SOURCES: kde4-kdepim-branch.diff, kde4-kdepimlibs-branch.diff - updated

arekm arekm at pld-linux.org
Sat Mar 7 18:27:42 CET 2009 

Author: arekm                        Date: Sat Mar  7 17:27:41 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   kde4-kdepim-branch.diff (1.3 -> 1.4) , kde4-kdepimlibs-branch.diff (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SOURCES/kde4-kdepim-branch.diff
diff -u SOURCES/kde4-kdepim-branch.diff:1.3 SOURCES/kde4-kdepim-branch.diff:1.4
--- SOURCES/kde4-kdepim-branch.diff:1.3	Mon Feb 23 20:48:44 2009
+++ SOURCES/kde4-kdepim-branch.diff	Sat Mar  7 18:27:35 2009
@@ -1,9723 +1,2169 @@
-Index: akregator/plugins/onlinesync/akregator_onlinesync_plugin.desktop
+Index: akregator/Messages.sh
 ===================================================================
---- 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
- Name[pt_BR]=Suporte para leitor de notícias on-line do Akregator
-+Name[sl]=Akregatorjeva podpora za spletne bralnike
- Name[sv]=Stöd för Akregator kanalläsare
- Name[tr]=Akregator Çevrimiçi Kaynak Okuyucu Desteği
- 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 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
- Name[ro]=Cititori online
-+Name[sl]=Spletni bralniki
- Name[sv]=Kanalläsare
- Name[tr]=Çevrimiçi Okuyucular
- Name[uk]=Програми для читання розсилок
-Index: akregator/src/articleviewer.cpp
-===================================================================
---- 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>";
-     m_part->view()->setContentsPos(0,0);
--    m_part->begin(m_link);
-+
-+    //pass link to the KHTMLPart to make relative links work
-+    //add a bogus query item to distinguish from m_link
-+    //fixes the Complete Story link if the url has an anchor (e.g. #reqRSS) in it
-+    //See bug 177754
-+
-+    KUrl url(m_link);
-+    url.addQueryItem("akregatorPreviewMode", "true");
-+    m_part->begin(url);
-     m_part->write(head);
- }
- 
-Index: akregator/src/selectioncontroller.cpp
-===================================================================
---- 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()
- {
--    if(m_articleModel)
--        delete m_articleModel;
-+    ArticleModel* const newModel = new ArticleModel( m_selectedSubscription );
-+    m_articleLister->setArticleModel( newModel );
-+    delete m_articleModel;
-+    m_articleModel = newModel;
- 
--    m_articleModel = new Akregator::ArticleModel( m_selectedSubscription );
--    m_articleLister->setArticleModel( m_articleModel );
--
-     m_articleLister->setIsAggregation( m_selectedSubscription->isAggregation() );
- 
-     connect( m_articleLister->articleSelectionModel(), SIGNAL( selectionChanged( QItemSelection, QItemSelection ) ),
-Index: akregator/src/articlelistview.cpp
-===================================================================
---- 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 )
- {
--    slotClear();
--    if ( !model )
-+    if ( !model ) {
-+        setModel( model );
-         return;
-+    }
-+
-     m_proxy = new SortColorizeProxyModel( model );
-     m_proxy->setSourceModel( model );
-     m_proxy->setSortRole( ArticleModel::SortRole );
-@@ -164,12 +166,6 @@
-     columnsProxy->setColumnEnabled( ArticleModel::AuthorColumn );
- 
-     setModel( columnsProxy );
--
--    if ( !m_headerSetUp )
--    {
--        loadHeaderSettings();
--        m_headerSetUp = true;
--    }
-     header()->setContextMenuPolicy( Qt::CustomContextMenu );
- }
- 
-@@ -205,24 +201,16 @@
- 
- void ArticleListView::saveHeaderSettings()
- {
--    //FIXME: HACK: Change back to saveState() when the Qt-bug is fixed
--    // is it qt-bug, really? at least saveState is working, but calling the next line causes app to hang.. -Teemu
--    //Settings::setArticlelistHeaderStates( header()->saveState().toBase64() );
--
--    QByteArray s = header()->saveState();
-+    if ( model() )
-+        m_headerState = header()->saveState();
-     KConfigGroup conf( Settings::self()->config(), "General" );
--    conf.writeEntry( "ArticleListHeaders", s.toBase64() );
-+    conf.writeEntry( "ArticleListHeaders", m_headerState.toBase64() );
- }
- 
- void ArticleListView::loadHeaderSettings()
- {
--    //FIXME: HACK: change back to loadState+Settings class instead of using KConfigGroup directly..
--    //QByteArray s = QByteArray::fromBase64( Settings::feedlistHeaderStates().toAscii() ); // this fails currently, I think -Teemu
--
-     KConfigGroup conf( Settings::self()->config(), "General" );
--    QByteArray s = QByteArray::fromBase64( conf.readEntry( "ArticleListHeaders" ).toAscii() );
--    if( !s.isNull() )
--        header()->restoreState( s );
-+    m_headerState = QByteArray::fromBase64( conf.readEntry( "ArticleListHeaders" ).toAscii() );
- }
- 
- QItemSelectionModel* ArticleListView::articleSelectionModel() const
-@@ -287,8 +275,7 @@
- ArticleListView::ArticleListView( QWidget* parent )
-     : QTreeView(parent),
-     m_columnMode( Unspecified ),
--    m_isAggregation( false ),
--    m_headerSetUp( false )
-+    m_isAggregation( false )
- {
-     setSortingEnabled( true );
-     setAlternatingRowColors( true );
-@@ -296,7 +283,6 @@
-     setUniformRowHeights( true );
-     setRootIsDecorated( false );
-     setAllColumnsShowFocus( true );
--
-     setMinimumSize( 250, 150 );
-     setWhatsThis( i18n("<h2>Article list</h2>"
-         "Here you can browse articles from the currently selected feed. "
-@@ -306,6 +292,7 @@
-     //connect exactly once
-     disconnect( header(), SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(showHeaderMenu(QPoint)) );
-     connect( header(), SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(showHeaderMenu(QPoint)) );
-+    loadHeaderSettings();
- }
- 
- void ArticleListView::mousePressEvent( QMouseEvent *ev )
-@@ -390,11 +377,18 @@
- }
- 
- 
-+void ArticleListView::setModel( QAbstractItemModel* m ) {
-+    QAbstractItemModel* const oldModel = model();
-+    if ( oldModel )
-+        m_headerState = header()->saveState();
-+    QTreeView::setModel( m );
-+    if ( m )
-+        header()->restoreState( m_headerState );
-+}
-+
- void ArticleListView::slotClear()
- {
--    QAbstractItemModel* const oldModel = model();
-     setModel( 0L );
--    delete oldModel;
- }
- 
- void ArticleListView::slotPreviousArticle()
-Index: akregator/src/subscriptionlistview.h
-===================================================================
---- 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>
- #include <QAction>
-+#include <QByteArray>
- 
- class KMenu;
- 
-@@ -83,7 +84,7 @@
-     void headerMenuItemTriggered( QAction* action );
- 
- private:
--    bool m_headerSetup;
-+    QByteArray m_headerState;
- };
- 
- }
-Index: akregator/src/akregator_part.cpp
-===================================================================
---- 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)
- 
- {
-+    initFonts();
-+
-     setPluginLoadingMode( LoadPluginsIfEnabled );
-     setPluginInterfaceVersion( AKREGATOR_PLUGIN_INTERFACE_VERSION );
- 
-@@ -180,8 +182,6 @@
-     connect(m_autosaveTimer, SIGNAL(timeout()), this, SLOT(slotSaveFeedList()));
-     m_autosaveTimer->start(5*60*1000); // 5 minutes
- 
--    initFonts();
--
-     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 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;
-     }
--    else 
-+    else
-         return idx.parent();
- }
- 
-@@ -104,7 +104,7 @@
-         if ( i.row() + 1 < siblings )
-             return i.sibling( i.row() + 1, i.column() );
-         i = i.parent();
--    }   
-+    }
- }
- 
- QModelIndex nextFeedIndex( const QModelIndex& idx )
-@@ -134,8 +134,9 @@
-     setDragDropMode( QAbstractItemView::DragDrop );
-     setDropIndicatorShown( true );
-     setAcceptDrops( true );
--    m_headerSetup = false;
-     connect( header(), SIGNAL( customContextMenuRequested( const QPoint & ) ), this, SLOT( showHeaderMenu( const QPoint& ) ) );
-+
-+    loadHeaderSettings();
- }
- 
- Akregator::SubscriptionListView::~SubscriptionListView()
-@@ -143,19 +144,25 @@
-     saveHeaderSettings();
- }
- 
--void Akregator::SubscriptionListView::setModel( QAbstractItemModel* model )
-+void Akregator::SubscriptionListView::setModel( QAbstractItemModel* m )
- {
--    QTreeView::setModel( model );
--    
-+    if ( model() )
-+        m_headerState = header()->saveState();
-+
-+    QTreeView::setModel( m );
-+
-+    if ( m )
-+        header()->restoreState( m_headerState );
-+
-     QStack<QModelIndex> stack;
-     stack.push( rootIndex() );
-     while ( !stack.isEmpty() )
-     {
-         const QModelIndex i = stack.pop();
--        const int childCount = model->rowCount( i );
-+        const int childCount = m->rowCount( i );
-         for ( int j = 0; j < childCount; ++j )
-         {
--            const QModelIndex child = model->index( j, 0, i );
-+            const QModelIndex child = m->index( j, 0, i );
-             if ( child.isValid() )
-                 stack.push( child );
-         }
-@@ -163,11 +170,6 @@
-     }
- 
-     header()->setContextMenuPolicy( Qt::CustomContextMenu );
--
--    if( ! m_headerSetup ) {
--        loadHeaderSettings();
--        m_headerSetup = true;
--    }
- }
- 
- void Akregator::SubscriptionListView::showHeaderMenu( const QPoint& pos )
-@@ -179,7 +181,7 @@
-     menu->addTitle( i18n( "Columns" ) );
-     menu->setAttribute( Qt::WA_DeleteOnClose );
-     connect(menu, SIGNAL( triggered( QAction* ) ), this, SLOT( headerMenuItemTriggered( QAction* ) ) );
--    
-+
-     for (int i = 0; i < model()->columnCount(); i++)
+--- akregator/Messages.sh	(.../tags/KDE/4.2.1/kdepim)	(wersja 936453)
++++ akregator/Messages.sh	(.../branches/KDE/4.2/kdepim)	(wersja 936453)
+@@ -1,3 +1,3 @@
+ #! /bin/sh
+ $EXTRACTRC `find . -name "*.rc" -o -name "*.ui" -o -name "*.kcfg"` >> rc.cpp || exit 11
+-$XGETTEXT $(find -name "*.cpp" ) -o $podir/akregator.pot
++$XGETTEXT $(find . -name "*.cpp" -o -name "*.h") -o $podir/akregator.pot
+Index: akregator/src/subscriptionlistmodel.cpp
+===================================================================
+--- akregator/src/subscriptionlistmodel.cpp	(.../tags/KDE/4.2.1/kdepim)	(wersja 936453)
++++ akregator/src/subscriptionlistmodel.cpp	(.../branches/KDE/4.2/kdepim)	(wersja 936453)
+@@ -447,6 +447,9 @@
      {
-         QString col = model()->headerData( i, Qt::Horizontal, Qt::DisplayRole ).toString();
-@@ -188,7 +190,7 @@
-         act->setChecked( !header()->isSectionHidden( i ) );
-         act->setData( i );
-     }
--    
-+
-     menu->popup( header()->mapToGlobal( pos ) );
- }
- 
-@@ -203,24 +205,17 @@
- }
- 
- void Akregator::SubscriptionListView::saveHeaderSettings()
--{ 
--    QByteArray s = header()->saveState();
-+{
-+    if ( model() )
-+        m_headerState = header()->saveState();
-     KConfigGroup conf( Settings::self()->config(), "General" );
--    conf.writeEntry( "SubscriptionListHeaders", s.toBase64() );
--
--    //FIXME: HACK: Change back to Settings, when it starts to work again..
--    // Settings::setFeedlistHeaderStates( s.toBase64() );
-+    conf.writeEntry( "SubscriptionListHeaders", m_headerState.toBase64() );
- }
- 
- void Akregator::SubscriptionListView::loadHeaderSettings()
- {
--    // FIXME: HACK: Change back to Settings when it's working
--    //QByteArray s = QByteArray::fromBase64( Settings::feedlistHeaderStates().toAscii() );
--    
--    KConfigGroup conf( Settings::self()->config(), "General" );
--    QByteArray s = QByteArray::fromBase64( conf.readEntry( "SubscriptionListHeaders" ).toAscii() );
--    if( !s.isNull() )
--        header()->restoreState( s );
-+    const KConfigGroup conf( Settings::self()->config(), "General" );
-+    m_headerState = QByteArray::fromBase64( conf.readEntry( "SubscriptionListHeaders" ).toAscii() );
- }
- 
- void Akregator::SubscriptionListView::slotPrevFeed()
-@@ -235,7 +230,7 @@
-     }
-     if ( prev.isValid() )
-         setCurrentIndex( prev );
--    
-+
- }
- 
- void Akregator::SubscriptionListView::slotNextFeed()
-@@ -276,7 +271,7 @@
- 
- void SubscriptionListView::slotItemBegin()
- {
--    
-+
- }
- 
- void SubscriptionListView::slotItemEnd()
-@@ -285,22 +280,22 @@
- 
- void SubscriptionListView::slotItemLeft()
- {
--    
-+
- }
- 
- void SubscriptionListView::slotItemRight()
- {
--    
-+
- }
- 
- void SubscriptionListView::slotItemUp()
- {
--    
-+
- }
- 
- void SubscriptionListView::slotItemDown()
- {
--    
-+
- }
- 
- 
-Index: akregator/src/articlelistview.h
-===================================================================
---- 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 @@
+         const TreeNode* const droppedOnNode = qobject_cast<const TreeNode*>( nodeForIndex( parent, m_feedList ) );
  
