diff -Nru kde-l10n-zhcn-4.12.90/debian/changelog kde-l10n-zhcn-4.12.95/debian/changelog
--- kde-l10n-zhcn-4.12.90/debian/changelog 2014-03-19 12:46:26.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/debian/changelog 2014-03-23 12:25:48.000000000 +0000
@@ -1,3 +1,9 @@
+kde-l10n-zhcn (4:4.12.95-0ubuntu1) trusty; urgency=medium
+
+ * New upstream release
+
+ -- Philip Muškovac Sun, 23 Mar 2014 13:16:21 +0100
+
kde-l10n-zhcn (4:4.12.90-0ubuntu1) trusty; urgency=medium
* New upstream release
diff -Nru kde-l10n-zhcn-4.12.90/messages/applications/dolphin.po kde-l10n-zhcn-4.12.95/messages/applications/dolphin.po
--- kde-l10n-zhcn-4.12.90/messages/applications/dolphin.po 2014-03-07 04:13:05.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/applications/dolphin.po 2014-03-18 04:17:11.000000000 +0000
@@ -16,7 +16,7 @@
msgstr ""
"Project-Id-Version: dolphin\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2014-03-07 01:42+0000\n"
+"POT-Creation-Date: 2014-03-18 01:27+0000\n"
"PO-Revision-Date: 2014-02-22 11:12+0800\n"
"Last-Translator: Feng Chao \n"
"Language-Team: Chinese Simplified \n"
@@ -1427,7 +1427,7 @@
msgid "Everywhere"
msgstr "任何位置"
-#: search/dolphinsearchbox.cpp:459
+#: search/dolphinsearchbox.cpp:461
#, kde-format
msgctxt ""
"@title UDS_DISPLAY_NAME for a KIO directory listing. %1 is the query the "
@@ -1435,17 +1435,17 @@
msgid "Query Results from '%1'"
msgstr "查询“%1”的结果"
-#: search/dolphinsearchbox.cpp:474
+#: search/dolphinsearchbox.cpp:476
msgctxt "@label:textbox"
msgid "Find:"
msgstr "查找:"
-#: search/dolphinsearchbox.cpp:492
+#: search/dolphinsearchbox.cpp:494
msgctxt "action:button"
msgid "Fewer Options"
msgstr "简化选项"
-#: search/dolphinsearchbox.cpp:492
+#: search/dolphinsearchbox.cpp:494
msgctxt "action:button"
msgid "More Options"
msgstr "更多选项"
diff -Nru kde-l10n-zhcn-4.12.90/messages/frameworks/kio5.po kde-l10n-zhcn-4.12.95/messages/frameworks/kio5.po
--- kde-l10n-zhcn-4.12.90/messages/frameworks/kio5.po 2014-03-13 04:01:06.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/frameworks/kio5.po 2014-03-19 06:15:59.000000000 +0000
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: kio4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2014-03-13 01:38+0000\n"
+"POT-Creation-Date: 2014-03-19 04:10+0000\n"
"PO-Revision-Date: 2013-11-10 12:06+0800\n"
"Last-Translator: Feng Chao \n"
"Language-Team: Chinese Simplified \n"
@@ -1750,7 +1750,7 @@
msgid "The server was too busy responding to other requests to respond."
msgstr "服务器忙于响应其它请求,以致无法对该请求做出响应。"
-#: src/core/job_error.cpp:934 src/core/slavebase.cpp:1431
+#: src/core/job_error.cpp:934 src/core/slavebase.cpp:1417
msgid "Unknown Error"
msgstr "未知的错误"
@@ -2133,125 +2133,125 @@
"无法创建输入输出后端:\n"
"klauncher 消息:%1"
-#: src/core/slavebase.cpp:782
+#: src/core/slavebase.cpp:768
#, kde-format
msgid "Opening connections is not supported with the protocol %1."
msgstr "协议 %1 不支持打开连接。"
-#: src/core/slavebase.cpp:784
+#: src/core/slavebase.cpp:770
#, kde-format
msgid "Closing connections is not supported with the protocol %1."
msgstr "协议 %1 不支持关闭连接。"
-#: src/core/slavebase.cpp:786
+#: src/core/slavebase.cpp:772
#, kde-format
msgid "Accessing files is not supported with the protocol %1."
msgstr "协议 %1 不支持文件访问。"
-#: src/core/slavebase.cpp:788
+#: src/core/slavebase.cpp:774
#, kde-format
msgid "Writing to %1 is not supported."
msgstr "不支持写入 %1。"
-#: src/core/slavebase.cpp:790
+#: src/core/slavebase.cpp:776
#, kde-format
msgid "There are no special actions available for protocol %1."
msgstr "协议 %1 没有可用的特殊动作。"
-#: src/core/slavebase.cpp:792
+#: src/core/slavebase.cpp:778
#, kde-format
msgid "Listing folders is not supported for protocol %1."
msgstr "协议 %1 不支持列出文件夹内容。"
-#: src/core/slavebase.cpp:794
+#: src/core/slavebase.cpp:780
#, kde-format
msgid "Retrieving data from %1 is not supported."
msgstr "不支持从 %1 获取数据。"
-#: src/core/slavebase.cpp:796
+#: src/core/slavebase.cpp:782
#, kde-format
msgid "Retrieving mime type information from %1 is not supported."
msgstr "抱歉,不支持从 %1 获取 MIME 类型。"
-#: src/core/slavebase.cpp:798
+#: src/core/slavebase.cpp:784
#, kde-format
msgid "Renaming or moving files within %1 is not supported."
msgstr "不支持在 %1 内重命名或移动文件。"
-#: src/core/slavebase.cpp:800
+#: src/core/slavebase.cpp:786
#, kde-format
msgid "Creating symlinks is not supported with protocol %1."
msgstr "协议 %1 不支持符号链接。"
-#: src/core/slavebase.cpp:802
+#: src/core/slavebase.cpp:788
#, kde-format
msgid "Copying files within %1 is not supported."
msgstr "不支持在 %1 内复制文件。"
-#: src/core/slavebase.cpp:804
+#: src/core/slavebase.cpp:790
#, kde-format
msgid "Deleting files from %1 is not supported."
msgstr "不支持从 %1 删除文件。"
-#: src/core/slavebase.cpp:806
+#: src/core/slavebase.cpp:792
#, kde-format
msgid "Creating folders is not supported with protocol %1."
msgstr "协议 %1 不支持创建文件夹。"
-#: src/core/slavebase.cpp:808
+#: src/core/slavebase.cpp:794
#, kde-format
msgid "Changing the attributes of files is not supported with protocol %1."
msgstr "协议 %1 不支持更改文件属性。"
-#: src/core/slavebase.cpp:810
+#: src/core/slavebase.cpp:796
#, kde-format
msgid "Changing the ownership of files is not supported with protocol %1."
msgstr "协议 %1 不支持更改文件属主。"
-#: src/core/slavebase.cpp:812
+#: src/core/slavebase.cpp:798
#, kde-format
msgid "Using sub-URLs with %1 is not supported."
msgstr "不支持在 %1 使用子 URL。"
-#: src/core/slavebase.cpp:814
+#: src/core/slavebase.cpp:800
#, kde-format
msgid "Multiple get is not supported with protocol %1."
msgstr "协议 %1 不支持多次获取。"
-#: src/core/slavebase.cpp:816
+#: src/core/slavebase.cpp:802
#, kde-format
msgid "Opening files is not supported with protocol %1."
msgstr "协议 %1 不支持打开文件。"
-#: src/core/slavebase.cpp:818
+#: src/core/slavebase.cpp:804
#, kde-format
msgid "Protocol %1 does not support action %2."
msgstr "协议 %1 不支持动作 %2。"
-#: src/core/slavebase.cpp:974
+#: src/core/slavebase.cpp:960
msgid "&Yes"
msgstr "是(&Y)"
-#: src/core/slavebase.cpp:975
+#: src/core/slavebase.cpp:961
msgid "&No"
msgstr "否(&N)"
-#: src/core/slaveinterface.cpp:429 src/core/tcpslavebase.cpp:822
+#: src/core/slaveinterface.cpp:413 src/core/tcpslavebase.cpp:822
#: src/widgets/sslui.cpp:78
msgid "&Details"
msgstr "细节(&D)"
-#: src/core/slaveinterface.cpp:431 src/core/tcpslavebase.cpp:839
+#: src/core/slaveinterface.cpp:415 src/core/tcpslavebase.cpp:839
#: src/widgets/sslui.cpp:114
msgid "&Forever"
msgstr "永远(&F)"
-#: src/core/slaveinterface.cpp:435 src/core/tcpslavebase.cpp:822
+#: src/core/slaveinterface.cpp:419 src/core/tcpslavebase.cpp:822
#: src/widgets/sslui.cpp:79
msgid "Co&ntinue"
msgstr "继续(&N)"
-#: src/core/slaveinterface.cpp:437 src/core/tcpslavebase.cpp:840
+#: src/core/slaveinterface.cpp:421 src/core/tcpslavebase.cpp:840
#: src/widgets/sslui.cpp:115
msgid "&Current Session only"
msgstr "仅当前会话(&C)"
diff -Nru kde-l10n-zhcn-4.12.90/messages/frameworks/ktexteditor5.po kde-l10n-zhcn-4.12.95/messages/frameworks/ktexteditor5.po
--- kde-l10n-zhcn-4.12.90/messages/frameworks/ktexteditor5.po 2014-03-13 04:01:06.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/frameworks/ktexteditor5.po 2014-03-20 03:57:01.000000000 +0000
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: katepart4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2014-03-13 01:38+0000\n"
+"POT-Creation-Date: 2014-03-20 01:40+0000\n"
"PO-Revision-Date: 2013-04-16 14:58-0400\n"
"Last-Translator: Weng Xuetian \n"
"Language-Team: Chinese Simplified \n"
@@ -26,12 +26,12 @@
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Lokalize 1.5\n"
-#: completion/katecompletionconfig.cpp:41
+#: completion/katecompletionconfig.cpp:42
msgid "Code Completion Configuration"
msgstr "代码补全配置"
-#: completion/katecompletionconfig.cpp:115
-#: completion/katecompletionconfig.cpp:144
+#: completion/katecompletionconfig.cpp:116
+#: completion/katecompletionconfig.cpp:145
msgid "Always"
msgstr "总是"
@@ -85,7 +85,7 @@
#. i18n: ectx: property (text), widget (QTreeWidget, treeWidget)
#: completion/katecompletionmodel.cpp:1334
-#: dialogs/commandmenuconfigwidget.ui:22 dialogs/katedialogs.cpp:970
+#: dialogs/commandmenuconfigwidget.ui:22 dialogs/katedialogs.cpp:1048
msgid "Name"
msgstr "名称"
@@ -262,7 +262,7 @@
msgstr "主工具栏"
#. i18n: ectx: property (title), widget (QGroupBox, gbBorders)
-#: dialogs/bordersappearanceconfigwidget.ui:9 dialogs/katedialogs.cpp:577
+#: dialogs/bordersappearanceconfigwidget.ui:9 dialogs/katedialogs.cpp:624
msgid "Borders"
msgstr "边框"
@@ -373,7 +373,7 @@
msgstr ""
#. i18n: ectx: property (text), item, widget (QComboBox, cmbShowScrollbars)
-#: dialogs/bordersappearanceconfigwidget.ui:168 dialogs/katedialogs.cpp:581
+#: dialogs/bordersappearanceconfigwidget.ui:168 dialogs/katedialogs.cpp:628
msgid "Always On"
msgstr "总是打开"
@@ -503,8 +503,8 @@
#. i18n: ectx: property (title), widget (QGroupBox, gbGeneral)
#. i18n: ectx: property (title), widget (QGroupBox, gbViInputMode)
-#: dialogs/completionconfigtab.ui:12 dialogs/katedialogs.cpp:496
-#: dialogs/katedialogs.cpp:573 dialogs/katedialogs.cpp:744
+#: dialogs/completionconfigtab.ui:12 dialogs/katedialogs.cpp:507
+#: dialogs/katedialogs.cpp:620 dialogs/katedialogs.cpp:807
#: vimode/viinputmodeconfigwidget.ui:29
msgid "General"
msgstr "通用"
@@ -1068,7 +1068,7 @@
msgid "Increase indentation level if in l&eading blank space"
msgstr "如果在开始空白空格处,增加缩进等级(&E)"
-#: dialogs/katedialogs.cpp:199 dialogs/katedialogs.cpp:202
+#: dialogs/katedialogs.cpp:200 dialogs/katedialogs.cpp:203
#, fuzzy
#| msgid " character"
#| msgid_plural " characters"
@@ -1076,7 +1076,7 @@
msgid "1 character"
msgstr " 个字符"
-#: dialogs/katedialogs.cpp:200 dialogs/katedialogs.cpp:203
+#: dialogs/katedialogs.cpp:201 dialogs/katedialogs.cpp:204
#, fuzzy
#| msgid " character"
#| msgid_plural " characters"
@@ -1084,153 +1084,165 @@
msgid " characters"
msgstr " 个字符"
-#: dialogs/katedialogs.cpp:475
-#, fuzzy
-#| msgid " character"
-#| msgid_plural " characters"
-msgctxt "suffix for spinbox >1 wrap words at (value is at 20 or larger)"
-msgid " characters"
-msgstr " 个字符"
-
-#: dialogs/katedialogs.cpp:497
-msgid "Text Navigation"
-msgstr "文本导航"
-
-#: dialogs/katedialogs.cpp:498
+#: dialogs/katedialogs.cpp:231
msgid "Indentation"
msgstr "缩进"
-#: dialogs/katedialogs.cpp:499
+#: dialogs/katedialogs.cpp:301
msgid "Auto Completion"
msgstr "自动补全"
-#: dialogs/katedialogs.cpp:500 utils/kateglobal.cpp:103
-msgid "Vi Input Mode"
-msgstr "Vi 输入模式"
-
-#: dialogs/katedialogs.cpp:501
+#: dialogs/katedialogs.cpp:365
msgid "Spellcheck"
msgstr "拼写检查"
-#: dialogs/katedialogs.cpp:579
+#: dialogs/katedialogs.cpp:441
+msgid "Text Navigation"
+msgstr "文本导航"
+
+#: dialogs/katedialogs.cpp:500
+#, fuzzy
+#| msgid " character"
+#| msgid_plural " characters"
+msgctxt "suffix for spinbox >1 wrap words at (value is at 20 or larger)"
+msgid " characters"
+msgstr " 个字符"
+
+#: dialogs/katedialogs.cpp:592 script/data/commands/utils.js:330
+msgid "Editing"
+msgstr "编辑"
+
+#: dialogs/katedialogs.cpp:597
+msgid "Editing Options"
+msgstr "编辑选项"
+
+#: dialogs/katedialogs.cpp:626
msgid "Off"
msgstr "关闭"
-#: dialogs/katedialogs.cpp:580
+#: dialogs/katedialogs.cpp:627
msgid "Follow Line Numbers"
msgstr "按照行号"
+#: dialogs/katedialogs.cpp:737 dialogs/katedialogs.cpp:742
+msgid "Appearance"
+msgstr "外观"
+
#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
-#: dialogs/katedialogs.cpp:745 dialogs/textareaappearanceconfigwidget.ui:102
+#: dialogs/katedialogs.cpp:808 dialogs/textareaappearanceconfigwidget.ui:102
msgid "Advanced"
msgstr "高级"
-#: dialogs/katedialogs.cpp:746
-msgid "Modes && Filetypes"
-msgstr "模式和文件类型"
-
-#: dialogs/katedialogs.cpp:800
+#: dialogs/katedialogs.cpp:863
msgid ""
"You did not provide a backup suffix or prefix. Using default suffix: '~'"
msgstr "您没有指定备份文件的后缀或前缀。将使用后缀“~”"
-#: dialogs/katedialogs.cpp:801
+#: dialogs/katedialogs.cpp:864
msgid "No Backup Suffix or Prefix"
msgstr "无备份文件的后缀或前缀"
-#: dialogs/katedialogs.cpp:812
+#: dialogs/katedialogs.cpp:875
msgid ""
"Selected directory for swap file storage does not exist. Do you want to "
"create it?"
msgstr ""
-#: dialogs/katedialogs.cpp:813
+#: dialogs/katedialogs.cpp:876
msgid "Missing Swap File Directory"
msgstr ""
-#: dialogs/katedialogs.cpp:870
+#: dialogs/katedialogs.cpp:933
msgid "KDE Default"
msgstr "KDE 默认值"
-#: dialogs/katedialogs.cpp:958
+#: dialogs/katedialogs.cpp:1017
+msgid "Open/Save"
+msgstr "打开/保存"
+
+#: dialogs/katedialogs.cpp:1022
+msgid "File Opening & Saving"
+msgstr "文件打开和保存"
+
+#: dialogs/katedialogs.cpp:1036
msgid "Highlight Download"
msgstr "下载语法加亮文件"
-#: dialogs/katedialogs.cpp:965
+#: dialogs/katedialogs.cpp:1043
msgid "Select the syntax highlighting files you want to update:"
msgstr "选择您想要更新的加亮显示语法文件:"
-#: dialogs/katedialogs.cpp:970
+#: dialogs/katedialogs.cpp:1048
msgid "Installed"
msgstr "已安装"
-#: dialogs/katedialogs.cpp:970
+#: dialogs/katedialogs.cpp:1048
msgid "Latest"
msgstr "最新的"
-#: dialogs/katedialogs.cpp:977
+#: dialogs/katedialogs.cpp:1055
msgid "Note: New versions are selected automatically."
msgstr "注意:新版本已经自动选中。"
-#: dialogs/katedialogs.cpp:984
+#: dialogs/katedialogs.cpp:1062
msgid "&Install"
msgstr "安装(&I)"
-#: dialogs/katedialogs.cpp:1027
+#: dialogs/katedialogs.cpp:1105
msgid ""
"The list of highlightings could not be found on / retrieved from the server"
msgstr "在服务器的根目录上找不到语法加亮文件"
-#: dialogs/katedialogs.cpp:1135
+#: dialogs/katedialogs.cpp:1213
msgid "&Go to line:"
msgstr "跳转到行(&G):"
-#: dialogs/katedialogs.cpp:1141
+#: dialogs/katedialogs.cpp:1219
msgid "Go"
msgstr "转到"
-#: dialogs/katedialogs.cpp:1203
+#: dialogs/katedialogs.cpp:1281
msgid "Dictionary:"
msgstr "词典:"
-#: dialogs/katedialogs.cpp:1251
+#: dialogs/katedialogs.cpp:1329
msgid "File Was Deleted on Disk"
msgstr "文件已在磁盘上删除"
-#: dialogs/katedialogs.cpp:1252
+#: dialogs/katedialogs.cpp:1330
msgid "&Save File As..."
msgstr "文件另存为(&S)..."
-#: dialogs/katedialogs.cpp:1254
+#: dialogs/katedialogs.cpp:1332
msgid "Lets you select a location and save the file again."
msgstr "让您选择一个位置以再次保存文件。"
-#: dialogs/katedialogs.cpp:1256
+#: dialogs/katedialogs.cpp:1334
msgid "File Changed on Disk"
msgstr "文件已在磁盘上更改"
-#: dialogs/katedialogs.cpp:1257 document/katedocument.cpp:3939
+#: dialogs/katedialogs.cpp:1335 document/katedocument.cpp:3927
msgid "&Reload File"
msgstr "重新装入文件(&R)"
-#: dialogs/katedialogs.cpp:1259
+#: dialogs/katedialogs.cpp:1337
msgid ""
"Reload the file from disk. If you have unsaved changes, they will be lost."
msgstr "从磁盘上重新装入文件。如果您有未保存的更改,这些更改将丢失。"
-#: dialogs/katedialogs.cpp:1273 document/katedocument.cpp:3937
+#: dialogs/katedialogs.cpp:1351 document/katedocument.cpp:3925
msgid "What do you want to do?"
msgstr "您想要做什么?"
-#: dialogs/katedialogs.cpp:1284 document/katedocument.cpp:3940
+#: dialogs/katedialogs.cpp:1362 document/katedocument.cpp:3928
msgid "&Ignore Changes"
msgstr "忽略更改(&I)"
-#: dialogs/katedialogs.cpp:1285
+#: dialogs/katedialogs.cpp:1363
msgid "Ignore the changes. You will not be prompted again."
msgstr "忽略更改。您将不会再收到提示。"
-#: dialogs/katedialogs.cpp:1291
+#: dialogs/katedialogs.cpp:1369
msgid ""
"Do nothing. Next time you focus the file, or try to save it or close it, you "
"will be prompted again."
@@ -1238,36 +1250,36 @@
"不执行任何操作。您下次聚焦该文件时,或者尝试保存或关闭它时,您将会再次看到该"
"提示。"
-#: dialogs/katedialogs.cpp:1300
+#: dialogs/katedialogs.cpp:1378
msgid "Overwrite the disk file with the editor content."
msgstr "用编辑器的内容覆盖磁盘上的文件。"
-#: dialogs/katedialogs.cpp:1374 swapfile/kateswapdiffcreator.cpp:137
+#: dialogs/katedialogs.cpp:1452 swapfile/kateswapdiffcreator.cpp:137
msgid ""
"The diff command failed. Please make sure that diff(1) is installed and in "
"your PATH."
msgstr "diff 命令失败。请确定安装了 diff(1),并且该命令在您的路径中。"
-#: dialogs/katedialogs.cpp:1376 swapfile/kateswapdiffcreator.cpp:139
+#: dialogs/katedialogs.cpp:1454 swapfile/kateswapdiffcreator.cpp:139
msgid "Error Creating Diff"
msgstr "创建 diff 失败"
-#: dialogs/katedialogs.cpp:1385 swapfile/kateswapdiffcreator.cpp:147
+#: dialogs/katedialogs.cpp:1463 swapfile/kateswapdiffcreator.cpp:147
msgid "The files are identical."
msgstr "文件是相同的。"
-#: dialogs/katedialogs.cpp:1386 dialogs/katedialogs.cpp:1390
+#: dialogs/katedialogs.cpp:1464 dialogs/katedialogs.cpp:1468
#: swapfile/kateswapdiffcreator.cpp:148
msgid "Diff Output"
msgstr "diff 输出"
-#: dialogs/katedialogs.cpp:1389
+#: dialogs/katedialogs.cpp:1467
#, fuzzy
#| msgid "Besides white space changes, the files are identical."
msgid "Ignoring amount of white space changed, the files are identical."
msgstr "除了空白符变化之外,文件是一样的"
-#: dialogs/katedialogs.cpp:1414
+#: dialogs/katedialogs.cpp:1492
msgid ""
"Ignoring means that you will not be warned again (unless the disk file "
"changes once more): if you save the document, you will overwrite the file on "
@@ -1277,7 +1289,7 @@
"文档,您将会覆盖磁盘上的文件;如果您不保存的话,那么磁盘上的文件(如果存在)就"
"会保持现状。"
-#: dialogs/katedialogs.cpp:1418
+#: dialogs/katedialogs.cpp:1496
msgid "You Are on Your Own"
msgstr "请小心操作"
@@ -1361,7 +1373,7 @@
msgstr "文本选择模式:"
#. i18n: ectx: property (text), item, widget (QComboBox, cbTextSelectionMode)
-#: dialogs/navigationconfigwidget.ui:103
+#: dialogs/navigationconfigwidget.ui:103 view/kateview.cpp:1170
msgid "Normal"
msgstr "正常"
@@ -1788,7 +1800,7 @@
msgid "The file %1 does not exist."
msgstr "文件是相同的。"
-#: document/katedocument.cpp:2058
+#: document/katedocument.cpp:2046
#, kde-format
msgid ""
"The file %1 could not be loaded, as it was not possible to read from it.
请检查您是否有该文件的读权限。"
-#: document/katedocument.cpp:2061
+#: document/katedocument.cpp:2049
msgctxt "translators: you can also translate 'Try Again' with 'Reload'"
msgid "Try Again"
msgstr ""
-#: document/katedocument.cpp:2064 document/katedocument.cpp:5663
+#: document/katedocument.cpp:2052 document/katedocument.cpp:5651
msgid "&Close"
msgstr "关闭(&C)"
-#: document/katedocument.cpp:2065 document/katedocument.cpp:5664
+#: document/katedocument.cpp:2053 document/katedocument.cpp:5652
msgid "Close message"
msgstr "关闭消息"
-#: document/katedocument.cpp:2076
+#: document/katedocument.cpp:2064
#, kde-format
msgid ""
"The file %1 could not be loaded, as it was not possible to read from it.\n"
@@ -1820,7 +1832,7 @@
"\n"
"请检查您是否有该文件的读权限。"
-#: document/katedocument.cpp:2196
+#: document/katedocument.cpp:2184
#, kde-format
msgid ""
"The file %1 was opened with %2 encoding but contained invalid characters."
@@ -1832,7 +1844,7 @@
"式,因为保存也许会破坏它的内容。
选用正确的编码方式重新打开这个文件,或"
"者在菜单中重新启用读写模式,都可以对它进行编辑。"
-#: document/katedocument.cpp:2206
+#: document/katedocument.cpp:2194
#, kde-format
msgid ""
"The file %1 was opened with %2 encoding but contained invalid characters. It "
@@ -1844,7 +1856,7 @@
"为保存也许会破坏它的内容。选用正确的编码方式重新打开这个文件,或者在菜单中重"
"新启用读写模式,都可以对它进行编辑。"
-#: document/katedocument.cpp:2217
+#: document/katedocument.cpp:2205
#, fuzzy, kde-format
#| msgid ""
#| "The file %1 was opened and contained lines longer than the configured "
@@ -1859,17 +1871,17 @@
"文件 %1 已打开,并且包含了过长的行(超过 %2 个字符)。
过长的行已折行并且"
"文档设置为只读模式,保存时将会修改它的内容。"
-#: document/katedocument.cpp:2222
+#: document/katedocument.cpp:2210
msgid "Temporarily raise limit and reload file"
msgstr ""
-#: document/katedocument.cpp:2225
+#: document/katedocument.cpp:2213
#, fuzzy
#| msgid "&Close"
msgid "Close"
msgstr "关闭(&C)"
-#: document/katedocument.cpp:2231
+#: document/katedocument.cpp:2219
#, fuzzy, kde-format
#| msgid ""
#| "The file %1 was opened and contained lines longer than the configured "
@@ -1884,22 +1896,22 @@
"文件 %1 已打开,并且包含了过长的行(超过 %2 个字符)。
过长的行已折行并且"
"文档设置为只读模式,保存时将会修改它的内容。"
-#: document/katedocument.cpp:2253
+#: document/katedocument.cpp:2241
msgid ""
"Do you really want to save this unmodified file? You could overwrite changed "
"data in the file on disk."
msgstr "您真的想要保存此未修改的文件吗?您将会覆盖该文件在磁盘上被更改的数据。"
-#: document/katedocument.cpp:2253
+#: document/katedocument.cpp:2241
msgid "Trying to Save Unmodified File"
msgstr "试图保存未修改的文件"
-#: document/katedocument.cpp:2253 document/katedocument.cpp:2258
-#: document/katedocument.cpp:2270
+#: document/katedocument.cpp:2241 document/katedocument.cpp:2246
+#: document/katedocument.cpp:2258
msgid "Save Nevertheless"
msgstr "仍然保存"
-#: document/katedocument.cpp:2258
+#: document/katedocument.cpp:2246
msgid ""
"Do you really want to save this file? Both your open file and the file on "
"disk were changed. There could be some data lost."
@@ -1907,12 +1919,12 @@
"您真的想要保存此文件吗?您打开的文件和磁盘上的文件都已更改。有些数据可能丢"
"失。"
-#: document/katedocument.cpp:2258 document/katedocument.cpp:2270
-#: document/katedocument.cpp:2512
+#: document/katedocument.cpp:2246 document/katedocument.cpp:2258
+#: document/katedocument.cpp:2500
msgid "Possible Data Loss"
msgstr "数据可能丢失"
-#: document/katedocument.cpp:2270
+#: document/katedocument.cpp:2258
msgid ""
"The selected encoding cannot encode every unicode character in this "
"document. Do you really want to save it? There could be some data lost."
@@ -1920,7 +1932,7 @@
"所选的编码格式无法对此文档中所含的全部 Unicode 字符编码。您真的想要保存吗?这"
"样可能造成数据丢失。"
-#: document/katedocument.cpp:2337
+#: document/katedocument.cpp:2325
#, kde-format
msgid ""
"For file %1 no backup copy could be created before saving. If an error "
@@ -1932,15 +1944,15 @@
"会丢失这个文件的数据。一个可能的原因是,您要写入的介质已经满了,或者这个文件"
"所在的目录对于您是只读的。"
-#: document/katedocument.cpp:2340
+#: document/katedocument.cpp:2328
msgid "Failed to create backup copy."
msgstr "创建备份副本失败。"
-#: document/katedocument.cpp:2341
+#: document/katedocument.cpp:2329
msgid "Try to Save Nevertheless"
msgstr "仍然尝试保存"
-#: document/katedocument.cpp:2380 document/katedocument.cpp:4062
+#: document/katedocument.cpp:2368 document/katedocument.cpp:4050
#, kde-format
msgid ""
"The document could not be saved, as it was not possible to write to %1.\n"
@@ -1952,38 +1964,38 @@
"\n"
"请检查您是否有此文件的写权限,或者磁盘空间是否充足。"
-#: document/katedocument.cpp:2511
+#: document/katedocument.cpp:2499
msgid "Do you really want to continue to close this file? Data loss may occur."
msgstr "您真的想要继续关闭此文件吗?数据可能丢失。"
-#: document/katedocument.cpp:2512
+#: document/katedocument.cpp:2500
msgid "Close Nevertheless"
msgstr "仍然关闭"
-#: document/katedocument.cpp:3829
+#: document/katedocument.cpp:3817
msgid "Untitled"
msgstr "无标题"
-#: document/katedocument.cpp:3865 document/katedocument.cpp:4030
-#: document/katedocument.cpp:4684
+#: document/katedocument.cpp:3853 document/katedocument.cpp:4018
+#: document/katedocument.cpp:4672
msgid "Save File"
msgstr "保存文件"
-#: document/katedocument.cpp:3872
+#: document/katedocument.cpp:3860
msgid "Save failed"
msgstr "保存失败"
-#: document/katedocument.cpp:3938
+#: document/katedocument.cpp:3926
msgid "File Was Changed on Disk"
msgstr "文件已在磁盘上更改"
-#: document/katedocument.cpp:4046
+#: document/katedocument.cpp:4034
#, fuzzy
#| msgid "Save File"
msgid "Save Copy of File"
msgstr "保存文件"
-#: document/katedocument.cpp:4277
+#: document/katedocument.cpp:4265
msgid ""
"Using deprecated modeline 'remove-trailing-space'. Please replace with "
"'remove-trailing-spaces modified;', see http://docs.kde.org/stable/en/kde-"
@@ -1993,7 +2005,7 @@
"spaces modified;” 替代,见 http://docs.kde.org/stable/en/kde-baseapps/kate/"
"config-variables.html#variable-remove-trailing-spaces"
-#: document/katedocument.cpp:4282
+#: document/katedocument.cpp:4270
msgid ""
"Using deprecated modeline 'replace-trailing-space-save'. Please replace with "
"'remove-trailing-spaces all;', see http://docs.kde.org/stable/en/kde-"
@@ -2003,32 +2015,32 @@
"trailing-spaces all;” 替代,参见 http://docs.kde.org/stable/en/kde-baseapps/"
"kate/config-variables.html#variable-remove-trailing-spaces"
-#: document/katedocument.cpp:4559
+#: document/katedocument.cpp:4547
#, kde-format
msgid "The file '%1' was modified by another program."
msgstr "文件“%1”已经被其它程序更改。"
-#: document/katedocument.cpp:4562
+#: document/katedocument.cpp:4550
#, kde-format
msgid "The file '%1' was created by another program."
msgstr "文件“%1”已经被其它程序创建。"
-#: document/katedocument.cpp:4565
+#: document/katedocument.cpp:4553
#, kde-format
msgid "The file '%1' was deleted by another program."
msgstr "文件“%1”已经被其它程序删除。"
-#: document/katedocument.cpp:4712
+#: document/katedocument.cpp:4700
#, kde-format
msgid ""
"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
msgstr "已经存在同名的文件“%1”,您确定要覆盖它吗?"
-#: document/katedocument.cpp:4714
+#: document/katedocument.cpp:4702
msgid "Overwrite File?"
msgstr "覆盖文件吗?"
-#: document/katedocument.cpp:4922
+#: document/katedocument.cpp:4910
#, kde-format
msgid ""
"The document \"%1\" has been modified.\n"
@@ -2037,17 +2049,17 @@
"文档“%1”已被修改。\n"
"您想要保存还是忽略更改?"
-#: document/katedocument.cpp:4924
+#: document/katedocument.cpp:4912
msgid "Close Document"
msgstr "关闭文档"
-#: document/katedocument.cpp:5057
+#: document/katedocument.cpp:5045
#, fuzzy, kde-format
#| msgid "The file %1 is still loading."
msgid "The file %2 is still loading."
msgstr "文件 %1 仍在载入中。"
-#: document/katedocument.cpp:5064
+#: document/katedocument.cpp:5052
msgid "&Abort Loading"
msgstr ""
@@ -2085,6 +2097,10 @@
msgid "Select Mime Types"
msgstr "选择 MIME 类型"
+#: mode/katemodeconfigpage.cpp:307
+msgid "Modes && Filetypes"
+msgstr "模式和文件类型"
+
#: printing/printconfigwidgets.cpp:49
msgid "Te&xt Settings"
msgstr "文本设置(&X)"
@@ -2747,6 +2763,14 @@
"
"
msgstr "模式 %1 已存在。
请选择不同的模式名。
"
+#: schema/kateschemaconfig.cpp:1376
+msgid "Fonts & Colors"
+msgstr "字体和颜色"
+
+#: schema/kateschemaconfig.cpp:1381
+msgid "Font & Color Schemas"
+msgstr "字体和配色方案"
+
#: schema/katestyletreewidget.cpp:137
msgctxt "@title:column Meaning of text in editor"
msgid "Context"
@@ -3045,10 +3069,6 @@
msgid "Expand Quick Coding Abbreviation"
msgstr "展开缩写"
-#: script/data/commands/utils.js:330 utils/kateglobal.cpp:373
-msgid "Editing"
-msgstr "编辑"
-
#: script/data/commands/utils.js:333
msgid "Sort Selected Text"
msgstr "排序选中的文本"
@@ -6203,6 +6223,10 @@
msgid "Erlend Hamberg"
msgstr "Erlend Hamberg"
+#: utils/kateglobal.cpp:103 vimode/kateviinputmodeconfigtab.cpp:235
+msgid "Vi Input Mode"
+msgstr "Vi 输入模式"
+
#: utils/kateglobal.cpp:104
msgid "Bernhard Beschow"
msgstr "Beschow Beschow"
@@ -6472,34 +6496,10 @@
msgid "Your emails"
msgstr "kde-china@kde.org"
-#: utils/kateglobal.cpp:293
+#: utils/kateglobal.cpp:252
msgid "Configure"
msgstr "配置"
-#: utils/kateglobal.cpp:367 utils/kateglobal.cpp:389
-msgid "Appearance"
-msgstr "外观"
-
-#: utils/kateglobal.cpp:370
-msgid "Fonts & Colors"
-msgstr "字体和颜色"
-
-#: utils/kateglobal.cpp:376
-msgid "Open/Save"
-msgstr "打开/保存"
-
-#: utils/kateglobal.cpp:392
-msgid "Font & Color Schemas"
-msgstr "字体和配色方案"
-
-#: utils/kateglobal.cpp:395
-msgid "Editing Options"
-msgstr "编辑选项"
-
-#: utils/kateglobal.cpp:398
-msgid "File Opening & Saving"
-msgstr "文件打开和保存"
-
#: utils/katesedcmd.cpp:273
#, fuzzy, kde-format
#| msgid "Text to replace with"
@@ -7410,177 +7410,177 @@
"information into a HTML document."
msgstr ""
-#: view/kateview.cpp:717
+#: view/kateview.cpp:714
msgid "Move Word Left"
msgstr "整词左移"
-#: view/kateview.cpp:723
+#: view/kateview.cpp:720
msgid "Select Character Left"
msgstr "选择左边字符"
-#: view/kateview.cpp:729
+#: view/kateview.cpp:726
msgid "Select Word Left"
msgstr "选择左边整词"
-#: view/kateview.cpp:735
+#: view/kateview.cpp:732
msgid "Move Word Right"
msgstr "整词右移"
-#: view/kateview.cpp:741
+#: view/kateview.cpp:738
msgid "Select Character Right"
msgstr "选择右边字符"
-#: view/kateview.cpp:747
+#: view/kateview.cpp:744
msgid "Select Word Right"
msgstr "选择右边整词"
-#: view/kateview.cpp:753
+#: view/kateview.cpp:750
msgid "Move to Beginning of Line"
msgstr "移到行首"
-#: view/kateview.cpp:759
+#: view/kateview.cpp:756
msgid "Move to Beginning of Document"
msgstr "移到文档开头"
-#: view/kateview.cpp:765
+#: view/kateview.cpp:762
msgid "Select to Beginning of Line"
msgstr "选择到行首"
-#: view/kateview.cpp:771
+#: view/kateview.cpp:768
msgid "Select to Beginning of Document"
msgstr "选择到文档开头"
-#: view/kateview.cpp:777
+#: view/kateview.cpp:774
msgid "Move to End of Line"
msgstr "移到行尾"
-#: view/kateview.cpp:783
+#: view/kateview.cpp:780
msgid "Move to End of Document"
msgstr "移到文档末尾"
-#: view/kateview.cpp:789
+#: view/kateview.cpp:786
msgid "Select to End of Line"
msgstr "选择到行尾"
-#: view/kateview.cpp:795
+#: view/kateview.cpp:792
msgid "Select to End of Document"
msgstr "选择到文档末尾"
-#: view/kateview.cpp:801
+#: view/kateview.cpp:798
msgid "Select to Previous Line"
msgstr "选择到前一行"
-#: view/kateview.cpp:807
+#: view/kateview.cpp:804
msgid "Scroll Line Up"
msgstr "向上滚动一行"
-#: view/kateview.cpp:813
+#: view/kateview.cpp:810
msgid "Move to Next Line"
msgstr "选择到下一行"
-#: view/kateview.cpp:819
+#: view/kateview.cpp:816
msgid "Move to Previous Line"
msgstr "选择到前一行"
-#: view/kateview.cpp:825
+#: view/kateview.cpp:822
msgid "Move Cursor Right"
msgstr "光标右移"
-#: view/kateview.cpp:831
+#: view/kateview.cpp:828
msgid "Move Cursor Left"
msgstr "光标左移"
-#: view/kateview.cpp:837
+#: view/kateview.cpp:834
msgid "Select to Next Line"
msgstr "选择到下一行"
-#: view/kateview.cpp:843
+#: view/kateview.cpp:840
msgid "Scroll Line Down"
msgstr "向下滚动一行"
-#: view/kateview.cpp:849
+#: view/kateview.cpp:846
msgid "Scroll Page Up"
msgstr "向上滚动一页"
-#: view/kateview.cpp:855
+#: view/kateview.cpp:852
msgid "Select Page Up"
msgstr "向上选择一页"
-#: view/kateview.cpp:861
+#: view/kateview.cpp:858
msgid "Move to Top of View"
msgstr "移到视图顶部"
-#: view/kateview.cpp:867
+#: view/kateview.cpp:864
msgid "Select to Top of View"
msgstr "选择到视图顶部"
-#: view/kateview.cpp:873
+#: view/kateview.cpp:870
msgid "Scroll Page Down"
msgstr "向下滚动一页"
-#: view/kateview.cpp:879
+#: view/kateview.cpp:876
msgid "Select Page Down"
msgstr "向下选择一页"
-#: view/kateview.cpp:885
+#: view/kateview.cpp:882
msgid "Move to Bottom of View"
msgstr "移到视图底部"
-#: view/kateview.cpp:891
+#: view/kateview.cpp:888
msgid "Select to Bottom of View"
msgstr "选择到视图底部"
-#: view/kateview.cpp:897
+#: view/kateview.cpp:894
msgid "Move to Matching Bracket"
msgstr "移到匹配的括号"
-#: view/kateview.cpp:903
+#: view/kateview.cpp:900
msgid "Select to Matching Bracket"
msgstr "选择到匹配的括号"
-#: view/kateview.cpp:911
+#: view/kateview.cpp:908
msgid "Transpose Characters"
msgstr "左右交换字符"
-#: view/kateview.cpp:917
+#: view/kateview.cpp:914
msgid "Delete Line"
msgstr "删除一行"
-#: view/kateview.cpp:923
+#: view/kateview.cpp:920
msgid "Delete Word Left"
msgstr "删除左边整词"
-#: view/kateview.cpp:929
+#: view/kateview.cpp:926
msgid "Delete Word Right"
msgstr "删除右边整词"
-#: view/kateview.cpp:935
+#: view/kateview.cpp:932
msgid "Delete Next Character"
msgstr "删除下个字符"
-#: view/kateview.cpp:941
+#: view/kateview.cpp:938
msgid "Backspace"
msgstr "Backspace"
-#: view/kateview.cpp:950
+#: view/kateview.cpp:947
msgid "Insert Tab"
msgstr "插入制表符"
-#: view/kateview.cpp:955
+#: view/kateview.cpp:952
msgid "Insert Smart Newline"
msgstr "智能插入新行"
-#: view/kateview.cpp:956
+#: view/kateview.cpp:953
msgid ""
"Insert newline including leading characters of the current line which are "
"not letters or numbers."
msgstr "插入新行,并自动加入当前行中开头的非字母或数字文字。"
-#: view/kateview.cpp:966
+#: view/kateview.cpp:963
msgid "&Indent"
msgstr "增加缩进(&I)"
-#: view/kateview.cpp:967
+#: view/kateview.cpp:964
msgid ""
"Use this to indent a selected block of text.
You can configure "
"whether tabs should be honored and used or replaced with spaces, in the "
@@ -7589,45 +7589,49 @@
"使用此命令对选中的一块文字增加缩进。
在配置对话框中,您可以配置是"
"否使用制表符还是使用空格来进行缩进。"
-#: view/kateview.cpp:974
+#: view/kateview.cpp:971
msgid "&Unindent"
msgstr "减少缩进(&U)"
-#: view/kateview.cpp:975
+#: view/kateview.cpp:972
msgid "Use this to unindent a selected block of text."
msgstr "使用此命令对选中的一块文字减少缩进。"
-#: view/kateview.cpp:995
+#: view/kateview.cpp:992
msgid "Fold Toplevel Nodes"
msgstr "折叠顶层节点"
-#: view/kateview.cpp:1013
+#: view/kateview.cpp:1010
msgid "Fold Current Node"
msgstr "折叠当前节点"
-#: view/kateview.cpp:1017
+#: view/kateview.cpp:1014
msgid "Unfold Current Node"
msgstr "展开当前节点"
-#: view/kateview.cpp:1122
+#: view/kateview.cpp:1119
msgid "OVERWRITE"
msgstr ""
-#: view/kateview.cpp:1122
+#: view/kateview.cpp:1119
msgid "INSERT"
msgstr ""
-#: view/kateview.cpp:1135
+#: view/kateview.cpp:1132
#, fuzzy
#| msgid "E&ncoding"
msgid "recording"
msgstr "编码(&E)"
-#: view/kateview.cpp:1157
+#: view/kateview.cpp:1154
#, kde-format
msgid "(R/O) %1"
msgstr ""
+#: view/kateview.cpp:1170
+msgid "vi-mode"
+msgstr ""
+
#: view/kateviewhelpers.cpp:197 view/kateviewhelpers.cpp:244
#: view/kateviewhelpers.cpp:699
#, fuzzy, kde-format
@@ -7669,21 +7673,21 @@
"code>
要获得可用命令的列表,请输入 help list
要"
"获得关于单个命令的帮助,请输入 help <命令>
"
-#: view/kateviewhelpers.cpp:981 vimode/kateviemulatedcommandbar.cpp:1152
+#: view/kateviewhelpers.cpp:981 vimode/kateviemulatedcommandbar.cpp:1159
#, kde-format
msgid "Error: No range allowed for command \"%1\"."
msgstr "错误:没有命令“%1”允许的操作范围。"
-#: view/kateviewhelpers.cpp:996 vimode/kateviemulatedcommandbar.cpp:1160
+#: view/kateviewhelpers.cpp:996 vimode/kateviemulatedcommandbar.cpp:1167
msgid "Success: "
msgstr "成功:"
-#: view/kateviewhelpers.cpp:1010 vimode/kateviemulatedcommandbar.cpp:1169
+#: view/kateviewhelpers.cpp:1010 vimode/kateviemulatedcommandbar.cpp:1176
#, kde-format
msgid "Command \"%1\" failed."
msgstr "命令“%1”失败。"
-#: view/kateviewhelpers.cpp:1014 vimode/kateviemulatedcommandbar.cpp:1173
+#: view/kateviewhelpers.cpp:1014 vimode/kateviemulatedcommandbar.cpp:1180
#, kde-format
msgid "No such command: \"%1\""
msgstr "没有这样的命令:“%1”"
@@ -7697,7 +7701,7 @@
msgid "Set Default Mark Type"
msgstr "设定默认标记类型"
-#: view/kateviewhelpers.cpp:2125
+#: view/kateviewhelpers.cpp:2122
msgid "Disable Annotation Bar"
msgstr "禁用批注栏"
@@ -7904,62 +7908,62 @@
"文档写入磁盘
wa — 将所有文档写入磁盘。如果文件未"
"命名,将会显示文件对话框。
"
-#: vimode/kateviinputmodeconfigtab.cpp:209
+#: vimode/kateviinputmodeconfigtab.cpp:211
msgid "Unable to open the config file for reading."
msgstr "无法打开配置文件进行读取。"
-#: vimode/kateviinputmodeconfigtab.cpp:209
+#: vimode/kateviinputmodeconfigtab.cpp:211
msgid "Unable to open file"
msgstr "无法打开文件"
-#: vimode/kateviinputmodemanager.cpp:759
+#: vimode/kateviinputmodemanager.cpp:778
#, fuzzy, kde-format
#| msgid "Mark not set: %1"
msgid "Mark set: %1"
msgstr "标记未设置:%1"
-#: vimode/kateviinputmodemanager.cpp:801
+#: vimode/kateviinputmodemanager.cpp:820
#, fuzzy
#| msgid "Go to the next bookmark."
msgid "There are no more chars for the next bookmark."
msgstr "转到下一个书签。"
-#: vimode/kateviinputmodemanager.cpp:869
+#: vimode/kateviinputmodemanager.cpp:888
msgid "VI: INSERT MODE"
msgstr "VI:插入模式"
-#: vimode/kateviinputmodemanager.cpp:872
+#: vimode/kateviinputmodemanager.cpp:891
msgid "VI: NORMAL MODE"
msgstr "VI:普通模式"
-#: vimode/kateviinputmodemanager.cpp:875
+#: vimode/kateviinputmodemanager.cpp:894
msgid "VI: VISUAL"
msgstr "VI:可视模式"
-#: vimode/kateviinputmodemanager.cpp:878
+#: vimode/kateviinputmodemanager.cpp:897
msgid "VI: VISUAL BLOCK"
msgstr "VI:可视区块"
-#: vimode/kateviinputmodemanager.cpp:881
+#: vimode/kateviinputmodemanager.cpp:900
msgid "VI: VISUAL LINE"
msgstr "VI:可视行"
-#: vimode/kateviinputmodemanager.cpp:884
+#: vimode/kateviinputmodemanager.cpp:903
msgid "VI: REPLACE"
msgstr "VI:替换"
#: vimode/kateviinsertmode.cpp:268 vimode/katevimodebase.cpp:946
-#: vimode/katevinormalmode.cpp:3741
+#: vimode/katevinormalmode.cpp:3750
#, kde-format
msgid "Nothing in register %1"
msgstr "未能注册于 %1"
-#: vimode/katevinormalmode.cpp:1620
+#: vimode/katevinormalmode.cpp:1629
#, kde-format
msgid "'%1' %2, Hex %3, Octal %4"
msgstr "“%1” %2,十六进制 %3,八进制 %4"
-#: vimode/katevinormalmode.cpp:2455
+#: vimode/katevinormalmode.cpp:2464
#, kde-format
msgid "Mark not set: %1"
msgstr "标记未设置:%1"
diff -Nru kde-l10n-zhcn-4.12.90/messages/frameworks/solid_qt.po kde-l10n-zhcn-4.12.95/messages/frameworks/solid_qt.po
--- kde-l10n-zhcn-4.12.90/messages/frameworks/solid_qt.po 2014-01-25 21:41:22.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/frameworks/solid_qt.po 2014-03-17 03:50:16.000000000 +0000
@@ -5,13 +5,14 @@
# Lie Ex , 2010.
# Weng Xuetian , 2012, 2013.
# FengChao , 2012.
+# Feng Chao , 2014.
msgid ""
msgstr ""
"Project-Id-Version: solid_qt\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-01-24 18:50+0000\n"
-"PO-Revision-Date: 2013-07-05 22:37-0400\n"
-"Last-Translator: Weng Xuetian \n"
+"PO-Revision-Date: 2014-03-16 16:07+0800\n"
+"Last-Translator: Feng Chao \n"
"Language-Team: Chinese Simplified \n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
@@ -501,43 +502,36 @@
msgstr "存储设备"
#: backends/udisks2/udisksdevice.cpp:63
-#, fuzzy, qt-format
-#| msgid "%1 TiB"
+#, qt-format
msgctxt "udisksdevice"
msgid "%1 TiB"
msgstr "%1 TiB"
#: backends/udisks2/udisksdevice.cpp:65
-#, fuzzy, qt-format
-#| msgid "%1 GiB"
+#, qt-format
msgctxt "udisksdevice"
msgid "%1 GiB"
msgstr "%1 GiB"
#: backends/udisks2/udisksdevice.cpp:71
-#, fuzzy, qt-format
-#| msgid "%1 MiB"
+#, qt-format
msgctxt "udisksdevice"
msgid "%1 MiB"
msgstr "%1 MiB"
#: backends/udisks2/udisksdevice.cpp:76
-#, fuzzy, qt-format
-#| msgid "%1 KiB"
+#, qt-format
msgctxt "udisksdevice"
msgid "%1 KiB"
msgstr "%1 KiB"
#: backends/udisks2/udisksdevice.cpp:80
-#, fuzzy, qt-format
-#| msgid "%1 B"
+#, qt-format
msgctxt "udisksdevice"
msgid "%1 B"
msgstr "%1 B"
#: backends/udisks2/udisksdevice.cpp:84
-#, fuzzy
-#| msgid "0 B"
msgctxt "udisksdevice"
msgid "0 B"
msgstr "0 B"
@@ -557,107 +551,62 @@
msgstr "%1 加密设备"
#: backends/udisks2/udisksdevice.cpp:560
-#, fuzzy
-#| msgctxt ""
-#| msgid "Encrypted Drive"
msgid "Encrypted Drive"
msgstr "加密设备"
#: backends/udisks2/udisksdevice.cpp:712
-#, fuzzy
-#| msgctxt ""
-#| msgid "You are not authorized to perform this operation"
msgid "You are not authorized to perform this operation"
msgstr "您未被授权进行此操作"
#: backends/udisks2/udisksdevice.cpp:714
-#, fuzzy
-#| msgctxt ""
-#| msgid "The device is currently busy"
msgid "The device is currently busy"
msgstr "设备正忙"
#: backends/udisks2/udisksdevice.cpp:716
-#, fuzzy
-#| msgctxt ""
-#| msgid "The requested operation has failed"
msgid "The requested operation has failed"
msgstr "请求的操作已失败"
#: backends/udisks2/udisksdevice.cpp:718
-#, fuzzy
-#| msgctxt ""
-#| msgid "The requested operation has been canceled"
msgid "The requested operation has been canceled"
msgstr "请求的操作已取消"
#: backends/udisks2/udisksdevice.cpp:720
-#, fuzzy
-#| msgctxt ""
-#| msgid "An invalid or malformed option has been given"
msgid "An invalid or malformed option has been given"
msgstr "给定了无效或不正确的选项"
#: backends/udisks2/udisksdevice.cpp:722
-#, fuzzy
-#| msgctxt ""
-#| msgid "The kernel driver for this filesystem type is not available"
msgid "The kernel driver for this filesystem type is not available"
msgstr "此文件系统类型的内核驱动不可用"
#: backends/udisks2/udisksdevice.cpp:724
-#, fuzzy
-#| msgctxt ""
-#| msgid "The device is already mounted"
msgid "The device is already mounted"
msgstr "设备已挂载"
#: backends/udisks2/udisksdevice.cpp:726
-#, fuzzy
-#| msgctxt ""
-#| msgid "The device is not mounted"
msgid "The device is not mounted"
msgstr "设备未挂载"
#: backends/udisks2/udisksdevice.cpp:728
-#, fuzzy
-#| msgctxt ""
-#| msgid "The device is mounted by another user"
msgid "The device is mounted by another user"
msgstr "设备被其他用户挂载"
#: backends/udisks2/udisksdevice.cpp:730
-#, fuzzy
-#| msgctxt ""
-#| msgid "The device is already unmounting"
msgid "The device is already unmounting"
msgstr "设备正在卸载"
#: backends/udisks2/udisksdevice.cpp:732
-#, fuzzy
-#| msgctxt ""
-#| msgid "The operation timed out"
msgid "The operation timed out"
msgstr "操作已超时"
#: backends/udisks2/udisksdevice.cpp:734
-#, fuzzy
-#| msgctxt ""
-#| msgid "The operation would wake up a disk that is in a deep-sleep state"
msgid "The operation would wake up a disk that is in a deep-sleep state"
msgstr "操作会将磁盘从深度休眠中唤醒"
#: backends/udisks2/udisksdevice.cpp:736
-#, fuzzy
-#| msgctxt ""
-#| msgid "The operation has already been canceled"
msgid "The operation has already been canceled"
msgstr "请求的操作已取消"
#: backends/udisks2/udisksdevice.cpp:738
-#, fuzzy
-#| msgctxt ""
-#| msgid "An unspecified error has occurred"
msgid "An unspecified error has occurred"
msgstr "发生未预期的错误"
@@ -841,14 +790,12 @@
#: deviceinterface.cpp:110
msgctxt "A keyboard"
msgid "Keyboard"
-msgstr ""
+msgstr "键盘"
#: deviceinterface.cpp:112
-#, fuzzy
-#| msgid "UPnP Devices"
msgctxt "A pointing device"
msgid "PointingDevice"
-msgstr "UPnP 设备"
+msgstr "指针设备"
#~ msgctxt ""
#~ msgid "%1 TiB"
diff -Nru kde-l10n-zhcn-4.12.90/messages/frameworks/xml_mimetypes.po kde-l10n-zhcn-4.12.95/messages/frameworks/xml_mimetypes.po
--- kde-l10n-zhcn-4.12.90/messages/frameworks/xml_mimetypes.po 2014-02-26 03:45:38.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/frameworks/xml_mimetypes.po 2014-03-17 03:50:16.000000000 +0000
@@ -4,20 +4,21 @@
#
# Ni Hui , 2009, 2011.
# Lie Ex , 2009-2010.
+# Feng Chao , 2014.
msgid ""
msgstr ""
"Project-Id-Version: xml_mimetypes\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2014-02-26 01:37+0000\n"
-"PO-Revision-Date: 2011-10-01 11:09+0800\n"
-"Last-Translator: Ni Hui \n"
+"PO-Revision-Date: 2014-03-16 16:07+0800\n"
+"Last-Translator: Feng Chao \n"
"Language-Team: Chinese Simplified \n"
-"Language: \n"
+"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Lokalize 1.2\n"
+"X-Generator: Lokalize 1.5\n"
#: kde5.xml.podir/kde5.xml.in.h:1
msgid "Metalink download"
@@ -296,10 +297,8 @@
msgstr "Mobipocket 电子书"
#: kde5.xml.podir/kde5.xml.in.h:82
-#, fuzzy
-#| msgid "HDR image"
msgid "WebP image"
-msgstr "HDR 图像"
+msgstr "WebP 图像"
#~ msgid "shortcut to Kexi project on database server"
#~ msgstr "Kexi 数据库服务器项目的快捷方式"
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdeaccessibility/jovie.po kde-l10n-zhcn-4.12.95/messages/kdeaccessibility/jovie.po
--- kde-l10n-zhcn-4.12.90/messages/kdeaccessibility/jovie.po 2013-10-30 03:18:44.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdeaccessibility/jovie.po 2014-03-17 03:50:16.000000000 +0000
@@ -4,20 +4,21 @@
# Zhang Zhongli , 2005.
# Ni Hui , 2008, 2010.
# Lie_Ex , 2007-2010.
+# Feng Chao , 2014.
msgid ""
msgstr ""
"Project-Id-Version: kttsd\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2013-10-30 01:33+0000\n"
-"PO-Revision-Date: 2010-11-10 14:03+0800\n"
-"Last-Translator: Ni Hui \n"
+"PO-Revision-Date: 2014-03-16 19:42+0800\n"
+"Last-Translator: Feng Chao \n"
"Language-Team: Chinese Simplified \n"
-"Language: \n"
+"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Lokalize 1.1\n"
+"X-Generator: Lokalize 1.5\n"
msgctxt "NAME OF TRANSLATORS"
msgid "Your names"
@@ -722,7 +723,7 @@
#: jovie/main.cpp:49
msgid "Simion Ploscariu"
-msgstr ""
+msgstr "Simion Ploscariu"
#: jovie/main.cpp:50
msgid "Jorge Luis Arzola"
@@ -996,10 +997,8 @@
#. i18n: ectx: property (text), widget (QTableWidget, AvailableTalkersTable)
#: kcmkttsmgr/talkerwidget.ui:78
-#, fuzzy
-#| msgid "Voice Type"
msgid "Voice Name"
-msgstr "语音类型"
+msgstr "语音名"
#. i18n: ectx: property (text), widget (QLabel, label_2)
#: kcmkttsmgr/talkerwidget.ui:86
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdeedu/kanagram.po kde-l10n-zhcn-4.12.95/messages/kdeedu/kanagram.po
--- kde-l10n-zhcn-4.12.90/messages/kdeedu/kanagram.po 2014-03-04 05:00:25.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdeedu/kanagram.po 2014-03-19 06:15:59.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: kanagram\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2014-03-04 01:54+0000\n"
+"POT-Creation-Date: 2014-03-19 04:11+0000\n"
"PO-Revision-Date: 2011-11-06 08:41+0800\n"
"Last-Translator: FengChao \n"
"Language-Team: Chinese Simplified \n"
@@ -94,7 +94,7 @@
msgid "Shortcuts"
msgstr "快捷键"
-#: kanagram.cpp:1032
+#: kanagram.cpp:1033
#, kde-format
msgid ""
"File %1 cannot be found.\n"
@@ -103,7 +103,7 @@
"%1 文件没有找到。\n"
"请确保 Kanagram 已被正确安装。"
-#: kanagram.cpp:1033
+#: kanagram.cpp:1034
msgid "Error"
msgstr "错误"
@@ -336,6 +336,16 @@
msgid "Use sou&nds"
msgstr "使用声音(&N)"
+#. i18n: ectx: property (whatsThis), widget (QCheckBox, kcfg_uppercaseOnly)
+#: mainsettingswidget.ui:139
+msgid "Use Uppercase."
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_uppercaseOnly)
+#: mainsettingswidget.ui:142
+msgid "Use only uppercase letters"
+msgstr ""
+
#: vocabedit.cpp:110
msgid "Would you like to save your changes?"
msgstr "您是否想要保存您所作的改变?"
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdeedu/kstars.po kde-l10n-zhcn-4.12.95/messages/kdeedu/kstars.po
--- kde-l10n-zhcn-4.12.90/messages/kdeedu/kstars.po 2014-02-21 04:01:56.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdeedu/kstars.po 2014-03-15 03:21:58.000000000 +0000
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: kstars\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2014-02-21 01:49+0000\n"
+"POT-Creation-Date: 2014-03-15 01:33+0000\n"
"PO-Revision-Date: 2010-12-22 19:42+0800\n"
"Last-Translator: Sami Zhan \n"
"Language-Team: Chinese Simplified \n"
@@ -4592,7 +4592,7 @@
msgid "WCS header missing or corrupted. Solver failed."
msgstr ""
-#: ekos/offlineastrometryparser.cpp:258 ekos/onlineastrometryparser.cpp:391
+#: ekos/offlineastrometryparser.cpp:258 ekos/onlineastrometryparser.cpp:392
#, kde-format
msgid "Solver completed in %1 second."
msgid_plural "Solver completed in %1 seconds."
@@ -4602,80 +4602,80 @@
msgid "Error: No connection to the internet."
msgstr ""
-#: ekos/onlineastrometryparser.cpp:139
+#: ekos/onlineastrometryparser.cpp:140
#, fuzzy, kde-format
#| msgid "Could not open file %1."
msgid "Failed to open file %1. %2"
msgstr "无法打开文件 %1。"
-#: ekos/onlineastrometryparser.cpp:182
+#: ekos/onlineastrometryparser.cpp:183
#, fuzzy
#| msgid "Loading images..."
msgid "Uploading file..."
msgstr "正在装入 KStars..."
-#: ekos/onlineastrometryparser.cpp:269
+#: ekos/onlineastrometryparser.cpp:270
msgid ""
"Astrometry.net authentication failed. Check the validity of the Astrometry."
"net API Key."
msgstr ""
-#: ekos/onlineastrometryparser.cpp:277
+#: ekos/onlineastrometryparser.cpp:278
#, kde-format
msgid "Authentication to astrometry.net is successful. Session: %1"
msgstr ""
-#: ekos/onlineastrometryparser.cpp:286
+#: ekos/onlineastrometryparser.cpp:287
#, fuzzy
#| msgid "Upload"
msgid "Upload failed."
msgstr "上传"
-#: ekos/onlineastrometryparser.cpp:295
+#: ekos/onlineastrometryparser.cpp:296
msgid "Parsing submission ID failed."
msgstr ""
-#: ekos/onlineastrometryparser.cpp:300
+#: ekos/onlineastrometryparser.cpp:301
#, fuzzy
#| msgid "Use the specified configuration file"
msgid "Upload complete. Waiting for astrometry.net solver to complete..."
msgstr "使用指定的配置文件"
-#: ekos/onlineastrometryparser.cpp:321
+#: ekos/onlineastrometryparser.cpp:322
#, fuzzy
#| msgid "Failed to load image"
msgid "Failed to retrieve job ID."
msgstr "装入图像失败"
-#: ekos/onlineastrometryparser.cpp:344
+#: ekos/onlineastrometryparser.cpp:345
msgid "Solver timed out."
msgstr ""
-#: ekos/onlineastrometryparser.cpp:352
+#: ekos/onlineastrometryparser.cpp:353
#, kde-format
msgid "Solver failed after %1 second."
msgid_plural "Solver failed after %1 seconds."
msgstr[0] ""
-#: ekos/onlineastrometryparser.cpp:363
+#: ekos/onlineastrometryparser.cpp:364
#, fuzzy
#| msgid "Error opening file"
msgid "Error parsing parity."
msgstr "文件打开错误。"
-#: ekos/onlineastrometryparser.cpp:370
+#: ekos/onlineastrometryparser.cpp:371
#, fuzzy
#| msgid "Target position:"
msgid "Error parsing orientation."
msgstr "目的位置:"
-#: ekos/onlineastrometryparser.cpp:378
+#: ekos/onlineastrometryparser.cpp:379
#, fuzzy
#| msgid "Error opening file"
msgid "Error parsing RA."
msgstr "文件打开错误。"
-#: ekos/onlineastrometryparser.cpp:385
+#: ekos/onlineastrometryparser.cpp:386
#, fuzzy
#| msgid "Error opening file"
msgid "Error parsing DEC."
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdeedu/parley.po kde-l10n-zhcn-4.12.95/messages/kdeedu/parley.po
--- kde-l10n-zhcn-4.12.90/messages/kdeedu/parley.po 2014-03-13 04:01:06.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdeedu/parley.po 2014-03-19 06:15:59.000000000 +0000
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: parley\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2014-03-13 01:41+0000\n"
+"POT-Creation-Date: 2014-03-19 04:13+0000\n"
"PO-Revision-Date: 2014-02-22 20:42+0800\n"
"Last-Translator: Feng Chao \n"
"Language-Team: Chinese Simplified \n"
@@ -263,14 +263,14 @@
#. i18n: ectx: property (text), widget (QCheckBox, kcfg_PracticeSoundEnabled)
#: src/configure-practice/advancedpracticeoptions.ui:126
-#: src/editor/editor.cpp:334
+#: src/editor/editor.cpp:338
msgid "Sound"
msgstr "声音"
#. i18n: ectx: property (text), widget (QLabel, synonymLabel)
#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
#: src/configure-practice/advancedpracticeoptions.ui:139
-#: src/editor/editor.cpp:243 src/editor/synonymwidget.ui:16
+#: src/editor/editor.cpp:247 src/editor/synonymwidget.ui:16
msgid "Synonyms"
msgstr "同义词"
@@ -290,7 +290,7 @@
#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
#. i18n: ectx: property (text), widget (QRadioButton, multipleChoice)
#: src/configure-practice/advancedpracticeoptions.ui:165
-#: src/editor/editor.cpp:228 src/statistics/statisticsmainwindow.ui:115
+#: src/editor/editor.cpp:232 src/statistics/statisticsmainwindow.ui:115
msgid "Multiple Choice"
msgstr "多项选择"
@@ -641,12 +641,12 @@
#. i18n: ectx: property (text), widget (QPushButton, makeAdjectiveButton)
#: src/editor/comparisonwidget.ui:116 src/editor/inflectionwidget.cpp:46
-#: src/parleydocument.cpp:330 src/vocabulary/wordtypeview.cpp:106
+#: src/parleydocument.cpp:337 src/vocabulary/wordtypeview.cpp:106
msgid "Adjective"
msgstr "形容词"
#. i18n: ectx: property (text), widget (QPushButton, makeAdverbButton)
-#: src/editor/comparisonwidget.ui:123 src/parleydocument.cpp:334
+#: src/editor/comparisonwidget.ui:123 src/parleydocument.cpp:341
#: src/vocabulary/wordtypeview.cpp:114
msgid "Adverb"
msgstr "副词"
@@ -751,19 +751,19 @@
#. i18n: ectx: property (text), widget (QLabel, label_3)
#: src/editor/declensionwidget.cpp:167 src/editor/declensionwidget.ui:185
-#: src/editor/inflectionwidget.cpp:121 src/parleydocument.cpp:316
+#: src/editor/inflectionwidget.cpp:121 src/parleydocument.cpp:323
msgid "Masculine"
msgstr "阳性"
#. i18n: ectx: property (text), widget (QLabel, label_4)
#: src/editor/declensionwidget.cpp:168 src/editor/declensionwidget.ui:271
-#: src/editor/inflectionwidget.cpp:123 src/parleydocument.cpp:319
+#: src/editor/inflectionwidget.cpp:123 src/parleydocument.cpp:326
msgid "Feminine"
msgstr "阴性"
#. i18n: ectx: property (text), widget (QLabel, label_5)
#: src/editor/declensionwidget.cpp:169 src/editor/declensionwidget.ui:357
-#: src/editor/inflectionwidget.cpp:122 src/parleydocument.cpp:322
+#: src/editor/inflectionwidget.cpp:122 src/parleydocument.cpp:329
msgid "Neuter"
msgstr "中性"
@@ -819,11 +819,11 @@
msgid "Number:"
msgstr ""
-#: src/editor/editor.cpp:150
+#: src/editor/editor.cpp:154
msgid "Lessons"
msgstr "课程"
-#: src/editor/editor.cpp:160
+#: src/editor/editor.cpp:164
msgid ""
"Right click to add, delete, or rename lessons. \n"
"With the checkboxes you can select which lessons you want to practice. \n"
@@ -833,55 +833,55 @@
"您也可以在复选框加点选您要练习的课程。\n"
"只有选中的课程才会在测验中问到!"
-#: src/editor/editor.cpp:175
+#: src/editor/editor.cpp:179
msgid "Word Types"
msgstr "词性"
-#: src/editor/editor.cpp:196
+#: src/editor/editor.cpp:200
msgid "Inflection (verbs, adjectives, nouns)"
msgstr ""
-#: src/editor/editor.cpp:212
+#: src/editor/editor.cpp:216
msgid "Comparison forms"
msgstr "比较级"
-#: src/editor/editor.cpp:257
+#: src/editor/editor.cpp:261
msgid "Antonyms"
msgstr "反义词"
-#: src/editor/editor.cpp:272
+#: src/editor/editor.cpp:276
msgid "False Friends"
msgstr "易混淆词"
-#: src/editor/editor.cpp:288
+#: src/editor/editor.cpp:292
msgid "Phonetic Symbols"
msgstr "音标"
-#: src/editor/editor.cpp:303
+#: src/editor/editor.cpp:307
msgid "Image"
msgstr "图像"
-#: src/editor/editor.cpp:319
+#: src/editor/editor.cpp:323
msgid "Summary"
msgstr "摘要"
-#: src/editor/editor.cpp:350
+#: src/editor/editor.cpp:354
msgid "Internet"
msgstr "互联网"
-#: src/editor/editor.cpp:367
+#: src/editor/editor.cpp:371
msgid "LaTeX"
msgstr "LaTeX"
-#: src/editor/editor.cpp:403 src/editor/editor.cpp:404
+#: src/editor/editor.cpp:407 src/editor/editor.cpp:408
msgid "Practice"
msgstr "练习"
-#: src/editor/editor.cpp:440
+#: src/editor/editor.cpp:444
msgid "Enter search terms here"
msgstr "在此输入查找条件"
-#: src/editor/editor.cpp:444
+#: src/editor/editor.cpp:448
msgid "S&earch:"
msgstr "搜索(&E):"
@@ -992,12 +992,12 @@
msgid "&Reset Grades"
msgstr "重置等级(&R)"
-#: src/editor/inflectionwidget.cpp:36 src/parleydocument.cpp:326
+#: src/editor/inflectionwidget.cpp:36 src/parleydocument.cpp:333
#: src/vocabulary/wordtypeview.cpp:123
msgid "Verb"
msgstr "动词"
-#: src/editor/inflectionwidget.cpp:41 src/parleydocument.cpp:312
+#: src/editor/inflectionwidget.cpp:41 src/parleydocument.cpp:319
#: src/vocabulary/wordtypeview.cpp:74
msgid "Noun"
msgstr "名词"
@@ -1078,53 +1078,53 @@
msgid "Comment"
msgstr "注释"
-#: src/editor/synonymwidget.cpp:60
+#: src/editor/synonymwidget.cpp:66
msgid "Select Synonyms"
msgstr "所选同义词"
-#: src/editor/synonymwidget.cpp:66
+#: src/editor/synonymwidget.cpp:72
#, kde-format
msgid "%1 and %2 are not Synonyms"
msgstr "%1 和 %2 不是一对同义词"
-#: src/editor/synonymwidget.cpp:68
+#: src/editor/synonymwidget.cpp:74
#, kde-format
msgid "%1 and %2 are Synonyms"
msgstr "%1 和 %2 是一对同义词"
-#: src/editor/synonymwidget.cpp:73
+#: src/editor/synonymwidget.cpp:79
#, kde-format
msgid "%1 and %2 are not Antonyms"
msgstr "%1 和 %2 不是一对反义词"
-#: src/editor/synonymwidget.cpp:75
+#: src/editor/synonymwidget.cpp:81
#, kde-format
msgid "%1 and %2 are Antonyms"
msgstr "%1 和 %2 是一对反义词"
-#: src/editor/synonymwidget.cpp:80
+#: src/editor/synonymwidget.cpp:86
#, kde-format
msgid "%1 and %2 are not False Friends"
msgstr "%1 和 %2 不是一对易混淆词"
-#: src/editor/synonymwidget.cpp:82
+#: src/editor/synonymwidget.cpp:88
#, kde-format
msgid "%1 and %2 are False Friends"
msgstr "%1 和 %2 是一对易混淆词"
-#: src/editor/synonymwidget.cpp:91
+#: src/editor/synonymwidget.cpp:97
#, kde-format
msgctxt "Title for a list of synonyms for a word"
msgid "Synonyms of %1:"
msgstr "%1 的同义词:"
-#: src/editor/synonymwidget.cpp:94
+#: src/editor/synonymwidget.cpp:100
#, kde-format
msgctxt "Title for a list of antonyms (opposites) for a word"
msgid "Antonyms of %1:"
msgstr "%1 的反义词:"
-#: src/editor/synonymwidget.cpp:97
+#: src/editor/synonymwidget.cpp:103
#, kde-format
msgctxt ""
"Title for a list of false friend (things that sound similar but have "
@@ -1152,7 +1152,7 @@
msgid "Could not write to file \"%1\""
msgstr "无法开始练习"
-#: src/export/exportdialog.cpp:110 src/parleydocument.cpp:238
+#: src/export/exportdialog.cpp:110 src/parleydocument.cpp:245
#: src/parleymainwindow.cpp:139
msgid "Untitled"
msgstr "无标题"
@@ -1473,7 +1473,7 @@
msgid "Share the current vocabulary collection with other users"
msgstr "和他人共享当前的词汇收藏库。"
-#: src/parleydocument.cpp:126 src/parleydocument.cpp:415
+#: src/parleydocument.cpp:126 src/parleydocument.cpp:422
#, kde-format
msgctxt "@title:window document properties"
msgid "Properties for %1"
@@ -1503,23 +1503,23 @@
msgid "Open Downloaded Vocabulary Collection"
msgstr "打开下载的词汇收藏库"
-#: src/parleydocument.cpp:254 src/parleydocument.cpp:304
+#: src/parleydocument.cpp:261 src/parleydocument.cpp:311
#, kde-format
msgid "Writing file \"%1\" resulted in an error: %2"
msgstr "写入“%1”时发生错误:%2"
-#: src/parleydocument.cpp:255 src/parleydocument.cpp:305
+#: src/parleydocument.cpp:262 src/parleydocument.cpp:312
#, fuzzy
#| msgid "Save File"
msgctxt "@title:window"
msgid "Save File"
msgstr "保存文件"
-#: src/parleydocument.cpp:273
+#: src/parleydocument.cpp:280
msgid "Save Vocabulary As"
msgstr "词汇表另存为"
-#: src/parleydocument.cpp:282
+#: src/parleydocument.cpp:289
#, kde-format
msgid ""
"The file%1
already exists. Do you want to overwrite it?"
@@ -1527,39 +1527,39 @@
"文件已经存在。\n"
"您要覆盖“%1”吗?"
-#: src/parleydocument.cpp:288
+#: src/parleydocument.cpp:295
#, kde-format
msgctxt "@info:status saving a file"
msgid "Saving %1"
msgstr "保存 %1"
-#: src/parleydocument.cpp:338 src/vocabulary/wordtypeview.cpp:131
+#: src/parleydocument.cpp:345 src/vocabulary/wordtypeview.cpp:131
#, fuzzy
#| msgid "Conjugation"
msgid "Conjunction"
msgstr "词形变化"
#. i18n: ectx: property (text), item, widget (KComboBox, licenseComboBox)
-#: src/parleydocument.cpp:351 src/settings/documentproperties.ui:221
+#: src/parleydocument.cpp:358 src/settings/documentproperties.ui:221
msgid "Public Domain"
msgstr "公共领域"
#. i18n: ectx: property (text), item, widget (KComboBox, categoryComboBox)
#. i18n: ectx: property (title), widget (QGroupBox, languageGroupBox)
-#: src/parleydocument.cpp:352 src/settings/documentproperties.ui:167
+#: src/parleydocument.cpp:359 src/settings/documentproperties.ui:167
#: src/settings/documentproperties.ui:237
msgid "Languages"
msgstr "语言"
-#: src/parleydocument.cpp:360
+#: src/parleydocument.cpp:367
msgid "A Second Language"
msgstr "第二语言"
-#: src/parleydocument.cpp:363
+#: src/parleydocument.cpp:370
msgid "Lesson 1"
msgstr "课程 1"
-#: src/parleydocument.cpp:402
+#: src/parleydocument.cpp:409
#, fuzzy, kde-format
#| msgid "Downloads new vocabulary collections"
msgid "Could not open vocabulary collection \"%1\""
@@ -3296,13 +3296,13 @@
msgid "Enable/Disable the columns for each language"
msgstr "启用/禁用每一种语言栏"
-#: src/vocabulary/vocabularydelegate.cpp:161
+#: src/vocabulary/vocabularydelegate.cpp:164
#, fuzzy, kde-format
#| msgid "Currently selected row"
msgid "Sound file selected: %1"
msgstr "当前选中的行"
-#: src/vocabulary/vocabularydelegate.cpp:164
+#: src/vocabulary/vocabularydelegate.cpp:167
#, fuzzy, kde-format
#| msgid "Currently selected row"
msgid "Image file selected: %1"
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdelibs/akonadi_baloo_indexer.po kde-l10n-zhcn-4.12.95/messages/kdelibs/akonadi_baloo_indexer.po
--- kde-l10n-zhcn-4.12.90/messages/kdelibs/akonadi_baloo_indexer.po 2014-03-13 04:01:06.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdelibs/akonadi_baloo_indexer.po 2014-03-20 03:57:01.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2014-03-13 01:44+0000\n"
+"POT-Creation-Date: 2014-03-20 01:46+0000\n"
"PO-Revision-Date: 2014-03-11 22:10+0800\n"
"Last-Translator: Feng Chao \n"
"Language-Team: Chinese Simplified \n"
@@ -22,10 +22,10 @@
msgid "No indexers available"
msgstr "无可用索引器"
-#: agent.cpp:253
+#: agent.cpp:258
msgid "Indexing PIM data"
msgstr "索引 PIM 数据"
-#: agent.cpp:428 agent.cpp:452
+#: agent.cpp:445 agent.cpp:469
msgid "Ready"
msgstr "就绪"
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdelibs/baloowidgets.po kde-l10n-zhcn-4.12.95/messages/kdelibs/baloowidgets.po
--- kde-l10n-zhcn-4.12.90/messages/kdelibs/baloowidgets.po 2014-01-29 03:28:23.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdelibs/baloowidgets.po 2014-03-16 03:54:44.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2014-01-29 01:34+0000\n"
+"POT-Creation-Date: 2014-03-16 01:46+0000\n"
"PO-Revision-Date: 2012-11-22 21:36+0800\n"
"Last-Translator: FengChao \n"
"Language-Team: Chinese Simplified \n"
@@ -18,54 +18,54 @@
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Lokalize 1.5\n"
-#: src/filemetadataprovider.cpp:286
+#: src/filemetadataprovider.cpp:288
#, kde-format
msgctxt "@item:intable"
msgid "%1 item"
msgid_plural "%1 items"
msgstr[0] "%1 项"
-#: src/filemetadataprovider.cpp:390 src/filemetadataprovider.cpp:401
+#: src/filemetadataprovider.cpp:391 src/filemetadataprovider.cpp:402
msgctxt "@label"
msgid "Comment"
msgstr "备注"
-#: src/filemetadataprovider.cpp:391
+#: src/filemetadataprovider.cpp:392
msgctxt "@label"
msgid "Modified"
msgstr "修改时间"
-#: src/filemetadataprovider.cpp:392
+#: src/filemetadataprovider.cpp:393
msgctxt "@label"
msgid "Owner"
msgstr "所有者"
-#: src/filemetadataprovider.cpp:393
+#: src/filemetadataprovider.cpp:394
msgctxt "@label"
msgid "Permissions"
msgstr "权限"
-#: src/filemetadataprovider.cpp:394 src/filemetadataprovider.cpp:400
+#: src/filemetadataprovider.cpp:395 src/filemetadataprovider.cpp:401
msgctxt "@label"
msgid "Rating"
msgstr "评分"
-#: src/filemetadataprovider.cpp:395
+#: src/filemetadataprovider.cpp:396
msgctxt "@label"
msgid "Size"
msgstr "大小"
-#: src/filemetadataprovider.cpp:396 src/filemetadataprovider.cpp:399
+#: src/filemetadataprovider.cpp:397 src/filemetadataprovider.cpp:400
msgctxt "@label"
msgid "Tags"
msgstr "标签"
-#: src/filemetadataprovider.cpp:397
+#: src/filemetadataprovider.cpp:398
msgctxt "@label"
msgid "Total Size"
msgstr "总大小"
-#: src/filemetadataprovider.cpp:398
+#: src/filemetadataprovider.cpp:399
msgctxt "@label"
msgid "Type"
msgstr "类型"
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdelibs/kcm_baloofile.po kde-l10n-zhcn-4.12.95/messages/kdelibs/kcm_baloofile.po
--- kde-l10n-zhcn-4.12.90/messages/kdelibs/kcm_baloofile.po 2014-03-12 03:53:28.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdelibs/kcm_baloofile.po 2014-03-16 03:54:44.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2014-02-14 03:38+0000\n"
+"POT-Creation-Date: 2014-03-16 01:46+0000\n"
"PO-Revision-Date: 2014-03-11 22:17+0800\n"
"Last-Translator: Feng Chao \n"
"Language-Team: Chinese Simplified \n"
@@ -41,20 +41,20 @@
msgid "Enable Developer Mode"
msgstr "打开开发者模式"
-#: folderselectionwidget.cpp:192
+#: folderselectionwidget.cpp:199
msgid "Select the folder which should be excluded"
msgstr "设置需要排除的文件夹"
-#: folderselectionwidget.cpp:206
+#: folderselectionwidget.cpp:213
msgid "The root directory is always hidden"
msgstr "根目录总是隐藏"
-#: folderselectionwidget.cpp:219
+#: folderselectionwidget.cpp:226
#, kde-format
msgid "Folder %1 is already excluded"
msgstr "已经排除了文件夹 %1"
-#: folderselectionwidget.cpp:240
+#: folderselectionwidget.cpp:247
#, kde-format
msgid "Folder's parent %1 is already excluded"
msgstr "已经排除了上层文件夹 %1"
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdelibs/kdelibs4.po kde-l10n-zhcn-4.12.95/messages/kdelibs/kdelibs4.po
--- kde-l10n-zhcn-4.12.90/messages/kdelibs/kdelibs4.po 2014-02-28 06:11:11.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdelibs/kdelibs4.po 2014-03-17 03:50:16.000000000 +0000
@@ -7,7 +7,7 @@
# Xiong Jiang , 2002,2003,2004.
# Funda Wang , 2002,2003,2004.
# Liang Qi , 2007.
-# Feng Chao , 2010, 2012.
+# Feng Chao , 2010, 2012, 2014.
# Ni Hui , 2010, 2011, 2012.
# Weng Xuetian , 2011, 2012, 2013.
msgid ""
@@ -15,8 +15,8 @@
"Project-Id-Version: kdelibs4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2014-02-28 03:44+0000\n"
-"PO-Revision-Date: 2013-06-21 16:40-0400\n"
-"Last-Translator: Weng Xuetian \n"
+"PO-Revision-Date: 2014-03-13 21:01+0800\n"
+"Last-Translator: Feng Chao \n"
"Language-Team: Chinese Simplified \n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
@@ -27,11 +27,11 @@
msgctxt "NAME OF TRANSLATORS"
msgid "Your names"
-msgstr "KDE 中国"
+msgstr "KDE 中国, Feng Chao"
msgctxt "EMAIL OF TRANSLATORS"
msgid "Your emails"
-msgstr "kde-china@kde.org"
+msgstr "kde-china@kde.org, chaofeng111@gmail.com"
#: dnssd/servicemodel.cpp:101 knewstuff/knewstuff2/ui/kdxstranslation.cpp:46
#: knewstuff/knewstuff2/ui/providerdialog.cpp:68
@@ -5010,14 +5010,12 @@
#. i18n: ectx: property (text), widget (QRadioButton, anonymousRadioButton)
#: kdeui/dialogs/kpassworddialog.ui:65
msgid "No password, use anonymous (or guest) login"
-msgstr ""
+msgstr "无密码,使用匿名(或访客)登录"
#. i18n: ectx: property (text), widget (QRadioButton, usePasswordButton)
#: kdeui/dialogs/kpassworddialog.ui:72
-#, fuzzy
-#| msgid "&Keep password"
msgid "Use this password:"
-msgstr "保存密码(&K)"
+msgstr "使用此密码:"
#. i18n: ectx: property (text), widget (QLabel, userNameLabel)
#. i18n: ectx: property (text), widget (QLabel, label_10)
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdelibs/kfilemetadata.po kde-l10n-zhcn-4.12.95/messages/kdelibs/kfilemetadata.po
--- kde-l10n-zhcn-4.12.90/messages/kdelibs/kfilemetadata.po 1970-01-01 00:00:00.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdelibs/kfilemetadata.po 2014-03-17 03:50:16.000000000 +0000
@@ -0,0 +1,308 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Feng Chao , 2014.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2014-01-29 01:34+0000\n"
+"PO-Revision-Date: 2014-03-13 21:24+0800\n"
+"Last-Translator: Feng Chao \n"
+"Language-Team: Chinese Simplified \n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Lokalize 1.5\n"
+
+#: src/propertyinfo.cpp:50
+msgctxt "@label music album"
+msgid "Album"
+msgstr "专辑"
+
+#: src/propertyinfo.cpp:56
+msgctxt "@label"
+msgid "Album Artist"
+msgstr "专辑艺人"
+
+#: src/propertyinfo.cpp:62
+msgctxt "@label"
+msgid "Artist"
+msgstr "艺人"
+
+#: src/propertyinfo.cpp:68
+msgctxt "@label"
+msgid "Aspect Ratio"
+msgstr "纵横比"
+
+#: src/propertyinfo.cpp:74
+msgctxt "@label"
+msgid "Author"
+msgstr "作者"
+
+#: src/propertyinfo.cpp:80
+msgctxt "@label"
+msgid "Bitrate"
+msgstr "比特率"
+
+#: src/propertyinfo.cpp:86
+msgctxt "@label"
+msgid "Channels"
+msgstr "声道"
+
+#: src/propertyinfo.cpp:92
+msgctxt "@label"
+msgid "Comment"
+msgstr "评论"
+
+#: src/propertyinfo.cpp:99
+msgctxt "@label"
+msgid "Composer"
+msgstr "作曲家"
+
+#: src/propertyinfo.cpp:106
+msgctxt "@label"
+msgid "Copyright"
+msgstr "版权"
+
+#: src/propertyinfo.cpp:113
+msgctxt "@label"
+msgid "Creation Date"
+msgstr "创建日期"
+
+#: src/propertyinfo.cpp:119
+msgctxt "@label"
+msgid "Creator"
+msgstr "创建者"
+
+#: src/propertyinfo.cpp:126
+msgctxt "@label"
+msgid "Description"
+msgstr "描述"
+
+#: src/propertyinfo.cpp:133
+msgctxt "@label"
+msgid "Duration"
+msgstr "时长"
+
+#: src/propertyinfo.cpp:144
+msgctxt "@label"
+msgid "Frame Rate"
+msgstr "帧速率"
+
+#: src/propertyinfo.cpp:151
+msgctxt "@label"
+msgid "Generator"
+msgstr "生成器"
+
+#: src/propertyinfo.cpp:158
+msgctxt "@label music genre"
+msgid "Genre"
+msgstr "流派"
+
+#: src/propertyinfo.cpp:165
+msgctxt "@label"
+msgid "Height"
+msgstr "高度"
+
+#: src/propertyinfo.cpp:171
+msgctxt "@label EXIF"
+msgid "Image Date Time"
+msgstr "图像日期和时间"
+
+#: src/propertyinfo.cpp:177
+msgctxt "@label EXIF"
+msgid "Image Make"
+msgstr ""
+
+#: src/propertyinfo.cpp:184
+msgctxt "@label EXIF"
+msgid "Image Model"
+msgstr ""
+
+#: src/propertyinfo.cpp:191
+msgctxt "@label EXIF"
+msgid "Image Orientation"
+msgstr "图像方向"
+
+#: src/propertyinfo.cpp:197
+msgctxt "@label"
+msgid "Keywords"
+msgstr "关键字"
+
+#: src/propertyinfo.cpp:204
+msgctxt "@label"
+msgid "Language"
+msgstr "语言"
+
+#: src/propertyinfo.cpp:211
+msgctxt "@label number of lines"
+msgid "Line Count"
+msgstr "行数"
+
+#: src/propertyinfo.cpp:217
+msgctxt "@label"
+msgid "Lyricist"
+msgstr "作词"
+
+#: src/propertyinfo.cpp:224
+msgctxt "@label"
+msgid "Page Count"
+msgstr "页数"
+
+#: src/propertyinfo.cpp:230
+msgctxt "@label EXIF"
+msgid "Photo Aperture Value"
+msgstr ""
+
+#: src/propertyinfo.cpp:236
+msgctxt "@label EXIF"
+msgid "Photo Original Date Time"
+msgstr ""
+
+#: src/propertyinfo.cpp:242
+msgctxt "@label EXIF"
+msgid "Photo Exposure Bias"
+msgstr ""
+
+#: src/propertyinfo.cpp:248
+msgctxt "@label EXIF"
+msgid "Photo Exposure Time"
+msgstr ""
+
+#: src/propertyinfo.cpp:254
+msgctxt "@label EXIF"
+msgid "Photo Flash"
+msgstr "照片闪光灯"
+
+#: src/propertyinfo.cpp:260
+msgctxt "@label EXIF"
+msgid "Photo F Number"
+msgstr ""
+
+#: src/propertyinfo.cpp:266
+msgctxt "@label EXIF"
+msgid "Photo Focal Length"
+msgstr ""
+
+#: src/propertyinfo.cpp:272
+msgctxt "@label EXIF"
+msgid "Photo Focal Length 35mm"
+msgstr ""
+
+#: src/propertyinfo.cpp:278
+msgctxt "@label EXIF"
+msgid "Photo ISO Speed Rating"
+msgstr ""
+
+#: src/propertyinfo.cpp:284
+msgctxt "@label EXIF"
+msgid "Photo Metering Mode"
+msgstr ""
+
+#: src/propertyinfo.cpp:290
+msgctxt "@label EXIF"
+msgid "Photo X Dimension"
+msgstr ""
+
+#: src/propertyinfo.cpp:296
+msgctxt "@label EXIF"
+msgid "Photo Y Dimension"
+msgstr ""
+
+#: src/propertyinfo.cpp:302
+msgctxt "@label EXIF"
+msgid "Photo Saturation"
+msgstr ""
+
+#: src/propertyinfo.cpp:308
+msgctxt "@label EXIF"
+msgid "Photo Sharpness"
+msgstr ""
+
+#: src/propertyinfo.cpp:314
+msgctxt "@label EXIF"
+msgid "Photo White Balance"
+msgstr ""
+
+#: src/propertyinfo.cpp:320
+msgctxt "@label"
+msgid "Publisher"
+msgstr "出版"
+
+#: src/propertyinfo.cpp:326
+msgctxt "@label"
+msgid "Release Year"
+msgstr "发行年份"
+
+#: src/propertyinfo.cpp:332
+msgctxt "@label"
+msgid "Sample Rate"
+msgstr "采样率"
+
+#: src/propertyinfo.cpp:338
+msgctxt "@label"
+msgid "Subject"
+msgstr "主题"
+
+#: src/propertyinfo.cpp:345
+msgctxt "@label"
+msgid "Title"
+msgstr "标题"
+
+#: src/propertyinfo.cpp:351
+msgctxt "@label music track number"
+msgid "Track Number"
+msgstr "曲目编号"
+
+#: src/propertyinfo.cpp:357
+msgctxt "@label"
+msgid "Width"
+msgstr "宽度"
+
+#: src/propertyinfo.cpp:363
+msgctxt "@label number of words"
+msgid "Word Count"
+msgstr "单词计数"
+
+#: src/typeinfo.cpp:42
+msgctxt "@label"
+msgid "Archive"
+msgstr "存档"
+
+#: src/typeinfo.cpp:47
+msgctxt "@label"
+msgid "Audio"
+msgstr "音频"
+
+#: src/typeinfo.cpp:52
+msgctxt "@label"
+msgid "Document"
+msgstr "文档"
+
+#: src/typeinfo.cpp:57
+msgctxt "@label"
+msgid "Image"
+msgstr "图像"
+
+#: src/typeinfo.cpp:62
+msgctxt "@label"
+msgid "Presentation"
+msgstr "演示"
+
+#: src/typeinfo.cpp:67
+msgctxt "@label"
+msgid "Spreadsheet"
+msgstr "电子表格"
+
+#: src/typeinfo.cpp:72
+msgctxt "@label"
+msgid "Text"
+msgstr "文本"
+
+#: src/typeinfo.cpp:77
+msgctxt "@label"
+msgid "Video"
+msgstr "视频"
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdelibs/kio4.po kde-l10n-zhcn-4.12.95/messages/kdelibs/kio4.po
--- kde-l10n-zhcn-4.12.90/messages/kdelibs/kio4.po 2014-03-09 03:47:40.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdelibs/kio4.po 2014-03-14 06:47:58.000000000 +0000
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: kio4\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2014-03-09 01:46+0000\n"
+"POT-Creation-Date: 2014-03-14 04:54+0000\n"
"PO-Revision-Date: 2013-11-10 12:06+0800\n"
"Last-Translator: Feng Chao \n"
"Language-Team: Chinese Simplified \n"
@@ -976,25 +976,25 @@
msgid "Could not login to %1."
msgstr "无法登录到 %1。"
-#: ../kioslave/ftp/ftp.cpp:2609 ../kioslave/http/http.cpp:5274
+#: ../kioslave/ftp/ftp.cpp:2632 ../kioslave/http/http.cpp:5274
#: ../kioslave/http/http.cpp:5396
msgid ""
"You need to supply a username and a password for the proxy server listed "
"below before you are allowed to access any sites."
msgstr "您需要为以下列出的代理服务器提供用户名和密码,才能够访问站点。"
-#: ../kioslave/ftp/ftp.cpp:2613 ../kioslave/http/http.cpp:5278
+#: ../kioslave/ftp/ftp.cpp:2636 ../kioslave/http/http.cpp:5278
#: ../kioslave/http/http.cpp:5399
msgid "Proxy:"
msgstr "代理:"
-#: ../kioslave/ftp/ftp.cpp:2614 ../kioslave/http/http.cpp:5279
+#: ../kioslave/ftp/ftp.cpp:2637 ../kioslave/http/http.cpp:5279
#: ../kioslave/http/http.cpp:5479
#, kde-format
msgid "%1 at %2"
msgstr "%1 在 %2"
-#: ../kioslave/ftp/ftp.cpp:2615 ../kioslave/http/http.cpp:5281
+#: ../kioslave/ftp/ftp.cpp:2638 ../kioslave/http/http.cpp:5281
#: ../kioslave/http/http.cpp:5416
msgid "Proxy Authentication Failed."
msgstr "代理验证失败。"
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdelibs/kio_tags.po kde-l10n-zhcn-4.12.95/messages/kdelibs/kio_tags.po
--- kde-l10n-zhcn-4.12.90/messages/kdelibs/kio_tags.po 1970-01-01 00:00:00.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdelibs/kio_tags.po 2014-03-17 03:50:16.000000000 +0000
@@ -0,0 +1,26 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Feng Chao , 2014.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2014-02-18 01:40+0000\n"
+"PO-Revision-Date: 2014-03-13 21:01+0800\n"
+"Last-Translator: Feng Chao \n"
+"Language-Team: Chinese Simplified \n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Lokalize 1.5\n"
+
+#: kio_tags.cpp:72 kio_tags.cpp:171
+msgid "Tag"
+msgstr "标签"
+
+#: kio_tags.cpp:174
+msgid "All Tags"
+msgstr "所有标签"
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdelibs/kio_timeline.po kde-l10n-zhcn-4.12.95/messages/kdelibs/kio_timeline.po
--- kde-l10n-zhcn-4.12.90/messages/kdelibs/kio_timeline.po 1970-01-01 00:00:00.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdelibs/kio_timeline.po 2014-03-17 03:50:16.000000000 +0000
@@ -0,0 +1,36 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Feng Chao , 2014.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2014-01-28 01:35+0000\n"
+"PO-Revision-Date: 2014-03-13 21:06+0800\n"
+"Last-Translator: Feng Chao \n"
+"Language-Team: Chinese Simplified \n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Lokalize 1.5\n"
+
+#: kio_timeline.cpp:70
+msgctxt ""
+"Month and year used in a tree above the actual days. Have a look at http://"
+"api.kde.org/4.x-api/kdelibs-apidocs/kdecore/html/classKCalendarSystem."
+"html#a560204439a4b670ad36c16c404f292b4 to see which variables you can use "
+"and ask kde-i18n-doc@kde.org if you have problems understanding how to "
+"translate this"
+msgid "%B %Y"
+msgstr "%Y%B"
+
+#: kio_timeline.cpp:127
+msgid "Today"
+msgstr "今天"
+
+#: kio_timeline.cpp:128 kio_timeline.cpp:201
+msgid "Calendar"
+msgstr "日历"
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdenetwork/kget.po kde-l10n-zhcn-4.12.95/messages/kdenetwork/kget.po
--- kde-l10n-zhcn-4.12.90/messages/kdenetwork/kget.po 2014-02-24 03:47:48.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdenetwork/kget.po 2014-03-17 03:50:16.000000000 +0000
@@ -8,16 +8,15 @@
# Funda Wang , 2003.
# Ni Hui , 2008, 2009, 2010, 2012.
# Lie Ex , 2007-2009.
-# Leon Feng , 2010.
-# Feng Chao , 2011, 2012, 2013.
+# Feng Chao , 2010, 2011, 2012, 2013, 2014.
# Weng Xuetian , 2011.
msgid ""
msgstr ""
"Project-Id-Version: kget\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2014-02-24 01:45+0000\n"
-"PO-Revision-Date: 2013-06-23 18:52+0800\n"
-"Last-Translator: FengChao \n"
+"PO-Revision-Date: 2014-03-16 19:39+0800\n"
+"Last-Translator: Feng Chao \n"
"Language-Team: Chinese Simplified \n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
@@ -2127,10 +2126,6 @@
msgstr "上传速度"
#: transfer-plugins/bittorrent/advanceddetails/peerviewmodel.cpp:333
-#, fuzzy
-#| msgid ""
-#| "Whether or not the peer has choked us. If we are choked, the peer will "
-#| "not send us any data."
msgid ""
"Whether or not the peer has choked us. If we are choked, the peer will not "
"send us any data."
@@ -2433,10 +2428,8 @@
#. i18n: ectx: property (text), widget (QLabel, tempFolderLabel)
#: transfer-plugins/bittorrent/btsettingswidget.ui:137
-#, fuzzy
-#| msgid "Default temporary folder"
msgid "Default temporary folder:"
-msgstr "默认临时文件夹"
+msgstr "默认临时文件夹:"
#. i18n: ectx: property (text), widget (QCheckBox, preallocBox)
#: transfer-plugins/bittorrent/btsettingswidget.ui:154
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdenetwork/kopete.po kde-l10n-zhcn-4.12.95/messages/kdenetwork/kopete.po
--- kde-l10n-zhcn-4.12.90/messages/kdenetwork/kopete.po 2014-01-07 03:08:16.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdenetwork/kopete.po 2014-03-17 03:50:16.000000000 +0000
@@ -8,14 +8,14 @@
# Ni Hui , 2008, 2010, 2012.
# Lie_Ex , 2007-2010.
# Weng Xuetian , 2011, 2012, 2013.
-# FengChao , 2013.
+# Feng Chao , 2013, 2014.
msgid ""
msgstr ""
"Project-Id-Version: kopete\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2014-01-07 01:32+0000\n"
-"PO-Revision-Date: 2013-07-21 14:54+0800\n"
-"Last-Translator: FengChao \n"
+"PO-Revision-Date: 2014-03-16 19:38+0800\n"
+"Last-Translator: Feng Chao \n"
"Language-Team: Chinese Simplified \n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
@@ -7520,6 +7520,7 @@
"%1 has sent an encrypted message intended for a different session. If you "
"are logged in multiple times, another session may have received the message."
msgstr ""
+"%1 发送了一个给其它会话的加密信息。如果您是多点登录,其它会话可能收到了信息。"
#: plugins/otr/otrlchatinterface.cpp:600
#, kde-format
@@ -20810,139 +20811,3 @@
#: protocols/yahoo/yahooverifyaccount.cpp:44
msgid "Account Verification - Yahoo"
msgstr "账户验证 - Yahoo"
-
-#~ msgid "Authentication successful. The conversation is now secure."
-#~ msgstr "验证成功。现在的对话连接是安全的。"
-
-#~ msgid ""
-#~ "Authentication failed. Note that the conversation is now insecure."
-#~ msgstr "验证失败。现在的对话连接是不安全的。"
-
-#~ msgid "Authentication error."
-#~ msgstr "验证错误。"
-
-#~ msgid "Encryption error"
-#~ msgstr "加密错误"
-
-#~ msgid "Disable custom background color set by users."
-#~ msgstr "禁用用户自定义的背景颜色。"
-
-#~ msgid "Disable rich text set by users."
-#~ msgstr "禁用用户自定义的丰富文本。"
-
-#~ msgid "Base font color for the chat window"
-#~ msgstr "聊天窗口内的基本字体颜色"
-
-#~ msgid "Do not show user specified back&ground color"
-#~ msgstr "不显示用户指定的背景色(&G)"
-
-#~ msgid "&Do not show user specified foreground color"
-#~ msgstr "不显示用户指定的前景色(&D)"
-
-#~ msgid "Do not show user specified &rich text"
-#~ msgstr "不显示用户指定的丰富文本(&R)"
-
-#~ msgid "Jabber &server:"
-#~ msgstr "Jabber 服务器(&S):"
-
-#~ msgid "Please enter a server name, or click Choose."
-#~ msgstr "请输入服务器名称,或单击选择。"
-
-#, fuzzy
-#~| msgid "Chat History"
-#~ msgid "Chat History2"
-#~ msgstr "聊天历史"
-
-#, fuzzy
-#~| msgid "Color of history messages in the chat window"
-#~ msgid "Color of history2 messages in the chat window"
-#~ msgstr "聊天窗口中历史消息的颜色"
-
-#~ msgid "Developer, Skype plugin maintainer"
-#~ msgstr "开发者、Skype 插件维护者"
-
-#~ msgid ""
-#~ "Check this box to enable SSL encrypted communication with the server. "
-#~ "Note that this is not end-to-end encryption, but rather encrypted "
-#~ "communication with the server."
-#~ msgstr ""
-#~ "选中此框可在与服务器通讯时启用 SSL 加密。请注意,这不是端到端的加密,而只"
-#~ "是与服务器的通讯加密。"
-
-#~ msgid "Use protocol encr&yption (SSL)"
-#~ msgstr "使用协议加密(SSL)(&Y)"
-
-#~ msgid "(Unnamed Group)"
-#~ msgstr "(未命名组)"
-
-#, fuzzy
-#~| msgid "&Format"
-#~ msgid "Form"
-#~ msgstr "格式(&F)"
-
-#~ msgid "Ignore"
-#~ msgstr "忽略"
-
-#~ msgctxt "@action"
-#~ msgid "Ignore"
-#~ msgstr "忽略"
-
-#, fuzzy
-#~| msgid ""
-#~| "The IP address or hostmask of the ICQ server you wish to connect to. "
-#~| "Normally you will want the default (login.icq.com)."
-#~ msgid ""
-#~ "The IP address or hostmask of the AIM server you wish to connect to. "
-#~ "Normally you will want the default (login.icq.com)."
-#~ msgstr ""
-#~ "您想要连接的 ICQ 服务器的 IP 地址或主机名。通常,您只需保留默认值(login."
-#~ "icq.com)。"
-
-#~ msgid ""
-#~ "Unable to find the Jasper image conversion program.\n"
-#~ "Jasper is required to render Yahoo webcam images.\n"
-#~ "Please see %1 for further information."
-#~ msgstr ""
-#~ "找不到 Jasper 图像转换程序。\n"
-#~ "渲染 Yahoo 摄像头图像,需要使用 Jasper。\n"
-#~ "请查看 %1 了解更多信息。"
-
-#~ msgid "€"
-#~ msgstr "€"
-
-#~ msgid "kopetepasswordtest"
-#~ msgstr "kopete 密码测试"
-
-#~ msgid "Config group to store password in"
-#~ msgstr "配置存储密码的组"
-
-#~ msgid "Set password to new"
-#~ msgstr "重设密码"
-
-#~ msgid "Claim password was erroneous"
-#~ msgstr "声明密码不对"
-
-#~ msgid "Password prompt"
-#~ msgstr "密码提示"
-
-#~ msgid "Image to display in password dialog"
-#~ msgstr "要在密码对话框中显示的图像"
-
-#~ msgid ""
-#~ "Hopefully this popped up because you set the password to the empty string."
-#~ msgstr "弹出此提示是因为您将密码设置为空字符串。"
-
-#~ msgid "Kopete Avatar Selector Widget Test"
-#~ msgstr "Kopete 头像选择器窗口部件测试"
-
-#~ msgid "larouche@kde.org"
-#~ msgstr "larouche@kde.org"
-
-#~ msgid "kopetewallettest"
-#~ msgstr "kopete 钱包测试"
-
-#~ msgid "Chinese"
-#~ msgstr "汉语"
-
-#~ msgid "Translator"
-#~ msgstr "翻译者"
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdenetwork/krdc.po kde-l10n-zhcn-4.12.95/messages/kdenetwork/krdc.po
--- kde-l10n-zhcn-4.12.90/messages/kdenetwork/krdc.po 2014-02-23 03:59:29.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdenetwork/krdc.po 2014-03-17 03:50:16.000000000 +0000
@@ -8,14 +8,14 @@
# Funda Wang , 2002, 2004.
# Lie_Ex , 2007, 2008, 2009.
# Ni Hui , 2009, 2010, 2012.
-# FengChao , 2013.
+# Feng Chao , 2013, 2014.
msgid ""
msgstr ""
"Project-Id-Version: krdc\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2014-02-23 01:48+0000\n"
-"PO-Revision-Date: 2013-06-23 20:34+0800\n"
-"Last-Translator: FengChao \n"
+"PO-Revision-Date: 2014-03-16 19:40+0800\n"
+"Last-Translator: Feng Chao \n"
"Language-Team: Chinese Simplified \n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
@@ -1388,28 +1388,21 @@
msgstr "VNC 服务器端关闭了连接。"
#: vnc/vncclientthread.cpp:312
-#, fuzzy, kde-format
-#| msgid "Disconnect"
+#, kde-format
msgid "Disconnected: %1."
-msgstr "断开连接"
+msgstr "断开连接:%1."
#: vnc/vncclientthread.cpp:498
-#, fuzzy
-#| msgid "When Connecting"
msgid "Reconnecting."
-msgstr "连接时"
+msgstr "正在重新连接。"
#: vnc/vncclientthread.cpp:566
-#, fuzzy
-#| msgid "Disconnect"
msgid "Reconnected."
-msgstr "断开连接"
+msgstr "已经重新连接。"
#: vnc/vncclientthread.cpp:568
-#, fuzzy
-#| msgid "Connect"
msgid "Connected."
-msgstr "连接"
+msgstr "已连接."
#. i18n: ectx: property (text), widget (QLabel, connectionLabel)
#: vnc/vncpreferences.ui:23
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdepim/akonadi_mailfilter_agent.po kde-l10n-zhcn-4.12.95/messages/kdepim/akonadi_mailfilter_agent.po
--- kde-l10n-zhcn-4.12.90/messages/kdepim/akonadi_mailfilter_agent.po 2014-03-04 05:00:25.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdepim/akonadi_mailfilter_agent.po 2014-03-15 03:21:58.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2014-03-04 02:02+0000\n"
+"POT-Creation-Date: 2014-03-15 01:37+0000\n"
"PO-Revision-Date: 2013-01-23 15:31-0500\n"
"Last-Translator: Weng Xuetian \n"
"Language-Team: Chinese Simplified \n"
@@ -89,7 +89,7 @@
"日志数据的收集使用内存临时存储日志数据;这里您可以限制使用内存的最大值:如果"
"收集的日志大小超过了限额那么最老的数据将被丢弃直到不再超过限额为止。"
-#: filterlogdialog.cpp:337
+#: filterlogdialog.cpp:339
#, kde-format
msgid ""
"Could not write the file %1:\n"
@@ -98,7 +98,7 @@
"无法写入文件 %1:\n"
"“%2”为详细错误描述。"
-#: filterlogdialog.cpp:341
+#: filterlogdialog.cpp:343
msgid "KMail Error"
msgstr "KMail 错误"
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdepim/blogilo.po kde-l10n-zhcn-4.12.95/messages/kdepim/blogilo.po
--- kde-l10n-zhcn-4.12.90/messages/kdepim/blogilo.po 2014-02-22 03:33:27.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdepim/blogilo.po 2014-03-20 03:57:01.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: blogilo\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2014-02-22 01:40+0000\n"
+"POT-Creation-Date: 2014-03-20 01:47+0000\n"
"PO-Revision-Date: 2013-01-23 15:32-0500\n"
"Last-Translator: Weng Xuetian \n"
"Language-Team: Chinese Simplified \n"
@@ -346,27 +346,27 @@
msgid "Cannot write data to file %1"
msgstr "无法将数据写入文件 %1"
-#: src/configuredialog.cpp:62
+#: src/configuredialog.cpp:63
msgctxt "Configure Page"
msgid "General"
msgstr "常规"
-#: src/configuredialog.cpp:63
+#: src/configuredialog.cpp:64
msgctxt "Configure Page"
msgid "Blogs"
msgstr "博客"
-#: src/configuredialog.cpp:64
+#: src/configuredialog.cpp:65
msgctxt "Configure Page"
msgid "Editor"
msgstr "编辑器"
-#: src/configuredialog.cpp:65
+#: src/configuredialog.cpp:66
msgctxt "Configure Page"
msgid "Advanced"
msgstr "高级"
-#: src/configuredialog.cpp:66
+#: src/configuredialog.cpp:67
msgctxt "Configure Page"
msgid "Storage Service"
msgstr ""
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdepim/kalarm.po kde-l10n-zhcn-4.12.95/messages/kdepim/kalarm.po
--- kde-l10n-zhcn-4.12.90/messages/kdepim/kalarm.po 2014-03-10 03:56:28.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdepim/kalarm.po 2014-03-20 03:57:01.000000000 +0000
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: kalarm\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2014-03-10 01:51+0000\n"
+"POT-Creation-Date: 2014-03-20 01:47+0000\n"
"PO-Revision-Date: 2013-01-23 16:06-0500\n"
"Last-Translator: Weng Xuetian \n"
"Language-Team: Chinese Simplified \n"
@@ -1667,179 +1667,179 @@
msgid "Choose Alarm Font & Color"
msgstr "选择提醒字体和颜色"
-#: functions.cpp:181
+#: functions.cpp:183
msgctxt "@action"
msgid "Enable &Alarms"
msgstr "启用提醒(&A)"
-#: functions.cpp:194
+#: functions.cpp:196
msgctxt "@action"
msgid "Stop Play"
msgstr "停止播放"
-#: functions.cpp:207
+#: functions.cpp:209
msgctxt "@action"
msgid "Spread Windows"
msgstr "展开窗口"
-#: functions.cpp:1125
+#: functions.cpp:1127
msgctxt "@info"
msgid "Error saving alarms"
msgstr "保存提醒出错"
-#: functions.cpp:1126
+#: functions.cpp:1128
msgctxt "@info"
msgid "Error saving alarm"
msgstr "保存提醒出错"
-#: functions.cpp:1129
+#: functions.cpp:1131
msgctxt "@info"
msgid "Error deleting alarms"
msgstr "删除提醒出错"
-#: functions.cpp:1130
+#: functions.cpp:1132
msgctxt "@info"
msgid "Error deleting alarm"
msgstr "删除提醒出错"
-#: functions.cpp:1133
+#: functions.cpp:1135
msgctxt "@info"
msgid "Error saving reactivated alarms"
msgstr "保存重新激活的提醒出错"
-#: functions.cpp:1134
+#: functions.cpp:1136
msgctxt "@info"
msgid "Error saving reactivated alarm"
msgstr "保存重新激活的提醒出错"
-#: functions.cpp:1137
+#: functions.cpp:1139
msgctxt "@info"
msgid "Error saving alarm templates"
msgstr "保存提醒模板出错"
-#: functions.cpp:1138
+#: functions.cpp:1140
msgctxt "@info"
msgid "Error saving alarm template"
msgstr "保存提醒模板出错"
-#: functions.cpp:1157
+#: functions.cpp:1159
msgctxt "@info"
msgid "Unable to show alarms in KOrganizer"
msgstr "无法在 KOrganizer 中显示提醒"
-#: functions.cpp:1158
+#: functions.cpp:1160
msgctxt "@info"
msgid "Unable to show alarm in KOrganizer"
msgstr "无法在 KOrganizer 中显示提醒"
-#: functions.cpp:1161
+#: functions.cpp:1163
msgctxt "@info"
msgid "Unable to update alarm in KOrganizer"
msgstr "无法更新 KOrganizer 中的提醒"
-#: functions.cpp:1164
+#: functions.cpp:1166
msgctxt "@info"
msgid "Unable to delete alarms from KOrganizer"
msgstr "无法从 KOrganizer 中删除提醒"
-#: functions.cpp:1165
+#: functions.cpp:1167
msgctxt "@info"
msgid "Unable to delete alarm from KOrganizer"
msgstr "无法从 KOrganizer 中删除提醒"
-#: functions.cpp:1172
+#: functions.cpp:1174
#, kde-format
msgctxt "@info"
msgid "%1(KOrganizer not fully started)"
msgstr "%1(KOrganizer 还未完全启动)"
-#: functions.cpp:1174
+#: functions.cpp:1176
#, kde-format
msgctxt "@info"
msgid "%1(Error communicating with KOrganizer)"
msgstr "%1(和 KOrganizer 通讯时出错)"
-#: functions.cpp:1405
+#: functions.cpp:1407
msgctxt "info"
msgid "The scheduled Wake from Suspend has been cancelled."
msgstr ""
-#: functions.cpp:1449
+#: functions.cpp:1451
#, kde-format
msgctxt "@info"
msgid "Error obtaining authorization (%1)"
msgstr ""
-#: functions.cpp:1474
+#: functions.cpp:1476
msgctxt "@info"
msgid "You must enable a template calendar to save the template in"
msgstr "您必须启用一个用于保存模板的日历"
-#: functions.cpp:1757
+#: functions.cpp:1759
#, kde-format
msgctxt "@info Please set the 'From' email address..."
msgid "%1Please set it in the Configuration dialog."
msgstr "%1请在配置对话框中设置。"
-#: functions.cpp:1761
+#: functions.cpp:1763
msgctxt "@info"
msgid ""
"Alarms are currently disabled.Do you want to enable "
"alarms now?"
msgstr "提醒已被禁用。现在要启用吗?"
-#: functions.cpp:1762
+#: functions.cpp:1764
msgctxt "@action:button"
msgid "Enable"
msgstr "启用"
-#: functions.cpp:1762
+#: functions.cpp:1764
msgctxt "@action:button"
msgid "Keep Disabled"
msgstr "保持禁用"
-#: functions.cpp:1833
+#: functions.cpp:1835
#, kde-format
msgctxt "@info"
msgid ""
"Unable to start KMail(%1)"
msgstr "无法启动 KMail(%1)"
-#: functions.cpp:2142
+#: functions.cpp:2144
msgctxt "@info"
msgid "Please select a file to display"
msgstr "请选择要显示的文件"
-#: functions.cpp:2144
+#: functions.cpp:2146
msgctxt "@info"
msgid "Please select a file to play"
msgstr "请选择要播放的文件"
-#: functions.cpp:2150
+#: functions.cpp:2152
#, kde-format
msgctxt "@info"
msgid "%1 is a folder"
msgstr "%1 是文件夹"
-#: functions.cpp:2152
+#: functions.cpp:2154
#, kde-format
msgctxt "@info"
msgid "%1 not found"
msgstr "%1 未找到"
-#: functions.cpp:2153
+#: functions.cpp:2155
#, kde-format
msgctxt "@info"
msgid "%1 is not readable"
msgstr "%1 不可读"
-#: functions.cpp:2154
+#: functions.cpp:2156
#, kde-format
msgctxt "@info"
msgid "%1 appears not to be a text or image file"
msgstr "%1 不象是文本或图像文件"
-#: functions.cpp:2223
+#: functions.cpp:2225
#, kde-format
msgctxt "@info"
msgid ""
@@ -1850,7 +1850,7 @@
"日历 %1 是旧版格式(KAlarm "
"%2)。除非您选择更新到最新格式,否则它是只读的。"
-#: functions.cpp:2226
+#: functions.cpp:2228
#, kde-format
msgctxt "@info"
msgid ""
@@ -1861,7 +1861,7 @@
"日历 %1 中有部分或全部提醒是 KAlarm"
"application> 旧版格式。除非您选择更新到最新格式,否则它们是只读的。"
-#: functions.cpp:2229
+#: functions.cpp:2231
#, fuzzy, kde-format
#| msgctxt "@info"
#| msgid ""
@@ -5215,33 +5215,33 @@
msgid "Enter the length of time to repeat the alarm"
msgstr "输入重复提醒的时间长度"
-#: resourceconfigdialog.cpp:47 resourceselector.cpp:249
+#: resourceconfigdialog.cpp:49 resourceselector.cpp:249
msgctxt "@title:window"
msgid "Calendar Configuration"
msgstr "日历配置"
-#: resourceconfigdialog.cpp:60
+#: resourceconfigdialog.cpp:62
msgctxt "@title:group"
msgid "General Settings"
msgstr "常规设置"
-#: resourceconfigdialog.cpp:62
+#: resourceconfigdialog.cpp:64
msgctxt "@label:textbox Calendar name"
msgid "Name:"
msgstr "名称:"
-#: resourceconfigdialog.cpp:67
+#: resourceconfigdialog.cpp:69
msgctxt "@option:check"
msgid "Read-only"
msgstr "只读"
-#: resourceconfigdialog.cpp:80
+#: resourceconfigdialog.cpp:82
#, kde-format
msgctxt "@title:group"
msgid "%1 Calendar Settings"
msgstr "%1 日历设置"
-#: resourceconfigdialog.cpp:122
+#: resourceconfigdialog.cpp:124
msgctxt "@info"
msgid "Please enter a calendar name."
msgstr "请输入一个日历名称。"
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdepim/kmail.po kde-l10n-zhcn-4.12.95/messages/kdepim/kmail.po
--- kde-l10n-zhcn-4.12.90/messages/kdepim/kmail.po 2014-03-09 03:47:40.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdepim/kmail.po 2014-03-17 03:50:16.000000000 +0000
@@ -7,16 +7,16 @@
# Levin Du , 2004.
# Funda Wang , 2002,2003,2004.
# Ni Hui , 2009, 2010, 2012.
-# Feng Chao , 2010, 2012, 2013.
+# Feng Chao , 2010, 2012, 2013, 2014.
# Lie_Ex , 2007-2010.
# Weng Xuetian , 2011, 2013.
msgid ""
msgstr ""
"Project-Id-Version: kmail\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2014-03-09 01:48+0000\n"
-"PO-Revision-Date: 2013-11-03 15:20+0800\n"
-"Last-Translator: Feng Chao \n"
+"POT-Creation-Date: 2014-03-14 04:55+0000\n"
+"PO-Revision-Date: 2014-03-16 20:15+0800\n"
+"Last-Translator: Feng Chao \n"
"Language-Team: Chinese Simplified \n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
@@ -62,8 +62,6 @@
msgstr "文档"
#: aboutdata.cpp:82
-#, fuzzy
-#| msgid "system tray notification"
msgid "System tray notification"
msgstr "系统托盘通知"
@@ -104,25 +102,19 @@
msgstr "改进了 HTML 支持"
#: aboutdata.cpp:219
-#, fuzzy
-#| msgid "beta testing of PGP 6 support"
msgid "Beta testing of PGP 6 support"
msgstr "PGP 6 支持的 beta 测试"
#: aboutdata.cpp:226
-#, fuzzy
-#| msgid "timestamp for 'Transmission completed' status messages"
msgid "Timestamp for 'Transmission completed' status messages"
msgstr "“传送完成”状态消息的时间戳"
#: aboutdata.cpp:230
-#, fuzzy
-#| msgid "multiple encryption keys per address"
msgid "Multiple encryption keys per address"
msgstr "每个地址用多个加密密钥"
#: aboutdata.cpp:240 collectionpage/collectionmailinglistpage.cpp:109
-#: editor/kmcomposewin.cpp:2179 kmsystemtray.cpp:71 kmsystemtray.cpp:115
+#: editor/kmcomposewin.cpp:2179 kmsystemtray.cpp:71 kmsystemtray.cpp:116
msgid "KMail"
msgstr "KMail"
@@ -131,10 +123,8 @@
msgstr "KDE 电子邮件客户端程序"
#: aboutdata.cpp:242
-#, fuzzy
-#| msgid "Copyright © 1997–2013, KMail authors"
msgid "Copyright © 1997–2014, KMail authors"
-msgstr "Copyright © 1997–2013, KMail 作者"
+msgstr "Copyright © 1997–2014, KMail 作者"
#: antispam-virus/antispamwizard.cpp:116
msgid "Anti-Spam Wizard"
@@ -910,7 +900,7 @@
#: configuredialog/configureappearancepage.cpp:377
msgid "Close to quota threshold:"
-msgstr "配额临界阈值:"
+msgstr "配额警告阈值:"
#: configuredialog/configureappearancepage.cpp:384
msgid "%"
@@ -1125,8 +1115,6 @@
msgstr "外部编辑器"
#: configuredialog/configurecomposerpage.cpp:143
-#, fuzzy
-#| msgid "Signature"
msgctxt "@title:group"
msgid "Signature"
msgstr "签名"
@@ -1136,10 +1124,12 @@
"Automatically insert the configured signature\n"
"when starting to compose a message"
msgstr ""
+"在开始撰写邮件时自动\n"
+"插入配置的签名"
#: configuredialog/configurecomposerpage.cpp:165
msgid "Insert the signature above any quoted text"
-msgstr ""
+msgstr "在所有引用的文本前插入签名"
#: configuredialog/configurecomposerpage.cpp:180
msgid ""
@@ -1149,14 +1139,12 @@
#: configuredialog/configurecomposerpage.cpp:195
msgid "When replying, do not quote any existing signature"
-msgstr ""
+msgstr "回复时不引用已经存在的签名"
#: configuredialog/configurecomposerpage.cpp:207
-#, fuzzy
-#| msgid "F&ormat:"
msgctxt "@title:group"
msgid "Format"
-msgstr "格式(&O):"
+msgstr "格式"
#: configuredialog/configurecomposerpage.cpp:214
#, fuzzy
@@ -1218,8 +1206,6 @@
msgstr "不自动保存"
#: configuredialog/configurecomposerpage.cpp:307
-#, fuzzy
-#| msgid " min"
msgctxt "Interval suffix"
msgid " minute"
msgid_plural " minutes"
@@ -1242,20 +1228,16 @@
#: configuredialog/configurecomposerpage.cpp:330
msgid "Set the default forwarded message format"
-msgstr ""
+msgstr "设定默认转发格式"
#: configuredialog/configurecomposerpage.cpp:334
-#, fuzzy
-#| msgid "Default Forwarding Type:"
msgid "Default forwarding type:"
msgstr "默认转发类型:"
#: configuredialog/configurecomposerpage.cpp:349
-#, fuzzy
-#| msgid "All Recipients"
msgctxt "@title:group"
msgid "Recipients"
-msgstr "全部收件人"
+msgstr "收件人"
#: configuredialog/configurecomposerpage.cpp:357
msgid ""
@@ -1269,8 +1251,6 @@
msgstr "收件人过多时警告"
#: configuredialog/configurecomposerpage.cpp:386
-#, fuzzy
-#| msgid "Warn if the number of recipients is larger than"
msgid "Set the maximum number of recipients for the warning"
msgstr "收件人大于一定数量时警告"
@@ -1291,15 +1271,11 @@
msgstr ""
#: configuredialog/configurecomposerpage.cpp:447
-#, fuzzy
-#| msgid "No save"
msgctxt "No addresses are retained"
msgid "No save"
msgstr "不保存"
#: configuredialog/configurecomposerpage.cpp:450
-#, fuzzy
-#| msgid "Maximum recent address:"
msgid "Maximum recent addresses retained:"
msgstr "最近地址的最大数量:"
@@ -1608,16 +1584,12 @@
msgstr "KMail 错误"
#: dialog/addemailtoexistingcontactdialog.cpp:38
-#, fuzzy
-#| msgid "Select Font"
msgid "Select Contact"
-msgstr "选择字体"
+msgstr "选择联系人"
#: dialog/addemailtoexistingcontactdialog.cpp:41
-#, fuzzy
-#| msgid "Se&lect..."
msgid "Select"
-msgstr "选择(&L)..."
+msgstr "选择"
#: dialog/archivefolderdialog.cpp:50
msgctxt "Start of the filename for a mail archive file"
@@ -1625,15 +1597,11 @@
msgstr "归档"
#: dialog/archivefolderdialog.cpp:57
-#, fuzzy
-#| msgid "Archive Folder"
msgctxt "@title:window for archiving a folder"
msgid "Archive Folder"
msgstr "归档文件夹"
#: dialog/archivefolderdialog.cpp:60 kmmainwidget.cpp:3686
-#, fuzzy
-#| msgid "Archive"
msgctxt "@action"
msgid "Archive"
msgstr "存档"
@@ -1994,10 +1962,8 @@
msgstr "小写"
#: editor/kmcomposewin.cpp:1375
-#, fuzzy
-#| msgid "Chang&e..."
msgid "Change Case"
-msgstr "更改(&E)..."
+msgstr "更改大小写"
#: editor/kmcomposewin.cpp:1388
msgid "&Spellchecker..."
@@ -2346,10 +2312,8 @@
msgstr "插入"
#: editor/kmcomposewin.cpp:3579
-#, fuzzy
-#| msgid "A critical error occurred. Processing stops here."
msgid "An error occurred while sending the file."
-msgstr "发生了严重错误。进度在此停住。"
+msgstr "发送文件时发生了错误。"
#: editor/kmcomposewin.cpp:3579
msgid "Upload file"
@@ -2361,10 +2325,8 @@
msgstr ""
#: editor/kmcomposewin.cpp:3598
-#, fuzzy
-#| msgid "KMail Error"
msgid "Error"
-msgstr "KMail 错误"
+msgstr "错误"
#: editor/snippetwidget.cpp:76
msgid "Text Snippets"
@@ -2379,16 +2341,13 @@
msgstr "无法获得搜索结果。%1"
#: folderarchive/folderarchiveagentcheckcollection.cpp:98
-#, fuzzy
-#| msgid "Folder was indexed: %1"
msgid "Folder name not defined."
-msgstr "文件夹已索引:%1"
+msgstr "文件夹名称未定义。"
#: folderarchive/folderarchiveagentcheckcollection.cpp:129
-#, fuzzy, kde-format
-#| msgid "Unable to retrieve folder list."
+#, kde-format
msgid "Unable to create folder. %1"
-msgstr "无法获取文件夹列表。"
+msgstr "无法创建文件夹。%1"
#: folderarchive/folderarchiveagentjob.cpp:47
msgid "Archive folder not defined. Please verify settings for account"
@@ -2435,10 +2394,8 @@
msgstr "无法获取文件夹列表。"
#: folderarchive/folderarchivemanager.cpp:181
-#, fuzzy
-#| msgid "Open Message in List Archive"
msgid "Messages archived"
-msgstr "打开列表归档中的信件"
+msgstr "已经存档消息"
#: foldershortcutactionmanager.cpp:138 foldershortcutactionmanager.cpp:139
#, kde-format
@@ -2850,27 +2807,19 @@
msgstr "编辑我的 vcard"
#: identity/identityeditvcarddialog.cpp:35
-#, fuzzy
-#| msgid "Delete current vcard"
msgid "Delete current vCard"
msgstr "删除当前 vCard"
#: identity/identityeditvcarddialog.cpp:61
-#, fuzzy
-#| msgid "Are you sure to want to delete this vcard?"
msgid "Are you sure to want to delete this vCard?"
msgstr "您确定要删除这个 vCard 名片吗?"
#: identity/identityeditvcarddialog.cpp:61
#: identity/identityeditvcarddialog.cpp:73
-#, fuzzy
-#| msgid "Delete vcard"
msgid "Delete vCard"
msgstr "删除 vCard"
#: identity/identityeditvcarddialog.cpp:73
-#, fuzzy
-#| msgid "We cannot delete vcard file."
msgid "We cannot delete vCard file."
msgstr "不能删除 vCard 文件。"
@@ -3020,10 +2969,8 @@
msgstr "您的地址簿项未设定图片。"
#: job/addemailtoexistingcontactjob.cpp:69
-#, fuzzy
-#| msgid "Messages deleted successfully."
msgid "Email added successfully."
-msgstr "信件删除成功。"
+msgstr "成功添加邮箱。"
#: job/addressvalidationjob.cpp:81
#, kde-format
@@ -3718,10 +3665,8 @@
msgstr "配置自动存档(&C)..."
#: kmmainwidget.cpp:3114
-#, fuzzy
-#| msgid "New Message To..."
msgid "Message Delayed..."
-msgstr "撰写新信件给..."
+msgstr "延迟消息..."
#: kmmainwidget.cpp:3130 kmmainwidget.cpp:4138
msgctxt "@action Hard delete, bypassing trash"
@@ -4180,11 +4125,10 @@
msgstr "无法启动“PIM 设置导出”程序"
#: kmmainwidget.cpp:4845
-#, fuzzy, kde-format
-#| msgid "Searching..."
+#, kde-format
msgctxt "Show shortcut for focus quick search. Don't change it"
msgid "Search...<%1>"
-msgstr "正在搜索..."
+msgstr "搜索...<%1>"
#: kmmainwin.cpp:61
msgid "New &Window"
@@ -4244,10 +4188,8 @@
msgstr "转发给..."
#: kmreaderwin.cpp:187
-#, fuzzy
-#| msgid "Failed to store contact"
msgid "Add to Existing Contact"
-msgstr "无法保存账户"
+msgstr "添加到已有账户"
#: kmreaderwin.cpp:196
msgid "Open in Address Book"
@@ -4410,15 +4352,15 @@
msgid "Contact modified successfully"
msgstr "成功修改联系人"
-#: kmsystemtray.cpp:296
+#: kmsystemtray.cpp:306
msgid "New Messages In"
msgstr "新邮件位于"
-#: kmsystemtray.cpp:394
+#: kmsystemtray.cpp:404
msgid "There are no unread messages"
msgstr "无未读信件"
-#: kmsystemtray.cpp:395
+#: kmsystemtray.cpp:405
#, kde-format
msgid "1 unread message"
msgid_plural "%1 unread messages"
@@ -4671,22 +4613,16 @@
msgstr "无法获得搜索结果。%1"
#: searchdialog/searchwindow.cpp:541
-#, fuzzy
-#| msgid "Search canceled"
msgid "Search failed."
-msgstr "搜索已取消。"
+msgstr "搜索失败。"
#: searchdialog/searchwindow.cpp:581
-#, fuzzy
-#| msgid "Search canceled"
msgid "Search complete."
-msgstr "搜索已取消。"
+msgstr "搜索完成。"
#: searchdialog/searchwindow.cpp:601
-#, fuzzy
-#| msgid "Search tag"
msgid "Search stopped."
-msgstr "搜索标签"
+msgstr "搜索已停止。"
#: searchdialog/searchwindow.cpp:659
#, kde-format
@@ -4788,7 +4724,7 @@
msgid ""
"The threshold for when to warn the user that a folder is nearing its quota "
"limit."
-msgstr "决定何时警告用户文件夹配额即将超出限度的阈值。"
+msgstr "决定何时警告用户文件夹配额即将超出限度。"
#. i18n: ectx: label, entry (EmptyTrashOnExit), group (General)
#: settings/kmail.kcfg.cmake:118
@@ -5608,10 +5544,8 @@
#. i18n: ectx: property (text), widget (QRadioButton, mChkMultiFolders)
#: ui/searchwindow.ui:53
-#, fuzzy
-#| msgid "Select specific folders"
msgid "Select specific folders:"
-msgstr "选择指定的文件夹"
+msgstr "选择指定的文件夹:"
#. i18n: ectx: property (text), widget (QPushButton, selectMultipleFolders)
#: ui/searchwindow.ui:60
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdepim/knotes.po kde-l10n-zhcn-4.12.95/messages/kdepim/knotes.po
--- kde-l10n-zhcn-4.12.90/messages/kdepim/knotes.po 2014-03-13 04:01:06.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdepim/knotes.po 2014-03-19 06:15:59.000000000 +0000
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: knotes\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2014-03-13 01:45+0000\n"
+"POT-Creation-Date: 2014-03-19 04:17+0000\n"
"PO-Revision-Date: 2009-06-01 10:40+0800\n"
"Last-Translator: Lie Ex \n"
"Language-Team: zh_CN \n"
@@ -307,183 +307,183 @@
msgid "No Result found."
msgstr ""
-#: knoteedit.cpp:62
+#: knoteedit.cpp:63
msgid "Bold"
msgstr "粗体"
-#: knoteedit.cpp:67
+#: knoteedit.cpp:68
msgid "Italic"
msgstr "斜体"
-#: knoteedit.cpp:71
+#: knoteedit.cpp:72
msgid "Underline"
msgstr "下划线"
-#: knoteedit.cpp:75
+#: knoteedit.cpp:76
msgid "Strike Out"
msgstr "删除线"
-#: knoteedit.cpp:88
+#: knoteedit.cpp:89
msgid "Align Left"
msgstr "左对齐"
-#: knoteedit.cpp:95
+#: knoteedit.cpp:96
msgid "Align Center"
msgstr "居中对齐"
-#: knoteedit.cpp:101
+#: knoteedit.cpp:102
msgid "Align Right"
msgstr "右对齐"
-#: knoteedit.cpp:107
+#: knoteedit.cpp:108
msgid "Align Block"
msgstr "两端对齐"
-#: knoteedit.cpp:119
+#: knoteedit.cpp:120
msgid "List"
msgstr "列表"
-#: knoteedit.cpp:124
+#: knoteedit.cpp:125
msgid "Superscript"
msgstr "上标"
-#: knoteedit.cpp:128
+#: knoteedit.cpp:129
msgid "Subscript"
msgstr "下标"
-#: knoteedit.cpp:135
+#: knoteedit.cpp:136
msgid "Increase Indent"
msgstr "增加缩进"
-#: knoteedit.cpp:143
+#: knoteedit.cpp:144
msgid "Decrease Indent"
msgstr "减少缩进"
-#: knoteedit.cpp:156
+#: knoteedit.cpp:157
msgid "Text Color..."
msgstr "文字颜色..."
-#: knoteedit.cpp:161
+#: knoteedit.cpp:162
msgid "Text Background Color..."
msgstr "文字背景颜色..."
-#: knoteedit.cpp:165
+#: knoteedit.cpp:166
msgid "Text Font"
msgstr "文本字体"
-#: knoteedit.cpp:170
+#: knoteedit.cpp:171
msgid "Text Size"
msgstr "文本大小"
-#: knoteedit.cpp:175
+#: knoteedit.cpp:176
msgid "Uppercase"
msgstr ""
-#: knoteedit.cpp:179
+#: knoteedit.cpp:180
msgid "Lowercase"
msgstr ""
-#: knoteedit.cpp:183
+#: knoteedit.cpp:184
msgid "Insert Date"
msgstr "插入日期"
-#: knoteedit.cpp:225
+#: knoteedit.cpp:266
msgid "Change case..."
msgstr ""
-#: notes/knote.cpp:170
+#: notes/knote.cpp:169
#, kde-format
msgid "Do you really want to delete note %1?"
msgstr "您真要删除便笺 %1 吗?"
-#: notes/knote.cpp:172
+#: notes/knote.cpp:171
msgid "Confirm Delete"
msgstr "确认删除"
-#: notes/knote.cpp:173
+#: notes/knote.cpp:172
msgid "&Delete"
msgstr "删除(&D)"
-#: notes/knote.cpp:299
+#: notes/knote.cpp:298
msgid "Please enter the new name:"
msgstr "请输入新的名字:"
-#: notes/knote.cpp:513
+#: notes/knote.cpp:512
msgid "Save note as plain text"
msgstr "将便笺另存为纯文本"
-#: notes/knote.cpp:518
+#: notes/knote.cpp:517
msgid "Save As"
msgstr "另存为"
-#: notes/knote.cpp:535
+#: notes/knote.cpp:534
#, kde-format
msgid ""
"A file named %1 already exists.
Are you sure you want to "
"overwrite it?"
msgstr "已经存在名为 %1 的文件。
您确定想要覆盖吗?"
-#: notes/knote.cpp:645
+#: notes/knote.cpp:644
msgid "&All Desktops"
msgstr "所有桌面(&A)"
-#: notes/knote.cpp:686
+#: notes/knote.cpp:685
msgid "New"
msgstr "新建"
-#: notes/knote.cpp:690
+#: notes/knote.cpp:689
msgid "Rename..."
msgstr "重命名..."
-#: notes/knote.cpp:695
+#: notes/knote.cpp:694
msgid "Lock"
msgstr "锁定"
-#: notes/knote.cpp:699
+#: notes/knote.cpp:698
msgid "Unlock"
msgstr "取消锁定"
-#: notes/knote.cpp:701
+#: notes/knote.cpp:700
msgid "Hide"
msgstr "隐藏"
-#: notes/knote.cpp:706
+#: notes/knote.cpp:705
msgid "Delete"
msgstr "删除"
-#: notes/knote.cpp:710
+#: notes/knote.cpp:709
msgid "Set Alarm..."
msgstr "设定提醒..."
-#: notes/knote.cpp:715
+#: notes/knote.cpp:714
msgid "Send..."
msgstr "发送..."
-#: notes/knote.cpp:719
+#: notes/knote.cpp:718
msgid "Mail..."
msgstr "邮寄..."
-#: notes/knote.cpp:723
+#: notes/knote.cpp:722
msgid "Save As..."
msgstr "另存为..."
-#: notes/knote.cpp:734
+#: notes/knote.cpp:733
msgid "Preferences..."
msgstr "首选项..."
-#: notes/knote.cpp:740
+#: notes/knote.cpp:739
msgid "Keep Above Others"
msgstr "常居顶端"
-#: notes/knote.cpp:746
+#: notes/knote.cpp:745
msgid "Keep Below Others"
msgstr "常居底端"
-#: notes/knote.cpp:752
+#: notes/knote.cpp:751
msgid "To Desktop"
msgstr "移到桌面"
-#: notes/knote.cpp:762
+#: notes/knote.cpp:761
msgid "Walk Through Notes"
msgstr "便笺漫游"
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdepim/kontact.po kde-l10n-zhcn-4.12.95/messages/kdepim/kontact.po
--- kde-l10n-zhcn-4.12.90/messages/kdepim/kontact.po 2014-03-12 03:53:28.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdepim/kontact.po 2014-03-18 04:17:11.000000000 +0000
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: kontact\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2014-03-12 01:49+0000\n"
+"POT-Creation-Date: 2014-03-18 01:42+0000\n"
"PO-Revision-Date: 2013-04-05 20:07+0800\n"
"Last-Translator: FengChao \n"
"Language-Team: Chinese Simplified \n"
@@ -260,89 +260,89 @@
msgid "Laurent Montel"
msgstr "目前维护者"
-#: plugins/knotes/knotes_part.cpp:115
+#: plugins/knotes/knotes_part.cpp:114
msgctxt "@action:inmenu create new popup note"
msgid "&New"
msgstr "新建(&N)"
-#: plugins/knotes/knotes_part.cpp:120
+#: plugins/knotes/knotes_part.cpp:119
msgctxt "@info:status"
msgid "Create a new popup note"
msgstr "创建新的弹出便笺"
-#: plugins/knotes/knotes_part.cpp:123
+#: plugins/knotes/knotes_part.cpp:122
msgctxt "@info:whatsthis"
msgid "You will be presented with a dialog where you can add a new popup note."
msgstr "这将展示一个对话框,告诉您在哪里新建弹出便笺。"
-#: plugins/knotes/knotes_part.cpp:126 plugins/knotes/knotes_part.cpp:608
-#: plugins/knotes/knotes_part.cpp:610 plugins/knotes/knotes_part.cpp:787
+#: plugins/knotes/knotes_part.cpp:125 plugins/knotes/knotes_part.cpp:585
+#: plugins/knotes/knotes_part.cpp:587 plugins/knotes/knotes_part.cpp:764
msgctxt "@action:inmenu"
msgid "Edit..."
msgstr "编辑..."
-#: plugins/knotes/knotes_part.cpp:130
+#: plugins/knotes/knotes_part.cpp:129
msgctxt "@info:status"
msgid "Edit popup note"
msgstr "编辑弹出便笺"
-#: plugins/knotes/knotes_part.cpp:133
+#: plugins/knotes/knotes_part.cpp:132
msgctxt "@info:whatsthis"
msgid ""
"You will be presented with a dialog where you can modify an existing popup "
"note."
msgstr "这将展示一个对话框,告诉您在哪里修改已有的弹出便笺。"
-#: plugins/knotes/knotes_part.cpp:136
+#: plugins/knotes/knotes_part.cpp:135
msgctxt "@action:inmenu"
msgid "Rename..."
msgstr "重命名..."
-#: plugins/knotes/knotes_part.cpp:141
+#: plugins/knotes/knotes_part.cpp:140
msgctxt "@info:status"
msgid "Rename popup note"
msgstr "重命名弹出便笺"
-#: plugins/knotes/knotes_part.cpp:144
+#: plugins/knotes/knotes_part.cpp:143
msgctxt "@info:whatsthis"
msgid ""
"You will be presented with a dialog where you can rename an existing popup "
"note."
msgstr "这将展示一个对话框,告诉您在哪里重命名已有的弹出便笺。"
-#: plugins/knotes/knotes_part.cpp:147
+#: plugins/knotes/knotes_part.cpp:146
msgctxt "@action:inmenu"
msgid "Delete"
msgstr "删除"
-#: plugins/knotes/knotes_part.cpp:152
+#: plugins/knotes/knotes_part.cpp:151
msgctxt "@info:status"
msgid "Delete popup note"
msgstr "删除弹出便笺"
-#: plugins/knotes/knotes_part.cpp:155
+#: plugins/knotes/knotes_part.cpp:154
msgctxt "@info:whatsthis"
msgid ""
"You will be prompted if you really want to permanently remove the selected "
"popup note."
msgstr "在永久删除所选的弹出便笺前,会有确认提示。"
-#: plugins/knotes/knotes_part.cpp:159
+#: plugins/knotes/knotes_part.cpp:158
msgctxt "@action:inmenu"
msgid "Print Selected Notes..."
msgstr "打印选中的便笺..."
-#: plugins/knotes/knotes_part.cpp:163
+#: plugins/knotes/knotes_part.cpp:162
msgctxt "@info:status"
msgid "Print popup note"
msgstr "打印弹出便笺"
-#: plugins/knotes/knotes_part.cpp:166
+#: plugins/knotes/knotes_part.cpp:165
msgctxt "@info:whatsthis"
msgid "You will be prompted to print the selected popup note."
msgstr "打印所选的弹出便笺时会有提示。"
-#: plugins/knotes/knotes_part.cpp:169
+#: plugins/knotes/knotes_part.cpp:168
#, fuzzy
#| msgctxt "@action:inmenu"
#| msgid "Print Selected Notes..."
@@ -350,67 +350,67 @@
msgid "Print Preview Selected Notes..."
msgstr "打印选中的便笺..."
-#: plugins/knotes/knotes_part.cpp:175
+#: plugins/knotes/knotes_part.cpp:174
msgid "Note settings..."
msgstr ""
-#: plugins/knotes/knotes_part.cpp:179
+#: plugins/knotes/knotes_part.cpp:178
#, fuzzy
#| msgctxt "@action:inmenu"
#| msgid "Print Selected Notes..."
msgid "Preferences KNotes..."
msgstr "打印选中的便笺..."
-#: plugins/knotes/knotes_part.cpp:183
+#: plugins/knotes/knotes_part.cpp:182
msgid "Mail..."
msgstr ""
-#: plugins/knotes/knotes_part.cpp:187
+#: plugins/knotes/knotes_part.cpp:186
msgid "Send..."
msgstr ""
-#: plugins/knotes/knotes_part.cpp:191
+#: plugins/knotes/knotes_part.cpp:190
msgid "Set Alarm..."
msgstr ""
-#: plugins/knotes/knotes_part.cpp:196
+#: plugins/knotes/knotes_part.cpp:195
msgid "New Note From Clipboard"
msgstr ""
-#: plugins/knotes/knotes_part.cpp:201
+#: plugins/knotes/knotes_part.cpp:200
msgid "Save As..."
msgstr ""
-#: plugins/knotes/knotes_part.cpp:205
+#: plugins/knotes/knotes_part.cpp:204
msgid "Lock"
msgstr ""
-#: plugins/knotes/knotes_part.cpp:208
+#: plugins/knotes/knotes_part.cpp:207
msgid "Unlock"
msgstr ""
-#: plugins/knotes/knotes_part.cpp:328
+#: plugins/knotes/knotes_part.cpp:306
msgctxt "@info"
msgid "To print notes, first select the notes to print from the list."
msgstr "要打印便笺,请先从列表中选择要打印的便笺。"
-#: plugins/knotes/knotes_part.cpp:329
+#: plugins/knotes/knotes_part.cpp:307
msgctxt "@title:window"
msgid "Print Popup Notes"
msgstr "打印弹出便笺"
-#: plugins/knotes/knotes_part.cpp:373
+#: plugins/knotes/knotes_part.cpp:351
msgid "Note was not created."
msgstr ""
-#: plugins/knotes/knotes_part.cpp:373
+#: plugins/knotes/knotes_part.cpp:351
#, fuzzy
#| msgctxt "@info:status"
#| msgid "Create new popup note"
msgid "Create new note"
msgstr "创建一个新的弹出便笺"
-#: plugins/knotes/knotes_part.cpp:395
+#: plugins/knotes/knotes_part.cpp:373
#: plugins/knotes/knotesselectdeletenotesdialog.cpp:62
#, kde-format
msgctxt "@info"
@@ -418,44 +418,44 @@
msgid_plural "Do you really want to delete these %1 notes?"
msgstr[0] "您真的想要删除这 %1 个便笺吗?"
-#: plugins/knotes/knotes_part.cpp:397
+#: plugins/knotes/knotes_part.cpp:375
#: plugins/knotes/knotesselectdeletenotesdialog.cpp:54
msgctxt "@title:window"
msgid "Confirm Delete"
msgstr "确认删除"
-#: plugins/knotes/knotes_part.cpp:585
+#: plugins/knotes/knotes_part.cpp:562
msgctxt "@title:window"
msgid "Rename Popup Note"
msgstr "重命名弹出便笺"
-#: plugins/knotes/knotes_part.cpp:586
+#: plugins/knotes/knotes_part.cpp:563
msgctxt "@label:textbox"
msgid "New Name:"
msgstr "新名称:"
-#: plugins/knotes/knotes_part.cpp:608 plugins/knotes/knotes_part.cpp:787
+#: plugins/knotes/knotes_part.cpp:585 plugins/knotes/knotes_part.cpp:764
#, fuzzy
#| msgctxt "@action:inmenu"
#| msgid "New Popup Note..."
msgid "Show Note..."
msgstr "新建弹出便笺..."
-#: plugins/knotes/knotes_part.cpp:638
+#: plugins/knotes/knotes_part.cpp:615
#, fuzzy
#| msgid "&Settings"
msgid "Settings"
msgstr "设置(&S)"
-#: plugins/knotes/knotes_part.cpp:737
+#: plugins/knotes/knotes_part.cpp:714
msgid "Save note as plain text"
msgstr ""
-#: plugins/knotes/knotes_part.cpp:741
+#: plugins/knotes/knotes_part.cpp:718
msgid "Save As"
msgstr ""
-#: plugins/knotes/knotes_part.cpp:757
+#: plugins/knotes/knotes_part.cpp:734
#, kde-format
msgid ""
"A file named %1 already exists.
Are you sure you want to "
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdepim/libkdepim.po kde-l10n-zhcn-4.12.95/messages/kdepim/libkdepim.po
--- kde-l10n-zhcn-4.12.90/messages/kdepim/libkdepim.po 2014-02-22 03:33:27.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdepim/libkdepim.po 2014-03-18 04:17:11.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: libkdepim\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2014-02-22 01:41+0000\n"
+"POT-Creation-Date: 2014-03-18 01:42+0000\n"
"PO-Revision-Date: 2013-01-22 15:33-0500\n"
"Last-Translator: Weng Xuetian \n"
"Language-Team: Chinese Simplified \n"
@@ -200,208 +200,204 @@
msgid "Store clear text password in KWallet"
msgstr ""
-#: ldap/ldapsearchdialog.cpp:99
+#: ldap/ldapsearchdialog.cpp:100
msgctxt "@item LDAP search key"
msgid "Title"
msgstr "头衔"
-#: ldap/ldapsearchdialog.cpp:100 ldap/ldapsearchdialog.cpp:309
+#: ldap/ldapsearchdialog.cpp:101 ldap/ldapsearchdialog.cpp:310
msgid "Full Name"
msgstr "全名"
-#: ldap/ldapsearchdialog.cpp:101
+#: ldap/ldapsearchdialog.cpp:102
msgctxt "@item LDAP search key"
msgid "Email"
msgstr "电子邮件"
-#: ldap/ldapsearchdialog.cpp:102 ldap/ldapsearchdialog.cpp:144
-#: ldap/ldapsearchdialog.cpp:315
+#: ldap/ldapsearchdialog.cpp:103 ldap/ldapsearchdialog.cpp:145
+#: ldap/ldapsearchdialog.cpp:316
msgid "Home Number"
msgstr "宅电"
-#: ldap/ldapsearchdialog.cpp:103 ldap/ldapsearchdialog.cpp:146
-#: ldap/ldapsearchdialog.cpp:318
+#: ldap/ldapsearchdialog.cpp:104 ldap/ldapsearchdialog.cpp:147
+#: ldap/ldapsearchdialog.cpp:319
msgid "Work Number"
msgstr "办公电话"
-#: ldap/ldapsearchdialog.cpp:104 ldap/ldapsearchdialog.cpp:321
+#: ldap/ldapsearchdialog.cpp:105 ldap/ldapsearchdialog.cpp:322
msgid "Mobile Number"
msgstr "移动电话"
-#: ldap/ldapsearchdialog.cpp:105 ldap/ldapsearchdialog.cpp:324
+#: ldap/ldapsearchdialog.cpp:106 ldap/ldapsearchdialog.cpp:325
msgid "Fax Number"
msgstr "传真"
-#: ldap/ldapsearchdialog.cpp:106
+#: ldap/ldapsearchdialog.cpp:107
msgid "Pager"
msgstr "寻呼机"
-#: ldap/ldapsearchdialog.cpp:107 ldap/ldapsearchdialog.cpp:333
+#: ldap/ldapsearchdialog.cpp:108 ldap/ldapsearchdialog.cpp:334
msgid "Street"
msgstr "街道"
-#: ldap/ldapsearchdialog.cpp:108
+#: ldap/ldapsearchdialog.cpp:109
msgctxt "@item LDAP search key"
msgid "State"
msgstr "州/省"
-#: ldap/ldapsearchdialog.cpp:109 ldap/ldapsearchdialog.cpp:340
+#: ldap/ldapsearchdialog.cpp:110 ldap/ldapsearchdialog.cpp:341
msgid "Country"
msgstr "国家"
-#: ldap/ldapsearchdialog.cpp:110 ldap/ldapsearchdialog.cpp:349
+#: ldap/ldapsearchdialog.cpp:111 ldap/ldapsearchdialog.cpp:350
msgid "City"
msgstr "城市"
-#: ldap/ldapsearchdialog.cpp:111 ldap/ldapsearchdialog.cpp:330
+#: ldap/ldapsearchdialog.cpp:112 ldap/ldapsearchdialog.cpp:331
msgid "Organization"
msgstr "组织"
-#: ldap/ldapsearchdialog.cpp:112 ldap/ldapsearchdialog.cpp:327
+#: ldap/ldapsearchdialog.cpp:113 ldap/ldapsearchdialog.cpp:328
msgid "Company"
msgstr "公司"
-#: ldap/ldapsearchdialog.cpp:113 ldap/ldapsearchdialog.cpp:352
+#: ldap/ldapsearchdialog.cpp:114 ldap/ldapsearchdialog.cpp:353
msgid "Department"
msgstr "部门"
-#: ldap/ldapsearchdialog.cpp:114 ldap/ldapsearchdialog.cpp:343
+#: ldap/ldapsearchdialog.cpp:115 ldap/ldapsearchdialog.cpp:344
msgid "Zip Code"
msgstr "邮编"
-#: ldap/ldapsearchdialog.cpp:115 ldap/ldapsearchdialog.cpp:346
+#: ldap/ldapsearchdialog.cpp:116 ldap/ldapsearchdialog.cpp:347
msgid "Postal Address"
msgstr "邮政地址"
-#: ldap/ldapsearchdialog.cpp:116 ldap/ldapsearchdialog.cpp:355
+#: ldap/ldapsearchdialog.cpp:117 ldap/ldapsearchdialog.cpp:356
msgid "Description"
msgstr "描述"
-#: ldap/ldapsearchdialog.cpp:117 ldap/ldapsearchdialog.cpp:358
+#: ldap/ldapsearchdialog.cpp:118 ldap/ldapsearchdialog.cpp:359
msgid "User ID"
msgstr "用户编号"
-#: ldap/ldapsearchdialog.cpp:137
+#: ldap/ldapsearchdialog.cpp:138
msgctxt "Search attribute: Name of contact"
msgid "Name"
msgstr "名称"
-#: ldap/ldapsearchdialog.cpp:142
+#: ldap/ldapsearchdialog.cpp:143
msgctxt "Search attribute: Email of the contact"
msgid "Email"
msgstr "电子邮件"
-#: ldap/ldapsearchdialog.cpp:312
+#: ldap/ldapsearchdialog.cpp:313
msgctxt "@title:column Column containing email addresses"
msgid "Email"
msgstr "电子邮件"
-#: ldap/ldapsearchdialog.cpp:337
+#: ldap/ldapsearchdialog.cpp:338
msgctxt "@title:column Column containing the residential state of the address"
msgid "State"
msgstr "州/省"
-#: ldap/ldapsearchdialog.cpp:361
+#: ldap/ldapsearchdialog.cpp:362
msgctxt "@title:column Column containing title of the person"
msgid "Title"
msgstr "头衔"
-#: ldap/ldapsearchdialog.cpp:519
+#: ldap/ldapsearchdialog.cpp:522
msgid "Import Contacts from LDAP"
msgstr "从 LDAP 导入联系人"
-#: ldap/ldapsearchdialog.cpp:531
+#: ldap/ldapsearchdialog.cpp:534
msgid "Search for Addresses in Directory"
msgstr "在目录中搜索地址"
-#: ldap/ldapsearchdialog.cpp:538
+#: ldap/ldapsearchdialog.cpp:541
msgid "Search for:"
msgstr "搜索:"
-#: ldap/ldapsearchdialog.cpp:546
+#: ldap/ldapsearchdialog.cpp:549
msgctxt "In LDAP attribute"
msgid "in"
msgstr "于"
-#: ldap/ldapsearchdialog.cpp:550
+#: ldap/ldapsearchdialog.cpp:553
msgctxt "@item:inlistbox Name of the contact"
msgid "Name"
msgstr "名称"
-#: ldap/ldapsearchdialog.cpp:551
+#: ldap/ldapsearchdialog.cpp:554
msgctxt "@item:inlistbox email address of the contact"
msgid "Email"
msgstr "电子邮件"
-#: ldap/ldapsearchdialog.cpp:552
+#: ldap/ldapsearchdialog.cpp:555
msgctxt "@item:inlistbox"
msgid "Home Number"
msgstr "宅电"
-#: ldap/ldapsearchdialog.cpp:553
+#: ldap/ldapsearchdialog.cpp:556
msgctxt "@item:inlistbox"
msgid "Work Number"
msgstr "办公电话"
-#: ldap/ldapsearchdialog.cpp:557 ldap/ldapsearchdialog.cpp:787
-msgid "Stop"
-msgstr "停止"
-
-#: ldap/ldapsearchdialog.cpp:559 ldap/ldapsearchdialog.cpp:829
+#: ldap/ldapsearchdialog.cpp:558
msgctxt "@action:button Start searching"
msgid "&Search"
msgstr "搜索(&S)"
-#: ldap/ldapsearchdialog.cpp:568
+#: ldap/ldapsearchdialog.cpp:574
msgid "Recursive search"
msgstr "递归搜索"
-#: ldap/ldapsearchdialog.cpp:573
+#: ldap/ldapsearchdialog.cpp:579
msgid "Contains"
msgstr "包含"
-#: ldap/ldapsearchdialog.cpp:574
+#: ldap/ldapsearchdialog.cpp:580
msgid "Starts With"
msgstr "开始于"
-#: ldap/ldapsearchdialog.cpp:604
+#: ldap/ldapsearchdialog.cpp:610
#, fuzzy
#| msgctxt "@action:button Start searching"
#| msgid "&Search"
msgid "Searching..."
msgstr "搜索(&S)"
-#: ldap/ldapsearchdialog.cpp:608
+#: ldap/ldapsearchdialog.cpp:614
msgid "Select All"
msgstr "全部选择"
-#: ldap/ldapsearchdialog.cpp:610
+#: ldap/ldapsearchdialog.cpp:616
msgid "Unselect All"
msgstr "全部取消选择"
-#: ldap/ldapsearchdialog.cpp:617
+#: ldap/ldapsearchdialog.cpp:623
msgid "Add Selected"
msgstr "添加所选项"
-#: ldap/ldapsearchdialog.cpp:618
+#: ldap/ldapsearchdialog.cpp:624
msgid "Configure LDAP Servers..."
msgstr "配置 LDAP 服务器..."
-#: ldap/ldapsearchdialog.cpp:656
+#: ldap/ldapsearchdialog.cpp:662
msgid "Copy"
msgstr ""
-#: ldap/ldapsearchdialog.cpp:779
+#: ldap/ldapsearchdialog.cpp:785
msgid "You must select an LDAP server before searching."
msgstr "在搜索前您必须选择 LDAP 服务器。"
-#: ldap/ldapsearchdialog.cpp:878
+#: ldap/ldapsearchdialog.cpp:884
#, kde-format
msgctxt "arguments are host name, datetime"
msgid "Imported from LDAP directory %1 on %2"
msgstr "已从 %2 的 LDAP 目录 %1 导入"
-#: ldap/ldapsearchdialog.cpp:895
+#: ldap/ldapsearchdialog.cpp:901
msgid "Configure the Address Book LDAP Settings"
msgstr "配置地址簿 LDAP 设置"
@@ -605,6 +601,9 @@
msgid "Spell Checking Language"
msgstr ""
+#~ msgid "Stop"
+#~ msgstr "停止"
+
#~ msgid "&Configure"
#~ msgstr "配置(&C)"
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdepim/libksieve.po kde-l10n-zhcn-4.12.95/messages/kdepim/libksieve.po
--- kde-l10n-zhcn-4.12.90/messages/kdepim/libksieve.po 2014-03-13 04:01:06.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdepim/libksieve.po 2014-03-18 04:17:11.000000000 +0000
@@ -3,7 +3,7 @@
msgstr ""
"Project-Id-Version: libksieve\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2014-03-13 01:45+0000\n"
+"POT-Creation-Date: 2014-03-18 01:42+0000\n"
"PO-Revision-Date: 2013-01-22 15:30-0500\n"
"Last-Translator: Weng Xuetian \n"
"Language-Team: Chinese Simplified \n"
@@ -108,7 +108,7 @@
msgid "Sieve Error"
msgstr ""
-#: ksieveui/autocreatescripts/autocreatescriptdialog.cpp:32
+#: ksieveui/autocreatescripts/autocreatescriptdialog.cpp:34
msgid "Create sieve filter"
msgstr ""
@@ -513,7 +513,7 @@
#: ksieveui/autocreatescripts/sieveactions/sieveactionsetvariable.cpp:64
#: ksieveui/autocreatescripts/sieveconditions/sieveconditionenvironment.cpp:70
-#: ksieveui/autocreatescripts/sieveconditions/sieveconditionhasflag.cpp:68
+#: ksieveui/autocreatescripts/sieveconditions/sieveconditionhasflag.cpp:70
#: ksieveui/autocreatescripts/sieveconditions/sieveconditionmetadata.cpp:74
#: ksieveui/autocreatescripts/sieveconditions/sieveconditionservermetadata.cpp:75
msgid "Value:"
@@ -828,13 +828,13 @@
msgid "Has Flag"
msgstr ""
-#: ksieveui/autocreatescripts/sieveconditions/sieveconditionhasflag.cpp:60
+#: ksieveui/autocreatescripts/sieveconditions/sieveconditionhasflag.cpp:61
msgid ""
"Variable name\n"
" (if empty it uses internal variable):"
msgstr ""
-#: ksieveui/autocreatescripts/sieveconditions/sieveconditionhasflag.cpp:125
+#: ksieveui/autocreatescripts/sieveconditions/sieveconditionhasflag.cpp:130
msgid ""
"The hasflag test evaluates to true if any of the variables matches any flag "
"name."
@@ -1463,33 +1463,33 @@
"\n"
msgstr ""
-#: ksieveui/debug/sievedebugdialog.cpp:70
+#: ksieveui/debug/sievedebugdialog.cpp:86
#, kde-format
msgid "Collecting data for account '%1'...\n"
msgstr ""
-#: ksieveui/debug/sievedebugdialog.cpp:71
+#: ksieveui/debug/sievedebugdialog.cpp:87
msgid "------------------------------------------------------------\n"
msgstr "------------------------------------------------------------\n"
-#: ksieveui/debug/sievedebugdialog.cpp:76
+#: ksieveui/debug/sievedebugdialog.cpp:92
msgid ""
"(Account does not support Sieve)\n"
"\n"
msgstr ""
-#: ksieveui/debug/sievedebugdialog.cpp:107
+#: ksieveui/debug/sievedebugdialog.cpp:123
#, kde-format
msgid "Contents of script '%1':\n"
msgstr ""
-#: ksieveui/debug/sievedebugdialog.cpp:129
+#: ksieveui/debug/sievedebugdialog.cpp:145
msgid ""
"(This script is empty.)\n"
"\n"
msgstr ""
-#: ksieveui/debug/sievedebugdialog.cpp:132
+#: ksieveui/debug/sievedebugdialog.cpp:148
#, kde-format
msgid ""
"------------------------------------------------------------\n"
@@ -1498,25 +1498,25 @@
"\n"
msgstr ""
-#: ksieveui/debug/sievedebugdialog.cpp:148
+#: ksieveui/debug/sievedebugdialog.cpp:164
msgid "Sieve capabilities:\n"
msgstr ""
-#: ksieveui/debug/sievedebugdialog.cpp:151
+#: ksieveui/debug/sievedebugdialog.cpp:167
msgid "(No special capabilities available)"
msgstr ""
-#: ksieveui/debug/sievedebugdialog.cpp:159
+#: ksieveui/debug/sievedebugdialog.cpp:175
msgid "Available Sieve scripts:\n"
msgstr ""
-#: ksieveui/debug/sievedebugdialog.cpp:162
+#: ksieveui/debug/sievedebugdialog.cpp:178
msgid ""
"(No Sieve scripts available on this server)\n"
"\n"
msgstr ""
-#: ksieveui/debug/sievedebugdialog.cpp:169
+#: ksieveui/debug/sievedebugdialog.cpp:185
#, kde-format
msgid ""
"Active script: %1\n"
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdepim/libmailcommon.po kde-l10n-zhcn-4.12.95/messages/kdepim/libmailcommon.po
--- kde-l10n-zhcn-4.12.90/messages/kdepim/libmailcommon.po 2014-03-13 04:01:06.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdepim/libmailcommon.po 2014-03-17 03:50:16.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2014-03-13 01:45+0000\n"
+"POT-Creation-Date: 2014-03-17 01:45+0000\n"
"PO-Revision-Date: 2013-01-23 16:01-0500\n"
"Last-Translator: Weng Xuetian \n"
"Language-Team: Chinese Simplified \n"
@@ -1816,20 +1816,20 @@
msgid " not implemented/supported"
msgstr ""
-#: search/searchpattern.cpp:1487
+#: search/searchpattern.cpp:1494
msgctxt "name used for a virgin filter"
msgid "unknown"
msgstr "未知"
-#: search/searchpattern.cpp:1495
+#: search/searchpattern.cpp:1502
msgid "(match any of the following)"
msgstr "(满足下列任何条件)"
-#: search/searchpattern.cpp:1498
+#: search/searchpattern.cpp:1505
msgid "(match all of the following)"
msgstr "(匹配以下全部条件)"
-#: search/searchpattern.cpp:1501
+#: search/searchpattern.cpp:1508
msgid "(match all messages)"
msgstr ""
@@ -2102,19 +2102,19 @@
msgstr "名称(&N):"
#. i18n: ectx: property (text), widget (QLabel, textLabelGroup)
-#: snippets/ui/snippetdialog.ui:64
+#: snippets/ui/snippetdialog.ui:68
msgctxt "Group to which the snippet belongs."
msgid "Group:"
msgstr "群组:"
#. i18n: ectx: property (text), widget (QLabel, textLabel)
-#: snippets/ui/snippetdialog.ui:77
+#: snippets/ui/snippetdialog.ui:81
#, fuzzy
msgid "&Snippet:"
msgstr "代码片断(&S)"
#. i18n: ectx: property (text), widget (QLabel, keyWidgetLabel)
-#: snippets/ui/snippetdialog.ui:106
+#: snippets/ui/snippetdialog.ui:110
msgid "Sh&ortcut:"
msgstr "快捷键(&O):"
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdepim/libmessagecore.po kde-l10n-zhcn-4.12.95/messages/kdepim/libmessagecore.po
--- kde-l10n-zhcn-4.12.90/messages/kdepim/libmessagecore.po 2014-02-24 03:47:48.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdepim/libmessagecore.po 2014-03-18 04:17:11.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2014-02-24 01:46+0000\n"
+"POT-Creation-Date: 2014-03-18 01:42+0000\n"
"PO-Revision-Date: 2013-01-23 16:02-0500\n"
"Last-Translator: Weng Xuetian \n"
"Language-Team: Chinese Simplified \n"
@@ -332,6 +332,6 @@
msgid "Delete"
msgstr "删除"
-#: widgets/emailaddressrequester.cpp:86
+#: widgets/emailaddressrequester.cpp:87
msgid "Open Address Book"
msgstr "打开地址簿"
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdepim/libmessagelist.po kde-l10n-zhcn-4.12.95/messages/kdepim/libmessagelist.po
--- kde-l10n-zhcn-4.12.90/messages/kdepim/libmessagelist.po 2014-03-12 03:53:28.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdepim/libmessagelist.po 2014-03-15 03:21:58.000000000 +0000
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: kmail\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2014-03-12 01:49+0000\n"
+"POT-Creation-Date: 2014-03-15 01:37+0000\n"
"PO-Revision-Date: 2010-07-14 16:01+0800\n"
"Last-Translator: Lie Ex \n"
"Language-Team: 简体中文 \n"
@@ -807,47 +807,47 @@
msgid "Unknown"
msgstr "未知"
-#: core/theme.cpp:615
+#: core/theme.cpp:602
msgid "Unread"
msgstr "未读"
-#: core/theme.cpp:776
+#: core/theme.cpp:763
msgid "Never Show"
msgstr "从不显示"
-#: core/theme.cpp:777
+#: core/theme.cpp:764
msgid "Always Show"
msgstr "总是显示"
-#: core/theme.cpp:784
+#: core/theme.cpp:771
msgid "Plain Rectangles"
msgstr "常规矩形"
-#: core/theme.cpp:785
+#: core/theme.cpp:772
msgid "Plain Joined Rectangle"
msgstr "常规相连矩形"
-#: core/theme.cpp:786
+#: core/theme.cpp:773
msgid "Rounded Rectangles"
msgstr "圆角矩形"
-#: core/theme.cpp:787
+#: core/theme.cpp:774
msgid "Rounded Joined Rectangle"
msgstr "圆角相连矩形"
-#: core/theme.cpp:788
+#: core/theme.cpp:775
msgid "Gradient Rectangles"
msgstr "渐变矩形"
-#: core/theme.cpp:789
+#: core/theme.cpp:776
msgid "Gradient Joined Rectangle"
msgstr "渐变相连矩形"
-#: core/theme.cpp:790
+#: core/theme.cpp:777
msgid "Styled Rectangles"
msgstr "风格化矩形"
-#: core/theme.cpp:791
+#: core/theme.cpp:778
msgid "Styled Joined Rectangles"
msgstr "风格化相连矩形"
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdepim/libmessageviewer.po kde-l10n-zhcn-4.12.95/messages/kdepim/libmessageviewer.po
--- kde-l10n-zhcn-4.12.90/messages/kdepim/libmessageviewer.po 2014-03-13 04:01:06.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdepim/libmessageviewer.po 2014-03-17 03:50:16.000000000 +0000
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: kmail\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2014-03-13 01:45+0000\n"
+"POT-Creation-Date: 2014-03-17 01:45+0000\n"
"PO-Revision-Date: 2013-01-18 19:58+0800\n"
"Last-Translator: FengChao \n"
"Language-Team: Chinese Simplified \n"
@@ -178,18 +178,18 @@
"filter."
msgstr ""
-#: adblock/adblocksettingwidget.cpp:345
+#: adblock/adblocksettingwidget.cpp:346
#, kde-format
msgid "Do you want to delete list \"%1\"?"
msgstr ""
-#: adblock/adblocksettingwidget.cpp:345
+#: adblock/adblocksettingwidget.cpp:346
#, fuzzy
#| msgid "Delete Attachment"
msgid "Delete current list"
msgstr "删除附件"
-#: adblock/adblocksettingwidget.cpp:374 adblock/adblocksettingwidget.cpp:405
+#: adblock/adblocksettingwidget.cpp:375 adblock/adblocksettingwidget.cpp:406
msgid "*|all files (*)"
msgstr ""
@@ -321,52 +321,52 @@
msgstr ""
#. i18n: ectx: property (text), widget (QPushButton, showList)
-#: adblock/ui/settings_adblock.ui:124
+#: adblock/ui/settings_adblock.ui:127
msgid "Show List..."
msgstr ""
#. i18n: ectx: attribute (title), widget (QWidget, tab)
-#: adblock/ui/settings_adblock.ui:132
+#: adblock/ui/settings_adblock.ui:135
msgid "Manual Filters"
msgstr ""
#. i18n: ectx: property (toolTip), widget (QToolButton, insertButton)
-#: adblock/ui/settings_adblock.ui:143
+#: adblock/ui/settings_adblock.ui:146
msgid "Add filter expression"
msgstr ""
#. i18n: ectx: property (text), widget (QToolButton, insertButton)
-#: adblock/ui/settings_adblock.ui:146
+#: adblock/ui/settings_adblock.ui:149
msgid "..."
msgstr ""
#. i18n: ectx: property (text), widget (QPushButton, importFilters)
-#: adblock/ui/settings_adblock.ui:188
+#: adblock/ui/settings_adblock.ui:191
msgid "Import Filters..."
msgstr ""
#. i18n: ectx: property (text), widget (QPushButton, exportFilters)
-#: adblock/ui/settings_adblock.ui:195
+#: adblock/ui/settings_adblock.ui:198
msgid "Export filters..."
msgstr ""
#. i18n: ectx: property (text), widget (QLabel, label)
-#: adblock/ui/settings_adblock.ui:204
+#: adblock/ui/settings_adblock.ui:207
msgid "Search:"
msgstr ""
#. i18n: ectx: property (text), widget (QPushButton, editFilter)
-#: adblock/ui/settings_adblock.ui:216 viewer/viewer_p.cpp:493
+#: adblock/ui/settings_adblock.ui:219 viewer/viewer_p.cpp:493
msgid "Edit"
msgstr "编辑"
#. i18n: ectx: property (toolTip), widget (QPushButton, removeButton)
-#: adblock/ui/settings_adblock.ui:223
+#: adblock/ui/settings_adblock.ui:226
msgid "Remove filter expression"
msgstr ""
#. i18n: ectx: property (text), widget (QPushButton, removeButton)
-#: adblock/ui/settings_adblock.ui:226
+#: adblock/ui/settings_adblock.ui:229
msgid "Remove Filter"
msgstr ""
@@ -2607,7 +2607,7 @@
msgid "Select collection where Todo will stored."
msgstr ""
-#: widgets/todoedit.cpp:148
+#: widgets/todoedit.cpp:154
#, fuzzy, kde-format
#| msgid "Reply to: "
msgid "Reply to \"%1\""
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdepim/libpimcommon.po kde-l10n-zhcn-4.12.95/messages/kdepim/libpimcommon.po
--- kde-l10n-zhcn-4.12.90/messages/kdepim/libpimcommon.po 2014-03-06 03:50:07.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdepim/libpimcommon.po 2014-03-19 06:15:59.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2014-03-06 01:41+0000\n"
+"POT-Creation-Date: 2014-03-19 04:18+0000\n"
"PO-Revision-Date: 2013-01-22 02:00-0500\n"
"Last-Translator: Weng Xuetian \n"
"Language-Team: Chinese Simplified \n"
@@ -473,7 +473,7 @@
msgid "Username:"
msgstr ""
-#: storageservice/authdialog/logindialog.cpp:45
+#: storageservice/authdialog/logindialog.cpp:46
msgid "Password:"
msgstr ""
@@ -481,7 +481,7 @@
msgid "Authorization canceled."
msgstr ""
-#: storageservice/box/boxjob.cpp:209 storageservice/dropbox/dropboxjob.cpp:158
+#: storageservice/box/boxjob.cpp:210 storageservice/dropbox/dropboxjob.cpp:158
#: storageservice/hubic/hubicjob.cpp:204
#: storageservice/yousendit/yousenditjob.cpp:292
#, kde-format
@@ -510,6 +510,7 @@
#: storageservice/gdrive/gdrivestorageservice.cpp:403
#: storageservice/ubuntuone/ubuntuonestorageservice.cpp:494
#: storageservice/webdav/webdavstorageservice.cpp:383
+#: storageservice/yousendit/yousenditstorageservice.cpp:435
msgid "File"
msgstr ""
@@ -610,8 +611,8 @@
#: storageservice/dropbox/dropboxjob.cpp:366
#: storageservice/ubuntuone/ubuntuonejob.cpp:561
-#: storageservice/webdav/webdavjob.cpp:76
-#: storageservice/webdav/webdavjob.cpp:96
+#: storageservice/webdav/webdavjob.cpp:78
+#: storageservice/webdav/webdavjob.cpp:98
#: storageservice/yousendit/yousenditjob.cpp:185
msgid "Authentication Canceled."
msgstr ""
@@ -871,12 +872,12 @@
msgstr ""
#: storageservice/ubuntuone/ubuntuonestorageservice.cpp:512
-#: storageservice/yousendit/yousenditstorageservice.cpp:441
+#: storageservice/yousendit/yousenditstorageservice.cpp:448
msgid "Yes"
msgstr ""
#: storageservice/ubuntuone/ubuntuonestorageservice.cpp:512
-#: storageservice/yousendit/yousenditstorageservice.cpp:441
+#: storageservice/yousendit/yousenditstorageservice.cpp:448
#, fuzzy
#| msgctxt "Permissions"
#| msgid "None"
@@ -925,6 +926,7 @@
msgstr ""
#: storageservice/webdav/webdavstorageservice.cpp:383
+#: storageservice/yousendit/yousenditstorageservice.cpp:435
msgid "Directory"
msgstr ""
@@ -989,7 +991,7 @@
"and client software."
msgstr ""
-#: storageservice/yousendit/yousenditstorageservice.cpp:441
+#: storageservice/yousendit/yousenditstorageservice.cpp:448
msgid "writable:"
msgstr ""
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdepimlibs/libakonadi.po kde-l10n-zhcn-4.12.95/messages/kdepimlibs/libakonadi.po
--- kde-l10n-zhcn-4.12.90/messages/kdepimlibs/libakonadi.po 2014-03-07 04:13:05.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdepimlibs/libakonadi.po 2014-03-19 06:15:59.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: libakonadi\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2014-03-07 02:00+0000\n"
+"POT-Creation-Date: 2014-03-19 04:18+0000\n"
"PO-Revision-Date: 2013-07-07 22:05-0400\n"
"Last-Translator: Weng Xuetian \n"
"Language-Team: Chinese Simplified \n"
@@ -60,46 +60,46 @@
msgid "Do you really want to delete the selected agent instance?"
msgstr "您真的想要删除选中的代理实例吗?"
-#: agentbase.cpp:337 preprocessorbase_p.cpp:41
+#: agentbase.cpp:338 preprocessorbase_p.cpp:41
#, kde-format
msgid "Unable to register object at dbus: %1"
msgstr "无法在 dbus 上注册对象:%1"
-#: agentbase.cpp:423
+#: agentbase.cpp:424
#, kde-format
msgctxt "Name and type of Akonadi resource"
msgid "%1 of type %2"
msgstr "类型 %2 的 %1"
-#: agentbase.cpp:837 agentbase.cpp:838
+#: agentbase.cpp:844 agentbase.cpp:845
msgid "Akonadi Agent"
msgstr "Akonadi 代理"
-#: agentbase.cpp:841
+#: agentbase.cpp:848
msgid "Agent identifier"
msgstr "代理标识符"
-#: agentbase_p.h:61 resourcescheduler.cpp:235
+#: agentbase_p.h:63 resourcescheduler.cpp:235
msgctxt "@info:status Application ready for work"
msgid "Ready"
msgstr "就绪"
-#: agentbase_p.h:63
+#: agentbase_p.h:65
msgctxt "@info:status"
msgid "Offline"
msgstr "离线"
-#: agentbase_p.h:68
+#: agentbase_p.h:70
msgctxt "@info:status"
msgid "Syncing..."
msgstr "正在同步..."
-#: agentbase_p.h:73
+#: agentbase_p.h:75
msgctxt "@info:status"
msgid "Error."
msgstr "错误。"
-#: agentbase_p.h:78
+#: agentbase_p.h:80
msgctxt "@info:status"
msgid "Not configured"
msgstr "未配置"
@@ -474,23 +474,23 @@
msgid "Name"
msgstr "名称"
-#: entitytreemodel_p.cpp:1346
+#: entitytreemodel_p.cpp:1351
msgid "Could not copy item:"
msgstr "无法复制项目:"
-#: entitytreemodel_p.cpp:1348
+#: entitytreemodel_p.cpp:1353
msgid "Could not copy collection:"
msgstr "无法复制集合:"
-#: entitytreemodel_p.cpp:1350
+#: entitytreemodel_p.cpp:1355
msgid "Could not move item:"
msgstr "无法移动项目:"
-#: entitytreemodel_p.cpp:1352
+#: entitytreemodel_p.cpp:1357
msgid "Could not move collection:"
msgstr "无法移动集合:"
-#: entitytreemodel_p.cpp:1354
+#: entitytreemodel_p.cpp:1359
msgid "Could not link entity:"
msgstr "无法链接实体:"
@@ -1713,23 +1713,23 @@
msgid "Unread"
msgstr "未读"
-#: subscriptiondialog.cpp:185
+#: subscriptiondialog.cpp:188
msgid "Local Subscriptions"
msgstr "本地订阅"
-#: subscriptiondialog.cpp:211
+#: subscriptiondialog.cpp:214
msgid "Search:"
msgstr "搜索:"
-#: subscriptiondialog.cpp:219
+#: subscriptiondialog.cpp:222
msgid "Subscribed only"
msgstr "只显示已订阅的"
-#: subscriptiondialog.cpp:228
+#: subscriptiondialog.cpp:231
msgid "Subscribe"
msgstr "订阅"
-#: subscriptiondialog.cpp:232
+#: subscriptiondialog.cpp:235
msgid "Unsubscribe"
msgstr "退订"
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdepim-runtime/akonadi_davgroupware_resource.po kde-l10n-zhcn-4.12.95/messages/kdepim-runtime/akonadi_davgroupware_resource.po
--- kde-l10n-zhcn-4.12.90/messages/kdepim-runtime/akonadi_davgroupware_resource.po 2014-03-13 04:01:06.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdepim-runtime/akonadi_davgroupware_resource.po 2014-03-19 06:15:59.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2014-03-13 01:46+0000\n"
+"POT-Creation-Date: 2014-03-19 04:18+0000\n"
"PO-Revision-Date: 2013-10-26 20:16+0800\n"
"Last-Translator: Feng Chao \n"
"Language-Team: Chinese Simplified \n"
@@ -284,21 +284,6 @@
msgid "The server returned invalid data"
msgstr "服务器返回无效的数据"
-#: davgroupwareresource.cpp:744
-#, kde-format
-msgid "Unable to add item: %1"
-msgstr "无法添加项目:%1"
-
-#: davgroupwareresource.cpp:772
-#, kde-format
-msgid "Unable to change item: %1"
-msgstr "无法更改项目:%1"
-
-#: davgroupwareresource.cpp:792
-#, kde-format
-msgid "Unable to remove item: %1"
-msgstr "无法删除项目:%1"
-
#. i18n: ectx: label, entry (settingsVersion), group (General)
#: davgroupwareresource.kcfg:10
msgid "Settings Version"
@@ -338,7 +323,7 @@
#. i18n: ectx: label, entry (AccountId), group (General)
#: davgroupwareresource.kcfg:38
-msgid "The account id in WebAccouts framework."
+msgid "The account id in WebAccounts framework."
msgstr ""
#. i18n: ectx: label, entry (AccountServices), group (General)
@@ -564,6 +549,15 @@
msgid "Fetch"
msgstr "获取"
+#~ msgid "Unable to add item: %1"
+#~ msgstr "无法添加项目:%1"
+
+#~ msgid "Unable to change item: %1"
+#~ msgstr "无法更改项目:%1"
+
+#~ msgid "Unable to remove item: %1"
+#~ msgstr "无法删除项目:%1"
+
#~ msgid "Client did not create a UID for item %1."
#~ msgstr "客户端无法为项目 %1 创建 UID。"
diff -Nru kde-l10n-zhcn-4.12.90/messages/kdepim-runtime/akonadi_imap_resource.po kde-l10n-zhcn-4.12.95/messages/kdepim-runtime/akonadi_imap_resource.po
--- kde-l10n-zhcn-4.12.90/messages/kdepim-runtime/akonadi_imap_resource.po 2014-03-04 05:00:25.000000000 +0000
+++ kde-l10n-zhcn-4.12.95/messages/kdepim-runtime/akonadi_imap_resource.po 2014-03-14 06:47:58.000000000 +0000
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: akonadi_imap_resource\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2014-03-04 02:03+0000\n"
+"POT-Creation-Date: 2014-03-14 04:56+0000\n"
"PO-Revision-Date: 2013-01-22 01:05-0500\n"
"Last-Translator: Weng Xuetian \n"
"Language-Team: Chinese Simplified \n"
@@ -418,7 +418,7 @@
#. i18n: ectx: property (windowTitle), widget (QWidget, ServerInfo)
#. i18n: ectx: property (text), widget (QPushButton, showServerInfo)
-#: serverinfo.ui:14 setupserverview_desktop.ui:567
+#: serverinfo.ui:14 setupserverview_desktop.ui:595
#: setupserverview_mobile.ui:440
msgid "Server Info"
msgstr "服务器信息"
@@ -618,7 +618,7 @@
msgstr "账户名称:"
#. i18n: ectx: property (whatsThis), widget (QLabel, label)
-#: setupserverview_desktop.ui:43 setupserverview_mobile.ui:59
+#: setupserverview_desktop.ui:47 setupserverview_mobile.ui:59
msgid ""
"Indicate the IMAP server. If you want to connect to a non-standard port for "
"a specific encryption scheme, you can add \":port\" to indicate that. For "
@@ -628,66 +628,66 @@
"个“:端口号”声明,例如:“imap.foo.com:144”。"
#. i18n: ectx: property (text), widget (QLabel, label)
-#: setupserverview_desktop.ui:46
+#: setupserverview_desktop.ui:50
msgid "IMAP Server:"
msgstr "IMAP 服务器:"
#. i18n: ectx: property (whatsThis), widget (QLabel, label_2)
-#: setupserverview_desktop.ui:59 setupserverview_mobile.ui:163
+#: setupserverview_desktop.ui:67 setupserverview_mobile.ui:163
msgid "The username."
msgstr "用户名。"
#. i18n: ectx: property (text), widget (QLabel, label_2)
#. i18n: ectx: property (text), widget (QLabel, label_12)
-#: setupserverview_desktop.ui:62 setupserverview_desktop.ui:247
+#: setupserverview_desktop.ui:70 setupserverview_desktop.ui:271
#: setupserverview_mobile.ui:166
msgid "Username:"
msgstr "用户名:"
#. i18n: ectx: property (whatsThis), widget (QLabel, label_3)
-#: setupserverview_desktop.ui:75 setupserverview_mobile.ui:179
+#: setupserverview_desktop.ui:87 setupserverview_mobile.ui:179
msgid "The password."
msgstr "密码。"
#. i18n: ectx: property (text), widget (QLabel, label_3)
#. i18n: ectx: property (text), widget (QLabel, label_13)
-#: setupserverview_desktop.ui:78 setupserverview_desktop.ui:240
+#: setupserverview_desktop.ui:90 setupserverview_desktop.ui:264
#: setupserverview_mobile.ui:182
msgid "Password:"
msgstr "密码:"
#. i18n: ectx: property (title), widget (QGroupBox, checkOptions)
-#: setupserverview_desktop.ui:98
+#: setupserverview_desktop.ui:114
msgid "Mail Checking Options"
msgstr "邮件检查选项"
#. i18n: ectx: property (text), widget (QCheckBox, enableMailCheckBox)
-#: setupserverview_desktop.ui:104
+#: setupserverview_desktop.ui:120
msgid "Enable &interval mail checking"
msgstr "启用定时邮件检查(&I)"
#. i18n: ectx: property (text), widget (QLabel, label_7)
-#: setupserverview_desktop.ui:113
+#: setupserverview_desktop.ui:129
msgid "Check mail interval:"
msgstr "检查邮件间隔:"
#. i18n: ectx: attribute (title), widget (QWidget, tab_2)
-#: setupserverview_desktop.ui:155
+#: setupserverview_desktop.ui:171
msgid "Filtering"
msgstr "过滤"
#. i18n: ectx: property (text), widget (QCheckBox, managesieveCheck)
-#: setupserverview_desktop.ui:161 setupserverview_mobile.ui:392
+#: setupserverview_desktop.ui:177 setupserverview_mobile.ui:392
msgid "Server supports Sieve"
msgstr "服务器支持筛选"
#. i18n: ectx: property (text), widget (QCheckBox, sameConfigCheck)
-#: setupserverview_desktop.ui:168 setupserverview_mobile.ui:399
+#: setupserverview_desktop.ui:184 setupserverview_mobile.ui:399
msgid "Reuse host and login configuration"
msgstr "重用主机和登录配置"
#. i18n: ectx: property (text), widget (QLabel, label_14)
-#: setupserverview_desktop.ui:175
+#: setupserverview_desktop.ui:191
msgid ""
"The server port changed when ManageSieve turned into a full RFC Standard. "
"Old server implementations still use port 2000, while newer standard conform "
@@ -695,102 +695,102 @@
msgstr ""
#. i18n: ectx: property (text), widget (QLabel, label_5)
-#: setupserverview_desktop.ui:187 setupserverview_mobile.ui:421
+#: setupserverview_desktop.ui:203 setupserverview_mobile.ui:421
msgid "Managesieve port:"
msgstr "筛选管理端口:"
#. i18n: ectx: property (text), widget (QLabel, label_6)
-#: setupserverview_desktop.ui:205 setupserverview_mobile.ui:408
+#: setupserverview_desktop.ui:221 setupserverview_mobile.ui:408
msgid "Alternate URL:"
msgstr "备用 URL:"
#. i18n: ectx: property (title), widget (QGroupBox, authentification)
-#: setupserverview_desktop.ui:217
+#: setupserverview_desktop.ui:238
#, fuzzy
#| msgid "Authentication:"
msgid "Authentification"
msgstr "身份验证:"
#. i18n: ectx: property (text), widget (QRadioButton, noAuthentification)
-#: setupserverview_desktop.ui:230
+#: setupserverview_desktop.ui:254
#, fuzzy
#| msgid "Authentication:"
msgid "No authentification"
msgstr "身份验证:"
#. i18n: ectx: property (text), widget (QRadioButton, customUserPassword)
-#: setupserverview_desktop.ui:254
+#: setupserverview_desktop.ui:278
msgid "Username and Password"
msgstr ""
#. i18n: ectx: property (text), widget (QRadioButton, imapUserPassword)
-#: setupserverview_desktop.ui:267
+#: setupserverview_desktop.ui:295
msgid "IMAP Username and Password"
msgstr ""
#. i18n: ectx: attribute (title), widget (QWidget, tab_4)
-#: setupserverview_desktop.ui:297
+#: setupserverview_desktop.ui:325
msgid "Advanced"
msgstr "高级"
#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
-#: setupserverview_desktop.ui:303
+#: setupserverview_desktop.ui:331
msgid "IMAP Settings"
msgstr "IMAP 设置"
#. i18n: ectx: property (text), widget (QCheckBox, subscriptionEnabled)
-#: setupserverview_desktop.ui:311
+#: setupserverview_desktop.ui:339
msgid "Enable server-side subscriptions"
msgstr "启用服务器端订阅"
#. i18n: ectx: property (text), widget (KPushButton, subscriptionButton)
-#: setupserverview_desktop.ui:321 setupserverview_mobile.ui:328
+#: setupserverview_desktop.ui:349 setupserverview_mobile.ui:328
msgid "Serverside Subscription..."
msgstr "服务器端订阅..."
#. i18n: ectx: property (text), widget (QCheckBox, disconnectedModeEnabled)
-#: setupserverview_desktop.ui:330
+#: setupserverview_desktop.ui:358
msgid "Enable disconnected mode"
msgstr "启用离线模式"
#. i18n: ectx: property (text), widget (QCheckBox, autoExpungeCheck)
-#: setupserverview_desktop.ui:337
+#: setupserverview_desktop.ui:365
msgid "Automaticall&y compact folders (expunges deleted messages)"
msgstr "自动压缩文件夹(清除删除信件的空间)(&Y)"
#. i18n: ectx: property (text), widget (QLabel, label_11)
#. i18n: ectx: property (text), widget (QLabel, label_7)
-#: setupserverview_desktop.ui:346 setupserverview_mobile.ui:344
+#: setupserverview_desktop.ui:374 setupserverview_mobile.ui:344
msgid "Trash folder:"
msgstr "废件夹:"
#. i18n: ectx: property (title), widget (QGroupBox, identityBox)
-#: setupserverview_desktop.ui:358
+#: setupserverview_desktop.ui:386
msgid "Identity Settings"
msgstr "身份设置"
#. i18n: ectx: property (toolTip), widget (QCheckBox, useDefaultIdentityCheck)
-#: setupserverview_desktop.ui:364 setupserverview_mobile.ui:356
+#: setupserverview_desktop.ui:392 setupserverview_mobile.ui:356
msgid "Use the default identity for this account"
msgstr "为此账户使用默认身份"
#. i18n: ectx: property (text), widget (QCheckBox, useDefaultIdentityCheck)
-#: setupserverview_desktop.ui:367 setupserverview_mobile.ui:359
+#: setupserverview_desktop.ui:395 setupserverview_mobile.ui:359
msgid "Use &default identity"
msgstr "使用默认身份(&D)"
#. i18n: ectx: property (toolTip), widget (QLabel, identityLabel)
-#: setupserverview_desktop.ui:376 setupserverview_mobile.ui:377
+#: setupserverview_desktop.ui:404 setupserverview_mobile.ui:377
msgid "Select the KMail identity used for this account"
msgstr "选择要用于此账户的 KMail 身份"
#. i18n: ectx: property (text), widget (QLabel, identityLabel)
-#: setupserverview_desktop.ui:379 setupserverview_mobile.ui:380
+#: setupserverview_desktop.ui:407 setupserverview_mobile.ui:380
msgid "Identity:"
msgstr "身份:"
#. i18n: ectx: property (whatsThis), widget (QGroupBox, safeImap)
-#: setupserverview_desktop.ui:400
+#: setupserverview_desktop.ui:428
msgid ""
"\n"
@@ -837,88 +837,88 @@
"设置。