Hello community,
here is the log from the commit of package incidenceeditor for openSUSE:Factory checked in at 2017-10-23 16:27:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/incidenceeditor (Old)
and /work/SRC/openSUSE:Factory/.incidenceeditor.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "incidenceeditor"
Mon Oct 23 16:27:17 2017 rev:19 rq:534654 version:17.08.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/incidenceeditor/incidenceeditor.changes 2017-09-12 19:43:00.079629995 +0200
+++ /work/SRC/openSUSE:Factory/.incidenceeditor.new/incidenceeditor.changes 2017-10-23 16:27:20.197577037 +0200
@@ -1,0 +2,10 @@
+Tue Oct 17 00:31:16 CEST 2017 - lbeltrame@kde.org
+
+- Update to 17.08.2
+ * New bugfix release
+ * For more details please see:
+ * https://www.kde.org/announcements/announce-applications-17.08.2.php
+- Changes since 17.08.1:
+ * We have an identity but we don't use settings as sent folder
+
+-------------------------------------------------------------------
Old:
----
incidenceeditor-17.08.1.tar.xz
New:
----
incidenceeditor-17.08.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ incidenceeditor.spec ++++++
--- /var/tmp/diff_new_pack.V0kXBI/_old 2017-10-23 16:27:20.965541083 +0200
+++ /var/tmp/diff_new_pack.V0kXBI/_new 2017-10-23 16:27:20.965541083 +0200
@@ -19,7 +19,7 @@
%bcond_without lang
Name: incidenceeditor
-Version: 17.08.1
+Version: 17.08.2
Release: 0
%define kf5_version 5.26.0
# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
++++++ incidenceeditor-17.08.1.tar.xz -> incidenceeditor-17.08.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/incidenceeditor-17.08.1/CMakeLists.txt new/incidenceeditor-17.08.2/CMakeLists.txt
--- old/incidenceeditor-17.08.1/CMakeLists.txt 2017-09-05 02:41:17.000000000 +0200
+++ new/incidenceeditor-17.08.2/CMakeLists.txt 2017-10-10 02:18:14.000000000 +0200
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.0)
-set(PIM_VERSION "5.6.1")
+set(PIM_VERSION "5.6.2")
project(incidenceeditor VERSION ${PIM_VERSION})
@@ -24,18 +24,18 @@
set(INCIDENCEEDITOR_LIB_VERSION ${PIM_VERSION})
-set(AKONADI_MIMELIB_VERSION "5.6.1")
-set(KDEPIM_LIB_VERSION "5.6.1")
+set(AKONADI_MIMELIB_VERSION "5.6.2")
+set(KDEPIM_LIB_VERSION "5.6.2")
set(QT_REQUIRED_VERSION "5.7.0")
-set(KMIME_LIB_VERSION "5.6.1")
-set(KMAILTRANSPORT_LIB_VERSION "5.6.1")
-set(KLDAP_LIB_VERSION "5.6.1")
-set(CALENDARUTILS_LIB_VERSION "5.6.1")
-set(KCALENDARCORE_LIB_VERSION "5.6.1")
-set(CALENDARSUPPORT_LIB_VERSION "5.6.1")
-set(LIBKDEPIM_LIB_VERSION "5.6.1")
-set(EVENTVIEW_LIB_VERSION "5.6.1")
-set(AKONADI_VERSION "5.6.1")
+set(KMIME_LIB_VERSION "5.6.2")
+set(KMAILTRANSPORT_LIB_VERSION "5.6.2")
+set(KLDAP_LIB_VERSION "5.6.2")
+set(CALENDARUTILS_LIB_VERSION "5.6.2")
+set(KCALENDARCORE_LIB_VERSION "5.6.2")
+set(CALENDARSUPPORT_LIB_VERSION "5.6.2")
+set(LIBKDEPIM_LIB_VERSION "5.6.2")
+set(EVENTVIEW_LIB_VERSION "5.6.2")
+set(AKONADI_VERSION "5.6.2")
set(KDIAGRAM_LIB_VERSION "1.4.0")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/incidenceeditor-17.08.1/po/cs/libincidenceeditors.po new/incidenceeditor-17.08.2/po/cs/libincidenceeditors.po
--- old/incidenceeditor-17.08.1/po/cs/libincidenceeditors.po 2017-09-05 02:41:16.000000000 +0200
+++ new/incidenceeditor-17.08.2/po/cs/libincidenceeditors.po 2017-10-10 02:18:14.000000000 +0200
@@ -9,7 +9,7 @@
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2017-08-30 08:42+0200\n"
-"PO-Revision-Date: 2017-04-19 10:29+0100\n"
+"PO-Revision-Date: 2017-09-11 13:36+0100\n"
"Last-Translator: Vít Pelčák \n"
"Language-Team: Czech \n"
"Language: cs\n"
@@ -1846,7 +1846,7 @@
#, kde-format
msgctxt "@label:listbox The calendar to which the todo or event must be added"
msgid "Calen&dar:"
-msgstr ""
+msgstr "Kalen&dář:"
#. i18n: ectx: property (text), widget (QLabel, label_7)
#: ui/dialogdesktop.ui:81
@@ -1904,7 +1904,7 @@
#, kde-format
msgctxt "@label"
msgid "&Title:"
-msgstr ""
+msgstr "&Název:"
#. i18n: ectx: property (text), widget (QLabel, mLocationLabel)
#: ui/dialogdesktop.ui:183
@@ -2046,7 +2046,7 @@
#, kde-format
msgctxt "@label Start date/time of the event or todo"
msgid "S&tart:"
-msgstr ""
+msgstr "Počá&tek:"
#. i18n: ectx: property (toolTip), widget (KDateComboBox, mStartDateEdit)
#: ui/dialogdesktop.ui:442
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/incidenceeditor-17.08.1/po/de/libincidenceeditors.po new/incidenceeditor-17.08.2/po/de/libincidenceeditors.po
--- old/incidenceeditor-17.08.1/po/de/libincidenceeditors.po 2017-09-05 02:41:16.000000000 +0200
+++ new/incidenceeditor-17.08.2/po/de/libincidenceeditors.po 2017-10-10 02:18:14.000000000 +0200
@@ -15,7 +15,7 @@
"Project-Id-Version: libincidenceeditors\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2017-08-30 08:42+0200\n"
-"PO-Revision-Date: 2017-07-17 20:06+0100\n"
+"PO-Revision-Date: 2017-09-10 22:01+0100\n"
"Last-Translator: Burkhard Lück \n"
"Language-Team: German \n"
"Language: de\n"
@@ -587,7 +587,7 @@
#, kde-format
msgctxt "@title"
msgid "Add Attachment"
-msgstr "Anhang bearbeiten"
+msgstr "Anhang hinzufügen"
#: incidenceattachment.cpp:208
#, kde-kuit-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/incidenceeditor-17.08.1/po/gl/libincidenceeditors.po new/incidenceeditor-17.08.2/po/gl/libincidenceeditors.po
--- old/incidenceeditor-17.08.1/po/gl/libincidenceeditors.po 2017-09-05 02:41:17.000000000 +0200
+++ new/incidenceeditor-17.08.2/po/gl/libincidenceeditors.po 2017-10-10 02:18:14.000000000 +0200
@@ -4,14 +4,14 @@
# Xosé , 2011, 2012, 2013, 2014.
# Adrian Chaves Fernandez , 2013, 2015, 2017.
# Marce Villarino , 2013, 2014.
+# Adrián Chaves (Gallaecio) , 2017.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2017-08-30 08:42+0200\n"
-"PO-Revision-Date: 2017-06-10 20:11+0100\n"
-"Last-Translator: Adrián Chaves Fernández (Gallaecio) \n"
+"PO-Revision-Date: 2017-09-07 06:42+0100\n"
+"Last-Translator: Adrián Chaves (Gallaecio) \n"
"Language-Team: Galician \n"
"Language: gl\n"
"MIME-Version: 1.0\n"
@@ -312,7 +312,7 @@
#: categoryeditdialog.cpp:78
#, kde-format
msgid "Cancel changes and close"
-msgstr "Cancelar os cambios e saír"
+msgstr "Cancelar os cambios e pechar"
#: categoryeditdialog.cpp:79
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/incidenceeditor-17.08.1/po/zh_CN/libincidenceeditors.po new/incidenceeditor-17.08.2/po/zh_CN/libincidenceeditors.po
--- old/incidenceeditor-17.08.1/po/zh_CN/libincidenceeditors.po 2017-09-05 02:41:17.000000000 +0200
+++ new/incidenceeditor-17.08.2/po/zh_CN/libincidenceeditors.po 2017-10-10 02:18:14.000000000 +0200
@@ -1,9 +1,19 @@
+# translation of libincidenceeditors.po to 简体中文
+# Copyright (C) 2002,2003, 2008 Free Software Foundation, Inc.
+#
+# Wang Jian , 2000.
+# Xiong Jiang , 2002, 2003.
+# Funda Wang , 2002, 2003, 2004, 2008.
+# Ni Hui , 2008, 2010.
+# Lie_Ex , 2007-2010.
+# Feng Chao , 2011, 2013.
+# Weng Xuetian , 2015.
msgid ""
msgstr ""
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2017-08-30 08:42+0200\n"
-"PO-Revision-Date: 2017-08-31 05:16-0400\n"
+"PO-Revision-Date: 2017-09-30 17:48-0400\n"
"Last-Translator: guoyunhebrave \n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
@@ -29,22 +39,22 @@
#: alarmdialog.cpp:242
#, kde-format
msgid "Before the to-do starts"
-msgstr "待办事宜开始前"
+msgstr "待办事项开始前"
#: alarmdialog.cpp:242
#, kde-format
msgid "After the to-do starts"
-msgstr "待办事宜开始后"
+msgstr "待办事项开始后"
#: alarmdialog.cpp:246
#, kde-format
msgid "Before the to-do is due"
-msgstr "待办事宜到期前"
+msgstr "待办事项到期前"
#: alarmdialog.cpp:246
#, kde-format
msgid "After the to-do is due"
-msgstr "待办事宜到期后"
+msgstr "待办事项到期后"
#: alarmdialog.cpp:250
#, kde-format
@@ -70,7 +80,7 @@
#, kde-format
msgctxt "@item:inlistbox"
msgid "At start"
-msgstr ""
+msgstr "在开头"
#: alarmpresets.cpp:106
#, kde-format
@@ -153,7 +163,7 @@
#, kde-format
msgctxt "@info:tooltip"
msgid "Enter the name or email address of the attendee."
-msgstr ""
+msgstr "输入该参加者的姓名或电子邮件地址。"
#: attendeeline.cpp:180 incidenceattendee.cpp:86
#, kde-format
@@ -192,17 +202,17 @@
#: attendeetablemodel.cpp:82
#, kde-format
msgid "Free"
-msgstr ""
+msgstr "空闲"
#: attendeetablemodel.cpp:84
#, kde-format
msgid "Busy"
-msgstr ""
+msgstr "忙碌"
#: attendeetablemodel.cpp:86
#, kde-format
msgid "Accepted"
-msgstr ""
+msgstr "已接受"
#: attendeetablemodel.cpp:88 attendeetablemodel.cpp:90
#, kde-format
@@ -213,13 +223,13 @@
#, kde-format
msgctxt "vCard attendee role"
msgid "Role"
-msgstr ""
+msgstr "角色"
#: attendeetablemodel.cpp:169
#, kde-format
msgctxt "Attendees (name+emailaddress)"
msgid "Name"
-msgstr "名称"
+msgstr "姓名"
#: attendeetablemodel.cpp:171
#, kde-format
@@ -238,25 +248,25 @@
#, kde-format
msgctxt "Type of calendar user (vCard attribute)"
msgid "User Type"
-msgstr ""
+msgstr "用户类型"
#: attendeetablemodel.cpp:178
#, kde-format
msgctxt "Has attendee to respond to the invitation"
msgid "Response"
-msgstr ""
+msgstr "响应"
#: attendeetablemodel.cpp:180
#, kde-format
msgctxt "Attendee name"
msgid "Name"
-msgstr "名称"
+msgstr "姓名"
#: attendeetablemodel.cpp:182
#, kde-format
msgctxt "Attendee email"
msgid "Email"
-msgstr "邮件地址"
+msgstr "电子邮件"
#: categorydialog.cpp:59
#, kde-format
@@ -279,7 +289,7 @@
#: categoryeditdialog.cpp:74
#, kde-format
msgid "Apply changes and close"
-msgstr ""
+msgstr "应用更改并关闭"
#: categoryeditdialog.cpp:75
#, kde-format
@@ -291,7 +301,7 @@
#: categoryeditdialog.cpp:78
#, kde-format
msgid "Cancel changes and close"
-msgstr ""
+msgstr "取消更改并关闭"
#: categoryeditdialog.cpp:79
#, kde-format
@@ -389,12 +399,12 @@
#: incidencealarm.cpp:291
#, kde-format
msgid "Display a dialog"
-msgstr ""
+msgstr "显示对话框"
#: incidencealarm.cpp:294
#, kde-format
msgid "Execute a script"
-msgstr ""
+msgstr "执行脚本"
#: incidencealarm.cpp:297
#, kde-format
@@ -404,7 +414,7 @@
#: incidencealarm.cpp:300
#, kde-format
msgid "Play an audio file"
-msgstr ""
+msgstr "播放音频文件"
#: incidencealarm.cpp:303
#, kde-format
@@ -627,7 +637,7 @@
msgid ""
"Displays items (files, mail, etc.) that have been associated with this event "
"or to-do."
-msgstr "显示关联到此事件或待办事宜的项目(文件和邮件等)。"
+msgstr "显示关联到此事件或待办事项的项目(文件和邮件等)。"
#: incidenceattendee.cpp:258
#, kde-format
@@ -680,12 +690,12 @@
#: incidencedatetime.cpp:859
#, kde-format
msgid "Starting Date"
-msgstr ""
+msgstr "起始日期"
#: incidencedatetime.cpp:860
#, kde-format
msgid "Starting Time"
-msgstr ""
+msgstr "起始时间"
#: incidencedatetime.cpp:874 incidencedatetime.cpp:875
#, kde-format
@@ -715,7 +725,7 @@
#: incidencedatetime.cpp:886
#, kde-format
msgid "Ending Time"
-msgstr ""
+msgstr "结束时间"
#: incidencedatetime.cpp:947
#, kde-format
@@ -734,7 +744,7 @@
"The to-do is due before it starts.\n"
"Please correct dates and times."
msgstr ""
-"该待办事宜在开始前便已到期。\n"
+"该待办事项在开始前便已到期。\n"
"请更正日期和时间。"
#: incidencedefaults.cpp:82
@@ -818,7 +828,7 @@
#, kde-format
msgctxt "@title:tab Exception to a recurring event, capital first letter only"
msgid " (E)"
-msgstr ""
+msgstr " (E)"
#: incidencedialog.cpp:307
#, kde-format
@@ -872,7 +882,7 @@
#, kde-format
msgctxt "@title:tab Tab to modify attendees of an event or todo"
msgid "&Resources"
-msgstr ""
+msgstr "资源(&R)"
#: incidencedialog.cpp:491
#, kde-format
@@ -998,7 +1008,7 @@
#, kde-format
msgctxt "example: the 30th"
msgid "the %1"
-msgstr ""
+msgstr "%1"
#: incidencerecurrence.cpp:514
#, kde-format
@@ -1010,13 +1020,13 @@
#, kde-format
msgctxt "example: the 5th Wednesday"
msgid "the %1 %2"
-msgstr ""
+msgstr "%1 %2"
#: incidencerecurrence.cpp:524
#, kde-format
msgctxt "example: the last Wednesday"
msgid "the last %1"
-msgstr ""
+msgstr "最后一个 %1"
#: incidencerecurrence.cpp:528
#, kde-format
@@ -1028,7 +1038,7 @@
#, kde-format
msgctxt "example: the 5th of June"
msgid "the %1 of %2"
-msgstr ""
+msgstr "%2 %1"
#: incidencerecurrence.cpp:548
#, kde-format
@@ -1065,7 +1075,7 @@
msgctxt "Recurrence ends after n occurrences"
msgid "occurrence"
msgid_plural "occurrences"
-msgstr[0] ""
+msgstr[0] "次重复"
#: incidencerecurrence.cpp:615
#, kde-format
@@ -1122,13 +1132,13 @@
#, kde-format
msgctxt "@action:button dialog negative answer"
msgid "Do Not Send"
-msgstr ""
+msgstr "不发送"
#: individualmaildialog.cpp:42
#, kde-format
msgctxt "@title:window"
msgid "Group Scheduling Email"
-msgstr ""
+msgstr "分组调度邮件"
#: individualmaildialog.cpp:49
#, kde-format
@@ -1152,19 +1162,19 @@
#, kde-format
msgctxt "@action:button show list of attendees"
msgid "Individual mailsettings <<"
-msgstr ""
+msgstr "单独的邮件设置 <<"
#: individualmaildialog.cpp:134
#, kde-format
msgctxt "@action:button show list of attendees"
msgid "Individual mailsettings >>"
-msgstr ""
+msgstr "单独的邮件设置 >>"
#: ldaputils.cpp:29
#, kde-format
msgctxt "ldap attribute cn"
msgid "Common name"
-msgstr ""
+msgstr "通用名"
#: ldaputils.cpp:31
#, kde-format
@@ -1176,13 +1186,13 @@
#, kde-format
msgctxt "ldap attribute givenname"
msgid "Given name"
-msgstr ""
+msgstr "名"
#: ldaputils.cpp:35
#, kde-format
msgctxt "ldap attribute sn"
msgid "Surname"
-msgstr ""
+msgstr "姓"
#: ldaputils.cpp:37
#, kde-format
@@ -1194,7 +1204,7 @@
#, kde-format
msgctxt "ldap attribute objectClass"
msgid "Object class"
-msgstr ""
+msgstr "对象类"
#: ldaputils.cpp:41
#, kde-format
@@ -1212,7 +1222,7 @@
#, kde-format
msgctxt "ldap attribute mobile"
msgid "Mobile"
-msgstr ""
+msgstr "手机"
#: opencomposerjob.cpp:72
#, kde-format
@@ -1231,13 +1241,13 @@
#, kde-format
msgctxt "errormessage: dbus is running but still no connection kmail"
msgid "Cannot connect to email service"
-msgstr ""
+msgstr "无法连接到邮件服务"
#: resourcemanagement.cpp:122
#, kde-format
msgctxt "@action:button add resource to attendeelist"
msgid "Book resource"
-msgstr ""
+msgstr "预订资源"
#: schedulingdialog.cpp:195
#, kde-format
@@ -1245,7 +1255,7 @@
"@label Day of week followed by day of the month, then the month. Example: "
"Monday, 12 June"
msgid "%1, %2 %3"
-msgstr ""
+msgstr "%1，%2 %3"
#: schedulingdialog.cpp:216
#, kde-format
@@ -1584,7 +1594,7 @@
msgid ""
"Enter a list comma-separated addresses to which an email will be sent when "
"the reminder triggers"
-msgstr ""
+msgstr "输入提醒被触发时，通知邮件发送对象的地址列表，用逗号隔开。"
#. i18n: ectx: property (text), widget (QLabel, mEmailTextLabel)
#: ui/alarmdialog.ui:455
@@ -1604,7 +1614,7 @@
msgid ""
"Enter any text you desire for the email message that will be sent when the "
"alarm triggers."
-msgstr ""
+msgstr "输入提醒被触发时，所发送邮件里的文字内容。"
#. i18n: ectx: property (toolTip), widget (KLineEdit, mLabelEdit)
#: ui/attachmenteditdialog.ui:38
@@ -1814,7 +1824,7 @@
#, kde-format
msgctxt "@label:listbox The calendar to which the todo or event must be added"
msgid "Calen&dar:"
-msgstr ""
+msgstr "日历(&D)"
#. i18n: ectx: property (text), widget (QLabel, label_7)
#: ui/dialogdesktop.ui:81
@@ -1865,7 +1875,7 @@
#, kde-format
msgctxt "@info:whatsthis"
msgid "Sets the Title of this event or to-do."
-msgstr "设置该事件或待办事宜的标题。"
+msgstr "设置该事件或待办事项的标题。"
#. i18n: ectx: property (text), widget (QLabel, label_2)
#: ui/dialogdesktop.ui:145
@@ -1893,7 +1903,7 @@
#, kde-format
msgctxt "@info:whatsthis"
msgid "Sets where the event or to-do will take place."
-msgstr "设置事件或待办事宜的发生地点。"
+msgstr "设置事件或待办事项的发生地点。"
#. i18n: ectx: property (text), widget (QLabel, mTaskLabel)
#: ui/dialogdesktop.ui:219
@@ -1992,7 +2002,7 @@
msgctxt "@info:whatsthis"
msgid ""
"Set if this to-do's start and due dates have times associated with them."
-msgstr "设置是否要对此待办事宜的起始和终止时间分派关联的时间。"
+msgstr "设置是否要对此待办事项的起始和终止时间分派关联的时间。"
#. i18n: ectx: property (text), widget (QCheckBox, mWholeDayCheck)
#: ui/dialogdesktop.ui:357
@@ -2013,7 +2023,7 @@
#, kde-format
msgctxt "@label Start date/time of the event or todo"
msgid "S&tart:"
-msgstr ""
+msgstr "开始(&T)："
#. i18n: ectx: property (toolTip), widget (KDateComboBox, mStartDateEdit)
#: ui/dialogdesktop.ui:442
@@ -2027,14 +2037,14 @@
#, kde-format
msgctxt "@info:whatsthis"
msgid "Sets the start date for this to-do"
-msgstr "设置该待办事宜的起始日期"
+msgstr "设置该待办事项的起始日期"
#. i18n: ectx: property (whatsThis), widget (KTimeComboBox, mStartTimeEdit)
#: ui/dialogdesktop.ui:461
#, kde-format
msgctxt "@info:whatsthis"
msgid "Sets the start time for this to-do."
-msgstr "设置该待办事宜的起始时间。"
+msgstr "设置该待办事项的起始时间。"
#. i18n: ectx: property (whatsThis), widget (IncidenceEditorNG::KTimeZoneComboBox, mTimeZoneComboStart)
#. i18n: ectx: property (whatsThis), widget (IncidenceEditorNG::KTimeZoneComboBox, mTimeZoneComboEnd)
@@ -2056,21 +2066,21 @@
#, kde-format
msgctxt "@label end date/time for an event or to-do"
msgid "E&nd:"
-msgstr ""
+msgstr "结束(&N)："
#. i18n: ectx: property (whatsThis), widget (KDateComboBox, mEndDateEdit)
#: ui/dialogdesktop.ui:560
#, kde-format
msgctxt "@info:whatsthis"
msgid "Sets the due date for this to-do."
-msgstr "设置该待办事宜的终止日期。"
+msgstr "设置该待办事项的终止日期。"
#. i18n: ectx: property (whatsThis), widget (KTimeComboBox, mEndTimeEdit)
#: ui/dialogdesktop.ui:576
#, kde-format
msgctxt "@info:whatsthis"
msgid "Sets the due time for this to-do."
-msgstr "设置该待办事宜的到期时间。"
+msgstr "设置该待办事项的到期时间。"
#. i18n: ectx: attribute (title), widget (QWidget, mGeneralTab)
#: ui/dialogdesktop.ui:625
@@ -2098,8 +2108,8 @@
"of the restrictions will depend on the groupware server. This means that "
"events or to-dos marked as private or confidential may be visible to others."
msgstr ""
-"设置该事件或待办事宜的访问权限。请注意目前 KOrganizer 并不使用这些设置，权限"
-"相关的特性依赖于您的群件服务器。这意味着被标为私有或机密的事件或待办事宜对其"
+"设置该事件或待办事项的访问权限。请注意目前 KOrganizer 并不使用这些设置，权限"
+"相关的特性依赖于您的群件服务器。这意味着被标为私有或机密的事件或待办事项对其"
"他人是不可见的。"
#. i18n: ectx: property (text), widget (QLabel, mSecrecyLabel)
@@ -2222,13 +2232,13 @@
#: ui/dialogdesktop.ui:930
#, kde-format
msgid "Book resource"
-msgstr ""
+msgstr "预订资源"
#. i18n: ectx: property (text), widget (QPushButton, mFindResourcesButton)
#: ui/dialogdesktop.ui:959
#, kde-format
msgid "Find Resources..."
-msgstr ""
+msgstr "查找资源..."
#. i18n: ectx: attribute (title), widget (QWidget, mReminderTab)
#: ui/dialogdesktop.ui:969
@@ -2346,7 +2356,7 @@
#: ui/dialogdesktop.ui:1177
#, kde-format
msgid "This and future occurrences."
-msgstr ""
+msgstr "此事件和未来的事件。"
#. i18n: ectx: property (text), widget (QLabel, mRecurrenceEndLabel)
#: ui/dialogdesktop.ui:1348
@@ -2381,7 +2391,7 @@
#, kde-format
msgctxt "@info:whatsthis"
msgid "Date after which the event or to-do should stop recurring"
-msgstr "该事件或待办事宜应在指定日期后停止重现"
+msgstr "该事件或待办事项应在指定日期后停止重现"
#. i18n: ectx: property (text), widget (QLabel, mRecurrenceOccurrencesLabel)
#: ui/dialogdesktop.ui:1490
@@ -2439,7 +2449,7 @@
msgid ""
"Shows a dialog used to select an attachment to add to this event or to-do as "
"link or as inline data."
-msgstr "显示用于向该事件或待办事宜选择附件作为链接或内嵌数据的对话框。"
+msgstr "显示用于向该事件或待办事项选择附件作为链接或内嵌数据的对话框。"
#. i18n: ectx: property (text), widget (QPushButton, mAddButton)
#: ui/dialogdesktop.ui:1635
@@ -2461,7 +2471,7 @@
msgctxt "@info:whatsthis"
msgid ""
"Removes the attachment selected in the list above from this event or to-do."
-msgstr "在上面的列表中从该事件或待办事宜删除选中附件。"
+msgstr "在上面的列表中从该事件或待办事项删除选中附件。"
#. i18n: ectx: property (text), widget (QPushButton, mRemoveButton)
#: ui/dialogdesktop.ui:1657
@@ -2480,7 +2490,7 @@
#: ui/resourcemanagement.ui:88
#, kde-format
msgid "Owner"
-msgstr ""
+msgstr "所有者"
#. i18n: ectx: property (windowTitle), widget (QWidget, Dialog)
#: ui/schedulingdialog.ui:14
@@ -2492,13 +2502,13 @@
#: ui/schedulingdialog.ui:39
#, kde-format
msgid "Earliest time to start:"
-msgstr ""
+msgstr "最早开始时间："
#. i18n: ectx: property (text), widget (QLabel, label_2)
#: ui/schedulingdialog.ui:59
#, kde-format
msgid "Latest time to end:"
-msgstr ""
+msgstr "最晚开始时间："
#. i18n: ectx: property (toolTip), widget (QLabel, label_3)
#. i18n: ectx: property (toolTip), widget (KPIM::KWeekdayCheckCombo, mWeekdayCombo)
@@ -2519,7 +2529,7 @@
#: ui/schedulingdialog.ui:92
#, kde-format
msgid "Allowed weekdays:"
-msgstr ""
+msgstr "允许的工作日："
#. i18n: ectx: property (toolTip), widget (QLabel, label_5)
#. i18n: ectx: property (toolTip), widget (KPIM::KCheckComboBox, mRolesCombo)
@@ -2559,19 +2569,19 @@
#: ui/schedulingdialog.ui:201
#, kde-format
msgid "Move your appointment to:"
-msgstr ""
+msgstr "移动约会到："
#. i18n: ectx: property (text), widget (QLabel, mMoveDayLabel)
#: ui/schedulingdialog.ui:222
#, kde-format
msgid "Monday, 12th June"
-msgstr ""
+msgstr "六月 12 日星期一"
#. i18n: ectx: property (text), widget (QLabel, mMoveEndTimeLabel)
#: ui/schedulingdialog.ui:235
#, kde-format
msgid "to 10:00am"
-msgstr ""
+msgstr "到上午 10:00"
#. i18n: ectx: property (windowTitle), widget (QWidget, TemplateManagementDialog_base)
#: ui/template_management_dialog_base.ui:14
@@ -2683,7 +2693,7 @@
msgstr ""
"选择甘特图德缩放级别：<nl/>“小时”显示的是小时范围，<nl/>“天”显示的是天数范"
"围，<nl/>“周”显示的是若干月的范围，<nl/>“月”则显示的是若干年的范围。<nl/>如果"
-"选择“自动”，图的范围会自动适应当前的事件或待办事宜。"
+"选择“自动”，图的范围会自动适应当前的事件或待办事项。"
#: visualfreebusywidget.cpp:168
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/incidenceeditor-17.08.1/src/individualmailcomponentfactory.cpp new/incidenceeditor-17.08.2/src/individualmailcomponentfactory.cpp
--- old/incidenceeditor-17.08.1/src/individualmailcomponentfactory.cpp 2017-08-29 07:25:20.000000000 +0200
+++ new/incidenceeditor-17.08.2/src/individualmailcomponentfactory.cpp 2017-09-28 06:48:48.000000000 +0200
@@ -92,15 +92,29 @@
msg->cc()->fromUnicodeString(messageCc.join(QStringLiteral(", ")), "utf-8");
msg->assemble();
+
mQueueJob = new MailTransport::MessageQueueJob(this);
mQueueJob->setMessage(msg);
- mQueueJob->transportAttribute().setTransportId(transportAttribute().transportId());
- mQueueJob->sentBehaviourAttribute().setSentBehaviour(sentBehaviourAttribute().sentBehaviour());
+ mQueueJob->transportAttribute().setTransportId(mIdentity.isNull() ? transportAttribute().transportId() : mIdentity.transport().toInt());
mQueueJob->addressAttribute().setFrom(addressAttribute().from());
mQueueJob->addressAttribute().setTo(to);
mQueueJob->addressAttribute().setCc(cc);
mQueueJob->addressAttribute().setBcc(addressAttribute().bcc());
+ if (mIdentity.disabledFcc()) {
+ mQueueJob->sentBehaviourAttribute().setSentBehaviour(MailTransport::SentBehaviourAttribute::Delete);
+ } else {
+ const Akonadi::Collection sentCollection(mIdentity.fcc().toLongLong());
+ if (sentCollection.isValid()) {
+ mQueueJob->sentBehaviourAttribute().setSentBehaviour(MailTransport::SentBehaviourAttribute::MoveToCollection);
+ mQueueJob->sentBehaviourAttribute().setMoveToCollection(sentCollection);
+ } else {
+ mQueueJob->sentBehaviourAttribute().setSentBehaviour(
+ MailTransport::SentBehaviourAttribute::MoveToDefaultSentCollection);
+ }
+ }
+
+
connect(mQueueJob, &MailTransport::MessageQueueJob::finished, this,
&IndividualMessageQueueJob::handleJobFinished);
mQueueJob->start();
