Hello community, here is the log from the commit of package akonadi-contact for openSUSE:Factory checked in at 2018-03-20 21:35:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadi-contact (Old) and /work/SRC/openSUSE:Factory/.akonadi-contact.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadi-contact" Tue Mar 20 21:35:12 2018 rev:21 rq:585485 version:17.12.3 Changes: -------- --- /work/SRC/openSUSE:Factory/akonadi-contact/akonadi-contact.changes 2018-02-12 09:57:45.119268325 +0100 +++ /work/SRC/openSUSE:Factory/.akonadi-contact.new/akonadi-contact.changes 2018-03-20 21:35:13.999957312 +0100 @@ -1,0 +2,13 @@ +Thu Mar 08 23:50:51 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: + * Remove duplicate category file + * Fix crash Bug 390965 - kaddressbook-5.7.2 without kdepim-addons crashes adding/editing contacts (kde#390965) + * Remove debug + * Allow barcodes to be nullpointers + +------------------------------------------------------------------- Old: ---- akonadi-contacts-17.12.2.tar.xz New: ---- akonadi-contacts-17.12.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-contact.spec ++++++ --- /var/tmp/diff_new_pack.lRRfzR/_old 2018-03-20 21:35:14.795928661 +0100 +++ /var/tmp/diff_new_pack.lRRfzR/_new 2018-03-20 21:35:14.799928517 +0100 @@ -20,13 +20,13 @@ %define sonum 5 Name: akonadi-contact -Version: 17.12.2 +Version: 17.12.3 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}')} Summary: KDE PIM Libraries for Akonadi Contacts -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/GUI/KDE Url: http://www.kde.org Source: akonadi-contacts-%{version}.tar.xz ++++++ akonadi-contacts-17.12.2.tar.xz -> akonadi-contacts-17.12.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-contacts-17.12.2/CMakeLists.txt new/akonadi-contacts-17.12.3/CMakeLists.txt --- old/akonadi-contacts-17.12.2/CMakeLists.txt 2018-02-06 01:40:53.000000000 +0100 +++ new/akonadi-contacts-17.12.3/CMakeLists.txt 2018-03-06 01:28:31.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(Akonadi-Contact VERSION ${PIM_VERSION}) @@ -25,10 +25,10 @@ set(AKONADI_CONTACTS_VERSION ${PIM_VERSION}) -set(AKONADI_MIME_VERSION "5.7.2") -set(KCONTACTS_VERSION "5.7.2") -set(KMIMELIB_VERSION "5.7.2") -set(AKONADI_VERSION "5.7.2") +set(AKONADI_MIME_VERSION "5.7.3") +set(KCONTACTS_VERSION "5.7.3") +set(KMIMELIB_VERSION "5.7.3") +set(AKONADI_VERSION "5.7.3") set(QT_REQUIRED_VERSION "5.8.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-contacts-17.12.2/po/fi/akonadicontact5.po new/akonadi-contacts-17.12.3/po/fi/akonadicontact5.po --- old/akonadi-contacts-17.12.2/po/fi/akonadicontact5.po 2018-02-06 01:40:51.000000000 +0100 +++ new/akonadi-contacts-17.12.3/po/fi/akonadicontact5.po 2018-03-06 01:28:30.000000000 +0100 @@ -1,6 +1,6 @@ # KDE Finnish translation sprint participants: # Author: Artnay -# Tommi Nieminen <[email protected]>, 2012, 2013, 2017. +# Tommi Nieminen <[email protected]>, 2012, 2013, 2017, 2018. # Lasse Liehu <[email protected]>, 2012, 2013, 2014, 2015, 2016. # Jiri Grönroos <[email protected]>, 2012. msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-contacts-17.12.2/po/nb/akonadicontact5.po new/akonadi-contacts-17.12.3/po/nb/akonadicontact5.po --- old/akonadi-contacts-17.12.2/po/nb/akonadicontact5.po 2018-02-06 01:40:51.000000000 +0100 +++ new/akonadi-contacts-17.12.3/po/nb/akonadicontact5.po 2018-03-06 01:28:30.000000000 +0100 @@ -1,20 +1,20 @@ -# Translation of akonadicontact5 to Norwegian Bokmål +# Translation of akonadiimportwizard to Norwegian Bokmål # -# Bjørn Steensrud <[email protected]>, 2009, 2010, 2011, 2012, 2013, 2014. +# Bjørn Steensrud <[email protected]>, 2012, 2013, 2014, 2015. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-09-03 03:07+0200\n" -"PO-Revision-Date: 2014-03-16 18:00+0100\n" +"POT-Creation-Date: 2017-11-05 03:11+0100\n" +"PO-Revision-Date: 2015-02-07 19:07+0100\n" "Last-Translator: Bjørn Steensrud <[email protected]>\n" "Language-Team: Norwegian Bokmål <[email protected]>\n" "Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 1.5\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" @@ -220,7 +220,7 @@ msgid "Sending an SMS is currently not supported on Ekiga." msgstr "Det er for tiden ikke støtte i Ekiga for å sende en SMS." -#: akonadi-contacts/actions/qsflphonedialer.cpp:69 +#: akonadi-contacts/actions/qsflphonedialer.cpp:67 #, kde-format msgid "" "Unable to start sflphone-client-kde process, check that sflphone-client-kde " @@ -268,7 +268,7 @@ msgid "%1/%2 (%3 SMS)" msgstr "%1/%2 (%3 SMS)" -#: akonadi-contacts/contacteditor.cpp:170 +#: akonadi-contacts/contacteditor.cpp:173 #, kde-format msgid "" "The contact has been changed by someone else.\n" @@ -277,46 +277,46 @@ "Noen andre har endret kontakten.\n" "Hva skal gjøres?" -#: akonadi-contacts/contacteditor.cpp:171 -#: akonadi-contacts/contactgroupeditor.cpp:147 +#: akonadi-contacts/contacteditor.cpp:174 +#: akonadi-contacts/contactgroupeditor.cpp:148 #, kde-format msgid "Take over changes" msgstr "Ta over endringer" -#: akonadi-contacts/contacteditor.cpp:172 -#: akonadi-contacts/contactgroupeditor.cpp:148 +#: akonadi-contacts/contacteditor.cpp:175 +#: akonadi-contacts/contactgroupeditor.cpp:149 #, kde-format msgid "Ignore and Overwrite changes" msgstr "Ignorer og overskriv endringer" -#: akonadi-contacts/contacteditor.cpp:277 -#: akonadi-contacts/contactgroupeditor.cpp:284 +#: akonadi-contacts/contacteditor.cpp:290 +#: akonadi-contacts/contactgroupeditor.cpp:297 #, kde-format msgid "Select Address Book" msgstr "Velg adressebok" -#: akonadi-contacts/contacteditor.cpp:278 +#: akonadi-contacts/contacteditor.cpp:291 #, kde-format msgid "Select the address book the new contact shall be saved in:" msgstr "Velg den adresseboka der den nye kontakten skal lagres:" -#: akonadi-contacts/contacteditordialog.cpp:51 +#: akonadi-contacts/contacteditordialog.cpp:53 #, kde-format msgid "New Contact" msgstr "Ny kontakt" -#: akonadi-contacts/contacteditordialog.cpp:51 +#: akonadi-contacts/contacteditordialog.cpp:53 #, kde-format msgid "Edit Contact" msgstr "Endre kontakt" -#: akonadi-contacts/contacteditordialog.cpp:72 +#: akonadi-contacts/contacteditordialog.cpp:77 #: akonadi-contacts/contactgroupeditordialog.cpp:116 #, kde-format msgid "Add to:" msgstr "Legg til:" -#: akonadi-contacts/contactgroupeditor.cpp:146 +#: akonadi-contacts/contactgroupeditor.cpp:147 #, kde-format msgid "" "The contact group has been changed by someone else.\n" @@ -325,12 +325,12 @@ "Noen andre har endret kontaktgruppa.\n" "Hva skal gjøres?" -#: akonadi-contacts/contactgroupeditor.cpp:179 +#: akonadi-contacts/contactgroupeditor.cpp:183 #, kde-format msgid "The name of the contact group must not be empty." msgstr "Navnet på kontakgruppa kan ikke være tomt." -#: akonadi-contacts/contactgroupeditor.cpp:285 +#: akonadi-contacts/contactgroupeditor.cpp:298 #, kde-format msgid "Select the address book the new contact group shall be saved in:" msgstr "Velg den adresseboka der den nye kontaktgruppa skal lagres:" @@ -359,23 +359,23 @@ msgid "Edit Contact Group" msgstr "Rediger kontaktgruppe" -#: akonadi-contacts/contactgroupmodel.cpp:215 +#: akonadi-contacts/contactgroupmodel.cpp:217 #, kde-format msgid "The member with name <b>%1</b> is missing an email address" msgstr "Medlemmet med navn <b>%1</b> mangler en e-postadresse" -#: akonadi-contacts/contactgroupmodel.cpp:263 +#: akonadi-contacts/contactgroupmodel.cpp:265 #, kde-format msgid "Contact does not exist any more" msgstr "Kontakten finnes ikke lenger" -#: akonadi-contacts/contactgroupmodel.cpp:417 +#: akonadi-contacts/contactgroupmodel.cpp:419 #, kde-format msgctxt "contact's name" msgid "Name" msgstr "Navn" -#: akonadi-contacts/contactgroupmodel.cpp:419 +#: akonadi-contacts/contactgroupmodel.cpp:421 #, kde-format msgctxt "contact's email address" msgid "EMail" @@ -388,7 +388,7 @@ #: akonadi-contacts/contactgroupviewer.cpp:85 #: akonadi-contacts/standardcontactformatter.cpp:214 -#, kde-format +#, fuzzy, kde-format msgid "Address Book" msgstr "Adressebøker" @@ -397,61 +397,61 @@ msgid "Show Contact Group" msgstr "Vis kontaktgruppe" -#: akonadi-contacts/contactstreemodel.cpp:234 +#: akonadi-contacts/contactstreemodel.cpp:232 #, kde-format msgctxt "@title:column address books overview" msgid "Address Books" msgstr "Adressebøker" -#: akonadi-contacts/contactstreemodel.cpp:244 +#: akonadi-contacts/contactstreemodel.cpp:242 #, kde-format msgctxt "@title:column name of a person" msgid "Name" msgstr "Navn" -#: akonadi-contacts/contactstreemodel.cpp:246 +#: akonadi-contacts/contactstreemodel.cpp:244 #, kde-format msgctxt "@title:column family name of a person" msgid "Family Name" msgstr "Etternavn" -#: akonadi-contacts/contactstreemodel.cpp:248 +#: akonadi-contacts/contactstreemodel.cpp:246 #, kde-format msgctxt "@title:column given name of a person" msgid "Given Name" msgstr "Fornavn" -#: akonadi-contacts/contactstreemodel.cpp:252 +#: akonadi-contacts/contactstreemodel.cpp:250 #, kde-format msgctxt "@title:column home address of a person" msgid "Home" msgstr "Hjemme" -#: akonadi-contacts/contactstreemodel.cpp:254 +#: akonadi-contacts/contactstreemodel.cpp:252 #, kde-format msgctxt "@title:column work address of a person" msgid "Work" msgstr "Arbeid" -#: akonadi-contacts/contactstreemodel.cpp:256 +#: akonadi-contacts/contactstreemodel.cpp:254 #, kde-format msgctxt "@title:column phone numbers of a person" msgid "Phone Numbers" msgstr "Telefonnumre" -#: akonadi-contacts/contactstreemodel.cpp:258 +#: akonadi-contacts/contactstreemodel.cpp:256 #, kde-format msgctxt "@title:column the preferred email addresses of a person" msgid "Preferred EMail" msgstr "Foretrukket e-postadresse" -#: akonadi-contacts/contactstreemodel.cpp:260 +#: akonadi-contacts/contactstreemodel.cpp:258 #, kde-format msgctxt "@title:column all email addresses of a person" msgid "All EMails" msgstr "Alle e-postadresser" -#: akonadi-contacts/contactviewer.cpp:87 +#: akonadi-contacts/contactviewer.cpp:81 #, kde-format msgid "Contact %1" msgstr "Kontakt %1" @@ -461,10 +461,10 @@ msgid "Show Contact" msgstr "Vis kontakt" -#: akonadi-contacts/emailaddressrequester.cpp:97 +#: akonadi-contacts/emailaddressrequester.cpp:96 #, kde-format msgid "Open Address Book" -msgstr "" +msgstr "Åpne adresseboka" #: akonadi-contacts/emailaddressselectionproxymodel.cpp:36 #, kde-format @@ -794,7 +794,7 @@ msgstr "Flytt kontakt til" #: akonadi-contacts/standardcontactactionmanager.cpp:370 -#: akonadi-contacts/standardcontactactionmanager.cpp:607 +#: akonadi-contacts/standardcontactactionmanager.cpp:617 #, kde-format msgid "Edit Contact..." msgstr "Rediger kontakt …" @@ -813,14 +813,14 @@ msgstr "Kopier gruppe til" #: akonadi-contacts/standardcontactactionmanager.cpp:387 -#, kde-format +#, fuzzy, kde-format msgid "Delete Group" msgid_plural "Delete %1 Groups" msgstr[0] "Slett gruppe" msgstr[1] "Slett %1 grupper" #: akonadi-contacts/standardcontactactionmanager.cpp:391 -#, kde-format +#, fuzzy, kde-format msgid "Cut Group" msgid_plural "Cut %1 Groups" msgstr[0] "Klipp ut gruppe" @@ -837,22 +837,22 @@ msgid "Edit Group..." msgstr "Rediger gruppe …" -#: akonadi-contacts/standardcontactactionmanager.cpp:526 +#: akonadi-contacts/standardcontactactionmanager.cpp:528 #, kde-format msgid "Contact cannot be stored: %1" msgstr "Kan ikke lagre kontakten: %1" -#: akonadi-contacts/standardcontactactionmanager.cpp:526 +#: akonadi-contacts/standardcontactactionmanager.cpp:528 #, kde-format msgid "Failed to store contact" msgstr "Klarte ikke å lagre kontakten" -#: akonadi-contacts/standardcontactactionmanager.cpp:587 +#: akonadi-contacts/standardcontactactionmanager.cpp:593 #, kde-format msgid "New &Contact..." msgstr "Ny &kontakt …" -#: akonadi-contacts/standardcontactactionmanager.cpp:588 +#: akonadi-contacts/standardcontactactionmanager.cpp:594 #, kde-format msgid "" "Create a new contact<p>You will be presented with a dialog where you can add " @@ -861,12 +861,12 @@ "Lag en ny kontakt<p>Du vil få opp et dialogvindu der du kan legge inn data " "om en person, medregnet adresser og telefonnumre.</p>" -#: akonadi-contacts/standardcontactactionmanager.cpp:597 +#: akonadi-contacts/standardcontactactionmanager.cpp:605 #, kde-format msgid "New &Group..." msgstr "Ny &gruppe …" -#: akonadi-contacts/standardcontactactionmanager.cpp:598 +#: akonadi-contacts/standardcontactactionmanager.cpp:606 #, kde-format msgid "" "Create a new group<p>You will be presented with a dialog where you can add a " @@ -875,7 +875,7 @@ "Opprett en ny gruppe<p>Du får opp et dialogvindu der du kan opprette en ny " "gruppe kontakter.</p>" -#: akonadi-contacts/standardcontactactionmanager.cpp:608 +#: akonadi-contacts/standardcontactactionmanager.cpp:618 #, kde-format msgid "" "Edit the selected contact<p>You will be presented with a dialog where you " @@ -886,7 +886,7 @@ "endre data om en person, medregnet adresser og telefonnumre.</p>" #: akonadi-contacts/standardcontactformatter.cpp:118 -#, kde-format +#, fuzzy, kde-format msgid "(One year old)" msgid_plural "(%1 years old)" msgstr[0] "(ett år gammel)" @@ -910,7 +910,7 @@ msgstr "Hjemmeside" #: akonadi-contacts/standardcontactformatter.cpp:169 -#, kde-format +#, fuzzy, kde-format msgid "Blog Feed" msgstr "Bloggkanal" @@ -921,7 +921,7 @@ msgstr "Vis adresse på kart" #: akonadi-contacts/standardcontactformatter.cpp:199 -#, kde-format +#, fuzzy, kde-format msgid "Notes" msgstr "Merknader" @@ -936,12 +936,12 @@ msgstr "Yrke" #: akonadi-contacts/standardcontactformatter.cpp:208 -#, kde-format +#, fuzzy, kde-format msgid "Assistant's Name" msgstr "Navnet på assistenten" #: akonadi-contacts/standardcontactformatter.cpp:209 -#, kde-format +#, fuzzy, kde-format msgid "Manager's Name" msgstr "Navnet på sjefen" @@ -962,7 +962,7 @@ msgstr "IM-adresse" #: akonadi-contacts/standardcontactformatter.cpp:213 -#, kde-format +#, fuzzy, kde-format msgid "Anniversary" msgstr "Merkedag" @@ -1013,98 +1013,11 @@ msgid "<p style=\"color: white;\"><b>Waiting for operation</b><br/></p>" msgstr "<p style=\"color: white;\"><b>Venter på handling</b><br/></p>" -#: contact-editor/editor/addresseditor/addressgrantleeobject.cpp:69 -#: contact-editor/editor/addresseditor/addressgrantleeobject.cpp:108 -#, kde-format -msgid "Remove Address" -msgstr "" - -#: contact-editor/editor/addresseditor/addressgrantleeobject.cpp:116 -#, kde-format -msgid "Edit Address" -msgstr "" - -#: contact-editor/editor/addresseditor/addresslocationwidget.cpp:62 -#, kde-format -msgid "Add Street" -msgstr "" - -#: contact-editor/editor/addresseditor/addresslocationwidget.cpp:72 -#, kde-format -msgid "Add Post Office Box" -msgstr "" - -#: contact-editor/editor/addresseditor/addresslocationwidget.cpp:81 -#, kde-format -msgid "Add Postal Code" -msgstr "" - -#: contact-editor/editor/addresseditor/addresslocationwidget.cpp:90 -#, kde-format -msgid "Add Locality" -msgstr "" - -#: contact-editor/editor/addresseditor/addresslocationwidget.cpp:99 +#: contact-editor/editor/addresseditor/addresseslocationwidget.cpp:46 #, kde-format -msgid "Add Region" +msgid "Missing plugins. Please verify your installation" msgstr "" -#: contact-editor/editor/addresseditor/addresslocationwidget.cpp:113 -#, kde-format -msgid "Add a Country" -msgstr "" - -#: contact-editor/editor/addresseditor/addresslocationwidget.cpp:117 -#, kde-format -msgctxt "street/postal" -msgid "This is the preferred address" -msgstr "Dette er den adressen som er foretrukket" - -#: contact-editor/editor/addresseditor/addresslocationwidget.cpp:128 -#, kde-format -msgid "Add Address" -msgstr "" - -#: contact-editor/editor/addresseditor/addresslocationwidget.cpp:140 -#, kde-format -msgid "Update Address" -msgstr "" - -#: contact-editor/editor/addresseditor/addresslocationwidget.cpp:145 -#, kde-format -msgid "Cancel" -msgstr "" - -#: contact-editor/editor/addresseditor/addresstypedialog.cpp:35 -#, kde-format -msgctxt "street/postal" -msgid "Edit Address Type" -msgstr "Endre adressetype" - -#: contact-editor/editor/addresseditor/addresstypedialog.cpp:49 -#, kde-format -msgctxt "street/postal" -msgid "Address Types" -msgstr "Adressetyper" - -#: contact-editor/editor/addresseditor/selectaddresstypecombobox.cpp:77 -#: contact-editor/editor/generalinfoeditor/phone/phonecomboboxtype.cpp:83 -#, kde-format -msgctxt "@item:inlistbox Category of contact info field" -msgid "Other..." -msgstr "Annet …" - -#: contact-editor/editor/addresseditor/selectaddresstypecombobox.cpp:79 -#, kde-format -msgctxt "@item:inlistbox Category of contact info field" -msgid "New Address Type" -msgstr "" - -#: contact-editor/editor/addresseditor/webengine/addresseslocationengineviewer.cpp:84 -#, kde-format -msgid "Do you really want to delete this address?" -msgstr "Er du sikker på at du vil slette denne adressen?" - #: contact-editor/editor/businesseditor/businesseditorwidget.cpp:53 #, kde-format msgctxt "@label The organization of a contact" @@ -1188,7 +1101,7 @@ msgid "Free/Busy:" msgstr "Ledig/opptatt:" -#: contact-editor/editor/businesseditor/freebusyeditwidget.cpp:43 +#: contact-editor/editor/businesseditor/freebusyeditwidget.cpp:42 #, kde-format msgid "Add FreeBusy" msgstr "" @@ -1281,53 +1194,53 @@ msgstr "Dato og klokkeslett" #: contact-editor/editor/customfieldeditor/customfieldeditorwidget.cpp:82 -#, kde-format +#, fuzzy, kde-format msgid "Url" msgstr "Nettadresse" -#: contact-editor/editor/customfieldeditor/customfieldslistdelegate.cpp:250 +#: contact-editor/editor/customfieldeditor/customfieldslistdelegate.cpp:244 #, kde-format msgctxt "Custom Fields" msgid "Do you really want to delete the selected custom field?" msgstr "Er du sikker på at du vil slette det valgte feltet?" -#: contact-editor/editor/customfieldeditor/customfieldslistdelegate.cpp:251 +#: contact-editor/editor/customfieldeditor/customfieldslistdelegate.cpp:245 #, kde-format msgid "Confirm Delete" msgstr "Bekreft sletting" -#: contact-editor/editor/customfieldeditor/customfieldsmodel.cpp:219 +#: contact-editor/editor/customfieldeditor/customfieldsmodel.cpp:214 #, kde-format msgctxt "custom field title" msgid "Title" msgstr "Tittel" -#: contact-editor/editor/customfieldeditor/customfieldsmodel.cpp:221 +#: contact-editor/editor/customfieldeditor/customfieldsmodel.cpp:216 #, kde-format msgctxt "custom field value" msgid "Value" msgstr "Verdi" #: contact-editor/editor/generalinfoeditor/contactselecttypecombobox.cpp:39 -#: contact-editor/editor/generalinfoeditor/web/webwidget.cpp:49 +#: contact-editor/editor/generalinfoeditor/web/webwidget.cpp:48 #, kde-format msgid "Select..." msgstr "Velg …" #: contact-editor/editor/generalinfoeditor/contactselecttypecombobox.cpp:42 -#: contact-editor/editor/generalinfoeditor/web/webwidget.cpp:54 +#: contact-editor/editor/generalinfoeditor/web/webwidget.cpp:53 #, kde-format msgid "Home" msgstr "" #: contact-editor/editor/generalinfoeditor/contactselecttypecombobox.cpp:45 -#: contact-editor/editor/generalinfoeditor/web/webwidget.cpp:57 +#: contact-editor/editor/generalinfoeditor/web/webwidget.cpp:56 #, kde-format msgid "Work" msgstr "Arbeid" #: contact-editor/editor/generalinfoeditor/contactselecttypecombobox.cpp:48 -#: contact-editor/editor/generalinfoeditor/web/webwidget.cpp:60 +#: contact-editor/editor/generalinfoeditor/web/webwidget.cpp:59 #, kde-format msgid "Other" msgstr "" @@ -1363,7 +1276,7 @@ msgid "Custom" msgstr "Tilpasset" -#: contact-editor/editor/generalinfoeditor/generalinfowidget.cpp:88 +#: contact-editor/editor/generalinfoeditor/generalinfowidget.cpp:86 #, kde-format msgid "Tags" msgstr "" @@ -1373,42 +1286,42 @@ msgid "Email" msgstr "E-post" -#: contact-editor/editor/generalinfoeditor/mail/mailwidget.cpp:42 +#: contact-editor/editor/generalinfoeditor/mail/mailwidget.cpp:40 #, kde-format msgid "Add an Email Account" msgstr "" -#: contact-editor/editor/generalinfoeditor/mail/mailwidget.cpp:54 +#: contact-editor/editor/generalinfoeditor/mail/mailwidget.cpp:52 #, kde-format msgid "Add an Email" msgstr "" -#: contact-editor/editor/generalinfoeditor/mail/mailwidget.cpp:61 +#: contact-editor/editor/generalinfoeditor/mail/mailwidget.cpp:59 #, kde-format msgid "Remove Email" msgstr "" -#: contact-editor/editor/generalinfoeditor/messageformattingwidget.cpp:38 +#: contact-editor/editor/generalinfoeditor/messageformattingwidget.cpp:37 #, kde-format msgid "Show messages received from this contact as:" msgstr "Vis meldinger mottatt fra denne kontakten som:" -#: contact-editor/editor/generalinfoeditor/messageformattingwidget.cpp:47 +#: contact-editor/editor/generalinfoeditor/messageformattingwidget.cpp:46 #, kde-format msgid "Default" msgstr "Standard" -#: contact-editor/editor/generalinfoeditor/messageformattingwidget.cpp:47 -#, kde-format +#: contact-editor/editor/generalinfoeditor/messageformattingwidget.cpp:46 +#, fuzzy, kde-format msgid "Plain Text" msgstr "Ren tekst" -#: contact-editor/editor/generalinfoeditor/messageformattingwidget.cpp:47 +#: contact-editor/editor/generalinfoeditor/messageformattingwidget.cpp:46 #, kde-format msgid "HTML" msgstr "HTML" -#: contact-editor/editor/generalinfoeditor/messageformattingwidget.cpp:51 +#: contact-editor/editor/generalinfoeditor/messageformattingwidget.cpp:50 #, kde-format msgid "Allow remote content in received HTML messages" msgstr "Tillat nettinnhold i mottatte HTML-meldinger" @@ -1418,25 +1331,25 @@ msgid "Messaging" msgstr "" -#: contact-editor/editor/generalinfoeditor/messaging/messagingwidget.cpp:43 +#: contact-editor/editor/generalinfoeditor/messaging/messagingwidget.cpp:41 #, kde-format msgid "Add an identifier" msgstr "" -#: contact-editor/editor/generalinfoeditor/messaging/messagingwidget.cpp:51 +#: contact-editor/editor/generalinfoeditor/messaging/messagingwidget.cpp:49 #, kde-format msgctxt "@item:inlistbox select from a list of IM protocols" msgid "Select..." msgstr "Velg …" -#: contact-editor/editor/generalinfoeditor/messaging/messagingwidget.cpp:64 +#: contact-editor/editor/generalinfoeditor/messaging/messagingwidget.cpp:62 #, kde-format msgid "Add an IM" msgstr "" -#: contact-editor/editor/generalinfoeditor/messaging/messagingwidget.cpp:71 +#: contact-editor/editor/generalinfoeditor/messaging/messagingwidget.cpp:69 #, kde-format -msgid "Add IM" +msgid "Remove IM" msgstr "" #: contact-editor/editor/generalinfoeditor/nameeditdialog.cpp:36 @@ -1536,7 +1449,7 @@ msgstr "Navn" #: contact-editor/editor/generalinfoeditor/namewidget.cpp:54 -#, kde-format +#, fuzzy, kde-format msgid "..." msgstr " …" @@ -1550,12 +1463,18 @@ msgid "Add a Nickname" msgstr "" +#: contact-editor/editor/generalinfoeditor/phone/phonecomboboxtype.cpp:83 +#, kde-format +msgctxt "@item:inlistbox Category of contact info field" +msgid "Other..." +msgstr "Annet …" + #: contact-editor/editor/generalinfoeditor/phone/phonelistwidget.cpp:38 #, kde-format msgid "Phone" msgstr "Telefon" -#: contact-editor/editor/generalinfoeditor/phone/phonetypedialog.cpp:38 +#: contact-editor/editor/generalinfoeditor/phone/phonetypedialog.cpp:37 #, kde-format msgid "Edit Phone Number" msgstr "Endre telefonnummer" @@ -1576,13 +1495,13 @@ msgid "Web" msgstr "Vev" -#: contact-editor/editor/generalinfoeditor/web/webwidget.cpp:42 -#: contact-editor/editor/generalinfoeditor/web/webwidget.cpp:66 +#: contact-editor/editor/generalinfoeditor/web/webwidget.cpp:41 +#: contact-editor/editor/generalinfoeditor/web/webwidget.cpp:65 #, kde-format msgid "Add a Web Site" msgstr "" -#: contact-editor/editor/generalinfoeditor/web/webwidget.cpp:73 +#: contact-editor/editor/generalinfoeditor/web/webwidget.cpp:72 #, kde-format msgid "Remove Web Site" msgstr "" @@ -1593,35 +1512,35 @@ msgstr "" #: contact-editor/editor/personaleditor/dateeditwidget.cpp:48 -#, kde-format +#, fuzzy, kde-format msgid "Remove" msgstr "Fjern" #: contact-editor/editor/personaleditor/kdatepickerpopup.cpp:93 -#, kde-format +#, fuzzy, kde-format msgctxt "@option today" msgid "&Today" msgstr "I &dag" -#: contact-editor/editor/personaleditor/kdatepickerpopup.cpp:94 -#, kde-format +#: contact-editor/editor/personaleditor/kdatepickerpopup.cpp:96 +#, fuzzy, kde-format msgctxt "@option tomorrow" msgid "To&morrow" msgstr "I &morgen" -#: contact-editor/editor/personaleditor/kdatepickerpopup.cpp:95 +#: contact-editor/editor/personaleditor/kdatepickerpopup.cpp:99 #, kde-format msgctxt "@option next week" msgid "Next &Week" msgstr "Neste &uke" -#: contact-editor/editor/personaleditor/kdatepickerpopup.cpp:96 -#, kde-format +#: contact-editor/editor/personaleditor/kdatepickerpopup.cpp:102 +#, fuzzy, kde-format msgctxt "@option next month" msgid "Next M&onth" msgstr "Neste &måned" -#: contact-editor/editor/personaleditor/kdatepickerpopup.cpp:104 +#: contact-editor/editor/personaleditor/kdatepickerpopup.cpp:112 #, kde-format msgctxt "@option do not specify a date" msgid "No Date" @@ -1660,54 +1579,54 @@ msgid "The logo of the company (click to change)" msgstr "Firmaets logo (trykk for å endre)" -#: contact-editor/editor/widgets/imagewidget.cpp:250 +#: contact-editor/editor/widgets/imagewidget.cpp:251 #, kde-format msgid "Change photo..." msgstr "Endre foto …" -#: contact-editor/editor/widgets/imagewidget.cpp:251 -#: contact-editor/editor/widgets/imagewidget.cpp:264 +#: contact-editor/editor/widgets/imagewidget.cpp:252 +#: contact-editor/editor/widgets/imagewidget.cpp:265 #, kde-format msgid "Change URL..." msgstr "" -#: contact-editor/editor/widgets/imagewidget.cpp:255 +#: contact-editor/editor/widgets/imagewidget.cpp:256 #, kde-format msgid "Save photo..." msgstr "Lagre foto …" -#: contact-editor/editor/widgets/imagewidget.cpp:258 +#: contact-editor/editor/widgets/imagewidget.cpp:259 #, kde-format msgid "Remove photo" msgstr "Fjern foto" -#: contact-editor/editor/widgets/imagewidget.cpp:263 +#: contact-editor/editor/widgets/imagewidget.cpp:264 #, kde-format msgid "Change logo..." msgstr "Endre logo …" -#: contact-editor/editor/widgets/imagewidget.cpp:268 +#: contact-editor/editor/widgets/imagewidget.cpp:269 #, kde-format msgid "Save logo..." msgstr "Lagre logo …" -#: contact-editor/editor/widgets/imagewidget.cpp:271 +#: contact-editor/editor/widgets/imagewidget.cpp:272 #, kde-format msgid "Remove logo" msgstr "Fjern logo" -#: contact-editor/editor/widgets/imagewidget.cpp:284 +#: contact-editor/editor/widgets/imagewidget.cpp:285 #, kde-format msgid "Change image URL" msgstr "" -#: contact-editor/editor/widgets/imagewidget.cpp:284 +#: contact-editor/editor/widgets/imagewidget.cpp:285 #, kde-format msgid "Image URL:" msgstr "" -#: contact-editor/editor/widgets/imagewidget.cpp:311 -#: contact-editor/editor/widgets/imagewidget.cpp:334 +#: contact-editor/editor/widgets/imagewidget.cpp:312 +#: contact-editor/editor/widgets/imagewidget.cpp:335 #, kde-format msgid "Images (%1)" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-contacts-17.12.2/po/nb/kcm_akonadicontact_actions.po new/akonadi-contacts-17.12.3/po/nb/kcm_akonadicontact_actions.po --- old/akonadi-contacts-17.12.2/po/nb/kcm_akonadicontact_actions.po 2018-02-06 01:40:51.000000000 +0100 +++ new/akonadi-contacts-17.12.3/po/nb/kcm_akonadicontact_actions.po 2018-03-06 01:28:30.000000000 +0100 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-02-21 09:14+0100\n" +"POT-Creation-Date: 2017-09-19 03:32+0200\n" "PO-Revision-Date: 2014-03-16 18:01+0100\n" "Last-Translator: Bjørn Steensrud <[email protected]>\n" "Language-Team: Norwegian Bokmål <[email protected]>\n" @@ -62,58 +62,58 @@ msgid "Send SMS" msgstr "Send SMS" -#: kcmakonadicontactactions.cpp:40 +#: kcmakonadicontactactions.cpp:41 #, kde-format msgid "Contact Actions Settings" msgstr "Innstillinger for kontakthandlinger" -#: kcmakonadicontactactions.cpp:42 +#: kcmakonadicontactactions.cpp:43 #, kde-format msgid "(c) 2009 Tobias Koenig" msgstr "© 2009 Tobias Koenig" -#: kcmakonadicontactactions.cpp:44 +#: kcmakonadicontactactions.cpp:45 #, kde-format msgid "Tobias Koenig" msgstr "Tobias Koenig" -#: kcmakonadicontactactions.cpp:51 kcmakonadicontactactions.cpp:58 +#: kcmakonadicontactactions.cpp:52 kcmakonadicontactactions.cpp:59 #, kde-format msgid "Skype" msgstr "Skype" -#: kcmakonadicontactactions.cpp:52 +#: kcmakonadicontactactions.cpp:53 #, kde-format msgid "Ekiga" msgstr "Ekiga" -#: kcmakonadicontactactions.cpp:53 kcmakonadicontactactions.cpp:59 +#: kcmakonadicontactactions.cpp:54 kcmakonadicontactactions.cpp:60 #, kde-format msgid "SflPhone" msgstr "SflPhone" -#: kcmakonadicontactactions.cpp:54 kcmakonadicontactactions.cpp:60 -#: kcmakonadicontactactions.cpp:64 +#: kcmakonadicontactactions.cpp:55 kcmakonadicontactactions.cpp:61 +#: kcmakonadicontactactions.cpp:65 #, kde-format msgid "External Application" msgstr "Eksternt program" -#: kcmakonadicontactactions.cpp:63 +#: kcmakonadicontactactions.cpp:64 #, kde-format msgid "Web Browser" msgstr "Nettleser" -#: kcmakonadicontactactions.cpp:65 +#: kcmakonadicontactactions.cpp:66 #, kde-format msgid "Google map" msgstr "Google map" -#: kcmakonadicontactactions.cpp:66 +#: kcmakonadicontactactions.cpp:67 #, kde-format msgid "Map quest" msgstr "Map quest" -#: kcmakonadicontactactions.cpp:67 +#: kcmakonadicontactactions.cpp:68 #, kde-format msgid "OpenStreetMap" msgstr "OpenStreetMap" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-contacts-17.12.2/po/zh_CN/akonadicontact5.po new/akonadi-contacts-17.12.3/po/zh_CN/akonadicontact5.po --- old/akonadi-contacts-17.12.2/po/zh_CN/akonadicontact5.po 2018-02-06 01:40:53.000000000 +0100 +++ new/akonadi-contacts-17.12.3/po/zh_CN/akonadicontact5.po 2018-03-06 01:28:31.000000000 +0100 @@ -9,7 +9,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-11-05 03:11+0100\n" -"PO-Revision-Date: 2018-02-04 20:33-0500\n" +"PO-Revision-Date: 2018-02-28 02:27-0500\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/akonadi-contacts-17.12.2/po/zh_CN/kcm_akonadicontact_actions.po new/akonadi-contacts-17.12.3/po/zh_CN/kcm_akonadicontact_actions.po --- old/akonadi-contacts-17.12.2/po/zh_CN/kcm_akonadicontact_actions.po 2018-02-06 01:40:53.000000000 +0100 +++ new/akonadi-contacts-17.12.3/po/zh_CN/kcm_akonadicontact_actions.po 2018-03-06 01:28:31.000000000 +0100 @@ -9,7 +9,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-09-19 03:32+0200\n" -"PO-Revision-Date: 2018-02-04 20:33-0500\n" +"PO-Revision-Date: 2018-02-28 02:27-0500\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/akonadi-contacts-17.12.2/src/akonadi-contacts/CMakeLists.txt new/akonadi-contacts-17.12.3/src/akonadi-contacts/CMakeLists.txt --- old/akonadi-contacts-17.12.2/src/akonadi-contacts/CMakeLists.txt 2018-02-02 07:15:30.000000000 +0100 +++ new/akonadi-contacts-17.12.3/src/akonadi-contacts/CMakeLists.txt 2018-02-27 13:25:37.000000000 +0100 @@ -220,4 +220,3 @@ add_subdirectory(plugins) -install( FILES akonadi-contacts.categories DESTINATION ${KDE_INSTALL_CONFDIR} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-contacts-17.12.2/src/akonadi-contacts/akonadi-contacts.categories new/akonadi-contacts-17.12.3/src/akonadi-contacts/akonadi-contacts.categories --- old/akonadi-contacts-17.12.2/src/akonadi-contacts/akonadi-contacts.categories 2018-02-02 07:15:30.000000000 +0100 +++ new/akonadi-contacts-17.12.3/src/akonadi-contacts/akonadi-contacts.categories 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -org.kde.pim.akonadicontact akonadicontact (lib) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-contacts-17.12.2/src/akonadi-contacts/contactviewer.cpp new/akonadi-contacts-17.12.3/src/akonadi-contacts/contactviewer.cpp --- old/akonadi-contacts-17.12.2/src/akonadi-contacts/contactviewer.cpp 2018-02-02 07:15:30.000000000 +0100 +++ new/akonadi-contacts-17.12.3/src/akonadi-contacts/contactviewer.cpp 2018-02-27 13:25:37.000000000 +0100 @@ -148,14 +148,18 @@ addr.setPhoto(KContacts::Picture()); addr.setLogo(KContacts::Picture()); const QString data = QString::fromUtf8(converter.createVCard(addr)); - mQRCode->setData(data); - mDataMatrix->setData(data); - mBrowser->document()->addResource(QTextDocument::ImageResource, - QUrl(QStringLiteral("qrcode")), - mQRCode->toImage(QSizeF(50, 50))); - mBrowser->document()->addResource(QTextDocument::ImageResource, - QUrl(QStringLiteral("datamatrix")), - mDataMatrix->toImage(QSizeF(50, 50))); + if (mQRCode) { + mQRCode->setData(data); + mBrowser->document()->addResource(QTextDocument::ImageResource, + QUrl(QStringLiteral("qrcode")), + mQRCode->toImage(QSizeF(50, 50))); + } + if (mDataMatrix) { + mDataMatrix->setData(data); + mBrowser->document()->addResource(QTextDocument::ImageResource, + QUrl(QStringLiteral("datamatrix")), + mDataMatrix->toImage(QSizeF(50, 50))); + } } // merge local and global custom field descriptions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-contacts-17.12.2/src/akonadi-contacts/job/contactsearchjob.cpp new/akonadi-contacts-17.12.3/src/akonadi-contacts/job/contactsearchjob.cpp --- old/akonadi-contacts-17.12.2/src/akonadi-contacts/job/contactsearchjob.cpp 2018-02-02 07:15:30.000000000 +0100 +++ new/akonadi-contacts-17.12.3/src/akonadi-contacts/job/contactsearchjob.cpp 2018-02-27 13:25:37.000000000 +0100 @@ -67,7 +67,6 @@ void ContactSearchJob::setQuery(Criterion criterion, const QString &value, Match match) { - qDebug() << " void ContactSearchJob::setQuery(Criterion criterion, const QString &value, Match match)"<<value; Akonadi::SearchQuery query(SearchTerm::RelOr); if (criterion == Name) { @@ -85,9 +84,7 @@ query.setLimit(d->mLimit); - qDebug() << "void ContactSearchJob::setQuery(Criterion criterion, const QString &value, Match match)"<<value; ItemSearchJob::setQuery(query); - qDebug() << " AFTER ::::::::::::::::::::::::::::::::::::::::"; } void ContactSearchJob::setLimit(int limit) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-contacts-17.12.2/src/contact-editor/editor/addresseditor/addresseslocationwidget.h new/akonadi-contacts-17.12.3/src/contact-editor/editor/addresseditor/addresseslocationwidget.h --- old/akonadi-contacts-17.12.2/src/contact-editor/editor/addresseditor/addresseslocationwidget.h 2018-02-02 07:15:30.000000000 +0100 +++ new/akonadi-contacts-17.12.3/src/contact-editor/editor/addresseditor/addresseslocationwidget.h 2018-02-27 13:25:37.000000000 +0100 @@ -39,7 +39,7 @@ void setReadOnly(bool readOnly); private: - AbstractAddressLocationWidget *mAbstractAddressLocationWidget; + AbstractAddressLocationWidget *mAbstractAddressLocationWidget = nullptr; }; } #endif // ADDRESSESLOCATIONWIDGET_H
