SOURCES: kde4-kdepim-branch.diff - updated

arekm arekm at pld-linux.org
Mon Feb 23 20:48:50 CET 2009 

Author: arekm                        Date: Mon Feb 23 19:48:49 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   kde4-kdepim-branch.diff (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/kde4-kdepim-branch.diff
diff -u SOURCES/kde4-kdepim-branch.diff:1.2 SOURCES/kde4-kdepim-branch.diff:1.3
--- SOURCES/kde4-kdepim-branch.diff:1.2	Tue Feb  3 16:54:15 2009
+++ SOURCES/kde4-kdepim-branch.diff	Mon Feb 23 20:48:44 2009
@@ -1,7 +1,7 @@
 Index: akregator/plugins/onlinesync/akregator_onlinesync_plugin.desktop
 ===================================================================
---- akregator/plugins/onlinesync/akregator_onlinesync_plugin.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 920564)
-+++ akregator/plugins/onlinesync/akregator_onlinesync_plugin.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 920564)
+--- akregator/plugins/onlinesync/akregator_onlinesync_plugin.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ akregator/plugins/onlinesync/akregator_onlinesync_plugin.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
 @@ -24,6 +24,7 @@
  Name[pl]=Wsparcie dla czytnika kanałów RSS Akregator
  Name[pt]=Suporte de Leitura de Fontes de Notícias do Akregator
@@ -12,8 +12,8 @@
  Name[uk]=Підтримка читання мережевих розсилок у Akregator
 Index: akregator/plugins/onlinesync/akregator_config_onlinesync.desktop
 ===================================================================
---- akregator/plugins/onlinesync/akregator_config_onlinesync.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 920564)
-+++ akregator/plugins/onlinesync/akregator_config_onlinesync.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 920564)
+--- akregator/plugins/onlinesync/akregator_config_onlinesync.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ akregator/plugins/onlinesync/akregator_config_onlinesync.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
 @@ -35,6 +35,7 @@
  Name[pt]=Leitores 'Online'
  Name[pt_BR]=Leitores on-line
@@ -24,8 +24,8 @@
  Name[uk]=Програми для читання розсилок
 Index: akregator/src/articleviewer.cpp
 ===================================================================
---- akregator/src/articleviewer.cpp	(.../tags/KDE/4.2.0/kdepim)	(wersja 920564)
-+++ akregator/src/articleviewer.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 920564)
+--- akregator/src/articleviewer.cpp	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ akregator/src/articleviewer.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
 @@ -457,7 +457,15 @@
  
      head += "</style></head><body>";
@@ -45,8 +45,8 @@
  
 Index: akregator/src/selectioncontroller.cpp
 ===================================================================
---- akregator/src/selectioncontroller.cpp	(.../tags/KDE/4.2.0/kdepim)	(wersja 920564)
-+++ akregator/src/selectioncontroller.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 920564)
+--- akregator/src/selectioncontroller.cpp	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ akregator/src/selectioncontroller.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
 @@ -181,12 +181,11 @@
  
  void Akregator::SelectionController::articleHeadersAvailable()
@@ -66,8 +66,8 @@
      connect( m_articleLister->articleSelectionModel(), SIGNAL( selectionChanged( QItemSelection, QItemSelection ) ),
 Index: akregator/src/articlelistview.cpp
 ===================================================================
---- akregator/src/articlelistview.cpp	(.../tags/KDE/4.2.0/kdepim)	(wersja 920564)
-+++ akregator/src/articlelistview.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 920564)
+--- akregator/src/articlelistview.cpp	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ akregator/src/articlelistview.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
 @@ -144,9 +144,11 @@
  
  void ArticleListView::setArticleModel( ArticleModel* model )
@@ -173,8 +173,8 @@
  void ArticleListView::slotPreviousArticle()
 Index: akregator/src/subscriptionlistview.h
 ===================================================================
---- akregator/src/subscriptionlistview.h	(.../tags/KDE/4.2.0/kdepim)	(wersja 920564)
-+++ akregator/src/subscriptionlistview.h	(.../branches/KDE/4.2/kdepim)	(wersja 920564)
+--- akregator/src/subscriptionlistview.h	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ akregator/src/subscriptionlistview.h	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
 @@ -28,6 +28,7 @@
  #include <QTreeView>
  #include <QMap>
