Hello community, here is the log from the commit of package kdepim4-runtime for openSUSE:Factory checked in at 2013-09-09 11:06:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim4-runtime (Old) and /work/SRC/openSUSE:Factory/.kdepim4-runtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepim4-runtime" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim4-runtime/kdepim4-runtime.changes 2013-08-16 13:39:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdepim4-runtime.new/kdepim4-runtime.changes 2013-09-09 11:06:35.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Sep 1 09:58:03 UTC 2013 - [email protected] + +- Update to 4.11.1 + * KDE 4.11.1 bugfix release + * See http://www.kde.org/announcements/announce-4.11.1.php + +------------------------------------------------------------------- Old: ---- kdepim-runtime-4.11.0.tar.xz New: ---- kdepim-runtime-4.11.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.8B5hYP/_old 2013-09-09 11:06:36.000000000 +0200 +++ /var/tmp/diff_new_pack.8B5hYP/_new 2013-09-09 11:06:36.000000000 +0200 @@ -17,7 +17,7 @@ Name: kdepim4-runtime -Version: 4.11.0 +Version: 4.11.1 Release: 0 Summary: Base package of kdepim License: LGPL-2.1+ ++++++ kdepim-runtime-4.11.0.tar.xz -> kdepim-runtime-4.11.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.11.0/CMakeLists.txt new/kdepim-runtime-4.11.1/CMakeLists.txt --- old/kdepim-runtime-4.11.0/CMakeLists.txt 2013-08-07 17:01:39.000000000 +0200 +++ new/kdepim-runtime-4.11.1/CMakeLists.txt 2013-08-29 20:34:32.000000000 +0200 @@ -38,7 +38,7 @@ set(KDEPIM_RUNTIME_DEV_VERSION "") endif() -set(KDEPIM_RUNTIME_VERSION "4.11${KDEPIM_RUNTIME_DEV_VERSION}") +set(KDEPIM_RUNTIME_VERSION "4.11.1${KDEPIM_RUNTIME_DEV_VERSION}") ############### search-related options ################ option(KDEPIM_NO_NEPOMUK "Build without nepomuk dependency" FALSE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.11.0/agents/nepomukfeeder/findunindexeditemsjob.cpp new/kdepim-runtime-4.11.1/agents/nepomukfeeder/findunindexeditemsjob.cpp --- old/kdepim-runtime-4.11.0/agents/nepomukfeeder/findunindexeditemsjob.cpp 2013-07-10 01:13:32.000000000 +0200 +++ new/kdepim-runtime-4.11.1/agents/nepomukfeeder/findunindexeditemsjob.cpp 2013-08-28 19:06:34.000000000 +0200 @@ -131,7 +131,7 @@ if (job->error()) { mAkonadiItems.clear(); setError(KJob::UserDefinedError); - setErrorText("Retrieving items failed"); + setErrorText(i18n("Retrieving items failed")); emitResult(); return; } @@ -191,7 +191,7 @@ mStaleUris.clear(); kWarning() << query->lastError(); setError(KJob::UserDefinedError); - setErrorText("Nepomuk query failed"); + setErrorText(i18n("Nepomuk query failed")); emitResult(); return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.11.0/agents/nepomukfeeder/indexscheduler.cpp new/kdepim-runtime-4.11.1/agents/nepomukfeeder/indexscheduler.cpp --- old/kdepim-runtime-4.11.0/agents/nepomukfeeder/indexscheduler.cpp 2013-07-10 01:13:32.000000000 +0200 +++ new/kdepim-runtime-4.11.1/agents/nepomukfeeder/indexscheduler.cpp 2013-08-28 19:06:34.000000000 +0200 @@ -31,6 +31,7 @@ #include <KIconLoader> #include <QDateTime> +#include <QTimer> #include "nepomukhelpers.h" #include "nepomukfeeder-config.h" @@ -42,6 +43,7 @@ IndexScheduler::IndexScheduler( QObject* parent ) : QObject( parent ), mTotalAmount( 0 ), + mTotalClearAmount( 0 ), mReIndex( false ), mOnline( true ), lowPrioQueue(1, 100, this), @@ -176,16 +178,19 @@ void IndexScheduler::removeCollection(const Collection& collection) { mCollectionsToRemove.append( collection ); + mTotalClearAmount++; } void IndexScheduler::removeItem(const Item& item) { mItemsToRemove.append( item ); + mTotalClearAmount++; } void IndexScheduler::removeNepomukUris(const QList< QUrl > uriList) { mUrisToRemove.append( uriList ); + mTotalClearAmount += uriList.size(); } @@ -218,6 +223,12 @@ kDebug() << "Progress:" << percent << "%" << size() << mTotalAmount; emit progress( percent ); } + else if (mTotalClearAmount) { + int size = mCollectionsToRemove.size() + mItemsToRemove.size() + mUrisToRemove.size(); + int percent = ( mTotalClearAmount - size ) * 100.0 / mTotalClearAmount; + kDebug() << "Progress:" << percent << "%" << size << mTotalClearAmount; + emit progress( percent ); + } if ( !mOnline ) { kDebug() << "not Online, stopping processing"; @@ -261,39 +272,30 @@ // FIXME: We should probably be clearing the contents of the collection as well // Clear 10 collections at a time - QList<QUrl> nieUrls; for( int i=0; i<10 && mCollectionsToRemove.count(); i++ ) - nieUrls << mCollectionsToRemove.takeFirst().url(); - - KJob *removeJob = Nepomuk2::removeResources( nieUrls, Nepomuk2::RemoveSubResoures ); - connect( removeJob, SIGNAL(finished(KJob*)), this, SLOT(batchFinished()) ); + mNieUrlsToRemove << mCollectionsToRemove.takeFirst().url(); + QTimer::singleShot(lowPrioQueue.processingDelay(), this, SLOT(slotSendUrlsForClearing())); emit running( i18n("Clearing unused Emails") ); return; } else if( !mItemsToRemove.isEmpty() ) { // Clear 10 items at a time - QList<QUrl> nieUrls; for( int i=0; i<10 && mItemsToRemove.count(); i++ ) - nieUrls << mItemsToRemove.takeFirst().url(); - - KJob *removeJob = Nepomuk2::removeResources( nieUrls, Nepomuk2::RemoveSubResoures ); - connect( removeJob, SIGNAL(finished(KJob*)), this, SLOT(batchFinished()) ); + mNieUrlsToRemove << mItemsToRemove.takeFirst().url(); + QTimer::singleShot(lowPrioQueue.processingDelay(), this, SLOT(slotSendUrlsForClearing())); emit running( i18n("Clearing unused Emails") ); return; } else if( !mUrisToRemove.isEmpty() ) { // Clear 10 at a time - QList<QUrl> uris; for( int i=0; i<10 && mUrisToRemove.count(); i++ ) - uris << mUrisToRemove.takeFirst(); - - KJob *removeJob = Nepomuk2::removeResources( uris, Nepomuk2::RemoveSubResoures ); - connect( removeJob, SIGNAL(finished(KJob*)), this, SLOT(batchFinished()) ); + mNieUrlsToRemove << mUrisToRemove.takeFirst(); + QTimer::singleShot(lowPrioQueue.processingDelay(), this, SLOT(slotSendUrlsForClearing())); emit running( i18n("Clearing unused Emails") ); return; } @@ -302,9 +304,17 @@ emit idle( i18n( "Ready to index data." ) ); } +void IndexScheduler::slotSendUrlsForClearing() +{ + KJob *removeJob = Nepomuk2::removeResources( mNieUrlsToRemove, Nepomuk2::RemoveSubResoures ); + connect( removeJob, SIGNAL(finished(KJob*)), this, SLOT(batchFinished()) ); + + mNieUrlsToRemove.clear(); +} + void IndexScheduler::prioQueueFinished() { - if ( isEmpty() ) { + if (highPrioQueue.isEmpty() && lowPrioQueue.isEmpty() && emailItemQueue.isEmpty() && mCollectionQueue.isEmpty()) { indexingComplete(); mTotalAmount = 0; } @@ -312,15 +322,14 @@ void IndexScheduler::batchFinished() { - /*if ( sender() == &highPrioQueue ) - kDebug() << "high prio batch finished--------------------"; - if ( sender() == &lowPrioQueue ) - kDebug() << "low prio batch finished--------------------";*/ - if ( !isEmpty() ) { - //kDebug() << "continue"; - // go to eventloop before processing the next one, otherwise we miss the idle status change - mProcessItemQueueTimer.start(); - } + if (!isEmpty()) { + // go to eventloop before processing the next one, otherwise we miss the idle status change + mProcessItemQueueTimer.start(); + } + else if (mCollectionsToRemove.isEmpty() && mItemsToRemove.isEmpty() && mUrisToRemove.isEmpty()) { + mTotalClearAmount = 0; + indexingComplete(); + } } void IndexScheduler::collectionSaveJobResult(KJob* job) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.11.0/agents/nepomukfeeder/indexscheduler.h new/kdepim-runtime-4.11.1/agents/nepomukfeeder/indexscheduler.h --- old/kdepim-runtime-4.11.0/agents/nepomukfeeder/indexscheduler.h 2013-07-10 01:13:32.000000000 +0200 +++ new/kdepim-runtime-4.11.1/agents/nepomukfeeder/indexscheduler.h 2013-08-28 19:06:34.000000000 +0200 @@ -128,10 +128,14 @@ void slotIdleStatusChanged(bool isIdle); void slotPowerManagementChanged(bool onBattery); + void slotSendUrlsForClearing(); + private: void continueIndexing(); //start the indexing if work is to be done void indexingComplete(); - int mTotalAmount; + + int mTotalAmount; // The number of items than need to be indexe + int mTotalClearAmount; // The number of items that need to be cleared bool mReIndex; bool mOnline; @@ -147,6 +151,10 @@ Akonadi::Collection::List mCollectionsToRemove; QList<QUrl> mUrisToRemove; + // This variable is temporarily used to store the urls that will be passed to nepomuk + // for deletion. + QList<QUrl> mNieUrlsToRemove; + Nepomuk2::EventMonitor* mEventMonitor; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.11.0/agents/nepomukfeeder/itemqueue.cpp new/kdepim-runtime-4.11.1/agents/nepomukfeeder/itemqueue.cpp --- old/kdepim-runtime-4.11.0/agents/nepomukfeeder/itemqueue.cpp 2013-07-10 01:13:32.000000000 +0200 +++ new/kdepim-runtime-4.11.1/agents/nepomukfeeder/itemqueue.cpp 2013-08-28 19:06:34.000000000 +0200 @@ -71,6 +71,12 @@ mDelay = delay; } +int ItemQueue::processingDelay() +{ + return mDelay; +} + + void ItemQueue::addItem(const Akonadi::Item &item) { QDateTime modificationTime = item.modificationTime(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.11.0/agents/nepomukfeeder/itemqueue.h new/kdepim-runtime-4.11.1/agents/nepomukfeeder/itemqueue.h --- old/kdepim-runtime-4.11.0/agents/nepomukfeeder/itemqueue.h 2013-07-10 01:13:32.000000000 +0200 +++ new/kdepim-runtime-4.11.1/agents/nepomukfeeder/itemqueue.h 2013-08-28 19:06:34.000000000 +0200 @@ -84,6 +84,7 @@ * Sets the articifical delay that is introduced when processing one batch */ void setProcessingDelay(int delay); + int processingDelay(); void clear(); signals: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.11.0/resources/dav/services/owncloud.desktop new/kdepim-runtime-4.11.1/resources/dav/services/owncloud.desktop --- old/kdepim-runtime-4.11.0/resources/dav/services/owncloud.desktop 2013-07-10 01:13:32.000000000 +0200 +++ new/kdepim-runtime-4.11.1/resources/dav/services/owncloud.desktop 2013-08-28 19:06:34.000000000 +0200 @@ -36,6 +36,7 @@ Name[sr@latin]=ownCloud Name[sv]=ownCloud Name[tr]=ownCloud +Name[ug]=ownCloud Name[uk]=ownCloud Name[x-test]=xxownCloudxx Name[zh_CN]=ownCloud diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.11.0/resources/facebook/akonadi_facebook_resource.notifyrc new/kdepim-runtime-4.11.1/resources/facebook/akonadi_facebook_resource.notifyrc --- old/kdepim-runtime-4.11.0/resources/facebook/akonadi_facebook_resource.notifyrc 2013-08-06 14:46:09.000000000 +0200 +++ new/kdepim-runtime-4.11.1/resources/facebook/akonadi_facebook_resource.notifyrc 2013-08-28 19:06:34.000000000 +0200 @@ -94,6 +94,7 @@ Name[sr@latin]=Facebook Name[sv]=Facebook Name[tr]=Facebook +Name[ug]=فېيىسبۇك(Facebook) Name[uk]=Facebook Name[x-test]=xxFacebookxx Name[zh_CN]=Facebook diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.11.0/resources/facebook/facebookresource.desktop new/kdepim-runtime-4.11.1/resources/facebook/facebookresource.desktop --- old/kdepim-runtime-4.11.0/resources/facebook/facebookresource.desktop 2013-08-06 14:46:09.000000000 +0200 +++ new/kdepim-runtime-4.11.1/resources/facebook/facebookresource.desktop 2013-08-28 19:06:34.000000000 +0200 @@ -28,6 +28,7 @@ Name[sr@latin]=Facebook Name[sv]=Facebook Name[tr]=Facebook +Name[ug]=فېيىسبۇك(Facebook) Name[uk]=Facebook Name[x-test]=xxFacebookxx Name[zh_CN]=Facebook diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.11.0/resources/google/Messages.sh new/kdepim-runtime-4.11.1/resources/google/Messages.sh --- old/kdepim-runtime-4.11.0/resources/google/Messages.sh 2013-07-10 01:13:32.000000000 +0200 +++ new/kdepim-runtime-4.11.1/resources/google/Messages.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -#! /usr/bin/env bash -$EXTRACTRC `find . -name \*.kcfg -o -name \*.ui` >> rc.cpp || exit 11 -$XGETTEXT `find . -name \*.cpp -o -name \*.h` -o $podir/akonadi_google_resource.pot -rm -f rc.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.11.0/resources/google/calendar/Messages.sh new/kdepim-runtime-4.11.1/resources/google/calendar/Messages.sh --- old/kdepim-runtime-4.11.0/resources/google/calendar/Messages.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/kdepim-runtime-4.11.1/resources/google/calendar/Messages.sh 2013-08-28 19:06:34.000000000 +0200 @@ -0,0 +1,4 @@ +#! /usr/bin/env bash +$EXTRACTRC *.ui *.kcfg >> rc.cpp +$XGETTEXT *.cpp -o $podir/akonadi_googlecalendar_resource.pot +$XGETTEXT ../common/*.cpp -j -o $podir/akonadi_googlecalendar_resource.pot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.11.0/resources/google/contacts/Messages.sh new/kdepim-runtime-4.11.1/resources/google/contacts/Messages.sh --- old/kdepim-runtime-4.11.0/resources/google/contacts/Messages.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/kdepim-runtime-4.11.1/resources/google/contacts/Messages.sh 2013-08-28 19:06:34.000000000 +0200 @@ -0,0 +1,4 @@ +#! /usr/bin/env bash +$EXTRACTRC *.ui *.kcfg >> rc.cpp +$XGETTEXT *.cpp -o $podir/akonadi_googlecontacts_resource.pot +$XGETTEXT ../common/*.cpp -j -o $podir/akonadi_googlecontacts_resource.pot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.11.0/resources/google/contacts/googlecontactsresource.desktop new/kdepim-runtime-4.11.1/resources/google/contacts/googlecontactsresource.desktop --- old/kdepim-runtime-4.11.0/resources/google/contacts/googlecontactsresource.desktop 2013-07-10 01:13:32.000000000 +0200 +++ new/kdepim-runtime-4.11.1/resources/google/contacts/googlecontactsresource.desktop 2013-08-28 19:06:34.000000000 +0200 @@ -34,6 +34,7 @@ Name[sr@latin]=Googleovi kontakti Name[sv]=Google kontakter Name[tr]=Google Kişileri +Name[ug]=Google ئالاقەداشلىرى Name[uk]=Контакти Google Name[x-test]=xxGoogle Contactsxx Name[zh_CN]=Google 联系人 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.11.0/resources/imap/resourcetask.cpp new/kdepim-runtime-4.11.1/resources/imap/resourcetask.cpp --- old/kdepim-runtime-4.11.0/resources/imap/resourcetask.cpp 2013-07-10 01:13:32.000000000 +0200 +++ new/kdepim-runtime-4.11.1/resources/imap/resourcetask.cpp 2013-08-28 19:06:34.000000000 +0200 @@ -395,7 +395,7 @@ void ResourceTask::kill() { kDebug(); - cancelTask("killed"); + cancelTask(i18n("killed")); } const QChar ResourceTask::separatorCharacter() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.11.0/resources/imap/retrieveitemtask.cpp new/kdepim-runtime-4.11.1/resources/imap/retrieveitemtask.cpp --- old/kdepim-runtime-4.11.0/resources/imap/retrieveitemtask.cpp 2013-07-10 01:13:32.000000000 +0200 +++ new/kdepim-runtime-4.11.1/resources/imap/retrieveitemtask.cpp 2013-08-28 19:06:34.000000000 +0200 @@ -47,7 +47,7 @@ if ( m_uid == 0 ) { kWarning() << "Remote id is " << item().remoteId(); - cancelTask( "Remote id is empty or invalid" ); // TODO: i18n + cancelTask( i18n("Remote id is empty or invalid") ); return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.11.0/resources/imap/subscriptiondialog.cpp new/kdepim-runtime-4.11.1/resources/imap/subscriptiondialog.cpp --- old/kdepim-runtime-4.11.0/resources/imap/subscriptiondialog.cpp 2013-07-10 01:13:32.000000000 +0200 +++ new/kdepim-runtime-4.11.1/resources/imap/subscriptiondialog.cpp 2013-08-28 19:06:34.000000000 +0200 @@ -154,12 +154,34 @@ } else { m_enableSubscription->hide(); } + readConfig(); } SubscriptionDialog::~SubscriptionDialog() { + writeConfig(); } +void SubscriptionDialog::readConfig() +{ + KConfigGroup group( KGlobal::config(), "SubscriptionDialog" ); + + const QSize size = group.readEntry( "Size", QSize() ); + if ( size.isValid() ) { + resize( size ); + } else { + resize( 500, 300 ); + } +} + +void SubscriptionDialog::writeConfig() +{ + KConfigGroup group( KGlobal::config(), "SubscriptionDialog" ); + group.writeEntry( "Size", size() ); + group.sync(); +} + + void SubscriptionDialog::setSubscriptionEnabled( bool enabled ) { m_enableSubscription->setChecked( enabled ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.11.0/resources/imap/subscriptiondialog.h new/kdepim-runtime-4.11.1/resources/imap/subscriptiondialog.h --- old/kdepim-runtime-4.11.0/resources/imap/subscriptiondialog.h 2013-07-10 01:13:32.000000000 +0200 +++ new/kdepim-runtime-4.11.1/resources/imap/subscriptiondialog.h 2013-08-28 19:06:34.000000000 +0200 @@ -101,6 +101,8 @@ protected slots: void slotButtonClicked( int button ); private: + void readConfig(); + void writeConfig(); void applyChanges(); KIMAP::Session *m_session; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.11.0/resources/kolabproxy/setupdefaultfoldersjob.cpp new/kdepim-runtime-4.11.1/resources/kolabproxy/setupdefaultfoldersjob.cpp --- old/kdepim-runtime-4.11.0/resources/kolabproxy/setupdefaultfoldersjob.cpp 2013-07-10 01:13:32.000000000 +0200 +++ new/kdepim-runtime-4.11.1/resources/kolabproxy/setupdefaultfoldersjob.cpp 2013-08-28 19:06:34.000000000 +0200 @@ -30,6 +30,8 @@ #include <Akonadi/CollectionModifyJob> #include <Akonadi/EntityDisplayAttribute> +#include <KLocale> + SetupDefaultFoldersJob::SetupDefaultFoldersJob( const Akonadi::AgentInstance &instance, QObject *parent ) : Job( parent ), @@ -82,7 +84,7 @@ if (!defaultParent.isValid()) { setError(KJob::UserDefinedError); - setErrorText("Could not find valid parent collection."); + setErrorText(i18n("Could not find valid parent collection.")); emitResult(); } kDebug() << "default parent " << defaultParent.id(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.11.0/resources/kolabproxy/setupkolab.cpp new/kdepim-runtime-4.11.1/resources/kolabproxy/setupkolab.cpp --- old/kdepim-runtime-4.11.0/resources/kolabproxy/setupkolab.cpp 2013-07-14 12:02:24.000000000 +0200 +++ new/kdepim-runtime-4.11.1/resources/kolabproxy/setupkolab.cpp 2013-08-28 19:06:34.000000000 +0200 @@ -126,7 +126,7 @@ const Akonadi::AgentInstance instanceSelected = m_agentList[m_ui->imapAccountComboBox->currentText()]; - m_versionUi->statusLabel->setText( "started" ); + m_versionUi->statusLabel->setText( i18n("Started") ); m_versionUi->progressBar->setEnabled( true ); UpgradeJob *job = @@ -152,14 +152,14 @@ { if ( job->error() ) { kWarning() << job->errorString(); - m_versionUi->statusLabel->setText( "error" ); + m_versionUi->statusLabel->setText( i18n("Error") ); KMessageBox::error( this, i18n( "Could not complete the upgrade process: " ) + job->errorString(), i18n( "Error during Upgrade Process" ) ); return; } - m_versionUi->statusLabel->setText( "complete" ); + m_versionUi->statusLabel->setText( i18n("Complete") ); m_versionUi->progressBar->setValue( 100 ); } @@ -171,9 +171,9 @@ Kolab::Version v = readKolabVersion( instanceSelected.identifier() ); if ( v == Kolab::KolabV2 ) { - m_ui->formatVersion->setText( "Kolab Format v2" ); + m_ui->formatVersion->setText( i18n("Kolab Format v2") ); } else { - m_ui->formatVersion->setText( "Kolab Format v3" ); + m_ui->formatVersion->setText( i18n("Kolab Format v3") ); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.11.0/tray/akonaditray.desktop new/kdepim-runtime-4.11.1/tray/akonaditray.desktop --- old/kdepim-runtime-4.11.0/tray/akonaditray.desktop 2013-07-10 01:13:32.000000000 +0200 +++ new/kdepim-runtime-4.11.1/tray/akonaditray.desktop 2013-08-28 19:06:34.000000000 +0200 @@ -94,6 +94,7 @@ GenericName[sr@latin]=Akonadijeva kasetna alatka GenericName[sv]=Akonadi-brickverktyg GenericName[tr]=Akonadi Sistem Çekmecesi Aracı +GenericName[ug]=Akonadi قونداق قورالي GenericName[uk]=Утиліта лотка Akonadi GenericName[x-test]=xxAkonadi Tray Utilityxx GenericName[zh_CN]=Akonadi 托盘工具 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