-     void setIsAggregation( bool isAggregation );
- 
-+    /* reimp */ void setModel( QAbstractItemModel* model );
++        if ( !droppedOnNode )
++            return false;
 +
- protected:
-     void mousePressEvent( QMouseEvent *ev );
- 
-@@ -162,8 +164,8 @@
-     ColumnMode m_columnMode;
-     bool m_isAggregation;
-     QPointer<SortColorizeProxyModel> m_proxy;
--    bool m_headerSetUp;
-     std::vector<boost::shared_ptr<const Filters::AbstractMatcher> > m_matchers;
-+    QByteArray m_headerState;
- };
- 
- } // namespace Akregator
-Index: akregator/configuration/akregator_config_browser.desktop
-===================================================================
---- 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
-+Comment[sl]=Nastavite vgrajeno komponento za brskanje
- Comment[sv]=Anpassa intern webbläsningskomponent
- Comment[tr]=İç Tarayıcı Bileşenini Yapılandır
- Comment[uk]=Налаштування вбудованого компонента переглядача
-Index: akregator/configuration/akregator_config_appearance.desktop
-===================================================================
---- 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
- Comment[ro]=Configurează aspectul cititorului de fluxuri
-+Comment[sl]=Nastavite videz bralnika virov
- 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 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
- Comment[ru]=Настройка архива лент
-+Comment[sl]=Nastavite arhiv vira
- Comment[sv]=Anpassa kanalarkivet
- Comment[tr]=Haber Arşivini Yapılandır
- Comment[uk]=Налаштування архіву розсилок
-Index: cmake/modules/FindAssuan.cmake
-===================================================================
---- 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()
- 
--    # is this needed, of just unreflected cut'n'paste?
--    # this isn't a KDE library, after all!
--    if( NOT KDEWIN_FOUND )
--      find_package( KDEWIN REQUIRED )
--    endif()
--
-     set( ASSUAN_FOUND         false )
-     set( ASSUAN_VANILLA_FOUND false )
-     #set( ASSUAN_GLIB_FOUND    false )
+         const Folder* const destFolder = droppedOnNode->isGroup() ? qobject_cast<const Folder*>( droppedOnNode ) : droppedOnNode->parent();
+         if ( !destFolder )
+             return false;
 Index: libkleo/libkleopatrarc.desktop
 ===================================================================