@@ -194,8 +194,8 @@
  }
 Index: akregator/src/akregator_part.cpp
 ===================================================================
---- akregator/src/akregator_part.cpp	(.../tags/KDE/4.2.0/kdepim)	(wersja 920564)
-+++ akregator/src/akregator_part.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 920564)
+--- akregator/src/akregator_part.cpp	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ akregator/src/akregator_part.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
 @@ -103,6 +103,8 @@
      , m_dialog(0)
  
@@ -214,10 +214,22 @@
      QString useragent = QString( "Akregator/%1; syndication" ).arg( AKREGATOR_VERSION );
  
      if( !Settings::customUserAgent().isEmpty() )
+Index: akregator/src/akregator.desktop
+===================================================================
+--- akregator/src/akregator.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ akregator/src/akregator.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
+@@ -56,6 +56,7 @@
+ Comment[ja]=KDE のフィードリーダー
+ Comment[km]=កម្មវិធី​អាន​មតិព័ត៌មាន​របស់ KDE
+ Comment[ko]=피드 리더
++Comment[lt]=RSS kanalų skaitytuvė KDE darbastalio aplinkai
+ Comment[lv]=KDE ziņu barotņu lasītājs
+ Comment[nb]=En kildeleser for KDE
+ Comment[nds]=En Mellenstroom-Kieker för KDE
 Index: akregator/src/subscriptionlistview.cpp
 ===================================================================
---- akregator/src/subscriptionlistview.cpp	(.../tags/KDE/4.2.0/kdepim)	(wersja 920564)
-+++ akregator/src/subscriptionlistview.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 920564)
+--- akregator/src/subscriptionlistview.cpp	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ akregator/src/subscriptionlistview.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
 @@ -55,7 +55,7 @@
              i = i.child( model->rowCount( i ) - 1, i.column() );
          return i;
@@ -386,8 +398,8 @@
  
 Index: akregator/src/articlelistview.h
 ===================================================================
---- akregator/src/articlelistview.h	(.../tags/KDE/4.2.0/kdepim)	(wersja 920564)
-+++ akregator/src/articlelistview.h	(.../branches/KDE/4.2/kdepim)	(wersja 920564)
+--- akregator/src/articlelistview.h	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ akregator/src/articlelistview.h	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
 @@ -119,6 +119,8 @@
  
      void setIsAggregation( bool isAggregation );
@@ -409,9 +421,17 @@
  } // namespace Akregator
 Index: akregator/configuration/akregator_config_browser.desktop
 ===================================================================
---- akregator/configuration/akregator_config_browser.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 920564)
-+++ akregator/configuration/akregator_config_browser.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 920564)
-@@ -66,6 +66,7 @@
+--- akregator/configuration/akregator_config_browser.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ akregator/configuration/akregator_config_browser.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
+@@ -23,6 +23,7 @@
+ Name[ja]=ブラウザ
+ Name[km]=កម្មវិធី​រុករក
+ Name[ko]=탐색기
++Name[lt]=Naršyklė
+ Name[lv]=Pārlūks
+ Name[nb]=Nettleser
+ Name[nds]=Kieker
+@@ -66,6 +67,7 @@
  Comment[pt]=Configurar a Componente de Navegação Interna
  Comment[pt_BR]=Configurar o componente de navegação interna
  Comment[ro]=Configurează componenta internă de navigare
@@ -421,8 +441,8 @@
  Comment[uk]=Налаштування вбудованого компонента переглядача
 Index: akregator/configuration/akregator_config_appearance.desktop
 ===================================================================
---- akregator/configuration/akregator_config_appearance.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 920564)
-+++ akregator/configuration/akregator_config_appearance.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 920564)
+--- akregator/configuration/akregator_config_appearance.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ akregator/configuration/akregator_config_appearance.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
 @@ -93,6 +93,7 @@
  Comment[pt]=Configurar a Aparência do Leitor de Fontes
  Comment[pt_BR]=Configurar a aparência do leitor de fontes de notícias
