Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package incidenceeditor for openSUSE:Factory
checked in at 2021-07-09 23:57:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/incidenceeditor (Old)
and /work/SRC/openSUSE:Factory/.incidenceeditor.new.2625 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "incidenceeditor"
Fri Jul 9 23:57:41 2021 rev:65 rq:904875 version:21.04.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/incidenceeditor/incidenceeditor.changes
2021-06-12 20:06:10.704733096 +0200
+++
/work/SRC/openSUSE:Factory/.incidenceeditor.new.2625/incidenceeditor.changes
2021-07-09 23:58:27.660934311 +0200
@@ -1,0 +2,10 @@
+Wed Jul 7 08:56:56 UTC 2021 - Christophe Giboudeaux <[email protected]>
+
+- Update to 21.04.3
+ * New bugfix release
+ * For more details please see:
+ * https://kde.org/announcements/gear/21.04.3
+- Changes since 21.04.2:
+ * Allow journal entries to be private or confidential
+
+-------------------------------------------------------------------
Old:
----
incidenceeditor-21.04.2.tar.xz
incidenceeditor-21.04.2.tar.xz.sig
New:
----
incidenceeditor-21.04.3.tar.xz
incidenceeditor-21.04.3.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ incidenceeditor.spec ++++++
--- /var/tmp/diff_new_pack.1TODZi/_old 2021-07-09 23:58:28.168930361 +0200
+++ /var/tmp/diff_new_pack.1TODZi/_new 2021-07-09 23:58:28.172930330 +0200
@@ -21,7 +21,7 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print
$1"."$2}')}
%bcond_without lang
Name: incidenceeditor
-Version: 21.04.2
+Version: 21.04.3
Release: 0
Summary: Incidenceeditor library
License: GPL-2.0-or-later AND LGPL-2.1-or-later
++++++ incidenceeditor-21.04.2.tar.xz -> incidenceeditor-21.04.3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/incidenceeditor-21.04.2/CMakeLists.txt
new/incidenceeditor-21.04.3/CMakeLists.txt
--- old/incidenceeditor-21.04.2/CMakeLists.txt 2021-05-21 00:54:30.000000000
+0200
+++ new/incidenceeditor-21.04.3/CMakeLists.txt 2021-06-28 04:46:57.000000000
+0200
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
-set(PIM_VERSION "5.17.2")
+set(PIM_VERSION "5.17.3")
project(incidenceeditor VERSION ${PIM_VERSION})
@@ -29,21 +29,21 @@
set(INCIDENCEEDITOR_LIB_VERSION ${PIM_VERSION})
-set(AKONADI_MIMELIB_VERSION "5.17.2")
-set(KDEPIM_LIB_VERSION "5.17.2")
+set(AKONADI_MIMELIB_VERSION "5.17.3")
+set(KDEPIM_LIB_VERSION "5.17.3")
set(QT_REQUIRED_VERSION "5.14.0")
-set(KMIME_LIB_VERSION "5.17.2")
-set(KMAILTRANSPORT_LIB_VERSION "5.17.2")
-set(KLDAP_LIB_VERSION "5.17.2")
-set(CALENDARUTILS_LIB_VERSION "5.17.2")
-set(CALENDARSUPPORT_LIB_VERSION "5.17.2")
-set(LIBKDEPIM_LIB_VERSION "5.17.2")
-set(EVENTVIEW_LIB_VERSION "5.17.2")
-set(AKONADI_VERSION "5.17.2")
-set(AKONADICONTACT_LIB_VERSION "5.17.2")
-set(AKONADICALENDAR_LIB_VERSION "5.17.2")
-set(PIMCOMMON_LIB_VERSION "5.17.2")
-set(GRANTLEETHEME_LIB_VERSION "5.17.2")
+set(KMIME_LIB_VERSION "5.17.3")
+set(KMAILTRANSPORT_LIB_VERSION "5.17.3")
+set(KLDAP_LIB_VERSION "5.17.3")
+set(CALENDARUTILS_LIB_VERSION "5.17.3")
+set(CALENDARSUPPORT_LIB_VERSION "5.17.3")
+set(LIBKDEPIM_LIB_VERSION "5.17.3")
+set(EVENTVIEW_LIB_VERSION "5.17.3")
+set(AKONADI_VERSION "5.17.3")
+set(AKONADICONTACT_LIB_VERSION "5.17.3")
+set(AKONADICALENDAR_LIB_VERSION "5.17.3")
+set(PIMCOMMON_LIB_VERSION "5.17.3")
+set(GRANTLEETHEME_LIB_VERSION "5.17.3")
set(KDIAGRAM_LIB_VERSION "1.4.0")
find_package(KGantt ${KDIAGRAM_LIB_VERSION} CONFIG REQUIRED)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/incidenceeditor-21.04.2/po/el/libincidenceeditors.po
new/incidenceeditor-21.04.3/po/el/libincidenceeditors.po
--- old/incidenceeditor-21.04.2/po/el/libincidenceeditors.po 2021-06-08
08:18:24.000000000 +0200
+++ new/incidenceeditor-21.04.3/po/el/libincidenceeditors.po 2021-07-06
07:28:39.000000000 +0200
@@ -2,32 +2,30 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Dimitrios Glentadakis <[email protected]>, 2012, 2013.
-# Stelios <[email protected]>, 2012.
+# Stelios <[email protected]>, 2012, 2021.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2021-05-22 01:40+0000\n"
-"PO-Revision-Date: 2013-06-29 15:53+0200\n"
-"Last-Translator: Dimitrios Glentadakis <[email protected]>\n"
+"PO-Revision-Date: 2021-06-21 09:47+0300\n"
+"Last-Translator: Stelios <[email protected]>\n"
"Language-Team: Greek <[email protected]>\n"
"Language: el\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 1.5\n"
+"X-Generator: Lokalize 20.04.2\n"
#: alarmdialog.cpp:25
-#, fuzzy, kde-format
-#| msgid "Create a new reminder"
+#, kde-format
msgctxt "@title:window"
msgid "Create a new reminder"
msgstr "???????????????????? ???????? ???????? ??????????????????????"
#: alarmdialog.cpp:68
-#, fuzzy, kde-format
-#| msgid "Edit existing reminder"
+#, kde-format
msgctxt "@title:window"
msgid "Edit existing reminder"
msgstr "?????????????????????? ???????? ????????????????????
??????????????????????"
@@ -35,12 +33,12 @@
#: alarmdialog.cpp:222
#, kde-format
msgid "Before the to-do starts"
-msgstr "???????? ?????? ???????????????? ?????? ????????????????"
+msgstr "???????? ?????? ???????????? ?????? ????????????????"
#: alarmdialog.cpp:222
#, kde-format
msgid "After the to-do starts"
-msgstr "???????? ?????? ???????????????? ?????? ????????????????"
+msgstr "???????? ?????? ???????????? ?????? ????????????????"
#: alarmdialog.cpp:226
#, kde-format
@@ -55,12 +53,12 @@
#: alarmdialog.cpp:230
#, kde-format
msgid "Before the event starts"
-msgstr "???????? ?????? ???????????????? ?????? ??????????????????"
+msgstr "???????? ?????? ???????????? ?????? ??????????????????"
#: alarmdialog.cpp:230
#, kde-format
msgid "After the event starts"
-msgstr "???????? ?????? ???????????????? ?????? ??????????????????"
+msgstr "???????? ?????? ???????????? ?????? ??????????????????"
#: alarmdialog.cpp:233
#, kde-format
@@ -76,82 +74,67 @@
#, kde-format
msgctxt "@item:inlistbox"
msgid "At start"
-msgstr ""
+msgstr "???????? ????????????"
#: alarmpresets.cpp:85
-#, fuzzy, kde-format
-#| msgctxt "@item:inlistbox"
-#| msgid "%1 minutes before start"
+#, kde-format
msgctxt "@item:inlistbox"
msgid "%1 minute before start"
msgid_plural "%1 minutes before start"
-msgstr[0] "%1 ?????????? ???????? ?????? ????????????"
+msgstr[0] "%1 ?????????? ???????? ?????? ????????????"
msgstr[1] "%1 ?????????? ???????? ?????? ????????????"
#: alarmpresets.cpp:87
-#, fuzzy, kde-format
-#| msgctxt "@item:inlistbox"
-#| msgid "%1 hours before start"
+#, kde-format
msgctxt "@item:inlistbox"
msgid "%1 hour before start"
msgid_plural "%1 hours before start"
-msgstr[0] "%1 ???????? ???????? ?????? ????????????"
+msgstr[0] "%1 ?????? ???????? ?????? ????????????"
msgstr[1] "%1 ???????? ???????? ?????? ????????????"
#: alarmpresets.cpp:89
-#, fuzzy, kde-format
-#| msgctxt "@item:inlistbox"
-#| msgid "%1 days before start"
+#, kde-format
msgctxt "@item:inlistbox"
msgid "%1 day before start"
msgid_plural "%1 days before start"
-msgstr[0] "%1 ???????????? ???????? ?????? ????????????"
+msgstr[0] "%1 ?????????? ???????? ?????? ????????????"
msgstr[1] "%1 ???????????? ???????? ?????? ????????????"
#: alarmpresets.cpp:103
-#, fuzzy, kde-format
-#| msgid "When:"
+#, kde-format
msgctxt "@item:inlistbox"
msgid "When due"
-msgstr "????????:"
+msgstr "???????? ??????????"
#: alarmpresets.cpp:105
-#, fuzzy, kde-format
-#| msgctxt "@item:inlistbox"
-#| msgid "%1 minutes before due"
+#, kde-format
msgctxt "@item:inlistbox"
msgid "%1 minute before due"
msgid_plural "%1 minutes before due"
-msgstr[0] "%1 ?????????? ???????? ???? ????????"
+msgstr[0] "%1 ?????????? ???????? ???? ????????"
msgstr[1] "%1 ?????????? ???????? ???? ????????"
#: alarmpresets.cpp:107
-#, fuzzy, kde-format
-#| msgctxt "@item:inlistbox"
-#| msgid "%1 hours before due"
+#, kde-format
msgctxt "@item:inlistbox"
msgid "%1 hour before due"
msgid_plural "%1 hours before due"
-msgstr[0] "%1 ???????? ???????? ???? ????????"
+msgstr[0] "%1 ?????? ???????? ???? ????????"
msgstr[1] "%1 ???????? ???????? ???? ????????"
#: alarmpresets.cpp:109
-#, fuzzy, kde-format
-#| msgctxt "@item:inlistbox"
-#| msgid "%1 days before due"
+#, kde-format
msgctxt "@item:inlistbox"
msgid "%1 day before due"
msgid_plural "%1 days before due"
-msgstr[0] "%1 ???????????? ???????? ???? ????????"
+msgstr[0] "%1 ?????????? ???????? ???? ????????"
msgstr[1] "%1 ???????????? ???????? ???? ????????"
#: attachmenteditdialog.cpp:37
-#, fuzzy, kde-format
-#| msgctxt "@title"
-#| msgid "Add Attachment"
+#, kde-format
msgctxt "@title:window"
msgid "Edit Attachment"
-msgstr "???????????????? ????????????????????"
+msgstr "?????????????????????? ????????????????????"
#: attachmenteditdialog.cpp:56
#, kde-format
@@ -225,80 +208,71 @@
#: attendeetablemodel.cpp:64
#, kde-format
msgid "Free"
-msgstr ""
+msgstr "??????????????????"
#: attendeetablemodel.cpp:66
#, kde-format
msgid "Busy"
-msgstr ""
+msgstr "??????????????????????????"
#: attendeetablemodel.cpp:68
-#, fuzzy, kde-format
-#| msgctxt "@action:button Accept an invitation"
-#| msgid "Accept"
+#, kde-format
msgid "Accepted"
-msgstr "??????????????"
+msgstr "??????????????????"
#: attendeetablemodel.cpp:70 attendeetablemodel.cpp:72
-#, fuzzy, kde-format
-#| msgctxt "@label unknown mimetype"
-#| msgid "Unknown"
+#, kde-format
msgid "Unknown"
-msgstr "??????????????"
+msgstr "????????????????"
#: attendeetablemodel.cpp:150
#, kde-format
msgctxt "vCard attendee role"
msgid "Role"
-msgstr ""
+msgstr "??????????"
#: attendeetablemodel.cpp:152
#, kde-format
msgctxt "Attendees (name+emailaddress)"
msgid "Name"
-msgstr ""
+msgstr "??????????"
#: attendeetablemodel.cpp:154
-#, fuzzy, kde-format
-#| msgid "Disable"
+#, kde-format
msgctxt "Is attendee available for incidence"
msgid "Available"
-msgstr "????????????????????????????"
+msgstr "????????????????????"
#: attendeetablemodel.cpp:156
#, kde-format
msgctxt ""
"Status of attendee in an incidence (accepted, declined, delegated, ...)"
msgid "Status"
-msgstr ""
+msgstr "??????????????????"
#: attendeetablemodel.cpp:158
-#, fuzzy, kde-format
-#| msgid "Type"
+#, kde-format
msgctxt "Type of calendar user (vCard attribute)"
msgid "User Type"
-msgstr "??????????"
+msgstr "?????????? ????????????"
#: attendeetablemodel.cpp:160
-#, fuzzy, kde-format
-#| msgctxt "@item:inlistbox"
-#| msgid "Request Response"
+#, kde-format
msgctxt "Has attendee to respond to the invitation"
msgid "Response"
-msgstr "?????????????? ?????? ????????????????"
+msgstr "????????????????"
#: attendeetablemodel.cpp:162
#, kde-format
msgctxt "Attendee name"
msgid "Name"
-msgstr ""
+msgstr "??????????"
#: attendeetablemodel.cpp:164
-#, fuzzy, kde-format
-#| msgid "Send email"
+#, kde-format
msgctxt "Attendee email"
msgid "Email"
-msgstr "???????????????? ????. ??????????????????????????"
+msgstr "????. ????????????????????????"
#: editoritemmanager.cpp:221
#, kde-format
@@ -350,8 +324,7 @@
msgstr "??????????:"
#: freebusyurldialog.cpp:29
-#, fuzzy, kde-format
-#| msgid "Edit Free/Busy Location"
+#, kde-format
msgctxt "@title:window"
msgid "Edit Free/Busy Location"
msgstr "?????????????????????? ????????????????????
??????????????????-??/??????????????????????????-??"
@@ -364,18 +337,18 @@
"%2</placeholder>:"
#: freebusyurldialog.cpp:68
-#, fuzzy, kde-format
-#| msgctxt "@info:tooltip"
-#| msgid "Enter the name or email address of the attendee."
+#, kde-format
msgctxt "@info:whatsthis"
msgid "Enter the location of the Free/Busy information for the attendee."
-msgstr "???????????????? ???? ?????????? ?? ?????? ????. ??????????????????
?????? ????????????????????????."
+msgstr ""
+"???????????????? ???? ???????? ?????? ??????????????????????
??????????????????/?????????????????????????? ?????? ?????? "
+"????????????????????????."
#: freebusyurldialog.cpp:69
#, kde-format
msgctxt "@info:tooltip"
msgid "Enter the location of the information."
-msgstr ""
+msgstr "???????????????? ???? ???????? ?????? ??????????????????????."
#: incidencealarm.cpp:250
#, kde-format
@@ -390,67 +363,58 @@
msgstr "????????????????????????"
#: incidencealarm.cpp:268
-#, fuzzy, kde-format
-#| msgid "Display a dialog"
+#, kde-format
msgctxt "Alarm action"
msgid "Display a dialog"
msgstr "???????????????? ???????? ????????????????"
#: incidencealarm.cpp:271
-#, fuzzy, kde-format
-#| msgid "Execute a script"
+#, kde-format
msgctxt "Alarm action"
msgid "Execute a script"
msgstr "???????????????? ???????? ????????????????"
#: incidencealarm.cpp:274
-#, fuzzy, kde-format
-#| msgid "Send an email"
+#, kde-format
msgctxt "Alarm action"
msgid "Send an email"
msgstr "???????????????? ???????? ??????????????????"
#: incidencealarm.cpp:277
-#, fuzzy, kde-format
-#| msgid "Play an audio file"
+#, kde-format
msgctxt "Alarm action"
msgid "Play an audio file"
msgstr "???????????????? ???????? ?????????????? ????????"
#: incidencealarm.cpp:280
-#, fuzzy, kde-format
-#| msgid "Invalid Reminder."
+#, kde-format
msgctxt "Alarm action"
msgid "Invalid Reminder."
msgstr "???? ???????????? ????????????????????."
#: incidencealarm.cpp:286
-#, fuzzy, kde-format
-#| msgctxt "The reminder is set to X minutes before/after the event"
-#| msgid "minutes"
+#, kde-format
msgctxt "The reminder is set to X minutes before/after the event"
msgid "1 minute"
msgid_plural "%1 minutes"
-msgstr[0] "??????????"
-msgstr[1] "??????????"
+msgstr[0] "1 ??????????"
+msgstr[1] "%1 ??????????"
#: incidencealarm.cpp:291
#, kde-format
msgctxt "The reminder is set to X days before/after the event"
msgid "1 day"
msgid_plural "%1 days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "1 ??????????"
+msgstr[1] "%1 ????????????"
#: incidencealarm.cpp:294
-#, fuzzy, kde-format
-#| msgctxt "The reminder is set to X hours before/after the event"
-#| msgid "hours"
+#, kde-format
msgctxt "The reminder is set to X hours before/after the event"
msgid "1 hour"
msgid_plural "%1 hours"
-msgstr[0] "????????"
-msgstr[1] "????????"
+msgstr[0] "1 ??????"
+msgstr[1] "%1 ????????"
#: incidencealarm.cpp:299
#, kde-format
@@ -463,100 +427,84 @@
#. one of the time units above, %3 is the (Repeats) part that will be used
#. in case of repetition of the alarm.
#: incidencealarm.cpp:309
-#, fuzzy, kde-format
-#| msgid "%1 %2 %3 after the to-do started %4"
+#, kde-format
msgid "%1 %2 after the to-do started %3"
-msgstr "%1 %2 %3 ???????? ?????? ???????????????? ?????? ???????????????? %4"
+msgstr "%1 %2 ???????? ?????? ???????????? ?????? ???????????????? %3"
#: incidencealarm.cpp:311
-#, fuzzy, kde-format
-#| msgid "%1 %2 %3 after the event started %4"
+#, kde-format
msgid "%1 %2 after the event started %3"
-msgstr "%1 %2 %3 ???????? ?????? ???????????????? ?????? ?????????????????? %4"
+msgstr "%1 %2 ???????? ?????? ???????????? ?????? ?????????????????? %3"
#: incidencealarm.cpp:315
-#, fuzzy, kde-format
-#| msgid "%1 %2 %3 before the to-do starts %4"
+#, kde-format
msgid "%1 %2 before the to-do starts %3"
-msgstr "%1 %2 %3 ???????? ?????? ???????????????? ?????? ???????????????? %4"
+msgstr "%1 %2 ???????? ?????? ???????????? ?????? ???????????????? %3"
#: incidencealarm.cpp:317
-#, fuzzy, kde-format
-#| msgid "%1 %2 %3 before the event starts %4"
+#, kde-format
msgid "%1 %2 before the event starts %3"
-msgstr "%1 %2 %3 ???????? ?????? ???????????????? ?????? ?????????????????? %4"
+msgstr "%1 %2 ???????? ?????? ???????????? ?????? ?????????????????? %3"
#: incidencealarm.cpp:321
-#, fuzzy, kde-format
-#| msgid "%1 %2 %3 after the to-do is due %4"
+#, kde-format
msgid "%1 %2 after the to-do is due %3"
-msgstr "%1 %2 %3 ???????? ???? ???????? ?????? ???????????????? %4"
+msgstr "%1 %2 ???????? ???? ???????? ?????? ???????????????? %3"
#: incidencealarm.cpp:323
-#, fuzzy, kde-format
-#| msgid "%1 %2 %3 after the event ends %4"
+#, kde-format
msgid "%1 %2 after the event ends %3"
-msgstr "%1 %2 %3 ???????? ???? ?????????? ?????? ?????????????????? %4"
+msgstr "%1 %2 ???????? ???? ?????????? ?????? ?????????????????? %3"
#: incidencealarm.cpp:327
-#, fuzzy, kde-format
-#| msgid "%1 %2 %3 before the to-do is due %4"
+#, kde-format
msgid "%1 %2 before the to-do is due %3"
-msgstr "%1 %2 %3 ???????? ???? ???????? ?????? ???????????????? %4"
+msgstr "%1 %2 ???????? ???? ???????? ?????? ???????????????? %3"
#: incidencealarm.cpp:329
-#, fuzzy, kde-format
-#| msgid "%1 %2 %3 before the event ends %4"
+#, kde-format
msgid "%1 %2 before the event ends %3"
-msgstr "%1 %2 %3 ???????? ???? ?????????? ?????? ?????????????????? %4"
+msgstr "%1 %2 ???????? ???? ?????????? ?????? ?????????????????? %3"
#: incidencealarm.cpp:335
-#, fuzzy, kde-format
-#| msgid "%1 %2 %3 after the to-do started %4 (Disabled)"
+#, kde-format
msgid "%1 %2 after the to-do started %3 (Disabled)"
-msgstr "%1 %2 %3 ???????? ?????? ???????????????? ?????? ???????????????? %4
(????????????????????????????????)"
+msgstr "%1 %2 ???????? ?????? ???????????? ?????? ???????????????? %3
(????????????????????????????????)"
#: incidencealarm.cpp:337
-#, fuzzy, kde-format
-#| msgid "%1 %2 %3 after the event started %4 (Disabled)"
+#, kde-format
msgid "%1 %2 after the event started %3 (Disabled)"
-msgstr "%1 %2 %3 ???????? ?????? ???????????????? ?????? ?????????????????? %4
(????????????????????????????????)"
+msgstr "%1 %2 ???????? ?????? ???????????? ?????? ?????????????????? %3
(????????????????????????????????)"
#: incidencealarm.cpp:341
-#, fuzzy, kde-format
-#| msgid "%1 %2 %3 before the to-do starts %4 (Disabled)"
+#, kde-format
msgid "%1 %2 before the to-do starts %3 (Disabled)"
-msgstr "%1 %2 %3 ???????? ?????? ???????????????? ?????? ???????????????? %4
(????????????????????????????????)"
+msgstr "%1 %2 ???????? ?????? ???????????? ?????? ???????????????? %3
(????????????????????????????????)"
#: incidencealarm.cpp:343
-#, fuzzy, kde-format
-#| msgid "%1 %2 %3 before the event starts %4 (Disabled)"
+#, kde-format
msgid "%1 %2 before the event starts %3 (Disabled)"
-msgstr "%1 %2 %3 ???????? ?????? ???????????????? ?????? ?????????????????? %4
(????????????????????????????????)"
+msgstr "%1 %2 ???????? ?????? ???????????? ?????? ?????????????????? %3
(????????????????????????????????)"
#: incidencealarm.cpp:347
-#, fuzzy, kde-format
-#| msgid "%1 %2 %3 after the to-do is due %4 (Disabled)"
+#, kde-format
msgid "%1 %2 after the to-do is due %3 (Disabled)"
-msgstr "%1 %2 %3 ???????? ???? ???????? ?????? ???????????????? %4
(????????????????????????????????)"
+msgstr "%1 %2 ???????? ???? ???????? ?????? ???????????????? %3
(????????????????????????????????)"
#: incidencealarm.cpp:349
-#, fuzzy, kde-format
-#| msgid "%1 %2 %3 after the event ends %4 (Disabled)"
+#, kde-format
msgid "%1 %2 after the event ends %3 (Disabled)"
-msgstr "%1 %2 %3 ???????? ???? ?????????? ?????? ?????????????????? %4
(????????????????????????????????)"
+msgstr "%1 %2 ???????? ???? ?????????? ?????? ?????????????????? %3
(????????????????????????????????)"
#: incidencealarm.cpp:353
-#, fuzzy, kde-format
-#| msgid "%1 %2 %3 before the to-do is due %4 (Disabled)"
+#, kde-format
msgid "%1 %2 before the to-do is due %3 (Disabled)"
-msgstr "%1 %2 %3 ???????? ???? ???????? ?????? ???????????????? %4
(????????????????????????????????)"
+msgstr "%1 %2 ???????? ???? ???????? ?????? ???????????????? %3
(????????????????????????????????)"
#: incidencealarm.cpp:355
-#, fuzzy, kde-format
-#| msgid "%1 %2 %3 before the event ends %4 (Disabled)"
+#, kde-format
msgid "%1 %2 before the event ends %3 (Disabled)"
-msgstr "%1 %2 %3 ???????? ???? ?????????? ?????? ?????????????????? %4
(????????????????????????????????)"
+msgstr "%1 %2 ???????? ???? ?????????? ?????? ?????????????????? %3
(????????????????????????????????)"
#: incidencealarm.cpp:363
#, kde-format
@@ -691,12 +639,10 @@
msgstr "???? ???????????? ?????????????????? ????. ??????????????????????????"
#: incidenceattendee.cpp:430
-#, fuzzy, kde-format
-#| msgctxt "@action:button"
-#| msgid "Select Attendees..."
+#, kde-format
msgctxt "@title:window"
msgid "Select Attendees"
-msgstr "?????????????? ??????????????????????????????..."
+msgstr "?????????????? ??????????????????????????"
#: incidenceattendee.cpp:610
#, kde-format
@@ -776,32 +722,28 @@
msgstr "?????? ??????????"
#: incidencedatetime.cpp:837
-#, fuzzy, kde-format
-#| msgid "Invalid Reminder."
+#, kde-format
msgctxt "@info"
msgid "Invalid start date."
-msgstr "???? ???????????? ????????????????????."
+msgstr "???? ???????????? ??m???????????????? ??????????????."
#: incidencedatetime.cpp:842
-#, fuzzy, kde-format
-#| msgid "Invalid Reminder."
+#, kde-format
msgctxt "@info"
msgid "Invalid start time."
-msgstr "???? ???????????? ????????????????????."
+msgstr "???? ???????????? ?????? ??????????????."
#: incidencedatetime.cpp:850
-#, fuzzy, kde-format
-#| msgid "Invalid Reminder."
+#, kde-format
msgctxt "@info"
msgid "Invalid end date."
-msgstr "???? ???????????? ????????????????????."
+msgstr "???? ???????????? ???????????????????? ??????????."
#: incidencedatetime.cpp:855
-#, fuzzy, kde-format
-#| msgid "Invalid Reminder."
+#, kde-format
msgctxt "@info"
msgid "Invalid end time."
-msgstr "???? ???????????? ????????????????????."
+msgstr "???? ???????????? ?????? ??????????."
#: incidencedatetime.cpp:864
#, kde-format
@@ -841,18 +783,15 @@
msgid "[email protected]"
msgstr "??????????@??????????????????.??????????????????????????"
+# y, kde-format
#: incidencedescription.cpp:104
-#, fuzzy, kde-format
-#| msgctxt "@action Enable or disable rich text editting"
-#| msgid "Enable rich text"
+#, kde-format
msgctxt "@action Enable or disable rich text editing"
msgid "Enable rich text"
msgstr "???????????????????????? ???????????????????????????? ????????????????"
#: incidencedescription.cpp:108
-#, fuzzy, kde-format
-#| msgctxt "@action Enable or disable rich text editting"
-#| msgid "Disable rich text"
+#, kde-format
msgctxt "@action Enable or disable rich text editing"
msgid "Disable rich text"
msgstr "???????????????????????????? ????????????????????????????
????????????????"
@@ -860,7 +799,7 @@
#: incidencedialog.cpp:193
#, kde-format
msgid "Select a valid collection first."
-msgstr ""
+msgstr "?????????????? ???????? ?????????????? ???????????????? ??????????."
#: incidencedialog.cpp:216
#, kde-format
@@ -914,7 +853,7 @@
#, kde-format
msgctxt "@info"
msgid "Unable to find template '%1'."
-msgstr "?????????????? ?? ???????????? ?????? ???????????????? ??%1??."
+msgstr "???????????????? ?????????????? ?????? ???????????????? ??%1??."
#: incidencedialog.cpp:288
#, kde-format
@@ -953,18 +892,16 @@
msgstr "&??????????????????????????"
#: incidencedialog.cpp:405
-#, fuzzy, kde-format
-#| msgctxt "@title:tab Tab to modify attendees of an event or todo"
-#| msgid "&Attendees (%1)"
+#, kde-format
msgctxt "@title:tab Tab to modify attendees of an event or todo"
msgid "&Resources (%1)"
-msgstr "&?????????????????????????? (%1)"
+msgstr "????&?????? (%1)"
#: incidencedialog.cpp:407
#, kde-format
msgctxt "@title:tab Tab to modify attendees of an event or todo"
msgid "&Resources"
-msgstr ""
+msgstr "????&??????"
#: incidencedialog.cpp:429
#, kde-format
@@ -988,13 +925,17 @@
"para><para>Would you like to set your default events calendar to <resource>"
"%1</resource>?</para>"
msgstr ""
+"<para>?????? ?????????? ???????????????? ?????????? ??????
???????????????????????????? ???????????????????? ?????? ???? ???????????????? "
+"??????.</para><para>???? ???? ?????????????? ????????
?????????????????????????????? ?????????????????????? ?? ???????????????????? "
+"?????? ???????? ?????????????????? ???? ?????????? ???????????????? ??????
???????????????????? ???? ?????????????????? ???????????????????? "
+"???? ?????????????????????? ???? ??????????
????????????.</para><para>???????????? ???? ?????????????????? ???? "
+"???????????????????????????? ???????????????????? ?????????????????? ??????
<resource>%1</resource>;</para>"
#: incidencedialog.cpp:460
-#, fuzzy, kde-format
-#| msgid "Default Category"
+#, kde-format
msgctxt "@title:window"
msgid "Set Default Calendar?"
-msgstr "???????????????????????????? ??????????????????"
+msgstr "???? ?????????????????? ???? ????????????????????????????
????????????????????;"
#: incidencedialog.cpp:642
#, kde-format
@@ -1059,10 +1000,10 @@
#. i18n: ectx: tooltip, entry (DefaultEmailAttachMethod), group
(AttachmentHandling)
#: incidenceeditor.kcfg:13
-#, fuzzy, kde-format
-#| msgid "The default way of attaching dropped emails to an event"
+#, kde-format
msgid "Choose the default way of attaching dropped emails to an event"
-msgstr "?? ???????????????????????????? ?????????????? ??????????????
?????????????????????????? ???? ?????? ??????????????"
+msgstr ""
+"???????????????? ?????? ???????????????????????????? ????????????
???????????????????? ?????????????????????????? ???? ?????? ??????????????"
#. i18n: ectx: whatsthis, entry (DefaultEmailAttachMethod), group
(AttachmentHandling)
#: incidenceeditor.kcfg:14
@@ -1119,11 +1060,10 @@
msgstr "?? ???????????????????? ?????????????? ?????? ????????????????????????
?????? ?????????? ????????????."
#: incidencerecurrence.cpp:465
-#, fuzzy, kde-format
-#| msgid "The incidence's start date is invalid."
+#, kde-format
msgctxt "@info"
msgid "The recurrence end date is invalid."
-msgstr "?? ???????????????????? ?????????????? ?????? ????????????????????????
?????? ?????????? ????????????."
+msgstr "?? ?????????????????? ?????? ?????????????????????? ?????????? ??????
???????????????????????? ?????? ?????????? ????????????."
#: incidencerecurrence.cpp:508
#, kde-format
@@ -1249,8 +1189,7 @@
#: individualmailcomponentfactory.h:51 individualmailcomponentfactory.h:58
#: individualmailcomponentfactory.h:64
-#, fuzzy, kde-format
-#| msgid "Send email"
+#, kde-format
msgctxt "@action:button dialog positive answer"
msgid "Send Email"
msgstr "???????????????? ????. ??????????????????????????"
@@ -1260,144 +1199,133 @@
#, kde-format
msgctxt "@action:button dialog negative answer"
msgid "Do Not Send"
-msgstr ""
+msgstr "???? ?????? ??????????????????"
#: individualmaildialog.cpp:25
#, kde-format
msgctxt "@title:window"
msgid "Group Scheduling Email"
-msgstr ""
+msgstr "?????????????????????? ??????????????????????????????????
??????????????????????????"
#: individualmaildialog.cpp:32
#, kde-format
msgctxt "@item:inlistbox ITIP Messages for one attendee"
msgid "Send update"
-msgstr ""
+msgstr "???????????????? ????????????????????"
#: individualmaildialog.cpp:33
#, kde-format
msgctxt "@item:inlistbox ITIP Messages for one attendee"
msgid "Send no update"
-msgstr ""
+msgstr "?????????? ???????????????? ????????????????????"
#: individualmaildialog.cpp:34
-#, fuzzy, kde-format
-#| msgid "Send email"
+#, kde-format
msgctxt "@item:inlistbox ITIP Messages for one attendee"
msgid "Edit mail"
-msgstr "???????????????? ????. ??????????????????????????"
+msgstr "?????????????????????? ????. ??????????????????????????"
#: individualmaildialog.cpp:35
#, kde-format
msgctxt "@info:whatsthis"
msgid "Options for this particular attendee."
-msgstr ""
+msgstr "???????????????? ?????? ?????? ????????????????????????
????????????????????????."
#: individualmaildialog.cpp:36
-#, fuzzy, kde-format
-#| msgctxt "@info:tooltip"
-#| msgid "Provide a location for the attachment file"
+#, kde-format
msgctxt "@info:tooltip"
msgid "Choose an option for this attendee."
-msgstr "???????????????? ???????? ???????????????????? ?????? ????
?????????????????? ????????????"
+msgstr "?????????? ?????? ?????????????? ?????? ?????????? ??????
????????????????????????."
#: individualmaildialog.cpp:111
#, kde-format
msgctxt "@action:button show list of attendees"
msgid "Individual mailsettings <<"
-msgstr ""
+msgstr "???????????????? ?????????????????? ?????????????????????????? <<"
#: individualmaildialog.cpp:113
#, kde-format
msgctxt "@action:button show list of attendees"
msgid "Individual mailsettings >>"
-msgstr ""
+msgstr "???????????????? ?????????????????? ?????????????????????????? <<"
#: ldaputils.cpp:15
#, kde-format
msgctxt "ldap attribute cn"
msgid "Common name"
-msgstr ""
+msgstr "?????????? ??????????"
#: ldaputils.cpp:17
-#, fuzzy, kde-format
-#| msgid "Send email"
+#, kde-format
msgctxt "ldap attribute mail"
msgid "Email"
-msgstr "???????????????? ????. ??????????????????????????"
+msgstr "????. ????????????????????????"
#: ldaputils.cpp:19
#, kde-format
msgctxt "ldap attribute givenname"
msgid "Given name"
-msgstr ""
+msgstr "?????????????? ??????????"
#: ldaputils.cpp:21
-#, fuzzy, kde-format
-#| msgctxt "NAME OF TRANSLATORS"
-#| msgid "Your names"
+#, kde-format
msgctxt "ldap attribute sn"
msgid "Surname"
-msgstr "?????????????????? ??????????????????????"
+msgstr "??????????????"
#: ldaputils.cpp:23
-#, fuzzy, kde-format
-#| msgctxt "@title:window"
-#| msgid "KOrganizer Confirmation"
+#, kde-format
msgctxt "ldap attribute ou"
msgid "Organization"
-msgstr "KOrganizer ??????????????????????"
+msgstr "????????????????????"
#: ldaputils.cpp:25
#, kde-format
msgctxt "ldap attribute objectClass"
msgid "Object class"
-msgstr ""
+msgstr "?????????? ????????????????????????"
#: ldaputils.cpp:27
#, kde-format
msgctxt "ldap attribute description"
msgid "Description"
-msgstr ""
+msgstr "??????????????????"
#: ldaputils.cpp:29
#, kde-format
msgctxt "ldap attribute telephoneNumber"
msgid "Telephone"
-msgstr ""
+msgstr "????????????????"
#: ldaputils.cpp:31
#, kde-format
msgctxt "ldap attribute mobile"
msgid "Mobile"
-msgstr ""
+msgstr "????????????"
#: opencomposerjob.cpp:79
#, kde-format
msgctxt "errormessage: dbus is running but still no connection kmail"
msgid "Cannot connect to email service"
-msgstr ""
+msgstr "???????????????? ???????????????? ???????? ????????????????
??????????????????????????"
#: resourcemanagement.cpp:98
-#, fuzzy, kde-format
-#| msgid "Template Management"
+#, kde-format
msgctxt "@title:window"
msgid "Resource Management"
-msgstr "???????????????????? ????????????????"
+msgstr "???????????????????? ??????????"
#: resourcemanagement.cpp:103
#, kde-format
msgctxt "@action:button add resource to attendeelist"
msgid "Book resource"
-msgstr ""
+msgstr "?????????????? ??????????"
#: schedulingdialog.cpp:28
-#, fuzzy, kde-format
-#| msgctxt "@action:button"
-#| msgid "Schedule..."
+#, kde-format
msgctxt "@title:window"
msgid "Scheduling"
-msgstr "??????????????????????????????..."
+msgstr "??????????????????????????????"
#: schedulingdialog.cpp:168
#, kde-format
@@ -1416,8 +1344,7 @@
msgstr "???? %1"
#: templatemanagementdialog.cpp:30
-#, fuzzy, kde-format
-#| msgid "Manage %1 Templates"
+#, kde-format
msgctxt "@title:window"
msgid "Manage %1 Templates"
msgstr "???????????????????? %1 &????????????????"
@@ -1638,18 +1565,17 @@
#. i18n: ectx: property (toolTip), widget (QComboBox, mTypeCombo)
#: ui/alarmdialog.ui:222
-#, fuzzy, kde-format
-#| msgctxt "@info:tooltip"
-#| msgid "Set the start date"
+#, kde-format
msgid "Select the alarm type"
-msgstr "?????????????? ?????????????????????? ??????????????"
+msgstr "?????????????? ?????????? ????????????????????"
#. i18n: ectx: property (whatsThis), widget (QComboBox, mTypeCombo)
#: ui/alarmdialog.ui:225
-#, fuzzy, kde-format
-#| msgid "Use this selector to choose the time between repeating reminders."
+#, kde-format
msgid "Use this selector to choose the alarm type for the reminders."
-msgstr "???????????????? ???? ?????????? ???????????? ????????????????????
????????????????????????."
+msgstr ""
+"???????????????????????????? ?????????? ?????? ???????????????? ?????? ????
?????????????????? ?????? ???????? ???????????????????? ?????? "
+"?????? ????????????????????????."
#. i18n: ectx: property (text), item, widget (QComboBox, mTypeCombo)
#: ui/alarmdialog.ui:235
@@ -1925,24 +1851,22 @@
#: ui/dialogdesktop.ui:20
#, kde-format
msgid "A message on this incidence item"
-msgstr ""
+msgstr "?????? ???????????? ???? ???????? ???? ??????????????????????"
#. i18n: ectx: property (whatsThis), widget (CalendarSupport::MessageWidget,
mMessageWidget)
#: ui/dialogdesktop.ui:23
-#, fuzzy, kde-format
-#| msgid "Use this selector to choose the time between repeating reminders."
+#, kde-format
msgid "Use this message to correct the item parameters."
-msgstr "???????????????? ???? ?????????? ???????????? ????????????????????
????????????????????????."
+msgstr ""
+"???????????????????????????? ???????? ???? ???????????? ?????? ????
???????????????????? ?????? ?????????????????????? ?????? "
+"????????????????????????."
#. i18n: ectx: property (text), widget (QLabel, label)
#: ui/dialogdesktop.ui:53
-#, fuzzy, kde-format
-#| msgctxt ""
-#| "@label:listbox The calendar to which the todo or event must be added"
-#| msgid "Calendar:"
+#, kde-format
msgctxt "@label:listbox The calendar to which the todo or event must be added"
msgid "Calen&dar:"
-msgstr "????????????????????:"
+msgstr "??????????????&??????:"
#. i18n: ectx: property (text), widget (QLabel, label_7)
#: ui/dialogdesktop.ui:87
@@ -1997,9 +1921,7 @@
#. i18n: ectx: property (text), widget (QLabel, label_2)
#: ui/dialogdesktop.ui:159
-#, fuzzy, kde-format
-#| msgctxt "@label"
-#| msgid "T&itle:"
+#, kde-format
msgctxt "@label"
msgid "&Title:"
msgstr "&????????????:"
@@ -2142,12 +2064,10 @@
#. i18n: ectx: property (text), widget (QLabel, mStartLabel)
#: ui/dialogdesktop.ui:434
-#, fuzzy, kde-format
-#| msgctxt "@info:tooltip period start time"
-#| msgid "Start:"
+#, kde-format
msgctxt "@label Start date/time of the event or todo"
msgid "S&tart:"
-msgstr "????????????:"
+msgstr "??&??????????:"
#. i18n: ectx: property (toolTip), widget (KDateComboBox, mStartDateEdit)
#: ui/dialogdesktop.ui:462
@@ -2182,19 +2102,17 @@
#. i18n: ectx: property (text), widget (QLabel, mTimeZoneLabel)
#: ui/dialogdesktop.ui:515
-#, fuzzy, kde-format
-#| msgctxt "@action"
-#| msgid "<a href=\"hide\"><font color='blue'><< Time zones</font></a>"
+#, kde-format
msgctxt "@action"
msgid "<a href=\"hide\"><< Time zones</a>"
-msgstr "<a href=\"hide\"><font color='blue'><< ??????????
????????</font></a>"
+msgstr "<a href=\"hide\"><< ?????????? ????????</a>"
#. i18n: ectx: property (text), widget (QLabel, mEndLabel)
#: ui/dialogdesktop.ui:552
#, kde-format
msgctxt "@label end date/time for an event or to-do"
msgid "E&nd:"
-msgstr ""
+msgstr "????&????:"
#. i18n: ectx: property (whatsThis), widget (KDateComboBox, mEndDateEdit)
#: ui/dialogdesktop.ui:580
@@ -2252,22 +2170,17 @@
#. i18n: ectx: property (text), widget (QLabel, mRichTextLabel)
#: ui/dialogdesktop.ui:690
-#, fuzzy, kde-format
-#| msgctxt "@label"
-#| msgid ""
-#| "<a href=\\\"hide\\\"><font color='blue'>Rich text >></font></a>"
+#, kde-format
msgctxt "@label"
msgid "<a href=\\\"hide\\\">Rich text >></a>"
-msgstr ""
-"<a href=\\\"hide\\\"><font color='blue'>??????????????????????????
?????????????? >></"
-"font></a>"
+msgstr "<a href=\\\"hide\\\">?????????????????????????? ??????????????
>></a>"
#. i18n: ectx: property (text), widget (QLabel, mCategoryLabel)
#: ui/dialogdesktop.ui:721
#, kde-format
msgctxt "@label"
msgid "Tags:"
-msgstr ""
+msgstr "????????????????:"
#. i18n: ectx: attribute (title), widget (QWidget, mAttendeesTab)
#: ui/dialogdesktop.ui:742
@@ -2292,17 +2205,7 @@
#. i18n: ectx: property (whatsThis), widget (QComboBox, mOrganizerCombo)
#: ui/dialogdesktop.ui:792
-#, fuzzy, kde-format
-#| msgctxt "@info:whatsthis"
-#| msgid ""
-#| "Sets the identity corresponding to the organizer of this to-do or event. "
-#| "Identities can be set in the 'Personal' section of the KOrganizer "
-#| "configuration, or in the Personal'->'About Me'->'Password & User Account' "
-#| "section of the System Settings. In addition, identities are gathered from "
-#| "your KMail settings and from your address book. If you choose to set it "
-#| "globally for KDE in the System Settings, be sure to check 'Use email "
-#| "settings from System Settings' in the 'Personal' section of the "
-#| "KOrganizer configuration."
+#, kde-format
msgctxt "@info:whatsthis"
msgid ""
"Sets the identity corresponding to the organizer of this to-do or event. "
@@ -2310,15 +2213,10 @@
"configuration. In addition, identities are gathered from your KMail settings "
"and from your address book."
msgstr ""
-"?????????????? ?????? ???????????????????? ?????? ??????????????????????
???????? ???????????????? ?????????? ?????? ???????????????? ???????? "
+"???????????????? ?????? ?????????????????? ?????? ??????????????????????
???????? ???????????????? ?????????? ?????? ???????????????? ???????? "
"?????????????????? ?? ??????????????????. ???? ????????????????????
?????????????? ???? ???????????????? ?????? '??????????????????' "
-"?????????? ?????? ?????????????????? ?????? KOrganizer, ?? ?????? ??????????
'?????????????????? & ?????????????? ???? "
-"????????'->'?????????????? & ?????????????????????? ????????????' ????????
?????????????????? ?????? ????????????????????. "
-"????????????????, ???? ???????????????????? ???????????????????? ??????
?????? ?????????????????? ?????? KMail ?????? ?????? ???? "
-"???????????? ??????????????????????. ???? ?????????????????? ????
?????????????? ?????? ?????????????????? ???????????????? ?????? ???? "
-"KDE ???????? ?????????????????? ?????? ????????????????????,
?????????????????????????? ?????? ???????????????????????????? ?????? "
-"?????????????? '?????????? ?????????????????? email' ?????? ????????????
??????????????, ?????? '??????????????????' ?????????? "
-"?????? ?????????????????? ?????? KOrganizer."
+"?????????? ?????? ?????????????????????? ?????? KOrganizer. ????????????????,
???? ???????????????????? ???????????????????? ?????? "
+"?????? ?????????????????? ?????? KMail ?????? ?????? ???? ????????????
??????????????????????."
#. i18n: ectx: property (text), widget (QLabel, label_5)
#: ui/dialogdesktop.ui:824
@@ -2356,7 +2254,7 @@
#: ui/dialogdesktop.ui:872
#, kde-format
msgid "Substitute with group members"
-msgstr ""
+msgstr "?????????????????????????? ???? ???????? ?????? ????????????"
#. i18n: ectx: property (toolTip), widget (QPushButton, mSelectButton)
#: ui/dialogdesktop.ui:879
@@ -2385,19 +2283,19 @@
#: ui/dialogdesktop.ui:909
#, kde-format
msgid "Resources"
-msgstr ""
+msgstr "??????????"
#. i18n: ectx: property (text), widget (QPushButton, mBookResourceButton)
#: ui/dialogdesktop.ui:949
#, kde-format
msgid "Book Resource"
-msgstr ""
+msgstr "?????????????? ??????????"
#. i18n: ectx: property (text), widget (QPushButton, mFindResourcesButton)
#: ui/dialogdesktop.ui:978
#, kde-format
msgid "Find Resources..."
-msgstr ""
+msgstr "???????????? ??????????..."
#. i18n: ectx: attribute (title), widget (QWidget, mReminderTab)
#: ui/dialogdesktop.ui:992
@@ -2422,19 +2320,17 @@
#. i18n: ectx: property (text), widget (QPushButton, mAlarmNewButton)
#: ui/dialogdesktop.ui:1058
-#, fuzzy, kde-format
-#| msgctxt "@action:button Create a new reminder"
-#| msgid "New"
+#, kde-format
msgctxt "@action:button create a new reminder"
msgid "New"
-msgstr "??????"
+msgstr "??????"
#. i18n: ectx: property (text), widget (QPushButton, mAlarmConfigureButton)
#: ui/dialogdesktop.ui:1069
#, kde-format
msgctxt "@action:button modify the selected reminder"
msgid "Modify"
-msgstr ""
+msgstr "??????????????????????"
#. i18n: ectx: property (text), widget (QPushButton, mAlarmToggleButton)
#: ui/dialogdesktop.ui:1080
@@ -2649,11 +2545,9 @@
#. i18n: ectx: property (toolTip), widget (QLineEdit, resourceSearch)
#: ui/resourcemanagement.ui:39
-#, fuzzy, kde-format
-#| msgctxt "@info:tooltip"
-#| msgid "Set the start date"
+#, kde-format
msgid "Enter the search term"
-msgstr "?????????????? ?????????????????????? ??????????????"
+msgstr "???????????????? ?????? ?????? ?????? ????????????????????"
#. i18n: ectx: property (whatsThis), widget (QLineEdit, resourceSearch)
#: ui/resourcemanagement.ui:42
@@ -2661,18 +2555,20 @@
msgid ""
"Use this text box to enter some keyword for the resource you want to find."
msgstr ""
+"???????????????????????????? ???????? ???? ?????????????? ????????????????
?????? ???? ???????????????? ???????????? ?????????????? ?????? "
+"?????? ???????? ?????? ???????????? ???? ????????????."
#. i18n: ectx: property (title), widget (QGroupBox, groupDetails)
#: ui/resourcemanagement.ui:76
#, kde-format
msgid "Details"
-msgstr ""
+msgstr "????????????????????????"
#. i18n: ectx: property (title), widget (QGroupBox, groupOwner)
#: ui/resourcemanagement.ui:94
#, kde-format
msgid "Owner"
-msgstr ""
+msgstr "??????????????"
#. i18n: ectx: property (windowTitle), widget (QWidget, Dialog)
#: ui/schedulingdialog.ui:14
@@ -2741,17 +2637,16 @@
#. i18n: ectx: property (toolTip), widget (QTabWidget, mTabWidget)
#: ui/schedulingdialog.ui:154
-#, fuzzy, kde-format
-#| msgctxt "@info:tooltip"
-#| msgid "Set the location"
+#, kde-format
msgid "Select the search option"
-msgstr "?????????????? ?????? ??????????"
+msgstr "?????????? ?????? ?????????????? ????????????????????"
#. i18n: ectx: property (whatsThis), widget (QTabWidget, mTabWidget)
#: ui/schedulingdialog.ui:157
#, kde-format
msgid "Use these tabs to choose the search option."
msgstr ""
+"???????????????????????????? ?????????? ?????? ???????????????? ?????? ????
?????????????? ?????? ?????????????? ????????????????????."
#. i18n: ectx: attribute (title), widget (QWidget, mTextTab)
#: ui/schedulingdialog.ui:164
@@ -2791,21 +2686,15 @@
#. i18n: ectx: property (text), widget (QLabel, m_introLabel)
#: ui/template_management_dialog_base.ui:26
-#, fuzzy, kde-format
-#| msgctxt "@label/rich"
-#| msgid ""
-#| "Select a template and click <interface>Apply</interface> to apply it to "
-#| "this item. Click <interface>New</interface> to create a new template "
-#| "based on the current item settings."
+#, kde-format
msgctxt "@label"
msgid ""
"Select a template and click <i>Apply</i> to apply it to this item. Click "
"<i>New</i> to create a new template based on the current item settings."
msgstr ""
-"???????????????? ?????? ?????????????? ?????? ?????????? ???????? ??????
<interface>????????????????</interface> ?????? "
-"???? ???? ???????????????????? ?????? ?????????????????????? ????????. ????
???????? ?????? <interface>??????</"
-"interface> ???? ???????????????????????? ?????? ?????? ??????????????
?????????? ?????? ?????????????????? ?????? ?????????????????? "
-"????????????????????????."
+"???????????????? ?????? ?????????????? ?????? ?????????? ???????? ??????
<i>????????????????</i> ?????? ???? ???? ???????????????????? "
+"?????? ?????????????????????? ????????. ???? ???????? ?????? <i>??????</i>
???? ???????????????????????? ?????? ?????? ?????????????? "
+"?????????? ?????? ?????????????????? ?????? ??????????????????
????????????????????????."
#. i18n: ectx: property (toolTip), widget (QListWidget, m_listBox)
#: ui/template_management_dialog_base.ui:42
@@ -3019,26 +2908,22 @@
"?????? ?????????? ???????? ?????????????????????????? ?????? ????????
???????????????????????? ????????????????????????."
#: visualfreebusywidget.cpp:199
-#, fuzzy, kde-format
-#| msgctxt "@info:tooltip"
-#| msgid "Shows the Free/Busy status of all attendees"
+#, kde-format
msgctxt "@info:tooltip"
msgid "Shows the tree list of all data"
-msgstr "???????????????? ?????? ????????????????????
???????????????????????????? ?????? ?????????? ????????
??????????????????????????"
+msgstr "?????????????????? ???? ???????????????? ?????????? ?????? ?????? ????
????????????????"
#: visualfreebusywidget.cpp:200
-#, fuzzy, kde-format
-#| msgctxt "@info:tooltip"
-#| msgid "Shows the Free/Busy status of all attendees"
+#, kde-format
msgctxt "@info:whatsthis"
msgid "Shows the tree list of all data"
-msgstr "???????????????? ?????? ????????????????????
???????????????????????????? ?????? ?????????? ????????
??????????????????????????"
+msgstr "?????????????????? ???? ???????????????? ?????????? ?????? ?????? ????
????????????????"
#: visualfreebusywidget.cpp:206
#, kde-format
msgctxt "@info:tooltip"
msgid "Shows the Free/Busy status of all attendees"
-msgstr "???????????????? ?????? ????????????????????
???????????????????????????? ?????? ?????????? ????????
??????????????????????????"
+msgstr "?????????????????? ?????? ??????????????????
???????????????????????????? ?????? ?????????? ????????
??????????????????????????"
#: visualfreebusywidget.cpp:208
#, kde-format
@@ -3048,7 +2933,7 @@
"attendee's entry in the list will allow you to enter the location of their "
"Free/Busy Information."
msgstr ""
-"???????????????? ?????? ???????????????????? ????????????????????????????
?????? ?????????? ???????? ??????????????????????????. "
+"?????????????????? ?????? ?????????????????? ????????????????????????????
?????? ?????????? ???????? ??????????????????????????. "
"???????????????? ?????????? ???????? ???? ?????? ????????????????????????
?????? ?????????? ???? ?????? ?????????????????? ?????? "
"???????????????? ?????? ???????????????????? ?????? ??????????????????????
????????????????????????????."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/incidenceeditor-21.04.2/po/zh_CN/libincidenceeditors.po
new/incidenceeditor-21.04.3/po/zh_CN/libincidenceeditors.po
--- old/incidenceeditor-21.04.2/po/zh_CN/libincidenceeditors.po 2021-06-08
08:18:24.000000000 +0200
+++ new/incidenceeditor-21.04.3/po/zh_CN/libincidenceeditors.po 2021-07-06
07:28:40.000000000 +0200
@@ -13,7 +13,7 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2021-05-22 01:40+0000\n"
-"PO-Revision-Date: 2021-06-03 16:07\n"
+"PO-Revision-Date: 2021-06-20 07:37\n"
"Last-Translator: \n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
@@ -2053,7 +2053,7 @@
#, kde-format
msgctxt "@info:tooltip"
msgid "Set the secrecy level"
-msgstr "????????????????????????"
+msgstr "??????????????????"
#. i18n: ectx: property (whatsThis), widget (QLabel, mSecrecyLabel)
#. i18n: ectx: property (whatsThis), widget (QComboBox, mSecrecyCombo)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/incidenceeditor-21.04.2/src/incidencesecrecy.cpp
new/incidenceeditor-21.04.3/src/incidencesecrecy.cpp
--- old/incidenceeditor-21.04.2/src/incidencesecrecy.cpp 2021-05-21
00:54:30.000000000 +0200
+++ new/incidenceeditor-21.04.3/src/incidencesecrecy.cpp 2021-06-28
04:46:57.000000000 +0200
@@ -26,11 +26,6 @@
if (mLoadedIncidence) {
Q_ASSERT(mUi->mSecrecyCombo->count() ==
KCalUtils::Stringify::incidenceSecrecyList().count());
mUi->mSecrecyCombo->setCurrentIndex(mLoadedIncidence->secrecy());
-
- if (incidence->type() == KCalendarCore::Incidence::TypeJournal) {
- mUi->mSecrecyCombo->setVisible(false);
- mUi->mSecrecyLabel->setVisible(false);
- }
} else {
mUi->mSecrecyCombo->setCurrentIndex(0);
}
