diff -Nru kdepim-runtime-4.12.95/accountwizard/accountwizard.desktop kdepim-runtime-4.12.97/accountwizard/accountwizard.desktop --- kdepim-runtime-4.12.95/accountwizard/accountwizard.desktop 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/accountwizard/accountwizard.desktop 2014-03-26 07:25:02.000000000 +0000 @@ -53,7 +53,7 @@ Comment=Launch the account wizard to configure PIM accounts. Comment[bs]=Pokreni čarobnjaka za naloge za konfigurisanje PIM naloga. Comment[ca]=Llança l'assistent de comptes per a configurar comptes de PIM. -Comment[ca@valencia]=Llança l'assistent de comptes per configurar comptes de PIM. +Comment[ca@valencia]=Llança l'assistent de comptes per a configurar comptes de PIM. Comment[cs]=Spustit průvodce nastavením PIM účtů. Comment[da]=Start kontoguiden for at konfigurere PIM-konti. Comment[de]=Den Zugangsassistenten zum Einrichten von PIM-Zugängen starten. diff -Nru kdepim-runtime-4.12.95/accountwizard/wizards/tine20/tine20wizard.desktop kdepim-runtime-4.12.97/accountwizard/wizards/tine20/tine20wizard.desktop --- kdepim-runtime-4.12.95/accountwizard/wizards/tine20/tine20wizard.desktop 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/accountwizard/wizards/tine20/tine20wizard.desktop 2014-03-26 07:25:02.000000000 +0000 @@ -2,7 +2,7 @@ Name=Tine 2.0 Groupware Server Name[bs]=Tine 2.0 Groupware Server Name[ca]=Servidor de treball en grup Tine 2.0 -Name[ca@valencia]=Servidor de Groupware Tine 2.0 +Name[ca@valencia]=Servidor de treball en grup Tine 2.0 Name[cs]=Groupware Server Tine 2.0 Name[da]=Tine 2.0 groupware-server Name[de]=Tine 2.0 Groupware-Server @@ -43,7 +43,7 @@ Comment=Tine 2.0 Groupware Server Comment[bs]=Tine 2.0 Groupware Server Comment[ca]=Servidor de treball en grup Tine 2.0 -Comment[ca@valencia]=Servidor de Groupware Tine 2.0 +Comment[ca@valencia]=Servidor de treball en grup Tine 2.0 Comment[cs]=Groupware Server Tine 2.0 Comment[da]=Tine 2.0 groupware-server Comment[de]=Tine 2.0 Groupware-Server diff -Nru kdepim-runtime-4.12.95/agents/akonadinepomukfeederagent.desktop kdepim-runtime-4.12.97/agents/akonadinepomukfeederagent.desktop --- kdepim-runtime-4.12.95/agents/akonadinepomukfeederagent.desktop 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/agents/akonadinepomukfeederagent.desktop 2014-03-26 07:25:02.000000000 +0000 @@ -2,11 +2,12 @@ Name=Akonadi Nepomuk Feeder Name[bs]=Akonadi Nepomuk napajač Name[ca]=Alimentador del Nepomuk per a l'Akonadi -Name[ca@valencia]=Alimentador Nepomuk per l'Akonadi +Name[ca@valencia]=Alimentador del Nepomuk per a l'Akonadi Name[cs]=Akonadi podavač Nepomuku Name[da]=Akonadi Nepomuk-feeder Name[de]=Nepomuk-Modul für Akonadi Name[el]=Τροφοδότης Nepomuk του Akonadi +Name[es]=Alimentador Nepomuk de Akonadi Name[et]=Akonadi Nepomuki söötur Name[fi]=Akonadi Nepomuk Feeder Name[fr]=Connecteur Nepomuk pour Akonadi @@ -28,6 +29,10 @@ Name[ru]=Akonadi Nepomuk Feeder Name[sk]=Kŕmitko Nepomuk Akonadi Name[sl]=Podajalnik za Nepomuk +Name[sr]=Непомуков уводник Аконадија +Name[sr@ijekavian]=Непомуков уводник Аконадија +Name[sr@ijekavianlatin]=Nepomukov uvodnik Akonadija +Name[sr@latin]=Nepomukov uvodnik Akonadija Name[sv]=Akonadi-inmatning till Nepomuk Name[tr]=Akonadi Nepomuk Besleyici Name[uk]=Передавач даних Akonadi Nepomuk diff -Nru kdepim-runtime-4.12.95/agents/maildispatcher/akonadi_maildispatcher_agent.notifyrc kdepim-runtime-4.12.97/agents/maildispatcher/akonadi_maildispatcher_agent.notifyrc --- kdepim-runtime-4.12.95/agents/maildispatcher/akonadi_maildispatcher_agent.notifyrc 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/agents/maildispatcher/akonadi_maildispatcher_agent.notifyrc 2014-03-26 07:25:02.000000000 +0000 @@ -4,7 +4,7 @@ Comment[bg]=Пощенски клиент за KDE Comment[bs]=KDE klijent elektronske pošte Comment[ca]=Client de correu electrònic pel KDE -Comment[ca@valencia]=Client de correu electrònic del KDE +Comment[ca@valencia]=Client de correu electrònic pel KDE Comment[cs]=Klient KDE pro čtení elektronické pošty Comment[da]=KDE e-mail-klient Comment[de]=E-Mail-Programm für KDE diff -Nru kdepim-runtime-4.12.95/agents/migration/migrationagent.desktop kdepim-runtime-4.12.97/agents/migration/migrationagent.desktop --- kdepim-runtime-4.12.95/agents/migration/migrationagent.desktop 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/agents/migration/migrationagent.desktop 2014-03-26 07:25:02.000000000 +0000 @@ -5,6 +5,7 @@ Name[ca@valencia]=Agent de migració Name[da]=Migreringsagent Name[de]=Migrations-Assistent +Name[el]=Πράκτορας μεταφοράς Name[es]=Agente de migración Name[fi]=Siirtoagentti Name[fr]=Agent de migration diff -Nru kdepim-runtime-4.12.95/agents/newmailnotifier/akonadi_newmailnotifier_agent.notifyrc kdepim-runtime-4.12.97/agents/newmailnotifier/akonadi_newmailnotifier_agent.notifyrc --- kdepim-runtime-4.12.95/agents/newmailnotifier/akonadi_newmailnotifier_agent.notifyrc 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/agents/newmailnotifier/akonadi_newmailnotifier_agent.notifyrc 2014-03-26 07:25:02.000000000 +0000 @@ -136,6 +136,7 @@ Name[ca@valencia]=No s'ha trobat el servei Jovie de text a veu Name[da]=Jovie tekst-til-tale-tjeneste ikke fundet Name[de]=Der Sprachausgabedienstes Jovie wurde nicht gefunden +Name[el]=Η υπηρεσία Jovie Text-to-Speech δε βρέθηκε Name[es]=Servicio de texto a voz Jovie no encontrado Name[fi]=Jovie-puhesyntetisaattoria ei löytynyt Name[fr]=Impossible de trouver le service de synthèse vocale Jovie diff -Nru kdepim-runtime-4.12.95/agents/newmailnotifier/newmailnotifieragent.cpp kdepim-runtime-4.12.97/agents/newmailnotifier/newmailnotifieragent.cpp --- kdepim-runtime-4.12.95/agents/newmailnotifier/newmailnotifieragent.cpp 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/agents/newmailnotifier/newmailnotifieragent.cpp 2014-03-26 07:25:02.000000000 +0000 @@ -285,7 +285,7 @@ for ( QHash< Akonadi::Collection, QList >::iterator it = mNewMails.begin(); it != end; ++it ) { QList idList = it.value(); bool itemFound = false; - Q_FOREACH( Item item, items ) { + Q_FOREACH( const Item &item, items ) { if (idList.contains(item.id())) { idList.removeAll( item.id() ); itemFound = true; @@ -305,7 +305,7 @@ { if (!isActive()) return; - Q_FOREACH (Akonadi::Item item, items) { + Q_FOREACH (const Akonadi::Item &item, items) { QHash< Akonadi::Collection, QList >::iterator end(mNewMails.end()); for ( QHash< Akonadi::Collection, QList >::iterator it = mNewMails.begin(); it != end; ++it ) { QList idList= it.value(); @@ -327,7 +327,7 @@ if (!isActive()) return; - Q_FOREACH (Akonadi::Item item, items) { + Q_FOREACH (const Akonadi::Item &item, items) { Akonadi::MessageStatus status; status.setStatusFromFlags( item.flags() ); if ( status.isRead() || status.isSpam() || status.isIgnored() ) diff -Nru kdepim-runtime-4.12.95/CMakeLists.txt kdepim-runtime-4.12.97/CMakeLists.txt --- kdepim-runtime-4.12.95/CMakeLists.txt 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/CMakeLists.txt 2014-03-26 07:25:02.000000000 +0000 @@ -33,7 +33,7 @@ # 3.2 alpha1 if(NOT DEFINED KDEPIM_RUNTIME_DEV_VERSION) - set(KDEPIM_RUNTIME_DEV_VERSION "beta3") + set(KDEPIM_RUNTIME_DEV_VERSION "rc") endif() set(KDEPIM_RUNTIME_VERSION "4.13${KDEPIM_RUNTIME_DEV_VERSION}") @@ -53,7 +53,7 @@ include(KDE4Defaults) # KdepimLibs -find_package(KdepimLibs 4.12.96) +find_package(KdepimLibs 4.12.97) set_package_properties(KdepimLibs PROPERTIES DESCRIPTION "The KDEPIM libraries" URL "http://www.kde.org" TYPE REQUIRED) #Boost diff -Nru kdepim-runtime-4.12.95/debian/changelog kdepim-runtime-4.12.97/debian/changelog --- kdepim-runtime-4.12.95/debian/changelog 2014-03-23 11:09:56.000000000 +0000 +++ kdepim-runtime-4.12.97/debian/changelog 2014-04-02 09:21:02.000000000 +0000 @@ -1,3 +1,9 @@ +kdepim-runtime (4:4.12.97-0ubuntu1) trusty; urgency=medium + + * New upstream release candidate + + -- Philip Muškovac Wed, 02 Apr 2014 11:21:01 +0200 + kdepim-runtime (4:4.12.95-0ubuntu1) trusty; urgency=medium * New upstream beta release diff -Nru kdepim-runtime-4.12.95/debian/control kdepim-runtime-4.12.97/debian/control --- kdepim-runtime-4.12.95/debian/control 2014-03-23 11:09:56.000000000 +0000 +++ kdepim-runtime-4.12.97/debian/control 2014-04-02 09:21:02.000000000 +0000 @@ -7,7 +7,7 @@ George Kiagiadakis Build-Depends: kde-sc-dev-latest (>= 4:4.10), debhelper (>= 7.3.16), cmake, pkg-kde-tools (>= 0.12), - kdepimlibs5-dev (>= 4:4.12.95), kdelibs5-dev (>= 4:4.12.95), libakonadi-dev (>= 1.8), + kdepimlibs5-dev (>= 4:4.12.97), kdelibs5-dev (>= 4:4.12.97), libakonadi-dev (>= 1.8), libxml2-dev, xsltproc, libstrigiqtdbusclient-dev, libboost1.54-dev (>= 1.40.0-2), libstreamanalyzer-dev, shared-mime-info (>= 0.30), shared-desktop-ontologies (>= 0.10), nepomuk-core-dev, libkolabxml-dev, libkolab-dev (>= 0.2), libkgapi-dev (>= 0.4.3), diff -Nru kdepim-runtime-4.12.95/debian/kdepim-runtime.install kdepim-runtime-4.12.97/debian/kdepim-runtime.install --- kdepim-runtime-4.12.95/debian/kdepim-runtime.install 2014-03-23 11:09:56.000000000 +0000 +++ kdepim-runtime-4.12.97/debian/kdepim-runtime.install 2014-04-02 09:21:02.000000000 +0000 @@ -144,7 +144,7 @@ usr/share/kde4/apps/akonadi/accountwizard/maildir/maildirwizard.es usr/share/kde4/apps/akonadi/accountwizard/maildir/maildirwizard.ui usr/share/kde4/apps/akonadi/accountwizard/pop3/pop3wizard.desktop -usr/share/kde4/apps/akonadi/accountwizard/pop3/pop3wizard.js +usr/share/kde4/apps/akonadi/accountwizard/pop3/pop3wizard.es usr/share/kde4/apps/akonadi/accountwizard/pop3/pop3wizard.ui usr/share/kde4/apps/akonadi/accountwizard/tine20/tine20wizard.desktop usr/share/kde4/apps/akonadi/accountwizard/tine20/tine20wizard.es diff -Nru kdepim-runtime-4.12.95/kcm/kcm_akonadi.desktop kdepim-runtime-4.12.97/kcm/kcm_akonadi.desktop --- kdepim-runtime-4.12.95/kcm/kcm_akonadi.desktop 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/kcm/kcm_akonadi.desktop 2014-03-26 07:25:02.000000000 +0000 @@ -66,7 +66,7 @@ Comment[ar]=ضبط إطار إدارة المعلومات الشخصية اكوندا Comment[bs]=Konfiguracija Akonadi frameworka za upravljanje licnim podacima Comment[ca]=Configuració de l'entorn per a la gestió de la informació personal de l'Akonadi -Comment[ca@valencia]=Configuració de l'entorn de gestió d'informació personal de l'Akonadi +Comment[ca@valencia]=Configuració de l'entorn per a la gestió de la informació personal de l'Akonadi Comment[da]=Konfiguration af Akonadi - framework til håndtering af personlig information (PIM) Comment[de]=Einrichtung des persönlichen Informationsmanagement von Akonadi Comment[el]=Διαμόρφωση του διαχειριστή προσωπικών πληροφοριών Akonadi diff -Nru kdepim-runtime-4.12.95/kcm/kcm_akonadi_resources.desktop kdepim-runtime-4.12.97/kcm/kcm_akonadi_resources.desktop --- kdepim-runtime-4.12.95/kcm/kcm_akonadi_resources.desktop 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/kcm/kcm_akonadi_resources.desktop 2014-03-26 07:25:02.000000000 +0000 @@ -65,7 +65,7 @@ Comment[ar]=ضبط إطار إدارة المعلومات الشخصية اكوندا Comment[bs]=Konfiguracija Akonadi frameworka za upravljanje licnim podacima Comment[ca]=Configuració de l'entorn per a la gestió de la informació personal de l'Akonadi -Comment[ca@valencia]=Configuració de l'entorn de gestió d'informació personal de l'Akonadi +Comment[ca@valencia]=Configuració de l'entorn per a la gestió de la informació personal de l'Akonadi Comment[da]=Konfiguration af Akonadi - framework til håndtering af personlig information (PIM) Comment[de]=Einrichtung des persönlichen Informationsmanagement von Akonadi Comment[el]=Διαμόρφωση του διαχειριστή προσωπικών πληροφοριών Akonadi diff -Nru kdepim-runtime-4.12.95/kresources/kabc/akonadi.desktop kdepim-runtime-4.12.97/kresources/kabc/akonadi.desktop --- kdepim-runtime-4.12.95/kresources/kabc/akonadi.desktop 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/kresources/kabc/akonadi.desktop 2014-03-26 07:25:02.000000000 +0000 @@ -51,7 +51,7 @@ Comment[ar]=يوفر الدخول لجهات الإتصال المحفوظة في مجلد دفتر عناوين اكوندا Comment[bs]=Omogućuje pristup kontaktima pohranjenim u Akonadi imenicima Comment[ca]=Proporciona l'accés als contactes emmagatzemats en carpetes de la llibreta d'adreces de l'Akonadi -Comment[ca@valencia]=Proporciona l'accés als contactes emmagatzemats en carpetes de llibreta d'adreces de l'Akonadi +Comment[ca@valencia]=Proporciona l'accés als contactes emmagatzemats en carpetes de la llibreta d'adreces de l'Akonadi Comment[da]=Giver adgang til kontakter lagret i Akonadi adressebogs-mapper Comment[de]=Ermöglicht den Zugriff auf Kontakte, die in Akonadi-Adressbuchordnern gespeichert sind. Comment[el]=Παρέχει πρόσβαση σε επαφές αποθηκευμένες σε φακέλους βιβλίων διευθύνσεων του Akonadi diff -Nru kdepim-runtime-4.12.95/kresources/kcal/akonadi.desktop kdepim-runtime-4.12.97/kresources/kcal/akonadi.desktop --- kdepim-runtime-4.12.95/kresources/kcal/akonadi.desktop 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/kresources/kcal/akonadi.desktop 2014-03-26 07:25:02.000000000 +0000 @@ -56,7 +56,7 @@ Comment[ar]=يوفر الوصول للتقويمات المحفوظة في مجلد تقويم اكوندا Comment[bs]=Omogućava pristup kalendarima pohranjenim u Akonadi direktorijima kalendara Comment[ca]=Proporciona l'accés als calendaris emmagatzemats en carpetes del calendari de l'Akonadi -Comment[ca@valencia]=Proporciona l'accés als calendaris emmagatzemats en carpetes de calendari de l'Akonadi +Comment[ca@valencia]=Proporciona l'accés als calendaris emmagatzemats en carpetes del calendari de l'Akonadi Comment[da]=Giver adgang til kalendere lagret i Akonadi kalender-mapper Comment[de]=Ermöglicht den Zugriff auf Kalender, die in Akonadi-Ordnern gespeichert sind. Comment[el]=Παρέχει πρόσβαση σε ημερολόγια αποθηκευμένα σε φακέλους ημερολογίου του Akonadi diff -Nru kdepim-runtime-4.12.95/migration/kaddressbook/kaddressbookmigrator.desktop kdepim-runtime-4.12.97/migration/kaddressbook/kaddressbookmigrator.desktop --- kdepim-runtime-4.12.95/migration/kaddressbook/kaddressbookmigrator.desktop 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/migration/kaddressbook/kaddressbookmigrator.desktop 2014-03-26 07:25:02.000000000 +0000 @@ -50,7 +50,7 @@ Comment=Tool to migrate the old kresource based address book to Akonadi. Comment[bs]=Alat za pomjeranje adresara baziranog na kresource u Akonadi. Comment[ca]=Eina per a migrar l'adreça de contactes antiga basada en kresource a l'Akonadi. -Comment[ca@valencia]=Eina per migrar l'adreça de contactes antiga basada en kresource a l'Akonadi. +Comment[ca@valencia]=Eina per a migrar l'adreça de contactes antiga basada en kresource a l'Akonadi. Comment[da]=Værktøj til at migrere den gamle kresource-baserede adressebog til Akonadi. Comment[de]=Werkzeug zum Migrieren alter auf Ressourcen basierender Adressbücher nach Akonadi Comment[el]=Εργαλείο μετατροπής των παλιών βιβλίων διευθύνσεων του kresource σε βιβλία διευθύνσεων συμβατά με το Akonadi. diff -Nru kdepim-runtime-4.12.95/plugins/akonadi_serializer_contactgroup.desktop kdepim-runtime-4.12.97/plugins/akonadi_serializer_contactgroup.desktop --- kdepim-runtime-4.12.95/plugins/akonadi_serializer_contactgroup.desktop 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/plugins/akonadi_serializer_contactgroup.desktop 2014-03-26 07:25:02.000000000 +0000 @@ -3,7 +3,7 @@ Name[ar]=مسلسل مجموعة جهات الإتصال Name[bs]=Serializator kontaktne grupe Name[ca]=Serialitzador de grup de contactes -Name[ca@valencia]=Serialitzador de grups de contactes +Name[ca@valencia]=Serialitzador de grup de contactes Name[da]=Serieordning af kontaktgruppe Name[de]=Kontaktgruppen-Serialisierung Name[el]=Σειριακοποιητής ομάδας επαφών @@ -49,7 +49,7 @@ Comment[ar]=ملحق مسلسل اكوندا لكائنات مجموعة الإتصال Comment[bs]=Akonadi dodatak serializatora za objekte kontakt grupe Comment[ca]=Un connector de serialització de l'Akonadi pels objectes de grup de contactes -Comment[ca@valencia]=Un connector de serialització de l'Akonadi pels objectes de grups de contactes +Comment[ca@valencia]=Un connector de serialització de l'Akonadi pels objectes de grup de contactes Comment[da]=Et Akonadi-plugin til serieordning af kontaktgruppeobjekter Comment[de]=Akonadi-Modul zur Serialisierung von Kontaktgruppen Comment[el]=Ένα πρόσθετο σειριακοποιητή Akonadi για αντικείμενα ομάδων επαφών diff -Nru kdepim-runtime-4.12.95/plugins/akonadi_serializer_kalarm.cpp kdepim-runtime-4.12.97/plugins/akonadi_serializer_kalarm.cpp --- kdepim-runtime-4.12.95/plugins/akonadi_serializer_kalarm.cpp 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/plugins/akonadi_serializer_kalarm.cpp 2014-03-26 07:25:02.000000000 +0000 @@ -264,6 +264,11 @@ reporter->addProperty(AbstractDifferencesReporter::ConflictMode, KAEventFormatter::label(id), mValueL.value(id), mValueR.value(id)); } +QString SerializerPluginKAlarm::extractGid(const Item& item) const +{ + return item.hasPayload() ? item.payload().id() : QString(); +} + Q_EXPORT_PLUGIN2(akonadi_serializer_kalarm, SerializerPluginKAlarm) diff -Nru kdepim-runtime-4.12.95/plugins/akonadi_serializer_kalarm.h kdepim-runtime-4.12.97/plugins/akonadi_serializer_kalarm.h --- kdepim-runtime-4.12.95/plugins/akonadi_serializer_kalarm.h 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/plugins/akonadi_serializer_kalarm.h 2014-03-26 07:25:02.000000000 +0000 @@ -1,6 +1,6 @@ /* * akonadi_serializer_kalarm.h - Akonadi resource serializer for KAlarm - * Copyright © 2009-2012 by David Jarvie + * Copyright © 2009-2014 by David Jarvie * * This library is free software; you can redistribute it and/or modify it * under the terms of the GNU Library General Public License as published by @@ -25,24 +25,32 @@ #include #include +#include #include #include -namespace Akonadi { class AbstractDifferencesReporter; } +namespace Akonadi +{ + class Item; + class AbstractDifferencesReporter; +} class SerializerPluginKAlarm : public QObject, public Akonadi::ItemSerializerPlugin, - public Akonadi::DifferencesAlgorithmInterface + public Akonadi::DifferencesAlgorithmInterface, + public Akonadi::GidExtractorInterface { Q_OBJECT Q_INTERFACES(Akonadi::ItemSerializerPlugin) Q_INTERFACES(Akonadi::DifferencesAlgorithmInterface) + Q_INTERFACES(Akonadi::GidExtractorInterface) public: bool deserialize(Akonadi::Item& item, const QByteArray& label, QIODevice& data, int version); void serialize(const Akonadi::Item& item, const QByteArray& label, QIODevice& data, int& version); void compare(Akonadi::AbstractDifferencesReporter*, const Akonadi::Item& left, const Akonadi::Item& right); + QString extractGid(const Akonadi::Item& item) const; private: void reportDifference(Akonadi::AbstractDifferencesReporter*, KAEventFormatter::Parameter); diff -Nru kdepim-runtime-4.12.95/plugins/akonadi_serializer_kcalcore.desktop kdepim-runtime-4.12.97/plugins/akonadi_serializer_kcalcore.desktop --- kdepim-runtime-4.12.95/plugins/akonadi_serializer_kcalcore.desktop 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/plugins/akonadi_serializer_kcalcore.desktop 2014-03-26 07:25:02.000000000 +0000 @@ -49,7 +49,7 @@ Comment[ar]=ملحق مسلسل اكوندا لمدخلات الأحداث و المهمات و السّجل اليومي Comment[bs]=Akonadi dodatak serializatora za događaje, zadatke i žurnal upise Comment[ca]=Un connector de serialització de l'Akonadi pels objectes d'incidències -Comment[ca@valencia]=Un connector de serialització de l'Akonadi pels objectes incidències +Comment[ca@valencia]=Un connector de serialització de l'Akonadi pels objectes d'incidències Comment[da]=Et Akonadi-plugin til serieordning af hændelser, opgaver og journalindgange Comment[de]=Akonadi-Modul zur Serialisierung von Ereignissen Comment[el]=Ένα πρόσθετο σειριακοποιητή Akonadi για γεγονότα, εργασίες και καταχωρήσεις χρονικού diff -Nru kdepim-runtime-4.12.95/plugins/akonadi_serializer_kcal.desktop kdepim-runtime-4.12.97/plugins/akonadi_serializer_kcal.desktop --- kdepim-runtime-4.12.95/plugins/akonadi_serializer_kcal.desktop 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/plugins/akonadi_serializer_kcal.desktop 2014-03-26 07:25:02.000000000 +0000 @@ -49,7 +49,7 @@ Comment[ar]=ملحق مسلسل اكوندا لمدخلات الأحداث و المهمات و السّجل اليومي Comment[bs]=Akonadi dodatak serializatora za događaje, zadatke i žurnal upise Comment[ca]=Un connector de serialització de l'Akonadi pels objectes d'incidències -Comment[ca@valencia]=Un connector de serialització de l'Akonadi pels objectes incidències +Comment[ca@valencia]=Un connector de serialització de l'Akonadi pels objectes d'incidències Comment[da]=Et Akonadi-plugin til serieordning af hændelser, opgaver og journalindgange Comment[de]=Akonadi-Modul zur Serialisierung von Ereignissen Comment[el]=Ένα πρόσθετο σειριακοποιητή Akonadi για γεγονότα, εργασίες και καταχωρήσεις χρονικού diff -Nru kdepim-runtime-4.12.95/plugins/akonadi_serializer_microblog.desktop kdepim-runtime-4.12.97/plugins/akonadi_serializer_microblog.desktop --- kdepim-runtime-4.12.95/plugins/akonadi_serializer_microblog.desktop 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/plugins/akonadi_serializer_microblog.desktop 2014-03-26 07:25:02.000000000 +0000 @@ -3,7 +3,7 @@ Name[ar]=مسلسل التدوين المصغر Name[bs]=Siralizator mikrobloga Name[ca]=Serialitzador de micro-blog -Name[ca@valencia]=Serialitzador de microbloc +Name[ca@valencia]=Serialitzador de micro-blog Name[da]=Serieordning af microblogs Name[de]=Microblog-Serialisierung Name[el]=Σειριακοποιητής Microblog @@ -49,7 +49,7 @@ Comment[ar]=ملحق مسلسل اكوندا للتدوين المصغر Comment[bs]=Akonadi dodatak serializatora za Microblog Comment[ca]=Un connector de serialització de l'Akonadi pels micro-blogs -Comment[ca@valencia]=Un connector de serialització de l'Akonadi pels microblocs +Comment[ca@valencia]=Un connector de serialització de l'Akonadi pels micro-blogs Comment[da]=Et Akonadi-plugin til serieordning af microblogs Comment[de]=Akonadi-Modul zur Serialisierung von Microblog-Objekten Comment[el]=Ένα πρόσθετο σειριακοποιητή Akonadi για το Microblog diff -Nru kdepim-runtime-4.12.95/resources/akonotes/akonotesresource.desktop kdepim-runtime-4.12.97/resources/akonotes/akonotesresource.desktop --- kdepim-runtime-4.12.95/resources/akonotes/akonotesresource.desktop 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/akonotes/akonotesresource.desktop 2014-03-26 07:25:02.000000000 +0000 @@ -47,7 +47,7 @@ Comment=Loads a notes hierarchy from a local maildir folder Comment[bs]=Učitava hijerarhiju napomena iz loklnog maildir direktorija Comment[ca]=Carrega una jerarquia de notes des d'una carpeta pel directori de correu local -Comment[ca@valencia]=Carrega una jerarquia de notes des d'una carpeta maildir local +Comment[ca@valencia]=Carrega una jerarquia de notes des d'una carpeta pel directori de correu local Comment[da]=Indlæser et hierarki af noter fra en lokal maildir-mappe Comment[de]=Laden einer Notizenhierarchie aus einem lokalen Maildir-Ordner Comment[el]=Φόρτωση ιεραρχίας σημειώσεων από έναν τοπικό φάκελο maildir diff -Nru kdepim-runtime-4.12.95/resources/contacts/wizard/contactswizard.es.cmake kdepim-runtime-4.12.97/resources/contacts/wizard/contactswizard.es.cmake --- kdepim-runtime-4.12.95/resources/contacts/wizard/contactswizard.es.cmake 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/contacts/wizard/contactswizard.es.cmake 2014-03-26 07:25:02.000000000 +0000 @@ -17,8 +17,7 @@ 02110-1301, USA. */ -// TODO: i18n?? -var page = Dialog.addPage( "contactswizard.ui", "Settings" ); +var page = Dialog.addPage( "contactswizard.ui", qsTr("Settings") ); page.widget().lineEdit.text = "${CONTACTS_DIRECTORY_DEFAULT_PATH}"; @@ -36,7 +35,7 @@ var contactsResource = SetupManager.createResource( "akonadi_contacts_resource" ); contactsResource.setOption( "Path", page.widget().lineEdit.text ); contactsResource.setOption( "IsConfigured", "true" ); - contactsResource.setName( "Local Contacts" ); //TODO: i18n + contactsResource.setName( qsTr("Local Contacts") ); SetupManager.execute(); } diff -Nru kdepim-runtime-4.12.95/resources/contacts/wizard/Messages.sh kdepim-runtime-4.12.97/resources/contacts/wizard/Messages.sh --- kdepim-runtime-4.12.95/resources/contacts/wizard/Messages.sh 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/contacts/wizard/Messages.sh 2014-03-26 07:25:02.000000000 +0000 @@ -1,5 +1,6 @@ #! /usr/bin/env bash -# TODO: uncomment after string freeze -#$EXTRACTRC *.ui >> rc.cpp -#$XGETTEXT *.cpp -o $podir/accountwizard_contacts.pot -#rm rc.cpp +$EXTRACTRC *.ui >> rc.cpp +$XGETTEXT *.cpp -o $podir/accountwizard_contacts.pot +$XGETTEXT -kqsTr *.es.cmake -j -o $podir/accountwizard_contacts.pot +rm rc.cpp + diff -Nru kdepim-runtime-4.12.95/resources/dav/resource/davgroupwareresource.cpp kdepim-runtime-4.12.97/resources/dav/resource/davgroupwareresource.cpp --- kdepim-runtime-4.12.95/resources/dav/resource/davgroupwareresource.cpp 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/dav/resource/davgroupwareresource.cpp 2014-03-26 07:25:02.000000000 +0000 @@ -116,8 +116,6 @@ kDebug() << "Removing collection " << collection.remoteId(); if ( !configurationIsValid() ) { - emit status( NotConfigured, i18n( "The resource is not configured yet" ) ); - cancelTask( i18n( "The resource is not configured yet" ) ); return; } @@ -229,8 +227,6 @@ mSyncErrorNotified = false; if ( !configurationIsValid() ) { - emit status( NotConfigured, i18n( "The resource is not configured yet" ) ); - cancelTask( i18n( "The resource is not configured yet" ) ); return; } @@ -248,8 +244,6 @@ kDebug() << "Retrieving items for collection " << collection.remoteId(); if ( !configurationIsValid() ) { - emit status( NotConfigured, i18n( "The resource is not configured yet" ) ); - cancelTask( i18n( "The resource is not configured yet" ) ); return; } @@ -281,8 +275,6 @@ kDebug() << "Retrieving single item. Remote id = " << item.remoteId(); if ( !configurationIsValid() ) { - emit status( NotConfigured, i18n( "The resource is not configured yet" ) ); - cancelTask( i18n( "The resource is not configured yet" ) ); return false; } @@ -312,8 +304,6 @@ << ". Collection remote id = " << collection.remoteId(); if ( !configurationIsValid() ) { - emit status( NotConfigured, i18n( "The resource is not configured yet" ) ); - cancelTask( i18n( "The resource is not configured yet" ) ); return; } @@ -347,8 +337,6 @@ << ". Remote id = " << item.remoteId(); if ( !configurationIsValid() ) { - emit status( NotConfigured, i18n( "The resource is not configured yet" ) ); - cancelTask( i18n( "The resource is not configured yet" ) ); return; } @@ -374,8 +362,6 @@ void DavGroupwareResource::itemRemoved( const Akonadi::Item &item ) { if ( !configurationIsValid() ) { - emit status( NotConfigured, i18n( "The resource is not configured yet" ) ); - cancelTask( i18n( "The resource is not configured yet" ) ); return; } @@ -811,8 +797,11 @@ bool DavGroupwareResource::configurationIsValid() { - if ( Settings::self()->remoteUrls().empty() ) + if ( Settings::self()->remoteUrls().empty() ) { + emit status( NotConfigured, i18n( "The resource is not configured yet" ) ); + cancelTask( i18n( "The resource is not configured yet" ) ); return false; + } int newICT = Settings::self()->refreshInterval(); if ( newICT == 0 ) diff -Nru kdepim-runtime-4.12.95/resources/dav/resource/davgroupwareresource.desktop kdepim-runtime-4.12.97/resources/dav/resource/davgroupwareresource.desktop --- kdepim-runtime-4.12.95/resources/dav/resource/davgroupwareresource.desktop 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/dav/resource/davgroupwareresource.desktop 2014-03-26 07:25:02.000000000 +0000 @@ -2,7 +2,7 @@ Name=DAV groupware resource Name[bs]=DAV grupni resurs Name[ca]=Recurs de treball en grup DAV -Name[ca@valencia]=Recurs de treball en grup DAV +Name[ca@valencia]=Recurs de treball en grup DAV Name[da]=Ressource til DAV-groupware Name[de]=DAV-Groupware-Ressource Name[el]=Πόρος DAV groupware @@ -48,6 +48,7 @@ Comment[ca@valencia]=«Recurs per gestionar calendaris i llibretes d'adreces DAV (CalDAV, GroupDAV)» Comment[da]="Ressource til håndtering af DAV-kalendere og -adressebøger (CalDAV, GroupDAV)" Comment[de]="Ressource zur Verwaltung von DAV-Kalendern und -Adressbüchern (CalDAV, GroupDAV)" +Comment[el]="Πόρος για τη διαχείριση ημερολογίων DAV και βιβλίων διευθύνσεων (CalDAV, GroupDAV)" Comment[es]=«Recurso para gestionar calendarios DAV y libretas de direcciones (CalDAV, GroupDAV)» Comment[fi]="DAV-kalenterien ja -osoitekirjojen (CalDAV, GroupDAV) hallintaresurssi" Comment[fr]=« Ressource pour gérer les agendas et carnets d'adresses DAV (CalDAV, GroupDAV) » diff -Nru kdepim-runtime-4.12.95/resources/ical/wizard/icalwizard.es.cmake kdepim-runtime-4.12.97/resources/ical/wizard/icalwizard.es.cmake --- kdepim-runtime-4.12.95/resources/ical/wizard/icalwizard.es.cmake 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/ical/wizard/icalwizard.es.cmake 2014-03-26 07:25:02.000000000 +0000 @@ -17,8 +17,7 @@ 02110-1301, USA. */ -// TODO: i18n?? -var page = Dialog.addPage( "icalwizard.ui", "Settings" ); +var page = Dialog.addPage( "icalwizard.ui", qsTr("Settings") ); page.widget().lineEdit.text = "${ICAL_FILE_DEFAULT_PATH}"; @@ -35,7 +34,7 @@ { var icalRes = SetupManager.createResource( "akonadi_ical_resource" ); icalRes.setOption( "Path", page.widget().lineEdit.text ); - icalRes.setName( "Default Calendar" ); //TODO: i18n + icalRes.setName( qsTr("Default Calendar") ); SetupManager.execute(); } diff -Nru kdepim-runtime-4.12.95/resources/ical/wizard/Messages.sh kdepim-runtime-4.12.97/resources/ical/wizard/Messages.sh --- kdepim-runtime-4.12.95/resources/ical/wizard/Messages.sh 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/ical/wizard/Messages.sh 2014-03-26 07:25:02.000000000 +0000 @@ -1,3 +1,4 @@ #! /usr/bin/env bash $EXTRACTRC *.ui >> rc.cpp $XGETTEXT *.cpp -o $podir/accountwizard_ical.pot +$XGETTEXT -kqsTr *.es.cmake -j -o $podir/accountwizard_ical.pot diff -Nru kdepim-runtime-4.12.95/resources/icaldir/icaldirresource.desktop kdepim-runtime-4.12.97/resources/icaldir/icaldirresource.desktop --- kdepim-runtime-4.12.95/resources/icaldir/icaldirresource.desktop 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/icaldir/icaldirresource.desktop 2014-03-26 07:25:02.000000000 +0000 @@ -44,6 +44,7 @@ Comment[cs]="Poskytuje přístup k položkám kalendáře, každé uložené v jednom souboru v daném adresáři" Comment[da]="Giver adgang til en kalenderelementer, hver især gemt i en enkelt fil i en given mappe" Comment[de]="Ermöglicht Zugriff auf Kalender, die jeweils in einzelnen Dateien in einem vorgegebenen Ordner gespeichert sind" +Comment[el]="Παρέχει πρόσβαση σε αντικείμενα ημερολογίου, με το καθένα αποθηκευμένο σε ένα αρχείο, σε δοσμένο κατάλογο" Comment[es]=«Proporciona acceso a elementos de calendario, cada uno almacenado en un solo archivo, en un directorio dado» Comment[fi]="Tarjoaa pääsyn määräkansion yksittäisiin tiedostoihin tallennettuihin kalenterimerkintöihin" Comment[fr]=« Fournit l'accès aux éléments d'agenda, chacun stocké dans un fichier distinct, dans un dossier donné » diff -Nru kdepim-runtime-4.12.95/resources/imap/imapresource.cpp kdepim-runtime-4.12.97/resources/imap/imapresource.cpp --- kdepim-runtime-4.12.95/resources/imap/imapresource.cpp 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/imap/imapresource.cpp 2014-03-26 07:25:02.000000000 +0000 @@ -33,10 +33,6 @@ #include #include -#ifndef IMAPRESOURCE_NO_SOLID -#include -#endif - #include #include #include @@ -259,28 +255,30 @@ // ----------------------------------------------------------------------------- -int ImapResource::configureDialog( WId windowId ) +KDialog* ImapResource::createConfigureDialog(WId windowId) { - QPointer dlg = new SetupServer( this, windowId ); + SetupServer *dlg = new SetupServer( this, windowId ); KWindowSystem::setMainWindow( dlg, windowId ); - dlg->setWindowIcon( KIcon( QLatin1String("network-server") ) ); - int result = QDialog::Rejected; - if( dlg->exec() ) { + connect(dlg, SIGNAL(finished(int)), this, SLOT(onConfigurationDone(int)));; + return dlg; +} + +void ImapResource::onConfigurationDone(int result) +{ + SetupServer *dlg = qobject_cast(sender()); + if (result) { if ( dlg->shouldClearCache() ) { clearCache(); } Settings::self()->writeConfig(); - result = QDialog::Accepted; } - delete dlg; - - return result; + dlg->deleteLater(); } void ImapResource::configure( WId windowId ) { - if ( configureDialog( windowId ) == QDialog::Accepted ) { + if ( createConfigureDialog( windowId )->exec() == QDialog::Accepted ) { emit configurationDialogAccepted(); reconnect(); } else { @@ -363,12 +361,13 @@ case SessionPool::IncompatibleServerError: setOnline( false ); emit status( Broken, errorString ); - taskDone(); + cancelTask(); return; case SessionPool::CouldNotConnectError: - setOnline( false ); - taskDone(); + emit status( Broken, errorString ); + deferTask(); + setTemporaryOffline((m_pool->account() && m_pool->account()->timeout() > 0) ? m_pool->account()->timeout() : 300); return; case SessionPool::ReconnectNeededError: @@ -620,8 +619,10 @@ delete task; } m_taskList.clear(); - if ( m_pool->isConnected() ) - m_pool->disconnect(); + m_pool->cancelPasswordRequests(); + if (m_pool->isConnected()) { + m_pool->disconnect(); + } if (m_idle) { m_idle->stop(); delete m_idle; @@ -660,15 +661,7 @@ { setNeedsNetwork( needsNetwork() ); setOnline( false ); // we are not connected initially - - setOnline( !needsNetwork() -#ifndef IMAPRESOURCE_NO_SOLID - || - Solid::Networking::status() == Solid::Networking::Unknown || - Solid::Networking::status() == Solid::Networking::Connected -#endif - ); - + setOnline( true ); } diff -Nru kdepim-runtime-4.12.95/resources/imap/imapresource.h kdepim-runtime-4.12.97/resources/imap/imapresource.h --- kdepim-runtime-4.12.95/resources/imap/imapresource.h 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/imap/imapresource.h 2014-03-26 07:25:02.000000000 +0000 @@ -28,6 +28,7 @@ #include #include +#include #include class QTimer; @@ -57,7 +58,7 @@ ~ImapResource(); - int configureDialog( WId windowId ); + KDialog *createConfigureDialog( WId windowId ); QStringList serverCapabilities() const; void fetchItemsWithoutBodies( const Akonadi::Collection &collection, QObject *receiver, const char *slot ); @@ -135,6 +136,7 @@ void clearStatusMessage(); void fetchItemsWithoutBodiesDone( KJob *job ); + void onConfigurationDone( int result ); private: friend class ResourceState; diff -Nru kdepim-runtime-4.12.95/resources/imap/passwordrequesterinterface.cpp kdepim-runtime-4.12.97/resources/imap/passwordrequesterinterface.cpp --- kdepim-runtime-4.12.95/resources/imap/passwordrequesterinterface.cpp 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/imap/passwordrequesterinterface.cpp 2014-03-26 07:25:02.000000000 +0000 @@ -27,4 +27,7 @@ } +void PasswordRequesterInterface::cancelPasswordRequests() +{ +} diff -Nru kdepim-runtime-4.12.95/resources/imap/passwordrequesterinterface.h kdepim-runtime-4.12.97/resources/imap/passwordrequesterinterface.h --- kdepim-runtime-4.12.95/resources/imap/passwordrequesterinterface.h 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/imap/passwordrequesterinterface.h 2014-03-26 07:25:02.000000000 +0000 @@ -48,6 +48,7 @@ public: virtual void requestPassword( RequestType request = StandardRequest, const QString &serverError = QString() ) = 0; + virtual void cancelPasswordRequests(); signals: void done( int resultType, const QString &password = QString() ); diff -Nru kdepim-runtime-4.12.95/resources/imap/sessionpool.cpp kdepim-runtime-4.12.97/resources/imap/sessionpool.cpp --- kdepim-runtime-4.12.95/resources/imap/sessionpool.cpp 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/imap/sessionpool.cpp 2014-03-26 07:25:02.000000000 +0000 @@ -66,6 +66,11 @@ this, SLOT(onPasswordRequestDone(int,QString)) ); } +void SessionPool::cancelPasswordRequests() +{ + m_passwordRequester->cancelPasswordRequests(); +} + KIMAP::SessionUiProxy::Ptr SessionPool::sessionUiProxy() const { return m_sessionUiProxy; @@ -113,6 +118,7 @@ m_reservedPool.clear(); m_connectingPool.clear(); m_pendingInitialSession = 0; + m_passwordRequester->cancelPasswordRequests(); delete m_account; m_account = 0; @@ -473,6 +479,7 @@ m_connectingPool.removeAll( session ); if ( m_unusedPool.isEmpty() && m_reservedPool.isEmpty() ) { + m_passwordRequester->cancelPasswordRequests(); delete m_account; m_account = 0; m_namespaces.clear(); diff -Nru kdepim-runtime-4.12.95/resources/imap/sessionpool.h kdepim-runtime-4.12.97/resources/imap/sessionpool.h --- kdepim-runtime-4.12.95/resources/imap/sessionpool.h 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/imap/sessionpool.h 2014-03-26 07:25:02.000000000 +0000 @@ -65,6 +65,7 @@ PasswordRequesterInterface *passwordRequester() const; void setPasswordRequester( PasswordRequesterInterface *requester ); + void cancelPasswordRequests(); KIMAP::SessionUiProxy::Ptr sessionUiProxy() const; void setSessionUiProxy( KIMAP::SessionUiProxy::Ptr proxy ); diff -Nru kdepim-runtime-4.12.95/resources/imap/settingspasswordrequester.cpp kdepim-runtime-4.12.97/resources/imap/settingspasswordrequester.cpp --- kdepim-runtime-4.12.95/resources/imap/settingspasswordrequester.cpp 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/imap/settingspasswordrequester.cpp 2014-03-26 07:25:02.000000000 +0000 @@ -21,22 +21,27 @@ #include "settingspasswordrequester.h" -#include - #include #include +#include #include +#include #include "imapresource.h" #include "settings.h" SettingsPasswordRequester::SettingsPasswordRequester( ImapResource *resource, QObject *parent ) - : PasswordRequesterInterface( parent ), m_resource( resource ) + : PasswordRequesterInterface( parent ), m_resource( resource ), m_requestDialog( 0 ), m_settingsDialog( 0 ) { } +SettingsPasswordRequester::~SettingsPasswordRequester() +{ + cancelPasswordRequests(); +} + void SettingsPasswordRequester::requestPassword( RequestType request, const QString &serverError ) { if ( request == WrongPasswordRequest ) { @@ -50,30 +55,76 @@ void SettingsPasswordRequester::askUserInput( const QString &serverError ) { - // the credentials were not ok.... - int i = KMessageBox::questionYesNoCancelWId( m_resource->winIdForDialogs(), - i18n( "The server for account \"%2\" refused the supplied username and password. " + // the credentials were not ok, allow to retry or change password + if ( m_requestDialog ) { + kDebug() << "Password request dialog is already open"; + return; + } + QWidget *parent = QWidget::find(m_resource->winIdForDialogs()); + QString text = i18n( "The server for account \"%2\" refused the supplied username and password. " "Do you want to go to the settings, have another attempt " "at logging in, or do nothing?\n\n" - "%1", serverError, m_resource->name() ), - i18n( "Could Not Authenticate" ), - KGuiItem( i18n( "Account Settings" ) ), - KGuiItem( i18nc( "Input username/password manually and not store them", "Try Again" ) ) ); - - if ( i == KMessageBox::Yes ) { - int result = m_resource->configureDialog( m_resource->winIdForDialogs() ); - if ( result==QDialog::Accepted ) { - emit done( ReconnectNeeded ); - } else { - emit done( UserRejected ); + "%1", serverError, m_resource->name() ); + KDialog *dialog = new KDialog(parent, Qt::Dialog); + dialog->setCaption(i18n( "Could Not Authenticate" )); + dialog->setButtons(KDialog::Yes|KDialog::No|KDialog::Cancel); + dialog->setDefaultButton(KDialog::Yes); + dialog->setButtonText(KDialog::Yes, i18n( "Account Settings" )); + dialog->setButtonText(KDialog::No, i18nc( "Input username/password manually and not store them", "Try Again" )); + dialog->setAttribute(Qt::WA_DeleteOnClose); + connect(dialog, SIGNAL(buttonClicked(KDialog::ButtonCode)), this, SLOT(onButtonClicked(KDialog::ButtonCode))); + connect(dialog, SIGNAL(destroyed(QObject*)), this, SLOT(onDialogDestroyed())); + m_requestDialog = dialog; + KWindowSystem::setMainWindow(dialog, m_resource->winIdForDialogs()); + bool checkboxResult = false; + KMessageBox::createKMessageBox(dialog, QMessageBox::Information, + text, QStringList(), + QString(), + &checkboxResult, KMessageBox::NoExec); + dialog->show(); +} + +void SettingsPasswordRequester::onDialogDestroyed() +{ + m_requestDialog = 0; +} + +void SettingsPasswordRequester::onButtonClicked(KDialog::ButtonCode result) +{ + if ( result == KDialog::Yes ) { + if (!m_settingsDialog) { + KDialog *dialog = m_resource->createConfigureDialog(m_resource->winIdForDialogs()); + connect(dialog, SIGNAL(finished(int)), this, SLOT(onSettingsDialogFinished(int))); + m_settingsDialog = dialog; + dialog->show(); } - } else if ( i == KMessageBox::No ) { + } else if ( result == KDialog::No ) { connect( Settings::self(), SIGNAL(passwordRequestCompleted(QString,bool)), this, SLOT(onPasswordRequestCompleted(QString,bool)) ); Settings::self()->requestManualAuth(); } else { emit done( UserRejected ); } + m_requestDialog = 0; +} + +void SettingsPasswordRequester::onSettingsDialogFinished(int result) +{ + m_settingsDialog = 0; + if (result == QDialog::Accepted) { + emit done( ReconnectNeeded ); + } else { + emit done( UserRejected ); + } +} + +void SettingsPasswordRequester::cancelPasswordRequests() +{ + if (m_requestDialog) { + if (m_requestDialog->close()) { + m_requestDialog = 0; + } + } } void SettingsPasswordRequester::onPasswordRequestCompleted( const QString &password, bool userRejected ) @@ -89,5 +140,3 @@ emit done( PasswordRetrieved, password ); } } - - diff -Nru kdepim-runtime-4.12.95/resources/imap/settingspasswordrequester.h kdepim-runtime-4.12.97/resources/imap/settingspasswordrequester.h --- kdepim-runtime-4.12.95/resources/imap/settingspasswordrequester.h 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/imap/settingspasswordrequester.h 2014-03-26 07:25:02.000000000 +0000 @@ -23,6 +23,7 @@ #define SETTINGSPASSWORDREQUESTER_H #include +#include class ImapResource; @@ -32,16 +33,23 @@ public: explicit SettingsPasswordRequester( ImapResource *resource, QObject *parent = 0 ); + virtual ~SettingsPasswordRequester(); virtual void requestPassword( RequestType request = StandardRequest, const QString &serverError = QString() ); + virtual void cancelPasswordRequests(); private slots: void askUserInput( const QString &serverError ); void onPasswordRequestCompleted( const QString &password, bool userRejected ); + void onButtonClicked(KDialog::ButtonCode); + void onDialogDestroyed(); + void onSettingsDialogFinished(int result); private: ImapResource *m_resource; + KDialog *m_requestDialog; + KDialog *m_settingsDialog; }; #endif diff -Nru kdepim-runtime-4.12.95/resources/imap/subscriptiondialog.cpp kdepim-runtime-4.12.97/resources/imap/subscriptiondialog.cpp --- kdepim-runtime-4.12.95/resources/imap/subscriptiondialog.cpp 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/imap/subscriptiondialog.cpp 2014-03-26 07:25:02.000000000 +0000 @@ -103,7 +103,7 @@ m_lineEdit = new KLineEdit( mainWidget ); m_lineEdit->setClearButtonShown( true ); connect( m_lineEdit, SIGNAL(textChanged(QString)), - m_filter, SLOT(setSearchPattern(QString)) ); + this, SLOT(slotSearchPattern(QString)) ); filterBarLayout->addWidget( m_lineEdit ); m_lineEdit->setFocus(); @@ -162,6 +162,14 @@ writeConfig(); } +void SubscriptionDialog::slotSearchPattern(const QString &pattern) +{ +#ifndef KDEPIM_MOBILE_UI + m_treeView->expandAll(); +#endif + m_filter->setSearchPattern(pattern); +} + void SubscriptionDialog::readConfig() { KConfigGroup group( KGlobal::config(), "SubscriptionDialog" ); diff -Nru kdepim-runtime-4.12.95/resources/imap/subscriptiondialog.h kdepim-runtime-4.12.97/resources/imap/subscriptiondialog.h --- kdepim-runtime-4.12.95/resources/imap/subscriptiondialog.h 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/imap/subscriptiondialog.h 2014-03-26 07:25:02.000000000 +0000 @@ -94,6 +94,7 @@ void onItemChanged( QStandardItem *item ); void onMobileLineEditChanged( const QString &text ); + void slotSearchPattern(const QString &pattern); protected: /* reimp */ void keyPressEvent( QKeyEvent *event ); diff -Nru kdepim-runtime-4.12.95/resources/kolabproxy/akonadi_kolabproxy_resource.notifyrc kdepim-runtime-4.12.97/resources/kolabproxy/akonadi_kolabproxy_resource.notifyrc --- kdepim-runtime-4.12.95/resources/kolabproxy/akonadi_kolabproxy_resource.notifyrc 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/kolabproxy/akonadi_kolabproxy_resource.notifyrc 2014-03-26 07:25:02.000000000 +0000 @@ -3,8 +3,10 @@ Comment=Kolab Proxy Resource Notifications Comment[bs]=Notifikacija Kolab Proxy resursa Comment[ca]=Notificacions del recurs d'intermediari del Kolab +Comment[ca@valencia]=Notificacions del recurs d'intermediari del Kolab Comment[da]=Bekendtgørelser fra Kolab-proxy-ressource Comment[de]=Benachrichtigungen der Proxy-Ressource für Kolab +Comment[el]=Ειδοποιήσεις πόρου διαμεσολαβητή Kolab Comment[es]=Notificaciones de recursos del proxy Kolab Comment[fi]=Kolab Proxy -resurssin ilmoitukset Comment[fr]=Configuration des notifications Kolab @@ -33,9 +35,11 @@ Name=Kolab Resource Name[bs]=Kolab resurs Name[ca]=Recurs de Kolab +Name[ca@valencia]=Recurs de Kolab Name[cs]=Zdroj Kolab Name[da]=Kolab-ressource Name[de]=Kolab-Ressource +Name[el]=Πόρος Kolab Name[es]=Recurso de Kolab Name[fi]=Kolab-resurssi Name[fr]=Ressource Kolab @@ -66,8 +70,10 @@ Name=An error occurred Name[bs]=Desila se greška Name[ca]=S'ha produït un error +Name[ca@valencia]=S'ha produït un error Name[da]=En fejl opstod Name[de]=Es ist ein Fehler aufgetreten +Name[el]=Συνέβη ένα σφάλμα Name[es]=Ocurrió un error Name[fi]=Tapahtui virhe Name[fr]=Une erreur est survenue diff -Nru kdepim-runtime-4.12.95/resources/kolabproxy/kolabhandler.cpp kdepim-runtime-4.12.97/resources/kolabproxy/kolabhandler.cpp --- kdepim-runtime-4.12.95/resources/kolabproxy/kolabhandler.cpp 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/kolabproxy/kolabhandler.cpp 2014-03-26 07:25:02.000000000 +0000 @@ -221,4 +221,5 @@ if ( job->error() ) { kWarning() << "Error occurred: " << job->errorString(); } -} \ No newline at end of file +} + diff -Nru kdepim-runtime-4.12.95/resources/kolabproxy/kolabproxyresource.desktop kdepim-runtime-4.12.97/resources/kolabproxy/kolabproxyresource.desktop --- kdepim-runtime-4.12.95/resources/kolabproxy/kolabproxyresource.desktop 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/kolabproxy/kolabproxyresource.desktop 2014-03-26 07:25:02.000000000 +0000 @@ -3,7 +3,7 @@ Name[bg]=Сървър Kolab Groupware Name[bs]=Server kolaborativnog softvera Name[ca]=Servidor de treball en grup Kolab -Name[ca@valencia]=Servidor de Groupware Kolab +Name[ca@valencia]=Servidor de treball en grup Kolab Name[cs]=Kolab Groupware server Name[da]=Kolab groupware-server Name[de]=Kolab Groupware-Server @@ -48,7 +48,7 @@ Comment=Provides access to Kolab groupware folders on an IMAP server (IMAP accounts need to be set up separately). Comment[bs]=Omogućava pristup folderima kolaborativnog softvera na IMAP server (IMAP računi trebaju biti uspostavljeni odvojeno). Comment[ca]=Proporciona accés a carpetes de treball en grup Kolab en un servidor IMAP (els comptes IMAP s'han de configurar separadament). -Comment[ca@valencia]=Proporciona accés a carpetes de groupware Kolab en un servidor IMAP (els comptes IMAP s'han de configurar separadament). +Comment[ca@valencia]=Proporciona accés a carpetes de treball en grup Kolab en un servidor IMAP (els comptes IMAP s'han de configurar separadament). Comment[da]=Giver adgang til Kolab groupware-mapper på en IMAP-server (IMAP-konti skal sættes op separat). Comment[de]=Ermöglicht den Zugriff auf Kolab Groupware-Ordner auf einem IMAP-Server (IMAP-Zugänge müssen separat erstellt werden). Comment[el]=Προσφέρει πρόσβαση σε φακέλους του Kolab groupware σε έναν εξυπηρετητή IMAP (οι λογαριασμοί IMAP θα πρέπει να ρυθμιστούν ξεχωριστά). diff -Nru kdepim-runtime-4.12.95/resources/kolabproxy/tests/clientsidetest.cpp kdepim-runtime-4.12.97/resources/kolabproxy/tests/clientsidetest.cpp --- kdepim-runtime-4.12.95/resources/kolabproxy/tests/clientsidetest.cpp 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/kolabproxy/tests/clientsidetest.cpp 2014-03-26 07:25:02.000000000 +0000 @@ -134,7 +134,7 @@ item.setPayload(event); Akonadi::ItemCreateJob *createJob = new Akonadi::ItemCreateJob(item, kolabCollection); //Check that the signal is NOT emitted within the timeout - QVERIFY(!TestUtils::ensure(imapCollection, SIGNAL(itemAdded(Akonadi::Item, Akonadi::Collection)), createJob)); + QVERIFY(!TestUtils::ensure(imapCollection, SIGNAL(itemAdded(Akonadi::Item,Akonadi::Collection)), createJob)); //TODO akonadi currently doesn't support failing itemcreatejobs if the resource fails to store the item. // the item will simply remain dirty in the akonadi server // QVERIFY(createJob->error()); @@ -162,7 +162,7 @@ Akonadi::Item item(event->mimeType()); item.setPayload(event); Akonadi::ItemCreateJob *createJob = new Akonadi::ItemCreateJob(item, kolabCollection); - QVERIFY(TestUtils::ensure(imapCollection, SIGNAL(itemAdded(Akonadi::Item, Akonadi::Collection)), createJob)); + QVERIFY(TestUtils::ensure(imapCollection, SIGNAL(itemAdded(Akonadi::Item,Akonadi::Collection)), createJob)); createdItem = createJob->item(); QVERIFY(createdItem.isValid()); } @@ -171,7 +171,7 @@ event->setDtStart(date2); createdItem.setPayload(event); Akonadi::ItemModifyJob *modifyJob = new Akonadi::ItemModifyJob(createdItem); - QVERIFY(TestUtils::ensure(imapCollection, SIGNAL(itemChanged(Akonadi::Item, QSet)), modifyJob)); + QVERIFY(TestUtils::ensure(imapCollection, SIGNAL(itemChanged(Akonadi::Item,QSet)), modifyJob)); Akonadi::Item modifiedItem = modifyJob->item(); QVERIFY(modifiedItem.hasPayload()); QCOMPARE(modifiedItem.payload()->dtStart().toString(), date2.toString()); @@ -202,7 +202,7 @@ Akonadi::Item item(event->mimeType()); item.setPayload(event); Akonadi::ItemCreateJob *createJob = new Akonadi::ItemCreateJob(item, kolabCollection); - QVERIFY(TestUtils::ensure(imapCollection, SIGNAL(itemAdded(Akonadi::Item, Akonadi::Collection)), createJob)); + QVERIFY(TestUtils::ensure(imapCollection, SIGNAL(itemAdded(Akonadi::Item,Akonadi::Collection)), createJob)); createdItem = createJob->item(); QVERIFY(createdItem.isValid()); } @@ -214,7 +214,7 @@ AKVERIFYEXEC(modifyJob); QTest::qWait(TIMEOUT); //FIXME this fails, no idea why -// QVERIFY(!TestUtils::ensure(imapCollection, SIGNAL(itemChanged(Akonadi::Item, QSet)), modifyJob)); +// QVERIFY(!TestUtils::ensure(imapCollection, SIGNAL(itemChanged(Akonadi::Item,QSet)), modifyJob)); } //Ensure the change has been reverted for the kolab item diff -Nru kdepim-runtime-4.12.95/resources/kolabproxy/tests/imapsignaltest.cpp kdepim-runtime-4.12.97/resources/kolabproxy/tests/imapsignaltest.cpp --- kdepim-runtime-4.12.95/resources/kolabproxy/tests/imapsignaltest.cpp 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/kolabproxy/tests/imapsignaltest.cpp 2014-03-26 07:25:02.000000000 +0000 @@ -135,7 +135,7 @@ { event->setSummary("summary2"); Akonadi::ItemCreateJob *createJob = new Akonadi::ItemCreateJob(createImapItem(event), imapCollection, this); - QVERIFY(TestUtils::ensure(kolabCollection, SIGNAL(itemChanged(const Akonadi::Item &, const QSet &)), createJob)); + QVERIFY(TestUtils::ensure(kolabCollection, SIGNAL(itemChanged(Akonadi::Item,QSet)), createJob)); recreatdImapItem = createJob->item(); } @@ -190,7 +190,7 @@ { event->setSummary("summary2"); Akonadi::ItemCreateJob *createJob = new Akonadi::ItemCreateJob(createImapItem(event), imapCollection, this); - QVERIFY(TestUtils::ensure(kolabCollection, SIGNAL(itemChanged(const Akonadi::Item &, const QSet &)), createJob)); + QVERIFY(TestUtils::ensure(kolabCollection, SIGNAL(itemChanged(Akonadi::Item,QSet)), createJob)); secondImapItem = createJob->item(); } @@ -227,7 +227,7 @@ event->setSummary("summary2"); Akonadi::ItemCreateJob *createJob = new Akonadi::ItemCreateJob(createImapItem(event), imapCollection, this); // AKVERIFYEXEC(createJob); - QVERIFY(TestUtils::ensure(kolabCollection, SIGNAL(itemChanged(const Akonadi::Item &, const QSet &)), createJob)); + QVERIFY(TestUtils::ensure(kolabCollection, SIGNAL(itemChanged(Akonadi::Item,QSet)), createJob)); secondImapItem = createJob->item(); } //we expect one kolab item that is linked to the second imap item @@ -235,7 +235,7 @@ //remove first imap item { Akonadi::ItemDeleteJob *deleteJob = new Akonadi::ItemDeleteJob(firstImapItem); - QVERIFY(!TestUtils::ensure(kolabCollection, SIGNAL(itemRemoved(const Akonadi::Item &)), deleteJob)); + QVERIFY(!TestUtils::ensure(kolabCollection, SIGNAL(itemRemoved(Akonadi::Item)), deleteJob)); } //TestUtils::ensure kolab item remains @@ -251,7 +251,7 @@ //remove second imap item { Akonadi::ItemDeleteJob *deleteJob = new Akonadi::ItemDeleteJob(secondImapItem); - QVERIFY(TestUtils::ensure(kolabCollection, SIGNAL(itemRemoved(const Akonadi::Item &)), deleteJob)); + QVERIFY(TestUtils::ensure(kolabCollection, SIGNAL(itemRemoved(Akonadi::Item)), deleteJob)); } //TestUtils::ensure kolab item is removed @@ -272,7 +272,7 @@ annotations.insert("/shared/vendor/kolab/folder-type", "event"); col.addAttribute(new CollectionAnnotationsAttribute(annotations)); Akonadi::CollectionCreateJob *createJob = new Akonadi::CollectionCreateJob(col, this); - QVERIFY(TestUtils::ensure(kolabCollection, SIGNAL(collectionAdded(const Akonadi::Collection &, const Akonadi::Collection &)), createJob)); + QVERIFY(TestUtils::ensure(kolabCollection, SIGNAL(collectionAdded(Akonadi::Collection,Akonadi::Collection)), createJob)); createdCollection = createJob->collection(); } { @@ -283,7 +283,7 @@ //cleanup { Akonadi::CollectionDeleteJob *deleteJob = new Akonadi::CollectionDeleteJob(createdCollection); - QVERIFY(TestUtils::ensure(kolabCollection, SIGNAL(collectionRemoved(const Akonadi::Collection &)), deleteJob)); + QVERIFY(TestUtils::ensure(kolabCollection, SIGNAL(collectionRemoved(Akonadi::Collection)), deleteJob)); } { Akonadi::CollectionFetchJob *fetchJob = new Akonadi::CollectionFetchJob(kolabCollection); @@ -303,7 +303,7 @@ col.addAttribute(new CollectionAnnotationsAttribute(annotations)); col.setRights(Akonadi::Collection::AllRights); Akonadi::CollectionCreateJob *createJob = new Akonadi::CollectionCreateJob(col, this); - QVERIFY(TestUtils::ensure(kolabCollection, SIGNAL(collectionAdded(const Akonadi::Collection &, const Akonadi::Collection &)), createJob)); + QVERIFY(TestUtils::ensure(kolabCollection, SIGNAL(collectionAdded(Akonadi::Collection,Akonadi::Collection)), createJob)); createdCollection = createJob->collection(); } @@ -316,7 +316,7 @@ { createdCollection.setRights(Akonadi::Collection::ReadOnly); Akonadi::CollectionModifyJob *modJob = new Akonadi::CollectionModifyJob(createdCollection); - QVERIFY(TestUtils::ensure(kolabCollection, SIGNAL(collectionChanged(const Akonadi::Collection &)), modJob)); + QVERIFY(TestUtils::ensure(kolabCollection, SIGNAL(collectionChanged(Akonadi::Collection)), modJob)); } { Akonadi::CollectionFetchJob *fetchJob = new Akonadi::CollectionFetchJob(kolabCollection); @@ -327,7 +327,7 @@ //cleanup { Akonadi::CollectionDeleteJob *deleteJob = new Akonadi::CollectionDeleteJob(createdCollection); - QVERIFY(TestUtils::ensure(kolabCollection, SIGNAL(collectionRemoved(const Akonadi::Collection &)), deleteJob)); + QVERIFY(TestUtils::ensure(kolabCollection, SIGNAL(collectionRemoved(Akonadi::Collection)), deleteJob)); } } @@ -336,3 +336,4 @@ QTEST_AKONADIMAIN( ImapSignalTest, NoGUI ) #include "imapsignaltest.moc" + diff -Nru kdepim-runtime-4.12.95/resources/kolabproxy/wizard/kolabwizard.desktop kdepim-runtime-4.12.97/resources/kolabproxy/wizard/kolabwizard.desktop --- kdepim-runtime-4.12.95/resources/kolabproxy/wizard/kolabwizard.desktop 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/kolabproxy/wizard/kolabwizard.desktop 2014-03-26 07:25:02.000000000 +0000 @@ -3,7 +3,7 @@ Name[bg]=Сървър Kolab Groupware Name[bs]=Server kolaborativnog softvera Name[ca]=Servidor de treball en grup Kolab -Name[ca@valencia]=Servidor de Groupware Kolab +Name[ca@valencia]=Servidor de treball en grup Kolab Name[cs]=Kolab Groupware server Name[da]=Kolab groupware-server Name[de]=Kolab Groupware-Server @@ -50,7 +50,7 @@ Comment[bg]=Сървър Kolab Groupware Comment[bs]=Server kolaborativnog softvera Comment[ca]=Servidor de treball en grup Kolab -Comment[ca@valencia]=Servidor de Groupware Kolab +Comment[ca@valencia]=Servidor de treball en grup Kolab Comment[cs]=Kolab Groupware server Comment[da]=Kolab groupware-server Comment[de]=Kolab Groupware-Server diff -Nru kdepim-runtime-4.12.95/resources/maildir/maildirresource.cpp kdepim-runtime-4.12.97/resources/maildir/maildirresource.cpp --- kdepim-runtime-4.12.95/resources/maildir/maildirresource.cpp 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/maildir/maildirresource.cpp 2014-03-26 07:25:02.000000000 +0000 @@ -144,7 +144,7 @@ } mChangedCleanerTimer = new QTimer( this ); - connect( mChangedCleanerTimer, SIGNAL( timeout() ), this, SLOT( changedCleaner() ) ); + connect( mChangedCleanerTimer, SIGNAL(timeout()), this, SLOT(changedCleaner()) ); } void MaildirResource::attemptConfigRestoring( KJob * job ) diff -Nru kdepim-runtime-4.12.95/resources/maildir/maildirresource.desktop kdepim-runtime-4.12.97/resources/maildir/maildirresource.desktop --- kdepim-runtime-4.12.95/resources/maildir/maildirresource.desktop 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/maildir/maildirresource.desktop 2014-03-26 07:25:02.000000000 +0000 @@ -54,7 +54,7 @@ Comment[bg]=Зареждане на данни от локална папка maildir Comment[bs]=Učitava podatke iz lokalnog maildir direktorija Comment[ca]=Carrega les dades des d'una carpeta pel directori de correu local -Comment[ca@valencia]=Carregar dades des d'una carpeta «maildir» local +Comment[ca@valencia]=Carrega les dades des d'una carpeta pel directori de correu local Comment[cs]=Načítá data z místní složky maildir Comment[da]=Indlæser data fra en lokal maildir-mappe Comment[de]=Daten werden aus einem lokalen Maildir-Ordner geladen diff -Nru kdepim-runtime-4.12.95/resources/openxchange/openxchangeresource.desktop kdepim-runtime-4.12.97/resources/openxchange/openxchangeresource.desktop --- kdepim-runtime-4.12.95/resources/openxchange/openxchangeresource.desktop 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/openxchange/openxchangeresource.desktop 2014-03-26 07:25:02.000000000 +0000 @@ -48,8 +48,10 @@ Comment="Provides access to the appointments, tasks, and contacts of an Open-Xchange groupware server." Comment[bs]="Obezbjeđuje pristup zakazanim obavezama, zadacima i kontaktima za Open-Xchange grupni server." Comment[ca]="Proporciona l'accés a les cites, tasques i contactes emmagatzemats en un servidor de treball en grup Open-Xchange." +Comment[ca@valencia]="Proporciona l'accés a les cites, tasques i contactes emmagatzemats en un servidor de treball en grup Open-Xchange." Comment[da]="Giver adgang til aftaler, opgaver og kontakter på en Open-Xchange groupware-server." Comment[de]="Ermöglicht den Zugriff auf Termine, Aufgaben und Kontakte, die auf einem Open-Xchange-Server gespeichert sind." +Comment[el]="Παρέχει πρόσβαση σε ραντεβού, εργασίες και επαφές ενός εξυπηρετητή groupware Open-Xchange" Comment[es]=«Proporciona acceso a las citas, tareas y contactos almacenados en un servidor de colaboración Open-Xchange». Comment[fi]="Tarjoaa pääsyn Open-Xchange-työryhmäpalvelimen tapaamis-, tehtävä- ja yhteystietoihin." Comment[fr]=« Fournit l'accès aux contacts, aux rendez-vous et aux tâches stockés sur un serveur Open-Xchange de logiciels de collaboration. » diff -Nru kdepim-runtime-4.12.95/resources/pop3/accountdialog.cpp kdepim-runtime-4.12.97/resources/pop3/accountdialog.cpp --- kdepim-runtime-4.12.95/resources/pop3/accountdialog.cpp 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/pop3/accountdialog.cpp 2014-03-26 07:25:02.000000000 +0000 @@ -417,7 +417,7 @@ mServerTestFailed = false; } -void AccountDialog::slotPopCapabilities( QList encryptionTypes ) +void AccountDialog::slotPopCapabilities( const QList &encryptionTypes ) { checkCapabilitiesStack->setCurrentIndex( 0 ); enableButtonOk( true ); diff -Nru kdepim-runtime-4.12.95/resources/pop3/accountdialog.h kdepim-runtime-4.12.97/resources/pop3/accountdialog.h --- kdepim-runtime-4.12.95/resources/pop3/accountdialog.h 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/pop3/accountdialog.h 2014-03-26 07:25:02.000000000 +0000 @@ -55,7 +55,7 @@ void slotPipeliningClicked(); void slotPopEncryptionChanged(int); void slotCheckPopCapabilities(); - void slotPopCapabilities( QList ); + void slotPopCapabilities(const QList & ); void slotLeaveOnServerDaysChanged( int value ); void slotLeaveOnServerCountChanged( int value ); void slotFilterOnServerSizeChanged( int value ); diff -Nru kdepim-runtime-4.12.95/resources/pop3/wizard/CMakeLists.txt kdepim-runtime-4.12.97/resources/pop3/wizard/CMakeLists.txt --- kdepim-runtime-4.12.95/resources/pop3/wizard/CMakeLists.txt 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/pop3/wizard/CMakeLists.txt 2014-03-26 07:25:02.000000000 +0000 @@ -1,2 +1,2 @@ -install ( FILES pop3wizard.desktop pop3wizard.js pop3wizard.ui DESTINATION ${DATA_INSTALL_DIR}/akonadi/accountwizard/pop3 ) +install ( FILES pop3wizard.desktop pop3wizard.es pop3wizard.ui DESTINATION ${DATA_INSTALL_DIR}/akonadi/accountwizard/pop3 ) diff -Nru kdepim-runtime-4.12.95/resources/pop3/wizard/Messages.sh kdepim-runtime-4.12.97/resources/pop3/wizard/Messages.sh --- kdepim-runtime-4.12.95/resources/pop3/wizard/Messages.sh 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/pop3/wizard/Messages.sh 2014-03-26 07:25:02.000000000 +0000 @@ -1,4 +1,4 @@ #! /usr/bin/env bash $EXTRACTRC *.ui >> rc.cpp $XGETTEXT *.cpp -o $podir/accountwizard_pop3.pot -$XGETTEXT -kqsTr *.js -j -o $podir/accountwizard_pop3.pot +$XGETTEXT -kqsTr *.es -j -o $podir/accountwizard_pop3.pot diff -Nru kdepim-runtime-4.12.95/resources/pop3/wizard/pop3wizard.desktop kdepim-runtime-4.12.97/resources/pop3/wizard/pop3wizard.desktop --- kdepim-runtime-4.12.95/resources/pop3/wizard/pop3wizard.desktop 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/pop3/wizard/pop3wizard.desktop 2014-03-26 07:25:02.000000000 +0000 @@ -99,7 +99,7 @@ [Wizard] Type=message/rfc822 -Script=pop3wizard.js +Script=pop3wizard.es [Translate] Filename=accountwizard_pop3 diff -Nru kdepim-runtime-4.12.95/resources/pop3/wizard/pop3wizard.es kdepim-runtime-4.12.97/resources/pop3/wizard/pop3wizard.es --- kdepim-runtime-4.12.95/resources/pop3/wizard/pop3wizard.es 1970-01-01 00:00:00.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/pop3/wizard/pop3wizard.es 2014-03-26 07:25:02.000000000 +0000 @@ -0,0 +1,63 @@ +/* + Copyright (c) 2009 Montel Laurent + + This library is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public + License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to the + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +// add this function to trim user input of whitespace when needed +String.prototype.trim = function() { return this.replace(/^\s+|\s+$/g, ""); }; + +var page = Dialog.addPage( "pop3wizard.ui", qsTr("Personal Settings") ); + +var userChangedServerAddress = false; + +function serverChanged( arg ) +{ + validateInput(); + if ( arg == "" ) { + userChangedServerAddress = false; + } else { + userChangedServerAddress = true; + } +} + +function validateInput() +{ + if ( page.widget().incommingAddress.text.trim() == "" ) { + page.setValid( false ); + } else { + page.setValid( true ); + } +} + +function setup() +{ + var pop3Res = SetupManager.createResource( "akonadi_pop3_resource" ); + pop3Res.setOption( "Host", page.widget().incommingAddress.text.trim() ); + pop3Res.setOption( "Login", page.widget().userName.text.trim() ); + pop3Res.setOption( "Password", SetupManager.password() ); + + var smtp = SetupManager.createTransport( "smtp" ); + smtp.setName( SetupManager.name() ); + smtp.setHost( page.widget().outgoingAddress.text.trim() ); + smtp.setEncryption( "NONE" ); + + SetupManager.execute(); +} + +page.widget().incommingAddress.textChanged.connect( serverChanged ); +page.pageLeftNext.connect( setup ); +validateInput(); diff -Nru kdepim-runtime-4.12.95/resources/pop3/wizard/pop3wizard.js kdepim-runtime-4.12.97/resources/pop3/wizard/pop3wizard.js --- kdepim-runtime-4.12.95/resources/pop3/wizard/pop3wizard.js 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/pop3/wizard/pop3wizard.js 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -/* - Copyright (c) 2009 Montel Laurent - - This library is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published by - the Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public - License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. -*/ - -// add this function to trim user input of whitespace when needed -String.prototype.trim = function() { return this.replace(/^\s+|\s+$/g, ""); }; - -var page = Dialog.addPage( "pop3wizard.ui", qsTr("Personal Settings") ); - -var userChangedServerAddress = false; - -function serverChanged( arg ) -{ - validateInput(); - if ( arg == "" ) { - userChangedServerAddress = false; - } else { - userChangedServerAddress = true; - } -} - -function validateInput() -{ - if ( page.widget().incommingAddress.text.trim() == "" ) { - page.setValid( false ); - } else { - page.setValid( true ); - } -} - -function setup() -{ - var pop3Res = SetupManager.createResource( "akonadi_pop3_resource" ); - pop3Res.setOption( "Host", page.widget().incommingAddress.text.trim() ); - pop3Res.setOption( "Login", page.widget().userName.text.trim() ); - pop3Res.setOption( "Password", SetupManager.password() ); - - var smtp = SetupManager.createTransport( "smtp" ); - smtp.setName( SetupManager.name() ); - smtp.setHost( page.widget().outgoingAddress.text.trim() ); - smtp.setEncryption( "NONE" ); - - SetupManager.execute(); -} - -connect( page.widget().incommingAddress, "textChanged(QString)", this, "serverChanged(QString)" ); -connect( page, "pageLeftNext()", this, "setup()" ); -validateInput(); diff -Nru kdepim-runtime-4.12.95/resources/shared/createandsettagsjob.cpp kdepim-runtime-4.12.97/resources/shared/createandsettagsjob.cpp --- kdepim-runtime-4.12.95/resources/shared/createandsettagsjob.cpp 2014-03-20 04:44:26.000000000 +0000 +++ kdepim-runtime-4.12.97/resources/shared/createandsettagsjob.cpp 2014-03-26 07:25:02.000000000 +0000 @@ -25,7 +25,8 @@ CreateAndSetTagsJob::CreateAndSetTagsJob(const Item& item, const Akonadi::Tag::List& tags, QObject* parent) : KJob(parent), mItem(item), - mTags(tags) + mTags(tags), + mCount(0) { } @@ -67,4 +68,4 @@ setError(KJob::UserDefinedError); } emitResult(); -} \ No newline at end of file +}