@@ -431,10 +451,22 @@
  Comment[sv]=Anpassa kanalläsarens utseende
  Comment[tr]=Haber Okuyucu Görünümünü Yapılandır
  Comment[uk]=Налаштування вигляду програми читання розсилок
+Index: akregator/configuration/akregator_config_advanced.desktop
+===================================================================
+--- akregator/configuration/akregator_config_advanced.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ akregator/configuration/akregator_config_advanced.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
+@@ -25,6 +25,7 @@
+ Name[ja]=詳細
+ Name[km]=កម្រិត​ខ្ពស់
+ Name[ko]=고급
++Name[lt]=SudÄ—tingesni
+ Name[lv]=Paplašināti
+ Name[nb]=Avansert
+ Name[nds]=Verwiedert
 Index: akregator/configuration/akregator_config_archive.desktop
 ===================================================================
---- akregator/configuration/akregator_config_archive.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 920564)
-+++ akregator/configuration/akregator_config_archive.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 920564)
+--- akregator/configuration/akregator_config_archive.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ akregator/configuration/akregator_config_archive.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
 @@ -68,6 +68,7 @@
  Comment[pt_BR]=Configurar o arquivo de fontes de notícias
  Comment[ro]=Configurează arhiva de fluxuri
@@ -445,8 +477,8 @@
  Comment[uk]=Налаштування архіву розсилок
 Index: cmake/modules/FindAssuan.cmake
 ===================================================================
---- cmake/modules/FindAssuan.cmake	(.../tags/KDE/4.2.0/kdepim)	(wersja 920564)
-+++ cmake/modules/FindAssuan.cmake	(.../branches/KDE/4.2/kdepim)	(wersja 920564)
+--- cmake/modules/FindAssuan.cmake	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ cmake/modules/FindAssuan.cmake	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
 @@ -75,12 +75,6 @@
  
    else()
@@ -462,9 +494,9 @@
      #set( ASSUAN_GLIB_FOUND    false )
 Index: libkleo/libkleopatrarc.desktop
 ===================================================================
---- libkleo/libkleopatrarc.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 920564)
-+++ libkleo/libkleopatrarc.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 920564)
-@@ -318,6 +318,7 @@
+--- libkleo/libkleopatrarc.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ libkleo/libkleopatrarc.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
+@@ -318,12 +318,14 @@
  Name[es]=Otras claves
  Name[et]=Muud võtmed
  Name[fr]=Autres clés
@@ -472,10 +504,44 @@
  Name[ga]=Eochracha Eile
  Name[gl]=Outras Chaves
  Name[it]=Altre chiavi
+ Name[ja]=その他の鍵
+ Name[km]=សោ​ផ្សេង​ទៀត
+ Name[ko]=다른 키
++Name[lt]=Kiti raktai
+ Name[lv]=Citas atslēgas
+ Name[nb]=Andre nøkler
+ Name[nds]=Anner Slötels
+Index: libkleo/ui/messagebox.cpp
+===================================================================
+--- libkleo/ui/messagebox.cpp	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ libkleo/ui/messagebox.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
+@@ -2,7 +2,7 @@
+     messagebox.cpp
+ 
+     This file is part of libkleopatra, the KDE keymanagement library
+-    Copyright (c) 2004 Klarälvdalens Datakonsult AB
++    Copyright (c) 2004 Klarälvdalens Datakonsult AB
+ 
+     Libkleopatra is free software; you can redistribute it and/or
+     modify it under the terms of the GNU General Public License as
+@@ -60,11 +60,11 @@
+ namespace {
+ 
+ static KGuiItem KGuiItem_save() {
+-    return KGuiItem( i18n("&Save to Disk..."), "filesaveas" );
++    return KGuiItem( i18n("&Save to Disk..."), "document-save-as" );
+ }
+ 
+ static KGuiItem KGuiItem_copy() {
+-    return KGuiItem( i18n("&Copy to Clipboard"), "editcopy", i18n("Copy Audit Log to Clipboard") );
++    return KGuiItem( i18n("&Copy to Clipboard"), "edit-copy", i18n("Copy Audit Log to Clipboard") );
+ }
+ 
+ static KGuiItem KGuiItem_showAuditLog() {
 Index: kleopatra/kleopatra_import.desktop
 ===================================================================
---- kleopatra/kleopatra_import.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 920564)
-+++ kleopatra/kleopatra_import.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 920564)
+--- kleopatra/kleopatra_import.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ kleopatra/kleopatra_import.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
 @@ -36,6 +36,7 @@
  Comment[pt]=Gestor de Certificados e GUI Unificada de Criptografia
  Comment[pt_BR]=Gerenciador de certificados e interface gráfica do usuário unificada
