Hello community, here is the log from the commit of package libkdepim for openSUSE:Factory checked in at 2018-03-20 21:40:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkdepim (Old) and /work/SRC/openSUSE:Factory/.libkdepim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkdepim" Tue Mar 20 21:40:59 2018 rev:24 rq:585642 version:17.12.3 Changes: -------- --- /work/SRC/openSUSE:Factory/libkdepim/libkdepim.changes 2018-02-12 10:04:34.256521263 +0100 +++ /work/SRC/openSUSE:Factory/.libkdepim.new/libkdepim.changes 2018-03-20 21:41:01.367454088 +0100 @@ -1,0 +2,10 @@ +Thu Mar 08 23:52:21 CET 2018 - [email protected] + +- Update to 17.12.3 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.12.3.php +- Changes since 17.12.2: + * None + +------------------------------------------------------------------- Old: ---- libkdepim-17.12.2.tar.xz New: ---- libkdepim-17.12.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkdepim.spec ++++++ --- /var/tmp/diff_new_pack.ClDtcN/_old 2018-03-20 21:41:02.151425870 +0100 +++ /var/tmp/diff_new_pack.ClDtcN/_new 2018-03-20 21:41:02.155425726 +0100 @@ -19,10 +19,10 @@ %bcond_without lang Name: libkdepim -Version: 17.12.2 +Version: 17.12.3 Release: 0 Summary: Base package of kdepim -License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/Libraries Url: http://www.kde.org Source0: %{name}-%{version}.tar.xz @@ -82,7 +82,7 @@ %package -n libKF5Libkdepim5 Summary: libkdepim library -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries Requires: %{name} >= %{version} @@ -91,7 +91,7 @@ %package -n libKF5LibkdepimAkonadi5 Summary: libkdepim Akonadi library -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries Requires: %{name} >= %{version} @@ -107,7 +107,7 @@ %package devel Summary: Development package for libkdepim -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/KDE Requires: akonadi-contacts-devel Requires: akonadi-server-devel ++++++ libkdepim-17.12.2.tar.xz -> libkdepim-17.12.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-17.12.2/CMakeLists.txt new/libkdepim-17.12.3/CMakeLists.txt --- old/libkdepim-17.12.2/CMakeLists.txt 2018-02-06 01:43:52.000000000 +0100 +++ new/libkdepim-17.12.3/CMakeLists.txt 2018-03-06 01:31:57.000000000 +0100 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.7.2") +set(PIM_VERSION "5.7.3") project(libkdepim VERSION ${PIM_VERSION}) @@ -24,12 +24,12 @@ set(LIBKDEPIM_LIB_VERSION ${PIM_VERSION}) -set(AKONADICONTACT_LIB_VERSION "5.7.2") +set(AKONADICONTACT_LIB_VERSION "5.7.3") set(QT_REQUIRED_VERSION "5.8.0") -set(KLDAP_LIB_VERSION "5.7.2") -set(KCONTACTS_LIB_VERSION "5.7.2") -set(AKONADISEARCH_LIB_VERSION "5.7.2") -set(AKONADI_VERSION "5.7.2") +set(KLDAP_LIB_VERSION "5.7.3") +set(KCONTACTS_LIB_VERSION "5.7.3") +set(AKONADISEARCH_LIB_VERSION "5.7.3") +set(AKONADI_VERSION "5.7.3") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test DBus Network) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-17.12.2/po/de/libkdepim.po new/libkdepim-17.12.3/po/de/libkdepim.po --- old/libkdepim-17.12.2/po/de/libkdepim.po 2018-02-06 01:43:51.000000000 +0100 +++ new/libkdepim-17.12.3/po/de/libkdepim.po 2018-03-06 01:31:56.000000000 +0100 @@ -729,7 +729,7 @@ "<para>A contact for <email>%1</email> was successfully added to your address " "book.</para><para>Do you want to edit this new contact now?</para>" msgstr "" -"<para>Ein Kontakt für <email>%1</email> Wurde erfolgreich zu Ihrem " +"<para>Ein Kontakt für <email>%1</email> wurde erfolgreich zu Ihrem " "Adressbuch hinzugefügt.</para><para>Möchten Sie diesen neuen Kontakt jetzt " "bearbeiten?</para>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-17.12.2/po/nb/libkdepim.po new/libkdepim-17.12.3/po/nb/libkdepim.po --- old/libkdepim-17.12.2/po/nb/libkdepim.po 2018-02-06 01:43:52.000000000 +0100 +++ new/libkdepim-17.12.3/po/nb/libkdepim.po 2018-03-06 01:31:56.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: libkdepim\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-08-31 03:05+0200\n" +"POT-Creation-Date: 2017-11-11 03:18+0100\n" "PO-Revision-Date: 2014-09-13 18:14+0200\n" "Last-Translator: Bjørn Steensrud <[email protected]>\n" "Language-Team: Norwegian Bokmål <[email protected]>\n" @@ -34,18 +34,18 @@ "[email protected],[email protected],[email protected]," "[email protected]" -#: libkdepim/addressline/recentaddress/recentaddresswidget.cpp:56 +#: libkdepim/addressline/recentaddress/recentaddresswidget.cpp:59 #, kde-format msgid "Add" msgstr "" -#: libkdepim/addressline/recentaddress/recentaddresswidget.cpp:66 -#: libkdepim/addressline/recentaddress/recentaddresswidget.cpp:121 +#: libkdepim/addressline/recentaddress/recentaddresswidget.cpp:69 +#: libkdepim/addressline/recentaddress/recentaddresswidget.cpp:124 #, kde-format msgid "Remove" msgstr "Fjern" -#: libkdepim/addressline/recentaddress/recentaddresswidget.cpp:121 +#: libkdepim/addressline/recentaddress/recentaddresswidget.cpp:124 #, kde-format msgid "Do you want to remove this email address?" msgid_plural "Do you want to remove %1 email addresses?" @@ -135,7 +135,7 @@ msgstr "Tittel" #: libkdepim/ldap/ldapsearchdialog.cpp:107 -#: libkdepim/ldap/ldapsearchdialog.cpp:315 +#: libkdepim/ldap/ldapsearchdialog.cpp:317 #, kde-format msgid "Full Name" msgstr "Fullt navn" @@ -147,25 +147,25 @@ msgstr "E-post" #: libkdepim/ldap/ldapsearchdialog.cpp:109 -#: libkdepim/ldap/ldapsearchdialog.cpp:321 +#: libkdepim/ldap/ldapsearchdialog.cpp:323 #, kde-format msgid "Home Number" msgstr "Telefonnummer hjemme" #: libkdepim/ldap/ldapsearchdialog.cpp:110 -#: libkdepim/ldap/ldapsearchdialog.cpp:324 +#: libkdepim/ldap/ldapsearchdialog.cpp:326 #, kde-format msgid "Work Number" msgstr "Telefonnummer arbeid" #: libkdepim/ldap/ldapsearchdialog.cpp:111 -#: libkdepim/ldap/ldapsearchdialog.cpp:327 +#: libkdepim/ldap/ldapsearchdialog.cpp:329 #, kde-format msgid "Mobile Number" msgstr "Mobiltlf. nummer" #: libkdepim/ldap/ldapsearchdialog.cpp:112 -#: libkdepim/ldap/ldapsearchdialog.cpp:330 +#: libkdepim/ldap/ldapsearchdialog.cpp:332 #, kde-format msgid "Fax Number" msgstr "Telefaksnummer" @@ -176,7 +176,7 @@ msgstr "Personsøker" #: libkdepim/ldap/ldapsearchdialog.cpp:114 -#: libkdepim/ldap/ldapsearchdialog.cpp:339 +#: libkdepim/ldap/ldapsearchdialog.cpp:341 #, kde-format msgid "Street" msgstr "Gate" @@ -188,190 +188,190 @@ msgstr "Stat" #: libkdepim/ldap/ldapsearchdialog.cpp:116 -#: libkdepim/ldap/ldapsearchdialog.cpp:346 +#: libkdepim/ldap/ldapsearchdialog.cpp:348 #, kde-format msgid "Country" msgstr "Land" #: libkdepim/ldap/ldapsearchdialog.cpp:117 -#: libkdepim/ldap/ldapsearchdialog.cpp:355 +#: libkdepim/ldap/ldapsearchdialog.cpp:357 #, kde-format msgid "City" msgstr "By" #: libkdepim/ldap/ldapsearchdialog.cpp:118 -#: libkdepim/ldap/ldapsearchdialog.cpp:336 +#: libkdepim/ldap/ldapsearchdialog.cpp:338 #, kde-format msgid "Organization" msgstr "Organisasjon" #: libkdepim/ldap/ldapsearchdialog.cpp:119 -#: libkdepim/ldap/ldapsearchdialog.cpp:333 +#: libkdepim/ldap/ldapsearchdialog.cpp:335 #, kde-format msgid "Company" msgstr "Firma" #: libkdepim/ldap/ldapsearchdialog.cpp:120 -#: libkdepim/ldap/ldapsearchdialog.cpp:358 +#: libkdepim/ldap/ldapsearchdialog.cpp:360 #, kde-format msgid "Department" msgstr "Avdeling" #: libkdepim/ldap/ldapsearchdialog.cpp:121 -#: libkdepim/ldap/ldapsearchdialog.cpp:349 +#: libkdepim/ldap/ldapsearchdialog.cpp:351 #, kde-format msgid "Zip Code" msgstr "Postnummer" #: libkdepim/ldap/ldapsearchdialog.cpp:122 -#: libkdepim/ldap/ldapsearchdialog.cpp:352 +#: libkdepim/ldap/ldapsearchdialog.cpp:354 #, kde-format msgid "Postal Address" msgstr "Postadresse" #: libkdepim/ldap/ldapsearchdialog.cpp:123 -#: libkdepim/ldap/ldapsearchdialog.cpp:361 +#: libkdepim/ldap/ldapsearchdialog.cpp:363 #, kde-format msgid "Description" msgstr "Beskrivelse" #: libkdepim/ldap/ldapsearchdialog.cpp:124 -#: libkdepim/ldap/ldapsearchdialog.cpp:364 +#: libkdepim/ldap/ldapsearchdialog.cpp:366 #, kde-format msgid "User ID" msgstr "Bruker-ID" -#: libkdepim/ldap/ldapsearchdialog.cpp:318 +#: libkdepim/ldap/ldapsearchdialog.cpp:320 #, kde-format msgctxt "@title:column Column containing email addresses" msgid "Email" msgstr "E-post" -#: libkdepim/ldap/ldapsearchdialog.cpp:343 +#: libkdepim/ldap/ldapsearchdialog.cpp:345 #, kde-format msgctxt "@title:column Column containing the residential state of the address" msgid "State" msgstr "Stat" -#: libkdepim/ldap/ldapsearchdialog.cpp:367 +#: libkdepim/ldap/ldapsearchdialog.cpp:369 #, kde-format msgctxt "@title:column Column containing title of the person" msgid "Title" msgstr "Tittel" -#: libkdepim/ldap/ldapsearchdialog.cpp:541 +#: libkdepim/ldap/ldapsearchdialog.cpp:543 #, kde-format msgid "Import Contacts from LDAP" msgstr "Importer kontakter fra LDAP" -#: libkdepim/ldap/ldapsearchdialog.cpp:563 +#: libkdepim/ldap/ldapsearchdialog.cpp:566 #, kde-format msgid "Search for Addresses in Directory" msgstr "Søk etter adresser i katalogen" -#: libkdepim/ldap/ldapsearchdialog.cpp:569 +#: libkdepim/ldap/ldapsearchdialog.cpp:572 #, kde-format msgid "Search for:" msgstr "Søk etter:" -#: libkdepim/ldap/ldapsearchdialog.cpp:577 +#: libkdepim/ldap/ldapsearchdialog.cpp:580 #, kde-format msgctxt "In LDAP attribute" msgid "in" msgstr "i" -#: libkdepim/ldap/ldapsearchdialog.cpp:581 +#: libkdepim/ldap/ldapsearchdialog.cpp:584 #, kde-format msgctxt "@item:inlistbox Name of the contact" msgid "Name" msgstr "Navn" -#: libkdepim/ldap/ldapsearchdialog.cpp:582 +#: libkdepim/ldap/ldapsearchdialog.cpp:585 #, kde-format msgctxt "@item:inlistbox email address of the contact" msgid "Email" msgstr "E-post" -#: libkdepim/ldap/ldapsearchdialog.cpp:583 +#: libkdepim/ldap/ldapsearchdialog.cpp:586 #, kde-format msgctxt "@item:inlistbox" msgid "Home Number" msgstr "Telefonnummer hjemme" -#: libkdepim/ldap/ldapsearchdialog.cpp:584 +#: libkdepim/ldap/ldapsearchdialog.cpp:587 #, kde-format msgctxt "@item:inlistbox" msgid "Work Number" msgstr "Telefonnummer arbeid" -#: libkdepim/ldap/ldapsearchdialog.cpp:586 +#: libkdepim/ldap/ldapsearchdialog.cpp:589 #, kde-format msgctxt "@action:button Start searching" msgid "&Search" msgstr "&Søk" -#: libkdepim/ldap/ldapsearchdialog.cpp:602 +#: libkdepim/ldap/ldapsearchdialog.cpp:605 #, kde-format msgid "Recursive search" msgstr "Rekursivt søk" -#: libkdepim/ldap/ldapsearchdialog.cpp:607 +#: libkdepim/ldap/ldapsearchdialog.cpp:610 #, kde-format msgid "Contains" msgstr "Inneholder" -#: libkdepim/ldap/ldapsearchdialog.cpp:608 +#: libkdepim/ldap/ldapsearchdialog.cpp:611 #, kde-format msgid "Starts With" msgstr "Begynner med" -#: libkdepim/ldap/ldapsearchdialog.cpp:618 +#: libkdepim/ldap/ldapsearchdialog.cpp:621 #, kde-format msgid "Search in result" msgstr "Søk i resultat" -#: libkdepim/ldap/ldapsearchdialog.cpp:648 +#: libkdepim/ldap/ldapsearchdialog.cpp:652 #, kde-format msgid "Searching..." msgstr "Søker …" -#: libkdepim/ldap/ldapsearchdialog.cpp:652 +#: libkdepim/ldap/ldapsearchdialog.cpp:656 #, kde-format msgid "Select All" msgstr "Velg alt" -#: libkdepim/ldap/ldapsearchdialog.cpp:655 +#: libkdepim/ldap/ldapsearchdialog.cpp:661 #, kde-format msgid "Unselect All" msgstr "Fravelg alt" -#: libkdepim/ldap/ldapsearchdialog.cpp:661 +#: libkdepim/ldap/ldapsearchdialog.cpp:669 #, kde-format msgid "Add Selected" msgstr "Legg til det valgte" -#: libkdepim/ldap/ldapsearchdialog.cpp:662 +#: libkdepim/ldap/ldapsearchdialog.cpp:670 #, kde-format msgid "Configure LDAP Servers..." msgstr "Sett opp LDAP-tjenere …" -#: libkdepim/ldap/ldapsearchdialog.cpp:698 +#: libkdepim/ldap/ldapsearchdialog.cpp:706 #, kde-format msgid "Copy" msgstr "Kopier" -#: libkdepim/ldap/ldapsearchdialog.cpp:816 +#: libkdepim/ldap/ldapsearchdialog.cpp:824 #, kde-format msgid "You must select an LDAP server before searching." msgstr "Du må velge en LDAP-tjener før du kan søke." -#: libkdepim/ldap/ldapsearchdialog.cpp:911 +#: libkdepim/ldap/ldapsearchdialog.cpp:919 #, kde-format msgctxt "arguments are host name, datetime" msgid "Imported from LDAP directory %1 on %2" msgstr "Importert fra LDAP-katalog %1 på %2" -#: libkdepim/ldap/ldapsearchdialog.cpp:929 +#: libkdepim/ldap/ldapsearchdialog.cpp:937 #, kde-format msgid "Configure the Address Book LDAP Settings" msgstr "Sett opp LDAP-innstillinger for adresseboka" @@ -387,12 +387,12 @@ msgid "Choose..." msgstr "Velg …" -#: libkdepim/prefs/kprefsdialog.cpp:770 +#: libkdepim/prefs/kprefsdialog.cpp:777 #, kde-format msgid "Preferences" msgstr "Innstillinger" -#: libkdepim/prefs/kprefsdialog.cpp:875 +#: libkdepim/prefs/kprefsdialog.cpp:882 #, kde-format msgid "" "You are about to set all preferences to default values. All custom " @@ -401,17 +401,17 @@ "Du skal nå til å sette alle innstillinger til standardverdier. Alle " "selvvalgte endringer blir slettet." -#: libkdepim/prefs/kprefsdialog.cpp:877 +#: libkdepim/prefs/kprefsdialog.cpp:884 #, kde-format msgid "Setting Default Preferences" msgstr "Setter standard-innstillinger" -#: libkdepim/prefs/kprefsdialog.cpp:878 +#: libkdepim/prefs/kprefsdialog.cpp:885 #, kde-format msgid "Reset to Defaults" msgstr "Sett tilbake til standardinnstillinger" -#: libkdepim/progresswidget/progressdialog.cpp:173 +#: libkdepim/progresswidget/progressdialog.cpp:170 #, kde-format msgid "Cancel this operation." msgstr "Avbryt denne handlinga." @@ -431,17 +431,17 @@ msgid "Connection is unencrypted" msgstr "Tilkoblingen er ikke kryptert" -#: libkdepim/progresswidget/statusbarprogresswidget.cpp:89 +#: libkdepim/progresswidget/statusbarprogresswidget.cpp:88 #, kde-format msgid "Open detailed progress dialog" msgstr "Åpne detaljert framdriftsdialog" -#: libkdepim/progresswidget/statusbarprogresswidget.cpp:298 +#: libkdepim/progresswidget/statusbarprogresswidget.cpp:305 #, kde-format msgid "Show detailed progress window" msgstr "Vis detaljert framdriftsvindu" -#: libkdepim/progresswidget/statusbarprogresswidget.cpp:302 +#: libkdepim/progresswidget/statusbarprogresswidget.cpp:308 #, kde-format msgid "Hide detailed progress window" msgstr "Skjul detaljert framdriftsvindu" @@ -452,25 +452,25 @@ msgid "&Today" msgstr "i &dag" -#: libkdepim/widgets/kdatepickerpopup.cpp:104 +#: libkdepim/widgets/kdatepickerpopup.cpp:106 #, kde-format msgctxt "@option tomorrow" msgid "To&morrow" msgstr "i &morgen" -#: libkdepim/widgets/kdatepickerpopup.cpp:105 +#: libkdepim/widgets/kdatepickerpopup.cpp:109 #, kde-format msgctxt "@option next week" msgid "Next &Week" msgstr "Neste &uke" -#: libkdepim/widgets/kdatepickerpopup.cpp:106 +#: libkdepim/widgets/kdatepickerpopup.cpp:112 #, kde-format msgctxt "@option next month" msgid "Next M&onth" msgstr "Neste &måned" -#: libkdepim/widgets/kdatepickerpopup.cpp:114 +#: libkdepim/widgets/kdatepickerpopup.cpp:122 #, kde-format msgctxt "@option do not specify a date" msgid "No Date" @@ -488,56 +488,56 @@ msgid "Fewer" msgstr "Færre" -#: libkdepimakonadi/addressline/addresslineedit/addresseelineedit.cpp:344 +#: libkdepimakonadi/addressline/addresslineedit/addresseelineedit.cpp:342 #, kde-format msgid "vCard Import Failed" msgstr "" -#: libkdepimakonadi/addressline/addresslineedit/addresseelineedit.cpp:345 +#: libkdepimakonadi/addressline/addresslineedit/addresseelineedit.cpp:343 #, kde-format msgid "<qt>Unable to access <b>%1</b>.</qt>" msgstr "<qt>Kunne ikke få tilgang til <b>%1</b>.</qt>" -#: libkdepimakonadi/addressline/addresslineedit/addresseelineedit.cpp:465 +#: libkdepimakonadi/addressline/addresslineedit/addresseelineedit.cpp:463 #, kde-format msgid "Select email from contact" msgstr "" -#: libkdepimakonadi/addressline/addresslineedit/addresseelineedit.cpp:584 +#: libkdepimakonadi/addressline/addresslineedit/addresseelineedit.cpp:582 #, kde-format msgid "Show Organization Unit for LDAP results" msgstr "Vis organisasjonsenhet for LDAP-resultater" -#: libkdepimakonadi/addressline/addresslineedit/addresseelineedit.cpp:592 +#: libkdepimakonadi/addressline/addresslineedit/addresseelineedit.cpp:590 #, kde-format msgid "Configure Completion..." msgstr "" -#: libkdepimakonadi/addressline/addresslineedit/addresseelineedit.cpp:596 +#: libkdepimakonadi/addressline/addresslineedit/addresseelineedit.cpp:594 #, kde-format msgid "Automatically expand groups" msgstr "" -#: libkdepimakonadi/addressline/addresslineedit/addresseelineedit.cpp:602 +#: libkdepimakonadi/addressline/addresslineedit/addresseelineedit.cpp:600 #, kde-format msgid "Expand Groups..." msgstr "" -#: libkdepimakonadi/addressline/addresslineedit/addresseelineedit.cpp:637 +#: libkdepimakonadi/addressline/addresslineedit/addresseelineedit.cpp:635 #: libkdepimakonadi/addressline/completionorder/completionorderwidget.cpp:326 #, kde-format msgid "Recent Addresses" msgstr "Nylig brukte adresser" -#: libkdepimakonadi/addressline/addresslineedit/addresseelineedit_p.cpp:123 -#: libkdepimakonadi/addressline/addresslineedit/addresseelineedit_p.cpp:788 -#: libkdepimakonadi/addressline/addresslineedit/addresseelineedit_p.cpp:789 +#: libkdepimakonadi/addressline/addresslineedit/addresseelineedit_p.cpp:126 +#: libkdepimakonadi/addressline/addresslineedit/addresseelineedit_p.cpp:791 +#: libkdepimakonadi/addressline/addresslineedit/addresseelineedit_p.cpp:792 #, kde-format msgctxt "@title:group" msgid "Contacts found in your data" msgstr "Kontakter funnet i dine data" -#: libkdepimakonadi/addressline/addresslineedit/addresseelineeditldap.cpp:52 +#: libkdepimakonadi/addressline/addresslineedit/addresseelineeditldap.cpp:47 #, kde-format msgid "LDAP server: %1" msgstr "LDAP-tjener: %1" @@ -563,32 +563,32 @@ msgid "Show Blacklisted Emails" msgstr "" -#: libkdepimakonadi/addressline/blacklistbaloocompletion/blacklistbalooemailcompletionwidget.cpp:83 +#: libkdepimakonadi/addressline/blacklistbaloocompletion/blacklistbalooemailcompletionwidget.cpp:89 #, kde-format msgid "&Select" msgstr "&Velg" -#: libkdepimakonadi/addressline/blacklistbaloocompletion/blacklistbalooemailcompletionwidget.cpp:88 +#: libkdepimakonadi/addressline/blacklistbaloocompletion/blacklistbalooemailcompletionwidget.cpp:94 #, kde-format msgid "&Unselect" msgstr "" -#: libkdepimakonadi/addressline/blacklistbaloocompletion/blacklistbalooemailcompletionwidget.cpp:93 +#: libkdepimakonadi/addressline/blacklistbaloocompletion/blacklistbalooemailcompletionwidget.cpp:99 #, kde-format msgid "<qt><a href=\"more_result\">More result...</a></qt>" msgstr "" -#: libkdepimakonadi/addressline/blacklistbaloocompletion/blacklistbalooemailcompletionwidget.cpp:108 +#: libkdepimakonadi/addressline/blacklistbaloocompletion/blacklistbalooemailcompletionwidget.cpp:113 #, kde-format msgid "Search in result..." msgstr "" -#: libkdepimakonadi/addressline/blacklistbaloocompletion/blacklistbalooemailcompletionwidget.cpp:122 +#: libkdepimakonadi/addressline/blacklistbaloocompletion/blacklistbalooemailcompletionwidget.cpp:126 #, kde-format msgid "Exclude domain names:" msgstr "" -#: libkdepimakonadi/addressline/blacklistbaloocompletion/blacklistbalooemailcompletionwidget.cpp:131 +#: libkdepimakonadi/addressline/blacklistbaloocompletion/blacklistbalooemailcompletionwidget.cpp:135 #, kde-format msgid "Separate domain with '%1'" msgstr "" @@ -605,7 +605,7 @@ msgstr[0] "" msgstr[1] "" -#: libkdepimakonadi/addressline/blacklistbaloocompletion/blacklistbalooemaillist.cpp:136 +#: libkdepimakonadi/addressline/blacklistbaloocompletion/blacklistbalooemaillist.cpp:135 #, kde-format msgid "No result found" msgstr "" @@ -672,7 +672,7 @@ "Den primære e-postadressen til dette vCardet er i adresseboka fra før, men " "du kan lagre vCardet til en fil og importere fila manuelt til adresseboka." -#: libkdepimakonadi/job/addcontactjob.cpp:127 +#: libkdepimakonadi/job/addcontactjob.cpp:129 #, kde-format msgctxt "@info" msgid "" @@ -691,8 +691,8 @@ msgstr "" "En kontakt med e-postadressen <email>%1</email> finnes i adresseboka fra før." -#: libkdepimakonadi/job/addemailaddressjob.cpp:141 -#: libkdepimakonadi/job/addemaildisplayjob.cpp:159 +#: libkdepimakonadi/job/addemailaddressjob.cpp:143 +#: libkdepimakonadi/job/addemaildisplayjob.cpp:167 #, kde-format msgctxt "@info" msgid "" @@ -702,20 +702,20 @@ "Du må opprette en adressebok før du legger til en kontakt. Vil du opprette " "en adressebok?" -#: libkdepimakonadi/job/addemailaddressjob.cpp:142 -#: libkdepimakonadi/job/addemaildisplayjob.cpp:160 +#: libkdepimakonadi/job/addemailaddressjob.cpp:144 +#: libkdepimakonadi/job/addemaildisplayjob.cpp:168 #, kde-format msgctxt "@title:window" msgid "No Address Book Available" msgstr "Ingen tilgjengelig adressebok" -#: libkdepimakonadi/job/addemailaddressjob.cpp:144 -#: libkdepimakonadi/job/addemaildisplayjob.cpp:162 +#: libkdepimakonadi/job/addemailaddressjob.cpp:146 +#: libkdepimakonadi/job/addemaildisplayjob.cpp:170 #, kde-format msgid "Add Address Book" msgstr "Legg til adressebok" -#: libkdepimakonadi/job/addemailaddressjob.cpp:230 +#: libkdepimakonadi/job/addemailaddressjob.cpp:236 #, kde-kuit-format msgctxt "@info" msgid "" @@ -725,17 +725,17 @@ "<para>En kontakt for <email>%1</email> ble lagt til i adresseboka di.</para> " "<para>Vil du redigere denne nye kontakten nå?</para>" -#: libkdepimakonadi/job/addemailaddressjob.cpp:260 +#: libkdepimakonadi/job/addemailaddressjob.cpp:270 #, kde-format msgid "Contact cannot be stored: %1" msgstr "Kan ikke lagre kontakten: %1" -#: libkdepimakonadi/job/addemailaddressjob.cpp:260 +#: libkdepimakonadi/job/addemailaddressjob.cpp:270 #, kde-format msgid "Failed to store contact" msgstr "Klarte ikke å lagre kontakten" -#: libkdepimakonadi/job/addemailaddressjob.cpp:267 +#: libkdepimakonadi/job/addemailaddressjob.cpp:277 #, kde-format msgid "Contact created successfully" msgstr "Kontakt vellykket opprettet" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-17.12.2/po/zh_CN/libkdepim.po new/libkdepim-17.12.3/po/zh_CN/libkdepim.po --- old/libkdepim-17.12.2/po/zh_CN/libkdepim.po 2018-02-06 01:43:52.000000000 +0100 +++ new/libkdepim-17.12.3/po/zh_CN/libkdepim.po 2018-03-06 01:31:57.000000000 +0100 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-11-11 03:18+0100\n" -"PO-Revision-Date: 2018-02-04 20:33-0500\n" +"PO-Revision-Date: 2018-02-28 02:28-0500\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n"
