summaryrefslogtreecommitdiffstats
path: root/tde-i18n-zh_CN
diff options
context:
space:
mode:
authorAutomated System <[email protected]>2019-01-24 00:39:30 +0100
committerSlávek Banko <[email protected]>2019-01-24 00:39:30 +0100
commite1717010d2d0e87e944f0490dda76778cbd34820 (patch)
tree1f1f91d712e8d916641e9c84138eea338d6c395b /tde-i18n-zh_CN
parentc5f1876c858cd8987b84b7f900839acefd372ecc (diff)
downloadtde-i18n-e1717010d2d0e87e944f0490dda76778cbd34820.tar.gz
tde-i18n-e1717010d2d0e87e944f0490dda76778cbd34820.zip
Merge translation files from master branch.
Diffstat (limited to 'tde-i18n-zh_CN')
-rw-r--r--tde-i18n-zh_CN/messages/tdeaddons/ark_plugin.po6
-rw-r--r--tde-i18n-zh_CN/messages/tdeartwork/klock.po32
-rw-r--r--tde-i18n-zh_CN/messages/tdeartwork/twin_art_clients.po19
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kate.po614
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmenergy.po34
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kcmmedia.po74
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kdcop.po38
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kdesktop.po82
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kgreet_classic.po30
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kgreet_winbind.po22
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/kicker.po244
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/konqueror.po10
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/konsole.po6
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/ksmserver.po199
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/libdmctl.po14
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdeio_media.po116
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdeio_trash.po72
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdepasswd.po18
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/tdmgreet.po82
-rw-r--r--tde-i18n-zh_CN/messages/tdebase/twin.po44
-rw-r--r--tde-i18n-zh_CN/messages/tdegames/kbackgammon.po84
-rw-r--r--tde-i18n-zh_CN/messages/tdegraphics/kpovmodeler.po22
-rw-r--r--tde-i18n-zh_CN/messages/tdelibs/katepart.po239
-rw-r--r--tde-i18n-zh_CN/messages/tdelibs/tdeio.po86
-rw-r--r--tde-i18n-zh_CN/messages/tdelibs/tdelibs.po328
-rw-r--r--tde-i18n-zh_CN/messages/tdenetwork/kopete.po24
-rw-r--r--tde-i18n-zh_CN/messages/tdenetwork/krdc.po34
-rw-r--r--tde-i18n-zh_CN/messages/tdenetwork/krfb.po22
-rw-r--r--tde-i18n-zh_CN/messages/tdepim/kalarm.po144
-rw-r--r--tde-i18n-zh_CN/messages/tdeutils/ark.po20
-rw-r--r--tde-i18n-zh_CN/messages/tdeutils/kgpg.po110
-rw-r--r--tde-i18n-zh_CN/messages/tdevelop/tdevelop.po2
-rw-r--r--tde-i18n-zh_CN/messages/tdewebdev/tdefilereplace.po284
33 files changed, 1428 insertions, 1727 deletions
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/ark_plugin.po b/tde-i18n-zh_CN/messages/tdeaddons/ark_plugin.po
index 3665bfc4572..659b3badd26 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/ark_plugin.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/ark_plugin.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ark_plugin\n"
-"POT-Creation-Date: 2018-12-30 19:35+0100\n"
+"POT-Creation-Date: 2019-01-23 23:28+0100\n"
"PO-Revision-Date: 2005-08-04 09:25+0800\n"
"Last-Translator: Funda Wang <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -67,11 +67,11 @@ msgstr "解压缩到子文件夹"
msgid "Extract To..."
msgstr "解压缩到..."
-#: arkplugin.cpp:485 arkplugin.cpp:529
+#: arkplugin.cpp:467 arkplugin.cpp:511
msgid "Archive"
msgstr "存档文件"
-#: arkplugin.cpp:489 arkplugin.cpp:533
+#: arkplugin.cpp:471 arkplugin.cpp:515
#, c-format
msgid "Archive %1"
msgstr "存档文件 %1"
diff --git a/tde-i18n-zh_CN/messages/tdeartwork/klock.po b/tde-i18n-zh_CN/messages/tdeartwork/klock.po
index d26a1f291d6..4ca0be4d901 100644
--- a/tde-i18n-zh_CN/messages/tdeartwork/klock.po
+++ b/tde-i18n-zh_CN/messages/tdeartwork/klock.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: klock\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-13 19:00+0100\n"
+"POT-Creation-Date: 2019-01-23 23:29+0100\n"
"PO-Revision-Date: 2004-11-15 15:23+0800\n"
"Last-Translator: Yan Shuangchun <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -219,7 +219,7 @@ msgid "Cycling color"
msgstr "循环色彩"
#: kdesavers/banner.cpp:133 kdesavers/lines.cpp:139 kdesavers/lorenz.cpp:82
-#: kdesavers/polygon.cpp:87 kdesavers/science.cpp:932 xsavers/space.cpp:592
+#: kdesavers/polygon.cpp:87 kdesavers/science.cpp:932 xsavers/space.cpp:593
#: xsavers/swarm.cpp:328
msgid "Speed:"
msgstr "速度:"
@@ -306,11 +306,11 @@ msgstr ""
"由 Tiaan Wessels 编写,1997\n"
-#: kdesavers/firesaver.cpp:74
+#: kdesavers/firesaver.cpp:73
msgid "Setup Screen Saver"
msgstr "设置屏幕保护程序"
-#: kdesavers/firesaver.cpp:85
+#: kdesavers/firesaver.cpp:84
msgid ""
"<h3>KFireSaver 3D 1.0</h3>\n"
"<p>TEST Koral - Enrico Ros::2004</p>"
@@ -318,35 +318,35 @@ msgstr ""
"<h3>KFireSaver 3D 1.0</h3>\n"
"<p>TEST Koral - Enrico Ros::2004</p>"
-#: kdesavers/firesaver.cpp:100
+#: kdesavers/firesaver.cpp:99
msgid "Fireworks 3D (GL)"
msgstr "三维烟花(GL)"
-#: kdesavers/firesaver.cpp:523
+#: kdesavers/firesaver.cpp:522
msgid "www.kde.org"
msgstr "www.kde.org"
-#: kdesavers/firesaver.cpp:524
+#: kdesavers/firesaver.cpp:523
msgid "My TDE, please!"
msgstr "我的 TDE"
-#: kdesavers/firesaver.cpp:525
+#: kdesavers/firesaver.cpp:524
msgid "KoNqUeR the World"
msgstr "征服世界"
-#: kdesavers/firesaver.cpp:526
+#: kdesavers/firesaver.cpp:525
msgid "KFIRESAVER 3D"
msgstr "KFIRESAVER 3D"
-#: kdesavers/firesaver.cpp:527
+#: kdesavers/firesaver.cpp:526
msgid "Gimme your eyes..."
msgstr "养眼..."
-#: kdesavers/firesaver.cpp:528
+#: kdesavers/firesaver.cpp:527
msgid "Thank you for using TDE"
msgstr "感谢您使用 TDE"
-#: kdesavers/firesaver.cpp:529
+#: kdesavers/firesaver.cpp:528
msgid "Going insane tonight"
msgstr "今夜天空灿烂"
@@ -766,19 +766,19 @@ msgstr "启动屏幕保护程序的演示模式"
msgid "TDELock"
msgstr "时钟"
-#: xsavers/space.cpp:425
+#: xsavers/space.cpp:426
msgid "GL can not render with root visual\n"
msgstr "GL 不能用 root visual 渲染\n"
-#: xsavers/space.cpp:578
+#: xsavers/space.cpp:579
msgid "Setup Space Screen Saver"
msgstr "设置空间屏幕保护程序"
-#: xsavers/space.cpp:602
+#: xsavers/space.cpp:603
msgid "Warp interval:"
msgstr "扭曲间隔:"
-#: xsavers/space.cpp:675
+#: xsavers/space.cpp:676
msgid ""
"KSpace\n"
"Copyright (c) 1998\n"
diff --git a/tde-i18n-zh_CN/messages/tdeartwork/twin_art_clients.po b/tde-i18n-zh_CN/messages/tdeartwork/twin_art_clients.po
index b3a0e160c8e..76e0c4b6257 100644
--- a/tde-i18n-zh_CN/messages/tdeartwork/twin_art_clients.po
+++ b/tde-i18n-zh_CN/messages/tdeartwork/twin_art_clients.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: twin_art_clients\n"
-"POT-Creation-Date: 2019-01-13 19:00+0100\n"
+"POT-Creation-Date: 2019-01-23 23:29+0100\n"
"PO-Revision-Date: 2005-12-23 21:08+0800\n"
"Last-Translator: Funda Wang <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -168,23 +168,16 @@ msgstr "打开 TDE 的 IceWM 主题文件夹"
#, fuzzy
msgid ""
"Clicking on the link above will cause a window to appear showing the TDE "
-"IceWM theme folder. You can add or remove native IceWM themes by installing "
-"theme files into this folder or by creating folder symlinks to existing "
-"IceWM themes on your system. You can get extra-themes here: <b>https://"
-"github.com/bbidulock/icewm-extra-themes</b>"
+"IceWM theme folder. You can add or remove native IceWM themes by "
+"uncompressing <b>http://icewm.themes.org/</b> theme files into this folder, "
+"or by creating folder symlinks to existing IceWM themes on your system."
msgstr ""
"单击上面的链接将打开显示 TDE IceWM 主题文件夹的窗口。您可以将从 <b>http://"
"icewm.themes.org/</b> 下载的主题文件解压缩到此文件夹中,或者创建到您系统中已"
"有的 IceWM 主题的文件夹链接,以便添加或删除 IceWM 自有主题。"
-#: icewm/config/config.cpp:107
-msgid ""
-"You're supposed to copy the entire theme folders into your TDE IceWM theme "
-"folder."
-msgstr ""
-
-#: icewm/config/config.cpp:170 icewm/config/config.cpp:212
-#: icewm/config/config.cpp:256 icewm/config/config.cpp:271
+#: icewm/config/config.cpp:167 icewm/config/config.cpp:209
+#: icewm/config/config.cpp:253 icewm/config/config.cpp:268
msgid "Infadel #2 (default)"
msgstr "Infadel #2(默认)"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kate.po b/tde-i18n-zh_CN/messages/tdebase/kate.po
index 06743442c70..f3255b8a06a 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kate.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kate.po
@@ -10,7 +10,7 @@
msgid ""
msgstr ""
"Project-Id-Version: kate\n"
-"POT-Creation-Date: 2019-01-13 18:46+0100\n"
+"POT-Creation-Date: 2019-01-23 23:15+0100\n"
"PO-Revision-Date: 2005-08-09 07:46+0800\n"
"Last-Translator: 张忠立 <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -31,26 +31,11 @@ msgid ""
"Your emails"
-#: app/kateapp.cpp:244 app/kateapp.cpp:408 app/kwritemain.cpp:686
+#: app/kateapp.cpp:214 app/kateapp.cpp:326 app/kwritemain.cpp:686
msgid ""
"The file '%1' could not be opened: it is not a normal file, it is a folder."
msgstr "无法打开文件“%1”;它不是一个普通文件,而是一个文件夹。"
-#: app/kateapp.cpp:325
-#, fuzzy
-msgid "Save Sessions"
-msgstr "保存会话吗?"
-
-#: app/kateapp.cpp:331
-msgid ""
-"<p>Do you want to save the existing sessions?<p>!!NOTE!!<p>All existing "
-"sessions will be removed if you choose \"Delete\""
-msgstr ""
-
-#: app/kateapp.cpp:334 app/katesessionpanel.cpp:731
-msgid "Do not ask again"
-msgstr "不再询问"
-
#: app/kateconfigdialog.cpp:91 app/kateconfigdialog.cpp:97
#: app/kateconfigdialog.cpp:204 app/kateconfigdialog.cpp:273
#: app/kateconfigdialog.cpp:282 app/kateconfigdialog.cpp:290
@@ -171,7 +156,7 @@ msgstr "(从不)"
msgid " day(s)"
msgstr " 天"
-#: app/kateconfigdialog.cpp:204 app/katemainwindow.cpp:221
+#: app/kateconfigdialog.cpp:204
msgid "Sessions"
msgstr "会话"
@@ -250,7 +235,7 @@ msgid "Plugin Manager"
msgstr "插件管理器"
#: app/kateconfigdialog.cpp:298 app/kateconfigdialog.cpp:299
-#: app/katemainwindow.cpp:269 app/katemainwindow.cpp:557
+#: app/katemainwindow.cpp:265 app/katemainwindow.cpp:539
msgid "External Tools"
msgstr "外部工具"
@@ -299,11 +284,11 @@ msgstr "<p>文档“%1”已经被修改,但尚未保存。<p>您是否想要�
msgid "Close Document"
msgstr "关闭文档"
-#: app/katedocmanager.cpp:431 app/katemainwindow.cpp:359
+#: app/katedocmanager.cpp:431 app/katemainwindow.cpp:340
msgid "New file opened while trying to close Kate, closing aborted."
msgstr "试图关闭 Kate 时打开了新文件,关闭被中止。"
-#: app/katedocmanager.cpp:432 app/katemainwindow.cpp:360
+#: app/katedocmanager.cpp:432 app/katemainwindow.cpp:341
msgid "Closing Aborted"
msgstr "关闭被中止"
@@ -315,31 +300,31 @@ msgstr "重新打开前次会话中的文件..."
msgid "Starting Up"
msgstr "启动"
-#: app/kateexternaltools.cpp:275
+#: app/kateexternaltools.cpp:276
msgid "Failed to expand the command '%1'."
msgstr "展开命令“%1”失败。"
-#: app/kateexternaltools.cpp:276
+#: app/kateexternaltools.cpp:277
msgid "Kate External Tools"
msgstr "Kate 外部工具"
-#: app/kateexternaltools.cpp:426
+#: app/kateexternaltools.cpp:427
msgid "Edit External Tool"
msgstr "编辑外部工具"
-#: app/kateexternaltools.cpp:440
+#: app/kateexternaltools.cpp:441
msgid "&Label:"
msgstr "标签(&L):"
-#: app/kateexternaltools.cpp:445
+#: app/kateexternaltools.cpp:446
msgid "The name will be displayed in the 'Tools->External' menu"
msgstr "将显示于“工具->外部”菜单中的名称"
-#: app/kateexternaltools.cpp:455
+#: app/kateexternaltools.cpp:456
msgid "S&cript:"
msgstr "脚本(&C):"
-#: app/kateexternaltools.cpp:460
+#: app/kateexternaltools.cpp:461
msgid ""
"<p>The script to execute to invoke the tool. The script is passed to /bin/sh "
"for execution. The following macros will be expanded:</p><ul><li><code>%URL</"
@@ -360,11 +345,11 @@ msgstr ""
"数。<li><code>%selection</code> - 当前视图中所选的文本。<li><code>%text</"
"code> - 当前文档的文本。</ul>"
-#: app/kateexternaltools.cpp:478
+#: app/kateexternaltools.cpp:479
msgid "&Executable:"
msgstr "可执行(&E):"
-#: app/kateexternaltools.cpp:483
+#: app/kateexternaltools.cpp:484
msgid ""
"The executable used by the command. This is used to check if a tool should "
"be displayed; if not set, the first word of <em>command</em> will be used."
@@ -372,11 +357,11 @@ msgstr ""
"此命令使用的可执行文件。此选项将用来检查是否要显示此工具;如果未设置的话,将"
"会使用 <em>command</em> 的第一个单词。"
-#: app/kateexternaltools.cpp:489
+#: app/kateexternaltools.cpp:490
msgid "&Mime types:"
msgstr "MIME 类型(&M):"
-#: app/kateexternaltools.cpp:494
+#: app/kateexternaltools.cpp:495
msgid ""
"A semicolon-separated list of mime types for which this tool should be "
"available; if this is left empty, the tool is always available. To choose "
@@ -385,27 +370,27 @@ msgstr ""
"此工具适用于的 MIME 类型列表,用分号分隔;如果为空的话,此工具将总是有效。要"
"从已知的 MIME 类型中选择,请按右侧的按钮。"
-#: app/kateexternaltools.cpp:503
+#: app/kateexternaltools.cpp:504
msgid "Click for a dialog that can help you creating a list of mimetypes."
msgstr "单击可出现一个帮助您创建 MIME 类型列表的对话框。"
-#: app/kateexternaltools.cpp:507
+#: app/kateexternaltools.cpp:508
msgid "&Save:"
msgstr "保存(&S):"
-#: app/kateexternaltools.cpp:511
+#: app/kateexternaltools.cpp:512
msgid "None"
msgstr "无"
-#: app/kateexternaltools.cpp:511
+#: app/kateexternaltools.cpp:512
msgid "Current Document"
msgstr "当前文档"
-#: app/kateexternaltools.cpp:511
+#: app/kateexternaltools.cpp:512
msgid "All Documents"
msgstr "全部文档"
-#: app/kateexternaltools.cpp:515
+#: app/kateexternaltools.cpp:516
msgid ""
"You can elect to save the current or all [modified] documents prior to "
"running the command. This is helpful if you want to pass URLs to an "
@@ -414,11 +399,11 @@ msgstr ""
"您可以选择在运行命令前先保存当前或[已修改]的全部文档。如果您想要将 URL 传递给"
"像 FTP 客户端这样的应用程序的话,此功能将非常有用。"
-#: app/kateexternaltools.cpp:522
+#: app/kateexternaltools.cpp:523
msgid "&Command line name:"
msgstr "命令行名称(&C):"
-#: app/kateexternaltools.cpp:527
+#: app/kateexternaltools.cpp:528
msgid ""
"If you specify a name here, you can invoke the command from the view command "
"lines with exttool-the_name_you_specified_here. Please do not use spaces or "
@@ -427,31 +412,31 @@ msgstr ""
"如果您在此指定名称,您就可以从查看命令行中使用该名称调用该命令。请不要在名称"
"中使用空格或跳格键。"
-#: app/kateexternaltools.cpp:538
+#: app/kateexternaltools.cpp:539
msgid "You must specify at least a name and a command"
msgstr "您必须至少指定一个名称和命令"
-#: app/kateexternaltools.cpp:547
+#: app/kateexternaltools.cpp:548
msgid "Select the MimeTypes for which to enable this tool."
msgstr "选择此工具适用的 MIME 类型。"
-#: app/kateexternaltools.cpp:549
+#: app/kateexternaltools.cpp:550
msgid "Select Mime Types"
msgstr "选择 MIME 类型"
-#: app/kateexternaltools.cpp:567
+#: app/kateexternaltools.cpp:568
msgid "&New..."
msgstr "新建(&N)..."
-#: app/kateexternaltools.cpp:575
+#: app/kateexternaltools.cpp:576
msgid "&Edit..."
msgstr "编辑(&E)..."
-#: app/kateexternaltools.cpp:579
+#: app/kateexternaltools.cpp:580
msgid "Insert &Separator"
msgstr "插入分隔符(&S)"
-#: app/kateexternaltools.cpp:601
+#: app/kateexternaltools.cpp:602
msgid ""
"This list shows all the configured tools, represented by their menu text."
msgstr "此列表显示了配置的全部工具,各选项用菜单文字代表。"
@@ -583,62 +568,62 @@ msgstr "应用上次使用的过滤器(“%1”)"
msgid "Clear filter"
msgstr "清除过滤器"
-#: app/katefileselector.cpp:535
+#: app/katefileselector.cpp:536
msgid "Toolbar"
msgstr "工具栏"
-#: app/katefileselector.cpp:537
+#: app/katefileselector.cpp:538
msgid "A&vailable actions:"
msgstr "可用的动作(&V):"
-#: app/katefileselector.cpp:538
+#: app/katefileselector.cpp:539
msgid "S&elected actions:"
msgstr "选用的动作(&E):"
-#: app/katefileselector.cpp:546
+#: app/katefileselector.cpp:547
msgid "Auto Synchronization"
msgstr "自动同步"
-#: app/katefileselector.cpp:547
+#: app/katefileselector.cpp:548
msgid "When a docu&ment becomes active"
msgstr "每当文档变为活跃(&M)"
-#: app/katefileselector.cpp:548
+#: app/katefileselector.cpp:549
msgid "When the file selector becomes visible"
msgstr "每当文件选择器出现"
-#: app/katefileselector.cpp:555
+#: app/katefileselector.cpp:556
msgid "Remember &locations:"
msgstr "记住位置数(&L):"
-#: app/katefileselector.cpp:562
+#: app/katefileselector.cpp:563
msgid "Remember &filters:"
msgstr "记住过滤器数(&F):"
-#: app/katefileselector.cpp:569
+#: app/katefileselector.cpp:570
msgid "Session"
msgstr "会话"
-#: app/katefileselector.cpp:570
+#: app/katefileselector.cpp:571
msgid "Restore loca&tion"
msgstr "恢复位置(&T)"
-#: app/katefileselector.cpp:571
+#: app/katefileselector.cpp:572
msgid "Restore last f&ilter"
msgstr "恢复最后使用的过滤器(&I)"
-#: app/katefileselector.cpp:591
+#: app/katefileselector.cpp:592
msgid ""
"<p>Decides how many locations to keep in the history of the location combo "
"box."
msgstr "<p>决定要在位置组合框的历史中保留多少位置。"
-#: app/katefileselector.cpp:596
+#: app/katefileselector.cpp:597
msgid ""
"<p>Decides how many filters to keep in the history of the filter combo box."
msgstr "<p>决定要在过滤器组合框的历史中保留多少过滤器。"
-#: app/katefileselector.cpp:601
+#: app/katefileselector.cpp:602
msgid ""
"<p>These options allow you to have the File Selector automatically change "
"location to the folder of the active document on certain events.<p>Auto "
@@ -650,7 +635,7 @@ msgstr ""
"同步具有<em>惰性</em>,这意味着它直到文件选择器处于可见状态时才会生效。<p>这"
"些选项默认都不被启用,但是您可以随时按工具栏上的同步按钮来同步位置。"
-#: app/katefileselector.cpp:610
+#: app/katefileselector.cpp:611
msgid ""
"<p>If this option is enabled (default), the location will be restored when "
"you start Kate.<p><strong>Note</strong> that if the session is handled by "
@@ -659,7 +644,7 @@ msgstr ""
"<p>如果启用此选项(默认),当您启动 Kate 时,位置会被恢复。<p><strong>注意</"
"strong>,如果会话由 TDE 会话管理器处理,位置将总是会被恢复。"
-#: app/katefileselector.cpp:614
+#: app/katefileselector.cpp:615
msgid ""
"<p>If this option is enabled (default), the current filter will be restored "
"when you start Kate.<p><strong>Note</strong> that if the session is handled "
@@ -672,7 +657,7 @@ msgstr ""
"复。<p><strong>注意</strong>,某些自动同步设置若被启用可能会优先于恢复的位"
"置。"
-#: app/kategrepdialog.cpp:71 app/katemainwindow.cpp:227
+#: app/kategrepdialog.cpp:71 app/katemainwindow.cpp:223
msgid "Find in Files"
msgstr "在文件中查找"
@@ -696,42 +681,37 @@ msgstr "模板:"
msgid "Files:"
msgstr "文件:"
-#: app/kategrepdialog.cpp:163
-#, fuzzy
-msgid "Hide errors"
-msgstr "隐藏侧边栏(&B)"
-
-#: app/kategrepdialog.cpp:169
+#: app/kategrepdialog.cpp:160
msgid "Folder:"
msgstr "文件夹:"
-#: app/kategrepdialog.cpp:187
+#: app/kategrepdialog.cpp:178
msgid "Recursive"
msgstr "递归"
-#: app/kategrepdialog.cpp:195 app/kategrepdialog.cpp:488
+#: app/kategrepdialog.cpp:186 app/kategrepdialog.cpp:475
msgid "Find"
msgstr "查找"
-#: app/kategrepdialog.cpp:210
+#: app/kategrepdialog.cpp:201
#, fuzzy
msgid ""
"<p>Enter the expression you want to search for here.<p>If 'regular "
-"expression' is unchecked, all characters that are not letters in your "
-"expression will be escaped with a backslash character.<p>Possible meta "
-"characters are:<br><b>.</b> - Matches any character<br><b>^</b> - Matches "
-"the beginning of a line<br><b>$</b> - Matches the end of a line<br><b>\\&lt;"
-"</b> - Matches the beginning of a word<br><b>\\&gt;</b> - Matches the end of "
-"a word<p>The following repetition operators exist:<br><b>?</b> - The "
-"preceding item is matched at most once<br><b>*</b> - The preceding item is "
-"matched zero or more times<br><b>+</b> - The preceding item is matched one "
-"or more times<br><b>{<i>n</i>}</b> - The preceding item is matched exactly "
-"<i>n</i> times<br><b>{<i>n</i>,}</b> - The preceding item is matched <i>n</"
-"i> or more times<br><b>{,<i>n</i>}</b> - The preceding item is matched at "
-"most <i>n</i> times<br><b>{<i>n</i>,<i>m</i>}</b> - The preceding item is "
-"matched at least <i>n</i>, but at most <i>m</i> times.<p>Furthermore, "
-"backreferences to bracketed subexpressions are available via the notation "
-"<code>\\#</code>.<p>See the grep(1) documentation for the full documentation."
+"expression' is unchecked, any non-space letters in your expression will be "
+"escaped with a backslash character.<p>Possible meta characters are:<br><b>.</"
+"b> - Matches any character<br><b>^</b> - Matches the beginning of a "
+"line<br><b>$</b> - Matches the end of a line<br><b>\\&lt;</b> - Matches the "
+"beginning of a word<br><b>\\&gt;</b> - Matches the end of a word<p>The "
+"following repetition operators exist:<br><b>?</b> - The preceding item is "
+"matched at most once<br><b>*</b> - The preceding item is matched zero or "
+"more times<br><b>+</b> - The preceding item is matched one or more "
+"times<br><b>{<i>n</i>}</b> - The preceding item is matched exactly <i>n</i> "
+"times<br><b>{<i>n</i>,}</b> - The preceding item is matched <i>n</i> or more "
+"times<br><b>{,<i>n</i>}</b> - The preceding item is matched at most <i>n</i> "
+"times<br><b>{<i>n</i>,<i>m</i>}</b> - The preceding item is matched at least "
+"<i>n</i>, but at most <i>m</i> times.<p>Furthermore, backreferences to "
+"bracketed subexpressions are available via the notation <code>\\#</code>."
+"<p>See the grep(1) documentation for the full documentation."
msgstr ""
"<p>在此处输入您要搜索的正则表达式。<p>如果未选中“正则表达式”,您表达式中的任"
"何非空格字符都将会用反斜线的方式加以转码。<p>可能使用的元字符有:<br><b>.</"
@@ -745,7 +725,7 @@ msgstr ""
"号内的子表达式可通过使用 <code>\\#</code> 符号来达到。<p>完整的文档请参看参"
"见 grep(1)。"
-#: app/kategrepdialog.cpp:233
+#: app/kategrepdialog.cpp:224
msgid ""
"Enter the file name pattern of the files to search here.\n"
"You may give several patterns separated by commas."
@@ -753,7 +733,7 @@ msgstr ""
"在此处输入要搜索的文件名模板。\n"
"您可以给出多个用逗号分隔的模式。"
-#: app/kategrepdialog.cpp:236
+#: app/kategrepdialog.cpp:227
#, c-format
msgid ""
"You can choose a template for the pattern from the combo box\n"
@@ -765,20 +745,20 @@ msgstr ""
"模板中的字符串 %s 将被模式输入字段代替,从而\n"
"成为您要搜索的正则表达式。"
-#: app/kategrepdialog.cpp:241
+#: app/kategrepdialog.cpp:232
msgid "Enter the folder which contains the files in which you want to search."
msgstr "输入您要搜索的文件所在的文件夹。"
-#: app/kategrepdialog.cpp:243
+#: app/kategrepdialog.cpp:234
msgid "Check this box to search in all subfolders."
msgstr "选择此项来搜索所有子文件夹。"
-#: app/kategrepdialog.cpp:245
+#: app/kategrepdialog.cpp:236
msgid ""
"If this option is enabled (the default), the search will be case sensitive."
msgstr "如果该选项被选(默认),搜索时将区分大小写。"
-#: app/kategrepdialog.cpp:247
+#: app/kategrepdialog.cpp:238
msgid ""
"<p>If this is enabled, your pattern will be passed unmodified to "
"<em>grep(1)</em>. Otherwise, all characters that are not letters will be "
@@ -788,7 +768,7 @@ msgstr ""
"<p>如果启用此选项,您的模式将会被原样传递给 <em>grep(1)</em>。否则,所有非字"
"母的字符都将会用反斜线字符加以转码,以避免 grep 将其解释为表达式的一部分。"
-#: app/kategrepdialog.cpp:252
+#: app/kategrepdialog.cpp:243
msgid ""
"The results of the grep run are listed here. Select a\n"
"filename/line number combination and press Enter or doubleclick\n"
@@ -798,25 +778,19 @@ msgstr ""
"文件名/行号组合,然后按 ENTER 或双\n"
"击该项来在编辑器中显示相应行。"
-#: app/kategrepdialog.cpp:256
-msgid ""
-"<p>If this is checked, the dialog window showing the search errors will not "
-"be displayed at the end of the search."
-msgstr ""
-
-#: app/kategrepdialog.cpp:339
+#: app/kategrepdialog.cpp:327
msgid "You must enter an existing local folder in the 'Folder' entry."
msgstr "您必须在“文件夹”项中输入已有文件夹。"
-#: app/kategrepdialog.cpp:340
+#: app/kategrepdialog.cpp:328
msgid "Invalid Folder"
msgstr "无效的文件夹"
-#: app/kategrepdialog.cpp:494
+#: app/kategrepdialog.cpp:479
msgid "<strong>Error:</strong><p>"
msgstr "<strong>错误:</strong><p>"
-#: app/kategrepdialog.cpp:494
+#: app/kategrepdialog.cpp:479
msgid "Grep Tool Error"
msgstr "Grep 工具错误"
@@ -995,188 +969,164 @@ msgstr "很好的帮助"
msgid "All people who have contributed and I have forgotten to mention"
msgstr "所有做出贡献而我却没能提到的人员"
-#: app/katemainwindow.cpp:213 app/katesavemodifieddialog.cpp:152
+#: app/katemainwindow.cpp:212 app/katesavemodifieddialog.cpp:152
msgid "Documents"
msgstr "文档"
-#: app/katemainwindow.cpp:217
+#: app/katemainwindow.cpp:216
msgid "Filesystem Browser"
msgstr "文件系统浏览器"
-#: app/katemainwindow.cpp:234
+#: app/katemainwindow.cpp:230
msgid "Terminal"
msgstr "终端"
-#: app/katemainwindow.cpp:246
+#: app/katemainwindow.cpp:242
msgid "Create a new document"
msgstr "创建一个新文档"
-#: app/katemainwindow.cpp:247
+#: app/katemainwindow.cpp:243
msgid "Open an existing document for editing"
msgstr "打开已有文档来编辑"
-#: app/katemainwindow.cpp:250 app/kwritemain.cpp:151
+#: app/katemainwindow.cpp:246 app/kwritemain.cpp:151
msgid ""
"This lists files which you have opened recently, and allows you to easily "
"open them again."
msgstr "这会列举您最近打开的文件,并能让您轻松地再打开它们。"
-#: app/katemainwindow.cpp:252
+#: app/katemainwindow.cpp:248
msgid "Save A&ll"
msgstr "全部保存(&L)"
-#: app/katemainwindow.cpp:253
+#: app/katemainwindow.cpp:249
msgid "Save all open, modified documents to disk."
msgstr "把所有打开、修改过的文档保存到磁盘上。"
-#: app/katemainwindow.cpp:255
+#: app/katemainwindow.cpp:251
msgid "Close the current document."
msgstr "关闭当前文档。"
-#: app/katemainwindow.cpp:257
+#: app/katemainwindow.cpp:253
msgid "Clos&e All"
msgstr "全部关闭(&E)"
-#: app/katemainwindow.cpp:258
+#: app/katemainwindow.cpp:254
msgid "Close all open documents."
msgstr "关闭所有打开的文档。"
-#: app/katemainwindow.cpp:260
+#: app/katemainwindow.cpp:256
msgid "Send one or more of the open documents as email attachments."
msgstr "把一个或多个打开的文档作为电子邮件附件发送。"
-#: app/katemainwindow.cpp:262
+#: app/katemainwindow.cpp:258
msgid "Close this window"
msgstr "关闭该窗口"
-#: app/katemainwindow.cpp:265
+#: app/katemainwindow.cpp:261
msgid "Create a new Kate view (a new window with the same document list)."
msgstr "创建一个新的 Kate 视图(一个有同样文档列表的新窗口)。"
-#: app/katemainwindow.cpp:270
+#: app/katemainwindow.cpp:266
msgid "Launch external helper applications"
msgstr "调用外部助手应用程序"
-#: app/katemainwindow.cpp:276
+#: app/katemainwindow.cpp:272
msgid "Open W&ith"
msgstr "打开方式(&I)"
-#: app/katemainwindow.cpp:277
+#: app/katemainwindow.cpp:273
msgid ""
"Open the current document using another application registered for its file "
"type, or an application of your choice."
msgstr ""
"使用另一个注册用于该文件类型的应用程序或您自己选择的应用程序来打开当前文档。"
-#: app/katemainwindow.cpp:282 app/kwritemain.cpp:174
+#: app/katemainwindow.cpp:278 app/kwritemain.cpp:174
msgid "Configure the application's keyboard shortcut assignments."
msgstr "配置应用程序的键盘快捷键安排。"
-#: app/katemainwindow.cpp:285 app/kwritemain.cpp:177
+#: app/katemainwindow.cpp:281 app/kwritemain.cpp:177
msgid "Configure which items should appear in the toolbar(s)."
msgstr "配置要在工具栏上出现的项目。"
-#: app/katemainwindow.cpp:288
+#: app/katemainwindow.cpp:284
msgid ""
"Configure various aspects of this application and the editing component."
msgstr "从多个方面配置本应用程序和编辑组件"
-#: app/katemainwindow.cpp:292
+#: app/katemainwindow.cpp:288
msgid "&Pipe to Console"
msgstr "管道到控制台(&P)"
-#: app/katemainwindow.cpp:295
+#: app/katemainwindow.cpp:291
msgid "This shows useful tips on the use of this application."
msgstr "这会显示关于本应用程序使用的有用提示。"
-#: app/katemainwindow.cpp:299
+#: app/katemainwindow.cpp:295
msgid "&Plugins Handbook"
msgstr "插件手册(&P)"
-#: app/katemainwindow.cpp:300
+#: app/katemainwindow.cpp:296
msgid "This shows help files for various available plugins."
msgstr "这会显示各类可用插件的帮助文件。"
-#: app/katemainwindow.cpp:309
-#, fuzzy
-msgid "&New"
-msgstr "新建(&N)..."
+#: app/katemainwindow.cpp:305
+msgid ""
+"_: Menu entry Session->New\n"
+"&New"
+msgstr "新建(&N)"
-#: app/katemainwindow.cpp:313
+#: app/katemainwindow.cpp:308
msgid "Save &As..."
msgstr "另存为(&A)..."
-#: app/katemainwindow.cpp:315
-#, fuzzy
-msgid "&Rename"
-msgstr "重命名(&R)..."
-
-#: app/katemainwindow.cpp:319
-msgid "Re&load"
-msgstr ""
-
-#: app/katemainwindow.cpp:321
-#, fuzzy
-msgid "Acti&vate"
-msgstr "激活下个标签"
-
-#: app/katemainwindow.cpp:323
-msgid "Toggle read &only"
-msgstr ""
-
-#: app/katemainwindow.cpp:325
-#, fuzzy
-msgid "Move &Up"
-msgstr "移至"
-
-#: app/katemainwindow.cpp:327
-#, fuzzy
-msgid "Move Do&wn"
-msgstr "移至"
+#: app/katemainwindow.cpp:309
+msgid "&Manage..."
+msgstr "管理(&M)..."
-#: app/katemainwindow.cpp:329
-#, fuzzy
-msgid "Sele&ct session"
-msgstr "保存会话(&S)"
+#: app/katemainwindow.cpp:312
+msgid "&Quick Open"
+msgstr "快速打开(&Q)"
-#: app/katemainwindow.cpp:506
+#: app/katemainwindow.cpp:488
msgid ""
"_: 'document name [*]', [*] means modified\n"
"%1 [*]"
msgstr "%1 [*]"
-#: app/katemainwindow.cpp:631
+#: app/katemainwindow.cpp:610
msgid "&Other..."
msgstr "其它(&O)..."
-#: app/katemainwindow.cpp:641
+#: app/katemainwindow.cpp:620
msgid "Other..."
msgstr "其它..."
-#: app/katemainwindow.cpp:658
+#: app/katemainwindow.cpp:637
msgid "Application '%1' not found!"
msgstr "应用程序“%1”未找到!"
-#: app/katemainwindow.cpp:658
+#: app/katemainwindow.cpp:637
msgid "Application Not Found!"
msgstr "应用程序未找到!"
-#: app/katemainwindow.cpp:686
+#: app/katemainwindow.cpp:665
msgid ""
"<p>The current document has not been saved, and cannot be attached to an "
"email message.<p>Do you want to save it and proceed?"
msgstr ""
"<p>当前文档还没有被保存,无法被附加到电子邮件消息。<p>您想保存它并继续吗?"
-#: app/katemainwindow.cpp:689
+#: app/katemainwindow.cpp:668
msgid "Cannot Send Unsaved File"
msgstr "无法发送未保存文件"
-#: app/katemainwindow.cpp:697 app/katemainwindow.cpp:718
+#: app/katemainwindow.cpp:676 app/katemainwindow.cpp:697
msgid "The file could not be saved. Please check if you have write permission."
msgstr "该文件无法被保存。请检查您是否拥有写权限。"
-#: app/katemainwindow.cpp:708
+#: app/katemainwindow.cpp:687
msgid ""
"<p>The current file:<br><strong>%1</strong><br>has been modified. "
"Modifications will not be available in the attachment.<p>Do you want to save "
@@ -1185,11 +1135,11 @@ msgstr ""
"<p>当前文件:<br><strong>%1</strong><br>已被修改。修改将不会体现在附件中。<p>"
"您想在发送前保存它吗?"
-#: app/katemainwindow.cpp:711
+#: app/katemainwindow.cpp:690
msgid "Save Before Sending?"
msgstr "发送前保存?"
-#: app/katemainwindow.cpp:711
+#: app/katemainwindow.cpp:690
msgid "Do Not Save"
msgstr "不保存"
@@ -1383,146 +1333,115 @@ msgstr "位置"
msgid "Projects"
msgstr "项目"
-#: app/katesavemodifieddialog.cpp:163
+#: app/katesavemodifieddialog.cpp:164
msgid "Se&lect All"
msgstr "全部选中(&L)"
-#: app/katesavemodifieddialog.cpp:210
+#: app/katesavemodifieddialog.cpp:211
msgid ""
"Data you requested to be saved could not be written. Please choose how you "
"want to proceed."
msgstr "您请求保存的数据无法写入。请选择您想要如何继续。"
-#: app/katesession.cpp:823
-msgid "Session Chooser"
-msgstr "会话选择器"
-
-#: app/katesession.cpp:825
-msgid "Open Session"
-msgstr "打开会话"
-
-#: app/katesession.cpp:826
-msgid "New Session"
-msgstr "新建会话"
+#: app/katesession.cpp:78 app/katesession.cpp:102 app/katesession.cpp:252
+#, fuzzy
+msgid "Default Session"
+msgstr "默认会话"
-#: app/katesession.cpp:843
-msgid "Session Name"
-msgstr "会话名称"
+#: app/katesession.cpp:82
+msgid "Unnamed Session"
+msgstr "未命名会话"
-#: app/katesession.cpp:844
-msgid "Open Documents"
-msgstr "打开文档"
+#: app/katesession.cpp:104
+msgid "Session (%1)"
+msgstr "会话(%1)"
-#: app/katesessionpanel.cpp:43
+#: app/katesession.cpp:384
#, fuzzy
-msgid "Session Name Chooser"
-msgstr "会话选择器"
+msgid "Save Session?"
+msgstr "保存会话吗?"
-#: app/katesessionpanel.cpp:63
+#: app/katesession.cpp:391
#, fuzzy
-msgid "Switch to the new session"
-msgstr "启动新会话(&S)"
+msgid "Save current session?"
+msgstr "保存会话(&S)"
-#: app/katesessionpanel.cpp:201
-#, fuzzy
-msgid "New"
-msgstr "新建标签"
+#: app/katesession.cpp:392
+msgid "Do not ask again"
+msgstr "不再询问"
-#: app/katesessionpanel.cpp:203
-msgid "Create a new session and switch to it."
-msgstr ""
+#: app/katesession.cpp:482
+msgid "No session selected to open."
+msgstr "未选择要打开的会话。"
-#: app/katesessionpanel.cpp:208
-#, fuzzy
-msgid "Save the selected session."
-msgstr "保存当前会话吗?"
+#: app/katesession.cpp:482
+msgid "No Session Selected"
+msgstr "未选择会话"
-#: app/katesessionpanel.cpp:211
-#, fuzzy
-msgid "Save as..."
-msgstr "另存为(&A)..."
+#: app/katesession.cpp:554
+msgid "Specify Name for Current Session"
+msgstr "指定当前会话的名称"
-#: app/katesessionpanel.cpp:213
-msgid ""
-"Save an unsaved session with a new name or clone an already saved session "
-"into a new session."
-msgstr ""
+#: app/katesession.cpp:554 app/katesession.cpp:572 app/katesession.cpp:850
+msgid "Session name:"
+msgstr "会话名称:"
-#: app/katesessionpanel.cpp:217
-#, fuzzy
-msgid "Rename"
-msgstr "重命名(&R)..."
+#: app/katesession.cpp:561
+msgid "To save a new session, you must specify a name."
+msgstr "要保存新会话,您必须指定名称。"
-#: app/katesessionpanel.cpp:219
-msgid "Rename the selected session."
-msgstr ""
+#: app/katesession.cpp:561 app/katesession.cpp:579 app/katesession.cpp:857
+msgid "Missing Session Name"
+msgstr "缺少会话名称"
-#: app/katesessionpanel.cpp:224
-msgid "Delete the selected session."
-msgstr ""
+#: app/katesession.cpp:572
+msgid "Specify New Name for Current Session"
+msgstr "为当前会话指定新名称"
-#: app/katesessionpanel.cpp:229
-msgid "Reload the last saved state of the selected session."
-msgstr ""
-
-#: app/katesessionpanel.cpp:234
-#, fuzzy
-msgid "Activate"
-msgstr "激活下个标签"
-
-#: app/katesessionpanel.cpp:236
-msgid "Activate the selected session."
-msgstr ""
+#: app/katesession.cpp:579 app/katesession.cpp:857
+msgid "To save a session, you must specify a name."
+msgstr "要保存会话,您必须指定名称。"
-#: app/katesessionpanel.cpp:239
-msgid "Toggle read only"
-msgstr ""
+#: app/katesession.cpp:618
+msgid "Session Chooser"
+msgstr "会话选择器"
-#: app/katesessionpanel.cpp:241
-msgid ""
-"Toggle read only status for the selected session.<p>In a read only session, "
-"you can work as usual but the list of documents in the session will not be "
-"saved when you exit Kate or switch to another session.<p>You can use this "
-"option to create template sessions that you wish to keep unchanged over time."
-msgstr ""
+#: app/katesession.cpp:623 app/katesession.cpp:715
+msgid "Open Session"
+msgstr "打开会话"
-#: app/katesessionpanel.cpp:247
-#, fuzzy
-msgid "Move Up"
-msgstr "移至"
+#: app/katesession.cpp:624
+msgid "New Session"
+msgstr "新建会话"
-#: app/katesessionpanel.cpp:249
-msgid "Move up the selected session."
-msgstr ""
+#: app/katesession.cpp:642 app/katesession.cpp:732 app/katesession.cpp:796
+msgid "Session Name"
+msgstr "会话名称"
-#: app/katesessionpanel.cpp:252
-#, fuzzy
-msgid "Move Down"
-msgstr "移至"
+#: app/katesession.cpp:643 app/katesession.cpp:733 app/katesession.cpp:797
+msgid "Open Documents"
+msgstr "打开文档"
-#: app/katesessionpanel.cpp:254
-msgid "Move down the selected session."
-msgstr ""
+#: app/katesession.cpp:660
+msgid "&Always use this choice"
+msgstr "总是使用此选择(&A)"
-#: app/katesessionpanel.cpp:379
-msgid "Do you really want to delete the session \"%1\"?"
-msgstr ""
+#: app/katesession.cpp:720
+msgid "&Open"
+msgstr "打开(&O)"
-#: app/katesessionpanel.cpp:380
-#, fuzzy
-msgid "Delete session"
-msgstr "默认会话"
+#: app/katesession.cpp:781
+msgid "Manage Sessions"
+msgstr "管理会话"
-#: app/katesessionpanel.cpp:723
+#: app/katesession.cpp:810
#, fuzzy
-msgid "Save Session"
-msgstr "保存会话吗?"
+msgid "&Rename..."
+msgstr "重命名(&R)..."
-#: app/katesessionpanel.cpp:729
-msgid ""
-"<p>Do you want to save the current session?<p>!!NOTE!!<p>The session will be "
-"removed if you choose \"Delete\""
-msgstr ""
+#: app/katesession.cpp:850
+msgid "Specify New Name for Session"
+msgstr "指定会话的新名称"
#: app/kateviewmanager.cpp:97
msgid "New Tab"
@@ -1592,27 +1511,27 @@ msgstr "关闭当前标签"
msgid "Open File"
msgstr "打开文件"
-#: app/kateviewspace.cpp:322 app/kateviewspace.cpp:361
+#: app/kateviewspace.cpp:321 app/kateviewspace.cpp:360
msgid " INS "
msgstr " 插入 "
-#: app/kateviewspace.cpp:327 app/kateviewspace.cpp:365
+#: app/kateviewspace.cpp:326 app/kateviewspace.cpp:364
msgid " NORM "
msgstr " 普通 "
-#: app/kateviewspace.cpp:353
+#: app/kateviewspace.cpp:352
msgid " Line: %1 Col: %2 "
msgstr " 行:%1 列:%2 "
-#: app/kateviewspace.cpp:357
+#: app/kateviewspace.cpp:356
msgid " R/O "
msgstr " 只读 "
-#: app/kateviewspace.cpp:359
+#: app/kateviewspace.cpp:358
msgid " OVR "
msgstr " 改写 "
-#: app/kateviewspace.cpp:365
+#: app/kateviewspace.cpp:364
msgid " BLK "
msgstr " 块 "
@@ -1701,7 +1620,7 @@ msgstr "文档(&D)"
msgid "Sess&ions"
msgstr "会话(&I)"
-#: data/kateui.rc:90
+#: data/kateui.rc:85
#, no-c-format
msgid "&Window"
msgstr "窗口(&W)"
@@ -1887,6 +1806,70 @@ msgstr ""
"架。</p>\n"
#, fuzzy
+#~ msgid "Save Sessions"
+#~ msgstr "保存会话吗?"
+
+#, fuzzy
+#~ msgid "Hide errors"
+#~ msgstr "隐藏侧边栏(&B)"
+
+#, fuzzy
+#~ msgid "&New"
+#~ msgstr "新建(&N)..."
+
+#, fuzzy
+#~ msgid "Acti&vate"
+#~ msgstr "激活下个标签"
+
+#, fuzzy
+#~ msgid "Move &Up"
+#~ msgstr "移至"
+
+#, fuzzy
+#~ msgid "Move Do&wn"
+#~ msgstr "移至"
+
+#, fuzzy
+#~ msgid "Sele&ct session"
+#~ msgstr "保存会话(&S)"
+
+#, fuzzy
+#~ msgid "Session Name Chooser"
+#~ msgstr "会话选择器"
+
+#, fuzzy
+#~ msgid "Switch to the new session"
+#~ msgstr "启动新会话(&S)"
+
+#, fuzzy
+#~ msgid "New"
+#~ msgstr "新建标签"
+
+#, fuzzy
+#~ msgid "Save the selected session."
+#~ msgstr "保存当前会话吗?"
+
+#, fuzzy
+#~ msgid "Save as..."
+#~ msgstr "另存为(&A)..."
+
+#, fuzzy
+#~ msgid "Rename"
+#~ msgstr "重命名(&R)..."
+
+#, fuzzy
+#~ msgid "Activate"
+#~ msgstr "激活下个标签"
+
+#, fuzzy
+#~ msgid "Move Up"
+#~ msgstr "移至"
+
+#, fuzzy
+#~ msgid "Move Down"
+#~ msgstr "移至"
+
+#, fuzzy
#~ msgid "Save As"
#~ msgstr "另存为(&A)..."
@@ -1938,58 +1921,5 @@ msgstr ""
#~ msgid "Main Toolbar"
#~ msgstr "工具栏"
-#~ msgid "Unnamed Session"
-#~ msgstr "未命名会话"
-
-#~ msgid "Session (%1)"
-#~ msgstr "会话(%1)"
-
-#~ msgid "No session selected to open."
-#~ msgstr "未选择要打开的会话。"
-
-#~ msgid "No Session Selected"
-#~ msgstr "未选择会话"
-
-#~ msgid "Specify Name for Current Session"
-#~ msgstr "指定当前会话的名称"
-
-#~ msgid "Session name:"
-#~ msgstr "会话名称:"
-
-#~ msgid "To save a new session, you must specify a name."
-#~ msgstr "要保存新会话,您必须指定名称。"
-
-#~ msgid "Missing Session Name"
-#~ msgstr "缺少会话名称"
-
-#~ msgid "Specify New Name for Current Session"
-#~ msgstr "为当前会话指定新名称"
-
-#~ msgid "To save a session, you must specify a name."
-#~ msgstr "要保存会话,您必须指定名称。"
-
-#~ msgid "&Always use this choice"
-#~ msgstr "总是使用此选择(&A)"
-
-#~ msgid "&Open"
-#~ msgstr "打开(&O)"
-
-#~ msgid "Manage Sessions"
-#~ msgstr "管理会话"
-
-#~ msgid "Specify New Name for Session"
-#~ msgstr "指定会话的新名称"
-
-#~ msgid ""
-#~ "_: Menu entry Session->New\n"
-#~ "&New"
-#~ msgstr "新建(&N)"
-
-#~ msgid "&Manage..."
-#~ msgstr "管理(&M)..."
-
-#~ msgid "&Quick Open"
-#~ msgstr "快速打开(&Q)"
-
#~ msgid "Choose Editor..."
#~ msgstr "选择编辑器..."
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmenergy.po b/tde-i18n-zh_CN/messages/tdebase/kcmenergy.po
index f1830634499..227dae0eea8 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmenergy.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmenergy.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmenergy\n"
-"POT-Creation-Date: 2018-12-06 17:06+0100\n"
+"POT-Creation-Date: 2019-01-23 23:15+0100\n"
"PO-Revision-Date: 2004-01-05 00:19+0800\n"
"Last-Translator: Gou Zhuang <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -27,7 +27,7 @@ msgid ""
"Your emails"
msgstr ""
-#: energy.cpp:145
+#: energy.cpp:149
msgid ""
"<h1>Display Power Control</h1> If your display supports power saving "
"features, you can configure them using this module.<p> There are three "
@@ -42,50 +42,50 @@ msgstr ""
"的时间就越长。<p>要把显示器从节能状态唤醒,您可以轻轻挪动鼠标,或者按下一个不"
"致产生副作用的键,如“Shift”键。"
-#: energy.cpp:181
+#: energy.cpp:185
msgid "&Enable display power management"
msgstr "启用显示器能源管理(&E)"
-#: energy.cpp:185
+#: energy.cpp:189
msgid "Check this option to enable the power saving features of your display."
msgstr "选中此选项将启用您的显示器的节能功能。"
-#: energy.cpp:189
+#: energy.cpp:193
#, fuzzy
msgid "&Enable specific display power management"
msgstr "启用显示器能源管理(&E)"
-#: energy.cpp:195
+#: energy.cpp:199
msgid "Your display does not support power saving."
msgstr "您的显示器没有节能功能。"
-#: energy.cpp:202
+#: energy.cpp:206
msgid "Learn more about the Energy Star program"
msgstr "更多地了解关于能源之星程序"
-#: energy.cpp:212
+#: energy.cpp:216
msgid "&Standby after:"
msgstr "待机前等(&S):"
-#: energy.cpp:214 energy.cpp:225 energy.cpp:237
+#: energy.cpp:218 energy.cpp:229 energy.cpp:241
msgid " min"
msgstr "分钟"
-#: energy.cpp:215 energy.cpp:226 energy.cpp:238
+#: energy.cpp:219 energy.cpp:230 energy.cpp:242
msgid "Disabled"
msgstr "禁用"
-#: energy.cpp:218
+#: energy.cpp:222
msgid ""
"Choose the period of inactivity after which the display should enter "
"\"standby\" mode. This is the first level of power saving."
msgstr "选择显示器进入“待机”模式前的空闲状态的时间。这是第一级节能。"
-#: energy.cpp:223
+#: energy.cpp:227
msgid "S&uspend after:"
msgstr "休眠(&U):"
-#: energy.cpp:229
+#: energy.cpp:233
msgid ""
"Choose the period of inactivity after which the display should enter "
"\"suspend\" mode. This is the second level of power saving, but may not be "
@@ -94,11 +94,11 @@ msgstr ""
"选择显示器进入“休眠”模式前的空闲状态的时间。这是第二级节能,但是对于某些显示"
"器来说,可能和第一级没有什么区别。"
-#: energy.cpp:235
+#: energy.cpp:239
msgid "&Power off after:"
msgstr "关闭电源(&P):"
-#: energy.cpp:241
+#: energy.cpp:245
msgid ""
"Choose the period of inactivity after which the display should be powered "
"off. This is the greatest level of power saving that can be achieved while "
@@ -107,10 +107,10 @@ msgstr ""
"选择关闭显示器电源前的空闲状态的时间。这是显示器物理上处于开启状态时所能达到"
"的最大级别的节能。"
-#: energy.cpp:252
+#: energy.cpp:256
msgid "Configure KPowersave..."
msgstr ""
-#: energy.cpp:258
+#: energy.cpp:262
msgid "Configure TDEPowersave..."
msgstr ""
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmmedia.po b/tde-i18n-zh_CN/messages/tdebase/kcmmedia.po
index 8bd0e6981ce..4182fc21bdb 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmmedia.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmmedia.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: kcmmedia\n"
-"POT-Creation-Date: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-01-23 23:16+0100\n"
"PO-Revision-Date: 2005-09-24 23:24+0800\n"
"Last-Translator: Funda Wang <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -116,23 +116,11 @@ msgid ""
msgstr "如果您想要在挂载设备后自动启动应用程序,请选中此项。"
#: managermoduleview.ui:60
-#, fuzzy, no-c-format
-msgid "Enable notification popups"
-msgstr "通知(&N)"
-
-#: managermoduleview.ui:63
-#, no-c-format
-msgid ""
-"Deselect this if you do not want action request popups to be generated when "
-"devices are plugged in."
-msgstr ""
-
-#: managermoduleview.ui:71
#, no-c-format
msgid "Mount options"
msgstr ""
-#: managermoduleview.ui:90
+#: managermoduleview.ui:79
#, no-c-format
msgid ""
"Here you can specify default mount options for your storage media. Please "
@@ -143,77 +131,77 @@ msgid ""
"the best value depending on your media."
msgstr ""
-#: managermoduleview.ui:110
+#: managermoduleview.ui:99
#, no-c-format
msgid "Read only"
msgstr ""
-#: managermoduleview.ui:113
+#: managermoduleview.ui:102
#, no-c-format
msgid "By default, mount all file systems read-only."
msgstr ""
-#: managermoduleview.ui:121
+#: managermoduleview.ui:110
#, no-c-format
msgid "Mount as user"
msgstr ""
-#: managermoduleview.ui:124
+#: managermoduleview.ui:113
#, no-c-format
msgid "Mount this file system as user."
msgstr ""
-#: managermoduleview.ui:132
+#: managermoduleview.ui:121
#, no-c-format
msgid "Flushed IO"
msgstr ""
-#: managermoduleview.ui:138
+#: managermoduleview.ui:127
#, no-c-format
msgid ""
"Always flush all data to the hot plug devices immediately and don't cache it."
msgstr ""
-#: managermoduleview.ui:146
+#: managermoduleview.ui:135
#, no-c-format
msgid "Synchronous"
msgstr ""
-#: managermoduleview.ui:152
+#: managermoduleview.ui:141
#, no-c-format
msgid "All I/O to the file system should be done synchronously."
msgstr ""
-#: managermoduleview.ui:160
+#: managermoduleview.ui:149
#, no-c-format
msgid "Quiet"
msgstr ""
-#: managermoduleview.ui:163
+#: managermoduleview.ui:152
#, no-c-format
msgid ""
"Attempts to chown or chmod files do not return errors, although they fail. "
"Use with caution!"
msgstr ""
-#: managermoduleview.ui:171
+#: managermoduleview.ui:160
#, no-c-format
msgid "UTF-8 charset"
msgstr ""
-#: managermoduleview.ui:174
+#: managermoduleview.ui:163
#, no-c-format
msgid ""
"UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the "
"console. It can be be enabled for the filesystem with this option."
msgstr ""
-#: managermoduleview.ui:190
+#: managermoduleview.ui:179
#, no-c-format
msgid "Short names:"
msgstr ""
-#: managermoduleview.ui:196
+#: managermoduleview.ui:185
#, no-c-format
msgid ""
"<h2>Defines the behaviour for creation and display of filenames which "
@@ -240,27 +228,27 @@ msgid ""
"all upper case."
msgstr ""
-#: managermoduleview.ui:217
+#: managermoduleview.ui:206
#, no-c-format
msgid "All Data"
msgstr ""
-#: managermoduleview.ui:222
+#: managermoduleview.ui:211
#, no-c-format
msgid "Ordered"
msgstr ""
-#: managermoduleview.ui:227
+#: managermoduleview.ui:216
#, no-c-format
msgid "Writeback"
msgstr ""
-#: managermoduleview.ui:242
+#: managermoduleview.ui:231
#, no-c-format
msgid "Journaling:"
msgstr ""
-#: managermoduleview.ui:248
+#: managermoduleview.ui:237
#, no-c-format
msgid ""
"<h2>Specifies the journalling mode for file data. Metadata is always "
@@ -283,42 +271,42 @@ msgid ""
"after a crash and journal recovery."
msgstr ""
-#: managermoduleview.ui:268
+#: managermoduleview.ui:257
#, no-c-format
msgid "Lower"
msgstr ""
-#: managermoduleview.ui:273
+#: managermoduleview.ui:262
#, no-c-format
msgid "Windows 95"
msgstr ""
-#: managermoduleview.ui:278
+#: managermoduleview.ui:267
#, no-c-format
msgid "Windows NT"
msgstr ""
-#: managermoduleview.ui:283
+#: managermoduleview.ui:272
#, no-c-format
msgid "Mixed"
msgstr ""
-#: managermoduleview.ui:297
+#: managermoduleview.ui:286
#, no-c-format
msgid "Mount automatically"
msgstr ""
-#: managermoduleview.ui:300
+#: managermoduleview.ui:289
#, no-c-format
msgid "By default, mount all file systems automatically."
msgstr ""
-#: managermoduleview.ui:308
+#: managermoduleview.ui:297
#, no-c-format
msgid "Access time updates"
msgstr ""
-#: managermoduleview.ui:314
+#: managermoduleview.ui:303
#, no-c-format
msgid "Update inode access time for each access."
msgstr ""
@@ -398,3 +386,7 @@ msgstr "显示服务的介质(&Y):"
#, no-c-format
msgid "Command:"
msgstr "命令:"
+
+#, fuzzy
+#~ msgid "Enable notification popups"
+#~ msgstr "通知(&N)"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kdcop.po b/tde-i18n-zh_CN/messages/tdebase/kdcop.po
index c1d5c8360fa..011d6ed3725 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kdcop.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kdcop.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: kdcop\n"
-"POT-Creation-Date: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-01-23 23:16+0100\n"
"PO-Revision-Date: 2004-01-05 00:28+0800\n"
"Last-Translator: Gou Zhuang <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -67,81 +67,81 @@ msgstr "设置当前的语言导出。"
msgid "DCOP Browser"
msgstr "DCOP 浏览器"
-#: kdcopwindow.cpp:414
+#: kdcopwindow.cpp:411
msgid "No parameters found."
msgstr "找不到参数。"
-#: kdcopwindow.cpp:414
+#: kdcopwindow.cpp:411
msgid "DCOP Browser Error"
msgstr "DCOP 浏览器错误"
-#: kdcopwindow.cpp:430
+#: kdcopwindow.cpp:427
#, c-format
msgid "Call Function %1"
msgstr "调用函数 %1"
-#: kdcopwindow.cpp:434
+#: kdcopwindow.cpp:431
msgid "Name"
msgstr "名称"
-#: kdcopwindow.cpp:435
+#: kdcopwindow.cpp:432
msgid "Type"
msgstr "类型"
-#: kdcopwindow.cpp:436
+#: kdcopwindow.cpp:433
msgid "Value"
msgstr "值"
-#: kdcopwindow.cpp:643
+#: kdcopwindow.cpp:640
msgid "X"
msgstr "X"
-#: kdcopwindow.cpp:644
+#: kdcopwindow.cpp:641
msgid "Y"
msgstr "Y"
-#: kdcopwindow.cpp:674 kdcopwindow.cpp:801
+#: kdcopwindow.cpp:671 kdcopwindow.cpp:798
#, c-format
msgid "Cannot handle datatype %1"
msgstr "无法处理数据类型 %1"
-#: kdcopwindow.cpp:836
+#: kdcopwindow.cpp:833
msgid "DCOP call failed"
msgstr "DCOP 调用失败"
-#: kdcopwindow.cpp:838
+#: kdcopwindow.cpp:835
#, c-format
msgid "<p>DCOP call failed.</p>%1"
msgstr "<p>DCOP 调用失败。</p>%1"
-#: kdcopwindow.cpp:849
+#: kdcopwindow.cpp:846
msgid ""
"<p>Application is still registered with DCOP; I do not know why this call "
"failed.</p>"
msgstr "<p>程序仍然登记在 DCOP 中;不知道为什么该调用失败。</p>"
-#: kdcopwindow.cpp:861
+#: kdcopwindow.cpp:858
msgid "<p>The application appears to have unregistered with DCOP.</p>"
msgstr "<p>程序看起来已经在 DCOP 中注销。</p>"
-#: kdcopwindow.cpp:877
+#: kdcopwindow.cpp:874
msgid "DCOP call %1 executed"
msgstr "DCOP 调用 %1 已执行"
-#: kdcopwindow.cpp:886
+#: kdcopwindow.cpp:883
msgid "<strong>%1</strong>"
msgstr "<strong>%1</strong>"
-#: kdcopwindow.cpp:893
+#: kdcopwindow.cpp:890
#, c-format
msgid "Unknown type %1."
msgstr "未知类型 %1。"
-#: kdcopwindow.cpp:899
+#: kdcopwindow.cpp:896
msgid "No returned values"
msgstr "没有返回值"
-#: kdcopwindow.cpp:1104
+#: kdcopwindow.cpp:1101
#, c-format
msgid "Do not know how to demarshal %1"
msgstr "不知道如何散列 %1"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kdesktop.po b/tde-i18n-zh_CN/messages/tdebase/kdesktop.po
index 7bd2ec884c1..cacb41cf768 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kdesktop.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kdesktop.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-01-23 23:16+0100\n"
"PO-Revision-Date: 2005-08-09 13:01+0800\n"
"Last-Translator: Funda Wang <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -102,12 +102,12 @@ msgstr "显示任务管理器"
msgid "Show Window List"
msgstr "显示窗口列表"
-#: kdesktopbindings.cpp:26 krootwm.cc:469 lock/lockdlg.cc:875
-#: lock/securedlg.cc:118
+#: kdesktopbindings.cpp:26 krootwm.cc:469 lock/lockdlg.cc:801
+#: lock/securedlg.cc:116
msgid "Switch User"
msgstr "切换用户"
-#: kdesktopbindings.cpp:31 krootwm.cc:194 lock/securedlg.cc:106
+#: kdesktopbindings.cpp:31 krootwm.cc:194 lock/securedlg.cc:104
msgid "Lock Session"
msgstr "锁住会话"
@@ -296,7 +296,7 @@ msgstr ""
msgid "Warning - New Session"
msgstr "警告 - 新会话"
-#: krootwm.cc:903 lock/lockdlg.cc:778
+#: krootwm.cc:903 lock/lockdlg.cc:702
msgid "&Start New Session"
msgstr "开始新会话(&S)"
@@ -379,66 +379,66 @@ msgstr ""
msgid "Automatic Logout Notification"
msgstr ""
-#: lock/autologout.cc:56
+#: lock/autologout.cc:54
msgid "<nobr><qt><b>Automatic Log Out</b></qt><nobr>"
msgstr "<nobr><qt><b>自动注销</b></qt><nobr>"
-#: lock/autologout.cc:57
+#: lock/autologout.cc:55
msgid ""
"<qt>To prevent being logged out, resume using this session by moving the "
"mouse or pressing a key.</qt>"
msgstr "<qt>为了避免被注销,请移动鼠标或者按任意键以便恢复此会话。</qt>"
-#: lock/autologout.cc:99
+#: lock/autologout.cc:97
#, c-format
msgid ""
"_n: <nobr><qt>You will be automatically logged out in 1 second</qt></nobr>\n"
"<nobr><qt>You will be automatically logged out in %n seconds</qt></nobr>"
msgstr "<nobr><qt>您将在 %n 秒后被自动注销</qt></nobr>"
-#: lock/lockdlg.cc:121 lock/sakdlg.cc:76
+#: lock/lockdlg.cc:110 lock/sakdlg.cc:76
#, fuzzy
msgid "Desktop Session Locked"
msgstr "KDesktop 锁定程序"
-#: lock/lockdlg.cc:142 lock/lockdlg.cc:143
+#: lock/lockdlg.cc:129 lock/lockdlg.cc:130
msgid "This computer is in use and has been locked."
msgstr ""
-#: lock/lockdlg.cc:143
+#: lock/lockdlg.cc:130
msgid "Only '%1' may unlock this session."
msgstr ""
-#: lock/lockdlg.cc:147
+#: lock/lockdlg.cc:134
msgid "<nobr><b>The session is locked</b><br>"
msgstr "<nobr><b>会话已经锁定</b><br>"
-#: lock/lockdlg.cc:148
+#: lock/lockdlg.cc:135
msgid "<nobr><b>The session was locked by %1</b><br>"
msgstr "<nobr><b>会话已经被 %1 锁定</b><br>"
-#: lock/lockdlg.cc:153
+#: lock/lockdlg.cc:140
#, c-format
msgid "This session has been locked since %1"
msgstr ""
-#: lock/lockdlg.cc:164
+#: lock/lockdlg.cc:151
msgid "Sw&itch User..."
msgstr "切换用户(&I)..."
-#: lock/lockdlg.cc:165 lock/querydlg.cc:96
+#: lock/lockdlg.cc:152 lock/querydlg.cc:94
msgid "Unl&ock"
msgstr "取消锁定(&O)"
-#: lock/lockdlg.cc:331
+#: lock/lockdlg.cc:309
msgid "<b>Unlocking failed</b>"
msgstr "<b>取消锁定失败</b>"
-#: lock/lockdlg.cc:336
+#: lock/lockdlg.cc:316
msgid "<b>Warning: Caps Lock on</b>"
msgstr "<b>警告:大写状态</b>"
-#: lock/lockdlg.cc:636
+#: lock/lockdlg.cc:563
msgid ""
"Cannot unlock the session because the authentication system failed to work;\n"
"you must kill kdesktop_lock (pid %1) manually."
@@ -446,16 +446,16 @@ msgstr ""
"无法解锁会话,因为身份验证系统无法工作;\n"
"您必须手动杀死 kdesktop_lock (pid %1)。"
-#: lock/lockdlg.cc:691 lock/lockprocess.cc:2421
+#: lock/lockdlg.cc:618 lock/lockprocess.cc:2418
msgid "Authentication Subsystem Notice"
msgstr ""
-#: lock/lockdlg.cc:750
+#: lock/lockdlg.cc:675
#, fuzzy
msgid "New Session"
msgstr "开始新会话"
-#: lock/lockdlg.cc:765
+#: lock/lockdlg.cc:689
msgid ""
"You have chosen to open another desktop session instead of resuming the "
"current one.<br>The current session will be hidden and a new login screen "
@@ -470,49 +470,45 @@ msgstr ""
"一个会话,F%2 被指定为第二个会话,依次类推。您可以同时按下 Ctrl、Alt 和对应"
"的 Fn 功能键在不同的会话之间切换。此外,TDE 面板和桌面菜单也可用于切换会话。"
-#: lock/lockdlg.cc:790
+#: lock/lockdlg.cc:714
msgid "&Do not ask again"
msgstr "不再询问(&D)"
-#: lock/lockdlg.cc:901
+#: lock/lockdlg.cc:826
msgid "Session"
msgstr "会话"
-#: lock/lockdlg.cc:902
+#: lock/lockdlg.cc:827
msgid "Location"
msgstr "位置"
-#: lock/lockdlg.cc:929
+#: lock/lockdlg.cc:853
msgid ""
"_: session\n"
"&Activate"
msgstr "激活(&A)"
-#: lock/lockdlg.cc:937
+#: lock/lockdlg.cc:862
msgid "Start &New Session"
msgstr "开始新会话(&N)"
-#: lock/lockdlg.cc:997
-msgid "PIN:"
-msgstr ""
-
-#: lock/lockprocess.cc:557 lock/lockprocess.cc:713
+#: lock/lockprocess.cc:541 lock/lockprocess.cc:697
msgid "Securing desktop session"
msgstr ""
-#: lock/lockprocess.cc:1457
+#: lock/lockprocess.cc:1460
msgid "Will not lock the session, as unlocking would be impossible:\n"
msgstr "将不会锁定会话,因为取消锁定不可能:\n"
-#: lock/lockprocess.cc:1461
+#: lock/lockprocess.cc:1464
msgid "Cannot start <i>kcheckpass</i>."
msgstr "无法启动 <i>kcheckpass</i>。"
-#: lock/lockprocess.cc:1462
+#: lock/lockprocess.cc:1465
msgid "<i>kcheckpass</i> is unable to operate. Possibly it is not SetUID root."
msgstr "<i>kcheckpass</i> 无法操作。可能该程序未被 SetUID root。"
-#: lock/lockprocess.cc:1504
+#: lock/lockprocess.cc:1508
msgid "No appropriate greeter plugin configured."
msgstr "没有配置恰当的欢迎插件。"
@@ -548,15 +544,15 @@ msgstr "KDesktop 会话锁定程序"
msgid "Information Needed"
msgstr ""
-#: lock/sakdlg.cc:104
+#: lock/sakdlg.cc:102
msgid "Press Ctrl+Alt+Del to begin."
msgstr ""
-#: lock/sakdlg.cc:104
+#: lock/sakdlg.cc:102
msgid "This process helps keep your password secure."
msgstr ""
-#: lock/sakdlg.cc:104
+#: lock/sakdlg.cc:102
msgid "It prevents unauthorized users from emulating the login screen."
msgstr ""
@@ -565,20 +561,20 @@ msgstr ""
msgid "Secure Desktop Area"
msgstr "刷新桌面"
-#: lock/securedlg.cc:97
+#: lock/securedlg.cc:95
msgid "'%1' is currently logged on"
msgstr ""
-#: lock/securedlg.cc:100
+#: lock/securedlg.cc:98
msgid "You are currently logged on"
msgstr ""
-#: lock/securedlg.cc:109
+#: lock/securedlg.cc:107
#, fuzzy
msgid "Task Manager"
msgstr "显示任务管理器"
-#: lock/securedlg.cc:112
+#: lock/securedlg.cc:110
msgid "Logoff Menu"
msgstr ""
diff --git a/tde-i18n-zh_CN/messages/tdebase/kgreet_classic.po b/tde-i18n-zh_CN/messages/tdebase/kgreet_classic.po
index 0ade858b700..068220eaca2 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kgreet_classic.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kgreet_classic.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: kgreet_classic\n"
-"POT-Creation-Date: 2018-12-06 17:06+0100\n"
+"POT-Creation-Date: 2019-01-23 23:17+0100\n"
"PO-Revision-Date: 2004-05-03 13:27+0800\n"
"Last-Translator: Funda Wang <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -22,34 +22,34 @@ msgid ""
"Your emails"
msgstr ""
-#: kgreet_classic.cpp:50
-msgid "&Password:"
-msgstr "密码(&P):"
-
-#: kgreet_classic.cpp:53
-msgid "Current &password:"
-msgstr "当前密码(&P):"
-
-#: kgreet_classic.cpp:109
+#: kgreet_classic.cpp:98
msgid "&Username:"
msgstr "用户名(&U):"
-#: kgreet_classic.cpp:114
+#: kgreet_classic.cpp:103
msgid "Username:"
msgstr "用户名:"
-#: kgreet_classic.cpp:151
+#: kgreet_classic.cpp:125
+msgid "&Password:"
+msgstr "密码(&P):"
+
+#: kgreet_classic.cpp:126
+msgid "Current &password:"
+msgstr "当前密码(&P):"
+
+#: kgreet_classic.cpp:144
msgid "&New password:"
msgstr "新密码(&N):"
-#: kgreet_classic.cpp:152
+#: kgreet_classic.cpp:145
msgid "Con&firm password:"
msgstr "确认密码(&F):"
-#: kgreet_classic.cpp:361
+#: kgreet_classic.cpp:299
msgid "Unrecognized prompt \"%1\""
msgstr "无法识别的提示“%1”"
-#: kgreet_classic.cpp:615
+#: kgreet_classic.cpp:518
msgid "Username + password (classic)"
msgstr "用户名+密码(经典)"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kgreet_winbind.po b/tde-i18n-zh_CN/messages/tdebase/kgreet_winbind.po
index 880a5c8914c..51ee58a633c 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kgreet_winbind.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kgreet_winbind.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: kgreet_winbind\n"
-"POT-Creation-Date: 2018-12-06 17:06+0100\n"
+"POT-Creation-Date: 2019-01-23 23:17+0100\n"
"PO-Revision-Date: 2005-05-14 05:41+0800\n"
"Last-Translator: Funda Wang <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -25,42 +25,42 @@ msgid ""
"Your emails"
msgstr ""
-#: kgreet_winbind.cpp:130
+#: kgreet_winbind.cpp:128
msgid "&Domain:"
msgstr "域(&D):"
-#: kgreet_winbind.cpp:131
+#: kgreet_winbind.cpp:129
msgid "&Username:"
msgstr "用户名(&U):"
-#: kgreet_winbind.cpp:145
+#: kgreet_winbind.cpp:143
msgid "Domain:"
msgstr "域:"
-#: kgreet_winbind.cpp:148
+#: kgreet_winbind.cpp:146
msgid "Username:"
msgstr "用户名:"
-#: kgreet_winbind.cpp:167
+#: kgreet_winbind.cpp:165
msgid "&Password:"
msgstr "密码(&P):"
-#: kgreet_winbind.cpp:168
+#: kgreet_winbind.cpp:166
msgid "Current &password:"
msgstr "当前密码(&P):"
-#: kgreet_winbind.cpp:191
+#: kgreet_winbind.cpp:189
msgid "&New password:"
msgstr "新密码(&N):"
-#: kgreet_winbind.cpp:192
+#: kgreet_winbind.cpp:190
msgid "Con&firm password:"
msgstr "确认密码(&F):"
-#: kgreet_winbind.cpp:410
+#: kgreet_winbind.cpp:378
msgid "Unrecognized prompt \"%1\""
msgstr "无法识别提示“%1”"
-#: kgreet_winbind.cpp:714
+#: kgreet_winbind.cpp:674
msgid "Winbind / Samba"
msgstr "Winbind / Samba"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kicker.po b/tde-i18n-zh_CN/messages/tdebase/kicker.po
index 618f13759d9..c085e5f115f 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kicker.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kicker.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-01-23 23:16+0100\n"
"PO-Revision-Date: 2005-08-21 17:13+0800\n"
"Last-Translator: Funda Wang <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -60,7 +60,7 @@ msgstr "无法执行非 TDE 应用程序。"
msgid "Kicker Error"
msgstr "Kicker 错误"
-#: buttons/servicemenubutton.cpp:62 ui/k_new_mnu.cpp:1423 ui/k_new_mnu.cpp:1921
+#: buttons/servicemenubutton.cpp:62 ui/k_new_mnu.cpp:1412 ui/k_new_mnu.cpp:1910
#: ui/k_new_mnu.h:80
msgid "Applications"
msgstr "应用程序"
@@ -357,7 +357,7 @@ msgstr "不可执行"
msgid "Select Other"
msgstr "选择其它"
-#: ui/itemview.cpp:475 ui/k_new_mnu.cpp:1048
+#: ui/itemview.cpp:475 ui/k_new_mnu.cpp:1037
#, fuzzy
msgid "New Applications"
msgstr "应用程序"
@@ -366,7 +366,7 @@ msgstr "应用程序"
msgid "Restart Computer"
msgstr ""
-#: ui/itemview.cpp:482 ui/k_mnu.cpp:379 ui/k_new_mnu.cpp:1375
+#: ui/itemview.cpp:482 ui/k_mnu.cpp:379 ui/k_new_mnu.cpp:1364
msgid "Switch User"
msgstr "切换用户"
@@ -395,11 +395,11 @@ msgstr "全部应用程序"
msgid "Actions"
msgstr "动作"
-#: ui/k_mnu.cpp:370 ui/k_new_mnu.cpp:1440
+#: ui/k_mnu.cpp:370 ui/k_new_mnu.cpp:1429
msgid "Run Command..."
msgstr "运行命令..."
-#: ui/k_mnu.cpp:391 ui/k_new_mnu.cpp:1369
+#: ui/k_mnu.cpp:391 ui/k_new_mnu.cpp:1358
msgid "Save Session"
msgstr "保存会话"
@@ -411,15 +411,15 @@ msgstr "锁住会话"
msgid "Log Out..."
msgstr "注销..."
-#: ui/k_mnu.cpp:477 ui/k_new_mnu.cpp:958 ui/k_new_mnu.cpp:1554
+#: ui/k_mnu.cpp:477 ui/k_new_mnu.cpp:947 ui/k_new_mnu.cpp:1543
msgid "Lock Current && Start New Session"
msgstr "锁住当前会话并启动新会话"
-#: ui/k_mnu.cpp:479 ui/k_new_mnu.cpp:955 ui/k_new_mnu.cpp:1555
+#: ui/k_mnu.cpp:479 ui/k_new_mnu.cpp:944 ui/k_new_mnu.cpp:1544
msgid "Start New Session"
msgstr "启动新会话"
-#: ui/k_mnu.cpp:511 ui/k_new_mnu.cpp:1587
+#: ui/k_mnu.cpp:511 ui/k_new_mnu.cpp:1576
msgid ""
"<p>You have chosen to open another desktop session.<br>The current session "
"will be hidden and a new login screen will be displayed.<br>An F-key is "
@@ -433,416 +433,396 @@ msgstr ""
"话,等等。您可以同时按下 Ctrl、Alt 和相应的 F-功能键切换到不同的会话。此外,"
"TDE 面板和桌面菜单也可用于切换会话。</p>"
-#: ui/k_mnu.cpp:522 ui/k_new_mnu.cpp:1598
+#: ui/k_mnu.cpp:522 ui/k_new_mnu.cpp:1587
msgid "Warning - New Session"
msgstr "警告 - 新会话"
-#: ui/k_mnu.cpp:523 ui/k_new_mnu.cpp:1599
+#: ui/k_mnu.cpp:523 ui/k_new_mnu.cpp:1588
msgid "&Start New Session"
msgstr "启动新会话(&S)"
-#: ui/k_new_mnu.cpp:223
+#: ui/k_new_mnu.cpp:212
msgid "User&nbsp;<b>%1</b>&nbsp;on&nbsp;<b>%2</b>"
msgstr ""
-#: ui/k_new_mnu.cpp:242
+#: ui/k_new_mnu.cpp:231
msgid "Most commonly used applications and documents"
msgstr ""
-#: ui/k_new_mnu.cpp:245
+#: ui/k_new_mnu.cpp:234
#, fuzzy
msgid "List of installed applications"
msgstr "最常使用的应用程序"
-#: ui/k_new_mnu.cpp:250
+#: ui/k_new_mnu.cpp:239
msgid ""
"Information and configuration of your system, access to personal files, "
"network resources and connected disk drives"
msgstr ""
-#: ui/k_new_mnu.cpp:259
+#: ui/k_new_mnu.cpp:248
#, fuzzy
msgid "Recently used applications and documents"
msgstr "最近用过的应用程序"
-#: ui/k_new_mnu.cpp:263
+#: ui/k_new_mnu.cpp:252
msgid "<qt>Logout, switch user, switch off or reset, suspend of the system"
msgstr ""
-#: ui/k_new_mnu.cpp:267
+#: ui/k_new_mnu.cpp:256
msgid "<p align=\"center\"> <u>F</u>avorites</p>"
msgstr ""
-#: ui/k_new_mnu.cpp:268
+#: ui/k_new_mnu.cpp:257
msgid "<p align=\"center\"><u>H</u>istory</p>"
msgstr ""
-#: ui/k_new_mnu.cpp:270
+#: ui/k_new_mnu.cpp:259
msgid "<p align=\"center\"> <u>C</u>omputer</p>"
msgstr ""
-#: ui/k_new_mnu.cpp:271
+#: ui/k_new_mnu.cpp:260
msgid "<p align=\"center\"><u>A</u>pplications</p>"
msgstr ""
-#: ui/k_new_mnu.cpp:273
+#: ui/k_new_mnu.cpp:262
msgid "<p align=\"center\"><u>L</u>eave</p>"
msgstr ""
-#: ui/k_new_mnu.cpp:333
+#: ui/k_new_mnu.cpp:322
msgid "Search Internet"
msgstr ""
-#: ui/k_new_mnu.cpp:345
+#: ui/k_new_mnu.cpp:334
#, fuzzy
msgid "Search Index"
msgstr "搜索(&S):"
-#: ui/k_new_mnu.cpp:434
+#: ui/k_new_mnu.cpp:423
#, fuzzy
msgid "Applications, Contacts and Documents"
msgstr "应用程序、任务和桌面会话"
-#: ui/k_new_mnu.cpp:944
+#: ui/k_new_mnu.cpp:933
msgid "Start '%1'"
msgstr ""
-#: ui/k_new_mnu.cpp:946
+#: ui/k_new_mnu.cpp:935
msgid "Start '%1' (current)"
msgstr ""
-#: ui/k_new_mnu.cpp:948
+#: ui/k_new_mnu.cpp:937
msgid "Restart and boot directly into '%1'"
msgstr ""
-#: ui/k_new_mnu.cpp:956
+#: ui/k_new_mnu.cpp:945
#, fuzzy
msgid "Start a parallel session"
msgstr "启动新会话"
-#: ui/k_new_mnu.cpp:959
+#: ui/k_new_mnu.cpp:948
#, fuzzy
msgid "Lock screen and start a parallel session"
msgstr "锁住当前会话并启动新会话"
-#: ui/k_new_mnu.cpp:970
+#: ui/k_new_mnu.cpp:959
msgid "Switch to Session of User '%1'"
msgstr ""
-#: ui/k_new_mnu.cpp:971
+#: ui/k_new_mnu.cpp:960
#, fuzzy, c-format
msgid "Session: %1"
msgstr "保存会话"
-#: ui/k_new_mnu.cpp:1357
+#: ui/k_new_mnu.cpp:1346
#, fuzzy
msgid "Session"
msgstr "保存会话"
-#: ui/k_new_mnu.cpp:1359
-#, fuzzy
-msgid "Log out"
-msgstr "注销..."
+#: ui/k_new_mnu.cpp:1348
+msgid "Logout"
+msgstr ""
-#: ui/k_new_mnu.cpp:1360
+#: ui/k_new_mnu.cpp:1349
#, fuzzy
-msgid "End current session"
+msgid "End session"
msgstr "保存会话"
-#: ui/k_new_mnu.cpp:1362
+#: ui/k_new_mnu.cpp:1351
msgid "Lock"
msgstr ""
-#: ui/k_new_mnu.cpp:1363
+#: ui/k_new_mnu.cpp:1352
#, fuzzy
-msgid "Lock computer screen"
+msgid "Lock screen"
msgstr "锁住会话"
-#: ui/k_new_mnu.cpp:1370
+#: ui/k_new_mnu.cpp:1359
msgid "Save current Session for next login"
msgstr ""
-#: ui/k_new_mnu.cpp:1376
+#: ui/k_new_mnu.cpp:1365
msgid "Manage parallel sessions"
msgstr ""
-#: ui/k_new_mnu.cpp:1393
+#: ui/k_new_mnu.cpp:1382
msgid "System"
msgstr ""
-#: ui/k_new_mnu.cpp:1394
-msgid "Shutdown"
+#: ui/k_new_mnu.cpp:1383
+msgid "Shutdown Computer"
msgstr ""
-#: ui/k_new_mnu.cpp:1395
+#: ui/k_new_mnu.cpp:1384
msgid "Turn off computer"
msgstr ""
-#: ui/k_new_mnu.cpp:1397
-msgid "&Restart"
+#: ui/k_new_mnu.cpp:1386
+msgid "&Restart Computer"
msgstr ""
-#: ui/k_new_mnu.cpp:1398
-msgid "Restart computer and boot the default system"
+#: ui/k_new_mnu.cpp:1387
+msgid "Restart and boot the default system"
msgstr ""
-#: ui/k_new_mnu.cpp:1408
+#: ui/k_new_mnu.cpp:1397
msgid "Start Operating System"
msgstr ""
-#: ui/k_new_mnu.cpp:1409
+#: ui/k_new_mnu.cpp:1398
msgid "Restart and boot another operating system"
msgstr ""
-#: ui/k_new_mnu.cpp:1444
+#: ui/k_new_mnu.cpp:1433
#, fuzzy
msgid "System Folders"
msgstr "选择文件夹"
-#: ui/k_new_mnu.cpp:1446
+#: ui/k_new_mnu.cpp:1435
#, fuzzy
msgid "Home Folder"
msgstr "主文件夹(&H)"
-#: ui/k_new_mnu.cpp:1455
+#: ui/k_new_mnu.cpp:1444
msgid "My Documents"
msgstr ""
-#: ui/k_new_mnu.cpp:1464
+#: ui/k_new_mnu.cpp:1453
msgid "My Images"
msgstr ""
-#: ui/k_new_mnu.cpp:1473
+#: ui/k_new_mnu.cpp:1462
msgid "My Music"
msgstr ""
-#: ui/k_new_mnu.cpp:1482
+#: ui/k_new_mnu.cpp:1471
msgid "My Videos"
msgstr ""
-#: ui/k_new_mnu.cpp:1491
+#: ui/k_new_mnu.cpp:1480
msgid "My Downloads"
msgstr ""
-#: ui/k_new_mnu.cpp:1494
+#: ui/k_new_mnu.cpp:1483
#, fuzzy
msgid "Network Folders"
msgstr "选择文件夹"
-#: ui/k_new_mnu.cpp:1719
+#: ui/k_new_mnu.cpp:1708
msgid ""
"<center><b>%1</b></center>\n"
"You do not have permission to execute this command."
msgstr ""
-#: ui/k_new_mnu.cpp:1747
+#: ui/k_new_mnu.cpp:1736
msgid ""
"<center><b>%1</b></center>\n"
"Could not run the specified command."
msgstr ""
-#: ui/k_new_mnu.cpp:1757
+#: ui/k_new_mnu.cpp:1746
msgid ""
"<center><b>%1</b></center>\n"
"The specified command does not exist."
msgstr ""
-#: ui/k_new_mnu.cpp:1955
+#: ui/k_new_mnu.cpp:1944
msgid "Documents"
msgstr ""
-#: ui/k_new_mnu.cpp:2291 ui/k_new_mnu.cpp:2421
+#: ui/k_new_mnu.cpp:2280 ui/k_new_mnu.cpp:2410
#, c-format
msgid "Send Email to %1"
msgstr ""
-#: ui/k_new_mnu.cpp:2302
+#: ui/k_new_mnu.cpp:2291
#, c-format
msgid "Open Addressbook at %1"
msgstr ""
-#: ui/k_new_mnu.cpp:2343
+#: ui/k_new_mnu.cpp:2332
msgid "- Add ext:type to specify a file extension."
msgstr ""
-#: ui/k_new_mnu.cpp:2346
+#: ui/k_new_mnu.cpp:2335
msgid "- When searching for a phrase, add quotes."
msgstr ""
-#: ui/k_new_mnu.cpp:2349
+#: ui/k_new_mnu.cpp:2338
msgid "- To exclude search terms, use the minus symbol in front."
msgstr ""
-#: ui/k_new_mnu.cpp:2352
+#: ui/k_new_mnu.cpp:2341
msgid "- To search for optional terms, use OR."
msgstr ""
-#: ui/k_new_mnu.cpp:2355
+#: ui/k_new_mnu.cpp:2344
msgid "- You can use upper and lower case."
msgstr ""
-#: ui/k_new_mnu.cpp:2358
+#: ui/k_new_mnu.cpp:2347
msgid "Search Quick Tips"
msgstr ""
-#: ui/k_new_mnu.cpp:2410
+#: ui/k_new_mnu.cpp:2399
msgid "%1 = %2"
msgstr ""
-#: ui/k_new_mnu.cpp:2442
+#: ui/k_new_mnu.cpp:2431
#, c-format
msgid "Open Local File: %1"
msgstr ""
-#: ui/k_new_mnu.cpp:2445
+#: ui/k_new_mnu.cpp:2434
#, c-format
msgid "Open Local Dir: %1"
msgstr ""
-#: ui/k_new_mnu.cpp:2448
+#: ui/k_new_mnu.cpp:2437
#, c-format
msgid "Open Remote Location: %1"
msgstr ""
-#: ui/k_new_mnu.cpp:2476
+#: ui/k_new_mnu.cpp:2465
msgid "Run '%1'"
msgstr ""
-#: ui/k_new_mnu.cpp:2521 ui/k_new_mnu.cpp:2594
+#: ui/k_new_mnu.cpp:2510 ui/k_new_mnu.cpp:2583
msgid "No matches found"
msgstr ""
-#: ui/k_new_mnu.cpp:2646
+#: ui/k_new_mnu.cpp:2635
msgid "top %1 of %2"
msgstr ""
-#: ui/k_new_mnu.cpp:2648
+#: ui/k_new_mnu.cpp:2637
msgid "%1 (top %2 of %3)"
msgstr ""
-#: ui/k_new_mnu.cpp:2782
+#: ui/k_new_mnu.cpp:2768
msgid "Do you really want to reset the computer and boot Microsoft Windows"
msgstr ""
-#: ui/k_new_mnu.cpp:2782
+#: ui/k_new_mnu.cpp:2768
#, fuzzy
msgid "Start Windows Confirmation"
msgstr "快速浏览器配置"
-#: ui/k_new_mnu.cpp:2782
+#: ui/k_new_mnu.cpp:2768
msgid "Start Windows"
msgstr ""
-#: ui/k_new_mnu.cpp:2807
+#: ui/k_new_mnu.cpp:2793
msgid "Could not start Tomboy."
msgstr ""
-#: ui/k_new_mnu.cpp:2867
+#: ui/k_new_mnu.cpp:2853
#, fuzzy
msgid "Remove From Favorites"
msgstr "从面板删除(&R)"
-#: ui/k_new_mnu.cpp:2874
+#: ui/k_new_mnu.cpp:2860
#, fuzzy
msgid "Add to Favorites"
msgstr "添加到面板(&A)"
-#: ui/k_new_mnu.cpp:2905 ui/service_mnu.cpp:630
+#: ui/k_new_mnu.cpp:2891 ui/service_mnu.cpp:630
msgid "Add Menu to Desktop"
msgstr "将菜单添加到桌面"
-#: ui/k_new_mnu.cpp:2908 ui/service_mnu.cpp:603
+#: ui/k_new_mnu.cpp:2894 ui/service_mnu.cpp:603
msgid "Add Item to Desktop"
msgstr "将项目添加到桌面"
-#: ui/k_new_mnu.cpp:2915 ui/service_mnu.cpp:636
+#: ui/k_new_mnu.cpp:2901 ui/service_mnu.cpp:636
msgid "Add Menu to Main Panel"
msgstr "将菜单添加到主面板"
-#: ui/k_new_mnu.cpp:2918 ui/service_mnu.cpp:609
+#: ui/k_new_mnu.cpp:2904 ui/service_mnu.cpp:609
msgid "Add Item to Main Panel"
msgstr "将项目添加到主面板"
-#: ui/k_new_mnu.cpp:2924 ui/service_mnu.cpp:642
+#: ui/k_new_mnu.cpp:2910 ui/service_mnu.cpp:642
msgid "Edit Menu"
msgstr "编辑菜单"
-#: ui/k_new_mnu.cpp:2926 ui/service_mnu.cpp:615
+#: ui/k_new_mnu.cpp:2912 ui/service_mnu.cpp:615
msgid "Edit Item"
msgstr "编辑项"
-#: ui/k_new_mnu.cpp:2932 ui/service_mnu.cpp:621
+#: ui/k_new_mnu.cpp:2918 ui/service_mnu.cpp:621
msgid "Put Into Run Dialog"
msgstr "放入运行对话框"
-#: ui/k_new_mnu.cpp:2960
+#: ui/k_new_mnu.cpp:2946
msgid "Advanced"
msgstr ""
-#: ui/k_new_mnu.cpp:2976
+#: ui/k_new_mnu.cpp:2962
#, fuzzy
msgid "Clear Recently Used Applications"
msgstr "最近用过的应用程序"
-#: ui/k_new_mnu.cpp:2979
+#: ui/k_new_mnu.cpp:2965
#, fuzzy
msgid "Clear Recently Used Documents"
msgstr "最近用过的应用程序"
-#: ui/k_new_mnu.cpp:3564
+#: ui/k_new_mnu.cpp:3550
msgid "Media"
msgstr ""
-#: ui/k_new_mnu.cpp:3623
+#: ui/k_new_mnu.cpp:3609
msgid "(%1 available)"
msgstr ""
-#: ui/k_new_mnu.cpp:3754 ui/k_new_mnu.cpp:3758
+#: ui/k_new_mnu.cpp:3740 ui/k_new_mnu.cpp:3744
#, c-format
msgid "Directory: %1"
msgstr ""
-#: ui/k_new_mnu.cpp:3849 ui/k_new_mnu.cpp:3875
-msgid "Suspend"
-msgstr ""
-
-#: ui/k_new_mnu.cpp:3859
-msgid "Freeze"
-msgstr ""
-
-#: ui/k_new_mnu.cpp:3860
-msgid "Put the computer in software idle mode"
-msgstr ""
-
-#: ui/k_new_mnu.cpp:3867
-msgid "Standby"
+#: ui/k_new_mnu.cpp:3836
+msgid "Suspend to Disk"
msgstr ""
-#: ui/k_new_mnu.cpp:3868
+#: ui/k_new_mnu.cpp:3837 ui/k_new_mnu.cpp:3845 ui/k_new_mnu.cpp:3853
+#: ui/k_new_mnu.cpp:3861
msgid "Pause without logging out"
msgstr ""
-#: ui/k_new_mnu.cpp:3876
+#: ui/k_new_mnu.cpp:3844
msgid "Suspend to RAM"
msgstr ""
-#: ui/k_new_mnu.cpp:3883
-msgid "Hibernate"
-msgstr ""
-
-#: ui/k_new_mnu.cpp:3884
-msgid "Suspend to Disk"
-msgstr ""
-
-#: ui/k_new_mnu.cpp:3891
-msgid "Hybrid Suspend"
+#: ui/k_new_mnu.cpp:3852
+msgid "Freeze"
msgstr ""
-#: ui/k_new_mnu.cpp:3892
-msgid "Suspend to RAM + Disk"
+#: ui/k_new_mnu.cpp:3860
+msgid "Standby"
msgstr ""
-#: ui/k_new_mnu.cpp:3973
+#: ui/k_new_mnu.cpp:3931
msgid "Suspend failed"
msgstr ""
@@ -1187,6 +1167,10 @@ msgid "&Description:"
msgstr "描述(&D):"
#, fuzzy
+#~ msgid "Log out"
+#~ msgstr "注销..."
+
+#, fuzzy
#~ msgid "Bookmarks"
#~ msgstr "编辑书签(&E)"
diff --git a/tde-i18n-zh_CN/messages/tdebase/konqueror.po b/tde-i18n-zh_CN/messages/tdebase/konqueror.po
index 7b5554ac40f..657e03b561f 100644
--- a/tde-i18n-zh_CN/messages/tdebase/konqueror.po
+++ b/tde-i18n-zh_CN/messages/tdebase/konqueror.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: konqueror\n"
-"POT-Creation-Date: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-01-23 23:16+0100\n"
"PO-Revision-Date: 2005-07-17 10:02+0800\n"
"Last-Translator: Funda Wang <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -582,15 +582,15 @@ msgstr "取消选中全部项目"
msgid "Inverts the current selection of items"
msgstr "反转当前选择的项目"
-#: iconview/konq_iconview.cc:552 listview/konq_listview.cc:382
+#: iconview/konq_iconview.cc:550 listview/konq_listview.cc:382
msgid "Select files:"
msgstr "选中文件:"
-#: iconview/konq_iconview.cc:584 listview/konq_listview.cc:418
+#: iconview/konq_iconview.cc:582 listview/konq_listview.cc:418
msgid "Unselect files:"
msgstr "不选文件:"
-#: iconview/konq_iconview.cc:793
+#: iconview/konq_iconview.cc:791
msgid ""
"You cannot drop any items in a directory in which you do not have write "
"permission"
@@ -2234,7 +2234,7 @@ msgstr "不区分大小写排序"
msgid "Name"
msgstr "名称"
-#: listview/konq_listviewwidget.cc:1084
+#: listview/konq_listviewwidget.cc:1058
msgid "You must take the file out of the trash before being able to use it."
msgstr "在使用回收站里面的文件之前您必须先将它移出去。"
diff --git a/tde-i18n-zh_CN/messages/tdebase/konsole.po b/tde-i18n-zh_CN/messages/tdebase/konsole.po
index 6aa227ec8cb..3e2a68b2e69 100644
--- a/tde-i18n-zh_CN/messages/tdebase/konsole.po
+++ b/tde-i18n-zh_CN/messages/tdebase/konsole.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-01-23 23:16+0100\n"
"PO-Revision-Date: 2005-12-03 21:54+0800\n"
"Last-Translator: Funda Wang <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -31,11 +31,11 @@ msgid ""
"Your emails"
-#: TEWidget.cpp:966 TEWidget.cpp:968
+#: TEWidget.cpp:964 TEWidget.cpp:966
msgid "Size: XXX x XXX"
msgstr "大小:XXX x XXX"
-#: TEWidget.cpp:973
+#: TEWidget.cpp:971
msgid "Size: %1 x %2"
msgstr "大小:%1 x %2"
diff --git a/tde-i18n-zh_CN/messages/tdebase/ksmserver.po b/tde-i18n-zh_CN/messages/tdebase/ksmserver.po
index 15f4ff51774..874d02cfd5c 100644
--- a/tde-i18n-zh_CN/messages/tdebase/ksmserver.po
+++ b/tde-i18n-zh_CN/messages/tdebase/ksmserver.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: ksmserver\n"
-"POT-Creation-Date: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-01-23 23:16+0100\n"
"PO-Revision-Date: 2004-02-09 11:06+0800\n"
"Last-Translator: Funda Wang <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -64,76 +64,76 @@ msgstr "TDE 会话管理器"
msgid "Maintainer"
msgstr "维护者"
-#: shutdown.cpp:277
+#: shutdown.cpp:272
msgid "Notifying applications of logout request..."
msgstr ""
-#: shutdown.cpp:513 shutdown.cpp:544
+#: shutdown.cpp:508 shutdown.cpp:539
msgid "Skip Notification (%1)"
msgstr ""
-#: shutdown.cpp:515
+#: shutdown.cpp:510
msgid "Notifying remaining applications of logout request (%1/%2)..."
msgstr ""
-#: shutdown.cpp:518
+#: shutdown.cpp:513
msgid "Notifying remaining applications of logout request (%1/%2, %3)..."
msgstr ""
-#: shutdown.cpp:525
+#: shutdown.cpp:520
msgid "Ignore and Resume Logout"
msgstr ""
-#: shutdown.cpp:533
+#: shutdown.cpp:528
msgid "An application is requesting attention, logout paused..."
msgstr ""
-#: shutdown.cpp:536
+#: shutdown.cpp:531
msgid "%3 is requesting attention, logout paused..."
msgstr ""
-#: shutdown.cpp:546
+#: shutdown.cpp:541
msgid "Notifying applications of logout request (%1/%2)..."
msgstr ""
-#: shutdown.cpp:549
+#: shutdown.cpp:544
msgid "Notifying applications of logout request (%1/%2, %3)..."
msgstr ""
-#: shutdown.cpp:639
+#: shutdown.cpp:634
msgid "Logout canceled by '%1'"
msgstr "“%1”取消了注销"
-#: shutdown.cpp:645
+#: shutdown.cpp:640
#, fuzzy
msgid "Logout canceled by user"
msgstr "“%1”取消了注销"
-#: shutdown.cpp:704
+#: shutdown.cpp:699
msgid "Forcing interacting application termination"
msgstr ""
-#: shutdown.cpp:754
+#: shutdown.cpp:749
msgid "Notifying remaining applications of logout request..."
msgstr ""
-#: shutdown.cpp:784
+#: shutdown.cpp:779
msgid "Synchronizing remote folders"
msgstr ""
-#: shutdown.cpp:790 shutdowndlg.cpp:1365
+#: shutdown.cpp:785 shutdowndlg.cpp:1288
msgid "Saving your settings..."
msgstr ""
-#: shutdown.cpp:840 shutdown.cpp:914
+#: shutdown.cpp:835 shutdown.cpp:909
msgid "Closing applications (%1/%2)..."
msgstr ""
-#: shutdown.cpp:843 shutdown.cpp:917
+#: shutdown.cpp:838 shutdown.cpp:912
msgid "Closing applications (%1/%2, %3)..."
msgstr ""
-#: shutdown.cpp:925
+#: shutdown.cpp:920
msgid "Terminating services..."
msgstr ""
@@ -145,128 +145,140 @@ msgstr "结束“%1”的会话"
msgid "Log out"
msgstr ""
-#: shutdowndlg.cpp:761 shutdowndlg.cpp:790
-msgid ""
-"<qt><p>Log out of the current session to login as a different user.</p></qt>"
-msgstr ""
+#: shutdowndlg.cpp:790
+msgid "&End Current Session"
+msgstr "结束当前会话(&E)"
-#: shutdowndlg.cpp:789
-msgid "&Log out"
+#: shutdowndlg.cpp:791
+msgid ""
+"<qt><h3>End Current Session</h3><p>Log out of the current session to login "
+"with a different user</p></qt>"
msgstr ""
-#: shutdowndlg.cpp:899 shutdowndlg.cpp:1086
+#: shutdowndlg.cpp:889
msgid "&Freeze"
msgstr ""
-#: shutdowndlg.cpp:901 shutdowndlg.cpp:1087
-msgid ""
-"<qt><p>Put the computer in software idle mode, allowing for some "
-"powersaving. The system can be reactivated in a really short time, almost "
-"instantly.</p><p>This correspond to ACPI S0 mode.</p></qt>"
+#: shutdowndlg.cpp:901
+msgid "&Suspend"
msgstr ""
-#: shutdowndlg.cpp:914 shutdowndlg.cpp:1097
-msgid "&Suspend"
+#: shutdowndlg.cpp:913
+msgid "&Hibernate"
msgstr ""
-#: shutdowndlg.cpp:916 shutdowndlg.cpp:1098
+#: shutdowndlg.cpp:931
+#, fuzzy
+msgid "&Restart"
+msgstr "重启计算机(&R)"
+
+#: shutdowndlg.cpp:955 shutdowndlg.cpp:1031
msgid ""
-"<qt><p>Put the computer in suspend-to-memory mode. The system is stopped and "
-"its state saved to memory.</p><p> This allows more powersaving than 'Freeze' "
-"but requires longer time to reactivate the system.</p><p>This correspond to "
-"ACPI S3 mode.</p><p>Also known as Suspend-to-RAM mode.</p></qt>"
-msgstr ""
+"_: current option in boot loader\n"
+" (current)"
+msgstr " (当前)"
-#: shutdowndlg.cpp:930 shutdowndlg.cpp:1109
-msgid "&Hibernate"
-msgstr ""
+#: shutdowndlg.cpp:971
+#, fuzzy
+msgid "&Turn Off"
+msgstr "关闭计算机(&T)"
+
+#: shutdowndlg.cpp:996
+msgid "&Turn Off Computer"
+msgstr "关闭计算机(&T)"
-#: shutdowndlg.cpp:932 shutdowndlg.cpp:1110
+#: shutdowndlg.cpp:997
msgid ""
-"<qt><p>Put the computer in suspend-to-disk mode. The system is stopped and "
-"its state saved to disk.</p><p>This offers the greatest powersaving but "
-"considerable time is required to reactivate the system again.</p><p>This "
-"correspond to ACPI S4 mode.</p><p>Also known as Suspend-to-Disk mode.</p></"
-"qt>"
+"<qt><h3>Turn Off Computer</h3><p>Log out of the current session and turn off "
+"the computer</p></qt>"
msgstr ""
-#: shutdowndlg.cpp:945 shutdowndlg.cpp:1120
-msgid "H&ybrid Suspend"
-msgstr ""
+#: shutdowndlg.cpp:1008
+msgid "&Restart Computer"
+msgstr "重启计算机(&R)"
-#: shutdowndlg.cpp:947 shutdowndlg.cpp:1121
+#: shutdowndlg.cpp:1009
msgid ""
-"<qt><p>Put the computer in both suspend-to-memory and suspend-to-disk mode. "
-"The system is stopped and its state saved to memory and to disk.</p><p>This "
-"offers the best of both 'Suspend' and 'Hibernate' modes combined together. "
-"The system is de facto in 'Suspend' mode but if power is lost, work can "
-"still be resumed as if the system had been hibernated, preventing any data "
-"loss.</p><p>This correspond to ACPI S3+S4 mode.</p><p>Also known as Suspend-"
-"to-RAM + Suspend-to-Disk mode.</p></qt>"
+"<qt><h3>Restart Computer</h3><p>Log out of the current session and restart "
+"the computer</p><p>Hold the mouse button or the space bar for a short while "
+"to get a list of options what to boot</p></qt>"
msgstr ""
-#: shutdowndlg.cpp:969 shutdowndlg.cpp:1049
+#: shutdowndlg.cpp:1045
#, fuzzy
-msgid "&Restart"
+msgid "&Freeze Computer"
msgstr "重启计算机(&R)"
-#: shutdowndlg.cpp:971 shutdowndlg.cpp:1050
+#: shutdowndlg.cpp:1046
msgid ""
-"<qt><p>Log out of the current session and restart the computer.</p></qt>"
+"<qt><h3>Freeze Computer</h3><p>Put the computer in software sleep mode, "
+"allowing for some powersaving. The system can be reactivated in a really "
+"short time, almost instantly.</p></qt>"
msgstr ""
-#: shutdowndlg.cpp:994 shutdowndlg.cpp:1072
-msgid ""
-"_: current option in boot loader\n"
-" (current)"
-msgstr " (当前)"
+#: shutdowndlg.cpp:1054
+#, fuzzy
+msgid "&Suspend Computer"
+msgstr "关闭计算机(&T)"
-#: shutdowndlg.cpp:1010 shutdowndlg.cpp:1037
-msgid "&Shutdown"
+#: shutdowndlg.cpp:1055
+msgid ""
+"<qt><h3>Suspend Computer</h3><p>Put the computer in a suspend-to-memory "
+"mode. The system is stopped and its state saved to memory.</p><p> This "
+"allows more powersaving than 'Freeze Computer' but requires longer time to "
+"reactivate the system.</p></qt>"
msgstr ""
-#: shutdowndlg.cpp:1012 shutdowndlg.cpp:1038
+#: shutdowndlg.cpp:1063
+#, fuzzy
+msgid "&Hibernate Computer"
+msgstr "重启计算机(&R)"
+
+#: shutdowndlg.cpp:1064
msgid ""
-"<qt><p>Log out of the current session and turn off the computer.</p></qt>"
+"<qt><h3>Hibernate Computer</h3><p>Put the computer in a suspend-to-disk "
+"mode. The system is stopped and its state saved to disk.</p><p>This offers "
+"the greatest powersaving but considerable time is required to reactivate the "
+"system again.</p></qt>"
msgstr ""
-#: shutdowndlg.cpp:1367
+#: shutdowndlg.cpp:1290
msgid "Skip Notification"
msgstr ""
-#: shutdowndlg.cpp:1368
+#: shutdowndlg.cpp:1291
msgid "Abort Logout"
msgstr ""
-#: shutdowndlg.cpp:1423
+#: shutdowndlg.cpp:1346
msgid "Would you like to turn off your computer?"
msgstr ""
-#: shutdowndlg.cpp:1424
+#: shutdowndlg.cpp:1347
msgid ""
"This computer will turn off automatically\n"
"after %1 seconds."
msgstr ""
-#: shutdowndlg.cpp:1430
+#: shutdowndlg.cpp:1353
msgid "Would you like to reboot your computer?"
msgstr ""
-#: shutdowndlg.cpp:1432
+#: shutdowndlg.cpp:1355
msgid "Would you like to reboot to \"%1\"?"
msgstr ""
-#: shutdowndlg.cpp:1433
+#: shutdowndlg.cpp:1356
msgid ""
"This computer will reboot automatically\n"
"after %1 seconds."
msgstr ""
-#: shutdowndlg.cpp:1437
+#: shutdowndlg.cpp:1360
msgid "Would you like to end your current session?"
msgstr ""
-#: shutdowndlg.cpp:1438
+#: shutdowndlg.cpp:1361
msgid ""
"This session will end\n"
"after %1 seconds automatically."
@@ -297,28 +309,3 @@ msgstr ""
#, no-c-format
msgid "Confirm"
msgstr ""
-
-#~ msgid "&End Current Session"
-#~ msgstr "结束当前会话(&E)"
-
-#, fuzzy
-#~ msgid "&Turn Off"
-#~ msgstr "关闭计算机(&T)"
-
-#~ msgid "&Turn Off Computer"
-#~ msgstr "关闭计算机(&T)"
-
-#~ msgid "&Restart Computer"
-#~ msgstr "重启计算机(&R)"
-
-#, fuzzy
-#~ msgid "&Freeze Computer"
-#~ msgstr "重启计算机(&R)"
-
-#, fuzzy
-#~ msgid "&Suspend Computer"
-#~ msgstr "关闭计算机(&T)"
-
-#, fuzzy
-#~ msgid "&Hibernate Computer"
-#~ msgstr "重启计算机(&R)"
diff --git a/tde-i18n-zh_CN/messages/tdebase/libdmctl.po b/tde-i18n-zh_CN/messages/tdebase/libdmctl.po
index cf47d4f9191..3deb779dc52 100644
--- a/tde-i18n-zh_CN/messages/tdebase/libdmctl.po
+++ b/tde-i18n-zh_CN/messages/tdebase/libdmctl.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: libdmctrl\n"
-"POT-Creation-Date: 2018-12-06 17:06+0100\n"
+"POT-Creation-Date: 2019-01-23 23:17+0100\n"
"PO-Revision-Date: 2005-05-14 05:46+0800\n"
"Last-Translator: Funda Wang <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -25,34 +25,34 @@ msgid ""
"Your emails"
msgstr ""
-#: dmctl.cpp:401
+#: dmctl.cpp:353
msgid ""
"_: user: ...\n"
"%1: TTY login"
msgstr "%1:TTY 登录"
-#: dmctl.cpp:407
+#: dmctl.cpp:359
msgid "Unused"
msgstr "未使用"
-#: dmctl.cpp:409
+#: dmctl.cpp:361
msgid "X login on remote host"
msgstr "远程主机上的 X 登录"
-#: dmctl.cpp:410
+#: dmctl.cpp:362
#, c-format
msgid ""
"_: ... host\n"
"X login on %1"
msgstr "%1 上的 X 登录"
-#: dmctl.cpp:413
+#: dmctl.cpp:365
msgid ""
"_: user: session type\n"
"%1: %2"
msgstr "%1:%2"
-#: dmctl.cpp:428
+#: dmctl.cpp:380
msgid ""
"_: session (location)\n"
"%1 (%2)"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po
index 537bbb2e9b0..2b5f4627d3b 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: tdeio_media\n"
-"POT-Creation-Date: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-01-23 23:16+0100\n"
"PO-Revision-Date: 2005-08-09 13:07+0800\n"
"Last-Translator: Funda Wang <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -77,8 +77,8 @@ msgstr ""
#: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
#: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
#: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1349
-#: mediamanager/tdehardwarebackend.cpp:1360
+#: mediamanager/tdehardwarebackend.cpp:1340
+#: mediamanager/tdehardwarebackend.cpp:1351
#, c-format
msgid "No such medium: %1"
msgstr "没有此类媒体: %1"
@@ -115,12 +115,12 @@ msgstr "远程共享"
msgid "Hard Disk"
msgstr "硬盘"
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:805
+#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:796
#, fuzzy
msgid "Unknown Drive"
msgstr "未知"
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:835
+#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:826
#, fuzzy
msgid "Floppy Drive"
msgstr "软盘"
@@ -130,7 +130,7 @@ msgstr "软盘"
msgid "Zip Drive"
msgstr "Zip 磁盘"
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:892
+#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:883
msgid "Camera"
msgstr "相机"
@@ -175,23 +175,23 @@ msgstr ""
"此外,还检测到了仍然在使用设备的程序,程序清单列在下面。您需要关闭这些程序,"
"或者更改其工作目录,然后再尝试卸载设备。"
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1588
+#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1579
msgid ""
"Programs that were still using the device have been forcibly terminated. "
"They are listed below."
msgstr ""
#: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1406
-#: mediamanager/tdehardwarebackend.cpp:1424
-#: mediamanager/tdehardwarebackend.cpp:1464
+#: mediamanager/tdehardwarebackend.cpp:1397
+#: mediamanager/tdehardwarebackend.cpp:1415
+#: mediamanager/tdehardwarebackend.cpp:1455
msgid ""
"Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
"mounted at <b>%4</b> could not be unmounted. "
msgstr ""
"设备 <b>%1</b> (%2) 名为<b>“%3”</b>,目前正挂载于 <b>%4</b>,现在无法卸载。"
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1470
+#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1461
msgid "The following error was returned by umount command:"
msgstr "umount 命令返回了下列错误:"
@@ -200,7 +200,7 @@ msgstr "umount 命令返回了下列错误:"
msgid "Permission denied"
msgstr "拒绝许可权限"
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1232
+#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1223
msgid "Cannot mount encrypted drives!"
msgstr ""
@@ -245,142 +245,142 @@ msgstr "功能仅对于 HAL 可用"
msgid "Feature only available with HAL or TDE hardware backend"
msgstr "功能仅对于 HAL 可用"
-#: mediamanager/tdehardwarebackend.cpp:480
-#: mediamanager/tdehardwarebackend.cpp:517
-#: mediamanager/tdehardwarebackend.cpp:750
+#: mediamanager/tdehardwarebackend.cpp:471
+#: mediamanager/tdehardwarebackend.cpp:508
+#: mediamanager/tdehardwarebackend.cpp:741
#, fuzzy
msgid "%1 Removable Device"
msgstr "可移动设备"
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:516
#, fuzzy
msgid "Blank CD-ROM"
msgstr "CD-ROM"
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:525
msgid "Blank CD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:534
msgid "Blank CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:543
msgid "Blank Magneto-Optical CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:552
msgid "Blank Mount Ranier CD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:561
msgid "Blank Mount Ranier CD-RW-W"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:570
msgid "Blank DVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:579
msgid "Blank DVD-RAM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:588
msgid "Blank DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:597
msgid "Blank DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:606
msgid "Blank Dual Layer DVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:615
msgid "Blank Dual Layer DVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:624
msgid "Blank DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:633
msgid "Blank DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:642
msgid "Blank Dual Layer DVD+R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:651
msgid "Blank Dual Layer DVD+RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:660
msgid "Blank BD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:669
msgid "Blank BD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:678
msgid "Blank BD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:687
msgid "Blank HDDVD-ROM"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:696
msgid "Blank HDDVD-R"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:714
+#: mediamanager/tdehardwarebackend.cpp:705
msgid "Blank HDDVD-RW"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:721
+#: mediamanager/tdehardwarebackend.cpp:712
msgid "Audio CD"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:742
+#: mediamanager/tdehardwarebackend.cpp:733
msgid "%1 Fixed Disk (%2)"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:849
+#: mediamanager/tdehardwarebackend.cpp:840
#, fuzzy
msgid "%1 Zip Disk"
msgstr "Zip 磁盘"
-#: mediamanager/tdehardwarebackend.cpp:1212
-#: mediamanager/tdehardwarebackend.cpp:1392
+#: mediamanager/tdehardwarebackend.cpp:1203
+#: mediamanager/tdehardwarebackend.cpp:1383
#, fuzzy
msgid "Internal error"
msgstr "内部错误"
-#: mediamanager/tdehardwarebackend.cpp:1239
+#: mediamanager/tdehardwarebackend.cpp:1230
msgid ""
"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
"device and/or user privilege level<br>Corrupt data on storage device"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1241
-#: mediamanager/tdehardwarebackend.cpp:1316
-#: mediamanager/tdehardwarebackend.cpp:1408
-#: mediamanager/tdehardwarebackend.cpp:1426
+#: mediamanager/tdehardwarebackend.cpp:1232
+#: mediamanager/tdehardwarebackend.cpp:1307
+#: mediamanager/tdehardwarebackend.cpp:1399
+#: mediamanager/tdehardwarebackend.cpp:1417
msgid "<p>Technical details:<br>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1314
+#: mediamanager/tdehardwarebackend.cpp:1305
msgid ""
"<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
"device and/or user privilege level<br>Corrupt data on storage "
"device<br>Incorrect encryption password"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1420
+#: mediamanager/tdehardwarebackend.cpp:1411
msgid ""
"<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
"%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -388,7 +388,7 @@ msgid ""
"lost</i>"
msgstr ""
-#: mediamanager/tdehardwarebackend.cpp:1547
+#: mediamanager/tdehardwarebackend.cpp:1538
#, fuzzy
msgid ""
"Programs still using the device have been detected. They are listed below. "
@@ -562,18 +562,6 @@ msgid ""
"Autostart or an Autoopen file."
msgstr ""
-#: libmediacommon/mediamanagersettings.kcfg:28
-#, fuzzy, no-c-format
-msgid "Enable notification popups"
-msgstr "通知(&N)"
-
-#: libmediacommon/mediamanagersettings.kcfg:29
-#, no-c-format
-msgid ""
-"Deselect this if you do not want action request popups to be generated when "
-"devices are plugged in."
-msgstr ""
-
#: mediamanager/decryptdialog.ui:24 mounthelper/decryptdialog.ui:24
#, no-c-format
msgid "Decrypting Storage Device"
@@ -839,6 +827,10 @@ msgstr "混合"
msgid "Filesystem: iso9660"
msgstr "文件系统:iso9660"
+#, fuzzy
+#~ msgid "Enable notification popups"
+#~ msgstr "通知(&N)"
+
#~ msgid ""
#~ "\n"
#~ "Please check that the disk is entered correctly."
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_trash.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_trash.po
index b4fdc19f2c5..cd7599fb83e 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_trash.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_trash.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: tdeio_trash\n"
-"POT-Creation-Date: 2018-12-07 02:48+0100\n"
+"POT-Creation-Date: 2019-01-23 23:16+0100\n"
"PO-Revision-Date: 2005-01-03 10:16+0800\n"
"Last-Translator: Funda Wang <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -51,75 +51,15 @@ msgstr ""
"注意:要将文件移动到回收站,不应使用 ktrash,而应使用“kfmclient move url "
"trash:/”"
-#: ktrashpropsdlgplugin.cpp:74
-msgid "Size Limits"
-msgstr ""
-
-#: ktrashpropsdlgplugin.cpp:164
-msgid "Delete files older than:"
-msgstr ""
-
-#: ktrashpropsdlgplugin.cpp:171
-msgid "Limit to maximum size"
-msgstr ""
-
-#: ktrashpropsdlgplugin.cpp:180
-msgid "&Percentage:"
-msgstr ""
-
-#: ktrashpropsdlgplugin.cpp:181
-msgid "&Fixed size:"
-msgstr ""
-
-#: ktrashpropsdlgplugin.cpp:195 ktrashpropsdlgplugin.cpp:246
-msgid "Bytes"
-msgstr ""
-
-#: ktrashpropsdlgplugin.cpp:196 ktrashpropsdlgplugin.cpp:248
-msgid "KBytes"
-msgstr ""
-
-#: ktrashpropsdlgplugin.cpp:197 ktrashpropsdlgplugin.cpp:252
-msgid "MBytes"
-msgstr ""
-
-#: ktrashpropsdlgplugin.cpp:198 ktrashpropsdlgplugin.cpp:256
-msgid "GBytes"
-msgstr ""
-
-#: ktrashpropsdlgplugin.cpp:199 ktrashpropsdlgplugin.cpp:260
-msgid "TBytes"
-msgstr ""
-
-#: ktrashpropsdlgplugin.cpp:203
-msgid "When limit reached:"
-msgstr ""
-
-#: ktrashpropsdlgplugin.cpp:207
-msgid "Warn me"
-msgstr ""
-
-#: ktrashpropsdlgplugin.cpp:208
-msgid "Delete oldest files from trash"
-msgstr ""
-
-#: ktrashpropsdlgplugin.cpp:209
-msgid "Delete biggest files from trash"
-msgstr ""
-
-#: ktrashpropsdlgplugin.cpp:264
-msgid "(%1 %2)"
-msgstr ""
-
#: tdefile-plugin/tdefile_trash.cpp:52
msgid "General"
msgstr "常规"
-#: tdefile-plugin/tdefile_trash.cpp:54
+#: tdefile-plugin/tdefile_trash.cpp:55
msgid "Original Path"
msgstr "原始路径"
-#: tdefile-plugin/tdefile_trash.cpp:55
+#: tdefile-plugin/tdefile_trash.cpp:56
msgid "Date of Deletion"
msgstr "删除日期"
@@ -151,11 +91,5 @@ msgstr ""
msgid "This file is already in the trash bin."
msgstr "此文件已经在回收站中了。"
-#: trashimpl.cpp:1024
-msgid ""
-"The trash has reached its maximum size!\n"
-"Clean the trash manually."
-msgstr ""
-
#~ msgid "Helper program to handle the TDE trash can"
#~ msgstr "处理 TDE 回收站的助手程序"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdepasswd.po b/tde-i18n-zh_CN/messages/tdebase/tdepasswd.po
index a2af825fba0..81a25e2f6d4 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdepasswd.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdepasswd.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: tdepasswd\n"
-"POT-Creation-Date: 2018-12-07 02:48+0100\n"
+"POT-Creation-Date: 2019-01-23 23:17+0100\n"
"PO-Revision-Date: 2004-05-03 13:24+0800\n"
"Last-Translator: Funda Wang <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -30,7 +30,7 @@ msgstr "更改密码"
msgid "Please enter your current password:"
msgstr "请输入您当前的密码:"
-#: passwddlg.cpp:41 passwddlg.cpp:160
+#: passwddlg.cpp:41 passwddlg.cpp:159
msgid "Conversation with 'passwd' failed."
msgstr "与“passwd”对话失败。"
@@ -54,7 +54,7 @@ msgstr "请输入您的新密码:"
msgid "Please enter the new password for user <b>%1</b>:"
msgstr "请输入用户 <b>%1</b> 的新密码:"
-#: passwddlg.cpp:109
+#: passwddlg.cpp:108
msgid ""
"Your password is longer than 8 characters. On some systems, this can cause "
"problems. You can truncate the password to 8 characters, or leave it as it "
@@ -63,7 +63,7 @@ msgstr ""
"您的密码比 8 个字符长。在某些系统上,这样可能出现问题。您可以选择将密码截断为"
"前八个字符,或者保留原样。"
-#: passwddlg.cpp:112
+#: passwddlg.cpp:111
msgid ""
"The password is longer than 8 characters. On some systems, this can cause "
"problems. You can truncate the password to 8 characters, or leave it as it "
@@ -72,23 +72,23 @@ msgstr ""
"密码比 8 个字符长。在某些系统上,这样可能出现问题。您可以选择将密码截断为前八"
"个字符,或者保留原样。"
-#: passwddlg.cpp:116
+#: passwddlg.cpp:115
msgid "Password Too Long"
msgstr "密码太长"
-#: passwddlg.cpp:117
+#: passwddlg.cpp:116
msgid "Truncate"
msgstr "截断"
-#: passwddlg.cpp:118
+#: passwddlg.cpp:117
msgid "Use as Is"
msgstr "原样"
-#: passwddlg.cpp:139
+#: passwddlg.cpp:138
msgid "Your password has been changed."
msgstr "您的密码已更改。"
-#: passwddlg.cpp:149
+#: passwddlg.cpp:148
msgid "Your password has not been changed."
msgstr "您的密码未更改。"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdmgreet.po b/tde-i18n-zh_CN/messages/tdebase/tdmgreet.po
index e64a6b2fc24..718c9b9afc9 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdmgreet.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdmgreet.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: tdmgreet\n"
-"POT-Creation-Date: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-01-23 23:17+0100\n"
"PO-Revision-Date: 2005-05-01 02:06+0800\n"
"Last-Translator: Yan Shuangchun <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -63,7 +63,7 @@ msgstr "接受(&A)"
msgid "&Refresh"
msgstr "刷新(&R)"
-#: kchooser.cpp:95 kgreeter.cpp:1045
+#: kchooser.cpp:95 kgreeter.cpp:925
msgid "&Menu"
msgstr "菜单(&M)"
@@ -118,19 +118,19 @@ msgid ""
"%1 (%2)"
msgstr "%1 (%2)"
-#: kgreeter.cpp:625
+#: kgreeter.cpp:598
msgid "Custom"
msgstr "自定义"
-#: kgreeter.cpp:626
+#: kgreeter.cpp:599
msgid "Failsafe"
msgstr "安全模式"
-#: kgreeter.cpp:702
+#: kgreeter.cpp:674
msgid " (previous)"
msgstr " (前一个)"
-#: kgreeter.cpp:775
+#: kgreeter.cpp:747
msgid ""
"Your saved session type '%1' is not valid any more.\n"
"Please select a new one, otherwise 'default' will be used."
@@ -138,15 +138,11 @@ msgstr ""
"你保存的“%1”会话类型不再有效。\n"
"请选择一个新的类型,否则将使用“默认”。"
-#: kgreeter.cpp:931 kgreeter.cpp:1334
-msgid "PIN:"
-msgstr ""
-
-#: kgreeter.cpp:977
+#: kgreeter.cpp:857
msgid "Warning: this is an unsecured session"
msgstr "警告:这是不安全的会话"
-#: kgreeter.cpp:979
+#: kgreeter.cpp:859
msgid ""
"This display requires no X authorization.\n"
"This means that anybody can connect to it,\n"
@@ -156,31 +152,31 @@ msgstr ""
"这意味着任何人都可以连接、\n"
"在其中打开窗口或解释您的输入。"
-#: kgreeter.cpp:1042
+#: kgreeter.cpp:922
msgid "L&ogin"
msgstr "登录(&O)"
-#: kgreeter.cpp:1075 kgreeter.cpp:1222
+#: kgreeter.cpp:955 kgreeter.cpp:1098
msgid "Session &Type"
msgstr "会话类型(&T)"
-#: kgreeter.cpp:1080 kgreeter.cpp:1234
+#: kgreeter.cpp:960 kgreeter.cpp:1110
msgid "&Authentication Method"
msgstr "认证方式(&A)"
-#: kgreeter.cpp:1085 kgreeter.cpp:1239
+#: kgreeter.cpp:965 kgreeter.cpp:1115
msgid "&Remote Login"
msgstr "远程登录(&R)"
-#: kgreeter.cpp:1169
+#: kgreeter.cpp:1046
msgid "Login Failed."
msgstr "登录失败。"
-#: kgverify.cpp:187
+#: kgverify.cpp:177
msgid "No greeter widget plugin loaded. Check the configuration."
msgstr "没有载入欢迎部件插件。请检查配置。"
-#: kgverify.cpp:493
+#: kgverify.cpp:442
msgid ""
"Authenticating %1...\n"
"\n"
@@ -188,23 +184,23 @@ msgstr ""
"%1 认证中...\n"
"\n"
-#: kgverify.cpp:497
+#: kgverify.cpp:446
msgid "You are required to change your password immediately (password aged)."
msgstr "你被要求立即修改你的密码 (密码过期)。"
-#: kgverify.cpp:498
+#: kgverify.cpp:447
msgid "You are required to change your password immediately (root enforced)."
msgstr "你被要求立即修改你的密码(管理员强制执行)。"
-#: kgverify.cpp:499
+#: kgverify.cpp:448
msgid "You are not allowed to login at the moment."
msgstr "您不被允许在此时登录。"
-#: kgverify.cpp:500
+#: kgverify.cpp:449
msgid "Home folder not available."
msgstr "主文件夹不可用。"
-#: kgverify.cpp:501
+#: kgverify.cpp:450
msgid ""
"Logins are not allowed at the moment.\n"
"Try again later."
@@ -212,19 +208,19 @@ msgstr ""
"这个时间不允许登录。\n"
"稍后再试。"
-#: kgverify.cpp:502
+#: kgverify.cpp:451
msgid "Your login shell is not listed in /etc/shells."
msgstr "您的登录 shell 没有列在 /etc/shells 中。"
-#: kgverify.cpp:503
+#: kgverify.cpp:452
msgid "Root logins are not allowed."
msgstr "不允许 Root 登录。"
-#: kgverify.cpp:504
+#: kgverify.cpp:453
msgid "Your account has expired; please contact your system administrator."
msgstr "您的账户已过期;请联系您的系统管理员。"
-#: kgverify.cpp:514
+#: kgverify.cpp:463
msgid ""
"A critical error occurred.\n"
"Please look at TDM's logfile(s) for more information\n"
@@ -234,60 +230,60 @@ msgstr ""
"请查看 TDM 的日志文件获得更多信息\n"
"或联系系统管理员。"
-#: kgverify.cpp:540
+#: kgverify.cpp:489
#, c-format
msgid ""
"_n: Your account expires tomorrow.\n"
"Your account expires in %n days."
msgstr "您的账户将于 %n 天后过期。"
-#: kgverify.cpp:541
+#: kgverify.cpp:490
msgid "Your account expires today."
msgstr "您的账户今天过期。"
-#: kgverify.cpp:549
+#: kgverify.cpp:497
#, c-format
msgid ""
"_n: Your password expires tomorrow.\n"
"Your password expires in %n days."
msgstr "您的密码将于 %n 天后过期。"
-#: kgverify.cpp:550
+#: kgverify.cpp:498
msgid "Your password expires today."
msgstr "您的密码今天过期。"
-#: kgverify.cpp:617 kgverify.cpp:1155
+#: kgverify.cpp:565 kgverify.cpp:1012
msgid "Authentication failed"
msgstr "认证失败"
-#: kgverify.cpp:816
+#: kgverify.cpp:702
msgid "Authenticated user (%1) does not match requested user (%2).\n"
msgstr "已认证用户 %1 和要求的用户 (%2)不匹配。\n"
-#: kgverify.cpp:1138
+#: kgverify.cpp:995
#, c-format
msgid ""
"_n: Automatic login in 1 second...\n"
"Automatic login in %n seconds..."
msgstr "即将于 %n 秒内自动登录..."
-#: kgverify.cpp:1147
+#: kgverify.cpp:1004
msgid "Warning: Caps Lock on"
msgstr "警告:大写锁定"
-#: kgverify.cpp:1152
+#: kgverify.cpp:1009
msgid "Change failed"
msgstr "更改失败"
-#: kgverify.cpp:1154
+#: kgverify.cpp:1011
msgid "Login failed"
msgstr "登录失败"
-#: kgverify.cpp:1188
+#: kgverify.cpp:1045
msgid "Theme not usable with authentication method '%1'."
msgstr "使用身份验证方式“%1”时无法使用主题。"
-#: kgverify.cpp:1244
+#: kgverify.cpp:1100
msgid "Changing authentication token"
msgstr "更改认证标记"
@@ -303,15 +299,15 @@ msgstr "配置文件名称"
msgid "KRootImage"
msgstr "KRootImage"
-#: sakdlg.cc:129
+#: sakdlg.cc:124
msgid "Press Ctrl+Alt+Del to begin."
msgstr ""
-#: sakdlg.cc:129
+#: sakdlg.cc:124
msgid "This process helps keep your password secure."
msgstr ""
-#: sakdlg.cc:129
+#: sakdlg.cc:124
msgid "It prevents unauthorized users from emulating the login screen."
msgstr ""
diff --git a/tde-i18n-zh_CN/messages/tdebase/twin.po b/tde-i18n-zh_CN/messages/tdebase/twin.po
index 0ea99ac83c4..a921371e963 100644
--- a/tde-i18n-zh_CN/messages/tdebase/twin.po
+++ b/tde-i18n-zh_CN/messages/tdebase/twin.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-01-23 23:17+0100\n"
"PO-Revision-Date: 2005-08-21 17:21+0800\n"
"Last-Translator: Funda Wang <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -38,7 +38,7 @@ msgstr "窗口“%1”请求注意。"
msgid "Suspended"
msgstr ""
-#: killer/killer.cpp:49 main.cpp:318 resumer/resumer.cpp:48
+#: killer/killer.cpp:49 main.cpp:319 resumer/resumer.cpp:48
msgid "TWin"
msgstr ""
@@ -134,19 +134,19 @@ msgstr "默认的装饰插件损坏,无法被载入。"
msgid "The library %1 is not a TWin plugin."
msgstr "库 %1 不是 KWin 插件。"
-#: main.cpp:63
+#: main.cpp:64
#, fuzzy
msgid ""
"[twin] it looks like there's already a window manager running. twin not "
"started.\n"
msgstr "twin:看起来已经有一个窗口管理器在运行。twin 没有起动。\n"
-#: main.cpp:78
+#: main.cpp:79
#, fuzzy
msgid "[twin] failure during initialization; aborting"
msgstr "twin:在初始化时失败;中止"
-#: main.cpp:137 main.cpp:143 main.cpp:149
+#: main.cpp:138 main.cpp:144 main.cpp:150
#, fuzzy
msgid ""
"[twin] unable to claim manager selection, another wm running? (try using --"
@@ -155,28 +155,28 @@ msgstr ""
"twin:无法声明窗口管理器选择,是否正在运行另外一种窗口管理器?(试着使用 --"
"replace)\n"
-#: main.cpp:236
+#: main.cpp:237
msgid "TDE window manager"
msgstr "TDE 窗口管理器"
-#: main.cpp:240
+#: main.cpp:241
msgid "Disable configuration options"
msgstr "禁用配置选项"
-#: main.cpp:241
+#: main.cpp:242
msgid "Replace already-running ICCCM2.0-compliant window manager"
msgstr "替换已经运行的 ICCCM2.0 兼容的窗口管理器"
-#: main.cpp:242
+#: main.cpp:243
msgid "Do not start composition manager"
msgstr ""
-#: main.cpp:320
+#: main.cpp:321
#, fuzzy
msgid "(c) 1999-2005, The KDE Developers"
msgstr "(C) 1999-2005,TDE 开发者"
-#: main.cpp:324
+#: main.cpp:325
msgid "Maintainer"
msgstr "维护者"
@@ -213,7 +213,7 @@ msgstr ""
msgid "Keep Suspended"
msgstr ""
-#: tabbox.cpp:52
+#: tabbox.cpp:53
msgid "*** No Windows ***"
msgstr "*** 没有窗口 ***"
@@ -787,12 +787,12 @@ msgstr "到桌面(&D)"
msgid "&All Desktops"
msgstr "全部桌面(&A)"
-#: workspace.cpp:1201 workspace.cpp:1221
+#: workspace.cpp:1203 workspace.cpp:1223
#, c-format
msgid "Desktop %1"
msgstr "桌面 %1"
-#: workspace.cpp:2773
+#: workspace.cpp:2775
msgid ""
"You have selected to show a window without its border.\n"
"Without the border, you will not be able to enable the border again using "
@@ -803,7 +803,7 @@ msgstr ""
"没有边框的话,您就无法使用鼠标再次启用边框:请使用快捷键 %1 激活窗口的操作菜"
"单来完成这一任务。"
-#: workspace.cpp:2785
+#: workspace.cpp:2787
msgid ""
"You have selected to show a window in fullscreen mode.\n"
"If the application itself does not have an option to turn the fullscreen "
@@ -814,17 +814,17 @@ msgstr ""
"如果应用程序自身没有提供退出全屏模式的选项,您就无法使用鼠标退出全屏模式:请"
"使用快捷键 %1 激活窗口的操作菜单来完成这一任务。"
-#: workspace.cpp:2924
+#: workspace.cpp:2926
msgid ""
"The Composite Manager crashed twice within a minute and is therefore "
"disabled for this session."
msgstr "复合管理器在一分钟之内崩溃了两次,因此本次会话中该特性将被禁用。"
-#: workspace.cpp:2925 workspace.cpp:2948 workspace.cpp:2987
+#: workspace.cpp:2927 workspace.cpp:2950 workspace.cpp:2989
msgid "Composite Manager Failure"
msgstr "复合管理器失败"
-#: workspace.cpp:2966
+#: workspace.cpp:2968
#, fuzzy
msgid ""
"<qt><b>The TDE composition manager failed to open the display</b><br>There "
@@ -833,7 +833,7 @@ msgstr ""
"<qt><b>kompmgr 打开显示失败</b><br>可能在您的 ~/.xcompmgrrc 中有无效的显示"
"项。</qt>"
-#: workspace.cpp:2968
+#: workspace.cpp:2970
#, fuzzy
msgid ""
"<qt><b>The TDE composition manager cannot find the Xrender extension</"
@@ -843,7 +843,7 @@ msgstr ""
"<qt><b>kompmgr 找不到 Xrender 扩展</b><br>您可能正在使用 XOrg 的早期版本或缩"
"水版本。<br>请从 www.freedesktop.org 获取 XOrg &ge; 6.8。<br></qt>"
-#: workspace.cpp:2970
+#: workspace.cpp:2972
msgid ""
"<qt><b>Composite extension not found</b><br>You <i>must</i> use XOrg &ge; "
"6.8 for translucency and shadows to work.<br>Additionally, you need to add a "
@@ -854,7 +854,7 @@ msgstr ""
"影。<br>此外,您必须在您的 X 配置文件中添加新的一节:<br><i>Section "
"\"Extensions\"<br>Option \"Composite\" \"Enable\"<br>EndSection</i></qt>"
-#: workspace.cpp:2975
+#: workspace.cpp:2977
msgid ""
"<qt><b>Damage extension not found</b><br>You <i>must</i> use XOrg &ge; 6.8 "
"for translucency and shadows to work.</qt>"
@@ -862,7 +862,7 @@ msgstr ""
"<qt><b>损坏扩展未找到</b><br>您<i>必须</i>使用 XOrg &ge; 6.8 获得透明效果及阴"
"影。</qt>"
-#: workspace.cpp:2977
+#: workspace.cpp:2979
msgid ""
"<qt><b>XFixes extension not found</b><br>You <i>must</i> use XOrg &ge; 6.8 "
"for translucency and shadows to work.</qt>"
diff --git a/tde-i18n-zh_CN/messages/tdegames/kbackgammon.po b/tde-i18n-zh_CN/messages/tdegames/kbackgammon.po
index e0ba37c29c2..409f8cb997a 100644
--- a/tde-i18n-zh_CN/messages/tdegames/kbackgammon.po
+++ b/tde-i18n-zh_CN/messages/tdegames/kbackgammon.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: kbackgammon\n"
-"POT-Creation-Date: 2019-01-13 18:59+0100\n"
+"POT-Creation-Date: 2019-01-23 23:28+0100\n"
"PO-Revision-Date: 2004-01-17 07:21+0800\n"
"Last-Translator: Zong Yaotang <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -349,45 +349,45 @@ msgstr ""
"输入在服务器 %2 上用户名 %1 的口令。\n"
"\n"
-#: engines/fibs/kbgfibs.cpp:1127
+#: engines/fibs/kbgfibs.cpp:1129
msgid "The password may not contain colons or spaces!"
msgstr "口令不能含有冒号或空格!"
-#: engines/fibs/kbgfibs.cpp:1401
+#: engines/fibs/kbgfibs.cpp:1403
msgid ""
"There was a problem with your login and password. You can reenter\n"
"your login and password and try to reconnect."
msgstr "您的用户名和口令有问题。您可以重新输入用户名和口令,再尝试进行连接。"
-#: engines/fibs/kbgfibs.cpp:1406
+#: engines/fibs/kbgfibs.cpp:1408
msgid "Wrong Login/Password"
msgstr "用户名或口令错"
-#: engines/fibs/kbgfibs.cpp:1407
+#: engines/fibs/kbgfibs.cpp:1409
msgid "Reconnect"
msgstr "重新连接"
-#: engines/fibs/kbgfibs.cpp:1436
+#: engines/fibs/kbgfibs.cpp:1438
msgid "%1, last logged in from %2 at %3."
msgstr "%1,上次在 %3 从 %2 登录。"
-#: engines/fibs/kbgfibs.cpp:1507
+#: engines/fibs/kbgfibs.cpp:1509
msgid "The moreboards toggle has been set."
msgstr "多棋盘选项已设置。"
-#: engines/fibs/kbgfibs.cpp:1514
+#: engines/fibs/kbgfibs.cpp:1516
msgid "The notify toggle has been set."
msgstr "通知选项已设置。"
-#: engines/fibs/kbgfibs.cpp:1521
+#: engines/fibs/kbgfibs.cpp:1523
msgid "The report toggle has been set."
msgstr "报告选项已设置。"
-#: engines/fibs/kbgfibs.cpp:1569
+#: engines/fibs/kbgfibs.cpp:1571
msgid "The selected login is alreay in use! Please select another one."
msgstr "所选的用户名已被使用!请选择其它的。"
-#: engines/fibs/kbgfibs.cpp:1577
+#: engines/fibs/kbgfibs.cpp:1579
msgid ""
"\n"
"\n"
@@ -397,7 +397,7 @@ msgstr ""
"\n"
"用户名不能含有空格或冒号!"
-#: engines/fibs/kbgfibs.cpp:1609
+#: engines/fibs/kbgfibs.cpp:1611
msgid ""
"Your account has been created. Your new login is <u>%1</u>. To fully "
"activate this account, I will now close the connection. Once you reconnect, "
@@ -406,47 +406,47 @@ msgstr ""
"您的帐号已创建。您的新用户名是 <u>%1</u>。为完全激活这个帐号,我们现在将断开"
"连接。一旦您重新连接上,就可以在 FIBS 开始西洋双陆棋游戏了。"
-#: engines/fibs/kbgfibs.cpp:1737
+#: engines/fibs/kbgfibs.cpp:1739
msgid "%1 (%2) vs. %3 (%4) - game over"
msgstr "%1 (%2) 对 %3 (%4) - 游戏结束"
-#: engines/fibs/kbgfibs.cpp:1740
+#: engines/fibs/kbgfibs.cpp:1742
msgid "%1 (%2) vs. %3 (%4) - unlimited match"
msgstr "%1 (%2) 对 %3 (%4) - 无上限的棋局"
-#: engines/fibs/kbgfibs.cpp:1743
+#: engines/fibs/kbgfibs.cpp:1745
msgid "%1 (%2) vs. %3 (%4) - %5 point match"
msgstr "%1 (%2) 对 %3 (%4) - %5 点上限的棋局"
-#: engines/fibs/kbgfibs.cpp:1769
+#: engines/fibs/kbgfibs.cpp:1771
msgid "Please make your move"
msgstr "请你开始移动"
-#: engines/fibs/kbgfibs.cpp:1782
+#: engines/fibs/kbgfibs.cpp:1784
msgid "(or use the corresponding menu entry to join the match)"
msgstr "(或使用相应菜单项加入棋局)"
-#: engines/fibs/kbgfibs.cpp:1836
+#: engines/fibs/kbgfibs.cpp:1838
msgid "It's your turn to roll the dice or double the cube"
msgstr "轮到你掷骰子或加倍"
-#: engines/fibs/kbgfibs.cpp:1897
+#: engines/fibs/kbgfibs.cpp:1899
msgid "(or use the corresponding menu entry to leave or continue the match)"
msgstr "(或使用相应菜单项离开或继续棋局)"
-#: engines/fibs/kbgfibs.cpp:1993
+#: engines/fibs/kbgfibs.cpp:1995
msgid "(or use the corresponding menu entry to accept or reject the offer)"
msgstr "(或使用相应菜单项接受或拒绝提议)"
-#: engines/fibs/kbgfibs.cpp:2014
+#: engines/fibs/kbgfibs.cpp:2016
msgid "Sorry, you lost the game."
msgstr "抱歉,你输了这局游戏。"
-#: engines/fibs/kbgfibs.cpp:2022
+#: engines/fibs/kbgfibs.cpp:2024
msgid "Congratulations, you won the game!"
msgstr "恭喜,你赢了这局游戏!"
-#: engines/fibs/kbgfibs.cpp:2060
+#: engines/fibs/kbgfibs.cpp:2062
msgid ""
"You should never set the 'boardstyle' variable by hand! It is vital for "
"proper functioning of this program that it remains set to 3. It has been "
@@ -455,79 +455,79 @@ msgstr ""
"您绝不要手工设置‘boardstyle’游戏!它必须保持为 3,这关系到本程序的正常运作。"
"它已被重置。"
-#: engines/fibs/kbgfibs.cpp:2160
+#: engines/fibs/kbgfibs.cpp:2162
msgid "&Connect"
msgstr "连接(&C)"
-#: engines/fibs/kbgfibs.cpp:2161
+#: engines/fibs/kbgfibs.cpp:2163
msgid "New Account"
msgstr "新建帐号"
-#: engines/fibs/kbgfibs.cpp:2162
+#: engines/fibs/kbgfibs.cpp:2164
msgid "&Disconnect"
msgstr "断开(&D)"
-#: engines/fibs/kbgfibs.cpp:2170
+#: engines/fibs/kbgfibs.cpp:2172
msgid "&Invite..."
msgstr "邀请(&I)..."
-#: engines/fibs/kbgfibs.cpp:2176
+#: engines/fibs/kbgfibs.cpp:2178
msgid "&Commands"
msgstr "命令(&C)"
-#: engines/fibs/kbgfibs.cpp:2178
+#: engines/fibs/kbgfibs.cpp:2180
msgid "Away"
msgstr "离开"
-#: engines/fibs/kbgfibs.cpp:2195
+#: engines/fibs/kbgfibs.cpp:2197
msgid "Ready to Play"
msgstr "准备就绪"
-#: engines/fibs/kbgfibs.cpp:2197
+#: engines/fibs/kbgfibs.cpp:2199
msgid "Show Rating Computations"
msgstr "显示排名计算"
-#: engines/fibs/kbgfibs.cpp:2199
+#: engines/fibs/kbgfibs.cpp:2201
msgid "Hide Rating Computations"
msgstr "隐藏排名计算"
-#: engines/fibs/kbgfibs.cpp:2200
+#: engines/fibs/kbgfibs.cpp:2202
msgid "Greedy Bearoffs"
msgstr "贪心撤退方式"
-#: engines/fibs/kbgfibs.cpp:2202
+#: engines/fibs/kbgfibs.cpp:2204
msgid "Ask for Doubles"
msgstr "要求加倍"
-#: engines/fibs/kbgfibs.cpp:2215
+#: engines/fibs/kbgfibs.cpp:2217
msgid "&Response"
msgstr "响应(&R)"
-#: engines/fibs/kbgfibs.cpp:2217 engines/offline/kbgoffline.cpp:652
+#: engines/fibs/kbgfibs.cpp:2219 engines/offline/kbgoffline.cpp:652
msgid "Accept"
msgstr "接受"
-#: engines/fibs/kbgfibs.cpp:2218 engines/offline/kbgoffline.cpp:652
+#: engines/fibs/kbgfibs.cpp:2220 engines/offline/kbgoffline.cpp:652
msgid "Reject"
msgstr "拒绝"
-#: engines/fibs/kbgfibs.cpp:2225
+#: engines/fibs/kbgfibs.cpp:2227
msgid "Join"
msgstr "加入"
-#: engines/fibs/kbgfibs.cpp:2226
+#: engines/fibs/kbgfibs.cpp:2228
msgid "Leave"
msgstr "离开"
-#: engines/fibs/kbgfibs.cpp:2236
+#: engines/fibs/kbgfibs.cpp:2238
msgid "&Join"
msgstr "加入(&J)"
-#: engines/fibs/kbgfibs.cpp:2259
+#: engines/fibs/kbgfibs.cpp:2261
msgid "&Player List"
msgstr "玩家列表(&P)"
-#: engines/fibs/kbgfibs.cpp:2260
+#: engines/fibs/kbgfibs.cpp:2262
msgid "&Chat"
msgstr "聊天(&C)"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/kpovmodeler.po b/tde-i18n-zh_CN/messages/tdegraphics/kpovmodeler.po
index eaf91d6e624..237396bbe3e 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/kpovmodeler.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/kpovmodeler.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: kpovmodeler\n"
-"POT-Creation-Date: 2019-01-13 18:51+0100\n"
+"POT-Creation-Date: 2019-01-23 23:20+0100\n"
"PO-Revision-Date: 2004-07-13 09:07+0800\n"
"Last-Translator: Xiong Jiang <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -307,7 +307,7 @@ msgstr "使用索引"
msgid "Bump size:"
msgstr "凸起大小:"
-#: pmcamera.cpp:119 pmrendermanager.cpp:1540 pmrendermanager.cpp:1544
+#: pmcamera.cpp:119 pmrendermanager.cpp:1545 pmrendermanager.cpp:1549
msgid "camera"
msgstr "镜头"
@@ -1205,7 +1205,7 @@ msgid "No Cameras"
msgstr "无镜头"
#: pmglview.cpp:1559 pmmovecommand.cpp:448 pmobjectselect.cpp:75
-#: pmrendermanager.cpp:1538
+#: pmrendermanager.cpp:1543
msgid "(unnamed)"
msgstr "(未命名)"
@@ -3683,35 +3683,35 @@ msgstr "povray 源码"
msgid "Povray code:"
msgstr "Povray 源码:"
-#: pmrendermanager.cpp:1312
+#: pmrendermanager.cpp:1317
msgid "not supported"
msgstr "不支持"
-#: pmrendermanager.cpp:1315
+#: pmrendermanager.cpp:1320
msgid "approximated"
msgstr "近似支持"
-#: pmrendermanager.cpp:1512
+#: pmrendermanager.cpp:1517
msgid "left"
msgstr "左"
-#: pmrendermanager.cpp:1515
+#: pmrendermanager.cpp:1520
msgid "right"
msgstr "右"
-#: pmrendermanager.cpp:1518
+#: pmrendermanager.cpp:1523
msgid "bottom"
msgstr "底"
-#: pmrendermanager.cpp:1521
+#: pmrendermanager.cpp:1526
msgid "top"
msgstr "顶"
-#: pmrendermanager.cpp:1524
+#: pmrendermanager.cpp:1529
msgid "front"
msgstr "前"
-#: pmrendermanager.cpp:1527
+#: pmrendermanager.cpp:1532
msgid "back"
msgstr "后"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/katepart.po b/tde-i18n-zh_CN/messages/tdelibs/katepart.po
index b4506f35ef5..0bbeb6bc644 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/katepart.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/katepart.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: katepart\n"
-"POT-Creation-Date: 2019-01-13 18:46+0100\n"
+"POT-Creation-Date: 2019-01-23 23:15+0100\n"
"PO-Revision-Date: 2005-08-01 07:52+0800\n"
"Last-Translator: Funda Wang <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -599,13 +599,13 @@ msgstr "按创建时间(&R)"
msgid "Show indentation lines"
msgstr "显示缩进行"
-#: part/katedialogs.cpp:701 part/kateview.cpp:365
+#: part/katedialogs.cpp:701 part/kateview.cpp:360
msgid ""
"If this option is checked, the text lines will be wrapped at the view border "
"on the screen."
msgstr "如果选中此项,文本行将自动在屏幕视图边界处折到新的一行。"
-#: part/katedialogs.cpp:703 part/kateview.cpp:368
+#: part/katedialogs.cpp:703 part/kateview.cpp:363
msgid "Choose when the Dynamic Word Wrap Indicators should be displayed"
msgstr "选择何时显示动态自动换行标识符"
@@ -1203,7 +1203,7 @@ msgstr "您真的想要继续关闭此文件吗?数据可能丢失。"
msgid "Close Nevertheless"
msgstr "仍然关闭"
-#: part/katedocument.cpp:4331 part/katedocument.cpp:5073 part/kateview.cpp:868
+#: part/katedocument.cpp:4331 part/katedocument.cpp:5073 part/kateview.cpp:863
msgid "Save File"
msgstr "保存文件"
@@ -1231,16 +1231,16 @@ msgstr "文件“%1”已经被其它程序创建。"
msgid "The file '%1' was deleted by another program."
msgstr "文件“%1”已经被其它程序删除。"
-#: part/katedocument.cpp:5101 part/kateview.cpp:895
+#: part/katedocument.cpp:5101 part/kateview.cpp:890
msgid ""
"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
msgstr "已经存在同名的文件“%1”,您确信要覆盖它吗?"
-#: part/katedocument.cpp:5103 part/kateview.cpp:896
+#: part/katedocument.cpp:5103 part/kateview.cpp:891
msgid "Overwrite File?"
msgstr "覆盖文件吗?"
-#: part/katedocument.cpp:5104 part/kateview.cpp:897
+#: part/katedocument.cpp:5104 part/kateview.cpp:892
msgid "&Overwrite"
msgstr "覆盖(&O)"
@@ -2398,445 +2398,436 @@ msgstr ""
"将选中区中全部单词的第一个字母转换成大写。若没有选中文字的话,则转换光标右侧"
"的字符。"
-#: part/kateview.cpp:287 part/kateview.cpp:589
-msgid "Delete Line"
-msgstr "删除一行"
-
-#: part/kateview.cpp:289
-#, fuzzy
-msgid "Use this to delete the current line."
-msgstr "按此按钮可删除当前选中实体。"
-
-#: part/kateview.cpp:291
+#: part/kateview.cpp:287
msgid "Join Lines"
msgstr "连接行"
-#: part/kateview.cpp:293
-msgid "Use this to join lines together."
-msgstr ""
-
-#: part/kateview.cpp:304
+#: part/kateview.cpp:299
msgid "Print the current document."
msgstr "打印当前文档。"
-#: part/kateview.cpp:306
+#: part/kateview.cpp:301
msgid "Reloa&d"
msgstr "重新装入(&D)"
-#: part/kateview.cpp:307
+#: part/kateview.cpp:302
msgid "Reload the current document from disk."
msgstr "从磁盘中重新装入当前文档。"
-#: part/kateview.cpp:310
+#: part/kateview.cpp:305
msgid "Save the current document to disk, with a name of your choice."
msgstr "用您指定的名字将当前文档保存到磁盘。"
-#: part/kateview.cpp:313
+#: part/kateview.cpp:308
msgid ""
"This command opens a dialog and lets you choose a line that you want the "
"cursor to move to."
msgstr "此命令打开一个对话框,让您选择将光标移到哪一行。"
-#: part/kateview.cpp:315
+#: part/kateview.cpp:310
msgid "&Configure Editor..."
msgstr "配置编辑器(&C)..."
-#: part/kateview.cpp:316
+#: part/kateview.cpp:311
msgid "Configure various aspects of this editor."
msgstr "配置这个编辑器多方面的设置。"
-#: part/kateview.cpp:318
+#: part/kateview.cpp:313
msgid "&Highlighting"
msgstr "语法加亮(&H)"
-#: part/kateview.cpp:319
+#: part/kateview.cpp:314
msgid "Here you can choose how the current document should be highlighted."
msgstr "这里您可以选择如何加亮显示当前文档。"
-#: part/kateview.cpp:322
+#: part/kateview.cpp:317
msgid "&Filetype"
msgstr "文件类型(&F)"
-#: part/kateview.cpp:325
+#: part/kateview.cpp:320
msgid "&Schema"
msgstr "方案(&S)"
-#: part/kateview.cpp:329
+#: part/kateview.cpp:324
msgid "&Indentation"
msgstr "缩进(&I)"
-#: part/kateview.cpp:332
+#: part/kateview.cpp:327
msgid "E&xport as HTML..."
msgstr "导出为 HTML(&X)..."
-#: part/kateview.cpp:333
+#: part/kateview.cpp:328
msgid ""
"This command allows you to export the current document with all highlighting "
"information into a HTML document."
msgstr "此命令允许您将当前文档及其全部加亮信息导出到 HTML 文档。"
-#: part/kateview.cpp:337
+#: part/kateview.cpp:332
msgid "Select the entire text of the current document."
msgstr "选中当前文档的全部文本。"
-#: part/kateview.cpp:340
+#: part/kateview.cpp:335
msgid ""
"If you have selected something within the current document, this will no "
"longer be selected."
msgstr "如果您在当前文档中有一些选中的文字,这将使它们不再被选中。"
-#: part/kateview.cpp:342
+#: part/kateview.cpp:337
msgid "Enlarge Font"
msgstr "增大字体"
-#: part/kateview.cpp:343
+#: part/kateview.cpp:338
msgid "This increases the display font size."
msgstr "此命令增大显示字体的大小。"
-#: part/kateview.cpp:345
+#: part/kateview.cpp:340
msgid "Shrink Font"
msgstr "缩小字体"
-#: part/kateview.cpp:346
+#: part/kateview.cpp:341
msgid "This decreases the display font size."
msgstr "此命令减小显示字体的大小。"
-#: part/kateview.cpp:349
+#: part/kateview.cpp:344
msgid "Bl&ock Selection Mode"
msgstr "块选择方式(&O)"
-#: part/kateview.cpp:352
+#: part/kateview.cpp:347
msgid ""
"This command allows switching between the normal (line based) selection mode "
"and the block selection mode."
msgstr "此命令让您在普通的行选择方式和块选择方式之间切换。"
-#: part/kateview.cpp:355
+#: part/kateview.cpp:350
msgid "Overwr&ite Mode"
msgstr "覆盖模式(&I)"
-#: part/kateview.cpp:358
+#: part/kateview.cpp:353
msgid ""
"Choose whether you want the text you type to be inserted or to overwrite "
"existing text."
msgstr "让您选择新输入的文字是插入到文档还是覆盖已有的文字。"
-#: part/kateview.cpp:362
+#: part/kateview.cpp:357
msgid "&Dynamic Word Wrap"
msgstr "动态文字换行(&D)"
-#: part/kateview.cpp:367
+#: part/kateview.cpp:362
msgid "Dynamic Word Wrap Indicators"
msgstr "动态文字换行标识符"
-#: part/kateview.cpp:372
+#: part/kateview.cpp:367
msgid "&Off"
msgstr "关(&O)"
-#: part/kateview.cpp:373
+#: part/kateview.cpp:368
msgid "Follow &Line Numbers"
msgstr "按照行号(&L)"
-#: part/kateview.cpp:374
+#: part/kateview.cpp:369
msgid "&Always On"
msgstr "总是打开(&A)"
-#: part/kateview.cpp:378
+#: part/kateview.cpp:373
msgid "Show Folding &Markers"
msgstr "显示折叠标记(&M)"
-#: part/kateview.cpp:381
+#: part/kateview.cpp:376
msgid ""
"You can choose if the codefolding marks should be shown, if codefolding is "
"possible."
msgstr "如果能进行代码折叠,您可以选择是否显示代码折叠标记。"
-#: part/kateview.cpp:382
+#: part/kateview.cpp:377
msgid "Hide Folding &Markers"
msgstr "隐藏折叠标记(&M)"
-#: part/kateview.cpp:385
+#: part/kateview.cpp:380
msgid "Show &Icon Border"
msgstr "显示图标边框(&I)"
-#: part/kateview.cpp:389
+#: part/kateview.cpp:384
msgid ""
"Show/hide the icon border.<BR><BR> The icon border shows bookmark symbols, "
"for instance."
msgstr "显示/隐藏页面边上的图标边条。<BR><BR>图标边条上能显示书签符号等标记。"
-#: part/kateview.cpp:390
+#: part/kateview.cpp:385
msgid "Hide &Icon Border"
msgstr "隐藏图标边框(&I)"
-#: part/kateview.cpp:393
+#: part/kateview.cpp:388
msgid "Show &Line Numbers"
msgstr "显示行号(&L)"
-#: part/kateview.cpp:396
+#: part/kateview.cpp:391
msgid "Show/hide the line numbers on the left hand side of the view."
msgstr "在视图左边显示/隐藏行号。"
-#: part/kateview.cpp:397
+#: part/kateview.cpp:392
msgid "Hide &Line Numbers"
msgstr "隐藏行号(&L)"
-#: part/kateview.cpp:400
+#: part/kateview.cpp:395
msgid "Show Scroll&bar Marks"
msgstr "显示滚动条标记(&B)"
-#: part/kateview.cpp:403
+#: part/kateview.cpp:398
msgid ""
"Show/hide the marks on the vertical scrollbar.<BR><BR>The marks, for "
"instance, show bookmarks."
msgstr "显示/隐藏垂直滚动条上的标记。<BR><BR>这些标记可显示书签等符号。"
-#: part/kateview.cpp:404
+#: part/kateview.cpp:399
msgid "Hide Scroll&bar Marks"
msgstr "隐藏滚动条标记(&B)"
-#: part/kateview.cpp:407
+#: part/kateview.cpp:402
msgid "Show Static &Word Wrap Marker"
msgstr "显示静态自动换行标记(&W)"
-#: part/kateview.cpp:411
+#: part/kateview.cpp:406
msgid ""
"Show/hide the Word Wrap Marker, a vertical line drawn at the word wrap "
"column as defined in the editing properties"
msgstr ""
"显示/隐藏自动换行标记,它是在编辑属性中定义的自动换行列显示的一条竖线。"
-#: part/kateview.cpp:413
+#: part/kateview.cpp:408
msgid "Hide Static &Word Wrap Marker"
msgstr "隐藏静态自动换行标记(&W)"
-#: part/kateview.cpp:416
+#: part/kateview.cpp:411
msgid "Switch to Command Line"
msgstr "切换到命令行"
-#: part/kateview.cpp:419
+#: part/kateview.cpp:414
msgid "Show/hide the command line on the bottom of the view."
msgstr "在视图底部显示/隐藏命令行。"
-#: part/kateview.cpp:421
+#: part/kateview.cpp:416
msgid "&End of Line"
msgstr "行尾(&E)"
-#: part/kateview.cpp:422
+#: part/kateview.cpp:417
msgid "Choose which line endings should be used, when you save the document"
msgstr "选择当您保存文档时使用哪种行结束字符。"
-#: part/kateview.cpp:432
+#: part/kateview.cpp:427
msgid "E&ncoding"
msgstr "编码(&E)"
-#: part/kateview.cpp:449
+#: part/kateview.cpp:444
msgid "Move Word Left"
msgstr "整词左移"
-#: part/kateview.cpp:453
+#: part/kateview.cpp:448
msgid "Select Character Left"
msgstr "选择左边字符"
-#: part/kateview.cpp:457
+#: part/kateview.cpp:452
msgid "Select Word Left"
msgstr "选择左边整词"
-#: part/kateview.cpp:462
+#: part/kateview.cpp:457
msgid "Move Word Right"
msgstr "整词右移"
-#: part/kateview.cpp:466
+#: part/kateview.cpp:461
msgid "Select Character Right"
msgstr "选择右边字符"
-#: part/kateview.cpp:470
+#: part/kateview.cpp:465
msgid "Select Word Right"
msgstr "选择右边整词"
-#: part/kateview.cpp:475
+#: part/kateview.cpp:470
msgid "Move to Beginning of Line"
msgstr "移到行首"
-#: part/kateview.cpp:479
+#: part/kateview.cpp:474
msgid "Move to Beginning of Document"
msgstr "移到文档开头"
-#: part/kateview.cpp:483
+#: part/kateview.cpp:478
msgid "Select to Beginning of Line"
msgstr "选择到行首"
-#: part/kateview.cpp:487
+#: part/kateview.cpp:482
msgid "Select to Beginning of Document"
msgstr "选择到文档开头"
-#: part/kateview.cpp:492
+#: part/kateview.cpp:487
msgid "Move to End of Line"
msgstr "移到行尾"
-#: part/kateview.cpp:496
+#: part/kateview.cpp:491
msgid "Move to End of Document"
msgstr "移到文档末尾"
-#: part/kateview.cpp:500
+#: part/kateview.cpp:495
msgid "Select to End of Line"
msgstr "选择到行尾"
-#: part/kateview.cpp:504
+#: part/kateview.cpp:499
msgid "Select to End of Document"
msgstr "选择到文档末尾"
-#: part/kateview.cpp:509
+#: part/kateview.cpp:504
msgid "Select to Previous Line"
msgstr "选择到前一行"
-#: part/kateview.cpp:513
+#: part/kateview.cpp:508
msgid "Scroll Line Up"
msgstr "向上滚动一行"
-#: part/kateview.cpp:517
+#: part/kateview.cpp:512
msgid "Move to Next Line"
msgstr "选择到下一行"
-#: part/kateview.cpp:520
+#: part/kateview.cpp:515
msgid "Move to Previous Line"
msgstr "选择到前一行"
-#: part/kateview.cpp:523
+#: part/kateview.cpp:518
msgid "Move Character Right"
msgstr "移动右边字符"
-#: part/kateview.cpp:526
+#: part/kateview.cpp:521
msgid "Move Character Left"
msgstr "移动左边字符"
-#: part/kateview.cpp:530
+#: part/kateview.cpp:525
msgid "Select to Next Line"
msgstr "选择到下一行"
-#: part/kateview.cpp:534
+#: part/kateview.cpp:529
msgid "Scroll Line Down"
msgstr "向下滚动一行"
-#: part/kateview.cpp:539
+#: part/kateview.cpp:534
msgid "Scroll Page Up"
msgstr "向上滚动一页"
-#: part/kateview.cpp:543
+#: part/kateview.cpp:538
msgid "Select Page Up"
msgstr "向上选择一页"
-#: part/kateview.cpp:547
+#: part/kateview.cpp:542
msgid "Move to Top of View"
msgstr "移到视图顶部"
-#: part/kateview.cpp:551
+#: part/kateview.cpp:546
msgid "Select to Top of View"
msgstr "选择到视图顶部"
-#: part/kateview.cpp:556
+#: part/kateview.cpp:551
msgid "Scroll Page Down"
msgstr "向下滚动一页"
-#: part/kateview.cpp:560
+#: part/kateview.cpp:555
msgid "Select Page Down"
msgstr "向下选择一页"
-#: part/kateview.cpp:564
+#: part/kateview.cpp:559
msgid "Move to Bottom of View"
msgstr "移到视图底部"
-#: part/kateview.cpp:568
+#: part/kateview.cpp:563
msgid "Select to Bottom of View"
msgstr "选择到视图底部"
-#: part/kateview.cpp:572
+#: part/kateview.cpp:567
msgid "Move to Matching Bracket"
msgstr "移到匹配的括号"
-#: part/kateview.cpp:576
+#: part/kateview.cpp:571
msgid "Select to Matching Bracket"
msgstr "选择到匹配的括号"
-#: part/kateview.cpp:584
+#: part/kateview.cpp:579
msgid "Transpose Characters"
msgstr "左右交换字符"
-#: part/kateview.cpp:594
+#: part/kateview.cpp:584
+msgid "Delete Line"
+msgstr "删除一行"
+
+#: part/kateview.cpp:589
msgid "Delete Word Left"
msgstr "删除左边整词"
-#: part/kateview.cpp:599
+#: part/kateview.cpp:594
msgid "Delete Word Right"
msgstr "删除右边整词"
-#: part/kateview.cpp:603
+#: part/kateview.cpp:598
msgid "Delete Next Character"
msgstr "删除下个字符"
-#: part/kateview.cpp:607
+#: part/kateview.cpp:602
msgid "Backspace"
msgstr "Backspace"
-#: part/kateview.cpp:633
+#: part/kateview.cpp:628
msgid "Collapse Toplevel"
msgstr "折叠顶层树"
-#: part/kateview.cpp:635
+#: part/kateview.cpp:630
msgid "Expand Toplevel"
msgstr "展开顶层"
-#: part/kateview.cpp:637
+#: part/kateview.cpp:632
msgid "Collapse One Local Level"
msgstr "折叠一层本地级别"
-#: part/kateview.cpp:639
+#: part/kateview.cpp:634
msgid "Expand One Local Level"
msgstr "展开一层本地级别"
-#: part/kateview.cpp:644
+#: part/kateview.cpp:639
msgid "Show the code folding region tree"
msgstr "显示代码树状折叠"
-#: part/kateview.cpp:645
+#: part/kateview.cpp:640
msgid "Basic template code test"
msgstr "基本模板代码测试"
-#: part/kateview.cpp:707
+#: part/kateview.cpp:702
msgid " OVR "
msgstr " 改写 "
-#: part/kateview.cpp:709
+#: part/kateview.cpp:704
msgid " INS "
msgstr " 插入 "
-#: part/kateview.cpp:712
+#: part/kateview.cpp:707
msgid " R/O "
msgstr " 只读 "
-#: part/kateview.cpp:717
+#: part/kateview.cpp:712
#, c-format
msgid " Line: %1"
msgstr " 行:%1"
-#: part/kateview.cpp:718
+#: part/kateview.cpp:713
#, c-format
msgid " Col: %1"
msgstr " 列:%1"
-#: part/kateview.cpp:721
+#: part/kateview.cpp:716
msgid " BLK "
msgstr " 块 "
-#: part/kateview.cpp:721
+#: part/kateview.cpp:716
msgid " NORM "
msgstr " 普通 "
-#: part/kateview.cpp:897
+#: part/kateview.cpp:892
msgid "Overwrite the file"
msgstr "覆盖文件"
-#: part/kateview.cpp:1799
+#: part/kateview.cpp:1794
msgid "Export File as HTML"
msgstr "文件导出为 HTML"
@@ -5044,6 +5035,10 @@ msgid ""
msgstr "Bash"
#, fuzzy
+#~ msgid "Use this to delete the current line."
+#~ msgstr "按此按钮可删除当前选中实体。"
+
+#, fuzzy
#~ msgid "&Bookmarks"
#~ msgstr "书签"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdeio.po b/tde-i18n-zh_CN/messages/tdelibs/tdeio.po
index daa09ef27ee..56fa5335926 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdeio.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdeio.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: tdelibs\n"
-"POT-Creation-Date: 2019-01-13 18:46+0100\n"
+"POT-Creation-Date: 2019-01-23 23:15+0100\n"
"PO-Revision-Date: 2005-06-10 18:14+0800\n"
"Last-Translator: Funda Wang <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -334,11 +334,11 @@ msgstr "此证书不相关。"
msgid "The certificate is invalid."
msgstr "证书无效。"
-#: kssl/ksslinfodlg.cc:92 kssl/ksslinfodlg.cc:151
+#: kssl/ksslinfodlg.cc:92 kssl/ksslinfodlg.cc:149
msgid "Current connection is secured with SSL."
msgstr "当前连接使用安全的 SSL。"
-#: kssl/ksslinfodlg.cc:95 kssl/ksslinfodlg.cc:155
+#: kssl/ksslinfodlg.cc:95 kssl/ksslinfodlg.cc:152
msgid "Current connection is not secured with SSL."
msgstr "当前连接没有使用安全的 SSL。"
@@ -359,101 +359,101 @@ msgid ""
"The main part of this document is secured with SSL, but some parts are not."
msgstr "该文档的主要部分使用安全的 SSL,但是某些部分没有使用。"
-#: kssl/ksslinfodlg.cc:145
+#: kssl/ksslinfodlg.cc:144
msgid "Some of this document is secured with SSL, but the main part is not."
msgstr "该文档的某些部分使用安全的 SSL,但是主要部分没有使用。"
-#: kssl/ksslinfodlg.cc:188
+#: kssl/ksslinfodlg.cc:184
msgid "Chain:"
msgstr "信任链:"
-#: kssl/ksslinfodlg.cc:197
+#: kssl/ksslinfodlg.cc:193
msgid "0 - Site Certificate"
msgstr "0 - 站点证书"
-#: kssl/ksslinfodlg.cc:214
+#: kssl/ksslinfodlg.cc:210
msgid "Peer certificate:"
msgstr "对端证书:"
-#: kssl/ksslinfodlg.cc:216
+#: kssl/ksslinfodlg.cc:212
msgid "Issuer:"
msgstr "颁发者:"
-#: kssl/ksslinfodlg.cc:222
+#: kssl/ksslinfodlg.cc:218
msgid "IP address:"
msgstr "IP 地址:"
-#: kssl/ksslinfodlg.cc:231 tdefile/kpropertiesdialog.cpp:2613
+#: kssl/ksslinfodlg.cc:227 tdefile/kpropertiesdialog.cpp:2613
msgid "URL:"
msgstr "URL:"
-#: kssl/ksslinfodlg.cc:234
+#: kssl/ksslinfodlg.cc:230
msgid "Certificate state:"
msgstr "证书状态:"
-#: kssl/ksslinfodlg.cc:240
+#: kssl/ksslinfodlg.cc:236
msgid "Valid from:"
msgstr "有效期自:"
-#: kssl/ksslinfodlg.cc:242
+#: kssl/ksslinfodlg.cc:238
msgid "Valid until:"
msgstr "有效期至:"
-#: kssl/ksslinfodlg.cc:245
+#: kssl/ksslinfodlg.cc:241
msgid "Serial number:"
msgstr "序列号:"
-#: kssl/ksslinfodlg.cc:247
+#: kssl/ksslinfodlg.cc:243
msgid "MD5 digest:"
msgstr "MD5 摘要:"
-#: kssl/ksslinfodlg.cc:250
+#: kssl/ksslinfodlg.cc:246
msgid "Cipher in use:"
msgstr "使用的密码:"
-#: kssl/ksslinfodlg.cc:252
+#: kssl/ksslinfodlg.cc:248
msgid "Details:"
msgstr "细节:"
-#: kssl/ksslinfodlg.cc:254
+#: kssl/ksslinfodlg.cc:250
msgid "SSL version:"
msgstr "SSL 版本:"
-#: kssl/ksslinfodlg.cc:256
+#: kssl/ksslinfodlg.cc:252
msgid "Cipher strength:"
msgstr "密码强度:"
-#: kssl/ksslinfodlg.cc:257
+#: kssl/ksslinfodlg.cc:253
msgid "%1 bits used of a %2 bit cipher"
msgstr "使用了 %2 位加密算法的 %1 位"
-#: kssl/ksslinfodlg.cc:413
+#: kssl/ksslinfodlg.cc:409
msgid "Organization:"
msgstr "组织:"
-#: kssl/ksslinfodlg.cc:418
+#: kssl/ksslinfodlg.cc:414
msgid "Organizational unit:"
msgstr "组织单位:"
-#: kssl/ksslinfodlg.cc:423
+#: kssl/ksslinfodlg.cc:419
msgid "Locality:"
msgstr "位置:"
-#: kssl/ksslinfodlg.cc:428
+#: kssl/ksslinfodlg.cc:424
msgid ""
"_: Federal State\n"
"State:"
msgstr "状态:"
-#: kssl/ksslinfodlg.cc:433
+#: kssl/ksslinfodlg.cc:429
msgid "Country:"
msgstr "国家:"
-#: kssl/ksslinfodlg.cc:438
+#: kssl/ksslinfodlg.cc:434
msgid "Common name:"
msgstr "通用名称:"
-#: kssl/ksslinfodlg.cc:443
+#: kssl/ksslinfodlg.cc:439
msgid "Email:"
msgstr "电子邮件:"
@@ -489,23 +489,23 @@ msgstr "存储"
msgid "Do Not Store"
msgstr "不存储"
-#: kssl/ksslkeygen.cc:209
+#: kssl/ksslkeygen.cc:210
msgid "2048 (High Grade)"
msgstr "2048 (高级)"
-#: kssl/ksslkeygen.cc:210
+#: kssl/ksslkeygen.cc:211
msgid "1024 (Medium Grade)"
msgstr "1024 (中级)"
-#: kssl/ksslkeygen.cc:211
+#: kssl/ksslkeygen.cc:212
msgid "768 (Low Grade)"
msgstr "768 (低级)"
-#: kssl/ksslkeygen.cc:212
+#: kssl/ksslkeygen.cc:213
msgid "512 (Low Grade)"
msgstr "512 (低级)"
-#: kssl/ksslkeygen.cc:214
+#: kssl/ksslkeygen.cc:215
msgid "No SSL support."
msgstr "不支持 SSL。"
@@ -762,47 +762,47 @@ msgstr ""
msgid "C&reate"
msgstr "创建(&R)"
-#: misc/tdewalletd/tdewalletd.cpp:470 misc/tdewalletd/tdewalletd.cpp:650
-#: misc/tdewalletd/tdewalletd.cpp:666 misc/tdewalletd/tdewalletd.cpp:677
-#: misc/tdewalletd/tdewalletd.cpp:682 misc/tdewalletd/tdewalletd.cpp:1242
+#: misc/tdewalletd/tdewalletd.cpp:470 misc/tdewalletd/tdewalletd.cpp:651
+#: misc/tdewalletd/tdewalletd.cpp:667 misc/tdewalletd/tdewalletd.cpp:678
+#: misc/tdewalletd/tdewalletd.cpp:683 misc/tdewalletd/tdewalletd.cpp:1243
msgid "TDE Wallet Service"
msgstr "TDE 钱包服务"
-#: misc/tdewalletd/tdewalletd.cpp:486
+#: misc/tdewalletd/tdewalletd.cpp:487
msgid ""
"<qt>Error opening the wallet '<b>%1</b>'. Please try again.<br>(Error code "
"%2: %3)"
msgstr "<qt>打开钱包“<b>%1</b>”出错。请再试一次。<br>(错误代码 %2:%3)"
-#: misc/tdewalletd/tdewalletd.cpp:561
+#: misc/tdewalletd/tdewalletd.cpp:562
msgid "<qt>TDE has requested access to the open wallet '<b>%1</b>'."
msgstr "<qt>TDE 请求访问打开的钱包“<b>%1</b>”。"
-#: misc/tdewalletd/tdewalletd.cpp:563
+#: misc/tdewalletd/tdewalletd.cpp:564
msgid ""
"<qt>The application '<b>%1</b>' has requested access to the open wallet '<b>"
"%2</b>'."
msgstr "<qt>应用程序“<b>%1</b>”请求访问打开的钱包“<b>%2</b>”。"
-#: misc/tdewalletd/tdewalletd.cpp:650
+#: misc/tdewalletd/tdewalletd.cpp:651
msgid ""
"Unable to open wallet. The wallet must be opened in order to change the "
"password."
msgstr "无法打开钱包。要更改密码,必须先打开钱包。"
-#: misc/tdewalletd/tdewalletd.cpp:665
+#: misc/tdewalletd/tdewalletd.cpp:666
msgid "<qt>Please choose a new password for the wallet '<b>%1</b>'."
msgstr "<qt>请为钱包“<b>%1</b>”选择一个新密码。"
-#: misc/tdewalletd/tdewalletd.cpp:677
+#: misc/tdewalletd/tdewalletd.cpp:678
msgid "Error re-encrypting the wallet. Password was not changed."
msgstr "重新加密钱包出错。密码未更改。"
-#: misc/tdewalletd/tdewalletd.cpp:682
+#: misc/tdewalletd/tdewalletd.cpp:683
msgid "Error reopening the wallet. Data may be lost."
msgstr "重新打开钱包出错。数据可能已丢失。"
-#: misc/tdewalletd/tdewalletd.cpp:1242
+#: misc/tdewalletd/tdewalletd.cpp:1243
msgid ""
"There have been repeated failed attempts to gain access to a wallet. An "
"application may be misbehaving."
diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdelibs.po b/tde-i18n-zh_CN/messages/tdelibs/tdelibs.po
index 29dc3be0c35..6641e9de67d 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdelibs.po
@@ -9,7 +9,7 @@
msgid ""
msgstr ""
"Project-Id-Version: tdelibs\n"
-"POT-Creation-Date: 2019-01-13 18:39+0100\n"
+"POT-Creation-Date: 2019-01-23 23:08+0100\n"
"PO-Revision-Date: 2006-04-30 16:49+0800\n"
"Last-Translator: Funda Wang <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -2304,7 +2304,7 @@ msgstr "标志"
msgid "Photo"
msgstr "照片"
-#: tdeabc/addressee.cpp:948 tdecore/tdehw/tdehardwaredevices.cpp:4208
+#: tdeabc/addressee.cpp:948 tdecore/tdehw/tdehardwaredevices.cpp:4122
msgid "Sound"
msgstr "声音"
@@ -2673,7 +2673,7 @@ msgstr "视频"
msgid "Mailbox"
msgstr "邮箱"
-#: tdeabc/phonenumber.cpp:178 tdecore/tdehw/tdehardwaredevices.cpp:4190
+#: tdeabc/phonenumber.cpp:178 tdecore/tdehw/tdehardwaredevices.cpp:4107
msgid "Modem"
msgstr "调制解调器"
@@ -4721,72 +4721,6 @@ msgstr ""
msgid "No PSK provided"
msgstr "没有选择提供者。"
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:51
-msgid "card not powered on"
-msgstr ""
-
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:54
-msgid "protocol mismatch"
-msgstr ""
-
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:274
-#, fuzzy
-msgid "Unknown (%1)"
-msgstr "未知"
-
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:323
-msgid "Please enter the PIN for '%1'"
-msgstr ""
-
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:700
-#, fuzzy
-msgid "Card watcher object not available"
-msgstr "预览不可用。"
-
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:709
-msgid "Unable to initialize PKCS"
-msgstr ""
-
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:715
-#, c-format
-msgid "Cannot enumerate certificates: %1"
-msgstr ""
-
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:726
-#, fuzzy, c-format
-msgid "Cannot read certificate: %1"
-msgstr "无效的证书!"
-
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:736
-msgid "Cannot initialize openssl session to retrieve cryptographic objects"
-msgstr ""
-
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:746
-msgid "Cannot get X509 object"
-msgstr ""
-
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:794
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:804
-#, c-format
-msgid "Cannot decrypt: %1"
-msgstr ""
-
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:794
-msgid "Ciphertext too small"
-msgstr ""
-
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:804
-msgid "Ciphertext too large"
-msgstr ""
-
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:815
-msgid "Cannot determine decrypted message length: %1 (%2)"
-msgstr ""
-
-#: tdecore/tdehw/tdecryptographiccarddevice.cpp:836
-msgid "Cannot decrypt: %1 (%2)"
-msgstr ""
-
#: tdecore/tdehw/tdeeventdevice.cpp:288
msgid "Lid Switch"
msgstr ""
@@ -4888,7 +4822,7 @@ msgid "Generic Input Device"
msgstr "通用选项"
#: tdecore/tdehw/tdegenericdevice.cpp:315
-#: tdecore/tdehw/tdehardwaredevices.cpp:3319
+#: tdecore/tdehw/tdehardwaredevices.cpp:3256
msgid "Generic %1 Device"
msgstr ""
@@ -4902,261 +4836,236 @@ msgid "Unknown Virtual Device"
msgstr ""
#: tdecore/tdehw/tdegenericdevice.cpp:330
-#: tdecore/tdehw/tdehardwaredevices.cpp:4307
+#: tdecore/tdehw/tdehardwaredevices.cpp:4206
#, fuzzy
msgid "Unknown Device"
msgstr "未知字段"
-#: tdecore/tdehw/tdehardwaredevices.cpp:3324
+#: tdecore/tdehw/tdehardwaredevices.cpp:3261
msgid "Disconnected %1 Port"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:3714
-#: tdecore/tdehw/tdehardwaredevices.cpp:3794
-#: tdecore/tdehw/tdehardwaredevices.cpp:3806
+#: tdecore/tdehw/tdehardwaredevices.cpp:3631
+#: tdecore/tdehw/tdehardwaredevices.cpp:3711
+#: tdecore/tdehw/tdehardwaredevices.cpp:3723
#, fuzzy
msgid "Unknown PCI Device"
msgstr "未知字段"
-#: tdecore/tdehw/tdehardwaredevices.cpp:3824
-#: tdecore/tdehw/tdehardwaredevices.cpp:3904
-#: tdecore/tdehw/tdehardwaredevices.cpp:3916
+#: tdecore/tdehw/tdehardwaredevices.cpp:3741
+#: tdecore/tdehw/tdehardwaredevices.cpp:3821
+#: tdecore/tdehw/tdehardwaredevices.cpp:3833
#, fuzzy
msgid "Unknown USB Device"
msgstr "未知字段"
-#: tdecore/tdehw/tdehardwaredevices.cpp:3945
-#: tdecore/tdehw/tdehardwaredevices.cpp:3986
+#: tdecore/tdehw/tdehardwaredevices.cpp:3862
+#: tdecore/tdehw/tdehardwaredevices.cpp:3903
#, fuzzy
msgid "Unknown PNP Device"
msgstr "未知字段"
-#: tdecore/tdehw/tdehardwaredevices.cpp:4015
-#: tdecore/tdehw/tdehardwaredevices.cpp:4056
+#: tdecore/tdehw/tdehardwaredevices.cpp:3932
+#: tdecore/tdehw/tdehardwaredevices.cpp:3973
msgid "Unknown Monitor Device"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4145
+#: tdecore/tdehw/tdehardwaredevices.cpp:4062
#, fuzzy
msgid "Root"
msgstr "无 CA 根"
-#: tdecore/tdehw/tdehardwaredevices.cpp:4148
+#: tdecore/tdehw/tdehardwaredevices.cpp:4065
#, fuzzy
msgid "System Root"
msgstr "系统菜单"
-#: tdecore/tdehw/tdehardwaredevices.cpp:4151
+#: tdecore/tdehw/tdehardwaredevices.cpp:4068
msgid "CPU"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4154
+#: tdecore/tdehw/tdehardwaredevices.cpp:4071
#, fuzzy
msgid "Graphics Processor"
msgstr "地理位置"
-#: tdecore/tdehw/tdehardwaredevices.cpp:4157
+#: tdecore/tdehw/tdehardwaredevices.cpp:4074
msgid "RAM"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4160
+#: tdecore/tdehw/tdehardwaredevices.cpp:4077
msgid "Bus"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4163
+#: tdecore/tdehw/tdehardwaredevices.cpp:4080
msgid "I2C Bus"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4166
+#: tdecore/tdehw/tdehardwaredevices.cpp:4083
msgid "MDIO Bus"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4169
+#: tdecore/tdehw/tdehardwaredevices.cpp:4086
#, fuzzy
msgid "Mainboard"
msgstr "主工具栏"
-#: tdecore/tdehw/tdehardwaredevices.cpp:4172
+#: tdecore/tdehw/tdehardwaredevices.cpp:4089
msgid "Disk"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4175
+#: tdecore/tdehw/tdehardwaredevices.cpp:4092
msgid "SCSI"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4178
+#: tdecore/tdehw/tdehardwaredevices.cpp:4095
msgid "Storage Controller"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4181
+#: tdecore/tdehw/tdehardwaredevices.cpp:4098
msgid "Mouse"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4184
+#: tdecore/tdehw/tdehardwaredevices.cpp:4101
msgid "Keyboard"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4187
+#: tdecore/tdehw/tdehardwaredevices.cpp:4104
msgid "HID"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4193
+#: tdecore/tdehw/tdehardwaredevices.cpp:4110
msgid "Monitor and Display"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4196
+#: tdecore/tdehw/tdehardwaredevices.cpp:4113
msgid "Network"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4199
-msgid "Nonvolatile Memory"
-msgstr ""
-
#: ../dependencies/tqt3/src/dialogs/qprintdialog.cpp:1033
-#: tdecore/tdehw/tdehardwaredevices.cpp:4202
+#: tdecore/tdehw/tdehardwaredevices.cpp:4116
#, fuzzy
msgid "Printer"
msgstr "打印"
-#: tdecore/tdehw/tdehardwaredevices.cpp:4205
+#: tdecore/tdehw/tdehardwaredevices.cpp:4119
msgid "Scanner"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4211
+#: tdecore/tdehw/tdehardwaredevices.cpp:4125
#, fuzzy
msgid "Video Capture"
msgstr "视频工具栏"
-#: tdecore/tdehw/tdehardwaredevices.cpp:4214
+#: tdecore/tdehw/tdehardwaredevices.cpp:4128
msgid "IEEE1394"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4217
+#: tdecore/tdehw/tdehardwaredevices.cpp:4131
msgid "PCMCIA"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4220
+#: tdecore/tdehw/tdehardwaredevices.cpp:4134
msgid "Camera"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4223
+#: tdecore/tdehw/tdehardwaredevices.cpp:4137
#, fuzzy
msgid "Text I/O"
msgstr "仅文字"
-#: tdecore/tdehw/tdehardwaredevices.cpp:4226
+#: tdecore/tdehw/tdehardwaredevices.cpp:4140
msgid "Serial Communications Controller"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4229
+#: tdecore/tdehw/tdehardwaredevices.cpp:4143
msgid "Parallel Port"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4232
+#: tdecore/tdehw/tdehardwaredevices.cpp:4146
msgid "Peripheral"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4235
+#: tdecore/tdehw/tdehardwaredevices.cpp:4149
#, fuzzy
msgid "Backlight"
msgstr "后退"
-#: tdecore/tdehw/tdehardwaredevices.cpp:4238
+#: tdecore/tdehw/tdehardwaredevices.cpp:4152
msgid "Battery"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4241
+#: tdecore/tdehw/tdehardwaredevices.cpp:4155
msgid "Power Supply"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4244
+#: tdecore/tdehw/tdehardwaredevices.cpp:4158
#, fuzzy
msgid "Docking Station"
msgstr "方向"
-#: tdecore/tdehw/tdehardwaredevices.cpp:4247
+#: tdecore/tdehw/tdehardwaredevices.cpp:4161
#, fuzzy
msgid "Thermal Sensor"
msgstr "常规设置"
-#: tdecore/tdehw/tdehardwaredevices.cpp:4250
+#: tdecore/tdehw/tdehardwaredevices.cpp:4164
msgid "Thermal Control"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4253
+#: tdecore/tdehw/tdehardwaredevices.cpp:4167
#: tdecore/tdehw/tdenetworkconnections.cpp:781
msgid "Bluetooth"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4256
+#: tdecore/tdehw/tdehardwaredevices.cpp:4170
msgid "Bridge"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4259
-msgid "Hub"
-msgstr ""
-
-#: tdecore/tdehw/tdehardwaredevices.cpp:4262
+#: tdecore/tdehw/tdehardwaredevices.cpp:4173
msgid "Platform"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4265
+#: tdecore/tdehw/tdehardwaredevices.cpp:4176
msgid "Cryptography"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4268
-msgid "Cryptographic Card"
-msgstr ""
-
-#: tdecore/tdehw/tdehardwaredevices.cpp:4271
-#, fuzzy
-msgid "Biometric Security"
-msgstr "安全"
-
-#: tdecore/tdehw/tdehardwaredevices.cpp:4274
-msgid "Test and Measurement"
-msgstr ""
-
-#: tdecore/tdehw/tdehardwaredevices.cpp:4277
-msgid "Timekeeping"
-msgstr ""
-
-#: tdecore/tdehw/tdehardwaredevices.cpp:4280
+#: tdecore/tdehw/tdehardwaredevices.cpp:4179
msgid "Platform Event"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4283
+#: tdecore/tdehw/tdehardwaredevices.cpp:4182
#, fuzzy
msgid "Platform Input"
msgstr "清除输入"
-#: tdecore/tdehw/tdehardwaredevices.cpp:4286
+#: tdecore/tdehw/tdehardwaredevices.cpp:4185
msgid "Plug and Play"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4289
+#: tdecore/tdehw/tdehardwaredevices.cpp:4188
#, fuzzy
msgid "Other ACPI"
msgstr "其它"
-#: tdecore/tdehw/tdehardwaredevices.cpp:4292
+#: tdecore/tdehw/tdehardwaredevices.cpp:4191
#, fuzzy
msgid "Other USB"
msgstr "其它"
-#: tdecore/tdehw/tdehardwaredevices.cpp:4295
+#: tdecore/tdehw/tdehardwaredevices.cpp:4194
msgid "Other Multimedia"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4298
+#: tdecore/tdehw/tdehardwaredevices.cpp:4197
msgid "Other Peripheral"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4301
+#: tdecore/tdehw/tdehardwaredevices.cpp:4200
msgid "Other Sensor"
msgstr ""
-#: tdecore/tdehw/tdehardwaredevices.cpp:4304
+#: tdecore/tdehw/tdehardwaredevices.cpp:4203
msgid "Other Virtual"
msgstr ""
@@ -5204,109 +5113,94 @@ msgstr ""
msgid "Virtual Private Network"
msgstr ""
-#: tdecore/tdehw/tdestoragedevice.cpp:279
-#, fuzzy
-msgid "Inactive"
-msgstr "相对"
-
-#: tdecore/tdehw/tdestoragedevice.cpp:282
-#, fuzzy
-msgid "Active"
-msgstr "动作"
-
-#: tdecore/tdehw/tdestoragedevice.cpp:285
-#: tdehtml/java/kjavaappletserver.cpp:667
-msgid "Unknown"
-msgstr "未知"
-
-#: tdecore/tdehw/tdestoragedevice.cpp:761
+#: tdecore/tdehw/tdestoragedevice.cpp:540
msgid "%1 Removable Device"
msgstr ""
-#: tdecore/tdehw/tdestoragedevice.cpp:764
+#: tdecore/tdehw/tdestoragedevice.cpp:543
msgid "%1 Fixed Storage Device"
msgstr ""
-#: tdecore/tdehw/tdestoragedevice.cpp:781
-#: tdecore/tdehw/tdestoragedevice.cpp:816
+#: tdecore/tdehw/tdestoragedevice.cpp:560
+#: tdecore/tdehw/tdestoragedevice.cpp:595
msgid "Hard Disk Drive"
msgstr ""
-#: tdecore/tdehw/tdestoragedevice.cpp:785
+#: tdecore/tdehw/tdestoragedevice.cpp:564
msgid "Floppy Drive"
msgstr ""
-#: tdecore/tdehw/tdestoragedevice.cpp:788
+#: tdecore/tdehw/tdestoragedevice.cpp:567
msgid "Optical Drive"
msgstr ""
-#: tdecore/tdehw/tdestoragedevice.cpp:791
+#: tdecore/tdehw/tdestoragedevice.cpp:570
msgid "CDROM Drive"
msgstr ""
-#: tdecore/tdehw/tdestoragedevice.cpp:794
+#: tdecore/tdehw/tdestoragedevice.cpp:573
msgid "CDRW Drive"
msgstr ""
-#: tdecore/tdehw/tdestoragedevice.cpp:797
+#: tdecore/tdehw/tdestoragedevice.cpp:576
msgid "DVD Drive"
msgstr ""
-#: tdecore/tdehw/tdestoragedevice.cpp:800
+#: tdecore/tdehw/tdestoragedevice.cpp:579
msgid "DVDRW Drive"
msgstr ""
-#: tdecore/tdehw/tdestoragedevice.cpp:803
+#: tdecore/tdehw/tdestoragedevice.cpp:582
msgid "DVDRAM Drive"
msgstr ""
-#: tdecore/tdehw/tdestoragedevice.cpp:806
+#: tdecore/tdehw/tdestoragedevice.cpp:585
msgid "Zip Drive"
msgstr ""
-#: tdecore/tdehw/tdestoragedevice.cpp:809
+#: tdecore/tdehw/tdestoragedevice.cpp:588
msgid "Tape Drive"
msgstr ""
-#: tdecore/tdehw/tdestoragedevice.cpp:812
+#: tdecore/tdehw/tdestoragedevice.cpp:591
msgid "Digital Camera"
msgstr ""
-#: tdecore/tdehw/tdestoragedevice.cpp:818
+#: tdecore/tdehw/tdestoragedevice.cpp:597
#, fuzzy
msgid "Removable Storage"
msgstr "删除项目"
-#: tdecore/tdehw/tdestoragedevice.cpp:821
+#: tdecore/tdehw/tdestoragedevice.cpp:600
msgid "Compact Flash"
msgstr ""
-#: tdecore/tdehw/tdestoragedevice.cpp:824
+#: tdecore/tdehw/tdestoragedevice.cpp:603
msgid "Memory Stick"
msgstr ""
-#: tdecore/tdehw/tdestoragedevice.cpp:827
+#: tdecore/tdehw/tdestoragedevice.cpp:606
msgid "Smart Media"
msgstr ""
-#: tdecore/tdehw/tdestoragedevice.cpp:830
+#: tdecore/tdehw/tdestoragedevice.cpp:609
#, fuzzy
msgid "Secure Digital"
msgstr "安全"
-#: tdecore/tdehw/tdestoragedevice.cpp:835
+#: tdecore/tdehw/tdestoragedevice.cpp:614
msgid "Random Access Memory"
msgstr ""
-#: tdecore/tdehw/tdestoragedevice.cpp:838
+#: tdecore/tdehw/tdestoragedevice.cpp:617
msgid "Loop Device"
msgstr ""
-#: tdecore/tdehw/tdestoragedevice.cpp:1224
+#: tdecore/tdehw/tdestoragedevice.cpp:976
msgid "No supported mounting methods were detected on your system"
msgstr ""
-#: tdecore/tdehw/tdestoragedevice.cpp:1411
+#: tdecore/tdehw/tdestoragedevice.cpp:1154
msgid "No supported unmounting methods were detected on your system"
msgstr ""
@@ -5891,6 +5785,10 @@ msgstr "私钥失败"
msgid "InvalidHost"
msgstr "无效主机"
+#: tdehtml/java/kjavaappletserver.cpp:667
+msgid "Unknown"
+msgstr "未知"
+
#: tdehtml/java/kjavaappletserver.cpp:784 tdehtml/tdehtml_part.cpp:6842
msgid "Security Alert"
msgstr "安全警报"
@@ -8780,23 +8678,23 @@ msgstr "下拉列表和自动"
msgid "&Browse..."
msgstr "浏览(&B)..."
-#: tdeui/kpassdlg.cpp:250
+#: tdeui/kpassdlg.cpp:255
msgid "&Password:"
msgstr "密码(&P):"
-#: tdeui/kpassdlg.cpp:269
+#: tdeui/kpassdlg.cpp:274
msgid "&Keep password"
msgstr "保存密码(&K)"
-#: tdeui/kpassdlg.cpp:289
+#: tdeui/kpassdlg.cpp:294
msgid "&Verify:"
msgstr "校验(&V):"
-#: tdeui/kpassdlg.cpp:311
+#: tdeui/kpassdlg.cpp:316
msgid "Password strength meter:"
msgstr "密码强度衡量:"
-#: tdeui/kpassdlg.cpp:315
+#: tdeui/kpassdlg.cpp:320
msgid ""
"The password strength meter gives an indication of the security of the "
"password you have entered. To improve the strength of the password, try:\n"
@@ -8809,15 +8707,15 @@ msgstr ""
" - 混合使用大小写字母;\n"
" - 将字母与数字或符号组合使用,比如 #。"
-#: tdeui/kpassdlg.cpp:331 tdeui/kpassdlg.cpp:524
+#: tdeui/kpassdlg.cpp:336 tdeui/kpassdlg.cpp:530
msgid "Passwords do not match"
msgstr "密码不匹配"
-#: tdeui/kpassdlg.cpp:408
+#: tdeui/kpassdlg.cpp:413
msgid "You entered two different passwords. Please try again."
msgstr "您输入了两个不同的密码。请重新输入。"
-#: tdeui/kpassdlg.cpp:415
+#: tdeui/kpassdlg.cpp:420
msgid ""
"The password you have entered has a low strength. To improve the strength of "
"the password, try:\n"
@@ -8834,22 +8732,22 @@ msgstr ""
"\n"
"您是否仍然想要使用此密码?"
-#: tdeui/kpassdlg.cpp:423
+#: tdeui/kpassdlg.cpp:428
msgid "Low Password Strength"
msgstr "密码太简单"
-#: tdeui/kpassdlg.cpp:518
+#: tdeui/kpassdlg.cpp:524
msgid "Password is empty"
msgstr "密码为空"
-#: tdeui/kpassdlg.cpp:521
+#: tdeui/kpassdlg.cpp:527
#, c-format
msgid ""
"_n: Password must be at least 1 character long\n"
"Password must be at least %n characters long"
msgstr "密码必须至少有 %n 个字符"
-#: tdeui/kpassdlg.cpp:523
+#: tdeui/kpassdlg.cpp:529
msgid "Passwords match"
msgstr "密码匹配"
@@ -13356,6 +13254,30 @@ msgstr "密码为空"
msgid "The size of the dialog"
msgstr "日积月累"
+#, fuzzy
+#~ msgid "Unknown (%1)"
+#~ msgstr "未知"
+
+#, fuzzy
+#~ msgid "Card watcher object not available"
+#~ msgstr "预览不可用。"
+
+#, fuzzy
+#~ msgid "Cannot read certificate: %1"
+#~ msgstr "无效的证书!"
+
+#, fuzzy
+#~ msgid "Biometric Security"
+#~ msgstr "安全"
+
+#, fuzzy
+#~ msgid "Inactive"
+#~ msgstr "相对"
+
+#, fuzzy
+#~ msgid "Active"
+#~ msgstr "动作"
+
#~ msgid ""
#~ "The <b>K Desktop Environment</b> is written and maintained by the TDE "
#~ "Team, a world-wide network of software engineers committed to <a href="
diff --git a/tde-i18n-zh_CN/messages/tdenetwork/kopete.po b/tde-i18n-zh_CN/messages/tdenetwork/kopete.po
index 10ad1351c83..c8711d54c68 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/kopete.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/kopete.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-01-13 18:51+0100\n"
+"POT-Creation-Date: 2019-01-23 23:20+0100\n"
"PO-Revision-Date: 2008-01-29 17:02+0000\n"
"Last-Translator: Lie_Ex <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -3440,7 +3440,7 @@ msgid "Please enter the same password twice."
msgstr "请输入两次同样的密码。"
#: protocols/gadu/gaduregisteraccount.cpp:106
-#: protocols/jabber/ui/jabberregisteraccount.cpp:160
+#: protocols/jabber/ui/jabberregisteraccount.cpp:161
msgid "Password entries do not match."
msgstr "两次密码不符。"
@@ -3597,7 +3597,7 @@ msgid "&Manage Privacy..."
msgstr "管理隐私(&M)..."
#: protocols/groupwise/gwaccount.cpp:251 protocols/jabber/jabberaccount.cpp:428
-#: protocols/jabber/ui/jabberregisteraccount.cpp:269
+#: protocols/jabber/ui/jabberregisteraccount.cpp:270
#, fuzzy
msgid ""
"SSL support could not be initialized for account %1. This is most likely "
@@ -4972,7 +4972,7 @@ msgid "Jabber Error"
msgstr "Jabber 错误"
#: protocols/jabber/jabberaccount.cpp:430
-#: protocols/jabber/ui/jabberregisteraccount.cpp:271
+#: protocols/jabber/ui/jabberregisteraccount.cpp:272
msgid "Jabber SSL Error"
msgstr "Jabber SSL 错误"
@@ -5889,7 +5889,7 @@ msgstr "请输入服务器名称,或单击选择。"
msgid "Please enter a valid Jabber ID."
msgstr "请输入有效的 Jabber ID。"
-#: protocols/jabber/ui/jabberregisteraccount.cpp:192
+#: protocols/jabber/ui/jabberregisteraccount.cpp:193
msgid ""
"Unless you know what you are doing, your JID should be of the form "
"\"[email protected]\". In your case for example \"username@%1\"."
@@ -5897,33 +5897,33 @@ msgstr ""
"除非您知道您在做什么,您的 JID 格式应该是“[email protected]”。您的情况就应"
"该是“username@%1”。"
-#: protocols/jabber/ui/jabberregisteraccount.cpp:247
+#: protocols/jabber/ui/jabberregisteraccount.cpp:248
msgid "Connecting to server..."
msgstr "正在连接到服务器..."
-#: protocols/jabber/ui/jabberregisteraccount.cpp:316
+#: protocols/jabber/ui/jabberregisteraccount.cpp:317
msgid "Protocol error."
msgstr "协议错误。"
-#: protocols/jabber/ui/jabberregisteraccount.cpp:329
+#: protocols/jabber/ui/jabberregisteraccount.cpp:330
msgid "Connected successfully, registering new account..."
msgstr "连接成功,正在注册新账户..."
-#: protocols/jabber/ui/jabberregisteraccount.cpp:344
+#: protocols/jabber/ui/jabberregisteraccount.cpp:345
msgid "Registration successful."
msgstr "注册成功。"
-#: protocols/jabber/ui/jabberregisteraccount.cpp:378
+#: protocols/jabber/ui/jabberregisteraccount.cpp:379
msgid "Registration failed."
msgstr "注册失败。"
-#: protocols/jabber/ui/jabberregisteraccount.cpp:380
+#: protocols/jabber/ui/jabberregisteraccount.cpp:381
msgid ""
"Unable to create account on the server. The Jabber ID is probably already in "
"use."
msgstr "无法在服务器上创建账户。Jabber ID 可能已经被别人使用了。"
-#: protocols/jabber/ui/jabberregisteraccount.cpp:381
+#: protocols/jabber/ui/jabberregisteraccount.cpp:382
msgid "Jabber Account Registration"
msgstr "Jabber 账户注册"
diff --git a/tde-i18n-zh_CN/messages/tdenetwork/krdc.po b/tde-i18n-zh_CN/messages/tdenetwork/krdc.po
index e009275b330..d3f393e8112 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/krdc.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/krdc.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: krdc\n"
-"POT-Creation-Date: 2019-01-13 18:51+0100\n"
+"POT-Creation-Date: 2019-01-23 23:20+0100\n"
"PO-Revision-Date: 2005-08-02 17:28+0800\n"
"Last-Translator: Funda Wang <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -282,13 +282,13 @@ msgstr "无法启动 rdesktop;请确定 rdesktop 已经正确安装。"
msgid "rdesktop Failure"
msgstr "rdesktop 失败"
-#: rdp/krdpview.cpp:367 vnc/kvncview.cpp:470
+#: rdp/krdpview.cpp:367 vnc/kvncview.cpp:467
msgid "Connection attempt to host failed."
msgstr "连接到主机失败。"
-#: rdp/krdpview.cpp:368 vnc/kvncview.cpp:217 vnc/kvncview.cpp:471
-#: vnc/kvncview.cpp:476 vnc/kvncview.cpp:481 vnc/kvncview.cpp:486
-#: vnc/kvncview.cpp:491 vnc/kvncview.cpp:496
+#: rdp/krdpview.cpp:368 vnc/kvncview.cpp:225 vnc/kvncview.cpp:468
+#: vnc/kvncview.cpp:473 vnc/kvncview.cpp:478 vnc/kvncview.cpp:483
+#: vnc/kvncview.cpp:488 vnc/kvncview.cpp:493
msgid "Connection Failure"
msgstr "连接失败"
@@ -307,55 +307,55 @@ msgstr "是"
msgid "no"
msgstr "否"
-#: vnc/kvncview.cpp:216
+#: vnc/kvncview.cpp:224
msgid "It is not possible to connect to a local desktop sharing service."
msgstr "不可能连接到本地桌面共享服务。"
-#: vnc/kvncview.cpp:231
+#: vnc/kvncview.cpp:239
#, c-format
msgid "VNC Host Preferences for %1"
msgstr "%1 的 VNC 主机首选项"
-#: vnc/kvncview.cpp:419
+#: vnc/kvncview.cpp:416
msgid "Access to the system requires a password."
msgstr "访问系统需要密码。"
-#: vnc/kvncview.cpp:475
+#: vnc/kvncview.cpp:472
msgid "Remote host is using an incompatible protocol."
msgstr "远程主机使用的协议不兼容。"
-#: vnc/kvncview.cpp:480
+#: vnc/kvncview.cpp:477
msgid "The connection to the host has been interrupted."
msgstr "到主机的连接被中断。"
-#: vnc/kvncview.cpp:485
+#: vnc/kvncview.cpp:482
msgid "Connection failed. The server does not accept new connections."
msgstr "连接失败。服务器不接受新连接。"
-#: vnc/kvncview.cpp:490
+#: vnc/kvncview.cpp:487
msgid "Connection failed. A server with the given name cannot be found."
msgstr "连接失败。找不到给定名称的服务器。"
-#: vnc/kvncview.cpp:495
+#: vnc/kvncview.cpp:492
#, fuzzy
msgid ""
"Connection failed. No server running at the given address and port. Verify "
"the KDED TDE Internet Daemon is running at the remote server."
msgstr "连接失败。给定地址和端口没有运行服务器。"
-#: vnc/kvncview.cpp:504
+#: vnc/kvncview.cpp:501
msgid "Authentication failed. Connection aborted."
msgstr "认证失败。连接中止。"
-#: vnc/kvncview.cpp:505
+#: vnc/kvncview.cpp:502
msgid "Authentication Failure"
msgstr "认证失败"
-#: vnc/kvncview.cpp:509
+#: vnc/kvncview.cpp:506
msgid "Unknown error."
msgstr "未知错误。"
-#: vnc/kvncview.cpp:510
+#: vnc/kvncview.cpp:507
msgid "Unknown Error"
msgstr "未知错误"
diff --git a/tde-i18n-zh_CN/messages/tdenetwork/krfb.po b/tde-i18n-zh_CN/messages/tdenetwork/krfb.po
index 7660911691f..f4af5ab9f92 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/krfb.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/krfb.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: krfb\n"
-"POT-Creation-Date: 2019-01-13 18:51+0100\n"
+"POT-Creation-Date: 2019-01-23 23:20+0100\n"
"PO-Revision-Date: 2005-01-09 21:58+0800\n"
"Last-Translator: Funda Wang <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -153,7 +153,7 @@ msgstr ""
"找不到 KInetD。TDE 守护程序(kded)可能已经崩溃或者根本没有启动,或者是安装失"
"败。"
-#: krfb/main.cpp:116 krfb/main.cpp:123 krfb/rfbcontroller.cc:894
+#: krfb/main.cpp:116 krfb/main.cpp:123 krfb/rfbcontroller.cc:885
msgid "Desktop Sharing Error"
msgstr "桌面共享错误"
@@ -167,43 +167,43 @@ msgstr "找不到用于桌面共享(krfb)的 KInetD 服务。安装不完整或�
msgid "Personal Invitation"
msgstr "个人邀请"
-#: krfb/rfbcontroller.cc:378
+#: krfb/rfbcontroller.cc:376
msgid "%1@%2 (shared desktop)"
msgstr "%1@%2 (共享的桌面)"
-#: krfb/rfbcontroller.cc:516
+#: krfb/rfbcontroller.cc:510
#, c-format
msgid "User accepts connection from %1"
msgstr "用户接受来自 %1 的连接"
-#: krfb/rfbcontroller.cc:530
+#: krfb/rfbcontroller.cc:523
#, c-format
msgid "User refuses connection from %1"
msgstr "用户拒绝来自 %1 的连接"
-#: krfb/rfbcontroller.cc:578
+#: krfb/rfbcontroller.cc:571
#, c-format
msgid "Closed connection: %1."
msgstr "关闭的连接:%1。"
-#: krfb/rfbcontroller.cc:705 krfb/rfbcontroller.cc:710
+#: krfb/rfbcontroller.cc:700 krfb/rfbcontroller.cc:705
msgid "Failed login attempt from %1: wrong password"
msgstr "来自 %1 的登录失败:密码不对"
-#: krfb/rfbcontroller.cc:748
+#: krfb/rfbcontroller.cc:741
msgid "Connection refused from %1, already connected."
msgstr "来自 %1 的连接被拒绝,连接已经存在。"
-#: krfb/rfbcontroller.cc:758
+#: krfb/rfbcontroller.cc:751
#, c-format
msgid "Accepted uninvited connection from %1"
msgstr "已接受来自 %1 的未邀请连接"
-#: krfb/rfbcontroller.cc:766
+#: krfb/rfbcontroller.cc:759
msgid "Received connection from %1, on hold (waiting for confirmation)"
msgstr "收到来自 %1 的连接,正在等待(等候确认)"
-#: krfb/rfbcontroller.cc:893
+#: krfb/rfbcontroller.cc:884
msgid ""
"Your X11 Server does not support the required XTest extension version 2.2. "
"Sharing your desktop is not possible."
diff --git a/tde-i18n-zh_CN/messages/tdepim/kalarm.po b/tde-i18n-zh_CN/messages/tdepim/kalarm.po
index 9847ba82e0c..fe72f5ae181 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kalarm.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kalarm.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2019-01-13 18:48+0100\n"
+"POT-Creation-Date: 2019-01-23 23:17+0100\n"
"PO-Revision-Date: 2008-01-30 13:58+0800\n"
"Last-Translator: Lie_Ex <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -828,47 +828,41 @@ msgstr "您必须输入提醒模板的名称"
msgid "Template name is already in use"
msgstr "模板名称已被使用"
-#: editdlg.cpp:1387
-msgid ""
-"The date/time in the Alarm tab does not match the recurrence settings "
-"specified in the Recurrence tab."
-msgstr ""
-
-#: editdlg.cpp:1405
+#: editdlg.cpp:1398
msgid "Recurrence has already expired"
msgstr "再现已过期"
-#: editdlg.cpp:1433
+#: editdlg.cpp:1426
msgid ""
"Reminder period must be less than the recurrence interval, unless '%1' is "
"checked."
msgstr "提示时间段必须小于重现间隔,除非选中了“%1”。"
-#: editdlg.cpp:1447
+#: editdlg.cpp:1441
msgid ""
"The duration of a repetition within the recurrence must be less than the "
"recurrence interval minus any reminder period"
msgstr "重现间隔必须小于重现间隔减去任何提醒时间段"
-#: editdlg.cpp:1454
+#: editdlg.cpp:1448
msgid ""
"For a repetition within the recurrence, its period must be in units of days "
"or weeks for a date-only alarm"
msgstr "对于只有日期的提醒,提醒重复时间段的单位必须是天或者周"
-#: editdlg.cpp:1476
+#: editdlg.cpp:1470
msgid "Do you really want to send the email now to the specified recipient(s)?"
msgstr "您真的要现在就发送邮件给指定的收件人吗?"
-#: editdlg.cpp:1477
+#: editdlg.cpp:1471
msgid "Confirm Email"
msgstr "确认邮件"
-#: editdlg.cpp:1477
+#: editdlg.cpp:1471
msgid "&Send"
msgstr "发送(&S)"
-#: editdlg.cpp:1488
+#: editdlg.cpp:1482
#, c-format
msgid ""
"Command executed:\n"
@@ -877,7 +871,7 @@ msgstr ""
"命令已执行:\n"
"%1"
-#: editdlg.cpp:1495
+#: editdlg.cpp:1489
#, c-format
msgid ""
"\n"
@@ -886,7 +880,7 @@ msgstr ""
"\n"
"密送:%1"
-#: editdlg.cpp:1496
+#: editdlg.cpp:1490
msgid ""
"Email sent to:\n"
"%1%2"
@@ -894,16 +888,16 @@ msgstr ""
"邮件发送到:\n"
"%1%2"
-#: editdlg.cpp:1557 messagewin.cpp:1543
+#: editdlg.cpp:1551 messagewin.cpp:1543
msgid "Defer Alarm"
msgstr "推迟提醒"
-#: editdlg.cpp:1711
+#: editdlg.cpp:1705
msgid ""
"Log file must be the name or path of a local file, with write permission."
msgstr "日志文件必须是本地文件的名称或路径,而且必须拥有写权限。"
-#: editdlg.cpp:1737
+#: editdlg.cpp:1731
#, c-format
msgid ""
"Invalid email address:\n"
@@ -912,11 +906,11 @@ msgstr ""
"无效的邮件地址:\n"
"%1"
-#: editdlg.cpp:1744
+#: editdlg.cpp:1738
msgid "No email address specified"
msgstr "没有指定邮件地址"
-#: editdlg.cpp:1761
+#: editdlg.cpp:1755
#, c-format
msgid ""
"Invalid email attachment:\n"
@@ -925,31 +919,31 @@ msgstr ""
"无效的邮件附件:\n"
"%1"
-#: editdlg.cpp:1790
+#: editdlg.cpp:1784
msgid "Display the alarm message now"
msgstr "现在就显示提醒消息"
-#: editdlg.cpp:1807
+#: editdlg.cpp:1801
msgid "Display the file now"
msgstr "现在就显示文件"
-#: editdlg.cpp:1819
+#: editdlg.cpp:1813
msgid "Execute the specified command now"
msgstr "现在就执行指定命令"
-#: editdlg.cpp:1830
+#: editdlg.cpp:1824
msgid "Send the email to the specified addressees now"
msgstr "现在就将邮件发送到指定地址。"
-#: editdlg.cpp:1904
+#: editdlg.cpp:1898
msgid "Choose File to Attach"
msgstr "选择要附加的文件"
-#: editdlg.cpp:2011
+#: editdlg.cpp:2005
msgid "Please select a file to display"
msgstr "请选择要显示的文件"
-#: editdlg.cpp:2013
+#: editdlg.cpp:2007
msgid ""
"%1\n"
"not found"
@@ -957,7 +951,7 @@ msgstr ""
"%1\n"
"没有找到"
-#: editdlg.cpp:2014
+#: editdlg.cpp:2008
msgid ""
"%1\n"
"is a folder"
@@ -965,7 +959,7 @@ msgstr ""
"%1\n"
"是一个文件夹"
-#: editdlg.cpp:2015
+#: editdlg.cpp:2009
msgid ""
"%1\n"
"is not readable"
@@ -973,7 +967,7 @@ msgstr ""
"%1\n"
"不可读"
-#: editdlg.cpp:2016
+#: editdlg.cpp:2010
msgid ""
"%1\n"
"appears not to be a text or image file"
@@ -2740,200 +2734,200 @@ msgstr "结束日期比开始日期还早"
msgid "End date/time is earlier than start date/time"
msgstr "结束日期/时间比开始日期/时间还早"
-#: recurrenceedit.cpp:734
+#: recurrenceedit.cpp:641
msgid ""
"_: Date cannot be earlier than start date\n"
"start date"
msgstr "开始日期"
-#: recurrenceedit.cpp:1124
+#: recurrenceedit.cpp:1031
msgid "Recur e&very"
msgstr "每隔(&V)"
-#: recurrenceedit.cpp:1192
+#: recurrenceedit.cpp:1099
msgid "hours:minutes"
msgstr "小时:分钟"
-#: recurrenceedit.cpp:1193
+#: recurrenceedit.cpp:1100
msgid "Enter the number of hours and minutes between repetitions of the alarm"
msgstr "输入重复提醒之间的时间(以小时和分钟计)。"
-#: recurrenceedit.cpp:1211
+#: recurrenceedit.cpp:1118
msgid ""
"_: On: Tuesday\n"
"O&n:"
msgstr "在(&N):"
-#: recurrenceedit.cpp:1289
+#: recurrenceedit.cpp:1196
msgid "No day selected"
msgstr "没有选中的天"
-#: recurrenceedit.cpp:1318
+#: recurrenceedit.cpp:1225
msgid "day(s)"
msgstr "天"
-#: recurrenceedit.cpp:1319
+#: recurrenceedit.cpp:1226
msgid "Enter the number of days between repetitions of the alarm"
msgstr "输入重复提醒之间的天数。"
-#: recurrenceedit.cpp:1320
+#: recurrenceedit.cpp:1227
msgid "Select the days of the week on which the alarm is allowed to occur"
msgstr "选择一周中允许发生提醒的日子"
-#: recurrenceedit.cpp:1331
+#: recurrenceedit.cpp:1238
msgid "week(s)"
msgstr "星期"
-#: recurrenceedit.cpp:1332
+#: recurrenceedit.cpp:1239
msgid "Enter the number of weeks between repetitions of the alarm"
msgstr "输入重复提醒之间的星期数"
-#: recurrenceedit.cpp:1333
+#: recurrenceedit.cpp:1240
msgid "Select the days of the week on which to repeat the alarm"
msgstr "选择一周中要重复提醒的日子"
-#: recurrenceedit.cpp:1356
+#: recurrenceedit.cpp:1263
msgid ""
"_: On day number in the month\n"
"O&n day"
msgstr "日期(&N)"
-#: recurrenceedit.cpp:1360
+#: recurrenceedit.cpp:1267
msgid "Repeat the alarm on the selected day of the month"
msgstr "在每月选定的日子进行重新提醒"
-#: recurrenceedit.cpp:1366
+#: recurrenceedit.cpp:1273
msgid ""
"_: Last day of month\n"
"Last"
msgstr "最后一个"
-#: recurrenceedit.cpp:1369
+#: recurrenceedit.cpp:1276
msgid "Select the day of the month on which to repeat the alarm"
msgstr "选择每月内进行重复提醒的日子"
-#: recurrenceedit.cpp:1381
+#: recurrenceedit.cpp:1288
msgid ""
"_: On the 1st Tuesday\n"
"On t&he"
msgstr "在(&H)"
-#: recurrenceedit.cpp:1386
+#: recurrenceedit.cpp:1293
msgid ""
"Repeat the alarm on one day of the week, in the selected week of the month"
msgstr "在每月选定星期的某一天重复提醒"
-#: recurrenceedit.cpp:1389
+#: recurrenceedit.cpp:1296
msgid "1st"
msgstr "第1"
-#: recurrenceedit.cpp:1390
+#: recurrenceedit.cpp:1297
msgid "2nd"
msgstr "第2"
-#: recurrenceedit.cpp:1391
+#: recurrenceedit.cpp:1298
msgid "3rd"
msgstr "第3"
-#: recurrenceedit.cpp:1392
+#: recurrenceedit.cpp:1299
msgid "4th"
msgstr "第4"
-#: recurrenceedit.cpp:1393
+#: recurrenceedit.cpp:1300
msgid "5th"
msgstr "第5"
-#: recurrenceedit.cpp:1394
+#: recurrenceedit.cpp:1301
msgid ""
"_: Last Monday in March\n"
"Last"
msgstr "最后一个"
-#: recurrenceedit.cpp:1395
+#: recurrenceedit.cpp:1302
msgid "2nd Last"
msgstr "倒数第二个"
-#: recurrenceedit.cpp:1396
+#: recurrenceedit.cpp:1303
msgid "3rd Last"
msgstr "倒数第三个"
-#: recurrenceedit.cpp:1397
+#: recurrenceedit.cpp:1304
msgid "4th Last"
msgstr "倒数第四个"
-#: recurrenceedit.cpp:1398
+#: recurrenceedit.cpp:1305
msgid "5th Last"
msgstr "倒数第五个"
-#: recurrenceedit.cpp:1401
+#: recurrenceedit.cpp:1308
msgid ""
"_: Every (Monday...) in month\n"
"Every"
msgstr "每个"
-#: recurrenceedit.cpp:1404
+#: recurrenceedit.cpp:1311
msgid "Select the week of the month in which to repeat the alarm"
msgstr "选择每月内进行重复提醒的星期"
-#: recurrenceedit.cpp:1417
+#: recurrenceedit.cpp:1324
msgid "Select the day of the week on which to repeat the alarm"
msgstr "选择每周内进行重复提醒的日子"
-#: recurrenceedit.cpp:1535
+#: recurrenceedit.cpp:1442
msgid "month(s)"
msgstr "月"
-#: recurrenceedit.cpp:1536
+#: recurrenceedit.cpp:1443
msgid "Enter the number of months between repetitions of the alarm"
msgstr "输入重复提醒之间的月数"
-#: recurrenceedit.cpp:1547
+#: recurrenceedit.cpp:1454
msgid "year(s)"
msgstr "年"
-#: recurrenceedit.cpp:1548
+#: recurrenceedit.cpp:1455
msgid "Enter the number of years between repetitions of the alarm"
msgstr "输入重复提醒之间的年数"
-#: recurrenceedit.cpp:1553
+#: recurrenceedit.cpp:1460
msgid ""
"_: List of months to select\n"
"Months:"
msgstr ""
-#: recurrenceedit.cpp:1572
+#: recurrenceedit.cpp:1479
msgid "Select the months of the year in which to repeat the alarm"
msgstr "选择一年中要重复提醒的月份"
-#: recurrenceedit.cpp:1579
+#: recurrenceedit.cpp:1486
msgid "February 2&9th alarm in non-leap years:"
msgstr "非闰年中二月二十九日的提醒(&9):"
-#: recurrenceedit.cpp:1582
+#: recurrenceedit.cpp:1489
msgid ""
"_: No date\n"
"None"
msgstr "无"
-#: recurrenceedit.cpp:1583
+#: recurrenceedit.cpp:1490
msgid ""
"_: 1st March (short form)\n"
"1 Mar"
msgstr "三月一日"
-#: recurrenceedit.cpp:1584
+#: recurrenceedit.cpp:1491
msgid ""
"_: 28th February (short form)\n"
"28 Feb"
msgstr "二月二十八日"
-#: recurrenceedit.cpp:1590
+#: recurrenceedit.cpp:1497
msgid ""
"Select which date, if any, the February 29th alarm should trigger in non-"
"leap years"
msgstr "在非闰年中应如何触发二月二十九日的提醒"
-#: recurrenceedit.cpp:1674
+#: recurrenceedit.cpp:1581
msgid "No month selected"
msgstr "没有选中的月"
diff --git a/tde-i18n-zh_CN/messages/tdeutils/ark.po b/tde-i18n-zh_CN/messages/tdeutils/ark.po
index ef001e2a122..1652380df18 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/ark.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/ark.po
@@ -12,7 +12,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2019-01-13 18:51+0100\n"
+"POT-Creation-Date: 2019-01-23 23:20+0100\n"
"PO-Revision-Date: 2005-08-04 03:45+0800\n"
"Last-Translator: Funda Wang <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -35,11 +35,11 @@ msgstr "[email protected]"
#: ace.cpp:104 ace.cpp:170 ar.cpp:102 ar.cpp:121 ar.cpp:165 ar.cpp:222
#: ar.cpp:255 arj.cpp:134 arj.cpp:202 arj.cpp:258 arj.cpp:294 arj.cpp:322
-#: compressedfile.cpp:221 compressedfile.cpp:332 lha.cpp:158 lha.cpp:228
+#: compressedfile.cpp:214 compressedfile.cpp:325 lha.cpp:158 lha.cpp:228
#: lha.cpp:269 lha.cpp:299 rar.cpp:223 rar.cpp:309 rar.cpp:366 rar.cpp:402
#: rar.cpp:430 sevenzip.cpp:114 sevenzip.cpp:162 sevenzip.cpp:207
-#: sevenzip.cpp:261 sevenzip.cpp:417 tar.cpp:281 tar.cpp:575 tar.cpp:654
-#: tar.cpp:698 tar.cpp:818 zip.cpp:106 zip.cpp:184 zip.cpp:243 zip.cpp:280
+#: sevenzip.cpp:261 sevenzip.cpp:417 tar.cpp:277 tar.cpp:568 tar.cpp:647
+#: tar.cpp:691 tar.cpp:813 zip.cpp:106 zip.cpp:184 zip.cpp:243 zip.cpp:280
#: zip.cpp:308 zoo.cpp:122 zoo.cpp:189 zoo.cpp:248 zoo.cpp:279
msgid "Could not start a subprocess."
msgstr "无法启动子进程。"
@@ -102,15 +102,15 @@ msgstr ""
"Ark 检测到了格式:%1\n"
"如果此格式不正确,请选择适当的格式。"
-#: archiveformatinfo.cpp:73
+#: archiveformatinfo.cpp:71
msgid "Compressed File"
msgstr "压缩文件"
-#: archiveformatinfo.cpp:118
+#: archiveformatinfo.cpp:116
msgid "All Valid Archives\n"
msgstr "全部存档文件\n"
-#: archiveformatinfo.cpp:119
+#: archiveformatinfo.cpp:117
msgid "All Files"
msgstr "全部文件"
@@ -692,7 +692,7 @@ msgstr ""
msgid "Simple Compressed Archive"
msgstr "简单压缩的存档文件"
-#: compressedfile.cpp:347 tar.cpp:169 tar.cpp:185
+#: compressedfile.cpp:340 tar.cpp:169 tar.cpp:185
msgid "Trouble writing to the archive..."
msgstr "保存到存档文件时出错..."
@@ -887,11 +887,11 @@ msgstr ""
"重置搜索\n"
"重置搜索栏,这样就会显示全部存档项。"
-#: tar.cpp:420
+#: tar.cpp:413
msgid "Unable to fork a decompressor"
msgstr "无法启动一个解压缩器"
-#: tar.cpp:447
+#: tar.cpp:440
msgid "Trouble writing to the tempfile..."
msgstr "写入临时文件时出错..."
diff --git a/tde-i18n-zh_CN/messages/tdeutils/kgpg.po b/tde-i18n-zh_CN/messages/tdeutils/kgpg.po
index a8b604c3ca9..d97996532af 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/kgpg.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/kgpg.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: kgpg\n"
-"POT-Creation-Date: 2019-01-13 18:51+0100\n"
+"POT-Creation-Date: 2019-01-23 23:21+0100\n"
"PO-Revision-Date: 2005-08-04 04:22+0800\n"
"Last-Translator: Funda Wang <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -226,98 +226,98 @@ msgstr ""
msgid "Public Key"
msgstr "公钥"
-#: keyservers.cpp:789 kgpginterface.cpp:1578
+#: keyservers.cpp:789 kgpginterface.cpp:1577
#, c-format
msgid ""
"_n: <qt>%n key processed.<br></qt>\n"
"<qt>%n keys processed.<br></qt>"
msgstr ""
-#: keyservers.cpp:791 kgpginterface.cpp:1580
+#: keyservers.cpp:791 kgpginterface.cpp:1579
#, c-format
msgid ""
"_n: <qt>One key unchanged.<br></qt>\n"
"<qt>%n keys unchanged.<br></qt>"
msgstr ""
-#: keyservers.cpp:793 kgpginterface.cpp:1582
+#: keyservers.cpp:793 kgpginterface.cpp:1581
#, c-format
msgid ""
"_n: <qt>One signature imported.<br></qt>\n"
"<qt>%n signatures imported.<br></qt>"
msgstr ""
-#: keyservers.cpp:795 kgpginterface.cpp:1584
+#: keyservers.cpp:795 kgpginterface.cpp:1583
#, c-format
msgid ""
"_n: <qt>One key without ID.<br></qt>\n"
"<qt>%n keys without ID.<br></qt>"
msgstr ""
-#: keyservers.cpp:797 kgpginterface.cpp:1586
+#: keyservers.cpp:797 kgpginterface.cpp:1585
#, c-format
msgid ""
"_n: <qt>One RSA key imported.<br></qt>\n"
"<qt>%n RSA keys imported.<br></qt>"
msgstr ""
-#: keyservers.cpp:799 kgpginterface.cpp:1588
+#: keyservers.cpp:799 kgpginterface.cpp:1587
#, c-format
msgid ""
"_n: <qt>One user ID imported.<br></qt>\n"
"<qt>%n user IDs imported.<br></qt>"
msgstr ""
-#: keyservers.cpp:801 kgpginterface.cpp:1590
+#: keyservers.cpp:801 kgpginterface.cpp:1589
#, c-format
msgid ""
"_n: <qt>One subkey imported.<br></qt>\n"
"<qt>%n subkeys imported.<br></qt>"
msgstr ""
-#: keyservers.cpp:803 kgpginterface.cpp:1592
+#: keyservers.cpp:803 kgpginterface.cpp:1591
#, c-format
msgid ""
"_n: <qt>One revocation certificate imported.<br></qt>\n"
"<qt>%n revocation certificates imported.<br></qt>"
msgstr ""
-#: keyservers.cpp:805 kgpginterface.cpp:1595
+#: keyservers.cpp:805 kgpginterface.cpp:1594
#, c-format
msgid ""
"_n: <qt>One secret key processed.<br></qt>\n"
"<qt>%n secret keys processed.<br></qt>"
msgstr ""
-#: keyservers.cpp:807 kgpginterface.cpp:1599
+#: keyservers.cpp:807 kgpginterface.cpp:1598
#, c-format
msgid ""
"_n: <qt><b>One secret key imported.</b><br></qt>\n"
"<qt><b>%n secret keys imported.</b><br></qt>"
msgstr ""
-#: keyservers.cpp:809 kgpginterface.cpp:1601
+#: keyservers.cpp:809 kgpginterface.cpp:1600
#, c-format
msgid ""
"_n: <qt>One secret key unchanged.<br></qt>\n"
"<qt>%n secret keys unchanged.<br></qt>"
msgstr ""
-#: keyservers.cpp:811 kgpginterface.cpp:1603
+#: keyservers.cpp:811 kgpginterface.cpp:1602
#, c-format
msgid ""
"_n: <qt>One secret key not imported.<br></qt>\n"
"<qt>%n secret keys not imported.<br></qt>"
msgstr ""
-#: keyservers.cpp:813 kgpginterface.cpp:1605
+#: keyservers.cpp:813 kgpginterface.cpp:1604
#, c-format
msgid ""
"_n: <qt><b>One key imported:</b><br></qt>\n"
"<qt><b>%n keys imported:</b><br></qt>"
msgstr ""
-#: keyservers.cpp:816 kgpginterface.cpp:1611
+#: keyservers.cpp:816 kgpginterface.cpp:1610
msgid ""
"No key imported... \n"
"Check detailed log for more infos"
@@ -618,8 +618,8 @@ msgstr " 或者 "
msgid "Enter passphrase for your file (symmetrical encryption):"
msgstr "为您的文件输入密码句(对称加密):"
-#: kgpginterface.cpp:227 kgpginterface.cpp:411 kgpginterface.cpp:530
-#: kgpginterface.cpp:779 kgpginterface.cpp:1438
+#: kgpginterface.cpp:227 kgpginterface.cpp:411 kgpginterface.cpp:529
+#: kgpginterface.cpp:778 kgpginterface.cpp:1437
msgid "[No user id found]"
msgstr "[未找到用户 ID]"
@@ -627,12 +627,12 @@ msgstr "[未找到用户 ID]"
msgid "<b>No user id found</b>. Trying all secret keys.<br>"
msgstr "<b>未找到用户 ID</b>。正在尝试所有私钥。<br>"
-#: kgpginterface.cpp:234 kgpginterface.cpp:417 kgpginterface.cpp:534
+#: kgpginterface.cpp:234 kgpginterface.cpp:417 kgpginterface.cpp:533
msgid "<b>Bad passphrase</b>. You have %1 tries left.<br>"
msgstr "<b>无效的密码句</b>。您还剩下 %1 次重试机会。<br>"
-#: kgpginterface.cpp:236 kgpginterface.cpp:418 kgpginterface.cpp:535
-#: kgpginterface.cpp:784
+#: kgpginterface.cpp:236 kgpginterface.cpp:418 kgpginterface.cpp:534
+#: kgpginterface.cpp:783
msgid "Enter passphrase for <b>%1</b>"
msgstr "请输入 <b>%1</b> 的密码句"
@@ -644,19 +644,19 @@ msgstr "输入密码句(对称加密)"
msgid "Bad MDC detected. The encrypted text has been manipulated."
msgstr ""
-#: kgpginterface.cpp:608 kgpginterface.cpp:638 kgpginterface.cpp:841
-#: kgpginterface.cpp:868
+#: kgpginterface.cpp:607 kgpginterface.cpp:637 kgpginterface.cpp:840
+#: kgpginterface.cpp:867
msgid "No signature found."
msgstr "未找到签名。"
-#: kgpginterface.cpp:626 kgpginterface.cpp:844
+#: kgpginterface.cpp:625 kgpginterface.cpp:843
#, fuzzy
msgid "<qt>Good signature from:<br><b>%1</b><br>Key ID: %2</qt>"
msgstr ""
"来自 %1 的有效签名\n"
"密钥 ID:%2"
-#: kgpginterface.cpp:630
+#: kgpginterface.cpp:629
#, fuzzy
msgid ""
"<qt><b>Bad signature</b> from:<br>%1<br>Key ID: %2<br><br><b>Text is "
@@ -667,55 +667,55 @@ msgstr ""
"\n"
"该文件已损坏!"
-#: kgpginterface.cpp:640 kgpginterface.cpp:857
+#: kgpginterface.cpp:639 kgpginterface.cpp:856
msgid "The signature is valid, but the key is untrusted"
msgstr ""
-#: kgpginterface.cpp:642 kgpginterface.cpp:859
+#: kgpginterface.cpp:641 kgpginterface.cpp:858
msgid "The signature is valid, and the key is ultimately trusted"
msgstr ""
-#: kgpginterface.cpp:649
+#: kgpginterface.cpp:648
msgid "MD5 Checksum"
msgstr "MD5 校验和"
-#: kgpginterface.cpp:652
+#: kgpginterface.cpp:651
msgid "Compare MD5 with Clipboard"
msgstr "和剪贴板比较 MD5"
-#: kgpginterface.cpp:667
+#: kgpginterface.cpp:666
msgid "MD5 sum for <b>%1</b> is:"
msgstr "<b>%1</b> 的 MD5 校验和是:"
-#: kgpginterface.cpp:684
+#: kgpginterface.cpp:683
msgid "<b>Unknown status</b>"
msgstr "<b>未知状态</b>"
-#: kgpginterface.cpp:713
+#: kgpginterface.cpp:712
msgid "<b>Correct checksum</b>, file is ok."
msgstr "<b>校验和正确</b>,文件是好的。"
-#: kgpginterface.cpp:718
+#: kgpginterface.cpp:717
msgid "Clipboard content is not a MD5 sum."
msgstr "剪贴板内容不是 MD5 校验和。"
-#: kgpginterface.cpp:720
+#: kgpginterface.cpp:719
msgid "<b>Wrong checksum, FILE CORRUPTED</b>"
msgstr "<b>错误的校验和,文件已损坏</b>"
-#: kgpginterface.cpp:757
+#: kgpginterface.cpp:756
msgid "The signature file %1 was successfully created."
msgstr "签名文件 %1 已成功创建。"
-#: kgpginterface.cpp:759
+#: kgpginterface.cpp:758
msgid "Bad passphrase, signature was not created."
msgstr "无效的密码句,未创建签名。"
-#: kgpginterface.cpp:783
+#: kgpginterface.cpp:782
msgid "<b>Bad passphrase</b>. you have %1 tries left.<br>"
msgstr "<b>无效的密码句</b>。您还剩下 %1 次重试机会。<br>"
-#: kgpginterface.cpp:848
+#: kgpginterface.cpp:847
#, fuzzy
msgid ""
"<qt><b>BAD signature</b> from:<br> %1<br>Key id: %2<br><br><b>The file is "
@@ -726,33 +726,33 @@ msgstr ""
"\n"
"该文件已损坏!"
-#: kgpginterface.cpp:872 kgpgview.cpp:241
+#: kgpginterface.cpp:871 kgpgview.cpp:241
msgid ""
"<qt><b>Missing signature:</b><br>Key id: %1<br><br>Do you want to import "
"this key from a keyserver?</qt>"
msgstr ""
-#: kgpginterface.cpp:873 kgpgview.cpp:242 listkeys.cpp:474
+#: kgpginterface.cpp:872 kgpgview.cpp:242 listkeys.cpp:474
msgid "Do Not Import"
msgstr "不导入"
-#: kgpginterface.cpp:965 kgpginterface.cpp:1046
+#: kgpginterface.cpp:964 kgpginterface.cpp:1045
#, fuzzy
msgid "<qt>%1 Enter passphrase for <b>%2</b>:</qt>"
msgstr "请输入 <b>%1</b> 的密码句"
-#: kgpginterface.cpp:988 kgpginterface.cpp:1067
+#: kgpginterface.cpp:987 kgpginterface.cpp:1066
#, fuzzy
msgid "<b>Bad passphrase</b>. Try again.</br>"
msgstr "无效的密码句,请重试。"
-#: kgpginterface.cpp:1091
+#: kgpginterface.cpp:1090
msgid ""
"<qt>Signing key <b>%1</b> with key <b>%2</b> failed.<br>Do you want to try "
"signing the key in console mode?</qt>"
msgstr ""
-#: kgpginterface.cpp:1125
+#: kgpginterface.cpp:1124
msgid ""
"This key has more than one user ID.\n"
"Edit the key manually to delete signature."
@@ -760,34 +760,34 @@ msgstr ""
"这个密钥含有多个用户 ID。\n"
"请手工编辑该密钥来删除签名。"
-#: kgpginterface.cpp:1274 kgpginterface.cpp:1694 kgpginterface.cpp:1824
-#: kgpginterface.cpp:1902 kgpginterface.cpp:1996
+#: kgpginterface.cpp:1273 kgpginterface.cpp:1693 kgpginterface.cpp:1823
+#: kgpginterface.cpp:1901 kgpginterface.cpp:1995
#, fuzzy
msgid "<qt>Enter passphrase for <b>%1</b>:</qt>"
msgstr "请输入 <b>%1</b> 的密码句:"
-#: kgpginterface.cpp:1318
+#: kgpginterface.cpp:1317
msgid ""
"<qt><b>Changing expiration failed.</b><br>Do you want to try changing the "
"key expiration in console mode?</qt>"
msgstr ""
-#: kgpginterface.cpp:1433
+#: kgpginterface.cpp:1432
msgid "<b>Bad passphrase</b>. Try again<br>"
msgstr "<b>无效的密码句</b>。请重试<br>"
-#: kgpginterface.cpp:1443
+#: kgpginterface.cpp:1442
#, fuzzy
msgid "<qt>%1 Enter passphrase for <b>%2</b></qt>"
msgstr "请输入 <b>%1</b> 的密码句"
-#: kgpginterface.cpp:1458
+#: kgpginterface.cpp:1457
msgid ""
"<qt>Enter new passphrase for <b>%1</b><br>If you forget this passphrase, all "
"your encrypted files and messages will be lost !<br></qt>"
msgstr ""
-#: kgpginterface.cpp:1607
+#: kgpginterface.cpp:1606
msgid ""
"<qt><br><b>You have imported a secret key.</b> <br>Please note that imported "
"secret keys are not trusted by default.<br>To fully use this secret key for "
@@ -795,19 +795,19 @@ msgid ""
"its trust to Full or Ultimate.</qt>"
msgstr ""
-#: kgpginterface.cpp:1889
+#: kgpginterface.cpp:1888
msgid "This image is very large. Use it anyway?"
msgstr ""
-#: kgpginterface.cpp:1889
+#: kgpginterface.cpp:1888
msgid "Use Anyway"
msgstr ""
-#: kgpginterface.cpp:1889
+#: kgpginterface.cpp:1888
msgid "Do Not Use"
msgstr ""
-#: kgpginterface.cpp:1955
+#: kgpginterface.cpp:1954
msgid "Creation of the revocation certificate failed..."
msgstr ""
@@ -1516,7 +1516,7 @@ msgstr ""
#, fuzzy
msgid ""
"This passphrase is not secure enough.\n"
-"Minimum length = 5 characters"
+"Minimum length= 5 characters"
msgstr ""
"这个密码句不够安全。\n"
"最小长度为 5 字符"
diff --git a/tde-i18n-zh_CN/messages/tdevelop/tdevelop.po b/tde-i18n-zh_CN/messages/tdevelop/tdevelop.po
index d8d02d27efe..a62fbeba90c 100644
--- a/tde-i18n-zh_CN/messages/tdevelop/tdevelop.po
+++ b/tde-i18n-zh_CN/messages/tdevelop/tdevelop.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: tdevelop\n"
-"POT-Creation-Date: 2019-01-13 19:02+0100\n"
+"POT-Creation-Date: 2019-01-23 23:31+0100\n"
"PO-Revision-Date: 2007-10-06 21:38+0000\n"
"Last-Translator: 杜比 <[email protected]>\n"
"Language-Team: <[email protected]>\n"
diff --git a/tde-i18n-zh_CN/messages/tdewebdev/tdefilereplace.po b/tde-i18n-zh_CN/messages/tdewebdev/tdefilereplace.po
index d4dccb38a5d..d0f2803a10c 100644
--- a/tde-i18n-zh_CN/messages/tdewebdev/tdefilereplace.po
+++ b/tde-i18n-zh_CN/messages/tdewebdev/tdefilereplace.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
-"POT-Creation-Date: 2019-01-13 18:52+0100\n"
+"POT-Creation-Date: 2019-01-23 23:34+0100\n"
"PO-Revision-Date: 2005-12-05 21:08+0800\n"
"Last-Translator: Dick Zhang <[email protected]>\n"
"Language-Team: zh_CN <[email protected]>\n"
@@ -27,11 +27,11 @@ msgid ""
"Your emails"
-#: configurationclasses.cpp:175
+#: configurationclasses.cpp:168
msgid " Line:%3,Col:%4 - \"%1\" -> \"%2\""
msgstr "行:%3,列:%4 -“%1”->“%2”"
-#: knewprojectdlg.cpp:99
+#: knewprojectdlg.cpp:97
msgid "Project Directory"
msgstr "项目目录"
@@ -60,7 +60,7 @@ msgstr "初始文件夹"
msgid "TDEFileReplace"
msgstr "KFileReplace"
-#: main.cpp:38 tdefilereplacepart.cpp:527
+#: main.cpp:38 tdefilereplacepart.cpp:525
#, fuzzy
msgid "Part of the KDEWebDev module."
msgstr "TDEWebDev 模块的部件。"
@@ -69,11 +69,11 @@ msgstr "TDEWebDev 模块的部件。"
msgid "Shell author, KPart creator, co-maintainer"
msgstr "Shell 作者、KPart 创建者、联合维护者"
-#: main.cpp:42 tdefilereplacepart.cpp:532
+#: main.cpp:42 tdefilereplacepart.cpp:530
msgid "Current maintainer, code cleaner and rewriter"
msgstr "当前维护者,代码清理和重写"
-#: main.cpp:44 tdefilereplacepart.cpp:529
+#: main.cpp:44 tdefilereplacepart.cpp:527
#, fuzzy
msgid "Original author of the TDEFileReplace tool"
msgstr "KFileReplace 工具的最初作者"
@@ -116,7 +116,7 @@ msgstr "搜索"
msgid "Results Table"
msgstr "结果表"
-#: knewprojectdlgs.ui:522 knewprojectdlgs.ui:603 report.cpp:114
+#: knewprojectdlgs.ui:429 knewprojectdlgs.ui:510 report.cpp:114
#: tdefilereplaceviewwdg.ui:58 tdefilereplaceviewwdg.ui:181
#, no-c-format
msgid "Name"
@@ -249,240 +249,240 @@ msgstr "正在替换文件..."
msgid "Replaced strings"
msgstr "替换的字符串"
-#: tdefilereplacepart.cpp:242
+#: tdefilereplacepart.cpp:241
msgid "Stopping..."
msgstr "正在停止..."
-#: tdefilereplacepart.cpp:256
+#: tdefilereplacepart.cpp:255
msgid "There are no results to save: the result list is empty."
msgstr "没有结果可以保存:结果为空。"
-#: tdefilereplacepart.cpp:260
+#: tdefilereplacepart.cpp:259
msgid "Save Report"
msgstr "保存结果"
-#: tdefilereplacepart.cpp:270
+#: tdefilereplacepart.cpp:269
msgid "<qt>A folder or a file named <b>%1</b> already exists.</qt>"
msgstr "<qt>名为 <b>%1</b> 的文件夹或文件已经存在。</qt>"
-#: tdefilereplacepart.cpp:278
+#: tdefilereplacepart.cpp:277
msgid "<qt>Cannot create the <b>%1</b> folder.</qt>"
msgstr "<qt>无法创建 <b>%1</b> 文件夹。</qt>"
-#: tdefilereplacepart.cpp:357
+#: tdefilereplacepart.cpp:355
#, fuzzy
msgid "TDEFileReplace strings"
msgstr "KFileReplace 字符串"
-#: tdefilereplacepart.cpp:357 tdefilereplaceview.cpp:472
+#: tdefilereplacepart.cpp:355 tdefilereplaceview.cpp:425
msgid "All Files"
msgstr "全部文件"
-#: tdefilereplacepart.cpp:358
+#: tdefilereplacepart.cpp:356
msgid "Load Strings From File"
msgstr "从文件载入字符串"
-#: tdefilereplacepart.cpp:391
+#: tdefilereplacepart.cpp:389
msgid "Cannot open folders."
msgstr "无法打开文件夹。"
-#: tdefilereplacepart.cpp:523
+#: tdefilereplacepart.cpp:521
#, fuzzy
msgid "TDEFileReplacePart"
msgstr "KFileReplacePart"
-#: tdefilereplacepart.cpp:525
+#: tdefilereplacepart.cpp:523
msgid "Batch search and replace tool."
msgstr "批量搜索替换工具。"
-#: tdefilereplacepart.cpp:535
+#: tdefilereplacepart.cpp:533
msgid "Co-maintainer, KPart creator"
msgstr "联合维护者,KPart 创建者"
-#: tdefilereplacepart.cpp:538
+#: tdefilereplacepart.cpp:536
msgid "Original german translator"
msgstr "德语原翻译者"
-#: tdefilereplacepart.cpp:548
+#: tdefilereplacepart.cpp:546
#, fuzzy
msgid "Sorry, currently the TDEFileReplace part works only for local files."
msgstr "抱歉,KFileReplace 部件只能在本地文件上工作。"
-#: tdefilereplacepart.cpp:548
+#: tdefilereplacepart.cpp:546
msgid "Non Local File"
msgstr "非本地文件"
-#: tdefilereplacepart.cpp:580
+#: tdefilereplacepart.cpp:578
msgid "Customize Search/Replace Session..."
msgstr "自定义搜索/替换会话..."
-#: tdefilereplacepart.cpp:581
+#: tdefilereplacepart.cpp:579
msgid "&Search"
msgstr "搜索(&S)"
-#: tdefilereplacepart.cpp:582
+#: tdefilereplacepart.cpp:580
msgid "S&imulate"
msgstr "模拟(&I)"
-#: tdefilereplacepart.cpp:583
+#: tdefilereplacepart.cpp:581
msgid "&Replace"
msgstr "替换(&R)"
-#: tdefilereplacepart.cpp:584
+#: tdefilereplacepart.cpp:582
msgid "Sto&p"
msgstr "停止(&P)"
-#: tdefilereplacepart.cpp:585
+#: tdefilereplacepart.cpp:583
msgid "Cre&ate Report File..."
msgstr "创建报告文件(&A)..."
-#: tdefilereplacepart.cpp:588
+#: tdefilereplacepart.cpp:586
msgid "&Add String..."
msgstr "添加字符串(&A)..."
-#: tdefilereplacepart.cpp:590
+#: tdefilereplacepart.cpp:588
msgid "&Delete String"
msgstr "删除字符串(&D)"
-#: tdefilereplacepart.cpp:591
+#: tdefilereplacepart.cpp:589
msgid "&Empty Strings List"
msgstr "清空字符串列表(&E)"
-#: tdefilereplacepart.cpp:592
+#: tdefilereplacepart.cpp:590
msgid "Edit Selected String..."
msgstr "编辑选中的字符串..."
-#: tdefilereplacepart.cpp:593
+#: tdefilereplacepart.cpp:591
msgid "&Save Strings List to File..."
msgstr "字符串列表保存到文件(&S)..."
-#: tdefilereplacepart.cpp:594
+#: tdefilereplacepart.cpp:592
msgid "&Load Strings List From File..."
msgstr "从文件载入字符串列表(&L)..."
-#: tdefilereplacepart.cpp:595
+#: tdefilereplacepart.cpp:593
msgid "&Load Recent Strings Files"
msgstr "载入最近使用的字符串文件(&L)"
-#: tdefilereplacepart.cpp:596
+#: tdefilereplacepart.cpp:594
msgid "&Invert Current String (search <--> replace)"
msgstr "对调当前字符串(搜索<-->替换)(&I)"
-#: tdefilereplacepart.cpp:597
+#: tdefilereplacepart.cpp:595
msgid "&Invert All Strings (search <--> replace)"
msgstr "对调所有字符串(搜索<-->替换)(&I)"
-#: tdefilereplacepart.cpp:600
+#: tdefilereplacepart.cpp:598
msgid "&Include Sub-Folders"
msgstr "包含子文件夹(&I)"
-#: tdefilereplacepart.cpp:601
+#: tdefilereplacepart.cpp:599
msgid "Create &Backup Files"
msgstr "创建备份文件(&B)"
-#: tdefilereplacepart.cpp:602
+#: tdefilereplacepart.cpp:600
msgid "Case &Sensitive"
msgstr "区分大小写(&S)"
-#: tdefilereplacepart.cpp:603
+#: tdefilereplacepart.cpp:601
msgid "Enable Commands &in Replace String: [$command:option$]"
msgstr "替换字符串中使用命令(&I):[$命令:选项$]"
-#: tdefilereplacepart.cpp:604
+#: tdefilereplacepart.cpp:602
msgid "Enable &Regular Expressions"
msgstr "启用正则表达式(&R)"
-#: tdefilereplacepart.cpp:605
+#: tdefilereplacepart.cpp:603
#, fuzzy
msgid "Configure &TDEFileReplace..."
msgstr "配置 &KFileReplace..."
-#: tdefilereplacepart.cpp:608 tdefilereplaceview.cpp:577
+#: tdefilereplacepart.cpp:606 tdefilereplaceview.cpp:530
msgid "&Properties"
msgstr "属性(&P)"
-#: tdefilereplacepart.cpp:609 tdefilereplaceview.cpp:549
+#: tdefilereplacepart.cpp:607 tdefilereplaceview.cpp:502
msgid "&Open"
msgstr "打开(&O)"
-#: tdefilereplacepart.cpp:613 tdefilereplaceview.cpp:562
+#: tdefilereplacepart.cpp:611 tdefilereplaceview.cpp:515
msgid "&Edit in Quanta"
msgstr "在 Quanta 中编辑(&E)"
-#: tdefilereplacepart.cpp:615 tdefilereplaceview.cpp:568
+#: tdefilereplacepart.cpp:613 tdefilereplaceview.cpp:521
msgid "Open Parent &Folder"
msgstr "打开父文件夹(&F)"
-#: tdefilereplacepart.cpp:617
+#: tdefilereplacepart.cpp:615
msgid "E&xpand Tree"
msgstr "展开树(&X)"
-#: tdefilereplacepart.cpp:618
+#: tdefilereplacepart.cpp:616
msgid "&Reduce Tree"
msgstr "缩小树(&R)"
-#: tdefilereplacepart.cpp:619
+#: tdefilereplacepart.cpp:617
#, fuzzy
msgid "&About TDEFileReplace"
msgstr "关于 KFileReplace(&A)"
-#: tdefilereplacepart.cpp:620
+#: tdefilereplacepart.cpp:618
#, fuzzy
msgid "TDEFileReplace &Handbook"
msgstr "KFileReplace 手册(&H)"
-#: tdefilereplacepart.cpp:621
+#: tdefilereplacepart.cpp:619
msgid "&Report Bug"
msgstr "报告错误(&R)"
-#: tdefilereplacepart.cpp:998
+#: tdefilereplacepart.cpp:983
msgid ""
"It seems you have a circular reference in your file system.The search has "
"been limited to this sublevel to preventTDEFileReplace from crashing."
msgstr ""
-#: tdefilereplacepart.cpp:1001 tdefilereplacepart.cpp:1338
+#: tdefilereplacepart.cpp:986 tdefilereplacepart.cpp:1317
msgid "Circular reference detected"
msgstr ""
-#: tdefilereplacepart.cpp:1065 tdefilereplacepart.cpp:1153
-#: tdefilereplacepart.cpp:1395
+#: tdefilereplacepart.cpp:1046 tdefilereplacepart.cpp:1134
+#: tdefilereplacepart.cpp:1369
msgid "<qt>Cannot open file <b>%1</b> for reading.</qt>"
msgstr "<qt>无法打开文件 <b>%1</b> 读取。</qt>"
-#: tdefilereplacepart.cpp:1104 tdefilereplacepart.cpp:1182
+#: tdefilereplacepart.cpp:1085 tdefilereplacepart.cpp:1163
msgid "<qt>Cannot open file <b>%1</b> for writing.</qt>"
msgstr "<qt>无法打开文件 <b>%1</b> 写入。</qt>"
-#: tdefilereplacepart.cpp:1239
+#: tdefilereplacepart.cpp:1220
msgid ""
"<qt>Do you want to replace the string <b>%1</b> with the string <b>%2</b>?</"
"qt>"
msgstr "<qt>您是否想要将 <b>%1</b> 替换为 <b>%2</b>?</qt>"
-#: tdefilereplacepart.cpp:1240
+#: tdefilereplacepart.cpp:1221
msgid "Confirm Replace"
msgstr "确认替换"
-#: tdefilereplacepart.cpp:1242
+#: tdefilereplacepart.cpp:1223
msgid "Do Not Replace"
msgstr "不替换"
-#: tdefilereplacepart.cpp:1335
+#: tdefilereplacepart.cpp:1314
msgid ""
"It seems you have a circular reference in your file system. The search has "
"been limited to this sublevel to prevent TDEFileReplace from crashing."
msgstr ""
-#: tdefilereplacepart.cpp:1466 tdefilereplacepart.cpp:1506
+#: tdefilereplacepart.cpp:1440 tdefilereplacepart.cpp:1480
msgid " Line:%2, Col:%3 - \"%1\""
msgstr " 行:%2,列:%3 -“%1”"
-#: tdefilereplacepart.cpp:1572
+#: tdefilereplacepart.cpp:1546
msgid "<qt>Cannot open the file <b>%1</b> and load the string list.</qt>"
msgstr "<qt>无法打开文件 <b>%1</b> 并载入字符串列表。</qt>"
-#: tdefilereplacepart.cpp:1580
+#: tdefilereplacepart.cpp:1554
msgid ""
"<qt>File <b>%1</b> seems not to be written in new kfr format. Remember that "
"the old kfr format will be soon abandoned. You can convert your old rules "
@@ -491,7 +491,7 @@ msgstr ""
"<qt>文件 <b>%1</b> 好像不是以新的 kfr 格式写入的。请记住,旧的 kfr 格式即将被"
"抛弃。您应该用 tdefilereplace 重新保存旧的规则文件来转换您的旧规则文件。</qt>"
-#: tdefilereplacepart.cpp:1600
+#: tdefilereplacepart.cpp:1574
msgid ""
"<qt>The format of kfr files has been changed; attempting to load <b>%1</b>. "
"Please see the KFilereplace manual for details. Do you want to load a search-"
@@ -500,58 +500,58 @@ msgstr ""
"<qt>kfr 文件的格式已经更改;正在试图装入 <b>%1</b>。详情请看 KFilereplace 的"
"手册。您是否想要装入搜索替换的字符串列表?</qt>"
-#: tdefilereplacepart.cpp:1600
+#: tdefilereplacepart.cpp:1574
msgid "Load"
msgstr "装入"
-#: tdefilereplacepart.cpp:1600
+#: tdefilereplacepart.cpp:1574
msgid "Do Not Load"
msgstr "不装入"
-#: tdefilereplacepart.cpp:1689
+#: tdefilereplacepart.cpp:1663
msgid "There are no strings to search and replace."
msgstr "没有要搜索和替换的字符串。"
-#: tdefilereplacepart.cpp:1702
+#: tdefilereplacepart.cpp:1676
msgid "<qt>The main folder of the project <b>%1</b> does not exist.</qt>"
msgstr "<qt>项目主文件夹 <b>%1</b> 不存在。</qt>"
-#: tdefilereplacepart.cpp:1710
+#: tdefilereplacepart.cpp:1684
msgid "<qt>Access denied in the main folder of the project:<br><b>%1</b></qt>"
msgstr "<qt>对项目主文件夹的访问被禁止:<br><b>%1</b></qt>"
-#: tdefilereplaceview.cpp:142
+#: tdefilereplaceview.cpp:120
msgid ""
"<qt>Cannot invert string <b>%1</b>, because the search string would be empty."
"</qt>"
msgstr "<qt>无法对调字符串 <b>%1</b>,因为那样搜索字符串会为空。</qt>"
-#: tdefilereplaceview.cpp:291
+#: tdefilereplaceview.cpp:259
msgid "File %1 cannot be opened. Might be a DCOP problem."
msgstr "无法打开文件 %1。可能是 DCOP 问题。"
-#: tdefilereplaceview.cpp:313
+#: tdefilereplaceview.cpp:281
msgid "Do you really want to delete %1?"
msgstr "您真的要删除 %1 吗?"
-#: tdefilereplaceview.cpp:448
+#: tdefilereplaceview.cpp:401
msgid "No strings to save as the list is empty."
msgstr "列表中没有字符串可以保存。"
-#: tdefilereplaceview.cpp:472
+#: tdefilereplaceview.cpp:425
#, fuzzy
msgid "TDEFileReplace Strings"
msgstr "KFileReplace 字符串"
-#: tdefilereplaceview.cpp:473
+#: tdefilereplaceview.cpp:426
msgid "Save Strings to File"
msgstr "保存字符串到文件"
-#: tdefilereplaceview.cpp:484
+#: tdefilereplaceview.cpp:437
msgid "File %1 cannot be saved."
msgstr "无法保存文件 %1。"
-#: tdefilereplaceview.cpp:554
+#: tdefilereplaceview.cpp:507
msgid "Open &With..."
msgstr "打开方式(&W)..."
@@ -592,122 +592,115 @@ msgstr ""
#: whatthis.h:42
msgid ""
-"Insert the maximum depth sublevel you want to search, or leave it unchecked "
-"if you don't want to limit the search. A level of 0 searches only the "
-"current level."
-msgstr ""
-
-#: whatthis.h:44
-msgid ""
"Insert the minimum value for file access date that you want to search, or "
"leave it unchecked if you don't a minimum limit."
msgstr ""
-#: whatthis.h:46
+#: whatthis.h:44
msgid ""
"Insert the maximum value for file access date that you want to search, or "
"leave it unchecked if you don't a maximum limit."
msgstr ""
-#: whatthis.h:48
+#: whatthis.h:46
msgid ""
"Select \"writing\" if you want to use the date of the last modification, "
"or \"reading\" to use the the date of the last access."
msgstr ""
-#: whatthis.h:50
+#: whatthis.h:48
msgid "Minimum value for access date."
msgstr ""
-#: whatthis.h:52
+#: whatthis.h:50
msgid "Maximum value for access date."
msgstr ""
-#: whatthis.h:54
+#: whatthis.h:52
#, fuzzy
msgid "Insert here the string to search for."
msgstr "没有要搜索和替换的字符串。"
-#: whatthis.h:56
+#: whatthis.h:54
#, fuzzy
msgid "Insert here the string to replace with."
msgstr "没有要搜索和替换的字符串。"
-#: whatthis.h:59
+#: whatthis.h:57
msgid "Enable this option if your search is case sensitive."
msgstr ""
-#: whatthis.h:61
+#: whatthis.h:59
msgid "Enable this option to search in sub folders too."
msgstr ""
-#: whatthis.h:63
+#: whatthis.h:61
msgid ""
"Enable this option when you are searching for a string and you are only "
"interested to know if the string is present or not in the current file."
msgstr ""
-#: whatthis.h:67
+#: whatthis.h:65
msgid ""
"If tdefilereplace encounters a symbolic link treats it like a normal folder "
"or file."
msgstr ""
-#: whatthis.h:69
+#: whatthis.h:67
#, fuzzy
msgid "Enable this option to ignore hidden files or folders."
msgstr "忽略隐藏的文件和文件夹"
-#: whatthis.h:71
+#: whatthis.h:69
msgid ""
"If this option is enabled, KFR will show even the names of the files in "
"which no string has been found or replaced."
msgstr ""
-#: whatthis.h:73
+#: whatthis.h:71
msgid ""
"Allows you to apply QT-like regular expressions on the search string. Note "
"that a complex regular expression could affect speed performance"
msgstr ""
-#: whatthis.h:75
+#: whatthis.h:73
msgid ""
"Enable \"commands\". For example: if search string is \"user\" and replace "
"string is the command \"[$user:uid$]\", KFR will substitute \"user\" with "
"the uid of the user."
msgstr ""
-#: whatthis.h:77
+#: whatthis.h:75
msgid "Enable this option if you want leave original files untouched."
msgstr ""
-#: whatthis.h:79
+#: whatthis.h:77
msgid ""
"Enable this option if you want to be asked for single string replacement "
"confirmation."
msgstr ""
-#: whatthis.h:82
+#: whatthis.h:80
msgid ""
"Enable this option to perform replacing as a simulation, i.e. without make "
"any changes in files."
msgstr ""
-#: whatthis.h:95
+#: whatthis.h:93
#, fuzzy
msgid "Select search-only mode."
msgstr "只搜索模式"
-#: whatthis.h:97
+#: whatthis.h:95
#, fuzzy
msgid "Select search-and-replace mode."
msgstr "搜索和替换模式"
-#: whatthis.h:99
+#: whatthis.h:97
msgid "Insert here a string you want search for."
msgstr ""
-#: whatthis.h:101
+#: whatthis.h:99
msgid "Insert here the string that KFR will use to replace the search string."
msgstr ""
@@ -792,152 +785,142 @@ msgstr "位置:"
msgid "Insert a search path here. You can use the search path button."
msgstr "在此插入搜索路径。您可以使用搜索路径按钮。"
-#: knewprojectdlgs.ui:263
+#: knewprojectdlgs.ui:262
#, no-c-format
msgid "&Include subfolders"
msgstr "包含子文件夹(&I)"
-#: knewprojectdlgs.ui:274
-#, no-c-format
-msgid "&Max depth"
-msgstr ""
-
-#: knewprojectdlgs.ui:316
+#: knewprojectdlgs.ui:275
#, no-c-format
msgid "Search/Replace Strings"
msgstr "搜索/替换字符串"
-#: knewprojectdlgs.ui:350 knewprojectdlgs.ui:381
-#, fuzzy, no-c-format
-msgid "Insert a search string here."
-msgstr "没有要搜索和替换的字符串。"
-
-#: knewprojectdlgs.ui:389
+#: knewprojectdlgs.ui:296
#, no-c-format
msgid "Search:"
msgstr "搜索:"
-#: knewprojectdlgs.ui:397
+#: knewprojectdlgs.ui:304
#, no-c-format
msgid "Replace:"
msgstr "替换:"
-#: knewprojectdlgs.ui:407 koptionsdlgs.ui:45
+#: knewprojectdlgs.ui:314 koptionsdlgs.ui:45
#, no-c-format
msgid "General Options"
msgstr "常规选项"
-#: knewprojectdlgs.ui:421
+#: knewprojectdlgs.ui:328
#, no-c-format
msgid "Enable &regular expressions"
msgstr "启用正则表达式(&R)"
-#: knewprojectdlgs.ui:429
+#: knewprojectdlgs.ui:336
#, no-c-format
msgid "Do &backup copy instead of overwrite"
msgstr "进行备份而不仅是覆盖(&B)"
-#: knewprojectdlgs.ui:437
+#: knewprojectdlgs.ui:344
#, no-c-format
msgid "&Case sensitive"
msgstr "区分大小写(&C)"
-#: knewprojectdlgs.ui:445
+#: knewprojectdlgs.ui:352
#, no-c-format
msgid "Enable co&mmands in the replace string"
msgstr "在替换字符串中使用命令(&M)"
-#: knewprojectdlgs.ui:453 koptionsdlgs.ui:67
+#: knewprojectdlgs.ui:360 koptionsdlgs.ui:67
#, no-c-format
msgid "Backup copy suffix:"
msgstr "备份后缀:"
-#: knewprojectdlgs.ui:482 koptionsdlgs.ui:132
+#: knewprojectdlgs.ui:389 koptionsdlgs.ui:132
#, no-c-format
msgid "Encoding of the files:"
msgstr "文件的编码:"
-#: knewprojectdlgs.ui:494 koptionsdlgs.ui:157
+#: knewprojectdlgs.ui:401 koptionsdlgs.ui:157
#, no-c-format
msgid "&Advanced"
msgstr "高级(&A)"
-#: knewprojectdlgs.ui:505
+#: knewprojectdlgs.ui:412
#, no-c-format
msgid "Ownership Filtering"
msgstr "拥有者过滤"
-#: knewprojectdlgs.ui:516
+#: knewprojectdlgs.ui:423
#, no-c-format
msgid "User: "
msgstr "用户:"
-#: knewprojectdlgs.ui:527 knewprojectdlgs.ui:608
+#: knewprojectdlgs.ui:434 knewprojectdlgs.ui:515
#, no-c-format
msgid "ID (Number)"
msgstr "ID(数字)"
-#: knewprojectdlgs.ui:549 knewprojectdlgs.ui:576
+#: knewprojectdlgs.ui:456 knewprojectdlgs.ui:483
#, no-c-format
msgid "Equals To"
msgstr "等于"
-#: knewprojectdlgs.ui:554 knewprojectdlgs.ui:581
+#: knewprojectdlgs.ui:461 knewprojectdlgs.ui:488
#, no-c-format
msgid "Is Not"
msgstr "不是"
-#: knewprojectdlgs.ui:632
+#: knewprojectdlgs.ui:539
#, no-c-format
msgid "Group:"
msgstr "组:"
-#: knewprojectdlgs.ui:658
+#: knewprojectdlgs.ui:565
#, no-c-format
msgid "Access Date Filtering"
msgstr "访问日期过滤器"
-#: knewprojectdlgs.ui:685
+#: knewprojectdlgs.ui:592
#, no-c-format
msgid "Dates valid for:"
msgstr "有效的日期:"
-#: knewprojectdlgs.ui:693
+#: knewprojectdlgs.ui:600
#, no-c-format
msgid "Accessed after:"
msgstr "访问时间晚于:"
-#: knewprojectdlgs.ui:701
+#: knewprojectdlgs.ui:608
#, no-c-format
msgid "Accessed before: "
msgstr "访问时间早于:"
-#: knewprojectdlgs.ui:717
+#: knewprojectdlgs.ui:624
#, no-c-format
msgid "Last Writing Access"
msgstr "上次写入访问"
-#: knewprojectdlgs.ui:722
+#: knewprojectdlgs.ui:629
#, no-c-format
msgid "Last Reading Access"
msgstr "上次读取访问"
-#: knewprojectdlgs.ui:830
+#: knewprojectdlgs.ui:737
#, no-c-format
msgid "Size Filtering"
msgstr "大小过滤器"
-#: knewprojectdlgs.ui:857
+#: knewprojectdlgs.ui:764
#, no-c-format
msgid "Minimum si&ze:"
msgstr "最小大小(&Z):"
-#: knewprojectdlgs.ui:865
+#: knewprojectdlgs.ui:772
#, no-c-format
msgid "Maximum size:"
msgstr "最大大小:"
-#: knewprojectdlgs.ui:915 knewprojectdlgs.ui:923
+#: knewprojectdlgs.ui:822 knewprojectdlgs.ui:830
#, no-c-format
msgid "KB"
msgstr "KB"
@@ -1069,13 +1052,16 @@ msgstr "红色代表正在扫描文件"
#: tdefilereplaceviewwdg.ui:513
#, fuzzy, no-c-format
-msgid "Scanned folders:"
+msgid "Scanned files:"
msgstr "扫描的文件:"
-#: tdefilereplaceviewwdg.ui:544
-#, fuzzy, no-c-format
-msgid "Files:"
-msgstr "全部文件"
+#, fuzzy
+#~ msgid "Insert a search string here."
+#~ msgstr "没有要搜索和替换的字符串。"
+
+#, fuzzy
+#~ msgid "Files:"
+#~ msgstr "全部文件"
#, fuzzy
#~ msgid "Files"