@@ -486,8 +552,8 @@
  Comment[uk]=Засіб для керування сертифікатами і уніфікований графічний інтерфейс шифрування
 Index: kleopatra/conf/kleopatra_config_smimevalidation.desktop
 ===================================================================
---- kleopatra/conf/kleopatra_config_smimevalidation.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 920564)
-+++ kleopatra/conf/kleopatra_config_smimevalidation.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 920564)
+--- kleopatra/conf/kleopatra_config_smimevalidation.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ kleopatra/conf/kleopatra_config_smimevalidation.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
 @@ -64,6 +64,7 @@
  Comment[pl]=Konfiguracja opcji walidacji certyfikatu S/MIME
  Comment[pt]=Configuração das opções de validação do certificado de S/MIME
@@ -498,8 +564,8 @@
  Comment[tr]=S/MIME sertifika geçerlilik doğrulaması seçeneklerinin yapılandırması
 Index: kleopatra/conf/kleopatra_config_dirserv.desktop
 ===================================================================
---- kleopatra/conf/kleopatra_config_dirserv.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 920564)
-+++ kleopatra/conf/kleopatra_config_dirserv.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 920564)
+--- kleopatra/conf/kleopatra_config_dirserv.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ kleopatra/conf/kleopatra_config_dirserv.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
 @@ -88,6 +88,7 @@
  Comment[pl]=Konfiguracja usług katalogowych
  Comment[pt]=Configuração dos serviços de directório
@@ -510,8 +576,8 @@
  Comment[tr]=Dizin servisleri yapılandırması
 Index: kleopatra/kleopatra_decryptverifyfolders.desktop
 ===================================================================
---- kleopatra/kleopatra_decryptverifyfolders.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 920564)
-+++ kleopatra/kleopatra_decryptverifyfolders.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 920564)
+--- kleopatra/kleopatra_decryptverifyfolders.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ kleopatra/kleopatra_decryptverifyfolders.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
 @@ -25,6 +25,7 @@
  Name[pl]=Odszyfrowanie/weryfikacja wszystkich plików w katalogu w Kleopatrze
  Name[pt]=Descodificação/Verificação de Todos os Ficheiros da Pasta do Kleopatra
@@ -530,8 +596,8 @@
  Name[uk]=Розшифрувати/Перевірити всі файли у теці
 Index: kleopatra/kleopatra_decryptverifyfiles.desktop
 ===================================================================
---- kleopatra/kleopatra_decryptverifyfiles.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 920564)
-+++ kleopatra/kleopatra_decryptverifyfiles.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 920564)
+--- kleopatra/kleopatra_decryptverifyfiles.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ kleopatra/kleopatra_decryptverifyfiles.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
 @@ -26,6 +26,7 @@
  Name[pl]=Odszyfrowanie/weryfikacja plików w Kleopatrze
  Name[pt]=Descodificação/Verificação de Ficheiros do Kleopatra
@@ -548,10 +614,117 @@
  Name[sv]=Avkoda och verifiera fil
  Name[tr]=Dosyaların Şifrelemesini Aç/Doğrula
  Name[uk]=Розшифрувати/Перевірити файл
