Hello community, here is the log from the commit of package kdepim-apps-libs for openSUSE:Factory checked in at 2018-08-22 14:12:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim-apps-libs (Old) and /work/SRC/openSUSE:Factory/.kdepim-apps-libs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepim-apps-libs" Wed Aug 22 14:12:49 2018 rev:30 rq:630129 version:18.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim-apps-libs/kdepim-apps-libs.changes 2018-07-18 22:42:02.945326099 +0200 +++ /work/SRC/openSUSE:Factory/.kdepim-apps-libs.new/kdepim-apps-libs.changes 2018-08-22 14:12:50.621284053 +0200 @@ -1,0 +2,21 @@ +Thu Aug 16 22:03:32 UTC 2018 - [email protected] + +- Update to 18.08.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.08.0.php +- Changes since 18.07.80: + * None + +------------------------------------------------------------------- +Thu Jul 26 13:00:38 UTC 2018 - [email protected] + +- Update to 18.07.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.07.80.php +- Changes since 18.04.3: + * Use Q_REQUIRED_RESULT + * Indent + +------------------------------------------------------------------- Old: ---- kdepim-apps-libs-18.04.3.tar.xz New: ---- kdepim-apps-libs-18.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim-apps-libs.spec ++++++ --- /var/tmp/diff_new_pack.Unxuio/_old 2018-08-22 14:12:51.021285001 +0200 +++ /var/tmp/diff_new_pack.Unxuio/_new 2018-08-22 14:12:51.025285011 +0200 @@ -19,11 +19,11 @@ %bcond_without lang Name: kdepim-apps-libs -Version: 18.04.3 +Version: 18.08.0 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) -%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} +%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: Base package of kdepim License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/Libraries @@ -53,17 +53,13 @@ BuildRequires: pkgconfig(Qt5Gui) >= 5.6.0 BuildRequires: pkgconfig(Qt5Test) >= 5.6.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.6.0 -%if %{with lang} Recommends: %{name}-lang -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description This package contains mail related libraries -%if %{with lang} %lang_package -%endif %prep %setup -q @@ -95,6 +91,7 @@ %files devel %defattr(-,root,root) +%license COPYING* %{_kf5_includedir}/ %{_kf5_cmakedir}/KF5KaddressbookImportExport/ %{_kf5_libdir}/cmake/KF5FollowupReminder/ @@ -114,6 +111,7 @@ %files %defattr(-,root,root) +%license COPYING* %config %{_kf5_configdir}/kdepim-apps-lib.categories %config %{_kf5_configdir}/kdepim-apps-lib.renamecategories %{_kf5_libdir}/libKF5FollowupReminder.so.* @@ -124,7 +122,7 @@ %if %{with lang} %files lang -f %{name}.lang -%doc COPYING* +%license COPYING* %endif %changelog ++++++ kdepim-apps-libs-18.04.3.tar.xz -> kdepim-apps-libs-18.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-18.04.3/CMakeLists.txt new/kdepim-apps-libs-18.08.0/CMakeLists.txt --- old/kdepim-apps-libs-18.04.3/CMakeLists.txt 2018-07-10 02:15:39.000000000 +0200 +++ new/kdepim-apps-libs-18.08.0/CMakeLists.txt 2018-08-10 02:15:05.000000000 +0200 @@ -1,8 +1,8 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.8.3") +set(PIM_VERSION "5.9.0") project(kdepim-apps-lib VERSION ${PIM_VERSION}) -set(KF5_VERSION "5.44.0") +set(KF5_VERSION "5.47.0") find_package(ECM ${KF5_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -27,14 +27,14 @@ set(KDEPIM_APPS_LIB_VERSION ${PIM_VERSION}) -set(QT_REQUIRED_VERSION "5.8.0") +set(QT_REQUIRED_VERSION "5.9.0") -set(AKONADI_VERSION "5.8.3") -set(GRANTLEETHEME_LIB_VERSION "5.8.3") -set(KCONTACTS_LIB_VERSION "5.8.3") -set(AKONADICONTACT_LIB_VERSION "5.8.3") -set(LIBKLEO_LIB_VERSION "5.8.3") -set(PIMCOMMON_LIB_VERSION "5.8.3") +set(AKONADI_VERSION "5.9.0") +set(GRANTLEETHEME_LIB_VERSION "5.9.0") +set(KCONTACTS_LIB_VERSION "5.9.0") +set(AKONADICONTACT_LIB_VERSION "5.9.0") +set(LIBKLEO_LIB_VERSION "5.9.0") +set(PIMCOMMON_LIB_VERSION "5.9.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Gui) @@ -60,7 +60,7 @@ if(BUILD_TESTING) find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Test) - add_definitions(-DBUILD_TESTING) + add_definitions(-DBUILD_TESTING) endif() add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-18.04.3/kaddressbookgrantlee/src/contactobject/contactgrantleeaddressobject.h new/kdepim-apps-libs-18.08.0/kaddressbookgrantlee/src/contactobject/contactgrantleeaddressobject.h --- old/kdepim-apps-libs-18.04.3/kaddressbookgrantlee/src/contactobject/contactgrantleeaddressobject.h 2018-06-29 07:04:49.000000000 +0200 +++ new/kdepim-apps-libs-18.08.0/kaddressbookgrantlee/src/contactobject/contactgrantleeaddressobject.h 2018-08-06 07:14:46.000000000 +0200 @@ -39,15 +39,15 @@ explicit ContactGrantleeAddressObject(const KContacts::Address &address, QObject *parent = nullptr); ~ContactGrantleeAddressObject(); - QString type() const; - QString street() const; - QString postOfficeBox() const; - QString locality() const; - QString region() const; - QString postalCode() const; - QString country() const; - QString label() const; - QString formattedAddress() const; + Q_REQUIRED_RESULT QString type() const; + Q_REQUIRED_RESULT QString street() const; + Q_REQUIRED_RESULT QString postOfficeBox() const; + Q_REQUIRED_RESULT QString locality() const; + Q_REQUIRED_RESULT QString region() const; + Q_REQUIRED_RESULT QString postalCode() const; + Q_REQUIRED_RESULT QString country() const; + Q_REQUIRED_RESULT QString label() const; + Q_REQUIRED_RESULT QString formattedAddress() const; private: KContacts::Address mAddress; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-18.04.3/kaddressbookgrantlee/src/contactobject/contactgrantleecryptoobject.h new/kdepim-apps-libs-18.08.0/kaddressbookgrantlee/src/contactobject/contactgrantleecryptoobject.h --- old/kdepim-apps-libs-18.04.3/kaddressbookgrantlee/src/contactobject/contactgrantleecryptoobject.h 2018-06-29 07:04:49.000000000 +0200 +++ new/kdepim-apps-libs-18.08.0/kaddressbookgrantlee/src/contactobject/contactgrantleecryptoobject.h 2018-08-06 07:14:46.000000000 +0200 @@ -31,8 +31,8 @@ explicit ContactGrantleeCryptoObject(const KContacts::Addressee &address, QObject *parent = nullptr); ~ContactGrantleeCryptoObject(); - QString signaturePreference() const; - QString cryptoPreference() const; + Q_REQUIRED_RESULT QString signaturePreference() const; + Q_REQUIRED_RESULT QString cryptoPreference() const; private: KContacts::Addressee mAddress; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-18.04.3/kaddressbookgrantlee/src/contactobject/contactgrantleeemail.h new/kdepim-apps-libs-18.08.0/kaddressbookgrantlee/src/contactobject/contactgrantleeemail.h --- old/kdepim-apps-libs-18.04.3/kaddressbookgrantlee/src/contactobject/contactgrantleeemail.h 2018-06-29 07:04:49.000000000 +0200 +++ new/kdepim-apps-libs-18.08.0/kaddressbookgrantlee/src/contactobject/contactgrantleeemail.h 2018-08-06 07:14:46.000000000 +0200 @@ -35,10 +35,10 @@ public: explicit ContactGrantleeEmail(const KContacts::Addressee &addressee, const KContacts::Email &email, QObject *parent = nullptr); ~ContactGrantleeEmail(); - QString emailFormatted() const; + Q_REQUIRED_RESULT QString emailFormatted() const; - QString email() const; - bool preferred() const; + Q_REQUIRED_RESULT QString email() const; + Q_REQUIRED_RESULT bool preferred() const; private: KContacts::Email mEmail; KContacts::Addressee mAddressee; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-18.04.3/kaddressbookgrantlee/src/contactobject/contactgrantleegeoobject.h new/kdepim-apps-libs-18.08.0/kaddressbookgrantlee/src/contactobject/contactgrantleegeoobject.h --- old/kdepim-apps-libs-18.04.3/kaddressbookgrantlee/src/contactobject/contactgrantleegeoobject.h 2018-06-29 07:04:49.000000000 +0200 +++ new/kdepim-apps-libs-18.08.0/kaddressbookgrantlee/src/contactobject/contactgrantleegeoobject.h 2018-08-06 07:14:46.000000000 +0200 @@ -36,10 +36,10 @@ explicit ContactGrantleeGeoObject(const KContacts::Geo &geo, QObject *parent = nullptr); ~ContactGrantleeGeoObject(); - float latitude() const; - float longitude() const; - QString toString() const; - bool isValid() const; + Q_REQUIRED_RESULT float latitude() const; + Q_REQUIRED_RESULT float longitude() const; + Q_REQUIRED_RESULT QString toString() const; + Q_REQUIRED_RESULT bool isValid() const; private: KContacts::Geo mGeo; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-18.04.3/kaddressbookgrantlee/src/contactobject/contactgrantleeimobject.h new/kdepim-apps-libs-18.08.0/kaddressbookgrantlee/src/contactobject/contactgrantleeimobject.h --- old/kdepim-apps-libs-18.04.3/kaddressbookgrantlee/src/contactobject/contactgrantleeimobject.h 2018-06-29 07:04:49.000000000 +0200 +++ new/kdepim-apps-libs-18.08.0/kaddressbookgrantlee/src/contactobject/contactgrantleeimobject.h 2018-08-06 07:14:46.000000000 +0200 @@ -31,8 +31,8 @@ explicit ContactGrantleeImObject(const QString &type, const QString &address, QObject *parent = nullptr); ~ContactGrantleeImObject(); - QString type() const; - QString address() const; + Q_REQUIRED_RESULT QString type() const; + Q_REQUIRED_RESULT QString address() const; private: QString mType; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-18.04.3/kaddressbookgrantlee/src/contactobject/contactgrantleephoneobject.h new/kdepim-apps-libs-18.08.0/kaddressbookgrantlee/src/contactobject/contactgrantleephoneobject.h --- old/kdepim-apps-libs-18.04.3/kaddressbookgrantlee/src/contactobject/contactgrantleephoneobject.h 2018-06-29 07:04:49.000000000 +0200 +++ new/kdepim-apps-libs-18.08.0/kaddressbookgrantlee/src/contactobject/contactgrantleephoneobject.h 2018-08-06 07:14:46.000000000 +0200 @@ -33,9 +33,9 @@ explicit ContactGrantleePhoneObject(const KContacts::PhoneNumber &phone, QObject *parent = nullptr); ~ContactGrantleePhoneObject(); - QString type() const; - QString number() const; - bool preferred() const; + Q_REQUIRED_RESULT QString type() const; + Q_REQUIRED_RESULT QString number() const; + Q_REQUIRED_RESULT bool preferred() const; private: KContacts::PhoneNumber mPhoneNumber; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-18.04.3/kaddressbookgrantlee/src/contactobject/contactgrantleewebsite.h new/kdepim-apps-libs-18.08.0/kaddressbookgrantlee/src/contactobject/contactgrantleewebsite.h --- old/kdepim-apps-libs-18.04.3/kaddressbookgrantlee/src/contactobject/contactgrantleewebsite.h 2018-06-29 07:04:49.000000000 +0200 +++ new/kdepim-apps-libs-18.08.0/kaddressbookgrantlee/src/contactobject/contactgrantleewebsite.h 2018-08-06 07:14:46.000000000 +0200 @@ -31,8 +31,8 @@ public: explicit ContactGrantleeWebSite(const KContacts::ResourceLocatorUrl &resourceLocator, QObject *parent = nullptr); ~ContactGrantleeWebSite(); - QString url() const; - bool preferred() const; + Q_REQUIRED_RESULT QString url() const; + Q_REQUIRED_RESULT bool preferred() const; private: KContacts::ResourceLocatorUrl mResourceLocator; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-18.04.3/kaddressbookgrantlee/src/formatter/grantleecontactformatter.h new/kdepim-apps-libs-18.08.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.h --- old/kdepim-apps-libs-18.04.3/kaddressbookgrantlee/src/formatter/grantleecontactformatter.h 2018-06-29 07:04:49.000000000 +0200 +++ new/kdepim-apps-libs-18.08.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.h 2018-08-06 07:14:46.000000000 +0200 @@ -53,12 +53,12 @@ void setGrantleeTheme(const GrantleeTheme::Theme &theme); void setForceDisableQRCode(bool b); - bool forceDisableQRCode() const; + Q_REQUIRED_RESULT bool forceDisableQRCode() const; /** * Returns the contact formatted as HTML */ - QString toHtml(HtmlForm form = SelfcontainedForm) const override; + Q_REQUIRED_RESULT QString toHtml(HtmlForm form = SelfcontainedForm) const override; void setShowQRCode(bool b); private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-18.04.3/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.h new/kdepim-apps-libs-18.08.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.h --- old/kdepim-apps-libs-18.04.3/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.h 2018-06-29 07:04:49.000000000 +0200 +++ new/kdepim-apps-libs-18.08.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.h 2018-08-06 07:14:46.000000000 +0200 @@ -54,7 +54,7 @@ /** * Returns the contact group formatted as HTML */ - QString toHtml(HtmlForm form = SelfcontainedForm) const override; + Q_REQUIRED_RESULT QString toHtml(HtmlForm form = SelfcontainedForm) const override; private: //@cond PRIVATE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-18.04.3/kaddressbookgrantlee/src/formatter/grantleecontactutils.h new/kdepim-apps-libs-18.08.0/kaddressbookgrantlee/src/formatter/grantleecontactutils.h --- old/kdepim-apps-libs-18.04.3/kaddressbookgrantlee/src/formatter/grantleecontactutils.h 2018-06-29 07:04:49.000000000 +0200 +++ new/kdepim-apps-libs-18.08.0/kaddressbookgrantlee/src/formatter/grantleecontactutils.h 2018-08-06 07:14:46.000000000 +0200 @@ -26,7 +26,7 @@ { public: GrantleeContactUtils(); - QString variableI18n(const QString &variable); + Q_REQUIRED_RESULT QString variableI18n(const QString &variable); void insertVariableToQVariantHash(QVariantHash &contactI18n, const QString &variable); }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-18.04.3/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.h new/kdepim-apps-libs-18.08.0/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.h --- old/kdepim-apps-libs-18.04.3/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.h 2018-06-29 07:04:49.000000000 +0200 +++ new/kdepim-apps-libs-18.08.0/kaddressbookgrantlee/src/printing/contactgrantleeprintobject.h 2018-08-06 07:14:46.000000000 +0200 @@ -69,43 +69,43 @@ explicit ContactGrantleePrintObject(const KContacts::Addressee &address, QObject *parent = nullptr); ~ContactGrantleePrintObject(); - QString name() const; - QString realName() const; - QString formattedName() const; - QString prefix() const; - QString givenName() const; - QString additionalName() const; - QString familyName() const; - QString suffix() const; - QString nickName() const; - QStringList emails() const; - QString organization() const; - QString note() const; + Q_REQUIRED_RESULT QString name() const; + Q_REQUIRED_RESULT QString realName() const; + Q_REQUIRED_RESULT QString formattedName() const; + Q_REQUIRED_RESULT QString prefix() const; + Q_REQUIRED_RESULT QString givenName() const; + Q_REQUIRED_RESULT QString additionalName() const; + Q_REQUIRED_RESULT QString familyName() const; + Q_REQUIRED_RESULT QString suffix() const; + Q_REQUIRED_RESULT QString nickName() const; + Q_REQUIRED_RESULT QStringList emails() const; + Q_REQUIRED_RESULT QString organization() const; + Q_REQUIRED_RESULT QString note() const; //webPage deprecated. - QString webPage() const; - QString webSite() const; - QString title() const; - QString preferredEmail() const; - QString role() const; - QString birthday() const; - QString department() const; - QVariant addresses() const; - QVariant phones() const; - QString addressBookName() const; - QVariant instantManging() const; - QVariant geo() const; - QString photo() const; - QString logo() const; - QVariant crypto() const; - QString anniversary() const; - QString profession() const; - QString office() const; - QString manager() const; - QString assistant() const; - QString spouse() const; - QString languages() const; - QVariant webSites() const; - QVariant emailsList() const; + Q_REQUIRED_RESULT QString webPage() const; + Q_REQUIRED_RESULT QString webSite() const; + Q_REQUIRED_RESULT QString title() const; + Q_REQUIRED_RESULT QString preferredEmail() const; + Q_REQUIRED_RESULT QString role() const; + Q_REQUIRED_RESULT QString birthday() const; + Q_REQUIRED_RESULT QString department() const; + Q_REQUIRED_RESULT QVariant addresses() const; + Q_REQUIRED_RESULT QVariant phones() const; + Q_REQUIRED_RESULT QString addressBookName() const; + Q_REQUIRED_RESULT QVariant instantManging() const; + Q_REQUIRED_RESULT QVariant geo() const; + Q_REQUIRED_RESULT QString photo() const; + Q_REQUIRED_RESULT QString logo() const; + Q_REQUIRED_RESULT QVariant crypto() const; + Q_REQUIRED_RESULT QString anniversary() const; + Q_REQUIRED_RESULT QString profession() const; + Q_REQUIRED_RESULT QString office() const; + Q_REQUIRED_RESULT QString manager() const; + Q_REQUIRED_RESULT QString assistant() const; + Q_REQUIRED_RESULT QString spouse() const; + Q_REQUIRED_RESULT QString languages() const; + Q_REQUIRED_RESULT QVariant webSites() const; + Q_REQUIRED_RESULT QVariant emailsList() const; private: QString imgToDataUrl(const QImage &image) const; QList<QObject *> mListAddress; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-18.04.3/kaddressbookgrantlee/src/printing/grantleeprint.h new/kdepim-apps-libs-18.08.0/kaddressbookgrantlee/src/printing/grantleeprint.h --- old/kdepim-apps-libs-18.04.3/kaddressbookgrantlee/src/printing/grantleeprint.h 2018-06-29 07:04:49.000000000 +0200 +++ new/kdepim-apps-libs-18.08.0/kaddressbookgrantlee/src/printing/grantleeprint.h 2018-08-06 07:14:46.000000000 +0200 @@ -34,7 +34,7 @@ explicit GrantleePrint(const QString &themePath, QObject *parent = nullptr); ~GrantleePrint(); - QString contactsToHtml(const KContacts::Addressee::List &contacts); + Q_REQUIRED_RESULT QString contactsToHtml(const KContacts::Addressee::List &contacts); }; } #endif // GRANTLEEPRINT_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-18.04.3/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.h new/kdepim-apps-libs-18.08.0/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.h --- old/kdepim-apps-libs-18.04.3/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.h 2018-06-29 07:04:49.000000000 +0200 +++ new/kdepim-apps-libs-18.08.0/kaddressbookimportexport/src/kaddressbookcontactselectiondialog.h 2018-08-06 07:14:46.000000000 +0200 @@ -67,12 +67,12 @@ /** * Returns the list of selected contacts. */ - KAddressBookImportExport::KAddressBookImportExportContactList selectedContacts() const; + Q_REQUIRED_RESULT KAddressBookImportExport::KAddressBookImportExportContactList selectedContacts() const; - KAddressBookExportSelectionWidget::ExportFields exportType() const; + Q_REQUIRED_RESULT KAddressBookExportSelectionWidget::ExportFields exportType() const; void setAddGroupContact(bool addGroupContact); - Akonadi::Item::List selectedItems() const; + Q_REQUIRED_RESULT Akonadi::Item::List selectedItems() const; private: KAddressBookContactSelectionWidget *mSelectionWidget = nullptr; KAddressBookExportSelectionWidget *mVCardExport = nullptr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-18.04.3/kaddressbookimportexport/src/kaddressbookcontactselectionwidget.h new/kdepim-apps-libs-18.08.0/kaddressbookimportexport/src/kaddressbookcontactselectionwidget.h --- old/kdepim-apps-libs-18.04.3/kaddressbookimportexport/src/kaddressbookcontactselectionwidget.h 2018-06-29 07:04:49.000000000 +0200 +++ new/kdepim-apps-libs-18.08.0/kaddressbookimportexport/src/kaddressbookcontactselectionwidget.h 2018-08-06 07:14:46.000000000 +0200 @@ -70,10 +70,10 @@ /** * Returns the list of selected contacts. */ - KAddressBookImportExport::KAddressBookImportExportContactList selectedContacts() const; + Q_REQUIRED_RESULT KAddressBookImportExport::KAddressBookImportExportContactList selectedContacts() const; void setAddGroupContact(bool addGroupContact); - Akonadi::Item::List selectedItems() const; + Q_REQUIRED_RESULT Akonadi::Item::List selectedItems() const; private: void initGui(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-18.04.3/kaddressbookimportexport/src/kaddressbookexportselectionwidget.h new/kdepim-apps-libs-18.08.0/kaddressbookimportexport/src/kaddressbookexportselectionwidget.h --- old/kdepim-apps-libs-18.04.3/kaddressbookimportexport/src/kaddressbookexportselectionwidget.h 2018-06-29 07:04:49.000000000 +0200 +++ new/kdepim-apps-libs-18.08.0/kaddressbookimportexport/src/kaddressbookexportselectionwidget.h 2018-08-06 07:14:46.000000000 +0200 @@ -42,7 +42,7 @@ Q_ENUM(ExportField) Q_DECLARE_FLAGS(ExportFields, ExportField) - ExportFields exportType() const; + Q_REQUIRED_RESULT ExportFields exportType() const; private: void readSettings(); void writeSettings(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-18.04.3/kaddressbookimportexport/src/kaddressbookimportexportcontactfields.h new/kdepim-apps-libs-18.08.0/kaddressbookimportexport/src/kaddressbookimportexportcontactfields.h --- old/kdepim-apps-libs-18.04.3/kaddressbookimportexport/src/kaddressbookimportexportcontactfields.h 2018-06-29 07:04:49.000000000 +0200 +++ new/kdepim-apps-libs-18.08.0/kaddressbookimportexport/src/kaddressbookimportexportcontactfields.h 2018-08-06 07:14:46.000000000 +0200 @@ -98,12 +98,12 @@ /** * Returns the i18n label for the @p field. */ - static QString label(Field field); + Q_REQUIRED_RESULT static QString label(Field field); /** * Returns a list of all available fields. */ - static Fields allFields(); + Q_REQUIRED_RESULT static Fields allFields(); /** * Sets the @p value of the @p field for the @p contact. @@ -113,7 +113,7 @@ /** * Returns the value for the @p field of the @p contact. */ - static QString value(Field field, const KContacts::Addressee &contact); + Q_REQUIRED_RESULT static QString value(Field field, const KContacts::Addressee &contact); }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-18.04.3/kaddressbookimportexport/src/kaddressbookimportexportcontactlist.h new/kdepim-apps-libs-18.08.0/kaddressbookimportexport/src/kaddressbookimportexportcontactlist.h --- old/kdepim-apps-libs-18.04.3/kaddressbookimportexport/src/kaddressbookimportexportcontactlist.h 2018-06-29 07:04:49.000000000 +0200 +++ new/kdepim-apps-libs-18.08.0/kaddressbookimportexport/src/kaddressbookimportexportcontactlist.h 2018-08-06 07:14:46.000000000 +0200 @@ -30,16 +30,16 @@ public: KAddressBookImportExportContactList(); - bool isEmpty() const; - int count() const; + Q_REQUIRED_RESULT bool isEmpty() const; + Q_REQUIRED_RESULT int count() const; void clear(); void append(const KContacts::Addressee &addr); void append(const KContacts::ContactGroup &group); - KContacts::Addressee::List addressList() const; + Q_REQUIRED_RESULT KContacts::Addressee::List addressList() const; void setAddressList(const KContacts::Addressee::List &value); - KContacts::ContactGroup::List contactGroupList() const; + Q_REQUIRED_RESULT KContacts::ContactGroup::List contactGroupList() const; void setContactGroupList(const KContacts::ContactGroup::List &value); private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-18.04.3/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h new/kdepim-apps-libs-18.08.0/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h --- old/kdepim-apps-libs-18.04.3/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h 2018-06-29 07:04:49.000000000 +0200 +++ new/kdepim-apps-libs-18.08.0/kaddressbookimportexport/src/kaddressbookimportexportplugininterface.h 2018-08-06 07:14:46.000000000 +0200 @@ -38,27 +38,27 @@ Export = 1 }; - QList<QAction *> importActions() const; + Q_REQUIRED_RESULT QList<QAction *> importActions() const; void setImportActions(const QList<QAction *> &importAction); - QList<QAction *> exportActions() const; + Q_REQUIRED_RESULT QList<QAction *> exportActions() const; void setExportActions(const QList<QAction *> &exportAction); - ImportExportAction importExportAction() const; + Q_REQUIRED_RESULT ImportExportAction importExportAction() const; void setImportExportAction(const ImportExportAction &importExportAction); - Akonadi::Collection defaultCollection() const; + Q_REQUIRED_RESULT Akonadi::Collection defaultCollection() const; void setDefaultCollection(const Akonadi::Collection &defaultCollection); void setSelectionModel(QItemSelectionModel *model); - QItemSelectionModel *itemSelectionModel() const; + Q_REQUIRED_RESULT QItemSelectionModel *itemSelectionModel() const; void setItemSelectionModel(QItemSelectionModel *itemSelectionModel); - virtual bool canImportFileType(const QUrl &url); + Q_REQUIRED_RESULT virtual bool canImportFileType(const QUrl &url); virtual void importFile(const QUrl &url); - virtual bool canImportData() const; + Q_REQUIRED_RESULT virtual bool canImportData() const; virtual void importData(const QByteArray &data); protected: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-18.04.3/kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.h new/kdepim-apps-libs-18.08.0/kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.h --- old/kdepim-apps-libs-18.04.3/kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.h 2018-06-29 07:04:49.000000000 +0200 +++ new/kdepim-apps-libs-18.08.0/kaddressbookimportexport/src/kaddressbookimportexportpluginmanager.h 2018-08-06 07:14:46.000000000 +0200 @@ -35,12 +35,12 @@ ~KAddressBookImportExportPluginManager(); static KAddressBookImportExportPluginManager *self(); - QVector<KAddressBookImportExportPlugin *> pluginsList() const; + Q_REQUIRED_RESULT QVector<KAddressBookImportExportPlugin *> pluginsList() const; - QVector<PimCommon::PluginUtilData> pluginsDataList() const; + Q_REQUIRED_RESULT QVector<PimCommon::PluginUtilData> pluginsDataList() const; - QString configGroupName() const; - QString configPrefixSettingKey() const; + Q_REQUIRED_RESULT QString configGroupName() const; + Q_REQUIRED_RESULT QString configPrefixSettingKey() const; KAddressBookImportExportPlugin *pluginFromIdentifier(const QString &id); private: KAddressBookImportExportPrivate *const d; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-18.04.3/libfollowupreminder/src/followupreminderinfo.h new/kdepim-apps-libs-18.08.0/libfollowupreminder/src/followupreminderinfo.h --- old/kdepim-apps-libs-18.04.3/libfollowupreminder/src/followupreminderinfo.h 2018-06-29 07:04:49.000000000 +0200 +++ new/kdepim-apps-libs-18.08.0/libfollowupreminder/src/followupreminderinfo.h 2018-08-06 07:14:46.000000000 +0200 @@ -33,37 +33,37 @@ FollowUpReminderInfo(const FollowUpReminderInfo &info); //Can be invalid. - Akonadi::Item::Id originalMessageItemId() const; + Q_REQUIRED_RESULT Akonadi::Item::Id originalMessageItemId() const; void setOriginalMessageItemId(Akonadi::Item::Id value); - Akonadi::Item::Id todoId() const; + Q_REQUIRED_RESULT Akonadi::Item::Id todoId() const; void setTodoId(Akonadi::Item::Id value); - bool isValid() const; + Q_REQUIRED_RESULT bool isValid() const; - QString messageId() const; + Q_REQUIRED_RESULT QString messageId() const; void setMessageId(const QString &messageId); void setTo(const QString &to); - QString to() const; + Q_REQUIRED_RESULT QString to() const; - QDate followUpReminderDate() const; + Q_REQUIRED_RESULT QDate followUpReminderDate() const; void setFollowUpReminderDate(const QDate &followUpReminderDate); void writeConfig(KConfigGroup &config, qint32 identifier); - QString subject() const; + Q_REQUIRED_RESULT QString subject() const; void setSubject(const QString &subject); bool operator ==(const FollowUpReminderInfo &other) const; - bool answerWasReceived() const; + Q_REQUIRED_RESULT bool answerWasReceived() const; void setAnswerWasReceived(bool answerWasReceived); - Akonadi::Item::Id answerMessageItemId() const; + Q_REQUIRED_RESULT Akonadi::Item::Id answerMessageItemId() const; void setAnswerMessageItemId(Akonadi::Item::Id answerMessageItemId); - qint32 uniqueIdentifier() const; + Q_REQUIRED_RESULT qint32 uniqueIdentifier() const; void setUniqueIdentifier(qint32 uniqueIdentifier); private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-18.04.3/libfollowupreminder/src/followupreminderutil.h new/kdepim-apps-libs-18.08.0/libfollowupreminder/src/followupreminderutil.h --- old/kdepim-apps-libs-18.04.3/libfollowupreminder/src/followupreminderutil.h 2018-06-29 07:04:49.000000000 +0200 +++ new/kdepim-apps-libs-18.08.0/libfollowupreminder/src/followupreminderutil.h 2018-08-06 07:14:46.000000000 +0200 @@ -24,9 +24,9 @@ namespace FollowUpReminder { class FollowUpReminderInfo; namespace FollowUpReminderUtil { -FOLLOWUPREMINDER_EXPORT bool followupReminderAgentWasRegistered(); +Q_REQUIRED_RESULT FOLLOWUPREMINDER_EXPORT bool followupReminderAgentWasRegistered(); -FOLLOWUPREMINDER_EXPORT bool followupReminderAgentEnabled(); +Q_REQUIRED_RESULT FOLLOWUPREMINDER_EXPORT bool followupReminderAgentEnabled(); FOLLOWUPREMINDER_EXPORT void reload(); @@ -36,9 +36,9 @@ FOLLOWUPREMINDER_EXPORT void writeFollowupReminderInfo(KSharedConfig::Ptr config, FollowUpReminder::FollowUpReminderInfo *info, bool forceReload); -FOLLOWUPREMINDER_EXPORT bool removeFollowupReminderInfo(KSharedConfig::Ptr config, const QList<qint32> &listRemove, bool forceReload = false); +Q_REQUIRED_RESULT FOLLOWUPREMINDER_EXPORT bool removeFollowupReminderInfo(KSharedConfig::Ptr config, const QList<qint32> &listRemove, bool forceReload = false); -FOLLOWUPREMINDER_EXPORT QString followUpReminderPattern(); +Q_REQUIRED_RESULT FOLLOWUPREMINDER_EXPORT QString followUpReminderPattern(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-18.04.3/libsendlater/src/sendlaterdialog.h new/kdepim-apps-libs-18.08.0/libsendlater/src/sendlaterdialog.h --- old/kdepim-apps-libs-18.04.3/libsendlater/src/sendlaterdialog.h 2018-06-29 07:04:49.000000000 +0200 +++ new/kdepim-apps-libs-18.08.0/libsendlater/src/sendlaterdialog.h 2018-08-06 07:14:46.000000000 +0200 @@ -47,7 +47,7 @@ SendLater::SendLaterInfo *info(); - SendLaterAction action() const; + Q_REQUIRED_RESULT SendLaterAction action() const; private: void slotRecurrenceClicked(bool); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-18.04.3/libsendlater/src/sendlaterinfo.h new/kdepim-apps-libs-18.08.0/libsendlater/src/sendlaterinfo.h --- old/kdepim-apps-libs-18.04.3/libsendlater/src/sendlaterinfo.h 2018-06-29 07:04:49.000000000 +0200 +++ new/kdepim-apps-libs-18.08.0/libsendlater/src/sendlaterinfo.h 2018-08-06 07:14:46.000000000 +0200 @@ -42,34 +42,34 @@ Years }; - bool isValid() const; + Q_REQUIRED_RESULT bool isValid() const; void setItemId(Akonadi::Item::Id id); - Akonadi::Item::Id itemId() const; + Q_REQUIRED_RESULT Akonadi::Item::Id itemId() const; void setRecurrenceUnit(RecurrenceUnit unit); - RecurrenceUnit recurrenceUnit() const; + Q_REQUIRED_RESULT RecurrenceUnit recurrenceUnit() const; void setRecurrenceEachValue(int value); - int recurrenceEachValue() const; + Q_REQUIRED_RESULT int recurrenceEachValue() const; - bool isRecurrence() const; + Q_REQUIRED_RESULT bool isRecurrence() const; void setRecurrence(bool b); void setDateTime(const QDateTime &time); - QDateTime dateTime() const; + Q_REQUIRED_RESULT QDateTime dateTime() const; void readConfig(const KConfigGroup &config); void writeConfig(KConfigGroup &config); void setLastDateTimeSend(const QDateTime &date); - QDateTime lastDateTimeSend() const; + Q_REQUIRED_RESULT QDateTime lastDateTimeSend() const; void setSubject(const QString &subject); - QString subject() const; + Q_REQUIRED_RESULT QString subject() const; void setTo(const QString &to); - QString to() const; + Q_REQUIRED_RESULT QString to() const; bool operator ==(const SendLaterInfo &other) const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-18.04.3/libsendlater/src/sendlatertimedatewidget.h new/kdepim-apps-libs-18.08.0/libsendlater/src/sendlatertimedatewidget.h --- old/kdepim-apps-libs-18.04.3/libsendlater/src/sendlatertimedatewidget.h 2018-06-29 07:04:49.000000000 +0200 +++ new/kdepim-apps-libs-18.08.0/libsendlater/src/sendlatertimedatewidget.h 2018-08-06 07:14:46.000000000 +0200 @@ -35,7 +35,7 @@ ~SendLaterTimeDateWidget(); void setDateTime(const QDateTime &); - QDateTime dateTime() const; + Q_REQUIRED_RESULT QDateTime dateTime() const; Q_SIGNALS: void dateTimeChanged(const QDateTime &); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-18.04.3/libsendlater/src/sendlaterutil.h new/kdepim-apps-libs-18.08.0/libsendlater/src/sendlaterutil.h --- old/kdepim-apps-libs-18.04.3/libsendlater/src/sendlaterutil.h 2018-06-29 07:04:49.000000000 +0200 +++ new/kdepim-apps-libs-18.08.0/libsendlater/src/sendlaterutil.h 2018-08-06 07:14:46.000000000 +0200 @@ -26,22 +26,22 @@ namespace SendLater { class SendLaterInfo; namespace SendLaterUtil { -SENDLATER_EXPORT bool compareSendLaterInfo(SendLater::SendLaterInfo *left, SendLater::SendLaterInfo *right); +Q_REQUIRED_RESULT SENDLATER_EXPORT bool compareSendLaterInfo(SendLater::SendLaterInfo *left, SendLater::SendLaterInfo *right); SENDLATER_EXPORT KSharedConfig::Ptr defaultConfig(); SENDLATER_EXPORT void writeSendLaterInfo(KSharedConfig::Ptr config, SendLater::SendLaterInfo *info, bool forceReload = true); -SENDLATER_EXPORT bool sentLaterAgentWasRegistered(); +Q_REQUIRED_RESULT SENDLATER_EXPORT bool sentLaterAgentWasRegistered(); -SENDLATER_EXPORT bool sentLaterAgentEnabled(); +Q_REQUIRED_RESULT SENDLATER_EXPORT bool sentLaterAgentEnabled(); SENDLATER_EXPORT void reload(); SENDLATER_EXPORT void changeRecurrentDate(SendLater::SendLaterInfo *info); SENDLATER_EXPORT void forceReparseConfiguration(); -SENDLATER_EXPORT QString sendLaterPattern(); +Q_REQUIRED_RESULT SENDLATER_EXPORT QString sendLaterPattern(); } } #endif // SENDLATERUTIL_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-18.04.3/libsendlater/src/sendlaterutil_p.h new/kdepim-apps-libs-18.08.0/libsendlater/src/sendlaterutil_p.h --- old/kdepim-apps-libs-18.04.3/libsendlater/src/sendlaterutil_p.h 2018-06-29 07:04:49.000000000 +0200 +++ new/kdepim-apps-libs-18.08.0/libsendlater/src/sendlaterutil_p.h 2018-08-06 07:14:46.000000000 +0200 @@ -26,7 +26,7 @@ namespace SendLater { class SendLaterInfo; namespace SendLaterUtil { -QDateTime updateRecurence(SendLater::SendLaterInfo *info, QDateTime dateTime); +Q_REQUIRED_RESULT QDateTime updateRecurence(SendLater::SendLaterInfo *info, QDateTime dateTime); } } #endif // SENDLATERUTIL_P_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-18.04.3/po/zh_CN/libkaddressbookgrantlee.po new/kdepim-apps-libs-18.08.0/po/zh_CN/libkaddressbookgrantlee.po --- old/kdepim-apps-libs-18.04.3/po/zh_CN/libkaddressbookgrantlee.po 2018-07-10 02:15:39.000000000 +0200 +++ new/kdepim-apps-libs-18.08.0/po/zh_CN/libkaddressbookgrantlee.po 2018-08-10 02:15:05.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-10-13 03:27+0200\n" -"PO-Revision-Date: 2018-07-03 17:39\n" +"PO-Revision-Date: 2018-07-24 08:46\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-18.04.3/po/zh_CN/libsendlater.po new/kdepim-apps-libs-18.08.0/po/zh_CN/libsendlater.po --- old/kdepim-apps-libs-18.04.3/po/zh_CN/libsendlater.po 2018-07-10 02:15:39.000000000 +0200 +++ new/kdepim-apps-libs-18.08.0/po/zh_CN/libsendlater.po 2018-08-10 02:15:05.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-09-22 03:32+0200\n" -"PO-Revision-Date: 2018-07-03 17:40\n" +"PO-Revision-Date: 2018-07-24 08:46\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-apps-libs-18.04.3/po/zh_TW/libsendlater.po new/kdepim-apps-libs-18.08.0/po/zh_TW/libsendlater.po --- old/kdepim-apps-libs-18.04.3/po/zh_TW/libsendlater.po 2018-07-10 02:15:39.000000000 +0200 +++ new/kdepim-apps-libs-18.08.0/po/zh_TW/libsendlater.po 2018-08-10 02:15:05.000000000 +0200 @@ -69,141 +69,3 @@ #, kde-format msgid "Repeat every:" msgstr "重覆間隔：" - -#~ msgid "Configure" -#~ msgstr "設定" - -#~ msgid "Send Later Agent" -#~ msgstr "稍後傳送代理程式" - -#~ msgid "Send emails later agent." -#~ msgstr "讓您可以稍後傳送電子郵件。" - -#~ msgid "Copyright (C) 2013-2015 Laurent Montel" -#~ msgstr "Copyright (C) 2013-2015 Laurent Montel" - -#~ msgid "Laurent Montel" -#~ msgstr "Laurent Montel" - -#~ msgid "Maintainer" -#~ msgstr "維護者" - -#~ msgctxt "NAME OF TRANSLATORS" -#~ msgid "Your names" -#~ msgstr "Franklin Weng" - -#~ msgctxt "EMAIL OF TRANSLATORS" -#~ msgid "Your emails" -#~ msgstr "[email protected]" - -#~ msgid "To" -#~ msgstr "收件者" - -#~ msgid "Subject" -#~ msgstr "主題" - -#~ msgid "Send around" -#~ msgstr "傳送於" - -#~ msgid "Recurrent" -#~ msgstr "循環" - -#~ msgid "Message Id" -#~ msgstr "信件代碼" - -#~ msgid "No messages waiting..." -#~ msgstr "沒有等待中的信件..." - -#~ msgid "Send now" -#~ msgstr "立即傳送" - -#~ msgid "Delete" -#~ msgstr "刪除" - -#~ msgid "Yes" -#~ msgstr "是" - -#~ msgid "No" -#~ msgstr "否" - -#~ msgid "Do you want to delete selected items? Do you want to continue?" -#~ msgstr "您確定要刪除選取的項目嗎？" - -#~ msgid "Remove items" -#~ msgstr "移除項目" - -#~ msgid "Do you want to remove messages as well?" -#~ msgstr "您要順便移除信件嗎？" - -#~ msgid "Remove messages" -#~ msgstr "移除信件" - -#~ msgid "Not message found." -#~ msgstr "找不到信件。" - -#~ msgid "No message found." -#~ msgstr "找不到信件。" - -#~ msgid "Error during fetching message." -#~ msgstr "抓取信件時發生錯誤。" - -#~ msgid "Cannot fetch message. %1" -#~ msgstr "無法抓取信件。%1" - -#~ msgid "We can't create transport" -#~ msgstr "無法建立傳送" - -#~ msgid "Message is not a real message" -#~ msgstr "信件不是真的信件" - -#~ msgid "Cannot send message." -#~ msgstr "無法傳送信件。" - -#~ msgid "Message sent" -#~ msgstr "信件已送出" - -#~ msgid "An error was found. Do you want to resend it?" -#~ msgstr "發現了一個錯誤。您要重新傳送嗎？" - -#~ msgid "Error found" -#~ msgstr "發現錯誤" - -#~ msgid "Modify..." -#~ msgstr "變更..." - -#~ msgid "Remove" -#~ msgstr "移除" - -#, fuzzy -#~| msgid "Send Later" -#~ msgid "SendLater" -#~ msgstr "稍後傳送" - -#~ msgid "Recurrence" -#~ msgstr "循環" - -#~ msgid "Each:" -#~ msgstr "每：" - -#~ msgid "30 minutes later" -#~ msgstr "30 分鐘後" - -#~ msgid "1 hour later" -#~ msgstr "一小時後" - -#, fuzzy -#~| msgid "2 hour later" -#~ msgid "2 hours later" -#~ msgstr "兩小時後" - -#~ msgid "Send around %1" -#~ msgstr "約於 %1 傳送" - -#~ msgid "Send Now" -#~ msgstr "立即傳送" - -#~ msgid "Recursive" -#~ msgstr "遞迴" - -#~ msgid "Date" -#~ msgstr "日期"
