Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kalarm for openSUSE:Factory checked in at 2021-09-04 22:34:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kalarm (Old) and /work/SRC/openSUSE:Factory/.kalarm.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kalarm" Sat Sep 4 22:34:04 2021 rev:61 rq:915854 version:21.08.1 Changes: -------- --- /work/SRC/openSUSE:Factory/kalarm/kalarm.changes 2021-08-16 10:14:47.186864341 +0200 +++ /work/SRC/openSUSE:Factory/.kalarm.new.1899/kalarm.changes 2021-09-04 22:36:24.572235430 +0200 @@ -1,0 +2,10 @@ +Wed Sep 1 12:37:55 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 21.08.1 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/gear/21.08.1 +- Changes since 21.08.0: + * Fix crash when KAlarm is launched while already running (kde#441660) + +------------------------------------------------------------------- Old: ---- kalarm-21.08.0.tar.xz kalarm-21.08.0.tar.xz.sig New: ---- kalarm-21.08.1.tar.xz kalarm-21.08.1.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kalarm.spec ++++++ --- /var/tmp/diff_new_pack.7zvAIM/_old 2021-09-04 22:36:25.008236007 +0200 +++ /var/tmp/diff_new_pack.7zvAIM/_new 2021-09-04 22:36:25.008236007 +0200 @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kalarm -Version: 21.08.0 +Version: 21.08.1 Release: 0 Summary: Personal Alarm Scheduler License: GPL-2.0-only ++++++ kalarm-21.08.0.tar.xz -> kalarm-21.08.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-21.08.0/CMakeLists.txt new/kalarm-21.08.1/CMakeLists.txt --- old/kalarm-21.08.0/CMakeLists.txt 2021-08-05 00:08:07.000000000 +0200 +++ new/kalarm-21.08.1/CMakeLists.txt 2021-08-30 00:52:06.000000000 +0200 @@ -1,8 +1,8 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(PIM_VERSION "5.18.0") +set(PIM_VERSION "5.18.1") set(PIM_VERSION ${PIM_VERSION}) -set(RELEASE_SERVICE_VERSION "21.08.0") -set(KALARM_VERSION "3.3.0") +set(RELEASE_SERVICE_VERSION "21.08.1") +set(KALARM_VERSION "3.3.1") project(kalarm VERSION ${KALARM_VERSION}) @@ -38,26 +38,26 @@ set(KDEPIM_VERSION "${PIM_VERSION}${KDEPIM_DEV_VERSION} (${RELEASE_SERVICE_VERSION})") -set(KALARMCALENDAR_LIB_VERSION "5.18.0") -set(KIMAP_LIB_VERSION "5.18.0") -set(AKONADI_MIMELIB_VERSION "5.18.0") -set(AKONADI_CONTACT_VERSION "5.18.0") - -set(KMAILTRANSPORT_LIB_VERSION "5.18.0") -set(KPIMTEXTEDIT_LIB_VERSION "5.18.0") -set(IDENTITYMANAGEMENT_LIB_VERSION "5.18.0") -set(AKONADI_VERSION "5.18.0") -set(KMIME_LIB_VERSION "5.18.0") -set(AKONADIKALARM_LIB_VERSION "5.18.0") -set(PIMCOMMON_LIB_VERSION "5.18.0") -set(GRANTLEETHEME_LIB_VERSION "5.18.0") +set(KALARMCALENDAR_LIB_VERSION "5.18.1") +set(KIMAP_LIB_VERSION "5.18.1") +set(AKONADI_MIMELIB_VERSION "5.18.1") +set(AKONADI_CONTACT_VERSION "5.18.1") + +set(KMAILTRANSPORT_LIB_VERSION "5.18.1") +set(KPIMTEXTEDIT_LIB_VERSION "5.18.1") +set(IDENTITYMANAGEMENT_LIB_VERSION "5.18.1") +set(AKONADI_VERSION "5.18.1") +set(KMIME_LIB_VERSION "5.18.1") +set(AKONADIKALARM_LIB_VERSION "5.18.1") +set(PIMCOMMON_LIB_VERSION "5.18.1") +set(GRANTLEETHEME_LIB_VERSION "5.18.1") set(KDEPIM_LIB_VERSION "${PIM_VERSION}") set(KDEPIM_LIB_SOVERSION "5") set(QT_REQUIRED_VERSION "5.15.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Gui Network Widgets) -set(CALENDARUTILS_LIB_VERSION "5.18.0") +set(CALENDARUTILS_LIB_VERSION "5.18.1") option(FILE_RESOURCES "Use file system resources instead of Akonadi resources." TRUE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-21.08.0/Changelog new/kalarm-21.08.1/Changelog --- old/kalarm-21.08.0/Changelog 2021-08-05 00:08:07.000000000 +0200 +++ new/kalarm-21.08.1/Changelog 2021-08-30 00:52:06.000000000 +0200 @@ -1,5 +1,8 @@ KAlarm Change Log +=== Version 3.3.1 (KDE Applications 21.08.1) --- 29 August 2021 === +* Fix crash when KAlarm is launched while already running [KDE Bug 441660] + === Version 3.3.0 (KDE Applications 21.08) --- 1 August 2021 === * Add date selector option to enable alarm list view to be filtered. * Show hamburger menu when menu bar is hidden, to allow access to all options. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-21.08.0/po/ca@valencia/kalarm.po new/kalarm-21.08.1/po/ca@valencia/kalarm.po --- old/kalarm-21.08.0/po/ca@valencia/kalarm.po 2021-08-06 02:23:19.000000000 +0200 +++ new/kalarm-21.08.1/po/ca@valencia/kalarm.po 2021-08-31 02:37:24.000000000 +0200 @@ -11,14 +11,14 @@ "Project-Id-Version: kalarm\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-08-02 01:36+0000\n" -"PO-Revision-Date: 2021-07-13 10:47+0200\n" +"PO-Revision-Date: 2021-08-02 09:08+0200\n" "Last-Translator: Antoni Bella P??rez <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca@valencia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 21.04.3\n" +"X-Generator: Lokalize 21.07.80\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" @@ -3703,12 +3703,10 @@ "<filename>%1</filename> no sembla que siga un fitxer de text o una imatge" #: lib/file.cpp:180 -#, fuzzy, kde-format -#| msgctxt "@item:inlistbox File type selection filter" -#| msgid "Calendar files" +#, kde-format msgctxt "@item:inlistbox File type" msgid "All files" -msgstr "Fitxers de calendari" +msgstr "Tots els fitxers" #: lib/filedialog.cpp:55 #, kde-format @@ -7563,12 +7561,10 @@ msgstr "Fitxer de so" #: soundpicker.cpp:314 -#, fuzzy, kde-format -#| msgctxt "@item:inlistbox" -#| msgid "Sound file" +#, kde-format msgctxt "@item:inlistbox" msgid "Audio files" -msgstr "Fitxer de so" +msgstr "Fitxers d'??udio" #: soundpicker.cpp:338 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-21.08.0/po/en_GB/kalarm.po new/kalarm-21.08.1/po/en_GB/kalarm.po --- old/kalarm-21.08.0/po/en_GB/kalarm.po 2021-08-06 02:23:19.000000000 +0200 +++ new/kalarm-21.08.1/po/en_GB/kalarm.po 2021-08-31 02:37:24.000000000 +0200 @@ -10,7 +10,7 @@ "Project-Id-Version: kalarm\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-08-02 01:36+0000\n" -"PO-Revision-Date: 2021-07-25 11:23+0100\n" +"PO-Revision-Date: 2021-08-14 13:40+0100\n" "Last-Translator: Steve Allewell <[email protected]>\n" "Language-Team: British English <[email protected]>\n" "Language: en_GB\n" @@ -3604,12 +3604,10 @@ msgstr "<filename>%1</filename> appears not to be a text or image file" #: lib/file.cpp:180 -#, fuzzy, kde-format -#| msgctxt "@item:inlistbox File type selection filter" -#| msgid "Calendar files" +#, kde-format msgctxt "@item:inlistbox File type" msgid "All files" -msgstr "Calendar files" +msgstr "All files" #: lib/filedialog.cpp:55 #, kde-format @@ -7407,12 +7405,10 @@ msgstr "Sound File" #: soundpicker.cpp:314 -#, fuzzy, kde-format -#| msgctxt "@item:inlistbox" -#| msgid "Sound file" +#, kde-format msgctxt "@item:inlistbox" msgid "Audio files" -msgstr "Sound file" +msgstr "Audio files" #: soundpicker.cpp:338 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-21.08.0/po/hi/kalarm.po new/kalarm-21.08.1/po/hi/kalarm.po --- old/kalarm-21.08.0/po/hi/kalarm.po 2021-08-06 02:23:19.000000000 +0200 +++ new/kalarm-21.08.1/po/hi/kalarm.po 2021-08-31 02:37:24.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: kalarm\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-08-02 01:36+0000\n" -"PO-Revision-Date: 2021-07-10 10:57+0530\n" +"PO-Revision-Date: 2021-08-21 17:43+0530\n" "Last-Translator: Raghavendra Kamath <[email protected]>\n" "Language-Team: kde-hindi\n" "Language: hi\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 21.04.3\n" +"X-Generator: Lokalize 21.08.0\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -72,7 +72,7 @@ #, kde-format msgctxt "@info:whatsthis" msgid "Reschedule the alarm to the specified date and time." -msgstr "????????????????????? ????????? ????????? ?????????????????? ?????? ????????? ?????????????????? ????????? ?????? ???????????? ????????????." +msgstr "????????????????????? ????????? ????????? ?????????????????? ?????? ????????? ?????????????????? ????????? ?????? ???????????? ????????????." #: alarmtimewidget.cpp:94 #, fuzzy, kde-format @@ -644,7 +644,7 @@ "Use --help to get a list of available command line options.\n" msgstr "" "\n" -"--help ?????? ???????????????????????? ???????????? ?????????????????? ??????????????? ?????????????????? ???????????????????????? ?????? ???????????? ????????????????????? ???????????? ?????? ?????????.\n" +"--help ?????? ???????????????????????? ???????????? ?????????????????? ??????????????? ?????????????????? ???????????????????????? ?????? ???????????? ????????????????????? ???????????? ?????? ?????????.\n" #: commandoptions.cpp:744 #, kde-kuit-format @@ -1532,7 +1532,7 @@ msgctxt "@info:whatsthis" msgid "" "Default setting in the alarm edit dialog for blind copying emails to self." -msgstr "?????????????????? ?????????????????? ??????????????? ????????? ???????????? ?????? ??????????????? ?????? ????????????????????? ???????????? ??????????????? ?????? ????????? ???????????????????????? ?????????????????????." +msgstr "?????????????????? ?????????????????? ??????????????? ????????? ???????????? ?????? ??????????????? ?????? ????????????????????? ???????????? ??????????????? ?????? ????????? ???????????????????????? ?????????????????????." #. i18n: ectx: label, entry (DefaultRecurPeriod), group (Defaults) #: data/kalarmconfig.kcfg:362 @@ -4912,7 +4912,7 @@ "Check to use the default email address set in <application>KMail</" "application> or KDE System Settings, to identify you as the sender when " "sending email alarms." -msgstr "?????????????????? ?????????????????? ??????????????? ????????? ???????????? ?????? ??????????????? ?????? ????????????????????? ???????????? ??????????????? ?????? ????????? ???????????????????????? ?????????????????????." +msgstr "?????????????????? ?????????????????? ??????????????? ????????? ???????????? ?????? ??????????????? ?????? ????????????????????? ???????????? ??????????????? ?????? ????????? ???????????????????????? ?????????????????????." #: prefdlg.cpp:1058 #, kde-kuit-format @@ -4957,7 +4957,7 @@ "Check to use the default email address set in <application>KMail</" "application> or KDE System Settings, for blind copying email alarms to " "yourself." -msgstr "?????????????????? ?????????????????? ??????????????? ????????? ???????????? ?????? ??????????????? ?????? ????????????????????? ???????????? ??????????????? ?????? ????????? ???????????????????????? ?????????????????????." +msgstr "?????????????????? ?????????????????? ??????????????? ????????? ???????????? ?????? ??????????????? ?????? ????????????????????? ???????????? ??????????????? ?????? ????????? ???????????????????????? ?????????????????????." #: prefdlg.cpp:1172 #, fuzzy, kde-format @@ -7741,8 +7741,8 @@ msgctxt "@info" msgid "Do you really want to delete the selected alarm template?" msgid_plural "Do you really want to delete the %1 selected alarm templates?" -msgstr[0] "???????????? ?????? ??????????????? ??????????????? ?????????????????? ??????????????????????????? ?????? ?????????????????? ??????????????? ??????????" -msgstr[1] "???????????? ?????? ??????????????? %1 ??????????????? ?????????????????? ??????????????????????????? ?????? ?????????????????? ??????????????? ??????????" +msgstr[0] "???????????? ?????? ??????????????? ??????????????? ?????????????????? ??????????????????????????? ?????? ?????????????????? ??????????????? ??????????" +msgstr[1] "???????????? ?????? ??????????????? %1 ??????????????? ?????????????????? ??????????????????????????? ?????? ?????????????????? ??????????????? ??????????" #: templatedlg.cpp:180 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-21.08.0/po/ia/kalarm.po new/kalarm-21.08.1/po/ia/kalarm.po --- old/kalarm-21.08.0/po/ia/kalarm.po 2021-08-06 02:23:19.000000000 +0200 +++ new/kalarm-21.08.1/po/ia/kalarm.po 2021-08-31 02:37:24.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-08-02 01:36+0000\n" -"PO-Revision-Date: 2021-08-02 09:54+0200\n" +"PO-Revision-Date: 2021-08-06 23:20+0200\n" "Last-Translator: giovanni <[email protected]>\n" "Language-Team: Interlingua <[email protected]>\n" "Language: ia\n" @@ -15,7 +15,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 20.04.2\n" +"X-Generator: Lokalize 21.04.3\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -208,7 +208,7 @@ #: autostart/autostart.cpp:49 #, kde-format msgid "KAlarm autostart at login" -msgstr "Autoinitio de KAlarm a le accesso initial" +msgstr "Autoinitio de KAlarm al accesso initial" #: autostart/autostart.cpp:51 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-21.08.0/po/ko/kalarm.po new/kalarm-21.08.1/po/ko/kalarm.po --- old/kalarm-21.08.0/po/ko/kalarm.po 2021-08-06 02:23:19.000000000 +0200 +++ new/kalarm-21.08.1/po/ko/kalarm.po 2021-08-31 02:37:24.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: kalarm\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-08-02 01:36+0000\n" -"PO-Revision-Date: 2021-07-31 16:03+0200\n" +"PO-Revision-Date: 2021-08-09 23:21+0200\n" "Last-Translator: Shinjo Park <[email protected]>\n" "Language-Team: Korean <[email protected]>\n" "Language: ko\n" @@ -1525,7 +1525,7 @@ #, kde-format msgctxt "@option" msgid "Do not repeat" -msgstr "" +msgstr "???????????? ??????" #. i18n: ectx: label, entry (DefaultReminderUnits), group (Defaults) #: data/kalarmconfig.kcfg:387 @@ -3402,12 +3402,10 @@ msgstr "" #: lib/file.cpp:180 -#, fuzzy, kde-format -#| msgctxt "@info" -#| msgid "Calendar Files" +#, kde-format msgctxt "@item:inlistbox File type" msgid "All files" -msgstr "?????? ??????" +msgstr "?????? ??????" #: lib/filedialog.cpp:55 #, kde-format @@ -3520,7 +3518,7 @@ #, kde-format msgctxt "@action" msgid "&Templates..." -msgstr "" +msgstr "?????????(&T)..." #: mainwindow.cpp:442 #, kde-format @@ -4736,7 +4734,7 @@ #, kde-format msgctxt "@option:radio" msgid "Do not repeat" -msgstr "" +msgstr "???????????? ??????" #: prefdlg.cpp:1310 #, kde-kuit-format @@ -5187,7 +5185,7 @@ #, kde-format msgctxt "@label" msgid "occurrence(s)" -msgstr "" +msgstr "???" #: recurrenceedit.cpp:247 #, kde-format @@ -7047,12 +7045,10 @@ msgstr "" #: soundpicker.cpp:314 -#, fuzzy, kde-format -#| msgctxt "@label:textbox" -#| msgid "Sound file:" +#, kde-format msgctxt "@item:inlistbox" msgid "Audio files" -msgstr "????????? ??????:" +msgstr "????????? ??????" #: soundpicker.cpp:338 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-21.08.0/po/pl/kalarm.po new/kalarm-21.08.1/po/pl/kalarm.po --- old/kalarm-21.08.0/po/pl/kalarm.po 2021-08-06 02:23:19.000000000 +0200 +++ new/kalarm-21.08.1/po/pl/kalarm.po 2021-08-31 02:37:24.000000000 +0200 @@ -1,6 +1,6 @@ # translation of kalarm.po to # translation of alarmdaemonctrl.po to -# Version: $Revision: 1606043 $ +# Version: $Revision: 1606341 $ # # Copyright (C) 2002, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # Krzysztof Lichota <[email protected]>, 2002, 2004, 2005, 2006. @@ -18,7 +18,7 @@ "Project-Id-Version: kalarm\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-08-02 01:36+0000\n" -"PO-Revision-Date: 2021-07-25 07:50+0200\n" +"PO-Revision-Date: 2021-08-07 09:56+0200\n" "Last-Translator: ??ukasz Wojni??owicz <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" "Language: pl\n" @@ -3659,12 +3659,10 @@ msgstr "<filename>%1</filename> nie jest plikiem tekstowym ani obrazkiem" #: lib/file.cpp:180 -#, fuzzy, kde-format -#| msgctxt "@item:inlistbox File type selection filter" -#| msgid "Calendar files" +#, kde-format msgctxt "@item:inlistbox File type" msgid "All files" -msgstr "Pliki kalendarza" +msgstr "Wszystkie pliki" #: lib/filedialog.cpp:55 #, kde-format @@ -7488,12 +7486,10 @@ msgstr "Plik d??wi??kowy" #: soundpicker.cpp:314 -#, fuzzy, kde-format -#| msgctxt "@item:inlistbox" -#| msgid "Sound file" +#, kde-format msgctxt "@item:inlistbox" msgid "Audio files" -msgstr "Plik d??wi??kowy" +msgstr "Pliki d??wi??kowe" #: soundpicker.cpp:338 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-21.08.0/po/sl/kalarm.po new/kalarm-21.08.1/po/sl/kalarm.po --- old/kalarm-21.08.0/po/sl/kalarm.po 2021-08-06 02:23:19.000000000 +0200 +++ new/kalarm-21.08.1/po/sl/kalarm.po 2021-08-31 02:37:24.000000000 +0200 @@ -12,7 +12,7 @@ "Project-Id-Version: kalarm\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-08-02 01:36+0000\n" -"PO-Revision-Date: 2021-07-14 09:27+0200\n" +"PO-Revision-Date: 2021-08-11 09:00+0200\n" "Last-Translator: Matja?? Jeran <[email protected]>\n" "Language-Team: Slovenian <[email protected]>\n" "Language: sl\n" @@ -3624,12 +3624,10 @@ "Videti je, da <filename>%1</filename> ni besedilna ali slikovna datoteka" #: lib/file.cpp:180 -#, fuzzy, kde-format -#| msgctxt "@item:inlistbox File type selection filter" -#| msgid "Calendar files" +#, kde-format msgctxt "@item:inlistbox File type" msgid "All files" -msgstr "Koledarske datoteke" +msgstr "Vse datoteke" #: lib/filedialog.cpp:55 #, kde-format @@ -7440,12 +7438,10 @@ msgstr "Zvo??na datoteka" #: soundpicker.cpp:314 -#, fuzzy, kde-format -#| msgctxt "@item:inlistbox" -#| msgid "Sound file" +#, kde-format msgctxt "@item:inlistbox" msgid "Audio files" -msgstr "Zvo??na datoteka" +msgstr "Zvo??ne datoteke" #: soundpicker.cpp:338 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-21.08.0/po/zh_CN/kalarm.po new/kalarm-21.08.1/po/zh_CN/kalarm.po --- old/kalarm-21.08.0/po/zh_CN/kalarm.po 2021-08-06 02:23:19.000000000 +0200 +++ new/kalarm-21.08.1/po/zh_CN/kalarm.po 2021-08-31 02:37:24.000000000 +0200 @@ -13,7 +13,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-08-02 01:36+0000\n" -"PO-Revision-Date: 2021-07-26 13:49\n" +"PO-Revision-Date: 2021-08-30 11:45\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -494,7 +494,7 @@ #: commandoptions.cpp:147 #, kde-format msgid "Display alarm message as a notification" -msgstr "" +msgstr "?????????????????????????????????" #: commandoptions.cpp:150 #, kde-format @@ -759,7 +759,7 @@ #, kde-format msgctxt "@label" msgid "Enable alarm names" -msgstr "" +msgstr "????????????????????????" #. i18n: ectx: whatsthis, entry (UseAlarmName), group (General) #: data/kalarmconfig.kcfg:96 @@ -768,7 +768,7 @@ msgid "" "Choose whether to be able to give alarms a name. This is a convenience to " "help you to identify alarms." -msgstr "" +msgstr "????????????????????????????????????????????????????????????????????????" #. i18n: ectx: label, entry (MessageFont), group (General) #: data/kalarmconfig.kcfg:101 @@ -819,6 +819,9 @@ "alarms due within a set period of time, enter the time period in minutes.</" "p><p>Enter 0 to always show the system tray icon.</p>" msgstr "" +"<p>?????? -1 ??????KAlarm ?????????????????????????????????????????????????????????</p><p>???????????????" +"????????????????????????????????????????????????????????????????????????????????? (????????????)???</p><p>???" +"??? 0 ???????????????????????????????????????</p>" #. i18n: ectx: label, entry (NoAutoHideSystemTrayDesktops), group (General) #: data/kalarmconfig.kcfg:119 @@ -1275,14 +1278,14 @@ "Enter how many minutes before the alarm trigger time to wake the system from " "suspend. This can be used to ensure that the system is fully restored by the " "time the alarm triggers." -msgstr "" +msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????" #. i18n: ectx: label, entry (DefaultDisplayMethod), group (Defaults) #: data/kalarmconfig.kcfg:281 #, kde-format msgctxt "@label" msgid "Alarm message display method" -msgstr "" +msgstr "????????????????????????" #. i18n: ectx: whatsthis, entry (DefaultDisplayMethod), group (Defaults) #: data/kalarmconfig.kcfg:282 @@ -1293,6 +1296,7 @@ "determine whether to display alarm messages in windows or in system " "notifications." msgstr "" +"??????????????????????????????????????????????????????????????????????????????????????????????????????????????????" #. i18n: ectx: label, entry (DefaultLateCancel), group (Defaults) #: data/kalarmconfig.kcfg:290 @@ -1806,43 +1810,43 @@ msgid "" "Select dates to show in the alarm list. Only alarms due on these dates will " "be shown." -msgstr "" +msgstr "????????????????????????????????????????????????????????????????????????????????????????????????" #: datepicker.cpp:38 #, kde-format msgctxt "@title:group" msgid "Alarm Date Selector" -msgstr "" +msgstr "?????????????????????" #: datepicker.cpp:65 #, kde-format msgctxt "@info:tooltip" msgid "Show the previous year" -msgstr "" +msgstr "?????????????????????" #: datepicker.cpp:66 #, kde-format msgctxt "@info:tooltip" msgid "Show the previous month" -msgstr "" +msgstr "????????????????????????" #: datepicker.cpp:67 #, kde-format msgctxt "@info:tooltip" msgid "Show the next year" -msgstr "" +msgstr "?????????????????????" #: datepicker.cpp:68 #, kde-format msgctxt "@info:tooltip" msgid "Show the next month" -msgstr "" +msgstr "????????????????????????" #: daymatrix.cpp:205 #, kde-format msgctxt "delimiter for joining holiday names" msgid "," -msgstr "" +msgstr "???" #: deferdlg.cpp:38 #, kde-format @@ -2153,7 +2157,7 @@ #, kde-format msgctxt "@action:Button" msgid "Fewer Options <<" -msgstr "" +msgstr "???????????? <<" #: editdlg.cpp:1240 #, kde-format @@ -2183,19 +2187,19 @@ #, kde-format msgctxt "@label:listbox How to display alarms" msgid "Display method:" -msgstr "" +msgstr "???????????????" #: editdlgtypes.cpp:90 #, kde-format msgctxt "@item:inlistbox" msgid "Window" -msgstr "" +msgstr "??????" #: editdlgtypes.cpp:91 #, kde-format msgctxt "@item:inlistbox" msgid "Notification" -msgstr "" +msgstr "??????" #: editdlgtypes.cpp:92 #, kde-format @@ -2296,7 +2300,7 @@ msgid "" "Select whether to display the alarm in a window or by the notification " "system." -msgstr "" +msgstr "????????????????????????????????????????????????" #: editdlgtypes.cpp:276 #, kde-format @@ -2957,7 +2961,7 @@ #, kde-format msgctxt "@title:window" msgid "Import Calendar Files" -msgstr "" +msgstr "??????????????????" #: functions.cpp:916 #, kde-format @@ -3163,13 +3167,13 @@ #, kde-kuit-format msgctxt "@info:shell" msgid "Cannot create alarm: No default calendar is defined" -msgstr "" +msgstr "??????????????????????????????????????????" #: kalarmapp.cpp:1071 #, kde-kuit-format msgctxt "@info:shell" msgid "Error creating alarm" -msgstr "" +msgstr "?????????????????????" #: kalarmapp.cpp:1127 #, kde-kuit-format @@ -3203,6 +3207,8 @@ "<interface>View | Show Calendars</interface> to check or change calendar " "statuses." msgstr "" +"???????????????????????????????????????????????????????????????????????????<nl/><nl/>????????????????????????" +"?????????<interface>?????? | ????????????</interface>????????????????????????????????????" #: kalarmapp.cpp:1515 #, kde-kuit-format @@ -3214,6 +3220,9 @@ "calendar, and check <interface>Use as Default for Archived Alarms</" "interface>." msgstr "" +"???????????????????????????????????????????????????????????????????????????<nl/><nl/>????????????????????????" +"?????????<interface>?????? | ????????????</interface>?????????????????????????????????????????????" +"<interface>?????????????????????????????????</interface>???" #: kalarmapp.cpp:2482 #, kde-format @@ -3296,6 +3305,9 @@ "default address in <application>KMail</application> or KDE System Settings " "or in the <application>KAlarm</application> Configuration dialog.</para>" msgstr "" +"<para>????????????????????????????????????</para><para>??????<application>KMail</" +"application>???KDE ??????????????? <application>KAlarm</application> ?????????????????????" +"??????????????????</para>" #: kamail.cpp:134 #, kde-kuit-format @@ -3465,7 +3477,7 @@ #, kde-format msgctxt "@item:inlistbox File type" msgid "All files" -msgstr "" +msgstr "????????????" #: lib/filedialog.cpp:55 #, kde-format @@ -3489,7 +3501,7 @@ #, kde-format msgctxt "@info" msgid "Failed to execute command (not found or not executable)" -msgstr "" +msgstr "?????????????????? (??????????????????????????????)" #: lib/shellprocess.cpp:150 #, kde-format @@ -3560,7 +3572,7 @@ #: main.cpp:44 #, kde-format msgid "Copyright ?? 2001-%1, David Jarvie" -msgstr "" +msgstr "Copyright ?? 2001-%1, David Jarvie" #: mainwindow.cpp:418 #, kde-kuit-format @@ -3646,7 +3658,7 @@ #, kde-format msgctxt "@action" msgid "Show Date Selector" -msgstr "" +msgstr "?????????????????????" #: mainwindow.cpp:512 #, kde-format @@ -3733,12 +3745,12 @@ msgid "" "<qt>This will hide the menu bar completely. You can show it again by typing " "%1.</qt>" -msgstr "" +msgstr "<qt>????????????????????????????????????????????? %1 ?????????????????????</qt>" #: mainwindow.cpp:1244 #, kde-format msgid "Hide menu bar" -msgstr "" +msgstr "???????????????" #: mainwindow.cpp:1489 #, kde-format @@ -3926,7 +3938,7 @@ #, kde-format msgctxt "@action:button" msgid "Defer" -msgstr "" +msgstr "??????" #: messagewindow.cpp:232 #, kde-format @@ -4006,7 +4018,7 @@ #, kde-format msgctxt "@info:tooltip" msgid "Defer the alarm until later" -msgstr "" +msgstr "????????????" #: messagewindow.cpp:459 #, kde-kuit-format @@ -4190,7 +4202,7 @@ #, kde-format msgctxt "@title:tab" msgid "Alarm Defaults" -msgstr "" +msgstr "??????????????????" #: prefdlg.cpp:175 #, kde-format @@ -4270,7 +4282,7 @@ #, kde-format msgctxt "@option:check" msgid "Enable alarm names" -msgstr "" +msgstr "????????????????????????" #: prefdlg.cpp:458 #, kde-format @@ -4278,7 +4290,7 @@ msgid "" "Check to have the option to give alarms a name. This is a convenience to " "help you to identify alarms." -msgstr "" +msgstr "????????????????????????????????????????????????????????????????????????" #: prefdlg.cpp:466 #, kde-format @@ -4757,6 +4769,8 @@ "No default email address is currently set in <application>KMail</" "application> or KDE System Settings. %1" msgstr "" +"????????? <application>KMail</application> ??? KDE ??????????????????????????????????????????" +"??????%1" #: prefdlg.cpp:1190 #, kde-kuit-format @@ -4781,7 +4795,7 @@ #, kde-format msgctxt "@title:tab Settings specific to alarm type" msgid "Type Specific" -msgstr "" +msgstr "????????????????????????" #: prefdlg.cpp:1224 #, kde-format @@ -4795,7 +4809,7 @@ msgid "" "The default setting for the alarm message display method in the alarm edit " "dialog." -msgstr "" +msgstr "???????????????????????????????????????????????????????????????" #: prefdlg.cpp:1264 #, kde-format @@ -4907,13 +4921,13 @@ msgctxt "@info:whatsthis" msgid "" "Select to set the default volume for sound files in the alarm edit dialog." -msgstr "" +msgstr "????????????????????????????????????????????????????????????" #: prefdlg.cpp:1396 #, kde-format msgctxt "@info:whatsthis" msgid "The default volume for sound files in the alarm edit dialog." -msgstr "" +msgstr "??????????????????????????????????????????????????????" #: prefdlg.cpp:1406 #, kde-format @@ -4994,6 +5008,8 @@ "system tray if there are no active alarms. When hidden, the icon can always " "be made visible by use of the system tray option to show hidden icons." msgstr "" +"????????????<application>KAlarm</application> ???????????????????????????????????????????????????" +"??????????????????????????????????????????????????????????????????????????????????????????" #: prefdlg.cpp:1714 #, kde-kuit-format @@ -5004,6 +5020,8 @@ "hidden, the icon can always be made visible by use of the system tray option " "to show hidden icons." msgstr "" +"????????????<application>KAlarm</application> ???????????????????????????????????????????????????" +"???????????????????????????????????????????????????????????????????????????????????????????????????" #: prefdlg.cpp:1717 #, kde-format @@ -5845,31 +5863,31 @@ #, kde-format msgctxt "@title:window" msgid "Import Directory Resource" -msgstr "" +msgstr "??????????????????" #: resources/dirresourceimportdialog.cpp:39 #, kde-format msgctxt "@title:tab" msgid "Import Calendar Directory Resource" -msgstr "" +msgstr "????????????????????????" #: resources/dirresourceimportdialog.cpp:46 #, kde-format msgctxt "@title:tab" msgid "Import Active Alarms" -msgstr "" +msgstr "??????????????????" #: resources/dirresourceimportdialog.cpp:55 #, kde-format msgctxt "@title:tab" msgid "Import Archived Alarms" -msgstr "" +msgstr "????????????????????????" #: resources/dirresourceimportdialog.cpp:64 #, kde-format msgctxt "@title:tab" msgid "Import Alarm Templates" -msgstr "" +msgstr "??????????????????" #: resources/dirresourceimportdialog.cpp:191 #, kde-format @@ -5894,47 +5912,47 @@ #, kde-format msgctxt "@item:inlistbox File type selection filter" msgid "Calendar files" -msgstr "" +msgstr "????????????" #: resources/dirresourceimportdialog.cpp:397 #: resources/singlefileresourceconfigdialog.cpp:212 #, kde-format msgctxt "@info:status" msgid "Checking file information..." -msgstr "" +msgstr "????????????????????????..." #: resources/dirresourceimportdialog.cpp:405 #: resources/dirresourceimportdialog.cpp:453 #, kde-format msgctxt "@info:status" msgid "Error! File already exists." -msgstr "" +msgstr "???????????????????????????" #: resources/dirresourceimportdialog.cpp:411 #: resources/dirresourceimportdialog.cpp:462 #, kde-format msgctxt "@info:status" msgid "Error! Cannot create file (directory does not exist)." -msgstr "" +msgstr "??????????????????????????? (???????????????)???" #: resources/dirresourceimportdialog.cpp:416 #: resources/dirresourceimportdialog.cpp:464 #, kde-format msgctxt "@info:status" msgid "Error! Cannot create file (directory is not writable)." -msgstr "" +msgstr "??????????????????????????? (??????????????????)???" #: resources/dirresourceimportdialog.cpp:470 #, kde-format msgctxt "@info" msgid "Error! Cannot create file (directory does not exist)." -msgstr "" +msgstr "??????????????????????????? (???????????????)???" #: resources/dirresourceimportdialog.cpp:472 #, kde-format msgctxt "@info" msgid "Error! Cannot create file (directory is not writable)." -msgstr "" +msgstr "??????????????????????????? (??????????????????)???" #. i18n: ectx: property (text), widget (QLabel, warning1) #: resources/dirresourceimportdialog_intro.ui:12 @@ -5945,6 +5963,8 @@ "using the contents of the directory resource below, you must import it into " "a KAlarm calendar file resource." msgstr "" +"KAlarm ??????????????????????????????????????????????????????????????????????????????????????????????????? " +"KAlarm ????????????????????????" #. i18n: ectx: property (text), widget (QLabel, warning2) #: resources/dirresourceimportdialog_intro.ui:22 @@ -5955,6 +5975,8 @@ "using the contents of the directory resource below, you must import each of " "its alarm types into separate KAlarm calendar file resources." msgstr "" +"KAlarm ?????????????????????????????????????????????????????????????????????????????????????????????????????????" +"???????????????????????? KAlarm ????????????????????????" #. i18n: ectx: property (text), widget (QLabel, label1) #. i18n: ectx: property (text), widget (QLabel, nameLabel) @@ -5963,21 +5985,21 @@ #, kde-format msgctxt "@label:textbox" msgid "Display name:" -msgstr "" +msgstr "???????????????" #. i18n: ectx: property (text), widget (QLabel, label2) #: resources/dirresourceimportdialog_intro.ui:43 #, kde-format msgctxt "@label:textbox" msgid "Calendar directory:" -msgstr "" +msgstr "???????????????" #. i18n: ectx: property (text), widget (QLabel, label3) #: resources/dirresourceimportdialog_intro.ui:57 #, kde-format msgctxt "@label:textbox" msgid "Alarm types:" -msgstr "" +msgstr "???????????????" #. i18n: ectx: property (text), widget (QLabel, note) #: resources/dirresourceimportdialog_intro.ui:74 @@ -5987,28 +6009,28 @@ "If you prefer, you can import this calendar directory resource later, by " "using the Import Alarms menu option to import the calendar files contained " "within it." -msgstr "" +msgstr "????????????????????????????????????????????????????????????????????????????????????????????????" #. i18n: ectx: property (text), widget (QRadioButton, mergeRadio) #: resources/dirresourceimportdialog_type.ui:9 #, kde-format msgctxt "@option:radio" msgid "Import into existing calendar file resource" -msgstr "" +msgstr "????????????????????????????????????" #. i18n: ectx: property (whatsThis), widget (QComboBox, mergeResource) #: resources/dirresourceimportdialog_type.ui:22 #, kde-format msgctxt "@info:whatsthis" msgid "Select the resource to import the directory resource's alarms into." -msgstr "" +msgstr "??????????????????????????????????????????" #. i18n: ectx: property (text), widget (QRadioButton, newRadio) #: resources/dirresourceimportdialog_type.ui:45 #, kde-format msgctxt "@option:radio" msgid "Import into new calendar file resource" -msgstr "" +msgstr "?????????????????????????????????" #. i18n: ectx: property (text), widget (QLabel, pathLabel) #: resources/dirresourceimportdialog_type.ui:60 @@ -6016,7 +6038,7 @@ #, kde-format msgctxt "@label:textbox" msgid "Filename:" -msgstr "" +msgstr "????????????" #. i18n: ectx: property (toolTip), widget (KUrlRequester, pathRequester) #: resources/dirresourceimportdialog_type.ui:70 @@ -6024,7 +6046,7 @@ msgctxt "@info:tooltip" msgid "" "Select the file to contain this resource. The file must not already exist." -msgstr "" +msgstr "?????????????????????????????????????????????????????????????????????????????????" #. i18n: ectx: property (whatsThis), widget (KUrlRequester, pathRequester) #: resources/dirresourceimportdialog_type.ui:75 @@ -6036,58 +6058,61 @@ "Note that if the URL of a remote file is specified, monitoring for file " "changes will not work." msgstr "" +"????????????????????????????????????\n" +"?????????????????????????????????????????????\n" +"??????????????????????????????????????? URL?????????????????????????????????" #. i18n: ectx: property (toolTip), widget (KLineEdit, nameText) #: resources/dirresourceimportdialog_type.ui:105 #, kde-format msgctxt "@info:tooltip" msgid "Enter the name used to identify this resource in displays." -msgstr "" +msgstr "???????????????????????????????????????????????????" #. i18n: ectx: property (whatsThis), widget (KLineEdit, nameText) #: resources/dirresourceimportdialog_type.ui:108 #, kde-format msgctxt "@info:whatsthis" msgid "Enter the name used to identify this resource in displays." -msgstr "" +msgstr "???????????????????????????????????????????????????" #. i18n: ectx: property (text), widget (QRadioButton, noRadio) #: resources/dirresourceimportdialog_type.ui:133 #, kde-format msgctxt "@option:radio" msgid "Do not import" -msgstr "" +msgstr "?????????" #: resources/fileresource.cpp:308 resources/fileresource.cpp:434 #, kde-format msgctxt "@info" msgid "Resource is not configured." -msgstr "" +msgstr "?????????????????????" #: resources/fileresource.cpp:337 resources/fileresource.cpp:352 #, kde-kuit-format msgctxt "@info" msgid "Error loading calendar <resource>%1</resource>." -msgstr "" +msgstr "???????????? <resource>%1</resource> ????????????" #: resources/fileresource.cpp:412 resources/fileresource.cpp:451 #: resources/fileresource.cpp:461 #, kde-kuit-format msgctxt "@info" msgid "Error saving calendar <resource>%1</resource>." -msgstr "" +msgstr "???????????? <resource>%1</resource> ????????????" #: resources/fileresource.cpp:441 #, kde-format msgctxt "@info" msgid "Resource is read-only." -msgstr "" +msgstr "????????????????????????" #: resources/fileresource.cpp:446 #, kde-kuit-format msgctxt "@info" msgid "Calendar file is in wrong format: <filename>%1</filename>." -msgstr "" +msgstr "???????????????????????????<filename>%1</filename>???" #: resources/fileresourcecalendarupdater.cpp:115 #, kde-kuit-format @@ -6099,13 +6124,13 @@ #, kde-format msgctxt "@title:window" msgid "Calendar Configuration" -msgstr "" +msgstr "????????????" #: resources/fileresourcecreator.cpp:55 #, kde-format msgctxt "@label:listbox" msgid "Select storage type of new calendar:" -msgstr "" +msgstr "?????????????????????????????????" #: resources/fileresourcecreator.cpp:137 #, kde-kuit-format @@ -6113,7 +6138,7 @@ msgid "" "Error! The file <filename>%1</filename> is already used by an existing " "resource." -msgstr "" +msgstr "??????????????? <filename>%1</filename> ???????????????????????????" #: resources/fileresourcemigrator.cpp:554 #, kde-format @@ -6140,6 +6165,8 @@ "<para>Failed to create default calendar <resource>%1</resource></" "para><para>Location: <filename>%2</filename></para>" msgstr "" +"<para>???????????????????????? <resource>%1</resource></para><para>?????????<filename>" +"%2</filename></para>" #: resources/resourcedatamodelbase.cpp:66 #, kde-format @@ -6199,13 +6226,13 @@ #, kde-format msgctxt "@title:column" msgid "Color" -msgstr "" +msgstr "??????" #: resources/resourcedatamodelbase.cpp:122 #, kde-format msgctxt "@title:column" msgid "Type" -msgstr "" +msgstr "??????" #: resources/resourcedatamodelbase.cpp:124 #, kde-format @@ -6307,7 +6334,7 @@ #, kde-format msgctxt "@info:whatsthis" msgid "Alarm name, or alarm text if name is blank" -msgstr "" +msgstr "??????????????????????????? (???????????????)" #: resources/resourcedatamodelbase.cpp:567 #, kde-format @@ -6425,13 +6452,13 @@ #, kde-format msgctxt "@item:inlistbox" msgid "KAlarm Calendar File" -msgstr "" +msgstr "KAlarm ????????????" #: resources/resourcetype.cpp:346 #, kde-format msgctxt "@item:inlistbox" msgid "KAlarm Calendar Directory" -msgstr "" +msgstr "KAlarm ????????????" #: resources/resourcetype.cpp:347 #, kde-format @@ -6455,62 +6482,62 @@ #, kde-format msgctxt "@info" msgid "A previous load is still in progress." -msgstr "" +msgstr "????????????????????????????????????" #: resources/singlefileresource.cpp:181 resources/singlefileresource.cpp:337 #, kde-format msgctxt "@info" msgid "A previous save is still in progress." -msgstr "" +msgstr "????????????????????????????????????" #: resources/singlefileresource.cpp:230 #, kde-kuit-format msgctxt "@info" msgid "Could not create calendar file <filename>%1</filename>." -msgstr "" +msgstr "???????????????????????? <filename>%1</filename>???" #: resources/singlefileresource.cpp:568 #, kde-kuit-format msgctxt "@info" msgid "Could not load file <filename>%1</filename>." -msgstr "" +msgstr "?????????????????? <filename>%1</filename>???" #: resources/singlefileresource.cpp:600 #, kde-format msgctxt "@info" msgid "Calendar not open." -msgstr "" +msgstr "??????????????????" #: resources/singlefileresource.cpp:613 #, kde-kuit-format msgctxt "@info" msgid "Could not save file <filename>%1</filename>." -msgstr "" +msgstr "?????????????????? <filename>%1</filename>???" #: resources/singlefileresource.cpp:704 #, kde-kuit-format msgctxt "@info" msgid "Could not load file <filename>%1</filename>. (%2)" -msgstr "" +msgstr "?????????????????? <filename>%1</filename>???(%2)" #: resources/singlefileresource.cpp:744 #, kde-kuit-format msgctxt "@info" msgid "Could not save file <filename>%1</filename>. (%2)" -msgstr "" +msgstr "?????????????????? <filename>%1</filename>???(%2)" #: resources/singlefileresourceconfigdialog.cpp:32 #, kde-format msgctxt "@title:window" msgid "Configure Calendar" -msgstr "" +msgstr "????????????" #. i18n: ectx: property (title), widget (QGroupBox, pathGroupBox) #: resources/singlefileresourceconfigdialog.ui:17 #, kde-format msgctxt "@title:group" msgid "Calendar File" -msgstr "" +msgstr "????????????" #. i18n: ectx: property (html), widget (KTextEdit, pathDescription) #: resources/singlefileresourceconfigdialog.ui:64 @@ -6521,13 +6548,15 @@ "also be specified, but note that monitoring for file changes will not work " "in this case." msgstr "" +"??????????????????????????????????????????????????????????????????????????????????????????????????????????????????" +"????????? URL???????????????????????????????????????????????????" #. i18n: ectx: property (text), widget (QRadioButton, activeRadio) #: resources/singlefileresourceconfigdialog.ui:82 #, kde-format msgctxt "@option:radio" msgid "Acti&ve Alarms" -msgstr "" +msgstr "????????????(&V)" #. i18n: ectx: property (text), widget (QRadioButton, archivedRadio) #: resources/singlefileresourceconfigdialog.ui:95 @@ -6541,20 +6570,20 @@ #, kde-format msgctxt "@option:radio" msgid "Alarm &Templates" -msgstr "" +msgstr "????????????(&T)" #. i18n: ectx: property (html), widget (KTextEdit, alarmTypeDescription) #: resources/singlefileresourceconfigdialog.ui:129 #, kde-format msgid "Select which alarm type this resource should contain." -msgstr "" +msgstr "??????????????????????????????????????????" #. i18n: ectx: property (text), widget (QLabel, alarmTypeLabel) #: resources/singlefileresourceconfigdialog.ui:138 #, kde-format msgctxt "@label:textbox" msgid "Alarm type:" -msgstr "" +msgstr "???????????????" #. i18n: ectx: property (text), widget (QLineEdit, activeAlarmsText) #: resources/singlefileresourceconfigdialog.ui:151 @@ -6582,34 +6611,34 @@ #, kde-format msgctxt "@title:group" msgid "Display Name" -msgstr "" +msgstr "????????????" #. i18n: ectx: property (text), widget (QLabel, label_1) #: resources/singlefileresourceconfigdialog.ui:197 #, kde-format msgctxt "@label:textbox" msgid "&Name:" -msgstr "" +msgstr "??????(&N)???" #. i18n: ectx: property (html), widget (KTextEdit, nameDescription) #: resources/singlefileresourceconfigdialog.ui:218 #, kde-format msgid "Enter the name used to identify this resource in displays." -msgstr "" +msgstr "???????????????????????????????????????????????????" #. i18n: ectx: property (title), widget (QGroupBox, readOnlyGroupBox) #: resources/singlefileresourceconfigdialog.ui:228 #, kde-format msgctxt "@title:group" msgid "Access Rights" -msgstr "" +msgstr "????????????" #. i18n: ectx: property (text), widget (QCheckBox, readOnlyCheckbox) #: resources/singlefileresourceconfigdialog.ui:234 #, kde-format msgctxt "@option:check" msgid "Read only" -msgstr "" +msgstr "??????" #. i18n: ectx: property (html), widget (KTextEdit, readOnlyDescription) #: resources/singlefileresourceconfigdialog.ui:250 @@ -6620,6 +6649,8 @@ "have write access to the file or the file is on a remote server that does " "not support write access." msgstr "" +"??????????????????????????????????????????????????????????????????????????????????????????????????????????????????" +"?????????????????????????????????????????????????????????????????????" #: resourceselector.cpp:53 #, kde-format @@ -7084,6 +7115,11 @@ "is spoken. (Option requires working Qt text-to-speech installation.)</item></" "list></para>" msgstr "" +"<para>???????????????????????????????????????<list><item><interface>%1</interface>????????????" +"???????????????</item><item><interface>%2</interface>?????????????????????????????????</" +"item><item><interface>%3</interface>????????????????????????????????????????????????????????????" +"????????????????????????????????????(?????????????????????????????????) </item><item><interface>%4</" +"interface>??????????????????????????????(??????????????? Qt ???????????????)</item></list></para>" #: soundpicker.cpp:91 #, kde-format @@ -7104,12 +7140,10 @@ msgstr "????????????" #: soundpicker.cpp:314 -#, fuzzy, kde-format -#| msgctxt "@item:inlistbox" -#| msgid "Sound file" +#, kde-format msgctxt "@item:inlistbox" msgid "Audio files" -msgstr "????????????" +msgstr "????????????" #: soundpicker.cpp:338 #, kde-format @@ -7175,6 +7209,8 @@ "displayed.</para><para>If checked, the pre-alarm command is also executed " "before a deferred alarm is displayed.</para>" msgstr "" +"<para>???????????????????????????????????????????????????</para><para>????????????????????????????????????" +"??????????????????????????????</para>" #: specialactions.cpp:180 #, kde-format @@ -7490,6 +7526,10 @@ "computers only support setting a wakeup time up to 24 hours ahead. You may " "wish to set up a test alarm to check your system's capability.</para>" msgstr "" +"<para>??????????????????????????????????????????????????????????????????????????? KAlarm ??????????????????" +"?????????????????????</para><para><b>?????????</b>??????????????????????????????????????????????????????" +"??? (?????????????????????)???????????????????????????????????? 24 ?????????????????????????????????????????????" +"??????????????????????????????</para>" #. i18n: ectx: property (title), widget (QGroupBox, groupBox) #: wakedlg.ui:17 @@ -7571,7 +7611,7 @@ "Enter how many minutes before the alarm trigger time to wake the system from " "suspend. This can be used to ensure that the system is fully restored by the " "time the alarm triggers." -msgstr "" +msgstr "??????????????????????????????????????????????????????????????????????????????????????????????????????" #. i18n: ectx: property (text), widget (QLabel, label) #: wakedlg.ui:119 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-21.08.0/src/data/kalarm.autostart.desktop new/kalarm-21.08.1/src/data/kalarm.autostart.desktop --- old/kalarm-21.08.0/src/data/kalarm.autostart.desktop 2021-08-05 00:08:07.000000000 +0200 +++ new/kalarm-21.08.1/src/data/kalarm.autostart.desktop 2021-08-30 00:52:06.000000000 +0200 @@ -59,7 +59,7 @@ Name[sr@ijekavianlatin]=K???alarm Name[sr@latin]=K???alarm Name[sv]=Kalarm -Name[ta]=K?????????????????? +Name[ta]=???????????????????????? Name[tg]=KAlarm Name[tr]=KAlarm Name[ug]=KAlarm @@ -119,6 +119,7 @@ Comment[sr@ijekavianlatin]=Automatsko pokretanje K???alarma po prijavljivanju Comment[sr@latin]=Automatsko pokretanje K???alarma po prijavljivanju Comment[sv]=Automatisk start av Kalarm vid inloggning +Comment[ta]=???????????????????????????????????? ???????????????????????? ????????????????????? Comment[tr]=A????l????ta KAlarm servisini ba??lat Comment[ug]=???????????????? KAlarm ???? ???????????????????? ?????????? Comment[uk]=???????????????????? ?????????? ?????????? KAlarm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-21.08.0/src/data/kalarm.notifyrc new/kalarm-21.08.1/src/data/kalarm.notifyrc --- old/kalarm-21.08.0/src/data/kalarm.notifyrc 2021-08-05 00:08:07.000000000 +0200 +++ new/kalarm-21.08.1/src/data/kalarm.notifyrc 2021-08-30 00:52:06.000000000 +0200 @@ -24,8 +24,10 @@ Comment[sk]=KAlarm Comment[sl]=KAlarm Comment[sv]=Kalarm +Comment[ta]=???????????????????????? Comment[uk]=KAlarm Comment[x-test]=xxKAlarmxx +Comment[zh_CN]=KAlarm [Event/Message] Name=Alarm message @@ -50,8 +52,10 @@ Name[pt_BR]=Mensagem de alarme Name[sl]=Obvestilo alarma Name[sv]=Alarmmeddelande +Name[ta]=?????????????????? ??????????????? Name[uk]=???????????????????????? ?????????????????????? Name[x-test]=xxAlarm messagexx +Name[zh_CN]=???????????? Action=Popup [Event/MessageBeep] @@ -76,8 +80,10 @@ Name[pt_BR]=Mensagem de alarme com alarme sonoro Name[sl]=Obvestilo alarma s piskom Name[sv]=Alarmmeddelande med ton +Name[ta]=???????????????????????? ??????????????? ?????????????????? ??????????????? Name[uk]=???????????????????????? ?????????????????????? ?? ???????????? Name[x-test]=xxAlarm message with beepxx +Name[zh_CN]=?????????????????? Action=Popup|Sound Sound=Oxygen-Sys-App-Message.ogg @@ -103,8 +109,10 @@ Name[pt_BR]=Mensagem de alarme falada Name[sl]=Govorno sporo??ilo alarma Name[sv]=Talat alarmmeddelande +Name[ta]=??????????????????????????? ?????????????????? ??????????????? Name[uk]=???????????????????????? ?????????????????????? ?? ???????????????????????? ???????????? Name[x-test]=xxSpoken alarm messagexx +Name[zh_CN]=???????????????????????? Action=Popup|TTS TTS=%s @@ -130,7 +138,9 @@ Name[pt_BR]=Mensagem de erro no alarme Name[sl]=Alarmovo obvestilo o napaki Name[sv]=Alarmfelmeddelande +Name[ta]=?????????????????? ????????????????????????????????? ??????????????? Name[uk]=???????????????????????? ?????????????? ?????????????????????? Name[x-test]=xxAlarm error messagexx +Name[zh_CN]=?????????????????? Action=Popup|Sound Sound=Oxygen-Sys-App-Error.ogg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-21.08.0/src/data/org.kde.kalarm.appdata.xml new/kalarm-21.08.1/src/data/org.kde.kalarm.appdata.xml --- old/kalarm-21.08.0/src/data/org.kde.kalarm.appdata.xml 2021-08-05 00:08:07.000000000 +0200 +++ new/kalarm-21.08.1/src/data/org.kde.kalarm.appdata.xml 2021-08-30 00:52:06.000000000 +0200 @@ -390,9 +390,9 @@ <binary>kalarm</binary> </provides> <releases> + <release version="3.3.0" date="2021-09-02"/> <release version="3.3.0" date="2021-08-12"/> <release version="3.2.2" date="2021-07-08"/> <release version="3.2.2" date="2021-06-10"/> - <release version="3.2.1" date="2021-05-13"/> </releases> </component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-21.08.0/src/data/org.kde.kalarm.desktop new/kalarm-21.08.1/src/data/org.kde.kalarm.desktop --- old/kalarm-21.08.0/src/data/org.kde.kalarm.desktop 2021-08-05 00:08:07.000000000 +0200 +++ new/kalarm-21.08.1/src/data/org.kde.kalarm.desktop 2021-08-30 00:52:06.000000000 +0200 @@ -58,7 +58,7 @@ Name[sr@ijekavianlatin]=K???alarm Name[sr@latin]=K???alarm Name[sv]=Kalarm -Name[ta]=K?????????????????? +Name[ta]=???????????????????????? Name[tg]=KAlarm Name[tr]=KAlarm Name[ug]=KAlarm @@ -129,7 +129,7 @@ GenericName[sr@ijekavianlatin]=Raspore??iva?? li??nih alarma GenericName[sr@latin]=Raspore??iva?? li??nih alarma GenericName[sv]=Personlig alarmschemal??ggning -GenericName[ta]=Personal Alarm Scheduler +GenericName[ta]=??????????????????????????? ?????????????????? ??????????????? GenericName[tg]=???????????????????? ???????????????????????????? ?????????? GenericName[th]=??????????????????????????????????????????????????????????????????????????????????????? GenericName[tr]=Ki??isel Alarm Zamanlay??c?? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-21.08.0/src/data/org.kde.kalarm.rtcwake.actions new/kalarm-21.08.1/src/data/org.kde.kalarm.rtcwake.actions --- old/kalarm-21.08.0/src/data/org.kde.kalarm.rtcwake.actions 2021-08-05 00:08:07.000000000 +0200 +++ new/kalarm-21.08.1/src/data/org.kde.kalarm.rtcwake.actions 2021-08-30 00:52:06.000000000 +0200 @@ -58,7 +58,7 @@ Name[sr@ijekavianlatin]=K???alarm Name[sr@latin]=K???alarm Name[sv]=Kalarm -Name[ta]=K?????????????????? +Name[ta]=???????????????????????? Name[tg]=KAlarm Name[tr]=KAlarm Name[ug]=KAlarm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-21.08.0/src/resources/resourcemodel.cpp new/kalarm-21.08.1/src/resources/resourcemodel.cpp --- old/kalarm-21.08.0/src/resources/resourcemodel.cpp 2021-08-05 00:08:07.000000000 +0200 +++ new/kalarm-21.08.1/src/resources/resourcemodel.cpp 2021-08-30 00:52:06.000000000 +0200 @@ -1,7 +1,7 @@ /* * resourcemodel.cpp - models containing flat list of resources * Program: kalarm - * SPDX-FileCopyrightText: 2007-2020 David Jarvie <[email protected]> + * SPDX-FileCopyrightText: 2007-2021 David Jarvie <[email protected]> * * SPDX-License-Identifier: GPL-2.0-or-later */ @@ -448,7 +448,7 @@ = Proxy model providing a checkable resource list, filtered to contain only one = alarm type. The selected alarm type may be changed as desired. =============================================================================*/ -ResourceFilterCheckListModel* ResourceFilterCheckListModel::mInstance {nullptr}; +QVector<ResourceFilterCheckListModel*> ResourceFilterCheckListModel::mInstances; ResourceFilterCheckListModel::ResourceFilterCheckListModel(QObject* parent) : QSortFilterProxyModel(parent) @@ -459,8 +459,7 @@ ResourceFilterCheckListModel::~ResourceFilterCheckListModel() { - if (this == mInstance) - mInstance = nullptr; + mInstances.removeAll(this); } void ResourceFilterCheckListModel::init() @@ -524,11 +523,11 @@ void ResourceFilterCheckListModel::disable() { - if (mInstance) + for (auto instance : std::as_const(mInstances)) { - mInstance->mActiveModel->disable(); - mInstance->mArchivedModel->disable(); - mInstance->mTemplateModel->disable(); + instance->mActiveModel->disable(); + instance->mArchivedModel->disable(); + instance->mTemplateModel->disable(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kalarm-21.08.0/src/resources/resourcemodel.h new/kalarm-21.08.1/src/resources/resourcemodel.h --- old/kalarm-21.08.0/src/resources/resourcemodel.h 2021-08-05 00:08:07.000000000 +0200 +++ new/kalarm-21.08.1/src/resources/resourcemodel.h 2021-08-30 00:52:06.000000000 +0200 @@ -1,7 +1,7 @@ /* * resourcemodel.h - models containing flat list of resources * Program: kalarm - * SPDX-FileCopyrightText: 2010-2020 David Jarvie <[email protected]> + * SPDX-FileCopyrightText: 2010-2021 David Jarvie <[email protected]> * * SPDX-License-Identifier: GPL-2.0-or-later */ @@ -177,7 +177,7 @@ { Q_OBJECT public: - /** Constructs the unique instance. + /** Constructs an instance. * @tparam DataModel The data model class to use as the source model. It must * have the following methods: * static DataModel* instance(); - returns the unique instance. @@ -208,7 +208,7 @@ explicit ResourceFilterCheckListModel(QObject* parent); void init(); - static ResourceFilterCheckListModel* mInstance; + static QVector<ResourceFilterCheckListModel*> mInstances; ResourceCheckListModel* mActiveModel {nullptr}; ResourceCheckListModel* mArchivedModel {nullptr}; ResourceCheckListModel* mTemplateModel {nullptr}; @@ -270,15 +270,14 @@ template <class DataModel> ResourceFilterCheckListModel* ResourceFilterCheckListModel::create(QObject* parent) { - if (mInstance) - return nullptr; - mInstance = new ResourceFilterCheckListModel(parent); - mInstance->mActiveModel = ResourceCheckListModel::create<DataModel>(CalEvent::ACTIVE, mInstance); - mInstance->mArchivedModel = ResourceCheckListModel::create<DataModel>(CalEvent::ARCHIVED, mInstance); - mInstance->mTemplateModel = ResourceCheckListModel::create<DataModel>(CalEvent::TEMPLATE, mInstance); - mInstance->mTooltipFunction = [](const Resource& r, CalEvent::Types t) { return DataModel::instance()->tooltip(r, t); }; - mInstance->init(); - return mInstance; + ResourceFilterCheckListModel* instance = new ResourceFilterCheckListModel(parent); + mInstances.append(instance); + instance->mActiveModel = ResourceCheckListModel::create<DataModel>(CalEvent::ACTIVE, instance); + instance->mArchivedModel = ResourceCheckListModel::create<DataModel>(CalEvent::ARCHIVED, instance); + instance->mTemplateModel = ResourceCheckListModel::create<DataModel>(CalEvent::TEMPLATE, instance); + instance->mTooltipFunction = [](const Resource& r, CalEvent::Types t) { return DataModel::instance()->tooltip(r, t); }; + instance->init(); + return instance; }