+Index: kleopatra/kgpgconf/CMakeLists.txt
+===================================================================
+--- kleopatra/kgpgconf/CMakeLists.txt	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ kleopatra/kgpgconf/CMakeLists.txt	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
+@@ -1,7 +1,8 @@
+ project(kgpgconf)
+ 
+ include_directories( ${CMAKE_SOURCE_DIR}/libkleo/backends/qgpgme )
+-add_definitions ( -D_ASSUAN_ONLY_GPG_ERRORS -UQT_NO_STL -DKDE_DEFAULT_DEBUG_AREA=5154 )
++add_definitions ( -D_ASSUAN_ONLY_GPG_ERRORS -DKDE_DEFAULT_DEBUG_AREA=5154 )
++remove_definitions ( -DQT_NO_STL )
+ 
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+ 
+Index: kleopatra/uiserver/echocommand.cpp
+===================================================================
+--- kleopatra/uiserver/echocommand.cpp	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ kleopatra/uiserver/echocommand.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
+@@ -32,12 +32,6 @@
+ 
+ #include <config-kleopatra.h>
+ 
+-#ifdef QT_NO_STL
+-#undef QT_NO_STL
+-#undef QT_STL
+-#define QT_STL
+-#endif
+-
+ #include "echocommand.h"
+ 
+ #include <utils/input.h>
+Index: kleopatra/CMakeLists.txt
+===================================================================
+--- kleopatra/CMakeLists.txt	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ kleopatra/CMakeLists.txt	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
+@@ -27,7 +27,8 @@
+ if (USABLE_ASSUAN_FOUND)
+    include_directories(${ASSUAN_INCLUDES})
+ endif(USABLE_ASSUAN_FOUND)
+-add_definitions ( -DQT_STL -DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS -D_ASSUAN_ONLY_GPG_ERRORS -UQT_NO_STL )
++add_definitions ( -DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS -D_ASSUAN_ONLY_GPG_ERRORS )
++remove_definitions ( -DQT_NO_STL )
+ 
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
+ 
+@@ -275,6 +276,9 @@
+ endif ( NOT KDE4_KCMUTILS_LIBS )
+ 
+ target_link_libraries(kleopatra_bin ${_kleopatra_extra_libs} kleo ${QGPGME_LIBRARIES} ${KDE4_KDEUI_LIBS} ${KDE4_KMIME_LIBRARY} ${KDE4_KCMUTILS_LIBS} ${_kleopatra_uiserver_extra_libs} )
++if ( USABLE_ASSUAN_FOUND )
++  target_link_libraries(kleopatra_bin ${QT_QTNETWORK_LIBRARY}) 
++ENDIF ( USABLE_ASSUAN_FOUND )
+ 
+ install(TARGETS kleopatra_bin ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+Index: kleopatra/crypto/gui/signerresolvepage.cpp
+===================================================================
+--- kleopatra/crypto/gui/signerresolvepage.cpp	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ kleopatra/crypto/gui/signerresolvepage.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
+@@ -61,6 +61,7 @@
+ #include <QRadioButton>
+ #include <QStackedLayout>
+ #include <QVBoxLayout>
++#include <QVector>
+ 
+ #include <cassert>
+ 
+@@ -435,7 +436,7 @@
+ void SignerResolvePage::Private::selectCertificates()
+ {
+     QPointer<SigningCertificateSelectionDialog> dlg = new SigningCertificateSelectionDialog( q );
+-    dlg->setAllowedProtocols( QVector<Protocol>::fromStdVector(signingProtocolSelectionWidget->checkedProtocols() ) );
++    dlg->setAllowedProtocols( QVector<Protocol>::fromStdVector( signingProtocolSelectionWidget->checkedProtocols() ) );
+     if ( dlg->exec() == QDialog::Accepted && dlg )
+     {
+         const QMap<Protocol, Key> certs = dlg->selectedCertificates();
+Index: kleopatra/crypto/gui/resolverecipientspage.cpp
+===================================================================
+--- kleopatra/crypto/gui/resolverecipientspage.cpp	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ kleopatra/crypto/gui/resolverecipientspage.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
+@@ -32,12 +32,6 @@
+ 
+ #include <config-kleopatra.h>
+ 
+-#ifdef QT_NO_STL
+-#undef QT_NO_STL
+-#undef QT_STL
+-#define QT_STL
+-#endif
+-
+ #include "resolverecipientspage.h"
+ #include "resolverecipientspage_p.h"
+ 
+Index: kleopatra/crypto/gui/signerresolvepage_p.h
+===================================================================
+--- kleopatra/crypto/gui/signerresolvepage_p.h	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ kleopatra/crypto/gui/signerresolvepage_p.h	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
+@@ -39,6 +39,9 @@
+ class QCheckBox;
+ class QLabel;
+ 
++#include <vector>
++#include <map>
++
+ namespace Kleo {
+ namespace Crypto {
+ namespace Gui {
 Index: kleopatra/kleopatra_signencryptfolders.desktop
 ===================================================================
---- kleopatra/kleopatra_signencryptfolders.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 920564)
-+++ kleopatra/kleopatra_signencryptfolders.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 920564)
+--- kleopatra/kleopatra_signencryptfolders.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ kleopatra/kleopatra_signencryptfolders.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
 @@ -26,6 +26,7 @@
  Name[pl]=Podpisywanie/szyfrowanie katalogów w Kleopatrze
  Name[pt]=Assinatura/Encriptação de Pastas do Kleopatra
@@ -568,10 +741,24 @@
  Name[sv]=Arkivera, signera och kryptera katalog
  Name[tr]=Dizini ArÅŸivle, Ä°mzala & Åžifrele
  Name[uk]=Архівувати, підписати і зашифрувати теку
+@@ -77,11 +79,13 @@
+ Name[es]=Archivar y cifrar carpeta
+ Name[et]=Kataloogi arhiveerimine ja krüptimine
+ Name[fr]=Archiver et chiffrer le dossier
++Name[ga]=Cuir Fillteán i gCartlann agus Criptigh É
+ Name[gl]=Arquivar e Cifrar Cartafol
+ Name[it]=Archivia e codifica cartella
+ Name[ja]=フォルダをアーカイブして暗号化
+ Name[km]=ប័ណ្ណសារ និង​អ៊ីនគ្រិប​ថត
+ Name[ko]=폴더 압축 및 암호화
++Name[lt]=Archyvuoti ir Å¡ifruoti aplankÄ…
+ Name[lv]=Arhivēt un šifrēt mapi
+ Name[nb]=Arkiver og krypter mappe
+ Name[nds]=Orner archiveren un verslöteln
 Index: kleopatra/kleopatra_signencryptfiles.desktop
 ===================================================================
---- kleopatra/kleopatra_signencryptfiles.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 920564)
-+++ kleopatra/kleopatra_signencryptfiles.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 920564)
+--- kleopatra/kleopatra_signencryptfiles.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ kleopatra/kleopatra_signencryptfiles.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
 @@ -27,6 +27,7 @@
  Name[pl]=Podpisz/zaszyfruj pliki w Kleopatrze
  Name[pt]=Assinatura/Encriptação de Ficheiros do Kleopatra
@@ -588,7 +775,21 @@
  Name[sv]=Kryptera och signera fil
  Name[th]=เข้ารหัสและเซ็นกำกับแฟ้ม
  Name[tr]=Dosyayı Şifrele & İmzala
-@@ -132,6 +134,7 @@
+@@ -80,11 +82,13 @@
+ Name[es]=Cifrar archivo
+ Name[et]=Faili krüptimine
+ Name[fr]=Chiffrer le fichier
++Name[ga]=Criptigh Comhad
+ Name[gl]=Cifrar Ficheiro
+ Name[it]=Codifica file
+ Name[ja]=ファイルを暗号化
+ Name[km]=អ៊ីនគ្រិប​ឯកសារ
+ Name[ko]=파일 암호화
++Name[lt]=Å ifruoti failÄ…
+ Name[lv]=Šifrēt failu
+ Name[nb]=Krypter fil
+ Name[nds]=Datei verslöteln
+@@ -132,6 +136,7 @@
  Name[pt]=Assinar o Ficheiro com o OpenPGP
  Name[pt_BR]=Assinar arquivo com OpenPGP
  Name[ro]=Semnează fișierul cu OpenPGP
@@ -596,7 +797,7 @@
  Name[sv]=Signera fil med OpenPGP
  Name[tr]=Dosyayı OpenPGP-İmzala
  Name[uk]=Підписати файл з OpenPGP
-@@ -166,6 +169,7 @@
+@@ -166,6 +171,7 @@
  Name[pt]=Assinar o Ficheiro com o S/MIME
  Name[pt_BR]=Assinar arquivo com S/MIME
  Name[ro]=Semnează fișierul cu S/MIME
@@ -604,11 +805,67 @@
  Name[sv]=Signera fil med S/MIME
  Name[tr]=Dosyayı S/MIME-İmzala
  Name[uk]=Підписати файл з S/MIME
+Index: kleopatra/libkleopatraclient/tests/CMakeLists.txt
+===================================================================
+--- kleopatra/libkleopatraclient/tests/CMakeLists.txt	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ kleopatra/libkleopatraclient/tests/CMakeLists.txt	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
+@@ -9,6 +9,6 @@
+ 
+ foreach( _kleoclient_test ${kleoclient_TESTS} )
+   kde4_add_executable( "${_kleoclient_test}" TEST "${_kleoclient_test}.cpp" )
+-  target_link_libraries( "${_kleoclient_test}" kleopatraclientcore ${QT_QTGUI_LIBRARY} )
++  target_link_libraries( "${_kleoclient_test}" kleopatraclientcore ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} )
+ endforeach( _kleoclient_test )
+ 
+Index: kresources/egroupware/kcal_resourcexmlrpc.cpp
+===================================================================
+--- kresources/egroupware/kcal_resourcexmlrpc.cpp	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ kresources/egroupware/kcal_resourcexmlrpc.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
+@@ -590,8 +590,10 @@
+         calendar()->addEvent( event );
+         retrievedEvents.append( event );
+         changed = true;
+-      } else
++      } else {
++        retrievedEvents.append( oldEvent );
+         delete event;
++      }
+     } else {
+       if ( !localUid.isEmpty() )
+         event->setUid( localUid );
+@@ -700,8 +702,10 @@
+         calendar()->addTodo( todo );
+         retrievedTodos.append( todo );
+         changed = true;
+-      } else
++      } else {
++        retrievedTodos.append( oldTodo );
+         delete todo;
++      }
+     } else {
+       idMapper().setRemoteId( todo->uid(), uid );
+       calendar()->addTodo( todo );
 Index: kresources/blog/blog.desktop
 ===================================================================
---- kresources/blog/blog.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 920564)
-+++ kresources/blog/blog.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 920564)
-@@ -55,6 +55,7 @@
+--- kresources/blog/blog.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ kresources/blog/blog.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
+@@ -17,6 +17,7 @@
+ Name[ja]=ブログの日記
+ Name[km]=ទិនានុប្បវត្តិ​នៅ​ក្នុង​ប្លុក
+ Name[ko]=블로그의 저널
++Name[lt]=Žurnalas tinklaraštyje
+ Name[lv]=Tīmekļa dienasgrāmata
+ Name[nb]=Dagbok i en blogg
+ Name[nds]=Nett-Daagbook
+@@ -43,6 +44,7 @@
+ Comment[es]=Le permite publicar entradas de diario del calendario con entradas de bitácora
+ Comment[et]=Võimaldab postitada kalendri päeviku sissekandeid veebipäeviku sissekannetena
+ Comment[fr]=Permet de de poster des évènements du calendrier comme des entrées de journal
++Comment[ga]=Leis an mbreiseán seo is féidir leat iontrálacha dialainne a chur suas ar do bhlag
+ Comment[gl]=Permite publicar as entradas do diario como entradas de blogue
+ Comment[it]=Consente di inserire voci di diario in un blog
+ Comment[ja]=日記のエントリをブログのエントリとして投稿できるようにします
+@@ -55,6 +57,7 @@
  Comment[pl]=Pozwala na wysyłanie wpisów dziennika jako wpisów na blogach
  Comment[pt]=Permite-lhe publicar itens do diário como publicações num 'blog'
  Comment[pt_BR]=Permite-lhe postar entradas de diário como entradas de blog
