summaryrefslogtreecommitdiffstats
path: root/tde-i18n-zh_CN/messages/tdebase
diff options
context:
space:
mode:
Diffstat (limited to 'tde-i18n-zh_CN/messages/tdebase')
-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
17 files changed, 755 insertions, 944 deletions
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: 张忠立 <netwind2003@263.net>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -31,26 +31,11 @@ msgid ""
"Your emails"
msgstr "i18n-translation@lists.linux.net.cn"
-#: 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 <gouzhuang@bigfoot.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\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 <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\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 <gouzhuang@bigfoot.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\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 <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\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 <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\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 <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\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 <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\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 <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <18n-translation@lists.linux.net.cn>\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 <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -31,11 +31,11 @@ msgid ""
"Your emails"
msgstr "i18n-translation@lists.linux.net.cn"
-#: 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 <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\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 <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\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 <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\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 <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\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 <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\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 <yahzee@d3eye.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\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 <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\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>"