Hello community,
here is the log from the commit of package akonadi-contact for openSUSE:Factory
checked in at 2020-07-14 07:44:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/akonadi-contact (Old)
and /work/SRC/openSUSE:Factory/.akonadi-contact.new.3060 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadi-contact"
Tue Jul 14 07:44:57 2020 rev:51 rq:820108 version:20.04.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/akonadi-contact/akonadi-contact.changes
2020-06-14 18:17:24.891183343 +0200
+++
/work/SRC/openSUSE:Factory/.akonadi-contact.new.3060/akonadi-contact.changes
2020-07-14 07:45:30.947116671 +0200
@@ -1,0 +2,11 @@
+Thu Jul 9 20:08:19 UTC 2020 - Luca Beltrame <[email protected]>
+
+- Update to 20.04.3
+ * New bugfix release
+ * For more details please see:
+ * https://kde.org/announcements/releases/2020-07-apps-update
+- Changes since 20.04.2:
+ * Fix crash when we select a unknown type
+ * Fix mem leak found by ASAN
+
+-------------------------------------------------------------------
Old:
----
akonadi-contacts-20.04.2.tar.xz
akonadi-contacts-20.04.2.tar.xz.sig
New:
----
akonadi-contacts-20.04.3.tar.xz
akonadi-contacts-20.04.3.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ akonadi-contact.spec ++++++
--- /var/tmp/diff_new_pack.lNAqMD/_old 2020-07-14 07:45:32.135120506 +0200
+++ /var/tmp/diff_new_pack.lNAqMD/_new 2020-07-14 07:45:32.135120506 +0200
@@ -23,7 +23,7 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print
$1"."$2}')}
%bcond_without lang
Name: akonadi-contact
-Version: 20.04.2
+Version: 20.04.3
Release: 0
Summary: KDE PIM Libraries for Akonadi Contacts
License: LGPL-2.1-or-later
++++++ akonadi-contacts-20.04.2.tar.xz -> akonadi-contacts-20.04.3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-contacts-20.04.2/CMakeLists.txt
new/akonadi-contacts-20.04.3/CMakeLists.txt
--- old/akonadi-contacts-20.04.2/CMakeLists.txt 2020-06-09 02:44:46.000000000
+0200
+++ new/akonadi-contacts-20.04.3/CMakeLists.txt 2020-07-07 03:07:26.000000000
+0200
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.5)
-set(PIM_VERSION "5.14.2")
+set(PIM_VERSION "5.14.3")
project(Akonadi-Contact VERSION ${PIM_VERSION})
@@ -26,8 +26,8 @@
set(AKONADI_CONTACTS_VERSION ${PIM_VERSION})
-set(KMIMELIB_VERSION "5.14.2")
-set(AKONADI_VERSION "5.14.2")
+set(KMIMELIB_VERSION "5.14.3")
+set(AKONADI_VERSION "5.14.3")
set(QT_REQUIRED_VERSION "5.12.0")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-contacts-20.04.2/po/el/akonadicontact5-serializer.po
new/akonadi-contacts-20.04.3/po/el/akonadicontact5-serializer.po
--- old/akonadi-contacts-20.04.2/po/el/akonadicontact5-serializer.po
2020-06-09 02:44:42.000000000 +0200
+++ new/akonadi-contacts-20.04.3/po/el/akonadicontact5-serializer.po
2020-07-07 03:07:23.000000000 +0200
@@ -12,7 +12,7 @@
"PO-Revision-Date: 2014-11-13 20:24+0200\n"
"Last-Translator: Dimitris Kardarakos <[email protected]>\n"
"Language-Team: American English <[email protected]>\n"
-"Language: en_US\n"
+"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-contacts-20.04.2/po/el/akonadicontact5.po
new/akonadi-contacts-20.04.3/po/el/akonadicontact5.po
--- old/akonadi-contacts-20.04.2/po/el/akonadicontact5.po 2020-06-09
02:44:42.000000000 +0200
+++ new/akonadi-contacts-20.04.3/po/el/akonadicontact5.po 2020-07-07
03:07:23.000000000 +0200
@@ -13,7 +13,7 @@
"PO-Revision-Date: 2014-03-03 21:30+0200\n"
"Last-Translator: Dimitris Kardarakos <[email protected]>\n"
"Language-Team: American English <[email protected]>\n"
-"Language: en_US\n"
+"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-contacts-20.04.2/po/fi/akonadicontact5.po
new/akonadi-contacts-20.04.3/po/fi/akonadicontact5.po
--- old/akonadi-contacts-20.04.2/po/fi/akonadicontact5.po 2020-06-09
02:44:43.000000000 +0200
+++ new/akonadi-contacts-20.04.3/po/fi/akonadicontact5.po 2020-07-07
03:07:23.000000000 +0200
@@ -21,7 +21,7 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-POT-Import-Date: 2012-12-01 22:25:16+0000\n"
-"X-Generator: Lokalize 18.12.3\n"
+"X-Generator: Lokalize 20.04.2\n"
#. i18n: ectx: whatsthis, entry (ShowAddressAction), group (Show Address
Settings)
#: akonadi-contacts/actions/contactactionssettings.kcfg.cmake:18
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-contacts-20.04.2/po/fr/akonadicontact5.po
new/akonadi-contacts-20.04.3/po/fr/akonadicontact5.po
--- old/akonadi-contacts-20.04.2/po/fr/akonadicontact5.po 2020-06-09
02:44:43.000000000 +0200
+++ new/akonadi-contacts-20.04.3/po/fr/akonadicontact5.po 2020-07-07
03:07:23.000000000 +0200
@@ -16,13 +16,13 @@
"POT-Creation-Date: 2020-02-29 03:17+0100\n"
"PO-Revision-Date: 2020-05-19 22:25+0200\n"
"Last-Translator: Xavier Besnard <[email protected]>\n"
-"Language-Team: French <[email protected]>\n"
+"Language-Team: French <[email protected]>\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Lokalize 20.04.1\n"
+"X-Generator: Lokalize 20.04.2\n"
"X-Environment: kde\n"
"X-Accelerator-Marker: &\n"
"X-Text-Markup: kde4\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-contacts-20.04.2/po/it/akonadicontact5.po
new/akonadi-contacts-20.04.3/po/it/akonadicontact5.po
--- old/akonadi-contacts-20.04.2/po/it/akonadicontact5.po 2020-06-09
02:44:44.000000000 +0200
+++ new/akonadi-contacts-20.04.3/po/it/akonadicontact5.po 2020-07-07
03:07:24.000000000 +0200
@@ -2,14 +2,14 @@
# Copyright (C) 2009 This_file_is_part_of_KDE
# This file is distributed under the same license as the akonadicontact
package.
# Luigi Toscano <[email protected]>, 2009, 2010, 2011, 2012, 2013,
2014, 2015.
-# Vincenzo Reale <[email protected]>, 2015, 2017, 2018, 2019.
+# Vincenzo Reale <[email protected]>, 2015, 2017, 2018, 2019, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: akonadicontact\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2020-02-29 03:17+0100\n"
-"PO-Revision-Date: 2019-12-17 21:15+0100\n"
+"PO-Revision-Date: 2020-06-15 20:06+0200\n"
"Last-Translator: Vincenzo Reale <[email protected]>\n"
"Language-Team: Italian <[email protected]>\n"
"Language: it\n"
@@ -17,7 +17,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 19.12.0\n"
+"X-Generator: Lokalize 20.04.1\n"
#. i18n: ectx: whatsthis, entry (ShowAddressAction), group (Show Address
Settings)
#: akonadi-contacts/actions/contactactionssettings.kcfg.cmake:18
@@ -28,11 +28,11 @@
"placeholders for the single address parts. If 'External Application' is "
"selected, a command with placeholders can be defined."
msgstr ""
-"Definisce quale applicazione deve essere usata per mostrare l'indirizzo di "
-"posta di un contatto sulla mappa. Se è selezionato \"Browser web\", si può "
-"definire una URL con dei segnaposto per le singole parti dell'indirizzo. Se "
-"è selezionato \"Applicazione esterna\", può essere definito un comando con "
-"dei segnaposto."
+"Definisce quale applicazione sarà utilizzata per mostrare l'indirizzo di "
+"posta di un contatto sulla mappa. Se è selezionato «Browser web», si può "
+"definire un URL con dei segnaposto per le singole parti dell'indirizzo. Se è "
+"selezionato «Applicazione esterna», può essere definito un comando con dei "
+"segnaposto."
#. i18n: ectx: whatsthis, entry (AddressUrl), group (Show Address Settings)
#: akonadi-contacts/actions/contactactionssettings.kcfg.cmake:23
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-contacts-20.04.2/po/sr/akonadicontact5-serializer.po
new/akonadi-contacts-20.04.3/po/sr/akonadicontact5-serializer.po
--- old/akonadi-contacts-20.04.2/po/sr/akonadicontact5-serializer.po
2020-06-09 02:44:46.000000000 +0200
+++ new/akonadi-contacts-20.04.3/po/sr/akonadicontact5-serializer.po
2020-07-07 03:07:26.000000000 +0200
@@ -3,8 +3,8 @@
msgid ""
msgstr ""
"Project-Id-Version: akonadi_serializer_plugins\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
-"POT-Creation-Date: 2018-08-16 09:11+0200\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
"PO-Revision-Date: 2014-08-30 19:03+0200\n"
"Last-Translator: Chusslove Illich <[email protected]>\n"
"Language-Team: Serbian <[email protected]>\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-contacts-20.04.2/po/sr/akonadicontact5.po
new/akonadi-contacts-20.04.3/po/sr/akonadicontact5.po
--- old/akonadi-contacts-20.04.2/po/sr/akonadicontact5.po 2020-06-09
02:44:45.000000000 +0200
+++ new/akonadi-contacts-20.04.3/po/sr/akonadicontact5.po 2020-07-07
03:07:26.000000000 +0200
@@ -4,8 +4,8 @@
msgid ""
msgstr ""
"Project-Id-Version: akonadicontact5\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
-"POT-Creation-Date: 2019-04-15 03:27+0200\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
+"POT-Creation-Date: 2020-02-29 03:17+0100\n"
"PO-Revision-Date: 2017-10-14 23:06+0200\n"
"Last-Translator: Chusslove Illich <[email protected]>\n"
"Language-Team: Serbian <[email protected]>\n"
@@ -188,8 +188,8 @@
" %t: текст"
# rewrite-msgid: /settings dialog/configuration dialog/
-#: akonadi-contacts/actions/dialphonenumberaction.cpp:86
-#: akonadi-contacts/actions/sendsmsaction.cpp:66
+#: akonadi-contacts/actions/dialphonenumberaction.cpp:71
+#: akonadi-contacts/actions/sendsmsaction.cpp:51
#, kde-format
msgid ""
"There is no application set which could be executed.\n"
@@ -208,7 +208,7 @@
msgid "Sending an SMS is not supported"
msgstr "Слање СМС‑а није подржано."
-#: akonadi-contacts/actions/qekigadialer.cpp:85
+#: akonadi-contacts/actions/qekigadialer.cpp:84
#, kde-format
msgid ""
"Unable to start ekiga process, check that ekiga executable is in your PATH "
@@ -217,18 +217,18 @@
"Не могу да нађем процес Екиге, проверите да ли је наредба ekiga доступна "
"кроз променљиву $PATH."
-#: akonadi-contacts/actions/qekigadialer.cpp:110
+#: akonadi-contacts/actions/qekigadialer.cpp:109
#, kde-format
msgid "Ekiga Public API (D-Bus) seems to be disabled."
msgstr "Изгледа да је јавни АПИ Екиге (д‑бус) искључен."
-#: akonadi-contacts/actions/qekigadialer.cpp:130
+#: akonadi-contacts/actions/qekigadialer.cpp:129
#, kde-format
msgid "Sending an SMS is currently not supported on Ekiga."
msgstr "Слање СМС‑а тренутно није подржано на Екиги."
# literal-segment: sflphone-client-kde
-#: akonadi-contacts/actions/qsflphonedialer.cpp:67
+#: akonadi-contacts/actions/qsflphonedialer.cpp:66
#, kde-format
msgid ""
"Unable to start sflphone-client-kde process, check that sflphone-client-kde "
@@ -237,7 +237,7 @@
"Не могу да нађем процес СФЛ‑фона, проверите да ли је наредба sflphone-client-"
"kde доступна кроз променљиву $PATH."
-#: akonadi-contacts/actions/qskypedialer.cpp:91
+#: akonadi-contacts/actions/qskypedialer.cpp:89
#, kde-format
msgid ""
"Unable to start skype process, check that skype executable is in your PATH "
@@ -246,23 +246,25 @@
"Не могу да нађем процес Скајпа, проверите да ли је наредба skype доступна "
"кроз променљиву $PATH."
-#: akonadi-contacts/actions/qskypedialer.cpp:116
+#: akonadi-contacts/actions/qskypedialer.cpp:114
#, kde-format
msgid "Skype Public API (D-Bus) seems to be disabled."
msgstr "Изгледа да је јавни АПИ Скајпа (д‑бус) искључен."
-#: akonadi-contacts/actions/qskypedialer.cpp:125
+#: akonadi-contacts/actions/qskypedialer.cpp:123
#, kde-format
msgid "Skype registration failed."
msgstr "Неуспела регистрација на Скајп."
-#: akonadi-contacts/actions/qskypedialer.cpp:134
+#: akonadi-contacts/actions/qskypedialer.cpp:132
#, kde-format
msgid "Protocol mismatch."
msgstr "Протоколи се не слажу."
#: akonadi-contacts/actions/smsdialog.cpp:50
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "SMS text"
+msgctxt "@title:window"
msgid "SMS text"
msgstr "СМС текст"
@@ -297,10 +299,11 @@
msgid "Ignore and Overwrite changes"
msgstr "Игнориши и пребриши измене"
-# >> @title:window
#: akonadi-contacts/contacteditor.cpp:290
#: akonadi-contacts/contactgroupeditor.cpp:297
+#: akonadi-contacts/selectaddressbookdialog.cpp:37
#, kde-format
+msgctxt "@title:window"
msgid "Select Address Book"
msgstr "Избор адресара"
@@ -310,23 +313,41 @@
msgstr "Изаберите адресар у који треба уписати нови контакт:"
# >> @title:window
-#: akonadi-contacts/contacteditordialog.cpp:53
+#: akonadi-contacts/contacteditordialog.cpp:54
#, kde-format
msgid "New Contact"
msgstr "Нови контакт"
# >> @title:window
-#: akonadi-contacts/contacteditordialog.cpp:53
+#: akonadi-contacts/contacteditordialog.cpp:54
#, kde-format
msgid "Edit Contact"
msgstr "Уређивање контакта"
-#: akonadi-contacts/contacteditordialog.cpp:77
-#: akonadi-contacts/contactgroupeditordialog.cpp:116
+#: akonadi-contacts/contacteditordialog.cpp:78
+#: akonadi-contacts/contactgroupeditordialog.cpp:117
#, kde-format
msgid "Add to:"
msgstr "Додај у:"
+#: akonadi-contacts/contacteditordialog.cpp:198
+#: akonadi-contacts/contactgroupeditordialog.cpp:182
+#, fuzzy, kde-format
+#| msgid "Do you really want to delete the selected contact?"
+#| msgid_plural "Do you really want to delete %1 contacts?"
+msgctxt "@info"
+msgid "Do you really want to cancel?"
+msgstr "Желите ли заиста да обришете %1 контакт?"
+
+# >> @title:window
+#: akonadi-contacts/contacteditordialog.cpp:199
+#: akonadi-contacts/contactgroupeditordialog.cpp:183
+#, fuzzy, kde-format
+#| msgid "Confirm Delete"
+msgctxt "@title:window"
+msgid "Confirmation"
+msgstr "Потврда брисања"
+
#: akonadi-contacts/contactgroupeditor.cpp:147
#, kde-format
msgid ""
@@ -361,13 +382,13 @@
msgstr "Чланови групе контаката:"
# >> @title:window
-#: akonadi-contacts/contactgroupeditordialog.cpp:91
+#: akonadi-contacts/contactgroupeditordialog.cpp:92
#, kde-format
msgid "New Contact Group"
msgstr "Нова група контаката"
# >> @title:window
-#: akonadi-contacts/contactgroupeditordialog.cpp:91
+#: akonadi-contacts/contactgroupeditordialog.cpp:92
#, kde-format
msgid "Edit Contact Group"
msgstr "Уређивање групе контаката"
@@ -398,20 +419,24 @@
# >> @title:window
#: akonadi-contacts/contactgroupviewer.cpp:71
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Contact Group %1"
+msgctxt "@title:window"
msgid "Contact Group %1"
msgstr "Група контаката %1"
# >> @item:intext
#: akonadi-contacts/contactgroupviewer.cpp:85
-#: akonadi-contacts/standardcontactformatter.cpp:214
+#: akonadi-contacts/standardcontactformatter.cpp:215
#, kde-format
msgid "Address Book"
msgstr "адресар"
# >> @title:window
#: akonadi-contacts/contactgroupviewerdialog.cpp:45
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Show Contact Group"
+msgctxt "@title:window"
msgid "Show Contact Group"
msgstr "Приказ групе контаката"
@@ -470,18 +495,22 @@
msgstr "све е‑поште"
# >> @title:window
-#: akonadi-contacts/contactviewer.cpp:77
-#, kde-format
+#: akonadi-contacts/contactviewer.cpp:76
+#, fuzzy, kde-format
+#| msgid "Contact %1"
+msgctxt "@title:window"
msgid "Contact %1"
msgstr "Контакт %1"
# >> @title:window
#: akonadi-contacts/contactviewerdialog.cpp:72
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Show Contact"
+msgctxt "@title:window"
msgid "Show Contact"
msgstr "Приказ контакта"
-#: akonadi-contacts/emailaddressrequester.cpp:96
+#: akonadi-contacts/emailaddressrequester.cpp:94
#, kde-format
msgid "Open Address Book"
msgstr "Отвори адресар"
@@ -503,12 +532,6 @@
msgid "Search:"
msgstr "Тражи:"
-#: akonadi-contacts/selectaddressbookdialog.cpp:37
-#, kde-format
-msgctxt "@title:window"
-msgid "Select Address Book"
-msgstr "Избор адресара"
-
#: akonadi-contacts/selectaddressbookdialog.cpp:40
#, kde-format
msgctxt "@info"
@@ -938,7 +961,7 @@
"<p>Уређивање изабраног контакта.</p><p>Отвара се дијалог у коме можете "
"уредити податке о особи, укључујући адресе и бројеве телефона.</p>"
-#: akonadi-contacts/standardcontactformatter.cpp:118
+#: akonadi-contacts/standardcontactformatter.cpp:119
#, kde-format
msgid "(One year old)"
msgid_plural "(%1 years old)"
@@ -947,89 +970,89 @@
msgstr[2] "(%1 година)"
msgstr[3] "(%1 година)"
-#: akonadi-contacts/standardcontactformatter.cpp:130
+#: akonadi-contacts/standardcontactformatter.cpp:131
#, kde-format
msgctxt "@info:tooltip"
msgid "Send SMS"
msgstr "Пошаљи СМС"
# >> @item:intext
-#: akonadi-contacts/standardcontactformatter.cpp:146
+#: akonadi-contacts/standardcontactformatter.cpp:147
#, kde-format
msgctxt "a contact's email address"
msgid "Email"
msgstr "е‑пошта"
# >> @item:intext
-#: akonadi-contacts/standardcontactformatter.cpp:163
+#: akonadi-contacts/standardcontactformatter.cpp:164
#, kde-format
msgid "Homepage"
msgstr "домаћа страница"
# >> @item:intext
-#: akonadi-contacts/standardcontactformatter.cpp:169
+#: akonadi-contacts/standardcontactformatter.cpp:170
#: contact-editor/editor/generalinfoeditor/blogfeedwidget.cpp:37
#, kde-format
msgid "Blog Feed"
msgstr "довод блога"
-#: akonadi-contacts/standardcontactformatter.cpp:187
+#: akonadi-contacts/standardcontactformatter.cpp:188
#, kde-format
msgctxt "@info:tooltip"
msgid "Show address on map"
msgstr "Покажи адресу на карти"
# >> @item:intext
-#: akonadi-contacts/standardcontactformatter.cpp:199
+#: akonadi-contacts/standardcontactformatter.cpp:200
#, kde-format
msgid "Notes"
msgstr "белешке"
# >> @item:intext
-#: akonadi-contacts/standardcontactformatter.cpp:206
+#: akonadi-contacts/standardcontactformatter.cpp:207
#, kde-format
msgid "Department"
msgstr "одељење"
# >> @item:intext
-#: akonadi-contacts/standardcontactformatter.cpp:207
+#: akonadi-contacts/standardcontactformatter.cpp:208
#, kde-format
msgid "Profession"
msgstr "струка"
# >> @item:intext
-#: akonadi-contacts/standardcontactformatter.cpp:208
+#: akonadi-contacts/standardcontactformatter.cpp:209
#, kde-format
msgid "Assistant's Name"
msgstr "име помоћника"
# >> @item:intext
-#: akonadi-contacts/standardcontactformatter.cpp:209
+#: akonadi-contacts/standardcontactformatter.cpp:210
#, kde-format
msgid "Manager's Name"
msgstr "име менаџера"
# >> @item:intext
-#: akonadi-contacts/standardcontactformatter.cpp:210
+#: akonadi-contacts/standardcontactformatter.cpp:211
#, kde-format
msgctxt "Wife/Husband/..."
msgid "Partner's Name"
msgstr "име супружника"
# >> @item:intext
-#: akonadi-contacts/standardcontactformatter.cpp:211
+#: akonadi-contacts/standardcontactformatter.cpp:212
#, kde-format
msgid "Office"
msgstr "канцеларија"
# >> @item:intext
-#: akonadi-contacts/standardcontactformatter.cpp:212
+#: akonadi-contacts/standardcontactformatter.cpp:213
#, kde-format
msgid "IM Address"
msgstr "ИМ адреса"
# >> @item:intext
-#: akonadi-contacts/standardcontactformatter.cpp:213
+#: akonadi-contacts/standardcontactformatter.cpp:214
#, kde-format
msgid "Anniversary"
msgstr "годишњица"
@@ -1046,31 +1069,31 @@
msgid "no"
msgstr "не"
-#: akonadi-contacts/textbrowser.cpp:70
+#: akonadi-contacts/textbrowser.cpp:69
#, kde-format
msgctxt "@action:inmenu Copy the text of a general item"
msgid "Copy Item"
msgstr "Копирај ставку"
-#: akonadi-contacts/textbrowser.cpp:79
+#: akonadi-contacts/textbrowser.cpp:78
#, kde-format
msgctxt "@action:inmenu Copy a displayed email address"
msgid "Copy Email Address"
msgstr "Копирај адресу е‑поште"
-#: akonadi-contacts/textbrowser.cpp:88
+#: akonadi-contacts/textbrowser.cpp:87
#, kde-format
msgctxt "@action:inmenu Copy a link URL"
msgid "Copy Link URL"
msgstr "Копирај УРЛ везе"
-#: akonadi-contacts/textbrowser.cpp:116
+#: akonadi-contacts/textbrowser.cpp:115
#, kde-format
msgctxt "@action:inmenu Copy a contact photo"
msgid "Copy Photo"
msgstr "Копирај фотографију"
-#: akonadi-contacts/textbrowser.cpp:119
+#: akonadi-contacts/textbrowser.cpp:118
#, fuzzy, kde-format
#| msgctxt "@action:inmenu Copy a QR or Datamatrix image"
#| msgid "Copy Code"
@@ -1083,10 +1106,109 @@
msgid "<p style=\"color: white;\"><b>Waiting for operation</b><br/></p>"
msgstr "<p style=\"color: white;\"><b>Чекам на поступак</b><br/></p>"
-#: contact-editor/editor/addresseditor/addresseslocationwidget.cpp:46
+# >> @item:intext
+#: contact-editor/editor/addresseditor/addresseslocationwidget.cpp:75
+#, fuzzy, kde-format
+#| msgid "IM Address"
+msgid "Remove Address"
+msgstr "ИМ адреса"
+
+#: contact-editor/editor/addresseditor/addresseslocationwidget.cpp:78
+#, fuzzy, kde-format
+#| msgid "Do you really want to delete this address book?"
+#| msgid_plural "Do you really want to delete %1 address books?"
+msgid "Do you really want to delete this address?"
+msgstr "Желите ли заиста да обришете %1 адресар?"
+
+#: contact-editor/editor/addresseditor/addresslocationwidget.cpp:64
+#, fuzzy, kde-format
+#| msgid "Add FreeBusy"
+msgid "Add Street"
+msgstr "Додај слободно-заузето"
+
+#: contact-editor/editor/addresseditor/addresslocationwidget.cpp:74
+#, fuzzy, kde-format
+#| msgid "Add the office"
+msgid "Add Post Office Box"
+msgstr "Додај канцеларију"
+
+#: contact-editor/editor/addresseditor/addresslocationwidget.cpp:83
+#, kde-format
+msgid "Add Postal Code"
+msgstr ""
+
+#: contact-editor/editor/addresseditor/addresslocationwidget.cpp:92
+#, kde-format
+msgid "Add Locality"
+msgstr ""
+
+#: contact-editor/editor/addresseditor/addresslocationwidget.cpp:101
+#, fuzzy, kde-format
+#| msgid "Add profession"
+msgid "Add Region"
+msgstr "Додај струку"
+
+#: contact-editor/editor/addresseditor/addresslocationwidget.cpp:115
+#, fuzzy, kde-format
+#| msgid "Add an Email Account"
+msgid "Add a Country"
+msgstr "Додај налог е‑поште"
+
+#: contact-editor/editor/addresseditor/addresslocationwidget.cpp:119
#, kde-format
-msgid "Missing plugins. Please verify your installation"
-msgstr "Недостају прикључци. Проверите инсталацију."
+msgctxt "street/postal"
+msgid "This is the preferred address"
+msgstr ""
+
+#: contact-editor/editor/addresseditor/addresslocationwidget.cpp:130
+#, fuzzy, kde-format
+#| msgctxt "@title:window"
+#| msgid "Add Address Book"
+msgid "Add Address"
+msgstr "Додавање адресара"
+
+#: contact-editor/editor/addresseditor/addresslocationwidget.cpp:142
+#, fuzzy, kde-format
+#| msgid "Update Address Book"
+#| msgid_plural "Update %1 Address Books"
+msgid "Update Address"
+msgstr "Ажурирај %1 адресар"
+
+#: contact-editor/editor/addresseditor/addresslocationwidget.cpp:147
+#, kde-format
+msgid "Cancel"
+msgstr ""
+
+#: contact-editor/editor/addresseditor/addresstypedialog.cpp:37
+#, fuzzy, kde-format
+#| msgid "Update Address Book"
+#| msgid_plural "Update %1 Address Books"
+msgctxt "street/postal"
+msgid "Edit Address Type"
+msgstr "Ажурирај %1 адресар"
+
+#: contact-editor/editor/addresseditor/addresstypedialog.cpp:51
+#, fuzzy, kde-format
+#| msgctxt "@title:column address books overview"
+#| msgid "Address Books"
+msgctxt "street/postal"
+msgid "Address Types"
+msgstr "адресари"
+
+#: contact-editor/editor/addresseditor/selectaddresstypecombobox.cpp:78
+#: contact-editor/editor/generalinfoeditor/phone/phonecomboboxtype.cpp:83
+#, kde-format
+msgctxt "@item:inlistbox Category of contact info field"
+msgid "Other..."
+msgstr "друго..."
+
+#: contact-editor/editor/addresseditor/selectaddresstypecombobox.cpp:80
+#, fuzzy, kde-format
+#| msgctxt "@title:window"
+#| msgid "New Address Book Folder"
+msgctxt "@item:inlistbox Category of contact info field"
+msgid "New Address Type"
+msgstr "Нова фасцикла адресара"
#: contact-editor/editor/businesseditor/businesseditorwidget.cpp:53
#, kde-format
@@ -1307,30 +1429,6 @@
msgid "Add a Blog Feed"
msgstr "довод блога"
-#: contact-editor/editor/generalinfoeditor/contactselecttypecombobox.cpp:38
-#: contact-editor/editor/generalinfoeditor/web/webselecttypecombobox.cpp:38
-#, kde-format
-msgid "Select..."
-msgstr "Изабери..."
-
-#: contact-editor/editor/generalinfoeditor/contactselecttypecombobox.cpp:41
-#: contact-editor/editor/generalinfoeditor/web/webselecttypecombobox.cpp:41
-#, kde-format
-msgid "Home"
-msgstr "Кућа"
-
-#: contact-editor/editor/generalinfoeditor/contactselecttypecombobox.cpp:44
-#: contact-editor/editor/generalinfoeditor/web/webselecttypecombobox.cpp:44
-#, kde-format
-msgid "Work"
-msgstr "Посао"
-
-#: contact-editor/editor/generalinfoeditor/contactselecttypecombobox.cpp:47
-#: contact-editor/editor/generalinfoeditor/web/webselecttypecombobox.cpp:50
-#, kde-format
-msgid "Other"
-msgstr "Друго"
-
# >> @item:intable
#: contact-editor/editor/generalinfoeditor/displaynameeditwidget.cpp:60
#, kde-format
@@ -1377,17 +1475,41 @@
msgid "Email"
msgstr "Е‑пошта"
+#: contact-editor/editor/generalinfoeditor/mail/mailtypecombobox.cpp:32
+#: contact-editor/editor/generalinfoeditor/web/webselecttypecombobox.cpp:33
+#, kde-format
+msgid "Select..."
+msgstr "Изабери..."
+
+#: contact-editor/editor/generalinfoeditor/mail/mailtypecombobox.cpp:33
+#: contact-editor/editor/generalinfoeditor/web/webselecttypecombobox.cpp:34
+#, kde-format
+msgid "Home"
+msgstr "Кућа"
+
+#: contact-editor/editor/generalinfoeditor/mail/mailtypecombobox.cpp:34
+#: contact-editor/editor/generalinfoeditor/web/webselecttypecombobox.cpp:35
+#, kde-format
+msgid "Work"
+msgstr "Посао"
+
+#: contact-editor/editor/generalinfoeditor/mail/mailtypecombobox.cpp:35
+#: contact-editor/editor/generalinfoeditor/web/webselecttypecombobox.cpp:37
+#, kde-format
+msgid "Other"
+msgstr "Друго"
+
#: contact-editor/editor/generalinfoeditor/mail/mailwidget.cpp:40
#, kde-format
msgid "Add an Email Account"
msgstr "Додај налог е‑поште"
-#: contact-editor/editor/generalinfoeditor/mail/mailwidget.cpp:53
+#: contact-editor/editor/generalinfoeditor/mail/mailwidget.cpp:52
#, kde-format
msgid "Add an Email"
msgstr "Додај е‑пошту"
-#: contact-editor/editor/generalinfoeditor/mail/mailwidget.cpp:60
+#: contact-editor/editor/generalinfoeditor/mail/mailwidget.cpp:59
#, kde-format
msgid "Remove Email"
msgstr "Уклони е‑пошту"
@@ -1425,31 +1547,32 @@
msgid "Messaging"
msgstr "Гласништво"
-#: contact-editor/editor/generalinfoeditor/messaging/messagingwidget.cpp:41
+#: contact-editor/editor/generalinfoeditor/messaging/messagingwidget.cpp:44
#, kde-format
msgid "Add an identifier"
msgstr "Додај идентификатор"
-#: contact-editor/editor/generalinfoeditor/messaging/messagingwidget.cpp:49
+#: contact-editor/editor/generalinfoeditor/messaging/messagingwidget.cpp:52
#, kde-format
msgctxt "@item:inlistbox select from a list of IM protocols"
msgid "Select..."
msgstr "по избору..."
-#: contact-editor/editor/generalinfoeditor/messaging/messagingwidget.cpp:62
+#: contact-editor/editor/generalinfoeditor/messaging/messagingwidget.cpp:65
#, kde-format
msgid "Add an IM"
msgstr "Додај ИМ"
-#: contact-editor/editor/generalinfoeditor/messaging/messagingwidget.cpp:69
+#: contact-editor/editor/generalinfoeditor/messaging/messagingwidget.cpp:72
#, kde-format
msgid "Remove IM"
msgstr "Уклони ИМ"
# >> @title:window
#: contact-editor/editor/generalinfoeditor/nameeditdialog.cpp:36
-#: contact-editor/editor/generalinfoeditor/namewidget.cpp:55
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Edit Contact Name"
+msgctxt "@title:window"
msgid "Edit Contact Name"
msgstr "Уређивање имена контакта"
@@ -1548,6 +1671,12 @@
msgid "..."
msgstr "..."
+# >> @title:window
+#: contact-editor/editor/generalinfoeditor/namewidget.cpp:55
+#, kde-format
+msgid "Edit Contact Name"
+msgstr "Уређивање имена контакта"
+
#: contact-editor/editor/generalinfoeditor/nicknamewidget.cpp:37
#, kde-format
msgid "Nickname"
@@ -1558,12 +1687,6 @@
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 "друго..."
-
#: contact-editor/editor/generalinfoeditor/phone/phonelistwidget.cpp:38
#, kde-format
msgid "Phone"
@@ -1571,7 +1694,9 @@
# >> @title:window
#: contact-editor/editor/generalinfoeditor/phone/phonetypedialog.cpp:37
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Edit Phone Number"
+msgctxt "@title:window"
msgid "Edit Phone Number"
msgstr "Уређивање телефонског броја"
@@ -1591,19 +1716,19 @@
msgid "Web"
msgstr "Веб"
-#: contact-editor/editor/generalinfoeditor/web/webselecttypecombobox.cpp:47
+#: contact-editor/editor/generalinfoeditor/web/webselecttypecombobox.cpp:36
#, fuzzy, kde-format
#| msgid "Prof."
msgid "Profile"
msgstr "проф."
#: contact-editor/editor/generalinfoeditor/web/webwidget.cpp:41
-#: contact-editor/editor/generalinfoeditor/web/webwidget.cpp:54
+#: contact-editor/editor/generalinfoeditor/web/webwidget.cpp:53
#, kde-format
msgid "Add a Web Site"
msgstr "Додај веб сајт"
-#: contact-editor/editor/generalinfoeditor/web/webwidget.cpp:61
+#: contact-editor/editor/generalinfoeditor/web/webwidget.cpp:60
#, kde-format
msgid "Remove Web Site"
msgstr "Уклони веб сајт"
@@ -1736,7 +1861,7 @@
msgid "Images (%1)"
msgstr "Слике (%1)"
-#: contact-editor/editor/widgets/preferredlineeditwidget.cpp:42
+#: contact-editor/editor/widgets/preferredlineeditwidget.cpp:36
#, kde-format
msgid "Set as Preferred"
msgstr "Постави као пожељно"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-contacts-20.04.2/po/sr/kcm_akonadicontact_actions.po
new/akonadi-contacts-20.04.3/po/sr/kcm_akonadicontact_actions.po
--- old/akonadi-contacts-20.04.2/po/sr/kcm_akonadicontact_actions.po
2020-06-09 02:44:45.000000000 +0200
+++ new/akonadi-contacts-20.04.3/po/sr/kcm_akonadicontact_actions.po
2020-07-07 03:07:26.000000000 +0200
@@ -3,8 +3,8 @@
msgid ""
msgstr ""
"Project-Id-Version: kcm_akonadicontact_actions\n"
-"Report-Msgid-Bugs-To: http://bugs.kde.org\n";
-"POT-Creation-Date: 2019-04-15 03:27+0200\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
+"POT-Creation-Date: 2020-04-05 08:48+0200\n"
"PO-Revision-Date: 2016-11-28 01:33+0100\n"
"Last-Translator: Chusslove Illich <[email protected]>\n"
"Language-Team: Serbian <[email protected]>\n"
@@ -76,12 +76,12 @@
msgid "Tobias Koenig"
msgstr "Тобијас Кениг"
-#: kcmakonadicontactactions.cpp:52 kcmakonadicontactactions.cpp:60
+#: kcmakonadicontactactions.cpp:52 kcmakonadicontactactions.cpp:58
#, kde-format
msgid "System Default"
msgstr ""
-#: kcmakonadicontactactions.cpp:53 kcmakonadicontactactions.cpp:61
+#: kcmakonadicontactactions.cpp:53 kcmakonadicontactactions.cpp:59
#, kde-format
msgid "Skype"
msgstr "Скајп"
@@ -91,33 +91,33 @@
msgid "Ekiga"
msgstr "Екига"
-#: kcmakonadicontactactions.cpp:55 kcmakonadicontactactions.cpp:62
+#: kcmakonadicontactactions.cpp:55 kcmakonadicontactactions.cpp:60
#, kde-format
msgid "SflPhone"
msgstr "СФЛ‑фон"
-#: kcmakonadicontactactions.cpp:56 kcmakonadicontactactions.cpp:63
-#: kcmakonadicontactactions.cpp:67
+#: kcmakonadicontactactions.cpp:56 kcmakonadicontactactions.cpp:61
+#: kcmakonadicontactactions.cpp:64
#, kde-format
msgid "External Application"
msgstr "спољашњи програм"
-#: kcmakonadicontactactions.cpp:66
+#: kcmakonadicontactactions.cpp:63
#, kde-format
msgid "Web Browser"
msgstr "веб прегледач"
-#: kcmakonadicontactactions.cpp:68
+#: kcmakonadicontactactions.cpp:65
#, kde-format
msgid "Google map"
msgstr "Гугл‑карте"
-#: kcmakonadicontactactions.cpp:69
+#: kcmakonadicontactactions.cpp:66
#, kde-format
msgid "Map quest"
msgstr "Мапквест"
-#: kcmakonadicontactactions.cpp:70
+#: kcmakonadicontactactions.cpp:67
#, kde-format
msgid "OpenStreetMap"
msgstr "Опенстритмап"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-contacts-20.04.2/po/zh_CN/akonadicontact5-serializer.po
new/akonadi-contacts-20.04.3/po/zh_CN/akonadicontact5-serializer.po
--- old/akonadi-contacts-20.04.2/po/zh_CN/akonadicontact5-serializer.po
2020-06-09 02:44:46.000000000 +0200
+++ new/akonadi-contacts-20.04.3/po/zh_CN/akonadicontact5-serializer.po
2020-07-07 03:07:26.000000000 +0200
@@ -9,8 +9,8 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2019-05-20 03:14+0200\n"
-"PO-Revision-Date: 2020-05-09 13:51\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2020-06-24 08:02\n"
+"Last-Translator: \n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
@@ -18,8 +18,11 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Crowdin-Project: kdeorg\n"
+"X-Crowdin-Project-ID: 269464\n"
"X-Crowdin-Language: zh-CN\n"
-"X-Crowdin-File: /kf5-stable/messages/pim/akonadicontact5-serializer.pot\n"
+"X-Crowdin-File: /kf5-stable/messages/akonadi-contacts/akonadicontact5-"
+"serializer.pot\n"
+"X-Crowdin-File-ID: 7033\n"
#: akonadi_serializer_addressee.cpp:182
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-contacts-20.04.2/po/zh_CN/akonadicontact5.po
new/akonadi-contacts-20.04.3/po/zh_CN/akonadicontact5.po
--- old/akonadi-contacts-20.04.2/po/zh_CN/akonadicontact5.po 2020-06-09
02:44:46.000000000 +0200
+++ new/akonadi-contacts-20.04.3/po/zh_CN/akonadicontact5.po 2020-07-07
03:07:26.000000000 +0200
@@ -9,8 +9,8 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2020-02-29 03:17+0100\n"
-"PO-Revision-Date: 2020-05-09 13:51\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2020-06-24 08:02\n"
+"Last-Translator: \n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
@@ -18,8 +18,10 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Crowdin-Project: kdeorg\n"
+"X-Crowdin-Project-ID: 269464\n"
"X-Crowdin-Language: zh-CN\n"
-"X-Crowdin-File: /kf5-stable/messages/pim/akonadicontact5.pot\n"
+"X-Crowdin-File: /kf5-stable/messages/akonadi-contacts/akonadicontact5.pot\n"
+"X-Crowdin-File-ID: 3111\n"
#. i18n: ectx: whatsthis, entry (ShowAddressAction), group (Show Address
Settings)
#: akonadi-contacts/actions/contactactionssettings.kcfg.cmake:18
@@ -981,7 +983,7 @@
#: contact-editor/editor/addresseditor/addresseslocationwidget.cpp:75
#, kde-format
msgid "Remove Address"
-msgstr ""
+msgstr "移除地址"
#: contact-editor/editor/addresseditor/addresseslocationwidget.cpp:78
#, kde-format
@@ -991,7 +993,7 @@
#: contact-editor/editor/addresseditor/addresslocationwidget.cpp:64
#, kde-format
msgid "Add Street"
-msgstr ""
+msgstr "添加街道"
#: contact-editor/editor/addresseditor/addresslocationwidget.cpp:74
#, kde-format
@@ -1027,17 +1029,17 @@
#: contact-editor/editor/addresseditor/addresslocationwidget.cpp:130
#, kde-format
msgid "Add Address"
-msgstr ""
+msgstr "添加地址"
#: contact-editor/editor/addresseditor/addresslocationwidget.cpp:142
#, kde-format
msgid "Update Address"
-msgstr ""
+msgstr "更新地址"
#: contact-editor/editor/addresseditor/addresslocationwidget.cpp:147
#, kde-format
msgid "Cancel"
-msgstr ""
+msgstr "取消"
#: contact-editor/editor/addresseditor/addresstypedialog.cpp:37
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-contacts-20.04.2/po/zh_CN/kcm_akonadicontact_actions.po
new/akonadi-contacts-20.04.3/po/zh_CN/kcm_akonadicontact_actions.po
--- old/akonadi-contacts-20.04.2/po/zh_CN/kcm_akonadicontact_actions.po
2020-06-09 02:44:46.000000000 +0200
+++ new/akonadi-contacts-20.04.3/po/zh_CN/kcm_akonadicontact_actions.po
2020-07-07 03:07:26.000000000 +0200
@@ -9,8 +9,8 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2020-04-05 08:48+0200\n"
-"PO-Revision-Date: 2020-05-09 13:51\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2020-06-24 08:02\n"
+"Last-Translator: \n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
@@ -18,8 +18,11 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Crowdin-Project: kdeorg\n"
+"X-Crowdin-Project-ID: 269464\n"
"X-Crowdin-Language: zh-CN\n"
-"X-Crowdin-File: /kf5-stable/messages/pim/kcm_akonadicontact_actions.pot\n"
+"X-Crowdin-File: /kf5-stable/messages/akonadi-contacts/"
+"kcm_akonadicontact_actions.pot\n"
+"X-Crowdin-File-ID: 3138\n"
#, kde-format
msgctxt "NAME OF TRANSLATORS"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-contacts-20.04.2/src/akonadi-contacts/contacteditor.cpp
new/akonadi-contacts-20.04.3/src/akonadi-contacts/contacteditor.cpp
--- old/akonadi-contacts-20.04.2/src/akonadi-contacts/contacteditor.cpp
2020-05-20 21:03:33.000000000 +0200
+++ new/akonadi-contacts-20.04.3/src/akonadi-contacts/contacteditor.cpp
2020-06-29 08:28:51.000000000 +0200
@@ -55,7 +55,7 @@
if (editorWidget) {
mEditorWidget = editorWidget;
} else {
- mEditorWidget = new ContactEditorWidget(displayMode == FullMode ?
ContactEditorWidget::FullMode : ContactEditorWidget::VCardMode, nullptr);
+ mEditorWidget = new ContactEditorWidget(displayMode == FullMode ?
ContactEditorWidget::FullMode : ContactEditorWidget::VCardMode, mParent);
}
QVBoxLayout *layout = new QVBoxLayout(mParent);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-contacts-20.04.2/src/contact-editor/editor/addresseditor/addresseslocationwidget.cpp
new/akonadi-contacts-20.04.3/src/contact-editor/editor/addresseditor/addresseslocationwidget.cpp
---
old/akonadi-contacts-20.04.2/src/contact-editor/editor/addresseditor/addresseslocationwidget.cpp
2020-05-20 21:03:33.000000000 +0200
+++
new/akonadi-contacts-20.04.3/src/contact-editor/editor/addresseditor/addresseslocationwidget.cpp
2020-06-29 08:28:51.000000000 +0200
@@ -47,7 +47,7 @@
mAddressesLocationView->setRootIsDecorated(false);
mAddressesLocationView->setHeaderHidden(true);
mAddressesLocationView->setModel(mAddressModel);
- mAddressesLocationView->setItemDelegate(new AddressDelegate);
+ mAddressesLocationView->setItemDelegate(new AddressDelegate(this));
mAddressesLocationView->setContextMenuPolicy(Qt::CustomContextMenu);
mAddressesLocationView->setObjectName(QStringLiteral("addresseslocationviewer"));
addWidget(mAddressesLocationView);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-contacts-20.04.2/src/contact-editor/editor/addresseditor/selectaddresstypecombobox.cpp
new/akonadi-contacts-20.04.3/src/contact-editor/editor/addresseditor/selectaddresstypecombobox.cpp
---
old/akonadi-contacts-20.04.2/src/contact-editor/editor/addresseditor/selectaddresstypecombobox.cpp
2020-05-20 21:03:33.000000000 +0200
+++
new/akonadi-contacts-20.04.3/src/contact-editor/editor/addresseditor/selectaddresstypecombobox.cpp
2020-06-29 08:28:51.000000000 +0200
@@ -54,7 +54,7 @@
{
if (!mTypeList.contains(static_cast<int>(type))) {
// insert at the end, but before the 'Others...' entry
- mTypeList.insert(mTypeList.at(mTypeList.count() - 1),
static_cast<int>(type));
+ mTypeList.insert(mTypeList.count() - 1, static_cast<int>(type));
}
mType = type;
@@ -106,7 +106,7 @@
if (dlg->exec()) {
mType = dlg->type();
if (!mTypeList.contains(mType)) {
- mTypeList.insert(mTypeList.at(mTypeList.count() - 1), mType);
+ mTypeList.insert(mTypeList.count() - 1, mType);
}
} else {
setType(KContacts::Address::Type(mTypeList.at(mLastSelected)));