@@ -618,9 +875,17 @@
  Comment[uk]=Надає можливість розміщувати записи журналу календаря як записи у блозі.
 Index: kresources/scalix/kabc/scalix.desktop
 ===================================================================
---- kresources/scalix/kabc/scalix.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 920564)
-+++ kresources/scalix/kabc/scalix.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 920564)
-@@ -51,6 +51,7 @@
+--- kresources/scalix/kabc/scalix.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ kresources/scalix/kabc/scalix.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
+@@ -16,6 +16,7 @@
+ Name[ja]=KMail 経由 Scalix サーバのアドレス帳
+ Name[km]=សៀវភៅ​អាសយដ្ឋាន​នៅ​លើ​ម៉ាស៊ីន​បម្រើ Scalix តាមរយៈ KMail
+ Name[ko]=KMail을 통한 Scalix 서버의 주소록
++Name[lt]=Adresų knygelė Scalix serveryje per KMail
+ Name[lv]=Scalix servera adrešu grāmata, izmantojot KMail
+ Name[nb]=Adressebok på Scalix-tjener via KMail
+ Name[nds]=Adressbook op Scalix-Server över KMail
+@@ -51,6 +52,7 @@
  Comment[pl]=Zapewnia dostęp do wizytówek przechowywanych na serwerze Scalix przy użyciu IMAP w KMailu lub Kontakcie
  Comment[pt]=Oferece o acesso aos contactos guardados num servidor de Scalix por IMAP, através do KMail ou do Kontact
  Comment[pt_BR]=Fornece acesso aos contatos armazenados em um servidor Scalix usando IMAP, pelo KMail ou Kontact
