Hello community,
here is the log from the commit of package kdepim4-runtime for openSUSE:Factory checked in at 2011-12-08 12:09:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdepim4-runtime (Old)
and /work/SRC/openSUSE:Factory/.kdepim4-runtime.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepim4-runtime", Maintainer is "WStephenson@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdepim4-runtime/kdepim4-runtime.changes 2011-11-14 14:18:11.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kdepim4-runtime.new/kdepim4-runtime.changes 2011-12-08 12:10:01.000000000 +0100
@@ -1,0 +2,11 @@
+Wed Dec 7 11:30:46 UTC 2011 - coolo@suse.com
+
+- fix license to be in spdx.org format
+
+-------------------------------------------------------------------
+Fri Dec 2 01:58:59 CET 2011 - dmueller@suse.de
+
+- update to 4.7.4
+ * see http://kde.org/announcements/changelogs/changelog4_7_3to4_7_4.php for details
+
+-------------------------------------------------------------------
Old:
----
kdepim-runtime-4.7.3.tar.bz2
New:
----
kdepim-runtime-4.7.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdepim4-runtime.spec ++++++
--- /var/tmp/diff_new_pack.JphvNx/_old 2011-12-08 12:10:03.000000000 +0100
+++ /var/tmp/diff_new_pack.JphvNx/_new 2011-12-08 12:10:03.000000000 +0100
@@ -15,15 +15,13 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
-
Name: kdepim4-runtime
-Version: 4.7.3
-Release: 1
-License: LGPLv2.1+
+Version: 4.7.4
+Release: 0
Summary: Base package of kdepim
-Url: http://www.kde.org
+License: LGPL-2.1+
Group: System/GUI/KDE
+Url: http://www.kde.org
Source0: kdepim-runtime-%{version}.tar.bz2
Source1: akonadi.png
Patch0: 4_7_BRANCH.diff
++++++ kdepim-runtime-4.7.3.tar.bz2 -> kdepim-runtime-4.7.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/CMakeLists.txt new/kdepim-runtime-4.7.4/CMakeLists.txt
--- old/kdepim-runtime-4.7.3/CMakeLists.txt 2011-10-28 09:51:28.000000000 +0200
+++ new/kdepim-runtime-4.7.4/CMakeLists.txt 2011-12-02 00:53:01.000000000 +0100
@@ -38,7 +38,7 @@
set( KDEPIM_RUNTIME_DEV_VERSION "" )
endif ()
-set( KDEPIM_RUNTIME_VERSION "4.7.3${KDEPIM_RUNTIME_DEV_VERSION}" )
+set( KDEPIM_RUNTIME_VERSION "4.7.4${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.7.3/accountwizard/accountwizard.desktop new/kdepim-runtime-4.7.4/accountwizard/accountwizard.desktop
--- old/kdepim-runtime-4.7.3/accountwizard/accountwizard.desktop 2011-10-02 15:24:50.000000000 +0200
+++ new/kdepim-runtime-4.7.4/accountwizard/accountwizard.desktop 2011-12-02 00:25:44.000000000 +0100
@@ -35,6 +35,7 @@
Name[sr@ijekavianlatin]=Čarobnjak za naloge
Name[sr@latin]=Čarobnjak za naloge
Name[sv]=Kontoguide
+Name[tr]=Hesap Sihirbazı
Name[ug]=زىيارەت يېتەكچىسى
Name[uk]=Майстер облікових записів
Name[x-test]=xxAccount Wizardxx
@@ -73,6 +74,7 @@
Comment[sr@ijekavianlatin]=Pokrenite čarobnjak da podesite PIM naloge.
Comment[sr@latin]=Pokrenite čarobnjak da podesite PIM naloge.
Comment[sv]=Starta kontoguiden för att anpassa konton för personlig informationshantering.
+Comment[tr]=PIM hesaplarını düzenlemek için hesap sihirbazını başlat.
Comment[uk]=Запустити майстер облікових записів для налаштування.
Comment[x-test]=xxLaunch the account wizard to configure PIM accounts.xx
Comment[zh_CN]=调用账户向导配置个人信息账户。
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/agents/calendarsearch/calendarsearchagent.desktop new/kdepim-runtime-4.7.4/agents/calendarsearch/calendarsearchagent.desktop
--- old/kdepim-runtime-4.7.3/agents/calendarsearch/calendarsearchagent.desktop 2011-10-02 15:24:48.000000000 +0200
+++ new/kdepim-runtime-4.7.4/agents/calendarsearch/calendarsearchagent.desktop 2011-12-02 00:25:44.000000000 +0100
@@ -31,6 +31,7 @@
Name[sr@ijekavianlatin]=Agent pretrage kalendara
Name[sr@latin]=Agent pretrage kalendara
Name[sv]=Modul för kalendersökning
+Name[tr]=Takvim Arama Programı
Name[uk]=Агент пошуку у календарі
Name[x-test]=xxCalendar Search Agentxx
Name[zh_CN]=日历搜索代理
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/agents/invitations/invitationsagent.desktop new/kdepim-runtime-4.7.4/agents/invitations/invitationsagent.desktop
--- old/kdepim-runtime-4.7.3/agents/invitations/invitationsagent.desktop 2011-10-28 09:43:28.000000000 +0200
+++ new/kdepim-runtime-4.7.4/agents/invitations/invitationsagent.desktop 2011-12-02 00:25:44.000000000 +0100
@@ -28,6 +28,7 @@
Name[sr@ijekavianlatin]=Agent otpremanja pozivnica
Name[sr@latin]=Agent otpremanja pozivnica
Name[sv]=Modul för inbjudningssändning
+Name[tr]=Davetiye Dağıtıcı Programı
Name[uk]=Агент розподілу запрошень
Name[x-test]=xxInvitations Dispatcher Agentxx
Name[zh_CN]=邀请签发代理
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/agents/maildispatcher/akonadi_maildispatcher_agent.notifyrc new/kdepim-runtime-4.7.4/agents/maildispatcher/akonadi_maildispatcher_agent.notifyrc
--- old/kdepim-runtime-4.7.3/agents/maildispatcher/akonadi_maildispatcher_agent.notifyrc 2011-10-02 15:24:50.000000000 +0200
+++ new/kdepim-runtime-4.7.4/agents/maildispatcher/akonadi_maildispatcher_agent.notifyrc 2011-12-02 00:25:44.000000000 +0100
@@ -33,6 +33,7 @@
Comment[sr@ijekavianlatin]=KDE klijent e‑pošte
Comment[sr@latin]=KDE klijent e‑pošte
Comment[sv]=KDE E-postklient
+Comment[tr]=KDE e-posta istemcisi
Comment[uk]=Поштовий клієнт KDE
Comment[x-test]=xxKDE e-mail clientxx
Comment[zh_CN]=KDE 邮件客户端
@@ -70,6 +71,7 @@
Name[sr@ijekavianlatin]=KDE pošta
Name[sr@latin]=KDE pošta
Name[sv]=KDE:s e-postprogram
+Name[tr]=KDE E-Posta
Name[uk]=Пошта KDE
Name[x-test]=xxKDE Mailxx
Name[zh_CN]=KDE 电子邮件
@@ -108,6 +110,7 @@
Name[sr@ijekavianlatin]=E‑pošta je uspešno poslata
Name[sr@latin]=E‑pošta je uspešno poslata
Name[sv]=E-post skickad med lyckat resultat
+Name[tr]=E-posta başarıyla gönderildi
Name[ug]=ئېلخەت مۇۋەپپەقىيەتلىك يوللاندى
Name[uk]=Пошту успішно надіслано
Name[x-test]=xxE-mail successfully sentxx
@@ -148,6 +151,7 @@
Name[sr@ijekavianlatin]=Slanje e‑pošte nije uspelo
Name[sr@latin]=Slanje e‑pošte nije uspelo
Name[sv]=Misslyckades skicka brev
+Name[tr]=E-posta gönderimi başarısız oldu
Name[uk]=Спроба надсилання повідомлення зазнала невдачі
Name[x-test]=xxE-mail sending failedxx
Name[zh_TW]=傳送信件失敗
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/agents/newmailnotifier/newmailnotifieragent.desktop new/kdepim-runtime-4.7.4/agents/newmailnotifier/newmailnotifieragent.desktop
--- old/kdepim-runtime-4.7.3/agents/newmailnotifier/newmailnotifieragent.desktop 2011-10-02 15:24:50.000000000 +0200
+++ new/kdepim-runtime-4.7.4/agents/newmailnotifier/newmailnotifieragent.desktop 2011-12-02 00:25:44.000000000 +0100
@@ -30,6 +30,7 @@
Name[sr@ijekavianlatin]=Izveštavač o pristigloj e‑pošti
Name[sr@latin]=Izveštavač o pristigloj e‑pošti
Name[sv]=Ny brevunderrättelse
+Name[tr]=Yeni E-posta Bildirimi
Name[uk]=Сповіщувач про нові повідомлення
Name[x-test]=xxNew Email Notifierxx
Name[zh_TW]=新郵件通知器
@@ -63,6 +64,7 @@
Comment[sr@ijekavianlatin]=Obaveštenja o nedavno pristigloj e‑pošti
Comment[sr@latin]=Obaveštenja o nedavno pristigloj e‑pošti
Comment[sv]=Underrättelser om nyss mottagen e-post
+Comment[tr]=Yeni gelen e-postalar için bildirimler
Comment[uk]=Сповіщення щодо щойно отриманих повідомлень
Comment[x-test]=xxNotifications about newly received emailsxx
Comment[zh_TW]=收到新郵件的通知
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/defaultsetup/defaultcalendar-ce.desktop new/kdepim-runtime-4.7.4/defaultsetup/defaultcalendar-ce.desktop
--- old/kdepim-runtime-4.7.3/defaultsetup/defaultcalendar-ce.desktop 2011-10-28 09:43:28.000000000 +0200
+++ new/kdepim-runtime-4.7.4/defaultsetup/defaultcalendar-ce.desktop 2011-12-02 00:25:44.000000000 +0100
@@ -8,6 +8,7 @@
Name[de]=Persönlicher Kalender
Name[el]=Προσωπικό ημερολόγιο
Name[es]=Calendario personal
+Name[et]=Isiklik kalender
Name[fr]=Agenda personnel
Name[ia]=Calendario Personal
Name[it]=Calendario personale
@@ -26,6 +27,7 @@
Name[sr@ijekavianlatin]=Lični kalendar
Name[sr@latin]=Lični kalendar
Name[sv]=Personlig kalender
+Name[tr]=Kişisel Takvim
Name[uk]=Особистий календар
Name[x-test]=xxPersonal Calendarxx
Name[zh_TW]=個人行事曆
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/defaultsetup/defaultcalendar.desktop new/kdepim-runtime-4.7.4/defaultsetup/defaultcalendar.desktop
--- old/kdepim-runtime-4.7.3/defaultsetup/defaultcalendar.desktop 2011-10-28 09:43:28.000000000 +0200
+++ new/kdepim-runtime-4.7.4/defaultsetup/defaultcalendar.desktop 2011-12-02 00:25:44.000000000 +0100
@@ -8,6 +8,7 @@
Name[de]=Persönlicher Kalender
Name[el]=Προσωπικό ημερολόγιο
Name[es]=Calendario personal
+Name[et]=Isiklik kalender
Name[fr]=Agenda personnel
Name[ia]=Calendario Personal
Name[it]=Calendario personale
@@ -26,6 +27,7 @@
Name[sr@ijekavianlatin]=Lični kalendar
Name[sr@latin]=Lični kalendar
Name[sv]=Personlig kalender
+Name[tr]=Kişisel Takvim
Name[uk]=Особистий календар
Name[x-test]=xxPersonal Calendarxx
Name[zh_TW]=個人行事曆
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/migration/kmail/kmailmigrator.cpp new/kdepim-runtime-4.7.4/migration/kmail/kmailmigrator.cpp
--- old/kdepim-runtime-4.7.3/migration/kmail/kmailmigrator.cpp 2011-10-28 09:43:28.000000000 +0200
+++ new/kdepim-runtime-4.7.4/migration/kmail/kmailmigrator.cpp 2011-12-02 00:25:44.000000000 +0100
@@ -80,7 +80,9 @@
changing too. */
enum MboxLocking { Procmail, MuttDotLock, MuttDotLockPrivileged, MboxNone };
+#ifdef SPECIALCOLLECTION_TAKEOVER
#define SPECIALCOLLECTIONS_LOCK_SERVICE QLatin1String( "org.kde.pim.SpecialCollections" )
+#endif
static MixedMaildirStore *createStoreFromBasePath( const QString &basePath )
{
@@ -997,6 +999,7 @@
resourceGroup.writeEntry( "CheckOnStartup", false );
resourceGroup.writeEntry( "OfflineOnShutdown", false );
+#ifdef SPECIALCOLLECTION_TAKEOVER
const bool specialCollectionsLock =
QDBusConnection::sessionBus().registerService( SPECIALCOLLECTIONS_LOCK_SERVICE );
@@ -1020,9 +1023,11 @@
defaultInstanceName = defaultInstance.name();
}
}
+#endif
const QString instanceName = i18n("KMail Folders");
+#ifdef SPECIALCOLLECTION_TAKEOVER
if ( defaultInstanceName.isEmpty() && specialCollectionsLock ) {
specialMailCollectionsGroup.writeEntry( QLatin1String( "DefaultResourceId" ), defaultResourceId );
specialMailCollectionsGroup.sync();
@@ -1041,6 +1046,7 @@
if ( specialCollectionsLock ){
QDBusConnection::sessionBus().unregisterService( SPECIALCOLLECTIONS_LOCK_SERVICE );
}
+#endif
instance.setName( instanceName );
emit status( instanceName );
@@ -1082,6 +1088,7 @@
resource.reconfigure();
if ( error.isEmpty() ) {
+#ifdef SPECIALCOLLECTION_TAKEOVER
KConfigGroup config( KGlobal::config(), QLatin1String( "SpecialMailCollections" ) );
if ( config.readEntry( QLatin1String( "TakeOverIfDefaultIsTotallyEmpty" ), false ) ) {
KConfig specialMailCollectionsConfig( QLatin1String( "specialmailcollectionsrc" ) );
@@ -1101,6 +1108,7 @@
return;
}
}
+#endif
mCurrentInstance = AgentInstance();
@@ -1308,6 +1316,7 @@
void KMailMigrator::specialColDefaultResourceCheckFinished( const AgentInstance &instance )
{
+#ifdef SPECIALCOLLECTION_TAKEOVER
KConfig specialMailCollectionsConfig( QLatin1String( "specialmailcollectionsrc" ) );
KConfigGroup specialMailCollectionsGroup = specialMailCollectionsConfig.group( QLatin1String( "SpecialCollections" ) );
@@ -1339,6 +1348,7 @@
emit message( Success, i18n( "Local folders migrated successfully." ) );
emit status( QString() );
migrationDone();
+#endif
}
QString KMailMigrator::importPassword(const QString &aStr)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/migration/kmail/main.cpp new/kdepim-runtime-4.7.4/migration/kmail/main.cpp
--- old/kdepim-runtime-4.7.3/migration/kmail/main.cpp 2011-10-02 15:24:50.000000000 +0200
+++ new/kdepim-runtime-4.7.4/migration/kmail/main.cpp 2011-12-02 00:25:44.000000000 +0100
@@ -95,5 +95,10 @@
const int result = app->exec();
if ( InfoDialog::hasError() )
return 3;
+
+ // if we have succeeded, update version information
+ migrationCfg.writeEntry( "Version", targetVersion );
+ migrationCfg.sync();
+
return result;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/resources/akonotes/akonotesresource.desktop new/kdepim-runtime-4.7.4/resources/akonotes/akonotesresource.desktop
--- old/kdepim-runtime-4.7.3/resources/akonotes/akonotesresource.desktop 2011-10-02 15:24:50.000000000 +0200
+++ new/kdepim-runtime-4.7.4/resources/akonotes/akonotesresource.desktop 2011-12-02 00:25:44.000000000 +0100
@@ -32,6 +32,7 @@
Name[sr@ijekavianlatin]=Ako‑bilješke
Name[sr@latin]=Ako‑beleške
Name[sv]=Ako-anteckningar
+Name[tr]=AkoNot
Name[uk]=Нотатки
Name[x-test]=xxAkoNotesxx
Name[zh_CN]=AkoNotes
@@ -67,6 +68,7 @@
Comment[sr@ijekavianlatin]=Učitava hijerarhiju bilješki iz lokalne maildir fascikle
Comment[sr@latin]=Učitava hijerarhiju beleški iz lokalne maildir fascikle
Comment[sv]=Laddar en anteckningshierarki från en lokal maildir-katalog
+Comment[tr]=Yerel bir maildir klasöründen not hiyerarşisini yükler
Comment[uk]=Завантажує ієрархію нотаток з локальної теки maildir
Comment[x-test]=xxLoads a notes hierarchy from a local maildir folderxx
Comment[zh_CN]=从本地 maildir 文件夹中载入层次型便笺
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/resources/dav/common/davmanager.cpp new/kdepim-runtime-4.7.4/resources/dav/common/davmanager.cpp
--- old/kdepim-runtime-4.7.3/resources/dav/common/davmanager.cpp 2011-10-02 15:24:50.000000000 +0200
+++ new/kdepim-runtime-4.7.4/resources/dav/common/davmanager.cpp 2011-12-02 00:25:44.000000000 +0100
@@ -83,6 +83,8 @@
KIO::DavJob* DavManager::createPropPatchJob( const KUrl &url, const QDomDocument &document ) const
{
KIO::DavJob *job = KIO::davPropPatch( url, document, KIO::HideProgressInfo | KIO::DefaultFlags );
+ const QString header = "Content-Type: text/xml";
+ job->addMetaData( "customHTTPHeader", header );
job->addMetaData( "cookies", "none" );
job->addMetaData( "no-auth-prompt", "true" );
return job;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/resources/dav/protocols/caldavprotocol.cpp new/kdepim-runtime-4.7.4/resources/dav/protocols/caldavprotocol.cpp
--- old/kdepim-runtime-4.7.3/resources/dav/protocols/caldavprotocol.cpp 2011-10-02 15:24:50.000000000 +0200
+++ new/kdepim-runtime-4.7.4/resources/dav/protocols/caldavprotocol.cpp 2011-12-02 00:25:44.000000000 +0100
@@ -32,6 +32,7 @@
* <calendar-query>
* <prop>
* <getetag/>
+ * <resourcetype/>
* </prop>
* <filter>
* <comp-filter name="VCALENDAR">
@@ -52,6 +53,9 @@
QDomElement getetagElement = document.createElementNS( "DAV:", "getetag" );
propElement.appendChild( getetagElement );
+ QDomElement getRTypeElement = document.createElementNS( "DAV:", "resourcetype" );
+ propElement.appendChild( getRTypeElement );
+
QDomElement filterElement = document.createElementNS( "urn:ietf:params:xml:ns:caldav", "filter" );
queryElement.appendChild( filterElement );
@@ -77,6 +81,7 @@
* <calendar-query>
* <prop>
* <getetag/>
+ * <resourcetype/>
* </prop>
* <filter>
* <comp-filter name="VCALENDAR">
@@ -97,6 +102,9 @@
QDomElement getetagElement = document.createElementNS( "DAV:", "getetag" );
propElement.appendChild( getetagElement );
+ QDomElement getRTypeElement = document.createElementNS( "DAV:", "resourcetype" );
+ propElement.appendChild( getRTypeElement );
+
QDomElement filterElement = document.createElementNS( "urn:ietf:params:xml:ns:caldav", "filter" );
queryElement.appendChild( filterElement );
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/resources/dav/resource/davgroupwareprovider.desktop new/kdepim-runtime-4.7.4/resources/dav/resource/davgroupwareprovider.desktop
--- old/kdepim-runtime-4.7.3/resources/dav/resource/davgroupwareprovider.desktop 2011-10-02 15:24:50.000000000 +0200
+++ new/kdepim-runtime-4.7.4/resources/dav/resource/davgroupwareprovider.desktop 2011-12-02 00:25:44.000000000 +0100
@@ -27,6 +27,7 @@
Name[sr@ijekavianlatin]=Dobavljač grupverskih DAV resursa
Name[sr@latin]=Dobavljač grupverskih DAV resursa
Name[sv]=Leverantör av DAV-grupprogramresurs
+Name[tr]=DAV Groupware kaynak sağlayıcı
Name[uk]=Надавач ресурсу групової роботи DAV
Name[x-test]=xxDAV Groupware resource providerxx
Name[zh_TW]=DAV 群組資源提供者
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/resources/dav/resource/davgroupwareresource.desktop new/kdepim-runtime-4.7.4/resources/dav/resource/davgroupwareresource.desktop
--- old/kdepim-runtime-4.7.3/resources/dav/resource/davgroupwareresource.desktop 2011-10-02 15:24:50.000000000 +0200
+++ new/kdepim-runtime-4.7.4/resources/dav/resource/davgroupwareresource.desktop 2011-12-02 00:25:44.000000000 +0100
@@ -30,6 +30,7 @@
Name[sr@ijekavianlatin]=Grupverski DAV resurs
Name[sr@latin]=Grupverski DAV resurs
Name[sv]=DAV-grupprogramresurs
+Name[tr]=DAV groupware kaynağı
Name[uk]=Ресурс групової роботи DAV
Name[x-test]=xxDAV groupware resourcexx
Name[zh_CN]=DAV 群件资源
@@ -63,6 +64,7 @@
Comment[sr@ijekavianlatin]=Resurs za upravljanje DAV kalendarima i adresarima (CalDAV, GroupDAV)
Comment[sr@latin]=Resurs za upravljanje DAV kalendarima i adresarima (CalDAV, GroupDAV)
Comment[sv]=Resurs för att hantera DAV-kalendrar och adressböcker (CalDAV, GroupDAV)
+Comment[tr]=DAV takvim ve adres defterlerini yönetmek için kaynak (CalDAV, GroupDAV)
Comment[uk]=Ресурс для керування календарями і адресними книгами DAV (CalDAV, GroupDAV)
Comment[x-test]=xxResource to manage DAV calendars and address books (CalDAV, GroupDAV)xx
Comment[zh_CN]=管理 DAV 日历和地址簿的资源(CalDAV、GroupDAV)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/resources/dav/services/citadel.desktop new/kdepim-runtime-4.7.4/resources/dav/services/citadel.desktop
--- old/kdepim-runtime-4.7.3/resources/dav/services/citadel.desktop 2011-10-02 15:24:50.000000000 +0200
+++ new/kdepim-runtime-4.7.4/resources/dav/services/citadel.desktop 2011-12-02 00:25:44.000000000 +0100
@@ -28,6 +28,7 @@
Name[sr@ijekavianlatin]=Citadela
Name[sr@latin]=Citadela
Name[sv]=Citadel
+Name[tr]=Citadel
Name[uk]=Citadel
Name[x-test]=xxCitadelxx
Name[zh_TW]=Citadel
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/resources/dav/services/davical.desktop new/kdepim-runtime-4.7.4/resources/dav/services/davical.desktop
--- old/kdepim-runtime-4.7.3/resources/dav/services/davical.desktop 2011-10-02 15:24:50.000000000 +0200
+++ new/kdepim-runtime-4.7.4/resources/dav/services/davical.desktop 2011-12-02 00:25:44.000000000 +0100
@@ -28,6 +28,7 @@
Name[sr@ijekavianlatin]=DAViCal
Name[sr@latin]=DAViCal
Name[sv]=Davical
+Name[tr]=Davical
Name[uk]=Davical
Name[x-test]=xxDavicalxx
Name[zh_TW]=Davical
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/resources/dav/services/egroupware.desktop new/kdepim-runtime-4.7.4/resources/dav/services/egroupware.desktop
--- old/kdepim-runtime-4.7.3/resources/dav/services/egroupware.desktop 2011-10-02 15:24:50.000000000 +0200
+++ new/kdepim-runtime-4.7.4/resources/dav/services/egroupware.desktop 2011-12-02 00:25:44.000000000 +0100
@@ -28,6 +28,7 @@
Name[sr@ijekavianlatin]=EGroupware
Name[sr@latin]=EGroupware
Name[sv]=eGroupware
+Name[tr]=eGroupware
Name[uk]=eGroupware
Name[x-test]=xxeGroupwarexx
Name[zh_TW]=eGroupware
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/resources/dav/services/opengroupware.desktop new/kdepim-runtime-4.7.4/resources/dav/services/opengroupware.desktop
--- old/kdepim-runtime-4.7.3/resources/dav/services/opengroupware.desktop 2011-10-02 15:24:50.000000000 +0200
+++ new/kdepim-runtime-4.7.4/resources/dav/services/opengroupware.desktop 2011-12-02 00:25:44.000000000 +0100
@@ -28,6 +28,7 @@
Name[sr@ijekavianlatin]=OpenGroupware
Name[sr@latin]=OpenGroupware
Name[sv]=OpenGroupware
+Name[tr]=OpenGroupware
Name[uk]=OpenGroupware
Name[x-test]=xxOpenGroupwarexx
Name[zh_TW]=OpenGroupware
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/resources/dav/services/scalix.desktop new/kdepim-runtime-4.7.4/resources/dav/services/scalix.desktop
--- old/kdepim-runtime-4.7.3/resources/dav/services/scalix.desktop 2011-10-02 15:24:50.000000000 +0200
+++ new/kdepim-runtime-4.7.4/resources/dav/services/scalix.desktop 2011-12-02 00:25:44.000000000 +0100
@@ -28,6 +28,7 @@
Name[sr@ijekavianlatin]=Scalix
Name[sr@latin]=Scalix
Name[sv]=Scalix
+Name[tr]=Scalix
Name[uk]=Scalix
Name[x-test]=xxScalixxx
Name[zh_TW]=Scalix
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/resources/dav/services/sogo.desktop new/kdepim-runtime-4.7.4/resources/dav/services/sogo.desktop
--- old/kdepim-runtime-4.7.3/resources/dav/services/sogo.desktop 2011-10-02 15:24:50.000000000 +0200
+++ new/kdepim-runtime-4.7.4/resources/dav/services/sogo.desktop 2011-12-02 00:25:44.000000000 +0100
@@ -28,6 +28,7 @@
Name[sr@ijekavianlatin]=ScalableOGo
Name[sr@latin]=ScalableOGo
Name[sv]=ScalableOGo
+Name[tr]=ScalableOGo
Name[uk]=ScalableOGo
Name[x-test]=xxScalableOGoxx
Name[zh_TW]=ScalableOGo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/resources/dav/services/yahoo.desktop new/kdepim-runtime-4.7.4/resources/dav/services/yahoo.desktop
--- old/kdepim-runtime-4.7.3/resources/dav/services/yahoo.desktop 2011-10-02 15:24:50.000000000 +0200
+++ new/kdepim-runtime-4.7.4/resources/dav/services/yahoo.desktop 2011-12-02 00:25:44.000000000 +0100
@@ -28,6 +28,7 @@
Name[sr@ijekavianlatin]=Yahoo
Name[sr@latin]=Yahoo
Name[sv]=Yahoo!
+Name[tr]=Yahoo!
Name[ug]=Yahoo!
Name[uk]=Yahoo!
Name[x-test]=xxYahoo!xx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/resources/dav/services/zarafa.desktop new/kdepim-runtime-4.7.4/resources/dav/services/zarafa.desktop
--- old/kdepim-runtime-4.7.3/resources/dav/services/zarafa.desktop 2011-10-02 15:24:50.000000000 +0200
+++ new/kdepim-runtime-4.7.4/resources/dav/services/zarafa.desktop 2011-12-02 00:25:44.000000000 +0100
@@ -28,6 +28,7 @@
Name[sr@ijekavianlatin]=Zarafa
Name[sr@latin]=Zarafa
Name[sv]=Zarafa
+Name[tr]=Zarafa
Name[uk]=Zarafa
Name[x-test]=xxZarafaxx
Name[zh_TW]=Zarafa
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/resources/dav/services/zimbra.desktop new/kdepim-runtime-4.7.4/resources/dav/services/zimbra.desktop
--- old/kdepim-runtime-4.7.3/resources/dav/services/zimbra.desktop 2011-10-02 15:24:50.000000000 +0200
+++ new/kdepim-runtime-4.7.4/resources/dav/services/zimbra.desktop 2011-12-02 00:25:44.000000000 +0100
@@ -28,6 +28,7 @@
Name[sr@ijekavianlatin]=Zimbra
Name[sr@latin]=Zimbra
Name[sv]=Zimbra
+Name[tr]=Zimbra
Name[uk]=Zimbra
Name[x-test]=xxZimbraxx
Name[zh_TW]=Zimbra
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/resources/imap/imapresource.cpp new/kdepim-runtime-4.7.4/resources/imap/imapresource.cpp
--- old/kdepim-runtime-4.7.3/resources/imap/imapresource.cpp 2011-10-02 15:24:50.000000000 +0200
+++ new/kdepim-runtime-4.7.4/resources/imap/imapresource.cpp 2011-12-02 00:25:44.000000000 +0100
@@ -147,6 +147,7 @@
Settings::self(); // make sure the D-Bus settings interface is up
new ResourceAdaptor( this );
+ setNeedsNetwork( needsNetwork() );
}
ImapResource::~ImapResource()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/resources/imap/imapresource.desktop new/kdepim-runtime-4.7.4/resources/imap/imapresource.desktop
--- old/kdepim-runtime-4.7.3/resources/imap/imapresource.desktop 2011-10-02 15:24:50.000000000 +0200
+++ new/kdepim-runtime-4.7.4/resources/imap/imapresource.desktop 2011-12-02 00:25:44.000000000 +0100
@@ -77,6 +77,7 @@
Comment[sr@ijekavianlatin]=Povezuje se na IMAP server e‑pošte
Comment[sr@latin]=Povezuje se na IMAP server e‑pošte
Comment[sv]=Ansluter till en IMAP e-postserver
+Comment[tr]=IMAP e-posta sunucusuna bağlanır
Comment[uk]=Встановлює з’єднання з поштовим сервером IMAP
Comment[x-test]=xxConnects to an IMAP e-mail serverxx
Comment[zh_CN]=连接到 IMAP 电子邮件服务器
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/resources/imap/sessionpool.cpp new/kdepim-runtime-4.7.4/resources/imap/sessionpool.cpp
--- old/kdepim-runtime-4.7.3/resources/imap/sessionpool.cpp 2011-10-02 15:24:50.000000000 +0200
+++ new/kdepim-runtime-4.7.4/resources/imap/sessionpool.cpp 2011-12-02 00:25:44.000000000 +0100
@@ -150,7 +150,7 @@
void SessionPool::releaseSession( KIMAP::Session *session )
{
- if ( m_reservedPool.contains( session ) ) {
+ if ( !m_reservedPool.isEmpty() && m_reservedPool.contains( session ) ) {
m_reservedPool.removeAll( session );
m_idlePool << session;
}
@@ -204,9 +204,11 @@
emit connectDone();
} else {
m_reservedPool << session;
- emit sessionRequestDone( m_pendingRequests.takeFirst(), session );
if ( !m_pendingRequests.isEmpty() ) {
- QTimer::singleShot( 0, this, SLOT(processPendingRequests()) );
+ emit sessionRequestDone( m_pendingRequests.takeFirst(), session );
+ if ( !m_pendingRequests.isEmpty() ) {
+ QTimer::singleShot( 0, this, SLOT(processPendingRequests()) );
+ }
}
}
}
@@ -224,9 +226,11 @@
killSession( session, LogoutSession );
} else {
killSession( session, LogoutSession );
- emit sessionRequestDone( m_pendingRequests.takeFirst(), 0, errorCode, errorMessage );
if ( !m_pendingRequests.isEmpty() ) {
- QTimer::singleShot( 0, this, SLOT(processPendingRequests()) );
+ emit sessionRequestDone( m_pendingRequests.takeFirst(), 0, errorCode, errorMessage );
+ if ( !m_pendingRequests.isEmpty() ) {
+ QTimer::singleShot( 0, this, SLOT(processPendingRequests()) );
+ }
}
}
}
@@ -237,24 +241,26 @@
// We have a session ready to give out
KIMAP::Session *session = m_idlePool.takeFirst();
m_reservedPool << session;
- emit sessionRequestDone( m_pendingRequests.takeFirst(), session );
-
if ( !m_pendingRequests.isEmpty() ) {
- QTimer::singleShot( 0, this, SLOT(processPendingRequests()) );
+ emit sessionRequestDone( m_pendingRequests.takeFirst(), session );
+ if ( !m_pendingRequests.isEmpty() ) {
+ QTimer::singleShot( 0, this, SLOT(processPendingRequests()) );
+ }
}
-
} else if ( m_idlePool.size() + m_reservedPool.size() < m_maxPoolSize ) {
// We didn't reach the max pool size yet so create a new one
m_passwordRequester->requestPassword();
} else {
// No session available, and max pool size reached
- emit sessionRequestDone( m_pendingRequests.takeFirst(), 0, NoAvailableSessionError,
- i18n( "Could not create another extra connection to the IMAP-server %1.",
- m_account->server() ) );
-
if ( !m_pendingRequests.isEmpty() ) {
- QTimer::singleShot( 0, this, SLOT(processPendingRequests()) );
+ emit sessionRequestDone(
+ m_pendingRequests.takeFirst(), 0, NoAvailableSessionError,
+ i18n( "Could not create another extra connection to the IMAP-server %1.",
+ m_account->server() ) );
+ if ( !m_pendingRequests.isEmpty() ) {
+ QTimer::singleShot( 0, this, SLOT(processPendingRequests()) );
+ }
}
}
}
@@ -372,10 +378,14 @@
KIMAP::CapabilitiesJob *capJob = qobject_castKIMAP::CapabilitiesJob*( job );
if ( job->error() ) {
+ QString server;
+ if ( m_account ) {
+ server = m_account->server();
+ }
cancelSessionCreation( capJob->session(),
CapabilitiesTestError,
i18n( "Could not test the capabilities supported by the IMAP server %1.",
- m_account->server() ) );
+ server ) );
return;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/resources/imap/wizard/imapwizard.desktop new/kdepim-runtime-4.7.4/resources/imap/wizard/imapwizard.desktop
--- old/kdepim-runtime-4.7.3/resources/imap/wizard/imapwizard.desktop 2011-10-02 15:24:50.000000000 +0200
+++ new/kdepim-runtime-4.7.4/resources/imap/wizard/imapwizard.desktop 2011-12-02 00:25:44.000000000 +0100
@@ -33,6 +33,7 @@
Name[sr@ijekavianlatin]=Generički IMAP server e‑pošte
Name[sr@latin]=Generički IMAP server e‑pošte
Name[sv]=Generell IMAP e-postserver
+Name[tr]=Genel IMAP E-posta Sunucu
Name[uk]=Типовий сервер пошти IMAP
Name[x-test]=xxGeneric IMAP Email Serverxx
Name[zh_CN]=普通 IMAP 电子邮件服务器
@@ -73,6 +74,7 @@
Comment[sr@ijekavianlatin]=IMAP nalog
Comment[sr@latin]=IMAP nalog
Comment[sv]=Imap-konto
+Comment[tr]=Imap hesabı
Comment[uk]=Обліковий запис IMAP
Comment[x-test]=xxImap accountxx
Comment[zh_CN]=IMAP 账户
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/resources/kdeaccounts/kdeaccountsresource.desktop new/kdepim-runtime-4.7.4/resources/kdeaccounts/kdeaccountsresource.desktop
--- old/kdepim-runtime-4.7.3/resources/kdeaccounts/kdeaccountsresource.desktop 2011-10-02 15:24:49.000000000 +0200
+++ new/kdepim-runtime-4.7.4/resources/kdeaccounts/kdeaccountsresource.desktop 2011-12-02 00:25:44.000000000 +0100
@@ -35,6 +35,7 @@
Name[sr@ijekavianlatin]=KDE nalozi
Name[sr@latin]=KDE nalozi
Name[sv]=KDE-konton
+Name[tr]=KDE Hesapları
Name[ug]=KDE ھېساباتى
Name[uk]=Облікові записи KDE
Name[x-test]=xxKDE Accountsxx
@@ -74,6 +75,7 @@
Comment[sr@ijekavianlatin]=Učitava kontakte iz fajla KDE naloga
Comment[sr@latin]=Učitava kontakte iz fajla KDE naloga
Comment[sv]=Laddar kontakter från KDE:s kontofil
+Comment[tr]=KDE hesap dosyasından kişileri yükler
Comment[uk]=Завантаження контактів з файла облікових записів KDE
Comment[x-test]=xxLoads contacts from the KDE accounts filexx
Comment[zh_CN]=从 KDE 账户文件中装入联系人
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/resources/kolabproxy/wizard/kolabwizard.desktop new/kdepim-runtime-4.7.4/resources/kolabproxy/wizard/kolabwizard.desktop
--- old/kdepim-runtime-4.7.3/resources/kolabproxy/wizard/kolabwizard.desktop 2011-10-02 15:24:50.000000000 +0200
+++ new/kdepim-runtime-4.7.4/resources/kolabproxy/wizard/kolabwizard.desktop 2011-12-02 00:25:44.000000000 +0100
@@ -75,6 +75,7 @@
Comment[sr@ijekavianlatin]=Kolabov grupverski server
Comment[sr@latin]=Kolabov grupverski server
Comment[sv]=Kolab grupprogramserver
+Comment[tr]=Kolab Groupware Sunucusu
Comment[uk]=Сервер групової роботи Kolab
Comment[x-test]=xxKolab Groupware Serverxx
Comment[zh_CN]=Kolab 群件服务器
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/resources/maildir/wizard/maildirwizard.desktop new/kdepim-runtime-4.7.4/resources/maildir/wizard/maildirwizard.desktop
--- old/kdepim-runtime-4.7.3/resources/maildir/wizard/maildirwizard.desktop 2011-10-02 15:24:50.000000000 +0200
+++ new/kdepim-runtime-4.7.4/resources/maildir/wizard/maildirwizard.desktop 2011-12-02 00:25:44.000000000 +0100
@@ -84,6 +84,7 @@
Comment[sr@ijekavianlatin]=Maildir nalog
Comment[sr@latin]=Maildir nalog
Comment[sv]=Maildir-konto
+Comment[tr]=Maildir hesabı
Comment[uk]=Обліковий запис Maildir
Comment[x-test]=xxMaildir accountxx
Comment[zh_CN]=Maildir 账户
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/resources/mbox/wizard/mailboxwizard.desktop new/kdepim-runtime-4.7.4/resources/mbox/wizard/mailboxwizard.desktop
--- old/kdepim-runtime-4.7.3/resources/mbox/wizard/mailboxwizard.desktop 2011-10-02 15:24:50.000000000 +0200
+++ new/kdepim-runtime-4.7.4/resources/mbox/wizard/mailboxwizard.desktop 2011-12-02 00:25:44.000000000 +0100
@@ -34,6 +34,7 @@
Name[sr@ijekavianlatin]=Mbox
Name[sr@latin]=Mbox
Name[sv]=Mailbox
+Name[tr]=MailBox
Name[ug]=خەت ساندۇقى
Name[uk]=MailBox
Name[x-test]=xxMailBoxxx
@@ -74,6 +75,7 @@
Comment[sr@ijekavianlatin]=Mbox nalog
Comment[sr@latin]=Mbox nalog
Comment[sv]=Mailbox-konto
+Comment[tr]=Mailbox hesabı
Comment[uk]=Обліковий запис Mailbox
Comment[x-test]=xxMailbox accountxx
Comment[zh_CN]=MailBox 账户
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/resources/mixedmaildir/mixedmaildirresource.desktop new/kdepim-runtime-4.7.4/resources/mixedmaildir/mixedmaildirresource.desktop
--- old/kdepim-runtime-4.7.3/resources/mixedmaildir/mixedmaildirresource.desktop 2011-10-02 15:24:50.000000000 +0200
+++ new/kdepim-runtime-4.7.4/resources/mixedmaildir/mixedmaildirresource.desktop 2011-12-02 00:25:44.000000000 +0100
@@ -32,6 +32,7 @@
Name[sr@ijekavianlatin]=Maildir K‑pošte
Name[sr@latin]=Maildir K‑pošte
Name[sv]=Kmail maildir
+Name[tr]=KMail Maildir
Name[uk]=Maildir KMail
Name[x-test]=xxKMail Maildirxx
Name[zh_CN]=KMail Maildir
@@ -68,6 +69,7 @@
Comment[sr@ijekavianlatin]=Učitava podatke iz lokalne K‑poštine maildir fascikle
Comment[sr@latin]=Učitava podatke iz lokalne K‑poštine maildir fascikle
Comment[sv]=Laddar data från en lokal Kmail maildir-katalog
+Comment[tr]=Yerel bir KMail maildir klasöründen verileri yükler
Comment[uk]=Завантажує дані з локальної теки maildir KMail
Comment[x-test]=xxLoads data from a local KMail maildir folderxx
Comment[zh_CN]=从本地 KMail maildir 文件夹中载入数据
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-4.7.3/resources/mixedmaildir/retrieveitemsjob.cpp new/kdepim-runtime-4.7.4/resources/mixedmaildir/retrieveitemsjob.cpp
--- old/kdepim-runtime-4.7.3/resources/mixedmaildir/retrieveitemsjob.cpp 2011-10-02 15:24:49.000000000 +0200
+++ new/kdepim-runtime-4.7.4/resources/mixedmaildir/retrieveitemsjob.cpp 2011-12-02 00:25:44.000000000 +0100
@@ -45,7 +45,7 @@
class RetrieveItemsJob::Private
{
RetrieveItemsJob *const q;
-
+
public:
Private( RetrieveItemsJob *parent, const Collection &collection, MixedMaildirStore *store )
: q( parent ), mCollection( collection ), mStore( store ),
@@ -57,26 +57,27 @@
{
if ( !mTransaction ) {
mTransaction = new TransactionSequence( q );
+ mTransaction->setAutomaticCommittingEnabled( false );
connect( mTransaction, SIGNAL( result( KJob* ) ),
q, SLOT( transactionResult( KJob* ) ) );
}
return mTransaction;
}
-
+
public:
const Collection mCollection;
MixedMaildirStore *const mStore;
TransactionSequence *mTransaction;
-
+
QHash