---- 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
-+Name[fy]=Oare kaaien
- 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 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
- Comment[ru]=Менеджер сертификата и унифицированный интерфейс пользователя для работы с криптографией.
-+Comment[sl]=Upravljalnik potrdil in enoten Å¡ifrirni vmesnik
- Comment[sv]=Certifikathantering och gemensamt grafiskt användargränssnitt för kryptering
- Comment[tr]=Sertifika Yöneticisi ve Birleşik Şifreleme Arayüzü
- Comment[uk]=Засіб для керування сертифікатами і уніфікований графічний інтерфейс шифрування
-Index: kleopatra/conf/kleopatra_config_smimevalidation.desktop
-===================================================================
---- 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
- Comment[pt_BR]=Configuração das opções de validação do certificado de S/MIME
-+Comment[sl]=Nastavitev možnosti preverjanja potrdil S/MIME
- Comment[sv]=Anpassning av alternativ för S/MIME-certifikatvalidering
- Comment[th]=การปรับแต่งค่าตัวเลือกการตรวจความถูกต้องของ S/MIME
- 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 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
- Comment[pt_BR]=Configuração dos serviços de diretório
<<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.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kde4-kdepimlibs-branch.diff?r1=1.6&r2=1.7&f=u

More information about the pld-cvs-commit mailing list