@@ -628,10 +893,34 @@
  Comment[sv]=Ger tillgång till kontakter lagrade på en Scalix-server med användning av IMAP via Kmail eller Kontact
  Comment[tr]=KMail ya da KOntact IMAP kullanarak Scalix sunucusu üzerindeki kişilere erişim sağlar
  Comment[uk]=Надає доступ до календаря, який зберігається на сервері Scalix, за допомогою IMAP за посередництва KMail або Kontact
+Index: kresources/scalix/knotes/scalix.desktop
+===================================================================
+--- kresources/scalix/knotes/scalix.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ kresources/scalix/knotes/scalix.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
+@@ -15,6 +15,7 @@
+ Name[ja]=KMail 経由 Scalix サーバのメモ
+ Name[km]=ចំណាំ​នៅ​លើ​ម៉ាស៊ីន​បម្រើ Scalix តាមរយៈ KMail
+ Name[ko]=KMail을 통한 Scalix 서버의 메모
++Name[lt]=Lipnūs lapeliai Scalix serveryje per KMail
+ Name[lv]=Scalix servera piezīmes, izmantojot KMail
+ Name[nb]=Notater på  Scalix-tjener via KMail
+ Name[nds]=Notizen op Scalix-Server över KMail
+Index: kresources/scalix/kcal/scalix.desktop
+===================================================================
+--- kresources/scalix/kcal/scalix.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ kresources/scalix/kcal/scalix.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
+@@ -16,6 +16,7 @@
+ Name[ja]=KMail 経由 Scalix サーバのカレンダー
+ Name[km]=ប្រតិទិន​នៅ​លើ​ម៉ាស៊ីន​បម្រើ Scalix តាមរយៈ KMail
+ Name[ko]=KMail을 통한 Scalix 서버의 달력
++Name[lt]=Kalendorius Scalix serveryje per KMail
+ Name[lv]=Scalix servera kalendārs, izmantojot KMail
+ Name[nb]=Kalender på Scalix-tjener via KMail
+ Name[nds]=Kalenner op Scalix-Server över KMail
 Index: kresources/slox/kabc_ox.desktop
 ===================================================================
---- kresources/slox/kabc_ox.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 920564)
-+++ kresources/slox/kabc_ox.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 920564)
+--- kresources/slox/kabc_ox.desktop	(.../tags/KDE/4.2.0/kdepim)	(wersja 930540)
++++ kresources/slox/kabc_ox.desktop	(.../branches/KDE/4.2/kdepim)	(wersja 930540)
 @@ -65,6 +65,7 @@
  Comment[pl]=Zapewnia dostęp do wizytówek przechowywanych na serwerze Open-Xchange
  Comment[pt]=Oferece o acesso aos contactos guardados num servidor de Open-Xchange
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdepim-branch.diff?r1=1.2&r2=1.3&f=u

More information about the pld-cvs-commit mailing list