Automated l10n update (.po files)

530 files changed, 99622 insertions, 90514 deletions

diff --git a/tde-i18n-zh_CN/messages/tdeaccessibility/kbstateapplet.po b/tde-i18n-zh_CN/messages/tdeaccessibility/kbstateapplet.po
index 849c3dcca7d..8ddf1a5eafd 100644
--- a/tde-i18n-zh_CN/messages/tdeaccessibility/kbstateapplet.po
+++ b/tde-i18n-zh_CN/messages/tdeaccessibility/kbstateapplet.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kbstateapplet\n"
-"POT-Creation-Date: 2005-10-02 02:46+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-02-10 15:20+0000\n"
 "Last-Translator: Dong <x-dongzi@163.com>\n"
 "Language-Team:  <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaccessibility/kmag.po b/tde-i18n-zh_CN/messages/tdeaccessibility/kmag.po
index c5373a9cd32..92b1adb88a1 100644
--- a/tde-i18n-zh_CN/messages/tdeaccessibility/kmag.po
+++ b/tde-i18n-zh_CN/messages/tdeaccessibility/kmag.po
@@ -6,20 +6,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmag 3.5\n"
-"POT-Creation-Date: 2006-05-28 04:04+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-12-23 21:16+0800\n"
 "Last-Translator: Liu Songhe <jackliu9999@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kmagzoomview.cpp:159
-msgid ""
-"This is the main window which shows the contents of the selected region. The "
-"contents will be magnified according to the zoom level that is set."
-msgstr "这是将所选区域的内容显示出来的主窗口。内容会根据设定的缩放级别加以放大。"
-
 #: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -32,40 +27,14 @@ msgid ""
 "Your emails"
 msgstr "i18n-translation@lists.linux.net.cn"
 
-#: main.cpp:37
-msgid "File to open"
-msgstr "要打开的文件"
+#: kmagselrect.cpp:228
+msgid "Selection Window"
+msgstr "选择窗口"
 
 #: kmagselrect.cpp:228 main.cpp:45
 msgid "KMagnifier"
 msgstr "K 放大镜"
 
-#: main.cpp:46
-msgid "Screen magnifier for the Trinity Desktop Environment (TDE)"
-msgstr "K 桌面环境(TDE)的屏幕放大镜"
-
-#: main.cpp:53
-msgid "Rewrite and current maintainer"
-msgstr "重写及当前维护者"
-
-#: main.cpp:56
-msgid "Original idea and author (TDE1)"
-msgstr "原始创意和作者(TDE1)"
-
-#: main.cpp:58
-msgid ""
-"Rework of the user interface, improved selection window, speed optimisation, "
-"rotation, bug fixes"
-msgstr "改良了用户界面，改进了选择窗口，速度优化，旋转，错误修正"
-
-#: main.cpp:59
-msgid "Some tips"
-msgstr "一些技巧"
-
-#: kmagselrect.cpp:228
-msgid "Selection Window"
-msgstr "选择窗口"
-
 #: kmag.cpp:92
 msgid "&Very Low"
 msgstr "非常低(&V)"
@@ -392,3 +361,36 @@ msgstr "放大至屏幕右边缘 - 选择大小"
 #: kmag.cpp:685
 msgid "Magnify to Bottom Screen Edge - Select Size"
 msgstr "放大至屏幕下边缘 - 选择大小"
+
+#: kmagzoomview.cpp:159
+msgid ""
+"This is the main window which shows the contents of the selected region. The "
+"contents will be magnified according to the zoom level that is set."
+msgstr "这是将所选区域的内容显示出来的主窗口。内容会根据设定的缩放级别加以放大。"
+
+#: main.cpp:37
+msgid "File to open"
+msgstr "要打开的文件"
+
+#: main.cpp:46
+msgid "Screen magnifier for the Trinity Desktop Environment (TDE)"
+msgstr "K 桌面环境(TDE)的屏幕放大镜"
+
+#: main.cpp:53
+msgid "Rewrite and current maintainer"
+msgstr "重写及当前维护者"
+
+#: main.cpp:56
+#, fuzzy
+msgid "Original idea and author (KDE1)"
+msgstr "原始创意和作者(TDE1)"
+
+#: main.cpp:58
+msgid ""
+"Rework of the user interface, improved selection window, speed optimisation, "
+"rotation, bug fixes"
+msgstr "改良了用户界面，改进了选择窗口，速度优化，旋转，错误修正"
+
+#: main.cpp:59
+msgid "Some tips"
+msgstr "一些技巧"
diff --git a/tde-i18n-zh_CN/messages/tdeaccessibility/kmousetool.po b/tde-i18n-zh_CN/messages/tdeaccessibility/kmousetool.po
index a01e81891c4..e31bdebd567 100644
--- a/tde-i18n-zh_CN/messages/tdeaccessibility/kmousetool.po
+++ b/tde-i18n-zh_CN/messages/tdeaccessibility/kmousetool.po
@@ -6,64 +6,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmousetool\n"
-"POT-Creation-Date: 2005-02-17 01:26+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2003-12-21 02:20+0800\n"
 "Last-Translator: Liu Songhe <jackliu9999@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding:8bit\n"
 
-#: kmousetool.cpp:418
-msgid "The drag time must be less than or equal to the dwell time."
-msgstr "拖动时间必须小于或等于悬停时间"
-
-#: kmousetool.cpp:418
-msgid "Invalid Value"
-msgstr "无效数值"
-
-#: kmousetool.cpp:488 kmousetool.cpp:632
-msgid "&Stop"
-msgstr "停止(&S)"
-
-#: kmousetool.cpp:559
-msgid ""
-"There are unsaved changes in the active module.\n"
-"Do you want to apply the changes before closing the configuration window or "
-"discard the changes?"
-msgstr ""
-"在激活的模块里有尚未保存的更改。\n"
-"您希望在关闭配置窗口之前应用或者放弃这些更改吗？"
-
-#: kmousetool.cpp:560
-msgid "Closing Configuration Window"
-msgstr "正在关闭配置窗口"
-
-#: kmousetool.cpp:578
-msgid ""
-"There are unsaved changes in the active module.\n"
-"Do you want to apply the changes before quitting KMousetool or discard the "
-"changes?"
-msgstr ""
-"在激活的模块里有尚未保存的更改。\n"
-"您希望在退出 K 鼠标工具之前应用或者放弃这些更改吗？"
-
-#: kmousetool.cpp:579
-msgid "Quitting KMousetool"
-msgstr "正在退出 K 鼠标工具"
-
-#: kmousetool.cpp:616
-msgid "&Configure KMouseTool..."
-msgstr "配置 K 鼠标工具(&C)..."
-
-#: kmousetool.cpp:619
-msgid "KMousetool &Handbook"
-msgstr "K 鼠标工具手册(&H)"
-
-#: kmousetool.cpp:621
-msgid "&About KMouseTool"
-msgstr "关于 K 鼠标工具(&A)"
-
 #: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -83,18 +34,6 @@ msgstr ""
 msgid "KMouseTool"
 msgstr "K 鼠标工具"
 
-#: main.cpp:48
-msgid "Current maintainer"
-msgstr "当前维护者"
-
-#: main.cpp:49
-msgid "Usability improvements"
-msgstr "可用性改进"
-
-#: main.cpp:50
-msgid "Original author"
-msgstr "原始作者"
-
 #. i18n: file kmousetoolui.ui line 44
 #: rc.cpp:6
 #, no-c-format
@@ -156,3 +95,65 @@ msgid ""
 "KMouseTool will run as a background application after you close this dialog. To "
 "change the settings again, restart KMouseTool or use the TDE system tray."
 msgstr "K 鼠标工具在您关闭这个对话框后将作为后台程序运行。若要再次改变设置，重启 K 鼠标工具或者使用 TDE 系统托盘。"
+
+#: kmousetool.cpp:418
+msgid "The drag time must be less than or equal to the dwell time."
+msgstr "拖动时间必须小于或等于悬停时间"
+
+#: kmousetool.cpp:418
+msgid "Invalid Value"
+msgstr "无效数值"
+
+#: kmousetool.cpp:488 kmousetool.cpp:632
+msgid "&Stop"
+msgstr "停止(&S)"
+
+#: kmousetool.cpp:559
+msgid ""
+"There are unsaved changes in the active module.\n"
+"Do you want to apply the changes before closing the configuration window or "
+"discard the changes?"
+msgstr ""
+"在激活的模块里有尚未保存的更改。\n"
+"您希望在关闭配置窗口之前应用或者放弃这些更改吗？"
+
+#: kmousetool.cpp:560
+msgid "Closing Configuration Window"
+msgstr "正在关闭配置窗口"
+
+#: kmousetool.cpp:578
+msgid ""
+"There are unsaved changes in the active module.\n"
+"Do you want to apply the changes before quitting KMousetool or discard the "
+"changes?"
+msgstr ""
+"在激活的模块里有尚未保存的更改。\n"
+"您希望在退出 K 鼠标工具之前应用或者放弃这些更改吗？"
+
+#: kmousetool.cpp:579
+msgid "Quitting KMousetool"
+msgstr "正在退出 K 鼠标工具"
+
+#: kmousetool.cpp:616
+msgid "&Configure KMouseTool..."
+msgstr "配置 K 鼠标工具(&C)..."
+
+#: kmousetool.cpp:619
+msgid "KMousetool &Handbook"
+msgstr "K 鼠标工具手册(&H)"
+
+#: kmousetool.cpp:621
+msgid "&About KMouseTool"
+msgstr "关于 K 鼠标工具(&A)"
+
+#: main.cpp:48
+msgid "Current maintainer"
+msgstr "当前维护者"
+
+#: main.cpp:49
+msgid "Usability improvements"
+msgstr "可用性改进"
+
+#: main.cpp:50
+msgid "Original author"
+msgstr "原始作者"
diff --git a/tde-i18n-zh_CN/messages/tdeaccessibility/kmouth.po b/tde-i18n-zh_CN/messages/tdeaccessibility/kmouth.po
index 617ee167683..89b099906b7 100644
--- a/tde-i18n-zh_CN/messages/tdeaccessibility/kmouth.po
+++ b/tde-i18n-zh_CN/messages/tdeaccessibility/kmouth.po
@@ -6,16 +6,116 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmouth\n"
-"POT-Creation-Date: 2005-07-24 01:41+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-11-15 14:59+0800\n"
 "Last-Translator: Yan Shuangchun <yahzee@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 "Translator: Sun Fang <sun_xp@msn.com>\n"
 
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Yan Shuangchun"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "yahzee@d3eye.com"
+
+#: phraselist.cpp:56
+msgid ""
+"This list contains the history of spoken sentences. You can select sentences "
+"and press the speak button for re-speaking."
+msgstr "这个列表包含已朗读的句子的历史记录。您可以选择句子并按朗读按钮来再次朗读。"
+
+#: phraselist.cpp:74
+msgid ""
+"Into this edit field you can type a phrase. Click on the speak button in order "
+"to speak the entered phrase."
+msgstr "您可以在这个编辑区域输入一个词组。单击朗读按钮来朗读输入的词组。"
+
+#: kmouth.cpp:127 kmouth.cpp:156 phraselist.cpp:79
+msgid "&Speak"
+msgstr "朗读(&S)"
+
+#: kmouth.cpp:129 phraselist.cpp:82
+msgid ""
+"Speaks the currently active sentence(s). If there is some text in the edit "
+"field it is spoken. Otherwise the selected sentences in the history (if any) "
+"are spoken."
+msgstr "朗读当前活动的句子。如果在编辑区域中有文本，这些文本将被朗读。否则在历史记录中所选的句子(如果有的话)将被朗读。"
+
+#: phrasebook/phrasebookdialog.cpp:744 phraselist.cpp:449
+#, c-format
+msgid ""
+"There was an error saving file\n"
+"%1"
+msgstr "在保存文件 %1 时发生一个错误"
+
+#: phraselist.cpp:454
+msgid ""
+"*|All Files\n"
+"*.phrasebook|Phrase Books (*.phrasebook)\n"
+"*.txt|Plain Text Files (*.txt)"
+msgstr ""
+"*|所有文件\n"
+"*.phrasebook|词组本 (*.phrasebook)\n"
+"*.txt|纯文本文件 (*.txt)"
+
+#: phraselist.cpp:454
+msgid "Open File as History"
+msgstr "打开文件作为历史记录"
+
+#: phrasebook/phrasebookdialog.cpp:734 phraselist.cpp:475
+#, c-format
+msgid ""
+"There was an error loading file\n"
+"%1"
+msgstr "在读取文件 %1 时发生一个错误"
+
+#: configwizard.cpp:37
+msgid "Initial Configuration - KMouth"
+msgstr "初始化配置 - KMouth"
+
+#: configwizard.cpp:57
+msgid "Text-to-Speech Configuration"
+msgstr "文本到语音配置"
+
+#: configwizard.cpp:71
+msgid "Initial Phrase Book"
+msgstr "初始化词组本"
+
+#: configwizard.cpp:103 optionsdialog.cpp:136
+msgid "Word Completion"
+msgstr "单词补全"
+
+#: optionsdialog.cpp:123
+msgid "General Options"
+msgstr "常规选项"
+
+#: optionsdialog.cpp:129
+msgid "&Preferences"
+msgstr "首选项(&P)"
+
+#: optionsdialog.cpp:133
+msgid "&Text-to-Speech"
+msgstr "文本到语音(&T)"
+
+#: optionsdialog.cpp:142
+msgid "KTTSD Speech Service"
+msgstr "KTTSD 语言服务"
+
+#: optionsdialog.cpp:143
+msgid "TDE Text-to-Speech Daemon Configuration"
+msgstr "TDE 文本到语音守护程序配置"
+
 #: texttospeechconfigurationwidget.cpp:47
 #: wordcompletion/dictionarycreationwizard.cpp:101
 msgid "Local"
@@ -31,19 +131,185 @@ msgstr "拉丁1"
 msgid "Unicode"
 msgstr "Unicode"
 
-#: wordcompletion/creationsourcedetailsui.ui.h:31
-#: wordcompletion/klanguagebuttonhelper.cpp:38
-#: wordcompletion/klanguagebuttonhelper.cpp:56
-#: wordcompletion/wordcompletionui.ui.h:31
-#: wordcompletion/wordcompletionwidget.cpp:78
-#: wordcompletion/wordcompletionwidget.cpp:139
-#: wordcompletion/wordcompletionwidget.cpp:203
-msgid "without name"
-msgstr "没有名字"
+#: phrasebook/phrasebookdialog.cpp:134
+msgid " (%1 of %2 books selected)"
+msgstr " (选中 %2 本词组本中的 %1 本)"
 
-#: wordcompletion/wordcompletionwidget.cpp:249
-msgid "Export Dictionary"
-msgstr "导出字典"
+#: phrasebook/phrasebookdialog.cpp:145
+msgid "Please decide which phrase books you need:"
+msgstr "请决定您需要哪些词组本："
+
+#: phrasebook/phrasebookdialog.cpp:153
+msgid "Book"
+msgstr "书"
+
+#: phrasebook/phrasebookdialog.cpp:242
+msgid ""
+"By clicking on this button you can select the keyboard shortcut associated with "
+"the selected phrase."
+msgstr "单击此按钮可选择与选中词组关联的键盘快捷键。"
+
+#: phrasebook/phrasebookdialog.cpp:263
+msgid "Phrase Book"
+msgstr "词组本"
+
+#: phrasebook/phrasebookdialog.cpp:300
+msgid "Phrase"
+msgstr "词组"
+
+#: phrasebook/phrasebookdialog.cpp:301
+msgid "Shortcut"
+msgstr "快捷键"
+
+#: phrasebook/phrasebookdialog.cpp:305
+msgid ""
+"This list contains the current phrase book in a tree structure. You can select "
+"and modify individual phrases and sub phrase books"
+msgstr "此列表以树形结构包含了当前词组本。您还可以选择并修改独立的词组和子词组本"
+
+#: phrasebook/phrasebookdialog.cpp:325
+msgid "&New Phrase"
+msgstr "新建词组(&N)"
+
+#: phrasebook/phrasebookdialog.cpp:326 phrasebook/phrasebookdialog.cpp:327
+msgid "Adds a new phrase"
+msgstr "添加一个新词组"
+
+#: phrasebook/phrasebookdialog.cpp:329
+msgid "New Phrase &Book"
+msgstr "新词组本(&B)"
+
+#: phrasebook/phrasebookdialog.cpp:330 phrasebook/phrasebookdialog.cpp:331
+msgid "Adds a new phrase book into which other books and phrases can be placed"
+msgstr "添加新的词组本到其它书和短语可以存放的地方"
+
+#: phrasebook/phrasebookdialog.cpp:334 phrasebook/phrasebookdialog.cpp:335
+msgid "Saves the phrase book onto the hard disk"
+msgstr "把词组本保存到硬盘上"
+
+#: phrasebook/phrasebookdialog.cpp:337 phrasebook/phrasebookdialog.cpp:341
+msgid "&Import..."
+msgstr "导入(&I)..."
+
+#: phrasebook/phrasebookdialog.cpp:338 phrasebook/phrasebookdialog.cpp:339
+#: phrasebook/phrasebookdialog.cpp:342 phrasebook/phrasebookdialog.cpp:343
+msgid "Imports a file and adds its contents to the phrase book"
+msgstr "导入一个文件并把内容添加到词组本"
+
+#: phrasebook/phrasebookdialog.cpp:345
+msgid "I&mport Standard Phrase Book"
+msgstr "导入标准词组本(&S)"
+
+#: phrasebook/phrasebookdialog.cpp:346 phrasebook/phrasebookdialog.cpp:347
+msgid "Imports a standard phrase book and adds its contents to the phrase book"
+msgstr "导入一个标准词组本并把它的内容添加到词组本"
+
+#: phrasebook/phrasebookdialog.cpp:349
+msgid "&Export..."
+msgstr "导出(&E)..."
+
+#: phrasebook/phrasebookdialog.cpp:350 phrasebook/phrasebookdialog.cpp:351
+msgid "Exports the currently selected phrase(s) or phrase book(s) into a file"
+msgstr "把目前所选的词组或词组本导出到一个文件"
+
+#: phrasebook/phrasebookdialog.cpp:354 phrasebook/phrasebookdialog.cpp:355
+msgid "Prints the currently selected phrase(s) or phrase book(s)"
+msgstr "打印目前所选的词组或词组本"
+
+#: phrasebook/phrasebookdialog.cpp:358 phrasebook/phrasebookdialog.cpp:359
+msgid "Closes the window"
+msgstr "关闭窗口"
+
+#: phrasebook/phrasebookdialog.cpp:363 phrasebook/phrasebookdialog.cpp:364
+msgid ""
+"Cuts the currently selected entries from the phrase book and puts it to the "
+"clipboard"
+msgstr "从词组本中剪切目前所选的条目并放置到剪贴板"
+
+#: phrasebook/phrasebookdialog.cpp:367 phrasebook/phrasebookdialog.cpp:368
+msgid ""
+"Copies the currently selected entry from the phrase book to the clipboard"
+msgstr "把目前所选的条目从词组本中复制到剪贴板"
+
+#: kmouth.cpp:124 phrasebook/phrasebookdialog.cpp:371
+#: phrasebook/phrasebookdialog.cpp:372
+msgid "Pastes the clipboard contents to actual position"
+msgstr "粘贴剪贴板的内容到当前位置"
+
+#: phrasebook/phrasebookdialog.cpp:375 phrasebook/phrasebookdialog.cpp:376
+msgid "Deletes the selected entries from the phrase book"
+msgstr "取消选择词组本中所选的条目"
+
+#. i18n: file phrasebook/buttonboxui.ui line 93
+#: phrasebook/phrasebookdialog.cpp:491 phrasebook/phrasebookdialog.cpp:505
+#: rc.cpp:205
+#, no-c-format
+msgid "Text of the &phrase:"
+msgstr "词组的文本(&P)："
+
+#: phrasebook/phrasebookdialog.cpp:526
+msgid "Name of the &phrase book:"
+msgstr "词组本的名字(&P)："
+
+#: phrasebook/phrasebookdialog.cpp:545
+#, fuzzy
+msgid ""
+"<qt>There are unsaved changes."
+"<br>Do you want to apply the changes before closing the \"phrase book\" window "
+"or discard the changes?</qt>"
+msgstr "有未保存的更改。<br>关闭“词组本”窗口之前，您要应用这些更改还是放弃这些更改？"
+
+#: phrasebook/phrasebookdialog.cpp:546
+msgid "Closing \"Phrase Book\" Window"
+msgstr "关闭“词组本”窗口"
+
+#: phrasebook/phrasebookdialog.cpp:598
+msgid ""
+"In order to use the '%1' key as a shortcut, it must be combined with the Win, "
+"Alt, Ctrl, and/or Shift keys."
+msgstr "为了把“%1”键作为快捷键使用，它必须和 Win、Alt、Ctrl 和/或 Shift 键组合。"
+
+#: phrasebook/phrasebookdialog.cpp:601
+msgid "Invalid Shortcut Key"
+msgstr "无效的快捷键"
+
+#: phrasebook/phrasebookdialog.cpp:695
+#, fuzzy
+msgid "(New Phrase Book)"
+msgstr "新词组本(&B)"
+
+#: phrasebook/phrasebookdialog.cpp:706
+#, fuzzy
+msgid "(New Phrase)"
+msgstr "(新词组)"
+
+#: phrasebook/phrasebook.cpp:258 phrasebook/phrasebookdialog.cpp:723
+msgid ""
+"*.phrasebook|Phrase Books (*.phrasebook)\n"
+"*.txt|Plain Text Files (*.txt)\n"
+"*|All Files"
+msgstr ""
+"*.phrasebook|词组本 (*.phrasebook)\n"
+"*.txt|纯文本文件 (*.txt)\n"
+"*|所有文件"
+
+#: phrasebook/phrasebookdialog.cpp:723
+msgid "Import Phrasebook"
+msgstr "导入词组本"
+
+#: phrasebook/phrasebookdialog.cpp:743
+msgid "Export Phrase Book"
+msgstr "导出词组本"
+
+#: phrasebook/phrasebook.cpp:260
+msgid ""
+"*.txt|Plain Text Files (*.txt)\n"
+"*.phrasebook|Phrase Books (*.phrasebook)\n"
+"*|All Files"
+msgstr ""
+"*.txt|纯文本文件 (*.txt)\n"
+"*.phrasebook|词组本 (*.phrasebook)\n"
+"*|所有文件"
 
 #: phrasebook/phrasebook.cpp:277 wordcompletion/wordcompletionwidget.cpp:254
 msgid "The file %1 already exists. Do you want to overwrite it?"
@@ -57,46 +323,73 @@ msgstr "文件已存在"
 msgid "&Overwrite"
 msgstr "覆盖(&O)"
 
-#: wordcompletion/wordlist.cpp:109
-msgid "Creating Word List"
-msgstr "创建单词列表"
+#: phrasebook/phrasebook.cpp:289
+msgid ""
+"Your chosen filename <i>%1</i> has a different extension than <i>.phrasebook</i>"
+". Do you wish to add <i>.phrasebook</i> to the filename?"
+msgstr "您所选的文件 <i>%1</i> 的扩展名与词组本不同。您是否想把 <i>.phrasebook</i> 添加到文件名中？"
 
-#: wordcompletion/wordlist.cpp:109 wordcompletion/wordlist.cpp:291
-msgid "Parsing the TDE documentation..."
-msgstr "正在分析 TDE 文档..."
+#: phrasebook/phrasebook.cpp:290 phrasebook/phrasebook.cpp:306
+msgid "File Extension"
+msgstr "文件扩展名"
 
-#: wordcompletion/wordlist.cpp:238
-msgid "Merging dictionaries..."
-msgstr "正在合并字典..."
+#: phrasebook/phrasebook.cpp:290
+msgid "Do Not Add"
+msgstr ""
 
-#: wordcompletion/wordlist.cpp:305
-msgid "Parsing file..."
-msgstr "正在分析文件..."
+#: phrasebook/phrasebook.cpp:305
+msgid ""
+"Your chosen filename <i>%1</i> has the extension <i>.phrasebook</i>"
+". Do you wish to save in phrasebook format?"
+msgstr "您所选文件 <i>%1</i> 含有 <i>.phrasebook</i> 的扩展名。您是否想用词组本格式保存？"
 
-#: wordcompletion/wordlist.cpp:315
-msgid "Parsing directory..."
-msgstr "正在分析文件夹..."
+#: phrasebook/phrasebook.cpp:306
+msgid "As Phrasebook"
+msgstr "作为词组本"
 
-#: wordcompletion/wordlist.cpp:504
-msgid "Performing spell check..."
-msgstr "正在进行拼写检查..."
+#: phrasebook/phrasebook.cpp:306
+msgid "As Plain Text"
+msgstr "作为纯文本文件"
 
-#. i18n: file wordcompletion/kdedocsourceui.ui line 68
-#: rc.cpp:292 wordcompletion/kdedocsourceui.ui.h:14
-#, no-c-format
+#: phrasebook/phrasetree.cpp:470
 msgid ""
-"With this combo box you select which of the installed languages is used for "
-"creating the new dictionary. KMouth will only parse documentation files of this "
-"language."
-msgstr "您可使用此复选框选择要使用所安装的何种语言创建新字典。KMouth 将只会处理此语言的文档文件。"
+"The '%1' key combination has already been allocated to %2.\n"
+"Please choose a unique key combination."
+msgstr ""
+"“%1”按键组合已经分配给 %2。\n"
+"请选择唯一的按键组合。"
 
-#. i18n: file wordcompletion/creationsourcedetailsui.ui line 144
-#: rc.cpp:241 wordcompletion/creationsourcedetailsui.ui.h:15
+#: phrasebook/phrasetree.cpp:488
+msgid "the standard \"%1\" action"
+msgstr "标准“%1”动作"
+
+#: phrasebook/phrasetree.cpp:489
+msgid "Conflict with Standard Application Shortcut"
+msgstr "与标准应用程序快捷键相冲突"
+
+#: phrasebook/phrasetree.cpp:504
+msgid "the global \"%1\" action"
+msgstr "全局“%1”动作"
+
+#: phrasebook/phrasetree.cpp:505
+msgid "Conflict with Global Shortcuts"
+msgstr "与全局快捷键相冲突"
+
+#: phrasebook/phrasetree.cpp:520
+msgid "an other phrase"
+msgstr "另一个词组"
+
+#: phrasebook/phrasetree.cpp:521
+msgid "Key Conflict"
+msgstr "按键冲突"
+
+#. i18n: file wordcompletion/wordcompletionui.ui line 224
+#: rc.cpp:340 wordcompletion/wordcompletionui.ui.h:15
 #, no-c-format
 msgid ""
-"With this combo box you decide which language should be associated with the new "
+"With this combo box you select the language associated with the selected "
 "dictionary."
-msgstr "您可使用此复选框决定要将新字典关联到何种语言。"
+msgstr "您可使用此复选框选择与选中字典关联的语言。"
 
 #: wordcompletion/creationsourcedetailsui.ui.h:18
 #: wordcompletion/wordcompletionui.ui.h:18
@@ -113,6 +406,16 @@ msgstr "创建自定义语言"
 msgid "Please enter the code for the custom language:"
 msgstr "请输入自定义语言的代码："
 
+#: wordcompletion/creationsourcedetailsui.ui.h:31
+#: wordcompletion/klanguagebuttonhelper.cpp:38
+#: wordcompletion/klanguagebuttonhelper.cpp:56
+#: wordcompletion/wordcompletionui.ui.h:31
+#: wordcompletion/wordcompletionwidget.cpp:78
+#: wordcompletion/wordcompletionwidget.cpp:139
+#: wordcompletion/wordcompletionwidget.cpp:203
+msgid "without name"
+msgstr "没有名字"
+
 #: wordcompletion/dictionarycreationwizard.cpp:53
 msgid "Source of New Dictionary (1)"
 msgstr "新建字典的来源 (1)"
@@ -153,37 +456,50 @@ msgstr "空列表"
 msgid "TDE Documentation"
 msgstr "TDE 文档"
 
-#. i18n: file wordcompletion/wordcompletionui.ui line 224
-#: rc.cpp:340 wordcompletion/wordcompletionui.ui.h:15
-#, no-c-format
-msgid ""
-"With this combo box you select the language associated with the selected "
-"dictionary."
-msgstr "您可使用此复选框选择与选中字典关联的语言。"
+#: wordcompletion/wordlist.cpp:109
+msgid "Creating Word List"
+msgstr "创建单词列表"
 
-#: optionsdialog.cpp:123
-msgid "General Options"
-msgstr "常规选项"
+#: wordcompletion/wordlist.cpp:109 wordcompletion/wordlist.cpp:291
+msgid "Parsing the TDE documentation..."
+msgstr "正在分析 TDE 文档..."
 
-#: optionsdialog.cpp:129
-msgid "&Preferences"
-msgstr "首选项(&P)"
+#: wordcompletion/wordlist.cpp:238
+msgid "Merging dictionaries..."
+msgstr "正在合并字典..."
 
-#: optionsdialog.cpp:133
-msgid "&Text-to-Speech"
-msgstr "文本到语音(&T)"
+#: wordcompletion/wordlist.cpp:305
+msgid "Parsing file..."
+msgstr "正在分析文件..."
 
-#: configwizard.cpp:103 optionsdialog.cpp:136
-msgid "Word Completion"
-msgstr "单词补全"
+#: wordcompletion/wordlist.cpp:315
+msgid "Parsing directory..."
+msgstr "正在分析文件夹..."
 
-#: optionsdialog.cpp:142
-msgid "KTTSD Speech Service"
-msgstr "KTTSD 语言服务"
+#: wordcompletion/wordlist.cpp:504
+msgid "Performing spell check..."
+msgstr "正在进行拼写检查..."
 
-#: optionsdialog.cpp:143
-msgid "TDE Text-to-Speech Daemon Configuration"
-msgstr "TDE 文本到语音守护程序配置"
+#. i18n: file wordcompletion/kdedocsourceui.ui line 68
+#: rc.cpp:292 wordcompletion/kdedocsourceui.ui.h:14
+#, no-c-format
+msgid ""
+"With this combo box you select which of the installed languages is used for "
+"creating the new dictionary. KMouth will only parse documentation files of this "
+"language."
+msgstr "您可使用此复选框选择要使用所安装的何种语言创建新字典。KMouth 将只会处理此语言的文档文件。"
+
+#. i18n: file wordcompletion/creationsourcedetailsui.ui line 144
+#: rc.cpp:241 wordcompletion/creationsourcedetailsui.ui.h:15
+#, no-c-format
+msgid ""
+"With this combo box you decide which language should be associated with the new "
+"dictionary."
+msgstr "您可使用此复选框决定要将新字典关联到何种语言。"
+
+#: wordcompletion/wordcompletionwidget.cpp:249
+msgid "Export Dictionary"
+msgstr "导出字典"
 
 #: kmouth.cpp:98
 msgid "&Open as History..."
@@ -235,32 +551,16 @@ msgid ""
 "in the history (if any) are copied to the clipboard."
 msgstr "复制所选的部分到剪贴板。如果在编辑区域中有文本被选，所选的文本将被复制到剪贴板。否则历史记录中所选的句子(如果有的话)将被复制到剪贴板。"
 
-#: kmouth.cpp:124 phrasebook/phrasebookdialog.cpp:371
-#: phrasebook/phrasebookdialog.cpp:372
-msgid "Pastes the clipboard contents to actual position"
-msgstr "粘贴剪贴板的内容到当前位置"
-
 #: kmouth.cpp:125
 msgid ""
 "Pastes the clipboard contents at the current cursor position into the edit "
 "field."
 msgstr "把剪切版中的内容粘贴到编辑区域中目前指针所在的位置。"
 
-#: kmouth.cpp:127 kmouth.cpp:156 phraselist.cpp:79
-msgid "&Speak"
-msgstr "朗读(&S)"
-
 #: kmouth.cpp:128
 msgid "Speaks the currently active sentence(s)"
 msgstr "朗读当前活动的句子"
 
-#: kmouth.cpp:129 phraselist.cpp:82
-msgid ""
-"Speaks the currently active sentence(s). If there is some text in the edit "
-"field it is spoken. Otherwise the selected sentences in the history (if any) "
-"are spoken."
-msgstr "朗读当前活动的句子。如果在编辑区域中有文本，这些文本将被朗读。否则在历史记录中所选的句子(如果有的话)将被朗读。"
-
 #: kmouth.cpp:132
 msgid "&Edit..."
 msgstr "编辑(&E)..."
@@ -364,34 +664,6 @@ msgstr "正在切换词组栏..."
 msgid "Toggle the statusbar..."
 msgstr "切换状态栏..."
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Yan Shuangchun"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "yahzee@d3eye.com"
-
-#: main.cpp:28
-msgid "A type-and-say front end for speech synthesizers"
-msgstr "一个即输即读的语音合成前端"
-
-#: main.cpp:34
-msgid "History file to open"
-msgstr "要打开的历史记录文件"
-
-#: main.cpp:42
-msgid "KMouth"
-msgstr "KMouth"
-
-#: main.cpp:49
-msgid "Tips, extended phrase books"
-msgstr "提示，扩展词组本"
-
 #. i18n: file kmouthui.rc line 14
 #: rc.cpp:9 rc.cpp:98
 #, no-c-format
@@ -591,13 +863,6 @@ msgstr "如果您选中了此选项，则选中的词组将可通过键盘快捷
 msgid "Shortcut for the phrase:"
 msgstr "词组的快捷键："
 
-#. i18n: file phrasebook/buttonboxui.ui line 93
-#: phrasebook/phrasebookdialog.cpp:491 phrasebook/phrasebookdialog.cpp:505
-#: rc.cpp:205
-#, no-c-format
-msgid "Text of the &phrase:"
-msgstr "词组的文本(&P)："
-
 #. i18n: file wordcompletion/creationsourcedetailsui.ui line 24
 #: rc.cpp:211 rc.cpp:280
 #, no-c-format
@@ -851,285 +1116,21 @@ msgstr "名称(&M)："
 msgid "With this input field you specify the name of the selected dictionary."
 msgstr "您可通过此输入域指定选中字典的名称。"
 
-#: phrasebook/phrasebookdialog.cpp:134
-msgid " (%1 of %2 books selected)"
-msgstr " (选中 %2 本词组本中的 %1 本)"
-
-#: phrasebook/phrasebookdialog.cpp:145
-msgid "Please decide which phrase books you need:"
-msgstr "请决定您需要哪些词组本："
-
-#: phrasebook/phrasebookdialog.cpp:153
-msgid "Book"
-msgstr "书"
-
-#: phrasebook/phrasebookdialog.cpp:242
-msgid ""
-"By clicking on this button you can select the keyboard shortcut associated with "
-"the selected phrase."
-msgstr "单击此按钮可选择与选中词组关联的键盘快捷键。"
-
-#: phrasebook/phrasebookdialog.cpp:263
-msgid "Phrase Book"
-msgstr "词组本"
-
-#: phrasebook/phrasebookdialog.cpp:300
-msgid "Phrase"
-msgstr "词组"
-
-#: phrasebook/phrasebookdialog.cpp:301
-msgid "Shortcut"
-msgstr "快捷键"
-
-#: phrasebook/phrasebookdialog.cpp:305
-msgid ""
-"This list contains the current phrase book in a tree structure. You can select "
-"and modify individual phrases and sub phrase books"
-msgstr "此列表以树形结构包含了当前词组本。您还可以选择并修改独立的词组和子词组本"
-
-#: phrasebook/phrasebookdialog.cpp:325
-msgid "&New Phrase"
-msgstr "新建词组(&N)"
-
-#: phrasebook/phrasebookdialog.cpp:326 phrasebook/phrasebookdialog.cpp:327
-msgid "Adds a new phrase"
-msgstr "添加一个新词组"
-
-#: phrasebook/phrasebookdialog.cpp:329
-msgid "New Phrase &Book"
-msgstr "新词组本(&B)"
-
-#: phrasebook/phrasebookdialog.cpp:330 phrasebook/phrasebookdialog.cpp:331
-msgid "Adds a new phrase book into which other books and phrases can be placed"
-msgstr "添加新的词组本到其它书和短语可以存放的地方"
-
-#: phrasebook/phrasebookdialog.cpp:334 phrasebook/phrasebookdialog.cpp:335
-msgid "Saves the phrase book onto the hard disk"
-msgstr "把词组本保存到硬盘上"
-
-#: phrasebook/phrasebookdialog.cpp:337 phrasebook/phrasebookdialog.cpp:341
-msgid "&Import..."
-msgstr "导入(&I)..."
-
-#: phrasebook/phrasebookdialog.cpp:338 phrasebook/phrasebookdialog.cpp:339
-#: phrasebook/phrasebookdialog.cpp:342 phrasebook/phrasebookdialog.cpp:343
-msgid "Imports a file and adds its contents to the phrase book"
-msgstr "导入一个文件并把内容添加到词组本"
-
-#: phrasebook/phrasebookdialog.cpp:345
-msgid "I&mport Standard Phrase Book"
-msgstr "导入标准词组本(&S)"
-
-#: phrasebook/phrasebookdialog.cpp:346 phrasebook/phrasebookdialog.cpp:347
-msgid "Imports a standard phrase book and adds its contents to the phrase book"
-msgstr "导入一个标准词组本并把它的内容添加到词组本"
-
-#: phrasebook/phrasebookdialog.cpp:349
-msgid "&Export..."
-msgstr "导出(&E)..."
-
-#: phrasebook/phrasebookdialog.cpp:350 phrasebook/phrasebookdialog.cpp:351
-msgid "Exports the currently selected phrase(s) or phrase book(s) into a file"
-msgstr "把目前所选的词组或词组本导出到一个文件"
-
-#: phrasebook/phrasebookdialog.cpp:354 phrasebook/phrasebookdialog.cpp:355
-msgid "Prints the currently selected phrase(s) or phrase book(s)"
-msgstr "打印目前所选的词组或词组本"
-
-#: phrasebook/phrasebookdialog.cpp:358 phrasebook/phrasebookdialog.cpp:359
-msgid "Closes the window"
-msgstr "关闭窗口"
-
-#: phrasebook/phrasebookdialog.cpp:363 phrasebook/phrasebookdialog.cpp:364
-msgid ""
-"Cuts the currently selected entries from the phrase book and puts it to the "
-"clipboard"
-msgstr "从词组本中剪切目前所选的条目并放置到剪贴板"
-
-#: phrasebook/phrasebookdialog.cpp:367 phrasebook/phrasebookdialog.cpp:368
-msgid ""
-"Copies the currently selected entry from the phrase book to the clipboard"
-msgstr "把目前所选的条目从词组本中复制到剪贴板"
-
-#: phrasebook/phrasebookdialog.cpp:375 phrasebook/phrasebookdialog.cpp:376
-msgid "Deletes the selected entries from the phrase book"
-msgstr "取消选择词组本中所选的条目"
-
-#: phrasebook/phrasebookdialog.cpp:526
-msgid "Name of the &phrase book:"
-msgstr "词组本的名字(&P)："
-
-#: phrasebook/phrasebookdialog.cpp:545
-#, fuzzy
-msgid ""
-"<qt>There are unsaved changes."
-"<br>Do you want to apply the changes before closing the \"phrase book\" window "
-"or discard the changes?</qt>"
-msgstr "有未保存的更改。<br>关闭“词组本”窗口之前，您要应用这些更改还是放弃这些更改？"
-
-#: phrasebook/phrasebookdialog.cpp:546
-msgid "Closing \"Phrase Book\" Window"
-msgstr "关闭“词组本”窗口"
-
-#: phrasebook/phrasebookdialog.cpp:598
-msgid ""
-"In order to use the '%1' key as a shortcut, it must be combined with the Win, "
-"Alt, Ctrl, and/or Shift keys."
-msgstr "为了把“%1”键作为快捷键使用，它必须和 Win、Alt、Ctrl 和/或 Shift 键组合。"
-
-#: phrasebook/phrasebookdialog.cpp:601
-msgid "Invalid Shortcut Key"
-msgstr "无效的快捷键"
-
-#: phrasebook/phrasebookdialog.cpp:695
-#, fuzzy
-msgid "(New Phrase Book)"
-msgstr "新词组本(&B)"
-
-#: phrasebook/phrasebookdialog.cpp:706
-#, fuzzy
-msgid "(New Phrase)"
-msgstr "(新词组)"
-
-#: phrasebook/phrasebook.cpp:258 phrasebook/phrasebookdialog.cpp:723
-msgid ""
-"*.phrasebook|Phrase Books (*.phrasebook)\n"
-"*.txt|Plain Text Files (*.txt)\n"
-"*|All Files"
-msgstr ""
-"*.phrasebook|词组本 (*.phrasebook)\n"
-"*.txt|纯文本文件 (*.txt)\n"
-"*|所有文件"
-
-#: phrasebook/phrasebookdialog.cpp:723
-msgid "Import Phrasebook"
-msgstr "导入词组本"
-
-#: phrasebook/phrasebookdialog.cpp:734 phraselist.cpp:475
-#, c-format
-msgid ""
-"There was an error loading file\n"
-"%1"
-msgstr "在读取文件 %1 时发生一个错误"
-
-#: phrasebook/phrasebookdialog.cpp:743
-msgid "Export Phrase Book"
-msgstr "导出词组本"
-
-#: phrasebook/phrasebookdialog.cpp:744 phraselist.cpp:449
-#, c-format
-msgid ""
-"There was an error saving file\n"
-"%1"
-msgstr "在保存文件 %1 时发生一个错误"
-
-#: phrasebook/phrasebook.cpp:260
-msgid ""
-"*.txt|Plain Text Files (*.txt)\n"
-"*.phrasebook|Phrase Books (*.phrasebook)\n"
-"*|All Files"
-msgstr ""
-"*.txt|纯文本文件 (*.txt)\n"
-"*.phrasebook|词组本 (*.phrasebook)\n"
-"*|所有文件"
-
-#: phrasebook/phrasebook.cpp:289
-msgid ""
-"Your chosen filename <i>%1</i> has a different extension than <i>.phrasebook</i>"
-". Do you wish to add <i>.phrasebook</i> to the filename?"
-msgstr "您所选的文件 <i>%1</i> 的扩展名与词组本不同。您是否想把 <i>.phrasebook</i> 添加到文件名中？"
-
-#: phrasebook/phrasebook.cpp:290 phrasebook/phrasebook.cpp:306
-msgid "File Extension"
-msgstr "文件扩展名"
-
-#: phrasebook/phrasebook.cpp:290
-msgid "Do Not Add"
-msgstr ""
-
-#: phrasebook/phrasebook.cpp:305
-msgid ""
-"Your chosen filename <i>%1</i> has the extension <i>.phrasebook</i>"
-". Do you wish to save in phrasebook format?"
-msgstr "您所选文件 <i>%1</i> 含有 <i>.phrasebook</i> 的扩展名。您是否想用词组本格式保存？"
-
-#: phrasebook/phrasebook.cpp:306
-msgid "As Phrasebook"
-msgstr "作为词组本"
-
-#: phrasebook/phrasebook.cpp:306
-msgid "As Plain Text"
-msgstr "作为纯文本文件"
-
-#: phrasebook/phrasetree.cpp:470
-msgid ""
-"The '%1' key combination has already been allocated to %2.\n"
-"Please choose a unique key combination."
-msgstr ""
-"“%1”按键组合已经分配给 %2。\n"
-"请选择唯一的按键组合。"
-
-#: phrasebook/phrasetree.cpp:488
-msgid "the standard \"%1\" action"
-msgstr "标准“%1”动作"
-
-#: phrasebook/phrasetree.cpp:489
-msgid "Conflict with Standard Application Shortcut"
-msgstr "与标准应用程序快捷键相冲突"
-
-#: phrasebook/phrasetree.cpp:504
-msgid "the global \"%1\" action"
-msgstr "全局“%1”动作"
-
-#: phrasebook/phrasetree.cpp:505
-msgid "Conflict with Global Shortcuts"
-msgstr "与全局快捷键相冲突"
-
-#: phrasebook/phrasetree.cpp:520
-msgid "an other phrase"
-msgstr "另一个词组"
-
-#: phrasebook/phrasetree.cpp:521
-msgid "Key Conflict"
-msgstr "按键冲突"
-
-#: configwizard.cpp:37
-msgid "Initial Configuration - KMouth"
-msgstr "初始化配置 - KMouth"
-
-#: configwizard.cpp:57
-msgid "Text-to-Speech Configuration"
-msgstr "文本到语音配置"
-
-#: configwizard.cpp:71
-msgid "Initial Phrase Book"
-msgstr "初始化词组本"
-
-#: phraselist.cpp:56
-msgid ""
-"This list contains the history of spoken sentences. You can select sentences "
-"and press the speak button for re-speaking."
-msgstr "这个列表包含已朗读的句子的历史记录。您可以选择句子并按朗读按钮来再次朗读。"
+#: main.cpp:28
+msgid "A type-and-say front end for speech synthesizers"
+msgstr "一个即输即读的语音合成前端"
 
-#: phraselist.cpp:74
-msgid ""
-"Into this edit field you can type a phrase. Click on the speak button in order "
-"to speak the entered phrase."
-msgstr "您可以在这个编辑区域输入一个词组。单击朗读按钮来朗读输入的词组。"
+#: main.cpp:34
+msgid "History file to open"
+msgstr "要打开的历史记录文件"
 
-#: phraselist.cpp:454
-msgid ""
-"*|All Files\n"
-"*.phrasebook|Phrase Books (*.phrasebook)\n"
-"*.txt|Plain Text Files (*.txt)"
-msgstr ""
-"*|所有文件\n"
-"*.phrasebook|词组本 (*.phrasebook)\n"
-"*.txt|纯文本文件 (*.txt)"
+#: main.cpp:42
+msgid "KMouth"
+msgstr "KMouth"
 
-#: phraselist.cpp:454
-msgid "Open File as History"
-msgstr "打开文件作为历史记录"
+#: main.cpp:49
+msgid "Tips, extended phrase books"
+msgstr "提示，扩展词组本"
 
 #~ msgid "(New phrase book)"
 #~ msgstr "(新词组本)"
diff --git a/tde-i18n-zh_CN/messages/tdeaccessibility/ksayit.po b/tde-i18n-zh_CN/messages/tdeaccessibility/ksayit.po
index 5cfed7bf726..8ca7c4f4a9e 100644
--- a/tde-i18n-zh_CN/messages/tdeaccessibility/ksayit.po
+++ b/tde-i18n-zh_CN/messages/tdeaccessibility/ksayit.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ksayit\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2007-03-27 20:30+0800\n"
 "Last-Translator: Lie_Ex <lilith.shang@thizgroup.com>\n"
 "Language-Team:  <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaccessibility/kttsd.po b/tde-i18n-zh_CN/messages/tdeaccessibility/kttsd.po
index fa63da948a8..239ccd985a2 100644
--- a/tde-i18n-zh_CN/messages/tdeaccessibility/kttsd.po
+++ b/tde-i18n-zh_CN/messages/tdeaccessibility/kttsd.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-06-28 15:36+0800\n"
 "Last-Translator: Zhang Zhongli <zhang-zhongli@tom.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -769,7 +770,7 @@ msgstr "事件"
 #. i18n: file libkttsd/selecttalkerwidget.ui line 25
 #: filters/talkerchooser/talkerchooserconf.cpp:225
 #: kcmkttsmgr/kcmkttsmgr.cpp:2501 kttsjobmgr/kttsjobmgr.cpp:496
-#: libkttsd/selecttalkerdlg.h:60 rc.cpp:405
+#: libkttsd/selecttalkerdlg.h:61 rc.cpp:405
 #, no-c-format
 msgid "Select Talker"
 msgstr ""
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/akregator_konqplugin.po b/tde-i18n-zh_CN/messages/tdeaddons/akregator_konqplugin.po
index 88dc471aeb2..ce1b33485f0 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/akregator_konqplugin.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/akregator_konqplugin.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: akregator_konqplugin\n"
-"POT-Creation-Date: 2006-11-11 02:39+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-08-04 09:24+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/alsaplayerui.po b/tde-i18n-zh_CN/messages/tdeaddons/alsaplayerui.po
index 480d1c7414f..f0421840408 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/alsaplayerui.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/alsaplayerui.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: alsaplayerui.po\n"
-"POT-Creation-Date: 2008-07-08 01:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2002-10-09 22:08+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/ark_plugin.po b/tde-i18n-zh_CN/messages/tdeaddons/ark_plugin.po
index eecef32b338..89b1ff2d2e9 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/ark_plugin.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/ark_plugin.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ark_plugin\n"
-"POT-Creation-Date: 2006-10-17 02:38+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-08-04 09:25+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -54,11 +55,11 @@ msgstr "解压缩到子文件夹"
 msgid "Extract To..."
 msgstr "解压缩到..."
 
-#: arkplugin.cpp:435 arkplugin.cpp:479
+#: arkplugin.cpp:472 arkplugin.cpp:516
 msgid "Archive"
 msgstr "存档文件"
 
-#: arkplugin.cpp:439 arkplugin.cpp:483
+#: arkplugin.cpp:476 arkplugin.cpp:520
 #, c-format
 msgid "Archive %1"
 msgstr "存档文件 %1"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/atlantikdesigner.po b/tde-i18n-zh_CN/messages/tdeaddons/atlantikdesigner.po
index 6d52049ca31..b888968daf6 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/atlantikdesigner.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/atlantikdesigner.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: atlantikdesigner\n"
-"POT-Creation-Date: 2004-12-29 14:56+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-01-14 17:12+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,95 +28,6 @@ msgid ""
 "Your emails"
 msgstr "i18n-translation@lists.linux.net.cn"
 
-#: designer/main.cpp:12
-msgid "Atlantik Designer"
-msgstr "Atlantik 设计者"
-
-#: designer/main.cpp:13
-msgid "Atlantik gameboard designer"
-msgstr "Atlantik 棋盘设计者"
-
-#: designer/main.cpp:15
-msgid "(c) 2002 Jason Katz-Brown"
-msgstr "(c) 2002 Jason Katz-Brown"
-
-#: designer/main.cpp:20
-msgid "main author"
-msgstr "主要作者"
-
-#: designer/main.cpp:21
-msgid "libatlantikui"
-msgstr "libatlantikui"
-
-#: designer/designer.cpp:56
-msgid "&Edit Gameboard Info..."
-msgstr "编辑棋盘信息(&E)..."
-
-#: designer/designer.cpp:57
-msgid "&Edit Groups..."
-msgstr "编辑组(&E)..."
-
-#: designer/designer.cpp:59
-msgid "&Add 4 Squares"
-msgstr "添加4个方格(&A)"
-
-#: designer/designer.cpp:60
-msgid "&Remove 4 Squares"
-msgstr "删除4个方格(&R)"
-
-#: designer/designer.cpp:63
-msgid "&Up"
-msgstr "上(&U)"
-
-#: designer/designer.cpp:64
-msgid "&Down"
-msgstr "下(&D)"
-
-#: designer/designer.cpp:65
-msgid "&Left"
-msgstr "左(&L)"
-
-#: designer/designer.cpp:66
-msgid "&Right"
-msgstr "右(&R)"
-
-#: designer/designer.cpp:72
-msgid "Change Estate"
-msgstr "转换地产"
-
-#: designer/designer.cpp:194
-msgid "New Estate"
-msgstr "新地产"
-
-#: designer/designer.cpp:213
-msgid "There are unsaved changes to gameboard. Save them?"
-msgstr "棋盘上有未保存的改动。要保存吗？"
-
-#: designer/designer.cpp:213
-msgid "Unsaved Changes"
-msgstr "未保存的改动"
-
-#: designer/designer.cpp:351
-msgid "No Name"
-msgstr "没有命名"
-
-#: designer/designer.cpp:529
-msgid "This board file is invalid; cannot open."
-msgstr "该棋盘文件是无效的；无法打开。"
-
-#: designer/designer.cpp:529
-msgid "There are only %1 estates specified in this file."
-msgstr "该文件中只指定了 %1 个地产。"
-
-#: designer/designer.cpp:556
-#, c-format
-msgid "Jump to Estate %1"
-msgstr "跳到地产 %1"
-
-#: designer/designer.cpp:949
-msgid "Atlantik Gameboard Editor"
-msgstr "Atlantic 棋盘编辑器"
-
 #: designer/group.cpp:23
 msgid "Group Editor"
 msgstr "组编辑器"
@@ -185,6 +97,42 @@ msgstr "在下面输入新组的名称："
 msgid "That group is already on the list."
 msgstr "该组已经在列表中。"
 
+#: designer/boardinfo.cpp:19
+msgid "Gameboard Information"
+msgstr "棋盘信息"
+
+#: designer/boardinfo.cpp:42
+msgid "Version:"
+msgstr "版本："
+
+#: designer/boardinfo.cpp:52
+msgid "URL:"
+msgstr "URL："
+
+#: designer/boardinfo.cpp:60
+msgid "Description:"
+msgstr "描述："
+
+#: designer/boardinfo.cpp:72
+msgid "Background color:"
+msgstr "背景色："
+
+#: designer/boardinfo.cpp:79
+msgid "&Authors"
+msgstr "作者(&A)"
+
+#: designer/boardinfo.cpp:83
+msgid "&Thanks To"
+msgstr "致谢(&T)"
+
+#: designer/boardinfo.cpp:123
+msgid "&Add Name"
+msgstr "添加名称(&A)"
+
+#: designer/boardinfo.cpp:127
+msgid "&Delete Name"
+msgstr "删除名称(&D)"
+
 #: designer/editor.cpp:189
 msgid "Type:"
 msgstr "类型："
@@ -361,38 +309,91 @@ msgstr "价钱："
 msgid "Group:"
 msgstr "组："
 
-#: designer/boardinfo.cpp:19
-msgid "Gameboard Information"
-msgstr "棋盘信息"
+#: designer/designer.cpp:56
+msgid "&Edit Gameboard Info..."
+msgstr "编辑棋盘信息(&E)..."
 
-#: designer/boardinfo.cpp:42
-msgid "Version:"
-msgstr "版本："
+#: designer/designer.cpp:57
+msgid "&Edit Groups..."
+msgstr "编辑组(&E)..."
 
-#: designer/boardinfo.cpp:52
-msgid "URL:"
-msgstr "URL："
+#: designer/designer.cpp:59
+msgid "&Add 4 Squares"
+msgstr "添加4个方格(&A)"
 
-#: designer/boardinfo.cpp:60
-msgid "Description:"
-msgstr "描述："
+#: designer/designer.cpp:60
+msgid "&Remove 4 Squares"
+msgstr "删除4个方格(&R)"
 
-#: designer/boardinfo.cpp:72
-msgid "Background color:"
-msgstr "背景色："
+#: designer/designer.cpp:63
+msgid "&Up"
+msgstr "上(&U)"
 
-#: designer/boardinfo.cpp:79
-msgid "&Authors"
-msgstr "作者(&A)"
+#: designer/designer.cpp:64
+msgid "&Down"
+msgstr "下(&D)"
 
-#: designer/boardinfo.cpp:83
-msgid "&Thanks To"
-msgstr "致谢(&T)"
+#: designer/designer.cpp:65
+msgid "&Left"
+msgstr "左(&L)"
 
-#: designer/boardinfo.cpp:123
-msgid "&Add Name"
-msgstr "添加名称(&A)"
+#: designer/designer.cpp:66
+msgid "&Right"
+msgstr "右(&R)"
 
-#: designer/boardinfo.cpp:127
-msgid "&Delete Name"
-msgstr "删除名称(&D)"
+#: designer/designer.cpp:72
+msgid "Change Estate"
+msgstr "转换地产"
+
+#: designer/designer.cpp:194
+msgid "New Estate"
+msgstr "新地产"
+
+#: designer/designer.cpp:213
+msgid "There are unsaved changes to gameboard. Save them?"
+msgstr "棋盘上有未保存的改动。要保存吗？"
+
+#: designer/designer.cpp:213
+msgid "Unsaved Changes"
+msgstr "未保存的改动"
+
+#: designer/designer.cpp:351
+msgid "No Name"
+msgstr "没有命名"
+
+#: designer/designer.cpp:529
+msgid "This board file is invalid; cannot open."
+msgstr "该棋盘文件是无效的；无法打开。"
+
+#: designer/designer.cpp:529
+msgid "There are only %1 estates specified in this file."
+msgstr "该文件中只指定了 %1 个地产。"
+
+#: designer/designer.cpp:556
+#, c-format
+msgid "Jump to Estate %1"
+msgstr "跳到地产 %1"
+
+#: designer/designer.cpp:949
+msgid "Atlantik Gameboard Editor"
+msgstr "Atlantic 棋盘编辑器"
+
+#: designer/main.cpp:12
+msgid "Atlantik Designer"
+msgstr "Atlantik 设计者"
+
+#: designer/main.cpp:13
+msgid "Atlantik gameboard designer"
+msgstr "Atlantik 棋盘设计者"
+
+#: designer/main.cpp:15
+msgid "(c) 2002 Jason Katz-Brown"
+msgstr "(c) 2002 Jason Katz-Brown"
+
+#: designer/main.cpp:20
+msgid "main author"
+msgstr "主要作者"
+
+#: designer/main.cpp:21
+msgid "libatlantikui"
+msgstr "libatlantikui"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/audiorename_plugin.po b/tde-i18n-zh_CN/messages/tdeaddons/audiorename_plugin.po
index 0a9ace74b7f..c1081f0412f 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/audiorename_plugin.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/audiorename_plugin.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: audiorename_plugin\n"
-"POT-Creation-Date: 2007-01-07 02:43+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-01-14 17:13+0800\n"
 "Last-Translator: Sun Fang <sun_xp@msn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/autorefresh.po b/tde-i18n-zh_CN/messages/tdeaddons/autorefresh.po
index 7833b86074f..070fd69c0e0 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/autorefresh.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/autorefresh.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: autorefresh\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-01-14 17:14+0800\n"
 "Last-Translator: Sun Fang <sun_xp@msn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/babelfish.po b/tde-i18n-zh_CN/messages/tdeaddons/babelfish.po
index 6dac7a11c5d..a8956970969 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/babelfish.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/babelfish.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: babelfish\n"
-"POT-Creation-Date: 2008-04-08 02:02+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-06-20 11:56+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/charlatanui.po b/tde-i18n-zh_CN/messages/tdeaddons/charlatanui.po
index 7c8f9a43bb8..0887e00ce7a 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/charlatanui.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/charlatanui.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: charlatanui\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2002-10-29 22:58+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/crashesplugin.po b/tde-i18n-zh_CN/messages/tdeaddons/crashesplugin.po
index bf17e4706de..35ad20f157a 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/crashesplugin.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/crashesplugin.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: crashesplugin\n"
-"POT-Creation-Date: 2005-08-10 10:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-01-14 17:15+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/dirfilterplugin.po b/tde-i18n-zh_CN/messages/tdeaddons/dirfilterplugin.po
index f31b6501e94..b890ece784a 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/dirfilterplugin.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/dirfilterplugin.po
@@ -5,63 +5,64 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dirfilterplugin\n"
-"POT-Creation-Date: 2005-12-31 03:19+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-05-18 06:25+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: dirfilterplugin.cpp:155
+#: dirfilterplugin.cpp:156
 msgid "View F&ilter"
 msgstr "查看过滤器(&I)"
 
-#: dirfilterplugin.cpp:158
+#: dirfilterplugin.cpp:159
 msgid "Allow to filter the currently displayed items by filetype."
 msgstr "允许按照文件类型过滤目前显示的项目。"
 
-#: dirfilterplugin.cpp:175
+#: dirfilterplugin.cpp:176
 msgid "Clear Filter Field"
 msgstr "清除过滤字段"
 
-#: dirfilterplugin.cpp:179
+#: dirfilterplugin.cpp:180
 msgid "Clear filter field<p>Clears the content of the filter field."
 msgstr "清除过滤字段<p>清除过滤字段的内容。"
 
-#: dirfilterplugin.cpp:195
+#: dirfilterplugin.cpp:196
 msgid ""
 "Enter here a text which an item in the view must contain anywhere to be shown."
 msgstr "在此输入视图中的项目必须包含的文本。"
 
-#: dirfilterplugin.cpp:199
+#: dirfilterplugin.cpp:201
 msgid "Filter Field"
 msgstr "过滤字段"
 
-#: dirfilterplugin.cpp:250
+#: dirfilterplugin.cpp:278
 msgid "Only Show Items of Type"
 msgstr "仅显示项目类型为："
 
-#: dirfilterplugin.cpp:316
+#: dirfilterplugin.cpp:344
 msgid "Use Multiple Filters"
 msgstr "使用多重过滤器"
 
-#: dirfilterplugin.cpp:321
+#: dirfilterplugin.cpp:349
 msgid "Show Count"
 msgstr "显示计数"
 
-#: dirfilterplugin.cpp:325
+#: dirfilterplugin.cpp:353
 msgid "Reset"
 msgstr "重置"
 
-#. i18n: file dirfilterplugin.rc line 8
+#. i18n: file dirfilterplugin.rc line 10
 #: rc.cpp:6
 #, no-c-format
 msgid "Extra Toolbar"
 msgstr "额外工具栏"
 
-#. i18n: file dirfilterplugin.rc line 11
+#. i18n: file dirfilterplugin.rc line 14
 #: rc.cpp:9
 #, no-c-format
 msgid "Filter Toolbar"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/domtreeviewer.po b/tde-i18n-zh_CN/messages/tdeaddons/domtreeviewer.po
index 1920a9f558e..f474f427af7 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/domtreeviewer.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/domtreeviewer.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: domtreeviewer\n"
-"POT-Creation-Date: 2006-05-18 04:07+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-05-17 09:30+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/dub.po b/tde-i18n-zh_CN/messages/tdeaddons/dub.po
index c63d1095857..850690565b8 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/dub.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/dub.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dub\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-01-14 19:27+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/ffrs.po b/tde-i18n-zh_CN/messages/tdeaddons/ffrs.po
index f90937cc03d..725320d705d 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/ffrs.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/ffrs.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ffrs\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2002-10-29 23:12+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/fsview.po b/tde-i18n-zh_CN/messages/tdeaddons/fsview.po
index c7fac46134a..611ce62ce41 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/fsview.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/fsview.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: fsview\n"
-"POT-Creation-Date: 2007-05-17 02:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-01-14 19:26+0800\n"
 "Last-Translator: Xiong Jiang <jxiong@offtopic.org>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,21 +28,85 @@ msgid ""
 "Your emails"
 msgstr "i18n-translation@lists.linux.net.cn"
 
-#: main.cpp:19
-msgid "View filesystem starting from this folder"
-msgstr "从此文件夹开始查看文件系统"
+#: fsview.cpp:49 fsview.cpp:389
+msgid "Name"
+msgstr "名称"
 
-#: fsview_part.cpp:89 main.cpp:26
-msgid "FSView"
-msgstr "FSView"
+#: fsview.cpp:50
+msgid "Size"
+msgstr "大小"
 
-#: main.cpp:27
-msgid "Filesystem Viewer"
-msgstr "文件系统浏览器"
+#: fsview.cpp:51
+msgid "File Count"
+msgstr "文件数量"
 
-#: main.cpp:29
-msgid "(c) 2002, Josef Weidendorfer"
-msgstr "(c) 2002, Josef Weidendorfer"
+#: fsview.cpp:52
+msgid "Directory Count"
+msgstr "目录数量"
+
+#: fsview.cpp:53
+msgid "Last Modified"
+msgstr "最后更新"
+
+#: fsview.cpp:54 fsview.cpp:390
+msgid "Owner"
+msgstr "所有者"
+
+#: fsview.cpp:55 fsview.cpp:391
+msgid "Group"
+msgstr "用户组"
+
+#: fsview.cpp:56 fsview.cpp:392
+msgid "Mime Type"
+msgstr "MIME类型"
+
+#: fsview.cpp:280
+msgid "Go To"
+msgstr "转到"
+
+#: fsview.cpp:282
+msgid "Go Up"
+msgstr "上一级"
+
+#: fsview.cpp:284
+msgid "Stop Refresh"
+msgstr "停止刷新"
+
+#: fsview.cpp:286
+msgid "Refresh"
+msgstr "刷新"
+
+#: fsview.cpp:289
+msgid "Refresh '%1'"
+msgstr "刷新“%1”"
+
+#: fsview.cpp:292 fsview_part.cpp:123
+msgid "Stop at Depth"
+msgstr "停止深度"
+
+#: fsview.cpp:294 fsview_part.cpp:121
+msgid "Stop at Area"
+msgstr "停在区域"
+
+#: fsview.cpp:296
+msgid "Stop at Name"
+msgstr "停止名称"
+
+#: fsview.cpp:302 fsview_part.cpp:127
+msgid "Color Mode"
+msgstr "颜色模式"
+
+#: fsview.cpp:305 fsview_part.cpp:125
+msgid "Visualization"
+msgstr "可视化"
+
+#: fsview.cpp:387
+msgid "None"
+msgstr "无"
+
+#: fsview.cpp:388
+msgid "Depth"
+msgstr "深度"
 
 #: fsview_part.cpp:76
 msgid ""
@@ -56,6 +121,10 @@ msgid ""
 "%n folders"
 msgstr "%n 个文件夹"
 
+#: fsview_part.cpp:89 main.cpp:26
+msgid "FSView"
+msgstr "FSView"
+
 #: fsview_part.cpp:90
 msgid "Filesystem Utilization Viewer"
 msgstr "文件系统利用率查看"
@@ -77,22 +146,6 @@ msgstr ""
 "<p>注意在此模式中，当文件系统被改变时，特意<b>不</b>自动更新显示。</p>"
 "<p>有关用法和可以使用的选项的，详情可以查看在线帮助“帮助/FSView 手册”。</p> "
 
-#: fsview.cpp:294 fsview_part.cpp:121
-msgid "Stop at Area"
-msgstr "停在区域"
-
-#: fsview.cpp:292 fsview_part.cpp:123
-msgid "Stop at Depth"
-msgstr "停止深度"
-
-#: fsview.cpp:305 fsview_part.cpp:125
-msgid "Visualization"
-msgstr "可视化"
-
-#: fsview.cpp:302 fsview_part.cpp:127
-msgid "Color Mode"
-msgstr "颜色模式"
-
 #: fsview_part.cpp:131
 msgid "&FSView Manual"
 msgstr "FSView 手册(&F)"
@@ -248,66 +301,14 @@ msgstr "减小(到 %1)"
 msgid "Increment (to %1)"
 msgstr "增加(到 %1)"
 
-#: fsview.cpp:49 fsview.cpp:389
-msgid "Name"
-msgstr "名称"
-
-#: fsview.cpp:50
-msgid "Size"
-msgstr "大小"
-
-#: fsview.cpp:51
-msgid "File Count"
-msgstr "文件数量"
-
-#: fsview.cpp:52
-msgid "Directory Count"
-msgstr "目录数量"
-
-#: fsview.cpp:53
-msgid "Last Modified"
-msgstr "最后更新"
-
-#: fsview.cpp:54 fsview.cpp:390
-msgid "Owner"
-msgstr "所有者"
-
-#: fsview.cpp:55 fsview.cpp:391
-msgid "Group"
-msgstr "用户组"
-
-#: fsview.cpp:56 fsview.cpp:392
-msgid "Mime Type"
-msgstr "MIME类型"
-
-#: fsview.cpp:280
-msgid "Go To"
-msgstr "转到"
-
-#: fsview.cpp:282
-msgid "Go Up"
-msgstr "上一级"
-
-#: fsview.cpp:284
-msgid "Stop Refresh"
-msgstr "停止刷新"
-
-#: fsview.cpp:286
-msgid "Refresh"
-msgstr "刷新"
-
-#: fsview.cpp:289
-msgid "Refresh '%1'"
-msgstr "刷新“%1”"
-
-#: fsview.cpp:296
-msgid "Stop at Name"
-msgstr "停止名称"
+#: main.cpp:19
+msgid "View filesystem starting from this folder"
+msgstr "从此文件夹开始查看文件系统"
 
-#: fsview.cpp:387
-msgid "None"
-msgstr "无"
+#: main.cpp:27
+msgid "Filesystem Viewer"
+msgstr "文件系统浏览器"
 
-#: fsview.cpp:388
-msgid "Depth"
-msgstr "深度"
+#: main.cpp:29
+msgid "(c) 2002, Josef Weidendorfer"
+msgstr "(c) 2002, Josef Weidendorfer"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/imagerename_plugin.po b/tde-i18n-zh_CN/messages/tdeaddons/imagerename_plugin.po
index 1f9a31a89da..1d42cbd2910 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/imagerename_plugin.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/imagerename_plugin.po
@@ -5,15 +5,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: imagerename_plugin\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-01-14 17:17+0800\n"
 "Last-Translator: Liu Songhe <jackliu9999@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: image_plugin.cpp:71
+#: image_plugin.cpp:70
 msgid "You want to overwrite the left picture with the one on the right."
 msgstr "您将以右侧的图片覆盖左侧的。"
 
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/imgalleryplugin.po b/tde-i18n-zh_CN/messages/tdeaddons/imgalleryplugin.po
index abfa2a43ad6..371840048a9 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/imgalleryplugin.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/imgalleryplugin.po
@@ -9,10 +9,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: imgalleryplugin\n"
-"POT-Creation-Date: 2007-01-07 02:43+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-01-15 01:14+0800\n"
 "Last-Translator: Mai Haohui <maihaohui@hotmail.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/katecppsymbolviewer.po b/tde-i18n-zh_CN/messages/tdeaddons/katecppsymbolviewer.po
index d0e77769351..f99aca99dc5 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/katecppsymbolviewer.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/katecppsymbolviewer.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katecppsymbolviewer\n"
-"POT-Creation-Date: 2007-03-26 02:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-05-17 09:19+0800\n"
 "Last-Translator: Sun Fang <sun_xp@msn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,10 +87,10 @@ msgstr ""
 msgid "Globals"
 msgstr "全局"
 
-#: plugin_katesymbolviewer.h:136
+#: plugin_katesymbolviewer.h:139
 msgid "Symbol Viewer"
 msgstr "符号查看器"
 
-#: plugin_katesymbolviewer.h:137
+#: plugin_katesymbolviewer.h:140
 msgid "Symbol Viewer Configuration Page"
 msgstr "符号查看器配置页"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/katefiletemplates.po b/tde-i18n-zh_CN/messages/tdeaddons/katefiletemplates.po
index 4a41dfe389a..3dd1ca68426 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/katefiletemplates.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/katefiletemplates.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katefiletemplates\n"
-"POT-Creation-Date: 2007-10-02 01:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-07-03 21:34+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/katefll_initplugin.po b/tde-i18n-zh_CN/messages/tdeaddons/katefll_initplugin.po
index a9a295c78db..65f868093bc 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/katefll_initplugin.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/katefll_initplugin.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katefll_initplugin\n"
-"POT-Creation-Date: 2005-07-24 01:39+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-08-04 09:29+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/katefll_plugin.po b/tde-i18n-zh_CN/messages/tdeaddons/katefll_plugin.po
index a9cd10a43d9..b7c75f1de58 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/katefll_plugin.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/katefll_plugin.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katefll_plugin\n"
-"POT-Creation-Date: 2005-07-24 01:39+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2002-10-29 23:22+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/katehelloworld.po b/tde-i18n-zh_CN/messages/tdeaddons/katehelloworld.po
index 2019cb69ad6..b7bcb905095 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/katehelloworld.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/katehelloworld.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katehelloworld\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2001-11-22 11:13+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/katehtmltools.po b/tde-i18n-zh_CN/messages/tdeaddons/katehtmltools.po
index 69de08edf47..8dbe5e9df41 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/katehtmltools.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/katehtmltools.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katehtmltools\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2002-02-17 14:59+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@126.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/kateinsertcommand.po b/tde-i18n-zh_CN/messages/tdeaddons/kateinsertcommand.po
index 3f631906f74..39d2b82bf04 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/kateinsertcommand.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/kateinsertcommand.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kateinsertcommand\n"
-"POT-Creation-Date: 2006-03-06 03:57+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-01-14 17:21+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -61,7 +62,7 @@ msgstr "命令退出返回状态 %1"
 msgid "Oops!"
 msgstr "糟糕！"
 
-#: plugin_kateinsertcommand.cpp:286 plugin_kateinsertcommand.h:73
+#: plugin_kateinsertcommand.cpp:286 plugin_kateinsertcommand.h:74
 msgid "Insert Command"
 msgstr "插入命令"
 
@@ -155,10 +156,10 @@ msgstr ""
 "<p><strong>文档文件夹：</strong> 文档的文件夹(仅用于本地文档)。"
 "<p><strong>上一次工作文件夹：</strong> 您上一次使用这个插件时设置的工作文件夹。</p></qt>"
 
-#: plugin_kateinsertcommand.h:75
+#: plugin_kateinsertcommand.h:76
 msgid "Configure Insert Command Plugin"
 msgstr "配置插入命令插件"
 
-#: plugin_kateinsertcommand.h:135
+#: plugin_kateinsertcommand.h:137
 msgid "Please Wait"
 msgstr "请稍候"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/katekjswrapper.po b/tde-i18n-zh_CN/messages/tdeaddons/katekjswrapper.po
index 38863f3e763..243bb5c1bec 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/katekjswrapper.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/katekjswrapper.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katekjswrapper\n"
-"POT-Creation-Date: 2004-10-30 01:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-05-17 09:20+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/katemake.po b/tde-i18n-zh_CN/messages/tdeaddons/katemake.po
index 0b3cf3c7e92..9bd853b8ad6 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/katemake.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/katemake.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katemake\n"
-"POT-Creation-Date: 2006-08-18 04:13+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-06-20 12:19+0800\n"
 "Last-Translator: Sun Fang <sun_xp@msn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/katemodeline.po b/tde-i18n-zh_CN/messages/tdeaddons/katemodeline.po
index 2141da0ad20..15b669b3b15 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/katemodeline.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/katemodeline.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katemodeline\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2002-10-29 23:25+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/kateopenheader.po b/tde-i18n-zh_CN/messages/tdeaddons/kateopenheader.po
index 7dd210147c2..3d8d7671017 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/kateopenheader.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/kateopenheader.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kateopenheader\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2002-10-29 23:25+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/katepybrowse.po b/tde-i18n-zh_CN/messages/tdeaddons/katepybrowse.po
index c402327582e..315ae3ff072 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/katepybrowse.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/katepybrowse.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katepybrowser\n"
-"POT-Creation-Date: 2005-05-08 01:27+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-01-14 17:18+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/katesnippets.po b/tde-i18n-zh_CN/messages/tdeaddons/katesnippets.po
index 2a4288b719b..971521ebb29 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/katesnippets.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/katesnippets.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katesnippets\n"
-"POT-Creation-Date: 2005-05-08 01:27+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-11-27 21:06+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/katetabbarextension.po b/tde-i18n-zh_CN/messages/tdeaddons/katetabbarextension.po
index 5a667dcbba7..1642591cbd7 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/katetabbarextension.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/katetabbarextension.po
@@ -1,29 +1,37 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katetabbarextension\n"
-"POT-Creation-Date: 2008-02-22 01:36+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-06-20 12:20+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plugin_katetabbarextension.cpp:484
-msgid "Sorting Behavior"
-msgstr "排序行为"
+#: plugin_katetabbarextension.cpp:483
+msgid "Behavior options"
+msgstr ""
 
-#: plugin_katetabbarextension.cpp:488
+#: plugin_katetabbarextension.cpp:486
 msgid "Sort files alphabetically"
 msgstr "按字母顺序排序文件"
 
+#: plugin_katetabbarextension.cpp:487
+msgid "Close document on mouse middle click"
+msgstr ""
+
 #. i18n: file ui.rc line 4
-#: plugin_katetabbarextension.h:307 rc.cpp:3
+#: plugin_katetabbarextension.h:348 rc.cpp:3
 #, no-c-format
 msgid "Tab Bar Extension"
 msgstr "标签栏扩展"
 
-#: plugin_katetabbarextension.h:308
+#: plugin_katetabbarextension.h:349
 #, fuzzy
 msgid "Configure Tab Bar Extension"
 msgstr "标签栏扩展"
+
+#~ msgid "Sorting Behavior"
+#~ msgstr "排序行为"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/katetextfilter.po b/tde-i18n-zh_CN/messages/tdeaddons/katetextfilter.po
index a784f3d3216..899b167c639 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/katetextfilter.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/katetextfilter.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katetextfilter\n"
-"POT-Creation-Date: 2006-01-02 03:18+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-08-04 09:31+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/katexmlcheck.po b/tde-i18n-zh_CN/messages/tdeaddons/katexmlcheck.po
index 695bf1ea418..2656c29eb34 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/katexmlcheck.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/katexmlcheck.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katexmlcheck\n"
-"POT-Creation-Date: 2005-05-08 01:27+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2003-01-12 16:39-0500\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/katexmltools.po b/tde-i18n-zh_CN/messages/tdeaddons/katexmltools.po
index 224d47eebc1..12d2b0136af 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/katexmltools.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/katexmltools.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katexmltools\n"
-"POT-Creation-Date: 2005-05-08 01:27+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-01-14 17:10+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/kbinaryclock.po b/tde-i18n-zh_CN/messages/tdeaddons/kbinaryclock.po
index 2b85096dd1a..8dbf7ad3712 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/kbinaryclock.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/kbinaryclock.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kbinaryclock\n"
-"POT-Creation-Date: 2008-07-08 01:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-01-14 19:21+0800\n"
 "Last-Translator: Yan Shuangchun <yahzee@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/kcmkuick.po b/tde-i18n-zh_CN/messages/tdeaddons/kcmkuick.po
index 15a827c7c59..0db7a45cefb 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/kcmkuick.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/kcmkuick.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkuick\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-01-14 17:11+0800\n"
 "Last-Translator: Liu Songhe <jackliu9999@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/kmathapplet.po b/tde-i18n-zh_CN/messages/tdeaddons/kmathapplet.po
index 6cfa92c6717..ec472eff992 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/kmathapplet.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/kmathapplet.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmathapplet\n"
-"POT-Creation-Date: 2004-12-17 01:25+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-06-21 13:52+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/kolourpicker.po b/tde-i18n-zh_CN/messages/tdeaddons/kolourpicker.po
index 8a4e3c40164..6ca152b867b 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/kolourpicker.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/kolourpicker.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kolourpicker\n"
-"POT-Creation-Date: 2008-08-12 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-01-14 17:06+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/konqsidebar_delicious.po b/tde-i18n-zh_CN/messages/tdeaddons/konqsidebar_delicious.po
index 2d62cb7ede0..b3c7d88a52e 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/konqsidebar_delicious.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/konqsidebar_delicious.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: konqsidebar_delicous\n"
-"POT-Creation-Date: 2005-08-18 04:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-10-07 00:58+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/konqsidebar_mediaplayer.po b/tde-i18n-zh_CN/messages/tdeaddons/konqsidebar_mediaplayer.po
index f06885ad74a..a29b6f79dd7 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/konqsidebar_mediaplayer.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/konqsidebar_mediaplayer.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: konqsidebar_mediaplayer\n"
-"POT-Creation-Date: 2004-12-11 01:24+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-01-14 17:07+0800\n"
 "Last-Translator: Yin Huaming <yhmact@pzh-public.sc.cninfo.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/konqsidebar_metabar.po b/tde-i18n-zh_CN/messages/tdeaddons/konqsidebar_metabar.po
index be019e6e12f..31907ad7429 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/konqsidebar_metabar.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/konqsidebar_metabar.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: metabar 3.5\n"
-"POT-Creation-Date: 2006-03-13 03:59+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-12-10 11:14+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/konqsidebar_news.po b/tde-i18n-zh_CN/messages/tdeaddons/konqsidebar_news.po
index 18e1b5ecae4..88bdad161a6 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/konqsidebar_news.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/konqsidebar_news.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: konqsidebar_news\n"
-"POT-Creation-Date: 2004-12-11 01:24+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-06-21 13:54+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/ksig.po b/tde-i18n-zh_CN/messages/tdeaddons/ksig.po
index 8750e771273..0a1316953ab 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/ksig.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/ksig.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksig\n"
-"POT-Creation-Date: 2005-03-07 01:46+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-01-14 17:07+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/ktimemon.po b/tde-i18n-zh_CN/messages/tdeaddons/ktimemon.po
index 5794792274a..cfb16d7b6c2 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/ktimemon.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/ktimemon.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ktimemon\n"
-"POT-Creation-Date: 2006-04-15 04:00+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2002-10-29 23:42+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -312,8 +313,9 @@ msgstr ""
 "交换区：%4 MB %5% 空闲"
 
 #: timemon.cc:238
+#, fuzzy
 msgid ""
-"KTimeMon for TDE\n"
+"KTimeMon for KDE\n"
 "Maintained by Dirk A. Mueller <dmuell@gmx.net>\n"
 "Written by M. Maierhofer (m.maierhofer@tees.ac.uk)\n"
 "Based on timemon by H. Maierhofer"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/kuick_plugin.po b/tde-i18n-zh_CN/messages/tdeaddons/kuick_plugin.po
index ac48ea4eddd..c14ca6cd01a 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/kuick_plugin.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/kuick_plugin.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kuick_plugin\n"
-"POT-Creation-Date: 2006-11-03 02:41+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-01-14 17:18+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/libkaddrbk_geo_xxport.po b/tde-i18n-zh_CN/messages/tdeaddons/libkaddrbk_geo_xxport.po
index efc182c8573..03c983d62e1 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/libkaddrbk_geo_xxport.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/libkaddrbk_geo_xxport.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2004-11-25 01:30+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-01-14 22:31+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/libkaddrbk_gmx_xxport.po b/tde-i18n-zh_CN/messages/tdeaddons/libkaddrbk_gmx_xxport.po
index 0168f1cbb77..4bdb8be02df 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/libkaddrbk_gmx_xxport.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/libkaddrbk_gmx_xxport.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkaddrbk_gmx_xxport\n"
-"POT-Creation-Date: 2006-08-28 02:41+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-05-17 09:33+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/lyrics.po b/tde-i18n-zh_CN/messages/tdeaddons/lyrics.po
index d415c224762..3f40c4c6d8c 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/lyrics.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/lyrics.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lyrics\n"
-"POT-Creation-Date: 2004-11-24 01:22+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-01-14 19:20+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +27,7 @@ msgstr "配置歌词插件"
 msgid "Search providers:"
 msgstr "搜索提供者："
 
-#: cmodule.cpp:61 cmodule.h:24
+#: cmodule.cpp:61 cmodule.h:25
 msgid "New Search Provider"
 msgstr "新增搜索提供者"
 
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/mediacontrol.po b/tde-i18n-zh_CN/messages/tdeaddons/mediacontrol.po
index 5372c80bd4c..c4e7adbec4f 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/mediacontrol.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/mediacontrol.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mediacontrol\n"
-"POT-Creation-Date: 2008-08-12 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-08-04 09:33+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -75,7 +76,8 @@ msgid "Fix for Noatun-Support"
 msgstr "Noatun 支持修正"
 
 #: mediacontrol.cpp:127
-msgid "Fix for Vertical Slider"
+#, fuzzy
+msgid "Fix forQt::Vertical Slider"
 msgstr "垂直滑块修正"
 
 #: mediacontrol.cpp:129
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/mf_konqplugin.po b/tde-i18n-zh_CN/messages/tdeaddons/mf_konqplugin.po
index d6ac0b82fde..19bec0260be 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/mf_konqplugin.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/mf_konqplugin.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mf_konqplugin\n"
-"POT-Creation-Date: 2005-06-13 01:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-08-04 09:38+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/minitoolsplugin.po b/tde-i18n-zh_CN/messages/tdeaddons/minitoolsplugin.po
index cac8cfab12b..0408b4c301d 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/minitoolsplugin.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/minitoolsplugin.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: minitoolsplugin\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2003-11-02 22:34+0800\n"
 "Last-Translator: Yan Shuangchun <yahzee@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/nexscope.po b/tde-i18n-zh_CN/messages/tdeaddons/nexscope.po
index 685b935204c..6a1c6ba6bbc 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/nexscope.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/nexscope.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nexscope\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2002-11-08 11:05-0500\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/pitchablespeed.po b/tde-i18n-zh_CN/messages/tdeaddons/pitchablespeed.po
index a2f58cda384..0a7c2c13ccd 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/pitchablespeed.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/pitchablespeed.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pitchablespeed\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2002-10-29 23:55+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/rellinks.po b/tde-i18n-zh_CN/messages/tdeaddons/rellinks.po
index 2df4601b525..c8851636c1e 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/rellinks.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/rellinks.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rellinks\n"
-"POT-Creation-Date: 2005-09-05 02:42+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-06-21 14:04+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/searchbarplugin.po b/tde-i18n-zh_CN/messages/tdeaddons/searchbarplugin.po
index f8b6a2def00..946e2212439 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/searchbarplugin.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/searchbarplugin.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: searchbarplugin\n"
-"POT-Creation-Date: 2006-06-20 04:04+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-08-04 09:37+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -15,29 +16,45 @@ msgstr ""
 msgid "Search Toolbar"
 msgstr "搜索工具栏"
 
-#: searchbar.cpp:71
+#: searchbar.cpp:80
 msgid "Search Bar"
 msgstr "搜索栏"
 
-#: searchbar.cpp:79
+#: searchbar.cpp:88
 msgid ""
 "Search Bar"
 "<p>Enter a search term. Click on the icon to change search mode or provider."
 msgstr "搜索栏<p>输入搜索条件。单击图标可更改搜索模式或提供者。"
 
-#: searchbar.cpp:82
+#: searchbar.cpp:91
 msgid "Focus Searchbar"
 msgstr "聚焦搜索栏"
 
-#: searchbar.cpp:264 searchbar.cpp:327
+#: searchbar.cpp:322 searchbar.cpp:385
 msgid "Find in This Page"
 msgstr "在本页中查找"
 
-#: searchbar.cpp:298
+#: searchbar.cpp:356
 msgid "%1 Search"
 msgstr "%1 搜索"
 
-#: searchbar.cpp:358
+#: searchbar.cpp:416
+msgid "Use Google Suggest"
+msgstr ""
+
+#: searchbar.cpp:418
+msgid "For Google Only"
+msgstr ""
+
+#: searchbar.cpp:418
+msgid "For All Searches"
+msgstr ""
+
+#: searchbar.cpp:418
+msgid "Never"
+msgstr ""
+
+#: searchbar.cpp:421
 msgid "Select Search Engines..."
 msgstr "选择搜索引擎..."
 
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/synaescope.po b/tde-i18n-zh_CN/messages/tdeaddons/synaescope.po
index 90da89372ac..01de8507358 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/synaescope.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/synaescope.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: synaescope\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-01-14 22:34+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/tdefile_cert.po b/tde-i18n-zh_CN/messages/tdeaddons/tdefile_cert.po
index f810a30d738..ec9431236a8 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/tdefile_cert.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/tdefile_cert.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_cert\n"
-"POT-Creation-Date: 2004-11-11 01:23+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-05-17 09:37+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/tdefile_desktop.po b/tde-i18n-zh_CN/messages/tdeaddons/tdefile_desktop.po
index 4d8d8bdb2b0..86cc88f5468 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/tdefile_desktop.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/tdefile_desktop.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_desktop\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2002-10-29 23:34+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,6 +63,6 @@ msgstr "首选项目"
 msgid "Link To"
 msgstr "链接到"
 
-#: tdefile_desktop.cpp:101
+#: tdefile_desktop.cpp:102
 msgid "Service"
 msgstr "服务"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/tdefile_folder.po b/tde-i18n-zh_CN/messages/tdeaddons/tdefile_folder.po
index f9e42790166..87b7cb59beb 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/tdefile_folder.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/tdefile_folder.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_folder\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2002-10-29 23:35+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/tdefile_html.po b/tde-i18n-zh_CN/messages/tdeaddons/tdefile_html.po
index c6c2fa7fc09..440b85a26b5 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/tdefile_html.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/tdefile_html.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_html\n"
-"POT-Creation-Date: 2006-11-26 03:48+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2002-10-29 23:35+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/tdefile_lnk.po b/tde-i18n-zh_CN/messages/tdeaddons/tdefile_lnk.po
index 397901b3290..f4d4afe2882 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/tdefile_lnk.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/tdefile_lnk.po
@@ -5,14 +5,35 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_lnk\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-06-21 13:48+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: lnkforward.cpp:37
+msgid "lnkforward"
+msgstr "lnkforward"
+
+#: lnkforward.cpp:39
+msgid "TDE tool for opening URLs given in a Windows .lnk file"
+msgstr "打开 Windows .lnk 文件中给出 URL 的 TDE 工具"
+
+#: lnkforward.cpp:45
+msgid ""
+"Map a Windows drive to a local mountpoint, e.g. \"C=/mnt/windows\"\n"
+"This option can be given multiple times"
+msgstr ""
+"将 Windows 驱动器映射到本地挂载点，如“C=/mnt/windows”\n"
+"此选项可以多次出现"
+
+#: lnkforward.cpp:47
+msgid "Windows .lnk file to open"
+msgstr "要打开的 Windows .lnk 文件"
+
 #: tdefile_lnk.cpp:46
 msgid "Windows Link File Information"
 msgstr "Windows 快捷方式文件信息"
@@ -41,23 +62,3 @@ msgstr "位于 Windows 盘：%1"
 #: tdefile_lnk.cpp:83
 msgid "on network share"
 msgstr "位于网络共享"
-
-#: lnkforward.cpp:37
-msgid "lnkforward"
-msgstr "lnkforward"
-
-#: lnkforward.cpp:39
-msgid "TDE tool for opening URLs given in a Windows .lnk file"
-msgstr "打开 Windows .lnk 文件中给出 URL 的 TDE 工具"
-
-#: lnkforward.cpp:45
-msgid ""
-"Map a Windows drive to a local mountpoint, e.g. \"C=/mnt/windows\"\n"
-"This option can be given multiple times"
-msgstr ""
-"将 Windows 驱动器映射到本地挂载点，如“C=/mnt/windows”\n"
-"此选项可以多次出现"
-
-#: lnkforward.cpp:47
-msgid "Windows .lnk file to open"
-msgstr "要打开的 Windows .lnk 文件"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/tdefile_mhtml.po b/tde-i18n-zh_CN/messages/tdeaddons/tdefile_mhtml.po
index 1f5e1da2680..d3aa1f3fe3a 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/tdefile_mhtml.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/tdefile_mhtml.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_mhtml\n"
-"POT-Creation-Date: 2005-01-19 01:25+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-05-17 09:35+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/tdefile_txt.po b/tde-i18n-zh_CN/messages/tdeaddons/tdefile_txt.po
index 9bec66741cc..b95e7bac7dc 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/tdefile_txt.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/tdefile_txt.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_txt\n"
-"POT-Creation-Date: 2005-01-08 01:24+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2002-10-29 23:36+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/tdehtmlsettingsplugin.po b/tde-i18n-zh_CN/messages/tdeaddons/tdehtmlsettingsplugin.po
index a35ac50ca37..e4efd65ea7f 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/tdehtmlsettingsplugin.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/tdehtmlsettingsplugin.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdehtmlsettingsplugin\n"
-"POT-Creation-Date: 2005-02-10 01:34+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2003-11-11 12:45+0800\n"
 "Last-Translator: Yan Shuangchun <yahzee@d3eye.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/tippecanoe.po b/tde-i18n-zh_CN/messages/tdeaddons/tippecanoe.po
index ccd4b0ffb5c..38a08daf139 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/tippecanoe.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/tippecanoe.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tippecanoe\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2002-10-29 23:56+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/tyler.po b/tde-i18n-zh_CN/messages/tdeaddons/tyler.po
index ef0e36bc5ff..80d1d84cf89 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/tyler.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/tyler.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tyler\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2002-10-29 23:57+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/uachangerplugin.po b/tde-i18n-zh_CN/messages/tdeaddons/uachangerplugin.po
index 12fc2da4ebd..e3a0f3e415c 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/uachangerplugin.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/uachangerplugin.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: uachangerplugin\n"
-"POT-Creation-Date: 2005-06-28 01:37+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-06-20 12:18+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/validatorsplugin.po b/tde-i18n-zh_CN/messages/tdeaddons/validatorsplugin.po
index afb713911ee..113730d861b 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/validatorsplugin.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/validatorsplugin.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vaildatorsplugin\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-01-14 19:23+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/wakeup.po b/tde-i18n-zh_CN/messages/tdeaddons/wakeup.po
index 720e8a28436..43f19c2b450 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/wakeup.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/wakeup.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wakeup\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2002-10-29 23:59+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/wavecapture.po b/tde-i18n-zh_CN/messages/tdeaddons/wavecapture.po
index f5cae7f86c0..d4bcd6a41bc 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/wavecapture.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/wavecapture.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wavecapture\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2002-10-30 00:02+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeaddons/webarchiver.po b/tde-i18n-zh_CN/messages/tdeaddons/webarchiver.po
index 22c89edc2ce..9dd6990f9b3 100644
--- a/tde-i18n-zh_CN/messages/tdeaddons/webarchiver.po
+++ b/tde-i18n-zh_CN/messages/tdeaddons/webarchiver.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: webarchiver\n"
-"POT-Creation-Date: 2007-01-25 02:44+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-08-04 09:39+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeadmin/kcmlilo.po b/tde-i18n-zh_CN/messages/tdeadmin/kcmlilo.po
index 081521cedc1..8464fdce480 100644
--- a/tde-i18n-zh_CN/messages/tdeadmin/kcmlilo.po
+++ b/tde-i18n-zh_CN/messages/tdeadmin/kcmlilo.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmlilo\n"
-"POT-Creation-Date: 2007-03-13 02:18+0100\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2002-10-30 01:19+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeadmin/kcron.po b/tde-i18n-zh_CN/messages/tdeadmin/kcron.po
index d1373b5f206..c061b669aae 100644
--- a/tde-i18n-zh_CN/messages/tdeadmin/kcron.po
+++ b/tde-i18n-zh_CN/messages/tdeadmin/kcron.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcron\n"
-"POT-Creation-Date: 2007-05-25 02:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2004-05-30 14:41+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -41,7 +42,7 @@ msgstr "没有找到 UID 为“%1”的密码项"
 msgid "An error occurred while updating crontab."
 msgstr "更新 crontab 时发生了错误。"
 
-#: ctdom.cpp:33 ctdow.cpp:58 cttask.cpp:316
+#: ctdom.cpp:33 ctdow.cpp:58 cttask.cpp:303
 msgid "every day "
 msgstr "每天 "
 
@@ -255,43 +256,43 @@ msgstr "十一月"
 msgid "December"
 msgstr "十二月"
 
-#: cttask.cpp:251
+#: cttask.cpp:238
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: cttask.cpp:252
+#: cttask.cpp:239
 msgid ""
 "_: Please translator, read the README.translators file in kcron's source code\n"
 "DAYS_OF_MONTH of MONTHS"
 msgstr "MONTHS DAYS_OF_MONTH"
 
-#: cttask.cpp:253
+#: cttask.cpp:240
 msgid ""
 "_: Really, read that file\n"
 "every DAYS_OF_WEEK"
 msgstr "每个 DAYS_OF_WEEK"
 
-#: cttask.cpp:254
+#: cttask.cpp:241
 msgid "DOM_FORMAT as well as DOW_FORMAT"
 msgstr "DOM_FORMAT 以及 DOW_FORMAT"
 
-#: cttask.cpp:255
+#: cttask.cpp:242
 msgid "At TIME"
 msgstr "在 TIME"
 
-#: cttask.cpp:256
+#: cttask.cpp:243
 msgid "TIME_FORMAT, DATE_FORMAT"
 msgstr "DATE_FORMAT 的 TIME_FORMAT"
 
-#: cttask.cpp:302
+#: cttask.cpp:289
 msgid ", and "
 msgstr " 和 "
 
-#: cttask.cpp:304 ctunit.cpp:187
+#: cttask.cpp:291 ctunit.cpp:187
 msgid " and "
 msgstr " 和 "
 
-#: cttask.cpp:306 ctunit.cpp:189
+#: cttask.cpp:293 ctunit.cpp:189
 msgid ", "
 msgstr "、"
 
@@ -524,87 +525,83 @@ msgstr "程序(&P)："
 msgid "&Browse..."
 msgstr "浏览(&B)..."
 
-#: kttask.cpp:176
-msgid "&Silent"
-msgstr "安静(&S)"
-
-#: kttask.cpp:185
+#: kttask.cpp:180
 msgid "Months"
 msgstr "月"
 
-#: kttask.cpp:201 kttask.cpp:234 kttask.cpp:254 kttask.cpp:314 kttask.cpp:343
-#: kttask.cpp:712 kttask.cpp:741 kttask.cpp:750 kttask.cpp:779 kttask.cpp:788
-#: kttask.cpp:817 kttask.cpp:826 kttask.cpp:855 kttask.cpp:864 kttask.cpp:893
+#: kttask.cpp:196 kttask.cpp:229 kttask.cpp:249 kttask.cpp:309 kttask.cpp:338
+#: kttask.cpp:706 kttask.cpp:735 kttask.cpp:744 kttask.cpp:773 kttask.cpp:782
+#: kttask.cpp:811 kttask.cpp:820 kttask.cpp:849 kttask.cpp:858 kttask.cpp:887
 msgid "Set All"
 msgstr "全部设置"
 
-#: kttask.cpp:207
+#: kttask.cpp:202
 msgid "Days of Month"
 msgstr "月中的天"
 
-#: kttask.cpp:238
+#: kttask.cpp:233
 msgid "Days of Week"
 msgstr "周中的天"
 
-#: kttask.cpp:260
+#: kttask.cpp:255
 msgid "Daily"
 msgstr "每天"
 
-#: kttask.cpp:266
+#: kttask.cpp:261
 msgid "Run every day"
 msgstr "每天运行"
 
-#: kttask.cpp:271
+#: kttask.cpp:266
 msgid "Hours"
 msgstr "小时"
 
-#: kttask.cpp:276
+#: kttask.cpp:271
 msgid "AM"
 msgstr "AM"
 
-#: kttask.cpp:299
+#: kttask.cpp:294
 msgid "PM"
 msgstr "PM"
 
-#: kttask.cpp:318
+#: kttask.cpp:313
 msgid "Minutes"
 msgstr "分钟"
 
-#: kttask.cpp:528
+#: kttask.cpp:523
 msgid ""
 "Please enter the following to schedule the task:\n"
 msgstr ""
 "请输入以下内容来调度任务：\n"
 
-#: kttask.cpp:534
+#: kttask.cpp:529
 msgid "the program to run"
 msgstr "要运行的程序"
 
-#: kttask.cpp:546
+#: kttask.cpp:541
 msgid "the months"
 msgstr "月份"
 
-#: kttask.cpp:567
+#: kttask.cpp:562
 msgid "either the days of the month or the days of the week"
 msgstr "月中的天或星期中的天"
 
-#: kttask.cpp:583
+#: kttask.cpp:578
 msgid "the hours"
 msgstr "小时"
 
-#: kttask.cpp:599
+#: kttask.cpp:594
 msgid "the minutes"
 msgstr "分钟"
 
-#: kttask.cpp:627
+#: kttask.cpp:622
 msgid "Cannot locate program. Please re-enter."
 msgstr "无法定位程序。请重新输入。"
 
-#: kttask.cpp:635
+#: kttask.cpp:630
 msgid "Program is not an executable file. Please re-enter."
 msgstr "程序不是一个可执行文件。请重新输入。"
 
-#: kttask.cpp:703
+#: kttask.cpp:697
 msgid "Only local or mounted files can be executed by crontab."
 msgstr "Crontab只能执行本地或安装的文件。"
 
@@ -677,3 +674,6 @@ msgstr "TDE 任务调度器"
 #: main.cpp:22
 msgid "KCron"
 msgstr "KCron"
+
+#~ msgid "&Silent"
+#~ msgstr "安静(&S)"
diff --git a/tde-i18n-zh_CN/messages/tdeadmin/kdat.po b/tde-i18n-zh_CN/messages/tdeadmin/kdat.po
index b97a03ce5bc..38d2a8cc157 100644
--- a/tde-i18n-zh_CN/messages/tdeadmin/kdat.po
+++ b/tde-i18n-zh_CN/messages/tdeadmin/kdat.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeadmin\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2004-11-15 15:16+0800\n"
 "Last-Translator: Wang Jian <larkw@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -994,7 +995,7 @@ msgstr "恢复到文件夹："
 msgid "Verify in folder:"
 msgstr "在文件夹中校验："
 
-#. i18n: file OptionsDlgWidget.ui line 136
+#. i18n: file OptionsDlgWidget.ui line 142
 #: VerifyOptDlg.cpp:60 rc.cpp:30 rc.cpp:42
 #, no-c-format
 msgid "..."
@@ -1038,7 +1039,7 @@ msgstr "无法分配内存"
 msgid "Options Widget"
 msgstr "选项部件"
 
-#. i18n: file OptionsDlgWidget.ui line 53
+#. i18n: file OptionsDlgWidget.ui line 56
 #: rc.cpp:6
 #, no-c-format
 msgid ""
@@ -1046,7 +1047,7 @@ msgid ""
 " This is used when formatting the tapes."
 msgstr "此设置决定了 KDat 认为备份磁带所拥有的容量。此选项主要用于格式化磁带。"
 
-#. i18n: file OptionsDlgWidget.ui line 67
+#. i18n: file OptionsDlgWidget.ui line 73
 #: rc.cpp:9
 #, no-c-format
 msgid ""
@@ -1057,19 +1058,19 @@ msgstr ""
 "磁带驱动器以单个块的方式读写数据。此设置控制了每个块的大小，而且应该和您磁带驱动器的块大小保持一致。对于软盘磁带设备，应该将此选项设置为 <b>"
 "10240</b> 字节。"
 
-#. i18n: file OptionsDlgWidget.ui line 73
+#. i18n: file OptionsDlgWidget.ui line 79
 #: rc.cpp:12
 #, no-c-format
 msgid "MB"
 msgstr "MB"
 
-#. i18n: file OptionsDlgWidget.ui line 78
+#. i18n: file OptionsDlgWidget.ui line 84
 #: rc.cpp:15
 #, no-c-format
 msgid "GB"
 msgstr "GB"
 
-#. i18n: file OptionsDlgWidget.ui line 88
+#. i18n: file OptionsDlgWidget.ui line 94
 #: rc.cpp:18
 #, no-c-format
 msgid ""
@@ -1077,31 +1078,31 @@ msgid ""
 "(MB) or gigabytes (GB)."
 msgstr "此选项选择左侧的默认磁带大小以何单位显示，是兆字节(MB)还是吉字节(GB)。"
 
-#. i18n: file OptionsDlgWidget.ui line 96
+#. i18n: file OptionsDlgWidget.ui line 102
 #: rc.cpp:21
 #, no-c-format
 msgid "bytes"
 msgstr "字节"
 
-#. i18n: file OptionsDlgWidget.ui line 104
+#. i18n: file OptionsDlgWidget.ui line 110
 #: rc.cpp:24
 #, no-c-format
 msgid "Tape block size:"
 msgstr "磁带块大小："
 
-#. i18n: file OptionsDlgWidget.ui line 115
+#. i18n: file OptionsDlgWidget.ui line 121
 #: rc.cpp:27
 #, no-c-format
 msgid "Default tape size:"
 msgstr "默认磁带大小："
 
-#. i18n: file OptionsDlgWidget.ui line 139
+#. i18n: file OptionsDlgWidget.ui line 145
 #: rc.cpp:33
 #, no-c-format
 msgid "Browse for the tar command."
 msgstr "浏览 tar 命令。"
 
-#. i18n: file OptionsDlgWidget.ui line 147
+#. i18n: file OptionsDlgWidget.ui line 153
 #: rc.cpp:36
 #, no-c-format
 msgid ""
@@ -1109,19 +1110,19 @@ msgid ""
 "tape device.  The default is <b>/dev/tape</b>."
 msgstr "<em>非回绕</em>磁带设备在文件系统中的位置。默认为 <b>/dev/tape</b>。"
 
-#. i18n: file OptionsDlgWidget.ui line 155
+#. i18n: file OptionsDlgWidget.ui line 161
 #: rc.cpp:39
 #, no-c-format
 msgid "Tar command:"
 msgstr "Tar 命令："
 
-#. i18n: file OptionsDlgWidget.ui line 169
+#. i18n: file OptionsDlgWidget.ui line 175
 #: rc.cpp:45
 #, no-c-format
 msgid "Browse for the tape device."
 msgstr "浏览磁带设备。"
 
-#. i18n: file OptionsDlgWidget.ui line 177
+#. i18n: file OptionsDlgWidget.ui line 183
 #: rc.cpp:48
 #, no-c-format
 msgid ""
@@ -1129,31 +1130,31 @@ msgid ""
 "The full path should be given.  The default is <b>tar</b>."
 msgstr "此设置控制了 KDat 用于执行磁带备份的命令。应该给出完整路径。默认为 <b>tar</b>。"
 
-#. i18n: file OptionsDlgWidget.ui line 185
+#. i18n: file OptionsDlgWidget.ui line 191
 #: rc.cpp:51
 #, no-c-format
 msgid "Tape device:"
 msgstr "磁带设备："
 
-#. i18n: file OptionsDlgWidget.ui line 198
+#. i18n: file OptionsDlgWidget.ui line 204
 #: rc.cpp:54
 #, no-c-format
 msgid "Tape Drive Options"
 msgstr "磁带驱动器选项"
 
-#. i18n: file OptionsDlgWidget.ui line 209
+#. i18n: file OptionsDlgWidget.ui line 215
 #: rc.cpp:57
 #, no-c-format
 msgid "Load tape on mount"
 msgstr "挂载时装入"
 
-#. i18n: file OptionsDlgWidget.ui line 212
+#. i18n: file OptionsDlgWidget.ui line 218
 #: rc.cpp:60
 #, no-c-format
 msgid "<qt>Issue an <tt>mtload</tt> command prior to mounting the tape.</qt>"
 msgstr "<qt>在挂载磁带前执行 <tt>mtload</tt> 命令。</qt>"
 
-#. i18n: file OptionsDlgWidget.ui line 217
+#. i18n: file OptionsDlgWidget.ui line 223
 #: rc.cpp:63
 #, no-c-format
 msgid ""
@@ -1166,19 +1167,19 @@ msgstr ""
 "\n"
 "某些磁带设备需要此功能。"
 
-#. i18n: file OptionsDlgWidget.ui line 225
+#. i18n: file OptionsDlgWidget.ui line 231
 #: rc.cpp:68
 #, no-c-format
 msgid "Lock tape drive on mount"
 msgstr "挂载磁带时锁住磁带"
 
-#. i18n: file OptionsDlgWidget.ui line 228
+#. i18n: file OptionsDlgWidget.ui line 234
 #: rc.cpp:71
 #, no-c-format
 msgid "Disable the eject button after mounting the tape."
 msgstr "挂载磁带后禁用弹出按钮。"
 
-#. i18n: file OptionsDlgWidget.ui line 233
+#. i18n: file OptionsDlgWidget.ui line 239
 #: rc.cpp:74
 #, no-c-format
 msgid ""
@@ -1191,19 +1192,19 @@ msgstr ""
 "\n"
 "此功能并不适合于所有磁带设备。"
 
-#. i18n: file OptionsDlgWidget.ui line 241
+#. i18n: file OptionsDlgWidget.ui line 247
 #: rc.cpp:79
 #, no-c-format
 msgid "Eject tape on unmount"
 msgstr "卸载磁带时弹出磁带"
 
-#. i18n: file OptionsDlgWidget.ui line 244
+#. i18n: file OptionsDlgWidget.ui line 250
 #: rc.cpp:82
 #, no-c-format
 msgid "Try to eject the tape after it is unmounted.  Don't use this for ftape."
 msgstr "试图在卸载磁带时弹出磁带。不要对 ftape 使用此功能。"
 
-#. i18n: file OptionsDlgWidget.ui line 249
+#. i18n: file OptionsDlgWidget.ui line 255
 #: rc.cpp:85
 #, no-c-format
 msgid ""
@@ -1215,19 +1216,19 @@ msgstr ""
 "\n"
 "不应对软盘磁带驱动器使用此选项。"
 
-#. i18n: file OptionsDlgWidget.ui line 257
+#. i18n: file OptionsDlgWidget.ui line 263
 #: rc.cpp:90
 #, no-c-format
 msgid "Variable block size"
 msgstr "可变块大小"
 
-#. i18n: file OptionsDlgWidget.ui line 260
+#. i18n: file OptionsDlgWidget.ui line 266
 #: rc.cpp:93
 #, no-c-format
 msgid "Enable variable-block size support in the tape drive."
 msgstr "启用磁带驱动器中的可变块大小支持。"
 
-#. i18n: file OptionsDlgWidget.ui line 265
+#. i18n: file OptionsDlgWidget.ui line 271
 #: rc.cpp:96
 #, no-c-format
 msgid ""
diff --git a/tde-i18n-zh_CN/messages/tdeadmin/knetworkconf.po b/tde-i18n-zh_CN/messages/tdeadmin/knetworkconf.po
index 0ba4e005c37..5aa6707a4ca 100644
--- a/tde-i18n-zh_CN/messages/tdeadmin/knetworkconf.po
+++ b/tde-i18n-zh_CN/messages/tdeadmin/knetworkconf.po
@@ -7,33 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: knetworkconf\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2006-05-04 19:05+0800\n"
 "Last-Translator: Zhang Le <robert@thizgroup.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kadddevicecontainer.cpp:129 kadddnsserverdlg.ui.h:42
-#: kaddknownhostdlg.ui.h:25
-msgid "The format of the specified IP address is not valid."
-msgstr "指定 IP 地址的格式无效。"
-
-#: kadddevicecontainer.cpp:129 kadddevicecontainer.cpp:132
-#: kadddevicecontainer.cpp:135 kadddevicecontainer.cpp:138
-#: kadddnsserverdlg.ui.h:42 kaddknownhostdlg.ui.h:25 knetworkconf.cpp:589
-msgid "Invalid IP Address"
-msgstr "无效的 IP 地址"
-
-#: kadddnsserverdlg.ui.h:54
-msgid "You have to type an alias first."
-msgstr "您必须先输入一个别名。"
-
-#: kadddnsserverdlg.ui.h:54
-msgid "Invalid Text"
-msgstr "无效文字"
-
 #: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -46,6 +28,51 @@ msgid ""
 "Your emails"
 msgstr "robert@thizgroup.com"
 
+#: knetworkconfmodule.cpp:94
+msgid "KNetworkConf"
+msgstr "KNetworkConf"
+
+#: knetworkconfmodule.cpp:97
+msgid "Lead Developer"
+msgstr "首席开发者"
+
+#: knetworkconfmodule.cpp:99
+msgid "Provided the Network backend which KNetworkConf relies on."
+msgstr "提供了 KNetworkConf 所依赖的网络后端。"
+
+#: knetworkconfmodule.cpp:101
+msgid "Conectiva Linux Support"
+msgstr "Conectiva Linux 支持"
+
+#: knetworkconfmodule.cpp:103
+msgid "Documentation maintainer, and German translator"
+msgstr "文档维护者和德语翻译"
+
+#: knetworkconfmodule.cpp:105
+msgid "Various bugfixes and features"
+msgstr "各种错误修正和特性"
+
+#: knetworkconfmodule.cpp:107
+msgid "Various bugfixes and Brazilian Portuguese translator"
+msgstr "各种错误修正和巴西葡萄牙语翻译"
+
+#: knetworkconfmodule.cpp:113
+msgid ""
+"%1Network configuration%2This module allows you to configure your TCP/IP "
+"settings.%3"
+msgstr "%1网络配置%2此模块允许您配置您的 TCP/IP 设置。%3"
+
+#: kadddevicecontainer.cpp:129 kadddnsserverdlg.ui.h:42
+#: kaddknownhostdlg.ui.h:25
+msgid "The format of the specified IP address is not valid."
+msgstr "指定 IP 地址的格式无效。"
+
+#: kadddevicecontainer.cpp:129 kadddevicecontainer.cpp:132
+#: kadddevicecontainer.cpp:135 kadddevicecontainer.cpp:138
+#: kadddnsserverdlg.ui.h:42 kaddknownhostdlg.ui.h:25 knetworkconf.cpp:589
+msgid "Invalid IP Address"
+msgstr "无效的 IP 地址"
+
 #: kaddknownhostdlg.ui.h:29
 msgid "You must add at least one alias for the specified IP address."
 msgstr "您必须为指定的 IP 地址至少添加一个别名。"
@@ -181,42 +208,6 @@ msgstr "新配置文件名称："
 msgid "There is already another profile with that name."
 msgstr "已经存在同名的配置文件。"
 
-#: kadddevicecontainer.cpp:53
-msgid "&Advanced Settings"
-msgstr "高级设置(&A)"
-
-#: kadddevicecontainer.cpp:54 kadddevicecontainer.cpp:55
-msgid "Toggle between advanced and basic settings"
-msgstr "切换高级和基此设置"
-
-#: kadddevicecontainer.cpp:57
-msgid "Apply changes"
-msgstr "应用更改"
-
-#: kadddevicecontainer.cpp:59
-msgid "Forget changes"
-msgstr "放弃更改"
-
-#: kadddevicecontainer.cpp:132
-msgid "The format of the specified netmask is not valid."
-msgstr "指定的网络掩码的格式无效。"
-
-#: kadddevicecontainer.cpp:135
-msgid "The format of the specified broadcast is not valid."
-msgstr "指定的广播地址的格式无效。"
-
-#: kadddevicecontainer.cpp:138
-msgid "The format of the specified Gateway is not valid."
-msgstr "指定的网关的格式无效。"
-
-#: kadddevicecontainer.cpp:174
-msgid "Basic Settings"
-msgstr "基此设置"
-
-#: kadddevicecontainer.cpp:179
-msgid "Advanced Settings"
-msgstr "高级设置"
-
 #: kprofileslistviewtooltip.h:84
 msgid "<b>Network Configuration of this Profile:</b>"
 msgstr "<b>此配置文件的网络配置：</b>"
@@ -271,6 +262,50 @@ msgstr "<br><b>机器名：</b> %1"
 msgid "<br><b>DNS Name Server:</b> %1"
 msgstr "<br><b>DNS 服务器：</b> %1"
 
+#: kadddevicecontainer.cpp:53
+msgid "&Advanced Settings"
+msgstr "高级设置(&A)"
+
+#: kadddevicecontainer.cpp:54 kadddevicecontainer.cpp:55
+msgid "Toggle between advanced and basic settings"
+msgstr "切换高级和基此设置"
+
+#: kadddevicecontainer.cpp:57
+msgid "Apply changes"
+msgstr "应用更改"
+
+#: kadddevicecontainer.cpp:59
+msgid "Forget changes"
+msgstr "放弃更改"
+
+#: kadddevicecontainer.cpp:132
+msgid "The format of the specified netmask is not valid."
+msgstr "指定的网络掩码的格式无效。"
+
+#: kadddevicecontainer.cpp:135
+msgid "The format of the specified broadcast is not valid."
+msgstr "指定的广播地址的格式无效。"
+
+#: kadddevicecontainer.cpp:138
+msgid "The format of the specified Gateway is not valid."
+msgstr "指定的网关的格式无效。"
+
+#: kadddevicecontainer.cpp:174
+msgid "Basic Settings"
+msgstr "基此设置"
+
+#: kadddevicecontainer.cpp:179
+msgid "Advanced Settings"
+msgstr "高级设置"
+
+#: kadddnsserverdlg.ui.h:54
+msgid "You have to type an alias first."
+msgstr "您必须先输入一个别名。"
+
+#: kadddnsserverdlg.ui.h:54
+msgid "Invalid Text"
+msgstr "无效文字"
+
 #. i18n: file kadddevicedlg.ui line 44
 #: rc.cpp:3
 #, no-c-format
@@ -925,45 +960,17 @@ msgid ""
 "current network configuration could be damaged."
 msgstr "您可以选择以下被支持的平台，如果您<b>确定</b>您的平台和所选择平台表现一致的话。请务必确认这一点，因为您现在的网络配置可能因此被破坏。"
 
-#: knetworkconfmodule.cpp:94
-msgid "KNetworkConf"
-msgstr "KNetworkConf"
-
-#: knetworkconfmodule.cpp:97
-msgid "Lead Developer"
-msgstr "首席开发者"
-
-#: knetworkconfmodule.cpp:99
-msgid "Provided the Network backend which KNetworkConf relies on."
-msgstr "提供了 KNetworkConf 所依赖的网络后端。"
-
-#: knetworkconfmodule.cpp:101
-msgid "Conectiva Linux Support"
-msgstr "Conectiva Linux 支持"
-
-#: knetworkconfmodule.cpp:103
-msgid "Documentation maintainer, and German translator"
-msgstr "文档维护者和德语翻译"
-
-#: knetworkconfmodule.cpp:105
-msgid "Various bugfixes and features"
-msgstr "各种错误修正和特性"
-
-#: knetworkconfmodule.cpp:107
-msgid "Various bugfixes and Brazilian Portuguese translator"
-msgstr "各种错误修正和巴西葡萄牙语翻译"
-
-#: knetworkconfmodule.cpp:113
+#: version.h:5
 msgid ""
-"%1Network configuration%2This module allows you to configure your TCP/IP "
-"settings.%3"
-msgstr "%1网络配置%2此模块允许您配置您的 TCP/IP 设置。%3"
+"KNetworkConf - A Trinity Control Center module to configure TCP/IP settings."
+msgstr "KNetworkConf - 允许您配置 TCP/IP 设置的 TDE 控制中心模块。"
 
 #: knetworkconfigparser.cpp:41
+#, fuzzy
 msgid ""
 "Could not find the backend script for the network configuration detection. "
 "Something is wrong with your installation.\n"
-" Please check that  \n"
+" Please check that \n"
 "{TDE_PATH}/%1 \n"
 "file is present."
 msgstr ""
@@ -1029,8 +1036,3 @@ msgstr "无法分析网络配置后端的支持平台列表。"
 #: knetworkconfigparser.cpp:1031
 msgid "Error Obtaining Supported Platforms List"
 msgstr "获取支持平台列表时出错"
-
-#: version.h:5
-msgid ""
-"KNetworkConf - A Trinity Control Center module to configure TCP/IP settings."
-msgstr "KNetworkConf - 允许您配置 TCP/IP 设置的 TDE 控制中心模块。"
diff --git a/tde-i18n-zh_CN/messages/tdeadmin/kpackage.po b/tde-i18n-zh_CN/messages/tdeadmin/kpackage.po
index 1930cd11721..6a4d213fcfc 100644
--- a/tde-i18n-zh_CN/messages/tdeadmin/kpackage.po
+++ b/tde-i18n-zh_CN/messages/tdeadmin/kpackage.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kpackage\n"
-"POT-Creation-Date: 2006-08-29 02:38+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2005-10-05 22:36+0800\n"
 "Last-Translator: Wang Jian <lark@linux.ustc.edu.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeadmin/ksysv.po b/tde-i18n-zh_CN/messages/tdeadmin/ksysv.po
index 274ca870a80..911cc03d09a 100644
--- a/tde-i18n-zh_CN/messages/tdeadmin/ksysv.po
+++ b/tde-i18n-zh_CN/messages/tdeadmin/ksysv.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksysv\n"
-"POT-Creation-Date: 2007-09-19 01:14+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2004-05-30 14:42+0800\n"
 "Last-Translator: Wang Jian <larkw@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeadmin/kuser.po b/tde-i18n-zh_CN/messages/tdeadmin/kuser.po
index 1e82c75927c..01eefccf71f 100644
--- a/tde-i18n-zh_CN/messages/tdeadmin/kuser.po
+++ b/tde-i18n-zh_CN/messages/tdeadmin/kuser.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kuser\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2005-10-05 22:39+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeadmin/secpolicy.po b/tde-i18n-zh_CN/messages/tdeadmin/secpolicy.po
index ed9678f12d8..ac8d8c19b03 100644
--- a/tde-i18n-zh_CN/messages/tdeadmin/secpolicy.po
+++ b/tde-i18n-zh_CN/messages/tdeadmin/secpolicy.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: secpolicy\n"
-"POT-Creation-Date: 2005-02-06 01:20+0100\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2003-11-11 02:31+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeadmin/tdefile_deb.po b/tde-i18n-zh_CN/messages/tdeadmin/tdefile_deb.po
index dff1fe1c664..d2473d3cb74 100644
--- a/tde-i18n-zh_CN/messages/tdeadmin/tdefile_deb.po
+++ b/tde-i18n-zh_CN/messages/tdeadmin/tdefile_deb.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_deb\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2002-09-09 17:26+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeadmin/tdefile_rpm.po b/tde-i18n-zh_CN/messages/tdeadmin/tdefile_rpm.po
index ea6e0df7315..70a3e8fb367 100644
--- a/tde-i18n-zh_CN/messages/tdeadmin/tdefile_rpm.po
+++ b/tde-i18n-zh_CN/messages/tdeadmin/tdefile_rpm.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_rpm 3.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2003-11-05 14:12+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeartwork/klock.po b/tde-i18n-zh_CN/messages/tdeartwork/klock.po
index 048d8884f85..e6d66b11482 100644
--- a/tde-i18n-zh_CN/messages/tdeartwork/klock.po
+++ b/tde-i18n-zh_CN/messages/tdeartwork/klock.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: klock\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-08 01:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-11-15 15:23+0800\n"
 "Last-Translator: Yan Shuangchun <yahzee@21cn.com>\n"
 "Language-Team: zh_CN <18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -76,13 +77,14 @@ msgid "Mode:"
 msgstr "模式："
 
 #: kdesavers/Euphoria.cpp:1040
+#, fuzzy
 msgid ""
 "<h3>Euphoria 1.0</h3>\n"
 "<p>Copyright (c) 2002 Terence M. Welsh"
 "<br>\n"
 "<a href=\"http://www.reallyslick.com/\">http://www.reallyslick.com/</a></p>\n"
 "\n"
-"<p>Ported to TDE by Karl Robillard</p>"
+"<p>Ported to KDE by Karl Robillard</p>"
 msgstr ""
 "<h3>Euphoria 1.0</h3>\n"
 "<p>版权所有 (c) 2002 Terence M. Welsh"
@@ -120,13 +122,14 @@ msgid "Setup Flux Screen Saver"
 msgstr "设置“流动”屏幕保护程序"
 
 #: kdesavers/Flux.cpp:921
+#, fuzzy
 msgid ""
 "<h3>Flux 1.0</h3>\n"
 "<p>Copyright (c) 2002 Terence M. Welsh"
 "<br>\n"
 "<a href=\"http://www.reallyslick.com/\">http://www.reallyslick.com/</a></p>\n"
 "\n"
-"<p>Ported to TDE by Karl Robillard</p>"
+"<p>Ported to KDE by Karl Robillard</p>"
 msgstr ""
 "<h3>Flux 1.0</h3>\n"
 "<p>版权所有 (c) 2002 Terence M. Welsh"
@@ -164,13 +167,14 @@ msgid "Setup Solar Wind"
 msgstr "设置太阳风"
 
 #: kdesavers/SolarWinds.cpp:733
+#, fuzzy
 msgid ""
 "<h3>Solar Winds 1.0</h3>\n"
 "<p>Copyright (c) 2002 Terence M. Welsh"
 "<br>\n"
 "<a href=\"http://www.reallyslick.com/\">http://www.reallyslick.com/</a></p>\n"
 "\n"
-"<p>Ported to TDE by Karl Robillard</p>"
+"<p>Ported to KDE by Karl Robillard</p>"
 msgstr ""
 "<h3>Solar Winds 1.0</h3>\n"
 "<p>版权所有 2002 Terence M. Welsh"
@@ -594,7 +598,7 @@ msgstr ""
 
 #: kdesavers/pendulum.cpp:788
 msgid ""
-"<h3>KPendulum Screen Saver for TDE</h3>"
+"<h3>KPendulum Screen Saver for KDE</h3>"
 "<p>Simulation of a two-part pendulum</p>"
 "<p>Copyright (c) Georg&nbsp;Drenkhahn 2004</p>"
 "<p><tt>georg-d@users.sourceforge.net</tt></p>"
@@ -642,7 +646,7 @@ msgstr ""
 
 #: kdesavers/rotation.cpp:782
 msgid ""
-"<h3>KRotation Screen Saver for TDE</h3>"
+"<h3>KRotation Screen Saver for KDE</h3>"
 "<p>Simulation of a force free rotating asymmetric body</p>"
 "<p>Copyright (c) Georg&nbsp;Drenkhahn 2004</p>"
 "<p><tt>georg-d@users.sourceforge.net</tt></p>"
diff --git a/tde-i18n-zh_CN/messages/tdeartwork/kxsconfig.po b/tde-i18n-zh_CN/messages/tdeartwork/kxsconfig.po
index f73d5308652..5f49b31790f 100644
--- a/tde-i18n-zh_CN/messages/tdeartwork/kxsconfig.po
+++ b/tde-i18n-zh_CN/messages/tdeartwork/kxsconfig.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kxsconfig\n"
-"POT-Creation-Date: 2007-05-22 02:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2003-12-28 16:12+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeartwork/tdepartsaver.po b/tde-i18n-zh_CN/messages/tdeartwork/tdepartsaver.po
index 54f0644569e..7e525faa335 100644
--- a/tde-i18n-zh_CN/messages/tdeartwork/tdepartsaver.po
+++ b/tde-i18n-zh_CN/messages/tdeartwork/tdepartsaver.po
@@ -5,30 +5,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdepartsaver\n"
-"POT-Creation-Date: 2007-02-26 02:46+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2002-09-09 23:22+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@126.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tdepartsaver.cpp:62
-msgid "KPart Screen Saver"
-msgstr "KPart 屏幕保护程序"
-
-#: tdepartsaver.cpp:124
-msgid "The screen saver is not configured yet."
-msgstr "还没有配置屏幕保护程序。"
-
-#: tdepartsaver.cpp:258
-msgid "All of your files are unsupported"
-msgstr "您所有的文件都不被支持"
-
-#: tdepartsaver.cpp:341
-msgid "Select Media Files"
-msgstr "选择媒体文件"
-
 #. i18n: file configwidget.ui line 17
 #: rc.cpp:3
 #, no-c-format
@@ -88,3 +73,19 @@ msgstr "随机选择下一个媒体"
 #, no-c-format
 msgid "seconds"
 msgstr "秒"
+
+#: tdepartsaver.cpp:62
+msgid "KPart Screen Saver"
+msgstr "KPart 屏幕保护程序"
+
+#: tdepartsaver.cpp:124
+msgid "The screen saver is not configured yet."
+msgstr "还没有配置屏幕保护程序。"
+
+#: tdepartsaver.cpp:258
+msgid "All of your files are unsupported"
+msgstr "您所有的文件都不被支持"
+
+#: tdepartsaver.cpp:341
+msgid "Select Media Files"
+msgstr "选择媒体文件"
diff --git a/tde-i18n-zh_CN/messages/tdeartwork/tdestyle_phase_config.po b/tde-i18n-zh_CN/messages/tdeartwork/tdestyle_phase_config.po
index 6a919f8ed4a..38cd834e6e8 100644
--- a/tde-i18n-zh_CN/messages/tdeartwork/tdestyle_phase_config.po
+++ b/tde-i18n-zh_CN/messages/tdeartwork/tdestyle_phase_config.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdestyle_phase_config\n"
-"POT-Creation-Date: 2005-01-31 01:35+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-08-04 04:52+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeartwork/twin_art_clients.po b/tde-i18n-zh_CN/messages/tdeartwork/twin_art_clients.po
index a9aee7650da..be8ee7a6ec8 100644
--- a/tde-i18n-zh_CN/messages/tdeartwork/twin_art_clients.po
+++ b/tde-i18n-zh_CN/messages/tdeartwork/twin_art_clients.po
@@ -5,22 +5,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: twin_art_clients\n"
-"POT-Creation-Date: 2005-12-17 03:14+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-12-23 21:08+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cde/cdeclient.cpp:299
-msgid "<center><b>CDE preview</b></center>"
-msgstr "<center><b>CDE 预览</b></center>"
-
-#: cde/cdeclient.cpp:328 icewm/icewm.cpp:976 icewm/icewm.cpp:980
-#: kde1/kde1client.cpp:308 kstep/nextclient.cpp:511
-msgid "Menu"
-msgstr "菜单"
+#: kstep/nextclient.cpp:841 riscos/AboveButton.cpp:48
+msgid "Keep above others"
+msgstr "常居顶端"
 
 #: cde/cdeclient.cpp:350 glow/glowclient.cpp:664 icewm/icewm.cpp:1017
 #: kde1/kde1client.cpp:346 kstep/nextclient.cpp:502
@@ -28,52 +24,6 @@ msgstr "菜单"
 msgid "Minimize"
 msgstr "最小化"
 
-#: cde/cdeclient.cpp:361 cde/cdeclient.cpp:400 glow/glowclient.cpp:606
-#: glow/glowclient.cpp:670 icewm/icewm.cpp:1005 icewm/icewm.cpp:1525
-#: kde1/kde1client.cpp:358 kde1/kde1client.cpp:444 kstep/nextclient.cpp:481
-#: kstep/nextclient.cpp:776 riscos/MaximiseButton.cpp:69
-#: riscos/MaximiseButton.cpp:83 system/systemclient.cpp:391
-#: system/systemclient.cpp:630
-msgid "Maximize"
-msgstr "最大化"
-
-#: cde/config/config.cpp:31
-msgid "Text &Alignment"
-msgstr "文本排列(&A)"
-
-#: cde/config/config.cpp:33
-msgid "Use these buttons to set the alignment of the titlebar caption text."
-msgstr "使用这些按钮设定标题栏标题文本的排列情况。"
-
-#: cde/config/config.cpp:35
-msgid "Centered"
-msgstr "居中"
-
-#: cde/config/config.cpp:39
-msgid "Draw window frames using &titlebar colors"
-msgstr "使用标题栏颜色绘制窗口边框(&T)"
-
-#: cde/config/config.cpp:40
-msgid ""
-"When selected, the window decoration borders are drawn using the titlebar "
-"colors. Otherwise, they are drawn using normal border colors instead."
-msgstr "选中时，窗口装饰的边框将使用标题栏的颜色绘制。否则，将使用普通的边框颜色绘制。"
-
-#: cde/config/config.cpp:48
-msgid ""
-"Tip: If you want the look of the original Motif(tm) Window Manager,\n"
-"click the \"Buttons\" tab above and remove the help\n"
-"and close buttons from the titlebar."
-msgstr ""
-"提示：如果您想要获得 Motif(tm) 窗口管理器的原始外观，\n"
-"请单击上方的“按钮”标签，然后从标题栏中删除帮助和关闭按钮。"
-
-#: glow/glowclient.cpp:586 glow/glowclient.cpp:652 icewm/icewm.cpp:1048
-#: icewm/icewm.cpp:1501 kstep/nextclient.cpp:765 riscos/StickyButton.cpp:82
-#: system/systemclient.cpp:659
-msgid "Not on all desktops"
-msgstr "不在全部桌面"
-
 #: glow/glowclient.cpp:591 glow/glowclient.cpp:652 icewm/icewm.cpp:1048
 #: icewm/icewm.cpp:1501 kstep/nextclient.cpp:530 kstep/nextclient.cpp:765
 #: riscos/StickyButton.cpp:70 riscos/StickyButton.cpp:83
@@ -81,50 +31,38 @@ msgstr "不在全部桌面"
 msgid "On all desktops"
 msgstr "在全部桌面"
 
-#: glow/glowclient.cpp:718
-msgid "<b><center>Glow preview</center></b>"
-msgstr "<b><center>Glow 预览</center></b>"
-
-#: glow/config/glowconfigdialog.cpp:69
-msgid "Theme"
-msgstr "主题"
-
-#: glow/config/glowconfigdialog.cpp:70
-msgid "Button Size"
-msgstr "按钮大小"
-
-#: glow/config/glowconfigdialog.cpp:80
-msgid "Button Glow Colors"
-msgstr "按钮发光颜色"
-
-#: glow/config/glowconfigdialog.cpp:161
-msgid "Titlebar gradient:"
-msgstr "标题栏渐变："
-
-#: glow/config/glowconfigdialog.cpp:168
-msgid "Show resize handle"
-msgstr "显示缩放句柄"
-
-#: kde1/kde1client.cpp:257
-msgid "<center><b>TDE 1 preview</b></center>"
-msgstr "<center><b>TDE 1 预览</b></center>"
-
-#: kde1/kde1client.cpp:323 kde1/kde1client.cpp:457
-msgid "Not On All Desktops"
+#: glow/glowclient.cpp:586 glow/glowclient.cpp:652 icewm/icewm.cpp:1048
+#: icewm/icewm.cpp:1501 kstep/nextclient.cpp:765 riscos/StickyButton.cpp:82
+#: system/systemclient.cpp:659
+msgid "Not on all desktops"
 msgstr "不在全部桌面"
 
-#: kde1/kde1client.cpp:323 kde1/kde1client.cpp:457
-msgid "On All Desktops"
-msgstr "在全部桌面"
+#: kstep/nextclient.cpp:852 riscos/LowerButton.cpp:48
+msgid "Keep below others"
+msgstr "常居底端"
 
-#: kde1/kde1client.cpp:606
-msgid "<center><b>TDE 1 decoration</b></center>"
-msgstr "<center><b>TDE 1 装饰</b></center>"
+#: riscos/Manager.cpp:714
+msgid "<center><b>RiscOS preview</b></center>"
+msgstr "<center><b>RiscOS 预览</b></center>"
+
+#: cde/cdeclient.cpp:361 cde/cdeclient.cpp:400 glow/glowclient.cpp:606
+#: glow/glowclient.cpp:670 icewm/icewm.cpp:1005 icewm/icewm.cpp:1525
+#: kde1/kde1client.cpp:358 kde1/kde1client.cpp:444 kstep/nextclient.cpp:481
+#: kstep/nextclient.cpp:776 riscos/MaximiseButton.cpp:69
+#: riscos/MaximiseButton.cpp:83 system/systemclient.cpp:391
+#: system/systemclient.cpp:630
+msgid "Maximize"
+msgstr "最大化"
 
 #: icewm/icewm.cpp:903 icewm/icewm.cpp:913
 msgid "<center><b>IceWM preview</b></center>"
 msgstr "<center><b>IceWM 预览</b></center>"
 
+#: cde/cdeclient.cpp:328 icewm/icewm.cpp:976 icewm/icewm.cpp:980
+#: kde1/kde1client.cpp:308 kstep/nextclient.cpp:511
+msgid "Menu"
+msgstr "菜单"
+
 #: icewm/icewm.cpp:1036 icewm/icewm.cpp:1536
 msgid "Rollup"
 msgstr "卷起"
@@ -186,6 +124,34 @@ msgstr ""
 msgid "Infadel #2 (default)"
 msgstr "Infadel #2(默认)"
 
+#: glow/glowclient.cpp:718
+msgid "<b><center>Glow preview</center></b>"
+msgstr "<b><center>Glow 预览</center></b>"
+
+#: glow/config/glowconfigdialog.cpp:69
+msgid "Theme"
+msgstr "主题"
+
+#: glow/config/glowconfigdialog.cpp:70
+msgid "Button Size"
+msgstr "按钮大小"
+
+#: glow/config/glowconfigdialog.cpp:80
+msgid "Button Glow Colors"
+msgstr "按钮发光颜色"
+
+#: glow/config/glowconfigdialog.cpp:161
+msgid "Titlebar gradient:"
+msgstr "标题栏渐变："
+
+#: glow/config/glowconfigdialog.cpp:168
+msgid "Show resize handle"
+msgstr "显示缩放句柄"
+
+#: system/systemclient.cpp:307
+msgid "<center><b>System++ preview</b></center>"
+msgstr "<center><b>System++ 预览</b></center>"
+
 #: kstep/nextclient.cpp:415
 msgid "<center><b>KStep preview</b></center>"
 msgstr "<center><b>KStep 预览</b></center>"
@@ -206,26 +172,63 @@ msgstr "展开"
 msgid "Do not keep above others"
 msgstr "不常居顶端"
 
-#: kstep/nextclient.cpp:841 riscos/AboveButton.cpp:48
-msgid "Keep above others"
-msgstr "常居顶端"
-
 #: kstep/nextclient.cpp:852
 msgid "Do not keep below others"
 msgstr "不常居底端"
 
-#: kstep/nextclient.cpp:852 riscos/LowerButton.cpp:48
-msgid "Keep below others"
-msgstr "常居底端"
-
-#: riscos/Manager.cpp:714
-msgid "<center><b>RiscOS preview</b></center>"
-msgstr "<center><b>RiscOS 预览</b></center>"
-
-#: system/systemclient.cpp:307
-msgid "<center><b>System++ preview</b></center>"
-msgstr "<center><b>System++ 预览</b></center>"
-
 #: openlook/OpenLook.cpp:362
 msgid "<center><b>OpenLook preview</b></center>"
 msgstr "<center><b>OpenLook 预览</b></center>"
+
+#: cde/config/config.cpp:31
+msgid "Text &Alignment"
+msgstr "文本排列(&A)"
+
+#: cde/config/config.cpp:33
+msgid "Use these buttons to set the alignment of the titlebar caption text."
+msgstr "使用这些按钮设定标题栏标题文本的排列情况。"
+
+#: cde/config/config.cpp:35
+msgid "Centered"
+msgstr "居中"
+
+#: cde/config/config.cpp:39
+msgid "Draw window frames using &titlebar colors"
+msgstr "使用标题栏颜色绘制窗口边框(&T)"
+
+#: cde/config/config.cpp:40
+msgid ""
+"When selected, the window decoration borders are drawn using the titlebar "
+"colors. Otherwise, they are drawn using normal border colors instead."
+msgstr "选中时，窗口装饰的边框将使用标题栏的颜色绘制。否则，将使用普通的边框颜色绘制。"
+
+#: cde/config/config.cpp:48
+msgid ""
+"Tip: If you want the look of the original Motif(tm) Window Manager,\n"
+"click the \"Buttons\" tab above and remove the help\n"
+"and close buttons from the titlebar."
+msgstr ""
+"提示：如果您想要获得 Motif(tm) 窗口管理器的原始外观，\n"
+"请单击上方的“按钮”标签，然后从标题栏中删除帮助和关闭按钮。"
+
+#: cde/cdeclient.cpp:299
+msgid "<center><b>CDE preview</b></center>"
+msgstr "<center><b>CDE 预览</b></center>"
+
+#: kde1/kde1client.cpp:257
+#, fuzzy
+msgid "<center><b>KDE 1 preview</b></center>"
+msgstr "<center><b>TDE 1 预览</b></center>"
+
+#: kde1/kde1client.cpp:323 kde1/kde1client.cpp:457
+msgid "Not On All Desktops"
+msgstr "不在全部桌面"
+
+#: kde1/kde1client.cpp:323 kde1/kde1client.cpp:457
+msgid "On All Desktops"
+msgstr "在全部桌面"
+
+#: kde1/kde1client.cpp:606
+#, fuzzy
+msgid "<center><b>KDE 1 decoration</b></center>"
+msgstr "<center><b>TDE 1 装饰</b></center>"
diff --git a/tde-i18n-zh_CN/messages/tdebase/appletproxy.po b/tde-i18n-zh_CN/messages/tdebase/appletproxy.po
index 9f39d60fb34..6cecc01c66a 100644
--- a/tde-i18n-zh_CN/messages/tdebase/appletproxy.po
+++ b/tde-i18n-zh_CN/messages/tdebase/appletproxy.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: appletproxy\n"
-"POT-Creation-Date: 2006-04-09 03:51+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-23 18:26+0800\n"
 "Last-Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.marsec.net>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/clockapplet.po b/tde-i18n-zh_CN/messages/tdebase/clockapplet.po
index 2e1bf04c88d..18aaf3ee156 100644
--- a/tde-i18n-zh_CN/messages/tdebase/clockapplet.po
+++ b/tde-i18n-zh_CN/messages/tdebase/clockapplet.po
@@ -6,351 +6,352 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2008-08-19 01:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-08-13 07:54+0800\n"
 "Last-Translator: Dick Zhang <netwind2003@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: clock.cpp:93
+#: clock.cpp:83
 msgid "Configure - Clock"
 msgstr "配置 - 时钟"
 
-#: clock.cpp:136
+#: clock.cpp:126
 msgid "General"
 msgstr "常规"
 
-#: clock.cpp:680
+#: clock.cpp:697
 msgid ""
 "_: hour\n"
 "one"
 msgstr "一点"
 
-#: clock.cpp:680
+#: clock.cpp:697
 msgid ""
 "_: hour\n"
 "two"
 msgstr "二点"
 
-#: clock.cpp:681
+#: clock.cpp:698
 msgid ""
 "_: hour\n"
 "three"
 msgstr "三点"
 
-#: clock.cpp:681
+#: clock.cpp:698
 msgid ""
 "_: hour\n"
 "four"
 msgstr "四点"
 
-#: clock.cpp:681
+#: clock.cpp:698
 msgid ""
 "_: hour\n"
 "five"
 msgstr "五点"
 
-#: clock.cpp:682
+#: clock.cpp:699
 msgid ""
 "_: hour\n"
 "six"
 msgstr "六点"
 
-#: clock.cpp:682
+#: clock.cpp:699
 msgid ""
 "_: hour\n"
 "seven"
 msgstr "七点"
 
-#: clock.cpp:682
+#: clock.cpp:699
 msgid ""
 "_: hour\n"
 "eight"
 msgstr "八点"
 
-#: clock.cpp:683
+#: clock.cpp:700
 msgid ""
 "_: hour\n"
 "nine"
 msgstr "九点"
 
-#: clock.cpp:683
+#: clock.cpp:700
 msgid ""
 "_: hour\n"
 "ten"
 msgstr "十点"
 
-#: clock.cpp:683
+#: clock.cpp:700
 msgid ""
 "_: hour\n"
 "eleven"
 msgstr "十一点"
 
-#: clock.cpp:684
+#: clock.cpp:701
 msgid ""
 "_: hour\n"
 "twelve"
 msgstr "十二点"
 
-#: clock.cpp:687
+#: clock.cpp:704
 #, no-c-format
 msgid "%0 o'clock"
 msgstr "%0整"
 
-#: clock.cpp:688
+#: clock.cpp:705
 #, no-c-format
 msgid "five past %0"
 msgstr "%0五分"
 
-#: clock.cpp:689
+#: clock.cpp:706
 #, no-c-format
 msgid "ten past %0"
 msgstr "%0十分"
 
-#: clock.cpp:690
+#: clock.cpp:707
 #, no-c-format
 msgid "quarter past %0"
 msgstr "%0一刻"
 
-#: clock.cpp:691
+#: clock.cpp:708
 #, no-c-format
 msgid "twenty past %0"
 msgstr "%0二十"
 
-#: clock.cpp:692
+#: clock.cpp:709
 #, no-c-format
 msgid "twenty five past %0"
 msgstr "%0二十五"
 
-#: clock.cpp:693
+#: clock.cpp:710
 #, no-c-format
 msgid "half past %0"
 msgstr "%0半"
 
-#: clock.cpp:694
+#: clock.cpp:711
 #, no-c-format
 msgid "twenty five to %1"
 msgstr "差二十五分%1"
 
-#: clock.cpp:695
+#: clock.cpp:712
 #, no-c-format
 msgid "twenty to %1"
 msgstr "差二十分%1"
 
-#: clock.cpp:696
+#: clock.cpp:713
 #, no-c-format
 msgid "quarter to %1"
 msgstr "差一刻%1"
 
-#: clock.cpp:697
+#: clock.cpp:714
 #, no-c-format
 msgid "ten to %1"
 msgstr "差十分%1"
 
-#: clock.cpp:698
+#: clock.cpp:715
 #, no-c-format
 msgid "five to %1"
 msgstr "差五分%1"
 
-#: clock.cpp:699
+#: clock.cpp:716
 #, no-c-format
 msgid "%1 o'clock"
 msgstr "%1整"
 
-#: clock.cpp:702
+#: clock.cpp:719
 #, no-c-format
 msgid ""
 "_: one\n"
 "%0 o'clock"
 msgstr "%0整"
 
-#: clock.cpp:703
+#: clock.cpp:720
 #, no-c-format
 msgid ""
 "_: one\n"
 "five past %0"
 msgstr "%0五分"
 
-#: clock.cpp:704
+#: clock.cpp:721
 #, no-c-format
 msgid ""
 "_: one\n"
 "ten past %0"
 msgstr "%0十分"
 
-#: clock.cpp:705
+#: clock.cpp:722
 #, no-c-format
 msgid ""
 "_: one\n"
 "quarter past %0"
 msgstr "%0一刻"
 
-#: clock.cpp:706
+#: clock.cpp:723
 #, no-c-format
 msgid ""
 "_: one\n"
 "twenty past %0"
 msgstr "%0二十"
 
-#: clock.cpp:707
+#: clock.cpp:724
 #, no-c-format
 msgid ""
 "_: one\n"
 "twenty five past %0"
 msgstr "%0二十五"
 
-#: clock.cpp:708
+#: clock.cpp:725
 #, no-c-format
 msgid ""
 "_: one\n"
 "half past %0"
 msgstr "%0半"
 
-#: clock.cpp:709
+#: clock.cpp:726
 #, no-c-format
 msgid ""
 "_: one\n"
 "twenty five to %1"
 msgstr "差二十五分%1"
 
-#: clock.cpp:710
+#: clock.cpp:727
 #, no-c-format
 msgid ""
 "_: one\n"
 "twenty to %1"
 msgstr "差二十分%1"
 
-#: clock.cpp:711
+#: clock.cpp:728
 #, no-c-format
 msgid ""
 "_: one\n"
 "quarter to %1"
 msgstr "差一刻%1"
 
-#: clock.cpp:712
+#: clock.cpp:729
 #, no-c-format
 msgid ""
 "_: one\n"
 "ten to %1"
 msgstr "差十分%1"
 
-#: clock.cpp:713
+#: clock.cpp:730
 #, no-c-format
 msgid ""
 "_: one\n"
 "five to %1"
 msgstr "差五分%1"
 
-#: clock.cpp:714
+#: clock.cpp:731
 #, no-c-format
 msgid ""
 "_: one\n"
 "%1 o'clock"
 msgstr "%1整"
 
-#: clock.cpp:716
+#: clock.cpp:733
 msgid "Night"
 msgstr "午夜"
 
-#: clock.cpp:717
+#: clock.cpp:734
 msgid "Early morning"
 msgstr "凌晨"
 
-#: clock.cpp:717
+#: clock.cpp:734
 msgid "Morning"
 msgstr "早晨"
 
-#: clock.cpp:717
+#: clock.cpp:734
 msgid "Almost noon"
 msgstr "午前"
 
-#: clock.cpp:718
+#: clock.cpp:735
 msgid "Noon"
 msgstr "中午"
 
-#: clock.cpp:718
+#: clock.cpp:735
 msgid "Afternoon"
 msgstr "下午"
 
-#: clock.cpp:718
+#: clock.cpp:735
 msgid "Evening"
 msgstr "晚上"
 
-#: clock.cpp:719
+#: clock.cpp:736
 msgid "Late evening"
 msgstr "深夜"
 
-#: clock.cpp:821
+#: clock.cpp:838
 msgid "Start of week"
 msgstr "一周开始"
 
-#: clock.cpp:823
+#: clock.cpp:840
 msgid "Middle of week"
 msgstr "一周中间"
 
-#: clock.cpp:825
+#: clock.cpp:842
 msgid "End of week"
 msgstr "一周之末"
 
-#: clock.cpp:827
+#: clock.cpp:844
 msgid "Weekend!"
 msgstr "周末！"
 
-#: clock.cpp:1502
+#: clock.cpp:1541
 msgid "Clock"
 msgstr "时钟"
 
-#: clock.cpp:1528 clock.cpp:1731
+#: clock.cpp:1567 clock.cpp:1770
 msgid "Local Timezone"
 msgstr "本地时区"
 
-#: clock.cpp:1537
+#: clock.cpp:1576
 msgid "&Configure Timezones..."
 msgstr "配置时区(&C)..."
 
-#: clock.cpp:1541
+#: clock.cpp:1580
 msgid "&Plain"
 msgstr "简单(&P)"
 
-#: clock.cpp:1542
+#: clock.cpp:1581
 msgid "&Digital"
 msgstr "数字(&D)"
 
-#: clock.cpp:1543
+#: clock.cpp:1582
 msgid "&Analog"
 msgstr "模拟(&A)"
 
-#: clock.cpp:1544
+#: clock.cpp:1583
 msgid "&Fuzzy"
 msgstr "文字(&F)"
 
-#: clock.cpp:1547
+#: clock.cpp:1586
 msgid "&Type"
 msgstr "类型(&T)"
 
-#: clock.cpp:1548
+#: clock.cpp:1587
 msgid "Show Time&zone"
 msgstr "显示时区(&Z)"
 
-#: clock.cpp:1551
+#: clock.cpp:1590
 msgid "&Adjust Date && Time..."
 msgstr "调整日期和时间(&A)..."
 
-#: clock.cpp:1553
+#: clock.cpp:1592
 msgid "Date && Time &Format..."
 msgstr "日期和时间格式(&F)..."
 
-#: clock.cpp:1556
+#: clock.cpp:1595
 msgid "C&opy to Clipboard"
 msgstr "复制到剪贴板(&O)"
 
-#: clock.cpp:1560
+#: clock.cpp:1599
 msgid "&Configure Clock..."
 msgstr "配置时钟(&C)..."
 
-#: clock.cpp:1813
+#: clock.cpp:1852
 #, c-format
 msgid "Showing time for %1"
 msgstr "显示 %1 的时间"
@@ -390,19 +391,19 @@ msgid "&Frame"
 msgstr "窗口(&F)"
 
 #. i18n: file analog.ui line 92
-#: rc.cpp:18 rc.cpp:63 rc.cpp:90 rc.cpp:147
+#: rc.cpp:18 rc.cpp:63 rc.cpp:90 rc.cpp:150
 #, no-c-format
 msgid "Time"
 msgstr "时间"
 
 #. i18n: file analog.ui line 136
-#: rc.cpp:21 rc.cpp:69 rc.cpp:99 rc.cpp:156 rc.cpp:162
+#: rc.cpp:21 rc.cpp:69 rc.cpp:99 rc.cpp:159 rc.cpp:165
 #, no-c-format
 msgid "Foreground color:"
 msgstr "前景色："
 
 #. i18n: file analog.ui line 167
-#: rc.cpp:24 rc.cpp:72 rc.cpp:96 rc.cpp:153 rc.cpp:165
+#: rc.cpp:24 rc.cpp:72 rc.cpp:96 rc.cpp:156 rc.cpp:168
 #, no-c-format
 msgid "Background color:"
 msgstr "背景色："
@@ -456,7 +457,7 @@ msgid "LCD look"
 msgstr "LCD 外观"
 
 #. i18n: file fuzzy.ui line 124
-#: rc.cpp:93 rc.cpp:150 rc.cpp:168
+#: rc.cpp:93 rc.cpp:153 rc.cpp:171
 #, no-c-format
 msgid "Font:"
 msgstr "字体："
@@ -527,32 +528,38 @@ msgstr "文字时钟"
 msgid "&Seconds"
 msgstr "秒(&S)"
 
-#. i18n: file settings.ui line 326
-#: rc.cpp:159
+#. i18n: file settings.ui line 186
+#: rc.cpp:147
+#, fuzzy, no-c-format
+msgid "&Shadow"
+msgstr "阴影颜色："
+
+#. i18n: file settings.ui line 334
+#: rc.cpp:162
 #, no-c-format
 msgid "Date"
 msgstr "日期"
 
-#. i18n: file settings.ui line 438
-#: rc.cpp:171
+#. i18n: file settings.ui line 446
+#: rc.cpp:174
 #, no-c-format
 msgid "&Timezones"
 msgstr "时区(&T)"
 
-#. i18n: file settings.ui line 447
-#: rc.cpp:174
+#. i18n: file settings.ui line 455
+#: rc.cpp:177
 #, no-c-format
 msgid "City"
 msgstr "城市"
 
-#. i18n: file settings.ui line 458
-#: rc.cpp:177
+#. i18n: file settings.ui line 466
+#: rc.cpp:180
 #, no-c-format
 msgid "Comment"
 msgstr "备注"
 
-#. i18n: file settings.ui line 474
-#: rc.cpp:180
+#. i18n: file settings.ui line 482
+#: rc.cpp:183
 #, no-c-format
 msgid ""
 "A list of timezones known to your system. Press the middle mouse button on the "
@@ -560,91 +567,97 @@ msgid ""
 msgstr "这是系统支持的城市列表。选择世界各地的城市，用鼠标中键点击任务条上的时钟，它能显示选定城市的时间。"
 
 #. i18n: file clockapplet.kcfg line 10
-#: rc.cpp:183
+#: rc.cpp:186
 #, no-c-format
 msgid "Clock type"
 msgstr "时钟类型："
 
 #. i18n: file clockapplet.kcfg line 22
-#: rc.cpp:186 rc.cpp:189 rc.cpp:210 rc.cpp:228 rc.cpp:255 rc.cpp:282
+#: rc.cpp:189 rc.cpp:192 rc.cpp:216 rc.cpp:234 rc.cpp:261 rc.cpp:288
 #, no-c-format
 msgid "Foreground color."
 msgstr "前景色。"
 
 #. i18n: file clockapplet.kcfg line 30
-#: rc.cpp:192 rc.cpp:207 rc.cpp:279
+#: rc.cpp:195 rc.cpp:213 rc.cpp:285
 #, no-c-format
 msgid "Font for the clock."
 msgstr "时钟使用的字体。"
 
 #. i18n: file clockapplet.kcfg line 40
-#: rc.cpp:195 rc.cpp:216 rc.cpp:243
+#: rc.cpp:198 rc.cpp:222 rc.cpp:249
 #, no-c-format
 msgid "Show seconds."
 msgstr "显示秒。"
 
 #. i18n: file clockapplet.kcfg line 44
-#: rc.cpp:198 rc.cpp:219 rc.cpp:246 rc.cpp:270
+#: rc.cpp:201 rc.cpp:225 rc.cpp:252 rc.cpp:276
 #, no-c-format
 msgid "Show date."
 msgstr "显示日期。"
 
 #. i18n: file clockapplet.kcfg line 48
-#: rc.cpp:201 rc.cpp:222 rc.cpp:249 rc.cpp:273
+#: rc.cpp:204 rc.cpp:228 rc.cpp:255 rc.cpp:279
 #, no-c-format
 msgid "Show day of week."
 msgstr "显示周内日。"
 
 #. i18n: file clockapplet.kcfg line 52
-#: rc.cpp:204 rc.cpp:225 rc.cpp:252 rc.cpp:276
+#: rc.cpp:207 rc.cpp:231 rc.cpp:258 rc.cpp:282
 #, no-c-format
 msgid "Show frame."
 msgstr "显示窗口。"
 
-#. i18n: file clockapplet.kcfg line 69
-#: rc.cpp:213 rc.cpp:231 rc.cpp:258 rc.cpp:285
+#. i18n: file clockapplet.kcfg line 56
+#: rc.cpp:210
+#, no-c-format
+msgid "Use shadow."
+msgstr ""
+
+#. i18n: file clockapplet.kcfg line 73
+#: rc.cpp:219 rc.cpp:237 rc.cpp:264 rc.cpp:291
 #, no-c-format
 msgid "Background color."
 msgstr "背景颜色。"
 
-#. i18n: file clockapplet.kcfg line 99
-#: rc.cpp:234 rc.cpp:261
+#. i18n: file clockapplet.kcfg line 103
+#: rc.cpp:240 rc.cpp:267
 #, no-c-format
 msgid "Shadow color."
 msgstr "阴影颜色。"
 
-#. i18n: file clockapplet.kcfg line 103
-#: rc.cpp:237
+#. i18n: file clockapplet.kcfg line 107
+#: rc.cpp:243
 #, no-c-format
 msgid "Blink"
 msgstr "闪烁"
 
-#. i18n: file clockapplet.kcfg line 107
-#: rc.cpp:240 rc.cpp:264
+#. i18n: file clockapplet.kcfg line 111
+#: rc.cpp:246 rc.cpp:270
 #, no-c-format
 msgid "LCD Style"
 msgstr "LCD 风格"
 
-#. i18n: file clockapplet.kcfg line 145
-#: rc.cpp:267
+#. i18n: file clockapplet.kcfg line 149
+#: rc.cpp:273
 #, no-c-format
 msgid "Anti-Alias factor"
 msgstr "边缘平滑的刻度"
 
-#. i18n: file clockapplet.kcfg line 178
-#: rc.cpp:288
+#. i18n: file clockapplet.kcfg line 182
+#: rc.cpp:294
 #, no-c-format
 msgid "Fuzzyness"
 msgstr "模糊度"
 
-#. i18n: file clockapplet.kcfg line 184
-#: rc.cpp:291
+#. i18n: file clockapplet.kcfg line 188
+#: rc.cpp:297
 #, no-c-format
 msgid "Show window frame"
 msgstr "显示窗口框架"
 
-#. i18n: file clockapplet.kcfg line 188
-#: rc.cpp:294
+#. i18n: file clockapplet.kcfg line 192
+#: rc.cpp:300
 #, no-c-format
 msgid "Default size of the calendar"
 msgstr "日历的默认大小"
diff --git a/tde-i18n-zh_CN/messages/tdebase/display.po b/tde-i18n-zh_CN/messages/tdebase/display.po
index 9b9b135fb4d..466cdbb39a7 100644
--- a/tde-i18n-zh_CN/messages/tdebase/display.po
+++ b/tde-i18n-zh_CN/messages/tdebase/display.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: display\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-05-03 13:30+0800\n"
 "Last-Translator: Yan Shuangchun <yahzee@d3eye.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/dockbarextension.po b/tde-i18n-zh_CN/messages/tdebase/dockbarextension.po
index 05e8906fa7f..fdd7c819018 100644
--- a/tde-i18n-zh_CN/messages/tdebase/dockbarextension.po
+++ b/tde-i18n-zh_CN/messages/tdebase/dockbarextension.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dockbarextension\n"
-"POT-Creation-Date: 2005-11-06 02:43+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-04 22:59+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/drkonqi.po b/tde-i18n-zh_CN/messages/tdebase/drkonqi.po
index 156ab44be64..65cb988df76 100644
--- a/tde-i18n-zh_CN/messages/tdebase/drkonqi.po
+++ b/tde-i18n-zh_CN/messages/tdebase/drkonqi.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drkonqi\n"
-"POT-Creation-Date: 2008-01-23 01:15+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-17 11:40+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,10 +27,33 @@ msgid ""
 "Your emails"
 msgstr "lark@linux.net.cn"
 
-#: backtrace.cpp:83
+#: backtrace.cpp:97
 msgid "Could not generate a backtrace as the debugger '%1' was not found."
 msgstr "无法生成回溯跟踪，因为找不到调试器“%1”。"
 
+#: backtrace.cpp:146
+#, fuzzy
+msgid "Administrative access is required to generate a backtrace"
+msgstr "无法生成回溯跟踪。"
+
+#: bugdescription.cpp:59
+msgid "Crash Report"
+msgstr ""
+
+#: bugdescription.cpp:67 bugdescriptiondialog.cpp:60
+msgid "Bug Description"
+msgstr ""
+
+#: bugdescriptiondialog.cpp:83
+msgid "Contact Email: "
+msgstr ""
+
+#: bugdescriptiondialog.cpp:90
+msgid ""
+"Enter the text (in English if possible) that you wish to submit with this crash "
+"report.\n"
+msgstr ""
+
 #: debugger.cpp:65
 msgid "C&opy"
 msgstr "复制(&O)"
@@ -47,24 +71,24 @@ msgstr "回溯跟踪已保存到 %1"
 msgid "Cannot create a file in which to save the backtrace"
 msgstr "无法创建用于保存回溯跟踪的文件"
 
-#: debugger.cpp:115
+#: debugger.cpp:115 toplevel.cpp:485
 msgid "Select Filename"
 msgstr "选择文件名"
 
-#: debugger.cpp:123
+#: debugger.cpp:123 toplevel.cpp:496
 msgid ""
 "A file named \"%1\" already exists. Are you sure you want to overwrite it?"
 msgstr "已经存在名为“%1”的文件。您确定想要覆盖吗？"
 
-#: debugger.cpp:125
+#: debugger.cpp:125 toplevel.cpp:498
 msgid "Overwrite File?"
 msgstr "覆盖文件吗？"
 
-#: debugger.cpp:126
+#: debugger.cpp:126 toplevel.cpp:499
 msgid "&Overwrite"
 msgstr "覆盖(&O)"
 
-#: debugger.cpp:138
+#: debugger.cpp:138 toplevel.cpp:510
 msgid "Cannot open file %1 for writing"
 msgstr "无法打开文件 %1 写入"
 
@@ -178,39 +202,43 @@ msgstr "禁用任意访问磁盘"
 msgid "The TDE Crash Handler"
 msgstr "TDE 崩溃处理程序"
 
-#: toplevel.cpp:59
+#: toplevel.cpp:63
 msgid "&Bug report"
 msgstr "错误报告(&B)"
 
-#: toplevel.cpp:60
+#: toplevel.cpp:64
 msgid "&Debugger"
 msgstr "调试器(&D)"
 
-#: toplevel.cpp:64
+#: toplevel.cpp:65
+msgid "&Report Crash"
+msgstr ""
+
+#: toplevel.cpp:69
 msgid "&General"
 msgstr "常规(&G)"
 
-#: toplevel.cpp:79
+#: toplevel.cpp:84
 msgid "&Backtrace"
 msgstr "回溯跟踪(&B)"
 
-#: toplevel.cpp:103
+#: toplevel.cpp:108
 msgid "<p><b>Short description</b></p><p>%1</p>"
 msgstr "<p><b>简短描述</b></p><p>%1</p>"
 
-#: toplevel.cpp:107
+#: toplevel.cpp:112
 msgid "<p><b>What is this?</b></p><p>%1</p>"
 msgstr "<p><b>这是什么？</b></p><p>%1</p>"
 
-#: toplevel.cpp:111
+#: toplevel.cpp:116
 msgid "<p><b>What can I do?</b></p><p>%1</p>"
 msgstr "<p><b>我能做什么？</b></p><p>%1</p>"
 
-#: toplevel.cpp:116
+#: toplevel.cpp:121
 msgid "<p><b>Application crashed</b></p><p>The program %appname crashed.</p>"
 msgstr "<p><b>程序已崩溃</b></p><p>程序 %appname 已经崩溃了。</p>"
 
-#: toplevel.cpp:135
+#: toplevel.cpp:140
 msgid ""
 "<p>Do you want to generate a backtrace? This will help the developers to figure "
 "out what went wrong.</p>\n"
@@ -223,22 +251,95 @@ msgstr ""
 "<p>不好的是在慢速的机器上，这要花费一些时间。</p>"
 "<p><b>注意：回溯跟踪不能代替对错误的正确描述和如何重现错误的信息。如果没有正确的描述，将无法修补错误。</b></p>"
 
-#: toplevel.cpp:147
+#: toplevel.cpp:152
 msgid "Include Backtrace"
 msgstr "包括回溯跟踪"
 
-#: toplevel.cpp:147
+#: toplevel.cpp:152
 msgid "Generate"
 msgstr "生成"
 
-#: toplevel.cpp:147
+#: toplevel.cpp:152
 msgid "Do Not Generate"
 msgstr "不生成"
 
-#: toplevel.cpp:215
+#: toplevel.cpp:229 toplevel.cpp:241
 msgid "It was not possible to generate a backtrace."
 msgstr "无法生成回溯跟踪。"
 
-#: toplevel.cpp:216
+#: toplevel.cpp:230 toplevel.cpp:241
 msgid "Backtrace Not Possible"
 msgstr "不可能回溯跟踪"
+
+#: toplevel.cpp:255
+msgid ""
+"<p>Do you want to include a description of what you were doing when this "
+"application crashed? This would help the developers to figure out what went "
+"wrong.</p>\n"
+msgstr ""
+
+#: toplevel.cpp:261
+msgid "Include Description"
+msgstr ""
+
+#: toplevel.cpp:261
+msgid "Add Description"
+msgstr ""
+
+#: toplevel.cpp:261
+msgid "Just Report the Crash"
+msgstr ""
+
+#: toplevel.cpp:353
+msgid ""
+"<p>The crash report is ready.  Do you want to send it now?</p>\n"
+msgstr ""
+
+#: toplevel.cpp:354
+msgid "Ready to Send"
+msgstr ""
+
+#: toplevel.cpp:354
+msgid "View Report"
+msgstr ""
+
+#: toplevel.cpp:354
+msgid "Send Report"
+msgstr ""
+
+#: toplevel.cpp:435
+msgid ""
+"<p>Your crash report has been uploaded!</p></p>You may reference it if desired "
+"by its unique ID:"
+"<br>%1</p>"
+msgstr ""
+
+#: toplevel.cpp:436
+msgid "Report uploaded"
+msgstr ""
+
+#: toplevel.cpp:448
+msgid ""
+"<p>Your crash report failed to upload!</p>"
+"<p>Please check your network settings and try again.</p>"
+"<p>The server responded:"
+"<br>%1</p>"
+msgstr ""
+
+#: toplevel.cpp:449 toplevel.cpp:466
+msgid "Upload failure"
+msgstr ""
+
+#: toplevel.cpp:449 toplevel.cpp:466
+msgid "Save Report"
+msgstr ""
+
+#: toplevel.cpp:449 toplevel.cpp:466
+msgid "Retry Upload"
+msgstr ""
+
+#: toplevel.cpp:465
+msgid ""
+"<p>Your crash report failed to upload!</p>"
+"<p>Please check your network settings and try again.</p>"
+msgstr ""
diff --git a/tde-i18n-zh_CN/messages/tdebase/extensionproxy.po b/tde-i18n-zh_CN/messages/tdebase/extensionproxy.po
index e7226f06491..3ade7dd9035 100644
--- a/tde-i18n-zh_CN/messages/tdebase/extensionproxy.po
+++ b/tde-i18n-zh_CN/messages/tdebase/extensionproxy.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: extensionproxy\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-23 18:26+0800\n"
 "Last-Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.marsec.net>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/filetypes.po b/tde-i18n-zh_CN/messages/tdebase/filetypes.po
index bf98c9268bc..49624a9f4ed 100644
--- a/tde-i18n-zh_CN/messages/tdebase/filetypes.po
+++ b/tde-i18n-zh_CN/messages/tdebase/filetypes.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: filetype\n"
-"POT-Creation-Date: 2007-02-02 02:29+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-16 11:42+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -212,7 +213,8 @@ msgid ""
 msgstr "TDE 文件类型编辑器 - 用来编辑单个文件类型的简化版本"
 
 #: keditfiletype.cpp:117
-msgid "(c) 2000, TDE developers"
+#, fuzzy
+msgid "(c) 2000, KDE developers"
 msgstr "(c) 2000，TDE 开发者"
 
 #: keditfiletype.cpp:151
diff --git a/tde-i18n-zh_CN/messages/tdebase/htmlsearch.po b/tde-i18n-zh_CN/messages/tdebase/htmlsearch.po
index 01d789ab460..b91bfb7f3bb 100644
--- a/tde-i18n-zh_CN/messages/tdebase/htmlsearch.po
+++ b/tde-i18n-zh_CN/messages/tdebase/htmlsearch.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: htmlsearch\n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2002-02-24 00:49+0800\n"
 "Last-Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/joystick.po b/tde-i18n-zh_CN/messages/tdebase/joystick.po
index db408f4baf9..20d8099679d 100644
--- a/tde-i18n-zh_CN/messages/tdebase/joystick.po
+++ b/tde-i18n-zh_CN/messages/tdebase/joystick.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: joystick\n"
-"POT-Creation-Date: 2006-03-02 03:42+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-08-01 22:45+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kaccess.po b/tde-i18n-zh_CN/messages/tdebase/kaccess.po
index 6d08f5c2735..ebb387de3e6 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kaccess.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kaccess.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kaccess\n"
-"POT-Creation-Date: 2006-09-16 02:33+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-09-24 23:06+0800\n"
 "Last-Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -299,8 +300,8 @@ msgstr "应用程序请求更改这些设置。"
 #: kaccess.cpp:751
 msgid ""
 "These AccessX settings are needed for some users with motion impairments and "
-"can be configured in the Trinity Control Center. You can also turn them on and off "
-"with standardized keyboard gestures.\n"
+"can be configured in the Trinity Control Center. You can also turn them on and "
+"off with standardized keyboard gestures.\n"
 "\n"
 "If you do not need them, you can select \"Deactivate all AccessX features and "
 "gestures\"."
diff --git a/tde-i18n-zh_CN/messages/tdebase/kappfinder.po b/tde-i18n-zh_CN/messages/tdebase/kappfinder.po
index f1e78ce82e5..34a815cdec8 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kappfinder.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kappfinder.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-21 22:30+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kasbarextension.po b/tde-i18n-zh_CN/messages/tdebase/kasbarextension.po
index 95277a8cc05..190313c0544 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kasbarextension.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kasbarextension.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kasbarextension\n"
-"POT-Creation-Date: 2006-08-13 04:04+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-05-14 04:12+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,7 +19,8 @@ msgid "About Kasbar"
 msgstr "关于 Kasbar"
 
 #: kasaboutdlg.cpp:156
-msgid "<qt><body><h2>Kasbar Version: %1</h2><b>TDE Version:</b> %2</body></qt>"
+#, fuzzy
+msgid "<qt><body><h2>Kasbar Version: %1</h2><b>KDE Version:</b> %2</body></qt>"
 msgstr "<qt><body><h2>Kasbar 版本：%1</h2><b>TDE 版本：</b> %2</body><qt>"
 
 #: kasaboutdlg.cpp:164
diff --git a/tde-i18n-zh_CN/messages/tdebase/kate.po b/tde-i18n-zh_CN/messages/tdebase/kate.po
index d7db872616b..69d1b9b9d8a 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kate.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kate.po
@@ -10,190 +10,197 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kate\n"
-"POT-Creation-Date: 2008-08-14 01:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: app/kateexternaltools.cpp:276
-msgid "Failed to expand the command '%1'."
-msgstr "展开命令“%1”失败。"
-
-#: app/kateexternaltools.cpp:277
-msgid "Kate External Tools"
-msgstr "Kate 外部工具"
-
-#: app/kateexternaltools.cpp:427
-msgid "Edit External Tool"
-msgstr "编辑外部工具"
-
-#: app/kateexternaltools.cpp:441
-msgid "&Label:"
-msgstr "标签(&L)："
-
-#: app/kateexternaltools.cpp:446
-msgid "The name will be displayed in the 'Tools->External' menu"
-msgstr "将显示于“工具->外部”菜单中的名称"
+#: _translatorinfo.cpp:1 app/katemain.cpp:103 app/kwritemain.cpp:589
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Simplified Chinese Translation Team"
 
-#: app/kateexternaltools.cpp:456
-msgid "S&cript:"
-msgstr "脚本(&C)："
+#: _translatorinfo.cpp:3 app/katemain.cpp:103 app/kwritemain.cpp:589
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "i18n-translation@lists.linux.net.cn"
 
-#: app/kateexternaltools.cpp:461
+#: tips.txt:3
 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</code> - the URL of the current document."
-"<li><code>%URLs</code> - a list of the URLs of all open documents."
-"<li><code>%directory</code> - the URL of the directory containing the current "
-"document."
-"<li><code>%filename</code> - the filename of the current document."
-"<li><code>%line</code> - the current line of the text cursor in the current "
-"view."
-"<li><code>%column</code> - the column of the text cursor in the current view."
-"<li><code>%selection</code> - the selected text in the current view."
-"<li><code>%text</code> - the text of the current document.</ul>"
+"<p>Kate comes with a nice set of plugins, providing simple\n"
+"and advanced features of all sorts.</p>\n"
+"<p>You can enable/disable plugins to suit your needs in the configuration "
+"dialog,\n"
+"choose <strong>Settings -&gt;configure</strong> to launch that.</p>\n"
 msgstr ""
-"<p>调用工具要执行的脚本。脚本会传递给 /bin/sh 执行。下列宏将会被展开：</p>"
-"<ul>"
-"<li><code>%URL</code> - 当前文档的 URL。"
-"<li><code>%URLs</code> - 打开的全部文档的 URL。"
-"<li><code>%directory</code> - 包含当前文档的目录的 URL。"
-"<li><code>%filename</code> - 当前文档的文件名。"
-"<li><code>%line</code> - 当前视图中光标所在文本行号。"
-"<li><code>%column</code> - 当前视图中光标所在文本列数。"
-"<li><code>%selection</code> - 当前视图中所选的文本。"
-"<li><code>%text</code> - 当前文档的文本。</ul>"
-
-#: app/kateexternaltools.cpp:479
-msgid "&Executable:"
-msgstr "可执行(&E)："
+"<p>Kate 附带了一组不错的插件，提供了各种简单的和高级的功能。</p>"
+"<p>您可以在配置对话框中启用/禁用插件来满足您的需要，选择 <strong>设置 -&gt;configure</strong> 来启动配置对话框。</p>"
+"\n"
 
-#: app/kateexternaltools.cpp:484
+#: tips.txt:11
 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."
-msgstr "此命令使用的可执行文件。此选项将用来检查是否要显示此工具；如果未设置的话，将会使用 <em>command</em> 的第一个单词。"
-
-#: app/kateexternaltools.cpp:490
-msgid "&Mime types:"
-msgstr "MIME 类型(&M)："
+"<p>You can swap the characters on each side of the cursor just by pressing\n"
+"<strong>Ctrl+T</strong></p>\n"
+msgstr ""
+"<p>您可以交换光标两侧的字符，方法是按 <strong>Ctrl+T</strong></p>\n"
 
-#: app/kateexternaltools.cpp:495
+#: tips.txt:17
 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 from "
-"known mimetypes, press the button on the right."
-msgstr "此工具适用于的 MIME 类型列表，用分号分隔；如果为空的话，此工具将总是有效。要从已知的 MIME 类型中选择，请按右侧的按钮。"
-
-#: app/kateexternaltools.cpp:504
-msgid "Click for a dialog that can help you creating a list of mimetypes."
-msgstr "单击可出现一个帮助您创建 MIME 类型列表的对话框。"
-
-#: app/kateexternaltools.cpp:508
-msgid "&Save:"
-msgstr "保存(&S)："
-
-#: app/kateexternaltools.cpp:512
-msgid "None"
-msgstr "无"
-
-#: app/kateexternaltools.cpp:512
-msgid "Current Document"
-msgstr "当前文档"
-
-#: app/kateexternaltools.cpp:512
-msgid "All Documents"
-msgstr "全部文档"
+"<p>You can export the current document as a HTML file, including\n"
+"syntax highlighting.</p>\n"
+"<p>Just choose <strong>File -&gt; Export -&gt; HTML...</strong></p>\n"
+msgstr ""
+"<p>您可以把当前文档导出为 HTML 文件，包括语法加亮显示。</p>"
+"<p>只需选择 <strong>文件 -&gt; 导出 -&gt; HTML...</strong>即可</p>\n"
 
-#: app/kateexternaltools.cpp:516
+#: tips.txt:24
 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 application like, "
-"for example, an FTP client."
-msgstr "您可以选择在运行命令前先保存当前或[已修改]的全部文档。如果您想要将 URL 传递给像 FTP 客户端这样的应用程序的话，此功能将非常有用。"
-
-#: app/kateexternaltools.cpp:523
-msgid "&Command line name:"
-msgstr "命令行名称(&C)："
+"<p>You can split the Kate editor as many times as you like and\n"
+"in either direction. Each frame has its own status bar and\n"
+"can display any open document.</p>\n"
+"<p>Just choose "
+"<br><strong>View -&gt; Split [ Horizontal | Vertical ]</strong></p>\n"
+msgstr ""
+"<p>您可以按任意方向多次分割 Kate 编辑器。每个框架中都有它自己的状态栏，并能够显示任何打开的文件。</p>"
+"<p>只需选择"
+"<br><strong>查看 -&gt; [ 水平 | 垂直 ]分割</strong> 即可。</p>\n"
 
-#: app/kateexternaltools.cpp:528
+#: tips.txt:32
 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 "
-"tabs in the name."
-msgstr "如果您在此指定名称，您就可以从查看命令行中使用该名称调用该命令。请不要在名称中使用空格或跳格键。"
-
-#: app/kateexternaltools.cpp:539
-msgid "You must specify at least a name and a command"
-msgstr "您必须至少指定一个名称和命令"
-
-#: app/kateexternaltools.cpp:548
-msgid "Select the MimeTypes for which to enable this tool."
-msgstr "选择此工具适用的 MIME 类型。"
-
-#: app/kateexternaltools.cpp:550
-msgid "Select Mime Types"
-msgstr "选择 MIME 类型"
-
-#: app/kateexternaltools.cpp:568
-msgid "&New..."
-msgstr "新建(&N)..."
-
-#: app/kateexternaltools.cpp:576
-msgid "&Edit..."
-msgstr "编辑(&E)..."
+"<p>You can drag the Tool views (<em>File List</em> and <em>File Selector</em>)\n"
+"to any side that you want them in Kate, or stack them, or even tear them off "
+"the\n"
+"main window.</p>\n"
+msgstr ""
+"<p>您可以把工具视图(<em>文件列表</em>和<em>文件选择器</em>)拖放到 Kate 的任何一边上，或叠放它们，甚至从主窗口中分裂出来。</p>"
+"\n"
 
-#: app/kateexternaltools.cpp:580
-msgid "Insert &Separator"
-msgstr "插入分隔符(&S)"
+#: tips.txt:39
+msgid ""
+"<p>Kate has a built-in terminal emulator, just click on <strong>"
+"\"Terminal\"</strong> at\n"
+"the bottom to show or hide it as you desire.</p>\n"
+msgstr ""
+"<p>Kate 有一个内建的终端仿真器，只需点击下面的<strong>“终端”</strong>来随意显示或隐藏它。</p>\n"
 
-#: app/kateexternaltools.cpp:602
+#: tips.txt:45
 msgid ""
-"This list shows all the configured tools, represented by their menu text."
-msgstr "此列表显示了配置的全部工具，各选项用菜单文字代表。"
+"<p>Kate can highlight the current line with a\n"
+"<table bgcolor=\"yellow\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\" "
+"width=\"100%\">"
+"<tr>"
+"<td>different\n"
+"background color.<strong>|</strong></td></tr></table></p>\n"
+"<p>You can set the color in the <em>Colors</em> page of the configuration\n"
+"dialog.</p>\n"
+msgstr ""
+"<p>Kate 可以使用<table bgcolor=\"yellow\" border=\"0\" cellspacing=\"0\" "
+"cellpadding=\"0\" width=\"100%\">"
+"<tr>"
+"<td>不同的背景颜色<strong>|</strong></td></tr></table>来突出显示当前行。</p>"
+"<p>您可以在配置对话框中的<em>颜色</em>页中设置颜色。</p>\n"
 
-#: app/kateviewspace.cpp:320 app/kateviewspace.cpp:359
-msgid " INS "
-msgstr " 插入 "
+#: tips.txt:54
+msgid ""
+"<p>You can open the currently edited file in any other application from within\n"
+"Kate.</p>\n"
+"<p>Choose <strong>File -&gt; Open With</strong> for the list of programs\n"
+"configured\n"
+"for the document type. There is also an option <strong>Other...</strong> to\n"
+"choose any application on your system.</p>\n"
+msgstr ""
+"<p>您可以在 Kate 内用任何其它程序打开当前正在被编辑的文件。</p>"
+"<p>选择<strong>文件 -&gt; 打开方式</strong> 来选择配置给该文档类型的程序。其中还有一个选项<strong>"
+"其它...</strong>，您可以用它来选择系统上的任何程序。</p>\n"
 
-#: app/kateviewspace.cpp:325 app/kateviewspace.cpp:363
-msgid " NORM "
-msgstr " 普通 "
+#: tips.txt:64
+msgid ""
+"<p>You can configure the editor to always display the line numbers and/or\n"
+"bookmark panes when started from the <strong>View Defaults</strong> "
+"page of the\n"
+"configuration dialog.</p>\n"
+msgstr ""
+"<p>您可以在配置对话框中的<strong>视图默认值</strong>页中配置，让编辑器启动时总是显示行号和/或书签栏。</p>\n"
 
-#: app/kateviewspace.cpp:351
-msgid " Line: %1 Col: %2 "
-msgstr " 行：%1 列：%2 "
+#: tips.txt:71
+msgid ""
+"<p>You can download new or updated <em>Syntax highlight definitions</em> from\n"
+"the <strong>Highlighting</strong> page in the configuration dialog.</p>\n"
+"<p>Just click the <em>Download...</em> button on the <em>Highlight Modes</em>\n"
+"tab (You have to be online, of course...).</p>\n"
+msgstr ""
+"<p>您可以在配置对话框中的<strong>加亮显示</strong>页上下载新的或更新的<em>语法加亮定义</em></p>"
+"<p>只需点击<em>加亮显示模式</em>标签上的<em>下载...</em>按钮即可(当然，您必须得在线才行...)。</p>\n"
 
-#: app/kateviewspace.cpp:355
-msgid " R/O "
-msgstr " 只读 "
+#: tips.txt:79
+msgid ""
+"<p>You can cycle through all open documents by pressing <strong>"
+"Alt+Left</strong>\n"
+"or <strong>Alt+Right</strong>. The next/previous document will immediately be "
+"displayed\n"
+"in the active frame.</p>\n"
+msgstr ""
+"<p>您可以通过按 <strong>Alt+Left</strong> 或 <strong>Alt+Right</strong> "
+"来循环浏览所有打开的文档。下一/前一文档将会被立即显示在活跃的框架中。</p>\n"
 
-#: app/kateviewspace.cpp:357
-msgid " OVR "
-msgstr " 改写 "
+#: tips.txt:86
+msgid ""
+"<p>You can do cool sed-like regular expression replacements using <em>"
+"Command Line</em>.</p>\n"
+"<p>For example, press <strong>F7</strong> and enter <code>"
+"s /oldtext/newtext/g</code>\n"
+"to replace &quot;oldtext&quot; with &quot;newtext&quot; throughout the current\n"
+"line.</p>\n"
+msgstr ""
+"<p>您可以使用 <em>编辑命令</em> 来执行类似 sed 的正则表达式替换。</p>"
+"<p>例如，按 <strong>Ctrl+M</strong> 并输入<code>s/oldtext/newtext/g</code> "
+"会把当前行中的所有“oldtext”替换为“newtext”</p>\n"
 
-#: app/kateviewspace.cpp:363
-msgid " BLK "
-msgstr " 块 "
+#: tips.txt:94
+msgid ""
+"<p>You can repeat your last search by just pressing <strong>F3</strong>, or\n"
+"<strong>Shift+F3</strong> if you want to search backwards.</p>\n"
+msgstr ""
+"<p>您只需按 <strong>F3</strong> 来重复刚才的搜索，或者按 <strong>Shift+F3</strong> 来反向搜索。</p>\n"
 
-#: app/kateconsole.cpp:129
+#: tips.txt:100
 msgid ""
-"Do you really want to pipe the text to the console? This will execute any "
-"contained commands with your user rights."
-msgstr "您真的想要将文本管道到控制台吗？这将使用您的用户权限执行其中包含的任何命令。"
+"<p>You can filter the files displayed in the <em>File Selector</em> tool view.\n"
+"</p>\n"
+"<p>Simply enter your filter in the filter entry at the bottom, for example:\n"
+"<code>*.html *.php</code> if you only want to see HTML and PHP files in the\n"
+"current folder.</p>\n"
+"<p>The File Selector will even remember your filters for you.</strong></p>\n"
+msgstr ""
+"<p>您可以过滤显示在 <em>文件选择器</em> 工具视图中的文件。</p>"
+"<p>只需在底部的过滤器框中输入您的过滤器即可。例如：输入 <code>*.html *.php</code>"
+"，如果您只想看到当前文件夹中的 HTML 和 PHP 文件。</p>"
+"<p>文件选择器甚至会记住您使用过的过滤器。</strong></p>\n"
 
-#: app/kateconsole.cpp:130
-msgid "Pipe to Console?"
-msgstr "管道到控制台吗？"
+#: tips.txt:110
+msgid ""
+"<p>You can have two views - or even more - of the same document in Kate. "
+"Editing\n"
+"in either will be reflected in both.</p>\n"
+"<p>So if you find yourself scrolling up and down to look at text at the other\n"
+"end of a document, just press <strong>Ctrl+Shift+T</strong> to split\n"
+"horizontally.</p>\n"
+msgstr ""
+"<p>在 Kate 中，同一文档您可以有两个视图 - 甚至更多。在任何一个视图中编辑该文档都会反映在所有视图中。</p>"
+"<p>因此，如果您需要前后寻找文档另一端的文本时，只需按 <strong>Ctrl+Shift+T</strong> 来水平分割它即可。</p>\n"
 
-#: app/kateconsole.cpp:131
-msgid "Pipe to Console"
-msgstr "管道到控制台"
+#: tips.txt:119
+msgid ""
+"<p>Press <strong>F8</strong> or <strong>Shift+F8</strong> to switch to the\n"
+"next/previous frame.</p>\n"
+msgstr ""
+"<p>按 <strong>F8</strong> 或 <strong>Shift+F8</strong> 来切换到下一/前一框架。</p>\n"
 
 #: app/katemainwindow.cpp:212 app/katesavemodifieddialog.cpp:152
 msgid "Documents"
@@ -257,8 +264,8 @@ msgstr "关闭该窗口"
 msgid "Create a new Kate view (a new window with the same document list)."
 msgstr "创建一个新的 Kate 视图(一个有同样文档列表的新窗口)。"
 
-#: app/kateconfigdialog.cpp:268 app/kateconfigdialog.cpp:269
-#: app/katemainwindow.cpp:265 app/katemainwindow.cpp:540
+#: app/kateconfigdialog.cpp:298 app/kateconfigdialog.cpp:299
+#: app/katemainwindow.cpp:265 app/katemainwindow.cpp:539
 msgid "External Tools"
 msgstr "外部工具"
 
@@ -331,44 +338,44 @@ msgstr "试图关闭 Kate 时打开了新文件，关闭被中止。"
 msgid "Closing Aborted"
 msgstr "关闭被中止"
 
-#: app/katemainwindow.cpp:489
+#: app/katemainwindow.cpp:488
 msgid ""
 "_: 'document name [*]', [*] means modified\n"
 "%1 [*]"
 msgstr "%1 [*]"
 
-#: app/katemainwindow.cpp:611
+#: app/katemainwindow.cpp:610
 msgid "&Other..."
 msgstr "其它(&O)..."
 
-#: app/katemainwindow.cpp:621
+#: app/katemainwindow.cpp:620
 msgid "Other..."
 msgstr "其它..."
 
-#: app/katemainwindow.cpp:638
+#: app/katemainwindow.cpp:637
 msgid "Application '%1' not found!"
 msgstr "应用程序“%1”未找到！"
 
-#: app/katemainwindow.cpp:638
+#: app/katemainwindow.cpp:637
 msgid "Application Not Found!"
 msgstr "应用程序未找到！"
 
-#: app/katemainwindow.cpp:666
+#: 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:669
+#: app/katemainwindow.cpp:668
 msgid "Cannot Send Unsaved File"
 msgstr "无法发送未保存文件"
 
-#: app/katemainwindow.cpp:677 app/katemainwindow.cpp:698
+#: 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:688
+#: app/katemainwindow.cpp:687
 msgid ""
 "<p>The current file:"
 "<br><strong>%1</strong>"
@@ -376,304 +383,178 @@ msgid ""
 "<p>Do you want to save it before sending it?"
 msgstr "<p>当前文件：<br><strong>%1</strong><br>已被修改。修改将不会体现在附件中。<p>您想在发送前保存它吗？"
 
-#: app/katemainwindow.cpp:691
+#: app/katemainwindow.cpp:690
 msgid "Save Before Sending?"
 msgstr "发送前保存？"
 
-#: app/katemainwindow.cpp:691
+#: app/katemainwindow.cpp:690
 msgid "Do Not Save"
 msgstr "不保存"
 
-#: app/katemailfilesdialog.cpp:47
-msgid "Email Files"
-msgstr "邮寄文件"
-
-#: app/katemailfilesdialog.cpp:49 app/katemailfilesdialog.cpp:99
-msgid "&Show All Documents >>"
-msgstr "显示所有文档(&S) >>"
-
-#: app/katemailfilesdialog.cpp:52
-msgid "&Mail..."
-msgstr "邮寄(&M)..."
-
-#: app/katemailfilesdialog.cpp:57
-msgid ""
-"<p>Press <strong>Mail...</strong> to email the current document."
-"<p>To select more documents to send, press <strong>Show All "
-"Documents&nbsp;&gt;&gt;</strong>."
-msgstr ""
-"<p>按 <strong>邮寄...</strong> 来把当前文档作为电子邮件发送。 "
-"<p>要选择更多文件进行，请按 <strong>显示所有文档&nbsp;&gt;&gt;</strong>。"
-
 #: app/kateconfigplugindialogpage.cpp:81 app/katemailfilesdialog.cpp:61
 msgid "Name"
 msgstr "名称"
 
-#: app/katefilelist.cpp:142 app/katefilelist.cpp:579
-#: app/katemailfilesdialog.cpp:62
-msgid "URL"
-msgstr "URL"
-
-#: app/katemailfilesdialog.cpp:104
-msgid "&Hide Document List <<"
-msgstr "隐藏文档列表(&H) <<"
-
-#: app/katemailfilesdialog.cpp:105
-msgid "Press <strong>Mail...</strong> to send selected documents"
-msgstr "按 <strong>邮寄...</strong> 来发送选定的文档"
-
-#: app/katemwmodonhddialog.cpp:61
-msgid "Documents Modified on Disk"
-msgstr "文档已在磁盘上修改"
-
-#: app/katemwmodonhddialog.cpp:63
-msgid "&Ignore"
-msgstr "忽略(&I)"
-
-#: app/katemwmodonhddialog.cpp:64
-msgid "&Overwrite"
-msgstr "覆盖(&O)"
-
-#: app/katemwmodonhddialog.cpp:68
-msgid ""
-"Removes the modified flag from the selected documents and closes the dialog if "
-"there are no more unhandled documents."
-msgstr "从选中文档中删除修改标记，如果没有其它未处理的文档的话，并关闭对话框。"
-
-#: app/katemwmodonhddialog.cpp:71
-msgid ""
-"Overwrite selected documents, discarding the disk changes and closes the dialog "
-"if there are no more unhandled documents."
-msgstr "覆盖选中的文档，丢弃磁盘上的更改，如果没有其它未处理的文档的话，关闭对话框。"
-
-#: app/katemwmodonhddialog.cpp:74
-msgid ""
-"Reloads the selected documents from disk and closes the dialog if there are no "
-"more unhandled documents."
-msgstr "从磁盘中重新装入选中文档，如果没有其它未处理的文档的话，关闭对话框。"
+#: app/kateconfigplugindialogpage.cpp:82
+msgid "Comment"
+msgstr "注释"
 
-#: app/katemwmodonhddialog.cpp:87
+#: app/kateconfigplugindialogpage.cpp:83
 msgid ""
-"<qt>The documents listed below has changed on disk."
-"<p>Select one or more at the time and press an action button until the list is "
-"empty.</qt>"
-msgstr "<qt>下面列出的文档在磁盘上已经发生了更改。<p>一次选择一个或多个文档，然后按下操作按钮，直到此列表变空。</qt>"
-
-#: app/katemwmodonhddialog.cpp:93
-msgid "Filename"
-msgstr "文件名"
-
-#: app/katemwmodonhddialog.cpp:94
-msgid "Status on Disk"
-msgstr "磁盘上的状态"
-
-#: app/katemwmodonhddialog.cpp:98
-msgid "Modified"
-msgstr "已修改"
-
-#: app/katemwmodonhddialog.cpp:98
-msgid "Created"
-msgstr "已创建"
-
-#: app/katemwmodonhddialog.cpp:98
-msgid "Deleted"
-msgstr "已删除"
+"Here you can see all available Kate plugins. Those with a check mark are "
+"loaded, and will be loaded again the next time Kate is started."
+msgstr "此处您可以看到所有可用的 Kate 插件。那些带有选择标记的插件已被载入，并且在 Kate 下次启动时还会被载入。"
 
-#: app/katemwmodonhddialog.cpp:108
-msgid "&View Difference"
-msgstr "查看差异(&V)"
+#: app/katemain.cpp:41
+msgid "Start Kate with a given session"
+msgstr "以给定会话启动 Kate"
 
-#: app/katemwmodonhddialog.cpp:111
-msgid ""
-"Calculates the difference between the the editor contents and the disk file for "
-"the selected document, and shows the difference with the default application. "
-"Requires diff(1)."
-msgstr "计算选中文档的编辑器内容和磁盘文件之间的差异，然后用默认应用程序显示差异。需要 diff(1)。"
+#: app/katemain.cpp:43
+msgid "Use a already running kate instance (if possible)"
+msgstr "使用已经运行的 Kate 实例(如果有的话)"
 
-#: app/katemwmodonhddialog.cpp:163
-msgid ""
-"Could not save the document \n"
-"'%1'"
+#: app/katemain.cpp:45
+msgid "Force single document mode if the MDI setting is enabled."
 msgstr ""
-"无法保存文档\n"
-"“%1”"
-
-#: app/katemwmodonhddialog.cpp:268
-msgid ""
-"The diff command failed. Please make sure that diff(1) is installed and in your "
-"PATH."
-msgstr "diff 命令失败。请确定 diff(1) 已经安装并且在您的路径中。"
-
-#: app/katemwmodonhddialog.cpp:270
-msgid "Error Creating Diff"
-msgstr "创建 Diff 失败"
-
-#: app/kateconfigdialog.cpp:91 app/kateconfigdialog.cpp:97
-#: app/kateconfigdialog.cpp:174 app/kateconfigdialog.cpp:243
-#: app/kateconfigdialog.cpp:252 app/kateconfigdialog.cpp:260
-#: app/kateconfigdialog.cpp:268 app/kateconfigdialog.cpp:317
-msgid "Application"
-msgstr "应用程序"
-
-#: app/kateconfigdialog.cpp:97
-msgid "General"
-msgstr "常规"
 
-#: app/kateconfigdialog.cpp:98
-msgid "General Options"
-msgstr "常规选项"
-
-#: app/kateconfigdialog.cpp:105
-msgid "&Appearance"
-msgstr "外观(&A)"
+#: app/katemain.cpp:47
+msgid "Only try to reuse kate instance with this pid"
+msgstr "只试着重用此 pid 的 Kate 实例"
 
-#: app/kateconfigdialog.cpp:110
-msgid "&Show full path in title"
-msgstr "在标题中显示完整路径(&S)"
+#: app/katemain.cpp:49 app/kwritemain.cpp:532
+msgid "Set encoding for the file to open"
+msgstr "设定打开文件所用的编码"
 
-#: app/kateconfigdialog.cpp:112
-msgid ""
-"If this option is checked, the full document path will be shown in the window "
-"caption."
-msgstr "如果该选项被选，在窗口标题处将会显示完整的文档路径。"
+#: app/katemain.cpp:51 app/kwritemain.cpp:533
+msgid "Navigate to this line"
+msgstr "转到这一行"
 
-#: app/kateconfigdialog.cpp:117
-msgid "&Behavior"
-msgstr "行为(&B)"
+#: app/katemain.cpp:53 app/kwritemain.cpp:534
+msgid "Navigate to this column"
+msgstr "转到这一列"
 
-#: app/kateconfigdialog.cpp:122
-msgid "Sync &terminal emulator with active document"
-msgstr "使终端仿真器与当前文档同步(&T)"
+#: app/katemain.cpp:55 app/kwritemain.cpp:531
+msgid "Read the contents of stdin"
+msgstr "读取标准输入设备上的内容"
 
-#: app/kateconfigdialog.cpp:125
-msgid ""
-"If this is checked, the built in Konsole will <code>cd</code> "
-"to the directory of the active document when started and whenever the active "
-"document changes, if the document is a local file."
-msgstr ""
-"如果选中此选项，对于本地文件，内建的 Konsole 将会在启动以及活跃文档改变时使用 <code>cd</code> 命令转到活跃文档所在的目录。"
+#: app/katemain.cpp:56 app/kwritemain.cpp:535
+msgid "Document to open"
+msgstr "要打开的文档"
 
-#: app/kateconfigdialog.cpp:132
-msgid "Wa&rn about files modified by foreign processes"
-msgstr "当文件被外部进程修改时给出警告(&R)"
+#: app/katemain.cpp:67
+msgid "Kate"
+msgstr "Kate"
 
-#: app/kateconfigdialog.cpp:135
-msgid ""
-"If enabled, when Kate receives focus you will be asked what to do with files "
-"that have been modified on the hard disk. If not enabled, you will be asked "
-"what to do with a file that has been modified on the hard disk only when that "
-"file gains focus inside Kate."
-msgstr ""
-"启用时，Kate 会在获得焦点后询问您如何处理硬盘上已经被修改的文件。如果未启用，直到在硬盘上已被修改的文件在 Kate 中获得焦点的时候，您才会被询问。"
+#: app/katemain.cpp:68
+msgid "Kate - Advanced Text Editor"
+msgstr "Kate - 高级文本编辑器"
 
-#: app/kateconfigdialog.cpp:143
-msgid "Meta-Information"
-msgstr "元信息"
+#: app/katemain.cpp:69 app/kwritemain.cpp:556
+msgid "(c) 2000-2005 The Kate Authors"
+msgstr "(c) 2000-2005 Kate 作者"
 
-#: app/kateconfigdialog.cpp:148
-msgid "Keep &meta-information past sessions"
-msgstr "在会话中保留元信息(&M)"
+#: app/katemain.cpp:71 app/kwritemain.cpp:558
+msgid "Maintainer"
+msgstr "维护者"
 
-#: app/kateconfigdialog.cpp:151
-msgid ""
-"Check this if you want document configuration like for example bookmarks to be "
-"saved past editor sessions. The configuration will be restored if the document "
-"has not changed when reopened."
-msgstr "如果您想要在编辑器的不同会话中保存像书签这样的文档配置，请选中此项。如果重新打开文档的时候文档没有更改，则会恢复配置文件。"
+#: app/katemain.cpp:72 app/katemain.cpp:73 app/katemain.cpp:74
+#: app/katemain.cpp:79 app/kwritemain.cpp:559 app/kwritemain.cpp:560
+#: app/kwritemain.cpp:561 app/kwritemain.cpp:566
+msgid "Core Developer"
+msgstr "核心开发"
 
-#: app/kateconfigdialog.cpp:159
-msgid "&Delete unused meta-information after:"
-msgstr "删除无用的元信息，等(&D)："
+#: app/katemain.cpp:75 app/kwritemain.cpp:562
+msgid "The cool buffersystem"
+msgstr "极好的缓冲系统"
 
-#: app/kateconfigdialog.cpp:161
-msgid "(never)"
-msgstr "(从不)"
+#: app/katemain.cpp:76 app/kwritemain.cpp:563
+msgid "The Editing Commands"
+msgstr "编辑命令"
 
-#: app/kateconfigdialog.cpp:162
-msgid " day(s)"
-msgstr " 天"
+#: app/katemain.cpp:77 app/kwritemain.cpp:564
+msgid "Testing, ..."
+msgstr "测试、..."
 
-#: app/kateconfigdialog.cpp:174
-msgid "Sessions"
-msgstr "会话"
+#: app/katemain.cpp:78 app/kwritemain.cpp:565
+msgid "Former Core Developer"
+msgstr "先前核心开发者"
 
-#: app/kateconfigdialog.cpp:175
-msgid "Session Management"
-msgstr "会话管理"
+#: app/katemain.cpp:80 app/kwritemain.cpp:567
+msgid "KWrite Author"
+msgstr "KWrite 作者"
 
-#: app/kateconfigdialog.cpp:181
-msgid "Elements of Sessions"
-msgstr "会话元素"
+#: app/katemain.cpp:81 app/kwritemain.cpp:568
+msgid "KWrite port to KParts"
+msgstr "KWrite 移植到 KParts"
 
-#: app/kateconfigdialog.cpp:186
-msgid "Include &window configuration"
-msgstr "包含窗口配置(&W)"
+#: app/katemain.cpp:84 app/kwritemain.cpp:571
+msgid "KWrite Undo History, Kspell integration"
+msgstr "KWrite 撤销历史，Kspell 集成"
 
-#: app/kateconfigdialog.cpp:190
-msgid ""
-"Check this if you want all your views and frames restored each time you open "
-"Kate"
-msgstr "如果您希望在每次打开 Kate 时都恢复所有视图和框架，启用此选项。"
+#: app/katemain.cpp:85 app/kwritemain.cpp:572
+msgid "KWrite XML Syntax highlighting support"
+msgstr "KWrite XML 语法加亮支持"
 
-#: app/kateconfigdialog.cpp:195
-msgid "Behavior on Application Startup"
-msgstr "应用启动时的行为"
+#: app/katemain.cpp:86 app/kwritemain.cpp:573
+msgid "Patches and more"
+msgstr "补丁及其它"
 
-#: app/kateconfigdialog.cpp:199
-msgid "&Start new session"
-msgstr "启动新会话(&S)"
+#: app/katemain.cpp:87
+msgid "Developer & Highlight wizard"
+msgstr "开发者和突出显示向导"
 
-#: app/kateconfigdialog.cpp:200
-msgid "&Load last-used session"
-msgstr "装入上次使用的会话(&L)"
+#: app/katemain.cpp:89 app/kwritemain.cpp:575
+msgid "Highlighting for RPM Spec-Files, Perl, Diff and more"
+msgstr "RPM Spec 文件、Perl、Diff 和其它类型的语法加亮"
 
-#: app/kateconfigdialog.cpp:201
-msgid "&Manually choose a session"
-msgstr "手动选择会话(&M)"
+#: app/katemain.cpp:90 app/kwritemain.cpp:576
+msgid "Highlighting for VHDL"
+msgstr "VHDL 语法加亮"
 
-#: app/kateconfigdialog.cpp:216
-msgid "Behavior on Application Exit or Session Switch"
-msgstr "应用程序退出或会话切换时的行为"
+#: app/katemain.cpp:91 app/kwritemain.cpp:577
+msgid "Highlighting for SQL"
+msgstr "SQL 语法加亮"
 
-#: app/kateconfigdialog.cpp:220
-msgid "&Do not save session"
-msgstr "不保存会话(&D)"
+#: app/katemain.cpp:92 app/kwritemain.cpp:578
+msgid "Highlighting for Ferite"
+msgstr "Ferite 语法加亮"
 
-#: app/kateconfigdialog.cpp:221
-msgid "&Save session"
-msgstr "保存会话(&S)"
+#: app/katemain.cpp:93 app/kwritemain.cpp:579
+msgid "Highlighting for ILERPG"
+msgstr "ILERPG 语法加亮"
 
-#: app/kateconfigdialog.cpp:222
-msgid "&Ask user"
-msgstr "询问用户(&A)"
+#: app/katemain.cpp:94 app/kwritemain.cpp:580
+msgid "Highlighting for LaTeX"
+msgstr "LaTeX 语法加亮"
 
-#: app/kateconfigdialog.cpp:243
-msgid "File Selector"
-msgstr "文件选择器"
+#: app/katemain.cpp:95 app/kwritemain.cpp:581
+msgid "Highlighting for Makefiles, Python"
+msgstr "Makefiles、Python 语法加亮"
 
-#: app/kateconfigdialog.cpp:245
-msgid "File Selector Settings"
-msgstr "文件选择器设置"
+#: app/katemain.cpp:96 app/kwritemain.cpp:582
+msgid "Highlighting for Python"
+msgstr "Python 语法加亮"
 
-#: app/kateconfigdialog.cpp:252
-msgid "Document List"
-msgstr "文档列表"
+#: app/katemain.cpp:98 app/kwritemain.cpp:584
+msgid "Highlighting for Scheme"
+msgstr "Scheme 语法加亮"
 
-#: app/kateconfigdialog.cpp:253
-msgid "Document List Settings"
-msgstr "文档列表设置"
+#: app/katemain.cpp:99 app/kwritemain.cpp:585
+msgid "PHP Keyword/Datatype list"
+msgstr "PHP 关键字/数据类型列表"
 
-#: app/kateconfigdialog.cpp:260 app/kateconfigdialog.cpp:317
-msgid "Plugins"
-msgstr "插件"
+#: app/katemain.cpp:100 app/kwritemain.cpp:586
+msgid "Very nice help"
+msgstr "很好的帮助"
 
-#: app/kateconfigdialog.cpp:261
-msgid "Plugin Manager"
-msgstr "插件管理器"
+#: app/katemain.cpp:101 app/kwritemain.cpp:587
+msgid "All people who have contributed and I have forgotten to mention"
+msgstr "所有做出贡献而我却没能提到的人员"
 
-#: app/kateconfigdialog.cpp:276 app/kateconfigdialog.cpp:282
-msgid "Editor"
-msgstr "编辑器"
+#: 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/kategrepdialog.cpp:102
 msgid "Pattern:"
@@ -820,339 +701,549 @@ msgstr "<strong>错误：</strong><p>"
 msgid "Grep Tool Error"
 msgstr "Grep 工具错误"
 
-#: app/katemain.cpp:41
-msgid "Start Kate with a given session"
-msgstr "以给定会话启动 Kate"
+#: app/katedocmanager.cpp:395
+msgid ""
+"<p>The document '%1' has been modified, but not saved."
+"<p>Do you want to save your changes or discard them?"
+msgstr "<p>文档“%1”已经被修改，但尚未保存。<p>您是否想要保存更改还是丢弃更改？"
 
-#: app/katemain.cpp:43
-msgid "Use a already running kate instance (if possible)"
-msgstr "使用已经运行的 Kate 实例(如果有的话)"
+#: app/katedocmanager.cpp:397
+msgid "Close Document"
+msgstr "关闭文档"
 
-#: app/katemain.cpp:45
-msgid "Only try to reuse kate instance with this pid"
-msgstr "只试着重用此 pid 的 Kate 实例"
+#: app/katedocmanager.cpp:484
+msgid "Reopening files from the last session..."
+msgstr "重新打开前次会话中的文件..."
 
-#: app/katemain.cpp:47 app/kwritemain.cpp:532
-msgid "Set encoding for the file to open"
-msgstr "设定打开文件所用的编码"
+#: app/katedocmanager.cpp:491
+msgid "Starting Up"
+msgstr "启动"
 
-#: app/katemain.cpp:49 app/kwritemain.cpp:533
-msgid "Navigate to this line"
-msgstr "转到这一行"
+#: app/katemwmodonhddialog.cpp:61
+msgid "Documents Modified on Disk"
+msgstr "文档已在磁盘上修改"
 
-#: app/katemain.cpp:51 app/kwritemain.cpp:534
-msgid "Navigate to this column"
-msgstr "转到这一列"
+#: app/katemwmodonhddialog.cpp:63
+msgid "&Ignore"
+msgstr "忽略(&I)"
 
-#: app/katemain.cpp:53 app/kwritemain.cpp:531
-msgid "Read the contents of stdin"
-msgstr "读取标准输入设备上的内容"
+#: app/katemwmodonhddialog.cpp:64
+msgid "&Overwrite"
+msgstr "覆盖(&O)"
 
-#: app/katemain.cpp:54 app/kwritemain.cpp:535
-msgid "Document to open"
-msgstr "要打开的文档"
+#: app/katemwmodonhddialog.cpp:68
+msgid ""
+"Removes the modified flag from the selected documents and closes the dialog if "
+"there are no more unhandled documents."
+msgstr "从选中文档中删除修改标记，如果没有其它未处理的文档的话，并关闭对话框。"
 
-#: app/katemain.cpp:63
-msgid "Kate"
-msgstr "Kate"
+#: app/katemwmodonhddialog.cpp:71
+msgid ""
+"Overwrite selected documents, discarding the disk changes and closes the dialog "
+"if there are no more unhandled documents."
+msgstr "覆盖选中的文档，丢弃磁盘上的更改，如果没有其它未处理的文档的话，关闭对话框。"
 
-#: app/katemain.cpp:64
-msgid "Kate - Advanced Text Editor"
-msgstr "Kate - 高级文本编辑器"
+#: app/katemwmodonhddialog.cpp:74
+msgid ""
+"Reloads the selected documents from disk and closes the dialog if there are no "
+"more unhandled documents."
+msgstr "从磁盘中重新装入选中文档，如果没有其它未处理的文档的话，关闭对话框。"
 
-#: app/katemain.cpp:65 app/kwritemain.cpp:552
-msgid "(c) 2000-2005 The Kate Authors"
-msgstr "(c) 2000-2005 Kate 作者"
+#: app/katemwmodonhddialog.cpp:87
+msgid ""
+"<qt>The documents listed below has changed on disk."
+"<p>Select one or more at the time and press an action button until the list is "
+"empty.</qt>"
+msgstr "<qt>下面列出的文档在磁盘上已经发生了更改。<p>一次选择一个或多个文档，然后按下操作按钮，直到此列表变空。</qt>"
 
-#: app/katemain.cpp:67 app/kwritemain.cpp:554
-msgid "Maintainer"
-msgstr "维护者"
+#: app/katemwmodonhddialog.cpp:93
+msgid "Filename"
+msgstr "文件名"
 
-#: app/katemain.cpp:68 app/katemain.cpp:69 app/katemain.cpp:70
-#: app/katemain.cpp:75 app/kwritemain.cpp:555 app/kwritemain.cpp:556
-#: app/kwritemain.cpp:557 app/kwritemain.cpp:562
-msgid "Core Developer"
-msgstr "核心开发"
+#: app/katemwmodonhddialog.cpp:94
+msgid "Status on Disk"
+msgstr "磁盘上的状态"
 
-#: app/katemain.cpp:71 app/kwritemain.cpp:558
-msgid "The cool buffersystem"
-msgstr "极好的缓冲系统"
+#: app/katemwmodonhddialog.cpp:98
+msgid "Modified"
+msgstr "已修改"
 
-#: app/katemain.cpp:72 app/kwritemain.cpp:559
-msgid "The Editing Commands"
-msgstr "编辑命令"
+#: app/katemwmodonhddialog.cpp:98
+msgid "Created"
+msgstr "已创建"
 
-#: app/katemain.cpp:73 app/kwritemain.cpp:560
-msgid "Testing, ..."
-msgstr "测试、..."
+#: app/katemwmodonhddialog.cpp:98
+msgid "Deleted"
+msgstr "已删除"
 
-#: app/katemain.cpp:74 app/kwritemain.cpp:561
-msgid "Former Core Developer"
-msgstr "先前核心开发者"
+#: app/katemwmodonhddialog.cpp:108
+msgid "&View Difference"
+msgstr "查看差异(&V)"
 
-#: app/katemain.cpp:76 app/kwritemain.cpp:563
-msgid "KWrite Author"
-msgstr "KWrite 作者"
+#: app/katemwmodonhddialog.cpp:111
+msgid ""
+"Calculates the difference between the the editor contents and the disk file for "
+"the selected document, and shows the difference with the default application. "
+"Requires diff(1)."
+msgstr "计算选中文档的编辑器内容和磁盘文件之间的差异，然后用默认应用程序显示差异。需要 diff(1)。"
 
-#: app/katemain.cpp:77 app/kwritemain.cpp:564
-msgid "KWrite port to KParts"
-msgstr "KWrite 移植到 KParts"
+#: app/katemwmodonhddialog.cpp:163
+msgid ""
+"Could not save the document \n"
+"'%1'"
+msgstr ""
+"无法保存文档\n"
+"“%1”"
 
-#: app/katemain.cpp:80 app/kwritemain.cpp:567
-msgid "KWrite Undo History, Kspell integration"
-msgstr "KWrite 撤销历史，Kspell 集成"
+#: app/katemwmodonhddialog.cpp:268
+msgid ""
+"The diff command failed. Please make sure that diff(1) is installed and in your "
+"PATH."
+msgstr "diff 命令失败。请确定 diff(1) 已经安装并且在您的路径中。"
 
-#: app/katemain.cpp:81 app/kwritemain.cpp:568
-msgid "KWrite XML Syntax highlighting support"
-msgstr "KWrite XML 语法加亮支持"
+#: app/katemwmodonhddialog.cpp:270
+msgid "Error Creating Diff"
+msgstr "创建 Diff 失败"
 
-#: app/katemain.cpp:82 app/kwritemain.cpp:569
-msgid "Patches and more"
-msgstr "补丁及其它"
+#: app/katemailfilesdialog.cpp:47
+msgid "Email Files"
+msgstr "邮寄文件"
 
-#: app/katemain.cpp:83
-msgid "Developer & Highlight wizard"
-msgstr "开发者和突出显示向导"
+#: app/katemailfilesdialog.cpp:49 app/katemailfilesdialog.cpp:99
+msgid "&Show All Documents >>"
+msgstr "显示所有文档(&S) >>"
 
-#: app/katemain.cpp:85 app/kwritemain.cpp:571
-msgid "Highlighting for RPM Spec-Files, Perl, Diff and more"
-msgstr "RPM Spec 文件、Perl、Diff 和其它类型的语法加亮"
+#: app/katemailfilesdialog.cpp:52
+msgid "&Mail..."
+msgstr "邮寄(&M)..."
 
-#: app/katemain.cpp:86 app/kwritemain.cpp:572
-msgid "Highlighting for VHDL"
-msgstr "VHDL 语法加亮"
+#: app/katemailfilesdialog.cpp:57
+msgid ""
+"<p>Press <strong>Mail...</strong> to email the current document."
+"<p>To select more documents to send, press <strong>Show All "
+"Documents&nbsp;&gt;&gt;</strong>."
+msgstr ""
+"<p>按 <strong>邮寄...</strong> 来把当前文档作为电子邮件发送。 "
+"<p>要选择更多文件进行，请按 <strong>显示所有文档&nbsp;&gt;&gt;</strong>。"
 
-#: app/katemain.cpp:87 app/kwritemain.cpp:573
-msgid "Highlighting for SQL"
-msgstr "SQL 语法加亮"
+#: app/katefilelist.cpp:150 app/katefilelist.cpp:688
+#: app/katemailfilesdialog.cpp:62
+msgid "URL"
+msgstr "URL"
 
-#: app/katemain.cpp:88 app/kwritemain.cpp:574
-msgid "Highlighting for Ferite"
-msgstr "Ferite 语法加亮"
+#: app/katemailfilesdialog.cpp:104
+msgid "&Hide Document List <<"
+msgstr "隐藏文档列表(&H) <<"
 
-#: app/katemain.cpp:89 app/kwritemain.cpp:575
-msgid "Highlighting for ILERPG"
-msgstr "ILERPG 语法加亮"
+#: app/katemailfilesdialog.cpp:105
+msgid "Press <strong>Mail...</strong> to send selected documents"
+msgstr "按 <strong>邮寄...</strong> 来发送选定的文档"
 
-#: app/katemain.cpp:90 app/kwritemain.cpp:576
-msgid "Highlighting for LaTeX"
-msgstr "LaTeX 语法加亮"
+#: app/katefileselector.cpp:170
+msgid "Current Document Folder"
+msgstr "当前文档文件夹"
 
-#: app/katemain.cpp:91 app/kwritemain.cpp:577
-msgid "Highlighting for Makefiles, Python"
-msgstr "Makefiles、Python 语法加亮"
+#: app/katefileselector.cpp:198
+msgid ""
+"<p>Here you can enter a path for a folder to display."
+"<p>To go to a folder previously entered, press the arrow on the right and "
+"choose one. "
+"<p>The entry has folder completion. Right-click to choose how completion should "
+"behave."
+msgstr ""
+"<p>此处您可以输入要显示的文件夹路径。"
+"<p>要转到先前输入的文件夹，请按右侧的箭头，然后从中选择一个。"
+"<p>此输入框具有文件夹补齐功能。右键点击可选择补齐的方式。"
 
-#: app/katemain.cpp:92 app/kwritemain.cpp:578
-msgid "Highlighting for Python"
-msgstr "Python 语法加亮"
+#: app/katefileselector.cpp:203
+msgid ""
+"<p>Here you can enter a name filter to limit which files are displayed."
+"<p>To clear the filter, toggle off the filter button to the left."
+"<p>To reapply the last filter used, toggle on the filter button."
+msgstr ""
+"<p>此处您可以输入名称过滤器来限制要显示的文件。"
+"<p>要清除过滤器，点击弹起左边的过滤器按钮。"
+"<p>要重新应用刚才使用的过滤器，按下过滤器按钮即可。"
 
-#: app/katemain.cpp:94 app/kwritemain.cpp:580
-msgid "Highlighting for Scheme"
-msgstr "Scheme 语法加亮"
+#: app/katefileselector.cpp:207
+msgid ""
+"<p>This button clears the name filter when toggled off, or reapplies the last "
+"filter used when toggled on."
+msgstr "<p>该按钮在关闭时会清除名称过滤器，按下时重新应用刚才使用的过滤器。"
 
-#: app/katemain.cpp:95 app/kwritemain.cpp:581
-msgid "PHP Keyword/Datatype list"
-msgstr "PHP 关键字/数据类型列表"
+#: app/katefileselector.cpp:321
+msgid "Apply last filter (\"%1\")"
+msgstr "应用上次使用的过滤器(“%1”)"
 
-#: app/katemain.cpp:96 app/kwritemain.cpp:582
-msgid "Very nice help"
-msgstr "很好的帮助"
+#: app/katefileselector.cpp:326
+msgid "Clear filter"
+msgstr "清除过滤器"
 
-#: app/katemain.cpp:97 app/kwritemain.cpp:583
-msgid "All people who have contributed and I have forgotten to mention"
-msgstr "所有做出贡献而我却没能提到的人员"
+#: app/katefileselector.cpp:536
+msgid "Toolbar"
+msgstr "工具栏"
+
+#: app/katefileselector.cpp:538
+msgid "A&vailable actions:"
+msgstr "可用的动作(&V)："
+
+#: app/katefileselector.cpp:539
+msgid "S&elected actions:"
+msgstr "选用的动作(&E)："
+
+#: app/katefileselector.cpp:547
+msgid "Auto Synchronization"
+msgstr "自动同步"
+
+#: app/katefileselector.cpp:548
+msgid "When a docu&ment becomes active"
+msgstr "每当文档变为活跃(&M)"
+
+#: app/katefileselector.cpp:549
+msgid "When the file selector becomes visible"
+msgstr "每当文件选择器出现"
+
+#: app/katefileselector.cpp:556
+msgid "Remember &locations:"
+msgstr "记住位置数(&L)："
+
+#: app/katefileselector.cpp:563
+msgid "Remember &filters:"
+msgstr "记住过滤器数(&F)："
+
+#: app/katefileselector.cpp:570
+msgid "Session"
+msgstr "会话"
+
+#: app/katefileselector.cpp:571
+msgid "Restore loca&tion"
+msgstr "恢复位置(&T)"
 
-#: _translatorinfo.cpp:1 app/katemain.cpp:99 app/kwritemain.cpp:585
+#: app/katefileselector.cpp:572
+msgid "Restore last f&ilter"
+msgstr "恢复最后使用的过滤器(&I)"
+
+#: app/katefileselector.cpp:592
 msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Simplified Chinese Translation Team"
+"<p>Decides how many locations to keep in the history of the location combo box."
+msgstr "<p>决定要在位置组合框的历史中保留多少位置。"
 
-#: _translatorinfo.cpp:3 app/katemain.cpp:99 app/kwritemain.cpp:585
+#: app/katefileselector.cpp:597
 msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "i18n-translation@lists.linux.net.cn"
+"<p>Decides how many filters to keep in the history of the filter combo box."
+msgstr "<p>决定要在过滤器组合框的历史中保留多少过滤器。"
 
-#: app/katedocmanager.cpp:395
+#: app/katefileselector.cpp:602
 msgid ""
-"<p>The document '%1' has been modified, but not saved."
-"<p>Do you want to save your changes or discard them?"
-msgstr "<p>文档“%1”已经被修改，但尚未保存。<p>您是否想要保存更改还是丢弃更改？"
+"<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 synchronization is <em>lazy</em>, meaning it will not take effect until "
+"the file selector is visible."
+"<p>None of these are enabled by default, but you can always sync the location "
+"by pressing the sync button in the toolbar."
+msgstr ""
+"<p>这些选项会允许文件选择器在某些事件发生时自动转到活跃文档的文件夹。"
+"<p>自动同步具有<em>惰性</em>，这意味着它直到文件选择器处于可见状态时才会生效。"
+"<p>这些选项默认都不被启用，但是您可以随时按工具栏上的同步按钮来同步位置。"
 
-#: app/katedocmanager.cpp:397
-msgid "Close Document"
-msgstr "关闭文档"
+#: 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 the TDE session "
+"manager, the location is always restored."
+msgstr ""
+"<p>如果启用此选项(默认)，当您启动 Kate 时，位置会被恢复。"
+"<p><strong>注意</strong>，如果会话由 TDE 会话管理器处理，位置将总是会被恢复。"
 
-#: app/katedocmanager.cpp:483
-msgid "Reopening files from the last session..."
-msgstr "重新打开前次会话中的文件..."
+#: 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 by the TDE session "
+"manager, the filter is always restored."
+"<p><strong>Note</strong> that some of the autosync settings may override the "
+"restored location if on."
+msgstr ""
+"<p>如果启用此选项(默认)，当您启动 Kate 时，当前使用的过滤器会被恢复。"
+"<p><strong>注意</strong>，如果会话由 TDE 会话管理器处理，过滤器将总是会被恢复。"
+"<p><strong>注意</strong>，某些自动同步设置若被启用可能会优先于恢复的位置。"
 
-#: app/katedocmanager.cpp:490
-msgid "Starting Up"
-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
+#: app/kateconfigdialog.cpp:298 app/kateconfigdialog.cpp:347
+msgid "Application"
+msgstr "应用程序"
 
-#: app/katesession.cpp:78 app/katesession.cpp:102 app/katesession.cpp:252
-msgid "Default Session"
-msgstr "默认会话"
+#: app/kateconfigdialog.cpp:97
+msgid "General"
+msgstr "常规"
 
-#: app/katesession.cpp:82
-msgid "Unnamed Session"
-msgstr "未命名会话"
+#: app/kateconfigdialog.cpp:98
+msgid "General Options"
+msgstr "常规选项"
 
-#: app/katesession.cpp:104
-msgid "Session (%1)"
-msgstr "会话(%1)"
+#: app/kateconfigdialog.cpp:105
+msgid "&Appearance"
+msgstr "外观(&A)"
 
-#: app/katesession.cpp:384
-msgid "Save Session?"
-msgstr "保存会话吗？"
+#: app/kateconfigdialog.cpp:110
+msgid "&Show full path in title"
+msgstr "在标题中显示完整路径(&S)"
 
-#: app/katesession.cpp:391
-msgid "Save current session?"
-msgstr "保存当前会话吗？"
+#: app/kateconfigdialog.cpp:112
+msgid ""
+"If this option is checked, the full document path will be shown in the window "
+"caption."
+msgstr "如果该选项被选，在窗口标题处将会显示完整的文档路径。"
 
-#: app/katesession.cpp:392
-msgid "Do not ask again"
-msgstr "不再询问"
+#: app/kateconfigdialog.cpp:117
+msgid "Sort &files alphabetically in the file list"
+msgstr ""
 
-#: app/katesession.cpp:482
-msgid "No session selected to open."
-msgstr "未选择要打开的会话。"
+#: app/kateconfigdialog.cpp:120
+#, fuzzy
+msgid ""
+"If this is checked, the files in the file list will be sorted alphabetically."
+msgstr "如果该选项被选，在窗口标题处将会显示完整的文档路径。"
 
-#: app/katesession.cpp:482
-msgid "No Session Selected"
-msgstr "未选择会话"
+#: app/kateconfigdialog.cpp:124
+msgid "&Behavior"
+msgstr "行为(&B)"
 
-#: app/katesession.cpp:554
-msgid "Specify Name for Current Session"
-msgstr "指定当前会话的名称"
+#: app/kateconfigdialog.cpp:129
+msgid "&Number of recent files:"
+msgstr ""
 
-#: app/katesession.cpp:554 app/katesession.cpp:572 app/katesession.cpp:850
-msgid "Session name:"
-msgstr "会话名称："
+#: app/kateconfigdialog.cpp:134
+msgid ""
+"<qt>Sets the number of recent files remembered by Kate."
+"<p><strong>NOTE: </strong>If you set this lower than the current value, the "
+"list will be truncated and some items forgotten.</qt>"
+msgstr ""
 
-#: app/katesession.cpp:561
-msgid "To save a new session, you must specify a name."
-msgstr "要保存新会话，您必须指定名称。"
+#: app/kateconfigdialog.cpp:143
+msgid "Always use the current instance of kate to open new files"
+msgstr ""
 
-#: app/katesession.cpp:561 app/katesession.cpp:579 app/katesession.cpp:857
-msgid "Missing Session Name"
-msgstr "缺少会话名称"
+#: app/kateconfigdialog.cpp:146
+msgid ""
+"When checked, all files opened from outside of Kate will only use the currently "
+"opened instance of Kate."
+msgstr ""
 
-#: app/katesession.cpp:572
-msgid "Specify New Name for Current Session"
-msgstr "为当前会话指定新名称"
+#: app/kateconfigdialog.cpp:152
+msgid "Sync &terminal emulator with active document"
+msgstr "使终端仿真器与当前文档同步(&T)"
 
-#: app/katesession.cpp:579 app/katesession.cpp:857
-msgid "To save a session, you must specify a name."
-msgstr "要保存会话，您必须指定名称。"
+#: app/kateconfigdialog.cpp:155
+msgid ""
+"If this is checked, the built in Konsole will <code>cd</code> "
+"to the directory of the active document when started and whenever the active "
+"document changes, if the document is a local file."
+msgstr ""
+"如果选中此选项，对于本地文件，内建的 Konsole 将会在启动以及活跃文档改变时使用 <code>cd</code> 命令转到活跃文档所在的目录。"
 
-#: app/katesession.cpp:618
-msgid "Session Chooser"
-msgstr "会话选择器"
+#: app/kateconfigdialog.cpp:162
+msgid "Wa&rn about files modified by foreign processes"
+msgstr "当文件被外部进程修改时给出警告(&R)"
 
-#: app/katesession.cpp:623 app/katesession.cpp:715
-msgid "Open Session"
-msgstr "打开会话"
+#: app/kateconfigdialog.cpp:165
+msgid ""
+"If enabled, when Kate receives focus you will be asked what to do with files "
+"that have been modified on the hard disk. If not enabled, you will be asked "
+"what to do with a file that has been modified on the hard disk only when that "
+"file gains focus inside Kate."
+msgstr ""
+"启用时，Kate 会在获得焦点后询问您如何处理硬盘上已经被修改的文件。如果未启用，直到在硬盘上已被修改的文件在 Kate 中获得焦点的时候，您才会被询问。"
 
-#: app/katesession.cpp:624
-msgid "New Session"
-msgstr "新建会话"
+#: app/kateconfigdialog.cpp:173
+msgid "Meta-Information"
+msgstr "元信息"
 
-#: app/katesession.cpp:642 app/katesession.cpp:732 app/katesession.cpp:796
-msgid "Session Name"
-msgstr "会话名称"
+#: app/kateconfigdialog.cpp:178
+msgid "Keep &meta-information past sessions"
+msgstr "在会话中保留元信息(&M)"
 
-#: app/katesession.cpp:643 app/katesession.cpp:733 app/katesession.cpp:797
-msgid "Open Documents"
-msgstr "打开文档"
+#: app/kateconfigdialog.cpp:181
+msgid ""
+"Check this if you want document configuration like for example bookmarks to be "
+"saved past editor sessions. The configuration will be restored if the document "
+"has not changed when reopened."
+msgstr "如果您想要在编辑器的不同会话中保存像书签这样的文档配置，请选中此项。如果重新打开文档的时候文档没有更改，则会恢复配置文件。"
 
-#: app/katesession.cpp:660
-msgid "&Always use this choice"
-msgstr "总是使用此选择(&A)"
+#: app/kateconfigdialog.cpp:189
+msgid "&Delete unused meta-information after:"
+msgstr "删除无用的元信息，等(&D)："
 
-#: app/katesession.cpp:720
-msgid "&Open"
-msgstr "打开(&O)"
+#: app/kateconfigdialog.cpp:191
+msgid "(never)"
+msgstr "(从不)"
 
-#: app/katesession.cpp:781
-msgid "Manage Sessions"
-msgstr "管理会话"
+#: app/kateconfigdialog.cpp:192
+msgid " day(s)"
+msgstr " 天"
 
-#: app/katesession.cpp:810
-msgid "&Rename..."
-msgstr "重命名(&R)..."
+#: app/kateconfigdialog.cpp:204
+msgid "Sessions"
+msgstr "会话"
 
-#: app/katesession.cpp:850
-msgid "Specify New Name for Session"
-msgstr "指定会话的新名称"
+#: app/kateconfigdialog.cpp:205
+msgid "Session Management"
+msgstr "会话管理"
+
+#: app/kateconfigdialog.cpp:211
+msgid "Elements of Sessions"
+msgstr "会话元素"
 
-#: app/katefilelist.cpp:139
+#: app/kateconfigdialog.cpp:216
+msgid "Include &window configuration"
+msgstr "包含窗口配置(&W)"
+
+#: app/kateconfigdialog.cpp:220
+msgid ""
+"Check this if you want all your views and frames restored each time you open "
+"Kate"
+msgstr "如果您希望在每次打开 Kate 时都恢复所有视图和框架，启用此选项。"
+
+#: app/kateconfigdialog.cpp:225
+msgid "Behavior on Application Startup"
+msgstr "应用启动时的行为"
+
+#: app/kateconfigdialog.cpp:229
+msgid "&Start new session"
+msgstr "启动新会话(&S)"
+
+#: app/kateconfigdialog.cpp:230
+msgid "&Load last-used session"
+msgstr "装入上次使用的会话(&L)"
+
+#: app/kateconfigdialog.cpp:231
+msgid "&Manually choose a session"
+msgstr "手动选择会话(&M)"
+
+#: app/kateconfigdialog.cpp:246
+msgid "Behavior on Application Exit or Session Switch"
+msgstr "应用程序退出或会话切换时的行为"
+
+#: app/kateconfigdialog.cpp:250
+msgid "&Do not save session"
+msgstr "不保存会话(&D)"
+
+#: app/kateconfigdialog.cpp:251
+msgid "&Save session"
+msgstr "保存会话(&S)"
+
+#: app/kateconfigdialog.cpp:252
+msgid "&Ask user"
+msgstr "询问用户(&A)"
+
+#: app/kateconfigdialog.cpp:273
+msgid "File Selector"
+msgstr "文件选择器"
+
+#: app/kateconfigdialog.cpp:275
+msgid "File Selector Settings"
+msgstr "文件选择器设置"
+
+#: app/kateconfigdialog.cpp:282
+msgid "Document List"
+msgstr "文档列表"
+
+#: app/kateconfigdialog.cpp:283
+msgid "Document List Settings"
+msgstr "文档列表设置"
+
+#: app/kateconfigdialog.cpp:290 app/kateconfigdialog.cpp:347
+msgid "Plugins"
+msgstr "插件"
+
+#: app/kateconfigdialog.cpp:291
+msgid "Plugin Manager"
+msgstr "插件管理器"
+
+#: app/kateconfigdialog.cpp:306 app/kateconfigdialog.cpp:312
+msgid "Editor"
+msgstr "编辑器"
+
+#: app/katefilelist.cpp:141
 msgid "Sort &By"
 msgstr "排序方式(&B)"
 
-#: app/katefilelist.cpp:142 app/katefilelist.cpp:579
+#: app/katefilelist.cpp:143
+msgid "Move File Up"
+msgstr ""
+
+#: app/katefilelist.cpp:145
+msgid "Move File Down"
+msgstr ""
+
+#: app/katefilelist.cpp:150 app/katefilelist.cpp:688
 msgid "Opening Order"
 msgstr "打开顺序"
 
-#: app/katefilelist.cpp:142 app/katefilelist.cpp:579
+#: app/katefilelist.cpp:150 app/katefilelist.cpp:688
 msgid "Document Name"
 msgstr "文档名称"
 
-#: app/katefilelist.cpp:373
+#: app/katefilelist.cpp:150
+msgid "Manual Placement"
+msgstr ""
+
+#: app/katefilelist.cpp:432
 msgid ""
 "<b>This file was changed (modified) on disk by another program.</b><br />"
 msgstr "<b>磁盘上的这个文件被另一个程序改变(修改)。</b><br />"
 
-#: app/katefilelist.cpp:375
+#: app/katefilelist.cpp:434
 msgid ""
 "<b>This file was changed (created) on disk by another program.</b><br />"
 msgstr "<b>磁盘上的这个文件被另一个程序改变(创建)。</b><br />"
 
-#: app/katefilelist.cpp:377
+#: app/katefilelist.cpp:436
 msgid ""
 "<b>This file was changed (deleted) on disk by another program.</b><br />"
 msgstr "<b>磁盘上的这个文件被另一个程序改变(删除)。</b><br />"
 
-#: app/katefilelist.cpp:553
+#: app/katefilelist.cpp:662
 msgid "Background Shading"
 msgstr "背景阴影"
 
-#: app/katefilelist.cpp:559
+#: app/katefilelist.cpp:668
 msgid "&Enable background shading"
 msgstr "启用背景阴影(&E)"
 
-#: app/katefilelist.cpp:563
+#: app/katefilelist.cpp:672
 msgid "&Viewed documents' shade:"
 msgstr "查看过的文档的阴影(&V)："
 
-#: app/katefilelist.cpp:568
+#: app/katefilelist.cpp:677
 msgid "&Modified documents' shade:"
 msgstr "修改过的文档的阴影(&M)："
 
-#: app/katefilelist.cpp:575
+#: app/katefilelist.cpp:684
 msgid "&Sort by:"
 msgstr "排序方式(&B)："
 
-#: app/katefilelist.cpp:585
+#: app/katefilelist.cpp:694
 msgid ""
 "When background shading is enabled, documents that have been viewed or edited "
 "within the current session will have a shaded background. The most recent "
 "documents have the strongest shade."
 msgstr "启用背景阴影的时候，当前会话被查看或编辑过的文档都会有阴影。最近的文档的阴影最强烈。"
 
-#: app/katefilelist.cpp:589
+#: app/katefilelist.cpp:698
 msgid "Set the color for shading viewed documents."
 msgstr "设置对查看过的文档所设置的阴影颜色。"
 
-#: app/katefilelist.cpp:591
+#: app/katefilelist.cpp:700
 msgid ""
 "Set the color for modified documents. This color is blended into the color for "
 "viewed files. The most recently edited documents get most of this color."
 msgstr "设定修改过的文档的颜色。此颜色将会叠加到查看过的文件的颜色上。越近编辑过的文档，叠加后的颜色中此颜色的比例越大。"
 
-#: app/katefilelist.cpp:596
+#: app/katefilelist.cpp:705
 msgid "Set the sorting method for the documents."
 msgstr "设定文档的排序方式。"
 
@@ -1185,8 +1276,9 @@ msgid "Create another view containing the current document"
 msgstr "创建另一个包含当前文档的视图"
 
 #: app/kwritemain.cpp:157
-msgid "Choose Editor..."
-msgstr "选择编辑器..."
+#, fuzzy
+msgid "Choose Editor Component..."
+msgstr "选择编辑器组件"
 
 #: app/kwritemain.cpp:159
 msgid "Override the system wide setting for the default editing component"
@@ -1222,23 +1314,152 @@ msgid ""
 "the current user."
 msgstr "给定的文件不能读取，请检查文件是否存在或当前用户是否有权限读取。"
 
-#: app/kwritemain.cpp:549
+#: app/kwritemain.cpp:553
 msgid "KWrite"
 msgstr "KWrite"
 
-#: app/kwritemain.cpp:551
+#: app/kwritemain.cpp:555
 msgid "KWrite - Text Editor"
 msgstr "KWrite - 文本编辑器"
 
-#: app/kateapp.cpp:210 app/kateapp.cpp:322 app/kwritemain.cpp:682
-msgid ""
-"The file '%1' could not be opened: it is not a normal file, it is a folder."
-msgstr "无法打开文件“%1”；它不是一个普通文件，而是一个文件夹。"
-
-#: app/kwritemain.cpp:696
+#: app/kwritemain.cpp:700
 msgid "Choose Editor Component"
 msgstr "选择编辑器组件"
 
+#: app/kateconsole.cpp:129
+msgid ""
+"Do you really want to pipe the text to the console? This will execute any "
+"contained commands with your user rights."
+msgstr "您真的想要将文本管道到控制台吗？这将使用您的用户权限执行其中包含的任何命令。"
+
+#: app/kateconsole.cpp:130
+msgid "Pipe to Console?"
+msgstr "管道到控制台吗？"
+
+#: app/kateconsole.cpp:131
+msgid "Pipe to Console"
+msgstr "管道到控制台"
+
+#: app/katesession.cpp:78 app/katesession.cpp:102 app/katesession.cpp:252
+msgid "Default Session"
+msgstr "默认会话"
+
+#: app/katesession.cpp:82
+msgid "Unnamed Session"
+msgstr "未命名会话"
+
+#: app/katesession.cpp:104
+msgid "Session (%1)"
+msgstr "会话(%1)"
+
+#: app/katesession.cpp:384
+msgid "Save Session?"
+msgstr "保存会话吗？"
+
+#: app/katesession.cpp:391
+msgid "Save current session?"
+msgstr "保存当前会话吗？"
+
+#: app/katesession.cpp:392
+msgid "Do not ask again"
+msgstr "不再询问"
+
+#: app/katesession.cpp:482
+msgid "No session selected to open."
+msgstr "未选择要打开的会话。"
+
+#: app/katesession.cpp:482
+msgid "No Session Selected"
+msgstr "未选择会话"
+
+#: app/katesession.cpp:554
+msgid "Specify Name for Current Session"
+msgstr "指定当前会话的名称"
+
+#: app/katesession.cpp:554 app/katesession.cpp:572 app/katesession.cpp:850
+msgid "Session name:"
+msgstr "会话名称："
+
+#: app/katesession.cpp:561
+msgid "To save a new session, you must specify a name."
+msgstr "要保存新会话，您必须指定名称。"
+
+#: app/katesession.cpp:561 app/katesession.cpp:579 app/katesession.cpp:857
+msgid "Missing Session Name"
+msgstr "缺少会话名称"
+
+#: app/katesession.cpp:572
+msgid "Specify New Name for Current Session"
+msgstr "为当前会话指定新名称"
+
+#: app/katesession.cpp:579 app/katesession.cpp:857
+msgid "To save a session, you must specify a name."
+msgstr "要保存会话，您必须指定名称。"
+
+#: app/katesession.cpp:618
+msgid "Session Chooser"
+msgstr "会话选择器"
+
+#: app/katesession.cpp:623 app/katesession.cpp:715
+msgid "Open Session"
+msgstr "打开会话"
+
+#: app/katesession.cpp:624
+msgid "New Session"
+msgstr "新建会话"
+
+#: app/katesession.cpp:642 app/katesession.cpp:732 app/katesession.cpp:796
+msgid "Session Name"
+msgstr "会话名称"
+
+#: app/katesession.cpp:643 app/katesession.cpp:733 app/katesession.cpp:797
+msgid "Open Documents"
+msgstr "打开文档"
+
+#: app/katesession.cpp:660
+msgid "&Always use this choice"
+msgstr "总是使用此选择(&A)"
+
+#: app/katesession.cpp:720
+msgid "&Open"
+msgstr "打开(&O)"
+
+#: app/katesession.cpp:781
+msgid "Manage Sessions"
+msgstr "管理会话"
+
+#: app/katesession.cpp:810
+msgid "&Rename..."
+msgstr "重命名(&R)..."
+
+#: app/katesession.cpp:850
+msgid "Specify New Name for Session"
+msgstr "指定会话的新名称"
+
+#: app/kateviewspace.cpp:321 app/kateviewspace.cpp:360
+msgid " INS "
+msgstr " 插入 "
+
+#: app/kateviewspace.cpp:326 app/kateviewspace.cpp:364
+msgid " NORM "
+msgstr " 普通 "
+
+#: app/kateviewspace.cpp:352
+msgid " Line: %1 Col: %2 "
+msgstr " 行：%1 列：%2 "
+
+#: app/kateviewspace.cpp:356
+msgid " R/O "
+msgstr " 只读 "
+
+#: app/kateviewspace.cpp:358
+msgid " OVR "
+msgstr " 改写 "
+
+#: app/kateviewspace.cpp:364
+msgid " BLK "
+msgstr " 块 "
+
 #: app/kateviewmanager.cpp:97
 msgid "New Tab"
 msgstr "新建标签"
@@ -1303,81 +1524,6 @@ msgstr "打开新标签"
 msgid "Close the current tab"
 msgstr "关闭当前标签"
 
-#: app/katemdi.cpp:140
-msgid "Tool &Views"
-msgstr "工具视图(&V)"
-
-#: app/katemdi.cpp:141
-msgid "Show Side&bars"
-msgstr "显示侧边栏(&B)"
-
-#: app/katemdi.cpp:143
-msgid "Hide Side&bars"
-msgstr "隐藏侧边栏(&B)"
-
-#: app/katemdi.cpp:176
-#, c-format
-msgid "Show %1"
-msgstr "显示%1"
-
-#: app/katemdi.cpp:179
-#, c-format
-msgid "Hide %1"
-msgstr "隐藏%1"
-
-#: app/katemdi.cpp:464
-msgid "Behavior"
-msgstr "行为"
-
-#: app/katemdi.cpp:466
-msgid "Make Non-Persistent"
-msgstr "变成非永久"
-
-#: app/katemdi.cpp:466
-msgid "Make Persistent"
-msgstr "变成永久"
-
-#: app/katemdi.cpp:468
-msgid "Move To"
-msgstr "移至"
-
-#: app/katemdi.cpp:471
-msgid "Left Sidebar"
-msgstr "左侧边栏"
-
-#: app/katemdi.cpp:474
-msgid "Right Sidebar"
-msgstr "右侧边栏"
-
-#: app/katemdi.cpp:477
-msgid "Top Sidebar"
-msgstr "上侧边栏"
-
-#: app/katemdi.cpp:480
-msgid "Bottom Sidebar"
-msgstr "下侧边栏"
-
-#: app/katemdi.cpp:778
-msgid ""
-"<qt>You are about to hide the sidebars. With hidden sidebars it is not possible "
-"to directly access the tool views with the mouse anymore, so if you need to "
-"access the sidebars again invoke <b>Window &gt; Tool Views &gt; Show "
-"Sidebars</b> in the menu. It is still possible to show/hide the tool views with "
-"the assigned shortcuts.</qt>"
-msgstr ""
-"<qt>您即将隐藏侧边栏。侧边栏一旦隐藏，将无法通过鼠标直接访问工具视图。如果您需要再次访问侧边栏的话，请从菜单中调用<b>"
-"窗口 &gt; 工具视图 &gt; 显示侧边栏</b>。您还可以通过指派的快捷键显示/隐藏工具视图。</qt>"
-
-#: app/kateconfigplugindialogpage.cpp:82
-msgid "Comment"
-msgstr "注释"
-
-#: app/kateconfigplugindialogpage.cpp:83
-msgid ""
-"Here you can see all available Kate plugins. Those with a check mark are "
-"loaded, and will be loaded again the next time Kate is started."
-msgstr "此处您可以看到所有可用的 Kate 插件。那些带有选择标记的插件已被载入，并且在 Kate 下次启动时还会被载入。"
-
 #: app/katesavemodifieddialog.cpp:78
 msgid "Save As (%1)"
 msgstr "另存为(%1)"
@@ -1422,135 +1568,209 @@ msgid ""
 "to proceed."
 msgstr "您请求保存的数据无法写入。请选择您想要如何继续。"
 
-#: app/katefileselector.cpp:170
-msgid "Current Document Folder"
-msgstr "当前文档文件夹"
+#: app/kateexternaltools.cpp:276
+msgid "Failed to expand the command '%1'."
+msgstr "展开命令“%1”失败。"
 
-#: app/katefileselector.cpp:198
+#: app/kateexternaltools.cpp:277
+msgid "Kate External Tools"
+msgstr "Kate 外部工具"
+
+#: app/kateexternaltools.cpp:427
+msgid "Edit External Tool"
+msgstr "编辑外部工具"
+
+#: app/kateexternaltools.cpp:441
+msgid "&Label:"
+msgstr "标签(&L)："
+
+#: app/kateexternaltools.cpp:446
+msgid "The name will be displayed in the 'Tools->External' menu"
+msgstr "将显示于“工具->外部”菜单中的名称"
+
+#: app/kateexternaltools.cpp:456
+msgid "S&cript:"
+msgstr "脚本(&C)："
+
+#: app/kateexternaltools.cpp:461
 msgid ""
-"<p>Here you can enter a path for a folder to display."
-"<p>To go to a folder previously entered, press the arrow on the right and "
-"choose one. "
-"<p>The entry has folder completion. Right-click to choose how completion should "
-"behave."
+"<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</code> - the URL of the current document."
+"<li><code>%URLs</code> - a list of the URLs of all open documents."
+"<li><code>%directory</code> - the URL of the directory containing the current "
+"document."
+"<li><code>%filename</code> - the filename of the current document."
+"<li><code>%line</code> - the current line of the text cursor in the current "
+"view."
+"<li><code>%column</code> - the column of the text cursor in the current view."
+"<li><code>%selection</code> - the selected text in the current view."
+"<li><code>%text</code> - the text of the current document.</ul>"
 msgstr ""
-"<p>此处您可以输入要显示的文件夹路径。"
-"<p>要转到先前输入的文件夹，请按右侧的箭头，然后从中选择一个。"
-"<p>此输入框具有文件夹补齐功能。右键点击可选择补齐的方式。"
+"<p>调用工具要执行的脚本。脚本会传递给 /bin/sh 执行。下列宏将会被展开：</p>"
+"<ul>"
+"<li><code>%URL</code> - 当前文档的 URL。"
+"<li><code>%URLs</code> - 打开的全部文档的 URL。"
+"<li><code>%directory</code> - 包含当前文档的目录的 URL。"
+"<li><code>%filename</code> - 当前文档的文件名。"
+"<li><code>%line</code> - 当前视图中光标所在文本行号。"
+"<li><code>%column</code> - 当前视图中光标所在文本列数。"
+"<li><code>%selection</code> - 当前视图中所选的文本。"
+"<li><code>%text</code> - 当前文档的文本。</ul>"
 
-#: app/katefileselector.cpp:203
+#: app/kateexternaltools.cpp:479
+msgid "&Executable:"
+msgstr "可执行(&E)："
+
+#: app/kateexternaltools.cpp:484
 msgid ""
-"<p>Here you can enter a name filter to limit which files are displayed."
-"<p>To clear the filter, toggle off the filter button to the left."
-"<p>To reapply the last filter used, toggle on the filter button."
-msgstr ""
-"<p>此处您可以输入名称过滤器来限制要显示的文件。"
-"<p>要清除过滤器，点击弹起左边的过滤器按钮。"
-"<p>要重新应用刚才使用的过滤器，按下过滤器按钮即可。"
+"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."
+msgstr "此命令使用的可执行文件。此选项将用来检查是否要显示此工具；如果未设置的话，将会使用 <em>command</em> 的第一个单词。"
 
-#: app/katefileselector.cpp:207
+#: app/kateexternaltools.cpp:490
+msgid "&Mime types:"
+msgstr "MIME 类型(&M)："
+
+#: app/kateexternaltools.cpp:495
 msgid ""
-"<p>This button clears the name filter when toggled off, or reapplies the last "
-"filter used when toggled on."
-msgstr "<p>该按钮在关闭时会清除名称过滤器，按下时重新应用刚才使用的过滤器。"
+"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 from "
+"known mimetypes, press the button on the right."
+msgstr "此工具适用于的 MIME 类型列表，用分号分隔；如果为空的话，此工具将总是有效。要从已知的 MIME 类型中选择，请按右侧的按钮。"
 
-#: app/katefileselector.cpp:321
-msgid "Apply last filter (\"%1\")"
-msgstr "应用上次使用的过滤器(“%1”)"
+#: app/kateexternaltools.cpp:504
+msgid "Click for a dialog that can help you creating a list of mimetypes."
+msgstr "单击可出现一个帮助您创建 MIME 类型列表的对话框。"
 
-#: app/katefileselector.cpp:326
-msgid "Clear filter"
-msgstr "清除过滤器"
+#: app/kateexternaltools.cpp:508
+msgid "&Save:"
+msgstr "保存(&S)："
 
-#: app/katefileselector.cpp:536
-msgid "Toolbar"
-msgstr "工具栏"
+#: app/kateexternaltools.cpp:512
+msgid "None"
+msgstr "无"
 
-#: app/katefileselector.cpp:538
-msgid "A&vailable actions:"
-msgstr "可用的动作(&V)："
+#: app/kateexternaltools.cpp:512
+msgid "Current Document"
+msgstr "当前文档"
 
-#: app/katefileselector.cpp:539
-msgid "S&elected actions:"
-msgstr "选用的动作(&E)："
+#: app/kateexternaltools.cpp:512
+msgid "All Documents"
+msgstr "全部文档"
 
-#: app/katefileselector.cpp:547
-msgid "Auto Synchronization"
-msgstr "自动同步"
+#: 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 application like, "
+"for example, an FTP client."
+msgstr "您可以选择在运行命令前先保存当前或[已修改]的全部文档。如果您想要将 URL 传递给像 FTP 客户端这样的应用程序的话，此功能将非常有用。"
 
-#: app/katefileselector.cpp:548
-msgid "When a docu&ment becomes active"
-msgstr "每当文档变为活跃(&M)"
+#: app/kateexternaltools.cpp:523
+msgid "&Command line name:"
+msgstr "命令行名称(&C)："
 
-#: app/katefileselector.cpp:549
-msgid "When the file selector becomes visible"
-msgstr "每当文件选择器出现"
+#: 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 "
+"tabs in the name."
+msgstr "如果您在此指定名称，您就可以从查看命令行中使用该名称调用该命令。请不要在名称中使用空格或跳格键。"
 
-#: app/katefileselector.cpp:556
-msgid "Remember &locations:"
-msgstr "记住位置数(&L)："
+#: app/kateexternaltools.cpp:539
+msgid "You must specify at least a name and a command"
+msgstr "您必须至少指定一个名称和命令"
 
-#: app/katefileselector.cpp:563
-msgid "Remember &filters:"
-msgstr "记住过滤器数(&F)："
+#: app/kateexternaltools.cpp:548
+msgid "Select the MimeTypes for which to enable this tool."
+msgstr "选择此工具适用的 MIME 类型。"
 
-#: app/katefileselector.cpp:570
-msgid "Session"
-msgstr "会话"
+#: app/kateexternaltools.cpp:550
+msgid "Select Mime Types"
+msgstr "选择 MIME 类型"
 
-#: app/katefileselector.cpp:571
-msgid "Restore loca&tion"
-msgstr "恢复位置(&T)"
+#: app/kateexternaltools.cpp:568
+msgid "&New..."
+msgstr "新建(&N)..."
 
-#: app/katefileselector.cpp:572
-msgid "Restore last f&ilter"
-msgstr "恢复最后使用的过滤器(&I)"
+#: app/kateexternaltools.cpp:576
+msgid "&Edit..."
+msgstr "编辑(&E)..."
 
-#: app/katefileselector.cpp:592
-msgid ""
-"<p>Decides how many locations to keep in the history of the location combo box."
-msgstr "<p>决定要在位置组合框的历史中保留多少位置。"
+#: app/kateexternaltools.cpp:580
+msgid "Insert &Separator"
+msgstr "插入分隔符(&S)"
 
-#: app/katefileselector.cpp:597
+#: app/kateexternaltools.cpp:602
 msgid ""
-"<p>Decides how many filters to keep in the history of the filter combo box."
-msgstr "<p>决定要在过滤器组合框的历史中保留多少过滤器。"
+"This list shows all the configured tools, represented by their menu text."
+msgstr "此列表显示了配置的全部工具，各选项用菜单文字代表。"
 
-#: 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 synchronization is <em>lazy</em>, meaning it will not take effect until "
-"the file selector is visible."
-"<p>None of these are enabled by default, but you can always sync the location "
-"by pressing the sync button in the toolbar."
-msgstr ""
-"<p>这些选项会允许文件选择器在某些事件发生时自动转到活跃文档的文件夹。"
-"<p>自动同步具有<em>惰性</em>，这意味着它直到文件选择器处于可见状态时才会生效。"
-"<p>这些选项默认都不被启用，但是您可以随时按工具栏上的同步按钮来同步位置。"
+#: app/katemdi.cpp:140
+msgid "Tool &Views"
+msgstr "工具视图(&V)"
 
-#: 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 the TDE session "
-"manager, the location is always restored."
-msgstr ""
-"<p>如果启用此选项(默认)，当您启动 Kate 时，位置会被恢复。"
-"<p><strong>注意</strong>，如果会话由 TDE 会话管理器处理，位置将总是会被恢复。"
+#: app/katemdi.cpp:141
+msgid "Show Side&bars"
+msgstr "显示侧边栏(&B)"
 
-#: app/katefileselector.cpp:615
+#: app/katemdi.cpp:143
+msgid "Hide Side&bars"
+msgstr "隐藏侧边栏(&B)"
+
+#: app/katemdi.cpp:176
+#, c-format
+msgid "Show %1"
+msgstr "显示%1"
+
+#: app/katemdi.cpp:179
+#, c-format
+msgid "Hide %1"
+msgstr "隐藏%1"
+
+#: app/katemdi.cpp:465
+msgid "Behavior"
+msgstr "行为"
+
+#: app/katemdi.cpp:467
+msgid "Make Non-Persistent"
+msgstr "变成非永久"
+
+#: app/katemdi.cpp:467
+msgid "Make Persistent"
+msgstr "变成永久"
+
+#: app/katemdi.cpp:469
+msgid "Move To"
+msgstr "移至"
+
+#: app/katemdi.cpp:472
+msgid "Left Sidebar"
+msgstr "左侧边栏"
+
+#: app/katemdi.cpp:475
+msgid "Right Sidebar"
+msgstr "右侧边栏"
+
+#: app/katemdi.cpp:478
+msgid "Top Sidebar"
+msgstr "上侧边栏"
+
+#: app/katemdi.cpp:481
+msgid "Bottom Sidebar"
+msgstr "下侧边栏"
+
+#: app/katemdi.cpp:779
 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 by the TDE session "
-"manager, the filter is always restored."
-"<p><strong>Note</strong> that some of the autosync settings may override the "
-"restored location if on."
+"<qt>You are about to hide the sidebars. With hidden sidebars it is not possible "
+"to directly access the tool views with the mouse anymore, so if you need to "
+"access the sidebars again invoke <b>Window &gt; Tool Views &gt; Show "
+"Sidebars</b> in the menu. It is still possible to show/hide the tool views with "
+"the assigned shortcuts.</qt>"
 msgstr ""
-"<p>如果启用此选项(默认)，当您启动 Kate 时，当前使用的过滤器会被恢复。"
-"<p><strong>注意</strong>，如果会话由 TDE 会话管理器处理，过滤器将总是会被恢复。"
-"<p><strong>注意</strong>，某些自动同步设置若被启用可能会优先于恢复的位置。"
+"<qt>您即将隐藏侧边栏。侧边栏一旦隐藏，将无法通过鼠标直接访问工具视图。如果您需要再次访问侧边栏的话，请从菜单中调用<b>"
+"窗口 &gt; 工具视图 &gt; 显示侧边栏</b>。您还可以通过指派的快捷键显示/隐藏工具视图。</qt>"
 
 #. i18n: file ./data/kateui.rc line 43
 #: rc.cpp:9
@@ -1570,173 +1790,5 @@ msgstr "会话(&I)"
 msgid "&Window"
 msgstr "窗口(&W)"
 
-#: tips.cpp:3
-msgid ""
-"<p>Kate comes with a nice set of plugins, providing simple\n"
-"and advanced features of all sorts.</p>\n"
-"<p>You can enable/disable plugins to suit your needs in the configuration "
-"dialog,\n"
-"choose <strong>Settings -&gt;configure</strong> to launch that.</p>\n"
-msgstr ""
-"<p>Kate 附带了一组不错的插件，提供了各种简单的和高级的功能。</p>"
-"<p>您可以在配置对话框中启用/禁用插件来满足您的需要，选择 <strong>设置 -&gt;configure</strong> 来启动配置对话框。</p>"
-"\n"
-
-#: tips.cpp:11
-msgid ""
-"<p>You can swap the characters on each side of the cursor just by pressing\n"
-"<strong>Ctrl+T</strong></p>\n"
-msgstr ""
-"<p>您可以交换光标两侧的字符，方法是按 <strong>Ctrl+T</strong></p>\n"
-
-#: tips.cpp:17
-msgid ""
-"<p>You can export the current document as a HTML file, including\n"
-"syntax highlighting.</p>\n"
-"<p>Just choose <strong>File -&gt; Export -&gt; HTML...</strong></p>\n"
-msgstr ""
-"<p>您可以把当前文档导出为 HTML 文件，包括语法加亮显示。</p>"
-"<p>只需选择 <strong>文件 -&gt; 导出 -&gt; HTML...</strong>即可</p>\n"
-
-#: tips.cpp:24
-msgid ""
-"<p>You can split the Kate editor as many times as you like and\n"
-"in either direction. Each frame has its own status bar and\n"
-"can display any open document.</p>\n"
-"<p>Just choose "
-"<br><strong>View -&gt; Split [ Horizontal | Vertical ]</strong></p>\n"
-msgstr ""
-"<p>您可以按任意方向多次分割 Kate 编辑器。每个框架中都有它自己的状态栏，并能够显示任何打开的文件。</p>"
-"<p>只需选择"
-"<br><strong>查看 -&gt; [ 水平 | 垂直 ]分割</strong> 即可。</p>\n"
-
-#: tips.cpp:32
-msgid ""
-"<p>You can drag the Tool views (<em>File List</em> and <em>File Selector</em>)\n"
-"to any side that you want them in Kate, or stack them, or even tear them off "
-"the\n"
-"main window.</p>\n"
-msgstr ""
-"<p>您可以把工具视图(<em>文件列表</em>和<em>文件选择器</em>)拖放到 Kate 的任何一边上，或叠放它们，甚至从主窗口中分裂出来。</p>"
-"\n"
-
-#: tips.cpp:39
-msgid ""
-"<p>Kate has a built-in terminal emulator, just click on <strong>"
-"\"Terminal\"</strong> at\n"
-"the bottom to show or hide it as you desire.</p>\n"
-msgstr ""
-"<p>Kate 有一个内建的终端仿真器，只需点击下面的<strong>“终端”</strong>来随意显示或隐藏它。</p>\n"
-
-#: tips.cpp:45
-msgid ""
-"<p>Kate can highlight the current line with a\n"
-"<table bgcolor=\"yellow\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\" "
-"width=\"100%\">"
-"<tr>"
-"<td>different\n"
-"background color.<strong>|</strong></td></tr></table></p>\n"
-"<p>You can set the color in the <em>Colors</em> page of the configuration\n"
-"dialog.</p>\n"
-msgstr ""
-"<p>Kate 可以使用<table bgcolor=\"yellow\" border=\"0\" cellspacing=\"0\" "
-"cellpadding=\"0\" width=\"100%\">"
-"<tr>"
-"<td>不同的背景颜色<strong>|</strong></td></tr></table>来突出显示当前行。</p>"
-"<p>您可以在配置对话框中的<em>颜色</em>页中设置颜色。</p>\n"
-
-#: tips.cpp:54
-msgid ""
-"<p>You can open the currently edited file in any other application from within\n"
-"Kate.</p>\n"
-"<p>Choose <strong>File -&gt; Open With</strong> for the list of programs\n"
-"configured\n"
-"for the document type. There is also an option <strong>Other...</strong> to\n"
-"choose any application on your system.</p>\n"
-msgstr ""
-"<p>您可以在 Kate 内用任何其它程序打开当前正在被编辑的文件。</p>"
-"<p>选择<strong>文件 -&gt; 打开方式</strong> 来选择配置给该文档类型的程序。其中还有一个选项<strong>"
-"其它...</strong>，您可以用它来选择系统上的任何程序。</p>\n"
-
-#: tips.cpp:64
-msgid ""
-"<p>You can configure the editor to always display the line numbers and/or\n"
-"bookmark panes when started from the <strong>View Defaults</strong> "
-"page of the\n"
-"configuration dialog.</p>\n"
-msgstr ""
-"<p>您可以在配置对话框中的<strong>视图默认值</strong>页中配置，让编辑器启动时总是显示行号和/或书签栏。</p>\n"
-
-#: tips.cpp:71
-msgid ""
-"<p>You can download new or updated <em>Syntax highlight definitions</em> from\n"
-"the <strong>Highlighting</strong> page in the configuration dialog.</p>\n"
-"<p>Just click the <em>Download...</em> button on the <em>Highlight Modes</em>\n"
-"tab (You have to be online, of course...).</p>\n"
-msgstr ""
-"<p>您可以在配置对话框中的<strong>加亮显示</strong>页上下载新的或更新的<em>语法加亮定义</em></p>"
-"<p>只需点击<em>加亮显示模式</em>标签上的<em>下载...</em>按钮即可(当然，您必须得在线才行...)。</p>\n"
-
-#: tips.cpp:79
-msgid ""
-"<p>You can cycle through all open documents by pressing <strong>"
-"Alt+Left</strong>\n"
-"or <strong>Alt+Right</strong>. The next/previous document will immediately be "
-"displayed\n"
-"in the active frame.</p>\n"
-msgstr ""
-"<p>您可以通过按 <strong>Alt+Left</strong> 或 <strong>Alt+Right</strong> "
-"来循环浏览所有打开的文档。下一/前一文档将会被立即显示在活跃的框架中。</p>\n"
-
-#: tips.cpp:86
-msgid ""
-"<p>You can do cool sed-like regular expression replacements using <em>"
-"Command Line</em>.</p>\n"
-"<p>For example, press <strong>F7</strong> and enter <code>"
-"s /oldtext/newtext/g</code>\n"
-"to replace &quot;oldtext&quot; with &quot;newtext&quot; throughout the current\n"
-"line.</p>\n"
-msgstr ""
-"<p>您可以使用 <em>编辑命令</em> 来执行类似 sed 的正则表达式替换。</p>"
-"<p>例如，按 <strong>Ctrl+M</strong> 并输入<code>s/oldtext/newtext/g</code> "
-"会把当前行中的所有“oldtext”替换为“newtext”</p>\n"
-
-#: tips.cpp:94
-msgid ""
-"<p>You can repeat your last search by just pressing <strong>F3</strong>, or\n"
-"<strong>Shift+F3</strong> if you want to search backwards.</p>\n"
-msgstr ""
-"<p>您只需按 <strong>F3</strong> 来重复刚才的搜索，或者按 <strong>Shift+F3</strong> 来反向搜索。</p>\n"
-
-#: tips.cpp:100
-msgid ""
-"<p>You can filter the files displayed in the <em>File Selector</em> tool view.\n"
-"</p>\n"
-"<p>Simply enter your filter in the filter entry at the bottom, for example:\n"
-"<code>*.html *.php</code> if you only want to see HTML and PHP files in the\n"
-"current folder.</p>\n"
-"<p>The File Selector will even remember your filters for you.</strong></p>\n"
-msgstr ""
-"<p>您可以过滤显示在 <em>文件选择器</em> 工具视图中的文件。</p>"
-"<p>只需在底部的过滤器框中输入您的过滤器即可。例如：输入 <code>*.html *.php</code>"
-"，如果您只想看到当前文件夹中的 HTML 和 PHP 文件。</p>"
-"<p>文件选择器甚至会记住您使用过的过滤器。</strong></p>\n"
-
-#: tips.cpp:110
-msgid ""
-"<p>You can have two views - or even more - of the same document in Kate. "
-"Editing\n"
-"in either will be reflected in both.</p>\n"
-"<p>So if you find yourself scrolling up and down to look at text at the other\n"
-"end of a document, just press <strong>Ctrl+Shift+T</strong> to split\n"
-"horizontally.</p>\n"
-msgstr ""
-"<p>在 Kate 中，同一文档您可以有两个视图 - 甚至更多。在任何一个视图中编辑该文档都会反映在所有视图中。</p>"
-"<p>因此，如果您需要前后寻找文档另一端的文本时，只需按 <strong>Ctrl+Shift+T</strong> 来水平分割它即可。</p>\n"
-
-#: tips.cpp:119
-msgid ""
-"<p>Press <strong>F8</strong> or <strong>Shift+F8</strong> to switch to the\n"
-"next/previous frame.</p>\n"
-msgstr ""
-"<p>按 <strong>F8</strong> 或 <strong>Shift+F8</strong> 来切换到下一/前一框架。</p>\n"
+#~ msgid "Choose Editor..."
+#~ msgstr "选择编辑器..."
diff --git a/tde-i18n-zh_CN/messages/tdebase/kay.po b/tde-i18n-zh_CN/messages/tdebase/kay.po
index be0c7ec80ae..8c1d4110a9d 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kay.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kay.po
@@ -4,15 +4,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kay 3.5\n"
-"POT-Creation-Date: 2007-03-30 02:14+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-08-01 06:56+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: medianotifier.cpp:175
+#: medianotifier.cpp:209
 msgid ""
 "An autorun file has been found on your '%1'. Do you want to execute it?\n"
 "Note that executing a file on a medium may compromise your system's security"
@@ -20,12 +21,12 @@ msgstr ""
 "您的“%1”中找到了自动运行文件。您是否想要执行？\n"
 "请注意，在介质上执行文件可能是系统安全的隐患"
 
-#: medianotifier.cpp:179
+#: medianotifier.cpp:213
 #, c-format
 msgid "Autorun - %1"
 msgstr "自动运行 - %1"
 
-#: medianotifier.cpp:249
+#: medianotifier.cpp:283
 msgid ""
 "An autoopen file has been found on your '%1'. Do you want to open '%2'?\n"
 "Note that opening a file on a medium may compromise your system's security"
@@ -33,20 +34,38 @@ msgstr ""
 "您的“%1”中找到了自动打开文件。您是否想要打开“%2”？\n"
 "请注意，在介质上打开文件可能是系统安全的隐患"
 
-#: medianotifier.cpp:253
+#: medianotifier.cpp:287
 #, c-format
 msgid "Autoopen - %1"
 msgstr "自动打开 - %1"
 
-#: notificationdialog.cpp:37
+#: medianotifier.cpp:384
+msgid "Low Disk Space"
+msgstr ""
+
+#: medianotifier.cpp:388
+msgid "Start Konqueror"
+msgstr ""
+
+#: medianotifier.cpp:390
+msgid ""
+"You are running low on disk space on your home partition (currently %1% free), "
+"would you like to run Konqueror to free some disk space and fix the problem?"
+msgstr ""
+
+#: medianotifier.cpp:394
+msgid "Do not ask again"
+msgstr ""
+
+#: notificationdialog.cpp:38
 msgid "Medium Detected"
 msgstr "检测到了介质"
 
-#: notificationdialog.cpp:51
+#: notificationdialog.cpp:52
 msgid "<b>Medium type:</b>"
 msgstr "<b>介质类型：</b>"
 
-#: notificationdialog.cpp:64
+#: notificationdialog.cpp:65
 msgid "Configure..."
 msgstr "配置..."
 
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmaccess.po b/tde-i18n-zh_CN/messages/tdebase/kcmaccess.po
index 8f432a485c6..96b7358f543 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmaccess.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmaccess.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmaccess\n"
-"POT-Creation-Date: 2006-03-27 03:52+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-09-24 23:12+0800\n"
 "Last-Translator: Funda Wang <fundawang@en2china.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmaccessibility.po b/tde-i18n-zh_CN/messages/tdebase/kcmaccessibility.po
index 6df250bfd58..221342cbf55 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmaccessibility.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmaccessibility.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-01-09 22:52+0800\n"
 "Last-Translator: Dick Zhang <netwind2003@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmarts.po b/tde-i18n-zh_CN/messages/tdebase/kcmarts.po
index a38b833795f..a30dad1573a 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmarts.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmarts.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2007-07-28 01:12+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-17 11:41+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmbackground.po b/tde-i18n-zh_CN/messages/tdebase/kcmbackground.po
index 97ef8b40556..a93297be444 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmbackground.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmbackground.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-09-24 23:14+0800\n"
 "Last-Translator: Dick Zhang <netwind2003@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -137,11 +138,12 @@ msgstr ""
 "您没有填写“命令”域。\n"
 "这是必须填写的。"
 
-#: bgdialog.cpp:131
+#: bgdialog.cpp:149
 msgid "Open file dialog"
 msgstr "打开文件对话框"
 
-#: bgdialog.cpp:368
+#: bgdialog.cpp:390
+#, fuzzy
 msgid ""
 "<h1>Background</h1> This module allows you to control the appearance of the "
 "virtual desktops. TDE offers a variety of options for customization, including "
@@ -156,8 +158,8 @@ msgid ""
 "opaquely, or blended in different ways with the background colors and patterns."
 "<p> TDE allows you to have the wallpaper change automatically at specified "
 "intervals of time. You can also replace the background with a program that "
-"updates the desktop dynamically. For example, the \"kdeworld\" program shows a "
-"day/night map of the world which is updated periodically."
+"updates the desktop dynamically. For example, the \"kworldclock\" program shows "
+"a day/night map of the world which is updated periodically."
 msgstr ""
 "<h1>背景</h1> 该模块允许您控制虚拟桌面的外观。TDE 提供许多选项用于定制，包括为每个虚拟桌面指定不同的设置，或者为它们指定一个公共的背景。"
 "<p>桌面的外观是由它的背景颜色和图案还有可选的基于图片文件的墙纸组合而成的。"
@@ -165,109 +167,113 @@ msgstr ""
 "<p>TDE 允许每隔一定的时间就自动更换墙纸。您还可以用一个能动态更新桌面的程序来替代背景。例如，“TDE "
 "世界”程序可以显示一幅不断更新的白天和黑夜的世界地图。"
 
-#: bgdialog.cpp:424
+#: bgdialog.cpp:449
+msgid "Desktop %1 Viewport %2"
+msgstr ""
+
+#: bgdialog.cpp:456
 #, c-format
 msgid "Screen %1"
 msgstr "第%1个屏幕"
 
-#: bgdialog.cpp:427
+#: bgdialog.cpp:459
 msgid "Single Color"
 msgstr "单色"
 
-#: bgdialog.cpp:428
+#: bgdialog.cpp:460
 msgid "Horizontal Gradient"
 msgstr "水平渐变"
 
-#: bgdialog.cpp:429
+#: bgdialog.cpp:461
 msgid "Vertical Gradient"
 msgstr "垂直渐变"
 
-#: bgdialog.cpp:430
+#: bgdialog.cpp:462
 msgid "Pyramid Gradient"
 msgstr "棱锥混和"
 
-#: bgdialog.cpp:431
+#: bgdialog.cpp:463
 msgid "Pipecross Gradient"
 msgstr "十字管道渐变"
 
-#: bgdialog.cpp:432
+#: bgdialog.cpp:464
 msgid "Elliptic Gradient"
 msgstr "椭圆渐变"
 
-#: bgdialog.cpp:447
+#: bgdialog.cpp:479
 msgid "Centered"
 msgstr "居中"
 
-#: bgdialog.cpp:448
+#: bgdialog.cpp:480
 msgid "Tiled"
 msgstr "平铺"
 
-#: bgdialog.cpp:449
+#: bgdialog.cpp:481
 msgid "Center Tiled"
 msgstr "居中平铺"
 
-#: bgdialog.cpp:450
+#: bgdialog.cpp:482
 msgid "Centered Maxpect"
 msgstr "居中放大"
 
-#: bgdialog.cpp:451
+#: bgdialog.cpp:483
 msgid "Tiled Maxpect"
 msgstr "平铺放大"
 
-#: bgdialog.cpp:452
+#: bgdialog.cpp:484
 msgid "Scaled"
 msgstr "缩放"
 
-#: bgdialog.cpp:453
+#: bgdialog.cpp:485
 msgid "Centered Auto Fit"
 msgstr "居中自动调整"
 
-#: bgdialog.cpp:454
+#: bgdialog.cpp:486
 msgid "Scale & Crop"
 msgstr "缩放和裁剪"
 
-#: bgdialog.cpp:457
+#: bgdialog.cpp:489
 msgid "No Blending"
 msgstr "不混和"
 
-#: bgdialog.cpp:458
+#: bgdialog.cpp:490
 msgid "Flat"
 msgstr "平面"
 
-#: bgdialog.cpp:461
+#: bgdialog.cpp:493
 msgid "Pyramid"
 msgstr "棱锥"
 
-#: bgdialog.cpp:462
+#: bgdialog.cpp:494
 msgid "Pipecross"
 msgstr "十字管道"
 
-#: bgdialog.cpp:463
+#: bgdialog.cpp:495
 msgid "Elliptic"
 msgstr "椭圆"
 
-#: bgdialog.cpp:464
+#: bgdialog.cpp:496
 msgid "Intensity"
 msgstr "亮度"
 
-#: bgdialog.cpp:465
+#: bgdialog.cpp:497
 msgid "Saturation"
 msgstr "饱和度"
 
-#: bgdialog.cpp:466
+#: bgdialog.cpp:498
 msgid "Contrast"
 msgstr "对比度"
 
-#: bgdialog.cpp:467
+#: bgdialog.cpp:499
 msgid "Hue Shift"
 msgstr "色调偏移"
 
-#: bgdialog.cpp:616
+#: bgdialog.cpp:656
 msgid "Select Wallpaper"
 msgstr "选择壁纸"
 
 #. i18n: file bgdialog_ui.ui line 300
-#: bgdialog.cpp:1218 rc.cpp:152
+#: bgdialog.cpp:1260 rc.cpp:152
 #, no-c-format
 msgid "Get New Wallpapers"
 msgstr "获得新壁纸"
@@ -295,8 +301,8 @@ msgid "TDE Background Control Module"
 msgstr "TDE 背景控制模块"
 
 #: main.cpp:73
-msgid "(c) 1997-2002 Martin R. Jones"
-msgstr "(C) 1997-2002 Martin R. Jones"
+msgid "(c) 2009,2010 Timothy Pearson"
+msgstr ""
 
 #. i18n: file bgadvanced_ui.ui line 27
 #: rc.cpp:3
@@ -305,7 +311,7 @@ msgid "Background Program"
 msgstr "背景程序"
 
 #. i18n: file bgadvanced_ui.ui line 44
-#: rc.cpp:6 rc.cpp:245
+#: rc.cpp:6 rc.cpp:251
 #, no-c-format
 msgid "&Add..."
 msgstr "添加(&A)..."
@@ -642,7 +648,7 @@ msgid "Posi&tion:"
 msgstr "位置(&T)："
 
 #. i18n: file bgdialog_ui.ui line 376
-#: rc.cpp:164 rc.cpp:206
+#: rc.cpp:164 rc.cpp:212
 #, no-c-format
 msgid ""
 "<qt>You can choose here how a background picture is shown on the desktop:\n"
@@ -680,98 +686,110 @@ msgstr ""
 #. i18n: file bgdialog_ui.ui line 384
 #: rc.cpp:176
 #, no-c-format
+msgid "Cross-fading background"
+msgstr ""
+
+#. i18n: file bgdialog_ui.ui line 387
+#: rc.cpp:179
+#, no-c-format
+msgid "Enables a smooth fading effect when changing background image."
+msgstr ""
+
+#. i18n: file bgdialog_ui.ui line 395
+#: rc.cpp:182
+#, no-c-format
 msgid ""
 "If you have selected to use a background picture you can choose various methods "
 "of blending the background colors with the picture. The default option of \"No "
 "Blending\" means that the picture simply obscures the background colors below."
 msgstr "如果您选择了使用背景图，您可以选择不同地方法混合背景图和背景色。默认选项“无混合”意味着图片简单的遮住下面的背景色。"
 
-#. i18n: file bgdialog_ui.ui line 403
-#: rc.cpp:179
+#. i18n: file bgdialog_ui.ui line 414
+#: rc.cpp:185
 #, no-c-format
 msgid "Click to choose the primary background color."
 msgstr "点击选择主要的背景色。"
 
-#. i18n: file bgdialog_ui.ui line 414
-#: rc.cpp:182
+#. i18n: file bgdialog_ui.ui line 425
+#: rc.cpp:188
 #, no-c-format
 msgid ""
 "Click to choose the secondary background color. If no secondary color is "
 "required by the pattern selected this button will be disabled."
 msgstr "点击选择第二种背景色。如果图案不需要第二种背景色，此按钮将被禁用。"
 
-#. i18n: file bgdialog_ui.ui line 424
-#: rc.cpp:185
+#. i18n: file bgdialog_ui.ui line 435
+#: rc.cpp:191
 #, no-c-format
 msgid "Co&lors:"
 msgstr "颜色(&L)："
 
-#. i18n: file bgdialog_ui.ui line 435
-#: rc.cpp:188
+#. i18n: file bgdialog_ui.ui line 446
+#: rc.cpp:194
 #, no-c-format
 msgid "&Blending:"
 msgstr "混和(&B)："
 
-#. i18n: file bgdialog_ui.ui line 454
-#: rc.cpp:191
+#. i18n: file bgdialog_ui.ui line 465
+#: rc.cpp:197
 #, no-c-format
 msgid "Balance:"
 msgstr "平衡："
 
-#. i18n: file bgdialog_ui.ui line 460
-#: rc.cpp:194 rc.cpp:197
+#. i18n: file bgdialog_ui.ui line 471
+#: rc.cpp:200 rc.cpp:203
 #, no-c-format
 msgid ""
 "You can use this slider to control the degree of blending. You can experiment "
 "by moving the slider and looking at the effects in the preview image."
 msgstr "您可以通过这个滑块来控制混和度。您可以移动滑块并在上面的预览图像中观察它的效果。"
 
-#. i18n: file bgdialog_ui.ui line 496
-#: rc.cpp:200
+#. i18n: file bgdialog_ui.ui line 507
+#: rc.cpp:206
 #, no-c-format
 msgid "Reverse roles"
 msgstr "反转"
 
-#. i18n: file bgdialog_ui.ui line 499
-#: rc.cpp:203
+#. i18n: file bgdialog_ui.ui line 510
+#: rc.cpp:209
 #, no-c-format
 msgid ""
 "For some types of blending, you can reverse the role of the background and the "
 "picture by checking this option."
 msgstr "对于某些类型的背景混合，您可以选中这个选项使背景跟墙纸的层次对调。"
 
-#. i18n: file bgdialog_ui.ui line 573
-#: rc.cpp:218
+#. i18n: file bgdialog_ui.ui line 584
+#: rc.cpp:224
 #, no-c-format
 msgid "Background"
 msgstr "背景"
 
-#. i18n: file bgdialog_ui.ui line 584
-#: rc.cpp:221
+#. i18n: file bgdialog_ui.ui line 595
+#: rc.cpp:227
 #, no-c-format
 msgid "&No picture"
 msgstr "没有图片(&N)"
 
-#. i18n: file bgdialog_ui.ui line 592
-#: rc.cpp:224
+#. i18n: file bgdialog_ui.ui line 603
+#: rc.cpp:230
 #, no-c-format
 msgid "&Slide show:"
 msgstr "放映幻灯片(&S)："
 
-#. i18n: file bgdialog_ui.ui line 600
-#: rc.cpp:227
+#. i18n: file bgdialog_ui.ui line 611
+#: rc.cpp:233
 #, no-c-format
 msgid "&Picture:"
 msgstr "图片(&P)："
 
-#. i18n: file bgdialog_ui.ui line 628
-#: rc.cpp:230
+#. i18n: file bgdialog_ui.ui line 639
+#: rc.cpp:236
 #, no-c-format
 msgid "Set&up..."
 msgstr "设置(&U)..."
 
-#. i18n: file bgdialog_ui.ui line 631
-#: rc.cpp:233
+#. i18n: file bgdialog_ui.ui line 642
+#: rc.cpp:239
 #, no-c-format
 msgid ""
 "Click this button to select a set of images to be used as background pictures. "
@@ -781,35 +799,38 @@ msgid ""
 msgstr "单击此按钮选择一组图片作为背景图。一张图片将显示指定的一段时间，然后显示另一张。图片可以随机显示或者用您指定的顺序显示。"
 
 #. i18n: file bgwallpaper_ui.ui line 27
-#: rc.cpp:236
+#: rc.cpp:242
 #, no-c-format
 msgid "Show the following pictures:"
 msgstr "显示下列图片："
 
 #. i18n: file bgwallpaper_ui.ui line 35
-#: rc.cpp:239
+#: rc.cpp:245
 #, no-c-format
 msgid "&Show pictures in random order"
 msgstr "随机显示图片(&S)"
 
 #. i18n: file bgwallpaper_ui.ui line 51
-#: rc.cpp:242
+#: rc.cpp:248
 #, no-c-format
 msgid "Change &picture after:"
 msgstr "在何时之后更换图片(&P)："
 
 #. i18n: file bgwallpaper_ui.ui line 146
-#: rc.cpp:251
+#: rc.cpp:257
 #, no-c-format
 msgid "Move &Down"
 msgstr "下移(&D)"
 
 #. i18n: file bgwallpaper_ui.ui line 154
-#: rc.cpp:254
+#: rc.cpp:260
 #, no-c-format
 msgid "Move &Up"
 msgstr "上移(&U)"
 
+#~ msgid "(c) 1997-2002 Martin R. Jones"
+#~ msgstr "(C) 1997-2002 Martin R. Jones"
+
 #~ msgid "No picture, color only"
 #~ msgstr "没有图片，只使用颜色"
 
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmbell.po b/tde-i18n-zh_CN/messages/tdebase/kcmbell.po
index 49ee28c34e2..721c043fb9a 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmbell.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmbell.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmbell\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2002-09-10 20:40+0800\n"
 "Last-Translator: Wang Jian <larkw@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmcgi.po b/tde-i18n-zh_CN/messages/tdebase/kcmcgi.po
index c2b910e79ce..2b5a1eb00f7 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmcgi.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmcgi.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcgi\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-27 23:31+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmcolors.po b/tde-i18n-zh_CN/messages/tdebase/kcmcolors.po
index 702030a2740..783d93ee406 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmcolors.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmcolors.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcolors\n"
-"POT-Creation-Date: 2006-08-22 02:34+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-01-14 18:35+0800\n"
 "Last-Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,11 +31,12 @@ msgid ""
 msgstr "i18n-translation@lists.linux.net.cn"
 
 #: colorscm.cpp:100
+#, fuzzy
 msgid ""
 "<h1>Colors</h1> This module allows you to choose the color scheme used for the "
-"TDE desktop. The different elements of the desktop, such as title bars, menu "
-"text, etc., are called \"widgets\". You can choose the widget whose color you "
-"want to change by selecting it from a list, or by clicking on a graphical "
+"Trinity desktop. The different elements of the desktop, such as title bars, "
+"menu text, etc., are called \"widgets\". You can choose the widget whose color "
+"you want to change by selecting it from a list, or by clicking on a graphical "
 "representation of the desktop."
 "<p> You can save color settings as complete color schemes, which can also be "
 "modified or deleted. TDE comes with several predefined color schemes on which "
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-zh_CN/messages/tdebase/kcmcomponentchooser.po
index 9ea3d9c42a9..bb298437bfb 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmcomponentchooser.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-16 11:49+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmcrypto.po b/tde-i18n-zh_CN/messages/tdebase/kcmcrypto.po
index 80612057bdc..03a80e2e4b0 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmcrypto.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmcrypto.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcrypto\n"
-"POT-Creation-Date: 2007-07-30 01:13+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-22 12:34+0800\n"
 "Last-Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -196,7 +197,7 @@ msgstr "使用 EGD"
 msgid "Use entropy file"
 msgstr "使用熵文件"
 
-#: crypto.cpp:418 crypto.cpp:2278
+#: crypto.cpp:418 crypto.cpp:2298
 msgid "Path to EGD:"
 msgstr "EGD 路径："
 
@@ -512,14 +513,14 @@ msgid ""
 msgstr "此模块未与 OpenSSL 库连接，因此无法配置这些选项。"
 
 #: certexport.cpp:93 certexport.cpp:108 certexport.cpp:116 crypto.cpp:832
-#: crypto.cpp:1039 crypto.cpp:1341 crypto.cpp:1370 crypto.cpp:1387
-#: crypto.cpp:1389 crypto.cpp:1572 crypto.cpp:1590 crypto.cpp:1642
-#: crypto.cpp:1674 crypto.cpp:1676 crypto.cpp:1870 crypto.cpp:1890
-#: crypto.cpp:1956 crypto.cpp:1963 crypto.cpp:1978 crypto.cpp:2030
+#: crypto.cpp:1047 crypto.cpp:1361 crypto.cpp:1390 crypto.cpp:1407
+#: crypto.cpp:1409 crypto.cpp:1592 crypto.cpp:1610 crypto.cpp:1662
+#: crypto.cpp:1694 crypto.cpp:1696 crypto.cpp:1890 crypto.cpp:1910
+#: crypto.cpp:1976 crypto.cpp:1983 crypto.cpp:1998 crypto.cpp:2050
 msgid "SSL"
 msgstr "SSL"
 
-#: crypto.cpp:834 crypto.cpp:2258 crypto.cpp:2266 crypto.cpp:2270
+#: crypto.cpp:834 crypto.cpp:2278 crypto.cpp:2286 crypto.cpp:2290
 msgid "OpenSSL"
 msgstr "OpenSSL"
 
@@ -543,117 +544,117 @@ msgstr "SSL 签名者"
 msgid "Validation Options"
 msgstr "验证选项"
 
-#: crypto.cpp:1035
+#: crypto.cpp:1043
 msgid ""
 "If you do not select at least one SSL algorithm, either SSL will not work or "
 "the application may be forced to choose a suitable default."
 msgstr "如果您没有选择至少一个 SSL 算法，要么 SSL 不工作，要么应用程序被强迫选择一个适合的默认值。"
 
-#: crypto.cpp:1087
+#: crypto.cpp:1099
 msgid "If you do not select at least one cipher, SSLv2 will not work."
 msgstr "如果您没有至少选择一个加密算法，SSL 版本2将不工作。"
 
-#: crypto.cpp:1089
+#: crypto.cpp:1101
 msgid "SSLv2 Ciphers"
 msgstr "SSL 版本2加密算法"
 
-#: crypto.cpp:1106
+#: crypto.cpp:1118
 msgid "If you do not select at least one cipher, SSLv3 will not work."
 msgstr "如果您没有选择至少一个加密算法，SSL 版本3将不工作。"
 
-#: crypto.cpp:1108
+#: crypto.cpp:1120
 msgid "SSLv3 Ciphers"
 msgstr "SSL 版本3加密算法"
 
-#: crypto.cpp:1340
+#: crypto.cpp:1360
 msgid "Could not open the certificate."
 msgstr "无法打开证书。"
 
-#: crypto.cpp:1370
+#: crypto.cpp:1390
 msgid "Error obtaining the certificate."
 msgstr "获取证书时发生错误。"
 
-#: crypto.cpp:1387 crypto.cpp:1674
+#: crypto.cpp:1407 crypto.cpp:1694
 msgid "This certificate passed the verification tests successfully."
 msgstr "该证书通过了校验测试。"
 
-#: crypto.cpp:1389 crypto.cpp:1676
+#: crypto.cpp:1409 crypto.cpp:1696
 msgid "This certificate has failed the tests and should be considered invalid."
 msgstr "该证书没有通过校验测试，应该被认为无效。"
 
-#: crypto.cpp:1566
+#: crypto.cpp:1586
 msgid "Certificate password"
 msgstr "证书口令"
 
-#: crypto.cpp:1572
+#: crypto.cpp:1592
 msgid "The certificate file could not be loaded. Try a different password?"
 msgstr "无法载入证书文件。要尝试另外的口令吗？"
 
-#: crypto.cpp:1572
+#: crypto.cpp:1592
 msgid "Try"
 msgstr "尝试"
 
-#: crypto.cpp:1572
+#: crypto.cpp:1592
 msgid "Do Not Try"
 msgstr "不尝试"
 
-#: crypto.cpp:1590
+#: crypto.cpp:1610
 msgid ""
 "A certificate with that name already exists. Are you sure that you wish to "
 "replace it?"
 msgstr "同名的证书已存在。您确认要替代它吗？"
 
-#: crypto.cpp:1623 crypto.cpp:1655 crypto.cpp:1703
+#: crypto.cpp:1643 crypto.cpp:1675 crypto.cpp:1723
 msgid "Enter the certificate password:"
 msgstr "输入证书口令："
 
-#: crypto.cpp:1629 crypto.cpp:1661 crypto.cpp:1709 crypto.cpp:1807
+#: crypto.cpp:1649 crypto.cpp:1681 crypto.cpp:1729 crypto.cpp:1827
 msgid "Decoding failed. Please try again:"
 msgstr "解码失败。请重试："
 
-#: crypto.cpp:1642
+#: crypto.cpp:1662
 msgid "Export failed."
 msgstr "导出错误。"
 
-#: crypto.cpp:1802
+#: crypto.cpp:1822
 msgid "Enter the OLD password for the certificate:"
 msgstr "输入证书的旧口令："
 
-#: crypto.cpp:1815
+#: crypto.cpp:1835
 msgid "Enter the new certificate password"
 msgstr "输入新的证书口令"
 
-#: crypto.cpp:1867 crypto.cpp:1962
+#: crypto.cpp:1887 crypto.cpp:1982
 msgid "This is not a signer certificate."
 msgstr "这不是一个签名证书。"
 
-#: crypto.cpp:1887 crypto.cpp:1977
+#: crypto.cpp:1907 crypto.cpp:1997
 msgid "You already have this signer certificate installed."
 msgstr "您已经安装了这个签名证书。"
 
-#: crypto.cpp:1955
+#: crypto.cpp:1975
 msgid "The certificate file could not be loaded."
 msgstr "无法载入证书文件。"
 
-#: crypto.cpp:2006
+#: crypto.cpp:2026
 msgid "Do you want to make this certificate available to KMail as well?"
 msgstr "您是否想要为 KMail 启用此证书？"
 
-#: crypto.cpp:2006
+#: crypto.cpp:2026
 msgid "Make Available"
 msgstr "启用"
 
-#: crypto.cpp:2006
+#: crypto.cpp:2026
 msgid "Do Not Make Available"
 msgstr "不启用"
 
-#: crypto.cpp:2012
+#: crypto.cpp:2032
 msgid ""
 "Could not execute Kleopatra. You might have to install or update the tdepim "
 "package."
 msgstr "无法执行 Kleopatra。您可能需要安装或更新 tdepim 软件包。"
 
-#: crypto.cpp:2030
+#: crypto.cpp:2050
 msgid ""
 "This will revert your certificate signers database to the TDE default.\n"
 "This operation cannot be undone.\n"
@@ -663,81 +664,81 @@ msgstr ""
 "这个操作不能取消。\n"
 "您确定要继续吗？"
 
-#: crypto.cpp:2030
+#: crypto.cpp:2050
 msgid "Revert"
 msgstr "复原"
 
-#: crypto.cpp:2256 crypto.cpp:2264
+#: crypto.cpp:2276 crypto.cpp:2284
 msgid "Failed to load OpenSSL."
 msgstr "无法载入 OpenSSL。"
 
-#: crypto.cpp:2257
+#: crypto.cpp:2277
 msgid "libssl was not found or successfully loaded."
 msgstr "没有找到 libssl 或成功载入。"
 
-#: crypto.cpp:2265
+#: crypto.cpp:2285
 msgid "libcrypto was not found or successfully loaded."
 msgstr "没有找到 libcrypto 或成功载入。"
 
-#: crypto.cpp:2270
+#: crypto.cpp:2290
 msgid "OpenSSL was successfully loaded."
 msgstr "成功载入 OpenSSL。"
 
-#: crypto.cpp:2289
+#: crypto.cpp:2309
 msgid "Path to entropy file:"
 msgstr "熵文件路径："
 
-#: crypto.cpp:2302
+#: crypto.cpp:2322
 msgid "Personal SSL"
 msgstr "个人 SSL"
 
-#: crypto.cpp:2303
+#: crypto.cpp:2323
 msgid "Server SSL"
 msgstr "服务器 SSL"
 
-#: crypto.cpp:2304
+#: crypto.cpp:2324
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: crypto.cpp:2305
+#: crypto.cpp:2325
 msgid "PGP"
 msgstr "PGP"
 
-#: crypto.cpp:2306
+#: crypto.cpp:2326
 msgid "GPG"
 msgstr "GPG"
 
-#: crypto.cpp:2307
+#: crypto.cpp:2327
 msgid "SSL Personal Request"
 msgstr "SSL 个人请求"
 
-#: crypto.cpp:2308
+#: crypto.cpp:2328
 msgid "SSL Server Request"
 msgstr "SSL 服务器请求"
 
-#: crypto.cpp:2309
+#: crypto.cpp:2329
 msgid "Netscape SSL"
 msgstr "Netscape SSL"
 
-#: crypto.cpp:2310
+#: crypto.cpp:2330
 msgid ""
 "_: Server certificate authority\n"
 "Server CA"
 msgstr "服务器 CA"
 
-#: crypto.cpp:2311
+#: crypto.cpp:2331
 msgid ""
 "_: Personal certificate authority\n"
 "Personal CA"
 msgstr "个人 CA"
 
-#: crypto.cpp:2312
+#: crypto.cpp:2332
 msgid ""
 "_: Secure MIME certificate authority\n"
 "S/MIME CA"
 msgstr "S/MIME CA"
 
-#: crypto.cpp:2404
+#: crypto.cpp:2435
 msgid "None"
 msgstr "无"
 
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmcss.po b/tde-i18n-zh_CN/messages/tdebase/kcmcss.po
index cad6d425f7e..ed2437ccbe6 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmcss.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmcss.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcss\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-27 23:45+0800\n"
 "Last-Translator: Li Zongliang <li-zongliang@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmenergy.po b/tde-i18n-zh_CN/messages/tdebase/kcmenergy.po
index 41c09c9c57f..2d577f3cff1 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmenergy.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmenergy.po
@@ -5,16 +5,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmenergy\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
 
-#: 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."
@@ -29,58 +30,71 @@ msgstr ""
 "<p>共有三级节能：待机、休眠以及关闭电源。节能的级别越高，其恢复到正常工作状态所需的时间就越长。"
 "<p>要把显示器从节能状态唤醒，您可以轻轻挪动鼠标，或者按下一个不致产生副作用的键，如“Shift”键。"
 
-#: energy.cpp:165
+#: energy.cpp:185
 msgid "&Enable display power management"
 msgstr "启用显示器能源管理(&E)"
 
-#: energy.cpp:168
+#: energy.cpp:189
 msgid "Check this option to enable the power saving features of your display."
 msgstr "选中此选项将启用您的显示器的节能功能。"
 
-#: energy.cpp:171
+#: energy.cpp:193
+#, fuzzy
+msgid "&Enable specific display power management"
+msgstr "启用显示器能源管理(&E)"
+
+#: energy.cpp:199
 msgid "Your display does not support power saving."
 msgstr "您的显示器没有节能功能。"
 
-#: energy.cpp:178
+#: energy.cpp:206
 msgid "Learn more about the Energy Star program"
 msgstr "更多地了解关于能源之星程序"
 
-#: energy.cpp:187
+#: energy.cpp:216
 msgid "&Standby after:"
 msgstr "待机前等(&S)："
 
-#: energy.cpp:189 energy.cpp:200 energy.cpp:212
+#: energy.cpp:218 energy.cpp:229 energy.cpp:241
 msgid " min"
 msgstr "分钟"
 
-#: energy.cpp:190 energy.cpp:201 energy.cpp:213
+#: energy.cpp:219 energy.cpp:230 energy.cpp:242
 msgid "Disabled"
 msgstr "禁用"
 
-#: energy.cpp:193
+#: 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:198
+#: energy.cpp:227
 msgid "S&uspend after:"
 msgstr "休眠(&U)："
 
-#: energy.cpp:204
+#: 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 "
 "different from the first level for some displays."
 msgstr "选择显示器进入“休眠”模式前的空闲状态的时间。这是第二级节能，但是对于某些显示器来说，可能和第一级没有什么区别。"
 
-#: energy.cpp:210
+#: energy.cpp:239
 msgid "&Power off after:"
 msgstr "关闭电源(&P)："
 
-#: energy.cpp:216
+#: 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 the "
 "display is still physically turned on."
 msgstr "选择关闭显示器电源前的空闲状态的时间。这是显示器物理上处于开启状态时所能达到的最大级别的节能。"
+
+#: energy.cpp:256
+msgid "Configure KPowersave..."
+msgstr ""
+
+#: energy.cpp:262
+msgid "Configure TDEPowersave..."
+msgstr ""
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmfonts.po b/tde-i18n-zh_CN/messages/tdebase/kcmfonts.po
index 9983e282d26..d22e6b508ef 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmfonts.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmfonts.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmfonts\n"
-"POT-Creation-Date: 2007-04-11 02:14+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-01-09 15:52+0800\n"
 "Last-Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmhtmlsearch.po b/tde-i18n-zh_CN/messages/tdebase/kcmhtmlsearch.po
index a5fd1e482ba..7154eb56ee9 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmhtmlsearch.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmhtmlsearch.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmhtmlsearch\n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-01-05 00:17+0800\n"
 "Last-Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmicons.po b/tde-i18n-zh_CN/messages/tdebase/kcmicons.po
index e63985fbab9..9e344e0306b 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmicons.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmicons.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmicons\n"
-"POT-Creation-Date: 2006-09-03 02:35+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-28 14:50+0800\n"
 "Last-Translator: Xuedong Zhang <zxd@bu.edu>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,115 +27,134 @@ msgid ""
 "Your emails"
 msgstr "i18n-translation@lists.linux.net.cn"
 
-#: icons.cpp:45
+#: icons.cpp:48
 msgid "Use of Icon"
 msgstr "图标用途"
 
-#: icons.cpp:66
+#: icons.cpp:69
 msgid "Active"
 msgstr "活动"
 
-#: icons.cpp:68
+#: icons.cpp:71
 msgid "Disabled"
 msgstr "禁用"
 
-#: icons.cpp:80
+#: icons.cpp:82
 msgid "Size:"
 msgstr "大小："
 
-#: icons.cpp:88
+#: icons.cpp:90
 msgid "Double-sized pixels"
 msgstr "使用双倍像素显示"
 
-#: icons.cpp:92
+#: icons.cpp:94
 msgid "Animate icons"
 msgstr "动画图标"
 
-#: icons.cpp:117
+#: icons.cpp:98
+msgid "Rounded text selection"
+msgstr ""
+
+#: icons.cpp:102
+msgid "Show icon activation effect"
+msgstr ""
+
+#: icons.cpp:131
 msgid "Set Effect..."
 msgstr "设置特殊效果..."
 
-#: icons.cpp:133
+#: icons.cpp:147
 msgid "Desktop/File Manager"
 msgstr "桌面/文件管理器"
 
-#: icons.cpp:134
+#: icons.cpp:148
 msgid "Toolbar"
 msgstr "工具栏"
 
-#: icons.cpp:136
+#: icons.cpp:150
 msgid "Small Icons"
 msgstr "小图标"
 
-#: icons.cpp:137
+#: icons.cpp:151
 msgid "Panel"
 msgstr "面板"
 
-#: icons.cpp:138
+#: icons.cpp:152
 msgid "All Icons"
 msgstr "全部图标"
 
-#: icons.cpp:445
+#: icons.cpp:153 icons.cpp:303 icons.cpp:364 icons.cpp:375 icons.cpp:518
+#: icons.cpp:561 icons.cpp:612
+msgid "Panel Buttons"
+msgstr ""
+
+#: icons.cpp:154 icons.cpp:317 icons.cpp:367 icons.cpp:378 icons.cpp:526
+#: icons.cpp:564 icons.cpp:617
+#, fuzzy
+msgid "System Tray Icons"
+msgstr "小图标"
+
+#: icons.cpp:579
 msgid "Setup Default Icon Effect"
 msgstr "设置默认图标效果"
 
-#: icons.cpp:446
+#: icons.cpp:580
 msgid "Setup Active Icon Effect"
 msgstr "设置活动图标效果"
 
-#: icons.cpp:447
+#: icons.cpp:581
 msgid "Setup Disabled Icon Effect"
 msgstr "设置禁用图标效果"
 
-#: icons.cpp:534
+#: icons.cpp:690
 msgid "&Effect:"
 msgstr "特殊效果(&E)："
 
-#: icons.cpp:538
+#: icons.cpp:694
 msgid "No Effect"
 msgstr "无特殊效果"
 
-#: icons.cpp:539
+#: icons.cpp:695
 msgid "To Gray"
 msgstr "变灰色"
 
-#: icons.cpp:540
+#: icons.cpp:696
 msgid "Colorize"
 msgstr "加彩色"
 
-#: icons.cpp:541
+#: icons.cpp:697
 msgid "Gamma"
 msgstr "亮度"
 
-#: icons.cpp:542
+#: icons.cpp:698
 msgid "Desaturate"
 msgstr "去饱和"
 
-#: icons.cpp:543
+#: icons.cpp:699
 msgid "To Monochrome"
 msgstr "变为单色"
 
-#: icons.cpp:549
+#: icons.cpp:705
 msgid "&Semi-transparent"
 msgstr "半透明(&S)"
 
-#: icons.cpp:553
+#: icons.cpp:709
 msgid "Preview"
 msgstr "预览"
 
-#: icons.cpp:564
+#: icons.cpp:720
 msgid "Effect Parameters"
 msgstr "效果参数"
 
-#: icons.cpp:569
+#: icons.cpp:725
 msgid "&Amount:"
 msgstr "程度(&A)："
 
-#: icons.cpp:576
+#: icons.cpp:732
 msgid "Co&lor:"
 msgstr "颜色(&L)："
 
-#: icons.cpp:584
+#: icons.cpp:740
 msgid "&Second color:"
 msgstr "第二颜色(&S)："
 
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcminfo.po b/tde-i18n-zh_CN/messages/tdebase/kcminfo.po
index 68cd4cd1755..e094b9fe23b 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcminfo.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcminfo.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcminfo\n"
-"POT-Creation-Date: 2006-06-16 03:58+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-07-22 12:22+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -150,7 +151,7 @@ msgstr "%1 字节"
 
 #: info.cpp:263 info_aix.cpp:299 info_hpux.cpp:372 info_hpux.cpp:662
 #: info_linux.cpp:136 info_linux.cpp:562 info_netbsd.cpp:73
-#: info_openbsd.cpp:69 info_solaris.cpp:686 opengl.cpp:636
+#: info_openbsd.cpp:69 info_solaris.cpp:686 opengl.cpp:635
 msgid "Value"
 msgstr "值"
 
@@ -158,7 +159,7 @@ msgstr "值"
 msgid "Server Information"
 msgstr "服务器信息"
 
-#: info.cpp:272 opengl.cpp:638
+#: info.cpp:272 opengl.cpp:637
 msgid "Name of the Display"
 msgstr "显示器名称"
 
@@ -873,11 +874,13 @@ msgid "Disk cache:"
 msgstr "磁盘缓存："
 
 #: memory.cpp:156
-msgid "Total swap memory:"
+#, fuzzy
+msgid "Total swap space:"
 msgstr "交换区总量："
 
 #: memory.cpp:159
-msgid "Free swap memory:"
+#, fuzzy
+msgid "Free swap space:"
 msgstr "空闲交换区："
 
 #: memory.cpp:198
@@ -885,9 +888,10 @@ msgid "Total Memory"
 msgstr "内存总量"
 
 #: memory.cpp:199
+#, fuzzy
 msgid ""
-"This graph gives you an overview of the <b>total sum of physical and virtual "
-"memory</b> in your system."
+"This graph gives you an overview of the usage of <b>all available memory</b> "
+"(the sum of physical memory and swap space) in your system."
 msgstr "此图向您概述了系统<b>物理内存和虚拟内存的总量</b>。"
 
 #: memory.cpp:204
@@ -895,74 +899,83 @@ msgid "Physical Memory"
 msgstr "物理内存"
 
 #: memory.cpp:205
+#, fuzzy
 msgid ""
-"This graph gives you an overview of the <b>usage of physical memory</b> "
+"This graph gives you an overview of the usage of <b>physical memory</b> "
 "in your system."
 "<p>Most operating systems (including Linux) will use as much of the available "
-"physical memory as possible as disk cache, to speed up the system performance. "
-"<p>This means that if you have a small amount of <b>Free Physical Memory</b> "
-"and a large amount of <b>Disk Cache Memory</b>, your system is well configured."
+"physical memory as possible for a disk cache, to speed up the reading and "
+"writing of files. "
+"<p>This means that if you are seeing a small amount of <b>"
+"Free Physical Memory</b> and a large amount of <b>Disk Cache</b>"
+", your system is well configured."
 msgstr ""
 "此图向您概述了系统中<b>物理内存的使用情况</b>。"
 "<p>大多数操作系统(包括 Linux)都会尽可能使用物理内存来进行磁盘缓存，这样可以提升系统性能。"
 "<p>这意味着，如果您<b>剩余物理内存</b>的值偏小，而<b>磁盘缓存内存</b>较大的话，您的系统配置就是比较合理的。"
 
-#: memory.cpp:217
+#: memory.cpp:216
 msgid "Swap Space"
 msgstr "交换空间"
 
-#: memory.cpp:218
+#: memory.cpp:217
+#, fuzzy
 msgid ""
-"The swap space is the <b>virtual memory</b> available to the system. "
-"<p>It will be used on demand and is provided through one or more swap "
+"Swap space is the <b>virtual memory</b> available to the system. "
+"<p>It will be used when needed, and is provided through one or more swap "
 "partitions and/or swap files."
 msgstr "交换空间是系统可用的<b>虚拟内存</b>。<p>这片空间由一个或多个交换分区和/或交换文件组成。系统将会按需使用这片空间。"
 
-#: memory.cpp:271
+#: memory.cpp:270
 msgid ""
 "<h1>Memory Information</h1> This display shows you the current memory usage of "
 "your system. The values are updated on a regular basis and give you an overview "
 "of the physical and virtual used memory."
 msgstr "<h1>内存信息</h1> 显示您当前系统使用内存的信息。显示的值定期更新，您可以大概了解物理内存和实际使用的内存。"
 
-#: memory.cpp:350
+#: memory.cpp:349
 msgid "%1 free"
 msgstr "%1 空闲"
 
-#: memory.cpp:371
+#: memory.cpp:370
 msgid "%1 bytes ="
 msgstr "%1 字节 ="
 
-#: memory.cpp:402
+#: memory.cpp:401
 msgid "Application Data"
 msgstr "应用程序数据"
 
-#: memory.cpp:404
+#: memory.cpp:403
 msgid "Disk Buffers"
 msgstr "磁盘缓冲"
 
-#: memory.cpp:406
+#: memory.cpp:405
 msgid "Disk Cache"
 msgstr "磁盘缓存"
 
-#: memory.cpp:408
+#: memory.cpp:407
 msgid "Free Physical Memory"
 msgstr "空闲物理内存"
 
-#: memory.cpp:419 memory.cpp:439
+#: memory.cpp:418
 msgid "Used Swap"
 msgstr "已用交换区"
 
-#: memory.cpp:421
+#: memory.cpp:420
 msgid "Free Swap"
 msgstr "空闲交换区"
 
-#: memory.cpp:437
-msgid "Used Physical Memory"
-msgstr "已用物理内存"
+#: memory.cpp:432
+msgid "Used Memory (swap part)"
+msgstr ""
+
+#: memory.cpp:434
+msgid "Used Memory (physical part)"
+msgstr ""
 
-#: memory.cpp:441
-msgid "Total Free Memory"
+#: memory.cpp:436
+#, fuzzy
+msgid "Free Memory (total)"
 msgstr "空闲内存总量"
 
 #: opengl.cpp:266
@@ -1161,6 +1174,9 @@ msgstr "GLU 版本"
 msgid "GLU extensions"
 msgstr "GLU 扩展"
 
-#: opengl.cpp:662
+#: opengl.cpp:661
 msgid "Could not initialize OpenGL"
 msgstr "无法初始化 OpenGL"
+
+#~ msgid "Used Physical Memory"
+#~ msgstr "已用物理内存"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcminput.po b/tde-i18n-zh_CN/messages/tdebase/kcminput.po
index cf8eb3bd025..a359235963a 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcminput.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcminput.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2006-08-22 02:34+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-02-12 18:29+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,98 +34,98 @@ msgstr "i18n-translation@lists.linux.net.cn"
 msgid "Mouse type: %1"
 msgstr "鼠标类型：%1"
 
-#: logitechmouse.cpp:225
+#: logitechmouse.cpp:229
 msgid ""
 "RF channel 1 has been set. Please press Connect button on mouse to re-establish "
 "link"
 msgstr "设置了 RF 第一频道。请按连接鼠标上的连接按钮以便重新建立连接"
 
-#: logitechmouse.cpp:225 logitechmouse.cpp:229
+#: logitechmouse.cpp:229 logitechmouse.cpp:233
 msgid "Press Connect Button"
 msgstr "请按连接按钮"
 
-#: logitechmouse.cpp:229
+#: logitechmouse.cpp:233
 msgid ""
 "RF channel 2 has been set. Please press Connect button on mouse to re-establish "
 "link"
 msgstr "设置了 RF 第二频道。请按连接鼠标上的连接按钮以便重新建立连接"
 
-#: logitechmouse.cpp:356
+#: logitechmouse.cpp:370
 msgid "none"
 msgstr "无"
 
-#: logitechmouse.cpp:359 logitechmouse.cpp:389
+#: logitechmouse.cpp:373 logitechmouse.cpp:403
 msgid "Cordless Mouse"
 msgstr "无限旋貂"
 
-#: logitechmouse.cpp:362 logitechmouse.cpp:368 logitechmouse.cpp:371
+#: logitechmouse.cpp:376 logitechmouse.cpp:382 logitechmouse.cpp:385
 msgid "Cordless Wheel Mouse"
 msgstr "带滚轮的无限旋貂"
 
-#: logitechmouse.cpp:365
+#: logitechmouse.cpp:379
 msgid "Cordless MouseMan Wheel"
 msgstr "无限银貂"
 
-#: logitechmouse.cpp:374
+#: logitechmouse.cpp:388
 msgid "Cordless TrackMan Wheel"
 msgstr "无限火星"
 
-#: logitechmouse.cpp:377
+#: logitechmouse.cpp:391
 msgid "TrackMan Live"
 msgstr "简报飞貂"
 
-#: logitechmouse.cpp:380
+#: logitechmouse.cpp:394
 msgid "Cordless TrackMan FX"
 msgstr "无限金星"
 
-#: logitechmouse.cpp:383
+#: logitechmouse.cpp:397
 msgid "Cordless MouseMan Optical"
 msgstr "无限飞貂极光版"
 
-#: logitechmouse.cpp:386
+#: logitechmouse.cpp:400
 msgid "Cordless Optical Mouse"
 msgstr "无限天貂"
 
-#: logitechmouse.cpp:392
+#: logitechmouse.cpp:406
 msgid "Cordless MouseMan Optical (2ch)"
 msgstr "无限飞貂极光版(双频道)"
 
-#: logitechmouse.cpp:395
+#: logitechmouse.cpp:409
 msgid "Cordless Optical Mouse (2ch)"
 msgstr "无限天貂(双频道)"
 
-#: logitechmouse.cpp:398
+#: logitechmouse.cpp:412
 msgid "Cordless Mouse (2ch)"
 msgstr "无限旋貂(双频道)"
 
-#: logitechmouse.cpp:401
+#: logitechmouse.cpp:415
 msgid "Cordless Optical TrackMan"
 msgstr "无限水星"
 
-#: logitechmouse.cpp:404
+#: logitechmouse.cpp:418
 msgid "MX700 Cordless Optical Mouse"
 msgstr "无限云貂极光版"
 
-#: logitechmouse.cpp:407
+#: logitechmouse.cpp:421
 msgid "MX700 Cordless Optical Mouse (2ch)"
 msgstr "无限云貂极光版(双频道)"
 
-#: logitechmouse.cpp:410
+#: logitechmouse.cpp:424
 msgid "Unknown mouse"
 msgstr "未知鼠标"
 
-#: mouse.cpp:82
+#: mouse.cpp:84
 msgid ""
 "<h1>Mouse</h1> This module allows you to choose various options for the way in "
 "which your pointing device works. Your pointing device may be a mouse, "
 "trackball, or some other hardware that performs a similar function."
 msgstr "<h1>鼠标</h1>这个模块允许您使用各种选项来选择指点设备工作的方式。您的指点设备可能是鼠标，跟踪球，或其它能够完成相似功能的其它硬件。"
 
-#: mouse.cpp:101
+#: mouse.cpp:103
 msgid "&General"
 msgstr "常规(&G)"
 
-#: mouse.cpp:106
+#: mouse.cpp:108
 msgid ""
 "If you are left-handed, you may prefer to swap the functions of the left and "
 "right buttons on your pointing device by choosing the 'left-handed' option. If "
@@ -135,7 +136,7 @@ msgstr ""
 "如果您是左手习惯，您也许希望选择“左手习惯”选项来交换指点设备的左键和右键的功能。如果您的指点设备有多于两个的按钮，只有具有左键或右键功能的按钮才会受到影响。例"
 "如，如果您有三键鼠标，中键不受影响。"
 
-#: mouse.cpp:116
+#: mouse.cpp:118
 msgid ""
 "The default behavior in TDE is to select and activate icons with a single click "
 "of the left button on your pointing device. This behavior is consistent with "
@@ -145,41 +146,41 @@ msgid ""
 msgstr ""
 "TDE 的默认行为是指点设备的左按钮单击选中并激活图标。这和您在大多数 web 浏览器中单击链接时的行为是一致的。如果您希望单击选中，双击激活，使用这个选项。"
 
-#: mouse.cpp:124
+#: mouse.cpp:126
 msgid "Activates and opens a file or folder with a single click."
 msgstr "用单击激活并打开文件或文件夹。"
 
-#: mouse.cpp:130
+#: mouse.cpp:132
 msgid ""
 "If you check this option, pausing the mouse pointer over an icon on the screen "
 "will automatically select that icon. This may be useful when single clicks "
 "activate icons, and you want only to select the icon without activating it."
 msgstr "如果您使用这个选项，鼠标指针在屏幕上的图标上停留会自动选中图标。这在单击激活图标，而您只想选择而不是激活图标时是非常有用的。"
 
-#: mouse.cpp:142
+#: mouse.cpp:144
 msgid ""
 "If you have checked the option to automatically select icons, this slider "
 "allows you to select how long the mouse pointer must be paused over the icon "
 "before it is selected."
 msgstr "如果您已经使用自动选中图标的选项，这个滑动条允许您指定在图标被选中前鼠标指针必须在图标上停留多长时间。"
 
-#: mouse.cpp:147
+#: mouse.cpp:149
 msgid "Show feedback when clicking an icon"
 msgstr "在点击图标时显示反馈"
 
-#: mouse.cpp:179
+#: mouse.cpp:181
 msgid "&Cursor Theme"
 msgstr "光标主题(&C)"
 
-#: mouse.cpp:183
+#: mouse.cpp:185
 msgid "Advanced"
 msgstr "高级"
 
-#: mouse.cpp:189
+#: mouse.cpp:191
 msgid "Pointer acceleration:"
 msgstr "指针加速："
 
-#: mouse.cpp:194
+#: mouse.cpp:196
 msgid ""
 "This option allows you to change the relationship between the distance that the "
 "mouse pointer moves on the screen and the relative movement of the physical "
@@ -192,11 +193,11 @@ msgstr ""
 "这个选项允许您改变鼠标指针在屏幕上移动和实际的设备(可能是鼠标、跟踪球或其它的指点设备)移动之间的关系。"
 "<p>大的加速值将导致即使您的物理设备做很小的移动也会使鼠标指针移动很大距离。选择非常大的值将使鼠标指针在屏幕上掠过，很难控制。"
 
-#: mouse.cpp:207
+#: mouse.cpp:209
 msgid "Pointer threshold:"
 msgstr "指针快速移动阈值："
 
-#: mouse.cpp:215
+#: mouse.cpp:217
 msgid ""
 "The threshold is the smallest distance that the mouse pointer must move on the "
 "screen before acceleration has any effect. If the movement is smaller than the "
@@ -213,7 +214,7 @@ msgstr ""
 msgid "Double click interval:"
 msgstr "双击间隔："
 
-#: mouse.cpp:231 mouse.cpp:249 mouse.cpp:303 mouse.cpp:311 mouse.cpp:320
+#: mouse.cpp:231 mouse.cpp:279 mouse.cpp:333 mouse.cpp:341 mouse.cpp:350
 msgid " msec"
 msgstr " 毫秒"
 
@@ -225,31 +226,46 @@ msgid ""
 "separate clicks."
 msgstr "双击间隔时间是鼠标双击的两次点击的最大间隔时间(毫秒)。如果第二次点击在第一次点击后的此时间间隔后，这两次点击将被认为是两次单击。"
 
-#: mouse.cpp:247
+#: mouse.cpp:246
+msgid "Double-click on the image below to test your double-click interval:"
+msgstr ""
+
+#: mouse.cpp:248
+msgid ""
+"The image will change when your double-click test time is less than or equal to "
+"the interval you configured. When changing the interval, be sure to select the "
+"Apply button before testing. For example, the image will not change when you "
+"configure a double-click interval of 700 milliseconds and the time between two "
+"successive clicks on the image is 800 milliseconds, but the image will change "
+"when the time between clicks is 600 milliseconds. The goal is to select a "
+"comfortable interval that you find is not too fast or slow."
+msgstr ""
+
+#: mouse.cpp:277
 msgid "Drag start time:"
 msgstr "拖动起始时间："
 
-#: mouse.cpp:254
+#: mouse.cpp:284
 msgid ""
 "If you click with the mouse (e.g. in a multi-line editor) and begin to move the "
 "mouse within the drag start time, a drag operation will be initiated."
 msgstr "如果您用鼠标点击(例如在多行编辑器里)并在拖动起始时间内开始移动鼠标，就开始拖动操作。"
 
-#: mouse.cpp:260
+#: mouse.cpp:290
 msgid "Drag start distance:"
 msgstr "拖动起始距离："
 
-#: mouse.cpp:268
+#: mouse.cpp:298
 msgid ""
 "If you click with the mouse and begin to move the mouse at least the drag start "
 "distance, a drag operation will be initiated."
 msgstr "如果您用鼠标点击并在拖动起始距离内开始移动鼠标，就开始拖动操作。"
 
-#: mouse.cpp:274
+#: mouse.cpp:304
 msgid "Mouse wheel scrolls by:"
 msgstr "鼠标滚轮卷动单位："
 
-#: mouse.cpp:282
+#: mouse.cpp:312
 msgid ""
 "If you use the wheel of a mouse, this value determines the number of lines to "
 "scroll for each wheel movement. Note that if this number exceeds the number of "
@@ -257,53 +273,53 @@ msgid ""
 "page up/down movement."
 msgstr "如果您使用滚轮鼠标，该值确定滚轮每次运动要卷动的行数。注意如果该值超过了可见的行数时，该值会被忽略，滚轮动作将被作为一次上页(或下页)动作。"
 
-#: mouse.cpp:288
+#: mouse.cpp:318
 msgid "Mouse Navigation"
 msgstr "鼠标导航"
 
-#: mouse.cpp:296
+#: mouse.cpp:326
 msgid "&Move pointer with keyboard (using the num pad)"
 msgstr "用键盘(数字键盘)移动鼠标指针(&M)"
 
-#: mouse.cpp:302
+#: mouse.cpp:332
 msgid "&Acceleration delay:"
 msgstr "加速延时(&A)："
 
-#: mouse.cpp:310
+#: mouse.cpp:340
 msgid "R&epeat interval:"
 msgstr "重复间隔(&E)："
 
-#: mouse.cpp:318
+#: mouse.cpp:348
 msgid "Acceleration &time:"
 msgstr "加速时间(&T)："
 
-#: mouse.cpp:326
+#: mouse.cpp:356
 msgid "Ma&ximum speed:"
 msgstr "最大速度(&X)："
 
-#: mouse.cpp:328
+#: mouse.cpp:358
 msgid " pixel/sec"
 msgstr " 像素/秒"
 
-#: mouse.cpp:334
+#: mouse.cpp:364
 msgid "Acceleration &profile:"
 msgstr "加速曲线参数(&P)："
 
-#: mouse.cpp:407
+#: mouse.cpp:437
 msgid "Mouse"
 msgstr "鼠标"
 
-#: mouse.cpp:408
+#: mouse.cpp:438
 msgid "(c) 1997 - 2005 Mouse developers"
 msgstr "(c) 1997 - 2005 鼠标开发者"
 
-#: mouse.cpp:710 mouse.cpp:715
+#: mouse.cpp:765 mouse.cpp:770
 msgid ""
 "_n:  pixel\n"
 " pixels"
 msgstr " 像素"
 
-#: mouse.cpp:720
+#: mouse.cpp:775
 msgid ""
 "_n:  line\n"
 " lines"
@@ -456,19 +472,19 @@ msgstr "第二频道"
 msgid "Select the cursor theme you want to use:"
 msgstr "选择您想要使用的光标主题："
 
-#: core/themepage.cpp:66 xcursor/themepage.cpp:93
+#: core/themepage.cpp:66 xcursor/themepage.cpp:100
 msgid "Name"
 msgstr "名称"
 
-#: core/themepage.cpp:67 xcursor/themepage.cpp:94
+#: core/themepage.cpp:67 xcursor/themepage.cpp:101
 msgid "Description"
 msgstr "描述"
 
-#: core/themepage.cpp:105 xcursor/themepage.cpp:139
+#: core/themepage.cpp:105 xcursor/themepage.cpp:146
 msgid "You have to restart TDE for these changes to take effect."
 msgstr "要让这些更改生效，您必须重新启动 TDE。"
 
-#: core/themepage.cpp:106 xcursor/themepage.cpp:140
+#: core/themepage.cpp:106 xcursor/themepage.cpp:147
 msgid "Cursor Settings Changed"
 msgstr "光标设置已更改"
 
@@ -504,74 +520,78 @@ msgstr "大白光标"
 msgid "Large white cursors"
 msgstr "大白光标"
 
-#: xcursor/themepage.cpp:84
+#: xcursor/themepage.cpp:79
+msgid "XFree theme %1 - incomplete for TDE"
+msgstr ""
+
+#: xcursor/themepage.cpp:80
+msgid "No description available"
+msgstr "没有可用的描述"
+
+#: xcursor/themepage.cpp:91
 msgid "Select the cursor theme you want to use (hover preview to test cursor):"
 msgstr "选择您想要使用的鼠标指针主题(指向预览可测试指针)："
 
-#: xcursor/themepage.cpp:104
+#: xcursor/themepage.cpp:111
 msgid "Install New Theme..."
 msgstr "安装新主题..."
 
-#: xcursor/themepage.cpp:105
+#: xcursor/themepage.cpp:112
 msgid "Remove Theme"
 msgstr "删除主题"
 
-#: xcursor/themepage.cpp:212
+#: xcursor/themepage.cpp:219
 msgid "Drag or Type Theme URL"
 msgstr "拖曳或输入主题 URL"
 
-#: xcursor/themepage.cpp:221
+#: xcursor/themepage.cpp:228
 #, c-format
 msgid "Unable to find the cursor theme archive %1."
 msgstr "找不到光标主题存档 %1。"
 
-#: xcursor/themepage.cpp:223
+#: xcursor/themepage.cpp:230
 msgid ""
 "Unable to download the cursor theme archive; please check that the address %1 "
 "is correct."
 msgstr "无法下载光标主题存档；请检查地址 %1 是否正确。"
 
-#: xcursor/themepage.cpp:231
+#: xcursor/themepage.cpp:238
 msgid "The file %1 does not appear to be a valid cursor theme archive."
 msgstr "文件 %1 好像不是有效的光标主题存档。"
 
-#: xcursor/themepage.cpp:240
+#: xcursor/themepage.cpp:247
 msgid ""
 "<qt>Are you sure you want to remove the <strong>%1</strong> cursor theme?"
 "<br>This will delete all the files installed by this theme.</qt>"
 msgstr "<qt>您确定要删除 <strong>%1</strong> 光标主题吗？<br>这将删除此主题安装的全部文件。</qt>"
 
-#: xcursor/themepage.cpp:246
+#: xcursor/themepage.cpp:253
 msgid "Confirmation"
 msgstr "确认"
 
-#: xcursor/themepage.cpp:300
+#: xcursor/themepage.cpp:307
 msgid ""
 "A theme named %1 already exists in your icon theme folder. Do you want replace "
 "it with this one?"
 msgstr "已经在您的图标主题文件夹中存在名为 %1 的主题。您是否想要将其覆盖？"
 
-#: xcursor/themepage.cpp:302
+#: xcursor/themepage.cpp:309
 msgid "Overwrite Theme?"
 msgstr "覆盖主题吗？"
 
-#: xcursor/themepage.cpp:336 xcursor/themepage.cpp:483
-msgid "No description available"
-msgstr "没有可用的描述"
-
-#: xcursor/themepage.cpp:537
+#: xcursor/themepage.cpp:544
 msgid "No theme"
 msgstr "无主题"
 
-#: xcursor/themepage.cpp:537
+#: xcursor/themepage.cpp:544
 msgid "The old classic X cursors"
 msgstr "旧的经典 X 光标"
 
-#: xcursor/themepage.cpp:539
+#: xcursor/themepage.cpp:546
 msgid "System theme"
 msgstr "系统主题"
 
-#: xcursor/themepage.cpp:539
+#: xcursor/themepage.cpp:546
 msgid "Do not change cursor theme"
 msgstr "不更改光标主题"
 
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmkclock.po b/tde-i18n-zh_CN/messages/tdebase/kcmkclock.po
index 9348f033b0c..987c0963c2d 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmkclock.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmkclock.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkclock\n"
-"POT-Creation-Date: 2005-12-17 03:07+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-01-05 00:16+0800\n"
 "Last-Translator: Xuedong Zhang <zxd@bu.edu>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmkded.po b/tde-i18n-zh_CN/messages/tdebase/kcmkded.po
index 6fc2b51094e..57cce00d8d8 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmkded.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmkded.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkded\n"
-"POT-Creation-Date: 2006-08-22 02:34+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-28 14:45+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,10 +39,11 @@ msgid "(c) 2002 Daniel Molkentin"
 msgstr "(C) 2002 Daniel Molkentin"
 
 #: kcmkded.cpp:59
+#, fuzzy
 msgid ""
 "<h1>Service Manager</h1>"
-"<p>This module allows you to have an overview of all plugins of the TDE Daemon, "
-"also referred to as TDE Services. Generally, there are two types of service:</p>"
+"<p>This module allows you to have an overview of all plugins running as TDE "
+"Services. Generally, there are two types of service:</p>"
 "<ul>"
 "<li>Services invoked at startup</li>"
 "<li>Services called on demand</li></ul>"
@@ -109,7 +111,8 @@ msgid "Start"
 msgstr "启动"
 
 #: kcmkded.cpp:237 kcmkded.cpp:328
-msgid "Unable to contact TDED."
+#, fuzzy
+msgid "Unable to contact KDED."
 msgstr "无法联系 TDED。"
 
 #: kcmkded.cpp:322
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmkeys.po b/tde-i18n-zh_CN/messages/tdebase/kcmkeys.po
index 38a9ad15bf4..6d1223536ca 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmkeys.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmkeys.po
@@ -8,17 +8,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkeys\n"
-"POT-Creation-Date: 2006-08-22 02:34+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-22 12:41+0800\n"
 "Last-Translator: Funda Wang <fundawang@en2china.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Translator: Wang Jian <lark@linux.net.cn>\n"
 "X-Generator: KBabel 1.0\n"
 
-#: shortcuts.cpp:93
+#: shortcuts.cpp:96
 msgid ""
 "<h1>Key Bindings</h1> Using key bindings you can configure certain actions to "
 "be triggered when you press a key or a combination of keys, e.g. Ctrl+C is "
@@ -35,70 +36,74 @@ msgstr ""
 "<p>在“全局快捷键”里，您可以配置和程序无关的键盘关联，比如切换桌面或最大化窗口。在“应用程序快捷键”里，您将找到在应用程序里使用的典型绑定，比如“复制”和“"
 "粘贴”。"
 
-#: shortcuts.cpp:152
+#: shortcuts.cpp:157
 msgid ""
 "Click here to remove the selected key bindings scheme. You cannot remove the "
 "standard system-wide schemes 'Current scheme' and 'TDE default'."
 msgstr "单击此处删除选中的按键绑定方案。您无法删除标准的系统级方案“当前方案”和“TDE 默认方案”。"
 
-#: shortcuts.cpp:158
+#: shortcuts.cpp:163
 msgid "New scheme"
 msgstr "新方案"
 
-#: shortcuts.cpp:163
+#: shortcuts.cpp:168
 msgid "&Save..."
 msgstr "保存(&S)..."
 
-#: shortcuts.cpp:165
+#: shortcuts.cpp:170
 msgid ""
 "Click here to add a new key bindings scheme. You will be prompted for a name."
 msgstr "单击以添加新的按键绑定方案。您会被提示输入名字。"
 
-#: shortcuts.cpp:177
+#: shortcuts.cpp:195
+msgid "Use Win key as modifier (uncheck to bind Win key to Menu)"
+msgstr ""
+
+#: shortcuts.cpp:201
 msgid "&Global Shortcuts"
 msgstr "全局快捷键(&G)"
 
-#: shortcuts.cpp:182
+#: shortcuts.cpp:206
 msgid "Shortcut Se&quences"
 msgstr "快捷键序列(&Q)"
 
-#: shortcuts.cpp:187
+#: shortcuts.cpp:211
 msgid "App&lication Shortcuts"
 msgstr "应用程序快捷键(&L)"
 
-#: shortcuts.cpp:248
+#: shortcuts.cpp:272
 msgid "User-Defined Scheme"
 msgstr "用户定义方案"
 
-#: shortcuts.cpp:249
+#: shortcuts.cpp:273
 msgid "Current Scheme"
 msgstr "当前方案"
 
-#: shortcuts.cpp:292
+#: shortcuts.cpp:316
 msgid ""
 "Your current changes will be lost if you load another scheme before saving this "
 "one."
 msgstr "在保存之前您装载另外一个方案的话，您当前的改变 将丢失。"
 
-#: shortcuts.cpp:312
+#: shortcuts.cpp:336
 msgid ""
 "This scheme requires the \"%1\" modifier key, which is not available on your "
 "keyboard layout. Do you wish to view it anyway?"
 msgstr "此方案需要修饰键“%1”，但该键在您的键盘布局上是没有用的。您确实想查看它吗？"
 
-#: modifiers.cpp:194 modifiers.cpp:290 shortcuts.cpp:314
+#: modifiers.cpp:195 modifiers.cpp:291 shortcuts.cpp:338
 msgid "Win"
 msgstr "Win"
 
-#: shortcuts.cpp:341 shortcuts.cpp:374
+#: shortcuts.cpp:365 shortcuts.cpp:398
 msgid "Save Key Scheme"
 msgstr "保存按键方案"
 
-#: shortcuts.cpp:342
+#: shortcuts.cpp:366
 msgid "Enter a name for the key scheme:"
 msgstr "为按键方案输入一个名称："
 
-#: shortcuts.cpp:372
+#: shortcuts.cpp:396
 msgid ""
 "A key scheme with the name '%1' already exists;\n"
 "do you want to overwrite it?\n"
@@ -106,37 +111,31 @@ msgstr ""
 "名为“%1”的键盘方案已经存在；\n"
 "您要覆盖它吗？\n"
 
-#: shortcuts.cpp:375
+#: shortcuts.cpp:399
 msgid "Overwrite"
 msgstr "覆盖"
 
-#: modifiers.cpp:174
+#: modifiers.cpp:175
 msgid "TDE Modifiers"
 msgstr "TDE 修饰键"
 
-#: modifiers.cpp:177
+#: modifiers.cpp:178
 msgid "Modifier"
 msgstr "修饰键"
 
-#: modifiers.cpp:182 modifiers.cpp:235
+#: modifiers.cpp:183 modifiers.cpp:236
 msgid "X11-Mod"
 msgstr "X11-Mod"
 
-#: modifiers.cpp:188 modifiers.cpp:288
-msgid ""
-"_: QAccel\n"
-"Ctrl"
-msgstr "Ctrl"
-
-#: modifiers.cpp:207
+#: modifiers.cpp:208
 msgid "Macintosh keyboard"
 msgstr "Macintosh 键盘"
 
-#: modifiers.cpp:212
+#: modifiers.cpp:213
 msgid "MacOS-style modifier usage"
 msgstr "MacOS 风格的修改键用法"
 
-#: modifiers.cpp:215
+#: modifiers.cpp:216
 msgid ""
 "Checking this box will change your X Modifier Mapping to better reflect the "
 "standard MacOS modifier key usage. It allows you to use <i>Command+C</i> for <i>"
@@ -149,32 +148,32 @@ msgstr ""
 "，而不是标准的 PC 用法<i>Ctrl+C</i>。<b>Command</b> 将用于应用程序和控制台命令，<b>Option</b> "
 "将用于命令修改键以及导航菜单和对话框，而 <b>Control</b> 用于窗口管理命令。"
 
-#: modifiers.cpp:228
+#: modifiers.cpp:229
 msgid "X Modifier Mapping"
 msgstr "X-Window修饰键映射"
 
-#: modifiers.cpp:278 modifiers.cpp:284 treeview.cpp:108
+#: modifiers.cpp:279 modifiers.cpp:285 treeview.cpp:108
 msgid "Command"
 msgstr "Command"
 
-#: modifiers.cpp:279 modifiers.cpp:283
+#: modifiers.cpp:280 modifiers.cpp:284
 msgid "Option"
 msgstr "Option"
 
-#: modifiers.cpp:280 modifiers.cpp:282
+#: modifiers.cpp:281 modifiers.cpp:283
 msgid "Control"
 msgstr "Control"
 
-#: modifiers.cpp:297
+#: modifiers.cpp:298
 #, c-format
 msgid "Key %1"
 msgstr "按键 %1"
 
-#: modifiers.cpp:330
+#: modifiers.cpp:331
 msgid "None"
 msgstr "无"
 
-#: modifiers.cpp:343
+#: modifiers.cpp:344
 msgid ""
 "You can only activate this option if your X keyboard layout has the 'Super' or "
 "'Meta' keys properly configured as modifier keys."
@@ -299,366 +298,466 @@ msgid "Walk Through Windows (Reverse)"
 msgstr "遍历窗口(反向)"
 
 #: ../../twin/twinbindings.cpp:23
+#, fuzzy
+msgid "Walk Through Windows of Same Application"
+msgstr "遍历窗口"
+
+#: ../../twin/twinbindings.cpp:24
+#, fuzzy
+msgid "Walk Through Windows of Same Application (Reverse)"
+msgstr "遍历窗口(反向)"
+
+#: ../../twin/twinbindings.cpp:25
 msgid "Walk Through Desktops"
 msgstr "遍历桌面"
 
-#: ../../twin/twinbindings.cpp:24
+#: ../../twin/twinbindings.cpp:26
 msgid "Walk Through Desktops (Reverse)"
 msgstr "遍历桌面(反向)"
 
-#: ../../twin/twinbindings.cpp:25
+#: ../../twin/twinbindings.cpp:27
 msgid "Walk Through Desktop List"
 msgstr "遍历桌面列表"
 
-#: ../../twin/twinbindings.cpp:26
+#: ../../twin/twinbindings.cpp:28
 msgid "Walk Through Desktop List (Reverse)"
 msgstr "遍历桌面列表(反向)"
 
-#: ../../twin/twinbindings.cpp:28
+#: ../../twin/twinbindings.cpp:30
 msgid "Windows"
 msgstr "窗口"
 
-#: ../../twin/twinbindings.cpp:29
+#: ../../twin/twinbindings.cpp:31
 msgid "Window Operations Menu"
 msgstr "窗口操作菜单"
 
-#: ../../twin/twinbindings.cpp:30
+#: ../../twin/twinbindings.cpp:32
 msgid "Close Window"
 msgstr "关闭窗口"
 
-#: ../../twin/twinbindings.cpp:32
+#: ../../twin/twinbindings.cpp:34
 msgid "Maximize Window"
 msgstr "最大化窗口"
 
-#: ../../twin/twinbindings.cpp:34
+#: ../../twin/twinbindings.cpp:36
 msgid "Maximize Window Vertically"
 msgstr "垂直最大化窗口"
 
-#: ../../twin/twinbindings.cpp:36
+#: ../../twin/twinbindings.cpp:38
 msgid "Maximize Window Horizontally"
 msgstr "水平最大化窗口"
 
-#: ../../twin/twinbindings.cpp:38
+#: ../../twin/twinbindings.cpp:40
 msgid "Minimize Window"
 msgstr "最小化窗口"
 
-#: ../../twin/twinbindings.cpp:40
+#: ../../twin/twinbindings.cpp:42
 msgid "Shade Window"
 msgstr "卷起窗口"
 
-#: ../../twin/twinbindings.cpp:42
+#: ../../twin/twinbindings.cpp:44
 msgid "Move Window"
 msgstr "移动窗口"
 
-#: ../../twin/twinbindings.cpp:44
+#: ../../twin/twinbindings.cpp:46
 msgid "Resize Window"
 msgstr "更改窗口大小"
 
-#: ../../twin/twinbindings.cpp:46
+#: ../../twin/twinbindings.cpp:48
 msgid "Raise Window"
 msgstr "升起窗口"
 
-#: ../../twin/twinbindings.cpp:48
+#: ../../twin/twinbindings.cpp:50
 msgid "Lower Window"
 msgstr "降低窗口"
 
-#: ../../twin/twinbindings.cpp:50
+#: ../../twin/twinbindings.cpp:52
 msgid "Toggle Window Raise/Lower"
 msgstr "窗口置前或置后"
 
-#: ../../twin/twinbindings.cpp:51
+#: ../../twin/twinbindings.cpp:53
 msgid "Make Window Fullscreen"
 msgstr "将窗口放至全屏"
 
-#: ../../twin/twinbindings.cpp:53
+#: ../../twin/twinbindings.cpp:55
 msgid "Hide Window Border"
 msgstr "隐藏窗口边框"
 
-#: ../../twin/twinbindings.cpp:55
+#: ../../twin/twinbindings.cpp:57
 msgid "Keep Window Above Others"
 msgstr "让窗口常居顶端"
 
-#: ../../twin/twinbindings.cpp:57
+#: ../../twin/twinbindings.cpp:59
 msgid "Keep Window Below Others"
 msgstr "让窗口常居底端"
 
-#: ../../twin/twinbindings.cpp:59
+#: ../../twin/twinbindings.cpp:61
 msgid "Activate Window Demanding Attention"
 msgstr "激活请求注意的窗口"
 
-#: ../../twin/twinbindings.cpp:60
+#: ../../twin/twinbindings.cpp:62
 msgid "Setup Window Shortcut"
 msgstr "设置窗口快捷键"
 
-#: ../../twin/twinbindings.cpp:61
+#: ../../twin/twinbindings.cpp:63
 msgid "Pack Window to the Right"
 msgstr "将窗口推至右侧"
 
-#: ../../twin/twinbindings.cpp:63
+#: ../../twin/twinbindings.cpp:65
 msgid "Pack Window to the Left"
 msgstr "将窗口推至左侧"
 
-#: ../../twin/twinbindings.cpp:65
+#: ../../twin/twinbindings.cpp:67
 msgid "Pack Window Up"
 msgstr "将窗口推至上侧"
 
-#: ../../twin/twinbindings.cpp:67
+#: ../../twin/twinbindings.cpp:69
 msgid "Pack Window Down"
 msgstr "将窗口推至下侧"
 
-#: ../../twin/twinbindings.cpp:69
+#: ../../twin/twinbindings.cpp:71
 msgid "Pack Grow Window Horizontally"
 msgstr "将窗口水平扩展"
 
-#: ../../twin/twinbindings.cpp:71
+#: ../../twin/twinbindings.cpp:73
 msgid "Pack Grow Window Vertically"
 msgstr "将窗口垂直扩展"
 
-#: ../../twin/twinbindings.cpp:73
+#: ../../twin/twinbindings.cpp:75
 msgid "Pack Shrink Window Horizontally"
 msgstr "将窗口水平收缩"
 
-#: ../../twin/twinbindings.cpp:75
+#: ../../twin/twinbindings.cpp:77
 msgid "Pack Shrink Window Vertically"
 msgstr "将窗口垂直收缩"
 
-#: ../../twin/twinbindings.cpp:78
+#: ../../twin/twinbindings.cpp:80
 msgid "Window & Desktop"
 msgstr "窗口和桌面"
 
-#: ../../twin/twinbindings.cpp:79
+#: ../../twin/twinbindings.cpp:81
 msgid "Keep Window on All Desktops"
 msgstr "将窗口放到全部桌面"
 
-#: ../../twin/twinbindings.cpp:81
+#: ../../twin/twinbindings.cpp:83
 msgid "Window to Desktop 1"
 msgstr "窗口到桌面 1"
 
-#: ../../twin/twinbindings.cpp:82
+#: ../../twin/twinbindings.cpp:84
 msgid "Window to Desktop 2"
 msgstr "窗口到桌面 2"
 
-#: ../../twin/twinbindings.cpp:83
+#: ../../twin/twinbindings.cpp:85
 msgid "Window to Desktop 3"
 msgstr "窗口到桌面 3"
 
-#: ../../twin/twinbindings.cpp:84
+#: ../../twin/twinbindings.cpp:86
 msgid "Window to Desktop 4"
 msgstr "窗口到桌面 4"
 
-#: ../../twin/twinbindings.cpp:85
+#: ../../twin/twinbindings.cpp:87
 msgid "Window to Desktop 5"
 msgstr "窗口到桌面 5"
 
-#: ../../twin/twinbindings.cpp:86
+#: ../../twin/twinbindings.cpp:88
 msgid "Window to Desktop 6"
 msgstr "窗口到桌面 6"
 
-#: ../../twin/twinbindings.cpp:87
+#: ../../twin/twinbindings.cpp:89
 msgid "Window to Desktop 7"
 msgstr "窗口到桌面 7"
 
-#: ../../twin/twinbindings.cpp:88
+#: ../../twin/twinbindings.cpp:90
 msgid "Window to Desktop 8"
 msgstr "窗口到桌面 8"
 
-#: ../../twin/twinbindings.cpp:89
+#: ../../twin/twinbindings.cpp:91
 msgid "Window to Desktop 9"
 msgstr "窗口到桌面 9"
 
-#: ../../twin/twinbindings.cpp:90
+#: ../../twin/twinbindings.cpp:92
 msgid "Window to Desktop 10"
 msgstr "窗口到桌面 10"
 
-#: ../../twin/twinbindings.cpp:91
+#: ../../twin/twinbindings.cpp:93
 msgid "Window to Desktop 11"
 msgstr "窗口到桌面 11"
 
-#: ../../twin/twinbindings.cpp:92
+#: ../../twin/twinbindings.cpp:94
 msgid "Window to Desktop 12"
 msgstr "窗口到桌面 12"
 
-#: ../../twin/twinbindings.cpp:93
+#: ../../twin/twinbindings.cpp:95
 msgid "Window to Desktop 13"
 msgstr "窗口到桌面 13"
 
-#: ../../twin/twinbindings.cpp:94
+#: ../../twin/twinbindings.cpp:96
 msgid "Window to Desktop 14"
 msgstr "窗口到桌面 14"
 
-#: ../../twin/twinbindings.cpp:95
+#: ../../twin/twinbindings.cpp:97
 msgid "Window to Desktop 15"
 msgstr "窗口到桌面 15"
 
-#: ../../twin/twinbindings.cpp:96
+#: ../../twin/twinbindings.cpp:98
 msgid "Window to Desktop 16"
 msgstr "窗口到桌面 16"
 
-#: ../../twin/twinbindings.cpp:97
+#: ../../twin/twinbindings.cpp:99
 msgid "Window to Desktop 17"
 msgstr "窗口到桌面 17"
 
-#: ../../twin/twinbindings.cpp:98
+#: ../../twin/twinbindings.cpp:100
 msgid "Window to Desktop 18"
 msgstr "窗口到桌面 18"
 
-#: ../../twin/twinbindings.cpp:99
+#: ../../twin/twinbindings.cpp:101
 msgid "Window to Desktop 19"
 msgstr "窗口到桌面 19"
 
-#: ../../twin/twinbindings.cpp:100
+#: ../../twin/twinbindings.cpp:102
 msgid "Window to Desktop 20"
 msgstr "窗口到桌面 20"
 
-#: ../../twin/twinbindings.cpp:101
+#: ../../twin/twinbindings.cpp:103
 msgid "Window to Next Desktop"
 msgstr "窗口到后一桌面"
 
-#: ../../twin/twinbindings.cpp:102
+#: ../../twin/twinbindings.cpp:104
 msgid "Window to Previous Desktop"
 msgstr "窗口到前一桌面"
 
-#: ../../twin/twinbindings.cpp:103
+#: ../../twin/twinbindings.cpp:105
 msgid "Window One Desktop to the Right"
 msgstr "窗口右移一个桌面"
 
-#: ../../twin/twinbindings.cpp:104
+#: ../../twin/twinbindings.cpp:106
 msgid "Window One Desktop to the Left"
 msgstr "窗口左移一个桌面"
 
-#: ../../twin/twinbindings.cpp:105
+#: ../../twin/twinbindings.cpp:107
 msgid "Window One Desktop Up"
 msgstr "窗口上移一个桌面"
 
-#: ../../twin/twinbindings.cpp:106
+#: ../../twin/twinbindings.cpp:108
 msgid "Window One Desktop Down"
 msgstr "切换下移一个桌面"
 
-#: ../../twin/twinbindings.cpp:108
+#: ../../twin/twinbindings.cpp:109
+#, fuzzy
+msgid "Window to Screen 0"
+msgstr "窗口抓图"
+
+#: ../../twin/twinbindings.cpp:110
+#, fuzzy
+msgid "Window to Screen 1"
+msgstr "窗口抓图"
+
+#: ../../twin/twinbindings.cpp:111
+#, fuzzy
+msgid "Window to Screen 2"
+msgstr "窗口抓图"
+
+#: ../../twin/twinbindings.cpp:112
+#, fuzzy
+msgid "Window to Screen 3"
+msgstr "窗口抓图"
+
+#: ../../twin/twinbindings.cpp:113
+#, fuzzy
+msgid "Window to Screen 4"
+msgstr "窗口抓图"
+
+#: ../../twin/twinbindings.cpp:114
+#, fuzzy
+msgid "Window to Screen 5"
+msgstr "窗口抓图"
+
+#: ../../twin/twinbindings.cpp:115
+#, fuzzy
+msgid "Window to Screen 6"
+msgstr "窗口抓图"
+
+#: ../../twin/twinbindings.cpp:116
+#, fuzzy
+msgid "Window to Screen 7"
+msgstr "窗口抓图"
+
+#: ../../twin/twinbindings.cpp:117
+#, fuzzy
+msgid "Window to Next Screen"
+msgstr "窗口到后一桌面"
+
+#: ../../twin/twinbindings.cpp:119
 msgid "Desktop Switching"
 msgstr "桌面切换"
 
-#: ../../twin/twinbindings.cpp:109
+#: ../../twin/twinbindings.cpp:120
 msgid "Switch to Desktop 1"
 msgstr "切换到桌面 1"
 
-#: ../../twin/twinbindings.cpp:110
+#: ../../twin/twinbindings.cpp:121
 msgid "Switch to Desktop 2"
 msgstr "切换到桌面 2"
 
-#: ../../twin/twinbindings.cpp:111
+#: ../../twin/twinbindings.cpp:122
 msgid "Switch to Desktop 3"
 msgstr "切换到桌面 3"
 
-#: ../../twin/twinbindings.cpp:112
+#: ../../twin/twinbindings.cpp:123
 msgid "Switch to Desktop 4"
 msgstr "切换到桌面 4"
 
-#: ../../twin/twinbindings.cpp:113
+#: ../../twin/twinbindings.cpp:124
 msgid "Switch to Desktop 5"
 msgstr "切换到桌面 5"
 
-#: ../../twin/twinbindings.cpp:114
+#: ../../twin/twinbindings.cpp:125
 msgid "Switch to Desktop 6"
 msgstr "切换到桌面 6"
 
-#: ../../twin/twinbindings.cpp:115
+#: ../../twin/twinbindings.cpp:126
 msgid "Switch to Desktop 7"
 msgstr "切换到桌面 7"
 
-#: ../../twin/twinbindings.cpp:116
+#: ../../twin/twinbindings.cpp:127
 msgid "Switch to Desktop 8"
 msgstr "切换到桌面 8"
 
-#: ../../twin/twinbindings.cpp:117
+#: ../../twin/twinbindings.cpp:128
 msgid "Switch to Desktop 9"
 msgstr "切换到桌面 9"
 
-#: ../../twin/twinbindings.cpp:118
+#: ../../twin/twinbindings.cpp:129
 msgid "Switch to Desktop 10"
 msgstr "切换到桌面 10"
 
-#: ../../twin/twinbindings.cpp:119
+#: ../../twin/twinbindings.cpp:130
 msgid "Switch to Desktop 11"
 msgstr "切换到桌面 11"
 
-#: ../../twin/twinbindings.cpp:120
+#: ../../twin/twinbindings.cpp:131
 msgid "Switch to Desktop 12"
 msgstr "切换到桌面 12"
 
-#: ../../twin/twinbindings.cpp:121
+#: ../../twin/twinbindings.cpp:132
 msgid "Switch to Desktop 13"
 msgstr "切换到桌面 13"
 
-#: ../../twin/twinbindings.cpp:122
+#: ../../twin/twinbindings.cpp:133
 msgid "Switch to Desktop 14"
 msgstr "切换到桌面 14"
 
-#: ../../twin/twinbindings.cpp:123
+#: ../../twin/twinbindings.cpp:134
 msgid "Switch to Desktop 15"
 msgstr "切换到桌面 15"
 
-#: ../../twin/twinbindings.cpp:124
+#: ../../twin/twinbindings.cpp:135
 msgid "Switch to Desktop 16"
 msgstr "切换到桌面 16"
 
-#: ../../twin/twinbindings.cpp:125
+#: ../../twin/twinbindings.cpp:136
 msgid "Switch to Desktop 17"
 msgstr "切换到桌面 17"
 
-#: ../../twin/twinbindings.cpp:126
+#: ../../twin/twinbindings.cpp:137
 msgid "Switch to Desktop 18"
 msgstr "切换到桌面 18"
 
-#: ../../twin/twinbindings.cpp:127
+#: ../../twin/twinbindings.cpp:138
 msgid "Switch to Desktop 19"
 msgstr "切换到桌面 19"
 
-#: ../../twin/twinbindings.cpp:128
+#: ../../twin/twinbindings.cpp:139
 msgid "Switch to Desktop 20"
 msgstr "切换到桌面 20"
 
-#: ../../twin/twinbindings.cpp:129
+#: ../../twin/twinbindings.cpp:140
 msgid "Switch to Next Desktop"
 msgstr "切换到后一桌面"
 
-#: ../../twin/twinbindings.cpp:130
+#: ../../twin/twinbindings.cpp:141
 msgid "Switch to Previous Desktop"
 msgstr "切换到前一桌面"
 
-#: ../../twin/twinbindings.cpp:131
+#: ../../twin/twinbindings.cpp:142
 msgid "Switch One Desktop to the Right"
 msgstr "切换到右边桌面"
 
-#: ../../twin/twinbindings.cpp:132
+#: ../../twin/twinbindings.cpp:143
 msgid "Switch One Desktop to the Left"
 msgstr "切换到左边桌面"
 
-#: ../../twin/twinbindings.cpp:133
+#: ../../twin/twinbindings.cpp:144
 msgid "Switch One Desktop Up"
 msgstr "切换到上面的桌面"
 
-#: ../../twin/twinbindings.cpp:134
+#: ../../twin/twinbindings.cpp:145
 msgid "Switch One Desktop Down"
 msgstr "切换到下面的桌面"
 
-#: ../../twin/twinbindings.cpp:137
+#: ../../twin/twinbindings.cpp:146
+#, fuzzy
+msgid "Switch to Screen 0"
+msgstr "切换到桌面 10"
+
+#: ../../twin/twinbindings.cpp:147
+#, fuzzy
+msgid "Switch to Screen 1"
+msgstr "切换到桌面 1"
+
+#: ../../twin/twinbindings.cpp:148
+#, fuzzy
+msgid "Switch to Screen 2"
+msgstr "切换到桌面 2"
+
+#: ../../twin/twinbindings.cpp:149
+#, fuzzy
+msgid "Switch to Screen 3"
+msgstr "切换到桌面 3"
+
+#: ../../twin/twinbindings.cpp:150
+#, fuzzy
+msgid "Switch to Screen 4"
+msgstr "切换到桌面 4"
+
+#: ../../twin/twinbindings.cpp:151
+#, fuzzy
+msgid "Switch to Screen 5"
+msgstr "切换到桌面 5"
+
+#: ../../twin/twinbindings.cpp:152
+#, fuzzy
+msgid "Switch to Screen 6"
+msgstr "切换到桌面 6"
+
+#: ../../twin/twinbindings.cpp:153
+#, fuzzy
+msgid "Switch to Screen 7"
+msgstr "切换到桌面 7"
+
+#: ../../twin/twinbindings.cpp:154
+#, fuzzy
+msgid "Switch to Next Screen"
+msgstr "切换到后一桌面"
+
+#: ../../twin/twinbindings.cpp:157
 msgid "Mouse Emulation"
 msgstr "鼠标仿真"
 
-#: ../../twin/twinbindings.cpp:138
+#: ../../twin/twinbindings.cpp:158
 msgid "Kill Window"
 msgstr "杀死窗口"
 
-#: ../../twin/twinbindings.cpp:139
+#: ../../twin/twinbindings.cpp:159
 msgid "Window Screenshot"
 msgstr "窗口抓图"
 
-#: ../../twin/twinbindings.cpp:140
+#: ../../twin/twinbindings.cpp:160
 msgid "Desktop Screenshot"
 msgstr "桌面抓图"
 
-#: ../../twin/twinbindings.cpp:145
+#: ../../twin/twinbindings.cpp:165
 msgid "Block Global Shortcuts"
 msgstr "屏蔽全局快捷键"
 
@@ -706,19 +805,28 @@ msgstr "切换用户"
 msgid "Lock Session"
 msgstr "锁住会话"
 
-#: ../../kdesktop/kdesktopbindings.cpp:37
+#: ../../kdesktop/kdesktopbindings.cpp:32
+#, fuzzy
+msgid "Lock Session (Hotkey)"
+msgstr "锁住会话"
+
+#: ../../kdesktop/kdesktopbindings.cpp:38
+msgid "Start Screen Saver"
+msgstr ""
+
+#: ../../kdesktop/kdesktopbindings.cpp:44
 msgid "Log Out"
 msgstr "注销"
 
-#: ../../kdesktop/kdesktopbindings.cpp:38
+#: ../../kdesktop/kdesktopbindings.cpp:45
 msgid "Log Out Without Confirmation"
 msgstr "不加确认注销"
 
-#: ../../kdesktop/kdesktopbindings.cpp:39
+#: ../../kdesktop/kdesktopbindings.cpp:46
 msgid "Halt without Confirmation"
 msgstr "不加确认关机"
 
-#: ../../kdesktop/kdesktopbindings.cpp:40
+#: ../../kdesktop/kdesktopbindings.cpp:47
 msgid "Reboot without Confirmation"
 msgstr "不加确认重新启动"
 
@@ -745,3 +853,8 @@ msgstr "键盘"
 #: ../../kxkb/kxkbbindings.cpp:10
 msgid "Switch to Next Keyboard Layout"
 msgstr "切换到下一个键盘布局"
+
+#~ msgid ""
+#~ "_: QAccel\n"
+#~ "Ctrl"
+#~ msgstr "Ctrl"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmkicker.po b/tde-i18n-zh_CN/messages/tdebase/kcmkicker.po
index 3a4ec3e1d08..2340edf2e55 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmkicker.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmkicker.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-06-11 13:56+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -93,21 +94,21 @@ msgstr ""
 msgid "Main Panel"
 msgstr "主面板"
 
-#. i18n: file hidingtab.ui line 371
-#: hidingtab_impl.cpp:216 rc.cpp:197
+#. i18n: file hidingtab.ui line 385
+#: hidingtab_impl.cpp:222 rc.cpp:224
 #, no-c-format
 msgid "Show left panel-hiding bu&tton"
 msgstr "显示左面板的隐藏按钮(&T)"
 
-#: hidingtab_impl.cpp:217
+#: hidingtab_impl.cpp:223
 msgid "Show right panel-hiding bu&tton"
 msgstr "显示右面板的隐藏按钮(&B)"
 
-#: hidingtab_impl.cpp:221
+#: hidingtab_impl.cpp:227
 msgid "Show top panel-hiding bu&tton"
 msgstr "显示上面板的隐藏按钮(&T)"
 
-#: hidingtab_impl.cpp:222
+#: hidingtab_impl.cpp:228
 msgid "Show bottom panel-hiding bu&tton"
 msgstr "显示下面板的隐藏按钮(&T)"
 
@@ -127,11 +128,11 @@ msgstr ""
 "%1\n"
 "%2"
 
-#: lookandfeeltab_kcm.cpp:36 main.cpp:346
+#: lookandfeeltab_kcm.cpp:36 main.cpp:358
 msgid "kcmkicker"
 msgstr "kcmkicker"
 
-#: lookandfeeltab_kcm.cpp:36 main.cpp:347
+#: lookandfeeltab_kcm.cpp:36 main.cpp:359
 msgid "TDE Panel Control Module"
 msgstr "TDE 面板控制模块"
 
@@ -143,7 +144,7 @@ msgstr ""
 "(C) 1999 - 2001 Matthias Elter\n"
 "(c) 2002 Aaron J. Seigo"
 
-#: lookandfeeltab_kcm.cpp:86 main.cpp:333
+#: lookandfeeltab_kcm.cpp:86 main.cpp:345
 msgid ""
 "<h1>Panel</h1> Here you can configure the TDE panel (also referred to as "
 "'kicker'). This includes options like the position and size of the panel, as "
@@ -156,19 +157,21 @@ msgstr ""
 "<h1>面板</h1>您可以配置 TDE 面板(也称为“kicker”)。这包括面板的位置和大小选项，还有它的自动隐藏行为和外观。"
 "<p> 注意您也可以通过直接点击面板(例如用鼠标左键拖动它，或使用右键的即时菜单)来访问这些选项。该即时菜单也可以让您控制面板的按钮和小程序。"
 
-#: main.cpp:349
+#: main.cpp:361
+#, fuzzy
 msgid ""
+"(c) 2009 - 2010 Timothy Pearson\n"
 "(c) 1999 - 2001 Matthias Elter\n"
 "(c) 2002 - 2003 Aaron J. Seigo"
 msgstr ""
 "(c) 1999 - 2001 Matthias Elter\n"
 "(c) 2002 - 2003 Aaron J. Seigo"
 
-#: menutab_impl.cpp:99
+#: menutab_impl.cpp:129
 msgid "Quick Browser"
 msgstr "快捷浏览"
 
-#: menutab_impl.cpp:177
+#: menutab_impl.cpp:311
 msgid ""
 "The TDE menu editor (kmenuedit) could not be launched.\n"
 "Perhaps it is not installed or not in your path."
@@ -176,7 +179,7 @@ msgstr ""
 "TDE 菜单编辑器 (kmenuedit) 无法启动。\n"
 "可能它没有安装或者不在您的执行路径上。"
 
-#: menutab_impl.cpp:179
+#: menutab_impl.cpp:313
 msgid "Application Missing"
 msgstr "程序找不到"
 
@@ -233,7 +236,7 @@ msgid "All Screens"
 msgstr "全部屏幕"
 
 #. i18n: file positiontab.ui line 412
-#: positiontab_impl.cpp:535 rc.cpp:528
+#: positiontab_impl.cpp:535 rc.cpp:618
 #, no-c-format
 msgid "Custom"
 msgstr "自定义"
@@ -259,7 +262,7 @@ msgid ""
 msgstr "这个选项指定面板上隐藏按钮显示的大小。"
 
 #. i18n: file advancedOptions.ui line 52
-#: rc.cpp:12 rc.cpp:534
+#: rc.cpp:12 rc.cpp:624
 #, no-c-format
 msgid " pixels"
 msgstr " 像素"
@@ -394,80 +397,126 @@ msgstr ""
 "通常情况下，如果您在屏幕最上方将桌面或当前应用程序的菜单栏显示为面板的话(MacOS "
 "样式)，该面板的透明样式是被禁用的，这样可以避免背景干扰菜单栏。设定此选项将使得该面板也透明。"
 
-#. i18n: file applettab.ui line 24
+#. i18n: file advancedOptions.ui line 304
 #: rc.cpp:86
 #, no-c-format
+msgid "Blur the background when transparency is enabled"
+msgstr ""
+
+#. i18n: file advancedOptions.ui line 307
+#: rc.cpp:89
+#, no-c-format
+msgid ""
+"When checked, the displayed semi-transparent background image will be blurred "
+"to reduce eyestrain"
+msgstr ""
+
+#. i18n: file advancedOptions.ui line 317
+#: rc.cpp:92
+#, no-c-format
+msgid "Texture"
+msgstr ""
+
+#. i18n: file advancedOptions.ui line 328
+#: rc.cpp:95
+#, no-c-format
+msgid "Show resize handle on panels"
+msgstr ""
+
+#. i18n: file advancedOptions.ui line 331
+#: rc.cpp:98
+#, no-c-format
+msgid ""
+"Enabling this option will show a resize handle on the resizable end of each "
+"panel."
+msgstr ""
+
+#. i18n: file advancedOptions.ui line 339
+#: rc.cpp:101
+#, no-c-format
+msgid "Use deep buttons"
+msgstr ""
+
+#. i18n: file advancedOptions.ui line 342
+#: rc.cpp:104
+#, no-c-format
+msgid "Enabling this option will yield more highly textured panels."
+msgstr ""
+
+#. i18n: file applettab.ui line 24
+#: rc.cpp:107
+#, no-c-format
 msgid "Security Level"
 msgstr "安全级别"
 
 #. i18n: file applettab.ui line 35
-#: rc.cpp:89
+#: rc.cpp:110
 #, no-c-format
 msgid "Load only trusted applets internal"
 msgstr "仅内部载入受信任的小程序"
 
 #. i18n: file applettab.ui line 43
-#: rc.cpp:92
+#: rc.cpp:113
 #, no-c-format
 msgid "Load startup config applets internal"
 msgstr "内部载入启动配置小程序"
 
 #. i18n: file applettab.ui line 51
-#: rc.cpp:95
+#: rc.cpp:116
 #, no-c-format
 msgid "Load all applets internal"
 msgstr "内部载入所有的小程序"
 
 #. i18n: file applettab.ui line 67
-#: rc.cpp:98
+#: rc.cpp:119
 #, no-c-format
 msgid "List of Trusted Applets"
 msgstr "受信任的小程序的列表"
 
 #. i18n: file applettab.ui line 84
-#: rc.cpp:101
+#: rc.cpp:122
 #, no-c-format
 msgid "Available Applets"
 msgstr "可用的小程序"
 
 #. i18n: file applettab.ui line 133
-#: rc.cpp:104
+#: rc.cpp:125
 #, no-c-format
 msgid ">>"
 msgstr ">>"
 
 #. i18n: file applettab.ui line 172
-#: rc.cpp:107
+#: rc.cpp:128
 #, no-c-format
 msgid "<<"
 msgstr "<<"
 
 #. i18n: file applettab.ui line 197
-#: rc.cpp:110
+#: rc.cpp:131
 #, no-c-format
 msgid "Trusted Applets"
 msgstr "信任的小程序"
 
 #. i18n: file hidingtab.ui line 44
-#: rc.cpp:113 rc.cpp:467
+#: rc.cpp:134 rc.cpp:557
 #, no-c-format
 msgid "S&ettings for:"
 msgstr "设置(&E)："
 
 #. i18n: file hidingtab.ui line 79
-#: rc.cpp:116
+#: rc.cpp:137
 #, no-c-format
 msgid "Hide Mode"
 msgstr "隐藏模式"
 
 #. i18n: file hidingtab.ui line 107
-#: rc.cpp:119
+#: rc.cpp:140
 #, no-c-format
 msgid "On&ly hide when a panel-hiding button is clicked"
 msgstr "点击隐藏按钮才隐藏(&L)"
 
 #. i18n: file hidingtab.ui line 113
-#: rc.cpp:122
+#: rc.cpp:143
 #, no-c-format
 msgid ""
 "If this option is selected, the only way to hide the panel will be to click on "
@@ -475,38 +524,38 @@ msgid ""
 msgstr "如果此项被选中，点击面板两端的隐藏按钮将是隐藏面板的唯一方式。"
 
 #. i18n: file hidingtab.ui line 138
-#: rc.cpp:125
+#: rc.cpp:146
 #, no-c-format
 msgid " sec"
 msgstr " 秒"
 
 #. i18n: file hidingtab.ui line 141
-#: rc.cpp:128
+#: rc.cpp:149
 #, no-c-format
 msgid "Immediately"
 msgstr "立刻隐藏"
 
 #. i18n: file hidingtab.ui line 144
-#: rc.cpp:131 rc.cpp:137
+#: rc.cpp:152 rc.cpp:158
 #, no-c-format
 msgid ""
 "Here you can change the delay after which the panel will disappear if not used."
 msgstr "您可以修改面板多长时间不使用后就会隐藏。"
 
 #. i18n: file hidingtab.ui line 163
-#: rc.cpp:134
+#: rc.cpp:155
 #, no-c-format
 msgid "after the &cursor leaves the panel"
 msgstr "光标离开面板后(&C)"
 
 #. i18n: file hidingtab.ui line 199
-#: rc.cpp:140
+#: rc.cpp:161
 #, no-c-format
 msgid "Allow other &windows to cover the panel"
 msgstr "允许其它窗口覆盖面板(&W)"
 
 #. i18n: file hidingtab.ui line 202
-#: rc.cpp:143
+#: rc.cpp:164
 #, no-c-format
 msgid ""
 "If this option is selected, the panel will allow itself to be covered by other "
@@ -514,13 +563,13 @@ msgid ""
 msgstr "如果选中这个选项，面板将允许自己被其它窗口覆盖。"
 
 #. i18n: file hidingtab.ui line 213
-#: rc.cpp:146
+#: rc.cpp:167
 #, no-c-format
 msgid "Hide a&utomatically"
 msgstr "自动隐藏(&U)"
 
 #. i18n: file hidingtab.ui line 216
-#: rc.cpp:149
+#: rc.cpp:170
 #, no-c-format
 msgid ""
 "If this option is selected, the panel will automatically hide after a period of "
@@ -530,13 +579,13 @@ msgid ""
 msgstr "如果启用这个选项，面板将在一段时间后自动隐藏，并在您将鼠标移动到靠近面板的屏幕边缘时重新出现。这在低分辨率下特别有用，例如某些膝上型电脑。"
 
 #. i18n: file hidingtab.ui line 235
-#: rc.cpp:152
+#: rc.cpp:173
 #, no-c-format
 msgid "&Raise when the pointer touches the screen's:"
 msgstr "升到最前面，如果鼠标移到屏幕的(&R)："
 
 #. i18n: file hidingtab.ui line 238
-#: rc.cpp:155
+#: rc.cpp:176
 #, no-c-format
 msgid ""
 "When this option is selected, moving the pointer to the specified edge of the "
@@ -545,55 +594,55 @@ msgid ""
 msgstr "此个选项被选中时，将鼠标移到选定的屏幕边角，面板就将显示在其它窗口上面，不再被盖住。"
 
 #. i18n: file hidingtab.ui line 244
-#: rc.cpp:158
+#: rc.cpp:179
 #, no-c-format
 msgid "Top Left Corner"
 msgstr "左上角"
 
 #. i18n: file hidingtab.ui line 249
-#: rc.cpp:161
+#: rc.cpp:182
 #, no-c-format
 msgid "Top Edge"
 msgstr "上边缘"
 
 #. i18n: file hidingtab.ui line 254
-#: rc.cpp:164
+#: rc.cpp:185
 #, no-c-format
 msgid "Top Right Corner"
 msgstr "右上角"
 
 #. i18n: file hidingtab.ui line 259
-#: rc.cpp:167
+#: rc.cpp:188
 #, no-c-format
 msgid "Right Edge"
 msgstr "右边缘"
 
 #. i18n: file hidingtab.ui line 264
-#: rc.cpp:170
+#: rc.cpp:191
 #, no-c-format
 msgid "Bottom Right Corner"
 msgstr "右下角"
 
 #. i18n: file hidingtab.ui line 269
-#: rc.cpp:173
+#: rc.cpp:194
 #, no-c-format
 msgid "Bottom Edge"
 msgstr "下边缘"
 
 #. i18n: file hidingtab.ui line 274
-#: rc.cpp:176
+#: rc.cpp:197
 #, no-c-format
 msgid "Bottom Left Corner"
 msgstr "左下角"
 
 #. i18n: file hidingtab.ui line 279
-#: rc.cpp:179
+#: rc.cpp:200
 #, no-c-format
 msgid "Left Edge"
 msgstr "左边缘"
 
 #. i18n: file hidingtab.ui line 289
-#: rc.cpp:182
+#: rc.cpp:203
 #, no-c-format
 msgid ""
 "Here you can set the location on the screen's edge that will bring the panel to "
@@ -601,13 +650,28 @@ msgid ""
 msgstr "这里您可以选择把鼠标移到屏幕的边角部位就使面板升到最上面。"
 
 #. i18n: file hidingtab.ui line 319
-#: rc.cpp:185
+#: rc.cpp:206
+#, no-c-format
+msgid "&Hide panel when configured screen is not available"
+msgstr ""
+
+#. i18n: file hidingtab.ui line 322
+#: rc.cpp:209
+#, no-c-format
+msgid ""
+"When this option is selected, this panel will be hidden if its Xinerama screen "
+"is not available.  This panel will be automatically restored when the "
+"configured Xinerama screen is reenabked."
+msgstr ""
+
+#. i18n: file hidingtab.ui line 333
+#: rc.cpp:212
 #, no-c-format
 msgid "Show panel when switching &desktops"
 msgstr "在切换桌面时显示面板(&D)"
 
-#. i18n: file hidingtab.ui line 322
-#: rc.cpp:188
+#. i18n: file hidingtab.ui line 336
+#: rc.cpp:215
 #, no-c-format
 msgid ""
 "If this option is enabled, the panel will automatically show itself for a brief "
@@ -615,14 +679,14 @@ msgid ""
 "are on."
 msgstr "如果启用该选项，当桌面切换时面板将自动显示一小段时间，这样您可以知道您现在在哪个桌面上。"
 
-#. i18n: file hidingtab.ui line 357
-#: rc.cpp:191
+#. i18n: file hidingtab.ui line 371
+#: rc.cpp:218
 #, no-c-format
 msgid "Panel-Hiding Buttons"
 msgstr "隐藏面板的按钮"
 
-#. i18n: file hidingtab.ui line 360
-#: rc.cpp:194
+#. i18n: file hidingtab.ui line 374
+#: rc.cpp:221
 #, no-c-format
 msgid ""
 "This option controls the panel-hiding buttons, which are buttons with a small "
@@ -630,74 +694,74 @@ msgid ""
 "of the panel, or both. Clicking on one of these buttons will hide the panel."
 msgstr "此选项控制面板两端画着小三角的隐藏按钮。您可以把隐藏按钮安排在面板的任意一端，或两端都有。点击任何一个隐藏按钮就能使面板隐藏起来。"
 
-#. i18n: file hidingtab.ui line 377
-#: rc.cpp:200
+#. i18n: file hidingtab.ui line 391
+#: rc.cpp:227
 #, no-c-format
 msgid ""
 "When this option is selected, a panel-hiding button appears on the left end of "
 "the panel."
 msgstr "选中此项时，面板条左端将出现一个隐藏按钮。"
 
-#. i18n: file hidingtab.ui line 385
-#: rc.cpp:203
+#. i18n: file hidingtab.ui line 399
+#: rc.cpp:230
 #, no-c-format
 msgid "Show right panel-hiding &button"
 msgstr "显示右边的隐藏按钮(&B)"
 
-#. i18n: file hidingtab.ui line 391
-#: rc.cpp:206
+#. i18n: file hidingtab.ui line 405
+#: rc.cpp:233
 #, no-c-format
 msgid ""
 "When this option is selected, a panel-hiding button appears on the right end of "
 "the panel."
 msgstr "选中此项时，面板条右端将出现一个隐藏按钮。"
 
-#. i18n: file hidingtab.ui line 426
-#: rc.cpp:209
+#. i18n: file hidingtab.ui line 440
+#: rc.cpp:236
 #, no-c-format
 msgid "Panel Animation"
 msgstr "面板动画"
 
-#. i18n: file hidingtab.ui line 454
-#: rc.cpp:212
+#. i18n: file hidingtab.ui line 468
+#: rc.cpp:239
 #, no-c-format
 msgid "A&nimate panel hiding"
 msgstr "面板动画隐藏(&N)"
 
-#. i18n: file hidingtab.ui line 457
-#: rc.cpp:215
+#. i18n: file hidingtab.ui line 471
+#: rc.cpp:242
 #, no-c-format
 msgid ""
 "When this option is selected the panel will \"slide\" off the screen when "
 "hiding. The speed of the animation is controlled by the slider directly below."
 msgstr "选中此项后，面板隐藏时将慢慢“滑出”屏幕。动画的速度由下面紧挨着的滑动杆控制。"
 
-#. i18n: file hidingtab.ui line 522
-#: rc.cpp:218
+#. i18n: file hidingtab.ui line 536
+#: rc.cpp:245
 #, no-c-format
 msgid "Determines how quickly the panel hides if hiding animation is enabled."
 msgstr "决定面板动画隐藏的速度。"
 
-#. i18n: file hidingtab.ui line 558
-#: rc.cpp:221
+#. i18n: file hidingtab.ui line 572
+#: rc.cpp:248
 #, no-c-format
 msgid "Fast"
 msgstr "快"
 
-#. i18n: file hidingtab.ui line 599
-#: rc.cpp:224
+#. i18n: file hidingtab.ui line 613
+#: rc.cpp:251
 #, no-c-format
 msgid "Medium"
 msgstr "中"
 
-#. i18n: file hidingtab.ui line 623
-#: rc.cpp:227
+#. i18n: file hidingtab.ui line 637
+#: rc.cpp:254
 #, no-c-format
 msgid "Slow"
 msgstr "慢"
 
 #. i18n: file lookandfeeltab.ui line 16
-#: rc.cpp:230
+#: rc.cpp:257
 #, no-c-format
 msgid ""
 "If this option is selected, informational tooltips will appear when the mouse "
@@ -705,19 +769,19 @@ msgid ""
 msgstr "如果选中此项，当鼠标移动到面板上的图标、按钮和小程序上时，将会出现工具提示条。"
 
 #. i18n: file lookandfeeltab.ui line 30
-#: rc.cpp:233
+#: rc.cpp:260
 #, no-c-format
 msgid "General"
 msgstr "常规"
 
 #. i18n: file lookandfeeltab.ui line 41
-#: rc.cpp:236
+#: rc.cpp:263
 #, no-c-format
 msgid "Enable icon &mouseover effects"
 msgstr "启用图标鼠标悬停特效(&M)"
 
 #. i18n: file lookandfeeltab.ui line 44
-#: rc.cpp:239
+#: rc.cpp:266
 #, no-c-format
 msgid ""
 "When this option is selected a mouseover effect appears when the mouse cursor "
@@ -725,145 +789,159 @@ msgid ""
 msgstr "如果启用这个选项，当鼠标移动到按钮图标上时，图标会被放大。"
 
 #. i18n: file lookandfeeltab.ui line 52
-#: rc.cpp:242
+#: rc.cpp:269
+#, fuzzy, no-c-format
+msgid "Enable icon activation effects"
+msgstr "启用图标鼠标悬停特效(&M)"
+
+#. i18n: file lookandfeeltab.ui line 55
+#: rc.cpp:272
+#, fuzzy, no-c-format
+msgid ""
+"When this option is selected an activation effect appears when panel buttons "
+"are left clicked."
+msgstr "如果启用这个选项，当鼠标移动到按钮图标上时，图标会被放大。"
+
+#. i18n: file lookandfeeltab.ui line 63
+#: rc.cpp:275
 #, no-c-format
 msgid "Show too&ltips"
 msgstr "显示工具提示(&L)"
 
-#. i18n: file lookandfeeltab.ui line 55
-#: rc.cpp:245
+#. i18n: file lookandfeeltab.ui line 66
+#: rc.cpp:278
 #, no-c-format
 msgid ""
 "When this option is selected informational tooltips will appear when the mouse "
 "cursor moves over the icons, buttons and applets in the panel."
 msgstr "如果选中此项，当鼠标移动到面板上的图标、按钮和小程序上时，将会出现工具提示条。"
 
-#. i18n: file lookandfeeltab.ui line 65
-#: rc.cpp:248
+#. i18n: file lookandfeeltab.ui line 76
+#: rc.cpp:281
 #, no-c-format
 msgid "Button Backgrounds"
 msgstr "按钮背景"
 
-#. i18n: file lookandfeeltab.ui line 76
-#: rc.cpp:251
+#. i18n: file lookandfeeltab.ui line 87
+#: rc.cpp:284
 #, no-c-format
 msgid "&TDE menu:"
 msgstr "&K 菜单："
 
-#. i18n: file lookandfeeltab.ui line 82
-#: rc.cpp:254 rc.cpp:278
+#. i18n: file lookandfeeltab.ui line 93
+#: rc.cpp:287 rc.cpp:311
 #, no-c-format
 msgid "Choose a tile image for the TDE menu."
 msgstr "为 K 菜单选择一个平铺图像。"
 
-#. i18n: file lookandfeeltab.ui line 90
-#: rc.cpp:257
+#. i18n: file lookandfeeltab.ui line 101
+#: rc.cpp:290
 #, no-c-format
 msgid "&QuickBrowser menus:"
 msgstr "快捷浏览菜单(&Q)："
 
-#. i18n: file lookandfeeltab.ui line 96
-#: rc.cpp:260 rc.cpp:269
+#. i18n: file lookandfeeltab.ui line 107
+#: rc.cpp:293 rc.cpp:302
 #, no-c-format
 msgid "Choose a tile image for Quick Browser buttons."
 msgstr "为快捷浏览按钮选择一个平铺图像。"
 
-#. i18n: file lookandfeeltab.ui line 107
-#: rc.cpp:266 rc.cpp:275 rc.cpp:290 rc.cpp:308 rc.cpp:335
+#. i18n: file lookandfeeltab.ui line 118
+#: rc.cpp:299 rc.cpp:308 rc.cpp:323 rc.cpp:341 rc.cpp:368
 #, no-c-format
 msgid "Custom Color"
 msgstr "自定义颜色"
 
-#. i18n: file lookandfeeltab.ui line 165
-#: rc.cpp:281
+#. i18n: file lookandfeeltab.ui line 176
+#: rc.cpp:314
 #, no-c-format
 msgid ""
 "When the Custom Color option is selected, use this button to pick a color for "
 "quick browser tile backgrounds"
 msgstr "若选中了自定义颜色选项，请使用此按钮拾取快速浏览器的平铺背景"
 
-#. i18n: file lookandfeeltab.ui line 176
-#: rc.cpp:284
+#. i18n: file lookandfeeltab.ui line 187
+#: rc.cpp:317
 #, no-c-format
 msgid ""
 "When the Custom Color option is selected, use this button to pick a color for "
 "the TDE menu tile background"
 msgstr "若选中了自定义颜色选项，请使用此按钮拾取 K 菜单的平铺背景"
 
-#. i18n: file lookandfeeltab.ui line 205
-#: rc.cpp:293 rc.cpp:302
+#. i18n: file lookandfeeltab.ui line 216
+#: rc.cpp:326 rc.cpp:335
 #, no-c-format
 msgid "Choose a tile image for window list buttons."
 msgstr "为窗口列表按钮选择一个平铺图像。"
 
-#. i18n: file lookandfeeltab.ui line 216
-#: rc.cpp:296
+#. i18n: file lookandfeeltab.ui line 227
+#: rc.cpp:329
 #, no-c-format
 msgid ""
 "When the Custom Color option is selected, use this button to pick a color for "
 "window list tile backgrounds"
 msgstr "若选中了自定义颜色选项，请使用此按钮拾取窗口列表的平铺背景"
 
-#. i18n: file lookandfeeltab.ui line 224
-#: rc.cpp:299
+#. i18n: file lookandfeeltab.ui line 235
+#: rc.cpp:332
 #, no-c-format
 msgid "&Window list:"
 msgstr "窗口列表(&W)："
 
-#. i18n: file lookandfeeltab.ui line 259
-#: rc.cpp:311 rc.cpp:320
+#. i18n: file lookandfeeltab.ui line 270
+#: rc.cpp:344 rc.cpp:353
 #, no-c-format
 msgid "Choose a tile image for desktop access buttons."
 msgstr "为桌面访问按钮选择一个平铺图像。"
 
-#. i18n: file lookandfeeltab.ui line 270
-#: rc.cpp:314
+#. i18n: file lookandfeeltab.ui line 281
+#: rc.cpp:347
 #, no-c-format
 msgid ""
 "When the Custom Color option is selected, use this button to pick a color for "
 "the desktop tile background"
 msgstr "若选中了自定义颜色选项，请使用此按钮拾取桌面的平铺背景"
 
-#. i18n: file lookandfeeltab.ui line 278
-#: rc.cpp:317
+#. i18n: file lookandfeeltab.ui line 289
+#: rc.cpp:350
 #, no-c-format
 msgid "De&sktop access:"
 msgstr "桌面访问(&S)："
 
-#. i18n: file lookandfeeltab.ui line 295
-#: rc.cpp:323
+#. i18n: file lookandfeeltab.ui line 306
+#: rc.cpp:356
 #, no-c-format
 msgid ""
 "When the Custom Color option is selected, use this button to pick a color for "
 "application tile backgrounds"
 msgstr "若选中了自定义颜色选项，请使用此按钮拾取应用程序的平铺背景"
 
-#. i18n: file lookandfeeltab.ui line 303
-#: rc.cpp:326
+#. i18n: file lookandfeeltab.ui line 314
+#: rc.cpp:359
 #, no-c-format
 msgid "Applicatio&ns:"
 msgstr "应用程序(&N)："
 
-#. i18n: file lookandfeeltab.ui line 309
-#: rc.cpp:329 rc.cpp:338
+#. i18n: file lookandfeeltab.ui line 320
+#: rc.cpp:362 rc.cpp:371
 #, no-c-format
 msgid "Choose a tile image for buttons that launch applications."
 msgstr "为启动应用程序按钮选择一个平铺图像。"
 
-#. i18n: file lookandfeeltab.ui line 365
-#: rc.cpp:341
+#. i18n: file lookandfeeltab.ui line 376
+#: rc.cpp:374
 #, no-c-format
 msgid "Panel Background"
 msgstr "面板背景"
 
-#. i18n: file lookandfeeltab.ui line 396
-#: rc.cpp:344
+#. i18n: file lookandfeeltab.ui line 407
+#: rc.cpp:377
 #, no-c-format
 msgid "Colorize to &match the desktop color scheme"
 msgstr "按照桌面颜色方案着色(&M)"
 
-#. i18n: file lookandfeeltab.ui line 402
-#: rc.cpp:347
+#. i18n: file lookandfeeltab.ui line 413
+#: rc.cpp:380
 #, no-c-format
 msgid ""
 "If this option is selected, the panel background image will be colored to match "
@@ -871,14 +949,14 @@ msgid ""
 "module."
 msgstr "如果选中了此选项，面板背景图像将按照默认颜色着色。要更改默认颜色，请前往“颜色”控制模块。"
 
-#. i18n: file lookandfeeltab.ui line 449
-#: rc.cpp:350
+#. i18n: file lookandfeeltab.ui line 460
+#: rc.cpp:383
 #, no-c-format
 msgid "This is a preview for the selected background image."
 msgstr "这是选中的背景图像的预览。"
 
-#. i18n: file lookandfeeltab.ui line 469
-#: rc.cpp:353
+#. i18n: file lookandfeeltab.ui line 480
+#: rc.cpp:386
 #, no-c-format
 msgid ""
 "Here you can choose a theme to be displayed by the panel. Press the 'Browse' "
@@ -888,120 +966,200 @@ msgstr ""
 "您可在这里选择面板所显示的主题。按下“浏览”按钮可使用文件对话框选择主题。\n"
 "此选项仅当“启用背景图像”选中时才有效。"
 
-#. i18n: file lookandfeeltab.ui line 477
-#: rc.cpp:357
+#. i18n: file lookandfeeltab.ui line 488
+#: rc.cpp:390
 #, no-c-format
 msgid "Enable &background image"
 msgstr "启用背景图像(&B)"
 
-#. i18n: file lookandfeeltab.ui line 485
-#: rc.cpp:360
+#. i18n: file lookandfeeltab.ui line 496
+#: rc.cpp:393
 #, no-c-format
 msgid "Enable &transparency"
 msgstr "允许透明(&T)"
 
-#. i18n: file lookandfeeltab.ui line 503
-#: rc.cpp:363
+#. i18n: file lookandfeeltab.ui line 514
+#: rc.cpp:396
 #, no-c-format
 msgid "Advanc&ed Options"
 msgstr "高级选项(&E)"
 
-#. i18n: file lookandfeeltab.ui line 506
-#: rc.cpp:366
+#. i18n: file lookandfeeltab.ui line 517
+#: rc.cpp:399
 #, no-c-format
 msgid ""
 "Click here to open the Advanced Options dialog. You can configure the applet "
 "handles look and feel, the tint transparency color and more."
 msgstr "点击此处打开高级选项对话框。您可以配置小程序把手的观感、透明染色等选项。"
 
-#. i18n: file menutab.ui line 27
-#: rc.cpp:369
+#. i18n: file menutab.ui line 35
+#: rc.cpp:402
+#, fuzzy, no-c-format
+msgid "TDE menu style:"
+msgstr "&K 菜单："
+
+#. i18n: file menutab.ui line 44
+#: rc.cpp:405
+#, no-c-format
+msgid "Kickoff"
+msgstr ""
+
+#. i18n: file menutab.ui line 49
+#: rc.cpp:408
+#, no-c-format
+msgid "Trinity Classic"
+msgstr ""
+
+#. i18n: file menutab.ui line 80
+#: rc.cpp:411
 #, no-c-format
 msgid "TDE Menu"
 msgstr "K 菜单"
 
-#. i18n: file menutab.ui line 49
-#: rc.cpp:372
+#. i18n: file menutab.ui line 102
+#: rc.cpp:414
 #, no-c-format
 msgid "Menu item format:"
 msgstr "菜单项格式："
 
-#. i18n: file menutab.ui line 55
-#: rc.cpp:375
+#. i18n: file menutab.ui line 108
+#: rc.cpp:417
 #, no-c-format
 msgid "Here you can choose how menu entries are shown."
 msgstr "您可在此选择菜单项显示的方式。"
 
-#. i18n: file menutab.ui line 66
-#: rc.cpp:378
+#. i18n: file menutab.ui line 119
+#: rc.cpp:420
 #, no-c-format
 msgid "&Name only"
 msgstr "只有名称(&N)"
 
-#. i18n: file menutab.ui line 69
-#: rc.cpp:381
+#. i18n: file menutab.ui line 122
+#: rc.cpp:423
 #, no-c-format
 msgid ""
 "When this option is selected, items in the TDE Menu will appear with the "
 "application's name next to the icon."
 msgstr "如果选中此项，K 菜单上各项图标旁边将只显示其名称。"
 
-#. i18n: file menutab.ui line 77
-#: rc.cpp:384
+#. i18n: file menutab.ui line 130
+#: rc.cpp:426
 #, no-c-format
 msgid "Name - &Description"
 msgstr "名称 - 描述(&D)"
 
-#. i18n: file menutab.ui line 83
-#: rc.cpp:387
+#. i18n: file menutab.ui line 136
+#: rc.cpp:429
 #, no-c-format
 msgid ""
 "When this option is selected, items in the TDE Menu will appear with the "
 "application's name and a brief description next to the icon."
 msgstr "如果选中此项，K 菜单上各项图标旁边将显示其名称及其简短描述。"
 
-#. i18n: file menutab.ui line 91
-#: rc.cpp:390
+#. i18n: file menutab.ui line 144
+#: rc.cpp:432
 #, no-c-format
 msgid "D&escription only"
 msgstr "只有描述(&E)"
 
-#. i18n: file menutab.ui line 94
-#: rc.cpp:393
+#. i18n: file menutab.ui line 147
+#: rc.cpp:435
 #, no-c-format
 msgid ""
 "When this option is selected, items in the TDE Menu will appear with the "
 "application's brief description next to the icon."
 msgstr "如果选中此项，K 菜单上各项图标旁边将只显示应用程序的简短描述。"
 
-#. i18n: file menutab.ui line 105
-#: rc.cpp:396
+#. i18n: file menutab.ui line 158
+#: rc.cpp:438
 #, no-c-format
 msgid "Des&cription (Name)"
 msgstr "描述(名称)(&C)"
 
-#. i18n: file menutab.ui line 108
-#: rc.cpp:399
+#. i18n: file menutab.ui line 161
+#: rc.cpp:441
 #, no-c-format
 msgid ""
 "When this option is selected, items in the TDE Menu will appear with a brief "
 "description and the application's name in brackets next to the icon."
 msgstr "如果选中此项，K 菜单上各项图标旁边将显示其描述，并在括号里附加其名称。"
 
-#. i18n: file menutab.ui line 118
-#: rc.cpp:402
+#. i18n: file menutab.ui line 171
+#: rc.cpp:444
+#, no-c-format
+msgid "Edit &TDE Menu"
+msgstr "编辑 &K 菜单"
+
+#. i18n: file menutab.ui line 174
+#: rc.cpp:447
+#, fuzzy, no-c-format
+msgid ""
+"Start the editor for the TDE Menu. Here you can add, edit, remove and hide "
+"applications."
+msgstr "启动 K 菜单的编辑器。您可在此添加、编辑、删除和隐藏应用程序。"
+
+#. i18n: file menutab.ui line 182
+#: rc.cpp:450
+#, no-c-format
+msgid "Change menu icon"
+msgstr ""
+
+#. i18n: file menutab.ui line 185
+#: rc.cpp:453
+#, fuzzy, no-c-format
+msgid "Allows you to choose a different icon for the TDE menu."
+msgstr "为 K 菜单选择一个平铺图像。"
+
+#. i18n: file menutab.ui line 213
+#: rc.cpp:456
+#, no-c-format
+msgid "Optional Menus"
+msgstr "可选菜单"
+
+#. i18n: file menutab.ui line 243
+#: rc.cpp:459
+#, no-c-format
+msgid ""
+"This is a list of the dynamic menus that can be displayed in the TDE menu in "
+"addition to the normal applications. Use the checkboxes to add or remove menus."
+msgstr "这里列出的是可以添加到 TDE 菜单上的动态菜单。用复选框添加或删除这些菜单。"
+
+#. i18n: file menutab.ui line 256
+#: rc.cpp:462
+#, no-c-format
+msgid "Open menu on mouse hover"
+msgstr ""
+
+#. i18n: file menutab.ui line 264
+#: rc.cpp:465
+#, fuzzy, no-c-format
+msgid "Show T&ooltip"
+msgstr "显示工具提示(&L)"
+
+#. i18n: file menutab.ui line 270
+#: rc.cpp:468
+#, no-c-format
+msgid ""
+"<qt>When this option is selected, a tooltip appears when hovering the mouse "
+"pointer over Application Launcher Menu items. Enabling this option also "
+"requires that tooltips are enabled in the Panels->Appearance configuration "
+"dialog."
+msgstr ""
+
+#. i18n: file menutab.ui line 278
+#: rc.cpp:471
 #, no-c-format
 msgid "Show side ima&ge"
 msgstr "显示旁边的图像(&G)"
 
-#. i18n: file menutab.ui line 126
-#: rc.cpp:405
-#, no-c-format
+#. i18n: file menutab.ui line 286
+#: rc.cpp:474
+#, fuzzy, no-c-format
 msgid ""
 "<qt>When this option is selected an image will appear down the left-hand side "
 "of the TDE Menu. The image will be tinted according to your color settings.\n"
-"                                    \n"
-"                                    "
+"\t\t\t\t\t\t\t\t\n"
+"\t\t\t\t\t\t\t\t"
 "<p><b>Tip</b>: You can customize the image that appears in the TDE Menu by "
 "putting an image file called kside.png and a tileable image file called "
 "kside_tile.png in $TDEHOME/share/apps/kicker/pics.</qt>"
@@ -1011,48 +1169,46 @@ msgstr ""
 "<p><b>提示</b>：您可以自定义出现在 K 菜单上的图像，只需在 $TDEHOME/share/apps/kicker/pics 目录下放一个名为 "
 "kside.png 的图片文件和一个名为 kside_title.png 的可拼接图案文件。</qt>"
 
-#. i18n: file menutab.ui line 151
-#: rc.cpp:410
+#. i18n: file menutab.ui line 294
+#: rc.cpp:479
 #, no-c-format
-msgid "Edit &TDE Menu"
-msgstr "编辑 &K 菜单"
+msgid "Display text in menu button"
+msgstr ""
 
-#. i18n: file menutab.ui line 154
-#: rc.cpp:413
-#, no-c-format
+#. i18n: file menutab.ui line 300
+#: rc.cpp:482
+#, fuzzy, no-c-format
 msgid ""
-"Start the editor for the TDE menu. Here you can add, edit, remove and hide "
-"applications."
-msgstr "启动 K 菜单的编辑器。您可在此添加、编辑、删除和隐藏应用程序。"
+"<qt>When this option is selected the text below will be shown in the TDE Menu "
+"button."
+msgstr "如果选中此项，K 菜单上各项图标旁边将只显示其名称。"
 
-#. i18n: file menutab.ui line 162
-#: rc.cpp:416
+#. i18n: file menutab.ui line 323
+#: rc.cpp:485
 #, no-c-format
-msgid "Optional Menus"
-msgstr "可选菜单"
+msgid "Text:"
+msgstr ""
 
-#. i18n: file menutab.ui line 192
-#: rc.cpp:419
+#. i18n: file menutab.ui line 347
+#: rc.cpp:488
 #, no-c-format
-msgid ""
-"This is a list of the dynamic menus that can be displayed in the TDE menu in "
-"addition to the normal applications. Use the checkboxes to add or remove menus."
-msgstr "这里列出的是可以添加到 TDE 菜单上的动态菜单。用复选框添加或删除这些菜单。"
+msgid "Font:"
+msgstr ""
 
-#. i18n: file menutab.ui line 202
-#: rc.cpp:422
+#. i18n: file menutab.ui line 406
+#: rc.cpp:491
 #, no-c-format
 msgid "QuickBrowser Menus"
 msgstr "快捷浏览菜单"
 
-#. i18n: file menutab.ui line 221
-#: rc.cpp:425
+#. i18n: file menutab.ui line 425
+#: rc.cpp:494 rc.cpp:512
 #, no-c-format
 msgid "Ma&ximum number of entries:"
 msgstr "最大菜单项数(&X)："
 
-#. i18n: file menutab.ui line 227
-#: rc.cpp:428 rc.cpp:431
+#. i18n: file menutab.ui line 431
+#: rc.cpp:497 rc.cpp:500
 #, no-c-format
 msgid ""
 "When browsing directories that contain a lot of files, the QuickBrowser can "
@@ -1061,78 +1217,112 @@ msgid ""
 "resolutions."
 msgstr "当浏览有很多文件的目录的时候，快捷浏览菜单有时会盖满您整个桌面。您可以限制快捷浏览同时可以显示的项目数。这在低分辨率下特别有用。"
 
-#. i18n: file menutab.ui line 254
-#: rc.cpp:434
+#. i18n: file menutab.ui line 458
+#: rc.cpp:503
 #, no-c-format
 msgid "Show hidden fi&les"
 msgstr "显示隐藏文件(&L)"
 
-#. i18n: file menutab.ui line 260
-#: rc.cpp:437
+#. i18n: file menutab.ui line 464
+#: rc.cpp:506
 #, no-c-format
 msgid ""
 "If this option is enabled, hidden files (i.e. files beginning with a dot) will "
 "be shown in the QuickBrowser menus."
 msgstr "如果启用这个选项，隐藏文件(即以 . 为文件名开始的文件)将在快捷浏览菜单中显示。"
 
-#. i18n: file menutab.ui line 287
-#: rc.cpp:440
+#. i18n: file menutab.ui line 491
+#: rc.cpp:509
+#, no-c-format
+msgid "Recent Documents Menu"
+msgstr ""
+
+#. i18n: file menutab.ui line 516
+#: rc.cpp:515 rc.cpp:518
+#, no-c-format
+msgid ""
+"This sets the maximum number of recently accessed documents stored for fast "
+"retrieval."
+msgstr ""
+
+#. i18n: file menutab.ui line 562
+#: rc.cpp:521
 #, no-c-format
 msgid "QuickStart Menu Items"
 msgstr "快速启动菜单项"
 
-#. i18n: file menutab.ui line 306
-#: rc.cpp:443
+#. i18n: file menutab.ui line 581
+#: rc.cpp:524
 #, no-c-format
 msgid "Maxim&um number of entries:"
 msgstr "最多菜单项数(&U)："
 
-#. i18n: file menutab.ui line 312
-#: rc.cpp:446
+#. i18n: file menutab.ui line 587
+#: rc.cpp:527
 #, no-c-format
 msgid ""
 "This option allows you to define the maximum number of applications that should "
 "be displayed in the QuickStart menu area."
 msgstr "此选项让您能指定快速启动菜单区显示的最多程序个数。"
 
-#. i18n: file menutab.ui line 329
-#: rc.cpp:449
+#. i18n: file menutab.ui line 604
+#: rc.cpp:530
 #, no-c-format
 msgid ""
 "This option allows you to define how many applications should be displayed at "
 "most in the QuickStart menu area."
 msgstr "此选项让您能指定快速启动菜单区显示的最多程序个数。"
 
-#. i18n: file menutab.ui line 339
-#: rc.cpp:452
+#. i18n: file menutab.ui line 614
+#: rc.cpp:533
 #, no-c-format
 msgid "Show the &applications most recently used"
 msgstr "显示最近使用过的程序(&A)"
 
-#. i18n: file menutab.ui line 345
-#: rc.cpp:455
+#. i18n: file menutab.ui line 620
+#: rc.cpp:536
 #, no-c-format
 msgid ""
 "When this option is selected the QuickStart menu area will be filled with the "
 "applications you have used most recently."
 msgstr "选中此选项，快速启动菜单区将会包括您最近使用过的程序。"
 
-#. i18n: file menutab.ui line 353
-#: rc.cpp:458
+#. i18n: file menutab.ui line 628
+#: rc.cpp:539
 #, no-c-format
 msgid "Show the applications most fre&quently used"
 msgstr "显示使用次数最多的程序(&Q)"
 
-#. i18n: file menutab.ui line 356
-#: rc.cpp:461
+#. i18n: file menutab.ui line 631
+#: rc.cpp:542
 #, no-c-format
 msgid ""
 "When this option is selected the QuickStart menu area will be filled with the "
 "applications you use most frequently."
 msgstr "选中此选项，快速启动菜单区将会包括您最经常使用的程序。"
 
+#. i18n: file menutab.ui line 658
+#: rc.cpp:545
+#, fuzzy, no-c-format
+msgid "TDE Menu Search"
+msgstr "K 菜单"
+
+#. i18n: file menutab.ui line 669
+#: rc.cpp:548
+#, no-c-format
+msgid "Show search field in TDE Menu"
+msgstr ""
+
+#. i18n: file menutab.ui line 675
+#: rc.cpp:551
+#, fuzzy, no-c-format
+msgid ""
+"<qt>When this option is selected a text-based search field will appear in the "
+"TDE Menu.</qt>"
+msgstr "选中此项时，面板条左端将出现一个隐藏按钮。"
+
 #. i18n: file positiontab.ui line 17
-#: rc.cpp:464
+#: rc.cpp:554
 #, no-c-format
 msgid ""
 "This is a list of all the panels currently active on your desktop. Select one "
@@ -1140,13 +1330,13 @@ msgid ""
 msgstr "这里列出的是您的系统当前用到的所有面板。请选择一个进行配置。"
 
 #. i18n: file positiontab.ui line 83
-#: rc.cpp:470
+#: rc.cpp:560
 #, no-c-format
 msgid "Screen"
 msgstr "屏幕"
 
 #. i18n: file positiontab.ui line 139
-#: rc.cpp:473
+#: rc.cpp:563
 #, no-c-format
 msgid ""
 "This preview image shows how the panel will appear on your screen with the "
@@ -1156,25 +1346,25 @@ msgid ""
 msgstr "这个预览图像显示了在您所选的设置下面板是如何出现在屏幕上的。点击图案周围的按钮将改变面板的位置，移动长度滑杆和选择不同大小将改变面板的尺寸。"
 
 #. i18n: file positiontab.ui line 191
-#: rc.cpp:476
+#: rc.cpp:566
 #, no-c-format
 msgid "Identify"
 msgstr "标识"
 
 #. i18n: file positiontab.ui line 194
-#: rc.cpp:479
+#: rc.cpp:569
 #, no-c-format
 msgid "This button displays each monitor's identifying number"
 msgstr "此按钮显示每个显示器的标识号码"
 
 #. i18n: file positiontab.ui line 212
-#: rc.cpp:482
+#: rc.cpp:572
 #, no-c-format
 msgid "&Xinerama screen:"
 msgstr "&Xinerama 屏幕："
 
 #. i18n: file positiontab.ui line 223
-#: rc.cpp:485
+#: rc.cpp:575
 #, no-c-format
 msgid ""
 "This menu selects which screen the Panel will be displayed on in a "
@@ -1182,13 +1372,13 @@ msgid ""
 msgstr "这个菜单选择多显示器系统中，面板将在哪个屏幕上显示"
 
 #. i18n: file positiontab.ui line 260
-#: rc.cpp:488
+#: rc.cpp:578
 #, no-c-format
 msgid "Len&gth"
 msgstr "长度(&G)"
 
 #. i18n: file positiontab.ui line 264
-#: rc.cpp:491
+#: rc.cpp:581
 #, no-c-format
 msgid ""
 "This group of settings determines how the panel is aligned, including\n"
@@ -1196,7 +1386,7 @@ msgid ""
 msgstr "这组选项决定了面板在屏幕上将如何对齐、放置在何处、以及使用多大部分的屏幕。"
 
 #. i18n: file positiontab.ui line 312
-#: rc.cpp:495
+#: rc.cpp:585
 #, no-c-format
 msgid ""
 "This slider defines how much of the screen's edge will be occupied by the "
@@ -1204,13 +1394,13 @@ msgid ""
 msgstr "这个滑动杆控制屏幕边上多长的部分被面板占用。"
 
 #. i18n: file positiontab.ui line 329
-#: rc.cpp:498
+#: rc.cpp:588
 #, no-c-format
 msgid "%"
 msgstr "%"
 
 #. i18n: file positiontab.ui line 332
-#: rc.cpp:501
+#: rc.cpp:591
 #, no-c-format
 msgid ""
 "This spinbox defines how much of the screen's edge will be occupied by the "
@@ -1218,13 +1408,13 @@ msgid ""
 msgstr "这个滚轮控制屏幕边上多长的部分被面板占用。"
 
 #. i18n: file positiontab.ui line 342
-#: rc.cpp:504
+#: rc.cpp:594
 #, no-c-format
 msgid "&Expand as required to fit contents"
 msgstr "自动扩大到需要的尺寸(&E)"
 
 #. i18n: file positiontab.ui line 345
-#: rc.cpp:507
+#: rc.cpp:597
 #, no-c-format
 msgid ""
 "When this option is selected, the panel will grow as necessary to accommodate "
@@ -1232,61 +1422,61 @@ msgid ""
 msgstr "如果选中此选项，面板尺寸将按照需要，扩大到可以容纳它上面的全部按钮和小程序。"
 
 #. i18n: file positiontab.ui line 380
-#: rc.cpp:510
+#: rc.cpp:600
 #, no-c-format
 msgid "Si&ze"
 msgstr "大小(&Z)"
 
 #. i18n: file positiontab.ui line 383
-#: rc.cpp:513
+#: rc.cpp:603
 #, no-c-format
 msgid "This sets the size of the panel."
 msgstr "这将设置面板的大小。"
 
 #. i18n: file positiontab.ui line 392
-#: rc.cpp:516
+#: rc.cpp:606
 #, no-c-format
 msgid "Tiny"
 msgstr "极小"
 
 #. i18n: file positiontab.ui line 397
-#: rc.cpp:519
+#: rc.cpp:609
 #, no-c-format
 msgid "Small"
 msgstr "小"
 
 #. i18n: file positiontab.ui line 402
-#: rc.cpp:522
+#: rc.cpp:612
 #, no-c-format
 msgid "Normal"
 msgstr "正常"
 
 #. i18n: file positiontab.ui line 407
-#: rc.cpp:525
+#: rc.cpp:615
 #, no-c-format
 msgid "Large"
 msgstr "大"
 
 #. i18n: file positiontab.ui line 484
-#: rc.cpp:531
+#: rc.cpp:621
 #, no-c-format
 msgid "This slider defines the panel size when the Custom option is selected."
 msgstr "当使用自定义选项时，这个滑动杆指定面板的高度。"
 
 #. i18n: file positiontab.ui line 507
-#: rc.cpp:537
+#: rc.cpp:627
 #, no-c-format
 msgid "This spinbox defines the panel size when the Custom option is selected."
 msgstr "当使用自定义选项时，这个滚轮指定面板的高度。"
 
 #. i18n: file positiontab.ui line 519
-#: rc.cpp:540
+#: rc.cpp:630
 #, no-c-format
 msgid "Position"
 msgstr "位置"
 
 #. i18n: file positiontab.ui line 525
-#: rc.cpp:543
+#: rc.cpp:633
 #, no-c-format
 msgid ""
 "Here you can set the position of the panel highlighted on the left side. You "
@@ -1297,142 +1487,143 @@ msgstr ""
 "您可在此设置左侧突出显示的面板所在的位置。您可以将任何面板放在屏幕的上边、下边、左边、右边。而且，您可以将其放在一边的中间，也可以放在屏幕的一角。"
 
 #. i18n: file positiontab.ui line 609
-#: rc.cpp:546
+#: rc.cpp:636
 #, no-c-format
 msgid "Alt+1"
 msgstr "Alt+1"
 
 #. i18n: file positiontab.ui line 643
-#: rc.cpp:549
+#: rc.cpp:639
 #, no-c-format
 msgid "Alt+2"
 msgstr "Alt+2"
 
 #. i18n: file positiontab.ui line 677
-#: rc.cpp:552
+#: rc.cpp:642
 #, no-c-format
 msgid "Alt+3"
 msgstr "Alt+3"
 
 #. i18n: file positiontab.ui line 721
-#: rc.cpp:555
+#: rc.cpp:645
 #, no-c-format
 msgid "Alt+="
 msgstr "Alt+="
 
 #. i18n: file positiontab.ui line 755
-#: rc.cpp:558
+#: rc.cpp:648
 #, no-c-format
 msgid "Alt+-"
 msgstr "Alt+-"
 
 #. i18n: file positiontab.ui line 789
-#: rc.cpp:561
+#: rc.cpp:651
 #, no-c-format
 msgid "Alt+0"
 msgstr "Alt+0"
 
 #. i18n: file positiontab.ui line 833
-#: rc.cpp:564
+#: rc.cpp:654
 #, no-c-format
 msgid "Alt+9"
 msgstr "Alt+9"
 
 #. i18n: file positiontab.ui line 867
-#: rc.cpp:567
+#: rc.cpp:657
 #, no-c-format
 msgid "Alt+8"
 msgstr "Alt+8"
 
 #. i18n: file positiontab.ui line 901
-#: rc.cpp:570
+#: rc.cpp:660
 #, no-c-format
 msgid "Alt+7"
 msgstr "Alt+7"
 
 #. i18n: file positiontab.ui line 945
-#: rc.cpp:573
+#: rc.cpp:663
 #, no-c-format
 msgid "Alt+4"
 msgstr "Alt+4"
 
 #. i18n: file positiontab.ui line 979
-#: rc.cpp:576
+#: rc.cpp:666
 #, no-c-format
 msgid "Alt+5"
 msgstr "Alt+5"
 
 #. i18n: file positiontab.ui line 1013
-#: rc.cpp:579
+#: rc.cpp:669
 #, no-c-format
 msgid "Alt+6"
 msgstr "Alt+6"
 
-#: rc.cpp:580
-msgid "TDE Button"
+#: rc.cpp:670
+#, fuzzy
+msgid "KDE Button"
 msgstr "TDE 按钮"
 
-#: rc.cpp:581
+#: rc.cpp:671
 msgid "Blue Wood"
 msgstr "蓝木纹"
 
-#: rc.cpp:582
+#: rc.cpp:672
 msgid "Green Wood"
 msgstr "绿木纹"
 
-#: rc.cpp:583
+#: rc.cpp:673
 msgid "Light Gray"
 msgstr "淡灰"
 
-#: rc.cpp:584
+#: rc.cpp:674
 msgid "Light Green"
 msgstr "淡绿"
 
-#: rc.cpp:585
+#: rc.cpp:675
 msgid "Light Pastel"
 msgstr "淡彩蜡笔画"
 
-#: rc.cpp:586
+#: rc.cpp:676
 msgid "Light Purple"
 msgstr "淡紫"
 
-#: rc.cpp:587
+#: rc.cpp:677
 msgid "Nuts And Bolts"
 msgstr "螺母和螺栓"
 
-#: rc.cpp:588
+#: rc.cpp:678
 msgid "Red Wood"
 msgstr "红木纹"
 
-#: rc.cpp:589
+#: rc.cpp:679
 msgid "Solid Blue"
 msgstr "蓝色"
 
-#: rc.cpp:590
+#: rc.cpp:680
 msgid "Solid Gray"
 msgstr "灰色"
 
-#: rc.cpp:591
+#: rc.cpp:681
 msgid "Solid Green"
 msgstr "绿色"
 
-#: rc.cpp:592
+#: rc.cpp:682
 msgid "Solid Orange"
 msgstr "桔黄"
 
-#: rc.cpp:593
+#: rc.cpp:683
 msgid "Solid Pastel"
 msgstr "蜡笔画"
 
-#: rc.cpp:594
+#: rc.cpp:684
 msgid "Solid Purple"
 msgstr "紫色"
 
-#: rc.cpp:595
+#: rc.cpp:685
 msgid "Solid Red"
 msgstr "红色"
 
-#: rc.cpp:596
+#: rc.cpp:686
 msgid "Solid Tigereye"
 msgstr "虎眼石"
 
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmkonq.po b/tde-i18n-zh_CN/messages/tdebase/kcmkonq.po
index a167947fe7d..6354156affd 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmkonq.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmkonq.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2008-06-08 01:37+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-05-06 17:41+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,55 +51,67 @@ msgid ""
 msgstr "使用该选项将把所有网络文件传输的进度信息组织到一个窗口中的列表中。当不使用该选项时，全部传输在各个窗口中显示。"
 
 #: behaviour.cpp:85
+msgid "Show archived &files as folders"
+msgstr ""
+
+#: behaviour.cpp:88
+#, fuzzy
+msgid ""
+"Checking this option will list archived files as folders when using tree view."
+msgstr "选中此选项将点击图标名称直接对文件改名。"
+
+#: behaviour.cpp:94
 msgid "Show file &tips"
 msgstr "显示文件提示(&T)"
 
-#: behaviour.cpp:88
+#: behaviour.cpp:97
+#, fuzzy
 msgid ""
 "Here you can control if, when moving the mouse over a file, you want to see a "
-"small popup window with additional information about that file"
+"small popup window with additional information about that file.This feature "
+"requires 'Enable tooltips' in KControl, Appearance & Themes, Style."
 msgstr "这样您能控制它，当在文件上移动鼠标时，您能看到一个关于那个文件的额外信息的小的弹出窗口。"
 
-#: behaviour.cpp:108
+#: behaviour.cpp:118
 msgid "Show &previews in file tips"
 msgstr "在文件提示中显示预览(&P)"
 
-#: behaviour.cpp:111
+#: behaviour.cpp:121
 msgid ""
 "Here you can control if you want the popup window to contain a larger preview "
 "for the file, when moving the mouse over it."
 msgstr "您可以在这里控制当鼠标指向文件时，弹出窗口中是否要显示文件的较大预览。"
 
-#: behaviour.cpp:114
+#: behaviour.cpp:124
 msgid "Rename icons in&line"
 msgstr "内嵌式重命名图标(&L)"
 
-#: behaviour.cpp:115
+#: behaviour.cpp:125
 msgid ""
 "Checking this option will allow files to be renamed by clicking directly on the "
 "icon name. "
 msgstr "选中此选项将点击图标名称直接对文件改名。"
 
-#: behaviour.cpp:121
+#: behaviour.cpp:131
 msgid "Home &URL:"
 msgstr "主 &URL："
 
-#: behaviour.cpp:126
+#: behaviour.cpp:136
 msgid "Select Home Folder"
 msgstr "选择主文件夹"
 
-#: behaviour.cpp:131
+#: behaviour.cpp:141
 msgid ""
 "This is the URL (e.g. a folder or a web page) where Konqueror will jump to when "
 "the \"Home\" button is pressed. This is usually your home folder, symbolized by "
 "a 'tilde' (~)."
 msgstr "当“主文件夹”按钮按下时，Konqueror 将打开该 URL (文件夹或网页)。这通常是您的主文件夹，由波浪号 ~ 代表。"
 
-#: behaviour.cpp:139
+#: behaviour.cpp:149
 msgid "Show 'Delete' context me&nu entries which bypass the trashcan"
 msgstr "显示跳过回收站的“删除”快捷菜单项(&N)"
 
-#: behaviour.cpp:143
+#: behaviour.cpp:153
 msgid ""
 "Check this if you want 'Delete' menu commands to be displayed on the desktop "
 "and in the file manager's context menus. You can always delete files by holding "
@@ -107,11 +120,11 @@ msgstr ""
 "如果您想在桌面和文件管理器的菜单和快捷菜单中显示“删除”菜单命令，请选中此选项。如果您想要彻底删除文件，您总是可以在调用“移到回收站”命令时按住 Shift "
 "键。"
 
-#: behaviour.cpp:148
+#: behaviour.cpp:158
 msgid "Ask Confirmation For"
 msgstr "要求确认"
 
-#: behaviour.cpp:150
+#: behaviour.cpp:160
 msgid ""
 "This option tells Konqueror whether to ask for a confirmation when you "
 "\"delete\" a file. "
@@ -125,11 +138,11 @@ msgstr ""
 "<li><em>移到回收站：</em>移动文件到您的回收目录中， 您可从这里轻松恢复文件。</li> "
 "<li><em>删除：</em>简单删除文件。</li></ul>"
 
-#: behaviour.cpp:159
+#: behaviour.cpp:169
 msgid "&Move to trash"
 msgstr "移到回收站(&M)"
 
-#: behaviour.cpp:161
+#: behaviour.cpp:171
 msgid "D&elete"
 msgstr "删除(&E)"
 
@@ -191,27 +204,28 @@ msgstr "桌面 %1"
 msgid "Sound Files"
 msgstr "声音文件"
 
-#: desktopbehavior_impl.cpp:136
+#: desktopbehavior_impl.cpp:137
 msgid "&Left button:"
 msgstr "左键(&L)："
 
-#: desktopbehavior_impl.cpp:137
+#: desktopbehavior_impl.cpp:138
 msgid ""
 "You can choose what happens when you click the left button of your pointing "
 "device on the desktop:"
 msgstr "您可以选择在桌面上点击定点设备左按钮时的动作："
 
-#: desktopbehavior_impl.cpp:140
+#: desktopbehavior_impl.cpp:141
 msgid "Right b&utton:"
 msgstr "右键(&U)："
 
-#: desktopbehavior_impl.cpp:141
+#: desktopbehavior_impl.cpp:142
 msgid ""
 "You can choose what happens when you click the right button of your pointing "
 "device on the desktop:"
 msgstr "您可以选择在桌面上点击指点设备右按钮时的动作："
 
-#: desktopbehavior_impl.cpp:157 desktopbehavior_impl.cpp:203
+#: desktopbehavior_impl.cpp:158 desktopbehavior_impl.cpp:204
+#, fuzzy
 msgid ""
 " "
 "<ul>"
@@ -224,8 +238,8 @@ msgid ""
 "<li><em>Desktop menu:</em> a context menu for the desktop pops up. Among other "
 "things, this menu has options for configuring the display, locking the screen, "
 "and logging out of TDE.</li> "
-"<li><em>Application menu:</em> the \"K\" menu pops up. This might be useful for "
-"quickly accessing applications if you like to keep the panel (also known as "
+"<li><em>Application menu:</em> the \"TDE\" menu pops up. This might be useful "
+"for quickly accessing applications if you like to keep the panel (also known as "
 "\"Kicker\") hidden from view.</li></ul>"
 msgstr ""
 "<ul>"
@@ -235,7 +249,8 @@ msgstr ""
 "<li><em>桌面菜单：</em>桌面的上下文菜单。该菜单包括了屏幕显示、屏幕锁定、退出TDE的选项。</li>"
 "<li><em>应用程序菜单：</em>“Kicker”菜单。快速访问应用程序。</li></ul>"
 
-#: desktopbehavior_impl.cpp:178
+#: desktopbehavior_impl.cpp:179
+#, fuzzy
 msgid ""
 "You can choose what happens when you click the middle button of your pointing "
 "device on the desktop: "
@@ -249,8 +264,8 @@ msgid ""
 "<li><em>Desktop menu:</em> a context menu for the desktop pops up. Among other "
 "things, this menu has options for configuring the display, locking the screen, "
 "and logging out of TDE.</li> "
-"<li><em>Application menu:</em> the \"K\" menu pops up. This might be useful for "
-"quickly accessing applications if you like to keep the panel (also known as "
+"<li><em>Application menu:</em> the \"TDE\" menu pops up. This might be useful "
+"for quickly accessing applications if you like to keep the panel (also known as "
 "\"Kicker\") hidden from view.</li></ul>"
 msgstr ""
 "选择当按鼠标中键点击桌面上的设备图标所要发生的事件："
@@ -261,35 +276,35 @@ msgstr ""
 "<li><em>桌面菜单：</em>桌面的上下文菜单。该菜单包括了屏幕显示、屏幕锁定、退出TDE的选项。</li>"
 "<li><em>应用程序菜单：</em>“Kicker”菜单。快速访问应用程序。</li></ul>"
 
-#: desktopbehavior_impl.cpp:269
+#: desktopbehavior_impl.cpp:290
 msgid "No Action"
 msgstr "无动作"
 
-#: desktopbehavior_impl.cpp:270
+#: desktopbehavior_impl.cpp:291
 msgid "Window List Menu"
 msgstr "窗口列表菜单"
 
-#: desktopbehavior_impl.cpp:271
+#: desktopbehavior_impl.cpp:292
 msgid "Desktop Menu"
 msgstr "桌面菜单"
 
-#: desktopbehavior_impl.cpp:272
+#: desktopbehavior_impl.cpp:293
 msgid "Application Menu"
 msgstr "应用程序菜单"
 
-#: desktopbehavior_impl.cpp:273
+#: desktopbehavior_impl.cpp:294
 msgid "Bookmarks Menu"
 msgstr "书签菜单"
 
-#: desktopbehavior_impl.cpp:274
+#: desktopbehavior_impl.cpp:295
 msgid "Custom Menu 1"
 msgstr "自定义菜单 1"
 
-#: desktopbehavior_impl.cpp:275
+#: desktopbehavior_impl.cpp:296
 msgid "Custom Menu 2"
 msgstr "自定义菜单 2"
 
-#: desktopbehavior_impl.cpp:458
+#: desktopbehavior_impl.cpp:480
 msgid ""
 "<h1>Behavior</h1>\n"
 "This module allows you to choose various options\n"
@@ -401,17 +416,18 @@ msgid ""
 msgstr "<p>在下列协议上允许预览、“文件夹图标反映内容”及获取摘要数据：</p>"
 
 #: previews.cpp:68
+#, fuzzy
 msgid ""
 "<h1>Preview Options</h1> Here you can modify the behavior of Konqueror when it "
 "shows the files in a folder."
-"<h2>The list of protocols:</h2> check the protocols over which previews should "
+"<h2>The list of protocols:</h2> Check the protocols over which previews should "
 "be shown; uncheck those over which they should not. For instance, you might "
 "want to show previews over SMB if the local network is fast enough, but you "
 "might disable it for FTP if you often visit very slow FTP sites with large "
 "images."
-"<h2>Maximum File Size:</h2> select the maximum file size for which previews "
-"should be generated. For instance, if set to 1 MB (the default), no preview "
-"will be generated for files bigger than 1 MB, for speed reasons."
+"<h2>Maximum File Size:</h2> Select the maximum file size for which previews "
+"should be generated. For instance, if set to 10 MB (the default), no preview "
+"will be generated for files bigger than 10 MB, for speed reasons."
 msgstr ""
 "<h1>预览选项</h1>您可以在这里修改 Konqueror 在文件夹中显示文件的行为。"
 "<h2>协议列表</h2>：选中应该被预览的协议，不选那些不应预览的协议。比如，假如本地网络足够快，您可能想 SMB "
@@ -653,18 +669,24 @@ msgstr "设备图标"
 
 #. i18n: file desktopbehavior.ui line 373
 #: rc.cpp:88
-#, no-c-format
-msgid "&Show device icons:"
+#, fuzzy, no-c-format
+msgid "&Show device icons"
 msgstr "显示设备图标(&S)："
 
-#. i18n: file desktopbehavior.ui line 379
+#. i18n: file desktopbehavior.ui line 381
 #: rc.cpp:91
+#, fuzzy, no-c-format
+msgid "&Show free space overlay on device icons"
+msgstr "显示设备图标(&S)："
+
+#. i18n: file desktopbehavior.ui line 387
+#: rc.cpp:94
 #, no-c-format
 msgid "Device Types to Display"
 msgstr "要显示的设备类型"
 
-#. i18n: file desktopbehavior.ui line 398
-#: rc.cpp:94
+#. i18n: file desktopbehavior.ui line 406
+#: rc.cpp:97
 #, no-c-format
 msgid "Deselect the device types which you do not want to see on the desktop."
 msgstr "不要选择那些您不想在桌面上出现的设备。"
@@ -712,15 +734,77 @@ msgid ""
 "This folder will be used by default to load or save documents from or to."
 msgstr "该文件夹默认将被用来载入或保存文档。"
 
-#: rootopts.cpp:202 rootopts.cpp:217
+#: rootopts.cpp:117
+#, fuzzy
+msgid "Download path:"
+msgstr "文档路径(&O)："
+
+#: rootopts.cpp:124
+#, fuzzy
+msgid ""
+"This folder will be used by default to load or save downloads from or to."
+msgstr "该文件夹默认将被用来载入或保存文档。"
+
+#: rootopts.cpp:129
+msgid "Music path:"
+msgstr ""
+
+#: rootopts.cpp:136
+#, fuzzy
+msgid "This folder will be used by default to load or save music from or to."
+msgstr "该文件夹默认将被用来载入或保存文档。"
+
+#: rootopts.cpp:141
+#, fuzzy
+msgid "Pictures path:"
+msgstr "文档路径(&O)："
+
+#: rootopts.cpp:148
+#, fuzzy
+msgid ""
+"This folder will be used by default to load or save pictures from or to."
+msgstr "该文件夹默认将被用来载入或保存文档。"
+
+#: rootopts.cpp:153
+msgid "Public Share path:"
+msgstr ""
+
+#: rootopts.cpp:160
+#, fuzzy
+msgid ""
+"This folder will be used by default to load or save public shared files from or "
+"to."
+msgstr "该文件夹默认将被用来载入或保存文档。"
+
+#: rootopts.cpp:165
+msgid "Templates path:"
+msgstr ""
+
+#: rootopts.cpp:172
+#, fuzzy
+msgid ""
+"This folder will be used by default to load or save templates from or to."
+msgstr "该文件夹默认将被用来载入或保存文档。"
+
+#: rootopts.cpp:177
+#, fuzzy
+msgid "Videos path:"
+msgstr "桌面路径(&K)："
+
+#: rootopts.cpp:184
+#, fuzzy
+msgid "This folder will be used by default to load or save videos from or to."
+msgstr "该文件夹默认将被用来载入或保存文档。"
+
+#: rootopts.cpp:312 rootopts.cpp:326
 msgid "Autostart"
 msgstr "自动启动"
 
-#: rootopts.cpp:206
+#: rootopts.cpp:316
 msgid "Desktop"
 msgstr "桌面"
 
-#: rootopts.cpp:275
+#: rootopts.cpp:512
 msgid ""
 "The path for '%1' has been changed;\n"
 "do you want the files to be moved from '%2' to '%3'?"
@@ -728,6 +812,6 @@ msgstr ""
 "“%1”的路径已经更改；\n"
 "您要把文件从“%2”移到“%3”吗？"
 
-#: rootopts.cpp:276
+#: rootopts.cpp:513
 msgid "Confirmation Required"
 msgstr "请求确认"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmkonqhtml.po b/tde-i18n-zh_CN/messages/tdebase/kcmkonqhtml.po
index b3dc3ff988e..09a3d3e7de5 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmkonqhtml.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmkonqhtml.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2007-10-22 01:14+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-22 12:49+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,10 +30,6 @@ msgid ""
 "Your emails"
 msgstr "i18n-translation@lists.linux.net.cn"
 
-#: advancedTabDialog.cpp:39 htmlopts.cpp:98
-msgid "Advanced Options"
-msgstr "高级选项"
-
 #: appearance.cpp:33
 msgid ""
 "<h1>Konqueror Fonts</h1>On this page, you can configure which fonts Konqueror "
@@ -258,7 +255,7 @@ msgstr ""
 "<h1>Konqueror AdBlocK</h1>Konqueror AdBlocK 允许您创建一组过滤器列表，而 Konqueror "
 "将会把这些过滤器应用到链接的图像和框架上。匹配的 URL 将被忽略，或者替换为占位图像。"
 
-#: htmlopts.cpp:41
+#: htmlopts.cpp:45
 msgid ""
 "<h1>Konqueror Browser</h1> Here you can configure Konqueror's browser "
 "functionality. Please note that the file manager functionality has to be "
@@ -270,117 +267,94 @@ msgstr ""
 "的浏览器功能。请注意，文件管理器的功能是在“文件管理器”配置模块中配置的。您可以设置 Konqueror 在装入网页时如何处理其中的 HTML "
 "代码。通常不必更改这里的全部设置。"
 
-#: htmlopts.cpp:49
+#: htmlopts.cpp:53
 msgid "Boo&kmarks"
 msgstr "书签(&K)"
 
-#: htmlopts.cpp:50
+#: htmlopts.cpp:54
 msgid "Ask for name and folder when adding bookmarks"
 msgstr "添加书签时询问名称和文件夹"
 
-#: htmlopts.cpp:51
+#: htmlopts.cpp:55
 msgid ""
 "If this box is checked, Konqueror will allow you to change the title of the "
 "bookmark and choose a folder in which to store it when you add a new bookmark."
 msgstr "若选中了此框，Konqueror 将会允许您添加新书签时更改书签的标题并选择书签所在的文件夹。"
 
-#: htmlopts.cpp:55
+#: htmlopts.cpp:59
 msgid "Show only marked bookmarks in bookmark toolbar"
 msgstr "只在书签工具栏中显示打标记的书签"
 
-#: htmlopts.cpp:56
+#: htmlopts.cpp:60
 msgid ""
 "If this box is checked, Konqueror will show only those bookmarks in the "
 "bookmark toolbar which you have marked to do so in the bookmark editor."
 msgstr "若选中了此框，Konqueror 将只会书签工具栏中显示您在书签编辑器中打了标记的那些书签。"
 
-#: htmlopts.cpp:65
+#: htmlopts.cpp:69
 msgid "Form Com&pletion"
 msgstr "表单补全(&P)"
 
-#: htmlopts.cpp:66
-msgid "Enable completion of &forms"
+#: htmlopts.cpp:70
+#, fuzzy
+msgid "Enable com&pletion of forms"
 msgstr "启用表单补全(&F)"
 
-#: htmlopts.cpp:67
+#: htmlopts.cpp:71
 msgid ""
 "If this box is checked, Konqueror will remember the data you enter in web forms "
 "and suggest it in similar fields for all forms."
 msgstr "如果启用该选项，Konqueror 将记住您在表单中输入的数据，在以后的表单中的同样的字段中将提示这些数据。"
 
-#: htmlopts.cpp:72
+#: htmlopts.cpp:76
 msgid "&Maximum completions:"
 msgstr "最多补全(&M)："
 
-#: htmlopts.cpp:75
+#: htmlopts.cpp:79
 msgid ""
 "Here you can select how many values Konqueror will remember for a form field."
 msgstr "您可以选择 Konqueror 为一个表单字段记住多少个值。"
 
-#: htmlopts.cpp:83
-msgid "Tabbed Browsing"
-msgstr "标签式浏览"
-
-#: htmlopts.cpp:86
-msgid "Open &links in new tab instead of in new window"
-msgstr "在新的标签而不是在新窗口中打开链接(&L)"
-
 #: htmlopts.cpp:87
-msgid ""
-"This will open a new tab instead of a new window in various situations, such as "
-"choosing a link or a folder with the middle mouse button."
-msgstr "这将在各种情况下在新标签而不是新窗口中打开，如用鼠标中键选择链接或者文件夹。"
-
-#: htmlopts.cpp:92
-msgid "Hide the tab bar when only one tab is open"
-msgstr "仅打开一个标签时隐藏标签栏"
-
-#: htmlopts.cpp:93
-msgid ""
-"This will display the tab bar only if there are two or more tabs. Otherwise it "
-"will always be displayed."
-msgstr "仅当打开了两个或更多标签时才显示标签栏。否则，将会总是显示标签栏。"
-
-#: htmlopts.cpp:108
 msgid "Mouse Beha&vior"
 msgstr "鼠标行为(&V)"
 
-#: htmlopts.cpp:110
+#: htmlopts.cpp:89
 msgid "Chan&ge cursor over links"
 msgstr "在链接上改变鼠标指针的形状(&G)"
 
-#: htmlopts.cpp:111
+#: htmlopts.cpp:90
 msgid ""
 "If this option is set, the shape of the cursor will change (usually to a hand) "
 "if it is moved over a hyperlink."
 msgstr "如果设置了这个选项，当鼠标移动到超级链接上时，指针将会改变形状(通常会是一个手的形状)"
 
-#: htmlopts.cpp:115
+#: htmlopts.cpp:94
 msgid "M&iddle click opens URL in selection"
 msgstr "中键单击打开选中的 URL(&I)"
 
-#: htmlopts.cpp:117
+#: htmlopts.cpp:96
 msgid ""
 "If this box is checked, you can open the URL in the selection by middle "
 "clicking on a Konqueror view."
 msgstr "如果选中了此框，您就可以在 Konqueror 视图中单击中键来打开选中的 URL。"
 
-#: htmlopts.cpp:121
+#: htmlopts.cpp:100
 msgid "Right click goes &back in history"
 msgstr "右键单击在历史中后退(&B)"
 
-#: htmlopts.cpp:123
+#: htmlopts.cpp:102
 msgid ""
 "If this box is checked, you can go back in history by right clicking on a "
 "Konqueror view. To access the context menu, press the right mouse button and "
 "move."
 msgstr "如果选中此框，只需在 Konqueror 视图中单击鼠标右键即可在历史中后退。如果想要访问快捷菜单，请按鼠标右键并移动。"
 
-#: htmlopts.cpp:132
+#: htmlopts.cpp:111
 msgid "A&utomatically load images"
 msgstr "自动装入图像(&U)"
 
-#: htmlopts.cpp:133
+#: htmlopts.cpp:112
 msgid ""
 "If this box is checked, Konqueror will automatically load any images that are "
 "embedded in a web page. Otherwise, it will display placeholders for the images, "
@@ -391,11 +365,23 @@ msgstr ""
 "如果选中此框，Konqueror 将会自动装入网页中嵌入的任何图像。否则，将在图像的位置显示占位符。您可以单击图像按钮手动装入图像。"
 "<br>除非您的网络连接速度非常慢，否则您可能想要选中此框来增强您的浏览体验。"
 
-#: htmlopts.cpp:138
+#: htmlopts.cpp:117
+#, fuzzy
+msgid "Enable &favicons"
+msgstr "启用过滤器"
+
+#: htmlopts.cpp:118
+msgid ""
+"If this box is checked, Konqueror will automatically load and display favicon "
+"images that are associated with a web page. These images appear in the Location "
+"bar. Otherwise a generic image will appear."
+msgstr ""
+
+#: htmlopts.cpp:123
 msgid "Dra&w frame around not completely loaded images"
 msgstr "在尚未完全装入的图像周围绘制边框(&W)"
 
-#: htmlopts.cpp:139
+#: htmlopts.cpp:124
 msgid ""
 "If this box is checked, Konqueror will draw a frame as placeholder around not "
 "yet fully loaded images that are embedded in a web page."
@@ -405,37 +391,37 @@ msgstr ""
 "如果选中此框，Konqueror 将会在尚未完全装入的网页嵌入图像周围显示框架，作为占位符。"
 "<br>除非您的网络连接速度非常慢，否则您可能想要选中此框来增强您的浏览体验。"
 
-#: htmlopts.cpp:144
+#: htmlopts.cpp:129
 msgid "Allow automatic delayed &reloading/redirecting"
 msgstr "允许自动延迟刷新/重定向(&R)"
 
-#: htmlopts.cpp:146
+#: htmlopts.cpp:131
 msgid ""
 "Some web pages request an automatic reload or redirection after a certain "
 "period of time. By unchecking this box Konqueror will ignore these requests."
 msgstr "某些网页会请求在经过一段时间后自动刷新或重定向。取消此框将使得 Konqueror 忽略这些请求。"
 
-#: htmlopts.cpp:158
+#: htmlopts.cpp:143
 msgid "Und&erline links:"
 msgstr "链接带下划线(&E)："
 
-#: htmlopts.cpp:161
+#: htmlopts.cpp:146
 msgid ""
 "_: underline\n"
 "Enabled"
 msgstr "已启用"
 
-#: htmlopts.cpp:162
+#: htmlopts.cpp:147
 msgid ""
 "_: underline\n"
 "Disabled"
 msgstr "已禁用"
 
-#: htmlopts.cpp:163
+#: htmlopts.cpp:148
 msgid "Only on Hover"
 msgstr "悬停"
 
-#: htmlopts.cpp:167
+#: htmlopts.cpp:152
 msgid ""
 "Controls how Konqueror handles underlining hyperlinks:"
 "<br>"
@@ -454,27 +440,28 @@ msgstr ""
 "<li><b>悬停</b>：仅当鼠标指向链接时才加下划线</li></ul>"
 "<br><i>请注意：网站的 CSS 定义可以覆盖此设置</i>"
 
-#: htmlopts.cpp:178
+#: htmlopts.cpp:163
 msgid "A&nimations:"
 msgstr "动画(&N)："
 
-#: htmlopts.cpp:181
+#: htmlopts.cpp:166
 msgid ""
 "_: animations\n"
 "Enabled"
 msgstr "已启用"
 
-#: htmlopts.cpp:182
+#: htmlopts.cpp:167
 msgid ""
 "_: animations\n"
 "Disabled"
 msgstr "已禁用"
 
-#: htmlopts.cpp:183
+#: htmlopts.cpp:168
 msgid "Show Only Once"
 msgstr "只显示一次"
 
-#: htmlopts.cpp:187
+#: htmlopts.cpp:172
+#, fuzzy
 msgid ""
 "Controls how Konqueror shows animated images:"
 "<br>"
@@ -482,7 +469,7 @@ msgid ""
 "<li><b>Enabled</b>: Show all animations completely.</li>"
 "<li><b>Disabled</b>: Never show animations, show the start image only.</li>"
 "<li><b>Show only once</b>: Show all animations completely but do not repeat "
-"them.</li>"
+"them.</li></ul>"
 msgstr ""
 "控制 Konqueror 如何显示动画图像："
 "<br>"
@@ -491,6 +478,35 @@ msgstr ""
 "<li><b>禁用</b>：从不显示动画，只显示起始图像。</li>"
 "<li><b>只显示一次</b>：完整显示所有动画，但并不重复。</li>"
 
+#: htmlopts.cpp:180
+msgid "Sm&ooth scrolling"
+msgstr ""
+
+#: htmlopts.cpp:183
+#, fuzzy
+msgid ""
+"_: SmoothScrolling\n"
+"Enabled"
+msgstr "已启用"
+
+#: htmlopts.cpp:184
+#, fuzzy
+msgid ""
+"_: SmoothScrolling\n"
+"Disabled"
+msgstr "已禁用"
+
+#: htmlopts.cpp:189
+msgid ""
+"Determines whether Konqueror should use smooth steps to scroll HTML pages, or "
+"whole steps:"
+"<br>"
+"<ul>"
+"<li><b>Always</b>: Always use smooth steps when scrolling.</li>"
+"<li><b>Never</b>: Never use smooth scrolling, scroll with whole steps "
+"instead.</li></ul>"
+msgstr ""
+
 #: javaopts.cpp:62 jsopts.cpp:48 pluginopts.cpp:59
 msgid "Global Settings"
 msgstr "全局设置"
@@ -616,7 +632,7 @@ msgstr ""
 "如果所有的小程序都被销毁，那么小程序服务器就应该关闭。但是，启动 Java 虚拟机很费时间。如果您想要在您浏览的时候仍然保留 Java "
 "进程，您可以将超时的值设置为您希望的值。要在 Konqueror 进程全程保留 Java 进程，请不要选中关闭小程序服务器。"
 
-#: javaopts.cpp:283 pluginopts.cpp:626
+#: javaopts.cpp:283 pluginopts.cpp:628
 msgid "Doma&in-Specific"
 msgstr "特定域(&I)"
 
@@ -901,19 +917,19 @@ msgstr "接受的语言："
 msgid "Accept character sets:"
 msgstr "接受字符集："
 
-#: main.cpp:82
+#: main.cpp:89
 msgid "kcmkonqhtml"
 msgstr "kcmkonqhtml"
 
-#: main.cpp:82
+#: main.cpp:89
 msgid "Konqueror Browsing Control Module"
 msgstr "Konqueror 浏览控制模块"
 
-#: main.cpp:84
+#: main.cpp:91
 msgid "(c) 1999 - 2001 The Konqueror Developers"
 msgstr "(C) 1999 - 2001 Konqueror 开发者"
 
-#: main.cpp:94
+#: main.cpp:101
 msgid ""
 "JavaScript access controls\n"
 "Per-domain policies extensions"
@@ -921,15 +937,15 @@ msgstr ""
 "JavaScript 访问控制\n"
 "特定域策略扩展"
 
-#: main.cpp:106
+#: main.cpp:113
 msgid "&Java"
 msgstr "&Java"
 
-#: main.cpp:110
+#: main.cpp:117
 msgid "Java&Script"
 msgstr "Java&Script"
 
-#: main.cpp:159
+#: main.cpp:166
 msgid ""
 "<h2>JavaScript</h2>On this page, you can configure whether JavaScript programs "
 "embedded in web pages should be allowed to be executed by Konqueror."
@@ -967,7 +983,7 @@ msgstr "插件的 CPU 优先级：%1"
 msgid "Domain-Specific Settin&gs"
 msgstr "特定域的设置(&G)"
 
-#: pluginopts.cpp:86 pluginopts.cpp:593
+#: pluginopts.cpp:86 pluginopts.cpp:595
 msgid "Domain-Specific Policies"
 msgstr "特定域的策略"
 
@@ -1012,7 +1028,7 @@ msgstr ""
 "您可以在这里为特定的主机或域名设置插件策略。要添加新的策略，请单击<i>添加...</i>按钮并在对话框中提供必要的信息。要更改已有的策略，请单击<i>"
 "修改...</i>按钮并从策略对话框中选择新的策略。单击<i>删除</i>按钮将删除选中策略，这将使得对该域名应用默认的策略设置。"
 
-#: pluginopts.cpp:129 pluginopts.cpp:523
+#: pluginopts.cpp:129 pluginopts.cpp:525
 msgid "Netscape Plugins"
 msgstr "Netscape 插件"
 
@@ -1077,35 +1093,35 @@ msgstr "正在扫描插件"
 msgid "Select Plugin Scan Folder"
 msgstr "选择插件扫描文件夹"
 
-#: pluginopts.cpp:546
+#: pluginopts.cpp:548
 msgid "Plugin"
 msgstr "插件"
 
-#: pluginopts.cpp:563
+#: pluginopts.cpp:565
 msgid "MIME type"
 msgstr "MIME 类型"
 
-#: pluginopts.cpp:568
+#: pluginopts.cpp:570
 msgid "Description"
 msgstr "描述"
 
-#: pluginopts.cpp:573
+#: pluginopts.cpp:575
 msgid "Suffixes"
 msgstr "后缀"
 
-#: pluginopts.cpp:638
+#: pluginopts.cpp:640
 msgid "New Plugin Policy"
 msgstr "新建插件策略"
 
-#: pluginopts.cpp:641
+#: pluginopts.cpp:643
 msgid "Change Plugin Policy"
 msgstr "修改插件策略"
 
-#: pluginopts.cpp:645
+#: pluginopts.cpp:647
 msgid "&Plugin policy:"
 msgstr "插件策略(&P)："
 
-#: pluginopts.cpp:646
+#: pluginopts.cpp:648
 msgid "Select a plugin policy for the above host or domain."
 msgstr "为以上主机或域选择插件策略。"
 
@@ -1114,210 +1130,273 @@ msgid "&Host or domain name:"
 msgstr "主机或域名(&H)："
 
 #: policydlg.cpp:40
+#, fuzzy
 msgid ""
-"Enter the name of a host (like www.kde.org) or a domain, starting with a dot "
-"(like .kde.org or .org)"
+"Enter the name of a host (like www.trinitydesktop.org) or a domain, starting "
+"with a dot (like .trinitydesktop.org or .org)"
 msgstr "输入主机名(如 www.kde.org)或以点起始的域名(如.kde.org 或.org)"
 
 #: policydlg.cpp:112
 msgid "You must first enter a domain name."
 msgstr "您必须先输入域名。"
 
-#. i18n: file advancedTabOptions.ui line 27
+#. i18n: file nsconfigwidget.ui line 17
 #: rc.cpp:3
 #, no-c-format
-msgid "<b>Advanced Options</b>"
-msgstr "<b>高级选项</b>"
+msgid "Netscape Plugin Config"
+msgstr "Netscape 插件配置"
 
-#. i18n: file advancedTabOptions.ui line 57
+#. i18n: file nsconfigwidget.ui line 40
 #: rc.cpp:6
 #, no-c-format
-msgid "O&pen new tabs in the background"
-msgstr "在后台打开新标签(&P)"
+msgid "Scan"
+msgstr "扫描"
 
-#. i18n: file advancedTabOptions.ui line 60
+#. i18n: file nsconfigwidget.ui line 59
 #: rc.cpp:9
 #, no-c-format
-msgid ""
-"This will open a new tab in the background, instead of in the foreground."
-msgstr "这将在后台打开新标签，否则将在前台打开。"
+msgid "&Scan for New Plugins"
+msgstr "扫描新插件(&S)"
 
-#. i18n: file advancedTabOptions.ui line 68
+#. i18n: file nsconfigwidget.ui line 62
 #: rc.cpp:12
 #, no-c-format
-msgid "Open &new tab after current tab"
-msgstr "在当前标签之后打开新标签(&N)"
+msgid "Click here to scan for newly installed Netscape plugins now."
+msgstr "单击此处扫描新安装的 Netscape 插件。"
 
-#. i18n: file advancedTabOptions.ui line 71
+#. i18n: file nsconfigwidget.ui line 89
 #: rc.cpp:15
 #, no-c-format
-msgid ""
-"This will open a new tab opened from a page after the current tab, instead of "
-"after the last tab."
-msgstr "这将在当前标签之后打开新标签，否则将在最后一个标签之后打开。"
+msgid "Scan for new plugins at &TDE startup"
+msgstr "TDE 启动时扫描新插件(&K)"
 
-#. i18n: file advancedTabOptions.ui line 79
+#. i18n: file nsconfigwidget.ui line 92
 #: rc.cpp:18
 #, no-c-format
-msgid "Confirm &when closing windows with multiple tabs"
-msgstr "关闭含有多页的窗口时确认(&W)"
-
-#. i18n: file advancedTabOptions.ui line 82
-#: rc.cpp:21
-#, no-c-format
 msgid ""
-"This will ask you whether you are sure you want to close a window when it has "
-"multiple tabs opened in it."
-msgstr "在您将要关闭多页的窗口时询问您是否确定。"
+"If this option is enabled, TDE will look for new Netscape plugins every time it "
+"starts up. This makes it easier for you if you often install new plugins, but "
+"it may also slow down TDE startup. You might want to disable this option, "
+"especially if you seldom install plugins."
+msgstr ""
+"如果启用此选项，TDE 将在每次启动的时候查找新的 Netscape 插件。如果您经常安装插件，这将非常方便，但可能放慢 TDE "
+"启动的时间。您可能想要禁用此选项，特别是您很少安装插件。"
 
-#. i18n: file advancedTabOptions.ui line 90
-#: rc.cpp:24
+#. i18n: file nsconfigwidget.ui line 106
+#: rc.cpp:21
 #, no-c-format
-msgid "&Show close button instead of website icon"
-msgstr "显示关闭按钮而不是网站图标(&S)"
+msgid "Scan Folders"
+msgstr "扫描文件夹"
 
-#. i18n: file advancedTabOptions.ui line 93
+#. i18n: file nsconfigwidget.ui line 128
 #: rc.cpp:27
 #, no-c-format
-msgid ""
-"This will display close buttons inside each tab instead of websites' icons."
-msgstr "这将在每个标签上显示关闭按钮，而不是网站的图标。"
+msgid "&New"
+msgstr "新建(&N)"
 
-#. i18n: file advancedTabOptions.ui line 101
+#. i18n: file nsconfigwidget.ui line 150
 #: rc.cpp:30
 #, no-c-format
-msgid "Open pop&ups in new tab instead of in new window"
-msgstr "在新的标签而不是在新窗口中打开弹出窗口(&U)"
+msgid "Do&wn"
+msgstr "下移(&W)"
 
-#. i18n: file advancedTabOptions.ui line 104
+#. i18n: file nsconfigwidget.ui line 161
 #: rc.cpp:33
 #, no-c-format
-msgid ""
-"Whether or not JavaScript popups if allowed shall open in a new tab or in a new "
-"window."
-msgstr "允许的 JavaScript 弹出窗口是应该在新标签还是在新窗口中打开。"
+msgid "&Up"
+msgstr "上移(&U)"
 
-#. i18n: file advancedTabOptions.ui line 112
+#. i18n: file nsconfigwidget.ui line 203
 #: rc.cpp:36
 #, no-c-format
-msgid "Activate previous used tab when closing the current tab"
-msgstr "关闭当前标签时激活先前使用的标签"
-
-#. i18n: file advancedTabOptions.ui line 115
-#: rc.cpp:39
-#, no-c-format
-msgid ""
-"When checking this the previous used or opened tab will be activated when you "
-"close the current active tab instead of the one right to the current tab."
-msgstr "选中此项时，当您关闭当前激活的标签时将会打开先前使用或打开的标签，而不是当前标签右侧的标签。"
+msgid "Plugins"
+msgstr "插件"
 
-#. i18n: file advancedTabOptions.ui line 123
+#. i18n: file nsconfigwidget.ui line 223
 #: rc.cpp:42
 #, no-c-format
-msgid "Open as tab in existing Konqueror when URL is called externally"
-msgstr "从外部调用 URL 时，在已有 Konqueror 中打开相应的标签"
+msgid "Value"
+msgstr "值"
 
-#. i18n: file advancedTabOptions.ui line 126
+#. i18n: file nsconfigwidget.ui line 239
 #: rc.cpp:45
 #, no-c-format
-msgid ""
-"When you click a URL in another TDE program or call kfmclient to open a URL, "
-"the current desktop will be searched for a non-minimized Konqueror and, if "
-"found, the URL opened as a new tab within it. Otherwise a new Konqueror window "
-"will be opened with the required URL."
-msgstr ""
-"当您在其它 TDE 程序中点击 URL 或调用 kfmclient 打开 URL 时，系统将会搜索当前桌面，看有没有非最小化的 "
-"Konqueror。如果有的话，该 URL 将会打开为其中的一个新标签。否则，将会为所请求的 URL 打开一个新的 Konqueror 窗口。"
+msgid "Here you can see a list of the Netscape plugins TDE has found."
+msgstr "您可以在这里看到 TDE 已经找到的 Netscape 插件列表。"
 
-#. i18n: file nsconfigwidget.ui line 17
+#. i18n: file nsconfigwidget.ui line 250
 #: rc.cpp:48
 #, no-c-format
-msgid "Netscape Plugin Config"
-msgstr "Netscape 插件配置"
+msgid "Use a&rtsdsp to pipe plugin sound through aRts"
+msgstr "通过 aRts 使用 artsdsp 处理插件声音(&R)"
 
-#. i18n: file nsconfigwidget.ui line 40
+#. i18n: file userInterOpts.ui line 35
 #: rc.cpp:51
 #, no-c-format
-msgid "Scan"
-msgstr "扫描"
+msgid "Tabbed Browsing"
+msgstr "标签式浏览"
 
-#. i18n: file nsconfigwidget.ui line 59
+#. i18n: file userInterOpts.ui line 54
 #: rc.cpp:54
 #, no-c-format
-msgid "&Scan for New Plugins"
-msgstr "扫描新插件(&S)"
+msgid "Open &links in new tab instead of in new window"
+msgstr "在新的标签而不是在新窗口中打开链接(&L)"
 
-#. i18n: file nsconfigwidget.ui line 62
+#. i18n: file userInterOpts.ui line 57
 #: rc.cpp:57
 #, no-c-format
-msgid "Click here to scan for newly installed Netscape plugins now."
-msgstr "单击此处扫描新安装的 Netscape 插件。"
+msgid ""
+"This will open a new tab instead of a new window in various situations, such as "
+"choosing a link or a folder with the middle mouse button."
+msgstr "这将在各种情况下在新标签而不是新窗口中打开，如用鼠标中键选择链接或者文件夹。"
 
-#. i18n: file nsconfigwidget.ui line 89
+#. i18n: file userInterOpts.ui line 65
 #: rc.cpp:60
-#, no-c-format
-msgid "Scan for new plugins at &TDE startup"
-msgstr "TDE 启动时扫描新插件(&K)"
+#, fuzzy, no-c-format
+msgid "&Hide the tab bar when only one tab is open"
+msgstr "仅打开一个标签时隐藏标签栏"
 
-#. i18n: file nsconfigwidget.ui line 92
+#. i18n: file userInterOpts.ui line 68
 #: rc.cpp:63
 #, no-c-format
 msgid ""
-"If this option is enabled, TDE will look for new Netscape plugins every time it "
-"starts up. This makes it easier for you if you often install new plugins, but "
-"it may also slow down TDE startup. You might want to disable this option, "
-"especially if you seldom install plugins."
-msgstr ""
-"如果启用此选项，TDE 将在每次启动的时候查找新的 Netscape 插件。如果您经常安装插件，这将非常方便，但可能放慢 TDE "
-"启动的时间。您可能想要禁用此选项，特别是您很少安装插件。"
+"This will display the tab bar only if there are two or more tabs. Otherwise it "
+"will always be displayed."
+msgstr "仅当打开了两个或更多标签时才显示标签栏。否则，将会总是显示标签栏。"
 
-#. i18n: file nsconfigwidget.ui line 106
+#. i18n: file userInterOpts.ui line 76
 #: rc.cpp:66
 #, no-c-format
-msgid "Scan Folders"
-msgstr "扫描文件夹"
+msgid "C&ycle tabs with mouse wheel"
+msgstr ""
 
-#. i18n: file nsconfigwidget.ui line 128
+#. i18n: file userInterOpts.ui line 79
+#: rc.cpp:69
+#, fuzzy, no-c-format
+msgid ""
+"This will cycle through tabs when there are two or more tabs using the mouse "
+"wheel."
+msgstr "仅当打开了两个或更多标签时才显示标签栏。否则，将会总是显示标签栏。"
+
+#. i18n: file userInterOpts.ui line 87
 #: rc.cpp:72
 #, no-c-format
-msgid "&New"
-msgstr "新建(&N)"
+msgid "O&pen new tabs in the background"
+msgstr "在后台打开新标签(&P)"
 
-#. i18n: file nsconfigwidget.ui line 150
+#. i18n: file userInterOpts.ui line 90
 #: rc.cpp:75
 #, no-c-format
-msgid "Do&wn"
-msgstr "下移(&W)"
+msgid ""
+"This will open a new tab in the background, instead of in the foreground."
+msgstr "这将在后台打开新标签，否则将在前台打开。"
 
-#. i18n: file nsconfigwidget.ui line 161
+#. i18n: file userInterOpts.ui line 98
 #: rc.cpp:78
 #, no-c-format
-msgid "&Up"
-msgstr "上移(&U)"
+msgid "Open &new tab after current tab"
+msgstr "在当前标签之后打开新标签(&N)"
 
-#. i18n: file nsconfigwidget.ui line 203
+#. i18n: file userInterOpts.ui line 101
 #: rc.cpp:81
 #, no-c-format
-msgid "Plugins"
-msgstr "插件"
+msgid ""
+"This will open a new tab opened from a page after the current tab, instead of "
+"after the last tab."
+msgstr "这将在当前标签之后打开新标签，否则将在最后一个标签之后打开。"
 
-#. i18n: file nsconfigwidget.ui line 223
+#. i18n: file userInterOpts.ui line 109
+#: rc.cpp:84
+#, no-c-format
+msgid "Confirm &when closing windows with multiple tabs"
+msgstr "关闭含有多页的窗口时确认(&W)"
+
+#. i18n: file userInterOpts.ui line 112
 #: rc.cpp:87
 #, no-c-format
-msgid "Value"
-msgstr "值"
+msgid ""
+"This will ask you whether you are sure you want to close a window when it has "
+"multiple tabs opened in it."
+msgstr "在您将要关闭多页的窗口时询问您是否确定。"
 
-#. i18n: file nsconfigwidget.ui line 239
+#. i18n: file userInterOpts.ui line 120
 #: rc.cpp:90
 #, no-c-format
-msgid "Here you can see a list of the Netscape plugins TDE has found."
-msgstr "您可以在这里看到 TDE 已经找到的 Netscape 插件列表。"
+msgid "&Show close button instead of website icon"
+msgstr "显示关闭按钮而不是网站图标(&S)"
 
-#. i18n: file nsconfigwidget.ui line 250
+#. i18n: file userInterOpts.ui line 123
 #: rc.cpp:93
 #, no-c-format
-msgid "Use a&rtsdsp to pipe plugin sound through aRts"
-msgstr "通过 aRts 使用 artsdsp 处理插件声音(&R)"
+msgid ""
+"This will display close buttons inside each tab instead of websites' icons."
+msgstr "这将在每个标签上显示关闭按钮，而不是网站的图标。"
+
+#. i18n: file userInterOpts.ui line 131
+#: rc.cpp:96
+#, fuzzy, no-c-format
+msgid "&Show close button instead of website icon with mouse hover"
+msgstr "显示关闭按钮而不是网站图标(&S)"
+
+#. i18n: file userInterOpts.ui line 134
+#: rc.cpp:99
+#, fuzzy, no-c-format
+msgid ""
+"This will display a close button inside each tab instead of websites' icons "
+"when the mouse pointer hovers the icon."
+msgstr "这将在每个标签上显示关闭按钮，而不是网站的图标。"
+
+#. i18n: file userInterOpts.ui line 142
+#: rc.cpp:102
+#, no-c-format
+msgid "Open pop&ups in new tab instead of in new window"
+msgstr "在新的标签而不是在新窗口中打开弹出窗口(&U)"
+
+#. i18n: file userInterOpts.ui line 145
+#: rc.cpp:105
+#, no-c-format
+msgid ""
+"Whether or not JavaScript popups if allowed shall open in a new tab or in a new "
+"window."
+msgstr "允许的 JavaScript 弹出窗口是应该在新标签还是在新窗口中打开。"
+
+#. i18n: file userInterOpts.ui line 153
+#: rc.cpp:108
+#, no-c-format
+msgid "Open as tab in existing Konqueror when URL is called externally"
+msgstr "从外部调用 URL 时，在已有 Konqueror 中打开相应的标签"
+
+#. i18n: file userInterOpts.ui line 156
+#: rc.cpp:111
+#, no-c-format
+msgid ""
+"When you click a URL in another TDE program or call kfmclient to open a URL, "
+"the current desktop will be searched for a non-minimized Konqueror and, if "
+"found, the URL opened as a new tab within it. Otherwise a new Konqueror window "
+"will be opened with the required URL."
+msgstr ""
+"当您在其它 TDE 程序中点击 URL 或调用 kfmclient 打开 URL 时，系统将会搜索当前桌面，看有没有非最小化的 "
+"Konqueror。如果有的话，该 URL 将会打开为其中的一个新标签。否则，将会为所请求的 URL 打开一个新的 Konqueror 窗口。"
+
+#. i18n: file userInterOpts.ui line 164
+#: rc.cpp:114
+#, no-c-format
+msgid "Activate previous used tab when closing the current tab"
+msgstr "关闭当前标签时激活先前使用的标签"
+
+#. i18n: file userInterOpts.ui line 167
+#: rc.cpp:117
+#, no-c-format
+msgid ""
+"When checking this the previous used or opened tab will be activated when you "
+"close the current active tab instead of the one right to the current tab."
+msgstr "选中此项时，当您关闭当前激活的标签时将会打开先前使用或打开的标签，而不是当前标签右侧的标签。"
+
+#~ msgid "Advanced Options"
+#~ msgstr "高级选项"
+
+#~ msgid "<b>Advanced Options</b>"
+#~ msgstr "<b>高级选项</b>"
 
 #~ msgid "Import.."
 #~ msgstr "导入..."
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmkonsole.po b/tde-i18n-zh_CN/messages/tdebase/kcmkonsole.po
index 6cb5b346f81..d86056c20d1 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmkonsole.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmkonsole.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkonsole\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-28 14:43+0800\n"
 "Last-Translator: Xiong Jiang <jxiong@offtopic.org>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,8 +29,9 @@ msgid ""
 msgstr "i18n-translation@lists.linux.net.cn"
 
 #: kcmkonsole.cpp:43
+#, fuzzy
 msgid ""
-"<h1>Konsole</h1> With this module you can configure Konsole, the TDE terminal "
+"<h1>Konsole</h1> With this module you can configure Konsole, the KDE terminal "
 "application. You can configure the generic Konsole options (which can also be "
 "configured using the RMB) and you can edit the schemas and sessions available "
 "to Konsole."
@@ -51,7 +53,7 @@ msgstr "KCM Konsole"
 msgid "KControl module for Konsole configuration"
 msgstr "用于配置 Konsole 的 KControl 模块"
 
-#: kcmkonsole.cpp:162
+#: kcmkonsole.cpp:171
 msgid ""
 "The Ctrl+S/Ctrl+Q flow control setting will only affect newly started Konsole "
 "sessions.\n"
@@ -61,7 +63,7 @@ msgstr ""
 "Ctrl+S/Ctrl+Q 流控设置将只在新打开的 Konsole 会话中有效。\n"
 "已经存在的 Konsole 会话可以用“stty”命令改变流控设置。"
 
-#: kcmkonsole.cpp:170
+#: kcmkonsole.cpp:179
 msgid ""
 "You have chosen to enable bidirectional text rendering by default.\n"
 "Note that bidirectional text may not always be shown correctly, especially when "
@@ -79,506 +81,512 @@ msgstr ""
 msgid "&General"
 msgstr "常规(&G)"
 
-#. i18n: file kcmkonsoledialog.ui line 70
+#. i18n: file kcmkonsoledialog.ui line 78
 #: rc.cpp:6
 #, no-c-format
-msgid "Double Click"
-msgstr "双击"
-
-#. i18n: file kcmkonsoledialog.ui line 81
-#: rc.cpp:9
-#, no-c-format
-msgid "Consider the following characters &part of a word when double clicking:"
-msgstr "双击选定单词时将下列字符当作单词内的字符(&P)："
-
-#. i18n: file kcmkonsoledialog.ui line 107
-#: rc.cpp:12
-#, no-c-format
-msgid "Misc"
-msgstr "杂项"
-
-#. i18n: file kcmkonsoledialog.ui line 118
-#: rc.cpp:15
-#, no-c-format
 msgid "Show terminal si&ze after resizing"
 msgstr "改变大小后显示终端尺寸(&Z)"
 
-#. i18n: file kcmkonsoledialog.ui line 126
-#: rc.cpp:18
+#. i18n: file kcmkonsoledialog.ui line 86
+#: rc.cpp:9
 #, no-c-format
 msgid "Show &frame"
 msgstr "显示边框(&F)"
 
-#. i18n: file kcmkonsoledialog.ui line 134
-#: rc.cpp:21
+#. i18n: file kcmkonsoledialog.ui line 94
+#: rc.cpp:12
 #, no-c-format
 msgid "&Confirm quit when closing more than one session"
 msgstr "关闭多个会话时确认退出(&C)"
 
-#. i18n: file kcmkonsoledialog.ui line 142
-#: rc.cpp:24
+#. i18n: file kcmkonsoledialog.ui line 102
+#: rc.cpp:15
 #, no-c-format
 msgid "&Blinking cursor"
 msgstr "光标闪烁(&B)"
 
-#. i18n: file kcmkonsoledialog.ui line 150
-#: rc.cpp:27
+#. i18n: file kcmkonsoledialog.ui line 110
+#: rc.cpp:18
 #, no-c-format
 msgid "&Require Ctrl key for drag and drop"
 msgstr "拖放操作必需使用 Ctrl 键(&R)"
 
-#. i18n: file kcmkonsoledialog.ui line 158
-#: rc.cpp:30
+#. i18n: file kcmkonsoledialog.ui line 118
+#: rc.cpp:21
 #, no-c-format
 msgid "Triple click selects &only from the current word forward"
 msgstr "三击只选择当前单词后面的内容(&O)"
 
-#. i18n: file kcmkonsoledialog.ui line 166
-#: rc.cpp:33
+#. i18n: file kcmkonsoledialog.ui line 126
+#: rc.cpp:24
 #, no-c-format
 msgid "Allow progr&ams to resize terminal window"
 msgstr "允许程序改变终端窗口大小(&A)"
 
-#. i18n: file kcmkonsoledialog.ui line 174
+#. i18n: file kcmkonsoledialog.ui line 134
+#: rc.cpp:27
+#, fuzzy, no-c-format
+msgid "&Use Ctrl+S/Ctrl+Q flow control"
+msgstr "使用 Ctrl+S/Ctrl+Q 流控"
+
+#. i18n: file kcmkonsoledialog.ui line 142
+#: rc.cpp:30
+#, fuzzy, no-c-format
+msgid "E&nable bidirectional text rendering"
+msgstr "启用双向文字渲染"
+
+#. i18n: file kcmkonsoledialog.ui line 150
+#: rc.cpp:33
+#, fuzzy, no-c-format
+msgid "Set &tab title to match window title"
+msgstr "将标签标题设定为匹配窗口标题"
+
+#. i18n: file kcmkonsoledialog.ui line 158
 #: rc.cpp:36
 #, no-c-format
-msgid "Use Ctrl+S/Ctrl+Q flow control"
-msgstr "使用 Ctrl+S/Ctrl+Q 流控"
+msgid "Cycle tabs &with mouse wheel"
+msgstr ""
 
-#. i18n: file kcmkonsoledialog.ui line 199
+#. i18n: file kcmkonsoledialog.ui line 166
 #: rc.cpp:39
 #, no-c-format
-msgid "Enable bidirectional text rendering"
-msgstr "启用双向文字渲染"
+msgid "Enable main &menu accelerator keys"
+msgstr ""
 
-#. i18n: file kcmkonsoledialog.ui line 215
+#. i18n: file kcmkonsoledialog.ui line 174
 #: rc.cpp:42
 #, no-c-format
-msgid "Seconds to detect s&ilence:"
-msgstr "空闲检测的门限秒数(&I)："
+msgid "Handle Meta &key as Alt Key"
+msgstr ""
 
-#. i18n: file kcmkonsoledialog.ui line 269
+#. i18n: file kcmkonsoledialog.ui line 190
 #: rc.cpp:45
 #, no-c-format
 msgid "&Line spacing:"
 msgstr "行间距(&L)："
 
-#. i18n: file kcmkonsoledialog.ui line 297
+#. i18n: file kcmkonsoledialog.ui line 262
 #: rc.cpp:48
 #, no-c-format
-msgid "Set tab title to match window title"
-msgstr "将标签标题设定为匹配窗口标题"
+msgid "Seconds to detect s&ilence:"
+msgstr "空闲检测的门限秒数(&I)："
 
-#. i18n: file kcmkonsoledialog.ui line 309
+#. i18n: file kcmkonsoledialog.ui line 292
 #: rc.cpp:51
 #, no-c-format
+msgid "Consider the following characters &part of a word when double clicking:"
+msgstr "双击选定单词时将下列字符当作单词内的字符(&P)："
+
+#. i18n: file kcmkonsoledialog.ui line 320
+#: rc.cpp:54
+#, no-c-format
 msgid "&Schema"
 msgstr "方案(&S)"
 
-#. i18n: file kcmkonsoledialog.ui line 327
-#: rc.cpp:54
+#. i18n: file kcmkonsoledialog.ui line 338
+#: rc.cpp:57
 #, no-c-format
 msgid "S&ession"
 msgstr "会话(&E)"
 
 #. i18n: file schemadialog.ui line 16
-#: rc.cpp:57
+#: rc.cpp:60
 #, no-c-format
 msgid "Konsole Schema Editor"
 msgstr "Konsole 方案编辑器"
 
 #. i18n: file schemadialog.ui line 42
-#: rc.cpp:60
+#: rc.cpp:63
 #, no-c-format
 msgid "&Title:"
 msgstr "标题(&T)："
 
 #. i18n: file schemadialog.ui line 76
-#: rc.cpp:63
+#: rc.cpp:66
 #, no-c-format
 msgid "Colors"
 msgstr "颜色"
 
 #. i18n: file schemadialog.ui line 87
-#: rc.cpp:66
+#: rc.cpp:69
 #, no-c-format
 msgid "Shell co&lor:"
 msgstr "Shell 颜色(&L)："
 
 #. i18n: file schemadialog.ui line 98
-#: rc.cpp:69
+#: rc.cpp:72
 #, no-c-format
 msgid "&Bold"
 msgstr "粗体(&B)"
 
 #. i18n: file schemadialog.ui line 129
-#: rc.cpp:72 rc.cpp:225
+#: rc.cpp:75 rc.cpp:228
 #, no-c-format
 msgid "Custom"
 msgstr "自定义"
 
 #. i18n: file schemadialog.ui line 134
-#: rc.cpp:75
+#: rc.cpp:78
 #, no-c-format
 msgid "System Background"
 msgstr "系统背景色"
 
 #. i18n: file schemadialog.ui line 139
-#: rc.cpp:78
+#: rc.cpp:81
 #, no-c-format
 msgid "System Foreground"
 msgstr "系统前景色"
 
 #. i18n: file schemadialog.ui line 144
-#: rc.cpp:81
+#: rc.cpp:84
 #, no-c-format
 msgid "Random Hue"
 msgstr "随机色调"
 
 #. i18n: file schemadialog.ui line 173
-#: rc.cpp:84
+#: rc.cpp:87
 #, no-c-format
 msgid "Trans&parent"
 msgstr "透明(&P)"
 
 #. i18n: file schemadialog.ui line 181
-#: rc.cpp:87
+#: rc.cpp:90
 #, no-c-format
 msgid "&Konsole color:"
 msgstr "&Konsole 颜色："
 
 #. i18n: file schemadialog.ui line 190
-#: rc.cpp:90
+#: rc.cpp:93
 #, no-c-format
 msgid "0 - Foreground Color"
 msgstr "0 - 前景色"
 
 #. i18n: file schemadialog.ui line 195
-#: rc.cpp:93
+#: rc.cpp:96
 #, no-c-format
 msgid "1 - Background Color"
 msgstr "1 - 背景色"
 
 #. i18n: file schemadialog.ui line 200
-#: rc.cpp:96
+#: rc.cpp:99
 #, no-c-format
 msgid "2 - Color 0 (black)"
 msgstr "2 - 颜色0 (黑)"
 
 #. i18n: file schemadialog.ui line 205
-#: rc.cpp:99
+#: rc.cpp:102
 #, no-c-format
 msgid "3 - Color 1 (red)"
 msgstr "3 - 颜色1 (红)"
 
 #. i18n: file schemadialog.ui line 210
-#: rc.cpp:102
+#: rc.cpp:105
 #, no-c-format
 msgid "4 - Color 2 (green)"
 msgstr "4 - 颜色2 (红)"
 
 #. i18n: file schemadialog.ui line 215
-#: rc.cpp:105
+#: rc.cpp:108
 #, no-c-format
 msgid "5 - Color 3 (yellow)"
 msgstr "5 - 颜色3 (黄)"
 
 #. i18n: file schemadialog.ui line 220
-#: rc.cpp:108
+#: rc.cpp:111
 #, no-c-format
 msgid "6 - Color 4 (blue)"
 msgstr "6 - 颜色4 (蓝)"
 
 #. i18n: file schemadialog.ui line 225
-#: rc.cpp:111
+#: rc.cpp:114
 #, no-c-format
 msgid "7 - Color 5 (magenta)"
 msgstr "7 - 颜色5 (紫)"
 
 #. i18n: file schemadialog.ui line 230
-#: rc.cpp:114
+#: rc.cpp:117
 #, no-c-format
 msgid "8 - Color 6 (cyan)"
 msgstr "8 - 颜色6 (青)"
 
 #. i18n: file schemadialog.ui line 235
-#: rc.cpp:117
+#: rc.cpp:120
 #, no-c-format
 msgid "9 - Color 7 (white)"
 msgstr "9 - 颜色7 (白)"
 
 #. i18n: file schemadialog.ui line 240
-#: rc.cpp:120
+#: rc.cpp:123
 #, no-c-format
 msgid "10 - Foreground Intensive Color"
 msgstr "10 - 前景色增强"
 
 #. i18n: file schemadialog.ui line 245
-#: rc.cpp:123
+#: rc.cpp:126
 #, no-c-format
 msgid "11 - Background Intensive Color"
 msgstr "11 - 背景色增强"
 
 #. i18n: file schemadialog.ui line 250
-#: rc.cpp:126
+#: rc.cpp:129
 #, no-c-format
 msgid "12 - Color 0 Intensive (gray)"
 msgstr "12 - 颜色 0 增强(灰)"
 
 #. i18n: file schemadialog.ui line 255
-#: rc.cpp:129
+#: rc.cpp:132
 #, no-c-format
 msgid "13 - Color 1 Intensive (light red)"
 msgstr "13 - 颜色 1 增强(浅红)"
 
 #. i18n: file schemadialog.ui line 260
-#: rc.cpp:132
+#: rc.cpp:135
 #, no-c-format
 msgid "14 - Color 2 Intensive (light green)"
 msgstr "14 - 颜色 2 增强(浅绿)"
 
 #. i18n: file schemadialog.ui line 265
-#: rc.cpp:135
+#: rc.cpp:138
 #, no-c-format
 msgid "15 - Color 3 Intensive (light yellow)"
 msgstr "15 - 颜色 3 增强(浅黄)"
 
 #. i18n: file schemadialog.ui line 270
-#: rc.cpp:138
+#: rc.cpp:141
 #, no-c-format
 msgid "16 - Color 4 Intensive (light blue)"
 msgstr "16 - 颜色 4 增强(浅蓝)"
 
 #. i18n: file schemadialog.ui line 275
-#: rc.cpp:141
+#: rc.cpp:144
 #, no-c-format
 msgid "17 - Color 5 Intensive (light magenta)"
 msgstr "17 - 颜色 5 增强(浅品红)"
 
 #. i18n: file schemadialog.ui line 280
-#: rc.cpp:144
+#: rc.cpp:147
 #, no-c-format
 msgid "18 - Color 6 Intensive (light cyan)"
 msgstr "18 - 颜色 6 增强(浅青)"
 
 #. i18n: file schemadialog.ui line 285
-#: rc.cpp:147
+#: rc.cpp:150
 #, no-c-format
 msgid "19 - Color 7 Intensive (white)"
 msgstr "19 - 颜色 7 增强(白)"
 
 #. i18n: file schemadialog.ui line 307
-#: rc.cpp:150
+#: rc.cpp:153
 #, no-c-format
 msgid "Schema"
 msgstr "方案"
 
 #. i18n: file schemadialog.ui line 323
-#: rc.cpp:153
+#: rc.cpp:156
 #, no-c-format
 msgid "S&et as default schema"
 msgstr "设为默认方案(&E)"
 
 #. i18n: file schemadialog.ui line 339
-#: rc.cpp:156
+#: rc.cpp:159
 #, no-c-format
 msgid "Sa&ve Schema..."
 msgstr "保存方案(&V)..."
 
 #. i18n: file schemadialog.ui line 347
-#: rc.cpp:159
+#: rc.cpp:162
 #, no-c-format
 msgid "&Remove Schema"
 msgstr "删除方案(&R)"
 
 #. i18n: file schemadialog.ui line 376
-#: rc.cpp:162
+#: rc.cpp:165
 #, no-c-format
 msgid "Background"
 msgstr "背景"
 
 #. i18n: file schemadialog.ui line 409
-#: rc.cpp:165
+#: rc.cpp:168
 #, no-c-format
 msgid "..."
 msgstr "..."
 
 #. i18n: file schemadialog.ui line 415
-#: rc.cpp:168
+#: rc.cpp:171
 #, no-c-format
 msgid "Tiled"
 msgstr "平铺"
 
 #. i18n: file schemadialog.ui line 420
-#: rc.cpp:171
+#: rc.cpp:174
 #, no-c-format
 msgid "Centered"
 msgstr "居中"
 
 #. i18n: file schemadialog.ui line 425
-#: rc.cpp:174
+#: rc.cpp:177
 #, no-c-format
 msgid "Full"
 msgstr "拉伸"
 
 #. i18n: file schemadialog.ui line 437
-#: rc.cpp:177
+#: rc.cpp:180
 #, no-c-format
 msgid "&Image:"
 msgstr "图片(&I)："
 
 #. i18n: file schemadialog.ui line 448
-#: rc.cpp:180
+#: rc.cpp:183
 #, no-c-format
 msgid "Min"
 msgstr "最弱"
 
 #. i18n: file schemadialog.ui line 467
-#: rc.cpp:183
+#: rc.cpp:186
 #, no-c-format
 msgid "Max"
 msgstr "最强"
 
 #. i18n: file schemadialog.ui line 475
-#: rc.cpp:186
+#: rc.cpp:189
 #, no-c-format
 msgid "Shade t&o:"
 msgstr "滤镜色(&O)："
 
 #. i18n: file schemadialog.ui line 528
-#: rc.cpp:189
+#: rc.cpp:192
 #, no-c-format
 msgid "Tr&ansparent"
 msgstr "透明(&A)"
 
 #. i18n: file sessiondialog.ui line 16
-#: rc.cpp:192
+#: rc.cpp:195
 #, no-c-format
 msgid "Konsole Session Editor"
 msgstr "Konsole 会话编辑器"
 
 #. i18n: file sessiondialog.ui line 59
-#: rc.cpp:198
+#: rc.cpp:201
 #, no-c-format
 msgid "<Default>"
 msgstr "<默认>"
 
 #. i18n: file sessiondialog.ui line 64
-#: rc.cpp:201
+#: rc.cpp:204
 #, no-c-format
 msgid "Normal"
 msgstr "正常"
 
 #. i18n: file sessiondialog.ui line 69
-#: rc.cpp:204
+#: rc.cpp:207
 #, no-c-format
 msgid "Tiny"
 msgstr "很小"
 
 #. i18n: file sessiondialog.ui line 74
-#: rc.cpp:207
+#: rc.cpp:210
 #, no-c-format
 msgid "Small"
 msgstr "小"
 
 #. i18n: file sessiondialog.ui line 79
-#: rc.cpp:210
+#: rc.cpp:213
 #, no-c-format
 msgid "Medium"
 msgstr "中"
 
 #. i18n: file sessiondialog.ui line 84
-#: rc.cpp:213
+#: rc.cpp:216
 #, no-c-format
 msgid "Large"
 msgstr "大"
 
 #. i18n: file sessiondialog.ui line 89
-#: rc.cpp:216
+#: rc.cpp:219
 #, no-c-format
 msgid "Huge"
 msgstr "巨大"
 
 #. i18n: file sessiondialog.ui line 94
-#: rc.cpp:219
+#: rc.cpp:222
 #, no-c-format
 msgid "Linux"
 msgstr "Linux"
 
 #. i18n: file sessiondialog.ui line 99
-#: rc.cpp:222
+#: rc.cpp:225
 #, no-c-format
 msgid "Unicode"
 msgstr "Unicode"
 
 #. i18n: file sessiondialog.ui line 137
-#: rc.cpp:228
+#: rc.cpp:231
 #, no-c-format
 msgid "&Font:"
 msgstr "字体(&F)："
 
 #. i18n: file sessiondialog.ui line 153
-#: rc.cpp:231
+#: rc.cpp:234
 #, no-c-format
 msgid "S&chema:"
 msgstr "方案(&C)："
 
 #. i18n: file sessiondialog.ui line 164
-#: rc.cpp:234
+#: rc.cpp:237
 #, no-c-format
 msgid "$&TERM:"
 msgstr "$&TERM："
 
 #. i18n: file sessiondialog.ui line 175
-#: rc.cpp:237
+#: rc.cpp:240
 #, no-c-format
 msgid "&Keytab:"
 msgstr "键盘表(&K)："
 
 #. i18n: file sessiondialog.ui line 222
-#: rc.cpp:240
+#: rc.cpp:243
 #, no-c-format
 msgid "&Icon:"
 msgstr "图标(&I)："
 
 #. i18n: file sessiondialog.ui line 238
-#: rc.cpp:243
+#: rc.cpp:246
 #, no-c-format
 msgid "Session"
 msgstr "会话"
 
 #. i18n: file sessiondialog.ui line 262
-#: rc.cpp:246
+#: rc.cpp:249
 #, no-c-format
 msgid "Sa&ve Session..."
 msgstr "保存会话(&V)..."
 
 #. i18n: file sessiondialog.ui line 270
-#: rc.cpp:249
+#: rc.cpp:252
 #, no-c-format
 msgid "&Remove Session"
 msgstr "删除会话(&R)"
 
 #. i18n: file sessiondialog.ui line 307
-#: rc.cpp:252
+#: rc.cpp:255
 #, no-c-format
 msgid "General"
 msgstr "常规"
 
 #. i18n: file sessiondialog.ui line 342
-#: rc.cpp:255
+#: rc.cpp:258
 #, no-c-format
 msgid "&Name:"
 msgstr "名字(&N)："
 
 #. i18n: file sessiondialog.ui line 353
-#: rc.cpp:258
+#: rc.cpp:261
 #, no-c-format
 msgid "E&xecute:"
 msgstr "执行(&X)："
 
 #. i18n: file sessiondialog.ui line 364
-#: rc.cpp:261
+#: rc.cpp:264
 #, no-c-format
 msgid "&Directory:"
 msgstr "目录(&D)："
@@ -715,3 +723,9 @@ msgstr ""
 #: sessioneditor.cpp:369
 msgid "Error Removing Session"
 msgstr "删除会话出错"
+
+#~ msgid "Double Click"
+#~ msgstr "双击"
+
+#~ msgid "Misc"
+#~ msgstr "杂项"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmkurifilt.po b/tde-i18n-zh_CN/messages/tdebase/kcmkurifilt.po
index 5ae366b56f0..d02657e5899 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmkurifilt.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmkurifilt.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2006-09-29 02:33+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-01-11 01:43+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,13 +19,14 @@ msgid "Under construction..."
 msgstr "建设中..."
 
 #: main.cpp:49
+#, fuzzy
 msgid ""
 "<h1>Enhanced Browsing</h1> In this module you can configure some enhanced "
 "browsing features of TDE. "
 "<h2>Internet Keywords</h2>Internet Keywords let you type in the name of a "
 "brand, a project, a celebrity, etc... and go to the relevant location. For "
-"example you can just type \"TDE\" or \"K Desktop Environment\" in Konqueror to "
-"go to TDE's homepage."
+"example you can just type \"TDE\" or \"Trinity Desktop Environment\" in "
+"Konqueror to go to TDE's homepage."
 "<h2>Web Shortcuts</h2>Web Shortcuts are a quick way of using Web search "
 "engines. For example, type \"altavista:frobozz\" or \"av:frobozz\" and "
 "Konqueror will do a search on AltaVista for \"frobozz\". Even easier: just "
@@ -306,10 +308,10 @@ msgstr "<qt><b>%1</b> 没有主文件夹。</qt>"
 msgid "<qt>There is no user called <b>%1</b>.</qt>"
 msgstr "<qt>没有叫做 <b>%1</b> 的用户。</qt>"
 
-#: plugins/shorturi/tdeshorturifilter.cpp:504
+#: plugins/shorturi/tdeshorturifilter.cpp:526
 msgid "<qt>The file or folder <b>%1</b> does not exist."
 msgstr "<qt>文件或文件夹 <b>%1</b> 不存在。"
 
-#: plugins/shorturi/tdeshorturifilter.cpp:521
+#: plugins/shorturi/tdeshorturifilter.cpp:543
 msgid "&ShortURLs"
 msgstr "快捷网址(&S)"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmkwm.po b/tde-i18n-zh_CN/messages/tdebase/kcmkwm.po
index beb2188c64e..38542354059 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmkwm.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmkwm.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkwm\n"
-"POT-Creation-Date: 2006-04-11 03:54+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-08-01 07:26+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -64,12 +65,13 @@ msgid "(c) 1997 - 2002 KWin and KControl Authors"
 msgstr "(c) 1997 - 2002 KWin 和 KControl 作者"
 
 #: main.cpp:190
+#, fuzzy
 msgid ""
 "<h1>Window Behavior</h1> Here you can customize the way windows behave when "
 "being moved, resized or clicked on. You can also specify a focus policy as well "
 "as a placement policy for new windows. "
 "<p>Please note that this configuration will not take effect if you do not use "
-"KWin as your window manager. If you do use a different window manager, please "
+"TWin as your window manager. If you do use a different window manager, please "
 "refer to its documentation for how to customize window behavior."
 msgstr ""
 "<h1>窗口行为</h1>您可以在这里自定义窗口移动、改变大小或被点击时的行为。您可以指定焦点策略和新窗口的放置策略。"
@@ -394,31 +396,31 @@ msgstr "激活、放在前面并移动"
 msgid "Resize"
 msgstr "更改大小"
 
-#: windows.cpp:122
+#: windows.cpp:125
 msgid "Focus"
 msgstr "焦点"
 
-#: windows.cpp:129
+#: windows.cpp:132
 msgid "&Policy:"
 msgstr "策略(&P)："
 
-#: windows.cpp:132
+#: windows.cpp:135
 msgid "Click to Focus"
 msgstr "点击获取焦点"
 
-#: windows.cpp:133
+#: windows.cpp:136
 msgid "Focus Follows Mouse"
 msgstr "焦点跟随鼠标"
 
-#: windows.cpp:134
+#: windows.cpp:137
 msgid "Focus Under Mouse"
 msgstr "焦点置于鼠标下"
 
-#: windows.cpp:135
+#: windows.cpp:138
 msgid "Focus Strictly Under Mouse"
 msgstr "焦点严格置于鼠标下"
 
-#: windows.cpp:140
+#: windows.cpp:143
 msgid ""
 "The focus policy is used to determine the active window, i.e. the window you "
 "can work in. "
@@ -447,66 +449,159 @@ msgstr ""
 "<li><em>焦点严格置于鼠标下：</em> 这比“焦点置于鼠标下”还差。只有鼠标下的窗口才激活。如果鼠标没有指到任何窗口，则没有窗口拥有焦点。</ul>"
 "注意“焦点置于鼠标下”和“焦点严格置于鼠标下”将可能会导致某些特性在 TDE 模式下工作不正常，如 Alt+Tab 窗口浏览对话框。"
 
-#: windows.cpp:165
+#: windows.cpp:168
 msgid "Auto &raise"
 msgstr "自动放置在前(&R)"
 
-#: windows.cpp:170 windows.cpp:183 windows.cpp:546
+#: windows.cpp:173 windows.cpp:186 windows.cpp:645
 msgid "Dela&y:"
 msgstr "延时(&Y)："
 
-#: windows.cpp:173 windows.cpp:186 windows.cpp:549 windows.cpp:577
+#: windows.cpp:176 windows.cpp:189 windows.cpp:648 windows.cpp:676
 msgid " msec"
 msgstr " 毫秒"
 
-#: windows.cpp:178
+#: windows.cpp:181
 msgid "Delay focus"
 msgstr "延迟聚焦"
 
-#: windows.cpp:189
-msgid "C&lick raise active window"
+#: windows.cpp:192
+#, fuzzy
+msgid "Click &raises active window"
 msgstr "点击升起激活窗口(&L)"
 
-#: windows.cpp:196
+#: windows.cpp:199
+#, fuzzy
+msgid "Focus stealing prevention &level:"
+msgstr "避免抢占焦点的程度："
+
+#: windows.cpp:202
+msgid ""
+"_: Focus Stealing Prevention Level\n"
+"None"
+msgstr "无"
+
+#: windows.cpp:203
+msgid ""
+"_: Focus Stealing Prevention Level\n"
+"Low"
+msgstr "低"
+
+#: windows.cpp:204
+msgid ""
+"_: Focus Stealing Prevention Level\n"
+"Normal"
+msgstr "普通"
+
+#: windows.cpp:205
+msgid ""
+"_: Focus Stealing Prevention Level\n"
+"High"
+msgstr "高"
+
+#: windows.cpp:206
+msgid ""
+"_: Focus Stealing Prevention Level\n"
+"Extreme"
+msgstr "终极"
+
+#: windows.cpp:209
+#, fuzzy
+msgid ""
+"<p>This option specifies how much TWin will try to prevent unwanted focus "
+"stealing caused by unexpected activation of new windows. (Note: This feature "
+"does not work with the Focus Under Mouse or Focus Strictly Under Mouse focus "
+"policies.)"
+"<ul>"
+"<li><em>None:</em> Prevention is turned off and new windows always become "
+"activated.</li>"
+"<li><em>Low:</em> Prevention is enabled; when some window does not have support "
+"for the underlying mechanism and TWin cannot reliably decide whether to "
+"activate the window or not, it will be activated. This setting may have both "
+"worse and better results than normal level, depending on the applications.</li>"
+"<li><em>Normal:</em> Prevention is enabled.</li>"
+"<li><em>High:</em> New windows get activated only if no window is currently "
+"active or if they belong to the currently active application. This setting is "
+"probably not really usable when not using mouse focus policy.</li>"
+"<li><em>Extreme:</em> All windows must be explicitly activated by the user.</li>"
+"</ul></p>"
+"<p>Windows that are prevented from stealing focus are marked as demanding "
+"attention, which by default means their taskbar entry will be highlighted. This "
+"can be changed in the Notifications control module.</p>"
+msgstr ""
+"<p>此选项指定了 KWin 应该如何因新窗口的无意激活而导致焦点被抢。(请注意：此特性与“焦点置于鼠标下”和“焦点严格置于鼠标下”策略不兼容。)"
+"<ul>"
+"<li><em>无：</em>不进行避免，新窗口总是被激活。</li>"
+"<li><em>低：</em>启用避免；如果某些窗口不支持后台规则，且 KWin "
+"无法可靠的确定是否要激活该窗口，则会激活该窗口。这一设置可能比普通级别的效果更差或更好，这取决于具体的应用程序。</li>"
+"<li><em>普通：</em>启用避免；默认设置。</li>"
+"<li><em>高：</em>仅当没有激活窗口或新窗口属于当前应用程序时，才会激活新窗口。如果不使用鼠标聚焦策略的话，这一设置可能不怎么常用。</li>"
+"<li><em>终极：</em>全部窗口都必须由用户显式激活。</li></ul></p>"
+"<p>标为避免获取焦点的窗口引起注意的默认方式是突出显示其任务栏项。您可以在通知控制模块中更改。</p>"
+
+#: windows.cpp:231
 msgid ""
 "When this option is enabled, a window in the background will automatically come "
 "to the front when the mouse pointer has been over it for some time."
 msgstr "这个选项启用时，当鼠标光标移动到窗口上一段时间后，在后面背景里的窗口将自动出现在最前面。"
 
-#: windows.cpp:198
+#: windows.cpp:233
 msgid ""
 "This is the delay after which the window that the mouse pointer is over will "
 "automatically come to the front."
 msgstr "当鼠标移动到窗口上后，延迟这么长时间窗口就会自动出现在最前面。"
 
-#: windows.cpp:202
+#: windows.cpp:237
 msgid ""
 "When this option is enabled, the active window will be brought to the front "
 "when you click somewhere into the window contents. To change it for inactive "
 "windows, you need to change the settings in the Actions tab."
 msgstr "这个选项启用时，当您点击活动窗口中的内容时，该窗口将会被带到顶层。要更改非活动窗口的特性，您需要在动作标签中更改设置。"
 
-#: windows.cpp:207
+#: windows.cpp:242
 msgid ""
 "When this option is enabled, there will be a delay after which the window the "
 "mouse pointer is over will become active (receive focus)."
 msgstr "启用此选项时，当鼠标移动到窗口上后，延迟一段时间后窗口就会自动出现在最前面(接受焦点)。"
 
-#: windows.cpp:209
+#: windows.cpp:244
 msgid ""
 "This is the delay after which the window the mouse pointer is over will "
 "automatically receive focus."
 msgstr "当鼠标移动到窗口上后，延迟这么长时间窗口就会自动出现在最前面。"
 
-#: windows.cpp:214
+#: windows.cpp:247
+msgid "S&eparate screen focus"
+msgstr ""
+
+#: windows.cpp:249
+msgid ""
+"When this option is enabled, focus operations are limited only to the active "
+"Xinerama screen"
+msgstr ""
+
+#: windows.cpp:252
+#, fuzzy
+msgid "Active &mouse screen"
+msgstr "激活并放在前面"
+
+#: windows.cpp:254
+msgid ""
+"When this option is enabled, active Xinerama screen (where for example new "
+"windows appear) is the screen with the mouse pointer. When disabled, the active "
+"Xinerama screen is the screen with the focused window. This option is by "
+"default disabled for Click to focus and enabled for other focus policies."
+msgstr ""
+
+#: windows.cpp:270
 msgid "Navigation"
 msgstr "导航"
 
-#: windows.cpp:218
+#: windows.cpp:274
 msgid "Show window list while switching windows"
 msgstr "切换窗口时显示窗口列表"
 
-#: windows.cpp:221
+#: windows.cpp:277
 msgid ""
 "Hold down the Alt key and press the Tab key repeatedly to walk through the "
 "windows on the current desktop (the Alt+Tab combination can be reconfigured).\n"
@@ -524,173 +619,107 @@ msgstr ""
 "\n"
 "否则，焦点将转移到新选中的窗口，而不显示弹出部件。此外，先前激活的窗口将会被自动推到最后。"
 
-#: windows.cpp:233
+#: windows.cpp:289
 msgid "&Traverse windows on all desktops"
 msgstr "遍历所有桌面上的窗口(&T)"
 
-#: windows.cpp:236
+#: windows.cpp:292
 msgid ""
 "Leave this option disabled if you want to limit walking through windows to the "
 "current desktop."
 msgstr "如果您希望仅限于遍历当前桌面上的窗口，请禁用该选项。"
 
-#: windows.cpp:240
+#: windows.cpp:296
 msgid "Desktop navi&gation wraps around"
 msgstr "桌面导航时自动卷绕(&G)"
 
-#: windows.cpp:243
+#: windows.cpp:299
 msgid ""
 "Enable this option if you want keyboard or active desktop border navigation "
 "beyond the edge of a desktop to take you to the opposite edge of the new "
 "desktop."
 msgstr "如果您希望用键盘或者鼠标切换桌面时，每当越过边界上的桌面就卷绕到对边上的桌面时，请启用这个选项。"
 
-#: windows.cpp:247
-msgid "Popup desktop name on desktop &switch"
+#: windows.cpp:303
+#, fuzzy
+msgid "Popup &desktop name on desktop switch"
 msgstr "桌面切换时弹出桌面名字(&S)"
 
-#: windows.cpp:250
+#: windows.cpp:306
 msgid ""
 "Enable this option if you wish to see the current desktop name popup whenever "
 "the current desktop is changed."
 msgstr "如果您希望在当前桌面改变后看到桌面的名字弹出来，请启用这个选项。"
 
-#: windows.cpp:535
+#: windows.cpp:634
 msgid "Shading"
 msgstr "卷起"
 
-#: windows.cpp:537
+#: windows.cpp:636
 msgid "Anima&te"
 msgstr "动画(&T)"
 
-#: windows.cpp:538
+#: windows.cpp:637
 msgid ""
 "Animate the action of reducing the window to its titlebar (shading) as well as "
 "the expansion of a shaded window"
 msgstr "动画显示窗口卷成标题栏和展开恢复成窗口的过程。"
 
-#: windows.cpp:541
+#: windows.cpp:640
 msgid "&Enable hover"
 msgstr "悬停展开(&E)"
 
-#: windows.cpp:551
+#: windows.cpp:650
 msgid ""
 "If Shade Hover is enabled, a shaded window will un-shade automatically when the "
 "mouse pointer has been over the title bar for some time."
 msgstr "如果悬停展开被启用，当鼠标指针在标题栏上停留一段时间后，卷起的窗口将自动展开。"
 
-#: windows.cpp:554
+#: windows.cpp:653
 msgid ""
 "Sets the time in milliseconds before the window unshades when the mouse pointer "
 "goes over the shaded window."
 msgstr "设置鼠标指针在卷起的窗口上停留多少毫秒后窗口自动展开。"
 
-#: windows.cpp:565
+#: windows.cpp:664
 msgid "Active Desktop Borders"
 msgstr "活动桌面边界"
 
-#: windows.cpp:568
+#: windows.cpp:667
 msgid ""
 "If this option is enabled, moving the mouse to a screen border will change your "
 "desktop. This is e.g. useful if you want to drag windows from one desktop to "
 "the other."
 msgstr "这个选项启用时，鼠标移动到屏幕边界将改变您的当前桌面。当您想把窗口拖拽到其它桌面时这特别有用。"
 
-#: windows.cpp:571
+#: windows.cpp:670
 msgid "D&isabled"
 msgstr "无效(&I)"
 
-#: windows.cpp:572
+#: windows.cpp:671
 msgid "Only &when moving windows"
 msgstr "只在移动窗口时切换桌面(&W)"
 
-#: windows.cpp:573
+#: windows.cpp:672
 msgid "A&lways enabled"
 msgstr "总是有效(&L)"
 
-#: windows.cpp:578
+#: windows.cpp:677
 msgid "Desktop &switch delay:"
 msgstr "桌面切换延时(&S)："
 
-#: windows.cpp:579
+#: windows.cpp:678
 msgid ""
 "Here you can set a delay for switching desktops using the active borders "
 "feature. Desktops will be switched after the mouse has been pushed against a "
 "screen border for the specified number of milliseconds."
 msgstr "这里您可以设置用活动桌面边界切换桌面的延时。当鼠标被推到屏幕边界一定时间(毫秒)后，桌面将自动切换。"
 
-#: windows.cpp:592
-msgid "Focus stealing prevention level:"
-msgstr "避免抢占焦点的程度："
-
-#: windows.cpp:594
-msgid ""
-"_: Focus Stealing Prevention Level\n"
-"None"
-msgstr "无"
-
-#: windows.cpp:595
-msgid ""
-"_: Focus Stealing Prevention Level\n"
-"Low"
-msgstr "低"
-
-#: windows.cpp:596
-msgid ""
-"_: Focus Stealing Prevention Level\n"
-"Normal"
-msgstr "普通"
-
-#: windows.cpp:597
-msgid ""
-"_: Focus Stealing Prevention Level\n"
-"High"
-msgstr "高"
-
-#: windows.cpp:598
-msgid ""
-"_: Focus Stealing Prevention Level\n"
-"Extreme"
-msgstr "终极"
-
-#: windows.cpp:602
-msgid ""
-"<p>This option specifies how much KWin will try to prevent unwanted focus "
-"stealing caused by unexpected activation of new windows. (Note: This feature "
-"does not work with the Focus Under Mouse or Focus Strictly Under Mouse focus "
-"policies.)"
-"<ul>"
-"<li><em>None:</em> Prevention is turned off and new windows always become "
-"activated.</li>"
-"<li><em>Low:</em> Prevention is enabled; when some window does not have support "
-"for the underlying mechanism and KWin cannot reliably decide whether to "
-"activate the window or not, it will be activated. This setting may have both "
-"worse and better results than normal level, depending on the applications.</li>"
-"<li><em>Normal:</em> Prevention is enabled.</li>"
-"<li><em>High:</em> New windows get activated only if no window is currently "
-"active or if they belong to the currently active application. This setting is "
-"probably not really usable when not using mouse focus policy.</li>"
-"<li><em>Extreme:</em> All windows must be explicitly activated by the user.</li>"
-"</ul></p>"
-"<p>Windows that are prevented from stealing focus are marked as demanding "
-"attention, which by default means their taskbar entry will be highlighted. This "
-"can be changed in the Notifications control module.</p>"
-msgstr ""
-"<p>此选项指定了 KWin 应该如何因新窗口的无意激活而导致焦点被抢。(请注意：此特性与“焦点置于鼠标下”和“焦点严格置于鼠标下”策略不兼容。)"
-"<ul>"
-"<li><em>无：</em>不进行避免，新窗口总是被激活。</li>"
-"<li><em>低：</em>启用避免；如果某些窗口不支持后台规则，且 KWin "
-"无法可靠的确定是否要激活该窗口，则会激活该窗口。这一设置可能比普通级别的效果更差或更好，这取决于具体的应用程序。</li>"
-"<li><em>普通：</em>启用避免；默认设置。</li>"
-"<li><em>高：</em>仅当没有激活窗口或新窗口属于当前应用程序时，才会激活新窗口。如果不使用鼠标聚焦策略的话，这一设置可能不怎么常用。</li>"
-"<li><em>终极：</em>全部窗口都必须由用户显式激活。</li></ul></p>"
-"<p>标为避免获取焦点的窗口引起注意的默认方式是突出显示其任务栏项。您可以在通知控制模块中更改。</p>"
-
-#: windows.cpp:625
+#: windows.cpp:690
 msgid "Hide utility windows for inactive applications"
 msgstr "隐藏非活动应用程序的工具窗口"
 
-#: windows.cpp:627
+#: windows.cpp:692
 msgid ""
 "When turned on, utility windows (tool windows, torn-off menus,...) of inactive "
 "applications will be hidden and will be shown only when the application becomes "
@@ -699,106 +728,106 @@ msgid ""
 msgstr ""
 "开启时，非活动应用程序的工具窗口(工具栏、私下的菜单)将被隐藏，而且仅当应用程序活动时才显示。请注意，要让此特性工作正常，应用程序必须将正确设定相应窗口的类型。"
 
-#: windows.cpp:780
+#: windows.cpp:834
 msgid "Windows"
 msgstr "窗口"
 
-#: windows.cpp:788
+#: windows.cpp:842
 msgid "Di&splay content in moving windows"
 msgstr "移动窗口时显示内容(&S)"
 
-#: windows.cpp:790
+#: windows.cpp:844
 msgid ""
 "Enable this option if you want a window's content to be fully shown while "
 "moving it, instead of just showing a window 'skeleton'. The result may not be "
 "satisfying on slow machines without graphic acceleration."
 msgstr "如果您希望移动窗口时显示它完整的内容，而不是仅显示一个“框架”，请启用这个选项。在没有图形加速的慢机器上，效果可能不令人满意。"
 
-#: windows.cpp:794
+#: windows.cpp:848
 msgid "Display content in &resizing windows"
 msgstr "改变窗口大小时显示内容(&R)"
 
-#: windows.cpp:796
+#: windows.cpp:850
 msgid ""
 "Enable this option if you want a window's content to be shown while resizing "
 "it, instead of just showing a window 'skeleton'. The result may not be "
 "satisfying on slow machines."
 msgstr "如果您希望改变窗口大小时显示窗口的内容，而不是仅显示一个“框架”，请启用这个选项。在慢速的机器上，效果可能不令人满意。"
 
-#: windows.cpp:800
+#: windows.cpp:854
 msgid "Display window &geometry when moving or resizing"
 msgstr "移动或者改变大小时显示窗口几何尺寸(&G)"
 
-#: windows.cpp:802
+#: windows.cpp:856
 msgid ""
 "Enable this option if you want a window's geometry to be displayed while it is "
 "being moved or resized. The window position relative to the top-left corner of "
 "the screen is displayed together with its size."
 msgstr "如果您要在移动或者改变大小时显示窗口几何尺寸，请启用此项。相对于屏幕左上角的窗口位置及其大小将会在移动时显示。"
 
-#: windows.cpp:812
+#: windows.cpp:866
 msgid "Animate minimi&ze and restore"
 msgstr "动画显示最小化和恢复(&Z)"
 
-#: windows.cpp:814
+#: windows.cpp:868
 msgid ""
 "Enable this option if you want an animation shown when windows are minimized or "
 "restored."
 msgstr "如果您希望最小化或恢复窗口时显示动画，请启用此选项。"
 
-#: windows.cpp:828
+#: windows.cpp:882
 msgid "Slow"
 msgstr "慢"
 
-#: windows.cpp:832
+#: windows.cpp:886
 msgid "Fast"
 msgstr "快"
 
-#: windows.cpp:836
+#: windows.cpp:890
 msgid ""
 "Here you can set the speed of the animation shown when windows are minimized "
 "and restored. "
 msgstr "您可以设置窗口最小化和恢复时的动画的速度。"
 
-#: windows.cpp:842
+#: windows.cpp:896
 msgid "Allow moving and resizing o&f maximized windows"
 msgstr "允许移动和改变最大化窗口的大小(&F)"
 
-#: windows.cpp:844
+#: windows.cpp:898
 msgid ""
 "When enabled, this feature activates the border of maximized windows and allows "
 "you to move or resize them, just like for normal windows"
 msgstr "启用时，该特性激活最大化窗口的边框，允许您移动或改变它们的大小，就象普通窗口一样。"
 
-#: windows.cpp:850
+#: windows.cpp:904
 msgid "&Placement:"
 msgstr "放置策略(&P)："
 
-#: windows.cpp:853
+#: windows.cpp:907
 msgid "Smart"
 msgstr "智能"
 
-#: windows.cpp:854
+#: windows.cpp:908
 msgid "Maximizing"
 msgstr "最大化"
 
-#: windows.cpp:855
+#: windows.cpp:909
 msgid "Cascade"
 msgstr "层叠"
 
-#: windows.cpp:856
+#: windows.cpp:910
 msgid "Random"
 msgstr "随机"
 
-#: windows.cpp:857
+#: windows.cpp:911
 msgid "Centered"
 msgstr "居中"
 
-#: windows.cpp:858
+#: windows.cpp:912
 msgid "Zero-Cornered"
 msgstr "边角"
 
-#: windows.cpp:865
+#: windows.cpp:919
 msgid ""
 "The placement policy determines where a new window will appear on the desktop. "
 "<ul> "
@@ -821,58 +850,59 @@ msgstr ""
 "<li><em>居中</em> 将把窗口居中放置</li> "
 "<li><em>边角</em> 将把窗口放在左上角</li></ul>"
 
-#: windows.cpp:904
+#: windows.cpp:958
 msgid "Snap Zones"
 msgstr "吸引区"
 
-#: windows.cpp:908 windows.cpp:917
+#: windows.cpp:962 windows.cpp:971
 msgid "none"
 msgstr "无"
 
-#: windows.cpp:910
+#: windows.cpp:964
 msgid "&Border snap zone:"
 msgstr "边界吸引区(&B)："
 
-#: windows.cpp:912
+#: windows.cpp:966
 msgid ""
 "Here you can set the snap zone for screen borders, i.e. the 'strength' of the "
 "magnetic field which will make windows snap to the border when moved near it."
 msgstr "您可以设置屏幕边界的吸引区，即磁场的“吸引力”，它使窗口移近边界时被吸引到边界上。"
 
-#: windows.cpp:919
+#: windows.cpp:973
 msgid "&Window snap zone:"
 msgstr "窗口吸引区(&W)："
 
-#: windows.cpp:921
+#: windows.cpp:975
 msgid ""
 "Here you can set the snap zone for windows, i.e. the 'strength' of the magnetic "
 "field which will make windows snap to each other when they're moved near "
 "another window."
 msgstr "您可以设置窗口的吸引区，即磁场的“吸引力”，它使窗口移近另外的窗口时彼此吸引到一起。"
 
-#: windows.cpp:925
+#: windows.cpp:979
 msgid "Snap windows onl&y when overlapping"
 msgstr "仅在重叠时才吸引窗口(&Y)"
 
-#: windows.cpp:926
+#: windows.cpp:980
 msgid ""
 "Here you can set that windows will be only snapped if you try to overlap them, "
 "i.e. they will not be snapped if the windows comes only near another window or "
 "border."
 msgstr "您可以在这里设置窗口只在重叠时才将它们的边界吸引到一起。即，如果它们只是相互靠近或者靠近屏幕边沿但尚未重叠，则不相互吸引。"
 
-#: windows.cpp:1023 windows.cpp:1027
+#: windows.cpp:1077 windows.cpp:1081
 msgid ""
 "_n:  pixel\n"
 " pixels"
 msgstr " 像素"
 
-#: windows.cpp:1226
+#: windows.cpp:1280
+#, fuzzy
 msgid ""
 "<qt><b>It seems that alpha channel support is not available.</b>"
 "<br>"
 "<br>Please make sure you have <a href=\"http://www.freedesktop.org/\">"
-"Xorg &ge; 6.8</a>, and installed the kompmgr that came with twin."
+"Xorg &ge; 6.8</a>, and installed the composition manager that came with twin."
 "<br>Also, make sure you have the following entries in your XConfig (e.g. "
 "/etc/X11/xorg.conf):"
 "<br>"
@@ -901,107 +931,134 @@ msgstr ""
 "<br><i>Option     \"RenderAccel\" \"true\"</i>"
 "<br>In <i>Section \"Device\"</i></qt>"
 
-#: windows.cpp:1246
+#: windows.cpp:1300
 msgid "Apply translucency only to decoration"
 msgstr "透明度仅适用于装饰"
 
-#: windows.cpp:1254
+#: windows.cpp:1308
 msgid "Active windows:"
 msgstr "活动窗口："
 
-#: windows.cpp:1261
+#: windows.cpp:1315
 msgid "Inactive windows:"
 msgstr "非活动窗口："
 
-#: windows.cpp:1268
+#: windows.cpp:1322
 msgid "Moving windows:"
 msgstr "移动窗口："
 
-#: windows.cpp:1275
+#: windows.cpp:1329
 msgid "Dock windows:"
 msgstr "停靠窗口："
 
-#: windows.cpp:1284
+#: windows.cpp:1338
 msgid "Treat 'keep above' windows as active ones"
 msgstr "将“常居顶端”的窗口当作活动窗口"
 
-#: windows.cpp:1287
+#: windows.cpp:1341
 msgid "Disable ARGB windows (ignores window alpha maps, fixes gtk1 apps)"
 msgstr "禁止 ARGB 窗口(忽略窗口的 alpha 映射，适用于 gtk1 应用程序)"
 
-#: windows.cpp:1291
+#: windows.cpp:1347
+msgid "Use OpenGL compositor (best performance)"
+msgstr ""
+
+#: windows.cpp:1354
 msgid "Opacity"
 msgstr "不透明度"
 
-#: windows.cpp:1297
-msgid "Use shadows"
-msgstr "使用阴影"
+#: windows.cpp:1360
+msgid ""
+"Use shadows (standard effects should be disabled in the Styles module if this "
+"is checked)"
+msgstr ""
 
-#: windows.cpp:1305
-msgid "Active window size:"
-msgstr "活动窗口大小："
+#: windows.cpp:1368
+#, fuzzy
+msgid "Base shadow radius:"
+msgstr "使用阴影"
 
-#: windows.cpp:1312
-msgid "Inactive window size:"
+#: windows.cpp:1375
+#, fuzzy
+msgid "Inactive window distance from background:"
 msgstr "非活动窗口大小："
 
-#: windows.cpp:1319
-msgid "Dock window size:"
-msgstr "停靠窗口大小："
+#: windows.cpp:1382
+msgid "Active window distance from background:"
+msgstr ""
 
-#: windows.cpp:1326
+#: windows.cpp:1389
+msgid "Dock distance from background:"
+msgstr ""
+
+#: windows.cpp:1396
+msgid "Menu distance from background:"
+msgstr ""
+
+#: windows.cpp:1409
 msgid "Vertical offset:"
 msgstr "垂直偏移："
 
-#: windows.cpp:1333
+#: windows.cpp:1416
 msgid "Horizontal offset:"
 msgstr "水平偏移："
 
-#: windows.cpp:1340
+#: windows.cpp:1423
 msgid "Shadow color:"
 msgstr "阴影颜色："
 
-#: windows.cpp:1346
+#: windows.cpp:1429
 msgid "Remove shadows on move"
 msgstr "移动时去掉阴影"
 
-#: windows.cpp:1348
+#: windows.cpp:1431
 msgid "Remove shadows on resize"
 msgstr "缩放时去掉阴影"
 
-#: windows.cpp:1351
+#: windows.cpp:1434
 msgid "Shadows"
 msgstr "阴影"
 
-#: windows.cpp:1356
+#: windows.cpp:1439
 msgid "Fade-in windows (including popups)"
 msgstr "淡入窗口(包括弹出窗口)"
 
-#: windows.cpp:1357
+#: windows.cpp:1440
+msgid ""
+"Fade-in menus (requires menu fade effect to be disabled in the Styles module)"
+msgstr ""
+
+#: windows.cpp:1441
 msgid "Fade between opacity changes"
 msgstr "不透明度更改时淡入淡出"
 
-#: windows.cpp:1360
+#: windows.cpp:1444
 msgid "Fade-in speed:"
 msgstr "淡入速度："
 
-#: windows.cpp:1363
+#: windows.cpp:1447
 msgid "Fade-out speed:"
 msgstr "淡出速度："
 
-#: windows.cpp:1370
+#: windows.cpp:1455
 msgid "Effects"
 msgstr "效果"
 
-#: windows.cpp:1372
-msgid "Use translucency/shadows"
-msgstr "使用透明/阴影"
+#: windows.cpp:1457
+msgid "Enable the Trinity window composition manager"
+msgstr ""
 
-#: windows.cpp:1624
-msgid ""
-"<qt>Translucency support is new and may cause problems"
-"<br> including crashes (sometimes the translucency engine, seldom even X).</qt>"
-msgstr "<qt>透明支持是新特性，可能造成各种问题，甚至崩溃(有时是透明引擎崩溃，少数情况下 X 也会崩溃)。</qt>"
+#~ msgid "Active window size:"
+#~ msgstr "活动窗口大小："
+
+#~ msgid "Dock window size:"
+#~ msgstr "停靠窗口大小："
+
+#~ msgid "Use translucency/shadows"
+#~ msgstr "使用透明/阴影"
+
+#~ msgid "<qt>Translucency support is new and may cause problems<br> including crashes (sometimes the translucency engine, seldom even X).</qt>"
+#~ msgstr "<qt>透明支持是新特性，可能造成各种问题，甚至崩溃(有时是透明引擎崩溃，少数情况下 X 也会崩溃)。</qt>"
 
 #~ msgid " pixels"
 #~ msgstr " 像素"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmlaunch.po b/tde-i18n-zh_CN/messages/tdebase/kcmlaunch.po
index 8fe22fafec8..356c1123f0e 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmlaunch.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmlaunch.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmlaunch\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-28 14:38+0800\n"
 "Last-Translator: Lou Bingyong <loubingyong@hotmail.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmlayout.po b/tde-i18n-zh_CN/messages/tdebase/kcmlayout.po
index 03e0a9f67a4..601b3d2f4b7 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmlayout.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmlayout.po
@@ -6,548 +6,549 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kcmlayout.cpp:563
+#: kcmlayout.cpp:566
 msgid "None"
 msgstr "无"
 
-#: kcmlayout.cpp:832
+#: kcmlayout.cpp:835
 msgid "Brazilian ABNT2"
 msgstr "巴西 ABNT2"
 
-#: kcmlayout.cpp:833
+#: kcmlayout.cpp:836
 msgid "Dell 101-key PC"
 msgstr "Dell 101-键 PC"
 
-#: kcmlayout.cpp:834
+#: kcmlayout.cpp:837
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: kcmlayout.cpp:835
+#: kcmlayout.cpp:838
 msgid "Generic 101-key PC"
 msgstr "通用 101 键 PC"
 
-#: kcmlayout.cpp:836
+#: kcmlayout.cpp:839
 msgid "Generic 102-key (Intl) PC"
 msgstr "通用 102 键 (Intl)PC"
 
-#: kcmlayout.cpp:837
+#: kcmlayout.cpp:840
 msgid "Generic 104-key PC"
 msgstr "通用 104 键 PC"
 
-#: kcmlayout.cpp:838
+#: kcmlayout.cpp:841
 msgid "Generic 105-key (Intl) PC"
 msgstr "通用 105 键 (Intl)PC"
 
-#: kcmlayout.cpp:839
+#: kcmlayout.cpp:842
 msgid "Japanese 106-key"
 msgstr "日本 106 键"
 
-#: kcmlayout.cpp:840
+#: kcmlayout.cpp:843
 msgid "Microsoft Natural"
 msgstr "微软自然键盘"
 
-#: kcmlayout.cpp:841
+#: kcmlayout.cpp:844
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: kcmlayout.cpp:842
+#: kcmlayout.cpp:845
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: kcmlayout.cpp:843
+#: kcmlayout.cpp:846
 msgid "Winbook Model XP5"
 msgstr "Winbook XP5 型"
 
-#: kcmlayout.cpp:846
+#: kcmlayout.cpp:849
 msgid "Group Shift/Lock behavior"
 msgstr "组切换/锁定行为"
 
-#: kcmlayout.cpp:847
+#: kcmlayout.cpp:850
 msgid "R-Alt switches group while pressed"
 msgstr "按右 Alt 键切换组"
 
-#: kcmlayout.cpp:848
+#: kcmlayout.cpp:851
 msgid "Right Alt key changes group"
 msgstr "右边的 Alt 键改变组"
 
-#: kcmlayout.cpp:849
+#: kcmlayout.cpp:852
 msgid "Caps Lock key changes group"
 msgstr "Caps Lock 键改变组"
 
-#: kcmlayout.cpp:850
+#: kcmlayout.cpp:853
 msgid "Menu key changes group"
 msgstr "菜单键改变组"
 
-#: kcmlayout.cpp:851
+#: kcmlayout.cpp:854
 msgid "Both Shift keys together change group"
 msgstr "两个 Shift 键一起按改变组"
 
-#: kcmlayout.cpp:852
+#: kcmlayout.cpp:855
 msgid "Control+Shift changes group"
 msgstr "Ctrl+Shift 改变组"
 
-#: kcmlayout.cpp:853
+#: kcmlayout.cpp:856
 msgid "Alt+Control changes group"
 msgstr "Alt+Ctrl 改变组"
 
-#: kcmlayout.cpp:854
+#: kcmlayout.cpp:857
 msgid "Alt+Shift changes group"
 msgstr "Alt+Shift 改变组"
 
-#: kcmlayout.cpp:855
+#: kcmlayout.cpp:858
 msgid "Control Key Position"
 msgstr "Ctrl 键位置"
 
-#: kcmlayout.cpp:856
+#: kcmlayout.cpp:859
 msgid "Make CapsLock an additional Control"
 msgstr "用 CapsLock 键作附加控制"
 
-#: kcmlayout.cpp:857
+#: kcmlayout.cpp:860
 msgid "Swap Control and Caps Lock"
 msgstr "交换 Ctrl 和 Caps Lock 键"
 
-#: kcmlayout.cpp:858
+#: kcmlayout.cpp:861
 msgid "Control key at left of 'A'"
 msgstr "Ctrl 键在字母“A” 左边"
 
-#: kcmlayout.cpp:859
+#: kcmlayout.cpp:862
 msgid "Control key at bottom left"
 msgstr "Ctrl 键在左下角"
 
-#: kcmlayout.cpp:860
+#: kcmlayout.cpp:863
 msgid "Use keyboard LED to show alternative group"
 msgstr "用键盘 LED 小灯显示另外的组"
 
-#: kcmlayout.cpp:861
+#: kcmlayout.cpp:864
 msgid "Num_Lock LED shows alternative group"
 msgstr "Num Lock LED 灯显示另外的组"
 
-#: kcmlayout.cpp:862
+#: kcmlayout.cpp:865
 msgid "Caps_Lock LED shows alternative group"
 msgstr "Caps Lock LED 灯显示另外的组"
 
-#: kcmlayout.cpp:863
+#: kcmlayout.cpp:866
 msgid "Scroll_Lock LED shows alternative group"
 msgstr "Scroll Lock LED 灯显示另外的组"
 
-#: kcmlayout.cpp:866
+#: kcmlayout.cpp:869
 msgid "Left Win-key switches group while pressed"
 msgstr "按左边的 Windows 键切换组"
 
-#: kcmlayout.cpp:867
+#: kcmlayout.cpp:870
 msgid "Right Win-key switches group while pressed"
 msgstr "按右边的 Windows 键切换组"
 
-#: kcmlayout.cpp:868
+#: kcmlayout.cpp:871
 msgid "Both Win-keys switch group while pressed"
 msgstr "按任一个 Windows 键切换组"
 
-#: kcmlayout.cpp:869
+#: kcmlayout.cpp:872
 msgid "Left Win-key changes group"
 msgstr "左 Windows 键改变组"
 
-#: kcmlayout.cpp:870
+#: kcmlayout.cpp:873
 msgid "Right Win-key changes group"
 msgstr "右 Windows 键改变组"
 
-#: kcmlayout.cpp:871
+#: kcmlayout.cpp:874
 msgid "Third level choosers"
 msgstr "第三级选择"
 
-#: kcmlayout.cpp:872
+#: kcmlayout.cpp:875
 msgid "Press Right Control to choose 3rd level"
 msgstr "按右 Ctrl 选择第三级"
 
-#: kcmlayout.cpp:873
+#: kcmlayout.cpp:876
 msgid "Press Menu key to choose 3rd level"
 msgstr "按菜单键选择第三级"
 
-#: kcmlayout.cpp:874
+#: kcmlayout.cpp:877
 msgid "Press any of Win-keys to choose 3rd level"
 msgstr "按任一 Windows 键选择第三级"
 
-#: kcmlayout.cpp:875
+#: kcmlayout.cpp:878
 msgid "Press Left Win-key to choose 3rd level"
 msgstr "按左 Windows 键选择第三级"
 
-#: kcmlayout.cpp:876
+#: kcmlayout.cpp:879
 msgid "Press Right Win-key to choose 3rd level"
 msgstr "按右 Windows 键选择第三级"
 
-#: kcmlayout.cpp:877
+#: kcmlayout.cpp:880
 msgid "CapsLock key behavior"
 msgstr "CapsLock 键行为"
 
-#: kcmlayout.cpp:878
+#: kcmlayout.cpp:881
 msgid "uses internal capitalization. Shift cancels Caps."
 msgstr "用内部的大写切换，Shift 键取消大写。"
 
-#: kcmlayout.cpp:879
+#: kcmlayout.cpp:882
 msgid "uses internal capitalization. Shift doesn't cancel Caps."
 msgstr "用内部的大写切换，Shift 键不取消大写。"
 
-#: kcmlayout.cpp:880
+#: kcmlayout.cpp:883
 msgid "acts as Shift with locking. Shift cancels Caps."
 msgstr "如同锁定 Shift，Shift 取消大写。"
 
-#: kcmlayout.cpp:881
+#: kcmlayout.cpp:884
 msgid "acts as Shift with locking. Shift doesn't cancel Caps."
 msgstr "如同锁定 Shift，Shift 不取消大写。"
 
-#: kcmlayout.cpp:882
+#: kcmlayout.cpp:885
 msgid "Alt/Win key behavior"
 msgstr "Alt/Windows 键行为"
 
-#: kcmlayout.cpp:883
+#: kcmlayout.cpp:886
 msgid "Add the standard behavior to Menu key."
 msgstr "给菜单键附加标准行为。"
 
-#: kcmlayout.cpp:884
+#: kcmlayout.cpp:887
 msgid "Alt and Meta on the Alt keys (default)."
 msgstr "Alt 和 Meta 都用 Alt 键 (缺省)。"
 
-#: kcmlayout.cpp:885
+#: kcmlayout.cpp:888
 msgid "Meta is mapped to the Win-keys."
 msgstr "Meta 映射到 Windows 键。"
 
-#: kcmlayout.cpp:886
+#: kcmlayout.cpp:889
 msgid "Meta is mapped to the left Win-key."
 msgstr "Meta 映射到左 Windows 键。"
 
-#: kcmlayout.cpp:887
+#: kcmlayout.cpp:890
 msgid "Super is mapped to the Win-keys (default)."
 msgstr "Super 映射到 Windows 键 (缺省)。"
 
-#: kcmlayout.cpp:888
+#: kcmlayout.cpp:891
 msgid "Hyper is mapped to the Win-keys."
 msgstr "Hyper 映射到 Windows 键。"
 
-#: kcmlayout.cpp:889
+#: kcmlayout.cpp:892
 msgid "Right Alt is Compose"
 msgstr "右边 Alt 键作 Compose"
 
-#: kcmlayout.cpp:890
+#: kcmlayout.cpp:893
 msgid "Right Win-key is Compose"
 msgstr "右边的 Windows 键作 Compose"
 
-#: kcmlayout.cpp:891
+#: kcmlayout.cpp:894
 msgid "Menu is Compose"
 msgstr "菜单键作 Compose"
 
-#: kcmlayout.cpp:894
+#: kcmlayout.cpp:897
 msgid "Both Ctrl keys together change group"
 msgstr "两个 Ctrl 键一起按改变组"
 
-#: kcmlayout.cpp:895
+#: kcmlayout.cpp:898
 msgid "Both Alt keys together change group"
 msgstr "两个 Alt 键一起按改变组"
 
-#: kcmlayout.cpp:896
+#: kcmlayout.cpp:899
 msgid "Left Shift key changes group"
 msgstr "左 Shift 键改变组"
 
-#: kcmlayout.cpp:897
+#: kcmlayout.cpp:900
 msgid "Right Shift key changes group"
 msgstr "右 Shift 键改变组"
 
-#: kcmlayout.cpp:898
+#: kcmlayout.cpp:901
 msgid "Right Ctrl key changes group"
 msgstr "右 Ctrl 键改变组"
 
-#: kcmlayout.cpp:899
+#: kcmlayout.cpp:902
 msgid "Left Alt key changes group"
 msgstr "左 Alt 键改变组"
 
-#: kcmlayout.cpp:900
+#: kcmlayout.cpp:903
 msgid "Left Ctrl key changes group"
 msgstr "左 Ctrl 键改变组"
 
-#: kcmlayout.cpp:901
+#: kcmlayout.cpp:904
 msgid "Compose Key"
 msgstr "Compose 键"
 
-#: kcmlayout.cpp:904
+#: kcmlayout.cpp:907
 msgid "Shift with numpad keys works as in MS Windows."
 msgstr "Shift+数字键盘与 Windows 工作方式相同。"
 
-#: kcmlayout.cpp:905
+#: kcmlayout.cpp:908
 msgid "Special keys (Ctrl+Alt+<key>) handled in a server."
 msgstr "特殊键(Ctrl+Alt+<键>)在服务器中处理。"
 
-#: kcmlayout.cpp:906
+#: kcmlayout.cpp:909
 msgid "Miscellaneous compatibility options"
 msgstr "杂类兼容性选项"
 
-#: kcmlayout.cpp:907
+#: kcmlayout.cpp:910
 msgid "Right Control key works as Right Alt"
 msgstr "右 Ctrl 与右 Alt 键等价"
 
-#: kcmlayout.cpp:910
+#: kcmlayout.cpp:913
 msgid "Right Alt key switches group while pressed"
 msgstr "右边的 Alt 键切换组"
 
-#: kcmlayout.cpp:911
+#: kcmlayout.cpp:914
 msgid "Left Alt key switches group while pressed"
 msgstr "左边的 Alt 键切换组"
 
-#: kcmlayout.cpp:912
+#: kcmlayout.cpp:915
 msgid "Press Right Alt-key to choose 3rd level"
 msgstr "右 Alt 键选择第三级"
 
-#: kcmlayout.cpp:915
+#: kcmlayout.cpp:918
 msgid "R-Alt switches group while pressed."
 msgstr "右 Alt 键切换组。"
 
-#: kcmlayout.cpp:916
+#: kcmlayout.cpp:919
 msgid "Left Alt key switches group while pressed."
 msgstr "左边的 Alt 键切换组。"
 
-#: kcmlayout.cpp:917
+#: kcmlayout.cpp:920
 msgid "Left Win-key switches group while pressed."
 msgstr "左边的 Windows 键切换组。"
 
-#: kcmlayout.cpp:918
+#: kcmlayout.cpp:921
 msgid "Right Win-key switches group while pressed."
 msgstr "右边的 Windows 键切换组。"
 
-#: kcmlayout.cpp:919
+#: kcmlayout.cpp:922
 msgid "Both Win-keys switch group while pressed."
 msgstr "任一个 Windows 键切换组。"
 
-#: kcmlayout.cpp:920
+#: kcmlayout.cpp:923
 msgid "Right Ctrl key switches group while pressed."
 msgstr "右边的 Alt 键切换组。"
 
-#: kcmlayout.cpp:921
+#: kcmlayout.cpp:924
 msgid "Right Alt key changes group."
 msgstr "右边的 Alt 键改变组。"
 
-#: kcmlayout.cpp:922
+#: kcmlayout.cpp:925
 msgid "Left Alt key changes group."
 msgstr "左 Alt 键改变组。"
 
-#: kcmlayout.cpp:923
+#: kcmlayout.cpp:926
 msgid "CapsLock key changes group."
 msgstr "Caps Lock 键改变组。"
 
-#: kcmlayout.cpp:924
+#: kcmlayout.cpp:927
 msgid "Shift+CapsLock changes group."
 msgstr "Shift+Caps Lock 键改变组。"
 
-#: kcmlayout.cpp:925
+#: kcmlayout.cpp:928
 msgid "Both Shift keys together change group."
 msgstr "两个 Shift 键一起按改变组。"
 
-#: kcmlayout.cpp:926
+#: kcmlayout.cpp:929
 msgid "Both Alt keys together change group."
 msgstr "两个 Alt 键一起按改变组。"
 
-#: kcmlayout.cpp:927
+#: kcmlayout.cpp:930
 msgid "Both Ctrl keys together change group."
 msgstr "两个 Ctrl 键一起按改变组。"
 
-#: kcmlayout.cpp:928
+#: kcmlayout.cpp:931
 msgid "Ctrl+Shift changes group."
 msgstr "Ctrl+Shift 改变组。"
 
-#: kcmlayout.cpp:929
+#: kcmlayout.cpp:932
 msgid "Alt+Ctrl changes group."
 msgstr "Alt+Ctrl 改变组。"
 
-#: kcmlayout.cpp:930
+#: kcmlayout.cpp:933
 msgid "Alt+Shift changes group."
 msgstr "Alt+Shift 改变组。"
 
-#: kcmlayout.cpp:931
+#: kcmlayout.cpp:934
 msgid "Menu key changes group."
 msgstr "菜单键改变组。"
 
-#: kcmlayout.cpp:932
+#: kcmlayout.cpp:935
 msgid "Left Win-key changes group."
 msgstr "左 Windows 键改变组。"
 
-#: kcmlayout.cpp:933
+#: kcmlayout.cpp:936
 msgid "Right Win-key changes group."
 msgstr "右 Windows 键改变组。"
 
-#: kcmlayout.cpp:934
+#: kcmlayout.cpp:937
 msgid "Left Shift key changes group."
 msgstr "左 Shift 键改变组。"
 
-#: kcmlayout.cpp:935
+#: kcmlayout.cpp:938
 msgid "Right Shift key changes group."
 msgstr "右 Shift 键改变组。"
 
-#: kcmlayout.cpp:936
+#: kcmlayout.cpp:939
 msgid "Left Ctrl key changes group."
 msgstr "左 Ctrl 键改变组。"
 
-#: kcmlayout.cpp:937
+#: kcmlayout.cpp:940
 msgid "Right Ctrl key changes group."
 msgstr "右 Ctrl 键改变组。"
 
-#: kcmlayout.cpp:938
+#: kcmlayout.cpp:941
 msgid "Press Right Ctrl to choose 3rd level."
 msgstr "按右 Ctrl 选择第三级。"
 
-#: kcmlayout.cpp:939
+#: kcmlayout.cpp:942
 msgid "Press Menu key to choose 3rd level."
 msgstr "按菜单键选择第三级。"
 
-#: kcmlayout.cpp:940
+#: kcmlayout.cpp:943
 msgid "Press any of Win-keys to choose 3rd level."
 msgstr "按任一 Windows 键选择第三级。"
 
-#: kcmlayout.cpp:941
+#: kcmlayout.cpp:944
 msgid "Press Left Win-key to choose 3rd level."
 msgstr "按左 Windows 键选择第三级。"
 
-#: kcmlayout.cpp:942
+#: kcmlayout.cpp:945
 msgid "Press Right Win-key to choose 3rd level."
 msgstr "按右 Windows 键选择第三级。"
 
-#: kcmlayout.cpp:943
+#: kcmlayout.cpp:946
 msgid "Press any of Alt keys to choose 3rd level."
 msgstr "按任一 Alt 键选择第三级。"
 
-#: kcmlayout.cpp:944
+#: kcmlayout.cpp:947
 msgid "Press Left Alt key to choose 3rd level."
 msgstr "按左 Alt 键选择第三级。"
 
-#: kcmlayout.cpp:945
+#: kcmlayout.cpp:948
 msgid "Press Right Alt key to choose 3rd level."
 msgstr "按右 Alt 键选择第三级。"
 
-#: kcmlayout.cpp:946
+#: kcmlayout.cpp:949
 msgid "Ctrl key position"
 msgstr "Ctrl 键位置"
 
-#: kcmlayout.cpp:947
+#: kcmlayout.cpp:950
 msgid "Make CapsLock an additional Ctrl."
 msgstr "用 CapsLock 键作附加控制。"
 
-#: kcmlayout.cpp:948
+#: kcmlayout.cpp:951
 msgid "Swap Ctrl and CapsLock."
 msgstr "交换 Ctrl 和 Caps Lock 键。"
 
-#: kcmlayout.cpp:949
+#: kcmlayout.cpp:952
 msgid "Ctrl key at left of 'A'"
 msgstr "Ctrl 键在字母“A” 左边"
 
-#: kcmlayout.cpp:950
+#: kcmlayout.cpp:953
 msgid "Ctrl key at bottom left"
 msgstr "Ctrl 键在左下角"
 
-#: kcmlayout.cpp:951
+#: kcmlayout.cpp:954
 msgid "Right Ctrl key works as Right Alt."
 msgstr "右 Ctrl 与右 Alt 键等价。"
 
-#: kcmlayout.cpp:952
+#: kcmlayout.cpp:955
 msgid "Use keyboard LED to show alternative group."
 msgstr "用键盘 LED 小灯显示另外的组。"
 
-#: kcmlayout.cpp:953
+#: kcmlayout.cpp:956
 msgid "NumLock LED shows alternative group."
 msgstr "Num Lock LED 灯显示另外的组。"
 
-#: kcmlayout.cpp:954
+#: kcmlayout.cpp:957
 msgid "CapsLock LED shows alternative group."
 msgstr "Caps Lock LED 灯显示另外的组。"
 
-#: kcmlayout.cpp:955
+#: kcmlayout.cpp:958
 msgid "ScrollLock LED shows alternative group."
 msgstr "Scroll Lock LED 灯显示另外的组。"
 
-#: kcmlayout.cpp:956
+#: kcmlayout.cpp:959
 msgid "CapsLock uses internal capitalization. Shift cancels CapsLock."
 msgstr "CapsLock 使用内部大写切换。Shift 键取消大写。"
 
-#: kcmlayout.cpp:957
+#: kcmlayout.cpp:960
 msgid "CapsLock uses internal capitalization. Shift doesn't cancel CapsLock."
 msgstr "CapsLock 使用内部大写切换。Shift 键不取消大写。"
 
-#: kcmlayout.cpp:958
+#: kcmlayout.cpp:961
 msgid "CapsLock acts as Shift with locking. Shift cancels CapsLock."
 msgstr "CapsLock 如同锁定 Shift。Shift 取消大写。"
 
-#: kcmlayout.cpp:959
+#: kcmlayout.cpp:962
 msgid "CapsLock acts as Shift with locking. Shift doesn't cancel CapsLock."
 msgstr "CapsLock 如同锁定 Shift。Shift 不取消大写。"
 
-#: kcmlayout.cpp:960
+#: kcmlayout.cpp:963
 msgid "CapsLock just locks the Shift modifier."
 msgstr ""
 
-#: kcmlayout.cpp:961
+#: kcmlayout.cpp:964
 msgid "CapsLock toggles normal capitalization of alphabetic characters."
 msgstr ""
 
-#: kcmlayout.cpp:962
+#: kcmlayout.cpp:965
 msgid "CapsLock toggles Shift so all keys are affected."
 msgstr ""
 
-#: kcmlayout.cpp:963
+#: kcmlayout.cpp:966
 #, fuzzy
 msgid "Alt and Meta are on the Alt keys (default)."
 msgstr "Alt 和 Meta 都用 Alt 键 (缺省)。"
 
-#: kcmlayout.cpp:964
+#: kcmlayout.cpp:967
 #, fuzzy
 msgid "Alt is mapped to the right Win-key and Super to Menu."
 msgstr "Meta 映射到左 Windows 键。"
 
-#: kcmlayout.cpp:965
+#: kcmlayout.cpp:968
 msgid "Compose key position"
 msgstr "组合键位置"
 
-#: kcmlayout.cpp:966
+#: kcmlayout.cpp:969
 msgid "Right Alt is Compose."
 msgstr "右边 Alt 键作组合键。"
 
-#: kcmlayout.cpp:967
+#: kcmlayout.cpp:970
 #, fuzzy
 msgid "Right Win-key is Compose."
 msgstr "右边的 Windows 键作 Compose"
 
-#: kcmlayout.cpp:968
+#: kcmlayout.cpp:971
 #, fuzzy
 msgid "Menu is Compose."
 msgstr "菜单键作 Compose"
 
-#: kcmlayout.cpp:969
+#: kcmlayout.cpp:972
 msgid "Right Ctrl is Compose."
 msgstr "右边 Ctrl 键作 Compose。"
 
-#: kcmlayout.cpp:970
+#: kcmlayout.cpp:973
 msgid "Caps Lock is Compose."
 msgstr "Caps Lock 键作 Compose。"
 
-#: kcmlayout.cpp:971
+#: kcmlayout.cpp:974
 #, fuzzy
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server."
 msgstr "特殊键(Ctrl+Alt+<键>)在服务器中处理。"
 
-#: kcmlayout.cpp:972
+#: kcmlayout.cpp:975
 msgid "Adding the EuroSign to certain keys"
 msgstr ""
 
-#: kcmlayout.cpp:973
+#: kcmlayout.cpp:976
 msgid "Add the EuroSign to the E key."
 msgstr ""
 
-#: kcmlayout.cpp:974
+#: kcmlayout.cpp:977
 msgid "Add the EuroSign to the 5 key."
 msgstr ""
 
-#: kcmlayout.cpp:975
+#: kcmlayout.cpp:978
 msgid "Add the EuroSign to the 2 key."
 msgstr ""
 
@@ -1333,14 +1334,31 @@ msgid ""
 "succession: Tab characters continue to be emitted until you release the key."
 msgstr "如果您使用该选项，按住一个键将不断产生同样字符。例如，按住 Tab 键和连续多次按该键的效果一样：Tab 字符不断输入直到您放开该按键。"
 
-#. i18n: file kcmmiscwidget.ui line 263
+#. i18n: file kcmmiscwidget.ui line 252
 #: rc.cpp:191
 #, no-c-format
+msgid "Use &BIOS settings"
+msgstr ""
+
+#. i18n: file kcmmiscwidget.ui line 258
+#: rc.cpp:194
+#, fuzzy, no-c-format
+msgid ""
+"If you check this option, pressing and holding down a key emits the same "
+"character over and over again as set in the BIOS. For example, pressing and "
+"holding down the Tab key will have the same effect as that of pressing that key "
+"several times in succession: Tab characters continue to be emitted until you "
+"release the key."
+msgstr "如果您使用该选项，按住一个键将不断产生同样字符。例如，按住 Tab 键和连续多次按该键的效果一样：Tab 字符不断输入直到您放开该按键。"
+
+#. i18n: file kcmmiscwidget.ui line 277
+#: rc.cpp:197
+#, no-c-format
 msgid "%"
 msgstr "%"
 
-#. i18n: file kcmmiscwidget.ui line 266
-#: rc.cpp:194 rc.cpp:200
+#. i18n: file kcmmiscwidget.ui line 280
+#: rc.cpp:200 rc.cpp:206
 #, no-c-format
 msgid ""
 "If supported, this option allows you to hear audible clicks from your "
@@ -1354,8 +1372,8 @@ msgstr ""
 "如果支持的话，该选项允许您在击键的时候从计算机的扬声器中听到咔哒击键声。如果您的键盘不是机械式的，或者击键的声音非常小，该特性将非常有用。"
 "<p> 您可以拖动滑动条来调整击键反馈的音量，或者按翻转按钮的上下箭头。将音量设置为 0% 则关闭击键音。"
 
-#. i18n: file kcmmiscwidget.ui line 282
-#: rc.cpp:197
+#. i18n: file kcmmiscwidget.ui line 296
+#: rc.cpp:203
 #, no-c-format
 msgid "Key click &volume:"
 msgstr "击键音量(&V)："
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmlocale.po b/tde-i18n-zh_CN/messages/tdebase/kcmlocale.po
index bc611442f8f..2da46b0111b 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmlocale.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmlocale.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmlocale\n"
-"POT-Creation-Date: 2006-08-23 02:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-01-17 06:56+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -73,54 +74,67 @@ msgstr "日期和时间(&T)"
 msgid "&Other"
 msgstr "其它(&O)"
 
-#: kcmlocale.cpp:54
+#: kcmlocale.cpp:55
 msgid "Country or region:"
 msgstr "国家/地区："
 
-#: kcmlocale.cpp:60
+#: kcmlocale.cpp:61
 msgid "Languages:"
 msgstr "语言："
 
-#: kcmlocale.cpp:69
+#: kcmlocale.cpp:70
 msgid "Add Language"
 msgstr "添加语言"
 
-#: kcmlocale.cpp:73
+#: kcmlocale.cpp:74
 msgid "Remove Language"
 msgstr "删除语言"
 
-#: kcmlocale.cpp:74
+#: kcmlocale.cpp:75
 msgid "Move Up"
 msgstr "上移"
 
-#: kcmlocale.cpp:75
+#: kcmlocale.cpp:76
 msgid "Move Down"
 msgstr "下移"
 
-#: kcmlocale.cpp:235
+#: kcmlocale.cpp:107
+msgid "Install New Language"
+msgstr ""
+
+#: kcmlocale.cpp:109
+#, fuzzy
+msgid "Uninstall Language"
+msgstr "添加语言"
+
+#: kcmlocale.cpp:111
+msgid "Select System Language"
+msgstr ""
+
+#: kcmlocale.cpp:297
 msgid "Other"
 msgstr "其它"
 
-#: kcmlocale.cpp:243 kcmlocale.cpp:290 kcmlocale.cpp:311
+#: kcmlocale.cpp:305 kcmlocale.cpp:352 kcmlocale.cpp:373
 msgid "without name"
 msgstr "没有名称"
 
-#: kcmlocale.cpp:403
+#: kcmlocale.cpp:465
 msgid ""
 "This is where you live. TDE will use the defaults for this country or region."
 msgstr "这是您居住的地方。TDE 使用该国家/地区的默认设置。"
 
-#: kcmlocale.cpp:406
+#: kcmlocale.cpp:468
 msgid ""
 "This will add a language to the list. If the language is already in the list, "
 "the old one will be moved instead."
 msgstr "这将向列表中添加一种语言。如果该语言已经位于列表中，旧语言将被移动。"
 
-#: kcmlocale.cpp:410
+#: kcmlocale.cpp:472
 msgid "This will remove the highlighted language from the list."
 msgstr "这将从列表中删除突出显示的语言。"
 
-#: kcmlocale.cpp:413
+#: kcmlocale.cpp:475
 msgid ""
 "TDE programs will be displayed in the first available language in this list.\n"
 "If none of the languages are available, US English will be used."
@@ -128,13 +142,13 @@ msgstr ""
 "TDE 程序将用该列表中的第一个可用语言显示。\n"
 "如果任何语言都不可用，将使用美国英语。"
 
-#: kcmlocale.cpp:420
+#: kcmlocale.cpp:482
 msgid ""
 "Here you can choose your country or region. The settings for languages, numbers "
 "etc. will automatically switch to the corresponding values."
 msgstr "您可以在这里选择您的国家/地区。语言、数字等设置将自动切换到相应的值。"
 
-#: kcmlocale.cpp:427
+#: kcmlocale.cpp:489
 msgid ""
 "Here you can choose the languages that will be used by TDE. If the first "
 "language in the list is not available, the second will be used, etc. If only US "
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmmedia.po b/tde-i18n-zh_CN/messages/tdebase/kcmmedia.po
index c7389231d23..148bd5bd46e 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmmedia.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmmedia.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmmedia\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,19 +49,19 @@ msgstr "(c) 2005 Jean-Remy Falleri"
 msgid "Maintainer"
 msgstr "维护者"
 
-#: main.cpp:70
+#: main.cpp:71
 msgid "Help for the application design"
 msgstr "应用程序设计帮助"
 
-#: main.cpp:100
+#: main.cpp:101
 msgid "FIXME : Write me..."
 msgstr "有待补充"
 
-#: managermodule.cpp:40
+#: managermodule.cpp:49
 msgid "No support for HAL on this system"
 msgstr "此系统不支持 HAL"
 
-#: managermodule.cpp:47
+#: managermodule.cpp:56
 msgid "No support for CD polling on this system"
 msgstr "此系统不支持 CD 轮询"
 
@@ -68,54 +69,283 @@ msgstr "此系统不支持 CD 轮询"
 msgid "All Mime Types"
 msgstr "所有 MIME 类型"
 
-#. i18n: file managermoduleview.ui line 24
+#. i18n: file managermoduleview.ui line 16
 #: rc.cpp:3
 #, no-c-format
-msgid "Enable HAL backend"
-msgstr "启用 HAL 后端"
+msgid "ManagerModuleView"
+msgstr ""
 
 #. i18n: file managermoduleview.ui line 27
 #: rc.cpp:6
 #, no-c-format
+msgid "Enable HAL backend"
+msgstr "启用 HAL 后端"
+
+#. i18n: file managermoduleview.ui line 30
+#: rc.cpp:9
+#, no-c-format
 msgid ""
 "Select this if you want to enable the Hardware Abstraction Layer "
 "(http://hal.freedesktop.org/wiki/Software/hal) support."
 msgstr "如果您想要启用硬件抽象层(http://hal.freedesktop.org/wiki/Software/hal)支持，请选中此项。"
 
-#. i18n: file managermoduleview.ui line 35
-#: rc.cpp:9
+#. i18n: file managermoduleview.ui line 38
+#: rc.cpp:12
 #, no-c-format
 msgid "Enable CD polling"
 msgstr "启用 CD 查询"
 
-#. i18n: file managermoduleview.ui line 38
-#: rc.cpp:12
+#. i18n: file managermoduleview.ui line 41
+#: rc.cpp:15
 #, no-c-format
 msgid "Select this to enable the CD polling."
 msgstr "选中此项以启用 CD 查询。"
 
-#. i18n: file managermoduleview.ui line 46
-#: rc.cpp:15
+#. i18n: file managermoduleview.ui line 49
+#: rc.cpp:18
 #, no-c-format
 msgid "Enable medium application autostart after mount"
 msgstr "允许挂载后自动启动介质应用程序"
 
-#. i18n: file managermoduleview.ui line 49
-#: rc.cpp:18
+#. i18n: file managermoduleview.ui line 52
+#: rc.cpp:21
 #, no-c-format
 msgid ""
 "Select this if you want to enable application autostart after mounting a "
 "device."
 msgstr "如果您想要在挂载设备后自动启动应用程序，请选中此项。"
 
+#. i18n: file managermoduleview.ui line 60
+#: rc.cpp:24
+#, no-c-format
+msgid "Mount options"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 80
+#: rc.cpp:27
+#, no-c-format
+msgid ""
+"Here you can specify default mount options for your storage media. Please note "
+"that some options are not supported for certain filesystems and/or medium. You "
+"will be able to redefine all these options on per-volume basis later, using "
+"Properties dialog of the corresponding volume."
+"<br>\n"
+"Some of the options are tristate. Leave them \"undefined\" to let TDE choose "
+"the best value depending on your media."
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 99
+#: rc.cpp:31
+#, no-c-format
+msgid "Read only"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 102
+#: rc.cpp:34
+#, no-c-format
+msgid "By default, mount all file systems read-only."
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 110
+#: rc.cpp:37
+#, no-c-format
+msgid "Mount as user"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 113
+#: rc.cpp:40
+#, no-c-format
+msgid "Mount this file system as user."
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 121
+#: rc.cpp:43
+#, no-c-format
+msgid "Flushed IO"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 127
+#: rc.cpp:46
+#, no-c-format
+msgid ""
+"Always flush all data to the hot plug devices immediately and don't cache it."
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 135
+#: rc.cpp:49
+#, no-c-format
+msgid "Synchronous"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 141
+#: rc.cpp:52
+#, no-c-format
+msgid "All I/O to the file system should be done synchronously."
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 149
+#: rc.cpp:55
+#, no-c-format
+msgid "Quiet"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 152
+#: rc.cpp:58
+#, no-c-format
+msgid ""
+"Attempts to chown or chmod files do not return errors, although they fail. Use "
+"with caution!"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 160
+#: rc.cpp:61
+#, no-c-format
+msgid "UTF-8 charset"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 163
+#: rc.cpp:64
+#, 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 ""
+
+#. i18n: file managermoduleview.ui line 179
+#: rc.cpp:67
+#, no-c-format
+msgid "Short names:"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 197
+#: rc.cpp:70
+#, no-c-format
+msgid ""
+"<h2>Defines  the  behaviour  for  creation and display of filenames which fit "
+"into 8.3 characters. If a long name for a file exists, it will always be "
+"preferred display.</h2>\n"
+"\n"
+"<h3><b>Lower</b></h3>\n"
+"Force the short name to lower case upon display; store a long name when the "
+"short name is not all upper case.\n"
+"\n"
+"<h3><b>Windows 95</b></h3>\n"
+"Force the short name to upper case upon display; store a long name when the "
+"short name is not all upper case.\n"
+"\n"
+"<h3><b>Windows NT</b></h3>\n"
+"Display the shortname as is; store a long name when the short name is not all "
+"lower case or all upper case.\n"
+"\n"
+"<h3><b>Mixed</b></h3>\n"
+"Display the short name as is; store a long name when the short name is not all "
+"upper case."
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 203
+#: rc.cpp:85
+#, no-c-format
+msgid "All Data"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 208
+#: rc.cpp:88
+#, no-c-format
+msgid "Ordered"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 213
+#: rc.cpp:91
+#, no-c-format
+msgid "Writeback"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 228
+#: rc.cpp:94
+#, no-c-format
+msgid "Journaling:"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 243
+#: rc.cpp:97
+#, no-c-format
+msgid ""
+"<h2>Specifies  the journalling mode for file data. Metadata is always "
+"journaled. </h2>\n"
+"           \n"
+"<h3><b>All Data</b></h3>\n"
+"           All  data  is  committed into the journal prior to being written "
+"into the main file system. This is the slowest variant with the highest data "
+"security.\n"
+"\n"
+"<h3><b>Ordered</b></h3>\n"
+"           All data is forced directly out to the main  file system prior to "
+"its metadata being committed to the journal.\n"
+"\n"
+"<h3><b>Write Back</b></h3>\n"
+"           Data ordering is not preserved - data may be written into the main "
+"file system after its metadata has been committed to the journal.  This is "
+"rumoured to  be the  highest-throughput option.  It guarantees internal file "
+"system integrity,  however it can allow old data to appear in files after  a  "
+"crash  and  journal recovery."
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 249
+#: rc.cpp:109
+#, no-c-format
+msgid "Lower"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 254
+#: rc.cpp:112
+#, no-c-format
+msgid "Windows 95"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 259
+#: rc.cpp:115
+#, no-c-format
+msgid "Windows NT"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 264
+#: rc.cpp:118
+#, no-c-format
+msgid "Mixed"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 278
+#: rc.cpp:121
+#, no-c-format
+msgid "Mount automatically"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 281
+#: rc.cpp:124
+#, no-c-format
+msgid "By default, mount all file systems automatically."
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 289
+#: rc.cpp:127
+#, no-c-format
+msgid "Access time updates"
+msgstr ""
+
+#. i18n: file managermoduleview.ui line 295
+#: rc.cpp:130
+#, no-c-format
+msgid "Update inode access time for each access."
+msgstr ""
+
 #. i18n: file notifiermoduleview.ui line 48
-#: rc.cpp:21
+#: rc.cpp:133
 #, no-c-format
 msgid "Medium types:"
 msgstr "介质类型："
 
 #. i18n: file notifiermoduleview.ui line 64
-#: rc.cpp:24
+#: rc.cpp:136
 #, no-c-format
 msgid ""
 "Here is the list of the available types of medium which can be monitored. You "
@@ -124,43 +354,43 @@ msgid ""
 msgstr "此处列出了可监视的全部介质类型。选择介质类型可以对可用的动作进行过滤。如果您想要查看全部动作，请选择“全部 MIME 类型”。"
 
 #. i18n: file notifiermoduleview.ui line 90
-#: rc.cpp:27
+#: rc.cpp:139
 #, no-c-format
 msgid "&Add..."
 msgstr "添加(&A)..."
 
 #. i18n: file notifiermoduleview.ui line 93
-#: rc.cpp:30
+#: rc.cpp:142
 #, no-c-format
 msgid "Click here to add an action."
 msgstr "单击此处可添加动作。"
 
 #. i18n: file notifiermoduleview.ui line 104
-#: rc.cpp:36
+#: rc.cpp:148
 #, no-c-format
 msgid "Click here to delete the selected action if possible."
 msgstr "单击此处可删除选中的动作。"
 
 #. i18n: file notifiermoduleview.ui line 112
-#: rc.cpp:39
+#: rc.cpp:151
 #, no-c-format
 msgid "&Edit..."
 msgstr "编辑(&E)..."
 
 #. i18n: file notifiermoduleview.ui line 115
-#: rc.cpp:42
+#: rc.cpp:154
 #, no-c-format
 msgid "Click here to edit the selected action if possible."
 msgstr "单击此处可编辑选中的动作。"
 
 #. i18n: file notifiermoduleview.ui line 123
-#: rc.cpp:45
+#: rc.cpp:157
 #, no-c-format
 msgid "&Toggle as Auto Action"
 msgstr "切换为自动动作(&T)"
 
 #. i18n: file notifiermoduleview.ui line 126
-#: rc.cpp:48
+#: rc.cpp:160
 #, no-c-format
 msgid ""
 "Click here to perform this action automatically on detection of the selected "
@@ -168,7 +398,7 @@ msgid ""
 msgstr "单击此处表明在检测到选中的介质类型后自动执行此动作(如果所选的是“全部 MIME 类型”，则此选项被禁用)。"
 
 #. i18n: file notifiermoduleview.ui line 153
-#: rc.cpp:51
+#: rc.cpp:163
 #, no-c-format
 msgid ""
 "Here is the list of the available actions. You can modify them by using the "
@@ -176,25 +406,25 @@ msgid ""
 msgstr "此处列出了可用的动作。您可以使用右侧的按钮修改。"
 
 #. i18n: file serviceview.ui line 30
-#: rc.cpp:54 rc.cpp:57 serviceconfigdialog.cpp:40
+#: rc.cpp:166 rc.cpp:169 serviceconfigdialog.cpp:40
 #, no-c-format
 msgid "Edit Service"
 msgstr "编辑服务"
 
 #. i18n: file serviceview.ui line 188
-#: rc.cpp:60
+#: rc.cpp:172
 #, no-c-format
 msgid "Available &medium types:"
 msgstr "可用的介质服务(&M)："
 
 #. i18n: file serviceview.ui line 191
-#: rc.cpp:63
+#: rc.cpp:175
 #, no-c-format
 msgid "Displa&y service for:"
 msgstr "显示服务的介质(&Y)："
 
 #. i18n: file serviceview.ui line 218
-#: rc.cpp:66
+#: rc.cpp:178
 #, no-c-format
 msgid "Command:"
 msgstr "命令："
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmnic.po b/tde-i18n-zh_CN/messages/tdebase/kcmnic.po
index fa06f54a523..5f356530282 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmnic.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmnic.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmnic\n"
-"POT-Creation-Date: 2006-12-31 02:37+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2002-10-09 23:33+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@126.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmnotify.po b/tde-i18n-zh_CN/messages/tdebase/kcmnotify.po
index f5d1df7b63f..8870d1f94e7 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmnotify.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmnotify.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmnotify\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-28 14:39+0800\n"
 "Last-Translator: Xuedong Zhang <zxd@bu.edu>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,8 +27,9 @@ msgid ""
 msgstr "zxd@bu.edu"
 
 #: knotify.cpp:56
+#, fuzzy
 msgid ""
-"<h1>System Notifications</h1>TDE allows for a great deal of control over how "
+"<h1>System Notifications</h1>KDE allows for a great deal of control over how "
 "you will be notified when certain events occur. There are several choices as to "
 "how you are notified:"
 "<ul>"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmperformance.po b/tde-i18n-zh_CN/messages/tdebase/kcmperformance.po
index 8abb20d2e9a..a89631b3e5a 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmperformance.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmperformance.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmperformance\n"
-"POT-Creation-Date: 2006-08-23 02:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-01-02 03:09+0800\n"
 "Last-Translator: asteroid <asteroid@Planetio>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -168,17 +169,18 @@ msgid ""
 msgstr "<b>警告：</b>此选项可能在极少数情况下导致各种问题。详情请查看“这是什么”帮助(Shift+F1)。"
 
 #: system.cpp:34
+#, fuzzy
 msgid ""
 "<p>During startup TDE needs to perform a check of its system configuration "
 "(mimetypes, installed applications, etc.), and in case the configuration has "
-"changed since the last time, the system configuration cache (KSyCoCa) needs to "
-"be updated.</p>"
+"changed since the last time, the system configuration cache (TDESyCoCa) needs "
+"to be updated.</p>"
 "<p>This option delays the check, which avoid scanning all directories "
 "containing files describing the system during TDE startup, thus making TDE "
 "startup faster. However, in the rare case the system configuration has changed "
 "since the last time, and the change is needed before this delayed check takes "
-"place, this option may lead to various problems (missing applications in the K "
-"Menu, reports from applications about missing required mimetypes, etc.).</p>"
+"place, this option may lead to various problems (missing applications in the "
+"TDE Menu, reports from applications about missing required mimetypes, etc.).</p>"
 "<p>Changes of system configuration mostly happen by (un)installing "
 "applications. It is therefore recommended to turn this option temporarily off "
 "while (un)installing applications.</p>"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmprintmgr.po b/tde-i18n-zh_CN/messages/tdebase/kcmprintmgr.po
index 51dbffc9cbc..70b935558e7 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmprintmgr.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmprintmgr.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmprintmgr\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-28 14:34+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmsamba.po b/tde-i18n-zh_CN/messages/tdebase/kcmsamba.po
index a3fa520c04c..ffc6a849fe8 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmsamba.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmsamba.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmsamba\n"
-"POT-Creation-Date: 2005-07-06 01:31+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2002-10-09 23:39+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -60,7 +61,8 @@ msgid "TDE Panel System Information Control Module"
 msgstr "TDE 面板系统信息控制模块"
 
 #: main.cpp:88
-msgid "(c) 2002 TDE Information Control Module Samba Team"
+#, fuzzy
+msgid "(c) 2002 KDE Information Control Module Samba Team"
 msgstr "(C) 2002 TDE 信息控制模块 Samba 团队"
 
 #: kcmsambaimports.cpp:46 ksmbstatus.cpp:63
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmscreensaver.po b/tde-i18n-zh_CN/messages/tdebase/kcmscreensaver.po
index ce6b8c4b024..097e4ac2b35 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmscreensaver.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmscreensaver.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmscreensaver\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-05-14 04:54+0800\n"
 "Last-Translator: Xuedong Zhang <zxd@bu.edu>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -194,7 +195,7 @@ msgstr "左下角："
 msgid "Bottom right:"
 msgstr "右下角："
 
-#: scrnsave.cpp:89
+#: scrnsave.cpp:104
 msgid ""
 "<h1>Screen Saver</h1> This module allows you to enable and configure a screen "
 "saver. Note that you can enable a screen saver even if you have power saving "
@@ -210,95 +211,139 @@ msgstr ""
 "<p>除了提供丰富多采的娱乐和防止显示器损伤外，屏幕保护程序同时提供了一个简便的方法，在您离开显示器时锁定它。如果您希望屏幕保护程序锁定屏幕，请确认您启用了屏幕"
 "保护程序的“需要密码”功能。如果您没有启用，仍然可以用桌面的“锁定会话”动作来锁定屏幕。"
 
-#: scrnsave.cpp:132
+#: scrnsave.cpp:147
 msgid "Screen Saver"
 msgstr "屏幕保护程序"
 
-#: scrnsave.cpp:147
+#: scrnsave.cpp:162
 msgid "Select the screen saver to use."
 msgstr "选择要使用的屏幕保护程序。"
 
-#: scrnsave.cpp:150
+#: scrnsave.cpp:165
 msgid "&Setup..."
 msgstr "设置(&S)..."
 
-#: scrnsave.cpp:154
+#: scrnsave.cpp:169
 msgid "Configure the screen saver's options, if any."
 msgstr "如果有的话，配置屏幕保护程序的选项。"
 
-#: scrnsave.cpp:156
+#: scrnsave.cpp:171
 msgid "&Test"
 msgstr "测试(&T)"
 
-#: scrnsave.cpp:160
+#: scrnsave.cpp:175
 msgid "Show a full screen preview of the screen saver."
 msgstr "显示屏幕保护程序的全屏预览。"
 
-#: scrnsave.cpp:162
+#: scrnsave.cpp:177
 msgid "Settings"
 msgstr "设置"
 
-#: scrnsave.cpp:169
+#: scrnsave.cpp:182
 msgid "Start a&utomatically"
 msgstr "自动启动(&U)"
 
-#: scrnsave.cpp:172
+#: scrnsave.cpp:184
 msgid "Automatically start the screen saver after a period of inactivity."
 msgstr "在指定时间不活动之后，自动启动屏幕保护程序。"
 
-#: scrnsave.cpp:180 scrnsave.cpp:213
+#: scrnsave.cpp:191 scrnsave.cpp:219
 msgid "After:"
 msgstr "等待："
 
-#: scrnsave.cpp:186
+#: scrnsave.cpp:197
 msgid " min"
 msgstr " 分钟"
 
-#: scrnsave.cpp:195
+#: scrnsave.cpp:205
 msgid "The period of inactivity after which the screen saver should start."
 msgstr "启动屏幕保护程序之前要等待的不活动时长。"
 
-#: scrnsave.cpp:201
+#: scrnsave.cpp:209
 msgid "&Require password to stop"
 msgstr "需要密码来停止(&R)"
 
-#: scrnsave.cpp:208
+#: scrnsave.cpp:214
 msgid ""
 "Prevent potential unauthorized use by requiring a password to stop the screen "
 "saver."
 msgstr "要停止屏幕保护程序，需要提供密码，这可以避免未授权的使用。"
 
-#: scrnsave.cpp:216
+#: scrnsave.cpp:221
 msgid ""
 "The amount of time, after the screen saver has started, to ask for the unlock "
 "password."
 msgstr "屏幕保护程序启动后，请求解锁密码的时长。"
 
-#: scrnsave.cpp:221
+#: scrnsave.cpp:226
 msgid " sec"
 msgstr " 秒"
 
-#: scrnsave.cpp:239
+#: scrnsave.cpp:242
 msgid "Choose the period after which the display will be locked. "
 msgstr "选择显示被锁定前等待的时间。"
 
+#: scrnsave.cpp:246
+msgid "&Delay saver start after lock"
+msgstr ""
+
+#: scrnsave.cpp:251
+msgid ""
+"When manually locking the screen, wait to start the screen saver until the "
+"configured start delay has elapsed."
+msgstr ""
+
 #: scrnsave.cpp:253
+msgid "&Use Secure Attention Key"
+msgstr ""
+
+#: scrnsave.cpp:258
+msgid "Require Secure Attention Key prior to displaying the unlock dialog."
+msgstr ""
+
+#: scrnsave.cpp:260
+msgid "Use &legacy lock windows"
+msgstr ""
+
+#: scrnsave.cpp:265
+msgid "Use old-style unmanaged X11 lock windows."
+msgstr ""
+
+#: scrnsave.cpp:267
+msgid "Hide active &windows from saver"
+msgstr ""
+
+#: scrnsave.cpp:272
+msgid ""
+"Hide all active windows from the screen saver and use the desktop background as "
+"the screen saver input."
+msgstr ""
+
+#: scrnsave.cpp:274
+msgid "Hide &cancel button"
+msgstr ""
+
+#: scrnsave.cpp:279
+msgid "Hide Cancel button from the \"Desktop Session Locked\" dialog."
+msgstr ""
+
+#: scrnsave.cpp:288
 msgid "A preview of the selected screen saver."
 msgstr "选中屏幕保护程序的预览。"
 
-#: scrnsave.cpp:258
+#: scrnsave.cpp:293
 msgid "Advanced &Options"
 msgstr "高级选项(&O)"
 
-#: scrnsave.cpp:285
+#: scrnsave.cpp:320
 msgid "kcmscreensaver"
 msgstr "kcmscreensaver"
 
-#: scrnsave.cpp:285
+#: scrnsave.cpp:320
 msgid "TDE Screen Saver Control Module"
 msgstr "TDE 屏幕保护控制模块"
 
-#: scrnsave.cpp:287
+#: scrnsave.cpp:322
 msgid ""
 "(c) 1997-2002 Martin R. Jones\n"
 "(c) 2003-2004 Chris Howells"
@@ -306,7 +351,7 @@ msgstr ""
 "(c) 1997-2002 Martin R. Jones\n"
 "(c) 2003-2004 Chris Howells"
 
-#: scrnsave.cpp:470
+#: scrnsave.cpp:519
 msgid "Loading..."
 msgstr "正在装入..."
 
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmsmartcard.po b/tde-i18n-zh_CN/messages/tdebase/kcmsmartcard.po
index ec44f84d4ed..75335fd697d 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmsmartcard.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmsmartcard.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmsmartcard\n"
-"POT-Creation-Date: 2006-08-23 02:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-01-05 00:30+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -44,8 +45,8 @@ msgstr "可能的原因"
 msgid ""
 "\n"
 "1) The TDE daemon, 'kded' is not running. You can restart it by running the "
-"command 'tdeinit' and then try reloading the Trinity Control Center to see if this "
-"message goes away.\n"
+"command 'tdeinit' and then try reloading the Trinity Control Center to see if "
+"this message goes away.\n"
 "\n"
 "2) You don't appear to have smartcard support in the TDE libraries. You will "
 "need to recompile the tdelibs package with libpcsclite installed."
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmsmserver.po b/tde-i18n-zh_CN/messages/tdebase/kcmsmserver.po
index 9a341aec65b..ef8ebb2d355 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmsmserver.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmsmserver.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmsmserer\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-01-05 00:34+0800\n"
 "Last-Translator: Wang Hui <wanghuilux@yeah.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -51,20 +52,69 @@ msgid ""
 "confirmation dialog box."
 msgstr "如果您想会话管理器显示注销确认窗口，请选用此选项。"
 
-#. i18n: file smserverconfigdlg.ui line 62
+#. i18n: file smserverconfigdlg.ui line 65
 #: rc.cpp:15
 #, no-c-format
+msgid "Show &logout fadeaway"
+msgstr ""
+
+#. i18n: file smserverconfigdlg.ui line 68
+#: rc.cpp:18
+#, fuzzy, no-c-format
+msgid ""
+"Check this option if you want to see a fadeaway when displaying a logout "
+"confirmation dialog box."
+msgstr "如果您想会话管理器显示注销确认窗口，请选用此选项。"
+
+#. i18n: file smserverconfigdlg.ui line 79
+#: rc.cpp:21
+#, no-c-format
+msgid "Sho&w fancy logout fadeaway"
+msgstr ""
+
+#. i18n: file smserverconfigdlg.ui line 82
+#: rc.cpp:24
+#, fuzzy, no-c-format
+msgid ""
+"Check this option if you want to see a fancy fadeaway when displaying a logout "
+"confirmation dialog box."
+msgstr "如果您想会话管理器显示注销确认窗口，请选用此选项。"
+
+#. i18n: file smserverconfigdlg.ui line 90
+#: rc.cpp:27
+#, no-c-format
 msgid "O&ffer shutdown options"
 msgstr "提供关机选项(&F)"
 
-#. i18n: file smserverconfigdlg.ui line 72
-#: rc.cpp:18
+#. i18n: file smserverconfigdlg.ui line 93
+#: rc.cpp:30
+#, fuzzy, no-c-format
+msgid ""
+"Check this option if you want to see various options when displaying a logout "
+"confirmation dialog box."
+msgstr "如果您想会话管理器显示注销确认窗口，请选用此选项。"
+
+#. i18n: file smserverconfigdlg.ui line 101
+#: rc.cpp:33
+#, no-c-format
+msgid "Show logout stat&us dialog"
+msgstr ""
+
+#. i18n: file smserverconfigdlg.ui line 104
+#: rc.cpp:36
+#, fuzzy, no-c-format
+msgid ""
+"Check this option if you want to see a dialog box showing the logout status."
+msgstr "如果您想会话管理器显示注销确认窗口，请选用此选项。"
+
+#. i18n: file smserverconfigdlg.ui line 114
+#: rc.cpp:39
 #, no-c-format
 msgid "On Login"
 msgstr "登录时"
 
-#. i18n: file smserverconfigdlg.ui line 79
-#: rc.cpp:21
+#. i18n: file smserverconfigdlg.ui line 121
+#: rc.cpp:42
 #, no-c-format
 msgid ""
 "<ul>\n"
@@ -83,70 +133,70 @@ msgstr ""
 "<li><b>启动空会话：</b>什么也不保存。下次启动时将会出现空桌面。</li>\n"
 "</ul>"
 
-#. i18n: file smserverconfigdlg.ui line 90
-#: rc.cpp:28
+#. i18n: file smserverconfigdlg.ui line 132
+#: rc.cpp:49
 #, no-c-format
 msgid "Restore &previous session"
 msgstr "恢复上一次会话(&P)"
 
-#. i18n: file smserverconfigdlg.ui line 98
-#: rc.cpp:31
+#. i18n: file smserverconfigdlg.ui line 140
+#: rc.cpp:52
 #, no-c-format
 msgid "Restore &manually saved session"
 msgstr "恢复手动保存的会话(&M)"
 
-#. i18n: file smserverconfigdlg.ui line 106
-#: rc.cpp:34
+#. i18n: file smserverconfigdlg.ui line 148
+#: rc.cpp:55
 #, no-c-format
 msgid "Start with an empty &session"
 msgstr "以空会话启动(&S)"
 
-#. i18n: file smserverconfigdlg.ui line 116
-#: rc.cpp:37
+#. i18n: file smserverconfigdlg.ui line 158
+#: rc.cpp:58
 #, no-c-format
 msgid "Default Shutdown Option"
 msgstr "默认关机选项"
 
-#. i18n: file smserverconfigdlg.ui line 119
-#: rc.cpp:40
+#. i18n: file smserverconfigdlg.ui line 161
+#: rc.cpp:61
 #, no-c-format
 msgid ""
 "Here you can choose what should happen by default when you log out. This only "
 "has meaning, if you logged in through TDM."
 msgstr "在此你可以选择退出时的默认行为。这仅在通过TDM退出时有意义。"
 
-#. i18n: file smserverconfigdlg.ui line 130
-#: rc.cpp:43
+#. i18n: file smserverconfigdlg.ui line 172
+#: rc.cpp:64
 #, no-c-format
 msgid "&End current session"
 msgstr "结束当前会话(&E)"
 
-#. i18n: file smserverconfigdlg.ui line 138
-#: rc.cpp:46
+#. i18n: file smserverconfigdlg.ui line 180
+#: rc.cpp:67
 #, no-c-format
 msgid "&Turn off computer"
 msgstr "关闭计算机(&T)"
 
-#. i18n: file smserverconfigdlg.ui line 146
-#: rc.cpp:49
+#. i18n: file smserverconfigdlg.ui line 188
+#: rc.cpp:70
 #, no-c-format
 msgid "&Restart computer"
 msgstr "重启计算机(&R)"
 
-#. i18n: file smserverconfigdlg.ui line 156
-#: rc.cpp:52
+#. i18n: file smserverconfigdlg.ui line 198
+#: rc.cpp:73
 #, no-c-format
 msgid "Advanced"
 msgstr "高级"
 
-#. i18n: file smserverconfigdlg.ui line 167
-#: rc.cpp:55
+#. i18n: file smserverconfigdlg.ui line 209
+#: rc.cpp:76
 #, no-c-format
 msgid "Applications to be e&xcluded from sessions:"
 msgstr "要从会话中排除的应用程序(&X)："
 
-#. i18n: file smserverconfigdlg.ui line 178
-#: rc.cpp:58
+#. i18n: file smserverconfigdlg.ui line 220
+#: rc.cpp:79
 #, no-c-format
 msgid ""
 "Here you can enter a comma-separated list of applications that should not be "
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmspellchecking.po b/tde-i18n-zh_CN/messages/tdebase/kcmspellchecking.po
index f6c7f7fa114..e087c83db1f 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmspellchecking.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmspellchecking.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmspellchecking\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-28 09:40+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmstyle.po b/tde-i18n-zh_CN/messages/tdebase/kcmstyle.po
index bca6d6ccaf6..d6ccbd59040 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmstyle.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmstyle.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmstyle\n"
-"POT-Creation-Date: 2006-08-23 02:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-28 14:32+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,145 +58,177 @@ msgid "Sho&w icons on buttons"
 msgstr "在按钮上显示图标(&W)"
 
 #: kcmstyle.cpp:184
+msgid "Enable &scrolling in popup menus"
+msgstr ""
+
+#: kcmstyle.cpp:186
+msgid "Hide &underlined characters in the menu bar when not in use"
+msgstr ""
+
+#: kcmstyle.cpp:188
+msgid "&Pressing only the menu bar activator key selects the menu bar"
+msgstr ""
+
+#: kcmstyle.cpp:190
 msgid "E&nable tooltips"
 msgstr "启用工具提示(&N)"
 
-#: kcmstyle.cpp:186
+#: kcmstyle.cpp:192
 msgid "Show tear-off handles in &popup menus"
 msgstr "在弹出菜单中显示漂移句柄(&P)"
 
-#: kcmstyle.cpp:190
+#: kcmstyle.cpp:199
+#, fuzzy
+msgid "Menu popup delay:"
+msgstr "菜单不透明度(&O)："
+
+#: kcmstyle.cpp:201
+msgid " msec"
+msgstr ""
+
+#: kcmstyle.cpp:207
 msgid "Preview"
 msgstr "预览"
 
-#: kcmstyle.cpp:208
+#: kcmstyle.cpp:225
 msgid "&Enable GUI effects"
 msgstr "启用 GUI 特效(&E)"
 
-#: kcmstyle.cpp:216 kcmstyle.cpp:224 kcmstyle.cpp:233 kcmstyle.cpp:243
+#: kcmstyle.cpp:233 kcmstyle.cpp:241 kcmstyle.cpp:250 kcmstyle.cpp:258
+#: kcmstyle.cpp:268
 msgid "Disable"
 msgstr "禁用"
 
-#: kcmstyle.cpp:217 kcmstyle.cpp:225 kcmstyle.cpp:234
+#: kcmstyle.cpp:234 kcmstyle.cpp:242 kcmstyle.cpp:259
 msgid "Animate"
 msgstr "动画"
 
-#: kcmstyle.cpp:218
+#: kcmstyle.cpp:235
 msgid "Combobo&x effect:"
 msgstr "组合框特效(&X)："
 
-#: kcmstyle.cpp:226 kcmstyle.cpp:235
+#: kcmstyle.cpp:243 kcmstyle.cpp:260
 msgid "Fade"
 msgstr "淡入淡出"
 
-#: kcmstyle.cpp:227
+#: kcmstyle.cpp:244
 msgid "&Tool tip effect:"
 msgstr "工具提示特效(&T)："
 
-#: kcmstyle.cpp:236
+#: kcmstyle.cpp:251
+#, fuzzy
+msgid "Make translucent"
+msgstr "半透明"
+
+#: kcmstyle.cpp:252
+#, fuzzy
+msgid "&Rubberband effect:"
+msgstr "菜单效果(&M)："
+
+#: kcmstyle.cpp:261
 msgid "Make Translucent"
 msgstr "半透明"
 
-#: kcmstyle.cpp:237
+#: kcmstyle.cpp:262
 msgid "&Menu effect:"
 msgstr "菜单效果(&M)："
 
-#: kcmstyle.cpp:244
+#: kcmstyle.cpp:269
 msgid "Application Level"
 msgstr "应用程序级别"
 
-#: kcmstyle.cpp:246
+#: kcmstyle.cpp:271
 msgid "Me&nu tear-off handles:"
 msgstr "菜单脱离柄(&N)："
 
-#: kcmstyle.cpp:251
+#: kcmstyle.cpp:276
 msgid "Menu &drop shadow"
 msgstr "菜单阴影(&D)"
 
-#: kcmstyle.cpp:272
+#: kcmstyle.cpp:297
 msgid "Software Tint"
 msgstr "软件着色"
 
-#: kcmstyle.cpp:273
+#: kcmstyle.cpp:298
 msgid "Software Blend"
 msgstr "软件混色"
 
-#: kcmstyle.cpp:275
+#: kcmstyle.cpp:300
 msgid "XRender Blend"
 msgstr "XRender 混色"
 
-#: kcmstyle.cpp:288
+#: kcmstyle.cpp:313
 #, c-format
 msgid "0%"
 msgstr "0%"
 
-#: kcmstyle.cpp:290
+#: kcmstyle.cpp:315
 #, c-format
 msgid "50%"
 msgstr "50%"
 
-#: kcmstyle.cpp:292
+#: kcmstyle.cpp:317
 #, c-format
 msgid "100%"
 msgstr "100%"
 
-#: kcmstyle.cpp:295
+#: kcmstyle.cpp:320
 msgid "Menu trans&lucency type:"
 msgstr "菜单半透明类型(&L)："
 
-#: kcmstyle.cpp:297
+#: kcmstyle.cpp:322
 msgid "Menu &opacity:"
 msgstr "菜单不透明度(&O)："
 
-#: kcmstyle.cpp:326
+#: kcmstyle.cpp:351
 msgid "High&light buttons under mouse"
 msgstr "突出显示鼠标下的按钮(&L)"
 
-#: kcmstyle.cpp:327
+#: kcmstyle.cpp:352
 msgid "Transparent tool&bars when moving"
 msgstr "移动时工具栏是透明的(&B)"
 
-#: kcmstyle.cpp:332
+#: kcmstyle.cpp:357
 msgid "Text pos&ition:"
 msgstr "文字位置(&I)："
 
-#: kcmstyle.cpp:334
+#: kcmstyle.cpp:359
 msgid "Icons Only"
 msgstr "只有图标"
 
-#: kcmstyle.cpp:335
+#: kcmstyle.cpp:360
 msgid "Text Only"
 msgstr "只有文字"
 
-#: kcmstyle.cpp:336
+#: kcmstyle.cpp:361
 msgid "Text Alongside Icons"
 msgstr "文字在图标旁"
 
-#: kcmstyle.cpp:337
+#: kcmstyle.cpp:362
 msgid "Text Under Icons"
 msgstr "文字在图标下"
 
-#: kcmstyle.cpp:379
+#: kcmstyle.cpp:409
 msgid "&Style"
 msgstr "样式(&S)"
 
-#: kcmstyle.cpp:380
+#: kcmstyle.cpp:410
 msgid "&Effects"
 msgstr "特效(&E)"
 
-#: kcmstyle.cpp:381
+#: kcmstyle.cpp:411
 msgid "&Toolbar"
 msgstr "工具栏(&T)"
 
-#: kcmstyle.cpp:418 kcmstyle.cpp:429
+#: kcmstyle.cpp:448 kcmstyle.cpp:459
 msgid "There was an error loading the configuration dialog for this style."
 msgstr "装入此样式的配置对话框出错。"
 
-#: kcmstyle.cpp:420 kcmstyle.cpp:431
+#: kcmstyle.cpp:450 kcmstyle.cpp:461
 msgid "Unable to Load Dialog"
 msgstr "无法装入对话框"
 
-#: kcmstyle.cpp:520
+#: kcmstyle.cpp:550
 msgid ""
 "<qt>Selected style: <b>%1</b>"
 "<br>"
@@ -210,49 +243,49 @@ msgstr ""
 "<br>"
 "<br>"
 
-#: kcmstyle.cpp:532
+#: kcmstyle.cpp:562
 msgid "Menu translucency is not available.<br>"
 msgstr "菜单半透明不可用。<br>"
 
-#: kcmstyle.cpp:539
+#: kcmstyle.cpp:569
 msgid "Menu drop-shadows are not available."
 msgstr "菜单阴影不可用。"
 
-#: kcmstyle.cpp:722 kcmstyle.cpp:834
+#: kcmstyle.cpp:764 kcmstyle.cpp:876
 msgid "No description available."
 msgstr "没有描述。"
 
-#: kcmstyle.cpp:834
+#: kcmstyle.cpp:876
 #, c-format
 msgid "Description: %1"
 msgstr "描述：%1"
 
-#: kcmstyle.cpp:1013
+#: kcmstyle.cpp:1065
 msgid ""
 "Here you can choose from a list of predefined widget styles (e.g. the way "
 "buttons are drawn) which may or may not be combined with a theme (additional "
 "information like a marble texture or a gradient)."
 msgstr "您可以从预定义部件样式(如按钮的绘制方式)列表中选择哪些可以(或不可以)与主题组合(如大理石贴图或颜色梯度等附加信息)。"
 
-#: kcmstyle.cpp:1017
+#: kcmstyle.cpp:1069
 msgid ""
 "This area shows a preview of the currently selected style without having to "
 "apply it to the whole desktop."
 msgstr "此区域所显示的预览能够使得您无需将所选样式应用到整个桌面即可观看该样式的效果。"
 
-#: kcmstyle.cpp:1021
+#: kcmstyle.cpp:1073
 msgid ""
 "This page allows you to enable various widget style effects. For best "
 "performance, it is advisable to disable all effects."
 msgstr "此页面允许您启用各种部件样式效果。要获得最佳的执行效率，推荐禁用全部特效。"
 
-#: kcmstyle.cpp:1023
+#: kcmstyle.cpp:1075
 msgid ""
 "If you check this box, you can select several effects for different widgets "
 "like combo boxes, menus or tooltips."
 msgstr "如果您选中此选项，您就可以为不同的部件如组合框、菜单或工具提示选择几种特效。"
 
-#: kcmstyle.cpp:1025
+#: kcmstyle.cpp:1077
 msgid ""
 "<p><b>Disable: </b>do not use any combo box effects.</p>\n"
 "<b>Animate: </b>Do some animation."
@@ -260,7 +293,7 @@ msgstr ""
 "<p><b>禁用：</b>不使用任何组合框特效。</p>\n"
 "<b>动画：</b>显示动画。"
 
-#: kcmstyle.cpp:1027
+#: kcmstyle.cpp:1079
 msgid ""
 "<p><b>Disable: </b>do not use any tooltip effects.</p>\n"
 "<p><b>Animate: </b>Do some animation.</p>\n"
@@ -270,7 +303,16 @@ msgstr ""
 "<p><b>动画：</b>显示动画。</p>\n"
 "<b>淡入淡出：</b>使用 Alpha 混合造成工具提示淡入淡出的效果。"
 
-#: kcmstyle.cpp:1030
+#: kcmstyle.cpp:1082
+#, fuzzy
+msgid ""
+"<p><b>Disable: </b>do not use any rubberband effects.</p>\n"
+"<b>Make Translucent: </b>Draw a translucent rubberband."
+msgstr ""
+"<p><b>禁用：</b>不使用任何组合框特效。</p>\n"
+"<b>动画：</b>显示动画。"
+
+#: kcmstyle.cpp:1084
 msgid ""
 "<p><b>Disable: </b>do not use any menu effects.</p>\n"
 "<p><b>Animate: </b>Do some animation.</p>\n"
@@ -283,14 +325,14 @@ msgstr ""
 "<p><b>淡入淡出：</b>使用 Alpha 混色造成菜单淡入淡出的效果。</p>\n"
 "<b>半透明：</b>Alpha 混色菜单的透视效果。(仅 TDE 样式)"
 
-#: kcmstyle.cpp:1034
+#: kcmstyle.cpp:1088
 msgid ""
 "When enabled, all popup menus will have a drop-shadow, otherwise drop-shadows "
 "will not be displayed. At present, only TDE styles can have this effect "
 "enabled."
 msgstr "如果启用的话，所有的弹出菜单都会显示阴影，否则不会显示阴影。目前只有 TDE 样式可以启用此特效。"
 
-#: kcmstyle.cpp:1037
+#: kcmstyle.cpp:1091
 msgid ""
 "<p><b>Software Tint: </b>Alpha-blend using a flat color.</p>\n"
 "<p><b>Software Blend: </b>Alpha-blend using an image.</p>\n"
@@ -304,35 +346,35 @@ msgstr ""
 "<b>XRender 混色：</b>使用 XFree RENDER "
 "扩展进行图像混色(若可用的话)。与无加速显示设备上的软件例程相比，这种方式会较慢，但是在远程显示时的性能会较高。</p>\n"
 
-#: kcmstyle.cpp:1042
+#: kcmstyle.cpp:1096
 msgid "By adjusting this slider you can control the menu effect opacity."
 msgstr "通过调整此滑块，您可以控制菜单特效的不透明度。"
 
-#: kcmstyle.cpp:1045
+#: kcmstyle.cpp:1099
 msgid ""
 "<b>Note:</b> that all widgets in this combobox do not apply to Qt-only "
 "applications."
 msgstr "<b>注意：</b>此组合框中的所有部件都不会应用到只用 Qt 的应用程序中！"
 
-#: kcmstyle.cpp:1047
+#: kcmstyle.cpp:1101
 msgid ""
 "If this option is selected, toolbar buttons will change their color when the "
 "mouse cursor is moved over them."
 msgstr "如果使用此选项，在鼠标移动到工具栏按钮上时，它们将改变颜色。"
 
-#: kcmstyle.cpp:1049
+#: kcmstyle.cpp:1103
 msgid ""
 "If you check this box, the toolbars will be transparent when moving them "
 "around."
 msgstr "如果您选中此选项，工具提示将会在被鼠标四处移动的时候变成透明。"
 
-#: kcmstyle.cpp:1051
+#: kcmstyle.cpp:1105
 msgid ""
 "If you check this option, the TDE application will offer tooltips when the "
 "cursor remains over items in the toolbar."
 msgstr "如果您选中此选项，TDE 应用程序将会在鼠标指针指向工具栏中的项目时提供工具提示。"
 
-#: kcmstyle.cpp:1053
+#: kcmstyle.cpp:1107
 msgid ""
 "<p><b>Icons only:</b> Shows only icons on toolbar buttons. Best option for low "
 "resolutions.</p>"
@@ -346,13 +388,46 @@ msgstr ""
 "<p><b>文字在图标旁：</b>在工具栏按钮上同时显示图标和文字。文字排列于图标旁边。</p>"
 "<p><b>文字在图标下：</b>在工具栏按钮上同时显示图标和文字。文本排列于图标下。"
 
-#: kcmstyle.cpp:1060
+#: kcmstyle.cpp:1114
 msgid ""
 "If you enable this option, TDE Applications will show small icons alongside "
 "some important buttons."
 msgstr "如果您启用此选项，TDE 应用程序将会在某些重要按钮旁边显示小图标。"
 
-#: kcmstyle.cpp:1062
+#: kcmstyle.cpp:1116
+#, fuzzy
+msgid ""
+"If you enable this option, pop-up menus will scroll if vertical space is "
+"exhausted."
+msgstr "如果您启用此选项，TDE 应用程序将会在某些重要按钮旁边显示小图标。"
+
+#: kcmstyle.cpp:1117
+msgid ""
+"Program drop-down menus can be used with either the mouse or keyboard. Each "
+"menu item on the menu bar that can be activated from the keyboard contains one "
+"character that is underlined. When the underlined character key is pressed "
+"concurrently with the activator key (usually Alt), the keyboard combination "
+"opens the menu or selects that menu item. The underlines can remain hidden "
+"until the activator key is pressed or remain visible at all times. Enabling "
+"this option hides the underlines until pressing the activator key. Note: some "
+"widget styles do not support this feature."
+msgstr ""
+
+#: kcmstyle.cpp:1124
+msgid ""
+"When using the keyboard, program drop-down menus can be activated in one of two "
+"ways. Concurrently press the activator key (usually Alt) and the underlined "
+"character that is part of the menu name, or sequentially press and release the "
+"activator key and then press the underlined character. Enabling this option "
+"selects the latter method. The method of concurrently pressing both keys is "
+"supported in both Trinity and non Trinity programs. The choice of using either "
+"method applies to Trinity Programs only and not to non Trinity programs. "
+"Regardless of which option is preferred, after a desired menu opens, pressing "
+"only the respective underlined key of any menu item is required to select that "
+"menu item."
+msgstr ""
+
+#: kcmstyle.cpp:1132
 msgid ""
 "If you enable this option some pop-up menus will show so called tear-off "
 "handles. If you click them, you get the menu inside a widget. This can be very "
@@ -360,6 +435,12 @@ msgid ""
 msgstr ""
 "如果您启用此选项，某些弹出菜单将会显示被称为漂移句柄的部件。如果您单击这些漂移句柄，菜单就会漂移为新的部件窗口。在执行多次相同操作时，此功能非常有用。"
 
+#: kcmstyle.cpp:1136
+msgid ""
+"The menu popup delay is the time (in milliseconds) before a selected menu or "
+"submenu appears."
+msgstr ""
+
 #: menupreview.cpp:160
 #, c-format
 msgid "%"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmtaskbar.po b/tde-i18n-zh_CN/messages/tdebase/kcmtaskbar.po
index d483940ed50..2a601f59028 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmtaskbar.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmtaskbar.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmtaskbar\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-01-20 01:48+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,67 +31,92 @@ msgid ""
 "Your emails"
 msgstr "i18n-translation@lists.linux.net.cn"
 
-#: kcmtaskbar.cpp:83
+#: kcmtaskbar.cpp:103
 msgid "Show Task List"
 msgstr "显示任务列表"
 
-#: kcmtaskbar.cpp:83
+#: kcmtaskbar.cpp:103
 msgid "Show Operations Menu"
 msgstr "显示操作菜单"
 
-#: kcmtaskbar.cpp:84
+#: kcmtaskbar.cpp:104
 msgid "Activate, Raise or Minimize Task"
 msgstr "激活、提升或最小化任务"
 
-#: kcmtaskbar.cpp:85
+#: kcmtaskbar.cpp:105
 msgid "Activate Task"
 msgstr "激活任务"
 
-#: kcmtaskbar.cpp:85
+#: kcmtaskbar.cpp:105
 msgid "Raise Task"
 msgstr "提升任务"
 
-#: kcmtaskbar.cpp:86
+#: kcmtaskbar.cpp:106
 msgid "Lower Task"
 msgstr "降低任务"
 
-#: kcmtaskbar.cpp:86
+#: kcmtaskbar.cpp:106
 msgid "Minimize Task"
 msgstr "最小化任务"
 
-#: kcmtaskbar.cpp:87
-msgid "To Current Desktop"
+#: kcmtaskbar.cpp:107
+#, fuzzy
+msgid "Move To Current Desktop"
 msgstr "到当前桌面"
 
-#: kcmtaskbar.cpp:88
+#: kcmtaskbar.cpp:108
 msgid "Close Task"
 msgstr "关闭任务"
 
-#: kcmtaskbar.cpp:106
+#: kcmtaskbar.cpp:126
 msgid "Never"
 msgstr "从不"
 
-#: kcmtaskbar.cpp:106
+#: kcmtaskbar.cpp:126
 msgid "When Taskbar Full"
 msgstr "任务栏满时"
 
-#: kcmtaskbar.cpp:107
+#: kcmtaskbar.cpp:127
 msgid "Always"
 msgstr "总是"
 
-#: kcmtaskbar.cpp:129
+#: kcmtaskbar.cpp:145
+msgid "Any"
+msgstr ""
+
+#: kcmtaskbar.cpp:145
+msgid "Only Stopped"
+msgstr ""
+
+#: kcmtaskbar.cpp:146
+msgid "Only Running"
+msgstr ""
+
+#: kcmtaskbar.cpp:164
+msgid "Icons and Text"
+msgstr ""
+
+#: kcmtaskbar.cpp:165
+msgid "Text only"
+msgstr ""
+
+#: kcmtaskbar.cpp:166
+msgid "Icons only"
+msgstr ""
+
+#: kcmtaskbar.cpp:217
 msgid "Elegant"
 msgstr "智能"
 
-#: kcmtaskbar.cpp:130
+#: kcmtaskbar.cpp:218
 msgid "Classic"
 msgstr "经典"
 
-#: kcmtaskbar.cpp:131
+#: kcmtaskbar.cpp:219
 msgid "For Transparency"
 msgstr "透明"
 
-#: kcmtaskbar.cpp:144
+#: kcmtaskbar.cpp:232
 msgid ""
 "<h1>Taskbar</h1> You can configure the taskbar here. This includes options such "
 "as whether or not the taskbar should show all windows at once or only those on "
@@ -99,63 +125,99 @@ msgid ""
 msgstr ""
 "<h1>任务栏</h1>您可在此配置任务栏。这里包括一些选项，如是否在任务栏上显示所有窗口或只显示当前桌面上的窗口。您还可以配置是否显示窗口列表按钮。"
 
-#: kcmtaskbar.cpp:176
+#: kcmtaskbar.cpp:270
 msgid "kcmtaskbar"
 msgstr "kcmtaskbar"
 
-#: kcmtaskbar.cpp:177
+#: kcmtaskbar.cpp:271
 msgid "TDE Taskbar Control Module"
 msgstr "TDE 任务栏控制模块"
 
-#: kcmtaskbar.cpp:179
+#: kcmtaskbar.cpp:273
 msgid "(c) 2000 - 2001 Matthias Elter"
 msgstr "(C) 2000 - 2001 Matthias Elter"
 
-#: kcmtaskbar.cpp:182
+#: kcmtaskbar.cpp:276
 msgid "TDEConfigXT conversion"
 msgstr "TDEConfigXT 转换"
 
-#: kcmtaskbar.cpp:209 kcmtaskbar.cpp:210 kcmtaskbar.cpp:211
+#: kcmtaskbar.cpp:364 kcmtaskbar.cpp:365 kcmtaskbar.cpp:366
 msgid "Cycle Through Windows"
 msgstr "在窗口间循环"
 
-#: kcmtaskbar.cpp:243
+#: kcmtaskbar.cpp:398
 msgid "Custom"
 msgstr "自定义"
 
 #. i18n: file kcmtaskbarui.ui line 16
-#: rc.cpp:3 rc.cpp:6
+#: rc.cpp:3 rc.cpp:27
 #, no-c-format
 msgid "Taskbar"
 msgstr "任务栏"
 
-#. i18n: file kcmtaskbarui.ui line 47
+#. i18n: file kcmtaskbarui.ui line 32
+#: rc.cpp:6
+#, no-c-format
+msgid "Settings"
+msgstr ""
+
+#. i18n: file kcmtaskbarui.ui line 43
 #: rc.cpp:9
 #, no-c-format
-msgid "Sort windows by desk&top"
-msgstr "按桌面排序窗口(&T)"
+msgid ""
+"<b>NOTE: Currently you are editing the global taskbar configuration.</b>"
+"<br>To change the configuration of a specific taskbar (when using multiple "
+"taskbars), use the corresponding Configure Taskbar menu option, located in the "
+"taskbar handle popup menu."
+msgstr ""
 
-#. i18n: file kcmtaskbarui.ui line 55
+#. i18n: file kcmtaskbarui.ui line 51
 #: rc.cpp:12
 #, no-c-format
 msgid ""
-"Selecting this option causes the taskbar to show windows in order of the "
-"desktop they appear on.\n"
-"\n"
-"By default this option is selected."
+"<b>NOTE:</b> Currently you are editing the taskbar configuration for <b>only</b> "
+"this taskbar."
+msgstr ""
+
+#. i18n: file kcmtaskbarui.ui line 59
+#: rc.cpp:15
+#, no-c-format
+msgid "Use global floating taskbar configuration"
+msgstr ""
+
+#. i18n: file kcmtaskbarui.ui line 65
+#: rc.cpp:18
+#, fuzzy, no-c-format
+msgid ""
+"Selecting this option causes the taskbar to use the global taskbar "
+"configuration."
 msgstr ""
 "选择此选项将导致任务栏按照窗口所属的桌面显示窗口。\n"
 "\n"
 "默认情况下，此选项是选中的。"
 
-#. i18n: file kcmtaskbarui.ui line 63
-#: rc.cpp:17
+#. i18n: file kcmtaskbarui.ui line 73
+#: rc.cpp:21
+#, no-c-format
+msgid ""
+"Overwrite current configuration with the current global floating taskbar "
+"configuration"
+msgstr ""
+
+#. i18n: file kcmtaskbarui.ui line 81
+#: rc.cpp:24
+#, no-c-format
+msgid "Edt global floating taskbar configuration"
+msgstr ""
+
+#. i18n: file kcmtaskbarui.ui line 106
+#: rc.cpp:30
 #, no-c-format
 msgid "&Show windows from all desktops"
 msgstr "显示全部桌面中的窗口(&S)"
 
-#. i18n: file kcmtaskbarui.ui line 71
-#: rc.cpp:20
+#. i18n: file kcmtaskbarui.ui line 114
+#: rc.cpp:33
 #, no-c-format
 msgid ""
 "Turning this option off will cause the taskbar to display <b>only</b> "
@@ -167,56 +229,78 @@ msgstr ""
 "\n"
 "默认情况下，此选项为选中状态，即会显示全部窗口。"
 
-#. i18n: file kcmtaskbarui.ui line 79
-#: rc.cpp:25
+#. i18n: file kcmtaskbarui.ui line 122
+#: rc.cpp:38
 #, no-c-format
-msgid "Show window list &button"
-msgstr "显示窗口列表按钮(&B)"
+msgid "Sort windows by desk&top"
+msgstr "按桌面排序窗口(&T)"
 
-#. i18n: file kcmtaskbarui.ui line 85
-#: rc.cpp:28
+#. i18n: file kcmtaskbarui.ui line 130
+#: rc.cpp:41
 #, no-c-format
 msgid ""
-"Selecting this option causes the taskbar to display a button that, when "
-"clicked, shows a list of all windows in a popup menu."
-msgstr "选择此按钮将导致任务栏显示一个按钮，单击该按钮时将弹出一个包含全部窗口列表的弹出菜单。"
+"Selecting this option causes the taskbar to show windows in order of the "
+"desktop they appear on.\n"
+"\n"
+"By default this option is selected."
+msgstr ""
+"选择此选项将导致任务栏按照窗口所属的桌面显示窗口。\n"
+"\n"
+"默认情况下，此选项是选中的。"
 
-#. i18n: file kcmtaskbarui.ui line 105
-#: rc.cpp:31
+#. i18n: file kcmtaskbarui.ui line 138
+#: rc.cpp:46
+#, no-c-format
+msgid "Show windows from all sc&reens"
+msgstr "显示全部屏幕中的窗口(&R)"
+
+#. i18n: file kcmtaskbarui.ui line 146
+#: rc.cpp:49
 #, no-c-format
 msgid ""
-"The taskbar can group similar windows into single buttons. When one of these "
-"window group buttons are clicked on a menu appears showing all the windows in "
-"that group. This can be especially useful with the <em>Show all windows</em> "
-"option.\n"
-"\n"
-"You can set the taskbar to <strong>Never</strong> group windows, to <strong>"
-"Always</strong> group windows or to group windows only <strong>"
-"When the Taskbar is Full</strong>.\n"
+"Turning this option off will cause the taskbar to display <b>only</b> "
+"windows which are on the same Xinerama screen as the taskbar.\n"
 "\n"
-"By default the taskbar groups windows when it is full."
+"By default, this option is selected and all windows are shown."
 msgstr ""
-"任务栏可以将类似窗口分组为一个按钮。单击这样的按钮后，会出现一个菜单，其中显示了改组中的全部窗口。<em>显示全部窗口</em>选项可能会非常有用。\n"
-"\n"
-"您可以将任务栏设置为<strong>从不</strong>分组窗口，<strong>总是</strong>分组窗口，或者是仅当<strong>"
-"任务栏满时</strong>。\n"
+"关闭此选项将使得任务上<b>只</b>显示与任务栏在同一 Xinerama 屏幕中的窗口。\n"
 "\n"
-"默认情况下，系统会在任务栏满时对窗口进行分组。"
+"默认情况下，此选项为选中状态，即会显示全部窗口。"
 
-#. i18n: file kcmtaskbarui.ui line 113
-#: rc.cpp:38
+#. i18n: file kcmtaskbarui.ui line 154
+#: rc.cpp:54
 #, no-c-format
-msgid "&Group similar tasks:"
-msgstr "相似任务分组(&G)："
+msgid "Sort alphabeticall&y by application name"
+msgstr "按应用程序字母顺序排序(&Y)"
 
-#. i18n: file kcmtaskbarui.ui line 124
-#: rc.cpp:41
+#. i18n: file kcmtaskbarui.ui line 165
+#: rc.cpp:57
+#, no-c-format
+msgid "&Allow taskbar items to be rearranged using drag and drop"
+msgstr ""
+
+#. i18n: file kcmtaskbarui.ui line 171
+#: rc.cpp:60
+#, no-c-format
+msgid ""
+"Turning this option on will allow tasks on the taskbar to be manually "
+"rearranged using drag and drop."
+msgstr ""
+
+#. i18n: file kcmtaskbarui.ui line 179
+#: rc.cpp:63
+#, fuzzy, no-c-format
+msgid "Cycle through windows with mouse wheel"
+msgstr "在窗口间循环"
+
+#. i18n: file kcmtaskbarui.ui line 190
+#: rc.cpp:66
 #, no-c-format
 msgid "Show o&nly minimized windows"
 msgstr "只显示最小化的窗口(&N)"
 
-#. i18n: file kcmtaskbarui.ui line 129
-#: rc.cpp:44
+#. i18n: file kcmtaskbarui.ui line 195
+#: rc.cpp:69
 #, no-c-format
 msgid ""
 "Select this option if you want the taskbar to display <b>only</b> "
@@ -228,100 +312,138 @@ msgstr ""
 "\n"
 "默认情况下，此选项未选中，任务栏将显示全部窗口。"
 
-#. i18n: file kcmtaskbarui.ui line 137
-#: rc.cpp:49
+#. i18n: file kcmtaskbarui.ui line 203
+#: rc.cpp:74
 #, no-c-format
-msgid "Sho&w application icons"
-msgstr "显示程序图标(&W)"
+msgid "Show window list &button"
+msgstr "显示窗口列表按钮(&B)"
 
-#. i18n: file kcmtaskbarui.ui line 145
-#: rc.cpp:52
+#. i18n: file kcmtaskbarui.ui line 209
+#: rc.cpp:77
 #, no-c-format
 msgid ""
-"Select this option if you want window icons to appear along with their titles "
-"in the taskbar.\n"
-"\n"
-"By default this option is selected."
+"Selecting this option causes the taskbar to display a button that, when "
+"clicked, shows a list of all windows in a popup menu."
+msgstr "选择此按钮将导致任务栏显示一个按钮，单击该按钮时将弹出一个包含全部窗口列表的弹出菜单。"
+
+#. i18n: file kcmtaskbarui.ui line 217
+#: rc.cpp:80
+#, no-c-format
+msgid "Dis&play:"
 msgstr ""
-"如果您想要在任务栏中同时显示窗口图标及其标题，请选择此选项。\n"
-"\n"
-"默认情况下，此选项是选中的。"
 
-#. i18n: file kcmtaskbarui.ui line 153
-#: rc.cpp:57
+#. i18n: file kcmtaskbarui.ui line 236
+#: rc.cpp:83
 #, no-c-format
-msgid "Show windows from all sc&reens"
-msgstr "显示全部屏幕中的窗口(&R)"
+msgid ""
+"Choose taskbar display mode among <strong>Icons and text</strong>, <strong>"
+"Text only</strong> and <strong>Icons only</strong>."
+msgstr ""
 
-#. i18n: file kcmtaskbarui.ui line 161
-#: rc.cpp:60
+#. i18n: file kcmtaskbarui.ui line 256
+#: rc.cpp:86
 #, no-c-format
 msgid ""
-"Turning this option off will cause the taskbar to display <b>only</b> "
-"windows which are on the same Xinerama screen as the taskbar.\n"
+"The taskbar can group similar windows into single buttons. When one of these "
+"window group buttons are clicked on a menu appears showing all the windows in "
+"that group. This can be especially useful with the <em>Show all windows</em> "
+"option.\n"
 "\n"
-"By default, this option is selected and all windows are shown."
+"You can set the taskbar to <strong>Never</strong> group windows, to <strong>"
+"Always</strong> group windows or to group windows only <strong>"
+"When the Taskbar is Full</strong>.\n"
+"\n"
+"By default the taskbar groups windows when it is full."
 msgstr ""
-"关闭此选项将使得任务上<b>只</b>显示与任务栏在同一 Xinerama 屏幕中的窗口。\n"
+"任务栏可以将类似窗口分组为一个按钮。单击这样的按钮后，会出现一个菜单，其中显示了改组中的全部窗口。<em>显示全部窗口</em>选项可能会非常有用。\n"
 "\n"
-"默认情况下，此选项为选中状态，即会显示全部窗口。"
+"您可以将任务栏设置为<strong>从不</strong>分组窗口，<strong>总是</strong>分组窗口，或者是仅当<strong>"
+"任务栏满时</strong>。\n"
+"\n"
+"默认情况下，系统会在任务栏满时对窗口进行分组。"
+
+#. i18n: file kcmtaskbarui.ui line 264
+#: rc.cpp:93
+#, no-c-format
+msgid "&Group similar tasks:"
+msgstr "相似任务分组(&G)："
 
-#. i18n: file kcmtaskbarui.ui line 174
-#: rc.cpp:65
+#. i18n: file kcmtaskbarui.ui line 283
+#: rc.cpp:96
+#, no-c-format
+msgid ""
+"The taskbar can show and/or hide tasks based on their current process state.  "
+"Select <em>Any</em> to show all tasks regardless of current state."
+msgstr ""
+
+#. i18n: file kcmtaskbarui.ui line 291
+#: rc.cpp:99
+#, fuzzy, no-c-format
+msgid "&Show tasks with state:"
+msgstr "显示任务列表"
+
+#. i18n: file kcmtaskbarui.ui line 307
+#: rc.cpp:102
 #, no-c-format
 msgid "A&ppearance:"
 msgstr "外观(&P)："
 
-#. i18n: file kcmtaskbarui.ui line 188
-#: rc.cpp:68
+#. i18n: file kcmtaskbarui.ui line 321
+#: rc.cpp:105
 #, no-c-format
 msgid "Use &custom colors"
 msgstr "使用自定义颜色(&C)"
 
-#. i18n: file kcmtaskbarui.ui line 257
-#: rc.cpp:71
-#, no-c-format
-msgid "&Background color:"
-msgstr "背景颜色(&B)："
-
-#. i18n: file kcmtaskbarui.ui line 276
-#: rc.cpp:74
+#. i18n: file kcmtaskbarui.ui line 340
+#: rc.cpp:108
 #, no-c-format
 msgid "Inacti&ve task text color:"
 msgstr "非活动任务的文本颜色(&V)："
 
-#. i18n: file kcmtaskbarui.ui line 287
-#: rc.cpp:77
+#. i18n: file kcmtaskbarui.ui line 376
+#: rc.cpp:111
 #, no-c-format
 msgid "Active task te&xt color:"
 msgstr "活动任务的文本颜色(&X)："
 
-#. i18n: file kcmtaskbarui.ui line 334
-#: rc.cpp:80
+#. i18n: file kcmtaskbarui.ui line 412
+#: rc.cpp:114
 #, no-c-format
-msgid "Sort alphabeticall&y by application name"
-msgstr "按应用程序字母顺序排序(&Y)"
+msgid "&Background color:"
+msgstr "背景颜色(&B)："
 
-#. i18n: file kcmtaskbarui.ui line 347
-#: rc.cpp:83
+#. i18n: file kcmtaskbarui.ui line 469
+#: rc.cpp:117
 #, no-c-format
 msgid "Actions"
 msgstr "动作"
 
-#. i18n: file kcmtaskbarui.ui line 358
-#: rc.cpp:86
+#. i18n: file kcmtaskbarui.ui line 480
+#: rc.cpp:120
 #, no-c-format
 msgid "&Left button:"
 msgstr "左键(&L)："
 
-#. i18n: file kcmtaskbarui.ui line 369
-#: rc.cpp:89
+#. i18n: file kcmtaskbarui.ui line 491
+#: rc.cpp:123
 #, no-c-format
 msgid "&Middle button:"
 msgstr "中键(&M)："
 
-#. i18n: file kcmtaskbarui.ui line 380
-#: rc.cpp:92
+#. i18n: file kcmtaskbarui.ui line 502
+#: rc.cpp:126
 #, no-c-format
 msgid "Right b&utton:"
 msgstr "右键(&U)："
+
+#~ msgid "Sho&w application icons"
+#~ msgstr "显示程序图标(&W)"
+
+#~ msgid ""
+#~ "Select this option if you want window icons to appear along with their titles in the taskbar.\n"
+#~ "\n"
+#~ "By default this option is selected."
+#~ msgstr ""
+#~ "如果您想要在任务栏中同时显示窗口图标及其标题，请选择此选项。\n"
+#~ "\n"
+#~ "默认情况下，此选项是选中的。"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmtdednssd.po b/tde-i18n-zh_CN/messages/tdebase/kcmtdednssd.po
index ba9abbcbf66..f9fdc9f175d 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmtdednssd.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmtdednssd.po
@@ -4,136 +4,186 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkdnssd\n"
-"POT-Creation-Date: 2005-10-13 02:37+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-08-01 07:16+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kcmdnssd.cpp:53
+#: kcmdnssd.cpp:59
 msgid "kcm_tdednssd"
 msgstr "kcm_tdednssd"
 
-#: kcmdnssd.cpp:54
+#: kcmdnssd.cpp:60
 msgid "ZeroConf configuration"
 msgstr "ZeroConf 配置"
 
-#: kcmdnssd.cpp:55
+#: kcmdnssd.cpp:61
 msgid "(C) 2004,2005 Jakub Stachowski"
 msgstr "(C) 2004，2005 Jakub Stachowski"
 
-#: kcmdnssd.cpp:56
+#: kcmdnssd.cpp:62
 msgid "Setup services browsing with ZeroConf"
 msgstr "用 ZeroConf 设置服务浏览"
 
+#: kcmdnssd.cpp:96
+msgid ""
+"Enabling local network browsing will open a network port (5353) on your "
+"computer.  If security problems are discovered in the zeroconf server, remote "
+"attackers could access your computer as the \"avahi\" user."
+msgstr ""
+
+#: kcmdnssd.cpp:103
+msgid "Enable Zeroconf Network Browsing"
+msgstr ""
+
+#: kcmdnssd.cpp:103
+msgid "Enable Browsing"
+msgstr ""
+
+#: kcmdnssd.cpp:103
+msgid "Don't Enable Browsing"
+msgstr ""
+
 #. i18n: file configdialog.ui line 30
-#: rc.cpp:3 rc.cpp:55
+#: rc.cpp:3 rc.cpp:73
 #, no-c-format
 msgid "MyDialog1"
 msgstr "MyDialog1"
 
 #. i18n: file configdialog.ui line 45
-#: rc.cpp:6 rc.cpp:58
+#: rc.cpp:6 rc.cpp:76
 #, no-c-format
 msgid "&General"
 msgstr "常规(&G)"
 
-#. i18n: file configdialog.ui line 56
-#: rc.cpp:9 rc.cpp:61
+#. i18n: file configdialog.ui line 67
+#: rc.cpp:9 rc.cpp:79
 #, no-c-format
-msgid "Browse local networ&k"
-msgstr "浏览局域网(&K)"
+msgid "Publishing Mode"
+msgstr "发布模式"
 
-#. i18n: file configdialog.ui line 59
-#: rc.cpp:12 rc.cpp:64
+#. i18n: file configdialog.ui line 85
+#: rc.cpp:12 rc.cpp:82
 #, no-c-format
-msgid "Browse local network (domain .local) using multicast DNS."
-msgstr "使用多播 DNS 浏览局域网(域为 .local)。"
+msgid "&Wide area network"
+msgstr "广域网(&W)"
 
-#. i18n: file configdialog.ui line 75
-#: rc.cpp:15 rc.cpp:67
+#. i18n: file configdialog.ui line 88
+#: rc.cpp:15 rc.cpp:85
 #, no-c-format
-msgid "Additional Domains"
-msgstr "额外域"
+msgid "Alt+W"
+msgstr "Alt+W"
 
-#. i18n: file configdialog.ui line 79
-#: rc.cpp:18 rc.cpp:70
+#. i18n: file configdialog.ui line 91
+#: rc.cpp:18 rc.cpp:88
 #, no-c-format
 msgid ""
-"List of Internet domains  that will be browsed for services. Do not put .local "
-"here - it\n"
-"is configured with 'Browse local network' option above."
-msgstr ""
-"列出要浏览服务的 Internet 域名。不要在此输入 .local - 它已经用上面的\n"
-"“浏览局域网”选项配置了。"
+"Advertise services on Internet domain using public IP. To have this option "
+"working you need to configure wide area operation in using administrator mode"
+msgstr "使用公开 IP 在 Internet 域中推广服务。要使此选项生效，您需要使用管理员模式配置广域操作。"
 
-#. i18n: file configdialog.ui line 95
-#: rc.cpp:22 rc.cpp:74
+#. i18n: file configdialog.ui line 107
+#: rc.cpp:21 rc.cpp:91
 #, no-c-format
-msgid "Publishing Mode"
-msgstr "发布模式"
+msgid "Loc&al network"
+msgstr "局域网(&A)"
 
 #. i18n: file configdialog.ui line 110
-#: rc.cpp:25 rc.cpp:77
+#: rc.cpp:24 rc.cpp:94
 #, no-c-format
-msgid "Loc&al network"
-msgstr "局域网(&A)"
+msgid "Alt+A"
+msgstr "Alt+A"
 
 #. i18n: file configdialog.ui line 116
-#: rc.cpp:28 rc.cpp:80
+#: rc.cpp:27 rc.cpp:97
 #, no-c-format
 msgid ""
 "Advertise services on local network (in domain .local) using multicast DNS."
 msgstr "使用多播 DNS 在局域网(域为 .local)内推广服务。"
 
-#. i18n: file configdialog.ui line 135
-#: rc.cpp:31 rc.cpp:83
+#. i18n: file configdialog.ui line 125
+#: rc.cpp:30 rc.cpp:100
 #, no-c-format
-msgid "&Wide area network"
-msgstr "广域网(&W)"
+msgid "Browse local networ&k"
+msgstr "浏览局域网(&K)"
+
+#. i18n: file configdialog.ui line 128
+#: rc.cpp:33 rc.cpp:103
+#, no-c-format
+msgid "Alt+K"
+msgstr "Alt+K"
+
+#. i18n: file configdialog.ui line 131
+#: rc.cpp:36 rc.cpp:45 rc.cpp:106 rc.cpp:115
+#, no-c-format
+msgid "Browse local network (domain .local) using multicast DNS."
+msgstr "使用多播 DNS 浏览局域网(域为 .local)。"
+
+#. i18n: file configdialog.ui line 139
+#: rc.cpp:39 rc.cpp:109
+#, no-c-format
+msgid "Enable &Zeroconf network browsing"
+msgstr ""
+
+#. i18n: file configdialog.ui line 142
+#: rc.cpp:42 rc.cpp:112
+#, fuzzy, no-c-format
+msgid "Alt+Z"
+msgstr "Alt+K"
 
-#. i18n: file configdialog.ui line 138
-#: rc.cpp:34 rc.cpp:86
+#. i18n: file configdialog.ui line 161
+#: rc.cpp:48 rc.cpp:118
+#, no-c-format
+msgid "Additional Domains"
+msgstr "额外域"
+
+#. i18n: file configdialog.ui line 165
+#: rc.cpp:51 rc.cpp:121
 #, no-c-format
 msgid ""
-"Advertise services on Internet domain using public IP. To have this option "
-"working you need to configure wide area operation in using administrator mode"
-msgstr "使用公开 IP 在 Internet 域中推广服务。要使此选项生效，您需要使用管理员模式配置广域操作。"
+"List of Internet domains  that will be browsed for services. Do not put .local "
+"here - it\n"
+"is configured with 'Browse local network' option above."
+msgstr ""
+"列出要浏览服务的 Internet 域名。不要在此输入 .local - 它已经用上面的\n"
+"“浏览局域网”选项配置了。"
 
-#. i18n: file configdialog.ui line 149
-#: rc.cpp:37 rc.cpp:89
+#. i18n: file configdialog.ui line 175
+#: rc.cpp:55 rc.cpp:125
 #, no-c-format
 msgid "W&ide area"
 msgstr "广域(&I)"
 
-#. i18n: file configdialog.ui line 168
-#: rc.cpp:40 rc.cpp:92
+#. i18n: file configdialog.ui line 194
+#: rc.cpp:58 rc.cpp:128
 #, no-c-format
 msgid "Shared secret:"
 msgstr "共享机密："
 
-#. i18n: file configdialog.ui line 193
-#: rc.cpp:43 rc.cpp:95
+#. i18n: file configdialog.ui line 219
+#: rc.cpp:61 rc.cpp:131
 #, no-c-format
 msgid "Name of this machine. Must be in fully qualified form (host.domain)"
 msgstr "此计算机的名称。必须是全程域名的格式(host.domain)"
 
-#. i18n: file configdialog.ui line 201
-#: rc.cpp:46 rc.cpp:98
+#. i18n: file configdialog.ui line 227
+#: rc.cpp:64 rc.cpp:134
 #, no-c-format
 msgid "Optional shared secret used for authorization of DNS dynamic updates."
 msgstr "用于对 DNS 动态更新进行身份验证的共享机密。"
 
-#. i18n: file configdialog.ui line 212
-#: rc.cpp:49 rc.cpp:101
+#. i18n: file configdialog.ui line 238
+#: rc.cpp:67 rc.cpp:137
 #, no-c-format
 msgid "Domain:"
 msgstr "域："
 
-#. i18n: file configdialog.ui line 220
-#: rc.cpp:52 rc.cpp:104
+#. i18n: file configdialog.ui line 246
+#: rc.cpp:70 rc.cpp:140
 #, no-c-format
 msgid "Hostname:"
 msgstr "主机名："
@@ -160,14 +210,5 @@ msgstr "i18n-translation@lists.linux.net.cn"
 #~ "如果选中此项，那么所配置的每个域都会进行查询，以便获得要浏览的域列表。\n"
 #~ "这一过程是递归的。"
 
-#~ msgid "Alt+K"
-#~ msgstr "Alt+K"
-
-#~ msgid "Alt+A"
-#~ msgstr "Alt+A"
-
-#~ msgid "Alt+W"
-#~ msgstr "Alt+W"
-
 #~ msgid "Alt+I"
 #~ msgstr "Alt+I"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmtdeio.po b/tde-i18n-zh_CN/messages/tdebase/kcmtdeio.po
index f3e4ebe232a..7b13300f92d 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmtdeio.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmtdeio.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkio\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-01-14 18:42+0800\n"
 "Last-Translator: Xiong Jiang <jxiong@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -298,13 +299,11 @@ msgid ""
 "<qt>Enter a valid address or url."
 "<p><b><u>NOTE:</u></b> Wildcard matching such as <code>*.kde.org</code> "
 "is not supported. If you want to match any host in the <code>.kde.org</code> "
-"domain, then simply enter <code>"
-".kde.org</code></qt>"
+"domain, then simply enter <code>.kde.org</code></qt>"
 msgstr ""
 "<qt>输入有效地地址或 URL。"
 "<p><b><u>注意：</u></b>不支持诸如 <code>*.kde.org</code> 的通配符。如果您想要匹配 <code>"
-".kde.org</code> 域下的任何主机，只需输入 <code>"
-".kde.org</code></qt>"
+".kde.org</code> 域下的任何主机，只需输入 <code>.kde.org</code></qt>"
 
 #: kproxydlg.cpp:54
 msgid "&Proxy"
@@ -1062,7 +1061,7 @@ msgstr "自动检测代理服务器配置(&U)"
 
 #. i18n: file kproxydlg_ui.ui line 83
 #: rc.cpp:284
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<qt>\n"
 "Automatically detect and configure the proxy settings."
@@ -1072,7 +1071,8 @@ msgid ""
 "<p>\n"
 "<b>NOTE:</b> This option might not work properly or not work at all in some "
 "UNIX/Linux distributions. If you encounter a problem when using this option, "
-"please check the FAQ section at http://konqueror.kde.org.\n"
+"please contact the Trinity developers or file a bug report at "
+"http://bugs.trinitydesktop.org/.\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
@@ -1372,11 +1372,11 @@ msgstr "域名(&D)："
 
 #. i18n: file policydlg_ui.ui line 35
 #: rc.cpp:443 rc.cpp:448
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<qt>\n"
-"Enter the host or domain to which this policy applies, e.g. <b>www.kde.org</b> "
-"or <b>.kde.org</b>.\n"
+"Enter the host or domain to which this policy applies, e.g. <b>"
+"www.trinitydesktop.org</b> or <b>.trinitydesktop.org</b>.\n"
 "</qt>"
 msgstr ""
 "<qt>\n"
@@ -1636,12 +1636,12 @@ msgstr ""
 
 #. i18n: file useragentdlg_ui.ui line 19
 #: rc.cpp:598
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<qt>\n"
 "Here you can modify the default browser-identification text or set a site <code>"
-"(eg. www.kde.org)</code> or a domain <code>(eg. kde.org)</code> "
-"specific identification text."
+"(eg. www.trinitydesktop.org)</code> or a domain <code>"
+"(eg. trinitydesktop.org)</code> specific identification text."
 "<p>\n"
 "To add a new site specific identification text, click the <code>New</code> "
 "button and supply the necessary information. To change an existing site "
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmtwindecoration.po b/tde-i18n-zh_CN/messages/tdebase/kcmtwindecoration.po
index dc2beff74bc..fa6f3f6029d 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmtwindecoration.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmtwindecoration.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2005-10-28 02:43+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-17 11:43+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,7 +34,8 @@ msgid "Buttons"
 msgstr "按钮"
 
 #: buttons.cpp:611
-msgid "TDE"
+#, fuzzy
+msgid "KDE"
 msgstr "TDE"
 
 #: buttons.cpp:663
@@ -83,97 +85,243 @@ msgstr "菜单"
 msgid "--- spacer ---"
 msgstr "--- 分隔符 ---"
 
-#: twindecoration.cpp:90
+#: preview.cpp:48
+msgid ""
+"No preview available.\n"
+"Most probably there\n"
+"was a problem loading the plugin."
+msgstr ""
+"没有可用的预览。\n"
+"很可能是装入插件出现了问题。"
+
+#: preview.cpp:330
+msgid "Active Window"
+msgstr "激活窗口"
+
+#: preview.cpp:330
+msgid "Inactive Window"
+msgstr "非激活窗口"
+
+#: twindecoration.cpp:95
 msgid ""
 "Select the window decoration. This is the look and feel of both the window "
 "borders and the window handle."
 msgstr "选择窗口装饰。这是窗口边框的观感。"
 
-#: twindecoration.cpp:95
+#: twindecoration.cpp:100
 msgid "Decoration Options"
 msgstr "装饰选项"
 
-#: twindecoration.cpp:105
+#: twindecoration.cpp:110
 msgid "B&order size:"
 msgstr "边框大小(&O)："
 
-#: twindecoration.cpp:108
+#: twindecoration.cpp:113
 msgid "Use this combobox to change the border size of the decoration."
 msgstr "使用此组合框更改装饰的边框大小。"
 
-#: twindecoration.cpp:124
+#: twindecoration.cpp:129
 msgid "&Show window button tooltips"
 msgstr "显示窗口按钮提示(&S)"
 
-#: twindecoration.cpp:126
+#: twindecoration.cpp:131
 msgid ""
 "Enabling this checkbox will show window button tooltips. If this checkbox is "
 "off, no window button tooltips will be shown."
 msgstr "激活该选项用于显示窗口按钮提示。如果该选项没有选中，窗口按钮提示将不会显示。"
 
-#: twindecoration.cpp:130
+#: twindecoration.cpp:135
 msgid "Use custom titlebar button &positions"
 msgstr "使用定制的标题条按钮位置(&P)"
 
-#: twindecoration.cpp:132
+#: twindecoration.cpp:137
 msgid ""
 "The appropriate settings can be found in the \"Buttons\" Tab; please note that "
 "this option is not available on all styles yet."
 msgstr "相应的设置可以“按钮”标签卡中找到；请注意，该选项并非适用于全部样式。"
 
-#: twindecoration.cpp:163
+#: twindecoration.cpp:155
+msgid "NOTICE:"
+msgstr ""
+
+#: twindecoration.cpp:155
+msgid "A third party Window Manager has been selected for use with TDE."
+msgstr ""
+
+#: twindecoration.cpp:155
+msgid ""
+"As a result, the built-in Window Manager configuration system will not function "
+"and has been disabled."
+msgstr ""
+
+#: twindecoration.cpp:182
+msgid "&Draw a drop shadow under windows"
+msgstr ""
+
+#: twindecoration.cpp:184
+msgid ""
+"Enabling this checkbox will allow you to choose a kind of drop shadow to draw "
+"under each window."
+msgstr ""
+
+#: twindecoration.cpp:188
+#, fuzzy
+msgid "Active Window Shadow"
+msgstr "激活窗口"
+
+#: twindecoration.cpp:190
+#, fuzzy
+msgid "Inactive Window Shadows"
+msgstr "非激活窗口"
+
+#: twindecoration.cpp:192
+msgid "Draw Shadow Under Normal Windows And..."
+msgstr ""
+
+#: twindecoration.cpp:194
+msgid "Docks and &panels"
+msgstr ""
+
+#: twindecoration.cpp:198
+msgid "O&verride windows"
+msgstr ""
+
+#: twindecoration.cpp:202
+msgid "&Top menu"
+msgstr ""
+
+#: twindecoration.cpp:207
+msgid "Draw shadow under &inactive windows"
+msgstr ""
+
+#: twindecoration.cpp:213 twindecoration.cpp:219
+msgid "Colour:"
+msgstr ""
+
+#: twindecoration.cpp:225 twindecoration.cpp:241
+msgid "Maximum opacity:"
+msgstr ""
+
+#: twindecoration.cpp:262 twindecoration.cpp:272
+msgid "Offset rightward (may be negative):"
+msgstr ""
+
+#: twindecoration.cpp:265 twindecoration.cpp:276 twindecoration.cpp:286
+#: twindecoration.cpp:297 twindecoration.cpp:308 twindecoration.cpp:319
+msgid " pixels"
+msgstr ""
+
+#: twindecoration.cpp:283 twindecoration.cpp:293
+msgid "Offset downward (may be negative):"
+msgstr ""
+
+#: twindecoration.cpp:304 twindecoration.cpp:315
+msgid "Thickness to either side of window:"
+msgstr ""
+
+#: twindecoration.cpp:330
+msgid ""
+"Select the window manager. Selecting a window manager other than \"twin\" will "
+"require you to use a third party program for configuration and may increase the "
+"risk of system crashes or security problems."
+msgstr ""
+
+#: twindecoration.cpp:333
+msgid "Window Manager to use in your TDE session:"
+msgstr ""
+
+#: twindecoration.cpp:337
+msgid ""
+"Specify any command line arguments to be passed to the selected WM on startup, "
+"separated with whitespace.  A common example is --replace"
+msgstr ""
+
+#: twindecoration.cpp:339
+msgid ""
+"Command line arguments to pass to the Window Manager (should remain blank "
+"unless needed):"
+msgstr ""
+
+#: twindecoration.cpp:353
 msgid "&Window Decoration"
 msgstr "窗口装饰(&W)"
 
-#: twindecoration.cpp:164
+#: twindecoration.cpp:354
 msgid "&Buttons"
 msgstr "按钮(&B)"
 
-#: twindecoration.cpp:182
+#: twindecoration.cpp:355
+#, fuzzy
+msgid "&Shadows"
+msgstr "卷起"
+
+#: twindecoration.cpp:356
+#, fuzzy
+msgid "&Window Manager"
+msgstr "窗口装饰(&W)"
+
+#: twindecoration.cpp:382
 msgid "kcmtwindecoration"
 msgstr "kcmtwindecoration"
 
-#: twindecoration.cpp:183
+#: twindecoration.cpp:383
 msgid "Window Decoration Control Module"
 msgstr "窗口装饰控制模块"
 
-#: twindecoration.cpp:185
+#: twindecoration.cpp:385
 msgid "(c) 2001 Karol Szwed"
 msgstr "(C) 2001 Karol Szwed"
 
-#: twindecoration.cpp:237 twindecoration.cpp:439
-msgid "TDE 2"
+#: twindecoration.cpp:437 twindecoration.cpp:695
+#, fuzzy
+msgid "KDE 2"
 msgstr "TDE 2"
 
-#: twindecoration.cpp:266
+#: twindecoration.cpp:458
+msgid "(KDE4's window manager)"
+msgstr ""
+
+#: twindecoration.cpp:458
+msgid "(Compiz Effects Manager)"
+msgstr ""
+
+#: twindecoration.cpp:458
+msgid "(Simple, fast window manager)"
+msgstr ""
+
+#: twindecoration.cpp:460
+msgid "(Default TDE window manager)"
+msgstr ""
+
+#: twindecoration.cpp:522
 msgid "Tiny"
 msgstr "小"
 
-#: twindecoration.cpp:267
+#: twindecoration.cpp:523
 msgid "Normal"
 msgstr "中"
 
-#: twindecoration.cpp:268
+#: twindecoration.cpp:524
 msgid "Large"
 msgstr "大"
 
-#: twindecoration.cpp:269
+#: twindecoration.cpp:525
 msgid "Very Large"
 msgstr "很大"
 
-#: twindecoration.cpp:270
+#: twindecoration.cpp:526
 msgid "Huge"
 msgstr "巨大"
 
-#: twindecoration.cpp:271
+#: twindecoration.cpp:527
 msgid "Very Huge"
 msgstr "超大"
 
-#: twindecoration.cpp:272
+#: twindecoration.cpp:528
 msgid "Oversized"
 msgstr "最大"
 
-#: twindecoration.cpp:591
+#: twindecoration.cpp:949
 msgid ""
 "<h1>Window Manager Decoration</h1>"
 "<p>This module allows you to choose the window border decorations, as well as "
@@ -193,20 +341,3 @@ msgstr ""
 "<p>您可以在“配置 [...]”标签中配置每个主题。每个主题都有其不同的选项。</p>"
 "<p>您可以在“常规选项(如果有的话)”中激活“按钮”标签，方法是选中“使用自定义标题栏按钮位置”框。在“按钮”标签中，您可以按您自己的喜好更改按钮的位置。</"
 "p>"
-
-#: preview.cpp:48
-msgid ""
-"No preview available.\n"
-"Most probably there\n"
-"was a problem loading the plugin."
-msgstr ""
-"没有可用的预览。\n"
-"很可能是装入插件出现了问题。"
-
-#: preview.cpp:330
-msgid "Active Window"
-msgstr "激活窗口"
-
-#: preview.cpp:330
-msgid "Inactive Window"
-msgstr "非激活窗口"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmtwinrules.po b/tde-i18n-zh_CN/messages/tdebase/kcmtwinrules.po
index fe4d73148ea..3cd69ebff14 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmtwinrules.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmtwinrules.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmtwinrules\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-08-21 17:06+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -102,11 +103,12 @@ msgid "(c) 2004 KWin and KControl Authors"
 msgstr "(c) 2004 KWin 和 KControl 作者"
 
 #: kcm.cpp:81
+#, fuzzy
 msgid ""
 "<h1>Window-specific Settings</h1> Here you can customize window settings "
 "specifically only for some windows. "
 "<p>Please note that this configuration will not take effect if you do not use "
-"KWin as your window manager. If you do use a different window manager, please "
+"TWin as your window manager. If you do use a different window manager, please "
 "refer to its documentation for how to customize window behavior."
 msgstr ""
 "<h1>窗口特定的设置</h1>您可在此自定义仅对某些窗口生效的窗口设置。"
@@ -135,11 +137,12 @@ msgid "Window settings for %1"
 msgstr "%1 的窗口设置"
 
 #: main.cpp:279
-msgid "KWin"
-msgstr "KWin"
+msgid "TWin"
+msgstr ""
 
 #: main.cpp:280
-msgid "KWin helper utility"
+#, fuzzy
+msgid "TWin helper utility"
 msgstr "KWin 助手工具"
 
 #: main.cpp:290
@@ -833,3 +836,6 @@ msgstr "请查看文档中的更多信息。"
 #: ruleswidget.cpp:749
 msgid "Edit Shortcut"
 msgstr "编辑快捷键"
+
+#~ msgid "KWin"
+#~ msgstr "KWin"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmusb.po b/tde-i18n-zh_CN/messages/tdebase/kcmusb.po
index 00a2e99f9fd..6b48ff4d7ef 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmusb.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmusb.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmusb\n"
-"POT-Creation-Date: 2006-06-21 03:58+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2001-09-23 00:58+0800\n"
 "Last-Translator: Li Zongliang <li-zongliang@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmview1394.po b/tde-i18n-zh_CN/messages/tdebase/kcmview1394.po
index c449a4d37b2..cd26f0e572e 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmview1394.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmview1394.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmview1394\n"
-"POT-Creation-Date: 2005-09-27 02:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-11-13 10:47+0800\n"
 "Last-Translator: 张忠立 <netwind2003@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -85,7 +86,7 @@ msgstr "制造商"
 msgid "Generate 1394 Bus Reset"
 msgstr "复位1394总线"
 
-#: view1394.cpp:65
+#: view1394.cpp:64
 msgid ""
 "On the right hand side you can see some information about your IEEE 1394 "
 "configuration."
@@ -116,20 +117,20 @@ msgstr ""
 "<br><b>速度</b>：节点速度"
 "<br>"
 
-#: view1394.cpp:196
+#: view1394.cpp:195
 msgid "Port %1:\"%2\""
 msgstr "端口 %1：“%2”"
 
-#: view1394.cpp:209
+#: view1394.cpp:208
 #, c-format
 msgid "Node %1"
 msgstr "节点 %1"
 
-#: view1394.cpp:212
+#: view1394.cpp:211
 msgid "Not ready"
 msgstr "未就绪"
 
-#: view1394.cpp:316
+#: view1394.cpp:315
 msgid "Unknown"
 msgstr "未知"
 
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmxinerama.po b/tde-i18n-zh_CN/messages/tdebase/kcmxinerama.po
index 59cdc4a9833..a8faf563931 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmxinerama.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmxinerama.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmxinerama\n"
-"POT-Creation-Date: 2006-08-23 02:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-01-09 15:39+0800\n"
 "Last-Translator: Dick Zhang <netwind2000@etang.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kcontrol.po b/tde-i18n-zh_CN/messages/tdebase/kcontrol.po
index e50d1c85288..27f44b9afda 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcontrol.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcontrol.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2008-01-05 01:15+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -44,7 +45,7 @@ msgid ""
 "configuration module."
 msgstr "欢迎使用Trinity 控制中心。您可以在这里集中配置您的桌面环境。请从左边的列表中选择一项来载入一个配置模块。"
 
-#: aboutwidget.cpp:53 main.cpp:108
+#: aboutwidget.cpp:53
 msgid "Trinity Info Center"
 msgstr "Trinity 信息中心"
 
@@ -92,7 +93,7 @@ msgstr "机器："
 msgid "<big><b>Loading...</b></big>"
 msgstr "<big><b>正在载入...</b></big>"
 
-#: dockcontainer.cpp:201 toplevel.cpp:376
+#: dockcontainer.cpp:201 toplevel.cpp:371
 msgid ""
 "There are unsaved changes in the active module.\n"
 "Do you want to apply the changes before running the new module or discard the "
@@ -101,7 +102,7 @@ msgstr ""
 "在活动的模块中有未保存的修改。\n"
 "您想在运行新的模块前应用修改，还是放弃修改？"
 
-#: dockcontainer.cpp:204 toplevel.cpp:379
+#: dockcontainer.cpp:204 toplevel.cpp:374
 msgid ""
 "There are unsaved changes in the active module.\n"
 "Do you want to apply the changes before exiting the Control Center or discard "
@@ -110,7 +111,7 @@ msgstr ""
 "在活动的模块中有未保存的修改。\n"
 "您想在退出控制中心前应用修改，还是放弃修改？"
 
-#: dockcontainer.cpp:207 toplevel.cpp:382
+#: dockcontainer.cpp:207 toplevel.cpp:377
 msgid "Unsaved Changes"
 msgstr "未保存的修改"
 
@@ -122,19 +123,7 @@ msgstr ""
 "<p>使用“这是什么”(Shift+F1)获得关于特定选项的帮助。</p>"
 "<p>要阅读完整手册，请点击<a href=\"%1\">这里</a>。</p>"
 
-#: helpwidget.cpp:51
-msgid ""
-"<h1>TDE Info Center</h1>There is no quick help available for the active info "
-"module."
-"<br>"
-"<br>Click <a href = \"kinfocenter/index.html\">here</a> "
-"to read the general Info Center manual."
-msgstr ""
-"<h1>TDE 信息中心</h1>抱歉，活动的信息模块没有可供使用的快速帮助。"
-"<br>"
-"<br>点击<a href=\"kinfocenter/index.html\">这里</a>来阅读通用的信息中心手册。"
-
-#: helpwidget.cpp:56
+#: helpwidget.cpp:50
 msgid ""
 "<h1>Trinity Control Center</h1>There is no quick help available for the active "
 "control module."
@@ -156,18 +145,19 @@ msgstr "<big>您需要超级用户权限来运行这个控制模块。</big><br>
 msgid "The Trinity Control Center"
 msgstr "TDE 控制中心"
 
-#: main.cpp:106 main.cpp:110
+#: main.cpp:106
 msgid "(c) 1998-2004, The Trinity Control Center Developers"
 msgstr "(c) 1998-2004，TDE 控制中心开发者"
 
-#: main.cpp:109
-msgid "The TDE Info Center"
-msgstr "TDE 信息中心"
-
-#: main.cpp:128 main.cpp:130
+#: main.cpp:115
 msgid "Current Maintainer"
 msgstr "当前维护者"
 
+#: main.cpp:116
+#, fuzzy
+msgid "Previous Maintainer"
+msgstr "当前维护者"
+
 #: modules.cpp:160
 msgid "<big>Loading...</big>"
 msgstr "<big>正在载入...</big>"
@@ -211,13 +201,13 @@ msgid "&Administrator Mode"
 msgstr "管理员模式(&A)"
 
 #. i18n: file kcontrolui.rc line 5
-#: rc.cpp:6 rc.cpp:15
+#: rc.cpp:6
 #, no-c-format
 msgid "&Mode"
 msgstr "模式(&M)"
 
 #. i18n: file kcontrolui.rc line 9
-#: rc.cpp:9 rc.cpp:18
+#: rc.cpp:9
 #, no-c-format
 msgid "Icon &Size"
 msgstr "图标大小(&S)"
@@ -262,25 +252,31 @@ msgstr "大(&L)"
 msgid "&Huge"
 msgstr "巨大(&H)"
 
-#: toplevel.cpp:270 toplevel.cpp:392 toplevel.cpp:447
+#: toplevel.cpp:270 toplevel.cpp:387 toplevel.cpp:442
 msgid "About Current Module"
 msgstr "关于当前的模块"
 
-#: toplevel.cpp:281 toplevel.cpp:357
+#: toplevel.cpp:276 toplevel.cpp:352
 msgid "&Report Bug..."
 msgstr "报告错误(&R)..."
 
-#: toplevel.cpp:359
+#: toplevel.cpp:354
 msgid "Report Bug on Module %1..."
 msgstr "报告模块 %1 的错误..."
 
-#: toplevel.cpp:440
+#: toplevel.cpp:435
 #, c-format
 msgid ""
 "_: Help menu->about <modulename>\n"
 "About %1"
 msgstr "关于 %1"
 
+#~ msgid "<h1>TDE Info Center</h1>There is no quick help available for the active info module.<br><br>Click <a href = \"kinfocenter/index.html\">here</a> to read the general Info Center manual."
+#~ msgstr "<h1>TDE 信息中心</h1>抱歉，活动的信息模块没有可供使用的快速帮助。<br><br>点击<a href=\"kinfocenter/index.html\">这里</a>来阅读通用的信息中心手册。"
+
+#~ msgid "The TDE Info Center"
+#~ msgstr "TDE 信息中心"
+
 #~ msgid "Choose between Index, Search and Quick Help"
 #~ msgstr "选择索引、搜索和快速帮助之一"
 
diff --git a/tde-i18n-zh_CN/messages/tdebase/kdcop.po b/tde-i18n-zh_CN/messages/tdebase/kdcop.po
index 53c08e032bd..e08580c97bf 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kdcop.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kdcop.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdcop\n"
-"POT-Creation-Date: 2007-05-15 02:14+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kdesktop.po b/tde-i18n-zh_CN/messages/tdebase/kdesktop.po
index 02e4d08bd79..efc051f6b95 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kdesktop.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kdesktop.po
@@ -7,58 +7,81 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Translator: Wang Jian <lark@linux.net.cn>\n"
 "X-Generator: KBabel 1.0\n"
 
-#: lock/autologout.cc:39
+#: lock/autologout.cc:42
+msgid "Automatic Logout Notification"
+msgstr ""
+
+#: lock/autologout.cc:54
 msgid "<nobr><qt><b>Automatic Log Out</b></qt><nobr>"
 msgstr "<nobr><qt><b>自动注销</b></qt><nobr>"
 
-#: lock/autologout.cc:40
+#: 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:80
+#: 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:82
+#: lock/lockdlg.cc:110 lock/sakdlg.cc:76
+#, fuzzy
+msgid "Desktop Session Locked"
+msgstr "KDesktop 锁定程序"
+
+#: lock/lockdlg.cc:129 lock/lockdlg.cc:130
+msgid "This computer is in use and has been locked."
+msgstr ""
+
+#: lock/lockdlg.cc:130
+msgid "Only '%1' may unlock this session."
+msgstr ""
+
+#: lock/lockdlg.cc:134
 msgid "<nobr><b>The session is locked</b><br>"
 msgstr "<nobr><b>会话已经锁定</b><br>"
 
-#: lock/lockdlg.cc:83
+#: lock/lockdlg.cc:135
 msgid "<nobr><b>The session was locked by %1</b><br>"
 msgstr "<nobr><b>会话已经被 %1 锁定</b><br>"
 
-#: lock/lockdlg.cc:93
+#: lock/lockdlg.cc:140
+#, c-format
+msgid "This session has been locked since %1"
+msgstr ""
+
+#: lock/lockdlg.cc:151
 msgid "Sw&itch User..."
 msgstr "切换用户(&I)..."
 
-#: lock/lockdlg.cc:94
+#: lock/lockdlg.cc:152 lock/querydlg.cc:94
 msgid "Unl&ock"
 msgstr "取消锁定(&O)"
 
-#: lock/lockdlg.cc:191
+#: lock/lockdlg.cc:309
 msgid "<b>Unlocking failed</b>"
 msgstr "<b>取消锁定失败</b>"
 
-#: lock/lockdlg.cc:197
+#: lock/lockdlg.cc:316
 msgid "<b>Warning: Caps Lock on</b>"
 msgstr "<b>警告：大写状态</b>"
 
-#: lock/lockdlg.cc:423
+#: lock/lockdlg.cc:561
 msgid ""
 "Cannot unlock the session because the authentication system failed to work;\n"
 "you must kill kdesktop_lock (pid %1) manually."
@@ -66,7 +89,16 @@ msgstr ""
 "无法解锁会话，因为身份验证系统无法工作；\n"
 "您必须手动杀死 kdesktop_lock (pid %1)。"
 
-#: lock/lockdlg.cc:526
+#: lock/lockdlg.cc:616 lock/lockprocess.cc:2395
+msgid "Authentication Subsystem Notice"
+msgstr ""
+
+#: lock/lockdlg.cc:673
+#, fuzzy
+msgid "New Session"
+msgstr "开始新会话"
+
+#: lock/lockdlg.cc:687
 msgid ""
 "You have chosen to open another desktop session instead of resuming the current "
 "one."
@@ -82,95 +114,154 @@ msgstr ""
 "<br>每个会话都指定了一个 Fn 功能键；F%1 通常被指定为第一个会话，F%2 被指定为第二个会话，依次类推。您可以同时按下 Ctrl、Alt 和对应的 "
 "Fn 功能键在不同的会话之间切换。此外，TDE 面板和桌面菜单也可用于切换会话。"
 
-#: krootwm.cc:842 lock/lockdlg.cc:539
+#: krootwm.cc:899 lock/lockdlg.cc:700
 msgid "&Start New Session"
 msgstr "开始新会话(&S)"
 
-#: lock/lockdlg.cc:551
+#: lock/lockdlg.cc:712
 msgid "&Do not ask again"
 msgstr "不再询问(&D)"
 
-#: lock/lockdlg.cc:651
+#: kdesktopbindings.cpp:26 krootwm.cc:466 lock/lockdlg.cc:799
+#: lock/securedlg.cc:116
+msgid "Switch User"
+msgstr "切换用户"
+
+#: lock/lockdlg.cc:824
 msgid "Session"
 msgstr "会话"
 
-#: lock/lockdlg.cc:652
+#: lock/lockdlg.cc:825
 msgid "Location"
 msgstr "位置"
 
-#: lock/lockdlg.cc:678
+#: lock/lockdlg.cc:851
 msgid ""
 "_: session\n"
 "&Activate"
 msgstr "激活(&A)"
 
-#: lock/lockdlg.cc:687
+#: lock/lockdlg.cc:860
 msgid "Start &New Session"
 msgstr "开始新会话(&N)"
 
-#: lock/lockprocess.cc:742
+#: lock/lockprocess.cc:538 lock/lockprocess.cc:693
+msgid "Securing desktop session"
+msgstr ""
+
+#: lock/lockprocess.cc:1435
 msgid ""
 "Will not lock the session, as unlocking would be impossible:\n"
 msgstr ""
 "将不会锁定会话，因为取消锁定不可能：\n"
 
-#: lock/lockprocess.cc:746
+#: lock/lockprocess.cc:1439
 msgid "Cannot start <i>kcheckpass</i>."
 msgstr "无法启动 <i>kcheckpass</i>。"
 
-#: lock/lockprocess.cc:747
+#: lock/lockprocess.cc:1440
 msgid "<i>kcheckpass</i> is unable to operate. Possibly it is not SetUID root."
 msgstr "<i>kcheckpass</i> 无法操作。可能该程序未被 SetUID root。"
 
-#: lock/lockprocess.cc:790
+#: lock/lockprocess.cc:1483
 msgid "No appropriate greeter plugin configured."
 msgstr "没有配置恰当的欢迎插件。"
 
-#: lock/main.cc:54
+#: lock/main.cc:212
 msgid "Force session locking"
 msgstr "强制锁定会话"
 
-#: lock/main.cc:55
+#: lock/main.cc:213
 msgid "Only start screensaver"
 msgstr "仅启动屏幕保护程序"
 
-#: lock/main.cc:56
+#: lock/main.cc:214
+msgid "Launch the secure dialog"
+msgstr ""
+
+#: lock/main.cc:215
 msgid "Only use the blank screensaver"
 msgstr "仅使用空的屏幕保护程序"
 
-#: lock/main.cc:66
+#: lock/main.cc:216
+msgid "TDE internal command for background process loading"
+msgstr ""
+
+#: lock/main.cc:234
 msgid "KDesktop Locker"
 msgstr "KDesktop 锁定程序"
 
-#: lock/main.cc:66
+#: lock/main.cc:234
 msgid "Session Locker for KDesktop"
 msgstr "KDesktop 会话锁定程序"
 
-#: desktop.cc:771
+#: lock/querydlg.cc:74
+msgid "Information Needed"
+msgstr ""
+
+#: lock/sakdlg.cc:102
+msgid "Press Ctrl+Alt+Del to begin."
+msgstr ""
+
+#: lock/sakdlg.cc:102
+msgid "This process helps keep your password secure."
+msgstr ""
+
+#: lock/sakdlg.cc:102
+msgid "It prevents unauthorized users from emulating the login screen."
+msgstr ""
+
+#: lock/securedlg.cc:76
+#, fuzzy
+msgid "Secure Desktop Area"
+msgstr "刷新桌面"
+
+#: lock/securedlg.cc:95
+msgid "'%1' is currently logged on"
+msgstr ""
+
+#: lock/securedlg.cc:98
+msgid "You are currently logged on"
+msgstr ""
+
+#: kdesktopbindings.cpp:31 krootwm.cc:191 lock/securedlg.cc:104
+msgid "Lock Session"
+msgstr "锁住会话"
+
+#: lock/securedlg.cc:107
+#, fuzzy
+msgid "Task Manager"
+msgstr "显示任务管理器"
+
+#: lock/securedlg.cc:110
+msgid "Logoff Menu"
+msgstr ""
+
+#: desktop.cc:935
 msgid "Set as Primary Background Color"
 msgstr "设置为主背景色"
 
-#: desktop.cc:772
+#: desktop.cc:936
 msgid "Set as Secondary Background Color"
 msgstr "设置为次背景色"
 
-#: desktop.cc:789
+#: desktop.cc:953
 msgid "&Save to Desktop..."
 msgstr "保存到桌面(&S)..."
 
-#: desktop.cc:791
+#: desktop.cc:955
 msgid "Set as &Wallpaper"
 msgstr "设为墙纸(&W)"
 
-#: desktop.cc:799
+#: desktop.cc:963
 msgid "Enter a name for the image below:"
 msgstr "在下面输入图像的名称："
 
-#: desktop.cc:808
+#: desktop.cc:972
 msgid "image.png"
 msgstr "image.png"
 
-#: desktop.cc:871
+#: desktop.cc:1035
 msgid ""
 "Could not log out properly.\n"
 "The session manager cannot be contacted. You can try to force a shutdown by "
@@ -200,137 +291,153 @@ msgid ""
 "to use another path."
 msgstr "无法创建目录 %1；请检查权限或重新配置桌面以使用其它路径。"
 
-#: kdiconview.cc:437
+#: kdiconview.cc:444
 msgid "&Rename"
 msgstr "重命名(&R)"
 
-#: kdiconview.cc:438
+#: kdiconview.cc:445
 msgid "&Properties"
 msgstr "属性(&P)"
 
-#: kdiconview.cc:439
+#: kdiconview.cc:446
 msgid "&Move to Trash"
 msgstr "移至回收站(&M)"
 
-#: krootwm.cc:133
+#: kdiconview.cc:808
+msgid "You have chosen to remove a system icon"
+msgstr ""
+
+#: kdiconview.cc:808
+msgid "You can restore this icon in the future through the"
+msgstr ""
+
+#: kdiconview.cc:808
+msgid "tab in the"
+msgstr ""
+
+#: kdiconview.cc:808
+msgid "Behavior"
+msgstr ""
+
+#: kdiconview.cc:808
+msgid "pane of the Desktop Settings control module."
+msgstr ""
+
+#: krootwm.cc:134
 msgid "Run Command..."
 msgstr "运行命令..."
 
-#: krootwm.cc:137
+#: krootwm.cc:135
+msgid "Open Terminal Here..."
+msgstr ""
+
+#: krootwm.cc:141
 msgid "Configure Desktop..."
 msgstr "配置桌面..."
 
-#: krootwm.cc:139 krootwm.cc:364
+#: krootwm.cc:143 krootwm.cc:374
 msgid "Disable Desktop Menu"
 msgstr "禁用桌面菜单"
 
-#: krootwm.cc:143
+#: krootwm.cc:147
 msgid "Unclutter Windows"
 msgstr "散列窗口"
 
-#: krootwm.cc:145
+#: krootwm.cc:149
 msgid "Cascade Windows"
 msgstr "层叠窗口"
 
-#: krootwm.cc:151
+#: krootwm.cc:155
 msgid "By Name (Case Sensitive)"
 msgstr "按名称(区分大小写)"
 
-#: krootwm.cc:153
+#: krootwm.cc:157
 msgid "By Name (Case Insensitive)"
 msgstr "按名称(不区分大小写)"
 
-#: krootwm.cc:155
+#: krootwm.cc:159
 msgid "By Size"
 msgstr "按大小"
 
-#: krootwm.cc:157
+#: krootwm.cc:161
 msgid "By Type"
 msgstr "按类型"
 
-#: krootwm.cc:159
+#: krootwm.cc:163
 msgid "By Date"
 msgstr "按日期"
 
-#: krootwm.cc:162
+#: krootwm.cc:166
 msgid "Directories First"
 msgstr "目录在前"
 
-#: krootwm.cc:165
+#: krootwm.cc:169
 msgid "Line Up Horizontally"
 msgstr "水平排列图标"
 
-#: krootwm.cc:168
+#: krootwm.cc:172
 msgid "Line Up Vertically"
 msgstr "垂直排列图标"
 
-#: krootwm.cc:171
+#: krootwm.cc:175
 msgid "Align to Grid"
 msgstr "对齐到网格"
 
-#. i18n: file kdesktop.kcfg line 180
-#: krootwm.cc:175 rc.cpp:215
+#. i18n: file kdesktop.kcfg line 185
+#: krootwm.cc:179 rc.cpp:242
 #, no-c-format
 msgid "Lock in Place"
 msgstr "就地锁定"
 
-#: krootwm.cc:181
+#: krootwm.cc:185
 msgid "Refresh Desktop"
 msgstr "刷新桌面"
 
-#: kdesktopbindings.cpp:31 krootwm.cc:187
-msgid "Lock Session"
-msgstr "锁住会话"
-
-#: krootwm.cc:192
+#: krootwm.cc:196
 msgid "Log Out \"%1\"..."
 msgstr "注销“%1”..."
 
-#: krootwm.cc:198
+#: krootwm.cc:202
 msgid "Start New Session"
 msgstr "开始新会话"
 
-#: krootwm.cc:202
+#: krootwm.cc:206
 msgid "Lock Current && Start New Session"
 msgstr "锁定当前会话并开始新会话"
 
-#: krootwm.cc:342 krootwm.cc:420
+#: krootwm.cc:352 krootwm.cc:434
 msgid "Sort Icons"
 msgstr "排序图标"
 
-#: krootwm.cc:344
+#: krootwm.cc:354
 msgid "Line Up Icons"
 msgstr "排列图标"
 
-#: krootwm.cc:371
+#: krootwm.cc:381
 msgid "Enable Desktop Menu"
 msgstr "启用桌面菜单"
 
-#: krootwm.cc:430
+#: krootwm.cc:444
 msgid "Icons"
 msgstr "图标"
 
-#: krootwm.cc:436 krootwm.cc:492
+#: krootwm.cc:450 krootwm.cc:506
 msgid "Windows"
 msgstr "窗口"
 
-#: kdesktopbindings.cpp:26 krootwm.cc:452
-msgid "Switch User"
-msgstr "切换用户"
-
-#: krootwm.cc:481
+#: krootwm.cc:495
 msgid "Sessions"
 msgstr "会话"
 
-#: krootwm.cc:485
+#: krootwm.cc:499
 msgid "New"
 msgstr "新建"
 
-#: kdesktopbindings.cpp:14 krootwm.cc:491
+#: kdesktopbindings.cpp:14 krootwm.cc:505
 msgid "Desktop"
 msgstr "桌面"
 
-#: krootwm.cc:830
+#: krootwm.cc:887
 msgid ""
 "<p>You have chosen to open another desktop session."
 "<br>The current session will be hidden and a new login screen will be "
@@ -345,27 +452,32 @@ msgstr ""
 "<br>每个会话都指定了一个 Fn 功能键；F%1 通常被指定为第一个会话，F%2 被指定为第二个会话，依次类推。您可以同时按下 Ctrl、Alt 和对应的 "
 "Fn 功能键在不同的会话之间切换。此外，TDE 面板和桌面菜单也可用于切换会话。</p>"
 
-#: krootwm.cc:841
+#: krootwm.cc:898
 msgid "Warning - New Session"
 msgstr "警告 - 新会话"
 
-#: main.cc:46
+#: main.cc:58
 msgid "The TDE desktop"
 msgstr "TDE 桌面"
 
-#: main.cc:52
+#: main.cc:64
 msgid "Use this if the desktop window appears as a real window"
 msgstr "如果桌面窗口是真实窗口，使用此项"
 
-#: main.cc:53
+#: main.cc:65
 msgid "Obsolete"
 msgstr "废弃"
 
-#: main.cc:54
+#: main.cc:66
 msgid "Wait for kded to finish building database"
 msgstr "等待 kded 建完数据库"
 
-#: main.cc:153
+#: main.cc:68
+#, fuzzy
+msgid "Enable background transparency"
+msgstr "每个屏幕独立绘制背景"
+
+#: main.cc:171
 msgid "KDesktop"
 msgstr "KDesktop"
 
@@ -381,7 +493,7 @@ msgid ""
 "Your emails"
 msgstr "lark@linux.net.cn"
 
-#: kdesktopbindings.cpp:20 minicli.cpp:79
+#: kdesktopbindings.cpp:20 minicli.cpp:82
 msgid "Run Command"
 msgstr "运行命令"
 
@@ -393,45 +505,101 @@ msgstr "显示任务管理器"
 msgid "Show Window List"
 msgstr "显示窗口列表"
 
-#: kdesktopbindings.cpp:37
+#: kdesktopbindings.cpp:32
+#, fuzzy
+msgid "Lock Session (Hotkey)"
+msgstr "锁住会话"
+
+#: kdesktopbindings.cpp:38
+#, fuzzy
+msgid "Start Screen Saver"
+msgstr "仅启动屏幕保护程序"
+
+#: kdesktopbindings.cpp:44
 msgid "Log Out"
 msgstr "注销"
 
-#: kdesktopbindings.cpp:38
+#: kdesktopbindings.cpp:45
 msgid "Log Out Without Confirmation"
 msgstr "不需确认就注销"
 
-#: kdesktopbindings.cpp:39
+#: kdesktopbindings.cpp:46
 msgid "Halt without Confirmation"
 msgstr "不需确认就关机"
 
-#: kdesktopbindings.cpp:40
+#: kdesktopbindings.cpp:47
 msgid "Reboot without Confirmation"
 msgstr "不需确认就重新启动"
 
-#: minicli.cpp:93 minicli.cpp:639
+#: kxdglauncher.cpp:91
+msgid "XDG variable name to open"
+msgstr ""
+
+#: kxdglauncher.cpp:92
+msgid "Do not launch Konqueror; instead print path to directory if it exists)"
+msgstr ""
+
+#: kxdglauncher.cpp:98
+msgid "TDE XDG File Browser Launcher and Prompter"
+msgstr ""
+
+#: kxdglauncher.cpp:98
+msgid "Prompts if directory does not exist, otherwise launches"
+msgstr ""
+
+#: kxdglauncher.cpp:123
+msgid ""
+"Please confirm your Documents directory location"
+"<br>Upon confimation a new directory will be created"
+msgstr ""
+
+#: kxdglauncher.cpp:124
+msgid "Create Documents directory"
+msgstr ""
+
+#: kxdglauncher.cpp:167
+msgid "Unable to create directory "
+msgstr ""
+
+#: kxdglauncher.cpp:167
+msgid "Please check folder permissions and try again"
+msgstr ""
+
+#: kxdglauncher.cpp:167 kxdglauncher.cpp:172
+msgid "Unable to create directory"
+msgstr ""
+
+#: kxdglauncher.cpp:172
+msgid "Unable to create the directory "
+msgstr ""
+
+#: kxdglauncher.cpp:172
+msgid "Directory path cannot be longer than 4096 characters"
+msgstr ""
+
+#: minicli.cpp:96 minicli.cpp:795
 msgid "&Options >>"
 msgstr "选项(&O) >>"
 
-#: minicli.cpp:96
+#: minicli.cpp:99
 msgid "&Run"
 msgstr "运行(&R)"
 
-#: minicli.cpp:392
+#: minicli.cpp:452
 msgid "<qt>The user <b>%1</b> does not exist on this system.</qt>"
 msgstr "<qt>用户 <b>%1</b> 在这个系统中不存在。</qt>"
 
-#: minicli.cpp:402
+#: minicli.cpp:462
 msgid ""
 "You do not exist.\n"
 msgstr ""
 "您不存在。\n"
 
-#: minicli.cpp:427
+#: minicli.cpp:487
 msgid "Incorrect password; please try again."
 msgstr "不正确的密码；请重试。"
 
-#: minicli.cpp:538
+#: minicli.cpp:598
 msgid ""
 "<center><b>%1</b></center>\n"
 "You do not have permission to execute this command."
@@ -439,7 +607,7 @@ msgstr ""
 "<center><b>%1</b></center>\n"
 "您没有权限执行该命令。"
 
-#: minicli.cpp:566
+#: minicli.cpp:626
 msgid ""
 "<center><b>%1</b></center>\n"
 "Could not run the specified command."
@@ -447,7 +615,7 @@ msgstr ""
 "<center><b>%1</b></center>\n"
 "无法运行指定的命令。"
 
-#: minicli.cpp:578
+#: minicli.cpp:638
 msgid ""
 "<center><b>%1</b></center>\n"
 "The specified command does not exist."
@@ -455,11 +623,11 @@ msgstr ""
 "<center><b>%1</b></center>\n"
 "指定的命令不存在。"
 
-#: minicli.cpp:627
+#: minicli.cpp:783
 msgid "&Options <<"
 msgstr "选项(&O) <<"
 
-#: minicli.cpp:832
+#: minicli.cpp:1000
 msgid ""
 "Running a realtime application can be very dangerous. If the application "
 "misbehaves, the system might hang unrecoverably.\n"
@@ -469,11 +637,11 @@ msgstr ""
 "可能会不可恢复地挂起。\n"
 "您确定要继续吗？"
 
-#: minicli.cpp:835
+#: minicli.cpp:1003
 msgid "Warning - Run Command"
 msgstr "警告 - 运行命令"
 
-#: minicli.cpp:835
+#: minicli.cpp:1003
 msgid "&Run Realtime"
 msgstr "实时运行(&R)"
 
@@ -508,52 +676,97 @@ msgstr ""
 "</ul>\n"
 "</qt>"
 
-#. i18n: file minicli_ui.ui line 199
+#. i18n: file minicli_ui.ui line 188
 #: rc.cpp:14
 #, no-c-format
+msgid "Autocomplete shows available &applications"
+msgstr ""
+
+#. i18n: file minicli_ui.ui line 192
+#: rc.cpp:17
+#, no-c-format
+msgid ""
+"<qt>When enabled, the system shows available applications in the autocompletion "
+"area.\n"
+"\t\t\t\t\t\t</qt>"
+msgstr ""
+
+#. i18n: file minicli_ui.ui line 200
+#: rc.cpp:21
+#, no-c-format
+msgid "Autocomplete uses &filesystem instead of history"
+msgstr ""
+
+#. i18n: file minicli_ui.ui line 204
+#: rc.cpp:24
+#, no-c-format
+msgid ""
+"<qt>This selects whether the filesystem or the past command history will be "
+"used for autocompletion.\n"
+"\t\t\t\t\t\t</qt>"
+msgstr ""
+
+#. i18n: file minicli_ui.ui line 212
+#: rc.cpp:28
+#, no-c-format
+msgid "Autocomplete uses &both history and filesystem"
+msgstr ""
+
+#. i18n: file minicli_ui.ui line 216
+#: rc.cpp:31
+#, no-c-format
+msgid ""
+"<qt>This selects whether the filesystem and the past command history will be "
+"used for autocompletion.\n"
+"\t\t\t\t\t\t</qt>"
+msgstr ""
+
+#. i18n: file minicli_ui.ui line 235
+#: rc.cpp:35
+#, no-c-format
 msgid "User&name:"
 msgstr "用户名(&N)："
 
-#. i18n: file minicli_ui.ui line 205
-#: rc.cpp:17 rc.cpp:47
+#. i18n: file minicli_ui.ui line 241
+#: rc.cpp:38 rc.cpp:68
 #, no-c-format
 msgid "Enter the user you want to run the application as here."
 msgstr "在这里输入您要用来运行程序的用户。"
 
-#. i18n: file minicli_ui.ui line 224
-#: rc.cpp:20 rc.cpp:26
+#. i18n: file minicli_ui.ui line 260
+#: rc.cpp:41 rc.cpp:47
 #, no-c-format
 msgid "Enter the password here for the user you specified above."
 msgstr "在这里输入您指定用户的密码。"
 
-#. i18n: file minicli_ui.ui line 243
-#: rc.cpp:23
+#. i18n: file minicli_ui.ui line 279
+#: rc.cpp:44
 #, no-c-format
 msgid "Pass&word:"
 msgstr "密码(&W)："
 
-#. i18n: file minicli_ui.ui line 257
-#: rc.cpp:29
+#. i18n: file minicli_ui.ui line 293
+#: rc.cpp:50
 #, no-c-format
 msgid "Run in &terminal window"
 msgstr "在终端窗口中运行(&T)"
 
-#. i18n: file minicli_ui.ui line 260
-#: rc.cpp:32
+#. i18n: file minicli_ui.ui line 296
+#: rc.cpp:53
 #, no-c-format
 msgid ""
 "Check this option if the application you want to run is a text mode "
 "application. The application will then be run in a terminal emulator window."
 msgstr "如果您要运行的程序是文本模式的，请选中此选项。该程序将运行在模拟终端窗口中。"
 
-#. i18n: file minicli_ui.ui line 279
-#: rc.cpp:35
+#. i18n: file minicli_ui.ui line 315
+#: rc.cpp:56
 #, no-c-format
 msgid "&Priority:"
 msgstr "优先级(&P)："
 
-#. i18n: file minicli_ui.ui line 285
-#: rc.cpp:38 rc.cpp:53 rc.cpp:59 rc.cpp:62
+#. i18n: file minicli_ui.ui line 321
+#: rc.cpp:59 rc.cpp:74 rc.cpp:80 rc.cpp:83
 #, no-c-format
 msgid ""
 "The priority that the command will be run with can be set here. From left to "
@@ -561,14 +774,14 @@ msgid ""
 "priorities higher than the default, you will need to provide the root password."
 msgstr "这里可以设置要运行的命令的优先级。从左到右，从低到高。中间位置是默认值。要设置比默认值高的部分，就需要 root 的密码。"
 
-#. i18n: file minicli_ui.ui line 312
-#: rc.cpp:41
+#. i18n: file minicli_ui.ui line 348
+#: rc.cpp:62
 #, no-c-format
 msgid "Run with a &different priority"
 msgstr "以不同的优先级运行(&D)"
 
-#. i18n: file minicli_ui.ui line 315
-#: rc.cpp:44
+#. i18n: file minicli_ui.ui line 351
+#: rc.cpp:65
 #, no-c-format
 msgid ""
 "Check this option if you want to run the application with a different priority. "
@@ -576,26 +789,26 @@ msgid ""
 "your application."
 msgstr "如果您要用不同优先级运行该程序，启用该选项。指定高的优先级可以让系统分配更多的处理时间给该程序。"
 
-#. i18n: file minicli_ui.ui line 356
-#: rc.cpp:50
+#. i18n: file minicli_ui.ui line 392
+#: rc.cpp:71
 #, no-c-format
 msgid "Low"
 msgstr "低"
 
-#. i18n: file minicli_ui.ui line 370
-#: rc.cpp:56
+#. i18n: file minicli_ui.ui line 406
+#: rc.cpp:77
 #, no-c-format
 msgid "High"
 msgstr "高"
 
-#. i18n: file minicli_ui.ui line 411
-#: rc.cpp:65
+#. i18n: file minicli_ui.ui line 447
+#: rc.cpp:86
 #, no-c-format
 msgid "Run as a different &user"
 msgstr "以不同的用户运行(&U)"
 
-#. i18n: file minicli_ui.ui line 414
-#: rc.cpp:68
+#. i18n: file minicli_ui.ui line 450
+#: rc.cpp:89
 #, no-c-format
 msgid ""
 "Check this option if you want to run the application with a different user id. "
@@ -604,36 +817,36 @@ msgid ""
 msgstr ""
 "如果您要以不同用户的身份运行该程序，打开该选项。每个进程都有关联的用户 ID，该 ID 决定了文件和其它访问的权限。该选项需要输入指定的用户的密码。"
 
-#. i18n: file minicli_ui.ui line 470
-#: rc.cpp:71
+#. i18n: file minicli_ui.ui line 506
+#: rc.cpp:92
 #, no-c-format
 msgid "Com&mand:"
 msgstr "命令(&M)："
 
-#. i18n: file minicli_ui.ui line 476
-#: rc.cpp:74 rc.cpp:77
-#, no-c-format
+#. i18n: file minicli_ui.ui line 512
+#: rc.cpp:95 rc.cpp:98
+#, fuzzy, no-c-format
 msgid ""
 "Enter the command you wish to execute or the address of the resource you want "
-"to open. This can be a remote URL like \"www.kde.org\" or a local one like "
-"\"~/.tderc\"."
+"to open. This can be a remote URL like \"www.trinitydesktop.org\" or a local "
+"one like \"~/.tderc\"."
 msgstr "输入您要执行的命令或您要打开的资源的地址。这可以是一个远程 URL，如“www.kde.org”，或本地 URL，如“~/.tderc”。"
 
-#. i18n: file minicli_ui.ui line 533
-#: rc.cpp:80
+#. i18n: file minicli_ui.ui line 569
+#: rc.cpp:101
 #, no-c-format
 msgid ""
 "Enter the name of the application you want to run or the URL you want to view"
 msgstr "输入您要运行的程序的名称或您要查看的 URL"
 
 #. i18n: file kdesktop.kcfg line 11
-#: rc.cpp:83
+#: rc.cpp:104
 #, no-c-format
 msgid "Common settings for all desktops"
 msgstr "全部桌面的公共设置"
 
 #. i18n: file kdesktop.kcfg line 12
-#: rc.cpp:86
+#: rc.cpp:107
 #, no-c-format
 msgid ""
 "If you want the same background settings to be applied to all desktops enable "
@@ -641,13 +854,13 @@ msgid ""
 msgstr "如果您想要对全部桌面都应用相同的背景设置，请启用此选项。"
 
 #. i18n: file kdesktop.kcfg line 16
-#: rc.cpp:89
+#: rc.cpp:110
 #, no-c-format
 msgid "Common settings for all screens"
 msgstr "全部屏幕使用公共设置"
 
 #. i18n: file kdesktop.kcfg line 17
-#: rc.cpp:92
+#: rc.cpp:113
 #, no-c-format
 msgid ""
 "If you want the same background settings to be applied to all screens enable "
@@ -655,13 +868,13 @@ msgid ""
 msgstr "如果您想要对全部屏幕都应用相同的背景设置，请启用此选项。"
 
 #. i18n: file kdesktop.kcfg line 21
-#: rc.cpp:95
+#: rc.cpp:116
 #, no-c-format
 msgid "Draw backgrounds per screen"
 msgstr "每个屏幕独立绘制背景"
 
 #. i18n: file kdesktop.kcfg line 22
-#: rc.cpp:98
+#: rc.cpp:119
 #, no-c-format
 msgid ""
 "If you want to draw to each screen separately in xinerama mode enable this "
@@ -669,26 +882,26 @@ msgid ""
 msgstr "如果您想要在 xinerama 模式中独立绘制每个屏幕，请启用此选项。"
 
 #. i18n: file kdesktop.kcfg line 26
-#: rc.cpp:101
+#: rc.cpp:122
 #, no-c-format
 msgid "Limit background cache"
 msgstr "限制背景缓存"
 
 #. i18n: file kdesktop.kcfg line 27
-#: rc.cpp:104
+#: rc.cpp:125
 #, no-c-format
 msgid ""
 "Enable this option if you want to limit the cache size for the background."
 msgstr "如果您想要限制背景的缓存大小，请启用此选项。"
 
 #. i18n: file kdesktop.kcfg line 31
-#: rc.cpp:107
+#: rc.cpp:128
 #, no-c-format
 msgid "Background cache size"
 msgstr "背景缓存大小"
 
 #. i18n: file kdesktop.kcfg line 32
-#: rc.cpp:110
+#: rc.cpp:131
 #, no-c-format
 msgid ""
 "Here you can enter how much memory TDE should use for caching the "
@@ -697,14 +910,28 @@ msgid ""
 "use."
 msgstr "您可以在此选择 TDE 应使用多少内存对背景进行缓存。如果您为不同的桌面设定不同的桌面缓存，切换桌面将会更加平滑，但将以高内存占用为代价。"
 
-#. i18n: file kdesktop.kcfg line 38
-#: rc.cpp:113
+#. i18n: file kdesktop.kcfg line 36
+#: rc.cpp:134
+#, fuzzy, no-c-format
+msgid "Background Opacity"
+msgstr "背景缓存大小"
+
+#. i18n: file kdesktop.kcfg line 37
+#: rc.cpp:137
+#, no-c-format
+msgid ""
+"Here you can the opacity of the background (0-100). A composite manager can "
+"then render something behind it."
+msgstr ""
+
+#. i18n: file kdesktop.kcfg line 43
+#: rc.cpp:140
 #, no-c-format
 msgid "Show icons on desktop"
 msgstr "在桌面上显示图标"
 
-#. i18n: file kdesktop.kcfg line 39
-#: rc.cpp:116
+#. i18n: file kdesktop.kcfg line 44
+#: rc.cpp:143
 #, no-c-format
 msgid ""
 "Uncheck this option if you do not want to have icons on the desktop. Without "
@@ -712,14 +939,14 @@ msgid ""
 "drag files to the desktop."
 msgstr "如果您不想再桌面上显示桌面，请不要选中此选项。没有图标的桌面可能会快一点，但您也无法将文件拖曳至桌面。"
 
-#. i18n: file kdesktop.kcfg line 43
-#: rc.cpp:119
+#. i18n: file kdesktop.kcfg line 48
+#: rc.cpp:146
 #, no-c-format
 msgid "Allow programs in desktop window"
 msgstr "允许桌面窗口中的应用程序"
 
-#. i18n: file kdesktop.kcfg line 44
-#: rc.cpp:122
+#. i18n: file kdesktop.kcfg line 49
+#: rc.cpp:149
 #, no-c-format
 msgid ""
 "Check this option if you want to run X11 programs that draw into the desktop "
@@ -730,132 +957,132 @@ msgstr ""
 "如果您想要运行要在桌面上绘图的 X11 程序，比如 xsnow、xpenguim 或 xmountain，请选中此选项。如果您在 Netscape "
 "这样需要检查 root 窗口的运行实例的应用程序时遇到了问题，请禁用此选项。"
 
-#. i18n: file kdesktop.kcfg line 55
-#: rc.cpp:125
+#. i18n: file kdesktop.kcfg line 60
+#: rc.cpp:152
 #, no-c-format
 msgid "Automatically line up icons"
 msgstr "自动排列图标"
 
-#. i18n: file kdesktop.kcfg line 56
-#: rc.cpp:128
+#. i18n: file kdesktop.kcfg line 61
+#: rc.cpp:155
 #, no-c-format
 msgid ""
 "Check this option if you want to see your icons automatically aligned to the "
 "grid when you move them."
 msgstr "如果您想要在让您的图标在您移动后自动与网格对齐，请选中此选项。"
 
-#. i18n: file kdesktop.kcfg line 60
-#: rc.cpp:131 rc.cpp:209
+#. i18n: file kdesktop.kcfg line 65
+#: rc.cpp:158 rc.cpp:236
 #, no-c-format
 msgid "Sort directories first"
 msgstr "目录在前"
 
-#. i18n: file kdesktop.kcfg line 71
-#: rc.cpp:134
+#. i18n: file kdesktop.kcfg line 76
+#: rc.cpp:161
 #, no-c-format
 msgid "Mouse wheel over desktop background switches desktop"
 msgstr "在桌面背景上滚动鼠标滚轮可切换桌面"
 
-#. i18n: file kdesktop.kcfg line 72
-#: rc.cpp:137
+#. i18n: file kdesktop.kcfg line 77
+#: rc.cpp:164
 #, no-c-format
 msgid ""
 "You can switch between the virtual desktops by using the mouse wheel over the "
 "desktop background."
 msgstr "您在桌面背景上使用鼠标滚轮可以在虚拟桌面间切换。"
 
-#. i18n: file kdesktop.kcfg line 83
-#: rc.cpp:140
+#. i18n: file kdesktop.kcfg line 88
+#: rc.cpp:167
 #, no-c-format
 msgid "Terminal application"
 msgstr "终端应用程序"
 
-#. i18n: file kdesktop.kcfg line 84
-#: rc.cpp:143
+#. i18n: file kdesktop.kcfg line 89
+#: rc.cpp:170
 #, no-c-format
 msgid "Defines which terminal application is used."
 msgstr "定义所使用的终端应用程序。"
 
-#. i18n: file kdesktop.kcfg line 88
-#: rc.cpp:146
+#. i18n: file kdesktop.kcfg line 93
+#: rc.cpp:173
 #, no-c-format
 msgid "Left Mouse Button Action"
 msgstr "鼠标左键动作"
 
-#. i18n: file kdesktop.kcfg line 89
-#: rc.cpp:149
+#. i18n: file kdesktop.kcfg line 94
+#: rc.cpp:176
 #, no-c-format
 msgid ""
 "You can choose what happens when you click the left button of your pointing "
 "device on the desktop."
 msgstr "您可以选择当您在桌面上单击鼠标左键时执行的操作。"
 
-#. i18n: file kdesktop.kcfg line 93
-#: rc.cpp:152
+#. i18n: file kdesktop.kcfg line 98
+#: rc.cpp:179
 #, no-c-format
 msgid "Middle Mouse Button Action"
 msgstr "鼠标中键动作"
 
-#. i18n: file kdesktop.kcfg line 94
-#: rc.cpp:155
+#. i18n: file kdesktop.kcfg line 99
+#: rc.cpp:182
 #, no-c-format
 msgid ""
 "You can choose what happens when you click the middle button of your pointing "
 "device on the desktop."
 msgstr "您可以选择当您在桌面上单击鼠标中键时执行的操作。"
 
-#. i18n: file kdesktop.kcfg line 98
-#: rc.cpp:158
+#. i18n: file kdesktop.kcfg line 103
+#: rc.cpp:185
 #, no-c-format
 msgid "Right Mouse Button Action"
 msgstr "鼠标右键动作"
 
-#. i18n: file kdesktop.kcfg line 99
-#: rc.cpp:161
+#. i18n: file kdesktop.kcfg line 104
+#: rc.cpp:188
 #, no-c-format
 msgid ""
 "You can choose what happens when you click the right button of your pointing "
 "device on the desktop."
 msgstr "您可以选择当您在桌面上单击鼠标右键时执行的操作。"
 
-#. i18n: file kdesktop.kcfg line 105
-#: rc.cpp:164
-#, no-c-format
-msgid "TDE major version number"
+#. i18n: file kdesktop.kcfg line 110
+#: rc.cpp:191
+#, fuzzy, no-c-format
+msgid "KDE major version number"
 msgstr "TDE 主版本号"
 
-#. i18n: file kdesktop.kcfg line 110
-#: rc.cpp:167
-#, no-c-format
-msgid "TDE minor version number"
+#. i18n: file kdesktop.kcfg line 115
+#: rc.cpp:194
+#, fuzzy, no-c-format
+msgid "KDE minor version number"
 msgstr "TDE 次版本号"
 
-#. i18n: file kdesktop.kcfg line 115
-#: rc.cpp:170
-#, no-c-format
-msgid "TDE release version number"
+#. i18n: file kdesktop.kcfg line 120
+#: rc.cpp:197
+#, fuzzy, no-c-format
+msgid "KDE release version number"
 msgstr "TDE 释放版本号"
 
-#. i18n: file kdesktop.kcfg line 122
-#: rc.cpp:173
+#. i18n: file kdesktop.kcfg line 127
+#: rc.cpp:200
 #, no-c-format
 msgid "Normal text color used for icon labels"
 msgstr "图标标签的普通文本颜色"
 
-#. i18n: file kdesktop.kcfg line 126
-#: rc.cpp:176
+#. i18n: file kdesktop.kcfg line 131
+#: rc.cpp:203
 #, no-c-format
 msgid "Background color used for icon labels"
 msgstr "图标标签所用的背景颜色"
 
-#. i18n: file kdesktop.kcfg line 131
-#: rc.cpp:179
+#. i18n: file kdesktop.kcfg line 136
+#: rc.cpp:206
 #, no-c-format
 msgid "Enable text shadow"
 msgstr "启用文本阴影"
 
-#. i18n: file kdesktop.kcfg line 132
-#: rc.cpp:182
+#. i18n: file kdesktop.kcfg line 137
+#: rc.cpp:209
 #, no-c-format
 msgid ""
 "Check here to enable a shadow outline around the desktop font. This also "
@@ -863,14 +1090,14 @@ msgid ""
 "color."
 msgstr "选中此处可启用桌面字体的阴影外框。这也将改进背景与文本颜色相近的文字的可读性。"
 
-#. i18n: file kdesktop.kcfg line 145
-#: rc.cpp:185
+#. i18n: file kdesktop.kcfg line 150
+#: rc.cpp:212
 #, no-c-format
 msgid "Show hidden files"
 msgstr "显示隐藏文件"
 
-#. i18n: file kdesktop.kcfg line 146
-#: rc.cpp:188
+#. i18n: file kdesktop.kcfg line 151
+#: rc.cpp:215
 #, no-c-format
 msgid ""
 "<p>If you check this option, any files in your desktop directory that begin "
@@ -885,39 +1112,39 @@ msgstr ""
 "<p>例如，名为“.directory”的纯文本文件包含了 Konqueror "
 "的信息，比如显示目录时所使用的图标，目录内文件的排序依据等等。您不应该更改或删除这些文件，除非您完全了解这些文件。</p>"
 
-#. i18n: file kdesktop.kcfg line 150
-#: rc.cpp:191
+#. i18n: file kdesktop.kcfg line 155
+#: rc.cpp:218
 #, no-c-format
 msgid "Align direction"
 msgstr "排列方向"
 
-#. i18n: file kdesktop.kcfg line 151
-#: rc.cpp:194
+#. i18n: file kdesktop.kcfg line 156
+#: rc.cpp:221
 #, no-c-format
 msgid ""
 "If this is enabled, icons are aligned vertically, otherwise horizontally."
 msgstr "如果启用了此选项，图标将会以垂直方式排列，否则将以水平方式排列。"
 
-#. i18n: file kdesktop.kcfg line 155
-#: rc.cpp:197
+#. i18n: file kdesktop.kcfg line 160
+#: rc.cpp:224
 #, no-c-format
 msgid "Show Icon Previews For"
 msgstr "显示预览的文件类型"
 
-#. i18n: file kdesktop.kcfg line 156
-#: rc.cpp:200
+#. i18n: file kdesktop.kcfg line 161
+#: rc.cpp:227
 #, no-c-format
 msgid "Select for which types of files you want to enable preview images."
 msgstr "选择您想要启用预览的图像文件类型。"
 
-#. i18n: file kdesktop.kcfg line 170
-#: rc.cpp:203
+#. i18n: file kdesktop.kcfg line 175
+#: rc.cpp:230
 #, no-c-format
 msgid "Sort criterion"
 msgstr "排序依据"
 
-#. i18n: file kdesktop.kcfg line 171
-#: rc.cpp:206
+#. i18n: file kdesktop.kcfg line 176
+#: rc.cpp:233
 #, no-c-format
 msgid ""
 "Sets the sort criterion. Possible choices are NameCaseSensitive = 0, "
@@ -926,40 +1153,40 @@ msgstr ""
 "选择排序依据。可供选择的选项有：NameCaseSensitive = 0，NameCaseInsensitive = 1，Size = 2，Type = "
 "3，Date = 4。"
 
-#. i18n: file kdesktop.kcfg line 176
-#: rc.cpp:212
+#. i18n: file kdesktop.kcfg line 181
+#: rc.cpp:239
 #, no-c-format
 msgid ""
 "Enable this to place directories in front of the sorted list, otherwise they "
 "are amongst the files."
 msgstr "启用此选项可将目录放在排序后列表的最前面，否则将与文件放在一起排序。"
 
-#. i18n: file kdesktop.kcfg line 181
-#: rc.cpp:218
+#. i18n: file kdesktop.kcfg line 186
+#: rc.cpp:245
 #, no-c-format
 msgid "Check this option if you want to keep your icons from moving."
 msgstr "如果您想要避免图标被移动，请选中此选项。"
 
-#. i18n: file kdesktop.kcfg line 202
-#: rc.cpp:221
+#. i18n: file kdesktop.kcfg line 207
+#: rc.cpp:248
 #, no-c-format
 msgid "Device Types to exclude"
 msgstr "要排除的设备类型"
 
-#. i18n: file kdesktop.kcfg line 203
-#: rc.cpp:224
+#. i18n: file kdesktop.kcfg line 208
+#: rc.cpp:251
 #, no-c-format
 msgid "The device types which you do not want to see on the desktop."
 msgstr "您不想在桌面上看到的设备类型。"
 
-#. i18n: file kdesktop.kcfg line 211
-#: rc.cpp:227
+#. i18n: file kdesktop.kcfg line 221
+#: rc.cpp:254
 #, no-c-format
 msgid "Current application's menu bar (Mac OS-style)"
 msgstr "当前应用程序的菜单栏(Mac OS 样式)"
 
-#. i18n: file kdesktop.kcfg line 212
-#: rc.cpp:230
+#. i18n: file kdesktop.kcfg line 222
+#: rc.cpp:257
 #, no-c-format
 msgid ""
 "If this option is selected, applications will not have their menu bar attached "
@@ -969,52 +1196,52 @@ msgid ""
 msgstr ""
 "如果选中了此选项，应用程序的菜单栏将不会显示在其自己的窗口中。而屏幕上方会出现一个显示目前激活的应用程序的菜单。您可能会在 Mac OS 中看到过此特性。"
 
-#. i18n: file kdesktop.kcfg line 218
-#: rc.cpp:233
+#. i18n: file kdesktop.kcfg line 228
+#: rc.cpp:260
 #, no-c-format
 msgid "Desktop menu bar"
 msgstr "桌面菜单栏"
 
-#. i18n: file kdesktop.kcfg line 219
-#: rc.cpp:236
+#. i18n: file kdesktop.kcfg line 229
+#: rc.cpp:263
 #, no-c-format
 msgid ""
 "If this option is selected, there is one menu bar at the top of the screen "
 "which shows the desktop menus."
 msgstr "如果选中了此选项，则会在屏幕最上方显示一个包含桌面菜单的菜单栏。"
 
-#. i18n: file kdesktop.kcfg line 225
-#: rc.cpp:239
+#. i18n: file kdesktop.kcfg line 235
+#: rc.cpp:266
 #, no-c-format
 msgid "Enable screen saver"
 msgstr "启用屏幕保护程序"
 
-#. i18n: file kdesktop.kcfg line 226
-#: rc.cpp:242
+#. i18n: file kdesktop.kcfg line 236
+#: rc.cpp:269
 #, no-c-format
 msgid "Enables the screen saver."
 msgstr "启用屏幕保护程序。"
 
-#. i18n: file kdesktop.kcfg line 230
-#: rc.cpp:245
+#. i18n: file kdesktop.kcfg line 240
+#: rc.cpp:272
 #, no-c-format
 msgid "Screen saver timeout"
 msgstr "屏幕保护程序超时"
 
-#. i18n: file kdesktop.kcfg line 231
-#: rc.cpp:248
+#. i18n: file kdesktop.kcfg line 241
+#: rc.cpp:275
 #, no-c-format
 msgid "Sets the seconds after which the screen saver is started."
 msgstr "设定屏幕保护程序启动前等待的秒数。"
 
-#. i18n: file kdesktop.kcfg line 235
-#: rc.cpp:251
+#. i18n: file kdesktop.kcfg line 245
+#: rc.cpp:278
 #, no-c-format
 msgid "Suspend screen saver when DPMS kicks in"
 msgstr ""
 
-#. i18n: file kdesktop.kcfg line 238
-#: rc.cpp:254
+#. i18n: file kdesktop.kcfg line 248
+#: rc.cpp:281
 #, no-c-format
 msgid ""
 "Usually the screen saver is suspended when display power saving kicks in,\n"
@@ -1024,6 +1251,52 @@ msgid ""
 "them."
 msgstr ""
 
+#. i18n: file kdesktop.kcfg line 303
+#: rc.cpp:286
+#, no-c-format
+msgid ""
+"When enabled this restores the old style unmanaged window behavior of desktop "
+"locking."
+msgstr ""
+
+#. i18n: file kdesktop.kcfg line 308
+#: rc.cpp:289
+#, no-c-format
+msgid ""
+"When enabled the date and time when the desktop was locked is displayed as an "
+"additional intrusion detection measure."
+msgstr ""
+
+#. i18n: file kdesktop.kcfg line 313
+#: rc.cpp:292
+#, no-c-format
+msgid ""
+"When disabled the screensaver starts immediately when locking the desktop."
+msgstr ""
+
+#. i18n: file kdesktop.kcfg line 318
+#: rc.cpp:295
+#, no-c-format
+msgid ""
+"When enabled all active windows are hidden from the screensaver, showing only "
+"the desktop background as a result."
+msgstr ""
+
+#. i18n: file kdesktop.kcfg line 323
+#: rc.cpp:298
+#, no-c-format
+msgid "Hide Cancel button from the \"Desktop Session Locked\" dialog."
+msgstr ""
+
+#. i18n: file kdesktop.kcfg line 328
+#: rc.cpp:301
+#, no-c-format
+msgid ""
+"When enabled, the Trinity Secure Attention Key (TSAK) system will be used to "
+"secure the screen locker.  This requires system wide TSAK support to be enabled "
+"prior to use."
+msgstr ""
+
 #~ msgid "Disable screen saver during presentation or TV"
 #~ msgstr "展示或看电视时禁止屏幕保护程序"
 
diff --git a/tde-i18n-zh_CN/messages/tdebase/kdialog.po b/tde-i18n-zh_CN/messages/tdebase/kdialog.po
index a4dd28d1a4c..6d53c26104b 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kdialog.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kdialog.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdialog\n"
-"POT-Creation-Date: 2006-04-27 03:54+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-28 14:27+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -157,15 +158,15 @@ msgstr "保存“不再显示/再次询问”状态的配置文件和选项名�
 msgid "Arguments - depending on main option"
 msgstr "参数 - 根据主选项"
 
-#: kdialog.cpp:665
+#: kdialog.cpp:679
 msgid "KDialog"
 msgstr "KDialog"
 
-#: kdialog.cpp:666
+#: kdialog.cpp:680
 msgid "KDialog can be used to show nice dialog boxes from shell scripts"
 msgstr "KDialog 可用于在 shell 脚本中显示友好的对话框"
 
-#: kdialog.cpp:669
+#: kdialog.cpp:683
 msgid "Current maintainer"
 msgstr "当前维护者"
 
diff --git a/tde-i18n-zh_CN/messages/tdebase/kfindpart.po b/tde-i18n-zh_CN/messages/tdebase/kfindpart.po
index b17259e822b..137f1013cca 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kfindpart.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kfindpart.po
@@ -9,10 +9,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2006-10-10 02:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-22 12:58+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -350,7 +351,8 @@ msgstr ""
 "<li><b>图片 (png...)</b>只查找分辨率，位宽度...</li></ul></qt>"
 
 #: kftabdlg.cpp:552
-msgid "Unable to search within a period which is less than a minute."
+#, fuzzy
+msgid "Unable to search within a period that is less than a minute."
 msgstr "不能查找小于1分钟的时间间隔。"
 
 #: kftabdlg.cpp:563
@@ -460,7 +462,7 @@ msgstr "打开方式..."
 msgid "Selected Files"
 msgstr "选中的文件"
 
-#: kquery.cpp:478
+#: kquery.cpp:483
 msgid "Error while using locate"
 msgstr "使用 locate 出错"
 
@@ -477,7 +479,8 @@ msgid "KFind"
 msgstr "KFind"
 
 #: main.cpp:27
-msgid "(c) 1998-2003, The TDE Developers"
+#, fuzzy
+msgid "(c) 1998-2003, The KDE Developers"
 msgstr "(c) 1998-2003, TDE开发人员"
 
 #: main.cpp:29
diff --git a/tde-i18n-zh_CN/messages/tdebase/kfmclient.po b/tde-i18n-zh_CN/messages/tdebase/kfmclient.po
index a1d8c9f33bb..3caebee502c 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kfmclient.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kfmclient.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kfmclient\n"
-"POT-Creation-Date: 2006-08-04 03:58+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-06 11:19+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -190,6 +191,16 @@ msgstr ""
 "\n"
 
 #: kfmclient.cc:127
+#, fuzzy
+msgid ""
+"  kfmclient openBrowser\n"
+"            # Opens the system default Web browser.\n"
+"\n"
+msgstr ""
+"  kfmclient openProperties 'url'\n"
+"            # 打开属性菜单\n"
+
+#: kfmclient.cc:129
 msgid ""
 "  kfmclient configure\n"
 "            # Re-read Konqueror's configuration.\n"
@@ -199,7 +210,7 @@ msgstr ""
 "            # 重新读 Konqueror 的配置文件。\n"
 "\n"
 
-#: kfmclient.cc:129
+#: kfmclient.cc:131
 msgid ""
 "  kfmclient configureDesktop\n"
 "            # Re-read kdesktop's configuration.\n"
@@ -209,7 +220,7 @@ msgstr ""
 "            # 重新读 kdesktop 的配置文件。\n"
 "\n"
 
-#: kfmclient.cc:132
+#: kfmclient.cc:134
 msgid ""
 "*** Examples:\n"
 "  kfmclient exec file:/root/Desktop/cdrom.desktop \"Mount default\"\n"
@@ -221,7 +232,7 @@ msgstr ""
 "             // 安装 CDROM\n"
 "\n"
 
-#: kfmclient.cc:135
+#: kfmclient.cc:137
 msgid ""
 "  kfmclient exec file:/home/weis/data/test.html\n"
 "             // Opens the file with default binding\n"
@@ -231,7 +242,7 @@ msgstr ""
 "             // 使用默认关联打开文件\n"
 "\n"
 
-#: kfmclient.cc:137
+#: kfmclient.cc:139
 msgid ""
 "  kfmclient exec file:/home/weis/data/test.html Netscape\n"
 "             // Opens the file with netscape\n"
@@ -241,7 +252,7 @@ msgstr ""
 "             // 用 netscape 打开文件\n"
 "\n"
 
-#: kfmclient.cc:139
+#: kfmclient.cc:141
 msgid ""
 "  kfmclient exec ftp://localhost/\n"
 "             // Opens new window with URL\n"
@@ -251,7 +262,7 @@ msgstr ""
 "             // 在新窗口中打开 URL\n"
 "\n"
 
-#: kfmclient.cc:141
+#: kfmclient.cc:143
 msgid ""
 "  kfmclient exec file:/root/Desktop/emacs.desktop\n"
 "             // Starts emacs\n"
@@ -261,7 +272,7 @@ msgstr ""
 "             // 启动 emacs\n"
 "\n"
 
-#: kfmclient.cc:143
+#: kfmclient.cc:145
 msgid ""
 "  kfmclient exec file:/root/Desktop/cdrom.desktop\n"
 "             // Opens the CD-ROM's mount directory\n"
@@ -271,7 +282,7 @@ msgstr ""
 "             // 打开 CD-ROM 安装的目录\n"
 "\n"
 
-#: kfmclient.cc:145
+#: kfmclient.cc:147
 msgid ""
 "  kfmclient exec .\n"
 "             // Opens the current directory. Very convenient.\n"
@@ -281,29 +292,29 @@ msgstr ""
 "             // 打开当前目录。非常方便。\n"
 "\n"
 
-#: kfmclient.cc:405
+#: kfmclient.cc:407
 msgid ""
 "Profile %1 not found\n"
 msgstr ""
 "没有找到设置 %1\n"
 
-#: kfmclient.cc:434
+#: kfmclient.cc:436
 msgid ""
 "Syntax Error: Not enough arguments\n"
 msgstr ""
 "语法错误：参数不足\n"
 
-#: kfmclient.cc:439
+#: kfmclient.cc:441
 msgid ""
 "Syntax Error: Too many arguments\n"
 msgstr ""
 "语法错误：参数过多\n"
 
-#: kfmclient.cc:559
+#: kfmclient.cc:569
 msgid "Unable to download from an invalid URL."
 msgstr "无法从一个无效的 URL 下载。"
 
-#: kfmclient.cc:623
+#: kfmclient.cc:633
 msgid ""
 "Syntax Error: Unknown command '%1'\n"
 msgstr ""
diff --git a/tde-i18n-zh_CN/messages/tdebase/kgreet_classic.po b/tde-i18n-zh_CN/messages/tdebase/kgreet_classic.po
index 8b508e28030..30a48f17313 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kgreet_classic.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kgreet_classic.po
@@ -1,42 +1,43 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kgreet_classic\n"
-"POT-Creation-Date: 2007-12-16 01:17+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kgreet_classic.cpp:97
+#: kgreet_classic.cpp:98
 msgid "&Username:"
 msgstr "用户名(&U)："
 
-#: kgreet_classic.cpp:102
+#: kgreet_classic.cpp:103
 msgid "Username:"
 msgstr "用户名："
 
-#: kgreet_classic.cpp:124
+#: kgreet_classic.cpp:125
 msgid "&Password:"
 msgstr "密码(&P)："
 
-#: kgreet_classic.cpp:125
+#: kgreet_classic.cpp:126
 msgid "Current &password:"
 msgstr "当前密码(&P)："
 
-#: kgreet_classic.cpp:143
+#: kgreet_classic.cpp:144
 msgid "&New password:"
 msgstr "新密码(&N)："
 
-#: kgreet_classic.cpp:144
+#: kgreet_classic.cpp:145
 msgid "Con&firm password:"
 msgstr "确认密码(&F)："
 
-#: kgreet_classic.cpp:291
+#: kgreet_classic.cpp:299
 msgid "Unrecognized prompt \"%1\""
 msgstr "无法识别的提示“%1”"
 
-#: kgreet_classic.cpp:500
+#: kgreet_classic.cpp:508
 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 53dc49fa106..db0a4e1914d 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kgreet_winbind.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kgreet_winbind.po
@@ -4,50 +4,51 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kgreet_winbind\n"
-"POT-Creation-Date: 2007-12-16 01:17+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kgreet_winbind.cpp:127
+#: kgreet_winbind.cpp:128
 msgid "&Domain:"
 msgstr "域(&D)："
 
-#: kgreet_winbind.cpp:128
+#: kgreet_winbind.cpp:129
 msgid "&Username:"
 msgstr "用户名(&U)："
 
-#: kgreet_winbind.cpp:142
+#: kgreet_winbind.cpp:143
 msgid "Domain:"
 msgstr "域："
 
-#: kgreet_winbind.cpp:145
+#: kgreet_winbind.cpp:146
 msgid "Username:"
 msgstr "用户名："
 
-#: kgreet_winbind.cpp:164
+#: kgreet_winbind.cpp:165
 msgid "&Password:"
 msgstr "密码(&P)："
 
-#: kgreet_winbind.cpp:165
+#: kgreet_winbind.cpp:166
 msgid "Current &password:"
 msgstr "当前密码(&P)："
 
-#: kgreet_winbind.cpp:188
+#: kgreet_winbind.cpp:189
 msgid "&New password:"
 msgstr "新密码(&N)："
 
-#: kgreet_winbind.cpp:189
+#: kgreet_winbind.cpp:190
 msgid "Con&firm password:"
 msgstr "确认密码(&F)："
 
-#: kgreet_winbind.cpp:370
+#: kgreet_winbind.cpp:378
 msgid "Unrecognized prompt \"%1\""
 msgstr "无法识别提示“%1”"
 
-#: kgreet_winbind.cpp:666
+#: kgreet_winbind.cpp:674
 msgid "Winbind / Samba"
 msgstr "Winbind / Samba"
diff --git a/tde-i18n-zh_CN/messages/tdebase/khelpcenter.po b/tde-i18n-zh_CN/messages/tdebase/khelpcenter.po
index 797157ccd7d..555c6b6fb21 100644
--- a/tde-i18n-zh_CN/messages/tdebase/khelpcenter.po
+++ b/tde-i18n-zh_CN/messages/tdebase/khelpcenter.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: khelpcenter\n"
-"POT-Creation-Date: 2007-05-19 02:14+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-02-12 17:24+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -31,23 +32,25 @@ msgstr "lark@linux.net.cn"
 msgid "URL to display"
 msgstr "要显示的 URL"
 
-#: application.cpp:63 navigator.cpp:466
-msgid "TDE Help Center"
+#: application.cpp:63
+#, fuzzy
+msgid "Trinity Help Center"
 msgstr "TDE 帮助中心"
 
-#: application.cpp:65 khc_indexbuilder.cpp:176
-msgid "The TDE Help Center"
-msgstr "TDE 帮助中心"
+#: application.cpp:65 navigator.cpp:473
+#, fuzzy
+msgid "The Trinity Help Center"
+msgstr "TDE 控制中心"
 
 #: application.cpp:67
 msgid "(c) 1999-2003, The KHelpCenter developers"
 msgstr "(C) 1999-2003，KHelpCenter 开发者"
 
-#: application.cpp:71
+#: application.cpp:72
 msgid "Original Author"
 msgstr "原始作者"
 
-#: application.cpp:73
+#: application.cpp:74
 msgid "Info page support"
 msgstr "信息页支持"
 
@@ -147,7 +150,8 @@ msgid "See also: "
 msgstr "另见："
 
 #: glossary.cpp:292
-msgid "TDE Glossary"
+#, fuzzy
+msgid "KDE Glossary"
 msgstr "TDE 术语表"
 
 #: htmlsearchconfig.cpp:44
@@ -267,33 +271,33 @@ msgstr "更改..."
 msgid "<qt>The folder <b>%1</b> does not exist; unable to create index.</qt>"
 msgstr "<qt>文件夹 <b>%1</b>不存在；无法创建索引。</qt>"
 
-#: kcmhelpcenter.cpp:352
+#: kcmhelpcenter.cpp:353
 msgid "Missing"
 msgstr "缺少"
 
-#: kcmhelpcenter.cpp:397
+#: kcmhelpcenter.cpp:398
 msgid ""
 "Document '%1' (%2):\n"
 msgstr ""
 "文档“%1”(%2)：\n"
 
-#: kcmhelpcenter.cpp:402
+#: kcmhelpcenter.cpp:403
 msgid "No document type."
 msgstr "无文档类型。"
 
-#: kcmhelpcenter.cpp:408
+#: kcmhelpcenter.cpp:409
 msgid "No search handler available for document type '%1'."
 msgstr "没有文档类型“%1”可用的搜索处理程序。"
 
-#: kcmhelpcenter.cpp:415
+#: kcmhelpcenter.cpp:416
 msgid "No indexing command specified for document type '%1'."
 msgstr "没有文档类型“%1”可用的索引命令。"
 
-#: kcmhelpcenter.cpp:530
+#: kcmhelpcenter.cpp:531
 msgid "Failed to build index."
 msgstr "建立索引失败。"
 
-#: kcmhelpcenter.cpp:588
+#: kcmhelpcenter.cpp:589
 #, c-format
 msgid ""
 "Error executing indexing build command:\n"
@@ -318,6 +322,10 @@ msgstr "索引目录"
 msgid "KHelpCenter Index Builder"
 msgstr "KHelpCenter 索引创建工具"
 
+#: khc_indexbuilder.cpp:176
+msgid "The TDE Help Center"
+msgstr "TDE 帮助中心"
+
 #: khc_indexbuilder.cpp:178
 msgid "(c) 2003, The KHelpCenter developers"
 msgstr "(C) 2003，KHelpCenter 开发者"
@@ -394,31 +402,31 @@ msgstr "清除搜索"
 msgid "&Search"
 msgstr "搜索(&S)"
 
-#: navigator.cpp:187
+#: navigator.cpp:188
 msgid "Search Options"
 msgstr "搜索选项"
 
-#: navigator.cpp:195
+#: navigator.cpp:196
 msgid "G&lossary"
 msgstr "术语表(&L)"
 
-#: navigator.cpp:465
+#: navigator.cpp:472
 msgid "Start Page"
 msgstr "起始页"
 
-#: navigator.cpp:553
+#: navigator.cpp:560
 msgid "Unable to run search program."
 msgstr "无法运行搜索程序。"
 
-#: navigator.cpp:594
+#: navigator.cpp:601
 msgid "A search index does not yet exist. Do you want to create the index now?"
 msgstr "搜索索引不存在。您要现在创建吗？"
 
-#: navigator.cpp:598
+#: navigator.cpp:605
 msgid "Create"
 msgstr "创建"
 
-#: navigator.cpp:599
+#: navigator.cpp:606
 msgid "Do Not Create"
 msgstr "不创建"
 
@@ -536,76 +544,84 @@ msgid "Help Center"
 msgstr "帮助中心"
 
 #: view.cpp:120
-msgid "Welcome to the K Desktop Environment"
+#, fuzzy
+msgid "Welcome to the Trinity Desktop Environment"
 msgstr "欢迎使用 K 桌面环境"
 
 #: view.cpp:121
-msgid "The TDE team welcomes you to user-friendly UNIX computing"
+#, fuzzy
+msgid "The TDE team welcomes you to user-friendly UNIX-like computing"
 msgstr "TDE 团队欢迎您使用易用的 UNIX 计算环境"
 
 #: view.cpp:122
+#, fuzzy
 msgid ""
-"TDE is a powerful graphical desktop environment for UNIX workstations. A\n"
-"TDE desktop combines ease of use, contemporary functionality and outstanding\n"
-"graphical design with the technological superiority of the UNIX operating\n"
-"system."
+"The Trinity Desktop Environment (TDE) is a graphical desktop\n"
+"environment for UNIX-like workstations. The\n"
+"Trinity Desktop Environment combines ease of use, contemporary functionality, "
+"and\n"
+"professional graphical design along with the technical advantages of\n"
+"UNIX-like operating systems."
 msgstr ""
 "TDE 是一个 UNIX 工作站上的功能强大的图形桌面环境。\n"
 "TDE 桌面结合了易用、通用的功能和杰出的图形设计，\n"
 "以及 UNIX 操作系统的技术优势。"
 
-#: view.cpp:126
-msgid "What is the K Desktop Environment?"
+#: view.cpp:127
+#, fuzzy
+msgid "What is the Trinity Desktop Environment?"
 msgstr "K 桌面环境是什么？"
 
-#: view.cpp:127
-msgid "Contacting the TDE Project"
+#: view.cpp:128
+#, fuzzy
+msgid "Contacting the TDE Project Members"
 msgstr "联系 TDE 计划"
 
-#: view.cpp:128
+#: view.cpp:129
 msgid "Supporting the TDE Project"
 msgstr "支持 TDE 计划"
 
-#: view.cpp:129
+#: view.cpp:130
 msgid "Useful links"
 msgstr "有用的链接"
 
-#: view.cpp:130
+#: view.cpp:131
 msgid "Getting the most out of TDE"
 msgstr "充分利用 TDE"
 
-#: view.cpp:131
+#: view.cpp:132
 msgid "General Documentation"
 msgstr "常规文档"
 
-#: view.cpp:132
+#: view.cpp:133
 msgid "A Quick Start Guide to the Desktop"
 msgstr "桌面快速指南"
 
-#: view.cpp:133
+#: view.cpp:134
 msgid "TDE Users' guide"
 msgstr "TDE 用户手册"
 
-#: view.cpp:134
-msgid "Frequently asked questions"
+#: view.cpp:135
+#, fuzzy
+msgid "Frequently Asked Questions"
 msgstr "常见问题解答"
 
-#: view.cpp:135
+#: view.cpp:136
 msgid "Basic Applications"
 msgstr "基本应用程序"
 
-#: view.cpp:136
+#: view.cpp:137
 msgid "The Kicker Desktop Panel"
 msgstr "Kicker 桌面面板"
 
-#: view.cpp:137
+#: view.cpp:138
 msgid "The Trinity Control Center"
 msgstr "TDE 控制中心"
 
-#: view.cpp:138
+#: view.cpp:139
 msgid "The Konqueror File manager and Web Browser"
 msgstr "Konqueror 文件管理器和 Web 浏览器"
 
-#: view.cpp:269
+#: view.cpp:270
 msgid "Copy Link Address"
 msgstr "复制链接地址"
diff --git a/tde-i18n-zh_CN/messages/tdebase/khotkeys.po b/tde-i18n-zh_CN/messages/tdebase/khotkeys.po
index 7cf891c5bae..346c947a267 100644
--- a/tde-i18n-zh_CN/messages/tdebase/khotkeys.po
+++ b/tde-i18n-zh_CN/messages/tdebase/khotkeys.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: khotkeys\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-09-24 23:27+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -468,23 +469,43 @@ msgstr "KHotKeys"
 msgid "KHotKeys daemon"
 msgstr "KHotKeys 守护程序"
 
-#: shared/actions.cpp:181
+#: shared/actions.cpp:159 shared/actions.cpp:173 shared/actions.cpp:178
+msgid "KHotKeys was unable to execute"
+msgstr ""
+
+#: shared/actions.cpp:159
+msgid "Please verify existence of the service"
+msgstr ""
+
+#: shared/actions.cpp:159
+msgid "Unable to launch service!"
+msgstr ""
+
+#: shared/actions.cpp:173 shared/actions.cpp:178
+msgid "Please verify existence and permissions of the executable file"
+msgstr ""
+
+#: shared/actions.cpp:173 shared/actions.cpp:178
+msgid "Unable to launch program"
+msgstr ""
+
+#: shared/actions.cpp:186
 msgid "Command/URL : "
 msgstr "命令/URL："
 
-#: shared/actions.cpp:218
+#: shared/actions.cpp:223
 msgid "Menuentry : "
 msgstr "菜单项："
 
-#: shared/actions.cpp:302
+#: shared/actions.cpp:307
 msgid "DCOP : "
 msgstr "DCOP："
 
-#: shared/actions.cpp:396
+#: shared/actions.cpp:401
 msgid "Keyboard input : "
 msgstr "键盘输入："
 
-#: shared/actions.cpp:442
+#: shared/actions.cpp:447
 msgid "Activate window : "
 msgstr "活动的窗口："
 
diff --git a/tde-i18n-zh_CN/messages/tdebase/kicker.po b/tde-i18n-zh_CN/messages/tdebase/kicker.po
index b5f860e837c..4eee0c4221a 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kicker.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kicker.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2008-08-19 01:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,11 +31,11 @@ msgstr "显示桌面"
 msgid "Desktop Access"
 msgstr "桌面访问"
 
-#: buttons/kbutton.cpp:43
+#: buttons/kbutton.cpp:45
 msgid "Applications, tasks and desktop sessions"
 msgstr "应用程序、任务和桌面会话"
 
-#: buttons/kbutton.cpp:44 ui/k_mnu.cpp:76
+#: buttons/kbutton.cpp:46 buttons/knewbutton.cpp:59 ui/k_mnu.cpp:87
 msgid "TDE Menu"
 msgstr "K 菜单"
 
@@ -46,7 +47,8 @@ msgstr "无法执行非 TDE 应用程序。"
 msgid "Kicker Error"
 msgstr "Kicker 错误"
 
-#: buttons/servicemenubutton.cpp:62
+#: buttons/servicemenubutton.cpp:62 ui/k_new_mnu.cpp:1404
+#: ui/k_new_mnu.cpp:1902
 msgid "Applications"
 msgstr "应用程序"
 
@@ -78,21 +80,21 @@ msgstr "小程序 %1 无法装入。请检查您的安装。"
 msgid "Applet Loading Error"
 msgstr "小程序装入错误"
 
-#: core/container_extension.cpp:1607 core/container_extension.cpp:1620
+#: core/container_extension.cpp:1688 core/container_extension.cpp:1701
 msgid "Show panel"
 msgstr "显示面板"
 
-#: core/container_extension.cpp:1611 core/container_extension.cpp:1624
+#: core/container_extension.cpp:1692 core/container_extension.cpp:1705
 msgid "Hide panel"
 msgstr "隐藏面板"
 
-#: core/extensionmanager.cpp:117
+#: core/extensionmanager.cpp:120
 msgid ""
 "The TDE panel (kicker) could not load the main panel due to a problem with your "
 "installation. "
 msgstr "TDE 面板(kicker)无法装入主面板，原因是您的安装有问题。"
 
-#: core/extensionmanager.cpp:119
+#: core/extensionmanager.cpp:122
 msgid "Fatal Error!"
 msgstr "严重错误！"
 
@@ -117,129 +119,142 @@ msgid "TDE Panel"
 msgstr "TDE 面板"
 
 #: core/main.cpp:112
-msgid "(c) 1999-2004, The TDE Team"
+#, fuzzy
+msgid "(c) 1999-2010, The KDE Team"
 msgstr "(c) 1999-2004，TDE 团队"
 
 #: core/main.cpp:114
 msgid "Current maintainer"
 msgstr "当前维护者"
 
-#: core/main.cpp:122
+#: core/main.cpp:123
 msgid "Kiosk mode"
 msgstr "Kiosk 模式"
 
-#: core/panelextension.cpp:341
+#: core/panelextension.cpp:340
 msgid "Add &Applet to Menubar..."
 msgstr "将小程序添加到菜单栏(&A)..."
 
-#: core/panelextension.cpp:342
+#: core/panelextension.cpp:341
 msgid "Add &Applet to Panel..."
 msgstr "将小程序添加到面板(&A)..."
 
-#: core/panelextension.cpp:345
+#: core/panelextension.cpp:344
 msgid "Add Appli&cation to Menubar"
 msgstr "将应用程序添加到菜单栏(&C)"
 
-#: core/panelextension.cpp:346
+#: core/panelextension.cpp:345
 msgid "Add Appli&cation to Panel"
 msgstr "将应用程序添加到面板(&C)"
 
-#: core/panelextension.cpp:350
+#: core/panelextension.cpp:349
 msgid "&Remove From Menubar"
 msgstr "从菜单栏删除(&R)"
 
-#: core/panelextension.cpp:351
+#: core/panelextension.cpp:350
 msgid "&Remove From Panel"
 msgstr "从面板删除(&R)"
 
-#: core/panelextension.cpp:356
+#: core/panelextension.cpp:355
 msgid "Add New &Panel"
 msgstr "添加新面板(&P)"
 
-#: core/panelextension.cpp:358
+#: core/panelextension.cpp:357
 msgid "Remove Pa&nel"
 msgstr "删除面板(&N)"
 
-#: core/panelextension.cpp:365 core/panelextension.cpp:373
+#: core/panelextension.cpp:364 core/panelextension.cpp:372
 msgid "&Lock Panels"
 msgstr "锁定面板(&L)"
 
-#: core/panelextension.cpp:372
+#: core/panelextension.cpp:371
 msgid "Un&lock Panels"
 msgstr "解锁面板(&L)"
 
-#: core/panelextension.cpp:380
+#: core/panelextension.cpp:379
 msgid "&Configure Panel..."
 msgstr "配置面板(&C)..."
 
+#: core/panelextension.cpp:385
+msgid "&Launch Process Manager..."
+msgstr ""
+
 #: ui/addapplet.cpp:234
 msgid "Add Applet"
 msgstr "添加小程序"
 
-#: ui/addappletvisualfeedback.cpp:60
+#: ui/addappletvisualfeedback.cpp:61
 msgid "%1 Added"
 msgstr "添加了 %1"
 
-#: ui/appletop_mnu.cpp:51
+#: ui/appletop_mnu.cpp:52
 msgid "&Move %1 Menu"
 msgstr "移动%1菜单(&M)"
 
-#: ui/appletop_mnu.cpp:52
+#: ui/appletop_mnu.cpp:53
 msgid "&Move %1 Button"
 msgstr "移动%1按钮(&M)"
 
-#: ui/appletop_mnu.cpp:53
+#: ui/appletop_mnu.cpp:54
 #, c-format
 msgid "&Move %1"
 msgstr "移动%1(&M)"
 
-#: ui/appletop_mnu.cpp:75
+#: ui/appletop_mnu.cpp:76
 msgid "&Remove %1 Menu"
 msgstr "删除%1菜单(&R)"
 
-#: ui/appletop_mnu.cpp:76
+#: ui/appletop_mnu.cpp:77
 msgid "&Remove %1 Button"
 msgstr "删除%1按钮(&R)"
 
-#: ui/appletop_mnu.cpp:77
+#: ui/appletop_mnu.cpp:78
 #, c-format
 msgid "&Remove %1"
 msgstr "删除%1(&R)"
 
-#: ui/appletop_mnu.cpp:91 ui/extensionop_mnu.cpp:43
+#: ui/appletop_mnu.cpp:92 ui/extensionop_mnu.cpp:43
 msgid "Report &Bug..."
 msgstr "报告错误(&B)..."
 
-#: ui/appletop_mnu.cpp:105
+#: ui/appletop_mnu.cpp:106
 #, c-format
 msgid "&About %1"
 msgstr "关于 %1(&A)"
 
-#: ui/appletop_mnu.cpp:125
+#: ui/appletop_mnu.cpp:126
 msgid "&Configure %1 Button..."
 msgstr "配置 %1 按钮(&C)..."
 
-#: ui/appletop_mnu.cpp:130 ui/extensionop_mnu.cpp:62
+#: ui/appletop_mnu.cpp:131 ui/extensionop_mnu.cpp:62
 msgid "&Configure %1..."
 msgstr "配置 %1(&C)..."
 
-#: ui/appletop_mnu.cpp:143
+#: ui/appletop_mnu.cpp:144
 msgid "Applet Menu"
 msgstr "小程序菜单"
 
-#: ui/appletop_mnu.cpp:144
+#: ui/appletop_mnu.cpp:145
 msgid "%1 Menu"
 msgstr "%1菜单"
 
-#: ui/appletop_mnu.cpp:170
+#: ui/appletop_mnu.cpp:173
+msgid "Switch to Kickoff Menu Style"
+msgstr ""
+
+#: ui/appletop_mnu.cpp:175
+msgid "Switch to Trinity Classic Menu Style"
+msgstr ""
+
+#: ui/appletop_mnu.cpp:186
 msgid "&Menu Editor"
 msgstr "菜单编辑器(&M)"
 
-#: ui/appletop_mnu.cpp:185
+#: ui/appletop_mnu.cpp:201
 msgid "&Edit Bookmarks"
 msgstr "编辑书签(&E)"
 
-#: ui/appletop_mnu.cpp:194
+#: ui/appletop_mnu.cpp:210
 msgid "Panel Menu"
 msgstr "面板菜单"
 
@@ -267,23 +282,23 @@ msgstr "选择文件夹"
 msgid "'%1' is not a valid folder."
 msgstr "“%1”不是有效的文件夹。"
 
-#: ui/browser_mnu.cpp:126 ui/browser_mnu.cpp:135
+#: ui/browser_mnu.cpp:127 ui/browser_mnu.cpp:136
 msgid "Failed to Read Folder"
 msgstr "读取文件夹失败"
 
-#: ui/browser_mnu.cpp:143
+#: ui/browser_mnu.cpp:144
 msgid "Not Authorized to Read Folder"
 msgstr "未授权读取文件夹"
 
-#: ui/browser_mnu.cpp:151
+#: ui/browser_mnu.cpp:154
 msgid "Open in File Manager"
 msgstr "在文件管理器中打开"
 
-#: ui/browser_mnu.cpp:153
+#: ui/browser_mnu.cpp:156
 msgid "Open in Terminal"
 msgstr "在终端中打开"
 
-#: ui/browser_mnu.cpp:299
+#: ui/browser_mnu.cpp:302
 msgid "More"
 msgstr "更多"
 
@@ -315,47 +330,73 @@ msgstr "不可执行"
 msgid "Select Other"
 msgstr "选择其它"
 
-#: ui/k_mnu.cpp:197
+#: ui/itemview.cpp:475 ui/k_new_mnu.cpp:1029
+#, fuzzy
+msgid "New Applications"
+msgstr "应用程序"
+
+#: ui/itemview.cpp:479
+msgid "Restart Computer"
+msgstr ""
+
+#: ui/itemview.cpp:482 ui/k_mnu.cpp:378 ui/k_new_mnu.cpp:1356
+msgid "Switch User"
+msgstr "切换用户"
+
+#: ui/itemview.cpp:860
+#, fuzzy, c-format
+msgid "Host: %1"
+msgstr "浏览：%1"
+
+#: ui/itemview.cpp:1170
+msgid "Directory: /)"
+msgstr ""
+
+#: ui/itemview.cpp:1172
+msgid "Directory: "
+msgstr ""
+
+#: ui/k_mnu.cpp:267
+msgid "Press '/' to search..."
+msgstr ""
+
+#: ui/k_mnu.cpp:286
 msgid "All Applications"
 msgstr "全部应用程序"
 
-#: ui/k_mnu.cpp:199
+#: ui/k_mnu.cpp:288
 msgid "Actions"
 msgstr "动作"
 
-#: ui/k_mnu.cpp:231
+#: ui/k_mnu.cpp:320
 msgid "Quick Browser"
 msgstr "快速浏览器"
 
-#: ui/k_mnu.cpp:280
+#: ui/k_mnu.cpp:369 ui/k_new_mnu.cpp:1421
 msgid "Run Command..."
 msgstr "运行命令..."
 
-#: ui/k_mnu.cpp:289
-msgid "Switch User"
-msgstr "切换用户"
-
-#: ui/k_mnu.cpp:301
+#: ui/k_mnu.cpp:390 ui/k_new_mnu.cpp:1350
 msgid "Save Session"
 msgstr "保存会话"
 
-#: ui/k_mnu.cpp:306
+#: ui/k_mnu.cpp:395
 msgid "Lock Session"
 msgstr "锁住会话"
 
-#: ui/k_mnu.cpp:311
+#: ui/k_mnu.cpp:400
 msgid "Log Out..."
 msgstr "注销..."
 
-#: ui/k_mnu.cpp:364
+#: ui/k_mnu.cpp:476 ui/k_new_mnu.cpp:939 ui/k_new_mnu.cpp:1535
 msgid "Lock Current && Start New Session"
 msgstr "锁住当前会话并启动新会话"
 
-#: ui/k_mnu.cpp:365
+#: ui/k_mnu.cpp:478 ui/k_new_mnu.cpp:936 ui/k_new_mnu.cpp:1536
 msgid "Start New Session"
 msgstr "启动新会话"
 
-#: ui/k_mnu.cpp:397
+#: ui/k_mnu.cpp:510 ui/k_new_mnu.cpp:1568
 msgid ""
 "<p>You have chosen to open another desktop session."
 "<br>The current session will be hidden and a new login screen will be "
@@ -370,14 +411,399 @@ msgstr ""
 "<br>每个会话被分配一个 F-功能键：F%1 当前分配给第一个会话，F%2 分配给第二个会话，等等。您可以同时按下 Ctrl、Alt 和相应的 "
 "F-功能键切换到不同的会话。此外，TDE 面板和桌面菜单也可用于切换会话。</p>"
 
-#: ui/k_mnu.cpp:408
+#: ui/k_mnu.cpp:521 ui/k_new_mnu.cpp:1579
 msgid "Warning - New Session"
 msgstr "警告 - 新会话"
 
-#: ui/k_mnu.cpp:409
+#: ui/k_mnu.cpp:522 ui/k_new_mnu.cpp:1580
 msgid "&Start New Session"
 msgstr "启动新会话(&S)"
 
+#: ui/k_new_mnu.cpp:204
+msgid "User&nbsp;<b>%1</b>&nbsp;on&nbsp;<b>%2</b>"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:223
+msgid "Most commonly used applications and documents"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:226
+#, fuzzy
+msgid "List of installed applications"
+msgstr "最常使用的应用程序"
+
+#: ui/k_new_mnu.cpp:231
+msgid ""
+"Information and configuration of your system, access to personal files, network "
+"resources and connected disk drives"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:240
+#, fuzzy
+msgid "Recently used applications and documents"
+msgstr "最近用过的应用程序"
+
+#: ui/k_new_mnu.cpp:244
+msgid "<qt>Logout, switch user, switch off or reset, suspend of the system"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:248
+msgid "<p align=\"center\"> <u>F</u>avorites</p>"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:249
+msgid "<p align=\"center\"><u>H</u>istory</p>"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:251
+msgid "<p align=\"center\"> <u>C</u>omputer</p>"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:252
+msgid "<p align=\"center\"><u>A</u>pplications</p>"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:254
+msgid "<p align=\"center\"><u>L</u>eave</p>"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:314
+msgid "Search Internet"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:326
+#, fuzzy
+msgid "Search Index"
+msgstr "搜索(&S)："
+
+#: ui/k_new_mnu.cpp:415
+#, fuzzy
+msgid "Applications, Contacts and Documents"
+msgstr "应用程序、任务和桌面会话"
+
+#: ui/k_new_mnu.cpp:925
+msgid "Start '%1'"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:927
+msgid "Start '%1' (current)"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:929
+msgid "Restart and boot directly into '%1'"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:937
+#, fuzzy
+msgid "Start a parallel session"
+msgstr "启动新会话"
+
+#: ui/k_new_mnu.cpp:940
+#, fuzzy
+msgid "Lock screen and start a parallel session"
+msgstr "锁住当前会话并启动新会话"
+
+#: ui/k_new_mnu.cpp:951
+msgid "Switch to Session of User '%1'"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:952
+#, fuzzy, c-format
+msgid "Session: %1"
+msgstr "保存会话"
+
+#: ui/k_new_mnu.cpp:1338
+#, fuzzy
+msgid "Session"
+msgstr "保存会话"
+
+#: ui/k_new_mnu.cpp:1340
+msgid "Logout"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1341
+#, fuzzy
+msgid "End session"
+msgstr "保存会话"
+
+#: ui/k_new_mnu.cpp:1343
+msgid "Lock"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1344
+#, fuzzy
+msgid "Lock screen"
+msgstr "锁住会话"
+
+#: ui/k_new_mnu.cpp:1351
+msgid "Save current Session for next login"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1357
+msgid "Manage parallel sessions"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1374
+msgid "System"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1375
+msgid "Shutdown Computer"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1376
+msgid "Turn off computer"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1378
+msgid "&Restart Computer"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1379
+msgid "Restart and boot the default system"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1389
+msgid "Start Operating System"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1390
+msgid "Restart and boot another operating system"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1425
+#, fuzzy
+msgid "System Folders"
+msgstr "选择文件夹"
+
+#: ui/k_new_mnu.cpp:1427
+#, fuzzy
+msgid "Home Folder"
+msgstr "主文件夹(&H)"
+
+#: ui/k_new_mnu.cpp:1436
+msgid "My Documents"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1445
+msgid "My Images"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1454
+msgid "My Music"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1463
+msgid "My Videos"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1472
+msgid "My Downloads"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1475
+#, fuzzy
+msgid "Network Folders"
+msgstr "选择文件夹"
+
+#: ui/k_new_mnu.cpp:1700
+msgid ""
+"<center><b>%1</b></center>\n"
+"You do not have permission to execute this command."
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1728
+msgid ""
+"<center><b>%1</b></center>\n"
+"Could not run the specified command."
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1738
+msgid ""
+"<center><b>%1</b></center>\n"
+"The specified command does not exist."
+msgstr ""
+
+#: ui/k_new_mnu.cpp:1936
+msgid "Documents"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2272 ui/k_new_mnu.cpp:2402
+#, c-format
+msgid "Send Email to %1"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2283
+#, c-format
+msgid "Open Addressbook at %1"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2324
+msgid "- Add ext:type to specify a file extension."
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2327
+msgid "- When searching for a phrase, add quotes."
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2330
+msgid "- To exclude search terms, use the minus symbol in front."
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2333
+msgid "- To search for optional terms, use OR."
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2336
+msgid "- You can use upper and lower case."
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2339
+msgid "Search Quick Tips"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2391
+msgid "%1 = %2"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2423
+#, c-format
+msgid "Open Local File: %1"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2426
+#, c-format
+msgid "Open Local Dir: %1"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2429
+#, c-format
+msgid "Open Remote Location: %1"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2457
+msgid "Run '%1'"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2502 ui/k_new_mnu.cpp:2575
+msgid "No matches found"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2627
+msgid "top %1 of %2"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2629
+msgid "%1 (top %2 of %3)"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2760
+msgid "Do you really want to reset the computer and boot Microsoft Windows"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2760
+#, fuzzy
+msgid "Start Windows Confirmation"
+msgstr "快速浏览器配置"
+
+#: ui/k_new_mnu.cpp:2760
+msgid "Start Windows"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2785
+msgid "Could not start Tomboy."
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2845
+#, fuzzy
+msgid "Remove From Favorites"
+msgstr "从面板删除(&R)"
+
+#: ui/k_new_mnu.cpp:2852
+#, fuzzy
+msgid "Add to Favorites"
+msgstr "添加到面板(&A)"
+
+#: ui/k_new_mnu.cpp:2883 ui/service_mnu.cpp:630
+msgid "Add Menu to Desktop"
+msgstr "将菜单添加到桌面"
+
+#: ui/k_new_mnu.cpp:2886 ui/service_mnu.cpp:603
+msgid "Add Item to Desktop"
+msgstr "将项目添加到桌面"
+
+#: ui/k_new_mnu.cpp:2893 ui/service_mnu.cpp:636
+msgid "Add Menu to Main Panel"
+msgstr "将菜单添加到主面板"
+
+#: ui/k_new_mnu.cpp:2896 ui/service_mnu.cpp:609
+msgid "Add Item to Main Panel"
+msgstr "将项目添加到主面板"
+
+#: ui/k_new_mnu.cpp:2902 ui/service_mnu.cpp:642
+msgid "Edit Menu"
+msgstr "编辑菜单"
+
+#: ui/k_new_mnu.cpp:2904 ui/service_mnu.cpp:615
+msgid "Edit Item"
+msgstr "编辑项"
+
+#: ui/k_new_mnu.cpp:2910 ui/service_mnu.cpp:621
+msgid "Put Into Run Dialog"
+msgstr "放入运行对话框"
+
+#: ui/k_new_mnu.cpp:2938
+msgid "Advanced"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:2954
+#, fuzzy
+msgid "Clear Recently Used Applications"
+msgstr "最近用过的应用程序"
+
+#: ui/k_new_mnu.cpp:2957
+#, fuzzy
+msgid "Clear Recently Used Documents"
+msgstr "最近用过的应用程序"
+
+#: ui/k_new_mnu.cpp:3542
+msgid "Media"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:3601
+msgid "(%1 available)"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:3732 ui/k_new_mnu.cpp:3736
+#, c-format
+msgid "Directory: %1"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:3828
+msgid "Suspend to Disk"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:3829 ui/k_new_mnu.cpp:3837 ui/k_new_mnu.cpp:3845
+#: ui/k_new_mnu.cpp:3853
+msgid "Pause without logging out"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:3836
+msgid "Suspend to RAM"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:3844
+msgid "Freeze"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:3852
+msgid "Standby"
+msgstr ""
+
+#: ui/k_new_mnu.cpp:3921
+msgid "Suspend failed"
+msgstr ""
+
 #: ui/quickbrowser_mnu.cpp:48
 msgid "&Home Folder"
 msgstr "主文件夹(&H)"
@@ -433,58 +859,30 @@ msgstr "%1 (左边)"
 msgid "%1 (Floating)"
 msgstr "%1 (浮动)"
 
-#: ui/service_mnu.cpp:262
+#: ui/service_mnu.cpp:368
 msgid "No Entries"
 msgstr "空"
 
-#: ui/service_mnu.cpp:269
+#: ui/service_mnu.cpp:375
 msgid "Add This Menu"
 msgstr "添加此菜单"
 
-#: ui/service_mnu.cpp:274
+#: ui/service_mnu.cpp:380
 msgid "Add Non-TDE Application"
 msgstr "添加非 TDE 应用程序"
 
-#: ui/service_mnu.cpp:314
+#: ui/service_mnu.cpp:421
 msgid ""
 "_: Entries in K-menu: %1 app name, %2 description\n"
 "%1 - %2"
 msgstr "%1 - %2"
 
-#: ui/service_mnu.cpp:324
+#: ui/service_mnu.cpp:431
 msgid ""
 "_: Entries in K-menu: %1 description, %2 app name\n"
 "%1 (%2)"
 msgstr "%1 (%2)"
 
-#: ui/service_mnu.cpp:488
-msgid "Add Item to Desktop"
-msgstr "将项目添加到桌面"
-
-#: ui/service_mnu.cpp:494
-msgid "Add Item to Main Panel"
-msgstr "将项目添加到主面板"
-
-#: ui/service_mnu.cpp:500
-msgid "Edit Item"
-msgstr "编辑项"
-
-#: ui/service_mnu.cpp:506
-msgid "Put Into Run Dialog"
-msgstr "放入运行对话框"
-
-#: ui/service_mnu.cpp:515
-msgid "Add Menu to Desktop"
-msgstr "将菜单添加到桌面"
-
-#: ui/service_mnu.cpp:521
-msgid "Add Menu to Main Panel"
-msgstr "将菜单添加到主面板"
-
-#: ui/service_mnu.cpp:527
-msgid "Edit Menu"
-msgstr "编辑菜单"
-
 #: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -547,22 +945,28 @@ msgstr "<qt>这是小程序列表。选择一个小程序，然后单击<b>添�
 msgid "&Add to Panel"
 msgstr "添加到面板(&A)"
 
-#. i18n: file ui/nonTDEButtonSettings.ui line 30
-#: rc.cpp:33 rc.cpp:58
+#. i18n: file ui/kmenuitembase.ui line 36
+#: rc.cpp:33
+#, no-c-format
+msgid "KMenuItemBase"
+msgstr ""
+
+#. i18n: file ui/nonKDEButtonSettings.ui line 30
+#: rc.cpp:36 rc.cpp:61
 #, no-c-format
 msgid ""
 "Enter the name of the executable file to be run when this button is selected. "
 "If it is not in your $PATH then you will need to provide an absolute path."
 msgstr "输入选择此按钮后要运行的可执行文件名称。如果该文件所在的文件夹没有在您的 $PATH 中列出，您就必须提供绝对路径。"
 
-#. i18n: file ui/nonTDEButtonSettings.ui line 38
-#: rc.cpp:36
+#. i18n: file ui/nonKDEButtonSettings.ui line 38
+#: rc.cpp:39
 #, no-c-format
 msgid "Co&mmand line arguments (optional):"
 msgstr "可选的命令行参数(&M)："
 
-#. i18n: file ui/nonTDEButtonSettings.ui line 46
-#: rc.cpp:39 rc.cpp:50
+#. i18n: file ui/nonKDEButtonSettings.ui line 46
+#: rc.cpp:42 rc.cpp:53
 #, no-c-format
 msgid ""
 "Enter any command line options that should be passed to the command here.\n"
@@ -573,46 +977,46 @@ msgstr ""
 "\n"
 "<i>示例</i>：对于命令 `rm -fr`，请在此框中输入“-rf”。"
 
-#. i18n: file ui/nonTDEButtonSettings.ui line 54
-#: rc.cpp:44
+#. i18n: file ui/nonKDEButtonSettings.ui line 54
+#: rc.cpp:47
 #, no-c-format
 msgid "Run in a &terminal window"
 msgstr "在终端窗口中运行(&T)"
 
-#. i18n: file ui/nonTDEButtonSettings.ui line 57
-#: rc.cpp:47
+#. i18n: file ui/nonKDEButtonSettings.ui line 57
+#: rc.cpp:50
 #, no-c-format
 msgid ""
 "Select this option if the command is a command line application and you wish to "
 "be able to see its output when run."
 msgstr "如果命令是一个命令行应用程序，而您想要在运行时看到其输入，请选择此选项。"
 
-#. i18n: file ui/nonTDEButtonSettings.ui line 75
-#: rc.cpp:55
+#. i18n: file ui/nonKDEButtonSettings.ui line 75
+#: rc.cpp:58
 #, no-c-format
 msgid "&Executable:"
 msgstr "可执行程序(&E)："
 
-#. i18n: file ui/nonTDEButtonSettings.ui line 97
-#: rc.cpp:61 rc.cpp:67 rc.cpp:73 rc.cpp:76
+#. i18n: file ui/nonKDEButtonSettings.ui line 97
+#: rc.cpp:64 rc.cpp:70 rc.cpp:76 rc.cpp:79
 #, no-c-format
 msgid "Enter the name you would like to appear for this button here."
 msgstr "输入您想要此按钮在此出现的名称。"
 
-#. i18n: file ui/nonTDEButtonSettings.ui line 105
-#: rc.cpp:64
+#. i18n: file ui/nonKDEButtonSettings.ui line 105
+#: rc.cpp:67
 #, no-c-format
 msgid "&Button title:"
 msgstr "按钮标题(&B)："
 
-#. i18n: file ui/nonTDEButtonSettings.ui line 167
-#: rc.cpp:70
+#. i18n: file ui/nonKDEButtonSettings.ui line 167
+#: rc.cpp:73
 #, no-c-format
 msgid "&Description:"
 msgstr "描述(&D)："
 
 #. i18n: file core/extensionSettings.kcfg line 14
-#: rc.cpp:79
+#: rc.cpp:82
 #, no-c-format
 msgid ""
 "Whether this panel actually exists or not. Primarily to work around the fact "
@@ -621,103 +1025,109 @@ msgid ""
 msgstr "此面板是否已经存在。主要用于解决 TDEConfigXT 不会写入不包含非默认项的配置文件的问题。"
 
 #. i18n: file core/extensionSettings.kcfg line 18
-#: rc.cpp:82
+#: rc.cpp:85
 #, no-c-format
 msgid "The position of the panel"
 msgstr "面板的位置"
 
 #. i18n: file core/extensionSettings.kcfg line 25
-#: rc.cpp:85
+#: rc.cpp:88
 #, no-c-format
 msgid "The alignment of the panel"
 msgstr "面板的对齐方式"
 
 #. i18n: file core/extensionSettings.kcfg line 32
-#: rc.cpp:88
+#: rc.cpp:91
 #, no-c-format
 msgid "Primary xinerama screen"
 msgstr "主 xinerama 屏幕"
 
 #. i18n: file core/extensionSettings.kcfg line 37
-#: rc.cpp:91
+#: rc.cpp:94
 #, no-c-format
 msgid "Hide button size"
 msgstr "隐藏按钮大小"
 
 #. i18n: file core/extensionSettings.kcfg line 44
-#: rc.cpp:94
+#: rc.cpp:97
 #, no-c-format
 msgid "Show left panel hide button"
 msgstr "显示左侧面板的隐藏按钮"
 
 #. i18n: file core/extensionSettings.kcfg line 49
-#: rc.cpp:97
+#: rc.cpp:100
 #, no-c-format
 msgid "Show right panel hide button"
 msgstr "显示右侧面板的隐藏按钮"
 
 #. i18n: file core/extensionSettings.kcfg line 54
-#: rc.cpp:100
+#: rc.cpp:103
 #, no-c-format
 msgid "Auto hide panel"
 msgstr "自动隐藏面板"
 
 #. i18n: file core/extensionSettings.kcfg line 59
-#: rc.cpp:103
+#: rc.cpp:106
 #, no-c-format
 msgid "Enable auto hide"
 msgstr "启用自动隐藏"
 
 #. i18n: file core/extensionSettings.kcfg line 64
-#: rc.cpp:106
+#: rc.cpp:109
+#, no-c-format
+msgid "Auto hide when Xinerama screen is not available"
+msgstr ""
+
+#. i18n: file core/extensionSettings.kcfg line 69
+#: rc.cpp:112
 #, no-c-format
 msgid "Delay before auto hide"
 msgstr "自动隐藏的延时"
 
-#. i18n: file core/extensionSettings.kcfg line 69
-#: rc.cpp:109
+#. i18n: file core/extensionSettings.kcfg line 74
+#: rc.cpp:115
 #, no-c-format
 msgid "The trigger location for unhides"
 msgstr "取消隐藏的触发位置"
 
-#. i18n: file core/extensionSettings.kcfg line 76
-#: rc.cpp:112
+#. i18n: file core/extensionSettings.kcfg line 81
+#: rc.cpp:118
 #, no-c-format
 msgid "Enable background hiding"
 msgstr "启用背景隐藏"
 
-#. i18n: file core/extensionSettings.kcfg line 81
-#: rc.cpp:115
+#. i18n: file core/extensionSettings.kcfg line 86
+#: rc.cpp:121
 #, no-c-format
 msgid "Animate panel hiding"
 msgstr "动画式隐藏面板"
 
-#. i18n: file core/extensionSettings.kcfg line 86
-#: rc.cpp:118
+#. i18n: file core/extensionSettings.kcfg line 91
+#: rc.cpp:124
 #, no-c-format
 msgid "Panel hiding animation speed"
 msgstr "面板隐藏动画速度"
 
-#. i18n: file core/extensionSettings.kcfg line 91
-#: rc.cpp:121
+#. i18n: file core/extensionSettings.kcfg line 96
+#: rc.cpp:127
 #, no-c-format
 msgid "Length in percentage"
 msgstr "百分比长度"
 
-#. i18n: file core/extensionSettings.kcfg line 98
-#: rc.cpp:124
+#. i18n: file core/extensionSettings.kcfg line 103
+#: rc.cpp:130
 #, no-c-format
 msgid "Expand as required to fit contents"
 msgstr "展开以便适合内容"
 
-#. i18n: file core/extensionSettings.kcfg line 103
-#: rc.cpp:127
+#. i18n: file core/extensionSettings.kcfg line 108
+#: rc.cpp:133
 #, no-c-format
 msgid "Size"
 msgstr "大小"
 
-#. i18n: file core/extensionSettings.kcfg line 108
-#: rc.cpp:130
+#. i18n: file core/extensionSettings.kcfg line 113
+#: rc.cpp:136
 #, no-c-format
 msgid "Custom size"
 msgstr "自定义大小"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kickermenu_kate.po b/tde-i18n-zh_CN/messages/tdebase/kickermenu_kate.po
index 6330a41b3a9..2be08d43414 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kickermenu_kate.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kickermenu_kate.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2006-11-16 02:36+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kjobviewer.po b/tde-i18n-zh_CN/messages/tdebase/kjobviewer.po
index 1ade082293a..11aefbe7d5b 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kjobviewer.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kjobviewer.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kjobviewer\n"
-"POT-Creation-Date: 2006-03-12 03:46+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-28 14:13+0800\n"
 "Last-Translator: Li Zongliang <li-zongliang@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/klipper.po b/tde-i18n-zh_CN/messages/tdebase/klipper.po
index 94975307aa0..ee73436a0f7 100644
--- a/tde-i18n-zh_CN/messages/tdebase/klipper.po
+++ b/tde-i18n-zh_CN/messages/tdebase/klipper.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klipper\n"
-"POT-Creation-Date: 2006-06-17 03:59+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-28 14:16+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -115,111 +116,111 @@ msgid "Sy&nchronize contents of the clipboard and the selection"
 msgstr "同步剪贴板和选中内容(&N)"
 
 #: configdialog.cpp:141
-msgid ""
-"Selecting this option synchronizes these two buffers, so they work the same way "
-"as in TDE 1.x and 2.x."
+#, fuzzy
+msgid "Selecting this option synchronizes these two buffers."
 msgstr "选中此选项将同步这两个缓冲区，这样与 TDE 1.x 和 2.x 工作方式相同。"
 
-#: configdialog.cpp:145
+#: configdialog.cpp:144
 msgid "Separate clipboard and selection"
 msgstr "区分剪贴板和选中内容"
 
-#: configdialog.cpp:148
+#: configdialog.cpp:147
 msgid ""
 "Using this option will only set the selection when highlighting something and "
 "the clipboard when choosing e.g. \"Copy\" in a menubar."
 msgstr "使用此选项将区分两者，在突出显示文本的时候设置选中内容，而在选择“复制”这样的操作的时候设置剪贴板。"
 
-#: configdialog.cpp:155
+#: configdialog.cpp:154
 msgid "Tim&eout for action popups:"
 msgstr "动作弹出的超时时间(&E)："
 
-#: configdialog.cpp:157
+#: configdialog.cpp:156
 msgid " sec"
 msgstr " 秒"
 
-#: configdialog.cpp:158
+#: configdialog.cpp:157
 msgid "A value of 0 disables the timeout"
 msgstr "值为 0 代表禁用超时"
 
-#: configdialog.cpp:161
+#: configdialog.cpp:160
 msgid "C&lipboard history size:"
 msgstr "剪贴板历史大小(&L)："
 
-#: configdialog.cpp:183
+#: configdialog.cpp:182
 msgid ""
 "_n:  entry\n"
 " entries"
 msgstr " 项"
 
-#: configdialog.cpp:229
+#: configdialog.cpp:228
 msgid "Action &list (right click to add/remove commands):"
 msgstr "动作列表(右键点击增加或删除命令)(&L)："
 
-#: configdialog.cpp:233
-msgid "Regular Expression (see http://doc.trolltech.com/qregexp.html#details)"
+#: configdialog.cpp:232
+#, fuzzy
+msgid "Regular Expression (see http://doc.trolltech.com/tqregexp.html#details)"
 msgstr "正规表达式(参见 http://doc.trolltech.com/qregexp.html#details)"
 
-#: configdialog.cpp:234
+#: configdialog.cpp:233
 msgid "Description"
 msgstr "描述"
 
-#: configdialog.cpp:286
+#: configdialog.cpp:285
 msgid "&Use graphical editor for editing regular expressions"
 msgstr "使用图形编辑器编辑正规表达式(&U)"
 
-#: configdialog.cpp:295
+#: configdialog.cpp:294
 msgid "&Add Action"
 msgstr "添加动作(&A)"
 
-#: configdialog.cpp:298
+#: configdialog.cpp:297
 msgid "&Delete Action"
 msgstr "删除动作(&D)"
 
-#: configdialog.cpp:301
+#: configdialog.cpp:300
 #, c-format
 msgid ""
 "Click on a highlighted item's column to change it. \"%s\" in a command will be "
 "replaced with the clipboard contents."
 msgstr "点击突出显示项目的列进行修改。命令中“%s”将被剪贴板中的内容替换。"
 
-#: configdialog.cpp:307
+#: configdialog.cpp:306
 msgid "Advanced..."
 msgstr "高级..."
 
-#: configdialog.cpp:332
+#: configdialog.cpp:331
 msgid "Add Command"
 msgstr "添加命令"
 
-#: configdialog.cpp:333
+#: configdialog.cpp:332
 msgid "Remove Command"
 msgstr "删除命令"
 
-#: configdialog.cpp:343
+#: configdialog.cpp:342
 msgid "Click here to set the command to be executed"
 msgstr "点击这里设置要执行的命令"
 
-#: configdialog.cpp:344
+#: configdialog.cpp:343
 msgid "<new command>"
 msgstr "<新命令>"
 
-#: configdialog.cpp:366
+#: configdialog.cpp:365
 msgid "Click here to set the regexp"
 msgstr "点击这里设置正规表达式"
 
-#: configdialog.cpp:367
+#: configdialog.cpp:366
 msgid "<new action>"
 msgstr "<新动作>"
 
-#: configdialog.cpp:407
+#: configdialog.cpp:406
 msgid "Advanced Settings"
 msgstr "高级设置"
 
-#: configdialog.cpp:424
+#: configdialog.cpp:423
 msgid "D&isable Actions for Windows of Type WM_CLASS"
 msgstr "禁止在 WM_CLASS 类型的窗口上的动作(&I)："
 
-#: configdialog.cpp:427
+#: configdialog.cpp:426
 msgid ""
 "<qt>This lets you specify windows in which Klipper should not invoke "
 "\"actions\". Use"
@@ -275,67 +276,67 @@ msgstr "清除剪贴板历史(&L)"
 msgid "&Configure Klipper..."
 msgstr "配置 Klipper(&C)..."
 
-#: toplevel.cpp:225
+#: toplevel.cpp:232
 msgid "Klipper - clipboard tool"
 msgstr "Klipper - 剪贴板工具"
 
-#: toplevel.cpp:525
+#: toplevel.cpp:543
 msgid ""
 "You can enable URL actions later by right-clicking on the Klipper icon and "
 "selecting 'Enable Actions'"
 msgstr "如果想要稍候启用 URL 动作，可以用右键单击 Klipper 图标然后选择“启用动作”。"
 
-#: toplevel.cpp:592
+#: toplevel.cpp:610
 msgid ""
 "Should Klipper start automatically\n"
 "when you login?"
 msgstr "是否在您登录时自动启动 Klipper？"
 
-#: toplevel.cpp:592
+#: toplevel.cpp:610
 msgid "Automatically Start Klipper?"
 msgstr "自动启动 Klipper 吗？"
 
-#: toplevel.cpp:592
+#: toplevel.cpp:610
 msgid "Start"
 msgstr "启动"
 
-#: toplevel.cpp:592
+#: toplevel.cpp:610
 msgid "Do Not Start"
 msgstr "不启动"
 
-#: toplevel.cpp:647
+#: toplevel.cpp:665
 msgid "Enable &Actions"
 msgstr "启用动作(&A)"
 
-#: toplevel.cpp:651
+#: toplevel.cpp:669
 msgid "&Actions Enabled"
 msgstr "动作已启用(&A)"
 
-#: toplevel.cpp:1089
+#: toplevel.cpp:1104
 msgid "TDE cut & paste history utility"
 msgstr "TDE 剪切和粘贴历史工具"
 
-#: toplevel.cpp:1093
+#: toplevel.cpp:1108
 msgid "Klipper"
 msgstr "Klipper"
 
-#: toplevel.cpp:1100
+#: toplevel.cpp:1115
 msgid "Author"
 msgstr "作者"
 
-#: toplevel.cpp:1104
+#: toplevel.cpp:1119
 msgid "Original Author"
 msgstr "原创作者"
 
-#: toplevel.cpp:1108
+#: toplevel.cpp:1123
 msgid "Contributor"
 msgstr "贡献者"
 
-#: toplevel.cpp:1112
+#: toplevel.cpp:1127
 msgid "Bugfixes and optimizations"
 msgstr "错误修正和优化"
 
-#: toplevel.cpp:1116
+#: toplevel.cpp:1131
 msgid "Maintainer"
 msgstr "维护者"
 
@@ -343,15 +344,15 @@ msgstr "维护者"
 msgid " - Actions For: "
 msgstr " - 动作用于："
 
-#: urlgrabber.cpp:195
+#: urlgrabber.cpp:196
 msgid "Disable This Popup"
 msgstr "禁用此弹出菜单"
 
-#: urlgrabber.cpp:199
+#: urlgrabber.cpp:200
 msgid "&Edit Contents..."
 msgstr "编辑内容(&E)..."
 
-#: urlgrabber.cpp:262
+#: urlgrabber.cpp:271
 msgid "Edit Contents"
 msgstr "编辑内容"
 
diff --git a/tde-i18n-zh_CN/messages/tdebase/kmenuapplet.po b/tde-i18n-zh_CN/messages/tdebase/kmenuapplet.po
index e8fe327a9e8..7642e0ad63c 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kmenuapplet.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kmenuapplet.po
@@ -5,15 +5,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmenuapplet\n"
-"POT-Creation-Date: 2008-08-11 01:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-05 14:01+0800\n"
 "Last-Translator: 张忠立 <netwind2003@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: menuapplet.cpp:352
+#: menuapplet.cpp:350
 msgid ""
 "You do not appear to have enabled the standalone menubar; enable it in the "
 "Behavior control module for desktop."
diff --git a/tde-i18n-zh_CN/messages/tdebase/kmenuedit.po b/tde-i18n-zh_CN/messages/tdebase/kmenuedit.po
index a3b5e44f19a..308c3c23eb7 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kmenuedit.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kmenuedit.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmenuedit\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-11-15 15:31+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -100,13 +101,13 @@ msgstr "用户名(&U)："
 msgid "Current shortcut &key:"
 msgstr "当前快捷键(&K)："
 
-#: basictab.cpp:485
+#: basictab.cpp:490
 msgid ""
 "<qt>The key <b>%1</b> can not be used here because it is already used to "
 "activate <b>%2</b>."
 msgstr "<qt>无法在此使用按键 <b>%1</b>，因为该按键已经用于激活 <b>%2</b>。"
 
-#: basictab.cpp:490
+#: basictab.cpp:495
 msgid ""
 "<qt>The key <b>%1</b> can not be used here because it is already in use."
 msgstr "<qt>无法在此使用按键 <b>%1</b>，因为该按键已在使用中。"
@@ -143,7 +144,11 @@ msgstr "新建菜单项(&I)..."
 msgid "New S&eparator"
 msgstr "新建分隔符(&E)"
 
-#: kmenuedit.cpp:153
+#: kmenuedit.cpp:70
+msgid "Save && Quit"
+msgstr ""
+
+#: kmenuedit.cpp:161
 msgid ""
 "You have made changes to the Control Center.\n"
 "Do you want to save the changes or discard them?"
@@ -151,11 +156,11 @@ msgstr ""
 "您已经更改了控制中心。\n"
 "您是想要保存更改还是丢弃更改？"
 
-#: kmenuedit.cpp:155
+#: kmenuedit.cpp:163
 msgid "Save Control Center Changes?"
 msgstr "保存对控制中心的更改吗？"
 
-#: kmenuedit.cpp:161
+#: kmenuedit.cpp:169
 msgid ""
 "You have made changes to the menu.\n"
 "Do you want to save the changes or discard them?"
@@ -163,7 +168,7 @@ msgstr ""
 "您已经更改了菜单。\n"
 "您是想要保存更改还是丢弃更改？"
 
-#: kmenuedit.cpp:163
+#: kmenuedit.cpp:171
 msgid "Save Menu Changes?"
 msgstr "保存对菜单的更改吗？"
 
diff --git a/tde-i18n-zh_CN/messages/tdebase/kminipagerapplet.po b/tde-i18n-zh_CN/messages/tdebase/kminipagerapplet.po
index fb4debb0817..a012524050f 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kminipagerapplet.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kminipagerapplet.po
@@ -5,113 +5,118 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kminipagerapplet\n"
-"POT-Creation-Date: 2008-08-18 01:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-07-17 10:05+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Translator: Wang Jian <lark@linux.net.cn>\n"
 
-#: pagerapplet.cpp:680
+#: pagerapplet.cpp:713
 msgid "&Launch Pager"
 msgstr "启动切换器(&L)"
 
-#: pagerapplet.cpp:683
+#: pagerapplet.cpp:716
 msgid "&Rename Desktop \"%1\""
 msgstr "重命名桌面“%1”(&R)"
 
-#: pagerapplet.cpp:689
+#: pagerapplet.cpp:722
 msgid "Pager Layout"
 msgstr "切换器布局"
 
-#: pagerapplet.cpp:693
+#: pagerapplet.cpp:726
 msgid "&Automatic"
 msgstr "自动(&A)"
 
-#: pagerapplet.cpp:694
+#: pagerapplet.cpp:727
 msgid ""
 "_: one row or column\n"
 "&1"
 msgstr "&1"
 
-#: pagerapplet.cpp:695
+#: pagerapplet.cpp:728
 msgid ""
 "_: two rows or columns\n"
 "&2"
 msgstr "&2"
 
-#: pagerapplet.cpp:696
+#: pagerapplet.cpp:729
 msgid ""
 "_: three rows or columns\n"
 "&3"
 msgstr "&3"
 
-#: pagerapplet.cpp:698
+#: pagerapplet.cpp:731
 msgid "&Rows"
 msgstr "行数(&R)"
 
-#: pagerapplet.cpp:699
+#: pagerapplet.cpp:732
 msgid "&Columns"
 msgstr "列数(&C)"
 
-#: pagerapplet.cpp:702
+#: pagerapplet.cpp:735
 msgid "&Window Thumbnails"
 msgstr "窗口缩略图(&W)"
 
-#: pagerapplet.cpp:703
+#: pagerapplet.cpp:736
 msgid "&Window Icons"
 msgstr "窗口图标(&W)"
 
-#: pagerapplet.cpp:705
+#: pagerapplet.cpp:737
+msgid "&Cycle on Wheel"
+msgstr ""
+
+#: pagerapplet.cpp:739
 msgid "Text Label"
 msgstr "文本标签"
 
-#: pagerapplet.cpp:706
+#: pagerapplet.cpp:740
 msgid "Desktop N&umber"
 msgstr "桌面编号(&U)"
 
-#: pagerapplet.cpp:708
+#: pagerapplet.cpp:742
 msgid "Desktop N&ame"
 msgstr "桌面名称(&A)"
 
-#: pagerapplet.cpp:710
+#: pagerapplet.cpp:744
 msgid "N&o Label"
 msgstr "无标签(&O)"
 
-#: pagerapplet.cpp:713
+#: pagerapplet.cpp:747
 msgid "Background"
 msgstr "背景"
 
-#: pagerapplet.cpp:714
+#: pagerapplet.cpp:748
 msgid "&Elegant"
 msgstr "智能(&E)"
 
-#: pagerapplet.cpp:716
+#: pagerapplet.cpp:750
 msgid "&Transparent"
 msgstr "透明(&T)"
 
-#: pagerapplet.cpp:718
+#: pagerapplet.cpp:753
 msgid "&Desktop Wallpaper"
 msgstr "桌面壁纸(&D)"
 
-#: pagerapplet.cpp:721
+#: pagerapplet.cpp:757
 msgid "&Pager Options"
 msgstr "分页选项(&P)"
 
-#: pagerapplet.cpp:724
+#: pagerapplet.cpp:760
 msgid "&Configure Desktops..."
 msgstr "配置桌面(&C)..."
 
-#: pagerbutton.cpp:807
+#: pagerbutton.cpp:819
 #, c-format
 msgid ""
 "_n: and 1 other\n"
 "and %n others"
 msgstr "及其它 %n 个桌面"
 
-#: pagerbutton.cpp:815
+#: pagerbutton.cpp:827
 #, c-format
 msgid ""
 "_n: One window:\n"
@@ -184,5 +189,11 @@ msgstr "显示桌面预览？"
 msgid "Show window icons in previews?"
 msgstr "在预览中显示窗口图标？"
 
+#. i18n: file pagersettings.kcfg line 59
+#: rc.cpp:36
+#, no-c-format
+msgid "Cycle through desktops with wheel?"
+msgstr ""
+
 #~ msgid "and %1 others"
 #~ msgstr "及其它 %1 个桌面"
diff --git a/tde-i18n-zh_CN/messages/tdebase/knetattach.po b/tde-i18n-zh_CN/messages/tdebase/knetattach.po
index 777b31474aa..d7a9db91188 100644
--- a/tde-i18n-zh_CN/messages/tdebase/knetattach.po
+++ b/tde-i18n-zh_CN/messages/tdebase/knetattach.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: knetattach\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-02-12 17:15+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/konqueror.po b/tde-i18n-zh_CN/messages/tdebase/konqueror.po
index 9ff4811007d..1061bc7ad15 100644
--- a/tde-i18n-zh_CN/messages/tdebase/konqueror.po
+++ b/tde-i18n-zh_CN/messages/tdebase/konqueror.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: konqueror\n"
-"POT-Creation-Date: 2008-07-08 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -68,7 +69,7 @@ msgid ""
 msgstr "如果您启用了此选项，Konqueror 将在您打开文件夹时另外打开一个新窗口，而不是在当前窗口中显示文件夹内容。"
 
 #. i18n: file konqueror.kcfg line 20
-#: about/konq_aboutpage.cc:124 rc.cpp:75
+#: about/konq_aboutpage.cc:151 rc.cpp:75
 #, no-c-format
 msgid "Home Folder"
 msgstr "主文件夹"
@@ -153,19 +154,19 @@ msgstr "标准字体"
 msgid "This is the font used to display text in Konqueror windows."
 msgstr "这是在 Konqueror 窗口中显示文字所用的的字体。"
 
-#. i18n: file konqueror.kcfg line 598
+#. i18n: file konqueror.kcfg line 604
 #: rc.cpp:111
 #, no-c-format
 msgid "Ask confirmation for deleting a file."
 msgstr "删除文件时请求确认。"
 
-#. i18n: file konqueror.kcfg line 604
+#. i18n: file konqueror.kcfg line 610
 #: rc.cpp:114
 #, no-c-format
 msgid "Ask confirmation for move to trash"
 msgstr "移至回收站时请求确认"
 
-#. i18n: file konqueror.kcfg line 605
+#. i18n: file konqueror.kcfg line 611
 #: rc.cpp:117
 #, no-c-format
 msgid ""
@@ -173,7 +174,7 @@ msgid ""
 "file to your trash folder, from where it can be recovered very easily."
 msgstr "此选项将控制在您将文件移动到回收站时 Konqueror 是否应请求您的确认，以免您误删文件。"
 
-#. i18n: file konqueror.kcfg line 615
+#. i18n: file konqueror.kcfg line 621
 #: rc.cpp:120
 #, no-c-format
 msgid ""
@@ -199,13 +200,13 @@ msgstr "图标大小(&I)"
 msgid "S&ort"
 msgstr "排序(&O)"
 
-#. i18n: file iconview/konq_iconview.rc line 43
+#. i18n: file iconview/konq_iconview.rc line 44
 #: rc.cpp:204
 #, no-c-format
 msgid "Iconview Toolbar"
 msgstr "图标视图工具栏"
 
-#. i18n: file iconview/konq_iconview.rc line 48
+#. i18n: file iconview/konq_iconview.rc line 49
 #: rc.cpp:207
 #, no-c-format
 msgid "Iconview Extra Toolbar"
@@ -320,7 +321,7 @@ msgid "URLs older than"
 msgstr "URL 旧于"
 
 #. i18n: file sidebar/trees/history_module/history_dlg.ui line 151
-#: about/konq_aboutpage.cc:277 rc.cpp:375
+#: about/konq_aboutpage.cc:304 rc.cpp:375
 #, no-c-format
 msgid "Details"
 msgstr "细节"
@@ -371,8 +372,8 @@ msgstr ""
 "诊断信息是：\n"
 "%2"
 
-#: about/konq_aboutpage.cc:113 about/konq_aboutpage.cc:178
-#: about/konq_aboutpage.cc:233 about/konq_aboutpage.cc:330 konq_factory.cc:218
+#: about/konq_aboutpage.cc:140 about/konq_aboutpage.cc:205
+#: about/konq_aboutpage.cc:260 about/konq_aboutpage.cc:357 konq_factory.cc:218
 msgid "Konqueror"
 msgstr "Konqueror"
 
@@ -381,7 +382,8 @@ msgid "Web browser, file manager, ..."
 msgstr "Web 浏览器、文件管理器……"
 
 #: konq_factory.cc:222
-msgid "(c) 1999-2005, The Konqueror developers"
+#, fuzzy
+msgid "(c) 1999-2010, The Konqueror developers"
 msgstr "(c) 1999-2005，Konqueror 开发者"
 
 #: konq_factory.cc:224
@@ -389,103 +391,107 @@ msgid "http://konqueror.kde.org"
 msgstr "http://konqueror.kde.org"
 
 #: konq_factory.cc:225
+msgid "Maintainer, Trinity bugfixes"
+msgstr ""
+
+#: konq_factory.cc:226
 msgid "developer (framework, parts, JavaScript, I/O lib) and maintainer"
 msgstr "开发者(框架、组件、JavaScript、I/O 库)和维护者"
 
-#: konq_factory.cc:226
+#: konq_factory.cc:227
 msgid "developer (framework, parts)"
 msgstr "开发者(框架、组件)"
 
-#: konq_factory.cc:227 konq_factory.cc:254
+#: konq_factory.cc:228 konq_factory.cc:255
 msgid "developer (framework)"
 msgstr "开发者(框架)"
 
-#: konq_factory.cc:228
+#: konq_factory.cc:229
 msgid "developer"
 msgstr "开发者"
 
-#: konq_factory.cc:229
+#: konq_factory.cc:230
 msgid "developer (List views)"
 msgstr "开发者(列表视图)"
 
-#: konq_factory.cc:230
+#: konq_factory.cc:231
 msgid "developer (List views, I/O lib)"
 msgstr "开发者(列表视图、I/O 库)"
 
-#: konq_factory.cc:231 konq_factory.cc:232 konq_factory.cc:233
-#: konq_factory.cc:235 konq_factory.cc:236 konq_factory.cc:238
-#: konq_factory.cc:239 konq_factory.cc:240 konq_factory.cc:241
-#: konq_factory.cc:242
+#: konq_factory.cc:232 konq_factory.cc:233 konq_factory.cc:234
+#: konq_factory.cc:236 konq_factory.cc:237 konq_factory.cc:239
+#: konq_factory.cc:240 konq_factory.cc:241 konq_factory.cc:242
+#: konq_factory.cc:243
 msgid "developer (HTML rendering engine)"
 msgstr "开发者(HTML 绘制引擎)"
 
-#: konq_factory.cc:234
+#: konq_factory.cc:235
 msgid "developer (HTML rendering engine, I/O lib)"
 msgstr "开发者(HTML 绘制引擎、I/O 库)"
 
-#: konq_factory.cc:237
+#: konq_factory.cc:238
 msgid "developer (HTML rendering engine, I/O lib, regression test framework)"
 msgstr "开发者(HTML 绘制引擎、I/O 库、框架的深入测试)"
 
-#: konq_factory.cc:243
+#: konq_factory.cc:244
 msgid "developer (HTML rendering engine, JavaScript)"
 msgstr "开发者(HTML 绘制引擎、JavaScript)"
 
-#: konq_factory.cc:244
+#: konq_factory.cc:245
 msgid "developer (JavaScript)"
 msgstr "开发者(JavaScript)"
 
-#: konq_factory.cc:245
+#: konq_factory.cc:246
 msgid "developer (Java applets and other embedded objects)"
 msgstr "开发者(Java 小程序支持和其它嵌入对象)"
 
-#: konq_factory.cc:246 konq_factory.cc:247
+#: konq_factory.cc:247 konq_factory.cc:248
 msgid "developer (I/O lib)"
 msgstr "开发者(I/O 库)"
 
-#: konq_factory.cc:248 konq_factory.cc:249
+#: konq_factory.cc:249 konq_factory.cc:250
 msgid "developer (Java applet support)"
 msgstr "开发者(Java 小程序支持)"
 
-#: konq_factory.cc:250
+#: konq_factory.cc:251
 msgid ""
 "developer (Java 2 security manager support,\n"
 " and other major improvements to applet support)"
 msgstr "开发者(Java 2 安全管理器支持和其它对小程序支持的重要改进)"
 
-#: konq_factory.cc:251
+#: konq_factory.cc:252
 msgid "developer (Netscape plugin support)"
 msgstr "开发者(Netscape 插件支持)"
 
-#: konq_factory.cc:252
+#: konq_factory.cc:253
 msgid "developer (SSL, Netscape plugins)"
 msgstr "开发者(SSL，Netscape 插件支持)"
 
-#: konq_factory.cc:253
+#: konq_factory.cc:254
 msgid "developer (I/O lib, Authentication support)"
 msgstr "开发者(I/O 库、验证支持)"
 
-#: konq_factory.cc:255
+#: konq_factory.cc:256
 msgid "graphics/icons"
 msgstr "图像和图标"
 
-#: konq_factory.cc:256
+#: konq_factory.cc:257
 msgid "kfm author"
 msgstr "kfm 作者"
 
-#: konq_factory.cc:257
+#: konq_factory.cc:258
 msgid "developer (navigation panel framework)"
 msgstr "开发者(导航面板框架)"
 
-#: konq_factory.cc:258
+#: konq_factory.cc:259
 msgid "developer (misc stuff)"
 msgstr "开发者(杂项)"
 
-#: konq_factory.cc:259
+#: konq_factory.cc:260
 msgid "developer (AdBlock filter)"
 msgstr "开发者(广告过滤)"
 
-#: konq_frame.cc:85
+#: konq_frame.cc:86
 msgid ""
 "Checking this box on at least two views sets those views as 'linked'. Then, "
 "when you change directories in one view, the other views linked with it will "
@@ -496,15 +502,15 @@ msgstr ""
 "在至少两个视图中选中此选项将设置这些视图为“被链接的”。然后，当您在一个视图中更改目录时，其它与它链的视视图将自动更新并显示当前目录。这在多个不同类型的视图中非"
 "常有用，例如使用图标视图或详细视图的目录树，或者终端模拟窗口。"
 
-#: konq_frame.cc:148
+#: konq_frame.cc:154
 msgid "Close View"
 msgstr "关闭视图"
 
-#: konq_frame.cc:229
+#: konq_frame.cc:235
 msgid "%1/s"
 msgstr "%1/s"
 
-#: konq_frame.cc:231
+#: konq_frame.cc:237
 msgid "Stalled"
 msgstr "暂停"
 
@@ -517,12 +523,12 @@ msgstr "在 %1 里预览"
 msgid "Preview In"
 msgstr "选择预览程序"
 
-#: konq_guiclients.cc:190
+#: konq_guiclients.cc:195
 #, c-format
 msgid "Show %1"
 msgstr "显示 %1"
 
-#: konq_guiclients.cc:194
+#: konq_guiclients.cc:199
 #, c-format
 msgid "Hide %1"
 msgstr "隐藏 %1"
@@ -557,7 +563,7 @@ msgstr "对于指向文件的 URLs，打开目录并选择文件，而不是打�
 msgid "Location to open"
 msgstr "要打开的位置"
 
-#: konq_mainwindow.cc:495
+#: konq_mainwindow.cc:562
 #, c-format
 msgid ""
 "Malformed URL\n"
@@ -566,7 +572,7 @@ msgstr ""
 "不正确的 URL\n"
 "%1"
 
-#: konq_mainwindow.cc:500
+#: konq_mainwindow.cc:567
 #, c-format
 msgid ""
 "Protocol not supported\n"
@@ -575,25 +581,25 @@ msgstr ""
 "不支持协议\n"
 "%1"
 
-#: konq_mainwindow.cc:583 konq_run.cc:119
+#: konq_mainwindow.cc:650 konq_run.cc:119
 msgid ""
 "There appears to be a configuration error. You have associated Konqueror with "
 "%1, but it cannot handle this file type."
 msgstr "看起来有配置错误。您将 Konqueror 和 %1 相关联，但它无法处理该文件类型。"
 
-#: konq_mainwindow.cc:1414
+#: konq_mainwindow.cc:1480
 msgid "Open Location"
 msgstr "打开位置"
 
-#: konq_mainwindow.cc:1445
+#: konq_mainwindow.cc:1511
 msgid "Cannot create the find part, check your installation."
 msgstr "无法创建查找部件，请检查您的安装。"
 
-#: konq_mainwindow.cc:1721
+#: konq_mainwindow.cc:1787
 msgid "Canceled."
 msgstr "已取消。"
 
-#: konq_mainwindow.cc:1759
+#: konq_mainwindow.cc:1825
 msgid ""
 "This page contains changes that have not been submitted.\n"
 "Reloading the page will discard these changes."
@@ -601,33 +607,55 @@ msgstr ""
 "此页面包含尚未提交的更改。\n"
 "重新装入页面将会丢弃这些更改。"
 
-#: konq_mainwindow.cc:1760 konq_mainwindow.cc:2582 konq_mainwindow.cc:2600
-#: konq_mainwindow.cc:2704 konq_mainwindow.cc:2720 konq_mainwindow.cc:2737
-#: konq_mainwindow.cc:2774 konq_mainwindow.cc:2807 konq_mainwindow.cc:5233
-#: konq_mainwindow.cc:5251 konq_viewmgr.cc:1165 konq_viewmgr.cc:1183
+#: konq_mainwindow.cc:1826 konq_mainwindow.cc:2673 konq_mainwindow.cc:2691
+#: konq_mainwindow.cc:2803 konq_mainwindow.cc:2819 konq_mainwindow.cc:2836
+#: konq_mainwindow.cc:2873 konq_mainwindow.cc:2906 konq_mainwindow.cc:5328
+#: konq_mainwindow.cc:5346 konq_viewmgr.cc:1171 konq_viewmgr.cc:1189
 msgid "Discard Changes?"
 msgstr "丢弃更改吗？"
 
-#: konq_mainwindow.cc:1760 konq_mainwindow.cc:2582 konq_mainwindow.cc:2600
-#: konq_mainwindow.cc:2704 konq_mainwindow.cc:2720 konq_mainwindow.cc:2737
-#: konq_mainwindow.cc:2774 konq_mainwindow.cc:2807 konq_mainwindow.cc:5233
-#: konq_mainwindow.cc:5251 konq_viewmgr.cc:1165 konq_viewmgr.cc:1183
+#: konq_mainwindow.cc:1826 konq_mainwindow.cc:2673 konq_mainwindow.cc:2691
+#: konq_mainwindow.cc:2803 konq_mainwindow.cc:2819 konq_mainwindow.cc:2836
+#: konq_mainwindow.cc:2873 konq_mainwindow.cc:2906 konq_mainwindow.cc:5328
+#: konq_mainwindow.cc:5346 konq_viewmgr.cc:1171 konq_viewmgr.cc:1189
 msgid "&Discard Changes"
 msgstr "丢弃更改(&D)"
 
-#: konq_mainwindow.cc:1865
+#: konq_mainwindow.cc:1855 konq_mainwindow.cc:4048
+msgid ""
+"Stop loading the document"
+"<p>All network transfers will be stopped and Konqueror will display the content "
+"that has been received so far."
+msgstr "停止装入文档<p>所有网络传输都会停止，Konqueror 将显示已经接受到的文档内容。"
+
+#: konq_mainwindow.cc:1858 konq_mainwindow.cc:4051
+msgid "Stop loading the document"
+msgstr "停止装入文件"
+
+#: konq_mainwindow.cc:1862 konq_mainwindow.cc:4038
+msgid ""
+"Reload the currently displayed document"
+"<p>This may, for example, be needed to refresh webpages that have been modified "
+"since they were loaded, in order to make the changes visible."
+msgstr "重新装入当前显示的文档<p>例如，此功能可用于刷新自上次装入后修改过的网页，以便反映最新的变化。"
+
+#: konq_mainwindow.cc:1865 konq_mainwindow.cc:4041
+msgid "Reload the currently displayed document"
+msgstr "重新装入目前显示的文档"
+
+#: konq_mainwindow.cc:1959
 msgid "Your sidebar is not functional or unavailable."
 msgstr "您的侧边栏没有功能或不可用。"
 
-#: konq_mainwindow.cc:1865 konq_mainwindow.cc:1884
+#: konq_mainwindow.cc:1959 konq_mainwindow.cc:1978
 msgid "Show History Sidebar"
 msgstr "显示历史侧边栏"
 
-#: konq_mainwindow.cc:1884
+#: konq_mainwindow.cc:1978
 msgid "Cannot find running history plugin in your sidebar."
 msgstr "您的侧边栏中找不到运行中的历史插件。"
 
-#: konq_mainwindow.cc:2581 konq_mainwindow.cc:2599
+#: konq_mainwindow.cc:2672 konq_mainwindow.cc:2690
 msgid ""
 "This tab contains changes that have not been submitted.\n"
 "Detaching the tab will discard these changes."
@@ -635,7 +663,7 @@ msgstr ""
 "此标签包含尚未提交的更改。\n"
 "漂移标签将会丢弃这些更改。"
 
-#: konq_mainwindow.cc:2703
+#: konq_mainwindow.cc:2802
 msgid ""
 "This view contains changes that have not been submitted.\n"
 "Closing the view will discard these changes."
@@ -643,7 +671,7 @@ msgstr ""
 "此视图包含尚未提交的更改。\n"
 "关闭视图将会丢弃这些更改。"
 
-#: konq_mainwindow.cc:2719 konq_mainwindow.cc:2736
+#: konq_mainwindow.cc:2818 konq_mainwindow.cc:2835
 msgid ""
 "This tab contains changes that have not been submitted.\n"
 "Closing the tab will discard these changes."
@@ -651,19 +679,19 @@ msgstr ""
 "此标签包含尚未提交的更改。\n"
 "关闭标签将会丢弃这些更改。"
 
-#: konq_mainwindow.cc:2758
+#: konq_mainwindow.cc:2857
 msgid "Do you really want to close all other tabs?"
 msgstr "您确定想要关闭全部其它标签吗？"
 
-#: konq_mainwindow.cc:2759
+#: konq_mainwindow.cc:2858
 msgid "Close Other Tabs Confirmation"
 msgstr "关闭其它标签确认"
 
-#: konq_mainwindow.cc:2759 konq_mainwindow.cc:3803 konq_tabs.cc:421
+#: konq_mainwindow.cc:2858 konq_mainwindow.cc:3904 konq_tabs.cc:496
 msgid "Close &Other Tabs"
 msgstr "关闭其它标签(&O)"
 
-#: konq_mainwindow.cc:2773
+#: konq_mainwindow.cc:2872
 msgid ""
 "This tab contains changes that have not been submitted.\n"
 "Closing other tabs will discard these changes."
@@ -671,7 +699,7 @@ msgstr ""
 "此标签包含尚未提交的更改。\n"
 "关闭其它标签将会丢弃这些更改。"
 
-#: konq_mainwindow.cc:2806
+#: konq_mainwindow.cc:2905
 msgid ""
 "This tab contains changes that have not been submitted.\n"
 "Reloading all tabs will discard these changes."
@@ -679,324 +707,319 @@ msgstr ""
 "此标签包含尚未提交的更改。\n"
 "重新装入全部标签将会丢弃这些更改。"
 
-#: konq_mainwindow.cc:2878
+#: konq_mainwindow.cc:2977
 #, c-format
 msgid "No permissions to write to %1"
 msgstr "没有写入 %1 的权限"
 
-#: konq_mainwindow.cc:2888
+#: konq_mainwindow.cc:2987
 msgid "Enter Target"
 msgstr "输入目标"
 
-#: konq_mainwindow.cc:2897
+#: konq_mainwindow.cc:2996
 msgid "<qt><b>%1</b> is not valid</qt>"
 msgstr "<qt><b>%1</b> 是无效的</qt>"
 
-#: konq_mainwindow.cc:2913
+#: konq_mainwindow.cc:3012
 msgid "Copy selected files from %1 to:"
 msgstr "将选中文件从 %1 复制到："
 
-#: konq_mainwindow.cc:2923
+#: konq_mainwindow.cc:3022
 msgid "Move selected files from %1 to:"
 msgstr "将选中文件从 %1 移动到："
 
-#: konq_mainwindow.cc:3705
+#: konq_mainwindow.cc:3806
 msgid "&Edit File Type..."
 msgstr "编辑文件类型(&E)..."
 
-#: konq_mainwindow.cc:3707 sidebar/trees/history_module/history_module.cpp:78
+#: konq_mainwindow.cc:3808 sidebar/trees/history_module/history_module.cpp:78
 msgid "New &Window"
 msgstr "新建窗口(&W)"
 
-#: konq_mainwindow.cc:3708
+#: konq_mainwindow.cc:3809
 msgid "&Duplicate Window"
 msgstr "复制窗口(&D)"
 
-#: konq_mainwindow.cc:3709
+#: konq_mainwindow.cc:3810
 msgid "Send &Link Address..."
 msgstr "发送链接地址(&L)..."
 
-#: konq_mainwindow.cc:3710
+#: konq_mainwindow.cc:3811
 msgid "S&end File..."
 msgstr "发送文件(&E)..."
 
-#: konq_mainwindow.cc:3713
+#: konq_mainwindow.cc:3814
 msgid "Open &Terminal"
 msgstr "打开终端(&T)"
 
-#: konq_mainwindow.cc:3715
+#: konq_mainwindow.cc:3816
 msgid "&Open Location..."
 msgstr "打开位置(&O)..."
 
-#: konq_mainwindow.cc:3717
+#: konq_mainwindow.cc:3818
 msgid "&Find File..."
 msgstr "查找文件(&F)..."
 
-#: konq_mainwindow.cc:3722
+#: konq_mainwindow.cc:3823
 msgid "&Use index.html"
 msgstr "使用 index.html(&U)"
 
-#: konq_mainwindow.cc:3723
+#: konq_mainwindow.cc:3824
 msgid "Lock to Current Location"
 msgstr "锁定到当前位置"
 
-#: konq_mainwindow.cc:3724
+#: konq_mainwindow.cc:3825
 msgid "Lin&k View"
 msgstr "链接视图(&K)"
 
-#: konq_mainwindow.cc:3727
+#: konq_mainwindow.cc:3828
 msgid "&Up"
 msgstr "向上(&U)"
 
-#: konq_mainwindow.cc:3746 konq_mainwindow.cc:3765
+#: konq_mainwindow.cc:3847 konq_mainwindow.cc:3866
 msgid "History"
 msgstr "历史"
 
-#: konq_mainwindow.cc:3750
+#: konq_mainwindow.cc:3851
 msgid "Home"
 msgstr "主页"
 
-#: konq_mainwindow.cc:3754
+#: konq_mainwindow.cc:3855
 msgid "S&ystem"
 msgstr "系统(&Y)"
 
-#: konq_mainwindow.cc:3755
+#: konq_mainwindow.cc:3856
 msgid "App&lications"
 msgstr "应用程序(&L)"
 
-#: konq_mainwindow.cc:3756
+#: konq_mainwindow.cc:3857
 msgid "&Storage Media"
 msgstr "存储介质(&S)"
 
-#: konq_mainwindow.cc:3757
+#: konq_mainwindow.cc:3858
 msgid "&Network Folders"
 msgstr "网络文件夹(&N)"
 
-#: konq_mainwindow.cc:3758
+#: konq_mainwindow.cc:3859
 msgid "Sett&ings"
 msgstr "设置(&I)"
 
-#: about/konq_aboutpage.cc:136 konq_mainwindow.cc:3760
+#: about/konq_aboutpage.cc:163 konq_mainwindow.cc:3861
 msgid "Trash"
 msgstr "回收站"
 
-#: konq_mainwindow.cc:3761
+#: konq_mainwindow.cc:3862
 msgid "Autostart"
 msgstr "自动启动"
 
-#: konq_mainwindow.cc:3762
+#: konq_mainwindow.cc:3863
 msgid "Most Often Visited"
 msgstr "最经常访问的"
 
-#: konq_mainwindow.cc:3769 konq_mainwindow.cc:4335
+#: konq_mainwindow.cc:3870 konq_mainwindow.cc:4422
 msgid "&Save View Profile..."
 msgstr "保存视图配置文件(&S)..."
 
-#: konq_mainwindow.cc:3770
+#: konq_mainwindow.cc:3871
 msgid "Save View Changes per &Folder"
 msgstr "为每个文件夹保存视图更改(&F)"
 
-#: konq_mainwindow.cc:3772
+#: konq_mainwindow.cc:3873
 msgid "Remove Folder Properties"
 msgstr "删除文件夹属性"
 
-#: konq_mainwindow.cc:3792
+#: konq_mainwindow.cc:3893
 msgid "Configure Extensions..."
 msgstr "配置扩展..."
 
-#: konq_mainwindow.cc:3793
+#: konq_mainwindow.cc:3894
 msgid "Configure Spell Checking..."
 msgstr "配置拼写检查..."
 
-#: konq_mainwindow.cc:3796
+#: konq_mainwindow.cc:3897
 msgid "Split View &Left/Right"
 msgstr "垂直拆分视图(&L)"
 
-#: konq_mainwindow.cc:3797
+#: konq_mainwindow.cc:3898
 msgid "Split View &Top/Bottom"
 msgstr "水平拆分视图(&T)"
 
-#: konq_mainwindow.cc:3798 konq_tabs.cc:84
+#: konq_mainwindow.cc:3899 konq_tabs.cc:93
 msgid "&New Tab"
 msgstr "新建标签(&N)"
 
-#: konq_mainwindow.cc:3799
+#: konq_mainwindow.cc:3900
 msgid "&Duplicate Current Tab"
 msgstr "复制当前标签(&D)"
 
-#: konq_mainwindow.cc:3800
+#: konq_mainwindow.cc:3901
 msgid "Detach Current Tab"
 msgstr "漂移当前标签"
 
-#: konq_mainwindow.cc:3801
+#: konq_mainwindow.cc:3902
 msgid "&Close Active View"
 msgstr "关闭活动视图(&C)"
 
-#: konq_mainwindow.cc:3802
+#: konq_mainwindow.cc:3903
 msgid "Close Current Tab"
 msgstr "关闭当前标签"
 
-#: konq_mainwindow.cc:3805
+#: konq_mainwindow.cc:3906
 msgid "Activate Next Tab"
 msgstr "激活下一标签"
 
-#: konq_mainwindow.cc:3806
+#: konq_mainwindow.cc:3907
 msgid "Activate Previous Tab"
 msgstr "激活上一标签"
 
-#: konq_mainwindow.cc:3811
+#: konq_mainwindow.cc:3912
 #, c-format
 msgid "Activate Tab %1"
 msgstr "激活第 %1 个标签"
 
-#: konq_mainwindow.cc:3814
+#: konq_mainwindow.cc:3915
 msgid "Move Tab Left"
 msgstr "向左移动标签"
 
-#: konq_mainwindow.cc:3815
+#: konq_mainwindow.cc:3916
 msgid "Move Tab Right"
 msgstr "向右移动标签"
 
-#: konq_mainwindow.cc:3818
+#: konq_mainwindow.cc:3919
 msgid "Dump Debug Info"
 msgstr "转存调试信息"
 
-#: konq_mainwindow.cc:3821
+#: konq_mainwindow.cc:3922
 msgid "C&onfigure View Profiles..."
 msgstr "配置视图配置文件(&O)..."
 
-#: konq_mainwindow.cc:3822
+#: konq_mainwindow.cc:3923
 msgid "Load &View Profile"
 msgstr "装入视图配置文件(&V)"
 
-#: konq_mainwindow.cc:3835 konq_tabs.cc:399
+#: konq_mainwindow.cc:3936 konq_tabs.cc:474
 msgid "&Reload All Tabs"
 msgstr "刷新全部标签(&R)"
 
-#: konq_mainwindow.cc:3850
+#: konq_mainwindow.cc:3938
+#, fuzzy
+msgid "&Reload/Stop"
+msgstr "刷新标签(&R)"
+
+#: konq_mainwindow.cc:3953
 msgid "&Stop"
 msgstr "停止(&S)"
 
-#: konq_mainwindow.cc:3852
+#: konq_mainwindow.cc:3955
 msgid "&Rename"
 msgstr "重命名(&R)"
 
-#: konq_mainwindow.cc:3853
+#: konq_mainwindow.cc:3956
 msgid "&Move to Trash"
 msgstr "移动到回收站(&M)"
 
-#: konq_mainwindow.cc:3859
+#: konq_mainwindow.cc:3962
+msgid "Copy &Files..."
+msgstr "复制文件(&F)..."
+
+#: konq_mainwindow.cc:3963
+msgid "M&ove Files..."
+msgstr "移动文件(&O)..."
+
+#: konq_mainwindow.cc:3965
+msgid "Create Folder..."
+msgstr "创建文件夹..."
+
+#: konq_mainwindow.cc:3966
 msgid "Animated Logo"
 msgstr "动画标志"
 
-#: konq_mainwindow.cc:3862 konq_mainwindow.cc:3863
+#: konq_mainwindow.cc:3969 konq_mainwindow.cc:3970
 msgid "L&ocation: "
 msgstr "位置(&O)："
 
-#: konq_mainwindow.cc:3866
+#: konq_mainwindow.cc:3973
 msgid "Location Bar"
 msgstr "位置栏"
 
-#: konq_mainwindow.cc:3871
+#: konq_mainwindow.cc:3978
 msgid "Location Bar<p>Enter a web address or search term."
 msgstr "位置栏<p>输入网页位置或者搜索词条。"
 
-#: konq_mainwindow.cc:3874
+#: konq_mainwindow.cc:3981
 msgid "Clear Location Bar"
 msgstr "清除位置栏"
 
-#: konq_mainwindow.cc:3879
+#: konq_mainwindow.cc:3986
 msgid "Clear Location bar<p>Clears the content of the location bar."
 msgstr "清除位置栏<p>清除位置栏中的内容。"
 
-#: konq_mainwindow.cc:3902
+#: konq_mainwindow.cc:4009
 msgid "Bookmark This Location"
 msgstr "将此位置添加为书签"
 
-#: konq_mainwindow.cc:3906
+#: konq_mainwindow.cc:4013
 msgid "Kon&queror Introduction"
 msgstr "Konqueror 介绍(&Q)"
 
-#: konq_mainwindow.cc:3908
+#: konq_mainwindow.cc:4015
 msgid "Go"
 msgstr "转到"
 
-#: konq_mainwindow.cc:3909
+#: konq_mainwindow.cc:4016
 msgid "Go<p>Goes to the page that has been entered into the location bar."
 msgstr "转到<p>转到在位置栏中输入的位置所指定的页面。"
 
-#: konq_mainwindow.cc:3915
+#: konq_mainwindow.cc:4022
 msgid ""
 "Enter the parent folder"
 "<p>For instance, if the current location is file:/home/%1 clicking this button "
 "will take you to file:/home."
 msgstr "进入父文件夹<p>例如，如果当前位置是 file:/home/%1，单击此按钮将进入 file:/home。"
 
-#: konq_mainwindow.cc:3918
+#: konq_mainwindow.cc:4025
 msgid "Enter the parent folder"
 msgstr "进入父文件夹"
 
-#: konq_mainwindow.cc:3920
+#: konq_mainwindow.cc:4027
 msgid "Move backwards one step in the browsing history<p>"
 msgstr "在浏览历史中向后退一步<p>"
 
-#: konq_mainwindow.cc:3921
+#: konq_mainwindow.cc:4028
 msgid "Move backwards one step in the browsing history"
 msgstr "在浏览历史中向后退一步"
 
-#: konq_mainwindow.cc:3923
+#: konq_mainwindow.cc:4030
 msgid "Move forward one step in the browsing history<p>"
 msgstr "在浏览历史中向前进一步<p>"
 
-#: konq_mainwindow.cc:3924
+#: konq_mainwindow.cc:4031
 msgid "Move forward one step in the browsing history"
 msgstr "在浏览历史中向后退一步"
 
-#: konq_mainwindow.cc:3926
+#: konq_mainwindow.cc:4033
 msgid ""
 "Navigate to your 'Home Location'"
 "<p>You can configure the location this button takes you to in the <b>"
 "Trinity Control Center</b>, under <b>File Manager</b>/<b>Behavior</b>."
 msgstr "前往您的“主页”<p>您可以在<b>TDE 控制中心</b>的<b>文件管理器</b>/<b>行为</b>中配置此按钮将带您前往的位置。"
 
-#: konq_mainwindow.cc:3929
+#: konq_mainwindow.cc:4036
 msgid "Navigate to your 'Home Location'"
 msgstr "前往您的“主页”"
 
-#: konq_mainwindow.cc:3931
-msgid ""
-"Reload the currently displayed document"
-"<p>This may, for example, be needed to refresh webpages that have been modified "
-"since they were loaded, in order to make the changes visible."
-msgstr "重新装入当前显示的文档<p>例如，此功能可用于刷新自上次装入后修改过的网页，以便反映最新的变化。"
-
-#: konq_mainwindow.cc:3934
-msgid "Reload the currently displayed document"
-msgstr "重新装入目前显示的文档"
-
-#: konq_mainwindow.cc:3936
+#: konq_mainwindow.cc:4043
 msgid ""
 "Reload all currently displayed documents in tabs"
 "<p>This may, for example, be needed to refresh webpages that have been modified "
 "since they were loaded, in order to make the changes visible."
 msgstr "重新装入当前显示的文档<p>例如，此功能可用于刷新自上次装入后修改过的网页，以便反映最新的变化。"
 
-#: konq_mainwindow.cc:3939
+#: konq_mainwindow.cc:4046
 msgid "Reload all currently displayed document in tabs"
 msgstr "重新装入目前在标签中显示的文档"
 
-#: konq_mainwindow.cc:3941
-msgid ""
-"Stop loading the document"
-"<p>All network transfers will be stopped and Konqueror will display the content "
-"that has been received so far."
-msgstr "停止装入文档<p>所有网络传输都会停止，Konqueror 将显示已经接受到的文档内容。"
-
-#: konq_mainwindow.cc:3944
-msgid "Stop loading the document"
-msgstr "停止装入文件"
-
-#: konq_mainwindow.cc:3946
+#: konq_mainwindow.cc:4053
 msgid ""
 "Cut the currently selected text or item(s) and move it to the system clipboard"
 "<p> This makes it available to the <b>Paste</b> command in Konqueror and other "
@@ -1005,32 +1028,32 @@ msgstr ""
 "将当前选中的文字或项目剪切并移动到系统剪贴板中"
 "<p>这使得您可以稍候在 Konqueror 和其它 TDE 应用程序中使用<b>粘贴</b>命令。"
 
-#: konq_mainwindow.cc:3950
+#: konq_mainwindow.cc:4057
 msgid "Move the selected text or item(s) to the clipboard"
 msgstr "将选中的文字或项目移动到剪贴板"
 
-#: konq_mainwindow.cc:3952
+#: konq_mainwindow.cc:4059
 msgid ""
 "Copy the currently selected text or item(s) to the system clipboard"
 "<p>This makes it available to the <b>Paste</b> command in Konqueror and other "
 "TDE applications."
 msgstr "将当前选中的文字或项目复制到系统剪贴板中<p>这使得您可以稍候在 Konqueror 和其它 TDE 应用程序中使用<b>粘贴</b>命令。"
 
-#: konq_mainwindow.cc:3956
+#: konq_mainwindow.cc:4063
 msgid "Copy the selected text or item(s) to the clipboard"
 msgstr "将选中的文字或项目复制到剪贴板"
 
-#: konq_mainwindow.cc:3958
+#: konq_mainwindow.cc:4065
 msgid ""
 "Paste the previously cut or copied clipboard contents"
 "<p>This also works for text copied or cut from other TDE applications."
 msgstr "粘贴先前剪切或复制的剪贴板内容<p>这也适用于从其它 TDE 应用程序中复制或剪切的文字。"
 
-#: konq_mainwindow.cc:3961
+#: konq_mainwindow.cc:4068
 msgid "Paste the clipboard contents"
 msgstr "粘贴剪贴板内容"
 
-#: konq_mainwindow.cc:3963
+#: konq_mainwindow.cc:4070
 msgid ""
 "Print the currently displayed document"
 "<p>You will be presented with a dialog where you can set various options, such "
@@ -1042,107 +1065,106 @@ msgstr ""
 "<p>选择此功能后将出现一个对话框，其中您可以设置各种选项，如打印副本的数量和要使用的打印机。"
 "<p>此对话框也可访问特殊的 TDE 打印服务，如从当前文档创建 PDF 文件。"
 
-#: konq_mainwindow.cc:3969
+#: konq_mainwindow.cc:4076
 msgid "Print the current document"
 msgstr "打印当前文档"
 
-#: konq_mainwindow.cc:3975
+#: konq_mainwindow.cc:4082
 msgid "If present, open index.html when entering a folder."
 msgstr "在进入文件夹时，如果存在 index.html 则打开它。"
 
-#: konq_mainwindow.cc:3976
+#: konq_mainwindow.cc:4083
 msgid ""
 "A locked view cannot change folders. Use in combination with 'link view' to "
 "explore many files from one folder"
 msgstr "一个锁定的视图不能更改文件夹。请和“链接视图”一起使用来从一个文件夹中查看多个文件"
 
-#: konq_mainwindow.cc:3977
+#: konq_mainwindow.cc:4084
 msgid ""
 "Sets the view as 'linked'. A linked view follows folder changes made in other "
 "linked views."
 msgstr "设置视图为“被链接的”。一个被链接的视图随其它被链接的视图中文件夹的修改而更改。"
 
-#: konq_mainwindow.cc:4001
+#: konq_mainwindow.cc:4108
 #: sidebar/trees/bookmark_module/bookmark_module.cpp:71
 msgid "Open Folder in Tabs"
 msgstr "在标签中打开文件夹"
 
-#: konq_mainwindow.cc:4006
+#: konq_mainwindow.cc:4113
 #: sidebar/trees/bookmark_module/bookmark_module.cpp:67
-#: sidebar/trees/konq_sidebartree.cpp:913
+#: sidebar/trees/konq_sidebartree.cpp:924
 msgid "Open in New Window"
 msgstr "在新窗口中打开"
 
-#: konq_mainwindow.cc:4007
+#: konq_mainwindow.cc:4114
 #: sidebar/trees/bookmark_module/bookmark_module.cpp:69
-#: sidebar/trees/konq_sidebartree.cpp:915
+#: sidebar/trees/konq_sidebartree.cpp:926
 msgid "Open in New Tab"
 msgstr "在新标签中打开"
 
-#: konq_mainwindow.cc:4175
-msgid "Copy &Files..."
-msgstr "复制文件(&F)..."
-
-#: konq_mainwindow.cc:4176
-msgid "M&ove Files..."
-msgstr "移动文件(&O)..."
-
-#: konq_mainwindow.cc:4180
-msgid "Create Folder..."
-msgstr "创建文件夹..."
-
-#: konq_mainwindow.cc:4334
+#: konq_mainwindow.cc:4421
 msgid "&Save View Profile \"%1\"..."
 msgstr "保存视图配置文件“%1”(&S)..."
 
-#: konq_mainwindow.cc:4674
+#: konq_mainwindow.cc:4762
 msgid "Open in T&his Window"
 msgstr "在此窗口中打开(&T)"
 
-#: konq_mainwindow.cc:4675
+#: konq_mainwindow.cc:4763
 msgid "Open the document in current window"
 msgstr "在当前窗口中打开文档"
 
-#: konq_mainwindow.cc:4677 sidebar/web_module/web_module.h:55
+#: konq_mainwindow.cc:4765 sidebar/web_module/web_module.h:55
 #: sidebar/web_module/web_module.h:58
 msgid "Open in New &Window"
 msgstr "在新窗口中打开(&W)"
 
-#: konq_mainwindow.cc:4678
+#: konq_mainwindow.cc:4766
 msgid "Open the document in a new window"
 msgstr "在新窗口中打开文档"
 
-#: konq_mainwindow.cc:4688
+#: konq_mainwindow.cc:4776 konq_mainwindow.cc:4780
+#, fuzzy
+msgid "Open in &Background Tab"
+msgstr "在新建标签中打开(&N)"
+
+#: konq_mainwindow.cc:4777 konq_mainwindow.cc:4782
+#, fuzzy
+msgid "Open the document in a new background tab"
+msgstr "在新标签中打开文档"
+
+#: konq_mainwindow.cc:4778 konq_mainwindow.cc:4781
 msgid "Open in &New Tab"
 msgstr "在新建标签中打开(&N)"
 
-#: konq_mainwindow.cc:4689
-msgid "Open the document in a new tab"
+#: konq_mainwindow.cc:4779 konq_mainwindow.cc:4783
+#, fuzzy
+msgid "Open the document in a new foreground tab"
 msgstr "在新标签中打开文档"
 
-#: konq_mainwindow.cc:4929
+#: konq_mainwindow.cc:5025
 #, c-format
 msgid "Open with %1"
 msgstr "用 %1 打开"
 
-#: konq_mainwindow.cc:4986
+#: konq_mainwindow.cc:5082
 msgid "&View Mode"
 msgstr "视图模式(&V)"
 
-#: konq_mainwindow.cc:5196
+#: konq_mainwindow.cc:5291
 msgid ""
 "You have multiple tabs open in this window, are you sure you want to quit?"
 msgstr "您在此窗口内有多个标签，您确定要关闭窗口吗？"
 
-#: konq_mainwindow.cc:5198 konq_viewmgr.cc:1147
+#: konq_mainwindow.cc:5293 konq_viewmgr.cc:1153
 msgid "Confirmation"
 msgstr "确认"
 
-#: konq_mainwindow.cc:5200
+#: konq_mainwindow.cc:5295
 msgid "C&lose Current Tab"
 msgstr "关闭当前标签(&L)"
 
-#: konq_mainwindow.cc:5232
+#: konq_mainwindow.cc:5327
 msgid ""
 "This tab contains changes that have not been submitted.\n"
 "Closing the window will discard these changes."
@@ -1150,7 +1172,7 @@ msgstr ""
 "此标签包含尚未提交的更改。\n"
 "关闭窗口将会丢弃这些更改。"
 
-#: konq_mainwindow.cc:5250
+#: konq_mainwindow.cc:5345
 msgid ""
 "This page contains changes that have not been submitted.\n"
 "Closing the window will discard these changes."
@@ -1158,20 +1180,20 @@ msgstr ""
 "此页面包含尚未提交的更改。\n"
 "关闭窗口将会丢弃这些更改。"
 
-#: konq_mainwindow.cc:5342
+#: konq_mainwindow.cc:5437
 msgid ""
 "Your sidebar is not functional or unavailable. A new entry cannot be added."
 msgstr "您的侧边栏没有功能或不可用。新的项目无法被添加。"
 
-#: konq_mainwindow.cc:5342 konq_mainwindow.cc:5349
+#: konq_mainwindow.cc:5437 konq_mainwindow.cc:5444
 msgid "Web Sidebar"
 msgstr "Web 侧边栏"
 
-#: konq_mainwindow.cc:5347
+#: konq_mainwindow.cc:5442
 msgid "Add new web extension \"%1\" to your sidebar?"
 msgstr "要给您的侧边栏添加新的 Web 扩展“%1”吗？"
 
-#: konq_mainwindow.cc:5349
+#: konq_mainwindow.cc:5444
 msgid "Do Not Add"
 msgstr "不添加"
 
@@ -1199,7 +1221,7 @@ msgstr "在配置中保存 URL(&U)"
 msgid "Save &window size in profile"
 msgstr "在配置中保存窗口大小(&W)"
 
-#: konq_tabs.cc:65
+#: konq_tabs.cc:74
 msgid ""
 "This bar contains the list of currently open tabs. Click on a tab to make it "
 "active. The option to show a close button instead of the website icon in the "
@@ -1211,31 +1233,41 @@ msgstr ""
 "此栏包含目前打开的标签列表。单击标签可激活该标签。在标签左上角显示关闭按钮而非网站图标这一选项是可配置的。您还可以使用键盘快捷键在标签间导航。标签上的文字是该标"
 "签所打开的网站标题，如果该标题太长以致无法完全显示下的话，将您的鼠标指向标签可查看完整标题。"
 
-#: konq_tabs.cc:89
+#: konq_tabs.cc:98
 msgid "&Reload Tab"
 msgstr "刷新标签(&R)"
 
-#: konq_tabs.cc:94
+#: konq_tabs.cc:103
 msgid "&Duplicate Tab"
 msgstr "复制标签(&D)"
 
-#: konq_tabs.cc:100
+#: konq_tabs.cc:109
 msgid "D&etach Tab"
 msgstr "漂移标签(&E)"
 
-#: konq_tabs.cc:107
+#: konq_tabs.cc:116
+#, fuzzy
+msgid "Move Tab &Left"
+msgstr "向左移动标签"
+
+#: konq_tabs.cc:122
+#, fuzzy
+msgid "Move Tab &Right"
+msgstr "向右移动标签"
+
+#: konq_tabs.cc:129
 msgid "Other Tabs"
 msgstr "其它标签"
 
-#: konq_tabs.cc:112
+#: konq_tabs.cc:134
 msgid "&Close Tab"
 msgstr "关闭标签(&C)"
 
-#: konq_tabs.cc:144
+#: konq_tabs.cc:166
 msgid "Open a new tab"
 msgstr "打开一个新标签"
 
-#: konq_tabs.cc:153
+#: konq_tabs.cc:175
 msgid "Close the current tab"
 msgstr "关闭当前标签"
 
@@ -1250,7 +1282,7 @@ msgstr "您试图查看的页面是表单数据提交的结果。如果您重新
 msgid "Resend"
 msgstr "重新发送"
 
-#: konq_viewmgr.cc:1145
+#: konq_viewmgr.cc:1151
 msgid ""
 "You have multiple tabs open in this window.\n"
 "Loading a view profile will close them."
@@ -1258,11 +1290,11 @@ msgstr ""
 "您在此窗口内打开了多个标签。\n"
 "装入配置文件将会全部关闭。"
 
-#: konq_viewmgr.cc:1148
+#: konq_viewmgr.cc:1154
 msgid "Load View Profile"
 msgstr "装入视图配置文件"
 
-#: konq_viewmgr.cc:1164
+#: konq_viewmgr.cc:1170
 msgid ""
 "This tab contains changes that have not been submitted.\n"
 "Loading a profile will discard these changes."
@@ -1270,7 +1302,7 @@ msgstr ""
 "此标签包含尚未提交的更改。\n"
 "装入配置文件将会丢弃这些更改。"
 
-#: konq_viewmgr.cc:1182
+#: konq_viewmgr.cc:1188
 msgid ""
 "This page contains changes that have not been submitted.\n"
 "Loading a profile will discard these changes."
@@ -1278,107 +1310,111 @@ msgstr ""
 "此页面包含尚未提交的更改。\n"
 "装入配置文件将会丢弃这些更改。"
 
-#: iconview/konq_iconview.cc:212 listview/konq_listview.cc:674
+#: iconview/konq_iconview.cc:214 listview/konq_listview.cc:702
 msgid "Show &Hidden Files"
 msgstr "显示隐藏文件(&H)"
 
-#: iconview/konq_iconview.cc:215
+#: iconview/konq_iconview.cc:217
 msgid "Toggle displaying of hidden dot files"
 msgstr "切换显示隐藏的文件"
 
-#: iconview/konq_iconview.cc:217
+#: iconview/konq_iconview.cc:219
 msgid "&Folder Icons Reflect Contents"
 msgstr "文件夹图标反映内容(&F)"
 
-#: iconview/konq_iconview.cc:220
+#: iconview/konq_iconview.cc:222
+msgid "&Media Icons Reflect Free Space"
+msgstr ""
+
+#: iconview/konq_iconview.cc:225
 msgid "&Preview"
 msgstr "预览(&P)"
 
-#: iconview/konq_iconview.cc:222
+#: iconview/konq_iconview.cc:227
 msgid "Enable Previews"
 msgstr "启用预览"
 
-#: iconview/konq_iconview.cc:223
+#: iconview/konq_iconview.cc:228
 msgid "Disable Previews"
 msgstr "禁用预览"
 
-#: iconview/konq_iconview.cc:243
+#: iconview/konq_iconview.cc:248
 msgid "Sound Files"
 msgstr "声音文件"
 
-#: iconview/konq_iconview.cc:250
+#: iconview/konq_iconview.cc:255
 msgid "By Name (Case Sensitive)"
 msgstr "按名称(区分大小写)"
 
-#: iconview/konq_iconview.cc:251
+#: iconview/konq_iconview.cc:256
 msgid "By Name (Case Insensitive)"
 msgstr "按名称(不分大小写)"
 
-#: iconview/konq_iconview.cc:252
+#: iconview/konq_iconview.cc:257
 msgid "By Size"
 msgstr "按大小"
 
-#: iconview/konq_iconview.cc:253
+#: iconview/konq_iconview.cc:258
 msgid "By Type"
 msgstr "按类型"
 
-#: iconview/konq_iconview.cc:254
+#: iconview/konq_iconview.cc:259
 msgid "By Date"
 msgstr "按日期"
 
-#: iconview/konq_iconview.cc:279
+#: iconview/konq_iconview.cc:284
 msgid "Folders First"
 msgstr "文件夹在前"
 
-#: iconview/konq_iconview.cc:280
+#: iconview/konq_iconview.cc:285
 msgid "Descending"
 msgstr "降序"
 
-#: iconview/konq_iconview.cc:305 listview/konq_listview.cc:668
+#: iconview/konq_iconview.cc:310 listview/konq_listview.cc:680
 msgid "Se&lect..."
 msgstr "选择(&L)..."
 
-#: iconview/konq_iconview.cc:307 listview/konq_listview.cc:669
+#: iconview/konq_iconview.cc:312 listview/konq_listview.cc:681
 msgid "Unselect..."
 msgstr "取消选择..."
 
-#: iconview/konq_iconview.cc:310 listview/konq_listview.cc:671
+#: iconview/konq_iconview.cc:315 listview/konq_listview.cc:683
 msgid "Unselect All"
 msgstr "全部不选"
 
-#: iconview/konq_iconview.cc:312 listview/konq_listview.cc:672
+#: iconview/konq_iconview.cc:317 listview/konq_listview.cc:684
 msgid "&Invert Selection"
 msgstr "反转选择(&I)"
 
-#: iconview/konq_iconview.cc:316
+#: iconview/konq_iconview.cc:321
 msgid "Allows selecting of file or folder items based on a given mask"
 msgstr "允许按所给的通配符来选择文件或文件夹项"
 
-#: iconview/konq_iconview.cc:317
+#: iconview/konq_iconview.cc:322
 msgid "Allows unselecting of file or folder items based on a given mask"
 msgstr "允许按所给的通配符来取消选择文件或文件夹项"
 
-#: iconview/konq_iconview.cc:318
+#: iconview/konq_iconview.cc:323
 msgid "Selects all items"
 msgstr "选中全部项目"
 
-#: iconview/konq_iconview.cc:319
+#: iconview/konq_iconview.cc:324
 msgid "Unselects all selected items"
 msgstr "取消选中全部项目"
 
-#: iconview/konq_iconview.cc:320
+#: iconview/konq_iconview.cc:325
 msgid "Inverts the current selection of items"
 msgstr "反转当前选择的项目"
 
-#: iconview/konq_iconview.cc:524 listview/konq_listview.cc:370
+#: iconview/konq_iconview.cc:550 listview/konq_listview.cc:382
 msgid "Select files:"
 msgstr "选中文件："
 
-#: iconview/konq_iconview.cc:551 listview/konq_listview.cc:401
+#: iconview/konq_iconview.cc:577 listview/konq_listview.cc:413
 msgid "Unselect files:"
 msgstr "不选文件："
 
-#: iconview/konq_iconview.cc:755
+#: iconview/konq_iconview.cc:781
 msgid ""
 "You cannot drop any items in a directory in which you do not have write "
 "permission"
@@ -1392,144 +1428,172 @@ msgstr "查看为(&A)"
 msgid "Filename"
 msgstr "文件名"
 
-#: listview/konq_listview.cc:267
+#: listview/konq_listview.cc:275
 msgid "MimeType"
 msgstr "MIME 类型"
 
-#: listview/konq_listview.cc:268
+#: listview/konq_listview.cc:276
 msgid "Size"
 msgstr "大小"
 
-#: listview/konq_listview.cc:269
+#: listview/konq_listview.cc:277
 msgid "Modified"
 msgstr "修改时间"
 
-#: listview/konq_listview.cc:270
+#: listview/konq_listview.cc:278
 msgid "Accessed"
 msgstr "访问时间"
 
-#: listview/konq_listview.cc:271
+#: listview/konq_listview.cc:279
 msgid "Created"
 msgstr "创建时间"
 
-#: listview/konq_listview.cc:272
+#: listview/konq_listview.cc:280
 msgid "Permissions"
 msgstr "权限"
 
-#: listview/konq_listview.cc:273
+#: listview/konq_listview.cc:281
 msgid "Owner"
 msgstr "属主"
 
-#: listview/konq_listview.cc:274
+#: listview/konq_listview.cc:282
 msgid "Group"
 msgstr "组"
 
-#: listview/konq_listview.cc:275
+#: listview/konq_listview.cc:283
 msgid "Link"
 msgstr "链接"
 
 #: keditbookmarks/bookmarkinfo.cpp:196 keditbookmarks/listview.cpp:581
-#: keditbookmarks/listview.cpp:703 listview/konq_listview.cc:276
+#: keditbookmarks/listview.cpp:703 listview/konq_listview.cc:284
 msgid "URL"
 msgstr "URL"
 
-#: listview/konq_listview.cc:278
+#: listview/konq_listview.cc:286
 msgid "File Type"
 msgstr "文件类型"
 
-#: listview/konq_listview.cc:646
+#: listview/konq_listview.cc:658
 msgid "Show &Modification Time"
 msgstr "显示修改时间(&M)"
 
-#: listview/konq_listview.cc:647
+#: listview/konq_listview.cc:659
 msgid "Hide &Modification Time"
 msgstr "隐藏修改时间(&M)"
 
-#: listview/konq_listview.cc:648
+#: listview/konq_listview.cc:660
 msgid "Show &File Type"
 msgstr "显示文件类型(&F)"
 
-#: listview/konq_listview.cc:649
+#: listview/konq_listview.cc:661
 msgid "Hide &File Type"
 msgstr "隐藏文件类型(&F)"
 
-#: listview/konq_listview.cc:650
+#: listview/konq_listview.cc:662
 msgid "Show MimeType"
 msgstr "显示 MIME 类型"
 
-#: listview/konq_listview.cc:651
+#: listview/konq_listview.cc:663
 msgid "Hide MimeType"
 msgstr "隐藏 MIME 类型"
 
-#: listview/konq_listview.cc:652
+#: listview/konq_listview.cc:664
 msgid "Show &Access Time"
 msgstr "显示访问时间(&A)"
 
-#: listview/konq_listview.cc:653
+#: listview/konq_listview.cc:665
 msgid "Hide &Access Time"
 msgstr "隐藏访问时间(&A)"
 
-#: listview/konq_listview.cc:654
+#: listview/konq_listview.cc:666
 msgid "Show &Creation Time"
 msgstr "显示创建时间(&C)"
 
-#: listview/konq_listview.cc:655
+#: listview/konq_listview.cc:667
 msgid "Hide &Creation Time"
 msgstr "隐藏创建时间(&C)"
 
-#: listview/konq_listview.cc:656
+#: listview/konq_listview.cc:668
 msgid "Show &Link Destination"
 msgstr "显示链接目标(&L)"
 
-#: listview/konq_listview.cc:657
+#: listview/konq_listview.cc:669
 msgid "Hide &Link Destination"
 msgstr "隐藏链接目标(&L)"
 
-#: listview/konq_listview.cc:658
+#: listview/konq_listview.cc:670
 msgid "Show Filesize"
 msgstr "显示文件大小"
 
-#: listview/konq_listview.cc:659
+#: listview/konq_listview.cc:671
 msgid "Hide Filesize"
 msgstr "隐藏文件大小"
 
-#: listview/konq_listview.cc:660
+#: listview/konq_listview.cc:672
 msgid "Show Owner"
 msgstr "显示属主"
 
-#: listview/konq_listview.cc:661
+#: listview/konq_listview.cc:673
 msgid "Hide Owner"
 msgstr "隐藏属主"
 
-#: listview/konq_listview.cc:662
+#: listview/konq_listview.cc:674
 msgid "Show Group"
 msgstr "显示组"
 
-#: listview/konq_listview.cc:663
+#: listview/konq_listview.cc:675
 msgid "Hide Group"
 msgstr "隐藏组"
 
-#: listview/konq_listview.cc:664
+#: listview/konq_listview.cc:676
 msgid "Show Permissions"
 msgstr "显示权限"
 
-#: listview/konq_listview.cc:665
+#: listview/konq_listview.cc:677
 msgid "Hide Permissions"
 msgstr "隐藏权限"
 
-#: listview/konq_listview.cc:666
+#: listview/konq_listview.cc:678
 msgid "Show URL"
 msgstr "显示 URL"
 
-#: listview/konq_listview.cc:676
+#: listview/konq_listview.cc:689
+msgid "&Rename and move to next item"
+msgstr ""
+
+#: listview/konq_listview.cc:691
+msgid ""
+"Pressing this button completes the current rename operation,moves to the next "
+"item and starts a new rename operation."
+msgstr ""
+
+#: listview/konq_listview.cc:693
+msgid "Complete rename operation and move the next item"
+msgstr ""
+
+#: listview/konq_listview.cc:695
+msgid "&Rename and move to previous item"
+msgstr ""
+
+#: listview/konq_listview.cc:697
+msgid ""
+"Pressing this button completes the current rename operation,moves to the "
+"previous item and starts a new rename operation."
+msgstr ""
+
+#: listview/konq_listview.cc:699
+msgid "Complete rename operation and move the previous item"
+msgstr ""
+
+#: listview/konq_listview.cc:704
 msgid "Case Insensitive Sort"
 msgstr "不区分大小写排序"
 
-#: listview/konq_listviewwidget.cc:350 listview/konq_textviewwidget.cc:68
+#: listview/konq_listviewwidget.cc:355 listview/konq_textviewwidget.cc:68
 msgid "Name"
 msgstr "名称"
 
-#: listview/konq_listviewwidget.cc:909
+#: listview/konq_listviewwidget.cc:1060
 msgid "You must take the file out of the trash before being able to use it."
 msgstr "在使用回收站里面的文件之前您必须先将它移出去。"
 
@@ -1538,7 +1602,8 @@ msgid "Galeon"
 msgstr "Galeon"
 
 #: keditbookmarks/importers.h:118
-msgid "TDE"
+#, fuzzy
+msgid "KDE"
 msgstr "TDE"
 
 #: keditbookmarks/importers.h:139
@@ -1565,7 +1630,7 @@ msgstr "崩溃"
 msgid "&Show Netscape Bookmarks in Konqueror"
 msgstr "在 Konqueror 窗口中显示 Netscape 书签(&S)"
 
-#: keditbookmarks/actionsimpl.cpp:111 sidebar/trees/konq_sidebartree.cpp:907
+#: keditbookmarks/actionsimpl.cpp:111 sidebar/trees/konq_sidebartree.cpp:918
 msgid "Rename"
 msgstr "重命名"
 
@@ -1666,7 +1731,8 @@ msgid "Import &Galeon Bookmarks..."
 msgstr "导入 Galeon 书签(&G)..."
 
 #: keditbookmarks/actionsimpl.cpp:190
-msgid "Import &TDE2/TDE3 Bookmarks..."
+#, fuzzy
+msgid "Import &KDE2/KDE3 Bookmarks..."
 msgstr "导入 TDE2/TDE3 书签(&K)..."
 
 #: keditbookmarks/actionsimpl.cpp:193
@@ -1846,7 +1912,8 @@ msgid "*.xbel|Galeon Bookmark Files (*.xbel)"
 msgstr "*.xbel|Galeon 书签文件(*.xbel)"
 
 #: keditbookmarks/importers.cpp:188
-msgid "*.xml|TDE Bookmark Files (*.xml)"
+#, fuzzy
+msgid "*.xml|KDE Bookmark Files (*.xml)"
 msgstr "*.xml|TDE 书签文件(*.xml)"
 
 #: keditbookmarks/kbookmarkmerger.cpp:42
@@ -1975,7 +2042,8 @@ msgid "Konqueror Bookmarks Editor"
 msgstr "Konqueror 书签编辑器"
 
 #: keditbookmarks/main.cpp:120
-msgid "(c) 2000 - 2003, TDE developers"
+#, fuzzy
+msgid "(c) 2000 - 2003, KDE developers"
 msgstr "(c) 2000 - 2003，TDE 开发者"
 
 #: keditbookmarks/main.cpp:121
@@ -2016,128 +2084,129 @@ msgid ""
 "<br>Resets the quick search so that all bookmarks are shown again."
 msgstr "<b>重置快速搜索</b><br>重置快速搜索，以便显示全部书签。"
 
-#: keditbookmarks/toplevel.cpp:219 sidebar/trees/konqsidebar_tree.cpp:33
+#: keditbookmarks/toplevel.cpp:219 sidebar/trees/konqsidebar_tree.cpp:34
 msgid "Se&arch:"
 msgstr "搜索(&A)："
 
-#: about/konq_aboutpage.cc:112 about/konq_aboutpage.cc:114
-#: about/konq_aboutpage.cc:177 about/konq_aboutpage.cc:179
-#: about/konq_aboutpage.cc:232 about/konq_aboutpage.cc:234
-#: about/konq_aboutpage.cc:329 about/konq_aboutpage.cc:331
+#: about/konq_aboutpage.cc:139 about/konq_aboutpage.cc:141
+#: about/konq_aboutpage.cc:204 about/konq_aboutpage.cc:206
+#: about/konq_aboutpage.cc:259 about/konq_aboutpage.cc:261
+#: about/konq_aboutpage.cc:356 about/konq_aboutpage.cc:358
 msgid "Conquer your Desktop!"
 msgstr "征服您的桌面！"
 
-#: about/konq_aboutpage.cc:115 about/konq_aboutpage.cc:180
-#: about/konq_aboutpage.cc:235 about/konq_aboutpage.cc:332
+#: about/konq_aboutpage.cc:142 about/konq_aboutpage.cc:207
+#: about/konq_aboutpage.cc:262 about/konq_aboutpage.cc:359
 msgid ""
 "Konqueror is your file manager, web browser and universal document viewer."
 msgstr "Konqueror 是您的文件管理器、Web 浏览器和通用文档查看器。"
 
-#: about/konq_aboutpage.cc:116 about/konq_aboutpage.cc:181
-#: about/konq_aboutpage.cc:236 about/konq_aboutpage.cc:333
+#: about/konq_aboutpage.cc:143 about/konq_aboutpage.cc:208
+#: about/konq_aboutpage.cc:263 about/konq_aboutpage.cc:360
 msgid "Starting Points"
 msgstr "起点"
 
-#: about/konq_aboutpage.cc:117 about/konq_aboutpage.cc:182
-#: about/konq_aboutpage.cc:237 about/konq_aboutpage.cc:334
+#: about/konq_aboutpage.cc:144 about/konq_aboutpage.cc:209
+#: about/konq_aboutpage.cc:264 about/konq_aboutpage.cc:361
 msgid "Introduction"
 msgstr "介绍"
 
-#: about/konq_aboutpage.cc:118 about/konq_aboutpage.cc:183
-#: about/konq_aboutpage.cc:238 about/konq_aboutpage.cc:335
+#: about/konq_aboutpage.cc:145 about/konq_aboutpage.cc:210
+#: about/konq_aboutpage.cc:265 about/konq_aboutpage.cc:362
 msgid "Tips"
 msgstr "提示"
 
-#: about/konq_aboutpage.cc:119 about/konq_aboutpage.cc:184
-#: about/konq_aboutpage.cc:239 about/konq_aboutpage.cc:240
-#: about/konq_aboutpage.cc:336
+#: about/konq_aboutpage.cc:146 about/konq_aboutpage.cc:211
+#: about/konq_aboutpage.cc:266 about/konq_aboutpage.cc:267
+#: about/konq_aboutpage.cc:363
 msgid "Specifications"
 msgstr "技术规范"
 
-#: about/konq_aboutpage.cc:125
+#: about/konq_aboutpage.cc:152
 msgid "Your personal files"
 msgstr "您的个人文件"
 
-#: about/konq_aboutpage.cc:128
+#: about/konq_aboutpage.cc:155
 msgid "Storage Media"
 msgstr "存储介质"
 
-#: about/konq_aboutpage.cc:129
+#: about/konq_aboutpage.cc:156
 msgid "Disks and removable media"
 msgstr "磁盘和可移动介质"
 
-#: about/konq_aboutpage.cc:132
+#: about/konq_aboutpage.cc:159
 msgid "Network Folders"
 msgstr "网络文件夹"
 
-#: about/konq_aboutpage.cc:133
+#: about/konq_aboutpage.cc:160
 msgid "Shared files and folders"
 msgstr "共享的文件和文件夹"
 
-#: about/konq_aboutpage.cc:137
+#: about/konq_aboutpage.cc:164
 msgid "Browse and restore the trash"
 msgstr "浏览并恢复回收站"
 
-#: about/konq_aboutpage.cc:140
+#: about/konq_aboutpage.cc:167
 msgid "Applications"
 msgstr "应用程序"
 
-#: about/konq_aboutpage.cc:141
+#: about/konq_aboutpage.cc:168
 msgid "Installed programs"
 msgstr "已安装的程序"
 
-#: about/konq_aboutpage.cc:144
+#: about/konq_aboutpage.cc:171
 msgid "Settings"
 msgstr "设置"
 
-#: about/konq_aboutpage.cc:145
+#: about/konq_aboutpage.cc:172
 msgid "Desktop configuration"
 msgstr "桌面配置"
 
-#: about/konq_aboutpage.cc:148
+#: about/konq_aboutpage.cc:175
 msgid "Next: An Introduction to Konqueror"
 msgstr "下一页：Konqueror 介绍"
 
-#: about/konq_aboutpage.cc:150
+#: about/konq_aboutpage.cc:177
 msgid "Search the Web"
 msgstr "搜索 Web"
 
-#: about/konq_aboutpage.cc:185
+#: about/konq_aboutpage.cc:212
 msgid ""
 "Konqueror makes working with and managing your files easy. You can browse both "
 "local and networked folders while enjoying advanced features such as the "
 "powerful sidebar and file previews."
 msgstr "Konqueror 使得工作和管理文件从未如此容易。不管是本地还是网络文件夹，您都可尽享像强大的侧边栏及文件预览这样的高级特性。"
 
-#: about/konq_aboutpage.cc:189
+#: about/konq_aboutpage.cc:216
+#, fuzzy
 msgid ""
 "Konqueror is also a full featured and easy to use web browser which you can  "
 "use to explore the Internet. Enter the address (e.g. <a "
-"href=\"http://www.kde.org\">http://www.kde.org</A>) of a web page you would "
-"like to visit in the location bar and press Enter, or choose an entry from the "
-"Bookmarks menu."
+"href=\"http://www.trinitydesktop.org\">http://www.trinitydesktop.org</A>"
+") of a web page you would like to visit in the location bar and press Enter, or "
+"choose an entry from the Bookmarks menu."
 msgstr ""
 "Konqueror 还是一个全功能的 Web 浏览器。有它的日子，网上冲浪不再是一件枯燥的事情。只需在位置栏输入您要浏览的地址(例如 <a "
 "href=\"http://www.kde.org\">http://www.kde.org</a>) 并按 Enter，或者选择书签菜单中的任何一项。"
 
-#: about/konq_aboutpage.cc:194
+#: about/konq_aboutpage.cc:221
 msgid ""
 "To return to the previous location, press the back button  <img width='16' "
 "height='16' src=\"%1\"> in the toolbar. "
 msgstr "如果您要返回到上一个位置，请按工具栏中的后退按钮 <img width='16' height='16' src=\"%1\">。"
 
-#: about/konq_aboutpage.cc:197
+#: about/konq_aboutpage.cc:224
 msgid ""
 "To quickly go to your Home folder press the  home button <img width='16' "
 "height='16' src=\"%1\">."
 msgstr "要快速返回到您的主文件夹，只需单击工具栏中的主文件夹按钮 <img width='16' height='16' src=\"%1\">。"
 
-#: about/konq_aboutpage.cc:199
+#: about/konq_aboutpage.cc:226
 msgid ""
 "For more detailed documentation on Konqueror click <a href=\"%1\">here</a>."
 msgstr "如果需要有关 Konqueror 更详细的文档，请点击<a href=\"%1\">此处</a>。"
 
-#: about/konq_aboutpage.cc:201
+#: about/konq_aboutpage.cc:228
 msgid ""
 "<em>Tuning Tip:</em> If you want the Konqueror web browser to start faster, you "
 "can turn off this information screen by clicking <a href=\"%1\">here</a>"
@@ -2147,11 +2216,11 @@ msgstr ""
 "<i>调整提示：</i>如果您希望 Konqueror Web 浏览器启动更快一些，您可以单击<a href=\"%1\">此处</a>"
 "来关闭此信息。如果您想要重新启用它，请选择帮助->Konqueror 介绍菜单选项，然后按设置->保存视图配置“Web 浏览”。"
 
-#: about/konq_aboutpage.cc:206
+#: about/konq_aboutpage.cc:233
 msgid "Next: Tips &amp; Tricks"
 msgstr "下一页：技巧"
 
-#: about/konq_aboutpage.cc:241
+#: about/konq_aboutpage.cc:268
 msgid ""
 "Konqueror is designed to embrace and support Internet standards. The aim is to "
 "fully implement the officially sanctioned standards from organizations such as "
@@ -2164,54 +2233,54 @@ msgstr ""
 "这样的组织正式批准的标准，同时也加入了被作为 Internet 事实标准的其它常用特性的支持。除了支持常用图标、Internet 关键字和 <a "
 "href=\"%1\">XBEL 书签</a>等，Konqueror 也实现了："
 
-#: about/konq_aboutpage.cc:248
+#: about/konq_aboutpage.cc:275
 msgid "Web Browsing"
 msgstr "Web 浏览"
 
-#: about/konq_aboutpage.cc:249
+#: about/konq_aboutpage.cc:276
 msgid "Supported standards"
 msgstr "支持的标准"
 
-#: about/konq_aboutpage.cc:250
+#: about/konq_aboutpage.cc:277
 msgid "Additional requirements*"
 msgstr "其它需求*"
 
-#: about/konq_aboutpage.cc:251
+#: about/konq_aboutpage.cc:278
 msgid ""
 "<A HREF=\"%1\">DOM</A> (Level 1, partially Level 2) based <A HREF=\"%2\">"
 "HTML 4.01</A>"
 msgstr "基于 <A HREF=\"%1\">DOM</A>(第1级，部分的第2级)的 <A HREF=\"%2\">HTML 4.01</A>"
 
-#: about/konq_aboutpage.cc:253 about/konq_aboutpage.cc:255
-#: about/konq_aboutpage.cc:267 about/konq_aboutpage.cc:272
-#: about/konq_aboutpage.cc:274
+#: about/konq_aboutpage.cc:280 about/konq_aboutpage.cc:282
+#: about/konq_aboutpage.cc:294 about/konq_aboutpage.cc:299
+#: about/konq_aboutpage.cc:301
 msgid "built-in"
 msgstr "内建"
 
-#: about/konq_aboutpage.cc:254
+#: about/konq_aboutpage.cc:281
 msgid "<A HREF=\"%1\">Cascading Style Sheets</A> (CSS 1, partially CSS 2)"
 msgstr "<A HREF=\"%1\">层叠样式表</A>(CSS 1，部分的 CSS 2)"
 
-#: about/konq_aboutpage.cc:256
+#: about/konq_aboutpage.cc:283
 msgid "<A HREF=\"%1\">ECMA-262</A> Edition 3 (roughly equals JavaScript 1.5)"
 msgstr "<A HREF=\"%1\">ECMA-262</A> 第3版(基本相当于 JavaScript 1.5)"
 
-#: about/konq_aboutpage.cc:257
+#: about/konq_aboutpage.cc:284
 msgid ""
 "JavaScript disabled (globally). Enable JavaScript <A HREF=\"%1\">here</A>."
 msgstr "已禁用 JavaScript(全局)。在<A HREF=\"%1\">这里</A>启用 JavasSript。"
 
-#: about/konq_aboutpage.cc:258
+#: about/konq_aboutpage.cc:285
 msgid ""
 "JavaScript enabled (globally). Configure JavaScript <A HREF=\\\"%1\\\">here</A>"
 "."
 msgstr "已启用 JavaScript (全局)。在<A HREF=\\\"%1\\\">这里</A>配置 Javascript。"
 
-#: about/konq_aboutpage.cc:259
+#: about/konq_aboutpage.cc:286
 msgid "Secure <A HREF=\"%1\">Java</A><SUP>&reg;</SUP> support"
 msgstr "安全的 <A HREF=\"%1\">Java</A><SUP>&reg;</SUP> 支持"
 
-#: about/konq_aboutpage.cc:260
+#: about/konq_aboutpage.cc:287
 msgid ""
 "JDK 1.2.0 (Java 2) compatible VM (<A HREF=\"%1\">Blackdown</A>, <A HREF=\"%2\">"
 "IBM</A> or <A HREF=\"%3\">Sun</A>)"
@@ -2219,11 +2288,11 @@ msgstr ""
 "JDK 1.2.0 (Java 2) 兼容的虚拟机(<A HREF=\"%1\">Blackdown</A>，<A HREF=\"%2\">IBM</A>"
 "，或<A HREF=\"%3\">Sun</A>)"
 
-#: about/konq_aboutpage.cc:262
+#: about/konq_aboutpage.cc:289
 msgid "Enable Java (globally) <A HREF=\"%1\">here</A>."
 msgstr "在<A HREF=\"%1\">这里</A>启用 Java (全局)。"
 
-#: about/konq_aboutpage.cc:263
+#: about/konq_aboutpage.cc:290
 msgid ""
 "Netscape Communicator<SUP>&reg;</SUP> <A HREF=\"%4\">plugins</A> "
 "(for viewing <A HREF=\"%1\">Flash<SUP>&reg;</SUP></A>, <A HREF=\"%2\">Real<SUP>"
@@ -2233,96 +2302,97 @@ msgstr ""
 "Flash<SUP>&reg;</SUP></A>, <A HREF=\"%2\">Real<SUP>&reg;</SUP></A>"
 "音频, <A HREF=\"%3\">Real<SUP>&reg;</SUP></A>视频等文件)"
 
-#: about/konq_aboutpage.cc:268
+#: about/konq_aboutpage.cc:295
 msgid "Secure Sockets Layer"
 msgstr "安全套接字层"
 
-#: about/konq_aboutpage.cc:269
+#: about/konq_aboutpage.cc:296
 msgid "(TLS/SSL v2/3) for secure communications up to 168bit"
 msgstr "(TLS/SSL v2/3) 达到 168 位强度的安全通信"
 
-#: about/konq_aboutpage.cc:270
+#: about/konq_aboutpage.cc:297
 msgid "OpenSSL"
 msgstr "OpenSSL"
 
-#: about/konq_aboutpage.cc:271
+#: about/konq_aboutpage.cc:298
 msgid "Bidirectional 16bit unicode support"
 msgstr "双向语言的 16 位 Unicode 支持"
 
-#: about/konq_aboutpage.cc:273
+#: about/konq_aboutpage.cc:300
 msgid "AutoCompletion for forms"
 msgstr "表单自动补全"
 
-#: about/konq_aboutpage.cc:275
+#: about/konq_aboutpage.cc:302
 msgid "G E N E R A L"
 msgstr "常 规"
 
-#: about/konq_aboutpage.cc:276
+#: about/konq_aboutpage.cc:303
 msgid "Feature"
 msgstr "特性"
 
-#: about/konq_aboutpage.cc:278
+#: about/konq_aboutpage.cc:305
 msgid "Image formats"
 msgstr "图像格式"
 
-#: about/konq_aboutpage.cc:279
+#: about/konq_aboutpage.cc:306
 msgid "Transfer protocols"
 msgstr "传输协议"
 
-#: about/konq_aboutpage.cc:280
+#: about/konq_aboutpage.cc:307
 msgid "HTTP 1.1 (including gzip/bzip2 compression)"
 msgstr "HTTP 1.1 (包括 gzip/bzip2 压缩)"
 
-#: about/konq_aboutpage.cc:281
+#: about/konq_aboutpage.cc:308
 msgid "FTP"
 msgstr "FTP"
 
-#: about/konq_aboutpage.cc:282
+#: about/konq_aboutpage.cc:309
 msgid "and <A HREF=\"%1\">many more...</A>"
 msgstr "和 <A HREF=\"%1\">其它很多...</A>"
 
-#: about/konq_aboutpage.cc:283
+#: about/konq_aboutpage.cc:310
 msgid "URL-Completion"
 msgstr "URL 补全"
 
-#: about/konq_aboutpage.cc:284
+#: about/konq_aboutpage.cc:311
 msgid "Manual"
 msgstr "手册"
 
-#: about/konq_aboutpage.cc:285
+#: about/konq_aboutpage.cc:312
 msgid "Popup"
 msgstr "弹出菜单"
 
-#: about/konq_aboutpage.cc:286
+#: about/konq_aboutpage.cc:313
 msgid "(Short-) Automatic"
 msgstr "(快捷-) 自动"
 
-#: about/konq_aboutpage.cc:288
+#: about/konq_aboutpage.cc:315
 msgid "<a href=\"%1\">Return to Starting Points</a>"
 msgstr "<a href=\"%1\">返回到起点</a>"
 
-#: about/konq_aboutpage.cc:337
+#: about/konq_aboutpage.cc:364
 msgid "Tips &amp; Tricks"
 msgstr "技巧"
 
-#: about/konq_aboutpage.cc:338
+#: about/konq_aboutpage.cc:365
+#, fuzzy
 msgid ""
-"Use Internet-Keywords and Web-Shortcuts: by typing \"gg: TDE\" one can search "
-"the Internet, using Google, for the search phrase \"TDE\". There are a lot of "
-"Web-Shortcuts predefined to make searching for software or looking up certain "
-"words in an encyclopedia a breeze. You can even <a href=\"%1\">"
-"create your own</a> Web-Shortcuts."
+"Use Internet-Keywords and Web-Shortcuts: by typing \"gg: Trinity Desktop\" one "
+"can search the Internet, using Google, for the search phrase \"Trinity "
+"Desktop\". There are a lot of Web-Shortcuts predefined to make searching for "
+"software or looking up certain words in an encyclopedia a breeze. You can even "
+"<a href=\"%1\">create your own</a> Web-Shortcuts."
 msgstr ""
 "请使用 Internet 关键字和速搜：通过键入“gg: TDE”，可以使用 Google 在 Internet "
 "上搜索“TDE”。有很多预定义的速搜使搜索软件或在百科全书中查找某些词变得轻而易举。您甚至可以<a href=\"%1\">创建您自己的</a>速搜。"
 
-#: about/konq_aboutpage.cc:343
+#: about/konq_aboutpage.cc:370
 msgid ""
 "Use the magnifier button <img width='16' height='16' src=\"%1\"> "
 "in the toolbar to increase the font size on your web page."
 msgstr "使用工具栏中的放大镜按钮 <img width='16' height='16' src=\"%1\"> 来增大网页中的字体大小。"
 
-#: about/konq_aboutpage.cc:345
+#: about/konq_aboutpage.cc:372
 msgid ""
 "When you want to paste a new address into the Location toolbar you might want "
 "to clear the current entry by pressing the black arrow with the white cross "
@@ -2331,14 +2401,14 @@ msgstr ""
 "当您希望在位置工具栏中粘贴新地址时，您也许希望用工具栏中的白十字黑箭头 <img width='16' height='16' src=\"%1\"> "
 "来清除当前的地址。"
 
-#: about/konq_aboutpage.cc:349
+#: about/konq_aboutpage.cc:376
 msgid ""
 "To create a link on your desktop pointing to the current page, simply drag the "
 "\"Location\" label that is to the left of the Location toolbar, drop it on to "
 "the desktop, and choose \"Link\"."
 msgstr "如果要在桌面上创建指向当前页面的链接，只需将位置工具栏左侧的“位置”标签拖放到桌面上，并选择“链接”。"
 
-#: about/konq_aboutpage.cc:352
+#: about/konq_aboutpage.cc:379
 msgid ""
 "You can also find <img width='16' height='16' src=\"%1\"> "
 "\"Full-Screen Mode\" in the Settings menu. This feature is very useful for "
@@ -2346,7 +2416,7 @@ msgid ""
 msgstr ""
 "您也可以在窗口菜单中找到 <img width='16' height='16' src=\"%1\">“全屏幕模式”。该特性对“talk”会话非常有用。"
 
-#: about/konq_aboutpage.cc:355
+#: about/konq_aboutpage.cc:382
 msgid ""
 "Divide et impera (lat. \"Divide and conquer\") - by splitting a window into two "
 "parts (e.g. Window -> <img width='16' height='16' src=\"%1\"> "
@@ -2358,25 +2428,25 @@ msgstr ""
 "将视图左右分开)， 您可以使 Konqueror 象您希望的那样。您甚至可以装入一些视图配置示例(例如 Midnight "
 "Commander)，或者创建您自己的配置。"
 
-#: about/konq_aboutpage.cc:360
+#: about/konq_aboutpage.cc:387
 msgid ""
 "Use the <a href=\"%1\">user-agent</a> feature if the website you are visiting "
 "asks you to use a different browser (and do not forget to send a complaint to "
 "the webmaster!)"
 msgstr "如果您正在访问的网站要求您使用另外的浏览器，您可以使用<a href=\"%1\">用户代理</a>特性 (并且不要忘记向网站管理者抱怨！)"
 
-#: about/konq_aboutpage.cc:363
+#: about/konq_aboutpage.cc:390
 msgid ""
 "The <img width='16' height='16' src=\"%1\"> History in your SideBar ensures "
 "that you can keep track of the pages you have visited recently."
 msgstr "工具条中的历史功能 <img width='16' height='16' src=\"%1\"> 使您能够跟踪您最近访问的页面。"
 
-#: about/konq_aboutpage.cc:365
+#: about/konq_aboutpage.cc:392
 msgid ""
 "Use a caching <a href=\"%1\">proxy</a> to speed up your Internet connection."
 msgstr "使用缓冲<a href=\"%1\">代理服务器</a>来加速您的网络连接。"
 
-#: about/konq_aboutpage.cc:367
+#: about/konq_aboutpage.cc:394
 msgid ""
 "Advanced users will appreciate the Konsole which you can embed into Konqueror "
 "(Window -> <img width='16' height='16' SRC=\"%1\"> Show Terminal Emulator)."
@@ -2384,50 +2454,50 @@ msgstr ""
 "高级用户将喜欢 Konsole，您可以将它嵌入 Konqueror (窗口 -> <img width='16' height='16' src=\"%1\"> "
 "显示终端仿真器)。"
 
-#: about/konq_aboutpage.cc:370
+#: about/konq_aboutpage.cc:397
 msgid ""
 "Thanks to <a href=\"%1\">DCOP</a> you can have full control over Konqueror "
 "using a script."
 msgstr "借助于 <a href=\"%1\">DCOP</a>，您可以使用脚本来完全控制 Konqueror。"
 
-#: about/konq_aboutpage.cc:372
+#: about/konq_aboutpage.cc:399
 msgid "<img width='16' height='16' src=\"%1\">"
 msgstr "<img width='16' height='16' src=\"%1\">"
 
-#: about/konq_aboutpage.cc:373
+#: about/konq_aboutpage.cc:400
 msgid "Next: Specifications"
 msgstr "下一页：技术规范"
 
-#: about/konq_aboutpage.cc:389
+#: about/konq_aboutpage.cc:416
 msgid "Installed Plugins"
 msgstr "已安装的插件"
 
-#: about/konq_aboutpage.cc:390
+#: about/konq_aboutpage.cc:417
 msgid "<td>Plugin</td><td>Description</td><td>File</td><td>Types</td>"
 msgstr "<td>插件</td><td>描述</td><td>文件</td><td>类型</td>"
 
-#: about/konq_aboutpage.cc:391
+#: about/konq_aboutpage.cc:418
 msgid "Installed"
 msgstr "已安装"
 
-#: about/konq_aboutpage.cc:392
+#: about/konq_aboutpage.cc:419
 msgid "<td>Mime Type</td><td>Description</td><td>Suffixes</td><td>Plugin</td>"
 msgstr "<td>MIME 类型</td><td>描述</td><td>后缀</td><td>插件</td>"
 
-#: about/konq_aboutpage.cc:498
+#: about/konq_aboutpage.cc:538
 msgid ""
 "Do you want to disable showing the introduction in the webbrowsing profile?"
 msgstr "您要在网页浏览配置中禁止显示介绍吗？"
 
-#: about/konq_aboutpage.cc:500
+#: about/konq_aboutpage.cc:540
 msgid "Faster Startup?"
 msgstr "快速启动？"
 
-#: about/konq_aboutpage.cc:500
+#: about/konq_aboutpage.cc:540
 msgid "Disable"
 msgstr "禁用"
 
-#: about/konq_aboutpage.cc:500
+#: about/konq_aboutpage.cc:540
 msgid "Keep"
 msgstr "保留"
 
@@ -2459,52 +2529,63 @@ msgstr "在当前目录中执行 Shell 命令："
 msgid "Output from command: \"%1\""
 msgstr "命令输出：“%1”"
 
-#: sidebar/trees/konqsidebar_tree.cpp:31
+#: sidebar/trees/konqsidebar_tree.cpp:32
 msgid "Clear Search"
 msgstr "清除搜索"
 
-#: sidebar/trees/konqsidebar_tree.cpp:146
+#: sidebar/trees/konqsidebar_tree.cpp:147
 msgid "Select Type"
 msgstr "选择类型"
 
-#: sidebar/trees/konqsidebar_tree.cpp:147
+#: sidebar/trees/konqsidebar_tree.cpp:148
 msgid "Select type:"
 msgstr "选择类型："
 
-#: sidebar/trees/history_module/history_module.cpp:80
-msgid "&Remove Entry"
-msgstr "删除项目(&R)"
-
-#: sidebar/trees/history_module/history_module.cpp:82
-msgid "C&lear History"
-msgstr "清除历史(&L)"
+#: sidebar/trees/bookmark_module/bookmark_module.cpp:59
+msgid "&Create New Folder"
+msgstr "创建新文件夹(&C)"
 
-#: sidebar/trees/history_module/history_module.cpp:88
-msgid "By &Name"
-msgstr "按名称(&N)"
+#: sidebar/trees/bookmark_module/bookmark_module.cpp:61
+#: sidebar/trees/konq_sidebartree.cpp:916
+msgid "Delete Folder"
+msgstr "删除文件夹"
 
-#: sidebar/trees/history_module/history_module.cpp:93
-msgid "By &Date"
-msgstr "按日期(&D)"
+#: sidebar/trees/bookmark_module/bookmark_module.cpp:63
+msgid "Delete Bookmark"
+msgstr "删除书签"
 
-#: sidebar/trees/history_module/history_module.cpp:351
-#: sidebar/trees/history_module/kcmhistory.cpp:263
-msgid "Do you really want to clear the entire history?"
-msgstr "您确定想要清空全部历史吗？"
+#: sidebar/trees/bookmark_module/bookmark_module.cpp:73
+#: sidebar/trees/konq_sidebartree.cpp:928
+msgid "Copy Link Address"
+msgstr "复制链接地址"
 
-#: sidebar/trees/history_module/history_module.cpp:353
-#: sidebar/trees/history_module/kcmhistory.cpp:265
-msgid "Clear History?"
-msgstr "清除历史吗？"
+#: sidebar/trees/bookmark_module/bookmark_module.cpp:308
+msgid ""
+"Are you sure you wish to remove the bookmark folder\n"
+"\"%1\"?"
+msgstr ""
+"您确定想要删除书签文件夹\n"
+"“%1”吗？"
 
-#: sidebar/trees/history_module/history_item.cpp:121
+#: sidebar/trees/bookmark_module/bookmark_module.cpp:309
 msgid ""
-"<qt>"
-"<center><b>%4</b></center>"
-"<hr>Last visited: %1"
-"<br>First visited: %2"
-"<br>Number of times visited: %3</qt>"
-msgstr "<qt><center><b>%4</b></center><hr>第一次访问：%2<br>最后访问：%1<br>访问次数：%3</qt>"
+"Are you sure you wish to remove the bookmark\n"
+"\"%1\"?"
+msgstr ""
+"您确定想要删除书签\n"
+"“%1”吗？"
+
+#: sidebar/trees/bookmark_module/bookmark_module.cpp:310
+msgid "Bookmark Folder Deletion"
+msgstr "书签文件夹删除"
+
+#: sidebar/trees/bookmark_module/bookmark_module.cpp:311
+msgid "Bookmark Deletion"
+msgstr "书签删除"
+
+#: sidebar/trees/bookmark_module/bookmark_module.cpp:353
+msgid "Bookmark Properties"
+msgstr "书签属性"
 
 #: sidebar/trees/history_module/kcmhistory.cpp:68
 #: sidebar/trees/history_module/kcmhistory.cpp:73
@@ -2540,162 +2621,147 @@ msgid ""
 "Minutes"
 msgstr " 分钟"
 
-#: sidebar/trees/dirtree_module/dirtree_module.cpp:422
-msgid "Cannot find parent item %1 in the tree. Internal error."
-msgstr "无法在树中找到父项目 %1。内部错误。"
-
-#: sidebar/trees/bookmark_module/bookmark_module.cpp:59
-msgid "&Create New Folder"
-msgstr "创建新文件夹(&C)"
-
-#: sidebar/trees/bookmark_module/bookmark_module.cpp:61
-#: sidebar/trees/konq_sidebartree.cpp:905
-msgid "Delete Folder"
-msgstr "删除文件夹"
-
-#: sidebar/trees/bookmark_module/bookmark_module.cpp:63
-msgid "Delete Bookmark"
-msgstr "删除书签"
+#: sidebar/trees/history_module/history_module.cpp:351
+#: sidebar/trees/history_module/kcmhistory.cpp:263
+msgid "Do you really want to clear the entire history?"
+msgstr "您确定想要清空全部历史吗？"
 
-#: sidebar/trees/bookmark_module/bookmark_module.cpp:73
-#: sidebar/trees/konq_sidebartree.cpp:917
-msgid "Copy Link Address"
-msgstr "复制链接地址"
+#: sidebar/trees/history_module/history_module.cpp:353
+#: sidebar/trees/history_module/kcmhistory.cpp:265
+msgid "Clear History?"
+msgstr "清除历史吗？"
 
-#: sidebar/trees/bookmark_module/bookmark_module.cpp:308
+#: sidebar/trees/history_module/history_item.cpp:121
 msgid ""
-"Are you sure you wish to remove the bookmark folder\n"
-"\"%1\"?"
-msgstr ""
-"您确定想要删除书签文件夹\n"
-"“%1”吗？"
+"<qt>"
+"<center><b>%4</b></center>"
+"<hr>Last visited: %1"
+"<br>First visited: %2"
+"<br>Number of times visited: %3</qt>"
+msgstr "<qt><center><b>%4</b></center><hr>第一次访问：%2<br>最后访问：%1<br>访问次数：%3</qt>"
 
-#: sidebar/trees/bookmark_module/bookmark_module.cpp:309
-msgid ""
-"Are you sure you wish to remove the bookmark\n"
-"\"%1\"?"
-msgstr ""
-"您确定想要删除书签\n"
-"“%1”吗？"
+#: sidebar/trees/history_module/history_module.cpp:80
+msgid "&Remove Entry"
+msgstr "删除项目(&R)"
 
-#: sidebar/trees/bookmark_module/bookmark_module.cpp:310
-msgid "Bookmark Folder Deletion"
-msgstr "书签文件夹删除"
+#: sidebar/trees/history_module/history_module.cpp:82
+msgid "C&lear History"
+msgstr "清除历史(&L)"
 
-#: sidebar/trees/bookmark_module/bookmark_module.cpp:311
-msgid "Bookmark Deletion"
-msgstr "书签删除"
+#: sidebar/trees/history_module/history_module.cpp:88
+msgid "By &Name"
+msgstr "按名称(&N)"
 
-#: sidebar/trees/bookmark_module/bookmark_module.cpp:353
-msgid "Bookmark Properties"
-msgstr "书签属性"
+#: sidebar/trees/history_module/history_module.cpp:93
+msgid "By &Date"
+msgstr "按日期(&D)"
 
-#: sidebar/trees/konq_sidebartree.cpp:903
+#: sidebar/trees/konq_sidebartree.cpp:914
 msgid "&Create New Folder..."
 msgstr "创建新文件夹(&C)..."
 
-#: sidebar/trees/konq_sidebartree.cpp:909
+#: sidebar/trees/konq_sidebartree.cpp:920
 msgid "Delete Link"
 msgstr "删除链接"
 
-#: sidebar/trees/konq_sidebartree.cpp:955
+#: sidebar/trees/konq_sidebartree.cpp:966
 msgid "New Folder"
 msgstr "新建文件夹"
 
-#: sidebar/trees/konq_sidebartree.cpp:959
+#: sidebar/trees/konq_sidebartree.cpp:970
 msgid "Create New Folder"
 msgstr "创建新文件夹"
 
-#: sidebar/trees/konq_sidebartree.cpp:960
+#: sidebar/trees/konq_sidebartree.cpp:971
 msgid "Enter folder name:"
 msgstr "输入文件夹名称："
 
-#: sidebar/sidebar_widget.cpp:116
+#: sidebar/sidebar_widget.cpp:117
 msgid "Rollback to System Default"
 msgstr "重置为系统默认值"
 
-#: sidebar/sidebar_widget.cpp:122
+#: sidebar/sidebar_widget.cpp:123
 msgid ""
 "<qt>This removes all your entries from the sidebar and adds the system default "
 "ones.<BR><B>This procedure is irreversible</B><BR>Do you want to proceed?</qt>"
 msgstr "<qt>这将从侧边栏删除全部自定义项，并添加系统默项。 <BR><B>此过程是不可撤销的。 </B><BR>您真的想要继续吗？</qt>"
 
-#: sidebar/sidebar_widget.cpp:277
+#: sidebar/sidebar_widget.cpp:278
 msgid "Add New"
 msgstr "添加新项"
 
-#: sidebar/sidebar_widget.cpp:278
+#: sidebar/sidebar_widget.cpp:279
 msgid "Multiple Views"
 msgstr "多视图"
 
-#: sidebar/sidebar_widget.cpp:279
+#: sidebar/sidebar_widget.cpp:280
 msgid "Show Tabs Left"
 msgstr "在左侧显示标签"
 
-#: sidebar/sidebar_widget.cpp:280
+#: sidebar/sidebar_widget.cpp:281
 msgid "Show Configuration Button"
 msgstr "显示配置按钮"
 
-#: sidebar/sidebar_widget.cpp:283
+#: sidebar/sidebar_widget.cpp:284
 msgid "Close Navigation Panel"
 msgstr "关闭导航面板"
 
-#: sidebar/sidebar_widget.cpp:346
+#: sidebar/sidebar_widget.cpp:347
 msgid "This entry already exists."
 msgstr "这个条目已经存在。"
 
-#: sidebar/sidebar_widget.cpp:360 sidebar/web_module/web_module.cpp:210
+#: sidebar/sidebar_widget.cpp:361 sidebar/web_module/web_module.cpp:210
 msgid "Web SideBar Plugin"
 msgstr "Web 侧边栏插件"
 
-#: sidebar/sidebar_widget.cpp:506
+#: sidebar/sidebar_widget.cpp:507
 msgid "Enter a URL:"
 msgstr "输入 URL："
 
-#: sidebar/sidebar_widget.cpp:514
+#: sidebar/sidebar_widget.cpp:515
 msgid "<qt><b>%1</b> does not exist</qt>"
 msgstr "<qt><b>%1</b> 不存在</qt>"
 
-#: sidebar/sidebar_widget.cpp:531
+#: sidebar/sidebar_widget.cpp:532
 msgid "<qt>Do you really want to remove the <b>%1</b> tab?</qt>"
 msgstr "<qt>您真的想要删除 <b>%1</b> 标签吗？</qt>"
 
-#: sidebar/sidebar_widget.cpp:546
+#: sidebar/sidebar_widget.cpp:547
 msgid "Set Name"
 msgstr "设置名称"
 
-#: sidebar/sidebar_widget.cpp:546
+#: sidebar/sidebar_widget.cpp:547
 msgid "Enter the name:"
 msgstr "输入名称："
 
-#: sidebar/sidebar_widget.cpp:634
+#: sidebar/sidebar_widget.cpp:635
 msgid ""
 "You have hidden the navigation panel configuration button. To make it visible "
 "again, click the right mouse button on any of the navigation panel buttons and "
 "select \"Show Configuration Button\"."
 msgstr "您已经隐藏了导航面板配置按钮。要重新显示该按钮， 请用鼠标右键单击导航面板的任何一部分 并选择“显示配置按钮”。"
 
-#: sidebar/sidebar_widget.cpp:733
+#: sidebar/sidebar_widget.cpp:734
 msgid "Configure Sidebar"
 msgstr "配置侧边栏"
 
-#: sidebar/sidebar_widget.cpp:858
+#: sidebar/sidebar_widget.cpp:859
 msgid "Set Name..."
 msgstr "设置名称..."
 
-#: sidebar/sidebar_widget.cpp:859
+#: sidebar/sidebar_widget.cpp:860
 msgid "Set URL..."
 msgstr "设置 URL..."
 
-#: sidebar/sidebar_widget.cpp:860
+#: sidebar/sidebar_widget.cpp:861
 msgid "Set Icon..."
 msgstr "设置图标..."
 
-#: sidebar/sidebar_widget.cpp:864
+#: sidebar/sidebar_widget.cpp:865
 msgid "Configure Navigation Panel"
 msgstr "配置导航面板"
 
-#: sidebar/sidebar_widget.cpp:928
+#: sidebar/sidebar_widget.cpp:929
 msgid "Unknown"
 msgstr "未知"
 
@@ -2711,10 +2777,6 @@ msgstr " 分"
 msgid " sec"
 msgstr " 秒"
 
-#: sidebar/konqsidebar.cpp:118
-msgid "Extended Sidebar"
-msgstr "扩展的侧边栏"
-
 #: sidebar/trees/bookmark_module/bookmark_module.h:85
 msgid "Add Bookmark"
 msgstr "添加书签"
@@ -2738,3 +2800,9 @@ msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "i18n-translation@lists.linux.net.cn"
+
+#~ msgid "Cannot find parent item %1 in the tree. Internal error."
+#~ msgstr "无法在树中找到父项目 %1。内部错误。"
+
+#~ msgid "Extended Sidebar"
+#~ msgstr "扩展的侧边栏"
diff --git a/tde-i18n-zh_CN/messages/tdebase/konsole.po b/tde-i18n-zh_CN/messages/tdebase/konsole.po
index 39789ca57ca..e0322354e4c 100644
--- a/tde-i18n-zh_CN/messages/tdebase/konsole.po
+++ b/tde-i18n-zh_CN/messages/tdebase/konsole.po
@@ -8,21 +8,22 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2007-08-03 01:12+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Translator: Wang Jian <lark@linux.net.cn>\n"
 "X-Generator: KBabel 1.0\n"
 
-#: TEWidget.cpp:947 TEWidget.cpp:949
+#: TEWidget.cpp:964 TEWidget.cpp:966
 msgid "Size: XXX x XXX"
 msgstr "大小：XXX x XXX"
 
-#: TEWidget.cpp:954
+#: TEWidget.cpp:971
 msgid "Size: %1 x %2"
 msgstr "大小：%1 x %2"
 
@@ -38,231 +39,253 @@ msgid ""
 "Your emails"
 msgstr "i18n-translation@lists.linux.net.cn"
 
-#: konsole.cpp:489 konsole_part.cpp:327
+#: konsole.cpp:215
+#, fuzzy
+msgid "&Session"
+msgstr "会话"
+
+#: konsole.cpp:219
+#, fuzzy
+msgid "Se&ttings"
+msgstr "设置"
+
+#: konsole.cpp:524 konsole_part.cpp:328
 msgid "&Suspend Task"
 msgstr "挂起任务(&S)"
 
-#: konsole.cpp:490 konsole_part.cpp:328
+#: konsole.cpp:525 konsole_part.cpp:329
 msgid "&Continue Task"
 msgstr "继续任务(&C)"
 
-#: konsole.cpp:491 konsole_part.cpp:329
+#: konsole.cpp:526 konsole_part.cpp:330
 msgid "&Hangup"
 msgstr "挂起(&H)"
 
-#: konsole.cpp:492 konsole_part.cpp:330
+#: konsole.cpp:527 konsole_part.cpp:331
 msgid "&Interrupt Task"
 msgstr "中断任务(&I)"
 
-#: konsole.cpp:493 konsole_part.cpp:331
+#: konsole.cpp:528 konsole_part.cpp:332
 msgid "&Terminate Task"
 msgstr "终止任务(&T)"
 
-#: konsole.cpp:494 konsole_part.cpp:332
+#: konsole.cpp:529 konsole_part.cpp:333
 msgid "&Kill Task"
 msgstr "杀死任务(&K)"
 
-#: konsole.cpp:495 konsole_part.cpp:333
+#: konsole.cpp:530 konsole_part.cpp:334
 msgid "User Signal &1"
 msgstr "用户信号 &1"
 
-#: konsole.cpp:496 konsole_part.cpp:334
+#: konsole.cpp:531 konsole_part.cpp:335
 msgid "User Signal &2"
 msgstr "用户信号 &2"
 
-#: konsole.cpp:507 konsole.cpp:722 konsole_part.cpp:470
+#: konsole.cpp:542 konsole.cpp:762 konsole_part.cpp:476
 msgid "&Send Signal"
 msgstr "发送信号(&S)"
 
-#: konsole.cpp:581
+#: konsole.cpp:616
 msgid "&Tab Bar"
 msgstr "标签栏(&T)"
 
-#: konsole.cpp:584 konsole.cpp:592 konsole_part.cpp:348
+#: konsole.cpp:619 konsole.cpp:627 konsole_part.cpp:349
 msgid "&Hide"
 msgstr "隐藏(&H)"
 
-#: konsole.cpp:584
+#: konsole.cpp:619
 msgid "&Top"
 msgstr "顶部(&T)"
 
-#: konsole.cpp:589 konsole_part.cpp:344
+#: konsole.cpp:624 konsole_part.cpp:345
 msgid "Sc&rollbar"
 msgstr "滚动条(&R)"
 
-#: konsole.cpp:592 konsole_part.cpp:348
+#: konsole.cpp:627 konsole_part.cpp:349
 msgid "&Left"
 msgstr "左(&L)"
 
-#: konsole.cpp:592 konsole_part.cpp:348
+#: konsole.cpp:627 konsole_part.cpp:349
 msgid "&Right"
 msgstr "右(&R)"
 
-#: konsole.cpp:605 konsole_part.cpp:354
+#: konsole.cpp:640 konsole_part.cpp:355
 msgid "&Bell"
 msgstr "响铃(&B)"
 
-#: konsole.cpp:608 konsole_part.cpp:358
+#: konsole.cpp:643 konsole_part.cpp:359
 msgid "System &Bell"
 msgstr "系统响铃(&B)"
 
-#: konsole.cpp:609 konsole_part.cpp:359
+#: konsole.cpp:644 konsole_part.cpp:360
 msgid "System &Notification"
 msgstr "系统通告(&N)"
 
-#: konsole.cpp:610 konsole_part.cpp:360
+#: konsole.cpp:645 konsole_part.cpp:361
 msgid "&Visible Bell"
 msgstr "视觉响铃(&V)"
 
-#: konsole.cpp:611 konsole_part.cpp:361
+#: konsole.cpp:646 konsole_part.cpp:362
 msgid "N&one"
 msgstr "无(&O)"
 
-#: konsole.cpp:619 konsole_part.cpp:366
+#: konsole.cpp:654 konsole_part.cpp:367
 msgid "&Enlarge Font"
 msgstr "增大字体(&E)"
 
-#: konsole.cpp:623 konsole_part.cpp:367
+#: konsole.cpp:658 konsole_part.cpp:368
 msgid "&Shrink Font"
 msgstr "减小字体(&S)"
 
-#: konsole.cpp:627 konsole_part.cpp:368
+#: konsole.cpp:662 konsole_part.cpp:369
 msgid "Se&lect..."
 msgstr "选择(&L)..."
 
-#: konsole.cpp:633
+#: konsole.cpp:668
 msgid "&Install Bitmap..."
 msgstr "安装位图(&I)..."
 
-#: konsole.cpp:641 konsole_part.cpp:372
+#: konsole.cpp:676 konsole_part.cpp:373
 msgid "&Encoding"
 msgstr "编码(&E)"
 
-#: konsole.cpp:649 konsole_part.cpp:385
+#: konsole.cpp:684 konsole_part.cpp:386
 msgid "&Keyboard"
 msgstr "键盘(&K)"
 
-#: konsole.cpp:653 konsole_part.cpp:395
+#: konsole.cpp:688 konsole_part.cpp:396
 msgid "Sch&ema"
 msgstr "方案(&E)"
 
-#: konsole.cpp:658
+#: konsole.cpp:693
 msgid "S&ize"
 msgstr "大小(&I)"
 
-#: konsole.cpp:661
+#: konsole.cpp:696
 msgid "40x15 (&Small)"
 msgstr "40x15 (小)(&S)"
 
-#: konsole.cpp:662
+#: konsole.cpp:697
 msgid "80x24 (&VT100)"
 msgstr "80x24 (&VT100)"
 
-#: konsole.cpp:663
+#: konsole.cpp:698
 msgid "80x25 (&IBM PC)"
 msgstr "80x25 (&IBM PC)"
 
-#: konsole.cpp:664
+#: konsole.cpp:699
 msgid "80x40 (&XTerm)"
 msgstr "80x24 (&XTerm)"
 
-#: konsole.cpp:665
+#: konsole.cpp:700
 msgid "80x52 (IBM V&GA)"
 msgstr "80x52 (IBM V&GA)"
 
-#: konsole.cpp:667
+#: konsole.cpp:702
 msgid "&Custom..."
 msgstr "自定义(&C)..."
 
-#: konsole.cpp:672
+#: konsole.cpp:707
 msgid "Hist&ory..."
 msgstr "历史(&O)..."
 
-#: konsole.cpp:678 konsole_part.cpp:447
+#: konsole.cpp:713 konsole_part.cpp:453
 msgid "&Save as Default"
 msgstr "保存为默认值(&S)"
 
-#: konsole.cpp:701
+#: konsole.cpp:736
 msgid "&Tip of the Day"
 msgstr "日积月累(&T)"
 
-#: konsole.cpp:715 konsole_part.cpp:456
+#: konsole.cpp:750 konsole_part.cpp:462
 msgid "Set Selection End"
 msgstr "设置选择区结束点"
 
-#: konsole.cpp:726
+#: konsole.cpp:758
+msgid "&Open.."
+msgstr ""
+
+#: konsole.cpp:766
 msgid "New Sess&ion"
 msgstr "新建会话(&I)"
 
-#: konsole.cpp:739 konsole_part.cpp:476
+#: konsole.cpp:779 konsole_part.cpp:482
 msgid "S&ettings"
 msgstr "设置(&E)"
 
-#: konsole.cpp:794 konsole.cpp:1076
+#: konsole.cpp:836 konsole.cpp:1139
 msgid "&Detach Session"
 msgstr "漂移会话(&D)"
 
-#: konsole.cpp:797 konsole.cpp:1080
+#: konsole.cpp:841 konsole.cpp:1144
 msgid "&Rename Session..."
 msgstr "重命名会话(&R)..."
 
-#: konsole.cpp:801 konsole.cpp:1089
+#: konsole.cpp:845 konsole.cpp:1153
 msgid "Monitor for &Activity"
 msgstr "活动状态监视器(&A)"
 
-#: konsole.cpp:803 konsole.cpp:1092
+#: konsole.cpp:847 konsole.cpp:1156
 msgid "Stop Monitoring for &Activity"
 msgstr "停止监视活动(&A)"
 
-#: konsole.cpp:806 konsole.cpp:1094
+#: konsole.cpp:850 konsole.cpp:1158
 msgid "Monitor for &Silence"
 msgstr "静止状态监视器(&S)"
 
-#: konsole.cpp:808 konsole.cpp:1097
+#: konsole.cpp:852 konsole.cpp:1161
 msgid "Stop Monitoring for &Silence"
 msgstr "停止监视静止(&S)"
 
-#: konsole.cpp:811 konsole.cpp:1099
+#: konsole.cpp:855 konsole.cpp:1163
 msgid "Send &Input to All Sessions"
 msgstr "将输入发给所有的会话(&I)"
 
-#: konsole.cpp:816
+#: konsole.cpp:862 konsole.cpp:1196
+msgid "&Move Session Left"
+msgstr "将会话左移(&M)"
+
+#: konsole.cpp:869 konsole.cpp:1202
+msgid "M&ove Session Right"
+msgstr "将会话右移(&O)"
+
+#: konsole.cpp:876
 msgid "Select &Tab Color..."
 msgstr "选择标签颜色(&T)..."
 
-#: konsole.cpp:820
+#: konsole.cpp:880
 msgid "Switch to Tab"
 msgstr "切换到标签"
 
-#: konsole.cpp:825 konsole.cpp:1119 konsole.cpp:1201 konsole.cpp:2992
+#: konsole.cpp:885 konsole.cpp:1183 konsole.cpp:1271 konsole.cpp:3088
 msgid "C&lose Session"
 msgstr "关闭会话(&L)"
 
-#: konsole.cpp:835
+#: konsole.cpp:895
 msgid "Tab &Options"
 msgstr "标签选项(&O)"
 
-#: konsole.cpp:837
+#: konsole.cpp:897
 msgid "&Text && Icons"
 msgstr "文字和图标(&T)"
 
-#: konsole.cpp:837
+#: konsole.cpp:897
 msgid "Text &Only"
 msgstr "只有文字(&O)"
 
-#: konsole.cpp:837
+#: konsole.cpp:897
 msgid "&Icons Only"
 msgstr "只有图标(&I)"
 
-#: konsole.cpp:844
+#: konsole.cpp:904
 msgid "&Dynamic Hide"
 msgstr "动态隐藏(&D)"
 
-#: konsole.cpp:849
+#: konsole.cpp:909
 msgid "&Auto Resize Tabs"
 msgstr "自动缩放标签(&A)"
 
-#: konsole.cpp:917
+#: konsole.cpp:978
 msgid ""
 "Click for new standard session\n"
 "Click and hold for session menu"
@@ -270,112 +293,96 @@ msgstr ""
 "单击此处可新建标准会话\n"
 "单击并按住可出现会话菜单"
 
-#: konsole.cpp:926
+#: konsole.cpp:987
 msgid "Close the current session"
 msgstr "关闭当前会话"
 
-#: konsole.cpp:1030
-msgid "Session"
-msgstr "会话"
-
-#: konsole.cpp:1036
-msgid "Settings"
-msgstr "设置"
-
-#: konsole.cpp:1046
+#: konsole.cpp:1107
 msgid "Paste Selection"
 msgstr "粘贴选择区"
 
-#: konsole.cpp:1049
+#: konsole.cpp:1110
 msgid "C&lear Terminal"
 msgstr "关闭终端(&L)"
 
-#: konsole.cpp:1051
+#: konsole.cpp:1112
 msgid "&Reset && Clear Terminal"
 msgstr "重置并清除终端(&R)"
 
-#: konsole.cpp:1053
+#: konsole.cpp:1114
 msgid "&Find in History..."
 msgstr "在历史中查找(&F)..."
 
-#: konsole.cpp:1061
+#: konsole.cpp:1122
 msgid "Find Pre&vious"
 msgstr "查找上一个(&V)"
 
-#: konsole.cpp:1065
+#: konsole.cpp:1126
 msgid "S&ave History As..."
 msgstr "历史另存为(&A)..."
 
-#: konsole.cpp:1069
+#: konsole.cpp:1130
 msgid "Clear &History"
 msgstr "清除历史(&H)"
 
-#: konsole.cpp:1073
+#: konsole.cpp:1134
 msgid "Clear All H&istories"
 msgstr "清除全部历史记录(&I)"
 
-#: konsole.cpp:1084
+#: konsole.cpp:1148
 msgid "&ZModem Upload..."
 msgstr "&ZModem 上传..."
 
-#: konsole.cpp:1104
+#: konsole.cpp:1168
 msgid "Hide &Menubar"
 msgstr "隐藏菜单栏(&M)"
 
-#: konsole.cpp:1110
+#: konsole.cpp:1174
 msgid "Save Sessions &Profile..."
 msgstr "保存会话配置(&P)..."
 
-#: konsole.cpp:1121
+#: konsole.cpp:1185
 msgid "&Print Screen..."
 msgstr "打印屏幕(&P)..."
 
-#: konsole.cpp:1126
+#: konsole.cpp:1190
 msgid "New Session"
 msgstr "新建会话"
 
-#: konsole.cpp:1127
+#: konsole.cpp:1191
 msgid "Activate Menu"
 msgstr "激活菜单"
 
-#: konsole.cpp:1128
+#: konsole.cpp:1192
 msgid "List Sessions"
 msgstr "列出会话"
 
-#: konsole.cpp:1130
-msgid "&Move Session Left"
-msgstr "将会话左移(&M)"
-
-#: konsole.cpp:1133
-msgid "M&ove Session Right"
-msgstr "将会话右移(&O)"
-
-#: konsole.cpp:1137
+#: konsole.cpp:1207
 msgid "Go to Previous Session"
 msgstr "前往上一个会话"
 
-#: konsole.cpp:1139
+#: konsole.cpp:1209
 msgid "Go to Next Session"
 msgstr "前往下一个会话"
 
-#: konsole.cpp:1143
+#: konsole.cpp:1213
 #, c-format
 msgid "Switch to Session %1"
 msgstr "切换到会话 %1"
 
-#: konsole.cpp:1146
+#: konsole.cpp:1216
 msgid "Enlarge Font"
 msgstr "增大字体"
 
-#: konsole.cpp:1147
+#: konsole.cpp:1217
 msgid "Shrink Font"
 msgstr "减小字体"
 
-#: konsole.cpp:1149
+#: konsole.cpp:1219
 msgid "Toggle Bidi"
 msgstr "切换双向文字"
 
-#: konsole.cpp:1196
+#: konsole.cpp:1266
 msgid ""
 "You have open sessions (besides the current one). These will be killed if you "
 "continue.\n"
@@ -385,29 +392,29 @@ msgstr ""
 "如果您继续，这些会话会中断。\n"
 "您确定要退出吗？"
 
-#: konsole.cpp:1199
+#: konsole.cpp:1269
 msgid "Really Quit?"
 msgstr "真的退出吗？"
 
-#: konsole.cpp:1232
+#: konsole.cpp:1302
 msgid ""
 "The application running in Konsole does not respond to the close request. Do "
 "you want Konsole to close anyway?"
 msgstr "运行于 Konsole 的应用程序没有响应关闭请求。您还是想要关闭 Konsole 吗？"
 
-#: konsole.cpp:1234
+#: konsole.cpp:1304
 msgid "Application Does Not Respond"
 msgstr "应用程序没有响应"
 
-#: konsole.cpp:1417
+#: konsole.cpp:1484
 msgid "Save Sessions Profile"
 msgstr "保存会话配置"
 
-#: konsole.cpp:1418
+#: konsole.cpp:1485
 msgid "Enter name under which the profile should be saved:"
 msgstr "请输入配置将要被保存的名称："
 
-#: konsole.cpp:1809
+#: konsole.cpp:1887
 msgid ""
 "If you want to use the bitmap fonts distributed with Konsole, they must be "
 "installed.  After installation, you must restart Konsole to use them.  Do you "
@@ -416,27 +423,27 @@ msgstr ""
 "如果您想要在 Konsole 中使用位图字体，则必须安装这些字体。安装后，您必须重新启动 Konsole 才能使用这些字体。您是否想要将下列字体安装到 "
 "fonts:/个人？"
 
-#: konsole.cpp:1811
+#: konsole.cpp:1889
 msgid "Install Bitmap Fonts?"
 msgstr "安装位图字体吗？"
 
-#: konsole.cpp:1812
+#: konsole.cpp:1890
 msgid "&Install"
 msgstr "安装(&I)"
 
-#: konsole.cpp:1813
+#: konsole.cpp:1891
 msgid "Do Not Install"
 msgstr "不安装"
 
-#: konsole.cpp:1825
+#: konsole.cpp:1903
 msgid "Could not install %1 into fonts:/Personal/"
 msgstr "无法将 %1 安装到 fonts:/Personal/"
 
-#: konsole.cpp:1909
+#: konsole.cpp:1987
 msgid "Use the right mouse button to bring back the menu"
 msgstr "使用右键重新显示菜单"
 
-#: konsole.cpp:2034
+#: konsole.cpp:2112
 msgid ""
 "You have chosen one or more Ctrl+<key> combinations to be used as shortcuts. As "
 "a result these key combinations will no longer be passed to the command shell "
@@ -456,82 +463,87 @@ msgstr ""
 "\n"
 "您目前正在使用下列 Ctrl+<按键> 组合："
 
-#: konsole.cpp:2044
+#: konsole.cpp:2122
 msgid "Choice of Shortcut Keys"
 msgstr "快捷键选择"
 
-#: konsole.cpp:2431
+#: konsole.cpp:2525
 msgid ""
 "_: abbreviation of number\n"
 "%1 No. %2"
 msgstr "第 %2 个 %1"
 
-#: konsole.cpp:2486
+#: konsole.cpp:2580
 msgid "Session List"
 msgstr "会话列表"
 
-#: konsole.cpp:2991
+#: konsole.cpp:3087
 msgid "Are you sure that you want to close the current session?"
 msgstr "您真的想要关闭当前会话吗？"
 
-#: konsole.cpp:2992
+#: konsole.cpp:3088
 msgid "Close Confirmation"
 msgstr "关闭确认"
 
-#: konsole.cpp:3373 konsole.cpp:3431 konsole.cpp:3452
+#: konsole.cpp:3467 konsole.cpp:3525 konsole.cpp:3546
 msgid "New "
 msgstr "新建"
 
-#: konsole.cpp:3417 konsole.cpp:3419 konsole.cpp:3435 konsole.cpp:3437
+#: konsole.cpp:3511 konsole.cpp:3513 konsole.cpp:3529 konsole.cpp:3531
 msgid "New &Window"
 msgstr "新建窗口(&W)"
 
-#: konsole.cpp:3461
+#: konsole.cpp:3555
 msgid "New Shell at Bookmark"
 msgstr "在书签新建 Shell"
 
-#: konsole.cpp:3464
+#: konsole.cpp:3558
 msgid "Shell at Bookmark"
 msgstr "书签处的 Shell"
 
-#: konsole.cpp:3475
+#: konsole.cpp:3569
 #, c-format
 msgid ""
 "_: Screen is a program controlling screens!\n"
 "Screen at %1"
 msgstr "在 %1 上运行 screen"
 
-#: konsole.cpp:3788
+#: konsole.cpp:3888
 msgid "Rename Session"
 msgstr "重命名会话"
 
-#: konsole.cpp:3789
+#: konsole.cpp:3889
 msgid "Session name:"
 msgstr "会话名："
 
-#: konsole.cpp:3824 konsole_part.cpp:969
+#: konsole.cpp:3924 konsole_part.cpp:996
 msgid "History Configuration"
 msgstr "历史配置"
 
-#: konsole.cpp:3832 konsole_part.cpp:977
+#: konsole.cpp:3932 konsole_part.cpp:1004
 msgid "&Enable"
 msgstr "启用(&E)"
 
-#: konsole.cpp:3835
+#: konsole.cpp:3935
 msgid "&Number of lines: "
 msgstr "行数(&N)："
 
-#: konsole.cpp:3839 konsole_part.cpp:984
+#: konsole.cpp:3939 konsole_part.cpp:1011
 msgid ""
 "_: Unlimited (number of lines)\n"
 "Unlimited"
 msgstr "无限制"
 
-#: konsole.cpp:3843 konsole_part.cpp:986
+#: konsole.cpp:3943 konsole_part.cpp:1013
 msgid "&Set Unlimited"
 msgstr "设置无限制(&S)"
 
-#: konsole.cpp:4000
+#: konsole.cpp:4071
+#, c-format
+msgid "%1"
+msgstr ""
+
+#: konsole.cpp:4128
 msgid ""
 "End of history reached.\n"
 "Continue from the beginning?"
@@ -539,11 +551,11 @@ msgstr ""
 "已经到达历史记录的结尾处。\n"
 "从开始处继续？"
 
-#: konsole.cpp:4001 konsole.cpp:4009 konsole.cpp:4018
+#: konsole.cpp:4129 konsole.cpp:4137 konsole.cpp:4146
 msgid "Find"
 msgstr "查找"
 
-#: konsole.cpp:4008
+#: konsole.cpp:4136
 msgid ""
 "Beginning of history reached.\n"
 "Continue from the end?"
@@ -551,21 +563,21 @@ msgstr ""
 "已经到达历史记录的开始处。\n"
 "从结尾处继续？"
 
-#: konsole.cpp:4017
+#: konsole.cpp:4145
 msgid "Search string '%1' not found."
 msgstr "字符串“%1”没有找到"
 
-#: konsole.cpp:4034
+#: konsole.cpp:4162
 msgid "Save History"
 msgstr "保存历史"
 
-#: konsole.cpp:4040
+#: konsole.cpp:4168
 msgid ""
 "This is not a local file.\n"
 msgstr ""
 "这不是本地文件。\n"
 
-#: konsole.cpp:4050
+#: konsole.cpp:4178
 msgid ""
 "A file with this name already exists.\n"
 "Do you want to overwrite it?"
@@ -573,27 +585,27 @@ msgstr ""
 "已经存在这个名字的文件。\n"
 "您想覆盖它吗？"
 
-#: konsole.cpp:4050
+#: konsole.cpp:4178
 msgid "File Exists"
 msgstr "文件已存在"
 
-#: konsole.cpp:4050
+#: konsole.cpp:4178
 msgid "Overwrite"
 msgstr "覆盖"
 
-#: konsole.cpp:4055
+#: konsole.cpp:4183
 msgid "Unable to write to file."
 msgstr "无法写入文件。"
 
-#: konsole.cpp:4065
+#: konsole.cpp:4193
 msgid "Could not save history."
 msgstr "无法保存历史。"
 
-#: konsole.cpp:4076
+#: konsole.cpp:4204
 msgid "<p>The current session already has a ZModem file transfer in progress."
 msgstr "<p>当前会话已经有一个 ZModem 文件传送在进行。"
 
-#: konsole.cpp:4085
+#: konsole.cpp:4213
 msgid ""
 "<p>No suitable ZModem software was found on the system.\n"
 "<p>You may wish to install the 'rzsz' or 'lrzsz' package.\n"
@@ -601,11 +613,11 @@ msgstr ""
 "<p>系统中未发现有合适的 ZModem 软件。\n"
 "<p>您可以安装“rzsz”或者“lrzsz”软件包。\n"
 
-#: konsole.cpp:4092
+#: konsole.cpp:4220
 msgid "Select Files to Upload"
 msgstr "选择要上传的文件"
 
-#: konsole.cpp:4112
+#: konsole.cpp:4240
 msgid ""
 "<p>A ZModem file transfer attempt has been detected, but no suitable ZModem "
 "software was found on the system.\n"
@@ -614,7 +626,7 @@ msgstr ""
 "<p>检测到一个 ZModem 文件传送尝试，但系统中未发现合适的 ZModem 软件。\n"
 "<p>您可以安装‘rzsz’或者‘lrzsz’软件包。\n"
 
-#: konsole.cpp:4119
+#: konsole.cpp:4247
 msgid ""
 "A ZModem file transfer attempt has been detected.\n"
 "Please specify the folder you want to store the file(s):"
@@ -622,127 +634,131 @@ msgstr ""
 "检测到一个 ZModem 文件传送尝试。\n"
 "请指定您要存放此文件的文件夹："
 
-#: konsole.cpp:4122
+#: konsole.cpp:4250
 msgid "&Download"
 msgstr "下载(&D)"
 
-#: konsole.cpp:4123 konsole.cpp:4124
+#: konsole.cpp:4251 konsole.cpp:4252
 msgid "Start downloading file to specified folder."
 msgstr "开始将文件下载到指定的文件夹。"
 
-#: konsole.cpp:4140
+#: konsole.cpp:4268
 #, c-format
 msgid "Print %1"
 msgstr "打印 %1"
 
-#: konsole.cpp:4167
+#: konsole.cpp:4295
 msgid "Size Configuration"
 msgstr "大小配置"
 
-#: konsole.cpp:4181
+#: konsole.cpp:4309
 msgid "Number of columns:"
 msgstr "列数："
 
-#: konsole.cpp:4184 konsole_part.cpp:991
+#: konsole.cpp:4312 konsole_part.cpp:1018
 msgid "Number of lines:"
 msgstr "行数："
 
-#: konsole.cpp:4212
+#: konsole.cpp:4340
 msgid "As &regular expression"
 msgstr "作为正规表达式(&R)"
 
-#: konsole.cpp:4215
+#: konsole.cpp:4343
 msgid "&Edit..."
 msgstr "编辑(&E)..."
 
-#: konsole_part.cpp:92 main.cpp:168
+#: konsole_part.cpp:92 main.cpp:165
 msgid "Konsole"
 msgstr "Konsole"
 
-#: konsole_part.cpp:399
+#: konsole_part.cpp:400
 msgid "&History..."
 msgstr "历史(&H)..."
 
-#: konsole_part.cpp:405
+#: konsole_part.cpp:406
 msgid "Li&ne Spacing"
 msgstr "行间距(&N)"
 
-#: konsole_part.cpp:411
+#: konsole_part.cpp:412
 msgid "&0"
 msgstr "&0"
 
-#: konsole_part.cpp:412
+#: konsole_part.cpp:413
 msgid "&1"
 msgstr "&1"
 
-#: konsole_part.cpp:413
+#: konsole_part.cpp:414
 msgid "&2"
 msgstr "&2"
 
-#: konsole_part.cpp:414
+#: konsole_part.cpp:415
 msgid "&3"
 msgstr "&3"
 
-#: konsole_part.cpp:415
+#: konsole_part.cpp:416
 msgid "&4"
 msgstr "&4"
 
-#: konsole_part.cpp:416
+#: konsole_part.cpp:417
 msgid "&5"
 msgstr "&5"
 
-#: konsole_part.cpp:417
+#: konsole_part.cpp:418
 msgid "&6"
 msgstr "&6"
 
-#: konsole_part.cpp:418
+#: konsole_part.cpp:419
 msgid "&7"
 msgstr "&7"
 
-#: konsole_part.cpp:419
+#: konsole_part.cpp:420
 msgid "&8"
 msgstr "&8"
 
-#: konsole_part.cpp:424
+#: konsole_part.cpp:425
 msgid "Blinking &Cursor"
 msgstr "闪烁光标(&C)"
 
-#: konsole_part.cpp:429
+#: konsole_part.cpp:430
 msgid "Show Fr&ame"
 msgstr "显示边框(&A)"
 
-#: konsole_part.cpp:431
+#: konsole_part.cpp:432
 msgid "Hide Fr&ame"
 msgstr "隐藏边框(&A)"
 
-#: konsole_part.cpp:435
+#: konsole_part.cpp:436
+msgid "Me&ta key as Alt key"
+msgstr ""
+
+#: konsole_part.cpp:441
 msgid "Wor&d Connectors..."
 msgstr "字分隔符(&D)..."
 
-#: konsole_part.cpp:441
+#: konsole_part.cpp:447
 msgid "&Use Konsole's Settings"
 msgstr "使用 Konsole 的设置(&U)"
 
-#: konsole_part.cpp:480
+#: konsole_part.cpp:486
 msgid "&Close Terminal Emulator"
 msgstr "关闭终端模拟器(&C)"
 
-#: konsole_part.cpp:919
+#: konsole_part.cpp:946
 msgid "Word Connectors"
 msgstr "字分隔符"
 
-#: konsole_part.cpp:920
+#: konsole_part.cpp:947
 msgid ""
 "Characters other than alphanumerics considered part of a word when double "
 "clicking:"
 msgstr "当双击时，非字母表字符被当作词的一部分："
 
-#: kwrited.cpp:84
+#: kwrited.cpp:85
 #, c-format
 msgid "KWrited - Listening on Device %1"
 msgstr "KWrited - 在设备 %1 上监听"
 
-#: kwrited.cpp:117
+#: kwrited.cpp:118
 msgid "Clear Messages"
 msgstr "清除消息"
 
@@ -798,111 +814,107 @@ msgstr "不显示滚动条"
 msgid "Do not use Xft (anti-aliasing)"
 msgstr "不使用 Xft(平滑)"
 
-#: main.cpp:79
-msgid "Enable experimental support for real transparency"
-msgstr "允许真实透明的试验性支持"
-
-#: main.cpp:81
+#: main.cpp:78
 msgid "Terminal size in columns x lines"
 msgstr "列 x 行表示的终端大小"
 
-#: main.cpp:82
+#: main.cpp:79
 msgid "Terminal size is fixed"
 msgstr "终端大小固定"
 
-#: main.cpp:83
+#: main.cpp:80
 msgid "Start with given session type"
 msgstr "用给定的会话类型启动"
 
-#: main.cpp:84
+#: main.cpp:81
 msgid "List available session types"
 msgstr "列出可用的会话类型"
 
-#: main.cpp:85
+#: main.cpp:82
 msgid "Set keytab to 'name'"
 msgstr "将 keytab 设置为“name”"
 
-#: main.cpp:86
+#: main.cpp:83
 msgid "List available keytabs"
 msgstr "列出可用的 keytab"
 
-#: main.cpp:87
+#: main.cpp:84
 msgid "Start with given session profile"
 msgstr "用给定的会话配置启动"
 
-#: main.cpp:88
+#: main.cpp:85
 msgid "List available session profiles"
 msgstr "列出可用的会话配置"
 
-#: main.cpp:89
+#: main.cpp:86
 msgid "Set schema to 'name' or use 'file'"
 msgstr "将配色方案设置为“name”或使用“file”"
 
-#: main.cpp:91
+#: main.cpp:88
 msgid "List available schemata"
 msgstr "列出可用的方案"
 
-#: main.cpp:92
+#: main.cpp:89
 msgid "Enable extended DCOP Qt functions"
 msgstr "启用扩展的 DCOP Qt 函数"
 
-#: main.cpp:93
+#: main.cpp:90
 msgid "Change working directory to 'dir'"
 msgstr "将工作目录更改为“dir”"
 
-#: main.cpp:94
+#: main.cpp:91
 msgid "Execute 'command' instead of shell"
 msgstr "执行“command”而不是 shell"
 
-#: main.cpp:96
+#: main.cpp:93
 msgid "Arguments for 'command'"
 msgstr "“command”的参数"
 
-#: main.cpp:171
+#: main.cpp:168
 msgid "Maintainer"
 msgstr "维护者"
 
-#: main.cpp:172
+#: main.cpp:169
 msgid "Author"
 msgstr "作者"
 
-#: main.cpp:174 main.cpp:177 main.cpp:180
+#: main.cpp:171 main.cpp:174 main.cpp:177
 msgid "bug fixing and improvements"
 msgstr "错误修正和改进"
 
-#: main.cpp:183 main.cpp:219 main.cpp:222 main.cpp:225 main.cpp:228
+#: main.cpp:180 main.cpp:216 main.cpp:219 main.cpp:222 main.cpp:225
 msgid "bug fixing"
 msgstr "错误修正"
 
-#: main.cpp:186
+#: main.cpp:183
 msgid "Solaris support and work on history"
 msgstr "Solaris 支持和历史"
 
-#: main.cpp:189
+#: main.cpp:186
 msgid "faster startup, bug fixing"
 msgstr "更快启动、错误修补"
 
-#: main.cpp:192
+#: main.cpp:189
 msgid "decent marking"
 msgstr "大方的记号"
 
-#: main.cpp:195
+#: main.cpp:192
 msgid ""
 "partification\n"
 "Toolbar and session names"
 msgstr "工具栏和会话名"
 
-#: main.cpp:199
+#: main.cpp:196
 msgid ""
 "partification\n"
 "overall improvements"
 msgstr "整体改进"
 
-#: main.cpp:203
+#: main.cpp:200
 msgid "transparency"
 msgstr "透明"
 
-#: main.cpp:206
+#: main.cpp:203
 msgid ""
 "most of main.C donated via kvt\n"
 "overall improvements"
@@ -910,19 +922,19 @@ msgstr ""
 "大多数的 main.C 由 kvt 贡献\n"
 "整体的改进"
 
-#: main.cpp:210
+#: main.cpp:207
 msgid "schema and selection improvements"
 msgstr "方案和选择改进"
 
-#: main.cpp:213
+#: main.cpp:210
 msgid "SGI Port"
 msgstr "SGI 移植"
 
-#: main.cpp:216
+#: main.cpp:213
 msgid "FreeBSD port"
 msgstr "FreeBSD 移植"
 
-#: main.cpp:230
+#: main.cpp:227
 msgid ""
 "Thanks to many others.\n"
 "The above list only reflects the contributors\n"
@@ -931,13 +943,13 @@ msgstr ""
 "感谢很多其他的人。\n"
 "上面的列表只是我能够保留记录的一部分贡献者。"
 
-#: main.cpp:337
+#: main.cpp:284
 msgid ""
 "You can't use BOTH -ls and -e.\n"
 msgstr ""
 "你不能同时使用 -ls 和 -e。\n"
 
-#: main.cpp:464
+#: main.cpp:411
 msgid ""
 "expected --vt_sz <#columns>x<#lines> e.g. 80x40\n"
 msgstr ""
@@ -1102,7 +1114,7 @@ msgstr "会话“%1”以信号 %2 退出。"
 msgid "Session '%1' exited unexpectedly."
 msgstr "会话“%1”意外退出。"
 
-#: session.cpp:649
+#: session.cpp:655
 msgid "ZModem Progress"
 msgstr "ZModem 进度"
 
@@ -1312,26 +1324,29 @@ msgstr ""
 "按左键的同时再按Shift键一样可以选择文本。\n"
 
 #: tips.cpp:153
+#, fuzzy
 msgid ""
 "<p>...that you can let Konsole set the current directory as the window title?\n"
-"For Bash, put 'export PS1=$PS1\"\\[\\e]0;\\H:\\w\\a\\]\"' in your ~/.bashrc .\n"
+"For Bash, put 'export PS1=$PS1\"\\[\\e[0m\\H:\\w\\a\\]\"' in your ~/.bashrc .\n"
 msgstr ""
 "<p>……您可以让 Konsole 把当前目录的名称设置为窗口标题。\n"
 "对于 Bash 来说，将“export PS1=$PS1\"\\[\\e]0;\\H:\\w\\a\\]\"”加到~/.bashrc中。\n"
 
 #: tips.cpp:159
+#, fuzzy
 msgid ""
 "<p>...that you can let Konsole set the current directory as the session name?\n"
-"For Bash, put 'export PS1=$PS1\"\\[\\e]30;\\H:\\w\\a\\]\"' in your ~/.bashrc .\n"
+"For Bash, put 'export PS1=$PS1\"\\[\\e[30m\\H:\\w\\a\\]\"' in your ~/.bashrc .\n"
 msgstr ""
 "<p>……您可以让 Konsole 把当前目录的名称设置为会话名称。\n"
 "对于 Bash 来说，将“export PS1=$PS1\"\\[\\e]30;\\H:\\w\\a\\]\"”加到~/.bashrc中。\n"
 
 #: tips.cpp:165
+#, fuzzy
 msgid ""
 "<p>...that if you let your shell pass the current directory to Konsole within "
 "the prompt\n"
-"variable, e.g. for Bash with 'export PS1=$PS1\"\\[\\e]31;\\w\\a\\]\"' in your "
+"variable, e.g. for Bash with 'export PS1=$PS1\"\\[\\e[31m\\w\\a\\]\"' in your "
 "~/.bashrc, then\n"
 "Konsole can bookmark it, and session management will remember your current "
 "working directory\n"
@@ -1343,6 +1358,28 @@ msgstr ""
 
 #: tips.cpp:173
 msgid ""
+"<p>...that working with remote hosts in Konsole can be made much easier by "
+"setting the\n"
+"prompt to correctly show your hostname and present path? Try setting your "
+"prompt in our\n"
+"~/.bashrc with: \"export PS1='\\[\\e[0m\\h:\\w> '\" You can then just select "
+"your prompt and\n"
+"press middle-mouse to paste it as the source or destination on the command "
+"line.\n"
+msgstr ""
+
+#: tips.cpp:181
+msgid ""
+"<p>...that you can temporarily set the prompt for Konsole by setting the 'PS1=' "
+"variable\n"
+"without having to edit your ~/.bashrc. Try entering the following on the "
+"command line to\n"
+"set your prompt. It will also include the current time before the path:\n"
+"PS1='\\[\\e[0;37m\\]\\A\\[\\e[1;34m\\] \\[\\e[1;34m\\]\\h:\\w> \\[\\e[0m\\]'\n"
+msgstr ""
+
+#: tips.cpp:189
+msgid ""
 "<p>...that double-clicking will select a whole word?\n"
 "<p>When you don't release the mouse button after the second click you\n"
 "can extend your selection by additional words when moving the mouse.\n"
@@ -1350,7 +1387,7 @@ msgstr ""
 "<p>……双击可以选择整个单词。\n"
 "<p>第二次点击后，移动鼠标而不松开鼠标键，就可以选择更多的单词。\n"
 
-#: tips.cpp:180
+#: tips.cpp:196
 msgid ""
 "<p>...that triple-clicking will select a whole line?\n"
 "<p>When you don't release the mouse button after the third click you\n"
@@ -1359,19 +1396,20 @@ msgstr ""
 "<p>……三次点击鼠标可以选择整行。\n"
 "<p>第三次点击后，移动鼠标而不松开鼠标键，就可以选择更多的行。\n"
 
-#: tips.cpp:187
+#: tips.cpp:203
+#, fuzzy
 msgid ""
 "<p>...that if you drag &amp; drop a URL into a Konsole window you are presented "
 "with a\n"
 "menu giving the option to copy or move the specified file into the current "
 "working directory,\n"
 "as well as just pasting the URL as text.\n"
-"<p>This works with any type of URL which TDE supports.\n"
+"<p>This works with any type of URL which KDE supports.\n"
 msgstr ""
 "<p>……如果您将 URL 拖放到 Konsole 窗口中，您将会看到一个菜单，其中的选项包括将文件复制/移动到当前工作目录中，以及将 URL 粘贴为文本。\n"
 "<p>只要 TDE 支持，任何类型的 URL 均如此对待。\n"
 
-#: tips.cpp:195
+#: tips.cpp:211
 msgid ""
 "<p>...that the \"Settings->Configure Shortcuts...\" dialog allows you to define "
 "keyboard shortcuts for actions\n"
@@ -1380,7 +1418,7 @@ msgid ""
 msgstr ""
 "<p>……“设置/配置快捷键...”对话框允许您为没有显示在菜单中的操作定义快捷键，比如激活菜单、更改字体以及列出并切换会话。\n"
 
-#: tips.cpp:201
+#: tips.cpp:217
 msgid ""
 "<p>...that right-clicking over the \"New\" button in the left corner of the "
 "tabbar or in an empty tabbar space displays a menu where you can set several "
@@ -1392,5 +1430,8 @@ msgstr ""
 msgid "&Stop"
 msgstr "停止(&S)"
 
+#~ msgid "Enable experimental support for real transparency"
+#~ msgstr "允许真实透明的试验性支持"
+
 #~ msgid "Do not use the ARGB32 visual (transparency)"
 #~ msgstr "不使用 ARGB32 视觉(透明)"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kpager.po b/tde-i18n-zh_CN/messages/tdebase/kpager.po
index 6dc51c40781..f5115104d8d 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kpager.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kpager.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kpager\n"
-"POT-Creation-Date: 2006-08-16 04:04+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-27 23:52+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kpersonalizer.po b/tde-i18n-zh_CN/messages/tdebase/kpersonalizer.po
index c0947cfcd87..ab7cfddfbc5 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kpersonalizer.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kpersonalizer.po
@@ -6,87 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2005-09-03 02:36+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-21 22:45+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Translator: Jiang Xiong <jxiong@linux.net.cn>\n"
 
-#: kstylepage.cpp:50
-msgid "Style"
-msgstr "风格"
-
-#: kstylepage.cpp:51
-msgid "Description"
-msgstr "描述"
-
-#: kstylepage.cpp:55
-msgid "Plastik"
-msgstr "塑料"
-
-#: kstylepage.cpp:55
-msgid "Light"
-msgstr "光线"
-
-#: kstylepage.cpp:56
-msgid "TDE default style"
-msgstr "TDE 默认风格"
-
-#: kstylepage.cpp:59
-msgid "TDE Classic"
-msgstr "TDE 经典"
-
-#: kstylepage.cpp:60
-msgid "Classic TDE style"
-msgstr "TDE 经典风格"
-
-#: kstylepage.cpp:63
-msgid "Keramik"
-msgstr "Keramik"
-
-#: kstylepage.cpp:64
-msgid "The previous default style"
-msgstr "先前的默认风格"
-
-#: kstylepage.cpp:67
-msgid "Sunshine"
-msgstr "阳光"
-
-#: kstylepage.cpp:68
-msgid "A very common desktop"
-msgstr "非常普通的桌面"
-
-#: kstylepage.cpp:71
-msgid "Redmond"
-msgstr "Redmond"
-
-#: kstylepage.cpp:72
-msgid "A style from the northwest of the USA"
-msgstr "来自美国西北某地的风格"
-
-#: kstylepage.cpp:75
-msgid "Platinum"
-msgstr "白金"
-
-#: kstylepage.cpp:76
-msgid "The platinum style"
-msgstr "白金风格"
-
-#: kcountrypage.cpp:48
-msgid "<h3>Welcome to TDE %1</h3>"
-msgstr "<h3>欢迎使用 TDE %1</h3>"
-
-#: kcountrypage.cpp:90 kcountrypage.cpp:117 kfindlanguage.cpp:82
-msgid "without name"
-msgstr "没有名字"
-
-#: kcountrypage.cpp:142
-msgid "All"
-msgstr "全部"
-
 #: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -99,81 +28,21 @@ msgid ""
 "Your emails"
 msgstr "i18n-translation@lists.linux.net.cn"
 
-#: main.cpp:27 main.cpp:38
-msgid "KPersonalizer"
-msgstr "个性化设置向导"
-
-#: main.cpp:31
-msgid "Personalizer is restarted by itself"
-msgstr "个性化向导自行重新启动"
-
-#: main.cpp:32
-msgid "Personalizer is running before TDE session"
-msgstr "在 TDE 会话前启动个性化向导"
-
-#: kpersonalizer.cpp:67
-msgid "Step 1: Introduction"
-msgstr "第一步：简介"
-
-#: kpersonalizer.cpp:71
-msgid "Step 2: I want it my Way..."
-msgstr "第二步：做我自己..."
-
-#: kpersonalizer.cpp:75
-msgid "Step 3: Eyecandy-O-Meter"
-msgstr "第三步：视觉效果"
-
-#: kpersonalizer.cpp:79
-msgid "Step 4: Everybody loves Themes"
-msgstr "第四步：应用主题"
-
-#: kpersonalizer.cpp:83
-msgid "Step 5: Time to Refine"
-msgstr "第五步：细微调整"
-
-#: kpersonalizer.cpp:86
-msgid "S&kip Wizard"
-msgstr "跳过向导(&K)"
-
-#: kpersonalizer.cpp:152
-msgid ""
-"<p>Are you sure you want to quit the Desktop Settings Wizard?</p>"
-"<p>The Desktop Settings Wizard helps you to configure the TDE desktop to your "
-"personal liking.</p>"
-"<p>Click <b>Cancel</b> to return and finish your setup.</p>"
-msgstr ""
-"<p>您确定想要退出桌面设置向导吗？</p>"
-"<p>桌面设置向导可以帮助您配置 TDE 桌面来符合您的胃口。</p>"
-"<p>单击<b>取消</b>返回并继续您的设置。</p>"
-
-#: kpersonalizer.cpp:156
-msgid ""
-"<p>Are you sure you want to quit the Desktop Settings Wizard?</p>"
-"<p>If yes, click <b>Quit</b> and all changes will be lost."
-"<br>If not, click <b>Cancel</b> to return and finish your setup.</p>"
-msgstr ""
-"<p>您确定想要退出桌面设置向导吗？</p>"
-"<p>如果是的话，单击<b>退出</b>就会丢弃所有更改。"
-"<br>如果不是的话，单击<b>取消</b>可以返回并继续您的设置。</p>"
-
-#: kpersonalizer.cpp:160
-msgid "All Changes Will Be Lost"
-msgstr "所有更改都将丢失"
-
 #: kospage.cpp:352
+#, fuzzy
 msgid ""
 "<b>Window activation:</b> <i>Focus on click</i>"
 "<br><b>Titlebar double-click:</b> <i>Shade window</i>"
-"<br><b>Mouse selection:</b> <i>Single click</i>"
-"<br><b>Application startup notification:</b> <i>busy cursor</i>"
-"<br><b>Keyboard scheme:</b> <i>TDE default</i>"
+"<br><b>Mouse selection:</b> <i>Double click</i>"
+"<br><b>Application startup notification:</b> <i>none</i>"
+"<br><b>Keyboard scheme:</b> <i>Trinity default</i>"
 "<br>"
 msgstr ""
 "<b>窗口激活：</b> <i>单击置为焦点</i>"
 "<br><b>双击标题栏：</b> <i>卷起窗口</i>"
-"<br><b>鼠标选择：</b> <i>单击</i>"
-"<br><b>应用程序启动通知：</b> <i>沙漏</i>"
-"<br><b>键盘模式：</b> <i>TDE 默认方式</i>"
+"<br><b>鼠标选择：</b> <i>双击</i>"
+"<br><b>应用程序启动通知：</b> <i>无</i>"
+"<br><b>键盘模式：</b> <i>Mac</i>"
 "<br>"
 
 #: kospage.cpp:364
@@ -193,11 +62,12 @@ msgstr ""
 "<br>"
 
 #: kospage.cpp:376
+#, fuzzy
 msgid ""
 "<b>Window activation:</b> <i>Focus on click</i>"
 "<br><b>Titlebar double-click:</b> <i>Maximize window</i>"
 "<br><b>Mouse selection:</b> <i>Double click</i>"
-"<br><b>Application startup notification:</b> <i>busy cursor</i>"
+"<br><b>Application startup notification:</b> <i>none</i>"
 "<br><b>Keyboard scheme:</b> <i>Windows</i>"
 "<br>"
 msgstr ""
@@ -224,85 +94,71 @@ msgstr ""
 "<br><b>键盘模式：</b> <i>Mac</i>"
 "<br>"
 
-#: keyecandypage.cpp:67
-msgid "Features"
-msgstr "特效"
-
-#: keyecandypage.cpp:71
-msgid "Desktop Wallpaper"
-msgstr "桌面墙纸"
-
-#: keyecandypage.cpp:73
-msgid "Window Moving/Resizing Effects"
-msgstr "窗口移动/改变大小特效"
-
-#: keyecandypage.cpp:75
-msgid "Display Contents in Moving/Resizing Windows"
-msgstr "窗口移动/改变大小时仍显示内容"
-
-#: keyecandypage.cpp:78
-msgid "File Manager Background Picture"
-msgstr "文件管理器背景图片"
+#: tdestylepage.cpp:50
+msgid "Style"
+msgstr "风格"
 
-#: keyecandypage.cpp:80
-msgid "Panel Background Picture"
-msgstr "TDE 面板背景图片"
+#: tdestylepage.cpp:51
+msgid "Description"
+msgstr "描述"
 
-#: keyecandypage.cpp:83
-msgid "Panel Icon Popups"
-msgstr "面板图标弹出"
+#: tdestylepage.cpp:55
+msgid "Plastik"
+msgstr "塑料"
 
-#: keyecandypage.cpp:85
-msgid "Icon Highlighting"
-msgstr "图标加亮"
+#: tdestylepage.cpp:55
+msgid "Light"
+msgstr "光线"
 
-#: keyecandypage.cpp:87
-msgid "File Manager Icon Animation"
-msgstr "文件管理器图标动画"
+#: tdestylepage.cpp:56
+msgid "TDE default style"
+msgstr "TDE 默认风格"
 
-#: keyecandypage.cpp:90
-msgid "Sound Theme"
-msgstr "配乐方案"
+#: tdestylepage.cpp:59
+#, fuzzy
+msgid "KDE Classic"
+msgstr "TDE 经典"
 
-#: keyecandypage.cpp:96
-msgid "Large Desktop Icons"
-msgstr "大桌面图标"
+#: tdestylepage.cpp:60
+#, fuzzy
+msgid "Classic KDE style"
+msgstr "TDE 经典风格"
 
-#: keyecandypage.cpp:98
-msgid "Large Panel Icons"
-msgstr "大面板图标"
+#: tdestylepage.cpp:63
+msgid "Keramik"
+msgstr "Keramik"
 
-#: keyecandypage.cpp:102
-msgid "Smoothed Fonts (Antialiasing)"
-msgstr "平滑字体(反锯齿)"
+#: tdestylepage.cpp:64
+msgid "The previous default style"
+msgstr "先前的默认风格"
 
-#: keyecandypage.cpp:106
-msgid "Preview Images"
-msgstr "预览图像"
+#: tdestylepage.cpp:67
+msgid "Sunshine"
+msgstr "阳光"
 
-#: keyecandypage.cpp:108
-msgid "Icons on Buttons"
-msgstr "按钮上的图标"
+#: tdestylepage.cpp:68
+msgid "A very common desktop"
+msgstr "非常普通的桌面"
 
-#: keyecandypage.cpp:112
-msgid "Animated Combo Boxes"
-msgstr "动画效果的组合框"
+#: tdestylepage.cpp:71
+msgid "Redmond"
+msgstr "Redmond"
 
-#: keyecandypage.cpp:116
-msgid "Fading Tooltips"
-msgstr "淡入淡出工具提示"
+#: tdestylepage.cpp:72
+msgid "A style from the northwest of the USA"
+msgstr "来自美国西北某地的风格"
 
-#: keyecandypage.cpp:119
-msgid "Preview Text Files"
-msgstr "预览文本文件"
+#: tdestylepage.cpp:75
+msgid "Platinum"
+msgstr "白金"
 
-#: keyecandypage.cpp:122
-msgid "Fading Menus"
-msgstr "淡入淡出菜单"
+#: tdestylepage.cpp:76
+msgid "The platinum style"
+msgstr "白金风格"
 
-#: keyecandypage.cpp:124
-msgid "Preview Other Files"
-msgstr "预览其它文件"
+#: kcountrypage.cpp:90 kcountrypage.cpp:117 kfindlanguage.cpp:82
+msgid "without name"
+msgstr "没有名字"
 
 #. i18n: file kcountrypagedlg.ui line 64
 #: rc.cpp:3
@@ -312,17 +168,17 @@ msgstr "请选择您使用的语言："
 
 #. i18n: file kcountrypagedlg.ui line 82
 #: rc.cpp:6
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<p>This Personalizer will help you configure the basic setup of your TDE "
+"<p>This Personalizer will help you configure the basic setup of your Trinity "
 "desktop in five quick, easy steps. You can set things like your country (for "
 "date and time formats, etc.), language, desktop behavior and more.</p>\n"
-"<p>You will be able to change all the settings later using the TDE Control "
+"<p>You will be able to change all the settings later using the Trinity Control "
 "Center. You may choose to postpone your personalization until later by clicking "
 "on <b>Skip Wizard</b>. Any changes made so far, will then be reversed, except "
 "for the country and language settings. However, new users are encouraged to use "
 "this simple method.</p>\n"
-"<p>If you already like your TDE configuration and wish to quit the Wizard, "
+"<p>If you already like your Trinity configuration and wish to quit the Wizard, "
 "click <b>Skip Wizard</b>, then <b>Quit</b>.</p>"
 msgstr ""
 "<p>个性化向导将协助您经过简便快捷的五个步骤，完成您 TDE "
@@ -333,8 +189,8 @@ msgstr ""
 
 #. i18n: file kcountrypagedlg.ui line 100
 #: rc.cpp:11
-#, no-c-format
-msgid "<h3>Welcome to TDE %VERSION%!</h3>"
+#, fuzzy, no-c-format
+msgid "<h3>Welcome to Trinity %VERSION%!</h3>"
 msgstr "<h3>欢迎使用 TDE %VERSION%！</h3>"
 
 #. i18n: file kcountrypagedlg.ui line 148
@@ -345,11 +201,11 @@ msgstr "请选择您所在的国家或地区："
 
 #. i18n: file keyecandypagedlg.ui line 64
 #: rc.cpp:17
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"<P>TDE offers many visually appealing special effects, such as smoothed fonts, "
-"previews in the file manager and animated menus. All this beauty, however, "
-"comes at a small performance cost. </P>\n"
+"<P>Trinity offers many visually appealing special effects, such as smoothed "
+"fonts, previews in the file manager and animated menus. All this beauty, "
+"however, comes at a small performance cost. </P>\n"
 "If you have a fast, new processor, you might want to turn them all on, but for "
 "those of us with slower processors, starting off with less eye candy helps to "
 "keep your desktop more responsive."
@@ -433,12 +289,12 @@ msgstr "Apple MacOS (R)"
 
 #. i18n: file kospagedlg.ui line 126
 #: rc.cpp:56
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
 "<b>System Behavior</b>"
 "<br>\n"
 "Graphical User Interfaces behave differently on various Operating Systems.\n"
-"TDE allows you to customize its behavior according to your needs."
+"Trinity allows you to customize its behavior according to your needs."
 msgstr ""
 "<b>系统行为</b>"
 "<br>\n"
@@ -447,10 +303,10 @@ msgstr ""
 
 #. i18n: file kospagedlg.ui line 168
 #: rc.cpp:61
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"For motion impaired users, TDE provides keyboard gestures to activate special "
-"keyboard settings."
+"For motion impaired users, Trinity provides keyboard gestures to activate "
+"special keyboard settings."
 msgstr "对于行动不便的用户，TDE 提供了键盘手势来激活特殊的键盘设置。"
 
 #. i18n: file kospagedlg.ui line 179
@@ -490,58 +346,213 @@ msgstr "您也可以使用下面的按钮来启动 TDE 控制中心。"
 msgid "&Launch Trinity Control Center"
 msgstr "启动 TDE 控制中心(&L)"
 
-#. i18n: file kstylepagedlg.ui line 32
-#: rc.cpp:80
-#, no-c-format
-msgid ""
-"Please choose the way your computer should look by selecting one of the items "
-"below."
-msgstr "请用下面的选项选择您电脑的外观风格。"
-
-#. i18n: file kstylepagedlg.ui line 89
-#: rc.cpp:83
-#, no-c-format
-msgid "Preview"
-msgstr "预览"
-
 #. i18n: file stylepreview.ui line 42
-#: rc.cpp:86
+#: rc.cpp:80
 #, no-c-format
 msgid "Tab 1"
 msgstr "标签 1"
 
 #. i18n: file stylepreview.ui line 61
-#: rc.cpp:89
+#: rc.cpp:83
 #, no-c-format
 msgid "Button"
 msgstr "按钮"
 
 #. i18n: file stylepreview.ui line 72
-#: rc.cpp:92
+#: rc.cpp:86
 #, no-c-format
 msgid "ComboBox"
 msgstr "组合框"
 
 #. i18n: file stylepreview.ui line 92
-#: rc.cpp:95
+#: rc.cpp:89
 #, no-c-format
 msgid "Button Group"
 msgstr "按钮组"
 
 #. i18n: file stylepreview.ui line 103
-#: rc.cpp:98 rc.cpp:101
+#: rc.cpp:92 rc.cpp:95
 #, no-c-format
 msgid "RadioButton"
 msgstr "单选钮"
 
 #. i18n: file stylepreview.ui line 136
-#: rc.cpp:104
+#: rc.cpp:98
 #, no-c-format
 msgid "CheckBox"
 msgstr "复选框"
 
 #. i18n: file stylepreview.ui line 165
-#: rc.cpp:107
+#: rc.cpp:101
 #, no-c-format
 msgid "Tab 2"
 msgstr "标签 2"
+
+#. i18n: file tdestylepagedlg.ui line 32
+#: rc.cpp:104
+#, no-c-format
+msgid ""
+"Please choose the way your computer should look by selecting one of the items "
+"below."
+msgstr "请用下面的选项选择您电脑的外观风格。"
+
+#. i18n: file tdestylepagedlg.ui line 89
+#: rc.cpp:107
+#, no-c-format
+msgid "Preview"
+msgstr "预览"
+
+#: keyecandypage.cpp:69
+msgid "Features"
+msgstr "特效"
+
+#: keyecandypage.cpp:73
+msgid "Desktop Wallpaper"
+msgstr "桌面墙纸"
+
+#: keyecandypage.cpp:75
+msgid "Window Moving/Resizing Effects"
+msgstr "窗口移动/改变大小特效"
+
+#: keyecandypage.cpp:77
+msgid "Display Contents in Moving/Resizing Windows"
+msgstr "窗口移动/改变大小时仍显示内容"
+
+#: keyecandypage.cpp:80
+msgid "File Manager Background Picture"
+msgstr "文件管理器背景图片"
+
+#: keyecandypage.cpp:82
+msgid "Panel Background Picture"
+msgstr "TDE 面板背景图片"
+
+#: keyecandypage.cpp:85
+msgid "Panel Icon Popups"
+msgstr "面板图标弹出"
+
+#: keyecandypage.cpp:87
+msgid "Icon Highlighting"
+msgstr "图标加亮"
+
+#: keyecandypage.cpp:89
+msgid "File Manager Icon Animation"
+msgstr "文件管理器图标动画"
+
+#: keyecandypage.cpp:92
+msgid "Sound Theme"
+msgstr "配乐方案"
+
+#: keyecandypage.cpp:98
+msgid "Large Desktop Icons"
+msgstr "大桌面图标"
+
+#: keyecandypage.cpp:100
+msgid "Large Panel Icons"
+msgstr "大面板图标"
+
+#: keyecandypage.cpp:104
+msgid "Smoothed Fonts (Antialiasing)"
+msgstr "平滑字体(反锯齿)"
+
+#: keyecandypage.cpp:108
+msgid "Preview Images"
+msgstr "预览图像"
+
+#: keyecandypage.cpp:110
+msgid "Icons on Buttons"
+msgstr "按钮上的图标"
+
+#: keyecandypage.cpp:114
+msgid "Animated Combo Boxes"
+msgstr "动画效果的组合框"
+
+#: keyecandypage.cpp:118
+msgid "Fading Tooltips"
+msgstr "淡入淡出工具提示"
+
+#: keyecandypage.cpp:121
+msgid "Preview Text Files"
+msgstr "预览文本文件"
+
+#: keyecandypage.cpp:124
+msgid "Fading Menus"
+msgstr "淡入淡出菜单"
+
+#: keyecandypage.cpp:126
+msgid "Preview Other Files"
+msgstr "预览其它文件"
+
+#: kpersonalizer.cpp:67
+msgid "Step 1: Introduction"
+msgstr "第一步：简介"
+
+#: kpersonalizer.cpp:71
+msgid "Step 2: I want it my Way..."
+msgstr "第二步：做我自己..."
+
+#: kpersonalizer.cpp:75
+msgid "Step 3: Eyecandy-O-Meter"
+msgstr "第三步：视觉效果"
+
+#: kpersonalizer.cpp:79
+msgid "Step 4: Everybody loves Themes"
+msgstr "第四步：应用主题"
+
+#: kpersonalizer.cpp:83
+msgid "Step 5: Time to Refine"
+msgstr "第五步：细微调整"
+
+#: kpersonalizer.cpp:86
+msgid "S&kip Wizard"
+msgstr "跳过向导(&K)"
+
+#: kpersonalizer.cpp:152
+#, fuzzy
+msgid ""
+"<p>Are you sure you want to quit the Desktop Settings Wizard?</p>"
+"<p>The Desktop Settings Wizard helps you to configure the Trinity desktop to "
+"your personal liking.</p>"
+"<p>Click <b>Cancel</b> to return and finish your setup.</p>"
+msgstr ""
+"<p>您确定想要退出桌面设置向导吗？</p>"
+"<p>桌面设置向导可以帮助您配置 TDE 桌面来符合您的胃口。</p>"
+"<p>单击<b>取消</b>返回并继续您的设置。</p>"
+
+#: kpersonalizer.cpp:156
+msgid ""
+"<p>Are you sure you want to quit the Desktop Settings Wizard?</p>"
+"<p>If yes, click <b>Quit</b> and all changes will be lost."
+"<br>If not, click <b>Cancel</b> to return and finish your setup.</p>"
+msgstr ""
+"<p>您确定想要退出桌面设置向导吗？</p>"
+"<p>如果是的话，单击<b>退出</b>就会丢弃所有更改。"
+"<br>如果不是的话，单击<b>取消</b>可以返回并继续您的设置。</p>"
+
+#: kpersonalizer.cpp:160
+msgid "All Changes Will Be Lost"
+msgstr "所有更改都将丢失"
+
+#: kcountrypage.cpp:48
+#, fuzzy
+msgid "<h3>Welcome to Trinity %1</h3>"
+msgstr "<h3>欢迎使用 TDE %1</h3>"
+
+#: kcountrypage.cpp:142
+msgid "All"
+msgstr "全部"
+
+#: main.cpp:27 main.cpp:38
+msgid "KPersonalizer"
+msgstr "个性化设置向导"
+
+#: main.cpp:31
+msgid "Personalizer is restarted by itself"
+msgstr "个性化向导自行重新启动"
+
+#: main.cpp:32
+#, fuzzy
+msgid "Personalizer is running before Trinity session"
+msgstr "在 TDE 会话前启动个性化向导"
+
+#~ msgid "<b>Window activation:</b> <i>Focus on click</i><br><b>Titlebar double-click:</b> <i>Shade window</i><br><b>Mouse selection:</b> <i>Single click</i><br><b>Application startup notification:</b> <i>busy cursor</i><br><b>Keyboard scheme:</b> <i>TDE default</i><br>"
+#~ msgstr "<b>窗口激活：</b> <i>单击置为焦点</i><br><b>双击标题栏：</b> <i>卷起窗口</i><br><b>鼠标选择：</b> <i>单击</i><br><b>应用程序启动通知：</b> <i>沙漏</i><br><b>键盘模式：</b> <i>TDE 默认方式</i><br>"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kprinter.po b/tde-i18n-zh_CN/messages/tdebase/kprinter.po
index 11c6e3dcf35..caba1dbb329 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kprinter.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kprinter.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kprinter\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-28 14:09+0800\n"
 "Last-Translator: Li Zongliang <li-zongliang@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/krdb.po b/tde-i18n-zh_CN/messages/tdebase/krdb.po
index 83c31812e59..b4c4c47f395 100644
--- a/tde-i18n-zh_CN/messages/tdebase/krdb.po
+++ b/tde-i18n-zh_CN/messages/tdebase/krdb.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: krdb\n"
-"POT-Creation-Date: 2006-05-17 03:54+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-01-12 22:51-0500\n"
 "Last-Translator: Funda Wang <fundawang@en2china.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kreadconfig.po b/tde-i18n-zh_CN/messages/tdebase/kreadconfig.po
index 7f605dd389e..8133076d1a1 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kreadconfig.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kreadconfig.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kreadconfig\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-28 14:07+0800\n"
 "Last-Translator: Li Zongliang <li-zongliang@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/krunapplet.po b/tde-i18n-zh_CN/messages/tdebase/krunapplet.po
index 428b6b745f3..bf1bc221f75 100644
--- a/tde-i18n-zh_CN/messages/tdebase/krunapplet.po
+++ b/tde-i18n-zh_CN/messages/tdebase/krunapplet.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: krunapplet\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2002-10-12 00:53+0800\n"
 "Last-Translator: Xie Yuheng <phycommusyee@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/ksmserver.po b/tde-i18n-zh_CN/messages/tdebase/ksmserver.po
index 229a4a6d977..025b7a3a441 100644
--- a/tde-i18n-zh_CN/messages/tdebase/ksmserver.po
+++ b/tde-i18n-zh_CN/messages/tdebase/ksmserver.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksmserver\n"
-"POT-Creation-Date: 2007-03-07 02:42+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,39 +49,222 @@ msgstr ""
 "启动“wm”。缺省是“twin”"
 
 #: main.cpp:38
+msgid "Pass additional arguments to the window manager. Default is ''"
+msgstr ""
+
+#: main.cpp:39
 msgid "Also allow remote connections"
 msgstr "允许远程连接"
 
-#: main.cpp:182
+#: main.cpp:183
 msgid "The TDE Session Manager"
 msgstr "TDE 会话管理器"
 
-#: main.cpp:186
+#: main.cpp:187
 msgid "Maintainer"
 msgstr "维护者"
 
-#: shutdown.cpp:349
+#: shutdown.cpp:268
+msgid "Notifying applications of logout request..."
+msgstr ""
+
+#: shutdown.cpp:504 shutdown.cpp:535
+msgid "Skip Notification (%1)"
+msgstr ""
+
+#: shutdown.cpp:506
+msgid "Notifying remaining applications of logout request (%1/%2)..."
+msgstr ""
+
+#: shutdown.cpp:509
+msgid "Notifying remaining applications of logout request (%1/%2, %3)..."
+msgstr ""
+
+#: shutdown.cpp:516
+msgid "Ignore and Resume Logout"
+msgstr ""
+
+#: shutdown.cpp:524
+msgid "An application is requesting attention, logout paused..."
+msgstr ""
+
+#: shutdown.cpp:527
+msgid "%3 is requesting attention, logout paused..."
+msgstr ""
+
+#: shutdown.cpp:537
+msgid "Notifying applications of logout request (%1/%2)..."
+msgstr ""
+
+#: shutdown.cpp:540
+msgid "Notifying applications of logout request (%1/%2, %3)..."
+msgstr ""
+
+#: shutdown.cpp:630
 msgid "Logout canceled by '%1'"
 msgstr "“%1”取消了注销"
 
-#: shutdowndlg.cpp:102
+#: shutdown.cpp:636
+#, fuzzy
+msgid "Logout canceled by user"
+msgstr "“%1”取消了注销"
+
+#: shutdown.cpp:695
+msgid "Forcing interacting application termination"
+msgstr ""
+
+#: shutdown.cpp:745
+msgid "Notifying remaining applications of logout request..."
+msgstr ""
+
+#: shutdown.cpp:775
+msgid "Synchronizing remote folders"
+msgstr ""
+
+#: shutdown.cpp:781 shutdowndlg.cpp:1279
+msgid "Saving your settings..."
+msgstr ""
+
+#: shutdown.cpp:831 shutdown.cpp:904
+msgid "Closing applications (%1/%2)..."
+msgstr ""
+
+#: shutdown.cpp:834 shutdown.cpp:907
+msgid "Closing applications (%1/%2, %3)..."
+msgstr ""
+
+#: shutdown.cpp:915
+msgid "Terminating services..."
+msgstr ""
+
+#: shutdowndlg.cpp:728
 msgid "End Session for \"%1\""
 msgstr "结束“%1”的会话"
 
-#: shutdowndlg.cpp:128
+#: shutdowndlg.cpp:753
+msgid "Log out"
+msgstr ""
+
+#: shutdowndlg.cpp:784
 msgid "&End Current Session"
 msgstr "结束当前会话(&E)"
 
-#: shutdowndlg.cpp:136
-msgid "&Turn Off Computer"
-msgstr "关闭计算机(&T)"
+#: shutdowndlg.cpp:785
+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:144
-msgid "&Restart Computer"
+#: shutdowndlg.cpp:883
+msgid "&Freeze"
+msgstr ""
+
+#: shutdowndlg.cpp:895
+msgid "&Suspend"
+msgstr ""
+
+#: shutdowndlg.cpp:907
+msgid "&Hibernate"
+msgstr ""
+
+#: shutdowndlg.cpp:925
+#, fuzzy
+msgid "&Restart"
 msgstr "重启计算机(&R)"
 
-#: shutdowndlg.cpp:164
+#: shutdowndlg.cpp:949 shutdowndlg.cpp:1025
 msgid ""
 "_: current option in boot loader\n"
 " (current)"
 msgstr " (当前)"
+
+#: shutdowndlg.cpp:965
+#, fuzzy
+msgid "&Turn Off"
+msgstr "关闭计算机(&T)"
+
+#: shutdowndlg.cpp:990
+msgid "&Turn Off Computer"
+msgstr "关闭计算机(&T)"
+
+#: shutdowndlg.cpp:991
+msgid ""
+"<qt>"
+"<h3>Turn Off Computer</h3>"
+"<p>Log out of the current session and turn off the computer</p></qt>"
+msgstr ""
+
+#: shutdowndlg.cpp:1002
+msgid "&Restart Computer"
+msgstr "重启计算机(&R)"
+
+#: shutdowndlg.cpp:1003
+msgid ""
+"<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:1039
+#, fuzzy
+msgid "&Freeze Computer"
+msgstr "重启计算机(&R)"
+
+#: shutdowndlg.cpp:1047
+#, fuzzy
+msgid "&Suspend Computer"
+msgstr "关闭计算机(&T)"
+
+#: shutdowndlg.cpp:1055
+#, fuzzy
+msgid "&Hibernate Computer"
+msgstr "重启计算机(&R)"
+
+#: shutdowndlg.cpp:1281
+msgid "Skip Notification"
+msgstr ""
+
+#: shutdowndlg.cpp:1282
+msgid "Abort Logout"
+msgstr ""
+
+#: shutdowndlg.cpp:1337
+msgid "Would you like to turn off your computer?"
+msgstr ""
+
+#: shutdowndlg.cpp:1338
+msgid ""
+"This computer will turn off automatically\n"
+"after %1 seconds."
+msgstr ""
+
+#: shutdowndlg.cpp:1344
+msgid "Would you like to reboot your computer?"
+msgstr ""
+
+#: shutdowndlg.cpp:1346
+msgid "Would you like to reboot to \"%1\"?"
+msgstr ""
+
+#: shutdowndlg.cpp:1347
+msgid ""
+"This computer will reboot automatically\n"
+"after %1 seconds."
+msgstr ""
+
+#: shutdowndlg.cpp:1351
+msgid "Would you like to end your current session?"
+msgstr ""
+
+#: shutdowndlg.cpp:1352
+msgid ""
+"This session will end\n"
+"after %1 seconds automatically."
+msgstr ""
+
+#: startupdlg.cpp:78
+msgid "Loading your settings"
+msgstr ""
diff --git a/tde-i18n-zh_CN/messages/tdebase/ksplash.po b/tde-i18n-zh_CN/messages/tdebase/ksplash.po
index aa2ddb8988f..bb32f488d2f 100644
--- a/tde-i18n-zh_CN/messages/tdebase/ksplash.po
+++ b/tde-i18n-zh_CN/messages/tdebase/ksplash.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksplash\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-18 21:47+0800\n"
 "Last-Translator: Yan Shuangchun <yahzee@d3eye.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,13 +58,15 @@ msgid "KSplash"
 msgstr "KSplash"
 
 #: main.cpp:46
-msgid "TDE splash screen"
+#, fuzzy
+msgid "Trinity splash screen"
 msgstr "TDE 启动画面"
 
 #: main.cpp:48
+#, fuzzy
 msgid ""
 "(c) 2001 - 2003, Flaming Sword Productions\n"
-" (c) 2003 TDE developers"
+" (c) 2003 KDE developers"
 msgstr ""
 "(c) 2001 - 2003, Flaming Sword Productions\n"
 " (c) 2003 TDE 开发者"
@@ -105,5 +108,6 @@ msgid "Restoring session"
 msgstr "恢复会话"
 
 #: themeengine/objkstheme.cpp:135
-msgid "TDE is up and running"
+#, fuzzy
+msgid "Trinity is up and running"
 msgstr "TDE 启动完毕并正在运行"
diff --git a/tde-i18n-zh_CN/messages/tdebase/ksplashthemes.po b/tde-i18n-zh_CN/messages/tdebase/ksplashthemes.po
index 0c85a9b2421..27ef73fd89d 100644
--- a/tde-i18n-zh_CN/messages/tdebase/ksplashthemes.po
+++ b/tde-i18n-zh_CN/messages/tdebase/ksplashthemes.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksplashthemes\n"
-"POT-Creation-Date: 2006-08-24 02:34+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-21 00:35+0800\n"
 "Last-Translator: Yan Shuangchun <yahzee@d3eye.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -108,7 +109,8 @@ msgid "TDE splash screen theme manager"
 msgstr "TDE 飞溅屏幕主题管理器"
 
 #: main.cpp:68
-msgid "(c) 2003 TDE developers"
+#, fuzzy
+msgid "(c) 2003 KDE developers"
 msgstr "(c) 2003 TDE 开发者"
 
 #: main.cpp:70
diff --git a/tde-i18n-zh_CN/messages/tdebase/kstart.po b/tde-i18n-zh_CN/messages/tdebase/kstart.po
index 35c2d307e9b..1bc6f888815 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kstart.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kstart.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kstart\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-17 11:52+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/ksystemtrayapplet.po b/tde-i18n-zh_CN/messages/tdebase/ksystemtrayapplet.po
index 4a3d38c43f3..fe7c9815198 100644
--- a/tde-i18n-zh_CN/messages/tdebase/ksystemtrayapplet.po
+++ b/tde-i18n-zh_CN/messages/tdebase/ksystemtrayapplet.po
@@ -6,27 +6,32 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksystemtrayapplet\n"
-"POT-Creation-Date: 2008-08-14 01:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2001-04-08 18:30+0800\n"
 "Last-Translator: Li Zongliang <li-zongliang@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: systemtrayapplet.cpp:205
+#: systemtrayapplet.cpp:237
 msgid "Configure System Tray"
 msgstr "配置系统托盘"
 
-#: systemtrayapplet.cpp:214
-msgid "Visible icons:"
-msgstr "可见图标："
+#: systemtrayapplet.cpp:247
+msgid "Show Clock in Tray"
+msgstr ""
 
-#: systemtrayapplet.cpp:215
+#: systemtrayapplet.cpp:252
 msgid "Hidden icons:"
 msgstr "隐藏图标："
 
-#: systemtrayapplet.cpp:726
+#: systemtrayapplet.cpp:253
+msgid "Visible icons:"
+msgstr "可见图标："
+
+#: systemtrayapplet.cpp:844
 msgid "Configure System Tray..."
 msgstr "配置系统托盘..."
 
diff --git a/tde-i18n-zh_CN/messages/tdebase/ksystraycmd.po b/tde-i18n-zh_CN/messages/tdebase/ksystraycmd.po
index d87b328a358..31a9dc2a2f2 100644
--- a/tde-i18n-zh_CN/messages/tdebase/ksystraycmd.po
+++ b/tde-i18n-zh_CN/messages/tdebase/ksystraycmd.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksystraycmd\n"
-"POT-Creation-Date: 2006-08-12 04:01+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-07-17 10:09+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kthememanager.po b/tde-i18n-zh_CN/messages/tdebase/kthememanager.po
index 0a32b140ba3..2c71bef5b70 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kthememanager.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kthememanager.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kthememanager\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-05 13:58+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/ktip.po b/tde-i18n-zh_CN/messages/tdebase/ktip.po
index aa61f368b71..2a2008eb01d 100644
--- a/tde-i18n-zh_CN/messages/tdebase/ktip.po
+++ b/tde-i18n-zh_CN/messages/tdebase/ktip.po
@@ -7,72 +7,34 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ktip\n"
-"POT-Creation-Date: 2006-11-23 02:35+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-08-10 08:37+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "TDE 中文翻译组"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "i18n-translation@lists.linux.net.cn"
-
-#: ktipwindow.cpp:32
-msgid "Useful tips"
-msgstr "有用的小提示"
-
-#: ktipwindow.cpp:36
-msgid "KTip"
-msgstr "KTip"
-
-#: ktipwindow.cpp:52
-msgid "Useful Tips"
-msgstr "有用的小提示"
-
-#: tips.cpp:3
+#: tips.txt:3
 msgid ""
 "<P>\n"
 "There is a lot of information about TDE on the\n"
-"<A HREF=\"http://www.kde.org/\">TDE web site</A>. There are\n"
-"also useful sites for major applications like\n"
-"<A HREF=\"http://www.konqueror.org/\">Konqueror</A>,\n"
-"<A HREF=\"http://www.koffice.org/\">KOffice</A> and\n"
-"<A HREF=\"http://www.kdevelop.org/\">KDevelop</A>,\n"
-"which can be put to its full usage even outside TDE...\n"
-"</P>\n"
+"<A HREF=\"http://www.trinitydesktop.org/\">TDE web site</A>.</P>\n"
 "<br>\n"
 "<center>\n"
 "<img src=\"crystalsvg/48x48/places/desktop.png\">\n"
 "</center>\n"
 msgstr ""
-"<P>在 <A HREF=\"http://www.kde.org/\">TDE 的网站上</A>有许多关于 TDE "
-"的信息。另外，还有一些有用的网站是有关主要的应用程序的，如 <A HREF=\"http://www.konqueror.org/\">"
-"Konqueror</A>、<A HREF=\"http://www.koffice.org/\">KOffice</A> "
-"和 <A HREF=\"http://www.kdevelop.org/\">KDevelop</A>，即使是在 TDE 以外的场合它也可以被充分利用……</P>"
-"<br>"
-"<center><img src=\"crystalsvg/48x48/places/desktop.png\"></center>\n"
 
-#: tips.cpp:22
+#: tips.txt:14
+#, fuzzy
 msgid ""
 "<p>\n"
 "TDE is translated into many languages. You can change the country and\n"
 "language with the Control Center in \"Regional &amp; Accessibility\"\n"
 "->.\"Country/Region &amp; Language\".\n"
 "</p>\n"
-"<p>For more information about TDE translations and translators, see <a\n"
-"href=\"http://i18n.kde.org/\">http://i18n.kde.org</a>.\n"
-"</p>\n"
-"<br>\n"
 "<center>\n"
 "<img src=\"crystalsvg/48x48/apps/locale.png\">\n"
 "<p align=\"right\"><em>Contributed by Andrea Rizzi</em></p>\n"
@@ -84,7 +46,7 @@ msgstr ""
 "<center><img src=\"crystalsvg/48x48/apps/locale.png\"><p align=\"right\"><em>"
 "Andrea Rizzi 投稿</em></p>\n"
 
-#: tips.cpp:38
+#: tips.txt:26
 msgid ""
 "<p>\n"
 "You can minimize all your windows on the current desktop at once and\n"
@@ -103,7 +65,7 @@ msgstr ""
 "<br>"
 "<center><img src=\"crystalsvg/48x48/places/desktop.png\"></center>\n"
 
-#: tips.cpp:51
+#: tips.txt:39
 msgid ""
 "<p>\n"
 "If you temporarily need more screen real-estate, you can <strong>\"fold\n"
@@ -119,7 +81,7 @@ msgstr ""
 "。另外，您若想让它自动隐藏，可以更改控制中心的设置(首选项->面板，隐藏标签)。</p>"
 "<p>要获得关于 TDE 面板 Kicker 的更多信息，请参看 <a href=\"help:/kicker\">Kicker 手册</a>。</p>\n"
 
-#: tips.cpp:64
+#: tips.txt:52
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -139,7 +101,7 @@ msgstr ""
 "<br>"
 "<center><img src=\"crystalsvg/48x48/apps/klipper.png\"></center>\n"
 
-#: tips.cpp:79
+#: tips.txt:67
 msgid ""
 "<p>\n"
 "The window list, which is accessible via an icon on the panel, provides a\n"
@@ -154,7 +116,7 @@ msgstr ""
 "<br>"
 "<center><img src=\"crystalsvg/48x48/apps/window_list.png\"></center>\n"
 
-#: tips.cpp:90
+#: tips.txt:78
 msgid ""
 "<p>The <b>\"Location\" label</b> in Konqueror is draggable.</p>\n"
 "<p>This means you can create shortcuts (e.g. on the desktop or the panel)\n"
@@ -166,7 +128,7 @@ msgstr ""
 "<p>这意味着您只要通过鼠标拖动，就可以创建快捷方式(比如，在桌面或者面板上)。您还可以把它拖到 Konsole 或者编辑区域，从而把 URL "
 "填写进去(就像您可以让 Konqueror 显示链接和文件一样)。</p>\n"
 
-#: tips.cpp:99
+#: tips.txt:87
 msgid ""
 "<p>For quick access to TDEPrint Manager type\n"
 "<strong>\"print:/manager\"</strong>... --  <em>\"Type where?\"</em>,\n"
@@ -191,7 +153,7 @@ msgstr ""
 "<center><img src=\"crystalsvg/48x48/devices/printer1.png\"><p align=\"right\">"
 "<em>Kurt Pfeifle 投稿</em></p>\n"
 
-#: tips.cpp:115
+#: tips.txt:103
 msgid ""
 "<p>\n"
 "Double-clicking on the titlebar of any window \"shades\" it, which means\n"
@@ -210,7 +172,7 @@ msgstr ""
 "href=\"help:/khelpcenter/userguide/windows-how-to-work.html\">TDE 用户指南</a>。</p>"
 "\n"
 
-#: tips.cpp:127
+#: tips.txt:115
 msgid ""
 "<p>\n"
 "You can cycle through the windows on a virtual desktop by holding the\n"
@@ -227,11 +189,12 @@ msgstr ""
 "<p>更多信息请参看<a href=\"help:/khelpcenter/userguide/windows-how-to-work.html\">"
 "TDE 用户指南</a>。</p>\n"
 
-#: tips.cpp:138
+#: tips.txt:126
+#, fuzzy
 msgid ""
 "<p>\n"
 "You can assign <b>keyboard shortcuts</b> to your favorite applications in the\n"
-"TDE menu editor (K-menu->Settings->Menu Editor). Select the application\n"
+"TDE menu editor (TDE Menu->Settings->Menu Editor). Select the application\n"
 "(e.g. Konsole), then click on the image next to \"Current shortcut\n"
 "key:\". Press the key combination you want (say, Ctrl+Alt+K).\n"
 "<p>That is it: now you can fire up Konsoles with Ctrl+Alt+K.</p>\n"
@@ -242,7 +205,7 @@ msgstr ""
 "(比如 Konsole)，然后单击“当前快捷键”旁边的图像。输入您想要使用的按键组合(比如 Ctrl+Alt+K)。</p>\n"
 "<p>就这么简单！现在就用 Ctrl+Alt+K 来弹出 Konsole 吧！</p>\n"
 
-#: tips.cpp:148
+#: tips.txt:136
 msgid ""
 "<p>\n"
 "You can configure the number of virtual desktops by adjusting the \"Number\n"
@@ -258,25 +221,32 @@ msgstr ""
 "href=\"help:/khelpcenter/userguide/windows-how-to-work.html#using-multiple-deskt"
 "ops\">TDE 用户指南</a>。</p>\n"
 
-#: tips.cpp:159
-msgid ""
-"<p>The TDE project was founded in October 1996 and had its first release,\n"
-"1.0, on July 12, 1998.</p>\n"
+#: tips.txt:147
+msgid ""
+"<p>The <b>Trinity Desktop Environment</b> was born as a fork of the\n"
+"K Desktop Environment version 3.5, which was originally written by the KDE "
+"Team,\n"
+"a world-wide network of software engineers committed to Free Software "
+"development.\n"
+"The name <i>Trinity</i> was chosen because the word means <i>Three</i> as in\n"
+"<i>continuation of KDE 3</i>.</p>\n"
+"<p>Since then, TDE has evolved to be an independent and standalone computer "
+"desktop\n"
+"environment project. The developers have molded the code to its own identity "
+"without\n"
+"giving up on the efficiency, productivity and traditional user interface "
+"experience\n"
+"characteristic of the original KDE 3 series.</p>\n"
+"<p>The KDE project was founded in October 1996 and was first released\n"
+"on July 12, 1998.</p>\n"
+"<p>TDE first release dates back to April 2010.</p>\n"
 "<p>You can <em>support the TDE project</em> with work (programming, designing,\n"
 "documenting, proof-reading, translating, etc.) and financial or\n"
-"hardware donations. Please contact <a\n"
-" href=\"mailto:kde-ev@kde.org\">kde-ev@kde.org</a>\n"
-"if you are interested in donating, or <a\n"
-"href=\"mailto:kde-quality@kde.org\">kde-quality@kde.org</a> if you would\n"
-"like to contribute in other ways.</p>\n"
+"hardware donations. Please contact the TDE team if you are interested in\n"
+"donating, or if you would like to contribute in other ways.</p>\n"
 msgstr ""
-"<p>TDE 计划始于 1996 年十月，它的第一个版本 1.0 在 1998 年 7 月 12 日发布。</p>"
-"<p>您可以通过实际工作(编写程序、设计、编写文档、校对、翻译等)还有资金或者硬件捐助来<em>支持 TDE 计划</em>"
-"。如果您有兴趣，请联系 <a href=\"mailto:kde-ev@kde.org\">kde-ev@kde.org</a>"
-"；如果您想要以其它方式为 TDE 做出贡献，请联系 <a href=\"mailto:kde-quality@kde.org\">"
-"kde-quality@kde.org</a>。</p>\n"
 
-#: tips.cpp:172
+#: tips.txt:167
 msgid ""
 "<p>TDE provides some shortcuts to change the size of a window:</p>\n"
 "<table>"
@@ -316,12 +286,12 @@ msgstr ""
 "<td>用鼠标右键单击最大化按钮</td>\n"
 "</tr></table>\n"
 
-#: tips.cpp:186
+#: tips.txt:181
 #, fuzzy
 msgid ""
 "<p>You can stay up to date with new developments in TDE and releases\n"
-"by regularly checking the web site <A\n"
-" HREF=\"http://www.kde.org\">http://www.kde.org</A>.</p>\n"
+"by regularly checking the <a href=\"http://www.trinitydesktop.org/\">"
+"TDE web site</A>.</p>\n"
 "<BR>\n"
 "<center><img src=\"hicolor/48x48/apps/konqueror.png\"></center></p>\n"
 msgstr ""
@@ -330,10 +300,11 @@ msgstr ""
 "<BR>\n"
 "<center><img src=\"crystalsvg/48x48/apps/konqueror.png\"></center></p>\n"
 
-#: tips.cpp:195
+#: tips.txt:189
+#, fuzzy
 msgid ""
 "<p align=\"center\"><strong>TDEPrinting (I)</strong></p>\n"
-"<p><strong>kprinter</strong>, TDE's new printing utility supports\n"
+"<p><strong>tdeprinter</strong>, TDE's printing utility supports\n"
 "different print subsystems. These subsystems differ very much\n"
 "in their abilities.</p>\n"
 "<p>Among the supported systems are:\n"
@@ -356,13 +327,13 @@ msgstr ""
 "<li>通过外部程序打印(通用)。</li>\n"
 "</ul>\n"
 
-#: tips.cpp:211
+#: tips.txt:205
+#, fuzzy
 msgid ""
 "<p align=\"center\"><strong>TDEPrinting (II)</strong></p>\n"
 "<p>Not all print subsystems provide equal abilities\n"
 "for TDEPrint to build on.</p>\n"
-"<p>The TDEPrinting Team\n"
-"recommends installing a <A\n"
+"<p>The TDE developers recommend installing a <A\n"
 "HREF=\"http://www.cups.org/\"><strong>CUPS-based</strong></A>\n"
 "software as the underlying print subsystem.</p>\n"
 "<p> CUPS provides easy usage, powerful features, broad printer\n"
@@ -374,22 +345,18 @@ msgid ""
 msgstr ""
 "<p align=\"center\"><strong>TDEPrinting (II)</strong></p>"
 "<p>并不是所有的打印子系统为 TDEPrint 提供的能力都相同。</p>"
-"<p>TDEPrinting 开发组"
-"强烈建议安装 <A HREF=\"http://www.cups.org/\"><strong>基于 CUPS</strong></A>"
-"的软件作为底层打印子系统。</p>"
+"<p>TDEPrinting 开发组强烈建议安装 <A HREF=\"http://www.cups.org/\"><strong>"
+"基于 CUPS</strong></A>的软件作为底层打印子系统。</p>"
 "<p>CUPS 易于使用，功能强大，支持的打印机很多，设计也是最新的(基于IPP，“Internet 打印协议”)。其实用性在家用和大网络中都得到证实。</p>"
 "<p align=\"right\"><em>Kurt Pfeifle 投稿</em></p>\n"
 
-#: tips.cpp:228
+#: tips.txt:221
 #, fuzzy
 msgid ""
 "<p>\n"
 "TDE is based on a well-designed C++ foundation. C++ is a programming\n"
 "language well suited to desktop development. The TDE object model\n"
-"extends the power of C++ even further. See\n"
-" <a href=\"http://developer.kde.org/\">http://developer.kde.org/</a>\n"
-"for details.</p>"
-"<br>\n"
+"extends the power of C++ even further.\n"
 "<center><img src=\"hicolor/48x48/apps/konqueror.png\"></center>\n"
 msgstr ""
 "<p>\n"
@@ -401,7 +368,7 @@ msgstr ""
 "<br>\n"
 "<center><img src=\"crystalsvg/48x48/apps/konqueror.png\"></center>\n"
 
-#: tips.cpp:239
+#: tips.txt:230
 msgid ""
 "<p>\n"
 "You can use Konqueror to <strong>browse through tar archives</strong>,\n"
@@ -412,7 +379,7 @@ msgstr ""
 "您可以用 Konqueror 来<strong>浏览 tar 归档文件</strong>，甚至是经过\n"
 "压缩的。要解压缩它们您只需简单的把文件拖放到别的地方(例如另一个 Konqueror 窗口或者桌面)就可以。</p>\n"
 
-#: tips.cpp:247
+#: tips.txt:238
 msgid ""
 "<p>\n"
 "You can cycle through the virtual desktops by holding the Ctrl key and\n"
@@ -427,9 +394,10 @@ msgstr ""
 "href=\"help:/khelpcenter/userguide/windows-how-to-work.html#using-multiple-deskt"
 "ops\">TDE 用户指南</a>。</p>\n"
 
-#: tips.cpp:257
+#: tips.txt:248
+#, fuzzy
 msgid ""
-"<p>You can start <strong>kprinter</strong> as a standalone program\n"
+"<p>You can start <strong>tdeprinter</strong> as a standalone program\n"
 "from any xterm, Konsole window or from the \"Run Command\" dialog (started\n"
 "by pressing <i>Alt+F2</i>). Then select the file to print. You can print\n"
 "as many items of different types as you want, all at once.\n"
@@ -447,9 +415,10 @@ msgstr ""
 "<img src=\"crystalsvg/48x48/devices/printer1.png\"></center>\n"
 "<p align=\"right\"><em>Kurt Pfeifle 投稿</em></p>\n"
 
-#: tips.cpp:269
+#: tips.txt:260
+#, fuzzy
 msgid ""
-"<p>You may at any time switch <strong>kprinter</strong> to another\n"
+"<p>You may at any time switch <strong>tdeprinter</strong> to another\n"
 "print subsystem \"on the fly\" (and you do not need to be root to do it.)\n"
 "</p>\n"
 "<p>Laptop users who frequently change to different environments may find\n"
@@ -467,11 +436,11 @@ msgstr ""
 "</p>\n"
 "<p align=\"right\"><em>Kurt Pfeifle 投稿</em></p>\n"
 
-#: tips.cpp:281
+#: tips.txt:272
 #, fuzzy
 msgid ""
 "<P>\n"
-"TDE's help system can display not only TDE's own HTML-based help, but\n"
+"TDE's help system can display TDE's HTML-based help, but\n"
 "also info and man pages.</P>\n"
 "<p>For more ways of getting help, see <a\n"
 "href=\"help:/khelpcenter/userguide/getting-help.html\">the TDE User\n"
@@ -485,7 +454,7 @@ msgstr ""
 "<br>"
 "<center><img src=\"crystalsvg/48x48/apps/khelpcenter.png\"></center>\n"
 
-#: tips.cpp:293
+#: tips.txt:284
 msgid ""
 "<P>Clicking with the right mouse button on panel icons or applets opens a\n"
 "popup menu that allows you to move or remove the item, or add a new\n"
@@ -497,7 +466,7 @@ msgstr ""
 "您可以选择移动或者删除该项目，或者添加一个新项目。</P>\n"
 "<p>要获得关于自定义 TDE 面板 Kicker 的更多信息，请参看<a href=\"help:/kicker\">Kicker 手册</a>。</p>\n"
 
-#: tips.cpp:302
+#: tips.txt:293
 msgid ""
 "<P>If a toolbar is not large enough to display all buttons on it, you can\n"
 "click on the small arrow at the far right end of the toolbar to see\n"
@@ -506,15 +475,15 @@ msgstr ""
 "<P>如果一个工具栏没有足够的大小以显示它上面的所有按钮，\n"
 "您可以点击工具栏右端的小箭头看到其余的按钮。</P>\n"
 
-#: tips.cpp:309
+#: tips.txt:300
+#, fuzzy
 msgid ""
 "<p>\n"
 "Need comprehensive info about TDEPrinting?"
 "<br> </p>\n"
 "<p> Type <strong>help:/tdeprint/</strong> into a Konqueror address field\n"
-"and get the\n"
-" TDEPrint Handbook\n"
-"displayed.</p> "
+"and get the TDEPrint Handbook</a>\n"
+"displayed.</p>\n"
 "<center>\n"
 "<img src=\"crystalsvg/48x48/devices/printer1.png\">\n"
 msgstr ""
@@ -522,12 +491,11 @@ msgstr ""
 "想要全面了解 TDEPrinting？"
 "<br></p>\n"
 "<p>在 Konqueror 地址栏中输入 <strong>help:/tdeprint/</strong>就可得到\n"
-" TDEPrint 手册"
-"。</p>\n"
+" TDEPrint 手册。</p>\n"
 "<center>\n"
 "<img src=\"crystalsvg/48x48/devices/printer1.png\">\n"
 
-#: tips.cpp:328
+#: tips.txt:311
 msgid ""
 "<P>You can run non-TDE applications without problems on a TDE\n"
 "desktop. It is even possible to integrate them into the menu system.\n"
@@ -539,7 +507,7 @@ msgstr ""
 "TDE 的“应用程序查找(KAppfinder)”程序将搜索已知程序\n"
 "并将它们加入到菜单当中。</P>\n"
 
-#: tips.cpp:336
+#: tips.txt:319
 msgid ""
 "<p>You can quickly move the panel to another screen edge by \"grabbing\" it "
 "with\n"
@@ -551,10 +519,11 @@ msgstr ""
 "然后把它移动到您想放置的位置。</p>\n"
 "<p>要获得关于个性化 TDE 面板 Kicker 的更多信息，请参看<a href=\"help:/kicker\">Kicker 手册</a>。</p>\n"
 
-#: tips.cpp:344
+#: tips.txt:327
+#, fuzzy
 msgid ""
 "<p>\n"
-"If you need to kill some time, TDE comes with an extensive collection\n"
+"If you want to kill some time, TDE comes with an extensive collection\n"
 "of games.</p>"
 "<br>\n"
 "<center>\n"
@@ -567,7 +536,7 @@ msgstr ""
 "<center>\n"
 "<img src=\"crystalsvg/48x48/apps/package_games.png\">\n"
 
-#: tips.cpp:353
+#: tips.txt:336
 msgid ""
 "<p>You can <strong>quickly change the background</strong> image of the\n"
 "desktop by dragging a graphics image from a Konqueror window to the\n"
@@ -576,7 +545,7 @@ msgstr ""
 "<p>只要把一幅图片从 Konqueror 窗口拖到桌面背景中，\n"
 "您就可以<strong>快速改变桌面的背景图像</strong>。</p>\n"
 
-#: tips.cpp:360
+#: tips.txt:343
 msgid ""
 "<p>You can change the background color of the desktop by dragging a color\n"
 "from a color selector in any application to the desktop background.\n"
@@ -586,7 +555,7 @@ msgstr ""
 "您就可以改变桌面的背景颜色。\n"
 "</p>\n"
 
-#: tips.cpp:367
+#: tips.txt:350
 msgid ""
 "<p>\n"
 "A fast way to get your favorite application onto your panel is to\n"
@@ -599,7 +568,7 @@ msgstr ""
 "右键点击面板(面板菜单)然后选择“添加到面板->应用程序->任何东西”。\n"
 "</p>\n"
 
-#: tips.cpp:375
+#: tips.txt:358
 msgid ""
 "<p>\n"
 "You can add more applets to your panel by selecting Panel\n"
@@ -611,7 +580,7 @@ msgstr ""
 "小程序到您的面板中。\n"
 "</p>\n"
 
-#: tips.cpp:383
+#: tips.txt:366
 msgid ""
 "<p>\n"
 "You can add a little command line to your panel by selecting Panel\n"
@@ -626,7 +595,7 @@ msgstr ""
 "</p>\n"
 "<p>要获得关于 TDE 面板中可用的其它小程序，请参看<a href=\"help:/kicker\">Kicker 手册</a>。</p>\n"
 
-#: tips.cpp:393
+#: tips.txt:376
 msgid ""
 "<p>Want to see the local time of your friends or\n"
 "business partners <b>around the world</b>?</p>\n"
@@ -635,7 +604,7 @@ msgstr ""
 "<p>想要看到<b>世界各地</b>朋友或合作伙伴的本地时间吗？</p>\n"
 "<p>只需用鼠标中键单击<b>时钟面板</b>。</p>\n"
 
-#: tips.cpp:400
+#: tips.txt:383
 msgid ""
 "<p>Your <b>panel clock</b> can be configured to display the time\n"
 "in <b>plain</b>, <b>digital</b>, <b>analog</b> or <b>fuzzy-style</b>\n"
@@ -647,7 +616,7 @@ msgstr ""
 "<b>模拟钟</b>或<b>模糊方式</b>显示时间。</p>\n"
 "<p>更多信息请参看 <a href=\"help:/kicker/clock-applet.html\">Kicker 手册</a>。</p>\n"
 
-#: tips.cpp:409
+#: tips.txt:392
 msgid ""
 "<p>\n"
 "If you know its name, you can <strong>execute any program</strong> by pressing\n"
@@ -665,7 +634,7 @@ msgstr ""
 "<center>\n"
 "<img src=\"crystalsvg/48x48/apps/kmenu.png\">\n"
 
-#: tips.cpp:420
+#: tips.txt:403
 msgid ""
 "<p>\n"
 "You can <strong>browse any URL</strong> by pressing\n"
@@ -685,7 +654,7 @@ msgstr ""
 "<center>\n"
 "<img src=\"crystalsvg/48x48/places/network.png\">\n"
 
-#: tips.cpp:431
+#: tips.txt:414
 msgid ""
 "<p>If you are using Konqueror and want to type another location into\n"
 "the location field below the toolbar to get there, you can clear the\n"
@@ -700,7 +669,7 @@ msgstr ""
 "标签左边的黑叉按钮快速清除整个区域并开始输入新内容。</p>\n"
 "<p>您还可以按 Ctrl+L 打开一个对话框来输入另一个地址。</p>\n"
 
-#: tips.cpp:441
+#: tips.txt:424
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -721,7 +690,7 @@ msgstr ""
 "<center>\n"
 "<img src=\"crystalsvg/48x48/apps/khelpcenter.png\">\n"
 
-#: tips.cpp:452
+#: tips.txt:435
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -744,7 +713,7 @@ msgstr ""
 "<center>\n"
 "<img src=\"crystalsvg/48x48/apps/khelpcenter.png\">\n"
 
-#: tips.cpp:465
+#: tips.txt:448
 msgid ""
 "<p>\n"
 "If you cannot access the titlebar, you can still <strong>move a window</strong>"
@@ -761,12 +730,13 @@ msgstr ""
 "<br>\n"
 "<p>当然，您可以用控制中心改变这一行为。</p>\n"
 
-#: tips.cpp:474
+#: tips.txt:457
+#, fuzzy
 msgid ""
 "<p> Want TDE's printing power in non-TDE apps?  </p>\n"
-"<p> Then use <strong>'kprinter'</strong> as \"print command\".\n"
-"Works with Netscape, Mozilla, Galeon, gv, Acrobat Reader,\n"
-" StarOffice, OpenOffice.org, any GNOME application and many more...</p>\n"
+"<p> Then use <strong>'tdeprinter'</strong> as \"print command\".\n"
+"Works with Firefox, Seamonkey, Epiphany, gv, Acrobat Reader,\n"
+"LibreOffice, OpenOffice, any GNOME application and many more...</p>\n"
 "<center>\n"
 "<img src=\"crystalsvg/48x48/devices/printer1.png\">\n"
 "<p align=\"right\"><em>Contributed by Kurt Pfeifle</em></p>\n"
@@ -779,7 +749,7 @@ msgstr ""
 "<img src=\"crystalsvg/48x48/devices/printer1.png\">\n"
 "<p align=\"right\"><em>Kurt Pfeifle 投稿</em></p>\n"
 
-#: tips.cpp:488
+#: tips.txt:468
 msgid ""
 "<p>\n"
 "You can <strong>resize a window</strong> on the screen by holding the Alt key,\n"
@@ -789,7 +759,7 @@ msgstr ""
 "您可以按住 Alt 键，然后鼠标右点窗口中的任何地方并拖动它，\n"
 "来<strong>改变窗口的大小</strong>。</p>\n"
 
-#: tips.cpp:495
+#: tips.txt:475
 msgid ""
 "<p>\n"
 "TDE's mail client (KMail) provides seamless <strong>PGP/GnuPG\n"
@@ -804,21 +774,7 @@ msgstr ""
 "<strong>PGP/GnuPG 集成</strong>。</p>\n"
 "<p>关于设置加密的指示，请参看<a href=\"help:/kmail/pgp.html\">KMail 手册</a>。</p>\n"
 
-#: tips.cpp:505
-msgid ""
-"<p>\n"
-"You can find TDE developers all over the world, e.g., in Germany,\n"
-"Sweden, France, Canada, USA, Australia, Namibia, Argentina, and even in\n"
-"Norway!</p>\n"
-"<p>\n"
-"To see where TDE developers can be found, take a look at <a "
-"href=\"http://worldwide.kde.org\">worldwide.kde.org</a>.</p>\n"
-msgstr ""
-"<p>您可以在世界各地找到 TDE 的开发人员，例如在德国、瑞典、法国、加拿大、美国、澳大利亚、纳米比亚、阿根廷、挪威，当然也在中国！</p>"
-"<p>要查找 TDE 开发者的同乐会，请参看 <a href=\"http://worldwide.kde.org\">"
-"worldwide.kde.org</a>。</p>\n"
-
-#: tips.cpp:515
+#: tips.txt:485
 msgid ""
 "<p>\n"
 "TDE's CD player, KsCD, accesses the Internet CD database freedb to provide you\n"
@@ -830,7 +786,7 @@ msgstr ""
 "<p>TDE 的 CD 播放器 KsCD 通过 Internet CD 数据库 freedb 为您提供标题和音轨信息。</p>"
 "<p>关于 KsCD 详细功能的介绍，请看 <a href=\"help:/kscd\">KsCD 手册</a>。</p>\n"
 
-#: tips.cpp:525
+#: tips.txt:495
 msgid ""
 "<p>\n"
 "Some people open many terminal windows just to enter <em>one single</em>\n"
@@ -849,7 +805,7 @@ msgstr ""
 "<li>如果您需要输出信息，使用控制台会话(工具栏中的“新建”)。\n"
 "</ul>\n"
 
-#: tips.cpp:536
+#: tips.txt:506
 msgid ""
 "<p>\n"
 "You can change the color of the window titlebars by clicking on the title bar "
@@ -864,11 +820,12 @@ msgstr ""
 "</p>\n"
 "<p>这也适合于其它可选的颜色。</p>\n"
 
-#: tips.cpp:545
+#: tips.txt:515
+#, fuzzy
 msgid ""
 "<p align=\"center\"><strong>TDE Command Line Printing (I)</strong></p>\n"
 "<p> Want to print from command line, without missing TDE's printing power?</p>\n"
-"<p> Type <strong>'kprinter'</strong>. Up pops the\n"
+"<p> Type <strong>'tdeprinter'</strong>. Up pops the\n"
 "TDEPrint dialog. Select printer, print options and\n"
 "print files (note that you may select <em>different</em>\n"
 "files of <em>different</em> types for <em>one</em> print job...). </p>\n"
@@ -883,14 +840,15 @@ msgstr ""
 "<p>您可以在 Konsole，任何 X 终端，或“运行命令”\n"
 "(按 <em>Alt+F2</em> 弹出)中执行。</p>\n"
 
-#: tips.cpp:557
+#: tips.txt:527
+#, fuzzy
 msgid ""
 "<p align=\"center\"><strong>TDE Command Line Printing (II)</strong></p>\n"
 "<p>\n"
 "You may specify print files and/or name a printer from the command line:\n"
 "<pre>\n"
-"kprinter -d infotec \\\n   /home/kurt/paragliding.jpg \\\n   "
-"../tdeprint-handbook.pdf \\\n   /opt/kde3/flyer.ps\n"
+"tdeprinter -d infotec \\\n   /home/kurt/paragliding.jpg \\\n   "
+"../tdeprint-handbook.pdf \\\n   /opt/trinity/flyer.ps\n"
 "</pre>\n"
 " This prints 3 different files (from different folders) to printer "
 "\"infotec\".\n"
@@ -907,7 +865,7 @@ msgstr ""
 "<center><img src=\"crystalsvg/48x48/devices/printer1.png\"><p align=\"right\">"
 "<em>Kurt Pfeifle 投稿</em></p>\n"
 
-#: tips.cpp:575
+#: tips.txt:545
 msgid ""
 "<p>\n"
 "The difference between window manager styles and old-fashioned themes is\n"
@@ -916,35 +874,19 @@ msgid ""
 msgstr ""
 "<p>窗口管理器风格和老式的主题之间的区别是，前者甚至可以通过控制中心改变窗口标题栏的颜色设置并且可能实现不同的特性。</p>\n"
 
-#: tips.cpp:583
+#: tips.txt:553
 msgid ""
 "<p>\n"
-"The K in TDE does not stand for anything. It is the character that comes\n"
-"before L in the Latin alphabet, which stands for Linux. It was chosen\n"
-"because TDE runs on many types of UNIX (and perfectly well on FreeBSD).\n"
-"</p>\n"
+"The K in KDE did not stand for anything special. The K was the\n"
+"character that came before L in the Latin alphabet, which stands for Linux.\n"
+"The K was chosen because KDE ran on many types of UNIX and FreeBSD.\n"
+"The T in TDE does stand for something special. The T stands for Trinity\n"
+"which means three because Trinity is a continuation of the KDE 3.5 code base.\n"
+"The T also represents the name of the Trinity project that brought you this\n"
+"desktop environment. TDE also runs on many types of UNIX and FreeBSD.</p>\n"
 msgstr ""
-"<p>TDE 中的字母 K 不代表任何意思。它是拉丁字母表中 L 的前一个字母，L 代表 Linux。选择它是因为 TDE 能够运行在许多种 Unix "
-"系统中(在 FreeBSD 中也非常完美)。</p>\n"
 
-#: tips.cpp:592
-#, fuzzy
-msgid ""
-"<p>If you want to know when <b>the next release</b> of TDE is planned,\n"
-"look for the release schedule on <a\n"
-" href=\"http://developer.kde.org/\">http://developer.kde.org</a>. If you only\n"
-"find old release schedules, there will probably be some weeks/months of\n"
-"intensive development left before the next release.</p>"
-"<br>\n"
-"<center><img src=\"hicolor/48x48/apps/konqueror.png\"></center>\n"
-msgstr ""
-"<p>如果您想知道<b>下一版</b>的 TDE 计划在什么时候发布，请看看 <a href=\"http://developer.kde.org/\">"
-"http://developer.kde.org</a> "
-"上的发布时间表。如果您只找到旧的发布时间表，那么很可能再经过几个星期或几个月的开发，下一个版本就会发布了。</p>"
-"<br>"
-"<center><img src=\"crystalsvg/48x48/apps/konqueror.png\"></center>\n"
-
-#: tips.cpp:602
+#: tips.txt:565
 msgid ""
 "<p>\n"
 "Under the <em>\"B II\"</em> window decoration, the title bars\n"
@@ -958,7 +900,7 @@ msgstr ""
 "您可以右键点击标题栏并选择“配置窗口行为...”\n"
 "来改变您的标题栏的装饰。</p>\n"
 
-#: tips.cpp:611
+#: tips.txt:574
 msgid ""
 "<p>If you do not like the default completion mode (e.g. in Konqueror), you\n"
 "can right-click on the edit-widget and choose a different mode, e.g.\n"
@@ -973,7 +915,7 @@ msgstr ""
 "的 Shell。用 Ctrl+E 来调出它。\n"
 "</p>\n"
 
-#: tips.cpp:621
+#: tips.txt:584
 msgid ""
 "<p>If you want another panel, to make more space for your applets and\n"
 "buttons, press right mouse button on the panel to invoke the panel menu\n"
@@ -987,19 +929,20 @@ msgstr ""
 "“添加到面板->面板->子面板”。</p>\n"
 "<p>(然后您可以在新面板中放入任何东西或者调整它的尺寸等等。)</p>\n"
 
-#: tips.cpp:630
+#: tips.txt:593
+#, fuzzy
 msgid ""
-"<p>If you want to contribute your own \"tip of the day\", please send it to\n"
-"<a href=\"mailto:kde-doc-english@kde.org\">kde-doc-english@kde.org</a>"
-", and we will be happy to\n"
-" include\n"
-"it in the next release.</p>\n"
+"<p>If you want to contribute your own \"tip of the day\", please send the tip "
+"to\n"
+"<a href=\"trinity-devel@lists.pearsoncomputing.net\">"
+"trinity-devel@lists.pearsoncomputing.net</a>,\n"
+"and we will consider the tip for the next release.</p>\n"
 msgstr ""
 "<p>如果您想贡献您自己的“日积月累”，请将它发到\n"
 "<a href=\"mailto:kde-doc-english@kde.org\">kde-doc-english@kde.org</a>"
 "，我们将很高兴将它收集到下一个版本当中。</p>\n"
 
-#: tips.cpp:638
+#: tips.txt:600
 msgid ""
 "<p>\n"
 "If you drag a file from Konqueror or from the desktop to Konsole, you\n"
@@ -1016,7 +959,7 @@ msgstr ""
 "您只要选择其中之一即可，不必在终端窗口中输入整个路径。</p>\n"
 "<p align=\"right\"><em>Gerard Delafond 投稿</em></p>\n"
 
-#: tips.cpp:649
+#: tips.txt:611
 msgid ""
 "<p>\n"
 "You can hide mixer devices in KMix by clicking on \"Hide\" in the\n"
@@ -1035,7 +978,7 @@ msgstr ""
 "<p>看看 <a href=\"help:/kmix\">KMix 手册</a>中更多有关 KMix 的提示和技巧。</p>\n"
 "<p align=\"right\"><em>Stefan Schimanski 投稿</em></p>\n"
 
-#: tips.cpp:661
+#: tips.txt:623
 msgid ""
 "<p>\n"
 "You can add your own \"Web Shortcuts\" to Konqueror by selecting\n"
@@ -1054,7 +997,7 @@ msgstr ""
 "Konqueror 手册</a>。</p><p align=\"right\"><em> Michael Lachmann 和 Thomas Diehl "
 "投稿</em></p>\n"
 
-#: tips.cpp:674
+#: tips.txt:636
 msgid ""
 "<p>\n"
 "Each UNIX user has a so-called Home folder in which his or her\n"
@@ -1072,7 +1015,7 @@ msgstr ""
 "</p>\n"
 "<p align=\"right\"><em>Carsten Niehaus 投稿</em></p>\n"
 
-#: tips.cpp:685
+#: tips.txt:647
 msgid ""
 "<p>\n"
 "You might wonder why there are very few (if any) files whose\n"
@@ -1094,7 +1037,7 @@ msgstr ""
 "</p>\n"
 "<p align=\"right\"><em>Carsten Niehaus 投稿</em></p>\n"
 
-#: tips.cpp:698
+#: tips.txt:660
 msgid ""
 "<p>\n"
 "If you want to make your desktop look more interesting, you can find\n"
@@ -1109,7 +1052,7 @@ msgstr ""
 "</p>\n"
 "<p align=\"right\"><em>Carsten Niehaus 投稿</em></p>\n"
 
-#: tips.cpp:707
+#: tips.txt:669
 msgid ""
 "<p>\n"
 "Did you know that you can use the middle mouse button to paste\n"
@@ -1127,14 +1070,15 @@ msgstr ""
 "</p>\n"
 "<p align=\"right\"><em>Carsten Niehaus 投稿</em></p>\n"
 
-#: tips.cpp:718
+#: tips.txt:680
+#, fuzzy
 msgid ""
 "<p>\n"
 "Want to print by using \"DragNDrop\"?\n"
 "</p>\n"
 "<p>\n"
 "Drag a file and drop it on the \"Files\" tab of an opened\n"
-"<strong>kprinter</strong> dialog. </p>\n"
+"<strong>tdeprinter</strong> dialog. </p>\n"
 "<p>Then continue as you would normally: select a printer, job options, etc.\n"
 "and click the \"Print\" button.\n"
 "</p>\n"
@@ -1154,15 +1098,16 @@ msgstr ""
 "<img src=\"crystalsvg/48x48/devices/printer1.png\">\n"
 "<p align=\"right\"><em>Kurt Pfeifle 投稿</em></p>\n"
 
-#: tips.cpp:734
+#: tips.txt:696
+#, fuzzy
 msgid ""
 "<p>\n"
 "If you need to calculate a distance on the screen, the program\n"
 "<em>kruler</em> can be of great help.</p>\n"
 "<p>\n"
 "Furthermore, if you need to look closely at the ruler to count single\n"
-"pixels, <em>kmag</em> may be very useful. (It is not part of the TDE base\n"
-"installation but needs to be installed separately. It might already be\n"
+"pixels, <em>kmag</em> may be very useful. (<em>kmag</em> is part of the TDE\n"
+"Accessibility package. It might already be\n"
 "available on your distribution.) <em>kmag</em> works\n"
 "just like <em>xmag</em>, with the difference that it magnifies on the fly.\n"
 "</p>\n"
@@ -1182,7 +1127,7 @@ msgstr ""
 "<p align=\"right\"><em>Jesper Pedersen 投稿</em></p>"
 "<br>\n"
 
-#: tips.cpp:749
+#: tips.txt:711
 msgid ""
 "<p>\n"
 "Sound in TDE is coordinated by the <b>artsd</b> sound server. You can\n"
@@ -1200,7 +1145,7 @@ msgstr ""
 "<p align=\"right\"><em>Jeff Tranter 投稿</em></p>"
 "<br>\n"
 
-#: tips.cpp:759
+#: tips.txt:721
 msgid ""
 "<p>\n"
 "You can associate sounds, pop up windows, and more with TDE events. This can be "
@@ -1218,7 +1163,7 @@ msgstr ""
 "<p align=\"right\"><em>Jeff Tranter 投稿</em></p>"
 "<br>\n"
 
-#: tips.cpp:768
+#: tips.txt:730
 msgid ""
 "<p>\n"
 "Most non-TDE sound applications that do not know about the sound server can be\n"
@@ -1246,7 +1191,7 @@ msgstr ""
 "<p align=\"right\"><em>Jeff Tranter 投稿</em></p>"
 "<br>\n"
 
-#: tips.cpp:782
+#: tips.txt:744
 msgid ""
 "<p>\n"
 "By holding down the <b>Shift</b> button while moving a container (button\n"
@@ -1259,10 +1204,11 @@ msgstr ""
 "该容器就可以推动其它的容器。\n"
 "</p>\n"
 
-#: tips.cpp:791
+#: tips.txt:753
+#, fuzzy
 msgid ""
 "<p>\n"
-"TDE's 'tdeioslaves' do not just work in Konqueror: you can use network\n"
+"TDE's 'tdeio slaves' do not just work in Konqueror: you can use network\n"
 "URLs in any TDE application. For example, you can enter a URL like\n"
 "ftp://www.server.com/myfile in the Kate Open dialog, and Kate will\n"
 "open the file and save changes back to the FTP server when you click\n"
@@ -1273,7 +1219,7 @@ msgstr ""
 "打开对话框中输入 URL ftp://www.server.com/myfile，而 Kate 就会打开该文件，并在您单击“保存”时将更改存回 FTP "
 "服务器。</p>\n"
 
-#: tips.cpp:802
+#: tips.txt:764
 msgid ""
 "<p>\n"
 "You can use Konqueror to access your files on any server that you have\n"
@@ -1289,7 +1235,7 @@ msgstr ""
 "用户名</em>@<em>主机名</em>。</p>"
 "<p>实际上，所有的 TDE 应用程序都支持 fish:// URL - 例如，您可以尝试在 Kate 的打开对话框中使用</p>\n"
 
-#: tips.cpp:815
+#: tips.txt:777
 msgid ""
 "<p>\n"
 "KMail, the TDE email client, has built-in support for several popular\n"
@@ -1308,7 +1254,7 @@ msgstr ""
 "<p>更多信息请参看 <a href=\"help:/kmail/the-anti-spam-wizard.html\">KMail 手册反垃圾向导一章</a>"
 "。</p>\n"
 
-#: tips.cpp:830
+#: tips.txt:792
 msgid ""
 "<p>\n"
 "You can make a window go below other windows by middle-clicking on its "
@@ -1317,7 +1263,7 @@ msgid ""
 msgstr ""
 "<p>用鼠标中键单击窗口的标题栏可将窗口推至最下方。</p>\n"
 
-#: tips.cpp:837
+#: tips.txt:799
 msgid ""
 "<p>\n"
 "TDE applications offer short \"What's This?\" help texts for many\n"
@@ -1330,7 +1276,7 @@ msgstr ""
 "应用程序会对很多特性提供简短的“这是什么？”帮助文本。只需单击窗口标题栏上的问号，然后再单击您想要获取帮助的项目。(在某些主题中，按钮会显示为小写的“i”而不是"
 "问号)。</p>\n"
 
-#: tips.cpp:847
+#: tips.txt:809
 msgid ""
 "<p>\n"
 "TDE supports several different window focus modes: take a look in the\n"
@@ -1340,7 +1286,7 @@ msgid ""
 msgstr ""
 "<p>TDE 支持多种不同的窗口焦点模式：您可以看看控制中心里的桌面->窗口行为。例如，如果您经常使用鼠标，可以试试“焦点跟随鼠标”设置。</p>\n"
 
-#: tips.cpp:856
+#: tips.txt:818
 msgid ""
 "<p>\n"
 "Konqueror can continuously scroll webpages up or down: just press\n"
@@ -1349,27 +1295,26 @@ msgid ""
 "</p>\n"
 msgstr ""
 
-#: tips.cpp:865
+#: tips.txt:827
 msgid ""
 "<p>You can use Konqueror's help:/ tdeioslave to have quick and easy\n"
 "access to an application's handbook by typing <b>help:/</b>, directly\n"
 "followed by the application name, in the Location bar. So, for example\n"
-"to view the handbook for kwrite simply type help:/kwrite.</p> \n"
+"to view the handbook for kwrite simply type help:/kwrite.</p>\n"
 msgstr ""
 
-#: tips.cpp:873
+#: tips.txt:835
 msgid ""
-"<p>Thanks to the <a href=\"http://svg.kde.org\" title=\"ksvg\">KSVG\n"
-"project</a>, TDE now has full support for the Scalable Vector Graphics\n"
-"(SVG) image filetypes. You can view these images in Konqueror and even\n"
-"set an SVG image as a background for your desktop.</p>\n"
-"<p>There is also a great bunch of <a\n"
-"href=\"http://kdelook.org/index.php?xcontentmode=7\" title=\"kdelook\n"
+"<p>Thanks to the original KSVG project, TDE has full support for Scalable\n"
+"Vector Graphics (SVG) image filetypes. You can view these images in\n"
+"Konqueror and even set an SVG image as a background for your desktop.</p>\n"
+"<p>There is a great bunch of <a\n"
+"href=\"http://kde-look.org/index.php?xcontentmode=7\" title=\"kdelook\n"
 "SVG\">SVG wallpapers</a> for your desktop background available at <a\n"
-"href=\"http://kdelook.org\" title=\"kdelook\">kde-look.org</a>.</p>\n"
+"href=\"http://kde-look.org\" title=\"kdelook\">kde-look.org</a>.</p>\n"
 msgstr ""
 
-#: tips.cpp:885
+#: tips.txt:846
 msgid ""
 "<p>Konqueror's Web Shortcuts feature lets you submit a query directly\n"
 "to a search engine without having to visit the website\n"
@@ -1381,22 +1326,22 @@ msgid ""
 "Shortcuts icon.</p>\n"
 msgstr ""
 
-#: tips.cpp:897
+#: tips.txt:858
 msgid ""
-"<p>TDE is always looking to improve its accessibility, and with the\n"
-"launch of KTTS (TDE Text-to-Speech) you now have the power to convert\n"
+"<p>TDE developers are always looking to improve accessibility, and with\n"
+"KTTS (TDE Text-to-Speech) you have the power to convert\n"
 "strings of text into audible speech. </p>\n"
-"<p>KTTS is constantly improving, and currently provides support to\n"
+"<p>KTTS currently provides support to\n"
 "speak all or any portion of plain text files (as viewed in Kate), HTML\n"
 "pages in Konqueror, text in the TDE clipboard, as well as speech of\n"
 "TDE notifications (KNotify).</p>\n"
 "<p>To start the KTTS system, you can either select KTTS in the TDE\n"
-"menu, or hit Alt+F2 to run a command and then type <b>kttsmgr</b>. For\n"
+"menu, or press Alt+F2 to run a command and then type <b>kttsmgr</b>. For\n"
 "more information on KTTS, check the <a href=\"help:/kttsd\" title=\"KTTSD\n"
 "Handbook\">KTTSD Handbook</a>.</p>\n"
 msgstr ""
 
-#: tips.cpp:912
+#: tips.txt:873
 msgid ""
 "<p>Though TDE is a very stable desktop environment, programs may\n"
 "occasionally freeze or crash, particularly if you are running the\n"
@@ -1411,7 +1356,7 @@ msgid ""
 "used as a last resort.</p>\n"
 msgstr ""
 
-#: tips.cpp:927
+#: tips.txt:888
 msgid ""
 "<p>KMail is TDE's email client, but did you know that you can\n"
 "integrate it -- along with other programs -- to bring them all under\n"
@@ -1420,13 +1365,13 @@ msgid ""
 "<p>Other possible programs to integrate with Kontact include\n"
 "KAddressBook (for handling Contacts), KNotes (for keeping notes),\n"
 "KNode (to keep up-to-date with the latest news), and KOrganizer (for a\n"
-"comprehensive calender).</p>\n"
+"comprehensive calendar).</p>\n"
 msgstr ""
 
-#: tips.cpp:939
+#: tips.txt:900
 msgid ""
 "<p>You can use the mouse wheel to quickly perform a number of tasks;\n"
-"here are a few you might not have known of: \n"
+"here are a few you might not have known of:\n"
 "<ul>"
 "<li>Ctrl+Mouse-Wheel in the Konqueror web browser to change the font-size,\n"
 "or in Konqueror file manager to change icon size.</li>\n"
@@ -1437,22 +1382,22 @@ msgid ""
 "desktop.</li></ul></p>\n"
 msgstr ""
 
-#: tips.cpp:952
+#: tips.txt:913
 msgid ""
 "<p>By pressing F4 in Konqueror you can open a terminal at your current\n"
 "location.</p>\n"
 msgstr ""
 
-#: tips.cpp:958
+#: tips.txt:919
 msgid ""
 "<p>Although TDE will automatically restore your TDE programs that were\n"
 "left open after you logged out, you can specifically tell TDE to start\n"
 "particular applications on start up; see the <a\n"
-"href=\"help:/khelpcenter/faq/configure.html#id2574142\" title=\"Autostart\n"
+"href=\"help:/khelpcenter/faq/configure.html\" title=\"Autostart\n"
 "FAQ\">FAQ entry</a> for more information.</p>\n"
 msgstr ""
 
-#: tips.cpp:967
+#: tips.txt:928
 msgid ""
 "<p>You can integrate Kontact, TDE's Personal Information Management\n"
 "suit, with Kopete, TDE's Instant Messenger client, so that you can\n"
@@ -1462,7 +1407,7 @@ msgid ""
 "title=\"Integrated Messaging\">the TDE User Guide</a>.</p>\n"
 msgstr ""
 
-#: tips.cpp:977
+#: tips.txt:938
 msgid ""
 "<p>By entering <b>kmail --composer</b> in Konsole you can\n"
 "have KMail only open up the composer window, so that you do not have to\n"
@@ -1470,7 +1415,7 @@ msgid ""
 "someone.</p>\n"
 msgstr ""
 
-#: tips.cpp:985
+#: tips.txt:946
 msgid ""
 "<p>While remembering passwords may be tedious, and writing them down\n"
 "on paper or in a text file may be insecure and untidy, TDEWallet is an\n"
@@ -1480,17 +1425,17 @@ msgid ""
 "<p>TDEWallet can be accessed from kcontrol, TDE's Control Center; from\n"
 "there, simply go to Security &amp; Privacy->TDE Wallet. For more\n"
 "information on TDEWallet and on how to use it, check <a\n"
-"href=\"help:/tdewallet\" title=\"tdewallet\">the handbook</a>.</p>\n"
+"href=\"help:/tdewallet\" title=\"tdewallet\">the TDEWallet handbook</a>.</p>\n"
 msgstr ""
 
-#: tips.cpp:998
+#: tips.txt:959
 msgid ""
 "<p>By pressing the Middle Mouse-Button on the desktop you can get a\n"
 "brief list of all the windows on each desktop. From here you can also\n"
 " unclutter or cascade the windows.</p>\n"
 msgstr ""
 
-#: tips.cpp:1005
+#: tips.txt:966
 msgid ""
 "<p>Different virtual desktops can be customized individually, to a\n"
 "certain extent. For example, you can specify a particular background\n"
@@ -1499,7 +1444,7 @@ msgid ""
 "select Configure Desktop.</p>\n"
 msgstr ""
 
-#: tips.cpp:1014
+#: tips.txt:975
 msgid ""
 "<p>While tabbed browsing in Konqueror is very useful, you can take\n"
 "this one step further if you choose to have a split view in order to\n"
@@ -1511,7 +1456,7 @@ msgid ""
 "some of the tabs where you might think it is useful.</p>\n"
 msgstr ""
 
-#: tips.cpp:1026
+#: tips.txt:987
 msgid ""
 "<p>\n"
 "You can let TDE turn the <b>NumLock</b> ON or OFF at startup.\n"
@@ -1535,3 +1480,82 @@ msgstr ""
 "<hr>"
 "<br>"
 "<br><i>这是提示数据库中的最后一条提示。单击“下一条”将会将您带回到第一条提示。</i></p>\n"
+
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "TDE 中文翻译组"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "i18n-translation@lists.linux.net.cn"
+
+#: ktipwindow.cpp:32
+msgid "Useful tips"
+msgstr "有用的小提示"
+
+#: ktipwindow.cpp:36
+msgid "KTip"
+msgstr "KTip"
+
+#: ktipwindow.cpp:52
+msgid "Useful Tips"
+msgstr "有用的小提示"
+
+#~ msgid ""
+#~ "<P>\n"
+#~ "There is a lot of information about TDE on the\n"
+#~ "<A HREF=\"http://www.kde.org/\">TDE web site</A>. There are\n"
+#~ "also useful sites for major applications like\n"
+#~ "<A HREF=\"http://www.konqueror.org/\">Konqueror</A>,\n"
+#~ "<A HREF=\"http://www.koffice.org/\">KOffice</A> and\n"
+#~ "<A HREF=\"http://www.kdevelop.org/\">KDevelop</A>,\n"
+#~ "which can be put to its full usage even outside TDE...\n"
+#~ "</P>\n"
+#~ "<br>\n"
+#~ "<center>\n"
+#~ "<img src=\"crystalsvg/48x48/places/desktop.png\">\n"
+#~ "</center>\n"
+#~ msgstr "<P>在 <A HREF=\"http://www.kde.org/\">TDE 的网站上</A>有许多关于 TDE 的信息。另外，还有一些有用的网站是有关主要的应用程序的，如 <A HREF=\"http://www.konqueror.org/\">Konqueror</A>、<A HREF=\"http://www.koffice.org/\">KOffice</A> 和 <A HREF=\"http://www.kdevelop.org/\">KDevelop</A>，即使是在 TDE 以外的场合它也可以被充分利用……</P><br><center><img src=\"crystalsvg/48x48/places/desktop.png\"></center>\n"
+
+#~ msgid ""
+#~ "<p>The TDE project was founded in October 1996 and had its first release,\n"
+#~ "1.0, on July 12, 1998.</p>\n"
+#~ "<p>You can <em>support the TDE project</em> with work (programming, designing,\n"
+#~ "documenting, proof-reading, translating, etc.) and financial or\n"
+#~ "hardware donations. Please contact <a\n"
+#~ " href=\"mailto:kde-ev@kde.org\">kde-ev@kde.org</a>\n"
+#~ "if you are interested in donating, or <a\n"
+#~ "href=\"mailto:kde-quality@kde.org\">kde-quality@kde.org</a> if you would\n"
+#~ "like to contribute in other ways.</p>\n"
+#~ msgstr "<p>TDE 计划始于 1996 年十月，它的第一个版本 1.0 在 1998 年 7 月 12 日发布。</p><p>您可以通过实际工作(编写程序、设计、编写文档、校对、翻译等)还有资金或者硬件捐助来<em>支持 TDE 计划</em>。如果您有兴趣，请联系 <a href=\"mailto:kde-ev@kde.org\">kde-ev@kde.org</a>；如果您想要以其它方式为 TDE 做出贡献，请联系 <a href=\"mailto:kde-quality@kde.org\">kde-quality@kde.org</a>。</p>\n"
+
+#~ msgid ""
+#~ "<p>\n"
+#~ "You can find TDE developers all over the world, e.g., in Germany,\n"
+#~ "Sweden, France, Canada, USA, Australia, Namibia, Argentina, and even in\n"
+#~ "Norway!</p>\n"
+#~ "<p>\n"
+#~ "To see where TDE developers can be found, take a look at <a href=\"http://worldwide.kde.org\">worldwide.kde.org</a>.</p>\n"
+#~ msgstr "<p>您可以在世界各地找到 TDE 的开发人员，例如在德国、瑞典、法国、加拿大、美国、澳大利亚、纳米比亚、阿根廷、挪威，当然也在中国！</p><p>要查找 TDE 开发者的同乐会，请参看 <a href=\"http://worldwide.kde.org\">worldwide.kde.org</a>。</p>\n"
+
+#~ msgid ""
+#~ "<p>\n"
+#~ "The K in TDE does not stand for anything. It is the character that comes\n"
+#~ "before L in the Latin alphabet, which stands for Linux. It was chosen\n"
+#~ "because TDE runs on many types of UNIX (and perfectly well on FreeBSD).\n"
+#~ "</p>\n"
+#~ msgstr "<p>TDE 中的字母 K 不代表任何意思。它是拉丁字母表中 L 的前一个字母，L 代表 Linux。选择它是因为 TDE 能够运行在许多种 Unix 系统中(在 FreeBSD 中也非常完美)。</p>\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p>If you want to know when <b>the next release</b> of TDE is planned,\n"
+#~ "look for the release schedule on <a\n"
+#~ " href=\"http://developer.kde.org/\">http://developer.kde.org</a>. If you only\n"
+#~ "find old release schedules, there will probably be some weeks/months of\n"
+#~ "intensive development left before the next release.</p><br>\n"
+#~ "<center><img src=\"hicolor/48x48/apps/konqueror.png\"></center>\n"
+#~ msgstr "<p>如果您想知道<b>下一版</b>的 TDE 计划在什么时候发布，请看看 <a href=\"http://developer.kde.org/\">http://developer.kde.org</a> 上的发布时间表。如果您只找到旧的发布时间表，那么很可能再经过几个星期或几个月的开发，下一个版本就会发布了。</p><br><center><img src=\"crystalsvg/48x48/apps/konqueror.png\"></center>\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kwriteconfig.po b/tde-i18n-zh_CN/messages/tdebase/kwriteconfig.po
index bda1c14fff3..c74f6c87ce7 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kwriteconfig.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kwriteconfig.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kwriteconfig\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-09-01 21:56+0800\n"
 "Last-Translator: Yan Shuangchun <yahzee@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kxkb.po b/tde-i18n-zh_CN/messages/tdebase/kxkb.po
index 0ea485dc586..9f06c649f3c 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kxkb.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kxkb.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2006-04-06 03:54+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-12-03 21:56+0800\n"
 "Last-Translator: Dick Zhang <netwind2003@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/libdmctl.po b/tde-i18n-zh_CN/messages/tdebase/libdmctl.po
index 005aad02376..b778702612f 100644
--- a/tde-i18n-zh_CN/messages/tdebase/libdmctl.po
+++ b/tde-i18n-zh_CN/messages/tdebase/libdmctl.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libdmctrl\n"
-"POT-Creation-Date: 2007-11-02 01:14+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/libkicker.po b/tde-i18n-zh_CN/messages/tdebase/libkicker.po
index 8220355d508..e36fc7d9b0f 100644
--- a/tde-i18n-zh_CN/messages/tdebase/libkicker.po
+++ b/tde-i18n-zh_CN/messages/tdebase/libkicker.po
@@ -5,27 +5,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkicker\n"
-"POT-Creation-Date: 2008-07-31 01:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-08-09 08:07+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@126.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: panner.cpp:77
+#: panner.cpp:108
 msgid "Scroll left"
 msgstr "向左滚动"
 
-#: panner.cpp:78
+#: panner.cpp:109
 msgid "Scroll right"
 msgstr "向右滚动"
 
-#: panner.cpp:91
+#: panner.cpp:122
 msgid "Scroll up"
 msgstr "向上滚动"
 
-#: panner.cpp:92
+#: panner.cpp:123
 msgid "Scroll down"
 msgstr "向下滚动"
 
@@ -57,46 +58,80 @@ msgstr "启用此选项时，面板将变成半透明状"
 
 #. i18n: file kickerSettings.kcfg line 30
 #: rc.cpp:15
+#, fuzzy, no-c-format
+msgid "Enable resize handles"
+msgstr "启用着色背景。"
+
+#. i18n: file kickerSettings.kcfg line 31
+#: rc.cpp:18
+#, fuzzy, no-c-format
+msgid ""
+"When this option is enabled, the panel will provide a resize handle on order to "
+"change its width via click-and-drag"
+msgstr "启用此选项时，面板将把平铺图像显示为背景"
+
+#. i18n: file kickerSettings.kcfg line 36
+#: rc.cpp:21
+#, no-c-format
+msgid "Make the task buttons push further into the screen when activated"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 41
+#: rc.cpp:24
 #, no-c-format
 msgid "Enable transparency for menubar panel"
 msgstr "启用菜单栏面板透明"
 
-#. i18n: file kickerSettings.kcfg line 31
-#: rc.cpp:18
+#. i18n: file kickerSettings.kcfg line 42
+#: rc.cpp:27
 #, no-c-format
 msgid ""
 "When this option is enabled, the panel containing the menubar will become "
 "pseudo-transparent as well"
 msgstr "启用此选项时，包含菜单栏的面板也将变成半透明"
 
-#. i18n: file kickerSettings.kcfg line 36
-#: rc.cpp:21
+#. i18n: file kickerSettings.kcfg line 47
+#: rc.cpp:30
+#, fuzzy, no-c-format
+msgid "Enable blurring for menubar panel"
+msgstr "启用菜单栏面板透明"
+
+#. i18n: file kickerSettings.kcfg line 48
+#: rc.cpp:33
+#, fuzzy, no-c-format
+msgid ""
+"When this option is enabled, the panel containing the menubar will blur "
+"pseudo-transparent image"
+msgstr "启用此选项时，包含菜单栏的面板也将变成半透明"
+
+#. i18n: file kickerSettings.kcfg line 53
+#: rc.cpp:36
 #, no-c-format
 msgid "Enable background image"
 msgstr "启用背景图像"
 
-#. i18n: file kickerSettings.kcfg line 37
-#: rc.cpp:24
+#. i18n: file kickerSettings.kcfg line 54
+#: rc.cpp:39
 #, no-c-format
 msgid ""
 "When this option is enabled, the panel will display a tiled image as its "
 "background"
 msgstr "启用此选项时，面板将把平铺图像显示为背景"
 
-#. i18n: file kickerSettings.kcfg line 42
-#: rc.cpp:27
+#. i18n: file kickerSettings.kcfg line 59
+#: rc.cpp:42
 #, no-c-format
 msgid "Enable colourized background."
 msgstr "启用着色背景。"
 
-#. i18n: file kickerSettings.kcfg line 47
-#: rc.cpp:30
+#. i18n: file kickerSettings.kcfg line 64
+#: rc.cpp:45
 #, no-c-format
 msgid "Rotate background"
 msgstr "旋转背景"
 
-#. i18n: file kickerSettings.kcfg line 48
-#: rc.cpp:33
+#. i18n: file kickerSettings.kcfg line 65
+#: rc.cpp:48
 #, no-c-format
 msgid ""
 "When this option is enabled, when the panel is placed on the side or top edges "
@@ -104,14 +139,14 @@ msgid ""
 "orientation"
 msgstr "启用此选项时，若面板放在屏幕的左右两侧或上侧，将会对背景图像进行旋转以便符合面板的方向"
 
-#. i18n: file kickerSettings.kcfg line 53
-#: rc.cpp:36
+#. i18n: file kickerSettings.kcfg line 70
+#: rc.cpp:51
 #, no-c-format
 msgid "Background image"
 msgstr "背景图像"
 
-#. i18n: file kickerSettings.kcfg line 54
-#: rc.cpp:39
+#. i18n: file kickerSettings.kcfg line 71
+#: rc.cpp:54
 #, no-c-format
 msgid ""
 "Here you can choose an image to be displayed on the panel. Press the 'browse' "
@@ -119,67 +154,73 @@ msgid ""
 "if 'Enable background image' is selected"
 msgstr "您可在此选择要在面板上显示的图像。按下“浏览”按钮可使用文件对话框选择主题。仅当“启用背景图像”选中时，此选项才生效"
 
-#. i18n: file kickerSettings.kcfg line 59
-#: rc.cpp:42
+#. i18n: file kickerSettings.kcfg line 76
+#: rc.cpp:57
 #, no-c-format
 msgid ""
 "Controls the saturation level of the tint color used with transparent panels"
 msgstr "控制对透明面板着色时的饱和度。"
 
-#. i18n: file kickerSettings.kcfg line 66
-#: rc.cpp:45
+#. i18n: file kickerSettings.kcfg line 83
+#: rc.cpp:60
 #, no-c-format
 msgid "The tint color used to colorize transparent panels"
 msgstr "对透明面板着色所使用的颜色"
 
-#. i18n: file kickerSettings.kcfg line 68
-#: rc.cpp:48
+#. i18n: file kickerSettings.kcfg line 85
+#: rc.cpp:63
 #, no-c-format
 msgid "This option sets the color to use when tinting transparent panels"
 msgstr "此选项选择了对透明面板着色时所使用的颜色"
 
-#. i18n: file kickerSettings.kcfg line 72
-#: rc.cpp:51
+#. i18n: file kickerSettings.kcfg line 89
+#: rc.cpp:66
 #, no-c-format
 msgid "Raise when the pointer touches the screen here"
 msgstr "当指针指向屏幕此处时升起"
 
-#. i18n: file kickerSettings.kcfg line 77
-#: rc.cpp:54
+#. i18n: file kickerSettings.kcfg line 94
+#: rc.cpp:69
 #, no-c-format
 msgid "Fade out applet handles"
 msgstr "淡出小程序把手"
 
-#. i18n: file kickerSettings.kcfg line 79
-#: rc.cpp:57
+#. i18n: file kickerSettings.kcfg line 96
+#: rc.cpp:72
 #, no-c-format
 msgid ""
 "Select this option to make applet handles only visible on mouse hover. Applet "
 "handles let you move, remove and configure applets."
 msgstr "选择此选项将使得小程序把手仅当鼠标悬停时才可见。小程序把手可允许您移动、删除和配置小程序。"
 
-#. i18n: file kickerSettings.kcfg line 83
-#: rc.cpp:60
+#. i18n: file kickerSettings.kcfg line 100
+#: rc.cpp:75
 #, no-c-format
 msgid "Hide applet handles"
 msgstr "隐藏小程序把手"
 
-#. i18n: file kickerSettings.kcfg line 85
-#: rc.cpp:63
+#. i18n: file kickerSettings.kcfg line 102
+#: rc.cpp:78
 #, no-c-format
 msgid ""
 "Select this option to always hide the applet handles. Beware this could disable "
 "moving, removing or configuring some applets."
 msgstr "选择此选项将总是隐藏小程序把手。请注意，这也将禁止移动、删除或配置某些小程序。"
 
-#. i18n: file kickerSettings.kcfg line 89
-#: rc.cpp:66
+#. i18n: file kickerSettings.kcfg line 106
+#: rc.cpp:81
 #, no-c-format
 msgid "Show informational tooltips"
 msgstr "显示信息性工具提示"
 
-#. i18n: file kickerSettings.kcfg line 94
-#: rc.cpp:69
+#. i18n: file kickerSettings.kcfg line 111
+#: rc.cpp:84
+#, no-c-format
+msgid "Show visual effect when panel icon is activated."
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 116
+#: rc.cpp:87
 #, no-c-format
 msgid ""
 "A list of applets that have been loaded at runtime. In the case of a crash "
@@ -187,8 +228,8 @@ msgid ""
 "the crash"
 msgstr "运行时装入的小程序列表。如果发生崩溃的话，这些小程序将不会在 Kicker 下次启动的时候装入，因为很可能是这些小程序造成的崩溃"
 
-#. i18n: file kickerSettings.kcfg line 98
-#: rc.cpp:72
+#. i18n: file kickerSettings.kcfg line 120
+#: rc.cpp:90
 #, no-c-format
 msgid ""
 "A list of extensions that have been loaded at runtime. In the case of a crash "
@@ -196,263 +237,391 @@ msgid ""
 "caused the crash"
 msgstr "运行时装入的扩展列表。如果发生崩溃的话，这些扩展将不会在 Kicker 下次启动的时候装入，因为很可能是这些扩展造成的崩溃"
 
-#. i18n: file kickerSettings.kcfg line 108
-#: rc.cpp:75
+#. i18n: file kickerSettings.kcfg line 124
+#: rc.cpp:93
+#, fuzzy, no-c-format
+msgid "When this option is enabled, the classic TDE Menu is used."
+msgstr "启用此选项时，面板将变成半透明状"
+
+#. i18n: file kickerSettings.kcfg line 129
+#: rc.cpp:96
+#, fuzzy, no-c-format
+msgid "When this option is enabled, the Kickoff Menu opens on mouse hover."
+msgstr "启用此选项时，面板将变成半透明状"
+
+#. i18n: file kickerSettings.kcfg line 134
+#: rc.cpp:99
+#, fuzzy, no-c-format
+msgid ""
+"When this option is enabled, the Kickoff Menu application view switching will "
+"scroll."
+msgstr "启用此选项时，面板将把平铺图像显示为背景"
+
+#. i18n: file kickerSettings.kcfg line 139
+#: rc.cpp:102 rc.cpp:105
+#, no-c-format
+msgid "Preferred width of the KMenu"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 149
+#: rc.cpp:108
+#, no-c-format
+msgid "With this option the scale of the fonts Kickoff uses can be influenced"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 156
+#: rc.cpp:111
+#, no-c-format
+msgid ""
+"When this option is enabled, tdeabc is utilized to search for addresses. This "
+"may start KMail."
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 161
+#: rc.cpp:114
+#, fuzzy, no-c-format
+msgid ""
+"When this option is enabled, the Geeko eye moves when the mouse hovers the "
+"start menu button"
+msgstr "启用此选项时，面板将无法移动，您也无法删除或添加项目"
+
+#. i18n: file kickerSettings.kcfg line 168
+#: rc.cpp:117
+#, fuzzy, no-c-format
+msgid "Show names and icons on tabs"
+msgstr "细节项中先显示名称"
+
+#. i18n: file kickerSettings.kcfg line 171
+#: rc.cpp:120
+#, no-c-format
+msgid "Show only the names"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 174
+#: rc.cpp:123
+#, no-c-format
+msgid "Show only the icons"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 178
+#: rc.cpp:126
+#, no-c-format
+msgid "Appearace of the Kickoff tabbar"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 182
+#: rc.cpp:129
+#, fuzzy, no-c-format
+msgid ""
+"When this option is enabled, the tabs in the Kickoff menu will switch without "
+"the need to click"
+msgstr "启用此选项时，包含菜单栏的面板也将变成半透明"
+
+#. i18n: file kickerSettings.kcfg line 194
+#: rc.cpp:132
 #, no-c-format
 msgid "Show simple menu entries"
 msgstr "显示简单的菜单项"
 
-#. i18n: file kickerSettings.kcfg line 111
-#: rc.cpp:78
+#. i18n: file kickerSettings.kcfg line 197
+#: rc.cpp:135
 #, no-c-format
 msgid "Show names first on detailed entries"
 msgstr "细节项中先显示名称"
 
-#. i18n: file kickerSettings.kcfg line 114
-#: rc.cpp:81
+#. i18n: file kickerSettings.kcfg line 200
+#: rc.cpp:138
 #, no-c-format
 msgid "Show only description for menu entries"
 msgstr "只显示菜单项的描述"
 
-#. i18n: file kickerSettings.kcfg line 117
-#: rc.cpp:84
+#. i18n: file kickerSettings.kcfg line 203
+#: rc.cpp:141
 #, no-c-format
 msgid "Show detailed menu entries"
 msgstr "显示更详细的菜单项"
 
-#. i18n: file kickerSettings.kcfg line 121
-#: rc.cpp:87
+#. i18n: file kickerSettings.kcfg line 207
+#: rc.cpp:144
 #, no-c-format
 msgid "Formation of the menu entry text"
 msgstr "菜单项文本的格式"
 
-#. i18n: file kickerSettings.kcfg line 125
-#: rc.cpp:90
+#. i18n: file kickerSettings.kcfg line 211
+#: rc.cpp:147
 #, no-c-format
 msgid "Show section titles in Kmenu"
 msgstr "在 KMenu 中显示节标题"
 
-#. i18n: file kickerSettings.kcfg line 130
-#: rc.cpp:93
+#. i18n: file kickerSettings.kcfg line 216
+#: rc.cpp:150
+#, no-c-format
+msgid "Simplify menus with only a single item inside"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 221
+#: rc.cpp:153
 #, no-c-format
 msgid "Height of menu entries in pixels"
 msgstr "菜单项的像素高度"
 
-#. i18n: file kickerSettings.kcfg line 135
-#: rc.cpp:96
+#. i18n: file kickerSettings.kcfg line 226
+#: rc.cpp:156
 #, no-c-format
 msgid "Show hidden files in Quick Browser"
 msgstr "在快速浏览器中显示隐藏文件"
 
-#. i18n: file kickerSettings.kcfg line 140
-#: rc.cpp:99
+#. i18n: file kickerSettings.kcfg line 231
+#: rc.cpp:159
 #, no-c-format
 msgid "Maximum number of entries"
 msgstr "菜单的最多项数"
 
-#. i18n: file kickerSettings.kcfg line 146
-#: rc.cpp:102
+#. i18n: file kickerSettings.kcfg line 237
+#: rc.cpp:162
 #, no-c-format
 msgid "Show bookmarks in KMenu"
 msgstr "在 KMenu 中显示书签"
 
-#. i18n: file kickerSettings.kcfg line 151
-#: rc.cpp:105
+#. i18n: file kickerSettings.kcfg line 242
+#: rc.cpp:165
 #, no-c-format
 msgid "Use the Quick Browser"
 msgstr "使用快速浏览器"
 
-#. i18n: file kickerSettings.kcfg line 156
-#: rc.cpp:108
+#. i18n: file kickerSettings.kcfg line 247
+#: rc.cpp:168
 #, no-c-format
 msgid "Optional Menus"
 msgstr "可选菜单"
 
-#. i18n: file kickerSettings.kcfg line 161
-#: rc.cpp:111
+#. i18n: file kickerSettings.kcfg line 252
+#: rc.cpp:171
 #, no-c-format
 msgid "Recently used applications"
 msgstr "最近使用的应用程序"
 
-#. i18n: file kickerSettings.kcfg line 165
-#: rc.cpp:114
+#. i18n: file kickerSettings.kcfg line 256
+#: rc.cpp:174
 #, no-c-format
 msgid "Number of visible entries"
 msgstr "可见项数"
 
-#. i18n: file kickerSettings.kcfg line 171
-#: rc.cpp:117
+#. i18n: file kickerSettings.kcfg line 262
+#: rc.cpp:177
 #, no-c-format
 msgid "Show most recently used applications rather than most frequently used"
 msgstr "显示最近使用过的应用程序，而不是最常使用的应用程序"
 
-#. i18n: file kickerSettings.kcfg line 180
-#: rc.cpp:120
+#. i18n: file kickerSettings.kcfg line 267
+#: rc.cpp:180
+#, no-c-format
+msgid "The menu entries shown in the Favorites tab"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 271
+#: rc.cpp:183
+#, no-c-format
+msgid "Whether the panel has been started before or not"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 276
+#: rc.cpp:186
+#, no-c-format
+msgid "When the applications were first seen by Kickoff"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 284
+#: rc.cpp:189
 #, no-c-format
 msgid "Enable a tile background image for the KMenu button"
 msgstr "启用 KMenu 按钮的平铺背景图像"
 
-#. i18n: file kickerSettings.kcfg line 185
-#: rc.cpp:123
+#. i18n: file kickerSettings.kcfg line 289
+#: rc.cpp:192
 #, no-c-format
 msgid "Enable a tile background image for the Desktop button"
 msgstr "启用桌面按钮的平铺桌面图像"
 
-#. i18n: file kickerSettings.kcfg line 190
-#: rc.cpp:126
+#. i18n: file kickerSettings.kcfg line 294
+#: rc.cpp:195
 #, no-c-format
 msgid "Enable a tile background image for Application, URL and special buttons"
 msgstr "启用应用程序、URL 和特殊按钮的平铺背景图像"
 
-#. i18n: file kickerSettings.kcfg line 195
-#: rc.cpp:129
+#. i18n: file kickerSettings.kcfg line 299
+#: rc.cpp:198
 #, no-c-format
 msgid "Enable a tile background image for the Quick Browser button"
 msgstr "启用快速浏览器按钮的平铺背景图像"
 
-#. i18n: file kickerSettings.kcfg line 200
-#: rc.cpp:132
+#. i18n: file kickerSettings.kcfg line 304
+#: rc.cpp:201
 #, no-c-format
 msgid "Enable a tile background image for the Window List button"
 msgstr "启用窗口列表按钮的平铺背景图像"
 
-#. i18n: file kickerSettings.kcfg line 205
-#: rc.cpp:135
+#. i18n: file kickerSettings.kcfg line 309
+#: rc.cpp:204
 #, no-c-format
 msgid "Image tile for Kmenu button background"
 msgstr "KMenu 按钮背景的平铺图像"
 
-#. i18n: file kickerSettings.kcfg line 209
-#: rc.cpp:138 rc.cpp:144
+#. i18n: file kickerSettings.kcfg line 313
+#: rc.cpp:207 rc.cpp:213
 #, no-c-format
 msgid "Color to use for Kmenu button background"
 msgstr "KMenu 按钮背景所用的颜色"
 
-#. i18n: file kickerSettings.kcfg line 214
-#: rc.cpp:141
+#. i18n: file kickerSettings.kcfg line 318
+#: rc.cpp:210
 #, no-c-format
 msgid "Image tile for Desktop button background"
 msgstr "桌面按钮背景的平铺图像"
 
-#. i18n: file kickerSettings.kcfg line 223
-#: rc.cpp:147
+#. i18n: file kickerSettings.kcfg line 327
+#: rc.cpp:216
 #, no-c-format
 msgid "Image tile for Application, URL and special button backgrounds"
 msgstr "应用程序、URL 和特殊按钮背景的平铺图像"
 
-#. i18n: file kickerSettings.kcfg line 227
-#: rc.cpp:150
+#. i18n: file kickerSettings.kcfg line 331
+#: rc.cpp:219
 #, no-c-format
 msgid "Color to use for Application, URL and special button backgrounds"
 msgstr "应用程序、URL 和特殊按钮背景所使用的颜色"
 
-#. i18n: file kickerSettings.kcfg line 232
-#: rc.cpp:153
+#. i18n: file kickerSettings.kcfg line 336
+#: rc.cpp:222
 #, no-c-format
 msgid "Image tile for Browser button background"
 msgstr "浏览器按钮背景的平铺图像"
 
-#. i18n: file kickerSettings.kcfg line 236
-#: rc.cpp:156
+#. i18n: file kickerSettings.kcfg line 340
+#: rc.cpp:225
 #, no-c-format
 msgid "Color to use for Browser button background"
 msgstr "浏览器按钮背景所使用的颜色"
 
-#. i18n: file kickerSettings.kcfg line 241
-#: rc.cpp:159
+#. i18n: file kickerSettings.kcfg line 345
+#: rc.cpp:228
 #, no-c-format
 msgid "Image tile for Window List button background"
 msgstr "窗口列表按钮背景的平铺图像"
 
-#. i18n: file kickerSettings.kcfg line 245
-#: rc.cpp:162
+#. i18n: file kickerSettings.kcfg line 349
+#: rc.cpp:231
 #, no-c-format
 msgid "Color to use for Window List button background"
 msgstr "窗口列表按钮背景所使用的颜色"
 
-#. i18n: file kickerSettings.kcfg line 254
-#: rc.cpp:165
+#. i18n: file kickerSettings.kcfg line 358
+#: rc.cpp:234
 #, no-c-format
 msgid "Use side image in Kmenu"
 msgstr "在 KMenu 中使用侧边图像"
 
-#. i18n: file kickerSettings.kcfg line 259
-#: rc.cpp:168
+#. i18n: file kickerSettings.kcfg line 363
+#: rc.cpp:237
+#, fuzzy, no-c-format
+msgid "Use Tooltip in Kmenu"
+msgstr "在 KMenu 中使用侧边图像"
+
+#. i18n: file kickerSettings.kcfg line 368
+#: rc.cpp:240
+#, fuzzy, no-c-format
+msgid "Show searh field in Kmenu"
+msgstr "在 KMenu 中显示节标题"
+
+#. i18n: file kickerSettings.kcfg line 373
+#: rc.cpp:243
 #, no-c-format
 msgid "The name of the file to use as the side image in the TDE Menu"
 msgstr "在 K 菜单中用作侧边图像的文件名"
 
-#. i18n: file kickerSettings.kcfg line 264
-#: rc.cpp:171
+#. i18n: file kickerSettings.kcfg line 378
+#: rc.cpp:246
 #, no-c-format
 msgid ""
 "The name of the file used as a tile to fill the height of TDE Menu that "
 "SidePixmapName does not cover"
 msgstr "用来填充 K 菜单中 SidePixmapName 无法覆盖的部分的文件名"
 
-#. i18n: file kickerSettings.kcfg line 269
-#: rc.cpp:174
+#. i18n: file kickerSettings.kcfg line 383
+#: rc.cpp:249
 #, no-c-format
 msgid "Show text on the TDE Menu button"
 msgstr "在 K 菜单按钮上显示文本"
 
-#. i18n: file kickerSettings.kcfg line 274
-#: rc.cpp:177
+#. i18n: file kickerSettings.kcfg line 388
+#: rc.cpp:252
 #, no-c-format
 msgid "Text to be shown on TDE Menu Button"
 msgstr "K 菜单按钮上要显示的文本"
 
-#. i18n: file kickerSettings.kcfg line 283
-#: rc.cpp:180
+#. i18n: file kickerSettings.kcfg line 393
+#: rc.cpp:255
+#, no-c-format
+msgid "Custom TDE Menu Button Icon"
+msgstr ""
+
+#. i18n: file kickerSettings.kcfg line 402
+#: rc.cpp:258
 #, no-c-format
 msgid "Enable icon mouse over effects"
 msgstr "启用图标的鼠标悬停效果"
 
-#. i18n: file kickerSettings.kcfg line 288
-#: rc.cpp:183
+#. i18n: file kickerSettings.kcfg line 407
+#: rc.cpp:261
 #, no-c-format
 msgid "Show icons in mouse over effects"
 msgstr "在鼠标悬停效果中显示图标"
 
-#. i18n: file kickerSettings.kcfg line 293
-#: rc.cpp:186
+#. i18n: file kickerSettings.kcfg line 412
+#: rc.cpp:264
 #, no-c-format
 msgid "Show text in mouse over effects"
 msgstr "在鼠标悬停效果中显示文本"
 
-#. i18n: file kickerSettings.kcfg line 298
-#: rc.cpp:189
+#. i18n: file kickerSettings.kcfg line 417
+#: rc.cpp:267
 #, no-c-format
 msgid ""
 "Controls how fast the tooltips fade in, measured in thousandths of a second"
 msgstr "控制工具提示淡入的速度，以毫秒计"
 
-#. i18n: file kickerSettings.kcfg line 304
-#: rc.cpp:192
+#. i18n: file kickerSettings.kcfg line 423
+#: rc.cpp:270
 #, no-c-format
 msgid "Mouse over effects are shown after the defined time (in milliseconds)"
 msgstr "鼠标悬停效果将在指定时间后显示(以毫秒计)"
 
-#. i18n: file kickerSettings.kcfg line 309
-#: rc.cpp:195
+#. i18n: file kickerSettings.kcfg line 428
+#: rc.cpp:273
 #, no-c-format
 msgid "Mouse over effects are hidden after the defined time (in milliseconds)"
 msgstr "鼠标悬停效果将在指定时间后隐藏(以毫秒计)"
 
-#. i18n: file kickerSettings.kcfg line 314
-#: rc.cpp:198
+#. i18n: file kickerSettings.kcfg line 433
+#: rc.cpp:276
 #, no-c-format
 msgid "Enable background tiles"
 msgstr "启用背景平铺"
 
-#. i18n: file kickerSettings.kcfg line 319
-#: rc.cpp:201
+#. i18n: file kickerSettings.kcfg line 438
+#: rc.cpp:279
 #, no-c-format
 msgid "The margin between panel icons and the panel border"
 msgstr "面板图标和面板边框之间的距离"
 
-#. i18n: file kickerSettings.kcfg line 324
-#: rc.cpp:204
+#. i18n: file kickerSettings.kcfg line 443
+#: rc.cpp:282
+#, fuzzy, no-c-format
+msgid "The maximum height of the TDE Menu button in pixels"
+msgstr "在 K 菜单按钮上显示文本"
+
+#. i18n: file kickerSettings.kcfg line 448
+#: rc.cpp:285
 #, no-c-format
 msgid ""
 "Buttons that represent KServices (applications, primarily) watch for the "
@@ -460,14 +629,14 @@ msgid ""
 "turns this off."
 msgstr "代表 KServices(主要是应用程序)的按钮会监视服务的删除并删除对应的按钮。此设置可关闭此功能。"
 
-#. i18n: file kickerSettings.kcfg line 329
-#: rc.cpp:207
+#. i18n: file kickerSettings.kcfg line 453
+#: rc.cpp:288
 #, no-c-format
 msgid "Font for the buttons with text."
 msgstr "按钮文本的字体。"
 
-#. i18n: file kickerSettings.kcfg line 334
-#: rc.cpp:210
+#. i18n: file kickerSettings.kcfg line 458
+#: rc.cpp:291
 #, no-c-format
 msgid "Text color for the buttons."
 msgstr "按钮文本的颜色。"
diff --git a/tde-i18n-zh_CN/messages/tdebase/libkickermenu_konsole.po b/tde-i18n-zh_CN/messages/tdebase/libkickermenu_konsole.po
index 7b50f78f77e..0889f16a562 100644
--- a/tde-i18n-zh_CN/messages/tdebase/libkickermenu_konsole.po
+++ b/tde-i18n-zh_CN/messages/tdebase/libkickermenu_konsole.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkickermenu_konsole\n"
-"POT-Creation-Date: 2006-02-23 03:46+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2002-10-10 11:57+0800\n"
 "Last-Translator: Funda Wang <fundawang@en2china.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/libkickermenu_prefmenu.po b/tde-i18n-zh_CN/messages/tdebase/libkickermenu_prefmenu.po
index b7f73a9091e..fbb0eb7b673 100644
--- a/tde-i18n-zh_CN/messages/tdebase/libkickermenu_prefmenu.po
+++ b/tde-i18n-zh_CN/messages/tdebase/libkickermenu_prefmenu.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkickermenu_prefmenu\n"
-"POT-Creation-Date: 2006-03-18 04:02+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2002-10-10 11:58+0800\n"
 "Last-Translator: Funda Wang <fundawang@en2china.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,7 +19,8 @@ msgid "Settings"
 msgstr "设置"
 
 #: prefmenu.cpp:248
-msgid "Control Center"
+#, fuzzy
+msgid "Trinity Control Center"
 msgstr "控制中心"
 
 #: prefmenu.cpp:266
diff --git a/tde-i18n-zh_CN/messages/tdebase/libkickermenu_recentdocs.po b/tde-i18n-zh_CN/messages/tdebase/libkickermenu_recentdocs.po
index 51dacf35b1e..26372a4836b 100644
--- a/tde-i18n-zh_CN/messages/tdebase/libkickermenu_recentdocs.po
+++ b/tde-i18n-zh_CN/messages/tdebase/libkickermenu_recentdocs.po
@@ -5,18 +5,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkickermenu_recentdocs\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2002-10-10 11:59+0800\n"
 "Last-Translator: Funda Wang <fundawang@en2china.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: recentdocsmenu.cpp:53
+#: recentdocsmenu.cpp:55
 msgid "Clear History"
 msgstr "清空历史"
 
-#: recentdocsmenu.cpp:60
+#: recentdocsmenu.cpp:61
 msgid "No Entries"
 msgstr "没有条目"
diff --git a/tde-i18n-zh_CN/messages/tdebase/libkickermenu_remotemenu.po b/tde-i18n-zh_CN/messages/tdebase/libkickermenu_remotemenu.po
index e3308e79c9c..96da25e9d72 100644
--- a/tde-i18n-zh_CN/messages/tdebase/libkickermenu_remotemenu.po
+++ b/tde-i18n-zh_CN/messages/tdebase/libkickermenu_remotemenu.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkickermenu_remotemenu\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/libkickermenu_systemmenu.po b/tde-i18n-zh_CN/messages/tdebase/libkickermenu_systemmenu.po
index 7d224a3ea09..b8640b56ecd 100644
--- a/tde-i18n-zh_CN/messages/tdebase/libkickermenu_systemmenu.po
+++ b/tde-i18n-zh_CN/messages/tdebase/libkickermenu_systemmenu.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkickermenu_systemmenu\n"
-"POT-Creation-Date: 2006-03-18 04:02+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/libkickermenu_tdeprint.po b/tde-i18n-zh_CN/messages/tdebase/libkickermenu_tdeprint.po
index f47fb953360..19b93082b9e 100644
--- a/tde-i18n-zh_CN/messages/tdebase/libkickermenu_tdeprint.po
+++ b/tde-i18n-zh_CN/messages/tdebase/libkickermenu_tdeprint.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkickermenu_tdeprint 1.0\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2002-09-10 14:18+0800\n"
 "Last-Translator: Li Zongliang <li-zongliang@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/libkickermenu_tom.po b/tde-i18n-zh_CN/messages/tdebase/libkickermenu_tom.po
index 10ab79d8d0a..6d3eb0ab01f 100644
--- a/tde-i18n-zh_CN/messages/tdebase/libkickermenu_tom.po
+++ b/tde-i18n-zh_CN/messages/tdebase/libkickermenu_tom.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkickermenu_tom\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-05 14:01+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/libkonq.po b/tde-i18n-zh_CN/messages/tdebase/libkonq.po
index 5bcca559529..f151c06f5d1 100644
--- a/tde-i18n-zh_CN/messages/tdebase/libkonq.po
+++ b/tde-i18n-zh_CN/messages/tdebase/libkonq.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2007-09-26 01:13+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-01-20 01:39+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -106,168 +107,168 @@ msgstr "<p>您没有足够的权限读取 <b>%1</b></p>"
 msgid "<p><b>%1</b> does not seem to exist anymore</p>"
 msgstr "<p><b>%1</b> 似乎不再存在</p>"
 
-#: konq_dirpart.cc:491
+#: konq_dirpart.cc:495
 #, c-format
 msgid "Search result: %1"
 msgstr "查找结果：%1"
 
-#: konq_operations.cc:269
+#: konq_operations.cc:271
 #, c-format
 msgid ""
 "_n: Do you really want to delete this item?\n"
 "Do you really want to delete these %n items?"
 msgstr "您真的要删除这 %n 个项目吗？"
 
-#: konq_operations.cc:271
+#: konq_operations.cc:273
 msgid "Delete Files"
 msgstr "删除文件"
 
-#: konq_operations.cc:278
+#: konq_operations.cc:280
 #, c-format
 msgid ""
 "_n: Do you really want to shred this item?\n"
 "Do you really want to shred these %n items?"
 msgstr "您真的要销毁这 %n 个项目吗？"
 
-#: konq_operations.cc:280
+#: konq_operations.cc:282
 msgid "Shred Files"
 msgstr "销毁文件"
 
-#: konq_operations.cc:281
+#: konq_operations.cc:283
 msgid "Shred"
 msgstr "销毁"
 
-#: konq_operations.cc:288
+#: konq_operations.cc:290
 #, c-format
 msgid ""
 "_n: Do you really want to move this item to the trash?\n"
 "Do you really want to move these %n items to the trash?"
 msgstr "您真的要将这 %n 个项目移到回收站中吗？"
 
-#: konq_operations.cc:290
+#: konq_operations.cc:292
 msgid "Move to Trash"
 msgstr "移动到回收站"
 
-#: konq_operations.cc:291
+#: konq_operations.cc:293
 msgid ""
 "_: Verb\n"
 "&Trash"
 msgstr "放入回收站(&T)"
 
-#: konq_operations.cc:342
+#: konq_operations.cc:344
 msgid "You cannot drop a folder on to itself"
 msgstr "您不能将文件夹拖放到它自己上"
 
-#: konq_operations.cc:388
+#: konq_operations.cc:390
 msgid "File name for dropped contents:"
 msgstr "拖曳内容的文件名："
 
-#: konq_operations.cc:567
+#: konq_operations.cc:575
 msgid "&Move Here"
 msgstr "移动至此处(&M)"
 
-#: konq_operations.cc:569
+#: konq_operations.cc:577
 msgid "&Copy Here"
 msgstr "复制至此处(&C)"
 
-#: konq_operations.cc:570
+#: konq_operations.cc:578
 msgid "&Link Here"
 msgstr "在此处创建链接(&L)"
 
-#: konq_operations.cc:572
+#: konq_operations.cc:580
 msgid "Set as &Wallpaper"
 msgstr "设为壁纸(&W)"
 
-#: konq_operations.cc:574
+#: konq_operations.cc:582
 msgid "C&ancel"
 msgstr "取消(&A)"
 
-#: konq_operations.cc:728 konq_operations.cc:730 konq_operations.cc:732
+#: konq_operations.cc:736 konq_operations.cc:738 konq_operations.cc:740
 msgid "New Folder"
 msgstr "新建文件夹"
 
-#: konq_operations.cc:733
+#: konq_operations.cc:741
 msgid "Enter folder name:"
 msgstr "输入文件夹名称："
 
-#: konq_popupmenu.cc:471
+#: konq_popupmenu.cc:501
 msgid "&Open"
 msgstr "打开(&O)"
 
-#: konq_popupmenu.cc:471
+#: konq_popupmenu.cc:501
 msgid "Open in New &Window"
 msgstr "在新窗口中打开(&W)"
 
-#: konq_popupmenu.cc:478
+#: konq_popupmenu.cc:508
 msgid "Open the trash in a new window"
 msgstr "在新窗口中打开回收站"
 
-#: konq_popupmenu.cc:480
+#: konq_popupmenu.cc:510
 msgid "Open the medium in a new window"
 msgstr "在新窗口中打开介质"
 
-#: konq_popupmenu.cc:482
+#: konq_popupmenu.cc:512
 msgid "Open the document in a new window"
 msgstr "在新窗口中打开文档"
 
-#: konq_popupmenu.cc:501
+#: konq_popupmenu.cc:531
 msgid "Create &Folder..."
 msgstr "创建文件夹(&F)..."
 
-#: konq_popupmenu.cc:508
+#: konq_popupmenu.cc:538
 msgid "&Restore"
 msgstr "恢复(&R)"
 
-#: konq_popupmenu.cc:579
+#: konq_popupmenu.cc:609
 msgid "&Empty Trash Bin"
 msgstr "清空回收站(&E)"
 
-#: konq_popupmenu.cc:601
+#: konq_popupmenu.cc:631
 msgid "&Bookmark This Page"
 msgstr "将此页加入书签(&B)"
 
-#: konq_popupmenu.cc:603
+#: konq_popupmenu.cc:633
 msgid "&Bookmark This Location"
 msgstr "将此位置加入书签(&B)"
 
-#: konq_popupmenu.cc:606
+#: konq_popupmenu.cc:636
 msgid "&Bookmark This Folder"
 msgstr "将此文件夹加入书签(&B)"
 
-#: konq_popupmenu.cc:608
+#: konq_popupmenu.cc:638
 msgid "&Bookmark This Link"
 msgstr "将此链接加入书签(&B)"
 
-#: konq_popupmenu.cc:610
+#: konq_popupmenu.cc:640
 msgid "&Bookmark This File"
 msgstr "将此文件加入书签(&B)"
 
-#: konq_popupmenu.cc:858
+#: konq_popupmenu.cc:894
 msgid "&Open With"
 msgstr "打开方式(&O)"
 
-#: konq_popupmenu.cc:888
+#: konq_popupmenu.cc:924
 #, c-format
 msgid "Open with %1"
 msgstr "用 %1 打开"
 
-#: konq_popupmenu.cc:902
+#: konq_popupmenu.cc:938
 msgid "&Other..."
 msgstr "其它(&O)..."
 
-#: konq_popupmenu.cc:906 konq_popupmenu.cc:913
+#: konq_popupmenu.cc:942 konq_popupmenu.cc:949
 msgid "&Open With..."
 msgstr "打开方式(&O)..."
 
-#: konq_popupmenu.cc:933
+#: konq_popupmenu.cc:969
 msgid "Ac&tions"
 msgstr "动作(&T)"
 
-#: konq_popupmenu.cc:967
+#: konq_popupmenu.cc:1003
 msgid "&Properties"
 msgstr "属性(&P)"
 
-#: konq_popupmenu.cc:981
+#: konq_popupmenu.cc:1017
 msgid "Share"
 msgstr "共享"
 
diff --git a/tde-i18n-zh_CN/messages/tdebase/libtaskbar.po b/tde-i18n-zh_CN/messages/tdebase/libtaskbar.po
index 19eba7433c3..e938cf84a2f 100644
--- a/tde-i18n-zh_CN/messages/tdebase/libtaskbar.po
+++ b/tde-i18n-zh_CN/messages/tdebase/libtaskbar.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libtaskbar\n"
-"POT-Creation-Date: 2008-08-18 01:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-10-15 20:57+0800\n"
 "Last-Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -17,241 +18,315 @@ msgstr ""
 #. i18n: file taskbar.kcfg line 11
 #: rc.cpp:3
 #, no-c-format
-msgid "Show windows from all desktops"
-msgstr "显示全部桌面中的窗口"
+msgid "Use the global taskbar configuration"
+msgstr ""
 
 #. i18n: file taskbar.kcfg line 12
 #: rc.cpp:6
 #, no-c-format
 msgid ""
-"Turning this option off will cause the taskbar to display <b>only</b> "
-"the windows on the current desktop. \\n\\nBy default, this option is selected "
-"and all windows are shown."
+"Turning this option off will cause the taskbar to ignore the global taskbar "
+"configuration, instead using a specific configuration for that particular "
+"taskbar."
 msgstr ""
-"关闭此选项将使得任务栏<b>只</b>显示当前桌面中的窗口。\\n\\n默认情况下，此选项是选中的，将会显示所有窗口。"
 
 #. i18n: file taskbar.kcfg line 16
 #: rc.cpp:9
 #, no-c-format
-msgid "Show only minimized windows"
-msgstr "只显示最小化的窗口"
+msgid "Allow taskbar items to be rearranged using drag and drop"
+msgstr ""
 
 #. i18n: file taskbar.kcfg line 17
 #: rc.cpp:12
+#, fuzzy, no-c-format
+msgid ""
+"Turning this option on will allow tasks on the taskbar to be manually "
+"rearranged using drag and drop."
+msgstr "开启此选项将允许您为任务按钮文本和背景选择您自己的颜色。"
+
+#. i18n: file taskbar.kcfg line 21
+#: rc.cpp:15
 #, no-c-format
+msgid "Show windows from all desktops"
+msgstr "显示全部桌面中的窗口"
+
+#. i18n: file taskbar.kcfg line 22
+#: rc.cpp:18
+#, fuzzy, no-c-format
+msgid ""
+"Turning this option off will cause the taskbar to display <b>only</b> "
+"the windows on the current desktop. By default, this option is selected and all "
+"windows are shown."
+msgstr ""
+"关闭此选项将使得任务栏<b>只</b>显示当前桌面中的窗口。\\n\\n默认情况下，此选项是选中的，将会显示所有窗口。"
+
+#. i18n: file taskbar.kcfg line 26
+#: rc.cpp:21
+#, no-c-format
+msgid "Cycle through windows with mouse wheel"
+msgstr ""
+
+#. i18n: file taskbar.kcfg line 27
+#: rc.cpp:24
+#, fuzzy, no-c-format
+msgid ""
+"Enabling this option causes the taskbar to cycle through the current list of "
+"windows when using the mouse wheel"
+msgstr "选择此选项将使得任务栏显示这样一个按钮，单击该按钮时将在弹出菜单中显示所有窗口的列表。"
+
+#. i18n: file taskbar.kcfg line 31
+#: rc.cpp:27
+#, no-c-format
+msgid "Show only minimized windows"
+msgstr "只显示最小化的窗口"
+
+#. i18n: file taskbar.kcfg line 32
+#: rc.cpp:30
+#, fuzzy, no-c-format
 msgid ""
 "Select this option if you want the taskbar to display <b>only</b> "
-"minimized windows. \\n\\nBy default, this option is not selected and the "
-"taskbar will show all windows."
+"minimized windows. By default, this option is not selected and the taskbar will "
+"show all windows."
 msgstr ""
 "如果您想要任务栏<b>只</b>显示最小化了的窗口，请选择此选项。\\n\\n默认情况下，此选项是未选中的，任务栏将显示全部窗口。"
 
-#. i18n: file taskbar.kcfg line 22
-#: rc.cpp:15
+#. i18n: file taskbar.kcfg line 37
+#: rc.cpp:33 rc.cpp:48
 #, no-c-format
 msgid "Never"
 msgstr "从不"
 
-#. i18n: file taskbar.kcfg line 25
-#: rc.cpp:18
+#. i18n: file taskbar.kcfg line 40
+#: rc.cpp:36 rc.cpp:51
 #, no-c-format
 msgid "When Taskbar Full"
 msgstr "当任务栏占满时"
 
-#. i18n: file taskbar.kcfg line 28
-#: rc.cpp:21
+#. i18n: file taskbar.kcfg line 43
+#: rc.cpp:39 rc.cpp:54
 #, no-c-format
 msgid "Always"
 msgstr "总是"
 
-#. i18n: file taskbar.kcfg line 32
-#: rc.cpp:24
+#. i18n: file taskbar.kcfg line 47
+#: rc.cpp:42
+#, no-c-format
+msgid "Display:"
+msgstr ""
+
+#. i18n: file taskbar.kcfg line 48
+#: rc.cpp:45
+#, no-c-format
+msgid ""
+"Choose taskbar display mode among <strong>Icons and text</strong>, <strong>"
+"Text only</strong> and <strong>Icons only</strong>"
+msgstr ""
+
+#. i18n: file taskbar.kcfg line 63
+#: rc.cpp:57
 #, no-c-format
 msgid "Group similar tasks:"
 msgstr "分组类似任务："
 
-#. i18n: file taskbar.kcfg line 33
-#: rc.cpp:27
-#, no-c-format
+#. i18n: file taskbar.kcfg line 64
+#: rc.cpp:60
+#, fuzzy, no-c-format
 msgid ""
 "The taskbar can group similar windows into single buttons. When one of these "
 "window group buttons are clicked on a menu appears showing all the windows in "
 "that group. This can be especially useful with the <em>Show all windows</em> "
-"option.\\n\\nYou can set the taskbar to <strong>Never</strong> "
+"option. You can set the taskbar to <strong>Never</strong> "
 "group windows, to <strong>Always</strong> group windows or to group windows "
-"only <strong>When the Taskbar is Full</strong>.\\n\\nBy default the taskbar "
-"groups windows when it is full."
+"only <strong>When the Taskbar is Full</strong>. By default the taskbar groups "
+"windows when it is full."
 msgstr ""
 "任务栏可以将类似窗口分组为一个按钮。单击这样的按钮后，会出现一个菜单，其中显示了该组中的全部窗口。<em>显示全部窗口</em>"
 "选项可能会非常有用。\\n\\n您可以将任务栏设置为<strong>从不</strong>分组窗口，<strong>总是</strong>"
 "分组窗口，或者是仅当<strong>任务栏满时</strong>。\\n\\n默认情况下，系统会在任务栏满时对窗口进行分组。"
 
-#. i18n: file taskbar.kcfg line 37
-#: rc.cpp:30
+#. i18n: file taskbar.kcfg line 69
+#: rc.cpp:63
+#, no-c-format
+msgid "Any"
+msgstr ""
+
+#. i18n: file taskbar.kcfg line 72
+#: rc.cpp:66
+#, no-c-format
+msgid "Only Stopped"
+msgstr ""
+
+#. i18n: file taskbar.kcfg line 75
+#: rc.cpp:69
+#, no-c-format
+msgid "Only Running"
+msgstr ""
+
+#. i18n: file taskbar.kcfg line 79
+#: rc.cpp:72
+#, fuzzy, no-c-format
+msgid "Show tasks with state:"
+msgstr "显示任务列表"
+
+#. i18n: file taskbar.kcfg line 80
+#: rc.cpp:75
+#, no-c-format
+msgid ""
+"The taskbar can show and/or hide tasks based on their current process state. "
+"Select <em>Any</em> to show all tasks regardless of current state."
+msgstr ""
+
+#. i18n: file taskbar.kcfg line 84
+#: rc.cpp:78
 #, no-c-format
 msgid "Sort windows by desktop"
 msgstr "按桌面排序窗口"
 
-#. i18n: file taskbar.kcfg line 38
-#: rc.cpp:33
-#, no-c-format
+#. i18n: file taskbar.kcfg line 85
+#: rc.cpp:81
+#, fuzzy, no-c-format
 msgid ""
 "Selecting this option causes the taskbar to show windows in order of the "
-"desktop they appear on.\\n\\nBy default this option is selected."
+"desktop they appear on. By default this option is selected."
 msgstr ""
 "选择此选项将导致任务栏按照窗口所属的桌面显示窗口。\\n\\n默认情况下，此选项是选中的。"
 
-#. i18n: file taskbar.kcfg line 42
-#: rc.cpp:36
+#. i18n: file taskbar.kcfg line 89
+#: rc.cpp:84
 #, no-c-format
 msgid "Sort windows by application"
 msgstr "按应用程序排序窗口"
 
-#. i18n: file taskbar.kcfg line 43
-#: rc.cpp:39
-#, no-c-format
+#. i18n: file taskbar.kcfg line 90
+#: rc.cpp:87
+#, fuzzy, no-c-format
 msgid ""
 "Selecting this option causes the taskbar to show windows ordered by "
-"application.\\n\\nBy default this option is selected."
+"application. By default this option is selected."
 msgstr ""
 "选择此选项将使得任务栏按照应用程序的顺序显示窗口。\\n\\n默认情况下，此选项是选中的。"
 
-#. i18n: file taskbar.kcfg line 47
-#: rc.cpp:42
-#, no-c-format
-msgid "Show application icons"
-msgstr "显示应用程序图标"
-
-#. i18n: file taskbar.kcfg line 48
-#: rc.cpp:45
-#, no-c-format
-msgid ""
-"Select this option if you want window icons to appear along with their titles "
-"in the taskbar.\\n\\nBy default this option is selected."
-msgstr ""
-"如果您想要在任务栏中同时显示窗口图标及其标题，请选择此选项。\\n\\n默认情况下，此选项是选中的。"
-
-#. i18n: file taskbar.kcfg line 64
-#: rc.cpp:48
+#. i18n: file taskbar.kcfg line 106
+#: rc.cpp:90
 #, no-c-format
 msgid "Show windows from all screens"
 msgstr "显示全部屏幕中的窗口"
 
-#. i18n: file taskbar.kcfg line 65
-#: rc.cpp:51
-#, no-c-format
+#. i18n: file taskbar.kcfg line 107
+#: rc.cpp:93
+#, fuzzy, no-c-format
 msgid ""
 "Turning this option off will cause the taskbar to display <b>only</b> "
-"windows which are on the same Xinerama screen as the taskbar.\\n\\nBy default, "
-"this option is selected and all windows are shown."
+"windows which are on the same Xinerama screen as the taskbar. By default, this "
+"option is selected and all windows are shown."
 msgstr ""
 "关闭此选项将使得任务上<b>只</b>显示与任务栏在同一 Xinerama 屏幕中的窗口。\\n\\n默认情况下，此选项为选中状态，即会显示全部窗口。"
 
-#. i18n: file taskbar.kcfg line 74
-#: rc.cpp:54
+#. i18n: file taskbar.kcfg line 116
+#: rc.cpp:96
 #, no-c-format
 msgid "Show window list button"
 msgstr "显示窗口列表"
 
-#. i18n: file taskbar.kcfg line 75
-#: rc.cpp:57
+#. i18n: file taskbar.kcfg line 117
+#: rc.cpp:99
 #, no-c-format
 msgid ""
 "Selecting this option causes the taskbar to display a button that, when "
 "clicked, shows a list of all windows in a popup menu."
 msgstr "选择此选项将使得任务栏显示这样一个按钮，单击该按钮时将在弹出菜单中显示所有窗口的列表。"
 
-#. i18n: file taskbar.kcfg line 87
-#: rc.cpp:60
+#. i18n: file taskbar.kcfg line 129
+#: rc.cpp:102
 #, no-c-format
 msgid "Show Task List"
 msgstr "显示任务列表"
 
-#. i18n: file taskbar.kcfg line 90
-#: rc.cpp:63
+#. i18n: file taskbar.kcfg line 132
+#: rc.cpp:105
 #, no-c-format
 msgid "Show Operations Menu"
 msgstr "显示操作菜单"
 
-#. i18n: file taskbar.kcfg line 93
-#: rc.cpp:66
+#. i18n: file taskbar.kcfg line 135
+#: rc.cpp:108
 #, no-c-format
 msgid "Activate, Raise or Minimize Task"
 msgstr "激活、升起或最小化任务"
 
-#. i18n: file taskbar.kcfg line 96
-#: rc.cpp:69
+#. i18n: file taskbar.kcfg line 138
+#: rc.cpp:111
 #, no-c-format
 msgid "Activate Task"
 msgstr "激活任务"
 
-#. i18n: file taskbar.kcfg line 99
-#: rc.cpp:72
+#. i18n: file taskbar.kcfg line 141
+#: rc.cpp:114
 #, no-c-format
 msgid "Raise Task"
 msgstr "提升任务"
 
-#. i18n: file taskbar.kcfg line 102
-#: rc.cpp:75
+#. i18n: file taskbar.kcfg line 144
+#: rc.cpp:117
 #, no-c-format
 msgid "Lower Task"
 msgstr "降低任务"
 
-#. i18n: file taskbar.kcfg line 105
-#: rc.cpp:78
+#. i18n: file taskbar.kcfg line 147
+#: rc.cpp:120
 #, no-c-format
 msgid "Minimize Task"
 msgstr "最小化任务"
 
-#. i18n: file taskbar.kcfg line 108
-#: rc.cpp:81
+#. i18n: file taskbar.kcfg line 150
+#: rc.cpp:123
 #, no-c-format
 msgid "Move To Current Desktop"
 msgstr "移动到当前桌面"
 
-#. i18n: file taskbar.kcfg line 111
-#: rc.cpp:84
+#. i18n: file taskbar.kcfg line 153
+#: rc.cpp:126
 #, no-c-format
 msgid "Close Task"
 msgstr "关闭任务"
 
-#. i18n: file taskbar.kcfg line 117
-#: rc.cpp:87
+#. i18n: file taskbar.kcfg line 159
+#: rc.cpp:129
 #, no-c-format
 msgid "Mouse button actions"
 msgstr "鼠标按钮动作"
 
-#. i18n: file taskbar.kcfg line 125
-#: rc.cpp:90
+#. i18n: file taskbar.kcfg line 167
+#: rc.cpp:132
 #, no-c-format
 msgid ""
 "The number of times to blink a taskbar button when a window asks for attention. "
 "Setting this to 1000 or greater causes the button to blink forever."
 msgstr "当窗口请求注意时任务栏按钮应闪烁的次数。将此值设定为 1000 或更高将使得任务按钮永远闪烁。"
 
-#. i18n: file taskbar.kcfg line 130
-#: rc.cpp:93
+#. i18n: file taskbar.kcfg line 172
+#: rc.cpp:135
 #, no-c-format
 msgid "Draw taskbar entries \"flat\" and not as a button"
 msgstr "平面绘制任务栏项，不绘制为按钮"
 
-#. i18n: file taskbar.kcfg line 131
-#: rc.cpp:96
-#, no-c-format
+#. i18n: file taskbar.kcfg line 173
+#: rc.cpp:138
+#, fuzzy, no-c-format
 msgid ""
 "Turning this option on will cause the taskbar to draw visible button frames for "
-"each entry in the taskbar. \\n\\nBy default, this option is off."
+"each entry in the taskbar. By default, this option is off."
 msgstr ""
 "开启此选项将是的任务栏中的每一项周围绘制可见边框。\\n\\n默认情况下，此选项是关闭的。"
 
-#. i18n: file taskbar.kcfg line 135
-#: rc.cpp:99
+#. i18n: file taskbar.kcfg line 177
+#: rc.cpp:141
 #, no-c-format
 msgid "Draw taskbar text with a halo around it"
 msgstr "任务栏文字周围绘制边框"
 
-#. i18n: file taskbar.kcfg line 136
-#: rc.cpp:102
+#. i18n: file taskbar.kcfg line 178
+#: rc.cpp:144
 #, no-c-format
 msgid ""
 "Turning this option on will cause the taskbar to draw fancier text that has an "
@@ -259,20 +334,20 @@ msgid ""
 "dark panel backgrounds, it is slower."
 msgstr "打开此选项将使得任务栏绘制周围有边框的文本。尽管此选项对透明面板或特定的暗色面板背景非常有用，但也很慢。"
 
-#. i18n: file taskbar.kcfg line 140
-#: rc.cpp:105
+#. i18n: file taskbar.kcfg line 182
+#: rc.cpp:147
 #, no-c-format
 msgid "Show a visible button frame on the task the cursor is positioned over"
 msgstr "鼠标指针指向任务时显示可见的按钮边框"
 
-#. i18n: file taskbar.kcfg line 144
-#: rc.cpp:108
+#. i18n: file taskbar.kcfg line 186
+#: rc.cpp:150
 #, no-c-format
 msgid "Show thumbnails instead of icons in the mouse-over effects"
 msgstr "在鼠标悬停效果中显示缩略图，而非图标"
 
-#. i18n: file taskbar.kcfg line 145
-#: rc.cpp:111
+#. i18n: file taskbar.kcfg line 187
+#: rc.cpp:153
 #, no-c-format
 msgid ""
 "Enabling this option will draw a thumbnail of the window in its mouse-over "
@@ -284,14 +359,14 @@ msgstr ""
 "启用此选项将在鼠标指针指向任务时绘制窗口缩略图。"
 "<p>如果窗口已经最小化，或者位于不同的桌面上，则会显示图标，除非该窗口被恢复，或者激活了相应的桌面。</p>"
 
-#. i18n: file taskbar.kcfg line 149
-#: rc.cpp:114
+#. i18n: file taskbar.kcfg line 191
+#: rc.cpp:156
 #, no-c-format
 msgid "Maximum width/height of the thumbnail in pixels"
 msgstr "缩略图的最大宽度/高度(以像素计)"
 
-#. i18n: file taskbar.kcfg line 150
-#: rc.cpp:117
+#. i18n: file taskbar.kcfg line 192
+#: rc.cpp:159
 #, no-c-format
 msgid ""
 "A thumbnail is created by resizing the window. The scaling factor is determined "
@@ -299,56 +374,56 @@ msgid ""
 "not exceed this value in any dimension."
 msgstr "通过缩放窗口来创建缩略图。缩放因子取决于窗口的最大尺寸及此值。这样的话，缩略图的大小就不会在任何一个方向上超过此值。"
 
-#. i18n: file taskbar.kcfg line 154
-#: rc.cpp:120
+#. i18n: file taskbar.kcfg line 196
+#: rc.cpp:162
 #, no-c-format
 msgid "Use custom colors for taskbar buttons text and background"
 msgstr "为任务栏按钮文本和背景使用自定义颜色"
 
-#. i18n: file taskbar.kcfg line 155
-#: rc.cpp:123
+#. i18n: file taskbar.kcfg line 197
+#: rc.cpp:165
 #, no-c-format
 msgid ""
 "Turning this option on will allow choosing your own colors for taskbar buttons "
 "text and background."
 msgstr "开启此选项将允许您为任务按钮文本和背景选择您自己的颜色。"
 
-#. i18n: file taskbar.kcfg line 158
-#: rc.cpp:126
+#. i18n: file taskbar.kcfg line 200
+#: rc.cpp:168
 #, no-c-format
 msgid "Color to use for active task button text"
 msgstr "活动任务的按钮文本所使用的颜色"
 
-#. i18n: file taskbar.kcfg line 160
-#: rc.cpp:129
+#. i18n: file taskbar.kcfg line 202
+#: rc.cpp:171
 #, no-c-format
 msgid ""
 "This color is used for displaying text on taskbar button for task which is "
 "active at the moment."
 msgstr "此颜色将用于显示活动任务的任务栏按钮上的文本"
 
-#. i18n: file taskbar.kcfg line 163
-#: rc.cpp:132
+#. i18n: file taskbar.kcfg line 205
+#: rc.cpp:174
 #, no-c-format
 msgid "Color to use for inactive tasks button text"
 msgstr "非活动任务的按钮文本所使用的颜色"
 
-#. i18n: file taskbar.kcfg line 165
-#: rc.cpp:135
+#. i18n: file taskbar.kcfg line 207
+#: rc.cpp:177
 #, no-c-format
 msgid ""
 "This color is used for displaying text on taskbar button for tasks other than "
 "active."
 msgstr "此颜色将用于显示非活动任务的任务栏按钮上的文本"
 
-#. i18n: file taskbar.kcfg line 168
-#: rc.cpp:138
+#. i18n: file taskbar.kcfg line 210
+#: rc.cpp:180
 #, no-c-format
 msgid "Color to use for taskbar buttons background"
 msgstr "任务栏按钮背景所使用的颜色"
 
-#. i18n: file taskbar.kcfg line 170
-#: rc.cpp:141
+#. i18n: file taskbar.kcfg line 212
+#: rc.cpp:183
 #, no-c-format
 msgid "This color is used for displaying background of taskbar buttons."
 msgstr "此颜色将用于显示任务栏按钮背景。"
@@ -361,27 +436,49 @@ msgstr "下个任务栏项"
 msgid "Previous Taskbar Entry"
 msgstr "上个任务栏项"
 
-#: taskcontainer.cpp:623 taskcontainer.cpp:1600
+#: taskcontainer.cpp:728 taskcontainer.cpp:1840
 msgid "modified"
 msgstr "已修改"
 
-#: taskcontainer.cpp:1517
+#: taskcontainer.cpp:1281
+msgid "Move to Beginning"
+msgstr ""
+
+#: taskcontainer.cpp:1286
+msgid "Move Left"
+msgstr ""
+
+#: taskcontainer.cpp:1291
+msgid "Move Right"
+msgstr ""
+
+#: taskcontainer.cpp:1296
+msgid "Move to End"
+msgstr ""
+
+#: taskcontainer.cpp:1754
 msgid "Loading application ..."
 msgstr "正在装入应用程序..."
 
-#: taskcontainer.cpp:1581
+#: taskcontainer.cpp:1821
 msgid "On all desktops"
 msgstr "位于全部桌面"
 
-#: taskcontainer.cpp:1586
+#: taskcontainer.cpp:1826
 #, c-format
 msgid "On %1"
 msgstr "位于%1"
 
-#: taskcontainer.cpp:1592
+#: taskcontainer.cpp:1832
 msgid "Requesting attention"
 msgstr "请求注意"
 
-#: taskcontainer.cpp:1598
+#: taskcontainer.cpp:1838
 msgid "Has unsaved changes"
 msgstr "有未保存的更改"
+
+#~ msgid "Show application icons"
+#~ msgstr "显示应用程序图标"
+
+#~ msgid "Select this option if you want window icons to appear along with their titles in the taskbar.\\n\\nBy default this option is selected."
+#~ msgstr "如果您想要在任务栏中同时显示窗口图标及其标题，请选择此选项。\\n\\n默认情况下，此选项是选中的。"
diff --git a/tde-i18n-zh_CN/messages/tdebase/libtaskmanager.po b/tde-i18n-zh_CN/messages/tdebase/libtaskmanager.po
index 7c4231b85a9..a317eecabae 100644
--- a/tde-i18n-zh_CN/messages/tdebase/libtaskmanager.po
+++ b/tde-i18n-zh_CN/messages/tdebase/libtaskmanager.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libtaskmanager\n"
-"POT-Creation-Date: 2007-08-31 01:13+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-06-11 13:57+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@126.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -17,75 +18,79 @@ msgstr ""
 msgid "modified"
 msgstr "已修改"
 
-#: taskrmbmenu.cpp:69
+#: taskrmbmenu.cpp:71
 msgid "Ad&vanced"
 msgstr "高级(&V)"
 
-#: taskrmbmenu.cpp:74
+#: taskrmbmenu.cpp:76
 msgid "To &Desktop"
 msgstr "放到桌面(&D)"
 
-#: taskrmbmenu.cpp:78
+#: taskrmbmenu.cpp:80
 msgid "&To Current Desktop"
 msgstr "放到当前桌面(&T)"
 
-#: taskrmbmenu.cpp:89
+#: taskrmbmenu.cpp:91
 msgid "&Move"
 msgstr "移动(&M)"
 
-#: taskrmbmenu.cpp:92
+#: taskrmbmenu.cpp:94
 msgid "Re&size"
 msgstr "大小(&S)"
 
-#: taskrmbmenu.cpp:95
+#: taskrmbmenu.cpp:97
 msgid "Mi&nimize"
 msgstr "最小化(&N)"
 
-#: taskrmbmenu.cpp:99
+#: taskrmbmenu.cpp:101
 msgid "Ma&ximize"
 msgstr "最大化(&X)"
 
-#: taskrmbmenu.cpp:103
+#: taskrmbmenu.cpp:105
 msgid "&Shade"
 msgstr "卷起(&S)"
 
-#: taskrmbmenu.cpp:136
+#: taskrmbmenu.cpp:113
+msgid "Move Task Button"
+msgstr ""
+
+#: taskrmbmenu.cpp:145
 msgid "All to &Desktop"
 msgstr "全部放到桌面(&D)"
 
-#: taskrmbmenu.cpp:138
+#: taskrmbmenu.cpp:147
 msgid "All &to Current Desktop"
 msgstr "全部放到当前桌面(&T)"
 
-#: taskrmbmenu.cpp:153
+#: taskrmbmenu.cpp:162
 msgid "Mi&nimize All"
 msgstr "全部最小化(&N)"
 
-#: taskrmbmenu.cpp:166
+#: taskrmbmenu.cpp:175
 msgid "Ma&ximize All"
 msgstr "全部最大化(&X)"
 
-#: taskrmbmenu.cpp:179
+#: taskrmbmenu.cpp:188
 msgid "&Restore All"
 msgstr "全部恢复(&R)"
 
-#: taskrmbmenu.cpp:194
+#: taskrmbmenu.cpp:203
 msgid "&Close All"
 msgstr "全部关闭(&C)"
 
-#: taskrmbmenu.cpp:205
+#: taskrmbmenu.cpp:214
 msgid "Keep &Above Others"
 msgstr "常居顶端(&A)"
 
-#: taskrmbmenu.cpp:210
+#: taskrmbmenu.cpp:219
 msgid "Keep &Below Others"
 msgstr "常居底端(&B)"
 
-#: taskrmbmenu.cpp:215
+#: taskrmbmenu.cpp:224
 msgid "&Fullscreen"
 msgstr "全屏(&F)"
 
-#: taskrmbmenu.cpp:232 taskrmbmenu.cpp:253
+#: taskrmbmenu.cpp:241 taskrmbmenu.cpp:262
 msgid "&All Desktops"
 msgstr "全部桌面(&A)"
 
diff --git a/tde-i18n-zh_CN/messages/tdebase/lockout.po b/tde-i18n-zh_CN/messages/tdebase/lockout.po
index 94d7f0fd149..6fff7ba4188 100644
--- a/tde-i18n-zh_CN/messages/tdebase/lockout.po
+++ b/tde-i18n-zh_CN/messages/tdebase/lockout.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lockout\n"
-"POT-Creation-Date: 2008-08-18 01:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-19 01:44+0800\n"
 "Last-Translator: Yan Shuangchun <yahzee@d3eye.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/mediaapplet.po b/tde-i18n-zh_CN/messages/tdebase/mediaapplet.po
index 866767b5914..d2c080026fd 100644
--- a/tde-i18n-zh_CN/messages/tdebase/mediaapplet.po
+++ b/tde-i18n-zh_CN/messages/tdebase/mediaapplet.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mediaapplet\n"
-"POT-Creation-Date: 2008-07-31 01:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/naughtyapplet.po b/tde-i18n-zh_CN/messages/tdebase/naughtyapplet.po
index be1d146c863..fd6ffc01280 100644
--- a/tde-i18n-zh_CN/messages/tdebase/naughtyapplet.po
+++ b/tde-i18n-zh_CN/messages/tdebase/naughtyapplet.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: naughtyapplet\n"
-"POT-Creation-Date: 2008-08-19 01:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2002-09-10 15:09+0800\n"
 "Last-Translator: Li Zongliang <li-zongliang@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/nsplugin.po b/tde-i18n-zh_CN/messages/tdebase/nsplugin.po
index 0d7b5e438b1..665e71608a5 100644
--- a/tde-i18n-zh_CN/messages/tdebase/nsplugin.po
+++ b/tde-i18n-zh_CN/messages/tdebase/nsplugin.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2007-12-22 01:14+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-21 22:22+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,42 +49,42 @@ msgstr "正在为 %1 载入 Netscape 插件"
 msgid "Unable to load Netscape plugin for %1"
 msgstr "无法为 %1 载入 Netscape 插件"
 
-#: pluginscan.cpp:200
+#: pluginscan.cpp:201
 msgid "Netscape plugin mimeinfo"
 msgstr "Netscape 插件 mime 信息"
 
-#: pluginscan.cpp:235
+#: pluginscan.cpp:241
 msgid "Unnamed plugin"
 msgstr "无命名插件"
 
-#: pluginscan.cpp:461 pluginscan.cpp:464
+#: pluginscan.cpp:468 pluginscan.cpp:471
 msgid "Netscape plugin viewer"
 msgstr "Netscape 插件查看器"
 
-#: pluginscan.cpp:514
+#: pluginscan.cpp:521
 msgid "Show progress output for GUI"
 msgstr "显示 GUI 的进度输出"
 
-#: pluginscan.cpp:521
+#: pluginscan.cpp:528
 msgid "nspluginscan"
 msgstr "nspluginscan"
 
-#: viewer/nsplugin.cpp:819
+#: viewer/nsplugin.cpp:818
 #, c-format
 msgid "Submitting data to %1"
 msgstr "正在将数据提交到 %1"
 
-#: viewer/nsplugin.cpp:838
+#: viewer/nsplugin.cpp:837
 #, c-format
 msgid "Requesting %1"
 msgstr "正在请求 %1"
 
-#: viewer/viewer.cpp:280
+#: viewer/viewer.cpp:257
 msgid ""
 "There was an error connecting to the Desktop communications server. Please make "
 "sure that the 'dcopserver' process has been started, and then try again."
 msgstr "连接到桌面通信服务器时发生错误。请确定“dcopserver”进程已经启动，然后重试。"
 
-#: viewer/viewer.cpp:284
+#: viewer/viewer.cpp:261
 msgid "Error Connecting to DCOP Server"
 msgstr "连接到 DCOP 服务器时发生错误"
diff --git a/tde-i18n-zh_CN/messages/tdebase/privacy.po b/tde-i18n-zh_CN/messages/tdebase/privacy.po
index a805d6fa0f4..89172004d77 100644
--- a/tde-i18n-zh_CN/messages/tdebase/privacy.po
+++ b/tde-i18n-zh_CN/messages/tdebase/privacy.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: privacy\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-01-01 17:04+0800\n"
 "Last-Translator: 张忠立 <netwind2003@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -78,8 +79,8 @@ msgid "Saved Clipboard Contents"
 msgstr "已存的剪切板内容"
 
 #: privacy.cpp:100
-msgid "Web History"
-msgstr "Web 历史"
+msgid "Web and File Manager History"
+msgstr ""
 
 #: privacy.cpp:102
 msgid "Web Cache"
@@ -102,75 +103,85 @@ msgid "Favorite Icons"
 msgstr "收藏图标"
 
 #: privacy.cpp:112
+msgid "KPDF Document Data"
+msgstr ""
+
+#: privacy.cpp:114
 msgid ""
 "Check all cleanup actions you would like to perform. These will be executed by "
 "pressing the button below"
 msgstr "确认您将执行所有的清除动作。按下面的按钮开始执行"
 
-#: privacy.cpp:113
+#: privacy.cpp:115
 msgid "Immediately performs the cleanup actions selected above"
 msgstr "立即执行上面选中的清除动作"
 
-#: privacy.cpp:115
+#: privacy.cpp:117
 msgid "Clears all cached thumbnails"
 msgstr "清楚缓存的全部缩略图"
 
-#: privacy.cpp:116
+#: privacy.cpp:118
 msgid ""
 "Clears the history of commands run through the Run Command tool on the desktop"
 msgstr "清除通过桌面的运行命令工具运行的命令记录"
 
-#: privacy.cpp:117
+#: privacy.cpp:119
 msgid "Clears all stored cookies set by websites"
 msgstr "清除所有网站存储的 cookies"
 
-#: privacy.cpp:118
-msgid "Clears the history of visited websites"
+#: privacy.cpp:120
+#, fuzzy
+msgid "Clears the history of visited websites and file manager URLs"
 msgstr "清除已访问网站的历史记录"
 
-#: privacy.cpp:119
+#: privacy.cpp:121
 msgid "Clears the clipboard contents stored by Klipper"
 msgstr "清除 Klipper 存储的剪切板内容"
 
-#: privacy.cpp:120
+#: privacy.cpp:122
 msgid "Clears the temporary cache of websites visited"
 msgstr "清除已访问网站的缓存"
 
-#: privacy.cpp:121
+#: privacy.cpp:123
 msgid "Clears values which were entered into forms on websites"
 msgstr "清除网站表单上已输入的值"
 
-#: privacy.cpp:122
+#: privacy.cpp:124
 msgid ""
 "Clears the list of recently used documents from the TDE applications menu"
 msgstr "从 TDE 应用程序菜单中清除最近使用文档的列表"
 
-#: privacy.cpp:123
+#: privacy.cpp:125
 msgid "Clears the entries from the list of recently started applications"
 msgstr "清除最近启动的应用程序列表"
 
-#: privacy.cpp:124
+#: privacy.cpp:126
 msgid "Clears the FavIcons cached from visited websites"
 msgstr "清除已访问网站的个人图标缓存"
 
-#: privacy.cpp:251
+#: privacy.cpp:127
+#, fuzzy
+msgid "Clears all KPDF document data files"
+msgstr "清楚缓存的全部缩略图"
+
+#: privacy.cpp:257
 msgid ""
 "You are deleting data that is potentially valuable to you. Are you sure?"
 msgstr "您正在删除对您有用的数据。您确定吗？"
 
-#: privacy.cpp:254
+#: privacy.cpp:260
 msgid "Starting cleanup..."
 msgstr "开始清除..."
 
-#: privacy.cpp:263
+#: privacy.cpp:269
 msgid "Clearing %1..."
 msgstr "正在清除%1..."
 
-#: privacy.cpp:298
+#: privacy.cpp:307
 msgid "Clearing of %1 failed"
 msgstr "清除%1失败"
 
-#: privacy.cpp:305
+#: privacy.cpp:314
 msgid "Clean up finished."
 msgstr "整理完成。"
 
@@ -345,3 +356,6 @@ msgstr "通过电子邮件"
 #, no-c-format
 msgid "And do not allow me to remove my contact information"
 msgstr "并且不允许我移除我的联系信息"
+
+#~ msgid "Web History"
+#~ msgstr "Web 历史"
diff --git a/tde-i18n-zh_CN/messages/tdebase/quicklauncher.po b/tde-i18n-zh_CN/messages/tdebase/quicklauncher.po
index 5ce08f9dc7e..62691ece655 100644
--- a/tde-i18n-zh_CN/messages/tdebase/quicklauncher.po
+++ b/tde-i18n-zh_CN/messages/tdebase/quicklauncher.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2008-07-31 01:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-08-01 07:43+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,11 +31,19 @@ msgstr "i18n-translation@lists.linux.net.cn"
 msgid "Automatic"
 msgstr "自动"
 
-#: quickbutton.cpp:148 quicklauncher.cpp:165 quicklauncher.cpp:169
+#: quickbutton.cpp:63 quickbutton.cpp:64
+msgid "Show Desktop"
+msgstr ""
+
+#: quickbutton.cpp:171 quicklauncher.cpp:165 quicklauncher.cpp:169
 msgid "Add Application"
 msgstr "添加应用程序"
 
-#: quickbutton.cpp:154
+#: quickbutton.cpp:174 quicklauncher.cpp:175
+msgid "Remove Application"
+msgstr "删除应用程序"
+
+#: quickbutton.cpp:177
 msgid "Never Remove Automatically"
 msgstr "从不自动删除"
 
@@ -42,19 +51,15 @@ msgstr "从不自动删除"
 msgid "Configure Quicklauncher..."
 msgstr "配置快速启动..."
 
-#: quicklauncher.cpp:175
-msgid "Remove Application"
-msgstr "删除应用程序"
-
 #: quicklauncher.cpp:198
 msgid "Unknown"
 msgstr "未知"
 
-#: quicklauncher.cpp:495
+#: quicklauncher.cpp:499
 msgid "Quick Launcher"
 msgstr "快速启动"
 
-#: quicklauncher.cpp:496
+#: quicklauncher.cpp:500
 msgid "A simple application launcher"
 msgstr "简单的程序启动器"
 
@@ -67,179 +72,191 @@ msgstr "允许拖放"
 #. i18n: file configdlgbase.ui line 35
 #: rc.cpp:6
 #, no-c-format
+msgid "Enable 'Show Desktop' button"
+msgstr ""
+
+#. i18n: file configdlgbase.ui line 43
+#: rc.cpp:9
+#, no-c-format
 msgid "Layout"
 msgstr "布局"
 
-#. i18n: file configdlgbase.ui line 46
-#: rc.cpp:9
+#. i18n: file configdlgbase.ui line 54
+#: rc.cpp:12
 #, no-c-format
 msgid "Conserve space"
 msgstr "留存空间"
 
-#. i18n: file configdlgbase.ui line 49
-#: rc.cpp:12
+#. i18n: file configdlgbase.ui line 57
+#: rc.cpp:15
 #, no-c-format
 msgid "Do not expand icons to the size of the panel"
 msgstr "不将图标展开为面板大小"
 
-#. i18n: file configdlgbase.ui line 57
-#: rc.cpp:15
+#. i18n: file configdlgbase.ui line 65
+#: rc.cpp:18
 #, no-c-format
 msgid "Icon size:"
 msgstr "图标大小："
 
-#. i18n: file configdlgbase.ui line 92
-#: rc.cpp:18
+#. i18n: file configdlgbase.ui line 100
+#: rc.cpp:21
 #, no-c-format
 msgid "Most Popular Applications"
 msgstr "最流行的应用程序"
 
-#. i18n: file configdlgbase.ui line 145
-#: rc.cpp:21
+#. i18n: file configdlgbase.ui line 153
+#: rc.cpp:24
 #, no-c-format
 msgid "Short Term"
 msgstr "短期"
 
-#. i18n: file configdlgbase.ui line 156
-#: rc.cpp:24
+#. i18n: file configdlgbase.ui line 164
+#: rc.cpp:27
 #, no-c-format
 msgid "Long Term"
 msgstr "长期"
 
-#. i18n: file configdlgbase.ui line 169
-#: rc.cpp:27
+#. i18n: file configdlgbase.ui line 177
+#: rc.cpp:30
 #, no-c-format
 msgid "Maximum number of applications:"
 msgstr "应用程序的最大数量："
 
-#. i18n: file configdlgbase.ui line 204
-#: rc.cpp:30
+#. i18n: file configdlgbase.ui line 212
+#: rc.cpp:33
 #, no-c-format
 msgid "Minimum number of applications:"
 msgstr "应用程序的最小数量："
 
-#. i18n: file configdlgbase.ui line 212
-#: rc.cpp:33
+#. i18n: file configdlgbase.ui line 220
+#: rc.cpp:36
 #, no-c-format
 msgid "Add/remove applications based on their popularity"
 msgstr "根据应用程序的流行性添加/删除"
 
 #. i18n: file launcherapplet.kcfg line 9
-#: rc.cpp:36
+#: rc.cpp:39
 #, no-c-format
 msgid "Conserve Space"
 msgstr "留存空间"
 
 #. i18n: file launcherapplet.kcfg line 13
-#: rc.cpp:39
+#: rc.cpp:42
 #, no-c-format
 msgid "Drag Enabled"
 msgstr "启用拖曳"
 
 #. i18n: file launcherapplet.kcfg line 17
-#: rc.cpp:42
+#: rc.cpp:45
+#, no-c-format
+msgid "Show Desktop Button Enabled"
+msgstr ""
+
+#. i18n: file launcherapplet.kcfg line 21
+#: rc.cpp:48
 #, no-c-format
 msgid "Icon Size"
 msgstr "图标大小"
 
-#. i18n: file launcherapplet.kcfg line 21
-#: rc.cpp:45
+#. i18n: file launcherapplet.kcfg line 25
+#: rc.cpp:51
 #, no-c-format
 msgid "Offered Icon Sizes"
 msgstr "提供的图标大小"
 
-#. i18n: file launcherapplet.kcfg line 25
-#: rc.cpp:48
+#. i18n: file launcherapplet.kcfg line 29
+#: rc.cpp:54
 #, no-c-format
 msgid "Buttons"
 msgstr "按钮"
 
-#. i18n: file launcherapplet.kcfg line 29
-#: rc.cpp:51
+#. i18n: file launcherapplet.kcfg line 33
+#: rc.cpp:57
 #, no-c-format
 msgid "Volatile Buttons"
 msgstr "易变按钮"
 
-#. i18n: file launcherapplet.kcfg line 30
-#: rc.cpp:54
+#. i18n: file launcherapplet.kcfg line 34
+#: rc.cpp:60
 #, no-c-format
 msgid "Buttons that can be removed dynamically if they become unpopular"
 msgstr "应用程序不再流行时按钮将被删除"
 
-#. i18n: file launcherapplet.kcfg line 34
-#: rc.cpp:57
+#. i18n: file launcherapplet.kcfg line 38
+#: rc.cpp:63
 #, no-c-format
 msgid "Show frame for volatile buttons"
 msgstr "显示易变按钮的框架"
 
-#. i18n: file launcherapplet.kcfg line 38
-#: rc.cpp:60
+#. i18n: file launcherapplet.kcfg line 42
+#: rc.cpp:66
 #, no-c-format
 msgid "Auto Adjust Enabled"
 msgstr "自动调整已启用"
 
-#. i18n: file launcherapplet.kcfg line 42
-#: rc.cpp:63
+#. i18n: file launcherapplet.kcfg line 46
+#: rc.cpp:69
 #, no-c-format
 msgid "Minimum Number of Items"
 msgstr "最少项数"
 
-#. i18n: file launcherapplet.kcfg line 47
-#: rc.cpp:66
+#. i18n: file launcherapplet.kcfg line 51
+#: rc.cpp:72
 #, no-c-format
 msgid "Maximum Number of Items"
 msgstr "最多项数"
 
-#. i18n: file launcherapplet.kcfg line 52
-#: rc.cpp:69
+#. i18n: file launcherapplet.kcfg line 56
+#: rc.cpp:75
 #, no-c-format
 msgid "History Weight"
 msgstr "历史权重"
 
-#. i18n: file launcherapplet.kcfg line 60
-#: rc.cpp:72
+#. i18n: file launcherapplet.kcfg line 64
+#: rc.cpp:78
 #, no-c-format
 msgid "Service Cache Size"
 msgstr "服务缓存大小"
 
-#. i18n: file launcherapplet.kcfg line 61
-#: rc.cpp:75
+#. i18n: file launcherapplet.kcfg line 65
+#: rc.cpp:81
 #, no-c-format
 msgid "Number of services to remember"
 msgstr "要记住的服务数"
 
-#. i18n: file launcherapplet.kcfg line 65
-#: rc.cpp:78
+#. i18n: file launcherapplet.kcfg line 69
+#: rc.cpp:84
 #, no-c-format
 msgid "Service Names"
 msgstr "服务名称"
 
-#. i18n: file launcherapplet.kcfg line 66
-#: rc.cpp:81
+#. i18n: file launcherapplet.kcfg line 70
+#: rc.cpp:87
 #, no-c-format
 msgid "Name of known services"
 msgstr "已知服务名称"
 
-#. i18n: file launcherapplet.kcfg line 69
-#: rc.cpp:84
+#. i18n: file launcherapplet.kcfg line 73
+#: rc.cpp:90
 #, no-c-format
 msgid "Service Insertion Positions"
 msgstr "服务插入位置"
 
-#. i18n: file launcherapplet.kcfg line 70
-#: rc.cpp:87
+#. i18n: file launcherapplet.kcfg line 74
+#: rc.cpp:93
 #, no-c-format
 msgid "Position where services are inserted when they regain popularity"
 msgstr "服务重新流行时插入服务的位置"
 
-#. i18n: file launcherapplet.kcfg line 73
-#: rc.cpp:90
+#. i18n: file launcherapplet.kcfg line 77
+#: rc.cpp:96
 #, no-c-format
 msgid "Service History Data"
 msgstr "服务历史数据"
 
-#. i18n: file launcherapplet.kcfg line 74
-#: rc.cpp:93
+#. i18n: file launcherapplet.kcfg line 78
+#: rc.cpp:99
 #, no-c-format
 msgid "History Data used to determine the popularity of a service"
 msgstr "用于确定服务流行程度的历史数据"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdedebugdialog.po b/tde-i18n-zh_CN/messages/tdebase/tdedebugdialog.po
index 159fd3b0a4f..370340b796e 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdedebugdialog.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdedebugdialog.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdedebugdialog\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2002-10-10 10:30+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,6 +27,26 @@ msgid ""
 "Your emails"
 msgstr "lark@linux.net.cn"
 
+#: main.cpp:72
+msgid "Show the fully-fledged dialog instead of the default list dialog"
+msgstr "显示完整的对话框，而不是默认的列表对话框"
+
+#: main.cpp:80
+msgid "TDEDebugDialog"
+msgstr "TDEDebugDialog"
+
+#: main.cpp:81
+msgid "A dialog box for setting preferences for debug output"
+msgstr "用来设置调试输出首选项的对话框"
+
+#: main.cpp:83
+msgid "Maintainer"
+msgstr "维护者"
+
+#: main.cpp:84
+msgid "Original maintainer/developer"
+msgstr ""
+
 #: tdedebugdialog.cpp:46 tdelistdebugdialog.cpp:37
 msgid "Debug Settings"
 msgstr "调试设置"
@@ -75,19 +96,3 @@ msgstr "全选(&S)"
 #: tdelistdebugdialog.cpp:57
 msgid "&Deselect All"
 msgstr "全不选(&D)"
-
-#: main.cpp:72
-msgid "Show the fully-fledged dialog instead of the default list dialog"
-msgstr "显示完整的对话框，而不是默认的列表对话框"
-
-#: main.cpp:80
-msgid "TDEDebugDialog"
-msgstr "TDEDebugDialog"
-
-#: main.cpp:81
-msgid "A dialog box for setting preferences for debug output"
-msgstr "用来设置调试输出首选项的对话框"
-
-#: main.cpp:83
-msgid "Maintainer"
-msgstr "维护者"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdefontinst.po b/tde-i18n-zh_CN/messages/tdebase/tdefontinst.po
index 7ac4dc29ae6..d822166f305 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdefontinst.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdefontinst.po
@@ -5,19 +5,20 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefontinst\n"
-"POT-Creation-Date: 2008-06-16 02:37+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-12-21 12:13+0800\n"
 "Last-Translator: 张忠立 <netwind2003@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kcmfontinst/KCmFontInst.cpp:87
+#: kcmfontinst/KCmFontInst.cpp:88
 msgid "TDE Font Installer"
 msgstr "TDE 字体安装程序"
 
-#: kcmfontinst/KCmFontInst.cpp:90
+#: kcmfontinst/KCmFontInst.cpp:91
 msgid ""
 "GUI front end to the fonts:/ ioslave.\n"
 "(c) Craig Drummond, 2000 - 2004"
@@ -25,34 +26,34 @@ msgstr ""
 "fonts:/ ioslave 的图形前端。\n"
 "(C) Craig Drummond, 2000 - 2004"
 
-#: kcmfontinst/KCmFontInst.cpp:92
+#: kcmfontinst/KCmFontInst.cpp:93
 msgid "Developer and maintainer"
 msgstr "开发者和维护者"
 
-#: kcmfontinst/KCmFontInst.cpp:157 kcmfontinst/KCmFontInst.cpp:220
+#: kcmfontinst/KCmFontInst.cpp:158 kcmfontinst/KCmFontInst.cpp:221
 msgid "Add Fonts..."
 msgstr "添加字体..."
 
-#: kcmfontinst/KCmFontInst.cpp:172
+#: kcmfontinst/KCmFontInst.cpp:173
 msgid ""
 "<b>The fonts shown are your personal fonts.</b>"
 "<br>To see (and install) system-wide fonts, click on the \"Administrator Mode\" "
 "button below."
 msgstr "<b>显示的是您个人的字体。</b><br>要查看并安装系统级的字体，请单击下面的“管理员模式”按钮。"
 
-#: kcmfontinst/KCmFontInst.cpp:213
+#: kcmfontinst/KCmFontInst.cpp:214
 msgid "Show Bitmap Fonts"
 msgstr "显示位图字体"
 
-#: kcmfontinst/KCmFontInst.cpp:234
+#: kcmfontinst/KCmFontInst.cpp:235
 msgid "Configure..."
 msgstr "配置..."
 
-#: kcmfontinst/KCmFontInst.cpp:238
+#: kcmfontinst/KCmFontInst.cpp:239
 msgid "Print..."
 msgstr "打印..."
 
-#: kcmfontinst/KCmFontInst.cpp:317
+#: kcmfontinst/KCmFontInst.cpp:318
 msgid ""
 "<h1>Font Installer</h1>"
 "<p> This module allows you to install TrueType, Type1, and Bitmap fonts.</p>"
@@ -65,7 +66,7 @@ msgstr ""
 "<p>您也可以用 Konqueror 来安装字体：在地址栏键入 fonts:/ "
 "将会显示您已经安装的字体。要安装字体，只需要简单的把它复制到合适的文件夹里就可以了。"
 
-#: kcmfontinst/KCmFontInst.cpp:324
+#: kcmfontinst/KCmFontInst.cpp:325
 msgid ""
 "<h1>Font Installer</h1>"
 "<p> This module allows you to install TrueType, Type1, and Bitmap fonts.</p>"
@@ -85,19 +86,19 @@ msgstr ""
 "<p><b>注意：</b>由于您不是以“root”身份登录的，所安装的任何字体都只能由您自己使用。要在整个系统中安装字体，请使用“管理员模式”按钮以“root”"
 "身份重新运行此模块。</p>"
 
-#: kcmfontinst/KCmFontInst.cpp:421
+#: kcmfontinst/KCmFontInst.cpp:422
 msgid "Add Fonts"
 msgstr "添加字体"
 
-#: kcmfontinst/KCmFontInst.cpp:430
+#: kcmfontinst/KCmFontInst.cpp:431
 msgid "You did not select anything to delete."
 msgstr "您没有选择要删除的内容。"
 
-#: kcmfontinst/KCmFontInst.cpp:430
+#: kcmfontinst/KCmFontInst.cpp:431
 msgid "Nothing to Delete"
 msgstr "没有可删除的"
 
-#: kcmfontinst/KCmFontInst.cpp:454
+#: kcmfontinst/KCmFontInst.cpp:455
 msgid ""
 "<qt>Do you really want to delete\n"
 " <b>'%1'</b>?</qt>"
@@ -105,22 +106,22 @@ msgstr ""
 "<qt>您真的想删除\n"
 "<b>“%1”</b>吗?</qt>"
 
-#: kcmfontinst/KCmFontInst.cpp:455
+#: kcmfontinst/KCmFontInst.cpp:456
 msgid "Delete Font"
 msgstr "删除字体"
 
-#: kcmfontinst/KCmFontInst.cpp:459
+#: kcmfontinst/KCmFontInst.cpp:460
 #, c-format
 msgid ""
 "_n: Do you really want to delete this font?\n"
 "Do you really want to delete these %n fonts?"
 msgstr "您真的想删除这 %n 款字体吗？"
 
-#: kcmfontinst/KCmFontInst.cpp:461
+#: kcmfontinst/KCmFontInst.cpp:462
 msgid "Delete Fonts"
 msgstr "删除字体"
 
-#: kcmfontinst/KCmFontInst.cpp:535
+#: kcmfontinst/KCmFontInst.cpp:536
 msgid ""
 "There are no printable fonts.\n"
 "You can only print non-bitmap fonts."
@@ -128,29 +129,29 @@ msgstr ""
 "没有可打印的字体。\n"
 "您只能打印非位图字体。"
 
-#: kcmfontinst/KCmFontInst.cpp:536
+#: kcmfontinst/KCmFontInst.cpp:537
 msgid "Cannot Print"
 msgstr "无法打印"
 
-#: kcmfontinst/KCmFontInst.cpp:561
+#: kcmfontinst/KCmFontInst.cpp:562
 #, c-format
 msgid ""
 "_n: One Font\n"
 "%n Fonts"
 msgstr "%n 款字体"
 
-#: kcmfontinst/KCmFontInst.cpp:581
+#: kcmfontinst/KCmFontInst.cpp:582
 msgid "(%1 Total)"
 msgstr "(%1 全部)"
 
-#: kcmfontinst/KCmFontInst.cpp:584
+#: kcmfontinst/KCmFontInst.cpp:585
 #, c-format
 msgid ""
 "_n: One Family\n"
 "%n Families"
 msgstr "%n 个字体族"
 
-#: kcmfontinst/KCmFontInst.cpp:611
+#: kcmfontinst/KCmFontInst.cpp:612
 msgid ""
 "<p>Please note that any open applications will need to be restarted in order "
 "for any changes to be noticed."
@@ -162,13 +163,13 @@ msgstr ""
 "<p>"
 "<p>(您还需要重新启动次应用程序，以便使用新安装的字体打印。)</p>"
 
-#: kcmfontinst/KCmFontInst.cpp:615
+#: kcmfontinst/KCmFontInst.cpp:616
 msgid ""
 "Please note that any open applications will need to be restarted in order for "
 "any changes to be noticed."
 msgstr "请注意，要让任何更改生效，您必须重新启动已打开的任何应用程序。"
 
-#: kcmfontinst/KCmFontInst.cpp:618 viewpart/FontViewPart.cpp:244
+#: kcmfontinst/KCmFontInst.cpp:619 viewpart/FontViewPart.cpp:244
 msgid "Success"
 msgstr "成功"
 
@@ -297,6 +298,44 @@ msgstr "更新"
 msgid "Do Not Update"
 msgstr "不更新"
 
+#: lib/FcEngine.cpp:522
+msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz0123456789"
+msgstr "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz0123456789"
+
+#: lib/FcEngine.cpp:576
+msgid "ERROR: Could not determine font's name."
+msgstr "错误：无法确定字体的名称。"
+
+#: lib/FcEngine.cpp:580
+msgid ""
+"_n: %1 [1 pixel]\n"
+"%1 [%n pixels]"
+msgstr "%1 [%n 像素]"
+
+#: lib/FcEngine.cpp:697
+msgid ""
+"_: A sentence that uses all of the letters of the alphabet\n"
+"The quick brown fox jumps over the lazy dog"
+msgstr "明日复明日·万事成蹉跎"
+
+#: lib/FcEngine.cpp:711
+msgid ""
+"_: All of the letters of the alphabet, uppercase\n"
+"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+msgstr "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+
+#: lib/FcEngine.cpp:716
+msgid ""
+"_: All of the letters of the alphabet, lowercase\n"
+"abcdefghijklmnopqrstuvwxyz"
+msgstr "abcdefghijklmnopqrstuvwxyz"
+
+#: lib/FcEngine.cpp:721
+msgid ""
+"_: Numbers and characters\n"
+"0123456789.:,;(*!?'/\\\")£$€%^&-+@~#<>{}[]"
+msgstr "0123456789.:,;(*!?'/\\\")$%^&-+@~#<>{}[]"
+
 #: tdefile-plugin/KFileFont.cpp:287
 msgid "General"
 msgstr "常规"
@@ -413,44 +452,6 @@ msgid ""
 "Sorry, you cannot rename, move, copy, or delete either \"%1\" or \"%2\"."
 msgstr "抱歉，您无法重命名、移动、复制或删除“%1”或“%2”。"
 
-#: lib/FcEngine.cpp:522
-msgid "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz0123456789"
-msgstr "AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz0123456789"
-
-#: lib/FcEngine.cpp:576
-msgid "ERROR: Could not determine font's name."
-msgstr "错误：无法确定字体的名称。"
-
-#: lib/FcEngine.cpp:580
-msgid ""
-"_n: %1 [1 pixel]\n"
-"%1 [%n pixels]"
-msgstr "%1 [%n 像素]"
-
-#: lib/FcEngine.cpp:697
-msgid ""
-"_: A sentence that uses all of the letters of the alphabet\n"
-"The quick brown fox jumps over the lazy dog"
-msgstr "明日复明日·万事成蹉跎"
-
-#: lib/FcEngine.cpp:711
-msgid ""
-"_: All of the letters of the alphabet, uppercase\n"
-"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-msgstr "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-
-#: lib/FcEngine.cpp:716
-msgid ""
-"_: All of the letters of the alphabet, lowercase\n"
-"abcdefghijklmnopqrstuvwxyz"
-msgstr "abcdefghijklmnopqrstuvwxyz"
-
-#: lib/FcEngine.cpp:721
-msgid ""
-"_: Numbers and characters\n"
-"0123456789.:,;(*!?'/\\\")£$€%^&-+@~#<>{}[]"
-msgstr "0123456789.:,;(*!?'/\\\")$%^&-+@~#<>{}[]"
-
 #: viewpart/FontPreview.cpp:92
 msgid " No preview available"
 msgstr "没有预览"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdehtmlkttsd.po b/tde-i18n-zh_CN/messages/tdebase/tdehtmlkttsd.po
index 0b153e016f1..18c95f04a32 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdehtmlkttsd.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdehtmlkttsd.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdehtmlkttsd\n"
-"POT-Creation-Date: 2006-01-04 03:13+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-02-12 17:15+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_finger.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_finger.po
index 14d03bc763f..6b48270ac95 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_finger.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_finger.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_finger\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2001-06-03 17:36GMT\n"
 "Last-Translator: Mai Hao Hui <mhh@126.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_fish.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_fish.po
index 983889065cf..3065c31ef2b 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_fish.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_fish.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_fish\n"
-"POT-Creation-Date: 2006-11-05 02:34+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-07-11 23:17+0800\n"
 "Last-Translator: Sun Fang <sun_xp@msn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_floppy.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_floppy.po
index 8beed8c3d41..c75bc04feb7 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_floppy.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_floppy.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_floppy\n"
-"POT-Creation-Date: 2005-09-21 02:57+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-24 11:03+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_home.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_home.po
index d390da8053b..d75ed7225d6 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_home.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_home.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_home\n"
-"POT-Creation-Date: 2006-04-28 03:54+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-08-01 06:56+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_ldap.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_ldap.po
index 0929f4882e0..26c39e48ae6 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_ldap.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_ldap.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_ldap\n"
-"POT-Creation-Date: 2007-11-01 01:14+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-05-03 13:29+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_mac.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_mac.po
index bd633917118..f4835a65a21 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_mac.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_mac.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_mac\n"
-"POT-Creation-Date: 2005-09-21 02:57+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-09-24 23:28+0800\n"
 "Last-Translator: Funda Wang <fundawang@en2china.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_man.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_man.po
index e18cc3497c5..b4803a1d5cf 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_man.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_man.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_man\n"
-"POT-Creation-Date: 2007-05-29 02:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-01-05 00:21+0800\n"
 "Last-Translator: Li Zongliang <li-zongliang@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,7 +29,11 @@ msgid ""
 "Your emails"
 msgstr "li-zongliang@21cn.com"
 
-#: tdeio_man.cpp:465
+#: kmanpart.cpp:65
+msgid "KMan"
+msgstr "KMan"
+
+#: tdeio_man.cpp:471
 msgid ""
 "No man page matching to %1 found."
 "<br>"
@@ -44,104 +49,100 @@ msgstr ""
 "您还应该注意是否正确输入了字母的大小写。"
 "<br>如果所有内容都输入正确了的话，那么您可能需要设定手册页的正确搜索路径，此时应查看一下环境变量 MANPATH 或 /etc 目录中的文件。"
 
-#: tdeio_man.cpp:496
+#: tdeio_man.cpp:508
 msgid "Open of %1 failed."
 msgstr "打开 %1 失败。"
 
-#: tdeio_man.cpp:600 tdeio_man.cpp:618
+#: tdeio_man.cpp:649 tdeio_man.cpp:667
 msgid "Man output"
 msgstr "Man 输出"
 
-#: tdeio_man.cpp:604
+#: tdeio_man.cpp:653
 msgid "<body><h1>TDE Man Viewer Error</h1>"
 msgstr "<body><h1>TDE 手册查看器错误</h1>"
 
-#: tdeio_man.cpp:622
+#: tdeio_man.cpp:671
 msgid "There is more than one matching man page."
 msgstr "有多个匹配的手册页。"
 
-#: tdeio_man.cpp:633
+#: tdeio_man.cpp:682
 msgid ""
 "Note: if you read a man page in your language, be aware it can contain some "
 "mistakes or be obsolete. In case of doubt, you should have a look at the "
 "English version."
 msgstr "请注意：如果您正在阅读非英语的手册页，那么该手册页很可能包含错误或已过时。如果您怀有疑问的话，请以英文版本为准。"
 
-#: tdeio_man.cpp:723
+#: tdeio_man.cpp:772
 msgid "User Commands"
 msgstr "用户命令"
 
-#: tdeio_man.cpp:725
+#: tdeio_man.cpp:774
 msgid "System Calls"
 msgstr "系统调用"
 
-#: tdeio_man.cpp:727
+#: tdeio_man.cpp:776
 msgid "Subroutines"
 msgstr "子例程"
 
-#: tdeio_man.cpp:729
+#: tdeio_man.cpp:778
 msgid "Perl Modules"
 msgstr "Perl 模块"
 
-#: tdeio_man.cpp:731
+#: tdeio_man.cpp:780
 msgid "Network Functions"
 msgstr "网络函数"
 
-#: tdeio_man.cpp:733
+#: tdeio_man.cpp:782
 msgid "Devices"
 msgstr "设备"
 
-#: tdeio_man.cpp:735
+#: tdeio_man.cpp:784
 msgid "File Formats"
 msgstr "文件格式"
 
-#: tdeio_man.cpp:737
+#: tdeio_man.cpp:786
 msgid "Games"
 msgstr "游戏"
 
-#: tdeio_man.cpp:741
+#: tdeio_man.cpp:790
 msgid "System Administration"
 msgstr "系统管理"
 
-#: tdeio_man.cpp:743
+#: tdeio_man.cpp:792
 msgid "Kernel"
 msgstr "内核"
 
-#: tdeio_man.cpp:745
+#: tdeio_man.cpp:794
 msgid "Local Documentation"
 msgstr "本地文档"
 
-#: tdeio_man.cpp:747
+#: tdeio_man.cpp:796
 msgid "New"
 msgstr "新增部分"
 
-#: tdeio_man.cpp:782 tdeio_man.cpp:786 tdeio_man.cpp:1209
+#: tdeio_man.cpp:831 tdeio_man.cpp:835 tdeio_man.cpp:1258
 msgid "UNIX Manual Index"
 msgstr "UNIX 手册索引"
 
-#: tdeio_man.cpp:801
+#: tdeio_man.cpp:850
 msgid "Section "
 msgstr "节"
 
-#: tdeio_man.cpp:1214
+#: tdeio_man.cpp:1263
 msgid "Index for Section %1: %2"
 msgstr "章节索引 %1：%2"
 
-#: tdeio_man.cpp:1219
+#: tdeio_man.cpp:1268
 msgid "Generating Index"
 msgstr "生成索引"
 
-#: tdeio_man.cpp:1529
+#: tdeio_man.cpp:1584
 msgid ""
 "Could not find the sgml2roff program on your system. Please install it, if "
 "necessary, and extend the search path by adjusting the environment variable "
 "PATH before starting TDE."
 msgstr "在您的系统中未找到 sgml2roff 程序。请安装它，并且必要的话在启动 TDE 前调整 PATH 环境变量，扩展搜索路径。"
 
-#: kmanpart.cpp:65
-msgid "KMan"
-msgstr "KMan"
-
 #~ msgid "No man page matching to %1 found. You can extend the search path by setting the environment variable MANPATH before starting TDE."
 #~ msgstr "没有找到与 %1 匹配的手册页。你可能在启动 TDE 前设置环境变量 MANPATH 来扩充搜索路径。"
 
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po
index ac206d17d40..9355b70b693 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_media.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_media\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,60 +25,73 @@ msgid ""
 "Your emails"
 msgstr "fundawang@linux.net.cn"
 
-#: tdeio_media.cpp:35
-msgid "Protocol name"
-msgstr "协议名称"
-
-#: tdeio_media.cpp:36 tdeio_media.cpp:37
-msgid "Socket name"
-msgstr "套接字名称"
-
-#: mediaimpl.cpp:86 mediaimpl.cpp:113 mediaimpl.cpp:139 mediaimpl.cpp:173
-#: mediaimpl.cpp:193 mediaimpl.cpp:214
-#: mounthelper/tdeio_media_mounthelper.cpp:45
+#: mediaimpl.cpp:88 mediaimpl.cpp:115 mediaimpl.cpp:141 mediaimpl.cpp:177
+#: mediaimpl.cpp:197 mediaimpl.cpp:218
+#: mounthelper/tdeio_media_mounthelper.cpp:48
+#: mounthelper/tdeio_media_mounthelper.cpp:252
 msgid "The TDE mediamanager is not running."
 msgstr "TDE 介质管理器未运行。"
 
-#: mediaimpl.cpp:183
+#: mediaimpl.cpp:187
 msgid "This media name already exists."
 msgstr "此介质名称已存在。"
 
-#: mediaimpl.cpp:226
+#: mediaimpl.cpp:230 mediaimpl.cpp:293
 msgid "No such medium."
 msgstr "没有此类媒体。"
 
-#: mediaimpl.cpp:259 mediamanager/halbackend.cpp:972
-#: mediamanager/halbackend.cpp:981 mediamanager/halbackend.cpp:1285
-#: mediamanager/halbackend.cpp:1296 mounthelper/tdeio_media_mounthelper.cpp:53
+#: mediaimpl.cpp:238
+msgid "The drive is encrypted."
+msgstr ""
+
+#: mediaimpl.cpp:272 mediamanager/halbackend.cpp:1260
+#: mediamanager/halbackend.cpp:1269 mediamanager/halbackend.cpp:1659
+#: mediamanager/halbackend.cpp:1676 mediamanager/halbackend.cpp:1687
+#: mediamanager/halbackend.cpp:1789 mediamanager/halbackend.cpp:1797
+#: mediamanager/halbackend.cpp:1804 mediamanager/halbackend.cpp:1844
+#: mediamanager/halbackend.cpp:1850 mediamanager/halbackend.cpp:1857
+#: mounthelper/tdeio_media_mounthelper.cpp:56
 msgid "Internal Error"
 msgstr "内部错误"
 
-#. i18n: file propsdlgplugin/propertiespagegui.ui line 35
+#. i18n: file propsdlgplugin/propertiespagegui.ui line 16
 #: rc.cpp:3
 #, no-c-format
+msgid "PropertiesPageGUI"
+msgstr ""
+
+#. i18n: file propsdlgplugin/propertiespagegui.ui line 27
+#: rc.cpp:6
+#, fuzzy, no-c-format
+msgid "Use default mount options"
+msgstr "通用挂载选项"
+
+#. i18n: file propsdlgplugin/propertiespagegui.ui line 35
+#: rc.cpp:9
+#, no-c-format
 msgid "Generic Mount Options"
 msgstr "通用挂载选项"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 54
-#: rc.cpp:6
+#: rc.cpp:12
 #, no-c-format
 msgid "Read only"
 msgstr "只读"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 57
-#: rc.cpp:9
+#: rc.cpp:15
 #, no-c-format
 msgid "Mount the file system read-only."
 msgstr "以只读方式挂载文件系统。"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 65
-#: rc.cpp:12
+#: rc.cpp:18
 #, no-c-format
 msgid "Quiet"
 msgstr "安静"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 68
-#: rc.cpp:15
+#: rc.cpp:21
 #, no-c-format
 msgid ""
 "Attempts to chown or chmod files do not return errors, although they fail. Use "
@@ -85,37 +99,37 @@ msgid ""
 msgstr "即使对 chown 或chmod 文件的尝试失败，也不会返回错误。请谨慎使用！"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 76
-#: rc.cpp:18
+#: rc.cpp:24
 #, no-c-format
 msgid "Synchronous"
 msgstr "同步"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 79
-#: rc.cpp:21
+#: rc.cpp:27
 #, no-c-format
 msgid "All I/O to the file system should be done synchronously."
 msgstr "所有针对文件系统的 I/O 操作应同步执行。"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 87
-#: rc.cpp:24
+#: rc.cpp:30
 #, no-c-format
 msgid "Access time updates"
 msgstr "访问时间更新"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 90
-#: rc.cpp:27
+#: rc.cpp:33
 #, no-c-format
 msgid "Update inode access time for each access."
 msgstr "更新每次 inode 访问的时间。"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 106
-#: rc.cpp:30
+#: rc.cpp:36
 #, no-c-format
 msgid "Mountpoint:"
 msgstr "挂载点："
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 112
-#: rc.cpp:33
+#: rc.cpp:39
 #, no-c-format
 msgid ""
 "Under what directory this file system shall be mounted. Please note that there "
@@ -124,44 +138,44 @@ msgid ""
 msgstr "该文件系统应挂载到什么目录下。请注意，不能保证系统将遵循您的意愿。目录必须位于 /media 之下，但是它尚不存在。"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 130
-#: rc.cpp:36
+#: rc.cpp:42
 #, no-c-format
 msgid "Mount automatically"
 msgstr "自动挂载"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 133
-#: rc.cpp:39
+#: rc.cpp:45
 #, no-c-format
 msgid "Mount this file system automatically."
 msgstr "自动挂载该文件系统。"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 145
-#: rc.cpp:42
+#: rc.cpp:48
 #, no-c-format
 msgid "Filesystem Specific Mount Options"
 msgstr "特定于文件系统的装入选项"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 164
-#: rc.cpp:45
+#: rc.cpp:51
 #, no-c-format
 msgid "Flushed IO"
 msgstr "IO 已刷新"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 167
-#: rc.cpp:48
+#: rc.cpp:54
 #, no-c-format
 msgid ""
 "Always flush all data to the hot plug devices immediately and don't cache it."
 msgstr "始终将立即刷新热插拔设备上的数据而不会对其进行缓存。"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 175
-#: rc.cpp:51
+#: rc.cpp:57
 #, no-c-format
 msgid "UTF-8 charset"
 msgstr "UTF-8 字符集"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 178
-#: rc.cpp:54
+#: rc.cpp:60
 #, no-c-format
 msgid ""
 "UTF8 is the filesystem safe 8-bit encoding of Unicode that is used by the "
@@ -169,25 +183,25 @@ msgid ""
 msgstr "UTF8 是控制台使用的 Unicode 文件系统安全 8 位编码。可通过此选项对文件系统启用它。"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 186
-#: rc.cpp:57
+#: rc.cpp:63
 #, no-c-format
 msgid "Mount as user"
 msgstr "作为用户挂载"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 189
-#: rc.cpp:60
+#: rc.cpp:66
 #, no-c-format
 msgid "Mount this file system as user."
 msgstr "以用户的身份装入该文件。"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 205
-#: rc.cpp:63
+#: rc.cpp:69
 #, no-c-format
 msgid "Journaling:"
 msgstr "日志："
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 220
-#: rc.cpp:66 rc.cpp:87
+#: rc.cpp:72 rc.cpp:93
 #, no-c-format
 msgid ""
 "<h2>Specifies  the journalling mode for file data. Metadata is always "
@@ -225,31 +239,31 @@ msgstr ""
 "它保证了内部文件系统的完整性，但是在崩溃和日志恢复之后，它可能允许旧数据出现在文件中。"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 226
-#: rc.cpp:78
+#: rc.cpp:84
 #, no-c-format
 msgid "All Data"
 msgstr "所有数据"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 231
-#: rc.cpp:81
+#: rc.cpp:87
 #, no-c-format
 msgid "Ordered"
 msgstr "按顺序"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 236
-#: rc.cpp:84
+#: rc.cpp:90
 #, no-c-format
 msgid "Write Back"
 msgstr "回写"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 270
-#: rc.cpp:99
+#: rc.cpp:105
 #, no-c-format
 msgid "Short names:"
 msgstr "短名称："
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 288
-#: rc.cpp:102 rc.cpp:129
+#: rc.cpp:108 rc.cpp:135
 #, no-c-format
 msgid ""
 "<h2>Defines  the  behaviour  for  creation and display of filenames which fit "
@@ -290,72 +304,80 @@ msgstr ""
 " 按现状显示短名称；当短名称不全是大写时存储长名称。"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 294
-#: rc.cpp:117
+#: rc.cpp:123
 #, no-c-format
 msgid "Lower"
 msgstr "小写"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 299
-#: rc.cpp:120
+#: rc.cpp:126
 #, no-c-format
 msgid "Windows 95"
 msgstr "Windows 95"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 304
-#: rc.cpp:123
+#: rc.cpp:129
 #, no-c-format
 msgid "Windows NT"
 msgstr "Windows NT"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 309
-#: rc.cpp:126
+#: rc.cpp:132
 #, no-c-format
 msgid "Mixed"
 msgstr "混合"
 
 #. i18n: file propsdlgplugin/propertiespagegui.ui line 342
-#: rc.cpp:144
+#: rc.cpp:150
 #, no-c-format
 msgid "Filesystem: iso9660"
 msgstr "文件系统：iso9660"
 
-#: tdefile-plugin/tdefilemediaplugin.cpp:173
+#: tdeio_media.cpp:36
+msgid "Protocol name"
+msgstr "协议名称"
+
+#: tdeio_media.cpp:37 tdeio_media.cpp:38
+msgid "Socket name"
+msgstr "套接字名称"
+
+#: tdefile-plugin/tdefilemediaplugin.cpp:183
 msgid "Medium Information"
 msgstr "介质信息"
 
-#: tdefile-plugin/tdefilemediaplugin.cpp:176
+#: tdefile-plugin/tdefilemediaplugin.cpp:186
 msgid "Free"
 msgstr "剩余"
 
-#: tdefile-plugin/tdefilemediaplugin.cpp:179
+#: tdefile-plugin/tdefilemediaplugin.cpp:189
 msgid "Used"
 msgstr "已用"
 
-#: tdefile-plugin/tdefilemediaplugin.cpp:182
+#: tdefile-plugin/tdefilemediaplugin.cpp:192
 msgid "Total"
 msgstr "总计"
 
-#: tdefile-plugin/tdefilemediaplugin.cpp:185
+#: tdefile-plugin/tdefilemediaplugin.cpp:195
 msgid "Base URL"
 msgstr "基 URL"
 
-#: tdefile-plugin/tdefilemediaplugin.cpp:186
+#: tdefile-plugin/tdefilemediaplugin.cpp:196
 msgid "Mount Point"
 msgstr "挂载点"
 
-#: tdefile-plugin/tdefilemediaplugin.cpp:187
+#: tdefile-plugin/tdefilemediaplugin.cpp:197
 msgid "Device Node"
 msgstr "设备节点"
 
-#: tdefile-plugin/tdefilemediaplugin.cpp:189
+#: tdefile-plugin/tdefilemediaplugin.cpp:199
 msgid "Medium Summary"
 msgstr "介质概览"
 
-#: tdefile-plugin/tdefilemediaplugin.cpp:191
+#: tdefile-plugin/tdefilemediaplugin.cpp:201
 msgid "Usage"
 msgstr "用量"
 
-#: tdefile-plugin/tdefilemediaplugin.cpp:193
+#: tdefile-plugin/tdefilemediaplugin.cpp:203
 msgid "Bar Graph"
 msgstr "条形图"
 
@@ -375,8 +397,15 @@ msgstr "在新窗口中打开"
 msgid "Unknown"
 msgstr "未知"
 
+#: mediamanager/dialog.cpp:26 mounthelper/dialog.cpp:26
+msgid "Decrypt"
+msgstr ""
+
 #: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
-#: mediamanager/halbackend.cpp:1218 mediamanager/halbackend.cpp:1240
+#: mediamanager/halbackend.cpp:1591 mediamanager/halbackend.cpp:1613
+#: mediamanager/halbackend.cpp:1772 mediamanager/halbackend.cpp:1827
+#: mediamanager/tdehardwarebackend.cpp:1323
+#: mediamanager/tdehardwarebackend.cpp:1334
 #, c-format
 msgid "No such medium: %1"
 msgstr "没有此类媒体： %1"
@@ -413,101 +442,342 @@ msgstr "远程共享"
 msgid "Hard Disk"
 msgstr "硬盘"
 
-#: mediamanager/halbackend.cpp:640
+#: mediamanager/halbackend.cpp:745 mediamanager/tdehardwarebackend.cpp:780
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "未知"
 
-#: mediamanager/halbackend.cpp:652
+#: mediamanager/halbackend.cpp:757 mediamanager/tdehardwarebackend.cpp:810
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "软盘"
 
-#: mediamanager/halbackend.cpp:660
+#: mediamanager/halbackend.cpp:765
 #, fuzzy
 msgid "Zip Drive"
 msgstr "Zip 磁盘"
 
-#: mediamanager/halbackend.cpp:730
+#: mediamanager/halbackend.cpp:835 mediamanager/tdehardwarebackend.cpp:867
 msgid "Camera"
 msgstr "相机"
 
-#: mediamanager/halbackend.cpp:992
+#: mediamanager/halbackend.cpp:1217 mediamanager/halbackend.cpp:1243
+msgid "Authenticate"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1218
+msgid ""
+"<big><b>System policy prevents mounting internal media</b></big>"
+"<br/>Authentication is required to perform this action. Please enter your "
+"password to verify."
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1244
+msgid ""
+"<big><b>System policy prevents unmounting media mounted by other users</b></big>"
+"<br/>Authentication is required to perform this action. Please enter your "
+"password to verify."
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1280
 msgid "Invalid filesystem type"
 msgstr "无效的文件系统类型"
 
-#: mediamanager/halbackend.cpp:994 mediamanager/halbackend.cpp:1141
-#: mediamanager/halbackend.cpp:1317
-msgid "Permissions denied"
-msgstr "拒绝许可权限"
+#: mediamanager/halbackend.cpp:1282
+msgid ""
+"Permission denied"
+"<p>Please ensure that:"
+"<br>1. You have permission to access this device."
+"<br>2. This device node is not listed in /etc/fstab.</p>"
+msgstr ""
 
-#: mediamanager/halbackend.cpp:996
+#: mediamanager/halbackend.cpp:1286
 msgid "Device is already mounted."
 msgstr "设备已装入。"
 
-#: mediamanager/halbackend.cpp:1042
+#: mediamanager/halbackend.cpp:1336
 msgid ""
 "Moreover, programs still using the device have been detected. They are listed "
 "below. You have to close them or change their working directory before "
 "attempting to unmount the device again."
 msgstr "此外，还检测到了仍然在使用设备的程序，程序清单列在下面。您需要关闭这些程序，或者更改其工作目录，然后再尝试卸载设备。"
 
-#: mediamanager/halbackend.cpp:1065 mediamanager/halbackend.cpp:1306
+#: mediamanager/halbackend.cpp:1377 mediamanager/tdehardwarebackend.cpp:1562
+msgid ""
+"Programs that were still using the device have been forcibly terminated. They "
+"are listed below."
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1398 mediamanager/halbackend.cpp:1711
+#: mediamanager/tdehardwarebackend.cpp:1380
+#: mediamanager/tdehardwarebackend.cpp:1398
+#: mediamanager/tdehardwarebackend.cpp:1438
 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:1071
+#: mediamanager/halbackend.cpp:1404 mediamanager/tdehardwarebackend.cpp:1444
 msgid "The following error was returned by umount command:"
 msgstr "umount 命令返回了下列错误："
 
-#: mediamanager/halbackend.cpp:1312
+#: mediamanager/halbackend.cpp:1474
+#, fuzzy
+msgid "Permission denied"
+msgstr "拒绝许可权限"
+
+#: mediamanager/halbackend.cpp:1558 mediamanager/tdehardwarebackend.cpp:1206
+msgid "Cannot mount encrypted drives!"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1717
 msgid "Unmounting failed due to the following error:"
 msgstr "卸载失败，错误原因如下："
 
-#: mediamanager/halbackend.cpp:1314
+#: mediamanager/halbackend.cpp:1719
 msgid "Device is Busy:"
 msgstr "设备正忙："
 
-#: mediamanager/mediamanager.cpp:213 mediamanager/mediamanager.cpp:217
-#: mediamanager/mediamanager.cpp:226 mediamanager/mediamanager.cpp:230
+#: mediamanager/halbackend.cpp:1723
+msgid ""
+"Permission denied"
+"<p>Please ensure that:"
+"<br>1. You have permission to access this device."
+"<br>2. This device was originally mounted using TDE.</p>"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1735
+msgid ""
+"%1"
+"<p><b>Would you like to forcibly terminate these processes?</b>"
+"<br><i>All unsaved data would be lost</i>"
+msgstr ""
+
+#: mediamanager/halbackend.cpp:1807
+msgid "Wrong password"
+msgstr ""
+
+#: mediamanager/mediamanager.cpp:247 mediamanager/mediamanager.cpp:266
+#: mediamanager/mediamanager.cpp:285 mediamanager/mediamanager.cpp:293
+#: mediamanager/mediamanager.cpp:302 mediamanager/mediamanager.cpp:310
 msgid "Feature only available with HAL"
 msgstr "功能仅对于 HAL 可用"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:74
+#: mediamanager/mediamanager.cpp:252
+#, fuzzy
+msgid "Feature only available with the TDE hardware backend"
+msgstr "功能仅对于 HAL 可用"
+
+#: mediamanager/mediamanager.cpp:256 mediamanager/mediamanager.cpp:271
+#: mediamanager/mediamanager.cpp:275
+#, fuzzy
+msgid "Feature only available with HAL or TDE hardware backend"
+msgstr "功能仅对于 HAL 可用"
+
+#: mediamanager/tdehardwarebackend.cpp:452
+#: mediamanager/tdehardwarebackend.cpp:489
+#: mediamanager/tdehardwarebackend.cpp:720
+#, fuzzy
+msgid "%1 Removable Device"
+msgstr "可移动设备"
+
+#: mediamanager/tdehardwarebackend.cpp:497
+#, fuzzy
+msgid "Blank CD-ROM"
+msgstr "CD-ROM"
+
+#: mediamanager/tdehardwarebackend.cpp:506
+msgid "Blank CD-R"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:515
+msgid "Blank CD-RW"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:524
+msgid "Blank Magneto-Optical CD"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:533
+msgid "Blank Mount Ranier CD-RW"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:542
+msgid "Blank Mount Ranier CD-RW-W"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:551
+msgid "Blank DVD-ROM"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:560
+msgid "Blank DVD-RAM"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:569
+msgid "Blank DVD-R"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:578
+msgid "Blank DVD-RW"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:587
+msgid "Blank Dual Layer DVD-R"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:596
+msgid "Blank Dual Layer DVD-RW"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:605
+msgid "Blank DVD+R"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:614
+msgid "Blank DVD+RW"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:623
+msgid "Blank Dual Layer DVD+R"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:632
+msgid "Blank Dual Layer DVD+RW"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:641
+msgid "Blank BD-ROM"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:650
+msgid "Blank BD-R"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:659
+msgid "Blank BD-RW"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:668
+msgid "Blank HDDVD-ROM"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:677
+msgid "Blank HDDVD-R"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:686
+msgid "Blank HDDVD-RW"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:693
+msgid "Audio CD"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:714
+msgid "%1 Fixed Disk (%2)"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:824
+#, fuzzy
+msgid "%1 Zip Disk"
+msgstr "Zip 磁盘"
+
+#: mediamanager/tdehardwarebackend.cpp:1186
+#: mediamanager/tdehardwarebackend.cpp:1366
+#, fuzzy
+msgid "Internal error"
+msgstr "内部错误"
+
+#: mediamanager/tdehardwarebackend.cpp:1213
+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:1215
+#: mediamanager/tdehardwarebackend.cpp:1290
+#: mediamanager/tdehardwarebackend.cpp:1382
+#: mediamanager/tdehardwarebackend.cpp:1400
+msgid "<p>Technical details:<br>"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:1288
+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:1394
+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 forcibly terminate these processes?</b>"
+"<br><i>All unsaved data would be lost</i>"
+msgstr ""
+
+#: mediamanager/tdehardwarebackend.cpp:1521
+#, fuzzy
+msgid ""
+"Programs still using the device have been detected. They are listed below. You "
+"have to close them or change their working directory before attempting to "
+"unmount the device again."
+msgstr "此外，还检测到了仍然在使用设备的程序，程序清单列在下面。您需要关闭这些程序，或者更改其工作目录，然后再尝试卸载设备。"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:77
 msgid "%1 cannot be found."
 msgstr "找不到 %1。"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:81
+#: mounthelper/tdeio_media_mounthelper.cpp:84
 msgid "%1 is not a mountable media."
 msgstr "%1 不是可挂载的介质。"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:166
+#: mounthelper/tdeio_media_mounthelper.cpp:99
+#, fuzzy
+msgid "%1 is not an encrypted media."
+msgstr "%1 不是可挂载的介质。"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:105
+#, fuzzy
+msgid "%1 is already decrypted."
+msgstr "设备已装入。"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:224
 msgid "The device was successfully unmounted, but the tray could not be opened"
 msgstr "设备已经成功卸载，但无法打开托盘"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:168
+#: mounthelper/tdeio_media_mounthelper.cpp:226
 msgid "The device was successfully unmounted, but could not be ejected"
 msgstr "设备已经成功卸载，但尚未弹出"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:182
+#: mounthelper/tdeio_media_mounthelper.cpp:271
+#, fuzzy
+msgid "Decrypt given URL"
+msgstr "卸载给出的 URL"
+
+#: mounthelper/tdeio_media_mounthelper.cpp:272
 msgid "Unmount given URL"
 msgstr "卸载给出的 URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:183
+#: mounthelper/tdeio_media_mounthelper.cpp:273
 msgid "Mount given URL (default)"
 msgstr "挂载给定的 URL(默认)"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:184
+#: mounthelper/tdeio_media_mounthelper.cpp:274
 msgid "Eject given URL via tdeeject"
 msgstr "通过 tdeeject 弹出给定 URL"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:185
+#: mounthelper/tdeio_media_mounthelper.cpp:275
 msgid "Unmount and Eject given URL (necessary for some USB devices)"
 msgstr "卸载并弹出给定的 URL(某些 USB 设备需要)"
 
-#: mounthelper/tdeio_media_mounthelper.cpp:186
+#: mounthelper/tdeio_media_mounthelper.cpp:276
 msgid "media:/ URL to mount/unmount/eject/remove"
 msgstr "要挂载/卸载/弹出/删除的 media:/ URL"
 
@@ -516,15 +786,15 @@ msgstr "要挂载/卸载/弹出/删除的 media:/ URL"
 msgid "Filesystem: %1"
 msgstr "文件系统：%1"
 
-#: propsdlgplugin/propertiespage.cpp:196
+#: propsdlgplugin/propertiespage.cpp:207
 msgid "Mountpoint has to be below /media"
 msgstr "装入点必须位于 /media 之下"
 
-#: propsdlgplugin/propertiespage.cpp:211
+#: propsdlgplugin/propertiespage.cpp:223
 msgid "Saving the changes failed"
 msgstr "保存更改失败"
 
-#: propsdlgplugin/propsdlgshareplugin.cpp:67
+#: propsdlgplugin/propsdlgshareplugin.cpp:68
 msgid "&Mounting"
 msgstr "挂载(&M)"
 
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_nfs.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_nfs.po
index c9373367e8a..21220653fd1 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_nfs.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_nfs.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_nfs\n"
-"POT-Creation-Date: 2005-06-10 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2001-06-03 17:42GMT\n"
 "Last-Translator: Mai Hao Hui <mhh@126.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_nntp.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_nntp.po
index 106905d0c5d..65c6c435cde 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_nntp.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_nntp.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_nntp\n"
-"POT-Creation-Date: 2005-06-20 01:29+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2001-06-03 17:43GMT\n"
 "Last-Translator: Mai Hao Hui <mhh@126.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_pop3.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_pop3.po
index 5a544fc03cd..c6f9e6d6719 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_pop3.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_pop3.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_pop3\n"
-"POT-Creation-Date: 2007-07-17 01:45+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2002-10-10 00:10+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@126.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -117,9 +118,10 @@ msgstr ""
 "请选择另外一种验证方式。"
 
 #: pop3.cc:735
+#, fuzzy
 msgid ""
 "Your POP3 server claims to support TLS but negotiation was unsuccessful. You "
-"can disable TLS in TDE using the crypto settings module."
+"can disable TLS in KDE using the crypto settings module."
 msgstr "您的 POP3 服务器声明支持 TLS，但是协商失败了。您可以在 TDE 的加密设置模块中禁用 TLS。"
 
 #: pop3.cc:746
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_print.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_print.po
index 77a7c5059b4..1e924520df5 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_print.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_print.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_print 1.0\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-28 14:15+0800\n"
 "Last-Translator: Li Zongliang <li-zongliang@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -80,14 +81,14 @@ msgstr "无法确定 %1 的源类型。"
 msgid "Unable to retrieve printer information for %1."
 msgstr "无法得到 %1 的打印机信息。"
 
-#: tdeio_print.cpp:640 tdeio_print.cpp:681 tdeio_print.cpp:724 tdeio_print.cpp:825
-#: tdeio_print.cpp:896
+#: tdeio_print.cpp:640 tdeio_print.cpp:681 tdeio_print.cpp:724
+#: tdeio_print.cpp:825 tdeio_print.cpp:896
 #, c-format
 msgid "Unable to load template %1"
 msgstr "无法加载模板 %1"
 
-#: tdeio_print.cpp:645 tdeio_print.cpp:646 tdeio_print.cpp:696 tdeio_print.cpp:697
-#: tdeio_print.cpp:735 tdeio_print.cpp:736
+#: tdeio_print.cpp:645 tdeio_print.cpp:646 tdeio_print.cpp:696
+#: tdeio_print.cpp:697 tdeio_print.cpp:735 tdeio_print.cpp:736
 #, c-format
 msgid "Properties of %1"
 msgstr "%1 的属性"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_remote.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_remote.po
index c50ede188e6..5258a57c9c2 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_remote.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_remote.po
@@ -4,14 +4,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_remot\n"
-"POT-Creation-Date: 2006-04-28 03:54+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: remoteimpl.cpp:198
+msgid "Add a Network Folder"
+msgstr "添加网络文件夹"
+
 #: tdeio_remote.cpp:34
 msgid "Protocol name"
 msgstr "协议名称"
@@ -19,7 +24,3 @@ msgstr "协议名称"
 #: tdeio_remote.cpp:35 tdeio_remote.cpp:36
 msgid "Socket name"
 msgstr "套接字名称"
-
-#: remoteimpl.cpp:198
-msgid "Add a Network Folder"
-msgstr "添加网络文件夹"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_settings.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_settings.po
index 965b979c20d..ae2e25568b8 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_settings.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_settings.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_settings\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-11-11 15:13+0800\n"
 "Last-Translator: 张忠立 <netwind2003@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_sftp.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_sftp.po
index 3fb1f4c7262..d309c344550 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_sftp.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_sftp.po
@@ -6,230 +6,231 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_sftp\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-22 13:34+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
+#: ksshprocess.cpp:408
+msgid "Cannot specify a subsystem and command at the same time."
+msgstr "不能同时指定子系统和命令。"
+
+#: ksshprocess.cpp:753
+msgid "No options provided for ssh execution."
+msgstr "没有指定执行 ssh 的选项。"
+
+#: ksshprocess.cpp:761
+msgid "Failed to execute ssh process."
+msgstr "启动 ssh 进程失败。"
+
+#: ksshprocess.cpp:786 ksshprocess.cpp:815 ksshprocess.cpp:934
+#: ksshprocess.cpp:1006
+msgid "Error encountered while talking to ssh."
+msgstr "和 ssh 通信时发生错误。"
+
+#: ksshprocess.cpp:820 ksshprocess.cpp:967 tdeio_sftp.cpp:737
+msgid "Connection closed by remote host."
+msgstr "远程主机关闭了连接。"
+
+#: ksshprocess.cpp:866
+msgid "Please supply a password."
+msgstr "请提供密码。"
+
+#: ksshprocess.cpp:905
+msgid "Please supply the passphrase for your SSH private key."
+msgstr "请提供您 SSH 私有密钥的口令句。"
+
+#: ksshprocess.cpp:919
+msgid "Authentication to %1 failed"
+msgstr "到 %1 的认证失败"
+
+#: ksshprocess.cpp:942
+msgid ""
+"The identity of the remote host '%1' could not be verified because the host's "
+"key is not in the \"known hosts\" file."
+msgstr "因为远程主机的密钥不在“已知主机”文件中，远程主机“%1”的身份不能确认。"
+
+#: ksshprocess.cpp:948
+msgid ""
+" Manually, add the host's key to the \"known hosts\" file or contact your "
+"administrator."
+msgstr "请手工将主机的密钥添加到“已知主机”文件中，或联系网络管理员。"
+
+#: ksshprocess.cpp:954
+msgid " Manually, add the host's key to %1 or contact your administrator."
+msgstr "请手工将主机的密钥添加到 %1，或联系网络管理员。"
+
+#: ksshprocess.cpp:986
+msgid ""
+"The identity of the remote host '%1' could not be verified. The host's key "
+"fingerprint is:\n"
+"%2\n"
+"You should verify the fingerprint with the host's administrator before "
+"connecting.\n"
+"\n"
+"Would you like to accept the host's key and connect anyway? "
+msgstr ""
+"程序不能检验远程主机“%1”的身份. 主机的密钥指纹是：\n"
+"%2\n"
+"在连接之前，您应该跟主机的管理员核对密钥指纹。\n"
+"您要接受该密钥并继续连接吗？ "
+
+#: ksshprocess.cpp:1014
+msgid ""
+"WARNING: The identity of the remote host '%1' has changed!\n"
+"\n"
+"Someone could be eavesdropping on your connection, or the administrator may "
+"have just changed the host's key. Either way, you should verify the host's key "
+"fingerprint with the host's administrator. The key fingerprint is:\n"
+"%2\n"
+"Add the correct host key to \"%3\" to get rid of this message."
+msgstr ""
+"警告：远程主机“%1”的身份已经改变！\n"
+"\n"
+"也许有人在窃听您的网络连接，或者是管理员可能改变了主机的密钥。不管怎样，您应该与主机的管理员核实主机的密钥。主机的密钥指纹是：\n"
+"%2\n"
+"请将正确的主机密钥添加到“%3” 来消除这条信息。"
+
+#: ksshprocess.cpp:1049
+msgid ""
+"WARNING: The identity of the remote host '%1' has changed!\n"
+"\n"
+"Someone could be eavesdropping on your connection, or the administrator may "
+"have just changed the host's key. Either way, you should verify the host's key "
+"fingerprint with the host's administrator before connecting. The key "
+"fingerprint is:\n"
+"%2\n"
+"\n"
+"Would you like to accept the host's new key and connect anyway?"
+msgstr ""
+"警告：远程主机“%1”的身份已经改变！\n"
+"\n"
+"也许有人在窃听您的网络连接，或者是管理员可能改变了主机的密钥。不管怎样，连接前您应该与主机的管理员核实主机的密钥。主机的密钥指纹是：\n"
+"%2\n"
+"您要接受新的密钥并继续连接吗？ "
+
+#: ksshprocess.cpp:1073
+msgid "Host key was rejected."
+msgstr "主机密钥被拒绝。"
+
 #: tdeio_sftp.cpp:427
 msgid "An internal error occurred. Please retry the request again."
 msgstr "发生了内部错误。请重试请求。"
 
-#: tdeio_sftp.cpp:510
+#: tdeio_sftp.cpp:506
 msgid "Opening SFTP connection to host <b>%1:%2</b>"
 msgstr "正在打开到主机 <b>%1:%2</b> 的连接"
 
-#: tdeio_sftp.cpp:514
+#: tdeio_sftp.cpp:510
 msgid "No hostname specified"
 msgstr "没有指定主机"
 
-#: tdeio_sftp.cpp:526
+#: tdeio_sftp.cpp:522
 msgid "SFTP Login"
 msgstr "SFTP 登录"
 
-#: tdeio_sftp.cpp:528
+#: tdeio_sftp.cpp:524
 msgid "site:"
 msgstr "主机："
 
-#: tdeio_sftp.cpp:629
+#: tdeio_sftp.cpp:625
 msgid "Please enter your username and key passphrase."
 msgstr "请输入您的用户名和密钥口令句。"
 
-#: tdeio_sftp.cpp:631
+#: tdeio_sftp.cpp:627
 msgid "Please enter your username and password."
 msgstr "请输入您的用户名和密码。"
 
-#: tdeio_sftp.cpp:639
+#: tdeio_sftp.cpp:635
 msgid "Incorrect username or password"
 msgstr "用户名或密码不正确"
 
-#: tdeio_sftp.cpp:644
+#: tdeio_sftp.cpp:640
 msgid "Please enter a username and password"
 msgstr "请输入用户名和密码"
 
-#: tdeio_sftp.cpp:703
+#: tdeio_sftp.cpp:699
 msgid "Warning: Cannot verify host's identity."
 msgstr "警告：不能检验主机的身份。"
 
-#: tdeio_sftp.cpp:714
+#: tdeio_sftp.cpp:710
 msgid "Warning: Host's identity changed."
 msgstr "警告：主机身份密钥已经更改。"
 
-#: tdeio_sftp.cpp:725 tdeio_sftp.cpp:726
+#: tdeio_sftp.cpp:721 tdeio_sftp.cpp:722
 msgid "Authentication failed."
 msgstr "认证失败。"
 
-#: tdeio_sftp.cpp:740 tdeio_sftp.cpp:755
+#: tdeio_sftp.cpp:736 tdeio_sftp.cpp:751
 msgid "Connection failed."
 msgstr "连接失败。"
 
-#: tdeio_sftp.cpp:741 ksshprocess.cpp:810 ksshprocess.cpp:957
-msgid "Connection closed by remote host."
-msgstr "远程主机关闭了连接。"
-
-#: tdeio_sftp.cpp:756
+#: tdeio_sftp.cpp:752
 #, c-format
 msgid "Unexpected SFTP error: %1"
 msgstr "意外的 SFTP 错误：%1"
 
-#: tdeio_sftp.cpp:800
+#: tdeio_sftp.cpp:796
 #, c-format
 msgid "SFTP version %1"
 msgstr "SFTP 版本 %1"
 
-#: tdeio_sftp.cpp:806
+#: tdeio_sftp.cpp:802
 msgid "Protocol error."
 msgstr "协议错误。"
 
-#: tdeio_sftp.cpp:812
+#: tdeio_sftp.cpp:808
 #, c-format
 msgid "Successfully connected to %1"
 msgstr "成功连接到 %1"
 
-#: tdeio_sftp.cpp:1047
+#: tdeio_sftp.cpp:1043
 msgid "An internal error occurred. Please try again."
 msgstr "发生了内部错误。请重试。"
 
-#: tdeio_sftp.cpp:1068
+#: tdeio_sftp.cpp:1064
 msgid ""
 "Unknown error was encountered while copying the file to '%1'. Please try again."
 msgstr "试图将文件复制为“%1”时遇到了未知错误。请重试。"
 
-#: tdeio_sftp.cpp:1318
+#: tdeio_sftp.cpp:1314
 msgid "The remote host does not support renaming files."
 msgstr "远程主机不支持文件更名。"
 
-#: tdeio_sftp.cpp:1367
+#: tdeio_sftp.cpp:1363
 msgid "The remote host does not support creating symbolic links."
 msgstr "远程主机不支持创建符号连接。"
 
-#: tdeio_sftp.cpp:1492
+#: tdeio_sftp.cpp:1488
 msgid "Connection closed"
 msgstr "连接已关闭"
 
-#: tdeio_sftp.cpp:1494
+#: tdeio_sftp.cpp:1490
 msgid "Could not read SFTP packet"
 msgstr "无法读取SFTP包"
 
-#: tdeio_sftp.cpp:1611
+#: tdeio_sftp.cpp:1607
 msgid "SFTP command failed for an unknown reason."
 msgstr "SFTP 命令执行失败，原因未知。"
 
-#: tdeio_sftp.cpp:1615
+#: tdeio_sftp.cpp:1611
 msgid "The SFTP server received a bad message."
 msgstr "SFTP服务器收到了一个损坏的信息。"
 
-#: tdeio_sftp.cpp:1619
+#: tdeio_sftp.cpp:1615
 msgid "You attempted an operation unsupported by the SFTP server."
 msgstr "您企图执行SFTP服务器不支持的操作。"
 
-#: tdeio_sftp.cpp:1623
+#: tdeio_sftp.cpp:1619
 #, c-format
 msgid "Error code: %1"
 msgstr "错误代码：%1"
 
-#: ksshprocess.cpp:408
-msgid "Cannot specify a subsystem and command at the same time."
-msgstr "不能同时指定子系统和命令。"
-
-#: ksshprocess.cpp:743
-msgid "No options provided for ssh execution."
-msgstr "没有指定执行 ssh 的选项。"
-
-#: ksshprocess.cpp:751
-msgid "Failed to execute ssh process."
-msgstr "启动 ssh 进程失败。"
-
-#: ksshprocess.cpp:776 ksshprocess.cpp:805 ksshprocess.cpp:924
-#: ksshprocess.cpp:996
-msgid "Error encountered while talking to ssh."
-msgstr "和 ssh 通信时发生错误。"
-
-#: ksshprocess.cpp:856
-msgid "Please supply a password."
-msgstr "请提供密码。"
-
-#: ksshprocess.cpp:895
-msgid "Please supply the passphrase for your SSH private key."
-msgstr "请提供您 SSH 私有密钥的口令句。"
-
-#: ksshprocess.cpp:909
-msgid "Authentication to %1 failed"
-msgstr "到 %1 的认证失败"
-
-#: ksshprocess.cpp:932
-msgid ""
-"The identity of the remote host '%1' could not be verified because the host's "
-"key is not in the \"known hosts\" file."
-msgstr "因为远程主机的密钥不在“已知主机”文件中，远程主机“%1”的身份不能确认。"
-
-#: ksshprocess.cpp:938
-msgid ""
-" Manually, add the host's key to the \"known hosts\" file or contact your "
-"administrator."
-msgstr "请手工将主机的密钥添加到“已知主机”文件中，或联系网络管理员。"
-
-#: ksshprocess.cpp:944
-msgid " Manually, add the host's key to %1 or contact your administrator."
-msgstr "请手工将主机的密钥添加到 %1，或联系网络管理员。"
-
-#: ksshprocess.cpp:976
-msgid ""
-"The identity of the remote host '%1' could not be verified. The host's key "
-"fingerprint is:\n"
-"%2\n"
-"You should verify the fingerprint with the host's administrator before "
-"connecting.\n"
-"\n"
-"Would you like to accept the host's key and connect anyway? "
-msgstr ""
-"程序不能检验远程主机“%1”的身份. 主机的密钥指纹是：\n"
-"%2\n"
-"在连接之前，您应该跟主机的管理员核对密钥指纹。\n"
-"您要接受该密钥并继续连接吗？ "
-
-#: ksshprocess.cpp:1004
-msgid ""
-"WARNING: The identity of the remote host '%1' has changed!\n"
-"\n"
-"Someone could be eavesdropping on your connection, or the administrator may "
-"have just changed the host's key. Either way, you should verify the host's key "
-"fingerprint with the host's administrator. The key fingerprint is:\n"
-"%2\n"
-"Add the correct host key to \"%3\" to get rid of this message."
-msgstr ""
-"警告：远程主机“%1”的身份已经改变！\n"
-"\n"
-"也许有人在窃听您的网络连接，或者是管理员可能改变了主机的密钥。不管怎样，您应该与主机的管理员核实主机的密钥。主机的密钥指纹是：\n"
-"%2\n"
-"请将正确的主机密钥添加到“%3” 来消除这条信息。"
-
-#: ksshprocess.cpp:1039
-msgid ""
-"WARNING: The identity of the remote host '%1' has changed!\n"
-"\n"
-"Someone could be eavesdropping on your connection, or the administrator may "
-"have just changed the host's key. Either way, you should verify the host's key "
-"fingerprint with the host's administrator before connecting. The key "
-"fingerprint is:\n"
-"%2\n"
-"\n"
-"Would you like to accept the host's new key and connect anyway?"
-msgstr ""
-"警告：远程主机“%1”的身份已经改变！\n"
-"\n"
-"也许有人在窃听您的网络连接，或者是管理员可能改变了主机的密钥。不管怎样，连接前您应该与主机的管理员核实主机的密钥。主机的密钥指纹是：\n"
-"%2\n"
-"您要接受新的密钥并继续连接吗？ "
-
-#: ksshprocess.cpp:1063
-msgid "Host key was rejected."
-msgstr "主机密钥被拒绝。"
-
 #~ msgid "Could not allocate memory for SFTP packet."
 #~ msgstr "无法为SFTP包分配内存。"
 
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_smb.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_smb.po
index 82bed2a61bb..d96909df51f 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_smb.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_smb.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_smb\n"
-"POT-Creation-Date: 2005-11-08 02:45+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-22 13:31+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,15 +28,15 @@ msgstr ""
 "服务器 = %1\n"
 "共享 = %2"
 
-#: tdeio_smb_auth.cpp:175
+#: tdeio_smb_auth.cpp:176
 msgid "libsmbclient failed to initialize"
 msgstr "初始化 libsmbclient 失败"
 
-#: tdeio_smb_auth.cpp:181
+#: tdeio_smb_auth.cpp:182
 msgid "libsmbclient failed to create context"
 msgstr "libsmbclient 无法创建环境"
 
-#: tdeio_smb_auth.cpp:191
+#: tdeio_smb_auth.cpp:192
 msgid "libsmbclient failed to initialize context"
 msgstr "libsmbclient 无法初始化环境"
 
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_smtp.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_smtp.po
index d3ec7d4f75b..96525ca8cc9 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_smtp.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_smtp.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2007-07-17 01:45+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-01-10 23:00+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,9 +39,10 @@ msgid ""
 msgstr "您的 SMTP 服务器不支持 TLS。如果您想不加密连接，请禁用 TLS。"
 
 #: command.cc:186
+#, fuzzy
 msgid ""
 "Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
-"You can disable TLS in TDE using the crypto settings module."
+"You can disable TLS in KDE using the crypto settings module."
 msgstr ""
 "您的 SMTP 服务器声明支持 TLS，但协商失败了。\n"
 "您可以使用TDE中的加密设置模块禁用 TLS。"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_system.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_system.po
index 81466c311c3..a5fbcc0aea9 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_system.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_system.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_system\n"
-"POT-Creation-Date: 2006-04-28 03:54+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_tar.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_tar.po
index c1777e4bccd..23d92798c99 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_tar.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_tar.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_tar\n"
-"POT-Creation-Date: 2007-09-22 01:12+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-08-01 06:56+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_thumbnail.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_thumbnail.po
index 3cca659ae7a..5ae7b8177cd 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_thumbnail.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_thumbnail.po
@@ -4,49 +4,50 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_thumbnail\n"
-"POT-Creation-Date: 2005-06-03 01:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-08-01 06:56+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: thumbnail.cpp:174
+#: thumbnail.cpp:175
 msgid "No MIME Type specified."
 msgstr "未指定任何 MIME 类型。"
 
-#: thumbnail.cpp:184
+#: thumbnail.cpp:185
 msgid "No or invalid size specified."
 msgstr "未指定大小或指定了无效的大小。"
 
-#: thumbnail.cpp:265
+#: thumbnail.cpp:266
 msgid "No plugin specified."
 msgstr "未指定插件。"
 
-#: thumbnail.cpp:283
+#: thumbnail.cpp:284
 #, c-format
 msgid "Cannot load ThumbCreator %1"
 msgstr "无法装入缩略图创建器 %1"
 
-#: thumbnail.cpp:291
+#: thumbnail.cpp:292
 #, c-format
 msgid "Cannot create thumbnail for %1"
 msgstr "无法创建 %1 的缩略图"
 
-#: thumbnail.cpp:358
+#: thumbnail.cpp:359
 msgid "Failed to create a thumbnail."
 msgstr "创建缩略图失败。"
 
-#: thumbnail.cpp:373
+#: thumbnail.cpp:374
 msgid "Could not write image."
 msgstr "无法写入图像。"
 
-#: thumbnail.cpp:398
+#: thumbnail.cpp:399
 #, c-format
 msgid "Failed to attach to shared memory segment %1"
 msgstr "附加到共享内存段 %1 失败"
 
-#: thumbnail.cpp:403
+#: thumbnail.cpp:404
 msgid "Image is too big for the shared memory segment"
 msgstr "图像太大，共享内存段装不下"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeio_trash.po b/tde-i18n-zh_CN/messages/tdebase/tdeio_trash.po
index 6809be54585..ae99158d1fc 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeio_trash.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeio_trash.po
@@ -4,39 +4,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_trash\n"
-"POT-Creation-Date: 2006-11-07 02:35+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ktrash.cpp:30
-msgid "Empty the contents of the trash"
-msgstr "清空回收站内容"
-
-#: ktrash.cpp:32
-msgid "Restore a trashed file to its original location"
-msgstr "将回收站中的文件恢复到原始位置"
-
-#: ktrash.cpp:34
-msgid "Ignored"
-msgstr "已忽略"
-
-#: ktrash.cpp:42
-msgid "ktrash"
-msgstr "ktrash"
-
-#: ktrash.cpp:43
-msgid ""
-"Helper program to handle the TDE trash can\n"
-"Note: to move files to the trash, do not use ktrash, but \"kfmclient move 'url' "
-"trash:/\""
-msgstr ""
-"处理 TDE 回收站的助手程序\n"
-"注意：要将文件移动到回收站，不应使用 ktrash，而应使用“kfmclient move url trash:/”"
-
 #: tdeio_trash.cpp:46
 msgid "Protocol name"
 msgstr "协议名称"
@@ -45,20 +21,20 @@ msgstr "协议名称"
 msgid "Socket name"
 msgstr "套接字名称"
 
-#: tdeio_trash.cpp:97 tdeio_trash.cpp:160 tdeio_trash.cpp:317 tdeio_trash.cpp:349
-#: tdeio_trash.cpp:511 tdeio_trash.cpp:523
+#: tdeio_trash.cpp:96 tdeio_trash.cpp:159 tdeio_trash.cpp:316
+#: tdeio_trash.cpp:348 tdeio_trash.cpp:510 tdeio_trash.cpp:522
 #, c-format
 msgid "Malformed URL %1"
 msgstr "URL %1 格式不对"
 
-#: tdeio_trash.cpp:116
+#: tdeio_trash.cpp:115
 msgid ""
 "The directory %1 does not exist anymore, so it is not possible to restore this "
 "item to its original location. You can either recreate that directory and use "
 "the restore operation again, or drag the item anywhere else to restore it."
 msgstr "目录 %1 不存在，所以无法将此项目恢复到原始位置。您可以重新创建该目录，然后再使用一次恢复操作；也可以将项目拖曳到其它位置进行恢复。"
 
-#: tdeio_trash.cpp:145
+#: tdeio_trash.cpp:144
 msgid "This file is already in the trash bin."
 msgstr "此文件已经在回收站中了。"
 
@@ -74,5 +50,30 @@ msgstr "原始路径"
 msgid "Date of Deletion"
 msgstr "删除日期"
 
+#: ktrash.cpp:30
+msgid "Empty the contents of the trash"
+msgstr "清空回收站内容"
+
+#: ktrash.cpp:32
+msgid "Restore a trashed file to its original location"
+msgstr "将回收站中的文件恢复到原始位置"
+
+#: ktrash.cpp:34
+msgid "Ignored"
+msgstr "已忽略"
+
+#: ktrash.cpp:42
+msgid "ktrash"
+msgstr "ktrash"
+
+#: ktrash.cpp:43
+msgid ""
+"Helper program to handle the TDE trash can\n"
+"Note: to move files to the trash, do not use ktrash, but \"kfmclient move 'url' "
+"trash:/\""
+msgstr ""
+"处理 TDE 回收站的助手程序\n"
+"注意：要将文件移动到回收站，不应使用 ktrash，而应使用“kfmclient move url trash:/”"
+
 #~ 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 6e0be2cd5c5..09a75b509aa 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdepasswd.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdepasswd.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdepasswd\n"
-"POT-Creation-Date: 2005-07-09 01:31+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeprint_part.po b/tde-i18n-zh_CN/messages/tdebase/tdeprint_part.po
index 9410f6ed2b0..8ccbbe50e58 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeprint_part.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeprint_part.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeprint_part\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2002-10-10 12:09+0800\n"
 "Last-Translator: Funda Wang <fundawang@en2china.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdeprintfax.po b/tde-i18n-zh_CN/messages/tdebase/tdeprintfax.po
index e2413e53d62..b7f60f22a7c 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdeprintfax.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdeprintfax.po
@@ -6,112 +6,27 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeprintfax\n"
-"POT-Creation-Date: 2006-04-28 03:54+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-22 12:53+0800\n"
 "Last-Translator: Li Zongliang <li-zongliang@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: confsystem.cpp:50
-msgid "F&ax system:"
-msgstr "传真系统(&A)："
-
-#: confsystem.cpp:51
-msgid "Co&mmand:"
-msgstr "命令(&M)："
-
-#: confsystem.cpp:61
-msgid "Fax &server (if any):"
-msgstr "传真服务器(如果存在)(&S)："
-
-#: confsystem.cpp:62
-msgid "&Fax/Modem device:"
-msgstr "传真/调制解调器设备(&F)："
-
-#: confsystem.cpp:65
-msgid "Standard Modem Port"
-msgstr "标准调制解调器端口"
-
-#: confsystem.cpp:67
-#, c-format
-msgid "Serial Port #%1"
-msgstr "串口 #%1"
-
-#: confsystem.cpp:68
-msgid "Other"
-msgstr "其它"
-
-#: faxctrl.cpp:387
-msgid "Converting input files to PostScript"
-msgstr "将输入文件转换为 PostScript"
-
-#: faxctrl.cpp:462
-msgid "Sending fax to %1 (%2)"
-msgstr "发送传真给 %1 (%2)"
-
-#: faxctrl.cpp:467
-#, c-format
-msgid "Sending to fax using: %1"
-msgstr "发送到传真使用：%1"
-
-#: faxctrl.cpp:471
-msgid "Sending fax to %1..."
-msgstr "正在发送传真到 %1..."
-
-#: faxctrl.cpp:482
-msgid "Skipping %1..."
-msgstr "正在跳过 %1..."
-
-#: faxctrl.cpp:500
-msgid "Filtering %1..."
-msgstr "正在过滤 %1..."
-
-#: faxctrl.cpp:618
-msgid "Fax log"
-msgstr "传真日志"
-
-#: faxctrl.cpp:620
-msgid "Fax Log"
-msgstr "传真日志"
-
-#: faxctrl.cpp:629 faxctrl.cpp:659
-msgid "TDEPrint Fax Tool Log"
-msgstr "TDEPrint 传真工具日志"
-
-#: faxctrl.cpp:664
-msgid "Cannot open file for writing."
-msgstr "无法打开文件进行写入。"
-
-#: conffax.cpp:43
-msgid "High (204x196 dpi)"
-msgstr "高(204x196 dpi)"
-
-#: conffax.cpp:44
-msgid "Low (204x98 dpi)"
-msgstr "低(204x98 dpi)"
-
-#: conffax.cpp:45
-msgid "A4"
-msgstr "A4"
-
-#: conffax.cpp:46
-msgid "Letter"
-msgstr "信纸"
-
-#: conffax.cpp:47
-msgid "Legal"
-msgstr "Legal"
-
-#: conffax.cpp:48
-msgid "&Resolution:"
-msgstr "分辨率(&R)："
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Li Zongliang"
 
-#: conffax.cpp:50
-msgid "&Paper size:"
-msgstr "纸张大小(&P)："
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "li-zongliang@21cn.com"
 
 #: confgeneral.cpp:41
 msgid "&Name:"
@@ -129,60 +44,6 @@ msgstr "号码(&U)："
 msgid "Replace international prefix '+' with:"
 msgstr "将国际直拨前缀“+”替换为："
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Li Zongliang"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "li-zongliang@21cn.com"
-
-#: main.cpp:33
-msgid "A small fax utility to be used with tdeprint."
-msgstr "一个小传真实用工具和tdeprint一起使用。"
-
-#: main.cpp:39
-msgid "Phone number to fax to"
-msgstr "要发送传真的电话号码"
-
-#: main.cpp:40
-msgid "Send fax immediately"
-msgstr "立即发送传真"
-
-#: main.cpp:41
-msgid "Exit after sending"
-msgstr "发送后退出"
-
-#: main.cpp:42
-msgid "File to fax (added to the file list)"
-msgstr "要传真的文件(加进文件列表)"
-
-#: main.cpp:50
-msgid "KdeprintFax"
-msgstr "KdeprintFax"
-
-#: filterdlg.cpp:31
-msgid "Filter Parameters"
-msgstr "过滤器参数"
-
-#: filterdlg.cpp:37
-msgid "MIME type:"
-msgstr "MIME 类型："
-
-#: filterdlg.cpp:38
-msgid "Command:"
-msgstr "命令："
-
-#. i18n: file tdeprintfaxui.rc line 10
-#: rc.cpp:6
-#, no-c-format
-msgid "Fa&x"
-msgstr "传真(&X)"
-
 #: conffilters.cpp:42
 msgid "Mime Type"
 msgstr "MIME 类型"
@@ -247,25 +108,33 @@ msgstr "过滤器"
 msgid "Filters Configuration"
 msgstr "过滤器配置"
 
-#: faxab.cpp:41 tdeprintfax.cpp:88
-msgid "Name"
-msgstr "名称"
+#: conffax.cpp:43
+msgid "High (204x196 dpi)"
+msgstr "高(204x196 dpi)"
 
-#: faxab.cpp:42 tdeprintfax.cpp:87 tdeprintfax.cpp:562
-msgid "Fax Number"
-msgstr "传真号码"
+#: conffax.cpp:44
+msgid "Low (204x98 dpi)"
+msgstr "低(204x98 dpi)"
 
-#: faxab.cpp:44
-msgid "Entries:"
-msgstr "项目："
+#: conffax.cpp:45
+msgid "A4"
+msgstr "A4"
 
-#: faxab.cpp:47
-msgid "&Edit Addressbook"
-msgstr "编辑地址薄(&E)"
+#: conffax.cpp:46
+msgid "Letter"
+msgstr "信纸"
 
-#: faxab.cpp:150
-msgid "No fax number found in your address book."
-msgstr "在您的地址薄中没有找到传真号码。"
+#: conffax.cpp:47
+msgid "Legal"
+msgstr "Legal"
+
+#: conffax.cpp:48
+msgid "&Resolution:"
+msgstr "分辨率(&R)："
+
+#: conffax.cpp:50
+msgid "&Paper size:"
+msgstr "纸张大小(&P)："
 
 #: tdeprintfax.cpp:74
 msgid "Move up"
@@ -279,6 +148,14 @@ msgstr "下移"
 msgid "F&iles:"
 msgstr "文件(&I)："
 
+#: faxab.cpp:42 tdeprintfax.cpp:87 tdeprintfax.cpp:562
+msgid "Fax Number"
+msgstr "传真号码"
+
+#: faxab.cpp:41 tdeprintfax.cpp:88
+msgid "Name"
+msgstr "名称"
+
 #: tdeprintfax.cpp:89
 msgid "Enterprise"
 msgstr "企业"
@@ -407,3 +284,131 @@ msgstr "企业(&E)："
 #: tdeprintfax.cpp:593
 msgid "Invalid fax number."
 msgstr "无效的传真号码。"
+
+#: faxctrl.cpp:387
+msgid "Converting input files to PostScript"
+msgstr "将输入文件转换为 PostScript"
+
+#: faxctrl.cpp:462
+msgid "Sending fax to %1 (%2)"
+msgstr "发送传真给 %1 (%2)"
+
+#: faxctrl.cpp:467
+#, c-format
+msgid "Sending to fax using: %1"
+msgstr "发送到传真使用：%1"
+
+#: faxctrl.cpp:471
+msgid "Sending fax to %1..."
+msgstr "正在发送传真到 %1..."
+
+#: faxctrl.cpp:482
+msgid "Skipping %1..."
+msgstr "正在跳过 %1..."
+
+#: faxctrl.cpp:500
+msgid "Filtering %1..."
+msgstr "正在过滤 %1..."
+
+#: faxctrl.cpp:618
+msgid "Fax log"
+msgstr "传真日志"
+
+#: faxctrl.cpp:620
+msgid "Fax Log"
+msgstr "传真日志"
+
+#: faxctrl.cpp:629 faxctrl.cpp:659
+msgid "TDEPrint Fax Tool Log"
+msgstr "TDEPrint 传真工具日志"
+
+#: faxctrl.cpp:664
+msgid "Cannot open file for writing."
+msgstr "无法打开文件进行写入。"
+
+#: faxab.cpp:44
+msgid "Entries:"
+msgstr "项目："
+
+#: faxab.cpp:47
+msgid "&Edit Addressbook"
+msgstr "编辑地址薄(&E)"
+
+#: faxab.cpp:150
+msgid "No fax number found in your address book."
+msgstr "在您的地址薄中没有找到传真号码。"
+
+#: filterdlg.cpp:31
+msgid "Filter Parameters"
+msgstr "过滤器参数"
+
+#: filterdlg.cpp:37
+msgid "MIME type:"
+msgstr "MIME 类型："
+
+#: filterdlg.cpp:38
+msgid "Command:"
+msgstr "命令："
+
+#. i18n: file tdeprintfaxui.rc line 10
+#: rc.cpp:6
+#, no-c-format
+msgid "Fa&x"
+msgstr "传真(&X)"
+
+#: confsystem.cpp:50
+msgid "F&ax system:"
+msgstr "传真系统(&A)："
+
+#: confsystem.cpp:51
+msgid "Co&mmand:"
+msgstr "命令(&M)："
+
+#: confsystem.cpp:61
+msgid "Fax &server (if any):"
+msgstr "传真服务器(如果存在)(&S)："
+
+#: confsystem.cpp:62
+msgid "&Fax/Modem device:"
+msgstr "传真/调制解调器设备(&F)："
+
+#: confsystem.cpp:65
+msgid "Standard Modem Port"
+msgstr "标准调制解调器端口"
+
+#: confsystem.cpp:67
+#, c-format
+msgid "Serial Port #%1"
+msgstr "串口 #%1"
+
+#: confsystem.cpp:68
+msgid "Other"
+msgstr "其它"
+
+#: main.cpp:33
+msgid "A small fax utility to be used with tdeprint."
+msgstr "一个小传真实用工具和tdeprint一起使用。"
+
+#: main.cpp:39
+msgid "Phone number to fax to"
+msgstr "要发送传真的电话号码"
+
+#: main.cpp:40
+msgid "Send fax immediately"
+msgstr "立即发送传真"
+
+#: main.cpp:41
+msgid "Exit after sending"
+msgstr "发送后退出"
+
+#: main.cpp:42
+msgid "File to fax (added to the file list)"
+msgstr "要传真的文件(加进文件列表)"
+
+#: main.cpp:50
+#, fuzzy
+msgid "TDEPrintFax"
+msgstr "TDEPrint 传真工具日志"
+
+#~ msgid "KdeprintFax"
+#~ msgstr "KdeprintFax"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tderandr.po b/tde-i18n-zh_CN/messages/tdebase/tderandr.po
index 4c388912e2c..a57f9f68fb7 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tderandr.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tderandr.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tderandr\n"
-"POT-Creation-Date: 2006-11-08 02:34+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-01-12 14:31+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,7 +26,50 @@ msgid ""
 "Your emails"
 msgstr "i18n-translation@lists.linux.net.cn"
 
-#: tderandrmodule.cpp:82
+#: configdialog.cpp:49
+msgid "Global &Shortcuts"
+msgstr ""
+
+#: ktimerdialog.cpp:154
+#, c-format
+msgid ""
+"_n: 1 second remaining:\n"
+"%n seconds remaining:"
+msgstr "还剩 %n 秒："
+
+#: main.cpp:32
+msgid "Application is being auto-started at TDE session start"
+msgstr "应用程序会在 TDE 会话启动时自动启动"
+
+#: main.cpp:38
+msgid "Resize and Rotate"
+msgstr "大小和旋转"
+
+#: main.cpp:38
+msgid "Resize and Rotate System Tray App"
+msgstr "大小和旋转系统托盘小程序"
+
+#: main.cpp:39
+msgid "Developer and maintainer"
+msgstr ""
+
+#: main.cpp:40
+msgid "Original developer and maintainer"
+msgstr ""
+
+#: main.cpp:41
+msgid "Many fixes"
+msgstr "许多改正"
+
+#: tderandrbindings.cpp:29
+msgid "Display Control"
+msgstr ""
+
+#: tderandrbindings.cpp:31
+msgid "Switch Displays"
+msgstr ""
+
+#: tderandrmodule.cpp:83
 msgid ""
 "<qt>Your X server does not support resizing and rotating the display. Please "
 "update to version 4.3 or greater. You need the X Resize And Rotate extension "
@@ -34,239 +78,274 @@ msgstr ""
 "<qt>您的 X 服务器不支持对显示大小的更改以及旋转。请更新到 4.3 或更高版本。要使用此特性，您还需要 X 更改大小和旋转扩展(RANDR) 1.1 "
 "或更高版本。</qt>"
 
-#: tderandrmodule.cpp:91
+#: tderandrmodule.cpp:92
 msgid "Settings for screen:"
 msgstr "屏幕设置："
 
-#: tderandrmodule.cpp:95 tderandrtray.cpp:83
+#: tderandrmodule.cpp:96 tderandrtray.cpp:267
 #, c-format
 msgid "Screen %1"
 msgstr "屏幕 %1"
 
-#: tderandrmodule.cpp:100
+#: tderandrmodule.cpp:101
 msgid ""
 "The screen whose settings you would like to change can be selected using this "
 "drop-down list."
 msgstr "您想要对进行的全部设置都可使用此下拉列表选择。"
 
-#: tderandrmodule.cpp:109
+#: tderandrmodule.cpp:110
 msgid "Screen size:"
 msgstr "屏幕大小："
 
-#: tderandrmodule.cpp:111
+#: tderandrmodule.cpp:112
 msgid ""
 "The size, otherwise known as the resolution, of your screen can be selected "
 "from this drop-down list."
 msgstr "您可从此下拉列表中选择屏幕的大小，或称分辨率。"
 
-#: tderandrmodule.cpp:117
+#: tderandrmodule.cpp:118
 msgid "Refresh rate:"
 msgstr "刷新率："
 
-#: tderandrmodule.cpp:119
+#: tderandrmodule.cpp:120
 msgid ""
 "The refresh rate of your screen can be selected from this drop-down list."
 msgstr "您可从此下拉列表中选择您屏幕的刷新率。"
 
-#: tderandrmodule.cpp:123
+#: tderandrmodule.cpp:124
 msgid "Orientation (degrees counterclockwise)"
 msgstr "方向(逆时针角度)"
 
-#: tderandrmodule.cpp:126
+#: tderandrmodule.cpp:127
 msgid ""
 "The options in this section allow you to change the rotation of your screen."
 msgstr "本节中的选项允许您更改屏幕的旋转。"
 
-#: tderandrmodule.cpp:128
+#: tderandrmodule.cpp:129
 msgid "Apply settings on TDE startup"
 msgstr "在 TDE 启动时应用设置"
 
-#: tderandrmodule.cpp:130
+#: tderandrmodule.cpp:131
 msgid ""
 "If this option is enabled the size and orientation settings will be used when "
 "TDE starts."
 msgstr "如果启用了此选项，将会在 TDE 启动时使用大小和方向设置。"
 
-#: tderandrmodule.cpp:135
+#: tderandrmodule.cpp:136
 msgid "Allow tray application to change startup settings"
 msgstr "允许托盘应用程序更改启动设置"
 
-#: tderandrmodule.cpp:137
+#: tderandrmodule.cpp:138
 msgid ""
 "If this option is enabled, options set by the system tray applet will be saved "
 "and loaded when TDE starts instead of being temporary."
 msgstr "如果启用了此选项，系统托盘小程序所设定的选项将会被保存，并在 TDE 启动时装入，而不仅仅是临时设置。"
 
-#: tderandrmodule.cpp:174 tderandrtray.cpp:149
+#: tderandrmodule.cpp:175 tderandrtray.cpp:433
 msgid "%1 x %2"
 msgstr "%1 x %2"
 
-#: tderandrtray.cpp:45
+#: tderandrtray.cpp:62
 msgid "Screen resize & rotate"
 msgstr "屏幕大小和旋转"
 
-#: tderandrtray.cpp:69
+#: tderandrtray.cpp:107
+msgid "Start KRandRTray automatically when you log in?"
+msgstr ""
+
+#: tderandrtray.cpp:108
+msgid "Question"
+msgstr ""
+
+#: tderandrtray.cpp:108
+msgid "Start Automatically"
+msgstr ""
+
+#: tderandrtray.cpp:108
+msgid "Do Not Start"
+msgstr ""
+
+#: tderandrtray.cpp:252
 msgid "Required X Extension Not Available"
 msgstr "所需的 X 扩展不可用"
 
-#: tderandrtray.cpp:94
-msgid "Configure Display..."
+#: tderandrtray.cpp:282
+msgid "Color Profile"
+msgstr ""
+
+#: tderandrtray.cpp:298
+msgid "Display Profiles"
+msgstr ""
+
+#: tderandrtray.cpp:308
+#, fuzzy
+msgid "Global Configuration"
+msgstr "接受配置(&A)"
+
+#: tderandrtray.cpp:310
+#, fuzzy
+msgid "Configure Displays..."
+msgstr "配置显示..."
+
+#: tderandrtray.cpp:320
+#, fuzzy
+msgid "Configure Shortcut Keys..."
 msgstr "配置显示..."
 
-#: tderandrtray.cpp:117
+#: tderandrtray.cpp:355
 msgid "Screen configuration has changed"
 msgstr "屏幕配置已更改"
 
-#: tderandrtray.cpp:128
+#: tderandrtray.cpp:412
 msgid "Screen Size"
 msgstr "屏幕大小"
 
-#: tderandrtray.cpp:181
+#: tderandrtray.cpp:465
 msgid "Refresh Rate"
 msgstr "刷新率"
 
-#: tderandrtray.cpp:251
+#: tderandrtray.cpp:539
 msgid "Configure Display"
 msgstr "配置显示"
 
-#: ktimerdialog.cpp:154
-#, c-format
-msgid ""
-"_n: 1 second remaining:\n"
-"%n seconds remaining:"
-msgstr "还剩 %n 秒："
-
-#: main.cpp:32
-msgid "Application is being auto-started at TDE session start"
-msgstr "应用程序会在 TDE 会话启动时自动启动"
+#: tderandrtray.cpp:548
+#, fuzzy
+msgid "Configure Displays"
+msgstr "配置显示"
 
-#: main.cpp:38
-msgid "Resize and Rotate"
-msgstr "大小和旋转"
+#: tderandrtray.cpp:710 tderandrtray.cpp:863
+msgid ""
+"<b>Unable to activate output %1</b>"
+"<p>Either the output is not connected to a display,"
+"<br>or the display configuration is not detectable"
+msgstr ""
 
-#: main.cpp:38
-msgid "Resize and Rotate System Tray App"
-msgstr "大小和旋转系统托盘小程序"
+#: tderandrtray.cpp:710 tderandrtray.cpp:863
+msgid "Output Unavailable"
+msgstr ""
 
-#: main.cpp:39
-msgid "Maintainer"
-msgstr "维护者"
+#: tderandrtray.cpp:744
+msgid "Output Port"
+msgstr ""
 
-#: main.cpp:40
-msgid "Many fixes"
-msgstr "许多改正"
+#: tderandrtray.cpp:759
+msgid "%1 (Active)"
+msgstr ""
 
-#: randr.cpp:159
-msgid "Confirm Display Setting Change"
-msgstr "确认显示设置更改"
+#: tderandrtray.cpp:781
+msgid "%1 (Connected, Inactive)"
+msgstr ""
 
-#: randr.cpp:163
-msgid "&Accept Configuration"
-msgstr "接受配置(&A)"
+#: tderandrtray.cpp:803
+msgid "%1 (Disconnected, Inactive)"
+msgstr ""
 
-#: randr.cpp:164
-msgid "&Return to Previous Configuration"
-msgstr "返回到先前配置(&R)"
+#: tderandrtray.cpp:810
+msgid "Next available output"
+msgstr ""
 
-#: randr.cpp:166
+#: tderandrtray.cpp:883
 msgid ""
-"Your screen orientation, size and refresh rate have been changed to the "
-"requested settings. Please indicate whether you wish to keep this "
-"configuration. In 15 seconds the display will revert to your previous settings."
-msgstr "您的屏幕方向、大小和刷新率已经更改为所设定的值。请确定您是否要保持此配置。如果您没有任何操作的话，15 秒后显示将会返回到您先前的设置。"
+"<b>You are attempting to deactivate the only active output</b>"
+"<p>You must keep at least one display output active at all times!"
+msgstr ""
 
-#: randr.cpp:197
-msgid ""
-"New configuration:\n"
-"Resolution: %1 x %2\n"
-"Orientation: %3"
+#: tderandrtray.cpp:883
+msgid "Invalid Operation Requested"
 msgstr ""
-"新配置：\n"
-"分辨率：%1 x %2\n"
-"方向：%3"
 
-#: randr.cpp:202
-msgid ""
-"New configuration:\n"
-"Resolution: %1 x %2\n"
-"Orientation: %3\n"
-"Refresh rate: %4"
+#: tderandrtray.cpp:891
+msgid "New display output options are available!"
+msgstr ""
+
+#: tderandrtray.cpp:892
+msgid "A screen has been added, removed, or changed"
 msgstr ""
-"新配置：\n"
-"分辨率：%1 x %2\n"
-"方向：%3\n"
-"刷新率：%4"
 
-#: randr.cpp:231 randr.cpp:248
-msgid "Normal"
-msgstr "普通"
+#~ msgid "Maintainer"
+#~ msgstr "维护者"
 
-#: randr.cpp:233
-msgid "Left (90 degrees)"
-msgstr "左(90度)"
+#~ msgid "Confirm Display Setting Change"
+#~ msgstr "确认显示设置更改"
 
-#: randr.cpp:235
-msgid "Upside-down (180 degrees)"
-msgstr "上下颠倒(180度)"
+#~ msgid "&Return to Previous Configuration"
+#~ msgstr "返回到先前配置(&R)"
 
-#: randr.cpp:237
-msgid "Right (270 degrees)"
-msgstr "右(270度)"
+#~ msgid "Your screen orientation, size and refresh rate have been changed to the requested settings. Please indicate whether you wish to keep this configuration. In 15 seconds the display will revert to your previous settings."
+#~ msgstr "您的屏幕方向、大小和刷新率已经更改为所设定的值。请确定您是否要保持此配置。如果您没有任何操作的话，15 秒后显示将会返回到您先前的设置。"
 
-#: randr.cpp:239
-msgid "Mirror horizontally"
-msgstr "水平镜像"
+#~ msgid ""
+#~ "New configuration:\n"
+#~ "Resolution: %1 x %2\n"
+#~ "Orientation: %3"
+#~ msgstr ""
+#~ "新配置：\n"
+#~ "分辨率：%1 x %2\n"
+#~ "方向：%3"
 
-#: randr.cpp:241
-msgid "Mirror vertically"
-msgstr "垂直镜像"
+#~ msgid ""
+#~ "New configuration:\n"
+#~ "Resolution: %1 x %2\n"
+#~ "Orientation: %3\n"
+#~ "Refresh rate: %4"
+#~ msgstr ""
+#~ "新配置：\n"
+#~ "分辨率：%1 x %2\n"
+#~ "方向：%3\n"
+#~ "刷新率：%4"
 
-#: randr.cpp:243 randr.cpp:274
-msgid "Unknown orientation"
-msgstr "未知方向"
+#~ msgid "Normal"
+#~ msgstr "普通"
 
-#: randr.cpp:250
-msgid "Rotated 90 degrees counterclockwise"
-msgstr "逆时针旋转 90 度"
+#~ msgid "Left (90 degrees)"
+#~ msgstr "左(90度)"
 
-#: randr.cpp:252
-msgid "Rotated 180 degrees counterclockwise"
-msgstr "逆时针旋转 180 度"
+#~ msgid "Upside-down (180 degrees)"
+#~ msgstr "上下颠倒(180度)"
 
-#: randr.cpp:254
-msgid "Rotated 270 degrees counterclockwise"
-msgstr "逆时针旋转 270 度"
+#~ msgid "Right (270 degrees)"
+#~ msgstr "右(270度)"
 
-#: randr.cpp:259
-msgid "Mirrored horizontally and vertically"
-msgstr "水平垂直镜像"
+#~ msgid "Mirror horizontally"
+#~ msgstr "水平镜像"
 
-#: randr.cpp:261
-msgid "mirrored horizontally and vertically"
-msgstr "水平垂直镜像"
+#~ msgid "Mirror vertically"
+#~ msgstr "垂直镜像"
 
-#: randr.cpp:264
-msgid "Mirrored horizontally"
-msgstr "水平镜像"
+#~ msgid "Unknown orientation"
+#~ msgstr "未知方向"
 
-#: randr.cpp:266
-msgid "mirrored horizontally"
-msgstr "水平镜像"
+#~ msgid "Rotated 90 degrees counterclockwise"
+#~ msgstr "逆时针旋转 90 度"
 
-#: randr.cpp:269
-msgid "Mirrored vertically"
-msgstr "垂直镜像"
+#~ msgid "Rotated 180 degrees counterclockwise"
+#~ msgstr "逆时针旋转 180 度"
 
-#: randr.cpp:271
-msgid "mirrored vertically"
-msgstr "垂直镜像"
+#~ msgid "Rotated 270 degrees counterclockwise"
+#~ msgstr "逆时针旋转 270 度"
 
-#: randr.cpp:276
-msgid "unknown orientation"
-msgstr "未知方向"
+#~ msgid "Mirrored horizontally and vertically"
+#~ msgstr "水平垂直镜像"
 
-#: randr.cpp:400 randr.cpp:405
-msgid ""
-"_: Refresh rate in Hertz (Hz)\n"
-"%1 Hz"
-msgstr "%1 Hz"
+#~ msgid "mirrored horizontally and vertically"
+#~ msgstr "水平垂直镜像"
+
+#~ msgid "Mirrored horizontally"
+#~ msgstr "水平镜像"
+
+#~ msgid "mirrored horizontally"
+#~ msgstr "水平镜像"
+
+#~ msgid "Mirrored vertically"
+#~ msgstr "垂直镜像"
+
+#~ msgid "mirrored vertically"
+#~ msgstr "垂直镜像"
+
+#~ msgid "unknown orientation"
+#~ msgstr "未知方向"
+
+#~ msgid ""
+#~ "_: Refresh rate in Hertz (Hz)\n"
+#~ "%1 Hz"
+#~ msgstr "%1 Hz"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdescreensaver.po b/tde-i18n-zh_CN/messages/tdebase/tdescreensaver.po
index 1aa2939ac59..e804eaa7660 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdescreensaver.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdescreensaver.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdescreensaver\n"
-"POT-Creation-Date: 2007-01-26 02:37+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-12-28 14:06+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,7 +28,7 @@ msgstr "设置空屏幕屏保"
 msgid "Color:"
 msgstr "颜色："
 
-#: random.cpp:41
+#: random.cpp:42
 msgid ""
 "Usage: %1 [-setup] [args]\n"
 "Starts a random screen saver.\n"
@@ -37,34 +38,34 @@ msgstr ""
 "随机运行一个屏幕保护程序。\n"
 "任何参数(除了 -setup)都将传递给屏幕保护程序。"
 
-#: random.cpp:48
+#: random.cpp:49
 msgid "Start a random TDE screen saver"
 msgstr "启动随机的 TDE 屏幕保护程序"
 
-#: random.cpp:54
+#: random.cpp:55
 msgid "Setup screen saver"
 msgstr "设置屏幕保护程序"
 
-#: random.cpp:55
+#: random.cpp:56
 msgid "Run in the specified XWindow"
 msgstr "在指定的 XWindow 中运行"
 
-#: random.cpp:56
+#: random.cpp:57
 msgid "Run in the root XWindow"
 msgstr "在 root XWindow 中运行"
 
-#: random.cpp:66
+#: random.cpp:104
 msgid "Random screen saver"
 msgstr "随机屏幕保护程序"
 
-#: random.cpp:215
+#: random.cpp:261
 msgid "Setup Random Screen Saver"
 msgstr "设置随机屏幕保护程序"
 
-#: random.cpp:222
+#: random.cpp:268
 msgid "Use OpenGL screen savers"
 msgstr "使用 OpenGL 屏幕保护程序"
 
-#: random.cpp:225
+#: random.cpp:271
 msgid "Use screen savers that manipulate the screen"
 msgstr "使用变换屏幕的屏幕保护程序"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdestyle_keramik_config.po b/tde-i18n-zh_CN/messages/tdebase/tdestyle_keramik_config.po
index 14119b85485..a7389f8880e 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdestyle_keramik_config.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdestyle_keramik_config.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdestyle_keramik_config\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2003-11-11 17:17+0800\n"
 "Last-Translator: 张忠立 <netwind2003@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdesu.po b/tde-i18n-zh_CN/messages/tdebase/tdesu.po
index c22531f570d..75b69f3faf9 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdesu.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdesu.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdesu\n"
-"POT-Creation-Date: 2007-11-14 01:15+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2004-06-22 12:56+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -51,61 +52,67 @@ msgid "Let command use existing dcopserver"
 msgstr "让命令使用已有的 dcopserver"
 
 #: tdesu.cpp:66
-msgid "Do not display ignore button"
-msgstr "不显示忽略按钮"
+#, fuzzy
+msgid "Ignored"
+msgstr "忽略(&I)"
 
 #: tdesu.cpp:67
+#, fuzzy
+msgid "Display the ignore button"
+msgstr "不显示忽略按钮"
+
+#: tdesu.cpp:68
 msgid "Specify icon to use in the password dialog"
 msgstr "指定要在密码对话框中使用的图标"
 
-#: tdesu.cpp:68
+#: tdesu.cpp:69
 msgid "Do not show the command to be run in the dialog"
 msgstr "不在对话框中显示要运行的命令"
 
-#: tdesu.cpp:99
+#: tdesu.cpp:100
 msgid "TDE su"
 msgstr "TDE su"
 
-#: tdesu.cpp:100
+#: tdesu.cpp:101
 msgid "Runs a program with elevated privileges."
 msgstr "用提升的权限来运行程序。"
 
-#: tdesu.cpp:103
+#: tdesu.cpp:104
 msgid "Maintainer"
 msgstr "维护者"
 
-#: tdesu.cpp:105
+#: tdesu.cpp:106
 msgid "Original author"
 msgstr "初始作者"
 
-#: tdesu.cpp:131
+#: tdesu.cpp:132
 msgid "Command '%1' not found."
 msgstr "找不到命令“%1”。"
 
-#: tdesu.cpp:207
+#: tdesu.cpp:208
 #, c-format
 msgid "Illegal priority: %1"
 msgstr "不合法的优先级：%1"
 
-#: tdesu.cpp:235
+#: tdesu.cpp:230
 msgid "No command specified."
 msgstr "没有指定命令。"
 
-#: tdesu.cpp:344
+#: tdesu.cpp:336
 msgid ""
 "Su returned with an error.\n"
 msgstr ""
 "Su 返回错误。\n"
 
-#: tdesu.cpp:365
+#: tdesu.cpp:357
 msgid "Command:"
 msgstr "命令："
 
-#: tdesu.cpp:370
+#: tdesu.cpp:362
 msgid "realtime: "
 msgstr "实时："
 
-#: tdesu.cpp:373
+#: tdesu.cpp:365
 msgid "Priority:"
 msgstr "优先级："
 
@@ -118,27 +125,48 @@ msgstr "以 %1 运行"
 msgid "Please enter your password."
 msgstr "请输入您的密码。"
 
-#: sudlg.cpp:36
+#: sudlg.cpp:37
 msgid ""
 "The action you requested needs root privileges. Please enter root's password "
 "below or click Ignore to continue with your current privileges."
 msgstr "您请求的动作需要 root 的权限。请在下面输入 root 的密码或按忽略按钮来使用当前的权限来继续。"
 
-#: sudlg.cpp:40
+#: sudlg.cpp:42
 msgid ""
 "The action you requested needs additional privileges. Please enter the password "
 "for \"%1\" below or click Ignore to continue with your current privileges."
 msgstr "您请求的动作需要额外的权限。请在下面输入“%1”的密码或忽略按钮来使用当前的权限来继续。"
 
-#: sudlg.cpp:48
+#: sudlg.cpp:49
+#, fuzzy
+msgid ""
+"The action you requested needs root privileges. Please enter root's password "
+"below."
+msgstr "您请求的动作需要 root 的权限。请在下面输入 root 的密码。"
+
+#: sudlg.cpp:53
+#, fuzzy
+msgid ""
+"The action you requested needs additional privileges. Please enter the password "
+"for \"%1\" below."
+msgstr "您请求的动作需要 root 的权限。请在下面输入 root 的密码。"
+
+#: sudlg.cpp:59
+msgid ""
+"<qt>The stored password will be:"
+"<br> * Kept for up to %1 minutes"
+"<br> * Destroyed on logout"
+msgstr ""
+
+#: sudlg.cpp:62
 msgid "&Ignore"
 msgstr "忽略(&I)"
 
-#: sudlg.cpp:64
+#: sudlg.cpp:78
 msgid "Conversation with su failed."
 msgstr "和 su 的通信失败。"
 
-#: sudlg.cpp:73
+#: sudlg.cpp:87
 msgid ""
 "The program 'su' is not found;\n"
 "make sure your PATH is set correctly."
@@ -146,7 +174,7 @@ msgstr ""
 "没有找到程序“su”。\n"
 "请确定您的 PATH 设置正确。"
 
-#: sudlg.cpp:80
+#: sudlg.cpp:94
 msgid ""
 "You are not allowed to use 'su';\n"
 "on some systems, you need to be in a special group (often: wheel) to use this "
@@ -155,11 +183,11 @@ msgstr ""
 "您不被允许使用“su”。\n"
 "在某些系统上，您需要在特别的组群里(通常是 wheel)来使用这个命令。"
 
-#: sudlg.cpp:87
+#: sudlg.cpp:101
 msgid "Incorrect password; please try again."
 msgstr "不正确的密码；请重试。"
 
-#: sudlg.cpp:91
+#: sudlg.cpp:105
 msgid "Internal error: illegal return from SuProcess::checkInstall()"
 msgstr "内部错误：不合法的返回值来自 SuProcess::checkInstall()"
 
@@ -174,6 +202,3 @@ msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
 msgstr "lark@linux.net.cn"
-
-#~ msgid "The action you requested needs root privileges. Please enter root's password below "
-#~ msgstr "您请求的动作需要 root 的权限。请在下面输入 root 的密码。"
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdesud.po b/tde-i18n-zh_CN/messages/tdebase/tdesud.po
index 54c31dca325..229cfd3c522 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdesud.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdesud.po
@@ -6,24 +6,25 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdesud\n"
-"POT-Creation-Date: 2005-07-23 01:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2001-02-08 14:00+0800\n"
 "Last-Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.marsec.net>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
 
-#: tdesud.cpp:251
+#: tdesud.cpp:254
 msgid "TDE su daemon"
 msgstr "TDE su 守护程序"
 
-#: tdesud.cpp:252
+#: tdesud.cpp:255
 msgid "Daemon used by tdesu"
 msgstr "tdesu所使用的守护程序"
 
-#: tdesud.cpp:255
+#: tdesud.cpp:258
 msgid "Author"
 msgstr "作者"
 
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdmconfig.po b/tde-i18n-zh_CN/messages/tdebase/tdmconfig.po
index 6d18a1b6acc..f86fef4f935 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdmconfig.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdmconfig.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2007-11-17 01:14+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-08-24 01:54+0800\n"
 "Last-Translator: redarmy <redarmy@linuxaid.com.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,11 +29,11 @@ msgstr ""
 "如果选中此选项，TDM 将为背景使用下面的设置。如果禁用的话，您必须自己处理背景。自己设置背景可以在 tdmrc 中的 Setup= "
 "选项指定的脚本中运行某些程序(可能是 xsetroot)。"
 
-#: tdm-appear.cpp:71
+#: tdm-appear.cpp:77
 msgid "&Greeting:"
 msgstr "欢迎辞(&G)："
 
-#: tdm-appear.cpp:76
+#: tdm-appear.cpp:82
 msgid ""
 "This is the \"headline\" for TDM's login window. You may want to put some nice "
 "greeting or information about the operating system here."
@@ -60,117 +61,156 @@ msgstr ""
 "<li>%m -> 机器(硬件)类型</li>"
 "<li>%% -> 百分号自身</li></ul>"
 
-#: tdm-appear.cpp:95
+#: tdm-appear.cpp:101
 msgid "Logo area:"
 msgstr "标志区域："
 
-#: tdm-appear.cpp:99
+#: tdm-appear.cpp:105
 msgid ""
 "_: logo area\n"
 "&None"
 msgstr "无(&N)"
 
-#: tdm-appear.cpp:100
+#: tdm-appear.cpp:106
 msgid "Show cloc&k"
 msgstr "显示时钟(&K)"
 
-#: tdm-appear.cpp:101
+#: tdm-appear.cpp:107
 msgid "Sho&w logo"
 msgstr "显示标志(&W)"
 
-#: tdm-appear.cpp:113
+#: tdm-appear.cpp:119
 msgid ""
 "You can choose to display a custom logo (see below), a clock or no logo at all."
 msgstr "您可以选择显示自定义的标志(见下面)、时钟或什么都没有。"
 
-#: tdm-appear.cpp:119
+#: tdm-appear.cpp:125
 msgid "&Logo:"
 msgstr "标志(&L)："
 
-#: tdm-appear.cpp:129
+#: tdm-appear.cpp:135
 msgid ""
 "Click here to choose an image that TDM will display. You can also drag and drop "
 "an image onto this button (e.g. from Konqueror)."
 msgstr "单击这里选择 TDM 将显示的图像。您可以将图像拖放到这个按钮上(例如从 Konqeuror)。"
 
-#: tdm-appear.cpp:141
+#: tdm-appear.cpp:147
 msgid "Position:"
 msgstr "位置："
 
-#: tdm-appear.cpp:144
+#: tdm-appear.cpp:150
 msgid "&X:"
 msgstr "&X："
 
-#: tdm-appear.cpp:151
+#: tdm-appear.cpp:157
 msgid "&Y:"
 msgstr "&Y："
 
-#: tdm-appear.cpp:158
+#: tdm-appear.cpp:164
 msgid ""
 "Here you specify the relative coordinates (in percent) of the login dialog's "
 "<em>center</em>."
 msgstr "您可以在此这里指定登录对话框<em>中心</em>的相对坐标(百分比)。"
 
-#: tdm-appear.cpp:173 tdm-appear.cpp:186 tdm-users.cpp:84
+#: tdm-appear.cpp:179
+msgid "None"
+msgstr ""
+
+#: tdm-appear.cpp:180
+msgid "Trinity compositor"
+msgstr ""
+
+#: tdm-appear.cpp:181
+#, fuzzy
+msgid "Compositor:"
+msgstr "位置："
+
+#: tdm-appear.cpp:185
+msgid ""
+"Choose a compositor to be used in TDM.  Note that the chosen compositor will "
+"continue to run after login."
+msgstr ""
+
+#: tdm-appear.cpp:190 tdm-appear.cpp:203 tdm-users.cpp:84
 msgid "<default>"
 msgstr "<默认>"
 
-#: tdm-appear.cpp:176
+#: tdm-appear.cpp:193
 msgid "GUI s&tyle:"
 msgstr "GUI 风格(&T)："
 
-#: tdm-appear.cpp:180
+#: tdm-appear.cpp:197
 msgid "You can choose a basic GUI style here that will be used by TDM only."
 msgstr "您可以选择仅被 TDM 使用的基本的图形用户界面风格。"
 
-#: tdm-appear.cpp:189
+#: tdm-appear.cpp:206
 msgid "&Color scheme:"
 msgstr "配色方案(&C)："
 
-#: tdm-appear.cpp:193
+#: tdm-appear.cpp:210
 msgid "You can choose a basic Color Scheme here that will be used by TDM only."
 msgstr "您可以选择仅被 TDM 使用的基本的配色方案。"
 
-#: tdm-appear.cpp:199
+#: tdm-appear.cpp:216
 msgid "No Echo"
 msgstr "不回显"
 
-#: tdm-appear.cpp:200
+#: tdm-appear.cpp:217
 msgid "One Star"
 msgstr "一个星号"
 
-#: tdm-appear.cpp:201
+#: tdm-appear.cpp:218
 msgid "Three Stars"
 msgstr "三个星号"
 
-#: tdm-appear.cpp:202
+#: tdm-appear.cpp:219
 msgid "Echo &mode:"
 msgstr "回显模式(&M)："
 
-#: tdm-appear.cpp:206
+#: tdm-appear.cpp:223
 msgid ""
 "You can choose whether and how TDM shows your password when you type it."
 msgstr "您可以选择 TDM 是否和怎样显示您输入的密码。"
 
-#: tdm-appear.cpp:212
+#: tdm-appear.cpp:229
 msgid "Locale"
 msgstr "语系"
 
-#: tdm-appear.cpp:218
+#: tdm-appear.cpp:235
 msgid "Languag&e:"
 msgstr "语言(&E)："
 
-#: tdm-appear.cpp:223
+#: tdm-appear.cpp:240
 msgid ""
 "Here you can choose the language used by TDM. This setting does not affect a "
 "user's personal settings; that will take effect after login."
 msgstr "您可以在此选择 TDM 使用的语言。此设置不会影响在登录后生效的用户的个人设置。"
 
-#: tdm-appear.cpp:264
+#: tdm-appear.cpp:247
+msgid "Secure Attention Key"
+msgstr ""
+
+#: tdm-appear.cpp:250
+msgid "Enable Secure Attention Key"
+msgstr ""
+
+#: tdm-appear.cpp:258
+msgid ""
+"Secure Attention Key support is not available on your system.  Please check for "
+"the presence of evdev and uinput."
+msgstr ""
+
+#: tdm-appear.cpp:262
+msgid ""
+"Here you can enable or disable the Secure Attention Key [SAK] anti-spoofing "
+"measure."
+msgstr ""
+
+#: tdm-appear.cpp:303
 msgid "without name"
 msgstr "没有名称"
 
-#: tdm-appear.cpp:405
+#: tdm-appear.cpp:444
 msgid ""
 "There was an error loading the image:\n"
 "%1\n"
@@ -180,12 +220,12 @@ msgstr ""
 "%1\n"
 "它不会被保存。"
 
-#: tdm-appear.cpp:445 tdm-appear.cpp:488
-#, c-format
-msgid "Welcome to %s at %n"
+#: tdm-appear.cpp:506 tdm-appear.cpp:561
+#, fuzzy, c-format
+msgid "Welcome to %n"
 msgstr "欢迎访问 %s %n"
 
-#: tdm-appear.cpp:504
+#: tdm-appear.cpp:578
 msgid ""
 "<h1>TDM - Appearance</h1> Here you can configure the basic appearance of the "
 "TDM login manager, i.e. a greeting string, an icon etc."
@@ -232,31 +272,31 @@ msgid ""
 "antialiased (smoothed) in the login dialog."
 msgstr "如果您使用该选项，且您的 X 服务器支持 Xft 扩展，在登录对话框中将使用平滑字体。"
 
-#: tdm-shut.cpp:49
+#: tdm-shut.cpp:48
 msgid "Allow Shutdown"
 msgstr "允许关机"
 
-#: tdm-shut.cpp:52
+#: tdm-shut.cpp:51
 msgid "&Local:"
 msgstr "本地(&L)："
 
-#: tdm-shut.cpp:53 tdm-shut.cpp:59
+#: tdm-shut.cpp:52 tdm-shut.cpp:58
 msgid "Everybody"
 msgstr "任何人"
 
-#: tdm-shut.cpp:54 tdm-shut.cpp:60
+#: tdm-shut.cpp:53 tdm-shut.cpp:59
 msgid "Only Root"
 msgstr "仅 Root"
 
-#: tdm-shut.cpp:55 tdm-shut.cpp:61
+#: tdm-shut.cpp:54 tdm-shut.cpp:60
 msgid "Nobody"
 msgstr "无人"
 
-#: tdm-shut.cpp:58
+#: tdm-shut.cpp:57
 msgid "&Remote:"
 msgstr "远程(&R)："
 
-#: tdm-shut.cpp:63
+#: tdm-shut.cpp:62
 msgid ""
 "Here you can select who is allowed to shutdown the computer using TDM. You can "
 "specify different values for local (console) and remote displays. Possible "
@@ -273,48 +313,60 @@ msgstr ""
 "<li><em>仅 root：</em>TDM 只有在用户输入 root 用户密码后才允许关机</li>"
 "<li><em>无人：</em>没有人能够使用 TDM 来关机</li></ul>"
 
-#: tdm-shut.cpp:71
+#: tdm-shut.cpp:70
 msgid "Commands"
 msgstr "命令"
 
-#: tdm-shut.cpp:74
+#: tdm-shut.cpp:73
 msgid "H&alt:"
 msgstr "关闭系统(&A)："
 
-#: tdm-shut.cpp:77
+#: tdm-shut.cpp:76
 msgid "Command to initiate the system halt. Typical value: /sbin/halt"
 msgstr "关机的命令。一般在：/sbin/halt"
 
-#: tdm-shut.cpp:82
+#: tdm-shut.cpp:81
 msgid "Reb&oot:"
 msgstr "重新启动(&O)："
 
-#: tdm-shut.cpp:85
+#: tdm-shut.cpp:84
 msgid "Command to initiate the system reboot. Typical value: /sbin/reboot"
 msgstr "系统重新启动的命令。一般在：/sbin/reboot"
 
-#: tdm-shut.cpp:93
+#: tdm-shut.cpp:92
 msgid ""
 "_: boot manager\n"
 "None"
 msgstr "无"
 
-#: tdm-shut.cpp:94
+#: tdm-shut.cpp:93
 msgid "Grub"
 msgstr "Grub"
 
-#: tdm-shut.cpp:96
+#: tdm-shut.cpp:95
 msgid "Lilo"
 msgstr "Lilo"
 
-#: tdm-shut.cpp:98
+#: tdm-shut.cpp:97
 msgid "Boot manager:"
 msgstr "启动管理器："
 
-#: tdm-shut.cpp:100
+#: tdm-shut.cpp:99
 msgid "Enable boot options in the \"Shutdown...\" dialog."
 msgstr "在“关机...”对话框里启用启动选项。"
 
+#: tdm-shut.cpp:103
+msgid "Restart X-Server with session exit"
+msgstr ""
+
+#: tdm-shut.cpp:105
+msgid ""
+"Whether the login manager should restart the local X-Server after a session "
+"exit instead of resetting. Use this option when the X-Server leaks memory, "
+"crashes the system on reset attempts, or otherwise exhibits display issues or "
+"artifacts."
+msgstr ""
+
 #: tdm-users.cpp:81
 #, c-format
 msgid "Unable to create folder %1"
@@ -663,6 +715,16 @@ msgstr ""
 "当该选项打开时，当会话因为 X 服务器崩溃而中断后，用户将自动登录；注意，这个选项可能导致安全漏洞：如果你使用另外的屏幕锁定程序，而不是 TDE "
 "集成的，这个选项使绕过密码保护的屏幕锁定程序成为可能。"
 
+#: tdm-conv.cpp:157
+msgid "Allow &Root Login"
+msgstr ""
+
+#: tdm-conv.cpp:158
+msgid ""
+"When set this allows root logins directly in TDM. This is discouraged by some "
+"people. Use with caution."
+msgstr ""
+
 #: main.cpp:67
 msgid ""
 "%1 does not appear to be an image file.\n"
@@ -731,27 +793,27 @@ msgstr ""
 "<h2>便利</h2>您可以指定以某个用户身份自动登录，用户不需要输入密码即可登录；还有其它为懒人准备的其它特性。 "
 "<br>注意，这些设置从根本上说是安全漏洞，所以请小心使用。"
 
-#: main.cpp:186
+#: main.cpp:192
 msgid "A&ppearance"
 msgstr "外观(&P)"
 
-#: main.cpp:190
+#: main.cpp:196
 msgid "&Font"
 msgstr "字体(&F)"
 
-#: main.cpp:194
+#: main.cpp:200
 msgid "&Background"
 msgstr "背景(&B)"
 
-#: main.cpp:198
+#: main.cpp:204
 msgid "&Shutdown"
 msgstr "关机(&S)"
 
-#: main.cpp:202
+#: main.cpp:208
 msgid "&Users"
 msgstr "用户(&U)"
 
-#: main.cpp:210
+#: main.cpp:216
 msgid "Con&venience"
 msgstr "便利(&V)"
 
diff --git a/tde-i18n-zh_CN/messages/tdebase/tdmgreet.po b/tde-i18n-zh_CN/messages/tdebase/tdmgreet.po
index f3864855cb9..9c693169882 100644
--- a/tde-i18n-zh_CN/messages/tdebase/tdmgreet.po
+++ b/tde-i18n-zh_CN/messages/tdebase/tdmgreet.po
@@ -8,113 +8,30 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdmgreet\n"
-"POT-Creation-Date: 2007-12-08 01:14+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Translator: Gou Zhuang <gouzhuang@bigfoot.com>\n"
 "X-Generator: KBabel 1.3\n"
 
-#: tdmconfig.cpp:139
-msgid "[fix tdmrc!]"
-msgstr "[修补 tdmrc！]"
-
-#: tdmconfig.cpp:154
-msgid ""
-"_n: %1: TTY login\n"
-"%1: %n TTY logins"
-msgstr "%1：%n 次 TTY 登录"
-
-#: tdmconfig.cpp:165
-msgid "Unused"
-msgstr "未用"
-
-#: tdmconfig.cpp:167
-msgid ""
-"_: user: session type\n"
-"%1: %2"
-msgstr "%1：%2"
-
-#: tdmconfig.cpp:169
-#, c-format
-msgid ""
-"_: ... host\n"
-"X login on %1"
-msgstr "%1 上的 X 登录"
-
-#: krootimage.cpp:37
-msgid "Fancy desktop background for tdm"
-msgstr "tdm 的梦幻桌面背景"
-
-#: krootimage.cpp:42
-msgid "Name of the configuration file"
-msgstr "配置文件名称"
-
-#: krootimage.cpp:103
-msgid "KRootImage"
-msgstr "KRootImage"
-
-#: kchooser.cpp:57
-msgid "&Local Login"
-msgstr "本地登录(&L)"
-
-#: kchooser.cpp:61
-msgid "XDMCP Host Menu"
-msgstr "XDMCP 主机菜单"
-
-#: kchooser.cpp:66
-msgid "Hostname"
-msgstr "主机名"
-
-#: kchooser.cpp:68
-msgid "Status"
-msgstr "状态"
-
-#: kchooser.cpp:76
-msgid "Hos&t:"
-msgstr "主机(&T)："
-
-#: kchooser.cpp:77
-msgid "A&dd"
-msgstr "添加(&D)"
-
-#: kchooser.cpp:85
-msgid "&Accept"
-msgstr "接受(&A)"
-
-#: kchooser.cpp:87
-msgid "&Refresh"
-msgstr "刷新(&R)"
-
-#: kchooser.cpp:95 kgreeter.cpp:694
-msgid "&Menu"
-msgstr "菜单(&M)"
-
-#: kchooser.cpp:177
-msgid "<unknown>"
-msgstr "<未知>"
-
-#: kchooser.cpp:215
-#, c-format
-msgid "Unknown host %1"
-msgstr "未知的主机 %1"
-
-#: kgreeter.cpp:395
+#: kgreeter.cpp:595
 msgid "Custom"
 msgstr "自定义"
 
-#: kgreeter.cpp:396
+#: kgreeter.cpp:596
 msgid "Failsafe"
 msgstr "安全模式"
 
-#: kgreeter.cpp:470
+#: kgreeter.cpp:671
 msgid " (previous)"
 msgstr " (前一个)"
 
-#: kgreeter.cpp:529
+#: kgreeter.cpp:742
 msgid ""
 "Your saved session type '%1' is not valid any more.\n"
 "Please select a new one, otherwise 'default' will be used."
@@ -122,11 +39,11 @@ msgstr ""
 "你保存的“%1”会话类型不再有效。\n"
 "请选择一个新的类型，否则将使用“默认”。"
 
-#: kgreeter.cpp:636
+#: kgreeter.cpp:851
 msgid "Warning: this is an unsecured session"
 msgstr "警告：这是不安全的会话"
 
-#: kgreeter.cpp:638
+#: kgreeter.cpp:853
 msgid ""
 "This display requires no X authorization.\n"
 "This means that anybody can connect to it,\n"
@@ -136,288 +53,289 @@ msgstr ""
 "这意味着任何人都可以连接、\n"
 "在其中打开窗口或解释您的输入。"
 
-#: kgreeter.cpp:691
+#: kgreeter.cpp:916
 msgid "L&ogin"
 msgstr "登录(&O)"
 
-#: kgreeter.cpp:724 kgreeter.cpp:865
+#: kchooser.cpp:95 kgreeter.cpp:919
+msgid "&Menu"
+msgstr "菜单(&M)"
+
+#: kgreeter.cpp:949 kgreeter.cpp:1092
 msgid "Session &Type"
 msgstr "会话类型(&T)"
 
-#: kgreeter.cpp:729 kgreeter.cpp:871
+#: kgreeter.cpp:954 kgreeter.cpp:1104
 msgid "&Authentication Method"
 msgstr "认证方式(&A)"
 
-#: kgreeter.cpp:734 kgreeter.cpp:876
+#: kgreeter.cpp:959 kgreeter.cpp:1109
 msgid "&Remote Login"
 msgstr "远程登录(&R)"
 
-#: kgreeter.cpp:812
+#: kgreeter.cpp:1040
 msgid "Login Failed."
 msgstr "登录失败。"
 
-#: kconsole.cpp:75
-msgid "Cannot open console"
-msgstr "无法打开控制台"
+#: themer/tdmthemer.cpp:71
+#, c-format
+msgid "Cannot open theme file %1"
+msgstr "无法打开主题文件 %1"
 
-#: kconsole.cpp:159
-msgid ""
-"\n"
-"*** Cannot open console log source ***"
-msgstr ""
-"\n"
-"*** 无法打开终端日志源 ***"
+#: themer/tdmthemer.cpp:75
+#, c-format
+msgid "Cannot parse theme file %1"
+msgstr "无法分析主题文件 %1"
 
-#: kgdialog.cpp:61
-msgid "Sw&itch User"
-msgstr "切换用户(&I)"
+#: themer/tdmlabel.cpp:214
+msgid "Language"
+msgstr "语言"
 
-#: kgdialog.cpp:73
-msgid "R&estart X Server"
-msgstr "重启 X 服务器(&E)"
+#: themer/tdmlabel.cpp:215
+msgid "Session Type"
+msgstr "会话类型"
 
-#: kgdialog.cpp:73
-msgid "Clos&e Connection"
-msgstr "关闭连接(&E)"
+#: themer/tdmlabel.cpp:216
+msgid "Menu"
+msgstr "菜单"
 
-#: kgdialog.cpp:84
-msgid "Co&nsole Login"
-msgstr "控制台登录(&N)"
+#: themer/tdmlabel.cpp:217
+msgid "&Administration"
+msgstr ""
 
-#: kgdialog.cpp:87
-msgid "&Shutdown..."
-msgstr "关机(&S)..."
+#: themer/tdmlabel.cpp:218
+msgid "Disconnect"
+msgstr "断开连接"
 
-#: kgdialog.cpp:227
-msgid ""
-"_: session (location)\n"
-"%1 (%2)"
-msgstr "%1 (%2)"
+#: themer/tdmlabel.cpp:220
+#, fuzzy
+msgid "Power Off"
+msgstr "关机"
 
-#: kgverify.cpp:177
-msgid "No greeter widget plugin loaded. Check the configuration."
-msgstr "没有载入欢迎部件插件。请检查配置。"
+#: themer/tdmlabel.cpp:221
+msgid "Suspend"
+msgstr "挂起"
 
-#: kgverify.cpp:435
-msgid ""
-"Authenticating %1...\n"
-"\n"
-msgstr ""
-"%1 认证中...\n"
-"\n"
+#: themer/tdmlabel.cpp:222
+msgid "Reboot"
+msgstr "重新启动"
 
-#: kgverify.cpp:439
-msgid "You are required to change your password immediately (password aged)."
-msgstr "你被要求立即修改你的密码 (密码过期)。"
+#: themer/tdmlabel.cpp:223
+msgid "XDMCP Chooser"
+msgstr "XDMCP 选择器"
 
-#: kgverify.cpp:440
-msgid "You are required to change your password immediately (root enforced)."
-msgstr "你被要求立即修改你的密码(管理员强制执行)。"
+#: themer/tdmlabel.cpp:225
+msgid "Caps Lock is enabled."
+msgstr ""
 
-#: kgverify.cpp:441
-msgid "You are not allowed to login at the moment."
-msgstr "您不被允许在此时登录。"
+#: themer/tdmlabel.cpp:226
+#, c-format
+msgid "User %s will login in %d seconds"
+msgstr "用户 %s 将在 %d 秒后登录"
 
-#: kgverify.cpp:442
-msgid "Home folder not available."
-msgstr "主文件夹不可用。"
+#: themer/tdmlabel.cpp:227
+#, c-format
+msgid "Welcome to %h"
+msgstr "欢迎来到 %h"
 
-#: kgverify.cpp:443
-msgid ""
-"Logins are not allowed at the moment.\n"
-"Try again later."
-msgstr ""
-"这个时间不允许登录。\n"
-"稍后再试。"
+#: themer/tdmlabel.cpp:228
+msgid "Username:"
+msgstr "用户名："
 
-#: kgverify.cpp:444
-msgid "Your login shell is not listed in /etc/shells."
-msgstr "您的登录 shell 没有列在 /etc/shells 中。"
+#: themer/tdmlabel.cpp:229
+msgid "Password:"
+msgstr "密码："
 
-#: kgverify.cpp:445
-msgid "Root logins are not allowed."
-msgstr "不允许 Root 登录。"
+#: themer/tdmlabel.cpp:230
+msgid "Domain:"
+msgstr ""
 
-#: kgverify.cpp:446
-msgid "Your account has expired; please contact your system administrator."
-msgstr "您的账户已过期；请联系您的系统管理员。"
+#: themer/tdmlabel.cpp:231
+msgid "Login"
+msgstr "登录"
 
-#: kgverify.cpp:456
+#: themer/tdmlabel.cpp:270
+#, no-c-format
 msgid ""
-"A critical error occurred.\n"
-"Please look at TDM's logfile(s) for more information\n"
-"or contact your system administrator."
-msgstr ""
-"出现了严重错误。\n"
-"请查看 TDM 的日志文件获得更多信息\n"
-"或联系系统管理员。"
+"_: date format\n"
+"%a %d %B"
+msgstr "%Y年%m月%d日"
 
-#: kgverify.cpp:482
-#, c-format
-msgid ""
-"_n: Your account expires tomorrow.\n"
-"Your account expires in %n days."
-msgstr "您的账户将于 %n 天后过期。"
+#: krootimage.cpp:38
+msgid "Fancy desktop background for tdm"
+msgstr "tdm 的梦幻桌面背景"
 
-#: kgverify.cpp:483
-msgid "Your account expires today."
-msgstr "您的账户今天过期。"
+#: krootimage.cpp:43
+msgid "Name of the configuration file"
+msgstr "配置文件名称"
 
-#: kgverify.cpp:490
-#, c-format
-msgid ""
-"_n: Your password expires tomorrow.\n"
-"Your password expires in %n days."
-msgstr "您的密码将于 %n 天后过期。"
+#: krootimage.cpp:121
+msgid "KRootImage"
+msgstr "KRootImage"
 
-#: kgverify.cpp:491
-msgid "Your password expires today."
-msgstr "您的密码今天过期。"
+#: kchooser.cpp:57
+msgid "&Local Login"
+msgstr "本地登录(&L)"
 
-#: kgverify.cpp:558 kgverify.cpp:1005
-msgid "Authentication failed"
-msgstr "认证失败"
+#: kchooser.cpp:61
+msgid "XDMCP Host Menu"
+msgstr "XDMCP 主机菜单"
 
-#: kgverify.cpp:695
-msgid ""
-"Authenticated user (%1) does not match requested user (%2).\n"
-msgstr ""
-"已认证用户 %1 和要求的用户 (%2)不匹配。\n"
+#: kchooser.cpp:66
+msgid "Hostname"
+msgstr "主机名"
 
-#: kgverify.cpp:988
-#, c-format
-msgid ""
-"_n: Automatic login in 1 second...\n"
-"Automatic login in %n seconds..."
-msgstr "即将于 %n 秒内自动登录..."
+#: kchooser.cpp:68
+msgid "Status"
+msgstr "状态"
 
-#: kgverify.cpp:997
-msgid "Warning: Caps Lock on"
-msgstr "警告：大写锁定"
+#: kchooser.cpp:76
+msgid "Hos&t:"
+msgstr "主机(&T)："
 
-#: kgverify.cpp:1002
-msgid "Change failed"
-msgstr "更改失败"
+#: kchooser.cpp:77
+msgid "A&dd"
+msgstr "添加(&D)"
 
-#: kgverify.cpp:1004
-msgid "Login failed"
-msgstr "登录失败"
+#: kchooser.cpp:85
+msgid "&Accept"
+msgstr "接受(&A)"
 
-#: kgverify.cpp:1038
-msgid "Theme not usable with authentication method '%1'."
-msgstr "使用身份验证方式“%1”时无法使用主题。"
+#: kchooser.cpp:87
+msgid "&Refresh"
+msgstr "刷新(&R)"
 
-#: kgverify.cpp:1093
-msgid "Changing authentication token"
-msgstr "更改认证标记"
+#: kchooser.cpp:177
+msgid "<unknown>"
+msgstr "<未知>"
 
-#: tdmshutdown.cpp:92
+#: kchooser.cpp:215
+#, c-format
+msgid "Unknown host %1"
+msgstr "未知的主机 %1"
+
+#: tdmshutdown.cpp:97
 msgid "Root authorization required."
 msgstr "需要 Root 身份验证。"
 
-#: tdmshutdown.cpp:123 tdmshutdown.cpp:516
+#: tdmshutdown.cpp:128 tdmshutdown.cpp:602
 msgid "&Schedule..."
 msgstr "安排(&S)..."
 
-#: tdmshutdown.cpp:246
+#: tdmshutdown.cpp:247 tdmshutdown.cpp:473
+#, fuzzy
+msgid "Shutdown TDE"
+msgstr "关机类型"
+
+#: tdmshutdown.cpp:253
 msgid "Shutdown Type"
 msgstr "关机类型"
 
-#: tdmshutdown.cpp:250
+#: tdmshutdown.cpp:257
 msgid "&Turn off computer"
 msgstr "关闭计算机(&T)"
 
-#: tdmshutdown.cpp:254
+#: tdmshutdown.cpp:261
 msgid "&Restart computer"
 msgstr "重启计算机(&R)"
 
-#: tdmshutdown.cpp:282
+#: tdmshutdown.cpp:289
 msgid "Scheduling"
 msgstr "安排"
 
-#: tdmshutdown.cpp:286
+#: tdmshutdown.cpp:293
 msgid "&Start:"
 msgstr "开始(&S)："
 
-#: tdmshutdown.cpp:289
+#: tdmshutdown.cpp:296
 msgid "T&imeout:"
 msgstr "超时(&I)："
 
-#: tdmshutdown.cpp:291
+#: tdmshutdown.cpp:298
 msgid "&Force after timeout"
 msgstr "超时后强制(&F)"
 
-#: tdmshutdown.cpp:340
+#: tdmshutdown.cpp:347
 msgid "Entered start date is invalid."
 msgstr "输入的开始日期无效。"
 
-#: tdmshutdown.cpp:349
+#: tdmshutdown.cpp:356
 msgid "Entered timeout date is invalid."
 msgstr "输入的超时日期无效。"
 
-#: tdmshutdown.cpp:482
-msgid "&Turn Off Computer"
-msgstr "关闭计算机(&T)"
-
-#: tdmshutdown.cpp:489
-msgid "&Restart Computer"
-msgstr "重启计算机(&R)"
+#: tdmshutdown.cpp:501
+#, fuzzy
+msgid "&Restart"
+msgstr "开始(&S)："
 
-#: tdmshutdown.cpp:504
+#: tdmshutdown.cpp:521 tdmshutdown.cpp:590
 msgid ""
 "_: current option in boot loader\n"
 "%1 (current)"
 msgstr "%1 (当前)"
 
-#: tdmshutdown.cpp:608
+#: tdmshutdown.cpp:532
+#, fuzzy
+msgid "&Turn Off"
+msgstr "关闭计算机(&T)"
+
+#: tdmshutdown.cpp:568
+msgid "&Turn Off Computer"
+msgstr "关闭计算机(&T)"
+
+#: tdmshutdown.cpp:575
+msgid "&Restart Computer"
+msgstr "重启计算机(&R)"
+
+#: tdmshutdown.cpp:819
 msgid "Turn Off Computer"
 msgstr "关闭计算机"
 
-#: tdmshutdown.cpp:611
+#: tdmshutdown.cpp:822
 msgid "Switch to Console"
 msgstr "切换到控制台"
 
-#: tdmshutdown.cpp:613
+#: tdmshutdown.cpp:824
 msgid "Restart Computer"
 msgstr "重启计算机"
 
-#: tdmshutdown.cpp:615
+#: tdmshutdown.cpp:826
 msgid "<br>(Next boot: %1)"
 msgstr "<br>(下次启动：%1)"
 
-#: tdmshutdown.cpp:627
+#: tdmshutdown.cpp:838
 msgid "Abort active sessions:"
 msgstr "中断当前会话："
 
-#: tdmshutdown.cpp:628
+#: tdmshutdown.cpp:839
 msgid "No permission to abort active sessions:"
 msgstr "无权中断当前会话："
 
-#: tdmshutdown.cpp:635
+#: tdmshutdown.cpp:846
 msgid "Session"
 msgstr "会话"
 
-#: tdmshutdown.cpp:636
+#: tdmshutdown.cpp:847
 msgid "Location"
 msgstr "位置"
 
-#: tdmshutdown.cpp:667
+#: tdmshutdown.cpp:878
 msgid "Abort pending shutdown:"
 msgstr "中断推迟的关机："
 
-#: tdmshutdown.cpp:668
+#: tdmshutdown.cpp:879
 msgid "No permission to abort pending shutdown:"
 msgstr "无权中断推迟的关机："
 
-#: tdmshutdown.cpp:674
+#: tdmshutdown.cpp:885
 msgid "now"
 msgstr "立即"
 
-#: tdmshutdown.cpp:680
+#: tdmshutdown.cpp:891
 msgid "infinite"
 msgstr "无穷"
 
-#: tdmshutdown.cpp:686
+#: tdmshutdown.cpp:897
 msgid ""
 "Owner: %1\n"
 "Type: %2%5\n"
@@ -429,23 +347,23 @@ msgstr ""
 "开始：%3\n"
 "超时：%4"
 
-#: tdmshutdown.cpp:691
+#: tdmshutdown.cpp:902
 msgid "console user"
 msgstr "控制台用户"
 
-#: tdmshutdown.cpp:693
+#: tdmshutdown.cpp:904
 msgid "control socket"
 msgstr "控制台套接字"
 
-#: tdmshutdown.cpp:696
+#: tdmshutdown.cpp:907
 msgid "turn off computer"
 msgstr "关闭计算机"
 
-#: tdmshutdown.cpp:697
+#: tdmshutdown.cpp:908
 msgid "restart computer"
 msgstr "重启计算机"
 
-#: tdmshutdown.cpp:700
+#: tdmshutdown.cpp:911
 #, c-format
 msgid ""
 "\n"
@@ -454,7 +372,7 @@ msgstr ""
 "\n"
 "下次启动：%1"
 
-#: tdmshutdown.cpp:703
+#: tdmshutdown.cpp:914
 #, c-format
 msgid ""
 "\n"
@@ -463,89 +381,203 @@ msgstr ""
 "\n"
 "超时后：%1"
 
-#: tdmshutdown.cpp:705
+#: tdmshutdown.cpp:916
 msgid "abort all sessions"
 msgstr "中断全部会话"
 
-#: tdmshutdown.cpp:707
+#: tdmshutdown.cpp:918
 msgid "abort own sessions"
 msgstr "中断所属会话"
 
-#: tdmshutdown.cpp:708
+#: tdmshutdown.cpp:919
 msgid "cancel shutdown"
 msgstr "取消关机"
 
-#: themer/tdmlabel.cpp:170
-msgid "Language"
-msgstr "语言"
+#: kgverify.cpp:177
+msgid "No greeter widget plugin loaded. Check the configuration."
+msgstr "没有载入欢迎部件插件。请检查配置。"
 
-#: themer/tdmlabel.cpp:171
-msgid "Session Type"
-msgstr "会话类型"
+#: kgverify.cpp:442
+msgid ""
+"Authenticating %1...\n"
+"\n"
+msgstr ""
+"%1 认证中...\n"
+"\n"
 
-#: themer/tdmlabel.cpp:172
-msgid "Menu"
-msgstr "菜单"
+#: kgverify.cpp:446
+msgid "You are required to change your password immediately (password aged)."
+msgstr "你被要求立即修改你的密码 (密码过期)。"
 
-#: themer/tdmlabel.cpp:173
-msgid "Disconnect"
-msgstr "断开连接"
+#: kgverify.cpp:447
+msgid "You are required to change your password immediately (root enforced)."
+msgstr "你被要求立即修改你的密码(管理员强制执行)。"
 
-#: themer/tdmlabel.cpp:175
-msgid "Power off"
-msgstr "关机"
+#: kgverify.cpp:448
+msgid "You are not allowed to login at the moment."
+msgstr "您不被允许在此时登录。"
 
-#: themer/tdmlabel.cpp:176
-msgid "Suspend"
-msgstr "挂起"
+#: kgverify.cpp:449
+msgid "Home folder not available."
+msgstr "主文件夹不可用。"
 
-#: themer/tdmlabel.cpp:177
-msgid "Reboot"
-msgstr "重新启动"
+#: kgverify.cpp:450
+msgid ""
+"Logins are not allowed at the moment.\n"
+"Try again later."
+msgstr ""
+"这个时间不允许登录。\n"
+"稍后再试。"
 
-#: themer/tdmlabel.cpp:178
-msgid "XDMCP Chooser"
-msgstr "XDMCP 选择器"
+#: kgverify.cpp:451
+msgid "Your login shell is not listed in /etc/shells."
+msgstr "您的登录 shell 没有列在 /etc/shells 中。"
 
-#: themer/tdmlabel.cpp:180
-msgid "You have got caps lock on."
-msgstr "您打开了 Caps Lock。"
+#: kgverify.cpp:452
+msgid "Root logins are not allowed."
+msgstr "不允许 Root 登录。"
 
-#: themer/tdmlabel.cpp:181
-#, c-format
-msgid "User %s will login in %d seconds"
-msgstr "用户 %s 将在 %d 秒后登录"
+#: kgverify.cpp:453
+msgid "Your account has expired; please contact your system administrator."
+msgstr "您的账户已过期；请联系您的系统管理员。"
+
+#: kgverify.cpp:463
+msgid ""
+"A critical error occurred.\n"
+"Please look at TDM's logfile(s) for more information\n"
+"or contact your system administrator."
+msgstr ""
+"出现了严重错误。\n"
+"请查看 TDM 的日志文件获得更多信息\n"
+"或联系系统管理员。"
 
-#: themer/tdmlabel.cpp:182
+#: kgverify.cpp:489
 #, c-format
-msgid "Welcome to %h"
-msgstr "欢迎来到 %h"
+msgid ""
+"_n: Your account expires tomorrow.\n"
+"Your account expires in %n days."
+msgstr "您的账户将于 %n 天后过期。"
 
-#: themer/tdmlabel.cpp:183
-msgid "Username:"
-msgstr "用户名："
+#: kgverify.cpp:490
+msgid "Your account expires today."
+msgstr "您的账户今天过期。"
 
-#: themer/tdmlabel.cpp:184
-msgid "Password:"
-msgstr "密码："
+#: kgverify.cpp:497
+#, c-format
+msgid ""
+"_n: Your password expires tomorrow.\n"
+"Your password expires in %n days."
+msgstr "您的密码将于 %n 天后过期。"
 
-#: themer/tdmlabel.cpp:185
-msgid "Login"
-msgstr "登录"
+#: kgverify.cpp:498
+msgid "Your password expires today."
+msgstr "您的密码今天过期。"
 
-#: themer/tdmlabel.cpp:225
-#, no-c-format
+#: kgverify.cpp:565 kgverify.cpp:1012
+msgid "Authentication failed"
+msgstr "认证失败"
+
+#: kgverify.cpp:702
 msgid ""
-"_: date format\n"
-"%a %d %B"
-msgstr "%Y年%m月%d日"
+"Authenticated user (%1) does not match requested user (%2).\n"
+msgstr ""
+"已认证用户 %1 和要求的用户 (%2)不匹配。\n"
 
-#: themer/tdmthemer.cpp:67
+#: kgverify.cpp:995
 #, c-format
-msgid "Cannot open theme file %1"
-msgstr "无法打开主题文件 %1"
+msgid ""
+"_n: Automatic login in 1 second...\n"
+"Automatic login in %n seconds..."
+msgstr "即将于 %n 秒内自动登录..."
 
-#: themer/tdmthemer.cpp:71
+#: kgverify.cpp:1004
+msgid "Warning: Caps Lock on"
+msgstr "警告：大写锁定"
+
+#: kgverify.cpp:1009
+msgid "Change failed"
+msgstr "更改失败"
+
+#: kgverify.cpp:1011
+msgid "Login failed"
+msgstr "登录失败"
+
+#: kgverify.cpp:1045
+msgid "Theme not usable with authentication method '%1'."
+msgstr "使用身份验证方式“%1”时无法使用主题。"
+
+#: kgverify.cpp:1100
+msgid "Changing authentication token"
+msgstr "更改认证标记"
+
+#: kfdialog.cpp:167
+msgid "Question"
+msgstr ""
+
+#: tdmconfig.cpp:141
+msgid "[fix tdmrc!]"
+msgstr "[修补 tdmrc！]"
+
+#: tdmconfig.cpp:156
+msgid ""
+"_n: %1: TTY login\n"
+"%1: %n TTY logins"
+msgstr "%1：%n 次 TTY 登录"
+
+#: tdmconfig.cpp:167
+msgid "Unused"
+msgstr "未用"
+
+#: tdmconfig.cpp:169
+msgid ""
+"_: user: session type\n"
+"%1: %2"
+msgstr "%1：%2"
+
+#: tdmconfig.cpp:171
 #, c-format
-msgid "Cannot parse theme file %1"
-msgstr "无法分析主题文件 %1"
+msgid ""
+"_: ... host\n"
+"X login on %1"
+msgstr "%1 上的 X 登录"
+
+#: kgdialog.cpp:62
+msgid "Sw&itch User"
+msgstr "切换用户(&I)"
+
+#: kgdialog.cpp:74
+msgid "R&estart X Server"
+msgstr "重启 X 服务器(&E)"
+
+#: kgdialog.cpp:74
+msgid "Clos&e Connection"
+msgstr "关闭连接(&E)"
+
+#: kgdialog.cpp:85
+msgid "Co&nsole Login"
+msgstr "控制台登录(&N)"
+
+#: kgdialog.cpp:89
+msgid "&Shutdown..."
+msgstr "关机(&S)..."
+
+#: kgdialog.cpp:229
+msgid ""
+"_: session (location)\n"
+"%1 (%2)"
+msgstr "%1 (%2)"
+
+#: kconsole.cpp:75
+msgid "Cannot open console"
+msgstr "无法打开控制台"
+
+#: kconsole.cpp:159
+msgid ""
+"\n"
+"*** Cannot open console log source ***"
+msgstr ""
+"\n"
+"*** 无法打开终端日志源 ***"
+
+#~ msgid "You have got caps lock on."
+#~ msgstr "您打开了 Caps Lock。"
diff --git a/tde-i18n-zh_CN/messages/tdebase/trashapplet.po b/tde-i18n-zh_CN/messages/tdebase/trashapplet.po
index ddcf898fafd..5bc13fa10d7 100644
--- a/tde-i18n-zh_CN/messages/tdebase/trashapplet.po
+++ b/tde-i18n-zh_CN/messages/tdebase/trashapplet.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: trashapplet\n"
-"POT-Creation-Date: 2005-09-27 02:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-01-03 10:12+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdebase/twin.po b/tde-i18n-zh_CN/messages/tdebase/twin.po
index 2bb6ac5c6f6..7857ea2a37a 100644
--- a/tde-i18n-zh_CN/messages/tdebase/twin.po
+++ b/tde-i18n-zh_CN/messages/tdebase/twin.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2008-03-10 01:27+0100\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,10 +30,82 @@ msgid ""
 "Your emails"
 msgstr "lark@linux.net.cn"
 
-#: activation.cpp:695
+#: activation.cpp:738
 msgid "Window '%1' demands attention."
 msgstr "窗口“%1”请求注意。"
 
+#: client.cpp:2004
+msgid "Suspended"
+msgstr ""
+
+#: 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:79
+#, fuzzy
+msgid "[twin] failure during initialization; aborting"
+msgstr "twin：在初始化时失败；中止"
+
+#: main.cpp:138 main.cpp:144 main.cpp:150
+#, fuzzy
+msgid ""
+"[twin] unable to claim manager selection, another wm running? (try using "
+"--replace)\n"
+msgstr ""
+"twin：无法声明窗口管理器选择，是否正在运行另外一种窗口管理器？(试着使用 --replace)\n"
+
+#: main.cpp:237
+msgid "TDE window manager"
+msgstr "TDE 窗口管理器"
+
+#: main.cpp:241
+msgid "Disable configuration options"
+msgstr "禁用配置选项"
+
+#: main.cpp:242
+msgid "Replace already-running ICCCM2.0-compliant window manager"
+msgstr "替换已经运行的 ICCCM2.0 兼容的窗口管理器"
+
+#: main.cpp:243
+msgid "Do not start composition manager"
+msgstr ""
+
+#: killer/killer.cpp:49 main.cpp:319
+msgid "TWin"
+msgstr ""
+
+#: main.cpp:321
+#, fuzzy
+msgid "(c) 1999-2005, The KDE Developers"
+msgstr "(C) 1999-2005，TDE 开发者"
+
+#: main.cpp:325
+msgid "Maintainer"
+msgstr "维护者"
+
+#: plugins.cpp:32
+#, fuzzy
+msgid "TWin: "
+msgstr "KWin："
+
+#: plugins.cpp:33
+#, fuzzy
+msgid ""
+"\n"
+"TWin will now exit..."
+msgstr ""
+"\n"
+"KWin 现在退出..."
+
+#: tabbox.cpp:53
+msgid "*** No Windows ***"
+msgstr "*** 没有窗口 ***"
+
 #: twinbindings.cpp:18
 msgid "System"
 msgstr "系统"
@@ -50,427 +123,469 @@ msgid "Walk Through Windows (Reverse)"
 msgstr "遍历窗口(反向)"
 
 #: twinbindings.cpp:23
+#, fuzzy
+msgid "Walk Through Windows of Same Application"
+msgstr "遍历窗口"
+
+#: twinbindings.cpp:24
+#, fuzzy
+msgid "Walk Through Windows of Same Application (Reverse)"
+msgstr "遍历窗口(反向)"
+
+#: twinbindings.cpp:25
 msgid "Walk Through Desktops"
 msgstr "遍历桌面"
 
-#: twinbindings.cpp:24
+#: twinbindings.cpp:26
 msgid "Walk Through Desktops (Reverse)"
 msgstr "遍历桌面(反向)"
 
-#: twinbindings.cpp:25
+#: twinbindings.cpp:27
 msgid "Walk Through Desktop List"
 msgstr "遍历桌面列表"
 
-#: twinbindings.cpp:26
+#: twinbindings.cpp:28
 msgid "Walk Through Desktop List (Reverse)"
 msgstr "遍历桌面列表(反向)"
 
-#: twinbindings.cpp:28
+#: twinbindings.cpp:30
 msgid "Windows"
 msgstr "窗口"
 
-#: twinbindings.cpp:29
+#: twinbindings.cpp:31
 msgid "Window Operations Menu"
 msgstr "窗口操作菜单"
 
-#: twinbindings.cpp:30
+#: twinbindings.cpp:32
 msgid "Close Window"
 msgstr "关闭窗口"
 
-#: twinbindings.cpp:32
+#: twinbindings.cpp:34
 msgid "Maximize Window"
 msgstr "最大化窗口"
 
-#: twinbindings.cpp:34
+#: twinbindings.cpp:36
 msgid "Maximize Window Vertically"
 msgstr "垂直最大化窗口"
 
-#: twinbindings.cpp:36
+#: twinbindings.cpp:38
 msgid "Maximize Window Horizontally"
 msgstr "水平最大化窗口"
 
-#: twinbindings.cpp:38
+#: twinbindings.cpp:40
 msgid "Minimize Window"
 msgstr "最小化窗口"
 
-#: twinbindings.cpp:40
+#: twinbindings.cpp:42
 msgid "Shade Window"
 msgstr "卷起窗口"
 
-#: twinbindings.cpp:42
+#: twinbindings.cpp:44
 msgid "Move Window"
 msgstr "移动窗口"
 
-#: twinbindings.cpp:44
+#: twinbindings.cpp:46
 msgid "Resize Window"
 msgstr "更改窗口大小"
 
-#: twinbindings.cpp:46
+#: twinbindings.cpp:48
 msgid "Raise Window"
 msgstr "升起窗口"
 
-#: twinbindings.cpp:48
+#: twinbindings.cpp:50
 msgid "Lower Window"
 msgstr "降低窗口"
 
-#: twinbindings.cpp:50
+#: twinbindings.cpp:52
 msgid "Toggle Window Raise/Lower"
 msgstr "窗口置前或置后"
 
-#: twinbindings.cpp:51
+#: twinbindings.cpp:53
 msgid "Make Window Fullscreen"
 msgstr "将窗口放至全屏"
 
-#: twinbindings.cpp:53
+#: twinbindings.cpp:55
 msgid "Hide Window Border"
 msgstr "隐藏窗口边框"
 
-#: twinbindings.cpp:55
+#: twinbindings.cpp:57
 msgid "Keep Window Above Others"
 msgstr "让窗口常居顶端"
 
-#: twinbindings.cpp:57
+#: twinbindings.cpp:59
 msgid "Keep Window Below Others"
 msgstr "让窗口常居底端"
 
-#: twinbindings.cpp:59
+#: twinbindings.cpp:61
 msgid "Activate Window Demanding Attention"
 msgstr "激活请求注意的窗口"
 
-#: twinbindings.cpp:60
+#: twinbindings.cpp:62
 msgid "Setup Window Shortcut"
 msgstr "设置窗口快捷键"
 
-#: twinbindings.cpp:61
+#: twinbindings.cpp:63
 msgid "Pack Window to the Right"
 msgstr "将窗口推至右侧"
 
-#: twinbindings.cpp:63
+#: twinbindings.cpp:65
 msgid "Pack Window to the Left"
 msgstr "将窗口推至左侧"
 
-#: twinbindings.cpp:65
+#: twinbindings.cpp:67
 msgid "Pack Window Up"
 msgstr "将窗口推至上侧"
 
-#: twinbindings.cpp:67
+#: twinbindings.cpp:69
 msgid "Pack Window Down"
 msgstr "将窗口推至下侧"
 
-#: twinbindings.cpp:69
+#: twinbindings.cpp:71
 msgid "Pack Grow Window Horizontally"
 msgstr "将窗口水平扩展"
 
-#: twinbindings.cpp:71
+#: twinbindings.cpp:73
 msgid "Pack Grow Window Vertically"
 msgstr "将窗口垂直扩展"
 
-#: twinbindings.cpp:73
+#: twinbindings.cpp:75
 msgid "Pack Shrink Window Horizontally"
 msgstr "将窗口水平收缩"
 
-#: twinbindings.cpp:75
+#: twinbindings.cpp:77
 msgid "Pack Shrink Window Vertically"
 msgstr "将窗口垂直收缩"
 
-#: twinbindings.cpp:78
+#: twinbindings.cpp:80
 msgid "Window & Desktop"
 msgstr "窗口和桌面"
 
-#: twinbindings.cpp:79
+#: twinbindings.cpp:81
 msgid "Keep Window on All Desktops"
 msgstr "将窗口放到全部桌面"
 
-#: twinbindings.cpp:81
+#: twinbindings.cpp:83
 msgid "Window to Desktop 1"
 msgstr "窗口到桌面 1"
 
-#: twinbindings.cpp:82
+#: twinbindings.cpp:84
 msgid "Window to Desktop 2"
 msgstr "窗口到桌面 2"
 
-#: twinbindings.cpp:83
+#: twinbindings.cpp:85
 msgid "Window to Desktop 3"
 msgstr "窗口到桌面 3"
 
-#: twinbindings.cpp:84
+#: twinbindings.cpp:86
 msgid "Window to Desktop 4"
 msgstr "窗口到桌面 4"
 
-#: twinbindings.cpp:85
+#: twinbindings.cpp:87
 msgid "Window to Desktop 5"
 msgstr "窗口到桌面 5"
 
-#: twinbindings.cpp:86
+#: twinbindings.cpp:88
 msgid "Window to Desktop 6"
 msgstr "窗口到桌面 6"
 
-#: twinbindings.cpp:87
+#: twinbindings.cpp:89
 msgid "Window to Desktop 7"
 msgstr "窗口到桌面 7"
 
-#: twinbindings.cpp:88
+#: twinbindings.cpp:90
 msgid "Window to Desktop 8"
 msgstr "窗口到桌面 8"
 
-#: twinbindings.cpp:89
+#: twinbindings.cpp:91
 msgid "Window to Desktop 9"
 msgstr "窗口到桌面 9"
 
-#: twinbindings.cpp:90
+#: twinbindings.cpp:92
 msgid "Window to Desktop 10"
 msgstr "窗口到桌面 10"
 
-#: twinbindings.cpp:91
+#: twinbindings.cpp:93
 msgid "Window to Desktop 11"
 msgstr "窗口到桌面 11"
 
-#: twinbindings.cpp:92
+#: twinbindings.cpp:94
 msgid "Window to Desktop 12"
 msgstr "窗口到桌面 12"
 
-#: twinbindings.cpp:93
+#: twinbindings.cpp:95
 msgid "Window to Desktop 13"
 msgstr "窗口到桌面 13"
 
-#: twinbindings.cpp:94
+#: twinbindings.cpp:96
 msgid "Window to Desktop 14"
 msgstr "窗口到桌面 14"
 
-#: twinbindings.cpp:95
+#: twinbindings.cpp:97
 msgid "Window to Desktop 15"
 msgstr "窗口到桌面 15"
 
-#: twinbindings.cpp:96
+#: twinbindings.cpp:98
 msgid "Window to Desktop 16"
 msgstr "窗口到桌面 16"
 
-#: twinbindings.cpp:97
+#: twinbindings.cpp:99
 msgid "Window to Desktop 17"
 msgstr "窗口到桌面 17"
 
-#: twinbindings.cpp:98
+#: twinbindings.cpp:100
 msgid "Window to Desktop 18"
 msgstr "窗口到桌面 18"
 
-#: twinbindings.cpp:99
+#: twinbindings.cpp:101
 msgid "Window to Desktop 19"
 msgstr "窗口到桌面 19"
 
-#: twinbindings.cpp:100
+#: twinbindings.cpp:102
 msgid "Window to Desktop 20"
 msgstr "窗口到桌面 20"
 
-#: twinbindings.cpp:101
+#: twinbindings.cpp:103
 msgid "Window to Next Desktop"
 msgstr "窗口到下一桌面"
 
-#: twinbindings.cpp:102
+#: twinbindings.cpp:104
 msgid "Window to Previous Desktop"
 msgstr "窗口到前一桌面"
 
-#: twinbindings.cpp:103
+#: twinbindings.cpp:105
 msgid "Window One Desktop to the Right"
 msgstr "窗口右移一个桌面"
 
-#: twinbindings.cpp:104
+#: twinbindings.cpp:106
 msgid "Window One Desktop to the Left"
 msgstr "窗口左移一个桌面"
 
-#: twinbindings.cpp:105
+#: twinbindings.cpp:107
 msgid "Window One Desktop Up"
 msgstr "窗口上移一个桌面"
 
-#: twinbindings.cpp:106
+#: twinbindings.cpp:108
 msgid "Window One Desktop Down"
 msgstr "窗口下移一个桌面"
 
-#: twinbindings.cpp:108
+#: twinbindings.cpp:109
+#, fuzzy
+msgid "Window to Screen 0"
+msgstr "窗口抓图"
+
+#: twinbindings.cpp:110
+#, fuzzy
+msgid "Window to Screen 1"
+msgstr "窗口抓图"
+
+#: twinbindings.cpp:111
+#, fuzzy
+msgid "Window to Screen 2"
+msgstr "窗口抓图"
+
+#: twinbindings.cpp:112
+#, fuzzy
+msgid "Window to Screen 3"
+msgstr "窗口抓图"
+
+#: twinbindings.cpp:113
+#, fuzzy
+msgid "Window to Screen 4"
+msgstr "窗口抓图"
+
+#: twinbindings.cpp:114
+#, fuzzy
+msgid "Window to Screen 5"
+msgstr "窗口抓图"
+
+#: twinbindings.cpp:115
+#, fuzzy
+msgid "Window to Screen 6"
+msgstr "窗口抓图"
+
+#: twinbindings.cpp:116
+#, fuzzy
+msgid "Window to Screen 7"
+msgstr "窗口抓图"
+
+#: twinbindings.cpp:117
+#, fuzzy
+msgid "Window to Next Screen"
+msgstr "窗口到下一桌面"
+
+#: twinbindings.cpp:119
 msgid "Desktop Switching"
 msgstr "桌面切换"
 
-#: twinbindings.cpp:109
+#: twinbindings.cpp:120
 msgid "Switch to Desktop 1"
 msgstr "切换到桌面 1"
 
-#: twinbindings.cpp:110
+#: twinbindings.cpp:121
 msgid "Switch to Desktop 2"
 msgstr "切换到桌面 2"
 
-#: twinbindings.cpp:111
+#: twinbindings.cpp:122
 msgid "Switch to Desktop 3"
 msgstr "切换到桌面 3"
 
-#: twinbindings.cpp:112
+#: twinbindings.cpp:123
 msgid "Switch to Desktop 4"
 msgstr "切换到桌面 4"
 
-#: twinbindings.cpp:113
+#: twinbindings.cpp:124
 msgid "Switch to Desktop 5"
 msgstr "切换到桌面 5"
 
-#: twinbindings.cpp:114
+#: twinbindings.cpp:125
 msgid "Switch to Desktop 6"
 msgstr "切换到桌面 6"
 
-#: twinbindings.cpp:115
+#: twinbindings.cpp:126
 msgid "Switch to Desktop 7"
 msgstr "切换到桌面 7"
 
-#: twinbindings.cpp:116
+#: twinbindings.cpp:127
 msgid "Switch to Desktop 8"
 msgstr "切换到桌面 8"
 
-#: twinbindings.cpp:117
+#: twinbindings.cpp:128
 msgid "Switch to Desktop 9"
 msgstr "切换到桌面 9"
 
-#: twinbindings.cpp:118
+#: twinbindings.cpp:129
 msgid "Switch to Desktop 10"
 msgstr "切换到桌面 10"
 
-#: twinbindings.cpp:119
+#: twinbindings.cpp:130
 msgid "Switch to Desktop 11"
 msgstr "切换到桌面 11"
 
-#: twinbindings.cpp:120
+#: twinbindings.cpp:131
 msgid "Switch to Desktop 12"
 msgstr "切换到桌面 12"
 
-#: twinbindings.cpp:121
+#: twinbindings.cpp:132
 msgid "Switch to Desktop 13"
 msgstr "切换到桌面 13"
 
-#: twinbindings.cpp:122
+#: twinbindings.cpp:133
 msgid "Switch to Desktop 14"
 msgstr "切换到桌面 14"
 
-#: twinbindings.cpp:123
+#: twinbindings.cpp:134
 msgid "Switch to Desktop 15"
 msgstr "切换到桌面 15"
 
-#: twinbindings.cpp:124
+#: twinbindings.cpp:135
 msgid "Switch to Desktop 16"
 msgstr "切换到桌面 16"
 
-#: twinbindings.cpp:125
+#: twinbindings.cpp:136
 msgid "Switch to Desktop 17"
 msgstr "切换到桌面 17"
 
-#: twinbindings.cpp:126
+#: twinbindings.cpp:137
 msgid "Switch to Desktop 18"
 msgstr "切换到桌面 18"
 
-#: twinbindings.cpp:127
+#: twinbindings.cpp:138
 msgid "Switch to Desktop 19"
 msgstr "切换到桌面 19"
 
-#: twinbindings.cpp:128
+#: twinbindings.cpp:139
 msgid "Switch to Desktop 20"
 msgstr "切换到桌面 20"
 
-#: twinbindings.cpp:129
+#: twinbindings.cpp:140
 msgid "Switch to Next Desktop"
 msgstr "切换到前一桌面"
 
-#: twinbindings.cpp:130
+#: twinbindings.cpp:141
 msgid "Switch to Previous Desktop"
 msgstr "切换到后一桌面"
 
-#: twinbindings.cpp:131
+#: twinbindings.cpp:142
 msgid "Switch One Desktop to the Right"
 msgstr "切换到右边的桌面"
 
-#: twinbindings.cpp:132
+#: twinbindings.cpp:143
 msgid "Switch One Desktop to the Left"
 msgstr "切换到左边的桌面"
 
-#: twinbindings.cpp:133
+#: twinbindings.cpp:144
 msgid "Switch One Desktop Up"
 msgstr "切换到上面的桌面"
 
-#: twinbindings.cpp:134
+#: twinbindings.cpp:145
 msgid "Switch One Desktop Down"
 msgstr "切换到下面的桌面"
 
-#: twinbindings.cpp:137
+#: twinbindings.cpp:146
+#, fuzzy
+msgid "Switch to Screen 0"
+msgstr "切换到桌面 10"
+
+#: twinbindings.cpp:147
+#, fuzzy
+msgid "Switch to Screen 1"
+msgstr "切换到桌面 1"
+
+#: twinbindings.cpp:148
+#, fuzzy
+msgid "Switch to Screen 2"
+msgstr "切换到桌面 2"
+
+#: twinbindings.cpp:149
+#, fuzzy
+msgid "Switch to Screen 3"
+msgstr "切换到桌面 3"
+
+#: twinbindings.cpp:150
+#, fuzzy
+msgid "Switch to Screen 4"
+msgstr "切换到桌面 4"
+
+#: twinbindings.cpp:151
+#, fuzzy
+msgid "Switch to Screen 5"
+msgstr "切换到桌面 5"
+
+#: twinbindings.cpp:152
+#, fuzzy
+msgid "Switch to Screen 6"
+msgstr "切换到桌面 6"
+
+#: twinbindings.cpp:153
+#, fuzzy
+msgid "Switch to Screen 7"
+msgstr "切换到桌面 7"
+
+#: twinbindings.cpp:154
+#, fuzzy
+msgid "Switch to Next Screen"
+msgstr "切换到前一桌面"
+
+#: twinbindings.cpp:157
 msgid "Mouse Emulation"
 msgstr "鼠标模拟"
 
-#: twinbindings.cpp:138
+#: twinbindings.cpp:158
 msgid "Kill Window"
 msgstr "杀死窗口"
 
-#: twinbindings.cpp:139
+#: twinbindings.cpp:159
 msgid "Window Screenshot"
 msgstr "窗口抓图"
 
-#: twinbindings.cpp:140
+#: twinbindings.cpp:160
 msgid "Desktop Screenshot"
 msgstr "桌面抓图"
 
-#: twinbindings.cpp:145
+#: twinbindings.cpp:165
 msgid "Block Global Shortcuts"
 msgstr "屏蔽全局快捷键"
 
-#: main.cpp:65
-msgid ""
-"twin: it looks like there's already a window manager running. twin not "
-"started.\n"
-msgstr ""
-"twin：看起来已经有一个窗口管理器在运行。twin 没有起动。\n"
-
-#: main.cpp:80
-msgid "twin: failure during initialization; aborting"
-msgstr "twin：在初始化时失败；中止"
-
-#: main.cpp:101
-msgid ""
-"twin: unable to claim manager selection, another wm running? (try using "
-"--replace)\n"
-msgstr ""
-"twin：无法声明窗口管理器选择，是否正在运行另外一种窗口管理器？(试着使用 --replace)\n"
-
-#: main.cpp:182
-msgid "TDE window manager"
-msgstr "TDE 窗口管理器"
-
-#: main.cpp:186
-msgid "Disable configuration options"
-msgstr "禁用配置选项"
-
-#: main.cpp:187
-msgid "Replace already-running ICCCM2.0-compliant window manager"
-msgstr "替换已经运行的 ICCCM2.0 兼容的窗口管理器"
-
-#: killer/killer.cpp:49 main.cpp:263
-msgid "KWin"
-msgstr "KWin"
-
-#: main.cpp:265
-msgid "(c) 1999-2005, The TDE Developers"
-msgstr "(C) 1999-2005，TDE 开发者"
-
-#: main.cpp:269
-msgid "Maintainer"
-msgstr "维护者"
-
-#: plugins.cpp:32
-msgid "KWin: "
-msgstr "KWin："
-
-#: plugins.cpp:33
-msgid ""
-"\n"
-"KWin will now exit..."
-msgstr ""
-"\n"
-"KWin 现在退出..."
-
-#: tabbox.cpp:55
-msgid "*** No Windows ***"
-msgstr "*** 没有窗口 ***"
-
 #: useractions.cpp:62
 msgid "Keep &Above Others"
 msgstr "常居顶端(&A)"
@@ -487,72 +602,86 @@ msgstr "全屏(&F)"
 msgid "&No Border"
 msgstr "无边框(&N)"
 
-#: useractions.cpp:69
+#: useractions.cpp:68
+#, fuzzy
+msgid "Shad&ow"
+msgstr "卷起"
+
+#: useractions.cpp:70
 msgid "Window &Shortcut..."
 msgstr "窗口快捷键(&S)..."
 
-#: useractions.cpp:70
+#: useractions.cpp:72
+#, fuzzy
+msgid "&Suspend Application"
+msgstr "特殊应用程序设置(&S)..."
+
+#: useractions.cpp:73
+msgid "&Resume Application"
+msgstr ""
+
+#: useractions.cpp:75
 msgid "&Special Window Settings..."
 msgstr "特殊窗口设置(&S)..."
 
-#: useractions.cpp:71
+#: useractions.cpp:76
 msgid "&Special Application Settings..."
 msgstr "特殊应用程序设置(&S)..."
 
-#: useractions.cpp:73
+#: useractions.cpp:78
 msgid "Ad&vanced"
 msgstr "高级(&V)"
 
-#: useractions.cpp:80
+#: useractions.cpp:85
 msgid "Reset opacity to default value"
 msgstr "将不透明度重置为默认值"
 
-#: useractions.cpp:82
+#: useractions.cpp:87
 msgid "Slide this to set the window's opacity"
 msgstr "拖曳此滑块可设定窗口的不透明度"
 
-#: useractions.cpp:89
+#: useractions.cpp:94
 msgid "&Opacity"
 msgstr "不透明度(&O)"
 
-#: useractions.cpp:92
+#: useractions.cpp:97
 msgid "&Move"
 msgstr "移动(&M)"
 
-#: useractions.cpp:93
+#: useractions.cpp:98
 msgid "Re&size"
 msgstr "大小(&S)"
 
-#: useractions.cpp:94
+#: useractions.cpp:99
 msgid "Mi&nimize"
 msgstr "最小化(&N)"
 
-#: useractions.cpp:95
+#: useractions.cpp:100
 msgid "Ma&ximize"
 msgstr "最大化(&X)"
 
-#: useractions.cpp:96
+#: useractions.cpp:101
 msgid "Sh&ade"
 msgstr "卷起(&A)"
 
-#: useractions.cpp:103
+#: useractions.cpp:108
 msgid "Configur&e Window Behavior..."
 msgstr "配置窗口行为(&E)..."
 
-#: useractions.cpp:198
+#: useractions.cpp:209
 msgid "To &Desktop"
 msgstr "到桌面(&D)"
 
-#: useractions.cpp:211
+#: useractions.cpp:222
 msgid "&All Desktops"
 msgstr "全部桌面(&A)"
 
-#: workspace.cpp:1017 workspace.cpp:1037
+#: workspace.cpp:1182 workspace.cpp:1202
 #, c-format
 msgid "Desktop %1"
 msgstr "桌面 %1"
 
-#: workspace.cpp:2397
+#: workspace.cpp:2754
 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 the "
@@ -562,7 +691,7 @@ msgstr ""
 "您选择了显示没有边框的窗口。\n"
 "没有边框的话，您就无法使用鼠标再次启用边框：请使用快捷键 %1 激活窗口的操作菜单来完成这一任务。"
 
-#: workspace.cpp:2409
+#: workspace.cpp:2766
 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 mode "
@@ -572,32 +701,28 @@ msgstr ""
 "您选择了以全屏模式显示窗口。\n"
 "如果应用程序自身没有提供退出全屏模式的选项，您就无法使用鼠标退出全屏模式：请使用快捷键 %1 激活窗口的操作菜单来完成这一任务。"
 
-#: workspace.cpp:2446 workspace.cpp:2528
-msgid ""
-"The Composite Manager could not be started.\\nMake sure you have \"kompmgr\" in "
-"a $PATH directory."
-msgstr ""
-"无法启动复合管理器。\\n请确定您在 $PATH 目录中存有“kompmgr”。"
-
-#: workspace.cpp:2506
+#: workspace.cpp:2899
 msgid ""
 "The Composite Manager crashed twice within a minute and is therefore disabled "
 "for this session."
 msgstr "复合管理器在一分钟之内崩溃了两次，因此本次会话中该特性将被禁用。"
 
-#: workspace.cpp:2507 workspace.cpp:2529 workspace.cpp:2567
+#: workspace.cpp:2900 workspace.cpp:2923 workspace.cpp:2962
 msgid "Composite Manager Failure"
 msgstr "复合管理器失败"
 
-#: workspace.cpp:2546
+#: workspace.cpp:2941
+#, fuzzy
 msgid ""
-"<qt><b>kompmgr failed to open the display</b>"
-"<br>There is probably an invalid display entry in your ~/.xcompmgrrc.</qt>"
+"<qt><b>The TDE composition manager failed to open the display</b>"
+"<br>There is probably an invalid display entry in your ~/.compton-tde.conf "
+"file.</qt>"
 msgstr "<qt><b>kompmgr 打开显示失败</b><br>可能在您的 ~/.xcompmgrrc 中有无效的显示项。</qt>"
 
-#: workspace.cpp:2548
+#: workspace.cpp:2943
+#, fuzzy
 msgid ""
-"<qt><b>kompmgr cannot find the Xrender extension</b>"
+"<qt><b>The TDE composition manager cannot find the Xrender extension</b>"
 "<br>You are using either an outdated or a crippled version of XOrg."
 "<br>Get XOrg &ge; 6.8 from www.freedesktop.org."
 "<br></qt>"
@@ -607,7 +732,7 @@ msgstr ""
 "<br>请从 www.freedesktop.org 获取 XOrg &ge; 6.8。"
 "<br></qt>"
 
-#: workspace.cpp:2550
+#: workspace.cpp:2945
 msgid ""
 "<qt><b>Composite extension not found</b>"
 "<br>You <i>must</i> use XOrg &ge; 6.8 for translucency and shadows to work."
@@ -623,20 +748,21 @@ msgstr ""
 "<br>Option \"Composite\" \"Enable\""
 "<br>EndSection</i></qt>"
 
-#: workspace.cpp:2555
+#: workspace.cpp:2950
 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>"
 msgstr "<qt><b>损坏扩展未找到</b><br>您<i>必须</i>使用 XOrg &ge; 6.8 获得透明效果及阴影。</qt>"
 
-#: workspace.cpp:2557
+#: workspace.cpp:2952
 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>"
 msgstr "<qt><b>XFixes 扩展未找到</b><br>您<i>必须</i>使用 XOrg &ge; 6.8 获得透明效果及阴影。</qt>"
 
 #: killer/killer.cpp:50
-msgid "KWin helper utility"
+#, fuzzy
+msgid "TWin helper utility"
 msgstr "KWin 助手工具"
 
 #: killer/killer.cpp:67
@@ -661,55 +787,55 @@ msgstr "中止"
 msgid "Keep Running"
 msgstr "保持运行"
 
-#: lib/kcommondecoration.cpp:265
+#: lib/kcommondecoration.cpp:270
 msgid ""
 "_: %1 is the name of window decoration style\n"
 "<center><b>%1 preview</b></center>"
 msgstr "<center><b>%1 预览</b></center>"
 
-#: lib/kcommondecoration.cpp:329
+#: lib/kcommondecoration.cpp:351
 msgid "Menu"
 msgstr "菜单"
 
-#: lib/kcommondecoration.cpp:342 lib/kcommondecoration.cpp:529
+#: lib/kcommondecoration.cpp:366 lib/kcommondecoration.cpp:554
 msgid "Not on all desktops"
 msgstr "不在全部桌面"
 
-#: lib/kcommondecoration.cpp:342 lib/kcommondecoration.cpp:530
+#: lib/kcommondecoration.cpp:366 lib/kcommondecoration.cpp:555
 msgid "On all desktops"
 msgstr "全部桌面"
 
-#: lib/kcommondecoration.cpp:364
+#: lib/kcommondecoration.cpp:389
 msgid "Minimize"
 msgstr "最小化"
 
-#: lib/kcommondecoration.cpp:376 lib/kcommondecoration.cpp:516
+#: lib/kcommondecoration.cpp:401 lib/kcommondecoration.cpp:541
 msgid "Maximize"
 msgstr "最大化"
 
-#: lib/kcommondecoration.cpp:399 lib/kcommondecoration.cpp:572
+#: lib/kcommondecoration.cpp:424 lib/kcommondecoration.cpp:597
 msgid "Do not keep above others"
 msgstr "不常居顶端"
 
-#: lib/kcommondecoration.cpp:399 lib/kcommondecoration.cpp:572
-#: lib/kcommondecoration.cpp:596
+#: lib/kcommondecoration.cpp:424 lib/kcommondecoration.cpp:597
+#: lib/kcommondecoration.cpp:621
 msgid "Keep above others"
 msgstr "常居顶端"
 
-#: lib/kcommondecoration.cpp:412 lib/kcommondecoration.cpp:589
+#: lib/kcommondecoration.cpp:437 lib/kcommondecoration.cpp:614
 msgid "Do not keep below others"
 msgstr "不常居底端"
 
-#: lib/kcommondecoration.cpp:412 lib/kcommondecoration.cpp:579
-#: lib/kcommondecoration.cpp:589
+#: lib/kcommondecoration.cpp:437 lib/kcommondecoration.cpp:604
+#: lib/kcommondecoration.cpp:614
 msgid "Keep below others"
 msgstr "常居底端"
 
-#: lib/kcommondecoration.cpp:425 lib/kcommondecoration.cpp:541
+#: lib/kcommondecoration.cpp:450 lib/kcommondecoration.cpp:566
 msgid "Unshade"
 msgstr "展开"
 
-#: lib/kcommondecoration.cpp:425 lib/kcommondecoration.cpp:542
+#: lib/kcommondecoration.cpp:450 lib/kcommondecoration.cpp:567
 msgid "Shade"
 msgstr "卷起"
 
@@ -722,5 +848,12 @@ msgid "The default decoration plugin is corrupt and could not be loaded."
 msgstr "默认的装饰插件损坏，无法被载入。"
 
 #: lib/kdecoration_plugins_p.cpp:159
-msgid "The library %1 is not a KWin plugin."
+#, fuzzy
+msgid "The library %1 is not a TWin plugin."
 msgstr "库 %1 不是 KWin 插件。"
+
+#~ msgid "KWin"
+#~ msgstr "KWin"
+
+#~ msgid "The Composite Manager could not be started.\\nMake sure you have \"kompmgr\" in a $PATH directory."
+#~ msgstr "无法启动复合管理器。\\n请确定您在 $PATH 目录中存有“kompmgr”。"
diff --git a/tde-i18n-zh_CN/messages/tdebase/twin_clients.po b/tde-i18n-zh_CN/messages/tdebase/twin_clients.po
index 629205306c4..c04c5c8b756 100644
--- a/tde-i18n-zh_CN/messages/tdebase/twin_clients.po
+++ b/tde-i18n-zh_CN/messages/tdebase/twin_clients.po
@@ -1,111 +1,36 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: twin_clients\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-05-14 05:21+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: quartz/quartz.cpp:513
+msgid "Quartz"
+msgstr "Quartz"
+
 #: b2/config/config.cpp:41 quartz/config/config.cpp:40
 msgid "Draw window frames using &titlebar colors"
 msgstr "使用标题栏颜色绘制窗口框架(&T)"
 
-#: b2/config/config.cpp:43
+#: quartz/config/config.cpp:42
 msgid ""
-"When selected, the window borders are drawn using the titlebar colors; "
-"otherwise, they are drawn using normal border colors."
+"When selected, the window decoration borders are drawn using the titlebar "
+"colors; otherwise, they are drawn using normal border colors instead."
 msgstr "选中时，窗口边框会使用标题栏颜色绘制；否则，将使用普通边框颜色绘制。"
 
-#: b2/config/config.cpp:49
-msgid "Draw &resize handle"
-msgstr "绘制缩放柄(&R)"
-
-#: b2/config/config.cpp:51
-msgid ""
-"When selected, decorations are drawn with a \"grab handle\" in the bottom right "
-"corner of the windows; otherwise, no grab handle is drawn."
-msgstr "选中时，装饰会在窗口的右下角绘制“缩放柄”；否则不显示该缩放柄。"
-
-#: b2/config/config.cpp:56
-msgid "Actions Settings"
-msgstr "动作设置"
-
-#: b2/config/config.cpp:58
-msgid "Double click on menu button:"
-msgstr "双击菜单按钮："
-
-#: b2/config/config.cpp:60
-msgid "Do Nothing"
-msgstr "无"
-
-#: b2/config/config.cpp:61
-msgid "Minimize Window"
-msgstr "最小化窗口"
-
-#: b2/config/config.cpp:62
-msgid "Shade Window"
-msgstr "卷起窗口"
-
-#: b2/config/config.cpp:63
-msgid "Close Window"
-msgstr "关闭窗口"
-
-#: b2/config/config.cpp:66
-msgid ""
-"An action can be associated to a double click of the menu button. Leave it to "
-"none if in doubt."
-msgstr "双击菜单按钮可关联到一个操作。如果您保持怀疑的话，请设置为空。"
-
-#: b2/b2client.cpp:346 keramik/keramik.cpp:1036
-#: kwmtheme/kwmthemeclient.cpp:292
-msgid "Menu"
-msgstr "菜单"
-
-#: b2/b2client.cpp:348 b2/b2client.cpp:814 keramik/keramik.cpp:1046
-#: keramik/keramik.cpp:1431
-msgid "Not on all desktops"
-msgstr "不在全部桌面上"
-
-#: b2/b2client.cpp:348 b2/b2client.cpp:814 keramik/keramik.cpp:1046
-#: keramik/keramik.cpp:1431
-msgid "On all desktops"
-msgstr "在全部桌面上"
-
-#: b2/b2client.cpp:349 keramik/keramik.cpp:1066
-#: kwmtheme/kwmthemeclient.cpp:312
-msgid "Minimize"
-msgstr "最小化"
-
-#: b2/b2client.cpp:349 b2/b2client.cpp:826 keramik/keramik.cpp:1075
-#: keramik/keramik.cpp:1419 kwmtheme/kwmthemeclient.cpp:320
-#: kwmtheme/kwmthemeclient.cpp:775
-msgid "Maximize"
-msgstr "最大化"
-
-#: b2/b2client.cpp:351 b2/b2client.cpp:859 keramik/keramik.cpp:1112
-#: keramik/keramik.cpp:1442
-msgid "Unshade"
-msgstr "展开"
-
-#: b2/b2client.cpp:351 b2/b2client.cpp:859 keramik/keramik.cpp:1112
-#: keramik/keramik.cpp:1442
-msgid "Shade"
-msgstr "卷起"
-
-#: b2/b2client.cpp:352
-msgid "Resize"
-msgstr "大小"
-
-#: b2/b2client.cpp:390
-msgid "<b><center>B II preview</center></b>"
-msgstr "<b><center>B II 预览</center></b>"
+#: quartz/config/config.cpp:45
+msgid "Quartz &extra slim"
+msgstr "石英超细(&E)"
 
-#: web/Web.cpp:53
-msgid "Web"
-msgstr "Web"
+#: quartz/config/config.cpp:47
+msgid "Quartz window decorations with extra-small title bar."
+msgstr "超小标题栏的石英窗口装饰。"
 
 #: default/config/config.cpp:40
 msgid "Draw titlebar &stipple effect"
@@ -138,148 +63,210 @@ msgid ""
 msgstr "选中时，装饰将会以高色彩显示渐变；否则没有渐变效果。"
 
 #: default/kdedefault.cpp:746
-msgid "TDE2"
-msgstr "TDE2"
+msgid "KDE2"
+msgstr ""
 
-#: keramik/keramik.cpp:964
-msgid "<center><b>Keramik preview</b></center>"
-msgstr "<center><b>Keramik 预览</b></center>"
+#: modernsystem/modernsys.cpp:383
+msgid "Modern System"
+msgstr "现代系统"
 
-#: keramik/keramik.cpp:1093
-msgid "Keep Above Others"
-msgstr "常居顶端"
+#: modernsystem/config/config.cpp:40
+msgid "&Show window resize handle"
+msgstr "显示窗口缩放柄(&S)"
 
-#: keramik/keramik.cpp:1102
-msgid "Keep Below Others"
-msgstr "常居底端"
+#: modernsystem/config/config.cpp:42
+msgid ""
+"When selected, all windows are drawn with a resize handle at the lower right "
+"corner. This makes window resizing easier, especially for trackballs and other "
+"mouse replacements on laptops."
+msgstr "选中时，所有窗口都会在右下角绘制一个缩放柄。这将使得窗口缩放更加容易，特别是对那些轨迹球和笔记本电脑上的其它替代设备。"
 
-#: redmond/redmond.cpp:353
-msgid "Redmond"
-msgstr "Redmond"
+#: modernsystem/config/config.cpp:52
+msgid "Here you can change the size of the resize handle."
+msgstr "您可在此更改缩放柄的大小。"
+
+#: modernsystem/config/config.cpp:61
+msgid "Small"
+msgstr "小"
+
+#: modernsystem/config/config.cpp:63
+msgid "Medium"
+msgstr "中"
+
+#: modernsystem/config/config.cpp:65
+msgid "Large"
+msgstr "大"
+
+#: kwmtheme/cli_installer/main.cpp:12
+msgid "Installs a KWM theme"
+msgstr "安装 KWM 主题"
+
+#: kwmtheme/cli_installer/main.cpp:16
+msgid "Path to a theme config file"
+msgstr "主题配置文件"
 
 #: kwmtheme/kwmthemeclient.cpp:260
 msgid "<center><b>KWMTheme</b></center>"
 msgstr "<center><b>KWMTheme</b></center>"
 
+#: b2/b2client.cpp:347 keramik/keramik.cpp:1053
+#: kwmtheme/kwmthemeclient.cpp:292
+msgid "Menu"
+msgstr "菜单"
+
 #: kwmtheme/kwmthemeclient.cpp:301 kwmtheme/kwmthemeclient.cpp:765
 msgid "Sticky"
 msgstr "吸附"
 
+#: b2/b2client.cpp:350 keramik/keramik.cpp:1086
+#: kwmtheme/kwmthemeclient.cpp:312
+msgid "Minimize"
+msgstr "最小化"
+
+#: b2/b2client.cpp:350 b2/b2client.cpp:847 keramik/keramik.cpp:1095
+#: keramik/keramik.cpp:1439 kwmtheme/kwmthemeclient.cpp:320
+#: kwmtheme/kwmthemeclient.cpp:775
+msgid "Maximize"
+msgstr "最大化"
+
 #: kwmtheme/kwmthemeclient.cpp:765
 msgid "Unsticky"
 msgstr "取消吸附"
 
-#: kwmtheme/cli_installer/main.cpp:12
-msgid "Installs a KWM theme"
-msgstr "安装 KWM 主题"
+#: redmond/redmond.cpp:353
+msgid "Redmond"
+msgstr "Redmond"
 
-#: kwmtheme/cli_installer/main.cpp:16
-msgid "Path to a theme config file"
-msgstr "主题配置文件"
+#: plastik/plastikclient.cpp:56
+msgid "Plastik"
+msgstr "塑料"
 
-#: laptop/laptopclient.cpp:353
-msgid "Laptop"
-msgstr "便携"
+#: b2/b2client.cpp:349 b2/b2client.cpp:835 keramik/keramik.cpp:1065
+#: keramik/keramik.cpp:1451
+msgid "Not on all desktops"
+msgstr "不在全部桌面上"
 
-#. i18n: file ./keramik/config/keramikconfig.ui line 16
-#: rc.cpp:3
-#, no-c-format
-msgid "Keramik"
-msgstr "Keramik"
+#: b2/b2client.cpp:349 b2/b2client.cpp:835 keramik/keramik.cpp:1065
+#: keramik/keramik.cpp:1451
+msgid "On all desktops"
+msgstr "在全部桌面上"
 
-#. i18n: file ./keramik/config/keramikconfig.ui line 30
-#: rc.cpp:6
-#, no-c-format
-msgid "Display the window &icon in the caption bubble"
-msgstr "在标题气泡中显示窗口图标(&I)"
+#: b2/b2client.cpp:352 b2/b2client.cpp:880 keramik/keramik.cpp:1132
+#: keramik/keramik.cpp:1462
+msgid "Unshade"
+msgstr "展开"
 
-#. i18n: file ./keramik/config/keramikconfig.ui line 33
-#: rc.cpp:9
-#, no-c-format
-msgid ""
-"Check this option if you want the window icon to be displayed in the caption "
-"bubble next to the titlebar text."
-msgstr "如果您想要在标题栏文本旁边的标题气泡中显示窗口图标，请选中此选项。"
+#: b2/b2client.cpp:352 b2/b2client.cpp:880 keramik/keramik.cpp:1132
+#: keramik/keramik.cpp:1462
+msgid "Shade"
+msgstr "卷起"
 
-#. i18n: file ./keramik/config/keramikconfig.ui line 41
-#: rc.cpp:12
-#, no-c-format
-msgid "Draw &small caption bubbles on active windows"
-msgstr "在激活窗口中绘制小的标题气泡(&S)"
+#: b2/b2client.cpp:353
+msgid "Resize"
+msgstr "大小"
 
-#. i18n: file ./keramik/config/keramikconfig.ui line 44
-#: rc.cpp:15
-#, no-c-format
+#: b2/b2client.cpp:391
+msgid "<b><center>B II preview</center></b>"
+msgstr "<b><center>B II 预览</center></b>"
+
+#: b2/config/config.cpp:43
 msgid ""
-"Check this option if you want the caption bubble to have the same size on "
-"active windows that it has on inactive ones. This option is useful for laptops "
-"or low resolution displays where you want maximize the amount of space "
-"available to the window contents."
-msgstr ""
-"如果您想要在激活窗口中显示与非激活窗口中同样的标题气泡，请选中此选项。此选项特别用于笔记本电脑或分辨率较低的显示器，因为您可以将更多的空间留给窗口的实际内容。"
+"When selected, the window borders are drawn using the titlebar colors; "
+"otherwise, they are drawn using normal border colors."
+msgstr "选中时，窗口边框会使用标题栏颜色绘制；否则，将使用普通边框颜色绘制。"
 
-#. i18n: file ./keramik/config/keramikconfig.ui line 52
-#: rc.cpp:18
-#, no-c-format
-msgid "Draw g&rab bars below windows"
-msgstr "在窗口下绘制拖曳栏(&R)"
+#: b2/config/config.cpp:49
+msgid "Draw &resize handle"
+msgstr "绘制缩放柄(&R)"
 
-#. i18n: file ./keramik/config/keramikconfig.ui line 55
-#: rc.cpp:21
-#, no-c-format
+#: b2/config/config.cpp:51
 msgid ""
-"Check this option if you want a grab bar to be drawn below windows. When this "
-"option is not selected only a thin border will be drawn in its place."
-msgstr "选中时，装饰将会在窗口下绘制“拖曳栏”；否则将仅会在其位置处绘制细边框。"
+"When selected, decorations are drawn with a \"grab handle\" in the bottom right "
+"corner of the windows; otherwise, no grab handle is drawn."
+msgstr "选中时，装饰会在窗口的右下角绘制“缩放柄”；否则不显示该缩放柄。"
 
-#. i18n: file ./keramik/config/keramikconfig.ui line 63
-#: rc.cpp:24 rc.cpp:51
-#, no-c-format
-msgid "Use shadowed &text"
-msgstr "使用带阴影的文字(&T)"
+#: b2/config/config.cpp:56
+msgid "Actions Settings"
+msgstr "动作设置"
 
-#. i18n: file ./keramik/config/keramikconfig.ui line 66
-#: rc.cpp:27 rc.cpp:54
-#, no-c-format
+#: b2/config/config.cpp:58
+msgid "Double click on menu button:"
+msgstr "双击菜单按钮："
+
+#: b2/config/config.cpp:60
+msgid "Do Nothing"
+msgstr "无"
+
+#: b2/config/config.cpp:61
+msgid "Minimize Window"
+msgstr "最小化窗口"
+
+#: b2/config/config.cpp:62
+msgid "Shade Window"
+msgstr "卷起窗口"
+
+#: b2/config/config.cpp:63
+msgid "Close Window"
+msgstr "关闭窗口"
+
+#: b2/config/config.cpp:66
 msgid ""
-"Check this option if you want the titlebar text to have a 3D look with a shadow "
-"behind it."
-msgstr "如果您想要让标题栏文字的后面有立体效果的阴影，请选中此选项。"
+"An action can be associated to a double click of the menu button. Leave it to "
+"none if in doubt."
+msgstr "双击菜单按钮可关联到一个操作。如果您保持怀疑的话，请设置为空。"
+
+#: web/Web.cpp:53
+msgid "Web"
+msgstr "Web"
 
 #. i18n: file ./plastik/config/configdialog.ui line 16
-#: rc.cpp:30
+#: rc.cpp:3
 #, no-c-format
 msgid "Config Dialog"
 msgstr "配置对话框"
 
 #. i18n: file ./plastik/config/configdialog.ui line 30
-#: rc.cpp:33
+#: rc.cpp:6
 #, no-c-format
 msgid "Title &Alignment"
 msgstr "标题排列(&A)"
 
 #. i18n: file ./plastik/config/configdialog.ui line 67
-#: rc.cpp:45
+#: rc.cpp:18
 #, no-c-format
 msgid "Colored window border"
 msgstr "对窗口边框着色"
 
 #. i18n: file ./plastik/config/configdialog.ui line 73
-#: rc.cpp:48
+#: rc.cpp:21
 #, no-c-format
 msgid ""
 "Check this option if the window border should be painted in the titlebar color. "
 "Otherwise it will be painted in the background color."
 msgstr "选中时，窗口边框会使用标题栏颜色绘制。否则，将使用背景颜色绘制。"
 
+#. i18n: file ./plastik/config/configdialog.ui line 81
+#: rc.cpp:24 rc.cpp:63
+#, no-c-format
+msgid "Use shadowed &text"
+msgstr "使用带阴影的文字(&T)"
+
+#. i18n: file ./plastik/config/configdialog.ui line 84
+#: rc.cpp:27 rc.cpp:66
+#, no-c-format
+msgid ""
+"Check this option if you want the titlebar text to have a 3D look with a shadow "
+"behind it."
+msgstr "如果您想要让标题栏文字的后面有立体效果的阴影，请选中此选项。"
+
 #. i18n: file ./plastik/config/configdialog.ui line 92
-#: rc.cpp:57
+#: rc.cpp:30
 #, no-c-format
 msgid "Animate buttons"
 msgstr "动画按钮"
 
 #. i18n: file ./plastik/config/configdialog.ui line 95
-#: rc.cpp:60
+#: rc.cpp:33
 #, no-c-format
 msgid ""
 "Check this option if you want the buttons to fade in when the mouse pointer "
@@ -287,71 +274,88 @@ msgid ""
 msgstr "如果您想要当鼠标指针移入或移出按钮的时候显示淡入淡出的效果，请选中此选项。"
 
 #. i18n: file ./plastik/config/configdialog.ui line 103
-#: rc.cpp:63
+#: rc.cpp:36
 #, no-c-format
 msgid "Close windows by double clicking the menu button"
 msgstr "双击菜单按钮可关闭窗口"
 
 #. i18n: file ./plastik/config/configdialog.ui line 106
-#: rc.cpp:66
+#: rc.cpp:39
 #, no-c-format
 msgid ""
 "Check this option if you want windows to be closed when you double click the "
 "menu button, similar to Microsoft Windows."
 msgstr "如果您想要在双击菜单按钮的时候关闭窗口，也就是和 Microsoft Windows 一样，请选中此选项。"
 
-#: quartz/config/config.cpp:42
-msgid ""
-"When selected, the window decoration borders are drawn using the titlebar "
-"colors; otherwise, they are drawn using normal border colors instead."
-msgstr "选中时，窗口边框会使用标题栏颜色绘制；否则，将使用普通边框颜色绘制。"
-
-#: quartz/config/config.cpp:45
-msgid "Quartz &extra slim"
-msgstr "石英超细(&E)"
+#. i18n: file ./keramik/config/keramikconfig.ui line 16
+#: rc.cpp:42
+#, no-c-format
+msgid "Keramik"
+msgstr "Keramik"
 
-#: quartz/config/config.cpp:47
-msgid "Quartz window decorations with extra-small title bar."
-msgstr "超小标题栏的石英窗口装饰。"
+#. i18n: file ./keramik/config/keramikconfig.ui line 30
+#: rc.cpp:45
+#, no-c-format
+msgid "Display the window &icon in the caption bubble"
+msgstr "在标题气泡中显示窗口图标(&I)"
 
-#: quartz/quartz.cpp:513
-msgid "Quartz"
-msgstr "Quartz"
+#. i18n: file ./keramik/config/keramikconfig.ui line 33
+#: rc.cpp:48
+#, no-c-format
+msgid ""
+"Check this option if you want the window icon to be displayed in the caption "
+"bubble next to the titlebar text."
+msgstr "如果您想要在标题栏文本旁边的标题气泡中显示窗口图标，请选中此选项。"
 
-#: modernsystem/config/config.cpp:40
-msgid "&Show window resize handle"
-msgstr "显示窗口缩放柄(&S)"
+#. i18n: file ./keramik/config/keramikconfig.ui line 41
+#: rc.cpp:51
+#, no-c-format
+msgid "Draw &small caption bubbles on active windows"
+msgstr "在激活窗口中绘制小的标题气泡(&S)"
 
-#: modernsystem/config/config.cpp:42
+#. i18n: file ./keramik/config/keramikconfig.ui line 44
+#: rc.cpp:54
+#, no-c-format
 msgid ""
-"When selected, all windows are drawn with a resize handle at the lower right "
-"corner. This makes window resizing easier, especially for trackballs and other "
-"mouse replacements on laptops."
-msgstr "选中时，所有窗口都会在右下角绘制一个缩放柄。这将使得窗口缩放更加容易，特别是对那些轨迹球和笔记本电脑上的其它替代设备。"
+"Check this option if you want the caption bubble to have the same size on "
+"active windows that it has on inactive ones. This option is useful for laptops "
+"or low resolution displays where you want maximize the amount of space "
+"available to the window contents."
+msgstr ""
+"如果您想要在激活窗口中显示与非激活窗口中同样的标题气泡，请选中此选项。此选项特别用于笔记本电脑或分辨率较低的显示器，因为您可以将更多的空间留给窗口的实际内容。"
 
-#: modernsystem/config/config.cpp:52
-msgid "Here you can change the size of the resize handle."
-msgstr "您可在此更改缩放柄的大小。"
+#. i18n: file ./keramik/config/keramikconfig.ui line 52
+#: rc.cpp:57
+#, no-c-format
+msgid "Draw g&rab bars below windows"
+msgstr "在窗口下绘制拖曳栏(&R)"
 
-#: modernsystem/config/config.cpp:61
-msgid "Small"
-msgstr "小"
+#. i18n: file ./keramik/config/keramikconfig.ui line 55
+#: rc.cpp:60
+#, no-c-format
+msgid ""
+"Check this option if you want a grab bar to be drawn below windows. When this "
+"option is not selected only a thin border will be drawn in its place."
+msgstr "选中时，装饰将会在窗口下绘制“拖曳栏”；否则将仅会在其位置处绘制细边框。"
 
-#: modernsystem/config/config.cpp:63
-msgid "Medium"
-msgstr "中"
+#: keramik/keramik.cpp:965
+msgid "<center><b>Keramik preview</b></center>"
+msgstr "<center><b>Keramik 预览</b></center>"
 
-#: modernsystem/config/config.cpp:65
-msgid "Large"
-msgstr "大"
+#: keramik/keramik.cpp:1113
+msgid "Keep Above Others"
+msgstr "常居顶端"
 
-#: modernsystem/modernsys.cpp:383
-msgid "Modern System"
-msgstr "现代系统"
+#: keramik/keramik.cpp:1122
+msgid "Keep Below Others"
+msgstr "常居底端"
 
-#: plastik/plastikclient.cpp:56
-msgid "Plastik"
-msgstr "塑料"
+#: laptop/laptopclient.cpp:353
+msgid "Laptop"
+msgstr "便携"
+
+#~ msgid "TDE2"
+#~ msgstr "TDE2"
 
 #~ msgid "<center><b>Web preview</b></center>"
 #~ msgstr "<center><b>Web 预览</b></center>"
diff --git a/tde-i18n-zh_CN/messages/tdebase/twin_lib.po b/tde-i18n-zh_CN/messages/tdebase/twin_lib.po
index e3460821db9..951c7cf5039 100644
--- a/tde-i18n-zh_CN/messages/tdebase/twin_lib.po
+++ b/tde-i18n-zh_CN/messages/tdebase/twin_lib.po
@@ -4,74 +4,76 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: twin_lib\n"
-"POT-Creation-Date: 2005-10-08 02:42+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-08-01 07:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kcommondecoration.cpp:265
+#: kdecoration_plugins_p.cpp:120
+msgid "No window decoration plugin library was found."
+msgstr "未找到窗口装饰插件库。"
+
+#: kdecoration_plugins_p.cpp:145
+msgid "The default decoration plugin is corrupt and could not be loaded."
+msgstr "默认的装饰插件已经损坏，无法装入。"
+
+#: kdecoration_plugins_p.cpp:159
+#, fuzzy
+msgid "The library %1 is not a TWin plugin."
+msgstr "库 %1 不是 KWin 插件。"
+
+#: kcommondecoration.cpp:270
 msgid ""
 "_: %1 is the name of window decoration style\n"
 "<center><b>%1 preview</b></center>"
 msgstr "<center><b>%1 预览</b></center>"
 
-#: kcommondecoration.cpp:329
+#: kcommondecoration.cpp:351
 msgid "Menu"
 msgstr "菜单"
 
-#: kcommondecoration.cpp:342 kcommondecoration.cpp:529
+#: kcommondecoration.cpp:366 kcommondecoration.cpp:554
 msgid "Not on all desktops"
 msgstr "不在全部桌面上"
 
-#: kcommondecoration.cpp:342 kcommondecoration.cpp:530
+#: kcommondecoration.cpp:366 kcommondecoration.cpp:555
 msgid "On all desktops"
 msgstr "在全部桌面上"
 
-#: kcommondecoration.cpp:364
+#: kcommondecoration.cpp:389
 msgid "Minimize"
 msgstr "最小化"
 
-#: kcommondecoration.cpp:376 kcommondecoration.cpp:516
+#: kcommondecoration.cpp:401 kcommondecoration.cpp:541
 msgid "Maximize"
 msgstr "最大化"
 
-#: kcommondecoration.cpp:399 kcommondecoration.cpp:572
+#: kcommondecoration.cpp:424 kcommondecoration.cpp:597
 msgid "Do not keep above others"
 msgstr "不常居顶端"
 
-#: kcommondecoration.cpp:399 kcommondecoration.cpp:572
-#: kcommondecoration.cpp:596
+#: kcommondecoration.cpp:424 kcommondecoration.cpp:597
+#: kcommondecoration.cpp:621
 msgid "Keep above others"
 msgstr "常居顶端"
 
-#: kcommondecoration.cpp:412 kcommondecoration.cpp:589
+#: kcommondecoration.cpp:437 kcommondecoration.cpp:614
 msgid "Do not keep below others"
 msgstr "不常居底端"
 
-#: kcommondecoration.cpp:412 kcommondecoration.cpp:579
-#: kcommondecoration.cpp:589
+#: kcommondecoration.cpp:437 kcommondecoration.cpp:604
+#: kcommondecoration.cpp:614
 msgid "Keep below others"
 msgstr "常居底端"
 
-#: kcommondecoration.cpp:425 kcommondecoration.cpp:541
+#: kcommondecoration.cpp:450 kcommondecoration.cpp:566
 msgid "Unshade"
 msgstr "展开"
 
-#: kcommondecoration.cpp:425 kcommondecoration.cpp:542
+#: kcommondecoration.cpp:450 kcommondecoration.cpp:567
 msgid "Shade"
 msgstr "卷起"
-
-#: kdecoration_plugins_p.cpp:120
-msgid "No window decoration plugin library was found."
-msgstr "未找到窗口装饰插件库。"
-
-#: kdecoration_plugins_p.cpp:145
-msgid "The default decoration plugin is corrupt and could not be loaded."
-msgstr "默认的装饰插件已经损坏，无法装入。"
-
-#: kdecoration_plugins_p.cpp:159
-msgid "The library %1 is not a KWin plugin."
-msgstr "库 %1 不是 KWin 插件。"
diff --git a/tde-i18n-zh_CN/messages/tdebase/useraccount.po b/tde-i18n-zh_CN/messages/tdebase/useraccount.po
index f4e61f9368e..90cf5838a08 100644
--- a/tde-i18n-zh_CN/messages/tdebase/useraccount.po
+++ b/tde-i18n-zh_CN/messages/tdebase/useraccount.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: useraccount\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:47-0500\n"
 "PO-Revision-Date: 2005-01-01 17:03+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -143,7 +144,7 @@ msgstr "保存图像时出错：%1"
 msgid "Your administrator has disallowed changing your image."
 msgstr "您的管理员禁止您更改图像。"
 
-#: main.cpp:334
+#: main.cpp:333
 msgid ""
 "%1 does not appear to be an image file.\n"
 "Please use files with these extensions:\n"
diff --git a/tde-i18n-zh_CN/messages/tdeedu/kalzium.po b/tde-i18n-zh_CN/messages/tdeedu/kalzium.po
index ae2bfa25ee0..91896b97ae7 100644
--- a/tde-i18n-zh_CN/messages/tdeedu/kalzium.po
+++ b/tde-i18n-zh_CN/messages/tdeedu/kalzium.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kalzium\n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2006-07-25 11:31+0800\n"
 "Last-Translator: lee <yuanjiayj@gmail.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -4526,11 +4527,11 @@ msgstr "将光谱图导出为图像(&E)"
 msgid "Save Spectrum"
 msgstr "保存谱图"
 
-#: spectrumviewimpl.cpp:43
+#: spectrumviewimpl.cpp:44
 msgid "The spectrum could not be saved"
 msgstr "谱图无法保存"
 
-#: spectrumviewimpl.cpp:43
+#: spectrumviewimpl.cpp:44
 msgid "Image Could Not Be Saved"
 msgstr "图像无法保存"
 
diff --git a/tde-i18n-zh_CN/messages/tdeedu/kbruch.po b/tde-i18n-zh_CN/messages/tdeedu/kbruch.po
index 75b7347c50a..bfeea7c1071 100644
--- a/tde-i18n-zh_CN/messages/tdeedu/kbruch.po
+++ b/tde-i18n-zh_CN/messages/tdeedu/kbruch.po
@@ -9,15 +9,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kbruch\n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2007-01-26 23:27+0800\n"
 "Last-Translator: yzhh <ye_zong_hui@gmail.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Ni Hui, yzhh"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "shuizhuyuanluo@126.com, yezonghui@gmail.com"
+
 #: exercisecompare.cpp:90
 msgid "Click on this button to change the comparison sign."
 msgstr "点击此按钮来改变不等号的方向。"
@@ -66,21 +79,9 @@ msgstr "正确"
 msgid "N&ext Task"
 msgstr "下一个任务(&E)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Ni Hui, yzhh"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "shuizhuyuanluo@126.com, yezonghui@gmail.com"
-
-#: kbruch.h:32
-msgid "KBruch"
-msgstr "KBruch"
+#: kbruch.cpp:42
+msgid "Learn calculating with fractions"
+msgstr "学习分数运算"
 
 #: exerciseconvert.cpp:89 taskview.cpp:88
 msgid "Enter the numerator of your result"
@@ -97,17 +98,15 @@ msgid ""
 "not entered a result yet."
 msgstr "点击此按钮来检查您的结果。如果您还未输入结果，此按钮不起作用。"
 
-#: taskview.cpp:169
-msgid "In this exercise you have to solve a given task with fractions."
-msgstr "在此练习中您将解决一个与分数有关的任务。"
+#: exerciseconvert.cpp:170
+msgid "In this exercise you have to convert a number into a fraction."
+msgstr "在此练习中您要将一个数字转换成一个分数。"
 
-#: taskview.cpp:170
+#: exerciseconvert.cpp:171
 msgid ""
-"In this exercise you have to solve the generated task. You have to enter "
-"numerator and denominator. You can adjust the difficulty of the task with the "
-"boxes in the toolbar. Do not forget to reduce the result!"
-msgstr ""
-"在此练习中您将解决一个自动生成的任务。您需要输入结果的分子和分母。您可以改变工具栏上的给出的参数来调节任务的难度。不要忘了把结果约分至最简分数！"
+"In this exercise you have to convert a given number into a fraction by entering "
+"numerator and denominator. Do not forget to reduce the result!"
+msgstr "在此练习中您要将一个给定的数字转换成一个分数，输入转化结果的分子和分母。不要忘了将结果约分至最简分数！"
 
 #: exerciseconvert.cpp:406 taskview.cpp:332
 msgid ""
@@ -122,16 +121,6 @@ msgid ""
 "correctly solved."
 msgstr "您输入了正确的结果，但不是最简分数。请把结果化为最简分数后再输入。该任务将不会被算作正确解决。"
 
-#: taskwidget.cpp:107
-msgid ""
-"_: division symbol\n"
-"/"
-msgstr "÷"
-
-#: kbruch.cpp:42
-msgid "Learn calculating with fractions"
-msgstr "学习分数运算"
-
 #. i18n: file kbruchui.rc line 4
 #: rc.cpp:3
 #, no-c-format
@@ -417,6 +406,28 @@ msgstr "选择您所要的分数计算的运算类型：加/减，乘/除或混�
 msgid "Task Viewer Settings"
 msgstr "任务面板设置"
 
+#: taskview.cpp:169
+msgid "In this exercise you have to solve a given task with fractions."
+msgstr "在此练习中您将解决一个与分数有关的任务。"
+
+#: taskview.cpp:170
+msgid ""
+"In this exercise you have to solve the generated task. You have to enter "
+"numerator and denominator. You can adjust the difficulty of the task with the "
+"boxes in the toolbar. Do not forget to reduce the result!"
+msgstr ""
+"在此练习中您将解决一个自动生成的任务。您需要输入结果的分子和分母。您可以改变工具栏上的给出的参数来调节任务的难度。不要忘了把结果约分至最简分数！"
+
+#: kbruch.h:32
+msgid "KBruch"
+msgstr "KBruch"
+
+#: taskwidget.cpp:107
+msgid ""
+"_: division symbol\n"
+"/"
+msgstr "÷"
+
 #: exercisefactorize.cpp:121
 msgid "2"
 msgstr "2"
@@ -549,13 +560,3 @@ msgid ""
 msgstr ""
 "这里显示的是您的统计数据。您做的每个练习都被记录下来。 您可以通过按下面的按钮来重置统计。 "
 "另外，如果您不想看到统计，可以使用左边的垂直分栏来减小这部分窗口的尺寸。"
-
-#: exerciseconvert.cpp:170
-msgid "In this exercise you have to convert a number into a fraction."
-msgstr "在此练习中您要将一个数字转换成一个分数。"
-
-#: exerciseconvert.cpp:171
-msgid ""
-"In this exercise you have to convert a given number into a fraction by entering "
-"numerator and denominator. Do not forget to reduce the result!"
-msgstr "在此练习中您要将一个给定的数字转换成一个分数，输入转化结果的分子和分母。不要忘了将结果约分至最简分数！"
diff --git a/tde-i18n-zh_CN/messages/tdeedu/keduca.po b/tde-i18n-zh_CN/messages/tdeedu/keduca.po
index 4e4726d9052..ca5778ec212 100644
--- a/tde-i18n-zh_CN/messages/tdeedu/keduca.po
+++ b/tde-i18n-zh_CN/messages/tdeedu/keduca.po
@@ -8,243 +8,227 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: keduca\n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2008-01-30 11:07+0800\n"
 "Last-Translator: Wu XiaoGuang <woohsiaokuang@yahoo.com.cn>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: keducabuilder/main.cpp:26
-msgid "Form-based tests and exams builder"
-msgstr "基于表格的测验和考试创建器"
-
-#: keduca/main.cpp:30 keducabuilder/main.cpp:31
-msgid "File to load"
-msgstr "要载入的文件"
-
-#: keducabuilder/main.cpp:37
-msgid "KEducaBuilder"
-msgstr "KEducaBuilder"
-
-#: keduca/main.cpp:39 keducabuilder/main.cpp:40
-msgid "Original Author"
-msgstr "原作者"
-
-#: keduca/main.cpp:40 keducabuilder/main.cpp:41
-msgid "Maintainer 2002-2004"
-msgstr "维护者 2002-2004"
-
-#: keduca/main.cpp:42 keducabuilder/main.cpp:42
-msgid "Various fixes and cleanups"
-msgstr "各种修复和清理"
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "TDE 中文翻译组"
 
-#: keduca/main.cpp:44 keducabuilder/main.cpp:43
-msgid "Icons"
-msgstr "图标"
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "i18n-translation@lists.linux.net.cn"
 
-#: keducabuilder/kcontrolheader.cpp:30
+#: kcontrolheader.cpp:30
 msgid "Document Information"
 msgstr "文档信息"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 119
-#: keducabuilder/kcontrolheader.cpp:77 rc.cpp:104
+#. i18n: file kcontrolheaderbase.ui line 119
+#: kcontrolheader.cpp:77 rc.cpp:98
 #, no-c-format
 msgid "Description and rules of the project."
 msgstr "工程的描述和规则。"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 129
-#: keducabuilder/kcontrolheader.cpp:83 rc.cpp:107 rc.cpp:191
+#. i18n: file kcontrolheaderbase.ui line 129
+#: kcontrolheader.cpp:83 rc.cpp:101
 #, no-c-format
 msgid "Description"
 msgstr "描述"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 173
-#: keducabuilder/kcontrolheader.cpp:97 rc.cpp:119
+#. i18n: file kcontrolheaderbase.ui line 173
+#: kcontrolheader.cpp:97 rc.cpp:113
 #, no-c-format
 msgid "Type:"
 msgstr "类型："
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 224
-#: keducabuilder/kcontrolheader.cpp:110 rc.cpp:122
+#. i18n: file kcontrolheaderbase.ui line 224
+#: kcontrolheader.cpp:110 rc.cpp:116
 #, no-c-format
 msgid "Level:"
 msgstr "级别："
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 151
-#: keducabuilder/kcontrolheader.cpp:119 rc.cpp:113
+#. i18n: file kcontrolheaderbase.ui line 151
+#: kcontrolheader.cpp:119 rc.cpp:107
 #, no-c-format
 msgid "Language:"
 msgstr "语言："
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 162
-#: keducabuilder/kcontrolheader.cpp:128 rc.cpp:116
+#. i18n: file kcontrolheaderbase.ui line 162
+#: kcontrolheader.cpp:128 rc.cpp:110
 #, no-c-format
 msgid "Category:"
 msgstr "分类："
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 140
-#: keducabuilder/kcontrolheader.cpp:140 rc.cpp:110
+#. i18n: file kcontrolheaderbase.ui line 140
+#: kcontrolheader.cpp:140 rc.cpp:104
 #, no-c-format
 msgid "Title:"
 msgstr "标题："
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 252
-#: keducabuilder/kcontrolheader.cpp:148 rc.cpp:125
+#. i18n: file kcontrolheaderbase.ui line 252
+#: kcontrolheader.cpp:148 rc.cpp:119
 #, no-c-format
 msgid "Picture"
 msgstr "图片"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 263
-#: keducabuilder/kcontrolheader.cpp:158 rc.cpp:128
+#. i18n: file kcontrolheaderbase.ui line 263
+#: kcontrolheader.cpp:158 rc.cpp:122
 #, no-c-format
 msgid "Default picture:"
 msgstr "默认图片："
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 281
-#: keducabuilder/kcontrolheader.cpp:166 rc.cpp:131 rc.cpp:203
+#. i18n: file kcontrolheaderbase.ui line 281
+#: kcontrolheader.cpp:166 rc.cpp:125
 #, no-c-format
 msgid "Author"
 msgstr "作者"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 318
-#: keducabuilder/kcontrolheader.cpp:184 rc.cpp:137
+#. i18n: file kcontrolheaderbase.ui line 318
+#: kcontrolheader.cpp:184 rc.cpp:131
 #, no-c-format
 msgid "Web page:"
 msgstr "网页："
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 329
-#: keducabuilder/kcontrolheader.cpp:190 rc.cpp:140
+#. i18n: file kcontrolheaderbase.ui line 329
+#: kcontrolheader.cpp:190 rc.cpp:134
 #, no-c-format
 msgid "Email:"
 msgstr "电子邮件："
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 292
-#: keducabuilder/kcontrolheader.cpp:196 rc.cpp:134 rc.cpp:176
+#. i18n: file kcontrolheaderbase.ui line 292
+#: kcontrolheader.cpp:196 rc.cpp:128
 #, no-c-format
 msgid "Name:"
 msgstr "姓名："
 
-#: keducabuilder/kcontrolheader.cpp:340
+#: kcontrolheader.cpp:340
 msgid "Computers"
 msgstr "计算机"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 206
-#: keducabuilder/kcontrolheader.cpp:346 keducabuilder/keducabuilder.cpp:487
-#: rc.cpp:34
+#. i18n: file kcontroladdeditbase.ui line 206
+#: kcontrolheader.cpp:346 keducabuilder.cpp:487 rc.cpp:28
 #, no-c-format
 msgid "Test"
 msgstr "测验"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 211
-#: keducabuilder/kcontrolheader.cpp:347 rc.cpp:37
+#. i18n: file kcontroladdeditbase.ui line 211
+#: kcontrolheader.cpp:347 rc.cpp:31
 #, no-c-format
 msgid "Test with Question Points"
 msgstr "根据问题分值测验"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 216
-#: keducabuilder/kcontrolheader.cpp:348 rc.cpp:40
+#. i18n: file kcontroladdeditbase.ui line 216
+#: kcontrolheader.cpp:348 rc.cpp:34
 #, no-c-format
 msgid "Test with Answers Points"
 msgstr "根据回答分值测验"
 
-#: keducabuilder/kcontrolheader.cpp:349
+#: kcontrolheader.cpp:349
 msgid "Slidershow"
 msgstr "幻灯片"
 
-#: keducabuilder/kcontrolheader.cpp:350
+#: kcontrolheader.cpp:350
 msgid "Exam"
 msgstr "考试"
 
-#: keducabuilder/kcontrolheader.cpp:351
+#: kcontrolheader.cpp:351
 msgid "Psychotechnic Test"
 msgstr "心理测验"
 
-#: keducabuilder/kcontrolheader.cpp:354
+#: kcontrolheader.cpp:354
 msgid "Easy"
 msgstr "容易"
 
-#: keducabuilder/kcontrolheader.cpp:355
+#: kcontrolheader.cpp:355
 msgid "Normal"
 msgstr "普通"
 
-#: keducabuilder/kcontrolheader.cpp:356
+#: kcontrolheader.cpp:356
 msgid "Expert"
 msgstr "专家"
 
-#: keducabuilder/kcontrolheader.cpp:357
+#: kcontrolheader.cpp:357
 msgid "Supreme"
 msgstr "超级"
 
-#: keduca/keduca.cpp:67 keducabuilder/keducabuilder.cpp:116
+#: keducabuilder.cpp:116
 msgid "Open &Gallery..."
 msgstr "打开图库(&G)..."
 
-#: keducabuilder/keducabuilder.cpp:121
+#: keducabuilder.cpp:121
 msgid "Document Info"
 msgstr "文档信息"
 
-#: keducabuilder/keducabuilder.cpp:124
+#: keducabuilder.cpp:124
 msgid "&Add..."
 msgstr "添加(&A)..."
 
-#: keducabuilder/keducabuilder.cpp:125
+#: keducabuilder.cpp:125
 msgid "&Edit..."
 msgstr "编辑(&E)..."
 
-#: keducabuilder/keducabuilder.cpp:127
+#: keducabuilder.cpp:127
 msgid "&Up"
 msgstr "上(&U)"
 
-#: keducabuilder/keducabuilder.cpp:128
+#: keducabuilder.cpp:128
 msgid "&Down"
 msgstr "下(&D)"
 
-#: keducabuilder/keducabuilder.cpp:139
+#: keducabuilder.cpp:139
 msgid "Welcome To KEduca!"
 msgstr "欢迎使用 KEduca！"
 
-#: keducabuilder/keducabuilder.cpp:140
+#: keducabuilder.cpp:140
 msgid ""
 "Add a new Question by using the Edit Menu or by choosing one of the icons "
 "above."
 msgstr "使用编辑菜单或选择上面的任一图标可添加新问题。"
 
-#: keduca/keduca.cpp:76 keducabuilder/keducabuilder.cpp:151
+#: keducabuilder.cpp:151
 msgid "Open Educa File"
 msgstr "打开 Educa 文件"
 
-#: keduca/kgroupeduca.cpp:25 keducabuilder/keducabuilder.cpp:192
+#: keducabuilder.cpp:192
 msgid "Answers"
 msgstr "回答"
 
-#: keducabuilder/keducabuilder.cpp:222
+#: keducabuilder.cpp:222
 msgid "Question Image"
 msgstr "问题图像"
 
-#: keducabuilder/keducabuilder.cpp:228
+#: keducabuilder.cpp:228
 msgid "Question point"
 msgstr "问题分值"
 
-#: keduca/keducaview.cpp:459 keducabuilder/keducabuilder.cpp:234
+#: keducabuilder.cpp:234
 msgid "Time"
 msgstr "时间"
 
-#: keducabuilder/keducabuilder.cpp:236
+#: keducabuilder.cpp:236
 msgid " seconds</p>"
 msgstr " 秒数</p>"
 
-#: keducabuilder/keducabuilder.cpp:241
+#: keducabuilder.cpp:241
 msgid "Tip"
 msgstr "提示"
 
-#: keducabuilder/keducabuilder.cpp:249
+#: keducabuilder.cpp:249
 msgid "Explain"
 msgstr "解释"
 
-#: keducabuilder/keducabuilder.cpp:286
+#: keducabuilder.cpp:286
 msgid ""
 "The document \"%1\" has been modified.\n"
 "Do you want to save it?"
@@ -252,19 +236,19 @@ msgstr ""
 "文档“%1”已经修改。\n"
 "您是否想要保存？"
 
-#: keducabuilder/keducabuilder.cpp:288
+#: keducabuilder.cpp:288
 msgid "Save Document?"
 msgstr "保存文档吗？"
 
-#: keducabuilder/keducabuilder.cpp:409
+#: keducabuilder.cpp:409
 msgid "Compress the file"
 msgstr "压缩文件"
 
-#: keducabuilder/keducabuilder.cpp:413
+#: keducabuilder.cpp:413
 msgid "Save Document As"
 msgstr "文档另存为"
 
-#: keduca/keducaview.cpp:181 keducabuilder/keducabuilder.cpp:450
+#: keducabuilder.cpp:450
 msgid ""
 "A document with this name already exists.\n"
 "Do you want to overwrite it?"
@@ -272,11 +256,11 @@ msgstr ""
 "已经存在此名称的文档。\n"
 "您是否想要覆盖？"
 
-#: keduca/keducaview.cpp:183 keducabuilder/keducabuilder.cpp:452
+#: keducabuilder.cpp:452
 msgid "Overwrite"
 msgstr "覆盖"
 
-#: keducabuilder/keducabuilder.cpp:462
+#: keducabuilder.cpp:462
 msgid ""
 "If you want to share this document, it is better to copy the images to the same "
 "folder as the document.\n"
@@ -285,20 +269,20 @@ msgstr ""
 "如果您想要共享此文档，建议您将图像复制到文档所在文件夹。\n"
 "您是否想要复制图像？"
 
-#: keducabuilder/keducabuilder.cpp:464
+#: keducabuilder.cpp:464
 msgid "Copy Images"
 msgstr "复制图像"
 
-#: keducabuilder/keducabuilder.cpp:464
+#: keducabuilder.cpp:464
 msgid "Do Not Copy"
 msgstr "不复制"
 
-#: keducabuilder/keducabuilder.cpp:488
+#: keducabuilder.cpp:488
 #, c-format
 msgid "Print %1"
 msgstr "打印 %1"
 
-#: keducabuilder/keducabuilder.cpp:536
+#: keducabuilder.cpp:536
 msgid ""
 "Unable to save file.\n"
 "\n"
@@ -310,11 +294,11 @@ msgstr ""
 "您必须填满文档信息\n"
 "(只需描述)"
 
-#: keducabuilder/keducabuilder.cpp:536
+#: keducabuilder.cpp:536
 msgid "Complete Document Info..."
 msgstr "完整的文档信息..."
 
-#: keducabuilder/keducabuilder.cpp:546
+#: keducabuilder.cpp:546
 msgid ""
 "Unable to save file.\n"
 "\n"
@@ -324,235 +308,22 @@ msgstr ""
 "\n"
 "您必须插入一个问题。"
 
-#: keducabuilder/keducabuilder.cpp:547
+#: keducabuilder.cpp:547
 msgid "Insert Question"
 msgstr "插入问题"
 
-#: keducabuilder/keducaeditorstartdialog.cpp:109
-#: libkeduca/kgallerydialog.cpp:182
+#: keducaeditorstartdialog.cpp:109
 msgid "You need to specify the file to open!"
 msgstr "您需要指定要打开的文件！"
 
-#: keducabuilder/kcontroladdedit.cpp:56
-msgid "Modify Question"
-msgstr "修改问题"
-
-#: keducabuilder/kcontroladdedit.cpp:59
-msgid "Add Questions"
-msgstr "添加问题"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 592
-#: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: keducabuilder/kcontroladdedit.cpp:183 keducabuilder/kcontroladdedit.cpp:220
-#: rc.cpp:74
-#, no-c-format
-msgid "True"
-msgstr "对"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 587
-#: keducabuilder/kcontroladdedit.cpp:95 keducabuilder/kcontroladdedit.cpp:121
-#: rc.cpp:71
-#, no-c-format
-msgid "False"
-msgstr "错"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 696
-#: keducabuilder/kcontroladdedit.cpp:108 rc.cpp:89
-#, no-c-format
-msgid "&Add"
-msgstr "添加(&A)"
-
-#: libkeduca/kgallerydialog.cpp:168
-msgid "You need to specify a server!"
-msgstr "您需要指定服务器！"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "TDE 中文翻译组"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "i18n-translation@lists.linux.net.cn"
-
-#: keduca/keducaprefs.cpp:41
-msgid "Various Settings"
-msgstr "各种设置"
-
-#: keduca/keduca_part.cpp:84 keduca/keducaprefs.cpp:46
-msgid "General"
-msgstr "常规"
-
-#: keduca/keducaprefs.cpp:56
-msgid "Show results of the answer after press next"
-msgstr "按“下一个”后显示回答结果"
-
-#: keduca/keducaprefs.cpp:60
-msgid "Show results when finish the test"
-msgstr "完成测验后显示结果"
-
-#: keduca/keducaprefs.cpp:64
-msgid "Order"
-msgstr "顺序"
-
-#. i18n: file ./keduca/configdialogbase.ui line 67
-#: keduca/keducaprefs.cpp:74 rc.cpp:233
-#, no-c-format
-msgid "Show questions in random order"
-msgstr "以随机顺序显示问题"
-
-#. i18n: file ./keduca/configdialogbase.ui line 75
-#: keduca/keducaprefs.cpp:78 rc.cpp:236
-#, no-c-format
-msgid "Show answers in random order"
-msgstr "以随机顺序显示答案"
-
-#: keduca/main.cpp:25
-msgid "Form-based tests and exams"
-msgstr "基于表格的测验和考试"
-
-#: keduca/main.cpp:36
-msgid "KEduca"
-msgstr "KEduca"
-
-#: keduca/main.cpp:41
-msgid "Current Maintainer"
-msgstr "当前维护者"
-
-#: keduca/keduca_part.cpp:59
-msgid "KEducaPart"
-msgstr "KEducaPart"
-
-#: keduca/keduca_part.cpp:60
-msgid "KEduca KParts Component"
-msgstr "KEduca KParts 组件"
-
-#: keduca/keducaview.cpp:71
-msgid "&Start Test"
-msgstr "开始测试(&S)"
-
-#: keduca/keducaview.cpp:81 keduca/keducaview.cpp:96
-msgid "&Next >>"
-msgstr "下一个(&N) >>"
-
-#: keduca/keducaview.cpp:89
-msgid "&Save Results..."
-msgstr "保存结果(&S)..."
-
-#: keduca/keducaview.cpp:151
-msgid "Save Results As"
-msgstr "结果另存为"
-
-#: keduca/keducaview.cpp:192
-msgid "Save failed."
-msgstr "保存失败。"
-
-#: keduca/keducaview.cpp:212
-#, c-format
-msgid "Question %1"
-msgstr "问题 %1："
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 664
-#: keduca/keducaview.cpp:217 keduca/keducaview.cpp:482 rc.cpp:86
-#, no-c-format
-msgid "Points"
-msgstr "分值"
-
-#: keduca/keducaview.cpp:267
-msgid ""
-"You have %1 seconds to complete this question.\n"
-"\n"
-"Press OK when you are ready."
-msgstr ""
-"您有 %1 秒来完成这个问题。\n"
-"\n"
-"当您准备好之后请单击确定。"
-
-#: keduca/keducaview.cpp:376
-msgid "Result"
-msgstr "结果"
-
-#: keduca/keducaview.cpp:445
-msgid "Statistics"
-msgstr "统计"
-
-#: keduca/keducaview.cpp:446
-msgid "Correct questions"
-msgstr "正确答案"
-
-#: keduca/keducaview.cpp:448
-msgid "Incorrect questions"
-msgstr "错误答案"
-
-#: keduca/keducaview.cpp:452
-msgid "Total points"
-msgstr "总分"
-
-#: keduca/keducaview.cpp:453
-msgid "Correct points"
-msgstr "正确分数"
-
-#: keduca/keducaview.cpp:455
-msgid "Incorrect points"
-msgstr "不正确分数"
-
-#: keduca/keducaview.cpp:460
-msgid "Total time"
-msgstr "总计时间"
-
-#: keduca/keducaview.cpp:462
-msgid "Time in tests"
-msgstr "测试中的时间"
-
-#: keduca/keducaview.cpp:487
-msgid "The answer is: "
-msgstr "答案是："
-
-#: keduca/keducaview.cpp:489
-msgid "The correct answer is: "
-msgstr "正确的答案是："
-
-#: keduca/keducaview.cpp:495
-msgid "Your answer was: "
-msgstr "您的回答是："
-
-#: keduca/keducaview.cpp:550
-msgid "Title"
-msgstr "标题"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 212
-#: keduca/keducaview.cpp:551 rc.cpp:197
-#, no-c-format
-msgid "Category"
-msgstr "分类"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 223
-#: keduca/keducaview.cpp:552 rc.cpp:200
-#, no-c-format
-msgid "Type"
-msgstr "类型"
-
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 201
-#: keduca/keducaview.cpp:553 rc.cpp:194
-#, no-c-format
-msgid "Language"
-msgstr "语言"
-
-#: keduca/kquestion.cpp:56
-msgid "%v seconds left"
-msgstr "剩余 %v 秒"
-
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 20
-#: rc.cpp:15
+#. i18n: file kcontroladdeditbase.ui line 20
+#: rc.cpp:9
 #, no-c-format
 msgid "Question"
 msgstr "问题"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 120
-#: rc.cpp:18
+#. i18n: file kcontroladdeditbase.ui line 120
+#: rc.cpp:12
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
@@ -571,56 +342,56 @@ msgstr ""
 "<p>只需要问题与类型。</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 161
-#: rc.cpp:25
+#. i18n: file kcontroladdeditbase.ui line 161
+#: rc.cpp:19
 #, no-c-format
 msgid "&Question:"
 msgstr "问题(&Q)："
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 175
-#: rc.cpp:28
+#. i18n: file kcontroladdeditbase.ui line 175
+#: rc.cpp:22
 #, no-c-format
 msgid "&Type:"
 msgstr "类型(&T)："
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 189
-#: rc.cpp:31
+#. i18n: file kcontroladdeditbase.ui line 189
+#: rc.cpp:25
 #, no-c-format
 msgid "&Picture:"
 msgstr "图片(&P)："
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 228
-#: rc.cpp:43
+#. i18n: file kcontroladdeditbase.ui line 228
+#: rc.cpp:37
 #, no-c-format
 msgid "P&oint:"
 msgstr "分值(&O)："
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 242
-#: rc.cpp:46
+#. i18n: file kcontroladdeditbase.ui line 242
+#: rc.cpp:40
 #, no-c-format
 msgid "Ti&me:"
 msgstr "时间(&M)："
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 256
-#: rc.cpp:49
+#. i18n: file kcontroladdeditbase.ui line 256
+#: rc.cpp:43
 #, no-c-format
 msgid "T&ip:"
 msgstr "提示(&I)："
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 275
-#: rc.cpp:52
+#. i18n: file kcontroladdeditbase.ui line 275
+#: rc.cpp:46
 #, no-c-format
 msgid "&Explain:"
 msgstr "解释(&E)："
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 367
-#: rc.cpp:55 rc.cpp:80
+#. i18n: file kcontroladdeditbase.ui line 367
+#: rc.cpp:49 rc.cpp:74
 #, no-c-format
 msgid "Answer"
 msgstr "回答"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 467
-#: rc.cpp:58
+#. i18n: file kcontroladdeditbase.ui line 467
+#: rc.cpp:52
 #, no-c-format
 msgid ""
 "<span style=\"color:black\">\n"
@@ -639,140 +410,285 @@ msgstr ""
 "<p>只需要回答与数值。</p>\n"
 "</span>"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 553
-#: rc.cpp:65
+#. i18n: file kcontroladdeditbase.ui line 553
+#: rc.cpp:59
 #, no-c-format
 msgid "&Answer:"
 msgstr "回答(&A)："
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 567
-#: rc.cpp:68
+#. i18n: file kcontroladdeditbase.ui line 567
+#: rc.cpp:62
 #, no-c-format
 msgid "&Value:"
 msgstr "数值(&V)："
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 606
-#: rc.cpp:77
+#. i18n: file kcontroladdeditbase.ui line 587
+#: kcontroladdedit.cpp:95 kcontroladdedit.cpp:121 rc.cpp:65
+#, no-c-format
+msgid "False"
+msgstr "错"
+
+#. i18n: file kcontroladdeditbase.ui line 592
+#: kcontroladdedit.cpp:95 kcontroladdedit.cpp:121 kcontroladdedit.cpp:183
+#: kcontroladdedit.cpp:220 rc.cpp:68
+#, no-c-format
+msgid "True"
+msgstr "对"
+
+#. i18n: file kcontroladdeditbase.ui line 606
+#: rc.cpp:71
 #, no-c-format
 msgid "&Points:"
 msgstr "分值(&P)："
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 653
-#: rc.cpp:83
+#. i18n: file kcontroladdeditbase.ui line 653
+#: rc.cpp:77
 #, no-c-format
 msgid "Value"
 msgstr "数值"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 735
-#: rc.cpp:95
+#. i18n: file kcontroladdeditbase.ui line 664
+#: rc.cpp:80
+#, no-c-format
+msgid "Points"
+msgstr "分值"
+
+#. i18n: file kcontroladdeditbase.ui line 696
+#: kcontroladdedit.cpp:108 rc.cpp:83
+#, no-c-format
+msgid "&Add"
+msgstr "添加(&A)"
+
+#. i18n: file kcontroladdeditbase.ui line 735
+#: rc.cpp:89
 #, no-c-format
 msgid "Move &Up"
 msgstr "上移(&U)"
 
-#. i18n: file ./keducabuilder/kcontroladdeditbase.ui line 746
-#: rc.cpp:98
+#. i18n: file kcontroladdeditbase.ui line 746
+#: rc.cpp:92
 #, no-c-format
 msgid "Move &Down"
 msgstr "下移(&D)"
 
-#. i18n: file ./keducabuilder/kcontrolheaderbase.ui line 92
-#: rc.cpp:101
+#. i18n: file kcontrolheaderbase.ui line 92
+#: rc.cpp:95
 #, no-c-format
 msgid "<b  style=\"text-decoration:underline;\">Information</b>"
 msgstr "<b  style=\"text-decoration:underline;\">信息</b>"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 16
-#: rc.cpp:149
+#. i18n: file keducaeditorstartdialogbase.ui line 16
+#: rc.cpp:143
 #, no-c-format
 msgid "Editor - Getting Started"
 msgstr "编辑器 - 入门"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 76
-#: rc.cpp:152
+#. i18n: file keducaeditorstartdialogbase.ui line 76
+#: rc.cpp:146
 #, no-c-format
 msgid "Open an &existing document:"
 msgstr "打开已有文档(&E)："
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 127
-#: rc.cpp:155
+#. i18n: file keducaeditorstartdialogbase.ui line 127
+#: rc.cpp:149
 #, no-c-format
 msgid "Open a &recent document:"
 msgstr "打开最近的文档(&R)："
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 176
-#: rc.cpp:158
+#. i18n: file keducaeditorstartdialogbase.ui line 176
+#: rc.cpp:152
 #, no-c-format
 msgid "Open with Internet gallery browser"
 msgstr "用 Internet 图库浏览器打开"
 
-#. i18n: file ./keducabuilder/keducaeditorstartdialogbase.ui line 184
-#: rc.cpp:161
+#. i18n: file keducaeditorstartdialogbase.ui line 184
+#: rc.cpp:155
 #, no-c-format
 msgid "Start a &new document"
 msgstr "开始新文档(&N)"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 16
-#: rc.cpp:173
-#, no-c-format
-msgid "Gallery"
-msgstr "图库"
+#: main.cpp:26
+msgid "Form-based tests and exams builder"
+msgstr "基于表格的测验和考试创建器"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 72
-#: rc.cpp:179
-#, no-c-format
-msgid "Address:"
-msgstr "地址："
+#: main.cpp:31
+msgid "File to load"
+msgstr "要载入的文件"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 118
-#: rc.cpp:182
-#, no-c-format
-msgid "&Add Server"
-msgstr "添加服务器(&A)"
+#: main.cpp:37
+msgid "KEducaBuilder"
+msgstr "KEducaBuilder"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 157
-#: rc.cpp:185
-#, no-c-format
-msgid "Servers"
-msgstr "服务器"
+#: main.cpp:40
+msgid "Original Author"
+msgstr "原作者"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 168
-#: rc.cpp:188 rc.cpp:206
-#, no-c-format
-msgid "Address"
-msgstr "地址"
+#: main.cpp:41
+msgid "Maintainer 2002-2004"
+msgstr "维护者 2002-2004"
 
-#. i18n: file ./libkeduca/kgallerydialogbase.ui line 315
-#: rc.cpp:212
-#, no-c-format
-msgid "&Open"
-msgstr "打开(&O)"
+#: main.cpp:42
+msgid "Various fixes and cleanups"
+msgstr "各种修复和清理"
 
-#. i18n: file ./keduca/configdialogbase.ui line 16
-#: rc.cpp:218
-#, no-c-format
-msgid "KEduca Config Dialog"
-msgstr "KEduca 配置对话框"
+#: main.cpp:43
+msgid "Icons"
+msgstr "图标"
 
-#. i18n: file ./keduca/configdialogbase.ui line 27
-#: rc.cpp:221
-#, no-c-format
-msgid "Show Results"
-msgstr "显示结果"
+#: kcontroladdedit.cpp:56
+msgid "Modify Question"
+msgstr "修改问题"
 
-#. i18n: file ./keduca/configdialogbase.ui line 38
-#: rc.cpp:224
-#, no-c-format
-msgid "At the end of the test"
-msgstr "测验结束后"
+#: kcontroladdedit.cpp:59
+msgid "Add Questions"
+msgstr "添加问题"
 
-#. i18n: file ./keduca/configdialogbase.ui line 46
-#: rc.cpp:227
-#, no-c-format
-msgid "After answering each question"
-msgstr "回答每个问题后"
+#~ msgid "You need to specify a server!"
+#~ msgstr "您需要指定服务器！"
 
-#. i18n: file ./keduca/configdialogbase.ui line 56
-#: rc.cpp:230
-#, no-c-format
-msgid "Ordering"
-msgstr "顺序"
+#~ msgid "Various Settings"
+#~ msgstr "各种设置"
+
+#~ msgid "General"
+#~ msgstr "常规"
+
+#~ msgid "Show results of the answer after press next"
+#~ msgstr "按“下一个”后显示回答结果"
+
+#~ msgid "Show results when finish the test"
+#~ msgstr "完成测验后显示结果"
+
+#~ msgid "Order"
+#~ msgstr "顺序"
+
+#~ msgid "Show questions in random order"
+#~ msgstr "以随机顺序显示问题"
+
+#~ msgid "Show answers in random order"
+#~ msgstr "以随机顺序显示答案"
+
+#~ msgid "Form-based tests and exams"
+#~ msgstr "基于表格的测验和考试"
+
+#~ msgid "KEduca"
+#~ msgstr "KEduca"
+
+#~ msgid "Current Maintainer"
+#~ msgstr "当前维护者"
+
+#~ msgid "KEducaPart"
+#~ msgstr "KEducaPart"
+
+#~ msgid "KEduca KParts Component"
+#~ msgstr "KEduca KParts 组件"
+
+#~ msgid "&Start Test"
+#~ msgstr "开始测试(&S)"
+
+#~ msgid "&Next >>"
+#~ msgstr "下一个(&N) >>"
+
+#~ msgid "&Save Results..."
+#~ msgstr "保存结果(&S)..."
+
+#~ msgid "Save Results As"
+#~ msgstr "结果另存为"
+
+#~ msgid "Save failed."
+#~ msgstr "保存失败。"
+
+#~ msgid "Question %1"
+#~ msgstr "问题 %1："
+
+#~ msgid ""
+#~ "You have %1 seconds to complete this question.\n"
+#~ "\n"
+#~ "Press OK when you are ready."
+#~ msgstr ""
+#~ "您有 %1 秒来完成这个问题。\n"
+#~ "\n"
+#~ "当您准备好之后请单击确定。"
+
+#~ msgid "Result"
+#~ msgstr "结果"
+
+#~ msgid "Statistics"
+#~ msgstr "统计"
+
+#~ msgid "Correct questions"
+#~ msgstr "正确答案"
+
+#~ msgid "Incorrect questions"
+#~ msgstr "错误答案"
+
+#~ msgid "Total points"
+#~ msgstr "总分"
+
+#~ msgid "Correct points"
+#~ msgstr "正确分数"
+
+#~ msgid "Incorrect points"
+#~ msgstr "不正确分数"
+
+#~ msgid "Total time"
+#~ msgstr "总计时间"
+
+#~ msgid "Time in tests"
+#~ msgstr "测试中的时间"
+
+#~ msgid "The answer is: "
+#~ msgstr "答案是："
+
+#~ msgid "The correct answer is: "
+#~ msgstr "正确的答案是："
+
+#~ msgid "Your answer was: "
+#~ msgstr "您的回答是："
+
+#~ msgid "Title"
+#~ msgstr "标题"
+
+#~ msgid "Category"
+#~ msgstr "分类"
+
+#~ msgid "Type"
+#~ msgstr "类型"
+
+#~ msgid "Language"
+#~ msgstr "语言"
+
+#~ msgid "%v seconds left"
+#~ msgstr "剩余 %v 秒"
+
+#~ msgid "Gallery"
+#~ msgstr "图库"
+
+#~ msgid "Address:"
+#~ msgstr "地址："
+
+#~ msgid "&Add Server"
+#~ msgstr "添加服务器(&A)"
+
+#~ msgid "Servers"
+#~ msgstr "服务器"
+
+#~ msgid "Address"
+#~ msgstr "地址"
+
+#~ msgid "&Open"
+#~ msgstr "打开(&O)"
+
+#~ msgid "KEduca Config Dialog"
+#~ msgstr "KEduca 配置对话框"
+
+#~ msgid "Show Results"
+#~ msgstr "显示结果"
+
+#~ msgid "At the end of the test"
+#~ msgstr "测验结束后"
+
+#~ msgid "After answering each question"
+#~ msgstr "回答每个问题后"
+
+#~ msgid "Ordering"
+#~ msgstr "顺序"
diff --git a/tde-i18n-zh_CN/messages/tdeedu/kgeography.po b/tde-i18n-zh_CN/messages/tdeedu/kgeography.po
index eefd5759600..ab3d9155432 100644
--- a/tde-i18n-zh_CN/messages/tdeedu/kgeography.po
+++ b/tde-i18n-zh_CN/messages/tdeedu/kgeography.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kgeography\n"
-"POT-Creation-Date: 2007-03-02 02:46+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-09-04 20:52+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeedu/khangman.po b/tde-i18n-zh_CN/messages/tdeedu/khangman.po
index d799059dfd6..3c6e03c29a1 100644
--- a/tde-i18n-zh_CN/messages/tdeedu/khangman.po
+++ b/tde-i18n-zh_CN/messages/tdeedu/khangman.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: khangman\n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-01-14 18:03+0800\n"
 "Last-Translator: Yan Shuangchun <yahzee@d3eye.com>\n"
 "Language-Team: zh_CN  <18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,6 +29,18 @@ msgid ""
 "the words; otherwise leave it untranslated as a reminder)"
 msgstr ""
 
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Wu XiaoGuang, 颜双春"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "woohsiaokuang@yahoo.com.cn, yahzee@d3eye.com"
+
 #: khangmanview.cpp:66
 msgid "G&uess"
 msgstr "猜测(&U)"
@@ -82,165 +95,105 @@ msgstr ""
 "没有找到 $TDEDIR/share/apps/khangman/data/%1/%2 文件！\n"
 "请检查你的安装！"
 
-#: timer.cpp:33 timer.cpp:34 timer.cpp:42 timer.cpp:43
-#, fuzzy
-msgid "seconds"
-msgstr "声音"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Wu XiaoGuang, 颜双春"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "woohsiaokuang@yahoo.com.cn, yahzee@d3eye.com"
-
-#: main.cpp:32
-msgid "Classical hangman game for TDE"
-msgstr "TDE-教育的古典绞刑吏游戏"
-
-#: main.cpp:44
-msgid "KHangMan"
-msgstr "K绞刑吏"
-
-#: main.cpp:48
-msgid "Previous maintainer"
-msgstr "较早前的维护者"
-
-#: main.cpp:50
-msgid "Actual maintainer, author"
-msgstr "当前维护者、作者"
-
-#: main.cpp:52
-msgid "Graphics"
-msgstr "图形"
-
-#: main.cpp:54
-msgid "Swedish data files, coding help, transparent pictures and i18n fixes"
-msgstr "瑞典语数据文件，编程帮助，透明图片和 i18n 修正"
-
-#: main.cpp:56
-msgid "Nature theme background"
-msgstr "自然主题背景"
-
-#: main.cpp:58
-msgid "Blue theme background, icons"
-msgstr "蓝色主题背景，图标"
-
-#: main.cpp:60
-msgid "Spanish data files"
-msgstr "西班牙语数据文件"
-
-#: main.cpp:62
-msgid "Danish data files"
-msgstr "丹麦语数据文件"
-
-#: main.cpp:64
-msgid "Finnish data files"
-msgstr "芬兰语数据文件"
-
-#: main.cpp:66
-msgid "Brazilian Portuguese data files"
-msgstr "巴西葡萄牙语数据文件"
+#: khangman.cpp:77
+msgid "&New"
+msgstr "新建(&N)"
 
-#: main.cpp:68
-msgid "Catalan data files"
-msgstr "加泰隆尼亚语数据文件"
+#: khangman.cpp:78
+msgid "Play with a new word"
+msgstr ""
 
-#: main.cpp:70
-msgid "Italian data files"
-msgstr "意大利语数据文件"
+#: khangman.cpp:81
+#, fuzzy
+msgid "&Get Words in New Language..."
+msgstr "获得新语言的数据(&G)..."
 
-#: main.cpp:72
-msgid "Dutch data files"
-msgstr "荷兰语数据文件"
+#: khangman.cpp:85
+msgid "Le&vel"
+msgstr "级别(&V)"
 
-#: main.cpp:74
-#, fuzzy
-msgid "Czech data files"
-msgstr "荷兰语数据文件"
+#: khangman.cpp:86
+msgid "Choose the level"
+msgstr "选择级别"
 
-#: main.cpp:76
-#, fuzzy
-msgid "Hungarian data files"
-msgstr "意大利语数据文件"
+#: khangman.cpp:87
+msgid "Choose the level of difficulty"
+msgstr "选择难度级别"
 
-#: main.cpp:78
-msgid "Norwegian (Bokmål) data files"
+#: khangman.cpp:91
+msgid "&Language"
 msgstr ""
 
-#: main.cpp:80
-#, fuzzy
-msgid "Tajik data files"
-msgstr "丹麦语数据文件"
-
-#: main.cpp:82
-msgid "Serbian (Cyrillic and Latin) data files"
+#: khangman.cpp:100
+msgid "L&ook"
 msgstr ""
 
-#: main.cpp:84
+#: khangman.cpp:101
 #, fuzzy
-msgid "Slovenian data files"
-msgstr "意大利语数据文件"
+msgid "&Sea Theme"
+msgstr "蓝色主题(&B)"
 
-#: main.cpp:86
+#: khangman.cpp:102
 #, fuzzy
-msgid "Portuguese data files"
-msgstr "巴西葡萄牙语数据文件"
+msgid "&Desert Theme"
+msgstr "蓝色主题(&B)"
 
-#: main.cpp:88
-#, fuzzy
-msgid "Norwegian (Nynorsk) data files"
-msgstr "意大利语数据文件"
+#: khangman.cpp:105 khangman.cpp:106
+msgid "Choose the look and feel"
+msgstr "选择观感"
 
-#: main.cpp:90
-#, fuzzy
-msgid "Turkish data files"
-msgstr "丹麦语数据文件"
+#: khangman.cpp:148
+msgid "First letter upper case"
+msgstr ""
 
-#: main.cpp:92
-#, fuzzy
-msgid "Russian data files"
-msgstr "意大利语数据文件"
+#: khangman.cpp:243
+msgid "Cyrillic"
+msgstr ""
 
-#: main.cpp:94
-#, fuzzy
-msgid "Bulgarian data files"
-msgstr "意大利语数据文件"
+#: khangman.cpp:247
+msgid "Latin"
+msgstr "拉丁"
 
-#: main.cpp:96
-#, fuzzy
-msgid "Irish (Gaelic) data files"
-msgstr "意大利语数据文件"
+#: khangman.cpp:371
+msgid "General"
+msgstr ""
 
-#: main.cpp:98
-msgid "Softer Hangman Pictures"
-msgstr "Softer Hangman 图片"
+#: khangman.cpp:378
+msgid "Languages"
+msgstr ""
 
-#: main.cpp:100 main.cpp:102 main.cpp:104
-msgid "Coding help"
-msgstr "编程帮助"
+#. i18n: file timerdlg.ui line 24
+#: khangman.cpp:381 rc.cpp:67
+#, no-c-format
+msgid "Timers"
+msgstr ""
 
-#: main.cpp:106
-msgid "Coding help, fixed a lot of things"
+#: khangman.cpp:437
+#, fuzzy
+msgid ""
+"File $TDEDIR/share/apps/khangman/%1.txt not found;\n"
+"check your installation."
 msgstr ""
+"没有找到 $TDEDIR/share/apps/khangman/data/%1/%2 文件！\n"
+"请检查你的安装！"
 
-#: main.cpp:108
+#: khangman.cpp:460
+#, c-format
+msgid "Inserts the character %1"
+msgstr "插入字符 %1"
+
+#: khangman.cpp:534
 #, fuzzy
-msgid "SVG icon"
-msgstr "SVG 图标"
+msgid "Hint on right-click"
+msgstr "鼠标右击开启暗示"
 
-#: main.cpp:110
-msgid "Code for generating icons for the characters toolbar"
+#: khangman.cpp:536
+msgid "Hint available"
 msgstr ""
 
-#: main.cpp:112
-msgid "Code cleaning"
-msgstr ""
+#: khangman.cpp:542
+msgid "Type accented letters"
+msgstr "输入重音字母"
 
 #. i18n: file advanced.ui line 32
 #: rc.cpp:3
@@ -397,12 +350,6 @@ msgid ""
 "Default is no sound."
 msgstr ""
 
-#. i18n: file timerdlg.ui line 24
-#: khangman.cpp:381 rc.cpp:67
-#, no-c-format
-msgid "Timers"
-msgstr ""
-
 #. i18n: file timerdlg.ui line 64
 #: rc.cpp:70
 #, no-c-format
@@ -457,99 +404,153 @@ msgstr "主要"
 msgid "Special Characters"
 msgstr ""
 
-#: khangman.cpp:77
-msgid "&New"
-msgstr "新建(&N)"
+#: timer.cpp:33 timer.cpp:34 timer.cpp:42 timer.cpp:43
+#, fuzzy
+msgid "seconds"
+msgstr "声音"
 
-#: khangman.cpp:78
-msgid "Play with a new word"
-msgstr ""
+#: main.cpp:32
+msgid "Classical hangman game for TDE"
+msgstr "TDE-教育的古典绞刑吏游戏"
 
-#: khangman.cpp:81
-#, fuzzy
-msgid "&Get Words in New Language..."
-msgstr "获得新语言的数据(&G)..."
+#: main.cpp:44
+msgid "KHangMan"
+msgstr "K绞刑吏"
 
-#: khangman.cpp:85
-msgid "Le&vel"
-msgstr "级别(&V)"
+#: main.cpp:48
+msgid "Previous maintainer"
+msgstr "较早前的维护者"
 
-#: khangman.cpp:86
-msgid "Choose the level"
-msgstr "选择级别"
+#: main.cpp:50
+msgid "Actual maintainer, author"
+msgstr "当前维护者、作者"
 
-#: khangman.cpp:87
-msgid "Choose the level of difficulty"
-msgstr "选择难度级别"
+#: main.cpp:52
+msgid "Graphics"
+msgstr "图形"
 
-#: khangman.cpp:91
-msgid "&Language"
-msgstr ""
+#: main.cpp:54
+msgid "Swedish data files, coding help, transparent pictures and i18n fixes"
+msgstr "瑞典语数据文件，编程帮助，透明图片和 i18n 修正"
 
-#: khangman.cpp:100
-msgid "L&ook"
-msgstr ""
+#: main.cpp:56
+msgid "Nature theme background"
+msgstr "自然主题背景"
 
-#: khangman.cpp:101
-#, fuzzy
-msgid "&Sea Theme"
-msgstr "蓝色主题(&B)"
+#: main.cpp:58
+msgid "Blue theme background, icons"
+msgstr "蓝色主题背景，图标"
 
-#: khangman.cpp:102
+#: main.cpp:60
+msgid "Spanish data files"
+msgstr "西班牙语数据文件"
+
+#: main.cpp:62
+msgid "Danish data files"
+msgstr "丹麦语数据文件"
+
+#: main.cpp:64
+msgid "Finnish data files"
+msgstr "芬兰语数据文件"
+
+#: main.cpp:66
+msgid "Brazilian Portuguese data files"
+msgstr "巴西葡萄牙语数据文件"
+
+#: main.cpp:68
+msgid "Catalan data files"
+msgstr "加泰隆尼亚语数据文件"
+
+#: main.cpp:70
+msgid "Italian data files"
+msgstr "意大利语数据文件"
+
+#: main.cpp:72
+msgid "Dutch data files"
+msgstr "荷兰语数据文件"
+
+#: main.cpp:74
 #, fuzzy
-msgid "&Desert Theme"
-msgstr "蓝色主题(&B)"
+msgid "Czech data files"
+msgstr "荷兰语数据文件"
 
-#: khangman.cpp:105 khangman.cpp:106
-msgid "Choose the look and feel"
-msgstr "选择观感"
+#: main.cpp:76
+#, fuzzy
+msgid "Hungarian data files"
+msgstr "意大利语数据文件"
 
-#: khangman.cpp:148
-msgid "First letter upper case"
+#: main.cpp:78
+msgid "Norwegian (Bokmål) data files"
 msgstr ""
 
-#: khangman.cpp:243
-msgid "Cyrillic"
+#: main.cpp:80
+#, fuzzy
+msgid "Tajik data files"
+msgstr "丹麦语数据文件"
+
+#: main.cpp:82
+msgid "Serbian (Cyrillic and Latin) data files"
 msgstr ""
 
-#: khangman.cpp:247
-msgid "Latin"
-msgstr "拉丁"
+#: main.cpp:84
+#, fuzzy
+msgid "Slovenian data files"
+msgstr "意大利语数据文件"
 
-#: khangman.cpp:371
-msgid "General"
-msgstr ""
+#: main.cpp:86
+#, fuzzy
+msgid "Portuguese data files"
+msgstr "巴西葡萄牙语数据文件"
 
-#: khangman.cpp:378
-msgid "Languages"
-msgstr ""
+#: main.cpp:88
+#, fuzzy
+msgid "Norwegian (Nynorsk) data files"
+msgstr "意大利语数据文件"
 
-#: khangman.cpp:437
+#: main.cpp:90
 #, fuzzy
-msgid ""
-"File $TDEDIR/share/apps/khangman/%1.txt not found;\n"
-"check your installation."
-msgstr ""
-"没有找到 $TDEDIR/share/apps/khangman/data/%1/%2 文件！\n"
-"请检查你的安装！"
+msgid "Turkish data files"
+msgstr "丹麦语数据文件"
 
-#: khangman.cpp:460
-#, c-format
-msgid "Inserts the character %1"
-msgstr "插入字符 %1"
+#: main.cpp:92
+#, fuzzy
+msgid "Russian data files"
+msgstr "意大利语数据文件"
 
-#: khangman.cpp:534
+#: main.cpp:94
 #, fuzzy
-msgid "Hint on right-click"
-msgstr "鼠标右击开启暗示"
+msgid "Bulgarian data files"
+msgstr "意大利语数据文件"
 
-#: khangman.cpp:536
-msgid "Hint available"
+#: main.cpp:96
+#, fuzzy
+msgid "Irish (Gaelic) data files"
+msgstr "意大利语数据文件"
+
+#: main.cpp:98
+msgid "Softer Hangman Pictures"
+msgstr "Softer Hangman 图片"
+
+#: main.cpp:100 main.cpp:102 main.cpp:104
+msgid "Coding help"
+msgstr "编程帮助"
+
+#: main.cpp:106
+msgid "Coding help, fixed a lot of things"
 msgstr ""
 
-#: khangman.cpp:542
-msgid "Type accented letters"
-msgstr "输入重音字母"
+#: main.cpp:108
+#, fuzzy
+msgid "SVG icon"
+msgstr "SVG 图标"
+
+#: main.cpp:110
+msgid "Code for generating icons for the characters toolbar"
+msgstr ""
+
+#: main.cpp:112
+msgid "Code cleaning"
+msgstr ""
 
 #~ msgid "Animals"
 #~ msgstr "动物"
diff --git a/tde-i18n-zh_CN/messages/tdeedu/kig.po b/tde-i18n-zh_CN/messages/tdeedu/kig.po
index 2e4eb4acdad..bac6d6645e0 100644
--- a/tde-i18n-zh_CN/messages/tdeedu/kig.po
+++ b/tde-i18n-zh_CN/messages/tdeedu/kig.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kig\n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2007-02-17 14:30+0800\n"
 "Last-Translator: Yonghui Tao <taoyh@msn.com>\n"
 "Language-Team: Chinese(Simplified) <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -260,13 +261,13 @@ msgid "&Keep aspect ratio"
 msgstr "保留纵横比(&K)"
 
 #. i18n: file filters/imageexporteroptionsbase.ui line 132
-#: kig/kig_part.cpp:136 rc.cpp:136 rc.cpp:145 rc.cpp:157
+#: kig/kig_part.cpp:134 rc.cpp:136 rc.cpp:145 rc.cpp:157
 #, no-c-format
 msgid "Show grid"
 msgstr "显示网格"
 
 #. i18n: file filters/imageexporteroptionsbase.ui line 140
-#: kig/kig_part.cpp:139 rc.cpp:139 rc.cpp:148 rc.cpp:160
+#: kig/kig_part.cpp:137 rc.cpp:139 rc.cpp:148 rc.cpp:160
 #, no-c-format
 msgid "Show axes"
 msgstr "显示坐标轴"
@@ -1472,15 +1473,15 @@ msgstr "固定点"
 msgid "Enter the coordinates for the new point."
 msgstr "输入新点的坐标。"
 
-#: kig/kig_part.cpp:623 misc/kigfiledialog.cc:55 modes/typesdialog.cpp:173
+#: kig/kig_part.cpp:621 misc/kigfiledialog.cc:55 modes/typesdialog.cpp:175
 msgid "The file \"%1\" already exists. Do you wish to overwrite it?"
 msgstr "文件“%1”已经存在。是否覆盖？"
 
-#: kig/kig_part.cpp:624 misc/kigfiledialog.cc:56 modes/typesdialog.cpp:175
+#: kig/kig_part.cpp:622 misc/kigfiledialog.cc:56 modes/typesdialog.cpp:177
 msgid "Overwrite File?"
 msgstr "覆盖文件吗？"
 
-#: kig/kig_part.cpp:624 misc/kigfiledialog.cc:56 modes/typesdialog.cpp:175
+#: kig/kig_part.cpp:622 misc/kigfiledialog.cc:56 modes/typesdialog.cpp:177
 msgid "Overwrite"
 msgstr "覆盖"
 
@@ -2030,7 +2031,7 @@ msgstr "更改点样式"
 msgid "Change Object Style"
 msgstr "更改物体样式"
 
-#: kig/kig_part.cpp:245 modes/popup.cc:980
+#: kig/kig_part.cpp:243 modes/popup.cc:980
 msgid "U&nhide All"
 msgstr "全部取消隐藏(&N)"
 
@@ -4250,125 +4251,125 @@ msgstr "删除 %1 物体"
 msgid "Add %1 Objects"
 msgstr "添加 %1 物体"
 
-#: kig/kig_part.cpp:84
+#: kig/kig_part.cpp:82
 msgid "KigPart"
 msgstr "KigPart"
 
-#: kig/kig_part.cpp:98
+#: kig/kig_part.cpp:96
 msgid "&Set Coordinate System"
 msgstr "设置坐标系(&S)"
 
-#: kig/kig_part.cpp:132
+#: kig/kig_part.cpp:130
 msgid "Kig Options"
 msgstr "Kig 选项"
 
-#: kig/kig_part.cpp:224
+#: kig/kig_part.cpp:222
 msgid "Invert Selection"
 msgstr "反转选中内容"
 
-#: kig/kig_part.cpp:233
+#: kig/kig_part.cpp:231
 msgid "&Delete Objects"
 msgstr "删除物体(&D)"
 
-#: kig/kig_part.cpp:235
+#: kig/kig_part.cpp:233
 msgid "Delete the selected objects"
 msgstr "删除选中的物体"
 
-#: kig/kig_part.cpp:238
+#: kig/kig_part.cpp:236
 msgid "Cancel Construction"
 msgstr "取消构造"
 
-#: kig/kig_part.cpp:241
+#: kig/kig_part.cpp:239
 msgid "Cancel the construction of the object being constructed"
 msgstr "取消即将构造物体的构造"
 
-#: kig/kig_part.cpp:247
+#: kig/kig_part.cpp:245
 msgid "Show all hidden objects"
 msgstr "显示所有隐藏物体"
 
-#: kig/kig_part.cpp:251
+#: kig/kig_part.cpp:249
 msgid "&New Macro..."
 msgstr "新建宏(&N)..."
 
-#: kig/kig_part.cpp:253
+#: kig/kig_part.cpp:251
 msgid "Define a new macro"
 msgstr "定义一个新宏"
 
-#: kig/kig_part.cpp:256
+#: kig/kig_part.cpp:254
 msgid "Manage &Types..."
 msgstr "管理类型(&T)..."
 
-#: kig/kig_part.cpp:258
+#: kig/kig_part.cpp:256
 msgid "Manage macro types."
 msgstr "管理宏的类型。"
 
-#: kig/kig_part.cpp:265 kig/kig_part.cpp:266
+#: kig/kig_part.cpp:263 kig/kig_part.cpp:264
 msgid "Zoom in on the document"
 msgstr "放大文档"
 
-#: kig/kig_part.cpp:270 kig/kig_part.cpp:271
+#: kig/kig_part.cpp:268 kig/kig_part.cpp:269
 msgid "Zoom out of the document"
 msgstr "缩小文档"
 
-#: kig/kig_part.cpp:277 kig/kig_part.cpp:278
+#: kig/kig_part.cpp:275 kig/kig_part.cpp:276
 msgid "Recenter the screen on the document"
 msgstr "将文档重新显示在屏幕中心"
 
-#: kig/kig_part.cpp:290
+#: kig/kig_part.cpp:288
 msgid "Full Screen"
 msgstr "全屏"
 
-#: kig/kig_part.cpp:294 kig/kig_part.cpp:295
+#: kig/kig_part.cpp:292 kig/kig_part.cpp:293
 msgid "View this document full-screen."
 msgstr "全屏查看此文档。"
 
-#: kig/kig_part.cpp:299
+#: kig/kig_part.cpp:297
 msgid "&Select Shown Area"
 msgstr "显示显示的区域(&S)"
 
-#: kig/kig_part.cpp:301 kig/kig_part.cpp:302
+#: kig/kig_part.cpp:299 kig/kig_part.cpp:300
 msgid "Select the area that you want to be shown in the window."
 msgstr "选择您想要在窗口中显示的区域。"
 
-#: kig/kig_part.cpp:305
+#: kig/kig_part.cpp:303
 msgid "S&elect Zoom Area"
 msgstr "选择缩放区域(&E)"
 
-#: kig/kig_part.cpp:311
+#: kig/kig_part.cpp:309
 msgid "Show &Grid"
 msgstr "显示网格(&G)"
 
-#: kig/kig_part.cpp:313
+#: kig/kig_part.cpp:311
 msgid "Show or hide the grid."
 msgstr "显示或隐藏网格。"
 
-#: kig/kig_part.cpp:317
+#: kig/kig_part.cpp:315
 msgid "Show &Axes"
 msgstr "显示坐标轴(&A)"
 
-#: kig/kig_part.cpp:319
+#: kig/kig_part.cpp:317
 msgid "Show or hide the axes."
 msgstr "显示或隐藏坐标轴"
 
-#: kig/kig_part.cpp:323
+#: kig/kig_part.cpp:321
 msgid "Wear Infrared Glasses"
 msgstr ""
 
-#: kig/kig_part.cpp:325
+#: kig/kig_part.cpp:323
 msgid "Enable/Disable hidden objects visibility."
 msgstr "启用/禁用隐藏对象的可见性。"
 
-#: kig/kig_part.cpp:373
+#: kig/kig_part.cpp:371
 msgid ""
 "The file \"%1\" you tried to open does not exist. Please verify that you "
 "entered the correct path."
 msgstr "您试图打开的文件“%1”不存在。请检查您输入的路径是否正确。"
 
-#: kig/kig_part.cpp:375
+#: kig/kig_part.cpp:373
 msgid "File Not Found"
 msgstr "文件未找到"
 
-#: kig/kig_part.cpp:390
+#: kig/kig_part.cpp:388
 msgid ""
 "You tried to open a document of type \"%1\"; unfortunately, Kig does not "
 "support this format. If you think the format in question would be worth "
@@ -4376,21 +4377,21 @@ msgid ""
 "mailto:toscano.pino@tiscali.it or do the work yourself and send me a patch."
 msgstr ""
 
-#: kig/kig_part.cpp:396 kig/kig_part.cpp:439
+#: kig/kig_part.cpp:394 kig/kig_part.cpp:437
 msgid "Format Not Supported"
 msgstr "格式不支持"
 
-#: kig/kig_part.cpp:437
+#: kig/kig_part.cpp:435
 msgid ""
 "Kig does not support saving to any other file format than its own. Save to "
 "Kig's format instead?"
 msgstr "Kig 不支持保存为其它文件格式。您是否想要将其保存为 Kig 的格式？"
 
-#: kig/kig_part.cpp:439
+#: kig/kig_part.cpp:437
 msgid "Save Kig Format"
 msgstr "保存 Kig 格式"
 
-#: kig/kig_part.cpp:612
+#: kig/kig_part.cpp:610
 msgid ""
 "*.kig|Kig Documents (*.kig)\n"
 "*.kigz|Compressed Kig Documents (*.kigz)"
@@ -4398,18 +4399,18 @@ msgstr ""
 "*.kig|Kig 文档(*.kig)\n"
 "*.kigz|压缩的 Kig 文档(*.kigz)"
 
-#: kig/kig_part.cpp:790
+#: kig/kig_part.cpp:780
 msgid "Print Geometry"
 msgstr "打印几何"
 
-#: kig/kig_part.cpp:863
+#: kig/kig_part.cpp:853
 #, c-format
 msgid ""
 "_n: Hide %n Object\n"
 "Hide %n Objects"
 msgstr "隐藏 %n 个物体"
 
-#: kig/kig_part.cpp:882
+#: kig/kig_part.cpp:872
 #, c-format
 msgid ""
 "_n: Show %n Object\n"
@@ -4510,26 +4511,26 @@ msgstr "设置直角坐标系"
 msgid "Set Polar Coordinate System"
 msgstr "设置极坐标系"
 
-#: modes/typesdialog.cpp:82
+#: modes/typesdialog.cpp:84
 msgid "&Edit..."
 msgstr "编辑(&E)..."
 
-#: modes/typesdialog.cpp:85
+#: modes/typesdialog.cpp:87
 msgid "E&xport..."
 msgstr "导出(&X)..."
 
-#: modes/typesdialog.cpp:141
+#: modes/typesdialog.cpp:143
 #, c-format
 msgid ""
 "_n: Are you sure you want to delete this type?\n"
 "Are you sure you want to delete these %n types?"
 msgstr "您确定要删除这 %n 个类型吗？"
 
-#: modes/typesdialog.cpp:142
+#: modes/typesdialog.cpp:144
 msgid "Are You Sure?"
 msgstr "您确定吗？"
 
-#: modes/typesdialog.cpp:168 modes/typesdialog.cpp:183
+#: modes/typesdialog.cpp:170 modes/typesdialog.cpp:185
 msgid ""
 "*.kigt|Kig Types Files\n"
 "*|All Files"
@@ -4537,21 +4538,21 @@ msgstr ""
 "*.kigt|Kig 类型文件\n"
 "*|全部文件"
 
-#: modes/typesdialog.cpp:168
+#: modes/typesdialog.cpp:170
 msgid "Export Types"
 msgstr "导出类型"
 
-#: modes/typesdialog.cpp:183
+#: modes/typesdialog.cpp:185
 msgid "Import Types"
 msgstr "导入类型"
 
-#: modes/typesdialog.cpp:234
+#: modes/typesdialog.cpp:236
 msgid ""
 "There is more than one type selected. You can only edit one type at a time. "
 "Please select only the type you want to edit and try again."
 msgstr "选中了多个类型。您一次只能编辑一种类型。请只选择您想要编辑的类型，然后再试一次。"
 
-#: modes/typesdialog.cpp:237
+#: modes/typesdialog.cpp:239
 msgid "More Than One Type Selected"
 msgstr "选中了多个类型"
 
diff --git a/tde-i18n-zh_CN/messages/tdeedu/kiten.po b/tde-i18n-zh_CN/messages/tdeedu/kiten.po
index dc3de421147..6c30c9e570f 100644
--- a/tde-i18n-zh_CN/messages/tdeedu/kiten.po
+++ b/tde-i18n-zh_CN/messages/tdeedu/kiten.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kiten\n"
-"POT-Creation-Date: 2005-04-20 15:09+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2008-01-30 11:04+0800\n"
 "Last-Translator: Xiong Jiang <jxiong@offtopic.org>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeedu/klatin.po b/tde-i18n-zh_CN/messages/tdeedu/klatin.po
index c2ece3b4a45..3627befe93d 100644
--- a/tde-i18n-zh_CN/messages/tdeedu/klatin.po
+++ b/tde-i18n-zh_CN/messages/tdeedu/klatin.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klatin\n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-12-25 21:13+0800\n"
 "Last-Translator: Wu XiaoGuang <woohsiaokuang@yahoo.com.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeedu/klettres.po b/tde-i18n-zh_CN/messages/tdeedu/klettres.po
index e68bd675fd4..bf9f68104b4 100644
--- a/tde-i18n-zh_CN/messages/tdeedu/klettres.po
+++ b/tde-i18n-zh_CN/messages/tdeedu/klettres.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klettres\n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-12-25 21:05+0800\n"
 "Last-Translator: Wu XiaoGuang <woohsiaokuang@yahoo.com.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeedu/kmplot.po b/tde-i18n-zh_CN/messages/tdeedu/kmplot.po
index 154f2435b51..f7261ebd748 100644
--- a/tde-i18n-zh_CN/messages/tdeedu/kmplot.po
+++ b/tde-i18n-zh_CN/messages/tdeedu/kmplot.po
@@ -7,210 +7,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmplot\n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-12-23 21:00+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: kmplotio.cpp:229 kparametereditor.cpp:143
-msgid "The file does not exist."
-msgstr "文件不存在。"
-
-#: kmplotio.cpp:235 kmplotio.cpp:245 kparametereditor.cpp:154
-#: kparametereditor.cpp:195
-msgid "An error appeared when opening this file"
-msgstr "打开此文件时出错"
-
-#: kmplotio.cpp:250
-msgid "The file could not be loaded"
-msgstr "无法装入此文件"
-
-#: kmplotio.cpp:289
-msgid "The file had an unknown version number"
-msgstr "文件的版本号未知"
-
-#. i18n: file settingspagescaling.ui line 192
-#: View.cpp:1147 kmplotio.cpp:326 rc.cpp:1360 rc.cpp:1441 rc.cpp:3014
-#: rc.cpp:3095
-#, no-c-format
-msgid "automatic"
-msgstr "自动"
-
-#: kmplotio.cpp:541
-msgid "The function %1 could not be loaded"
-msgstr "无法装入函数 %1"
-
-#: coordsconfigdialog.cpp:57 coordsconfigdialog.cpp:72 editfunction.cpp:220
-#: keditparametric.cpp:154 keditpolar.cpp:138 kminmax.cpp:243
-msgid "The minimum range value must be lower than the maximum range value"
-msgstr "最小范围值必须低于最大范围值"
-
-#: editfunction.cpp:311 keditparametric.cpp:177 keditpolar.cpp:160
-#: kminmax.cpp:293
-msgid "Function could not be found"
-msgstr "找不到函数"
-
-#: ksliderwindow.cpp:48
-#, c-format
-msgid "Slider %1"
-msgstr "滑块 %1"
-
-#: ksliderwindow.cpp:49
-#, c-format
-msgid "Slider no. %1"
-msgstr "第 %1 个滑块"
-
-#: ksliderwindow.cpp:50
-msgid ""
-"Move slider to change the parameter of the function plot connected to this "
-"slider."
-msgstr "移动滑块可以更改与此滑块相关的函数图的参数。"
-
-#: ksliderwindow.cpp:64
-msgid "&Change Minimum Value"
-msgstr "更改最小值(&C)"
-
-#: ksliderwindow.cpp:66
-msgid "&Change Maximum Value"
-msgstr "更改最大值(&C)"
-
-#: ksliderwindow.cpp:102
-msgid "Change Minimum Value"
-msgstr "更改最小值"
-
-#: ksliderwindow.cpp:102
-msgid "Type a new minimum value for the slider:"
-msgstr "输入滑块的新最小值："
-
-#: ksliderwindow.cpp:113
-msgid "Change Maximum Value"
-msgstr "更改最大值"
-
-#: ksliderwindow.cpp:113
-msgid "Type a new maximum value for the slider:"
-msgstr "输入滑块的新最大值："
-
-#: kprinterdlg.cpp:39
-msgid "KmPlot Options"
-msgstr "KmPlot 选项"
-
-#: kprinterdlg.cpp:45
-msgid "Print header table"
-msgstr "打印头表格"
-
-#: kprinterdlg.cpp:46
-msgid "Transparent background"
-msgstr "透明背景"
-
-#: parser.cpp:534
-msgid "This function is depending on an other function"
-msgstr "此函数依赖其它函数"
-
-#: parser.cpp:961
-msgid ""
-"Parser error at position %1:\n"
-"Syntax error"
-msgstr ""
-"分析器错误，出错位置 %1：\n"
-"语法错误"
-
-#: parser.cpp:964
-msgid ""
-"Parser error at position %1:\n"
-"Missing parenthesis"
-msgstr ""
-"分析器错误，出错位置 %1：\n"
-"缺少括号"
-
-#: parser.cpp:967
-msgid ""
-"Parser error at position %1:\n"
-"Function name unknown"
-msgstr ""
-"分析器错误，出错位置 %1：\n"
-"未知函数名称"
-
-#: parser.cpp:970
-msgid ""
-"Parser error at position %1:\n"
-"Void function variable"
-msgstr ""
-"分析器错误，出错位置 %1：\n"
-"无效函数变量"
-
-#: parser.cpp:973
-msgid ""
-"Parser error at position %1:\n"
-"Too many functions"
-msgstr ""
-"分析器错误，出错位置 %1：\n"
-"太多函数"
-
-#: parser.cpp:976
-msgid ""
-"Parser error at position %1:\n"
-"Token-memory overflow"
-msgstr ""
-"分析器错误，出错位置 %1：\n"
-"标记内存溢出"
-
-#: parser.cpp:979
-msgid ""
-"Parser error at position %1:\n"
-"Stack overflow"
-msgstr ""
-"分析器错误，出错位置 %1：\n"
-"栈溢出"
-
-#: parser.cpp:982
-msgid ""
-"Parser error at position %1:\n"
-"Name of function not free."
-msgstr ""
-"分析器错误，出错位置 %1：\n"
-"函数名称不自由。"
-
-#: parser.cpp:985
-msgid ""
-"Parser error at position %1:\n"
-"recursive function not allowed."
-msgstr ""
-"分析器错误，出错位置 %1：\n"
-"不允许递归函数。"
-
-#: parser.cpp:988
-#, c-format
-msgid "Could not find a defined constant at position %1."
-msgstr "在位置 %1 处找不到定义的常量。"
-
-#: parser.cpp:991
-msgid "Empty function"
-msgstr "空函数"
-
-#: parser.cpp:993
-msgid "The function name is not allowed to contain capital letters."
-msgstr "函数名不允许包含大写字母。"
-
-#: parser.cpp:995
-msgid "Function could not be found."
-msgstr "找不到函数。"
-
-#: parser.cpp:997
-msgid "The expression must not contain user-defined constants."
-msgstr "列出用户定义的常量。"
-
-#: keditconstant.cpp:61
-msgid "Please insert a valid constant name between A and Z."
-msgstr "请插入一个 A 到 Z 之间的有效常量。"
-
-#: keditconstant.cpp:78
-msgid "The constant already exists."
-msgstr "常量已经存在。"
-
 #: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -223,41 +29,39 @@ msgid ""
 "Your emails"
 msgstr "sarahs@redhat.com,fundawang@linux.net.cn"
 
-#: main.cpp:43
-msgid "Mathematical function plotter for TDE"
-msgstr "TDE 桌面的数学函数绘图器"
-
-#: main.cpp:47
-msgid "File to open"
-msgstr "要打开的文件"
-
-#: main.cpp:57
-msgid "KmPlot"
-msgstr "KmPlot"
+#: kmplot.cpp:77
+msgid "Could not find KmPlot's part."
+msgstr "找不到 KmPlot 部件。"
 
-#: main.cpp:63
-msgid "Original Author"
-msgstr "原作者"
+#: kmplot.cpp:228
+msgid ""
+"*.fkt|KmPlot Files (*.fkt)\n"
+"*.*|All Files"
+msgstr ""
+"*.fkt|KmPlot 文件 (*.fkt)\n"
+"*.*|所有文件"
 
-#: main.cpp:66
-msgid "GUI"
-msgstr "GUI"
+#: xparser.cpp:120
+msgid "Error in extension."
+msgstr "扩展中出错。"
 
-#: main.cpp:68
-msgid "Various improvements"
-msgstr "各种改进"
+#: xparser.cpp:769
+msgid "There are no other Kmplot instances running"
+msgstr "目前没有其它正在运行的 Kmplot"
 
-#: main.cpp:69
-msgid "svg icon"
-msgstr "SVG 图标"
+#: xparser.cpp:781
+msgid "kmplot"
+msgstr "kmplot"
 
-#: main.cpp:70
-msgid "command line options, MIME type"
-msgstr "命令行选项，MIME 类型"
+#: xparser.cpp:781
+msgid ""
+"Choose which KmPlot instance\n"
+"you want to copy the function to:"
+msgstr "选择您想要将函数复制到哪个 KmPlot 实例："
 
-#: keditparametric.cpp:108
-msgid "Recursive function not allowed"
-msgstr "不允许递归函数"
+#: xparser.cpp:807 xparser.cpp:816
+msgid "An error appeared during the transfer"
+msgstr "传送过程中出错"
 
 #: kparametereditor.cpp:81 kparametereditor.cpp:107
 msgid "Parameter Value"
@@ -279,6 +83,15 @@ msgstr "值 %1 已经添加。"
 msgid "*.txt|Plain Text File "
 msgstr "*.txt|纯文本文件"
 
+#: kmplotio.cpp:229 kparametereditor.cpp:143
+msgid "The file does not exist."
+msgstr "文件不存在。"
+
+#: kmplotio.cpp:235 kmplotio.cpp:245 kparametereditor.cpp:154
+#: kparametereditor.cpp:195
+msgid "An error appeared when opening this file"
+msgstr "打开此文件时出错"
+
 #: kparametereditor.cpp:182
 msgid ""
 "Line %1 is not a valid parameter value and will therefore not be included. Do "
@@ -446,10 +259,20 @@ msgstr "计算 x 值和绘制结果所围成区域的定积分"
 msgid "Please choose a function"
 msgstr "请选择函数"
 
+#: coordsconfigdialog.cpp:57 coordsconfigdialog.cpp:72 editfunction.cpp:220
+#: keditparametric.cpp:154 keditpolar.cpp:138 kminmax.cpp:243
+msgid "The minimum range value must be lower than the maximum range value"
+msgstr "最小范围值必须低于最大范围值"
+
 #: editfunction.cpp:229 kminmax.cpp:251
 msgid "Please insert a minimum and maximum range between %1 and %2"
 msgstr "请插入 %1 和 %2 之间的最小值和最大值范围"
 
+#: editfunction.cpp:311 keditparametric.cpp:177 keditpolar.cpp:160
+#: kminmax.cpp:293
+msgid "Function could not be found"
+msgstr "找不到函数"
+
 #: kminmax.cpp:301
 msgid "You must choose a parameter for that function"
 msgstr "您必须为函数选择参数"
@@ -504,18 +327,6 @@ msgstr "选择参数"
 msgid "Choose a parameter to use:"
 msgstr "选择要使用的参数："
 
-#: kmplot.cpp:77
-msgid "Could not find KmPlot's part."
-msgstr "找不到 KmPlot 部件。"
-
-#: kmplot.cpp:228
-msgid ""
-"*.fkt|KmPlot Files (*.fkt)\n"
-"*.*|All Files"
-msgstr ""
-"*.fkt|KmPlot 文件 (*.fkt)\n"
-"*.*|所有文件"
-
 #: FktDlg.cpp:188 MainDlg.cpp:466
 msgid "New Function Plot"
 msgstr "新建函数图"
@@ -534,6 +345,268 @@ msgstr "新建参数方程图"
 msgid "New Polar Plot"
 msgstr "新建极坐标图"
 
+#: coordsconfigdialog.cpp:39
+msgid "Coords"
+msgstr "坐标"
+
+#: coordsconfigdialog.cpp:39
+msgid "Edit Coordinate System"
+msgstr "编辑坐标系"
+
+#: keditparametric.cpp:108
+msgid "Recursive function not allowed"
+msgstr "不允许递归函数"
+
+#: MainDlg.cpp:94
+msgid "Enter a function equation, for example: f(x)=x^2"
+msgstr "输入一个函数方程，如 f(x)=x^2"
+
+#: MainDlg.cpp:108
+msgid "General"
+msgstr "常规"
+
+#: MainDlg.cpp:108
+msgid "General Settings"
+msgstr "常规设置"
+
+#: MainDlg.cpp:109
+msgid "Constants"
+msgstr "常量"
+
+#: MainDlg.cpp:133
+msgid "Configure KmPlot..."
+msgstr "配置 KmPlot..."
+
+#: MainDlg.cpp:140
+msgid "E&xport..."
+msgstr "导出(&X)..."
+
+#: MainDlg.cpp:143
+msgid "&No Zoom"
+msgstr "不缩放(&N)"
+
+#: MainDlg.cpp:144
+msgid "Zoom &Rectangular"
+msgstr "矩形缩放(&R)"
+
+#: MainDlg.cpp:145
+msgid "Zoom &In"
+msgstr "放大(&I)"
+
+#: MainDlg.cpp:146
+msgid "Zoom &Out"
+msgstr "缩小(&O)"
+
+#: MainDlg.cpp:147
+msgid "&Center Point"
+msgstr "中点(&C)"
+
+#: MainDlg.cpp:148
+msgid "&Fit Widget to Trigonometric Functions"
+msgstr "部件适合三角函数(&F)"
+
+#: MainDlg.cpp:157
+msgid "Predefined &Math Functions"
+msgstr "预定义的数学函数(&M)"
+
+#: MainDlg.cpp:160
+msgid "&Colors..."
+msgstr "颜色(&C)..."
+
+#: MainDlg.cpp:161
+msgid "&Coordinate System..."
+msgstr "坐标系(&C)..."
+
+#: MainDlg.cpp:163
+msgid "&Scaling..."
+msgstr "缩放(&S)..."
+
+#: MainDlg.cpp:164
+msgid "&Fonts..."
+msgstr "字体(&F)..."
+
+#: MainDlg.cpp:166
+msgid "Coordinate System I"
+msgstr "坐标系 I"
+
+#: MainDlg.cpp:167
+msgid "Coordinate System II"
+msgstr "坐标系 II"
+
+#: MainDlg.cpp:168
+msgid "Coordinate System III"
+msgstr "坐标系 III"
+
+#: MainDlg.cpp:171
+msgid "&New Function Plot..."
+msgstr "新建函数图(&N)..."
+
+#: MainDlg.cpp:172
+msgid "New Parametric Plot..."
+msgstr "新建参数函数图..."
+
+#: MainDlg.cpp:173
+msgid "New Polar Plot..."
+msgstr "新建极坐标图..."
+
+#: MainDlg.cpp:174
+msgid "Edit Plots..."
+msgstr "编辑图..."
+
+#: MainDlg.cpp:177
+msgid "&Get y-Value..."
+msgstr "获得 y 值(&G)..."
+
+#: MainDlg.cpp:178
+msgid "&Search for Minimum Value..."
+msgstr "搜索最小值(&S)..."
+
+#: MainDlg.cpp:179
+msgid "&Search for Maximum Value..."
+msgstr "搜索最大值(&S)..."
+
+#: MainDlg.cpp:180
+msgid "&Calculate Integral"
+msgstr "计算积分(&C)"
+
+#: MainDlg.cpp:183
+msgid "Quick Edit"
+msgstr "快速编辑"
+
+#: MainDlg.cpp:184
+msgid ""
+"Enter a simple function equation here.\n"
+"For instance: f(x)=x^2\n"
+"For more options use Functions->Edit Plots... menu."
+msgstr ""
+"在此输入简单函数方程。\n"
+"例如：f(x)=x^2\n"
+"要查看更改选项，请使用函数->编辑图...菜单。"
+
+#: MainDlg.cpp:187
+msgid "Show Slider 1"
+msgstr "显示滑块 1"
+
+#: MainDlg.cpp:188
+msgid "Show Slider 2"
+msgstr "显示滑块 2"
+
+#: MainDlg.cpp:189
+msgid "Show Slider 3"
+msgstr "显示滑块 3"
+
+#: MainDlg.cpp:190
+msgid "Show Slider 4"
+msgstr "显示滑块 4"
+
+#. i18n: file editfunctionpage.ui line 91
+#: MainDlg.cpp:193 rc.cpp:229 rc.cpp:1883
+#, no-c-format
+msgid "&Hide"
+msgstr "隐藏(&H)"
+
+#: MainDlg.cpp:202
+msgid "&Move"
+msgstr "移动(&M)"
+
+#: MainDlg.cpp:214
+msgid ""
+"The plot has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"绘图已经修改。\n"
+"您想要保存吗？"
+
+#: MainDlg.cpp:252
+msgid ""
+"This file is saved with an old file format; if you save it, you cannot open the "
+"file with older versions of Kmplot. Are you sure you want to continue?"
+msgstr "此文件是以旧文件格式保存的；如果您保存的话，您将无法使用旧版本的 KmPlot 打开该文件。您确定想要继续吗？"
+
+#: MainDlg.cpp:252
+msgid "Save New Format"
+msgstr "保存新格式"
+
+#: MainDlg.cpp:266
+msgid ""
+"*.fkt|KmPlot Files (*.fkt)\n"
+"*|All Files"
+msgstr ""
+"*.fkt|KmPlot 文件 (*.fkt)\n"
+"*|所有文件"
+
+#: MainDlg.cpp:274
+msgid "The file could not be saved"
+msgstr "无法保存文件"
+
+#: MainDlg.cpp:290
+msgid ""
+"*.svg|Scalable Vector Graphics (*.svg)\n"
+"*.bmp|Bitmap 180dpi (*.bmp)\n"
+"*.png|Bitmap 180dpi (*.png)"
+msgstr ""
+"*.svg|可缩放矢量图像(*.svg)\n"
+"*.bmp|180dpi 位图(*.bmp)\n"
+"*.png|180dpi 位图(*.png)"
+
+#: MainDlg.cpp:309 MainDlg.cpp:325 MainDlg.cpp:341
+msgid "The URL could not be saved."
+msgstr "无法保存 URL。"
+
+#: MainDlg.cpp:395
+msgid "Print Plot"
+msgstr "打印图像"
+
+#: MainDlg.cpp:407
+msgid "Colors"
+msgstr "颜色"
+
+#: MainDlg.cpp:407
+msgid "Edit Colors"
+msgstr "编辑颜色"
+
+#: MainDlg.cpp:433
+msgid "Scale"
+msgstr "比例"
+
+#: MainDlg.cpp:433
+msgid "Edit Scaling"
+msgstr "编辑缩放"
+
+#: MainDlg.cpp:445
+msgid "Edit Fonts"
+msgstr "编辑字体"
+
+#: MainDlg.cpp:538
+msgid ""
+"Parametric functions must be definied in the \"New Parametric Plot\"-dialog "
+"which you can find in the menubar"
+msgstr "参数函数必须在“新建参数函数图”对话框中定义，您可菜单栏中找到这一功能"
+
+#: MainDlg.cpp:543
+msgid "Recursive function is not allowed"
+msgstr "不允许使用递归函数"
+
+#: MainDlg.cpp:802
+msgid "KmPlotPart"
+msgstr "KmPlotPart"
+
+#: kconstanteditor.cpp:95
+msgid "A function uses this constant; therefore, it cannot be removed."
+msgstr "有函数使用此常量；所以无法删除此常量。"
+
+#: kconstanteditor.cpp:111 kconstanteditor.cpp:190
+msgid "The item could not be found."
+msgstr "找不到项目。"
+
+#: kconstanteditor.cpp:158
+msgid "Choose Name"
+msgstr "选择名称"
+
+#: kconstanteditor.cpp:158
+msgid "Choose a name for the constant:"
+msgstr "选择常量名称："
+
 #. i18n: file kmplot_part.rc line 23
 #: rc.cpp:6
 #, no-c-format
@@ -798,12 +871,6 @@ msgstr ""
 msgid "Extensions"
 msgstr "扩展"
 
-#. i18n: file editfunctionpage.ui line 91
-#: MainDlg.cpp:193 rc.cpp:229 rc.cpp:1883
-#, no-c-format
-msgid "&Hide"
-msgstr "隐藏(&H)"
-
 #. i18n: file editfunctionpage.ui line 94
 #: rc.cpp:232 rc.cpp:346 rc.cpp:540 rc.cpp:652 rc.cpp:1886 rc.cpp:2000
 #: rc.cpp:2194 rc.cpp:2306
@@ -2398,6 +2465,13 @@ msgstr "与上面的设置类型，但此处设置打印或在屏幕上绘制时
 msgid "cm"
 msgstr "cm"
 
+#. i18n: file settingspagescaling.ui line 192
+#: View.cpp:1147 kmplotio.cpp:326 rc.cpp:1360 rc.cpp:1441 rc.cpp:3014
+#: rc.cpp:3095
+#, no-c-format
+msgid "automatic"
+msgstr "自动"
+
 #. i18n: file settingspagescaling.ui line 199
 #: rc.cpp:1363 rc.cpp:3017
 #, no-c-format
@@ -2945,6 +3019,58 @@ msgstr "缩小步进"
 msgid "The value the zoom-out tool should use"
 msgstr "缩小工具应该使用的值"
 
+#: ksliderwindow.cpp:48
+#, c-format
+msgid "Slider %1"
+msgstr "滑块 %1"
+
+#: ksliderwindow.cpp:49
+#, c-format
+msgid "Slider no. %1"
+msgstr "第 %1 个滑块"
+
+#: ksliderwindow.cpp:50
+msgid ""
+"Move slider to change the parameter of the function plot connected to this "
+"slider."
+msgstr "移动滑块可以更改与此滑块相关的函数图的参数。"
+
+#: ksliderwindow.cpp:64
+msgid "&Change Minimum Value"
+msgstr "更改最小值(&C)"
+
+#: ksliderwindow.cpp:66
+msgid "&Change Maximum Value"
+msgstr "更改最大值(&C)"
+
+#: ksliderwindow.cpp:102
+msgid "Change Minimum Value"
+msgstr "更改最小值"
+
+#: ksliderwindow.cpp:102
+msgid "Type a new minimum value for the slider:"
+msgstr "输入滑块的新最小值："
+
+#: ksliderwindow.cpp:113
+msgid "Change Maximum Value"
+msgstr "更改最大值"
+
+#: ksliderwindow.cpp:113
+msgid "Type a new maximum value for the slider:"
+msgstr "输入滑块的新最大值："
+
+#: kmplotio.cpp:250
+msgid "The file could not be loaded"
+msgstr "无法装入此文件"
+
+#: kmplotio.cpp:289
+msgid "The file had an unknown version number"
+msgstr "文件的版本号未知"
+
+#: kmplotio.cpp:541
+msgid "The function %1 could not be loaded"
+msgstr "无法装入函数 %1"
+
 #: View.cpp:440 View.cpp:1783
 msgid "The drawing was cancelled by the user."
 msgstr "绘图已被用户取消。"
@@ -2985,305 +3111,180 @@ msgstr "根"
 msgid "Are you sure you want to remove this function?"
 msgstr "您确定想要删除此函数吗？"
 
-#: xparser.cpp:120
-msgid "Error in extension."
-msgstr "扩展中出错。"
-
-#: xparser.cpp:769
-msgid "There are no other Kmplot instances running"
-msgstr "目前没有其它正在运行的 Kmplot"
-
-#: xparser.cpp:781
-msgid "kmplot"
-msgstr "kmplot"
-
-#: xparser.cpp:781
-msgid ""
-"Choose which KmPlot instance\n"
-"you want to copy the function to:"
-msgstr "选择您想要将函数复制到哪个 KmPlot 实例："
-
-#: xparser.cpp:807 xparser.cpp:816
-msgid "An error appeared during the transfer"
-msgstr "传送过程中出错"
-
-#: kconstanteditor.cpp:95
-msgid "A function uses this constant; therefore, it cannot be removed."
-msgstr "有函数使用此常量；所以无法删除此常量。"
-
-#: kconstanteditor.cpp:111 kconstanteditor.cpp:190
-msgid "The item could not be found."
-msgstr "找不到项目。"
-
-#: kconstanteditor.cpp:158
-msgid "Choose Name"
-msgstr "选择名称"
-
-#: kconstanteditor.cpp:158
-msgid "Choose a name for the constant:"
-msgstr "选择常量名称："
-
-#: MainDlg.cpp:94
-msgid "Enter a function equation, for example: f(x)=x^2"
-msgstr "输入一个函数方程，如 f(x)=x^2"
-
-#: MainDlg.cpp:108
-msgid "General"
-msgstr "常规"
-
-#: MainDlg.cpp:108
-msgid "General Settings"
-msgstr "常规设置"
-
-#: MainDlg.cpp:109
-msgid "Constants"
-msgstr "常量"
-
-#: MainDlg.cpp:133
-msgid "Configure KmPlot..."
-msgstr "配置 KmPlot..."
-
-#: MainDlg.cpp:140
-msgid "E&xport..."
-msgstr "导出(&X)..."
-
-#: MainDlg.cpp:143
-msgid "&No Zoom"
-msgstr "不缩放(&N)"
-
-#: MainDlg.cpp:144
-msgid "Zoom &Rectangular"
-msgstr "矩形缩放(&R)"
-
-#: MainDlg.cpp:145
-msgid "Zoom &In"
-msgstr "放大(&I)"
-
-#: MainDlg.cpp:146
-msgid "Zoom &Out"
-msgstr "缩小(&O)"
-
-#: MainDlg.cpp:147
-msgid "&Center Point"
-msgstr "中点(&C)"
-
-#: MainDlg.cpp:148
-msgid "&Fit Widget to Trigonometric Functions"
-msgstr "部件适合三角函数(&F)"
-
-#: MainDlg.cpp:157
-msgid "Predefined &Math Functions"
-msgstr "预定义的数学函数(&M)"
-
-#: MainDlg.cpp:160
-msgid "&Colors..."
-msgstr "颜色(&C)..."
-
-#: MainDlg.cpp:161
-msgid "&Coordinate System..."
-msgstr "坐标系(&C)..."
-
-#: MainDlg.cpp:163
-msgid "&Scaling..."
-msgstr "缩放(&S)..."
-
-#: MainDlg.cpp:164
-msgid "&Fonts..."
-msgstr "字体(&F)..."
+#: keditconstant.cpp:61
+msgid "Please insert a valid constant name between A and Z."
+msgstr "请插入一个 A 到 Z 之间的有效常量。"
 
-#: MainDlg.cpp:166
-msgid "Coordinate System I"
-msgstr "坐标系 I"
+#: keditconstant.cpp:78
+msgid "The constant already exists."
+msgstr "常量已经存在。"
 
-#: MainDlg.cpp:167
-msgid "Coordinate System II"
-msgstr "坐标系 II"
+#: editfunction.cpp:62
+msgid "Function"
+msgstr "函数"
 
-#: MainDlg.cpp:168
-msgid "Coordinate System III"
-msgstr "坐标系 III"
+#: editfunction.cpp:64
+msgid "Derivatives"
+msgstr "导函数"
 
-#: MainDlg.cpp:171
-msgid "&New Function Plot..."
-msgstr "新建函数图(&N)..."
+#: editfunction.cpp:70
+#, c-format
+msgid "Slider No. %1"
+msgstr "第 %1 个滑块"
 
-#: MainDlg.cpp:172
-msgid "New Parametric Plot..."
-msgstr "新建参数函数图..."
+#: editfunction.cpp:180
+msgid "You can only define plot functions in this dialog"
+msgstr "您只能在此对话框中定义绘图函数"
 
-#: MainDlg.cpp:173
-msgid "New Polar Plot..."
-msgstr "新建极坐标图..."
+#: editfunction.cpp:247
+msgid "Please insert a valid x-value"
+msgstr "请插入有效的 x 值"
 
-#: MainDlg.cpp:174
-msgid "Edit Plots..."
-msgstr "编辑图..."
+#: editfunction.cpp:259
+msgid "Please insert a valid y-value"
+msgstr "请插入有效的 y 值"
 
-#: MainDlg.cpp:177
-msgid "&Get y-Value..."
-msgstr "获得 y 值(&G)..."
+#: editfunction.cpp:301
+msgid "Recursive function is only allowed when drawing integral graphs"
+msgstr "只能在绘制积分图时使用递归函数"
 
-#: MainDlg.cpp:178
-msgid "&Search for Minimum Value..."
-msgstr "搜索最小值(&S)..."
+#: kprinterdlg.cpp:39
+msgid "KmPlot Options"
+msgstr "KmPlot 选项"
 
-#: MainDlg.cpp:179
-msgid "&Search for Maximum Value..."
-msgstr "搜索最大值(&S)..."
+#: kprinterdlg.cpp:45
+msgid "Print header table"
+msgstr "打印头表格"
 
-#: MainDlg.cpp:180
-msgid "&Calculate Integral"
-msgstr "计算积分(&C)"
+#: kprinterdlg.cpp:46
+msgid "Transparent background"
+msgstr "透明背景"
 
-#: MainDlg.cpp:183
-msgid "Quick Edit"
-msgstr "快速编辑"
+#: parser.cpp:534
+msgid "This function is depending on an other function"
+msgstr "此函数依赖其它函数"
 
-#: MainDlg.cpp:184
+#: parser.cpp:961
 msgid ""
-"Enter a simple function equation here.\n"
-"For instance: f(x)=x^2\n"
-"For more options use Functions->Edit Plots... menu."
+"Parser error at position %1:\n"
+"Syntax error"
 msgstr ""
-"在此输入简单函数方程。\n"
-"例如：f(x)=x^2\n"
-"要查看更改选项，请使用函数->编辑图...菜单。"
-
-#: MainDlg.cpp:187
-msgid "Show Slider 1"
-msgstr "显示滑块 1"
-
-#: MainDlg.cpp:188
-msgid "Show Slider 2"
-msgstr "显示滑块 2"
-
-#: MainDlg.cpp:189
-msgid "Show Slider 3"
-msgstr "显示滑块 3"
-
-#: MainDlg.cpp:190
-msgid "Show Slider 4"
-msgstr "显示滑块 4"
-
-#: MainDlg.cpp:202
-msgid "&Move"
-msgstr "移动(&M)"
+"分析器错误，出错位置 %1：\n"
+"语法错误"
 
-#: MainDlg.cpp:214
+#: parser.cpp:964
 msgid ""
-"The plot has been modified.\n"
-"Do you want to save it?"
+"Parser error at position %1:\n"
+"Missing parenthesis"
 msgstr ""
-"绘图已经修改。\n"
-"您想要保存吗？"
+"分析器错误，出错位置 %1：\n"
+"缺少括号"
 
-#: MainDlg.cpp:252
+#: parser.cpp:967
 msgid ""
-"This file is saved with an old file format; if you save it, you cannot open the "
-"file with older versions of Kmplot. Are you sure you want to continue?"
-msgstr "此文件是以旧文件格式保存的；如果您保存的话，您将无法使用旧版本的 KmPlot 打开该文件。您确定想要继续吗？"
-
-#: MainDlg.cpp:252
-msgid "Save New Format"
-msgstr "保存新格式"
+"Parser error at position %1:\n"
+"Function name unknown"
+msgstr ""
+"分析器错误，出错位置 %1：\n"
+"未知函数名称"
 
-#: MainDlg.cpp:266
+#: parser.cpp:970
 msgid ""
-"*.fkt|KmPlot Files (*.fkt)\n"
-"*|All Files"
+"Parser error at position %1:\n"
+"Void function variable"
 msgstr ""
-"*.fkt|KmPlot 文件 (*.fkt)\n"
-"*|所有文件"
-
-#: MainDlg.cpp:274
-msgid "The file could not be saved"
-msgstr "无法保存文件"
+"分析器错误，出错位置 %1：\n"
+"无效函数变量"
 
-#: MainDlg.cpp:290
+#: parser.cpp:973
 msgid ""
-"*.svg|Scalable Vector Graphics (*.svg)\n"
-"*.bmp|Bitmap 180dpi (*.bmp)\n"
-"*.png|Bitmap 180dpi (*.png)"
+"Parser error at position %1:\n"
+"Too many functions"
 msgstr ""
-"*.svg|可缩放矢量图像(*.svg)\n"
-"*.bmp|180dpi 位图(*.bmp)\n"
-"*.png|180dpi 位图(*.png)"
-
-#: MainDlg.cpp:309 MainDlg.cpp:325 MainDlg.cpp:341
-msgid "The URL could not be saved."
-msgstr "无法保存 URL。"
-
-#: MainDlg.cpp:395
-msgid "Print Plot"
-msgstr "打印图像"
+"分析器错误，出错位置 %1：\n"
+"太多函数"
 
-#: MainDlg.cpp:407
-msgid "Colors"
-msgstr "颜色"
+#: parser.cpp:976
+msgid ""
+"Parser error at position %1:\n"
+"Token-memory overflow"
+msgstr ""
+"分析器错误，出错位置 %1：\n"
+"标记内存溢出"
 
-#: MainDlg.cpp:407
-msgid "Edit Colors"
-msgstr "编辑颜色"
+#: parser.cpp:979
+msgid ""
+"Parser error at position %1:\n"
+"Stack overflow"
+msgstr ""
+"分析器错误，出错位置 %1：\n"
+"栈溢出"
 
-#: MainDlg.cpp:433
-msgid "Scale"
-msgstr "比例"
+#: parser.cpp:982
+msgid ""
+"Parser error at position %1:\n"
+"Name of function not free."
+msgstr ""
+"分析器错误，出错位置 %1：\n"
+"函数名称不自由。"
 
-#: MainDlg.cpp:433
-msgid "Edit Scaling"
-msgstr "编辑缩放"
+#: parser.cpp:985
+msgid ""
+"Parser error at position %1:\n"
+"recursive function not allowed."
+msgstr ""
+"分析器错误，出错位置 %1：\n"
+"不允许递归函数。"
 
-#: MainDlg.cpp:445
-msgid "Edit Fonts"
-msgstr "编辑字体"
+#: parser.cpp:988
+#, c-format
+msgid "Could not find a defined constant at position %1."
+msgstr "在位置 %1 处找不到定义的常量。"
 
-#: MainDlg.cpp:538
-msgid ""
-"Parametric functions must be definied in the \"New Parametric Plot\"-dialog "
-"which you can find in the menubar"
-msgstr "参数函数必须在“新建参数函数图”对话框中定义，您可菜单栏中找到这一功能"
+#: parser.cpp:991
+msgid "Empty function"
+msgstr "空函数"
 
-#: MainDlg.cpp:543
-msgid "Recursive function is not allowed"
-msgstr "不允许使用递归函数"
+#: parser.cpp:993
+msgid "The function name is not allowed to contain capital letters."
+msgstr "函数名不允许包含大写字母。"
 
-#: MainDlg.cpp:802
-msgid "KmPlotPart"
-msgstr "KmPlotPart"
+#: parser.cpp:995
+msgid "Function could not be found."
+msgstr "找不到函数。"
 
-#: coordsconfigdialog.cpp:39
-msgid "Coords"
-msgstr "坐标"
+#: parser.cpp:997
+msgid "The expression must not contain user-defined constants."
+msgstr "列出用户定义的常量。"
 
-#: coordsconfigdialog.cpp:39
-msgid "Edit Coordinate System"
-msgstr "编辑坐标系"
+#: main.cpp:43
+msgid "Mathematical function plotter for TDE"
+msgstr "TDE 桌面的数学函数绘图器"
 
-#: editfunction.cpp:62
-msgid "Function"
-msgstr "函数"
+#: main.cpp:47
+msgid "File to open"
+msgstr "要打开的文件"
 
-#: editfunction.cpp:64
-msgid "Derivatives"
-msgstr "导函数"
+#: main.cpp:57
+msgid "KmPlot"
+msgstr "KmPlot"
 
-#: editfunction.cpp:70
-#, c-format
-msgid "Slider No. %1"
-msgstr "第 %1 个滑块"
+#: main.cpp:63
+msgid "Original Author"
+msgstr "原作者"
 
-#: editfunction.cpp:180
-msgid "You can only define plot functions in this dialog"
-msgstr "您只能在此对话框中定义绘图函数"
+#: main.cpp:66
+msgid "GUI"
+msgstr "GUI"
 
-#: editfunction.cpp:247
-msgid "Please insert a valid x-value"
-msgstr "请插入有效的 x 值"
+#: main.cpp:68
+msgid "Various improvements"
+msgstr "各种改进"
 
-#: editfunction.cpp:259
-msgid "Please insert a valid y-value"
-msgstr "请插入有效的 y 值"
+#: main.cpp:69
+msgid "svg icon"
+msgstr "SVG 图标"
 
-#: editfunction.cpp:301
-msgid "Recursive function is only allowed when drawing integral graphs"
-msgstr "只能在绘制积分图时使用递归函数"
+#: main.cpp:70
+msgid "command line options, MIME type"
+msgstr "命令行选项，MIME 类型"
diff --git a/tde-i18n-zh_CN/messages/tdeedu/kpercentage.po b/tde-i18n-zh_CN/messages/tdeedu/kpercentage.po
index e7b92961006..dec4ea9518e 100644
--- a/tde-i18n-zh_CN/messages/tdeedu/kpercentage.po
+++ b/tde-i18n-zh_CN/messages/tdeedu/kpercentage.po
@@ -6,15 +6,117 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kpercentage\n"
-"POT-Creation-Date: 2005-03-18 01:27+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-12-25 20:58+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "TDE 中文翻译组"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "i18n-translation@lists.linux.net.cn"
+
+#: kanswer.cpp:153 kanswer.cpp:168
+msgid "Congratulations!"
+msgstr "恭喜！"
+
+#: kanswer.cpp:158
+msgid "Error!"
+msgstr "错误！"
+
+#: kanswer.cpp:163
+msgid "Oops!"
+msgstr "哇塞！"
+
+#: kanswer.cpp:164
+msgid "Mistyped!"
+msgstr "输错啦！"
+
+#: kanswer.cpp:169
+msgid ""
+"Great!\n"
+"You managed all\n"
+"the exercises!"
+msgstr ""
+"真棒！\n"
+"您通过了全部考试！"
+
+#: feedback_i18n.cpp:2
+msgid "Good choice!"
+msgstr "选择正确！"
+
+#: feedback_i18n.cpp:3
+msgid "Well done!"
+msgstr "干得漂亮！"
+
+#: feedback_i18n.cpp:4
+msgid "Pretty good!"
+msgstr "真不错！"
+
+#: feedback_i18n.cpp:5
+msgid "Fine!"
+msgstr "好！"
+
+#: feedback_i18n.cpp:6
+msgid "Right!"
+msgstr "完全正确！"
+
+#: feedback_i18n.cpp:7
+msgid "Yes!"
+msgstr "对啦！"
+
+#: feedback_i18n.cpp:8
+msgid "Great!"
+msgstr "真棒！"
+
+#: feedback_i18n.cpp:9
+msgid "Good work!"
+msgstr "好样的！"
+
+#: feedback_i18n.cpp:11
+msgid "Wrong!"
+msgstr "错啦！"
+
+#: feedback_i18n.cpp:12
+msgid "Not right!"
+msgstr "不对！"
+
+#: feedback_i18n.cpp:13
+msgid "Think twice!"
+msgstr "再想想！"
+
+#: feedback_i18n.cpp:14
+msgid "Sorry, no!"
+msgstr "好像不对哟！"
+
+#: feedback_i18n.cpp:15
+msgid "False!"
+msgstr "算错了！"
+
+#: feedback_i18n.cpp:16
+msgid "Try again!"
+msgstr "再试试！"
+
+#: feedback_i18n.cpp:17
+msgid "Oh no!"
+msgstr "不会吧！"
+
+#: feedback_i18n.cpp:18
+msgid "That's not right!"
+msgstr "真的不对！"
+
 #: kpercentage.cpp:71
 msgid "Number of tasks:"
 msgstr "题数："
@@ -118,54 +220,6 @@ msgstr "您可以在此调整考试题目的数量，从 1 到 10。"
 msgid "Choose one of the levels <i>easy</i>, <i>medium</i>, and <i>crazy</i>."
 msgstr "请从<i>简单</i>，<i>中等</i>和<i>超难</i>中间选择难易级别。"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "TDE 中文翻译组"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "i18n-translation@lists.linux.net.cn"
-
-#: main.cpp:30
-msgid "A program to improve your skills in calculating with percentages"
-msgstr "锻炼您计算百分比的程序"
-
-#: main.cpp:42
-msgid "KPercentage"
-msgstr "KPercentage"
-
-#: main.cpp:48
-msgid "coding, coding and coding"
-msgstr "编程、编程，还是编程"
-
-#: main.cpp:49
-msgid "CVS, coding and sed-script"
-msgstr "CVS，编程和 SED 脚本"
-
-#: main.cpp:50
-msgid "CVS, coding and Makefile stuff"
-msgstr "CVS，编程和 Makefile 等"
-
-#: main.cpp:51 main.cpp:52
-msgid "Pixmaps"
-msgstr "位图"
-
-#: main.cpp:53
-msgid "Spelling and Language"
-msgstr "拼写和语言"
-
-#: main.cpp:54
-msgid "Cleaning and bugfixing code"
-msgstr "清理和错误修正的代码"
-
-#: main.cpp:55
-msgid "SVG icon"
-msgstr "SVG 图标"
-
 #: kpercentmain.cpp:102
 #, c-format
 msgid " % of "
@@ -223,91 +277,38 @@ msgstr ""
 "答错了\n"
 "%1%"
 
-#: feedback_i18n.cpp:2
-msgid "Good choice!"
-msgstr "选择正确！"
-
-#: feedback_i18n.cpp:3
-msgid "Well done!"
-msgstr "干得漂亮！"
-
-#: feedback_i18n.cpp:4
-msgid "Pretty good!"
-msgstr "真不错！"
-
-#: feedback_i18n.cpp:5
-msgid "Fine!"
-msgstr "好！"
-
-#: feedback_i18n.cpp:6
-msgid "Right!"
-msgstr "完全正确！"
-
-#: feedback_i18n.cpp:7
-msgid "Yes!"
-msgstr "对啦！"
-
-#: feedback_i18n.cpp:8
-msgid "Great!"
-msgstr "真棒！"
-
-#: feedback_i18n.cpp:9
-msgid "Good work!"
-msgstr "好样的！"
-
-#: feedback_i18n.cpp:11
-msgid "Wrong!"
-msgstr "错啦！"
-
-#: feedback_i18n.cpp:12
-msgid "Not right!"
-msgstr "不对！"
-
-#: feedback_i18n.cpp:13
-msgid "Think twice!"
-msgstr "再想想！"
-
-#: feedback_i18n.cpp:14
-msgid "Sorry, no!"
-msgstr "好像不对哟！"
-
-#: feedback_i18n.cpp:15
-msgid "False!"
-msgstr "算错了！"
+#: main.cpp:30
+msgid "A program to improve your skills in calculating with percentages"
+msgstr "锻炼您计算百分比的程序"
 
-#: feedback_i18n.cpp:16
-msgid "Try again!"
-msgstr "再试试！"
+#: main.cpp:42
+msgid "KPercentage"
+msgstr "KPercentage"
 
-#: feedback_i18n.cpp:17
-msgid "Oh no!"
-msgstr "不会吧！"
+#: main.cpp:48
+msgid "coding, coding and coding"
+msgstr "编程、编程，还是编程"
 
-#: feedback_i18n.cpp:18
-msgid "That's not right!"
-msgstr "真的不对！"
+#: main.cpp:49
+msgid "CVS, coding and sed-script"
+msgstr "CVS，编程和 SED 脚本"
 
-#: kanswer.cpp:153 kanswer.cpp:168
-msgid "Congratulations!"
-msgstr "恭喜！"
+#: main.cpp:50
+msgid "CVS, coding and Makefile stuff"
+msgstr "CVS，编程和 Makefile 等"
 
-#: kanswer.cpp:158
-msgid "Error!"
-msgstr "错误！"
+#: main.cpp:51 main.cpp:52
+msgid "Pixmaps"
+msgstr "位图"
 
-#: kanswer.cpp:163
-msgid "Oops!"
-msgstr "哇塞！"
+#: main.cpp:53
+msgid "Spelling and Language"
+msgstr "拼写和语言"
 
-#: kanswer.cpp:164
-msgid "Mistyped!"
-msgstr "输错啦！"
+#: main.cpp:54
+msgid "Cleaning and bugfixing code"
+msgstr "清理和错误修正的代码"
 
-#: kanswer.cpp:169
-msgid ""
-"Great!\n"
-"You managed all\n"
-"the exercises!"
-msgstr ""
-"真棒！\n"
-"您通过了全部考试！"
+#: main.cpp:55
+msgid "SVG icon"
+msgstr "SVG 图标"
diff --git a/tde-i18n-zh_CN/messages/tdeedu/kstars.po b/tde-i18n-zh_CN/messages/tdeedu/kstars.po
index f141b5aed43..5b654957faa 100644
--- a/tde-i18n-zh_CN/messages/tdeedu/kstars.po
+++ b/tde-i18n-zh_CN/messages/tdeedu/kstars.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kstars\n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-11-26 23:07+0800\n"
 "Last-Translator: Shuang Wu <footfish78@hotmail.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -495,7 +496,7 @@ msgstr "高级"
 msgid "Log"
 msgstr "日志"
 
-#: detaildialog.cpp:487 skyobject.cpp:386 tools/observinglist.cpp:285
+#: detaildialog.cpp:487 skyobject.cpp:387 tools/observinglist.cpp:285
 #: tools/observinglist.cpp:493 tools/observinglist.cpp:503
 #, c-format
 msgid "Record here observation logs and/or data on %1."
@@ -25222,8 +25223,8 @@ msgstr ""
 msgid ""
 "The atmosphere bends light passing through it, like a lens.  If this item is "
 "checked, this \"atmospheric refraction\" will be simulated in the sky map.  "
-"Note that this correction is only applied when using the Horizontal coordinate "
-"system."
+"Note that this correction is only applied when using theQt::Horizontal "
+"coordinate system."
 msgstr ""
 
 #. i18n: file opsadvancedui.ui line 41
@@ -27198,9 +27199,10 @@ msgid ""
 "arcminutes and arcseconds (\"45:20\", \"45:20:00\", \"45:20\", \"45 20.0\", "
 "etc.).\n"
 "\n"
-"The Altitude is one of the coordinates in the Horizontal coordinate system.  It "
-"is defined as the angle of an object above or below the horizon.  For example, "
-"the Zenith has an Altitude of 90 degrees.  Altitude is also known as Elevation."
+"The Altitude is one of the coordinates in theQt::Horizontal coordinate system.  "
+"It is defined as the angle of an object above or below the horizon.  For "
+"example, the Zenith has an Altitude of 90 degrees.  Altitude is also known as "
+"Elevation."
 msgstr ""
 
 #. i18n: file tools/argsetaltaz.ui line 56
@@ -29525,110 +29527,110 @@ msgstr "未命名"
 msgid "unnamed object"
 msgstr "未命名天体"
 
-#: skyobject.cpp:311
+#: skyobject.cpp:312
 msgid "Star"
 msgstr "恒星"
 
-#: skyobject.cpp:312
+#: skyobject.cpp:313
 msgid "Catalog Star"
 msgstr "编目恒星"
 
-#: skyobject.cpp:313
+#: skyobject.cpp:314
 msgid "Planet"
 msgstr "行星"
 
-#: skyobject.cpp:314
+#: skyobject.cpp:315
 msgid "Open Cluster"
 msgstr "疏散星团"
 
-#: skyobject.cpp:315
+#: skyobject.cpp:316
 msgid "Globular Cluster"
 msgstr "球状星团"
 
-#: skyobject.cpp:316
+#: skyobject.cpp:317
 msgid "Gaseous Nebula"
 msgstr "气体星云"
 
-#: skyobject.cpp:317
+#: skyobject.cpp:318
 msgid "Planetary Nebula"
 msgstr "行星状星云"
 
-#: skyobject.cpp:318
+#: skyobject.cpp:319
 msgid "Supernova Remnant"
 msgstr "超新星遗迹"
 
-#: skyobject.cpp:319
+#: skyobject.cpp:320
 msgid "Galaxy"
 msgstr "星系"
 
-#: skyobject.cpp:320
+#: skyobject.cpp:321
 msgid "Comet"
 msgstr "彗星"
 
-#: skyobject.cpp:321
+#: skyobject.cpp:322
 msgid "Asteroid"
 msgstr "小行星"
 
-#: skyobject.cpp:322
+#: skyobject.cpp:323
 msgid "Unknown Type"
 msgstr "未知类型"
 
-#: skyobject.cpp:345
+#: skyobject.cpp:346
 msgid "Show HST Image"
 msgstr "显示 HST 图像"
 
-#: skyobject.cpp:346
+#: skyobject.cpp:347
 msgid "%1: Hubble Space Telescope, operated by STScI for NASA [public domain]"
 msgstr ""
 
-#: skyobject.cpp:349
+#: skyobject.cpp:350
 #, fuzzy
 msgid "Show Spitzer Image"
 msgstr "显示 HST 图像"
 
-#: skyobject.cpp:350
+#: skyobject.cpp:351
 msgid "%1: Spitzer Space Telescope, courtesy NASA/JPL-Caltech [public domain]"
 msgstr ""
 
-#: skyobject.cpp:353
+#: skyobject.cpp:354
 msgid "Show SEDS Image"
 msgstr "显示 SEDS 图像"
 
-#: skyobject.cpp:354
+#: skyobject.cpp:355
 msgid "%1: SEDS, http://www.seds.org [free for non-commercial use]"
 msgstr ""
 
-#: skyobject.cpp:357
+#: skyobject.cpp:358
 msgid "Show KPNO AOP Image"
 msgstr ""
 
-#: skyobject.cpp:358
+#: skyobject.cpp:359
 msgid ""
 "%1: Advanced Observing Program at Kitt Peak National Observatory [free for "
 "non-commercial use; no physical reproductions]"
 msgstr ""
 
-#: skyobject.cpp:361
+#: skyobject.cpp:362
 msgid "Show NOAO Image"
 msgstr "显示 NOAO 图像"
 
-#: skyobject.cpp:362
+#: skyobject.cpp:363
 msgid ""
 "%1: National Optical Astronomy Observatories and AURA [free for non-commercial "
 "use]"
 msgstr ""
 
-#: skyobject.cpp:366
+#: skyobject.cpp:367
 msgid ""
 "%1: Very Large Telescope, operated by the European Southern Observatory [free "
 "for non-commercial use; no reproductions]"
 msgstr ""
 
-#: skyobject.cpp:369
+#: skyobject.cpp:370
 msgid "Show"
 msgstr "显示"
 
-#: skyobject.cpp:426
+#: skyobject.cpp:427
 msgid "user log file could not be opened."
 msgstr ""
 
@@ -30108,7 +30110,7 @@ msgstr ""
 msgid ""
 "\t\t"
 "<p>The status bar displays the current sky coordinates of the mouse cursor,\n"
-"\t\t\tin both Equatorial and Horizontal coordinate systems.\n"
+"\t\t\tin both Equatorial andQt::Horizontal coordinate systems.\n"
 "\t\t</p>\n"
 "\t\n"
 msgstr ""
@@ -30151,7 +30153,7 @@ msgstr ""
 #, fuzzy
 msgid ""
 "\t\t"
-"<p>To switch between Equatorial and Horizontal coordinate\n"
+"<p>To switch between Equatorial andQt::Horizontal coordinate\n"
 "\t\t\tsystems, use the \"View->Coordinates\" menu item, or press the spacebar.\n"
 "\t\t</p>\n"
 "\t\n"
@@ -30409,7 +30411,7 @@ msgid ""
 "\t\t\titem in the File menu, or by pressing Ctrl+I.  In addition, you can\n"
 "\t\t\trun KStars from a command prompt with the \"--dump\" argument to save a\n"
 "\t\t\tsky image to disk without even opening the program window.  This can\n"
-"\t\t\tbe used to generate dynamic wallpaper for your TDE desktop.\n"
+"\t\t\tbe used to generate dynamic wallpaper for your KDE desktop.\n"
 "\t\t</p>\n"
 "\t\n"
 msgstr ""
@@ -30639,11 +30641,11 @@ msgstr ""
 "<p>梅西耶表列出了天空中 110 颗最亮的非恒星天体。其中包含许多著名的天体，\n"
 "如猎户座星云(M 42)，仙女座星系(M 31)和昴宿星团(M 45)。\n"
 
-#: addlinkdialog.h:41
+#: addlinkdialog.h:42
 msgid "object"
 msgstr "天体"
 
-#: ksnewstuff.h:69
+#: ksnewstuff.h:68
 msgid "Uploading data is not possible yet!"
 msgstr "上传数据尚未可能。"
 
@@ -31574,7 +31576,8 @@ msgid "Skymap Options"
 msgstr "天图选项"
 
 #: tools/scriptbuilder.cpp:649
-msgid "Use Horizontal coordinates? (otherwise, use Equatorial)"
+#, fuzzy
+msgid "UseQt::Horizontal coordinates? (otherwise, use Equatorial)"
 msgstr "使用地平坐标？(否则使用赤道坐标)"
 
 #: tools/scriptbuilder.cpp:650
diff --git a/tde-i18n-zh_CN/messages/tdeedu/ktouch.po b/tde-i18n-zh_CN/messages/tdeedu/ktouch.po
index dceabd0f0c1..7d5133b5f37 100644
--- a/tde-i18n-zh_CN/messages/tdeedu/ktouch.po
+++ b/tde-i18n-zh_CN/messages/tdeedu/ktouch.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: KTouch\n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2008-01-30 11:02+0800\n"
 "Last-Translator: Lie_Ex <lilith.ex@gmail.com>\n"
 "Language-Team: zh_CN <kde-china@kde.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeedu/kturtle.po b/tde-i18n-zh_CN/messages/tdeedu/kturtle.po
index efbe7f116b3..27af086f5a9 100644
--- a/tde-i18n-zh_CN/messages/tdeedu/kturtle.po
+++ b/tde-i18n-zh_CN/messages/tdeedu/kturtle.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kturtle\n"
 "Report-Msgid-Bugs-To: Lie_Ex <lilith.ex@gmail.com>\n"
-"POT-Creation-Date: 2007-06-18 01:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2008-01-30 10:14+0800\n"
 "Last-Translator: Lie_Ex <lilith.ex@gmail.com>\n"
 "Language-Team: zh_CN <kde-china@kde.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeedu/kverbos.po b/tde-i18n-zh_CN/messages/tdeedu/kverbos.po
index ab8cd9b207a..aeacb8a806d 100644
--- a/tde-i18n-zh_CN/messages/tdeedu/kverbos.po
+++ b/tde-i18n-zh_CN/messages/tdeedu/kverbos.po
@@ -6,21 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kverbos\n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2002-11-16 17:55-0500\n"
 "Last-Translator: Liu Songhe <jackliu9999@263.net>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: kverbosdoc.cpp:106
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr "当前文件已被修改。您要保存它吗？"
-
 #: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -33,43 +28,6 @@ msgid ""
 "Your emails"
 msgstr "jackliu9999@263.net"
 
-#: main.cpp:24 main.cpp:38
-msgid "KVerbos"
-msgstr "KVerbos"
-
-#: main.cpp:28
-#, fuzzy
-msgid "File to open"
-msgstr "要打开的文件"
-
-#: main.cpp:42
-msgid "svg icon"
-msgstr ""
-
-#: kerfassen.cpp:276
-msgid ""
-"The current verb is not in the list yet.\n"
-"Do you want to add it?"
-msgstr "当前动词不在列表里。您要添加它吗？"
-
-#: kerfassen.cpp:277
-msgid "Do Not Add"
-msgstr ""
-
-#: kerfassen.cpp:423
-#, fuzzy
-msgid ""
-"The current verb is already in the list.\n"
-"Do you want to replace it?\n"
-"If you do not want to change the list press 'Cancel'."
-msgstr ""
-"当前动词已在列表里，您要替换它吗？\n"
-"如果您不想改变列表请点击 CANCEL。"
-
-#: kerfassen.cpp:424
-msgid "Do Not Replace"
-msgstr ""
-
 #: kverbos.cpp:119
 msgid "New &Window"
 msgstr "新建窗口(&W)"
@@ -281,6 +239,53 @@ msgstr "请输入您的姓名："
 msgid "user: "
 msgstr "用户："
 
+#: kerfassen.cpp:276
+msgid ""
+"The current verb is not in the list yet.\n"
+"Do you want to add it?"
+msgstr "当前动词不在列表里。您要添加它吗？"
+
+#: kerfassen.cpp:277
+msgid "Do Not Add"
+msgstr ""
+
+#: kerfassen.cpp:423
+#, fuzzy
+msgid ""
+"The current verb is already in the list.\n"
+"Do you want to replace it?\n"
+"If you do not want to change the list press 'Cancel'."
+msgstr ""
+"当前动词已在列表里，您要替换它吗？\n"
+"如果您不想改变列表请点击 CANCEL。"
+
+#: kerfassen.cpp:424
+msgid "Do Not Replace"
+msgstr ""
+
+#: kverbosdoc.cpp:106
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr "当前文件已被修改。您要保存它吗？"
+
+#: kresult.cpp:37
+msgid "trained"
+msgstr "已训练"
+
+#: kresult.cpp:38
+#, c-format
+msgid "correct in %"
+msgstr "正确 %"
+
+#: kresult.cpp:39
+msgid "date"
+msgstr "日期"
+
+#: kresult.cpp:43
+msgid " verbs"
+msgstr " 动词"
+
 #. i18n: file kverbosui.rc line 15
 #: rc.cpp:12
 #, no-c-format
@@ -732,22 +737,18 @@ msgstr "自动移动食品"
 msgid "The language selected by the user"
 msgstr ""
 
-#: kresult.cpp:37
-msgid "trained"
-msgstr "已训练"
-
-#: kresult.cpp:38
-#, c-format
-msgid "correct in %"
-msgstr "正确 %"
+#: main.cpp:24 main.cpp:38
+msgid "KVerbos"
+msgstr "KVerbos"
 
-#: kresult.cpp:39
-msgid "date"
-msgstr "日期"
+#: main.cpp:28
+#, fuzzy
+msgid "File to open"
+msgstr "要打开的文件"
 
-#: kresult.cpp:43
-msgid " verbs"
-msgstr " 动词"
+#: main.cpp:42
+msgid "svg icon"
+msgstr ""
 
 #~ msgid "number of verbs: "
 #~ msgstr "动词个数："
diff --git a/tde-i18n-zh_CN/messages/tdeedu/kvoctrain.po b/tde-i18n-zh_CN/messages/tdeedu/kvoctrain.po
index 475f20515f7..98f358ba81a 100644
--- a/tde-i18n-zh_CN/messages/tdeedu/kvoctrain.po
+++ b/tde-i18n-zh_CN/messages/tdeedu/kvoctrain.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kvoctrain\n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2002-12-31 01:41-0500\n"
 "Last-Translator: Xiong Jiang <jxiong@offtopic.org>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1192,7 +1193,7 @@ msgid "&From Original"
 msgstr "来自原文(&F)"
 
 #. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 33
-#: entry-dialogs/EntryDlg.cpp:167 entry-dialogs/EntryDlg.cpp:259 rc.cpp:825
+#: entry-dialogs/EntryDlg.cpp:167 entry-dialogs/EntryDlg.cpp:259 rc.cpp:480
 #, no-c-format
 msgid "Properties From Original"
 msgstr "来自原文的属性"
@@ -1272,11 +1273,11 @@ msgstr "发音："
 msgid "Ready."
 msgstr "就绪。"
 
-#: kva_clip.cpp:115
+#: kva_clip.cpp:73
 msgid "Copying selection to clipboard..."
 msgstr "正在把选中区域复制到剪贴板..."
 
-#: kva_clip.cpp:166
+#: kva_clip.cpp:124
 msgid "Inserting clipboard contents..."
 msgstr "正在插入剪贴板内容..."
 
@@ -1617,7 +1618,7 @@ msgid "Create random lessons with unassigned entries"
 msgstr "用未安排的条目创建随机课程"
 
 #. i18n: file ./docprop-dialogs/TenseOptPageForm.ui line 123
-#: kva_init.cpp:183 rc.cpp:27 rc.cpp:123 rc.cpp:150 rc.cpp:168
+#: kva_init.cpp:183 rc.cpp:1104 rc.cpp:1200 rc.cpp:1218 rc.cpp:1236
 #, no-c-format
 msgid "&Clean Up"
 msgstr "清理(&C)"
@@ -1704,7 +1705,7 @@ msgstr ""
 
 #: kva_io.cpp:49
 msgid ""
-"*.qvo|QVocab (*.qvo)\n"
+"*.qvo|TQVocab (*.qvo)\n"
 msgstr ""
 
 #: kva_io.cpp:50
@@ -2044,7 +2045,7 @@ msgid "Original"
 msgstr "原文"
 
 #. i18n: file ./statistik-dialogs/StatistikPageForm.ui line 61
-#: kvoctrainview.cpp:179 rc.cpp:783
+#: kvoctrainview.cpp:179 rc.cpp:303
 #, no-c-format
 msgid "Lesson"
 msgstr "课程"
@@ -2622,15 +2623,15 @@ msgstr "过去分词"
 msgid "Future"
 msgstr "将来时"
 
-#: kvt-core/kvd_csv.cpp:70
+#: kvt-core/kvd_csv.cpp:120
 msgid "! Title:"
 msgstr ""
 
-#: kvt-core/kvd_csv.cpp:71
+#: kvt-core/kvd_csv.cpp:121
 msgid "! Author:"
 msgstr ""
 
-#: kvt-core/kvd_csv.cpp:239
+#: kvt-core/kvd_csv.cpp:289
 msgid "Error in csv file"
 msgstr "csv 文件错误"
 
@@ -2874,7 +2875,7 @@ msgstr "韩语"
 #: main.cpp:48
 msgid ""
 "© 1999-2002\tEwald Arnold\n"
-"© 2001-2002\tThe TDE team\n"
+"© 2001-2002\tThe KDE team\n"
 "© 2004-2007\tPeter Hedlund\n"
 "© 2007     \tFrederik Gladhorn\n"
 msgstr ""
@@ -2898,7 +2899,8 @@ msgid "Original Author"
 msgstr "原文"
 
 #: main.cpp:66
-msgid "Help with port to Qt3/TDE3"
+#, fuzzy
+msgid "Help with port to Qt3/KDE3"
 msgstr "协助移植到 Qt3/TDE3"
 
 #: main.cpp:69
@@ -2937,7 +2939,8 @@ msgid "Port to TDEConfig XT"
 msgstr ""
 
 #: main.cpp:92
-msgid "TDE Team"
+#, fuzzy
+msgid "KDE Team"
 msgstr "TDE 开发组"
 
 #: main.cpp:93
@@ -3123,890 +3126,854 @@ msgstr "词汇表(&C)"
 msgid "&Learning"
 msgstr "学习(&L)"
 
-#. i18n: file ./docprop-dialogs/TenseOptPageForm.ui line 16
-#: rc.cpp:12 rc.cpp:30 rc.cpp:90 rc.cpp:108 rc.cpp:126 rc.cpp:135 rc.cpp:153
-#: rc.cpp:480 rc.cpp:669 rc.cpp:753 rc.cpp:771 rc.cpp:786 rc.cpp:807
-#: rc.cpp:822 rc.cpp:852 rc.cpp:870 rc.cpp:876 rc.cpp:888 rc.cpp:894
-#: rc.cpp:897 rc.cpp:906 rc.cpp:948 rc.cpp:975 rc.cpp:978 rc.cpp:981
-#: rc.cpp:1026 rc.cpp:1029 rc.cpp:1032 rc.cpp:1035 rc.cpp:1038 rc.cpp:1041
-#: rc.cpp:1044 rc.cpp:1047 rc.cpp:1050 rc.cpp:1053 rc.cpp:1059 rc.cpp:1176
-#: rc.cpp:1179 rc.cpp:1182 rc.cpp:1185 rc.cpp:1188 rc.cpp:1215 rc.cpp:1218
+#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 40
+#: rc.cpp:12
 #, no-c-format
-msgid "-"
-msgstr "-"
+msgid "Enter the correct translation:"
+msgstr "输入正确的翻译："
 
-#. i18n: file ./docprop-dialogs/TenseOptPageForm.ui line 33
+#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 56
 #: rc.cpp:15
 #, no-c-format
-msgid "Tense Descriptions"
-msgstr "时态说明"
+msgid "Original Expression"
+msgstr "原文词语"
 
-#. i18n: file ./docprop-dialogs/TenseOptPageForm.ui line 75
-#: rc.cpp:18 rc.cpp:114 rc.cpp:141 rc.cpp:159
+#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 81
+#: rc.cpp:18 rc.cpp:21 rc.cpp:24 rc.cpp:69 rc.cpp:72 rc.cpp:75 rc.cpp:78
+#: rc.cpp:81 rc.cpp:84 rc.cpp:87 rc.cpp:90 rc.cpp:93 rc.cpp:96 rc.cpp:102
+#: rc.cpp:147 rc.cpp:150 rc.cpp:153 rc.cpp:156 rc.cpp:159 rc.cpp:222
+#: rc.cpp:225 rc.cpp:291 rc.cpp:306 rc.cpp:324 rc.cpp:342 rc.cpp:348
+#: rc.cpp:360 rc.cpp:366 rc.cpp:369 rc.cpp:378 rc.cpp:399 rc.cpp:414
+#: rc.cpp:435 rc.cpp:477 rc.cpp:558 rc.cpp:609 rc.cpp:1089 rc.cpp:1107
+#: rc.cpp:1167 rc.cpp:1185 rc.cpp:1203 rc.cpp:1221 rc.cpp:1239
 #, no-c-format
-msgid "&New..."
-msgstr "新建(&N)..."
+msgid "-"
+msgstr "-"
 
-#. i18n: file ./docprop-dialogs/TenseOptPageForm.ui line 91
-#: rc.cpp:21 rc.cpp:117 rc.cpp:144 rc.cpp:162
+#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 121
+#: rc.cpp:27 rc.cpp:393 rc.cpp:1179
 #, no-c-format
-msgid "&Modify..."
-msgstr "修改(&M)..."
+msgid "&Remark:"
+msgstr "注解(&R)："
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 33
-#: rc.cpp:33
+#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 129
+#: rc.cpp:30
 #, no-c-format
-msgid "Language Elements"
-msgstr "语种元素"
+msgid "T&ype:"
+msgstr "词性(&Y)："
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 58
-#: rc.cpp:36
+#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 137
+#: rc.cpp:33
 #, no-c-format
-msgid "Language code (ISO 639):"
-msgstr "语种代码(ISO 639)："
+msgid "&False friend:"
+msgstr "虚假的友词(&F)："
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 116
-#: rc.cpp:39
+#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 251
+#: rc.cpp:36 rc.cpp:108 rc.cpp:171 rc.cpp:198 rc.cpp:252 rc.cpp:279
 #, no-c-format
-msgid "Articles"
-msgstr "冠词"
+msgid "&Verify"
+msgstr "校验(&V)"
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 133
-#: rc.cpp:42 rc.cpp:921
+#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 267
+#: rc.cpp:39 rc.cpp:249
 #, no-c-format
-msgid "&Female:"
-msgstr "雌性(&F)："
+msgid "Show &More"
+msgstr "显示更多(&M)"
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 144
-#: rc.cpp:45 rc.cpp:933
+#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 283
+#: rc.cpp:42 rc.cpp:111 rc.cpp:165 rc.cpp:204 rc.cpp:246 rc.cpp:285
 #, no-c-format
-msgid "&Male:"
-msgstr "雄性(&M)："
+msgid "Show &All"
+msgstr "显示全部(&A)"
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 176
-#: rc.cpp:48
+#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 299
+#: rc.cpp:45 rc.cpp:114 rc.cpp:162 rc.cpp:207 rc.cpp:288
+#, fuzzy, no-c-format
+msgid "&Do Not Know"
+msgstr "不知道(&D)"
+
+#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 315
+#: rc.cpp:48 rc.cpp:105 rc.cpp:168 rc.cpp:201 rc.cpp:240 rc.cpp:282
 #, no-c-format
-msgid "Definite"
-msgstr "定冠词"
+msgid "I &Know It"
+msgstr "我知道(&K)"
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 266
-#: rc.cpp:51 rc.cpp:930
+#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 333
+#: rc.cpp:51 rc.cpp:117 rc.cpp:174 rc.cpp:210 rc.cpp:228 rc.cpp:267
 #, no-c-format
-msgid "&Neutral:"
-msgstr "中性(&N)："
+msgid "Progress"
+msgstr "进度"
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 277
-#: rc.cpp:54
+#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 350
+#: rc.cpp:54 rc.cpp:123 rc.cpp:180 rc.cpp:216 rc.cpp:234 rc.cpp:273
 #, no-c-format
-msgid "Indefinite"
-msgstr "不定冠词"
+msgid "Time:"
+msgstr "时间："
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 295
-#: rc.cpp:57
+#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 358
+#: rc.cpp:57 rc.cpp:120 rc.cpp:177 rc.cpp:213 rc.cpp:231 rc.cpp:270
 #, no-c-format
-msgid "Conjugation"
-msgstr "词形变化"
+msgid "Count:"
+msgstr "计数："
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 312
-#: rc.cpp:60 rc.cpp:918
+#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 392
+#: rc.cpp:60 rc.cpp:126 rc.cpp:183 rc.cpp:219 rc.cpp:237 rc.cpp:276
 #, no-c-format
-msgid "&1. Person:"
-msgstr "&1. 人称："
+msgid "Cycle:"
+msgstr "循环"
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 323
-#: rc.cpp:63 rc.cpp:936
+#. i18n: file ./query-dialogs/VerbQueryDlgForm.ui line 40
+#: rc.cpp:63
 #, no-c-format
-msgid "&2. Person:"
-msgstr "&2. 人称："
+msgid "Enter the correct conjugation forms."
+msgstr "输入正确的词形变化。"
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 334
+#. i18n: file ./query-dialogs/VerbQueryDlgForm.ui line 61
 #: rc.cpp:66
 #, no-c-format
-msgid "3. Person:"
-msgstr "3. 人称："
+msgid "Current tense is %1."
+msgstr "当前时态是 %1。"
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 389
-#: rc.cpp:69 rc.cpp:912
+#. i18n: file ./query-dialogs/VerbQueryDlgForm.ui line 283
+#: rc.cpp:99
 #, no-c-format
-msgid "C&ommon"
-msgstr "常见(&O)"
+msgid "Base form:"
+msgstr "原形："
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 397
-#: rc.cpp:72
+#. i18n: file ./query-dialogs/MCQueryDlgForm.ui line 32
+#: rc.cpp:129
 #, no-c-format
-msgid "F&emale:"
-msgstr "雌性(&E)："
+msgid "Select the correct translation:"
+msgstr "选择正确的翻译："
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 408
-#: rc.cpp:75
+#. i18n: file ./query-dialogs/MCQueryDlgForm.ui line 90
+#: rc.cpp:132 rc.cpp:423
 #, no-c-format
-msgid "M&ale:"
-msgstr "雄性(&A)："
+msgid "&2:"
+msgstr "&2："
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 419
-#: rc.cpp:78
+#. i18n: file ./query-dialogs/MCQueryDlgForm.ui line 98
+#: rc.cpp:135 rc.cpp:426
 #, no-c-format
-msgid "Neu&tral:"
-msgstr "中性(&T)："
+msgid "&3:"
+msgstr "&3："
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 430
-#: rc.cpp:81 rc.cpp:939
+#. i18n: file ./query-dialogs/MCQueryDlgForm.ui line 106
+#: rc.cpp:138 rc.cpp:420
 #, no-c-format
-msgid "Plural"
-msgstr "复数"
+msgid "&1:"
+msgstr "&1："
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 446
-#: rc.cpp:84 rc.cpp:915
+#. i18n: file ./query-dialogs/MCQueryDlgForm.ui line 114
+#: rc.cpp:141 rc.cpp:429
 #, no-c-format
-msgid "&Common"
-msgstr "常见(&C)"
+msgid "&4:"
+msgstr "&4："
 
-#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 454
-#: rc.cpp:87 rc.cpp:924
+#. i18n: file ./query-dialogs/MCQueryDlgForm.ui line 122
+#: rc.cpp:144 rc.cpp:432
 #, no-c-format
-msgid "Singular"
-msgstr "单数"
+msgid "&5:"
+msgstr "&5："
 
-#. i18n: file ./docprop-dialogs/TitlePageForm.ui line 33
-#: rc.cpp:93
+#. i18n: file ./query-dialogs/AdjQueryDlgForm.ui line 40
+#: rc.cpp:186
+#, fuzzy, no-c-format
+msgid "Fill in the missing comparison expressions:"
+msgstr "填写缺少的比较级词语："
+
+#. i18n: file ./query-dialogs/AdjQueryDlgForm.ui line 48
+#: rc.cpp:189 rc.cpp:405 rc.cpp:528 rc.cpp:999
 #, no-c-format
-msgid "General Document Properties"
-msgstr "常规文档属性"
+msgid "Level &1:"
+msgstr "级别 &1："
 
-#. i18n: file ./docprop-dialogs/TitlePageForm.ui line 50
-#: rc.cpp:96
+#. i18n: file ./query-dialogs/AdjQueryDlgForm.ui line 59
+#: rc.cpp:192 rc.cpp:411 rc.cpp:531 rc.cpp:1017
 #, no-c-format
-msgid "&Title:"
-msgstr "标题(&T)："
+msgid "Level &3:"
+msgstr "级别 &3："
 
-#. i18n: file ./docprop-dialogs/TitlePageForm.ui line 74
-#: rc.cpp:99
+#. i18n: file ./query-dialogs/AdjQueryDlgForm.ui line 70
+#: rc.cpp:195 rc.cpp:408 rc.cpp:507 rc.cpp:1002
 #, no-c-format
-msgid "&Authors:"
-msgstr "作者(&A)："
+msgid "Level &2:"
+msgstr "级别 &2："
 
-#. i18n: file ./docprop-dialogs/TitlePageForm.ui line 85
-#: rc.cpp:102 rc.cpp:801 rc.cpp:984
+#. i18n: file ./query-dialogs/SimpleQueryDlgForm.ui line 278
+#: rc.cpp:243
+#, fuzzy, no-c-format
+msgid "Do &Not Know"
+msgstr "不知道(&D)"
+
+#. i18n: file ./query-dialogs/ArtQueryDlgForm.ui line 40
+#: rc.cpp:255
 #, no-c-format
-msgid "&Remark:"
-msgstr "注解(&R)："
+msgid "Select the correct article for this noun:"
+msgstr "为这个名词选择正确的冠词："
 
-#. i18n: file ./docprop-dialogs/TitlePageForm.ui line 96
-#: rc.cpp:105
+#. i18n: file ./query-dialogs/ArtQueryDlgForm.ui line 100
+#: rc.cpp:258
 #, no-c-format
-msgid "&License:"
-msgstr "许可协议(&L)："
+msgid "&female"
+msgstr "雌性(&F)"
 
-#. i18n: file ./docprop-dialogs/UsageOptPageForm.ui line 33
-#: rc.cpp:111
+#. i18n: file ./query-dialogs/ArtQueryDlgForm.ui line 108
+#: rc.cpp:261
 #, no-c-format
-msgid "Usage Labels"
-msgstr ""
+msgid "&male"
+msgstr "雄性(&M)"
 
-#. i18n: file ./docprop-dialogs/DocOptionsPageForm.ui line 33
-#: rc.cpp:129
+#. i18n: file ./query-dialogs/ArtQueryDlgForm.ui line 116
+#: rc.cpp:264
 #, no-c-format
-msgid "Document Options"
-msgstr "文档选项"
+msgid "&neutral"
+msgstr "中性(&N)"
 
-#. i18n: file ./docprop-dialogs/DocOptionsPageForm.ui line 50
-#: rc.cpp:132
+#. i18n: file ./statistik-dialogs/StatistikPageForm.ui line 28
+#: rc.cpp:294
 #, no-c-format
-msgid "Allo&w sorting"
-msgstr "允许排序(&W)"
+msgid "Grade FROM"
+msgstr "从…级别"
 
-#. i18n: file ./docprop-dialogs/TypeOptPageForm.ui line 33
-#: rc.cpp:138
+#. i18n: file ./statistik-dialogs/StatistikPageForm.ui line 39
+#: rc.cpp:297
 #, no-c-format
-msgid "Type Descriptions"
-msgstr "词性说明"
+msgid "Grade TO"
+msgstr "到…级别"
 
-#. i18n: file ./docprop-dialogs/LessOptPageForm.ui line 33
-#: rc.cpp:156
+#. i18n: file ./statistik-dialogs/StatistikPageForm.ui line 50
+#: rc.cpp:300
 #, no-c-format
-msgid "Lesson Descriptions"
-msgstr "课程说明"
+msgid "Entries"
+msgstr "词数"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 35
-#: rc.cpp:171
+#. i18n: file ./statistik-dialogs/GenStatPageForm.ui line 37
+#: rc.cpp:309 rc.cpp:612
 #, fuzzy, no-c-format
-msgid "&Table font:"
-msgstr "表格字体："
+msgid "Filename:"
+msgstr "文件名："
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 51
-#: rc.cpp:174
-#, fuzzy, no-c-format
-msgid "&IPA font:"
-msgstr "IPA 字体："
+#. i18n: file ./statistik-dialogs/GenStatPageForm.ui line 49
+#: rc.cpp:312 rc.cpp:615
+#, no-c-format
+msgid "Title:"
+msgstr "标题："
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 70
-#: rc.cpp:177
-#, fuzzy, no-c-format
-msgid "Grade Colors"
-msgstr "级别颜色"
+#. i18n: file ./statistik-dialogs/GenStatPageForm.ui line 61
+#: rc.cpp:315
+#, no-c-format
+msgid "Entries:"
+msgstr "词数："
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 95
-#: rc.cpp:180 rc.cpp:501
+#. i18n: file ./statistik-dialogs/GenStatPageForm.ui line 73
+#: rc.cpp:318
 #, no-c-format
-msgid "Level &4:"
-msgstr "级别 &4："
+msgid "Author:"
+msgstr "作者："
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 114
-#: rc.cpp:183 rc.cpp:489
+#. i18n: file ./statistik-dialogs/GenStatPageForm.ui line 85
+#: rc.cpp:321
 #, no-c-format
-msgid "Level &5:"
-msgstr "级别 &5："
+msgid "Lessons:"
+msgstr "课程："
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 133
-#: rc.cpp:186 rc.cpp:504
+#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 27
+#: rc.cpp:327
 #, no-c-format
-msgid "Level &7:"
-msgstr "级别 &7："
+msgid "Invokes lesson input dialog"
+msgstr "调出课程输入对话框"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 152
-#: rc.cpp:189 rc.cpp:492
+#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 52
+#: rc.cpp:330
 #, no-c-format
-msgid "Level &6:"
-msgstr "级别 &6："
+msgid "Common Properties"
+msgstr "常用属性"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 171
-#: rc.cpp:192
+#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 128
+#: rc.cpp:333
 #, no-c-format
-msgid "&N"
-msgstr "&N"
+msgid "&Expression:"
+msgstr "词语(&E)："
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 187
-#: rc.cpp:195
+#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 139
+#: rc.cpp:336
 #, fuzzy, no-c-format
-msgid "Not &queried:"
-msgstr "未问到(&N)："
+msgid "&Pronunciation:"
+msgstr "发音(&P)："
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 206
-#: rc.cpp:198
+#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 150
+#: rc.cpp:339 rc.cpp:561
 #, no-c-format
-msgid "&1"
-msgstr "&1"
+msgid "&Lesson:"
+msgstr "课程(&L)："
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 209
-#: rc.cpp:201 rc.cpp:615
+#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 184
+#: rc.cpp:345
 #, no-c-format
-msgid "Alt+1"
-msgstr ""
-
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 212
-#: rc.cpp:204
-#, fuzzy, no-c-format
-msgid "Color for the grade 1"
-msgstr "无法读取 "
+msgid "Invokes input dialog for lessons"
+msgstr "调出课程输入对话框"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 215
-#: rc.cpp:207
+#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 215
+#: rc.cpp:351
 #, no-c-format
-msgid "Click here to change the color for grade 1."
-msgstr ""
+msgid "Invokes dialog page with characters from phonetic alphabet"
+msgstr "调出输入语音符号字符的对话框"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 231
-#: rc.cpp:210 rc.cpp:507 rc.cpp:813 rc.cpp:1089
+#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 225
+#: rc.cpp:354
 #, no-c-format
-msgid "Level &1:"
-msgstr "级别 &1："
+msgid "T&ype"
+msgstr "词性(&Y)"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 250
-#: rc.cpp:213 rc.cpp:486 rc.cpp:816 rc.cpp:1095
+#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 272
+#: rc.cpp:357
 #, no-c-format
-msgid "Level &2:"
-msgstr "级别 &2："
+msgid "&Subtype:"
+msgstr "亚词性(&S)："
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 269
-#: rc.cpp:216
+#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 319
+#: rc.cpp:363
 #, no-c-format
-msgid "&2"
-msgstr "&2"
+msgid "Invokes input dialog for word types"
+msgstr "调出词性输入对话框"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 272
-#: rc.cpp:219
+#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 377
+#: rc.cpp:372
 #, no-c-format
-msgid "Alt+2"
-msgstr ""
+msgid "Invokes input dialog for usage labels"
+msgstr "调出惯用法标签输入对话框"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 275
-#: rc.cpp:222
-#, fuzzy, no-c-format
-msgid "Color for the grade 2"
-msgstr "无法读取 "
+#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 458
+#: rc.cpp:375
+#, no-c-format
+msgid "Acti&ve"
+msgstr "活跃(&V)"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 278
-#: rc.cpp:225
+#. i18n: file ./entry-dialogs/AuxInfoEntryPageForm.ui line 49
+#: rc.cpp:381
 #, no-c-format
-msgid "Click here to change the color for grade 2."
-msgstr ""
+msgid "Additional Properties"
+msgstr "附加属性"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 294
-#: rc.cpp:228 rc.cpp:510 rc.cpp:819 rc.cpp:1092
+#. i18n: file ./entry-dialogs/AuxInfoEntryPageForm.ui line 123
+#: rc.cpp:384
 #, no-c-format
-msgid "Level &3:"
-msgstr "级别 &3："
+msgid "S&ynonyms:"
+msgstr "同义词(&Y)："
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 313
-#: rc.cpp:231
+#. i18n: file ./entry-dialogs/AuxInfoEntryPageForm.ui line 134
+#: rc.cpp:387
 #, no-c-format
-msgid "&3"
-msgstr "&3"
+msgid "Ant&onyms:"
+msgstr "反义词(&O)："
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 316
-#: rc.cpp:234
+#. i18n: file ./entry-dialogs/AuxInfoEntryPageForm.ui line 145
+#: rc.cpp:390
 #, no-c-format
-msgid "Alt+3"
-msgstr ""
+msgid "E&xample:"
+msgstr "例句(&X)："
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 319
-#: rc.cpp:237
-#, fuzzy, no-c-format
-msgid "Color for the grade 3"
-msgstr "无法读取 "
+#. i18n: file ./entry-dialogs/AuxInfoEntryPageForm.ui line 167
+#: rc.cpp:396
+#, no-c-format
+msgid "&Paraphrase:"
+msgstr "解释(&P)："
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 322
-#: rc.cpp:240
+#. i18n: file ./entry-dialogs/AdjEntryPageForm.ui line 33
+#: rc.cpp:402
 #, no-c-format
-msgid "Click here to change the color for grade 3."
-msgstr ""
+msgid "Comparison of Adjectives"
+msgstr "形容词比较级"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 338
-#: rc.cpp:243
+#. i18n: file ./entry-dialogs/MCEntryPageForm.ui line 33
+#: rc.cpp:417
 #, no-c-format
-msgid "&4"
-msgstr "&4"
+msgid "Suggestions for Multiple Choice"
+msgstr "多项单选的提示"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 341
-#: rc.cpp:246
+#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 33
+#: rc.cpp:438
 #, no-c-format
-msgid "Alt+4"
-msgstr ""
+msgid "Conjugation of Verbs"
+msgstr "动词变形"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 344
-#: rc.cpp:249
-#, fuzzy, no-c-format
-msgid "Color for the grade 4"
-msgstr "无法读取 "
+#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 71
+#: rc.cpp:441 rc.cpp:1146
+#, no-c-format
+msgid "C&ommon"
+msgstr "常见(&O)"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 347
-#: rc.cpp:252
+#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 105
+#: rc.cpp:444 rc.cpp:1161
 #, no-c-format
-msgid "Click here to change the color for grade 4."
-msgstr ""
+msgid "&Common"
+msgstr "常见(&C)"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 363
-#: rc.cpp:255
+#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 121
+#: rc.cpp:447 rc.cpp:1137
 #, no-c-format
-msgid "&5"
-msgstr "&5"
+msgid "&1. Person:"
+msgstr "&1. 人称："
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 366
-#: rc.cpp:258
+#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 132
+#: rc.cpp:450 rc.cpp:1119
 #, no-c-format
-msgid "Alt+5"
-msgstr ""
+msgid "&Female:"
+msgstr "雌性(&F)："
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 369
-#: rc.cpp:261
-#, fuzzy, no-c-format
-msgid "Color for the grade 5"
-msgstr "无法读取 "
+#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 143
+#: rc.cpp:453 rc.cpp:1164
+#, no-c-format
+msgid "Singular"
+msgstr "单数"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 372
-#: rc.cpp:264
+#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 177
+#: rc.cpp:456
 #, no-c-format
-msgid "Click here to change the color for grade 5."
-msgstr ""
+msgid "&3. Person:"
+msgstr "&3. 人称："
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 388
-#: rc.cpp:267
+#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 257
+#: rc.cpp:459 rc.cpp:1128
 #, no-c-format
-msgid "&6"
-msgstr "&6"
+msgid "&Neutral:"
+msgstr "中性(&N)："
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 391
-#: rc.cpp:270
+#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 268
+#: rc.cpp:462 rc.cpp:1122
 #, no-c-format
-msgid "Alt+6"
-msgstr ""
+msgid "&Male:"
+msgstr "雄性(&M)："
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 394
-#: rc.cpp:273
-#, fuzzy, no-c-format
-msgid "Color for the grade 6"
-msgstr "无法读取 "
+#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 292
+#: rc.cpp:465 rc.cpp:1140
+#, no-c-format
+msgid "&2. Person:"
+msgstr "&2. 人称："
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 397
-#: rc.cpp:276
+#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 303
+#: rc.cpp:468 rc.cpp:1158
 #, no-c-format
-msgid "Click here to change the color for grade 6."
-msgstr ""
+msgid "Plural"
+msgstr "复数"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 413
-#: rc.cpp:279
+#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 329
+#: rc.cpp:471
 #, no-c-format
-msgid "&7"
-msgstr "&7"
+msgid "&Tense:"
+msgstr "时态(&T)："
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 416
-#: rc.cpp:282
+#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 348
+#: rc.cpp:474
 #, no-c-format
-msgid "Alt+7"
-msgstr ""
+msgid "Ne&xt"
+msgstr "下一个(&X)"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 419
-#: rc.cpp:285
-#, fuzzy, no-c-format
-msgid "Color for the grade 7"
-msgstr "无法读取 "
+#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 113
+#: rc.cpp:483
+#, no-c-format
+msgid "False fr&iend:"
+msgstr "虚假的友词(&I)："
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 422
-#: rc.cpp:288
+#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 124
+#: rc.cpp:486
 #, no-c-format
-msgid "Click here to change the color for grade 7."
-msgstr ""
+msgid "&Grade:"
+msgstr "级别(&G)："
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 430
-#: rc.cpp:291
+#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 137
+#: rc.cpp:489
 #, no-c-format
-msgid "&Use colors"
-msgstr "使用颜色(&U)"
+msgid "Last Query &Date"
+msgstr "上次问答日期(&D)"
 
-#. i18n: file ./common-dialogs/viewoptionsbase.ui line 433
-#: rc.cpp:294 rc.cpp:297
+#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 204
+#: rc.cpp:492
 #, no-c-format
-msgid ""
-"If it is unchecked, you will just have black on white for the grades; if it is "
-"checked, the colors below will be chosen."
-msgstr ""
+msgid "T&oday"
+msgstr "今天(&O)"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 30
-#: rc.cpp:300
+#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 212
+#: rc.cpp:495
 #, no-c-format
-msgid "&Use alternative learning method"
-msgstr ""
+msgid "&Never"
+msgstr "从不(&N)"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 33
-#: rc.cpp:303
+#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 222
+#: rc.cpp:498
 #, no-c-format
-msgid "Use the Leitner learning method"
-msgstr ""
+msgid "Query Counters"
+msgstr "问答计数"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 36
-#: rc.cpp:306
+#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 239
+#: rc.cpp:501
 #, no-c-format
-msgid ""
-"By checking this, you will use the Leitner method of learning which requires "
-"you to answer correctly to each question 4 times in a row. "
-msgstr ""
+msgid "&Wrong:"
+msgstr "错误(&W)："
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 44
-#: rc.cpp:309
+#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 250
+#: rc.cpp:504
 #, no-c-format
-msgid "S&wap direction randomly"
-msgstr "随机交换方向(&W)"
+msgid "&Altogether:"
+msgstr "总共(&A)："
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 52
-#: rc.cpp:312
-#, fuzzy, no-c-format
-msgid "Random Query Options"
-msgstr "问答选项"
+#. i18n: file ./common-dialogs/blockoptionsbase.ui line 53
+#: rc.cpp:510 rc.cpp:972
+#, no-c-format
+msgid "Level &5:"
+msgstr "级别 &5："
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 66
-#: rc.cpp:315
+#. i18n: file ./common-dialogs/blockoptionsbase.ui line 64
+#: rc.cpp:513 rc.cpp:978
 #, no-c-format
-msgid "&Enable suggestion lists"
-msgstr ""
+msgid "Level &6:"
+msgstr "级别 &6："
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 69
-#: rc.cpp:318
+#. i18n: file ./common-dialogs/blockoptionsbase.ui line 83
+#: rc.cpp:516
 #, no-c-format
-msgid "If checked, pressing F5 or F6 will display a list of suggestions"
-msgstr ""
+msgid "E&xpiring"
+msgstr "过期(&X)"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 72
-#: rc.cpp:321
+#. i18n: file ./common-dialogs/blockoptionsbase.ui line 104
+#: rc.cpp:519
 #, no-c-format
-msgid ""
-"When this options is enabled, you can enter part of an answer, then press F5 or "
-"F6 to get a list of translations starting with or containing the text you "
-"typed."
-msgstr ""
+msgid "Bl&ocking"
+msgstr "封存(&O)"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 83
-#: rc.cpp:324
-#, fuzzy, no-c-format
-msgid "Split &translations"
-msgstr "翻译(&T)"
+#. i18n: file ./common-dialogs/blockoptionsbase.ui line 135
+#: rc.cpp:522 rc.cpp:969
+#, no-c-format
+msgid "Level &4:"
+msgstr "级别 &4："
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 86
-#: rc.cpp:327
-#, fuzzy, no-c-format
-msgid "Split translations and show multiple answer fields"
-msgstr "正在开始随机问答..."
+#. i18n: file ./common-dialogs/blockoptionsbase.ui line 146
+#: rc.cpp:525 rc.cpp:975
+#, no-c-format
+msgid "Level &7:"
+msgstr "级别 &7："
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 89
-#: rc.cpp:330
+#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 53
+#: rc.cpp:534
 #, no-c-format
-msgid ""
-"When this options is enabled, the program will split translations into several "
-"parts, show multiple answer fields, and you will need to answer each one of "
-"them. This is useful for example when a word has several meanings that have "
-"different translations in the other language."
-msgstr ""
+msgid "G&rade:"
+msgstr "级别(&R)："
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 97
-#: rc.cpp:333
+#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 64
+#: rc.cpp:537
 #, no-c-format
-msgid "Maximum number of &fields:"
-msgstr ""
+msgid "&Bad count:"
+msgstr "错误计数(&B)："
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 103
-#: rc.cpp:336 rc.cpp:399
+#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 75
+#: rc.cpp:540
 #, no-c-format
-msgid "Maximum number of fields to split translations into"
-msgstr ""
+msgid "Last q&uery:"
+msgstr "上次问答(&U)："
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 106
-#: rc.cpp:339 rc.cpp:402
+#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 119
+#: rc.cpp:543
 #, no-c-format
-msgid ""
-"Enter the maximum number of answer fields you want to have. When splitting "
-"translations, the program will only split into this many parts, and the last "
-"part will contain the rest of the translation."
-msgstr ""
+msgid "Word t&ype:"
+msgstr "词性(&Y)："
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 117
-#: rc.cpp:342
+#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 140
+#: rc.cpp:546
 #, no-c-format
-msgid "Enable I Know &button"
-msgstr ""
+msgid "Query c&ount:"
+msgstr "问答计数(&O)："
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 120
-#: rc.cpp:345
+#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 167
+#: rc.cpp:549
 #, no-c-format
-msgid "Enable the I Know It button on the Random Query screen"
-msgstr ""
+msgid "&All"
+msgstr "全部(&A)"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 123
-#: rc.cpp:348
+#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 191
+#: rc.cpp:552
 #, no-c-format
-msgid ""
-"If this is checked, the I Know button will be available. It allows you to tell "
-"the query that you know the result without writing it or having it checked. "
-"This is available by default. If you uncheck this, the I Know button will not "
-"be available."
-msgstr ""
+msgid "&None"
+msgstr "无(&N)"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 139
-#: rc.cpp:351
+#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 199
+#: rc.cpp:555
 #, no-c-format
-msgid "at"
-msgstr ""
+msgid "Selected lessons:"
+msgstr "所选的课程："
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 150
-#: rc.cpp:354
+#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 30
+#: rc.cpp:564
 #, fuzzy, no-c-format
-msgid "pe&riods"
-msgstr "[人称]"
+msgid "Sep&arator:"
+msgstr "分隔符(&S)："
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 153
-#: rc.cpp:357
-#, fuzzy, no-c-format
-msgid "Split translations at periods"
-msgstr "翻译(&T)"
+#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 47
+#: rc.cpp:567
+#, no-c-format
+msgid "Choose which separator you want to use to separate your data."
+msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 156
-#: rc.cpp:360
+#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 50
+#: rc.cpp:570
 #, no-c-format
 msgid ""
-"When this options is enabled, translations will be split at periods if they "
-"have any (except any trailing periods that will be removed)."
+"Choose one separator which will divide the parts of an expression when "
+"transferring data from or to another application over the clipboard."
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 167
-#: rc.cpp:363
+#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 75
+#: rc.cpp:573
 #, fuzzy, no-c-format
-msgid "sem&icolons"
-msgstr "使用颜色(&U)"
+msgid "Order"
+msgstr "次序(&O)"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 170
-#: rc.cpp:366
-#, fuzzy, no-c-format
-msgid "Split translations at semicolons"
-msgstr "翻译(&T)"
+#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 105
+#: rc.cpp:576
+#, no-c-format
+msgid "&Down"
+msgstr "下移(&D)"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 173
-#: rc.cpp:369
+#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 113
+#: rc.cpp:579
 #, no-c-format
-msgid ""
-"When this options is enabled, translations that have not been split at periods "
-"or colons will be split at semicolons if they have any."
-msgstr ""
+msgid "S&kip"
+msgstr "跳过(&K)"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 192
-#: rc.cpp:372
+#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 121
+#: rc.cpp:582
 #, no-c-format
-msgid "co&mmas"
-msgstr ""
+msgid "&Up"
+msgstr "上移(&U)"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 195
-#: rc.cpp:375
+#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 129
+#: rc.cpp:585
 #, fuzzy, no-c-format
-msgid "Split translations at commas"
-msgstr "翻译(&T)"
+msgid "Use &current document"
+msgstr "使用当前文档(&R)"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 198
-#: rc.cpp:378
+#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 132
+#: rc.cpp:588
 #, no-c-format
 msgid ""
-"When this options is enabled, translations that have not been split at periods, "
-"colons or semicolons will be split at commas if they have any."
-msgstr ""
-
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 209
-#: rc.cpp:381
-#, no-c-format
-msgid "co&lons"
+"Check this if you want the items in the clipboard to be in the same language "
+"order as the current document."
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 212
-#: rc.cpp:384
-#, fuzzy, no-c-format
-msgid "Split translations at colons"
-msgstr "翻译(&T)"
-
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 215
-#: rc.cpp:387
+#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 135
+#: rc.cpp:591
 #, no-c-format
 msgid ""
-"When this options is enabled, translations that have not been split at periods "
-"will be split at colons if they have any."
+"When checked, the items in the clipboard are assumed to be in the same language "
+"order as the current document."
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 226
-#: rc.cpp:390
+#. i18n: file ./common-dialogs/groupoptionsbase.ui line 27
+#: rc.cpp:594
 #, no-c-format
-msgid "Enable S&how More button"
-msgstr ""
+msgid "N&ame:"
+msgstr "名称(&A)："
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 229
-#: rc.cpp:393
+#. i18n: file ./common-dialogs/groupoptionsbase.ui line 70
+#: rc.cpp:600
 #, no-c-format
-msgid "Enable the Show More button on the Random Query screen"
+msgid "&Load"
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 232
-#: rc.cpp:396
+#. i18n: file ./common-dialogs/groupoptionsbase.ui line 86
+#: rc.cpp:603
 #, no-c-format
-msgid ""
-"When this is checked, you will be able to use a Show More button which allow "
-"you to get the next letter in your answer in the query. If this is unchecked, "
-"the Show More button will not be enabled, you will not be able to use it."
-msgstr ""
-
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 324
-#: rc.cpp:405
-#, fuzzy, no-c-format
-msgid "Time Per Query"
-msgstr "每次问答时间"
+msgid "&New"
+msgstr "新建(&N)"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 358
-#: rc.cpp:408
+#. i18n: file ./common-dialogs/ProgressDlgForm.ui line 82
+#: rc.cpp:618
 #, no-c-format
-msgid "&Show solution"
-msgstr "显示答案(&S)"
+msgid "file.kvtml"
+msgstr "file.kvtml"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 369
-#: rc.cpp:411
+#. i18n: file ./common-dialogs/ProgressDlgForm.ui line 98
+#: rc.cpp:621
 #, no-c-format
-msgid "&No time limitation"
-msgstr "无时间限制(&N)"
+msgid "title"
+msgstr "标题"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 375
-#: rc.cpp:414
-#, no-c-format
-msgid "Check this if you do not want any time limitation per query."
-msgstr ""
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 27
+#: rc.cpp:624
+#, fuzzy, no-c-format
+msgid "&Save vocabularies automatically on close and quit"
+msgstr "自动保存选项(&S)"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 378
-#: rc.cpp:417
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 30
+#: rc.cpp:627 rc.cpp:636
 #, no-c-format
-msgid "When this is checked, there is no time limitation for each query"
+msgid "Allow automatic saving of your work"
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 386
-#: rc.cpp:420
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 33
+#: rc.cpp:630 rc.cpp:639
 #, no-c-format
-msgid "&Continue after timeout"
-msgstr "超时后继续(&C)"
+msgid "Your work will be automatically saved if you check this option"
+msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 404
-#: rc.cpp:423
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 41
+#: rc.cpp:633
 #, fuzzy, no-c-format
-msgid "Ma&x. time (s):"
-msgstr "最多次数(&M)："
-
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 423
-#: rc.cpp:426
-#, no-c-format
-msgid "S&how remaining time"
-msgstr "显示剩余时间(&H)"
+msgid "&Create a backup every"
+msgstr "创建随机问答(&Q)"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 426
-#: rc.cpp:429
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 66
+#: rc.cpp:642
 #, no-c-format
-msgid "If checked, activate a progress bar to show the remaining time."
+msgid "minutes"
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 429
-#: rc.cpp:432
-#, no-c-format
-msgid ""
-"Check this button if you want to activate a progress bar to show the remaining "
-"time for each query."
-msgstr ""
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 77
+#: rc.cpp:645
+#, fuzzy, no-c-format
+msgid "Smart a&ppending"
+msgstr "智能添加(&P)"
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 460
-#: rc.cpp:435
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 80
+#: rc.cpp:648
 #, no-c-format
-msgid "Set the maximum time allowed per query."
+msgid "If checked, the entry dialog will popup repeatedly"
 msgstr ""
 
-#. i18n: file ./common-dialogs/queryoptionsbase.ui line 463
-#: rc.cpp:438
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 83
+#: rc.cpp:651
 #, no-c-format
 msgid ""
-"You may set a time limit KVocTrain grants you to remember the correct answer. "
-"Set here the maximum time you want to allow per query."
+"If this feature is activated, you will repeatedly be prompted with the entry "
+"dialog. After entering the first original you have to enter the corresponding "
+"translations. Afterwards you proceed with the next original and its "
+"translations until you stop by pressing the ESC key."
 msgstr ""
 
-#. i18n: file ./common-dialogs/groupoptionsbase.ui line 27
-#: rc.cpp:441
-#, no-c-format
-msgid "N&ame:"
-msgstr "名称(&A)："
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 91
+#: rc.cpp:654
+#, fuzzy, no-c-format
+msgid "Appl&y changes without asking"
+msgstr "不询问直接应用改变(&W)"
 
-#. i18n: file ./common-dialogs/groupoptionsbase.ui line 70
-#: rc.cpp:447
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 94
+#: rc.cpp:657
 #, no-c-format
-msgid "&Load"
+msgid "Your changes will be applied automatically."
 msgstr ""
 
-#. i18n: file ./common-dialogs/groupoptionsbase.ui line 86
-#: rc.cpp:450
-#, no-c-format
-msgid "&New"
-msgstr "新建(&N)"
-
-#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 53
-#: rc.cpp:456
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 97
+#: rc.cpp:660
 #, no-c-format
-msgid "G&rade:"
-msgstr "级别(&R)："
+msgid ""
+"If checked, you will not be asked if you really want this change; it will be "
+"applied automatically."
+msgstr ""
 
-#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 64
-#: rc.cpp:459
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 105
+#: rc.cpp:663
 #, no-c-format
-msgid "&Bad count:"
-msgstr "错误计数(&B)："
+msgid "Column Resizing"
+msgstr "改变表列大小"
 
-#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 75
-#: rc.cpp:462
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 119
+#: rc.cpp:666
 #, no-c-format
-msgid "Last q&uery:"
-msgstr "上次问答(&U)："
+msgid "A&utomatic"
+msgstr "自动(&U)"
 
-#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 119
-#: rc.cpp:465
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 122
+#: rc.cpp:669
 #, no-c-format
-msgid "Word t&ype:"
-msgstr "词性(&Y)："
+msgid "KVocTrain determines the resizing of the columns"
+msgstr ""
 
-#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 140
-#: rc.cpp:468
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 125
+#: rc.cpp:672
 #, no-c-format
-msgid "Query c&ount:"
-msgstr "问答计数(&O)："
+msgid ""
+"KVocTrain makes each column the same width except the leftmost with the lesson "
+"names, which is half the size of the others. The second column, which contains "
+"the picture that describes the state of the row, has a fixed width."
+msgstr ""
 
-#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 167
-#: rc.cpp:471
-#, no-c-format
-msgid "&All"
-msgstr "全部(&A)"
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 133
+#: rc.cpp:675
+#, fuzzy, no-c-format
+msgid "P&ercentage"
+msgstr "百分比(&E)"
 
-#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 191
-#: rc.cpp:474
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 136
+#: rc.cpp:678
 #, no-c-format
-msgid "&None"
-msgstr "无(&N)"
+msgid "The columns resize using the same factor that the window is resized to."
+msgstr ""
 
-#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 199
-#: rc.cpp:477
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 139
+#: rc.cpp:681
 #, no-c-format
-msgid "Selected lessons:"
-msgstr "所选的课程："
+msgid "If this is checked, the columns resize by the same amount as the window"
+msgstr ""
 
-#. i18n: file ./common-dialogs/thresholdoptionsbase.ui line 257
-#: rc.cpp:483 rc.cpp:867
-#, no-c-format
-msgid "&Lesson:"
-msgstr "课程(&L)："
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 147
+#: rc.cpp:684
+#, fuzzy, no-c-format
+msgid "&Fixed"
+msgstr "固定(&F)"
 
-#. i18n: file ./common-dialogs/blockoptionsbase.ui line 83
-#: rc.cpp:495
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 150
+#: rc.cpp:687
 #, no-c-format
-msgid "E&xpiring"
-msgstr "过期(&X)"
+msgid "There is no resizing of the columns"
+msgstr ""
 
-#. i18n: file ./common-dialogs/blockoptionsbase.ui line 104
-#: rc.cpp:498
+#. i18n: file ./common-dialogs/generaloptionsbase.ui line 153
+#: rc.cpp:690
 #, no-c-format
-msgid "Bl&ocking"
-msgstr "封存(&O)"
+msgid "When checked, the columns are not resized"
+msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 30
-#: rc.cpp:513
+#: rc.cpp:693
 #, no-c-format
 msgid "Available Languages"
 msgstr "可用的语种"
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 50
-#: rc.cpp:519
+#: rc.cpp:699
 #, fuzzy, no-c-format
 msgid "Delete the selected language"
 msgstr ""
 "您真的要删除所选中的范围吗？\n"
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 53
-#: rc.cpp:522
+#: rc.cpp:702
 #, fuzzy, no-c-format
 msgid "By clicking on this button you can delete the selected language."
 msgstr ""
 "您真的要删除所选中的范围吗？\n"
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 69
-#: rc.cpp:525
+#: rc.cpp:705
 #, fuzzy, no-c-format
 msgid "Alternative language code"
 msgstr "可选代码(&R)："
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 72
-#: rc.cpp:528
+#: rc.cpp:708
 #, no-c-format
 msgid ""
 "An alternative language code is set here but you can change it if you want"
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 88
-#: rc.cpp:531
+#: rc.cpp:711
 #, fuzzy, no-c-format
 msgid "Your own description of the language code."
 msgstr "语种代码定义含混"
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 91
-#: rc.cpp:534
+#: rc.cpp:714
 #, no-c-format
 msgid ""
 "A description of the language is written here and you can modify it if you "
@@ -4014,13 +3981,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 99
-#: rc.cpp:537 rc.cpp:549
+#: rc.cpp:717 rc.cpp:729
 #, no-c-format
 msgid "Select a language or use the Add New Language Code to add one."
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 102
-#: rc.cpp:540 rc.cpp:552
+#: rc.cpp:720 rc.cpp:732
 #, no-c-format
 msgid ""
 "You can select a language with the drop down box or use the Add New Language "
@@ -4028,13 +3995,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 113
-#: rc.cpp:543
+#: rc.cpp:723
 #, no-c-format
 msgid "The flag representing the language"
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 116
-#: rc.cpp:546
+#: rc.cpp:726
 #, no-c-format
 msgid ""
 "The default flag representing the language is set here but you can choose "
@@ -4042,19 +4009,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 143
-#: rc.cpp:555
+#: rc.cpp:735
 #, no-c-format
 msgid "Language c&ode:"
 msgstr "语种代码(&O)："
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 149
-#: rc.cpp:558 rc.cpp:594
+#: rc.cpp:738 rc.cpp:774
 #, no-c-format
 msgid "You can assign a language to each column"
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 152
-#: rc.cpp:561 rc.cpp:597
+#: rc.cpp:741 rc.cpp:777
 #, no-c-format
 msgid ""
 "Each column can be assigned a language. This is internally done with the usual "
@@ -4062,19 +4029,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 160
-#: rc.cpp:564
+#: rc.cpp:744
 #, fuzzy, no-c-format
 msgid "Alte&rnative code:"
 msgstr "可选代码(&R)："
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 166
-#: rc.cpp:567
+#: rc.cpp:747
 #, no-c-format
 msgid "Select a second language code if necessary"
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 169
-#: rc.cpp:570
+#: rc.cpp:750
 #, no-c-format
 msgid ""
 "Sometimes it may be useful to have a second language code because some "
@@ -4082,19 +4049,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 177
-#: rc.cpp:573
+#: rc.cpp:753
 #, no-c-format
 msgid "Lang&uage name:"
 msgstr "语种名称(&U)："
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 183
-#: rc.cpp:576
+#: rc.cpp:756
 #, no-c-format
 msgid "Describe the language in your own terms."
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 186
-#: rc.cpp:579
+#: rc.cpp:759
 #, no-c-format
 msgid ""
 "Here you can give the language code a descriptive name in your own language "
@@ -4102,49 +4069,49 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 194
-#: rc.cpp:582
+#: rc.cpp:762
 #, no-c-format
 msgid "&Picture:"
 msgstr "图片(&P)："
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 200
-#: rc.cpp:585
+#: rc.cpp:765
 #, no-c-format
 msgid "Set a picture for the language"
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 203
-#: rc.cpp:588
+#: rc.cpp:768
 #, no-c-format
 msgid "Choose a picture to represent the language above."
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 219
-#: rc.cpp:591
+#: rc.cpp:771
 #, no-c-format
 msgid "Keyboard layout:"
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 238
-#: rc.cpp:600
+#: rc.cpp:780
 #, no-c-format
 msgid "Add New Language Code"
 msgstr "添加新的语种代码"
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 255
-#: rc.cpp:603
+#: rc.cpp:783
 #, no-c-format
 msgid "Add Language Data From &TDE Database"
 msgstr "从 &TDE 数据库添加语种数据"
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 258
-#: rc.cpp:606
+#: rc.cpp:786
 #, no-c-format
 msgid "Obtains the language choices from the TDE database"
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 261
-#: rc.cpp:609
+#: rc.cpp:789
 #, no-c-format
 msgid ""
 "Pressing this button opens a menu that contains all the countries that are "
@@ -4153,19 +4120,25 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 269
-#: rc.cpp:612
+#: rc.cpp:792
 #, no-c-format
 msgid "Add Language Data From ISO639-&1"
 msgstr "从 ISO639-&1 添加语种数据"
 
+#. i18n: file ./common-dialogs/languageoptionsbase.ui line 272
+#: rc.cpp:795 rc.cpp:990
+#, no-c-format
+msgid "Alt+1"
+msgstr ""
+
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 275
-#: rc.cpp:618
+#: rc.cpp:798
 #, fuzzy, no-c-format
 msgid "List of languages covered by ISO639-1"
 msgstr "语种代码(ISO 639)："
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 278
-#: rc.cpp:621
+#: rc.cpp:801
 #, no-c-format
 msgid ""
 "Pressing this button opens a menu that contains all the language codes that are "
@@ -4173,646 +4146,676 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 286
-#: rc.cpp:624
+#: rc.cpp:804
 #, no-c-format
 msgid "&Add"
 msgstr "添加(&A)"
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 289
-#: rc.cpp:627
+#: rc.cpp:807
 #, fuzzy, no-c-format
 msgid "Allow addition of the language you typed."
 msgstr "语种代码定义含混"
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 292
-#: rc.cpp:630
+#: rc.cpp:810
 #, no-c-format
 msgid ""
 "This button becomes available when you type a language code in the field."
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 308
-#: rc.cpp:633
+#: rc.cpp:813
 #, no-c-format
 msgid "Type your language code if you know it."
 msgstr ""
 
 #. i18n: file ./common-dialogs/languageoptionsbase.ui line 311
-#: rc.cpp:636
+#: rc.cpp:816
 #, no-c-format
 msgid ""
 "Type the language code if you know it or use one of the 2 buttons below to "
 "choose a language code."
 msgstr ""
 
-#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 30
-#: rc.cpp:639
-#, fuzzy, no-c-format
-msgid "Sep&arator:"
-msgstr "分隔符(&S)："
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 30
+#: rc.cpp:819
+#, no-c-format
+msgid "&Use alternative learning method"
+msgstr ""
 
-#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 47
-#: rc.cpp:642
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 33
+#: rc.cpp:822
 #, no-c-format
-msgid "Choose which separator you want to use to separate your data."
+msgid "Use the Leitner learning method"
 msgstr ""
 
-#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 50
-#: rc.cpp:645
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 36
+#: rc.cpp:825
 #, no-c-format
 msgid ""
-"Choose one separator which will divide the parts of an expression when "
-"transferring data from or to another application over the clipboard."
+"By checking this, you will use the Leitner method of learning which requires "
+"you to answer correctly to each question 4 times in a row. "
 msgstr ""
 
-#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 75
-#: rc.cpp:648
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 44
+#: rc.cpp:828
+#, no-c-format
+msgid "S&wap direction randomly"
+msgstr "随机交换方向(&W)"
+
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 52
+#: rc.cpp:831
 #, fuzzy, no-c-format
-msgid "Order"
-msgstr "次序(&O)"
+msgid "Random Query Options"
+msgstr "问答选项"
 
-#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 105
-#: rc.cpp:651
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 66
+#: rc.cpp:834
 #, no-c-format
-msgid "&Down"
-msgstr "下移(&D)"
+msgid "&Enable suggestion lists"
+msgstr ""
 
-#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 113
-#: rc.cpp:654
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 69
+#: rc.cpp:837
 #, no-c-format
-msgid "S&kip"
-msgstr "跳过(&K)"
+msgid "If checked, pressing F5 or F6 will display a list of suggestions"
+msgstr ""
 
-#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 121
-#: rc.cpp:657
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 72
+#: rc.cpp:840
 #, no-c-format
-msgid "&Up"
-msgstr "上移(&U)"
+msgid ""
+"When this options is enabled, you can enter part of an answer, then press F5 or "
+"F6 to get a list of translations starting with or containing the text you "
+"typed."
+msgstr ""
 
-#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 129
-#: rc.cpp:660
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 83
+#: rc.cpp:843
 #, fuzzy, no-c-format
-msgid "Use &current document"
-msgstr "使用当前文档(&R)"
+msgid "Split &translations"
+msgstr "翻译(&T)"
 
-#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 132
-#: rc.cpp:663
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 86
+#: rc.cpp:846
+#, fuzzy, no-c-format
+msgid "Split translations and show multiple answer fields"
+msgstr "正在开始随机问答..."
+
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 89
+#: rc.cpp:849
 #, no-c-format
 msgid ""
-"Check this if you want the items in the clipboard to be in the same language "
-"order as the current document."
+"When this options is enabled, the program will split translations into several "
+"parts, show multiple answer fields, and you will need to answer each one of "
+"them. This is useful for example when a word has several meanings that have "
+"different translations in the other language."
 msgstr ""
 
-#. i18n: file ./common-dialogs/pasteoptionsbase.ui line 135
-#: rc.cpp:666
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 97
+#: rc.cpp:852
 #, no-c-format
-msgid ""
-"When checked, the items in the clipboard are assumed to be in the same language "
-"order as the current document."
+msgid "Maximum number of &fields:"
 msgstr ""
 
-#. i18n: file ./common-dialogs/ProgressDlgForm.ui line 54
-#: rc.cpp:672 rc.cpp:756
-#, fuzzy, no-c-format
-msgid "Filename:"
-msgstr "文件名："
-
-#. i18n: file ./common-dialogs/ProgressDlgForm.ui line 66
-#: rc.cpp:675 rc.cpp:759
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 103
+#: rc.cpp:855 rc.cpp:918
 #, no-c-format
-msgid "Title:"
-msgstr "标题："
+msgid "Maximum number of fields to split translations into"
+msgstr ""
 
-#. i18n: file ./common-dialogs/ProgressDlgForm.ui line 82
-#: rc.cpp:678
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 106
+#: rc.cpp:858 rc.cpp:921
 #, no-c-format
-msgid "file.kvtml"
-msgstr "file.kvtml"
+msgid ""
+"Enter the maximum number of answer fields you want to have. When splitting "
+"translations, the program will only split into this many parts, and the last "
+"part will contain the rest of the translation."
+msgstr ""
 
-#. i18n: file ./common-dialogs/ProgressDlgForm.ui line 98
-#: rc.cpp:681
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 117
+#: rc.cpp:861
 #, no-c-format
-msgid "title"
-msgstr "标题"
+msgid "Enable I Know &button"
+msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 27
-#: rc.cpp:684
-#, fuzzy, no-c-format
-msgid "&Save vocabularies automatically on close and quit"
-msgstr "自动保存选项(&S)"
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 120
+#: rc.cpp:864
+#, no-c-format
+msgid "Enable the I Know It button on the Random Query screen"
+msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 30
-#: rc.cpp:687 rc.cpp:696
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 123
+#: rc.cpp:867
 #, no-c-format
-msgid "Allow automatic saving of your work"
+msgid ""
+"If this is checked, the I Know button will be available. It allows you to tell "
+"the query that you know the result without writing it or having it checked. "
+"This is available by default. If you uncheck this, the I Know button will not "
+"be available."
 msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 33
-#: rc.cpp:690 rc.cpp:699
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 139
+#: rc.cpp:870
 #, no-c-format
-msgid "Your work will be automatically saved if you check this option"
+msgid "at"
 msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 41
-#: rc.cpp:693
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 150
+#: rc.cpp:873
 #, fuzzy, no-c-format
-msgid "&Create a backup every"
-msgstr "创建随机问答(&Q)"
+msgid "pe&riods"
+msgstr "[人称]"
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 66
-#: rc.cpp:702
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 153
+#: rc.cpp:876
+#, fuzzy, no-c-format
+msgid "Split translations at periods"
+msgstr "翻译(&T)"
+
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 156
+#: rc.cpp:879
 #, no-c-format
-msgid "minutes"
+msgid ""
+"When this options is enabled, translations will be split at periods if they "
+"have any (except any trailing periods that will be removed)."
 msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 77
-#: rc.cpp:705
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 167
+#: rc.cpp:882
 #, fuzzy, no-c-format
-msgid "Smart a&ppending"
-msgstr "智能添加(&P)"
+msgid "sem&icolons"
+msgstr "使用颜色(&U)"
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 80
-#: rc.cpp:708
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 170
+#: rc.cpp:885
+#, fuzzy, no-c-format
+msgid "Split translations at semicolons"
+msgstr "翻译(&T)"
+
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 173
+#: rc.cpp:888
 #, no-c-format
-msgid "If checked, the entry dialog will popup repeatedly"
+msgid ""
+"When this options is enabled, translations that have not been split at periods "
+"or colons will be split at semicolons if they have any."
 msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 83
-#: rc.cpp:711
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 192
+#: rc.cpp:891
 #, no-c-format
-msgid ""
-"If this feature is activated, you will repeatedly be prompted with the entry "
-"dialog. After entering the first original you have to enter the corresponding "
-"translations. Afterwards you proceed with the next original and its "
-"translations until you stop by pressing the ESC key."
+msgid "co&mmas"
 msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 91
-#: rc.cpp:714
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 195
+#: rc.cpp:894
 #, fuzzy, no-c-format
-msgid "Appl&y changes without asking"
-msgstr "不询问直接应用改变(&W)"
+msgid "Split translations at commas"
+msgstr "翻译(&T)"
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 94
-#: rc.cpp:717
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 198
+#: rc.cpp:897
 #, no-c-format
-msgid "Your changes will be applied automatically."
+msgid ""
+"When this options is enabled, translations that have not been split at periods, "
+"colons or semicolons will be split at commas if they have any."
 msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 97
-#: rc.cpp:720
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 209
+#: rc.cpp:900
 #, no-c-format
-msgid ""
-"If checked, you will not be asked if you really want this change; it will be "
-"applied automatically."
+msgid "co&lons"
 msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 105
-#: rc.cpp:723
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 212
+#: rc.cpp:903
+#, fuzzy, no-c-format
+msgid "Split translations at colons"
+msgstr "翻译(&T)"
+
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 215
+#: rc.cpp:906
 #, no-c-format
-msgid "Column Resizing"
-msgstr "改变表列大小"
+msgid ""
+"When this options is enabled, translations that have not been split at periods "
+"will be split at colons if they have any."
+msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 119
-#: rc.cpp:726
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 226
+#: rc.cpp:909
 #, no-c-format
-msgid "A&utomatic"
-msgstr "自动(&U)"
+msgid "Enable S&how More button"
+msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 122
-#: rc.cpp:729
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 229
+#: rc.cpp:912
 #, no-c-format
-msgid "KVocTrain determines the resizing of the columns"
+msgid "Enable the Show More button on the Random Query screen"
 msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 125
-#: rc.cpp:732
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 232
+#: rc.cpp:915
 #, no-c-format
 msgid ""
-"KVocTrain makes each column the same width except the leftmost with the lesson "
-"names, which is half the size of the others. The second column, which contains "
-"the picture that describes the state of the row, has a fixed width."
+"When this is checked, you will be able to use a Show More button which allow "
+"you to get the next letter in your answer in the query. If this is unchecked, "
+"the Show More button will not be enabled, you will not be able to use it."
 msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 133
-#: rc.cpp:735
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 324
+#: rc.cpp:924
 #, fuzzy, no-c-format
-msgid "P&ercentage"
-msgstr "百分比(&E)"
+msgid "Time Per Query"
+msgstr "每次问答时间"
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 136
-#: rc.cpp:738
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 358
+#: rc.cpp:927
 #, no-c-format
-msgid "The columns resize using the same factor that the window is resized to."
-msgstr ""
+msgid "&Show solution"
+msgstr "显示答案(&S)"
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 139
-#: rc.cpp:741
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 369
+#: rc.cpp:930
 #, no-c-format
-msgid "If this is checked, the columns resize by the same amount as the window"
-msgstr ""
-
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 147
-#: rc.cpp:744
-#, fuzzy, no-c-format
-msgid "&Fixed"
-msgstr "固定(&F)"
+msgid "&No time limitation"
+msgstr "无时间限制(&N)"
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 150
-#: rc.cpp:747
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 375
+#: rc.cpp:933
 #, no-c-format
-msgid "There is no resizing of the columns"
+msgid "Check this if you do not want any time limitation per query."
 msgstr ""
 
-#. i18n: file ./common-dialogs/generaloptionsbase.ui line 153
-#: rc.cpp:750
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 378
+#: rc.cpp:936
 #, no-c-format
-msgid "When checked, the columns are not resized"
+msgid "When this is checked, there is no time limitation for each query"
 msgstr ""
 
-#. i18n: file ./statistik-dialogs/GenStatPageForm.ui line 61
-#: rc.cpp:762
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 386
+#: rc.cpp:939
 #, no-c-format
-msgid "Entries:"
-msgstr "词数："
+msgid "&Continue after timeout"
+msgstr "超时后继续(&C)"
 
-#. i18n: file ./statistik-dialogs/GenStatPageForm.ui line 73
-#: rc.cpp:765
-#, no-c-format
-msgid "Author:"
-msgstr "作者："
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 404
+#: rc.cpp:942
+#, fuzzy, no-c-format
+msgid "Ma&x. time (s):"
+msgstr "最多次数(&M)："
 
-#. i18n: file ./statistik-dialogs/GenStatPageForm.ui line 85
-#: rc.cpp:768
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 423
+#: rc.cpp:945
 #, no-c-format
-msgid "Lessons:"
-msgstr "课程："
+msgid "S&how remaining time"
+msgstr "显示剩余时间(&H)"
 
-#. i18n: file ./statistik-dialogs/StatistikPageForm.ui line 28
-#: rc.cpp:774
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 426
+#: rc.cpp:948
 #, no-c-format
-msgid "Grade FROM"
-msgstr "从…级别"
+msgid "If checked, activate a progress bar to show the remaining time."
+msgstr ""
 
-#. i18n: file ./statistik-dialogs/StatistikPageForm.ui line 39
-#: rc.cpp:777
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 429
+#: rc.cpp:951
 #, no-c-format
-msgid "Grade TO"
-msgstr "到…级别"
+msgid ""
+"Check this button if you want to activate a progress bar to show the remaining "
+"time for each query."
+msgstr ""
 
-#. i18n: file ./statistik-dialogs/StatistikPageForm.ui line 50
-#: rc.cpp:780
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 460
+#: rc.cpp:954
 #, no-c-format
-msgid "Entries"
-msgstr "词数"
+msgid "Set the maximum time allowed per query."
+msgstr ""
 
-#. i18n: file ./entry-dialogs/AuxInfoEntryPageForm.ui line 49
-#: rc.cpp:789
+#. i18n: file ./common-dialogs/queryoptionsbase.ui line 463
+#: rc.cpp:957
 #, no-c-format
-msgid "Additional Properties"
-msgstr "附加属性"
+msgid ""
+"You may set a time limit KVocTrain grants you to remember the correct answer. "
+"Set here the maximum time you want to allow per query."
+msgstr ""
 
-#. i18n: file ./entry-dialogs/AuxInfoEntryPageForm.ui line 123
-#: rc.cpp:792
-#, no-c-format
-msgid "S&ynonyms:"
-msgstr "同义词(&Y)："
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 35
+#: rc.cpp:960
+#, fuzzy, no-c-format
+msgid "&Table font:"
+msgstr "表格字体："
 
-#. i18n: file ./entry-dialogs/AuxInfoEntryPageForm.ui line 134
-#: rc.cpp:795
-#, no-c-format
-msgid "Ant&onyms:"
-msgstr "反义词(&O)："
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 51
+#: rc.cpp:963
+#, fuzzy, no-c-format
+msgid "&IPA font:"
+msgstr "IPA 字体："
 
-#. i18n: file ./entry-dialogs/AuxInfoEntryPageForm.ui line 145
-#: rc.cpp:798
-#, no-c-format
-msgid "E&xample:"
-msgstr "例句(&X)："
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 70
+#: rc.cpp:966
+#, fuzzy, no-c-format
+msgid "Grade Colors"
+msgstr "级别颜色"
 
-#. i18n: file ./entry-dialogs/AuxInfoEntryPageForm.ui line 167
-#: rc.cpp:804
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 171
+#: rc.cpp:981
 #, no-c-format
-msgid "&Paraphrase:"
-msgstr "解释(&P)："
+msgid "&N"
+msgstr "&N"
 
-#. i18n: file ./entry-dialogs/AdjEntryPageForm.ui line 33
-#: rc.cpp:810
-#, no-c-format
-msgid "Comparison of Adjectives"
-msgstr "形容词比较级"
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 187
+#: rc.cpp:984
+#, fuzzy, no-c-format
+msgid "Not &queried:"
+msgstr "未问到(&N)："
 
-#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 113
-#: rc.cpp:828
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 206
+#: rc.cpp:987
 #, no-c-format
-msgid "False fr&iend:"
-msgstr "虚假的友词(&I)："
+msgid "&1"
+msgstr "&1"
 
-#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 124
-#: rc.cpp:831
-#, no-c-format
-msgid "&Grade:"
-msgstr "级别(&G)："
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 212
+#: rc.cpp:993
+#, fuzzy, no-c-format
+msgid "Color for the grade 1"
+msgstr "无法读取 "
 
-#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 137
-#: rc.cpp:834
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 215
+#: rc.cpp:996
 #, no-c-format
-msgid "Last Query &Date"
-msgstr "上次问答日期(&D)"
+msgid "Click here to change the color for grade 1."
+msgstr ""
 
-#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 204
-#: rc.cpp:837
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 269
+#: rc.cpp:1005
 #, no-c-format
-msgid "T&oday"
-msgstr "今天(&O)"
+msgid "&2"
+msgstr "&2"
 
-#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 212
-#: rc.cpp:840
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 272
+#: rc.cpp:1008
 #, no-c-format
-msgid "&Never"
-msgstr "从不(&N)"
+msgid "Alt+2"
+msgstr ""
 
-#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 222
-#: rc.cpp:843
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 275
+#: rc.cpp:1011
+#, fuzzy, no-c-format
+msgid "Color for the grade 2"
+msgstr "无法读取 "
+
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 278
+#: rc.cpp:1014
 #, no-c-format
-msgid "Query Counters"
-msgstr "问答计数"
+msgid "Click here to change the color for grade 2."
+msgstr ""
 
-#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 239
-#: rc.cpp:846
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 313
+#: rc.cpp:1020
 #, no-c-format
-msgid "&Wrong:"
-msgstr "错误(&W)："
+msgid "&3"
+msgstr "&3"
 
-#. i18n: file ./entry-dialogs/FromToEntryPageForm.ui line 250
-#: rc.cpp:849
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 316
+#: rc.cpp:1023
 #, no-c-format
-msgid "&Altogether:"
-msgstr "总共(&A)："
+msgid "Alt+3"
+msgstr ""
 
-#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 27
-#: rc.cpp:855
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 319
+#: rc.cpp:1026
+#, fuzzy, no-c-format
+msgid "Color for the grade 3"
+msgstr "无法读取 "
+
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 322
+#: rc.cpp:1029
 #, no-c-format
-msgid "Invokes lesson input dialog"
-msgstr "调出课程输入对话框"
+msgid "Click here to change the color for grade 3."
+msgstr ""
 
-#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 52
-#: rc.cpp:858
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 338
+#: rc.cpp:1032
 #, no-c-format
-msgid "Common Properties"
-msgstr "常用属性"
+msgid "&4"
+msgstr "&4"
 
-#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 128
-#: rc.cpp:861
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 341
+#: rc.cpp:1035
 #, no-c-format
-msgid "&Expression:"
-msgstr "词语(&E)："
+msgid "Alt+4"
+msgstr ""
 
-#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 139
-#: rc.cpp:864
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 344
+#: rc.cpp:1038
 #, fuzzy, no-c-format
-msgid "&Pronunciation:"
-msgstr "发音(&P)："
+msgid "Color for the grade 4"
+msgstr "无法读取 "
 
-#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 184
-#: rc.cpp:873
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 347
+#: rc.cpp:1041
 #, no-c-format
-msgid "Invokes input dialog for lessons"
-msgstr "调出课程输入对话框"
+msgid "Click here to change the color for grade 4."
+msgstr ""
 
-#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 215
-#: rc.cpp:879
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 363
+#: rc.cpp:1044
 #, no-c-format
-msgid "Invokes dialog page with characters from phonetic alphabet"
-msgstr "调出输入语音符号字符的对话框"
+msgid "&5"
+msgstr "&5"
 
-#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 225
-#: rc.cpp:882
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 366
+#: rc.cpp:1047
 #, no-c-format
-msgid "T&ype"
-msgstr "词性(&Y)"
+msgid "Alt+5"
+msgstr ""
 
-#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 272
-#: rc.cpp:885
-#, no-c-format
-msgid "&Subtype:"
-msgstr "亚词性(&S)："
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 369
+#: rc.cpp:1050
+#, fuzzy, no-c-format
+msgid "Color for the grade 5"
+msgstr "无法读取 "
 
-#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 319
-#: rc.cpp:891
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 372
+#: rc.cpp:1053
 #, no-c-format
-msgid "Invokes input dialog for word types"
-msgstr "调出词性输入对话框"
+msgid "Click here to change the color for grade 5."
+msgstr ""
 
-#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 377
-#: rc.cpp:900
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 388
+#: rc.cpp:1056
 #, no-c-format
-msgid "Invokes input dialog for usage labels"
-msgstr "调出惯用法标签输入对话框"
+msgid "&6"
+msgstr "&6"
 
-#. i18n: file ./entry-dialogs/CommonEntryPageForm.ui line 458
-#: rc.cpp:903
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 391
+#: rc.cpp:1059
 #, no-c-format
-msgid "Acti&ve"
-msgstr "活跃(&V)"
+msgid "Alt+6"
+msgstr ""
 
-#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 33
-#: rc.cpp:909
-#, no-c-format
-msgid "Conjugation of Verbs"
-msgstr "动词变形"
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 394
+#: rc.cpp:1062
+#, fuzzy, no-c-format
+msgid "Color for the grade 6"
+msgstr "无法读取 "
 
-#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 177
-#: rc.cpp:927
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 397
+#: rc.cpp:1065
 #, no-c-format
-msgid "&3. Person:"
-msgstr "&3. 人称："
+msgid "Click here to change the color for grade 6."
+msgstr ""
 
-#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 329
-#: rc.cpp:942
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 413
+#: rc.cpp:1068
 #, no-c-format
-msgid "&Tense:"
-msgstr "时态(&T)："
+msgid "&7"
+msgstr "&7"
 
-#. i18n: file ./entry-dialogs/TenseEntryPageForm.ui line 348
-#: rc.cpp:945
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 416
+#: rc.cpp:1071
 #, no-c-format
-msgid "Ne&xt"
-msgstr "下一个(&X)"
+msgid "Alt+7"
+msgstr ""
 
-#. i18n: file ./entry-dialogs/MCEntryPageForm.ui line 33
-#: rc.cpp:951
-#, no-c-format
-msgid "Suggestions for Multiple Choice"
-msgstr "多项单选的提示"
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 419
+#: rc.cpp:1074
+#, fuzzy, no-c-format
+msgid "Color for the grade 7"
+msgstr "无法读取 "
 
-#. i18n: file ./entry-dialogs/MCEntryPageForm.ui line 58
-#: rc.cpp:954 rc.cpp:1167
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 422
+#: rc.cpp:1077
 #, no-c-format
-msgid "&1:"
-msgstr "&1："
+msgid "Click here to change the color for grade 7."
+msgstr ""
 
-#. i18n: file ./entry-dialogs/MCEntryPageForm.ui line 77
-#: rc.cpp:957 rc.cpp:1161
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 430
+#: rc.cpp:1080
 #, no-c-format
-msgid "&2:"
-msgstr "&2："
+msgid "&Use colors"
+msgstr "使用颜色(&U)"
 
-#. i18n: file ./entry-dialogs/MCEntryPageForm.ui line 96
-#: rc.cpp:960 rc.cpp:1164
+#. i18n: file ./common-dialogs/viewoptionsbase.ui line 433
+#: rc.cpp:1083 rc.cpp:1086
 #, no-c-format
-msgid "&3:"
-msgstr "&3："
+msgid ""
+"If it is unchecked, you will just have black on white for the grades; if it is "
+"checked, the colors below will be chosen."
+msgstr ""
 
-#. i18n: file ./entry-dialogs/MCEntryPageForm.ui line 180
-#: rc.cpp:963 rc.cpp:1170
+#. i18n: file ./docprop-dialogs/TenseOptPageForm.ui line 33
+#: rc.cpp:1092
 #, no-c-format
-msgid "&4:"
-msgstr "&4："
+msgid "Tense Descriptions"
+msgstr "时态说明"
 
-#. i18n: file ./entry-dialogs/MCEntryPageForm.ui line 199
-#: rc.cpp:966 rc.cpp:1173
+#. i18n: file ./docprop-dialogs/TenseOptPageForm.ui line 75
+#: rc.cpp:1095 rc.cpp:1191 rc.cpp:1209 rc.cpp:1227
 #, no-c-format
-msgid "&5:"
-msgstr "&5："
+msgid "&New..."
+msgstr "新建(&N)..."
 
-#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 40
-#: rc.cpp:969
+#. i18n: file ./docprop-dialogs/TenseOptPageForm.ui line 91
+#: rc.cpp:1098 rc.cpp:1194 rc.cpp:1212 rc.cpp:1230
 #, no-c-format
-msgid "Enter the correct translation:"
-msgstr "输入正确的翻译："
+msgid "&Modify..."
+msgstr "修改(&M)..."
 
-#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 56
-#: rc.cpp:972
+#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 33
+#: rc.cpp:1110
 #, no-c-format
-msgid "Original Expression"
-msgstr "原文词语"
+msgid "Language Elements"
+msgstr "语种元素"
 
-#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 129
-#: rc.cpp:987
+#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 58
+#: rc.cpp:1113
 #, no-c-format
-msgid "T&ype:"
-msgstr "词性(&Y)："
+msgid "Language code (ISO 639):"
+msgstr "语种代码(ISO 639)："
 
-#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 137
-#: rc.cpp:990
+#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 116
+#: rc.cpp:1116
 #, no-c-format
-msgid "&False friend:"
-msgstr "虚假的友词(&F)："
+msgid "Articles"
+msgstr "冠词"
 
-#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 251
-#: rc.cpp:993 rc.cpp:1065 rc.cpp:1098 rc.cpp:1146 rc.cpp:1200 rc.cpp:1245
+#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 176
+#: rc.cpp:1125
 #, no-c-format
-msgid "&Verify"
-msgstr "校验(&V)"
+msgid "Definite"
+msgstr "定冠词"
 
-#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 267
-#: rc.cpp:996 rc.cpp:1242
+#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 277
+#: rc.cpp:1131
 #, no-c-format
-msgid "Show &More"
-msgstr "显示更多(&M)"
+msgid "Indefinite"
+msgstr "不定冠词"
 
-#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 283
-#: rc.cpp:999 rc.cpp:1068 rc.cpp:1104 rc.cpp:1152 rc.cpp:1194 rc.cpp:1239
+#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 295
+#: rc.cpp:1134
 #, no-c-format
-msgid "Show &All"
-msgstr "显示全部(&A)"
-
-#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 299
-#: rc.cpp:1002 rc.cpp:1071 rc.cpp:1107 rc.cpp:1155 rc.cpp:1191
-#, fuzzy, no-c-format
-msgid "&Do Not Know"
-msgstr "不知道(&D)"
+msgid "Conjugation"
+msgstr "词形变化"
 
-#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 315
-#: rc.cpp:1005 rc.cpp:1062 rc.cpp:1101 rc.cpp:1149 rc.cpp:1197 rc.cpp:1233
+#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 334
+#: rc.cpp:1143
 #, no-c-format
-msgid "I &Know It"
-msgstr "我知道(&K)"
+msgid "3. Person:"
+msgstr "3. 人称："
 
-#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 333
-#: rc.cpp:1008 rc.cpp:1074 rc.cpp:1110 rc.cpp:1134 rc.cpp:1203 rc.cpp:1221
+#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 397
+#: rc.cpp:1149
 #, no-c-format
-msgid "Progress"
-msgstr "进度"
+msgid "F&emale:"
+msgstr "雌性(&E)："
 
-#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 350
-#: rc.cpp:1011 rc.cpp:1080 rc.cpp:1116 rc.cpp:1140 rc.cpp:1209 rc.cpp:1227
+#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 408
+#: rc.cpp:1152
 #, no-c-format
-msgid "Time:"
-msgstr "时间："
+msgid "M&ale:"
+msgstr "雄性(&A)："
 
-#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 358
-#: rc.cpp:1014 rc.cpp:1077 rc.cpp:1113 rc.cpp:1137 rc.cpp:1206 rc.cpp:1224
+#. i18n: file ./docprop-dialogs/LangPropPageForm.ui line 419
+#: rc.cpp:1155
 #, no-c-format
-msgid "Count:"
-msgstr "计数："
+msgid "Neu&tral:"
+msgstr "中性(&T)："
 
-#. i18n: file ./query-dialogs/RandomQueryDlgForm.ui line 392
-#: rc.cpp:1017 rc.cpp:1083 rc.cpp:1119 rc.cpp:1143 rc.cpp:1212 rc.cpp:1230
+#. i18n: file ./docprop-dialogs/TitlePageForm.ui line 33
+#: rc.cpp:1170
 #, no-c-format
-msgid "Cycle:"
-msgstr "循环"
+msgid "General Document Properties"
+msgstr "常规文档属性"
 
-#. i18n: file ./query-dialogs/VerbQueryDlgForm.ui line 40
-#: rc.cpp:1020
+#. i18n: file ./docprop-dialogs/TitlePageForm.ui line 50
+#: rc.cpp:1173
 #, no-c-format
-msgid "Enter the correct conjugation forms."
-msgstr "输入正确的词形变化。"
+msgid "&Title:"
+msgstr "标题(&T)："
 
-#. i18n: file ./query-dialogs/VerbQueryDlgForm.ui line 61
-#: rc.cpp:1023
+#. i18n: file ./docprop-dialogs/TitlePageForm.ui line 74
+#: rc.cpp:1176
 #, no-c-format
-msgid "Current tense is %1."
-msgstr "当前时态是 %1。"
+msgid "&Authors:"
+msgstr "作者(&A)："
 
-#. i18n: file ./query-dialogs/VerbQueryDlgForm.ui line 283
-#: rc.cpp:1056
+#. i18n: file ./docprop-dialogs/TitlePageForm.ui line 96
+#: rc.cpp:1182
 #, no-c-format
-msgid "Base form:"
-msgstr "原形："
-
-#. i18n: file ./query-dialogs/AdjQueryDlgForm.ui line 40
-#: rc.cpp:1086
-#, fuzzy, no-c-format
-msgid "Fill in the missing comparison expressions:"
-msgstr "填写缺少的比较级词语："
+msgid "&License:"
+msgstr "许可协议(&L)："
 
-#. i18n: file ./query-dialogs/ArtQueryDlgForm.ui line 40
-#: rc.cpp:1122
+#. i18n: file ./docprop-dialogs/UsageOptPageForm.ui line 33
+#: rc.cpp:1188
 #, no-c-format
-msgid "Select the correct article for this noun:"
-msgstr "为这个名词选择正确的冠词："
+msgid "Usage Labels"
+msgstr ""
 
-#. i18n: file ./query-dialogs/ArtQueryDlgForm.ui line 100
-#: rc.cpp:1125
+#. i18n: file ./docprop-dialogs/LessOptPageForm.ui line 33
+#: rc.cpp:1206
 #, no-c-format
-msgid "&female"
-msgstr "雌性(&F)"
+msgid "Lesson Descriptions"
+msgstr "课程说明"
 
-#. i18n: file ./query-dialogs/ArtQueryDlgForm.ui line 108
-#: rc.cpp:1128
+#. i18n: file ./docprop-dialogs/TypeOptPageForm.ui line 33
+#: rc.cpp:1224
 #, no-c-format
-msgid "&male"
-msgstr "雄性(&M)"
+msgid "Type Descriptions"
+msgstr "词性说明"
 
-#. i18n: file ./query-dialogs/ArtQueryDlgForm.ui line 116
-#: rc.cpp:1131
+#. i18n: file ./docprop-dialogs/DocOptionsPageForm.ui line 33
+#: rc.cpp:1242
 #, no-c-format
-msgid "&neutral"
-msgstr "中性(&N)"
+msgid "Document Options"
+msgstr "文档选项"
 
-#. i18n: file ./query-dialogs/MCQueryDlgForm.ui line 32
-#: rc.cpp:1158
+#. i18n: file ./docprop-dialogs/DocOptionsPageForm.ui line 50
+#: rc.cpp:1245
 #, no-c-format
-msgid "Select the correct translation:"
-msgstr "选择正确的翻译："
-
-#. i18n: file ./query-dialogs/SimpleQueryDlgForm.ui line 278
-#: rc.cpp:1236
-#, fuzzy, no-c-format
-msgid "Do &Not Know"
-msgstr "不知道(&D)"
+msgid "Allo&w sorting"
+msgstr "允许排序(&W)"
 
 #: _translatorinfo.cpp:1
 msgid ""
diff --git a/tde-i18n-zh_CN/messages/tdeedu/kwordquiz.po b/tde-i18n-zh_CN/messages/tdeedu/kwordquiz.po
index c7e0ef1dfae..6f94b2ae553 100644
--- a/tde-i18n-zh_CN/messages/tdeedu/kwordquiz.po
+++ b/tde-i18n-zh_CN/messages/tdeedu/kwordquiz.po
@@ -4,50 +4,140 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kwordquiz\n"
-"POT-Creation-Date: 2008-07-08 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-12-23 20:55+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kwordquizdoc.cpp:110
-msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"当前文件已被修改。\n"
-"您想要保存吗？"
-
-#: kwordquizdoc.cpp:165
-msgid "<qt>Cannot open file<br><b>%1</b></qt>"
-msgstr "<qt>无法打开文件<br><b>%1</b></qt>"
-
-#: kwordquizdoc.cpp:335
-msgid "<qt>Cannot write to file<br><b>%1</b></qt>"
-msgstr "<qt>无法写入文件<br><b>%1</b></qt>"
-
-#: wqlreader.cpp:62
-msgid "This does not appear to be a (K)WordQuiz file"
-msgstr "此文件似乎不是 (K)WordQuiz 文件"
-
-#: wqlreader.cpp:71
-msgid "KWordQuiz can only open files created by WordQuiz 5.x"
-msgstr "KWordQuiz 只能打开由 WordQuiz 5.x 创建的文件"
-
 #: dlgrc.cpp:22
 msgid "Rows & Columns"
 msgstr "行列"
 
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "开源软件国际化之 TDE 简体中文组"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "i18n-translation@lists.linux.net.cn"
+
 #: flashview.cpp:89 multipleview.cpp:129 qaview.cpp:160
 msgid "Your answer was correct!"
 msgstr "您答对了！"
 
+#. i18n: file multipleviewbase.ui line 584
+#: multipleview.cpp:140 qaview.cpp:170 rc.cpp:360 rc.cpp:906
+#, no-c-format
+msgid "Correct Answer"
+msgstr "正确答案"
+
 #: flashview.cpp:97 multipleview.cpp:143 qaview.cpp:173
 msgid "Your answer was incorrect."
 msgstr "您答错了。"
 
+#. i18n: file multipleviewbase.ui line 847
+#: multipleview.cpp:146 qaview.cpp:176 rc.cpp:420 rc.cpp:861
+#, no-c-format
+msgid "Previous Question"
+msgstr "上个问题"
+
+#. i18n: file multipleviewbase.ui line 198
+#: multipleview.cpp:151 qaview.cpp:179 rc.cpp:282 rc.cpp:882
+#, no-c-format
+msgid "Your Answer"
+msgstr "您的答案"
+
+#: multipleview.cpp:165 qaview.cpp:192
+msgid "Summary"
+msgstr "概览"
+
+#: kwordquizview.cpp:68
+msgid "Column 1"
+msgstr "第一列"
+
+#: kwordquizview.cpp:69
+msgid "Column 2"
+msgstr "第二列"
+
+#: kwordquizview.cpp:214 kwordquizview.cpp:219
+#, c-format
+msgid "KWordQuiz - %1"
+msgstr "KWordQuiz - %1"
+
+#: kwordquizview.cpp:223
+msgid "Name:_____________________________ Date:__________"
+msgstr "姓名：_____________________________ 日期：__________"
+
+#. i18n: file prefquizbase.ui line 96
+#: kwordquizview.cpp:234 rc.cpp:741
+#, no-c-format
+msgid "Score"
+msgstr "得分"
+
+#: kwordquizview.cpp:304
+msgid "&Undo Entry"
+msgstr "撤消项(&U)"
+
+#: kwordquizview.cpp:315
+msgid "There is an error with the Fill-in-the-blank brackets"
+msgstr "填空的空有错误"
+
+#: kwordquiz.cpp:79 kwordquiz.cpp:652 kwordquizview.cpp:399
+msgid "Cannot &Undo"
+msgstr "无法撤消(&U)"
+
+#: kwordquizview.cpp:411
+msgid "&Undo Cut"
+msgstr "撤消剪切(&U)"
+
+#: kwordquizview.cpp:451
+msgid "&Undo Paste"
+msgstr "撤消粘贴(&U)"
+
+#: kwordquizview.cpp:539
+msgid "&Undo Clear"
+msgstr "撤消清除(&U)"
+
+#: kwordquizview.cpp:550
+msgid "&Undo Insert"
+msgstr "撤消插入(&U)"
+
+#: kwordquizview.cpp:564
+msgid "&Undo Delete"
+msgstr "撤消删除(&U)"
+
+#: kwordquizview.cpp:633
+msgid "&Undo Mark Blank"
+msgstr "撤消标为空(&U)"
+
+#: kwordquizview.cpp:679
+msgid "&Undo Unmark Blank"
+msgstr "撤消取消空(&U)"
+
+#: kwordquizview.cpp:778
+msgid "&Undo Sort"
+msgstr "撤消排序(&U)"
+
+#: kwordquizview.cpp:793
+msgid "&Undo Shuffle"
+msgstr "撤消打乱(&U)"
+
+#: wqlreader.cpp:62
+msgid "This does not appear to be a (K)WordQuiz file"
+msgstr "此文件似乎不是 (K)WordQuiz 文件"
+
+#: wqlreader.cpp:71
+msgid "KWordQuiz can only open files created by WordQuiz 5.x"
+msgstr "KWordQuiz 只能打开由 WordQuiz 5.x 创建的文件"
+
 #: dlglanguage.cpp:26
 msgid "Column Titles"
 msgstr "列标题"
@@ -94,93 +184,61 @@ msgstr "特殊字符"
 msgid "Special Characters"
 msgstr "特殊字符"
 
-#. i18n: file multipleviewbase.ui line 584
-#: multipleview.cpp:140 qaview.cpp:170 rc.cpp:360 rc.cpp:906
-#, no-c-format
-msgid "Correct Answer"
-msgstr "正确答案"
-
-#. i18n: file multipleviewbase.ui line 847
-#: multipleview.cpp:146 qaview.cpp:176 rc.cpp:420 rc.cpp:861
-#, no-c-format
-msgid "Previous Question"
-msgstr "上个问题"
-
-#. i18n: file multipleviewbase.ui line 198
-#: multipleview.cpp:151 qaview.cpp:179 rc.cpp:282 rc.cpp:882
-#, no-c-format
-msgid "Your Answer"
-msgstr "您的答案"
-
-#: multipleview.cpp:165 qaview.cpp:192
-msgid "Summary"
-msgstr "概览"
-
-#: _translatorinfo.cpp:1
+#: kwordquizdoc.cpp:110
 msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "开源软件国际化之 TDE 简体中文组"
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"当前文件已被修改。\n"
+"您想要保存吗？"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "i18n-translation@lists.linux.net.cn"
+#: kwordquizdoc.cpp:165
+msgid "<qt>Cannot open file<br><b>%1</b></qt>"
+msgstr "<qt>无法打开文件<br><b>%1</b></qt>"
 
-#: main.cpp:24
-msgid "A powerful flashcard and vocabulary learning program"
-msgstr "强大的答题卡和词汇表学习程序"
+#: kwordquizdoc.cpp:335
+msgid "<qt>Cannot write to file<br><b>%1</b></qt>"
+msgstr "<qt>无法写入文件<br><b>%1</b></qt>"
 
-#: main.cpp:29
-msgid ""
-"A number 1-5 corresponding to the \n"
-"entries in the Mode menu"
-msgstr ""
+#: dlgsort.cpp:24
+msgid "Sort"
+msgstr "排序"
 
-#: main.cpp:31
-msgid ""
-"Type of session to start with: \n"
-"'flash' for flashcard, \n"
-"'mc' for multiple choice, \n"
-"'qa' for question and answer"
-msgstr ""
+#: wqprintdialogpage.cpp:31
+msgid "Vocabulary Options"
+msgstr "词汇表选项"
 
-#: main.cpp:32
-msgid "File to open"
-msgstr "要打开的文件"
+#: wqprintdialogpage.cpp:35
+msgid "Select Type of Printout"
+msgstr "选择输出类型"
 
-#: main.cpp:39
-msgid "KWordQuiz"
-msgstr "KWordQuiz"
+#: wqprintdialogpage.cpp:42
+msgid "Vocabulary &list"
+msgstr "词汇表列表(&L)"
 
-#: main.cpp:49
-msgid "TDE Edutainment Maintainer"
-msgstr "TDE 娱教维护者"
+#: wqprintdialogpage.cpp:44
+msgid "Vocabulary e&xam"
+msgstr "词汇表测验(&X)"
 
-#: kwqnewstuff.cpp:81
-msgid "The file '%1' already exists. Do you want to overwrite it?"
-msgstr "文件“%1”已存在。您想要覆盖吗？"
+#: wqprintdialogpage.cpp:46
+msgid "&Flashcards"
+msgstr "答题卡(&F)"
 
-#: kwordquiz.cpp:613 kwqnewstuff.cpp:84
-msgid "Overwrite"
-msgstr "覆盖"
+#: wqprintdialogpage.cpp:50
+msgid "Specify type of printout to make"
+msgstr "指定要输出的类型"
 
-#: kwqnewstuff.cpp:84
-msgid "Do Not Overwrite"
-msgstr "不覆盖"
+#: wqprintdialogpage.cpp:51
+msgid "Select to print the vocabulary as displayed in the editor"
+msgstr "将编辑器中显示的词汇表打印输出"
 
-#: kwqnewstuff.cpp:89
-msgid ""
-"<qt>The selected file will now be downloaded and saved as\n"
-"<b>'%1'</b>.</qt>"
-msgstr ""
-"<qt>现在将下载选中的文件并保存为\n"
-"<b>“%1”</b>。</qt>"
+#: wqprintdialogpage.cpp:52
+msgid "Select to print the vocabulary as a vocabulary exam"
+msgstr "将词汇表打印为词汇表测验"
 
-#: dlgsort.cpp:24
-msgid "Sort"
-msgstr "排序"
+#: wqprintdialogpage.cpp:53
+msgid "Select to print flashcards"
+msgstr "打印答题卡"
 
 #. i18n: file kwordquizui.rc line 16
 #: rc.cpp:3
@@ -1101,12 +1159,6 @@ msgid ""
 "errors"
 msgstr "如果想要使用过提示功能的问题计为错误，请选择此项"
 
-#. i18n: file prefquizbase.ui line 96
-#: kwordquizview.cpp:234 rc.cpp:741
-#, no-c-format
-msgid "Score"
-msgstr "得分"
-
 #. i18n: file prefquizbase.ui line 99
 #: rc.cpp:744
 #, no-c-format
@@ -1397,9 +1449,51 @@ msgid ""
 "$HOME)"
 msgstr "下载的词汇表默认所保存的文件夹(相对于 $HOME)"
 
-#: kwordquiz.cpp:79 kwordquiz.cpp:652 kwordquizview.cpp:399
-msgid "Cannot &Undo"
-msgstr "无法撤消(&U)"
+#: kwqnewstuff.cpp:81
+msgid "The file '%1' already exists. Do you want to overwrite it?"
+msgstr "文件“%1”已存在。您想要覆盖吗？"
+
+#: kwordquiz.cpp:613 kwqnewstuff.cpp:84
+msgid "Overwrite"
+msgstr "覆盖"
+
+#: kwqnewstuff.cpp:84
+msgid "Do Not Overwrite"
+msgstr "不覆盖"
+
+#: kwqnewstuff.cpp:89
+msgid ""
+"<qt>The selected file will now be downloaded and saved as\n"
+"<b>'%1'</b>.</qt>"
+msgstr ""
+"<qt>现在将下载选中的文件并保存为\n"
+"<b>“%1”</b>。</qt>"
+
+#: dlgspecchar.cpp:26
+msgid "Select Character"
+msgstr "选择字符"
+
+#: dlgspecchar.cpp:30
+msgid "&Select"
+msgstr "选择(&S)"
+
+#: dlgspecchar.cpp:31
+msgid "Select this character"
+msgstr "选择此字符"
+
+#: prefcardappearance.cpp:68
+msgid ""
+"_: Back of the flashcard\n"
+"Back"
+msgstr "背面"
+
+#: prefcardappearance.cpp:70
+msgid "Answer"
+msgstr "答案"
+
+#: prefcardappearance.cpp:83
+msgid "Question"
+msgstr "问题"
 
 #: kwordquiz.cpp:109
 msgid "Creates a new blank vocabulary document"
@@ -1664,9 +1758,10 @@ msgid "&Join selected files into one list"
 msgstr "将选中的文件加入列表(&J)"
 
 #: kwordquiz.cpp:499
+#, fuzzy
 msgid ""
 "*.kvtml *.wql *.xml.gz *.csv|All Supported Documents\n"
-"*.kvtml|TDE Vocabulary Document\n"
+"*.kvtml|KDE Vocabulary Document\n"
 "*.wql|KWordQuiz Document\n"
 "*.xml.gz|Pauker Lesson\n"
 "*.csv|Comma-Separated Values"
@@ -1690,8 +1785,9 @@ msgid "Saving file with a new filename..."
 msgstr "以新文件名保存文件..."
 
 #: kwordquiz.cpp:587
+#, fuzzy
 msgid ""
-"*.kvtml|TDE Vocabulary Document\n"
+"*.kvtml|KDE Vocabulary Document\n"
 "*.wql|KWordQuiz Document\n"
 "*.csv|Comma-Separated Values\n"
 "*.html|Hypertext Markup Language"
@@ -1858,128 +1954,36 @@ msgstr "%1 -> %2 随机"
 msgid "%1 <-> %2 Randomly"
 msgstr "%1 <-> %2 随机"
 
-#: kwordquizview.cpp:68
-msgid "Column 1"
-msgstr "第一列"
-
-#: kwordquizview.cpp:69
-msgid "Column 2"
-msgstr "第二列"
-
-#: kwordquizview.cpp:214 kwordquizview.cpp:219
-#, c-format
-msgid "KWordQuiz - %1"
-msgstr "KWordQuiz - %1"
-
-#: kwordquizview.cpp:223
-msgid "Name:_____________________________ Date:__________"
-msgstr "姓名：_____________________________ 日期：__________"
-
-#: kwordquizview.cpp:304
-msgid "&Undo Entry"
-msgstr "撤消项(&U)"
-
-#: kwordquizview.cpp:315
-msgid "There is an error with the Fill-in-the-blank brackets"
-msgstr "填空的空有错误"
-
-#: kwordquizview.cpp:411
-msgid "&Undo Cut"
-msgstr "撤消剪切(&U)"
-
-#: kwordquizview.cpp:451
-msgid "&Undo Paste"
-msgstr "撤消粘贴(&U)"
-
-#: kwordquizview.cpp:539
-msgid "&Undo Clear"
-msgstr "撤消清除(&U)"
-
-#: kwordquizview.cpp:550
-msgid "&Undo Insert"
-msgstr "撤消插入(&U)"
-
-#: kwordquizview.cpp:564
-msgid "&Undo Delete"
-msgstr "撤消删除(&U)"
-
-#: kwordquizview.cpp:633
-msgid "&Undo Mark Blank"
-msgstr "撤消标为空(&U)"
-
-#: kwordquizview.cpp:679
-msgid "&Undo Unmark Blank"
-msgstr "撤消取消空(&U)"
-
-#: kwordquizview.cpp:778
-msgid "&Undo Sort"
-msgstr "撤消排序(&U)"
-
-#: kwordquizview.cpp:793
-msgid "&Undo Shuffle"
-msgstr "撤消打乱(&U)"
-
-#: wqprintdialogpage.cpp:31
-msgid "Vocabulary Options"
-msgstr "词汇表选项"
-
-#: wqprintdialogpage.cpp:35
-msgid "Select Type of Printout"
-msgstr "选择输出类型"
-
-#: wqprintdialogpage.cpp:42
-msgid "Vocabulary &list"
-msgstr "词汇表列表(&L)"
-
-#: wqprintdialogpage.cpp:44
-msgid "Vocabulary e&xam"
-msgstr "词汇表测验(&X)"
-
-#: wqprintdialogpage.cpp:46
-msgid "&Flashcards"
-msgstr "答题卡(&F)"
-
-#: wqprintdialogpage.cpp:50
-msgid "Specify type of printout to make"
-msgstr "指定要输出的类型"
-
-#: wqprintdialogpage.cpp:51
-msgid "Select to print the vocabulary as displayed in the editor"
-msgstr "将编辑器中显示的词汇表打印输出"
-
-#: wqprintdialogpage.cpp:52
-msgid "Select to print the vocabulary as a vocabulary exam"
-msgstr "将词汇表打印为词汇表测验"
-
-#: wqprintdialogpage.cpp:53
-msgid "Select to print flashcards"
-msgstr "打印答题卡"
+#: main.cpp:24
+msgid "A powerful flashcard and vocabulary learning program"
+msgstr "强大的答题卡和词汇表学习程序"
 
-#: prefcardappearance.cpp:68
+#: main.cpp:29
 msgid ""
-"_: Back of the flashcard\n"
-"Back"
-msgstr "背面"
-
-#: prefcardappearance.cpp:70
-msgid "Answer"
-msgstr "答案"
+"A number 1-5 corresponding to the \n"
+"entries in the Mode menu"
+msgstr ""
 
-#: prefcardappearance.cpp:83
-msgid "Question"
-msgstr "问题"
+#: main.cpp:31
+msgid ""
+"Type of session to start with: \n"
+"'flash' for flashcard, \n"
+"'mc' for multiple choice, \n"
+"'qa' for question and answer"
+msgstr ""
 
-#: dlgspecchar.cpp:26
-msgid "Select Character"
-msgstr "选择字符"
+#: main.cpp:32
+msgid "File to open"
+msgstr "要打开的文件"
 
-#: dlgspecchar.cpp:30
-msgid "&Select"
-msgstr "选择(&S)"
+#: main.cpp:39
+msgid "KWordQuiz"
+msgstr "KWordQuiz"
 
-#: dlgspecchar.cpp:31
-msgid "Select this character"
-msgstr "选择此字符"
+#: main.cpp:49
+#, fuzzy
+msgid "KDE Edutainment Maintainer"
+msgstr "TDE 娱教维护者"
 
 #~ msgid "Alt+F"
 #~ msgstr "Alt+F"
diff --git a/tde-i18n-zh_CN/messages/tdegames/atlantik.po b/tde-i18n-zh_CN/messages/tdegames/atlantik.po
index 3d974d488dd..4b03808b957 100644
--- a/tde-i18n-zh_CN/messages/tdegames/atlantik.po
+++ b/tde-i18n-zh_CN/messages/tdegames/atlantik.po
@@ -6,216 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: atlantik\n"
-"POT-Creation-Date: 2005-07-24 01:33+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-07-04 13:45+0800\n"
 "Last-Translator: Lee Jauwah <jauwah@yahoo.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: libatlantikclient/atlantik_network.cpp:909
-msgid "Connecting to %1:%2..."
-msgstr "正在连接到 %1:%2..."
-
-#: libatlantikclient/atlantik_network.cpp:915
-msgid "Server host name lookup finished..."
-msgstr "服务器主机名查找已完成..."
-
-#: libatlantikclient/atlantik_network.cpp:920
-msgid "Connected to %1:%2."
-msgstr "已连接到 %1:%2。"
-
-#: libatlantikclient/atlantik_network.cpp:925
-#, c-format
-msgid "Connection failed! Error code: %1"
-msgstr "连接失败！错误代码：%1"
-
-#: libatlantikui/trade_widget.cpp:55
-#, c-format
-msgid "Trade %1"
-msgstr "交易 %1"
-
-#: libatlantikui/trade_widget.cpp:59
-msgid "Add Component"
-msgstr "添加组件"
-
-#: libatlantikui/trade_widget.cpp:63
-msgid "Estate"
-msgstr "地产"
-
-#: libatlantikui/trade_widget.cpp:64
-msgid "Money"
-msgstr "钱"
-
-#: libatlantikui/trade_widget.cpp:89
-msgid "From"
-msgstr "从"
-
-#: libatlantikui/trade_widget.cpp:93
-msgid "To"
-msgstr "至"
-
-#: libatlantikui/trade_widget.cpp:112
-msgid "Update"
-msgstr "更新"
-
-#: libatlantikui/auction_widget.cpp:54 libatlantikui/trade_widget.cpp:120
-#: libatlantikui/trade_widget.cpp:122
-msgid "Player"
-msgstr "玩家"
-
-#: libatlantikui/trade_widget.cpp:121
-msgid "Gives"
-msgstr "给"
-
-#: libatlantikui/trade_widget.cpp:123
-msgid "Item"
-msgstr "项目"
-
-#: libatlantikui/trade_widget.cpp:133
-msgid "Reject"
-msgstr "拒绝"
-
-#: libatlantikui/trade_widget.cpp:138
-msgid "Accept"
-msgstr "接受"
-
-#: libatlantikui/trade_widget.cpp:146 libatlantikui/trade_widget.cpp:219
-msgid "%1 out of %2 players accept current trade proposal."
-msgstr "%2 玩家中的 %1 个接受当前的交易提议。"
-
-#: libatlantikui/trade_widget.cpp:180
-msgid ""
-"_: gives is transitive ;)\n"
-"gives"
-msgstr "礼物"
-
-#: libatlantikui/trade_widget.cpp:235
-#, c-format
-msgid "Trade proposal was rejected by %1."
-msgstr "交易提议被 %1 拒绝。"
-
-#: libatlantikui/trade_widget.cpp:237
-msgid "Trade proposal was rejected."
-msgstr "交易提议被拒绝。"
-
-#: libatlantikui/trade_widget.cpp:357
-msgid "Remove From Trade"
-msgstr "从交易中移除"
-
-#: libatlantikui/estateview.cpp:480 libatlantikui/portfolioview.cpp:263
-#, c-format
-msgid "Request Trade with %1"
-msgstr "请求与 %1 交易"
-
-#: libatlantikui/portfolioview.cpp:268
-msgid "Boot Player %1 to Lounge"
-msgstr ""
-
-#: libatlantikui/auction_widget.cpp:50
-#, c-format
-msgid "Auction: %1"
-msgstr "拍卖：%1"
-
-#: libatlantikui/auction_widget.cpp:50
-msgid "Auction"
-msgstr "拍卖"
-
-#: libatlantikui/auction_widget.cpp:55
-msgid "Bid"
-msgstr "叫价"
-
-#: libatlantikui/auction_widget.cpp:80
-msgid "Make Bid"
-msgstr "竞价"
-
-#: libatlantikui/auction_widget.cpp:94
-msgid "Going once..."
-msgstr "第一次..."
-
-#: libatlantikui/auction_widget.cpp:98
-msgid "Going twice..."
-msgstr "第二次..."
-
-#: libatlantikui/auction_widget.cpp:102
-msgid "Sold!"
-msgstr "成交！"
-
-#: libatlantikui/estatedetails.cpp:220 libatlantikui/estateview.cpp:86
-#, c-format
-msgid "Price: %1"
-msgstr "价格：%1"
-
-#: libatlantikui/estatedetails.cpp:227 libatlantikui/estateview.cpp:75
-#, c-format
-msgid "Owner: %1"
-msgstr "屋主：%1"
-
-#: libatlantikui/estatedetails.cpp:227
-msgid "unowned"
-msgstr "无主"
-
-#: libatlantikui/estatedetails.cpp:232
-#, c-format
-msgid "Houses: %1"
-msgstr "房屋：%1"
-
-#: libatlantikui/estatedetails.cpp:235
-#, c-format
-msgid "Mortgaged: %1"
-msgstr "已抵押：%1"
-
-#: libatlantikui/estateview.cpp:77
-#, fuzzy, c-format
-msgid "Unmortgage Price: %1"
-msgstr "价格：%1"
-
-#: libatlantikui/estateview.cpp:79
-#, fuzzy, c-format
-msgid "Mortgage Value: %1"
-msgstr "已抵押：%1"
-
-#: libatlantikui/estateview.cpp:81
-#, fuzzy, c-format
-msgid "House Value: %1"
-msgstr "房屋：%1"
-
-#: libatlantikui/estateview.cpp:83
-#, fuzzy, c-format
-msgid "House Price: %1"
-msgstr "价格：%1"
-
-#: libatlantikui/estateview.cpp:88
-#, c-format
-msgid "Money: %1"
-msgstr "钱：%1"
-
-#: libatlantikui/estateview.cpp:447
-msgid "Unmortgage"
-msgstr "未抵押"
-
-#: libatlantikui/estateview.cpp:453
-msgid "Mortgage"
-msgstr "抵押"
-
-#: libatlantikui/estateview.cpp:460
-msgid "Build Hotel"
-msgstr "建酒店"
-
-#: libatlantikui/estateview.cpp:462
-msgid "Build House"
-msgstr "建房屋"
-
-#: libatlantikui/estateview.cpp:469
-msgid "Sell Hotel"
-msgstr "卖酒店"
-
-#: libatlantikui/estateview.cpp:471
-msgid "Sell House"
-msgstr "卖房屋"
-
 #: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -228,177 +28,22 @@ msgid ""
 "Your emails"
 msgstr ""
 
-#: client/atlantik.cpp:106
-msgid "Show Event &Log"
-msgstr "显示事件日志(&L)"
-
-#: client/atlantik.cpp:135
-msgid "&Buy"
-msgstr "购买(&B)"
-
-#: client/atlantik.cpp:137
-msgid "&Auction"
-msgstr "拍卖(&A)"
-
-#: client/atlantik.cpp:141
-msgid "Use Card to Leave Jail"
-msgstr "使用卡片脱离监狱"
-
-#: client/atlantik.cpp:143
-msgid "&Pay to Leave Jail"
-msgstr "付钱脱离监狱(&P)"
-
-#: client/atlantik.cpp:145
-msgid "Roll to Leave &Jail"
-msgstr "掷骰子脱离监狱(&J)"
-
-#: client/atlantik.cpp:448
-msgid "Error connecting: "
-msgstr "连接错误："
-
-#: client/atlantik.cpp:454
-msgid "connection refused by host."
-msgstr "连接被主机拒绝。"
-
-#: client/atlantik.cpp:456
-msgid "could not connect to host."
-msgstr "无法连接主机。"
-
-#: client/atlantik.cpp:460
-msgid "host not found."
-msgstr "找不到主机。"
-
-#: client/atlantik.cpp:464
-msgid "unknown error."
-msgstr "未知错误。"
-
-#: client/atlantik.cpp:478
-msgid "Connection with server %1:%2 lost."
-msgstr "连接到服务器 %1:%2 主机。"
-
-#: client/atlantik.cpp:483
-msgid "Disconnected from %1:%2."
-msgstr "已从 %1:%2 断开连接。"
-
-#: client/atlantik.cpp:714
-msgid "It is your turn now."
-msgstr ""
-
-#: client/atlantik.cpp:843
-msgid ""
-"You are currently part of an active game. Are you sure you want to close "
-"Atlantik? If you do, you forfeit the game."
-msgstr "您目前正在玩一局游戏。您真的想要关闭 Atlantik 吗？如果您退出的话，您将会放弃这局游戏。"
-
-#: client/atlantik.cpp:843
-msgid "Close & Forfeit?"
-msgstr "关闭并弃权吗？"
-
-#: client/atlantik.cpp:843
-#, fuzzy
-msgid "Close && Forfeit"
-msgstr "关闭并弃权吗？"
-
-#: client/selectconfiguration_widget.cpp:45
-msgid "Game Configuration"
-msgstr "游戏配置"
-
-#: client/selectconfiguration_widget.cpp:61
-msgid "Leave Game"
-msgstr "离开游戏"
-
-#: client/selectconfiguration_widget.cpp:68
-msgid "Start Game"
-msgstr "开始游戏"
-
-#: client/selectconfiguration_widget.cpp:78
-msgid "Retrieving configuration list..."
-msgstr "正在获取配置列表..."
-
-#: client/selectconfiguration_widget.cpp:83
-msgid "Game started. Retrieving full game data..."
-msgstr "游戏已开始。正在获取完整的游戏数据..."
-
-#: client/selectconfiguration_widget.cpp:162
-msgid "Retrieved configuration list."
-msgstr "已获取配置列表。"
-
-#: client/main.cpp:29
-msgid "Connect to this host"
-msgstr "连接该主机"
-
-#: client/main.cpp:31
-msgid "Connect at this port"
-msgstr "连接该端口"
-
-#: client/main.cpp:33
-msgid "Join this game"
-msgstr "加入该游戏"
-
-#: client/main.cpp:41
-msgid "Atlantik"
-msgstr "Atlantik"
-
-#: client/main.cpp:42
-msgid "The Atlantic board game"
-msgstr "Atlantic 棋盘游戏"
-
-#: client/main.cpp:44
-msgid "(c) 1998-2004 Rob Kaper"
-msgstr "(C) 1998-2004 Rob Kaper"
-
-#: client/main.cpp:45
-msgid "TDE client for playing Monopoly-like games on the monopd network."
-msgstr "让 TDE 客户端在 monopd 网络上玩大富翁般的游戏。"
-
-#: client/main.cpp:49
-msgid "main author"
-msgstr "主要作者"
-
-#: client/main.cpp:52
-msgid "KExtendedSocket support"
-msgstr "KExtendedSocket 支持"
-
-#: client/main.cpp:53
-msgid "various patches"
-msgstr "各种补丁"
-
-#: client/main.cpp:55
-msgid "application icon"
-msgstr "应用程序图标"
-
-#: client/main.cpp:56
-msgid "token icons"
-msgstr "钱币图标"
-
-#: client/main.cpp:57 client/main.cpp:58
-msgid "icons"
-msgstr "图标"
-
-#: client/main.cpp:73
-msgid "The Atlantic Board Game"
-msgstr "Atlantic 棋类游戏"
-
-#: client/eventlogwidget.cpp:59
-msgid "Event Log"
-msgstr "事件日志"
-
-#: client/eventlogwidget.cpp:66
-msgid "Date/Time"
-msgstr "日期/时间"
+#: libatlantikclient/atlantik_network.cpp:909
+msgid "Connecting to %1:%2..."
+msgstr "正在连接到 %1:%2..."
 
-#: client/eventlogwidget.cpp:67 client/selectgame_widget.cpp:49
-msgid "Description"
-msgstr "描述"
+#: libatlantikclient/atlantik_network.cpp:915
+msgid "Server host name lookup finished..."
+msgstr "服务器主机名查找已完成..."
 
-#: client/eventlogwidget.cpp:75
-msgid "&Save As..."
-msgstr "另存为(&S)..."
+#: libatlantikclient/atlantik_network.cpp:920
+msgid "Connected to %1:%2."
+msgstr "已连接到 %1:%2。"
 
-#: client/eventlogwidget.cpp:116
+#: libatlantikclient/atlantik_network.cpp:925
 #, c-format
-msgid "Atlantik log file, saved at %1."
-msgstr "Atlantik 日志文件，已在 %1 保存。"
+msgid "Connection failed! Error code: %1"
+msgstr "连接失败！错误代码：%1"
 
 #: client/configdlg.cpp:43
 msgid "Configure Atlantik"
@@ -588,6 +233,122 @@ msgstr "已下载服务器列表。"
 msgid "Error while retrieving the server list."
 msgstr "获取服务器列表出错。"
 
+#: client/eventlogwidget.cpp:59
+msgid "Event Log"
+msgstr "事件日志"
+
+#: client/eventlogwidget.cpp:66
+msgid "Date/Time"
+msgstr "日期/时间"
+
+#: client/eventlogwidget.cpp:67 client/selectgame_widget.cpp:49
+msgid "Description"
+msgstr "描述"
+
+#: client/eventlogwidget.cpp:75
+msgid "&Save As..."
+msgstr "另存为(&S)..."
+
+#: client/eventlogwidget.cpp:116
+#, c-format
+msgid "Atlantik log file, saved at %1."
+msgstr "Atlantik 日志文件，已在 %1 保存。"
+
+#: client/selectconfiguration_widget.cpp:45
+msgid "Game Configuration"
+msgstr "游戏配置"
+
+#: client/selectconfiguration_widget.cpp:61
+msgid "Leave Game"
+msgstr "离开游戏"
+
+#: client/selectconfiguration_widget.cpp:68
+msgid "Start Game"
+msgstr "开始游戏"
+
+#: client/selectconfiguration_widget.cpp:78
+msgid "Retrieving configuration list..."
+msgstr "正在获取配置列表..."
+
+#: client/selectconfiguration_widget.cpp:83
+msgid "Game started. Retrieving full game data..."
+msgstr "游戏已开始。正在获取完整的游戏数据..."
+
+#: client/selectconfiguration_widget.cpp:162
+msgid "Retrieved configuration list."
+msgstr "已获取配置列表。"
+
+#: client/atlantik.cpp:106
+msgid "Show Event &Log"
+msgstr "显示事件日志(&L)"
+
+#: client/atlantik.cpp:135
+msgid "&Buy"
+msgstr "购买(&B)"
+
+#: client/atlantik.cpp:137
+msgid "&Auction"
+msgstr "拍卖(&A)"
+
+#: client/atlantik.cpp:141
+msgid "Use Card to Leave Jail"
+msgstr "使用卡片脱离监狱"
+
+#: client/atlantik.cpp:143
+msgid "&Pay to Leave Jail"
+msgstr "付钱脱离监狱(&P)"
+
+#: client/atlantik.cpp:145
+msgid "Roll to Leave &Jail"
+msgstr "掷骰子脱离监狱(&J)"
+
+#: client/atlantik.cpp:448
+msgid "Error connecting: "
+msgstr "连接错误："
+
+#: client/atlantik.cpp:454
+msgid "connection refused by host."
+msgstr "连接被主机拒绝。"
+
+#: client/atlantik.cpp:456
+msgid "could not connect to host."
+msgstr "无法连接主机。"
+
+#: client/atlantik.cpp:460
+msgid "host not found."
+msgstr "找不到主机。"
+
+#: client/atlantik.cpp:464
+msgid "unknown error."
+msgstr "未知错误。"
+
+#: client/atlantik.cpp:478
+msgid "Connection with server %1:%2 lost."
+msgstr "连接到服务器 %1:%2 主机。"
+
+#: client/atlantik.cpp:483
+msgid "Disconnected from %1:%2."
+msgstr "已从 %1:%2 断开连接。"
+
+#: client/atlantik.cpp:714
+msgid "It is your turn now."
+msgstr ""
+
+#: client/atlantik.cpp:843
+msgid ""
+"You are currently part of an active game. Are you sure you want to close "
+"Atlantik? If you do, you forfeit the game."
+msgstr "您目前正在玩一局游戏。您真的想要关闭 Atlantik 吗？如果您退出的话，您将会放弃这局游戏。"
+
+#: client/atlantik.cpp:843
+msgid "Close & Forfeit?"
+msgstr "关闭并弃权吗？"
+
+#: client/atlantik.cpp:843
+#, fuzzy
+msgid "Close && Forfeit"
+msgstr "关闭并弃权吗？"
+
 #: client/selectgame_widget.cpp:43
 msgid "Create or Select monopd Game"
 msgstr "创建或选择一个 monopd 游戏"
@@ -625,6 +386,246 @@ msgstr "加入 %1 的 %2 游戏"
 msgid "Join Game"
 msgstr "加入游戏"
 
+#: client/main.cpp:29
+msgid "Connect to this host"
+msgstr "连接该主机"
+
+#: client/main.cpp:31
+msgid "Connect at this port"
+msgstr "连接该端口"
+
+#: client/main.cpp:33
+msgid "Join this game"
+msgstr "加入该游戏"
+
+#: client/main.cpp:41
+msgid "Atlantik"
+msgstr "Atlantik"
+
+#: client/main.cpp:42
+msgid "The Atlantic board game"
+msgstr "Atlantic 棋盘游戏"
+
+#: client/main.cpp:44
+msgid "(c) 1998-2004 Rob Kaper"
+msgstr "(C) 1998-2004 Rob Kaper"
+
+#: client/main.cpp:45
+msgid "TDE client for playing Monopoly-like games on the monopd network."
+msgstr "让 TDE 客户端在 monopd 网络上玩大富翁般的游戏。"
+
+#: client/main.cpp:49
+msgid "main author"
+msgstr "主要作者"
+
+#: client/main.cpp:52
+msgid "KExtendedSocket support"
+msgstr "KExtendedSocket 支持"
+
+#: client/main.cpp:53
+msgid "various patches"
+msgstr "各种补丁"
+
+#: client/main.cpp:55
+msgid "application icon"
+msgstr "应用程序图标"
+
+#: client/main.cpp:56
+msgid "token icons"
+msgstr "钱币图标"
+
+#: client/main.cpp:57 client/main.cpp:58
+msgid "icons"
+msgstr "图标"
+
+#: client/main.cpp:73
+msgid "The Atlantic Board Game"
+msgstr "Atlantic 棋类游戏"
+
+#: libatlantikui/trade_widget.cpp:55
+#, c-format
+msgid "Trade %1"
+msgstr "交易 %1"
+
+#: libatlantikui/trade_widget.cpp:59
+msgid "Add Component"
+msgstr "添加组件"
+
+#: libatlantikui/trade_widget.cpp:63
+msgid "Estate"
+msgstr "地产"
+
+#: libatlantikui/trade_widget.cpp:64
+msgid "Money"
+msgstr "钱"
+
+#: libatlantikui/trade_widget.cpp:89
+msgid "From"
+msgstr "从"
+
+#: libatlantikui/trade_widget.cpp:93
+msgid "To"
+msgstr "至"
+
+#: libatlantikui/trade_widget.cpp:112
+msgid "Update"
+msgstr "更新"
+
+#: libatlantikui/auction_widget.cpp:54 libatlantikui/trade_widget.cpp:120
+#: libatlantikui/trade_widget.cpp:122
+msgid "Player"
+msgstr "玩家"
+
+#: libatlantikui/trade_widget.cpp:121
+msgid "Gives"
+msgstr "给"
+
+#: libatlantikui/trade_widget.cpp:123
+msgid "Item"
+msgstr "项目"
+
+#: libatlantikui/trade_widget.cpp:133
+msgid "Reject"
+msgstr "拒绝"
+
+#: libatlantikui/trade_widget.cpp:138
+msgid "Accept"
+msgstr "接受"
+
+#: libatlantikui/trade_widget.cpp:146 libatlantikui/trade_widget.cpp:219
+msgid "%1 out of %2 players accept current trade proposal."
+msgstr "%2 玩家中的 %1 个接受当前的交易提议。"
+
+#: libatlantikui/trade_widget.cpp:180
+msgid ""
+"_: gives is transitive ;)\n"
+"gives"
+msgstr "礼物"
+
+#: libatlantikui/trade_widget.cpp:235
+#, c-format
+msgid "Trade proposal was rejected by %1."
+msgstr "交易提议被 %1 拒绝。"
+
+#: libatlantikui/trade_widget.cpp:237
+msgid "Trade proposal was rejected."
+msgstr "交易提议被拒绝。"
+
+#: libatlantikui/trade_widget.cpp:357
+msgid "Remove From Trade"
+msgstr "从交易中移除"
+
+#: libatlantikui/estatedetails.cpp:227 libatlantikui/estateview.cpp:75
+#, c-format
+msgid "Owner: %1"
+msgstr "屋主：%1"
+
+#: libatlantikui/estateview.cpp:77
+#, fuzzy, c-format
+msgid "Unmortgage Price: %1"
+msgstr "价格：%1"
+
+#: libatlantikui/estateview.cpp:79
+#, fuzzy, c-format
+msgid "Mortgage Value: %1"
+msgstr "已抵押：%1"
+
+#: libatlantikui/estateview.cpp:81
+#, fuzzy, c-format
+msgid "House Value: %1"
+msgstr "房屋：%1"
+
+#: libatlantikui/estateview.cpp:83
+#, fuzzy, c-format
+msgid "House Price: %1"
+msgstr "价格：%1"
+
+#: libatlantikui/estatedetails.cpp:220 libatlantikui/estateview.cpp:86
+#, c-format
+msgid "Price: %1"
+msgstr "价格：%1"
+
+#: libatlantikui/estateview.cpp:88
+#, c-format
+msgid "Money: %1"
+msgstr "钱：%1"
+
+#: libatlantikui/estateview.cpp:447
+msgid "Unmortgage"
+msgstr "未抵押"
+
+#: libatlantikui/estateview.cpp:453
+msgid "Mortgage"
+msgstr "抵押"
+
+#: libatlantikui/estateview.cpp:460
+msgid "Build Hotel"
+msgstr "建酒店"
+
+#: libatlantikui/estateview.cpp:462
+msgid "Build House"
+msgstr "建房屋"
+
+#: libatlantikui/estateview.cpp:469
+msgid "Sell Hotel"
+msgstr "卖酒店"
+
+#: libatlantikui/estateview.cpp:471
+msgid "Sell House"
+msgstr "卖房屋"
+
+#: libatlantikui/estateview.cpp:480 libatlantikui/portfolioview.cpp:263
+#, c-format
+msgid "Request Trade with %1"
+msgstr "请求与 %1 交易"
+
+#: libatlantikui/portfolioview.cpp:268
+msgid "Boot Player %1 to Lounge"
+msgstr ""
+
+#: libatlantikui/auction_widget.cpp:50
+#, c-format
+msgid "Auction: %1"
+msgstr "拍卖：%1"
+
+#: libatlantikui/auction_widget.cpp:50
+msgid "Auction"
+msgstr "拍卖"
+
+#: libatlantikui/auction_widget.cpp:55
+msgid "Bid"
+msgstr "叫价"
+
+#: libatlantikui/auction_widget.cpp:80
+msgid "Make Bid"
+msgstr "竞价"
+
+#: libatlantikui/auction_widget.cpp:94
+msgid "Going once..."
+msgstr "第一次..."
+
+#: libatlantikui/auction_widget.cpp:98
+msgid "Going twice..."
+msgstr "第二次..."
+
+#: libatlantikui/auction_widget.cpp:102
+msgid "Sold!"
+msgstr "成交！"
+
+#: libatlantikui/estatedetails.cpp:227
+msgid "unowned"
+msgstr "无主"
+
+#: libatlantikui/estatedetails.cpp:232
+#, c-format
+msgid "Houses: %1"
+msgstr "房屋：%1"
+
+#: libatlantikui/estatedetails.cpp:235
+#, c-format
+msgid "Mortgaged: %1"
+msgstr "已抵押：%1"
+
 #. i18n: file atlantikui.rc line 7
 #: rc.cpp:6
 #, no-c-format
diff --git a/tde-i18n-zh_CN/messages/tdegames/kasteroids.po b/tde-i18n-zh_CN/messages/tdegames/kasteroids.po
index 17ec3072a8f..b1f6c62273e 100644
--- a/tde-i18n-zh_CN/messages/tdegames/kasteroids.po
+++ b/tde-i18n-zh_CN/messages/tdegames/kasteroids.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-02-13 14:31+0800\n"
 "Last-Translator: zhang yue <zhangyue911@hotmail.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegames/katomic.po b/tde-i18n-zh_CN/messages/tdegames/katomic.po
index 91ef832db3f..8fcb80c3a8d 100644
--- a/tde-i18n-zh_CN/messages/tdegames/katomic.po
+++ b/tde-i18n-zh_CN/messages/tdegames/katomic.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katomic\n"
-"POT-Creation-Date: 2008-06-25 01:36+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-08-01 16:59+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -39,20 +40,20 @@ msgstr "你用了 %2 步就解决了级别 %1!"
 msgid "Congratulations"
 msgstr "恭喜"
 
-#: gamewidget.cpp:101 gamewidget.cpp:225
+#: gamewidget.cpp:101 gamewidget.cpp:248
 #, fuzzy
 msgid "Level %1 Highscores"
 msgstr "级别 %1 高分"
 
-#: gamewidget.cpp:183
+#: gamewidget.cpp:206
 msgid "Score"
 msgstr "得分"
 
-#: gamewidget.cpp:188
+#: gamewidget.cpp:211
 msgid "Highscore:"
 msgstr ""
 
-#: gamewidget.cpp:200
+#: gamewidget.cpp:223
 msgid "Your score so far:"
 msgstr "你到目前为止的分数："
 
diff --git a/tde-i18n-zh_CN/messages/tdegames/kbackgammon.po b/tde-i18n-zh_CN/messages/tdegames/kbackgammon.po
index 049b0076bc1..f362b70f043 100644
--- a/tde-i18n-zh_CN/messages/tdegames/kbackgammon.po
+++ b/tde-i18n-zh_CN/messages/tdegames/kbackgammon.po
@@ -5,163 +5,27 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kbackgammon\n"
-"POT-Creation-Date: 2007-03-09 02:17+0100\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-01-17 07:21+0800\n"
 "Last-Translator: Zong Yaotang <zong@cosix.com.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: kbg.cpp:78
-msgid "Open Board"
-msgstr "打开棋盘"
-
-#: kbg.cpp:79
-msgid "FIBS"
-msgstr "FIBS"
-
-#: kbg.cpp:80
-msgid "GNU Backgammon (Experimental)"
-msgstr "GNU 西洋双陆棋(试验性)"
-
-#: kbg.cpp:81
-msgid "Next Generation (Experimental)"
-msgstr "下一代(试验性)"
-
-#: kbg.cpp:83
-msgid "FIBS Home"
-msgstr "FIBS 主页"
-
-#: kbg.cpp:86
-msgid "Backgammon Rules"
-msgstr "西洋双陆棋规则"
-
-#: kbg.cpp:108
-msgid "&Engine"
-msgstr "引擎(&E)"
-
-#: kbg.cpp:124
-msgid "Double Cube"
-msgstr "加倍立方体"
-
-#: kbg.cpp:133
-msgid "&Backgammon on the Web"
-msgstr "Web 上的西洋双陆棋(&B)"
-
-#: kbg.cpp:145
-msgid "Command: "
-msgstr "命令："
-
-#: kbg.cpp:182
-msgid ""
-"This area contains the status messages for the game. Most of these messages are "
-"sent to you from the current engine."
-msgstr "这个区域显示游戏的状态信息，多数都是从当前引擎发送给您的。"
-
-#: kbg.cpp:186
-msgid ""
-"This is the command line. You can type special commands related to the current "
-"engine in here. Most relevant commands are also available through the menus."
-msgstr "这是命令行。您可以在此输入和当前引擎有关的特殊命令。大多数命令也可以用菜单直接使用。"
-
-#: kbg.cpp:191
-msgid ""
-"This is the button bar tool bar. It gives you easy access to game related "
-"commands. You can drag the bar to a different location within the window."
-msgstr "这是工具按钮栏。它让您轻松使用游戏中的命令。您可以把工具栏拖动到窗口内的不同位置。"
-
-#: kbg.cpp:196
-msgid ""
-"This is the status bar. It shows you the currently selected engine in the left "
-"corner."
-msgstr "这是状态栏。它在左边角落显示当前选中的引擎。"
-
-#: kbg.cpp:509
-msgid "General"
-msgstr "常规"
-
-#: kbg.cpp:509
-#, c-format
-msgid "Here you can configure general settings of %1"
-msgstr "在此您可以配置 %1 的常规设置"
-
-#: kbg.cpp:516
-msgid "Messages"
-msgstr "消息"
-
-#: kbg.cpp:517
-msgid "Timer"
-msgstr "定时器"
-
-#: kbg.cpp:518
-msgid "Autosave"
-msgstr "自动保存"
-
-#: kbg.cpp:519
-msgid "Events"
-msgstr "事件"
-
-#: kbg.cpp:524
-msgid ""
-"After you finished your moves, they have to be sent to the engine. You can "
-"either do that manually (in which case you should not enable this feature), or "
-"you can specify an amount of time that has to pass before the move is "
-"committed. If you undo a move during the timeout, the timeout will be reset and "
-"restarted once you finish the move. This is very useful if you would like to "
-"review the result of your move."
-msgstr ""
-"当您完成移动后，此移动信息需要发送到引擎。您可以手工发送(这样您不需要启用这个功能)，或者您可以指定移动信息发送前等待的时间长度。如果您在此时间内撤消移动，这个"
-"等待时间将被重置，并在移动完成后再重新开始计时。当您需要复查移动结果的时候这非常有用。"
-
-#: kbg.cpp:531
-msgid "Enable timeout"
-msgstr "启用定时提交"
-
-#: kbg.cpp:536
-msgid "Move timeout in seconds:"
-msgstr "提交移动前的等待时间(秒)："
-
-#: kbg.cpp:549
-msgid ""
-"Check the box to enable all the messages that you have previously disabled by "
-"choosing the \"Don't show this message again\" option."
-msgstr "选中此项可以开启您以前用“不再显示此消息”选项关闭显示的所有消息。"
-
-#: kbg.cpp:553
-msgid "Reenable all messages"
-msgstr "重新开启全部消息"
-
-#: kbg.cpp:559
-msgid ""
-"Check the box to automatically save all window positions on program exit. They "
-"will be restored at next start."
-msgstr "选中此项可以在程序退出时自动保存所有窗口的位置，下次运行时自动恢复。"
-
-#: kbg.cpp:563
-msgid "Save settings on exit"
-msgstr "退出时保存设置"
-
-#: kbg.cpp:570
+#: _translatorinfo.cpp:1
 msgid ""
-"Event notification of %1 is configured as part of the system-wide notification "
-"process. Click here, and you will be able to configure system sounds, etc."
-msgstr "%1事件通知可作为整个系统通知处理的一部分来配置。点击此处您将可以配置系统声音等选项。"
-
-#: kbg.cpp:577
-msgid "Klick here to configure the event notification"
-msgstr "点击此处配置事件通知"
-
-#: kbg.cpp:649
-#, c-format
-msgid "Print %1"
-msgstr "打印 %1"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "TDE 中文翻译组"
 
-#: kbg.cpp:671
+#: _translatorinfo.cpp:3
 msgid ""
-"You can enable the menubar again with the right mouse button menu of the board."
-msgstr "您可以通过鼠标右键点击棋盘弹出的菜单启用菜单栏。"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "i18n-translation@lists.linux.net.cn"
 
 #: kbgboard.cpp:131
 msgid "Board"
@@ -297,44 +161,454 @@ msgstr ""
 "根据游戏的方向，一方老家放有骰子而另一方老家放有已被移出棋盘的棋子。棋子决不可以从老家移走。如果此老家放有骰子并且当前游戏状态允许，在骰子上双击将会投掷它们。此"
 "外，立方体可被放置在老家棋盘条上，如果它可以被加两倍，双击它即可。"
 
-#: engines/fibs/kbgfibschat.cpp:203
-msgid "%1 user"
-msgstr "%1 个用户"
+#: engines/offline/kbgoffline.cpp:123
+msgid "&New Game..."
+msgstr "新建游戏(&N)..."
 
-#: engines/fibs/kbgfibschat.cpp:205
-msgid "Kibitz to watchers and players"
-msgstr "替观众和玩家乱出主意"
+#: engines/offline/kbgoffline.cpp:124
+msgid "&Swap Colors"
+msgstr "对换颜色(&S)"
 
-#: engines/fibs/kbgfibschat.cpp:207
-msgid "Whisper to watchers only"
-msgstr "仅偷偷告诉观察者"
+#: engines/offline/kbgoffline.cpp:126
+msgid "&Edit Mode"
+msgstr "编辑方式(&E)"
 
-#: engines/fibs/kbgfibschat.cpp:222
-msgid "Chat Window"
-msgstr "聊天窗口"
+#: engines/offline/kbgoffline.cpp:182
+msgid "Offline Engine"
+msgstr "离线引擎"
 
-#: engines/fibs/kbgfibschat.cpp:224
+#: engines/offline/kbgoffline.cpp:182
+msgid "Use this to configure the Offline engine"
+msgstr "此处配置离线引擎"
+
+#: engines/offline/kbgoffline.cpp:199
+msgid "Names"
+msgstr "名称"
+
+#: engines/offline/kbgoffline.cpp:209
+msgid "First player:"
+msgstr "第一个玩家："
+
+#: engines/offline/kbgoffline.cpp:210
+msgid "Second player:"
+msgstr "第二个玩家："
+
+#: engines/offline/kbgoffline.cpp:217
+msgid "Enter the name of the first player."
+msgstr "输入第一个玩家的名字。"
+
+#: engines/offline/kbgoffline.cpp:218
+msgid "Enter the name of the second player."
+msgstr "输入第二个玩家的名字。"
+
+#: engines/offline/kbgoffline.cpp:224
+msgid "&Player Names"
+msgstr "玩家名字(&P)"
+
+#: engines/offline/kbgoffline.cpp:237 engines/offline/kbgoffline.cpp:253
+msgid "South"
+msgstr "南"
+
+#: engines/offline/kbgoffline.cpp:238 engines/offline/kbgoffline.cpp:254
+msgid "North"
+msgstr "北"
+
+#: engines/gnubg/kbggnubg.cpp:279 engines/offline/kbgoffline.cpp:286
+msgid "A game is currently in progress. Starting a new one will terminate it."
+msgstr "游戏正在进行中，开始新游戏将会终止当前棋局。"
+
+#: engines/gnubg/kbggnubg.cpp:281 engines/offline/kbgoffline.cpp:288
+msgid "Start New Game"
+msgstr "开始新游戏"
+
+#: engines/gnubg/kbggnubg.cpp:281 engines/offline/kbgoffline.cpp:289
+msgid "Continue Old Game"
+msgstr "继续当前游戏"
+
+#: engines/offline/kbgoffline.cpp:320
+msgid "%1 rolls %2, %3 rolls %4."
+msgstr "%1掷出 %2 点，%3掷出 %4 点。"
+
+#: engines/offline/kbgoffline.cpp:325 engines/offline/kbgoffline.cpp:328
+msgid "%1 makes the first move."
+msgstr "%1先移动。"
+
+#: engines/gnubg/kbggnubg.cpp:239 engines/offline/kbgoffline.cpp:341
+#: engines/offline/kbgoffline.cpp:798
+msgid "%1 vs. %2"
+msgstr "%1 对 %2"
+
+#: engines/offline/kbgoffline.cpp:391
 msgid ""
-"This is the chat window.\n"
-"\n"
-"The text in this window is colored depending on whether it is directed at you "
-"personally, shouted to the general FIBS population, has been said by you, or is "
-"of general interest. If you select the name of a player, the context contains "
-"entries specifically geared towards that player."
+"Please enter the nickname of the player whose home\n"
+"is in the lower half of the board:"
+msgstr "请输入老家位于棋盘下方的玩家的昵称："
+
+#: engines/offline/kbgoffline.cpp:395
+msgid ""
+"Please enter the nickname of the player whose home\n"
+"is in the upper half of the board:"
+msgstr "请输入老家位于棋盘上方的玩家的昵称："
+
+#: engines/offline/kbgoffline.cpp:424 engines/offline/kbgoffline.cpp:656
+msgid "%1 wins the game. Congratulations!"
+msgstr "%1赢得比赛。恭喜！"
+
+#: engines/offline/kbgoffline.cpp:443
+msgid "%1, please roll or double."
+msgstr "%1，请掷骰子或加倍。"
+
+#: engines/offline/kbgoffline.cpp:562
+msgid "It's not your turn to roll!"
+msgstr "还没轮到你掷骰子！"
+
+#: engines/offline/kbgoffline.cpp:614
+msgid "Game over!"
+msgstr "游戏结束！"
+
+#: engines/offline/kbgoffline.cpp:621
+msgid "%1, you cannot move."
+msgstr "%1，你不可移动。"
+
+#: engines/offline/kbgoffline.cpp:630
+#, fuzzy, c-format
+msgid ""
+"_n: , please move 1 piece.\n"
+", please move %n pieces."
+msgstr "%1，请移动 %2 个棋子。"
+
+#: engines/offline/kbgoffline.cpp:649
+msgid "%1 has doubled. %2, do you accept the double?"
+msgstr "%1已加倍。%2，你接受加倍吗？"
+
+#: engines/offline/kbgoffline.cpp:652
+msgid "Doubling"
+msgstr "加倍"
+
+#: engines/fibs/kbgfibs.cpp:2219 engines/offline/kbgoffline.cpp:652
+msgid "Accept"
+msgstr "接受"
+
+#: engines/fibs/kbgfibs.cpp:2220 engines/offline/kbgoffline.cpp:652
+msgid "Reject"
+msgstr "拒绝"
+
+#: engines/offline/kbgoffline.cpp:661
+msgid "%1 has accepted the double. The game continues."
+msgstr "%1已接受加倍，游戏继续进行。"
+
+#: engines/offline/kbgoffline.cpp:699
+msgid "In the middle of a game. Really quit?"
+msgstr "游戏尚在进行中，确实要退出？"
+
+#: engines/offline/kbgoffline.cpp:724
+msgid "Text commands are not yet working. The command '%1' has been ignored."
+msgstr "文本命令还不能用。命令“%1”被忽略。"
+
+#: engines/offline/kbgoffline.cpp:794
+msgid "%1 vs. %2 - Edit Mode"
+msgstr "%1 对 %2 — 编辑方式"
+
+#: engines/gnubg/kbggnubg.cpp:134
+#, c-format
+msgid "gnubg doubles the cube to %1."
+msgstr "gnubg 将加倍立方体加倍到 %1。"
+
+#: engines/gnubg/kbggnubg.cpp:135
+msgid "gnubg doubles"
+msgstr "gnubg 加倍"
+
+#: engines/gnubg/kbggnubg.cpp:136
+msgid "&Accept"
+msgstr "接受(&A)"
+
+#: engines/gnubg/kbggnubg.cpp:136
+msgid "Re&double"
+msgstr "再加倍(&D)"
+
+#: engines/gnubg/kbggnubg.cpp:136
+msgid "&Reject"
+msgstr "拒绝(&R)"
+
+#: engines/gnubg/kbggnubg.cpp:188
+msgid "Please roll or double."
+msgstr "请你掷骰子或者加倍。"
+
+#: engines/gnubg/kbggnubg.cpp:191
+msgid "Please roll."
+msgstr "请你掷骰子"
+
+#: engines/gnubg/kbggnubg.cpp:202
+msgid "You roll %1 and %2."
+msgstr "你掷出 %1 点和 %2 点。"
+
+#: engines/gnubg/kbggnubg.cpp:208
+msgid "Please move 1 piece."
+msgstr "请移动 1 个棋子。"
+
+#: engines/gnubg/kbggnubg.cpp:211
+msgid "Please move %1 pieces."
+msgstr "请移动 %1 个棋子。"
+
+#: engines/gnubg/kbggnubg.cpp:223
+msgid "gnubg rolls %1 and %2."
+msgstr "gnubg 掷出 %1 点和 %2 点。"
+
+#: engines/gnubg/kbggnubg.cpp:225
+msgid "gnubg cannot move."
+msgstr "gnubg 不能移动。"
+
+#: engines/gnubg/kbggnubg.cpp:294
+msgid "Starting a new game."
+msgstr "开始一局新游戏。"
+
+#: engines/gnubg/kbggnubg.cpp:382
+msgid "GNU Engine"
+msgstr "GNU 引擎"
+
+#: engines/gnubg/kbggnubg.cpp:382
+msgid "Here you can configure the GNU backgammon engine"
+msgstr "在此您可以配置 GNU 西洋双陆棋引擎"
+
+#: engines/gnubg/kbggnubg.cpp:442
+msgid "&Restart GNU Backgammon"
+msgstr "重新启动 GNU 西洋双陆棋(&R)"
+
+#: engines/gnubg/kbggnubg.cpp:474
+msgid ""
+"This is experimental code which currently requires a specially patched version "
+"of GNU Backgammon."
+"<br/>"
+"<br/>"
+msgstr "这是个试验性的代码，目前需要一个打过特别补丁的 GNU 西洋双陆棋程序。<br/><br/>"
+
+#: engines/gnubg/kbggnubg.cpp:507
+msgid ""
+"Could not start the GNU Backgammon process.\n"
+"Make sure the program is in your PATH and is called \"gnubg\".\n"
+"Make sure that your copy is at least version 0.10"
 msgstr ""
-"这是聊天窗口。\n"
-"\n"
-"根据消息是否针对你个人、对所有 FIBS "
-"玩家喊叫、是您所说的、或是一般感兴趣的，这个窗口里的文字将用不同颜色显示。如果你选择一个选手名字，环境菜单将含有针对那个玩家的条目。"
+"无法运行 GNU 西洋双陆棋程序。\n"
+"请确认该程序是“gnubg”，并且位于您的路径中。\n"
+"请确认您系统中的该程序至少是 0.10 版。"
 
-#: engines/fibs/kbgfibschat.cpp:233
-msgid "Info On"
-msgstr "信息开启"
+#: engines/gnubg/kbggnubg.cpp:535
+msgid "The GNU Backgammon process (%1) has exited. "
+msgstr "GNU 西洋双陆棋进程 (%1) 已退出。"
 
-#: engines/fibs/kbgfibschat.cpp:237
-msgid "Talk To"
+#: engines/nextgen/kbgng.cpp:63
+msgid "Local Games"
+msgstr "本地游戏"
+
+#: engines/nextgen/kbgng.cpp:64
+msgid "Offer Network Games"
+msgstr "离线网络游戏"
+
+#: engines/nextgen/kbgng.cpp:65
+msgid "Join Network Games"
+msgstr "加入网络游戏"
+
+#: engines/nextgen/kbgng.cpp:71
+msgid "&Types"
+msgstr "类型(&T)"
+
+#: engines/nextgen/kbgng.cpp:77
+msgid "&Names..."
+msgstr "名称(&N)..."
+
+#: engines/nextgen/kbgng.cpp:138
+msgid ""
+"Type the port number on which you want to listen to connections.\n"
+"The number should be between 1024 and 65535."
+msgstr ""
+"输入您要监听网络连接的端口号。\n"
+"该号码必须在 1024 和 65535 之间。"
+
+#: engines/nextgen/kbgng.cpp:150
+#, c-format
+msgid "Now waiting for incoming connections on port %1."
+msgstr "现在正在监听端口 %1 上的网络连接。"
+
+#: engines/nextgen/kbgng.cpp:153
+#, c-format
+msgid "Failed to offer connections on port %1."
+msgstr "在端口 %1 上提供连接失败。"
+
+#: engines/nextgen/kbgng.cpp:159
+#, fuzzy
+msgid "Type the name of the server you want to connect to:"
+msgstr "输入您想要连接的服务器名字。"
+
+#: engines/nextgen/kbgng.cpp:167
+msgid ""
+"Type the port number on %1 you want to connect to.\n"
+"The number should be between 1024 and 65535."
+msgstr ""
+"输入您想要连接的服务器 %1 上的端口号。\n"
+"此号码必须在 1024 和 65535 之间。"
+
+#: engines/nextgen/kbgng.cpp:186
+msgid "Now connected to %1:%2."
+msgstr "现在已连接到 %1:%2。"
+
+#: engines/nextgen/kbgng.cpp:189
+msgid "Failed to connect to %1:%2."
+msgstr "连接到 %1:%2 失败。"
+
+#: engines/nextgen/kbgng.cpp:210 engines/nextgen/kbgng.cpp:211
+msgid "Player %1 (%2) has joined the game."
+msgstr "玩家 %1 (%2) 已加入游戏。"
+
+#: engines/nextgen/kbgng.cpp:219
+#, c-format
+msgid "creating player. virtual=%1"
+msgstr "正在创建玩家。virtual=%1"
+
+#: engines/nextgen/kbgng.cpp:456
+msgid "one"
+msgstr "一"
+
+#: engines/nextgen/kbgng.cpp:457
+msgid "two"
+msgstr "二"
+
+#: engines/nextgen/kbgng.cpp:509
+msgid "Player %1 has changed the name to %2."
+msgstr "玩家 %1 已经改名为 %2。"
+
+#: engines/nextgen/kbgng.cpp:548
+#, fuzzy
+msgid "Type the name of the first player:"
+msgstr "输入第一个玩家的名字。"
+
+#: engines/nextgen/kbgng.cpp:551
+#, fuzzy
+msgid "Type the name of the second player:"
+msgstr "输入第二个玩家的名字。"
+
+#: engines/nextgen/kbgng.cpp:570
+msgid "Players are %1 and %2"
+msgstr "玩家为%1和%2"
+
+#: engines/fibs/kbginvite.cpp:55
+msgid "Invite Players"
+msgstr "邀请玩家"
+
+#: engines/fibs/kbginvite.cpp:64
+msgid "&Invite"
+msgstr "邀请(&I)"
+
+#: engines/fibs/kbginvite.cpp:65
+msgid "&Resume"
+msgstr "继续(&R)"
+
+#: engines/fibs/kbginvite.cpp:66
+msgid "&Unlimited"
+msgstr "无上限(&U)"
+
+#: engines/fibs/kbginvite.cpp:71
+msgid ""
+"Type the name of the player you want to invite in the first entry\n"
+"field and select the desired match length in the spin box."
+msgstr "在第一栏里输入您想邀请的玩家名字，然后在翻转框里选择想玩的棋局长度。"
+
+#: engines/fibs/kplayerlist.cpp:218
+msgid "Player"
+msgstr "玩家"
+
+#: engines/fibs/kplayerlist.cpp:219
+msgid "Opponent"
+msgstr "对手"
+
+#: engines/fibs/kplayerlist.cpp:220
+msgid "Watches"
+msgstr "观众"
+
+#: engines/fibs/kplayerlist.cpp:221
+msgid "Status"
+msgstr "状态"
+
+#: engines/fibs/kplayerlist.cpp:222
+msgid "Rating"
+msgstr "排名"
+
+#: engines/fibs/kplayerlist.cpp:223
+msgid "Exp."
+msgstr "经验值"
+
+#: engines/fibs/kplayerlist.cpp:224
+msgid "Idle"
+msgstr "空闲"
+
+#: engines/fibs/kplayerlist.cpp:225
+msgid "Time"
+msgstr "时间"
+
+#: engines/fibs/kplayerlist.cpp:226
+msgid "Host name"
+msgstr "主机名"
+
+#: engines/fibs/kplayerlist.cpp:227
+msgid "Client"
+msgstr "客户"
+
+#: engines/fibs/kplayerlist.cpp:228
+msgid "Email"
+msgstr "电子邮件"
+
+#: engines/fibs/kplayerlist.cpp:245
+msgid ""
+"_: abreviate blind\n"
+"B"
+msgstr "屏蔽"
+
+#: engines/fibs/kplayerlist.cpp:246
+msgid ""
+"_: abreviate away\n"
+"A"
+msgstr "离开"
+
+#: engines/fibs/kplayerlist.cpp:247
+msgid ""
+"_: abreviate ready\n"
+"R"
+msgstr "就绪"
+
+#: engines/fibs/kplayerlist.cpp:259
+msgid ""
+"This window contains the player list. It shows all players that are currently "
+"logged into FIBS.Use the right mouse button to get a context menu with helpful "
+"information and commands."
+msgstr "这个窗口含有玩家列表。它显示当前登录进 FIBS 服务器的所有玩家。用鼠标右键点击能弹出菜单，提供帮助信息和执行命令。"
+
+#: engines/fibs/kplayerlist.cpp:289
+msgid "Info"
+msgstr "信息"
+
+#: engines/fibs/kplayerlist.cpp:293
+msgid "Talk"
 msgstr "交谈"
 
+#: engines/fibs/kplayerlist.cpp:298
+msgid "Look"
+msgstr "查看"
+
+#: engines/fibs/kplayerlist.cpp:299
+msgid "Watch"
+msgstr "观察"
+
+#: engines/fibs/kplayerlist.cpp:300
+msgid "Unwatch"
+msgstr "不观察"
+
+#: engines/fibs/kplayerlist.cpp:301 engines/fibs/kplayerlist.cpp:600
+msgid "Blind"
+msgstr "屏蔽"
+
+#: engines/fibs/kplayerlist.cpp:302
+msgid "Update"
+msgstr "更新"
+
 #: engines/fibs/kbgfibschat.cpp:242 engines/fibs/kplayerlist.cpp:308
 msgid "Use Dialog"
 msgstr "使用对话框"
@@ -375,35 +649,28 @@ msgstr "无限制"
 msgid "Resume"
 msgstr "继续"
 
-#: engines/fibs/kbgfibschat.cpp:280
-msgid "Gag"
-msgstr "封堵"
-
-#: engines/fibs/kbgfibschat.cpp:281
-msgid "Ungag"
-msgstr "解封"
-
-#: engines/fibs/kbgfibschat.cpp:282
-msgid "Clear Gag List"
-msgstr "清除封堵清单"
-
-#: engines/fibs/kbgfibschat.cpp:286
-msgid "Silent"
-msgstr "无声"
+#: engines/fibs/kplayerlist.cpp:336
+msgid "Invite"
+msgstr "邀请"
 
-#: engines/fibs/kbgfibschat.cpp:364
-msgid "Select users to be removed from the gag list."
-msgstr "选择要从封堵清单删除的玩家。"
+#: engines/fibs/kplayerlist.cpp:454
+msgid "Column Selection"
+msgstr "表列选择"
 
-#: engines/fibs/kbgfibschat.cpp:366
+#: engines/fibs/kplayerlist.cpp:461
 msgid ""
-"Select all the users you want to remove from the gag list and then click OK. "
-"Afterwards you will again hear what they shout."
-msgstr "选择所有您要从封堵清单删除的玩家，然后点击确定，您就可以听到他们说的话了。"
+"Select all the columns that you would\n"
+"like to be shown in the player list."
+msgstr "选择所有您想要在玩家列表里显示的表列。"
 
-#: engines/fibs/kbgfibschat.cpp:381
-msgid "&Gag List"
-msgstr "封堵清单(&G)"
+#: engines/fibs/kplayerlist.cpp:484
+msgid "&Playerlist"
+msgstr "玩家清单(&P)"
+
+#: engines/fibs/kbgfibschat.cpp:689 engines/fibs/kplayerlist.cpp:572
+#, c-format
+msgid "Info on %1"
+msgstr "关于%1的信息"
 
 #: engines/fibs/kbgfibschat.cpp:453 engines/fibs/kbgfibschat.cpp:479
 #: engines/fibs/kbgfibschat.cpp:686 engines/fibs/kplayerlist.cpp:573
@@ -411,96 +678,44 @@ msgstr "封堵清单(&G)"
 msgid "Talk to %1"
 msgstr "和%1交谈"
 
-#: engines/fibs/kbgfibschat.cpp:552
-msgid "<u>%1 tells you:</u> %2"
-msgstr "<u>%1告诉你：</u>%2"
-
-#: engines/fibs/kbgfibschat.cpp:561
-msgid "<u>%1 shouts:</u> %2"
-msgstr "<u>%1喊道：</u>%2"
-
-#: engines/fibs/kbgfibschat.cpp:569
-msgid "<u>%1 whispers:</u> %2"
-msgstr "<u>%1悄悄说：</u>%2"
-
-#: engines/fibs/kbgfibschat.cpp:578
-msgid "<u>%1 kibitzes:</u> %2"
-msgstr "<u>%1乱出主意：</u>%2"
-
-#: engines/fibs/kbgfibschat.cpp:586
-msgid "<u>You tell %1:</u> %2"
-msgstr "<u>你告诉%1：</u>%2"
-
-#: engines/fibs/kbgfibschat.cpp:593
+#: engines/fibs/kplayerlist.cpp:574
 #, c-format
-msgid "<u>You shout:</u> %1"
-msgstr "<u>你喊道：</u>%1"
+msgid "Email to %1"
+msgstr "发电子邮件给%1"
 
-#: engines/fibs/kbgfibschat.cpp:600
+#: engines/fibs/kplayerlist.cpp:575
 #, c-format
-msgid "<u>You whisper:</u> %1"
-msgstr "<u>你悄悄说：</u>%1"
+msgid "Look at %1"
+msgstr "查看%1"
 
-#: engines/fibs/kbgfibschat.cpp:607
+#: engines/fibs/kplayerlist.cpp:576
 #, c-format
-msgid "<u>You kibitz:</u> %1"
-msgstr "<u>你乱出主意：</u>%1"
-
-#: engines/fibs/kbgfibschat.cpp:618
-msgid "<u>User %1 left a message at %2</u>: %3"
-msgstr "<u>玩家%1在 %2 留下一条消息</u>：%3"
-
-#: engines/fibs/kbgfibschat.cpp:625
-msgid "Your message for %1 has been delivered."
-msgstr "你给%1的消息已被发送。"
-
-#: engines/fibs/kbgfibschat.cpp:632
-msgid "Your message for %1 has been saved."
-msgstr "你给%1的消息已被保存。"
-
-#: engines/fibs/kbgfibschat.cpp:649
-msgid "<u>You say to yourself:</u> "
-msgstr "<u>你对自己说：</u>"
+msgid "Watch %1"
+msgstr "观察%1"
 
-#: engines/fibs/kbgfibschat.cpp:689 engines/fibs/kplayerlist.cpp:572
+#: engines/fibs/kplayerlist.cpp:577
 #, c-format
-msgid "Info on %1"
-msgstr "关于%1的信息"
+msgid "Update %1"
+msgstr "更新%1"
 
 #: engines/fibs/kbgfibschat.cpp:693 engines/fibs/kplayerlist.cpp:590
 #, c-format
 msgid "Invite %1"
 msgstr "邀请%1"
 
-#: engines/fibs/kbgfibschat.cpp:698
+#: engines/fibs/kplayerlist.cpp:598
 #, c-format
-msgid "Gag %1"
-msgstr "封堵%1"
+msgid "Unblind %1"
+msgstr "看到%1"
 
-#: engines/fibs/kbgfibschat.cpp:701
+#: engines/fibs/kplayerlist.cpp:598
 #, c-format
-msgid "Ungag %1"
-msgstr "解封%1"
-
-#: engines/fibs/kbgfibschat.cpp:730
-msgid "The gag list is now empty."
-msgstr "封堵清单现在是空的。"
-
-#: engines/fibs/kbgfibschat.cpp:744
-msgid "You won't hear what %1 says and shouts."
-msgstr "你将听不见%1说话和喊叫。"
-
-#: engines/fibs/kbgfibschat.cpp:766
-msgid "You will again hear what %1 says and shouts."
-msgstr "你将又能听见%1说话和喊叫。"
-
-#: engines/fibs/kbgfibschat.cpp:788
-msgid "You will not hear what people shout."
-msgstr "你将不会听见别人喊呼。"
+msgid "Blind %1"
+msgstr "看不到%1"
 
-#: engines/fibs/kbgfibschat.cpp:790
-msgid "You will hear what people shout."
-msgstr "你将会听见别人喊呼。"
+#: engines/fibs/kplayerlist.cpp:889
+msgid "Player List - %1 - %2/%3"
+msgstr "玩家清单 - %1 - %2/%3"
 
 #: engines/fibs/kbgfibs.cpp:210
 msgid "FIBS Engine"
@@ -952,14 +1167,6 @@ msgstr "要求加倍"
 msgid "&Response"
 msgstr "响应(&R)"
 
-#: engines/fibs/kbgfibs.cpp:2219 engines/offline/kbgoffline.cpp:652
-msgid "Accept"
-msgstr "接受"
-
-#: engines/fibs/kbgfibs.cpp:2220 engines/offline/kbgoffline.cpp:652
-msgid "Reject"
-msgstr "拒绝"
-
 #: engines/fibs/kbgfibs.cpp:2227
 msgid "Join"
 msgstr "加入"
@@ -980,509 +1187,321 @@ msgstr "玩家列表(&P)"
 msgid "&Chat"
 msgstr "聊天(&C)"
 
-#: engines/fibs/kplayerlist.cpp:218
-msgid "Player"
-msgstr "玩家"
-
-#: engines/fibs/kplayerlist.cpp:219
-msgid "Opponent"
-msgstr "对手"
-
-#: engines/fibs/kplayerlist.cpp:220
-msgid "Watches"
-msgstr "观众"
-
-#: engines/fibs/kplayerlist.cpp:221
-msgid "Status"
-msgstr "状态"
-
-#: engines/fibs/kplayerlist.cpp:222
-msgid "Rating"
-msgstr "排名"
-
-#: engines/fibs/kplayerlist.cpp:223
-msgid "Exp."
-msgstr "经验值"
-
-#: engines/fibs/kplayerlist.cpp:224
-msgid "Idle"
-msgstr "空闲"
-
-#: engines/fibs/kplayerlist.cpp:225
-msgid "Time"
-msgstr "时间"
-
-#: engines/fibs/kplayerlist.cpp:226
-msgid "Host name"
-msgstr "主机名"
-
-#: engines/fibs/kplayerlist.cpp:227
-msgid "Client"
-msgstr "客户"
-
-#: engines/fibs/kplayerlist.cpp:228
-msgid "Email"
-msgstr "电子邮件"
+#: engines/fibs/kbgfibschat.cpp:203
+msgid "%1 user"
+msgstr "%1 个用户"
 
-#: engines/fibs/kplayerlist.cpp:245
-msgid ""
-"_: abreviate blind\n"
-"B"
-msgstr "屏蔽"
+#: engines/fibs/kbgfibschat.cpp:205
+msgid "Kibitz to watchers and players"
+msgstr "替观众和玩家乱出主意"
 
-#: engines/fibs/kplayerlist.cpp:246
-msgid ""
-"_: abreviate away\n"
-"A"
-msgstr "离开"
+#: engines/fibs/kbgfibschat.cpp:207
+msgid "Whisper to watchers only"
+msgstr "仅偷偷告诉观察者"
 
-#: engines/fibs/kplayerlist.cpp:247
-msgid ""
-"_: abreviate ready\n"
-"R"
-msgstr "就绪"
+#: engines/fibs/kbgfibschat.cpp:222
+msgid "Chat Window"
+msgstr "聊天窗口"
 
-#: engines/fibs/kplayerlist.cpp:259
+#: engines/fibs/kbgfibschat.cpp:224
 msgid ""
-"This window contains the player list. It shows all players that are currently "
-"logged into FIBS.Use the right mouse button to get a context menu with helpful "
-"information and commands."
-msgstr "这个窗口含有玩家列表。它显示当前登录进 FIBS 服务器的所有玩家。用鼠标右键点击能弹出菜单，提供帮助信息和执行命令。"
+"This is the chat window.\n"
+"\n"
+"The text in this window is colored depending on whether it is directed at you "
+"personally, shouted to the general FIBS population, has been said by you, or is "
+"of general interest. If you select the name of a player, the context contains "
+"entries specifically geared towards that player."
+msgstr ""
+"这是聊天窗口。\n"
+"\n"
+"根据消息是否针对你个人、对所有 FIBS "
+"玩家喊叫、是您所说的、或是一般感兴趣的，这个窗口里的文字将用不同颜色显示。如果你选择一个选手名字，环境菜单将含有针对那个玩家的条目。"
 
-#: engines/fibs/kplayerlist.cpp:289
-msgid "Info"
-msgstr "信息"
+#: engines/fibs/kbgfibschat.cpp:233
+msgid "Info On"
+msgstr "信息开启"
 
-#: engines/fibs/kplayerlist.cpp:293
-msgid "Talk"
+#: engines/fibs/kbgfibschat.cpp:237
+msgid "Talk To"
 msgstr "交谈"
 
-#: engines/fibs/kplayerlist.cpp:298
-msgid "Look"
-msgstr "查看"
+#: engines/fibs/kbgfibschat.cpp:280
+msgid "Gag"
+msgstr "封堵"
 
-#: engines/fibs/kplayerlist.cpp:299
-msgid "Watch"
-msgstr "观察"
+#: engines/fibs/kbgfibschat.cpp:281
+msgid "Ungag"
+msgstr "解封"
 
-#: engines/fibs/kplayerlist.cpp:300
-msgid "Unwatch"
-msgstr "不观察"
+#: engines/fibs/kbgfibschat.cpp:282
+msgid "Clear Gag List"
+msgstr "清除封堵清单"
 
-#: engines/fibs/kplayerlist.cpp:301 engines/fibs/kplayerlist.cpp:600
-msgid "Blind"
-msgstr "屏蔽"
+#: engines/fibs/kbgfibschat.cpp:286
+msgid "Silent"
+msgstr "无声"
 
-#: engines/fibs/kplayerlist.cpp:302
-msgid "Update"
-msgstr "更新"
+#: engines/fibs/kbgfibschat.cpp:364
+msgid "Select users to be removed from the gag list."
+msgstr "选择要从封堵清单删除的玩家。"
 
-#: engines/fibs/kplayerlist.cpp:336
-msgid "Invite"
-msgstr "邀请"
+#: engines/fibs/kbgfibschat.cpp:366
+msgid ""
+"Select all the users you want to remove from the gag list and then click OK. "
+"Afterwards you will again hear what they shout."
+msgstr "选择所有您要从封堵清单删除的玩家，然后点击确定，您就可以听到他们说的话了。"
 
-#: engines/fibs/kplayerlist.cpp:454
-msgid "Column Selection"
-msgstr "表列选择"
+#: engines/fibs/kbgfibschat.cpp:381
+msgid "&Gag List"
+msgstr "封堵清单(&G)"
 
-#: engines/fibs/kplayerlist.cpp:461
-msgid ""
-"Select all the columns that you would\n"
-"like to be shown in the player list."
-msgstr "选择所有您想要在玩家列表里显示的表列。"
+#: engines/fibs/kbgfibschat.cpp:552
+msgid "<u>%1 tells you:</u> %2"
+msgstr "<u>%1告诉你：</u>%2"
 
-#: engines/fibs/kplayerlist.cpp:484
-msgid "&Playerlist"
-msgstr "玩家清单(&P)"
+#: engines/fibs/kbgfibschat.cpp:561
+msgid "<u>%1 shouts:</u> %2"
+msgstr "<u>%1喊道：</u>%2"
 
-#: engines/fibs/kplayerlist.cpp:574
-#, c-format
-msgid "Email to %1"
-msgstr "发电子邮件给%1"
+#: engines/fibs/kbgfibschat.cpp:569
+msgid "<u>%1 whispers:</u> %2"
+msgstr "<u>%1悄悄说：</u>%2"
 
-#: engines/fibs/kplayerlist.cpp:575
-#, c-format
-msgid "Look at %1"
-msgstr "查看%1"
+#: engines/fibs/kbgfibschat.cpp:578
+msgid "<u>%1 kibitzes:</u> %2"
+msgstr "<u>%1乱出主意：</u>%2"
 
-#: engines/fibs/kplayerlist.cpp:576
-#, c-format
-msgid "Watch %1"
-msgstr "观察%1"
+#: engines/fibs/kbgfibschat.cpp:586
+msgid "<u>You tell %1:</u> %2"
+msgstr "<u>你告诉%1：</u>%2"
 
-#: engines/fibs/kplayerlist.cpp:577
+#: engines/fibs/kbgfibschat.cpp:593
 #, c-format
-msgid "Update %1"
-msgstr "更新%1"
+msgid "<u>You shout:</u> %1"
+msgstr "<u>你喊道：</u>%1"
 
-#: engines/fibs/kplayerlist.cpp:598
+#: engines/fibs/kbgfibschat.cpp:600
 #, c-format
-msgid "Unblind %1"
-msgstr "看到%1"
+msgid "<u>You whisper:</u> %1"
+msgstr "<u>你悄悄说：</u>%1"
 
-#: engines/fibs/kplayerlist.cpp:598
+#: engines/fibs/kbgfibschat.cpp:607
 #, c-format
-msgid "Blind %1"
-msgstr "看不到%1"
-
-#: engines/fibs/kplayerlist.cpp:889
-msgid "Player List - %1 - %2/%3"
-msgstr "玩家清单 - %1 - %2/%3"
-
-#: engines/fibs/kbginvite.cpp:55
-msgid "Invite Players"
-msgstr "邀请玩家"
+msgid "<u>You kibitz:</u> %1"
+msgstr "<u>你乱出主意：</u>%1"
 
-#: engines/fibs/kbginvite.cpp:64
-msgid "&Invite"
-msgstr "邀请(&I)"
+#: engines/fibs/kbgfibschat.cpp:618
+msgid "<u>User %1 left a message at %2</u>: %3"
+msgstr "<u>玩家%1在 %2 留下一条消息</u>：%3"
 
-#: engines/fibs/kbginvite.cpp:65
-msgid "&Resume"
-msgstr "继续(&R)"
+#: engines/fibs/kbgfibschat.cpp:625
+msgid "Your message for %1 has been delivered."
+msgstr "你给%1的消息已被发送。"
 
-#: engines/fibs/kbginvite.cpp:66
-msgid "&Unlimited"
-msgstr "无上限(&U)"
+#: engines/fibs/kbgfibschat.cpp:632
+msgid "Your message for %1 has been saved."
+msgstr "你给%1的消息已被保存。"
 
-#: engines/fibs/kbginvite.cpp:71
-msgid ""
-"Type the name of the player you want to invite in the first entry\n"
-"field and select the desired match length in the spin box."
-msgstr "在第一栏里输入您想邀请的玩家名字，然后在翻转框里选择想玩的棋局长度。"
+#: engines/fibs/kbgfibschat.cpp:649
+msgid "<u>You say to yourself:</u> "
+msgstr "<u>你对自己说：</u>"
 
-#: engines/gnubg/kbggnubg.cpp:134
+#: engines/fibs/kbgfibschat.cpp:698
 #, c-format
-msgid "gnubg doubles the cube to %1."
-msgstr "gnubg 将加倍立方体加倍到 %1。"
+msgid "Gag %1"
+msgstr "封堵%1"
 
-#: engines/gnubg/kbggnubg.cpp:135
-msgid "gnubg doubles"
-msgstr "gnubg 加倍"
+#: engines/fibs/kbgfibschat.cpp:701
+#, c-format
+msgid "Ungag %1"
+msgstr "解封%1"
 
-#: engines/gnubg/kbggnubg.cpp:136
-msgid "&Accept"
-msgstr "接受(&A)"
+#: engines/fibs/kbgfibschat.cpp:730
+msgid "The gag list is now empty."
+msgstr "封堵清单现在是空的。"
 
-#: engines/gnubg/kbggnubg.cpp:136
-msgid "Re&double"
-msgstr "再加倍(&D)"
+#: engines/fibs/kbgfibschat.cpp:744
+msgid "You won't hear what %1 says and shouts."
+msgstr "你将听不见%1说话和喊叫。"
 
-#: engines/gnubg/kbggnubg.cpp:136
-msgid "&Reject"
-msgstr "拒绝(&R)"
+#: engines/fibs/kbgfibschat.cpp:766
+msgid "You will again hear what %1 says and shouts."
+msgstr "你将又能听见%1说话和喊叫。"
 
-#: engines/gnubg/kbggnubg.cpp:188
-msgid "Please roll or double."
-msgstr "请你掷骰子或者加倍。"
+#: engines/fibs/kbgfibschat.cpp:788
+msgid "You will not hear what people shout."
+msgstr "你将不会听见别人喊呼。"
 
-#: engines/gnubg/kbggnubg.cpp:191
-msgid "Please roll."
-msgstr "请你掷骰子"
+#: engines/fibs/kbgfibschat.cpp:790
+msgid "You will hear what people shout."
+msgstr "你将会听见别人喊呼。"
 
-#: engines/gnubg/kbggnubg.cpp:202
-msgid "You roll %1 and %2."
-msgstr "你掷出 %1 点和 %2 点。"
+#. i18n: file kbackgammonui.rc line 5
+#: rc.cpp:3
+#, no-c-format
+msgid "&Move"
+msgstr "移动(&M)"
 
-#: engines/gnubg/kbggnubg.cpp:208
-msgid "Please move 1 piece."
-msgstr "请移动 1 个棋子。"
+#. i18n: file kbackgammonui.rc line 10
+#: rc.cpp:6
+#, no-c-format
+msgid "&Command"
+msgstr "命令(&C)"
 
-#: engines/gnubg/kbggnubg.cpp:211
-msgid "Please move %1 pieces."
-msgstr "请移动 %1 个棋子。"
+#. i18n: file kbackgammonui.rc line 32
+#: rc.cpp:18
+#, no-c-format
+msgid "Command Toolbar"
+msgstr "命令工具栏"
 
-#: engines/gnubg/kbggnubg.cpp:223
-msgid "gnubg rolls %1 and %2."
-msgstr "gnubg 掷出 %1 点和 %2 点。"
+#: kbg.cpp:78
+msgid "Open Board"
+msgstr "打开棋盘"
 
-#: engines/gnubg/kbggnubg.cpp:225
-msgid "gnubg cannot move."
-msgstr "gnubg 不能移动。"
+#: kbg.cpp:79
+msgid "FIBS"
+msgstr "FIBS"
 
-#: engines/gnubg/kbggnubg.cpp:239 engines/offline/kbgoffline.cpp:341
-#: engines/offline/kbgoffline.cpp:798
-msgid "%1 vs. %2"
-msgstr "%1 对 %2"
+#: kbg.cpp:80
+msgid "GNU Backgammon (Experimental)"
+msgstr "GNU 西洋双陆棋(试验性)"
 
-#: engines/gnubg/kbggnubg.cpp:279 engines/offline/kbgoffline.cpp:286
-msgid "A game is currently in progress. Starting a new one will terminate it."
-msgstr "游戏正在进行中，开始新游戏将会终止当前棋局。"
+#: kbg.cpp:81
+msgid "Next Generation (Experimental)"
+msgstr "下一代(试验性)"
 
-#: engines/gnubg/kbggnubg.cpp:281 engines/offline/kbgoffline.cpp:288
-msgid "Start New Game"
-msgstr "开始新游戏"
+#: kbg.cpp:83
+msgid "FIBS Home"
+msgstr "FIBS 主页"
 
-#: engines/gnubg/kbggnubg.cpp:281 engines/offline/kbgoffline.cpp:289
-msgid "Continue Old Game"
-msgstr "继续当前游戏"
+#: kbg.cpp:86
+msgid "Backgammon Rules"
+msgstr "西洋双陆棋规则"
 
-#: engines/gnubg/kbggnubg.cpp:294
-msgid "Starting a new game."
-msgstr "开始一局新游戏。"
+#: kbg.cpp:108
+msgid "&Engine"
+msgstr "引擎(&E)"
 
-#: engines/gnubg/kbggnubg.cpp:382
-msgid "GNU Engine"
-msgstr "GNU 引擎"
+#: kbg.cpp:124
+msgid "Double Cube"
+msgstr "加倍立方体"
 
-#: engines/gnubg/kbggnubg.cpp:382
-msgid "Here you can configure the GNU backgammon engine"
-msgstr "在此您可以配置 GNU 西洋双陆棋引擎"
+#: kbg.cpp:133
+msgid "&Backgammon on the Web"
+msgstr "Web 上的西洋双陆棋(&B)"
 
-#: engines/gnubg/kbggnubg.cpp:442
-msgid "&Restart GNU Backgammon"
-msgstr "重新启动 GNU 西洋双陆棋(&R)"
+#: kbg.cpp:145
+msgid "Command: "
+msgstr "命令："
 
-#: engines/gnubg/kbggnubg.cpp:474
+#: kbg.cpp:182
 msgid ""
-"This is experimental code which currently requires a specially patched version "
-"of GNU Backgammon."
-"<br/>"
-"<br/>"
-msgstr "这是个试验性的代码，目前需要一个打过特别补丁的 GNU 西洋双陆棋程序。<br/><br/>"
+"This area contains the status messages for the game. Most of these messages are "
+"sent to you from the current engine."
+msgstr "这个区域显示游戏的状态信息，多数都是从当前引擎发送给您的。"
 
-#: engines/gnubg/kbggnubg.cpp:507
+#: kbg.cpp:186
 msgid ""
-"Could not start the GNU Backgammon process.\n"
-"Make sure the program is in your PATH and is called \"gnubg\".\n"
-"Make sure that your copy is at least version 0.10"
-msgstr ""
-"无法运行 GNU 西洋双陆棋程序。\n"
-"请确认该程序是“gnubg”，并且位于您的路径中。\n"
-"请确认您系统中的该程序至少是 0.10 版。"
-
-#: engines/gnubg/kbggnubg.cpp:535
-msgid "The GNU Backgammon process (%1) has exited. "
-msgstr "GNU 西洋双陆棋进程 (%1) 已退出。"
-
-#: engines/nextgen/kbgng.cpp:63
-msgid "Local Games"
-msgstr "本地游戏"
-
-#: engines/nextgen/kbgng.cpp:64
-msgid "Offer Network Games"
-msgstr "离线网络游戏"
-
-#: engines/nextgen/kbgng.cpp:65
-msgid "Join Network Games"
-msgstr "加入网络游戏"
-
-#: engines/nextgen/kbgng.cpp:71
-msgid "&Types"
-msgstr "类型(&T)"
-
-#: engines/nextgen/kbgng.cpp:77
-msgid "&Names..."
-msgstr "名称(&N)..."
+"This is the command line. You can type special commands related to the current "
+"engine in here. Most relevant commands are also available through the menus."
+msgstr "这是命令行。您可以在此输入和当前引擎有关的特殊命令。大多数命令也可以用菜单直接使用。"
 
-#: engines/nextgen/kbgng.cpp:138
+#: kbg.cpp:191
 msgid ""
-"Type the port number on which you want to listen to connections.\n"
-"The number should be between 1024 and 65535."
-msgstr ""
-"输入您要监听网络连接的端口号。\n"
-"该号码必须在 1024 和 65535 之间。"
-
-#: engines/nextgen/kbgng.cpp:150
-#, c-format
-msgid "Now waiting for incoming connections on port %1."
-msgstr "现在正在监听端口 %1 上的网络连接。"
-
-#: engines/nextgen/kbgng.cpp:153
-#, c-format
-msgid "Failed to offer connections on port %1."
-msgstr "在端口 %1 上提供连接失败。"
-
-#: engines/nextgen/kbgng.cpp:159
-#, fuzzy
-msgid "Type the name of the server you want to connect to:"
-msgstr "输入您想要连接的服务器名字。"
+"This is the button bar tool bar. It gives you easy access to game related "
+"commands. You can drag the bar to a different location within the window."
+msgstr "这是工具按钮栏。它让您轻松使用游戏中的命令。您可以把工具栏拖动到窗口内的不同位置。"
 
-#: engines/nextgen/kbgng.cpp:167
+#: kbg.cpp:196
 msgid ""
-"Type the port number on %1 you want to connect to.\n"
-"The number should be between 1024 and 65535."
-msgstr ""
-"输入您想要连接的服务器 %1 上的端口号。\n"
-"此号码必须在 1024 和 65535 之间。"
-
-#: engines/nextgen/kbgng.cpp:186
-msgid "Now connected to %1:%2."
-msgstr "现在已连接到 %1:%2。"
-
-#: engines/nextgen/kbgng.cpp:189
-msgid "Failed to connect to %1:%2."
-msgstr "连接到 %1:%2 失败。"
+"This is the status bar. It shows you the currently selected engine in the left "
+"corner."
+msgstr "这是状态栏。它在左边角落显示当前选中的引擎。"
 
-#: engines/nextgen/kbgng.cpp:210 engines/nextgen/kbgng.cpp:211
-msgid "Player %1 (%2) has joined the game."
-msgstr "玩家 %1 (%2) 已加入游戏。"
+#: kbg.cpp:509
+msgid "General"
+msgstr "常规"
 
-#: engines/nextgen/kbgng.cpp:219
+#: kbg.cpp:509
 #, c-format
-msgid "creating player. virtual=%1"
-msgstr "正在创建玩家。virtual=%1"
-
-#: engines/nextgen/kbgng.cpp:456
-msgid "one"
-msgstr "一"
-
-#: engines/nextgen/kbgng.cpp:457
-msgid "two"
-msgstr "二"
-
-#: engines/nextgen/kbgng.cpp:509
-msgid "Player %1 has changed the name to %2."
-msgstr "玩家 %1 已经改名为 %2。"
-
-#: engines/nextgen/kbgng.cpp:548
-#, fuzzy
-msgid "Type the name of the first player:"
-msgstr "输入第一个玩家的名字。"
-
-#: engines/nextgen/kbgng.cpp:551
-#, fuzzy
-msgid "Type the name of the second player:"
-msgstr "输入第二个玩家的名字。"
-
-#: engines/nextgen/kbgng.cpp:570
-msgid "Players are %1 and %2"
-msgstr "玩家为%1和%2"
-
-#: engines/offline/kbgoffline.cpp:123
-msgid "&New Game..."
-msgstr "新建游戏(&N)..."
-
-#: engines/offline/kbgoffline.cpp:124
-msgid "&Swap Colors"
-msgstr "对换颜色(&S)"
-
-#: engines/offline/kbgoffline.cpp:126
-msgid "&Edit Mode"
-msgstr "编辑方式(&E)"
-
-#: engines/offline/kbgoffline.cpp:182
-msgid "Offline Engine"
-msgstr "离线引擎"
-
-#: engines/offline/kbgoffline.cpp:182
-msgid "Use this to configure the Offline engine"
-msgstr "此处配置离线引擎"
-
-#: engines/offline/kbgoffline.cpp:199
-msgid "Names"
-msgstr "名称"
-
-#: engines/offline/kbgoffline.cpp:209
-msgid "First player:"
-msgstr "第一个玩家："
-
-#: engines/offline/kbgoffline.cpp:210
-msgid "Second player:"
-msgstr "第二个玩家："
-
-#: engines/offline/kbgoffline.cpp:217
-msgid "Enter the name of the first player."
-msgstr "输入第一个玩家的名字。"
-
-#: engines/offline/kbgoffline.cpp:218
-msgid "Enter the name of the second player."
-msgstr "输入第二个玩家的名字。"
-
-#: engines/offline/kbgoffline.cpp:224
-msgid "&Player Names"
-msgstr "玩家名字(&P)"
-
-#: engines/offline/kbgoffline.cpp:237 engines/offline/kbgoffline.cpp:253
-msgid "South"
-msgstr "南"
+msgid "Here you can configure general settings of %1"
+msgstr "在此您可以配置 %1 的常规设置"
 
-#: engines/offline/kbgoffline.cpp:238 engines/offline/kbgoffline.cpp:254
-msgid "North"
-msgstr "北"
+#: kbg.cpp:516
+msgid "Messages"
+msgstr "消息"
 
-#: engines/offline/kbgoffline.cpp:320
-msgid "%1 rolls %2, %3 rolls %4."
-msgstr "%1掷出 %2 点，%3掷出 %4 点。"
+#: kbg.cpp:517
+msgid "Timer"
+msgstr "定时器"
 
-#: engines/offline/kbgoffline.cpp:325 engines/offline/kbgoffline.cpp:328
-msgid "%1 makes the first move."
-msgstr "%1先移动。"
+#: kbg.cpp:518
+msgid "Autosave"
+msgstr "自动保存"
 
-#: engines/offline/kbgoffline.cpp:391
-msgid ""
-"Please enter the nickname of the player whose home\n"
-"is in the lower half of the board:"
-msgstr "请输入老家位于棋盘下方的玩家的昵称："
+#: kbg.cpp:519
+msgid "Events"
+msgstr "事件"
 
-#: engines/offline/kbgoffline.cpp:395
+#: kbg.cpp:524
 msgid ""
-"Please enter the nickname of the player whose home\n"
-"is in the upper half of the board:"
-msgstr "请输入老家位于棋盘上方的玩家的昵称："
-
-#: engines/offline/kbgoffline.cpp:424 engines/offline/kbgoffline.cpp:656
-msgid "%1 wins the game. Congratulations!"
-msgstr "%1赢得比赛。恭喜！"
-
-#: engines/offline/kbgoffline.cpp:443
-msgid "%1, please roll or double."
-msgstr "%1，请掷骰子或加倍。"
-
-#: engines/offline/kbgoffline.cpp:562
-msgid "It's not your turn to roll!"
-msgstr "还没轮到你掷骰子！"
+"After you finished your moves, they have to be sent to the engine. You can "
+"either do that manually (in which case you should not enable this feature), or "
+"you can specify an amount of time that has to pass before the move is "
+"committed. If you undo a move during the timeout, the timeout will be reset and "
+"restarted once you finish the move. This is very useful if you would like to "
+"review the result of your move."
+msgstr ""
+"当您完成移动后，此移动信息需要发送到引擎。您可以手工发送(这样您不需要启用这个功能)，或者您可以指定移动信息发送前等待的时间长度。如果您在此时间内撤消移动，这个"
+"等待时间将被重置，并在移动完成后再重新开始计时。当您需要复查移动结果的时候这非常有用。"
 
-#: engines/offline/kbgoffline.cpp:614
-msgid "Game over!"
-msgstr "游戏结束！"
+#: kbg.cpp:531
+msgid "Enable timeout"
+msgstr "启用定时提交"
 
-#: engines/offline/kbgoffline.cpp:621
-msgid "%1, you cannot move."
-msgstr "%1，你不可移动。"
+#: kbg.cpp:536
+msgid "Move timeout in seconds:"
+msgstr "提交移动前的等待时间(秒)："
 
-#: engines/offline/kbgoffline.cpp:630
-#, fuzzy, c-format
+#: kbg.cpp:549
 msgid ""
-"_n: , please move 1 piece.\n"
-", please move %n pieces."
-msgstr "%1，请移动 %2 个棋子。"
-
-#: engines/offline/kbgoffline.cpp:649
-msgid "%1 has doubled. %2, do you accept the double?"
-msgstr "%1已加倍。%2，你接受加倍吗？"
+"Check the box to enable all the messages that you have previously disabled by "
+"choosing the \"Don't show this message again\" option."
+msgstr "选中此项可以开启您以前用“不再显示此消息”选项关闭显示的所有消息。"
 
-#: engines/offline/kbgoffline.cpp:652
-msgid "Doubling"
-msgstr "加倍"
+#: kbg.cpp:553
+msgid "Reenable all messages"
+msgstr "重新开启全部消息"
 
-#: engines/offline/kbgoffline.cpp:661
-msgid "%1 has accepted the double. The game continues."
-msgstr "%1已接受加倍，游戏继续进行。"
+#: kbg.cpp:559
+msgid ""
+"Check the box to automatically save all window positions on program exit. They "
+"will be restored at next start."
+msgstr "选中此项可以在程序退出时自动保存所有窗口的位置，下次运行时自动恢复。"
 
-#: engines/offline/kbgoffline.cpp:699
-msgid "In the middle of a game. Really quit?"
-msgstr "游戏尚在进行中，确实要退出？"
+#: kbg.cpp:563
+msgid "Save settings on exit"
+msgstr "退出时保存设置"
 
-#: engines/offline/kbgoffline.cpp:724
-msgid "Text commands are not yet working. The command '%1' has been ignored."
-msgstr "文本命令还不能用。命令“%1”被忽略。"
+#: kbg.cpp:570
+msgid ""
+"Event notification of %1 is configured as part of the system-wide notification "
+"process. Click here, and you will be able to configure system sounds, etc."
+msgstr "%1事件通知可作为整个系统通知处理的一部分来配置。点击此处您将可以配置系统声音等选项。"
 
-#: engines/offline/kbgoffline.cpp:794
-msgid "%1 vs. %2 - Edit Mode"
-msgstr "%1 对 %2 — 编辑方式"
+#: kbg.cpp:577
+msgid "Klick here to configure the event notification"
+msgstr "点击此处配置事件通知"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "TDE 中文翻译组"
+#: kbg.cpp:649
+#, c-format
+msgid "Print %1"
+msgstr "打印 %1"
 
-#: _translatorinfo.cpp:3
+#: kbg.cpp:671
 msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "i18n-translation@lists.linux.net.cn"
+"You can enable the menubar again with the right mouse button menu of the board."
+msgstr "您可以通过鼠标右键点击棋盘弹出的菜单启用菜单栏。"
 
 #: main.cpp:31
 msgid "A Backgammon program for TDE"
@@ -1508,24 +1527,6 @@ msgstr "作者和维护者"
 msgid "Initial anti-aliasing of the board"
 msgstr "棋盘最初的锯齿平滑"
 
-#. i18n: file kbackgammonui.rc line 5
-#: rc.cpp:3
-#, no-c-format
-msgid "&Move"
-msgstr "移动(&M)"
-
-#. i18n: file kbackgammonui.rc line 10
-#: rc.cpp:6
-#, no-c-format
-msgid "&Command"
-msgstr "命令(&C)"
-
-#. i18n: file kbackgammonui.rc line 32
-#: rc.cpp:18
-#, no-c-format
-msgid "Command Toolbar"
-msgstr "命令工具栏"
-
 #~ msgid "Type the name of the %1 player."
 #~ msgstr "输入 %1 玩家的名字。"
 
diff --git a/tde-i18n-zh_CN/messages/tdegames/kbattleship.po b/tde-i18n-zh_CN/messages/tdegames/kbattleship.po
index ef0ebc7ab14..1ae48d8faf9 100644
--- a/tde-i18n-zh_CN/messages/tdegames/kbattleship.po
+++ b/tde-i18n-zh_CN/messages/tdegames/kbattleship.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kbattleship\n"
-"POT-Creation-Date: 2008-07-08 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2003-01-15 20:51-0500\n"
 "Last-Translator: Albert.Lew <albert_lew2002@eyou.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegames/kblackbox.po b/tde-i18n-zh_CN/messages/tdegames/kblackbox.po
index 2edfd02bf3a..d5ec534e473 100644
--- a/tde-i18n-zh_CN/messages/tdegames/kblackbox.po
+++ b/tde-i18n-zh_CN/messages/tdegames/kblackbox.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kblackbox\n"
-"POT-Creation-Date: 2005-07-24 01:33+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2003-01-15 20:54-0500\n"
 "Last-Translator: Wang Jian <lark@linux.ustc.edu.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegames/kbounce.po b/tde-i18n-zh_CN/messages/tdegames/kbounce.po
index 62d91bbab59..647c9f871e8 100644
--- a/tde-i18n-zh_CN/messages/tdegames/kbounce.po
+++ b/tde-i18n-zh_CN/messages/tdegames/kbounce.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kbounce\n"
-"POT-Creation-Date: 2005-07-01 01:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-01-17 07:22+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -130,18 +131,18 @@ msgstr ""
 msgid "On to level %1. Remember you get %2 lives this time!"
 msgstr "进入级别 %1。记住你这次有 %2 条命！"
 
-#: main.cpp:38
+#: main.cpp:40
 msgid "TDE Bounce Ball Game"
 msgstr "TDE 弹跳球游戏"
 
-#: main.cpp:45
+#: main.cpp:47
 msgid "KBounce"
 msgstr "KBounce"
 
-#: main.cpp:49
+#: main.cpp:51
 msgid "Original author"
 msgstr "原作者"
 
-#: main.cpp:51
+#: main.cpp:53
 msgid "Contributions"
 msgstr "贡献"
diff --git a/tde-i18n-zh_CN/messages/tdegames/kenolaba.po b/tde-i18n-zh_CN/messages/tdegames/kenolaba.po
index fb7cc315bce..e267ecb59b4 100644
--- a/tde-i18n-zh_CN/messages/tdegames/kenolaba.po
+++ b/tde-i18n-zh_CN/messages/tdegames/kenolaba.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kenolaba\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-01-17 07:23+0800\n"
 "Last-Translator: Wang Jian <larkw@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegames/kfouleggs.po b/tde-i18n-zh_CN/messages/tdegames/kfouleggs.po
index 2f64ccbc3fe..c25d8be1472 100644
--- a/tde-i18n-zh_CN/messages/tdegames/kfouleggs.po
+++ b/tde-i18n-zh_CN/messages/tdegames/kfouleggs.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kfouleggs\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-07-04 13:49+0800\n"
 "Last-Translator: Funda Wang <fundawang@en2china.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegames/kjumpingcube.po b/tde-i18n-zh_CN/messages/tdegames/kjumpingcube.po
index 5bee20bf9b0..df61e79b5c7 100644
--- a/tde-i18n-zh_CN/messages/tdegames/kjumpingcube.po
+++ b/tde-i18n-zh_CN/messages/tdegames/kjumpingcube.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2008-07-08 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-02-16 12:55+0800\n"
 "Last-Translator: zhang yue <zhangyue911@hotmail.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegames/klickety.po b/tde-i18n-zh_CN/messages/tdegames/klickety.po
index f2e2d4a6370..a5ec728f6f5 100644
--- a/tde-i18n-zh_CN/messages/tdegames/klickety.po
+++ b/tde-i18n-zh_CN/messages/tdegames/klickety.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klickety\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2003-07-12 17:19+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegames/klines.po b/tde-i18n-zh_CN/messages/tdegames/klines.po
index f22315ded98..468922972d2 100644
--- a/tde-i18n-zh_CN/messages/tdegames/klines.po
+++ b/tde-i18n-zh_CN/messages/tdegames/klines.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klines\n"
-"POT-Creation-Date: 2005-07-03 01:31+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-01-17 07:26+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegames/kmahjongg.po b/tde-i18n-zh_CN/messages/tdegames/kmahjongg.po
index 562696a0cb4..7ce2a2d7621 100644
--- a/tde-i18n-zh_CN/messages/tdegames/kmahjongg.po
+++ b/tde-i18n-zh_CN/messages/tdegames/kmahjongg.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmahjongg\n"
-"POT-Creation-Date: 2006-06-18 03:58+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-07-04 13:53+0800\n"
 "Last-Translator: Funda Wang <fundawang@en2china.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegames/kmines.po b/tde-i18n-zh_CN/messages/tdegames/kmines.po
index 814e5ed4dbf..93c874c962a 100644
--- a/tde-i18n-zh_CN/messages/tdegames/kmines.po
+++ b/tde-i18n-zh_CN/messages/tdegames/kmines.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmines\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-07-04 13:48+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegames/kolf.po b/tde-i18n-zh_CN/messages/tdegames/kolf.po
index 0e927a25736..768755af086 100644
--- a/tde-i18n-zh_CN/messages/tdegames/kolf.po
+++ b/tde-i18n-zh_CN/messages/tdegames/kolf.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kolf\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-01-17 07:42+0800\n"
 "Last-Translator: Zong Yaotang <zong@cosix.com.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -553,38 +554,38 @@ msgstr "不可移动"
 msgid "Whether or not this slope can be moved by other objects, like floaters."
 msgstr "这个斜坡是否能被其它物体(比如浮台)推动。"
 
-#: game.h:231
+#: game.h:232
 msgid "Puddle"
 msgstr "水坑"
 
-#: game.h:244
+#: game.h:245
 msgid "Sand"
 msgstr "沙地"
 
-#: game.h:281
+#: game.h:282
 msgid "Bumper"
 msgstr "反弹柱"
 
-#: game.h:312
+#: game.h:313
 msgid "Cup"
 msgstr "球洞"
 
-#: game.h:421
+#: game.h:425
 msgid "Black Hole"
 msgstr "黑洞"
 
-#: game.h:500
+#: game.h:504
 msgid "Wall"
 msgstr "短墙"
 
-#: game.h:608
+#: game.h:613
 msgid "Bridge"
 msgstr "桥"
 
-#: game.h:645
+#: game.h:651
 msgid "Sign"
 msgstr "标志"
 
-#: game.h:703
+#: game.h:710
 msgid "Windmill"
 msgstr "风车"
diff --git a/tde-i18n-zh_CN/messages/tdegames/konquest.po b/tde-i18n-zh_CN/messages/tdegames/konquest.po
index 013870096f8..dd7a2106881 100644
--- a/tde-i18n-zh_CN/messages/tdegames/konquest.po
+++ b/tde-i18n-zh_CN/messages/tdegames/konquest.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: konquest\n"
-"POT-Creation-Date: 2008-07-08 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-07-12 10:19+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegames/kpat.po b/tde-i18n-zh_CN/messages/tdegames/kpat.po
index e6385d2f1ac..29a9089f86c 100644
--- a/tde-i18n-zh_CN/messages/tdegames/kpat.po
+++ b/tde-i18n-zh_CN/messages/tdegames/kpat.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kpat.po\n"
-"POT-Creation-Date: 2006-10-12 02:36+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2003-01-07 17:24+0800\n"
 "Last-Translator: Funda Wang <fundawang@en2china.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegames/kpoker.po b/tde-i18n-zh_CN/messages/tdegames/kpoker.po
index 258e21f0c00..6fb2c273d55 100644
--- a/tde-i18n-zh_CN/messages/tdegames/kpoker.po
+++ b/tde-i18n-zh_CN/messages/tdegames/kpoker.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kpoker\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-08-21 17:37+0800\n"
 "Last-Translator: Funda Wang <fundawang@en2china.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegames/kreversi.po b/tde-i18n-zh_CN/messages/tdegames/kreversi.po
index a2533658735..5d062420331 100644
--- a/tde-i18n-zh_CN/messages/tdegames/kreversi.po
+++ b/tde-i18n-zh_CN/messages/tdegames/kreversi.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2008-07-08 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-08-21 17:36+0800\n"
 "Last-Translator: zhang yue <zhangyue911@hotmail.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,7 +31,7 @@ msgid ""
 "Your emails"
 msgstr "i18n-translation@lists.linux.net.cn"
 
-#: board.cpp:268
+#: board.cpp:267
 msgid "Click"
 msgstr "单击"
 
diff --git a/tde-i18n-zh_CN/messages/tdegames/ksame.po b/tde-i18n-zh_CN/messages/tdegames/ksame.po
index d024ba41d59..5d299ed650c 100644
--- a/tde-i18n-zh_CN/messages/tdegames/ksame.po
+++ b/tde-i18n-zh_CN/messages/tdegames/ksame.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksame\n"
-"POT-Creation-Date: 2005-07-24 01:33+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-01-17 07:18+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegames/kshisen.po b/tde-i18n-zh_CN/messages/tdegames/kshisen.po
index 2cf9ee19e96..506cd28d1ba 100644
--- a/tde-i18n-zh_CN/messages/tdegames/kshisen.po
+++ b/tde-i18n-zh_CN/messages/tdegames/kshisen.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kshisen\n"
-"POT-Creation-Date: 2006-06-12 04:03+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2003-01-17 16:39-0500\n"
 "Last-Translator: Wang Jian <lark@linux.ustc.edu.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -146,7 +147,8 @@ msgid "Game Paused"
 msgstr "游戏已暂停"
 
 #: app.cpp:80 app.cpp:340
-msgid " Cheat mode "
+#, fuzzy
+msgid " Hint mode "
 msgstr " 作弊模式 "
 
 #: app.cpp:123
diff --git a/tde-i18n-zh_CN/messages/tdegames/ksirtet.po b/tde-i18n-zh_CN/messages/tdegames/ksirtet.po
index 32122de0152..ff7f35a2d42 100644
--- a/tde-i18n-zh_CN/messages/tdegames/ksirtet.po
+++ b/tde-i18n-zh_CN/messages/tdegames/ksirtet.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-02-13 16:34+0800\n"
 "Last-Translator: zhang yue <zhangyue911@hotmail.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegames/ksmiletris.po b/tde-i18n-zh_CN/messages/tdegames/ksmiletris.po
index 1904b1d30ed..caeff7e1555 100644
--- a/tde-i18n-zh_CN/messages/tdegames/ksmiletris.po
+++ b/tde-i18n-zh_CN/messages/tdegames/ksmiletris.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksmiletris\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2003-01-15 21:55-0500\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegames/ksnake.po b/tde-i18n-zh_CN/messages/tdegames/ksnake.po
index 52fdc6006e2..4e905b009b5 100644
--- a/tde-i18n-zh_CN/messages/tdegames/ksnake.po
+++ b/tde-i18n-zh_CN/messages/tdegames/ksnake.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksnake\n"
-"POT-Creation-Date: 2008-07-08 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-07-04 13:31+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegames/ksokoban.po b/tde-i18n-zh_CN/messages/tdegames/ksokoban.po
index beb83f23398..56735e5bc46 100644
--- a/tde-i18n-zh_CN/messages/tdegames/ksokoban.po
+++ b/tde-i18n-zh_CN/messages/tdegames/ksokoban.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksokoban\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2003-01-15 22:01-0500\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegames/kspaceduel.po b/tde-i18n-zh_CN/messages/tdegames/kspaceduel.po
index a0212135f12..326cd1b45b1 100644
--- a/tde-i18n-zh_CN/messages/tdegames/kspaceduel.po
+++ b/tde-i18n-zh_CN/messages/tdegames/kspaceduel.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kspaceduel\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-07-12 10:28+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegames/ktron.po b/tde-i18n-zh_CN/messages/tdegames/ktron.po
index 735a2b641d1..c6c44d9a013 100644
--- a/tde-i18n-zh_CN/messages/tdegames/ktron.po
+++ b/tde-i18n-zh_CN/messages/tdegames/ktron.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2008-07-08 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-07-04 13:27+0800\n"
 "Last-Translator: zhang yue <zhangyue911@hotmail.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegames/ktuberling.po b/tde-i18n-zh_CN/messages/tdegames/ktuberling.po
index 136139de895..0b396dbf674 100644
--- a/tde-i18n-zh_CN/messages/tdegames/ktuberling.po
+++ b/tde-i18n-zh_CN/messages/tdegames/ktuberling.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ktuberling\n"
-"POT-Creation-Date: 2006-08-13 04:05+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-01-17 07:24+0800\n"
 "Last-Translator: Funda Wang <fundawang@en2china.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegames/libksirtet.po b/tde-i18n-zh_CN/messages/tdegames/libksirtet.po
index e0b3c401375..9fd5401b664 100644
--- a/tde-i18n-zh_CN/messages/tdegames/libksirtet.po
+++ b/tde-i18n-zh_CN/messages/tdegames/libksirtet.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2005-11-30 03:21+0100\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-02-13 16:44+0800\n"
 "Last-Translator: zhang yue <zhangyue911@hotmail.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegames/libtdegames.po b/tde-i18n-zh_CN/messages/tdegames/libtdegames.po
index f6deaabb497..4affbffb2be 100644
--- a/tde-i18n-zh_CN/messages/tdegames/libtdegames.po
+++ b/tde-i18n-zh_CN/messages/tdegames/libtdegames.po
@@ -7,15 +7,249 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libtdegames\n"
-"POT-Creation-Date: 2006-12-21 02:39+0100\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-01-17 07:35+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
+#: kgamemisc.cpp:55
+msgid ""
+"_: A list of language typical names ( for games ), separated by spaces\n"
+"Adam Alex Andreas Andrew Bart Ben Bernd Bill Chris Chuck Daniel Don Duncan Ed "
+"Emily Eric Gary Greg Harry Ian Jean Jeff Jan Kai Keith Ken Kirk Marc Mike Neil "
+"Paul Rik Robert Sam Sean Thomas Tim Walter"
+msgstr ""
+"Adam Alex Andreas Andrew Bart Ben Bernd Bill Chris Chuck Daniel Don Duncan Ed "
+"Emily Eric Gary Greg Harry Ian Jean Jeff Jan Kai Keith Ken Kirk Marc Mike Neil "
+"Paul Rik Robert Sam Sean Thomas Tim Walter"
+
+#: kcarddialog.cpp:277
+msgid "Choose Backside"
+msgstr "选择背面"
+
+#: kcarddialog.cpp:297
+msgid "Backside"
+msgstr "背面"
+
+#: kcarddialog.cpp:301 kcarddialog.cpp:351
+msgid "empty"
+msgstr "空"
+
+#: kcarddialog.cpp:309
+msgid "Random backside"
+msgstr "随机背面"
+
+#: kcarddialog.cpp:314
+msgid "Use global backside"
+msgstr "使用全局背面"
+
+#: kcarddialog.cpp:317
+msgid "Make Backside Global"
+msgstr "设定背面为全局"
+
+#: kcarddialog.cpp:329
+msgid "Choose Frontside"
+msgstr "选择正面"
+
+#: kcarddialog.cpp:347
+msgid "Frontside"
+msgstr "正面"
+
+#: kcarddialog.cpp:359
+msgid "Random frontside"
+msgstr "随机正面"
+
+#: kcarddialog.cpp:364
+msgid "Use global frontside"
+msgstr "使用全局正面"
+
+#: kcarddialog.cpp:367
+msgid "Make Frontside Global"
+msgstr "设定正面为全局"
+
+#: kcarddialog.cpp:426
+msgid "Resize Cards"
+msgstr "改变牌的大小"
+
+#: kcarddialog.cpp:439
+msgid "Default Size"
+msgstr "默认大小"
+
+#: kcarddialog.cpp:443
+msgid "Preview:"
+msgstr "预览："
+
+#: kcarddialog.cpp:476 kcarddialog.cpp:511
+msgid "unnamed"
+msgstr "未命名"
+
+#: kcarddialog.cpp:532
+msgid "Carddeck Selection"
+msgstr "选择牌垛"
+
+#: kchatdialog.cpp:60 kchatdialog.cpp:68
+msgid "Configure Chat"
+msgstr "配置聊天"
+
+#: kchatdialog.cpp:86 kchatdialog.cpp:108
+msgid "Name Font..."
+msgstr "名字字体..."
+
+#: kchatdialog.cpp:89 kchatdialog.cpp:111
+msgid "Text Font..."
+msgstr "文本字体..."
+
+#: kchatdialog.cpp:98
+msgid "Player: "
+msgstr "玩家："
+
+#: kchatdialog.cpp:100
+msgid "This is a player message"
+msgstr "这是一条玩家讯息"
+
+#: kchatdialog.cpp:106
+msgid "System Messages - Messages directly sent from the game"
+msgstr "系统讯息 — 由游戏直接发出的讯息"
+
+#: kchatdialog.cpp:120
+msgid "--- Game: "
+msgstr "--- 游戏："
+
+#: kchatdialog.cpp:122
+msgid "This is a system message"
+msgstr "这是一条系统讯息"
+
+#: kchatdialog.cpp:126
+msgid "Maximal number of messages (-1 = unlimited):"
+msgstr "最大讯息数目(-1 = 无限)："
+
+#: kstdgameaction.cpp:60
+msgid ""
+"_: new game\n"
+"&New"
+msgstr "新建(&N)"
+
+#: kstdgameaction.cpp:61
+msgid "&Load..."
+msgstr "载入(&L)..."
+
+#: kstdgameaction.cpp:62
+msgid "Load &Recent"
+msgstr "载入最近的(&R)"
+
+#: kstdgameaction.cpp:63
+msgid "Restart &Game"
+msgstr "重新开始游戏(&G)"
+
+#: kstdgameaction.cpp:65
+msgid "Save &As..."
+msgstr "另存为(&A)..."
+
+#: kstdgameaction.cpp:66
+msgid "&End Game"
+msgstr "结束游戏(&E)"
+
+#: kstdgameaction.cpp:67
+msgid "Pa&use"
+msgstr "暂停(&U)"
+
+#: kstdgameaction.cpp:68
+msgid "Show &Highscores"
+msgstr "显示排行榜(&H)"
+
+#: kstdgameaction.cpp:72
+msgid "Repeat"
+msgstr "重复"
+
+#: kstdgameaction.cpp:73
+msgid "Und&o"
+msgstr "撤消(&O)"
+
+#: kstdgameaction.cpp:74
+msgid "Re&do"
+msgstr "重做(&D)"
+
+#: kstdgameaction.cpp:75
+msgid "&Roll Dice"
+msgstr "掷骰子(&R)"
+
+#: kstdgameaction.cpp:76
+msgid "End Turn"
+msgstr "结束回合"
+
+#: kstdgameaction.cpp:77
+msgid "&Hint"
+msgstr "提示(&H)"
+
+#: kstdgameaction.cpp:78
+msgid "&Demo"
+msgstr "演示(&D)"
+
+#: kstdgameaction.cpp:79
+msgid "&Solve"
+msgstr "解决(&S)"
+
+#: kstdgameaction.cpp:81
+msgid "Choose Game &Type"
+msgstr "选择游戏类型(&T)"
+
+#: kstdgameaction.cpp:82
+msgid "Configure &Carddecks..."
+msgstr "配置牌垛(&C)..."
+
+#: kstdgameaction.cpp:83
+msgid "Configure &Highscores..."
+msgstr "配置排行榜(&H)..."
+
+#: kchat.cpp:85 kgame/dialogs/kgamedebugdialog.cpp:497 kgame/kgamechat.cpp:103
+#: kgame/kgamepropertyhandler.cpp:382
+msgid "Unknown"
+msgstr "未知"
+
+#: kgame/kgameerror.cpp:63
+msgid ""
+"Cookie mismatch!\n"
+"Expected Cookie: %1\n"
+"Received Cookie: %2"
+msgstr ""
+"Cookie不符！\n"
+"期望的Cookie：%1\n"
+"接收到的Cookie：%2"
+
+#: kgame/kgameerror.cpp:72
+msgid ""
+"KGame Version mismatch!\n"
+"Expected Version: %1\n"
+"Received Version: %2\n"
+msgstr ""
+"KGame 版本不符！\n"
+"期望的版本：%1\n"
+"接收到的版本：%2\n"
+
+#: kgame/kgameerror.cpp:76
+#, c-format
+msgid "Unknown error code %1"
+msgstr "未知错误码 %1"
+
+#: kgame/kgamechat.cpp:95
+#, c-format
+msgid "Player %1"
+msgstr "玩家 %1"
+
+#: kchatbase.cpp:409 kgame/kgamechat.cpp:168
+#, c-format
+msgid "Send to %1"
+msgstr "发送给 %1"
+
+#: kgame/kgamechat.cpp:214
+msgid "Send to My Group (\"%1\")"
+msgstr "发送到我的组(“%1”)"
+
 #: kgame/kplayer.cpp:91
 msgid "UserId"
 msgstr "用户ID"
@@ -41,6 +275,235 @@ msgstr "异步输入"
 msgid "myTurn"
 msgstr "我的回合"
 
+#: kgame/kgamemessage.cpp:115
+msgid "Setup Game"
+msgstr "设置游戏"
+
+#: kgame/kgamemessage.cpp:117
+msgid "Setup Game Continue"
+msgstr "设置游戏继续"
+
+#: kgame/kgamemessage.cpp:119
+msgid "Load Game"
+msgstr "载入游戏"
+
+#: kgame/kgamemessage.cpp:121
+msgid "Client game connected"
+msgstr "客户端游戏已连接"
+
+#: kgame/kgamemessage.cpp:123
+msgid "Game setup done"
+msgstr "游戏设置完毕"
+
+#: kgame/kgamemessage.cpp:125
+msgid "Synchronize Random"
+msgstr "同步随机"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:132 kgame/kgamemessage.cpp:127
+msgid "Disconnect"
+msgstr "断开连接"
+
+#: kgame/kgamemessage.cpp:129
+msgid "Player Property"
+msgstr "玩家属性"
+
+#: kgame/kgamemessage.cpp:131
+msgid "Game Property"
+msgstr "游戏属性"
+
+#: kgame/kgamemessage.cpp:133
+msgid "Add Player"
+msgstr "添加玩家"
+
+#: kgame/kgamemessage.cpp:135
+msgid "Remove Player"
+msgstr "删除玩家"
+
+#: kgame/kgamemessage.cpp:137
+msgid "Activate Player"
+msgstr "激活玩家"
+
+#: kgame/kgamemessage.cpp:139
+msgid "Inactivate Player"
+msgstr "停止玩家"
+
+#: kgame/kgamemessage.cpp:141
+msgid "Id Turn"
+msgstr "Id 回合"
+
+#: kgame/kgamemessage.cpp:143
+msgid "Error Message"
+msgstr "错误讯息"
+
+#: kgame/kgamemessage.cpp:145
+msgid "Player Input"
+msgstr "玩家输入"
+
+#: kgame/kgamemessage.cpp:147
+msgid "An IO was added"
+msgstr "加入了一个IO"
+
+#: kgame/kgamemessage.cpp:149
+msgid "Process Query"
+msgstr "进程查询"
+
+#: kgame/dialogs/kgamedebugdialog.cpp:207 kgame/kgamemessage.cpp:151
+msgid "Player ID"
+msgstr "玩家 ID"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:136
+msgid "Network Configuration"
+msgstr "网络配置"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:194
+msgid "Cannot connect to the network"
+msgstr "无法连接网络"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:200
+msgid "Network status: No Network"
+msgstr "网络状态：没有网络连接"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:206
+msgid "Network status: You are MASTER"
+msgstr "网络状态：您是主人"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:208
+msgid "Network status: You are connected"
+msgstr "网络状态：已连接"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:276
+msgid "Your name:"
+msgstr "您的名字："
+
+#: kgame/dialogs/kgamedialogconfig.cpp:436
+msgid "Maximal Number of Clients"
+msgstr "最大客户机数目"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:440
+msgid "Maximal number of clients (-1 = infinite):"
+msgstr "最大客户机数目(-1 = 无限)："
+
+#: kgame/dialogs/kgamedialogconfig.cpp:490
+msgid "Change Maximal Number of Clients"
+msgstr "改变最大客户机数目"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:492
+msgid "Change Admin"
+msgstr "改变管理员"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:494
+msgid "Remove Client with All Players"
+msgstr "删除客户机及其所有玩家"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:512
+msgid "Only the admin can configure the message server!"
+msgstr "只有管理员才可以配置讯息服务器！"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:523
+msgid "You don't own the message server"
+msgstr "您不是讯息服务器的所有者"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:556
+msgid "Chat"
+msgstr "聊天"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:609
+msgid "Connected Players"
+msgstr "在线玩家"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:746
+msgid "Do you want to ban player \"%1\" from the game?"
+msgstr "您想将玩家“%1”踢出游戏吗？"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:747
+msgid "Ban Player"
+msgstr "踢出玩家"
+
+#: kgame/dialogs/kgamedialogconfig.cpp:747
+msgid "Do Not Ban"
+msgstr "不踢"
+
+#: kgame/dialogs/kgamedialog.cpp:118
+msgid "&Chat"
+msgstr "聊天(&C)"
+
+#: kgame/dialogs/kgamedialog.cpp:129
+msgid "C&onnections"
+msgstr "连接(&O)"
+
+#: kgame/dialogs/kgamedialog.cpp:157
+msgid "&Network"
+msgstr "网络(&N)"
+
+#: kgame/dialogs/kgamedialog.cpp:165
+msgid "&Message Server"
+msgstr "迅息服务器(&M)"
+
+#: kgame/dialogs/kgameerrordialog.cpp:80
+msgid "Connection to the server has been lost!"
+msgstr "到服务器的连接已断开！"
+
+#: kgame/dialogs/kgameerrordialog.cpp:93
+msgid "Connection to client has been lost!"
+msgstr "到客户端的连接已断开！"
+
+#: kgame/dialogs/kgameerrordialog.cpp:99
+msgid ""
+"Received a network error!\n"
+"Error number: %1\n"
+"Error message: %2"
+msgstr ""
+"接收到一个网络错误！\n"
+"错误号：%1\n"
+"错误讯息：%2"
+
+#: kgame/dialogs/kgameerrordialog.cpp:107
+msgid "No connection could be created."
+msgstr "无法创建连接。"
+
+#: kgame/dialogs/kgameerrordialog.cpp:109
+#, c-format
+msgid ""
+"No connection could be created.\n"
+"The error message was:\n"
+"%1"
+msgstr ""
+"无法创建连接。\n"
+"错误讯息为：\n"
+"%1"
+
+#: kgame/dialogs/kgameconnectdialog.cpp:67
+msgid "Create a network game"
+msgstr "开始一局新的网络游戏"
+
+#: kgame/dialogs/kgameconnectdialog.cpp:68
+msgid "Join a network game"
+msgstr "加入一局网络游戏"
+
+#: kgame/dialogs/kgameconnectdialog.cpp:73
+msgid "Game name:"
+msgstr "游戏名称："
+
+#: kgame/dialogs/kgameconnectdialog.cpp:75
+msgid "Network games:"
+msgstr "网络游戏："
+
+#: kgame/dialogs/kgameconnectdialog.cpp:78
+msgid "Port to connect to:"
+msgstr "要连接的端口："
+
+#: kgame/dialogs/kgameconnectdialog.cpp:80
+msgid "Host to connect to:"
+msgstr "要连接的主机："
+
+#: kgame/dialogs/kgameconnectdialog.cpp:83
+msgid "&Start Network"
+msgstr "启动网络(&S)"
+
+#: kgame/dialogs/kgameconnectdialog.cpp:217
+msgid "Network Game"
+msgstr "网络游戏"
+
 #: kgame/dialogs/kgamedebugdialog.cpp:124
 msgid "KGame Debug Dialog"
 msgstr "KGame 调试对话框"
@@ -132,10 +595,6 @@ msgstr "可用玩家"
 msgid "Player Pointer"
 msgstr "玩家指针"
 
-#: kgame/dialogs/kgamedebugdialog.cpp:207 kgame/kgamemessage.cpp:151
-msgid "Player ID"
-msgstr "玩家 ID"
-
 #: kgame/dialogs/kgamedebugdialog.cpp:208
 msgid "Player Name"
 msgstr "玩家名字"
@@ -258,168 +717,6 @@ msgstr "本地"
 msgid "Undefined"
 msgstr "未定义"
 
-#: kchat.cpp:85 kgame/dialogs/kgamedebugdialog.cpp:497 kgame/kgamechat.cpp:103
-#: kgame/kgamepropertyhandler.cpp:382
-msgid "Unknown"
-msgstr "未知"
-
-#: kgame/dialogs/kgameerrordialog.cpp:80
-msgid "Connection to the server has been lost!"
-msgstr "到服务器的连接已断开！"
-
-#: kgame/dialogs/kgameerrordialog.cpp:93
-msgid "Connection to client has been lost!"
-msgstr "到客户端的连接已断开！"
-
-#: kgame/dialogs/kgameerrordialog.cpp:99
-msgid ""
-"Received a network error!\n"
-"Error number: %1\n"
-"Error message: %2"
-msgstr ""
-"接收到一个网络错误！\n"
-"错误号：%1\n"
-"错误讯息：%2"
-
-#: kgame/dialogs/kgameerrordialog.cpp:107
-msgid "No connection could be created."
-msgstr "无法创建连接。"
-
-#: kgame/dialogs/kgameerrordialog.cpp:109
-#, c-format
-msgid ""
-"No connection could be created.\n"
-"The error message was:\n"
-"%1"
-msgstr ""
-"无法创建连接。\n"
-"错误讯息为：\n"
-"%1"
-
-#: kgame/dialogs/kgamedialog.cpp:118
-msgid "&Chat"
-msgstr "聊天(&C)"
-
-#: kgame/dialogs/kgamedialog.cpp:129
-msgid "C&onnections"
-msgstr "连接(&O)"
-
-#: kgame/dialogs/kgamedialog.cpp:157
-msgid "&Network"
-msgstr "网络(&N)"
-
-#: kgame/dialogs/kgamedialog.cpp:165
-msgid "&Message Server"
-msgstr "迅息服务器(&M)"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:132 kgame/kgamemessage.cpp:127
-msgid "Disconnect"
-msgstr "断开连接"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:136
-msgid "Network Configuration"
-msgstr "网络配置"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:194
-msgid "Cannot connect to the network"
-msgstr "无法连接网络"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:200
-msgid "Network status: No Network"
-msgstr "网络状态：没有网络连接"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:206
-msgid "Network status: You are MASTER"
-msgstr "网络状态：您是主人"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:208
-msgid "Network status: You are connected"
-msgstr "网络状态：已连接"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:276
-msgid "Your name:"
-msgstr "您的名字："
-
-#: kgame/dialogs/kgamedialogconfig.cpp:436
-msgid "Maximal Number of Clients"
-msgstr "最大客户机数目"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:440
-msgid "Maximal number of clients (-1 = infinite):"
-msgstr "最大客户机数目(-1 = 无限)："
-
-#: kgame/dialogs/kgamedialogconfig.cpp:490
-msgid "Change Maximal Number of Clients"
-msgstr "改变最大客户机数目"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:492
-msgid "Change Admin"
-msgstr "改变管理员"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:494
-msgid "Remove Client with All Players"
-msgstr "删除客户机及其所有玩家"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:512
-msgid "Only the admin can configure the message server!"
-msgstr "只有管理员才可以配置讯息服务器！"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:523
-msgid "You don't own the message server"
-msgstr "您不是讯息服务器的所有者"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:556
-msgid "Chat"
-msgstr "聊天"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:609
-msgid "Connected Players"
-msgstr "在线玩家"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:746
-msgid "Do you want to ban player \"%1\" from the game?"
-msgstr "您想将玩家“%1”踢出游戏吗？"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:747
-msgid "Ban Player"
-msgstr "踢出玩家"
-
-#: kgame/dialogs/kgamedialogconfig.cpp:747
-msgid "Do Not Ban"
-msgstr "不踢"
-
-#: kgame/dialogs/kgameconnectdialog.cpp:67
-msgid "Create a network game"
-msgstr "开始一局新的网络游戏"
-
-#: kgame/dialogs/kgameconnectdialog.cpp:68
-msgid "Join a network game"
-msgstr "加入一局网络游戏"
-
-#: kgame/dialogs/kgameconnectdialog.cpp:73
-msgid "Game name:"
-msgstr "游戏名称："
-
-#: kgame/dialogs/kgameconnectdialog.cpp:75
-msgid "Network games:"
-msgstr "网络游戏："
-
-#: kgame/dialogs/kgameconnectdialog.cpp:78
-msgid "Port to connect to:"
-msgstr "要连接的端口："
-
-#: kgame/dialogs/kgameconnectdialog.cpp:80
-msgid "Host to connect to:"
-msgstr "要连接的主机："
-
-#: kgame/dialogs/kgameconnectdialog.cpp:83
-msgid "&Start Network"
-msgstr "启动网络(&S)"
-
-#: kgame/dialogs/kgameconnectdialog.cpp:217
-msgid "Network Game"
-msgstr "网络游戏"
-
 #: kgame/kgame.cpp:94
 msgid "MaxPlayers"
 msgstr "最大人数"
@@ -445,378 +742,18 @@ msgstr "未命名 - ID：%1"
 msgid "%1 unregistered"
 msgstr "%1 未注册"
 
-#: kgame/kgamemessage.cpp:115
-msgid "Setup Game"
-msgstr "设置游戏"
-
-#: kgame/kgamemessage.cpp:117
-msgid "Setup Game Continue"
-msgstr "设置游戏继续"
-
-#: kgame/kgamemessage.cpp:119
-msgid "Load Game"
-msgstr "载入游戏"
-
-#: kgame/kgamemessage.cpp:121
-msgid "Client game connected"
-msgstr "客户端游戏已连接"
-
-#: kgame/kgamemessage.cpp:123
-msgid "Game setup done"
-msgstr "游戏设置完毕"
-
-#: kgame/kgamemessage.cpp:125
-msgid "Synchronize Random"
-msgstr "同步随机"
-
-#: kgame/kgamemessage.cpp:129
-msgid "Player Property"
-msgstr "玩家属性"
-
-#: kgame/kgamemessage.cpp:131
-msgid "Game Property"
-msgstr "游戏属性"
-
-#: kgame/kgamemessage.cpp:133
-msgid "Add Player"
-msgstr "添加玩家"
-
-#: kgame/kgamemessage.cpp:135
-msgid "Remove Player"
-msgstr "删除玩家"
-
-#: kgame/kgamemessage.cpp:137
-msgid "Activate Player"
-msgstr "激活玩家"
-
-#: kgame/kgamemessage.cpp:139
-msgid "Inactivate Player"
-msgstr "停止玩家"
-
-#: kgame/kgamemessage.cpp:141
-msgid "Id Turn"
-msgstr "Id 回合"
-
-#: kgame/kgamemessage.cpp:143
-msgid "Error Message"
-msgstr "错误讯息"
-
-#: kgame/kgamemessage.cpp:145
-msgid "Player Input"
-msgstr "玩家输入"
-
-#: kgame/kgamemessage.cpp:147
-msgid "An IO was added"
-msgstr "加入了一个IO"
-
-#: kgame/kgamemessage.cpp:149
-msgid "Process Query"
-msgstr "进程查询"
-
-#: kgame/kgamechat.cpp:95
-#, c-format
-msgid "Player %1"
-msgstr "玩家 %1"
-
-#: kchatbase.cpp:409 kgame/kgamechat.cpp:168
-#, c-format
-msgid "Send to %1"
-msgstr "发送给 %1"
-
-#: kgame/kgamechat.cpp:214
-msgid "Send to My Group (\"%1\")"
-msgstr "发送到我的组(“%1”)"
-
-#: kgame/kgameerror.cpp:63
-msgid ""
-"Cookie mismatch!\n"
-"Expected Cookie: %1\n"
-"Received Cookie: %2"
-msgstr ""
-"Cookie不符！\n"
-"期望的Cookie：%1\n"
-"接收到的Cookie：%2"
-
-#: kgame/kgameerror.cpp:72
-msgid ""
-"KGame Version mismatch!\n"
-"Expected Version: %1\n"
-"Received Version: %2\n"
-msgstr ""
-"KGame 版本不符！\n"
-"期望的版本：%1\n"
-"接收到的版本：%2\n"
-
-#: kgame/kgameerror.cpp:76
-#, c-format
-msgid "Unknown error code %1"
-msgstr "未知错误码 %1"
-
-#: kgamemisc.cpp:55
-msgid ""
-"_: A list of language typical names ( for games ), separated by spaces\n"
-"Adam Alex Andreas Andrew Bart Ben Bernd Bill Chris Chuck Daniel Don Duncan Ed "
-"Emily Eric Gary Greg Harry Ian Jean Jeff Jan Kai Keith Ken Kirk Marc Mike Neil "
-"Paul Rik Robert Sam Sean Thomas Tim Walter"
-msgstr ""
-"Adam Alex Andreas Andrew Bart Ben Bernd Bill Chris Chuck Daniel Don Duncan Ed "
-"Emily Eric Gary Greg Harry Ian Jean Jeff Jan Kai Keith Ken Kirk Marc Mike Neil "
-"Paul Rik Robert Sam Sean Thomas Tim Walter"
-
-#: kstdgameaction.cpp:60
-msgid ""
-"_: new game\n"
-"&New"
-msgstr "新建(&N)"
-
-#: kstdgameaction.cpp:61
-msgid "&Load..."
-msgstr "载入(&L)..."
-
-#: kstdgameaction.cpp:62
-msgid "Load &Recent"
-msgstr "载入最近的(&R)"
-
-#: kstdgameaction.cpp:63
-msgid "Restart &Game"
-msgstr "重新开始游戏(&G)"
-
-#: kstdgameaction.cpp:65
-msgid "Save &As..."
-msgstr "另存为(&A)..."
-
-#: kstdgameaction.cpp:66
-msgid "&End Game"
-msgstr "结束游戏(&E)"
-
-#: kstdgameaction.cpp:67
-msgid "Pa&use"
-msgstr "暂停(&U)"
-
-#: kstdgameaction.cpp:68
-msgid "Show &Highscores"
-msgstr "显示排行榜(&H)"
-
-#: kstdgameaction.cpp:72
-msgid "Repeat"
-msgstr "重复"
-
-#: kstdgameaction.cpp:73
-msgid "Und&o"
-msgstr "撤消(&O)"
-
-#: kstdgameaction.cpp:74
-msgid "Re&do"
-msgstr "重做(&D)"
-
-#: kstdgameaction.cpp:75
-msgid "&Roll Dice"
-msgstr "掷骰子(&R)"
-
-#: kstdgameaction.cpp:76
-msgid "End Turn"
-msgstr "结束回合"
-
-#: kstdgameaction.cpp:77
-msgid "&Hint"
-msgstr "提示(&H)"
-
-#: kstdgameaction.cpp:78
-msgid "&Demo"
-msgstr "演示(&D)"
-
-#: kstdgameaction.cpp:79
-msgid "&Solve"
-msgstr "解决(&S)"
-
-#: kstdgameaction.cpp:81
-msgid "Choose Game &Type"
-msgstr "选择游戏类型(&T)"
-
-#: kstdgameaction.cpp:82
-msgid "Configure &Carddecks..."
-msgstr "配置牌垛(&C)..."
-
-#: kstdgameaction.cpp:83
-msgid "Configure &Highscores..."
-msgstr "配置排行榜(&H)..."
-
-#: highscore/khighscore.cpp:134
-msgid "Retry"
-msgstr "重试"
-
-#: highscore/khighscore.cpp:135
-msgid ""
-"Cannot access the highscore file. Another user is probably currently writing to "
-"it."
-msgstr "无法访问排行榜文件。可能有其他用户正在写入该文件。"
-
-#: highscore/kscoredialog.cpp:68
-msgid "High Scores"
-msgstr "排行榜"
-
-#: highscore/kexthighscore_internal.h:69 highscore/kscoredialog.cpp:83
-msgid "Date"
-msgstr "日期"
-
-#: highscore/kscoredialog.cpp:86
-msgid "Level"
-msgstr "级别"
-
-#: highscore/kexthighscore.cpp:211 highscore/kscoredialog.cpp:89
-msgid "Score"
-msgstr "分数"
+#: kchatbase.cpp:232
+msgid "Send to All Players"
+msgstr "发送给所有玩家"
 
-#: highscore/kexthighscore_internal.h:49 highscore/kscoredialog.cpp:141
-msgid "Rank"
-msgstr "等级"
+#: kchatbase.cpp:371
+msgid "%1 %2"
+msgstr "%1 %2"
 
-#: highscore/kscoredialog.cpp:167
+#: kchatbase.cpp:387
 #, c-format
-msgid "#%1"
-msgstr "#%1"
-
-#: highscore/kscoredialog.cpp:351
-msgid ""
-"Excellent!\n"
-"You have a new high score!"
-msgstr ""
-"太棒了！\n"
-"您创造了一个新的高分！"
-
-#: highscore/kscoredialog.cpp:353
-msgid ""
-"Well done!\n"
-"You made it to the high score list!"
-msgstr ""
-"干得不错！\n"
-"您进入了排行榜！"
-
-#: highscore/kexthighscore_gui.cpp:139
-msgid "Best &Scores"
-msgstr "最高分(&S)"
-
-#: highscore/kexthighscore_gui.cpp:144
-msgid "&Players"
-msgstr "玩家(&P)"
-
-#: highscore/kexthighscore_gui.cpp:149
-msgid "Statistics"
-msgstr "统计"
-
-#: highscore/kexthighscore_gui.cpp:155
-msgid "Histogram"
-msgstr "统计图"
-
-#: highscore/kexthighscore_gui.cpp:162
-msgid "View world-wide highscores"
-msgstr "查看全球排行榜"
-
-#: highscore/kexthighscore_gui.cpp:169
-msgid "View world-wide players"
-msgstr "查看全球玩家"
-
-#: highscore/kexthighscore_gui.cpp:202
-msgid "Highscores"
-msgstr "排行榜"
-
-#: highscore/kexthighscore_gui.cpp:204
-msgid "Configure..."
-msgstr "配置..."
-
-#: highscore/kexthighscore_gui.cpp:205
-msgid "Export..."
-msgstr "导出..."
-
-#: highscore/kexthighscore_gui.cpp:258
-msgid "Overwrite"
-msgstr "覆盖"
-
-#: highscore/kexthighscore_gui.cpp:260
-msgid "The file already exists. Overwrite?"
-msgstr "文件已经存在。覆盖吗？"
-
-#: highscore/kexthighscore_gui.cpp:302
-msgid "Winner"
-msgstr "赢家"
-
-#: highscore/kexthighscore_gui.cpp:334
-msgid "Won Games"
-msgstr "赢家"
-
-#: highscore/kexthighscore_gui.cpp:356
-msgid "Configure Highscores"
-msgstr "配置排行榜"
-
-#: highscore/kexthighscore_gui.cpp:367
-msgid "Main"
-msgstr "主要"
-
-#: highscore/kexthighscore_gui.cpp:376 highscore/kexthighscore_gui.cpp:413
-msgid "Nickname:"
-msgstr "昵称："
-
-#: highscore/kexthighscore_gui.cpp:387
-msgid "Comment:"
-msgstr "注释："
-
-#: highscore/kexthighscore_gui.cpp:397
-msgid "World-wide highscores enabled"
-msgstr "启用了全球排行榜"
-
-#: highscore/kexthighscore_gui.cpp:404
-msgid "Advanced"
-msgstr "高级"
-
-#: highscore/kexthighscore_gui.cpp:408
-msgid "Registration Data"
-msgstr "注册数据"
-
-#: highscore/kexthighscore_gui.cpp:417
-msgid "Key:"
-msgstr "密钥："
-
-#: highscore/kexthighscore_gui.cpp:456
-msgid ""
-"This will permanently remove your registration key. You will not be able to use "
-"the currently registered nickname anymore."
-msgstr "这将永久删除您的注册密钥。您将无法再使用目前注册的昵称。"
-
-#: highscore/kexthighscore_gui.cpp:499
-msgid "Please choose a non empty nickname."
-msgstr "请选择非空的昵称。"
-
-#: highscore/kexthighscore_gui.cpp:503
-msgid "Nickname already in use. Please choose another one"
-msgstr "昵称已再使用中。请选择另外一个"
-
-#: highscore/kexthighscore_gui.cpp:520
-msgid "Enter Your Nickname"
-msgstr "输入您的昵称"
-
-#: highscore/kexthighscore_gui.cpp:528
-msgid "Congratulations, you have won!"
-msgstr "恭喜，您赢了！"
-
-#: highscore/kexthighscore_gui.cpp:532
-msgid "Enter your nickname:"
-msgstr "输入您的昵称："
-
-#: highscore/kexthighscore_gui.cpp:540
-msgid "Do not ask again."
-msgstr "不再询问。"
-
-#: highscore/kexthighscore.cpp:214
-msgid "Mean Score"
-msgstr "平均得分"
-
-#: highscore/kexthighscore.cpp:219
-msgid "Best Score"
-msgstr "最高得分"
-
-#: highscore/kexthighscore.cpp:223
-msgid "Elapsed Time"
-msgstr "已过时间"
+msgid "--- %1"
+msgstr "--- %1"
 
 #: highscore/kexthighscore_internal.cpp:48
 msgid "anonymous"
@@ -912,10 +849,73 @@ msgstr "原始信息：%1"
 msgid "Invalid answer from world-wide highscores server (missing item: %1)."
 msgstr "全球排行榜服务器的回答无效(缺少项：%1)。"
 
+#: highscore/kexthighscore_internal.h:49 highscore/kscoredialog.cpp:141
+msgid "Rank"
+msgstr "等级"
+
+#: highscore/kexthighscore_internal.h:69 highscore/kscoredialog.cpp:83
+msgid "Date"
+msgstr "日期"
+
 #: highscore/kexthighscore_internal.h:78
 msgid "Success"
 msgstr "成功"
 
+#: highscore/khighscore.cpp:134
+msgid "Retry"
+msgstr "重试"
+
+#: highscore/khighscore.cpp:135
+msgid ""
+"Cannot access the highscore file. Another user is probably currently writing to "
+"it."
+msgstr "无法访问排行榜文件。可能有其他用户正在写入该文件。"
+
+#: highscore/kexthighscore.cpp:211 highscore/kscoredialog.cpp:89
+msgid "Score"
+msgstr "分数"
+
+#: highscore/kexthighscore.cpp:214
+msgid "Mean Score"
+msgstr "平均得分"
+
+#: highscore/kexthighscore.cpp:219
+msgid "Best Score"
+msgstr "最高得分"
+
+#: highscore/kexthighscore.cpp:223
+msgid "Elapsed Time"
+msgstr "已过时间"
+
+#: highscore/kscoredialog.cpp:68
+msgid "High Scores"
+msgstr "排行榜"
+
+#: highscore/kscoredialog.cpp:86
+msgid "Level"
+msgstr "级别"
+
+#: highscore/kscoredialog.cpp:167
+#, c-format
+msgid "#%1"
+msgstr "#%1"
+
+#: highscore/kscoredialog.cpp:351
+msgid ""
+"Excellent!\n"
+"You have a new high score!"
+msgstr ""
+"太棒了！\n"
+"您创造了一个新的高分！"
+
+#: highscore/kscoredialog.cpp:353
+msgid ""
+"Well done!\n"
+"You made it to the high score list!"
+msgstr ""
+"干得不错！\n"
+"您进入了排行榜！"
+
 #: highscore/kexthighscore_item.cpp:272
 msgid "Multiplayers Scores"
 msgstr "多玩家得分"
@@ -992,115 +992,116 @@ msgstr "计数"
 msgid "Percent"
 msgstr "百分比"
 
-#: kcarddialog.cpp:277
-msgid "Choose Backside"
-msgstr "选择背面"
+#: highscore/kexthighscore_gui.cpp:139
+msgid "Best &Scores"
+msgstr "最高分(&S)"
 
-#: kcarddialog.cpp:297
-msgid "Backside"
-msgstr "背面"
+#: highscore/kexthighscore_gui.cpp:144
+msgid "&Players"
+msgstr "玩家(&P)"
 
-#: kcarddialog.cpp:301 kcarddialog.cpp:351
-msgid "empty"
-msgstr "空"
+#: highscore/kexthighscore_gui.cpp:149
+msgid "Statistics"
+msgstr "统计"
 
-#: kcarddialog.cpp:309
-msgid "Random backside"
-msgstr "随机背面"
+#: highscore/kexthighscore_gui.cpp:155
+msgid "Histogram"
+msgstr "统计图"
 
-#: kcarddialog.cpp:314
-msgid "Use global backside"
-msgstr "使用全局背面"
+#: highscore/kexthighscore_gui.cpp:162
+msgid "View world-wide highscores"
+msgstr "查看全球排行榜"
 
-#: kcarddialog.cpp:317
-msgid "Make Backside Global"
-msgstr "设定背面为全局"
+#: highscore/kexthighscore_gui.cpp:169
+msgid "View world-wide players"
+msgstr "查看全球玩家"
 
-#: kcarddialog.cpp:329
-msgid "Choose Frontside"
-msgstr "选择正面"
+#: highscore/kexthighscore_gui.cpp:202
+msgid "Highscores"
+msgstr "排行榜"
 
-#: kcarddialog.cpp:347
-msgid "Frontside"
-msgstr "正面"
+#: highscore/kexthighscore_gui.cpp:204
+msgid "Configure..."
+msgstr "配置..."
 
-#: kcarddialog.cpp:359
-msgid "Random frontside"
-msgstr "随机正面"
+#: highscore/kexthighscore_gui.cpp:205
+msgid "Export..."
+msgstr "导出..."
 
-#: kcarddialog.cpp:364
-msgid "Use global frontside"
-msgstr "使用全局正面"
+#: highscore/kexthighscore_gui.cpp:258
+msgid "Overwrite"
+msgstr "覆盖"
 
-#: kcarddialog.cpp:367
-msgid "Make Frontside Global"
-msgstr "设定正面为全局"
+#: highscore/kexthighscore_gui.cpp:260
+msgid "The file already exists. Overwrite?"
+msgstr "文件已经存在。覆盖吗？"
 
-#: kcarddialog.cpp:426
-msgid "Resize Cards"
-msgstr "改变牌的大小"
+#: highscore/kexthighscore_gui.cpp:302
+msgid "Winner"
+msgstr "赢家"
 
-#: kcarddialog.cpp:439
-msgid "Default Size"
-msgstr "默认大小"
+#: highscore/kexthighscore_gui.cpp:334
+msgid "Won Games"
+msgstr "赢家"
 
-#: kcarddialog.cpp:443
-msgid "Preview:"
-msgstr "预览："
+#: highscore/kexthighscore_gui.cpp:356
+msgid "Configure Highscores"
+msgstr "配置排行榜"
 
-#: kcarddialog.cpp:476 kcarddialog.cpp:511
-msgid "unnamed"
-msgstr "未命名"
+#: highscore/kexthighscore_gui.cpp:367
+msgid "Main"
+msgstr "主要"
 
-#: kcarddialog.cpp:532
-msgid "Carddeck Selection"
-msgstr "选择牌垛"
+#: highscore/kexthighscore_gui.cpp:376 highscore/kexthighscore_gui.cpp:413
+msgid "Nickname:"
+msgstr "昵称："
 
-#: kchatdialog.cpp:60 kchatdialog.cpp:68
-msgid "Configure Chat"
-msgstr "配置聊天"
+#: highscore/kexthighscore_gui.cpp:387
+msgid "Comment:"
+msgstr "注释："
 
-#: kchatdialog.cpp:86 kchatdialog.cpp:108
-msgid "Name Font..."
-msgstr "名字字体..."
+#: highscore/kexthighscore_gui.cpp:397
+msgid "World-wide highscores enabled"
+msgstr "启用了全球排行榜"
 
-#: kchatdialog.cpp:89 kchatdialog.cpp:111
-msgid "Text Font..."
-msgstr "文本字体..."
+#: highscore/kexthighscore_gui.cpp:404
+msgid "Advanced"
+msgstr "高级"
 
-#: kchatdialog.cpp:98
-msgid "Player: "
-msgstr "玩家："
+#: highscore/kexthighscore_gui.cpp:408
+msgid "Registration Data"
+msgstr "注册数据"
 
-#: kchatdialog.cpp:100
-msgid "This is a player message"
-msgstr "这是一条玩家讯息"
+#: highscore/kexthighscore_gui.cpp:417
+msgid "Key:"
+msgstr "密钥："
 
-#: kchatdialog.cpp:106
-msgid "System Messages - Messages directly sent from the game"
-msgstr "系统讯息 — 由游戏直接发出的讯息"
+#: highscore/kexthighscore_gui.cpp:456
+msgid ""
+"This will permanently remove your registration key. You will not be able to use "
+"the currently registered nickname anymore."
+msgstr "这将永久删除您的注册密钥。您将无法再使用目前注册的昵称。"
 
-#: kchatdialog.cpp:120
-msgid "--- Game: "
-msgstr "--- 游戏："
+#: highscore/kexthighscore_gui.cpp:499
+msgid "Please choose a non empty nickname."
+msgstr "请选择非空的昵称。"
 
-#: kchatdialog.cpp:122
-msgid "This is a system message"
-msgstr "这是一条系统讯息"
+#: highscore/kexthighscore_gui.cpp:503
+msgid "Nickname already in use. Please choose another one"
+msgstr "昵称已再使用中。请选择另外一个"
 
-#: kchatdialog.cpp:126
-msgid "Maximal number of messages (-1 = unlimited):"
-msgstr "最大讯息数目(-1 = 无限)："
+#: highscore/kexthighscore_gui.cpp:520
+msgid "Enter Your Nickname"
+msgstr "输入您的昵称"
 
-#: kchatbase.cpp:232
-msgid "Send to All Players"
-msgstr "发送给所有玩家"
+#: highscore/kexthighscore_gui.cpp:528
+msgid "Congratulations, you have won!"
+msgstr "恭喜，您赢了！"
 
-#: kchatbase.cpp:371
-msgid "%1 %2"
-msgstr "%1 %2"
+#: highscore/kexthighscore_gui.cpp:532
+msgid "Enter your nickname:"
+msgstr "输入您的昵称："
 
-#: kchatbase.cpp:387
-#, c-format
-msgid "--- %1"
-msgstr "--- %1"
+#: highscore/kexthighscore_gui.cpp:540
+msgid "Do not ask again."
+msgstr "不再询问。"
diff --git a/tde-i18n-zh_CN/messages/tdegames/lskat.po b/tde-i18n-zh_CN/messages/tdegames/lskat.po
index e7055415d21..2247e332df8 100644
--- a/tde-i18n-zh_CN/messages/tdegames/lskat.po
+++ b/tde-i18n-zh_CN/messages/tdegames/lskat.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: lskat\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-08-21 17:26+0800\n"
 "Last-Translator: Liang Meng <mengliang99@sohu.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -306,7 +307,8 @@ msgid "for"
 msgstr "支 持"
 
 #: lskatview.cpp:306
-msgid "K D E"
+#, fuzzy
+msgid "T D E"
 msgstr "K D E"
 
 #: lskatview.cpp:407
diff --git a/tde-i18n-zh_CN/messages/tdegames/twin4.po b/tde-i18n-zh_CN/messages/tdegames/twin4.po
index 74202e3184c..2a794b6476b 100644
--- a/tde-i18n-zh_CN/messages/tdegames/twin4.po
+++ b/tde-i18n-zh_CN/messages/tdegames/twin4.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: twin4\n"
-"POT-Creation-Date: 2005-05-18 21:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-07-12 10:31+0800\n"
 "Last-Translator: Liang Meng <mengliang99@sohu.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,188 +28,18 @@ msgid ""
 "Your emails"
 msgstr "mengliang99@sohu.com"
 
-#: twin4.cpp:67
-msgid "Chat Dlg"
-msgstr "聊天对话框"
-
-#: twin4.cpp:73
-msgid "Chat"
-msgstr "聊天"
-
-#: twin4.cpp:79
-msgid "Configure..."
-msgstr "配置..."
-
-#: twin4.cpp:192
-msgid "Start a new game"
-msgstr "开始一个新游戏"
-
-#: twin4.cpp:195
-msgid "Open a saved game..."
-msgstr "打开保存的游戏..."
-
-#: twin4.cpp:198
-msgid "Save a game..."
-msgstr "保存游戏..."
-
-#: twin4.cpp:201
-msgid "Ending the current game..."
-msgstr "结束当前游戏..."
-
-#: twin4.cpp:202
-msgid "Aborts a currently played game. No winner will be declared."
-msgstr "中止当前进行游戏。没有胜利者。"
-
-#: twin4.cpp:204
-msgid "&Network Configuration..."
-msgstr "网络配置(&N)..."
-
-#: twin4.cpp:207
-msgid "Network Chat..."
-msgstr "网络聊天..."
-
-#: twin4.cpp:211
-msgid "Debug KGame"
-msgstr "调试 KGame"
-
-#: twin4.cpp:214
-msgid "&Show Statistics"
-msgstr "显示统计(&S)"
-
-#: twin4.cpp:216
-msgid "Show statistics."
-msgstr "显示统计。"
-
-#: twin4.cpp:219
-msgid "Shows a hint on how to move."
-msgstr "显示提示如何移动。"
-
-#: twin4.cpp:222
-msgid "Quits the program."
-msgstr "退出游戏。"
-
-#: twin4.cpp:225
-msgid "Undo last move."
-msgstr "撤消上步移动。"
-
-#: twin4.cpp:228
-msgid "Redo last move."
-msgstr "重复上步移动。"
-
-#: twin4.cpp:242 twin4.cpp:252
-msgid "Ready"
-msgstr "预备"
-
-#: twin4.cpp:251
-msgid "This leaves space for the mover"
-msgstr "为移动者留下空间"
-
-#: twin4.cpp:254
-msgid "(c) Martin Heni   "
-msgstr "(c) Martin Heni   "
-
-#: twin4.cpp:255
-msgid "Welcome to KWin4"
-msgstr "欢迎来到 KWin4"
-
-#: twin4.cpp:457
-msgid "No game  "
-msgstr "没有游戏"
-
-#: twin4.cpp:459
-msgid " - Yellow "
-msgstr " - 黄色"
-
-#: twin4.cpp:461
-msgid " - Red "
-msgstr " - 红色"
-
-#: twin4.cpp:463
-msgid "Nobody  "
-msgstr "没有人"
-
-#: twin4.cpp:482
-msgid ""
-"The network game ended!\n"
-msgstr ""
-"网络游戏结束！\n"
-
-#: twin4.cpp:493
-msgid "Game running..."
-msgstr "游戏进行中..."
-
-#: twin4.cpp:504
-msgid "The game is drawn. Please restart next round."
-msgstr "平局。请开始下一个回合。"
-
-#: twin4.cpp:512
-msgid "%1 won the game. Please restart next round."
-msgstr "%1赢得游戏。请开始下一个回合。"
-
-#: twin4.cpp:518
-msgid " Game aborted. Please restart next round."
-msgstr "游戏中止。请开始下一个回合。"
-
-#: twin4.cpp:536
-msgid "Network Configuration"
-msgstr "网络配置"
-
-#: twin4.cpp:548
-msgid "Yellow should be played by remote"
-msgstr "黄色应该由远端控制"
-
-#: twin4.cpp:549
-msgid "Red should be played by remote"
-msgstr "红色应该由远端控制"
-
-#: twin4.cpp:621
-msgid "General"
-msgstr "常规"
-
-#: twin4view.cpp:350
-msgid ""
-"_: 1. intro line, welcome to win4\n"
-"Welcome"
-msgstr "欢迎"
-
-#: twin4view.cpp:356
-msgid ""
-"_: 2. intro line, welcome to win4\n"
-"to"
-msgstr "来到"
-
-#: twin4view.cpp:362
-msgid ""
-"_: 3. intro line, welcome to win4\n"
-"KWin4"
-msgstr "KWin4"
-
-#: twin4view.cpp:606
-msgid "Hold on... the other player has not been yet..."
-msgstr "等一下...另一个玩家还没有移动..."
-
-#: twin4view.cpp:607
-msgid "Hold your horses..."
-msgstr "勒住你的马..."
-
-#: twin4view.cpp:608
-msgid "Ah ah ah... only one go at a time..."
-msgstr "啊...一次只能一个人移动..."
-
-#: twin4view.cpp:609
-msgid "Please wait... it is not your turn."
-msgstr "请等待...还没轮到你。"
-
 #: main.cpp:30
 msgid "Enter debug level"
 msgstr "输入调试级别"
 
 #: main.cpp:39
-msgid "KWin4"
+#, fuzzy
+msgid "TWin4"
 msgstr "KWin4"
 
 #: main.cpp:41
-msgid "KWin4: Two player network game"
+#, fuzzy
+msgid "TWin4: Two player network game"
 msgstr "KWin4：双人网络游戏"
 
 #: main.cpp:45
@@ -452,3 +283,177 @@ msgstr "胜利者"
 #: scorewidget.cpp:166
 msgid "Loser"
 msgstr "失败者"
+
+#: twin4.cpp:67
+msgid "Chat Dlg"
+msgstr "聊天对话框"
+
+#: twin4.cpp:73
+msgid "Chat"
+msgstr "聊天"
+
+#: twin4.cpp:79
+msgid "Configure..."
+msgstr "配置..."
+
+#: twin4.cpp:192
+msgid "Start a new game"
+msgstr "开始一个新游戏"
+
+#: twin4.cpp:195
+msgid "Open a saved game..."
+msgstr "打开保存的游戏..."
+
+#: twin4.cpp:198
+msgid "Save a game..."
+msgstr "保存游戏..."
+
+#: twin4.cpp:201
+msgid "Ending the current game..."
+msgstr "结束当前游戏..."
+
+#: twin4.cpp:202
+msgid "Aborts a currently played game. No winner will be declared."
+msgstr "中止当前进行游戏。没有胜利者。"
+
+#: twin4.cpp:204
+msgid "&Network Configuration..."
+msgstr "网络配置(&N)..."
+
+#: twin4.cpp:207
+msgid "Network Chat..."
+msgstr "网络聊天..."
+
+#: twin4.cpp:211
+msgid "Debug KGame"
+msgstr "调试 KGame"
+
+#: twin4.cpp:214
+msgid "&Show Statistics"
+msgstr "显示统计(&S)"
+
+#: twin4.cpp:216
+msgid "Show statistics."
+msgstr "显示统计。"
+
+#: twin4.cpp:219
+msgid "Shows a hint on how to move."
+msgstr "显示提示如何移动。"
+
+#: twin4.cpp:222
+msgid "Quits the program."
+msgstr "退出游戏。"
+
+#: twin4.cpp:225
+msgid "Undo last move."
+msgstr "撤消上步移动。"
+
+#: twin4.cpp:228
+msgid "Redo last move."
+msgstr "重复上步移动。"
+
+#: twin4.cpp:242 twin4.cpp:252
+msgid "Ready"
+msgstr "预备"
+
+#: twin4.cpp:251
+msgid "This leaves space for the mover"
+msgstr "为移动者留下空间"
+
+#: twin4.cpp:254
+msgid "(c) Martin Heni   "
+msgstr "(c) Martin Heni   "
+
+#: twin4.cpp:255
+#, fuzzy
+msgid "Welcome to TWin4"
+msgstr "欢迎来到 KWin4"
+
+#: twin4.cpp:457
+msgid "No game  "
+msgstr "没有游戏"
+
+#: twin4.cpp:459
+msgid " - Yellow "
+msgstr " - 黄色"
+
+#: twin4.cpp:461
+msgid " - Red "
+msgstr " - 红色"
+
+#: twin4.cpp:463
+msgid "Nobody  "
+msgstr "没有人"
+
+#: twin4.cpp:482
+msgid ""
+"The network game ended!\n"
+msgstr ""
+"网络游戏结束！\n"
+
+#: twin4.cpp:493
+msgid "Game running..."
+msgstr "游戏进行中..."
+
+#: twin4.cpp:504
+msgid "The game is drawn. Please restart next round."
+msgstr "平局。请开始下一个回合。"
+
+#: twin4.cpp:512
+msgid "%1 won the game. Please restart next round."
+msgstr "%1赢得游戏。请开始下一个回合。"
+
+#: twin4.cpp:518
+msgid " Game aborted. Please restart next round."
+msgstr "游戏中止。请开始下一个回合。"
+
+#: twin4.cpp:536
+msgid "Network Configuration"
+msgstr "网络配置"
+
+#: twin4.cpp:548
+msgid "Yellow should be played by remote"
+msgstr "黄色应该由远端控制"
+
+#: twin4.cpp:549
+msgid "Red should be played by remote"
+msgstr "红色应该由远端控制"
+
+#: twin4.cpp:621
+msgid "General"
+msgstr "常规"
+
+#: twin4view.cpp:350
+msgid ""
+"_: 1. intro line, welcome to win4\n"
+"Welcome"
+msgstr "欢迎"
+
+#: twin4view.cpp:356
+msgid ""
+"_: 2. intro line, welcome to win4\n"
+"to"
+msgstr "来到"
+
+#: twin4view.cpp:362
+#, fuzzy
+msgid ""
+"_: 3. intro line, welcome to win4\n"
+"TWin4"
+msgstr "KWin4"
+
+#: twin4view.cpp:606
+msgid "Hold on... the other player has not been yet..."
+msgstr "等一下...另一个玩家还没有移动..."
+
+#: twin4view.cpp:607
+msgid "Hold your horses..."
+msgstr "勒住你的马..."
+
+#: twin4view.cpp:608
+msgid "Ah ah ah... only one go at a time..."
+msgstr "啊...一次只能一个人移动..."
+
+#: twin4view.cpp:609
+msgid "Please wait... it is not your turn."
+msgstr "请等待...还没轮到你。"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/kcm_kviewcanvasconfig.po b/tde-i18n-zh_CN/messages/tdegraphics/kcm_kviewcanvasconfig.po
index 15a22326a69..b5634a9a55f 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/kcm_kviewcanvasconfig.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/kcm_kviewcanvasconfig.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcm-kviewcanvasconfig 3.3\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-07-13 08:54+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/kcm_kviewgeneralconfig.po b/tde-i18n-zh_CN/messages/tdegraphics/kcm_kviewgeneralconfig.po
index 29f3131c178..1d5a39db749 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/kcm_kviewgeneralconfig.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/kcm_kviewgeneralconfig.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-07-13 08:55+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/kcm_kviewpluginsconfig.po b/tde-i18n-zh_CN/messages/tdegraphics/kcm_kviewpluginsconfig.po
index f19bd9359e4..eb4c5fa50f0 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/kcm_kviewpluginsconfig.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/kcm_kviewpluginsconfig.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-01-14 22:43+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/kcm_kviewviewerpluginsconfig.po b/tde-i18n-zh_CN/messages/tdegraphics/kcm_kviewviewerpluginsconfig.po
index 7f1db3b4be8..16f114edb62 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/kcm_kviewviewerpluginsconfig.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/kcm_kviewviewerpluginsconfig.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-01-14 22:42+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/kcmkamera.po b/tde-i18n-zh_CN/messages/tdegraphics/kcmkamera.po
index c1f4dd5819a..8ad445613dc 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/kcmkamera.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/kcmkamera.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkamera\n"
-"POT-Creation-Date: 2007-05-28 02:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-01-14 22:38+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -83,93 +84,93 @@ msgstr ""
 "要查看数码相机中的图像并将其下载到计算机中，请在 Konqueror 和其它 TDE 应用程序中转到地址\n"
 "<a href=\"camera:/\">camera:/</a>。"
 
-#: kameradevice.cpp:79
+#: kameradevice.cpp:81
 msgid "Could not allocate memory for abilities list."
 msgstr "无法为功能列表分配内存。"
 
-#: kameradevice.cpp:83
+#: kameradevice.cpp:85
 msgid "Could not load ability list."
 msgstr "无法装入功能列表。"
 
-#: kameradevice.cpp:88 kameradevice.cpp:434 kameradevice.cpp:454
+#: kameradevice.cpp:90 kameradevice.cpp:443 kameradevice.cpp:463
 msgid ""
 "Description of abilities for camera %1 is not available. Configuration options "
 "may be incorrect."
 msgstr "相机 %1 的功能描述不可用。配置选项可能不正确。"
 
-#: kameradevice.cpp:111
+#: kameradevice.cpp:113
 msgid "Could not access driver. Check your gPhoto2 installation."
 msgstr "无法访问驱动程序。请检查您的 gPhoto2 的安装。"
 
-#: kameradevice.cpp:131
+#: kameradevice.cpp:133
 msgid ""
 "Unable to initialize camera. Check your port settings and camera connectivity "
 "and try again."
 msgstr "无法初始化相机。请检查您的端口设置和相机的连线，然后重试。"
 
-#: kameradevice.cpp:155
+#: kameradevice.cpp:157
 msgid ""
 "No camera summary information is available.\n"
 msgstr ""
 "没有可用的相机概要信息。\n"
 
-#: kameradevice.cpp:168 kameradevice.cpp:178
+#: kameradevice.cpp:170 kameradevice.cpp:180
 msgid "Camera configuration failed."
 msgstr "配置相机失败。"
 
-#: kameradevice.cpp:213 kameradevice.cpp:308 kameradevice.cpp:393
+#: kameradevice.cpp:215 kameradevice.cpp:310 kameradevice.cpp:402
 msgid "Serial"
 msgstr "串口"
 
-#: kameradevice.cpp:214 kameradevice.cpp:311 kameradevice.cpp:395
+#: kameradevice.cpp:216 kameradevice.cpp:313 kameradevice.cpp:404
 msgid "USB"
 msgstr "USB"
 
-#: kameradevice.cpp:215
+#: kameradevice.cpp:217
 msgid "Unknown port"
 msgstr "未知端口"
 
-#: kameradevice.cpp:274
+#: kameradevice.cpp:276
 msgid "Select Camera Device"
 msgstr "选择相机设备"
 
-#: kameradevice.cpp:291
+#: kameradevice.cpp:293
 msgid "Supported Cameras"
 msgstr "支持的相机"
 
-#: kameradevice.cpp:302 kameradevice.cpp:333
+#: kameradevice.cpp:304 kameradevice.cpp:335
 msgid "Port"
 msgstr "端口"
 
-#: kameradevice.cpp:304
+#: kameradevice.cpp:306
 msgid "Port Settings"
 msgstr "端口设置"
 
-#: kameradevice.cpp:310
+#: kameradevice.cpp:312
 msgid ""
 "If this option is checked, the camera would have to be connected one of the "
 "serial ports (known as COM in Microsoft Windows) in your computer."
 msgstr "如果选中此选项，相机需要通过串口(Microsoft Windows 中的 COM 端口)之一连接到计算机上。"
 
-#: kameradevice.cpp:313
+#: kameradevice.cpp:315
 msgid ""
 "If this option is checked, the camera would have to be connected to one of the "
 "USB slots in your computer or USB hub."
 msgstr "如果选中此选项，相机需要通过您计算机或 USB 集线器上的 USB 插槽连接到计算机上。"
 
-#: kameradevice.cpp:320
+#: kameradevice.cpp:322
 msgid "No port type selected."
 msgstr "没有选择端口类型。"
 
-#: kameradevice.cpp:326
+#: kameradevice.cpp:328
 msgid "Port:"
 msgstr "端口："
 
-#: kameradevice.cpp:328
+#: kameradevice.cpp:330
 msgid "Here you should choose the serial port you connect the camera to."
 msgstr "您可以在此选择您连接相机的串口。"
 
-#: kameradevice.cpp:336
+#: kameradevice.cpp:338
 msgid "No further configuration is required for USB."
 msgstr "USB 不需要更多的配置。"
 
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/kcoloredit.po b/tde-i18n-zh_CN/messages/tdegraphics/kcoloredit.po
index 7bb59a2ac1d..54ac84c6f95 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/kcoloredit.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/kcoloredit.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcoloredit\n"
-"POT-Creation-Date: 2006-06-05 03:59+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-01-14 22:42+0800\n"
 "Last-Translator: Qi Liang <cavendish@eyou.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -148,7 +149,8 @@ msgid "File to open"
 msgstr "要打开的文件"
 
 #: main.cpp:44
-msgid "Rewrote UI code to be TDE standards compliant"
+#, fuzzy
+msgid "Rewrote UI code to be KDE standards compliant"
 msgstr "重写用户界面代码，遵循 TDE 标准"
 
 #. i18n: file kcoloreditui.rc line 12
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/kdjview.po b/tde-i18n-zh_CN/messages/tdegraphics/kdjview.po
index 86b94907355..3d6cbeb2171 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/kdjview.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/kdjview.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kdjview\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2006-02-10 04:00+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2007-03-27 20:22+0800\n"
 "Last-Translator: Lie_Ex <lilith.shang@thizgroup.com>\n"
 "Language-Team:  <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/kdvi.po b/tde-i18n-zh_CN/messages/tdegraphics/kdvi.po
index 17aa91f2e1f..96bacdc6dbb 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/kdvi.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/kdvi.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdvi\n"
-"POT-Creation-Date: 2008-07-08 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2003-01-12 01:14-0500\n"
 "Last-Translator: Liu Songhe <jackliu9999@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -297,36 +298,36 @@ msgstr ""
 msgid "Starting the editor..."
 msgstr "正在启动编辑器..."
 
-#: dviRenderer_draw.cpp:269
+#: dviRenderer_draw.cpp:270
 #, fuzzy
 msgid "The DVI code set a character of an unknown font."
 msgstr "DVI 代码指定了不明字体的字符。"
 
-#: dviRenderer_draw.cpp:294 dviRenderer_prescan.cpp:636
+#: dviRenderer_draw.cpp:295 dviRenderer_prescan.cpp:636
 msgid "The DVI code referred to font #%1, which was not previously defined."
 msgstr "DVI 代码用到字体 #%1，但预先并未定义。"
 
-#: dviRenderer_draw.cpp:379
+#: dviRenderer_draw.cpp:380
 msgid "The stack was not empty when the EOP command was encountered."
 msgstr "遇到 EOP 命令时，堆栈并非为空。"
 
-#: dviRenderer_draw.cpp:391
+#: dviRenderer_draw.cpp:392
 msgid "The stack was empty when a POP command was encountered."
 msgstr "遇到 POP 命令时，堆栈已经为空。"
 
-#: dviRenderer_draw.cpp:515 dviRenderer_draw.cpp:524
+#: dviRenderer_draw.cpp:516 dviRenderer_draw.cpp:525
 msgid "The DVI code referred to a font which was not previously defined."
 msgstr "DVI 代码所用到的字体并未预先定义。"
 
-#: dviRenderer_draw.cpp:564
+#: dviRenderer_draw.cpp:565
 msgid "An illegal command was encountered."
 msgstr "遇到非法命令。"
 
-#: dviRenderer_draw.cpp:569
+#: dviRenderer_draw.cpp:570
 msgid "The unknown op-code %1 was encountered."
 msgstr "遇到未知的 op-代码 %1。"
 
-#: dviRenderer_export.cpp:83
+#: dviRenderer_export.cpp:84
 msgid ""
 "KDVI could not locate the program 'dvipdfm' on your computer. That program is "
 "essential for the export function to work. You can, however, convert the "
@@ -342,15 +343,15 @@ msgstr ""
 "系统至更新的、包含‘dvipdfm’程序的版本。\n"
 "对困惑的系统管理员的提示：KDVI 使用 shell 的 PATH 环境变量来寻找程序。"
 
-#: dviRenderer_export.cpp:98
+#: dviRenderer_export.cpp:99
 msgid "*.pdf|Portable Document Format (*.pdf)"
 msgstr "*.pdf|便携式文档格式 (*.pdf)"
 
-#: dviRenderer_export.cpp:98 dviRenderer_export.cpp:197
+#: dviRenderer_export.cpp:99 dviRenderer_export.cpp:198
 msgid "Export File As"
 msgstr "导出文件为"
 
-#: dviRenderer_export.cpp:103 dviRenderer_export.cpp:202
+#: dviRenderer_export.cpp:104 dviRenderer_export.cpp:203
 #: kdvi_multipage.cpp:164
 #, fuzzy
 msgid ""
@@ -360,21 +361,21 @@ msgstr ""
 "文件 %1\n"
 "已存在，要覆盖该文件吗？"
 
-#: dviRenderer_export.cpp:104 dviRenderer_export.cpp:203
+#: dviRenderer_export.cpp:105 dviRenderer_export.cpp:204
 #: kdvi_multipage.cpp:165
 msgid "Overwrite File"
 msgstr "覆盖文件"
 
-#: dviRenderer_export.cpp:104 kdvi_multipage.cpp:165
+#: dviRenderer_export.cpp:105 kdvi_multipage.cpp:165
 #, fuzzy
 msgid "Overwrite"
 msgstr "覆盖文件"
 
-#: dviRenderer_export.cpp:111
+#: dviRenderer_export.cpp:112
 msgid "Using dvipdfm to export the file to PDF"
 msgstr "使用 dvipdfm 导出为 PDF 文件"
 
-#: dviRenderer_export.cpp:113
+#: dviRenderer_export.cpp:114
 msgid ""
 "KDVI is currently using the external program 'dvipdfm' to convert your DVI-file "
 "to PDF. Sometimes that can take a while because dvipdfm needs to generate its "
@@ -383,19 +384,19 @@ msgstr ""
 "KDVI 正在使用‘dvipdfm’外部程序来将 DVI 文件转换为 PDF 格式。有时可能会花些时间，因为 dvipdfm "
 "要产生自己的点阵字体，请耐心等候。"
 
-#: dviRenderer_export.cpp:117
+#: dviRenderer_export.cpp:118
 msgid "Waiting for dvipdfm to finish..."
 msgstr "正在等待 dvipdfm 完成任务..."
 
-#: dviRenderer_export.cpp:118
+#: dviRenderer_export.cpp:119
 msgid "dvipdfm progress dialog"
 msgstr ""
 
-#: dviRenderer_export.cpp:120 dviRenderer_export.cpp:223
+#: dviRenderer_export.cpp:121 dviRenderer_export.cpp:224
 msgid "Please be patient"
 msgstr "请耐心等候"
 
-#: dviRenderer_export.cpp:136
+#: dviRenderer_export.cpp:137
 msgid ""
 "<qt>The external program 'dvipdf', which was used to export the file, reported "
 "an error. You might wish to look at the <strong>document info dialog</strong> "
@@ -404,11 +405,11 @@ msgstr ""
 "<qt>用来导出 PDF 文件的‘dvipdf’外部程序报告错误。您可以查看文件-菜单中的 <strong>文档信息对话框</strong> "
 "以获得准确的错误报告。</qt>"
 
-#: dviRenderer_export.cpp:139
+#: dviRenderer_export.cpp:140
 msgid "Export: %1 to PDF"
 msgstr "导出：%1 至 PDF"
 
-#: dviRenderer_export.cpp:180
+#: dviRenderer_export.cpp:181
 msgid ""
 "<qt><P>This DVI file refers to external graphic files which are not in "
 "PostScript format, and cannot be handled by the <strong>dvips</strong> "
@@ -421,19 +422,19 @@ msgid ""
 "complain, the missing functionality might later be added.</p></qt>"
 msgstr ""
 
-#: dviRenderer_export.cpp:187
+#: dviRenderer_export.cpp:188
 msgid "Functionality Unavailable"
 msgstr ""
 
-#: dviRenderer_export.cpp:197
+#: dviRenderer_export.cpp:198
 msgid "*.ps|PostScript (*.ps)"
 msgstr "*.ps|PostScript (*.ps)"
 
-#: dviRenderer_export.cpp:214
+#: dviRenderer_export.cpp:215
 msgid "Using dvips to export the file to PostScript"
 msgstr "使用 dvips 将文件导出为 PostScript"
 
-#: dviRenderer_export.cpp:216
+#: dviRenderer_export.cpp:217
 msgid ""
 "KDVI is currently using the external program 'dvips' to convert your DVI-file "
 "to PostScript. Sometimes that can take a while because dvips needs to generate "
@@ -442,15 +443,15 @@ msgstr ""
 "KDVI 正在使用“dvips”外部程序来将 DVI 文件转换为 PostScript 格式。有时可能会花些时间，因为 dvips "
 "要产生自己的点阵字体，请耐心等候。"
 
-#: dviRenderer_export.cpp:220
+#: dviRenderer_export.cpp:221
 msgid "Waiting for dvips to finish..."
 msgstr "正在等待 dvips 完成任务..."
 
-#: dviRenderer_export.cpp:221
+#: dviRenderer_export.cpp:222
 msgid "dvips progress dialog"
 msgstr ""
 
-#: dviRenderer_export.cpp:299
+#: dviRenderer_export.cpp:300
 msgid ""
 "<qt>The external program 'dvips', which was used to export the file, reported "
 "an error. You might wish to look at the <strong>document info dialog</strong> "
@@ -459,7 +460,7 @@ msgstr ""
 "<qt>用来导出 PostScript 文档的‘dvips’外部程序报告错误。您可以查看文件-菜单中的 <strong>文档信息对话框</strong> "
 "以获得准确的错误报告。</qt>"
 
-#: dviRenderer_export.cpp:302
+#: dviRenderer_export.cpp:303
 msgid "Export: %1 to PostScript"
 msgstr "导出：%1 至 PostScript"
 
@@ -1028,7 +1029,7 @@ msgid ""
 "line argument that would allow KDVI to specify the exact line which you wish to "
 "edit.</p>\n"
 "<p>If you feel that KDVI's support for a certain editor is inadequate, please "
-"write to kebekus@kde.org.</p>"
+"contact the Trinity developers at www.trinitydesktop.org.</p>"
 msgstr ""
 "并非所有编辑器都适合做反向查找。例如，许多编辑器并无“如果文件尚未载入，载入它，否则打开文件并将文件窗口移至前台”的功能。如果您的编辑器有此功能，在 DVI "
 "文件单击鼠标，通常就会打开一个新的编辑器，即使 TeX 文件已经打开。同样，有许多编辑器并无命令行参数供 KDVI 指定要编辑的特定行。\n"
@@ -1143,61 +1144,11 @@ msgstr ""
 msgid "The special command '%1' is not implemented."
 msgstr "专用命令“"
 
-#: tips.cpp:3
-#, fuzzy
-msgid ""
-"<p>...that KDVI can also load compressed DVI-files? \n"
-msgstr ""
-"<p>...KDVI 现在提供全文查找吗？\n"
-
-#: tips.cpp:8
-msgid ""
-"<p>...that you can mark text with the right mouse button and paste it\n"
-"into any application?\n"
-msgstr ""
-"<p>...您可以使用鼠标右键标记文本，并粘贴至任意应用程序中吗？\n"
-
-#: tips.cpp:14
-msgid ""
-"<p>...that KDVI now supports inverse search? You can click into your DVI file \n"
-"with the middle mouse button and your editor opens, loads the TeX file, and\n"
-"jumps to the proper line! <a href=\"help:/kdvi/inverse-search.html\">The \n"
-"manual explains how to set up your editor for this.</a> \n"
-msgstr ""
-"<p>...KDVI 现在支持反向查找？您可以在 DVI 文件上\n"
-"单击鼠标中键，打开您使用的编辑器，载入 TeX 文件，\n"
-"并跳至正确的行！<a href=\"help:/kdvi/inverse-search.html\">\n"
-"使用手册说明了如何为此设置您的编辑器</a>。\n"
-
-#: tips.cpp:22
-msgid ""
-"<p>...that KDVI supports forward search? If you use Emacs or XEmacs, you can \n"
-"jump directly from the TeX file to the associated place in the DVI file. \n"
-"<a href=\"help:/kdvi/forward-search.html\">The manual explains how to set up \n"
-"your editor for this.</a> \n"
-msgstr ""
-"<p>...KDVI 支持正向查找吗？如果您使用 Emacs 或 XEmacs，\n"
-"您可以直接由 TeX 文件跳至 DVI 文件相对应的位置。\n"
-"<a href=\"help:/kdvi/forward-search.html\">使用手册说明了如何为此设置您的编辑器</a>。\n"
-
-#: tips.cpp:30
-msgid ""
-"<p>...that KDVI now offers full text search? \n"
-msgstr ""
-"<p>...KDVI 现在提供全文查找吗？\n"
-
-#: tips.cpp:35
-msgid ""
-"<p>...that KDVI can save your DVI file as PostScript, PDF, and even plain text? "
-"\n"
-msgstr ""
-"<p>...KDVI 可以把 DVI 文件保存成 PostScript、PDF，甚至纯文本文件吗？\n"
-
-#: util.cpp:73
+#: util.cpp:75
 msgid "Fatal Error! "
 msgstr "严重错误！"
 
-#: util.cpp:76
+#: util.cpp:78
 #, fuzzy
 msgid ""
 "Fatal error.\n"
@@ -1206,7 +1157,7 @@ msgstr ""
 "严重错误！\n"
 "\n"
 
-#: util.cpp:78
+#: util.cpp:80
 msgid ""
 "\n"
 "\n"
@@ -1255,6 +1206,56 @@ msgstr " 已忽略。"
 msgid "Wrong command byte found in VF macro list: %1"
 msgstr "在 VF 宏列表中找到错误的命令字节：%1"
 
+#: tips.txt:3
+#, fuzzy
+msgid ""
+"<p>...that KDVI can also load compressed DVI-files? \n"
+msgstr ""
+"<p>...KDVI 现在提供全文查找吗？\n"
+
+#: tips.txt:8
+msgid ""
+"<p>...that you can mark text with the right mouse button and paste it\n"
+"into any application?\n"
+msgstr ""
+"<p>...您可以使用鼠标右键标记文本，并粘贴至任意应用程序中吗？\n"
+
+#: tips.txt:14
+msgid ""
+"<p>...that KDVI now supports inverse search? You can click into your DVI file \n"
+"with the middle mouse button and your editor opens, loads the TeX file, and\n"
+"jumps to the proper line! <a href=\"help:/kdvi/inverse-search.html\">The \n"
+"manual explains how to set up your editor for this.</a> \n"
+msgstr ""
+"<p>...KDVI 现在支持反向查找？您可以在 DVI 文件上\n"
+"单击鼠标中键，打开您使用的编辑器，载入 TeX 文件，\n"
+"并跳至正确的行！<a href=\"help:/kdvi/inverse-search.html\">\n"
+"使用手册说明了如何为此设置您的编辑器</a>。\n"
+
+#: tips.txt:22
+msgid ""
+"<p>...that KDVI supports forward search? If you use Emacs or XEmacs, you can \n"
+"jump directly from the TeX file to the associated place in the DVI file. \n"
+"<a href=\"help:/kdvi/forward-search.html\">The manual explains how to set up \n"
+"your editor for this.</a> \n"
+msgstr ""
+"<p>...KDVI 支持正向查找吗？如果您使用 Emacs 或 XEmacs，\n"
+"您可以直接由 TeX 文件跳至 DVI 文件相对应的位置。\n"
+"<a href=\"help:/kdvi/forward-search.html\">使用手册说明了如何为此设置您的编辑器</a>。\n"
+
+#: tips.txt:30
+msgid ""
+"<p>...that KDVI now offers full text search? \n"
+msgstr ""
+"<p>...KDVI 现在提供全文查找吗？\n"
+
+#: tips.txt:35
+msgid ""
+"<p>...that KDVI can save your DVI file as PostScript, PDF, and even plain text? "
+"\n"
+msgstr ""
+"<p>...KDVI 可以把 DVI 文件保存成 PostScript、PDF，甚至纯文本文件吗？\n"
+
 #~ msgid "Text..."
 #~ msgstr "文本..."
 
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/kfax.po b/tde-i18n-zh_CN/messages/tdegraphics/kfax.po
index 28e53d01d1f..2f84cd3709a 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/kfax.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/kfax.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kfax\n"
-"POT-Creation-Date: 2006-11-13 02:37+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-01-14 22:39+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -37,11 +38,11 @@ msgstr "Raw 传真分辨率："
 msgid "Auto"
 msgstr "自动"
 
-#: kfax.cpp:1453 options.cpp:107
+#: kfax.cpp:1454 options.cpp:107
 msgid "Fine"
 msgstr "高质量"
 
-#: kfax.cpp:1453 options.cpp:111
+#: kfax.cpp:1454 options.cpp:111
 msgid "Normal"
 msgstr "普通"
 
@@ -65,51 +66,51 @@ msgstr "Raw 传真宽度："
 msgid "Height:"
 msgstr "高度："
 
-#: kfax.cpp:246
+#: kfax.cpp:247
 msgid "A&dd..."
 msgstr "添加(&D)..."
 
-#: kfax.cpp:258
+#: kfax.cpp:259
 msgid "&Rotate Page"
 msgstr "旋转页面(&R)"
 
-#: kfax.cpp:260
+#: kfax.cpp:261
 msgid "Mirror Page"
 msgstr "镜像页面"
 
-#: kfax.cpp:262
+#: kfax.cpp:263
 msgid "&Flip Page"
 msgstr "翻转页面(&F)"
 
-#: kfax.cpp:281
+#: kfax.cpp:282
 msgid "w: 00000 h: 00000"
 msgstr "w：00000 h：00000"
 
-#: kfax.cpp:282
+#: kfax.cpp:283
 msgid "Res: XXXXX"
 msgstr "分辨率：XXXXX"
 
-#: kfax.cpp:283
+#: kfax.cpp:284
 msgid "Type: XXXXXXX"
 msgstr "类型：XXXXXXX"
 
-#: kfax.cpp:284
+#: kfax.cpp:285
 msgid "Page: XX of XX"
 msgstr "第XX页共XX页"
 
-#: kfax.cpp:694
+#: kfax.cpp:695
 msgid "There is no document active."
 msgstr "没有活动的文档。"
 
-#: kfax.cpp:703 kfax.cpp:704 kfax.cpp:1376 kfax.cpp:1651
+#: kfax.cpp:704 kfax.cpp:705 kfax.cpp:1377 kfax.cpp:1652
 msgid "KFax"
 msgstr "KFax"
 
-#: kfax.cpp:827
+#: kfax.cpp:828
 msgid "Saving..."
 msgstr "正在保存..."
 
-#: kfax.cpp:835
+#: kfax.cpp:836
 msgid ""
 "Failure in 'copy file()'\n"
 "Could not save file!"
@@ -117,92 +118,92 @@ msgstr ""
 "“copy file()”失败\n"
 "无法保存文件!"
 
-#: kfax.cpp:849
+#: kfax.cpp:850
 msgid "Loading '%1'"
 msgstr "正在载入“%1”"
 
-#: kfax.cpp:856
+#: kfax.cpp:857
 msgid "Downloading..."
 msgstr "正在下载..."
 
-#: kfax.cpp:1444
+#: kfax.cpp:1445
 msgid "Page: %1 of %2"
 msgstr "第 %1 页共 %2页"
 
-#: kfax.cpp:1449
+#: kfax.cpp:1450
 msgid "W: %1 H: %2"
 msgstr "宽：%1 高：%2"
 
-#: kfax.cpp:1453
+#: kfax.cpp:1454
 #, c-format
 msgid "Res: %1"
 msgstr "分辨率：%1"
 
-#: kfax.cpp:1462
+#: kfax.cpp:1463
 msgid "Type: Tiff "
 msgstr "类型：Tiff "
 
-#: kfax.cpp:1465
+#: kfax.cpp:1466
 msgid "Type: Raw "
 msgstr "类型：Raw "
 
-#: kfax.cpp:1622
+#: kfax.cpp:1623
 msgid "TDE G3/G4 Fax Viewer"
 msgstr "TDE G3/G4 传真查看器"
 
-#: kfax.cpp:1627
+#: kfax.cpp:1628
 msgid "Fine resolution"
 msgstr "高分辨率"
 
-#: kfax.cpp:1629
+#: kfax.cpp:1630
 msgid "Normal resolution"
 msgstr "普通分辨率"
 
-#: kfax.cpp:1630
+#: kfax.cpp:1631
 msgid "Height (number of fax lines)"
 msgstr "高度(传真线数)"
 
-#: kfax.cpp:1632
+#: kfax.cpp:1633
 msgid "Width (dots per fax line)"
 msgstr "宽度(传真每线点数)"
 
-#: kfax.cpp:1634
+#: kfax.cpp:1635
 msgid "Turn image 90 degrees (landscape mode)"
 msgstr "页面旋转 90 度(横向模式)"
 
-#: kfax.cpp:1636
+#: kfax.cpp:1637
 msgid "Turn image upside down"
 msgstr "上下颠倒图像"
 
-#: kfax.cpp:1638
+#: kfax.cpp:1639
 msgid "Invert black and white"
 msgstr "黑白反转"
 
-#: kfax.cpp:1640
+#: kfax.cpp:1641
 msgid "Limit memory use to 'bytes'"
 msgstr "限制内存的使用数量(字节)"
 
-#: kfax.cpp:1642
+#: kfax.cpp:1643
 msgid "Fax data is packed lsb first"
 msgstr "传真数据以 LSB 在前的方式封装"
 
-#: kfax.cpp:1643
+#: kfax.cpp:1644
 msgid "Raw files are g3-2d"
 msgstr "原始文件是 g3-2d"
 
-#: kfax.cpp:1644
+#: kfax.cpp:1645
 msgid "Raw files are g4"
 msgstr "原始文件是 g4"
 
-#: kfax.cpp:1645
+#: kfax.cpp:1646
 msgid "Fax file(s) to show"
 msgstr "要显示的传真文件"
 
-#: kfax.cpp:1655
+#: kfax.cpp:1656
 msgid "UI Rewrite, lots of code cleanups and fixes"
 msgstr "UI 重写，大量代码清理和修改"
 
-#: kfax.cpp:1657
+#: kfax.cpp:1658
 msgid "Printing Rewrite, lots of code cleanups and fixes"
 msgstr "打印重写，大量代码清理和修改"
 
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/kfaxview.po b/tde-i18n-zh_CN/messages/tdegraphics/kfaxview.po
index 90eda445f84..362a92f77f4 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/kfaxview.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/kfaxview.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tdegraphics\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2005-10-15 02:46+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2007-03-06 14:00+0000\n"
 "Last-Translator: Lie_Ex <lilith.ex@gmail.com>\n"
 "Language-Team: Chinese (China) <zh_CN@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/kgamma.po b/tde-i18n-zh_CN/messages/tdegraphics/kgamma.po
index fb2e8a5143b..a3b6e559152 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/kgamma.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/kgamma.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kgamma\n"
-"POT-Creation-Date: 2006-09-24 02:37+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-01-14 23:00+0800\n"
 "Last-Translator: Justin Fang <justin_fang@msn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -59,7 +60,8 @@ msgid "Blue:"
 msgstr "蓝色："
 
 #: kgamma.cpp:258
-msgid "Save settings to XF86Config"
+#, fuzzy
+msgid "Save settings to X-Server Config"
 msgstr "保存设置到 XF86Config"
 
 #: kgamma.cpp:261
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/kghostview.po b/tde-i18n-zh_CN/messages/tdegraphics/kghostview.po
index 6e17c7b87d1..e340d697689 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/kghostview.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/kghostview.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kghostview\n"
-"POT-Creation-Date: 2008-07-08 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-05-06 16:14+0800\n"
 "Last-Translator: Chen Xun <chenxun@peoplemail.com.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -634,14 +635,26 @@ msgid ""
 "If this is on, then the file will be reloaded whenever it changes on disk"
 msgstr ""
 
-#. i18n: file kghostview.kcfg line 52
+#. i18n: file kghostview.kcfg line 50
 #: rc.cpp:109
 #, no-c-format
+msgid "Retain document viewing data"
+msgstr ""
+
+#. i18n: file kghostview.kcfg line 51
+#: rc.cpp:112
+#, no-c-format
+msgid "If this is on, then document viewing options are retained"
+msgstr ""
+
+#. i18n: file kghostview.kcfg line 57
+#: rc.cpp:115
+#, no-c-format
 msgid "The ghostscript interpreter to use"
 msgstr "要使用的 ghostscript 解释器"
 
-#. i18n: file kghostview.kcfg line 53
-#: rc.cpp:112
+#. i18n: file kghostview.kcfg line 58
+#: rc.cpp:118
 #, no-c-format
 msgid ""
 "Kghostview does not, itself, display the document: it relies on ghostscript, "
@@ -649,28 +662,28 @@ msgid ""
 "interpreter to use."
 msgstr ""
 
-#. i18n: file kghostview.kcfg line 57
-#: rc.cpp:115
+#. i18n: file kghostview.kcfg line 62
+#: rc.cpp:121
 #, no-c-format
 msgid "Arguments for ghostscript if running with antialiasing"
 msgstr ""
 
-#. i18n: file kghostview.kcfg line 67
-#: rc.cpp:118
+#. i18n: file kghostview.kcfg line 72
+#: rc.cpp:124
 #, no-c-format
 msgid "This is the ghostscript version you are running"
 msgstr "这是您正在运行的 ghostscript 版本"
 
-#. i18n: file kghostview.kcfg line 68
-#: rc.cpp:121
+#. i18n: file kghostview.kcfg line 73
+#: rc.cpp:127
 #, no-c-format
 msgid ""
 "This is the version of ghostscript you are running. Normally you will not need "
 "to change this since it gets detected automatically."
 msgstr ""
 
-#. i18n: file kghostview.kcfg line 71
-#: rc.cpp:124
+#. i18n: file kghostview.kcfg line 76
+#: rc.cpp:130
 #, no-c-format
 msgid "This is an internal setting"
 msgstr "这是内部设置"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/kmrml.po b/tde-i18n-zh_CN/messages/tdegraphics/kmrml.po
index e5a489da119..b339aed5859 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/kmrml.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/kmrml.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmrml\n"
-"POT-Creation-Date: 2006-11-25 02:35+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-06-18 23:21+0800\n"
 "Last-Translator: Xiong Jiang <jxiong@offtopic.org>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/kolourpaint.po b/tde-i18n-zh_CN/messages/tdegraphics/kolourpaint.po
index ba01e1d5272..52c3f8bee35 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/kolourpaint.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/kolourpaint.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kolourpaint\n"
-"POT-Creation-Date: 2007-10-23 01:13+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-05-17 00:56+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -463,16 +464,17 @@ msgstr "获取抓图(&S)"
 msgid ""
 "<p>To acquire a screenshot, press <b>%1</b>.  The screenshot will be placed "
 "into the clipboard and you will be able to paste it in KolourPaint.</p>"
-"<p>You may configure the <b>Desktop Screenshot</b> shortcut in the TDE Control "
-"Center module <a href=\"configure kde shortcuts\">Keyboard Shortcuts</a>.</p>"
+"<p>You may configure the <b>Desktop Screenshot</b> shortcut in the Trinity "
+"Control Center module <a href=\"configure kde shortcuts\">Keyboard Shortcuts</a>"
+".</p>"
 "<p>Alternatively, you may try the application <a href=\"run ksnapshot\">"
 "KSnapshot</a>.</p>"
 msgstr ""
 
 #: kpmainwindow_help.cpp:154
 msgid ""
-"<p>You do not appear to be running TDE.</p>"
-"<p>Once you have loaded TDE:"
+"<p>You do not appear to be running KDE.</p>"
+"<p>Once you have loaded KDE:"
 "<br>"
 "<blockquote>To acquire a screenshot, press <b>%1</b>"
 ".  The screenshot will be placed into the clipboard and you will be able to "
@@ -673,7 +675,7 @@ msgstr "文本"
 msgid "Selection"
 msgstr "选择范围"
 
-#: kpthumbnail.cpp:157
+#: kpthumbnail.cpp:139
 msgid "Thumbnail"
 msgstr "缩略图"
 
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/kooka.po b/tde-i18n-zh_CN/messages/tdegraphics/kooka.po
index 1f56c2f18b6..d863f106393 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/kooka.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/kooka.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kooka\n"
-"POT-Creation-Date: 2006-04-23 03:56+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2003-01-16 11:31-0500\n"
 "Last-Translator: Liang Meng <mengliang99@sohu.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -554,7 +555,8 @@ msgid "Version: "
 msgstr ""
 
 #: kooka.cpp:97
-msgid "TDE Scanning"
+#, fuzzy
+msgid "KDE Scanning"
 msgstr "TDE 扫描"
 
 #: kooka.cpp:140
@@ -594,7 +596,8 @@ msgid "Mirror Image &Vertically"
 msgstr "垂直镜像图像(&V)"
 
 #: kooka.cpp:195
-msgid "&Mirror Image Horizontally"
+#, fuzzy
+msgid "&Mirror ImageQt::Horizontally"
 msgstr "水平镜像图像(&M)"
 
 #: kooka.cpp:199
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/kpdf.po b/tde-i18n-zh_CN/messages/tdegraphics/kpdf.po
index 3a71a9d9321..327d15f0b29 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/kpdf.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/kpdf.po
@@ -7,220 +7,27 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kpdf\n"
-"POT-Creation-Date: 2008-07-23 01:41+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-08-02 17:13+0800\n"
 "Last-Translator: Yan Shuangchun <yahzee@d3eye.com>\n"
 "Language-Team: zh_CN <18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: ui/presentationwidget.cpp:148
-#, c-format
-msgid "Title: %1"
-msgstr "标题：%1"
-
-#: ui/presentationwidget.cpp:150
-#, c-format
-msgid "Author: %1"
-msgstr "作者：%1"
-
-#: ui/presentationwidget.cpp:152
-#, c-format
-msgid "Pages: %1"
-msgstr "页数：%1"
-
-#: ui/presentationwidget.cpp:153
-msgid "Click to begin"
-msgstr "点击开始"
-
-#: ui/presentationwidget.cpp:329
-msgid ""
-"There are two ways of exiting presentation mode, you can press either ESC key "
-"or click with the quit button that appears when placing the mouse in the "
-"top-right corner. Of course you can cycle windows (Alt+TAB by default)"
-msgstr ""
-"退出展示模式有两种方法，您可以按 Esc 键，也可以将鼠标移至右上角，单击随后出现的退出按钮。当然，您也可以循环窗口(默认为 Alt+Tab)"
-
-#: ui/thumbnaillist.cpp:568
-msgid "Show bookmarked pages only"
-msgstr "只显示书签中的页面"
-
-#: ui/searchwidget.cpp:49
-msgid "Enter at least 3 letters to filter pages"
-msgstr "输入至少三个字母来过滤页面"
-
-#: ui/searchwidget.cpp:55
-msgid "Clear filter"
-msgstr "清除过滤器"
-
-#: ui/searchwidget.cpp:59
-msgid "Case Sensitive"
-msgstr "区分大小写"
-
-#: ui/searchwidget.cpp:61
-msgid "Match Phrase"
-msgstr "匹配短语"
-
-#: ui/searchwidget.cpp:62
-msgid "Match All Words"
-msgstr "匹配全部单词"
-
-#: ui/searchwidget.cpp:63
-msgid "Match Any Word"
-msgstr "匹配任何单词"
-
-#: ui/searchwidget.cpp:68
-msgid "Filter Options"
-msgstr "过滤器选项"
-
-#: ui/toc.cpp:59
-msgid "Topic"
-msgstr "主题"
-
-#: ui/pageview.cpp:257
-msgid "Fit to Page &Width"
-msgstr "适合页宽度(&W)"
-
-#: ui/pageview.cpp:260
-msgid "Fit to &Page"
-msgstr "适合整页(&P)"
-
-#: ui/pageview.cpp:263
-msgid "Fit to &Text"
-msgstr "适合文本(&T)"
-
-#: ui/pageview.cpp:267
-msgid "&Two Pages"
-msgstr "双页(&T)"
-
-#: ui/pageview.cpp:271
-msgid "&Continuous"
-msgstr "连续(&C)"
-
-#: ui/pageview.cpp:276
-msgid "&Browse Tool"
-msgstr "浏览工具(&B)"
-
-#: ui/pageview.cpp:280
-msgid "&Zoom Tool"
-msgstr "缩放工具(&Z)"
-
-#: ui/pageview.cpp:283
-msgid "&Select Tool"
-msgstr "选择工具(&S)"
-
-#: ui/pageview.cpp:291
-msgid "Scroll Up"
-msgstr "向上滚动"
-
-#: ui/pageview.cpp:294
-msgid "Scroll Down"
-msgstr "向下滚动"
-
-#: ui/pageview.cpp:354
-#, c-format
+#: _translatorinfo.cpp:1
 msgid ""
-"_n:  Loaded a one-page document.\n"
-" Loaded a %n-page document."
-msgstr "装入了 %n 页文档。"
-
-#: ui/pageview.cpp:654 ui/pageview.cpp:675 ui/pageview.cpp:1635
-msgid "Text found: \"%1\"."
-msgstr "找到了文字：“%1”。"
-
-#: ui/pageview.cpp:654 ui/pageview.cpp:1635
-msgid "Text not found: \"%1\"."
-msgstr "文字未找到：“%1”。"
-
-#: ui/pageview.cpp:706
-msgid "Starting -- find text as you type"
-msgstr "开始 - 即打即找。"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Mai Hao Hui,颜双春"
 
-#: ui/pageview.cpp:1117
-#, c-format
+#: _translatorinfo.cpp:3
 msgid ""
-"_n: Text (1 character)\n"
-"Text (%n characters)"
-msgstr "文本(%n 个字符)"
-
-#: ui/pageview.cpp:1118 ui/pageview.cpp:1125
-msgid "Copy to Clipboard"
-msgstr "复制到剪贴板"
-
-#: ui/pageview.cpp:1122
-msgid "Speak Text"
-msgstr "读出文本"
-
-#: ui/pageview.cpp:1124
-msgid "Image (%1 by %2 pixels)"
-msgstr "图像(%1x%2 像素)"
-
-#: ui/pageview.cpp:1126
-msgid "Save to File..."
-msgstr "保存到文件..."
-
-#: ui/pageview.cpp:1144
-msgid "Image [%1x%2] copied to clipboard."
-msgstr "图像[%1x%2]已复制到剪贴板。"
-
-#: ui/pageview.cpp:1151
-msgid "File not saved."
-msgstr "文件未保存。"
-
-#: ui/pageview.cpp:1158
-msgid "Image [%1x%2] saved to %3 file."
-msgstr "图像[%1x%2]已保存到 %3 文件。"
-
-#: ui/pageview.cpp:1187
-#, c-format
-msgid "Starting KTTSD Failed: %1"
-msgstr "启动 KTTSD 失败：%1"
-
-#: part.cpp:948 ui/pageview.cpp:1571
-msgid "Fit Width"
-msgstr "适合宽度"
-
-#: ui/pageview.cpp:1571
-msgid "Fit Page"
-msgstr "适合整页"
-
-#: ui/pageview.cpp:2003
-msgid "Find stopped."
-msgstr "查找已停止。"
-
-#: ui/pageview.cpp:2013
-msgid "Welcome"
-msgstr "欢迎"
-
-#: ui/pageview.cpp:2079
-msgid "Select zooming area. Right-click to zoom out."
-msgstr "选择缩放区域。右键单击可缩小。"
-
-#: ui/pageview.cpp:2085
-msgid "Draw a rectangle around the text/graphics to copy."
-msgstr "在要复制的文字/图形周围绘制矩形。"
-
-#: ui/propertiesdialog.cpp:23
-msgid "Unknown File"
-msgstr "未知文件"
-
-#: ui/propertiesdialog.cpp:32
-msgid "No document opened."
-msgstr "没有打开文档。"
-
-#: ui/propertiesdialog.cpp:38
-msgid "%1 Properties"
-msgstr "%1 属性"
-
-#: ui/propertiesdialog.cpp:53
-msgid "%1:"
-msgstr "%1："
-
-#: ui/propertiesdialog.cpp:66
-msgid "Pages:"
-msgstr "页数："
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "mhh@ricetons.com,yahzee@d3eye.com"
 
 #: conf/dlgperformance.ui.h:25
 msgid ""
@@ -272,276 +79,22 @@ msgstr "展示"
 msgid "Options for Presentation Mode"
 msgstr "展示模式的选项"
 
-#: core/document.cpp:750
-msgid ""
-"End of document reached.\n"
-"Continue from the beginning?"
-msgstr ""
-"到达文档结尾。\n"
-"从开始处继续吗？"
-
-#: core/document.cpp:796
-msgid "No matches found for '%1'."
-msgstr "“%1”没有匹配项。"
-
-#: core/document.cpp:998 core/document.cpp:1006
-msgid ""
-"The pdf file is trying to execute an external application and for your safety "
-"kpdf does not allow that."
-msgstr "PDF 文件视图执行外部应用程序。而为安全起见，KPDF 不允许文件这样做。"
-
-#: core/document.cpp:1019
-#, c-format
-msgid "No application found for opening file of mimetype %1."
-msgstr "没有找到可打开 MIME 类型 %1 的应用程序。"
-
-#: core/generator_pdf/generator_pdf.cpp:144
-msgid "Please insert the password to read the document:"
-msgstr "请输入读取文档所需的密码："
-
-#: core/generator_pdf/generator_pdf.cpp:146
-msgid "Incorrect password. Try again:"
-msgstr "密码不正确。请再试一次："
-
-#: core/generator_pdf/generator_pdf.cpp:200
-msgid "Title"
-msgstr "标题"
-
-#: core/generator_pdf/generator_pdf.cpp:201
-msgid "Subject"
-msgstr "主题"
-
-#: core/generator_pdf/generator_pdf.cpp:202
-msgid "Author"
-msgstr "作者"
-
-#: core/generator_pdf/generator_pdf.cpp:203
-msgid "Keywords"
-msgstr "关键字"
-
-#: core/generator_pdf/generator_pdf.cpp:204
-msgid "Creator"
-msgstr "创建者"
-
-#: core/generator_pdf/generator_pdf.cpp:205
-msgid "Producer"
-msgstr "制作者"
-
-#: core/generator_pdf/generator_pdf.cpp:206
-msgid "Created"
-msgstr "创建时间"
-
-#: core/generator_pdf/generator_pdf.cpp:207
-msgid "Modified"
-msgstr "修改时间"
-
-#: core/generator_pdf/generator_pdf.cpp:211
-#, c-format
-msgid ""
-"_: PDF v. <version>\n"
-"PDF v. %1"
-msgstr "PDF v. %1"
-
-#: core/generator_pdf/generator_pdf.cpp:212
-#: core/generator_pdf/generator_pdf.cpp:221
-msgid "Format"
-msgstr "格式"
-
-#: core/generator_pdf/generator_pdf.cpp:213
-msgid "Encrypted"
-msgstr "已加密"
-
-#: core/generator_pdf/generator_pdf.cpp:213
-msgid "Unencrypted"
-msgstr "未加密"
-
-#: core/generator_pdf/generator_pdf.cpp:214
-#: core/generator_pdf/generator_pdf.cpp:222
-msgid "Security"
-msgstr "安全性"
-
-#: core/generator_pdf/generator_pdf.cpp:216
-#: core/generator_pdf/generator_pdf.cpp:223
-msgid "Optimized"
-msgstr "已优化"
-
-#: core/generator_pdf/generator_pdf.cpp:217
-msgid "Pages"
-msgstr "页数"
-
-#: core/generator_pdf/generator_pdf.cpp:222
-msgid "Unknown Encryption"
-msgstr "未知加密"
-
-#: core/generator_pdf/generator_pdf.cpp:223
-msgid "Unknown Optimization"
-msgstr "未知优化"
-
-#: core/generator_pdf/generator_pdf.cpp:374
-msgid "Name"
-msgstr "名称"
-
-#: core/generator_pdf/generator_pdf.cpp:375
-msgid "Type"
-msgstr "类型"
-
-#: core/generator_pdf/generator_pdf.cpp:376
-msgid "Embedded"
-msgstr "嵌入"
-
-#: core/generator_pdf/generator_pdf.cpp:486
-msgid ""
-"The margins you specified change the page aspect ratio. Do you want to print "
-"with the aspect ratio changed or do you want the margins to be adapted so that "
-"the aspect ratio is preserved?"
-msgstr ""
-
-#: core/generator_pdf/generator_pdf.cpp:487
-msgid "Aspect ratio change"
-msgstr ""
-
-#: core/generator_pdf/generator_pdf.cpp:488
-msgid "Print with specified margins"
-msgstr ""
-
-#: core/generator_pdf/generator_pdf.cpp:489
-msgid "Print adapting margins to keep aspect ratio"
-msgstr ""
-
-#: core/generator_pdf/generator_pdf.cpp:720
-msgid "unknown"
-msgstr "未知"
-
-#: core/generator_pdf/generator_pdf.cpp:721
-msgid "Type 1"
-msgstr "Type 1"
-
-#: core/generator_pdf/generator_pdf.cpp:722
-msgid "Type 1C"
-msgstr "Type 1C"
-
-#: core/generator_pdf/generator_pdf.cpp:723
-msgid ""
-"_: OT means OpenType\n"
-"Type 1C (OT)"
-msgstr ""
-
-#: core/generator_pdf/generator_pdf.cpp:724
-msgid "Type 3"
-msgstr "Type 3"
-
-#: core/generator_pdf/generator_pdf.cpp:725
-msgid "TrueType"
-msgstr "TrueType"
-
-#: core/generator_pdf/generator_pdf.cpp:726
-msgid ""
-"_: OT means OpenType\n"
-"TrueType (OT)"
-msgstr ""
-
-#: core/generator_pdf/generator_pdf.cpp:727
-msgid "CID Type 0"
-msgstr "Cid Type 0"
-
-#: core/generator_pdf/generator_pdf.cpp:728
-msgid "CID Type 0C"
-msgstr "CID Type 0C"
+#: shell/shell.cpp:86
+msgid "Unable to find kpdf part."
+msgstr "无法找到 kpdf 部件。"
 
-#: core/generator_pdf/generator_pdf.cpp:729
+#: shell/shell.cpp:132
 msgid ""
-"_: OT means OpenType\n"
-"CID Type 0C (OT)"
+"Click to open a file\n"
+"Click and hold to open a recent file"
 msgstr ""
+"单击可打开文件\n"
+"单击并按住可打开最近的文件"
 
-#: core/generator_pdf/generator_pdf.cpp:730
-msgid "CID TrueType"
-msgstr "CID TrueType"
-
-#: core/generator_pdf/generator_pdf.cpp:731
+#: shell/shell.cpp:152
 msgid ""
-"_: OT means OpenType\n"
-"CID TrueType (OT)"
-msgstr ""
-
-#: core/generator_pdf/generator_pdf.cpp:764
-#: core/generator_pdf/generator_pdf.cpp:766
-#: core/generator_pdf/generator_pdf.cpp:771
-msgid "-"
-msgstr "-"
-
-#: core/generator_pdf/generator_pdf.cpp:770
-msgid "[none]"
-msgstr "[无]"
-
-#: core/generator_pdf/generator_pdf.cpp:791
-#: core/generator_pdf/generator_pdf.cpp:795
-#: core/generator_pdf/generator_pdf.cpp:809
-msgid "Unknown"
-msgstr "未知"
-
-#: core/generator_pdf/generator_pdf.cpp:817
-#: core/generator_pdf/generator_pdf.cpp:822
-#: core/generator_pdf/generator_pdf.cpp:831
-#: core/generator_pdf/generator_pdf.cpp:852
-msgid "Unknown Date"
-msgstr "未知日期"
-
-#: core/link.cpp:21
-#, fuzzy, c-format
-msgid "Go to page %1"
-msgstr "前往页面"
-
-#: core/link.cpp:21
-msgid "Open external file"
-msgstr ""
-
-#: core/link.cpp:26
-msgid "Execute '%1'..."
-msgstr ""
-
-#: core/link.cpp:39
-#, fuzzy
-msgid "First Page"
-msgstr "适合整页"
-
-#: core/link.cpp:41
-msgid "Previous Page"
-msgstr ""
-
-#: core/link.cpp:43
-#, fuzzy
-msgid "Next Page"
-msgstr "适合整页"
-
-#: core/link.cpp:45
-#, fuzzy
-msgid "Last Page"
-msgstr "适合整页"
-
-#: core/link.cpp:49
-#, fuzzy
-msgid "Forward"
-msgstr "格式"
-
-#: core/link.cpp:53
-#, fuzzy
-msgid "Start Presentation"
-msgstr "展示"
-
-#: core/link.cpp:55
-#, fuzzy
-msgid "End Presentation"
-msgstr "展示"
-
-#: core/link.cpp:57
-msgid "Find..."
-msgstr ""
-
-#: core/link.cpp:59
-#, fuzzy
-msgid "Go To Page..."
-msgstr "前往页面"
+"<b>Click</b> to open a file or <b>Click and hold</b> to select a recent file"
+msgstr "<b>单击</b>可打开文件，<b>单击并按住</b>可打开最近的文件"
 
 #: shell/main.cpp:22
 msgid "kpdf, a kde pdf viewer based on xpdf"
@@ -567,35 +120,6 @@ msgstr "Xpdf 作者"
 msgid "Icon"
 msgstr "图标"
 
-#: shell/shell.cpp:86
-msgid "Unable to find kpdf part."
-msgstr "无法找到 kpdf 部件。"
-
-#: shell/shell.cpp:132
-msgid ""
-"Click to open a file\n"
-"Click and hold to open a recent file"
-msgstr ""
-"单击可打开文件\n"
-"单击并按住可打开最近的文件"
-
-#: shell/shell.cpp:152
-msgid ""
-"<b>Click</b> to open a file or <b>Click and hold</b> to select a recent file"
-msgstr "<b>单击</b>可打开文件，<b>单击并按住</b>可打开最近的文件"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Mai Hao Hui,颜双春"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "mhh@ricetons.com,yahzee@d3eye.com"
-
 #: part.cpp:82
 #, fuzzy
 msgid "PDF Options"
@@ -743,6 +267,10 @@ msgstr "删除书签"
 msgid "Add Bookmark"
 msgstr "添加书签"
 
+#: part.cpp:948 ui/pageview.cpp:1581
+msgid "Fit Width"
+msgstr "适合宽度"
+
 #: part.cpp:963
 msgid "Tools"
 msgstr "工具"
@@ -755,344 +283,833 @@ msgstr "不允许打印此文档。"
 msgid "Could not print the document. Please report to bugs.kde.org"
 msgstr "无法打印文档。请在 bugs.kde.org 报告"
 
-#. i18n: file part.rc line 26
-#: rc.cpp:12 rc.cpp:210
-#, no-c-format
-msgid "&Go"
-msgstr "转到(&G)"
+#: core/document.cpp:750
+msgid ""
+"End of document reached.\n"
+"Continue from the beginning?"
+msgstr ""
+"到达文档结尾。\n"
+"从开始处继续吗？"
 
-#. i18n: file ./conf/dlgperformance.ui line 35
-#: rc.cpp:24
-#, no-c-format
-msgid "CPU Usage"
-msgstr "CPU 使用"
+#: core/document.cpp:796
+msgid "No matches found for '%1'."
+msgstr "“%1”没有匹配项。"
 
-#. i18n: file ./conf/dlgperformance.ui line 54
-#: rc.cpp:27
-#, no-c-format
-msgid "Enable &transparency effects"
-msgstr "禁用透明效果(&T)"
+#: core/document.cpp:998 core/document.cpp:1006
+msgid ""
+"The pdf file is trying to execute an external application and for your safety "
+"kpdf does not allow that."
+msgstr "PDF 文件视图执行外部应用程序。而为安全起见，KPDF 不允许文件这样做。"
 
-#. i18n: file ./conf/dlgperformance.ui line 62
-#: rc.cpp:30
-#, no-c-format
-msgid "Enable &background generation"
-msgstr "禁用后台生成(&B)"
+#: core/document.cpp:1019
+#, c-format
+msgid "No application found for opening file of mimetype %1."
+msgstr "没有找到可打开 MIME 类型 %1 的应用程序。"
 
-#. i18n: file ./conf/dlgperformance.ui line 125
-#: rc.cpp:33
-#, no-c-format
-msgid "Memory Usage"
-msgstr "内存使用"
+#: core/link.cpp:21
+#, fuzzy, c-format
+msgid "Go to page %1"
+msgstr "前往页面"
 
-#. i18n: file ./conf/dlgperformance.ui line 158
-#: rc.cpp:36
-#, no-c-format
-msgid "&Low"
-msgstr "低(&L)"
+#: core/link.cpp:21
+msgid "Open external file"
+msgstr ""
 
-#. i18n: file ./conf/dlgperformance.ui line 166
-#: rc.cpp:39
-#, no-c-format
-msgid "&Normal (default)"
-msgstr "普通(默认)(&N)"
+#: core/link.cpp:26
+msgid "Execute '%1'..."
+msgstr ""
 
-#. i18n: file ./conf/dlgperformance.ui line 174
-#: rc.cpp:42
-#, no-c-format
-msgid "&Aggressive"
-msgstr "激进(&A)"
+#: core/link.cpp:39
+#, fuzzy
+msgid "First Page"
+msgstr "适合整页"
 
-#. i18n: file ./conf/dlggeneral.ui line 27
-#: rc.cpp:45
-#, no-c-format
-msgid "Program Look"
-msgstr "程序外观"
+#: core/link.cpp:41
+msgid "Previous Page"
+msgstr ""
 
-#. i18n: file ./conf/dlggeneral.ui line 49
-#: rc.cpp:48
-#, no-c-format
-msgid "Show &search bar in thumbnails list"
-msgstr "在缩略图列表中显示搜索栏(&S)"
+#: core/link.cpp:43
+#, fuzzy
+msgid "Next Page"
+msgstr "适合整页"
 
-#. i18n: file ./conf/dlggeneral.ui line 60
-#: rc.cpp:51
-#, no-c-format
-msgid "Link the &thumbnails with the page"
-msgstr "将缩略图列表与页面链接(&T)"
+#: core/link.cpp:45
+#, fuzzy
+msgid "Last Page"
+msgstr "适合整页"
 
-#. i18n: file ./conf/dlggeneral.ui line 68
-#: rc.cpp:54
-#, no-c-format
-msgid "Show scroll&bars"
-msgstr "显示滚动条(&B)"
+#: core/link.cpp:49
+#, fuzzy
+msgid "Forward"
+msgstr "格式"
 
-#. i18n: file ./conf/dlggeneral.ui line 76
-#: rc.cpp:57
-#, no-c-format
-msgid "Show &hints and info messages"
-msgstr "显示提示和信息(&H)"
+#: core/link.cpp:53
+#, fuzzy
+msgid "Start Presentation"
+msgstr "展示"
 
-#. i18n: file ./conf/dlggeneral.ui line 84
-#: rc.cpp:60
-#, no-c-format
-msgid "&Obey DRM limitations"
-msgstr "遵从 DRM 限制(&O)"
+#: core/link.cpp:55
+#, fuzzy
+msgid "End Presentation"
+msgstr "展示"
 
-#. i18n: file ./conf/dlggeneral.ui line 92
-#: rc.cpp:63
+#: core/link.cpp:57
+msgid "Find..."
+msgstr ""
+
+#: core/link.cpp:59
+#, fuzzy
+msgid "Go To Page..."
+msgstr "前往页面"
+
+#: core/generator_pdf/generator_pdf.cpp:144
+msgid "Please insert the password to read the document:"
+msgstr "请输入读取文档所需的密码："
+
+#: core/generator_pdf/generator_pdf.cpp:146
+msgid "Incorrect password. Try again:"
+msgstr "密码不正确。请再试一次："
+
+#: core/generator_pdf/generator_pdf.cpp:200
+msgid "Title"
+msgstr "标题"
+
+#: core/generator_pdf/generator_pdf.cpp:201
+msgid "Subject"
+msgstr "主题"
+
+#: core/generator_pdf/generator_pdf.cpp:202
+msgid "Author"
+msgstr "作者"
+
+#: core/generator_pdf/generator_pdf.cpp:203
+msgid "Keywords"
+msgstr "关键字"
+
+#: core/generator_pdf/generator_pdf.cpp:204
+msgid "Creator"
+msgstr "创建者"
+
+#: core/generator_pdf/generator_pdf.cpp:205
+msgid "Producer"
+msgstr "制作者"
+
+#: core/generator_pdf/generator_pdf.cpp:206
+msgid "Created"
+msgstr "创建时间"
+
+#: core/generator_pdf/generator_pdf.cpp:207
+msgid "Modified"
+msgstr "修改时间"
+
+#: core/generator_pdf/generator_pdf.cpp:211
+#, c-format
+msgid ""
+"_: PDF v. <version>\n"
+"PDF v. %1"
+msgstr "PDF v. %1"
+
+#: core/generator_pdf/generator_pdf.cpp:212
+#: core/generator_pdf/generator_pdf.cpp:221
+msgid "Format"
+msgstr "格式"
+
+#: core/generator_pdf/generator_pdf.cpp:213
+msgid "Encrypted"
+msgstr "已加密"
+
+#: core/generator_pdf/generator_pdf.cpp:213
+msgid "Unencrypted"
+msgstr "未加密"
+
+#: core/generator_pdf/generator_pdf.cpp:214
+#: core/generator_pdf/generator_pdf.cpp:222
+msgid "Security"
+msgstr "安全性"
+
+#: core/generator_pdf/generator_pdf.cpp:216
+#: core/generator_pdf/generator_pdf.cpp:223
+msgid "Optimized"
+msgstr "已优化"
+
+#: core/generator_pdf/generator_pdf.cpp:217
+msgid "Pages"
+msgstr "页数"
+
+#: core/generator_pdf/generator_pdf.cpp:222
+msgid "Unknown Encryption"
+msgstr "未知加密"
+
+#: core/generator_pdf/generator_pdf.cpp:223
+msgid "Unknown Optimization"
+msgstr "未知优化"
+
+#: core/generator_pdf/generator_pdf.cpp:375
+msgid "Name"
+msgstr "名称"
+
+#: core/generator_pdf/generator_pdf.cpp:376
+msgid "Type"
+msgstr "类型"
+
+#: core/generator_pdf/generator_pdf.cpp:377
+msgid "Embedded"
+msgstr "嵌入"
+
+#: core/generator_pdf/generator_pdf.cpp:487
+msgid ""
+"The margins you specified change the page aspect ratio. Do you want to print "
+"with the aspect ratio changed or do you want the margins to be adapted so that "
+"the aspect ratio is preserved?"
+msgstr ""
+
+#: core/generator_pdf/generator_pdf.cpp:488
+msgid "Aspect ratio change"
+msgstr ""
+
+#: core/generator_pdf/generator_pdf.cpp:489
+msgid "Print with specified margins"
+msgstr ""
+
+#: core/generator_pdf/generator_pdf.cpp:490
+msgid "Print adapting margins to keep aspect ratio"
+msgstr ""
+
+#: core/generator_pdf/generator_pdf.cpp:721
+msgid "unknown"
+msgstr "未知"
+
+#: core/generator_pdf/generator_pdf.cpp:722
+msgid "Type 1"
+msgstr "Type 1"
+
+#: core/generator_pdf/generator_pdf.cpp:723
+msgid "Type 1C"
+msgstr "Type 1C"
+
+#: core/generator_pdf/generator_pdf.cpp:724
+msgid ""
+"_: OT means OpenType\n"
+"Type 1C (OT)"
+msgstr ""
+
+#: core/generator_pdf/generator_pdf.cpp:725
+msgid "Type 3"
+msgstr "Type 3"
+
+#: core/generator_pdf/generator_pdf.cpp:726
+msgid "TrueType"
+msgstr "TrueType"
+
+#: core/generator_pdf/generator_pdf.cpp:727
+msgid ""
+"_: OT means OpenType\n"
+"TrueType (OT)"
+msgstr ""
+
+#: core/generator_pdf/generator_pdf.cpp:728
+msgid "CID Type 0"
+msgstr "Cid Type 0"
+
+#: core/generator_pdf/generator_pdf.cpp:729
+msgid "CID Type 0C"
+msgstr "CID Type 0C"
+
+#: core/generator_pdf/generator_pdf.cpp:730
+msgid ""
+"_: OT means OpenType\n"
+"CID Type 0C (OT)"
+msgstr ""
+
+#: core/generator_pdf/generator_pdf.cpp:731
+msgid "CID TrueType"
+msgstr "CID TrueType"
+
+#: core/generator_pdf/generator_pdf.cpp:732
+msgid ""
+"_: OT means OpenType\n"
+"CID TrueType (OT)"
+msgstr ""
+
+#: core/generator_pdf/generator_pdf.cpp:765
+#: core/generator_pdf/generator_pdf.cpp:767
+#: core/generator_pdf/generator_pdf.cpp:772
+msgid "-"
+msgstr "-"
+
+#: core/generator_pdf/generator_pdf.cpp:771
+msgid "[none]"
+msgstr "[无]"
+
+#: core/generator_pdf/generator_pdf.cpp:792
+#: core/generator_pdf/generator_pdf.cpp:796
+#: core/generator_pdf/generator_pdf.cpp:810
+msgid "Unknown"
+msgstr "未知"
+
+#: core/generator_pdf/generator_pdf.cpp:818
+#: core/generator_pdf/generator_pdf.cpp:823
+#: core/generator_pdf/generator_pdf.cpp:832
+#: core/generator_pdf/generator_pdf.cpp:853
+msgid "Unknown Date"
+msgstr "未知日期"
+
+#. i18n: file part.rc line 28
+#: rc.cpp:12 rc.cpp:213
 #, no-c-format
-msgid "&Watch file"
-msgstr "监视文件(&W)"
+msgid "&Go"
+msgstr "转到(&G)"
 
 #. i18n: file ./conf/dlgpresentation.ui line 27
-#: rc.cpp:66
+#: rc.cpp:24
 #, no-c-format
 msgid "Navigation"
 msgstr "导航"
 
 #. i18n: file ./conf/dlgpresentation.ui line 49
-#: rc.cpp:69
+#: rc.cpp:27
 #, no-c-format
 msgid " sec."
 msgstr " 秒"
 
 #. i18n: file ./conf/dlgpresentation.ui line 60
-#: rc.cpp:72
+#: rc.cpp:30
 #, no-c-format
 msgid "Advance every:"
 msgstr "预先装入："
 
 #. i18n: file ./conf/dlgpresentation.ui line 68
-#: rc.cpp:75
+#: rc.cpp:33
 #, no-c-format
 msgid "Loop after last page"
 msgstr "最后一页后循环"
 
 #. i18n: file ./conf/dlgpresentation.ui line 89
-#: rc.cpp:81
-#, no-c-format
-msgid "Blinds Vertical"
+#: rc.cpp:39
+#, fuzzy, no-c-format
+msgid "BlindsQt::Vertical"
 msgstr "垂直百叶窗"
 
 #. i18n: file ./conf/dlgpresentation.ui line 94
-#: rc.cpp:84
-#, no-c-format
-msgid "Blinds Horizontal"
+#: rc.cpp:42
+#, fuzzy, no-c-format
+msgid "BlindsQt::Horizontal"
 msgstr "水平百叶窗"
 
 #. i18n: file ./conf/dlgpresentation.ui line 99
-#: rc.cpp:87
+#: rc.cpp:45
 #, no-c-format
 msgid "Box In"
 msgstr "盒状收缩"
 
 #. i18n: file ./conf/dlgpresentation.ui line 104
-#: rc.cpp:90
+#: rc.cpp:48
 #, no-c-format
 msgid "Box Out"
 msgstr "盒装展开"
 
 #. i18n: file ./conf/dlgpresentation.ui line 109
-#: rc.cpp:93
+#: rc.cpp:51
 #, no-c-format
 msgid "Dissolve"
 msgstr "溶解"
 
 #. i18n: file ./conf/dlgpresentation.ui line 114
-#: rc.cpp:96
+#: rc.cpp:54
 #, no-c-format
 msgid "Glitter Down"
 msgstr "向下拉出"
 
 #. i18n: file ./conf/dlgpresentation.ui line 119
-#: rc.cpp:99
+#: rc.cpp:57
 #, no-c-format
 msgid "Glitter Right"
 msgstr "向右拉出"
 
 #. i18n: file ./conf/dlgpresentation.ui line 124
-#: rc.cpp:102
+#: rc.cpp:60
 #, no-c-format
 msgid "Glitter Right-Down"
 msgstr "向右下拉出"
 
 #. i18n: file ./conf/dlgpresentation.ui line 129
-#: rc.cpp:105
+#: rc.cpp:63
 #, no-c-format
 msgid "Random Transition"
 msgstr "随机切换"
 
 #. i18n: file ./conf/dlgpresentation.ui line 139
-#: rc.cpp:111
-#, no-c-format
-msgid "Split Horizontal In"
+#: rc.cpp:69
+#, fuzzy, no-c-format
+msgid "SplitQt::Horizontal In"
 msgstr "两侧水平切入"
 
 #. i18n: file ./conf/dlgpresentation.ui line 144
-#: rc.cpp:114
-#, no-c-format
-msgid "Split Horizontal Out"
+#: rc.cpp:72
+#, fuzzy, no-c-format
+msgid "SplitQt::Horizontal Out"
 msgstr "两侧水平切出"
 
 #. i18n: file ./conf/dlgpresentation.ui line 149
-#: rc.cpp:117
-#, no-c-format
-msgid "Split Vertical In"
+#: rc.cpp:75
+#, fuzzy, no-c-format
+msgid "SplitQt::Vertical In"
 msgstr "两侧垂直切入"
 
 #. i18n: file ./conf/dlgpresentation.ui line 154
-#: rc.cpp:120
-#, no-c-format
-msgid "Split Vertical Out"
+#: rc.cpp:78
+#, fuzzy, no-c-format
+msgid "SplitQt::Vertical Out"
 msgstr "两侧垂直切出"
 
 #. i18n: file ./conf/dlgpresentation.ui line 159
-#: rc.cpp:123
+#: rc.cpp:81
 #, no-c-format
 msgid "Wipe Down"
 msgstr "从下方展开"
 
 #. i18n: file ./conf/dlgpresentation.ui line 164
-#: rc.cpp:126
+#: rc.cpp:84
 #, no-c-format
 msgid "Wipe Right"
 msgstr "从右方展开"
 
 #. i18n: file ./conf/dlgpresentation.ui line 169
-#: rc.cpp:129
+#: rc.cpp:87
 #, no-c-format
 msgid "Wipe Left"
 msgstr "从左方展开"
 
 #. i18n: file ./conf/dlgpresentation.ui line 174
-#: rc.cpp:132
+#: rc.cpp:90
 #, no-c-format
 msgid "Wipe Up"
 msgstr "从上方展开"
 
 #. i18n: file ./conf/dlgpresentation.ui line 186
-#: rc.cpp:135
+#: rc.cpp:93
 #, no-c-format
 msgid "Default transition:"
 msgstr "默认切换："
 
 #. i18n: file ./conf/dlgpresentation.ui line 194
-#: rc.cpp:138
+#: rc.cpp:96
 #, no-c-format
 msgid "Mouse cursor:"
 msgstr "鼠标指针："
 
 #. i18n: file ./conf/dlgpresentation.ui line 200
-#: rc.cpp:141
+#: rc.cpp:99
 #, no-c-format
 msgid "Hidden After Delay"
 msgstr "等...秒后隐藏"
 
 #. i18n: file ./conf/dlgpresentation.ui line 205
-#: rc.cpp:144
+#: rc.cpp:102
 #, no-c-format
 msgid "Always Visible"
 msgstr "总是可见"
 
 #. i18n: file ./conf/dlgpresentation.ui line 210
-#: rc.cpp:147
+#: rc.cpp:105
 #, no-c-format
 msgid "Always Hidden"
 msgstr "总是隐藏"
 
 #. i18n: file ./conf/dlgpresentation.ui line 222
-#: rc.cpp:150
+#: rc.cpp:108
 #, no-c-format
 msgid "Background color:"
 msgstr "背景颜色："
 
 #. i18n: file ./conf/dlgpresentation.ui line 238
-#: rc.cpp:153
+#: rc.cpp:111
 #, no-c-format
 msgid "Show s&ummary page"
 msgstr "显示概览页面(&U)"
 
 #. i18n: file ./conf/dlgpresentation.ui line 246
-#: rc.cpp:156
+#: rc.cpp:114
 #, no-c-format
 msgid "Show &progress indicator"
 msgstr "显示进度指示器(&P)"
 
+#. i18n: file ./conf/dlgperformance.ui line 35
+#: rc.cpp:117
+#, no-c-format
+msgid "CPU Usage"
+msgstr "CPU 使用"
+
+#. i18n: file ./conf/dlgperformance.ui line 54
+#: rc.cpp:120
+#, no-c-format
+msgid "Enable &transparency effects"
+msgstr "禁用透明效果(&T)"
+
+#. i18n: file ./conf/dlgperformance.ui line 62
+#: rc.cpp:123
+#, no-c-format
+msgid "Enable &background generation"
+msgstr "禁用后台生成(&B)"
+
+#. i18n: file ./conf/dlgperformance.ui line 125
+#: rc.cpp:126
+#, no-c-format
+msgid "Memory Usage"
+msgstr "内存使用"
+
+#. i18n: file ./conf/dlgperformance.ui line 158
+#: rc.cpp:129
+#, no-c-format
+msgid "&Low"
+msgstr "低(&L)"
+
+#. i18n: file ./conf/dlgperformance.ui line 166
+#: rc.cpp:132
+#, no-c-format
+msgid "&Normal (default)"
+msgstr "普通(默认)(&N)"
+
+#. i18n: file ./conf/dlgperformance.ui line 174
+#: rc.cpp:135
+#, no-c-format
+msgid "&Aggressive"
+msgstr "激进(&A)"
+
 #. i18n: file ./conf/dlgaccessibility.ui line 27
-#: rc.cpp:159
+#: rc.cpp:138
 #, no-c-format
 msgid "Draw border around &Images"
 msgstr "在图像周围绘制边框(&I)"
 
 #. i18n: file ./conf/dlgaccessibility.ui line 35
-#: rc.cpp:162
+#: rc.cpp:141
 #, no-c-format
 msgid "Draw border around &Links"
 msgstr "在链接周围绘制边框(&L)"
 
 #. i18n: file ./conf/dlgaccessibility.ui line 51
-#: rc.cpp:165
+#: rc.cpp:144
 #, no-c-format
 msgid "Change &Colors"
 msgstr "更改颜色(&C)"
 
 #. i18n: file ./conf/dlgaccessibility.ui line 83
-#: rc.cpp:168
+#: rc.cpp:147
 #, no-c-format
 msgid "Warning: these options can badly affect drawing speed."
 msgstr "警告：这些选项将显著影响绘制速度。"
 
 #. i18n: file ./conf/dlgaccessibility.ui line 125
-#: rc.cpp:171
+#: rc.cpp:150
 #, no-c-format
 msgid "&Invert colors"
 msgstr "反转颜色(&I)"
 
 #. i18n: file ./conf/dlgaccessibility.ui line 136
-#: rc.cpp:174
+#: rc.cpp:153
 #, no-c-format
 msgid "Change &paper color"
 msgstr "更改纸张颜色(&P)"
 
 #. i18n: file ./conf/dlgaccessibility.ui line 172
-#: rc.cpp:177
+#: rc.cpp:156
 #, no-c-format
 msgid "Paper color:"
 msgstr "纸张颜色："
 
 #. i18n: file ./conf/dlgaccessibility.ui line 213
-#: rc.cpp:180
+#: rc.cpp:159
 #, no-c-format
 msgid "&Change dark and light colors"
 msgstr "更改亮暗颜色(&C)"
 
 #. i18n: file ./conf/dlgaccessibility.ui line 308
-#: rc.cpp:183
+#: rc.cpp:162
 #, no-c-format
 msgid "Light color:"
 msgstr "亮色："
 
 #. i18n: file ./conf/dlgaccessibility.ui line 336
-#: rc.cpp:186
+#: rc.cpp:165
 #, no-c-format
 msgid "Dark color:"
 msgstr "暗色："
 
 #. i18n: file ./conf/dlgaccessibility.ui line 346
-#: rc.cpp:189
+#: rc.cpp:168
 #, no-c-format
 msgid "Convert to &black and white"
 msgstr "转换为黑白(&B)"
 
 #. i18n: file ./conf/dlgaccessibility.ui line 365
-#: rc.cpp:192
+#: rc.cpp:171
 #, no-c-format
 msgid "Contrast:"
 msgstr "对比度："
 
 #. i18n: file ./conf/dlgaccessibility.ui line 488
-#: rc.cpp:195
+#: rc.cpp:174
 #, no-c-format
 msgid "Threshold:"
 msgstr "阀值："
+
+#. i18n: file ./conf/dlggeneral.ui line 27
+#: rc.cpp:177
+#, no-c-format
+msgid "Program Look"
+msgstr "程序外观"
+
+#. i18n: file ./conf/dlggeneral.ui line 49
+#: rc.cpp:180
+#, no-c-format
+msgid "Show &search bar in thumbnails list"
+msgstr "在缩略图列表中显示搜索栏(&S)"
+
+#. i18n: file ./conf/dlggeneral.ui line 60
+#: rc.cpp:183
+#, no-c-format
+msgid "Link the &thumbnails with the page"
+msgstr "将缩略图列表与页面链接(&T)"
+
+#. i18n: file ./conf/dlggeneral.ui line 68
+#: rc.cpp:186
+#, no-c-format
+msgid "Show scroll&bars"
+msgstr "显示滚动条(&B)"
+
+#. i18n: file ./conf/dlggeneral.ui line 76
+#: rc.cpp:189
+#, no-c-format
+msgid "Show &hints and info messages"
+msgstr "显示提示和信息(&H)"
+
+#. i18n: file ./conf/dlggeneral.ui line 84
+#: rc.cpp:192
+#, no-c-format
+msgid "&Obey DRM limitations"
+msgstr "遵从 DRM 限制(&O)"
+
+#. i18n: file ./conf/dlggeneral.ui line 92
+#: rc.cpp:195
+#, no-c-format
+msgid "&Watch file"
+msgstr "监视文件(&W)"
+
+#. i18n: file ./conf/dlggeneral.ui line 100
+#: rc.cpp:198
+#, no-c-format
+msgid "&Retain document viewing data"
+msgstr ""
+
+#: ui/thumbnaillist.cpp:568
+msgid "Show bookmarked pages only"
+msgstr "只显示书签中的页面"
+
+#: ui/toc.cpp:59
+msgid "Topic"
+msgstr "主题"
+
+#: ui/propertiesdialog.cpp:23
+msgid "Unknown File"
+msgstr "未知文件"
+
+#: ui/propertiesdialog.cpp:32
+msgid "No document opened."
+msgstr "没有打开文档。"
+
+#: ui/propertiesdialog.cpp:38
+msgid "%1 Properties"
+msgstr "%1 属性"
+
+#: ui/propertiesdialog.cpp:53
+msgid "%1:"
+msgstr "%1："
+
+#: ui/propertiesdialog.cpp:66
+msgid "Pages:"
+msgstr "页数："
+
+#: ui/searchwidget.cpp:49
+msgid "Enter at least 3 letters to filter pages"
+msgstr "输入至少三个字母来过滤页面"
+
+#: ui/searchwidget.cpp:55
+msgid "Clear filter"
+msgstr "清除过滤器"
+
+#: ui/searchwidget.cpp:59
+msgid "Case Sensitive"
+msgstr "区分大小写"
+
+#: ui/searchwidget.cpp:61
+msgid "Match Phrase"
+msgstr "匹配短语"
+
+#: ui/searchwidget.cpp:62
+msgid "Match All Words"
+msgstr "匹配全部单词"
+
+#: ui/searchwidget.cpp:63
+msgid "Match Any Word"
+msgstr "匹配任何单词"
+
+#: ui/searchwidget.cpp:68
+msgid "Filter Options"
+msgstr "过滤器选项"
+
+#: ui/pageview.cpp:259
+msgid "Fit to Page &Width"
+msgstr "适合页宽度(&W)"
+
+#: ui/pageview.cpp:262
+msgid "Fit to &Page"
+msgstr "适合整页(&P)"
+
+#: ui/pageview.cpp:265
+msgid "Fit to &Text"
+msgstr "适合文本(&T)"
+
+#: ui/pageview.cpp:270
+#, fuzzy
+msgid "Rotate Right"
+msgstr "向右拉出"
+
+#: ui/pageview.cpp:273
+#, fuzzy
+msgid "Rotate Left"
+msgstr "从左方展开"
+
+#: ui/pageview.cpp:277
+msgid "&Two Pages"
+msgstr "双页(&T)"
+
+#: ui/pageview.cpp:281
+msgid "&Continuous"
+msgstr "连续(&C)"
+
+#: ui/pageview.cpp:286
+msgid "&Browse Tool"
+msgstr "浏览工具(&B)"
+
+#: ui/pageview.cpp:290
+msgid "&Zoom Tool"
+msgstr "缩放工具(&Z)"
+
+#: ui/pageview.cpp:293
+msgid "&Select Tool"
+msgstr "选择工具(&S)"
+
+#: ui/pageview.cpp:301
+msgid "Scroll Up"
+msgstr "向上滚动"
+
+#: ui/pageview.cpp:304
+msgid "Scroll Down"
+msgstr "向下滚动"
+
+#: ui/pageview.cpp:364
+#, c-format
+msgid ""
+"_n:  Loaded a one-page document.\n"
+" Loaded a %n-page document."
+msgstr "装入了 %n 页文档。"
+
+#: ui/pageview.cpp:664 ui/pageview.cpp:685 ui/pageview.cpp:1645
+msgid "Text found: \"%1\"."
+msgstr "找到了文字：“%1”。"
+
+#: ui/pageview.cpp:664 ui/pageview.cpp:1645
+msgid "Text not found: \"%1\"."
+msgstr "文字未找到：“%1”。"
+
+#: ui/pageview.cpp:716
+msgid "Starting -- find text as you type"
+msgstr "开始 - 即打即找。"
+
+#: ui/pageview.cpp:1127
+#, c-format
+msgid ""
+"_n: Text (1 character)\n"
+"Text (%n characters)"
+msgstr "文本(%n 个字符)"
+
+#: ui/pageview.cpp:1128 ui/pageview.cpp:1135
+msgid "Copy to Clipboard"
+msgstr "复制到剪贴板"
+
+#: ui/pageview.cpp:1132
+msgid "Speak Text"
+msgstr "读出文本"
+
+#: ui/pageview.cpp:1134
+msgid "Image (%1 by %2 pixels)"
+msgstr "图像(%1x%2 像素)"
+
+#: ui/pageview.cpp:1136
+msgid "Save to File..."
+msgstr "保存到文件..."
+
+#: ui/pageview.cpp:1154
+msgid "Image [%1x%2] copied to clipboard."
+msgstr "图像[%1x%2]已复制到剪贴板。"
+
+#: ui/pageview.cpp:1161
+msgid "File not saved."
+msgstr "文件未保存。"
+
+#: ui/pageview.cpp:1168
+msgid "Image [%1x%2] saved to %3 file."
+msgstr "图像[%1x%2]已保存到 %3 文件。"
+
+#: ui/pageview.cpp:1197
+#, c-format
+msgid "Starting KTTSD Failed: %1"
+msgstr "启动 KTTSD 失败：%1"
+
+#: ui/pageview.cpp:1581
+msgid "Fit Page"
+msgstr "适合整页"
+
+#: ui/pageview.cpp:2013
+msgid "Find stopped."
+msgstr "查找已停止。"
+
+#: ui/pageview.cpp:2023
+msgid "Welcome"
+msgstr "欢迎"
+
+#: ui/pageview.cpp:2135
+msgid "Select zooming area. Right-click to zoom out."
+msgstr "选择缩放区域。右键单击可缩小。"
+
+#: ui/pageview.cpp:2141
+msgid "Draw a rectangle around the text/graphics to copy."
+msgstr "在要复制的文字/图形周围绘制矩形。"
+
+#: ui/presentationwidget.cpp:148
+#, c-format
+msgid "Title: %1"
+msgstr "标题：%1"
+
+#: ui/presentationwidget.cpp:150
+#, c-format
+msgid "Author: %1"
+msgstr "作者：%1"
+
+#: ui/presentationwidget.cpp:152
+#, c-format
+msgid "Pages: %1"
+msgstr "页数：%1"
+
+#: ui/presentationwidget.cpp:153
+msgid "Click to begin"
+msgstr "点击开始"
+
+#: ui/presentationwidget.cpp:329
+msgid ""
+"There are two ways of exiting presentation mode, you can press either ESC key "
+"or click with the quit button that appears when placing the mouse in the "
+"top-right corner. Of course you can cycle windows (Alt+TAB by default)"
+msgstr ""
+"退出展示模式有两种方法，您可以按 Esc 键，也可以将鼠标移至右上角，单击随后出现的退出按钮。当然，您也可以循环窗口(默认为 Alt+Tab)"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/kpovmodeler.po b/tde-i18n-zh_CN/messages/tdegraphics/kpovmodeler.po
index cb0649056db..2acc78d4c36 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/kpovmodeler.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/kpovmodeler.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kpovmodeler\n"
-"POT-Creation-Date: 2006-05-28 03:57+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-07-13 09:07+0800\n"
 "Last-Translator: Xiong Jiang <jxiong@offtopic.org>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -347,19 +348,23 @@ msgid "Cylinder"
 msgstr "圆柱"
 
 #: pmcameraedit.cpp:56
-msgid "1: Vertical, Fixed Viewpoint"
+#, fuzzy
+msgid "1:Qt::Vertical, Fixed Viewpoint"
 msgstr "1：竖直、固定取景"
 
 #: pmcameraedit.cpp:57
-msgid "2: Horizontal, Fixed Viewpoint"
+#, fuzzy
+msgid "2:Qt::Horizontal, Fixed Viewpoint"
 msgstr "2：水平、固定取景"
 
 #: pmcameraedit.cpp:58
-msgid "3: Vertical, Variable Viewpoint"
+#, fuzzy
+msgid "3:Qt::Vertical, Variable Viewpoint"
 msgstr "3：竖直、可变取景"
 
 #: pmcameraedit.cpp:59
-msgid "4: Horizontal, Variable Viewpoint"
+#, fuzzy
+msgid "4:Qt::Horizontal, Variable Viewpoint"
 msgstr "4：水平、可变取景"
 
 #: pmcameraedit.cpp:71
@@ -3351,7 +3356,7 @@ msgstr "下"
 msgid "Povray only supports up to 20 library paths."
 msgstr "Povray 只支持最多 20 个库路径。"
 
-#: pmpovraysettings.cpp:207 pmpovraysettings.cpp:265
+#: pmpovraysettings.cpp:203 pmpovraysettings.cpp:257
 msgid "The list of library paths already contains this path."
 msgstr "库路径列表中已经包括此路径。"
 
@@ -4341,7 +4346,8 @@ msgid "Repeat:"
 msgstr "重复："
 
 #: pmwarpedit.cpp:142
-msgid "Orientation:"
+#, fuzzy
+msgid "Qt::Orientation:"
 msgstr "方向："
 
 #: pmwarpedit.cpp:149
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/kruler.po b/tde-i18n-zh_CN/messages/tdegraphics/kruler.po
index 772c9b477d9..b9e0e31ba89 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/kruler.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/kruler.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kruler\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2002-12-18 02:41-0500\n"
 "Last-Translator: Funda Wang <fundawang@en2china.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,9 +28,10 @@ msgid "This is the current distance measured in pixels."
 msgstr "这是以像素为单位计量的距离。"
 
 #: klineal.cpp:134
+#, fuzzy
 msgid ""
 "This is the current color in hexadecimal rgb representation as you may use it "
-"in HTML or as a QColor name. The rectangles background shows the color of the "
+"in HTML or as a TQColor name. The rectangles background shows the color of the "
 "pixel inside the little square at the end of the line cursor."
 msgstr ""
 "这是以16进制红绿蓝数值表示的当前像素的颜色，跟 HTML 页面中或者 QColor 名字中使用的表示法相同。矩形背景显示的是行光标后的小方框中的像素的颜色。"
@@ -78,7 +80,7 @@ msgstr "中(&M)"
 msgid "&Tall"
 msgstr "长(&T)"
 
-#: klineal.cpp:160 klineal.cpp:293
+#: klineal.cpp:160 klineal.cpp:268
 msgid "&Full Screen Width"
 msgstr "整个屏幕宽(&F)"
 
@@ -94,24 +96,26 @@ msgstr "选择颜色(&C)..."
 msgid "Choose &Font..."
 msgstr "选择字体(&F)..."
 
-#: klineal.cpp:293
+#: klineal.cpp:268
 msgid "&Full Screen Height"
 msgstr "整个屏幕高(&F)"
 
-#: main.cpp:29
+#: main.cpp:40
 msgid "TDE Screen Ruler"
 msgstr "TDE 屏幕标尺"
 
-#: main.cpp:31
-msgid "A screen ruler for the K Desktop Environment"
+#: main.cpp:42
+#, fuzzy
+msgid "A screen ruler for the Trinity Desktop Environment"
 msgstr "K 桌面环境的屏幕标尺"
 
-#: main.cpp:36
+#: main.cpp:47
 msgid "Programming"
 msgstr "编程"
 
-#: main.cpp:37
-msgid "Initial port to TDE 2"
+#: main.cpp:48
+#, fuzzy
+msgid "Initial port to KDE 2"
 msgstr "移植到 TDE 2"
 
 #: _translatorinfo.cpp:1
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/ksnapshot.po b/tde-i18n-zh_CN/messages/tdegraphics/ksnapshot.po
index bf25da961e4..cdcfba0952c 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/ksnapshot.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/ksnapshot.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksnapshot\n"
-"POT-Creation-Date: 2006-07-01 03:59+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-08-02 17:07+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/ksvgplugin.po b/tde-i18n-zh_CN/messages/tdegraphics/ksvgplugin.po
index 18683e5c80d..3ea70a66736 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/ksvgplugin.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/ksvgplugin.po
@@ -6,10 +6,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ksvgplugin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2003-11-14 13:25+0800\n"
 "Last-Translator: Yan Shuangchun <yahzee@d3eye.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/kuickshow.po b/tde-i18n-zh_CN/messages/tdegraphics/kuickshow.po
index 9784c0fffc6..524366ad07c 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/kuickshow.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/kuickshow.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2007-03-26 02:14+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-01-14 23:10+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/kview.po b/tde-i18n-zh_CN/messages/tdegraphics/kview.po
index d19385f46ce..833aa27067e 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/kview.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/kview.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kview\n"
-"POT-Creation-Date: 2005-03-07 01:42+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2003-01-16 12:02-0500\n"
 "Last-Translator: Funda Wang <fundawang@en2china.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/kview_scale.po b/tde-i18n-zh_CN/messages/tdegraphics/kview_scale.po
index 68c1d47150e..1a2ab5b293f 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/kview_scale.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/kview_scale.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kview_scale\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2002-11-16 18:42-0500\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/kviewbrowserplugin.po b/tde-i18n-zh_CN/messages/tdegraphics/kviewbrowserplugin.po
index 57a888cc4d6..1f6af47ffdf 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/kviewbrowserplugin.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/kviewbrowserplugin.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kviewbrowserplugin\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2002-10-29 13:19+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/kviewcanvas.po b/tde-i18n-zh_CN/messages/tdegraphics/kviewcanvas.po
index be930b0140f..d8e64118994 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/kviewcanvas.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/kviewcanvas.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-01-14 23:13+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/kvieweffectsplugin.po b/tde-i18n-zh_CN/messages/tdegraphics/kvieweffectsplugin.po
index 9a2a487075a..bcdc6ff9063 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/kvieweffectsplugin.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/kvieweffectsplugin.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kvieweffectsplugin\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-01-15 22:25+0800\n"
 "Last-Translator: Justin Fang <justin_fang@msn.com>\n"
 "Language-Team: Chinese(Simplified) <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/kviewpresenterplugin.po b/tde-i18n-zh_CN/messages/tdegraphics/kviewpresenterplugin.po
index 089dbbe6a47..8873e4def40 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/kviewpresenterplugin.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/kviewpresenterplugin.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kviewpresenterplugin\n"
-"POT-Creation-Date: 2005-01-31 01:31+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-01-14 22:41+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/kviewscannerplugin.po b/tde-i18n-zh_CN/messages/tdegraphics/kviewscannerplugin.po
index ac36120a4ea..edf24bb7a72 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/kviewscannerplugin.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/kviewscannerplugin.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kviewscannerplugin\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2003-07-28 09:40+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/kviewshell.po b/tde-i18n-zh_CN/messages/tdegraphics/kviewshell.po
index ad23e7bb4b7..a56d352cd4c 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/kviewshell.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/kviewshell.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kviewshell\n"
-"POT-Creation-Date: 2008-07-08 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-08-02 17:04+0800\n"
 "Last-Translator: Dai Zhuan <surestar@x263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,7 +31,7 @@ msgid ""
 "Your emails"
 msgstr "i18n-translation@lists.linux.net.cn"
 
-#: documentWidget.cpp:547
+#: documentWidget.cpp:548
 #, c-format
 msgid "Link to %1"
 msgstr "链接到 %1"
@@ -43,99 +44,6 @@ msgstr "空多页"
 msgid "Copyright (c) 2005 Wilfried Huss"
 msgstr "版权 (c) 2005 Wilfried Huss"
 
-#: tdemultipage.cpp:70
-msgid "Thumbnails"
-msgstr "缩略图"
-
-#: tdemultipage.cpp:158
-msgid "Save File As"
-msgstr "文件另存为"
-
-#: tdemultipage.cpp:169
-msgid ""
-"The file %1\n"
-"exists. Shall I overwrite that file?"
-msgstr ""
-"文件 %1\n"
-"已经存在。要覆盖该文件吗？"
-
-#: tdemultipage.cpp:170 tdemultipage.cpp:1916
-msgid "Overwrite File"
-msgstr "覆盖文件"
-
-#: tdemultipage.cpp:170 tdemultipage.cpp:1916
-msgid "Overwrite"
-msgstr "覆盖"
-
-#: tdemultipage.cpp:770
-#, c-format
-msgid "Print %1"
-msgstr "打印 %1"
-
-#: tdemultipage.cpp:1422 tdemultipage.cpp:1564
-msgid "Search interrupted"
-msgstr "搜索已中断"
-
-#: tdemultipage.cpp:1430 tdemultipage.cpp:1572
-msgid "Search page %1 of %2"
-msgstr "搜索页面第%1页共%2页"
-
-#: tdemultipage.cpp:1475
-msgid ""
-"<qt>The search string <strong>%1</strong> could not be found by the end of the "
-"document. Should the search be restarted from the beginning of the "
-"document?</qt>"
-msgstr "<qt>搜索字符串 <strong>%1</strong> 在文档结尾处也找不到。是否应从文档开始处重新搜索？</qt>"
-
-#: tdemultipage.cpp:1478 tdemultipage.cpp:1620
-msgid "Text Not Found"
-msgstr "文本未找到"
-
-#: tdemultipage.cpp:1502 tdemultipage.cpp:1644
-msgid "<qt>The search string <strong>%1</strong> could not be found.</qt>"
-msgstr "<qt>找不到搜索字符串 <strong>%1</strong>。</qt>"
-
-#: tdemultipage.cpp:1617
-msgid ""
-"<qt>The search string <strong>%1</strong> could not be found by the beginning "
-"of the document. Should the search be restarted from the end of the "
-"document?</qt>"
-msgstr "<qt>搜索字符串 <strong>%1</strong> 在文档开始处也找不到。是否应从文档结尾处重新搜索？</qt>"
-
-#: tdemultipage.cpp:1713
-#, c-format
-msgid "Reloading file %1"
-msgstr "重新装入文件 %1"
-
-#: tdemultipage.cpp:1749
-#, c-format
-msgid "Loading file %1"
-msgstr "装入文件 %1"
-
-#: tdemultipage.cpp:1906
-msgid "*.txt|Plain Text (Latin 1) (*.txt)"
-msgstr "*.txt|纯文本(拉丁 1) (*.txt)"
-
-#: tdemultipage.cpp:1906
-msgid "Export File As"
-msgstr "文件导出为"
-
-#: tdemultipage.cpp:1915
-msgid ""
-"The file %1\n"
-"exists. Do you want to overwrite that file?"
-msgstr ""
-"文件 %1\n"
-"已经存在。要覆盖该文件吗？"
-
-#: tdemultipage.cpp:1926
-msgid "Exporting to text..."
-msgstr "正在导出至文本..."
-
-#: tdemultipage.cpp:1926
-msgid "Abort"
-msgstr "中止"
-
 #: kprintDialogPage_pageoptions.cpp:26
 msgid "Page Size & Placement"
 msgstr "页面大小和放置"
@@ -893,8 +801,8 @@ msgstr "英寸"
 
 #. i18n: file pageSizeWidget_base.ui line 144
 #: rc.cpp:140
-#, no-c-format
-msgid "Orientation:"
+#, fuzzy, no-c-format
+msgid "Qt::Orientation:"
 msgstr "方向："
 
 #. i18n: file pageSizeWidget_base.ui line 188
@@ -903,7 +811,7 @@ msgstr "方向："
 msgid "Page Preview"
 msgstr "页面预览"
 
-#. i18n: file kviewshell.kcfg line 72
+#. i18n: file kviewshell.kcfg line 75
 #: rc.cpp:152
 #, no-c-format
 msgid ""
@@ -950,3 +858,96 @@ msgstr "区分大小写"
 #: tableOfContents.cpp:45
 msgid "Topic"
 msgstr "主题"
+
+#: tdemultipage.cpp:70
+msgid "Thumbnails"
+msgstr "缩略图"
+
+#: tdemultipage.cpp:158
+msgid "Save File As"
+msgstr "文件另存为"
+
+#: tdemultipage.cpp:169
+msgid ""
+"The file %1\n"
+"exists. Shall I overwrite that file?"
+msgstr ""
+"文件 %1\n"
+"已经存在。要覆盖该文件吗？"
+
+#: tdemultipage.cpp:170 tdemultipage.cpp:1916
+msgid "Overwrite File"
+msgstr "覆盖文件"
+
+#: tdemultipage.cpp:170 tdemultipage.cpp:1916
+msgid "Overwrite"
+msgstr "覆盖"
+
+#: tdemultipage.cpp:770
+#, c-format
+msgid "Print %1"
+msgstr "打印 %1"
+
+#: tdemultipage.cpp:1422 tdemultipage.cpp:1564
+msgid "Search interrupted"
+msgstr "搜索已中断"
+
+#: tdemultipage.cpp:1430 tdemultipage.cpp:1572
+msgid "Search page %1 of %2"
+msgstr "搜索页面第%1页共%2页"
+
+#: tdemultipage.cpp:1475
+msgid ""
+"<qt>The search string <strong>%1</strong> could not be found by the end of the "
+"document. Should the search be restarted from the beginning of the "
+"document?</qt>"
+msgstr "<qt>搜索字符串 <strong>%1</strong> 在文档结尾处也找不到。是否应从文档开始处重新搜索？</qt>"
+
+#: tdemultipage.cpp:1478 tdemultipage.cpp:1620
+msgid "Text Not Found"
+msgstr "文本未找到"
+
+#: tdemultipage.cpp:1502 tdemultipage.cpp:1644
+msgid "<qt>The search string <strong>%1</strong> could not be found.</qt>"
+msgstr "<qt>找不到搜索字符串 <strong>%1</strong>。</qt>"
+
+#: tdemultipage.cpp:1617
+msgid ""
+"<qt>The search string <strong>%1</strong> could not be found by the beginning "
+"of the document. Should the search be restarted from the end of the "
+"document?</qt>"
+msgstr "<qt>搜索字符串 <strong>%1</strong> 在文档开始处也找不到。是否应从文档结尾处重新搜索？</qt>"
+
+#: tdemultipage.cpp:1713
+#, c-format
+msgid "Reloading file %1"
+msgstr "重新装入文件 %1"
+
+#: tdemultipage.cpp:1749
+#, c-format
+msgid "Loading file %1"
+msgstr "装入文件 %1"
+
+#: tdemultipage.cpp:1906
+msgid "*.txt|Plain Text (Latin 1) (*.txt)"
+msgstr "*.txt|纯文本(拉丁 1) (*.txt)"
+
+#: tdemultipage.cpp:1906
+msgid "Export File As"
+msgstr "文件导出为"
+
+#: tdemultipage.cpp:1915
+msgid ""
+"The file %1\n"
+"exists. Do you want to overwrite that file?"
+msgstr ""
+"文件 %1\n"
+"已经存在。要覆盖该文件吗？"
+
+#: tdemultipage.cpp:1926
+msgid "Exporting to text..."
+msgstr "正在导出至文本..."
+
+#: tdemultipage.cpp:1926
+msgid "Abort"
+msgstr "中止"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/kviewviewer.po b/tde-i18n-zh_CN/messages/tdegraphics/kviewviewer.po
index e1e03f97966..606ad790831 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/kviewviewer.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/kviewviewer.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2005-07-24 01:35+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-01-15 22:40+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/libkscan.po b/tde-i18n-zh_CN/messages/tdegraphics/libkscan.po
index b90109a44fd..072b3dad47a 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/libkscan.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/libkscan.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkscan\n"
-"POT-Creation-Date: 2008-02-01 01:56+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-01-17 07:16+0800\n"
 "Last-Translator: Liu Songhe <jackliu9999@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -401,9 +402,10 @@ msgid "Acquire a gray preview even in color mode (faster)"
 msgstr "即便在彩色模式下仍然使用灰度预览(更快)"
 
 #: scanparams.cpp:518
+#, fuzzy
 msgid ""
 "<B>Problem: No Scanner was found</B><P>Your system does not provide a SANE <I>"
-"(Scanner Access Now Easy)</I> installation, which is required by the TDE scan "
+"(Scanner Access Now Easy)</I> installation, which is required by the KDE scan "
 "support.<P>Please install and configure SANE correctly on your system.<P>"
 "Visit the SANE homepage under http://www.sane-project.org to find out more "
 "about SANE installation and configuration. "
@@ -429,7 +431,8 @@ msgid "SANE debug (pnm only)"
 msgstr "SANE 调试(仅适于 pnm)"
 
 #: scanparams.cpp:675
-msgid "virt. Scan (all Qt modes)"
+#, fuzzy
+msgid "virt. Scan (all TQt modes)"
 msgstr "模拟扫描(所有 Qt 模式)"
 
 #: scanparams.cpp:736
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_bmp.po b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_bmp.po
index b9c5ebcd458..4540f77c536 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_bmp.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_bmp.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_bmp\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2002-10-29 20:58+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_dvi.po b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_dvi.po
index b15a6dc4b56..c7ee7654d05 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_dvi.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_dvi.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_dvi\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2003-01-16 00:25-0500\n"
 "Last-Translator: Xiong Jiang <jxiong@offtopic.org>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_exr.po b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_exr.po
index 72f19d9aa28..30c1a365d20 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_exr.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_exr.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_exr\n"
-"POT-Creation-Date: 2007-08-23 01:13+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-07-14 11:31+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_gif.po b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_gif.po
index 84ac7b7e68c..acae3c35b1c 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_gif.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_gif.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_gif\n"
-"POT-Creation-Date: 2005-03-14 01:33+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2002-10-29 13:16+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_ico.po b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_ico.po
index e8d52923f82..d9691e1368d 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_ico.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_ico.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_ico\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2002-10-29 12:58+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_jpeg.po b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_jpeg.po
index 589fbc3f6fb..103375d661c 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_jpeg.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_jpeg.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_jpeg\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-01-14 22:44+0800\n"
 "Last-Translator: Xiong Jiang <jxiong@offtopic.org>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -174,8 +175,8 @@ msgstr ""
 msgid "Infinite"
 msgstr "无限"
 
-#: tdefile_jpeg.cpp:335 tdefile_jpeg.cpp:370 tdefile_jpeg.cpp:378 tdefile_jpeg.cpp:403
-#: tdefile_jpeg.cpp:439 tdefile_jpeg.cpp:462
+#: tdefile_jpeg.cpp:335 tdefile_jpeg.cpp:370 tdefile_jpeg.cpp:378
+#: tdefile_jpeg.cpp:403 tdefile_jpeg.cpp:439 tdefile_jpeg.cpp:462
 msgid "Unknown"
 msgstr "未知"
 
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_pcx.po b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_pcx.po
index 1289e693ec4..17ae10d6565 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_pcx.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_pcx.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_pcx\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2003-01-16 00:24-0500\n"
 "Last-Translator: Xiong Jiang <jxiong@offtopic.org>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_pdf.po b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_pdf.po
index 6f7e494a81c..990de06d0b0 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_pdf.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_pdf.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_pdf\n"
-"POT-Creation-Date: 2005-04-20 15:05+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-01-14 22:40+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@126.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_png.po b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_png.po
index ffc1afdee13..816f556862e 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_png.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_png.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_png\n"
-"POT-Creation-Date: 2004-12-16 01:20+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2003-01-16 00:29-0500\n"
 "Last-Translator: Mai Hao Hui <mhh@126.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -55,8 +56,8 @@ msgstr "备注"
 msgid "Grayscale"
 msgstr "灰度"
 
-#: tdefile_png.cpp:66 tdefile_png.cpp:70 tdefile_png.cpp:183 tdefile_png.cpp:187
-#: tdefile_png.cpp:191
+#: tdefile_png.cpp:66 tdefile_png.cpp:70 tdefile_png.cpp:183
+#: tdefile_png.cpp:187 tdefile_png.cpp:191
 msgid "Unknown"
 msgstr "未知"
 
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_pnm.po b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_pnm.po
index 80ae4dfd4f0..dd49579d555 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_pnm.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_pnm.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-01-14 22:56+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_ps.po b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_ps.po
index 92048df0acf..6c6d0f5f51a 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_ps.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_ps.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_ps\n"
-"POT-Creation-Date: 2005-03-29 01:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2003-01-16 00:30-0500\n"
 "Last-Translator: Mai Hao Hui <mhh@126.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_rgb.po b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_rgb.po
index c9465873b1d..c7c54711936 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_rgb.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_rgb.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_rgb\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-07-14 11:24+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_tga.po b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_tga.po
index 0ffc4095e47..ff028a5adfe 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_tga.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_tga.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_tga\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2002-11-04 18:19-0500\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_tiff.po b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_tiff.po
index d9e20c72d62..48f24724027 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_tiff.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_tiff.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_tiff\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2003-01-16 00:38-0500\n"
 "Last-Translator: Xiong Jiang <jxiong@offtopic.org>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_xbm.po b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_xbm.po
index d5e3e0f924d..bcc71e85135 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_xbm.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_xbm.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_xbm\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2002-10-29 13:18+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_xpm.po b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_xpm.po
index 1c45cacb7a1..aeae5ef592b 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/tdefile_xpm.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/tdefile_xpm.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_xpm\n"
-"POT-Creation-Date: 2004-11-15 01:37+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-01-26 16:02+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdegraphics/tdeiconedit.po b/tde-i18n-zh_CN/messages/tdegraphics/tdeiconedit.po
index ac3a38cfd40..be63ec067e1 100644
--- a/tde-i18n-zh_CN/messages/tdegraphics/tdeiconedit.po
+++ b/tde-i18n-zh_CN/messages/tdegraphics/tdeiconedit.po
@@ -9,10 +9,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2006-03-05 03:45+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-03-23 22:17+0800\n"
 "Last-Translator: redarmy <redarmy@linuxaid.com.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -481,7 +482,7 @@ msgstr ""
 msgid "Colors: %1"
 msgstr "颜色：%1"
 
-#: kicongrid.cpp:90
+#: tdeicongrid.cpp:90
 msgid ""
 "Icon draw grid\n"
 "\n"
@@ -496,15 +497,15 @@ msgstr ""
 "您可以使用工具条上的放大镜工具来放大和缩小。\n"
 "(提示：按下放大镜按钮几秒就可缩放到一个预定义的比例)"
 
-#: kicongrid.cpp:116
+#: tdeicongrid.cpp:116
 msgid "width"
 msgstr "宽度"
 
-#: kicongrid.cpp:121
+#: tdeicongrid.cpp:121
 msgid "height"
 msgstr "高度"
 
-#: kicongrid.cpp:125
+#: tdeicongrid.cpp:125
 msgid ""
 "Rulers\n"
 "\n"
@@ -514,33 +515,33 @@ msgstr ""
 "\n"
 "这是一个当前光标位置的视觉表示"
 
-#: kicongrid.cpp:816
+#: tdeicongrid.cpp:816
 msgid "Free Hand"
 msgstr "手绘"
 
-#: kicongrid.cpp:1020
+#: tdeicongrid.cpp:1020
 msgid ""
 "There was an error loading a blank image.\n"
 msgstr ""
 "在载入空白图像时发生错误。\n"
 
-#: kicongrid.cpp:1152
+#: tdeicongrid.cpp:1152
 msgid "All selected"
 msgstr "已全部选中"
 
-#: kicongrid.cpp:1163
+#: tdeicongrid.cpp:1163
 msgid "Cleared"
 msgstr "已清除"
 
-#: kicongrid.cpp:1205
+#: tdeicongrid.cpp:1205
 msgid "Selected area cut"
 msgstr "已剪切选中的区域"
 
-#: kicongrid.cpp:1209
+#: tdeicongrid.cpp:1209
 msgid "Selected area copied"
 msgstr "已复制选中的区域"
 
-#: kicongrid.cpp:1234
+#: tdeicongrid.cpp:1234
 msgid ""
 "The clipboard image is larger than the current image!\n"
 "Paste as new image?"
@@ -548,21 +549,21 @@ msgstr ""
 "剪贴板上的图像比当前的图像大！\n"
 "粘贴成新的图像吗？"
 
-#: kicongrid.cpp:1235
+#: tdeicongrid.cpp:1235
 msgid "Do Not Paste"
 msgstr "不粘贴"
 
-#: kicongrid.cpp:1354 kicongrid.cpp:1388
+#: tdeicongrid.cpp:1354 tdeicongrid.cpp:1388
 msgid "Done pasting"
 msgstr "完成粘贴"
 
-#: kicongrid.cpp:1359 kicongrid.cpp:1394
+#: tdeicongrid.cpp:1359 tdeicongrid.cpp:1394
 msgid ""
 "Invalid pixmap data in clipboard!\n"
 msgstr ""
 "剪贴板上的象素图数据无效！\n"
 
-#: kicongrid.cpp:1901
+#: tdeicongrid.cpp:1901
 msgid "Drawn Array"
 msgstr "绘画队列"
 
@@ -616,7 +617,7 @@ msgstr ""
 "您可以建立一个有定制颜色的调色板。\n"
 "只需要在一个方框中双击就可以编辑颜色"
 
-#: kicon.cpp:73
+#: tdeicon.cpp:73
 msgid ""
 "The URL: %1 \n"
 "seems to be malformed.\n"
@@ -624,7 +625,7 @@ msgstr ""
 "URL：%1 \n"
 "的格式似乎不正确。\n"
 
-#: kicon.cpp:89 kicon.cpp:104
+#: tdeicon.cpp:89 tdeicon.cpp:104
 msgid ""
 "There was an error loading:\n"
 "%1\n"
@@ -632,23 +633,23 @@ msgstr ""
 "在载入时发生错误：\n"
 "%1\n"
 
-#: kicon.cpp:178
+#: tdeicon.cpp:178
 msgid "Save Icon As"
 msgstr "图标另存为"
 
-#: kicon.cpp:210
+#: tdeicon.cpp:210
 msgid "A file named \"%1\" already exists. Overwrite it?"
 msgstr "名叫\"%1\"的文件已经存在。要覆盖它么？"
 
-#: kicon.cpp:212
+#: tdeicon.cpp:212
 msgid "Overwrite File?"
 msgstr "确定覆写文件？"
 
-#: kicon.cpp:213
+#: tdeicon.cpp:213
 msgid "&Overwrite"
 msgstr "覆写(&O)"
 
-#: kicon.cpp:268
+#: tdeicon.cpp:268
 msgid ""
 "There was an error saving:\n"
 "%1\n"
@@ -700,7 +701,7 @@ msgstr "从空白创建"
 msgid "Create from template"
 msgstr "从模板创建"
 
-#: kiconconfig.cpp:121 knew.cpp:199
+#: knew.cpp:199 tdeiconconfig.cpp:121
 msgid "Templates"
 msgstr "模板"
 
@@ -741,107 +742,107 @@ msgstr "%1 x %2"
 msgid "modified"
 msgstr "修改"
 
-#: kiconconfig.cpp:56
+#: tdeiconconfig.cpp:56
 msgid "Icon Template"
 msgstr "图标模板"
 
-#: kiconconfig.cpp:61
+#: tdeiconconfig.cpp:61
 msgid "Template"
 msgstr "模板"
 
-#: kiconconfig.cpp:70
+#: tdeiconconfig.cpp:70
 msgid "Description:"
 msgstr "描述："
 
-#: kiconconfig.cpp:75
+#: tdeiconconfig.cpp:75
 msgid "Path:"
 msgstr "路径："
 
-#: kiconconfig.cpp:141
+#: tdeiconconfig.cpp:141
 msgid "&Add..."
 msgstr "添加(&A)..."
 
-#: kiconconfig.cpp:144
+#: tdeiconconfig.cpp:144
 msgid "&Edit..."
 msgstr "编辑(&E)..."
 
-#: kiconconfig.cpp:247
+#: tdeiconconfig.cpp:247
 msgid "Select Background"
 msgstr "选择背景"
 
-#: kiconconfig.cpp:263
+#: tdeiconconfig.cpp:263
 msgid "Use co&lor"
 msgstr "使用颜色(&L)"
 
-#: kiconconfig.cpp:267
+#: tdeiconconfig.cpp:267
 msgid "Use pix&map"
 msgstr "使用像素图(&M)"
 
-#: kiconconfig.cpp:280
+#: tdeiconconfig.cpp:280
 msgid "Choose..."
 msgstr "选择..."
 
-#: kiconconfig.cpp:283
+#: tdeiconconfig.cpp:283
 msgid "Preview"
 msgstr "预览"
 
-#: kiconconfig.cpp:363
+#: tdeiconconfig.cpp:363
 msgid "Only local files are supported yet."
 msgstr "只支持本地文件。"
 
-#: kiconconfig.cpp:384
+#: tdeiconconfig.cpp:384
 msgid "Paste &transparent pixels"
 msgstr "粘贴透明像素(&L)"
 
-#: kiconconfig.cpp:388
+#: tdeiconconfig.cpp:388
 msgid "Show &rulers"
 msgstr "显示标尺(&R)"
 
-#: kiconconfig.cpp:392
+#: tdeiconconfig.cpp:392
 msgid "Transparency Display"
 msgstr "透明显示"
 
-#: kiconconfig.cpp:402
+#: tdeiconconfig.cpp:402
 msgid "&Solid color:"
 msgstr "单色(&S)："
 
-#: kiconconfig.cpp:412
+#: tdeiconconfig.cpp:412
 msgid "Checker&board"
 msgstr "检测板(&B)"
 
-#: kiconconfig.cpp:422
+#: tdeiconconfig.cpp:422
 msgid "Small"
 msgstr "小"
 
-#: kiconconfig.cpp:423
+#: tdeiconconfig.cpp:423
 msgid "Medium"
 msgstr "中"
 
-#: kiconconfig.cpp:424
+#: tdeiconconfig.cpp:424
 msgid "Large"
 msgstr "大"
 
-#: kiconconfig.cpp:427
+#: tdeiconconfig.cpp:427
 msgid "Si&ze:"
 msgstr "大小(&z)"
 
-#: kiconconfig.cpp:433
+#: tdeiconconfig.cpp:433
 msgid "Color &1:"
 msgstr "颜色 &1："
 
-#: kiconconfig.cpp:439
+#: tdeiconconfig.cpp:439
 msgid "Color &2:"
 msgstr "颜色 &2："
 
-#: kiconconfig.cpp:540
+#: tdeiconconfig.cpp:540
 msgid "Icon Templates"
 msgstr "图标模板"
 
-#: kiconconfig.cpp:543
+#: tdeiconconfig.cpp:543
 msgid "Background"
 msgstr "背景"
 
-#: kiconconfig.cpp:546
+#: tdeiconconfig.cpp:546
 msgid "Icon Grid"
 msgstr "图标网格"
 
diff --git a/tde-i18n-zh_CN/messages/tdelibs/cupsdconf.po b/tde-i18n-zh_CN/messages/tdelibs/cupsdconf.po
index 0bf9f175408..8d4d06ee35e 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/cupsdconf.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/cupsdconf.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cupsdconf\n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2004-05-03 18:31+0800\n"
 "Last-Translator: Wang Fuchuan <wangfuchuan@intasect.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -60,1027 +61,6 @@ msgstr "寄给："
 msgid "Browse Address"
 msgstr "浏览地址"
 
-#: cupsd.conf.template.cpp:1
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Server name (ServerName)</b>\n"
-"<p>\n"
-"The hostname of your server, as advertised to the world.\n"
-"By default CUPS will use the hostname of the system.</p>\n"
-"<p>\n"
-"To set the default server used by clients, see the client.conf file.</p>\n"
-"<p>\n"
-"<i>ex</i>: myhost.domain.com</p>\n"
-msgstr ""
-"<b>服务器名称(ServerName)</b>\n"
-"<p>\n"
-"您服务器公布给全世界的主机名。\n"
-"默认情况下，CUPS 将会使用系统的主机名。</p>\n"
-"<p>\n"
-"要设置客户端所用的默认服务器，请见 client.conf 文件。</p>\n"
-"<p>\n"
-"<i>如</i>：myhost.domain.com</p>\n"
-
-#: cupsd.conf.template.cpp:11
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Server administrator (ServerAdmin)</b>\n"
-"<p>\n"
-"The email address to send all complaints or problems to.\n"
-"By default CUPS will use \"root@hostname\".</p>\n"
-"<p>\n"
-"<i>ex</i>: root@myhost.com</p>\n"
-msgstr ""
-"<b>服务器管理员(ServerAdmin)</b>\n"
-"<p>\n"
-"出现问题时报告的电子邮件地址。\n"
-"默认情况下，CUPS 将会使用“root@主机名”。</p>\n"
-"<p>\n"
-"<i>如</i>：root@myhost.com</p>\n"
-
-#: cupsd.conf.template.cpp:19
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Access log (AccessLog)</b>\n"
-"<p>\n"
-"The access log file; if this does not start with a leading /\n"
-"then it is assumed to be relative to ServerRoot.  By default set to\n"
-"\"/var/log/cups/access_log\".</p>\n"
-"<p>\n"
-"You can also use the special name <b>syslog</b> to send the output to the\n"
-"syslog file or daemon.</p>\n"
-"<p>\n"
-"<i>ex</i>: /var/log/cups/access_log</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:31
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Data directory (DataDir)</b>\n"
-"<p>\n"
-"The root directory for the CUPS data files.\n"
-"By default /usr/share/cups.</p>\n"
-"<p>\n"
-"<i>ex</i>: /usr/share/cups</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:39
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Default character set (DefaultCharset)</b>\n"
-"<p>\n"
-"The default character set to use. If not specified,\n"
-"defaults to utf-8.  Note that this can also be overridden in\n"
-"HTML documents...</p>\n"
-"<p>\n"
-"<i>ex</i>: utf-8</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:48
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Default language (DefaultLanguage)</b>\n"
-"<p>\n"
-"The default language if not specified by the browser.\n"
-"If not specified, the current locale is used.</p>\n"
-"<p>\n"
-"<i>ex</i>: en</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:56
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Document directory (DocumentRoot)</b>\n"
-"<p>\n"
-"The root directory for HTTP documents that are served.\n"
-"By default the compiled-in directory.</p>\n"
-"<p>\n"
-"<i>ex</i>: /usr/share/cups/doc</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:64
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Error log (ErrorLog)</b>\n"
-"<p>\n"
-"The error log file; if this does not start with a leading /\n"
-"then it is assumed to be relative to ServerRoot.  By default set to\n"
-"\"/var/log/cups/error_log\".</p>\n"
-"<p>\n"
-"You can also use the special name <b>syslog</b> to send the output to the\n"
-"syslog file or daemon.</p>\n"
-"<p>\n"
-"<i>ex</i>: /var/log/cups/error_log</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:76
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Font path (FontPath)</b>\n"
-"<p>\n"
-"The path to locate all font files (currently only for pstoraster).\n"
-"By default /usr/share/cups/fonts.</p>\n"
-"<p>\n"
-"<i>ex</i>: /usr/share/cups/fonts</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:84
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Log level (LogLevel)</b>\n"
-"<p>\n"
-"Controls the number of messages logged to the ErrorLog\n"
-"file and can be one of the following:</p>\n"
-"<ul type=circle>\n"
-"<li><i>debug2</i>:     Log everything.</li>\n"
-"<li><i>debug</i>:     Log almost everything.</li>\n"
-"<li><i>info</i>:      Log all requests and state changes.</li>\n"
-"<li><i>warn</i>:      Log errors and warnings.</li>\n"
-"<li><i>error</i>:     Log only errors.</li>\n"
-"<li><i>none</i>:      Log nothing.</li>\n"
-"</ul>"
-"<p>\n"
-"<i>ex</i>: info</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:99
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Max log size (MaxLogSize)</b>\n"
-"<p>\n"
-"Controls the maximum size of each log file before they are\n"
-"rotated.  Defaults to 1048576 (1MB).  Set to 0 to disable log rotating.</p>\n"
-"<p>\n"
-"<i>ex</i>: 1048576</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:107
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Page log (PageLog)</b>\n"
-"<p>\n"
-"The page log file; if this does not start with a leading /\n"
-"then it is assumed to be relative to ServerRoot.  By default set to\n"
-"\"/var/log/cups/page_log\".</p>\n"
-"<p>\n"
-"You can also use the special name <b>syslog</b> to send the output to the\n"
-"syslog file or daemon.</p>\n"
-"<p>\n"
-"<i>ex</i>: /var/log/cups/page_log</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:119
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Preserve job history (PreserveJobHistory)</b>\n"
-"<p>\n"
-"Whether or not to preserve the job history after a\n"
-"job is completed, canceled, or stopped.  Default is Yes.</p>\n"
-"<p>\n"
-"<i>ex</i>: Yes</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:127
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Preserve job files (PreserveJobFiles)</b>\n"
-"<p>\n"
-"Whether or not to preserve the job files after a\n"
-"job is completed, canceled, or stopped.  Default is No.</p>\n"
-"<p>\n"
-"<i>ex</i>: No</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:135
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Printcap file (Printcap)</b>\n"
-"<p>\n"
-"The name of the printcap file.  Default is no filename.\n"
-"Leave blank to disable printcap file generation.</p>\n"
-"<p>\n"
-"<i>ex</i>: /etc/printcap</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:143
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Request directory (RequestRoot)</b>\n"
-"<p>\n"
-"The directory where request files are stored.\n"
-"By default /var/spool/cups.</p>\n"
-"<p>\n"
-"<i>ex</i>: /var/spool/cups</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:151
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Remote root user (RemoteRoot)</b>\n"
-"<p>\n"
-"The name of the user assigned to unauthenticated accesses\n"
-"from remote systems.  By default \"remroot\".</p>\n"
-"<p>\n"
-"<i>ex</i>: remroot</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:159
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Server binaries (ServerBin)</b>\n"
-"<p>\n"
-"The root directory for the scheduler executables.\n"
-"By default /usr/lib/cups or /usr/lib32/cups (IRIX 6.5).</p>\n"
-"<p>\n"
-"<i>ex</i>: /usr/lib/cups</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:167
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Server files (ServerRoot)</b>\n"
-"<p>\n"
-"The root directory for the scheduler.\n"
-"By default /etc/cups.</p>\n"
-"<p>\n"
-"<i>ex</i>: /etc/cups</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:175
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>User (User)</b>\n"
-"<p>\n"
-"The user the server runs under.  Normally this\n"
-"must be <b>lp</b>, however you can configure things for another user\n"
-"as needed.</p>\n"
-"<p>\n"
-"Note: the server must be run initially as root to support the\n"
-"default IPP port of 631.  It changes users whenever an external\n"
-"program is run...</p>\n"
-"<p>\n"
-"<i>ex</i>: lp</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:188
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Group (Group)</b>\n"
-"<p>\n"
-"The group the server runs under.  Normally this\n"
-"must be <b>sys</b>, however you can configure things for another\n"
-"group as needed.</p>\n"
-"<p>\n"
-"<i>ex</i>: sys</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:197
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>RIP cache (RIPCache)</b>\n"
-"<p>\n"
-"The amount of memory that each RIP should use to cache\n"
-"bitmaps.  The value can be any real number followed by \"k\" for\n"
-"kilobytes, \"m\" for megabytes, \"g\" for gigabytes, or \"t\" for tiles\n"
-"(1 tile = 256x256 pixels).  Defaults to \"8m\" (8 megabytes).</p>\n"
-"<p>\n"
-"<i>ex</i>: 8m</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:207
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Temporary files (TempDir)</b>\n"
-"<p>\n"
-"The directory to put temporary files in. This directory must be\n"
-"writable by the user defined above!  Defaults to \"/var/spool/cups/tmp\" or\n"
-"the value of the TMPDIR environment variable.</p>\n"
-"<p>\n"
-"<i>ex</i>: /var/spool/cups/tmp</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:216
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Filter limit (FilterLimit)</b>\n"
-"<p>\n"
-"Sets the maximum cost of all job filters that can be run\n"
-"at the same time.  A limit of 0 means no limit.  A typical job may need\n"
-"a filter limit of at least 200; limits less than the minimum required\n"
-"by a job force a single job to be printed at any time.</p>\n"
-"<p>\n"
-"The default limit is 0 (unlimited).</p>\n"
-"<p>\n"
-"<i>ex</i>: 200</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:228
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Listen to (Port/Listen)</b>\n"
-"<p>\n"
-"Ports/addresses that are listened to.  The default port 631 is reserved\n"
-"for the Internet Printing Protocol (IPP) and is what is used here.</p>\n"
-"<p>\n"
-"You can have multiple Port/Listen lines to listen to more than one\n"
-"port or address, or to restrict access.</p>\n"
-"<p>\n"
-"Note: Unfortunately, most web browsers don't support TLS or HTTP Upgrades\n"
-"for encryption.  If you want to support web-based encryption you will\n"
-"probably need to listen on port 443 (the \"HTTPS\" port...).</p>\n"
-"<p>\n"
-"<i>ex</i>: 631, myhost:80, 1.2.3.4:631</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:243
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Hostname lookups (HostNameLookups)</b>\n"
-"<p>\n"
-"Whether or not to do lookups on IP addresses to get a\n"
-"fully-qualified hostname.  This defaults to Off for performance reasons...</p>\n"
-"<p>\n"
-"<i>ex</i>: On</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:251
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Keep alive (KeepAlive)</b>\n"
-"<p>\n"
-"Whether or not to support the Keep-Alive connection\n"
-"option.  Default is on.</p>\n"
-"<p>\n"
-"<i>ex</i>: On</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:259
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Keep-alive timeout (KeepAliveTimeout)</b>\n"
-"<p>\n"
-"The timeout (in seconds) before Keep-Alive connections are\n"
-"automatically closed.  Default is 60 seconds.</p>\n"
-"<p>\n"
-"<i>ex</i>: 60</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:267
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Max clients (MaxClients)</b>\n"
-"<p>\n"
-"Controls the maximum number of simultaneous clients that\n"
-"will be handled.  Defaults to 100.</p>\n"
-"<p>\n"
-"<i>ex</i>: 100</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:275
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Max request size (MaxRequestSize)</b>\n"
-"<p>\n"
-"Controls the maximum size of HTTP requests and print files.\n"
-"Set to 0 to disable this feature (defaults to 0).</p>\n"
-"<p>\n"
-"<i>ex</i>: 0</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:283
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Client timeout (Timeout)</b>\n"
-"<p>\n"
-"The timeout (in seconds) before requests time out.  Default is 300 seconds.</p>"
-"\n"
-"<p>\n"
-"<i>ex</i>: 300</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:290
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Use browsing (Browsing)</b>\n"
-"<p>\n"
-"Whether or not to <b>listen</b> to printer \n"
-"information from other CUPS servers.  \n"
-"</p>\n"
-"<p>\n"
-"Enabled by default.\n"
-"</p>\n"
-"<p>\n"
-"Note: to enable the <b>sending</b> of browsing\n"
-"information from this CUPS server to the LAN,\n"
-"specify a valid <i>BrowseAddress</i>.\n"
-"</p>\n"
-"<p>\n"
-"<i>ex</i>: On</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:307
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Use short names (BrowseShortNames)</b>\n"
-"<p>\n"
-"Whether or not to use \"short\" names for remote printers\n"
-"when possible (e.g. \"printer\" instead of \"printer@host\").  Enabled by\n"
-"default.</p>\n"
-"<p>\n"
-"<i>ex</i>: Yes</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:316
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Browse addresses (BrowseAddress)</b>\n"
-"<p>\n"
-"Specifies a broadcast address to be used.  By\n"
-"default browsing information is broadcast to all active interfaces.</p>\n"
-"<p>\n"
-"Note: HP-UX 10.20 and earlier do not properly handle broadcast unless\n"
-"you have a Class A, B, C, or D netmask (i.e. no CIDR support).</p>\n"
-"<p>\n"
-"<i>ex</i>: x.y.z.255, x.y.255.255</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:327
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Browse allow/deny (BrowseAllow/BrowseDeny)</b>\n"
-"<p>\n"
-"<u>BrowseAllow</u>: specifies an address mask to allow for incoming browser\n"
-"packets. The default is to allow packets from all addresses.</p>\n"
-"<p>\n"
-"<u>BrowseDeny</u>: specifies an address mask to deny for incoming browser\n"
-"packets. The default is to deny packets from no addresses.</p>\n"
-"<p>\n"
-"Both \"BrowseAllow\" and \"BrowseDeny\" accept the following notations for\n"
-"addresses:</p>\n"
-"<pre>\n"
-"All\n"
-"None\n"
-"*.domain.com\n"
-".domain.com\n"
-"host.domain.com\n"
-"nnn.*\n"
-"nnn.nnn.*\n"
-"nnn.nnn.nnn.*\n"
-"nnn.nnn.nnn.nnn\n"
-"nnn.nnn.nnn.nnn/mm\n"
-"nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm\n"
-"</pre>"
-"<p>\n"
-"The hostname/domainname restrictions only work if you have turned hostname\n"
-"lookups on!</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:354
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Browse interval (BrowseInterval)</b>\n"
-"<p>\n"
-"The time between browsing updates in seconds.  Default\n"
-"is 30 seconds.</p>\n"
-"<p>\n"
-"Note that browsing information is sent whenever a printer's state changes\n"
-"as well, so this represents the maximum time between updates.</p>\n"
-"<p>\n"
-"Set this to 0 to disable outgoing broadcasts so your local printers are\n"
-"not advertised but you can still see printers on other hosts.</p>\n"
-"<p>\n"
-"<i>ex</i>: 30</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:368
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Browse order (BrowseOrder)</b>\n"
-"<p>\n"
-"Specifies the order of BrowseAllow/BrowseDeny comparisons.</p>\n"
-"<p>\n"
-"<i>ex</i>: allow,deny</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:375
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Browse poll (BrowsePoll)</b>\n"
-"<p>\n"
-"Poll the named server(s) for printers.</p>\n"
-"<p>\n"
-"<i>ex</i>: myhost:631</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:382
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Browse port (BrowsePort)</b>\n"
-"<p>\n"
-"The port used for UDP broadcasts.  By default this is\n"
-"the IPP port; if you change this you need to do it on all servers.\n"
-"Only one BrowsePort is recognized.</p>\n"
-"<p>\n"
-"<i>ex</i>: 631</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:391
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Browse relay (BrowseRelay)</b>\n"
-"<p>\n"
-"Relay browser packets from one address/network to another.</p>\n"
-"<p>\n"
-"<i>ex</i>: src-address dest-address</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:398
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Browse timeout (BrowseTimeout)</b>\n"
-"<p>\n"
-"The timeout (in seconds) for network printers - if we don't\n"
-"get an update within this time the printer will be removed\n"
-"from the printer list.  This number definitely should not be\n"
-"less the BrowseInterval value for obvious reasons.  Defaults\n"
-"to 300 seconds.</p>\n"
-"<p>\n"
-"<i>ex</i>: 300</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:409
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Implicit classes (ImplicitClasses)</b>\n"
-"<p>\n"
-"Whether or not to use implicit classes.</p>\n"
-"<p>\n"
-"Printer classes can be specified explicitly in the classes.conf\n"
-"file, implicitly based upon the printers available on the LAN, or\n"
-"both.</p>\n"
-"<p>\n"
-"When ImplicitClasses is On, printers on the LAN with the same name\n"
-"(e.g. Acme-LaserPrint-1000) will be put into a class with the same\n"
-"name. This allows you to setup multiple redundant queues on a LAN\n"
-"without a lot of administrative difficulties.  If a user sends a\n"
-"job to Acme-LaserPrint-1000, the job will go to the first available\n"
-"queue.</p>\n"
-"<p>\n"
-"Enabled by default.</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:427
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>System group (SystemGroup)</b>\n"
-"<p>\n"
-"The group name for \"System\" (printer administration)\n"
-"access.  The default varies depending on the operating system, but\n"
-"will be <b>sys</b>, <b>system</b>, or <b>root</b> (checked for in that "
-"order).</p>\n"
-"<p>\n"
-"<i>ex</i>: sys</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:436
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Encryption certificate (ServerCertificate)</b>\n"
-"<p>\n"
-"The file to read containing the server's certificate.\n"
-"Defaults to \"/etc/cups/ssl/server.crt\".</p>\n"
-"<p>\n"
-"<i>ex</i>: /etc/cups/ssl/server.crt</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:444
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Encryption key (ServerKey)</b>\n"
-"<p>\n"
-"The file to read containing the server's key.\n"
-"Defaults to \"/etc/cups/ssl/server.key\".</p>\n"
-"<p>\n"
-"<i>ex</i>: /etc/cups/ssl/server.key</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:452
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"Access permissions\n"
-"# Access permissions for each directory served by the scheduler.\n"
-"Locations are relative to DocumentRoot...\n"
-"# AuthType: the authorization to use:\n"
-"#    None   - Perform no authentication\n"
-"Basic  - Perform authentication using the HTTP Basic method.\n"
-"Digest - Perform authentication using the HTTP Digest method.\n"
-"#    (Note: local certificate authentication can be substituted by\n"
-"the client for Basic or Digest when connecting to the\n"
-"localhost interface)\n"
-"# AuthClass: the authorization class; currently only Anonymous, User,\n"
-"System (valid user belonging to group SystemGroup), and Group\n"
-"(valid user belonging to the specified group) are supported.\n"
-"# AuthGroupName: the group name for \"Group\" authorization.\n"
-"# Order: the order of Allow/Deny processing.\n"
-"# Allow: allows access from the specified hostname, domain, IP address, or\n"
-"network.\n"
-"# Deny: denies access from the specified hostname, domain, IP address, or\n"
-"network.\n"
-"# Both \"Allow\" and \"Deny\" accept the following notations for addresses:\n"
-"#     All\n"
-"None\n"
-"*.domain.com\n"
-".domain.com\n"
-"host.domain.com\n"
-"nnn.*\n"
-"nnn.nnn.*\n"
-"nnn.nnn.nnn.*\n"
-"nnn.nnn.nnn.nnn\n"
-"nnn.nnn.nnn.nnn/mm\n"
-"nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm\n"
-"# The host and domain address require that you enable hostname lookups\n"
-"with \"HostNameLookups On\" above.\n"
-"# Encryption: whether or not to use encryption; this depends on having\n"
-"the OpenSSL library linked into the CUPS library and scheduler.\n"
-"# Possible values:\n"
-"#     Always       - Always use encryption (SSL)\n"
-"Never        - Never use encryption\n"
-"Required     - Use TLS encryption upgrade\n"
-"IfRequested  - Use encryption if the server requests it\n"
-"# The default value is \"IfRequested\".\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:495
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Authentication (AuthType)</b>\n"
-"<p>\n"
-"The authorization to use:"
-"<p>\n"
-"<ul type=circle>\n"
-"<li><i>None</i>   - Perform no authentication.</li>\n"
-"<li><i>Basic</i>  - Perform authentication using the HTTP Basic method.</li>\n"
-"<li><i>Digest</i> - Perform authentication using the HTTP Digest method.</li>\n"
-"</ul>"
-"<p>\n"
-"Note: local certificate authentication can be substituted by\n"
-"the client for <i>Basic</i> or <i>Digest</i> when connecting to the\n"
-"localhost interface.</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:508
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Class (AuthClass)</b>\n"
-"<p>\n"
-"The authorization class; currently only <i>Anonymous</i>, <i>User</i>,\n"
-"<i>System</i> (valid user belonging to group SystemGroup), and <i>Group</i>\n"
-"(valid user belonging to the specified group) are supported.</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:515
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<p>The user/group names allowed to access the resource. The format is a\n"
-"comma separated list.</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:519
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Satisfy (Satisfy)</b>\n"
-"<p>\n"
-"This directive controls whether all specified conditions must\n"
-"be satisfied to allow access to the resource. If set to \"all\",\n"
-"then all authentication and access control conditions must be\n"
-"satisfied to allow access.\n"
-"</p>\n"
-"<p>\n"
-"Setting Satisfy to \"any\" allows a user to gain access if the\n"
-"authentication <i>or</i> access control requirements are satisfied.\n"
-"For example, you might require authentication for remote access,\n"
-"but allow local access without authentication.\n"
-"</p>\n"
-"<p>\n"
-"The default is \"all\".\n"
-"</p> \n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:537
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Authentication group name (AuthGroupName)</b>\n"
-"<p>\n"
-"The group name for <i>Group</i> authorization.</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:542
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>ACL order (Order)</b>\n"
-"<p>\n"
-"The order of Allow/Deny processing.</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:547
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Allow</b>\n"
-"<p>\n"
-"Allows access from the specified hostname, domain, IP address, or\n"
-"network. Possible values are:</p>\n"
-"<pre>\n"
-"All\n"
-"None\n"
-"*.domain.com\n"
-".domain.com\n"
-"host.domain.com\n"
-"nnn.*\n"
-"nnn.nnn.*\n"
-"nnn.nnn.nnn.*\n"
-"nnn.nnn.nnn.nnn\n"
-"nnn.nnn.nnn.nnn/mm\n"
-"nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm\n"
-"</pre>"
-"<p>\n"
-"The host and domain address require that you enable hostname lookups\n"
-"with \"HostNameLookups On\" above.</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:568
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>ACL addresses (Allow/Deny)</b>\n"
-"<p>\n"
-"Allows/Denies access from the specified hostname, domain, IP address, or\n"
-"network. Possible values are:</p>\n"
-"<pre>\n"
-"All\n"
-"None\n"
-"*.domain.com\n"
-".domain.com\n"
-"host.domain.com\n"
-"nnn.*\n"
-"nnn.nnn.*\n"
-"nnn.nnn.nnn.*\n"
-"nnn.nnn.nnn.nnn\n"
-"nnn.nnn.nnn.nnn/mm\n"
-"nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm\n"
-"</pre>"
-"<p>\n"
-"The host and domain address require that you enable hostname lookups\n"
-"with \"HostNameLookups On\" above.</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:589
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Encryption (Encryption)</b>\n"
-"<p>\n"
-"Whether or not to use encryption; this depends on having\n"
-"the OpenSSL library linked into the CUPS library and scheduler.</p>\n"
-"<p>\n"
-"Possible values:</p>\n"
-"<ul type=circle>\n"
-"<li><i>Always</i>       - Always use encryption (SSL)</li>\n"
-"<li><i>Never</i>        - Never use encryption</li>\n"
-"<li><i>Required</i>     - Use TLS encryption upgrade</li>\n"
-"<li><i>IfRequested</i>  - Use encryption if the server requests it</li>\n"
-"</ul>"
-"<p>\n"
-"The default value is \"IfRequested\".</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:604
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Access permissions</b>\n"
-"<p>\n"
-"Access permissions for each directory served by the scheduler.\n"
-"Locations are relative to DocumentRoot...</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:610
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Auto purge jobs (AutoPurgeJobs)</b>\n"
-"<p>\n"
-"Automatically purge jobs when not needed for quotas.\n"
-"Default is No.</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:616
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Browse protocols (BrowseProtocols)</b>\n"
-"<p>\n"
-"Which protocols to use for browsing.  Can be\n"
-"any of the following separated by whitespace and/or commas:</p>\n"
-"<ul type=circle>\n"
-"<li><i>all</i>  - Use all supported protocols.</li>\n"
-"<li><i>cups</i> - Use the CUPS browse protocol.</li>\n"
-"<li><i>slp</i>  - Use the SLPv2 protocol.</li>\n"
-"</ul>"
-"<p>\n"
-"The default is <b>cups</b>.</p>\n"
-"<p>\n"
-"Note: If you choose to use SLPv2, it is <b>strongly</b> recommended that\n"
-"you have at least one SLP Directory Agent (DA) on your\n"
-"network.  Otherwise, browse updates can take several seconds,\n"
-"during which the scheduler will not response to client\n"
-"requests.</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:634
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Classification (Classification)</b>\n"
-"<p>\n"
-"The classification level of the server.  If set, this\n"
-"classification is displayed on all pages, and raw printing is disabled.\n"
-"The default is the empty string.</p>\n"
-"<p>\n"
-"<i>ex</i>: confidential\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:643
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Allow overrides (ClassifyOverride)</b>\n"
-"<p>\n"
-"Whether to allow users to override the classification\n"
-"on printouts. If enabled, users can limit banner pages to before or\n"
-"after the job, and can change the classification of a job, but cannot\n"
-"completely eliminate the classification or banners.</p>\n"
-"<p>\n"
-"The default is off.</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:653
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Hide implicit members (HideImplicitMembers)</b>\n"
-"<p>\n"
-"Whether or not to show the members of an\n"
-"implicit class.</p>\n"
-"<p>\n"
-"When HideImplicitMembers is On, any remote printers that are\n"
-"part of an implicit class are hidden from the user, who will\n"
-"then only see a single queue even though many queues will be\n"
-"supporting the implicit class.</p>\n"
-"<p>\n"
-"Enabled by default.</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:666
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Use &quot;any&quot; classes (ImplicitAnyClasses)</b>\n"
-"<p>\n"
-"Whether or not to create <b>AnyPrinter</b> implicit\n"
-"classes.</p>\n"
-"<p>\n"
-"When ImplicitAnyClasses is On and a local queue of the same name\n"
-"exists, e.g. \"printer\", \"printer@server1\", \"printer@server1\", then\n"
-"an implicit class called \"Anyprinter\" is created instead.</p>\n"
-"<p>\n"
-"When ImplicitAnyClasses is Off, implicit classes are not created\n"
-"when there is a local queue of the same name.</p>\n"
-"<p>\n"
-"Disabled by default.</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:681
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Max jobs (MaxJobs)</b>\n"
-"<p>\n"
-"Maximum number of jobs to keep in memory (active and completed).\n"
-"Default is 0 (no limit).</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:687
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Max jobs per user (MaxJobsPerUser)</b>\n"
-"<p>\n"
-"The MaxJobsPerUser directive controls the maximum number of <i>active</i>\n"
-"jobs that are allowed for each user. Once a user reaches the limit, new\n"
-"jobs will be rejected until one of the active jobs is completed, stopped,\n"
-"aborted, or canceled.</p>\n"
-"<p>\n"
-"Setting the maximum to 0 disables this functionality.\n"
-"Default is 0 (no limit).\n"
-"</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:699
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Max jobs per printer (MaxJobsPerPrinter)</b>\n"
-"<p>\n"
-"The MaxJobsPerPrinter directive controls the maximum number of <i>active</i>\n"
-"jobs that are allowed for each printer or class. Once a printer or class\n"
-"reaches the limit, new jobs will be rejected until one of the active jobs\n"
-"is completed, stopped, aborted, or canceled.</p>\n"
-"<p>\n"
-"Setting the maximum to 0 disables this functionality.\n"
-"Default is 0 (no limit).\n"
-"</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:711
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Port</b>\n"
-"<p>\n"
-"The port value that the CUPS daemon is listening to. Default is 631.</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:716
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<b>Address</b>\n"
-"<p>\n"
-"The address that the CUPS daemon is listening at. Leave it empty or use\n"
-"an asterisk (*) to specify a port value on the entire subnetwork.</p>\n"
-msgstr ""
-
-#: cupsd.conf.template.cpp:722
-msgid ""
-"_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, "
-"etc.)\n"
-"<p>Check this box if you want to use SSL encryption with this address/port.\n"
-"</p>\n"
-msgstr ""
-
 #: cupsdbrowsingpage.cpp:37
 msgid "Browsing"
 msgstr "浏览"
@@ -1146,106 +126,106 @@ msgstr "浏览顺序："
 msgid "Browse options:"
 msgstr "浏览选项："
 
-#: cupsdconf.cpp:811 cupsdconf.cpp:834 cupsdconf.cpp:850
+#: cupsdconf.cpp:847 cupsdconf.cpp:870 cupsdconf.cpp:886
 msgid ""
 "_: Base\n"
 "Root"
 msgstr "根"
 
-#: cupsdconf.cpp:811 cupsdconf.cpp:831 cupsdconf.cpp:852
+#: cupsdconf.cpp:847 cupsdconf.cpp:867 cupsdconf.cpp:888
 msgid "All printers"
 msgstr "全部打印机"
 
-#: cupsdconf.cpp:811 cupsdconf.cpp:832 cupsdconf.cpp:853
+#: cupsdconf.cpp:847 cupsdconf.cpp:868 cupsdconf.cpp:889
 msgid "All classes"
 msgstr "全部类"
 
-#: cupsdconf.cpp:811 cupsdconf.cpp:833 cupsdconf.cpp:855
+#: cupsdconf.cpp:847 cupsdconf.cpp:869 cupsdconf.cpp:891
 msgid "Print jobs"
 msgstr "打印任务"
 
-#: cupsdconf.cpp:812 cupsdconf.cpp:830 cupsdconf.cpp:851
+#: cupsdconf.cpp:848 cupsdconf.cpp:866 cupsdconf.cpp:887
 msgid "Administration"
 msgstr "管理"
 
-#: cupsdconf.cpp:813 cupsdconf.cpp:840 cupsdconf.cpp:843 cupsdconf.cpp:864
+#: cupsdconf.cpp:849 cupsdconf.cpp:876 cupsdconf.cpp:879 cupsdconf.cpp:900
 msgid "Class"
 msgstr "类"
 
-#: cupsdconf.cpp:814 cupsdconf.cpp:835 cupsdconf.cpp:838 cupsdconf.cpp:858
+#: cupsdconf.cpp:850 cupsdconf.cpp:871 cupsdconf.cpp:874 cupsdconf.cpp:894
 msgid "Printer"
 msgstr "打印机"
 
-#: cupsdconf.cpp:854
+#: cupsdconf.cpp:890
 msgid "Root"
 msgstr "根"
 
-#: cupsddialog.cpp:113
+#: cupsddialog.cpp:114
 msgid "Short Help"
 msgstr "简短帮助"
 
-#: cupsddialog.cpp:126
+#: cupsddialog.cpp:127
 msgid "CUPS Server Configuration"
 msgstr "CUPS 服务器配置"
 
-#: cupsddialog.cpp:173
+#: cupsddialog.cpp:174
 msgid "Error while loading configuration file!"
 msgstr "在载入配置文件时发生错误！"
 
-#: cupsddialog.cpp:173 cupsddialog.cpp:192 cupsddialog.cpp:258
-#: cupsddialog.cpp:313
+#: cupsddialog.cpp:174 cupsddialog.cpp:193 cupsddialog.cpp:254
+#: cupsddialog.cpp:309
 msgid "CUPS Configuration Error"
 msgstr "CUPS 配置错误"
 
-#: cupsddialog.cpp:182
+#: cupsddialog.cpp:183
 msgid ""
 "Some options were not recognized by this configuration tool. They will be left "
 "untouched and you won't be able to change them."
 msgstr "某些选项无法被此配置工具识别。这些选项将原样进行设置，您也无法更改这些选项。"
 
-#: cupsddialog.cpp:184
+#: cupsddialog.cpp:185
 msgid "Unrecognized Options"
 msgstr "未识别的选项"
 
-#: cupsddialog.cpp:204
+#: cupsddialog.cpp:205
 msgid "Unable to find a running CUPS server"
 msgstr "无法找到正在运行的CUPS服务器"
 
-#: cupsddialog.cpp:218
+#: cupsddialog.cpp:214
 msgid "Unable to restart CUPS server (pid = %1)"
 msgstr "无法重新启动CUPS服务器 (PID = %1)"
 
-#: cupsddialog.cpp:239
+#: cupsddialog.cpp:235
 msgid ""
 "Unable to retrieve configuration file from the CUPS server. You probably don't "
 "have the access permissions to perform this operation."
 msgstr "无法从 CUPS 服务器获取配置文件。您可能没有执行此操作所需的访问权限。"
 
-#: cupsddialog.cpp:249
+#: cupsddialog.cpp:245
 msgid "Internal error: file '%1' not readable/writable!"
 msgstr "内部错误：文件“%1”不可读/不可写！"
 
-#: cupsddialog.cpp:252
+#: cupsddialog.cpp:248
 msgid "Internal error: empty file '%1'!"
 msgstr "内部错误：空文件“%1”！"
 
-#: cupsddialog.cpp:270
+#: cupsddialog.cpp:266
 msgid ""
 "The config file has not been uploaded to the CUPS server. The daemon will not "
 "be restarted."
 msgstr ""
 
-#: cupsddialog.cpp:274
+#: cupsddialog.cpp:270
 msgid ""
 "Unable to upload the configuration file to CUPS server. You probably don't have "
 "the access permissions to perform this operation."
 msgstr ""
 
-#: cupsddialog.cpp:277
+#: cupsddialog.cpp:273
 msgid "CUPS configuration error"
 msgstr "CUPS 配置错误"
 
-#: cupsddialog.cpp:308
+#: cupsddialog.cpp:304
 #, c-format
 msgid "Unable to write configuration file %1"
 msgstr "无法写入配置文件 %1"
@@ -1692,3 +672,39 @@ msgstr "GB"
 #: sizewidget.cpp:37
 msgid "Tiles"
 msgstr ""
+
+#~ msgid ""
+#~ "_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, etc.)\n"
+#~ "<b>Server name (ServerName)</b>\n"
+#~ "<p>\n"
+#~ "The hostname of your server, as advertised to the world.\n"
+#~ "By default CUPS will use the hostname of the system.</p>\n"
+#~ "<p>\n"
+#~ "To set the default server used by clients, see the client.conf file.</p>\n"
+#~ "<p>\n"
+#~ "<i>ex</i>: myhost.domain.com</p>\n"
+#~ msgstr ""
+#~ "<b>服务器名称(ServerName)</b>\n"
+#~ "<p>\n"
+#~ "您服务器公布给全世界的主机名。\n"
+#~ "默认情况下，CUPS 将会使用系统的主机名。</p>\n"
+#~ "<p>\n"
+#~ "要设置客户端所用的默认服务器，请见 client.conf 文件。</p>\n"
+#~ "<p>\n"
+#~ "<i>如</i>：myhost.domain.com</p>\n"
+
+#~ msgid ""
+#~ "_: Do not translate the keyword between brackets (e.g. ServerName, ServerAdmin, etc.)\n"
+#~ "<b>Server administrator (ServerAdmin)</b>\n"
+#~ "<p>\n"
+#~ "The email address to send all complaints or problems to.\n"
+#~ "By default CUPS will use \"root@hostname\".</p>\n"
+#~ "<p>\n"
+#~ "<i>ex</i>: root@myhost.com</p>\n"
+#~ msgstr ""
+#~ "<b>服务器管理员(ServerAdmin)</b>\n"
+#~ "<p>\n"
+#~ "出现问题时报告的电子邮件地址。\n"
+#~ "默认情况下，CUPS 将会使用“root@主机名”。</p>\n"
+#~ "<p>\n"
+#~ "<i>如</i>：root@myhost.com</p>\n"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/katepart.po b/tde-i18n-zh_CN/messages/tdelibs/katepart.po
index 3d6b6e9a5f0..a280ad0ac43 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/katepart.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/katepart.po
@@ -8,249 +8,451 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: katepart\n"
-"POT-Creation-Date: 2008-05-21 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2005-08-01 07:52+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: part/kateprinter.cpp:72
-#, c-format
-msgid "Print %1"
-msgstr "打印 %1"
+#: _translatorinfo.cpp:1 part/katefactory.cpp:115
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "开源软件国际化之 TDE 简体中文组"
 
-#: part/kateprinter.cpp:202
-msgid "(Selection of) "
-msgstr "(选自)"
+#: _translatorinfo.cpp:3 part/katefactory.cpp:115
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "i18n-translation@lists.linux.net.cn"
 
-#: part/kateprinter.cpp:309 part/kateprinter.cpp:528
-#, c-format
-msgid "Typographical Conventions for %1"
-msgstr "用于%1的印刷惯例"
+#: plugins/autobookmarker/autobookmarker.cpp:90
+msgid "AutoBookmarks"
+msgstr "自动书签"
 
-#: part/kateprinter.cpp:639
-msgid "Te&xt Settings"
-msgstr "文本设置(&X)"
+#: plugins/autobookmarker/autobookmarker.cpp:101
+msgid "Configure AutoBookmarks"
+msgstr "配置自动书签"
 
-#: part/kateprinter.cpp:644
-msgid "Print &selected text only"
-msgstr "只打印选定的文本(&S)"
+#: plugins/autobookmarker/autobookmarker.cpp:279
+msgid "Edit Entry"
+msgstr "编辑项"
 
-#: part/kateprinter.cpp:647
-msgid "Print &line numbers"
-msgstr "打印行号(&L)"
+#: plugins/autobookmarker/autobookmarker.cpp:287
+msgid "&Pattern:"
+msgstr "模式(&P)："
 
-#: part/kateprinter.cpp:650
-msgid "Print syntax &guide"
-msgstr "打印语法向导(&G)"
+#: plugins/autobookmarker/autobookmarker.cpp:293
+msgid "<p>A regular expression. Matching lines will be bookmarked.</p>"
+msgstr "<p>正则表达式。匹配的行将被加入书签。</p>"
 
-#: part/kateprinter.cpp:659
+#: plugins/autobookmarker/autobookmarker.cpp:297
+msgid "Case &sensitive"
+msgstr "区分大小写(&S)"
+
+#: plugins/autobookmarker/autobookmarker.cpp:301
 msgid ""
-"<p>This option is only available if some text is selected in the document.</p>"
-"<p>If available and enabled, only the selected text is printed.</p>"
-msgstr "<p>当文档中有文本被选择时此选项才能被设置。</p><p>如果选中此选项，将只打印所选择的文本。</p>"
+"<p>If enabled, the pattern matching will be case sensitive, otherwise not.</p>"
+msgstr "<p>如果启用的话，模式匹配将区分大小写，否则不区分。</p>"
 
-#: part/kateprinter.cpp:662
+#: plugins/autobookmarker/autobookmarker.cpp:304
+msgid "&Minimal matching"
+msgstr "最小匹配(&M)"
+
+#: plugins/autobookmarker/autobookmarker.cpp:308
 msgid ""
-"<p>If enabled, line numbers will be printed on the left side of the page(s).</p>"
-msgstr "<p>如果选中此选项，行号将被打印在每页左边。</p>"
+"<p>If enabled, the pattern matching will use minimal matching; if you do not "
+"know what that is, please read the appendix on regular expressions in the kate "
+"manual.</p>"
+msgstr "<p>如果启用，模式匹配将使用最小匹配；如果您不知道什么是最小匹配，请阅读 Kate 手册中正则表达式的附录。</p>"
 
-#: part/kateprinter.cpp:664
+#: plugins/autobookmarker/autobookmarker.cpp:312
+msgid "&File mask:"
+msgstr "文件通配符(&F)："
+
+#: plugins/autobookmarker/autobookmarker.cpp:318
 msgid ""
-"<p>Print a box displaying typographical conventions for the document type, as "
-"defined by the syntax highlighting being used."
-msgstr "<p>打印一个方框，按照语法加亮定义的文档类型，显示此文档类型的印刷惯例。"
+"<p>A list of filename masks, separated by semicolons. This can be used to limit "
+"the usage of this entity to files with matching names.</p>"
+"<p>Use the wizard button to the right of the mimetype entry below to easily "
+"fill out both lists.</p>"
+msgstr ""
+"<p>以分号分隔的文件名通配符列表。此列表可用于限制此实体的用途仅限于匹配名称的文件。</p>"
+"<p>使用下方 MIME 类型项右侧的向导按钮可轻松填入全部列表。</p>"
 
-#: part/kateprinter.cpp:700
-msgid "Hea&der && Footer"
-msgstr "页眉和页脚(&D)"
+#: part/katedialogs.cpp:1303 part/katefiletype.cpp:308
+#: plugins/autobookmarker/autobookmarker.cpp:323
+msgid "MIME &types:"
+msgstr "MIME 类型(&T)："
 
-#: part/kateprinter.cpp:708
-msgid "Pr&int header"
-msgstr "打印页眉(&I)"
+#: plugins/autobookmarker/autobookmarker.cpp:329
+msgid ""
+"<p>A list of mime types, separated by semicolon. This can be used to limit the "
+"usage of this entity to files with matching mime types.</p>"
+"<p>Use the wizard button on the right to get a list of existing file types to "
+"choose from, using it will fill in the file masks as well.</p>"
+msgstr ""
+"<p>以分号分隔的 MIME 类型列表。此列表可用于限制此实体的用途仅限于匹配 MIME 类型的文件。</p>"
+"<p>使用下方 MIME 类型项右侧的向导按钮可轻松填入全部列表。</p>"
 
-#: part/kateprinter.cpp:710
-msgid "Pri&nt footer"
-msgstr "打印页脚(&N)"
+#: plugins/autobookmarker/autobookmarker.cpp:339
+msgid ""
+"<p>Click this button to display a checkable list of mimetypes available on your "
+"system. When used, the file masks entry above will be filled in with the "
+"corresponding masks.</p>"
+msgstr "<p>单击此按钮可显示系统中可用的 MIME 类型复选列表。使用此功能后，上面的文件通配符项也会按照相应的 MIME 类型填入。</p>"
 
-#: part/kateprinter.cpp:715
-msgid "Header/footer font:"
-msgstr "页眉/页脚字体："
+#: plugins/autobookmarker/autobookmarker.cpp:364
+msgid ""
+"Select the MimeTypes for this pattern.\n"
+"Please note that this will automatically edit the associated file extensions as "
+"well."
+msgstr ""
+"选择你想要为此文件类型对应的 MIME 类型。\n"
+"请注意，这也将自动编辑相关联的文件扩展名。"
 
-#: part/kateprinter.cpp:720
-msgid "Choo&se Font..."
-msgstr "选择字体(&S)..."
+#: part/katedialogs.cpp:1425 part/katefiletype.cpp:506
+#: plugins/autobookmarker/autobookmarker.cpp:366
+msgid "Select Mime Types"
+msgstr "选择 MIME 类型"
 
-#: part/kateprinter.cpp:724
-msgid "Header Properties"
-msgstr "页眉属性"
+#: plugins/autobookmarker/autobookmarker.cpp:384
+msgid "&Patterns"
+msgstr "模式(&P)"
 
-#: part/kateprinter.cpp:727
-msgid "&Format:"
-msgstr "格式(&F)："
+#: plugins/autobookmarker/autobookmarker.cpp:387
+msgid "Pattern"
+msgstr "模式"
 
-#: part/kateprinter.cpp:734 part/kateprinter.cpp:755
-msgid "Colors:"
-msgstr "颜色："
+#: plugins/autobookmarker/autobookmarker.cpp:388
+msgid "Mime Types"
+msgstr "MIME 类型"
 
-#: part/kateprinter.cpp:737 part/kateprinter.cpp:758
-msgid "Foreground:"
-msgstr "前景："
+#: plugins/autobookmarker/autobookmarker.cpp:389
+msgid "File Masks"
+msgstr "文件通配符"
 
-#: part/kateprinter.cpp:740
-msgid "Bac&kground"
-msgstr "背景(&K)"
+#: plugins/autobookmarker/autobookmarker.cpp:393
+msgid ""
+"<p>This list shows your configured autobookmark entities. When a document is "
+"opened, each entity is used in the following way: "
+"<ol>"
+"<li>The entity is dismissed, if a mime and/or filename mask is defined, and "
+"neither matches the document.</li>"
+"<li>Otherwise each line of the document is tried against the pattern, and a "
+"bookmark is set on matching lines.</li></ul>"
+"<p>Use the buttons below to manage your collection of entities.</p>"
+msgstr ""
+"<p>此列表为您显示了已经配置的自动书签实体。当文档打开时，每项将以如下方式使用："
+"<ol>"
+"<li>如果定义了 MIME 和/或文件名通配符，而二者之一与文档不符，则忽略此项。</li>"
+"<li>否则，会将文档的每一行与模式进行匹配，并在匹配行上设置书签。</li></ul>"
+"<p>使用下面的按钮可管理您的项收藏。</p>"
 
-#: part/kateprinter.cpp:743
-msgid "Footer Properties"
-msgstr "页脚属性"
+#: part/kateschema.cpp:840 plugins/autobookmarker/autobookmarker.cpp:405
+msgid "&New..."
+msgstr "新建(&N)..."
 
-#: part/kateprinter.cpp:747
-msgid "For&mat:"
-msgstr "格式(&M)："
+#: plugins/autobookmarker/autobookmarker.cpp:408
+msgid "Press this button to create a new autobookmark entity."
+msgstr "按此按钮可创建新的自动书签实体。"
 
-#: part/kateprinter.cpp:761
-msgid "&Background"
-msgstr "背景(&B)"
+#: plugins/autobookmarker/autobookmarker.cpp:413
+msgid "Press this button to delete the currently selected entity."
+msgstr "按此按钮可删除当前选中实体。"
 
-#: part/kateprinter.cpp:788
-msgid "<p>Format of the page header. The following tags are supported:</p>"
-msgstr "<p>页眉的格式。支持下列标记：</p>"
+#: plugins/autobookmarker/autobookmarker.cpp:415
+msgid "&Edit..."
+msgstr "编辑(&E)..."
 
-#: part/kateprinter.cpp:790
+#: plugins/autobookmarker/autobookmarker.cpp:418
+msgid "Press this button to edit the currently selected entity."
+msgstr "按此按钮可编辑当前选中实体。"
+
+#: plugins/insertfile/insertfileplugin.cpp:79
+msgid "Insert File..."
+msgstr "插入文件..."
+
+#: plugins/insertfile/insertfileplugin.cpp:88
+msgid "Choose File to Insert"
+msgstr "选择要插入的文件"
+
+#: plugins/insertfile/insertfileplugin.cpp:116
 msgid ""
-"<ul>"
-"<li><tt>%u</tt>: current user name</li>"
-"<li><tt>%d</tt>: complete date/time in short format</li>"
-"<li><tt>%D</tt>: complete date/time in long format</li>"
-"<li><tt>%h</tt>: current time</li>"
-"<li><tt>%y</tt>: current date in short format</li>"
-"<li><tt>%Y</tt>: current date in long format</li>"
-"<li><tt>%f</tt>: file name</li>"
-"<li><tt>%U</tt>: full URL of the document</li>"
-"<li><tt>%p</tt>: page number</li></ul>"
-"<br><u>Note:</u> Do <b>not</b> use the '|' (vertical bar) character."
+"Failed to load file:\n"
+"\n"
 msgstr ""
-"<ul>"
-"<li><tt>%u</tt>：当前用户名</li>"
-"<li><tt>%d</tt>：完整的日期/时间(短格式)</li>"
-"<li><tt>%D</tt>：完整的日期/时间(长格式)</li>"
-"<li><tt>%h</tt>：当前时间</li>"
-"<li><tt>%y</tt>：当前日期(短格式)</li>"
-"<li><tt>%Y</tt>：当前日期(长格式)</li>"
-"<li><tt>%f</tt>：文件名</li>"
-"<li><tt>%U</tt>：文档的完整 URL</li>"
-"<li><tt>%p</tt>：页码</li></ul>"
-"<br><u>注意：</u> 请<b>不要</b>使用‘|’(竖线)字符。"
+"载入文件失败：\n"
+"\n"
 
-#: part/kateprinter.cpp:804
-msgid "<p>Format of the page footer. The following tags are supported:</p>"
-msgstr "<p>页脚的格式。支持下列标记：</p>"
+#: plugins/insertfile/insertfileplugin.cpp:116
+#: plugins/insertfile/insertfileplugin.cpp:137
+#: plugins/insertfile/insertfileplugin.cpp:159
+msgid "Insert File Error"
+msgstr "插入文件错误"
 
-#: part/kateprinter.cpp:908
-msgid "L&ayout"
-msgstr "布局(&A)"
+#: plugins/insertfile/insertfileplugin.cpp:130
+msgid ""
+"<p>The file <strong>%1</strong> does not exist or is not readable, aborting."
+msgstr "<p>文件 <strong>%1</strong> 不存在或不可读，中止。"
 
-#: part/kateprinter.cpp:915 part/kateschema.cpp:834
-msgid "&Schema:"
-msgstr "方案(&S)："
+#: plugins/insertfile/insertfileplugin.cpp:134
+msgid "<p>Unable to open file <strong>%1</strong>, aborting."
+msgstr "<p>无法打开文件 <strong>%1</strong>，中止。"
 
-#: part/kateprinter.cpp:919
-msgid "Draw bac&kground color"
-msgstr "绘制背景颜色(&K)"
+#: plugins/insertfile/insertfileplugin.cpp:157
+msgid "<p>File <strong>%1</strong> had no contents."
+msgstr "<p>文件 <strong>%1</strong> 没有内容。"
 
-#: part/kateprinter.cpp:922
-msgid "Draw &boxes"
-msgstr "绘制边框(&B)"
+#: plugins/kdatatool/kate_kdatatool.cpp:78
+msgid "Data Tools"
+msgstr "数据工具"
 
-#: part/kateprinter.cpp:925
-msgid "Box Properties"
-msgstr "边框属性"
+#: plugins/kdatatool/kate_kdatatool.cpp:153
+#: plugins/kdatatool/kate_kdatatool.cpp:175
+msgid "(not available)"
+msgstr "(不可用)"
 
-#: part/kateprinter.cpp:928
-msgid "W&idth:"
-msgstr "宽度(&I)："
+#: plugins/kdatatool/kate_kdatatool.cpp:183
+msgid ""
+"Data tools are only available when text is selected, or when the right mouse "
+"button is clicked over a word. If no data tools are offered even when text is "
+"selected, you need to install them. Some data tools are part of the KOffice "
+"package."
+msgstr ""
+"只有在文本被选中、或者鼠标右键点击在一个词上时数据工具才可用。如果当文本被选中时还没有数据工具可用，您需要安装它。有些数据工具是 KOffice "
+"软件包的一部分。"
 
-#: part/kateprinter.cpp:932
-msgid "&Margin:"
-msgstr "边距(&M)："
+#: plugins/isearch/ISearchPlugin.cpp:68 plugins/isearch/ISearchPlugin.cpp:371
+msgid "Search Incrementally"
+msgstr "递增搜索"
 
-#: part/kateprinter.cpp:936
-msgid "Co&lor:"
-msgstr "颜色(&L)："
+#: plugins/isearch/ISearchPlugin.cpp:72 plugins/isearch/ISearchPlugin.cpp:372
+msgid "Search Incrementally Backwards"
+msgstr "反向递增搜索"
 
-#: part/kateprinter.cpp:954
+#: plugins/isearch/ISearchPlugin.cpp:76 plugins/isearch/ISearchPlugin.cpp:79
+msgid "I-Search:"
+msgstr "递增搜索："
+
+#: plugins/isearch/ISearchPlugin.cpp:95
+msgid "Search"
+msgstr "搜索"
+
+#: plugins/isearch/ISearchPlugin.cpp:101
+msgid "Search Options"
+msgstr "搜索选项"
+
+#: plugins/isearch/ISearchPlugin.cpp:106 plugins/isearch/ISearchPlugin.cpp:412
+msgid "Case Sensitive"
+msgstr "区分大小写"
+
+#: plugins/isearch/ISearchPlugin.cpp:115 plugins/isearch/ISearchPlugin.cpp:414
+msgid "From Beginning"
+msgstr "从开头开始"
+
+#: plugins/isearch/ISearchPlugin.cpp:124 plugins/isearch/ISearchPlugin.cpp:416
+msgid "Regular Expression"
+msgstr "正则表达式"
+
+#: plugins/isearch/ISearchPlugin.cpp:244
 msgid ""
-"<p>If enabled, the background color of the editor will be used.</p>"
-"<p>This may be useful if your color scheme is designed for a dark "
-"background.</p>"
-msgstr "<p>如选中此项，打印时将使用编辑器的背景颜色。</p><p>如果您的配色方案为暗色背景这可能有用。</p>"
+"_: Incremental Search\n"
+"I-Search:"
+msgstr "递增搜索："
 
-#: part/kateprinter.cpp:957
+#: plugins/isearch/ISearchPlugin.cpp:247
 msgid ""
-"<p>If enabled, a box as defined in the properties below will be drawn around "
-"the contents of each page. The Header and Footer will be separated from the "
-"contents with a line as well.</p>"
-msgstr "<p>如果选中此项，如下属性定义的边框将打印在每页正文周围。页眉和页脚也会用线条与正文隔开。</p>"
+"_: Incremental Search found no match\n"
+"Failing I-Search:"
+msgstr "递增搜索失败："
 
-#: part/kateprinter.cpp:961
-msgid "The width of the box outline"
-msgstr "边框线条的宽度"
+#: plugins/isearch/ISearchPlugin.cpp:250
+msgid ""
+"_: Incremental Search in the reverse direction\n"
+"I-Search Backward:"
+msgstr "反向递增搜索："
 
-#: part/kateprinter.cpp:963
-msgid "The margin inside boxes, in pixels"
-msgstr "边框内圈的留空(像素)"
+#: plugins/isearch/ISearchPlugin.cpp:253
+msgid "Failing I-Search Backward:"
+msgstr "反向递增搜索失败："
 
-#: part/kateprinter.cpp:965
-msgid "The line color to use for boxes"
-msgstr "边框线条的颜色"
+#: plugins/isearch/ISearchPlugin.cpp:256
+msgid ""
+"_: Incremental Search has passed the end of the document\n"
+"Wrapped I-Search:"
+msgstr "回绕递增搜索："
 
-#: part/katebookmarks.cpp:77
-msgid "Set &Bookmark"
-msgstr "设置书签(&B)"
+#: plugins/isearch/ISearchPlugin.cpp:259
+msgid "Failing Wrapped I-Search:"
+msgstr "回绕递增搜索失败："
 
-#: part/katebookmarks.cpp:80
-msgid "If a line has no bookmark then add one, otherwise remove it."
-msgstr "如果当前行没有书签就加一个，如果有则取消它。"
+#: plugins/isearch/ISearchPlugin.cpp:262
+msgid "Wrapped I-Search Backward:"
+msgstr "反向回绕递增搜索："
 
-#: part/katebookmarks.cpp:81
-msgid "Clear &Bookmark"
-msgstr "清除书签(&B)"
+#: plugins/isearch/ISearchPlugin.cpp:265
+msgid "Failing Wrapped I-Search Backward:"
+msgstr "反向回绕递增搜索失败："
 
-#: part/katebookmarks.cpp:84
-msgid "Clear &All Bookmarks"
-msgstr "清除全部书签(&A)"
+#: plugins/isearch/ISearchPlugin.cpp:269
+msgid ""
+"_: Incremental Search has passed both the end of the document and the original "
+"starting position\n"
+"Overwrapped I-Search:"
+msgstr "双重回绕递增搜索："
 
-#: part/katebookmarks.cpp:87
-msgid "Remove all bookmarks of the current document."
-msgstr "取消当前文档的所有书签。"
+#: plugins/isearch/ISearchPlugin.cpp:272
+msgid "Failing Overwrapped I-Search:"
+msgstr "双重回绕递增搜索失败："
 
-#: part/katebookmarks.cpp:90 part/katebookmarks.cpp:242
-msgid "Next Bookmark"
-msgstr "下一个书签"
+#: plugins/isearch/ISearchPlugin.cpp:275
+msgid "Overwrapped I-Search Backwards:"
+msgstr "反向双重回绕递增搜索："
 
-#: part/katebookmarks.cpp:93
-msgid "Go to the next bookmark."
-msgstr "前往下个书签。"
+#: plugins/isearch/ISearchPlugin.cpp:278
+msgid "Failing Overwrapped I-Search Backward:"
+msgstr "反向双重回绕递增搜索失败："
 
-#: part/katebookmarks.cpp:96 part/katebookmarks.cpp:244
-msgid "Previous Bookmark"
-msgstr "上一个书签"
+#: plugins/isearch/ISearchPlugin.cpp:280
+msgid "Error: unknown i-search state!"
+msgstr "错误：未知的递增搜索状态！"
 
-#: part/katebookmarks.cpp:99
-msgid "Go to the previous bookmark."
-msgstr "前往上个书签。"
+#: plugins/isearch/ISearchPlugin.cpp:341
+msgid "Next Incremental Search Match"
+msgstr "下一个递增搜索匹配"
 
-#: part/katebookmarks.cpp:203
-msgid "&Next: %1 - \"%2\""
-msgstr "下一个(&N)：%1 -“%2”"
+#: plugins/isearch/ISearchPlugin.cpp:342
+msgid "Previous Incremental Search Match"
+msgstr "上一个递增搜索匹配"
 
-#: part/katebookmarks.cpp:210
-msgid "&Previous: %1 - \"%2\""
-msgstr "上一个(&P)：%1 -“%2”"
+#: plugins/wordcompletion/docwordcompletion.cpp:109
+msgid "Word Completion Plugin"
+msgstr "单词补全插件"
+
+#: plugins/wordcompletion/docwordcompletion.cpp:114
+msgid "Configure the Word Completion Plugin"
+msgstr "配置单词补全插件"
+
+#: plugins/wordcompletion/docwordcompletion.cpp:148
+msgid "Reuse Word Above"
+msgstr "重用前面的单词"
+
+#: plugins/wordcompletion/docwordcompletion.cpp:150
+msgid "Reuse Word Below"
+msgstr "重用后面的单词"
+
+#: plugins/wordcompletion/docwordcompletion.cpp:152
+msgid "Pop Up Completion List"
+msgstr "弹出补全列表"
+
+#: plugins/wordcompletion/docwordcompletion.cpp:154
+msgid "Shell Completion"
+msgstr "Shell 补全"
+
+#: plugins/wordcompletion/docwordcompletion.cpp:156
+msgid "Automatic Completion Popup"
+msgstr "自动补全弹出"
+
+#: plugins/wordcompletion/docwordcompletion.cpp:498
+msgid "Automatically &show completion list"
+msgstr "自动显示补全列表(&S)"
+
+#: plugins/wordcompletion/docwordcompletion.cpp:511
+msgid ""
+"_: Translators: This is the first part of two strings wich will comprise the "
+"sentence 'Show completions when a word is at least N characters'. The first "
+"part is on the right side of the N, which is represented by a spinbox widget, "
+"followed by the second part: 'characters long'. Characters is a ingeger number "
+"between and including 1 and 30. Feel free to leave the second part of the "
+"sentence blank if it suits your language better. \n"
+"Show completions &when a word is at least"
+msgstr "显示补全要求单词至少有(&W)"
+
+#: plugins/wordcompletion/docwordcompletion.cpp:517
+msgid ""
+"_: This is the second part of two strings that will comprise teh sentence 'Show "
+"completions when a word is at least N characters'\n"
+"characters long."
+msgstr "个字符长。"
+
+#: plugins/wordcompletion/docwordcompletion.cpp:520
+msgid ""
+"Enable the automatic completion list popup as default. The popup can be "
+"disabled on a view basis from the 'Tools' menu."
+msgstr "默认启用自动补全列表弹出框。弹出框可以从“工具”菜单中根据视图加以禁用。"
+
+#: plugins/wordcompletion/docwordcompletion.cpp:523
+msgid ""
+"Define the length a word should have before the completion list is displayed."
+msgstr "定义显示补全列表前单词应该有多长。"
+
+#: part/kateluaindentscript.cpp:86
+msgid "indenter.register requires 2 parameters (event id, function to call)"
+msgstr "indenter.register 需要两个参数(事件 ID、要调用的函数)"
+
+#: part/kateluaindentscript.cpp:94
+msgid ""
+"indenter.register requires 2 parameters (event id (number), function to call "
+"(function))"
+msgstr "indenter.register 需要两个参数(事件 ID(数字)、要调用的函数(函数))"
+
+#: part/kateluaindentscript.cpp:108
+msgid "indenter.register:invalid event id"
+msgstr "indenter.register：无效的事件 ID"
+
+#: part/kateluaindentscript.cpp:113
+msgid "indenter.register:there is already a function set for given"
+msgstr "indenter.register：已经设置了给定的函数"
+
+#: part/kateluaindentscript.cpp:126
+msgid "document.textLine:One parameter (line number) required"
+msgstr "document.textLine：需要一个参数(行号)"
+
+#: part/kateluaindentscript.cpp:130
+msgid "document.textLine:One parameter (line number) required (number)"
+msgstr "document.textLine：需要一个参数(行号)(数字)"
+
+#: part/kateluaindentscript.cpp:139
+msgid ""
+"document.removeText:Four parameters needed (start line, start col,end line, end "
+"col)"
+msgstr "document.removeText：需要四个参数(开始行、开始列、结束行、结束列)"
+
+#: part/kateluaindentscript.cpp:143
+msgid ""
+"document.removeText:Four parameters needed (start line, start col,end line, end "
+"col) (4x number)"
+msgstr "document.removeText：需要四个参数(开始行、开始列、结束行、结束列)(四个数字)"
+
+#: part/kateluaindentscript.cpp:152
+msgid "document.insertText:Three parameters needed (line,col,text)"
+msgstr "document.insertText：需要三个参数(行、列、文本)"
+
+#: part/kateluaindentscript.cpp:156
+msgid ""
+"document.removeText:Three parameters needed (line,col,text) "
+"(number,number,string)"
+msgstr "document.insertText：需要三个参数(行、列、文本)(数字、数字、字符串)"
+
+#: part/kateluaindentscript.cpp:253
+msgid "LUA interpreter could not be initialized"
+msgstr "无法初始化 LUA 解释器"
+
+#: part/kateluaindentscript.cpp:293 part/kateluaindentscript.cpp:316
+#: part/kateluaindentscript.cpp:344
+#, c-format
+msgid "Lua indenting script had errors: %1"
+msgstr "Lua 缩进脚本有错误：%1"
+
+#: part/katejscript.cpp:1058 part/katejscript.cpp:1076
+#: part/kateluaindentscript.cpp:413 part/kateluaindentscript.cpp:431
+msgid "(Unknown)"
+msgstr "(未知)"
 
 #: part/katefactory.cpp:70
 msgid "Kate Part"
@@ -361,223 +563,666 @@ msgstr "非常好的帮助"
 msgid "All people who have contributed and I have forgotten to mention"
 msgstr "所有作出贡献而我却没能提到的人员"
 
-#: _translatorinfo.cpp:1 part/katefactory.cpp:115
+#: part/katesyntaxdocument.cpp:76
 msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "开源软件国际化之 TDE 简体中文组"
+"<qt>The error <b>%4</b>"
+"<br> has been detected in the file %1 at %2/%3</qt>"
+msgstr "<qt>文件 %1 中%2行/%3列发现错误<b>%4</b></qt>"
 
-#: _translatorinfo.cpp:3 part/katefactory.cpp:115
+#: part/katesyntaxdocument.cpp:84
+#, c-format
+msgid "Unable to open %1"
+msgstr "无法打开 %1"
+
+#: part/katesyntaxdocument.cpp:457
+msgid "Errors!"
+msgstr "错误！"
+
+#: part/katesyntaxdocument.cpp:462
+#, c-format
+msgid "Error: %1"
+msgstr "错误：%1"
+
+#: part/katespell.cpp:57
+msgid "Spelling (from cursor)..."
+msgstr "拼写(从光标处)..."
+
+#: part/katespell.cpp:58
+msgid "Check the document's spelling from the cursor and forward"
+msgstr "从光标处向下检查文档的拼写"
+
+#: part/katespell.cpp:60
+msgid "Spellcheck Selection..."
+msgstr "对选中范围进行拼写检查..."
+
+#: part/katespell.cpp:61
+msgid "Check spelling of the selected text"
+msgstr "检查选中文字的拼写"
+
+#: part/katespell.cpp:125
+msgid "Spellcheck"
+msgstr "拼写检查"
+
+#: part/katespell.cpp:205
 msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "i18n-translation@lists.linux.net.cn"
+"The spelling program could not be started. Please make sure you have set the "
+"correct spelling program and that it is properly configured and in your PATH."
+msgstr "无法启动拼写程序。请确定您已经正确安装了拼写程序，并已在 PATH 中配置好了。"
 
-#: part/katesearch.cpp:72
-msgid "Look up the first occurrence of a piece of text or regular expression."
-msgstr "查找第一个和文字或者正则表达式匹配的文本。"
+#: part/katespell.cpp:210
+msgid "The spelling program seems to have crashed."
+msgstr "拼写程序好像崩溃了。"
 
-#: part/katesearch.cpp:74
-msgid "Look up the next occurrence of the search phrase."
-msgstr "查找下一个和搜索字串匹配的文本。"
+#: part/kateview.cpp:216
+msgid "Cut the selected text and move it to the clipboard"
+msgstr "剪下选中的文字并保存到剪贴板"
 
-#: part/katesearch.cpp:76
-msgid "Look up the previous occurrence of the search phrase."
-msgstr "查找上一个和搜索字串匹配的文本。"
+#: part/kateview.cpp:219
+msgid "Paste previously copied or cut clipboard contents"
+msgstr "粘贴以前复制或者剪切到剪贴板的内容"
 
-#: part/katesearch.cpp:78
+#: part/kateview.cpp:222
 msgid ""
-"Look up a piece of text or regular expression and replace the result with some "
-"given text."
-msgstr "查找一段文本或者正则表达式，并用指定的文字替换它。"
+"Use this command to copy the currently selected text to the system clipboard."
+msgstr "使用此命令将当前选定的文字复制到系统剪贴板。"
 
-#: part/katesearch.cpp:331
-msgid "Search string '%1' not found!"
-msgstr "字符串“%1”没有找到！"
+#: part/kateview.cpp:224
+msgid "Copy as &HTML"
+msgstr "复制为 HTML(&H)"
 
-#: part/katesearch.cpp:333 part/katesearch.cpp:498
-msgid "Find"
-msgstr "查找"
+#: part/kateview.cpp:225
+msgid ""
+"Use this command to copy the currently selected text as HTML to the system "
+"clipboard."
+msgstr "使用此命令将当前选定的文字以 HTML 格式复制到系统剪贴板。"
 
-#: part/katesearch.cpp:353 part/katesearch.cpp:371 part/katesearch.cpp:475
-#, c-format
+#: part/kateview.cpp:230
+msgid "Save the current document"
+msgstr "保存当前文档"
+
+#: part/kateview.cpp:233
+msgid "Revert the most recent editing actions"
+msgstr "撤消最近的编辑动作"
+
+#: part/kateview.cpp:236
+msgid "Revert the most recent undo operation"
+msgstr "取消最近的撤消操作"
+
+#: part/kateview.cpp:238
+msgid "&Word Wrap Document"
+msgstr "自动换行文档(&W)"
+
+#: part/kateview.cpp:239
 msgid ""
-"_n: %n replacement made.\n"
-"%n replacements made."
-msgstr "完成了 %n 次替换。"
+"Use this command to wrap all lines of the current document which are longer "
+"than the width of the current view, to fit into this view."
+"<br>"
+"<br> This is a static word wrap, meaning it is not updated when the view is "
+"resized."
+msgstr ""
+"使使用此命令将当前文档中宽出当前视图的行折成多行，以适合当前显示。"
+"<br>"
+"<br>这是静态的按词卷绕，就是说当视图尺寸改变时它将不会随着变化。"
 
-#: part/katesearch.cpp:479
-msgid "End of document reached."
-msgstr "到达文件结尾。"
+#: part/kateview.cpp:244
+msgid "&Indent"
+msgstr "增加缩进(&I)"
 
-#: part/katesearch.cpp:480
-msgid "Beginning of document reached."
-msgstr "到达文件开头。"
+#: part/kateview.cpp:245
+msgid ""
+"Use this to indent a selected block of text."
+"<br>"
+"<br>You can configure whether tabs should be honored and used or replaced with "
+"spaces, in the configuration dialog."
+msgstr "使用此命令缩进选中的一块文字。<br><br>在配置对话框中，您可以配置是否直接使用制表符或者用空格代替。"
 
-#: part/katesearch.cpp:485
-msgid "End of selection reached."
-msgstr "到达选中范围结尾。"
+#: part/kateview.cpp:247
+msgid "&Unindent"
+msgstr "减少缩进(&U)"
 
-#: part/katesearch.cpp:486
-msgid "Beginning of selection reached."
-msgstr "到达选中范围开头。"
+#: part/kateview.cpp:248
+msgid "Use this to unindent a selected block of text."
+msgstr "使用此命令反缩进选中的一块文字。"
 
-#: part/katesearch.cpp:490
-msgid "Continue from the beginning?"
-msgstr "从开头继续找吗？"
+#: part/kateview.cpp:250
+msgid "&Clean Indentation"
+msgstr "清除缩进(&C)"
 
-#: part/katesearch.cpp:491
-msgid "Continue from the end?"
-msgstr "从结尾继续找吗？"
+#: part/kateview.cpp:251
+msgid ""
+"Use this to clean the indentation of a selected block of text (only tabs/only "
+"spaces)"
+"<br>"
+"<br>You can configure whether tabs should be honored and used or replaced with "
+"spaces, in the configuration dialog."
+msgstr "使用此命令清除一块选中文字的缩进(制表符或空格)。<br><br>在配置对话框中，您可以配置是否直接使用制表符或者用空格代替。"
 
-#: part/katesearch.cpp:499
-msgid "&Stop"
-msgstr "停止(&S)"
+#: part/kateview.cpp:254
+msgid "&Align"
+msgstr "对齐(&A)"
 
-#: part/katesearch.cpp:753
-msgid "Replace Confirmation"
-msgstr "替换确认"
+#: part/kateview.cpp:255
+msgid ""
+"Use this to align the current line or block of text to its proper indent level."
+msgstr "使用此功能可对齐当前行，或者将一块文本对齐到适当的缩进级别。"
 
-#: part/katesearch.cpp:755
-msgid "Replace &All"
-msgstr "全部替换(&A)"
+#: part/kateview.cpp:257
+msgid "C&omment"
+msgstr "注释(&O)"
 
-#: part/katesearch.cpp:755
-msgid "Re&place && Close"
-msgstr "替换并关闭(&P)"
+#: part/kateview.cpp:259
+msgid ""
+"This command comments out the current line or a selected block of text.<BR><BR>"
+"The characters for single/multiple line comments are defined within the "
+"language's highlighting."
+msgstr "使用此命令注释掉当前行或者选定的一块文字。<BR><BR>单行/多行注释的标记字符在语法加亮设置中定义。"
 
-#: part/katesearch.cpp:755
-msgid "&Replace"
-msgstr "替换(&R)"
+#: part/kateview.cpp:262
+msgid "Unco&mment"
+msgstr "去注释(&M)"
 
-#: part/katesearch.cpp:757
-msgid "&Find Next"
-msgstr "查找下一个(&F)"
+#: part/kateview.cpp:264
+msgid ""
+"This command removes comments from the current line or a selected block of "
+"text.<BR><BR>The characters for single/multiple line comments are defined "
+"within the language's highlighting."
+msgstr "使用此命令去掉当前行或者选定文字的注释。<BR><BR>单行/多行注释的标记字符在语法加亮设置中定义。"
 
-#: part/katesearch.cpp:762
-msgid "Found an occurrence of your search term. What do you want to do?"
-msgstr "找到您搜索条目的出现。您想做什么？"
+#: part/kateview.cpp:267
+msgid "&Read Only Mode"
+msgstr "只读模式(&R)"
 
-#: part/katesearch.cpp:814
-msgid "Usage: find[:[bcersw]] PATTERN"
-msgstr "用法：find[:[bcersw]] 模式"
+#: part/kateview.cpp:270
+msgid "Lock/unlock the document for writing"
+msgstr "锁定/解锁该文档进行写入"
 
-#: part/katesearch.cpp:826
-msgid "Usage: ifind[:[bcrs]] PATTERN"
-msgstr "用法：ifind[:[bcrs]] 模式"
+#: part/kateview.cpp:272
+msgid "Uppercase"
+msgstr "大写"
 
-#: part/katesearch.cpp:880
-msgid "Usage: replace[:[bceprsw]] PATTERN [REPLACEMENT]"
-msgstr "用法：replace[:[bceprsw]] 模式 [替换]"
+#: part/kateview.cpp:274
+msgid ""
+"Convert the selection to uppercase, or the character to the right of the cursor "
+"if no text is selected."
+msgstr "将选中区转换成大写。若没有选中文字的话，则转换光标右侧的字符。"
 
-#: part/katesearch.cpp:914
-msgid "<p>Usage: <code>find[:bcersw] PATTERN</code></p>"
-msgstr "<p>用法：<code>find[:bcersw] 模式</code></p>"
+#: part/kateview.cpp:277
+msgid "Lowercase"
+msgstr "小写"
 
-#: part/katesearch.cpp:917
+#: part/kateview.cpp:279
 msgid ""
-"<p>Usage: <code>ifind:[:bcrs] PATTERN</code>"
-"<br>ifind does incremental or 'as-you-type' search</p>"
-msgstr "<p>用法：<code>ifind[:bcrs] 模式</code><br>ifind 执行增量搜索或称“即输即搜”</p>"
+"Convert the selection to lowercase, or the character to the right of the cursor "
+"if no text is selected."
+msgstr "将选中区转换成小写。若没有选中文字的话，则转换光标右侧的字符。"
 
-#: part/katesearch.cpp:921
-msgid "<p>Usage: <code>replace[:bceprsw] PATTERN REPLACEMENT</code></p>"
-msgstr "<p>用法：<code>replace[:bceprsw] 模式 [替换]</code></p>"
+#: part/kateview.cpp:282
+msgid "Capitalize"
+msgstr "字首大写"
 
-#: part/katesearch.cpp:924
+#: part/kateview.cpp:284
 msgid ""
-"<h4><caption>Options</h4>"
-"<p><b>b</b> - Search backward"
-"<br><b>c</b> - Search from cursor"
-"<br><b>r</b> - Pattern is a regular expression"
-"<br><b>s</b> - Case sensitive search"
-msgstr ""
-"<h4><caption>选项</h4>"
-"<p><b>b</b> - 向前搜索"
-"<br><b>c</b> - 从光标处搜索"
-"<br><b>r</b> - 模式为正则表达式"
-"<br><b>s</b> - 区分大小写搜索"
+"Capitalize the selection, or the word under the cursor if no text is selected."
+msgstr "将选中区中全部单词的第一个字母转换成大写。若没有选中文字的话，则转换光标右侧的字符。"
 
-#: part/katesearch.cpp:933
+#: part/kateview.cpp:287
+msgid "Join Lines"
+msgstr "连接行"
+
+#: part/kateview.cpp:299
+msgid "Print the current document."
+msgstr "打印当前文档。"
+
+#: part/kateview.cpp:301
+msgid "Reloa&d"
+msgstr "重新装入(&D)"
+
+#: part/kateview.cpp:302
+msgid "Reload the current document from disk."
+msgstr "从磁盘中重新装入当前文档。"
+
+#: part/kateview.cpp:305
+msgid "Save the current document to disk, with a name of your choice."
+msgstr "用您指定的名字将当前文档保存到磁盘。"
+
+#: part/kateview.cpp:308
 msgid ""
-"<br><b>e</b> - Search in selected text only"
-"<br><b>w</b> - Search whole words only"
-msgstr "<br><b>e</b> - 仅在选中文本中搜索<br><b>w</b> - 仅搜索选中单词"
+"This command opens a dialog and lets you choose a line that you want the cursor "
+"to move to."
+msgstr "此命令打开一个对话框，让您选择将光标移到哪一行。"
 
-#: part/katesearch.cpp:939
+#: part/kateview.cpp:310
+msgid "&Configure Editor..."
+msgstr "配置编辑器(&C)..."
+
+#: part/kateview.cpp:311
+msgid "Configure various aspects of this editor."
+msgstr "配置这个编辑器多方面的设置。"
+
+#: part/kateview.cpp:313
+msgid "&Highlighting"
+msgstr "语法加亮(&H)"
+
+#: part/kateview.cpp:314
+msgid "Here you can choose how the current document should be highlighted."
+msgstr "这里您可以选择如何加亮显示当前文档。"
+
+#: part/kateview.cpp:317
+msgid "&Filetype"
+msgstr "文件类型(&F)"
+
+#: part/kateview.cpp:320
+msgid "&Schema"
+msgstr "方案(&S)"
+
+#: part/kateview.cpp:324
+msgid "&Indentation"
+msgstr "缩进(&I)"
+
+#: part/kateview.cpp:327
+msgid "E&xport as HTML..."
+msgstr "导出为 HTML(&X)..."
+
+#: part/kateview.cpp:328
 msgid ""
-"<br><b>p</b> - Prompt for replace</p>"
-"<p>If REPLACEMENT is not present, an empty string is used.</p>"
-"<p>If you want to have whitespace in your PATTERN, you need to quote both "
-"PATTERN and REPLACEMENT with either single or double quotes. To have the quote "
-"characters in the strings, prepend them with a backslash."
-msgstr ""
-"<br><b>p</b> - 提示替换</p>"
-"<p>如果没有[替换]，则使用空字符串。</p>"
-"<p>如果您想要在[模式]中使用空白，您就需要将[模式]和[替换]都用单引号或双引号包起来。要在字符串中使用引号字符，请在前面添加反斜线。"
+"This command allows you to export the current document with all highlighting "
+"information into a HTML document."
+msgstr "此命令允许您将当前文档及其全部加亮信息导出到 HTML 文档。"
 
-#: part/kateluaindentscript.cpp:86
-msgid "indenter.register requires 2 parameters (event id, function to call)"
-msgstr "indenter.register 需要两个参数(事件 ID、要调用的函数)"
+#: part/kateview.cpp:332
+msgid "Select the entire text of the current document."
+msgstr "选中当前文档的全部文本。"
 
-#: part/kateluaindentscript.cpp:94
+#: part/kateview.cpp:335
 msgid ""
-"indenter.register requires 2 parameters (event id (number), function to call "
-"(function))"
-msgstr "indenter.register 需要两个参数(事件 ID(数字)、要调用的函数(函数))"
+"If you have selected something within the current document, this will no longer "
+"be selected."
+msgstr "如果您在当前文档中有一些选中的文字，这将使它们不再被选中。"
 
-#: part/kateluaindentscript.cpp:108
-msgid "indenter.register:invalid event id"
-msgstr "indenter.register：无效的事件 ID"
+#: part/kateview.cpp:337
+msgid "Enlarge Font"
+msgstr "增大字体"
 
-#: part/kateluaindentscript.cpp:113
-msgid "indenter.register:there is already a function set for given"
-msgstr "indenter.register：已经设置了给定的函数"
+#: part/kateview.cpp:338
+msgid "This increases the display font size."
+msgstr "此命令增大显示字体的大小。"
 
-#: part/kateluaindentscript.cpp:126
-msgid "document.textLine:One parameter (line number) required"
-msgstr "document.textLine：需要一个参数(行号)"
+#: part/kateview.cpp:340
+msgid "Shrink Font"
+msgstr "缩小字体"
 
-#: part/kateluaindentscript.cpp:130
-msgid "document.textLine:One parameter (line number) required (number)"
-msgstr "document.textLine：需要一个参数(行号)(数字)"
+#: part/kateview.cpp:341
+msgid "This decreases the display font size."
+msgstr "此命令减小显示字体的大小。"
 
-#: part/kateluaindentscript.cpp:139
+#: part/kateview.cpp:344
+msgid "Bl&ock Selection Mode"
+msgstr "块选择方式(&O)"
+
+#: part/kateview.cpp:347
 msgid ""
-"document.removeText:Four parameters needed (start line, start col,end line, end "
-"col)"
-msgstr "document.removeText：需要四个参数(开始行、开始列、结束行、结束列)"
+"This command allows switching between the normal (line based) selection mode "
+"and the block selection mode."
+msgstr "此命令让您在普通的行选择方式和块选择方式之间切换。"
 
-#: part/kateluaindentscript.cpp:143
+#: part/kateview.cpp:350
+msgid "Overwr&ite Mode"
+msgstr "覆盖模式(&I)"
+
+#: part/kateview.cpp:353
 msgid ""
-"document.removeText:Four parameters needed (start line, start col,end line, end "
-"col) (4x number)"
-msgstr "document.removeText：需要四个参数(开始行、开始列、结束行、结束列)(四个数字)"
+"Choose whether you want the text you type to be inserted or to overwrite "
+"existing text."
+msgstr "让您选择新输入的文字是插入到文档还是覆盖已有的文字。"
 
-#: part/kateluaindentscript.cpp:152
-msgid "document.insertText:Three parameters needed (line,col,text)"
-msgstr "document.insertText：需要三个参数(行、列、文本)"
+#: part/kateview.cpp:357
+msgid "&Dynamic Word Wrap"
+msgstr "动态文字换行(&D)"
 
-#: part/kateluaindentscript.cpp:156
+#: part/katedialogs.cpp:701 part/kateview.cpp:360
 msgid ""
-"document.removeText:Three parameters needed (line,col,text) "
-"(number,number,string)"
-msgstr "document.insertText：需要三个参数(行、列、文本)(数字、数字、字符串)"
+"If this option is checked, the text lines will be wrapped at the view border on "
+"the screen."
+msgstr "如果选中此项，文本行将自动在屏幕视图边界处折到新的一行。"
 
-#: part/kateluaindentscript.cpp:253
-msgid "LUA interpreter could not be initialized"
-msgstr "无法初始化 LUA 解释器"
+#: part/kateview.cpp:362
+msgid "Dynamic Word Wrap Indicators"
+msgstr "动态文字换行标识符"
 
-#: part/kateluaindentscript.cpp:293 part/kateluaindentscript.cpp:316
-#: part/kateluaindentscript.cpp:344
+#: part/katedialogs.cpp:703 part/kateview.cpp:363
+msgid "Choose when the Dynamic Word Wrap Indicators should be displayed"
+msgstr "选择何时显示动态自动换行标识符"
+
+#: part/kateview.cpp:367
+msgid "&Off"
+msgstr "关(&O)"
+
+#: part/kateview.cpp:368
+msgid "Follow &Line Numbers"
+msgstr "按照行号(&L)"
+
+#: part/kateview.cpp:369
+msgid "&Always On"
+msgstr "总是打开(&A)"
+
+#: part/kateview.cpp:373
+msgid "Show Folding &Markers"
+msgstr "显示折叠标记(&M)"
+
+#: part/kateview.cpp:376
+msgid ""
+"You can choose if the codefolding marks should be shown, if codefolding is "
+"possible."
+msgstr "如果能进行代码折叠，您可以选择是否显示代码折叠标记。"
+
+#: part/kateview.cpp:377
+msgid "Hide Folding &Markers"
+msgstr "隐藏折叠标记(&M)"
+
+#: part/kateview.cpp:380
+msgid "Show &Icon Border"
+msgstr "显示图标边框(&I)"
+
+#: part/kateview.cpp:384
+msgid ""
+"Show/hide the icon border.<BR><BR> The icon border shows bookmark symbols, for "
+"instance."
+msgstr "显示/隐藏页面边上的图标边条。<BR><BR>图标边条上能显示书签符号等标记。"
+
+#: part/kateview.cpp:385
+msgid "Hide &Icon Border"
+msgstr "隐藏图标边框(&I)"
+
+#: part/kateview.cpp:388
+msgid "Show &Line Numbers"
+msgstr "显示行号(&L)"
+
+#: part/kateview.cpp:391
+msgid "Show/hide the line numbers on the left hand side of the view."
+msgstr "在视图左边显示/隐藏行号。"
+
+#: part/kateview.cpp:392
+msgid "Hide &Line Numbers"
+msgstr "隐藏行号(&L)"
+
+#: part/kateview.cpp:395
+msgid "Show Scroll&bar Marks"
+msgstr "显示滚动条标记(&B)"
+
+#: part/kateview.cpp:398
+msgid ""
+"Show/hide the marks on the vertical scrollbar.<BR><BR>"
+"The marks, for instance, show bookmarks."
+msgstr "显示/隐藏垂直滚动条上的标记。<BR><BR>这些标记可显示书签等符号。"
+
+#: part/kateview.cpp:399
+msgid "Hide Scroll&bar Marks"
+msgstr "隐藏滚动条标记(&B)"
+
+#: part/kateview.cpp:402
+msgid "Show Static &Word Wrap Marker"
+msgstr "显示静态自动换行标记(&W)"
+
+#: part/kateview.cpp:406
+msgid ""
+"Show/hide the Word Wrap Marker, a vertical line drawn at the word wrap column "
+"as defined in the editing properties"
+msgstr "显示/隐藏自动换行标记，它是在编辑属性中定义的自动换行列显示的一条竖线。"
+
+#: part/kateview.cpp:408
+msgid "Hide Static &Word Wrap Marker"
+msgstr "隐藏静态自动换行标记(&W)"
+
+#: part/kateview.cpp:411
+msgid "Switch to Command Line"
+msgstr "切换到命令行"
+
+#: part/kateview.cpp:414
+msgid "Show/hide the command line on the bottom of the view."
+msgstr "在视图底部显示/隐藏命令行。"
+
+#: part/kateview.cpp:416
+msgid "&End of Line"
+msgstr "行尾(&E)"
+
+#: part/kateview.cpp:417
+msgid "Choose which line endings should be used, when you save the document"
+msgstr "选择当您保存文档时使用哪种行结束字符。"
+
+#: part/kateview.cpp:427
+msgid "E&ncoding"
+msgstr "编码(&E)"
+
+#: part/kateview.cpp:444
+msgid "Move Word Left"
+msgstr "整词左移"
+
+#: part/kateview.cpp:448
+msgid "Select Character Left"
+msgstr "选择左边字符"
+
+#: part/kateview.cpp:452
+msgid "Select Word Left"
+msgstr "选择左边整词"
+
+#: part/kateview.cpp:457
+msgid "Move Word Right"
+msgstr "整词右移"
+
+#: part/kateview.cpp:461
+msgid "Select Character Right"
+msgstr "选择右边字符"
+
+#: part/kateview.cpp:465
+msgid "Select Word Right"
+msgstr "选择右边整词"
+
+#: part/kateview.cpp:470
+msgid "Move to Beginning of Line"
+msgstr "移到行首"
+
+#: part/kateview.cpp:474
+msgid "Move to Beginning of Document"
+msgstr "移到文档开头"
+
+#: part/kateview.cpp:478
+msgid "Select to Beginning of Line"
+msgstr "选择到行首"
+
+#: part/kateview.cpp:482
+msgid "Select to Beginning of Document"
+msgstr "选择到文档开头"
+
+#: part/kateview.cpp:487
+msgid "Move to End of Line"
+msgstr "移到行尾"
+
+#: part/kateview.cpp:491
+msgid "Move to End of Document"
+msgstr "移到文档末尾"
+
+#: part/kateview.cpp:495
+msgid "Select to End of Line"
+msgstr "选择到行尾"
+
+#: part/kateview.cpp:499
+msgid "Select to End of Document"
+msgstr "选择到文档末尾"
+
+#: part/kateview.cpp:504
+msgid "Select to Previous Line"
+msgstr "选择到前一行"
+
+#: part/kateview.cpp:508
+msgid "Scroll Line Up"
+msgstr "向上滚动一行"
+
+#: part/kateview.cpp:512
+msgid "Move to Next Line"
+msgstr "选择到下一行"
+
+#: part/kateview.cpp:515
+msgid "Move to Previous Line"
+msgstr "选择到前一行"
+
+#: part/kateview.cpp:518
+msgid "Move Character Right"
+msgstr "移动右边字符"
+
+#: part/kateview.cpp:521
+msgid "Move Character Left"
+msgstr "移动左边字符"
+
+#: part/kateview.cpp:525
+msgid "Select to Next Line"
+msgstr "选择到下一行"
+
+#: part/kateview.cpp:529
+msgid "Scroll Line Down"
+msgstr "向下滚动一行"
+
+#: part/kateview.cpp:534
+msgid "Scroll Page Up"
+msgstr "向上滚动一页"
+
+#: part/kateview.cpp:538
+msgid "Select Page Up"
+msgstr "向上选择一页"
+
+#: part/kateview.cpp:542
+msgid "Move to Top of View"
+msgstr "移到视图顶部"
+
+#: part/kateview.cpp:546
+msgid "Select to Top of View"
+msgstr "选择到视图顶部"
+
+#: part/kateview.cpp:551
+msgid "Scroll Page Down"
+msgstr "向下滚动一页"
+
+#: part/kateview.cpp:555
+msgid "Select Page Down"
+msgstr "向下选择一页"
+
+#: part/kateview.cpp:559
+msgid "Move to Bottom of View"
+msgstr "移到视图底部"
+
+#: part/kateview.cpp:563
+msgid "Select to Bottom of View"
+msgstr "选择到视图底部"
+
+#: part/kateview.cpp:567
+msgid "Move to Matching Bracket"
+msgstr "移到匹配的括号"
+
+#: part/kateview.cpp:571
+msgid "Select to Matching Bracket"
+msgstr "选择到匹配的括号"
+
+#: part/kateview.cpp:579
+msgid "Transpose Characters"
+msgstr "左右交换字符"
+
+#: part/kateview.cpp:584
+msgid "Delete Line"
+msgstr "删除一行"
+
+#: part/kateview.cpp:589
+msgid "Delete Word Left"
+msgstr "删除左边整词"
+
+#: part/kateview.cpp:594
+msgid "Delete Word Right"
+msgstr "删除右边整词"
+
+#: part/kateview.cpp:598
+msgid "Delete Next Character"
+msgstr "删除下个字符"
+
+#: part/kateview.cpp:602
+msgid "Backspace"
+msgstr "Backspace"
+
+#: part/kateview.cpp:628
+msgid "Collapse Toplevel"
+msgstr "折叠顶层树"
+
+#: part/kateview.cpp:630
+msgid "Expand Toplevel"
+msgstr "展开顶层"
+
+#: part/kateview.cpp:632
+msgid "Collapse One Local Level"
+msgstr "折叠一层本地级别"
+
+#: part/kateview.cpp:634
+msgid "Expand One Local Level"
+msgstr "展开一层本地级别"
+
+#: part/kateview.cpp:639
+msgid "Show the code folding region tree"
+msgstr "显示代码树状折叠"
+
+#: part/kateview.cpp:640
+msgid "Basic template code test"
+msgstr "基本模板代码测试"
+
+#: part/kateview.cpp:702
+msgid " OVR "
+msgstr " 改写 "
+
+#: part/kateview.cpp:704
+msgid " INS "
+msgstr " 插入 "
+
+#: part/kateview.cpp:707
+msgid " R/O "
+msgstr " 只读 "
+
+#: part/kateview.cpp:712
 #, c-format
-msgid "Lua indenting script had errors: %1"
-msgstr "Lua 缩进脚本有错误：%1"
+msgid " Line: %1"
+msgstr " 行：%1"
 
-#: part/katejscript.cpp:1058 part/katejscript.cpp:1076
-#: part/kateluaindentscript.cpp:413 part/kateluaindentscript.cpp:431
-msgid "(Unknown)"
-msgstr "(未知)"
+#: part/kateview.cpp:713
+#, c-format
+msgid " Col: %1"
+msgstr " 列：%1"
+
+#: part/kateview.cpp:716
+msgid " BLK "
+msgstr " 块 "
+
+#: part/kateview.cpp:716
+msgid " NORM "
+msgstr " 普通 "
+
+#: part/katedocument.cpp:4331 part/katedocument.cpp:5073 part/kateview.cpp:863
+msgid "Save File"
+msgstr "保存文件"
+
+#: part/katedocument.cpp:5101 part/kateview.cpp:890
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "已经存在同名的文件“%1”，您确信要覆盖它吗？"
+
+#: part/katedocument.cpp:5103 part/kateview.cpp:891
+msgid "Overwrite File?"
+msgstr "覆盖文件吗？"
+
+#: part/katedocument.cpp:5104 part/kateview.cpp:892
+msgid "&Overwrite"
+msgstr "覆盖(&O)"
+
+#: part/kateview.cpp:892
+msgid "Overwrite the file"
+msgstr "覆盖文件"
+
+#: part/kateview.cpp:1794
+msgid "Export File as HTML"
+msgstr "文件导出为 HTML"
 
 #: part/katedocument.cpp:434
 msgid "Fonts & Colors"
@@ -651,13 +1296,13 @@ msgstr "快捷键配置"
 msgid "Plugin Manager"
 msgstr "插件管理器"
 
-#: part/katedocument.cpp:2482
+#: part/katedocument.cpp:2483
 msgid ""
 "The file %1 could not be loaded completely, as there is not enough temporary "
 "disk storage for it."
 msgstr "文件 %1 尚未完全装入，原因是没有足够的临时磁盘存储空间。"
 
-#: part/katedocument.cpp:2484
+#: part/katedocument.cpp:2485
 msgid ""
 "The file %1 could not be loaded, as it was not possible to read from it.\n"
 "\n"
@@ -667,15 +1312,15 @@ msgstr ""
 "\n"
 "请检查您是否有该文件的读权限。"
 
-#: part/katedocument.cpp:2494 part/katedocument.cpp:2560
+#: part/katedocument.cpp:2495 part/katedocument.cpp:2561
 msgid "The file %1 is a binary, saving it will result in a corrupt file."
 msgstr "文件 %1 是二进制文件，保存该文件将导致文件损坏。"
 
-#: part/katedocument.cpp:2495
+#: part/katedocument.cpp:2496
 msgid "Binary File Opened"
 msgstr "打开了二进制文件"
 
-#: part/katedocument.cpp:2553
+#: part/katedocument.cpp:2554
 msgid ""
 "This file could not be loaded correctly due to lack of temporary disk space. "
 "Saving it could cause data loss.\n"
@@ -686,44 +1331,44 @@ msgstr ""
 "\n"
 "您真的想要保存吗？"
 
-#: part/katedocument.cpp:2553 part/katedocument.cpp:2580
-#: part/katedocument.cpp:2591 part/katedocument.cpp:2756
+#: part/katedocument.cpp:2554 part/katedocument.cpp:2581
+#: part/katedocument.cpp:2592 part/katedocument.cpp:2757
 msgid "Possible Data Loss"
 msgstr "数据可能丢失"
 
-#: part/katedocument.cpp:2553 part/katedocument.cpp:2562
-#: part/katedocument.cpp:2574 part/katedocument.cpp:2580
-#: part/katedocument.cpp:2591
+#: part/katedocument.cpp:2554 part/katedocument.cpp:2563
+#: part/katedocument.cpp:2575 part/katedocument.cpp:2581
+#: part/katedocument.cpp:2592
 msgid "Save Nevertheless"
 msgstr "仍然保存"
 
-#: part/katedocument.cpp:2561
+#: part/katedocument.cpp:2562
 msgid "Trying to Save Binary File"
 msgstr "试图保存二进制文件"
 
-#: part/katedocument.cpp:2574
+#: part/katedocument.cpp:2575
 msgid ""
 "Do you really want to save this unmodified file? You could overwrite changed "
 "data in the file on disk."
 msgstr "您真的想要保存此未修改的文件吗？您将会覆盖该文件在磁盘上被更改的数据。"
 
-#: part/katedocument.cpp:2574
+#: part/katedocument.cpp:2575
 msgid "Trying to Save Unmodified File"
 msgstr "试图保存未修改的文件"
 
-#: part/katedocument.cpp:2580
+#: part/katedocument.cpp:2581
 msgid ""
 "Do you really want to save this file? Both your open file and the file on disk "
 "were changed. There could be some data lost."
 msgstr "您真的想要保存此文件吗？您打开的文件和磁盘上的文件都已更改。有些数据可能丢失。"
 
-#: part/katedocument.cpp:2591
+#: part/katedocument.cpp:2592
 msgid ""
 "The selected encoding cannot encode every unicode character in this document. "
 "Do you really want to save it? There could be some data lost."
 msgstr "所选的编码无法解释此文档中所含的全部 Unicode 字符。您真的想要保存吗？这样可能造成数据丢失。"
 
-#: part/katedocument.cpp:2642
+#: part/katedocument.cpp:2643
 msgid ""
 "The document could not be saved, as it was not possible to write to %1.\n"
 "\n"
@@ -734,240 +1379,353 @@ msgstr ""
 "\n"
 "请检查您是否有此文件的写权限，以及磁盘空间是否充足。"
 
-#: part/katedocument.cpp:2755
+#: part/katedocument.cpp:2756
 msgid "Do you really want to continue to close this file? Data loss may occur."
 msgstr "您真的想要继续关闭此文件吗？数据可能丢失。"
 
-#: part/katedocument.cpp:2756
+#: part/katedocument.cpp:2757
 msgid "Close Nevertheless"
 msgstr "仍然关闭"
 
-#: part/katedocument.cpp:4330 part/katedocument.cpp:5063 part/kateview.cpp:863
-msgid "Save File"
-msgstr "保存文件"
-
-#: part/katedocument.cpp:4339
+#: part/katedocument.cpp:4340
 msgid "Save failed"
 msgstr "保存失败"
 
-#: part/katedialogs.cpp:1615 part/katedocument.cpp:4401
+#: part/katedialogs.cpp:1610 part/katedocument.cpp:4402
 msgid "What do you want to do?"
 msgstr "您想要做什么？"
 
-#: part/katedocument.cpp:4402
+#: part/katedocument.cpp:4403
 msgid "File Was Changed on Disk"
 msgstr "文件已在磁盘上更改"
 
-#: part/katedialogs.cpp:1593 part/katedocument.cpp:4402
+#: part/katedialogs.cpp:1588 part/katedocument.cpp:4403
 msgid "&Reload File"
 msgstr "重新装入文件(&R)"
 
-#: part/katedocument.cpp:4402
+#: part/katedocument.cpp:4403
 msgid "&Ignore Changes"
 msgstr "忽略更改(&I)"
 
-#: part/katedocument.cpp:4980
+#: part/katedocument.cpp:4981
 msgid "The file '%1' was modified by another program."
 msgstr "文件“%1”已经被其它程序更改。"
 
-#: part/katedocument.cpp:4983
+#: part/katedocument.cpp:4984
 msgid "The file '%1' was created by another program."
 msgstr "文件“%1”已经被其它程序创建。"
 
-#: part/katedocument.cpp:4986
+#: part/katedocument.cpp:4987
 msgid "The file '%1' was deleted by another program."
 msgstr "文件“%1”已经被其它程序删除。"
 
-#: part/katedocument.cpp:5091 part/kateview.cpp:890
-msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "已经存在同名的文件“%1”，您确信要覆盖它吗？"
+#: part/kateautoindent.cpp:97 part/katehighlight.cpp:3165
+#: part/kateschema.cpp:1058
+msgid "Normal"
+msgstr "正常"
 
-#: part/katedocument.cpp:5093 part/kateview.cpp:891
-msgid "Overwrite File?"
-msgstr "覆盖文件吗？"
+#: part/kateautoindent.cpp:99
+msgid "C Style"
+msgstr "C 样式"
 
-#: part/katedocument.cpp:5094 part/kateview.cpp:892
-msgid "&Overwrite"
-msgstr "覆盖(&O)"
+#: part/kateautoindent.cpp:101
+msgid "Python Style"
+msgstr "Python 风格"
 
-#: part/katefiletype.cpp:273
-msgid "&Filetype:"
-msgstr "文件类型(&F)："
+#: part/kateautoindent.cpp:103
+msgid "XML Style"
+msgstr "XML 样式"
 
-#: part/katefiletype.cpp:279
-msgid "&New"
-msgstr "新建(&N)"
+#: part/kateautoindent.cpp:105
+msgid "S&S C Style"
+msgstr "S&S C 样式"
 
-#: part/katefiletype.cpp:289
-msgid "N&ame:"
-msgstr "名称(&A)："
+#: part/kateautoindent.cpp:107
+msgid "Variable Based Indenter"
+msgstr "基于变量的缩进"
 
-#: part/katefiletype.cpp:294
-msgid "&Section:"
-msgstr "节(&S)："
+#: part/kateautoindent.cpp:111 part/katefiletype.cpp:522
+#: part/katehighlight.cpp:1192
+msgid "None"
+msgstr "无"
 
-#: part/katefiletype.cpp:299
-msgid "&Variables:"
-msgstr "变量(&V)："
+#: part/katehighlight.cpp:1823
+msgid "Normal Text"
+msgstr "普通文本"
 
-#: part/katedialogs.cpp:1299 part/katefiletype.cpp:304
-msgid "File e&xtensions:"
-msgstr "文件扩展名(&X)："
+#: part/katehighlight.cpp:1971
+msgid ""
+"<B>%1</B>: Deprecated syntax. Attribute (%2) not addressed by symbolic name<BR>"
+msgstr "<B>%1</B>：过时的格式。属性 (%2) 没有用符号名进行定位。<BR>"
 
-#: part/katedialogs.cpp:1304 part/katefiletype.cpp:308
-#: plugins/autobookmarker/autobookmarker.cpp:324
-msgid "MIME &types:"
-msgstr "MIME 类型(&T)："
+#: part/katehighlight.cpp:2338
+msgid "<B>%1</B>: Deprecated syntax. Context %2 has no symbolic name<BR>"
+msgstr "<B>%1</B>：过时的格式。上下文 %2 没有符号名。<BR>"
 
-#: part/katedialogs.cpp:1309 part/katefiletype.cpp:317
-msgid "Prio&rity:"
-msgstr "优先级(&R)："
+#: part/katehighlight.cpp:2385
+msgid ""
+"<B>%1</B>:Deprecated syntax. Context %2 not addressed by a symbolic name"
+msgstr "<B>%1</B>：过时的格式。上下文 %2 没有用符号名进行定位。"
 
-#: part/katefiletype.cpp:332
-msgid "Create a new file type."
-msgstr "创建新的文件类型。"
+#: part/katehighlight.cpp:2500
+msgid ""
+"There were warning(s) and/or error(s) while parsing the syntax highlighting "
+"configuration."
+msgstr "在分析语法加亮配置时产生警告和/或错误。"
 
-#: part/katefiletype.cpp:333
-msgid "Delete the current file type."
-msgstr "删除当前文件类型。"
+#: part/katehighlight.cpp:2502
+msgid "Kate Syntax Highlighting Parser"
+msgstr "Kate 语法加亮分析器"
 
-#: part/katefiletype.cpp:335
+#: part/katehighlight.cpp:2653
 msgid ""
-"The name of the filetype will be the text of the corresponding menu item."
-msgstr "文件类型名称将出现在相应的菜单项中。"
+"Since there has been an error parsing the highlighting description, this "
+"highlighting will be disabled"
+msgstr "由于分析语法加亮描述时发现错误，这个加亮将被停用"
 
-#: part/katefiletype.cpp:337
-msgid "The section name is used to organize the file types in menus."
-msgstr "本节用于组织菜单中的文件类型。"
+#: part/katehighlight.cpp:2855
+msgid ""
+"<B>%1</B>: Specified multiline comment region (%2) could not be resolved<BR>"
+msgstr "<B>%1</B>：指定的多行注释区域(%2)无法解决<BR>"
 
-#: part/katefiletype.cpp:339
+#: part/katehighlight.cpp:3166
+msgid "Keyword"
+msgstr "关键字"
+
+#: part/katehighlight.cpp:3167
+msgid "Data Type"
+msgstr "数据类型"
+
+#: part/katehighlight.cpp:3168
+msgid "Decimal/Value"
+msgstr "十进制/值"
+
+#: part/katehighlight.cpp:3169
+msgid "Base-N Integer"
+msgstr "N进制整数"
+
+#: part/katehighlight.cpp:3170
+msgid "Floating Point"
+msgstr "浮点数"
+
+#: part/katehighlight.cpp:3171
+msgid "Character"
+msgstr "字符"
+
+#: part/katehighlight.cpp:3172
+msgid "String"
+msgstr "字符串"
+
+#: part/katedialogs.cpp:1116 part/katehighlight.cpp:3173
+msgid "Comment"
+msgstr "注释"
+
+#: part/katehighlight.cpp:3174
+msgid "Others"
+msgstr "其它"
+
+#: part/katehighlight.cpp:3175
+msgid "Alert"
+msgstr "警告"
+
+#: part/katehighlight.cpp:3176
+msgid "Function"
+msgstr "函数"
+
+#: part/katehighlight.cpp:3178
+msgid "Region Marker"
+msgstr "区域标记"
+
+#: part/kateprinter.cpp:72
+#, c-format
+msgid "Print %1"
+msgstr "打印 %1"
+
+#: part/kateprinter.cpp:202
+msgid "(Selection of) "
+msgstr "(选自)"
+
+#: part/kateprinter.cpp:309 part/kateprinter.cpp:528
+#, c-format
+msgid "Typographical Conventions for %1"
+msgstr "用于%1的印刷惯例"
+
+#: part/kateprinter.cpp:639
+msgid "Te&xt Settings"
+msgstr "文本设置(&X)"
+
+#: part/kateprinter.cpp:644
+msgid "Print &selected text only"
+msgstr "只打印选定的文本(&S)"
+
+#: part/kateprinter.cpp:647
+msgid "Print &line numbers"
+msgstr "打印行号(&L)"
+
+#: part/kateprinter.cpp:650
+msgid "Print syntax &guide"
+msgstr "打印语法向导(&G)"
+
+#: part/kateprinter.cpp:659
 msgid ""
-"<p>This string allows you to configure Kate's settings for the files selected "
-"by this mimetype using Kate variables. You can set almost any configuration "
-"option, such as highlight, indent-mode, encoding, etc.</p>"
-"<p>For a full list of known variables, see the manual.</p>"
-msgstr ""
-"<p>此字符串允许您使用 Kate 变量配置此 MIME 类型所选择的文件。您可以设置任何配置选项，比如语法加亮、缩进模式、编码等等。</p>"
-"<p>要获得关于已知变量的完整列表，请查看手册。</p>"
+"<p>This option is only available if some text is selected in the document.</p>"
+"<p>If available and enabled, only the selected text is printed.</p>"
+msgstr "<p>当文档中有文本被选择时此选项才能被设置。</p><p>如果选中此选项，将只打印所选择的文本。</p>"
 
-#: part/katefiletype.cpp:344
+#: part/kateprinter.cpp:662
 msgid ""
-"The wildcards mask allows you to select files by filename. A typical mask uses "
-"an asterisk and the file extension, for example <code>*.txt; *.text</code>"
-". The string is a semicolon-separated list of masks."
-msgstr ""
-"通配符掩码允许您按照文件明选择文件。典型的掩码使用星号和文件扩展名，比如 <code>*.txt; *.text</code>。请用分号分隔掩码。"
+"<p>If enabled, line numbers will be printed on the left side of the page(s).</p>"
+msgstr "<p>如果选中此选项，行号将被打印在每页左边。</p>"
 
-#: part/katefiletype.cpp:349
+#: part/kateprinter.cpp:664
 msgid ""
-"The mime type mask allows you to select files by mimetype. The string is a "
-"semicolon-separated list of mimetypes, for example <code>"
-"text/plain; text/english</code>."
-msgstr ""
-"MIME 类型掩码允许您按照 MIME 类型选择文件。字符串应该以分号分隔 MIME 类型，比如 <code>"
-"text/plain; text/english</code>。"
+"<p>Print a box displaying typographical conventions for the document type, as "
+"defined by the syntax highlighting being used."
+msgstr "<p>打印一个方框，按照语法加亮定义的文档类型，显示此文档类型的印刷惯例。"
 
-#: part/katefiletype.cpp:353
-msgid "Displays a wizard that helps you easily select mimetypes."
-msgstr "显示帮助您轻松选择 MIME 类型的向导。"
+#: part/kateprinter.cpp:700
+msgid "Hea&der && Footer"
+msgstr "页眉和页脚(&D)"
 
-#: part/katefiletype.cpp:355
-msgid ""
-"Sets a priority for this file type. If more than one file type selects the same "
-"file, the one with the highest priority will be used."
-msgstr "设定此文件类型的优先级。如果对同一文件选择了多种优先级的文件类型，则将使用优先级最高的文件类型。"
+#: part/kateprinter.cpp:708
+msgid "Pr&int header"
+msgstr "打印页眉(&I)"
 
-#: part/katefiletype.cpp:427
-msgid "New Filetype"
-msgstr "新建文件类型"
+#: part/kateprinter.cpp:710
+msgid "Pri&nt footer"
+msgstr "打印页脚(&N)"
 
-#: part/katefiletype.cpp:471
-#, c-format
-msgid "Properties of %1"
-msgstr "%1 的属性"
+#: part/kateprinter.cpp:715
+msgid "Header/footer font:"
+msgstr "页眉/页脚字体："
 
-#: part/katefiletype.cpp:504
-msgid ""
-"Select the MimeTypes you want for this file type.\n"
-"Please note that this will automatically edit the associated file extensions as "
-"well."
-msgstr ""
-"选择你想要为此文件类型对应的 MIME 类型。\n"
-"请注意，这也将自动编辑相关联的文件扩展名。"
+#: part/kateprinter.cpp:720
+msgid "Choo&se Font..."
+msgstr "选择字体(&S)..."
 
-#: part/katedialogs.cpp:1426 part/katefiletype.cpp:506
-#: plugins/autobookmarker/autobookmarker.cpp:367
-msgid "Select Mime Types"
-msgstr "选择 MIME 类型"
+#: part/kateprinter.cpp:724
+msgid "Header Properties"
+msgstr "页眉属性"
 
-#: part/kateautoindent.cpp:111 part/katefiletype.cpp:522
-#: part/katehighlight.cpp:1193
-msgid "None"
-msgstr "无"
+#: part/kateprinter.cpp:727
+msgid "&Format:"
+msgstr "格式(&F)："
 
-#: part/kateviewhelpers.cpp:237
-msgid "Available Commands"
-msgstr "可用的命令"
+#: part/kateprinter.cpp:734 part/kateprinter.cpp:755
+msgid "Colors:"
+msgstr "颜色："
 
-#: part/kateviewhelpers.cpp:239
-msgid ""
-"<p>For help on individual commands, do <code>'help &lt;command&gt;'</code></p>"
-msgstr "<p>要获得关于单个命令的帮助，请执行<code>“help &lt;命令&gt;”</code></p>"
+#: part/kateprinter.cpp:737 part/kateprinter.cpp:758
+msgid "Foreground:"
+msgstr "前景："
 
-#: part/kateviewhelpers.cpp:250
-msgid "No help for '%1'"
-msgstr "没有“%1”的帮助"
+#: part/kateprinter.cpp:740
+msgid "Bac&kground"
+msgstr "背景(&K)"
 
-#: part/kateviewhelpers.cpp:253
-msgid "No such command <b>%1</b>"
-msgstr "没有这样的命令 <b>%1</b>"
+#: part/kateprinter.cpp:743
+msgid "Footer Properties"
+msgstr "页脚属性"
 
-#: part/kateviewhelpers.cpp:258
+#: part/kateprinter.cpp:747
+msgid "For&mat:"
+msgstr "格式(&M)："
+
+#: part/kateprinter.cpp:761
+msgid "&Background"
+msgstr "背景(&B)"
+
+#: part/kateprinter.cpp:788
+msgid "<p>Format of the page header. The following tags are supported:</p>"
+msgstr "<p>页眉的格式。支持下列标记：</p>"
+
+#: part/kateprinter.cpp:790
 msgid ""
-"<p>This is the Katepart <b>command line</b>."
-"<br>Syntax: <code><b>command [ arguments ]</b></code>"
-"<br>For a list of available commands, enter <code><b>help list</b></code>"
-"<br>For help for individual commands, enter <code><b>help &lt;command&gt;</b>"
-"</code></p>"
+"<ul>"
+"<li><tt>%u</tt>: current user name</li>"
+"<li><tt>%d</tt>: complete date/time in short format</li>"
+"<li><tt>%D</tt>: complete date/time in long format</li>"
+"<li><tt>%h</tt>: current time</li>"
+"<li><tt>%y</tt>: current date in short format</li>"
+"<li><tt>%Y</tt>: current date in long format</li>"
+"<li><tt>%f</tt>: file name</li>"
+"<li><tt>%U</tt>: full URL of the document</li>"
+"<li><tt>%p</tt>: page number</li></ul>"
+"<br><u>Note:</u> Do <b>not</b> use the '|' (vertical bar) character."
 msgstr ""
-"<p>这是 Katepart <b>命令行</b>。"
-"<br>语法：<code><b>命令 [ 参数 ]</b></code>"
-"<br>要获得可用命令的列表，请输入 <code><b>help list</b></code>"
-"<br>要获得关于单个命令的帮助，请输入 <code><b>help &lt;命令&gt;</b></code></p>"
+"<ul>"
+"<li><tt>%u</tt>：当前用户名</li>"
+"<li><tt>%d</tt>：完整的日期/时间(短格式)</li>"
+"<li><tt>%D</tt>：完整的日期/时间(长格式)</li>"
+"<li><tt>%h</tt>：当前时间</li>"
+"<li><tt>%y</tt>：当前日期(短格式)</li>"
+"<li><tt>%Y</tt>：当前日期(长格式)</li>"
+"<li><tt>%f</tt>：文件名</li>"
+"<li><tt>%U</tt>：文档的完整 URL</li>"
+"<li><tt>%p</tt>：页码</li></ul>"
+"<br><u>注意：</u> 请<b>不要</b>使用‘|’(竖线)字符。"
 
-#: part/kateviewhelpers.cpp:345
-msgid "Success: "
-msgstr "成功："
+#: part/kateprinter.cpp:804
+msgid "<p>Format of the page footer. The following tags are supported:</p>"
+msgstr "<p>页脚的格式。支持下列标记：</p>"
 
-#: part/kateviewhelpers.cpp:347
-msgid "Success"
-msgstr "成功"
+#: part/kateprinter.cpp:908
+msgid "L&ayout"
+msgstr "布局(&A)"
 
-#: part/kateviewhelpers.cpp:352
-msgid "Error: "
-msgstr "错误："
+#: part/kateprinter.cpp:915 part/kateschema.cpp:834
+msgid "&Schema:"
+msgstr "方案(&S)："
 
-#: part/kateviewhelpers.cpp:354
-msgid "Command \"%1\" failed."
-msgstr "命令“%1”失败。"
+#: part/kateprinter.cpp:919
+msgid "Draw bac&kground color"
+msgstr "绘制背景颜色(&K)"
 
-#: part/kateviewhelpers.cpp:360
-msgid "No such command: \"%1\""
-msgstr "没有这样的命令：“%1”"
+#: part/kateprinter.cpp:922
+msgid "Draw &boxes"
+msgstr "绘制边框(&B)"
 
-#: part/kateschema.cpp:304 part/kateviewhelpers.cpp:704
-msgid "Bookmark"
-msgstr "书签"
+#: part/kateprinter.cpp:925
+msgid "Box Properties"
+msgstr "边框属性"
 
-#: part/kateviewhelpers.cpp:1127 part/kateviewhelpers.cpp:1128
-#, c-format
-msgid "Mark Type %1"
-msgstr "标记类型%1"
+#: part/kateprinter.cpp:928
+msgid "W&idth:"
+msgstr "宽度(&I)："
 
-#: part/kateviewhelpers.cpp:1144
-msgid "Set Default Mark Type"
-msgstr "设定默认标记类型"
+#: part/kateprinter.cpp:932
+msgid "&Margin:"
+msgstr "边距(&M)："
+
+#: part/kateprinter.cpp:936
+msgid "Co&lor:"
+msgstr "颜色(&L)："
+
+#: part/kateprinter.cpp:954
+msgid ""
+"<p>If enabled, the background color of the editor will be used.</p>"
+"<p>This may be useful if your color scheme is designed for a dark "
+"background.</p>"
+msgstr "<p>如选中此项，打印时将使用编辑器的背景颜色。</p><p>如果您的配色方案为暗色背景这可能有用。</p>"
+
+#: part/kateprinter.cpp:957
+msgid ""
+"<p>If enabled, a box as defined in the properties below will be drawn around "
+"the contents of each page. The Header and Footer will be separated from the "
+"contents with a line as well.</p>"
+msgstr "<p>如果选中此项，如下属性定义的边框将打印在每页正文周围。页眉和页脚也会用线条与正文隔开。</p>"
+
+#: part/kateprinter.cpp:961
+msgid "The width of the box outline"
+msgstr "边框线条的宽度"
+
+#: part/kateprinter.cpp:963
+msgid "The margin inside boxes, in pixels"
+msgstr "边框内圈的留空(像素)"
+
+#: part/kateprinter.cpp:965
+msgid "The line color to use for boxes"
+msgstr "边框线条的颜色"
 
 #: part/kateschema.cpp:279
 msgid "Text Area Background"
@@ -985,6 +1743,10 @@ msgstr "选中文本："
 msgid "Current line:"
 msgstr "当前行："
 
+#: part/kateschema.cpp:304 part/kateviewhelpers.cpp:704
+msgid "Bookmark"
+msgstr "书签"
+
 #: part/kateschema.cpp:305
 msgid "Active Breakpoint"
 msgstr "激活断点"
@@ -1092,7 +1854,7 @@ msgstr ""
 "<p>要编辑颜色，点击颜色方块，或者从弹出窗口中选择要编辑的颜色。"
 "<p>您可以从相应的弹出菜单取消对背景和选中背景颜色的设置。"
 
-#: part/katedialogs.cpp:1267 part/kateschema.cpp:689
+#: part/katedialogs.cpp:1266 part/kateschema.cpp:689
 msgid "H&ighlight:"
 msgstr "加亮语法(&I)："
 
@@ -1112,10 +1874,6 @@ msgstr ""
 "<p>要编辑颜色，点击颜色方块，或者从弹出窗口中选择要编辑的颜色。"
 "<p>您可以从相应的弹出菜单取消对背景和选中背景颜色的设置。"
 
-#: part/kateschema.cpp:840 plugins/autobookmarker/autobookmarker.cpp:406
-msgid "&New..."
-msgstr "新建(&N)..."
-
 #: part/kateschema.cpp:853
 msgid "Colors"
 msgstr "颜色"
@@ -1148,11 +1906,6 @@ msgstr "新方案"
 msgid "Context"
 msgstr "上下文"
 
-#: part/kateautoindent.cpp:97 part/katehighlight.cpp:3166
-#: part/kateschema.cpp:1058
-msgid "Normal"
-msgstr "正常"
-
 #: part/kateschema.cpp:1059
 msgid "Selected"
 msgstr "选中内容"
@@ -1223,203 +1976,342 @@ msgstr "当你改变任何样式属性时，“使用默认样式”将自动被
 msgid "Kate Styles"
 msgstr "Kate 样式"
 
-#: part/katesyntaxdocument.cpp:76
+#: part/katefiletype.cpp:273
+msgid "&Filetype:"
+msgstr "文件类型(&F)："
+
+#: part/katefiletype.cpp:279
+msgid "&New"
+msgstr "新建(&N)"
+
+#: part/katefiletype.cpp:289
+msgid "N&ame:"
+msgstr "名称(&A)："
+
+#: part/katefiletype.cpp:294
+msgid "&Section:"
+msgstr "节(&S)："
+
+#: part/katefiletype.cpp:299
+msgid "&Variables:"
+msgstr "变量(&V)："
+
+#: part/katedialogs.cpp:1298 part/katefiletype.cpp:304
+msgid "File e&xtensions:"
+msgstr "文件扩展名(&X)："
+
+#: part/katedialogs.cpp:1308 part/katefiletype.cpp:317
+msgid "Prio&rity:"
+msgstr "优先级(&R)："
+
+#: part/katefiletype.cpp:332
+msgid "Create a new file type."
+msgstr "创建新的文件类型。"
+
+#: part/katefiletype.cpp:333
+msgid "Delete the current file type."
+msgstr "删除当前文件类型。"
+
+#: part/katefiletype.cpp:335
 msgid ""
-"<qt>The error <b>%4</b>"
-"<br> has been detected in the file %1 at %2/%3</qt>"
-msgstr "<qt>文件 %1 中%2行/%3列发现错误<b>%4</b></qt>"
+"The name of the filetype will be the text of the corresponding menu item."
+msgstr "文件类型名称将出现在相应的菜单项中。"
 
-#: part/katesyntaxdocument.cpp:84
+#: part/katefiletype.cpp:337
+msgid "The section name is used to organize the file types in menus."
+msgstr "本节用于组织菜单中的文件类型。"
+
+#: part/katefiletype.cpp:339
+msgid ""
+"<p>This string allows you to configure Kate's settings for the files selected "
+"by this mimetype using Kate variables. You can set almost any configuration "
+"option, such as highlight, indent-mode, encoding, etc.</p>"
+"<p>For a full list of known variables, see the manual.</p>"
+msgstr ""
+"<p>此字符串允许您使用 Kate 变量配置此 MIME 类型所选择的文件。您可以设置任何配置选项，比如语法加亮、缩进模式、编码等等。</p>"
+"<p>要获得关于已知变量的完整列表，请查看手册。</p>"
+
+#: part/katefiletype.cpp:344
+msgid ""
+"The wildcards mask allows you to select files by filename. A typical mask uses "
+"an asterisk and the file extension, for example <code>*.txt; *.text</code>"
+". The string is a semicolon-separated list of masks."
+msgstr ""
+"通配符掩码允许您按照文件明选择文件。典型的掩码使用星号和文件扩展名，比如 <code>*.txt; *.text</code>。请用分号分隔掩码。"
+
+#: part/katefiletype.cpp:349
+msgid ""
+"The mime type mask allows you to select files by mimetype. The string is a "
+"semicolon-separated list of mimetypes, for example <code>"
+"text/plain; text/english</code>."
+msgstr ""
+"MIME 类型掩码允许您按照 MIME 类型选择文件。字符串应该以分号分隔 MIME 类型，比如 <code>"
+"text/plain; text/english</code>。"
+
+#: part/katefiletype.cpp:353
+msgid "Displays a wizard that helps you easily select mimetypes."
+msgstr "显示帮助您轻松选择 MIME 类型的向导。"
+
+#: part/katefiletype.cpp:355
+msgid ""
+"Sets a priority for this file type. If more than one file type selects the same "
+"file, the one with the highest priority will be used."
+msgstr "设定此文件类型的优先级。如果对同一文件选择了多种优先级的文件类型，则将使用优先级最高的文件类型。"
+
+#: part/katefiletype.cpp:427
+msgid "New Filetype"
+msgstr "新建文件类型"
+
+#: part/katefiletype.cpp:471
 #, c-format
-msgid "Unable to open %1"
-msgstr "无法打开 %1"
+msgid "Properties of %1"
+msgstr "%1 的属性"
 
-#: part/katesyntaxdocument.cpp:457
-msgid "Errors!"
-msgstr "错误！"
+#: part/katefiletype.cpp:504
+msgid ""
+"Select the MimeTypes you want for this file type.\n"
+"Please note that this will automatically edit the associated file extensions as "
+"well."
+msgstr ""
+"选择你想要为此文件类型对应的 MIME 类型。\n"
+"请注意，这也将自动编辑相关联的文件扩展名。"
 
-#: part/katesyntaxdocument.cpp:462
+#: part/kateviewhelpers.cpp:237
+msgid "Available Commands"
+msgstr "可用的命令"
+
+#: part/kateviewhelpers.cpp:239
+msgid ""
+"<p>For help on individual commands, do <code>'help &lt;command&gt;'</code></p>"
+msgstr "<p>要获得关于单个命令的帮助，请执行<code>“help &lt;命令&gt;”</code></p>"
+
+#: part/kateviewhelpers.cpp:250
+msgid "No help for '%1'"
+msgstr "没有“%1”的帮助"
+
+#: part/kateviewhelpers.cpp:253
+msgid "No such command <b>%1</b>"
+msgstr "没有这样的命令 <b>%1</b>"
+
+#: part/kateviewhelpers.cpp:258
+msgid ""
+"<p>This is the Katepart <b>command line</b>."
+"<br>Syntax: <code><b>command [ arguments ]</b></code>"
+"<br>For a list of available commands, enter <code><b>help list</b></code>"
+"<br>For help for individual commands, enter <code><b>help &lt;command&gt;</b>"
+"</code></p>"
+msgstr ""
+"<p>这是 Katepart <b>命令行</b>。"
+"<br>语法：<code><b>命令 [ 参数 ]</b></code>"
+"<br>要获得可用命令的列表，请输入 <code><b>help list</b></code>"
+"<br>要获得关于单个命令的帮助，请输入 <code><b>help &lt;命令&gt;</b></code></p>"
+
+#: part/kateviewhelpers.cpp:345
+msgid "Success: "
+msgstr "成功："
+
+#: part/kateviewhelpers.cpp:347
+msgid "Success"
+msgstr "成功"
+
+#: part/kateviewhelpers.cpp:352
+msgid "Error: "
+msgstr "错误："
+
+#: part/kateviewhelpers.cpp:354
+msgid "Command \"%1\" failed."
+msgstr "命令“%1”失败。"
+
+#: part/kateviewhelpers.cpp:360
+msgid "No such command: \"%1\""
+msgstr "没有这样的命令：“%1”"
+
+#: part/kateviewhelpers.cpp:1127 part/kateviewhelpers.cpp:1128
 #, c-format
-msgid "Error: %1"
-msgstr "错误：%1"
+msgid "Mark Type %1"
+msgstr "标记类型%1"
 
-#: part/katedialogs.cpp:153
+#: part/kateviewhelpers.cpp:1144
+msgid "Set Default Mark Type"
+msgstr "设定默认标记类型"
+
+#: part/katedialogs.cpp:152
 msgid "Automatic Indentation"
 msgstr "自动缩进"
 
-#: part/katedialogs.cpp:157
+#: part/katedialogs.cpp:156
 msgid "&Indentation mode:"
 msgstr "缩进模式(&I)："
 
-#: part/katedialogs.cpp:161 part/katedialogs.cpp:1132
+#: part/katedialogs.cpp:160 part/katedialogs.cpp:1131
 msgid "Configure..."
 msgstr "配置..."
 
-#: part/katedialogs.cpp:163
+#: part/katedialogs.cpp:162
 msgid "Insert leading Doxygen \"*\" when typing"
 msgstr "输入时插入 Doxygen 前导“*”"
 
-#: part/katedialogs.cpp:164
+#: part/katedialogs.cpp:163
 msgid "Adjust indentation of code pasted from the clipboard"
 msgstr "调整从剪贴板粘贴的代码的缩进"
 
-#: part/katedialogs.cpp:166
+#: part/katedialogs.cpp:165
 msgid "Indentation with Spaces"
 msgstr "用空格缩进"
 
-#: part/katedialogs.cpp:168
+#: part/katedialogs.cpp:167
 msgid "Use &spaces instead of tabs to indent"
 msgstr "用空格而不是跳格缩进(&S)"
 
-#: part/katedialogs.cpp:169
+#: part/katedialogs.cpp:168
 msgid "Emacs style mixed mode"
 msgstr "Emacs 风格的混合模式"
 
-#: part/katedialogs.cpp:173
+#: part/katedialogs.cpp:172
 msgid "Number of spaces:"
 msgstr "空格数："
 
-#: part/katedialogs.cpp:175
+#: part/katedialogs.cpp:174
 msgid "Keep indent &profile"
 msgstr "保留缩进设置(&P)"
 
-#: part/katedialogs.cpp:176
+#: part/katedialogs.cpp:175
 msgid "&Keep extra spaces"
 msgstr "保留额外空格(&K)"
 
-#: part/katedialogs.cpp:178
+#: part/katedialogs.cpp:177
 msgid "Keys to Use"
 msgstr "使用的键"
 
-#: part/katedialogs.cpp:179
+#: part/katedialogs.cpp:178
 msgid "&Tab key indents"
 msgstr "用制表键缩进(&T)"
 
-#: part/katedialogs.cpp:180
+#: part/katedialogs.cpp:179
 msgid "&Backspace key indents"
 msgstr "用退格键反缩进(&B)"
 
-#: part/katedialogs.cpp:183
+#: part/katedialogs.cpp:182
 msgid "Tab Key Mode if Nothing Selected"
 msgstr "未选中内容下的跳格键模式"
 
-#: part/katedialogs.cpp:185
+#: part/katedialogs.cpp:184
 msgid "Insert indent &characters"
 msgstr "插入缩进字符(&C)"
 
-#: part/katedialogs.cpp:186
+#: part/katedialogs.cpp:185
 msgid "I&nsert tab character"
 msgstr "插入跳格字符(&N)"
 
-#: part/katedialogs.cpp:187
+#: part/katedialogs.cpp:186
 msgid "Indent current &line"
 msgstr "缩进当前行(&L)"
 
-#: part/katedialogs.cpp:209
+#: part/katedialogs.cpp:208
 msgid "Check this if you want to indent with spaces rather than tabs."
 msgstr "如果您想要用空格而非跳格来进行缩进，请选中此项。"
 
-#: part/katedialogs.cpp:211
+#: part/katedialogs.cpp:210
 msgid ""
 "Indentations of more than the selected number of spaces will not be shortened."
 msgstr "超过规定的缩进宽度的空格将不被去掉。"
 
-#: part/katedialogs.cpp:214
+#: part/katedialogs.cpp:213
 msgid ""
 "This allows the <b>Tab</b> key to be used to increase the indentation level."
 msgstr "允许使用<b>制表键</b>增加缩进的深度。"
 
-#: part/katedialogs.cpp:217
+#: part/katedialogs.cpp:216
 msgid ""
 "This allows the <b>Backspace</b> key to be used to decrease the indentation "
 "level."
 msgstr "允许使用<b>退格键</b>减少缩进的级别。"
 
-#: part/katedialogs.cpp:220
+#: part/katedialogs.cpp:219
 msgid ""
 "Automatically inserts a leading \"*\" while typing within a Doxygen style "
 "comment."
 msgstr "输入 Doxygen 风格的注释时自动插入前导“*”。"
 
-#: part/katedialogs.cpp:223
+#: part/katedialogs.cpp:222
 msgid "Use a mix of tab and space characters for indentation."
 msgstr "缩进时混合使用跳格和空格字符。"
 
-#: part/katedialogs.cpp:225
+#: part/katedialogs.cpp:224
 msgid ""
 "If this option is selected, pasted code from the clipboard is indented. "
 "Triggering the <b>undo</b>-action removes the indentation."
 msgstr "如果选中了此选项，从剪贴板粘贴的代码将进行缩进。执行<b>撤消</b>操作将删除缩进。"
 
-#: part/katedialogs.cpp:227
+#: part/katedialogs.cpp:226
 msgid "The number of spaces to indent with."
 msgstr "缩进的空格数。"
 
-#: part/katedialogs.cpp:230
+#: part/katedialogs.cpp:229
 msgid ""
 "If this button is enabled, additional indenter specific options are available "
 "and can be configured in an extra dialog."
 msgstr "如果启用了此按钮，则您可通过额外的对话框配置额外的缩进器特定选项。"
 
-#: part/katedialogs.cpp:282
+#: part/katedialogs.cpp:281
 msgid "Configure Indenter"
 msgstr "配置缩进器"
 
-#: part/katedialogs.cpp:357
+#: part/katedialogs.cpp:356
 msgid "Text Cursor Movement"
 msgstr "文字光标移动"
 
-#: part/katedialogs.cpp:359
+#: part/katedialogs.cpp:358
 msgid "Smart ho&me and smart end"
 msgstr "智能 Home 和智能 End(&M)"
 
-#: part/katedialogs.cpp:363
+#: part/katedialogs.cpp:362
 msgid "Wrap c&ursor"
 msgstr "光标卷绕(&U)"
 
-#: part/katedialogs.cpp:367
+#: part/katedialogs.cpp:366
 msgid "&PageUp/PageDown moves cursor"
 msgstr "PageUp/PageDown 移动光标(&P)"
 
-#: part/katedialogs.cpp:373
+#: part/katedialogs.cpp:372
 msgid "Autocenter cursor (lines):"
 msgstr "自动居中光标(行)："
 
-#: part/katedialogs.cpp:380
+#: part/katedialogs.cpp:379
 msgid "Selection Mode"
 msgstr "选择范围模式"
 
-#: part/katedialogs.cpp:384
+#: part/katedialogs.cpp:383
 msgid "&Normal"
 msgstr "普通(&N)"
 
-#: part/katedialogs.cpp:385
+#: part/katedialogs.cpp:384
 msgid "&Persistent"
 msgstr "永久(&P)"
 
-#: part/katedialogs.cpp:390
+#: part/katedialogs.cpp:389
 msgid ""
 "Selections will be overwritten by typed text and will be lost on cursor "
 "movement."
 msgstr "选中范围将会被所输入的文字所替换，移动光标后选中范围也会丢失。"
 
-#: part/katedialogs.cpp:393
+#: part/katedialogs.cpp:392
 msgid "Selections will stay even after cursor movement and typing."
 msgstr "即便移动光标或输入文字，选中范围仍然保持不变。"
 
-#: part/katedialogs.cpp:396
+#: part/katedialogs.cpp:395
 msgid ""
 "Sets the number of lines to maintain visible above and below the cursor when "
 "possible."
 msgstr "设置可能时要保持光标上下各多少行文字可见。"
 
-#: part/katedialogs.cpp:400
+#: part/katedialogs.cpp:399
 msgid ""
 "When selected, pressing the home key will cause the cursor to skip whitespace "
 "and go to the start of a line's text. The same applies for the end key."
 msgstr "选中此项后，按下 Home 键将会把光标移动到一行文本的实际开始处，即跳过开头的空白。End 键与此类似。"
 
-#: part/katedialogs.cpp:405
+#: part/katedialogs.cpp:404
 msgid ""
 "When on, moving the insertion cursor using the <b>Left</b> and <b>Right</b> "
 "keys will go on to previous/next line at beginning/end of the line, similar to "
@@ -1430,85 +2322,85 @@ msgstr ""
 "当此项选中时，和大多数编辑器一样，在行的开头/结尾使用<b>左</b>和<b>右</b>键移动插入光标将会使光标移动到前一行/后一行。"
 "<p>当关闭的时候，插入光标到行首后将不能再用左键移动，但可以移动到行的尾部，这对于编程者可能会很顺手。"
 
-#: part/katedialogs.cpp:411
+#: part/katedialogs.cpp:410
 msgid ""
 "Selects whether the PageUp and PageDown keys should alter the vertical position "
 "of the cursor relative to the top of the view."
 msgstr "选择 PageUp 和 PageDown 键是否更改光标相对于视图顶端的位置。"
 
-#: part/katedialogs.cpp:473
+#: part/katedialogs.cpp:472
 msgid "Tabulators"
 msgstr "制表位"
 
-#: part/katedialogs.cpp:475
+#: part/katedialogs.cpp:474
 msgid "&Insert spaces instead of tabulators"
 msgstr "用空格而不是跳格缩进(&I)"
 
-#: part/katedialogs.cpp:479
+#: part/katedialogs.cpp:478
 msgid "&Show tabulators"
 msgstr "显示制表符(&S)"
 
-#: part/katedialogs.cpp:485
+#: part/katedialogs.cpp:484
 msgid "Tab width:"
 msgstr "制表位宽度："
 
-#: part/katedialogs.cpp:490
+#: part/katedialogs.cpp:489
 msgid "Static Word Wrap"
 msgstr "静态文字换行"
 
-#: part/katedialogs.cpp:492
+#: part/katedialogs.cpp:491
 msgid "Enable static &word wrap"
 msgstr "启用静态自动换行(&W)"
 
-#: part/katedialogs.cpp:496
+#: part/katedialogs.cpp:495
 msgid "&Show static word wrap marker (if applicable)"
 msgstr "显示静态自动换行标记(如果合适的话)(&S)"
 
-#: part/katedialogs.cpp:502
+#: part/katedialogs.cpp:501
 msgid "Wrap words at:"
 msgstr "换行字符数："
 
-#: part/katedialogs.cpp:507
+#: part/katedialogs.cpp:506
 msgid "Remove &trailing spaces"
 msgstr "删除行尾的空格(&T)"
 
-#: part/katedialogs.cpp:512
+#: part/katedialogs.cpp:511
 msgid "Auto &brackets"
 msgstr "自动补全括号(&B)"
 
-#: part/katedialogs.cpp:519
+#: part/katedialogs.cpp:518
 msgid "Unlimited"
 msgstr "无限制"
 
-#: part/katedialogs.cpp:520
+#: part/katedialogs.cpp:519
 msgid "Maximum undo steps:"
 msgstr "最大撤消步数："
 
-#: part/katedialogs.cpp:525
+#: part/katedialogs.cpp:524
 msgid "Smart search t&ext from:"
 msgstr "智能搜索文字(&E)："
 
-#: part/katedialogs.cpp:528
+#: part/katedialogs.cpp:527
 msgid "Nowhere"
 msgstr "随处"
 
-#: part/katedialogs.cpp:529
+#: part/katedialogs.cpp:528
 msgid "Selection Only"
 msgstr "只对选择区"
 
-#: part/katedialogs.cpp:530
+#: part/katedialogs.cpp:529
 msgid "Selection, then Current Word"
 msgstr "选择区，然后是当前单词"
 
-#: part/katedialogs.cpp:531
+#: part/katedialogs.cpp:530
 msgid "Current Word Only"
 msgstr "只对当前单词"
 
-#: part/katedialogs.cpp:532
+#: part/katedialogs.cpp:531
 msgid "Current Word, then Selection"
 msgstr "当前单词，然后是选择区"
 
-#: part/katedialogs.cpp:542
+#: part/katedialogs.cpp:541
 msgid ""
 "Automatically start a new line of text when the current line exceeds the length "
 "specified by the <b>Wrap words at:</b> option."
@@ -1522,29 +2414,29 @@ msgstr ""
 "<p>此选项并不会更改已有文本行的换行 - 这一功能需要使用<b>工具</b>菜单中的<b>应用静态自动换行</b>选项。"
 "<p>如果您想要文本根据视图的宽度进行<i>可见换行</i>，请在<b>视图默认值</b>配置页中启用<b>动态自动换行</b>。"
 
-#: part/katedialogs.cpp:550
+#: part/katedialogs.cpp:549
 msgid ""
 "If the Word Wrap option is selected this entry determines the length (in "
 "characters) at which the editor will automatically start a new line."
 msgstr "如果选中自动换行选项，这个条目决定编辑器需要自动开始新一行的长度(字符数)。"
 
-#: part/katedialogs.cpp:553
+#: part/katedialogs.cpp:552
 msgid ""
 "When the user types a left bracket ([,(, or {) KateView automatically enters "
 "the right bracket (}, ), or ]) to the right of the cursor."
 msgstr "当用户键入一个左括号([、( 或 {) KateView 将自动在光标右侧输入右括号( }、) 或 ])。"
 
-#: part/katedialogs.cpp:556
+#: part/katedialogs.cpp:555
 msgid ""
 "The editor will display a symbol to indicate the presence of a tab in the text."
 msgstr "编辑器将显示一个符号来标明文本中制表符的存在。"
 
-#: part/katedialogs.cpp:560
+#: part/katedialogs.cpp:559
 msgid ""
 "Sets the number of undo/redo steps to record. More steps uses more memory."
 msgstr "设置撤消/重复的记录步数，步数越多使用的内存越大。"
 
-#: part/katedialogs.cpp:563
+#: part/katedialogs.cpp:562
 msgid ""
 "This determines where KateView will get the search text from (this will be "
 "automatically entered into the Find Text dialog): "
@@ -1571,20 +2463,20 @@ msgstr ""
 "<li><b>当前单词，然后是选择区：</b>可用时使用当前单词，否则使用选中的文本。</li></ul>"
 "请注意，在以上全部的模式中，如果搜索字符串尚未确定或无法确定，则查找文字对话框将会回退到上次搜索的文字。"
 
-#: part/katedialogs.cpp:588
+#: part/katedialogs.cpp:587
 msgid ""
 "If this is enabled, the editor will calculate the number of spaces up to the "
 "next tab position as defined by the tab width, and insert that number of spaces "
 "instead of a TAB character."
 msgstr "如果启用了此选项，编辑器将计算到下个制表符位置处所剩的空格数，并插入相应数量的空格，而不是跳格符。"
 
-#: part/katedialogs.cpp:592
+#: part/katedialogs.cpp:591
 msgid ""
 "If this is enabled, the editor will remove any trailing whitespace on lines "
 "when they are left by the insertion cursor."
 msgstr "如果启用了此选项，编辑器将会删除行尾的空格。"
 
-#: part/katedialogs.cpp:595
+#: part/katedialogs.cpp:594
 msgid ""
 "<p>If this option is checked, a vertical line will be drawn at the word wrap "
 "column as defined in the <strong>Editing</strong> properties."
@@ -1593,94 +2485,84 @@ msgstr ""
 "<p>如果此项被选中，一条竖线将会在<strong>编辑</streong>属性中指定的自动换行列显示出来。"
 "<p>注意此自动换行标记只有在您使用的是固定宽度字体时才会显示。"
 
-#: part/katedialogs.cpp:651
+#: part/katedialogs.cpp:650
 msgid "Word Wrap"
 msgstr "按词自动换行"
 
-#: part/katedialogs.cpp:653
+#: part/katedialogs.cpp:652
 msgid "&Dynamic word wrap"
 msgstr "动态自动换行(&D)"
 
-#: part/katedialogs.cpp:656
+#: part/katedialogs.cpp:655
 msgid "Dynamic word wrap indicators (if applicable):"
 msgstr "动态自动换行标记(如果合适的话)："
 
-#: part/katedialogs.cpp:659
+#: part/katedialogs.cpp:658
 msgid "Follow Line Numbers"
 msgstr "按照行号"
 
-#: part/katedialogs.cpp:660
+#: part/katedialogs.cpp:659
 msgid "Always On"
 msgstr "总是打开"
 
-#: part/katedialogs.cpp:664
+#: part/katedialogs.cpp:663
 msgid "Vertically align dynamically wrapped lines to indentation depth:"
 msgstr "自动将换行垂直对齐到缩进深度："
 
-#: part/katedialogs.cpp:667
+#: part/katedialogs.cpp:666
 #, no-c-format
 msgid "% of View Width"
 msgstr "视图宽度的百分比"
 
-#: part/katedialogs.cpp:668
+#: part/katedialogs.cpp:667
 msgid "Disabled"
 msgstr "禁用"
 
-#: part/katedialogs.cpp:672
+#: part/katedialogs.cpp:671
 msgid "Code Folding"
 msgstr "代码折叠"
 
-#: part/katedialogs.cpp:674
+#: part/katedialogs.cpp:673
 msgid "Show &folding markers (if available)"
 msgstr "可能时显示折叠标记(&F)"
 
-#: part/katedialogs.cpp:675
+#: part/katedialogs.cpp:674
 msgid "Collapse toplevel folding nodes"
 msgstr "折叠顶层结点"
 
-#: part/katedialogs.cpp:680
+#: part/katedialogs.cpp:679
 msgid "Borders"
 msgstr "边框"
 
-#: part/katedialogs.cpp:682
+#: part/katedialogs.cpp:681
 msgid "Show &icon border"
 msgstr "显示图标边框(&I)"
 
-#: part/katedialogs.cpp:683
+#: part/katedialogs.cpp:682
 msgid "Show &line numbers"
 msgstr "显示行号(&L)"
 
-#: part/katedialogs.cpp:684
+#: part/katedialogs.cpp:683
 msgid "Show &scrollbar marks"
 msgstr "显示滚动栏标记(&S)"
 
-#: part/katedialogs.cpp:688
+#: part/katedialogs.cpp:687
 msgid "Sort Bookmarks Menu"
 msgstr "排序书签菜单"
 
-#: part/katedialogs.cpp:690
+#: part/katedialogs.cpp:689
 msgid "By &position"
 msgstr "按位置(&P)"
 
-#: part/katedialogs.cpp:691
+#: part/katedialogs.cpp:690
 msgid "By c&reation"
 msgstr "按创建时间(&R)"
 
-#: part/katedialogs.cpp:695
+#: part/katedialogs.cpp:694
 msgid "Show indentation lines"
 msgstr "显示缩进行"
 
-#: part/katedialogs.cpp:702 part/kateview.cpp:360
-msgid ""
-"If this option is checked, the text lines will be wrapped at the view border on "
-"the screen."
-msgstr "如果选中此项，文本行将自动在屏幕视图边界处折到新的一行。"
-
-#: part/katedialogs.cpp:704 part/kateview.cpp:363
-msgid "Choose when the Dynamic Word Wrap Indicators should be displayed"
-msgstr "选择何时显示动态自动换行标识符"
-
-#: part/katedialogs.cpp:709
+#: part/katedialogs.cpp:708
 msgid ""
 "<p>Enables the start of dynamically wrapped lines to be aligned vertically to "
 "the indentation level of the first line.  This can help to make code and markup "
@@ -1695,13 +2577,13 @@ msgstr ""
 "<p>此外，此选项还允许您以百分比设置屏幕的最小宽度，超过此宽度的动态换行将不会进行垂直对齐。例如，如果是 50%，缩进级别超过屏幕宽度 50% "
 "的文本行就不会使得后续行进行垂直对齐了。</p>"
 
-#: part/katedialogs.cpp:718
+#: part/katedialogs.cpp:717
 msgid ""
 "If this option is checked, every new view will display line numbers on the left "
 "hand side."
 msgstr "如果此项选中，每个新视图会在左边显示行号。"
 
-#: part/katedialogs.cpp:721
+#: part/katedialogs.cpp:720
 msgid ""
 "If this option is checked, every new view will display an icon border on the "
 "left hand side."
@@ -1709,7 +2591,7 @@ msgid ""
 "<br>The icon border shows bookmark signs, for instance."
 msgstr "如果此项选中，每个新视图会在左边显示一个图标条。<br><br>图标条上可以显示书签符号等标记。"
 
-#: part/katedialogs.cpp:725
+#: part/katedialogs.cpp:724
 msgid ""
 "If this option is checked, every new view will show marks on the vertical "
 "scrollbar."
@@ -1717,116 +2599,116 @@ msgid ""
 "<br>These marks will, for instance, show bookmarks."
 msgstr "如果此项选中，每个新视图会在垂直滚动条上显示一个标记。<br><br>这些标记可以显示书签等符号。"
 
-#: part/katedialogs.cpp:729
+#: part/katedialogs.cpp:728
 msgid ""
 "If this option is checked, every new view will display marks for code folding, "
 "if code folding is available."
 msgstr "如果此项选中，若可进行代码折叠，每个新视图会显示代码折叠的标记。"
 
-#: part/katedialogs.cpp:732
+#: part/katedialogs.cpp:731
 msgid ""
 "Choose how the bookmarks should be ordered in the <b>Bookmarks</b> menu."
 msgstr "选择如何排列<b>书签</b>菜单上的书签。"
 
-#: part/katedialogs.cpp:734
+#: part/katedialogs.cpp:733
 msgid "The bookmarks will be ordered by the line numbers they are placed at."
 msgstr "书签将按照它们在文档中的行号顺序排列。"
 
-#: part/katedialogs.cpp:736
+#: part/katedialogs.cpp:735
 msgid ""
 "Each new bookmark will be added to the bottom, independently from where it is "
 "placed in the document."
 msgstr "每个新的书签都会添加在最后面，跟它在文档中的位置无关。"
 
-#: part/katedialogs.cpp:739
+#: part/katedialogs.cpp:738
 msgid ""
 "If this is enabled, the editor will display vertical lines to help identify "
 "indent lines."
 msgstr "如果启用了此选项，编辑器将会显示垂直线，以帮助您识别缩进行。"
 
-#: part/katedialogs.cpp:855
+#: part/katedialogs.cpp:854
 msgid "File Format"
 msgstr "文件格式"
 
-#: part/katedialogs.cpp:859
+#: part/katedialogs.cpp:858
 msgid "&Encoding:"
 msgstr "编码(&E)："
 
-#: part/katedialogs.cpp:864
+#: part/katedialogs.cpp:863
 msgid "End &of line:"
 msgstr "行尾(&O)："
 
-#: part/katedialogs.cpp:868
+#: part/katedialogs.cpp:867
 msgid "&Automatic end of line detection"
 msgstr "自动检测行尾(&A)"
 
-#: part/katedialogs.cpp:870
+#: part/katedialogs.cpp:869
 msgid "UNIX"
 msgstr "UNIX"
 
-#: part/katedialogs.cpp:871
+#: part/katedialogs.cpp:870
 msgid "DOS/Windows"
 msgstr "DOS/Windows"
 
-#: part/katedialogs.cpp:872
+#: part/katedialogs.cpp:871
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: part/katedialogs.cpp:874
+#: part/katedialogs.cpp:873
 msgid "Memory Usage"
 msgstr "内存使用"
 
-#: part/katedialogs.cpp:879
+#: part/katedialogs.cpp:878
 msgid "Maximum loaded &blocks per file:"
 msgstr "每个文件最多装入的块数(&B)："
 
-#: part/katedialogs.cpp:885
+#: part/katedialogs.cpp:884
 msgid "Automatic Cleanups on Load/Save"
 msgstr "装入/保存时自动清理"
 
-#: part/katedialogs.cpp:888
+#: part/katedialogs.cpp:887
 msgid "Re&move trailing spaces"
 msgstr "删除行尾的空格(&M)"
 
-#: part/katedialogs.cpp:891
+#: part/katedialogs.cpp:890
 msgid "Folder Config File"
 msgstr "文件夹配置文件"
 
-#: part/katedialogs.cpp:896
+#: part/katedialogs.cpp:895
 msgid "Do not use config file"
 msgstr "不使用配置文件"
 
-#: part/katedialogs.cpp:897
+#: part/katedialogs.cpp:896
 msgid "Se&arch depth for config file:"
 msgstr "配置文件的搜索深度(&A)："
 
-#: part/katedialogs.cpp:899
+#: part/katedialogs.cpp:898
 msgid "Backup on Save"
 msgstr "保存时作备份"
 
-#: part/katedialogs.cpp:901
+#: part/katedialogs.cpp:900
 msgid "&Local files"
 msgstr "本地文件(&L)"
 
-#: part/katedialogs.cpp:902
+#: part/katedialogs.cpp:901
 msgid "&Remote files"
 msgstr "远程文件(&R)"
 
-#: part/katedialogs.cpp:905
+#: part/katedialogs.cpp:904
 msgid "&Prefix:"
 msgstr "前缀(&P)："
 
-#: part/katedialogs.cpp:910
+#: part/katedialogs.cpp:909
 msgid "&Suffix:"
 msgstr "后缀(&S)："
 
-#: part/katedialogs.cpp:917
+#: part/katedialogs.cpp:916
 msgid ""
 "The editor will automatically eliminate extra spaces at the ends of lines of "
 "text while loading/saving the file."
 msgstr "编辑器将在装入/保存文件时自动截去文本行尾的多余空格。"
 
-#: part/katedialogs.cpp:920
+#: part/katedialogs.cpp:919
 msgid ""
 "<p>Backing up on save will cause Kate to copy the disk file to "
 "'&lt;prefix&gt;&lt;filename&gt;&lt;suffix&gt;' before saving changes."
@@ -1835,35 +2717,35 @@ msgstr ""
 "<p>保存时作备份将会让 Kate 在保存改动前把原磁盘文件复制为“&lt;前缀&gt;&lt;文件名&gt;&lt;后缀&gt;”。"
 "<p>默认的后缀为<strong>~</strong>，前缀为空"
 
-#: part/katedialogs.cpp:924
+#: part/katedialogs.cpp:923
 msgid ""
 "Check this if you want the editor to autodetect the end of line type.The first "
 "found end of line type will be used for the whole file."
 msgstr "如果您想要自动检测行尾类型，请选中此选项。第一次检测到的行尾类型将用于整个文件。"
 
-#: part/katedialogs.cpp:927
+#: part/katedialogs.cpp:926
 msgid "Check this if you want backups of local files when saving"
 msgstr "如果您要在保存本地文件时建立备份文件，请选中此项"
 
-#: part/katedialogs.cpp:929
+#: part/katedialogs.cpp:928
 msgid "Check this if you want backups of remote files when saving"
 msgstr "如果您要在保存远程文件时建立备份文件，请选中此项"
 
-#: part/katedialogs.cpp:931
+#: part/katedialogs.cpp:930
 msgid "Enter the prefix to prepend to the backup file names"
 msgstr "输入添加到备份文件名的前缀"
 
-#: part/katedialogs.cpp:933
+#: part/katedialogs.cpp:932
 msgid "Enter the suffix to add to the backup file names"
 msgstr "输入添加到备份文件名的后缀"
 
-#: part/katedialogs.cpp:935
+#: part/katedialogs.cpp:934
 msgid ""
 "The editor will search the given number of folder levels upwards for "
 ".kateconfig file and load the settings line from it."
 msgstr "编辑器将会向下搜索指定层数的文件夹中的 .kateconfig 文件，并从中装入设置。"
 
-#: part/katedialogs.cpp:938
+#: part/katedialogs.cpp:937
 msgid ""
 "The editor will load given number of blocks (of around 2048 lines) of text into "
 "memory; if the filesize is bigger than this the other blocks are swapped  to "
@@ -1877,57 +2759,53 @@ msgstr ""
 "<br>这可能使得文档导航略微变慢；但较大的块数将以耗费内存作为条件增加编辑的速度。"
 "<br>对于普通用途，只需选择最可能的块数：如果您在内存使用上遇到问题，请限制它。"
 
-#: part/katedialogs.cpp:977
+#: part/katedialogs.cpp:976
 msgid ""
 "You did not provide a backup suffix or prefix. Using default suffix: '~'"
 msgstr "您没有指定备份文件后缀或前缀。将使用后缀“~”"
 
-#: part/katedialogs.cpp:978
+#: part/katedialogs.cpp:977
 msgid "No Backup Suffix or Prefix"
 msgstr "无备份后缀或前缀"
 
-#: part/katedialogs.cpp:1014
+#: part/katedialogs.cpp:1013
 msgid "TDE Default"
 msgstr "TDE 默认值"
 
-#: part/katedialogs.cpp:1116 part/katedialogs.cpp:1447
+#: part/katedialogs.cpp:1115 part/katedialogs.cpp:1446
 msgid "Name"
 msgstr "名称"
 
-#: part/katedialogs.cpp:1117 part/katehighlight.cpp:3174
-msgid "Comment"
-msgstr "注释"
-
-#: part/katedialogs.cpp:1213
+#: part/katedialogs.cpp:1212
 #, c-format
 msgid "Configure %1"
 msgstr "配置 %1"
 
-#: part/katedialogs.cpp:1285
+#: part/katedialogs.cpp:1284
 msgid "Author:"
 msgstr "作者："
 
-#: part/katedialogs.cpp:1291
+#: part/katedialogs.cpp:1290
 msgid "License:"
 msgstr "许可："
 
-#: part/katedialogs.cpp:1324
+#: part/katedialogs.cpp:1323
 msgid "Do&wnload..."
 msgstr "下载(&W)..."
 
-#: part/katedialogs.cpp:1332
+#: part/katedialogs.cpp:1331
 msgid ""
 "Choose a <em>Syntax Highlight mode</em> from this list to view its properties "
 "below."
 msgstr "从列表中选择<em>语法加亮模式</em>，在下面查看它的属性。"
 
-#: part/katedialogs.cpp:1335
+#: part/katedialogs.cpp:1334
 msgid ""
 "The list of file extensions used to determine which files to highlight using "
 "the current syntax highlight mode."
 msgstr "文件扩展名列表用来决定那些文件要使用当前语法加亮模式。"
 
-#: part/katedialogs.cpp:1338
+#: part/katedialogs.cpp:1337
 msgid ""
 "The list of Mime Types used to determine which files to highlight using the "
 "current highlight mode."
@@ -1935,20 +2813,20 @@ msgid ""
 "MimeType selection dialog."
 msgstr "MIME 类型列表用来决定哪些文件要使用当前语法加亮模式。<p>点击输入框右边的向导按钮可显示 MIME 类型选择对话框。"
 
-#: part/katedialogs.cpp:1342
+#: part/katedialogs.cpp:1341
 msgid ""
 "Display a dialog with a list of all available mime types to choose from."
 "<p>The <strong>File Extensions</strong> entry will automatically be edited as "
 "well."
 msgstr "显示一个对话框，列出可选择的所有有效Mime类型。<p><strong>文件扩展名</strong>输入框也将自动被编辑。"
 
-#: part/katedialogs.cpp:1346
+#: part/katedialogs.cpp:1345
 msgid ""
 "Click this button to download new or updated syntax highlight descriptions from "
 "the Kate website."
 msgstr "点击这个按钮从 Kate 网站下载新的或者更新的语法加亮描述。"
 
-#: part/katedialogs.cpp:1424
+#: part/katedialogs.cpp:1423
 msgid ""
 "Select the MimeTypes you want highlighted using the '%1' syntax highlight "
 "rules.\n"
@@ -1958,102 +2836,102 @@ msgstr ""
 "选择你想要使用“%1”语法加亮规则加亮显示的MimeTypes。 \n"
 "请注意这也将自动编辑相关联的文件扩展名。"
 
-#: part/katedialogs.cpp:1439
+#: part/katedialogs.cpp:1438
 msgid "Highlight Download"
 msgstr "下载语法加亮"
 
-#: part/katedialogs.cpp:1439
+#: part/katedialogs.cpp:1438
 msgid "&Install"
 msgstr "安装(&I)"
 
-#: part/katedialogs.cpp:1444
+#: part/katedialogs.cpp:1443
 msgid "Select the syntax highlighting files you want to update:"
 msgstr "选择您想要更新的加亮显示语文文件："
 
-#: part/katedialogs.cpp:1448
+#: part/katedialogs.cpp:1447
 msgid "Installed"
 msgstr "已安装"
 
-#: part/katedialogs.cpp:1449
+#: part/katedialogs.cpp:1448
 msgid "Latest"
 msgstr "最新的"
 
-#: part/katedialogs.cpp:1453
+#: part/katedialogs.cpp:1452
 msgid "<b>Note:</b> New versions are selected automatically."
 msgstr "<b>注意：</b>新版本已经自动选中。"
 
-#: part/katedialogs.cpp:1552
+#: part/katedialogs.cpp:1547
 msgid "Go to Line"
 msgstr "跳至行"
 
-#: part/katedialogs.cpp:1562
+#: part/katedialogs.cpp:1557
 msgid "&Go to line:"
 msgstr "跳至行(&G)："
 
-#: part/katedialogs.cpp:1588
+#: part/katedialogs.cpp:1583
 msgid "File Was Deleted on Disk"
 msgstr "文件已在磁盘上删除"
 
-#: part/katedialogs.cpp:1589
+#: part/katedialogs.cpp:1584
 msgid "&Save File As..."
 msgstr "文件另存为(&S)..."
 
-#: part/katedialogs.cpp:1590
+#: part/katedialogs.cpp:1585
 msgid "Lets you select a location and save the file again."
 msgstr "让您再次选择一个文件并保存文件。"
 
-#: part/katedialogs.cpp:1592
+#: part/katedialogs.cpp:1587
 msgid "File Changed on Disk"
 msgstr "文件已在磁盘上更改"
 
-#: part/katedialogs.cpp:1594
+#: part/katedialogs.cpp:1589
 msgid ""
 "Reload the file from disk. If you have unsaved changes, they will be lost."
 msgstr "从磁盘上重新装入文件。如果您有未保存的更改，这些更改将丢失。"
 
-#: part/katedialogs.cpp:1599
+#: part/katedialogs.cpp:1594
 msgid "&Ignore"
 msgstr "忽略(&I)"
 
-#: part/katedialogs.cpp:1602
+#: part/katedialogs.cpp:1597
 msgid "Ignore the changes. You will not be prompted again."
 msgstr "忽略更改。您将不会再收到提示。"
 
-#: part/katedialogs.cpp:1603
+#: part/katedialogs.cpp:1598
 msgid ""
 "Do nothing. Next time you focus the file, or try to save it or close it, you "
 "will be prompted again."
 msgstr "不执行任何操作。您下次聚焦该文件时，或者尝试保存或关闭它时，您将会再次看到该提示。"
 
-#: part/katedialogs.cpp:1621
+#: part/katedialogs.cpp:1616
 msgid "&View Difference"
 msgstr "查看差异(&V)"
 
-#: part/katedialogs.cpp:1626
+#: part/katedialogs.cpp:1621
 msgid ""
 "Calculates the difference between the editor contents and the disk file using "
 "diff(1) and opens the diff file with the default application for that."
 msgstr "使用 diff(1) 计算编辑器内容和磁盘上文件的差异，并用默认应用程序打开差异文件。"
 
-#: part/katedialogs.cpp:1630
+#: part/katedialogs.cpp:1625
 msgid "Overwrite"
 msgstr "覆盖"
 
-#: part/katedialogs.cpp:1631
+#: part/katedialogs.cpp:1626
 msgid "Overwrite the disk file with the editor content."
 msgstr "用编辑器的内容覆盖磁盘文件。"
 
-#: part/katedialogs.cpp:1699
+#: part/katedialogs.cpp:1694
 msgid ""
 "The diff command failed. Please make sure that diff(1) is installed and in your "
 "PATH."
 msgstr "diff 命令失败。请确定安装了 diff(1)，并且该命令在您的路径中。"
 
-#: part/katedialogs.cpp:1701
+#: part/katedialogs.cpp:1696
 msgid "Error Creating Diff"
 msgstr "创建差异失败"
 
-#: part/katedialogs.cpp:1716
+#: part/katedialogs.cpp:1711
 msgid ""
 "Ignoring means that you will not be warned again (unless the disk file changes "
 "once more): if you save the document, you will overwrite the file on disk; if "
@@ -2062,7 +2940,7 @@ msgstr ""
 "忽略意味着您将不会再次收到警告(除非磁盘上的文件再次发生了变化)：如果您保存该文档，您将会覆盖磁盘上的文件；如果您不保存的话，那么磁盘上的现有文件就是您所得到的"
 "文件。"
 
-#: part/katedialogs.cpp:1720
+#: part/katedialogs.cpp:1715
 msgid "You Are on Your Own"
 msgstr "请小心操作"
 
@@ -2071,2081 +2949,2073 @@ msgstr "请小心操作"
 msgid "Could not access view"
 msgstr "无法访问视图"
 
-#: part/katejscript.cpp:304 part/katejscript.cpp:928
-msgid "Exception, line %1: %2"
-msgstr "意外：行 %1:%2"
-
-#: part/katejscript.cpp:754
-msgid "Command not found"
-msgstr "命令未找到"
-
-#: part/katejscript.cpp:762 part/katejscript.cpp:897
-msgid "JavaScript file not found"
-msgstr "JavaScript 文件未找到"
-
-#: part/katespell.cpp:57
-msgid "Spelling (from cursor)..."
-msgstr "拼写(从光标处)..."
-
-#: part/katespell.cpp:58
-msgid "Check the document's spelling from the cursor and forward"
-msgstr "从光标处向下检查文档的拼写"
-
-#: part/katespell.cpp:60
-msgid "Spellcheck Selection..."
-msgstr "对选中范围进行拼写检查..."
-
-#: part/katespell.cpp:61
-msgid "Check spelling of the selected text"
-msgstr "检查选中文字的拼写"
-
-#: part/katespell.cpp:125
-msgid "Spellcheck"
-msgstr "拼写检查"
-
-#: part/katespell.cpp:205
-msgid ""
-"The spelling program could not be started. Please make sure you have set the "
-"correct spelling program and that it is properly configured and in your PATH."
-msgstr "无法启动拼写程序。请确定您已经正确安装了拼写程序，并已在 PATH 中配置好了。"
-
-#: part/katespell.cpp:210
-msgid "The spelling program seems to have crashed."
-msgstr "拼写程序好像崩溃了。"
+#: part/katecmds.cpp:151
+msgid "Mode must be at least 0."
+msgstr "模式必须至少为 0。"
 
-#: part/kateview.cpp:216
-msgid "Cut the selected text and move it to the clipboard"
-msgstr "剪下选中的文字并保存到剪贴板"
+#: part/katecmds.cpp:169
+msgid "No such highlight '%1'"
+msgstr "没有高亮“%1”"
 
-#: part/kateview.cpp:219
-msgid "Paste previously copied or cut clipboard contents"
-msgstr "粘贴以前复制或者剪切到剪贴板的内容"
+#: part/katecmds.cpp:180
+msgid "Missing argument. Usage: %1 <value>"
+msgstr "缺少参数。用法：%1 <值>"
 
-#: part/kateview.cpp:222
-msgid ""
-"Use this command to copy the currently selected text to the system clipboard."
-msgstr "使用此命令将当前选定的文字复制到系统剪贴板。"
+#: part/katecmds.cpp:184
+msgid "Failed to convert argument '%1' to integer."
+msgstr "将参数“%1”转换为整数失败。"
 
-#: part/kateview.cpp:224
-msgid "Copy as &HTML"
-msgstr "复制为 HTML(&H)"
+#: part/katecmds.cpp:190 part/katecmds.cpp:196
+msgid "Width must be at least 1."
+msgstr "宽度必须至少为 1。"
 
-#: part/kateview.cpp:225
-msgid ""
-"Use this command to copy the currently selected text as HTML to the system "
-"clipboard."
-msgstr "使用此命令将当前选定的文字以 HTML 格式复制到系统剪贴板。"
+#: part/katecmds.cpp:202
+msgid "Column must be at least 1."
+msgstr "列必须至少为 1。"
 
-#: part/kateview.cpp:230
-msgid "Save the current document"
-msgstr "保存当前文档"
+#: part/katecmds.cpp:208
+msgid "Line must be at least 1"
+msgstr "行必须至少为 1"
 
-#: part/kateview.cpp:233
-msgid "Revert the most recent editing actions"
-msgstr "撤消最近的编辑动作"
+#: part/katecmds.cpp:210
+msgid "There is not that many lines in this document"
+msgstr "此文档中没有那么多行"
 
-#: part/kateview.cpp:236
-msgid "Revert the most recent undo operation"
-msgstr "取消最近的撤消操作"
+#: part/katecmds.cpp:232
+msgid "Usage: %1 on|off|1|0|true|false"
+msgstr "用法：%1 on|off|1|0|true|false"
 
-#: part/kateview.cpp:238
-msgid "&Word Wrap Document"
-msgstr "自动换行文档(&W)"
+#: part/katecmds.cpp:274
+msgid "Bad argument '%1'. Usage: %2 on|off|1|0|true|false"
+msgstr "错误的参数“%1”。用法：%2 on|off|1|0|true|false"
 
-#: part/kateview.cpp:239
-msgid ""
-"Use this command to wrap all lines of the current document which are longer "
-"than the width of the current view, to fit into this view."
-"<br>"
-"<br> This is a static word wrap, meaning it is not updated when the view is "
-"resized."
-msgstr ""
-"使使用此命令将当前文档中宽出当前视图的行折成多行，以适合当前显示。"
-"<br>"
-"<br>这是静态的按词卷绕，就是说当视图尺寸改变时它将不会随着变化。"
+#: part/katecmds.cpp:279
+msgid "Unknown command '%1'"
+msgstr "未知命令“%1”"
 
-#: part/kateview.cpp:244
-msgid "&Indent"
-msgstr "增加缩进(&I)"
+#: part/katecmds.cpp:498
+msgid "Sorry, but Kate is not able to replace newlines, yet"
+msgstr "抱歉，Kate 尚无法替换换行"
 
-#: part/kateview.cpp:245
+#: part/katecmds.cpp:540
+#, c-format
 msgid ""
-"Use this to indent a selected block of text."
-"<br>"
-"<br>You can configure whether tabs should be honored and used or replaced with "
-"spaces, in the configuration dialog."
-msgstr "使用此命令缩进选中的一块文字。<br><br>在配置对话框中，您可以配置是否直接使用制表符或者用空格代替。"
-
-#: part/kateview.cpp:247
-msgid "&Unindent"
-msgstr "减少缩进(&U)"
-
-#: part/kateview.cpp:248
-msgid "Use this to unindent a selected block of text."
-msgstr "使用此命令反缩进选中的一块文字。"
-
-#: part/kateview.cpp:250
-msgid "&Clean Indentation"
-msgstr "清除缩进(&C)"
+"_n: 1 replacement done\n"
+"%n replacements done"
+msgstr "完成了 %n 次替换"
 
-#: part/kateview.cpp:251
-msgid ""
-"Use this to clean the indentation of a selected block of text (only tabs/only "
-"spaces)"
-"<br>"
-"<br>You can configure whether tabs should be honored and used or replaced with "
-"spaces, in the configuration dialog."
-msgstr "使用此命令清除一块选中文字的缩进(制表符或空格)。<br><br>在配置对话框中，您可以配置是否直接使用制表符或者用空格代替。"
+#: part/katebookmarks.cpp:77
+msgid "Set &Bookmark"
+msgstr "设置书签(&B)"
 
-#: part/kateview.cpp:254
-msgid "&Align"
-msgstr "对齐(&A)"
+#: part/katebookmarks.cpp:80
+msgid "If a line has no bookmark then add one, otherwise remove it."
+msgstr "如果当前行没有书签就加一个，如果有则取消它。"
 
-#: part/kateview.cpp:255
-msgid ""
-"Use this to align the current line or block of text to its proper indent level."
-msgstr "使用此功能可对齐当前行，或者将一块文本对齐到适当的缩进级别。"
+#: part/katebookmarks.cpp:81
+msgid "Clear &Bookmark"
+msgstr "清除书签(&B)"
 
-#: part/kateview.cpp:257
-msgid "C&omment"
-msgstr "注释(&O)"
+#: part/katebookmarks.cpp:84
+msgid "Clear &All Bookmarks"
+msgstr "清除全部书签(&A)"
 
-#: part/kateview.cpp:259
-msgid ""
-"This command comments out the current line or a selected block of text.<BR><BR>"
-"The characters for single/multiple line comments are defined within the "
-"language's highlighting."
-msgstr "使用此命令注释掉当前行或者选定的一块文字。<BR><BR>单行/多行注释的标记字符在语法加亮设置中定义。"
+#: part/katebookmarks.cpp:87
+msgid "Remove all bookmarks of the current document."
+msgstr "取消当前文档的所有书签。"
 
-#: part/kateview.cpp:262
-msgid "Unco&mment"
-msgstr "去注释(&M)"
+#: part/katebookmarks.cpp:90 part/katebookmarks.cpp:242
+msgid "Next Bookmark"
+msgstr "下一个书签"
 
-#: part/kateview.cpp:264
-msgid ""
-"This command removes comments from the current line or a selected block of "
-"text.<BR><BR>The characters for single/multiple line comments are defined "
-"within the language's highlighting."
-msgstr "使用此命令去掉当前行或者选定文字的注释。<BR><BR>单行/多行注释的标记字符在语法加亮设置中定义。"
+#: part/katebookmarks.cpp:93
+msgid "Go to the next bookmark."
+msgstr "前往下个书签。"
 
-#: part/kateview.cpp:267
-msgid "&Read Only Mode"
-msgstr "只读模式(&R)"
+#: part/katebookmarks.cpp:96 part/katebookmarks.cpp:244
+msgid "Previous Bookmark"
+msgstr "上一个书签"
 
-#: part/kateview.cpp:270
-msgid "Lock/unlock the document for writing"
-msgstr "锁定/解锁该文档进行写入"
+#: part/katebookmarks.cpp:99
+msgid "Go to the previous bookmark."
+msgstr "前往上个书签。"
 
-#: part/kateview.cpp:272
-msgid "Uppercase"
-msgstr "大写"
+#: part/katebookmarks.cpp:203
+msgid "&Next: %1 - \"%2\""
+msgstr "下一个(&N)：%1 -“%2”"
 
-#: part/kateview.cpp:274
-msgid ""
-"Convert the selection to uppercase, or the character to the right of the cursor "
-"if no text is selected."
-msgstr "将选中区转换成大写。若没有选中文字的话，则转换光标右侧的字符。"
+#: part/katebookmarks.cpp:210
+msgid "&Previous: %1 - \"%2\""
+msgstr "上一个(&P)：%1 -“%2”"
 
-#: part/kateview.cpp:277
-msgid "Lowercase"
-msgstr "小写"
+#: part/katesearch.cpp:72
+msgid "Look up the first occurrence of a piece of text or regular expression."
+msgstr "查找第一个和文字或者正则表达式匹配的文本。"
 
-#: part/kateview.cpp:279
-msgid ""
-"Convert the selection to lowercase, or the character to the right of the cursor "
-"if no text is selected."
-msgstr "将选中区转换成小写。若没有选中文字的话，则转换光标右侧的字符。"
+#: part/katesearch.cpp:74
+msgid "Look up the next occurrence of the search phrase."
+msgstr "查找下一个和搜索字串匹配的文本。"
 
-#: part/kateview.cpp:282
-msgid "Capitalize"
-msgstr "字首大写"
+#: part/katesearch.cpp:76
+msgid "Look up the previous occurrence of the search phrase."
+msgstr "查找上一个和搜索字串匹配的文本。"
 
-#: part/kateview.cpp:284
+#: part/katesearch.cpp:78
 msgid ""
-"Capitalize the selection, or the word under the cursor if no text is selected."
-msgstr "将选中区中全部单词的第一个字母转换成大写。若没有选中文字的话，则转换光标右侧的字符。"
-
-#: part/kateview.cpp:287
-msgid "Join Lines"
-msgstr "连接行"
-
-#: part/kateview.cpp:299
-msgid "Print the current document."
-msgstr "打印当前文档。"
-
-#: part/kateview.cpp:301
-msgid "Reloa&d"
-msgstr "重新装入(&D)"
+"Look up a piece of text or regular expression and replace the result with some "
+"given text."
+msgstr "查找一段文本或者正则表达式，并用指定的文字替换它。"
 
-#: part/kateview.cpp:302
-msgid "Reload the current document from disk."
-msgstr "从磁盘中重新装入当前文档。"
+#: part/katesearch.cpp:331
+msgid "Search string '%1' not found!"
+msgstr "字符串“%1”没有找到！"
 
-#: part/kateview.cpp:305
-msgid "Save the current document to disk, with a name of your choice."
-msgstr "用您指定的名字将当前文档保存到磁盘。"
+#: part/katesearch.cpp:333 part/katesearch.cpp:510
+msgid "Find"
+msgstr "查找"
 
-#: part/kateview.cpp:308
+#: part/katesearch.cpp:353 part/katesearch.cpp:371 part/katesearch.cpp:487
+#, c-format
 msgid ""
-"This command opens a dialog and lets you choose a line that you want the cursor "
-"to move to."
-msgstr "此命令打开一个对话框，让您选择将光标移到哪一行。"
-
-#: part/kateview.cpp:310
-msgid "&Configure Editor..."
-msgstr "配置编辑器(&C)..."
-
-#: part/kateview.cpp:311
-msgid "Configure various aspects of this editor."
-msgstr "配置这个编辑器多方面的设置。"
-
-#: part/kateview.cpp:313
-msgid "&Highlighting"
-msgstr "语法加亮(&H)"
-
-#: part/kateview.cpp:314
-msgid "Here you can choose how the current document should be highlighted."
-msgstr "这里您可以选择如何加亮显示当前文档。"
-
-#: part/kateview.cpp:317
-msgid "&Filetype"
-msgstr "文件类型(&F)"
-
-#: part/kateview.cpp:320
-msgid "&Schema"
-msgstr "方案(&S)"
-
-#: part/kateview.cpp:324
-msgid "&Indentation"
-msgstr "缩进(&I)"
-
-#: part/kateview.cpp:327
-msgid "E&xport as HTML..."
-msgstr "导出为 HTML(&X)..."
+"_n: %n replacement made.\n"
+"%n replacements made."
+msgstr "完成了 %n 次替换。"
 
-#: part/kateview.cpp:328
-msgid ""
-"This command allows you to export the current document with all highlighting "
-"information into a HTML document."
-msgstr "此命令允许您将当前文档及其全部加亮信息导出到 HTML 文档。"
+#: part/katesearch.cpp:491
+msgid "End of document reached."
+msgstr "到达文件结尾。"
 
-#: part/kateview.cpp:332
-msgid "Select the entire text of the current document."
-msgstr "选中当前文档的全部文本。"
+#: part/katesearch.cpp:492
+msgid "Beginning of document reached."
+msgstr "到达文件开头。"
 
-#: part/kateview.cpp:335
-msgid ""
-"If you have selected something within the current document, this will no longer "
-"be selected."
-msgstr "如果您在当前文档中有一些选中的文字，这将使它们不再被选中。"
+#: part/katesearch.cpp:497
+msgid "End of selection reached."
+msgstr "到达选中范围结尾。"
 
-#: part/kateview.cpp:337
-msgid "Enlarge Font"
-msgstr "增大字体"
+#: part/katesearch.cpp:498
+msgid "Beginning of selection reached."
+msgstr "到达选中范围开头。"
 
-#: part/kateview.cpp:338
-msgid "This increases the display font size."
-msgstr "此命令增大显示字体的大小。"
+#: part/katesearch.cpp:502
+msgid "Continue from the beginning?"
+msgstr "从开头继续找吗？"
 
-#: part/kateview.cpp:340
-msgid "Shrink Font"
-msgstr "缩小字体"
+#: part/katesearch.cpp:503
+msgid "Continue from the end?"
+msgstr "从结尾继续找吗？"
 
-#: part/kateview.cpp:341
-msgid "This decreases the display font size."
-msgstr "此命令减小显示字体的大小。"
+#: part/katesearch.cpp:511
+msgid "&Stop"
+msgstr "停止(&S)"
 
-#: part/kateview.cpp:344
-msgid "Bl&ock Selection Mode"
-msgstr "块选择方式(&O)"
+#: part/katesearch.cpp:765
+msgid "Replace Confirmation"
+msgstr "替换确认"
 
-#: part/kateview.cpp:347
-msgid ""
-"This command allows switching between the normal (line based) selection mode "
-"and the block selection mode."
-msgstr "此命令让您在普通的行选择方式和块选择方式之间切换。"
+#: part/katesearch.cpp:767
+msgid "Replace &All"
+msgstr "全部替换(&A)"
 
-#: part/kateview.cpp:350
-msgid "Overwr&ite Mode"
-msgstr "覆盖模式(&I)"
+#: part/katesearch.cpp:767
+msgid "Re&place && Close"
+msgstr "替换并关闭(&P)"
 
-#: part/kateview.cpp:353
-msgid ""
-"Choose whether you want the text you type to be inserted or to overwrite "
-"existing text."
-msgstr "让您选择新输入的文字是插入到文档还是覆盖已有的文字。"
+#: part/katesearch.cpp:767
+msgid "&Replace"
+msgstr "替换(&R)"
 
-#: part/kateview.cpp:357
-msgid "&Dynamic Word Wrap"
-msgstr "动态文字换行(&D)"
+#: part/katesearch.cpp:769
+msgid "&Find Next"
+msgstr "查找下一个(&F)"
 
-#: part/kateview.cpp:362
-msgid "Dynamic Word Wrap Indicators"
-msgstr "动态文字换行标识符"
+#: part/katesearch.cpp:774
+msgid "Found an occurrence of your search term. What do you want to do?"
+msgstr "找到您搜索条目的出现。您想做什么？"
 
-#: part/kateview.cpp:367
-msgid "&Off"
-msgstr "关(&O)"
+#: part/katesearch.cpp:826
+msgid "Usage: find[:[bcersw]] PATTERN"
+msgstr "用法：find[:[bcersw]] 模式"
 
-#: part/kateview.cpp:368
-msgid "Follow &Line Numbers"
-msgstr "按照行号(&L)"
+#: part/katesearch.cpp:838
+msgid "Usage: ifind[:[bcrs]] PATTERN"
+msgstr "用法：ifind[:[bcrs]] 模式"
 
-#: part/kateview.cpp:369
-msgid "&Always On"
-msgstr "总是打开(&A)"
+#: part/katesearch.cpp:892
+msgid "Usage: replace[:[bceprsw]] PATTERN [REPLACEMENT]"
+msgstr "用法：replace[:[bceprsw]] 模式 [替换]"
 
-#: part/kateview.cpp:373
-msgid "Show Folding &Markers"
-msgstr "显示折叠标记(&M)"
+#: part/katesearch.cpp:926
+msgid "<p>Usage: <code>find[:bcersw] PATTERN</code></p>"
+msgstr "<p>用法：<code>find[:bcersw] 模式</code></p>"
 
-#: part/kateview.cpp:376
+#: part/katesearch.cpp:929
 msgid ""
-"You can choose if the codefolding marks should be shown, if codefolding is "
-"possible."
-msgstr "如果能进行代码折叠，您可以选择是否显示代码折叠标记。"
-
-#: part/kateview.cpp:377
-msgid "Hide Folding &Markers"
-msgstr "隐藏折叠标记(&M)"
+"<p>Usage: <code>ifind:[:bcrs] PATTERN</code>"
+"<br>ifind does incremental or 'as-you-type' search</p>"
+msgstr "<p>用法：<code>ifind[:bcrs] 模式</code><br>ifind 执行增量搜索或称“即输即搜”</p>"
 
-#: part/kateview.cpp:380
-msgid "Show &Icon Border"
-msgstr "显示图标边框(&I)"
+#: part/katesearch.cpp:933
+msgid "<p>Usage: <code>replace[:bceprsw] PATTERN REPLACEMENT</code></p>"
+msgstr "<p>用法：<code>replace[:bceprsw] 模式 [替换]</code></p>"
 
-#: part/kateview.cpp:384
+#: part/katesearch.cpp:936
 msgid ""
-"Show/hide the icon border.<BR><BR> The icon border shows bookmark symbols, for "
-"instance."
-msgstr "显示/隐藏页面边上的图标边条。<BR><BR>图标边条上能显示书签符号等标记。"
-
-#: part/kateview.cpp:385
-msgid "Hide &Icon Border"
-msgstr "隐藏图标边框(&I)"
-
-#: part/kateview.cpp:388
-msgid "Show &Line Numbers"
-msgstr "显示行号(&L)"
-
-#: part/kateview.cpp:391
-msgid "Show/hide the line numbers on the left hand side of the view."
-msgstr "在视图左边显示/隐藏行号。"
-
-#: part/kateview.cpp:392
-msgid "Hide &Line Numbers"
-msgstr "隐藏行号(&L)"
-
-#: part/kateview.cpp:395
-msgid "Show Scroll&bar Marks"
-msgstr "显示滚动条标记(&B)"
+"<h4><caption>Options</h4>"
+"<p><b>b</b> - Search backward"
+"<br><b>c</b> - Search from cursor"
+"<br><b>r</b> - Pattern is a regular expression"
+"<br><b>s</b> - Case sensitive search"
+msgstr ""
+"<h4><caption>选项</h4>"
+"<p><b>b</b> - 向前搜索"
+"<br><b>c</b> - 从光标处搜索"
+"<br><b>r</b> - 模式为正则表达式"
+"<br><b>s</b> - 区分大小写搜索"
 
-#: part/kateview.cpp:398
+#: part/katesearch.cpp:945
 msgid ""
-"Show/hide the marks on the vertical scrollbar.<BR><BR>"
-"The marks, for instance, show bookmarks."
-msgstr "显示/隐藏垂直滚动条上的标记。<BR><BR>这些标记可显示书签等符号。"
-
-#: part/kateview.cpp:399
-msgid "Hide Scroll&bar Marks"
-msgstr "隐藏滚动条标记(&B)"
-
-#: part/kateview.cpp:402
-msgid "Show Static &Word Wrap Marker"
-msgstr "显示静态自动换行标记(&W)"
+"<br><b>e</b> - Search in selected text only"
+"<br><b>w</b> - Search whole words only"
+msgstr "<br><b>e</b> - 仅在选中文本中搜索<br><b>w</b> - 仅搜索选中单词"
 
-#: part/kateview.cpp:406
+#: part/katesearch.cpp:951
 msgid ""
-"Show/hide the Word Wrap Marker, a vertical line drawn at the word wrap column "
-"as defined in the editing properties"
-msgstr "显示/隐藏自动换行标记，它是在编辑属性中定义的自动换行列显示的一条竖线。"
-
-#: part/kateview.cpp:408
-msgid "Hide Static &Word Wrap Marker"
-msgstr "隐藏静态自动换行标记(&W)"
-
-#: part/kateview.cpp:411
-msgid "Switch to Command Line"
-msgstr "切换到命令行"
-
-#: part/kateview.cpp:414
-msgid "Show/hide the command line on the bottom of the view."
-msgstr "在视图底部显示/隐藏命令行。"
-
-#: part/kateview.cpp:416
-msgid "&End of Line"
-msgstr "行尾(&E)"
-
-#: part/kateview.cpp:417
-msgid "Choose which line endings should be used, when you save the document"
-msgstr "选择当您保存文档时使用哪种行结束字符。"
-
-#: part/kateview.cpp:427
-msgid "E&ncoding"
-msgstr "编码(&E)"
-
-#: part/kateview.cpp:444
-msgid "Move Word Left"
-msgstr "整词左移"
-
-#: part/kateview.cpp:448
-msgid "Select Character Left"
-msgstr "选择左边字符"
-
-#: part/kateview.cpp:452
-msgid "Select Word Left"
-msgstr "选择左边整词"
-
-#: part/kateview.cpp:457
-msgid "Move Word Right"
-msgstr "整词右移"
-
-#: part/kateview.cpp:461
-msgid "Select Character Right"
-msgstr "选择右边字符"
-
-#: part/kateview.cpp:465
-msgid "Select Word Right"
-msgstr "选择右边整词"
-
-#: part/kateview.cpp:470
-msgid "Move to Beginning of Line"
-msgstr "移到行首"
-
-#: part/kateview.cpp:474
-msgid "Move to Beginning of Document"
-msgstr "移到文档开头"
-
-#: part/kateview.cpp:478
-msgid "Select to Beginning of Line"
-msgstr "选择到行首"
-
-#: part/kateview.cpp:482
-msgid "Select to Beginning of Document"
-msgstr "选择到文档开头"
-
-#: part/kateview.cpp:487
-msgid "Move to End of Line"
-msgstr "移到行尾"
-
-#: part/kateview.cpp:491
-msgid "Move to End of Document"
-msgstr "移到文档末尾"
-
-#: part/kateview.cpp:495
-msgid "Select to End of Line"
-msgstr "选择到行尾"
-
-#: part/kateview.cpp:499
-msgid "Select to End of Document"
-msgstr "选择到文档末尾"
-
-#: part/kateview.cpp:504
-msgid "Select to Previous Line"
-msgstr "选择到前一行"
-
-#: part/kateview.cpp:508
-msgid "Scroll Line Up"
-msgstr "向上滚动一行"
-
-#: part/kateview.cpp:512
-msgid "Move to Next Line"
-msgstr "选择到下一行"
-
-#: part/kateview.cpp:515
-msgid "Move to Previous Line"
-msgstr "选择到前一行"
-
-#: part/kateview.cpp:518
-msgid "Move Character Right"
-msgstr "移动右边字符"
-
-#: part/kateview.cpp:521
-msgid "Move Character Left"
-msgstr "移动左边字符"
-
-#: part/kateview.cpp:525
-msgid "Select to Next Line"
-msgstr "选择到下一行"
-
-#: part/kateview.cpp:529
-msgid "Scroll Line Down"
-msgstr "向下滚动一行"
-
-#: part/kateview.cpp:534
-msgid "Scroll Page Up"
-msgstr "向上滚动一页"
-
-#: part/kateview.cpp:538
-msgid "Select Page Up"
-msgstr "向上选择一页"
-
-#: part/kateview.cpp:542
-msgid "Move to Top of View"
-msgstr "移到视图顶部"
-
-#: part/kateview.cpp:546
-msgid "Select to Top of View"
-msgstr "选择到视图顶部"
-
-#: part/kateview.cpp:551
-msgid "Scroll Page Down"
-msgstr "向下滚动一页"
-
-#: part/kateview.cpp:555
-msgid "Select Page Down"
-msgstr "向下选择一页"
-
-#: part/kateview.cpp:559
-msgid "Move to Bottom of View"
-msgstr "移到视图底部"
-
-#: part/kateview.cpp:563
-msgid "Select to Bottom of View"
-msgstr "选择到视图底部"
-
-#: part/kateview.cpp:567
-msgid "Move to Matching Bracket"
-msgstr "移到匹配的括号"
-
-#: part/kateview.cpp:571
-msgid "Select to Matching Bracket"
-msgstr "选择到匹配的括号"
-
-#: part/kateview.cpp:579
-msgid "Transpose Characters"
-msgstr "左右交换字符"
-
-#: part/kateview.cpp:584
-msgid "Delete Line"
-msgstr "删除一行"
-
-#: part/kateview.cpp:589
-msgid "Delete Word Left"
-msgstr "删除左边整词"
-
-#: part/kateview.cpp:594
-msgid "Delete Word Right"
-msgstr "删除右边整词"
-
-#: part/kateview.cpp:598
-msgid "Delete Next Character"
-msgstr "删除下个字符"
-
-#: part/kateview.cpp:602
-msgid "Backspace"
-msgstr "Backspace"
-
-#: part/kateview.cpp:628
-msgid "Collapse Toplevel"
-msgstr "折叠顶层树"
-
-#: part/kateview.cpp:630
-msgid "Expand Toplevel"
-msgstr "展开顶层"
-
-#: part/kateview.cpp:632
-msgid "Collapse One Local Level"
-msgstr "折叠一层本地级别"
-
-#: part/kateview.cpp:634
-msgid "Expand One Local Level"
-msgstr "展开一层本地级别"
-
-#: part/kateview.cpp:639
-msgid "Show the code folding region tree"
-msgstr "显示代码树状折叠"
-
-#: part/kateview.cpp:640
-msgid "Basic template code test"
-msgstr "基本模板代码测试"
-
-#: part/kateview.cpp:702
-msgid " OVR "
-msgstr " 改写 "
-
-#: part/kateview.cpp:704
-msgid " INS "
-msgstr " 插入 "
-
-#: part/kateview.cpp:707
-msgid " R/O "
-msgstr " 只读 "
-
-#: part/kateview.cpp:712
-#, c-format
-msgid " Line: %1"
-msgstr " 行：%1"
-
-#: part/kateview.cpp:713
-#, c-format
-msgid " Col: %1"
-msgstr " 列：%1"
-
-#: part/kateview.cpp:716
-msgid " BLK "
-msgstr " 块 "
-
-#: part/kateview.cpp:716
-msgid " NORM "
-msgstr " 普通 "
-
-#: part/kateview.cpp:892
-msgid "Overwrite the file"
-msgstr "覆盖文件"
-
-#: part/kateview.cpp:1794
-msgid "Export File as HTML"
-msgstr "文件导出为 HTML"
+"<br><b>p</b> - Prompt for replace</p>"
+"<p>If REPLACEMENT is not present, an empty string is used.</p>"
+"<p>If you want to have whitespace in your PATTERN, you need to quote both "
+"PATTERN and REPLACEMENT with either single or double quotes. To have the quote "
+"characters in the strings, prepend them with a backslash."
+msgstr ""
+"<br><b>p</b> - 提示替换</p>"
+"<p>如果没有[替换]，则使用空字符串。</p>"
+"<p>如果您想要在[模式]中使用空白，您就需要将[模式]和[替换]都用单引号或双引号包起来。要在字符串中使用引号字符，请在前面添加反斜线。"
 
-#: part/katehighlight.cpp:1824
-msgid "Normal Text"
-msgstr "普通文本"
+#: part/katejscript.cpp:304 part/katejscript.cpp:928
+msgid "Exception, line %1: %2"
+msgstr "意外：行 %1:%2"
 
-#: part/katehighlight.cpp:1972
-msgid ""
-"<B>%1</B>: Deprecated syntax. Attribute (%2) not addressed by symbolic name<BR>"
-msgstr "<B>%1</B>：过时的格式。属性 (%2) 没有用符号名进行定位。<BR>"
+#: part/katejscript.cpp:754
+msgid "Command not found"
+msgstr "命令未找到"
 
-#: part/katehighlight.cpp:2339
-msgid "<B>%1</B>: Deprecated syntax. Context %2 has no symbolic name<BR>"
-msgstr "<B>%1</B>：过时的格式。上下文 %2 没有符号名。<BR>"
+#: part/katejscript.cpp:762 part/katejscript.cpp:897
+msgid "JavaScript file not found"
+msgstr "JavaScript 文件未找到"
 
-#: part/katehighlight.cpp:2386
-msgid ""
-"<B>%1</B>:Deprecated syntax. Context %2 not addressed by a symbolic name"
-msgstr "<B>%1</B>：过时的格式。上下文 %2 没有用符号名进行定位。"
+#. i18n: file ./data/katepartreadonlyui.rc line 39
+#: rc.cpp:12 rc.cpp:33
+#, no-c-format
+msgid "&Code Folding"
+msgstr "代码折叠(&C)"
 
-#: part/katehighlight.cpp:2501
+#. i18n: file data/4dos.xml line 9
+#: rc.cpp:44
+#, fuzzy
 msgid ""
-"There were warning(s) and/or error(s) while parsing the syntax highlighting "
-"configuration."
-msgstr "在分析语法加亮配置时产生警告和/或错误。"
-
-#: part/katehighlight.cpp:2503
-msgid "Kate Syntax Highlighting Parser"
-msgstr "Kate 语法加亮分析器"
+"_: Language\n"
+"4DOS BatchToMemory"
+msgstr "Sather"
 
-#: part/katehighlight.cpp:2654
+#. i18n: file data/4dos.xml line 9
+#: rc.cpp:46 rc.cpp:68 rc.cpp:80 rc.cpp:124 rc.cpp:128 rc.cpp:242 rc.cpp:272
+#: rc.cpp:276 rc.cpp:284 rc.cpp:356 rc.cpp:380 rc.cpp:400 rc.cpp:420
+#: rc.cpp:440 rc.cpp:464 rc.cpp:498 rc.cpp:502 rc.cpp:530 rc.cpp:550
+#: rc.cpp:638 rc.cpp:642 rc.cpp:650 rc.cpp:654 rc.cpp:686 rc.cpp:690
+#: rc.cpp:698 rc.cpp:702 rc.cpp:726 rc.cpp:754 rc.cpp:766 rc.cpp:778
+#: rc.cpp:786 rc.cpp:830 rc.cpp:834 rc.cpp:854 rc.cpp:874 rc.cpp:942
 msgid ""
-"Since there has been an error parsing the highlighting description, this "
-"highlighting will be disabled"
-msgstr "由于分析语法加亮描述时发现错误，这个加亮将被停用"
+"_: Language Section\n"
+"Scripts"
+msgstr "脚本"
 
-#: part/katehighlight.cpp:2856
+#. i18n: file data/abap.xml line 3
+#: rc.cpp:48
+#, fuzzy
 msgid ""
-"<B>%1</B>: Specified multiline comment region (%2) could not be resolved<BR>"
-msgstr "<B>%1</B>：指定的多行注释区域(%2)无法解决<BR>"
-
-#: part/katehighlight.cpp:3167
-msgid "Keyword"
-msgstr "关键字"
-
-#: part/katehighlight.cpp:3168
-msgid "Data Type"
-msgstr "数据类型"
-
-#: part/katehighlight.cpp:3169
-msgid "Decimal/Value"
-msgstr "十进制/值"
-
-#: part/katehighlight.cpp:3170
-msgid "Base-N Integer"
-msgstr "N进制整数"
-
-#: part/katehighlight.cpp:3171
-msgid "Floating Point"
-msgstr "浮点数"
-
-#: part/katehighlight.cpp:3172
-msgid "Character"
-msgstr "字符"
-
-#: part/katehighlight.cpp:3173
-msgid "String"
-msgstr "字符串"
-
-#: part/katehighlight.cpp:3175
-msgid "Others"
-msgstr "其它"
-
-#: part/katehighlight.cpp:3176
-msgid "Alert"
-msgstr "警告"
-
-#: part/katehighlight.cpp:3177
-msgid "Function"
-msgstr "函数"
-
-#: part/katehighlight.cpp:3179
-msgid "Region Marker"
-msgstr "区域标记"
-
-#: part/kateautoindent.cpp:99
-msgid "C Style"
-msgstr "C 样式"
-
-#: part/kateautoindent.cpp:101
-msgid "Python Style"
-msgstr "Python 风格"
-
-#: part/kateautoindent.cpp:103
-msgid "XML Style"
-msgstr "XML 样式"
-
-#: part/kateautoindent.cpp:105
-msgid "S&S C Style"
-msgstr "S&S C 样式"
-
-#: part/kateautoindent.cpp:107
-msgid "Variable Based Indenter"
-msgstr "基于变量的缩进"
-
-#: part/katecmds.cpp:151
-msgid "Mode must be at least 0."
-msgstr "模式必须至少为 0。"
-
-#: part/katecmds.cpp:169
-msgid "No such highlight '%1'"
-msgstr "没有高亮“%1”"
-
-#: part/katecmds.cpp:180
-msgid "Missing argument. Usage: %1 <value>"
-msgstr "缺少参数。用法：%1 <值>"
-
-#: part/katecmds.cpp:184
-msgid "Failed to convert argument '%1' to integer."
-msgstr "将参数“%1”转换为整数失败。"
-
-#: part/katecmds.cpp:190 part/katecmds.cpp:196
-msgid "Width must be at least 1."
-msgstr "宽度必须至少为 1。"
-
-#: part/katecmds.cpp:202
-msgid "Column must be at least 1."
-msgstr "列必须至少为 1。"
-
-#: part/katecmds.cpp:208
-msgid "Line must be at least 1"
-msgstr "行必须至少为 1"
-
-#: part/katecmds.cpp:210
-msgid "There is not that many lines in this document"
-msgstr "此文档中没有那么多行"
-
-#: part/katecmds.cpp:232
-msgid "Usage: %1 on|off|1|0|true|false"
-msgstr "用法：%1 on|off|1|0|true|false"
-
-#: part/katecmds.cpp:274
-msgid "Bad argument '%1'. Usage: %2 on|off|1|0|true|false"
-msgstr "错误的参数“%1”。用法：%2 on|off|1|0|true|false"
-
-#: part/katecmds.cpp:279
-msgid "Unknown command '%1'"
-msgstr "未知命令“%1”"
-
-#: part/katecmds.cpp:498
-msgid "Sorry, but Kate is not able to replace newlines, yet"
-msgstr "抱歉，Kate 尚无法替换换行"
+"_: Language\n"
+"ABAP"
+msgstr "ABC"
 
-#: part/katecmds.cpp:540
-#, c-format
+#. i18n: file data/abap.xml line 3
+#: rc.cpp:50 rc.cpp:58 rc.cpp:84 rc.cpp:140 rc.cpp:148 rc.cpp:152 rc.cpp:164
+#: rc.cpp:168 rc.cpp:178 rc.cpp:182 rc.cpp:190 rc.cpp:194 rc.cpp:212
+#: rc.cpp:260 rc.cpp:264 rc.cpp:296 rc.cpp:300 rc.cpp:304 rc.cpp:348
+#: rc.cpp:360 rc.cpp:364 rc.cpp:372 rc.cpp:376 rc.cpp:404 rc.cpp:408
+#: rc.cpp:412 rc.cpp:428 rc.cpp:452 rc.cpp:456 rc.cpp:476 rc.cpp:486
+#: rc.cpp:490 rc.cpp:494 rc.cpp:510 rc.cpp:566 rc.cpp:572 rc.cpp:576
+#: rc.cpp:592 rc.cpp:596 rc.cpp:600 rc.cpp:604 rc.cpp:608 rc.cpp:612
+#: rc.cpp:620 rc.cpp:624 rc.cpp:628 rc.cpp:674 rc.cpp:678 rc.cpp:682
+#: rc.cpp:706 rc.cpp:746 rc.cpp:758 rc.cpp:762 rc.cpp:794 rc.cpp:814
+#: rc.cpp:826 rc.cpp:902 rc.cpp:930 rc.cpp:938
 msgid ""
-"_n: 1 replacement done\n"
-"%n replacements done"
-msgstr "完成了 %n 次替换"
-
-#. i18n: file ./data/katepartreadonlyui.rc line 39
-#: rc.cpp:12 rc.cpp:33
-#, no-c-format
-msgid "&Code Folding"
-msgstr "代码折叠(&C)"
+"_: Language Section\n"
+"Sources"
+msgstr "源代码"
 
 #. i18n: file data/abc.xml line 5
-#: rc.cpp:44
+#: rc.cpp:52
 msgid ""
 "_: Language\n"
 "ABC"
 msgstr "ABC"
 
 #. i18n: file data/abc.xml line 5
-#: rc.cpp:46 rc.cpp:62 rc.cpp:110 rc.cpp:122 rc.cpp:150 rc.cpp:158 rc.cpp:162
-#: rc.cpp:170 rc.cpp:186 rc.cpp:290 rc.cpp:310 rc.cpp:318 rc.cpp:342
-#: rc.cpp:386 rc.cpp:418 rc.cpp:422
+#: rc.cpp:54 rc.cpp:72 rc.cpp:76 rc.cpp:156 rc.cpp:198 rc.cpp:206 rc.cpp:220
+#: rc.cpp:224 rc.cpp:230 rc.cpp:238 rc.cpp:268 rc.cpp:320 rc.cpp:336
+#: rc.cpp:388 rc.cpp:392 rc.cpp:396 rc.cpp:424 rc.cpp:436 rc.cpp:480
+#: rc.cpp:506 rc.cpp:518 rc.cpp:580 rc.cpp:662 rc.cpp:694 rc.cpp:734
+#: rc.cpp:742 rc.cpp:858
 msgid ""
 "_: Language Section\n"
 "Other"
 msgstr "其它"
 
 #. i18n: file data/actionscript.xml line 3
-#: rc.cpp:48
+#: rc.cpp:56
 msgid ""
 "_: Language\n"
 "ActionScript 2.0"
 msgstr "ActionScript 2.0"
 
-#. i18n: file data/actionscript.xml line 3
-#: rc.cpp:50 rc.cpp:54 rc.cpp:66 rc.cpp:98 rc.cpp:102 rc.cpp:106 rc.cpp:118
-#: rc.cpp:134 rc.cpp:138 rc.cpp:142 rc.cpp:154 rc.cpp:178 rc.cpp:182
-#: rc.cpp:206 rc.cpp:222 rc.cpp:230 rc.cpp:242 rc.cpp:246 rc.cpp:250
-#: rc.cpp:258 rc.cpp:274 rc.cpp:286 rc.cpp:294 rc.cpp:298 rc.cpp:302
-#: rc.cpp:338 rc.cpp:350 rc.cpp:354 rc.cpp:362 rc.cpp:394 rc.cpp:398
-#: rc.cpp:426 rc.cpp:434 rc.cpp:454 rc.cpp:474 rc.cpp:514 rc.cpp:530
-#: rc.cpp:534
-msgid ""
-"_: Language Section\n"
-"Sources"
-msgstr "源代码"
-
 #. i18n: file data/ada.xml line 3
-#: rc.cpp:52
+#: rc.cpp:60
 msgid ""
 "_: Language\n"
 "Ada"
 msgstr "Ada"
 
 #. i18n: file data/ahdl.xml line 3
-#: rc.cpp:56
+#: rc.cpp:62
 msgid ""
 "_: Language\n"
 "AHDL"
 msgstr "AHDL"
 
 #. i18n: file data/ahdl.xml line 3
-#: rc.cpp:58 rc.cpp:458 rc.cpp:498 rc.cpp:502
+#: rc.cpp:64 rc.cpp:798 rc.cpp:818 rc.cpp:822 rc.cpp:878 rc.cpp:882 rc.cpp:886
 msgid ""
 "_: Language Section\n"
 "Hardware"
 msgstr "硬件"
 
+#. i18n: file data/ahk.xml line 3
+#: rc.cpp:66
+#, fuzzy
+msgid ""
+"_: Language\n"
+"AutoHotKey"
+msgstr "AWK"
+
 #. i18n: file data/alert.xml line 29
-#: rc.cpp:60
+#: rc.cpp:70
 msgid ""
 "_: Language\n"
 "Alerts"
 msgstr "Alerts"
 
+#. i18n: file data/alert_indent.xml line 29
+#: rc.cpp:74
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Alerts_indent"
+msgstr "Alerts"
+
+#. i18n: file data/ample.xml line 3
+#: rc.cpp:78
+#, fuzzy
+msgid ""
+"_: Language\n"
+"AMPLE"
+msgstr "ASP"
+
 #. i18n: file data/ansic89.xml line 27
-#: rc.cpp:64
+#: rc.cpp:82
 msgid ""
 "_: Language\n"
 "ANSI C89"
 msgstr "ANSI C89"
 
+#. i18n: file data/ansys.xml line 3
+#: rc.cpp:86
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Ansys"
+msgstr "yacas"
+
+#. i18n: file data/ansys.xml line 3
+#: rc.cpp:88 rc.cpp:136 rc.cpp:246 rc.cpp:316 rc.cpp:324 rc.cpp:534 rc.cpp:538
+#: rc.cpp:542 rc.cpp:616 rc.cpp:714 rc.cpp:770 rc.cpp:846 rc.cpp:926
+msgid ""
+"_: Language Section\n"
+"Scientific"
+msgstr "科学"
+
 #. i18n: file data/apache.xml line 15
-#: rc.cpp:68
+#: rc.cpp:90
 msgid ""
 "_: Language\n"
 "Apache Configuration"
 msgstr "Apache 配置"
 
 #. i18n: file data/apache.xml line 15
-#: rc.cpp:70 rc.cpp:114 rc.cpp:166 rc.cpp:210 rc.cpp:254 rc.cpp:510
+#: rc.cpp:92 rc.cpp:120 rc.cpp:160 rc.cpp:308 rc.cpp:332 rc.cpp:340 rc.cpp:416
+#: rc.cpp:554 rc.cpp:584 rc.cpp:862 rc.cpp:866 rc.cpp:894 rc.cpp:914
 msgid ""
 "_: Language Section\n"
 "Configuration"
 msgstr "配置"
 
 #. i18n: file data/asm-avr.xml line 36
-#: rc.cpp:72
+#: rc.cpp:94
 msgid ""
 "_: Language\n"
 "AVR Assembler"
 msgstr "AVR 汇编语言"
 
 #. i18n: file data/asm-avr.xml line 36
-#: rc.cpp:74 rc.cpp:78 rc.cpp:226 rc.cpp:334 rc.cpp:346 rc.cpp:374
+#: rc.cpp:96 rc.cpp:100 rc.cpp:104 rc.cpp:108 rc.cpp:280 rc.cpp:352 rc.cpp:562
+#: rc.cpp:588 rc.cpp:646
 msgid ""
 "_: Language Section\n"
 "Assembler"
 msgstr "汇编语言"
 
+#. i18n: file data/asm-dsp56k.xml line 4
+#: rc.cpp:98
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Motorola DSP56k"
+msgstr "Matlab"
+
+#. i18n: file data/asm-m68k.xml line 4
+#: rc.cpp:102
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Motorola 68k (VASM/Devpac)"
+msgstr "Intel x86 (NASM)"
+
 #. i18n: file data/asm6502.xml line 3
-#: rc.cpp:76
+#: rc.cpp:106
 msgid ""
 "_: Language\n"
 "Asm6502"
 msgstr "Asm6502"
 
-#. i18n: file data/asp.xml line 3
-#: rc.cpp:80
+#. i18n: file data/asn1.xml line 12
+#: rc.cpp:110
+#, fuzzy
 msgid ""
 "_: Language\n"
-"ASP"
+"ASN.1"
 msgstr "ASP"
 
-#. i18n: file data/asp.xml line 3
-#: rc.cpp:82 rc.cpp:94 rc.cpp:126 rc.cpp:146 rc.cpp:174 rc.cpp:218 rc.cpp:234
-#: rc.cpp:262 rc.cpp:270 rc.cpp:278 rc.cpp:314 rc.cpp:330 rc.cpp:382
-#: rc.cpp:414 rc.cpp:446 rc.cpp:486 rc.cpp:506 rc.cpp:518 rc.cpp:522
-#: rc.cpp:526
+#. i18n: file data/asn1.xml line 12
+#: rc.cpp:112 rc.cpp:116 rc.cpp:132 rc.cpp:144 rc.cpp:174 rc.cpp:186
+#: rc.cpp:202 rc.cpp:216 rc.cpp:234 rc.cpp:252 rc.cpp:256 rc.cpp:312
+#: rc.cpp:328 rc.cpp:344 rc.cpp:368 rc.cpp:384 rc.cpp:432 rc.cpp:444
+#: rc.cpp:448 rc.cpp:460 rc.cpp:472 rc.cpp:514 rc.cpp:522 rc.cpp:526
+#: rc.cpp:546 rc.cpp:558 rc.cpp:632 rc.cpp:658 rc.cpp:666 rc.cpp:710
+#: rc.cpp:718 rc.cpp:722 rc.cpp:730 rc.cpp:738 rc.cpp:750 rc.cpp:774
+#: rc.cpp:782 rc.cpp:790 rc.cpp:838 rc.cpp:842 rc.cpp:850 rc.cpp:870
+#: rc.cpp:890 rc.cpp:898 rc.cpp:906 rc.cpp:910 rc.cpp:918 rc.cpp:922
+#: rc.cpp:934
 msgid ""
 "_: Language Section\n"
 "Markup"
 msgstr "标记语言"
 
-#. i18n: file data/awk.xml line 3
-#: rc.cpp:84
+#. i18n: file data/asp.xml line 3
+#: rc.cpp:114
 msgid ""
 "_: Language\n"
-"AWK"
-msgstr "AWK"
+"ASP"
+msgstr "ASP"
+
+#. i18n: file data/asterisk.xml line 19
+#: rc.cpp:118
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Asterisk"
+msgstr "Alerts"
 
 #. i18n: file data/awk.xml line 3
-#: rc.cpp:86 rc.cpp:90 rc.cpp:130 rc.cpp:190 rc.cpp:194 rc.cpp:238 rc.cpp:266
-#: rc.cpp:306 rc.cpp:322 rc.cpp:366 rc.cpp:370 rc.cpp:378 rc.cpp:402
-#: rc.cpp:406 rc.cpp:410 rc.cpp:430 rc.cpp:438 rc.cpp:450 rc.cpp:478
-#: rc.cpp:490 rc.cpp:494
+#: rc.cpp:122
 msgid ""
-"_: Language Section\n"
-"Scripts"
-msgstr "脚本"
+"_: Language\n"
+"AWK"
+msgstr "AWK"
 
-#. i18n: file data/bash.xml line 10
-#: rc.cpp:88
+#. i18n: file data/bash.xml line 11
+#: rc.cpp:126
 msgid ""
 "_: Language\n"
 "Bash"
 msgstr "Bash"
 
-#. i18n: file data/bibtex.xml line 3
-#: rc.cpp:92
+#. i18n: file data/bibtex.xml line 9
+#: rc.cpp:130
 msgid ""
 "_: Language\n"
 "BibTeX"
 msgstr "BibTeX"
 
+#. i18n: file data/bmethod.xml line 3
+#: rc.cpp:134
+#, fuzzy
+msgid ""
+"_: Language\n"
+"B-Method"
+msgstr "Python"
+
 #. i18n: file data/c.xml line 3
-#: rc.cpp:96
+#: rc.cpp:138
 msgid ""
 "_: Language\n"
 "C"
 msgstr "C"
 
+#. i18n: file data/ccss.xml line 9
+#: rc.cpp:142
+#, fuzzy
+msgid ""
+"_: Language\n"
+"CleanCSS"
+msgstr "CSS"
+
 #. i18n: file data/cg.xml line 23
-#: rc.cpp:100
+#: rc.cpp:146
 msgid ""
 "_: Language\n"
 "Cg"
 msgstr "Cg"
 
 #. i18n: file data/cgis.xml line 3
-#: rc.cpp:104
+#: rc.cpp:150
 msgid ""
 "_: Language\n"
 "CGiS"
 msgstr "CGiS"
 
 #. i18n: file data/changelog.xml line 3
-#: rc.cpp:108
+#: rc.cpp:154
 msgid ""
 "_: Language\n"
 "ChangeLog"
 msgstr "ChangeLog"
 
 #. i18n: file data/cisco.xml line 3
-#: rc.cpp:112
+#: rc.cpp:158
 msgid ""
 "_: Language\n"
 "Cisco"
 msgstr "Cisco"
 
 #. i18n: file data/clipper.xml line 3
-#: rc.cpp:116
+#: rc.cpp:162
 msgid ""
 "_: Language\n"
 "Clipper"
 msgstr "Clipper"
 
-#. i18n: file data/cmake.xml line 6
-#: rc.cpp:120
+#. i18n: file data/clojure.xml line 25
+#: rc.cpp:166
+#, fuzzy
 msgid ""
 "_: Language\n"
-"CMake"
-msgstr "CMake"
+"Clojure"
+msgstr "C"
+
+#. i18n: file data/coffee.xml line 4
+#: rc.cpp:170
+#, fuzzy
+msgid ""
+"_: Language\n"
+"CoffeeScript"
+msgstr "PostScript"
 
 #. i18n: file data/coldfusion.xml line 3
-#: rc.cpp:124
+#: rc.cpp:172
 msgid ""
 "_: Language\n"
 "ColdFusion"
 msgstr "ColdFusion"
 
-#. i18n: file data/commonlisp.xml line 28
-#: rc.cpp:128
+#. i18n: file data/commonlisp.xml line 26
+#: rc.cpp:176
 msgid ""
 "_: Language\n"
 "Common Lisp"
 msgstr "公共 Lisp"
 
 #. i18n: file data/component-pascal.xml line 13
-#: rc.cpp:132
+#: rc.cpp:180
 msgid ""
 "_: Language\n"
 "Component-Pascal"
 msgstr "组件 Pascal"
 
-#. i18n: file data/cpp.xml line 3
-#: rc.cpp:136
+#. i18n: file data/context.xml line 3
+#: rc.cpp:184
+#, fuzzy
+msgid ""
+"_: Language\n"
+"ConTeXt"
+msgstr "LaTeX"
+
+#. i18n: file data/crk.xml line 2
+#: rc.cpp:188
+#, fuzzy
 msgid ""
 "_: Language\n"
-"C++"
-msgstr "C++"
+"Crack"
+msgstr "CMake"
 
 #. i18n: file data/cs.xml line 2
-#: rc.cpp:140
+#: rc.cpp:192
 msgid ""
 "_: Language\n"
 "C#"
 msgstr "C#"
 
-#. i18n: file data/css.xml line 3
-#: rc.cpp:144
+#. i18n: file data/css-php.xml line 32
+#: rc.cpp:196
+#, fuzzy
+msgid ""
+"_: Language\n"
+"CSS/PHP"
+msgstr "CSS"
+
+#. i18n: file data/css.xml line 26
+#: rc.cpp:200
 msgid ""
 "_: Language\n"
 "CSS"
 msgstr "CSS"
 
 #. i18n: file data/cue.xml line 3
-#: rc.cpp:148
+#: rc.cpp:204
 msgid ""
 "_: Language\n"
 "CUE Sheet"
 msgstr "CUE 表单"
 
-#. i18n: file data/d.xml line 41
-#: rc.cpp:152
+#. i18n: file data/curry.xml line 33
+#: rc.cpp:208
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Curry"
+msgstr "C"
+
+#. i18n: file data/d.xml line 104
+#: rc.cpp:210
 msgid ""
 "_: Language\n"
 "D"
 msgstr "D"
 
+#. i18n: file data/ddoc.xml line 52
+#: rc.cpp:214
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Ddoc"
+msgstr "D"
+
 #. i18n: file data/debianchangelog.xml line 3
-#: rc.cpp:156
+#: rc.cpp:218
 msgid ""
 "_: Language\n"
 "Debian Changelog"
 msgstr "Debian Changelog"
 
 #. i18n: file data/debiancontrol.xml line 3
-#: rc.cpp:160
+#: rc.cpp:222
 msgid ""
 "_: Language\n"
 "Debian Control"
 msgstr "Debian Control"
 
 #. i18n: file data/desktop.xml line 3
-#: rc.cpp:164
+#: rc.cpp:226
 msgid ""
 "_: Language\n"
 ".desktop"
 msgstr ".desktop"
 
-#. i18n: file data/diff.xml line 15
-#: rc.cpp:168
+#. i18n: file data/diff.xml line 18
+#: rc.cpp:228
 msgid ""
 "_: Language\n"
 "Diff"
 msgstr "Diff"
 
-#. i18n: file data/doxygen.xml line 26
-#: rc.cpp:172
+#. i18n: file data/djangotemplate.xml line 7
+#: rc.cpp:232
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Django HTML Template"
+msgstr "HTML"
+
+#. i18n: file data/dockerfile.xml line 4
+#: rc.cpp:236
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Dockerfile"
+msgstr "Makefile"
+
+#. i18n: file data/dosbat.xml line 11
+#: rc.cpp:240
+#, fuzzy
+msgid ""
+"_: Language\n"
+"MS-DOS Batch"
+msgstr "MAB-DB"
+
+#. i18n: file data/dot.xml line 4
+#: rc.cpp:244
+#, fuzzy
+msgid ""
+"_: Language\n"
+"dot"
+msgstr "Ada"
+
+#. i18n: file data/doxygen.xml line 31
+#: rc.cpp:248
 msgid ""
 "_: Language\n"
 "Doxygen"
 msgstr "Doxygen"
 
+#. i18n: file data/doxygenlua.xml line 30
+#: rc.cpp:250
+#, fuzzy
+msgid ""
+"_: Language\n"
+"DoxygenLua"
+msgstr "Doxygen"
+
+#. i18n: file data/dtd.xml line 6
+#: rc.cpp:254
+#, fuzzy
+msgid ""
+"_: Language\n"
+"DTD"
+msgstr "D"
+
 #. i18n: file data/e.xml line 3
-#: rc.cpp:176
+#: rc.cpp:258
 msgid ""
 "_: Language\n"
 "E Language"
 msgstr "E 语言"
 
 #. i18n: file data/eiffel.xml line 13
-#: rc.cpp:180
+#: rc.cpp:262
 msgid ""
 "_: Language\n"
 "Eiffel"
 msgstr "Eiffel"
 
 #. i18n: file data/email.xml line 6
-#: rc.cpp:184
+#: rc.cpp:266
 msgid ""
 "_: Language\n"
 "Email"
 msgstr "Email"
 
+#. i18n: file data/erlang.xml line 39
+#: rc.cpp:270
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Erlang"
+msgstr "Prolog"
+
 #. i18n: file data/euphoria.xml line 32
-#: rc.cpp:188
+#: rc.cpp:274
 msgid ""
 "_: Language\n"
 "Euphoria"
 msgstr "Euphoria"
 
+#. i18n: file data/fasm.xml line 16
+#: rc.cpp:278
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Intel x86 (FASM)"
+msgstr "Intel x86 (NASM)"
+
 #. i18n: file data/ferite.xml line 3
-#: rc.cpp:192
+#: rc.cpp:282
 msgid ""
 "_: Language\n"
 "ferite"
 msgstr "ferite"
 
 #. i18n: file data/fgl-4gl.xml line 3
-#: rc.cpp:196
+#: rc.cpp:286
 msgid ""
 "_: Language\n"
 "4GL"
 msgstr "4GL"
 
 #. i18n: file data/fgl-4gl.xml line 3
-#: rc.cpp:198 rc.cpp:202 rc.cpp:282 rc.cpp:390 rc.cpp:462 rc.cpp:466
-#: rc.cpp:470
+#: rc.cpp:288 rc.cpp:292 rc.cpp:468 rc.cpp:670 rc.cpp:802 rc.cpp:806
+#: rc.cpp:810
 msgid ""
 "_: Language Section\n"
 "Database"
 msgstr "数据库"
 
 #. i18n: file data/fgl-per.xml line 3
-#: rc.cpp:200
+#: rc.cpp:290
 msgid ""
 "_: Language\n"
 "4GL-PER"
 msgstr "4GL-PER"
 
 #. i18n: file data/fortran.xml line 3
-#: rc.cpp:204
+#: rc.cpp:294
 msgid ""
 "_: Language\n"
 "Fortran"
 msgstr "Fortran"
 
+#. i18n: file data/freebasic.xml line 3
+#: rc.cpp:298
+#, fuzzy
+msgid ""
+"_: Language\n"
+"FreeBASIC"
+msgstr "ANSI C89"
+
+#. i18n: file data/fsharp.xml line 12
+#: rc.cpp:302
+#, fuzzy
+msgid ""
+"_: Language\n"
+"FSharp"
+msgstr "Sather"
+
 #. i18n: file data/fstab.xml line 4
-#: rc.cpp:208
+#: rc.cpp:306
 msgid ""
 "_: Language\n"
 "fstab"
 msgstr "fstab"
 
-#. i18n: file data/gdl.xml line 3
-#: rc.cpp:212
+#. i18n: file data/ftl.xml line 3
+#: rc.cpp:310
+#, fuzzy
 msgid ""
 "_: Language\n"
-"GDL"
-msgstr "GDL"
+"FTL"
+msgstr "HTML"
+
+#. i18n: file data/gap.xml line 17
+#: rc.cpp:314
+#, fuzzy
+msgid ""
+"_: Language\n"
+"GAP"
+msgstr "ASP"
+
+#. i18n: file data/gdb.xml line 10
+#: rc.cpp:318
+#, fuzzy
+msgid ""
+"_: Language\n"
+"GDB Backtrace"
+msgstr "Octave"
 
 #. i18n: file data/gdl.xml line 3
-#: rc.cpp:214 rc.cpp:326 rc.cpp:358 rc.cpp:442 rc.cpp:482
+#: rc.cpp:322
 msgid ""
-"_: Language Section\n"
-"Scientific"
-msgstr "科学"
+"_: Language\n"
+"GDL"
+msgstr "GDL"
 
-#. i18n: file data/gettext.xml line 24
-#: rc.cpp:216
+#. i18n: file data/gettext.xml line 26
+#: rc.cpp:326
 msgid ""
 "_: Language\n"
 "GNU Gettext"
 msgstr "GNU Gettext"
 
+#. i18n: file data/git-ignore.xml line 3
+#: rc.cpp:330
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Git Ignore"
+msgstr "Inform"
+
+#. i18n: file data/git-rebase.xml line 3
+#: rc.cpp:334
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Git Rebase"
+msgstr "Sieve"
+
+#. i18n: file data/gitolite.xml line 3
+#: rc.cpp:338
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Gitolite"
+msgstr "ferite"
+
+#. i18n: file data/glosstex.xml line 3
+#: rc.cpp:342
+#, fuzzy
+msgid ""
+"_: Language\n"
+"GlossTex"
+msgstr "LaTeX"
+
 #. i18n: file data/glsl.xml line 3
-#: rc.cpp:220
+#: rc.cpp:346
 msgid ""
 "_: Language\n"
 "GLSL"
 msgstr "GLSL"
 
-#. i18n: file data/gnuassembler.xml line 42
-#: rc.cpp:224
+#. i18n: file data/gnuassembler.xml line 46
+#: rc.cpp:350
 msgid ""
 "_: Language\n"
 "GNU Assembler"
 msgstr "GNU 汇编语言"
 
-#. i18n: file data/haskell.xml line 4
-#: rc.cpp:228
+#. i18n: file data/gnuplot.xml line 3
+#: rc.cpp:354
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Gnuplot"
+msgstr "xslt"
+
+#. i18n: file data/go.xml line 29
+#: rc.cpp:358
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Go"
+msgstr "GDL"
+
+#. i18n: file data/grammar.xml line 6
+#: rc.cpp:362
+#, fuzzy
+msgid ""
+"_: Language\n"
+"KDev-PG[-Qt] Grammar"
+msgstr "Stata"
+
+#. i18n: file data/haml.xml line 3
+#: rc.cpp:366
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Haml"
+msgstr "Haskell"
+
+#. i18n: file data/haskell.xml line 3
+#: rc.cpp:370
 msgid ""
 "_: Language\n"
 "Haskell"
 msgstr "Haskell"
 
+#. i18n: file data/haxe.xml line 15
+#: rc.cpp:374
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Haxe"
+msgstr "Haskell"
+
+#. i18n: file data/html-php.xml line 13
+#: rc.cpp:378
+#, fuzzy
+msgid ""
+"_: Language\n"
+"PHP (HTML)"
+msgstr "HTML"
+
 #. i18n: file data/html.xml line 7
-#: rc.cpp:232
+#: rc.cpp:382
 msgid ""
 "_: Language\n"
 "HTML"
 msgstr "HTML"
 
+#. i18n: file data/hunspell-aff.xml line 3
+#: rc.cpp:386
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Hunspell Affix File"
+msgstr "Haskell"
+
+#. i18n: file data/hunspell-dat.xml line 3
+#: rc.cpp:390
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Hunspell Thesaurus File"
+msgstr "Haskell"
+
+#. i18n: file data/hunspell-dic.xml line 3
+#: rc.cpp:394
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Hunspell Dictionary File"
+msgstr "硬件"
+
 #. i18n: file data/idconsole.xml line 3
-#: rc.cpp:236
+#: rc.cpp:398
 msgid ""
 "_: Language\n"
 "Quake Script"
 msgstr "Quake 脚本"
 
 #. i18n: file data/idl.xml line 3
-#: rc.cpp:240
+#: rc.cpp:402
 msgid ""
 "_: Language\n"
 "IDL"
 msgstr "IDL"
 
 #. i18n: file data/ilerpg.xml line 48
-#: rc.cpp:244
+#: rc.cpp:406
 msgid ""
 "_: Language\n"
 "ILERPG"
 msgstr "ILERPG"
 
-#. i18n: file data/inform.xml line 6
-#: rc.cpp:248
+#. i18n: file data/inform.xml line 5
+#: rc.cpp:410
 msgid ""
 "_: Language\n"
 "Inform"
 msgstr "Inform"
 
 #. i18n: file data/ini.xml line 3
-#: rc.cpp:252
+#: rc.cpp:414
 msgid ""
 "_: Language\n"
 "INI Files"
 msgstr "INI 文件"
 
+#. i18n: file data/j.xml line 27
+#: rc.cpp:418
+#, fuzzy
+msgid ""
+"_: Language\n"
+"J"
+msgstr "JSP"
+
+#. i18n: file data/jam.xml line 24
+#: rc.cpp:422
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Jam"
+msgstr "Java"
+
 #. i18n: file data/java.xml line 3
-#: rc.cpp:256
+#: rc.cpp:426
 msgid ""
 "_: Language\n"
 "Java"
 msgstr "Java"
 
 #. i18n: file data/javadoc.xml line 3
-#: rc.cpp:260
+#: rc.cpp:430
 msgid ""
 "_: Language\n"
 "Javadoc"
 msgstr "Javadoc"
 
+#. i18n: file data/javascript-php.xml line 12
+#: rc.cpp:434
+#, fuzzy
+msgid ""
+"_: Language\n"
+"JavaScript/PHP"
+msgstr "JavaScript"
+
 #. i18n: file data/javascript.xml line 6
-#: rc.cpp:264
+#: rc.cpp:438
 msgid ""
 "_: Language\n"
 "JavaScript"
 msgstr "JavaScript"
 
+#. i18n: file data/json.xml line 15
+#: rc.cpp:442
+#, fuzzy
+msgid ""
+"_: Language\n"
+"JSON"
+msgstr "JSP"
+
 #. i18n: file data/jsp.xml line 3
-#: rc.cpp:268
+#: rc.cpp:446
 msgid ""
 "_: Language\n"
 "JSP"
 msgstr "JSP"
 
+#. i18n: file data/julia.xml line 32
+#: rc.cpp:450
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Julia"
+msgstr "Lua"
+
 #. i18n: file data/kbasic.xml line 3
-#: rc.cpp:272
+#: rc.cpp:454
 msgid ""
 "_: Language\n"
 "KBasic"
 msgstr "KBasic"
 
 #. i18n: file data/latex.xml line 3
-#: rc.cpp:276
+#: rc.cpp:458
 msgid ""
 "_: Language\n"
 "LaTeX"
 msgstr "LaTeX"
 
+#. i18n: file data/ld.xml line 4
+#: rc.cpp:462
+#, fuzzy
+msgid ""
+"_: Language\n"
+"GNU Linker Script"
+msgstr "Quake 脚本"
+
 #. i18n: file data/ldif.xml line 3
-#: rc.cpp:280
+#: rc.cpp:466
 msgid ""
 "_: Language\n"
 "LDIF"
 msgstr "LDIF"
 
-#. i18n: file data/lex.xml line 23
-#: rc.cpp:284
+#. i18n: file data/less.xml line 3
+#: rc.cpp:470
+#, fuzzy
+msgid ""
+"_: Language\n"
+"LESSCSS"
+msgstr "CSS"
+
+#. i18n: file data/lex.xml line 21
+#: rc.cpp:474
 msgid ""
 "_: Language\n"
 "Lex/Flex"
 msgstr "Lex/Flex"
 
-#. i18n: file data/lilypond.xml line 27
-#: rc.cpp:288
+#. i18n: file data/lilypond.xml line 23
+#: rc.cpp:478
 msgid ""
 "_: Language\n"
 "LilyPond"
 msgstr "LilyPond"
 
+#. i18n: file data/literate-curry.xml line 3
+#: rc.cpp:482
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Literate Curry"
+msgstr "Literate Haskell"
+
 #. i18n: file data/literate-haskell.xml line 3
-#: rc.cpp:292
+#: rc.cpp:484
 msgid ""
 "_: Language\n"
 "Literate Haskell"
 msgstr "Literate Haskell"
 
 #. i18n: file data/logtalk.xml line 4
-#: rc.cpp:296
+#: rc.cpp:488
 msgid ""
 "_: Language\n"
 "Logtalk"
 msgstr "Logtalk"
 
 #. i18n: file data/lpc.xml line 19
-#: rc.cpp:300
+#: rc.cpp:492
 msgid ""
 "_: Language\n"
 "LPC"
 msgstr "LPC"
 
-#. i18n: file data/lua.xml line 3
-#: rc.cpp:304
+#. i18n: file data/lsl.xml line 14
+#: rc.cpp:496
+#, fuzzy
+msgid ""
+"_: Language\n"
+"LSL"
+msgstr "GLSL"
+
+#. i18n: file data/lua.xml line 38
+#: rc.cpp:500
 msgid ""
 "_: Language\n"
 "Lua"
 msgstr "Lua"
 
-#. i18n: file data/m3u.xml line 14
-#: rc.cpp:308
+#. i18n: file data/m3u.xml line 17
+#: rc.cpp:504
 msgid ""
 "_: Language\n"
 "M3U"
 msgstr "M3U"
 
+#. i18n: file data/m4.xml line 41
+#: rc.cpp:508
+#, fuzzy
+msgid ""
+"_: Language\n"
+"GNU M4"
+msgstr "SGML"
+
 #. i18n: file data/mab.xml line 3
-#: rc.cpp:312
+#: rc.cpp:512
 msgid ""
 "_: Language\n"
 "MAB-DB"
 msgstr "MAB-DB"
 
-#. i18n: file data/makefile.xml line 5
-#: rc.cpp:316
+#. i18n: file data/makefile.xml line 10
+#: rc.cpp:516
 msgid ""
 "_: Language\n"
 "Makefile"
 msgstr "Makefile"
 
+#. i18n: file data/mako.xml line 7
+#: rc.cpp:520
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Mako"
+msgstr "Mason"
+
+#. i18n: file data/mandoc.xml line 3
+#: rc.cpp:524
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Troff Mandoc"
+msgstr "Javadoc"
+
 #. i18n: file data/mason.xml line 3
-#: rc.cpp:320
+#: rc.cpp:528
 msgid ""
 "_: Language\n"
 "Mason"
 msgstr "Mason"
 
-#. i18n: file data/matlab.xml line 58
-#: rc.cpp:324
+#. i18n: file data/mathematica.xml line 3
+#: rc.cpp:532
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Mathematica"
+msgstr "Stata"
+
+#. i18n: file data/matlab.xml line 60
+#: rc.cpp:536
 msgid ""
 "_: Language\n"
 "Matlab"
 msgstr "Matlab"
 
-#. i18n: file data/mediawiki.xml line 3
-#: rc.cpp:328
+#. i18n: file data/maxima.xml line 24
+#: rc.cpp:540
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Maxima"
+msgstr "Matlab"
+
+#. i18n: file data/mediawiki.xml line 7
+#: rc.cpp:544
 msgid ""
 "_: Language\n"
 "MediaWiki"
 msgstr "MediaWiki"
 
+#. i18n: file data/mel.xml line 23
+#: rc.cpp:548
+#, fuzzy
+msgid ""
+"_: Language\n"
+"MEL"
+msgstr "SML"
+
+#. i18n: file data/mergetagtext.xml line 28
+#: rc.cpp:552
+#, fuzzy
+msgid ""
+"_: Language\n"
+"mergetag text"
+msgstr "GNU Gettext"
+
+#. i18n: file data/metafont.xml line 9
+#: rc.cpp:556
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Metapost/Metafont"
+msgstr "Mason"
+
 #. i18n: file data/mips.xml line 3
-#: rc.cpp:332
+#: rc.cpp:560
 msgid ""
 "_: Language\n"
 "MIPS Assembler"
 msgstr "MIPS 汇编语言"
 
+#. i18n: file data/modelica.xml line 19
+#: rc.cpp:564
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Modelica"
+msgstr "Modula-2"
+
+#. i18n: file data/modelines.xml line 10
+#: rc.cpp:568
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Modelines"
+msgstr "Mason"
+
 #. i18n: file data/modula-2.xml line 3
-#: rc.cpp:336
+#: rc.cpp:570
 msgid ""
 "_: Language\n"
 "Modula-2"
 msgstr "Modula-2"
 
+#. i18n: file data/monobasic.xml line 13
+#: rc.cpp:574
+#, fuzzy
+msgid ""
+"_: Language\n"
+"MonoBasic"
+msgstr "KBasic"
+
 #. i18n: file data/mup.xml line 3
-#: rc.cpp:340
+#: rc.cpp:578
 msgid ""
 "_: Language\n"
 "Music Publisher"
 msgstr "Music Publisher"
 
-#. i18n: file data/nasm.xml line 31
-#: rc.cpp:344
+#. i18n: file data/nagios.xml line 3
+#: rc.cpp:582
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Nagios"
+msgstr "Bash"
+
+#. i18n: file data/nasm.xml line 43
+#: rc.cpp:586
 msgid ""
 "_: Language\n"
 "Intel x86 (NASM)"
 msgstr "Intel x86 (NASM)"
 
+#. i18n: file data/nemerle.xml line 4
+#: rc.cpp:590
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Nemerle"
+msgstr "Perl"
+
+#. i18n: file data/nesc.xml line 3
+#: rc.cpp:594
+#, fuzzy
+msgid ""
+"_: Language\n"
+"nesC"
+msgstr "C"
+
+#. i18n: file data/noweb.xml line 3
+#: rc.cpp:598
+#, fuzzy
+msgid ""
+"_: Language\n"
+"noweb"
+msgstr "C"
+
 #. i18n: file data/objectivec.xml line 3
-#: rc.cpp:348
+#: rc.cpp:602
 msgid ""
 "_: Language\n"
 "Objective-C"
 msgstr "Objective-C"
 
-#. i18n: file data/ocaml.xml line 11
-#: rc.cpp:352
+#. i18n: file data/objectivecpp.xml line 3
+#: rc.cpp:606
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Objective-C++"
+msgstr "Objective-C"
+
+#. i18n: file data/ocaml.xml line 12
+#: rc.cpp:610
 msgid ""
 "_: Language\n"
 "Objective Caml"
 msgstr "Objective Caml"
 
 #. i18n: file data/octave.xml line 18
-#: rc.cpp:356
+#: rc.cpp:614
 msgid ""
 "_: Language\n"
 "Octave"
 msgstr "Octave"
 
+#. i18n: file data/oors.xml line 3
+#: rc.cpp:618
+#, fuzzy
+msgid ""
+"_: Language\n"
+"OORS"
+msgstr "ASP"
+
+#. i18n: file data/opal.xml line 3
+#: rc.cpp:622
+#, fuzzy
+msgid ""
+"_: Language\n"
+"OPAL"
+msgstr "AHDL"
+
+#. i18n: file data/opencl.xml line 3
+#: rc.cpp:626
+#, fuzzy
+msgid ""
+"_: Language\n"
+"OpenCL"
+msgstr "C"
+
+#. i18n: file data/pango.xml line 3
+#: rc.cpp:630
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Pango"
+msgstr "ChangeLog"
+
 #. i18n: file data/pascal.xml line 3
-#: rc.cpp:360
+#: rc.cpp:634
 msgid ""
 "_: Language\n"
 "Pascal"
 msgstr "Pascal"
 
 #. i18n: file data/perl.xml line 42
-#: rc.cpp:364
+#: rc.cpp:636
 msgid ""
 "_: Language\n"
 "Perl"
 msgstr "Perl"
 
-#. i18n: file data/php.xml line 21
-#: rc.cpp:368
+#. i18n: file data/php.xml line 67
+#: rc.cpp:640
 msgid ""
 "_: Language\n"
 "PHP/PHP"
 msgstr "PHP/PHP"
 
 #. i18n: file data/picsrc.xml line 11
-#: rc.cpp:372
+#: rc.cpp:644
 msgid ""
 "_: Language\n"
 "PicAsm"
 msgstr "PicAsm"
 
+#. i18n: file data/pig.xml line 4
+#: rc.cpp:648
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Pig"
+msgstr "Pike"
+
 #. i18n: file data/pike.xml line 4
-#: rc.cpp:376
+#: rc.cpp:652
 msgid ""
 "_: Language\n"
 "Pike"
 msgstr "Pike"
 
 #. i18n: file data/postscript.xml line 3
-#: rc.cpp:380
+#: rc.cpp:656
 msgid ""
 "_: Language\n"
 "PostScript"
 msgstr "PostScript"
 
-#. i18n: file data/povray.xml line 7
-#: rc.cpp:384
+#. i18n: file data/povray.xml line 9
+#: rc.cpp:660
 msgid ""
 "_: Language\n"
 "POV-Ray"
 msgstr "POV-Ray"
 
+#. i18n: file data/ppd.xml line 12
+#: rc.cpp:664
+#, fuzzy
+msgid ""
+"_: Language\n"
+"PostScript Printer Description"
+msgstr "PostScript"
+
 #. i18n: file data/progress.xml line 3
-#: rc.cpp:388
+#: rc.cpp:668
 msgid ""
 "_: Language\n"
 "progress"
 msgstr "Progress"
 
-#. i18n: file data/prolog.xml line 3
-#: rc.cpp:392
+#. i18n: file data/prolog.xml line 107
+#: rc.cpp:672
 msgid ""
 "_: Language\n"
 "Prolog"
 msgstr "Prolog"
 
+#. i18n: file data/protobuf.xml line 3
+#: rc.cpp:676
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Protobuf"
+msgstr "Prolog"
+
 #. i18n: file data/purebasic.xml line 3
-#: rc.cpp:396
+#: rc.cpp:680
 msgid ""
 "_: Language\n"
 "PureBasic"
 msgstr "PureBasic"
 
-#. i18n: file data/python.xml line 4
-#: rc.cpp:400
+#. i18n: file data/python.xml line 16
+#: rc.cpp:684
 msgid ""
 "_: Language\n"
 "Python"
 msgstr "Python"
 
-#. i18n: file data/r.xml line 11
-#: rc.cpp:404
+#. i18n: file data/q.xml line 3
+#: rc.cpp:688
+#, fuzzy
+msgid ""
+"_: Language\n"
+"q"
+msgstr "C"
+
+#. i18n: file data/qmake.xml line 3
+#: rc.cpp:692
+#, fuzzy
+msgid ""
+"_: Language\n"
+"QMake"
+msgstr "CMake"
+
+#. i18n: file data/qml.xml line 4
+#: rc.cpp:696
+#, fuzzy
+msgid ""
+"_: Language\n"
+"QML"
+msgstr "SML"
+
+#. i18n: file data/r.xml line 10
+#: rc.cpp:700
 msgid ""
 "_: Language\n"
 "R Script"
 msgstr "R 脚本"
 
+#. i18n: file data/rapidq.xml line 3
+#: rc.cpp:704
+#, fuzzy
+msgid ""
+"_: Language\n"
+"RapidQ"
+msgstr "Email"
+
+#. i18n: file data/relaxngcompact.xml line 3
+#: rc.cpp:708
+#, fuzzy
+msgid ""
+"_: Language\n"
+"RelaxNG-Compact"
+msgstr "Velocity"
+
+#. i18n: file data/replicode.xml line 14
+#: rc.cpp:712
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Replicode"
+msgstr "Spice"
+
+#. i18n: file data/rest.xml line 14
+#: rc.cpp:716
+#, fuzzy
+msgid ""
+"_: Language\n"
+"reStructuredText"
+msgstr "GNU Gettext"
+
+#. i18n: file data/restructuredtext.xml line 3
+#: rc.cpp:720
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Restructured Text"
+msgstr "GNU Gettext"
+
 #. i18n: file data/rexx.xml line 3
-#: rc.cpp:408
+#: rc.cpp:724
 msgid ""
 "_: Language\n"
 "REXX"
 msgstr "REXX"
 
 #. i18n: file data/rhtml.xml line 47
-#: rc.cpp:412
+#: rc.cpp:728
 msgid ""
 "_: Language\n"
 "Ruby/Rails/RHTML"
 msgstr "Ruby/Rails/RHTML"
 
 #. i18n: file data/rib.xml line 8
-#: rc.cpp:416
+#: rc.cpp:732
 msgid ""
 "_: Language\n"
 "RenderMan RIB"
 msgstr "RenderMan RIB"
 
-#. i18n: file data/rpmspec.xml line 3
-#: rc.cpp:420
+#. i18n: file data/roff.xml line 10
+#: rc.cpp:736
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Roff"
+msgstr "Diff"
+
+#. i18n: file data/rpmspec.xml line 11
+#: rc.cpp:740
 msgid ""
 "_: Language\n"
 "RPM Spec"
 msgstr "RPM Spec"
 
 #. i18n: file data/rsiidl.xml line 3
-#: rc.cpp:424
+#: rc.cpp:744
 msgid ""
 "_: Language\n"
 "RSI IDL"
 msgstr "RSI IDL"
 
+#. i18n: file data/rtf.xml line 3
+#: rc.cpp:748
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Rich Text Format"
+msgstr "Scheme"
+
 #. i18n: file data/ruby.xml line 33
-#: rc.cpp:428
+#: rc.cpp:752
 msgid ""
 "_: Language\n"
 "Ruby"
 msgstr "Ruby"
 
 #. i18n: file data/sather.xml line 3
-#: rc.cpp:432
+#: rc.cpp:756
 msgid ""
 "_: Language\n"
 "Sather"
 msgstr "Sather"
 
+#. i18n: file data/scala.xml line 3
+#: rc.cpp:760
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Scala"
+msgstr "Stata"
+
 #. i18n: file data/scheme.xml line 43
-#: rc.cpp:436
+#: rc.cpp:764
 msgid ""
 "_: Language\n"
 "Scheme"
 msgstr "Scheme"
 
 #. i18n: file data/sci.xml line 3
-#: rc.cpp:440
+#: rc.cpp:768
 msgid ""
 "_: Language\n"
 "scilab"
 msgstr "scilab"
 
+#. i18n: file data/scss.xml line 28
+#: rc.cpp:772
+#, fuzzy
+msgid ""
+"_: Language\n"
+"SCSS"
+msgstr "CSS"
+
+#. i18n: file data/sed.xml line 3
+#: rc.cpp:776
+#, fuzzy
+msgid ""
+"_: Language\n"
+"sed"
+msgstr "Ada"
+
 #. i18n: file data/sgml.xml line 3
-#: rc.cpp:444
+#: rc.cpp:780
 msgid ""
 "_: Language\n"
 "SGML"
 msgstr "SGML"
 
 #. i18n: file data/sieve.xml line 4
-#: rc.cpp:448
+#: rc.cpp:784
 msgid ""
 "_: Language\n"
 "Sieve"
 msgstr "Sieve"
 
+#. i18n: file data/sisu.xml line 3
+#: rc.cpp:788
+#, fuzzy
+msgid ""
+"_: Language\n"
+"SiSU"
+msgstr "CSS"
+
 #. i18n: file data/sml.xml line 3
-#: rc.cpp:452
+#: rc.cpp:792
 msgid ""
 "_: Language\n"
 "SML"
 msgstr "SML"
 
 #. i18n: file data/spice.xml line 4
-#: rc.cpp:456
+#: rc.cpp:796
 msgid ""
 "_: Language\n"
 "Spice"
 msgstr "Spice"
 
 #. i18n: file data/sql-mysql.xml line 8
-#: rc.cpp:460
+#: rc.cpp:800
 msgid ""
 "_: Language\n"
 "SQL (MySQL)"
 msgstr "SQL(MySQL)"
 
 #. i18n: file data/sql-postgresql.xml line 4
-#: rc.cpp:464
+#: rc.cpp:804
 msgid ""
 "_: Language\n"
 "SQL (PostgreSQL)"
 msgstr "SQL(PostgreSQL)"
 
 #. i18n: file data/sql.xml line 6
-#: rc.cpp:468
+#: rc.cpp:808
 msgid ""
 "_: Language\n"
 "SQL"
 msgstr "SQL"
 
 #. i18n: file data/stata.xml line 3
-#: rc.cpp:472
+#: rc.cpp:812
 msgid ""
 "_: Language\n"
 "Stata"
 msgstr "Stata"
 
-#. i18n: file data/tcl.xml line 8
-#: rc.cpp:476
+#. i18n: file data/systemc.xml line 10
+#: rc.cpp:816
+#, fuzzy
+msgid ""
+"_: Language\n"
+"SystemC"
+msgstr "C"
+
+#. i18n: file data/systemverilog.xml line 42
+#: rc.cpp:820
+#, fuzzy
+msgid ""
+"_: Language\n"
+"SystemVerilog"
+msgstr "Verilog"
+
+#. i18n: file data/tads3.xml line 5
+#: rc.cpp:824
+#, fuzzy
+msgid ""
+"_: Language\n"
+"TADS 3"
+msgstr "ASP"
+
+#. i18n: file data/tcl.xml line 31
+#: rc.cpp:828
 msgid ""
 "_: Language\n"
 "Tcl/Tk"
 msgstr "Tcl/Tk"
 
+#. i18n: file data/tcsh.xml line 11
+#: rc.cpp:832
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Tcsh"
+msgstr "Bash"
+
+#. i18n: file data/texinfo.xml line 3
+#: rc.cpp:836
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Texinfo"
+msgstr "Inform"
+
+#. i18n: file data/textile.xml line 18
+#: rc.cpp:840
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Textile"
+msgstr "Lex/Flex"
+
 #. i18n: file data/tibasic.xml line 3
-#: rc.cpp:480
+#: rc.cpp:844
 msgid ""
 "_: Language\n"
 "TI Basic"
 msgstr "TI Basic"
 
-#. i18n: file data/txt2tags.xml line 5
-#: rc.cpp:484
+#. i18n: file data/txt2tags.xml line 6
+#: rc.cpp:848
 msgid ""
 "_: Language\n"
 "txt2tags"
 msgstr "txt2tags"
 
 #. i18n: file data/uscript.xml line 3
-#: rc.cpp:488
+#: rc.cpp:852
 msgid ""
 "_: Language\n"
 "UnrealScript"
 msgstr "UnrealScript"
 
+#. i18n: file data/valgrind-suppression.xml line 3
+#: rc.cpp:856
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Valgrind Suppression"
+msgstr "ColdFusion"
+
+#. i18n: file data/varnish.xml line 3
+#: rc.cpp:860
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Varnish Configuration Language"
+msgstr "Apache 配置"
+
+#. i18n: file data/varnishtest.xml line 3
+#: rc.cpp:864
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Varnish Test Case language"
+msgstr "E 语言"
+
+#. i18n: file data/vcard.xml line 5
+#: rc.cpp:868
+msgid ""
+"_: Language\n"
+"vCard, vCalendar, iCalendar"
+msgstr ""
+
 #. i18n: file data/velocity.xml line 3
-#: rc.cpp:492
+#: rc.cpp:872
 msgid ""
 "_: Language\n"
 "Velocity"
 msgstr "Velocity"
 
+#. i18n: file data/vera.xml line 42
+#: rc.cpp:876
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Vera"
+msgstr "Perl"
+
 #. i18n: file data/verilog.xml line 3
-#: rc.cpp:496
+#: rc.cpp:880
 msgid ""
 "_: Language\n"
 "Verilog"
 msgstr "Verilog"
 
-#. i18n: file data/vhdl.xml line 3
-#: rc.cpp:500
+#. i18n: file data/vhdl.xml line 14
+#: rc.cpp:884
 msgid ""
 "_: Language\n"
 "VHDL"
 msgstr "VHDL"
 
 #. i18n: file data/vrml.xml line 3
-#: rc.cpp:504
+#: rc.cpp:888
 msgid ""
 "_: Language\n"
 "VRML"
 msgstr "VRML"
 
 #. i18n: file data/winehq.xml line 3
-#: rc.cpp:508
+#: rc.cpp:892
 msgid ""
 "_: Language\n"
 "WINE Config"
 msgstr "WINE Config"
 
+#. i18n: file data/wml.xml line 57
+#: rc.cpp:896
+#, fuzzy
+msgid ""
+"_: Language\n"
+"Wesnoth Markup Language"
+msgstr "E 语言"
+
 #. i18n: file data/xharbour.xml line 3
-#: rc.cpp:512
+#: rc.cpp:900
 msgid ""
 "_: Language\n"
 "xHarbour"
 msgstr "xHarbour"
 
-#. i18n: file data/xml.xml line 7
-#: rc.cpp:516
+#. i18n: file data/xml.xml line 9
+#: rc.cpp:904
 msgid ""
 "_: Language\n"
 "XML"
 msgstr "XML"
 
 #. i18n: file data/xmldebug.xml line 3
-#: rc.cpp:520
+#: rc.cpp:908
 msgid ""
 "_: Language\n"
 "XML (Debug)"
 msgstr "XML (Debug)"
 
-#. i18n: file data/xslt.xml line 53
-#: rc.cpp:524
+#. i18n: file data/xorg.xml line 3
+#: rc.cpp:912
+#, fuzzy
+msgid ""
+"_: Language\n"
+"x.org Configuration"
+msgstr "Apache 配置"
+
+#. i18n: file data/xslt.xml line 55
+#: rc.cpp:916
 msgid ""
 "_: Language\n"
 "xslt"
 msgstr "xslt"
 
+#. i18n: file data/xul.xml line 7
+#: rc.cpp:920
+#, fuzzy
+msgid ""
+"_: Language\n"
+"XUL"
+msgstr "XML"
+
 #. i18n: file data/yacas.xml line 3
-#: rc.cpp:528
+#: rc.cpp:924
 msgid ""
 "_: Language\n"
 "yacas"
 msgstr "yacas"
 
-#. i18n: file data/yacc.xml line 23
-#: rc.cpp:532
+#. i18n: file data/yacc.xml line 28
+#: rc.cpp:928
 msgid ""
 "_: Language\n"
 "Yacc/Bison"
 msgstr "Yacc/Bison"
 
-#: plugins/wordcompletion/docwordcompletion.cpp:109
-msgid "Word Completion Plugin"
-msgstr "单词补全插件"
-
-#: plugins/wordcompletion/docwordcompletion.cpp:114
-msgid "Configure the Word Completion Plugin"
-msgstr "配置单词补全插件"
-
-#: plugins/wordcompletion/docwordcompletion.cpp:148
-msgid "Reuse Word Above"
-msgstr "重用前面的单词"
-
-#: plugins/wordcompletion/docwordcompletion.cpp:150
-msgid "Reuse Word Below"
-msgstr "重用后面的单词"
-
-#: plugins/wordcompletion/docwordcompletion.cpp:152
-msgid "Pop Up Completion List"
-msgstr "弹出补全列表"
-
-#: plugins/wordcompletion/docwordcompletion.cpp:154
-msgid "Shell Completion"
-msgstr "Shell 补全"
-
-#: plugins/wordcompletion/docwordcompletion.cpp:156
-msgid "Automatic Completion Popup"
-msgstr "自动补全弹出"
-
-#: plugins/wordcompletion/docwordcompletion.cpp:498
-msgid "Automatically &show completion list"
-msgstr "自动显示补全列表(&S)"
-
-#: plugins/wordcompletion/docwordcompletion.cpp:511
-msgid ""
-"_: Translators: This is the first part of two strings wich will comprise the "
-"sentence 'Show completions when a word is at least N characters'. The first "
-"part is on the right side of the N, which is represented by a spinbox widget, "
-"followed by the second part: 'characters long'. Characters is a ingeger number "
-"between and including 1 and 30. Feel free to leave the second part of the "
-"sentence blank if it suits your language better. \n"
-"Show completions &when a word is at least"
-msgstr "显示补全要求单词至少有(&W)"
-
-#: plugins/wordcompletion/docwordcompletion.cpp:517
-msgid ""
-"_: This is the second part of two strings that will comprise teh sentence 'Show "
-"completions when a word is at least N characters'\n"
-"characters long."
-msgstr "个字符长。"
-
-#: plugins/wordcompletion/docwordcompletion.cpp:520
-msgid ""
-"Enable the automatic completion list popup as default. The popup can be "
-"disabled on a view basis from the 'Tools' menu."
-msgstr "默认启用自动补全列表弹出框。弹出框可以从“工具”菜单中根据视图加以禁用。"
-
-#: plugins/wordcompletion/docwordcompletion.cpp:523
-msgid ""
-"Define the length a word should have before the completion list is displayed."
-msgstr "定义显示补全列表前单词应该有多长。"
-
-#: plugins/insertfile/insertfileplugin.cpp:79
-msgid "Insert File..."
-msgstr "插入文件..."
-
-#: plugins/insertfile/insertfileplugin.cpp:88
-msgid "Choose File to Insert"
-msgstr "选择要插入的文件"
-
-#: plugins/insertfile/insertfileplugin.cpp:116
-msgid ""
-"Failed to load file:\n"
-"\n"
-msgstr ""
-"载入文件失败：\n"
-"\n"
-
-#: plugins/insertfile/insertfileplugin.cpp:116
-#: plugins/insertfile/insertfileplugin.cpp:137
-#: plugins/insertfile/insertfileplugin.cpp:159
-msgid "Insert File Error"
-msgstr "插入文件错误"
-
-#: plugins/insertfile/insertfileplugin.cpp:130
-msgid ""
-"<p>The file <strong>%1</strong> does not exist or is not readable, aborting."
-msgstr "<p>文件 <strong>%1</strong> 不存在或不可读，中止。"
-
-#: plugins/insertfile/insertfileplugin.cpp:134
-msgid "<p>Unable to open file <strong>%1</strong>, aborting."
-msgstr "<p>无法打开文件 <strong>%1</strong>，中止。"
-
-#: plugins/insertfile/insertfileplugin.cpp:157
-msgid "<p>File <strong>%1</strong> had no contents."
-msgstr "<p>文件 <strong>%1</strong> 没有内容。"
-
-#: plugins/kdatatool/kate_kdatatool.cpp:78
-msgid "Data Tools"
-msgstr "数据工具"
-
-#: plugins/kdatatool/kate_kdatatool.cpp:153
-#: plugins/kdatatool/kate_kdatatool.cpp:175
-msgid "(not available)"
-msgstr "(不可用)"
-
-#: plugins/kdatatool/kate_kdatatool.cpp:183
-msgid ""
-"Data tools are only available when text is selected, or when the right mouse "
-"button is clicked over a word. If no data tools are offered even when text is "
-"selected, you need to install them. Some data tools are part of the KOffice "
-"package."
-msgstr ""
-"只有在文本被选中、或者鼠标右键点击在一个词上时数据工具才可用。如果当文本被选中时还没有数据工具可用，您需要安装它。有些数据工具是 KOffice "
-"软件包的一部分。"
-
-#: plugins/isearch/ISearchPlugin.cpp:68 plugins/isearch/ISearchPlugin.cpp:371
-msgid "Search Incrementally"
-msgstr "递增搜索"
-
-#: plugins/isearch/ISearchPlugin.cpp:72 plugins/isearch/ISearchPlugin.cpp:372
-msgid "Search Incrementally Backwards"
-msgstr "反向递增搜索"
-
-#: plugins/isearch/ISearchPlugin.cpp:76 plugins/isearch/ISearchPlugin.cpp:79
-msgid "I-Search:"
-msgstr "递增搜索："
-
-#: plugins/isearch/ISearchPlugin.cpp:95
-msgid "Search"
-msgstr "搜索"
-
-#: plugins/isearch/ISearchPlugin.cpp:101
-msgid "Search Options"
-msgstr "搜索选项"
-
-#: plugins/isearch/ISearchPlugin.cpp:106 plugins/isearch/ISearchPlugin.cpp:412
-msgid "Case Sensitive"
-msgstr "区分大小写"
-
-#: plugins/isearch/ISearchPlugin.cpp:115 plugins/isearch/ISearchPlugin.cpp:414
-msgid "From Beginning"
-msgstr "从开头开始"
-
-#: plugins/isearch/ISearchPlugin.cpp:124 plugins/isearch/ISearchPlugin.cpp:416
-msgid "Regular Expression"
-msgstr "正则表达式"
-
-#: plugins/isearch/ISearchPlugin.cpp:244
-msgid ""
-"_: Incremental Search\n"
-"I-Search:"
-msgstr "递增搜索："
-
-#: plugins/isearch/ISearchPlugin.cpp:247
-msgid ""
-"_: Incremental Search found no match\n"
-"Failing I-Search:"
-msgstr "递增搜索失败："
-
-#: plugins/isearch/ISearchPlugin.cpp:250
-msgid ""
-"_: Incremental Search in the reverse direction\n"
-"I-Search Backward:"
-msgstr "反向递增搜索："
-
-#: plugins/isearch/ISearchPlugin.cpp:253
-msgid "Failing I-Search Backward:"
-msgstr "反向递增搜索失败："
-
-#: plugins/isearch/ISearchPlugin.cpp:256
-msgid ""
-"_: Incremental Search has passed the end of the document\n"
-"Wrapped I-Search:"
-msgstr "回绕递增搜索："
-
-#: plugins/isearch/ISearchPlugin.cpp:259
-msgid "Failing Wrapped I-Search:"
-msgstr "回绕递增搜索失败："
-
-#: plugins/isearch/ISearchPlugin.cpp:262
-msgid "Wrapped I-Search Backward:"
-msgstr "反向回绕递增搜索："
-
-#: plugins/isearch/ISearchPlugin.cpp:265
-msgid "Failing Wrapped I-Search Backward:"
-msgstr "反向回绕递增搜索失败："
-
-#: plugins/isearch/ISearchPlugin.cpp:269
+#. i18n: file data/yaml.xml line 4
+#: rc.cpp:932
+#, fuzzy
 msgid ""
-"_: Incremental Search has passed both the end of the document and the original "
-"starting position\n"
-"Overwrapped I-Search:"
-msgstr "双重回绕递增搜索："
-
-#: plugins/isearch/ISearchPlugin.cpp:272
-msgid "Failing Overwrapped I-Search:"
-msgstr "双重回绕递增搜索失败："
-
-#: plugins/isearch/ISearchPlugin.cpp:275
-msgid "Overwrapped I-Search Backwards:"
-msgstr "反向双重回绕递增搜索："
-
-#: plugins/isearch/ISearchPlugin.cpp:278
-msgid "Failing Overwrapped I-Search Backward:"
-msgstr "反向双重回绕递增搜索失败："
-
-#: plugins/isearch/ISearchPlugin.cpp:280
-msgid "Error: unknown i-search state!"
-msgstr "错误：未知的递增搜索状态！"
-
-#: plugins/isearch/ISearchPlugin.cpp:341
-msgid "Next Incremental Search Match"
-msgstr "下一个递增搜索匹配"
-
-#: plugins/isearch/ISearchPlugin.cpp:342
-msgid "Previous Incremental Search Match"
-msgstr "上一个递增搜索匹配"
-
-#: plugins/autobookmarker/autobookmarker.cpp:90
-msgid "AutoBookmarks"
-msgstr "自动书签"
-
-#: plugins/autobookmarker/autobookmarker.cpp:101
-msgid "Configure AutoBookmarks"
-msgstr "配置自动书签"
-
-#: plugins/autobookmarker/autobookmarker.cpp:280
-msgid "Edit Entry"
-msgstr "编辑项"
-
-#: plugins/autobookmarker/autobookmarker.cpp:288
-msgid "&Pattern:"
-msgstr "模式(&P)："
-
-#: plugins/autobookmarker/autobookmarker.cpp:294
-msgid "<p>A regular expression. Matching lines will be bookmarked.</p>"
-msgstr "<p>正则表达式。匹配的行将被加入书签。</p>"
-
-#: plugins/autobookmarker/autobookmarker.cpp:298
-msgid "Case &sensitive"
-msgstr "区分大小写(&S)"
-
-#: plugins/autobookmarker/autobookmarker.cpp:302
-msgid ""
-"<p>If enabled, the pattern matching will be case sensitive, otherwise not.</p>"
-msgstr "<p>如果启用的话，模式匹配将区分大小写，否则不区分。</p>"
-
-#: plugins/autobookmarker/autobookmarker.cpp:305
-msgid "&Minimal matching"
-msgstr "最小匹配(&M)"
-
-#: plugins/autobookmarker/autobookmarker.cpp:309
-msgid ""
-"<p>If enabled, the pattern matching will use minimal matching; if you do not "
-"know what that is, please read the appendix on regular expressions in the kate "
-"manual.</p>"
-msgstr "<p>如果启用，模式匹配将使用最小匹配；如果您不知道什么是最小匹配，请阅读 Kate 手册中正则表达式的附录。</p>"
-
-#: plugins/autobookmarker/autobookmarker.cpp:313
-msgid "&File mask:"
-msgstr "文件通配符(&F)："
-
-#: plugins/autobookmarker/autobookmarker.cpp:319
-msgid ""
-"<p>A list of filename masks, separated by semicolons. This can be used to limit "
-"the usage of this entity to files with matching names.</p>"
-"<p>Use the wizard button to the right of the mimetype entry below to easily "
-"fill out both lists.</p>"
-msgstr ""
-"<p>以分号分隔的文件名通配符列表。此列表可用于限制此实体的用途仅限于匹配名称的文件。</p>"
-"<p>使用下方 MIME 类型项右侧的向导按钮可轻松填入全部列表。</p>"
-
-#: plugins/autobookmarker/autobookmarker.cpp:330
-msgid ""
-"<p>A list of mime types, separated by semicolon. This can be used to limit the "
-"usage of this entity to files with matching mime types.</p>"
-"<p>Use the wizard button on the right to get a list of existing file types to "
-"choose from, using it will fill in the file masks as well.</p>"
-msgstr ""
-"<p>以分号分隔的 MIME 类型列表。此列表可用于限制此实体的用途仅限于匹配 MIME 类型的文件。</p>"
-"<p>使用下方 MIME 类型项右侧的向导按钮可轻松填入全部列表。</p>"
-
-#: plugins/autobookmarker/autobookmarker.cpp:340
-msgid ""
-"<p>Click this button to display a checkable list of mimetypes available on your "
-"system. When used, the file masks entry above will be filled in with the "
-"corresponding masks.</p>"
-msgstr "<p>单击此按钮可显示系统中可用的 MIME 类型复选列表。使用此功能后，上面的文件通配符项也会按照相应的 MIME 类型填入。</p>"
+"_: Language\n"
+"YAML"
+msgstr "SML"
 
-#: plugins/autobookmarker/autobookmarker.cpp:365
+#. i18n: file data/zonnon.xml line 3
+#: rc.cpp:936
+#, fuzzy
 msgid ""
-"Select the MimeTypes for this pattern.\n"
-"Please note that this will automatically edit the associated file extensions as "
-"well."
-msgstr ""
-"选择你想要为此文件类型对应的 MIME 类型。\n"
-"请注意，这也将自动编辑相关联的文件扩展名。"
-
-#: plugins/autobookmarker/autobookmarker.cpp:385
-msgid "&Patterns"
-msgstr "模式(&P)"
-
-#: plugins/autobookmarker/autobookmarker.cpp:388
-msgid "Pattern"
-msgstr "模式"
-
-#: plugins/autobookmarker/autobookmarker.cpp:389
-msgid "Mime Types"
-msgstr "MIME 类型"
-
-#: plugins/autobookmarker/autobookmarker.cpp:390
-msgid "File Masks"
-msgstr "文件通配符"
+"_: Language\n"
+"Zonnon"
+msgstr "Mason"
 
-#: plugins/autobookmarker/autobookmarker.cpp:394
+#. i18n: file data/zsh.xml line 11
+#: rc.cpp:940
+#, fuzzy
 msgid ""
-"<p>This list shows your configured autobookmark entities. When a document is "
-"opened, each entity is used in the following way: "
-"<ol>"
-"<li>The entity is dismissed, if a mime and/or filename mask is defined, and "
-"neither matches the document.</li>"
-"<li>Otherwise each line of the document is tried against the pattern, and a "
-"bookmark is set on matching lines.</li></ul>"
-"<p>Use the buttons below to manage your collection of entities.</p>"
-msgstr ""
-"<p>此列表为您显示了已经配置的自动书签实体。当文档打开时，每项将以如下方式使用："
-"<ol>"
-"<li>如果定义了 MIME 和/或文件名通配符，而二者之一与文档不符，则忽略此项。</li>"
-"<li>否则，会将文档的每一行与模式进行匹配，并在匹配行上设置书签。</li></ul>"
-"<p>使用下面的按钮可管理您的项收藏。</p>"
-
-#: plugins/autobookmarker/autobookmarker.cpp:409
-msgid "Press this button to create a new autobookmark entity."
-msgstr "按此按钮可创建新的自动书签实体。"
-
-#: plugins/autobookmarker/autobookmarker.cpp:414
-msgid "Press this button to delete the currently selected entity."
-msgstr "按此按钮可删除当前选中实体。"
-
-#: plugins/autobookmarker/autobookmarker.cpp:416
-msgid "&Edit..."
-msgstr "编辑(&E)..."
+"_: Language\n"
+"Zsh"
+msgstr "Bash"
 
-#: plugins/autobookmarker/autobookmarker.cpp:419
-msgid "Press this button to edit the currently selected entity."
-msgstr "按此按钮可编辑当前选中实体。"
+#~ msgid ""
+#~ "_: Language\n"
+#~ "C++"
+#~ msgstr "C++"
 
 #~ msgid ""
 #~ "_: Language\n"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/kmcop.po b/tde-i18n-zh_CN/messages/tdelibs/kmcop.po
index d5c93c39de0..7a49e4ccaa3 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/kmcop.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/kmcop.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmcop\n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2001-09-29 22:20+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/knotify.po b/tde-i18n-zh_CN/messages/tdelibs/knotify.po
index b6638c4c3f3..dd983e6c4ff 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/knotify.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/knotify.po
@@ -6,36 +6,37 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: knotify\n"
-"POT-Creation-Date: 2007-01-27 02:36+0100\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2003-11-10 20:36+0800\n"
 "Last-Translator: Yan Shuangchun <yahzee@d3eye.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: knotify.cpp:108
+#: knotify.cpp:106
 msgid "KNotify"
 msgstr "KNotify"
 
-#: knotify.cpp:109
+#: knotify.cpp:107
 msgid "TDE Notification Server"
 msgstr "TDE 通告服务器"
 
-#: knotify.cpp:111
+#: knotify.cpp:109
 msgid "Current Maintainer"
 msgstr "当前的维护者"
 
-#: knotify.cpp:113
+#: knotify.cpp:111
 msgid "Sound support"
 msgstr "音效支持"
 
-#: knotify.cpp:114
+#: knotify.cpp:112
 msgid "Previous Maintainer"
 msgstr "前一维护者"
 
-#: knotify.cpp:151
+#: knotify.cpp:148
 msgid ""
 "During the previous startup, KNotify crashed while creating Arts::Dispatcher. "
 "Do you want to try again or disable aRts sound output?\n"
@@ -47,19 +48,19 @@ msgstr ""
 "\n"
 "如果您现在选择了禁用 aRts 输出，您可以稍后重新启用，或者在系统通知控制面板中选择替代的声音播放器。"
 
-#: knotify.cpp:157 knotify.cpp:196
+#: knotify.cpp:154 knotify.cpp:190
 msgid "KNotify Problem"
 msgstr "KNotify 问题"
 
-#: knotify.cpp:158 knotify.cpp:197
+#: knotify.cpp:155 knotify.cpp:191
 msgid "&Try Again"
 msgstr "再试一次(&T)"
 
-#: knotify.cpp:159 knotify.cpp:198
+#: knotify.cpp:156 knotify.cpp:192
 msgid "D&isable aRts Output"
 msgstr "禁止 aRts 输出(&I)"
 
-#: knotify.cpp:190
+#: knotify.cpp:184
 msgid ""
 "During the previous startup, KNotify crashed while instantiating KNotify. Do "
 "you want to try again or disable aRts sound output?\n"
@@ -71,16 +72,17 @@ msgstr ""
 "\n"
 "如果您现在选择了禁用 aRts 输出，您可以稍后重新启用，或者在系统通知控制面板中选择替代的声音播放器。"
 
-#: knotify.cpp:573
+#: knotify.cpp:574
 msgid "Notification"
 msgstr "通告"
 
-#: knotify.cpp:582
+#: knotify.cpp:583
 msgid "Catastrophe!"
 msgstr "严重问题！"
 
-#: knotify.cpp:788
-msgid "TDE System Notifications"
+#: knotify.cpp:791
+#, fuzzy
+msgid "Trinity System Notifications"
 msgstr "TDE 系统通告服务"
 
 #: _translatorinfo.cpp:1
diff --git a/tde-i18n-zh_CN/messages/tdelibs/libtdescreensaver.po b/tde-i18n-zh_CN/messages/tdelibs/libtdescreensaver.po
index b8a9a1684d3..e9fc330fb00 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/libtdescreensaver.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/libtdescreensaver.po
@@ -5,26 +5,27 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkscreensaver\n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2001-07-31 18:27+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: main.cpp:48
+#: main.cpp:50
 msgid "Setup screen saver"
 msgstr "设置屏幕保护程序"
 
-#: main.cpp:49
+#: main.cpp:51
 msgid "Run in the specified XWindow"
 msgstr "在指定的 X 窗口中运行"
 
-#: main.cpp:50
+#: main.cpp:52
 msgid "Run in the root XWindow"
 msgstr "在根窗口中运行"
 
-#: main.cpp:51
+#: main.cpp:53
 msgid "Start screen saver in demo mode"
 msgstr "以演示模式运行屏幕保护程序"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdeabc_dir.po b/tde-i18n-zh_CN/messages/tdelibs/tdeabc_dir.po
index 12931d11bed..00a93ac5915 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdeabc_dir.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdeabc_dir.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeabc_dir\n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2003-12-27 23:13+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdeabc_file.po b/tde-i18n-zh_CN/messages/tdelibs/tdeabc_file.po
index 433ad519eaa..eba3f2727a1 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdeabc_file.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdeabc_file.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeabc_file\n"
-"POT-Creation-Date: 2006-06-20 03:54+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2003-12-27 23:14+0800\n"
 "Last-Translator: Xiong Jiang <jxiong@offtopic.org>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdeabc_ldaptdeio.po b/tde-i18n-zh_CN/messages/tdelibs/tdeabc_ldaptdeio.po
index 5f2eaff877b..2ce4d6fd54f 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdeabc_ldaptdeio.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdeabc_ldaptdeio.po
@@ -5,179 +5,180 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeabc_ldapkio\n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2004-07-13 09:58+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: resourceldapkioconfig.cpp:55
+#: resourceldaptdeioconfig.cpp:55
 msgid "Sub-tree query"
 msgstr "子树查询"
 
-#: resourceldapkioconfig.cpp:58
+#: resourceldaptdeioconfig.cpp:58
 msgid "Edit Attributes..."
 msgstr "编辑属性..."
 
-#: resourceldapkioconfig.cpp:59
+#: resourceldaptdeioconfig.cpp:59
 msgid "Offline Use..."
 msgstr "脱机使用..."
 
-#: resourceldapkioconfig.cpp:171
+#: resourceldaptdeioconfig.cpp:171
 msgid "Attributes Configuration"
 msgstr "属性配置"
 
-#: resourceldapkioconfig.cpp:175
+#: resourceldaptdeioconfig.cpp:175
 msgid "Object classes"
 msgstr "对象类"
 
-#: resourceldapkioconfig.cpp:176
+#: resourceldaptdeioconfig.cpp:176
 msgid "Common name"
 msgstr "普通名"
 
-#: resourceldapkioconfig.cpp:177
+#: resourceldaptdeioconfig.cpp:177
 msgid "Formatted name"
 msgstr "格式化名"
 
-#: resourceldapkioconfig.cpp:178
+#: resourceldaptdeioconfig.cpp:178
 msgid "Family name"
 msgstr "姓"
 
-#: resourceldapkioconfig.cpp:179
+#: resourceldaptdeioconfig.cpp:179
 msgid "Given name"
 msgstr "名"
 
-#: resourceldapkioconfig.cpp:180
+#: resourceldaptdeioconfig.cpp:180
 msgid "Organization"
 msgstr "组织"
 
-#: resourceldapkioconfig.cpp:181
+#: resourceldaptdeioconfig.cpp:181
 msgid "Title"
 msgstr "头衔"
 
-#: resourceldapkioconfig.cpp:182
+#: resourceldaptdeioconfig.cpp:182
 msgid "Street"
 msgstr "街道"
 
-#: resourceldapkioconfig.cpp:183
+#: resourceldaptdeioconfig.cpp:183
 msgid "State"
 msgstr "州"
 
-#: resourceldapkioconfig.cpp:184
+#: resourceldaptdeioconfig.cpp:184
 msgid "City"
 msgstr "城市"
 
-#: resourceldapkioconfig.cpp:185
+#: resourceldaptdeioconfig.cpp:185
 msgid "Postal code"
 msgstr "邮政编码"
 
-#: resourceldapkioconfig.cpp:186
+#: resourceldaptdeioconfig.cpp:186
 msgid "Email"
 msgstr "电子邮件"
 
-#: resourceldapkioconfig.cpp:187
+#: resourceldaptdeioconfig.cpp:187
 msgid "Email alias"
 msgstr "电子邮件别名"
 
-#: resourceldapkioconfig.cpp:188
+#: resourceldaptdeioconfig.cpp:188
 msgid "Telephone number"
 msgstr "电话号码"
 
-#: resourceldapkioconfig.cpp:189
+#: resourceldaptdeioconfig.cpp:189
 msgid "Work telephone number"
 msgstr "工作电话号码"
 
-#: resourceldapkioconfig.cpp:190
+#: resourceldaptdeioconfig.cpp:190
 msgid "Fax number"
 msgstr "传真号码"
 
-#: resourceldapkioconfig.cpp:191
+#: resourceldaptdeioconfig.cpp:191
 msgid "Cell phone number"
 msgstr "移动电话号码"
 
-#: resourceldapkioconfig.cpp:192
+#: resourceldaptdeioconfig.cpp:192
 msgid "Pager"
 msgstr "寻呼机"
 
-#: resourceldapkioconfig.cpp:193
+#: resourceldaptdeioconfig.cpp:193
 msgid "Note"
 msgstr "备忘"
 
-#: resourceldapkioconfig.cpp:194 resourceldapkioconfig.cpp:257
+#: resourceldaptdeioconfig.cpp:194 resourceldaptdeioconfig.cpp:257
 msgid "UID"
 msgstr "UID"
 
-#: resourceldapkioconfig.cpp:195
+#: resourceldaptdeioconfig.cpp:195
 msgid "Photo"
 msgstr "相片"
 
-#: resourceldapkioconfig.cpp:240
+#: resourceldaptdeioconfig.cpp:240
 msgid "Template:"
 msgstr "模板："
 
-#: resourceldapkioconfig.cpp:245
+#: resourceldaptdeioconfig.cpp:245
 msgid "User Defined"
 msgstr "用户定义的"
 
-#: resourceldapkioconfig.cpp:246
+#: resourceldaptdeioconfig.cpp:246
 msgid "Kolab"
 msgstr "Kolab"
 
-#: resourceldapkioconfig.cpp:247
+#: resourceldaptdeioconfig.cpp:247
 msgid "Netscape"
 msgstr "Netscape"
 
-#: resourceldapkioconfig.cpp:248
+#: resourceldaptdeioconfig.cpp:248
 msgid "Evolution"
 msgstr "Evolution"
 
-#: resourceldapkioconfig.cpp:249
+#: resourceldaptdeioconfig.cpp:249
 msgid "Outlook"
 msgstr "Outlook"
 
-#: resourceldapkioconfig.cpp:252
+#: resourceldaptdeioconfig.cpp:252
 msgid "RDN prefix attribute:"
 msgstr "RDN 前缀属性："
 
-#: resourceldapkioconfig.cpp:256
+#: resourceldaptdeioconfig.cpp:256
 msgid "commonName"
 msgstr "commonName"
 
-#: resourceldapkioconfig.cpp:337
+#: resourceldaptdeioconfig.cpp:337
 msgid "Offline Configuration"
 msgstr "脱机配置"
 
-#: resourceldapkioconfig.cpp:346
+#: resourceldaptdeioconfig.cpp:346
 msgid "Offline Cache Policy"
 msgstr "脱机缓存策略"
 
-#: resourceldapkioconfig.cpp:349
+#: resourceldaptdeioconfig.cpp:349
 msgid "Do not use offline cache"
 msgstr "不使用脱机缓存"
 
-#: resourceldapkioconfig.cpp:350
+#: resourceldaptdeioconfig.cpp:350
 msgid "Use local copy if no connection"
 msgstr "如果无连接则使用本地副本"
 
-#: resourceldapkioconfig.cpp:351
+#: resourceldaptdeioconfig.cpp:351
 msgid "Always use local copy"
 msgstr "总是使用本地副本"
 
-#: resourceldapkioconfig.cpp:354
+#: resourceldaptdeioconfig.cpp:354
 msgid "Refresh offline cache automatically"
 msgstr "自动刷新脱机缓存"
 
-#: resourceldapkioconfig.cpp:361
+#: resourceldaptdeioconfig.cpp:361
 msgid "Load into Cache"
 msgstr "装入缓存"
 
-#: resourceldapkioconfig.cpp:383
+#: resourceldaptdeioconfig.cpp:383
 msgid "Successfully downloaded directory server contents!"
 msgstr "成功下载了目录服务器内容！"
 
-#: resourceldapkioconfig.cpp:386
+#: resourceldaptdeioconfig.cpp:386
 #, c-format
 msgid "An error occurred downloading directory server contents into file %1."
 msgstr "将目录服务器内容下载至文件 %1 时发生错误。"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdeabc_net.po b/tde-i18n-zh_CN/messages/tdelibs/tdeabc_net.po
index 7e35dac4aad..38e2e452bbb 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdeabc_net.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdeabc_net.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeabc_net\n"
-"POT-Creation-Date: 2007-03-05 02:37+0100\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2003-12-27 23:18+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,24 +19,25 @@ msgstr ""
 msgid "Unable to download file '%1'."
 msgstr "无法下载文件“%1”。"
 
-#: resourcenet.cpp:147 resourcenet.cpp:183 resourcenet.cpp:364
+#: resourcenet.cpp:147 resourcenet.cpp:184 resourcenet.cpp:367
 msgid "Unable to open file '%1'."
 msgstr "无法打开文件“%1”。"
 
-#: resourcenet.cpp:154 resourcenet.cpp:361
+#: resourcenet.cpp:154 resourcenet.cpp:364
 msgid "Problems during parsing file '%1'."
 msgstr "分析文件“%1”时有问题。"
 
-#: resourcenet.cpp:244 resourcenet.cpp:275
+#: resourcenet.cpp:246 resourcenet.cpp:278
 msgid "Unable to save file '%1'."
 msgstr "无法保存文件“%1”。"
 
-#: resourcenet.cpp:250
+#: resourcenet.cpp:252
 msgid "Unable to upload to '%1'."
 msgstr "无法上传文件“%1”。"
 
-#: resourcenet.cpp:351
-msgid "Download failed in some way!"
+#: resourcenet.cpp:354
+#, fuzzy
+msgid "Download failed: Unable to create temporary file"
 msgstr "下载失败，原因未知！"
 
 #: resourcenetconfig.cpp:42
diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdeabc_sql.po b/tde-i18n-zh_CN/messages/tdelibs/tdeabc_sql.po
index 9b97e94c29d..91a07878256 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdeabc_sql.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdeabc_sql.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeabc_sql\n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2002-09-09 17:07+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdeabcformat_binary.po b/tde-i18n-zh_CN/messages/tdelibs/tdeabcformat_binary.po
index 03cb3f40ab8..748417e8e7b 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdeabcformat_binary.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdeabcformat_binary.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeabcformat_binary\n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2003-12-27 23:12+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdecmshell.po b/tde-i18n-zh_CN/messages/tdelibs/tdecmshell.po
index a9d908882cd..103b4ca9da6 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdecmshell.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdecmshell.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdecmshell\n"
-"POT-Creation-Date: 2006-08-13 04:02+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2005-01-20 01:30+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,7 +58,8 @@ msgid "A tool to start single TDE control modules"
 msgstr "启动单个 TDE 控制模块的工具"
 
 #: main.cpp:205
-msgid "(c) 1999-2004, The TDE Developers"
+#, fuzzy
+msgid "(c) 1999-2004, The KDE Developers"
 msgstr "(c) 1999-2004，TDE 开发者"
 
 #: main.cpp:207
@@ -68,11 +70,11 @@ msgstr "维护者"
 msgid "The following modules are available:"
 msgstr "下列模块可用："
 
-#: main.cpp:247
+#: main.cpp:246
 msgid "No description available"
 msgstr "没有可用的描述"
 
-#: main.cpp:314
+#: main.cpp:321
 #, c-format
 msgid "Configure - %1"
 msgstr "配置 - %1"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdefileaudiopreview.po b/tde-i18n-zh_CN/messages/tdelibs/tdefileaudiopreview.po
index ab7cf06ba93..592fc209139 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdefileaudiopreview.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdefileaudiopreview.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefileaudiopreview 3.2\n"
-"POT-Creation-Date: 2006-10-03 02:33+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2003-12-27 23:15+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdeio.po b/tde-i18n-zh_CN/messages/tdelibs/tdeio.po
index 039cac2c5dd..d8eeef01ac5 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdeio.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdeio.po
@@ -8,42 +8,1588 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdelibs\n"
-"POT-Creation-Date: 2008-07-08 01:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2005-06-10 18:14+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tdeio/netaccess.cpp:67
-msgid "File '%1' is not readable"
-msgstr "文件“%1”不可读"
+#: tests/kurifiltertest.cpp:144
+msgid "kurifiltertest"
+msgstr "kurifiltertest"
 
-#: tdeio/netaccess.cpp:438
-msgid "ERROR: Unknown protocol '%1'"
-msgstr "错误：未知的协议“%1”"
+#: tests/kurifiltertest.cpp:145
+msgid "Unit test for the URI filter plugin framework."
+msgstr "URI 过滤器插件框架的单元测试。"
+
+#: tests/kurifiltertest.cpp:150
+msgid "Use space as keyword delimeter for web shortcuts"
+msgstr "使用空格作为速搜的关键字分隔符"
+
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "开源软件国际化之简体中文组"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "i18n-translation@lists.linux.net.cn"
+
+#: bookmarks/kbookmarkmenu.cc:506 bookmarks/kbookmarkmenu_p.h:146
+msgid "Add Bookmark"
+msgstr "添加书签"
+
+#: bookmarks/kbookmarkimporter_opera.cc:110
+#: bookmarks/kbookmarkimporter_opera.cc:113
+msgid "*.adr|Opera Bookmark Files (*.adr)"
+msgstr "*.adr|Opera 书签文件(*.adr)"
+
+#: bookmarks/kbookmarkmenu.cc:259
+msgid "Add Bookmark Here"
+msgstr "在此添加书签"
+
+#: bookmarks/kbookmarkmenu.cc:276
+msgid "Open Folder in Bookmark Editor"
+msgstr "在书签编辑器中打开文件夹"
+
+#: bookmarks/kbookmarkmenu.cc:279
+msgid "Delete Folder"
+msgstr "删除文件夹"
+
+#: bookmarks/kbookmarkmenu.cc:287
+msgid "Copy Link Address"
+msgstr "复制链接地址"
+
+#: bookmarks/kbookmarkmenu.cc:290
+msgid "Delete Bookmark"
+msgstr "删除书签"
+
+#: bookmarks/kbookmarkmenu.cc:318
+msgid "Bookmark Properties"
+msgstr "书签属性"
+
+#: bookmarks/kbookmarkmanager.cc:506 bookmarks/kbookmarkmenu.cc:343
+msgid "Cannot add bookmark with empty URL."
+msgstr "无法添加空 URL 的书签。"
+
+#: bookmarks/kbookmarkmenu.cc:381
+msgid ""
+"Are you sure you wish to remove the bookmark folder\n"
+"\"%1\"?"
+msgstr ""
+"您确定想要删除书签文件夹\n"
+"“%1”吗？"
+
+#: bookmarks/kbookmarkmenu.cc:382
+msgid ""
+"Are you sure you wish to remove the bookmark\n"
+"\"%1\"?"
+msgstr ""
+"您确定想要删除书签\n"
+"“%1”吗？"
+
+#: bookmarks/kbookmarkmenu.cc:383
+msgid "Bookmark Folder Deletion"
+msgstr "书签文件夹删除"
+
+#: bookmarks/kbookmarkmenu.cc:384
+msgid "Bookmark Deletion"
+msgstr "书签删除"
+
+#: bookmarks/kbookmarkmenu.cc:486
+msgid "Bookmark Tabs as Folder..."
+msgstr "将标签添加为书签文件夹..."
+
+#: bookmarks/kbookmarkmenu.cc:495
+msgid "Add a folder of bookmarks for all open tabs."
+msgstr "为已打开的全部标签添加书签文件夹。"
+
+#: bookmarks/kbookmarkmenu.cc:515
+msgid "Add a bookmark for the current document"
+msgstr "为当前文档添加书签"
+
+#: bookmarks/kbookmarkmenu.cc:529
+msgid "Edit your bookmark collection in a separate window"
+msgstr "在另外的窗口中编辑您的书签集"
+
+#: bookmarks/kbookmarkmenu.cc:538
+msgid "&New Bookmark Folder..."
+msgstr "新建书签文件夹(&N)..."
+
+#: bookmarks/kbookmarkmenu.cc:550
+msgid "Create a new bookmark folder in this menu"
+msgstr "在该菜单中创建新书签文件夹"
+
+#: bookmarks/kbookmarkmenu.cc:684
+msgid "Quick Actions"
+msgstr "快速动作"
+
+#: ../tdeioslave/http/kcookiejar/kcookiewin.cpp:270
+#: bookmarks/kbookmarkmenu.cc:791 tdefile/kpropertiesdialog.cpp:4020
+#: tdeio/tdefileitem.cpp:943
+msgid "Name:"
+msgstr "名称："
+
+#: bookmarks/kbookmarkmenu.cc:797 tdefile/kpropertiesdialog.cpp:992
+#: tdefile/kurlrequesterdlg.cpp:47
+msgid "Location:"
+msgstr "位置："
+
+#: bookmarks/kbookmarkmenu.cc:829 tdefile/kpropertiesdialog.cpp:3306
+msgid "&Add"
+msgstr "添加(&A)"
+
+#: bookmarks/kbookmarkmenu.cc:831
+msgid "&New Folder..."
+msgstr "新建文件夹(&N)..."
+
+#: bookmarks/kbookmarkmenu.cc:948
+msgid "Bookmark"
+msgstr "书签"
+
+#: bookmarks/kbookmarkmenu.cc:1115
+msgid "Netscape Bookmarks"
+msgstr "Netscape 书签"
+
+#: bookmarks/kbookmark.cc:117
+msgid "Create New Bookmark Folder"
+msgstr "新建书签文件夹"
+
+#: bookmarks/kbookmark.cc:118
+#, c-format
+msgid "Create New Bookmark Folder in %1"
+msgstr "在 %1 中新建书签文件夹"
+
+#: bookmarks/kbookmark.cc:120
+msgid "New folder:"
+msgstr "新建文件夹："
+
+#: bookmarks/kbookmark.cc:286
+msgid "--- separator ---"
+msgstr "--- 分隔符 ---"
+
+#: bookmarks/kbookmarkimporter_ns.cc:110 bookmarks/kbookmarkimporter_ns.cc:113
+msgid "*.html|HTML Files (*.html)"
+msgstr "*.html|HTML 文件(*.html)"
+
+#: bookmarks/kbookmarkimporter_ns.cc:197
+msgid "<!-- This file was generated by Konqueror -->"
+msgstr "<!-- 本文件由 Konqueror 生成 -->"
+
+#: bookmarks/kbookmarkmanager.cc:365
+msgid ""
+"Unable to save bookmarks in %1. Reported error was: %2. This error message will "
+"only be shown once. The cause of the error needs to be fixed as quickly as "
+"possible, which is most likely a full hard drive."
+msgstr "无法在 %1 中保存书签。报告的错误是：%2。错误信息只会显示一次。产生错误的原因需要尽快修复，因为很可能是硬盘已满。"
+
+#: kssl/ksslcertdlg.cc:61
+msgid "Certificate"
+msgstr "证书"
+
+#: kssl/ksslcertdlg.cc:67
+msgid "Save selection for this host."
+msgstr "为该主机保存选择。"
+
+#: kssl/ksslcertdlg.cc:75
+msgid "Send certificate"
+msgstr "发送证书"
+
+#: kssl/ksslcertdlg.cc:79
+msgid "Do not send a certificate"
+msgstr "不要发送证书"
+
+#: kssl/ksslcertdlg.cc:84
+#, fuzzy
+msgid "KDE SSL Certificate Dialog"
+msgstr "TDE SSL 证书对话"
+
+#: kssl/ksslcertdlg.cc:139
+msgid ""
+"The server <b>%1</b> requests a certificate."
+"<p>Select a certificate to use from the list below:"
+msgstr "服务器 <b>%1</b> 请求证书。<p>请从下面的列表中选择要使用的证书："
+
+#: kssl/ksslinfodlg.cc:92 kssl/ksslinfodlg.cc:149
+msgid "Current connection is secured with SSL."
+msgstr "当前连接使用安全的 SSL。"
+
+#: kssl/ksslinfodlg.cc:95 kssl/ksslinfodlg.cc:152
+msgid "Current connection is not secured with SSL."
+msgstr "当前连接没有使用安全的 SSL。"
+
+#: kssl/ksslinfodlg.cc:99
+msgid "SSL support is not available in this build of TDE."
+msgstr "这个编译版本的 TDE 不包含 SSL 支持。"
+
+#: kssl/ksslinfodlg.cc:109
+msgid "C&ryptography Configuration..."
+msgstr "加密配置(&R)..."
+
+#: kssl/ksslinfodlg.cc:120 kssl/ksslkeygen.cc:93
+msgid "TDE SSL Information"
+msgstr "TDE SSL 信息"
+
+#: kssl/ksslinfodlg.cc:142
+msgid ""
+"The main part of this document is secured with SSL, but some parts are not."
+msgstr "该文档的主要部分使用安全的 SSL，但是某些部分没有使用。"
+
+#: kssl/ksslinfodlg.cc:144
+msgid "Some of this document is secured with SSL, but the main part is not."
+msgstr "该文档的某些部分使用安全的 SSL，但是主要部分没有使用。"
+
+#: kssl/ksslinfodlg.cc:184
+msgid "Chain:"
+msgstr "信任链："
+
+#: kssl/ksslinfodlg.cc:193
+msgid "0 - Site Certificate"
+msgstr "0 - 站点证书"
+
+#: kssl/ksslinfodlg.cc:210
+msgid "Peer certificate:"
+msgstr "对端证书："
+
+#: kssl/ksslinfodlg.cc:212
+msgid "Issuer:"
+msgstr "颁发者："
+
+#: kssl/ksslinfodlg.cc:218
+msgid "IP address:"
+msgstr "IP 地址："
+
+#: kssl/ksslinfodlg.cc:227 tdefile/kpropertiesdialog.cpp:2601
+msgid "URL:"
+msgstr "URL："
+
+#: kssl/ksslinfodlg.cc:230
+msgid "Certificate state:"
+msgstr "证书状态："
+
+#: kssl/ksslinfodlg.cc:236
+msgid "Valid from:"
+msgstr "有效期自："
+
+#: kssl/ksslinfodlg.cc:238
+msgid "Valid until:"
+msgstr "有效期至："
+
+#: kssl/ksslinfodlg.cc:241
+msgid "Serial number:"
+msgstr "序列号："
+
+#: kssl/ksslinfodlg.cc:243
+msgid "MD5 digest:"
+msgstr "MD5 摘要："
+
+#: kssl/ksslinfodlg.cc:246
+msgid "Cipher in use:"
+msgstr "使用的密码："
+
+#: kssl/ksslinfodlg.cc:248
+msgid "Details:"
+msgstr "细节："
+
+#: kssl/ksslinfodlg.cc:250
+msgid "SSL version:"
+msgstr "SSL 版本："
+
+#: kssl/ksslinfodlg.cc:252
+msgid "Cipher strength:"
+msgstr "密码强度："
+
+#: kssl/ksslinfodlg.cc:253
+msgid "%1 bits used of a %2 bit cipher"
+msgstr "使用了 %2 位加密算法的 %1 位"
+
+#: kssl/ksslinfodlg.cc:409
+msgid "Organization:"
+msgstr "组织："
+
+#: kssl/ksslinfodlg.cc:414
+msgid "Organizational unit:"
+msgstr "组织单位："
+
+#: kssl/ksslinfodlg.cc:419
+msgid "Locality:"
+msgstr "位置："
+
+#: kssl/ksslinfodlg.cc:424
+msgid ""
+"_: Federal State\n"
+"State:"
+msgstr "状态："
+
+#: kssl/ksslinfodlg.cc:429
+msgid "Country:"
+msgstr "国家："
+
+#: kssl/ksslinfodlg.cc:434
+msgid "Common name:"
+msgstr "通用名称："
+
+#: kssl/ksslinfodlg.cc:439
+msgid "Email:"
+msgstr "电子邮件："
+
+#: kssl/ksslcertificate.cc:202
+msgid "Signature Algorithm: "
+msgstr "签名算法："
+
+#: kssl/ksslcertificate.cc:203
+msgid "Unknown"
+msgstr "未知"
+
+#: kssl/ksslcertificate.cc:206
+msgid "Signature Contents:"
+msgstr "签名内容："
+
+#: kssl/ksslcertificate.cc:338
+msgid ""
+"_: Unknown\n"
+"Unknown key algorithm"
+msgstr "未知的密钥算法"
+
+#: kssl/ksslcertificate.cc:341
+msgid "Key type: RSA (%1 bit)"
+msgstr "密钥类型：RSA (%1 位)"
+
+#: kssl/ksslcertificate.cc:344
+msgid "Modulus: "
+msgstr "模："
+
+#: kssl/ksslcertificate.cc:357
+msgid "Exponent: 0x"
+msgstr "幂：0x"
+
+#: kssl/ksslcertificate.cc:363
+msgid "Key type: DSA (%1 bit)"
+msgstr "密钥类型：DSA (%1 位)"
+
+#: kssl/ksslcertificate.cc:366
+msgid "Prime: "
+msgstr "质数："
+
+#: kssl/ksslcertificate.cc:380
+msgid "160 bit prime factor: "
+msgstr "160 位质数因子："
+
+#: kssl/ksslcertificate.cc:404
+msgid "Public key: "
+msgstr "公钥："
+
+#: kssl/ksslcertificate.cc:920
+msgid "The certificate is valid."
+msgstr "证书有效。"
+
+#: kssl/ksslcertificate.cc:924
+msgid ""
+"Certificate signing authority root files could not be found so the certificate "
+"is not verified."
+msgstr "找不到证书签名权威根文件，证书没有被校验。"
+
+#: kssl/ksslcertificate.cc:927
+msgid "Certificate signing authority is unknown or invalid."
+msgstr "证书签名权威未知或无效。"
+
+#: kssl/ksslcertificate.cc:929
+msgid "Certificate is self-signed and thus may not be trustworthy."
+msgstr "证书是自签名的，所以可能不可信任。"
+
+#: kssl/ksslcertificate.cc:931
+msgid "Certificate has expired."
+msgstr "证书已过期。"
+
+#: kssl/ksslcertificate.cc:933
+msgid "Certificate has been revoked."
+msgstr "证书已被废除。"
+
+#: kssl/ksslcertificate.cc:935
+msgid "SSL support was not found."
+msgstr "没有 SSL 支持。"
+
+#: kssl/ksslcertificate.cc:937
+msgid "Signature is untrusted."
+msgstr "签名不被信任。"
+
+#: kssl/ksslcertificate.cc:939
+msgid "Signature test failed."
+msgstr "签名测试失败。"
+
+#: kssl/ksslcertificate.cc:942
+msgid "Rejected, possibly due to an invalid purpose."
+msgstr "已拒绝，可能由于不合法目的。"
+
+#: kssl/ksslcertificate.cc:944
+msgid "Private key test failed."
+msgstr "密钥测试失败。"
+
+#: kssl/ksslcertificate.cc:946
+msgid "The certificate has not been issued for this host."
+msgstr "证书未办发给此主机。"
+
+#: kssl/ksslcertificate.cc:948
+msgid "This certificate is not relevant."
+msgstr "此证书不相关。"
+
+#: kssl/ksslcertificate.cc:953
+msgid "The certificate is invalid."
+msgstr "证书无效。"
+
+#: kssl/ksslkeygen.cc:48
+msgid "TDE Certificate Request"
+msgstr "TDE 证书请求"
+
+#: kssl/ksslkeygen.cc:50
+msgid "TDE Certificate Request - Password"
+msgstr "TDE 证书请求 - 密码"
+
+#: kssl/ksslkeygen.cc:93
+msgid "Unsupported key size."
+msgstr "不支持的密钥大小。"
+
+#: kssl/ksslkeygen.cc:97 misc/uiserver.cpp:1383
+msgid "TDE"
+msgstr "TDE"
+
+#: kssl/ksslkeygen.cc:97
+msgid "Please wait while the encryption keys are generated..."
+msgstr "请稍候，正在生成加密密钥..."
+
+#: kssl/ksslkeygen.cc:107
+msgid "Do you wish to store the passphrase in your wallet file?"
+msgstr "您是否想要在钱包文件中存储密码句？"
+
+#: kssl/ksslkeygen.cc:107
+msgid "Store"
+msgstr "存储"
+
+#: kssl/ksslkeygen.cc:107
+msgid "Do Not Store"
+msgstr "不存储"
+
+#: kssl/ksslkeygen.cc:210
+msgid "2048 (High Grade)"
+msgstr "2048 (高级)"
+
+#: kssl/ksslkeygen.cc:211
+msgid "1024 (Medium Grade)"
+msgstr "1024 (中级)"
+
+#: kssl/ksslkeygen.cc:212
+msgid "768  (Low Grade)"
+msgstr "768 (低级)"
+
+#: kssl/ksslkeygen.cc:213
+msgid "512  (Low Grade)"
+msgstr "512 (低级)"
+
+#: kssl/ksslkeygen.cc:215
+msgid "No SSL support."
+msgstr "不支持 SSL。"
+
+#: kssl/ksslpemcallback.cc:36
+msgid "Certificate password"
+msgstr "证书密码"
+
+#: kssl/ksslutils.cc:79
+msgid "GMT"
+msgstr "GMT"
+
+#: misc/tdetelnetservice.cpp:41
+msgid "telnet service"
+msgstr "Telnet 服务"
+
+#: misc/tdetelnetservice.cpp:42
+msgid "telnet protocol handler"
+msgstr "Telnet 协议处理程序"
+
+#: misc/tdetelnetservice.cpp:76
+msgid "You do not have permission to access the %1 protocol."
+msgstr "您可能没有访问 %1 协议的权限。"
+
+#: misc/tdesendbugmail/main.cpp:22
+msgid "Subject line"
+msgstr "主题行"
+
+#: misc/tdesendbugmail/main.cpp:23
+msgid "Recipient"
+msgstr "收件人"
+
+#: misc/tdesendbugmail/main.cpp:33
+msgid "Error connecting to server."
+msgstr "连接到服务器时发生错误。"
+
+#: misc/tdesendbugmail/main.cpp:36
+msgid "Not connected."
+msgstr "没有连接。"
+
+#: misc/tdesendbugmail/main.cpp:39
+msgid "Connection timed out."
+msgstr "连接超时。"
+
+#: misc/tdesendbugmail/main.cpp:42
+msgid "Time out waiting for server interaction."
+msgstr "在等待服务器响应时超时。"
+
+#: misc/tdesendbugmail/main.cpp:46
+msgid "Server said: \"%1\""
+msgstr "服务器消息：“%1”"
+
+#: misc/tdesendbugmail/main.cpp:62
+msgid "KSendBugMail"
+msgstr "KSendBugMail"
+
+#: misc/tdesendbugmail/main.cpp:63
+msgid "Sends a short bug report to submit@bugs.kde.org"
+msgstr "把简短的错误报告发送给 submit@bugs.kde.org"
+
+#: misc/tdesendbugmail/main.cpp:65
+msgid "Author"
+msgstr "作者"
+
+#: misc/tdemailservice.cpp:32
+msgid "KMailService"
+msgstr "KMailService"
+
+#: misc/tdemailservice.cpp:32
+msgid "Mail service"
+msgstr "邮件服务"
+
+#: misc/uiserver.cpp:98 misc/uiserver.cpp:603 misc/uiserver.cpp:682
+msgid "Settings..."
+msgstr "设置..."
+
+#: misc/uiserver.cpp:126
+msgid "Configure Network Operation Window"
+msgstr "配置网络操作窗口"
+
+#: misc/uiserver.cpp:130
+msgid "Show system tray icon"
+msgstr "显示系统托盘图标"
+
+#: misc/uiserver.cpp:131
+msgid "Keep network operation window always open"
+msgstr "将网络操作窗口始终保持打开"
+
+#: misc/uiserver.cpp:132
+msgid "Show column headers"
+msgstr "显示列头"
+
+#: misc/uiserver.cpp:133
+msgid "Show toolbar"
+msgstr "显示工具栏"
+
+#: misc/uiserver.cpp:134
+msgid "Show statusbar"
+msgstr "显示状态栏"
+
+#: misc/uiserver.cpp:135
+msgid "Column widths are user adjustable"
+msgstr "列宽可由用户调整"
+
+#: misc/uiserver.cpp:136
+msgid "Show information:"
+msgstr "显示信息："
+
+#: misc/uiserver.cpp:143 misc/uiserver.cpp:474
+msgid "URL"
+msgstr "URL"
+
+#: misc/uiserver.cpp:144 misc/uiserver.cpp:473
+msgid ""
+"_: Remaining Time\n"
+"Rem. Time"
+msgstr "剩余时间"
+
+#: misc/uiserver.cpp:145 misc/uiserver.cpp:472
+msgid "Speed"
+msgstr "速度"
+
+#: misc/uiserver.cpp:146 misc/uiserver.cpp:471
+#: tdefile/tdefiledetailview.cpp:67
+msgid "Size"
+msgstr "大小"
+
+#: misc/uiserver.cpp:147 misc/uiserver.cpp:470
+#, c-format
+msgid "%"
+msgstr "%"
+
+#: misc/uiserver.cpp:148 misc/uiserver.cpp:469
+msgid "Count"
+msgstr "计数"
+
+#: misc/uiserver.cpp:149 misc/uiserver.cpp:468
+msgid ""
+"_: Resume\n"
+"Res."
+msgstr "续传"
+
+#: misc/uiserver.cpp:150 misc/uiserver.cpp:467
+msgid "Local Filename"
+msgstr "本地文件名"
+
+#: misc/uiserver.cpp:151 misc/uiserver.cpp:466
+msgid "Operation"
+msgstr "操作"
+
+#: misc/uiserver.cpp:254
+msgid "%1 / %2"
+msgstr "%1/ %2"
+
+#: misc/uiserver.cpp:288 tdeio/defaultprogress.cpp:325
+msgid "Stalled"
+msgstr "暂停"
+
+#: misc/uiserver.cpp:291
+msgid "%1/s"
+msgstr "%1/秒"
+
+#: misc/uiserver.cpp:302
+msgid "Copying"
+msgstr "复制"
+
+#: misc/uiserver.cpp:311
+msgid "Moving"
+msgstr "移动"
+
+#: misc/uiserver.cpp:320
+msgid "Creating"
+msgstr "创建"
+
+#: misc/uiserver.cpp:329
+msgid "Deleting"
+msgstr "删除"
+
+#: misc/uiserver.cpp:337
+msgid "Loading"
+msgstr "载入"
+
+#: misc/uiserver.cpp:362
+msgid "Examining"
+msgstr "检查"
+
+#: misc/uiserver.cpp:370
+msgid "Mounting"
+msgstr "挂载"
+
+#: misc/uiserver.cpp:378 tdeio/defaultprogress.cpp:410
+msgid "Unmounting"
+msgstr "卸载"
+
+#: misc/uiserver.cpp:608 misc/uiserver.cpp:1097
+msgid " Files: %1 "
+msgstr " 文件数：%1 "
+
+#: misc/uiserver.cpp:609
+msgid ""
+"_: Remaining Size\n"
+" Rem. Size: %1 kB "
+msgstr " 剩余大小：%1 kB "
+
+#: misc/uiserver.cpp:610
+msgid ""
+"_: Remaining Time\n"
+" Rem. Time: 00:00:00 "
+msgstr " 剩余时间：00:00:00 "
+
+#: misc/uiserver.cpp:611
+msgid " %1 kB/s "
+msgstr " %1 kB/秒"
+
+#: misc/uiserver.cpp:632 tdeio/defaultprogress.cpp:179
+msgid "Progress Dialog"
+msgstr "进度对话框"
+
+#: misc/uiserver.cpp:679
+msgid "Cancel Job"
+msgstr "取消任务"
+
+#: misc/uiserver.cpp:1098
+msgid ""
+"_: Remaining Size\n"
+" Rem. Size: %1 "
+msgstr " 剩余大小：%1"
+
+#: misc/uiserver.cpp:1100
+msgid ""
+"_: Remaining Time\n"
+" Rem. Time: %1 "
+msgstr " 剩余时间：%1 "
+
+#: misc/uiserver.cpp:1102 tdeio/statusbarprogress.cpp:134
+msgid " %1/s "
+msgstr " %1/秒 "
+
+#: misc/uiserver.cpp:1218 tdeio/observer.cpp:332
+msgid "The peer SSL certificate appears to be corrupt."
+msgstr "对端的 SSL 证书似乎已损坏。"
+
+#: misc/uiserver.cpp:1218 tdeio/observer.cpp:332 tdeio/tcpslavebase.cpp:706
+msgid "SSL"
+msgstr "SSL"
+
+#: misc/uiserver.cpp:1384
+msgid "TDE Progress Information UI Server"
+msgstr "TDE 进度信息界面服务器"
+
+#: misc/uiserver.cpp:1387 misc/uiserver.cpp:1388
+msgid "Developer"
+msgstr "开发者"
+
+#: misc/tdewalletd/tdewalletwizard.ui.h:23
+msgid "<qt>Password is empty.  <b>(WARNING: Insecure)"
+msgstr "<qt>密码为空。<b>(警告：不安全)"
+
+#: misc/tdewalletd/tdewalletwizard.ui.h:25
+msgid "Passwords match."
+msgstr "密码匹配。"
+
+#: misc/tdewalletd/tdewalletwizard.ui.h:28
+msgid "Passwords do not match."
+msgstr "密码不匹配。"
+
+#: misc/tdewalletd/tdewalletd.cpp:438
+msgid ""
+"<qt>TDE has requested to open the wallet '<b>%1</b>'. Please enter the password "
+"for this wallet below."
+msgstr "<qt>TDE 请求打开钱包“<b>%1</b>”。请在下面输入此钱包的密码。"
+
+#: misc/tdewalletd/tdewalletd.cpp:440
+msgid ""
+"<qt>The application '<b>%1</b>' has requested to open the wallet '<b>%2</b>"
+"'. Please enter the password for this wallet below."
+msgstr "<qt>应用程序“<b>%1</b>”请求打开钱包“<b>%2</b>”。请在下面输入此钱包的密码。"
+
+#: misc/tdewalletd/tdewalletd.cpp:443 misc/tdewalletd/tdewalletd.cpp:457
+#: tdefile/tdefiledialog.cpp:1841
+msgid "&Open"
+msgstr "打开(&O)"
+
+#: misc/tdewalletd/tdewalletd.cpp:452
+msgid ""
+"TDE has requested to open the wallet. This is used to store sensitive data in a "
+"secure fashion. Please enter a password to use with this wallet or click cancel "
+"to deny the application's request."
+msgstr "TDE 请求打开钱包。这将把敏感的数据存储在安全的地方。请输入此钱包的密码，或者单击取消以拒绝应用程序的请求。"
+
+#: misc/tdewalletd/tdewalletd.cpp:454
+msgid ""
+"<qt>The application '<b>%1</b>' has requested to open the TDE wallet. This is "
+"used to store sensitive data in a secure fashion. Please enter a password to "
+"use with this wallet or click cancel to deny the application's request."
+msgstr "<qt>应用程序“<b>%1</b>”请求打开钱包。这将把敏感的数据存储在安全的地方。请输入此钱包的密码，或者单击取消以拒绝应用程序的请求。"
+
+#: misc/tdewalletd/tdewalletd.cpp:461
+msgid ""
+"<qt>TDE has requested to create a new wallet named '<b>%1</b>"
+"'. Please choose a password for this wallet, or cancel to deny the "
+"application's request."
+msgstr "<qt>TDE 请求创建一个名为“<b>%1</b>”的新钱包。请为此钱包选择一个密码，或者单击取消以拒绝应用程序的请求。"
+
+#: misc/tdewalletd/tdewalletd.cpp:463
+msgid ""
+"<qt>The application '<b>%1</b>' has requested to create a new wallet named '<b>"
+"%2</b>'. Please choose a password for this wallet, or cancel to deny the "
+"application's request."
+msgstr ""
+"<qt>应用程序“<b>%1</b>”请求创建一个名为“<b>%2</b>”的新钱包。请为此钱包选择一个密码，或者单击取消以拒绝应用程序的请求。"
+
+#: misc/tdewalletd/tdewalletd.cpp:466
+msgid "C&reate"
+msgstr "创建(&R)"
+
+#: misc/tdewalletd/tdewalletd.cpp:470 misc/tdewalletd/tdewalletd.cpp:645
+#: misc/tdewalletd/tdewalletd.cpp:661 misc/tdewalletd/tdewalletd.cpp:672
+#: misc/tdewalletd/tdewalletd.cpp:677 misc/tdewalletd/tdewalletd.cpp:1237
+msgid "TDE Wallet Service"
+msgstr "TDE 钱包服务"
+
+#: misc/tdewalletd/tdewalletd.cpp:482
+msgid ""
+"<qt>Error opening the wallet '<b>%1</b>'. Please try again."
+"<br>(Error code %2: %3)"
+msgstr "<qt>打开钱包“<b>%1</b>”出错。请再试一次。<br>(错误代码 %2：%3)"
+
+#: misc/tdewalletd/tdewalletd.cpp:556
+msgid "<qt>TDE has requested access to the open wallet '<b>%1</b>'."
+msgstr "<qt>TDE 请求访问打开的钱包“<b>%1</b>”。"
+
+#: misc/tdewalletd/tdewalletd.cpp:558
+msgid ""
+"<qt>The application '<b>%1</b>' has requested access to the open wallet '<b>"
+"%2</b>'."
+msgstr "<qt>应用程序“<b>%1</b>”请求访问打开的钱包“<b>%2</b>”。"
+
+#: misc/tdewalletd/tdewalletd.cpp:645
+msgid ""
+"Unable to open wallet. The wallet must be opened in order to change the "
+"password."
+msgstr "无法打开钱包。要更改密码，必须先打开钱包。"
+
+#: misc/tdewalletd/tdewalletd.cpp:660
+msgid "<qt>Please choose a new password for the wallet '<b>%1</b>'."
+msgstr "<qt>请为钱包“<b>%1</b>”选择一个新密码。"
+
+#: misc/tdewalletd/tdewalletd.cpp:672
+msgid "Error re-encrypting the wallet. Password was not changed."
+msgstr "重新加密钱包出错。密码未更改。"
+
+#: misc/tdewalletd/tdewalletd.cpp:677
+msgid "Error reopening the wallet. Data may be lost."
+msgstr "重新打开钱包出错。数据可能已丢失。"
+
+#: misc/tdewalletd/tdewalletd.cpp:1237
+msgid ""
+"There have been repeated failed attempts to gain access to a wallet. An "
+"application may be misbehaving."
+msgstr "试图获得钱包的访问权限时发生了连续失败。应用程序可能行为不正常。"
+
+#: misc/kpac/discovery.cpp:116
+msgid "Could not find a usable proxy configuration script"
+msgstr "找不到可用的代理配置脚本"
+
+#: misc/kpac/downloader.cpp:81
+#, c-format
+msgid ""
+"Could not download the proxy configuration script:\n"
+"%1"
+msgstr ""
+"无法下载代理配置脚本：\n"
+"%1"
+
+#: misc/kpac/downloader.cpp:83
+msgid "Could not download the proxy configuration script"
+msgstr "无法下载代理配置脚本"
+
+#: misc/kpac/proxyscout.cpp:124
+#, c-format
+msgid ""
+"The proxy configuration script is invalid:\n"
+"%1"
+msgstr ""
+"代理配置脚本无效：\n"
+"%1"
+
+#: misc/kpac/proxyscout.cpp:184
+#, c-format
+msgid ""
+"The proxy configuration script returned an error:\n"
+"%1"
+msgstr ""
+"代理配置脚本返回了错误：\n"
+"%1"
+
+#: misc/tdefile/fileprops.cpp:200
+msgid "Do not print the mimetype of the given file(s)"
+msgstr "不打印给定文件的 MIME 类型"
+
+#: misc/tdefile/fileprops.cpp:204
+msgid ""
+"List all supported metadata keys of the given file(s). If mimetype is not "
+"specified, the mimetype of the given files is used."
+msgstr "列举所有给定文件的被支持的元数据关键词。如果没有指定 MIME 类型，则使用给定文件的 MIME 类型。"
+
+#: misc/tdefile/fileprops.cpp:210
+msgid ""
+"List all preferred metadata keys of the given file(s). If mimetype is not "
+"specified, the mimetype of the given files is used."
+msgstr "列举所有给定文件所想用的元数据关键词。如果没有指定 MIME 类型，则使用给定文件的 MIME 类型。"
+
+#: misc/tdefile/fileprops.cpp:216
+msgid "List all metadata keys which have a value in the given file(s)."
+msgstr "列举所有在给定文件中被赋予值的元数据关键词。"
+
+#: misc/tdefile/fileprops.cpp:221
+msgid "Prints all mimetypes for which metadata support is available."
+msgstr "显示所有带有元数据支持的 MIME 类型。"
+
+#: misc/tdefile/fileprops.cpp:226
+msgid ""
+"Do not print a warning when more than one file was given and they do not all "
+"have the same mimetype."
+msgstr "若给定的文件不止一个，且文件的 MIME 类型不全相同，则不要显示警告。"
+
+#: misc/tdefile/fileprops.cpp:231
+msgid "Prints all metadata values, available in the given file(s)."
+msgstr "显示所有在给定文件中的元数据值。"
+
+#: misc/tdefile/fileprops.cpp:236
+msgid "Prints the preferred metadata values, available in the given file(s)."
+msgstr "显示给定文件中首选的元数据值。"
+
+#: misc/tdefile/fileprops.cpp:240
+msgid ""
+"Opens a TDE properties dialog to allow viewing and modifying of metadata of the "
+"given file(s)"
+msgstr "打开 TDE 属性对话框以便查看和修改给定文件的元数据。"
+
+#: misc/tdefile/fileprops.cpp:244
+msgid ""
+"Prints the value for 'key' of the given file(s). 'key' may also be a "
+"comma-separated list of keys"
+msgstr "显示给定文件中“key”的值。“key”也可能是用逗号分隔的关键词列表。"
+
+#: misc/tdefile/fileprops.cpp:248
+msgid ""
+"Attempts to set the value 'value' for the metadata key 'key' for the given "
+"file(s)"
+msgstr "试图为给定文件把元数据关键词“key”设置为值“value”。"
+
+#: misc/tdefile/fileprops.cpp:251
+msgid "The group to get values from or set values to"
+msgstr "要获取值或设置值的组"
+
+#: misc/tdefile/fileprops.cpp:255
+msgid "The file (or a number of files) to operate on."
+msgstr "要操作的文件(或一组文件)。"
+
+#: misc/tdefile/fileprops.cpp:270
+msgid "No support for metadata extraction found."
+msgstr "没有找到对元数据抽取的支持。"
+
+#: misc/tdefile/fileprops.cpp:275
+msgid "Supported MimeTypes:"
+msgstr "支持的 MIME 类型："
+
+#: misc/tdefile/fileprops.cpp:410
+msgid "tdefile"
+msgstr "tdefile"
+
+#: misc/tdefile/fileprops.cpp:411
+msgid "A commandline tool to read and modify metadata of files."
+msgstr "读取和修改文件元数据的命令行工具。"
+
+#: misc/tdefile/fileprops.cpp:438
+msgid "No files specified"
+msgstr "没有指定文件"
+
+#: misc/tdefile/fileprops.cpp:467
+msgid "Cannot determine metadata"
+msgstr "无法判定元数据"
+
+#: tdeioexec/main.cpp:50
+msgid "TDEIO Exec - Opens remote files, watches modifications, asks for upload"
+msgstr "TDEIO Exec - 打开远程文件、监视修改、请求上传"
+
+#: tdeioexec/main.cpp:54
+msgid "Treat URLs as local files and delete them afterwards"
+msgstr "将 URL 当作本地文件并进行删除"
+
+#: tdeioexec/main.cpp:55
+msgid "Suggested file name for the downloaded file"
+msgstr "为所下载文件建议的文件名"
+
+#: tdeioexec/main.cpp:56
+msgid "Command to execute"
+msgstr "要执行的命令"
+
+#: tdeioexec/main.cpp:57
+msgid "URL(s) or local file(s) used for 'command'"
+msgstr "“command”所用的 URL 或文件"
+
+#: tdeioexec/main.cpp:73
+msgid ""
+"'command' expected.\n"
+msgstr ""
+"需要“command”。\n"
+
+#: tdeioexec/main.cpp:102
+msgid ""
+"The URL %1\n"
+"is malformed"
+msgstr ""
+"URL %1\n"
+"的格式不正确"
+
+#: tdeioexec/main.cpp:104
+msgid ""
+"Remote URL %1\n"
+"not allowed with --tempfiles switch"
+msgstr ""
+"远程 URL %1\n"
+"不允许使用 --tempfiles 开关"
+
+#: tdeioexec/main.cpp:237
+msgid ""
+"The supposedly temporary file\n"
+"%1\n"
+"has been modified.\n"
+"Do you still want to delete it?"
+msgstr ""
+"可能的临时文件\n"
+"%1\n"
+"已经被修改。\n"
+"您仍然想要删除吗？"
+
+#: tdeioexec/main.cpp:238 tdeioexec/main.cpp:245
+msgid "File Changed"
+msgstr "文件已更改"
+
+#: tdeioexec/main.cpp:238
+msgid "Do Not Delete"
+msgstr "不删除"
+
+#: tdeioexec/main.cpp:244
+msgid ""
+"The file\n"
+"%1\n"
+"has been modified.\n"
+"Do you want to upload the changes?"
+msgstr ""
+"文件\n"
+"%1\n"
+"已经被修改。\n"
+"您想要上传更改吗？"
+
+#: tdeioexec/main.cpp:245
+msgid "Upload"
+msgstr "上传"
+
+#: tdeioexec/main.cpp:245
+msgid "Do Not Upload"
+msgstr "不上传"
+
+#: tdeioexec/main.cpp:274
+msgid "KIOExec"
+msgstr "KIOExec"
+
+#. i18n: file ./kssl/keygenwizard2.ui line 25
+#: rc.cpp:3
+#, no-c-format
+msgid ""
+"You must now provide a password for the certificate request. Please choose a "
+"very secure password as this will be used to encrypt your private key."
+msgstr "您必须现在就为证书请求提供一个密码。请选择非常安全的密码，因为该密码会用于加密您的私人密钥。"
+
+#. i18n: file ./kssl/keygenwizard2.ui line 38
+#: rc.cpp:6
+#, no-c-format
+msgid "&Repeat password:"
+msgstr "重复密码(&R)："
+
+#. i18n: file ./kssl/keygenwizard2.ui line 49
+#: rc.cpp:9
+#, no-c-format
+msgid "&Choose password:"
+msgstr "选择密码(&C)："
+
+#. i18n: file ./kssl/keygenwizard.ui line 25
+#: rc.cpp:12
+#, no-c-format
+msgid ""
+"You have indicated that you wish to obtain or purchase a secure certificate. "
+"This wizard is intended to guide you through the procedure. You may cancel at "
+"any time, and this will abort the transaction."
+msgstr "您已经表明您想要获得或者购买安全证书。此向导将会引导您完成这个过程。您可在任何时候取消，从而中止此项事务。"
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 16
+#: rc.cpp:15
+#, no-c-format
+msgid "TDE Wallet Wizard"
+msgstr "TDE 钱包向导"
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 23
+#: rc.cpp:18
+#, no-c-format
+msgid "Introduction"
+msgstr "简介"
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 56
+#: rc.cpp:21
+#, no-c-format
+msgid "<u>TDEWallet</u> - The TDE Wallet System"
+msgstr "<u>TDEWallet</u> - TDE 钱包系统"
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 81
+#: rc.cpp:24
+#, no-c-format
+msgid ""
+"Welcome to TDEWallet, the TDE Wallet System.  TDEWallet allows you to store "
+"your passwords and other personal information on disk in an encrypted file, "
+"preventing others from viewing the information.  This wizard will tell you "
+"about TDEWallet and help you configure it for the first time."
+msgstr ""
+"欢迎使用 TDEWallet - TDE 钱包系统。TDEWallet "
+"允许您将您的密码和其他个人信息保存在磁盘上的加密文件中，这样可以避免其他人查看该信息。此向导将会为您介绍 TDEWallet 的特性，并帮助您进行首次配置。"
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 112
+#: rc.cpp:27
+#, no-c-format
+msgid "&Basic setup (recommended)"
+msgstr "基本设置(推荐)(&B)"
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 123
+#: rc.cpp:30
+#, no-c-format
+msgid "&Advanced setup"
+msgstr "高级设置(&A)"
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 180
+#: rc.cpp:36
+#, no-c-format
+msgid ""
+"The TDE Wallet system stores your data in a <i>wallet</i> "
+"file on your local hard disk.  The data is only written in encrypted form, "
+"presently using the blowfish algorithm with your password as the key.  When a "
+"wallet is opened, the wallet manager application will launch and display an "
+"icon in the system tray.  You can use this application to manage your wallets.  "
+"It even permits you to drag wallets and wallet contents, allowing you to easily "
+"copy a wallet to a remote system."
+msgstr ""
+"TDE "
+"钱包系统将您的数据存储在本地硬盘的<i>钱包</i>文件中。数据只能以加密方式写入，这并且会用您的密码作为密钥进行强加密。当钱包打开时，钱包管理器应用程序将会调"
+"用并在系统托盘中显示图标。您可以使用此应用程序管理您的钱包。它甚至允许您拖曳钱包及钱包的内容，这样就可以很轻松地将钱包复制到远程系统。"
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 193
+#: rc.cpp:39
+#, no-c-format
+msgid "Password Selection"
+msgstr "密码选择"
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 204
+#: rc.cpp:42
+#, no-c-format
+msgid ""
+"Various applications may attempt to use the TDE wallet to store passwords or "
+"other information such as web form data and cookies.  If you would like these "
+"applications to use the wallet, you must enable it now and choose a password.  "
+"The password you choose <i>cannot</i> be recovered if it is lost, and will "
+"allow anyone who knows it to obtain all the information contained in the "
+"wallet."
+msgstr ""
+"各种应用程序都可能试图使用 TDE 钱包来存储密码或其它诸如 Web 表单数据和 Cookies "
+"这样的信息。如果您想要这些应用程序使用钱包，您必须现在就启用并选择一个密码。如果您忘记所选的密码的话，将<i>无法</i>"
+"恢复。知道该密码的所有人都可以获取钱包中所包含的全部信息。"
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 234
+#: rc.cpp:45
+#, no-c-format
+msgid "Enter a new password:"
+msgstr "输入新密码："
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 251
+#: rc.cpp:48
+#, no-c-format
+msgid "Verify password:"
+msgstr "校验密码："
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 301
+#: rc.cpp:51
+#, no-c-format
+msgid "Yes, I wish to use the TDE wallet to store my personal information."
+msgstr "是，我想要使用 TDE 钱包来存储我的个人信息。"
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 390
+#: rc.cpp:54
+#, no-c-format
+msgid "Security Level"
+msgstr "安全级别"
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 401
+#: rc.cpp:57
+#, no-c-format
+msgid ""
+"The TDE Wallet system allows you to control the level of security of your "
+"personal data.  Some of these settings do impact usability.  While the default "
+"settings are generally acceptable for most users, you may wish to change some "
+"of them.  You may further tune these settings from the TDEWallet control "
+"module."
+msgstr ""
+"TDE 钱包系统允许您控制您个人数据的安全级别。某些设置会对可用性造成一定的影响。尽管默认设置适用于大多数用户，您仍然可以进行更改。您稍候可以从 "
+"TDEWallet 控制模块中对这些设置详细调整。"
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 432
+#: rc.cpp:60
+#, no-c-format
+msgid "Store network passwords and local passwords in separate wallet files"
+msgstr "在独立的钱包文件中存储网络密码和本地密码"
+
+#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 440
+#: rc.cpp:63
+#, no-c-format
+msgid "Automatically close idle wallets"
+msgstr "自动关闭不用的钱包"
+
+#. i18n: file ./misc/tdewalletd/kbetterthankdialogbase.ui line 60
+#: rc.cpp:66
+#, no-c-format
+msgid "Allow &Once"
+msgstr "允许一次(&O)"
 
-#: tdeio/global.cpp:729 tdeio/job.cpp:1761 tdeio/job.cpp:3228 tdeio/job.cpp:3745
-#: tdeio/paste.cpp:65
+#. i18n: file ./misc/tdewalletd/kbetterthankdialogbase.ui line 71
+#: rc.cpp:69
+#, no-c-format
+msgid "Allow &Always"
+msgstr "总是允许(&A)"
+
+#. i18n: file ./misc/tdewalletd/kbetterthankdialogbase.ui line 79
+#: rc.cpp:72
+#, no-c-format
+msgid "&Deny"
+msgstr "拒绝(&O)"
+
+#. i18n: file ./misc/tdewalletd/kbetterthankdialogbase.ui line 87
+#: rc.cpp:75
+#, no-c-format
+msgid "Deny &Forever"
+msgstr "永远拒绝(&F)"
+
+#. i18n: file ./tdefile/kpropertiesmimetypebase.ui line 27
+#: rc.cpp:78
+#, no-c-format
+msgid "Select one or more file types to add:"
+msgstr "选择要添加的一个或多个文件类型："
+
+#. i18n: file ./tdefile/kpropertiesmimetypebase.ui line 36
+#: rc.cpp:81 rc.cpp:99
+#, no-c-format
+msgid "Mimetype"
+msgstr "MIME 类型"
+
+#. i18n: file ./tdefile/kpropertiesmimetypebase.ui line 47
+#: rc.cpp:84 rc.cpp:102
+#, no-c-format
+msgid "Description"
+msgstr "描述"
+
+#. i18n: file ./tdefile/kpropertiesmimetypebase.ui line 61
+#: rc.cpp:87
+#, no-c-format
+msgid ""
+"<qt>"
+"<p>Select one or more types of file that your application can handle here. This "
+"list is organized by <u>mimetypes</u>.</p>\n"
+"<p>MIME, Multipurpose Internet (e)Mail Extension, is a standard protocol for "
+"identifying the type of data based on filename extensions and correspondent <u>"
+"mimetypes</u>. Example: the \"bmp\" part that comes after the dot in flower.bmp "
+"indicates that it is a specific kind of image, <u>image/x-bmp</u>"
+". To know which application should open each type of file, the system should be "
+"informed about the abilities of each application to handle these extensions and "
+"mimetypes.</p>"
+msgstr ""
+"<qt>"
+"<p>在此选择您的应用程序可处理的一种或多种文件类型。此列表是按照 <u>MIME 类型</u>组织的。</p>\n"
+"<p>MIME——多用途网际邮件扩展——是一种用来根据文件扩展名和相应的 <u>MIME 类型</u>来标识数据类型的标准协议。例如：flower.bmp "
+"中句点后面的“bmp”部分表明了这是一种图像 "
+"<u>image/x-bmp</u>。要哪个应用程序应该打开哪种类型的文件，您系统通知系统每个应用程序可处理哪些扩展名和 MIME 类型。</p>"
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 44
+#: rc.cpp:91
+#, no-c-format
+msgid "&Supported file types:"
+msgstr "支持的 MIME 类型(&S)："
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 52
+#: rc.cpp:94 rc.cpp:105
+#, no-c-format
+msgid ""
+"<qt>"
+"<p>This list should show the types of file that your application can handle. "
+"This list is organized by <u>mimetypes</u>.</p>\n"
+"<p>MIME, Multipurpose Internet (e)Mail Extension, is a standard protocol for "
+"identifying the type of data based on filename extensions and correspondent <u>"
+"mimetypes</u>. Example: the \"bmp\" part that comes after the dot in flower.bmp "
+"indicates that it is a specific kind of image, <u>image/x-bmp</u>"
+". To know which application should open each type of file, the system should be "
+"informed about the abilities of each application to handle these extensions and "
+"mimetypes.</p>\n"
+"<p>If you want to associate this application with one or more mimetypes that "
+"are not in this list, click on the button <b>Add</b> "
+"below. If there are one or more filetypes that this application cannot handle, "
+"you may want to remove them from the list clicking on the button <b>Remove</b> "
+"below.</p></qt>"
+msgstr ""
+"<qt>"
+"<p>在此选择您的应用程序可处理的一种或多种文件类型。此列表是按照 <u>MIME 类型</u>组织的。</p>\n"
+"<p>MIME——多用途网际邮件扩展——是一种用来根据文件扩展名和相应的 <u>MIME 类型</u>来标识数据类型的标准协议。例如：flower.bmp "
+"中句点后面的“bmp”部分表明了这是一种图像 "
+"<u>image/x-bmp</u>。要哪个应用程序应该打开哪种类型的文件，您系统通知系统每个应用程序可处理哪些扩展名和 MIME 类型。</p>\n"
+"<p>如果您想要将此应用程序与一种或多种未在列表中出现的 MIME 类型关联起来，请单击下面的<b>添加</b>"
+"按钮。如果此应用程序有一种或多种文件类型，您可以使用下面的<b>删除</b>按钮从列表中予以删除。</p></qt>"
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 103
+#: rc.cpp:110
+#, no-c-format
+msgid "&Name:"
+msgstr "名称(&N)："
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 109
+#: rc.cpp:113 rc.cpp:116
+#, no-c-format
+msgid ""
+"Type the name you want to give to this application here. This application will "
+"appear under this name in the applications menu and in the panel."
+msgstr "在此输入您想要为此应用程序起的名字。此应用程序将以此名称出现在应用程序菜单和面板中。"
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 125
+#: rc.cpp:119 tdefile/kurlbar.cpp:950
+#, no-c-format
+msgid "&Description:"
+msgstr "描述(&D)："
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 131
+#: rc.cpp:122 rc.cpp:125
+#, no-c-format
+msgid ""
+"Type the description of this application, based on its use, here. Examples: a "
+"dial up application (KPPP) would be \"Dial up tool\"."
+msgstr "在此根据用途输入此应用程序的描述。例如：拨号应用程序(KPPP)可能是“拨号工具”。"
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 147
+#: rc.cpp:128
+#, no-c-format
+msgid "Comm&ent:"
+msgstr "注释(&E)："
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 153
+#: rc.cpp:131 rc.cpp:134
+#, no-c-format
+msgid "Type any comment you think is useful here."
+msgstr "在此输入您认为有用的注释。"
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 169
+#: rc.cpp:137
+#, no-c-format
+msgid "Co&mmand:"
+msgstr "命令(&M)："
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 186
+#: rc.cpp:140 rc.cpp:154
+#, no-c-format
+msgid ""
+"Type the command to start this application here.\n"
+"\n"
+"Following the command, you can have several place holders which will be "
+"replaced with the actual values when the actual program is run:\n"
+"%f - a single file name\n"
+"%F - a list of files; use for applications that can open several local files at "
+"once\n"
+"%u - a single URL\n"
+"%U - a list of URLs\n"
+"%d - the directory of the file to open\n"
+"%D - a list of directories\n"
+"%i - the icon\n"
+"%m - the mini-icon\n"
+"%c - the caption"
+msgstr ""
+"在此输入启动此应用程序的命令。\n"
+"\n"
+"在命令之后，您可以使用某些占位符，在程序实际运行时这些占位符将被替换为实际值：\n"
+"%f - 单个文件名\n"
+"%F - 文件列表；用于可一次打开多个本地文件的应用程序\n"
+"%u - 单个 URL\n"
+"%U - URL 列表\n"
+"%d - 要打开文件的目录\n"
+"%D - 目录列表\n"
+"%i - 图标\n"
+"%m - 小图标\n"
+"%c - 标题"
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 213
+#: rc.cpp:168 tdefile/kicondialog.cpp:283 tdefile/kpropertiesdialog.cpp:3705
+#, no-c-format
+msgid "&Browse..."
+msgstr "浏览(&B)..."
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 216
+#: rc.cpp:171
+#, no-c-format
+msgid ""
+"Click here to browse your file system in order to find the desired executable."
+msgstr "单击此处可在您的文件系统中浏览，以便找到想要的可执行文件。"
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 224
+#: rc.cpp:174
+#, no-c-format
+msgid "&Work path:"
+msgstr "工作路径(&W)："
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 230
+#: rc.cpp:177 rc.cpp:180
+#, no-c-format
+msgid "Sets the working directory for your application."
+msgstr "设置您应用程序的工作目录。"
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 246
+#: rc.cpp:183
+#, no-c-format
+msgid "Add..."
+msgstr "添加..."
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 249
+#: rc.cpp:186
+#, no-c-format
+msgid ""
+"Click on this button if you want to add a type of file (mimetype) that your "
+"application can handle."
+msgstr "如果您想要为您的应用程序可处理的文件类型(MIME 类型)，请单击此按钮。"
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 277
+#: rc.cpp:192
+#, no-c-format
+msgid ""
+"If you want to remove a type of file (mimetype) that your application cannot "
+"handle, select the mimetype in the list above and click on this button."
+msgstr "如果您想要删除某种您应用程序无法处理的文件类型(MIME 类型)，请在上面的列表中选择该 MIME 类型，然后单击此按钮。"
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 302
+#: rc.cpp:195
+#, no-c-format
+msgid "Ad&vanced Options"
+msgstr "高级选项(&V)"
+
+#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 305
+#: rc.cpp:198
+#, no-c-format
+msgid ""
+"Click here to modify the way this application will run, launch feedback, DCOP "
+"options or to run it as a different user."
+msgstr "单击此处修改应用程序运行的方式，执行反馈，DCOP 选项或者以不同的用户运行。"
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 91
+#: rc.cpp:201
+#, no-c-format
+msgid "Events"
+msgstr "事件"
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 117
+#: rc.cpp:204
+#, no-c-format
+msgid "Quick Controls"
+msgstr "快速控制"
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 128
+#: rc.cpp:207
+#, no-c-format
+msgid "Apply to &all applications"
+msgstr "应用到全部应用程序(&A)"
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 170
+#: rc.cpp:210
+#, no-c-format
+msgid "Turn O&ff All"
+msgstr "全部关闭(&F)"
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 173
+#: rc.cpp:213 rc.cpp:219
+#, no-c-format
+msgid "Allows you to change the behavior for all events at once"
+msgstr "允许您一次更改全部事件的行为"
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 181
+#: rc.cpp:216
+#, no-c-format
+msgid "Turn O&n All"
+msgstr "全部打开(&N)"
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 204
+#: rc.cpp:222 tdefile/kicondialog.cpp:330
+#, no-c-format
+msgid "Actions"
+msgstr "动作"
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 215
+#: rc.cpp:225
+#, no-c-format
+msgid "Print a message to standard &error output"
+msgstr "把消息打印到标准错误输出(&E)"
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 223
+#: rc.cpp:228
+#, no-c-format
+msgid "Show a &message in a pop-up window"
+msgstr "在弹出窗口中显示消息(&M)"
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 231
+#: rc.cpp:231
+#, no-c-format
+msgid "E&xecute a program:"
+msgstr "执行程序(&X)："
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 247
+#: rc.cpp:234
+#, no-c-format
+msgid "Play a &sound:"
+msgstr "播放声音(&S)："
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 258
+#: rc.cpp:237
+#, no-c-format
+msgid "Test the Sound"
+msgstr "测试声音"
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 268
+#: rc.cpp:240
+#, no-c-format
+msgid "Mark &taskbar entry"
+msgstr "制作任务栏项(&T)"
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 276
+#: rc.cpp:243
+#, no-c-format
+msgid "&Log to a file:"
+msgstr "记录日志到文件(&L)："
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 352
+#: rc.cpp:246
+#, no-c-format
+msgid "&Use a passive window that does not interrupt other work"
+msgstr "使用不打断其它工作的被动窗口(&U)"
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 378
+#: rc.cpp:249
+#, no-c-format
+msgid "Less Options"
+msgstr "更少选项"
+
+#. i18n: file ./tdefile/knotifywidgetbase.ui line 406
+#: rc.cpp:252
+#, no-c-format
+msgid "Player Settings"
+msgstr "播放器设置"
+
+#: ../tdeioslave/http/http.cc:5189 kpasswdserver/kpasswdserver.cpp:346
+msgid "  Do you want to retry?"
+msgstr "  您想重试吗？"
+
+#: ../tdeioslave/http/http.cc:5190 kpasswdserver/kpasswdserver.cpp:348
+msgid "Authentication"
+msgstr "验证"
+
+#: kpasswdserver/kpasswdserver.cpp:348
+msgid "Retry"
+msgstr "重试"
+
+#: kpasswdserver/kpasswdserver.cpp:371 tdeio/passdlg.cpp:345
+msgid "Authorization Dialog"
+msgstr "授权对话框"
+
+#: tdeio/global.cpp:749 tdeio/job.cpp:1796 tdeio/job.cpp:3263
+#: tdeio/job.cpp:3780 tdeio/paste.cpp:65
 msgid "File Already Exists"
 msgstr "文件已存在"
 
-#: tdeio/global.cpp:739 tdeio/job.cpp:2938
+#: tdeio/global.cpp:759 tdeio/job.cpp:2973
 msgid "Folder Already Exists"
 msgstr "文件夹已存在"
 
-#: tdeio/job.cpp:3228 tdeio/job.cpp:3745
+#: tdeio/job.cpp:3263 tdeio/job.cpp:3780
 msgid "Already Exists as Folder"
 msgstr "已经存在一个同名文件夹"
 
-#: tdeio/kimageio.cpp:231
-msgid "All Pictures"
-msgstr "全部图片"
-
-#: tdeio/pastedialog.cpp:49
-msgid "Data format:"
-msgstr "数据格式："
+#: tdeio/kdcopservicestarter.cpp:64
+#, c-format
+msgid "No service implementing %1"
+msgstr "没有实现 %1 的服务"
 
 #: tdeio/renamedlg.cpp:119
 msgid "&Rename"
@@ -120,8 +1666,8 @@ msgstr "修改于 %1"
 msgid "The source file is '%1'"
 msgstr "源文件是“%1”"
 
-#: tdeio/kdirlister.cpp:282 tdeio/kdirlister.cpp:293 tdeio/krun.cpp:864
-#: tdeio/paste.cpp:213 tdeio/renamedlg.cpp:431
+#: tdeio/kdirlister.cpp:296 tdeio/kdirlister.cpp:307 tdeio/krun.cpp:996
+#: tdeio/paste.cpp:213 tdeio/renamedlg.cpp:433
 #, c-format
 msgid ""
 "Malformed URL\n"
@@ -130,6 +1676,99 @@ msgstr ""
 "不正确的 URL\n"
 "%1"
 
+#: tdeio/krun.cpp:128
+msgid ""
+"<qt>Unable to enter <b>%1</b>.\n"
+"You do not have access rights to this location.</qt>"
+msgstr ""
+"<qt>无法进入 <b>%1</b>。\n"
+"您没有到这个位置的访问权。</qt>"
+
+#: tdeio/krun.cpp:173
+msgid ""
+"<qt>The file <b>%1</b> is an executable program. For safety it will not be "
+"started.</qt>"
+msgstr "<qt>文件 <b>%1</b> 是可执行程序。为安全起见，不会启动该程序。</qt>"
+
+#: tdeio/krun.cpp:180
+msgid "<qt>You do not have permission to run <b>%1</b>.</qt>"
+msgstr "<qt>您没有运行 <b>%1</b>的权限。</qt>"
+
+#: tdeio/krun.cpp:217
+msgid "You are not authorized to open this file."
+msgstr "您没有被授权打开该文件。"
+
+#: tdefile/kopenwith.cpp:835 tdeio/krun.cpp:221
+msgid "Open with:"
+msgstr "打开方式："
+
+#: tdeio/krun.cpp:559
+msgid "You are not authorized to execute this file."
+msgstr "您没有被授权执行该文件。"
+
+#: tdeio/krun.cpp:579
+#, c-format
+msgid "Launching %1"
+msgstr "调用 %1"
+
+#: tdeio/krun.cpp:774
+msgid "You are not authorized to execute this service."
+msgstr "您没有被授权执行该服务。"
+
+#: tdeio/krun.cpp:1033
+msgid ""
+"<qt>Unable to run the command specified. The file or folder <b>%1</b> "
+"does not exist.</qt>"
+msgstr "<qt>无法运行指定的命令。文件或文件夹 <b>%1</b> 不存在。</qt>"
+
+#: tdeio/krun.cpp:1555
+msgid "Could not find the program '%1'"
+msgstr "找不到程序“%1”"
+
+#: tdefile/kpropertiesdialog.cpp:2754 tdeio/kmimetypechooser.cpp:75
+msgid "Mime Type"
+msgstr "MIME 类型"
+
+#: tdefile/kpropertiesdialog.cpp:2765 tdeio/kmimetypechooser.cpp:80
+msgid "Comment"
+msgstr "备注"
+
+#: tdeio/kmimetypechooser.cpp:84
+msgid "Patterns"
+msgstr "模式"
+
+#: tdeio/kmimetypechooser.cpp:94
+msgid "&Edit..."
+msgstr "编辑(&E)..."
+
+#: tdeio/kmimetypechooser.cpp:104
+msgid "Click this button to display the familiar TDE mime type editor."
+msgstr "单击此按钮来显示熟悉的 TDE MIME 类型编辑器。"
+
+#: tdeio/statusbarprogress.cpp:132
+msgid " Stalled "
+msgstr " 暂停 "
+
+#: tdeio/passdlg.cpp:57
+msgid "Password"
+msgstr "密码"
+
+#: tdeio/passdlg.cpp:98
+msgid "You need to supply a username and a password"
+msgstr "您需要提供一个用户名和密码"
+
+#: tdefile/kpropertiesdialog.cpp:3789 tdeio/passdlg.cpp:108
+msgid "&Username:"
+msgstr "用户名(&U)："
+
+#: tdeio/passdlg.cpp:125
+msgid "&Password:"
+msgstr "密码(&P)："
+
+#: tdeio/passdlg.cpp:147
+msgid "&Keep password"
+msgstr "保存密码(&K)"
+
 #: tdeio/paste.cpp:49 tdeio/paste.cpp:115
 msgid "Filename for clipboard content:"
 msgstr "用于剪贴板内容的文件名："
@@ -166,24 +1805,6 @@ msgstr "粘贴 %n 个 URL(&P)"
 msgid "&Paste Clipboard Contents"
 msgstr "粘贴剪贴板内容(&P)"
 
-#: tdeio/observer.cpp:332 misc/uiserver.cpp:1218
-msgid "The peer SSL certificate appears to be corrupt."
-msgstr "对端的 SSL 证书似乎已损坏。"
-
-#: tdeio/observer.cpp:332 tdeio/tcpslavebase.cpp:706 misc/uiserver.cpp:1218
-msgid "SSL"
-msgstr "SSL"
-
-#: tdeio/chmodjob.cpp:173
-msgid ""
-"<qt>Could not modify the ownership of file <b>%1</b>"
-". You have insufficient access to the file to perform the change.</qt>"
-msgstr "<qt>无法修改文件 <b>%1</b> 的所有者。您没有足够的权限来进行修改。</qt>"
-
-#: tdeio/chmodjob.cpp:173
-msgid "&Skip File"
-msgstr "跳过文件(&S)"
-
 #: tdeio/tdefilemetainfo.cpp:844
 msgid "s"
 msgstr "秒 "
@@ -236,6 +1857,56 @@ msgstr "Hz"
 msgid "mm"
 msgstr "毫米"
 
+#: tdeio/chmodjob.cpp:173
+msgid ""
+"<qt>Could not modify the ownership of file <b>%1</b>"
+". You have insufficient access to the file to perform the change.</qt>"
+msgstr "<qt>无法修改文件 <b>%1</b> 的所有者。您没有足够的权限来进行修改。</qt>"
+
+#: tdeio/chmodjob.cpp:173
+msgid "&Skip File"
+msgstr "跳过文件(&S)"
+
+#: tdeio/tdefileitem.cpp:899
+msgid "Symbolic Link"
+msgstr "符号链接"
+
+#: tdeio/tdefileitem.cpp:901
+msgid "%1 (Link)"
+msgstr "%1 (链接)"
+
+#: tdefile/kpropertiesdialog.cpp:951 tdeio/tdefileitem.cpp:944
+msgid "Type:"
+msgstr "类型："
+
+#: tdeio/tdefileitem.cpp:948
+msgid "Link to %1 (%2)"
+msgstr "链接到 %1(%2)"
+
+#: tdefile/kpropertiesdialog.cpp:1001 tdeio/tdefileitem.cpp:956
+msgid "Size:"
+msgstr "大小："
+
+#: tdefile/kpropertiesdialog.cpp:1069 tdeio/tdefileitem.cpp:961
+msgid "Modified:"
+msgstr "修改时间："
+
+#: tdeio/tdefileitem.cpp:967
+msgid "Owner:"
+msgstr "所有者："
+
+#: tdeio/tdefileitem.cpp:968
+msgid "Permissions:"
+msgstr "权限："
+
+#: tdeio/netaccess.cpp:67
+msgid "File '%1' is not readable"
+msgstr "文件“%1”不可读"
+
+#: tdeio/netaccess.cpp:461
+msgid "ERROR: Unknown protocol '%1'"
+msgstr "错误：未知的协议“%1”"
+
 #: tdeio/kmimetype.cpp:110
 msgid "No mime types installed."
 msgstr "没有安装 MIME 类型。"
@@ -249,11 +1920,11 @@ msgstr ""
 "找不到 MIME 类型\n"
 "%1"
 
-#: tdeio/kmimetype.cpp:796
+#: tdeio/kmimetype.cpp:794
 msgid "The desktop entry file %1 has no Type=... entry."
 msgstr "桌面项文件 %1 没有 Type=... 项。"
 
-#: tdeio/kmimetype.cpp:817
+#: tdeio/kmimetype.cpp:815
 msgid ""
 "The desktop entry of type\n"
 "%1\n"
@@ -263,7 +1934,7 @@ msgstr ""
 "%1\n"
 "未知。"
 
-#: tdeio/kmimetype.cpp:831 tdeio/kmimetype.cpp:933 tdeio/kmimetype.cpp:1115
+#: tdeio/kmimetype.cpp:829 tdeio/kmimetype.cpp:931 tdeio/kmimetype.cpp:1113
 msgid ""
 "The desktop entry file\n"
 "%1\n"
@@ -273,7 +1944,7 @@ msgstr ""
 "%1\n"
 "是文件系统设备类型，但是没有包含 Dev=... 项目。"
 
-#: tdeio/kmimetype.cpp:877
+#: tdeio/kmimetype.cpp:875
 msgid ""
 "The desktop entry file\n"
 "%1\n"
@@ -283,19 +1954,19 @@ msgstr ""
 "%1\n"
 "是链接类型，但是没有包含 URL=... 项。"
 
-#: tdeio/kmimetype.cpp:943
+#: tdeio/kmimetype.cpp:941
 msgid "Mount"
 msgstr "挂载"
 
-#: tdeio/kmimetype.cpp:954
+#: tdeio/kmimetype.cpp:952
 msgid "Eject"
 msgstr "弹出"
 
-#: tdeio/kmimetype.cpp:956
+#: tdeio/kmimetype.cpp:954
 msgid "Unmount"
 msgstr "卸载"
 
-#: tdeio/kmimetype.cpp:1073
+#: tdeio/kmimetype.cpp:1071
 msgid ""
 "The desktop entry file\n"
 "%1\n"
@@ -307,121 +1978,9 @@ msgstr ""
 "含有无效的菜单项\n"
 "%2。"
 
-#: tdeio/tcpslavebase.cpp:319
-msgid ""
-"You are about to leave secure mode. Transmissions will no longer be encrypted.\n"
-"This means that a third party could observe your data in transit."
-msgstr ""
-"您即将离开安全模式，数据传输将不再加密。\n"
-"这意味着第三方有可能查看到您传输的数据。"
-
-#: tdeio/tcpslavebase.cpp:325 tdeio/tcpslavebase.cpp:1087
-msgid "Security Information"
-msgstr "安全信息"
-
-#: tdeio/tcpslavebase.cpp:326
-msgid "C&ontinue Loading"
-msgstr "继续载入(&O)"
-
-#: tdeio/tcpslavebase.cpp:677
-msgid "Enter the certificate password:"
-msgstr "输入证书的密码："
-
-#: tdeio/tcpslavebase.cpp:678
-msgid "SSL Certificate Password"
-msgstr "SSL 证书密码"
-
-#: tdeio/tcpslavebase.cpp:691
-msgid "Unable to open the certificate. Try a new password?"
-msgstr "无法打开证书。试用新密码吗？"
-
-#: tdeio/tcpslavebase.cpp:704
-msgid "The procedure to set the client certificate for the session failed."
-msgstr "为会话设置客户端证书的过程失败。"
-
-#: tdeio/tcpslavebase.cpp:875
-msgid ""
-"The IP address of the host %1 does not match the one the certificate was issued "
-"to."
-msgstr "主机 %1 的 IP 地址和证书签发给的地址不匹配。"
-
-#: tdeio/tcpslavebase.cpp:880 tdeio/tcpslavebase.cpp:888 tdeio/tcpslavebase.cpp:923
-#: tdeio/tcpslavebase.cpp:997 tdeio/tcpslavebase.cpp:1009
-#: tdeio/tcpslavebase.cpp:1018 tdeio/tcpslavebase.cpp:1049
-msgid "Server Authentication"
-msgstr "服务器验证"
-
-#: tdeio/tcpslavebase.cpp:881 tdeio/tcpslavebase.cpp:889 tdeio/tcpslavebase.cpp:1019
-msgid "&Details"
-msgstr "细节(&D)"
-
-#: tdeio/tcpslavebase.cpp:882 tdeio/tcpslavebase.cpp:890
-msgid "Co&ntinue"
-msgstr "继续(&N)"
-
-#: tdeio/tcpslavebase.cpp:884 tdeio/tcpslavebase.cpp:1014
-msgid "The server certificate failed the authenticity test (%1)."
-msgstr "服务器证书没有通过验证测试 (%1)。"
-
-#: tdeio/tcpslavebase.cpp:920 tdeio/tcpslavebase.cpp:1046
-msgid ""
-"Would you like to accept this certificate forever without being prompted?"
-msgstr "您希望以后不提示就接受该证书吗？"
-
-#: tdeio/tcpslavebase.cpp:924 tdeio/tcpslavebase.cpp:1050
-msgid "&Forever"
-msgstr "永远(&F)"
-
-#: tdeio/tcpslavebase.cpp:925 tdeio/tcpslavebase.cpp:1051
-msgid "&Current Sessions Only"
-msgstr "仅当前会话(&C)"
-
-#: tdeio/tcpslavebase.cpp:996
-msgid ""
-"You have indicated that you wish to accept this certificate, but it is not "
-"issued to the server who is presenting it. Do you wish to continue loading?"
-msgstr "您已表明要接受该证书，但是它不是颁发给出示它的服务器的证书。您想继续载入吗？"
-
-#: tdeio/tcpslavebase.cpp:1008
-msgid ""
-"SSL certificate is being rejected as requested. You can disable this in the TDE "
-"Control Center."
-msgstr "SSL 证书将按要求被拒绝。您可以在 TDE 控制中心中禁用此选项。"
-
-#: tdeio/tcpslavebase.cpp:1020
-msgid "Co&nnect"
-msgstr "连接(&N)"
-
-#: tdeio/tcpslavebase.cpp:1076
-msgid ""
-"You are about to enter secure mode. All transmissions will be encrypted unless "
-"otherwise noted.\n"
-"This means that no third party will be able to easily observe your data in "
-"transit."
-msgstr ""
-"您即将进入安全模式。除非另外注明，所有的传输将会被加密。\n"
-"这表示第三方将不能轻易查看您传输的数据。"
-
-#: tdeio/tcpslavebase.cpp:1088
-msgid "Display SSL &Information"
-msgstr "显示 SSL 信息(&I)"
-
-#: tdeio/tcpslavebase.cpp:1090
-msgid "C&onnect"
-msgstr "连接(&O)"
-
-#: tdeio/kdcopservicestarter.cpp:64
-#, c-format
-msgid "No service implementing %1"
-msgstr "没有实现 %1 的服务"
-
-#: tdeio/kscan.cpp:52
-msgid "Acquire Image"
-msgstr "采集图像"
-
-#: tdeio/kscan.cpp:95
-msgid "OCR Image"
-msgstr "OCR 图像"
+#: tdeio/kimageio.cpp:231
+msgid "All Pictures"
+msgstr "全部图片"
 
 #: tdeio/defaultprogress.cpp:104
 msgid "Source:"
@@ -443,10 +2002,6 @@ msgstr "打开文件(&F)"
 msgid "Open &Destination"
 msgstr "打开目的(&D)"
 
-#: tdeio/defaultprogress.cpp:179 misc/uiserver.cpp:632
-msgid "Progress Dialog"
-msgstr "进度对话框"
-
 #: tdeio/defaultprogress.cpp:226
 #, no-c-format
 msgid ""
@@ -511,10 +2066,6 @@ msgid ""
 "%1 / %n files"
 msgstr "%1/%n 个文件"
 
-#: tdeio/defaultprogress.cpp:325 misc/uiserver.cpp:288
-msgid "Stalled"
-msgstr "暂停"
-
 #: tdeio/defaultprogress.cpp:327
 msgid "%1/s ( %2 remaining )"
 msgstr "%1/秒 (剩下 %2)"
@@ -548,10 +2099,6 @@ msgstr "检查文件进度"
 msgid "Mounting %1"
 msgstr "挂载 %1"
 
-#: tdeio/defaultprogress.cpp:410 misc/uiserver.cpp:378
-msgid "Unmounting"
-msgstr "卸载"
-
 #: tdeio/defaultprogress.cpp:418
 #, c-format
 msgid "Resuming from %1"
@@ -565,13 +2112,9 @@ msgstr "不可继续"
 msgid "%1/s (done)"
 msgstr "%1/s (完成)"
 
-#: tdeio/kservice.cpp:837
-msgid "Updating System Configuration"
-msgstr "更新系统配置"
-
-#: tdeio/kservice.cpp:838
-msgid "Updating system configuration."
-msgstr "更新系统配置。"
+#: tdeio/kshred.cpp:212
+msgid "Shredding:  pass %1 of 35"
+msgstr "强力删除：完成35次中的%1次"
 
 #: tdeio/global.cpp:48 tdeio/global.cpp:81
 msgid "%1 B"
@@ -640,22 +2183,22 @@ msgid ""
 "%n Folders"
 msgstr "%n 个文件夹"
 
-#: tdeio/global.cpp:220
+#: tdeio/global.cpp:237
 #, c-format
 msgid "Could not read %1."
 msgstr "无法读取 %1。"
 
-#: tdeio/global.cpp:223
+#: tdeio/global.cpp:240
 #, c-format
 msgid "Could not write to %1."
 msgstr "无法写入 %1。"
 
-#: tdeio/global.cpp:226
+#: tdeio/global.cpp:243
 #, c-format
 msgid "Could not start process %1."
 msgstr "无法启动进程 %1。"
 
-#: tdeio/global.cpp:229
+#: tdeio/global.cpp:246
 #, c-format
 msgid ""
 "Internal Error\n"
@@ -666,54 +2209,54 @@ msgstr ""
 "请在 http://bugs.kde.org 上提交一个完整的错误报告\n"
 "%1"
 
-#: tdeio/global.cpp:232
+#: tdeio/global.cpp:249
 #, c-format
 msgid "Malformed URL %1."
 msgstr "不正确的 URL %1。"
 
-#: tdeio/global.cpp:235
+#: tdeio/global.cpp:252
 msgid "The protocol %1 is not supported."
 msgstr "不支持协议 %1。"
 
-#: tdeio/global.cpp:238
+#: tdeio/global.cpp:255
 msgid "The protocol %1 is only a filter protocol."
 msgstr "协议 %1 只是一个过滤协议。"
 
-#: tdeio/global.cpp:245
+#: tdeio/global.cpp:262
 msgid "%1 is a folder, but a file was expected."
 msgstr "%1 是个文件夹，但现在需要一个文件。"
 
-#: tdeio/global.cpp:248
+#: tdeio/global.cpp:265
 msgid "%1 is a file, but a folder was expected."
 msgstr "%1 是个文件，但现在需要一个文件夹。"
 
-#: tdeio/global.cpp:251
+#: tdeio/global.cpp:268
 msgid "The file or folder %1 does not exist."
 msgstr "文件或文件夹 %1 不存在。"
 
-#: tdeio/global.cpp:254
+#: tdeio/global.cpp:271
 msgid "A file named %1 already exists."
 msgstr "名为 %1 的文件已存在。"
 
-#: tdeio/global.cpp:257
+#: tdeio/global.cpp:274
 msgid "A folder named %1 already exists."
 msgstr "名为 %1 的文件夹已存在。"
 
-#: tdeio/global.cpp:260
+#: tdeio/global.cpp:277
 msgid "No hostname specified."
 msgstr "没有指定主机名。"
 
-#: tdeio/global.cpp:260
+#: tdeio/global.cpp:277
 #, c-format
 msgid "Unknown host %1"
 msgstr "未知的主机 %1"
 
-#: tdeio/global.cpp:263
+#: tdeio/global.cpp:280
 #, c-format
 msgid "Access denied to %1."
 msgstr "拒绝访问 %1。"
 
-#: tdeio/global.cpp:266
+#: tdeio/global.cpp:283
 #, c-format
 msgid ""
 "Access denied.\n"
@@ -722,44 +2265,44 @@ msgstr ""
 "拒绝访问。\n"
 "无法写入 %1。"
 
-#: tdeio/global.cpp:269
+#: tdeio/global.cpp:286
 #, c-format
 msgid "Could not enter folder %1."
 msgstr "无法进入文件夹 %1。"
 
-#: tdeio/global.cpp:272
+#: tdeio/global.cpp:289
 msgid "The protocol %1 does not implement a folder service."
 msgstr "协议 %1 没有实现文件夹服务。"
 
-#: tdeio/global.cpp:275
+#: tdeio/global.cpp:292
 #, c-format
 msgid "Found a cyclic link in %1."
 msgstr "在 %1 中发现一个循环链接。"
 
-#: tdeio/global.cpp:281
+#: tdeio/global.cpp:298
 #, c-format
 msgid "Found a cyclic link while copying %1."
 msgstr "在复制 %1 时发现一个循环链接。"
 
-#: tdeio/global.cpp:284
+#: tdeio/global.cpp:301
 #, c-format
 msgid "Could not create socket for accessing %1."
 msgstr "无法为访问 %1 创建套接字。"
 
-#: tdeio/global.cpp:287
+#: tdeio/global.cpp:304
 #, c-format
 msgid "Could not connect to host %1."
 msgstr "无法连接到主机 %1。"
 
-#: tdeio/global.cpp:290
+#: tdeio/global.cpp:307
 msgid "Connection to host %1 is broken."
 msgstr "到主机 %1 的连接中断。"
 
-#: tdeio/global.cpp:293
+#: tdeio/global.cpp:310
 msgid "The protocol %1 is not a filter protocol."
 msgstr "协议 %1 不是一个过滤协议。"
 
-#: tdeio/global.cpp:296
+#: tdeio/global.cpp:313
 #, c-format
 msgid ""
 "Could not mount device.\n"
@@ -770,7 +2313,7 @@ msgstr ""
 "报告的错误为：\n"
 "%1"
 
-#: tdeio/global.cpp:299
+#: tdeio/global.cpp:316
 #, c-format
 msgid ""
 "Could not unmount device.\n"
@@ -781,76 +2324,76 @@ msgstr ""
 "报告的错误为：\n"
 "%1"
 
-#: tdeio/global.cpp:302
+#: tdeio/global.cpp:319
 #, c-format
 msgid "Could not read file %1."
 msgstr "无法读取文件 %1。"
 
-#: tdeio/global.cpp:305
+#: tdeio/global.cpp:322
 #, c-format
 msgid "Could not write to file %1."
 msgstr "无法写入文件 %1。"
 
-#: tdeio/global.cpp:308
+#: tdeio/global.cpp:325
 #, c-format
 msgid "Could not bind %1."
 msgstr "无法绑定 %1。"
 
-#: tdeio/global.cpp:311
+#: tdeio/global.cpp:328
 #, c-format
 msgid "Could not listen %1."
 msgstr "无法监听 %1。"
 
-#: tdeio/global.cpp:314
+#: tdeio/global.cpp:331
 #, c-format
 msgid "Could not accept %1."
 msgstr "无法接受 %1。"
 
-#: tdeio/global.cpp:320
+#: tdeio/global.cpp:337
 #, c-format
 msgid "Could not access %1."
 msgstr "无法访问 %1。"
 
-#: tdeio/global.cpp:323
+#: tdeio/global.cpp:340
 #, c-format
 msgid "Could not terminate listing %1."
 msgstr "无法停止列举 %1。"
 
-#: tdeio/global.cpp:326
+#: tdeio/global.cpp:343
 #, c-format
 msgid "Could not make folder %1."
 msgstr "无法创建文件夹 %1。"
 
-#: tdeio/global.cpp:329
+#: tdeio/global.cpp:346
 #, c-format
 msgid "Could not remove folder %1."
 msgstr "无法重命名文件夹 %1。"
 
-#: tdeio/global.cpp:332
+#: tdeio/global.cpp:349
 #, c-format
 msgid "Could not resume file %1."
 msgstr "无法续传文件 %1。"
 
-#: tdeio/global.cpp:335
+#: tdeio/global.cpp:352
 #, c-format
 msgid "Could not rename file %1."
 msgstr "无法重命名文件 %1。"
 
-#: tdeio/global.cpp:338
+#: tdeio/global.cpp:355
 #, c-format
 msgid "Could not change permissions for %1."
 msgstr "无法更改 %1 的权限。"
 
-#: tdeio/global.cpp:341
+#: tdeio/global.cpp:358
 #, c-format
 msgid "Could not delete file %1."
 msgstr "无法删除文件 %1。"
 
-#: tdeio/global.cpp:344
+#: tdeio/global.cpp:361
 msgid "The process for the %1 protocol died unexpectedly."
 msgstr "为 %1 协议服务的进程意外退出。"
 
-#: tdeio/global.cpp:347
+#: tdeio/global.cpp:364
 #, c-format
 msgid ""
 "Error. Out of memory.\n"
@@ -859,7 +2402,7 @@ msgstr ""
 "错误。内存不足。\n"
 "%1"
 
-#: tdeio/global.cpp:350
+#: tdeio/global.cpp:367
 #, c-format
 msgid ""
 "Unknown proxy host\n"
@@ -868,11 +2411,11 @@ msgstr ""
 "未知的代理主机\n"
 "%1"
 
-#: tdeio/global.cpp:353
+#: tdeio/global.cpp:370
 msgid "Authorization failed, %1 authentication not supported"
 msgstr "授权失败，不支持 %1 验证方式"
 
-#: tdeio/global.cpp:356
+#: tdeio/global.cpp:373
 #, c-format
 msgid ""
 "User canceled action\n"
@@ -881,7 +2424,7 @@ msgstr ""
 "用户取消了动作\n"
 "%1"
 
-#: tdeio/global.cpp:359
+#: tdeio/global.cpp:376
 #, c-format
 msgid ""
 "Internal error in server\n"
@@ -890,7 +2433,7 @@ msgstr ""
 "服务器内部错误\n"
 "%1"
 
-#: tdeio/global.cpp:362
+#: tdeio/global.cpp:379
 #, c-format
 msgid ""
 "Timeout on server\n"
@@ -899,7 +2442,7 @@ msgstr ""
 "服务器超时\n"
 "%1"
 
-#: tdeio/global.cpp:365
+#: tdeio/global.cpp:382
 #, c-format
 msgid ""
 "Unknown error\n"
@@ -908,7 +2451,7 @@ msgstr ""
 "未知的错误\n"
 "%1"
 
-#: tdeio/global.cpp:368
+#: tdeio/global.cpp:385
 #, c-format
 msgid ""
 "Unknown interrupt\n"
@@ -917,7 +2460,7 @@ msgstr ""
 "未知的中断\n"
 "%1"
 
-#: tdeio/global.cpp:379
+#: tdeio/global.cpp:396
 msgid ""
 "Could not delete original file %1.\n"
 "Please check permissions."
@@ -925,7 +2468,7 @@ msgstr ""
 "无法删除原始文件 %1。\n"
 "请检查权限。"
 
-#: tdeio/global.cpp:382
+#: tdeio/global.cpp:399
 msgid ""
 "Could not delete partial file %1.\n"
 "Please check permissions."
@@ -933,7 +2476,7 @@ msgstr ""
 "无法删除部分文件 %1。\n"
 "请检查权限。"
 
-#: tdeio/global.cpp:385
+#: tdeio/global.cpp:402
 msgid ""
 "Could not rename original file %1.\n"
 "Please check permissions."
@@ -941,7 +2484,7 @@ msgstr ""
 "无法重命名原始文件 %1。\n"
 "请检查权限。"
 
-#: tdeio/global.cpp:388
+#: tdeio/global.cpp:405
 msgid ""
 "Could not rename partial file %1.\n"
 "Please check permissions."
@@ -949,7 +2492,7 @@ msgstr ""
 "无法重命名部分文件 %1。\n"
 "请检查权限。"
 
-#: tdeio/global.cpp:391
+#: tdeio/global.cpp:408
 msgid ""
 "Could not create symlink %1.\n"
 "Please check permissions."
@@ -957,7 +2500,7 @@ msgstr ""
 "无法创建符号链接 %1。\n"
 "请检查权限。"
 
-#: tdeio/global.cpp:397
+#: tdeio/global.cpp:414
 msgid ""
 "Could not write file %1.\n"
 "Disk full."
@@ -965,7 +2508,7 @@ msgstr ""
 "无法写入文件 %1。\n"
 "磁盘已满。"
 
-#: tdeio/global.cpp:400
+#: tdeio/global.cpp:417
 #, c-format
 msgid ""
 "The source and destination are the same file.\n"
@@ -974,15 +2517,22 @@ msgstr ""
 "源文件和目标文件是同一文件。\n"
 "%1"
 
-#: tdeio/global.cpp:406
+#: tdeio/global.cpp:423
 msgid "%1 is required by the server, but is not available."
 msgstr "服务器需要 %1，但它不可用。"
 
-#: tdeio/global.cpp:409
+#: tdeio/global.cpp:426
 msgid "Access to restricted port in POST denied."
 msgstr "拒绝对 POST 中被限制端口的访问。"
 
-#: tdeio/global.cpp:412
+#: tdeio/global.cpp:429
+#, fuzzy
+msgid ""
+"Could not access %1.\n"
+"Offline mode active."
+msgstr "无法访问 %1。"
+
+#: tdeio/global.cpp:432
 msgid ""
 "Unknown error code %1\n"
 "%2\n"
@@ -992,289 +2542,291 @@ msgstr ""
 "%2\n"
 "请在 http://bugs.kde.org 上提交一个完整的错误报告。"
 
-#: tdeio/global.cpp:422
+#: tdeio/global.cpp:442
 #, c-format
 msgid "Opening connections is not supported with the protocol %1."
 msgstr "协议 %1 不支持打开连接。"
 
-#: tdeio/global.cpp:424
+#: tdeio/global.cpp:444
 #, c-format
 msgid "Closing connections is not supported with the protocol %1."
 msgstr "协议 %1 不支持关闭连接。"
 
-#: tdeio/global.cpp:426
+#: tdeio/global.cpp:446
 #, c-format
 msgid "Accessing files is not supported with the protocol %1."
 msgstr "协议 %1 不支持文件访问。"
 
-#: tdeio/global.cpp:428
+#: tdeio/global.cpp:448
 msgid "Writing to %1 is not supported."
 msgstr "不支持写入 %1。"
 
-#: tdeio/global.cpp:430
+#: tdeio/global.cpp:450
 #, c-format
 msgid "There are no special actions available for protocol %1."
 msgstr "协议 %1 没有可用的特殊动作。"
 
-#: tdeio/global.cpp:432
+#: tdeio/global.cpp:452
 #, c-format
 msgid "Listing folders is not supported for protocol %1."
 msgstr "协议 %1 不支持列出文件夹内容。"
 
-#: tdeio/global.cpp:434
+#: tdeio/global.cpp:454
 msgid "Retrieving data from %1 is not supported."
 msgstr "不支持从 %1 获取数据。"
 
-#: tdeio/global.cpp:436
+#: tdeio/global.cpp:456
 msgid "Retrieving mime type information from %1 is not supported."
 msgstr "抱歉，不支持从 %1 获取 MIME 类型。"
 
-#: tdeio/global.cpp:438
+#: tdeio/global.cpp:458
 msgid "Renaming or moving files within %1 is not supported."
 msgstr "不支持在 %1 内重命名或移动文件。"
 
-#: tdeio/global.cpp:440
+#: tdeio/global.cpp:460
 #, c-format
 msgid "Creating symlinks is not supported with protocol %1."
 msgstr "协议 %1 不支持符号链接。"
 
-#: tdeio/global.cpp:442
+#: tdeio/global.cpp:462
 msgid "Copying files within %1 is not supported."
 msgstr "不支持在 %1 内复制文件。"
 
-#: tdeio/global.cpp:444
+#: tdeio/global.cpp:464
 msgid "Deleting files from %1 is not supported."
 msgstr "不支持从 %1 删除文件。"
 
-#: tdeio/global.cpp:446
+#: tdeio/global.cpp:466
 #, c-format
 msgid "Creating folders is not supported with protocol %1."
 msgstr "协议 %1 不支持创建文件夹。"
 
-#: tdeio/global.cpp:448
+#: tdeio/global.cpp:468
 #, c-format
 msgid "Changing the attributes of files is not supported with protocol %1."
 msgstr "协议 %1 不支持更改文件属性。"
 
-#: tdeio/global.cpp:450
+#: tdeio/global.cpp:470
 msgid "Using sub-URLs with %1 is not supported."
 msgstr "不支持在 %1 使用子 URLs。"
 
-#: tdeio/global.cpp:452
+#: tdeio/global.cpp:472
 #, c-format
 msgid "Multiple get is not supported with protocol %1."
 msgstr "协议 %1 不支持多次获取。"
 
-#: tdeio/global.cpp:454
+#: tdeio/global.cpp:474
 msgid "Protocol %1 does not support action %2."
 msgstr "协议 %1 不支持动作 %2。"
 
-#: tdeio/global.cpp:474 tdeio/global.cpp:556
+#: tdeio/global.cpp:494 tdeio/global.cpp:576
 msgid "(unknown)"
 msgstr "(未知)"
 
-#: tdeio/global.cpp:486
+#: tdeio/global.cpp:506
 msgid "<b>Technical reason</b>: "
 msgstr "<b>技术原因</b>："
 
-#: tdeio/global.cpp:487
+#: tdeio/global.cpp:507
 msgid "</p><p><b>Details of the request</b>:"
 msgstr "</p><p><b>请求的细节</b>："
 
-#: tdeio/global.cpp:488
+#: tdeio/global.cpp:508
 msgid "</p><ul><li>URL: %1</li>"
 msgstr "</p><ul><li>URL：%1</li>"
 
-#: tdeio/global.cpp:490
+#: tdeio/global.cpp:510
 msgid "<li>Protocol: %1</li>"
 msgstr "<li>协议：%1</li>"
 
-#: tdeio/global.cpp:492
+#: tdeio/global.cpp:512
 msgid "<li>Date and time: %1</li>"
 msgstr "<li>日期和时间：%1</li>"
 
-#: tdeio/global.cpp:493
+#: tdeio/global.cpp:513
 msgid "<li>Additional information: %1</li></ul>"
 msgstr "<li>其它信息：%1</li></ul>"
 
-#: tdeio/global.cpp:495
+#: tdeio/global.cpp:515
 msgid "<p><b>Possible causes</b>:</p><ul><li>"
 msgstr "<p><b>可能原因</b>：</p><ul><li>"
 
-#: tdeio/global.cpp:500
+#: tdeio/global.cpp:520
 msgid "<p><b>Possible solutions</b>:</p><ul><li>"
 msgstr "<p><b>可能的解决方法</b>：</p></ul><li>"
 
-#: tdeio/global.cpp:566
+#: tdeio/global.cpp:586
 msgid ""
 "Contact your appropriate computer support system, whether the system "
 "administrator, or technical support group for further assistance."
 msgstr "请联系合适的计算机支持系统来获得更多帮助，例如系统管理员或技术支持小组。"
 
-#: tdeio/global.cpp:569
+#: tdeio/global.cpp:589
 msgid "Contact the administrator of the server for further assistance."
 msgstr "联系服务器的管理员以获得更多帮助。"
 
-#: tdeio/global.cpp:572
+#: tdeio/global.cpp:592
 msgid "Check your access permissions on this resource."
 msgstr "检查您对该资源的访问权限。"
 
-#: tdeio/global.cpp:573
+#: tdeio/global.cpp:593
 msgid ""
 "Your access permissions may be inadequate to perform the requested operation on "
 "this resource."
 msgstr "您可能没有足够权限来执行所请求的对该资源的操作。"
 
-#: tdeio/global.cpp:575
+#: tdeio/global.cpp:595
 msgid ""
 "The file may be in use (and thus locked) by another user or application."
 msgstr "文件可能正在被其它人或程序使用(所以被锁定)。"
 
-#: tdeio/global.cpp:577
+#: tdeio/global.cpp:597
 msgid ""
 "Check to make sure that no other application or user is using the file or has "
 "locked the file."
 msgstr "请检查并确定没有其它的程序或用户正在使用该文件或锁定该文件。"
 
-#: tdeio/global.cpp:579
+#: tdeio/global.cpp:599
 msgid "Although unlikely, a hardware error may have occurred."
 msgstr "虽然不太可能，也许出现了硬件错误。"
 
-#: tdeio/global.cpp:581
+#: tdeio/global.cpp:601
 msgid "You may have encountered a bug in the program."
 msgstr "您可能遇到了程序中的错误。"
 
-#: tdeio/global.cpp:582
+#: tdeio/global.cpp:602
 msgid ""
 "This is most likely to be caused by a bug in the program. Please consider "
 "submitting a full bug report as detailed below."
 msgstr "最大的可能是程序中的错误导致。请考虑提交一个详细的错误报告。"
 
-#: tdeio/global.cpp:584
+#: tdeio/global.cpp:604
 msgid ""
 "Update your software to the latest version. Your distribution should provide "
 "tools to update your software."
 msgstr "请将您的软件更新至最新版本。您使用的发行版本应该提供了更新软件的工具。"
 
-#: tdeio/global.cpp:586
+#: tdeio/global.cpp:606
+#, fuzzy
 msgid ""
 "When all else fails, please consider helping the TDE team or the third party "
 "maintainer of this software by submitting a high quality bug report. If the "
 "software is provided by a third party, please contact them directly. Otherwise, "
 "first look to see if the same bug has been submitted by someone else by "
-"searching at the <a href=\"http://bugs.kde.org/\">TDE bug reporting website</a>"
-". If not, take note of the details given above, and include them in your bug "
-"report, along with as many other details as you think might help."
+"searching at the <a href=\"http://bugs.pearsoncomputing.net//\">"
+"TDE bug reporting website</a>. If not, take note of the details given above, "
+"and include them in your bug report, along with as many other details as you "
+"think might help."
 msgstr ""
 "当其它所有方式都失败后，请考虑提交一份高质量的错误报告来帮助 TDE "
 "团队或此软件的第三方维护者。如果该软件是由第三方提供的，请直接联系他们。否则，先看看相同的错误是否已经由其他人提交了。您可以在 <a "
 "href=\"http://bugs.kde.org/\">TDE "
 "错误报告网站</a>搜索一番。如果没有相同的错误，请注意上面给出的信息，并在错误报告中包含这些信息，以及您认为可能有帮助的其它细节。"
 
-#: tdeio/global.cpp:594
+#: tdeio/global.cpp:614
 msgid "There may have been a problem with your network connection."
 msgstr "您的网络连接可能有问题。"
 
-#: tdeio/global.cpp:597
+#: tdeio/global.cpp:617
 msgid ""
 "There may have been a problem with your network configuration. If you have been "
 "accessing the Internet with no problems recently, this is unlikely."
 msgstr "您的网络配置可能有问题。如果您最近访问网络没有问题，这就不太可能。"
 
-#: tdeio/global.cpp:600
+#: tdeio/global.cpp:620
 msgid ""
 "There may have been a problem at some point along the network path between the "
 "server and this computer."
 msgstr "在网络中该计算机和服务器之间的路径可能有问题。"
 
-#: tdeio/global.cpp:602
+#: tdeio/global.cpp:622
 msgid "Try again, either now or at a later time."
 msgstr "请即刻或稍后再重试。"
 
-#: tdeio/global.cpp:603
+#: tdeio/global.cpp:623
 msgid "A protocol error or incompatibility may have occurred."
 msgstr "可能出现了协议错误或不兼容。"
 
-#: tdeio/global.cpp:604
+#: tdeio/global.cpp:624
 msgid "Ensure that the resource exists, and try again."
 msgstr "请确保资源存在后再重试。"
 
-#: tdeio/global.cpp:605
+#: tdeio/global.cpp:625
 msgid "The specified resource may not exist."
 msgstr "指定的资源可能不存在。"
 
-#: tdeio/global.cpp:606
+#: tdeio/global.cpp:626
 msgid "You may have incorrectly typed the location."
 msgstr "您可能输入了错误的位置。"
 
-#: tdeio/global.cpp:607
+#: tdeio/global.cpp:627
 msgid "Double-check that you have entered the correct location and try again."
 msgstr "请反复确认您输入了正确的位置后再重试。"
 
-#: tdeio/global.cpp:609
+#: tdeio/global.cpp:629
 msgid "Check your network connection status."
 msgstr "检查您的网络连接状态。"
 
-#: tdeio/global.cpp:613
+#: tdeio/global.cpp:633
 msgid "Cannot Open Resource For Reading"
 msgstr "无法打开资源来读取"
 
-#: tdeio/global.cpp:614
+#: tdeio/global.cpp:634
 msgid ""
 "This means that the contents of the requested file or folder <strong>%1</strong> "
 "could not be retrieved, as read access could not be obtained."
 msgstr "由于无法获取读权限，无法获取所请求的文件或文件夹<strong>%1</strong>的内容。"
 
-#: tdeio/global.cpp:617
+#: tdeio/global.cpp:637
 msgid "You may not have permissions to read the file or open the folder."
 msgstr "您可能没有读取文件或打开文件夹的权限。"
 
-#: tdeio/global.cpp:623
+#: tdeio/global.cpp:643
 msgid "Cannot Open Resource For Writing"
 msgstr "无法打开资源以写入"
 
-#: tdeio/global.cpp:624
+#: tdeio/global.cpp:644
 msgid ""
 "This means that the file, <strong>%1</strong>, could not be written to as "
 "requested, because access with permission to write could not be obtained."
 msgstr "由于无法获得写权限，无法按请求写入文件<strong>%1</strong>。"
 
-#: tdeio/global.cpp:632
+#: tdeio/global.cpp:652
 msgid "Cannot Initiate the %1 Protocol"
 msgstr "无法初始化 %1 协议"
 
-#: tdeio/global.cpp:633
+#: tdeio/global.cpp:653
 msgid "Unable to Launch Process"
 msgstr "无法启动进程"
 
-#: tdeio/global.cpp:634
+#: tdeio/global.cpp:654
 msgid ""
 "The program on your computer which provides access to the <strong>%1</strong> "
 "protocol could not be started. This is usually due to technical reasons."
 msgstr "您计算机上提供<strong>%1</strong>协议的程序无法被启动。这通常是由于技术原因。"
 
-#: tdeio/global.cpp:637
+#: tdeio/global.cpp:657
 msgid ""
 "The program which provides compatibility with this protocol may not have been "
 "updated with your last update of TDE. This can cause the program to be "
 "incompatible with the current version and thus not start."
 msgstr "提供此协议兼容性的程序可能没有与您最新的 TDE 一起更新。这导致程序与当前版本不兼容，因此无法启动。"
 
-#: tdeio/global.cpp:645
+#: tdeio/global.cpp:665
 msgid "Internal Error"
 msgstr "内部错误"
 
-#: tdeio/global.cpp:646
+#: tdeio/global.cpp:666
 msgid ""
 "The program on your computer which provides access to the <strong>%1</strong> "
 "protocol has reported an internal error."
 msgstr "您计算机上提供<strong>%1</strong>协议的程序报告了一个内部错误。"
 
-#: tdeio/global.cpp:654
+#: tdeio/global.cpp:674
 msgid "Improperly Formatted URL"
 msgstr "未正确格式化的URL"
 
-#: tdeio/global.cpp:655
+#: tdeio/global.cpp:675
 msgid ""
 "The <strong>U</strong>niform <strong>R</strong>esource <strong>L</strong>"
 "ocator (URL) that you entered was not properly formatted. The format of a URL "
@@ -1286,28 +2838,28 @@ msgstr ""
 "<blockquote><strong>协议://用户名@密码:www.example.org:端口/文件夹/文件名.扩展名?查询=值</strong>"
 "</blockquote>"
 
-#: tdeio/global.cpp:664
+#: tdeio/global.cpp:684
 #, c-format
 msgid "Unsupported Protocol %1"
 msgstr "不支持的协议 %1"
 
-#: tdeio/global.cpp:665
+#: tdeio/global.cpp:685
 msgid ""
 "The protocol <strong>%1</strong> is not supported by the TDE programs currently "
 "installed on this computer."
 msgstr "目前安装在该计算机上的 TDE 程序不支持协议 <strong>%1</strong>。"
 
-#: tdeio/global.cpp:668
+#: tdeio/global.cpp:688
 msgid "The requested protocol may not be supported."
 msgstr "请求的协议可能不被支持。"
 
-#: tdeio/global.cpp:669
+#: tdeio/global.cpp:689
 msgid ""
 "The versions of the %1 protocol supported by this computer and the server may "
 "be incompatible."
 msgstr "该计算机支持的 %1 协议的版本可能和服务器的版本不兼容。"
 
-#: tdeio/global.cpp:671
+#: tdeio/global.cpp:691
 msgid ""
 "You may perform a search on the Internet for a TDE program (called a tdeioslave "
 "or ioslave) which supports this protocol. Places to search include <a "
@@ -1318,21 +2870,21 @@ msgstr ""
 "href=\"http://kde-apps.org/\">http://kde-apps.org/</a> "
 "和 <a href=\"http://freshmeat.net/\">http://freshmeat.net/</a>。"
 
-#: tdeio/global.cpp:680
+#: tdeio/global.cpp:700
 msgid "URL Does Not Refer to a Resource."
 msgstr "URL 不是一个资源。"
 
-#: tdeio/global.cpp:681
+#: tdeio/global.cpp:701
 msgid "Protocol is a Filter Protocol"
 msgstr "协议是一个过滤协议"
 
-#: tdeio/global.cpp:682
+#: tdeio/global.cpp:702
 msgid ""
 "The <strong>U</strong>niform <strong>R</strong>esource <strong>L</strong>"
 "ocator (URL) that you entered did not refer to a specific resource."
 msgstr "您输入的统一资源定位符(<strong>URL</strong>)不是特定资源。"
 
-#: tdeio/global.cpp:685
+#: tdeio/global.cpp:705
 msgid ""
 "TDE is able to communicate through a protocol within a protocol; the protocol "
 "specified is only for use in such situations, however this is not one of these "
@@ -1340,171 +2892,171 @@ msgid ""
 "error."
 msgstr "TDE 可以通过协议中的协议通讯；特定的协议仅用于特定的情况，但是目前并不是这些情况之一。这种情况非常罕见，可能表明出现了编程错误。"
 
-#: tdeio/global.cpp:693
+#: tdeio/global.cpp:713
 #, c-format
 msgid "Unsupported Action: %1"
 msgstr "不支持的动作：%1"
 
-#: tdeio/global.cpp:694
+#: tdeio/global.cpp:714
 msgid ""
 "The requested action is not supported by the TDE program which is implementing "
 "the <strong>%1</strong> protocol."
 msgstr "实现<strong>%1</strong>协议的 TDE 程序不支持所请求的动作。"
 
-#: tdeio/global.cpp:697
+#: tdeio/global.cpp:717
 msgid ""
 "This error is very much dependent on the TDE program. The additional "
 "information should give you more information than is available to the TDE "
 "input/output architecture."
 msgstr "该错误依赖于 TDE 程序。额外的信息应该给您提供比 TDE 输入输出体系更多的信息。"
 
-#: tdeio/global.cpp:700
+#: tdeio/global.cpp:720
 msgid "Attempt to find another way to accomplish the same outcome."
 msgstr "试图查找另一种获得同一结果的方式。"
 
-#: tdeio/global.cpp:705
+#: tdeio/global.cpp:725
 msgid "File Expected"
 msgstr "需要文件"
 
-#: tdeio/global.cpp:706
+#: tdeio/global.cpp:726
 msgid ""
 "The request expected a file, however the folder <strong>%1</strong> "
 "was found instead."
 msgstr "请求需要一个文件，然而 <strong>%1</strong> 是一个文件夹。"
 
-#: tdeio/global.cpp:708
+#: tdeio/global.cpp:728
 msgid "This may be an error on the server side."
 msgstr "这可能是服务器端的错误。"
 
-#: tdeio/global.cpp:713
+#: tdeio/global.cpp:733
 msgid "Folder Expected"
 msgstr "需要文件夹"
 
-#: tdeio/global.cpp:714
+#: tdeio/global.cpp:734
 msgid ""
 "The request expected a folder, however the file <strong>%1</strong> "
 "was found instead."
 msgstr "请求需要一个文件夹，然而 <strong>%1</strong> 是一个文件。"
 
-#: tdeio/global.cpp:721
+#: tdeio/global.cpp:741
 msgid "File or Folder Does Not Exist"
 msgstr "文件或文件夹不存在"
 
-#: tdeio/global.cpp:722
+#: tdeio/global.cpp:742
 msgid "The specified file or folder <strong>%1</strong> does not exist."
 msgstr "指定的文件或文件夹 %1 不存在。"
 
-#: tdeio/global.cpp:730
+#: tdeio/global.cpp:750
 msgid ""
 "The requested file could not be created because a file with the same name "
 "already exists."
 msgstr "无法创建请求的文件，原因是已经存在相同名称的文件。"
 
-#: tdeio/global.cpp:732
+#: tdeio/global.cpp:752
 msgid "Try moving the current file out of the way first, and then try again."
 msgstr "请试着先将当前文件移动到其它位置，然后再试一次。"
 
-#: tdeio/global.cpp:734
+#: tdeio/global.cpp:754
 msgid "Delete the current file and try again."
 msgstr "删除当前文件然后再试一次。"
 
-#: tdeio/global.cpp:735
+#: tdeio/global.cpp:755
 msgid "Choose an alternate filename for the new file."
 msgstr "为新建文件选择其它的文件名。"
 
-#: tdeio/global.cpp:740
+#: tdeio/global.cpp:760
 msgid ""
 "The requested folder could not be created because a folder with the same name "
 "already exists."
 msgstr "无法创建请求的文件夹，原因是已经存在相同名称的文件夹。"
 
-#: tdeio/global.cpp:742
+#: tdeio/global.cpp:762
 msgid "Try moving the current folder out of the way first, and then try again."
 msgstr "请试着先将当前文件夹移动到其它位置，然后再试一次。"
 
-#: tdeio/global.cpp:744
+#: tdeio/global.cpp:764
 msgid "Delete the current folder and try again."
 msgstr "删除当前文件夹然后再试一次。"
 
-#: tdeio/global.cpp:745
+#: tdeio/global.cpp:765
 msgid "Choose an alternate name for the new folder."
 msgstr "为新建文件夹选择其它的名称。"
 
-#: tdeio/global.cpp:749
+#: tdeio/global.cpp:769
 msgid "Unknown Host"
 msgstr "未知主机"
 
-#: tdeio/global.cpp:750
+#: tdeio/global.cpp:770
 msgid ""
 "An unknown host error indicates that the server with the requested name, "
 "<strong>%1</strong>, could not be located on the Internet."
 msgstr "未知主机错误表明了在互联网上找不到所请求的名称为<strong>%1</strong>的服务器。"
 
-#: tdeio/global.cpp:753
+#: tdeio/global.cpp:773
 msgid ""
 "The name that you typed, %1, may not exist: it may be incorrectly typed."
 msgstr "您输入的名称 %1 可能不存在：可能输错了。"
 
-#: tdeio/global.cpp:760
+#: tdeio/global.cpp:780
 msgid "Access Denied"
 msgstr "拒绝访问"
 
-#: tdeio/global.cpp:761
+#: tdeio/global.cpp:781
 msgid "Access was denied to the specified resource, <strong>%1</strong>."
 msgstr "拒绝访问指定的资源，<strong>%1</strong>。"
 
-#: tdeio/global.cpp:763 tdeio/global.cpp:979
+#: tdeio/global.cpp:783 tdeio/global.cpp:999
 msgid "You may have supplied incorrect authentication details or none at all."
 msgstr "您可能提供了不正确的验证细节或根本没有提供。"
 
-#: tdeio/global.cpp:765 tdeio/global.cpp:981
+#: tdeio/global.cpp:785 tdeio/global.cpp:1001
 msgid "Your account may not have permission to access the specified resource."
 msgstr "您的帐号可能没有访问指定资源的权限。"
 
-#: tdeio/global.cpp:767 tdeio/global.cpp:983 tdeio/global.cpp:995
+#: tdeio/global.cpp:787 tdeio/global.cpp:1003 tdeio/global.cpp:1015
 msgid ""
 "Retry the request and ensure your authentication details are entered correctly."
 msgstr "重试请求并确保您的验证细节已被正确输入。"
 
-#: tdeio/global.cpp:773
+#: tdeio/global.cpp:793
 msgid "Write Access Denied"
 msgstr "拒绝写入"
 
-#: tdeio/global.cpp:774
+#: tdeio/global.cpp:794
 msgid ""
 "This means that an attempt to write to the file <strong>%1</strong> "
 "was rejected."
 msgstr "这意味着试图写入文件 <strong>%1</strong> 被拒绝。"
 
-#: tdeio/global.cpp:781
+#: tdeio/global.cpp:801
 msgid "Unable to Enter Folder"
 msgstr "无法进入文件夹"
 
-#: tdeio/global.cpp:782
+#: tdeio/global.cpp:802
 msgid ""
 "This means that an attempt to enter (in other words, to open) the requested "
 "folder <strong>%1</strong> was rejected."
 msgstr "这意味着试图进入(或说打开)请求的文件夹<strong>%1</strong>被拒绝。"
 
-#: tdeio/global.cpp:790
+#: tdeio/global.cpp:810
 msgid "Folder Listing Unavailable"
 msgstr "文件夹列表不可用"
 
-#: tdeio/global.cpp:791
+#: tdeio/global.cpp:811
 msgid "Protocol %1 is not a Filesystem"
 msgstr "协议 %1 不是一个文件系统"
 
-#: tdeio/global.cpp:792
+#: tdeio/global.cpp:812
 msgid ""
 "This means that a request was made which requires determining the contents of "
 "the folder, and the TDE program supporting this protocol is unable to do so."
 msgstr "这意味着产生了一个需要确定文件夹内容的请求，而支持此协议的 TDE 程序无法完成此功能。"
 
-#: tdeio/global.cpp:800
+#: tdeio/global.cpp:820
 msgid "Cyclic Link Detected"
 msgstr "检测到循环链接"
 
-#: tdeio/global.cpp:801
+#: tdeio/global.cpp:821
 msgid ""
 "UNIX environments are commonly able to link a file or folder to a separate name "
 "and/or location. TDE detected a link or series of links that results in an "
@@ -1512,29 +3064,29 @@ msgid ""
 "itself."
 msgstr "UNIX 环境通常允许将文件或文件夹链接到其它名称和/或位置。TDE 检测到链接的结果是无穷循环。即，文件(可能是间接的)链接到它自己。"
 
-#: tdeio/global.cpp:805 tdeio/global.cpp:827
+#: tdeio/global.cpp:825 tdeio/global.cpp:847
 msgid ""
 "Delete one part of the loop in order that it does not cause an infinite loop, "
 "and try again."
 msgstr "删除循环中的一部分，以便不再构成无穷循环，然后再试一次。"
 
-#: tdeio/global.cpp:814
+#: tdeio/global.cpp:834
 msgid "Request Aborted By User"
 msgstr "请求被用户中止"
 
-#: tdeio/global.cpp:815 tdeio/global.cpp:1108
+#: tdeio/global.cpp:835 tdeio/global.cpp:1128
 msgid "The request was not completed because it was aborted."
 msgstr "请求未完成，原因是被中止。"
 
-#: tdeio/global.cpp:817 tdeio/global.cpp:1011 tdeio/global.cpp:1110
+#: tdeio/global.cpp:837 tdeio/global.cpp:1031 tdeio/global.cpp:1130
 msgid "Retry the request."
 msgstr "重试请求。"
 
-#: tdeio/global.cpp:821
+#: tdeio/global.cpp:841
 msgid "Cyclic Link Detected During Copy"
 msgstr "复制时检测到了循环链接"
 
-#: tdeio/global.cpp:822
+#: tdeio/global.cpp:842
 msgid ""
 "UNIX environments are commonly able to link a file or folder to a separate name "
 "and/or location. During the requested copy operation, TDE detected a link or "
@@ -1543,80 +3095,81 @@ msgid ""
 msgstr ""
 "UNIX 环境通常允许将文件或文件夹链接到其它名称和/或位置。在请求的复制过程中，TDE 检测到链接的结果是无穷循环。即，文件(可能是间接的)链接到它自己。"
 
-#: tdeio/global.cpp:832
+#: tdeio/global.cpp:852
 msgid "Could Not Create Network Connection"
 msgstr "无法创建网络连接"
 
-#: tdeio/global.cpp:833
+#: tdeio/global.cpp:853
 msgid "Could Not Create Socket"
 msgstr "无法创建套接字"
 
-#: tdeio/global.cpp:834
+#: tdeio/global.cpp:854
 msgid ""
 "This is a fairly technical error in which a required device for network "
 "communications (a socket) could not be created."
 msgstr "这是一个技术错误。无法创建网络通讯(套接字)请求的设备。"
 
-#: tdeio/global.cpp:836 tdeio/global.cpp:949 tdeio/global.cpp:960 tdeio/global.cpp:969
+#: tdeio/global.cpp:856 tdeio/global.cpp:969 tdeio/global.cpp:980
+#: tdeio/global.cpp:989
 msgid ""
 "The network connection may be incorrectly configured, or the network interface "
 "may not be enabled."
 msgstr "网络连接可能配置不正确，或者网络接口未启用。"
 
-#: tdeio/global.cpp:842
+#: tdeio/global.cpp:862
 msgid "Connection to Server Refused"
 msgstr "拒绝连接服务器"
 
-#: tdeio/global.cpp:843
+#: tdeio/global.cpp:863
 msgid ""
 "The server <strong>%1</strong> refused to allow this computer to make a "
 "connection."
 msgstr "服务器 <strong>%1</strong> 拒绝允许此计算机连接。"
 
-#: tdeio/global.cpp:845
+#: tdeio/global.cpp:865
 msgid ""
 "The server, while currently connected to the Internet, may not be configured to "
 "allow requests."
 msgstr "目前虽然连接到 Internet，该服务器可能没有被配置成允许接受请求。"
 
-#: tdeio/global.cpp:847
+#: tdeio/global.cpp:867
 msgid ""
 "The server, while currently connected to the Internet, may not be running the "
 "requested service (%1)."
 msgstr "目前虽然连接到互联网中，该服务器可能没有在运行所请求的服务(%1)。"
 
-#: tdeio/global.cpp:849
+#: tdeio/global.cpp:869
 msgid ""
 "A network firewall (a device which restricts Internet requests), either "
 "protecting your network or the network of the server, may have intervened, "
 "preventing this request."
 msgstr "网络防火墙(限制 Internet 请求的设备)，保护您的网络或服务器网络的设备，可能干涉并阻止了这一请求。"
 
-#: tdeio/global.cpp:856
+#: tdeio/global.cpp:876
 msgid "Connection to Server Closed Unexpectedly"
 msgstr "到服务器的连接异常关闭"
 
-#: tdeio/global.cpp:857
+#: tdeio/global.cpp:877
 msgid ""
 "Although a connection was established to <strong>%1</strong>"
 ", the connection was closed at an unexpected point in the communication."
 msgstr "尽管已经建立了到 <strong>%1</strong>的连接，该连接在通讯的未预期点处已关闭。"
 
-#: tdeio/global.cpp:860
+#: tdeio/global.cpp:880
 msgid ""
 "A protocol error may have occurred, causing the server to close the connection "
 "as a response to the error."
 msgstr "可能发生了协议错误，导致服务器关闭了连接作为对错误的响应。"
 
-#: tdeio/global.cpp:866
+#: tdeio/global.cpp:886
 msgid "URL Resource Invalid"
 msgstr "URL 资源无效"
 
-#: tdeio/global.cpp:867
+#: tdeio/global.cpp:887
 msgid "Protocol %1 is not a Filter Protocol"
 msgstr "协议 %1 不是一个过滤协议"
 
-#: tdeio/global.cpp:868
+#: tdeio/global.cpp:888
 msgid ""
 "The <strong>U</strong>niform <strong>R</strong>esource <strong>L</strong>"
 "ocator (URL) that you entered did not refer to a valid mechanism of accessing "
@@ -1624,7 +3177,7 @@ msgid ""
 msgstr ""
 "您输入的统一资源定位符(<strong>URL</strong>)格式不是访问指定资源 <strong>%1%2</strong>的有效机制。"
 
-#: tdeio/global.cpp:873
+#: tdeio/global.cpp:893
 msgid ""
 "TDE is able to communicate through a protocol within a protocol. This request "
 "specified a protocol be used as such, however this protocol is not capable of "
@@ -1632,271 +3185,271 @@ msgid ""
 "error."
 msgstr "TDE 可以通过协议中的协议通讯；特定的协议仅用于特定的情况，但是目前并不是这些情况之一。这种情况非常罕见，可能表明出现了编程错误。"
 
-#: tdeio/global.cpp:881
+#: tdeio/global.cpp:901
 msgid "Unable to Initialize Input/Output Device"
 msgstr "无法初始化输入/输出设备"
 
-#: tdeio/global.cpp:882
+#: tdeio/global.cpp:902
 msgid "Could Not Mount Device"
 msgstr "无法挂载设备"
 
-#: tdeio/global.cpp:883
+#: tdeio/global.cpp:903
 msgid ""
 "The requested device could not be initialized (\"mounted\"). The reported error "
 "was: <strong>%1</strong>"
 msgstr "请求的设备无法被初始化(“被挂载”)。报告的错误是：<strong>%1</strong>"
 
-#: tdeio/global.cpp:886
+#: tdeio/global.cpp:906
 msgid ""
 "The device may not be ready, for example there may be no media in a removable "
 "media device (i.e. no CD-ROM in a CD drive), or in the case of a "
 "peripheral/portable device, the device may not be correctly connected."
 msgstr "设备可能没有就绪，如可移介质驱动器中没有介质(即光驱中没有光盘)，或者便携设备没有被正确连接。"
 
-#: tdeio/global.cpp:890
+#: tdeio/global.cpp:910
 msgid ""
 "You may not have permissions to initialize (\"mount\") the device. On UNIX "
 "systems, often system administrator privileges are required to initialize a "
 "device."
 msgstr "您可能没有初始化(“挂载”)该设备的权限。在 UNIX 系统中，要初始化设备通常需要系统管理员权限。"
 
-#: tdeio/global.cpp:894
+#: tdeio/global.cpp:914
 msgid ""
 "Check that the device is ready; removable drives must contain media, and "
 "portable devices must be connected and powered on.; and try again."
 msgstr "请检查该设备已经就绪；可移驱动器中必须包含介质，而且便携设备必须被正确连接并打开电源；然后再试一次。"
 
-#: tdeio/global.cpp:900
+#: tdeio/global.cpp:920
 msgid "Unable to Uninitialize Input/Output Device"
 msgstr "无法取消初始化输入/输出设备"
 
-#: tdeio/global.cpp:901
+#: tdeio/global.cpp:921
 msgid "Could Not Unmount Device"
 msgstr "无法卸载设备"
 
-#: tdeio/global.cpp:902
+#: tdeio/global.cpp:922
 msgid ""
 "The requested device could not be uninitialized (\"unmounted\"). The reported "
 "error was: <strong>%1</strong>"
 msgstr "请求的设备无法被卸载。报告的错误是：<strong>%1</strong>"
 
-#: tdeio/global.cpp:905
+#: tdeio/global.cpp:925
 msgid ""
 "The device may be busy, that is, still in use by another application or user. "
 "Even such things as having an open browser window on a location on this device "
 "may cause the device to remain in use."
 msgstr "该设备可能正忙，即正被其它程序或用户使用。甚至打开一个此设备上位置的浏览器窗口都可能导致它处于被使用状态。"
 
-#: tdeio/global.cpp:909
+#: tdeio/global.cpp:929
 msgid ""
 "You may not have permissions to uninitialize (\"unmount\") the device. On UNIX "
 "systems, system administrator privileges are often required to uninitialize a "
 "device."
 msgstr "您没有卸载设备的权限。在 UNIX 系统中，要卸载设备通常需要系统管理员权限。"
 
-#: tdeio/global.cpp:913
+#: tdeio/global.cpp:933
 msgid "Check that no applications are accessing the device, and try again."
 msgstr "请确定没有应用程序正在使用该设备，然后再试一次。"
 
-#: tdeio/global.cpp:918
+#: tdeio/global.cpp:938
 msgid "Cannot Read From Resource"
 msgstr "无法读取资源"
 
-#: tdeio/global.cpp:919
+#: tdeio/global.cpp:939
 msgid ""
 "This means that although the resource, <strong>%1</strong>"
 ", was able to be opened, an error occurred while reading the contents of the "
 "resource."
 msgstr "这意味着，资源 <strong>%1</strong> 虽然可以打开，但是在读取资源内容的时候发生了错误。"
 
-#: tdeio/global.cpp:922
+#: tdeio/global.cpp:942
 msgid "You may not have permissions to read from the resource."
 msgstr "您没有读取此资源的权限。"
 
-#: tdeio/global.cpp:931
+#: tdeio/global.cpp:951
 msgid "Cannot Write to Resource"
 msgstr "无法写入资源"
 
-#: tdeio/global.cpp:932
+#: tdeio/global.cpp:952
 msgid ""
 "This means that although the resource, <strong>%1</strong>"
 ", was able to be opened, an error occurred while writing to the resource."
 msgstr "这意味着，资源 <strong>%1</strong> 虽然可以打开，但是在写入资源的时候发生了错误。"
 
-#: tdeio/global.cpp:935
+#: tdeio/global.cpp:955
 msgid "You may not have permissions to write to the resource."
 msgstr "您没有写入此资源的权限。"
 
-#: tdeio/global.cpp:944 tdeio/global.cpp:955
+#: tdeio/global.cpp:964 tdeio/global.cpp:975
 msgid "Could Not Listen for Network Connections"
 msgstr "无法监听网络连接"
 
-#: tdeio/global.cpp:945
+#: tdeio/global.cpp:965
 msgid "Could Not Bind"
 msgstr "无法绑定"
 
-#: tdeio/global.cpp:946 tdeio/global.cpp:957
+#: tdeio/global.cpp:966 tdeio/global.cpp:977
 msgid ""
 "This is a fairly technical error in which a required device for network "
 "communications (a socket) could not be established to listen for incoming "
 "network connections."
 msgstr "这是一个技术错误。无法建立网络通讯(套接字)请求的设备来监听进入的网络连接。"
 
-#: tdeio/global.cpp:956
+#: tdeio/global.cpp:976
 msgid "Could Not Listen"
 msgstr "无法监听"
 
-#: tdeio/global.cpp:966
+#: tdeio/global.cpp:986
 msgid "Could Not Accept Network Connection"
 msgstr "无法接受网络连接"
 
-#: tdeio/global.cpp:967
+#: tdeio/global.cpp:987
 msgid ""
 "This is a fairly technical error in which an error occurred while attempting to "
 "accept an incoming network connection."
 msgstr "这是一个技术错误。接受进入的网络连接时发生了错误。"
 
-#: tdeio/global.cpp:971
+#: tdeio/global.cpp:991
 msgid "You may not have permissions to accept the connection."
 msgstr "您可能没有接受连接的权限。"
 
-#: tdeio/global.cpp:976
+#: tdeio/global.cpp:996
 #, c-format
 msgid "Could Not Login: %1"
 msgstr "无法登录：%1"
 
-#: tdeio/global.cpp:977
+#: tdeio/global.cpp:997
 msgid ""
 "An attempt to login to perform the requested operation was unsuccessful."
 msgstr "试图登录以执行请求的操作没有成功。"
 
-#: tdeio/global.cpp:988
+#: tdeio/global.cpp:1008
 msgid "Could Not Determine Resource Status"
 msgstr "无法确定资源状态"
 
-#: tdeio/global.cpp:989
+#: tdeio/global.cpp:1009
 msgid "Could Not Stat Resource"
 msgstr "无法查询资源状态"
 
-#: tdeio/global.cpp:990
+#: tdeio/global.cpp:1010
 msgid ""
 "An attempt to determine information about the status of the resource <strong>"
 "%1</strong>, such as the resource name, type, size, etc., was unsuccessful."
 msgstr "试图确定关于资源 <strong>%1</strong> 状态像资源名称、类型、大小等有关信息的操作没有成功。"
 
-#: tdeio/global.cpp:993
+#: tdeio/global.cpp:1013
 msgid "The specified resource may not have existed or may not be accessible."
 msgstr "指定的资源可能不存在或不可访问。"
 
-#: tdeio/global.cpp:1001
+#: tdeio/global.cpp:1021
 msgid "Could Not Cancel Listing"
 msgstr "无法取消列举内容"
 
-#: tdeio/global.cpp:1002
+#: tdeio/global.cpp:1022
 msgid "FIXME: Document this"
 msgstr "FIXME：在文档中记录"
 
-#: tdeio/global.cpp:1006
+#: tdeio/global.cpp:1026
 msgid "Could Not Create Folder"
 msgstr "无法创建文件夹"
 
-#: tdeio/global.cpp:1007
+#: tdeio/global.cpp:1027
 msgid "An attempt to create the requested folder failed."
 msgstr "试图创建所请求的文件夹失败。"
 
-#: tdeio/global.cpp:1008
+#: tdeio/global.cpp:1028
 msgid "The location where the folder was to be created may not exist."
 msgstr "要创建文件夹的位置可能不存在。"
 
-#: tdeio/global.cpp:1015
+#: tdeio/global.cpp:1035
 msgid "Could Not Remove Folder"
 msgstr "无法删除文件夹"
 
-#: tdeio/global.cpp:1016
+#: tdeio/global.cpp:1036
 msgid "An attempt to remove the specified folder, <strong>%1</strong>, failed."
 msgstr "试图删除指定文件夹 <strong>%1</strong> 失败。"
 
-#: tdeio/global.cpp:1018
+#: tdeio/global.cpp:1038
 msgid "The specified folder may not exist."
 msgstr "指定的文件夹可能不存在。"
 
-#: tdeio/global.cpp:1019
+#: tdeio/global.cpp:1039
 msgid "The specified folder may not be empty."
 msgstr "指定的文件夹可能不为空。"
 
-#: tdeio/global.cpp:1022
+#: tdeio/global.cpp:1042
 msgid "Ensure that the folder exists and is empty, and try again."
 msgstr "请确定文件夹已存在且为空，然后再试一次。"
 
-#: tdeio/global.cpp:1027
+#: tdeio/global.cpp:1047
 msgid "Could Not Resume File Transfer"
 msgstr "无法继续文件传输"
 
-#: tdeio/global.cpp:1028
+#: tdeio/global.cpp:1048
 msgid ""
 "The specified request asked that the transfer of file <strong>%1</strong> "
 "be resumed at a certain point of the transfer. This was not possible."
 msgstr "指定的请求要求传送文件 <strong>%1</strong> 在传送的特定点继续。这不可能。"
 
-#: tdeio/global.cpp:1031
+#: tdeio/global.cpp:1051
 msgid "The protocol, or the server, may not support file resuming."
 msgstr "此协议或者服务器不支持文件续传。"
 
-#: tdeio/global.cpp:1033
+#: tdeio/global.cpp:1053
 msgid "Retry the request without attempting to resume transfer."
 msgstr "不试图续传而重试请求。"
 
-#: tdeio/global.cpp:1038
+#: tdeio/global.cpp:1058
 msgid "Could Not Rename Resource"
 msgstr "无法重命名资源"
 
-#: tdeio/global.cpp:1039
+#: tdeio/global.cpp:1059
 msgid "An attempt to rename the specified resource <strong>%1</strong> failed."
 msgstr "试图重命名指定资源 <strong>%1</strong> 失败。"
 
-#: tdeio/global.cpp:1047
+#: tdeio/global.cpp:1067
 msgid "Could Not Alter Permissions of Resource"
 msgstr "无法改变资源的权限"
 
-#: tdeio/global.cpp:1048
+#: tdeio/global.cpp:1068
 msgid ""
 "An attempt to alter the permissions on the specified resource <strong>"
 "%1</strong> failed."
 msgstr "试图改变指定资源 <strong>%1</strong> 的权限失败。"
 
-#: tdeio/global.cpp:1055
+#: tdeio/global.cpp:1075
 msgid "Could Not Delete Resource"
 msgstr "无法删除资源"
 
-#: tdeio/global.cpp:1056
+#: tdeio/global.cpp:1076
 msgid "An attempt to delete the specified resource <strong>%1</strong> failed."
 msgstr "试图删除指定资源 <strong>%1</strong> 失败。"
 
-#: tdeio/global.cpp:1063
+#: tdeio/global.cpp:1083
 msgid "Unexpected Program Termination"
 msgstr "未预料到的程序终止"
 
-#: tdeio/global.cpp:1064
+#: tdeio/global.cpp:1084
 msgid ""
 "The program on your computer which provides access to the <strong>%1</strong> "
 "protocol has unexpectedly terminated."
 msgstr "您计算机上提供到 <strong>%1</strong> 协议访问的程序未预料地终止。"
 
-#: tdeio/global.cpp:1072
+#: tdeio/global.cpp:1092
 msgid "Out of Memory"
 msgstr "内存不足"
 
-#: tdeio/global.cpp:1073
+#: tdeio/global.cpp:1093
 msgid ""
 "The program on your computer which provides access to the <strong>%1</strong> "
 "protocol could not obtain the memory required to continue."
 msgstr "您计算机上提供到 <strong>%1</strong> 协议访问的程序无法获得继续运行所需的内存。"
 
-#: tdeio/global.cpp:1081
+#: tdeio/global.cpp:1101
 msgid "Unknown Proxy Host"
 msgstr "未知的代理主机"
 
-#: tdeio/global.cpp:1082
+#: tdeio/global.cpp:1102
 msgid ""
 "While retrieving information about the specified proxy host, <strong>%1</strong>"
 ", an Unknown Host error was encountered. An unknown host error indicates that "
@@ -1904,22 +3457,22 @@ msgid ""
 msgstr ""
 "在获取关于指定代理主机 <strong>%1</strong> 的信息时，出现了“未知主机”错误。“未知主机”错误表明在互联网上找不到所请求的名称。"
 
-#: tdeio/global.cpp:1086
+#: tdeio/global.cpp:1106
 msgid ""
 "There may have been a problem with your network configuration, specifically "
 "your proxy's hostname. If you have been accessing the Internet with no problems "
 "recently, this is unlikely."
 msgstr "您的网络配置可能有问题，特别是您的代理主机名。如果您最近访问互联网时没有出现问题，这就不太可能。"
 
-#: tdeio/global.cpp:1090
+#: tdeio/global.cpp:1110
 msgid "Double-check your proxy settings and try again."
 msgstr "请反复检查您的代理服务器设置后再重试。"
 
-#: tdeio/global.cpp:1095
+#: tdeio/global.cpp:1115
 msgid "Authentication Failed: Method %1 Not Supported"
 msgstr "授权失败：不支持 %1 验证方式"
 
-#: tdeio/global.cpp:1097
+#: tdeio/global.cpp:1117
 #, c-format
 msgid ""
 "Although you may have supplied the correct authentication details, the "
@@ -1927,49 +3480,51 @@ msgid ""
 "supported by the TDE program implementing the protocol %1."
 msgstr "虽然您可能提供了正确的验证信息，验证仍旧失败了。原因是该服务器所使用的方法不被实现协议 %1 的 TDE 程序支持。"
 
-#: tdeio/global.cpp:1101
+#: tdeio/global.cpp:1121
+#, fuzzy
 msgid ""
-"Please file a bug at <a href=\"http://bugs.kde.org/\">http://bugs.kde.org/</a> "
-"to inform the TDE team of the unsupported authentication method."
+"Please file a bug at <a href=\"http://bugs.kde.org/\">"
+"http://bugs.pearsoncomputing.net/</a> to inform the TDE team of the unsupported "
+"authentication method."
 msgstr ""
 "请在 <a href=\"http://bugs.kde.org/\">http://bugs.kde.org/</a>"
 "提交错误报告，通知 TDE 团队不支持的验证方法。"
 
-#: tdeio/global.cpp:1107
+#: tdeio/global.cpp:1127
 msgid "Request Aborted"
 msgstr "请求中止"
 
-#: tdeio/global.cpp:1114
+#: tdeio/global.cpp:1134
 msgid "Internal Error in Server"
 msgstr "服务器内部错误"
 
-#: tdeio/global.cpp:1115
+#: tdeio/global.cpp:1135
 msgid ""
 "The program on the server which provides access to the <strong>%1</strong> "
 "protocol has reported an internal error: %0."
 msgstr "服务器上提供到 <strong>%1</strong> 协议访问的程序报告了一个内部错误：%0"
 
-#: tdeio/global.cpp:1118
+#: tdeio/global.cpp:1138
 msgid ""
 "This is most likely to be caused by a bug in the server program. Please "
 "consider submitting a full bug report as detailed below."
 msgstr "最可能的原因是服务器程序错误。请考虑提交一份完整的错误报告，步骤如下。"
 
-#: tdeio/global.cpp:1121
+#: tdeio/global.cpp:1141
 msgid "Contact the administrator of the server to advise them of the problem."
 msgstr "请联系您的管理员，告诉他们这一问题。"
 
-#: tdeio/global.cpp:1123
+#: tdeio/global.cpp:1143
 msgid ""
 "If you know who the authors of the server software are, submit the bug report "
 "directly to them."
 msgstr "如果您知道服务器软件的作者是谁，请直接向他们提交错误报告。"
 
-#: tdeio/global.cpp:1128
+#: tdeio/global.cpp:1148
 msgid "Timeout Error"
 msgstr "超时错误"
 
-#: tdeio/global.cpp:1129
+#: tdeio/global.cpp:1149
 msgid ""
 "Although contact was made with the server, a response was not received within "
 "the amount of time allocated for the request as follows:"
@@ -1986,244 +3541,123 @@ msgstr ""
 "<li>接收回应超时：%2 秒</li>"
 "<li>访问代理服务器超时：%3 秒</li></ul>请注意， 您可以在 TDE 控制中心通过选择“网络”->“首选项”来改变这些超时设置。"
 
-#: tdeio/global.cpp:1140
+#: tdeio/global.cpp:1160
 msgid "The server was too busy responding to other requests to respond."
 msgstr "服务器忙于响应其它请求，以致无法对该请求做出响应。"
 
-#: tdeio/global.cpp:1146
+#: tdeio/global.cpp:1166
 msgid "Unknown Error"
 msgstr "未知的错误"
 
-#: tdeio/global.cpp:1147
+#: tdeio/global.cpp:1167
 msgid ""
 "The program on your computer which provides access to the <strong>%1</strong> "
 "protocol has reported an unknown error: %2."
 msgstr "您的计算机上提供到 <strong>%1</strong> 协议访问的程序报告了一个未知错误：%2。"
 
-#: tdeio/global.cpp:1155
+#: tdeio/global.cpp:1175
 msgid "Unknown Interruption"
 msgstr "未知的中断"
 
-#: tdeio/global.cpp:1156
+#: tdeio/global.cpp:1176
 msgid ""
 "The program on your computer which provides access to the <strong>%1</strong> "
 "protocol has reported an interruption of an unknown type: %2."
 msgstr "您的计算机上提供到 <strong>%1</strong> 协议访问的程序报告了一个未知中断：%2。"
 
-#: tdeio/global.cpp:1164
+#: tdeio/global.cpp:1184
 msgid "Could Not Delete Original File"
 msgstr "无法删除原始文件"
 
-#: tdeio/global.cpp:1165
+#: tdeio/global.cpp:1185
 msgid ""
 "The requested operation required the deleting of the original file, most likely "
 "at the end of a file move operation. The original file <strong>%1</strong> "
 "could not be deleted."
 msgstr "所请求的操作需要删除原始文件，很可能是文件移动操作的最后步骤。原始文件 <strong>%1</strong> 无法被删除。"
 
-#: tdeio/global.cpp:1174
+#: tdeio/global.cpp:1194
 msgid "Could Not Delete Temporary File"
 msgstr "无法删除临时文件"
 
-#: tdeio/global.cpp:1175
+#: tdeio/global.cpp:1195
 msgid ""
 "The requested operation required the creation of a temporary file in which to "
 "save the new file while being downloaded. This temporary file <strong>"
 "%1</strong> could not be deleted."
 msgstr "所请求的操作需要创建一个临时文件来保存正在下载的新文件。临时文件 <strong>%1</strong> 无法被删除。"
 
-#: tdeio/global.cpp:1184
+#: tdeio/global.cpp:1204
 msgid "Could Not Rename Original File"
 msgstr "无法重命名原始文件"
 
-#: tdeio/global.cpp:1185
+#: tdeio/global.cpp:1205
 msgid ""
 "The requested operation required the renaming of the original file <strong>"
 "%1</strong>, however it could not be renamed."
 msgstr "所请求的操作需要重命名原始文件 <strong>%1</strong>， 但是它无法被重命名。"
 
-#: tdeio/global.cpp:1193
+#: tdeio/global.cpp:1213
 msgid "Could Not Rename Temporary File"
 msgstr "无法重命名临时文件"
 
-#: tdeio/global.cpp:1194
+#: tdeio/global.cpp:1214
 msgid ""
 "The requested operation required the creation of a temporary file <strong>"
 "%1</strong>, however it could not be created."
 msgstr "所请求的操作需要创建临时文件<strong>%1</strong>，但是该文件无法创建。"
 
-#: tdeio/global.cpp:1202
+#: tdeio/global.cpp:1222
 msgid "Could Not Create Link"
 msgstr "无法创建链接"
 
-#: tdeio/global.cpp:1203
+#: tdeio/global.cpp:1223
 msgid "Could Not Create Symbolic Link"
 msgstr "无法创建符号链接"
 
-#: tdeio/global.cpp:1204
+#: tdeio/global.cpp:1224
 msgid "The requested symbolic link %1 could not be created."
 msgstr "所请求的符号链接 %1 无法被创建。"
 
-#: tdeio/global.cpp:1211
+#: tdeio/global.cpp:1231
 msgid "No Content"
 msgstr "无内容"
 
-#: tdeio/global.cpp:1216
+#: tdeio/global.cpp:1236
 msgid "Disk Full"
 msgstr "磁盘已满"
 
-#: tdeio/global.cpp:1217
+#: tdeio/global.cpp:1237
 msgid ""
 "The requested file <strong>%1</strong> could not be written to as there is "
 "inadequate disk space."
 msgstr "所请求的文件 <strong>%1</strong> 无法被写入，原因是没有足够的磁盘空间。"
 
-#: tdeio/global.cpp:1219
+#: tdeio/global.cpp:1239
 msgid ""
 "Free up enough disk space by 1) deleting unwanted and temporary files; 2) "
 "archiving files to removable media storage such as CD-Recordable discs; or 3) "
 "obtain more storage capacity."
 msgstr "释放足够磁盘空间，方法有：1) 删除不想要的和临时的文件；2) 把文件归档到 CD-R 之类的可移介质上；或3) 获取更多贮存容量。"
 
-#: tdeio/global.cpp:1226
+#: tdeio/global.cpp:1246
 msgid "Source and Destination Files Identical"
 msgstr "源文件和目标文件是同一文件"
 
-#: tdeio/global.cpp:1227
+#: tdeio/global.cpp:1247
 msgid ""
 "The operation could not be completed because the source and destination files "
 "are the same file."
 msgstr "由于源文件和目标文件是同一文件，操作无法完成。"
 
-#: tdeio/global.cpp:1229
+#: tdeio/global.cpp:1249
 msgid "Choose a different filename for the destination file."
 msgstr "为目标文件选择另一个文件名。"
 
-#: tdeio/global.cpp:1240
+#: tdeio/global.cpp:1260
 msgid "Undocumented Error"
 msgstr "未记录在文档中的错误"
 
-#: tdeio/statusbarprogress.cpp:132
-msgid " Stalled "
-msgstr " 暂停 "
-
-#: tdeio/statusbarprogress.cpp:134 misc/uiserver.cpp:1102
-msgid " %1/s "
-msgstr " %1/秒 "
-
-#: tdeio/passdlg.cpp:57
-msgid "Password"
-msgstr "密码"
-
-#: tdeio/passdlg.cpp:98
-msgid "You need to supply a username and a password"
-msgstr "您需要提供一个用户名和密码"
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 134
-#: tdefile/kpropertiesdialog.cpp:3699 tdeio/passdlg.cpp:108 rc.cpp:105
-#, no-c-format
-msgid "&Username:"
-msgstr "用户名(&U)："
-
-#: tdeio/passdlg.cpp:125
-msgid "&Password:"
-msgstr "密码(&P)："
-
-#: tdeio/passdlg.cpp:147
-msgid "&Keep password"
-msgstr "保存密码(&K)"
-
-#: tdeio/passdlg.cpp:345 kpasswdserver/kpasswdserver.cpp:371
-msgid "Authorization Dialog"
-msgstr "授权对话框"
-
-#: tdeio/krun.cpp:120
-msgid ""
-"<qt>Unable to enter <b>%1</b>.\n"
-"You do not have access rights to this location.</qt>"
-msgstr ""
-"<qt>无法进入 <b>%1</b>。\n"
-"您没有到这个位置的访问权。</qt>"
-
-#: tdeio/krun.cpp:159
-msgid ""
-"<qt>The file <b>%1</b> is an executable program. For safety it will not be "
-"started.</qt>"
-msgstr "<qt>文件 <b>%1</b> 是可执行程序。为安全起见，不会启动该程序。</qt>"
-
-#: tdeio/krun.cpp:166
-msgid "<qt>You do not have permission to run <b>%1</b>.</qt>"
-msgstr "<qt>您没有运行 <b>%1</b>的权限。</qt>"
-
-#: tdeio/krun.cpp:203
-msgid "You are not authorized to open this file."
-msgstr "您没有被授权打开该文件。"
-
-#: tdefile/kopenwith.cpp:835 tdeio/krun.cpp:207
-msgid "Open with:"
-msgstr "打开方式："
-
-#: tdeio/krun.cpp:545
-msgid "You are not authorized to execute this file."
-msgstr "您没有被授权执行该文件。"
-
-#: tdeio/krun.cpp:565
-#, c-format
-msgid "Launching %1"
-msgstr "调用 %1"
-
-#: tdeio/krun.cpp:746
-msgid "You are not authorized to execute this service."
-msgstr "您没有被授权执行该服务。"
-
-#: tdeio/krun.cpp:900
-msgid ""
-"<qt>Unable to run the command specified. The file or folder <b>%1</b> "
-"does not exist.</qt>"
-msgstr "<qt>无法运行指定的命令。文件或文件夹 <b>%1</b> 不存在。</qt>"
-
-#: tdeio/krun.cpp:1400
-msgid "Could not find the program '%1'"
-msgstr "找不到程序“%1”"
-
-#: tdeio/tdefileitem.cpp:730
-msgid "Symbolic Link"
-msgstr "符号链接"
-
-#: tdeio/tdefileitem.cpp:732
-msgid "%1 (Link)"
-msgstr "%1 (链接)"
-
-#: ../tdeioslave/http/kcookiejar/kcookiewin.cpp:270
-#: bookmarks/kbookmarkmenu.cc:791 tdefile/kpropertiesdialog.cpp:3930
-#: tdeio/tdefileitem.cpp:774
-msgid "Name:"
-msgstr "名称："
-
-#: tdefile/kpropertiesdialog.cpp:927 tdeio/tdefileitem.cpp:775
-msgid "Type:"
-msgstr "类型："
-
-#: tdeio/tdefileitem.cpp:779
-msgid "Link to %1 (%2)"
-msgstr "链接到 %1(%2)"
-
-#: tdefile/kpropertiesdialog.cpp:977 tdeio/tdefileitem.cpp:787
-msgid "Size:"
-msgstr "大小："
-
-#: tdefile/kpropertiesdialog.cpp:1045 tdeio/tdefileitem.cpp:792
-msgid "Modified:"
-msgstr "修改时间："
-
-#: tdeio/tdefileitem.cpp:798
-msgid "Owner:"
-msgstr "所有者："
-
-#: tdeio/tdefileitem.cpp:799
-msgid "Permissions:"
-msgstr "权限："
-
 #: tdeio/skipdlg.cpp:63
 msgid "Skip"
 msgstr "跳过"
@@ -2232,9 +3666,25 @@ msgstr "跳过"
 msgid "Auto Skip"
 msgstr "自动跳过"
 
-#: tdeio/kshred.cpp:212
-msgid "Shredding:  pass %1 of 35"
-msgstr "强力删除：完成35次中的%1次"
+#: tdeio/kscan.cpp:52
+msgid "Acquire Image"
+msgstr "采集图像"
+
+#: tdeio/kscan.cpp:95
+msgid "OCR Image"
+msgstr "OCR 图像"
+
+#: tdeio/kservice.cpp:923
+msgid "Updating System Configuration"
+msgstr "更新系统配置"
+
+#: tdeio/kservice.cpp:924
+msgid "Updating system configuration."
+msgstr "更新系统配置。"
+
+#: tdeio/pastedialog.cpp:49
+msgid "Data format:"
+msgstr "数据格式："
 
 #: tdeio/slave.cpp:370
 #, c-format
@@ -2262,1129 +3712,574 @@ msgstr ""
 "无法创建 io-slave：\n"
 "tdelauncher 消息：%1"
 
-#: tdefile/kpropertiesdialog.cpp:2686 tdeio/kmimetypechooser.cpp:75
-msgid "Mime Type"
-msgstr "MIME 类型"
-
-#: tdefile/kpropertiesdialog.cpp:2697 tdeio/kmimetypechooser.cpp:80
-msgid "Comment"
-msgstr "备注"
-
-#: tdeio/kmimetypechooser.cpp:84
-msgid "Patterns"
-msgstr "模式"
-
-#: tdeio/kmimetypechooser.cpp:94
-msgid "&Edit..."
-msgstr "编辑(&E)..."
-
-#: tdeio/kmimetypechooser.cpp:104
-msgid "Click this button to display the familiar TDE mime type editor."
-msgstr "单击此按钮来显示熟悉的 TDE MIME 类型编辑器。"
-
-#: kssl/ksslcertdlg.cc:61
-msgid "Certificate"
-msgstr "证书"
-
-#: kssl/ksslcertdlg.cc:67
-msgid "Save selection for this host."
-msgstr "为该主机保存选择。"
-
-#: kssl/ksslcertdlg.cc:75
-msgid "Send certificate"
-msgstr "发送证书"
-
-#: kssl/ksslcertdlg.cc:79
-msgid "Do not send a certificate"
-msgstr "不要发送证书"
-
-#: kssl/ksslcertdlg.cc:84
-msgid "TDE SSL Certificate Dialog"
-msgstr "TDE SSL 证书对话"
-
-#: kssl/ksslcertdlg.cc:139
-msgid ""
-"The server <b>%1</b> requests a certificate."
-"<p>Select a certificate to use from the list below:"
-msgstr "服务器 <b>%1</b> 请求证书。<p>请从下面的列表中选择要使用的证书："
-
-#: kssl/ksslcertificate.cc:202
-msgid "Signature Algorithm: "
-msgstr "签名算法："
-
-#: kssl/ksslcertificate.cc:203
-msgid "Unknown"
-msgstr "未知"
-
-#: kssl/ksslcertificate.cc:206
-msgid "Signature Contents:"
-msgstr "签名内容："
-
-#: kssl/ksslcertificate.cc:338
+#: tdeio/tcpslavebase.cpp:319
 msgid ""
-"_: Unknown\n"
-"Unknown key algorithm"
-msgstr "未知的密钥算法"
-
-#: kssl/ksslcertificate.cc:341
-msgid "Key type: RSA (%1 bit)"
-msgstr "密钥类型：RSA (%1 位)"
-
-#: kssl/ksslcertificate.cc:344
-msgid "Modulus: "
-msgstr "模："
+"You are about to leave secure mode. Transmissions will no longer be encrypted.\n"
+"This means that a third party could observe your data in transit."
+msgstr ""
+"您即将离开安全模式，数据传输将不再加密。\n"
+"这意味着第三方有可能查看到您传输的数据。"
 
-#: kssl/ksslcertificate.cc:357
-msgid "Exponent: 0x"
-msgstr "幂：0x"
+#: tdeio/tcpslavebase.cpp:325 tdeio/tcpslavebase.cpp:1089
+msgid "Security Information"
+msgstr "安全信息"
 
-#: kssl/ksslcertificate.cc:363
-msgid "Key type: DSA (%1 bit)"
-msgstr "密钥类型：DSA (%1 位)"
+#: tdeio/tcpslavebase.cpp:326
+msgid "C&ontinue Loading"
+msgstr "继续载入(&O)"
 
-#: kssl/ksslcertificate.cc:366
-msgid "Prime: "
-msgstr "质数："
+#: tdeio/tcpslavebase.cpp:677
+msgid "Enter the certificate password:"
+msgstr "输入证书的密码："
 
-#: kssl/ksslcertificate.cc:380
-msgid "160 bit prime factor: "
-msgstr "160 位质数因子："
+#: tdeio/tcpslavebase.cpp:678
+msgid "SSL Certificate Password"
+msgstr "SSL 证书密码"
 
-#: kssl/ksslcertificate.cc:404
-msgid "Public key: "
-msgstr "公钥："
+#: tdeio/tcpslavebase.cpp:691
+msgid "Unable to open the certificate. Try a new password?"
+msgstr "无法打开证书。试用新密码吗？"
 
-#: kssl/ksslcertificate.cc:920
-msgid "The certificate is valid."
-msgstr "证书有效。"
+#: tdeio/tcpslavebase.cpp:704
+msgid "The procedure to set the client certificate for the session failed."
+msgstr "为会话设置客户端证书的过程失败。"
 
-#: kssl/ksslcertificate.cc:924
+#: tdeio/tcpslavebase.cpp:877
 msgid ""
-"Certificate signing authority root files could not be found so the certificate "
-"is not verified."
-msgstr "找不到证书签名权威根文件，证书没有被校验。"
-
-#: kssl/ksslcertificate.cc:927
-msgid "Certificate signing authority is unknown or invalid."
-msgstr "证书签名权威未知或无效。"
-
-#: kssl/ksslcertificate.cc:929
-msgid "Certificate is self-signed and thus may not be trustworthy."
-msgstr "证书是自签名的，所以可能不可信任。"
-
-#: kssl/ksslcertificate.cc:931
-msgid "Certificate has expired."
-msgstr "证书已过期。"
-
-#: kssl/ksslcertificate.cc:933
-msgid "Certificate has been revoked."
-msgstr "证书已被废除。"
-
-#: kssl/ksslcertificate.cc:935
-msgid "SSL support was not found."
-msgstr "没有 SSL 支持。"
-
-#: kssl/ksslcertificate.cc:937
-msgid "Signature is untrusted."
-msgstr "签名不被信任。"
-
-#: kssl/ksslcertificate.cc:939
-msgid "Signature test failed."
-msgstr "签名测试失败。"
-
-#: kssl/ksslcertificate.cc:942
-msgid "Rejected, possibly due to an invalid purpose."
-msgstr "已拒绝，可能由于不合法目的。"
-
-#: kssl/ksslcertificate.cc:944
-msgid "Private key test failed."
-msgstr "密钥测试失败。"
-
-#: kssl/ksslcertificate.cc:946
-msgid "The certificate has not been issued for this host."
-msgstr "证书未办发给此主机。"
-
-#: kssl/ksslcertificate.cc:948
-msgid "This certificate is not relevant."
-msgstr "此证书不相关。"
-
-#: kssl/ksslcertificate.cc:953
-msgid "The certificate is invalid."
-msgstr "证书无效。"
-
-#: kssl/ksslutils.cc:79
-msgid "GMT"
-msgstr "GMT"
-
-#: kssl/ksslkeygen.cc:48
-msgid "TDE Certificate Request"
-msgstr "TDE 证书请求"
-
-#: kssl/ksslkeygen.cc:50
-msgid "TDE Certificate Request - Password"
-msgstr "TDE 证书请求 - 密码"
-
-#: kssl/ksslkeygen.cc:93
-msgid "Unsupported key size."
-msgstr "不支持的密钥大小。"
-
-#: kssl/ksslinfodlg.cc:120 kssl/ksslkeygen.cc:93
-msgid "TDE SSL Information"
-msgstr "TDE SSL 信息"
-
-#: kssl/ksslkeygen.cc:97 misc/uiserver.cpp:1383
-msgid "TDE"
-msgstr "TDE"
-
-#: kssl/ksslkeygen.cc:97
-msgid "Please wait while the encryption keys are generated..."
-msgstr "请稍候，正在生成加密密钥..."
-
-#: kssl/ksslkeygen.cc:107
-msgid "Do you wish to store the passphrase in your wallet file?"
-msgstr "您是否想要在钱包文件中存储密码句？"
-
-#: kssl/ksslkeygen.cc:107
-msgid "Store"
-msgstr "存储"
-
-#: kssl/ksslkeygen.cc:107
-msgid "Do Not Store"
-msgstr "不存储"
-
-#: kssl/ksslkeygen.cc:210
-msgid "2048 (High Grade)"
-msgstr "2048 (高级)"
-
-#: kssl/ksslkeygen.cc:211
-msgid "1024 (Medium Grade)"
-msgstr "1024 (中级)"
-
-#: kssl/ksslkeygen.cc:212
-msgid "768  (Low Grade)"
-msgstr "768 (低级)"
-
-#: kssl/ksslkeygen.cc:213
-msgid "512  (Low Grade)"
-msgstr "512 (低级)"
-
-#: kssl/ksslkeygen.cc:215
-msgid "No SSL support."
-msgstr "不支持 SSL。"
-
-#: kssl/ksslpemcallback.cc:36
-msgid "Certificate password"
-msgstr "证书密码"
+"The IP address of the host %1 does not match the one the certificate was issued "
+"to."
+msgstr "主机 %1 的 IP 地址和证书签发给的地址不匹配。"
 
-#: kssl/ksslinfodlg.cc:92 kssl/ksslinfodlg.cc:149
-msgid "Current connection is secured with SSL."
-msgstr "当前连接使用安全的 SSL。"
+#: tdeio/tcpslavebase.cpp:882 tdeio/tcpslavebase.cpp:890
+#: tdeio/tcpslavebase.cpp:925 tdeio/tcpslavebase.cpp:999
+#: tdeio/tcpslavebase.cpp:1011 tdeio/tcpslavebase.cpp:1020
+#: tdeio/tcpslavebase.cpp:1051
+msgid "Server Authentication"
+msgstr "服务器验证"
 
-#: kssl/ksslinfodlg.cc:95 kssl/ksslinfodlg.cc:152
-msgid "Current connection is not secured with SSL."
-msgstr "当前连接没有使用安全的 SSL。"
+#: tdeio/tcpslavebase.cpp:883 tdeio/tcpslavebase.cpp:891
+#: tdeio/tcpslavebase.cpp:1021
+msgid "&Details"
+msgstr "细节(&D)"
 
-#: kssl/ksslinfodlg.cc:99
-msgid "SSL support is not available in this build of TDE."
-msgstr "这个编译版本的 TDE 不包含 SSL 支持。"
+#: tdeio/tcpslavebase.cpp:884 tdeio/tcpslavebase.cpp:892
+msgid "Co&ntinue"
+msgstr "继续(&N)"
 
-#: kssl/ksslinfodlg.cc:109
-msgid "C&ryptography Configuration..."
-msgstr "加密配置(&R)..."
+#: tdeio/tcpslavebase.cpp:886 tdeio/tcpslavebase.cpp:1016
+msgid "The server certificate failed the authenticity test (%1)."
+msgstr "服务器证书没有通过验证测试 (%1)。"
 
-#: kssl/ksslinfodlg.cc:142
+#: tdeio/tcpslavebase.cpp:922 tdeio/tcpslavebase.cpp:1048
 msgid ""
-"The main part of this document is secured with SSL, but some parts are not."
-msgstr "该文档的主要部分使用安全的 SSL，但是某些部分没有使用。"
-
-#: kssl/ksslinfodlg.cc:144
-msgid "Some of this document is secured with SSL, but the main part is not."
-msgstr "该文档的某些部分使用安全的 SSL，但是主要部分没有使用。"
-
-#: kssl/ksslinfodlg.cc:184
-msgid "Chain:"
-msgstr "信任链："
-
-#: kssl/ksslinfodlg.cc:193
-msgid "0 - Site Certificate"
-msgstr "0 - 站点证书"
-
-#: kssl/ksslinfodlg.cc:210
-msgid "Peer certificate:"
-msgstr "对端证书："
-
-#: kssl/ksslinfodlg.cc:212
-msgid "Issuer:"
-msgstr "颁发者："
-
-#: kssl/ksslinfodlg.cc:218
-msgid "IP address:"
-msgstr "IP 地址："
+"Would you like to accept this certificate forever without being prompted?"
+msgstr "您希望以后不提示就接受该证书吗？"
 
-#: tdefile/kpropertiesdialog.cpp:2565 kssl/ksslinfodlg.cc:227
-msgid "URL:"
-msgstr "URL："
+#: tdeio/tcpslavebase.cpp:926 tdeio/tcpslavebase.cpp:1052
+msgid "&Forever"
+msgstr "永远(&F)"
 
-#: kssl/ksslinfodlg.cc:230
-msgid "Certificate state:"
-msgstr "证书状态："
+#: tdeio/tcpslavebase.cpp:927 tdeio/tcpslavebase.cpp:1053
+msgid "&Current Sessions Only"
+msgstr "仅当前会话(&C)"
 
-#: kssl/ksslinfodlg.cc:236
-msgid "Valid from:"
-msgstr "有效期自："
+#: tdeio/tcpslavebase.cpp:998
+msgid ""
+"You have indicated that you wish to accept this certificate, but it is not "
+"issued to the server who is presenting it. Do you wish to continue loading?"
+msgstr "您已表明要接受该证书，但是它不是颁发给出示它的服务器的证书。您想继续载入吗？"
 
-#: kssl/ksslinfodlg.cc:238
-msgid "Valid until:"
-msgstr "有效期至："
+#: tdeio/tcpslavebase.cpp:1010
+#, fuzzy
+msgid ""
+"SSL certificate is being rejected as requested. You can disable this in the "
+"Trinity Control Center."
+msgstr "SSL 证书将按要求被拒绝。您可以在 TDE 控制中心中禁用此选项。"
 
-#: kssl/ksslinfodlg.cc:241
-msgid "Serial number:"
-msgstr "序列号："
+#: tdeio/tcpslavebase.cpp:1022
+msgid "Co&nnect"
+msgstr "连接(&N)"
 
-#: kssl/ksslinfodlg.cc:243
-msgid "MD5 digest:"
-msgstr "MD5 摘要："
+#: tdeio/tcpslavebase.cpp:1078
+msgid ""
+"You are about to enter secure mode. All transmissions will be encrypted unless "
+"otherwise noted.\n"
+"This means that no third party will be able to easily observe your data in "
+"transit."
+msgstr ""
+"您即将进入安全模式。除非另外注明，所有的传输将会被加密。\n"
+"这表示第三方将不能轻易查看您传输的数据。"
 
-#: kssl/ksslinfodlg.cc:246
-msgid "Cipher in use:"
-msgstr "使用的密码："
+#: tdeio/tcpslavebase.cpp:1090
+msgid "Display SSL &Information"
+msgstr "显示 SSL 信息(&I)"
 
-#: kssl/ksslinfodlg.cc:248
-msgid "Details:"
-msgstr "细节："
+#: tdeio/tcpslavebase.cpp:1092
+msgid "C&onnect"
+msgstr "连接(&O)"
 
-#: kssl/ksslinfodlg.cc:250
-msgid "SSL version:"
-msgstr "SSL 版本："
+#: tdefile/kimagefilepreview.cpp:53
+msgid "&Automatic preview"
+msgstr "自动预览(&A)"
 
-#: kssl/ksslinfodlg.cc:252
-msgid "Cipher strength:"
-msgstr "密码强度："
+#: tdefile/kimagefilepreview.cpp:58
+msgid "&Preview"
+msgstr "预览(&P)"
 
-#: kssl/ksslinfodlg.cc:253
-msgid "%1 bits used of a %2 bit cipher"
-msgstr "使用了 %2 位加密算法的 %1 位"
+#: tdefile/kicondialog.cpp:241 tdefile/kicondialog.cpp:250
+msgid "Select Icon"
+msgstr "选择图标"
 
-#: kssl/ksslinfodlg.cc:401
-msgid "Organization:"
-msgstr "组织："
+#: tdefile/kicondialog.cpp:270
+msgid "Icon Source"
+msgstr "图标来源"
 
-#: kssl/ksslinfodlg.cc:406
-msgid "Organizational unit:"
-msgstr "组织单位："
+#: tdefile/kicondialog.cpp:276
+msgid "S&ystem icons:"
+msgstr "系统图标(&Y)："
 
-#: kssl/ksslinfodlg.cc:411
-msgid "Locality:"
-msgstr "位置："
+#: tdefile/kicondialog.cpp:281
+msgid "O&ther icons:"
+msgstr "其它图标(&T)："
 
-#: kssl/ksslinfodlg.cc:416
-msgid ""
-"_: Federal State\n"
-"State:"
-msgstr "状态："
+#: tdefile/kicondialog.cpp:293
+msgid "Clear Search"
+msgstr "清除搜索"
 
-#: kssl/ksslinfodlg.cc:421
-msgid "Country:"
-msgstr "国家："
+#: tdefile/kicondialog.cpp:297
+msgid "&Search:"
+msgstr "搜索(&S)："
 
-#: kssl/ksslinfodlg.cc:426
-msgid "Common name:"
-msgstr "通用名称："
+#: tdefile/kicondialog.cpp:308
+msgid "Search interactively for icon names (e.g. folder)."
+msgstr "交互式搜索图标名称(如文件夹)。"
 
-#: kssl/ksslinfodlg.cc:431
-msgid "Email:"
-msgstr "电子邮件："
+#: tdefile/kicondialog.cpp:331
+msgid "Animations"
+msgstr "动画"
 
-#: misc/kpac/proxyscout.cpp:124
-#, c-format
-msgid ""
-"The proxy configuration script is invalid:\n"
-"%1"
-msgstr ""
-"代理配置脚本无效：\n"
-"%1"
+#: tdefile/kicondialog.cpp:332 tdefile/kopenwith.cpp:296
+msgid "Applications"
+msgstr "程序"
 
-#: misc/kpac/proxyscout.cpp:184
-#, c-format
-msgid ""
-"The proxy configuration script returned an error:\n"
-"%1"
-msgstr ""
-"代理配置脚本返回了错误：\n"
-"%1"
+#: tdefile/kicondialog.cpp:333
+msgid "Categories"
+msgstr "类别"
 
-#: misc/kpac/downloader.cpp:81
-#, c-format
-msgid ""
-"Could not download the proxy configuration script:\n"
-"%1"
-msgstr ""
-"无法下载代理配置脚本：\n"
-"%1"
+#: tdefile/kicondialog.cpp:334
+msgid "Devices"
+msgstr "设备"
 
-#: misc/kpac/downloader.cpp:83
-msgid "Could not download the proxy configuration script"
-msgstr "无法下载代理配置脚本"
+#: tdefile/kicondialog.cpp:335
+msgid "Emblems"
+msgstr "徽标"
 
-#: misc/kpac/discovery.cpp:116
-msgid "Could not find a usable proxy configuration script"
-msgstr "找不到可用的代理配置脚本"
+#: tdefile/kicondialog.cpp:336
+msgid "Emotes"
+msgstr "表情"
 
-#: misc/tdefile/fileprops.cpp:200
-msgid "Do not print the mimetype of the given file(s)"
-msgstr "不打印给定文件的 MIME 类型"
+#: tdefile/kicondialog.cpp:337
+msgid "Filesystems"
+msgstr "文件系统"
 
-#: misc/tdefile/fileprops.cpp:204
-msgid ""
-"List all supported metadata keys of the given file(s). If mimetype is not "
-"specified, the mimetype of the given files is used."
-msgstr "列举所有给定文件的被支持的元数据关键词。如果没有指定 MIME 类型，则使用给定文件的 MIME 类型。"
+#: tdefile/kicondialog.cpp:338
+msgid "International"
+msgstr "国际"
 
-#: misc/tdefile/fileprops.cpp:210
-msgid ""
-"List all preferred metadata keys of the given file(s). If mimetype is not "
-"specified, the mimetype of the given files is used."
-msgstr "列举所有给定文件所想用的元数据关键词。如果没有指定 MIME 类型，则使用给定文件的 MIME 类型。"
+#: tdefile/kicondialog.cpp:339
+msgid "Mimetypes"
+msgstr "MIME 类型"
 
-#: misc/tdefile/fileprops.cpp:216
-msgid "List all metadata keys which have a value in the given file(s)."
-msgstr "列举所有在给定文件中被赋予值的元数据关键词。"
+#: tdefile/kicondialog.cpp:340
+msgid "Places"
+msgstr "位置"
 
-#: misc/tdefile/fileprops.cpp:221
-msgid "Prints all mimetypes for which metadata support is available."
-msgstr "显示所有带有元数据支持的 MIME 类型。"
+#: tdefile/kicondialog.cpp:341
+msgid "Status"
+msgstr "状态"
 
-#: misc/tdefile/fileprops.cpp:226
-msgid ""
-"Do not print a warning when more than one file was given and they do not all "
-"have the same mimetype."
-msgstr "若给定的文件不止一个，且文件的 MIME 类型不全相同，则不要显示警告。"
+#: tdefile/kicondialog.cpp:589
+msgid "*.png *.xpm *.svg *.svgz|Icon Files (*.png *.xpm *.svg *.svgz)"
+msgstr "*.png *.xpm *.svg *.svgz|图标文件(*.png *.xpm *.svg *.svgz)"
 
-#: misc/tdefile/fileprops.cpp:231
-msgid "Prints all metadata values, available in the given file(s)."
-msgstr "显示所有在给定文件中的元数据值。"
+#: tdefile/tdefileiconview.cpp:63
+msgid "Small Icons"
+msgstr "小图标"
 
-#: misc/tdefile/fileprops.cpp:236
-msgid "Prints the preferred metadata values, available in the given file(s)."
-msgstr "显示给定文件中首选的元数据值。"
+#: tdefile/tdefileiconview.cpp:68
+msgid "Large Icons"
+msgstr "大图标"
 
-#: misc/tdefile/fileprops.cpp:240
-msgid ""
-"Opens a TDE properties dialog to allow viewing and modifying of metadata of the "
-"given file(s)"
-msgstr "打开 TDE 属性对话框以便查看和修改给定文件的元数据。"
+#: tdefile/tdefileiconview.cpp:76
+msgid "Thumbnail Previews"
+msgstr "缩略预览"
 
-#: misc/tdefile/fileprops.cpp:244
-msgid ""
-"Prints the value for 'key' of the given file(s). 'key' may also be a "
-"comma-separated list of keys"
-msgstr "显示给定文件中“key”的值。“key”也可能是用逗号分隔的关键词列表。"
+#: tdefile/tdefileiconview.cpp:120
+msgid "Icon View"
+msgstr "图标视图"
 
-#: misc/tdefile/fileprops.cpp:248
+#: tdefile/kurlbar.cpp:352
 msgid ""
-"Attempts to set the value 'value' for the metadata key 'key' for the given "
-"file(s)"
-msgstr "试图为给定文件把元数据关键词“key”设置为值“value”。"
-
-#: misc/tdefile/fileprops.cpp:251
-msgid "The group to get values from or set values to"
-msgstr "要获取值或设置值的组"
-
-#: misc/tdefile/fileprops.cpp:255
-msgid "The file (or a number of files) to operate on."
-msgstr "要操作的文件(或一组文件)。"
-
-#: misc/tdefile/fileprops.cpp:270
-msgid "No support for metadata extraction found."
-msgstr "没有找到对元数据抽取的支持。"
-
-#: misc/tdefile/fileprops.cpp:275
-msgid "Supported MimeTypes:"
-msgstr "支持的 MIME 类型："
+"<qt>The <b>Quick Access</b> panel provides easy access to commonly used file "
+"locations."
+"<p>Clicking on one of the shortcut entries will take you to that location."
+"<p>By right clicking on an entry you can add, edit and remove shortcuts.</qt>"
+msgstr ""
+"<qt><b>快速访问</b>面板提供对常用文件位置的简便访问。"
+"<p>单击快捷项就会将您带到相应位置。"
+"<p>用鼠标右键单击项，可以添加、编辑或删除快捷方式。</qt>"
 
-#: misc/tdefile/fileprops.cpp:410
-msgid "tdefile"
-msgstr "tdefile"
+#: tdefile/kurlbar.cpp:620
+#, fuzzy
+msgid "Desktop Search"
+msgstr "桌面"
 
-#: misc/tdefile/fileprops.cpp:411
-msgid "A commandline tool to read and modify metadata of files."
-msgstr "读取和修改文件元数据的命令行工具。"
+#: tdefile/kurlbar.cpp:745
+msgid "&Large Icons"
+msgstr "大图标(&L)"
 
-#: misc/tdefile/fileprops.cpp:438
-msgid "No files specified"
-msgstr "没有指定文件"
+#: tdefile/kurlbar.cpp:745
+msgid "&Small Icons"
+msgstr "小图标(&S)"
 
-#: misc/tdefile/fileprops.cpp:467
-msgid "Cannot determine metadata"
-msgstr "无法判定元数据"
+#: tdefile/kurlbar.cpp:751
+msgid "&Edit Entry..."
+msgstr "编辑项目(&E)..."
 
-#: misc/tdewalletd/tdewalletd.cpp:400
-msgid ""
-"<qt>TDE has requested to open the wallet '<b>%1</b>'. Please enter the password "
-"for this wallet below."
-msgstr "<qt>TDE 请求打开钱包“<b>%1</b>”。请在下面输入此钱包的密码。"
+#: tdefile/kurlbar.cpp:755
+msgid "&Add Entry..."
+msgstr "添加项目(&A)..."
 
-#: misc/tdewalletd/tdewalletd.cpp:402
-msgid ""
-"<qt>The application '<b>%1</b>' has requested to open the wallet '<b>%2</b>"
-"'. Please enter the password for this wallet below."
-msgstr "<qt>应用程序“<b>%1</b>”请求打开钱包“<b>%2</b>”。请在下面输入此钱包的密码。"
+#: tdefile/kurlbar.cpp:759
+msgid "&Remove Entry"
+msgstr "删除项目(&R)"
 
-#: tdefile/tdefiledialog.cpp:1833 misc/tdewalletd/tdewalletd.cpp:405
-#: misc/tdewalletd/tdewalletd.cpp:419
-msgid "&Open"
-msgstr "打开(&O)"
+#: tdefile/kurlbar.cpp:791
+msgid "Enter a description"
+msgstr "输入描述"
 
-#: misc/tdewalletd/tdewalletd.cpp:414
-msgid ""
-"TDE has requested to open the wallet. This is used to store sensitive data in a "
-"secure fashion. Please enter a password to use with this wallet or click cancel "
-"to deny the application's request."
-msgstr "TDE 请求打开钱包。这将把敏感的数据存储在安全的地方。请输入此钱包的密码，或者单击取消以拒绝应用程序的请求。"
+#: tdefile/kurlbar.cpp:937
+msgid "Edit Quick Access Entry"
+msgstr "编辑快速访问项目"
 
-#: misc/tdewalletd/tdewalletd.cpp:416
+#: tdefile/kurlbar.cpp:940
 msgid ""
-"<qt>The application '<b>%1</b>' has requested to open the TDE wallet. This is "
-"used to store sensitive data in a secure fashion. Please enter a password to "
-"use with this wallet or click cancel to deny the application's request."
-msgstr "<qt>应用程序“<b>%1</b>”请求打开钱包。这将把敏感的数据存储在安全的地方。请输入此钱包的密码，或者单击取消以拒绝应用程序的请求。"
+"<qt><b>Please provide a description, URL and icon for this Quick Access "
+"entry.</b></br></qt>"
+msgstr "<qt><b>请为此快速访问项目提供描述、URL 和图标。</b></br></qt>"
 
-#: misc/tdewalletd/tdewalletd.cpp:423
+#: tdefile/kurlbar.cpp:947
 msgid ""
-"<qt>TDE has requested to create a new wallet named '<b>%1</b>"
-"'. Please choose a password for this wallet, or cancel to deny the "
-"application's request."
-msgstr "<qt>TDE 请求创建一个名为“<b>%1</b>”的新钱包。请为此钱包选择一个密码，或者单击取消以拒绝应用程序的请求。"
+"<qt>This is the text that will appear in the Quick Access panel."
+"<p>The description should consist of one or two words that will help you "
+"remember what this entry refers to.</qt>"
+msgstr "<qt>这是将出现在快速访问面板中的文字。<p>描述应该由一两个词组成，以便帮助您记住本项的含义。</qt>"
 
-#: misc/tdewalletd/tdewalletd.cpp:425
+#: tdefile/kurlbar.cpp:957
+#, fuzzy
 msgid ""
-"<qt>The application '<b>%1</b>' has requested to create a new wallet named '<b>"
-"%2</b>'. Please choose a password for this wallet, or cancel to deny the "
-"application's request."
+"<qt>This is the location associated with the entry. Any valid URL may be used. "
+"For example:"
+"<p>%1"
+"<br>http://www.trinitydesktop.org"
+"<p>By clicking on the button next to the text edit box you can browse to an "
+"appropriate URL.</qt>"
 msgstr ""
-"<qt>应用程序“<b>%1</b>”请求创建一个名为“<b>%2</b>”的新钱包。请为此钱包选择一个密码，或者单击取消以拒绝应用程序的请求。"
-
-#: misc/tdewalletd/tdewalletd.cpp:428
-msgid "C&reate"
-msgstr "创建(&R)"
+"<qt>这是与该项关联的位置，可以使用任何合法的 URL。例如："
+"<p>%1"
+"<br>http://www.kde.org"
+"<br>ftp://ftp.kde.org/pub/kde/stable"
+"<p>单击文本编辑框旁边的按钮可以浏览相应的 URL。</qt>"
 
-#: misc/tdewalletd/tdewalletd.cpp:432 misc/tdewalletd/tdewalletd.cpp:607
-#: misc/tdewalletd/tdewalletd.cpp:623 misc/tdewalletd/tdewalletd.cpp:634
-#: misc/tdewalletd/tdewalletd.cpp:639 misc/tdewalletd/tdewalletd.cpp:1157
-msgid "TDE Wallet Service"
-msgstr "TDE 钱包服务"
+#: tdefile/kurlbar.cpp:961
+msgid "&URL:"
+msgstr "&URL："
 
-#: misc/tdewalletd/tdewalletd.cpp:444
+#: tdefile/kurlbar.cpp:968
 msgid ""
-"<qt>Error opening the wallet '<b>%1</b>'. Please try again."
-"<br>(Error code %2: %3)"
-msgstr "<qt>打开钱包“<b>%1</b>”出错。请再试一次。<br>(错误代码 %2：%3)"
+"<qt>This is the icon that will appear in the Quick Access panel."
+"<p>Click on the button to select a different icon.</qt>"
+msgstr "<qt>这是将出现在快速访问面板中的图标。<p>单击按钮可以选择不同的图标。</qt>"
 
-#: misc/tdewalletd/tdewalletd.cpp:518
-msgid "<qt>TDE has requested access to the open wallet '<b>%1</b>'."
-msgstr "<qt>TDE 请求访问打开的钱包“<b>%1</b>”。"
+#: tdefile/kurlbar.cpp:970
+msgid "Choose an &icon:"
+msgstr "选择图标(&I)："
 
-#: misc/tdewalletd/tdewalletd.cpp:520
-msgid ""
-"<qt>The application '<b>%1</b>' has requested access to the open wallet '<b>"
-"%2</b>'."
-msgstr "<qt>应用程序“<b>%1</b>”请求访问打开的钱包“<b>%2</b>”。"
+#: tdefile/kurlbar.cpp:986
+msgid "&Only show when using this application (%1)"
+msgstr "仅在使用此程序(%1)时显示(&O)"
 
-#: misc/tdewalletd/tdewalletd.cpp:607
+#: tdefile/kurlbar.cpp:989
 msgid ""
-"Unable to open wallet. The wallet must be opened in order to change the "
-"password."
-msgstr "无法打开钱包。要更改密码，必须先打开钱包。"
-
-#: misc/tdewalletd/tdewalletd.cpp:622
-msgid "<qt>Please choose a new password for the wallet '<b>%1</b>'."
-msgstr "<qt>请为钱包“<b>%1</b>”选择一个新密码。"
+"<qt>Select this setting if you want this entry to show only when using the "
+"current application (%1)."
+"<p>If this setting is not selected, the entry will be available in all "
+"applications.</qt>"
+msgstr ""
+"<qt>如果您希望此项仅在使用当前应用程序(%1)时显示，请选择该设置。\n"
+"<p>如果该设置没有被选，此项将在所有应用程序中显示。</qt>"
 
-#: misc/tdewalletd/tdewalletd.cpp:634
-msgid "Error re-encrypting the wallet. Password was not changed."
-msgstr "重新加密钱包出错。密码未更改。"
+#: tdefile/kurlrequester.cpp:213
+msgid "Open file dialog"
+msgstr "打开文件对话框"
 
-#: misc/tdewalletd/tdewalletd.cpp:639
-msgid "Error reopening the wallet. Data may be lost."
-msgstr "重新打开钱包出错。数据可能已丢失。"
+#: tdefile/kdirselectdialog.cpp:407 tdefile/kdirselectdialog.cpp:411
+#: tdefile/tdediroperator.cpp:389 tdefile/tdediroperator.cpp:393
+msgid "New Folder"
+msgstr "新建文件夹"
 
-#: misc/tdewalletd/tdewalletd.cpp:1157
+#: tdefile/kdirselectdialog.cpp:412 tdefile/tdediroperator.cpp:394
+#, c-format
 msgid ""
-"There have been repeated failed attempts to gain access to a wallet. An "
-"application may be misbehaving."
-msgstr "试图获得钱包的访问权限时发生了连续失败。应用程序可能行为不正常。"
-
-#: misc/tdewalletd/tdewalletwizard.ui.h:23
-msgid "<qt>Password is empty.  <b>(WARNING: Insecure)"
-msgstr "<qt>密码为空。<b>(警告：不安全)"
-
-#: misc/tdewalletd/tdewalletwizard.ui.h:25
-msgid "Passwords match."
-msgstr "密码匹配。"
-
-#: misc/tdewalletd/tdewalletwizard.ui.h:28
-msgid "Passwords do not match."
-msgstr "密码不匹配。"
-
-#: misc/tdetelnetservice.cpp:41
-msgid "telnet service"
-msgstr "Telnet 服务"
-
-#: misc/tdetelnetservice.cpp:42
-msgid "telnet protocol handler"
-msgstr "Telnet 协议处理程序"
-
-#: misc/tdetelnetservice.cpp:76
-msgid "You do not have permission to access the %1 protocol."
-msgstr "您可能没有访问 %1 协议的权限。"
-
-#: misc/uiserver.cpp:98 misc/uiserver.cpp:603 misc/uiserver.cpp:682
-msgid "Settings..."
-msgstr "设置..."
-
-#: misc/uiserver.cpp:126
-msgid "Configure Network Operation Window"
-msgstr "配置网络操作窗口"
-
-#: misc/uiserver.cpp:130
-msgid "Show system tray icon"
-msgstr "显示系统托盘图标"
-
-#: misc/uiserver.cpp:131
-msgid "Keep network operation window always open"
-msgstr "将网络操作窗口始终保持打开"
-
-#: misc/uiserver.cpp:132
-msgid "Show column headers"
-msgstr "显示列头"
-
-#: misc/uiserver.cpp:133
-msgid "Show toolbar"
-msgstr "显示工具栏"
+"Create new folder in:\n"
+"%1"
+msgstr ""
+"创建新文件夹的位置：\n"
+"%1"
 
-#: misc/uiserver.cpp:134
-msgid "Show statusbar"
-msgstr "显示状态栏"
+#: tdefile/kdirselectdialog.cpp:435 tdefile/tdediroperator.cpp:422
+msgid "A file or folder named %1 already exists."
+msgstr "名为 %1 的文件或文件夹已存在。"
 
-#: misc/uiserver.cpp:135
-msgid "Column widths are user adjustable"
-msgstr "列宽可由用户调整"
+#: tdefile/kdirselectdialog.cpp:439 tdefile/tdediroperator.cpp:426
+msgid "You do not have permission to create that folder."
+msgstr "您没有创建该文件夹的权限。"
 
-#: misc/uiserver.cpp:136
-msgid "Show information:"
-msgstr "显示信息："
+#: tdefile/tdediroperator.cpp:448
+msgid "You did not select a file to delete."
+msgstr "您没有选择要删除的文件。"
 
-#: misc/uiserver.cpp:143 misc/uiserver.cpp:474
-msgid "URL"
-msgstr "URL"
+#: tdefile/tdediroperator.cpp:449
+msgid "Nothing to Delete"
+msgstr "没有可删除的"
 
-#: misc/uiserver.cpp:144 misc/uiserver.cpp:473
+#: tdefile/tdediroperator.cpp:471
 msgid ""
-"_: Remaining Time\n"
-"Rem. Time"
-msgstr "剩余时间"
-
-#: misc/uiserver.cpp:145 misc/uiserver.cpp:472
-msgid "Speed"
-msgstr "速度"
+"<qt>Do you really want to delete\n"
+" <b>'%1'</b>?</qt>"
+msgstr ""
+"<qt>您真的要删除\n"
+"<b>“%1”</b>吗？</qt>"
 
-#: tdefile/tdefiledetailview.cpp:67 misc/uiserver.cpp:146 misc/uiserver.cpp:471
-msgid "Size"
-msgstr "大小"
+#: tdefile/tdediroperator.cpp:473
+msgid "Delete File"
+msgstr "删除文件"
 
-#: misc/uiserver.cpp:147 misc/uiserver.cpp:470
+#: tdefile/tdediroperator.cpp:478
 #, c-format
-msgid "%"
-msgstr "%"
-
-#: misc/uiserver.cpp:148 misc/uiserver.cpp:469
-msgid "Count"
-msgstr "计数"
-
-#: misc/uiserver.cpp:149 misc/uiserver.cpp:468
 msgid ""
-"_: Resume\n"
-"Res."
-msgstr "续传"
-
-#: misc/uiserver.cpp:150 misc/uiserver.cpp:467
-msgid "Local Filename"
-msgstr "本地文件名"
-
-#: misc/uiserver.cpp:151 misc/uiserver.cpp:466
-msgid "Operation"
-msgstr "操作"
-
-#: misc/uiserver.cpp:254
-msgid "%1 / %2"
-msgstr "%1/ %2"
-
-#: misc/uiserver.cpp:291
-msgid "%1/s"
-msgstr "%1/秒"
-
-#: misc/uiserver.cpp:302
-msgid "Copying"
-msgstr "复制"
-
-#: misc/uiserver.cpp:311
-msgid "Moving"
-msgstr "移动"
-
-#: misc/uiserver.cpp:320
-msgid "Creating"
-msgstr "创建"
-
-#: misc/uiserver.cpp:329
-msgid "Deleting"
-msgstr "删除"
-
-#: misc/uiserver.cpp:337
-msgid "Loading"
-msgstr "载入"
-
-#: misc/uiserver.cpp:362
-msgid "Examining"
-msgstr "检查"
+"_n: Do you really want to delete this item?\n"
+"Do you really want to delete these %n items?"
+msgstr "您真的要删除这 %n 项吗？"
 
-#: misc/uiserver.cpp:370
-msgid "Mounting"
-msgstr "挂载"
+#: tdefile/tdediroperator.cpp:480
+msgid "Delete Files"
+msgstr "删除文件"
 
-#: misc/uiserver.cpp:608 misc/uiserver.cpp:1097
-msgid " Files: %1 "
-msgstr " 文件数：%1 "
+#: tdefile/tdediroperator.cpp:511
+msgid "You did not select a file to trash."
+msgstr "您没有选择要放入回收站的文件。"
 
-#: misc/uiserver.cpp:609
-msgid ""
-"_: Remaining Size\n"
-" Rem. Size: %1 kB "
-msgstr " 剩余大小：%1 kB "
+#: tdefile/tdediroperator.cpp:512
+msgid "Nothing to Trash"
+msgstr "没有可放入回收站的"
 
-#: misc/uiserver.cpp:610
+#: tdefile/tdediroperator.cpp:534
 msgid ""
-"_: Remaining Time\n"
-" Rem. Time: 00:00:00 "
-msgstr " 剩余时间：00:00:00 "
-
-#: misc/uiserver.cpp:611
-msgid " %1 kB/s "
-msgstr " %1 kB/秒"
+"<qt>Do you really want to trash\n"
+" <b>'%1'</b>?</qt>"
+msgstr ""
+"<qt>您真的要将\n"
+"<b>“%1”</b>放入回收站吗？</qt>"
 
-#: misc/uiserver.cpp:679
-msgid "Cancel Job"
-msgstr "取消任务"
+#: tdefile/tdediroperator.cpp:536
+msgid "Trash File"
+msgstr "放入回收站"
 
-#: misc/uiserver.cpp:1098
+#: tdefile/tdediroperator.cpp:537 tdefile/tdediroperator.cpp:544
 msgid ""
-"_: Remaining Size\n"
-" Rem. Size: %1 "
-msgstr " 剩余大小：%1"
+"_: to trash\n"
+"&Trash"
+msgstr "放入回收站(&T)"
 
-#: misc/uiserver.cpp:1100
+#: tdefile/tdediroperator.cpp:541
+#, c-format
 msgid ""
-"_: Remaining Time\n"
-" Rem. Time: %1 "
-msgstr " 剩余时间：%1 "
-
-#: misc/uiserver.cpp:1384
-msgid "TDE Progress Information UI Server"
-msgstr "TDE 进度信息界面服务器"
-
-#: misc/uiserver.cpp:1387 misc/uiserver.cpp:1388
-msgid "Developer"
-msgstr "开发者"
-
-#: misc/tdesendbugmail/main.cpp:22
-msgid "Subject line"
-msgstr "主题行"
-
-#: misc/tdesendbugmail/main.cpp:23
-msgid "Recipient"
-msgstr "收件人"
-
-#: misc/tdesendbugmail/main.cpp:33
-msgid "Error connecting to server."
-msgstr "连接到服务器时发生错误。"
-
-#: misc/tdesendbugmail/main.cpp:36
-msgid "Not connected."
-msgstr "没有连接。"
-
-#: misc/tdesendbugmail/main.cpp:39
-msgid "Connection timed out."
-msgstr "连接超时。"
-
-#: misc/tdesendbugmail/main.cpp:42
-msgid "Time out waiting for server interaction."
-msgstr "在等待服务器响应时超时。"
-
-#: misc/tdesendbugmail/main.cpp:46
-msgid "Server said: \"%1\""
-msgstr "服务器消息：“%1”"
-
-#: misc/tdesendbugmail/main.cpp:62
-msgid "KSendBugMail"
-msgstr "KSendBugMail"
-
-#: misc/tdesendbugmail/main.cpp:63
-msgid "Sends a short bug report to submit@bugs.kde.org"
-msgstr "把简短的错误报告发送给 submit@bugs.kde.org"
-
-#: misc/tdesendbugmail/main.cpp:65
-msgid "Author"
-msgstr "作者"
-
-#: misc/tdemailservice.cpp:32
-msgid "KMailService"
-msgstr "KMailService"
+"_n: translators: not called for n == 1\n"
+"Do you really want to trash these %n items?"
+msgstr "您真的要删除将这 %n 项放入回收站吗？"
 
-#: misc/tdemailservice.cpp:32
-msgid "Mail service"
-msgstr "邮件服务"
+#: tdefile/tdediroperator.cpp:543
+msgid "Trash Files"
+msgstr "放入回收站"
 
-#: tdeioexec/main.cpp:50
-msgid "TDEIO Exec - Opens remote files, watches modifications, asks for upload"
-msgstr "TDEIO Exec - 打开远程文件、监视修改、请求上传"
+#: tdefile/tdediroperator.cpp:658 tdefile/tdediroperator.cpp:726
+msgid "The specified folder does not exist or was not readable."
+msgstr "指定的文件夹不存在或不可读。"
 
-#: tdeioexec/main.cpp:54
-msgid "Treat URLs as local files and delete them afterwards"
-msgstr "将 URL 当作本地文件并进行删除"
+#: tdefile/tdediroperator.cpp:920 tdefile/tdediroperator.cpp:1321
+#: tdefile/tdefiledetailview.cpp:64
+msgid "Detailed View"
+msgstr "详细资料视图"
 
-#: tdeioexec/main.cpp:55
-msgid "Suggested file name for the downloaded file"
-msgstr "为所下载文件建议的文件名"
+#: tdefile/tdediroperator.cpp:925 tdefile/tdediroperator.cpp:1319
+msgid "Short View"
+msgstr "简要视图"
 
-#: tdeioexec/main.cpp:56
-msgid "Command to execute"
-msgstr "要执行的命令"
+#: tdefile/kcustommenueditor.cpp:94 tdefile/tdediroperator.cpp:1258
+msgid "Menu"
+msgstr "菜单"
 
-#: tdeioexec/main.cpp:57
-msgid "URL(s) or local file(s) used for 'command'"
-msgstr "“command”所用的 URL 或文件"
+#: tdefile/tdediroperator.cpp:1260
+msgid "Parent Folder"
+msgstr "父文件夹"
 
-#: tdeioexec/main.cpp:73
-msgid ""
-"'command' expected.\n"
-msgstr ""
-"需要“command”。\n"
+#: tdefile/tdediroperator.cpp:1264 tdefile/tdefilespeedbar.cpp:60
+msgid "Home Folder"
+msgstr "主文件夹"
 
-#: tdeioexec/main.cpp:102
-msgid ""
-"The URL %1\n"
-"is malformed"
-msgstr ""
-"URL %1\n"
-"的格式不正确"
+#: tdefile/kdirselectdialog.cpp:92 tdefile/kdirselectdialog.cpp:125
+#: tdefile/tdediroperator.cpp:1269
+msgid "New Folder..."
+msgstr "新建文件夹..."
 
-#: tdeioexec/main.cpp:104
-msgid ""
-"Remote URL %1\n"
-"not allowed with --tempfiles switch"
-msgstr ""
-"远程 URL %1\n"
-"不允许使用 --tempfiles 开关"
+#: tdefile/tdediroperator.cpp:1271
+msgid "Move to Trash"
+msgstr "移至回收站"
 
-#: tdeioexec/main.cpp:237
-msgid ""
-"The supposedly temporary file\n"
-"%1\n"
-"has been modified.\n"
-"Do you still want to delete it?"
-msgstr ""
-"可能的临时文件\n"
-"%1\n"
-"已经被修改。\n"
-"您仍然想要删除吗？"
+#: tdefile/tdediroperator.cpp:1282
+msgid "Sorting"
+msgstr "排序"
 
-#: tdeioexec/main.cpp:238 tdeioexec/main.cpp:245
-msgid "File Changed"
-msgstr "文件已更改"
+#: tdefile/tdediroperator.cpp:1283
+msgid "By Name"
+msgstr "按名称"
 
-#: tdeioexec/main.cpp:238
-msgid "Do Not Delete"
-msgstr "不删除"
+#: tdefile/tdediroperator.cpp:1286
+msgid "By Date"
+msgstr "按日期"
 
-#: tdeioexec/main.cpp:244
-msgid ""
-"The file\n"
-"%1\n"
-"has been modified.\n"
-"Do you want to upload the changes?"
-msgstr ""
-"文件\n"
-"%1\n"
-"已经被修改。\n"
-"您想要上传更改吗？"
+#: tdefile/tdediroperator.cpp:1289
+msgid "By Size"
+msgstr "按大小"
 
-#: tdeioexec/main.cpp:245
-msgid "Upload"
-msgstr "上传"
+#: tdefile/tdediroperator.cpp:1292
+msgid "Reverse"
+msgstr "逆序"
 
-#: tdeioexec/main.cpp:245
-msgid "Do Not Upload"
-msgstr "不上传"
+#: tdefile/tdediroperator.cpp:1302
+msgid "Folders First"
+msgstr "文件夹在前"
 
-#: tdeioexec/main.cpp:274
-msgid "KIOExec"
-msgstr "KIOExec"
+#: tdefile/tdediroperator.cpp:1304
+msgid "Case Insensitive"
+msgstr "不区分大小写"
 
-#: tdefile/kimagefilepreview.cpp:53
-msgid "&Automatic preview"
-msgstr "自动预览(&A)"
+#: tdefile/tdediroperator.cpp:1324
+msgid "Show Hidden Files"
+msgstr "显示隐藏文件"
 
-#: tdefile/kimagefilepreview.cpp:58
-msgid "&Preview"
-msgstr "预览(&P)"
+#: tdefile/tdediroperator.cpp:1327
+msgid "Separate Folders"
+msgstr "分离文件"
 
-#: tdefile/tdefileview.cpp:77
-msgid "Unknown View"
-msgstr "未知视图"
+#: tdefile/tdediroperator.cpp:1331
+msgid "Show Preview"
+msgstr "显示预览"
 
-#: tdefile/kpreviewprops.cpp:49
-msgid "P&review"
-msgstr "预览(&R)"
+#: tdefile/tdediroperator.cpp:1335
+msgid "Hide Preview"
+msgstr "隐藏预览"
 
-#: tdefile/tdefilespeedbar.cpp:46
+#: tdefile/tdefilespeedbar.cpp:49
 msgid "Desktop"
 msgstr "桌面"
 
-#: tdefile/tdefilespeedbar.cpp:53
+#: tdefile/tdefilespeedbar.cpp:56
 msgid "Documents"
 msgstr "文档"
 
-#: tdefile/tdediroperator.cpp:1264 tdefile/tdefilespeedbar.cpp:57
-msgid "Home Folder"
-msgstr "主文件夹"
-
-#: tdefile/tdefilespeedbar.cpp:62
+#: tdefile/tdefilespeedbar.cpp:65
 msgid "Storage Media"
 msgstr "存储介质"
 
-#: tdefile/tdefilespeedbar.cpp:67
-msgid "Network Folders"
-msgstr "网络文件夹"
-
-#: tdefile/kcustommenueditor.cpp:88
-msgid "Menu Editor"
-msgstr "菜单编辑器"
-
-#: tdefile/kcustommenueditor.cpp:94 tdefile/tdediroperator.cpp:1258
-msgid "Menu"
-msgstr "菜单"
-
-#: tdefile/kcustommenueditor.cpp:98
-msgid "New..."
-msgstr "新建..."
-
-#: tdefile/kcustommenueditor.cpp:100
-msgid "Move Up"
-msgstr "上移"
-
-#: tdefile/kcustommenueditor.cpp:101
-msgid "Move Down"
-msgstr "下移"
-
-#: tdefile/tdefiledialog.cpp:1676 tdefile/tdefilefiltercombo.cpp:32
-msgid "*|All Files"
-msgstr "*|全部文件"
-
-#: tdefile/tdefilefiltercombo.cpp:164
-msgid "All Supported Files"
-msgstr "支持的全部文件"
-
-#: tdefile/kopenwith.cpp:150
-msgid "Known Applications"
-msgstr "已知程序"
-
-#: tdefile/kicondialog.cpp:332 tdefile/kopenwith.cpp:296
-msgid "Applications"
-msgstr "程序"
-
-#: tdefile/kopenwith.cpp:322
-msgid "Open With"
-msgstr "打开方式"
-
-#: tdefile/kopenwith.cpp:326
-msgid ""
-"<qt>Select the program that should be used to open <b>%1</b>"
-". If the program is not listed, enter the name or click the browse button.</qt>"
-msgstr "<qt>选择用来打开 <b>%1</b> 的程序。如果程序未列出，输入程序名称或单击浏览按钮。</qt>"
-
-#: tdefile/kopenwith.cpp:332
-msgid "Choose the name of the program with which to open the selected files."
-msgstr "选择用来打开文件的程序名。"
-
-#: tdefile/kopenwith.cpp:353
-#, c-format
-msgid "Choose Application for %1"
-msgstr "选择用于 %1 的程序"
-
-#: tdefile/kopenwith.cpp:354
-msgid ""
-"<qt>Select the program for the file type: <b>%1</b>. If the program is not "
-"listed, enter the name or click the browse button.</qt>"
-msgstr "<qt>选择打开文件类型<b>%1</b>使用的程序。如果要使用的程序没有列出，输入程序名称或单击浏览按钮。</qt>"
-
-#: tdefile/kopenwith.cpp:366
-msgid "Choose Application"
-msgstr "选择应用程序"
-
-#: tdefile/kopenwith.cpp:367
-msgid ""
-"<qt>Select a program. If the program is not listed, enter the name or click the "
-"browse button.</qt>"
-msgstr "<qt>选择程序。如果要使用的程序没有列出，输入程序名称或单击浏览按钮。</qt>"
-
-#: tdefile/kopenwith.cpp:406
-msgid "Clear input field"
-msgstr "清除输入区"
-
-#: tdefile/kopenwith.cpp:436
-msgid ""
-"Following the command, you can have several place holders which will be "
-"replaced with the actual values when the actual program is run:\n"
-"%f - a single file name\n"
-"%F - a list of files; use for applications that can open several local files at "
-"once\n"
-"%u - a single URL\n"
-"%U - a list of URLs\n"
-"%d - the directory of the file to open\n"
-"%D - a list of directories\n"
-"%i - the icon\n"
-"%m - the mini-icon\n"
-"%c - the comment"
+#: tdefile/tdefilespeedbar.cpp:100
+msgid "Download"
 msgstr ""
-"您可以在命令后面跟上几个占位符，程序运行时这些占位符将会替换为实际的值：\n"
-"%f - 单个文件名\n"
-"%F - 文件列表；用于可同时打开多个本地文件的应用程序\n"
-"%u - 单个 URL\n"
-"%U - URL 列表\n"
-"%d - 要打开的文件所在目录\n"
-"%D - 目录列表\n"
-"%i - 图标\n"
-"%m - 小图标\n"
-"%c - 注释"
-
-#: tdefile/kopenwith.cpp:469
-msgid "Run in &terminal"
-msgstr "在终端中运行(&T)"
-
-#: tdefile/kopenwith.cpp:480
-msgid "&Do not close when command exits"
-msgstr "命令退出时不关闭(&D)"
-
-#: tdefile/kopenwith.cpp:497
-msgid "&Remember application association for this type of file"
-msgstr "记住该文件类型的应用程序关联(&R)"
-
-#: tdefile/kicondialog.cpp:241 tdefile/kicondialog.cpp:250
-msgid "Select Icon"
-msgstr "选择图标"
-
-#: tdefile/kicondialog.cpp:270
-msgid "Icon Source"
-msgstr "图标来源"
-
-#: tdefile/kicondialog.cpp:276
-msgid "S&ystem icons:"
-msgstr "系统图标(&Y)："
 
-#: tdefile/kicondialog.cpp:281
-msgid "O&ther icons:"
-msgstr "其它图标(&T)："
-
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 213
-#: tdefile/kicondialog.cpp:283 tdefile/kpropertiesdialog.cpp:3615 rc.cpp:288
-#, no-c-format
-msgid "&Browse..."
-msgstr "浏览(&B)..."
-
-#: tdefile/kicondialog.cpp:293
-msgid "Clear Search"
-msgstr "清除搜索"
-
-#: tdefile/kicondialog.cpp:297
-msgid "&Search:"
-msgstr "搜索(&S)："
-
-#: tdefile/kicondialog.cpp:308
-msgid "Search interactively for icon names (e.g. folder)."
-msgstr "交互式搜索图标名称(如文件夹)。"
-
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 204
-#: tdefile/kicondialog.cpp:330 rc.cpp:165
-#, no-c-format
-msgid "Actions"
-msgstr "动作"
+#: tdefile/tdefilespeedbar.cpp:102
+msgid "Music"
+msgstr ""
 
-#: tdefile/kicondialog.cpp:331
-msgid "Animations"
-msgstr "动画"
+#: tdefile/tdefilespeedbar.cpp:104
+#, fuzzy
+msgid "Pictures"
+msgstr "全部图片"
 
-#: tdefile/kicondialog.cpp:333
-msgid "Categories"
-msgstr "类别"
+#: tdefile/tdefilespeedbar.cpp:106
+msgid "Videos"
+msgstr ""
 
-#: tdefile/kicondialog.cpp:334
-msgid "Devices"
-msgstr "设备"
+#: tdefile/tdefilespeedbar.cpp:108
+msgid "Templates"
+msgstr ""
 
-#: tdefile/kicondialog.cpp:335
-msgid "Emblems"
-msgstr "徽标"
+#: tdefile/tdefilespeedbar.cpp:110
+#, fuzzy
+msgid "Public"
+msgstr "公钥："
 
-#: tdefile/kicondialog.cpp:336
-msgid "Emotes"
-msgstr "表情"
+#: tdefile/tdefilespeedbar.cpp:115
+msgid "Network Folders"
+msgstr "网络文件夹"
 
-#: tdefile/kicondialog.cpp:337
-msgid "Filesystems"
-msgstr "文件系统"
+#: tdefile/kpreviewprops.cpp:49
+msgid "P&review"
+msgstr "预览(&R)"
 
-#: tdefile/kicondialog.cpp:338
-msgid "International"
-msgstr "国际"
+#: tdefile/kacleditwidget.cpp:564 tdefile/tdefiledetailview.cpp:66
+msgid "Name"
+msgstr "名称"
 
-#: tdefile/kicondialog.cpp:339
-msgid "Mimetypes"
-msgstr "MIME 类型"
+#: tdefile/tdefiledetailview.cpp:68
+msgid "Date"
+msgstr "日期"
 
-#: tdefile/kicondialog.cpp:340
-msgid "Places"
-msgstr "位置"
+#: tdefile/tdefiledetailview.cpp:69
+msgid "Permissions"
+msgstr "权限"
 
-#: tdefile/kicondialog.cpp:341
-msgid "Status"
-msgstr "状态"
+#: tdefile/kacleditwidget.cpp:63 tdefile/kacleditwidget.cpp:421
+#: tdefile/tdefiledetailview.cpp:70
+msgid "Owner"
+msgstr "所有者"
 
-#: tdefile/kicondialog.cpp:589
-msgid "*.png *.xpm *.svg *.svgz|Icon Files (*.png *.xpm *.svg *.svgz)"
-msgstr "*.png *.xpm *.svg *.svgz|图标文件(*.png *.xpm *.svg *.svgz)"
+#: tdefile/kpropertiesdialog.cpp:2012 tdefile/tdefiledetailview.cpp:71
+msgid "Group"
+msgstr "群组"
 
-#: tdefile/tdefilemetainfowidget.cpp:111
-msgid "<Error>"
-msgstr "<错误>"
+#: tdefile/kmetaprops.cpp:130
+msgid "&Meta Info"
+msgstr "元信息(&M)"
 
-#: tdefile/tdefilepreview.cpp:63
-msgid "Preview"
-msgstr "预览"
+#: tdefile/kdirselectdialog.cpp:90
+msgid "Select Folder"
+msgstr "选择文件夹"
 
-#: tdefile/tdefilepreview.cpp:69
-msgid "No preview available."
-msgstr "没有可用的预览。"
+#: tdefile/kdirselectdialog.cpp:109
+msgid "Folders"
+msgstr "文件夹"
 
-#: tdefile/kacleditwidget.cpp:63 tdefile/kacleditwidget.cpp:421
-#: tdefile/tdefiledetailview.cpp:70
-msgid "Owner"
-msgstr "所有者"
+#: tdefile/kdirselectdialog.cpp:128
+msgid "Show Hidden Folders"
+msgstr "显示隐藏文件夹"
 
 #: tdefile/kacleditwidget.cpp:64 tdefile/kacleditwidget.cpp:423
 msgid "Owning Group"
 msgstr "所属组"
 
 #: tdefile/kacleditwidget.cpp:65 tdefile/kacleditwidget.cpp:425
-#: tdefile/kpropertiesdialog.cpp:1980
+#: tdefile/kpropertiesdialog.cpp:2016
 msgid "Others"
 msgstr "其它"
 
@@ -3440,10 +4335,6 @@ msgstr "群组："
 msgid "Type"
 msgstr "类型"
 
-#: tdefile/kacleditwidget.cpp:564 tdefile/tdefiledetailview.cpp:66
-msgid "Name"
-msgstr "名称"
-
 #: tdefile/kacleditwidget.cpp:565
 msgid ""
 "_: read permission\n"
@@ -3466,171 +4357,6 @@ msgstr "执行"
 msgid "Effective"
 msgstr "生效"
 
-#: tdefile/kdirselectdialog.cpp:90
-msgid "Select Folder"
-msgstr "选择文件夹"
-
-#: tdefile/tdediroperator.cpp:1269 tdefile/kdirselectdialog.cpp:92
-#: tdefile/kdirselectdialog.cpp:125
-msgid "New Folder..."
-msgstr "新建文件夹..."
-
-#: tdefile/kdirselectdialog.cpp:109
-msgid "Folders"
-msgstr "文件夹"
-
-#: tdefile/kdirselectdialog.cpp:128
-msgid "Show Hidden Folders"
-msgstr "显示隐藏文件夹"
-
-#: tdefile/tdediroperator.cpp:389 tdefile/tdediroperator.cpp:393
-#: tdefile/kdirselectdialog.cpp:407 tdefile/kdirselectdialog.cpp:411
-msgid "New Folder"
-msgstr "新建文件夹"
-
-#: tdefile/tdediroperator.cpp:394 tdefile/kdirselectdialog.cpp:412
-#, c-format
-msgid ""
-"Create new folder in:\n"
-"%1"
-msgstr ""
-"创建新文件夹的位置：\n"
-"%1"
-
-#: tdefile/tdediroperator.cpp:422 tdefile/kdirselectdialog.cpp:435
-msgid "A file or folder named %1 already exists."
-msgstr "名为 %1 的文件或文件夹已存在。"
-
-#: tdefile/tdediroperator.cpp:426 tdefile/kdirselectdialog.cpp:439
-msgid "You do not have permission to create that folder."
-msgstr "您没有创建该文件夹的权限。"
-
-#: bookmarks/kbookmarkmenu.cc:797 tdefile/kpropertiesdialog.cpp:968
-#: tdefile/kurlrequesterdlg.cpp:47
-msgid "Location:"
-msgstr "位置："
-
-#: tdefile/knotifydialog.cpp:81
-msgid "Sounds"
-msgstr "声音"
-
-#: tdefile/knotifydialog.cpp:82
-msgid "Logging"
-msgstr "记录日志"
-
-#: tdefile/knotifydialog.cpp:83
-msgid "Program Execution"
-msgstr "程序执行"
-
-#: tdefile/knotifydialog.cpp:84
-msgid "Message Windows"
-msgstr "消息窗口"
-
-#: tdefile/knotifydialog.cpp:85
-msgid "Passive Windows"
-msgstr "被动窗口"
-
-#: tdefile/knotifydialog.cpp:86
-msgid "Standard Error Output"
-msgstr "标准错误输出"
-
-#: tdefile/knotifydialog.cpp:87
-msgid "Taskbar"
-msgstr "任务栏"
-
-#: tdefile/knotifydialog.cpp:121
-msgid "Execute a program"
-msgstr "执行程序"
-
-#: tdefile/knotifydialog.cpp:122
-msgid "Print to Standard error output"
-msgstr "把消息打印到标准错误输出"
-
-#: tdefile/knotifydialog.cpp:123
-msgid "Display a messagebox"
-msgstr "显示警告框"
-
-#: tdefile/knotifydialog.cpp:124
-msgid "Log to a file"
-msgstr "记录日志到文件"
-
-#: tdefile/knotifydialog.cpp:125
-msgid "Play a sound"
-msgstr "播放声音"
-
-#: tdefile/knotifydialog.cpp:126
-msgid "Flash the taskbar entry"
-msgstr "闪烁任务栏项"
-
-#: tdefile/knotifydialog.cpp:163
-msgid "Notification Settings"
-msgstr "通知设置"
-
-#: tdefile/knotifydialog.cpp:309
-msgid ""
-"<qt>You may use the following macros"
-"<br>in the commandline:"
-"<br><b>%e</b>: for the event name,"
-"<br><b>%a</b>: for the name of the application that sent the event,"
-"<br><b>%s</b>: for the notification message,"
-"<br><b>%w</b>: for the numeric window ID where the event originated,"
-"<br><b>%i</b>: for the numeric event ID."
-msgstr ""
-"<qt>您可以在命令行中使用下列宏："
-"<br><b>%e</b>：事件名称，"
-"<br><b>%a</b>：发送事件的应用程序名称，"
-"<br><b>%s</b>：通知消息，"
-"<br><b>%w</b>：事件面向的窗口数字 ID，"
-"<br><b>%i</b>：事件的数字 ID。"
-
-#: tdefile/knotifydialog.cpp:339
-msgid "Advanced <<"
-msgstr "高级 <<"
-
-#: tdefile/knotifydialog.cpp:340
-msgid "Hide advanced options"
-msgstr "隐藏高级选项"
-
-#: tdefile/knotifydialog.cpp:356
-msgid "Advanced >>"
-msgstr "高级 >>"
-
-#: tdefile/knotifydialog.cpp:357
-msgid "Show advanced options"
-msgstr "显示高级选项"
-
-#: tdefile/knotifydialog.cpp:782
-msgid "This will cause the notifications to be reset to their defaults."
-msgstr "这将导致通知被重设为默认值。"
-
-#: tdefile/knotifydialog.cpp:784
-msgid "Are You Sure?"
-msgstr "您确定吗？"
-
-#: tdefile/knotifydialog.cpp:785
-msgid "&Reset"
-msgstr "重置(&R)"
-
-#: tdefile/knotifydialog.cpp:858
-msgid "Select Sound File"
-msgstr "选择声音文件"
-
-#: tdefile/knotifydialog.cpp:894
-msgid "Select Log File"
-msgstr "选择日志文件"
-
-#: tdefile/knotifydialog.cpp:908
-msgid "Select File to Execute"
-msgstr "选择要执行的文件"
-
-#: tdefile/knotifydialog.cpp:942
-msgid "The specified file does not exist."
-msgstr "指定的文件不存在。"
-
-#: tdefile/knotifydialog.cpp:1012
-msgid "No description available"
-msgstr "没有可用的描述"
-
 #: tdefile/tdefiledialog.cpp:347
 msgid "Please specify the filename to save to."
 msgstr "请指定要保存的文件名。"
@@ -3640,12 +4366,12 @@ msgid "Please select the file to open."
 msgstr "请选择要打开的文件。"
 
 #: tdefile/tdefiledialog.cpp:410 tdefile/tdefiledialog.cpp:453
-#: tdefile/tdefiledialog.cpp:1550
+#: tdefile/tdefiledialog.cpp:1558
 msgid "You can only select local files."
 msgstr "只能选择本地文件。"
 
 #: tdefile/tdefiledialog.cpp:411 tdefile/tdefiledialog.cpp:454
-#: tdefile/tdefiledialog.cpp:1551
+#: tdefile/tdefiledialog.cpp:1559
 msgid "Remote Files Not Accepted"
 msgstr "不接受远程文件"
 
@@ -3779,7 +4505,7 @@ msgstr ""
 msgid "&Location:"
 msgstr "位置(&L)："
 
-#: tdefile/tdefiledialog.cpp:1017
+#: tdefile/tdefiledialog.cpp:1018
 msgid ""
 "<qt>This is the filter to apply to the file list. File names that do not match "
 "the filter will not be shown."
@@ -3791,21 +4517,25 @@ msgstr ""
 "<p>您可以从下拉菜单中选择预设的过滤器，或者直接在文本区域中输入自定义的过滤器。"
 "<p>允许使用 * 和 ? 通配符。</qt>"
 
-#: tdefile/tdefiledialog.cpp:1023
+#: tdefile/tdefiledialog.cpp:1024
 msgid "&Filter:"
 msgstr "过滤(&F)："
 
-#: tdefile/tdefiledialog.cpp:1480
+#: tdefile/tdefiledialog.cpp:1171
+msgid "search term"
+msgstr ""
+
+#: tdefile/tdefiledialog.cpp:1488
 msgid ""
 "The chosen filenames do not\n"
 "appear to be valid."
 msgstr "选中的文件名似乎无效。"
 
-#: tdefile/tdefiledialog.cpp:1482
+#: tdefile/tdefiledialog.cpp:1490
 msgid "Invalid Filenames"
 msgstr "无效的文件名"
 
-#: tdefile/tdefiledialog.cpp:1512
+#: tdefile/tdefiledialog.cpp:1520
 msgid ""
 "The requested filenames\n"
 "%1\n"
@@ -3817,31 +4547,35 @@ msgstr ""
 "似乎无效；\n"
 "请确定将每个文件名包括在双引号内。"
 
-#: tdefile/tdefiledialog.cpp:1516
+#: tdefile/tdefiledialog.cpp:1524
 msgid "Filename Error"
 msgstr "文件名错误"
 
-#: tdefile/tdefiledialog.cpp:1673
+#: tdefile/tdefiledialog.cpp:1681
 msgid "*|All Folders"
 msgstr "*|全部文件夹"
 
-#: tdefile/tdefiledialog.cpp:1973
+#: tdefile/tdefiledialog.cpp:1684 tdefile/tdefilefiltercombo.cpp:32
+msgid "*|All Files"
+msgstr "*|全部文件"
+
+#: tdefile/tdefiledialog.cpp:1981
 msgid "Automatically select filename e&xtension (%1)"
 msgstr "自动选择文件扩展名(%1)(&X)"
 
-#: tdefile/tdefiledialog.cpp:1974
+#: tdefile/tdefiledialog.cpp:1982
 msgid "the extension <b>%1</b>"
 msgstr "扩展名 <b>%1</b>"
 
-#: tdefile/tdefiledialog.cpp:1982
+#: tdefile/tdefiledialog.cpp:1990
 msgid "Automatically select filename e&xtension"
 msgstr "自动选择文件扩展名(&X)"
 
-#: tdefile/tdefiledialog.cpp:1983
+#: tdefile/tdefiledialog.cpp:1991
 msgid "a suitable extension"
 msgstr "适合的扩展名"
 
-#: tdefile/tdefiledialog.cpp:1994
+#: tdefile/tdefiledialog.cpp:2002
 msgid ""
 "This option enables some convenient features for saving files with extensions:"
 "<br>"
@@ -3872,7 +4606,7 @@ msgstr ""
 "<br>如果您不想让 TDE 为文件名提供扩展名，您可以关闭选项，或者在文件名末尾添加句号(.)(句号会被自动去掉)。</li></ol>"
 "如果不确定的话，请保持此选项有效，这样会使得您的文件更容易管理。"
 
-#: tdefile/tdefiledialog.cpp:2268
+#: tdefile/tdefiledialog.cpp:2276
 msgid ""
 "<qt>This button allows you to bookmark specific locations. Click on this button "
 "to open the bookmark menu where you may add, edit or select a bookmark."
@@ -3882,174 +4616,165 @@ msgstr ""
 "<qt>此按钮允许您将指定位置加入书签。单击此按钮将打开书签菜单，其中您可以添加、编辑或选择书签。"
 "<p>这些书签专用于文件对话框，但是可像 TDE 其它地方的书签一样操作。</qt>"
 
-#: tdefile/tdefileiconview.cpp:62
-msgid "Small Icons"
-msgstr "小图标"
-
-#: tdefile/tdefileiconview.cpp:67
-msgid "Large Icons"
-msgstr "大图标"
-
-#: tdefile/tdefileiconview.cpp:75
-msgid "Thumbnail Previews"
-msgstr "缩略预览"
+#: tdefile/tdefileview.cpp:77
+msgid "Unknown View"
+msgstr "未知视图"
 
-#: tdefile/tdefileiconview.cpp:119
-msgid "Icon View"
-msgstr "图标视图"
+#: tdefile/tdefilepreview.cpp:63
+msgid "Preview"
+msgstr "预览"
 
-#: tdefile/kurlrequester.cpp:213
-msgid "Open file dialog"
-msgstr "打开文件对话框"
+#: tdefile/tdefilepreview.cpp:69
+msgid "No preview available."
+msgstr "没有可用的预览。"
 
-#: tdefile/tdediroperator.cpp:448
-msgid "You did not select a file to delete."
-msgstr "您没有选择要删除的文件。"
+#: tdefile/kopenwith.cpp:150
+msgid "Known Applications"
+msgstr "已知程序"
 
-#: tdefile/tdediroperator.cpp:449
-msgid "Nothing to Delete"
-msgstr "没有可删除的"
+#: tdefile/kopenwith.cpp:322
+msgid "Open With"
+msgstr "打开方式"
 
-#: tdefile/tdediroperator.cpp:471
+#: tdefile/kopenwith.cpp:326
 msgid ""
-"<qt>Do you really want to delete\n"
-" <b>'%1'</b>?</qt>"
-msgstr ""
-"<qt>您真的要删除\n"
-"<b>“%1”</b>吗？</qt>"
+"<qt>Select the program that should be used to open <b>%1</b>"
+". If the program is not listed, enter the name or click the browse button.</qt>"
+msgstr "<qt>选择用来打开 <b>%1</b> 的程序。如果程序未列出，输入程序名称或单击浏览按钮。</qt>"
 
-#: tdefile/tdediroperator.cpp:473
-msgid "Delete File"
-msgstr "删除文件"
+#: tdefile/kopenwith.cpp:332
+msgid "Choose the name of the program with which to open the selected files."
+msgstr "选择用来打开文件的程序名。"
 
-#: tdefile/tdediroperator.cpp:478
+#: tdefile/kopenwith.cpp:353
 #, c-format
-msgid ""
-"_n: Do you really want to delete this item?\n"
-"Do you really want to delete these %n items?"
-msgstr "您真的要删除这 %n 项吗？"
-
-#: tdefile/tdediroperator.cpp:480
-msgid "Delete Files"
-msgstr "删除文件"
-
-#: tdefile/tdediroperator.cpp:511
-msgid "You did not select a file to trash."
-msgstr "您没有选择要放入回收站的文件。"
-
-#: tdefile/tdediroperator.cpp:512
-msgid "Nothing to Trash"
-msgstr "没有可放入回收站的"
+msgid "Choose Application for %1"
+msgstr "选择用于 %1 的程序"
 
-#: tdefile/tdediroperator.cpp:534
+#: tdefile/kopenwith.cpp:354
 msgid ""
-"<qt>Do you really want to trash\n"
-" <b>'%1'</b>?</qt>"
-msgstr ""
-"<qt>您真的要将\n"
-"<b>“%1”</b>放入回收站吗？</qt>"
-
-#: tdefile/tdediroperator.cpp:536
-msgid "Trash File"
-msgstr "放入回收站"
+"<qt>Select the program for the file type: <b>%1</b>. If the program is not "
+"listed, enter the name or click the browse button.</qt>"
+msgstr "<qt>选择打开文件类型<b>%1</b>使用的程序。如果要使用的程序没有列出，输入程序名称或单击浏览按钮。</qt>"
 
-#: tdefile/tdediroperator.cpp:537 tdefile/tdediroperator.cpp:544
-msgid ""
-"_: to trash\n"
-"&Trash"
-msgstr "放入回收站(&T)"
+#: tdefile/kopenwith.cpp:366
+msgid "Choose Application"
+msgstr "选择应用程序"
 
-#: tdefile/tdediroperator.cpp:541
-#, c-format
+#: tdefile/kopenwith.cpp:367
 msgid ""
-"_n: translators: not called for n == 1\n"
-"Do you really want to trash these %n items?"
-msgstr "您真的要删除将这 %n 项放入回收站吗？"
-
-#: tdefile/tdediroperator.cpp:543
-msgid "Trash Files"
-msgstr "放入回收站"
+"<qt>Select a program. If the program is not listed, enter the name or click the "
+"browse button.</qt>"
+msgstr "<qt>选择程序。如果要使用的程序没有列出，输入程序名称或单击浏览按钮。</qt>"
 
-#: tdefile/tdediroperator.cpp:658 tdefile/tdediroperator.cpp:726
-msgid "The specified folder does not exist or was not readable."
-msgstr "指定的文件夹不存在或不可读。"
+#: tdefile/kopenwith.cpp:406
+msgid "Clear input field"
+msgstr "清除输入区"
 
-#: tdefile/tdediroperator.cpp:920 tdefile/tdediroperator.cpp:1321
-#: tdefile/tdefiledetailview.cpp:64
-msgid "Detailed View"
-msgstr "详细资料视图"
+#: tdefile/kopenwith.cpp:436
+msgid ""
+"Following the command, you can have several place holders which will be "
+"replaced with the actual values when the actual program is run:\n"
+"%f - a single file name\n"
+"%F - a list of files; use for applications that can open several local files at "
+"once\n"
+"%u - a single URL\n"
+"%U - a list of URLs\n"
+"%d - the directory of the file to open\n"
+"%D - a list of directories\n"
+"%i - the icon\n"
+"%m - the mini-icon\n"
+"%c - the comment"
+msgstr ""
+"您可以在命令后面跟上几个占位符，程序运行时这些占位符将会替换为实际的值：\n"
+"%f - 单个文件名\n"
+"%F - 文件列表；用于可同时打开多个本地文件的应用程序\n"
+"%u - 单个 URL\n"
+"%U - URL 列表\n"
+"%d - 要打开的文件所在目录\n"
+"%D - 目录列表\n"
+"%i - 图标\n"
+"%m - 小图标\n"
+"%c - 注释"
 
-#: tdefile/tdediroperator.cpp:925 tdefile/tdediroperator.cpp:1319
-msgid "Short View"
-msgstr "简要视图"
+#: tdefile/kopenwith.cpp:469
+msgid "Run in &terminal"
+msgstr "在终端中运行(&T)"
 
-#: tdefile/tdediroperator.cpp:1260
-msgid "Parent Folder"
-msgstr "父文件夹"
+#: tdefile/kopenwith.cpp:480
+msgid "&Do not close when command exits"
+msgstr "命令退出时不关闭(&D)"
 
-#: tdefile/tdediroperator.cpp:1271
-msgid "Move to Trash"
-msgstr "移至回收站"
+#: tdefile/kopenwith.cpp:497
+msgid "&Remember application association for this type of file"
+msgstr "记住该文件类型的应用程序关联(&R)"
 
-#: tdefile/tdediroperator.cpp:1282
-msgid "Sorting"
-msgstr "排序"
+#: tdefile/tdefilesharedlg.cpp:58
+msgid "&Share"
+msgstr "共享(&S)"
 
-#: tdefile/tdediroperator.cpp:1283
-msgid "By Name"
-msgstr "按名称"
+#: tdefile/tdefilesharedlg.cpp:143
+msgid "Only folders in your home folder can be shared."
+msgstr "仅可共享您主文件夹中的文件夹。"
 
-#: tdefile/tdediroperator.cpp:1286
-msgid "By Date"
-msgstr "按日期"
+#: tdefile/tdefilesharedlg.cpp:154
+msgid "Not shared"
+msgstr "未共享"
 
-#: tdefile/tdediroperator.cpp:1289
-msgid "By Size"
-msgstr "按大小"
+#: tdefile/tdefilesharedlg.cpp:159
+msgid "Shared - read only for others"
+msgstr ""
 
-#: tdefile/tdediroperator.cpp:1292
-msgid "Reverse"
-msgstr "逆序"
+#: tdefile/tdefilesharedlg.cpp:164
+msgid "Shared - writeable for others"
+msgstr ""
 
-#: tdefile/tdediroperator.cpp:1302
-msgid "Folders First"
-msgstr "文件夹在前"
+#: tdefile/tdefilesharedlg.cpp:186
+msgid ""
+"Sharing this folder makes it available under Linux/UNIX (NFS) and Windows "
+"(Samba)."
+msgstr "共享此文件夹将使其可以在 Linux/UNIX(NFS) 和 Windows(Samba) 中访问。"
 
-#: tdefile/tdediroperator.cpp:1304
-msgid "Case Insensitive"
-msgstr "不区分大小写"
+#: tdefile/tdefilesharedlg.cpp:192
+msgid "You can also reconfigure file sharing authorization."
+msgstr "您还可以重新配置文件共享的授权。"
 
-#: tdefile/tdediroperator.cpp:1324
-msgid "Show Hidden Files"
-msgstr "显示隐藏文件"
+#: tdefile/tdefilesharedlg.cpp:195 tdefile/tdefilesharedlg.cpp:222
+msgid "Configure File Sharing..."
+msgstr "配置文件共享..."
 
-#: tdefile/tdediroperator.cpp:1327
-msgid "Separate Folders"
-msgstr "分离文件"
+#: tdefile/tdefilesharedlg.cpp:207
+msgid ""
+"Error running 'filesharelist'. Check if installed and in $PATH or /usr/sbin."
+msgstr "运行“filesharelist”出错。请检查该程序是否已经安装并位于 $PATH 或 /usr/bin 中。"
 
-#: tdefile/tdediroperator.cpp:1331
-msgid "Show Preview"
-msgstr "显示预览"
+#: tdefile/tdefilesharedlg.cpp:214
+msgid "You need to be authorized to share folders."
+msgstr "您需要被授权共享文件夹。"
 
-#: tdefile/tdediroperator.cpp:1335
-msgid "Hide Preview"
-msgstr "隐藏预览"
+#: tdefile/tdefilesharedlg.cpp:217
+msgid "File sharing is disabled."
+msgstr "文件共享已禁用。"
 
-#: tdefile/tdefiledetailview.cpp:68
-msgid "Date"
-msgstr "日期"
+#: tdefile/tdefilesharedlg.cpp:282
+msgid "Sharing folder '%1' failed."
+msgstr "共享文件夹“%1”失败。"
 
-#: tdefile/tdefiledetailview.cpp:69
-msgid "Permissions"
-msgstr "权限"
+#: tdefile/tdefilesharedlg.cpp:283
+msgid ""
+"An error occurred while trying to share folder '%1'. Make sure that the Perl "
+"script 'fileshareset' is set suid root."
+msgstr "试图共享文件夹“%1”时发生了错误。请确定 Perl 脚本“fileshareset”已设置了 suid root。"
 
-#: tdefile/tdefiledetailview.cpp:71 tdefile/kpropertiesdialog.cpp:1976
-msgid "Group"
-msgstr "群组"
+#: tdefile/tdefilesharedlg.cpp:288
+msgid "Unsharing folder '%1' failed."
+msgstr "取消文件夹“%1”的共享失败。"
 
-#: tdefile/kmetaprops.cpp:130
-msgid "&Meta Info"
-msgstr "元信息(&M)"
+#: tdefile/tdefilesharedlg.cpp:289
+msgid ""
+"An error occurred while trying to unshare folder '%1'. Make sure that the Perl "
+"script 'fileshareset' is set suid root."
+msgstr "试图取消文件夹“%1”的共享时发生了错误。请确定 Perl 脚本“fileshareset”已设置了 suid root。"
 
 #: tdefile/kpropertiesdialog.cpp:177 tdefile/kpropertiesdialog.cpp:193
 #: tdefile/kpropertiesdialog.cpp:209 tdefile/kpropertiesdialog.cpp:232
@@ -4065,59 +4790,59 @@ msgid ""
 "Properties for %n Selected Items"
 msgstr "%n 个选中项目的属性"
 
-#: tdefile/kpropertiesdialog.cpp:740
+#: tdefile/kpropertiesdialog.cpp:748
 msgid "&General"
 msgstr "常规(&G)"
 
-#: tdefile/kpropertiesdialog.cpp:944
+#: tdefile/kpropertiesdialog.cpp:968
 msgid "Create new file type"
 msgstr "创建新的文件类型"
 
-#: tdefile/kpropertiesdialog.cpp:946
+#: tdefile/kpropertiesdialog.cpp:970
 msgid "Edit file type"
 msgstr "编辑文件类型"
 
-#: tdefile/kpropertiesdialog.cpp:959
+#: tdefile/kpropertiesdialog.cpp:983
 msgid "Contents:"
 msgstr "内容："
 
-#: tdefile/kpropertiesdialog.cpp:1001
+#: tdefile/kpropertiesdialog.cpp:1025
 msgid "Calculate"
 msgstr "计算"
 
-#: tdefile/kpropertiesdialog.cpp:1012 tdefile/kpropertiesdialog.cpp:1239
+#: tdefile/kpropertiesdialog.cpp:1036 tdefile/kpropertiesdialog.cpp:1263
 msgid "Refresh"
 msgstr "刷新"
 
-#: tdefile/kpropertiesdialog.cpp:1020
+#: tdefile/kpropertiesdialog.cpp:1044
 msgid "Points to:"
 msgstr "指向："
 
-#: tdefile/kpropertiesdialog.cpp:1034
+#: tdefile/kpropertiesdialog.cpp:1058
 msgid "Created:"
 msgstr "创建时间："
 
-#: tdefile/kpropertiesdialog.cpp:1056
+#: tdefile/kpropertiesdialog.cpp:1080
 msgid "Accessed:"
 msgstr "访问时间："
 
-#: tdefile/kpropertiesdialog.cpp:1075
+#: tdefile/kpropertiesdialog.cpp:1099
 msgid "Mounted on:"
 msgstr "挂载点："
 
-#: tdefile/kpropertiesdialog.cpp:1082 tdefile/kpropertiesdialog.cpp:2888
+#: tdefile/kpropertiesdialog.cpp:1106 tdefile/kpropertiesdialog.cpp:2958
 msgid "Free disk space:"
 msgstr "剩余磁盘空间："
 
-#: tdefile/kpropertiesdialog.cpp:1189 tdefile/kpropertiesdialog.cpp:1204
-#: tdefile/kpropertiesdialog.cpp:3031
+#: tdefile/kpropertiesdialog.cpp:1213 tdefile/kpropertiesdialog.cpp:1228
+#: tdefile/kpropertiesdialog.cpp:3118
 #, no-c-format
 msgid ""
 "_: Available space out of total partition size (percent used)\n"
 "%1 out of %2 (%3% used)"
 msgstr "%1/%2 (使用了%3%)"
 
-#: tdefile/kpropertiesdialog.cpp:1215
+#: tdefile/kpropertiesdialog.cpp:1239
 msgid ""
 "Calculating... %1 (%2)\n"
 "%3, %4"
@@ -4125,164 +4850,164 @@ msgstr ""
 "正在计算...%1 (%2)\n"
 "%3, %4"
 
-#: tdefile/kpropertiesdialog.cpp:1218 tdefile/kpropertiesdialog.cpp:1234
+#: tdefile/kpropertiesdialog.cpp:1242 tdefile/kpropertiesdialog.cpp:1258
 #, c-format
 msgid ""
 "_n: 1 file\n"
 "%n files"
 msgstr "%n 个文件"
 
-#: tdefile/kpropertiesdialog.cpp:1219 tdefile/kpropertiesdialog.cpp:1235
+#: tdefile/kpropertiesdialog.cpp:1243 tdefile/kpropertiesdialog.cpp:1259
 #, c-format
 msgid ""
 "_n: 1 sub-folder\n"
 "%n sub-folders"
 msgstr "%n 个子文件夹"
 
-#: tdefile/kpropertiesdialog.cpp:1248
+#: tdefile/kpropertiesdialog.cpp:1272
 msgid "Calculating..."
 msgstr "正在计算..."
 
-#: tdefile/kpropertiesdialog.cpp:1282
+#: tdefile/kpropertiesdialog.cpp:1306
 msgid "Stopped"
 msgstr "已停止"
 
-#: tdefile/kpropertiesdialog.cpp:1322
+#: tdefile/kpropertiesdialog.cpp:1347
 msgid "The new file name is empty."
 msgstr "新文件名称为空。"
 
-#: tdefile/kpropertiesdialog.cpp:1460 tdefile/kpropertiesdialog.cpp:2621
-#: tdefile/kpropertiesdialog.cpp:2778 tdefile/kpropertiesdialog.cpp:3059
-#: tdefile/kpropertiesdialog.cpp:3340 tdefile/kpropertiesdialog.cpp:3836
-#: tdefile/kpropertiesdialog.cpp:4079
+#: tdefile/kpropertiesdialog.cpp:1489 tdefile/kpropertiesdialog.cpp:2673
+#: tdefile/kpropertiesdialog.cpp:2689 tdefile/kpropertiesdialog.cpp:2846
+#: tdefile/kpropertiesdialog.cpp:3146 tdefile/kpropertiesdialog.cpp:3430
+#: tdefile/kpropertiesdialog.cpp:3926 tdefile/kpropertiesdialog.cpp:4169
 msgid ""
 "<qt>Could not save properties. You do not have sufficient access to write to <b>"
 "%1</b>.</qt>"
 msgstr "<qt>无法保存属性。您没有写入 <b>%1</b> 的足够权限。</qt>"
 
-#: tdefile/kpropertiesdialog.cpp:1534 tdefile/kpropertiesdialog.cpp:1538
-#: tdefile/kpropertiesdialog.cpp:1543
+#: tdefile/kpropertiesdialog.cpp:1563 tdefile/kpropertiesdialog.cpp:1567
+#: tdefile/kpropertiesdialog.cpp:1572
 msgid "Forbidden"
 msgstr "禁止"
 
-#: tdefile/kpropertiesdialog.cpp:1535
+#: tdefile/kpropertiesdialog.cpp:1564
 msgid "Can Read"
 msgstr "可读"
 
-#: tdefile/kpropertiesdialog.cpp:1536
+#: tdefile/kpropertiesdialog.cpp:1565
 msgid "Can Read & Write"
 msgstr "可读写"
 
-#: tdefile/kpropertiesdialog.cpp:1539
+#: tdefile/kpropertiesdialog.cpp:1568
 msgid "Can View Content"
 msgstr "可查看内容"
 
-#: tdefile/kpropertiesdialog.cpp:1540
+#: tdefile/kpropertiesdialog.cpp:1569
 msgid "Can View & Modify Content"
 msgstr "可查看并修改内容"
 
-#: tdefile/kpropertiesdialog.cpp:1544
+#: tdefile/kpropertiesdialog.cpp:1573
 msgid "Can View Content & Read"
 msgstr "可查看内容并读取"
 
-#: tdefile/kpropertiesdialog.cpp:1545
+#: tdefile/kpropertiesdialog.cpp:1574
 msgid "Can View/Read & Modify/Write"
 msgstr "可查看/读取并修改/写入内容"
 
-#: tdefile/kpropertiesdialog.cpp:1639
+#: tdefile/kpropertiesdialog.cpp:1668
 msgid "&Permissions"
 msgstr "权限(&P)"
 
-#: tdefile/kpropertiesdialog.cpp:1650 tdefile/kpropertiesdialog.cpp:1904
+#: tdefile/kpropertiesdialog.cpp:1679 tdefile/kpropertiesdialog.cpp:1940
 msgid "Access Permissions"
 msgstr "访问权限"
 
-#: tdefile/kpropertiesdialog.cpp:1661
+#: tdefile/kpropertiesdialog.cpp:1690
 msgid ""
 "_n: This file is a link and does not have permissions.\n"
 "All files are links and do not have permissions."
 msgstr "文件为链接，且没有权限。"
 
-#: tdefile/kpropertiesdialog.cpp:1664
+#: tdefile/kpropertiesdialog.cpp:1693
 msgid "Only the owner can change permissions."
 msgstr "只有所有者可以更改权限。"
 
-#: tdefile/kpropertiesdialog.cpp:1667
+#: tdefile/kpropertiesdialog.cpp:1696
 msgid "O&wner:"
 msgstr "所有者(&W)："
 
-#: tdefile/kpropertiesdialog.cpp:1673
+#: tdefile/kpropertiesdialog.cpp:1702
 msgid "Specifies the actions that the owner is allowed to do."
 msgstr "指定允许所有者执行的操作。"
 
-#: tdefile/kpropertiesdialog.cpp:1675
+#: tdefile/kpropertiesdialog.cpp:1704
 msgid "Gro&up:"
 msgstr "群组(&U)："
 
-#: tdefile/kpropertiesdialog.cpp:1681
+#: tdefile/kpropertiesdialog.cpp:1710
 msgid "Specifies the actions that the members of the group are allowed to do."
 msgstr "指定允许同组用户执行的操作。"
 
-#: tdefile/kpropertiesdialog.cpp:1683
+#: tdefile/kpropertiesdialog.cpp:1712
 msgid "O&thers:"
 msgstr "其他(&T)："
 
-#: tdefile/kpropertiesdialog.cpp:1689
+#: tdefile/kpropertiesdialog.cpp:1718
 msgid ""
 "Specifies the actions that all users, who are neither owner nor in the group, "
 "are allowed to do."
 msgstr "指定既非所有者也非同组者的其他用户可执行的操作。"
 
-#: tdefile/kpropertiesdialog.cpp:1694
+#: tdefile/kpropertiesdialog.cpp:1723
 msgid "Only own&er can rename and delete folder content"
 msgstr "只有所有者可以重命名并删除文件夹内容(&E)"
 
-#: tdefile/kpropertiesdialog.cpp:1695
+#: tdefile/kpropertiesdialog.cpp:1724
 msgid "Is &executable"
 msgstr "可执行(&E)"
 
-#: tdefile/kpropertiesdialog.cpp:1699
+#: tdefile/kpropertiesdialog.cpp:1728
 msgid ""
 "Enable this option to allow only the folder's owner to delete or rename the "
 "contained files and folders. Other users can only add new files, which requires "
 "the 'Modify Content' permission."
 msgstr "启用此选项，将允许文件夹属主删除或重命名文件和文件夹。其他用户在设置了“修改内容”权限的情况下，可以添加新文件。"
 
-#: tdefile/kpropertiesdialog.cpp:1703
+#: tdefile/kpropertiesdialog.cpp:1732
 msgid ""
 "Enable this option to mark the file as executable. This only makes sense for "
 "programs and scripts. It is required when you want to execute them."
 msgstr "启用此选项，可将此文件标为可执行。这只对程序和脚本。如果您想要执行此文件的话，则需要选中此项。"
 
-#: tdefile/kpropertiesdialog.cpp:1710
+#: tdefile/kpropertiesdialog.cpp:1739
 msgid "A&dvanced Permissions"
 msgstr "高级权限(&D)"
 
-#: tdefile/kpropertiesdialog.cpp:1719
+#: tdefile/kpropertiesdialog.cpp:1748
 msgid "Ownership"
 msgstr "所有者"
 
-#: tdefile/kpropertiesdialog.cpp:1728
+#: tdefile/kpropertiesdialog.cpp:1757
 msgid "User:"
 msgstr "用户："
 
-#: tdefile/kpropertiesdialog.cpp:1814
+#: tdefile/kpropertiesdialog.cpp:1843
 msgid "Group:"
 msgstr "群组："
 
-#: tdefile/kpropertiesdialog.cpp:1856
+#: tdefile/kpropertiesdialog.cpp:1885
 msgid "Apply changes to all subfolders and their contents"
 msgstr "将更改应用到所有的子文件夹和其中的文件"
 
-#: tdefile/kpropertiesdialog.cpp:1894
+#: tdefile/kpropertiesdialog.cpp:1930
 msgid "Advanced Permissions"
 msgstr "高级权限"
 
-#: tdefile/kpropertiesdialog.cpp:1913
+#: tdefile/kpropertiesdialog.cpp:1949
 msgid "Class"
 msgstr "类"
 
-#: tdefile/kpropertiesdialog.cpp:1918
+#: tdefile/kpropertiesdialog.cpp:1954
 msgid ""
 "Show\n"
 "Entries"
@@ -4290,19 +5015,19 @@ msgstr ""
 "显示\n"
 "项目"
 
-#: tdefile/kpropertiesdialog.cpp:1920
+#: tdefile/kpropertiesdialog.cpp:1956
 msgid "Read"
 msgstr "读取"
 
-#: tdefile/kpropertiesdialog.cpp:1925
+#: tdefile/kpropertiesdialog.cpp:1961
 msgid "This flag allows viewing the content of the folder."
 msgstr "此标志允许查看文件夹的内容。"
 
-#: tdefile/kpropertiesdialog.cpp:1927
+#: tdefile/kpropertiesdialog.cpp:1963
 msgid "The Read flag allows viewing the content of the file."
 msgstr "读取标志允许查看文件的内容。"
 
-#: tdefile/kpropertiesdialog.cpp:1931
+#: tdefile/kpropertiesdialog.cpp:1967
 msgid ""
 "Write\n"
 "Entries"
@@ -4310,217 +5035,211 @@ msgstr ""
 "写入\n"
 "项目"
 
-#: tdefile/kpropertiesdialog.cpp:1933
+#: tdefile/kpropertiesdialog.cpp:1969
 msgid "Write"
 msgstr "写入"
 
-#: tdefile/kpropertiesdialog.cpp:1938
+#: tdefile/kpropertiesdialog.cpp:1974
 msgid ""
 "This flag allows adding, renaming and deleting of files. Note that deleting and "
 "renaming can be limited using the Sticky flag."
 msgstr "此标志允许添加、重命名和删除文件。请注意，删除和重命名可以使用粘性标志加以限制。"
 
-#: tdefile/kpropertiesdialog.cpp:1941
+#: tdefile/kpropertiesdialog.cpp:1977
 msgid "The Write flag allows modifying the content of the file."
 msgstr "写入标志允许修改文件内容。"
 
-#: tdefile/kpropertiesdialog.cpp:1946
+#: tdefile/kpropertiesdialog.cpp:1982
 msgid ""
 "_: Enter folder\n"
 "Enter"
 msgstr "进入"
 
-#: tdefile/kpropertiesdialog.cpp:1947
+#: tdefile/kpropertiesdialog.cpp:1983
 msgid "Enable this flag to allow entering the folder."
 msgstr "启用此标志以允许进入文件夹。"
 
-#: tdefile/kpropertiesdialog.cpp:1950
+#: tdefile/kpropertiesdialog.cpp:1986
 msgid "Exec"
 msgstr "执行"
 
-#: tdefile/kpropertiesdialog.cpp:1951
+#: tdefile/kpropertiesdialog.cpp:1987
 msgid "Enable this flag to allow executing the file as a program."
 msgstr "启用此标志，可以将文件以程序方式执行。"
 
-#: tdefile/kpropertiesdialog.cpp:1961
+#: tdefile/kpropertiesdialog.cpp:1997
 msgid "Special"
 msgstr "特殊"
 
-#: tdefile/kpropertiesdialog.cpp:1965
+#: tdefile/kpropertiesdialog.cpp:2001
 msgid ""
 "Special flag. Valid for the whole folder, the exact meaning of the flag can be "
 "seen in the right hand column."
 msgstr "特殊标志。只对整个文件夹有效，您可在右手列中查看每个标志的具体含义。"
 
-#: tdefile/kpropertiesdialog.cpp:1968
+#: tdefile/kpropertiesdialog.cpp:2004
 msgid ""
 "Special flag. The exact meaning of the flag can be seen in the right hand "
 "column."
 msgstr "特殊标志。您可在右手列中查看每个标志的具体含义。"
 
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 95
-#: tdefile/kpropertiesdialog.cpp:1972 rc.cpp:96
-#, no-c-format
+#: tdefile/kpropertiesdialog.cpp:2008
 msgid "User"
 msgstr "用户"
 
-#: tdefile/kpropertiesdialog.cpp:1984
+#: tdefile/kpropertiesdialog.cpp:2020
 msgid "Set UID"
 msgstr "设置 UID"
 
-#: tdefile/kpropertiesdialog.cpp:1988
+#: tdefile/kpropertiesdialog.cpp:2024
 msgid ""
 "If this flag is set, the owner of this folder will be the owner of all new "
 "files."
 msgstr "如果设置了此标志，此文件夹的所有者也将是全部新文件的所有者。"
 
-#: tdefile/kpropertiesdialog.cpp:1991
+#: tdefile/kpropertiesdialog.cpp:2027
 msgid ""
 "If this file is an executable and the flag is set, it will be executed with the "
 "permissions of the owner."
 msgstr "如果此文件可执行且设置了此标志，该文件将会以所有者的权限加以运行。"
 
-#: tdefile/kpropertiesdialog.cpp:1995
+#: tdefile/kpropertiesdialog.cpp:2031
 msgid "Set GID"
 msgstr "设置 GID"
 
-#: tdefile/kpropertiesdialog.cpp:1999
+#: tdefile/kpropertiesdialog.cpp:2035
 msgid ""
 "If this flag is set, the group of this folder will be set for all new files."
 msgstr "如果设置了此标志，此文件夹的群组将会设置为全部新文件的群组。"
 
-#: tdefile/kpropertiesdialog.cpp:2002
+#: tdefile/kpropertiesdialog.cpp:2038
 msgid ""
 "If this file is an executable and the flag is set, it will be executed with the "
 "permissions of the group."
 msgstr "如果此文件可执行且设置了此标志，该文件将会以群组的权限加以运行。"
 
-#: tdefile/kpropertiesdialog.cpp:2006
+#: tdefile/kpropertiesdialog.cpp:2042
 msgid ""
 "_: File permission\n"
 "Sticky"
 msgstr "粘性"
 
-#: tdefile/kpropertiesdialog.cpp:2010
+#: tdefile/kpropertiesdialog.cpp:2046
 msgid ""
 "If the Sticky flag is set on a folder, only the owner and root can delete or "
 "rename files. Otherwise everybody with write permissions can do this."
 msgstr "如果在文件夹上设置了粘性标志，则只有所有者和 root 可以删除或重命名文件。否则，拥有写入权限的每个人都可以删除或重命名文件。"
 
-#: tdefile/kpropertiesdialog.cpp:2014
+#: tdefile/kpropertiesdialog.cpp:2050
 msgid ""
 "The Sticky flag on a file is ignored on Linux, but may be used on some systems"
 msgstr "文件上的粘性标志在 Linux 下被忽略，但可能在其它系统尚有用"
 
-#: tdefile/kpropertiesdialog.cpp:2193
+#: tdefile/kpropertiesdialog.cpp:2229
 msgid "Link"
 msgstr "链接"
 
-#: tdefile/kpropertiesdialog.cpp:2209
+#: tdefile/kpropertiesdialog.cpp:2245
 msgid "Varying (No Change)"
 msgstr "多种情况(无更改)"
 
-#: tdefile/kpropertiesdialog.cpp:2308
+#: tdefile/kpropertiesdialog.cpp:2344
 msgid ""
 "_n: This file uses advanced permissions\n"
 "These files use advanced permissions."
 msgstr "文件使用了高级权限。"
 
-#: tdefile/kpropertiesdialog.cpp:2329
+#: tdefile/kpropertiesdialog.cpp:2365
 msgid ""
 "_n: This folder uses advanced permissions.\n"
 "These folders use advanced permissions."
 msgstr "文件夹使用了高级权限。"
 
-#: tdefile/kpropertiesdialog.cpp:2344
+#: tdefile/kpropertiesdialog.cpp:2380
 msgid "These files use advanced permissions."
 msgstr "这些文件使用了高级权限。"
 
-#: tdefile/kpropertiesdialog.cpp:2560
+#: tdefile/kpropertiesdialog.cpp:2596
 msgid "U&RL"
 msgstr "U&RL"
 
-#: tdefile/kpropertiesdialog.cpp:2665
+#: tdefile/kpropertiesdialog.cpp:2733
 msgid "A&ssociation"
 msgstr "关联(&S)"
 
-#: tdefile/kpropertiesdialog.cpp:2674
+#: tdefile/kpropertiesdialog.cpp:2742
 msgid "Pattern ( example: *.html;*.htm )"
 msgstr "模式 (例如：*.html;*.htm)"
 
-#: tdefile/kpropertiesdialog.cpp:2707
+#: tdefile/kpropertiesdialog.cpp:2775
 msgid "Left click previews"
 msgstr "左键单击预览"
 
-#: tdefile/kpropertiesdialog.cpp:2826
+#: tdefile/kpropertiesdialog.cpp:2894
 msgid "De&vice"
 msgstr "设备(&V)"
 
-#: tdefile/kpropertiesdialog.cpp:2856
+#: tdefile/kpropertiesdialog.cpp:2924
 msgid "Device (/dev/fd0):"
 msgstr "设备 (/dev/fd0)："
 
-#: tdefile/kpropertiesdialog.cpp:2857
+#: tdefile/kpropertiesdialog.cpp:2925
 msgid "Device:"
 msgstr "设备："
 
-#: tdefile/kpropertiesdialog.cpp:2867
+#: tdefile/kpropertiesdialog.cpp:2937
 msgid "Read only"
 msgstr "只读"
 
-#: tdefile/kpropertiesdialog.cpp:2871
+#: tdefile/kpropertiesdialog.cpp:2941
 msgid "File system:"
 msgstr "文件系统："
 
-#: tdefile/kpropertiesdialog.cpp:2879
+#: tdefile/kpropertiesdialog.cpp:2949
 msgid "Mount point (/mnt/floppy):"
 msgstr "挂载点 (/mnt/floppy)："
 
-#: tdefile/kpropertiesdialog.cpp:2880
+#: tdefile/kpropertiesdialog.cpp:2950
 msgid "Mount point:"
 msgstr "挂载点："
 
-#: tdefile/kpropertiesdialog.cpp:2911
+#: tdefile/kpropertiesdialog.cpp:2981
 msgid "Unmounted Icon"
 msgstr "设备卸载后图标"
 
-#: tdefile/kpropertiesdialog.cpp:3091 tdefile/kpropertiesdialog.cpp:3896
+#: tdefile/kpropertiesdialog.cpp:3178 tdefile/kpropertiesdialog.cpp:3986
 msgid "&Application"
 msgstr "应用程序(&A)"
 
-#: tdefile/kpropertiesdialog.cpp:3213
+#: tdefile/kpropertiesdialog.cpp:3303
 #, c-format
 msgid "Add File Type for %1"
 msgstr "为 %1 添加文件类型"
 
-#: bookmarks/kbookmarkmenu.cc:829 tdefile/kpropertiesdialog.cpp:3216
-msgid "&Add"
-msgstr "添加(&A)"
-
-#: tdefile/kpropertiesdialog.cpp:3217 tdefile/kpropertiesdialog.cpp:3218
+#: tdefile/kpropertiesdialog.cpp:3307 tdefile/kpropertiesdialog.cpp:3308
 msgid ""
 "Add the selected file types to\n"
 "the list of supported file types."
 msgstr "将选中的文件类型添加到支持的文件类型中。"
 
-#: tdefile/kpropertiesdialog.cpp:3412 tdefile/kpropertiesdialog.cpp:3868
+#: tdefile/kpropertiesdialog.cpp:3502 tdefile/kpropertiesdialog.cpp:3958
 msgid "Only executables on local file systems are supported."
 msgstr "只支持本地文件系统上的可执行文件。"
 
-#: tdefile/kpropertiesdialog.cpp:3424
+#: tdefile/kpropertiesdialog.cpp:3514
 #, c-format
 msgid "Advanced Options for %1"
 msgstr "%1 的高级选项"
 
-#: tdefile/kpropertiesdialog.cpp:3583
+#: tdefile/kpropertiesdialog.cpp:3673
 msgid "E&xecute"
 msgstr "执行(&X)"
 
-#: tdefile/kpropertiesdialog.cpp:3590
+#: tdefile/kpropertiesdialog.cpp:3680
 msgid "Comman&d:"
 msgstr "命令(&D)："
 
-#: tdefile/kpropertiesdialog.cpp:3599
+#: tdefile/kpropertiesdialog.cpp:3689
 msgid ""
 "Following the command, you can have several place holders which will be "
 "replaced with the actual values when the actual program is run:\n"
@@ -4546,842 +5265,190 @@ msgstr ""
 "%m - 小图标\n"
 "%c - 标题"
 
-#: tdefile/kpropertiesdialog.cpp:3620
+#: tdefile/kpropertiesdialog.cpp:3710
 msgid "Panel Embedding"
 msgstr "面板嵌入"
 
-#: tdefile/kpropertiesdialog.cpp:3629
+#: tdefile/kpropertiesdialog.cpp:3719
 msgid "&Execute on click:"
 msgstr "在单击时执行(&E)："
 
-#: tdefile/kpropertiesdialog.cpp:3637
+#: tdefile/kpropertiesdialog.cpp:3727
 msgid "&Window title:"
 msgstr "窗口标题(&W)："
 
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 55
-#: tdefile/kpropertiesdialog.cpp:3657 rc.cpp:81
-#, no-c-format
+#: tdefile/kpropertiesdialog.cpp:3747
 msgid "&Run in terminal"
 msgstr "在终端中运行(&R)"
 
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 77
-#: tdefile/kpropertiesdialog.cpp:3672 rc.cpp:90
-#, no-c-format
+#: tdefile/kpropertiesdialog.cpp:3762
 msgid "Do not &close when command exits"
 msgstr "命令退出时不关闭(&C)"
 
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 66
-#: tdefile/kpropertiesdialog.cpp:3676 rc.cpp:87
-#, no-c-format
+#: tdefile/kpropertiesdialog.cpp:3766
 msgid "&Terminal options:"
 msgstr "终端选项(&T)："
 
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 106
-#: tdefile/kpropertiesdialog.cpp:3696 rc.cpp:99
-#, no-c-format
+#: tdefile/kpropertiesdialog.cpp:3786
 msgid "Ru&n as a different user"
 msgstr "以不同的用户运行(&N)"
 
-#: tdefile/kpropertiesdialog.cpp:3937
+#: tdefile/kpropertiesdialog.cpp:4027
 msgid "Description:"
 msgstr "描述："
 
-#: tdefile/kpropertiesdialog.cpp:3943
+#: tdefile/kpropertiesdialog.cpp:4033
 msgid "Comment:"
 msgstr "注释："
 
-#: tdefile/kpropertiesdialog.cpp:3949
+#: tdefile/kpropertiesdialog.cpp:4039
 msgid "File types:"
 msgstr "文件类型："
 
-#: tdefile/tdefilesharedlg.cpp:56
-msgid "&Share"
-msgstr "共享(&S)"
-
-#: tdefile/tdefilesharedlg.cpp:128
-msgid "Only folders in your home folder can be shared."
-msgstr "仅可共享您主文件夹中的文件夹。"
-
-#: tdefile/tdefilesharedlg.cpp:139
-msgid "Not shared"
-msgstr "未共享"
-
-#: tdefile/tdefilesharedlg.cpp:144
-msgid "Shared"
-msgstr "已共享"
-
-#: tdefile/tdefilesharedlg.cpp:156
-msgid ""
-"Sharing this folder makes it available under Linux/UNIX (NFS) and Windows "
-"(Samba)."
-msgstr "共享此文件夹将使其可以在 Linux/UNIX(NFS) 和 Windows(Samba) 中访问。"
-
-#: tdefile/tdefilesharedlg.cpp:162
-msgid "You can also reconfigure file sharing authorization."
-msgstr "您还可以重新配置文件共享的授权。"
-
-#: tdefile/tdefilesharedlg.cpp:165 tdefile/tdefilesharedlg.cpp:189
-msgid "Configure File Sharing..."
-msgstr "配置文件共享..."
-
-#: tdefile/tdefilesharedlg.cpp:174
-msgid ""
-"Error running 'filesharelist'. Check if installed and in $PATH or /usr/sbin."
-msgstr "运行“filesharelist”出错。请检查该程序是否已经安装并位于 $PATH 或 /usr/bin 中。"
-
-#: tdefile/tdefilesharedlg.cpp:181
-msgid "You need to be authorized to share folders."
-msgstr "您需要被授权共享文件夹。"
-
-#: tdefile/tdefilesharedlg.cpp:184
-msgid "File sharing is disabled."
-msgstr "文件共享已禁用。"
-
-#: tdefile/tdefilesharedlg.cpp:249
-msgid "Sharing folder '%1' failed."
-msgstr "共享文件夹“%1”失败。"
-
-#: tdefile/tdefilesharedlg.cpp:250
-msgid ""
-"An error occurred while trying to share folder '%1'. Make sure that the Perl "
-"script 'fileshareset' is set suid root."
-msgstr "试图共享文件夹“%1”时发生了错误。请确定 Perl 脚本“fileshareset”已设置了 suid root。"
-
-#: tdefile/tdefilesharedlg.cpp:255
-msgid "Unsharing folder '%1' failed."
-msgstr "取消文件夹“%1”的共享失败。"
-
-#: tdefile/tdefilesharedlg.cpp:256
-msgid ""
-"An error occurred while trying to unshare folder '%1'. Make sure that the Perl "
-"script 'fileshareset' is set suid root."
-msgstr "试图取消文件夹“%1”的共享时发生了错误。请确定 Perl 脚本“fileshareset”已设置了 suid root。"
-
-#: tdefile/kurlbar.cpp:348
-msgid ""
-"<qt>The <b>Quick Access</b> panel provides easy access to commonly used file "
-"locations."
-"<p>Clicking on one of the shortcut entries will take you to that location."
-"<p>By right clicking on an entry you can add, edit and remove shortcuts.</qt>"
-msgstr ""
-"<qt><b>快速访问</b>面板提供对常用文件位置的简便访问。"
-"<p>单击快捷项就会将您带到相应位置。"
-"<p>用鼠标右键单击项，可以添加、编辑或删除快捷方式。</qt>"
-
-#: tdefile/kurlbar.cpp:730
-msgid "&Large Icons"
-msgstr "大图标(&L)"
-
-#: tdefile/kurlbar.cpp:730
-msgid "&Small Icons"
-msgstr "小图标(&S)"
-
-#: tdefile/kurlbar.cpp:736
-msgid "&Edit Entry..."
-msgstr "编辑项目(&E)..."
-
-#: tdefile/kurlbar.cpp:740
-msgid "&Add Entry..."
-msgstr "添加项目(&A)..."
-
-#: tdefile/kurlbar.cpp:744
-msgid "&Remove Entry"
-msgstr "删除项目(&R)"
-
-#: tdefile/kurlbar.cpp:776
-msgid "Enter a description"
-msgstr "输入描述"
-
-#: tdefile/kurlbar.cpp:922
-msgid "Edit Quick Access Entry"
-msgstr "编辑快速访问项目"
-
-#: tdefile/kurlbar.cpp:925
-msgid ""
-"<qt><b>Please provide a description, URL and icon for this Quick Access "
-"entry.</b></br></qt>"
-msgstr "<qt><b>请为此快速访问项目提供描述、URL 和图标。</b></br></qt>"
-
-#: tdefile/kurlbar.cpp:932
-msgid ""
-"<qt>This is the text that will appear in the Quick Access panel."
-"<p>The description should consist of one or two words that will help you "
-"remember what this entry refers to.</qt>"
-msgstr "<qt>这是将出现在快速访问面板中的文字。<p>描述应该由一两个词组成，以便帮助您记住本项的含义。</qt>"
-
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 125
-#: tdefile/kurlbar.cpp:935 rc.cpp:239
-#, no-c-format
-msgid "&Description:"
-msgstr "描述(&D)："
-
-#: tdefile/kurlbar.cpp:942
-msgid ""
-"<qt>This is the location associated with the entry. Any valid URL may be used. "
-"For example:"
-"<p>%1"
-"<br>http://www.kde.org"
-"<br>ftp://ftp.kde.org/pub/kde/stable"
-"<p>By clicking on the button next to the text edit box you can browse to an "
-"appropriate URL.</qt>"
-msgstr ""
-"<qt>这是与该项关联的位置，可以使用任何合法的 URL。例如："
-"<p>%1"
-"<br>http://www.kde.org"
-"<br>ftp://ftp.kde.org/pub/kde/stable"
-"<p>单击文本编辑框旁边的按钮可以浏览相应的 URL。</qt>"
-
-#: tdefile/kurlbar.cpp:946
-msgid "&URL:"
-msgstr "&URL："
-
-#: tdefile/kurlbar.cpp:953
-msgid ""
-"<qt>This is the icon that will appear in the Quick Access panel."
-"<p>Click on the button to select a different icon.</qt>"
-msgstr "<qt>这是将出现在快速访问面板中的图标。<p>单击按钮可以选择不同的图标。</qt>"
-
-#: tdefile/kurlbar.cpp:955
-msgid "Choose an &icon:"
-msgstr "选择图标(&I)："
-
-#: tdefile/kurlbar.cpp:971
-msgid "&Only show when using this application (%1)"
-msgstr "仅在使用此程序(%1)时显示(&O)"
-
-#: tdefile/kurlbar.cpp:974
-msgid ""
-"<qt>Select this setting if you want this entry to show only when using the "
-"current application (%1)."
-"<p>If this setting is not selected, the entry will be available in all "
-"applications.</qt>"
-msgstr ""
-"<qt>如果您希望此项仅在使用当前应用程序(%1)时显示，请选择该设置。\n"
-"<p>如果该设置没有被选，此项将在所有应用程序中显示。</qt>"
-
-#: tests/kurifiltertest.cpp:144
-msgid "kurifiltertest"
-msgstr "kurifiltertest"
-
-#: tests/kurifiltertest.cpp:145
-msgid "Unit test for the URI filter plugin framework."
-msgstr "URI 过滤器插件框架的单元测试。"
-
-#: tests/kurifiltertest.cpp:150
-msgid "Use space as keyword delimeter for web shortcuts"
-msgstr "使用空格作为速搜的关键字分隔符"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "开源软件国际化之简体中文组"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "i18n-translation@lists.linux.net.cn"
-
-#. i18n: file ./kssl/keygenwizard2.ui line 25
-#: rc.cpp:3
-#, no-c-format
-msgid ""
-"You must now provide a password for the certificate request. Please choose a "
-"very secure password as this will be used to encrypt your private key."
-msgstr "您必须现在就为证书请求提供一个密码。请选择非常安全的密码，因为该密码会用于加密您的私人密钥。"
-
-#. i18n: file ./kssl/keygenwizard2.ui line 38
-#: rc.cpp:6
-#, no-c-format
-msgid "&Repeat password:"
-msgstr "重复密码(&R)："
-
-#. i18n: file ./kssl/keygenwizard2.ui line 49
-#: rc.cpp:9
-#, no-c-format
-msgid "&Choose password:"
-msgstr "选择密码(&C)："
-
-#. i18n: file ./kssl/keygenwizard.ui line 25
-#: rc.cpp:12
-#, no-c-format
-msgid ""
-"You have indicated that you wish to obtain or purchase a secure certificate. "
-"This wizard is intended to guide you through the procedure. You may cancel at "
-"any time, and this will abort the transaction."
-msgstr "您已经表明您想要获得或者购买安全证书。此向导将会引导您完成这个过程。您可在任何时候取消，从而中止此项事务。"
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 16
-#: rc.cpp:15
-#, no-c-format
-msgid "TDE Wallet Wizard"
-msgstr "TDE 钱包向导"
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 23
-#: rc.cpp:18
-#, no-c-format
-msgid "Introduction"
-msgstr "简介"
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 56
-#: rc.cpp:21
-#, no-c-format
-msgid "<u>TDEWallet</u> - The TDE Wallet System"
-msgstr "<u>TDEWallet</u> - TDE 钱包系统"
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 81
-#: rc.cpp:24
-#, no-c-format
-msgid ""
-"Welcome to TDEWallet, the TDE Wallet System.  TDEWallet allows you to store your "
-"passwords and other personal information on disk in an encrypted file, "
-"preventing others from viewing the information.  This wizard will tell you "
-"about TDEWallet and help you configure it for the first time."
-msgstr ""
-"欢迎使用 TDEWallet - TDE 钱包系统。TDEWallet "
-"允许您将您的密码和其他个人信息保存在磁盘上的加密文件中，这样可以避免其他人查看该信息。此向导将会为您介绍 TDEWallet 的特性，并帮助您进行首次配置。"
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 112
-#: rc.cpp:27
-#, no-c-format
-msgid "&Basic setup (recommended)"
-msgstr "基本设置(推荐)(&B)"
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 123
-#: rc.cpp:30
-#, no-c-format
-msgid "&Advanced setup"
-msgstr "高级设置(&A)"
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 180
-#: rc.cpp:36
-#, no-c-format
-msgid ""
-"The TDE Wallet system stores your data in a <i>wallet</i> "
-"file on your local hard disk.  The data is only written in encrypted form, "
-"presently using the blowfish algorithm with your password as the key.  When a "
-"wallet is opened, the wallet manager application will launch and display an "
-"icon in the system tray.  You can use this application to manage your wallets.  "
-"It even permits you to drag wallets and wallet contents, allowing you to easily "
-"copy a wallet to a remote system."
-msgstr ""
-"TDE "
-"钱包系统将您的数据存储在本地硬盘的<i>钱包</i>文件中。数据只能以加密方式写入，这并且会用您的密码作为密钥进行强加密。当钱包打开时，钱包管理器应用程序将会调"
-"用并在系统托盘中显示图标。您可以使用此应用程序管理您的钱包。它甚至允许您拖曳钱包及钱包的内容，这样就可以很轻松地将钱包复制到远程系统。"
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 193
-#: rc.cpp:39
-#, no-c-format
-msgid "Password Selection"
-msgstr "密码选择"
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 204
-#: rc.cpp:42
-#, no-c-format
-msgid ""
-"Various applications may attempt to use the TDE wallet to store passwords or "
-"other information such as web form data and cookies.  If you would like these "
-"applications to use the wallet, you must enable it now and choose a password.  "
-"The password you choose <i>cannot</i> be recovered if it is lost, and will "
-"allow anyone who knows it to obtain all the information contained in the "
-"wallet."
-msgstr ""
-"各种应用程序都可能试图使用 TDE 钱包来存储密码或其它诸如 Web 表单数据和 Cookies "
-"这样的信息。如果您想要这些应用程序使用钱包，您必须现在就启用并选择一个密码。如果您忘记所选的密码的话，将<i>无法</i>"
-"恢复。知道该密码的所有人都可以获取钱包中所包含的全部信息。"
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 234
-#: rc.cpp:45
-#, no-c-format
-msgid "Enter a new password:"
-msgstr "输入新密码："
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 251
-#: rc.cpp:48
-#, no-c-format
-msgid "Verify password:"
-msgstr "校验密码："
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 301
-#: rc.cpp:51
-#, no-c-format
-msgid "Yes, I wish to use the TDE wallet to store my personal information."
-msgstr "是，我想要使用 TDE 钱包来存储我的个人信息。"
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 390
-#: rc.cpp:54
-#, no-c-format
-msgid "Security Level"
-msgstr "安全级别"
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 401
-#: rc.cpp:57
-#, no-c-format
-msgid ""
-"The TDE Wallet system allows you to control the level of security of your "
-"personal data.  Some of these settings do impact usability.  While the default "
-"settings are generally acceptable for most users, you may wish to change some "
-"of them.  You may further tune these settings from the TDEWallet control module."
-msgstr ""
-"TDE 钱包系统允许您控制您个人数据的安全级别。某些设置会对可用性造成一定的影响。尽管默认设置适用于大多数用户，您仍然可以进行更改。您稍候可以从 "
-"TDEWallet 控制模块中对这些设置详细调整。"
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 432
-#: rc.cpp:60
-#, no-c-format
-msgid "Store network passwords and local passwords in separate wallet files"
-msgstr "在独立的钱包文件中存储网络密码和本地密码"
-
-#. i18n: file ./misc/tdewalletd/tdewalletwizard.ui line 440
-#: rc.cpp:63
-#, no-c-format
-msgid "Automatically close idle wallets"
-msgstr "自动关闭不用的钱包"
-
-#. i18n: file ./misc/tdewalletd/kbetterthankdialogbase.ui line 60
-#: rc.cpp:66
-#, no-c-format
-msgid "Allow &Once"
-msgstr "允许一次(&O)"
-
-#. i18n: file ./misc/tdewalletd/kbetterthankdialogbase.ui line 71
-#: rc.cpp:69
-#, no-c-format
-msgid "Allow &Always"
-msgstr "总是允许(&A)"
-
-#. i18n: file ./misc/tdewalletd/kbetterthankdialogbase.ui line 79
-#: rc.cpp:72
-#, no-c-format
-msgid "&Deny"
-msgstr "拒绝(&O)"
-
-#. i18n: file ./misc/tdewalletd/kbetterthankdialogbase.ui line 87
-#: rc.cpp:75
-#, no-c-format
-msgid "Deny &Forever"
-msgstr "永远拒绝(&F)"
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 27
-#: rc.cpp:78
-#, no-c-format
-msgid "Terminal"
-msgstr "终端"
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 58
-#: rc.cpp:84
-#, no-c-format
-msgid ""
-"Check this option if the application you want to run is a text mode application "
-"or if you want the information that is provided by the terminal emulator "
-"window."
-msgstr "如果您想要运行的应用程序是文本模式应用程序，或者您需要的信息由终端模拟窗口所提供，请选中此选项。"
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 80
-#: rc.cpp:93
-#, no-c-format
-msgid ""
-"Check this option if the text mode application offers relevant information on "
-"exit. Keeping the terminal emulator open allows you to retrieve this "
-"information."
-msgstr "如果文本模式应用程序在退出时提供相关信息，请选中此选项。保持终端模拟器打开可允许您获取此信息。"
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 109
-#: rc.cpp:102
-#, no-c-format
-msgid ""
-"Check this option if you want to run this application with a different user id. "
-"Every process has a different user id associated with it. This id code "
-"determines file access and other permissions. The password of the user is "
-"required to use this option."
-msgstr ""
-"如果您想要以不同的用户 ID 运行此应用程序，请选中此选项。每个进程都有与其关联的不同的用户 ID。此 ID "
-"代码决定了文件访问和其它权限。需要提供该用户的密码才可以使用此选项。"
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 140
-#: rc.cpp:108
-#, no-c-format
-msgid "Enter the user name you want to run the application as."
-msgstr "输入您想要以何用户名的身份运行此应用程序。"
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 148
-#: rc.cpp:111
-#, no-c-format
-msgid "Enter the user name you want to run the application as here."
-msgstr "在此输入您想要以何用户名的身份运行此应用程序。"
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 158
-#: rc.cpp:114
-#, no-c-format
-msgid "Startup"
-msgstr "启动"
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 169
-#: rc.cpp:117
-#, no-c-format
-msgid "Enable &launch feedback"
-msgstr "启用执行反馈(&L)"
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 172
-#: rc.cpp:120
-#, no-c-format
-msgid ""
-"Check this option if you want to make clear that your application has started. "
-"This visual feedback may appear as a busy cursor or in the taskbar."
-msgstr "如果您想要更清楚地了解您应用程序的启动过程，请选中此选项。此视觉反馈可能显示为忙光标，也可能在任务栏中有所体现。"
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 180
-#: rc.cpp:123
-#, no-c-format
-msgid "&Place in system tray"
-msgstr "放在系统托盘中(&P)"
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 183
-#: rc.cpp:126
-#, no-c-format
-msgid ""
-"Check this option if you want to have a system tray handle for your "
-"application."
-msgstr "如果您想要为您的应用程序提供系统托盘句柄，请选中此选项。"
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 191
-#: rc.cpp:129
-#, no-c-format
-msgid "&DCOP registration:"
-msgstr "DCOP 注册(&D)："
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 200
-#: rc.cpp:132
-#, no-c-format
-msgid "None"
-msgstr "无"
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 205
-#: rc.cpp:135
-#, no-c-format
-msgid "Multiple Instances"
-msgstr "多实例"
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 210
-#: rc.cpp:138
-#, no-c-format
-msgid "Single Instance"
-msgstr "单实例"
-
-#. i18n: file ./tdefile/kpropertiesdesktopadvbase.ui line 215
-#: rc.cpp:141
-#, no-c-format
-msgid "Run Until Finished"
-msgstr "运行至完成"
-
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 91
-#: rc.cpp:144
-#, no-c-format
-msgid "Events"
-msgstr "事件"
-
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 117
-#: rc.cpp:147
-#, no-c-format
-msgid "Quick Controls"
-msgstr "快速控制"
-
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 128
-#: rc.cpp:150
-#, no-c-format
-msgid "Apply to &all applications"
-msgstr "应用到全部应用程序(&A)"
+#: tdefile/tdefilefiltercombo.cpp:164
+msgid "All Supported Files"
+msgstr "支持的全部文件"
 
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 170
-#: rc.cpp:153
-#, no-c-format
-msgid "Turn O&ff All"
-msgstr "全部关闭(&F)"
+#: tdefile/kcustommenueditor.cpp:88
+msgid "Menu Editor"
+msgstr "菜单编辑器"
 
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 173
-#: rc.cpp:156 rc.cpp:162
-#, no-c-format
-msgid "Allows you to change the behavior for all events at once"
-msgstr "允许您一次更改全部事件的行为"
+#: tdefile/kcustommenueditor.cpp:98
+msgid "New..."
+msgstr "新建..."
 
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 181
-#: rc.cpp:159
-#, no-c-format
-msgid "Turn O&n All"
-msgstr "全部打开(&N)"
+#: tdefile/kcustommenueditor.cpp:100
+msgid "Move Up"
+msgstr "上移"
 
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 215
-#: rc.cpp:168
-#, no-c-format
-msgid "Print a message to standard &error output"
-msgstr "把消息打印到标准错误输出(&E)"
+#: tdefile/kcustommenueditor.cpp:101
+msgid "Move Down"
+msgstr "下移"
 
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 223
-#: rc.cpp:171
-#, no-c-format
-msgid "Show a &message in a pop-up window"
-msgstr "在弹出窗口中显示消息(&M)"
+#: tdefile/knotifydialog.cpp:81
+msgid "Sounds"
+msgstr "声音"
 
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 231
-#: rc.cpp:174
-#, no-c-format
-msgid "E&xecute a program:"
-msgstr "执行程序(&X)："
+#: tdefile/knotifydialog.cpp:82
+msgid "Logging"
+msgstr "记录日志"
 
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 247
-#: rc.cpp:177
-#, no-c-format
-msgid "Play a &sound:"
-msgstr "播放声音(&S)："
+#: tdefile/knotifydialog.cpp:83
+msgid "Program Execution"
+msgstr "程序执行"
 
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 258
-#: rc.cpp:180
-#, no-c-format
-msgid "Test the Sound"
-msgstr "测试声音"
+#: tdefile/knotifydialog.cpp:84
+msgid "Message Windows"
+msgstr "消息窗口"
 
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 268
-#: rc.cpp:183
-#, no-c-format
-msgid "Mark &taskbar entry"
-msgstr "制作任务栏项(&T)"
+#: tdefile/knotifydialog.cpp:85
+msgid "Passive Windows"
+msgstr "被动窗口"
 
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 276
-#: rc.cpp:186
-#, no-c-format
-msgid "&Log to a file:"
-msgstr "记录日志到文件(&L)："
+#: tdefile/knotifydialog.cpp:86
+msgid "Standard Error Output"
+msgstr "标准错误输出"
 
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 352
-#: rc.cpp:189
-#, no-c-format
-msgid "&Use a passive window that does not interrupt other work"
-msgstr "使用不打断其它工作的被动窗口(&U)"
+#: tdefile/knotifydialog.cpp:87
+msgid "Taskbar"
+msgstr "任务栏"
 
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 378
-#: rc.cpp:192
-#, no-c-format
-msgid "Less Options"
-msgstr "更少选项"
+#: tdefile/knotifydialog.cpp:121
+msgid "Execute a program"
+msgstr "执行程序"
 
-#. i18n: file ./tdefile/knotifywidgetbase.ui line 406
-#: rc.cpp:195
-#, no-c-format
-msgid "Player Settings"
-msgstr "播放器设置"
+#: tdefile/knotifydialog.cpp:122
+msgid "Print to Standard error output"
+msgstr "把消息打印到标准错误输出"
 
-#. i18n: file ./tdefile/kpropertiesmimetypebase.ui line 27
-#: rc.cpp:198
-#, no-c-format
-msgid "Select one or more file types to add:"
-msgstr "选择要添加的一个或多个文件类型："
+#: tdefile/knotifydialog.cpp:123
+msgid "Display a messagebox"
+msgstr "显示警告框"
 
-#. i18n: file ./tdefile/kpropertiesmimetypebase.ui line 36
-#: rc.cpp:201 rc.cpp:219
-#, no-c-format
-msgid "Mimetype"
-msgstr "MIME 类型"
+#: tdefile/knotifydialog.cpp:124
+msgid "Log to a file"
+msgstr "记录日志到文件"
 
-#. i18n: file ./tdefile/kpropertiesmimetypebase.ui line 47
-#: rc.cpp:204 rc.cpp:222
-#, no-c-format
-msgid "Description"
-msgstr "描述"
+#: tdefile/knotifydialog.cpp:125
+msgid "Play a sound"
+msgstr "播放声音"
 
-#. i18n: file ./tdefile/kpropertiesmimetypebase.ui line 61
-#: rc.cpp:207
-#, no-c-format
-msgid ""
-"<qt>"
-"<p>Select one or more types of file that your application can handle here. This "
-"list is organized by <u>mimetypes</u>.</p>\n"
-"<p>MIME, Multipurpose Internet (e)Mail Extension, is a standard protocol for "
-"identifying the type of data based on filename extensions and correspondent <u>"
-"mimetypes</u>. Example: the \"bmp\" part that comes after the dot in flower.bmp "
-"indicates that it is a specific kind of image, <u>image/x-bmp</u>"
-". To know which application should open each type of file, the system should be "
-"informed about the abilities of each application to handle these extensions and "
-"mimetypes.</p>"
-msgstr ""
-"<qt>"
-"<p>在此选择您的应用程序可处理的一种或多种文件类型。此列表是按照 <u>MIME 类型</u>组织的。</p>\n"
-"<p>MIME——多用途网际邮件扩展——是一种用来根据文件扩展名和相应的 <u>MIME 类型</u>来标识数据类型的标准协议。例如：flower.bmp "
-"中句点后面的“bmp”部分表明了这是一种图像 "
-"<u>image/x-bmp</u>。要哪个应用程序应该打开哪种类型的文件，您系统通知系统每个应用程序可处理哪些扩展名和 MIME 类型。</p>"
+#: tdefile/knotifydialog.cpp:126
+msgid "Flash the taskbar entry"
+msgstr "闪烁任务栏项"
 
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 44
-#: rc.cpp:211
-#, no-c-format
-msgid "&Supported file types:"
-msgstr "支持的 MIME 类型(&S)："
+#: tdefile/knotifydialog.cpp:163
+msgid "Notification Settings"
+msgstr "通知设置"
 
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 52
-#: rc.cpp:214 rc.cpp:225
-#, no-c-format
+#: tdefile/knotifydialog.cpp:309
 msgid ""
-"<qt>"
-"<p>This list should show the types of file that your application can handle. "
-"This list is organized by <u>mimetypes</u>.</p>\n"
-"<p>MIME, Multipurpose Internet (e)Mail Extension, is a standard protocol for "
-"identifying the type of data based on filename extensions and correspondent <u>"
-"mimetypes</u>. Example: the \"bmp\" part that comes after the dot in flower.bmp "
-"indicates that it is a specific kind of image, <u>image/x-bmp</u>"
-". To know which application should open each type of file, the system should be "
-"informed about the abilities of each application to handle these extensions and "
-"mimetypes.</p>\n"
-"<p>If you want to associate this application with one or more mimetypes that "
-"are not in this list, click on the button <b>Add</b> "
-"below. If there are one or more filetypes that this application cannot handle, "
-"you may want to remove them from the list clicking on the button <b>Remove</b> "
-"below.</p></qt>"
+"<qt>You may use the following macros"
+"<br>in the commandline:"
+"<br><b>%e</b>: for the event name,"
+"<br><b>%a</b>: for the name of the application that sent the event,"
+"<br><b>%s</b>: for the notification message,"
+"<br><b>%w</b>: for the numeric window ID where the event originated,"
+"<br><b>%i</b>: for the numeric event ID."
 msgstr ""
-"<qt>"
-"<p>在此选择您的应用程序可处理的一种或多种文件类型。此列表是按照 <u>MIME 类型</u>组织的。</p>\n"
-"<p>MIME——多用途网际邮件扩展——是一种用来根据文件扩展名和相应的 <u>MIME 类型</u>来标识数据类型的标准协议。例如：flower.bmp "
-"中句点后面的“bmp”部分表明了这是一种图像 "
-"<u>image/x-bmp</u>。要哪个应用程序应该打开哪种类型的文件，您系统通知系统每个应用程序可处理哪些扩展名和 MIME 类型。</p>\n"
-"<p>如果您想要将此应用程序与一种或多种未在列表中出现的 MIME 类型关联起来，请单击下面的<b>添加</b>"
-"按钮。如果此应用程序有一种或多种文件类型，您可以使用下面的<b>删除</b>按钮从列表中予以删除。</p></qt>"
-
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 103
-#: rc.cpp:230
-#, no-c-format
-msgid "&Name:"
-msgstr "名称(&N)："
-
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 109
-#: rc.cpp:233 rc.cpp:236
-#, no-c-format
-msgid ""
-"Type the name you want to give to this application here. This application will "
-"appear under this name in the applications menu and in the panel."
-msgstr "在此输入您想要为此应用程序起的名字。此应用程序将以此名称出现在应用程序菜单和面板中。"
-
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 131
-#: rc.cpp:242 rc.cpp:245
-#, no-c-format
-msgid ""
-"Type the description of this application, based on its use, here. Examples: a "
-"dial up application (KPPP) would be \"Dial up tool\"."
-msgstr "在此根据用途输入此应用程序的描述。例如：拨号应用程序(KPPP)可能是“拨号工具”。"
-
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 147
-#: rc.cpp:248
-#, no-c-format
-msgid "Comm&ent:"
-msgstr "注释(&E)："
-
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 153
-#: rc.cpp:251 rc.cpp:254
-#, no-c-format
-msgid "Type any comment you think is useful here."
-msgstr "在此输入您认为有用的注释。"
+"<qt>您可以在命令行中使用下列宏："
+"<br><b>%e</b>：事件名称，"
+"<br><b>%a</b>：发送事件的应用程序名称，"
+"<br><b>%s</b>：通知消息，"
+"<br><b>%w</b>：事件面向的窗口数字 ID，"
+"<br><b>%i</b>：事件的数字 ID。"
 
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 169
-#: rc.cpp:257
-#, no-c-format
-msgid "Co&mmand:"
-msgstr "命令(&M)："
+#: tdefile/knotifydialog.cpp:339
+msgid "Advanced <<"
+msgstr "高级 <<"
 
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 186
-#: rc.cpp:260 rc.cpp:274
-#, no-c-format
-msgid ""
-"Type the command to start this application here.\n"
-"\n"
-"Following the command, you can have several place holders which will be "
-"replaced with the actual values when the actual program is run:\n"
-"%f - a single file name\n"
-"%F - a list of files; use for applications that can open several local files at "
-"once\n"
-"%u - a single URL\n"
-"%U - a list of URLs\n"
-"%d - the directory of the file to open\n"
-"%D - a list of directories\n"
-"%i - the icon\n"
-"%m - the mini-icon\n"
-"%c - the caption"
-msgstr ""
-"在此输入启动此应用程序的命令。\n"
-"\n"
-"在命令之后，您可以使用某些占位符，在程序实际运行时这些占位符将被替换为实际值：\n"
-"%f - 单个文件名\n"
-"%F - 文件列表；用于可一次打开多个本地文件的应用程序\n"
-"%u - 单个 URL\n"
-"%U - URL 列表\n"
-"%d - 要打开文件的目录\n"
-"%D - 目录列表\n"
-"%i - 图标\n"
-"%m - 小图标\n"
-"%c - 标题"
+#: tdefile/knotifydialog.cpp:340
+msgid "Hide advanced options"
+msgstr "隐藏高级选项"
 
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 216
-#: rc.cpp:291
-#, no-c-format
-msgid ""
-"Click here to browse your file system in order to find the desired executable."
-msgstr "单击此处可在您的文件系统中浏览，以便找到想要的可执行文件。"
+#: tdefile/knotifydialog.cpp:356
+msgid "Advanced >>"
+msgstr "高级 >>"
 
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 224
-#: rc.cpp:294
-#, no-c-format
-msgid "&Work path:"
-msgstr "工作路径(&W)："
+#: tdefile/knotifydialog.cpp:357
+msgid "Show advanced options"
+msgstr "显示高级选项"
 
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 230
-#: rc.cpp:297 rc.cpp:300
-#, no-c-format
-msgid "Sets the working directory for your application."
-msgstr "设置您应用程序的工作目录。"
+#: tdefile/knotifydialog.cpp:782
+msgid "This will cause the notifications to be reset to their defaults."
+msgstr "这将导致通知被重设为默认值。"
 
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 246
-#: rc.cpp:303
-#, no-c-format
-msgid "Add..."
-msgstr "添加..."
+#: tdefile/knotifydialog.cpp:784
+msgid "Are You Sure?"
+msgstr "您确定吗？"
 
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 249
-#: rc.cpp:306
-#, no-c-format
-msgid ""
-"Click on this button if you want to add a type of file (mimetype) that your "
-"application can handle."
-msgstr "如果您想要为您的应用程序可处理的文件类型(MIME 类型)，请单击此按钮。"
+#: tdefile/knotifydialog.cpp:785
+msgid "&Reset"
+msgstr "重置(&R)"
 
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 277
-#: rc.cpp:312
-#, no-c-format
-msgid ""
-"If you want to remove a type of file (mimetype) that your application cannot "
-"handle, select the mimetype in the list above and click on this button."
-msgstr "如果您想要删除某种您应用程序无法处理的文件类型(MIME 类型)，请在上面的列表中选择该 MIME 类型，然后单击此按钮。"
+#: tdefile/knotifydialog.cpp:858
+msgid "Select Sound File"
+msgstr "选择声音文件"
 
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 302
-#: rc.cpp:315
-#, no-c-format
-msgid "Ad&vanced Options"
-msgstr "高级选项(&V)"
+#: tdefile/knotifydialog.cpp:894
+msgid "Select Log File"
+msgstr "选择日志文件"
 
-#. i18n: file ./tdefile/kpropertiesdesktopbase.ui line 305
-#: rc.cpp:318
-#, no-c-format
-msgid ""
-"Click here to modify the way this application will run, launch feedback, DCOP "
-"options or to run it as a different user."
-msgstr "单击此处修改应用程序运行的方式，执行反馈，DCOP 选项或者以不同的用户运行。"
+#: tdefile/knotifydialog.cpp:908
+msgid "Select File to Execute"
+msgstr "选择要执行的文件"
 
-#: ../tdeioslave/http/http.cc:5155 kpasswdserver/kpasswdserver.cpp:346
-msgid "  Do you want to retry?"
-msgstr "  您想重试吗？"
+#: tdefile/knotifydialog.cpp:942
+msgid "The specified file does not exist."
+msgstr "指定的文件不存在。"
 
-#: ../tdeioslave/http/http.cc:5156 kpasswdserver/kpasswdserver.cpp:348
-msgid "Authentication"
-msgstr "验证"
+#: tdefile/knotifydialog.cpp:1012
+msgid "No description available"
+msgstr "没有可用的描述"
 
-#: kpasswdserver/kpasswdserver.cpp:348
-msgid "Retry"
-msgstr "重试"
+#: tdefile/tdefilemetainfowidget.cpp:111
+msgid "<Error>"
+msgstr "<错误>"
 
 #: httpfilter/httpfilter.cc:278
 msgid "Unexpected end of data, some information may be lost."
@@ -5391,139 +5458,6 @@ msgstr "意外数据结束，某些信息可能丢失了。"
 msgid "Receiving corrupt data."
 msgstr "接收损坏的数据。"
 
-#: bookmarks/kbookmarkimporter_ns.cc:110 bookmarks/kbookmarkimporter_ns.cc:113
-msgid "*.html|HTML Files (*.html)"
-msgstr "*.html|HTML 文件(*.html)"
-
-#: bookmarks/kbookmarkimporter_ns.cc:197
-msgid "<!-- This file was generated by Konqueror -->"
-msgstr "<!-- 本文件由 Konqueror 生成 -->"
-
-#: bookmarks/kbookmarkimporter_opera.cc:110
-#: bookmarks/kbookmarkimporter_opera.cc:113
-msgid "*.adr|Opera Bookmark Files (*.adr)"
-msgstr "*.adr|Opera 书签文件(*.adr)"
-
-#: bookmarks/kbookmarkmenu.cc:506 bookmarks/kbookmarkmenu_p.h:146
-msgid "Add Bookmark"
-msgstr "添加书签"
-
-#: bookmarks/kbookmarkmenu.cc:259
-msgid "Add Bookmark Here"
-msgstr "在此添加书签"
-
-#: bookmarks/kbookmarkmenu.cc:276
-msgid "Open Folder in Bookmark Editor"
-msgstr "在书签编辑器中打开文件夹"
-
-#: bookmarks/kbookmarkmenu.cc:279
-msgid "Delete Folder"
-msgstr "删除文件夹"
-
-#: bookmarks/kbookmarkmenu.cc:287
-msgid "Copy Link Address"
-msgstr "复制链接地址"
-
-#: bookmarks/kbookmarkmenu.cc:290
-msgid "Delete Bookmark"
-msgstr "删除书签"
-
-#: bookmarks/kbookmarkmenu.cc:318
-msgid "Bookmark Properties"
-msgstr "书签属性"
-
-#: bookmarks/kbookmarkmanager.cc:506 bookmarks/kbookmarkmenu.cc:343
-msgid "Cannot add bookmark with empty URL."
-msgstr "无法添加空 URL 的书签。"
-
-#: bookmarks/kbookmarkmenu.cc:381
-msgid ""
-"Are you sure you wish to remove the bookmark folder\n"
-"\"%1\"?"
-msgstr ""
-"您确定想要删除书签文件夹\n"
-"“%1”吗？"
-
-#: bookmarks/kbookmarkmenu.cc:382
-msgid ""
-"Are you sure you wish to remove the bookmark\n"
-"\"%1\"?"
-msgstr ""
-"您确定想要删除书签\n"
-"“%1”吗？"
-
-#: bookmarks/kbookmarkmenu.cc:383
-msgid "Bookmark Folder Deletion"
-msgstr "书签文件夹删除"
-
-#: bookmarks/kbookmarkmenu.cc:384
-msgid "Bookmark Deletion"
-msgstr "书签删除"
-
-#: bookmarks/kbookmarkmenu.cc:486
-msgid "Bookmark Tabs as Folder..."
-msgstr "将标签添加为书签文件夹..."
-
-#: bookmarks/kbookmarkmenu.cc:495
-msgid "Add a folder of bookmarks for all open tabs."
-msgstr "为已打开的全部标签添加书签文件夹。"
-
-#: bookmarks/kbookmarkmenu.cc:515
-msgid "Add a bookmark for the current document"
-msgstr "为当前文档添加书签"
-
-#: bookmarks/kbookmarkmenu.cc:529
-msgid "Edit your bookmark collection in a separate window"
-msgstr "在另外的窗口中编辑您的书签集"
-
-#: bookmarks/kbookmarkmenu.cc:538
-msgid "&New Bookmark Folder..."
-msgstr "新建书签文件夹(&N)..."
-
-#: bookmarks/kbookmarkmenu.cc:550
-msgid "Create a new bookmark folder in this menu"
-msgstr "在该菜单中创建新书签文件夹"
-
-#: bookmarks/kbookmarkmenu.cc:684
-msgid "Quick Actions"
-msgstr "快速动作"
-
-#: bookmarks/kbookmarkmenu.cc:831
-msgid "&New Folder..."
-msgstr "新建文件夹(&N)..."
-
-#: bookmarks/kbookmarkmenu.cc:948
-msgid "Bookmark"
-msgstr "书签"
-
-#: bookmarks/kbookmarkmenu.cc:1115
-msgid "Netscape Bookmarks"
-msgstr "Netscape 书签"
-
-#: bookmarks/kbookmark.cc:117
-msgid "Create New Bookmark Folder"
-msgstr "新建书签文件夹"
-
-#: bookmarks/kbookmark.cc:118
-#, c-format
-msgid "Create New Bookmark Folder in %1"
-msgstr "在 %1 中新建书签文件夹"
-
-#: bookmarks/kbookmark.cc:120
-msgid "New folder:"
-msgstr "新建文件夹："
-
-#: bookmarks/kbookmark.cc:286
-msgid "--- separator ---"
-msgstr "--- 分隔符 ---"
-
-#: bookmarks/kbookmarkmanager.cc:365
-msgid ""
-"Unable to save bookmarks in %1. Reported error was: %2. This error message will "
-"only be shown once. The cause of the error needs to be fixed as quickly as "
-"possible, which is most likely a full hard drive."
-msgstr "无法在 %1 中保存书签。报告的错误是：%2。错误信息只会显示一次。产生错误的原因需要尽快修复，因为很可能是硬盘已满。"
-
 #: ../tdeioslave/ftp/ftp.cc:451
 #, c-format
 msgid "Opening connection to host %1"
@@ -5564,11 +5498,11 @@ msgstr ""
 "%2\n"
 "\n"
 
-#: ../tdeioslave/ftp/ftp.cc:596 ../tdeioslave/http/http.cc:5167
+#: ../tdeioslave/ftp/ftp.cc:596 ../tdeioslave/http/http.cc:5201
 msgid "You need to supply a username and a password to access this site."
 msgstr "您需要提供用户名和密码来访问这个站点。"
 
-#: ../tdeioslave/ftp/ftp.cc:598 ../tdeioslave/http/http.cc:5175
+#: ../tdeioslave/ftp/ftp.cc:598 ../tdeioslave/http/http.cc:5209
 msgid "Site:"
 msgstr "站点："
 
@@ -5585,7 +5519,7 @@ msgstr "登录成功"
 msgid "Could not login to %1."
 msgstr "无法登录到 %1。"
 
-#: ../tdeioslave/file/file.cc:564 ../tdeioslave/file/file.cc:798
+#: ../tdeioslave/file/file.cc:565 ../tdeioslave/file/file.cc:799
 #, c-format
 msgid ""
 "Could not change permissions for\n"
@@ -5594,68 +5528,40 @@ msgstr ""
 "无法改变 %1\n"
 "的权限"
 
-#: ../tdeioslave/file/file.cc:730
+#: ../tdeioslave/file/file.cc:731
 msgid "Cannot copy file from %1 to %2. (Errno: %3)"
 msgstr "无法将文件从 %1 复制到 %2。(错误号：%3)"
 
-#: ../tdeioslave/file/file.cc:1209
+#: ../tdeioslave/file/file.cc:1210
 #, c-format
 msgid "No media in device for %1"
 msgstr "%1 设备中没有介质"
 
-#: ../tdeioslave/file/file.cc:1375
+#: ../tdeioslave/file/file.cc:1385
 msgid "No Media inserted or Media not recognized."
 msgstr "未插入介质，或介质不可识别。"
 
-#: ../tdeioslave/file/file.cc:1385 ../tdeioslave/file/file.cc:1591
+#: ../tdeioslave/file/file.cc:1395 ../tdeioslave/file/file.cc:1601
 msgid "\"vold\" is not running."
 msgstr "“vold”未运行。"
 
-#: ../tdeioslave/file/file.cc:1419
+#: ../tdeioslave/file/file.cc:1429
 msgid "Could not find program \"mount\""
 msgstr "找不到程序“mount”"
 
-#: ../tdeioslave/file/file.cc:1604
+#: ../tdeioslave/file/file.cc:1614
 msgid "Could not find program \"umount\""
 msgstr "找不到程序“umount”"
 
-#: ../tdeioslave/file/file.cc:1709
+#: ../tdeioslave/file/file.cc:1794
 #, c-format
 msgid "Could not read %1"
 msgstr "无法读取 %1"
 
-#: ../tdeioslave/http/http_cache_cleaner.cpp:53
-#: ../tdeioslave/http/http_cache_cleaner.cpp:194
-msgid "TDE HTTP cache maintenance tool"
-msgstr "TDE HTTP 缓存维护工具"
-
-#: ../tdeioslave/http/http_cache_cleaner.cpp:59
-msgid "Empty the cache"
-msgstr "清空缓存"
-
-#: ../tdeioslave/http/kcookiejar/main.cpp:30
-msgid "HTTP Cookie Daemon"
-msgstr "HTTP Cookie 守护程序"
-
-#: ../tdeioslave/http/kcookiejar/main.cpp:36
-msgid "Shut down cookie jar"
-msgstr "关闭 cookie jar"
-
-#: ../tdeioslave/http/kcookiejar/main.cpp:37
-msgid "Remove cookies for domain"
-msgstr "删除域的全部 cookies"
-
-#: ../tdeioslave/http/kcookiejar/main.cpp:38
-msgid "Remove all cookies"
-msgstr "删除全部 cookies"
-
-#: ../tdeioslave/http/kcookiejar/main.cpp:39
-msgid "Reload configuration file"
-msgstr "重新载入配置文件"
-
-#: ../tdeioslave/http/kcookiejar/main.cpp:46
-msgid "HTTP cookie daemon"
-msgstr "HTTP cookie 守护程序"
+#: ../tdeioslave/metainfo/metainfo.cpp:99
+#, c-format
+msgid "No metainfo for %1"
+msgstr "没有 %1 的元信息"
 
 #: ../tdeioslave/http/kcookiejar/kcookiewin.cpp:80
 msgid "Cookie Alert"
@@ -5803,89 +5709,122 @@ msgstr "服务器"
 msgid "Servers, page scripts"
 msgstr "服务器，页面脚本"
 
-#: ../tdeioslave/http/http.cc:467
+#: ../tdeioslave/http/kcookiejar/main.cpp:30
+msgid "HTTP Cookie Daemon"
+msgstr "HTTP Cookie 守护程序"
+
+#: ../tdeioslave/http/kcookiejar/main.cpp:36
+msgid "Shut down cookie jar"
+msgstr "关闭 cookie jar"
+
+#: ../tdeioslave/http/kcookiejar/main.cpp:37
+msgid "Remove cookies for domain"
+msgstr "删除域的全部 cookies"
+
+#: ../tdeioslave/http/kcookiejar/main.cpp:38
+msgid "Remove all cookies"
+msgstr "删除全部 cookies"
+
+#: ../tdeioslave/http/kcookiejar/main.cpp:39
+msgid "Reload configuration file"
+msgstr "重新载入配置文件"
+
+#: ../tdeioslave/http/kcookiejar/main.cpp:46
+msgid "HTTP cookie daemon"
+msgstr "HTTP cookie 守护程序"
+
+#: ../tdeioslave/http/http_cache_cleaner.cpp:53
+#: ../tdeioslave/http/http_cache_cleaner.cpp:194
+msgid "TDE HTTP cache maintenance tool"
+msgstr "TDE HTTP 缓存维护工具"
+
+#: ../tdeioslave/http/http_cache_cleaner.cpp:59
+msgid "Empty the cache"
+msgstr "清空缓存"
+
+#: ../tdeioslave/http/http.cc:489
 msgid "No host specified."
 msgstr "没有指定主机。"
 
-#: ../tdeioslave/http/http.cc:1553
+#: ../tdeioslave/http/http.cc:1580
 msgid "Otherwise, the request would have succeeded."
 msgstr "否则，该请求已经成功。"
 
-#: ../tdeioslave/http/http.cc:1557
+#: ../tdeioslave/http/http.cc:1584
 msgid "retrieve property values"
 msgstr "获取属性值"
 
-#: ../tdeioslave/http/http.cc:1560
+#: ../tdeioslave/http/http.cc:1587
 msgid "set property values"
 msgstr "设置属性值"
 
-#: ../tdeioslave/http/http.cc:1563
+#: ../tdeioslave/http/http.cc:1590
 msgid "create the requested folder"
 msgstr "创建请求的文件夹"
 
-#: ../tdeioslave/http/http.cc:1566
+#: ../tdeioslave/http/http.cc:1593
 msgid "copy the specified file or folder"
 msgstr "复制指定的文件或文件夹"
 
-#: ../tdeioslave/http/http.cc:1569
+#: ../tdeioslave/http/http.cc:1596
 msgid "move the specified file or folder"
 msgstr "移动指定的文件或文件夹"
 
-#: ../tdeioslave/http/http.cc:1572
+#: ../tdeioslave/http/http.cc:1599
 msgid "search in the specified folder"
 msgstr "在指定的文件夹中搜索"
 
-#: ../tdeioslave/http/http.cc:1575
+#: ../tdeioslave/http/http.cc:1602
 msgid "lock the specified file or folder"
 msgstr "锁定指定的文件或文件夹"
 
-#: ../tdeioslave/http/http.cc:1578
+#: ../tdeioslave/http/http.cc:1605
 msgid "unlock the specified file or folder"
 msgstr "解锁指定的文件或文件夹"
 
-#: ../tdeioslave/http/http.cc:1581
+#: ../tdeioslave/http/http.cc:1608
 msgid "delete the specified file or folder"
 msgstr "删除指定的文件或文件夹"
 
-#: ../tdeioslave/http/http.cc:1584
+#: ../tdeioslave/http/http.cc:1611
 msgid "query the server's capabilities"
 msgstr "查询服务器的能力"
 
-#: ../tdeioslave/http/http.cc:1587
+#: ../tdeioslave/http/http.cc:1614
 msgid "retrieve the contents of the specified file or folder"
 msgstr "获取指定的文件或文件夹的内容"
 
-#: ../tdeioslave/http/http.cc:1599 ../tdeioslave/http/http.cc:1752
+#: ../tdeioslave/http/http.cc:1626 ../tdeioslave/http/http.cc:1779
 msgid "An unexpected error (%1) occurred while attempting to %2."
 msgstr "试图 %2 时发生未知的错误(%1)。"
 
-#: ../tdeioslave/http/http.cc:1607
+#: ../tdeioslave/http/http.cc:1634
 msgid "The server does not support the WebDAV protocol."
 msgstr "服务器不支持 WebDAV 协议。"
 
-#: ../tdeioslave/http/http.cc:1648
+#: ../tdeioslave/http/http.cc:1675
 msgid ""
 "An error occurred while attempting to %1, %2. A summary of the reasons is "
 "below."
 "<ul>"
 msgstr "试图 %1、%2 时发生错误。原因如下：<ul>"
 
-#: ../tdeioslave/http/http.cc:1660 ../tdeioslave/http/http.cc:1763
+#: ../tdeioslave/http/http.cc:1687 ../tdeioslave/http/http.cc:1790
 #, c-format
 msgid "Access was denied while attempting to %1."
 msgstr "试图 %1 时访问被拒绝。"
 
-#: ../tdeioslave/http/http.cc:1667
+#: ../tdeioslave/http/http.cc:1694
 msgid "The specified folder already exists."
 msgstr "指定的文件夹已经存在。"
 
-#: ../tdeioslave/http/http.cc:1673 ../tdeioslave/http/http.cc:1768
+#: ../tdeioslave/http/http.cc:1700 ../tdeioslave/http/http.cc:1795
 msgid ""
 "A resource cannot be created at the destination until one or more intermediate "
 "collections (folders) have been created."
 msgstr "在一个或多个中介集合(文件夹)被创建后才能够在目标处创建资源。"
 
-#: ../tdeioslave/http/http.cc:1682
+#: ../tdeioslave/http/http.cc:1709
 #, c-format
 msgid ""
 "The server was unable to maintain the liveness of the properties listed in the "
@@ -5893,113 +5832,181 @@ msgid ""
 "requesting that files are not overwritten. %1"
 msgstr "服务器无法保持列举在“属性行为”XML 元素中的属性的活跃性，或者您试图覆盖某文件，同时又请求那些文件不被覆盖。%1"
 
-#: ../tdeioslave/http/http.cc:1692
+#: ../tdeioslave/http/http.cc:1719
 #, c-format
 msgid "The requested lock could not be granted. %1"
 msgstr "请求的锁定无法被授予。%1"
 
-#: ../tdeioslave/http/http.cc:1698
+#: ../tdeioslave/http/http.cc:1725
 msgid "The server does not support the request type of the body."
 msgstr "服务器不支持内容中的请求类型。"
 
-#: ../tdeioslave/http/http.cc:1703 ../tdeioslave/http/http.cc:1775
+#: ../tdeioslave/http/http.cc:1730 ../tdeioslave/http/http.cc:1802
 msgid "Unable to %1 because the resource is locked."
 msgstr "无法 %1 因为资源被锁定了。"
 
-#: ../tdeioslave/http/http.cc:1707
+#: ../tdeioslave/http/http.cc:1734
 msgid "This action was prevented by another error."
 msgstr "该动作被另外一个错误阻止。"
 
-#: ../tdeioslave/http/http.cc:1714 ../tdeioslave/http/http.cc:1780
+#: ../tdeioslave/http/http.cc:1741 ../tdeioslave/http/http.cc:1807
 msgid ""
 "Unable to %1 because the destination server refuses to accept the file or "
 "folder."
 msgstr "无法 %1 因为目标服务器拒绝接收该文件或文件夹。"
 
-#: ../tdeioslave/http/http.cc:1721 ../tdeioslave/http/http.cc:1786
+#: ../tdeioslave/http/http.cc:1748 ../tdeioslave/http/http.cc:1813
 msgid ""
 "The destination resource does not have sufficient space to record the state of "
 "the resource after the execution of this method."
 msgstr "目标资源在该方法执行后没有足够的空间来记录资源的状态。"
 
-#: ../tdeioslave/http/http.cc:1743
+#: ../tdeioslave/http/http.cc:1770
 #, c-format
 msgid "upload %1"
 msgstr "上传 %1"
 
-#: ../tdeioslave/http/http.cc:2062
+#: ../tdeioslave/http/http.cc:2091
 msgid "Connecting to %1..."
 msgstr "正在连接 %1..."
 
-#: ../tdeioslave/http/http.cc:2080 ../tdeioslave/http/http.cc:2084
+#: ../tdeioslave/http/http.cc:2109 ../tdeioslave/http/http.cc:2113
 msgid "Proxy %1 at port %2"
 msgstr "代理 %1 在端口 %2"
 
-#: ../tdeioslave/http/http.cc:2110
+#: ../tdeioslave/http/http.cc:2139
 msgid "Connection was to %1 at port %2"
 msgstr "到主机 %1 端口 %2 的连接"
 
-#: ../tdeioslave/http/http.cc:2116
+#: ../tdeioslave/http/http.cc:2145
 msgid "%1 (port %2)"
 msgstr "%1 (端口 %2)"
 
-#: ../tdeioslave/http/http.cc:2640
+#: ../tdeioslave/http/http.cc:2674
 msgid "%1 contacted. Waiting for reply..."
 msgstr "已连接到 %1。正在等候响应..."
 
-#: ../tdeioslave/http/http.cc:3008
+#: ../tdeioslave/http/http.cc:3042
 msgid "Server processing request, please wait..."
 msgstr "服务器正在处理请求，请稍候..."
 
-#: ../tdeioslave/http/http.cc:3884
+#: ../tdeioslave/http/http.cc:3918
 msgid "Requesting data to send"
 msgstr "要发送的请求数据"
 
-#: ../tdeioslave/http/http.cc:3925
+#: ../tdeioslave/http/http.cc:3959
 #, c-format
 msgid "Sending data to %1"
 msgstr "把数据发送到 %1"
 
-#: ../tdeioslave/http/http.cc:4344
+#: ../tdeioslave/http/http.cc:4378
 msgid "Retrieving %1 from %2..."
 msgstr "正在从 %2 中获取 %1..."
 
-#: ../tdeioslave/http/http.cc:4353
+#: ../tdeioslave/http/http.cc:4387
 msgid "Retrieving from %1..."
 msgstr "正在从 %1 中获取..."
 
-#: ../tdeioslave/http/http.cc:5147 ../tdeioslave/http/http.cc:5295
+#: ../tdeioslave/http/http.cc:5181 ../tdeioslave/http/http.cc:5329
 msgid "Authentication Failed."
 msgstr "验证失败。"
 
-#: ../tdeioslave/http/http.cc:5150 ../tdeioslave/http/http.cc:5298
+#: ../tdeioslave/http/http.cc:5184 ../tdeioslave/http/http.cc:5332
 msgid "Proxy Authentication Failed."
 msgstr "代理验证失败。"
 
-#: ../tdeioslave/http/http.cc:5176 ../tdeioslave/http/http.cc:5193
+#: ../tdeioslave/http/http.cc:5210 ../tdeioslave/http/http.cc:5227
 msgid "<b>%1</b> at <b>%2</b>"
 msgstr "<b>%1</b> 在 <b>%2</b>"
 
-#: ../tdeioslave/http/http.cc:5183
+#: ../tdeioslave/http/http.cc:5217
 msgid ""
 "You need to supply a username and a password for the proxy server listed below "
 "before you are allowed to access any sites."
 msgstr "您需要为以下列出的代理服务器提供用户名和密码，才能够访问站点。"
 
-#: ../tdeioslave/http/http.cc:5192
+#: ../tdeioslave/http/http.cc:5226
 msgid "Proxy:"
 msgstr "代理："
 
-#: ../tdeioslave/http/http.cc:5214
+#: ../tdeioslave/http/http.cc:5248
 msgid "Authentication needed for %1 but authentication is disabled."
 msgstr "%1 需要身份验证，但身份验证被禁用。"
 
-#: ../tdeioslave/http/http.cc:5836
+#: ../tdeioslave/http/http.cc:5870
 msgid ""
 "Unsupported method: authentication will fail. Please submit a bug report."
 msgstr "不支持的方式：身份验证将会失败。请提交错误报告。"
 
-#: ../tdeioslave/metainfo/metainfo.cpp:99
-#, c-format
-msgid "No metainfo for %1"
-msgstr "没有 %1 的元信息"
+#: ../tdeioslave/iso/tdeiso_info.cpp:37
+msgid "TDE utility for getting ISO information"
+msgstr ""
+
+#: ../tdeioslave/iso/tdeiso_info.cpp:43
+msgid "Returns 0 if the file exists, -1 if it does not"
+msgstr ""
+
+#: ../tdeioslave/iso/tdeiso_info.cpp:44
+msgid ""
+"The device on which to execute the specified command.  Example: /dev/sr0"
+msgstr ""
+
+#: ../tdeioslave/iso/tdeiso_info.cpp:50
+msgid "Kerberos Realm Manager"
+msgstr ""
+
+#: ../tdeioslave/iso/tdeiso_info.cpp:93
+#, fuzzy
+msgid "No device was specified"
+msgstr "没有指定文件"
+
+#~ msgid "Shared"
+#~ msgstr "已共享"
+
+#~ msgid "Terminal"
+#~ msgstr "终端"
+
+#~ msgid "Check this option if the application you want to run is a text mode application or if you want the information that is provided by the terminal emulator window."
+#~ msgstr "如果您想要运行的应用程序是文本模式应用程序，或者您需要的信息由终端模拟窗口所提供，请选中此选项。"
+
+#~ msgid "Check this option if the text mode application offers relevant information on exit. Keeping the terminal emulator open allows you to retrieve this information."
+#~ msgstr "如果文本模式应用程序在退出时提供相关信息，请选中此选项。保持终端模拟器打开可允许您获取此信息。"
+
+#~ msgid "Check this option if you want to run this application with a different user id. Every process has a different user id associated with it. This id code determines file access and other permissions. The password of the user is required to use this option."
+#~ msgstr "如果您想要以不同的用户 ID 运行此应用程序，请选中此选项。每个进程都有与其关联的不同的用户 ID。此 ID 代码决定了文件访问和其它权限。需要提供该用户的密码才可以使用此选项。"
+
+#~ msgid "Enter the user name you want to run the application as."
+#~ msgstr "输入您想要以何用户名的身份运行此应用程序。"
+
+#~ msgid "Enter the user name you want to run the application as here."
+#~ msgstr "在此输入您想要以何用户名的身份运行此应用程序。"
+
+#~ msgid "Startup"
+#~ msgstr "启动"
+
+#~ msgid "Enable &launch feedback"
+#~ msgstr "启用执行反馈(&L)"
+
+#~ msgid "Check this option if you want to make clear that your application has started. This visual feedback may appear as a busy cursor or in the taskbar."
+#~ msgstr "如果您想要更清楚地了解您应用程序的启动过程，请选中此选项。此视觉反馈可能显示为忙光标，也可能在任务栏中有所体现。"
+
+#~ msgid "&Place in system tray"
+#~ msgstr "放在系统托盘中(&P)"
+
+#~ msgid "Check this option if you want to have a system tray handle for your application."
+#~ msgstr "如果您想要为您的应用程序提供系统托盘句柄，请选中此选项。"
+
+#~ msgid "&DCOP registration:"
+#~ msgstr "DCOP 注册(&D)："
+
+#~ msgid "None"
+#~ msgstr "无"
+
+#~ msgid "Multiple Instances"
+#~ msgstr "多实例"
+
+#~ msgid "Single Instance"
+#~ msgstr "单实例"
+
+#~ msgid "Run Until Finished"
+#~ msgstr "运行至完成"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdeio_help.po b/tde-i18n-zh_CN/messages/tdelibs/tdeio_help.po
index 2e69d7a2b8d..154b81b0bbd 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdeio_help.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdeio_help.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_help head\n"
-"POT-Creation-Date: 2006-05-03 03:51+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2004-05-03 18:20+0800\n"
 "Last-Translator: Dick Zhang <netwind2003@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,40 +26,6 @@ msgid ""
 "Your emails"
 msgstr "netwind2003@263.net"
 
-#: tdeio_help.cpp:115
-#, c-format
-msgid "There is no documentation available for %1."
-msgstr "%1 没有可用的文档。"
-
-#: tdeio_help.cpp:158
-msgid "Looking up correct file"
-msgstr "查找正确的文件"
-
-#: tdeio_help.cpp:209
-msgid "Preparing document"
-msgstr "修复文档"
-
-#: tdeio_help.cpp:218 tdeio_help.cpp:251
-#, c-format
-msgid "The requested help file could not be parsed:<br>%1"
-msgstr "不能处理请求的帮助文件：<br>%1"
-
-#: tdeio_help.cpp:240
-msgid "Saving to cache"
-msgstr "保存到缓存"
-
-#: tdeio_help.cpp:246
-msgid "Using cached version"
-msgstr "使用缓存版本"
-
-#: tdeio_help.cpp:308
-msgid "Looking up section"
-msgstr "查找章节"
-
-#: tdeio_help.cpp:319
-msgid "Could not find filename %1 in %2."
-msgstr "在 %2 中找不到文件名 %1。"
-
 #: meinproc.cpp:74
 msgid "Stylesheet to use"
 msgstr "使用的样式表"
@@ -103,11 +70,45 @@ msgstr "XML 翻译器"
 msgid "TDE Translator for XML"
 msgstr "TDE 的 XML 翻译器"
 
-#: meinproc.cpp:264
+#: meinproc.cpp:280
 #, c-format
 msgid "Could not write to cache file %1."
 msgstr "无法写入缓存文件 %1。"
 
+#: tdeio_help.cpp:122
+#, fuzzy, c-format
+msgid "Sorry, there is no documentation available at all for %1."
+msgstr "%1 没有可用的文档。"
+
+#: tdeio_help.cpp:166
+msgid "Looking up correct file"
+msgstr "查找正确的文件"
+
+#: tdeio_help.cpp:217
+msgid "Preparing document"
+msgstr "修复文档"
+
+#: tdeio_help.cpp:226 tdeio_help.cpp:259
+#, c-format
+msgid "The requested help file could not be parsed:<br>%1"
+msgstr "不能处理请求的帮助文件：<br>%1"
+
+#: tdeio_help.cpp:248
+msgid "Saving to cache"
+msgstr "保存到缓存"
+
+#: tdeio_help.cpp:254
+msgid "Using cached version"
+msgstr "使用缓存版本"
+
+#: tdeio_help.cpp:316
+msgid "Looking up section"
+msgstr "查找章节"
+
+#: tdeio_help.cpp:327
+msgid "Could not find filename %1 in %2."
+msgstr "在 %2 中找不到文件名 %1。"
+
 #: xslt.cpp:55
 msgid "Parsing stylesheet"
 msgstr "正在分析样式表"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdeioexec.po b/tde-i18n-zh_CN/messages/tdelibs/tdeioexec.po
index d01f76d28c3..27e9c195cda 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdeioexec.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdeioexec.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kfmexec\n"
-"POT-Creation-Date: 2007-04-13 02:13+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2003-12-27 23:10+0800\n"
 "Last-Translator: Dick Zhang <netwind2000@etang.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdelibs.po b/tde-i18n-zh_CN/messages/tdelibs/tdelibs.po
index 2d1d8ecabfe..8ae88b51457 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdelibs.po
@@ -9,10 +9,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdelibs\n"
-"POT-Creation-Date: 2008-07-08 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2006-04-30 16:49+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -34,148 +35,126 @@ msgid ""
 msgstr ""
 "请选择您想要在此程序中使用的默认文本编辑组件。如果您选择<B>系统默认</B>，应用程序将会遵从您在控制中心的更改。所有其它的选项都会超越该选项。"
 
-#. i18n: file ./tdecert/tdecertpart.rc line 4
+#. i18n: file ./tdehtml/tdehtml_popupmenu.rc line 11
 #: rc.cpp:9
 #, no-c-format
-msgid "&Certificate"
-msgstr "证书(&C)"
+msgid "Frame"
+msgstr "框架"
 
-#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 58
-#: rc.cpp:12
+#. i18n: file ./tdehtml/tdehtml.rc line 4
+#: common_texts.cpp:81 rc.cpp:12 rc.cpp:30 rc.cpp:229
 #, no-c-format
-msgid "Alternate shortcut:"
-msgstr "备选快捷键："
+msgid "&Edit"
+msgstr "编辑(&E)"
 
-#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 69
+#. i18n: file ./tdehtml/kjserrordlg.ui line 17
 #: rc.cpp:15
 #, no-c-format
-msgid "Primary shortcut:"
-msgstr "主要快捷键："
+msgid "JavaScript Errors"
+msgstr "JavaScript 错误"
 
-#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 155
+#. i18n: file ./tdehtml/kjserrordlg.ui line 20
 #: rc.cpp:18
-#, no-c-format
+#, fuzzy, no-c-format
 msgid ""
-"The currently set shortcut or the shortcut you are entering will show up here."
-msgstr "当前设置的或者您正在输入的快捷键将在这里显示。"
-
-#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 182
-#: rc.cpp:21 rc.cpp:27 rc.cpp:84
-#, no-c-format
-msgid "x"
-msgstr "x"
-
-#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 188
-#: rc.cpp:24 rc.cpp:30 rc.cpp:87
-#, no-c-format
-msgid "Clear shortcut"
-msgstr "清除快捷键"
-
-#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 213
-#: rc.cpp:33
-#, no-c-format
-msgid "Multi-key mode"
-msgstr "多键模式"
-
-#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 216
-#: rc.cpp:36
-#, no-c-format
-msgid "Enable the entry of multi-key shortcuts"
-msgstr "启用多按键的快捷键输入"
+"This dialog provides you with notification and details of scripting errors that "
+"occur on web pages. In many cases it is due to an error in the web site as "
+"designed by its author. In other cases it is the result of a programming error "
+"in Konqueror. If you suspect the former, please contact the webmaster of the "
+"site in question. Conversely if you suspect an error in Konqueror, please file "
+"a bug report at http://bugs.trinitydesktop.org/. A test case which illustrates "
+"the problem will be appreciated."
+msgstr ""
+"这个对话框向您提供网页中出现的脚本错误通知和详细信息。很多情况下它是由于网页设计者的网站设计错误产生的。有其它情况是由于 Konqueror "
+"中的程序设计错误。如果您怀疑是前一种错误，请和相关网站的网页设计者联系。反之，如果您怀疑是 Konqueror 的错误，请在 "
+"http://bugs.kde.org/ 提交错误报告。如果您能提供表现出这个问题的测试实例我们将非常感激。"
 
-#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 219
-#: rc.cpp:39
+#. i18n: file ./tdehtml/kjserrordlg.ui line 39
+#: tdeui/kstdaction_p.h:58 tdeui/kstdguiitem.cpp:161 rc.cpp:24
 #, no-c-format
-msgid ""
-"Select this checkbox to enable the entry of multi-key shortcuts.  A multi-key "
-"shortcut consists of a sequence of up to 4 keys.  For example, you could assign "
-"\"Ctrl+F,B\" to Font-Bold and \"Ctrl+F,U\" to Font-Underline."
-msgstr ""
-"选中此复选框可以启用多按键的快捷键输入。多按键的快捷键由最多 4 "
-"个键的序列组成，例如，您可以将“Ctrl+F,B”指定为字体-斜体，将“Ctrl+F,U”指定为字体-下划线。"
+msgid "C&lear"
+msgstr "清除(&L)"
 
-#. i18n: file ./tdeui/ui_standards.rc line 4
-#: common_texts.cpp:77 rc.cpp:42 rc.cpp:262
+#. i18n: file ./tdehtml/tdehtml_browser.rc line 4
+#: common_texts.cpp:77 rc.cpp:27 rc.cpp:223
 #, no-c-format
 msgid "&File"
 msgstr "文件(&F)"
 
-#. i18n: file ./tdeui/ui_standards.rc line 33
-#: common_texts.cpp:131 rc.cpp:45
+#. i18n: file ./tdehtml/tdehtml_browser.rc line 20
+#: common_texts.cpp:84 rc.cpp:33 rc.cpp:235
 #, no-c-format
-msgid "&Game"
-msgstr "游戏(&G)"
+msgid "&View"
+msgstr "查看(&V)"
 
-#. i18n: file ./tdeui/ui_standards.rc line 57
-#: common_texts.cpp:81 rc.cpp:48 rc.cpp:229 rc.cpp:265
+#. i18n: file ./tdehtml/tdehtml_browser.rc line 37
+#: common_texts.cpp:254 rc.cpp:36 rc.cpp:256
 #, no-c-format
-msgid "&Edit"
-msgstr "编辑(&E)"
+msgid "Main Toolbar"
+msgstr "主工具栏"
 
-#. i18n: file ./tdeui/ui_standards.rc line 80
-#: rc.cpp:51
+#. i18n: file ./tdehtml/htmlpageinfo.ui line 26
+#: rc.cpp:39
 #, no-c-format
-msgid ""
-"_: Menu title\n"
-"&Move"
-msgstr "移动(&M)"
+msgid "Document Information"
+msgstr "文档信息"
 
-#. i18n: file ./tdeui/ui_standards.rc line 97
-#: common_texts.cpp:84 rc.cpp:54 rc.cpp:268
+#. i18n: file ./tdehtml/htmlpageinfo.ui line 37
+#: rc.cpp:42
 #, no-c-format
-msgid "&View"
-msgstr "查看(&V)"
+msgid "General"
+msgstr "常规"
 
-#. i18n: file ./tdeui/ui_standards.rc line 112
-#: rc.cpp:57 rc.cpp:60
+#. i18n: file ./tdehtml/htmlpageinfo.ui line 64
+#: rc.cpp:45
 #, no-c-format
-msgid "&Go"
-msgstr "出发(&G)"
+msgid "URL:"
+msgstr "URL："
 
-#. i18n: file ./tdeui/ui_standards.rc line 133
-#: common_texts.cpp:182 rc.cpp:63
+#. i18n: file ./tdehtml/htmlpageinfo.ui line 122
+#: rc.cpp:48
 #, no-c-format
-msgid "&Bookmarks"
-msgstr "书签(&B)"
+msgid "Title:"
+msgstr "标题："
 
-#. i18n: file ./tdeui/ui_standards.rc line 139
-#: common_texts.cpp:185 rc.cpp:66
+#. i18n: file ./tdehtml/htmlpageinfo.ui line 141
+#: rc.cpp:51
 #, no-c-format
-msgid "&Tools"
-msgstr "工具(&T)"
+msgid "Last modified:"
+msgstr "上次修改时间："
 
-#. i18n: file ./tdeui/ui_standards.rc line 143
-#: common_texts.cpp:192 rc.cpp:69
+#. i18n: file ./tdehtml/htmlpageinfo.ui line 160
+#: rc.cpp:54
 #, no-c-format
-msgid "&Settings"
-msgstr "设置(&S)"
+msgid "Document encoding:"
+msgstr "文档编码："
 
-#. i18n: file ./tdeui/ui_standards.rc line 186
-#: common_texts.cpp:254 rc.cpp:75 rc.cpp:271
+#. i18n: file ./tdehtml/htmlpageinfo.ui line 188
+#: rc.cpp:57
 #, no-c-format
-msgid "Main Toolbar"
-msgstr "主工具栏"
+msgid "HTTP Headers"
+msgstr "HTTP 头"
 
-#. i18n: file ./tdeui/tdeshortcutdialog_simple.ui line 27
-#: rc.cpp:78
+#. i18n: file ./tdehtml/htmlpageinfo.ui line 197
+#: rc.cpp:60
 #, no-c-format
-msgid "Shortcut:"
-msgstr "快捷键："
+msgid "Property"
+msgstr "属性"
 
-#. i18n: file ./tdeui/tdeshortcutdialog_simple.ui line 65
-#: rc.cpp:81
+#. i18n: file ./tdehtml/htmlpageinfo.ui line 208
+#: tdehtml/java/kjavaappletviewer.cpp:132 rc.cpp:63
 #, no-c-format
-msgid "Alt+Tab"
-msgstr "Alt+Tab"
+msgid "Value"
+msgstr "值"
 
 #. i18n: file ./tdeui/tdespellui.ui line 38
-#: rc.cpp:90 rc.cpp:307
+#: rc.cpp:69 rc.cpp:307
 #, no-c-format
 msgid "Unknown word:"
 msgstr "未知单词："
 
 #. i18n: file ./tdeui/tdespellui.ui line 44
-#: rc.cpp:93 rc.cpp:105 rc.cpp:310 rc.cpp:322
+#: rc.cpp:72 rc.cpp:84 rc.cpp:310 rc.cpp:322
 #, no-c-format
 msgid ""
 "<qt>"
@@ -201,25 +180,25 @@ msgstr ""
 "</qt>"
 
 #. i18n: file ./tdeui/tdespellui.ui line 52
-#: rc.cpp:99 rc.cpp:316
+#: rc.cpp:78 rc.cpp:316
 #, no-c-format
 msgid "<b>misspelled</b>"
 msgstr "<b>拼错</b>"
 
 #. i18n: file ./tdeui/tdespellui.ui line 55
-#: rc.cpp:102 rc.cpp:319
+#: rc.cpp:81 rc.cpp:319
 #, no-c-format
 msgid "Unknown word"
 msgstr "未知单词"
 
 #. i18n: file ./tdeui/tdespellui.ui line 69
-#: rc.cpp:111 rc.cpp:328
+#: rc.cpp:90 rc.cpp:328
 #, no-c-format
 msgid "&Language:"
 msgstr "语言(&L)："
 
 #. i18n: file ./tdeui/tdespellui.ui line 77
-#: rc.cpp:114 rc.cpp:209 rc.cpp:331 rc.cpp:389
+#: rc.cpp:93 rc.cpp:188 rc.cpp:331 rc.cpp:389
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -231,19 +210,19 @@ msgstr ""
 "</qt>"
 
 #. i18n: file ./tdeui/tdespellui.ui line 88
-#: rc.cpp:119 rc.cpp:336
+#: rc.cpp:98 rc.cpp:336
 #, no-c-format
 msgid "... the <b>misspelled</b> word shown in context ..."
 msgstr "... 上下文中出现的<b>拼错</b>的单词 ..."
 
 #. i18n: file ./tdeui/tdespellui.ui line 94
-#: rc.cpp:122 rc.cpp:339
+#: rc.cpp:101 rc.cpp:339
 #, no-c-format
 msgid "Text excerpt showing the unknown word in its context."
 msgstr "含有该未知单词的上下文摘录文本。"
 
 #. i18n: file ./tdeui/tdespellui.ui line 99
-#: rc.cpp:125 rc.cpp:342
+#: rc.cpp:104 rc.cpp:342
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -259,13 +238,13 @@ msgstr ""
 "</qt>"
 
 #. i18n: file ./tdeui/tdespellui.ui line 107
-#: rc.cpp:130 rc.cpp:347
+#: rc.cpp:109 rc.cpp:347
 #, no-c-format
 msgid "<< Add to Dictionary"
 msgstr "<< 添加到字典"
 
 #. i18n: file ./tdeui/tdespellui.ui line 113
-#: rc.cpp:133 rc.cpp:350
+#: rc.cpp:112 rc.cpp:350
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -286,13 +265,13 @@ msgstr ""
 "</qt>"
 
 #. i18n: file ./tdeui/tdespellui.ui line 138
-#: rc.cpp:139 rc.cpp:405
+#: rc.cpp:118 rc.cpp:405
 #, no-c-format
 msgid "R&eplace All"
 msgstr "全部替换(&E)"
 
 #. i18n: file ./tdeui/tdespellui.ui line 143
-#: rc.cpp:142 rc.cpp:408
+#: rc.cpp:121 rc.cpp:408
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -305,19 +284,19 @@ msgstr ""
 "</qt>"
 
 #. i18n: file ./tdeui/tdespellui.ui line 149
-#: rc.cpp:147 rc.cpp:356
+#: rc.cpp:126 rc.cpp:356
 #, no-c-format
 msgid "Suggested Words"
 msgstr "建议单词"
 
 #. i18n: file ./tdeui/tdespellui.ui line 165
-#: rc.cpp:150 rc.cpp:359
+#: rc.cpp:129 rc.cpp:359
 #, no-c-format
 msgid "Suggestion List"
 msgstr "建议列表"
 
 #. i18n: file ./tdeui/tdespellui.ui line 171
-#: rc.cpp:153 rc.cpp:362
+#: rc.cpp:132 rc.cpp:362
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -335,13 +314,13 @@ msgstr ""
 "</qt>"
 
 #. i18n: file ./tdeui/tdespellui.ui line 179
-#: tdeui/keditcl2.cpp:833 tdeutils/kfinddialog.cpp:231 rc.cpp:159 rc.cpp:397
+#: tdeui/keditcl2.cpp:833 tdeutils/kfinddialog.cpp:232 rc.cpp:138 rc.cpp:397
 #, no-c-format
 msgid "&Replace"
 msgstr "替换(&R)"
 
 #. i18n: file ./tdeui/tdespellui.ui line 184
-#: rc.cpp:162 rc.cpp:400
+#: rc.cpp:141 rc.cpp:400
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -354,13 +333,13 @@ msgstr ""
 "</qt>"
 
 #. i18n: file ./tdeui/tdespellui.ui line 192
-#: rc.cpp:167 rc.cpp:368
+#: rc.cpp:146 rc.cpp:368
 #, no-c-format
 msgid "Replace &with:"
 msgstr "替换为(&W)："
 
 #. i18n: file ./tdeui/tdespellui.ui line 201
-#: rc.cpp:170 rc.cpp:194 rc.cpp:371 rc.cpp:377
+#: rc.cpp:149 rc.cpp:173 rc.cpp:371 rc.cpp:377
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -377,13 +356,13 @@ msgstr ""
 "</qt>"
 
 #. i18n: file ./tdeui/tdespellui.ui line 209
-#: rc.cpp:176 rc.cpp:413
+#: tdersync/tdersync.cpp:687 rc.cpp:155 rc.cpp:413
 #, no-c-format
 msgid "&Ignore"
 msgstr "忽略(&I)"
 
 #. i18n: file ./tdeui/tdespellui.ui line 215
-#: rc.cpp:179 rc.cpp:416
+#: rc.cpp:158 rc.cpp:416
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -398,13 +377,13 @@ msgstr ""
 "</qt>"
 
 #. i18n: file ./tdeui/tdespellui.ui line 223
-#: rc.cpp:185 rc.cpp:422
+#: rc.cpp:164 rc.cpp:422
 #, no-c-format
 msgid "I&gnore All"
 msgstr "全部忽略(&G)"
 
 #. i18n: file ./tdeui/tdespellui.ui line 229
-#: rc.cpp:188 rc.cpp:425 rc.cpp:434
+#: rc.cpp:167 rc.cpp:425 rc.cpp:434
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -420,110 +399,132 @@ msgstr ""
 "</qt>"
 
 #. i18n: file ./tdeui/tdespellui.ui line 248
-#: rc.cpp:200 rc.cpp:394
+#: rc.cpp:179 rc.cpp:394
 #, no-c-format
 msgid "S&uggest"
 msgstr "建议(&U)"
 
 #. i18n: file ./tdeui/tdespellui.ui line 254
-#: tdeui/ksconfig.cpp:294 rc.cpp:203 rc.cpp:383
+#: tdeui/ksconfig.cpp:294 rc.cpp:182 rc.cpp:383
 #, no-c-format
 msgid "English"
 msgstr "英语"
 
 #. i18n: file ./tdeui/tdespellui.ui line 261
-#: rc.cpp:206 rc.cpp:386
+#: rc.cpp:185 rc.cpp:386
 #, no-c-format
 msgid "Language Selection"
 msgstr "语言选择"
 
-#. i18n: file ./tdehtml/tdehtml_popupmenu.rc line 11
+#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 58
+#: rc.cpp:193
+#, no-c-format
+msgid "Alternate shortcut:"
+msgstr "备选快捷键："
+
+#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 69
+#: rc.cpp:196
+#, no-c-format
+msgid "Primary shortcut:"
+msgstr "主要快捷键："
+
+#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 155
+#: rc.cpp:199
+#, no-c-format
+msgid ""
+"The currently set shortcut or the shortcut you are entering will show up here."
+msgstr "当前设置的或者您正在输入的快捷键将在这里显示。"
+
+#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 182
+#: rc.cpp:202 rc.cpp:208 rc.cpp:265
+#, no-c-format
+msgid "x"
+msgstr "x"
+
+#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 188
+#: rc.cpp:205 rc.cpp:211 rc.cpp:268
+#, no-c-format
+msgid "Clear shortcut"
+msgstr "清除快捷键"
+
+#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 213
 #: rc.cpp:214
 #, no-c-format
-msgid "Frame"
-msgstr "框架"
+msgid "Multi-key mode"
+msgstr "多键模式"
 
-#. i18n: file ./tdehtml/kjserrordlg.ui line 17
+#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 216
 #: rc.cpp:217
 #, no-c-format
-msgid "JavaScript Errors"
-msgstr "JavaScript 错误"
+msgid "Enable the entry of multi-key shortcuts"
+msgstr "启用多按键的快捷键输入"
 
-#. i18n: file ./tdehtml/kjserrordlg.ui line 20
+#. i18n: file ./tdeui/tdeshortcutdialog_advanced.ui line 219
 #: rc.cpp:220
 #, no-c-format
 msgid ""
-"This dialog provides you with notification and details of scripting errors that "
-"occur on web pages.  In many cases it is due to an error in the web site as "
-"designed by its author.  In other cases it is the result of a programming error "
-"in Konqueror.  If you suspect the former, please contact the webmaster of the "
-"site in question.  Conversely if you suspect an error in Konqueror, please file "
-"a bug report at http://bugs.kde.org/.  A test case which illustrates the "
-"problem will be appreciated."
+"Select this checkbox to enable the entry of multi-key shortcuts.  A multi-key "
+"shortcut consists of a sequence of up to 4 keys.  For example, you could assign "
+"\"Ctrl+F,B\" to Font-Bold and \"Ctrl+F,U\" to Font-Underline."
 msgstr ""
-"这个对话框向您提供网页中出现的脚本错误通知和详细信息。很多情况下它是由于网页设计者的网站设计错误产生的。有其它情况是由于 Konqueror "
-"中的程序设计错误。如果您怀疑是前一种错误，请和相关网站的网页设计者联系。反之，如果您怀疑是 Konqueror 的错误，请在 "
-"http://bugs.kde.org/ 提交错误报告。如果您能提供表现出这个问题的测试实例我们将非常感激。"
+"选中此复选框可以启用多按键的快捷键输入。多按键的快捷键由最多 4 "
+"个键的序列组成，例如，您可以将“Ctrl+F,B”指定为字体-斜体，将“Ctrl+F,U”指定为字体-下划线。"
 
-#. i18n: file ./tdehtml/kjserrordlg.ui line 39
-#: tdeui/kstdaction_p.h:58 tdeui/kstdguiitem.cpp:161 rc.cpp:226
+#. i18n: file ./tdeui/ui_standards.rc line 33
+#: common_texts.cpp:131 rc.cpp:226
 #, no-c-format
-msgid "C&lear"
-msgstr "清除(&L)"
+msgid "&Game"
+msgstr "游戏(&G)"
 
-#. i18n: file ./tdehtml/htmlpageinfo.ui line 26
+#. i18n: file ./tdeui/ui_standards.rc line 80
 #: rc.cpp:232
 #, no-c-format
-msgid "Document Information"
-msgstr "文档信息"
-
-#. i18n: file ./tdehtml/htmlpageinfo.ui line 37
-#: rc.cpp:235
-#, no-c-format
-msgid "General"
-msgstr "常规"
+msgid ""
+"_: Menu title\n"
+"&Move"
+msgstr "移动(&M)"
 
-#. i18n: file ./tdehtml/htmlpageinfo.ui line 64
-#: rc.cpp:238
+#. i18n: file ./tdeui/ui_standards.rc line 112
+#: rc.cpp:238 rc.cpp:241
 #, no-c-format
-msgid "URL:"
-msgstr "URL："
+msgid "&Go"
+msgstr "出发(&G)"
 
-#. i18n: file ./tdehtml/htmlpageinfo.ui line 122
-#: rc.cpp:241
+#. i18n: file ./tdeui/ui_standards.rc line 133
+#: common_texts.cpp:182 rc.cpp:244
 #, no-c-format
-msgid "Title:"
-msgstr "标题："
+msgid "&Bookmarks"
+msgstr "书签(&B)"
 
-#. i18n: file ./tdehtml/htmlpageinfo.ui line 141
-#: rc.cpp:244
+#. i18n: file ./tdeui/ui_standards.rc line 139
+#: common_texts.cpp:185 rc.cpp:247
 #, no-c-format
-msgid "Last modified:"
-msgstr "上次修改时间："
+msgid "&Tools"
+msgstr "工具(&T)"
 
-#. i18n: file ./tdehtml/htmlpageinfo.ui line 160
-#: rc.cpp:247
+#. i18n: file ./tdeui/ui_standards.rc line 143
+#: common_texts.cpp:192 rc.cpp:250
 #, no-c-format
-msgid "Document encoding:"
-msgstr "文档编码："
+msgid "&Settings"
+msgstr "设置(&S)"
 
-#. i18n: file ./tdehtml/htmlpageinfo.ui line 188
-#: rc.cpp:250
+#. i18n: file ./tdeui/tdeshortcutdialog_simple.ui line 27
+#: rc.cpp:259
 #, no-c-format
-msgid "HTTP Headers"
-msgstr "HTTP 头"
+msgid "Shortcut:"
+msgstr "快捷键："
 
-#. i18n: file ./tdehtml/htmlpageinfo.ui line 197
-#: rc.cpp:253
+#. i18n: file ./tdeui/tdeshortcutdialog_simple.ui line 65
+#: rc.cpp:262
 #, no-c-format
-msgid "Property"
-msgstr "属性"
+msgid "Alt+Tab"
+msgstr "Alt+Tab"
 
-#. i18n: file ./tdehtml/htmlpageinfo.ui line 208
-#: tdehtml/java/kjavaappletviewer.cpp:132 rc.cpp:256
+#. i18n: file ./tdecert/tdecertpart.rc line 4
+#: rc.cpp:271
 #, no-c-format
-msgid "Value"
-msgstr "值"
+msgid "&Certificate"
+msgstr "证书(&C)"
 
 #. i18n: file ./tdespell2/ui/configui.ui line 26
 #: rc.cpp:274
@@ -535,7 +536,7 @@ msgstr "这是拼写检查器将使用的默认语言。下拉框将列出您已
 
 #. i18n: file ./tdespell2/ui/configui.ui line 34
 #: common_texts.cpp:118 tdeui/keditcl2.cpp:723 tdeui/keditcl2.cpp:862
-#: tdeutils/kfinddialog.cpp:161 rc.cpp:277
+#: tdeutils/kfinddialog.cpp:162 rc.cpp:277
 #, no-c-format
 msgid "Options"
 msgstr "选项"
@@ -642,8 +643,8 @@ msgstr "递归搜索域名"
 
 #. i18n: file ./dnssd/kcm_tdednssd.kcfg line 19
 #: rc.cpp:455
-#, no-c-format
-msgid "Removed in TDE 3.5.0"
+#, fuzzy, no-c-format
+msgid "Removed in KDE 3.5.0"
 msgstr "在 TDE 3.5.0 中已删除"
 
 #. i18n: file ./dnssd/kcm_tdednssd.kcfg line 25
@@ -690,8 +691,9 @@ msgid ""
 "Your emails"
 msgstr "i18n-translation@lists.linux.net.cn"
 
-#: common_texts.cpp:24 tdeui/tdeconfigdialog.cpp:56 tdeutils/kcmultidialog.cpp:59
-#: tdeutils/kcmultidialog.h:104 tdeutils/ksettings/dialog.cpp:571
+#: common_texts.cpp:24 tdeui/tdeconfigdialog.cpp:56
+#: tdeutils/kcmultidialog.cpp:59 tdeutils/kcmultidialog.h:104
+#: tdeutils/ksettings/dialog.cpp:571
 msgid "Configure"
 msgstr "配置"
 
@@ -723,7 +725,7 @@ msgstr "页面"
 msgid "Border"
 msgstr "边框"
 
-#: common_texts.cpp:32 tdeui/tdetoolbar.cpp:2116
+#: common_texts.cpp:32 tdeui/tdetoolbar.cpp:2122
 msgid "Orientation"
 msgstr "方向"
 
@@ -807,8 +809,8 @@ msgstr "缩放"
 msgid "&Zoom"
 msgstr "缩放(&Z)"
 
-#: arts/message/artsmessage.cc:89 common_texts.cpp:54 tdeabc/lock.cpp:132
-#: tdeui/tdemessagebox.cpp:760 tdeui/tdemessagebox.cpp:790 kjs/object.cpp:493
+#: arts/message/artsmessage.cc:89 common_texts.cpp:54 kjs/object.cpp:493
+#: tdeabc/lock.cpp:132 tdeui/tdemessagebox.cpp:760 tdeui/tdemessagebox.cpp:790
 #: tdeutils/kpluginselector.cpp:248
 msgid "Error"
 msgstr "错误"
@@ -852,10 +854,10 @@ msgstr "关于(&B)"
 msgid "Untitled"
 msgstr "无标题"
 
-#: common_texts.cpp:67 tdecore/tdeapplication.cpp:1417
-#: tdecore/tdeapplication.cpp:2245 tdecore/tdeapplication.cpp:2280
-#: tdecore/tdeapplication.cpp:2551 tdecore/tdeapplication.cpp:2573
-#: tdecore/kdebug.cpp:295 tdeui/kdialogbase.cpp:908 tdeui/kstdguiitem.cpp:99
+#: common_texts.cpp:67 tdecore/kdebug.cpp:339 tdecore/tdeapplication.cpp:1627
+#: tdecore/tdeapplication.cpp:2728 tdecore/tdeapplication.cpp:2763
+#: tdecore/tdeapplication.cpp:3034 tdecore/tdeapplication.cpp:3059
+#: tdeui/kdialogbase.cpp:908 tdeui/kstdguiitem.cpp:99
 msgid "&OK"
 msgstr "确定(&O)"
 
@@ -907,7 +909,7 @@ msgstr "退出"
 msgid "&Quit"
 msgstr "退出(&Q)"
 
-#: common_texts.cpp:88 tdecore/tdestdaccel.cpp:88 kded/tdebuildsycoca.cpp:753
+#: common_texts.cpp:88 kded/tdebuildsycoca.cpp:753 tdecore/tdestdaccel.cpp:88
 msgid "Reload"
 msgstr "刷新"
 
@@ -935,7 +937,8 @@ msgstr "新游戏"
 msgid "&New Game"
 msgstr "新游戏(&N)"
 
-#: common_texts.cpp:99 tdecore/kkeyserver_x11.cpp:133 tdecore/tdestdaccel.cpp:53
+#: common_texts.cpp:99 tdecore/kkeyserver_x11.cpp:134
+#: tdecore/tdestdaccel.cpp:53
 msgid "Open"
 msgstr "打开"
 
@@ -979,8 +982,9 @@ msgstr "保存"
 msgid "&Save"
 msgstr "保存(&S)"
 
-#: common_texts.cpp:111 tdehtml/tdehtml_part.cpp:3937 tdehtml/tdehtml_part.cpp:4141
-#: tdehtml/tdehtml_part.cpp:4462 tdehtml/tdehtml_run.cpp:83 tdeparts/browserrun.cpp:419
+#: common_texts.cpp:111 tdehtml/tdehtml_part.cpp:3941
+#: tdehtml/tdehtml_part.cpp:4145 tdehtml/tdehtml_part.cpp:4466
+#: tdehtml/tdehtml_run.cpp:83 tdeparts/browserrun.cpp:419
 msgid "Save As"
 msgstr "另存为"
 
@@ -996,7 +1000,8 @@ msgstr "另存为(&A)..."
 msgid "&Print..."
 msgstr "打印(&P)..."
 
-#: common_texts.cpp:117 tdeui/tdemessagebox.cpp:837 tdeui/tdemessagebox.cpp:867
+#: common_texts.cpp:117 tdeui/tdemessagebox.cpp:837
+#: tdeui/tdemessagebox.cpp:867
 msgid "Sorry"
 msgstr "抱歉"
 
@@ -1017,7 +1022,8 @@ msgstr "更改"
 msgid "&Delete"
 msgstr "删除(&D)"
 
-#: common_texts.cpp:125 tdeui/tdefontdialog.cpp:225 tdeui/tdefontdialog.cpp:477
+#: common_texts.cpp:125 tdeui/tdefontdialog.cpp:225
+#: tdeui/tdefontdialog.cpp:477
 msgid "Italic"
 msgstr "斜体"
 
@@ -1045,15 +1051,16 @@ msgstr "本地已经连接上"
 msgid "Browse..."
 msgstr "浏览..."
 
-#: common_texts.cpp:137 tdecore/kkeyserver_x11.cpp:127 tdeui/keditcl2.cpp:107
+#: common_texts.cpp:137 tdecore/kkeyserver_x11.cpp:128
+#: tdehtml/ecma/kjs_debugwin.cpp:466 tdeui/keditcl2.cpp:107
 #: tdeui/keditcl2.cpp:120 tdeui/keditcl2.cpp:377 tdeui/keditcl2.cpp:390
 #: tdeui/keditcl2.cpp:456 tdeui/keditcl2.cpp:469 tdeui/kstdguiitem.cpp:259
-#: tdehtml/ecma/kjs_debugwin.cpp:466 tdeutils/kreplace.cpp:319
+#: tdeutils/kreplace.cpp:319
 msgid "Stop"
 msgstr "停止"
 
-#: common_texts.cpp:138 tdeui/keditlistbox.cpp:136
-#: tderesources/configpage.cpp:127
+#: common_texts.cpp:138 tderesources/configpage.cpp:127
+#: tdeui/keditlistbox.cpp:136
 msgid "&Remove"
 msgstr "删除(&R)"
 
@@ -1109,7 +1116,7 @@ msgstr "恢复"
 msgid "Appearance"
 msgstr "外观"
 
-#: common_texts.cpp:152 tdecore/kkeyserver_x11.cpp:137
+#: common_texts.cpp:152 tdecore/kkeyserver_x11.cpp:138
 #: tdecore/tdestdaccel.cpp:57
 msgid "Print"
 msgstr "打印"
@@ -1179,8 +1186,11 @@ msgid "&Replace..."
 msgstr "替换(&R)..."
 
 #: common_texts.cpp:173 tdeabc/ldapconfigwidget.cpp:156
-#: tdeabc/ldapconfigwidget.cpp:168 tdeui/klineedit.cpp:914
-#: tdeui/tdetoolbar.cpp:2058
+#: tdeabc/ldapconfigwidget.cpp:168 tderandr/libtderandr.cc:1300
+#: tderandr/libtderandr.cc:1403 tderandr/libtderandr.cc:1404
+#: tderandr/libtderandr.cc:1405 tderandr/libtderandr.cc:1445
+#: tderandr/libtderandr.cc:1446 tderandr/libtderandr.cc:1447
+#: tdeui/klineedit.cpp:914 tdeui/tdetoolbar.cpp:2064
 msgid "Default"
 msgstr "默认"
 
@@ -1200,7 +1210,7 @@ msgstr "打开最近访问的"
 msgid "Open &Recent"
 msgstr "打开最近访问的(&R)"
 
-#: common_texts.cpp:179 tdeui/kstdaction_p.h:61 tdehtml/tdehtml_part.cpp:4258
+#: common_texts.cpp:179 tdehtml/tdehtml_part.cpp:4262 tdeui/kstdaction_p.h:61
 msgid "&Find..."
 msgstr "查找(&F)..."
 
@@ -1249,213 +1259,423 @@ msgstr "首选项(&P)..."
 msgid "Do not show this message again"
 msgstr "不再显示本信息"
 
+#: common_texts.cpp:194
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Escape"
+msgstr "Escape"
+
+#: common_texts.cpp:195
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Tab"
+msgstr "Tab"
+
+#: common_texts.cpp:196
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Backtab"
+msgstr "Backtab"
+
+#: common_texts.cpp:197
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Backspace"
+msgstr "Backspace"
+
+#: common_texts.cpp:198
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Return"
+msgstr "Return"
+
+#: common_texts.cpp:199
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Enter"
+msgstr "Enter"
+
+#: common_texts.cpp:200
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Insert"
+msgstr "Insert"
+
+#: common_texts.cpp:201
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Delete"
+msgstr "Delete"
+
+#: common_texts.cpp:202
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Pause"
+msgstr "Pause"
+
+#: common_texts.cpp:203
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Print"
+msgstr "Print"
+
+#: common_texts.cpp:204
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"SysReq"
+msgstr "SysReq"
+
+#: common_texts.cpp:205
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Home"
+msgstr "Home"
+
+#: common_texts.cpp:206
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"End"
+msgstr "End"
+
+#: common_texts.cpp:207
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Left"
+msgstr "Left"
+
+#: common_texts.cpp:208
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Up"
+msgstr "Up"
+
+#: common_texts.cpp:209
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Right"
+msgstr "Right"
+
+#: common_texts.cpp:210
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Down"
+msgstr "Down"
+
 #: common_texts.cpp:211
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Prior"
 msgstr "Prior"
 
 #: common_texts.cpp:212
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Next"
 msgstr "Next"
 
 #: common_texts.cpp:213
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Shift"
 msgstr "Shift"
 
 #: common_texts.cpp:214
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Control"
 msgstr "Ctrl"
 
 #: common_texts.cpp:215
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Meta"
 msgstr "Meta"
 
 #: common_texts.cpp:216
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Alt"
 msgstr "Alt"
 
+#: common_texts.cpp:217
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"CapsLock"
+msgstr "CapsLock"
+
+#: common_texts.cpp:218
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"NumLock"
+msgstr "NumLock"
+
+#: common_texts.cpp:219
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"ScrollLock"
+msgstr "ScrollLock"
+
+#: common_texts.cpp:220
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Space"
+msgstr "空格"
+
 #: common_texts.cpp:221
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "ParenLeft"
 msgstr "ParenLeft"
 
 #: common_texts.cpp:222
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "ParenRight"
 msgstr "ParenRight"
 
 #: common_texts.cpp:223
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Asterisk"
 msgstr "Asterisk"
 
 #: common_texts.cpp:224
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Plus"
 msgstr "Plus"
 
 #: common_texts.cpp:225
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Comma"
 msgstr "Comma"
 
 #: common_texts.cpp:226
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Minus"
 msgstr "Minus"
 
 #: common_texts.cpp:227
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Period"
 msgstr "Period"
 
 #: common_texts.cpp:228
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Slash"
 msgstr "Slash"
 
 #: common_texts.cpp:229
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Colon"
 msgstr "Colon"
 
 #: common_texts.cpp:230
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Semicolon"
 msgstr "Semicolon"
 
 #: common_texts.cpp:231
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Less"
 msgstr "Less"
 
 #: common_texts.cpp:232
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Equal"
 msgstr "Equal"
 
 #: common_texts.cpp:233
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Greater"
 msgstr "Greater"
 
 #: common_texts.cpp:234
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Question"
 msgstr "Question"
 
 #: common_texts.cpp:235
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "BracketLeft"
 msgstr "BracketLeft"
 
 #: common_texts.cpp:236
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Backslash"
 msgstr "Backslash"
 
 #: common_texts.cpp:237
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "BracketRight"
 msgstr "BracketRight"
 
 #: common_texts.cpp:238
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "AsciiCircum"
 msgstr "AsciiCircum"
 
 #: common_texts.cpp:239
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Underscore"
 msgstr "Underscore"
 
 #: common_texts.cpp:240
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "QuoteLeft"
 msgstr "QuoteLeft"
 
 #: common_texts.cpp:241
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "BraceLeft"
 msgstr "BraceLeft"
 
 #: common_texts.cpp:242
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "BraceRight"
 msgstr "BraceRight"
 
 #: common_texts.cpp:243
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "AsciiTilde"
 msgstr "AsciiTilde"
 
+#: common_texts.cpp:244
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"PgUp"
+msgstr "PgUp"
+
+#: common_texts.cpp:245
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"PgDown"
+msgstr "PgDown"
+
 #: common_texts.cpp:246
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Apostrophe"
 msgstr "Apostrophe"
 
 #: common_texts.cpp:247
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Ampersand"
 msgstr "Ampersand"
 
 #: common_texts.cpp:248
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Exclam"
 msgstr "Exclam"
 
 #: common_texts.cpp:249
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Dollar"
 msgstr "Dollar"
 
 #: common_texts.cpp:250
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "Percent"
 msgstr "Percent"
 
+#: common_texts.cpp:251
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Menu"
+msgstr "菜单"
+
+#: common_texts.cpp:252
+#, fuzzy
+msgid ""
+"_: TQAccel\n"
+"Help"
+msgstr "帮助"
+
 #: common_texts.cpp:253
+#, fuzzy
 msgid ""
-"_: QAccel\n"
+"_: TQAccel\n"
 "NumberSign"
 msgstr "NumberSign"
 
@@ -1513,1221 +1733,179 @@ msgid ""
 "Un-Sticky"
 msgstr "取消磁性"
 
-#: kjs/object.cpp:349
-msgid "No default value"
-msgstr "没有默认值"
-
-#: kjs/object.cpp:494
-msgid "Evaluation error"
-msgstr "赋值错误"
-
-#: kjs/object.cpp:495
-msgid "Range error"
-msgstr "范围错误"
-
-#: kjs/object.cpp:496
-msgid "Reference error"
-msgstr "引用错误"
-
-#: kjs/object.cpp:497
-msgid "Syntax error"
-msgstr "语法错误"
-
-#: kjs/object.cpp:498
-msgid "Type error"
-msgstr "类型错误"
-
-#: kjs/object.cpp:499
-msgid "URI error"
-msgstr "URI 错误"
-
-#: kjs/internal.cpp:135
-msgid "Undefined value"
-msgstr "没有定义的值"
-
-#: kjs/internal.cpp:166
-msgid "Null value"
-msgstr "空值"
-
-#: kjs/reference.cpp:96
-msgid "Invalid reference base"
-msgstr "无效的引用基础"
-
-#: kjs/reference.cpp:127
-msgid "Can't find variable: "
-msgstr "找不到变量："
-
-#: kjs/reference.cpp:134
-msgid "Base is not an object"
-msgstr "基础不是对象"
-
-#: kjs/function_object.cpp:290
-msgid "Syntax error in parameter list"
-msgstr "在参数表中有语法错误"
-
-#: interfaces/tdetexteditor/editorchooser.cpp:60
-msgid "System Default (%1)"
-msgstr "系统默认值(%1)"
-
-#: interfaces/tdescript/scriptmanager.cpp:106
-msgid "Unable to get KScript Runner for type \"%1\"."
-msgstr "无法获得类型 “%1” 的 KScript Runner。"
-
-#: interfaces/tdescript/scriptmanager.cpp:106
-#: interfaces/tdescript/scriptmanager.cpp:129
-msgid "KScript Error"
-msgstr "KScript 错误"
-
-#: interfaces/tdescript/scriptmanager.cpp:129
-msgid "Unable find script \"%1\"."
-msgstr "找不到脚本“%1”。"
-
-#: interfaces/tdescript/scriptloader.cpp:40
-msgid "TDE Scripts"
-msgstr "TDE 脚本"
-
-#: arts/kde/kvideowidget.cpp:82
-msgid "Video Toolbar"
-msgstr "视频工具栏"
-
-#: arts/kde/kvideowidget.cpp:104
-msgid "Fullscreen &Mode"
-msgstr "全屏模式(&M)"
-
-#: arts/kde/kvideowidget.cpp:107
-msgid "&Half Size"
-msgstr "一半大小(&H)"
-
-#: arts/kde/kvideowidget.cpp:110
-msgid "&Normal Size"
-msgstr "正常大小(&N)"
-
-#: arts/kde/kvideowidget.cpp:113
-msgid "&Double Size"
-msgstr "两倍大小(&D)"
-
-#: tdeabc/addressbook.cpp:346 tdeabc/addressbook.cpp:365
-msgid "Unable to load resource '%1'"
-msgstr "无法载入资源“%1”"
-
-#: tdeabc/key.cpp:127
-msgid "X509"
-msgstr "X509"
-
-#: tdeabc/key.cpp:130
-msgid "PGP"
-msgstr "PGP"
-
-#: kab/addressbook.cc:335 tdeabc/field.cpp:217 tdeabc/key.cpp:133
-#: tdeabc/scripts/field.src.cpp:110
-msgid "Custom"
-msgstr "自定义"
-
-#: tdeabc/key.cpp:136 tdeabc/secrecy.cpp:80
-msgid "Unknown type"
-msgstr "未知类型"
-
-#: tdeabc/field.cpp:192 tdeabc/scripts/field.src.cpp:85
-msgid "Unknown Field"
-msgstr "未知字段"
-
-#: tdeabc/field.cpp:205 tdeabc/scripts/field.src.cpp:98
-msgid "All"
-msgstr "全部"
-
-#: tdeabc/field.cpp:207 tdeabc/scripts/field.src.cpp:100
-msgid "Frequent"
-msgstr "频率"
-
-#: kab/addressbook.cc:192 tdeabc/field.cpp:209 tdeabc/scripts/field.src.cpp:102
-msgid ""
-"_: street/postal\n"
-"Address"
-msgstr "地址"
-
-#: tdeabc/addresseedialog.cpp:71 tdeabc/addresseedialog.cpp:101
-#: tdeabc/distributionlistdialog.cpp:190 tdeabc/distributionlisteditor.cpp:143
-#: tdeabc/field.cpp:211 tdeabc/scripts/field.src.cpp:104 tdeui/tdeaboutdialog.cpp:91
-msgid "Email"
-msgstr "电子邮件"
-
-#: tdeabc/field.cpp:213 tdeabc/scripts/field.src.cpp:106
-msgid "Personal"
-msgstr "个人"
-
-#: kab/addressbook.cc:176 tdeabc/addressee.cpp:727 tdeabc/field.cpp:215
-#: tdeabc/scripts/field.src.cpp:108
-msgid "Organization"
-msgstr "组织"
-
-#: tdeabc/field.cpp:219 tdeabc/scripts/field.src.cpp:112
-msgid "Undefined"
-msgstr "未定义"
-
-#: tdeabc/tdeab2tdeabc.cpp:42
-msgid "Disable automatic startup on login"
-msgstr "禁用登录时自动启动"
-
-#: tdeabc/tdeab2tdeabc.cpp:45
-msgid "Override existing entries"
-msgstr "超越已有项目"
-
-#: tdeabc/tdeab2tdeabc.cpp:287
-msgid ""
-"Address book file <b>%1</b> not found! Make sure the old address book is "
-"located there and you have read permission for this file."
-msgstr "地址簿文件 <b>%1</b> 未找到！请确定旧地址簿位于该处，您也有该文件的读权限。"
-
-#: tdeabc/tdeab2tdeabc.cpp:435
-msgid "Kab to Kabc Converter"
-msgstr "Kab 到 tdeabc 转换器"
-
-#: tdeabc/resource.cpp:332
-msgid "Loading resource '%1' failed!"
-msgstr "装入资源“%1”失败！"
-
-#: tdeabc/resource.cpp:343
-msgid "Saving resource '%1' failed!"
-msgstr "保存资源“%1”失败！"
-
-#: tdeabc/resourceselectdialog.cpp:39 tderesources/selectdialog.cpp:42
-msgid "Resource Selection"
-msgstr "资源选择"
-
-#: tdeabc/resourceselectdialog.cpp:46 tderesources/configpage.cpp:107
-#: tderesources/selectdialog.cpp:49
-msgid "Resources"
-msgstr "资源"
-
-#: tdeabc/secrecy.cpp:71
-msgid "Public"
-msgstr "公共"
-
-#: kab/addressbook.cc:1950 tdeabc/secrecy.cpp:74
-msgid "Private"
-msgstr "个人"
-
-#: tdeabc/secrecy.cpp:77
-msgid "Confidential"
-msgstr "机密"
-
-#: tdeabc/errorhandler.cpp:42
-msgid "Error in libtdeabc"
-msgstr "libtdeabc 中的错误"
-
-#: tdeabc/ldifconverter.cpp:475
-msgid "List of Emails"
-msgstr "电子邮件列表"
-
-#: tdeabc/locknull.cpp:60
-msgid "LockNull: All locks succeed but no actual locking is done."
-msgstr "LockNull：所有锁定都成功完成，但实际并未进行锁定。"
-
-#: tdeabc/locknull.cpp:62
-msgid "LockNull: All locks fail."
-msgstr "LockNull：所有锁定都失败。"
-
-#: tdeabc/phonenumber.cpp:147
-msgid ""
-"_: Preferred phone\n"
-"Preferred"
-msgstr "首选"
-
-#: tdeabc/phonenumber.cpp:151
-msgid ""
-"_: Home phone\n"
-"Home"
-msgstr "家庭电话"
-
-#: tdeabc/phonenumber.cpp:154
-msgid ""
-"_: Work phone\n"
-"Work"
-msgstr "办公电话"
-
-#: tdeabc/phonenumber.cpp:157
-msgid "Messenger"
-msgstr "信使"
-
-#: tdeabc/phonenumber.cpp:160
-msgid "Preferred Number"
-msgstr "首选号码"
-
-#: tdeabc/phonenumber.cpp:163
-msgid "Voice"
-msgstr "语音"
-
-#: tdeabc/phonenumber.cpp:166
-msgid "Fax"
-msgstr "传真"
-
-#: tdeabc/phonenumber.cpp:169
-msgid ""
-"_: Mobile Phone\n"
-"Mobile"
-msgstr "移动电话"
-
-#: tdeabc/phonenumber.cpp:172
-msgid "Video"
-msgstr "视频"
-
-#: tdeabc/phonenumber.cpp:175
-msgid "Mailbox"
-msgstr "邮箱"
-
-#: tdeabc/phonenumber.cpp:178
-msgid "Modem"
-msgstr "调制解调器"
-
-#: tdeabc/phonenumber.cpp:181
-msgid ""
-"_: Car Phone\n"
-"Car"
-msgstr "车载电话"
-
-#: tdeabc/addressee.cpp:601 tdeabc/phonenumber.cpp:184
-msgid "ISDN"
-msgstr "ISDN"
-
-#: tdeabc/phonenumber.cpp:187
-msgid "PCS"
-msgstr "PCS"
-
-#: tdeabc/addressee.cpp:607 tdeabc/phonenumber.cpp:190
-msgid "Pager"
-msgstr "寻呼机"
-
-#: tdeabc/addressee.cpp:583 tdeabc/phonenumber.cpp:193
-msgid "Home Fax"
-msgstr "家庭传真"
-
-#: tdeabc/phonenumber.cpp:196
-msgid "Work Fax"
-msgstr "办公传真"
-
-#: tdeabc/address.cpp:312 tdeabc/phonenumber.cpp:199 tdecore/kcharsets.cpp:43
-msgid "Other"
-msgstr "其它"
-
-#: tdeabc/distributionlistdialog.cpp:44
-msgid "Configure Distribution Lists"
-msgstr "配置分发列表"
-
-#: tdeabc/distributionlistdialog.cpp:61 tdeabc/distributionlisteditor.cpp:43
-msgid "Select Email Address"
-msgstr "选择电子邮件地址"
-
-#: kab/addressbook.cc:303 tdeabc/distributionlistdialog.cpp:69
-#: tdeabc/distributionlisteditor.cpp:49
-msgid "Email Addresses"
-msgstr "电子邮件地址"
-
-#: tdeabc/distributionlistdialog.cpp:152
-msgid "New List..."
-msgstr "新建列表..."
-
-#: tdeabc/distributionlistdialog.cpp:156
-msgid "Rename List..."
-msgstr "重新命名列表..."
-
-#: tdeabc/distributionlistdialog.cpp:160 tdeabc/distributionlisteditor.cpp:137
-msgid "Remove List"
-msgstr "删除列表"
-
-#: tdeabc/distributionlistdialog.cpp:167
-msgid "Available addresses:"
-msgstr "可用地址："
-
-#: tdeabc/addressee.cpp:335 tdeabc/addresseedialog.cpp:70
-#: tdeabc/addresseedialog.cpp:100 tdeabc/distributionlistdialog.cpp:174
-#: tdeabc/distributionlistdialog.cpp:189 tdeabc/distributionlisteditor.cpp:142
-#: tdeabc/distributionlisteditor.cpp:161 knewstuff/downloaddialog.cpp:270
-#: knewstuff/downloaddialog.cpp:276 knewstuff/downloaddialog.cpp:282
-#: knewstuff/providerdialog.cpp:65 tderesources/configpage.cpp:119
-#: tdeutils/kpluginselector.cpp:200
-msgid "Name"
-msgstr "名称"
-
-#: tdeabc/distributionlistdialog.cpp:175 tdeabc/distributionlisteditor.cpp:162
-msgid "Preferred Email"
-msgstr "首选邮件地址"
-
-#: tdeabc/distributionlistdialog.cpp:183 tdeabc/distributionlisteditor.cpp:156
-msgid "Add Entry"
-msgstr "添加项目"
-
-#: tdeabc/distributionlistdialog.cpp:191 tdeabc/distributionlisteditor.cpp:144
-msgid "Use Preferred"
-msgstr "使用首选的"
-
-#: tdeabc/distributionlistdialog.cpp:198
-msgid "Change Email..."
-msgstr "更改电子邮件..."
-
-#: tdeabc/distributionlistdialog.cpp:202 tdeabc/distributionlisteditor.cpp:152
-msgid "Remove Entry"
-msgstr "删除项目"
-
-#: tdeabc/distributionlistdialog.cpp:237 tdeabc/distributionlisteditor.cpp:196
-msgid "New Distribution List"
-msgstr "新建分发列表"
-
-#: tdeabc/distributionlistdialog.cpp:238
-msgid "Please enter &name:"
-msgstr "请输入名称(&N)："
-
-#: tdeabc/distributionlistdialog.cpp:255
-msgid "Distribution List"
-msgstr "分发列表"
-
-#: tdeabc/distributionlistdialog.cpp:256
-msgid "Please change &name:"
-msgstr "请更改名称(&N)："
-
-#: tdeabc/distributionlistdialog.cpp:273
-msgid "Delete distribution list '%1'?"
-msgstr "删除分发列表“%1”吗？"
-
-#: tdeabc/distributionlistdialog.cpp:339
-msgid "Selected addressees:"
-msgstr "选中的地址："
-
-#: tdeabc/distributionlistdialog.cpp:341
-msgid "Selected addresses in '%1':"
-msgstr "“%1”中选中的地址："
-
-#: tdeabc/addresseehelper.cpp:67
-msgid "Dr."
-msgstr "Dr."
-
-#: tdeabc/addresseehelper.cpp:68
-msgid "Miss"
-msgstr "Miss"
-
-#: tdeabc/addresseehelper.cpp:69
-msgid "Mr."
-msgstr "Mr."
-
-#: tdeabc/addresseehelper.cpp:70
-msgid "Mrs."
-msgstr "Mrs."
-
-#: tdeabc/addresseehelper.cpp:71
-msgid "Ms."
-msgstr "Ms."
-
-#: tdeabc/addresseehelper.cpp:72
-msgid "Prof."
-msgstr "Prof."
-
-#: tdeabc/addresseehelper.cpp:74
-msgid "I"
-msgstr "I"
-
-#: tdeabc/addresseehelper.cpp:75
-msgid "II"
-msgstr "II"
-
-#: tdeabc/addresseehelper.cpp:76
-msgid "III"
-msgstr "III"
-
-#: tdeabc/addresseehelper.cpp:77
-msgid "Jr."
-msgstr "Jr."
-
-#: tdeabc/addresseehelper.cpp:78
-msgid "Sr."
-msgstr "Sr."
-
-#: tdeabc/ldapconfigwidget.cpp:83
-msgid "User:"
-msgstr "用户："
-
-#: tdeabc/ldapconfigwidget.cpp:92
-msgid "Bind DN:"
-msgstr "基 DN："
-
-#: tdeabc/ldapconfigwidget.cpp:101
-msgid "Realm:"
-msgstr "域："
-
-#: tdeabc/ldapconfigwidget.cpp:110
-msgid "Password:"
-msgstr "密码："
-
-#: tdeabc/ldapconfigwidget.cpp:120
-msgid "Host:"
-msgstr "主机："
-
-#: tdeabc/ldapconfigwidget.cpp:130
-msgid "Port:"
-msgstr "端口："
-
-#: tdeabc/ldapconfigwidget.cpp:141
-msgid "LDAP version:"
-msgstr "LDAP 版本："
-
-#: tdeabc/ldapconfigwidget.cpp:152
-msgid "Size limit:"
-msgstr "大小限制："
-
-#: tdeabc/ldapconfigwidget.cpp:163
-msgid "Time limit:"
-msgstr "时间限制："
-
-#: tdeabc/ldapconfigwidget.cpp:167
-msgid " sec"
-msgstr " 秒"
-
-#: tdeabc/ldapconfigwidget.cpp:175
-msgid ""
-"_: Distinguished Name\n"
-"DN:"
-msgstr "DN："
-
-#: tdeabc/ldapconfigwidget.cpp:182 tdeabc/ldapconfigwidget.cpp:231
-msgid "Query Server"
-msgstr "查询服务器"
-
-#: tdeabc/ldapconfigwidget.cpp:190
-msgid "Filter:"
-msgstr "过滤器："
-
-#: tdeabc/ldapconfigwidget.cpp:199
-msgid "Security"
-msgstr "安全"
-
-#: tdeabc/ldapconfigwidget.cpp:201
-msgid "TLS"
-msgstr "TLS"
-
-#: tdeabc/ldapconfigwidget.cpp:202
-msgid "SSL"
-msgstr "SSL"
-
-#: tdeabc/ldapconfigwidget.cpp:216
-msgid "Authentication"
-msgstr "身份验证"
-
-#: tdeabc/ldapconfigwidget.cpp:218
-msgid "Anonymous"
-msgstr "匿名"
-
-#: tdeabc/ldapconfigwidget.cpp:219
-msgid "Simple"
-msgstr "样例"
-
-#: tdeabc/ldapconfigwidget.cpp:220
-msgid "SASL"
-msgstr "SASL"
-
-#: tdeabc/ldapconfigwidget.cpp:222
-msgid "SASL mechanism:"
-msgstr "SASL 算法："
-
-#: tdeabc/ldapconfigwidget.cpp:302
-msgid "LDAP Query"
-msgstr "LDAP 查询"
-
-#: tdeabc/address.cpp:145
-msgid "Post Office Box"
-msgstr "邮局邮箱"
-
-#: tdeabc/address.cpp:163
-msgid "Extended Address Information"
-msgstr "扩展地址信息"
-
-#: tdeabc/address.cpp:181
-msgid "Street"
-msgstr "街道"
-
-#: tdeabc/address.cpp:199
-msgid "Locality"
-msgstr "位置"
-
-#: tdeabc/address.cpp:217 tdeui/ktimezonewidget.cpp:46
-msgid "Region"
-msgstr "地域"
-
-#: tdeabc/address.cpp:235
-msgid "Postal Code"
-msgstr "邮政编码"
-
-#: kab/addressbook.cc:204 tdeabc/address.cpp:253
-msgid "Country"
-msgstr "国家"
-
-#: kab/addressbook.cc:188 tdeabc/address.cpp:271
-msgid "Delivery Label"
-msgstr "邮递标签"
-
-#: tdeabc/address.cpp:287
-msgid ""
-"_: Preferred address\n"
-"Preferred"
-msgstr "首选"
-
-#: tdeabc/address.cpp:291
-msgid "Domestic"
-msgstr "国内"
-
-#: tdeabc/address.cpp:294
-msgid "International"
-msgstr "国际"
-
-#: tdeabc/address.cpp:297
-msgid "Postal"
-msgstr "邮局"
-
-#: tdeabc/address.cpp:300
-msgid "Parcel"
-msgstr "包裹"
-
-#: tdeabc/address.cpp:303
-msgid ""
-"_: Home Address\n"
-"Home"
-msgstr "家庭地址"
-
-#: tdeabc/address.cpp:306
-msgid ""
-"_: Work Address\n"
-"Work"
-msgstr "工作地址"
-
-#: tdeabc/address.cpp:309
-msgid "Preferred Address"
-msgstr "首选地址"
-
-#: tdeabc/lock.cpp:93
-msgid "Unable to open lock file."
-msgstr "无法打开锁定文件。"
-
-#: tdeabc/lock.cpp:106
-msgid ""
-"The address book '%1' is locked by application '%2'.\n"
-"If you believe this is incorrect, just remove the lock file from '%3'"
+#: tdersync/rsyncconfigdialog.cpp:125
+msgid "Setting up synchronization for local folder"
 msgstr ""
-"地址簿“%1”已经被应用程序“%2”锁定。\n"
-"如果您认为这一信息不对，只需删除“%3”的锁定文件"
-
-#: tdeabc/lock.cpp:146
-msgid "Unlock failed. Lock file is owned by other process: %1 (%2)"
-msgstr "解锁失败。锁文件已被其它进程所拥有：%1 (%2)"
-
-#: tdeabc/stdaddressbook.cpp:148
-msgid "Unable to save to resource '%1'. It is locked."
-msgstr "无法保存到资源“%1”，因为它已被锁定。"
-
-#: tdeabc/addresseedialog.cpp:60
-msgid "Select Addressee"
-msgstr "选择地址"
-
-#: tdeabc/addresseedialog.cpp:95
-msgid "Selected"
-msgstr "已选中"
-
-#: tdeabc/addresseedialog.cpp:107
-msgid "Unselect"
-msgstr "取消选择"
-
-#: tdeabc/distributionlisteditor.cpp:133
-msgid "New List"
-msgstr "新建列表"
-
-#: tdeabc/distributionlisteditor.cpp:148
-msgid "Change Email"
-msgstr "更改电子邮件"
-
-#: tdeabc/distributionlisteditor.cpp:197
-msgid "Please enter name:"
-msgstr "请输入名称："
-
-#: tdeabc/formatfactory.cpp:55 tdeabc/formatfactory.cpp:119
-msgid "vCard"
-msgstr "vCard"
-
-#: tdeabc/formatfactory.cpp:56 tdeabc/formatfactory.cpp:120
-msgid "vCard Format"
-msgstr "vCard 格式"
-
-#: tdeabc/formatfactory.cpp:75
-msgid "No description available."
-msgstr "没有可用的描述。"
-
-#: tdeabc/addressee.cpp:317 tdeabc/scripts/addressee.src.cpp:180
-msgid "Unique Identifier"
-msgstr "唯一标识符"
-
-#: kab/addressbook.cc:271 tdeabc/addressee.cpp:354
-msgid "Formatted Name"
-msgstr "正式名称"
-
-#: tdeabc/addressee.cpp:373
-msgid "Family Name"
-msgstr "姓"
-
-#: tdeabc/addressee.cpp:392
-msgid "Given Name"
-msgstr "名"
-
-#: tdeabc/addressee.cpp:411
-msgid "Additional Names"
-msgstr "额外名"
-
-#: tdeabc/addressee.cpp:430
-msgid "Honorific Prefixes"
-msgstr "尊称前缀"
-
-#: tdeabc/addressee.cpp:449
-msgid "Honorific Suffixes"
-msgstr "尊称后缀"
-
-#: tdeabc/addressee.cpp:468
-msgid "Nick Name"
-msgstr "昵称"
-
-#: kab/addressbook.cc:291 tdeabc/addressee.cpp:487
-msgid "Birthday"
-msgstr "生日"
-
-#: tdeabc/addressee.cpp:493
-msgid "Home Address Street"
-msgstr "家庭地址街道"
-
-#: tdeabc/addressee.cpp:499
-msgid "Home Address City"
-msgstr "家庭地址城市"
-
-#: tdeabc/addressee.cpp:505
-msgid "Home Address State"
-msgstr "家庭地址省"
-
-#: tdeabc/addressee.cpp:511
-msgid "Home Address Zip Code"
-msgstr "家庭地址邮政编码"
-
-#: tdeabc/addressee.cpp:517
-msgid "Home Address Country"
-msgstr "家庭地址国家"
-
-#: tdeabc/addressee.cpp:523
-msgid "Home Address Label"
-msgstr "家庭地址门牌"
-
-#: tdeabc/addressee.cpp:529
-msgid "Business Address Street"
-msgstr "办公地址街道"
-
-#: tdeabc/addressee.cpp:535
-msgid "Business Address City"
-msgstr "办公地址城市"
-
-#: tdeabc/addressee.cpp:541
-msgid "Business Address State"
-msgstr "办公地址省"
-
-#: tdeabc/addressee.cpp:547
-msgid "Business Address Zip Code"
-msgstr "办公地址邮政编码"
-
-#: tdeabc/addressee.cpp:553
-msgid "Business Address Country"
-msgstr "办公地址国家"
-
-#: tdeabc/addressee.cpp:559
-msgid "Business Address Label"
-msgstr "办公地址门牌"
-
-#: tdeabc/addressee.cpp:565
-msgid "Home Phone"
-msgstr "家庭电话"
-
-#: tdeabc/addressee.cpp:571
-msgid "Business Phone"
-msgstr "办公电话"
-
-#: tdeabc/addressee.cpp:577
-msgid "Mobile Phone"
-msgstr "移动电话"
-
-#: tdeabc/addressee.cpp:589
-msgid "Business Fax"
-msgstr "办公传真"
-
-#: tdeabc/addressee.cpp:595
-msgid "Car Phone"
-msgstr "车载电话"
-
-#: tdeabc/addressee.cpp:613
-msgid "Email Address"
-msgstr "电子邮件地址"
-
-#: tdeabc/addressee.cpp:632
-msgid "Mail Client"
-msgstr "邮件客户"
-
-#: tdeabc/addressee.cpp:651
-msgid "Time Zone"
-msgstr "时区"
-
-#: tdeabc/addressee.cpp:670
-msgid "Geographic Position"
-msgstr "地理位置"
-
-#: kab/addressbook.cc:263 tdeabc/addressee.cpp:689
-msgid ""
-"_: person\n"
-"Title"
-msgstr "头衔"
-
-#: tdeabc/addressee.cpp:708
-msgid ""
-"_: person in organization\n"
-"Role"
-msgstr "角色"
-
-#: kab/addressbook.cc:180 tdeabc/addressee.cpp:746
-msgid "Department"
-msgstr "部门"
-
-#: tdeabc/addressee.cpp:765
-msgid "Note"
-msgstr "注释"
-
-#: tdeabc/addressee.cpp:784
-msgid "Product Identifier"
-msgstr "产品标识符"
-
-#: tdeabc/addressee.cpp:803
-msgid "Revision Date"
-msgstr "修订日期"
-
-#: tdeabc/addressee.cpp:822
-msgid "Sort String"
-msgstr "排序字符串"
-
-#: tdeabc/addressee.cpp:841 tdeui/tdeaboutdialog.cpp:92
-msgid "Homepage"
-msgstr "主页"
-
-#: tdeabc/addressee.cpp:860
-msgid "Security Class"
-msgstr "安全级别"
-
-#: tdeabc/addressee.cpp:879
-msgid "Logo"
-msgstr "标志"
-
-#: tdeabc/addressee.cpp:898
-msgid "Photo"
-msgstr "照片"
-
-#: tdeabc/addressee.cpp:917
-msgid "Sound"
-msgstr "声音"
-
-#: tdeabc/addressee.cpp:936
-msgid "Agent"
-msgstr "代理"
-
-#: tdeabc/vcard/testwrite.cpp:11
-msgid "TestWritevCard"
-msgstr "TestWritevCard"
-
-#: tdeabc/vcardparser/testread.cpp:38
-msgid "vCard 2.1"
-msgstr "vCard 2.1"
-
-#: tdeabc/vcardparser/testread.cpp:39 tdewidgets/maketdewidgets.cpp:112
-msgid "Input file"
-msgstr "输入文件"
-
-#: kded/tde-menu.cpp:36
-msgid "Output data in UTF-8 instead of local encoding"
-msgstr "用 UTF-8 而非本地编码输出数据"
-
-#: kded/tde-menu.cpp:37
-msgid ""
-"Print menu-id of the menu that contains\n"
-"the application"
-msgstr "输出包含该应用程序的菜单的菜单标识号"
-
-#: kded/tde-menu.cpp:38
-msgid ""
-"Print menu name (caption) of the menu that\n"
-"contains the application"
-msgstr "输出包含该应用程序的菜单的菜单名称(标题)"
-
-#: kded/tde-menu.cpp:39
-msgid "Highlight the entry in the menu"
-msgstr "在菜单中加亮显示该菜单项"
-
-#: kded/tde-menu.cpp:40
-msgid "Do not check if sycoca database is up to date"
-msgstr "不检查 sycoca 数据库是否最新"
-
-#: kded/tde-menu.cpp:41
-msgid "The id of the menu entry to locate"
-msgstr "要定位的菜单项的标识号"
 
-#: kded/tde-menu.cpp:99
-msgid "Menu item '%1' could not be highlighted."
-msgstr "菜单项“%1”无法被加亮显示。"
-
-#: kded/tde-menu.cpp:111
-msgid ""
-"TDE Menu query tool.\n"
-"This tool can be used to find in which menu a specific application is shown.\n"
-"The --highlight option can be used to visually indicate to the user where\n"
-"in the TDE menu a specific application is located."
+#: tdersync/rsyncconfigdialog.cpp:129
+msgid "Synchronization Method"
 msgstr ""
-"TDE 菜单查询工具。\n"
-"这个工具可以用来查找指定的应用程序显示在哪个菜单中。\n"
-"--highlight 选项可以用可视化方式向用户指示指定的应用程序在 TDE 菜单中位于何处。"
-
-#: kded/tde-menu.cpp:116
-msgid "tde-menu"
-msgstr "tde-menu"
 
-#: kded/tdebuildsycoca.cpp:724 kded/tdebuildsycoca.cpp:725 kded/tde-menu.cpp:119
-#: kded/khostname.cpp:362 tdeui/tdeaboutdialog.cpp:90
-msgid "Author"
-msgstr "作者"
-
-#: kded/tde-menu.cpp:133
-msgid "You must specify an application-id such as 'tde-konsole.desktop'"
-msgstr "您必须指定一个应用程序标识，比如“tde-konsole.desktop”"
-
-#: kded/tde-menu.cpp:142
+#: tdersync/rsyncconfigdialog.cpp:134
 msgid ""
-"You must specify at least one of --print-menu-id, --print-menu-name or "
-"--highlight"
-msgstr "您必须指定以下至少一个选项：--print-menu-id、--print-menu-name 或者 --highlight"
-
-#: kded/tde-menu.cpp:164
-msgid "No menu item '%1'."
-msgstr "无菜单项“%1”。"
-
-#: kded/tde-menu.cpp:168
-msgid "Menu item '%1' not found in menu."
-msgstr "未在菜单中找到菜单项“%1”。"
-
-#: kded/khostname.cpp:41
-msgid "Old hostname"
-msgstr "旧主机名"
-
-#: kded/khostname.cpp:42
-msgid "New hostname"
-msgstr "新主机名"
+"&Utilize rsync + ssh for upload to remote server\n"
+"Example: servername:/path/to/remote/folder"
+msgstr ""
 
-#: kded/khostname.cpp:79
+#: tdersync/rsyncconfigdialog.cpp:135
 msgid ""
-"Error: HOME environment variable not set.\n"
+"&Utilize rsync + ssh for download from remote server\n"
+"Example: servername:/path/to/remote/folder"
 msgstr ""
-"错误：没有设置 HOME 环境变量。\n"
 
-#: kded/khostname.cpp:88
+#: tdersync/rsyncconfigdialog.cpp:136
 msgid ""
-"Error: DISPLAY environment variable not set.\n"
+"&Utilize unison + ssh for bidirectional synchronization with remote server\n"
+"Example: ssh://servername//path/to/remote/folder"
 msgstr ""
-"错误：没有设置 DISPLAY 环境变量。\n"
-
-#: kded/khostname.cpp:359
-msgid "KDontChangeTheHostName"
-msgstr "KDontChangeTheHostName"
-
-#: kded/khostname.cpp:360
-msgid "Informs TDE about a change in hostname"
-msgstr "通知 TDE 主机名更改"
-
-#: kded/kded.cpp:720
-msgid "Check Sycoca database only once"
-msgstr "只检查一次 Sycoca 数据库"
-
-#: kded/kded.cpp:860
-msgid "TDE Daemon"
-msgstr "TDE 守护进程"
-
-#: kded/kded.cpp:862
-msgid "TDE Daemon - triggers Sycoca database updates when needed"
-msgstr "TDE 守护进程 - 在需要的时候触发 Sycoca 数据库的更新"
 
-#: kded/tdebuildsycoca.cpp:483
-msgid ""
-"Error creating database '%1'.\n"
-"Check that the permissions are correct on the directory and the disk is not "
-"full.\n"
+#: tdersync/rsyncconfigdialog.cpp:149
+msgid "Remote Folder"
 msgstr ""
-"创建数据库“%1”出错。\n"
-"请检查目录的权限是否正确，磁盘是否已满。\n"
 
-#: kded/tdebuildsycoca.cpp:483 kded/tdebuildsycoca.cpp:512
-#: kded/tdebuildsycoca.cpp:721
-msgid "KBuildSycoca"
-msgstr "KBuildSycoca"
+#: tdersync/rsyncconfigdialog.cpp:159
+#, fuzzy
+msgid "Automatic Synchronization"
+msgstr "自动检测"
 
-#: kded/tdebuildsycoca.cpp:512
-msgid ""
-"Error writing database '%1'.\n"
-"Check that the permissions are correct on the directory and the disk is not "
-"full.\n"
+#: tdersync/rsyncconfigdialog.cpp:164
+msgid "Synchronize on logout"
 msgstr ""
-"写入数据库“%1”出错。\n"
-"请检查目录的权限是否正确，磁盘是否已满。\n"
-
-#: kded/tdebuildsycoca.cpp:695
-msgid "Do not signal applications to update"
-msgstr "不请求应用程序进行更新"
 
-#: kded/tdebuildsycoca.cpp:696
-msgid "Disable incremental update, re-read everything"
-msgstr "禁用递增更新，重新读取所有数据"
+#: tdersync/tdersync.cpp:468 tdersync/tdersync.cpp:516
+#: tdersync/tdersync.cpp:583 tdersync/tdersync.cpp:592
+#: tdersync/tdersync.cpp:645 tdersync/tdersync.cpp:658
+#: tdersync/tdersync.cpp:966
+msgid "Remote Folder Synchronization"
+msgstr ""
 
-#: kded/tdebuildsycoca.cpp:697
-msgid "Check file timestamps"
-msgstr "检查文件时间戳"
+#: tdersync/tdersync.cpp:475 tdersync/tdersync.cpp:599
+msgid "Synchronizing Folder..."
+msgstr ""
 
-#: kded/tdebuildsycoca.cpp:698
-msgid "Disable checking files (dangerous)"
-msgstr "禁用文件检查(危险)"
+#: tdersync/tdersync.cpp:501 tdersync/tdersync.cpp:624
+#, fuzzy
+msgid "Remote authorization required"
+msgstr "需要确认"
 
-#: kded/tdebuildsycoca.cpp:699
-msgid "Create global database"
-msgstr "创建全局数据库"
+#: tdersync/tdersync.cpp:501 tdersync/tdersync.cpp:624
+#, fuzzy
+msgid "Please input"
+msgstr "清除输入"
 
-#: kded/tdebuildsycoca.cpp:700
-msgid "Perform menu generation test run only"
-msgstr "只进行菜单创建测试"
+#: tdersync/tdersync.cpp:587
+msgid "An error ocurred on the remote system"
+msgstr ""
 
-#: kded/tdebuildsycoca.cpp:701
-msgid "Track menu id for debug purposes"
-msgstr "跟踪菜单 ID 以进行调试"
+#: tdersync/tdersync.cpp:687
+#, fuzzy
+msgid "User Intervention Required"
+msgstr "需要确认"
 
-#: kded/tdebuildsycoca.cpp:703
-msgid "Silent - work without windows and stderr"
-msgstr "静默 - 没有窗口和标准错误输出"
+#: tdersync/tdersync.cpp:687
+#, fuzzy
+msgid "Use &Local File"
+msgstr "打开文件"
 
-#: kded/tdebuildsycoca.cpp:704
-msgid "Show progress information (even if 'silent' mode is on)"
-msgstr "显示进度信息(即使开启了“静默”模式)"
+#: tdersync/tdersync.cpp:687
+msgid "Use &Remote File"
+msgstr ""
 
-#: kded/tdebuildsycoca.cpp:722
-msgid "Rebuilds the system configuration cache."
-msgstr "重建系统配置缓存。"
+#: tdersync/tdersync.cpp:694
+msgid "WARNING: Both the local and remote file have been modified"
+msgstr ""
 
-#: kded/tdebuildsycoca.cpp:750
-msgid "Reloading TDE configuration, please wait..."
-msgstr "正在重新装入 TDE 配置，请稍候..."
+#: tdersync/tdersync.cpp:694
+#, fuzzy
+msgid "Local"
+msgstr "位置"
 
-#: kded/tdebuildsycoca.cpp:751
-msgid "TDE Configuration Manager"
-msgstr "TDE 配置管理器"
+#: tdersync/tdersync.cpp:694
+#, fuzzy
+msgid "Remote"
+msgstr "删除"
 
-#: kded/tdebuildsycoca.cpp:753
-msgid "Do you want to reload TDE configuration?"
-msgstr "您是否想要重新装入 TDE 配置？"
+#: tdersync/tdersync.cpp:694
+msgid "Please select the file to duplicate (the other will be overwritten)"
+msgstr ""
 
-#: kded/tdebuildsycoca.cpp:753
-msgid "Do Not Reload"
-msgstr "不重新装入"
+#: tdersync/tdersync.cpp:694
+msgid "Or, select Ignore to skip synchronization of this file for now"
+msgstr ""
 
-#: kded/tdebuildsycoca.cpp:953
-msgid "Configuration information reloaded successfully."
-msgstr "配置信息已成功装入。"
+#: tdersync/tdersync.cpp:966
+msgid "Configuring Remote Folder Synchronization"
+msgstr ""
 
-#: tdemdi/tdemdi/guiclient.cpp:79 tdemdi/tdemdiguiclient.cpp:139
-msgid "Tool &Views"
-msgstr "工具视图(&V)"
+#: tdecore/kcalendarsystemhebrew.cpp:402
+msgid "Tishrey"
+msgstr "Tishrey"
 
-#: tdemdi/tdemdiguiclient.cpp:142
-msgid "MDI Mode"
-msgstr "MDI 模式"
+#: tdecore/kcalendarsystemhebrew.cpp:404
+msgid "Heshvan"
+msgstr "Heshvan"
 
-#: tdemdi/tdemdiguiclient.cpp:144 tdemdi/tdemdimainfrm.cpp:2594
-msgid "&Toplevel Mode"
-msgstr "顶级模式(&T)"
+#: tdecore/kcalendarsystemhebrew.cpp:406
+msgid "Kislev"
+msgstr "Kislev"
 
-#: tdemdi/tdemdiguiclient.cpp:144 tdemdi/tdemdimainfrm.cpp:2595
-msgid "C&hildframe Mode"
-msgstr "子框架模式(&H)"
+#: tdecore/kcalendarsystemhebrew.cpp:408
+msgid "Tevet"
+msgstr "Tevet"
 
-#: tdemdi/tdemdiguiclient.cpp:144 tdemdi/tdemdimainfrm.cpp:2596
-msgid "Ta&b Page Mode"
-msgstr "标签页模式(&B)"
+#: tdecore/kcalendarsystemhebrew.cpp:410
+msgid "Shvat"
+msgstr "Shvat"
 
-#: tdemdi/tdemdiguiclient.cpp:144 tdemdi/tdemdimainfrm.cpp:2597
-msgid "I&DEAl Mode"
-msgstr "I&DEAl 模式"
+#: tdecore/kcalendarsystemhebrew.cpp:412
+msgid "Adar"
+msgstr "Adar"
 
-#: tdemdi/tdemdi/guiclient.cpp:81 tdemdi/tdemdiguiclient.cpp:154
-msgid "Tool &Docks"
-msgstr "工具停靠(&D)"
+#: tdecore/kcalendarsystemhebrew.cpp:414
+msgid "Nisan"
+msgstr "Nisan"
 
-#: tdemdi/tdemdi/guiclient.cpp:82 tdemdi/tdemdiguiclient.cpp:155
-msgid "Switch Top Dock"
-msgstr "切换顶部停靠区"
+#: tdecore/kcalendarsystemhebrew.cpp:416
+msgid "Iyar"
+msgstr "Iyar"
 
-#: tdemdi/tdemdi/guiclient.cpp:84 tdemdi/tdemdiguiclient.cpp:157
-msgid "Switch Left Dock"
-msgstr "切换左边停靠区"
+#: tdecore/kcalendarsystemhebrew.cpp:418
+msgid "Sivan"
+msgstr "Sivan"
 
-#: tdemdi/tdemdi/guiclient.cpp:86 tdemdi/tdemdiguiclient.cpp:159
-msgid "Switch Right Dock"
-msgstr "切换左边停靠区"
+#: tdecore/kcalendarsystemhebrew.cpp:420
+msgid "Tamuz"
+msgstr "Tamuz"
 
-#: tdemdi/tdemdi/guiclient.cpp:88 tdemdi/tdemdiguiclient.cpp:161
-msgid "Switch Bottom Dock"
-msgstr "切换底部停靠区"
+#: tdecore/kcalendarsystemhebrew.cpp:422
+msgid "Av"
+msgstr "Av"
 
-#: tdemdi/tdemdi/guiclient.cpp:91 tdemdi/tdemdiguiclient.cpp:164
-msgid "Previous Tool View"
-msgstr "上一工具视图"
+#: tdecore/kcalendarsystemhebrew.cpp:424
+msgid "Elul"
+msgstr "Elul"
 
-#: tdemdi/tdemdi/guiclient.cpp:93 tdemdi/tdemdiguiclient.cpp:166
-msgid "Next Tool View"
-msgstr "下一工具视图"
+#: tdecore/kcalendarsystemhebrew.cpp:426
+msgid "Adar I"
+msgstr "Adar I"
 
-#: tdeui/kdockwidget.cpp:2945 tdemdi/tdemdi/guiclient.cpp:148
-#: tdemdi/tdemdiguiclient.cpp:260
-#, c-format
-msgid "Show %1"
-msgstr "显示 %1"
+#: tdecore/kcalendarsystemhebrew.cpp:428
+msgid "Adar II"
+msgstr "Adar II"
 
-#: tdeui/kdockwidget.cpp:2939 tdemdi/tdemdi/guiclient.cpp:152
-#: tdemdi/tdemdiguiclient.cpp:265
+#: tdecore/twinmodule.cpp:458
 #, c-format
-msgid "Hide %1"
-msgstr "隐藏 %1"
-
-#: tdemdi/tdemdimainfrm.cpp:979
-msgid "Window"
-msgstr "窗口"
-
-#: tdemdi/tdemdimainfrm.cpp:992
-msgid "Undock"
-msgstr "取消停靠"
-
-#: tdemdi/tdemdimainfrm.cpp:1002
-msgid "Dock"
-msgstr "停靠"
-
-#: tdemdi/tdemdimainfrm.cpp:1007
-msgid "Operations"
-msgstr "操作"
-
-#: tdemdi/tdemdimainfrm.cpp:2577
-msgid "Close &All"
-msgstr "全部关闭(&A)"
-
-#: tdemdi/tdemdimainfrm.cpp:2586
-msgid "&Minimize All"
-msgstr "全部最小化(&M)"
-
-#: tdemdi/tdemdimainfrm.cpp:2592
-msgid "&MDI Mode"
-msgstr "MDI 模式(&M)"
-
-#: tdemdi/tdemdimainfrm.cpp:2619
-msgid "&Tile"
-msgstr "平铺(&T)"
-
-#: tdemdi/tdemdimainfrm.cpp:2621
-msgid "Ca&scade Windows"
-msgstr "层叠窗口(&S)"
-
-#: tdemdi/tdemdimainfrm.cpp:2622
-msgid "Cascade &Maximized"
-msgstr "最大化层叠(&M)"
-
-#: tdemdi/tdemdimainfrm.cpp:2623
-msgid "Expand &Vertically"
-msgstr "垂直扩展(&V)"
-
-#: tdemdi/tdemdimainfrm.cpp:2624
-msgid "Expand &Horizontally"
-msgstr "水平扩展(&H)"
-
-#: tdemdi/tdemdimainfrm.cpp:2625
-msgid "Tile &Non-Overlapped"
-msgstr "不叠放平铺(&N)"
-
-#: tdemdi/tdemdimainfrm.cpp:2626
-msgid "Tile Overla&pped"
-msgstr "叠放平铺(&P)"
-
-#: tdemdi/tdemdimainfrm.cpp:2627
-msgid "Tile V&ertically"
-msgstr "垂直平铺(&E)"
-
-#: tdemdi/tdemdimainfrm.cpp:2633
-msgid "&Dock/Undock"
-msgstr "停靠/取消停靠(&D)"
-
-#: tdemdi/tdemdichildfrmcaption.cpp:71 tdemdi/tdemdichildview.cpp:63
-#: tdemdi/tdemdichildview.cpp:89
-msgid "Unnamed"
-msgstr "未命名"
-
-#: tdemdi/tdemdichildfrm.cpp:1239
-msgid "R&esize"
-msgstr "大小(&E)"
-
-#: tdemdi/tdemdichildfrm.cpp:1240
-msgid "M&inimize"
-msgstr "最小化(&I)"
-
-#: tdemdi/tdemdichildfrm.cpp:1241
-msgid "M&aximize"
-msgstr "最大化(&A)"
-
-#: tdemdi/tdemdichildfrm.cpp:1261
-msgid "&Maximize"
-msgstr "最大化(&M)"
-
-#: tdeui/ksystemtray.cpp:155 tdemdi/tdemdichildfrm.cpp:1263
-msgid "&Minimize"
-msgstr "最小化(&M)"
-
-#: tdemdi/tdemdichildfrm.cpp:1265
-msgid "M&ove"
-msgstr "移动(&O)"
-
-#: tdemdi/tdemdichildfrm.cpp:1267
-msgid "&Resize"
-msgstr "大小(&R)"
-
-#: tdemdi/tdemdichildfrm.cpp:1270
-msgid "&Undock"
-msgstr "取消停靠(&U)"
-
-#: tdemdi/tdemdi/dockcontainer.cpp:196 tdemdi/tdemdidockcontainer.cpp:218
-msgid ""
-"_: Switch between overlap and side by side mode\n"
-"Overlap"
-msgstr "叠放"
-
-#: tdecore/klibloader.cpp:157
-msgid "The library %1 does not offer an %2 function."
-msgstr "代码库 %1 并不提供 %2 函数。"
-
-#: tdecore/klibloader.cpp:168
-msgid "The library %1 does not offer a TDE compatible factory."
-msgstr "代码库 %1 并不提供和 TDE 兼容的函数库。"
-
-#: tdecore/klibloader.cpp:425
-msgid "Library files for \"%1\" not found in paths."
-msgstr "“%1”的库文件未在路径中找到。"
+msgid "Desktop %1"
+msgstr "桌面 %1"
 
-#: tdecore/tdeapplication.cpp:931
+#: tdecore/tdeapplication.cpp:1141
 msgid ""
 "_: Dear Translator! Translate this string to the string 'LTR' in left-to-right "
 "languages (as english) or to 'RTL' in right-to-left languages (such as Hebrew "
 "and Arabic) to get proper widget layout."
 msgstr "LTR"
 
-#: tdecore/tdeapplication.cpp:1404
+#: tdecore/tdeapplication.cpp:1614
 msgid ""
 "There was an error setting up inter-process communications for TDE. The message "
 "returned by the system was:\n"
@@ -2736,7 +1914,7 @@ msgstr ""
 "在设置 TDE 的进程间通信时发生了错误。系统返回的错误信息是：\n"
 "\n"
 
-#: tdecore/tdeapplication.cpp:1408
+#: tdecore/tdeapplication.cpp:1618
 msgid ""
 "\n"
 "\n"
@@ -2746,43 +1924,44 @@ msgstr ""
 "\n"
 "请检查程序“dcopserver”是否正在运行！"
 
-#: tdecore/tdeapplication.cpp:1415
+#: tdecore/tdeapplication.cpp:1625
 msgid "DCOP communications error (%1)"
 msgstr "DCOP 通信错误 (%1)"
 
-#: tdecore/tdeapplication.cpp:1433
+#: tdecore/tdeapplication.cpp:1643
 msgid "Use the X-server display 'displayname'"
 msgstr "使用 X 服务器显示“displayname”"
 
-#: tdecore/tdeapplication.cpp:1435
+#: tdecore/tdeapplication.cpp:1645
 msgid "Use the QWS display 'displayname'"
 msgstr "使用 QWS 显示“displayname”"
 
-#: tdecore/tdeapplication.cpp:1437
+#: tdecore/tdeapplication.cpp:1647
 msgid "Restore the application for the given 'sessionId'"
 msgstr "恢复给定“sessionId”的应用程序"
 
-#: tdecore/tdeapplication.cpp:1438
+#: tdecore/tdeapplication.cpp:1648
 msgid ""
 "Causes the application to install a private color\n"
 "map on an 8-bit display"
 msgstr "让程序在 8 位显示上安装私有的颜色表"
 
-#: tdecore/tdeapplication.cpp:1439
+#: tdecore/tdeapplication.cpp:1649
+#, fuzzy
 msgid ""
 "Limits the number of colors allocated in the color\n"
 "cube on an 8-bit display, if the application is\n"
-"using the QApplication::ManyColor color\n"
+"using the TQApplication::ManyColor color\n"
 "specification"
 msgstr ""
 "如果程序在使用 QApplication::ManyColor 颜色规范，\n"
 "把分配的颜色数量限制在 8 位显示上"
 
-#: tdecore/tdeapplication.cpp:1440
+#: tdecore/tdeapplication.cpp:1650
 msgid "tells Qt to never grab the mouse or the keyboard"
 msgstr "让 Qt 从不争夺鼠标或键盘"
 
-#: tdecore/tdeapplication.cpp:1441
+#: tdecore/tdeapplication.cpp:1651
 msgid ""
 "running under a debugger can cause an implicit\n"
 "-nograb, use -dograb to override"
@@ -2790,15 +1969,15 @@ msgstr ""
 "在调试器下运行会引起隐含的 -nograb，\n"
 "使用 -dograb 来超越"
 
-#: tdecore/tdeapplication.cpp:1442
+#: tdecore/tdeapplication.cpp:1652
 msgid "switches to synchronous mode for debugging"
 msgstr "切换到同步模式以便调试"
 
-#: tdecore/tdeapplication.cpp:1444
+#: tdecore/tdeapplication.cpp:1654
 msgid "defines the application font"
 msgstr "定义程序字体"
 
-#: tdecore/tdeapplication.cpp:1446
+#: tdecore/tdeapplication.cpp:1656
 msgid ""
 "sets the default background color and an\n"
 "application palette (light and dark shades are\n"
@@ -2807,29 +1986,29 @@ msgstr ""
 "设置默认的背景颜色和程序配色板(浅色和\n"
 "深色阴影也被计算)"
 
-#: tdecore/tdeapplication.cpp:1448
+#: tdecore/tdeapplication.cpp:1658
 msgid "sets the default foreground color"
 msgstr "设置默认的前景色"
 
-#: tdecore/tdeapplication.cpp:1450
+#: tdecore/tdeapplication.cpp:1660
 msgid "sets the default button color"
 msgstr "设置默认的按钮颜色"
 
-#: tdecore/tdeapplication.cpp:1451
+#: tdecore/tdeapplication.cpp:1661
 msgid "sets the application name"
 msgstr "设置应用程序名称"
 
-#: tdecore/tdeapplication.cpp:1452
+#: tdecore/tdeapplication.cpp:1662
 msgid "sets the application title (caption)"
 msgstr "设置应用程序标题"
 
-#: tdecore/tdeapplication.cpp:1454
+#: tdecore/tdeapplication.cpp:1664
 msgid ""
 "forces the application to use a TrueColor visual on\n"
 "an 8-bit display"
 msgstr "强制程序在 8 位显示上使用 TrueColor 视觉效果"
 
-#: tdecore/tdeapplication.cpp:1455
+#: tdecore/tdeapplication.cpp:1665
 msgid ""
 "sets XIM (X Input Method) input style. Possible\n"
 "values are onthespot, overthespot, offthespot and\n"
@@ -2838,75 +2017,75 @@ msgstr ""
 "设置 XIM(X 输入法) 输入风格。可能的值为\n"
 "onthespot、overthespot、offthespot 和 root"
 
-#: tdecore/tdeapplication.cpp:1456
+#: tdecore/tdeapplication.cpp:1666
 msgid "set XIM server"
 msgstr "设置 XIM 服务器"
 
-#: tdecore/tdeapplication.cpp:1457
+#: tdecore/tdeapplication.cpp:1667
 msgid "disable XIM"
 msgstr "禁用 XIM"
 
-#: tdecore/tdeapplication.cpp:1460
+#: tdecore/tdeapplication.cpp:1670
 msgid "forces the application to run as QWS Server"
 msgstr "强制程序作为 QWS 服务器来运行"
 
-#: tdecore/tdeapplication.cpp:1462
+#: tdecore/tdeapplication.cpp:1672
 msgid "mirrors the whole layout of widgets"
 msgstr "镜像整个构件布局"
 
-#: tdecore/tdeapplication.cpp:1468
+#: tdecore/tdeapplication.cpp:1678
 msgid "Use 'caption' as name in the titlebar"
 msgstr "使用“caption”作为标题栏中的名称"
 
-#: tdecore/tdeapplication.cpp:1469
+#: tdecore/tdeapplication.cpp:1679
 msgid "Use 'icon' as the application icon"
 msgstr "使用“icon”作为程序图标"
 
-#: tdecore/tdeapplication.cpp:1470
+#: tdecore/tdeapplication.cpp:1680
 msgid "Use 'icon' as the icon in the titlebar"
 msgstr "使用“icon”作为标题栏图标"
 
-#: tdecore/tdeapplication.cpp:1471
+#: tdecore/tdeapplication.cpp:1681
 msgid "Use alternative configuration file"
 msgstr "使用替代的配置文件"
 
-#: tdecore/tdeapplication.cpp:1472
+#: tdecore/tdeapplication.cpp:1682
 msgid "Use the DCOP Server specified by 'server'"
 msgstr "使用“server”指定的 DCOP 服务器"
 
-#: tdecore/tdeapplication.cpp:1473
+#: tdecore/tdeapplication.cpp:1683
 msgid "Disable crash handler, to get core dumps"
 msgstr "禁用崩溃处理程序以便获得核心转储"
 
-#: tdecore/tdeapplication.cpp:1474
+#: tdecore/tdeapplication.cpp:1684
 msgid "Waits for a WM_NET compatible windowmanager"
 msgstr "等待 WM_NET 兼容的窗口管理器"
 
-#: tdecore/tdeapplication.cpp:1475
+#: tdecore/tdeapplication.cpp:1685
 msgid "sets the application GUI style"
 msgstr "设置程序的 GUI 风格"
 
-#: tdecore/tdeapplication.cpp:1476
+#: tdecore/tdeapplication.cpp:1686
 msgid ""
 "sets the client geometry of the main widget - see man X for the argument format"
 msgstr "设置主窗口部件的客户区大小 - 参数格式请参看 man X"
 
-#: tdecore/tdeapplication.cpp:1516
+#: tdecore/tdeapplication.cpp:1740
 msgid ""
 "The style %1 was not found\n"
 msgstr ""
 "没有找到 %1 风格\n"
 
-#: tdecore/tdeapplication.cpp:1978 kstyles/klegacy/klegacystyle.cpp:3044
-#: kstyles/web/webstyle.cpp:1604
+#: tdecore/tdeapplication.cpp:2455 tdestyles/klegacy/klegacystyle.cpp:3044
+#: tdestyles/web/webstyle.cpp:1604
 msgid "modified"
 msgstr "已修改"
 
-#: tdecore/tdeapplication.cpp:2244 tdecore/tdeapplication.cpp:2279
+#: tdecore/tdeapplication.cpp:2727 tdecore/tdeapplication.cpp:2762
 msgid "Could not Launch Help Center"
 msgstr "无法调用帮助中心"
 
-#: tdecore/tdeapplication.cpp:2245 tdecore/tdeapplication.cpp:2280
+#: tdecore/tdeapplication.cpp:2728 tdecore/tdeapplication.cpp:2763
 #, c-format
 msgid ""
 "Could not launch the TDE Help Center:\n"
@@ -2917,11 +2096,11 @@ msgstr ""
 "\n"
 "%1"
 
-#: tdecore/tdeapplication.cpp:2550
+#: tdecore/tdeapplication.cpp:3033
 msgid "Could not Launch Mail Client"
 msgstr "无法载入邮件客户程序"
 
-#: tdecore/tdeapplication.cpp:2551
+#: tdecore/tdeapplication.cpp:3034
 #, c-format
 msgid ""
 "Could not launch the mail client:\n"
@@ -2932,11 +2111,11 @@ msgstr ""
 "\n"
 "%1"
 
-#: tdecore/tdeapplication.cpp:2572
+#: tdecore/tdeapplication.cpp:3058
 msgid "Could not Launch Browser"
 msgstr "无法调用浏览器"
 
-#: tdecore/tdeapplication.cpp:2573
+#: tdecore/tdeapplication.cpp:3059
 #, c-format
 msgid ""
 "Could not launch the browser:\n"
@@ -2947,341 +2126,410 @@ msgstr ""
 "\n"
 "%1"
 
-#: tdecore/tdeapplication.cpp:2637
+#: tdecore/tdeapplication.cpp:3128
 msgid ""
 "Could not register with DCOP.\n"
 msgstr ""
 "无法在 DCOP 上登记。\n"
 
-#: tdecore/tdeapplication.cpp:2672
+#: tdecore/tdeapplication.cpp:3163
 msgid ""
 "TDELauncher could not be reached via DCOP.\n"
 msgstr ""
 "无法通过 DCOP 使用 TDELauncher。\n"
 
-#: tdecore/twinmodule.cpp:456
-#, c-format
-msgid "Desktop %1"
-msgstr "桌面 %1"
+#: tdecore/netsupp.cpp:890 tdecore/network/kresolver.cpp:557
+msgid "no error"
+msgstr "无错误"
 
-#: tdecore/tdeconfigbackend.cpp:1107 tdecore/tdeconfigbackend.cpp:1116
-msgid ""
-"Will not save configuration.\n"
-msgstr ""
-"将不会保存配置。\n"
+#: tdecore/netsupp.cpp:891
+msgid "address family for nodename not supported"
+msgstr "不支持节点名的地址族"
 
-#: tdecore/tdeconfigbackend.cpp:1109 tdecore/tdeconfigbackend.cpp:1117
-msgid ""
-"Configuration file \"%1\" not writable.\n"
-msgstr ""
-"配置文件“%1”不可写。\n"
+#: tdecore/netsupp.cpp:892 tdecore/network/kresolver.cpp:559
+msgid "temporary failure in name resolution"
+msgstr "名称解析暂时失败"
 
-#: tdecore/tdeconfigbackend.cpp:1124
-msgid "Please contact your system administrator."
-msgstr "请联系您的系统管理员。"
+#: tdecore/netsupp.cpp:893
+msgid "invalid value for 'ai_flags'"
+msgstr "无效的“ai_flags”值"
 
-#: tdecore/tdecmdlineargs.cpp:500 tdecore/tdecmdlineargs.cpp:516
-msgid "Unknown option '%1'."
-msgstr "未知选项“%1”。"
+#: tdecore/netsupp.cpp:894 tdecore/network/kresolver.cpp:560
+msgid "non-recoverable failure in name resolution"
+msgstr "名称解析遇到不可恢复错误"
 
-#: tdecore/tdecmdlineargs.cpp:524
-msgid "'%1' missing."
-msgstr "缺少“%1”。"
+#: tdecore/netsupp.cpp:895
+msgid "'ai_family' not supported"
+msgstr "不支持“ai_family”"
 
-#: tdecore/tdecmdlineargs.cpp:619
+#: tdecore/netsupp.cpp:896 tdecore/network/kresolver.cpp:562
+msgid "memory allocation failure"
+msgstr "内存分配失败"
+
+#: tdecore/netsupp.cpp:897
+msgid "no address associated with nodename"
+msgstr "没有和节点名关联的地址"
+
+#: tdecore/netsupp.cpp:898 tdecore/network/kresolver.cpp:563
+msgid "name or service not known"
+msgstr "未知的名称或服务"
+
+#: tdecore/netsupp.cpp:899
+msgid "servname not supported for ai_socktype"
+msgstr "对于 ai_socktype，servname 不被支持"
+
+#: tdecore/netsupp.cpp:900
+msgid "'ai_socktype' not supported"
+msgstr "不支持“ai_socktype”"
+
+#: tdecore/netsupp.cpp:901
+msgid "system error"
+msgstr "系统错误"
+
+#: tdecore/kcalendarsystemgregorian.cpp:91 tdecore/tdelocale.cpp:569
 msgid ""
-"_: the 2nd argument is a list of name+address, one on each line\n"
-"%1 was written by\n"
-"%2"
-msgstr ""
-"%1 的编写者是：\n"
-"%2"
+"_: January\n"
+"Jan"
+msgstr "一月"
 
-#: tdecore/tdecmdlineargs.cpp:622
-msgid "This application was written by somebody who wants to remain anonymous."
-msgstr "此应用程序由某个不愿透露姓名的人编写。"
+#: tdecore/kcalendarsystemgregorian.cpp:93 tdecore/tdelocale.cpp:570
+msgid ""
+"_: February\n"
+"Feb"
+msgstr "二月"
 
-#: tdecore/tdecmdlineargs.cpp:629
+#: tdecore/kcalendarsystemgregorian.cpp:95 tdecore/tdelocale.cpp:571
 msgid ""
-"Please use http://bugs.kde.org to report bugs.\n"
-msgstr ""
-"请使用 http://bugs.kde.org 报告错误。\n"
+"_: March\n"
+"Mar"
+msgstr "三月"
 
-#: tdecore/tdecmdlineargs.cpp:632 tdecore/tdecmdlineargs.cpp:634
+#: tdecore/kcalendarsystemgregorian.cpp:97 tdecore/tdelocale.cpp:572
 msgid ""
-"Please report bugs to %1.\n"
-msgstr ""
-"请将错误报告给 %1。\n"
+"_: April\n"
+"Apr"
+msgstr "四月"
 
-#: tdecore/tdecmdlineargs.cpp:660
-msgid "Unexpected argument '%1'."
-msgstr "未预料到的参数“%1”。"
+#: tdecore/kcalendarsystemgregorian.cpp:99 tdecore/tdelocale.cpp:573
+msgid ""
+"_: May short\n"
+"May"
+msgstr "五月"
 
-#: tdecore/tdecmdlineargs.cpp:765
-msgid "Use --help to get a list of available command line options."
-msgstr "使用 --help 获得可用的命令行选项列表。"
+#: tdecore/kcalendarsystemgregorian.cpp:101 tdecore/tdelocale.cpp:574
+msgid ""
+"_: June\n"
+"Jun"
+msgstr "六月"
 
-#: tdecore/tdecmdlineargs.cpp:780
+#: tdecore/kcalendarsystemgregorian.cpp:103 tdecore/tdelocale.cpp:575
 msgid ""
-"\n"
-"%1:\n"
-msgstr ""
-"\n"
-"%1：\n"
+"_: July\n"
+"Jul"
+msgstr "七月"
 
-#: tdecore/tdecmdlineargs.cpp:789
-msgid "[options] "
-msgstr "[选项] "
+#: tdecore/kcalendarsystemgregorian.cpp:105 tdecore/tdelocale.cpp:576
+msgid ""
+"_: August\n"
+"Aug"
+msgstr "八月"
 
-#: tdecore/tdecmdlineargs.cpp:796
-msgid "[%1-options]"
-msgstr "[%1-选项]"
+#: tdecore/kcalendarsystemgregorian.cpp:107 tdecore/tdelocale.cpp:577
+msgid ""
+"_: September\n"
+"Sep"
+msgstr "九月"
 
-#: tdecore/tdecmdlineargs.cpp:816
+#: tdecore/kcalendarsystemgregorian.cpp:109 tdecore/tdelocale.cpp:578
 msgid ""
-"Usage: %1 %2\n"
-msgstr ""
-"用法：%1 %2\n"
+"_: October\n"
+"Oct"
+msgstr "十月"
 
-#: tdecore/tdecmdlineargs.cpp:819
-msgid "Generic options"
-msgstr "通用选项"
+#: tdecore/kcalendarsystemgregorian.cpp:111 tdecore/tdelocale.cpp:579
+msgid ""
+"_: November\n"
+"Nov"
+msgstr "十一月"
 
-#: tdecore/tdecmdlineargs.cpp:820
-msgid "Show help about options"
-msgstr "显示选项的帮助"
+#: tdecore/kcalendarsystemgregorian.cpp:113 tdecore/tdelocale.cpp:580
+msgid ""
+"_: December\n"
+"Dec"
+msgstr "十二月"
 
-#: tdecore/tdecmdlineargs.cpp:828
-msgid "Show %1 specific options"
-msgstr "显示 %1 特有的选项"
+#: tdecore/kcalendarsystemgregorian.cpp:119 tdecore/tdelocale.cpp:585
+msgid "January"
+msgstr "一月"
 
-#: tdecore/tdecmdlineargs.cpp:835
-msgid "Show all options"
-msgstr "显示所有选项"
+#: tdecore/kcalendarsystemgregorian.cpp:121 tdecore/tdelocale.cpp:586
+msgid "February"
+msgstr "二月"
 
-#: tdecore/tdecmdlineargs.cpp:836
-msgid "Show author information"
-msgstr "显示作者信息"
+#: tdecore/kcalendarsystemgregorian.cpp:123 tdecore/tdelocale.cpp:587
+msgid "March"
+msgstr "三月"
 
-#: tdecore/tdecmdlineargs.cpp:837
-msgid "Show version information"
-msgstr "显示版本信息"
+#: tdecore/kcalendarsystemgregorian.cpp:125 tdecore/tdelocale.cpp:588
+msgid "April"
+msgstr "四月"
 
-#: tdecore/tdecmdlineargs.cpp:838
-msgid "Show license information"
-msgstr "显示版权信息"
+#: tdecore/kcalendarsystemgregorian.cpp:127 tdecore/tdelocale.cpp:589
+msgid ""
+"_: May long\n"
+"May"
+msgstr "五月"
 
-#: tdecore/tdecmdlineargs.cpp:839
-msgid "End of options"
-msgstr "选项结束"
+#: tdecore/kcalendarsystemgregorian.cpp:129 tdecore/tdelocale.cpp:590
+msgid "June"
+msgstr "六月"
 
-#: tdecore/tdecmdlineargs.cpp:861
-msgid "%1 options"
-msgstr "%1 个选项"
+#: tdecore/kcalendarsystemgregorian.cpp:131 tdecore/tdelocale.cpp:591
+msgid "July"
+msgstr "七月"
 
-#: tdecore/tdecmdlineargs.cpp:863
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"选项：\n"
+#: tdecore/kcalendarsystemgregorian.cpp:133 tdecore/tdelocale.cpp:592
+msgid "August"
+msgstr "八月"
 
-#: tdecore/tdecmdlineargs.cpp:920
-msgid ""
-"\n"
-"Arguments:\n"
-msgstr ""
-"\n"
-"参数：\n"
+#: tdecore/kcalendarsystemgregorian.cpp:135 tdecore/tdelocale.cpp:593
+msgid "September"
+msgstr "九月"
 
-#: tdecore/tdecmdlineargs.cpp:1282
-msgid "The files/URLs opened by the application will be deleted after use"
-msgstr "应用程序所打开的文件/URL 即将在使用后删除"
+#: tdecore/kcalendarsystemgregorian.cpp:137 tdecore/tdelocale.cpp:594
+msgid "October"
+msgstr "十月"
 
-#: tdecore/ksockaddr.cpp:112
-msgid "<unknown socket>"
-msgstr "<未知接口>"
+#: tdecore/kcalendarsystemgregorian.cpp:139 tdecore/tdelocale.cpp:595
+msgid "November"
+msgstr "十一月"
 
-#: tdecore/ksockaddr.cpp:568 tdecore/ksockaddr.cpp:587
-msgid "<empty>"
-msgstr "<空>"
+#: tdecore/kcalendarsystemgregorian.cpp:141 tdecore/tdelocale.cpp:596
+msgid "December"
+msgstr "十二月"
 
-#: tdecore/ksockaddr.cpp:571
+#: tdecore/kcalendarsystemgregorian.cpp:156 tdecore/tdelocale.cpp:607
 msgid ""
-"_: 1: hostname, 2: port number\n"
-"%1 port %2"
-msgstr "%1 端口 %2"
+"_: of January\n"
+"of Jan"
+msgstr "一月"
 
-#: tdecore/ksockaddr.cpp:853
-msgid "<empty UNIX socket>"
-msgstr "<空的 UNIX 套接字>"
+#: tdecore/kcalendarsystemgregorian.cpp:158 tdecore/tdelocale.cpp:608
+msgid ""
+"_: of February\n"
+"of Feb"
+msgstr "二月"
 
-#: tdecore/kcheckaccelerators.cpp:148
-msgid "Dr. Klash' Accelerator Diagnosis"
-msgstr "Klash 博士的的加速键分析"
+#: tdecore/kcalendarsystemgregorian.cpp:160 tdecore/tdelocale.cpp:609
+msgid ""
+"_: of March\n"
+"of Mar"
+msgstr "三月"
 
-#: tdecore/kcheckaccelerators.cpp:155
-msgid "&Disable automatic checking"
-msgstr "禁用自动检查(&D)"
+#: tdecore/kcalendarsystemgregorian.cpp:162 tdecore/tdelocale.cpp:610
+msgid ""
+"_: of April\n"
+"of Apr"
+msgstr "四月"
 
-#: tdecore/kcheckaccelerators.cpp:193
-msgid "<h2>Accelerators changed</h2>"
-msgstr "<h2>快捷键已更改</h2>"
+#: tdecore/kcalendarsystemgregorian.cpp:164 tdecore/tdelocale.cpp:611
+msgid ""
+"_: of May short\n"
+"of May"
+msgstr "五月"
 
-#: tdecore/kcheckaccelerators.cpp:199
-msgid "<h2>Accelerators removed</h2>"
-msgstr "<h2>快捷键已删除</h2>"
+#: tdecore/kcalendarsystemgregorian.cpp:166 tdecore/tdelocale.cpp:612
+msgid ""
+"_: of June\n"
+"of Jun"
+msgstr "六月"
 
-#: tdecore/kcheckaccelerators.cpp:204
-msgid "<h2>Accelerators added (just for your info)</h2>"
-msgstr "<h2>快捷键已添加(只是一个提示)</h2>"
+#: tdecore/kcalendarsystemgregorian.cpp:168 tdecore/tdelocale.cpp:613
+msgid ""
+"_: of July\n"
+"of Jul"
+msgstr "七月"
 
-#: tdecore/tdestdaccel.cpp:54
-msgid "New"
-msgstr "新建"
+#: tdecore/kcalendarsystemgregorian.cpp:170 tdecore/tdelocale.cpp:614
+msgid ""
+"_: of August\n"
+"of Aug"
+msgstr "八月"
 
-#: tdecore/tdestdaccel.cpp:65
-msgid "Paste Selection"
-msgstr "粘贴选中内容"
+#: tdecore/kcalendarsystemgregorian.cpp:172 tdecore/tdelocale.cpp:615
+msgid ""
+"_: of September\n"
+"of Sep"
+msgstr "九月"
 
-#: tdecore/tdestdaccel.cpp:67
-msgid "Deselect"
-msgstr "取消选择"
+#: tdecore/kcalendarsystemgregorian.cpp:174 tdecore/tdelocale.cpp:616
+msgid ""
+"_: of October\n"
+"of Oct"
+msgstr "十月"
 
-#: tdecore/tdestdaccel.cpp:68
-msgid "Delete Word Backwards"
-msgstr "删除前面的单词"
+#: tdecore/kcalendarsystemgregorian.cpp:176 tdecore/tdelocale.cpp:617
+msgid ""
+"_: of November\n"
+"of Nov"
+msgstr "十一月"
 
-#: tdecore/tdestdaccel.cpp:69
-msgid "Delete Word Forward"
-msgstr "删除后面的单词"
+#: tdecore/kcalendarsystemgregorian.cpp:178 tdecore/tdelocale.cpp:618
+msgid ""
+"_: of December\n"
+"of Dec"
+msgstr "十二月"
 
-#: tdecore/kkeyserver_x11.cpp:135 tdecore/tdestdaccel.cpp:70
-#: tdeui/keditcl2.cpp:107 tdeui/keditcl2.cpp:120 tdeui/keditcl2.cpp:377
-#: tdeui/keditcl2.cpp:390 tdeui/keditcl2.cpp:700 tdeutils/kfinddialog.cpp:119
-msgid "Find"
-msgstr "查找"
+#: tdecore/kcalendarsystemgregorian.cpp:184 tdecore/tdelocale.cpp:623
+msgid "of January"
+msgstr "一月"
 
-#: tdecore/tdestdaccel.cpp:71 tdeutils/kfind.cpp:47
-msgid "Find Next"
-msgstr "查找下一个"
+#: tdecore/kcalendarsystemgregorian.cpp:186 tdecore/tdelocale.cpp:624
+msgid "of February"
+msgstr "二月"
 
-#: tdecore/tdestdaccel.cpp:72
-msgid "Find Prev"
-msgstr "查找上一个"
+#: tdecore/kcalendarsystemgregorian.cpp:188 tdecore/tdelocale.cpp:625
+msgid "of March"
+msgstr "三月"
 
-#: tdecore/tdestdaccel.cpp:74
-msgid "Navigation"
-msgstr "导航"
+#: tdecore/kcalendarsystemgregorian.cpp:190 tdecore/tdelocale.cpp:626
+msgid "of April"
+msgstr "四月"
 
-#: tdecore/tdestdaccel.cpp:75
+#: tdecore/kcalendarsystemgregorian.cpp:192 tdecore/tdelocale.cpp:627
 msgid ""
-"_: Opposite to End\n"
-"Home"
-msgstr "Home"
-
-#: tdecore/tdestdaccel.cpp:76
-msgid "End"
-msgstr "End"
+"_: of May long\n"
+"of May"
+msgstr "五月"
 
-#: tdecore/tdestdaccel.cpp:77
-msgid "Beginning of Line"
-msgstr "行首"
+#: tdecore/kcalendarsystemgregorian.cpp:194 tdecore/tdelocale.cpp:628
+msgid "of June"
+msgstr "六月"
 
-#: tdecore/tdestdaccel.cpp:78 tdeutils/kfinddialog.cpp:451
-msgid "End of Line"
-msgstr "行尾"
+#: tdecore/kcalendarsystemgregorian.cpp:196 tdecore/tdelocale.cpp:629
+msgid "of July"
+msgstr "七月"
 
-#: tdecore/tdestdaccel.cpp:79
-msgid "Prior"
-msgstr "Prior"
+#: tdecore/kcalendarsystemgregorian.cpp:198 tdecore/tdelocale.cpp:630
+msgid "of August"
+msgstr "八月"
 
-#: tdecore/tdestdaccel.cpp:80
-msgid ""
-"_: Opposite to Prior\n"
-"Next"
-msgstr "Next"
+#: tdecore/kcalendarsystemgregorian.cpp:200 tdecore/tdelocale.cpp:631
+msgid "of September"
+msgstr "九月"
 
-#: tdecore/tdestdaccel.cpp:81 tdeui/keditcl2.cpp:976
-msgid "Go to Line"
-msgstr "跳至行"
+#: tdecore/kcalendarsystemgregorian.cpp:202 tdecore/tdelocale.cpp:632
+msgid "of October"
+msgstr "十月"
 
-#: tdecore/tdestdaccel.cpp:82
-msgid "Add Bookmark"
-msgstr "添加书签"
+#: tdecore/kcalendarsystemgregorian.cpp:204 tdecore/tdelocale.cpp:633
+msgid "of November"
+msgstr "十一月"
 
-#: tdecore/tdestdaccel.cpp:83
-msgid "Zoom In"
-msgstr "放大"
+#: tdecore/kcalendarsystemgregorian.cpp:206 tdecore/tdelocale.cpp:634
+msgid "of December"
+msgstr "十二月"
 
-#: tdecore/tdestdaccel.cpp:84
-msgid "Zoom Out"
-msgstr "缩小"
+#: tdecore/kcalendarsystem.cpp:124
+msgid ""
+"_: Monday\n"
+"Mon"
+msgstr "一"
 
-#: tdecore/tdestdaccel.cpp:85
-msgid "Up"
-msgstr "上"
+#: tdecore/kcalendarsystem.cpp:125
+msgid ""
+"_: Tuesday\n"
+"Tue"
+msgstr "二"
 
-#: tdecore/tdestdaccel.cpp:87
-msgid "Forward"
-msgstr "前进"
+#: tdecore/kcalendarsystem.cpp:126
+msgid ""
+"_: Wednesday\n"
+"Wed"
+msgstr "三"
 
-#: tdecore/tdestdaccel.cpp:89
-msgid "Popup Menu Context"
-msgstr "弹出菜单上下文"
+#: tdecore/kcalendarsystem.cpp:127
+msgid ""
+"_: Thursday\n"
+"Thu"
+msgstr "四"
 
-#: tdecore/tdestdaccel.cpp:90
-msgid "Show Menu Bar"
-msgstr "显示菜单栏"
+#: tdecore/kcalendarsystem.cpp:128
+msgid ""
+"_: Friday\n"
+"Fri"
+msgstr "五"
 
-#: tdecore/tdestdaccel.cpp:91
-msgid "Backward Word"
-msgstr "上一单词"
+#: tdecore/kcalendarsystem.cpp:129
+msgid ""
+"_: Saturday\n"
+"Sat"
+msgstr "六"
 
-#: tdecore/tdestdaccel.cpp:92
-msgid "Forward Word"
-msgstr "下一单词"
+#: tdecore/kcalendarsystem.cpp:130
+msgid ""
+"_: Sunday\n"
+"Sun"
+msgstr "日"
 
-#: tdecore/tdestdaccel.cpp:93
-msgid "Activate Next Tab"
-msgstr "激活下一标签"
+#: tdecore/tdeglobalsettings.cpp:570
+msgid "Trash"
+msgstr "回收站"
 
-#: tdecore/tdestdaccel.cpp:94
-msgid "Activate Previous Tab"
-msgstr "激活上一标签"
+#: tdecore/ksocks.cpp:135
+msgid "NEC SOCKS client"
+msgstr "NEC SOCKS 客户"
 
-#: tdecore/tdestdaccel.cpp:95
-msgid "Full Screen Mode"
-msgstr "全屏模式"
+#: tdecore/ksocks.cpp:170
+msgid "Dante SOCKS client"
+msgstr "Dante SOCKS 客户"
 
-#: tdecore/tdestdaccel.cpp:98
-msgid "What's This"
-msgstr "这是什么"
+#: tdecore/tdeaboutdata.cpp:388
+#, fuzzy
+msgid ""
+"_: replace this with information about your translation team\n"
+"<p>KDE is translated into many languages thanks to the work of the translation "
+"teams all over the world.</p>"
+"<p>For more information on KDE internationalization visit <a "
+"href=\"http://l10n.kde.org\">http://l10n.kde.org</a></p>"
+msgstr ""
+"<p>感谢分布在世界各地的翻译小组的辛勤工作，TDE 被翻译成多种语言。</p>"
+"<p>要了解更多有关 TDE 国际化的信息，请访问 <a href=\"http://l10n.kde.org\">"
+"http://l10n.kde.org</a></p>"
+"<p>要了解关于 TDE 简体中文翻译的更多信息，请访问 <a href=\"http://i18n.linux.net.cn\">"
+"i18n.linux.net.cn</a></p>"
 
-#: tdecore/tdestdaccel.cpp:99 tdecore/tdestdaccel.cpp:100 tdeui/klineedit.cpp:886
-msgid "Text Completion"
-msgstr "文本补全"
+#: tdecore/tdeaboutdata.cpp:444
+msgid ""
+"No licensing terms for this program have been specified.\n"
+"Please check the documentation or the source for any\n"
+"licensing terms.\n"
+msgstr ""
+"这个程序没有指定授权条款。请检查文档或源文件来查看\n"
+"是否有授权条款。\n"
 
-#: tdecore/tdestdaccel.cpp:101
-msgid "Previous Completion Match"
-msgstr "上一个补全匹配"
+#: tdecore/tdeaboutdata.cpp:451
+#, c-format
+msgid "This program is distributed under the terms of the %1."
+msgstr "本程序在 %1 的条款下分发。"
 
-#: tdecore/tdestdaccel.cpp:102
-msgid "Next Completion Match"
-msgstr "下一个补全匹配"
+#: tdecore/ksockaddr.cpp:112
+msgid "<unknown socket>"
+msgstr "<未知接口>"
 
-#: tdecore/tdestdaccel.cpp:103
-msgid "Substring Completion"
-msgstr "子串补全"
+#: tdecore/ksockaddr.cpp:568 tdecore/ksockaddr.cpp:587
+msgid "<empty>"
+msgstr "<空>"
 
-#: tdecore/tdestdaccel.cpp:104
-msgid "Previous Item in List"
-msgstr "在列表中的前一项"
+#: tdecore/ksockaddr.cpp:571
+msgid ""
+"_: 1: hostname, 2: port number\n"
+"%1 port %2"
+msgstr "%1 端口 %2"
 
-#: tdecore/tdestdaccel.cpp:105
-msgid "Next Item in List"
-msgstr "在列表中的后一项"
+#: tdecore/ksockaddr.cpp:853
+msgid "<empty UNIX socket>"
+msgstr "<空的 UNIX 套接字>"
 
 #: tdecore/kcalendarsystemhijri.cpp:298 tdecore/kcalendarsystemhijri.cpp:326
 msgid "Muharram"
@@ -3483,7 +2731,7 @@ msgstr "Yaum al-Sabt"
 msgid "Yaum al-Ahad"
 msgstr "Yaum al-Ahad"
 
-#: tdecore/tdelocale.cpp:217
+#: tdecore/tdelocale.cpp:226
 msgid ""
 "_: Dear translator, please do not translate this string in any form, but pick "
 "the _right_ value out of NoPlural/TwoForms/French... If not sure what to do "
@@ -3492,315 +2740,43 @@ msgid ""
 "Definition of PluralForm - to be set by the translator of tdelibs.po"
 msgstr "NoPlural"
 
-#: tdecore/kcalendarsystemgregorian.cpp:91 tdecore/tdelocale.cpp:553
-msgid ""
-"_: January\n"
-"Jan"
-msgstr "一月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:93 tdecore/tdelocale.cpp:554
-msgid ""
-"_: February\n"
-"Feb"
-msgstr "二月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:95 tdecore/tdelocale.cpp:555
-msgid ""
-"_: March\n"
-"Mar"
-msgstr "三月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:97 tdecore/tdelocale.cpp:556
-msgid ""
-"_: April\n"
-"Apr"
-msgstr "四月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:99 tdecore/tdelocale.cpp:557
-msgid ""
-"_: May short\n"
-"May"
-msgstr "五月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:101 tdecore/tdelocale.cpp:558
-msgid ""
-"_: June\n"
-"Jun"
-msgstr "六月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:103 tdecore/tdelocale.cpp:559
-msgid ""
-"_: July\n"
-"Jul"
-msgstr "七月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:105 tdecore/tdelocale.cpp:560
-msgid ""
-"_: August\n"
-"Aug"
-msgstr "八月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:107 tdecore/tdelocale.cpp:561
-msgid ""
-"_: September\n"
-"Sep"
-msgstr "九月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:109 tdecore/tdelocale.cpp:562
-msgid ""
-"_: October\n"
-"Oct"
-msgstr "十月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:111 tdecore/tdelocale.cpp:563
-msgid ""
-"_: November\n"
-"Nov"
-msgstr "十一月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:113 tdecore/tdelocale.cpp:564
-msgid ""
-"_: December\n"
-"Dec"
-msgstr "十二月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:119 tdecore/tdelocale.cpp:569
-msgid "January"
-msgstr "一月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:121 tdecore/tdelocale.cpp:570
-msgid "February"
-msgstr "二月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:123 tdecore/tdelocale.cpp:571
-msgid "March"
-msgstr "三月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:125 tdecore/tdelocale.cpp:572
-msgid "April"
-msgstr "四月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:127 tdecore/tdelocale.cpp:573
-msgid ""
-"_: May long\n"
-"May"
-msgstr "五月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:129 tdecore/tdelocale.cpp:574
-msgid "June"
-msgstr "六月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:131 tdecore/tdelocale.cpp:575
-msgid "July"
-msgstr "七月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:133 tdecore/tdelocale.cpp:576
-msgid "August"
-msgstr "八月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:135 tdecore/tdelocale.cpp:577
-msgid "September"
-msgstr "九月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:137 tdecore/tdelocale.cpp:578
-msgid "October"
-msgstr "十月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:139 tdecore/tdelocale.cpp:579
-msgid "November"
-msgstr "十一月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:141 tdecore/tdelocale.cpp:580
-msgid "December"
-msgstr "十二月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:156 tdecore/tdelocale.cpp:591
-msgid ""
-"_: of January\n"
-"of Jan"
-msgstr "一月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:158 tdecore/tdelocale.cpp:592
-msgid ""
-"_: of February\n"
-"of Feb"
-msgstr "二月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:160 tdecore/tdelocale.cpp:593
-msgid ""
-"_: of March\n"
-"of Mar"
-msgstr "三月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:162 tdecore/tdelocale.cpp:594
-msgid ""
-"_: of April\n"
-"of Apr"
-msgstr "四月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:164 tdecore/tdelocale.cpp:595
-msgid ""
-"_: of May short\n"
-"of May"
-msgstr "五月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:166 tdecore/tdelocale.cpp:596
-msgid ""
-"_: of June\n"
-"of Jun"
-msgstr "六月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:168 tdecore/tdelocale.cpp:597
-msgid ""
-"_: of July\n"
-"of Jul"
-msgstr "七月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:170 tdecore/tdelocale.cpp:598
-msgid ""
-"_: of August\n"
-"of Aug"
-msgstr "八月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:172 tdecore/tdelocale.cpp:599
-msgid ""
-"_: of September\n"
-"of Sep"
-msgstr "九月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:174 tdecore/tdelocale.cpp:600
-msgid ""
-"_: of October\n"
-"of Oct"
-msgstr "十月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:176 tdecore/tdelocale.cpp:601
-msgid ""
-"_: of November\n"
-"of Nov"
-msgstr "十一月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:178 tdecore/tdelocale.cpp:602
-msgid ""
-"_: of December\n"
-"of Dec"
-msgstr "十二月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:184 tdecore/tdelocale.cpp:607
-msgid "of January"
-msgstr "一月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:186 tdecore/tdelocale.cpp:608
-msgid "of February"
-msgstr "二月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:188 tdecore/tdelocale.cpp:609
-msgid "of March"
-msgstr "三月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:190 tdecore/tdelocale.cpp:610
-msgid "of April"
-msgstr "四月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:192 tdecore/tdelocale.cpp:611
-msgid ""
-"_: of May long\n"
-"of May"
-msgstr "五月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:194 tdecore/tdelocale.cpp:612
-msgid "of June"
-msgstr "六月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:196 tdecore/tdelocale.cpp:613
-msgid "of July"
-msgstr "七月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:198 tdecore/tdelocale.cpp:614
-msgid "of August"
-msgstr "八月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:200 tdecore/tdelocale.cpp:615
-msgid "of September"
-msgstr "九月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:202 tdecore/tdelocale.cpp:616
-msgid "of October"
-msgstr "十月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:204 tdecore/tdelocale.cpp:617
-msgid "of November"
-msgstr "十一月"
-
-#: tdecore/kcalendarsystemgregorian.cpp:206 tdecore/tdelocale.cpp:618
-msgid "of December"
-msgstr "十二月"
-
-#: tdecore/tdelocale.cpp:1773 tdecore/tdelocale.cpp:1913
+#: tdecore/tdelocale.cpp:1789 tdecore/tdelocale.cpp:1929
 msgid "pm"
 msgstr "下午"
 
-#: tdecore/tdelocale.cpp:1782 tdecore/tdelocale.cpp:1915
+#: tdecore/tdelocale.cpp:1798 tdecore/tdelocale.cpp:1931
 msgid "am"
 msgstr "上午"
 
-#: tdecore/tdelocale.cpp:1956
+#: tdecore/tdelocale.cpp:1972
 msgid ""
 "_: concatenation of dates and time\n"
 "%1 %2"
 msgstr "%1 %2"
 
-#: tdecore/tdelocale.cpp:2447
+#: tdecore/tdelocale.cpp:2473
 msgid "&Next"
 msgstr "下一个(&N)"
 
-#: tdecore/netsupp.cpp:890 tdecore/network/kresolver.cpp:557
-msgid "no error"
-msgstr "无错误"
-
-#: tdecore/netsupp.cpp:891
-msgid "address family for nodename not supported"
-msgstr "不支持节点名的地址族"
-
-#: tdecore/netsupp.cpp:892 tdecore/network/kresolver.cpp:559
-msgid "temporary failure in name resolution"
-msgstr "名称解析暂时失败"
-
-#: tdecore/netsupp.cpp:893
-msgid "invalid value for 'ai_flags'"
-msgstr "无效的“ai_flags”值"
-
-#: tdecore/netsupp.cpp:894 tdecore/network/kresolver.cpp:560
-msgid "non-recoverable failure in name resolution"
-msgstr "名称解析遇到不可恢复错误"
-
-#: tdecore/netsupp.cpp:895
-msgid "'ai_family' not supported"
-msgstr "不支持“ai_family”"
-
-#: tdecore/netsupp.cpp:896 tdecore/network/kresolver.cpp:562
-msgid "memory allocation failure"
-msgstr "内存分配失败"
-
-#: tdecore/netsupp.cpp:897
-msgid "no address associated with nodename"
-msgstr "没有和节点名关联的地址"
-
-#: tdecore/netsupp.cpp:898 tdecore/network/kresolver.cpp:563
-msgid "name or service not known"
-msgstr "未知的名称或服务"
-
-#: tdecore/netsupp.cpp:899
-msgid "servname not supported for ai_socktype"
-msgstr "对于 ai_socktype，servname 不被支持"
+#: tdecore/kcompletion.cpp:632
+msgid ""
+"You reached the end of the list\n"
+"of matching items.\n"
+msgstr ""
+"您已经到了匹配项列表的最后。\n"
 
-#: tdecore/netsupp.cpp:900
-msgid "'ai_socktype' not supported"
-msgstr "不支持“ai_socktype”"
+#: tdecore/kcompletion.cpp:638
+msgid ""
+"The completion is ambiguous, more than one\n"
+"match is available.\n"
+msgstr ""
+"补全不确定，可用匹配项不止一个。\n"
 
-#: tdecore/netsupp.cpp:901
-msgid "system error"
-msgstr "系统错误"
+#: tdecore/kcompletion.cpp:644
+msgid ""
+"There is no matching item available.\n"
+msgstr ""
+"没有匹配的项目。\n"
 
 #: tdecore/kcalendarsystemjalali.cpp:392
 msgid "Far"
@@ -3946,49 +2922,165 @@ msgstr "Shanbe"
 msgid "Yek-shanbe"
 msgstr "Yek-shanbe"
 
-#: tdecore/kkeyserver_x11.cpp:113
-msgid "Win"
-msgstr "Win"
+#: tdecore/kdetcompmgr.cpp:35
+msgid "TDE composition manager detection utility"
+msgstr ""
 
-#: tdecore/kkeyserver_x11.cpp:119
-msgid "Backspace"
-msgstr "Backspace"
+#: tdecore/kdetcompmgr.cpp:46
+msgid "kdetcompmgr"
+msgstr ""
 
-#: tdecore/kkeyserver_x11.cpp:120
-msgid "SysReq"
-msgstr "SysReq"
+#: tdecore/tdestdaccel.cpp:54
+msgid "New"
+msgstr "新建"
 
-#: tdecore/kkeyserver_x11.cpp:121
-msgid "CapsLock"
-msgstr "CapsLock"
+#: tdecore/tdestdaccel.cpp:65
+msgid "Paste Selection"
+msgstr "粘贴选中内容"
 
-#: tdecore/kkeyserver_x11.cpp:122
-msgid "NumLock"
-msgstr "NumLock"
+#: tdecore/tdestdaccel.cpp:67
+msgid "Deselect"
+msgstr "取消选择"
 
-#: tdecore/kkeyserver_x11.cpp:123
-msgid "ScrollLock"
-msgstr "ScrollLock"
+#: tdecore/tdestdaccel.cpp:68
+msgid "Delete Word Backwards"
+msgstr "删除前面的单词"
 
-#: tdecore/kkeyserver_x11.cpp:124
-msgid "PageUp"
-msgstr "PageUp"
+#: tdecore/tdestdaccel.cpp:69
+msgid "Delete Word Forward"
+msgstr "删除后面的单词"
 
-#: tdecore/kkeyserver_x11.cpp:125
-msgid "PageDown"
-msgstr "PageDown"
+#: tdecore/kkeyserver_x11.cpp:136 tdecore/tdestdaccel.cpp:70
+#: tdeui/keditcl2.cpp:107 tdeui/keditcl2.cpp:120 tdeui/keditcl2.cpp:377
+#: tdeui/keditcl2.cpp:390 tdeui/keditcl2.cpp:700 tdeutils/kfinddialog.cpp:119
+msgid "Find"
+msgstr "查找"
 
-#: tdecore/kkeyserver_x11.cpp:128
-msgid "Again"
-msgstr "Again"
+#: tdecore/tdestdaccel.cpp:71 tdeutils/kfind.cpp:47
+msgid "Find Next"
+msgstr "查找下一个"
 
-#: tdecore/kkeyserver_x11.cpp:129
-msgid "Props"
-msgstr "Props"
+#: tdecore/tdestdaccel.cpp:72
+msgid "Find Prev"
+msgstr "查找上一个"
 
-#: tdecore/kkeyserver_x11.cpp:131
-msgid "Front"
-msgstr "Front"
+#: tdecore/tdestdaccel.cpp:74
+msgid "Navigation"
+msgstr "导航"
+
+#: tdecore/tdestdaccel.cpp:75
+msgid ""
+"_: Opposite to End\n"
+"Home"
+msgstr "Home"
+
+#: tdecore/tdestdaccel.cpp:76
+msgid "End"
+msgstr "End"
+
+#: tdecore/tdestdaccel.cpp:77
+msgid "Beginning of Line"
+msgstr "行首"
+
+#: tdecore/tdestdaccel.cpp:78 tdeutils/kfinddialog.cpp:464
+msgid "End of Line"
+msgstr "行尾"
+
+#: tdecore/tdestdaccel.cpp:79
+msgid "Prior"
+msgstr "Prior"
+
+#: tdecore/tdestdaccel.cpp:80
+msgid ""
+"_: Opposite to Prior\n"
+"Next"
+msgstr "Next"
+
+#: tdecore/tdestdaccel.cpp:81 tdeui/keditcl2.cpp:976
+msgid "Go to Line"
+msgstr "跳至行"
+
+#: tdecore/tdestdaccel.cpp:82
+msgid "Add Bookmark"
+msgstr "添加书签"
+
+#: tdecore/tdestdaccel.cpp:83
+msgid "Zoom In"
+msgstr "放大"
+
+#: tdecore/tdestdaccel.cpp:84
+msgid "Zoom Out"
+msgstr "缩小"
+
+#: tdecore/tdestdaccel.cpp:85
+msgid "Up"
+msgstr "上"
+
+#: tdecore/tdestdaccel.cpp:87
+msgid "Forward"
+msgstr "前进"
+
+#: tdecore/tdestdaccel.cpp:89
+msgid "Popup Menu Context"
+msgstr "弹出菜单上下文"
+
+#: tdecore/tdestdaccel.cpp:90
+msgid "Show Menu Bar"
+msgstr "显示菜单栏"
+
+#: tdecore/tdestdaccel.cpp:91
+msgid "Backward Word"
+msgstr "上一单词"
+
+#: tdecore/tdestdaccel.cpp:92
+msgid "Forward Word"
+msgstr "下一单词"
+
+#: tdecore/tdestdaccel.cpp:93
+msgid "Activate Next Tab"
+msgstr "激活下一标签"
+
+#: tdecore/tdestdaccel.cpp:94
+msgid "Activate Previous Tab"
+msgstr "激活上一标签"
+
+#: tdecore/tdestdaccel.cpp:95
+msgid "Full Screen Mode"
+msgstr "全屏模式"
+
+#: tdecore/tdestdaccel.cpp:98
+msgid "What's This"
+msgstr "这是什么"
+
+#: tdecore/tdestdaccel.cpp:99 tdecore/tdestdaccel.cpp:100
+#: tdeui/klineedit.cpp:886
+msgid "Text Completion"
+msgstr "文本补全"
+
+#: tdecore/tdestdaccel.cpp:101
+msgid "Previous Completion Match"
+msgstr "上一个补全匹配"
+
+#: tdecore/tdestdaccel.cpp:102
+msgid "Next Completion Match"
+msgstr "下一个补全匹配"
+
+#: tdecore/tdestdaccel.cpp:103
+msgid "Substring Completion"
+msgstr "子串补全"
+
+#: tdecore/tdestdaccel.cpp:104
+msgid "Previous Item in List"
+msgstr "在列表中的前一项"
+
+#: tdecore/tdestdaccel.cpp:105
+msgid "Next Item in List"
+msgstr "在列表中的后一项"
+
+#: tdeabc/address.cpp:312 tdeabc/phonenumber.cpp:199 tdecore/kcharsets.cpp:43
+#: tdecore/tdehw/tdenetworkconnections.cpp:802
+msgid "Other"
+msgstr "其它"
 
 #: tdecore/kcharsets.cpp:44 tdehtml/tdehtml_part.cpp:280
 msgid "Arabic"
@@ -4018,8 +3110,8 @@ msgstr "斯拉夫语"
 msgid "Greek"
 msgstr "希腊语"
 
-#: tdecore/kcharsets.cpp:51 tdeui/ksconfig.cpp:235 tdeui/ksconfig.cpp:395
-#: tdeui/ksconfig.cpp:656 tdehtml/tdehtml_part.cpp:285
+#: tdecore/kcharsets.cpp:51 tdehtml/tdehtml_part.cpp:285
+#: tdeui/ksconfig.cpp:235 tdeui/ksconfig.cpp:395 tdeui/ksconfig.cpp:656
 msgid "Hebrew"
 msgstr "希伯来语"
 
@@ -4035,8 +3127,8 @@ msgstr "韩语"
 msgid "Thai"
 msgstr "泰国语"
 
-#: tdecore/kcharsets.cpp:55 tdeui/ksconfig.cpp:240 tdeui/ksconfig.cpp:400
-#: tdeui/ksconfig.cpp:661 tdehtml/tdehtml_part.cpp:290
+#: tdecore/kcharsets.cpp:55 tdehtml/tdehtml_part.cpp:290
+#: tdeui/ksconfig.cpp:240 tdeui/ksconfig.cpp:400 tdeui/ksconfig.cpp:661
 msgid "Turkish"
 msgstr "土耳其语"
 
@@ -4070,163 +3162,222 @@ msgid ""
 "%1 ( %2 )"
 msgstr "%1(%2)"
 
-#: tdecore/tdeglobalsettings.cpp:494
-msgid "Trash"
-msgstr "回收站"
+#: tdecore/tdecmdlineargs.cpp:500 tdecore/tdecmdlineargs.cpp:516
+msgid "Unknown option '%1'."
+msgstr "未知选项“%1”。"
 
-#: tdecore/kcompletion.cpp:632
+#: tdecore/tdecmdlineargs.cpp:524
+msgid "'%1' missing."
+msgstr "缺少“%1”。"
+
+#: tdecore/tdecmdlineargs.cpp:619
 msgid ""
-"You reached the end of the list\n"
-"of matching items.\n"
+"_: the 2nd argument is a list of name+address, one on each line\n"
+"%1 was written by\n"
+"%2"
 msgstr ""
-"您已经到了匹配项列表的最后。\n"
+"%1 的编写者是：\n"
+"%2"
 
-#: tdecore/kcompletion.cpp:638
+#: tdecore/tdecmdlineargs.cpp:622
+msgid "This application was written by somebody who wants to remain anonymous."
+msgstr "此应用程序由某个不愿透露姓名的人编写。"
+
+#: tdecore/tdecmdlineargs.cpp:629
+#, fuzzy
 msgid ""
-"The completion is ambiguous, more than one\n"
-"match is available.\n"
+"Please use http://bugs.pearsoncomputing.net to report bugs.\n"
 msgstr ""
-"补全不确定，可用匹配项不止一个。\n"
+"请使用 http://bugs.kde.org 报告错误。\n"
 
-#: tdecore/kcompletion.cpp:644
+#: tdecore/tdecmdlineargs.cpp:632 tdecore/tdecmdlineargs.cpp:634
 msgid ""
-"There is no matching item available.\n"
+"Please report bugs to %1.\n"
 msgstr ""
-"没有匹配的项目。\n"
+"请将错误报告给 %1。\n"
 
-#: tdecore/kcalendarsystemhebrew.cpp:402
-msgid "Tishrey"
-msgstr "Tishrey"
+#: tdecore/tdecmdlineargs.cpp:660
+msgid "Unexpected argument '%1'."
+msgstr "未预料到的参数“%1”。"
 
-#: tdecore/kcalendarsystemhebrew.cpp:404
-msgid "Heshvan"
-msgstr "Heshvan"
+#: tdecore/tdecmdlineargs.cpp:765
+msgid "Use --help to get a list of available command line options."
+msgstr "使用 --help 获得可用的命令行选项列表。"
 
-#: tdecore/kcalendarsystemhebrew.cpp:406
-msgid "Kislev"
-msgstr "Kislev"
+#: tdecore/tdecmdlineargs.cpp:780
+msgid ""
+"\n"
+"%1:\n"
+msgstr ""
+"\n"
+"%1：\n"
 
-#: tdecore/kcalendarsystemhebrew.cpp:408
-msgid "Tevet"
-msgstr "Tevet"
+#: tdecore/tdecmdlineargs.cpp:789
+msgid "[options] "
+msgstr "[选项] "
 
-#: tdecore/kcalendarsystemhebrew.cpp:410
-msgid "Shvat"
-msgstr "Shvat"
+#: tdecore/tdecmdlineargs.cpp:796
+msgid "[%1-options]"
+msgstr "[%1-选项]"
 
-#: tdecore/kcalendarsystemhebrew.cpp:412
-msgid "Adar"
-msgstr "Adar"
+#: tdecore/tdecmdlineargs.cpp:816
+msgid ""
+"Usage: %1 %2\n"
+msgstr ""
+"用法：%1 %2\n"
 
-#: tdecore/kcalendarsystemhebrew.cpp:414
-msgid "Nisan"
-msgstr "Nisan"
+#: tdecore/tdecmdlineargs.cpp:819
+msgid "Generic options"
+msgstr "通用选项"
 
-#: tdecore/kcalendarsystemhebrew.cpp:416
-msgid "Iyar"
-msgstr "Iyar"
+#: tdecore/tdecmdlineargs.cpp:820
+msgid "Show help about options"
+msgstr "显示选项的帮助"
 
-#: tdecore/kcalendarsystemhebrew.cpp:418
-msgid "Sivan"
-msgstr "Sivan"
+#: tdecore/tdecmdlineargs.cpp:828
+msgid "Show %1 specific options"
+msgstr "显示 %1 特有的选项"
 
-#: tdecore/kcalendarsystemhebrew.cpp:420
-msgid "Tamuz"
-msgstr "Tamuz"
+#: tdecore/tdecmdlineargs.cpp:835
+msgid "Show all options"
+msgstr "显示所有选项"
 
-#: tdecore/kcalendarsystemhebrew.cpp:422
-msgid "Av"
-msgstr "Av"
+#: tdecore/tdecmdlineargs.cpp:836
+msgid "Show author information"
+msgstr "显示作者信息"
 
-#: tdecore/kcalendarsystemhebrew.cpp:424
-msgid "Elul"
-msgstr "Elul"
+#: tdecore/tdecmdlineargs.cpp:837
+msgid "Show version information"
+msgstr "显示版本信息"
 
-#: tdecore/kcalendarsystemhebrew.cpp:426
-msgid "Adar I"
-msgstr "Adar I"
+#: tdecore/tdecmdlineargs.cpp:838
+msgid "Show license information"
+msgstr "显示版权信息"
 
-#: tdecore/kcalendarsystemhebrew.cpp:428
-msgid "Adar II"
-msgstr "Adar II"
+#: tdecore/tdecmdlineargs.cpp:839
+msgid "End of options"
+msgstr "选项结束"
 
-#: tdecore/tdeaboutdata.cpp:388
+#: tdecore/tdecmdlineargs.cpp:861
+msgid "%1 options"
+msgstr "%1 个选项"
+
+#: tdecore/tdecmdlineargs.cpp:863
 msgid ""
-"_: replace this with information about your translation team\n"
-"<p>TDE is translated into many languages thanks to the work of the translation "
-"teams all over the world.</p>"
-"<p>For more information on TDE internationalization visit <a "
-"href=\"http://l10n.kde.org\">http://l10n.kde.org</a></p>"
+"\n"
+"Options:\n"
 msgstr ""
-"<p>感谢分布在世界各地的翻译小组的辛勤工作，TDE 被翻译成多种语言。</p>"
-"<p>要了解更多有关 TDE 国际化的信息，请访问 <a href=\"http://l10n.kde.org\">"
-"http://l10n.kde.org</a></p>"
-"<p>要了解关于 TDE 简体中文翻译的更多信息，请访问 <a href=\"http://i18n.linux.net.cn\">"
-"i18n.linux.net.cn</a></p>"
+"\n"
+"选项：\n"
 
-#: tdecore/tdeaboutdata.cpp:444
+#: tdecore/tdecmdlineargs.cpp:920
 msgid ""
-"No licensing terms for this program have been specified.\n"
-"Please check the documentation or the source for any\n"
-"licensing terms.\n"
+"\n"
+"Arguments:\n"
 msgstr ""
-"这个程序没有指定授权条款。请检查文档或源文件来查看\n"
-"是否有授权条款。\n"
+"\n"
+"参数：\n"
 
-#: tdecore/tdeaboutdata.cpp:451
-#, c-format
-msgid "This program is distributed under the terms of the %1."
-msgstr "本程序在 %1 的条款下分发。"
+#: tdecore/tdecmdlineargs.cpp:1282
+msgid "The files/URLs opened by the application will be deleted after use"
+msgstr "应用程序所打开的文件/URL 即将在使用后删除"
 
-#: tdecore/kcalendarsystem.cpp:124
-msgid ""
-"_: Monday\n"
-"Mon"
-msgstr "一"
+#: tdecore/kcheckaccelerators.cpp:148
+msgid "Dr. Klash' Accelerator Diagnosis"
+msgstr "Klash 博士的的加速键分析"
 
-#: tdecore/kcalendarsystem.cpp:125
-msgid ""
-"_: Tuesday\n"
-"Tue"
-msgstr "二"
+#: tdecore/kcheckaccelerators.cpp:155
+msgid "&Disable automatic checking"
+msgstr "禁用自动检查(&D)"
 
-#: tdecore/kcalendarsystem.cpp:126
-msgid ""
-"_: Wednesday\n"
-"Wed"
-msgstr "三"
+#: tdecore/kcheckaccelerators.cpp:193
+msgid "<h2>Accelerators changed</h2>"
+msgstr "<h2>快捷键已更改</h2>"
 
-#: tdecore/kcalendarsystem.cpp:127
-msgid ""
-"_: Thursday\n"
-"Thu"
-msgstr "四"
+#: tdecore/kcheckaccelerators.cpp:199
+msgid "<h2>Accelerators removed</h2>"
+msgstr "<h2>快捷键已删除</h2>"
 
-#: tdecore/kcalendarsystem.cpp:128
-msgid ""
-"_: Friday\n"
-"Fri"
-msgstr "五"
+#: tdecore/kcheckaccelerators.cpp:204
+msgid "<h2>Accelerators added (just for your info)</h2>"
+msgstr "<h2>快捷键已添加(只是一个提示)</h2>"
 
-#: tdecore/kcalendarsystem.cpp:129
-msgid ""
-"_: Saturday\n"
-"Sat"
-msgstr "六"
+#: tdecore/kkeyserver_x11.cpp:114
+msgid "Win"
+msgstr "Win"
 
-#: tdecore/kcalendarsystem.cpp:130
+#: tdecore/kkeyserver_x11.cpp:120
+msgid "Backspace"
+msgstr "Backspace"
+
+#: tdecore/kkeyserver_x11.cpp:121
+msgid "SysReq"
+msgstr "SysReq"
+
+#: tdecore/kkeyserver_x11.cpp:122
+msgid "CapsLock"
+msgstr "CapsLock"
+
+#: tdecore/kkeyserver_x11.cpp:123
+msgid "NumLock"
+msgstr "NumLock"
+
+#: tdecore/kkeyserver_x11.cpp:124
+msgid "ScrollLock"
+msgstr "ScrollLock"
+
+#: tdecore/kkeyserver_x11.cpp:125
+msgid "PageUp"
+msgstr "PageUp"
+
+#: tdecore/kkeyserver_x11.cpp:126
+msgid "PageDown"
+msgstr "PageDown"
+
+#: tdecore/kkeyserver_x11.cpp:129
+msgid "Again"
+msgstr "Again"
+
+#: tdecore/kkeyserver_x11.cpp:130
+msgid "Props"
+msgstr "Props"
+
+#: tdecore/kkeyserver_x11.cpp:132
+msgid "Front"
+msgstr "Front"
+
+#: tdecore/klibloader.cpp:157
+msgid "The library %1 does not offer an %2 function."
+msgstr "代码库 %1 并不提供 %2 函数。"
+
+#: tdecore/klibloader.cpp:168
+msgid "The library %1 does not offer a TDE compatible factory."
+msgstr "代码库 %1 并不提供和 TDE 兼容的函数库。"
+
+#: tdecore/klibloader.cpp:184
+#, fuzzy
+msgid " %1 %2"
+msgstr "%1 %2，%3"
+
+#: tdecore/klibloader.cpp:425
+msgid "Library files for \"%1\" not found in paths."
+msgstr "“%1”的库文件未在路径中找到。"
+
+#: tdecore/tdeconfigbackend.cpp:1162 tdecore/tdeconfigbackend.cpp:1171
 msgid ""
-"_: Sunday\n"
-"Sun"
-msgstr "日"
+"Will not save configuration.\n"
+msgstr ""
+"将不会保存配置。\n"
 
-#: tdecore/ksocks.cpp:135
-msgid "NEC SOCKS client"
-msgstr "NEC SOCKS 客户"
+#: tdecore/tdeconfigbackend.cpp:1164 tdecore/tdeconfigbackend.cpp:1172
+msgid ""
+"Configuration file \"%1\" not writable.\n"
+msgstr ""
+"配置文件“%1”不可写。\n"
 
-#: tdecore/ksocks.cpp:170
-msgid "Dante SOCKS client"
-msgstr "Dante SOCKS 客户"
+#: tdecore/tdeconfigbackend.cpp:1179
+msgid "Please contact your system administrator."
+msgstr "请联系您的系统管理员。"
 
 #: tdecore/tdeconfig_compiler/tdeconfig_compiler.cpp:45
 msgid "Directory to generate files in"
@@ -4248,2558 +3399,2011 @@ msgstr "TDE .kcfg 编译器"
 msgid "TDEConfig Compiler"
 msgstr "TDEConfig 编译器"
 
-#: tdecore/network/kresolver.cpp:558
-msgid "requested family not supported for this host name"
-msgstr "此主机名不支持请求的家族"
-
-#: tdecore/network/kresolver.cpp:561
-msgid "invalid flags"
-msgstr "无效的标志"
-
-#: tdecore/network/kresolver.cpp:564
-msgid "requested family not supported"
-msgstr "不支持请求的家族"
+#: tdecore/tdehw/tdestoragedevice.cpp:526
+msgid "%1 Removable Device"
+msgstr ""
 
-#: tdecore/network/kresolver.cpp:565
-msgid "requested service not supported for this socket type"
-msgstr "请求的服务不支持此套接字类型"
+#: tdecore/tdehw/tdestoragedevice.cpp:529
+msgid "%1 Fixed Storage Device"
+msgstr ""
 
-#: tdecore/network/kresolver.cpp:566
-msgid "requested socket type not supported"
-msgstr "请求的套接字类型不支持"
+#: tdecore/tdehw/tdestoragedevice.cpp:546
+#: tdecore/tdehw/tdestoragedevice.cpp:581
+msgid "Hard Disk Drive"
+msgstr ""
 
-#: tdecore/network/kresolver.cpp:567
-msgid "unknown error"
-msgstr "未知的错误"
+#: tdecore/tdehw/tdestoragedevice.cpp:550
+msgid "Floppy Drive"
+msgstr ""
 
-#: tdecore/network/kresolver.cpp:569
-#, c-format
-msgid ""
-"_: 1: the i18n'ed system error code, from errno\n"
-"system error: %1"
-msgstr "系统错误：%1"
+#: tdecore/tdehw/tdestoragedevice.cpp:553
+msgid "Optical Drive"
+msgstr ""
 
-#: tdecore/network/kresolver.cpp:574
-msgid "request was canceled"
-msgstr "请求已取消"
+#: tdecore/tdehw/tdestoragedevice.cpp:556
+msgid "CDROM Drive"
+msgstr ""
 
-#: tdecore/network/tdesocketbase.cpp:172
-msgid ""
-"_: Socket error code NoError\n"
-"no error"
-msgstr "无错误"
+#: tdecore/tdehw/tdestoragedevice.cpp:559
+msgid "CDRW Drive"
+msgstr ""
 
-#: tdecore/network/tdesocketbase.cpp:177
-msgid ""
-"_: Socket error code LookupFailure\n"
-"name lookup has failed"
-msgstr "名称查阅失败"
+#: tdecore/tdehw/tdestoragedevice.cpp:562
+msgid "DVD Drive"
+msgstr ""
 
-#: tdecore/network/tdesocketbase.cpp:182
-msgid ""
-"_: Socket error code AddressInUse\n"
-"address already in use"
-msgstr "地址已在使用中"
+#: tdecore/tdehw/tdestoragedevice.cpp:565
+msgid "DVDRW Drive"
+msgstr ""
 
-#: tdecore/network/tdesocketbase.cpp:187
-msgid ""
-"_: Socket error code AlreadyBound\n"
-"socket is already bound"
-msgstr "套接字已绑定"
+#: tdecore/tdehw/tdestoragedevice.cpp:568
+msgid "DVDRAM Drive"
+msgstr ""
 
-#: tdecore/network/tdesocketbase.cpp:192
-msgid ""
-"_: Socket error code AlreadyCreated\n"
-"socket is already created"
-msgstr "套接字已创建"
+#: tdecore/tdehw/tdestoragedevice.cpp:571
+msgid "Zip Drive"
+msgstr ""
 
-#: tdecore/network/tdesocketbase.cpp:197
-msgid ""
-"_: Socket error code NotBound\n"
-"socket is not bound"
-msgstr "套接字未绑定"
+#: tdecore/tdehw/tdestoragedevice.cpp:574
+msgid "Tape Drive"
+msgstr ""
 
-#: tdecore/network/tdesocketbase.cpp:202
-msgid ""
-"_: Socket error code NotCreated\n"
-"socket has not been created"
-msgstr "套接字未创建"
+#: tdecore/tdehw/tdestoragedevice.cpp:577
+msgid "Digital Camera"
+msgstr ""
 
-#: tdecore/network/tdesocketbase.cpp:207
-msgid ""
-"_: Socket error code WouldBlock\n"
-"operation would block"
-msgstr "操作将阻塞"
+#: tdecore/tdehw/tdestoragedevice.cpp:583
+#, fuzzy
+msgid "Removable Storage"
+msgstr "删除项目"
 
-#: tdecore/network/tdesocketbase.cpp:212
-msgid ""
-"_: Socket error code ConnectionRefused\n"
-"connection actively refused"
-msgstr "拒绝活动连接"
+#: tdecore/tdehw/tdestoragedevice.cpp:586
+msgid "Compact Flash"
+msgstr ""
 
-#: tdecore/network/tdesocketbase.cpp:217
-msgid ""
-"_: Socket error code ConnectionTimedOut\n"
-"connection timed out"
-msgstr "连接超时"
+#: tdecore/tdehw/tdestoragedevice.cpp:589
+msgid "Memory Stick"
+msgstr ""
 
-#: tdecore/network/tdesocketbase.cpp:222
-msgid ""
-"_: Socket error code InProgress\n"
-"operation is already in progress"
-msgstr "操作已在进行中"
+#: tdecore/tdehw/tdestoragedevice.cpp:592
+msgid "Smart Media"
+msgstr ""
 
-#: tdecore/network/tdesocketbase.cpp:227
-msgid ""
-"_: Socket error code NetFailure\n"
-"network failure occurred"
-msgstr "发生了网络错误"
+#: tdecore/tdehw/tdestoragedevice.cpp:595
+#, fuzzy
+msgid "Secure Digital"
+msgstr "安全"
 
-#: tdecore/network/tdesocketbase.cpp:232
-msgid ""
-"_: Socket error code NotSupported\n"
-"operation is not supported"
-msgstr "操作不支持"
+#: tdecore/tdehw/tdestoragedevice.cpp:600
+msgid "Random Access Memory"
+msgstr ""
 
-#: tdecore/network/tdesocketbase.cpp:237
-msgid ""
-"_: Socket error code Timeout\n"
-"timed operation timed out"
-msgstr "限时操作超时"
+#: tdecore/tdehw/tdestoragedevice.cpp:603
+msgid "Loop Device"
+msgstr ""
 
-#: tdecore/network/tdesocketbase.cpp:242
-msgid ""
-"_: Socket error code UnknownError\n"
-"an unknown/unexpected error has happened"
-msgstr "发生了未知/意外错误"
+#: tdecore/tdehw/tdestoragedevice.cpp:946
+msgid "No supported mounting methods were detected on your system"
+msgstr ""
 
-#: tdecore/network/tdesocketbase.cpp:247
-msgid ""
-"_: Socket error code RemotelyDisconnected\n"
-"remote host closed connection"
-msgstr "远程主机关闭了连接"
+#: tdecore/tdehw/tdestoragedevice.cpp:1124
+msgid "No supported unmounting methods were detected on your system"
+msgstr ""
 
-#: tdecore/network/tdesocketaddress.cpp:625
+#: tdecore/tdehw/tdegenericdevice.cpp:256
 #, c-format
-msgid ""
-"_: 1: the unknown socket address family number\n"
-"Unknown family %1"
-msgstr "未知的家庭号码 %1"
-
-#: knewstuff/uploaddialog.cpp:47
-msgid "Share Hot New Stuff"
-msgstr "共享百宝箱"
-
-#: tdeui/kcolordialog.cpp:1133 knewstuff/uploaddialog.cpp:58
-#: tderesources/configdialog.cpp:53
-msgid "Name:"
-msgstr "名称："
-
-#: knewstuff/uploaddialog.cpp:63
-msgid "Author:"
-msgstr "作者："
-
-#: knewstuff/uploaddialog.cpp:68
-msgid "Email:"
-msgstr "电子邮件："
-
-#: tdeui/kbugreport.cpp:174 knewstuff/uploaddialog.cpp:73
-msgid "Version:"
-msgstr "版本："
-
-#: knewstuff/uploaddialog.cpp:78
-msgid "Release:"
-msgstr "放出："
-
-#: knewstuff/uploaddialog.cpp:84
-msgid "License:"
-msgstr "许可："
-
-#: knewstuff/uploaddialog.cpp:88
-msgid "GPL"
-msgstr "GPL"
-
-#: knewstuff/uploaddialog.cpp:89
-msgid "LGPL"
-msgstr "LGPL"
-
-#: knewstuff/uploaddialog.cpp:90
-msgid "BSD"
-msgstr "BSD"
-
-#: knewstuff/uploaddialog.cpp:93
-msgid "Language:"
-msgstr "语言："
-
-#: knewstuff/uploaddialog.cpp:99
-msgid "Preview URL:"
-msgstr "预览 URL："
+msgid "ACPI Node %1"
+msgstr ""
 
-#: knewstuff/uploaddialog.cpp:104
-msgid "Summary:"
-msgstr "概览："
+#: tdecore/tdehw/tdegenericdevice.cpp:277
+#: tdecore/tdehw/tdegenericdevice.cpp:295
+msgid "ACPI Lid Switch"
+msgstr ""
 
-#: knewstuff/uploaddialog.cpp:121
-msgid "Please put in a name."
-msgstr "请输入名称。"
+#: tdecore/tdehw/tdegenericdevice.cpp:280
+#: tdecore/tdehw/tdegenericdevice.cpp:298
+msgid "ACPI Sleep Button"
+msgstr ""
 
-#: knewstuff/uploaddialog.cpp:191
-msgid "Old upload information found, fill out fields?"
-msgstr "未找到旧的上传信息，要填写吗？"
+#: tdecore/tdehw/tdegenericdevice.cpp:283
+#: tdecore/tdehw/tdegenericdevice.cpp:301
+msgid "ACPI Power Button"
+msgstr ""
 
-#: knewstuff/uploaddialog.cpp:191
-msgid "Fill Out"
-msgstr "填充"
+#: tdecore/tdehw/tdegenericdevice.cpp:290
+msgid "Generic Event Device"
+msgstr ""
 
-#: knewstuff/uploaddialog.cpp:191
-msgid "Do Not Fill Out"
-msgstr "不填充"
+#: tdecore/tdehw/tdegenericdevice.cpp:308
+#, fuzzy
+msgid "Generic Input Device"
+msgstr "通用选项"
 
-#: knewstuff/knewstuffgeneric.cpp:139
-msgid "The file '%1' already exists. Do you want to overwrite it?"
-msgstr "文件“%1”已经存在。您确定要覆盖它吗？"
+#: tdecore/tdehw/tdegenericdevice.cpp:315
+#: tdecore/tdehw/tdehardwaredevices.cpp:3140
+msgid "Generic %1 Device"
+msgstr ""
 
-#: tdehtml/tdehtml_ext.cpp:828 knewstuff/knewstuffgeneric.cpp:141
-msgid "Overwrite"
-msgstr "覆盖"
+#: tdecore/tdehw/tdegenericdevice.cpp:322
+#, c-format
+msgid "Virtual Device %1"
+msgstr ""
 
-#: knewstuff/provider.cpp:270
-msgid "Error parsing providers list."
-msgstr "分析提供者列表出错。"
+#: tdecore/tdehw/tdegenericdevice.cpp:325
+msgid "Unknown Virtual Device"
+msgstr ""
 
-#: knewstuff/downloaddialog.cpp:101 knewstuff/downloaddialog.cpp:108
-#: knewstuff/downloaddialog.cpp:124 knewstuff/downloaddialog.cpp:131
-msgid "Get Hot New Stuff"
-msgstr "获得百宝箱"
+#: tdecore/tdehw/tdegenericdevice.cpp:330
+#: tdecore/tdehw/tdehardwaredevices.cpp:4088
+#, fuzzy
+msgid "Unknown Device"
+msgstr "未知字段"
 
-#: knewstuff/downloaddialog.cpp:228
-msgid "Welcome"
-msgstr "欢迎"
+#: tdecore/tdehw/tdeeventdevice.cpp:288
+msgid "Lid Switch"
+msgstr ""
 
-#: knewstuff/downloaddialog.cpp:259
-msgid "Highest Rated"
-msgstr "最受欢迎"
+#: tdecore/tdehw/tdeeventdevice.cpp:291
+#, fuzzy
+msgid "Tablet Mode"
+msgstr "标签页模式(&B)"
 
-#: knewstuff/downloaddialog.cpp:260
-msgid "Most Downloads"
-msgstr "最多下载"
+#: tdecore/tdehw/tdeeventdevice.cpp:294
+msgid "Headphone Inserted"
+msgstr ""
 
-#: knewstuff/downloaddialog.cpp:261
-msgid "Latest"
-msgstr "最新"
+#: tdecore/tdehw/tdeeventdevice.cpp:297
+msgid "Radio Frequency Device Kill Switch"
+msgstr ""
 
-#: knewstuff/downloaddialog.cpp:271 knewstuff/downloaddialog.cpp:277
-#: knewstuff/downloaddialog.cpp:283
-msgid "Version"
-msgstr "版本"
+#: tdecore/tdehw/tdeeventdevice.cpp:300
+msgid "Enable Radio"
+msgstr ""
 
-#: knewstuff/downloaddialog.cpp:272
-msgid "Rating"
-msgstr "评分"
+#: tdecore/tdehw/tdeeventdevice.cpp:303
+msgid "Microphone Inserted"
+msgstr ""
 
-#: knewstuff/downloaddialog.cpp:278
-msgid "Downloads"
-msgstr "下载数"
+#: tdecore/tdehw/tdeeventdevice.cpp:306
+#, fuzzy
+msgid "Docked"
+msgstr "停靠"
 
-#: knewstuff/downloaddialog.cpp:284
-msgid "Release Date"
-msgstr "放出日期"
+#: tdecore/tdehw/tdeeventdevice.cpp:309
+msgid "Line Out Inserted"
+msgstr ""
 
-#: knewstuff/downloaddialog.cpp:294
-msgid "Install"
-msgstr "安装"
+#: tdecore/tdehw/tdeeventdevice.cpp:312
+msgid "Physical Jack Inserted"
+msgstr ""
 
-#: tdeui/tdemessagebox.cpp:246 knewstuff/downloaddialog.cpp:295
-#: knewstuff/downloaddialog.cpp:505
-msgid "Details"
-msgstr "细节"
+#: tdecore/tdehw/tdeeventdevice.cpp:315
+msgid "Video Out Inserted"
+msgstr ""
 
-#: knewstuff/downloaddialog.cpp:477
-msgid ""
-"Name: %1\n"
-"Author: %2\n"
-"License: %3\n"
-"Version: %4\n"
-"Release: %5\n"
-"Rating: %6\n"
-"Downloads: %7\n"
-"Release date: %8\n"
-"Summary: %9\n"
+#: tdecore/tdehw/tdeeventdevice.cpp:318
+msgid "Camera Lens Cover"
 msgstr ""
-"名称：%1\n"
-"作者：%2\n"
-"许可：%3\n"
-"版本：%4\n"
-"放出：%5\n"
-"评分：%6\n"
-"下载数：%7\n"
-"发表日期：%8\n"
-"概览：%9\n"
 
-#: knewstuff/downloaddialog.cpp:499
-msgid ""
-"Preview: %1\n"
-"Payload: %2\n"
+#: tdecore/tdehw/tdeeventdevice.cpp:321
+msgid "Keypad Slide"
 msgstr ""
-"预览：%1\n"
-"下载：%2\n"
 
-#: knewstuff/downloaddialog.cpp:600
-msgid "Installation successful."
-msgstr "安装成功。"
+#: tdecore/tdehw/tdeeventdevice.cpp:324
+msgid "Front Proximity"
+msgstr ""
 
-#: knewstuff/downloaddialog.cpp:600 knewstuff/downloaddialog.cpp:602
-msgid "Installation"
-msgstr "安装"
+#: tdecore/tdehw/tdeeventdevice.cpp:327
+#, fuzzy
+msgid "Rotate Lock"
+msgstr "顺时针旋转(&R)"
 
-#: knewstuff/downloaddialog.cpp:602
-msgid "Installation failed."
-msgstr "安装失败。"
+#: tdecore/tdehw/tdeeventdevice.cpp:330
+msgid "Line In Inserted"
+msgstr ""
 
-#: knewstuff/downloaddialog.cpp:696
-msgid "Preview not available."
-msgstr "预览不可用。"
+#: tdecore/tdehw/tdeeventdevice.cpp:333
+msgid "Power Button"
+msgstr ""
 
-#: knewstuff/knewstuff.cpp:38 knewstuff/knewstuffbutton.cpp:61
-#, c-format
-msgid "Download New %1"
-msgstr "下载新 %1"
+#: tdecore/tdehw/tdeeventdevice.cpp:336
+msgid "Sleep Button"
+msgstr ""
 
-#: knewstuff/engine.cpp:218
-msgid "Successfully installed hot new stuff."
-msgstr "成功安装了百宝箱。"
+#: tdecore/tdehw/tdenetworkconnections.cpp:525
+msgid "hidden"
+msgstr ""
 
-#: knewstuff/engine.cpp:223
-msgid "Failed to install hot new stuff."
-msgstr "安装百宝箱失败。"
+#: tdecore/tdehw/tdenetworkconnections.cpp:769
+msgid "Wired Ethernet"
+msgstr ""
 
-#: knewstuff/engine.cpp:278
-msgid "Unable to create file to upload."
-msgstr "无法创建要上传的文件。"
+#: tdecore/tdehw/tdenetworkconnections.cpp:772
+msgid "802.11 WiFi"
+msgstr ""
 
-#: knewstuff/engine.cpp:293
-msgid ""
-"The files to be uploaded have been created at:\n"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4049
+#: tdecore/tdehw/tdenetworkconnections.cpp:775
+msgid "Bluetooth"
 msgstr ""
-"要上传的文件已经创建于：\n"
 
-#: knewstuff/engine.cpp:294
-msgid ""
-"Data file: %1\n"
+#: tdecore/tdehw/tdenetworkconnections.cpp:778
+msgid "OLPC Mesh"
 msgstr ""
-"数据文件：%1\n"
 
-#: knewstuff/engine.cpp:296
-msgid ""
-"Preview image: %1\n"
+#: tdecore/tdehw/tdenetworkconnections.cpp:781
+msgid "WiMax"
 msgstr ""
-"预览图像：%1\n"
 
-#: knewstuff/engine.cpp:298
-msgid ""
-"Content information: %1\n"
+#: tdecore/tdehw/tdenetworkconnections.cpp:784
+msgid "Cellular Modem"
 msgstr ""
-"内容信息：%1\n"
 
-#: knewstuff/engine.cpp:299
-msgid ""
-"Those files can now be uploaded.\n"
+#: tdecore/tdehw/tdenetworkconnections.cpp:787
+msgid "Infiniband"
 msgstr ""
-"无法上传这些文件。\n"
 
-#: knewstuff/engine.cpp:300
-msgid "Beware that any people might have access to them at any time."
-msgstr "请小心，任何人都可在任何时刻访问。"
+#: tdecore/tdehw/tdenetworkconnections.cpp:790
+msgid "Bond"
+msgstr ""
 
-#: knewstuff/engine.cpp:302
-msgid "Upload Files"
-msgstr "上传文件"
+#: tdecore/tdehw/tdenetworkconnections.cpp:793
+msgid "Virtual LAN"
+msgstr ""
 
-#: knewstuff/engine.cpp:307
-msgid "Please upload the files manually."
-msgstr "请手动上传文件。"
+#: tdecore/tdehw/tdenetworkconnections.cpp:796
+msgid "ADSL"
+msgstr ""
 
-#: knewstuff/engine.cpp:311
-msgid "Upload Info"
-msgstr "上传信息"
+#: tdecore/tdehw/tdenetworkconnections.cpp:799
+msgid "Virtual Private Network"
+msgstr ""
 
-#: knewstuff/engine.cpp:319
-msgid "&Upload"
-msgstr "上传(&U)"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3145
+msgid "Disconnected %1 Port"
+msgstr ""
 
-#: knewstuff/engine.cpp:421
-msgid "Successfully uploaded new stuff."
-msgstr "成功上传了新宝物。"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3513
+#: tdecore/tdehw/tdehardwaredevices.cpp:3593
+#: tdecore/tdehw/tdehardwaredevices.cpp:3605
+#, fuzzy
+msgid "Unknown PCI Device"
+msgstr "未知字段"
 
-#: knewstuff/knewstuffbutton.cpp:49
-msgid "Download New Stuff"
-msgstr "下载新宝物"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3623
+#: tdecore/tdehw/tdehardwaredevices.cpp:3703
+#: tdecore/tdehw/tdehardwaredevices.cpp:3715
+#, fuzzy
+msgid "Unknown USB Device"
+msgstr "未知字段"
 
-#: knewstuff/knewstuffsecure.cpp:83
-msgid ""
-"There was an error with the downloaded resource tarball file. Possible causes "
-"are damaged archive or invalid directory structure in the archive."
-msgstr "下载的资源 tarball 文件有错。可能的原因是存档文件已损坏或者存档中的目录结构无效。"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3744
+#: tdecore/tdehw/tdehardwaredevices.cpp:3785
+#, fuzzy
+msgid "Unknown PNP Device"
+msgstr "未知字段"
 
-#: knewstuff/knewstuffsecure.cpp:83
-msgid "Resource Installation Error"
-msgstr "资源安装错误"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3814
+#: tdecore/tdehw/tdehardwaredevices.cpp:3855
+msgid "Unknown Monitor Device"
+msgstr ""
 
-#: knewstuff/knewstuffsecure.cpp:94
-msgid "No keys were found."
-msgstr "未找到密钥。"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3944
+#, fuzzy
+msgid "Root"
+msgstr "无 CA 根"
 
-#: knewstuff/knewstuffsecure.cpp:99
-msgid "The validation failed for unknown reason."
-msgstr "由于未知原因，校验失败。"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3947
+#, fuzzy
+msgid "System Root"
+msgstr "系统菜单"
 
-#: knewstuff/knewstuffsecure.cpp:106
-msgid "The MD5SUM check failed, the archive might be broken."
-msgstr "MD5SUM 校验失败，存档可能已损坏。"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3950
+msgid "CPU"
+msgstr ""
 
-#: knewstuff/knewstuffsecure.cpp:111
-msgid "The signature is bad, the archive might be broken or altered."
-msgstr "签名无效，存档可能已损坏或已被篡改。"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3953
+#, fuzzy
+msgid "Graphics Processor"
+msgstr "地理位置"
 
-#: knewstuff/knewstuffsecure.cpp:121
-msgid "The signature is valid, but untrusted."
-msgstr "签名有效，但不可信。"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3956
+msgid "RAM"
+msgstr ""
 
-#: knewstuff/knewstuffsecure.cpp:127
-msgid "The signature is unknown."
-msgstr "签名未知。"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3959
+msgid "Bus"
+msgstr ""
 
-#: knewstuff/knewstuffsecure.cpp:131
-msgid ""
-"The resource was signed with key <i>0x%1</i>, belonging to <i>%2 &lt;%3&gt;</i>"
-"."
-msgstr "资源用密钥 <i>0x%1</i> 签名，该密钥属于 <i>%2 &lt;%3&gt;</i>。"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3962
+msgid "I2C Bus"
+msgstr ""
 
-#: knewstuff/knewstuffsecure.cpp:137
-msgid ""
-"<qt>There is a problem with the resource file you have downloaded. The errors "
-"are :<b>%1</b>"
-"<br>%2"
-"<br>"
-"<br>Installation of the resource is <b>not recommended</b>."
-"<br>"
-"<br>Do you want to proceed with the installation?</qt>"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3965
+msgid "MDIO Bus"
 msgstr ""
-"<qt>您下载的资源文件有问题。出现的错误为：<b>%1</b>"
-"<br>%2"
-"<br>"
-"<br><b>不推荐</b>安装该资源。"
-"<br>"
-"<br>您是否想要继续安装？</qt>"
 
-#: knewstuff/knewstuffsecure.cpp:137
-msgid "Problematic Resource File"
-msgstr "有问题的资源文件"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3968
+#, fuzzy
+msgid "Mainboard"
+msgstr "主工具栏"
 
-#: knewstuff/knewstuffsecure.cpp:140
-msgid "<qt>%1<br><br>Press OK to install it.</qt>"
-msgstr "<qt>%1<br><br>单击确定可安装。</qt>"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3971
+msgid "Disk"
+msgstr ""
 
-#: knewstuff/knewstuffsecure.cpp:140
-msgid "Valid Resource"
-msgstr "有效的资源"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3974
+msgid "SCSI"
+msgstr ""
 
-#: knewstuff/knewstuffsecure.cpp:190
-msgid "The signing failed for unknown reason."
-msgstr "签名失败，原因未知。"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3977
+msgid "Storage Controller"
+msgstr ""
 
-#: knewstuff/knewstuffsecure.cpp:195
-msgid ""
-"There are no keys usable for signing or you did not entered the correct "
-"passphrase.\n"
-"Proceed without signing the resource?"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3980
+msgid "Mouse"
 msgstr ""
-"没有可用于签名的密钥，或者您没有输入正确的密码句。\n"
-"不签名资源而继续吗？"
 
-#: knewstuff/security.cpp:63
-msgid ""
-"<qt>Cannot start <i>gpg</i> and retrieve the available keys. Make sure that <i>"
-"gpg</i> is installed, otherwise verification of downloaded resources will not "
-"be possible.</qt>"
-msgstr "<qt>无法启动 <i>gpg</i> 获取可用的密钥。请确定 <i>gpg</i> 已安装，否则将无法校验下载的资源。</qt>"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3983
+msgid "Keyboard"
+msgstr ""
 
-#: knewstuff/security.cpp:177
-msgid ""
-"<qt>Enter passphrase for key <b>0x%1</b>, belonging to"
-"<br><i>%2&lt;%3&gt;</i>:</qt>"
-msgstr "<qt>输入密钥 <b>0x%1</b> 的密码句，该密钥属于 <br><i>%2&lt;%3&gt;</i>：</qt>"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3986
+msgid "HID"
+msgstr ""
 
-#: knewstuff/security.cpp:257
-msgid ""
-"<qt>Cannot start <i>gpg</i> and check the validity of the file. Make sure that "
-"<i>gpg</i> is installed, otherwise verification of downloaded resources will "
-"not be possible.</qt>"
-msgstr "<qt>无法启动 <i>gpg</i> 检查文件的有效性。请确定 <i>gpg</i> 已安装，否则将无法校验下载的资源。</qt>"
+#: tdeabc/phonenumber.cpp:178 tdecore/tdehw/tdehardwaredevices.cpp:3989
+msgid "Modem"
+msgstr "调制解调器"
 
-#: knewstuff/security.cpp:317
-msgid "Select Signing Key"
-msgstr "选择签名密钥"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3992
+msgid "Monitor and Display"
+msgstr ""
 
-#: knewstuff/security.cpp:317
-msgid "Key used for signing:"
-msgstr "用于签名的密钥："
+#: tdecore/tdehw/tdehardwaredevices.cpp:3995
+msgid "Network"
+msgstr ""
 
-#: knewstuff/security.cpp:338
-msgid ""
-"<qt>Cannot start <i>gpg</i> and sign the file. Make sure that <i>gpg</i> "
-"is installed, otherwise signing of the resources will not be possible.</qt>"
-msgstr "<qt>无法启动 <i>gpg</i> 并签名文件。请确定 <i>gpg</i> 已安装，否则将对资源签名。</qt>"
+#: tdecore/tdehw/tdehardwaredevices.cpp:3998
+#, fuzzy
+msgid "Printer"
+msgstr "打印"
 
-#: knewstuff/ghns.cpp:50
-msgid "Get hot new stuff:"
-msgstr "获得百宝箱："
+#: tdecore/tdehw/tdehardwaredevices.cpp:4001
+msgid "Scanner"
+msgstr ""
 
-#: knewstuff/tdehotnewstuff.cpp:31
-msgid "Display only media of this type"
-msgstr "只显示此类型的媒体"
+#: tdeabc/addressee.cpp:936 tdecore/tdehw/tdehardwaredevices.cpp:4004
+msgid "Sound"
+msgstr "声音"
 
-#: knewstuff/tdehotnewstuff.cpp:32
-msgid "Provider list to use"
-msgstr "要使用的提供者列表"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4007
+#, fuzzy
+msgid "Video Capture"
+msgstr "视频工具栏"
 
-#: knewstuff/providerdialog.cpp:53
-msgid "Hot New Stuff Providers"
-msgstr "百宝箱提供者"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4010
+msgid "IEEE1394"
+msgstr ""
 
-#: knewstuff/providerdialog.cpp:61
-msgid "Please select one of the providers listed below:"
-msgstr "请从下面列出的提供者中选择一个："
+#: tdecore/tdehw/tdehardwaredevices.cpp:4013
+msgid "PCMCIA"
+msgstr ""
 
-#: knewstuff/providerdialog.cpp:88
-msgid "No provider selected."
-msgstr "没有选择提供者。"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4016
+msgid "Camera"
+msgstr ""
 
-#: tdeui/kkeydialog.cpp:321
-msgid "Clear Search"
-msgstr "清除搜索"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4019
+#, fuzzy
+msgid "Text I/O"
+msgstr "仅文字"
 
-#: tdeui/kkeydialog.cpp:324
-msgid "&Search:"
-msgstr "搜索(&S)："
+#: tdecore/tdehw/tdehardwaredevices.cpp:4022
+msgid "Serial Communications Controller"
+msgstr ""
 
-#: tdeui/kkeydialog.cpp:331
-msgid ""
-"Search interactively for shortcut names (e.g. Copy) or combination of keys "
-"(e.g. Ctrl+C) by typing them here."
-msgstr "交互式搜索快捷键名称(如复制)或者按键组合(如 Ctrl+C)，只需在此输入。"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4025
+msgid "Parallel Port"
+msgstr ""
 
-#: tdeui/kkeydialog.cpp:354
-msgid ""
-"Here you can see a list of key bindings, i.e. associations between actions "
-"(e.g. 'Copy') shown in the left column and keys or combination of keys (e.g. "
-"Ctrl+V) shown in the right column."
-msgstr "在此您可以看到键关联的列表，也就是左边显示的动作(例如“复制”)和右边显示的键或组合键(例如Ctrl+V)之间的关联。"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4028
+msgid "Peripheral"
+msgstr ""
 
-#: tdeui/kkeydialog.cpp:363
-msgid "Action"
-msgstr "动作"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4031
+#, fuzzy
+msgid "Backlight"
+msgstr "后退"
 
-#: tdeui/kkeydialog.cpp:364
-msgid "Shortcut"
-msgstr "快捷键"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4034
+msgid "Battery"
+msgstr ""
 
-#: tdeui/kkeydialog.cpp:365
-msgid "Alternate"
-msgstr "备选"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4037
+msgid "Power Supply"
+msgstr ""
 
-#: tdeui/kkeydialog.cpp:380
-msgid "Shortcut for Selected Action"
-msgstr "选中动作的快捷键"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4040
+#, fuzzy
+msgid "Docking Station"
+msgstr "方向"
 
-#: tdeui/kkeydialog.cpp:393
-msgid ""
-"_: no key\n"
-"&None"
-msgstr "无(&N)"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4043
+#, fuzzy
+msgid "Thermal Sensor"
+msgstr "常规设置"
 
-#: tdeui/kkeydialog.cpp:398
-msgid "The selected action will not be associated with any key."
-msgstr "选中的动作不会和任何键关联。"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4046
+msgid "Thermal Control"
+msgstr ""
 
-#: tdeui/kkeydialog.cpp:401
-msgid ""
-"_: default key\n"
-"De&fault"
-msgstr "默认(&F)"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4052
+msgid "Bridge"
+msgstr ""
 
-#: tdeui/kkeydialog.cpp:406
-msgid ""
-"This will bind the default key to the selected action. Usually a reasonable "
-"choice."
-msgstr "这会将默认键关联到选中的动作。通常是一个较合理的选择。"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4055
+msgid "Platform"
+msgstr ""
 
-#: tdeui/kkeydialog.cpp:409
-msgid "C&ustom"
-msgstr "自定义(&U)"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4058
+msgid "Cryptography"
+msgstr ""
 
-#: tdeui/kkeydialog.cpp:414
-msgid ""
-"If this option is selected you can create a customized key binding for the "
-"selected action using the buttons below."
-msgstr "如果选中了该选项，您可以用下面的按钮为选中的动作创建一个定制的组合键。"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4061
+msgid "Platform Event"
+msgstr ""
 
-#: tdeui/kkeydialog.cpp:428
-msgid ""
-"Use this button to choose a new shortcut key. Once you click it, you can press "
-"the key-combination which you would like to be assigned to the currently "
-"selected action."
-msgstr "使用该按钮来选择新的快捷键。一旦您点击它，您可以按下您想要指派给当前选中动作的组合键。"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4064
+#, fuzzy
+msgid "Platform Input"
+msgstr "清除输入"
 
-#: tdeui/kkeydialog.cpp:470
-msgid "Shortcuts"
-msgstr "快捷键"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4067
+msgid "Plug and Play"
+msgstr ""
 
-#: tdeui/kkeydialog.cpp:536
-msgid "Default key:"
-msgstr "默认键："
+#: tdecore/tdehw/tdehardwaredevices.cpp:4070
+#, fuzzy
+msgid "Other ACPI"
+msgstr "其它"
 
-#: tdeui/kkeybutton.cpp:89 tdeui/kkeydialog.cpp:536 tdeui/klineedit.cpp:889
-msgid "None"
-msgstr "无"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4073
+#, fuzzy
+msgid "Other USB"
+msgstr "其它"
 
-#: tdeui/kkeydialog.cpp:715
-msgid ""
-"In order to use the '%1' key as a shortcut, it must be combined with the Win, "
-"Alt, Ctrl, and/or Shift keys."
+#: tdecore/tdehw/tdehardwaredevices.cpp:4076
+msgid "Other Multimedia"
 msgstr ""
-"要使用“%1”键作为快捷键，它必须带有\n"
-"Meta、Alt、Ctrl 和(或) Shift 键。"
 
-#: tdeui/kkeydialog.cpp:718
-msgid "Invalid Shortcut Key"
-msgstr "无效快捷键"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4079
+msgid "Other Peripheral"
+msgstr ""
 
-#: tdeui/kkeydialog.cpp:943
-msgid ""
-"The '%1' key combination has already been allocated to the \"%2\" action.\n"
-"Please choose a unique key combination."
+#: tdecore/tdehw/tdehardwaredevices.cpp:4082
+msgid "Other Sensor"
 msgstr ""
-"按键组合“%1”已经被分配给“%2”动作。\n"
-"请选择一个独特的按键组合。"
 
-#: tdeui/kkeydialog.cpp:958
-msgid "Conflict with Standard Application Shortcut"
-msgstr "和标准程序快捷键冲突"
+#: tdecore/tdehw/tdehardwaredevices.cpp:4085
+msgid "Other Virtual"
+msgstr ""
 
-#: tdeui/kkeydialog.cpp:959
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1470
 msgid ""
-"The '%1' key combination has already been allocated to the standard action "
-"\"%2\".\n"
-"Do you want to reassign it from that action to the current one?"
+"Connection attempt failed!"
+"<br>Secrets were required to establish a connection, but no secrets were "
+"available."
 msgstr ""
-"组合键“%1”已经被分配给标准动作“%2”。\n"
-"您是否想要将其重新分配给当前操作？"
-
-#: tdeui/kkeydialog.cpp:964
-msgid "Conflict with Global Shortcut"
-msgstr "和全局快捷键冲突"
 
-#: tdeui/kkeydialog.cpp:965
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1479
 msgid ""
-"The '%1' key combination has already been allocated to the global action "
-"\"%2\".\n"
-"Do you want to reassign it from that action to the current one?"
+"Connection attempt failed!"
+"<br>The supplicant failed while attempting to establish a wireless connection."
 msgstr ""
-"按键组合“%1”已经被分配给全局动作“%2”。\n"
-"您是否想要将其重新分配给当前操作？"
 
-#: tdeui/kkeydialog.cpp:970
-msgid "Key Conflict"
-msgstr "按键冲突"
-
-#: tdeui/kkeydialog.cpp:971
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1482
 msgid ""
-"The '%1' key combination has already been allocated to the \"%2\" action.\n"
-"Do you want to reassign it from that action to the current one?"
+"Connection attempt failed!"
+"<br>The supplicant timed out while attempting to establish a wireless "
+"connection."
 msgstr ""
-"按键组合“%1”已经被分配给动作“%2”。\n"
-"您是否想要将其重新分配给当前操作？"
 
-#: tdeui/kkeydialog.cpp:977
-msgid "Reassign"
-msgstr "重新指派"
-
-#: tdeui/kkeydialog.cpp:1091 tdeui/kkeydialog.cpp:1103
-msgid "Configure Shortcuts"
-msgstr "配置快捷键"
-
-#: tdeui/ktabbar.cpp:196
-msgid "Close this tab"
-msgstr "关闭此标签"
-
-#: tdeui/kpixmapregionselectordialog.cpp:28
-msgid "Select Region of Image"
-msgstr "选择图像范围"
-
-#: tdeui/kpixmapregionselectordialog.cpp:31
-msgid "Please click and drag on the image to select the region of interest:"
-msgstr "请单击并拖曳图像以便选择您感兴趣的范围："
-
-#: tdeui/kswitchlanguagedialog.cpp:90
-msgid "Switch application language"
-msgstr "切换应用程序语言"
-
-#: tdeui/kswitchlanguagedialog.cpp:96
-msgid "Please choose language which should be used for this application"
-msgstr "请此应用程序应使用的语言"
-
-#: tdeui/kswitchlanguagedialog.cpp:123
-msgid "Add fallback language"
-msgstr "添加后备语言"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1485
+msgid "Connection attempt failed!<br>The PPP client failed to start."
+msgstr ""
 
-#: tdeui/kswitchlanguagedialog.cpp:124
-msgid ""
-"Adds one more language which will be used if other translations do not contain "
-"proper translation"
-msgstr "如果所选应用程序不包含指定语言的翻译，在此指定的一种或多种语言将会顺序使用。"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1488
+msgid "Connection attempt failed!<br>The PPP client was disconnected."
+msgstr ""
 
-#: tdeui/kswitchlanguagedialog.cpp:222
-msgid ""
-"Language for this application has been changed. The change will take effect "
-"upon next start of application"
-msgstr "此应用程序所使用的语言已更改。更改将会在应用程序下次启动时生效"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1491
+msgid "Connection attempt failed!<br>Unknown PPP failure."
+msgstr ""
 
-#: tdeui/kswitchlanguagedialog.cpp:223
-msgid "Application language changed"
-msgstr "应用程序语言已更改"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1494
+msgid "Connection attempt failed!<br>The DHCP client failed to start."
+msgstr ""
 
-#: tdeui/kswitchlanguagedialog.cpp:282
-msgid "Primary language:"
-msgstr "首选语言："
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1497
+msgid "Connection attempt failed!<br>The DHCP client encountered an error."
+msgstr ""
 
-#: tdeui/kswitchlanguagedialog.cpp:282
-msgid "Fallback language:"
-msgstr "后备语言："
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1500
+msgid "Connection attempt failed!<br>Uknown DHCP failure."
+msgstr ""
 
-#: tdeui/kswitchlanguagedialog.cpp:316
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1503
 msgid ""
-"This is main application language which will be used first before any other "
-"languages"
-msgstr "这种语言是主要应用程序语言，该语言将会在其它语言之前被使用"
+"Connection attempt failed!"
+"<br>The connection sharing service failed to start."
+msgstr ""
 
-#: tdeui/kswitchlanguagedialog.cpp:320
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1506
 msgid ""
-"This is language which will be used if any previous languages does not contain "
-"proper translation"
-msgstr "当以上语言都不包含相应的翻译时，将使用此语言的翻译"
-
-#: tdeui/ksconfig.cpp:102
-msgid "Create &root/affix combinations not in dictionary"
-msgstr "创建字典中没有的词根或词缀复合词(&R)"
-
-#: tdeui/ksconfig.cpp:107
-msgid "Consider run-together &words as spelling errors"
-msgstr "把连在一起的词认作拼写错误(&W)"
-
-#: tdeui/ksconfig.cpp:118
-msgid "&Dictionary:"
-msgstr "字典(&D)："
-
-#: tdeui/ksconfig.cpp:143
-msgid "&Encoding:"
-msgstr "编码(&E)："
-
-#: tdeui/ksconfig.cpp:148
-msgid "International Ispell"
-msgstr "国际语言 Ispell"
+"Connection attempt failed!"
+"<br>The connection sharing service encountered an error."
+msgstr ""
 
-#: tdeui/ksconfig.cpp:149
-msgid "Aspell"
-msgstr "Aspell"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1509
+msgid "Connection attempt failed!<br>The AutoIP service failed to start."
+msgstr ""
 
-#: tdeui/ksconfig.cpp:150
-msgid "Hspell"
-msgstr "Hspell"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1512
+msgid "Connection attempt failed!<br>The AutoIP service encountered an error."
+msgstr ""
 
-#: tdeui/ksconfig.cpp:151
-msgid "Zemberek"
-msgstr "Zemberek"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1515
+msgid "Connection attempt failed!<br>Unknown AutoIP failure."
+msgstr ""
 
-#: tdeui/ksconfig.cpp:156
-msgid "&Client:"
-msgstr "客户(&C)："
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1518
+msgid "Connection attempt failed!<br>Modem was busy."
+msgstr ""
 
-#: tdeui/ksconfig.cpp:297
-msgid "Spanish"
-msgstr "西班牙语"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1521
+msgid "Connection attempt failed!<br>No dial tone."
+msgstr ""
 
-#: tdeui/ksconfig.cpp:300
-msgid "Danish"
-msgstr "丹麦语"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1524
+msgid "Connection attempt failed!<br>No carrier detected."
+msgstr ""
 
-#: tdeui/ksconfig.cpp:303
-msgid "German"
-msgstr "德语"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1527
+msgid "Connection attempt failed!<br>Modem timed out while dialing."
+msgstr ""
 
-#: tdeui/ksconfig.cpp:306
-msgid "German (new spelling)"
-msgstr "德语 (新拼写)"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1530
+msgid "Connection attempt failed!<br>The modem failed to dial."
+msgstr ""
 
-#: tdeui/ksconfig.cpp:309
-msgid "Brazilian Portuguese"
-msgstr "巴西葡萄牙语"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1533
+msgid "Connection attempt failed!<br>Modem initialization failed."
+msgstr ""
 
-#: tdeui/ksconfig.cpp:312
-msgid "Portuguese"
-msgstr "葡萄牙语"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1536
+msgid "Connection attempt failed!<br>GSM APN failure."
+msgstr ""
 
-#: tdeui/ksconfig.cpp:315
-msgid "Esperanto"
-msgstr "世界语"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1539
+msgid ""
+"Connection attempt failed!"
+"<br>GSM registration failed to search for networks."
+msgstr ""
 
-#: tdeui/ksconfig.cpp:318
-msgid "Norwegian"
-msgstr "挪威语"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1542
+msgid "Connection attempt failed!<br>GSM registration attempt was rejected."
+msgstr ""
 
-#: tdeui/ksconfig.cpp:321
-msgid "Polish"
-msgstr "波兰语"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1545
+msgid "Connection attempt failed!<br>GSM registration attempt timed out."
+msgstr ""
 
-#: tdeui/ksconfig.cpp:324 tdehtml/tdehtml_part.cpp:288
-msgid "Russian"
-msgstr "俄语"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1548
+msgid "Connection attempt failed!<br>GSM registration attempt failed."
+msgstr ""
 
-#: tdeui/ksconfig.cpp:327
-msgid "Slovenian"
-msgstr "斯洛文尼亚语"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1551
+msgid "Connection attempt failed!<br>GSM PIN check failed."
+msgstr ""
 
-#: tdeui/ksconfig.cpp:330
-msgid "Slovak"
-msgstr "斯洛伐克语"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1554
+msgid "Connection attempt failed!<br>Network device firmware is missing."
+msgstr ""
 
-#: tdeui/ksconfig.cpp:333
-msgid "Czech"
-msgstr "捷克语"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1557
+msgid "Connection attempt failed!<br>Network device was removed."
+msgstr ""
 
-#: tdeui/ksconfig.cpp:336
-msgid "Swedish"
-msgstr "瑞典语"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1560
+msgid "Connection attempt failed!<br>Network device is sleeping."
+msgstr ""
 
-#: tdeui/ksconfig.cpp:339
-msgid "Swiss German"
-msgstr "瑞士德语"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1563
+msgid "Connection attempt failed!<br>Connection was removed."
+msgstr ""
 
-#: tdeui/ksconfig.cpp:342 tdehtml/tdehtml_part.cpp:291
-msgid "Ukrainian"
-msgstr "乌克兰语"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1566
+msgid "Connection attempt failed!<br>User requested device disconnection."
+msgstr ""
 
-#: tdeui/ksconfig.cpp:345
-msgid "Lithuanian"
-msgstr "立陶宛语"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1569
+msgid "Connection attempt failed!<br>Carrier or link status changed."
+msgstr ""
 
-#: tdeui/ksconfig.cpp:348
-msgid "French"
-msgstr "法语"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1572
+msgid "Connection attempt failed!<br>Device and/or connection already active."
+msgstr ""
 
-#: tdeui/ksconfig.cpp:351
-msgid "Belarusian"
-msgstr "白俄罗斯语"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1575
+msgid "Connection attempt failed!<br>The supplicant is now available."
+msgstr ""
 
-#: tdeui/ksconfig.cpp:354
-msgid "Hungarian"
-msgstr "匈牙利语"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1578
+msgid "Connection attempt failed!<br>Requested modem was not found."
+msgstr ""
 
-#: tdeui/ksconfig.cpp:358
-msgid ""
-"_: Unknown ispell dictionary\n"
-"Unknown"
-msgstr "未知"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1581
+msgid "Connection attempt failed!<br>Bluetooth connection timeout."
+msgstr ""
 
-#: tdeui/ksconfig.cpp:440 tdeui/ksconfig.cpp:594
-msgid "ISpell Default"
-msgstr "ISpell 默认"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1584
+msgid "Connection attempt failed!<br>GSM SIM not inserted."
+msgstr ""
 
-#: tdeui/ksconfig.cpp:488 tdeui/ksconfig.cpp:642
-msgid ""
-"_: default spelling dictionary\n"
-"Default - %1 [%2]"
-msgstr "默认 - %1 [%2]"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1587
+msgid "Connection attempt failed!<br>GSM PIN required."
+msgstr ""
 
-#: tdeui/ksconfig.cpp:508 tdeui/ksconfig.cpp:668
-msgid "ASpell Default"
-msgstr "ASpell 默认"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1590
+msgid "Connection attempt failed!<br>GSM PUK required."
+msgstr ""
 
-#: tdeui/ksconfig.cpp:573 tdeui/ksconfig.cpp:733
-#, c-format
-msgid ""
-"_: default spelling dictionary\n"
-"Default - %1"
-msgstr "默认 - %1"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1593
+msgid "Connection attempt failed!<br>GSM SIM incorrect."
+msgstr ""
 
-#: tdeui/tdefontrequester.cpp:38
-msgid "Choose..."
-msgstr "选择..."
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1596
+msgid "Connection attempt failed!<br>Incorrect Infiniband mode."
+msgstr ""
 
-#: tdeui/tdefontrequester.cpp:102
-msgid "Click to select a font"
-msgstr "单击可选择字体"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1599
+msgid "Connection attempt failed!<br>Dependency failure."
+msgstr ""
 
-#: tdeui/tdefontrequester.cpp:109
-msgid "Preview of the selected font"
-msgstr "选中字体的预览"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1602
+msgid "Connection attempt failed!<br>Unknown bridge failure."
+msgstr ""
 
-#: tdeui/tdefontrequester.cpp:111
-msgid ""
-"This is a preview of the selected font. You can change it by clicking the "
-"\"Choose...\" button."
-msgstr "这是所选择的字体的预览。您可以点击“选择...”按钮来更改它。"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1605
+msgid "Connection attempt failed!<br>ModemManager not available."
+msgstr ""
 
-#: tdeui/tdefontrequester.cpp:117
-msgid "Preview of the \"%1\" font"
-msgstr "字体“%1”的预览"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1608
+msgid "Connection attempt failed!<br>SSID not found."
+msgstr ""
 
-#: tdeui/tdefontrequester.cpp:119
-msgid ""
-"This is a preview of the \"%1\" font. You can change it by clicking the "
-"\"Choose...\" button."
-msgstr "这是字体“%1”的预览。您可以点击“选择...”按钮来更改它。"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1611
+msgid "Connection attempt failed!<br>Secondary connection failure."
+msgstr ""
 
-#. i18n "??" is displayed as (pseudo-)version when no data is known about the application
-#: tdeui/tdeaboutapplication.cpp:63
-msgid "??"
-msgstr "??"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1793
+msgid "NetworkManager"
+msgstr ""
 
-#: tdeui/tdeaboutapplication.cpp:67
-msgid ""
-"No information available.\n"
-"The supplied TDEAboutData object does not exist."
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4800
+msgid "Connection name is invalid"
 msgstr ""
-"抱歉，没有可用的信息。\n"
-"提供的 TDEAboutData 对象不存在。"
 
-#: tdeui/tdeaboutapplication.cpp:107
-msgid "A&uthor"
-msgstr "作者(&U)"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4812
+msgid "IPv4 address is invalid"
+msgstr ""
 
-#: tdeui/tdeaboutapplication.cpp:107
-msgid "A&uthors"
-msgstr "作者(&U)"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4821
+msgid "IPv6 address is invalid"
+msgstr ""
 
-#: tdeui/tdeaboutapplication.cpp:117
-msgid ""
-"Please use <a href=\"http://bugs.kde.org\">http://bugs.kde.org</a> "
-"to report bugs.\n"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4833
+msgid "No SSID provided"
 msgstr ""
-"请使用 <a href=\"http://bugs.kde.org\">http://bugs.kde.org</a> 报告错误。\n"
 
-#: tdeui/tdeaboutapplication.cpp:121 tdeui/tdeaboutapplication.cpp:124
-msgid ""
-"Please report bugs to <a href=\"mailto:%1\">%2</a>.\n"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4843
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4878
+msgid "WEP key 0 has invalid length"
 msgstr ""
-"请将错误报告给 <a href=\"mailto:%1\">%2</a>。\n"
 
-#: tdeui/tdeaboutapplication.cpp:149
-msgid "&Thanks To"
-msgstr "感谢(&T)"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4850
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4885
+msgid "WEP key 1 has invalid length"
+msgstr ""
 
-#: tdeui/tdeaboutapplication.cpp:176
-msgid "T&ranslation"
-msgstr "翻译(&R)"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4857
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4892
+msgid "WEP key 2 has invalid length"
+msgstr ""
 
-#: tdeui/tdeaboutapplication.cpp:181
-msgid "&License Agreement"
-msgstr "授权协议(&L)"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4864
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4899
+msgid "WEP key 3 has invalid length"
+msgstr ""
 
-#: tdeui/tdefontdialog.cpp:101
-msgid "Here you can choose the font to be used."
-msgstr "在此选择要使用的字体。"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4870
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4905
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4912
+msgid "No WEP key(s) provided"
+msgstr ""
 
-#: tdeui/tdefontdialog.cpp:113
-msgid "Requested Font"
-msgstr "要求的字体"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4920
+msgid "LEAP username and/or password not provided"
+msgstr ""
 
-#: tdeui/tdefontdialog.cpp:136
-msgid "Change font family?"
-msgstr "更改字体族？"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4931
+msgid "Hexadecimal length PSK contains non-hexadecimal characters"
+msgstr ""
 
-#: tdeui/tdefontdialog.cpp:138
-msgid "Enable this checkbox to change the font family settings."
-msgstr "启用该选项来更改字体族设置。"
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4937
+#, fuzzy
+msgid "No PSK provided"
+msgstr "没有选择提供者。"
 
-#: tdeui/kcharselect.cpp:383 tdeui/tdefontdialog.cpp:144
-msgid "Font:"
-msgstr "字体："
+#: tdecore/network/tdesocketaddress.cpp:625
+#, c-format
+msgid ""
+"_: 1: the unknown socket address family number\n"
+"Unknown family %1"
+msgstr "未知的家庭号码 %1"
 
-#: tdeui/tdefontdialog.cpp:151
-msgid "Font style"
-msgstr "字体样式"
+#: tdecore/network/kresolver.cpp:558
+msgid "requested family not supported for this host name"
+msgstr "此主机名不支持请求的家族"
 
-#: tdeui/tdefontdialog.cpp:155
-msgid "Change font style?"
-msgstr "更改字体样式？"
+#: tdecore/network/kresolver.cpp:561
+msgid "invalid flags"
+msgstr "无效的标志"
 
-#: tdeui/tdefontdialog.cpp:157
-msgid "Enable this checkbox to change the font style settings."
-msgstr "启用该选项来更改字体样式设置。"
+#: tdecore/network/kresolver.cpp:564
+msgid "requested family not supported"
+msgstr "不支持请求的家族"
 
-#: tdeui/tdefontdialog.cpp:163
-msgid "Font style:"
-msgstr "字体样式："
+#: tdecore/network/kresolver.cpp:565
+msgid "requested service not supported for this socket type"
+msgstr "请求的服务不支持此套接字类型"
 
-#: tdeui/tdefontdialog.cpp:171
-msgid "Size"
-msgstr "大小"
+#: tdecore/network/kresolver.cpp:566
+msgid "requested socket type not supported"
+msgstr "请求的套接字类型不支持"
 
-#: tdeui/tdefontdialog.cpp:175
-msgid "Change font size?"
-msgstr "更改字体大小？"
+#: tdecore/network/kresolver.cpp:567
+msgid "unknown error"
+msgstr "未知的错误"
 
-#: tdeui/tdefontdialog.cpp:177
-msgid "Enable this checkbox to change the font size settings."
-msgstr "使用该选项来修改字体大小设置。"
+#: tdecore/network/kresolver.cpp:569
+#, c-format
+msgid ""
+"_: 1: the i18n'ed system error code, from errno\n"
+"system error: %1"
+msgstr "系统错误：%1"
 
-#: tdeui/tdefontdialog.cpp:183
-msgid "Size:"
-msgstr "大小："
+#: tdecore/network/kresolver.cpp:574
+msgid "request was canceled"
+msgstr "请求已取消"
 
-#: tdeui/tdefontdialog.cpp:199
-msgid "Here you can choose the font family to be used."
-msgstr "在此选择要使用的字体族。"
+#: tdecore/network/tdesocketbase.cpp:172
+msgid ""
+"_: Socket error code NoError\n"
+"no error"
+msgstr "无错误"
 
-#: tdeui/tdefontdialog.cpp:221
-msgid "Here you can choose the font style to be used."
-msgstr "在此选择要使用的字体样式。"
+#: tdecore/network/tdesocketbase.cpp:177
+msgid ""
+"_: Socket error code LookupFailure\n"
+"name lookup has failed"
+msgstr "名称查阅失败"
 
-#: tdeui/tdefontdialog.cpp:224 tdeui/tdefontdialog.cpp:473
-#: tdeui/tdefontdialog.cpp:475 tdeui/tdefontdialog.cpp:484
-#: tdeui/tdefontdialog.cpp:485
-msgid "Regular"
-msgstr "常规"
+#: tdecore/network/tdesocketbase.cpp:182
+msgid ""
+"_: Socket error code AddressInUse\n"
+"address already in use"
+msgstr "地址已在使用中"
 
-#: tdeui/tdefontdialog.cpp:226
-msgid "Bold"
-msgstr "粗体"
+#: tdecore/network/tdesocketbase.cpp:187
+msgid ""
+"_: Socket error code AlreadyBound\n"
+"socket is already bound"
+msgstr "套接字已绑定"
 
-#: tdeui/tdefontdialog.cpp:227
-msgid "Bold Italic"
-msgstr "粗斜体"
+#: tdecore/network/tdesocketbase.cpp:192
+msgid ""
+"_: Socket error code AlreadyCreated\n"
+"socket is already created"
+msgstr "套接字已创建"
 
-#: tdeui/tdefontdialog.cpp:244
-msgid "Relative"
-msgstr "相对"
+#: tdecore/network/tdesocketbase.cpp:197
+msgid ""
+"_: Socket error code NotBound\n"
+"socket is not bound"
+msgstr "套接字未绑定"
 
-#: tdeui/tdefontdialog.cpp:246
-msgid "Font size<br><i>fixed</i> or <i>relative</i><br>to environment"
-msgstr "字体大小<br><i>固定</i>或<i>相对<i><br>于环境"
+#: tdecore/network/tdesocketbase.cpp:202
+msgid ""
+"_: Socket error code NotCreated\n"
+"socket has not been created"
+msgstr "套接字未创建"
 
-#: tdeui/tdefontdialog.cpp:248
+#: tdecore/network/tdesocketbase.cpp:207
 msgid ""
-"Here you can switch between fixed font size and font size to be calculated "
-"dynamically and adjusted to changing environment (e.g. widget dimensions, paper "
-"size)."
-msgstr "在此您可以选择使用固定大小字体，或根据环境(例如，构件大小、纸张大小等)动态计算。"
+"_: Socket error code WouldBlock\n"
+"operation would block"
+msgstr "操作将阻塞"
 
-#: tdeui/tdefontdialog.cpp:272
-msgid "Here you can choose the font size to be used."
-msgstr "在此选择要使用的字体大小。"
+#: tdecore/network/tdesocketbase.cpp:212
+msgid ""
+"_: Socket error code ConnectionRefused\n"
+"connection actively refused"
+msgstr "拒绝活动连接"
 
-#. i18n: This is a classical test phrase. (It contains all letters from A to Z.)
-#: tdeui/tdefontdialog.cpp:296
-msgid "The Quick Brown Fox Jumps Over The Lazy Dog"
-msgstr "The Quick Brown Fox 跳过那只懒狗"
+#: tdecore/network/tdesocketbase.cpp:217
+msgid ""
+"_: Socket error code ConnectionTimedOut\n"
+"connection timed out"
+msgstr "连接超时"
 
-#: tdeui/tdefontdialog.cpp:301
+#: tdecore/network/tdesocketbase.cpp:222
 msgid ""
-"This sample text illustrates the current settings. You may edit it to test "
-"special characters."
-msgstr "该示例文字显示当前的设置。您可以编辑它来测试特殊字符。"
+"_: Socket error code InProgress\n"
+"operation is already in progress"
+msgstr "操作已在进行中"
 
-#: tdeui/tdefontdialog.cpp:310 tdeui/tdefontdialog.cpp:320
-msgid "Actual Font"
-msgstr "实际字体"
+#: tdecore/network/tdesocketbase.cpp:227
+msgid ""
+"_: Socket error code NetFailure\n"
+"network failure occurred"
+msgstr "发生了网络错误"
 
-#: tdeui/tdeactionselector.cpp:69
-msgid "&Available:"
-msgstr "可用的动作(&A)："
+#: tdecore/network/tdesocketbase.cpp:232
+msgid ""
+"_: Socket error code NotSupported\n"
+"operation is not supported"
+msgstr "操作不支持"
 
-#: tdeui/tdeactionselector.cpp:84
-msgid "&Selected:"
-msgstr "已选(&S)："
+#: tdecore/network/tdesocketbase.cpp:237
+msgid ""
+"_: Socket error code Timeout\n"
+"timed operation timed out"
+msgstr "限时操作超时"
 
-#: tdeui/kcharselect.cpp:366
+#: tdecore/network/tdesocketbase.cpp:242
 msgid ""
-"_: Character\n"
-"<qt><font size=\"+4\" face=\"%1\">%2</font>"
-"<br>Unicode code point: U+%3"
-"<br>(In decimal: %4)"
-"<br>(Character: %5)</qt>"
-msgstr ""
-"<qt><font size=\"+4\" face=\"%1\">%2</font>"
-"<br>Unicode 代码点：U+%3"
-"<br>(十进制：%4)"
-"<br>(字符：%5)</qt>"
+"_: Socket error code UnknownError\n"
+"an unknown/unexpected error has happened"
+msgstr "发生了未知/意外错误"
 
-#: tdeui/kcharselect.cpp:394
-msgid "Table:"
-msgstr "表："
+#: tdecore/network/tdesocketbase.cpp:247
+msgid ""
+"_: Socket error code RemotelyDisconnected\n"
+"remote host closed connection"
+msgstr "远程主机关闭了连接"
 
-#: tdeui/kcharselect.cpp:404
-msgid "&Unicode code point:"
-msgstr "&Unicode 代码点："
+#: interfaces/tdescript/scriptmanager.cpp:106
+msgid "Unable to get KScript Runner for type \"%1\"."
+msgstr "无法获得类型 “%1” 的 KScript Runner。"
 
-#: tdeui/tdemessagebox.cpp:428 tdeui/tdemessagebox.cpp:479
-msgid "Question"
-msgstr "疑问"
+#: interfaces/tdescript/scriptmanager.cpp:106
+#: interfaces/tdescript/scriptmanager.cpp:129
+msgid "KScript Error"
+msgstr "KScript 错误"
 
-#: tdeui/tdemessagebox.cpp:442 tdeui/tdemessagebox.cpp:494
-#: tdeui/tdemessagebox.cpp:575 tdeui/tdemessagebox.cpp:647
-#: tdeui/tdemessagebox.cpp:723
-msgid "Do not ask again"
-msgstr "不再提问"
+#: interfaces/tdescript/scriptmanager.cpp:129
+msgid "Unable find script \"%1\"."
+msgstr "找不到脚本“%1”。"
 
-#: tdeui/tdeaboutdialog.cpp:1535 tdeui/khelpmenu.cpp:227
-#: tdeui/tdemessagebox.cpp:975
-#, c-format
-msgid "About %1"
-msgstr "关于 %1"
+#: interfaces/tdescript/scriptloader.cpp:40
+#, fuzzy
+msgid "KDE Scripts"
+msgstr "TDE 脚本"
 
-#: tdeui/klineedit.cpp:890
-msgid "Manual"
-msgstr "手动"
+#: interfaces/tdetexteditor/editorchooser.cpp:60
+msgid "System Default (%1)"
+msgstr "系统默认值(%1)"
 
-#: tdeui/klineedit.cpp:891
-msgid "Automatic"
-msgstr "自动"
+#: tderandr/ktimerdialog.cpp:154
+#, c-format
+msgid ""
+"_n: 1 second remaining:\n"
+"%n seconds remaining:"
+msgstr ""
 
-#: tdeui/klineedit.cpp:892
-msgid "Dropdown List"
-msgstr "下拉列表"
+#: tderandr/randr.cpp:260
+msgid "Confirm Display Setting Change"
+msgstr ""
 
-#: tdeui/klineedit.cpp:893
-msgid "Short Automatic"
-msgstr "半自动"
+#: tderandr/randr.cpp:264 tderandr/randr.cpp:856
+#, fuzzy
+msgid "&Accept Configuration"
+msgstr "配置"
 
-#: tdeui/klineedit.cpp:894
-msgid "Dropdown List && Automatic"
-msgstr "下拉列表和自动"
+#: tderandr/randr.cpp:265 tderandr/randr.cpp:857
+#, fuzzy
+msgid "&Return to Previous Configuration"
+msgstr "资源配置"
 
-#: tdeui/tdeabouttde.cpp:34
+#: tderandr/randr.cpp:267
 msgid ""
-"The <b>K Desktop Environment</b> is written and maintained by the TDE Team, a "
-"world-wide network of software engineers committed to <a "
-"href=\"http://www.gnu.org/philosophy/free-sw.html\">Free Software</a> "
-"development."
-"<br>"
-"<br>No single group, company or organization controls the TDE source code. "
-"Everyone is welcome to contribute to TDE."
-"<br>"
-"<br>Visit <A HREF=\"http://www.kde.org/\">http://www.kde.org</A> "
-"for more information on the TDE project. "
+"Your screen orientation, size and refresh rate have been changed to the "
+"requested settings. Please indicate whether you wish to keep this "
+"configuration. In 15 seconds the display will revert to your previous settings."
 msgstr ""
-"<b>K 桌面环境</b>由 TDE 团队编写和维护，该团队是一个由全世界联网的参与<a "
-"href=\"http://www.gnu.org/philosophy/free-sw.html\">自由软件</a>开发的工程师组成的组织。"
-"<br>"
-"<br>TDE 的源代码不受任何单独的团体、公司或机构控制。欢迎每个人对 TDE 作出贡献。"
-"<br>"
-"<br>访问 <A HREF=\"http://www.kde.org/\">http://www.kde.org/</A> "
-"来了解有关 TDE 计划的更多信息。"
 
-#: tdeui/tdeabouttde.cpp:43
+#: tderandr/randr.cpp:298
 msgid ""
-"Software can always be improved, and the TDE Team is ready to do so. However, "
-"you - the user - must tell us when something does not work as expected or could "
-"be done better."
-"<br>"
-"<br>The K Desktop Environment has a bug tracking system. Visit <A "
-"HREF=\"http://bugs.kde.org/\">http://bugs.kde.org</A> "
-"or use the \"Report Bug...\" dialog from the \"Help\" menu to report bugs."
-"<br>"
-"<br>If you have a suggestion for improvement then you are welcome to use the "
-"bug tracking system to register your wish. Make sure you use the severity "
-"called \"Wishlist\"."
+"New configuration:\n"
+"Resolution: %1 x %2\n"
+"Orientation: %3"
 msgstr ""
-"软件总是可以改进的，TDE 团队乐意这样做。然而，您 - 作为用户 - 必须在某些程序运行起来不如意或可以做得更好时告诉我们。"
-"<br>"
-"<br>K 桌面环境有一个错误跟踪系统，请访问 <A HREF=\"http://bugs.kde.org/\">"
-"http://bugs.kde.org/</A> 或使用“帮助”菜单的“报告错误”对话框来报告错误。"
-"<br>"
-"<br>如果您有改进的建议，欢迎使用错误跟踪系统来登记您的愿望，并确认您使用“愿望”严重程度。"
 
-#: tdeui/tdeabouttde.cpp:54
+#: tderandr/randr.cpp:303
 msgid ""
-"You do not have to be a software developer to be a member of the TDE team. You "
-"can join the national teams that translate program interfaces. You can provide "
-"graphics, themes, sounds, and improved documentation. You decide!"
-"<br>"
-"<br>Visit <A HREF=\"http://www.kde.org/jobs/\">http://www.kde.org/jobs/</A> "
-"for information on some projects in which you can participate."
-"<br>"
-"<br>If you need more information or documentation, then a visit to <A "
-"HREF=\"http://developer.kde.org/\">http://developer.kde.org</A> "
-"will provide you with what you need."
+"New configuration:\n"
+"Resolution: %1 x %2\n"
+"Orientation: %3\n"
+"Refresh rate: %4"
 msgstr ""
-"您不必是软件开发者就可以成为 TDE 组织的一员。您可以参加翻译程序界面的小组。您可以提供图片、主题、音效或改进文档。您可以自己决定！"
-"<br>"
-"<br>请访问 <A HREF=\"http://www.kde.org/jobs/\">http://www.kde.org/jobs/</A> "
-"来了解您可参与计划的信息。而要想参与 TDE 的简体中文翻译工作，请查看 <A HREF=\"http://i18n.linux.net.cn/\">"
-"http://i18n.linux.net.cn/</A>。"
-"<br>"
-"<br>如果您需要更多的信息或文档，请访问 <A HREF=\"http://developer.kde.org/\">"
-"http://developer.kde.org/</A>。"
 
-#: tdeui/tdeabouttde.cpp:67
-msgid ""
-"TDE is available free of charge, but making it is not free."
-"<br>"
-"<br>Thus, the TDE team formed the TDE e.V., a non-profit organization legally "
-"founded in Tuebingen, Germany. The TDE e.V. represents the TDE project in legal "
-"and financial matters. See <a href=\"http://www.kde-ev.org/\">"
-"http://www.kde-ev.org</a> for information on the TDE e.V."
-"<br>"
-"<br>The TDE team does need financial support. Most of the money is used to "
-"reimburse members and others on expenses they experienced when contributing to "
-"TDE. You are encouraged to support TDE through a financial donation, using one "
-"of the ways described at <a href=\"http://www.kde.org/support/\">"
-"http://www.kde.org/support/</a>."
-"<br>"
-"<br>Thank you very much in advance for your support."
+#: tderandr/randr.cpp:332 tderandr/randr.cpp:349
+#, fuzzy
+msgid "Normal"
+msgstr "还原"
+
+#: tderandr/randr.cpp:334
+msgid "Left (90 degrees)"
 msgstr ""
-"TDE 是免费的，但是开发的过程却不是免费的。"
-"<br>"
-"<br>为此，TDE 团队成立了 TDE 协会，一个在德国合法建立的非营利组织。TDE 协会在法律和财政方面代表了 TDE 计划。请参看 <a "
-"href=\"http://www.kde.org/kde-ev/\">http://www.kde.org/kde-ev/<a> "
-"中关于 TDE 协会的信息。"
-"<br>"
-"<br>TDE 团队的确需要资金支持。其中大部分的资金用于偿还成员和其它人在为 TDE 做出贡献的时候所付出的开支。我们鼓励您通过资金捐助来支持 "
-"TDE。详细的捐助方法在 <a href=\"http://www.kde.org/support/\">"
-"http://www.kde.org/support/</a> 上有描述。"
-"<br>"
-"<br>这里先行谢过了。"
 
-#: tdeui/tdeabouttde.cpp:81
-#, c-format
-msgid "K Desktop Environment. Release %1"
-msgstr "K 桌面环境 版本 %1"
+#: tderandr/randr.cpp:336
+msgid "Upside-down (180 degrees)"
+msgstr ""
 
-#: tdeui/tdeabouttde.cpp:83
-msgid ""
-"_: About TDE\n"
-"&About"
-msgstr "关于(&A)"
+#: tderandr/randr.cpp:338
+msgid "Right (270 degrees)"
+msgstr ""
 
-#: tdeui/tdeabouttde.cpp:84
-msgid "&Report Bugs or Wishes"
-msgstr "报告错误或愿望(&R)"
+#: tderandr/randr.cpp:340
+#, fuzzy
+msgid "Mirror horizontally"
+msgstr "水平"
 
-#: tdeui/tdeabouttde.cpp:85
-msgid "&Join the TDE Team"
-msgstr "加入 TDE 团队(&J)"
+#: tderandr/randr.cpp:342
+#, fuzzy
+msgid "Mirror vertically"
+msgstr "垂直平铺(&E)"
 
-#: tdeui/tdeabouttde.cpp:86
-msgid "&Support TDE"
-msgstr "支持 TDE(&S)"
+#: tderandr/randr.cpp:344 tderandr/randr.cpp:375
+#, fuzzy
+msgid "Unknown orientation"
+msgstr "方向"
 
-#: tdeui/kstdguiitem.cpp:110 tdehtml/java/kjavaappletserver.cpp:804
-msgid "&Yes"
-msgstr "是(&Y)"
+#: tderandr/randr.cpp:351
+#, fuzzy
+msgid "Rotated 90 degrees counterclockwise"
+msgstr "逆时针旋转(&C)"
 
-#: tdeui/kstdguiitem.cpp:115 tdehtml/java/kjavaappletserver.cpp:797
-msgid "&No"
-msgstr "否(&N)"
+#: tderandr/randr.cpp:353
+#, fuzzy
+msgid "Rotated 180 degrees counterclockwise"
+msgstr "逆时针旋转(&C)"
 
-#: tdeui/kstdguiitem.cpp:120
-msgid "Discard changes"
-msgstr "丢弃更改"
+#: tderandr/randr.cpp:355
+#, fuzzy
+msgid "Rotated 270 degrees counterclockwise"
+msgstr "逆时针旋转(&C)"
 
-#: tdeui/kstdguiitem.cpp:121
-msgid ""
-"Pressing this button will discard all recent changes made in this dialog"
-msgstr "按下该按钮将放弃在这个对话框中所做的修改"
+#: tderandr/randr.cpp:360
+msgid "Mirrored horizontally and vertically"
+msgstr ""
 
-#: tdeui/kstdguiitem.cpp:127
-msgid "Save data"
-msgstr "保存数据"
+#: tderandr/randr.cpp:362
+msgid "mirrored horizontally and vertically"
+msgstr ""
 
-#: tdeui/kstdguiitem.cpp:132
-msgid "&Do Not Save"
-msgstr "不保存(&D)"
+#: tderandr/randr.cpp:365
+#, fuzzy
+msgid "Mirrored horizontally"
+msgstr "水平扩展(&H)"
 
-#: tdeui/kstdguiitem.cpp:133
-msgid "Don't save data"
-msgstr "不保存数据"
+#: tderandr/randr.cpp:367
+#, fuzzy
+msgid "mirrored horizontally"
+msgstr "水平扩展(&H)"
 
-#: tdeui/kstdaction_p.h:44 tdeui/kstdguiitem.cpp:138
-msgid "Save &As..."
-msgstr "另存为(&A)..."
+#: tderandr/randr.cpp:370
+#, fuzzy
+msgid "Mirrored vertically"
+msgstr "垂直平铺(&E)"
 
-#: tdeui/kstdguiitem.cpp:139
-msgid "Save file with another name"
-msgstr "将文件保存为另外的名称"
+#: tderandr/randr.cpp:372
+#, fuzzy
+msgid "mirrored vertically"
+msgstr "垂直平铺(&E)"
 
-#: tdeui/kstdguiitem.cpp:144
-msgid "Apply changes"
-msgstr "应用更改"
+#: tderandr/randr.cpp:377
+#, fuzzy
+msgid "unknown orientation"
+msgstr "方向"
 
-#: tdeui/kstdguiitem.cpp:145
+#: tderandr/randr.cpp:519 tderandr/randr.cpp:524
 msgid ""
-"When clicking <b>Apply</b>, the settings will be handed over to the program, "
-"but the dialog will not be closed.\n"
-"Use this to try different settings."
+"_: Refresh rate in Hertz (Hz)\n"
+"%1 Hz"
 msgstr ""
-"当点击<b>应用</b>后，设置会被程序使用，但是对话框不会被关闭。\n"
-"请用它来尝试不同的设置。"
 
-#: tdeui/kstdguiitem.cpp:153
-msgid "Administrator &Mode..."
-msgstr "管理员模式(&M)..."
+#: tderandr/randr.cpp:693
+#, fuzzy
+msgid "No screens detected"
+msgstr "没有选择提供者。"
 
-#: tdeui/kstdguiitem.cpp:153
-msgid "Enter Administrator Mode"
-msgstr "进入管理员模式"
+#: tderandr/randr.cpp:852
+#, fuzzy
+msgid "Confirm Display Settings"
+msgstr "常规设置"
 
-#: tdeui/kstdguiitem.cpp:154
+#: tderandr/randr.cpp:859
 msgid ""
-"When clicking <b>Administrator Mode</b> you will be prompted for the "
-"administrator (root) password in order to make changes which require root "
-"privileges."
-msgstr "单击<b>管理员模式</b>之后，您需要输入管理员(root)的密码，以便进行需要 root 权限的更改。"
-
-#: tdeui/kstdguiitem.cpp:162
-msgid "Clear input"
-msgstr "清除输入"
-
-#: tdeui/kstdguiitem.cpp:163
-msgid "Clear the input in the edit field"
-msgstr "清除编辑区的输入"
+"Your display devices has been configured to match the settings shown above. "
+"Please indicate whether you wish to keep this configuration. In 15 seconds the "
+"display will revert to your previous settings."
+msgstr ""
 
-#: tdeui/kstdaction.cpp:62 tdeui/kstdguiitem.cpp:168
+#: tdeinit/tdelauncher_main.cpp:58
+#, fuzzy
 msgid ""
-"_: show help\n"
-"&Help"
-msgstr "帮助(&H)"
-
-#: tdeui/kstdguiitem.cpp:169
-msgid "Show help"
-msgstr "显示帮助"
+"[tdelauncher] This program is not supposed to be started manually.\n"
+"[tdelauncher] It is started automatically by tdeinit.\n"
+msgstr ""
+"tdelauncher: 这个程序不是为手工运行设计的。\n"
+"tdelauncher: 它会自动被 tdeinit 所启动。\n"
 
-#: tdeui/kstdguiitem.cpp:175
-msgid "Close the current window or document"
-msgstr "关闭当前窗口或文档"
+#: tdeinit/tdelauncher.cpp:744
+msgid "TDEInit could not launch '%1'."
+msgstr "TDEInit 无法启动“%1”。"
 
-#: tdeui/kstdguiitem.cpp:181
-msgid "Reset all items to their default values"
-msgstr "把所有项目重设为它们的默认值"
+#: tdeinit/tdelauncher.cpp:919 tdeinit/tdelauncher.cpp:944
+#: tdeinit/tdelauncher.cpp:961
+msgid "Could not find service '%1'."
+msgstr "找不到服务“%1”。"
 
-#: tdeui/kstdaction.cpp:51 tdeui/kstdguiitem.cpp:188
-msgid ""
-"_: go back\n"
-"&Back"
-msgstr "后退(&B)"
+#: tdeinit/tdelauncher.cpp:976 tdeinit/tdelauncher.cpp:1012
+msgid "Service '%1' is malformatted."
+msgstr "服务“%1”的格式不正确。"
 
-#: tdeui/kstdguiitem.cpp:189
-msgid "Go back one step"
-msgstr "后退一步"
+#: tdeinit/tdelauncher.cpp:1088
+#, c-format
+msgid "Launching %1"
+msgstr "调用 %1"
 
-#: tdeui/kstdaction.cpp:56 tdeui/kstdguiitem.cpp:196
+#: tdeinit/tdelauncher.cpp:1282
 msgid ""
-"_: go forward\n"
-"&Forward"
-msgstr "前进(&F)"
-
-#: tdeui/kstdguiitem.cpp:197
-msgid "Go forward one step"
-msgstr "前进一步"
-
-#: tdeui/kstdguiitem.cpp:208
-msgid "Opens the print dialog to print the current document"
-msgstr "打开打印对话框来打印当前文档"
-
-#: tdeui/kstdguiitem.cpp:214
-msgid "C&ontinue"
-msgstr "继续(&O)"
-
-#: tdeui/kstdguiitem.cpp:215
-msgid "Continue operation"
-msgstr "继续操作"
-
-#: tdeui/kstdguiitem.cpp:221
-msgid "Delete item(s)"
-msgstr "删除项目"
-
-#: tdeui/kstdguiitem.cpp:227
-msgid "Open file"
-msgstr "打开文件"
-
-#: tdeui/kstdguiitem.cpp:233
-msgid "Quit application"
-msgstr "退出程序"
+"Unknown protocol '%1'.\n"
+msgstr ""
+"未知的协议“%1”。\n"
 
-#: tdeui/kstdguiitem.cpp:238
-msgid "&Reset"
-msgstr "重置(&R)"
+#: tdeinit/tdelauncher.cpp:1335
+msgid ""
+"Error loading '%1'.\n"
+msgstr ""
+"载入“%1”时出错。\n"
 
-#: tdeui/kstdguiitem.cpp:239
-msgid "Reset configuration"
-msgstr "重置配置"
+#: tdeinit/tdeinit.cpp:475
+msgid ""
+"Unable to start new process.\n"
+"The system may have reached the maximum number of open files possible or the "
+"maximum number of open files that you are allowed to use has been reached."
+msgstr ""
+"无法启动新进程。\n"
+"系统已打开的文件数可能已经达到了极限，或者您所允许打开的文件数已经达到了极限。"
 
-#: tdeui/kstdguiitem.cpp:244
+#: tdeinit/tdeinit.cpp:497
 msgid ""
-"_: Verb\n"
-"&Insert"
-msgstr "插入(&I)"
+"Unable to create new process.\n"
+"The system may have reached the maximum number of processes possible or the "
+"maximum number of processes that you are allowed to use has been reached."
+msgstr ""
+"无法创建新进程。\n"
+"系统已创建的进程数可能已经达到了极限，或者您所允许创建进程数已经达到了极限。"
 
-#: tdeui/kstdguiitem.cpp:249
-msgid "Confi&gure..."
-msgstr "配置(&G)..."
+#: tdeinit/tdeinit.cpp:589
+msgid "Could not find '%1' executable."
+msgstr "找不到可执行程序“%1”。"
 
-#: tdeui/keditcl2.cpp:701 tdeui/keditcl2.cpp:833 tdeui/kstdguiitem.cpp:254
-#: tdeutils/kfinddialog.cpp:239
-msgid "&Find"
-msgstr "查找(&F)"
+#: tdeinit/tdeinit.cpp:605
+msgid ""
+"Could not open library '%1'.\n"
+"%2"
+msgstr ""
+"无法打开库“%1”。\n"
+"%2"
 
-#: tdeui/kstdguiitem.cpp:274
-msgid "Test"
-msgstr "测试"
+#: tdeinit/tdeinit.cpp:606 tdeinit/tdeinit.cpp:649
+msgid "Unknown error"
+msgstr "未知的错误"
 
-#: tdeui/kstdguiitem.cpp:284
-msgid "&Overwrite"
-msgstr "覆盖(&O)"
+#: tdeinit/tdeinit.cpp:648
+msgid ""
+"Could not find 'kdemain' in '%1'.\n"
+"%2"
+msgstr ""
+"无法在“%1”中找到“kdemain”。\n"
+"%2"
 
-#: tdeui/kjanuswidget.cpp:156
-msgid "Empty Page"
-msgstr "空页面"
+#: tdeabc/addresseehelper.cpp:67
+msgid "Dr."
+msgstr "Dr."
 
-#: tdeui/ksyntaxhighlighter.cpp:477 tdeui/ksyntaxhighlighter.cpp:586
-msgid "As-you-type spell checking enabled."
-msgstr "即输即查已启用。"
+#: tdeabc/addresseehelper.cpp:68
+msgid "Miss"
+msgstr "Miss"
 
-#: tdeui/ksyntaxhighlighter.cpp:479
-msgid "As-you-type spell checking disabled."
-msgstr "即输即查已禁用。"
+#: tdeabc/addresseehelper.cpp:69
+msgid "Mr."
+msgstr "Mr."
 
-#: tdeui/ksyntaxhighlighter.cpp:528
-msgid "Incremental Spellcheck"
-msgstr "渐进式拼写检查"
+#: tdeabc/addresseehelper.cpp:70
+msgid "Mrs."
+msgstr "Mrs."
 
-#: tdeui/ksyntaxhighlighter.cpp:588
-msgid "Too many misspelled words. As-you-type spell checking disabled."
-msgstr "拼错的单词太多了。即输即查已禁用。"
+#: tdeabc/addresseehelper.cpp:71
+msgid "Ms."
+msgstr "Ms."
 
-#: tdeui/kxmlguibuilder.cpp:166 tdeui/kxmlguibuilder.cpp:365
-msgid "No text!"
-msgstr "没有文字！"
+#: tdeabc/addresseehelper.cpp:72
+msgid "Prof."
+msgstr "Prof."
 
-#: tdeui/kauthicon.cpp:99
-msgid "Editing disabled"
-msgstr "编辑已禁用"
+#: tdeabc/addresseehelper.cpp:74
+msgid "I"
+msgstr "I"
 
-#: tdeui/kauthicon.cpp:100
-msgid "Editing enabled"
-msgstr "编辑已启用"
+#: tdeabc/addresseehelper.cpp:75
+msgid "II"
+msgstr "II"
 
-#: tdeui/tdetoolbarhandler.cpp:86
-msgid "Show Toolbar"
-msgstr "显示工具栏"
+#: tdeabc/addresseehelper.cpp:76
+msgid "III"
+msgstr "III"
 
-#: tdeui/tdetoolbarhandler.cpp:87
-msgid "Hide Toolbar"
-msgstr "隐藏工具栏"
+#: tdeabc/addresseehelper.cpp:77
+msgid "Jr."
+msgstr "Jr."
 
-#: tdeui/tdetoolbarhandler.cpp:91
-msgid "Toolbars"
-msgstr "工具栏"
+#: tdeabc/addresseehelper.cpp:78
+msgid "Sr."
+msgstr "Sr."
 
-#: tdeui/kdatepicker.cpp:88
-#, c-format
-msgid "Week %1"
-msgstr "第 %1 周"
+#: tdeabc/resource.cpp:332
+msgid "Loading resource '%1' failed!"
+msgstr "装入资源“%1”失败！"
 
-#: tdeui/kdatepicker.cpp:163
-msgid "Next year"
-msgstr "下一年"
+#: tdeabc/resource.cpp:343
+msgid "Saving resource '%1' failed!"
+msgstr "保存资源“%1”失败！"
 
-#: tdeui/kdatepicker.cpp:164
-msgid "Previous year"
-msgstr "上一年"
+#: tdeabc/locknull.cpp:60
+msgid "LockNull: All locks succeed but no actual locking is done."
+msgstr "LockNull：所有锁定都成功完成，但实际并未进行锁定。"
 
-#: tdeui/kdatepicker.cpp:165
-msgid "Next month"
-msgstr "下一月"
+#: tdeabc/locknull.cpp:62
+msgid "LockNull: All locks fail."
+msgstr "LockNull：所有锁定都失败。"
 
-#: tdeui/kdatepicker.cpp:166
-msgid "Previous month"
-msgstr "上一月"
+#: tdeabc/addresseedialog.cpp:60
+msgid "Select Addressee"
+msgstr "选择地址"
 
-#: tdeui/kdatepicker.cpp:167
-msgid "Select a week"
-msgstr "选择星期"
+#: tdeabc/addressee.cpp:354 tdeabc/addresseedialog.cpp:70
+#: tdeabc/addresseedialog.cpp:100 tdeabc/distributionlistdialog.cpp:174
+#: tdeabc/distributionlistdialog.cpp:189 tdeabc/distributionlisteditor.cpp:142
+#: tdeabc/distributionlisteditor.cpp:161
+#: tdehtml/misc/knsplugininstaller.cpp:380 tdenewstuff/downloaddialog.cpp:281
+#: tdenewstuff/downloaddialog.cpp:287 tdenewstuff/downloaddialog.cpp:293
+#: tdenewstuff/providerdialog.cpp:65 tderesources/configpage.cpp:119
+#: tdeutils/kpluginselector.cpp:200
+msgid "Name"
+msgstr "名称"
 
-#: tdeui/kdatepicker.cpp:168
-msgid "Select a month"
-msgstr "选择月份"
+#: tdeabc/addresseedialog.cpp:71 tdeabc/addresseedialog.cpp:101
+#: tdeabc/distributionlistdialog.cpp:190 tdeabc/distributionlisteditor.cpp:143
+#: tdeabc/field.cpp:211 tdeabc/scripts/field.src.cpp:104
+#: tdeui/tdeaboutdialog.cpp:91
+msgid "Email"
+msgstr "电子邮件"
 
-#: tdeui/kdatepicker.cpp:169
-msgid "Select a year"
-msgstr "选择年份"
+#: tdeabc/addresseedialog.cpp:95
+msgid "Selected"
+msgstr "已选中"
 
-#: tdeui/kdatepicker.cpp:170
-msgid "Select the current day"
-msgstr "选择今天"
+#: tdeabc/addresseedialog.cpp:107
+msgid "Unselect"
+msgstr "取消选择"
 
-#: tdeui/kwhatsthismanager.cpp:50
-msgid ""
-"<b>Not Defined</b>"
-"<br>There is no \"What's This?\" help assigned to this widget. If you want to "
-"help us to  describe the widget, you are welcome to <a "
-"href=\"submit-whatsthis\">send us your own \"What's This?\" help</a> for it."
-msgstr ""
-"<b>未定义</b>"
-"<br>没有为此部件指派“这是什么”帮助。如果您想要帮助我们描述此部件，欢迎<a href=\"submit-whatsthis\">"
-"向我们发送“这是什么”帮助</a>。"
+#: tdeabc/formatfactory.cpp:55 tdeabc/formatfactory.cpp:119
+msgid "vCard"
+msgstr "vCard"
 
-#: tdeui/tdeshortcutdialog.cpp:68
-msgid "Configure Shortcut"
-msgstr "配置快捷键"
+#: tdeabc/formatfactory.cpp:56 tdeabc/formatfactory.cpp:120
+msgid "vCard Format"
+msgstr "vCard 格式"
 
-#: tdeui/tdeshortcutdialog.cpp:71
-msgid "Advanced"
-msgstr "高级"
+#: tdeabc/formatfactory.cpp:75
+msgid "No description available."
+msgstr "没有可用的描述。"
 
-#: tdeui/kedittoolbar.cpp:49
-msgid "--- line separator ---"
-msgstr "--- 分行符 ---"
+#: tdeabc/field.cpp:192 tdeabc/scripts/field.src.cpp:85
+msgid "Unknown Field"
+msgstr "未知字段"
 
-#: tdeui/kedittoolbar.cpp:50
-msgid "--- separator ---"
-msgstr "--- 分隔符 ---"
+#: tdeabc/field.cpp:205 tdeabc/scripts/field.src.cpp:98
+msgid "All"
+msgstr "全部"
 
-#: tdeui/kedittoolbar.cpp:380 tdeui/kedittoolbar.cpp:392
-#: tdeui/kedittoolbar.cpp:402 tdeui/kedittoolbar.cpp:411
-msgid "Configure Toolbars"
-msgstr "配置工具栏"
+#: tdeabc/field.cpp:207 tdeabc/scripts/field.src.cpp:100
+msgid "Frequent"
+msgstr "频率"
 
-#: tdeui/kedittoolbar.cpp:447
+#: kab/addressbook.cc:192 tdeabc/field.cpp:209
+#: tdeabc/scripts/field.src.cpp:102
 msgid ""
-"Do you really want to reset all toolbars of this application to their default? "
-"The changes will be applied immediately."
-msgstr "您真的想要将此应用程序的全部工具栏重置为其默认值吗？更改将会立即生效。"
-
-#: tdeui/kedittoolbar.cpp:447
-msgid "Reset Toolbars"
-msgstr "重置工具栏"
-
-#: tdeui/kedittoolbar.cpp:447 tdehtml/html/html_formimpl.cpp:2129
-#: tdehtml/tdehtmlview.cpp:2541 tdehtml/tdehtmlview.cpp:2574
-msgid "Reset"
-msgstr "重置"
-
-#: tdeui/kedittoolbar.cpp:761
-msgid "&Toolbar:"
-msgstr "工具栏(&T)："
-
-#: tdeui/kedittoolbar.cpp:777
-msgid "A&vailable actions:"
-msgstr "可用的动作(&V)："
+"_: street/postal\n"
+"Address"
+msgstr "地址"
 
-#: tdeui/kedittoolbar.cpp:795
-msgid "Curr&ent actions:"
-msgstr "当前动作(&E)："
+#: tdeabc/field.cpp:213 tdeabc/scripts/field.src.cpp:106
+msgid "Personal"
+msgstr "个人"
 
-#: tdeui/kedittoolbar.cpp:818
-msgid "Change &Icon..."
-msgstr "更改图标(&I)..."
+#: kab/addressbook.cc:176 tdeabc/addressee.cpp:746 tdeabc/field.cpp:215
+#: tdeabc/scripts/field.src.cpp:108 tdefile-plugins/elf/tdefile_elf.cpp:70
+#: tdefile-plugins/elf/tdefile_elf.cpp:92
+msgid "Organization"
+msgstr "组织"
 
-#: tdeui/kedittoolbar.cpp:991
-msgid ""
-"This element will be replaced with all the elements of an embedded component."
-msgstr "这个元件将被一个嵌入部件的全部元件代替。"
+#: kab/addressbook.cc:335 tdeabc/field.cpp:217 tdeabc/key.cpp:133
+#: tdeabc/scripts/field.src.cpp:110
+msgid "Custom"
+msgstr "自定义"
 
-#: tdeui/kedittoolbar.cpp:993
-msgid "<Merge>"
-msgstr "<合并>"
+#: tdeabc/field.cpp:219 tdeabc/scripts/field.src.cpp:112
+msgid "Undefined"
+msgstr "未定义"
 
-#: tdeui/kedittoolbar.cpp:995
-msgid "<Merge %1>"
-msgstr "<合并 %1>"
+#: tdeabc/ldapconfigwidget.cpp:83
+msgid "User:"
+msgstr "用户："
 
-#: tdeui/kedittoolbar.cpp:1001
-msgid ""
-"This is a dynamic list of actions. You can move it, but if you remove it you "
-"won't be able to re-add it."
-msgstr "这是动作的动态列表。您可以移动它，但如果您删除它，您将无法重新添加它。"
+#: tdeabc/ldapconfigwidget.cpp:92
+msgid "Bind DN:"
+msgstr "基 DN："
 
-#: tdeui/kedittoolbar.cpp:1002
-#, c-format
-msgid "ActionList: %1"
-msgstr "动作列表：%1"
+#: tdeabc/ldapconfigwidget.cpp:101
+msgid "Realm:"
+msgstr "域："
 
-#: tdeui/kcolordialog.cpp:84
-msgid ""
-"_: palette name\n"
-"* Recent Colors *"
-msgstr "* 最近使用的颜色 *"
+#: tdeabc/ldapconfigwidget.cpp:110
+msgid "Password:"
+msgstr "密码："
 
-#: tdeui/kcolordialog.cpp:85
-msgid ""
-"_: palette name\n"
-"* Custom Colors *"
-msgstr "* 自定义颜色 *"
+#: tdeabc/ldapconfigwidget.cpp:120
+msgid "Host:"
+msgstr "主机："
 
-#: tdeui/kcolordialog.cpp:86
-msgid ""
-"_: palette name\n"
-"Forty Colors"
-msgstr "四十种颜色"
+#: tdeabc/ldapconfigwidget.cpp:130
+msgid "Port:"
+msgstr "端口："
 
-#: tdeui/kcolordialog.cpp:87
-msgid ""
-"_: palette name\n"
-"Rainbow Colors"
-msgstr "彩虹颜色"
+#: tdeabc/ldapconfigwidget.cpp:141
+msgid "LDAP version:"
+msgstr "LDAP 版本："
 
-#: tdeui/kcolordialog.cpp:88
-msgid ""
-"_: palette name\n"
-"Royal Colors"
-msgstr "精选颜色"
+#: tdeabc/ldapconfigwidget.cpp:152
+msgid "Size limit:"
+msgstr "大小限制："
 
-#: tdeui/kcolordialog.cpp:89
-msgid ""
-"_: palette name\n"
-"Web Colors"
-msgstr "Web 颜色"
+#: tdeabc/ldapconfigwidget.cpp:163
+msgid "Time limit:"
+msgstr "时间限制："
 
-#: tdeui/kcolordialog.cpp:563
-msgid "Named Colors"
-msgstr "命名颜色"
+#: tdeabc/ldapconfigwidget.cpp:167
+msgid " sec"
+msgstr " 秒"
 
-#: tdeui/kcolordialog.cpp:717
+#: tdeabc/ldapconfigwidget.cpp:175
 msgid ""
-"Unable to read X11 RGB color strings. The following file location(s) were "
-"examined:\n"
-msgstr ""
-"无法读取 X11 RGB 颜色字符串。以下文件位置已被检查过：\n"
+"_: Distinguished Name\n"
+"DN:"
+msgstr "DN："
 
-#: tdeui/kcolordialog.cpp:940
-msgid "Select Color"
-msgstr "选择颜色"
+#: tdeabc/ldapconfigwidget.cpp:182 tdeabc/ldapconfigwidget.cpp:231
+msgid "Query Server"
+msgstr "查询服务器"
 
-#: tdeui/kcolordialog.cpp:1005
-msgid "H:"
-msgstr "H："
+#: tdeabc/ldapconfigwidget.cpp:190
+msgid "Filter:"
+msgstr "过滤器："
 
-#: tdeui/kcolordialog.cpp:1014
-msgid "S:"
-msgstr "S："
+#: tdeabc/ldapconfigwidget.cpp:199
+msgid "Security"
+msgstr "安全"
 
-#: tdeui/kcolordialog.cpp:1023
-msgid "V:"
-msgstr "V："
+#: tdeabc/ldapconfigwidget.cpp:201
+msgid "TLS"
+msgstr "TLS"
 
-#: tdeui/kcolordialog.cpp:1035
-msgid "R:"
-msgstr "R："
+#: tdeabc/ldapconfigwidget.cpp:202
+msgid "SSL"
+msgstr "SSL"
 
-#: tdeui/kcolordialog.cpp:1044
-msgid "G:"
-msgstr "G："
+#: tdeabc/ldapconfigwidget.cpp:216
+msgid "Authentication"
+msgstr "身份验证"
 
-#: tdeui/kcolordialog.cpp:1053
-msgid "B:"
-msgstr "B："
+#: tdeabc/ldapconfigwidget.cpp:218
+msgid "Anonymous"
+msgstr "匿名"
 
-#: tdeui/kcolordialog.cpp:1108
-msgid "&Add to Custom Colors"
-msgstr "添加到自定义颜色中(&A)"
+#: tdeabc/ldapconfigwidget.cpp:219
+msgid "Simple"
+msgstr "样例"
 
-#: tdeui/kcolordialog.cpp:1140
-msgid "HTML:"
-msgstr "HTML："
+#: tdeabc/ldapconfigwidget.cpp:220
+msgid "SASL"
+msgstr "SASL"
 
-#: tdeui/kcolordialog.cpp:1219
-msgid "Default color"
-msgstr "默认颜色"
+#: tdeabc/ldapconfigwidget.cpp:222
+msgid "SASL mechanism:"
+msgstr "SASL 算法："
 
-#: tdeui/kcolordialog.cpp:1247
-msgid "-default-"
-msgstr "-默认-"
+#: tdeabc/ldapconfigwidget.cpp:302
+msgid "LDAP Query"
+msgstr "LDAP 查询"
 
-#: tdeui/kcolordialog.cpp:1463
-msgid "-unnamed-"
-msgstr "-未命名-"
+#: tdeabc/address.cpp:145
+msgid "Post Office Box"
+msgstr "邮局邮箱"
 
-#: tdeui/kstdaction.cpp:61
-msgid ""
-"_: beginning (of line)\n"
-"&Home"
-msgstr "首页(&H)"
+#: tdeabc/address.cpp:163
+msgid "Extended Address Information"
+msgstr "扩展地址信息"
 
-#: tdeui/kstdaction.cpp:240
-msgid "Show Menubar<p>Shows the menubar again after it has been hidden"
-msgstr "显示菜单栏<p>隐藏菜单栏后再次显示菜单栏"
+#: tdeabc/address.cpp:181
+msgid "Street"
+msgstr "街道"
 
-#: tdeui/kstdaction.cpp:242
-msgid "Hide &Menubar"
-msgstr "隐藏菜单栏(&M)"
+#: tdeabc/address.cpp:199
+msgid "Locality"
+msgstr "位置"
 
-#: tdeui/kstdaction.cpp:243
-msgid ""
-"Hide Menubar"
-"<p>Hide the menubar. You can usually get it back using the right mouse button "
-"inside the window itself."
-msgstr "隐藏菜单栏<p>隐藏菜单栏。您可以在窗口内使用鼠标右键重新显示。"
+#: tdeabc/address.cpp:217 tdeui/ktimezonewidget.cpp:46
+msgid "Region"
+msgstr "地域"
 
-#: tdeui/kstdaction.cpp:274 tdeui/kstdaction_p.h:97
-msgid "Show St&atusbar"
-msgstr "显示状态栏(&A)"
+#: tdeabc/address.cpp:235
+msgid "Postal Code"
+msgstr "邮政编码"
 
-#: tdeui/kstdaction.cpp:276
-msgid ""
-"Show Statusbar"
-"<p>Shows the statusbar, which is the bar at the bottom of the window used for "
-"status information."
-msgstr "显示状态栏<p>显示状态栏，即位于窗口底部用于显示状态信息的长条。"
+#: kab/addressbook.cc:204 tdeabc/address.cpp:253
+msgid "Country"
+msgstr "国家"
 
-#: tdeui/kstdaction.cpp:278
-msgid "Hide St&atusbar"
-msgstr "隐藏状态栏(&A)"
+#: kab/addressbook.cc:188 tdeabc/address.cpp:271
+msgid "Delivery Label"
+msgstr "邮递标签"
 
-#: tdeui/kstdaction.cpp:279
+#: tdeabc/address.cpp:287
 msgid ""
-"Hide Statusbar"
-"<p>Hides the statusbar, which is the bar at the bottom of the window used for "
-"status information."
-msgstr "隐藏状态栏<p>隐藏状态栏，即位于窗口底部用于显示状态信息的长条。"
-
-#: tdeui/kpassdlg.cpp:372
-msgid "&Password:"
-msgstr "密码(&P)："
-
-#: tdeui/kpassdlg.cpp:391
-msgid "&Keep password"
-msgstr "保存密码(&K)"
-
-#: tdeui/kpassdlg.cpp:403
-msgid "&Verify:"
-msgstr "校验(&V)："
+"_: Preferred address\n"
+"Preferred"
+msgstr "首选"
 
-#: tdeui/kpassdlg.cpp:425
-msgid "Password strength meter:"
-msgstr "密码强度衡量："
+#: tdeabc/address.cpp:291
+msgid "Domestic"
+msgstr "国内"
 
-#: tdeui/kpassdlg.cpp:429
-msgid ""
-"The password strength meter gives an indication of the security of the password "
-"you have entered.  To improve the strength of the password, try:\n"
-" - using a longer password;\n"
-" - using a mixture of upper- and lower-case letters;\n"
-" - using numbers or symbols, such as #, as well as letters."
-msgstr ""
-"密码强度衡量可表明您所输入的密码的安全性。要改进密码的强度，请试着：\n"
-" - 使用更长的密码；\n"
-" - 混合使用大小写字母；\n"
-" - 将字母与数字或符号组合使用，比如 #。"
+#: tdeabc/address.cpp:294
+msgid "International"
+msgstr "国际"
 
-#: tdeui/kpassdlg.cpp:445 tdeui/kpassdlg.cpp:617
-msgid "Passwords do not match"
-msgstr "密码不匹配"
+#: tdeabc/address.cpp:297
+msgid "Postal"
+msgstr "邮局"
 
-#: tdeui/kpassdlg.cpp:515
-msgid "You entered two different passwords. Please try again."
-msgstr "您输入了两个不同的密码。请重新输入。"
+#: tdeabc/address.cpp:300
+msgid "Parcel"
+msgstr "包裹"
 
-#: tdeui/kpassdlg.cpp:522
+#: tdeabc/address.cpp:303
 msgid ""
-"The password you have entered has a low strength. To improve the strength of "
-"the password, try:\n"
-" - using a longer password;\n"
-" - using a mixture of upper- and lower-case letters;\n"
-" - using numbers or symbols as well as letters.\n"
-"\n"
-"Would you like to use this password anyway?"
-msgstr ""
-"您所输入的密码长度较低。要改进密码的强度，请试着：\n"
-" - 使用更长的密码；\n"
-" - 混合使用大小写字母；\n"
-" - 将字母与数字或符号组合使用。\n"
-"\n"
-"您是否仍然想要使用此密码？"
-
-#: tdeui/kpassdlg.cpp:530
-msgid "Low Password Strength"
-msgstr "密码太简单"
-
-#: tdeui/kpassdlg.cpp:611
-msgid "Password is empty"
-msgstr "密码为空"
+"_: Home Address\n"
+"Home"
+msgstr "家庭地址"
 
-#: tdeui/kpassdlg.cpp:614
-#, c-format
+#: tdeabc/address.cpp:306
 msgid ""
-"_n: Password must be at least 1 character long\n"
-"Password must be at least %n characters long"
-msgstr "密码必须至少有 %n 个字符"
-
-#: tdeui/kpassdlg.cpp:616
-msgid "Passwords match"
-msgstr "密码匹配"
-
-#: tdeui/tdespelldlg.cpp:53 tdespell2/ui/dialog.cpp:62
-msgid "Check Spelling"
-msgstr "检查拼写"
-
-#: tdeui/tdespelldlg.cpp:54 tdespell2/ui/dialog.cpp:64
-msgid "&Finished"
-msgstr "已完成(&F)"
-
-#: tdeui/kcombobox.cpp:444 tdehtml/rendering/render_form.cpp:388
-msgid "Clear &History"
-msgstr "清除历史(&H)"
-
-#: tdeui/kcombobox.cpp:584
-msgid "No further item in the history."
-msgstr "在历史中没有更多项目。"
-
-#: tdeui/klineeditdlg.cpp:92
-msgid "&Browse..."
-msgstr "浏览(&B)..."
-
-#: tdeui/kdialogbase.cpp:636
-msgid "&Try"
-msgstr "试用(&T)"
+"_: Work Address\n"
+"Work"
+msgstr "工作地址"
 
-#: tdeui/kdialogbase.cpp:904
-msgid ""
-"If you press the <b>OK</b> button, all changes\n"
-"you made will be used to proceed."
-msgstr ""
-"如果您按下<b>确定</b> 按钮，您所做的所有\n"
-"修改将会生效。"
+#: tdeabc/address.cpp:309
+msgid "Preferred Address"
+msgstr "首选地址"
 
-#: tdeui/kdialogbase.cpp:911
-msgid "Accept settings"
-msgstr "接受设置"
+#: tdeabc/lock.cpp:93
+msgid "Unable to open lock file."
+msgstr "无法打开锁定文件。"
 
-#: tdeui/kdialogbase.cpp:932
+#: tdeabc/lock.cpp:106
 msgid ""
-"When clicking <b>Apply</b>, the settings will be\n"
-"handed over to the program, but the dialog\n"
-"will not be closed. Use this to try different settings. "
+"The address book '%1' is locked by application '%2'.\n"
+"If you believe this is incorrect, just remove the lock file from '%3'"
 msgstr ""
-"当点击<b>应用</b>后，设置会被程序\n"
-"使用，但是对话框不会被关闭。\n"
-"可以使用<b>应用</b>来试验不同设置。"
-
-#: tdeui/kdialogbase.cpp:941
-msgid "Apply settings"
-msgstr "应用设置"
+"地址簿“%1”已经被应用程序“%2”锁定。\n"
+"如果您认为这一信息不对，只需删除“%3”的锁定文件"
 
-#: tdeui/kdialogbase.cpp:1130
-msgid "&Details"
-msgstr "细节(&D)"
+#: tdeabc/lock.cpp:146
+msgid "Unlock failed. Lock file is owned by other process: %1 (%2)"
+msgstr "解锁失败。锁文件已被其它进程所拥有：%1 (%2)"
 
-#: tdeui/kdialogbase.cpp:1538
-msgid "Get help..."
-msgstr "获得帮助..."
+#: tdeabc/distributionlistdialog.cpp:44
+msgid "Configure Distribution Lists"
+msgstr "配置分发列表"
 
-#: tdeui/keditlistbox.cpp:124
-msgid "&Add"
-msgstr "添加(&A)"
+#: tdeabc/distributionlistdialog.cpp:61 tdeabc/distributionlisteditor.cpp:43
+msgid "Select Email Address"
+msgstr "选择电子邮件地址"
 
-#: tdeui/keditlistbox.cpp:148
-msgid "Move &Up"
-msgstr "上移(&U)"
+#: kab/addressbook.cc:303 tdeabc/distributionlistdialog.cpp:69
+#: tdeabc/distributionlisteditor.cpp:49
+msgid "Email Addresses"
+msgstr "电子邮件地址"
 
-#: tdeui/keditlistbox.cpp:153
-msgid "Move &Down"
-msgstr "下移(&D)"
+#: tdeabc/distributionlistdialog.cpp:152
+msgid "New List..."
+msgstr "新建列表..."
 
-#: tdeui/kbugreport.cpp:70
-msgid "Submit Bug Report"
-msgstr "提交错误报告"
+#: tdeabc/distributionlistdialog.cpp:156
+msgid "Rename List..."
+msgstr "重新命名列表..."
 
-#: tdeui/kbugreport.cpp:110
-msgid ""
-"Your email address. If incorrect, use the Configure Email button to change it"
-msgstr "您的电子邮件地址。如果不正确，请使用“配置电子邮件”按钮来修改它"
+#: tdeabc/distributionlistdialog.cpp:160 tdeabc/distributionlisteditor.cpp:137
+msgid "Remove List"
+msgstr "删除列表"
 
-#: tdeui/kbugreport.cpp:111
-msgid "From:"
-msgstr "发件人："
+#: tdeabc/distributionlistdialog.cpp:167
+msgid "Available addresses:"
+msgstr "可用地址："
 
-#: tdeui/kbugreport.cpp:120
-msgid "Configure Email..."
-msgstr "配置电子邮件..."
+#: tdeabc/distributionlistdialog.cpp:175 tdeabc/distributionlisteditor.cpp:162
+msgid "Preferred Email"
+msgstr "首选邮件地址"
 
-#: tdeui/kbugreport.cpp:127
-msgid "The email address this bug report is sent to."
-msgstr "错误报告要发送的电子邮件地址。"
+#: tdeabc/distributionlistdialog.cpp:183 tdeabc/distributionlisteditor.cpp:156
+msgid "Add Entry"
+msgstr "添加项目"
 
-#: tdeui/kbugreport.cpp:128
-msgid "To:"
-msgstr "收件人："
+#: tdeabc/distributionlistdialog.cpp:191 tdeabc/distributionlisteditor.cpp:144
+msgid "Use Preferred"
+msgstr "使用首选的"
 
-#: tdeui/kbugreport.cpp:135
-msgid "&Send"
-msgstr "发送(&S)"
+#: tdeabc/distributionlistdialog.cpp:198
+msgid "Change Email..."
+msgstr "更改电子邮件..."
 
-#: tdeui/kbugreport.cpp:135
-msgid "Send bug report."
-msgstr "发送错误报告。"
+#: tdeabc/distributionlistdialog.cpp:202 tdeabc/distributionlisteditor.cpp:152
+msgid "Remove Entry"
+msgstr "删除项目"
 
-#: tdeui/kbugreport.cpp:136
-#, c-format
-msgid "Send this bug report to %1."
-msgstr "把该错误报告发送到 %1。"
+#: tdeabc/distributionlistdialog.cpp:237 tdeabc/distributionlisteditor.cpp:196
+msgid "New Distribution List"
+msgstr "新建分发列表"
 
-#: tdeui/kbugreport.cpp:147
-msgid ""
-"The application for which you wish to submit a bug report - if incorrect, "
-"please use the Report Bug menu item of the correct application"
-msgstr "您要提交错误报告的程序 - 如果不正确，请使用正确程序的“报告错误”菜单"
+#: tdeabc/distributionlistdialog.cpp:238
+msgid "Please enter &name:"
+msgstr "请输入名称(&N)："
 
-#: tdeui/kbugreport.cpp:148
-msgid "Application: "
-msgstr "应用程序："
+#: tdeabc/distributionlistdialog.cpp:255
+msgid "Distribution List"
+msgstr "分发列表"
 
-#: tdeui/kbugreport.cpp:173
-msgid ""
-"The version of this application - please make sure that no newer version is "
-"available before sending a bug report"
-msgstr "这个程序的版本 - 请在发送错误报告前确定没有新的版本"
+#: tdeabc/distributionlistdialog.cpp:256
+msgid "Please change &name:"
+msgstr "请更改名称(&N)："
 
-#: tdeui/kbugreport.cpp:180
-msgid "no version set (programmer error!)"
-msgstr "没有设置版本(程序错误！)"
+#: tdeabc/distributionlistdialog.cpp:273
+msgid "Delete distribution list '%1'?"
+msgstr "删除分发列表“%1”吗？"
 
-#: tdeui/kbugreport.cpp:190
-msgid "OS:"
-msgstr "操作系统："
+#: tdeabc/distributionlistdialog.cpp:339
+msgid "Selected addressees:"
+msgstr "选中的地址："
 
-#: tdeui/kbugreport.cpp:202
-msgid "Compiler:"
-msgstr "编译器："
+#: tdeabc/distributionlistdialog.cpp:341
+msgid "Selected addresses in '%1':"
+msgstr "“%1”中选中的地址："
 
-#: tdeui/kbugreport.cpp:210
-msgid "Se&verity"
-msgstr "严重程度(&V)"
+#: tdeabc/resourceselectdialog.cpp:39 tderesources/selectdialog.cpp:42
+msgid "Resource Selection"
+msgstr "资源选择"
 
-#: tdeui/kbugreport.cpp:212
-msgid "Critical"
-msgstr "紧急"
+#: tdeabc/resourceselectdialog.cpp:46 tderesources/configpage.cpp:107
+#: tderesources/selectdialog.cpp:49
+msgid "Resources"
+msgstr "资源"
 
-#: tdeui/kbugreport.cpp:212
-msgid "Grave"
-msgstr "严重"
+#: tdeabc/ldifconverter.cpp:475
+msgid "List of Emails"
+msgstr "电子邮件列表"
 
-#: tdeui/kbugreport.cpp:212
+#: tdeabc/phonenumber.cpp:147
 msgid ""
-"_: normal severity\n"
-"Normal"
-msgstr "普通"
-
-#: tdeui/kbugreport.cpp:212
-msgid "Wishlist"
-msgstr "愿望"
-
-#: tdeui/kbugreport.cpp:212
-msgid "Translation"
-msgstr "翻译"
-
-#: tdeui/kbugreport.cpp:225
-msgid "S&ubject: "
-msgstr "主题(&U)："
+"_: Preferred phone\n"
+"Preferred"
+msgstr "首选"
 
-#: tdeui/kbugreport.cpp:232
+#: tdeabc/phonenumber.cpp:151
 msgid ""
-"Enter the text (in English if possible) that you wish to submit for the bug "
-"report.\n"
-"If you press \"Send\", a mail message will be sent to the maintainer of this "
-"program.\n"
-msgstr ""
-"请输入您要提交的错误报告的文字，尽量用英文。\n"
-"如果您按下“发送”按钮，邮件将被发送给该程序的维护者。\n"
+"_: Home phone\n"
+"Home"
+msgstr "家庭电话"
 
-#: tdeui/kbugreport.cpp:252
+#: tdeabc/phonenumber.cpp:154
 msgid ""
-"To submit a bug report, click on the button below.\n"
-"This will open a web browser window on http://bugs.kde.org where you will find "
-"a form to fill in.\n"
-"The information displayed above will be transferred to that server."
-msgstr ""
-"要提交错误报告，请单击下面的链接。\n"
-"这样会打开一个显示 http://bugs.kde.org 网页的浏览器窗口，在那里您将找到一个可以填写的表格。\n"
-"上面显示的信息将被传送到那个服务器上。"
+"_: Work phone\n"
+"Work"
+msgstr "办公电话"
 
-#: tdeui/kbugreport.cpp:260
-msgid "&Launch Bug Report Wizard"
-msgstr "调用错误报告向导(&L)"
+#: tdeabc/phonenumber.cpp:157
+msgid "Messenger"
+msgstr "信使"
 
-#: tdeui/kbugreport.cpp:298
-msgid ""
-"_: unknown program name\n"
-"unknown"
-msgstr "未知"
+#: tdeabc/phonenumber.cpp:160
+msgid "Preferred Number"
+msgstr "首选号码"
 
-#: tdeui/kbugreport.cpp:376
-msgid ""
-"You must specify both a subject and a description before the report can be "
-"sent."
-msgstr "您必须指定主题和描述才能发出错误报告。"
+#: tdeabc/phonenumber.cpp:163
+msgid "Voice"
+msgstr "语音"
 
-#: tdeui/kbugreport.cpp:386
-msgid ""
-"<p>You chose the severity <b>Critical</b>. Please note that this severity is "
-"intended only for bugs that</p>"
-"<ul>"
-"<li>break unrelated software on the system (or the whole system)</li>"
-"<li>cause serious data loss</li>"
-"<li>introduce a security hole on the system where the affected package is "
-"installed</li></ul>\n"
-"<p>Does the bug you are reporting cause any of the above damage? If it does "
-"not, please select a lower severity. Thank you!</p>"
-msgstr ""
-"<p>您选择了严重程度<b>紧急</b>。请注意这个严重程度只用于如下错误：</p>"
-"<ul>"
-"<li>使系统中不相关的软件(或整个系统)出问题</li>"
-"<li>导致严重的数据丢失</li>"
-"<li>在安装受影响的软件包的系统上引入安全漏洞</li></ul>\n"
-"<p>您报告的错误引起上面的危害了吗？如果没有，请选择较低的严重程度。谢谢！</p>"
+#: tdeabc/phonenumber.cpp:166
+msgid "Fax"
+msgstr "传真"
 
-#: tdeui/kbugreport.cpp:397
+#: tdeabc/phonenumber.cpp:169
 msgid ""
-"<p>You chose the severity <b>Grave</b>. Please note that this severity is "
-"intended only for bugs that</p>"
-"<ul>"
-"<li>make the package in question unusable or mostly so</li>"
-"<li>cause data loss</li>"
-"<li>introduce a security hole allowing access to the accounts of users who use "
-"the affected package</li></ul>\n"
-"<p>Does the bug you are reporting cause any of the above damage? If it does "
-"not, please select a lower severity. Thank you!</p>"
-msgstr ""
-"<p>您选择了严重程度<b>严重</b>。请注意这个严重程度只用于如下错误：</p>"
-"<ul>"
-"<li>使相关的软件包无法使用或几乎无法使用</li>"
-"<li>导致数据丢失</li>"
-"<li>导致安全漏洞，允许对使用受影响的软件包的用户的帐号进行非授权访问</li></ul>\n"
-"<p>您报告的错误引起上面的危害了吗？如果没有，请选择较低的严重程度。谢谢！</p>"
+"_: Mobile Phone\n"
+"Mobile"
+msgstr "移动电话"
 
-#: tdeui/kbugreport.cpp:409
-msgid ""
-"Unable to send the bug report.\n"
-"Please submit a bug report manually...\n"
-"See http://bugs.kde.org/ for instructions."
-msgstr ""
-"无法发送错误报告。\n"
-"请手工发出错误报告，非常抱歉...\n"
-"请参考 http://bugs.kde.org/ 上的说明。"
+#: tdeabc/phonenumber.cpp:172
+msgid "Video"
+msgstr "视频"
 
-#: tdeui/kbugreport.cpp:417
-msgid "Bug report sent, thank you for your input."
-msgstr "已发出错误报告，感谢您的帮助。"
+#: tdeabc/phonenumber.cpp:175
+msgid "Mailbox"
+msgstr "邮箱"
 
-#: tdeui/kbugreport.cpp:426
+#: tdeabc/phonenumber.cpp:181
 msgid ""
-"Close and discard\n"
-"edited message?"
-msgstr ""
-"关闭并放弃\n"
-"已编辑的消息？"
+"_: Car Phone\n"
+"Car"
+msgstr "车载电话"
 
-#: tdeui/kbugreport.cpp:427
-msgid "Close Message"
-msgstr "关闭消息"
+#: tdeabc/addressee.cpp:620 tdeabc/phonenumber.cpp:184
+msgid "ISDN"
+msgstr "ISDN"
 
-#: tdeui/kcolorcombo.cpp:187 tdeui/kcolorcombo.cpp:240
-msgid "Custom..."
-msgstr "自定义..."
+#: tdeabc/phonenumber.cpp:187
+msgid "PCS"
+msgstr "PCS"
 
-#: tdeui/ksystemtray.cpp:190
-msgid "<qt>Are you sure you want to quit <b>%1</b>?</qt>"
-msgstr "<qt>您确定想要退出 <b>%1</b> 吗？</qt>"
+#: tdeabc/addressee.cpp:626 tdeabc/phonenumber.cpp:190
+msgid "Pager"
+msgstr "寻呼机"
 
-#: tdeui/ksystemtray.cpp:193
-msgid "Confirm Quit From System Tray"
-msgstr "确认从系统托盘退出"
+#: tdeabc/addressee.cpp:602 tdeabc/phonenumber.cpp:193
+msgid "Home Fax"
+msgstr "家庭传真"
 
-#: tdeui/kpixmapregionselectorwidget.cpp:141
-msgid "Image Operations"
-msgstr "图像操作"
+#: tdeabc/phonenumber.cpp:196
+msgid "Work Fax"
+msgstr "办公传真"
 
-#: tdeui/kpixmapregionselectorwidget.cpp:143
-msgid "&Rotate Clockwise"
-msgstr "顺时针旋转(&R)"
+#: tdeabc/addressbook.cpp:346 tdeabc/addressbook.cpp:365
+msgid "Unable to load resource '%1'"
+msgstr "无法载入资源“%1”"
 
-#: tdeui/kpixmapregionselectorwidget.cpp:148
-msgid "Rotate &Counterclockwise"
-msgstr "逆时针旋转(&C)"
+#: tdeabc/key.cpp:127
+msgid "X509"
+msgstr "X509"
 
-#: tdeui/kdockwidget.cpp:237
-msgid ""
-"_: Freeze the window geometry\n"
-"Freeze"
-msgstr "冻结"
+#: tdeabc/key.cpp:130
+msgid "PGP"
+msgstr "PGP"
 
-#: tdeui/kdockwidget.cpp:244
-msgid ""
-"_: Dock this window\n"
-"Dock"
-msgstr "停靠"
+#: tdeabc/key.cpp:136 tdeabc/secrecy.cpp:80
+msgid "Unknown type"
+msgstr "未知类型"
 
-#: tdeui/kdockwidget.cpp:251
-msgid "Detach"
-msgstr "漂移"
+#: tdeabc/distributionlisteditor.cpp:133
+msgid "New List"
+msgstr "新建列表"
 
-#: tdeui/kwizard.cpp:48
-msgid "&Back"
-msgstr "上一步(&B)"
+#: tdeabc/distributionlisteditor.cpp:148
+msgid "Change Email"
+msgstr "更改电子邮件"
 
-#: tdeui/kwizard.cpp:49
-msgid ""
-"_: Opposite to Back\n"
-"&Next"
-msgstr "下一步(&N)"
+#: tdeabc/distributionlisteditor.cpp:197
+msgid "Please enter name:"
+msgstr "请输入名称："
 
-#: tdeui/khelpmenu.cpp:130 tdeui/kstdaction_p.h:108
-msgid "%1 &Handbook"
-msgstr "%1 手册(&H)"
+#: tdeabc/errorhandler.cpp:42
+msgid "Error in libtdeabc"
+msgstr "libtdeabc 中的错误"
 
-#: tdeui/khelpmenu.cpp:139
-msgid "What's &This"
-msgstr "这是什么(&T)"
+#: tdeabc/tdeab2tdeabc.cpp:42
+msgid "Disable automatic startup on login"
+msgstr "禁用登录时自动启动"
 
-#: tdeui/khelpmenu.cpp:150 tdeui/kstdaction_p.h:111
-msgid "&Report Bug..."
-msgstr "报告错误(&R)..."
+#: tdeabc/tdeab2tdeabc.cpp:45
+msgid "Override existing entries"
+msgstr "超越已有项目"
 
-#: tdeui/khelpmenu.cpp:159 tdeui/kstdaction_p.h:112
-msgid "Switch application &language..."
-msgstr "切换应用程序语言(&L)..."
+#: tdeabc/tdeab2tdeabc.cpp:287
+msgid ""
+"Address book file <b>%1</b> not found! Make sure the old address book is "
+"located there and you have read permission for this file."
+msgstr "地址簿文件 <b>%1</b> 未找到！请确定旧地址簿位于该处，您也有该文件的读权限。"
 
-#: tdeui/khelpmenu.cpp:170 tdeui/kstdaction_p.h:113
-#, c-format
-msgid "&About %1"
-msgstr "关于 %1(&A)"
+#: tdeabc/tdeab2tdeabc.cpp:435
+msgid "Kab to Kabc Converter"
+msgstr "Kab 到 tdeabc 转换器"
 
-#: tdeui/khelpmenu.cpp:176 tdeui/kstdaction_p.h:114
-msgid "About &TDE"
-msgstr "关于 &TDE"
+#: tdeabc/secrecy.cpp:71
+msgid "Public"
+msgstr "公共"
 
-#: tdeui/tdeactionclasses.cpp:2072
-msgid "Exit F&ull Screen Mode"
-msgstr "退出全屏模式(&U)"
+#: kab/addressbook.cc:1950 tdeabc/secrecy.cpp:74
+msgid "Private"
+msgstr "个人"
 
-#: tdeui/tdeactionclasses.cpp:2077 tdeui/kstdaction_p.h:98
-msgid "F&ull Screen Mode"
-msgstr "全屏模式(&U)"
+#: tdeabc/secrecy.cpp:77
+msgid "Confidential"
+msgstr "机密"
 
-#: tdeui/tdelistviewsearchline.cpp:243
-msgid "Search Columns"
-msgstr "搜索列"
+#: tdeabc/stdaddressbook.cpp:148
+msgid "Unable to save to resource '%1'. It is locked."
+msgstr "无法保存到资源“%1”，因为它已被锁定。"
 
-#: tdeui/tdelistviewsearchline.cpp:245
-msgid "All Visible Columns"
-msgstr "全部可见列"
+#: tdeabc/addressee.cpp:318 tdeabc/scripts/addressee.src.cpp:181
+msgid "Unique Identifier"
+msgstr "唯一标识符"
 
-#: tdeui/tdelistviewsearchline.cpp:260
-msgid ""
-"_: Column number %1\n"
-"Column No. %1"
-msgstr "第 %1 列"
+#: tdeabc/addressee.cpp:336 tdeabc/scripts/addressee.src.cpp:199
+#, fuzzy
+msgid "Unique Resource Identifier"
+msgstr "唯一标识符"
 
-#: tdeui/tdelistviewsearchline.cpp:455
-msgid "S&earch:"
-msgstr "搜索(&E)："
+#: kab/addressbook.cc:271 tdeabc/addressee.cpp:373
+msgid "Formatted Name"
+msgstr "正式名称"
 
-#: tdeui/ktip.cpp:206
-msgid "Tip of the Day"
-msgstr "日积月累"
+#: tdeabc/addressee.cpp:392
+msgid "Family Name"
+msgstr "姓"
 
-#: tdeui/ktip.cpp:224
-msgid ""
-"Did you know...?\n"
-msgstr ""
-"您知道吗...？\n"
+#: tdeabc/addressee.cpp:411
+msgid "Given Name"
+msgstr "名"
 
-#: tdeui/ktip.cpp:287
-msgid "&Show tips on startup"
-msgstr "在启动时显示提示(&S)"
+#: tdeabc/addressee.cpp:430
+msgid "Additional Names"
+msgstr "额外名"
 
-#: tdeui/tdetoolbar.cpp:2040
-msgid "Toolbar Menu"
-msgstr "工具栏菜单"
+#: tdeabc/addressee.cpp:449
+msgid "Honorific Prefixes"
+msgstr "尊称前缀"
 
-#: tdeui/tdetoolbar.cpp:2043
-msgid ""
-"_: toolbar position string\n"
-"Top"
-msgstr "上边"
+#: tdeabc/addressee.cpp:468
+msgid "Honorific Suffixes"
+msgstr "尊称后缀"
 
-#: tdeui/tdetoolbar.cpp:2044
-msgid ""
-"_: toolbar position string\n"
-"Left"
-msgstr "左边"
+#: tdeabc/addressee.cpp:487
+msgid "Nick Name"
+msgstr "昵称"
 
-#: tdeui/tdetoolbar.cpp:2045
-msgid ""
-"_: toolbar position string\n"
-"Right"
-msgstr "右边"
+#: kab/addressbook.cc:291 tdeabc/addressee.cpp:506
+msgid "Birthday"
+msgstr "生日"
 
-#: tdeui/tdetoolbar.cpp:2046
-msgid ""
-"_: toolbar position string\n"
-"Bottom"
-msgstr "下边"
+#: tdeabc/addressee.cpp:512
+msgid "Home Address Street"
+msgstr "家庭地址街道"
 
-#: tdeui/tdetoolbar.cpp:2048
-msgid ""
-"_: toolbar position string\n"
-"Floating"
-msgstr "浮动"
+#: tdeabc/addressee.cpp:518
+msgid "Home Address City"
+msgstr "家庭地址城市"
 
-#: tdeui/tdetoolbar.cpp:2049
-msgid ""
-"_: min toolbar\n"
-"Flat"
-msgstr "平面"
+#: tdeabc/addressee.cpp:524
+msgid "Home Address State"
+msgstr "家庭地址省"
 
-#: tdeui/tdetoolbar.cpp:2052
-msgid "Icons Only"
-msgstr "仅图标"
+#: tdeabc/addressee.cpp:530
+msgid "Home Address Zip Code"
+msgstr "家庭地址邮政编码"
 
-#: tdeui/tdetoolbar.cpp:2053
-msgid "Text Only"
-msgstr "仅文字"
+#: tdeabc/addressee.cpp:536
+msgid "Home Address Country"
+msgstr "家庭地址国家"
 
-#: tdeui/tdetoolbar.cpp:2054
-msgid "Text Alongside Icons"
-msgstr "文字在图标旁"
+#: tdeabc/addressee.cpp:542
+msgid "Home Address Label"
+msgstr "家庭地址门牌"
 
-#: tdeui/tdetoolbar.cpp:2055
-msgid "Text Under Icons"
-msgstr "文字在图标下"
+#: tdeabc/addressee.cpp:548
+msgid "Business Address Street"
+msgstr "办公地址街道"
 
-#: tdeui/tdetoolbar.cpp:2080 tdeui/tdetoolbar.cpp:2101
-msgid "Small (%1x%2)"
-msgstr "小 (%1x%2)"
+#: tdeabc/addressee.cpp:554
+msgid "Business Address City"
+msgstr "办公地址城市"
 
-#: tdeui/tdetoolbar.cpp:2082 tdeui/tdetoolbar.cpp:2103
-msgid "Medium (%1x%2)"
-msgstr "中 (%1x%2)"
+#: tdeabc/addressee.cpp:560
+msgid "Business Address State"
+msgstr "办公地址省"
 
-#: tdeui/tdetoolbar.cpp:2084 tdeui/tdetoolbar.cpp:2105
-msgid "Large (%1x%2)"
-msgstr "大 (%1x%2)"
+#: tdeabc/addressee.cpp:566
+msgid "Business Address Zip Code"
+msgstr "办公地址邮政编码"
 
-#: tdeui/tdetoolbar.cpp:2086 tdeui/tdetoolbar.cpp:2107
-msgid "Huge (%1x%2)"
-msgstr "巨大 (%1x%2)"
+#: tdeabc/addressee.cpp:572
+msgid "Business Address Country"
+msgstr "办公地址国家"
 
-#: tdeui/tdetoolbar.cpp:2118
-msgid "Text Position"
-msgstr "文字位置"
+#: tdeabc/addressee.cpp:578
+msgid "Business Address Label"
+msgstr "办公地址门牌"
 
-#: tdeui/tdetoolbar.cpp:2120
-msgid "Icon Size"
-msgstr "图标大小"
+#: tdeabc/addressee.cpp:584
+msgid "Home Phone"
+msgstr "家庭电话"
 
-#: tdeui/tdeaboutdialog.cpp:93
-msgid "Task"
-msgstr "任务"
+#: tdeabc/addressee.cpp:590
+msgid "Business Phone"
+msgstr "办公电话"
 
-#: tdeui/tdeaboutdialog.cpp:704
-msgid "%1 %2 (Using TDE %3)"
-msgstr "%1 %2 (使用 TDE %3)"
+#: tdeabc/addressee.cpp:596
+msgid "Mobile Phone"
+msgstr "移动电话"
 
-#: tdeui/tdeaboutdialog.cpp:706
-msgid "%1 %2, %3"
-msgstr "%1 %2，%3"
+#: tdeabc/addressee.cpp:608
+msgid "Business Fax"
+msgstr "办公传真"
 
-#: tdeui/tdeaboutdialog.cpp:1326
-msgid "Other Contributors:"
-msgstr "其它贡献者："
+#: tdeabc/addressee.cpp:614
+msgid "Car Phone"
+msgstr "车载电话"
 
-#: tdeui/tdeaboutdialog.cpp:1327
-msgid "(No logo available)"
-msgstr "(没有可用的徽标)"
+#: tdeabc/addressee.cpp:632
+msgid "Email Address"
+msgstr "电子邮件地址"
 
-#: tdeui/tdeaboutdialog.cpp:1772
-msgid "Image missing"
-msgstr "缺少图像"
+#: tdeabc/addressee.cpp:651
+msgid "Mail Client"
+msgstr "邮件客户"
 
-#: tdeui/ktimezonewidget.cpp:45
-msgid "Area"
-msgstr "区域"
+#: tdeabc/addressee.cpp:670
+msgid "Time Zone"
+msgstr "时区"
 
-#: kab/addressbook.cc:295 tdeui/ktimezonewidget.cpp:47
-msgid "Comment"
-msgstr "备注"
+#: tdeabc/addressee.cpp:689
+msgid "Geographic Position"
+msgstr "地理位置"
 
-#: tdeui/keditcl2.cpp:105 tdeui/keditcl2.cpp:375 tdeui/keditcl2.cpp:454
+#: kab/addressbook.cc:263 tdeabc/addressee.cpp:708
 msgid ""
-"End of document reached.\n"
-"Continue from the beginning?"
-msgstr ""
-"已到文件结尾。\n"
-"由开头继续?"
+"_: person\n"
+"Title"
+msgstr "头衔"
 
-#: tdeui/keditcl2.cpp:118 tdeui/keditcl2.cpp:388 tdeui/keditcl2.cpp:467
+#: tdeabc/addressee.cpp:727
 msgid ""
-"Beginning of document reached.\n"
-"Continue from the end?"
-msgstr ""
-"已到文档开头。\n"
-"由结尾继续?"
-
-#: tdeui/keditcl2.cpp:711 tdeui/keditcl2.cpp:844
-msgid "Find:"
-msgstr "查找："
-
-#: tdeui/keditcl2.cpp:728 tdeui/keditcl2.cpp:868
-msgid "Case &sensitive"
-msgstr "区分大小写(&S)"
-
-#: tdeui/keditcl2.cpp:730 tdeui/keditcl2.cpp:870 tdeutils/kfinddialog.cpp:171
-msgid "Find &backwards"
-msgstr "反向查找(&B)"
-
-#: tdeui/keditcl2.cpp:833
-msgid "Replace &All"
-msgstr "全部替换(&A)"
-
-#: tdeui/keditcl2.cpp:852
-msgid "Replace with:"
-msgstr "替换为："
-
-#: tdeui/keditcl2.cpp:984
-msgid "Go to line:"
-msgstr "跳至行："
-
-#: tdeui/twindowlistmenu.cpp:129
-msgid "Unclutter Windows"
-msgstr "排列窗口"
-
-#: tdeui/twindowlistmenu.cpp:131
-msgid "Cascade Windows"
-msgstr "层叠窗口"
-
-#: tdeui/twindowlistmenu.cpp:185
-msgid "On All Desktops"
-msgstr "在全部桌面"
-
-#: tdeui/twindowlistmenu.cpp:213
-msgid "No Windows"
-msgstr "无窗口"
-
-#: tdeui/ktextedit.cpp:231
-msgid "Check Spelling..."
-msgstr "检查拼写..."
-
-#: tdeui/ktextedit.cpp:237
-msgid "Auto Spell Check"
-msgstr "自动检查拼写"
-
-#: tdeui/ktextedit.cpp:241
-msgid "Allow Tabulations"
-msgstr "允许跳格"
-
-#: tdeui/ktextedit.cpp:353 tdehtml/rendering/render_form.cpp:331
-msgid "Spell Checking"
-msgstr "拼写检查"
-
-#: tdeui/tdespell.cpp:1176
-msgid "You have to restart the dialog for changes to take effect"
-msgstr "要使更改生效，您需要重新启动对话框"
-
-#: tdeui/tdespell.cpp:1402
-msgid "Spell Checker"
-msgstr "拼写检查器"
+"_: person in organization\n"
+"Role"
+msgstr "角色"
 
-#: tdeui/kcommand.cpp:151 tdeui/kcommand.cpp:166 tdeui/kcommand.cpp:199
-#: tdeui/kcommand.cpp:241
-#, c-format
-msgid "&Undo: %1"
-msgstr "撤消(&U)：%1"
+#: kab/addressbook.cc:180 tdeabc/addressee.cpp:765
+msgid "Department"
+msgstr "部门"
 
-#: tdeui/kcommand.cpp:192 tdeui/kcommand.cpp:247
-#, c-format
-msgid "&Redo: %1"
-msgstr "重做(&R)：%1"
+#: tdeabc/addressee.cpp:784
+msgid "Note"
+msgstr "注释"
 
-#: tdeui/kcommand.cpp:322
-#, c-format
-msgid "Undo: %1"
-msgstr "撤消：%1"
+#: tdeabc/addressee.cpp:803
+msgid "Product Identifier"
+msgstr "产品标识符"
 
-#: tdeui/kcommand.cpp:341 tdeui/kcommand.cpp:346
-#, c-format
-msgid "Redo: %1"
-msgstr "重做：%1"
+#: tdeabc/addressee.cpp:822
+msgid "Revision Date"
+msgstr "修订日期"
 
-#: tdehtml/tdehtmlimage.cpp:199
-msgid "%1 (%2 - %3x%4 Pixels)"
-msgstr "%1 (%2 - %3x%4 像素)"
+#: tdeabc/addressee.cpp:841
+msgid "Sort String"
+msgstr "排序字符串"
 
-#: tdehtml/tdehtmlimage.cpp:201
-msgid "%1 - %2x%3 Pixels"
-msgstr "%1 - %2x%3 像素"
+#: tdeabc/addressee.cpp:860 tdeui/tdeaboutdialog.cpp:92
+msgid "Homepage"
+msgstr "主页"
 
-#: tdehtml/tdehtmlimage.cpp:206
-msgid "%1 (%2x%3 Pixels)"
-msgstr "%1 (%2x%3 像素)"
+#: tdeabc/addressee.cpp:879
+msgid "Security Class"
+msgstr "安全级别"
 
-#: tdehtml/tdehtmlimage.cpp:208
-msgid "Image - %1x%2 Pixels"
-msgstr "图像 - %1x%2 像素"
+#: tdeabc/addressee.cpp:898
+msgid "Logo"
+msgstr "标志"
 
-#: tdehtml/tdehtmlimage.cpp:214
-msgid "Done."
-msgstr "完成。"
+#: tdeabc/addressee.cpp:917
+msgid "Photo"
+msgstr "照片"
 
-#: tdehtml/tdehtml_ext.cpp:434
-msgid "&Copy Text"
-msgstr "复制文字(&C)"
+#: tdeabc/addressee.cpp:955
+msgid "Agent"
+msgstr "代理"
 
-#: tdehtml/tdehtml_ext.cpp:480
-msgid "Search for '%1' with %2"
-msgstr "用 %2 搜索“%1”"
+#: tdeabc/vcard/testwrite.cpp:11
+msgid "TestWritevCard"
+msgstr "TestWritevCard"
 
-#: tdehtml/tdehtml_ext.cpp:489
-msgid "Search for '%1' with"
-msgstr "搜索“%1”的方式"
+#: tdeabc/vcardparser/testread.cpp:38
+msgid "vCard 2.1"
+msgstr "vCard 2.1"
 
-#: tdehtml/tdehtml_ext.cpp:518
-msgid "Open '%1'"
-msgstr "用“%1”打开"
+#: tdeabc/vcardparser/testread.cpp:39 tdewidgets/maketdewidgets.cpp:112
+msgid "Input file"
+msgstr "输入文件"
 
-#: tdehtml/tdehtml_ext.cpp:525 tdehtml/tdehtml_ext.cpp:582
-msgid "Stop Animations"
-msgstr "停止动画"
+#: kjs/reference.cpp:96
+msgid "Invalid reference base"
+msgstr "无效的引用基础"
 
-#: tdehtml/tdehtml_ext.cpp:533
-msgid "Copy Email Address"
-msgstr "复制电子邮件地址"
+#: kjs/reference.cpp:127
+msgid "Can't find variable: "
+msgstr "找不到变量："
 
-#: tdehtml/tdehtml_ext.cpp:538
-msgid "&Save Link As..."
-msgstr "链接另存为(&S)..."
+#: kjs/reference.cpp:134
+msgid "Base is not an object"
+msgstr "基础不是对象"
 
-#: tdehtml/tdehtml_ext.cpp:540
-msgid "Copy &Link Address"
-msgstr "复制链接地址(&L)"
+#: kjs/function_object.cpp:290
+msgid "Syntax error in parameter list"
+msgstr "在参数表中有语法错误"
 
-#: tdehtml/tdehtml_ext.cpp:550
-msgid "Open in New &Window"
-msgstr "在新窗口中打开(&W)"
+#: kjs/object.cpp:349
+msgid "No default value"
+msgstr "没有默认值"
 
-#: tdehtml/tdehtml_ext.cpp:552
-msgid "Open in &This Window"
-msgstr "在此窗口中打开(&T)"
+#: kjs/object.cpp:494
+msgid "Evaluation error"
+msgstr "赋值错误"
 
-#: tdehtml/tdehtml_ext.cpp:554
-msgid "Open in &New Tab"
-msgstr "在新标签中打开(&N)"
+#: kjs/object.cpp:495
+msgid "Range error"
+msgstr "范围错误"
 
-#: tdehtml/tdehtml_ext.cpp:556
-msgid "Reload Frame"
-msgstr "刷新框架"
+#: kjs/object.cpp:496
+msgid "Reference error"
+msgstr "引用错误"
 
-#: tdehtml/tdehtml_ext.cpp:561
-msgid "Block IFrame..."
-msgstr "屏蔽 IFrame..."
+#: kjs/object.cpp:497
+msgid "Syntax error"
+msgstr "语法错误"
 
-#: tdehtml/tdehtml_ext.cpp:564 tdehtml/tdehtml_part.cpp:256
-msgid "View Frame Source"
-msgstr "查看框架源文件"
+#: kjs/object.cpp:498
+msgid "Type error"
+msgstr "类型错误"
 
-#: tdehtml/tdehtml_ext.cpp:566
-msgid "View Frame Information"
-msgstr "查看框架信息"
+#: kjs/object.cpp:499
+msgid "URI error"
+msgstr "URI 错误"
 
-#: tdehtml/tdehtml_ext.cpp:570 tdehtml/tdehtml_part.cpp:404
-msgid "Print Frame..."
-msgstr "打印框架..."
+#: kjs/internal.cpp:135
+msgid "Undefined value"
+msgstr "没有定义的值"
 
-#: tdehtml/tdehtml_ext.cpp:571 tdehtml/tdehtml_part.cpp:262
-msgid "Save &Frame As..."
-msgstr "框架另存为(&F)..."
+#: kjs/internal.cpp:166
+msgid "Null value"
+msgstr "空值"
 
-#: tdehtml/tdehtml_ext.cpp:601
-msgid "Save Image As..."
-msgstr "图像另存为..."
+#: tdefile-plugins/elf/tdefile_elf.cpp:59
+#: tdefile-plugins/elf/tdefile_elf.cpp:83
+msgid "Embedded Metadata"
+msgstr ""
 
-#: tdehtml/tdehtml_ext.cpp:603
-msgid "Send Image..."
-msgstr "发送图像..."
+#: tdefile-plugins/elf/tdefile_elf.cpp:60
+#: tdefile-plugins/elf/tdefile_elf.cpp:84
+msgid "Embedded Icon(s)"
+msgstr ""
 
-#: tdehtml/tdehtml_ext.cpp:608
-msgid "Copy Image"
-msgstr "复制图像"
+#: tdefile-plugins/elf/tdefile_elf.cpp:64
+#: tdefile-plugins/elf/tdefile_elf.cpp:86
+#, fuzzy
+msgid "Internal Name"
+msgstr "额外名"
 
-#: tdehtml/tdehtml_ext.cpp:613
-msgid "Copy Image Location"
-msgstr "复制图像位置"
+#: tdefile-plugins/elf/tdefile_elf.cpp:65
+#: tdefile-plugins/elf/tdefile_elf.cpp:87
+#, fuzzy
+msgid "Description"
+msgstr "描述："
 
-#: tdehtml/tdehtml_ext.cpp:618
-msgid "View Image (%1)"
-msgstr "查看图像(%1)"
+#: tdefile-plugins/elf/tdefile_elf.cpp:66
+#: tdefile-plugins/elf/tdefile_elf.cpp:88
+#, fuzzy
+msgid "License"
+msgstr "许可："
 
-#: tdehtml/tdehtml_ext.cpp:623
-msgid "Block Image..."
-msgstr "屏蔽图像..."
+#: tdefile-plugins/elf/tdefile_elf.cpp:67
+#: tdefile-plugins/elf/tdefile_elf.cpp:89
+#, fuzzy
+msgid "Copyright"
+msgstr "复制"
 
-#: tdehtml/tdehtml_ext.cpp:629
-#, c-format
-msgid "Block Images From %1"
-msgstr "屏蔽来自 %1 的图像"
+#: tdefile-plugins/elf/tdefile_elf.cpp:68
+#: tdefile-plugins/elf/tdefile_elf.cpp:90
+#, fuzzy
+msgid "Author(s)"
+msgstr "作者(&U)"
 
-#: tdehtml/tdehtml_ext.cpp:653
-msgid "Save Link As"
-msgstr "链接另存为"
+#: tdefile-plugins/elf/tdefile_elf.cpp:69
+#: tdefile-plugins/elf/tdefile_elf.cpp:91
+msgid "Product"
+msgstr ""
 
-#: tdehtml/tdehtml_ext.cpp:673
-msgid "Save Image As"
-msgstr "图像另存为"
+#: tdefile-plugins/elf/tdefile_elf.cpp:71
+#: tdefile-plugins/elf/tdefile_elf.cpp:93 tdenewstuff/downloaddialog.cpp:282
+#: tdenewstuff/downloaddialog.cpp:288 tdenewstuff/downloaddialog.cpp:294
+msgid "Version"
+msgstr "版本"
 
-#: tdehtml/tdehtml_ext.cpp:687 tdehtml/tdehtml_ext.cpp:700
-msgid "Add URL to Filter"
-msgstr "将 URL 添加到过滤器"
+#: tdefile-plugins/elf/tdefile_elf.cpp:72
+#: tdefile-plugins/elf/tdefile_elf.cpp:94
+msgid "Compilation Date/Time"
+msgstr ""
 
-#: tdehtml/tdehtml_ext.cpp:688 tdehtml/tdehtml_ext.cpp:701
-msgid "Enter the URL:"
-msgstr "输入 URL："
+#: tdefile-plugins/elf/tdefile_elf.cpp:73
+#: tdefile-plugins/elf/tdefile_elf.cpp:95
+#, fuzzy
+msgid "Requested Icon"
+msgstr "要求的字体"
 
-#: tdehtml/tdehtml_ext.cpp:828
-msgid ""
-"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
-msgstr "名为“%1”的文件已经存在。您确定要覆盖它吗？"
+#: tdefile-plugins/elf/tdefile_elf.cpp:74
+#: tdefile-plugins/elf/tdefile_elf.cpp:96
+#, fuzzy
+msgid "SCM Module"
+msgstr "MDI 模式"
 
-#: tdehtml/tdehtml_ext.cpp:828
-msgid "Overwrite File?"
-msgstr "覆盖文件吗？"
+#: tdefile-plugins/elf/tdefile_elf.cpp:75
+#: tdefile-plugins/elf/tdefile_elf.cpp:97
+#, fuzzy
+msgid "SCM Revision"
+msgstr "修订日期"
 
-#: tdehtml/tdehtml_ext.cpp:889 tdeparts/browserrun.cpp:390
-msgid "The Download Manager (%1) could not be found in your $PATH "
-msgstr "无法在搜索路径 $PATH 中找到下载管理器(%1)。"
+#: tdefile-plugins/elf/tdefile_elf.cpp:76
+#: tdefile-plugins/elf/tdefile_elf.cpp:98
+#, fuzzy
+msgid "Comments"
+msgstr "备注"
 
-#: tdehtml/tdehtml_ext.cpp:890 tdeparts/browserrun.cpp:391
-msgid ""
-"Try to reinstall it  \n"
-"\n"
-"The integration with Konqueror will be disabled!"
+#: tdefile-plugins/elf/tdefile_elf.cpp:78
+#: tdefile-plugins/elf/tdefile_elf.cpp:100
+msgid "Icon Name(s)"
 msgstr ""
-"试着重新安装\n"
-"\n"
-"与 Konqueror 的集成将被禁用！"
-
-#: tdehtml/tdehtml_ext.cpp:983
-#, no-c-format
-msgid "Default Font Size (100%)"
-msgstr "默认字体大小(100%)"
-
-#: tdehtml/tdehtml_ext.cpp:996
-#, no-c-format
-msgid "%1%"
-msgstr "%1%"
 
 #: tdehtml/tdehtml_printsettings.cpp:31
 msgid ""
@@ -6871,6 +5475,10 @@ msgstr "打印页眉"
 msgid "View Do&cument Source"
 msgstr "查看文档源文件(&C)"
 
+#: tdehtml/tdehtml_ext.cpp:564 tdehtml/tdehtml_part.cpp:256
+msgid "View Frame Source"
+msgstr "查看框架源文件"
+
 #: tdehtml/tdehtml_part.cpp:257
 msgid "View Document Information"
 msgstr "查看文档信息"
@@ -6879,6 +5487,10 @@ msgstr "查看文档信息"
 msgid "Save &Background Image As..."
 msgstr "背景图像另存为(&B)..."
 
+#: tdehtml/tdehtml_ext.cpp:571 tdehtml/tdehtml_part.cpp:262
+msgid "Save &Frame As..."
+msgstr "框架另存为(&F)..."
+
 #: tdehtml/tdehtml_part.cpp:263
 msgid "Security..."
 msgstr "安全..."
@@ -6912,7 +5524,15 @@ msgstr "设置编码(&E)"
 msgid "Semi-Automatic"
 msgstr "半自动"
 
-#: tdehtml/tdehtml_part.cpp:297 tdehtml/tdehtml_part.cpp:2298
+#: tdehtml/tdehtml_part.cpp:288 tdeui/ksconfig.cpp:324
+msgid "Russian"
+msgstr "俄语"
+
+#: tdehtml/tdehtml_part.cpp:291 tdeui/ksconfig.cpp:342
+msgid "Ukrainian"
+msgstr "乌克兰语"
+
+#: tdehtml/tdehtml_part.cpp:297 tdehtml/tdehtml_part.cpp:2302
 msgid "Automatic Detection"
 msgstr "自动检测"
 
@@ -6976,6 +5596,10 @@ msgstr "输入时查找文字"
 msgid "Find Links as You Type"
 msgstr "输入时查找链接"
 
+#: tdehtml/tdehtml_ext.cpp:570 tdehtml/tdehtml_part.cpp:404
+msgid "Print Frame..."
+msgstr "打印框架..."
+
 #: tdehtml/tdehtml_part.cpp:405
 msgid ""
 "Print Frame"
@@ -7015,148 +5639,148 @@ msgstr "<b>错误</b>：结点 %1：%2"
 msgid "Display Images on Page"
 msgstr "显示页面中的图像"
 
-#: tdehtml/tdehtml_part.cpp:1539 tdehtml/tdehtml_part.cpp:1629
+#: tdehtml/tdehtml_part.cpp:1543 tdehtml/tdehtml_part.cpp:1633
 msgid "Session is secured with %1 bit %2."
 msgstr "会话使用 %1 位 %2 保卫安全。"
 
-#: tdehtml/tdehtml_part.cpp:1540 tdehtml/tdehtml_part.cpp:1631
+#: tdehtml/tdehtml_part.cpp:1544 tdehtml/tdehtml_part.cpp:1635
 msgid "Session is not secured."
 msgstr "会话不安全。"
 
-#: tdehtml/tdehtml_part.cpp:1727
+#: tdehtml/tdehtml_part.cpp:1731
 #, c-format
 msgid "Error while loading %1"
 msgstr "载入 %1 时出错"
 
-#: tdehtml/tdehtml_part.cpp:1729
+#: tdehtml/tdehtml_part.cpp:1733
 msgid "An error occurred while loading <B>%1</B>:"
 msgstr "载入 <B>%1</B> 时发生错误："
 
-#: tdehtml/tdehtml_part.cpp:1764
+#: tdehtml/tdehtml_part.cpp:1768
 msgid "Error: "
 msgstr "错误："
 
-#: tdehtml/tdehtml_part.cpp:1767
+#: tdehtml/tdehtml_part.cpp:1771
 msgid "The requested operation could not be completed"
 msgstr "请求的操作无法完成"
 
-#: tdehtml/tdehtml_part.cpp:1773
+#: tdehtml/tdehtml_part.cpp:1777
 msgid "Technical Reason: "
 msgstr "技术原因："
 
-#: tdehtml/tdehtml_part.cpp:1778
+#: tdehtml/tdehtml_part.cpp:1782
 msgid "Details of the Request:"
 msgstr "请求的细节："
 
-#: tdehtml/tdehtml_part.cpp:1780
+#: tdehtml/tdehtml_part.cpp:1784
 #, c-format
 msgid "URL: %1"
 msgstr "URL：%1"
 
-#: tdehtml/tdehtml_part.cpp:1787
+#: tdehtml/tdehtml_part.cpp:1791
 #, c-format
 msgid "Date and Time: %1"
 msgstr "日期和时间：%1"
 
-#: tdehtml/tdehtml_part.cpp:1789
+#: tdehtml/tdehtml_part.cpp:1793
 #, c-format
 msgid "Additional Information: %1"
 msgstr "其它信息：%1"
 
-#: tdehtml/tdehtml_part.cpp:1791
+#: tdehtml/tdehtml_part.cpp:1795
 msgid "Description:"
 msgstr "描述："
 
-#: tdehtml/tdehtml_part.cpp:1797
+#: tdehtml/tdehtml_part.cpp:1801
 msgid "Possible Causes:"
 msgstr "可能的原因："
 
-#: tdehtml/tdehtml_part.cpp:1804
+#: tdehtml/tdehtml_part.cpp:1808
 msgid "Possible Solutions:"
 msgstr "可能的解决方法："
 
-#: tdehtml/tdehtml_part.cpp:2135
+#: tdehtml/tdehtml_part.cpp:2139
 msgid "Page loaded."
 msgstr "页面已载入。"
 
-#: tdehtml/tdehtml_part.cpp:2137
+#: tdehtml/tdehtml_part.cpp:2141
 msgid ""
 "_n: %n Image of %1 loaded.\n"
 "%n Images of %1 loaded."
 msgstr "已载入 %1 个图像中的 %n 个。"
 
-#: tdehtml/tdehtml_part.cpp:3738 tdehtml/tdehtml_part.cpp:3825
-#: tdehtml/tdehtml_part.cpp:3836
+#: tdehtml/tdehtml_part.cpp:3742 tdehtml/tdehtml_part.cpp:3829
+#: tdehtml/tdehtml_part.cpp:3840
 msgid " (In new window)"
 msgstr " (在新窗口中)"
 
-#: tdehtml/tdehtml_part.cpp:3777
+#: tdehtml/tdehtml_part.cpp:3781
 msgid "Symbolic Link"
 msgstr "符号链接"
 
-#: tdehtml/tdehtml_part.cpp:3779
+#: tdehtml/tdehtml_part.cpp:3783
 msgid "%1 (Link)"
 msgstr "%1 (链接)"
 
-#: tdehtml/tdehtml_part.cpp:3799
+#: tdehtml/tdehtml_part.cpp:3803
 msgid "%2 (%1 bytes)"
 msgstr "%2 (%1 字节)"
 
-#: tdehtml/tdehtml_part.cpp:3803
+#: tdehtml/tdehtml_part.cpp:3807
 msgid "%2 (%1 K)"
 msgstr " %2 (%1 K)"
 
-#: tdehtml/tdehtml_part.cpp:3838
+#: tdehtml/tdehtml_part.cpp:3842
 msgid " (In other frame)"
 msgstr " (在另外的框架)"
 
-#: tdehtml/tdehtml_part.cpp:3843
+#: tdehtml/tdehtml_part.cpp:3847
 msgid "Email to: "
 msgstr "邮寄给："
 
-#: tdehtml/tdehtml_part.cpp:3849
+#: tdehtml/tdehtml_part.cpp:3853
 msgid " - Subject: "
 msgstr " - 主题："
 
-#: tdehtml/tdehtml_part.cpp:3851
+#: tdehtml/tdehtml_part.cpp:3855
 msgid " - CC: "
 msgstr " - 抄送："
 
-#: tdehtml/tdehtml_part.cpp:3853
+#: tdehtml/tdehtml_part.cpp:3857
 msgid " - BCC: "
 msgstr " - 暗送："
 
-#: tdehtml/tdehtml_part.cpp:3942
+#: tdehtml/tdehtml_part.cpp:3946
 msgid ""
 "<qt>This untrusted page links to<BR><B>%1</B>.<BR>Do you want to follow the "
 "link?"
 msgstr "<qt>这个不受信任的页面包含一个链接<BR><B>%1</B>。<BR>您是否想要跟随链接？"
 
-#: tdehtml/tdehtml_part.cpp:3943
+#: tdehtml/tdehtml_part.cpp:3947
 msgid "Follow"
 msgstr "跟随"
 
-#: tdehtml/tdehtml_part.cpp:4043
+#: tdehtml/tdehtml_part.cpp:4047
 msgid "Frame Information"
 msgstr "框架信息"
 
-#: tdehtml/tdehtml_part.cpp:4049
+#: tdehtml/tdehtml_part.cpp:4053
 msgid "   <a href=\"%1\">[Properties]</a>"
 msgstr "   <a href=\"%1\">[属性]</a>"
 
-#: tdehtml/tdehtml_part.cpp:4129
+#: tdehtml/tdehtml_part.cpp:4133
 msgid "Save Background Image As"
 msgstr "背景图像另存为(&B)"
 
-#: tdehtml/tdehtml_part.cpp:4216
+#: tdehtml/tdehtml_part.cpp:4220
 msgid "Save Frame As"
 msgstr "框架另存为"
 
-#: tdehtml/tdehtml_part.cpp:4256
+#: tdehtml/tdehtml_part.cpp:4260
 msgid "&Find in Frame..."
 msgstr "在框架中查找(&F)..."
 
-#: tdehtml/tdehtml_part.cpp:4763
+#: tdehtml/tdehtml_part.cpp:4767
 msgid ""
 "Warning:  This is a secure form but it is attempting to send your data back "
 "unencrypted.\n"
@@ -7167,16 +5791,16 @@ msgstr ""
 "第三方可能可以截获并查看该信息。\n"
 "您确定要继续吗？"
 
-#: tdehtml/tdehtml_part.cpp:4766 tdehtml/tdehtml_part.cpp:4775
-#: tdehtml/tdehtml_part.cpp:4799
+#: tdehtml/tdehtml_part.cpp:4770 tdehtml/tdehtml_part.cpp:4779
+#: tdehtml/tdehtml_part.cpp:4803
 msgid "Network Transmission"
 msgstr "网络传送"
 
-#: tdehtml/tdehtml_part.cpp:4766 tdehtml/tdehtml_part.cpp:4776
+#: tdehtml/tdehtml_part.cpp:4770 tdehtml/tdehtml_part.cpp:4780
 msgid "&Send Unencrypted"
 msgstr "不加密发送(&S)"
 
-#: tdehtml/tdehtml_part.cpp:4773
+#: tdehtml/tdehtml_part.cpp:4777
 msgid ""
 "Warning: Your data is about to be transmitted across the network unencrypted.\n"
 "Are you sure you wish to continue?"
@@ -7184,7 +5808,7 @@ msgstr ""
 "警告：您的数据即将在网络上明文传输。\n"
 "您确定要继续吗？"
 
-#: tdehtml/tdehtml_part.cpp:4797
+#: tdehtml/tdehtml_part.cpp:4801
 msgid ""
 "This site is attempting to submit form data via email.\n"
 "Do you want to continue?"
@@ -7192,68 +5816,69 @@ msgstr ""
 "该站点试图通过电子邮件来提交表格数据。\n"
 "您想继续吗？"
 
-#: tdehtml/tdehtml_part.cpp:4800
+#: tdehtml/tdehtml_part.cpp:4804
 msgid "&Send Email"
 msgstr "发送电子邮件(&S)"
 
-#: tdehtml/tdehtml_part.cpp:4821
+#: tdehtml/tdehtml_part.cpp:4825
 msgid ""
 "<qt>The form will be submitted to <BR><B>%1</B><BR>on your local filesystem.<BR>"
 "Do you want to submit the form?"
 msgstr "<qt>将把表格提交到<BR>您的本地文件系统上的<BR><B>%1。</B><BR>您真的要提交表格吗？"
 
-#: tdehtml/html/html_formimpl.cpp:1531 tdehtml/html/html_formimpl.cpp:2137
-#: tdehtml/tdehtml_part.cpp:4822 tdehtml/tdehtmlview.cpp:2527 tdehtml/tdehtmlview.cpp:2569
+#: tdehtml/html/html_formimpl.cpp:1527 tdehtml/html/html_formimpl.cpp:2133
+#: tdehtml/tdehtml_part.cpp:4826 tdehtml/tdehtmlview.cpp:2558
+#: tdehtml/tdehtmlview.cpp:2600
 msgid "Submit"
 msgstr "提交"
 
-#: tdehtml/tdehtml_part.cpp:4870
+#: tdehtml/tdehtml_part.cpp:4874
 msgid ""
 "This site attempted to attach a file from your computer in the form submission. "
 "The attachment was removed for your protection."
 msgstr "该网站在提交表格时试图从您的计算机中附加文件。为了保护您的隐私，附件已被删除。"
 
-#: tdehtml/tdehtml_part.cpp:4870
+#: tdehtml/tdehtml_part.cpp:4874
 msgid "TDE"
 msgstr "TDE"
 
-#: tdehtml/tdehtml_part.cpp:5776
+#: tdehtml/tdehtml_part.cpp:5782
 msgid "(%1/s)"
 msgstr "(%1/秒)"
 
-#: tdehtml/tdehtml_part.cpp:6829
+#: tdehtml/tdehtml_part.cpp:6835
 msgid "Security Warning"
 msgstr "安全警告"
 
-#: tdehtml/tdehtml_part.cpp:6835
+#: tdehtml/tdehtml_part.cpp:6841
 msgid "<qt>Access by untrusted page to<BR><B>%1</B><BR> denied."
 msgstr "<qt>不信任的页面无法访问<BR><B>%1</B><BR>。"
 
-#: tdehtml/java/kjavaappletserver.cpp:784 tdehtml/tdehtml_part.cpp:6836
+#: tdehtml/java/kjavaappletserver.cpp:784 tdehtml/tdehtml_part.cpp:6842
 msgid "Security Alert"
 msgstr "安全警报"
 
-#: tdehtml/tdehtml_part.cpp:7261
+#: tdehtml/tdehtml_part.cpp:7267
 msgid "The wallet '%1' is open and being used for form data and passwords."
 msgstr "钱包“%1”已打开，正用于填充表单数据和密码。"
 
-#: tdehtml/tdehtml_part.cpp:7315
+#: tdehtml/tdehtml_part.cpp:7321
 msgid "&Close Wallet"
 msgstr "关闭钱包(&C)"
 
-#: tdehtml/tdehtml_part.cpp:7358
+#: tdehtml/tdehtml_part.cpp:7364
 msgid "JavaScript &Debugger"
 msgstr "JavaScript 调试器(&D)"
 
-#: tdehtml/tdehtml_part.cpp:7393
+#: tdehtml/tdehtml_part.cpp:7399
 msgid "This page was prevented from opening a new window via JavaScript."
 msgstr "此页面通过 JavaScript 弹出的窗口被屏蔽。"
 
-#: tdehtml/tdehtml_part.cpp:7399
+#: tdehtml/tdehtml_part.cpp:7405
 msgid "Popup Window Blocked"
 msgstr "屏蔽了弹出窗口"
 
-#: tdehtml/tdehtml_part.cpp:7399
+#: tdehtml/tdehtml_part.cpp:7405
 msgid ""
 "This page has attempted to open a popup window but was blocked.\n"
 "You can click on this icon in the status bar to control this behavior\n"
@@ -7262,246 +5887,354 @@ msgstr ""
 "此页面试图打开弹出窗口，但该弹出窗口已经被屏蔽。\n"
 "您可以单击状态栏上的此图标控制此行为或打开弹出窗口。"
 
-#: tdehtml/tdehtml_part.cpp:7413
+#: tdehtml/tdehtml_part.cpp:7419
 #, c-format
 msgid ""
 "_n: &Show Blocked Popup Window\n"
 "Show %n Blocked Popup Windows"
 msgstr "显示 %n 个屏蔽的弹出窗口"
 
-#: tdehtml/tdehtml_part.cpp:7414
+#: tdehtml/tdehtml_part.cpp:7420
 msgid "Show Blocked Window Passive Popup &Notification"
 msgstr "显示屏蔽窗口弹出通知(&N)"
 
-#: tdehtml/tdehtml_part.cpp:7416
+#: tdehtml/tdehtml_part.cpp:7422
 msgid "&Configure JavaScript New Window Policies..."
 msgstr "配置 JavaScript 新窗口策略(&C)..."
 
-#: tdehtml/tdehtmlview.cpp:1625
+#: tdehtml/tdehtml_factory.cpp:177
+msgid "TDEHTML"
+msgstr "TDEHTML"
+
+#: tdehtml/tdehtml_factory.cpp:178
+msgid "Embeddable HTML component"
+msgstr "可嵌入的 HTML 部件"
+
+#: tdehtml/tdehtmlimage.cpp:199
+msgid "%1 (%2 - %3x%4 Pixels)"
+msgstr "%1 (%2 - %3x%4 像素)"
+
+#: tdehtml/tdehtmlimage.cpp:201
+msgid "%1 - %2x%3 Pixels"
+msgstr "%1 - %2x%3 像素"
+
+#: tdehtml/tdehtmlimage.cpp:206
+msgid "%1 (%2x%3 Pixels)"
+msgstr "%1 (%2x%3 像素)"
+
+#: tdehtml/tdehtmlimage.cpp:208
+msgid "Image - %1x%2 Pixels"
+msgstr "图像 - %1x%2 像素"
+
+#: tdehtml/tdehtmlimage.cpp:214
+msgid "Done."
+msgstr "完成。"
+
+#: tdehtml/tdehtml_ext.cpp:434
+msgid "&Copy Text"
+msgstr "复制文字(&C)"
+
+#: tdehtml/tdehtml_ext.cpp:480
+msgid "Search for '%1' with %2"
+msgstr "用 %2 搜索“%1”"
+
+#: tdehtml/tdehtml_ext.cpp:489
+msgid "Search for '%1' with"
+msgstr "搜索“%1”的方式"
+
+#: tdehtml/tdehtml_ext.cpp:518
+msgid "Open '%1'"
+msgstr "用“%1”打开"
+
+#: tdehtml/tdehtml_ext.cpp:525 tdehtml/tdehtml_ext.cpp:582
+msgid "Stop Animations"
+msgstr "停止动画"
+
+#: tdehtml/tdehtml_ext.cpp:533
+msgid "Copy Email Address"
+msgstr "复制电子邮件地址"
+
+#: tdehtml/tdehtml_ext.cpp:538
+msgid "&Save Link As..."
+msgstr "链接另存为(&S)..."
+
+#: tdehtml/tdehtml_ext.cpp:540
+msgid "Copy &Link Address"
+msgstr "复制链接地址(&L)"
+
+#: tdehtml/tdehtml_ext.cpp:550
+msgid "Open in New &Window"
+msgstr "在新窗口中打开(&W)"
+
+#: tdehtml/tdehtml_ext.cpp:552
+msgid "Open in &This Window"
+msgstr "在此窗口中打开(&T)"
+
+#: tdehtml/tdehtml_ext.cpp:554
+msgid "Open in &New Tab"
+msgstr "在新标签中打开(&N)"
+
+#: tdehtml/tdehtml_ext.cpp:556
+msgid "Reload Frame"
+msgstr "刷新框架"
+
+#: tdehtml/tdehtml_ext.cpp:561
+msgid "Block IFrame..."
+msgstr "屏蔽 IFrame..."
+
+#: tdehtml/tdehtml_ext.cpp:566
+msgid "View Frame Information"
+msgstr "查看框架信息"
+
+#: tdehtml/tdehtml_ext.cpp:601
+msgid "Save Image As..."
+msgstr "图像另存为..."
+
+#: tdehtml/tdehtml_ext.cpp:603
+msgid "Send Image..."
+msgstr "发送图像..."
+
+#: tdehtml/tdehtml_ext.cpp:608
+msgid "Copy Image"
+msgstr "复制图像"
+
+#: tdehtml/tdehtml_ext.cpp:613
+msgid "Copy Image Location"
+msgstr "复制图像位置"
+
+#: tdehtml/tdehtml_ext.cpp:618
+msgid "View Image (%1)"
+msgstr "查看图像(%1)"
+
+#: tdehtml/tdehtml_ext.cpp:623
+msgid "Block Image..."
+msgstr "屏蔽图像..."
+
+#: tdehtml/tdehtml_ext.cpp:629
+#, c-format
+msgid "Block Images From %1"
+msgstr "屏蔽来自 %1 的图像"
+
+#: tdehtml/tdehtml_ext.cpp:653
+msgid "Save Link As"
+msgstr "链接另存为"
+
+#: tdehtml/tdehtml_ext.cpp:673
+msgid "Save Image As"
+msgstr "图像另存为"
+
+#: tdehtml/tdehtml_ext.cpp:687 tdehtml/tdehtml_ext.cpp:700
+msgid "Add URL to Filter"
+msgstr "将 URL 添加到过滤器"
+
+#: tdehtml/tdehtml_ext.cpp:688 tdehtml/tdehtml_ext.cpp:701
+msgid "Enter the URL:"
+msgstr "输入 URL："
+
+#: tdehtml/tdehtml_ext.cpp:828
+msgid ""
+"A file named \"%1\" already exists. Are you sure you want to overwrite it?"
+msgstr "名为“%1”的文件已经存在。您确定要覆盖它吗？"
+
+#: tdehtml/tdehtml_ext.cpp:828
+msgid "Overwrite File?"
+msgstr "覆盖文件吗？"
+
+#: tdehtml/tdehtml_ext.cpp:828 tdenewstuff/knewstuffgeneric.cpp:141
+msgid "Overwrite"
+msgstr "覆盖"
+
+#: tdehtml/tdehtml_ext.cpp:889 tdeparts/browserrun.cpp:390
+msgid "The Download Manager (%1) could not be found in your $PATH "
+msgstr "无法在搜索路径 $PATH 中找到下载管理器(%1)。"
+
+#: tdehtml/tdehtml_ext.cpp:890 tdeparts/browserrun.cpp:391
+msgid ""
+"Try to reinstall it  \n"
+"\n"
+"The integration with Konqueror will be disabled!"
+msgstr ""
+"试着重新安装\n"
+"\n"
+"与 Konqueror 的集成将被禁用！"
+
+#: tdehtml/tdehtml_ext.cpp:983
+#, no-c-format
+msgid "Default Font Size (100%)"
+msgstr "默认字体大小(100%)"
+
+#: tdehtml/tdehtml_ext.cpp:996
+#, no-c-format
+msgid "%1%"
+msgstr "%1%"
+
+#: tdehtml/tdehtmlview.cpp:1644
 msgid "Find stopped."
 msgstr "查找已停止。"
 
-#: tdehtml/tdehtmlview.cpp:1636
+#: tdehtml/tdehtmlview.cpp:1655
 msgid "Starting -- find links as you type"
 msgstr "开始 - 查找您输入的链接"
 
-#: tdehtml/tdehtmlview.cpp:1642
+#: tdehtml/tdehtmlview.cpp:1661
 msgid "Starting -- find text as you type"
 msgstr "开始 - 查找您输入的文字"
 
-#: tdehtml/tdehtmlview.cpp:1663
+#: tdehtml/tdehtmlview.cpp:1682
 msgid "Link found: \"%1\"."
 msgstr "找到链接：“%1”。"
 
-#: tdehtml/tdehtmlview.cpp:1668
+#: tdehtml/tdehtmlview.cpp:1687
 msgid "Link not found: \"%1\"."
 msgstr "未找到链接：“%1”。"
 
-#: tdehtml/tdehtmlview.cpp:1676
+#: tdehtml/tdehtmlview.cpp:1695
 msgid "Text found: \"%1\"."
 msgstr "找到文字：“%1”。"
 
-#: tdehtml/tdehtmlview.cpp:1681
+#: tdehtml/tdehtmlview.cpp:1700
 msgid "Text not found: \"%1\"."
 msgstr "文本未找到：“%1”。"
 
-#: tdehtml/tdehtmlview.cpp:1725
+#: tdehtml/tdehtmlview.cpp:1752
 msgid "Access Keys activated"
 msgstr "激活了访问键"
 
-#: tdehtml/tdehtmlview.cpp:2756
+#: tdehtml/html/html_formimpl.cpp:2125 tdehtml/tdehtmlview.cpp:2572
+#: tdehtml/tdehtmlview.cpp:2605 tdeui/kedittoolbar.cpp:447
+msgid "Reset"
+msgstr "重置"
+
+#: tdehtml/tdehtmlview.cpp:2787
 #, c-format
 msgid "Print %1"
 msgstr "打印 %1"
 
-#: tdehtml/tdehtml_factory.cpp:177
-msgid "TDEHTML"
-msgstr "TDEHTML"
-
-#: tdehtml/tdehtml_factory.cpp:178
-msgid "Embeddable HTML component"
-msgstr "可嵌入的 HTML 部件"
-
-#: tdehtml/xml/xml_tokenizer.cpp:312
-msgid "the document is not in the correct file format"
-msgstr "文档的文件格式不正确"
-
-#: tdehtml/xml/xml_tokenizer.cpp:318
-msgid "fatal parsing error: %1 in line %2, column %3"
-msgstr "致命解析错误：%1 位于行 %2，列 %3"
-
-#: tdehtml/xml/xml_tokenizer.cpp:477
-msgid "XML parsing error"
-msgstr "XML 解析错误"
+#: tdehtml/rendering/render_frames.cpp:957
+msgid ""
+"No plugin found for '%1'.\n"
+"Do you want to download one from %2?"
+msgstr ""
+"没有找到用于“%1”的插件。\n"
+"您要从 %2 下载吗？"
 
-#: tdehtml/xml/dom_docimpl.cpp:2077
-msgid "Basic Page Style"
-msgstr "基本页面样式"
+#: tdehtml/rendering/render_frames.cpp:958
+msgid "Missing Plugin"
+msgstr "缺少插件"
 
-#: tdehtml/ecma/kjs_debugwin.cpp:291
-msgid "JavaScript Error"
-msgstr "JavaScript 错误"
+#: tdehtml/rendering/render_frames.cpp:958
+msgid "Download"
+msgstr "下载"
 
-#: tdehtml/ecma/kjs_debugwin.cpp:305
-msgid "&Do not show this message again"
-msgstr "不再显示本信息(&D)"
+#: tdehtml/rendering/render_frames.cpp:958
+msgid "Do Not Download"
+msgstr "不下载"
 
-#: tdehtml/ecma/kjs_debugwin.cpp:369
-msgid "JavaScript Debugger"
-msgstr "JavaScript 调试器"
+#: tdehtml/rendering/render_form.cpp:331 tdeui/ktextedit.cpp:353
+msgid "Spell Checking"
+msgstr "拼写检查"
 
-#: tdehtml/ecma/kjs_debugwin.cpp:383
-msgid "Call stack"
-msgstr "调用栈"
+#: tdehtml/rendering/render_form.cpp:388 tdeui/kcombobox.cpp:458
+#, fuzzy
+msgid "&Edit History..."
+msgstr "编辑(&E)..."
 
-#: tdehtml/ecma/kjs_debugwin.cpp:418
-msgid "JavaScript console"
-msgstr "JavaScript 控制台"
+#: tdehtml/rendering/render_form.cpp:390 tdeui/kcombobox.cpp:461
+msgid "Clear &History"
+msgstr "清除历史(&H)"
 
-#: tdehtml/ecma/kjs_debugwin.cpp:448
-msgid ""
-"_: Next breakpoint\n"
-"&Next"
-msgstr "下个断点(&N)"
+#: tdehtml/tdemultipart/tdemultipart.cpp:320
+msgid "No handler found for %1!"
+msgstr "找不到 %1 的处理程序！"
 
-#: tdehtml/ecma/kjs_debugwin.cpp:450
-msgid "&Step"
-msgstr "单步执行(&S)"
+#: tdehtml/tdemultipart/tdemultipart.cpp:576
+msgid "KMultiPart"
+msgstr "KMultiPart"
 
-#: tdehtml/ecma/kjs_debugwin.cpp:455
-msgid "&Continue"
-msgstr "继续(&C)"
+#: tdehtml/tdemultipart/tdemultipart.cpp:578
+msgid "Embeddable component for multipart/mixed"
+msgstr "用于 multipart/mixed 的可嵌入部件"
 
-#: tdehtml/ecma/kjs_debugwin.cpp:459
-msgid "&Break at Next Statement"
-msgstr "在下个语句处中断(&B)"
+#: tdehtml/xml/dom_docimpl.cpp:2077
+msgid "Basic Page Style"
+msgstr "基本页面样式"
 
-#: tdehtml/ecma/kjs_debugwin.cpp:463
-msgid ""
-"_: Next breakpoint\n"
-"Next"
-msgstr "下个断点"
+#: tdehtml/xml/xml_tokenizer.cpp:312
+msgid "the document is not in the correct file format"
+msgstr "文档的文件格式不正确"
 
-#: tdehtml/ecma/kjs_debugwin.cpp:464
-msgid "Step"
-msgstr "单步执行"
+#: tdehtml/xml/xml_tokenizer.cpp:318
+msgid "fatal parsing error: %1 in line %2, column %3"
+msgstr "致命解析错误：%1 位于行 %2，列 %3"
 
-#: tdehtml/ecma/kjs_debugwin.cpp:826
-msgid "Parse error at %1 line %2"
-msgstr "在 %1 的第 %2 行分析出错"
+#: tdehtml/xml/xml_tokenizer.cpp:477
+msgid "XML parsing error"
+msgstr "XML 解析错误"
 
-#: tdehtml/ecma/kjs_debugwin.cpp:837
-#, c-format
-msgid ""
-"An error occurred while attempting to run a script on this page.\n"
-"\n"
-"%1"
+#: tdehtml/misc/knsplugininstaller.cpp:348
+msgid "TDE plugin wizard"
 msgstr ""
-"试图在此页上运行脚本时发生了错误。\n"
-"\n"
-"%1"
 
-#: tdehtml/ecma/kjs_debugwin.cpp:846
-msgid ""
-"An error occurred while attempting to run a script on this page.\n"
-"\n"
-"%1 line %2:\n"
-"%3"
+#: tdehtml/misc/knsplugininstaller.cpp:378
+#, fuzzy
+msgid "The following plugins are available."
 msgstr ""
-"试图在此页上运行脚本时发生了错误。\n"
-"\n"
-"%1 第 %2 行：\n"
-"%3"
-
-#: tdehtml/ecma/kjs_html.cpp:2160 tdehtml/ecma/kjs_window.cpp:1562
-msgid "Confirmation: JavaScript Popup"
-msgstr "确认：JavaScript 弹出窗口"
+"没有匹配的项目。\n"
 
-#: tdehtml/ecma/kjs_window.cpp:1565
-msgid ""
-"This site is requesting to open up a new browser window via JavaScript.\n"
-"Do you want to allow this?"
+#: tdehtml/misc/knsplugininstaller.cpp:382
+msgid "Click on next to install the selected plugin."
 msgstr ""
-"该站点试图用 JavaScript 打开一个新浏览器窗口。\n"
-"您允许这样吗？"
-
-#: tdehtml/ecma/kjs_window.cpp:1568
-msgid ""
-"<qt>This site is requesting to open"
-"<p>%1</p>in a new browser window via JavaScript.<br />"
-"Do you want to allow this?</qt>"
-msgstr "<qt>该站点试图用 JavaScript 在新浏览器窗口中打开<p>%1</p>。<br />您允许这样吗？</qt>"
 
-#: tdehtml/ecma/kjs_html.cpp:2167 tdehtml/ecma/kjs_window.cpp:1570
-msgid "Allow"
-msgstr "允许"
+#: tdehtml/misc/knsplugininstaller.cpp:383
+msgid "Plugin installation confirmation"
+msgstr ""
 
-#: tdehtml/ecma/kjs_html.cpp:2167 tdehtml/ecma/kjs_window.cpp:1570
-msgid "Do Not Allow"
-msgstr "不允许"
+#: tdehtml/misc/knsplugininstaller.cpp:414
+msgid "I agree."
+msgstr ""
 
-#: tdehtml/ecma/kjs_window.cpp:1862
-msgid "Close window?"
-msgstr "关闭窗口吗？"
+#: tdehtml/misc/knsplugininstaller.cpp:416
+msgid "I do not agree (plugin will not be installed)."
+msgstr ""
 
-#: tdehtml/ecma/kjs_window.cpp:1862
-msgid "Confirmation Required"
-msgstr "需要确认"
+#: tdehtml/misc/knsplugininstaller.cpp:422
+msgid "Plugin licence"
+msgstr ""
 
-#: tdehtml/ecma/kjs_window.cpp:2744
-msgid ""
-"Do you want a bookmark pointing to the location \"%1\" to be added to your "
-"collection?"
-msgstr "您要将指向地址“%1”的书签添加到您的收藏中吗？"
+#: tdehtml/misc/knsplugininstaller.cpp:432
+#, fuzzy
+msgid "Installation in progress."
+msgstr "安装失败。"
 
-#: tdehtml/ecma/kjs_window.cpp:2747
-msgid ""
-"Do you want a bookmark pointing to the location \"%1\" titled \"%2\" to be "
-"added to your collection?"
-msgstr "您要将指向地址“%1”、标题为“%2”的书签添加到您的收藏中吗？"
+#: tdehtml/misc/knsplugininstaller.cpp:438
+#, fuzzy
+msgid "Plugin installation"
+msgstr "安装"
 
-#: tdehtml/ecma/kjs_window.cpp:2755
-msgid "JavaScript Attempted Bookmark Insert"
-msgstr "JavaScript 试图插入书签"
+#: tdehtml/misc/knsplugininstaller.cpp:451
+#, fuzzy
+msgid "Installation status"
+msgstr "安装"
 
-#: tdehtml/ecma/kjs_window.cpp:2759
-msgid "Disallow"
-msgstr "不允许"
+#: tdehtml/misc/knsplugininstaller.cpp:498
+#, fuzzy
+msgid "To install "
+msgstr "安装"
 
-#: tdehtml/ecma/kjs_proxy.cpp:405
-msgid ""
-"A script on this page is causing TDEHTML to freeze. If it continues to run, other "
-"applications may become less responsive.\n"
-"Do you want to abort the script?"
+#: tdehtml/misc/knsplugininstaller.cpp:498
+msgid " you need to agree to the following"
 msgstr ""
-"此页面上的脚本导致 TDEHTML 冻结。如果继续运行的话，其它程序的响应程度会受到影响。\n"
-"您是否想要中止脚本？"
-
-#: tdehtml/ecma/kjs_proxy.cpp:405
-msgid "JavaScript"
-msgstr "JavaScript"
-
-#: tdehtml/ecma/kjs_proxy.cpp:405
-msgid "&Abort"
-msgstr "中止(&A)"
 
-#: tdehtml/ecma/kjs_html.cpp:2162
-msgid ""
-"This site is submitting a form which will open up a new browser window via "
-"JavaScript.\n"
-"Do you want to allow the form to be submitted?"
+#: tdehtml/misc/knsplugininstaller.cpp:529
+msgid "Installation completed. Reload the page."
 msgstr ""
-"该站点试图用 JavaScript 提交一个将打开新浏览器窗口的表单。\n"
-"您允许这样吗？"
 
-#: tdehtml/ecma/kjs_html.cpp:2165
-msgid ""
-"<qt>This site is submitting a form which will open "
-"<p>%1</p> in a new browser window via JavaScript.<br />"
-"Do you want to allow the form to be submitted?</qt>"
-msgstr "<qt>该站点试图用 JavaScript 提交一个即将在新窗口中打开<p>%1</p>的表单。<br />您允许这样吗？</qt>"
+#: tdehtml/misc/knsplugininstaller.cpp:532
+#, fuzzy
+msgid "Installation failed"
+msgstr "安装失败。"
 
-#: tdehtml/html/htmlparser.cpp:1709
+#: tdehtml/html/htmlparser.cpp:1707
 msgid "This is a searchable index. Enter search keywords: "
 msgstr "这是一个可搜索的索引。请输入搜索关键字："
 
@@ -7554,19 +6287,9 @@ msgstr "不对此网站使用(&V)"
 msgid "Do Not Store"
 msgstr "不存储"
 
-#: tdehtml/html/html_formimpl.cpp:618
-msgid ""
-"Konqueror has the ability to store the password in an encrypted wallet. When "
-"the wallet is unlocked, it can then automatically restore the login information "
-"next time you submit this form. Do you want to store the information now?"
-msgstr "Konqueror 具有用加密的钱包存储密码的能力。当钱包未加锁时，下次您提交这一表单时它能自动恢复登录信息。您现在要存储信息吗？"
-
-#: tdehtml/html/html_formimpl.cpp:623
-msgid ""
-"Konqueror has the ability to store the password in an encrypted wallet. When "
-"the wallet is unlocked, it can then automatically restore the login information "
-"next time you visit %1. Do you want to store the information now?"
-msgstr "Konqueror 具有用加密的钱包保存密码的能力。当钱包未加锁时，下次您访问 %1 时它能自动恢复登录信息。您现在要存储信息吗？"
+#: tdehtml/html/html_formimpl.cpp:617
+msgid "Store passwords on this page?"
+msgstr ""
 
 #: tdehtml/java/kjavaappletviewer.cpp:122
 msgid "Applet Parameters"
@@ -7592,22 +6315,6 @@ msgstr "存档"
 msgid "TDE Java Applet Plugin"
 msgstr "TDE Java 小程序插件"
 
-#: tdehtml/java/kjavaapplet.cpp:225
-msgid "Initializing Applet \"%1\"..."
-msgstr "正在初始化小程序“%1”..."
-
-#: tdehtml/java/kjavaapplet.cpp:232
-msgid "Starting Applet \"%1\"..."
-msgstr "正在启动小程序“%1”..."
-
-#: tdehtml/java/kjavaapplet.cpp:239
-msgid "Applet \"%1\" started"
-msgstr "小程序“%1”已启动"
-
-#: tdehtml/java/kjavaapplet.cpp:245
-msgid "Applet \"%1\" stopped"
-msgstr "小程序“%1”已停止"
-
 #: tdehtml/java/kjavaappletserver.cpp:145
 msgid "Loading Applet"
 msgstr "正在载入 Applet"
@@ -7692,124 +6399,262 @@ msgstr "您用下列证书授予 Java 小程序："
 msgid "the following permission"
 msgstr "下列权限"
 
+#: tdehtml/java/kjavaappletserver.cpp:797 tdeui/kstdguiitem.cpp:115
+msgid "&No"
+msgstr "否(&N)"
+
 #: tdehtml/java/kjavaappletserver.cpp:801
 msgid "&Reject All"
 msgstr "全部拒绝(&R)"
 
+#: tdehtml/java/kjavaappletserver.cpp:804 tdeui/kstdguiitem.cpp:110
+msgid "&Yes"
+msgstr "是(&Y)"
+
 #: tdehtml/java/kjavaappletserver.cpp:807
 msgid "&Grant All"
 msgstr "全部同意(&G)"
 
-#: tdehtml/tdemultipart/tdemultipart.cpp:320
-msgid "No handler found for %1!"
-msgstr "找不到 %1 的处理程序！"
+#: tdehtml/java/kjavaapplet.cpp:225
+msgid "Initializing Applet \"%1\"..."
+msgstr "正在初始化小程序“%1”..."
 
-#: tdehtml/tdemultipart/tdemultipart.cpp:576
-msgid "KMultiPart"
-msgstr "KMultiPart"
+#: tdehtml/java/kjavaapplet.cpp:232
+msgid "Starting Applet \"%1\"..."
+msgstr "正在启动小程序“%1”..."
 
-#: tdehtml/tdemultipart/tdemultipart.cpp:578
-msgid "Embeddable component for multipart/mixed"
-msgstr "用于 multipart/mixed 的可嵌入部件"
+#: tdehtml/java/kjavaapplet.cpp:239
+msgid "Applet \"%1\" started"
+msgstr "小程序“%1”已启动"
+
+#: tdehtml/java/kjavaapplet.cpp:245
+msgid "Applet \"%1\" stopped"
+msgstr "小程序“%1”已停止"
 
-#: tdehtml/rendering/render_frames.cpp:944
+#: tdehtml/ecma/kjs_html.cpp:2163 tdehtml/ecma/kjs_window.cpp:1562
+msgid "Confirmation: JavaScript Popup"
+msgstr "确认：JavaScript 弹出窗口"
+
+#: tdehtml/ecma/kjs_html.cpp:2165
 msgid ""
-"No plugin found for '%1'.\n"
-"Do you want to download one from %2?"
+"This site is submitting a form which will open up a new browser window via "
+"JavaScript.\n"
+"Do you want to allow the form to be submitted?"
 msgstr ""
-"没有找到用于“%1”的插件。\n"
-"您要从 %2 下载吗？"
+"该站点试图用 JavaScript 提交一个将打开新浏览器窗口的表单。\n"
+"您允许这样吗？"
 
-#: tdehtml/rendering/render_frames.cpp:945
-msgid "Missing Plugin"
-msgstr "缺少插件"
+#: tdehtml/ecma/kjs_html.cpp:2168
+msgid ""
+"<qt>This site is submitting a form which will open "
+"<p>%1</p> in a new browser window via JavaScript.<br />"
+"Do you want to allow the form to be submitted?</qt>"
+msgstr "<qt>该站点试图用 JavaScript 提交一个即将在新窗口中打开<p>%1</p>的表单。<br />您允许这样吗？</qt>"
 
-#: tdehtml/rendering/render_frames.cpp:945
-msgid "Download"
-msgstr "下载"
+#: tdehtml/ecma/kjs_html.cpp:2170 tdehtml/ecma/kjs_window.cpp:1570
+msgid "Allow"
+msgstr "允许"
 
-#: tdehtml/rendering/render_frames.cpp:945
-msgid "Do Not Download"
-msgstr "不下载"
+#: tdehtml/ecma/kjs_html.cpp:2170 tdehtml/ecma/kjs_window.cpp:1570
+msgid "Do Not Allow"
+msgstr "不允许"
 
-#: tdeinit/tdeinit.cpp:475
+#: tdehtml/ecma/kjs_debugwin.cpp:291
+msgid "JavaScript Error"
+msgstr "JavaScript 错误"
+
+#: tdehtml/ecma/kjs_debugwin.cpp:305
+msgid "&Do not show this message again"
+msgstr "不再显示本信息(&D)"
+
+#: tdehtml/ecma/kjs_debugwin.cpp:369
+msgid "JavaScript Debugger"
+msgstr "JavaScript 调试器"
+
+#: tdehtml/ecma/kjs_debugwin.cpp:383
+msgid "Call stack"
+msgstr "调用栈"
+
+#: tdehtml/ecma/kjs_debugwin.cpp:418
+msgid "JavaScript console"
+msgstr "JavaScript 控制台"
+
+#: tdehtml/ecma/kjs_debugwin.cpp:448
 msgid ""
-"Unable to start new process.\n"
-"The system may have reached the maximum number of open files possible or the "
-"maximum number of open files that you are allowed to use has been reached."
-msgstr ""
-"无法启动新进程。\n"
-"系统已打开的文件数可能已经达到了极限，或者您所允许打开的文件数已经达到了极限。"
+"_: Next breakpoint\n"
+"&Next"
+msgstr "下个断点(&N)"
 
-#: tdeinit/tdeinit.cpp:497
+#: tdehtml/ecma/kjs_debugwin.cpp:450
+msgid "&Step"
+msgstr "单步执行(&S)"
+
+#: tdehtml/ecma/kjs_debugwin.cpp:455
+msgid "&Continue"
+msgstr "继续(&C)"
+
+#: tdehtml/ecma/kjs_debugwin.cpp:459
+msgid "&Break at Next Statement"
+msgstr "在下个语句处中断(&B)"
+
+#: tdehtml/ecma/kjs_debugwin.cpp:463
 msgid ""
-"Unable to create new process.\n"
-"The system may have reached the maximum number of processes possible or the "
-"maximum number of processes that you are allowed to use has been reached."
-msgstr ""
-"无法创建新进程。\n"
-"系统已创建的进程数可能已经达到了极限，或者您所允许创建进程数已经达到了极限。"
+"_: Next breakpoint\n"
+"Next"
+msgstr "下个断点"
 
-#: tdeinit/tdeinit.cpp:589
-msgid "Could not find '%1' executable."
-msgstr "找不到可执行程序“%1”。"
+#: tdehtml/ecma/kjs_debugwin.cpp:464
+msgid "Step"
+msgstr "单步执行"
 
-#: tdeinit/tdeinit.cpp:605
+#: tdehtml/ecma/kjs_debugwin.cpp:826
+msgid "Parse error at %1 line %2"
+msgstr "在 %1 的第 %2 行分析出错"
+
+#: tdehtml/ecma/kjs_debugwin.cpp:837
+#, c-format
 msgid ""
-"Could not open library '%1'.\n"
-"%2"
+"An error occurred while attempting to run a script on this page.\n"
+"\n"
+"%1"
 msgstr ""
-"无法打开库“%1”。\n"
-"%2"
+"试图在此页上运行脚本时发生了错误。\n"
+"\n"
+"%1"
 
-#: tdeinit/tdeinit.cpp:606 tdeinit/tdeinit.cpp:649
-msgid "Unknown error"
-msgstr "未知的错误"
+#: tdehtml/ecma/kjs_debugwin.cpp:846
+msgid ""
+"An error occurred while attempting to run a script on this page.\n"
+"\n"
+"%1 line %2:\n"
+"%3"
+msgstr ""
+"试图在此页上运行脚本时发生了错误。\n"
+"\n"
+"%1 第 %2 行：\n"
+"%3"
 
-#: tdeinit/tdeinit.cpp:648
+#: tdehtml/ecma/kjs_window.cpp:1565
 msgid ""
-"Could not find 'kdemain' in '%1'.\n"
-"%2"
+"This site is requesting to open up a new browser window via JavaScript.\n"
+"Do you want to allow this?"
 msgstr ""
-"无法在“%1”中找到“kdemain”。\n"
-"%2"
+"该站点试图用 JavaScript 打开一个新浏览器窗口。\n"
+"您允许这样吗？"
 
-#: tdeinit/tdelauncher_main.cpp:58
+#: tdehtml/ecma/kjs_window.cpp:1568
+msgid ""
+"<qt>This site is requesting to open"
+"<p>%1</p>in a new browser window via JavaScript.<br />"
+"Do you want to allow this?</qt>"
+msgstr "<qt>该站点试图用 JavaScript 在新浏览器窗口中打开<p>%1</p>。<br />您允许这样吗？</qt>"
+
+#: tdehtml/ecma/kjs_window.cpp:1862
+msgid "Close window?"
+msgstr "关闭窗口吗？"
+
+#: tdehtml/ecma/kjs_window.cpp:1862
+msgid "Confirmation Required"
+msgstr "需要确认"
+
+#: tdehtml/ecma/kjs_window.cpp:2744
+msgid ""
+"Do you want a bookmark pointing to the location \"%1\" to be added to your "
+"collection?"
+msgstr "您要将指向地址“%1”的书签添加到您的收藏中吗？"
+
+#: tdehtml/ecma/kjs_window.cpp:2747
+msgid ""
+"Do you want a bookmark pointing to the location \"%1\" titled \"%2\" to be "
+"added to your collection?"
+msgstr "您要将指向地址“%1”、标题为“%2”的书签添加到您的收藏中吗？"
+
+#: tdehtml/ecma/kjs_window.cpp:2755
+msgid "JavaScript Attempted Bookmark Insert"
+msgstr "JavaScript 试图插入书签"
+
+#: tdehtml/ecma/kjs_window.cpp:2759
+msgid "Disallow"
+msgstr "不允许"
+
+#: tdehtml/ecma/kjs_proxy.cpp:405
 msgid ""
-"tdelauncher: This program is not supposed to be started manually.\n"
-"tdelauncher: It is started automatically by tdeinit.\n"
+"A script on this page is causing TDEHTML to freeze. If it continues to run, "
+"other applications may become less responsive.\n"
+"Do you want to abort the script?"
 msgstr ""
-"tdelauncher: 这个程序不是为手工运行设计的。\n"
-"tdelauncher: 它会自动被 tdeinit 所启动。\n"
+"此页面上的脚本导致 TDEHTML 冻结。如果继续运行的话，其它程序的响应程度会受到影响。\n"
+"您是否想要中止脚本？"
 
-#: tdeinit/tdelauncher.cpp:743
-msgid "TDEInit could not launch '%1'."
-msgstr "TDEInit 无法启动“%1”。"
+#: tdehtml/ecma/kjs_proxy.cpp:405
+msgid "JavaScript"
+msgstr "JavaScript"
 
-#: tdeinit/tdelauncher.cpp:918 tdeinit/tdelauncher.cpp:943 tdeinit/tdelauncher.cpp:960
-msgid "Could not find service '%1'."
-msgstr "找不到服务“%1”。"
+#: tdehtml/ecma/kjs_proxy.cpp:405
+msgid "&Abort"
+msgstr "中止(&A)"
 
-#: tdeinit/tdelauncher.cpp:975 tdeinit/tdelauncher.cpp:1011
-msgid "Service '%1' is malformatted."
-msgstr "服务“%1”的格式不正确。"
+#: arts/kde/kvideowidget.cpp:82
+msgid "Video Toolbar"
+msgstr "视频工具栏"
 
-#: tdeinit/tdelauncher.cpp:1087
-#, c-format
-msgid "Launching %1"
-msgstr "调用 %1"
+#: arts/kde/kvideowidget.cpp:104
+msgid "Fullscreen &Mode"
+msgstr "全屏模式(&M)"
+
+#: arts/kde/kvideowidget.cpp:107
+msgid "&Half Size"
+msgstr "一半大小(&H)"
+
+#: arts/kde/kvideowidget.cpp:110
+msgid "&Normal Size"
+msgstr "正常大小(&N)"
 
-#: tdeinit/tdelauncher.cpp:1281
+#: arts/kde/kvideowidget.cpp:113
+msgid "&Double Size"
+msgstr "两倍大小(&D)"
+
+#: networkstatus/networkstatusindicator.cpp:39
+msgid "The desktop is offline"
+msgstr ""
+
+#: networkstatus/connectionmanager.cpp:146
 msgid ""
-"Unknown protocol '%1'.\n"
+"A network connection was disconnected.  The application is now in offline mode. "
+" Do you want the application to resume network operations when the network is "
+"available again?"
+msgstr ""
+
+#: networkstatus/connectionmanager.cpp:147
+msgid "This application is currently in offline mode.  Do you want to connect?"
 msgstr ""
-"未知的协议“%1”。\n"
 
-#: tdeinit/tdelauncher.cpp:1334
+#: networkstatus/connectionmanager.cpp:148
 msgid ""
-"Error loading '%1'.\n"
+"_: Message shown when a network connection failed.  The placeholder contains "
+"the concrete description of the operation eg 'while performing this operation\n"
+"A network connection failed %1.  Do you want to place the application in "
+"offline mode?"
 msgstr ""
-"载入“%1”时出错。\n"
+
+#: networkstatus/connectionmanager.cpp:150
+msgid ""
+"This application is currently in offline mode.  Do you want to connect in order "
+"to carry out this operation?"
+msgstr ""
+
+#: networkstatus/connectionmanager.cpp:151
+msgid "Leave Offline Mode?"
+msgstr ""
+
+#: networkstatus/connectionmanager.cpp:152
+msgid "Connect"
+msgstr ""
+
+#: networkstatus/connectionmanager.cpp:152
+#, fuzzy
+msgid "Do Not Connect"
+msgstr "不存储"
 
 #: tdeconf_update/tdeconf_update.cpp:43
 msgid "Keep output results from scripts"
@@ -7835,138 +6680,132 @@ msgstr "KConf 更新"
 msgid "TDE Tool for updating user configuration files"
 msgstr "用于更新用户配置文件的 TDE 工具"
 
-#: tdespell2/ui/configdialog.cpp:38
-msgid "KSpell2 Configuration"
-msgstr "KSpell2 配置"
-
-#: tdewidgets/maketdewidgets.cpp:15
-msgid "Builds Qt widget plugins from an ini style description file."
-msgstr "从 INI 样式的描述文件中创建 Qt 部件插件。"
-
-#: tdewidgets/maketdewidgets.cpp:113
-msgid "Output file"
-msgstr "输出文件"
-
-#: tdewidgets/maketdewidgets.cpp:114
-msgid "Name of the plugin class to generate"
-msgstr "要生成的插件类的名称"
+#: tdeutils/kreplace.cpp:49
+msgid "&All"
+msgstr "全部(&A)"
 
-#: tdewidgets/maketdewidgets.cpp:115
-msgid "Default widget group name to display in designer"
-msgstr "要在设计器里显示的默认部件组名"
+#: tdeutils/kreplace.cpp:49
+msgid "&Skip"
+msgstr "跳过(&S)"
 
-#: tdewidgets/maketdewidgets.cpp:116
-msgid "Embed pixmaps from a source directory"
-msgstr "从源文件目录中嵌入位图"
+#: tdeutils/kreplace.cpp:58
+msgid "Replace '%1' with '%2'?"
+msgstr "将“%1”替换为“%2”吗？"
 
-#: tdewidgets/maketdewidgets.cpp:129
-msgid "maketdewidgets"
-msgstr "maketdewidgets"
+#: tdeutils/kreplace.cpp:105 tdeutils/kreplace.cpp:300
+msgid "No text was replaced."
+msgstr "没有替换任何文本。"
 
-#: kstyles/web/plugin.cpp:9
-msgid "Web style plugin"
-msgstr "Web 风格插件"
+#: tdeutils/kreplace.cpp:107 tdeutils/kreplace.cpp:302
+#, c-format
+msgid ""
+"_n: 1 replacement done.\n"
+"%n replacements done."
+msgstr "完成了 %n 次替换。"
 
-#: kstyles/klegacy/plugin.cpp:28
-msgid "TDE LegacyStyle plugin"
-msgstr "TDE 旧有风格插件"
+#: tdeutils/kfind.cpp:650 tdeutils/kreplace.cpp:307
+msgid "Beginning of document reached."
+msgstr "已到文档开头。"
 
-#: kstyles/utils/installtheme/main.cpp:35
-msgid "TDE Tool to build a cache list of all pixmap themes installed"
-msgstr "创建所有安装了的位图主题的缓存列表的 TDE 工具"
+#: tdeutils/kfind.cpp:652 tdeutils/kreplace.cpp:309
+msgid "End of document reached."
+msgstr "已到文件结尾。"
 
-#: kstyles/utils/installtheme/main.cpp:40
-msgid "KInstalltheme"
-msgstr "KInstalltheme"
+#: tdeutils/kreplace.cpp:316
+msgid "Do you want to restart search from the end?"
+msgstr "您想要从结尾重新开始搜索吗？"
 
-#: tdeunittest/modrunner.cpp:36
-msgid "A command-line application that can be used to run KUnitTest modules."
-msgstr "可用于运行 KUnitTest 模块的命令应用程序。"
+#: tdeutils/kreplace.cpp:317
+msgid "Do you want to restart search at the beginning?"
+msgstr "您想要从开头重新开始搜索吗？"
 
-#: tdeunittest/modrunner.cpp:42
-msgid "Only run modules whose filenames match the regexp."
-msgstr "只运行文件名匹配正则表达式的模块。"
+#: tdeutils/kreplace.cpp:319
+msgid "Restart"
+msgstr "重新开始"
 
-#: tdeunittest/modrunner.cpp:43
+#: tdeutils/tdecmoduleproxy.cpp:213
 msgid ""
-"Only run tests modules which are found in the folder. Use the query option to "
-"select modules."
-msgstr "只运行文件夹中找到的测试模块。使用查询选项选择模块。"
+"<b>Changes in this section requires root access.</b><br />"
+"Click the \"Administrator Mode\" button to allow modifications."
+msgstr "<b>更改本节需要 root 权限。</b><br />单击“管理员模式”按钮可允许修改。"
 
-#: tdeunittest/modrunner.cpp:44
+#: tdeutils/tdecmoduleproxy.cpp:220
 msgid ""
-"Disables debug capturing. You typically use this option when you use the GUI."
-msgstr "禁用调试捕捉。在您使用 GUI 时可能会用到此选项。"
-
-#: tdeunittest/modrunner.cpp:53
-msgid "KUnitTest ModRunner"
-msgstr "KUnitTest 模块运行器"
-
-#: tdeparts/browserextension.cpp:485
-msgid "<qt>Do you want to search the Internet for <b>%1</b>?"
-msgstr "<qt>您真的要在 Internet 上搜索 <b>%1</b> 吗？"
-
-#: tdeparts/browserextension.cpp:486
-msgid "Internet Search"
-msgstr "Internet 搜索"
-
-#: tdeparts/browserextension.cpp:486
-msgid "&Search"
-msgstr "搜索(&S)"
+"This section requires special permissions, probably for system-wide changes; "
+"therefore, it is required that you provide the root password to be able to "
+"change the module's properties. If you do not provide the password, the module "
+"will be disabled."
+msgstr "本节需要特殊权限，可能涉及到整个系统的更改；因此需要您提供 root 密码才能更改模块属性。如果您不提供密码，那么本模块将被禁用。"
 
-#: tdeparts/part.cpp:492
+#: tdeutils/tdecmoduleproxy.cpp:252
+#, c-format
 msgid ""
-"The document \"%1\" has been modified.\n"
-"Do you want to save your changes or discard them?"
-msgstr ""
-"文档“%1”已经被修改。\n"
-"您想要保存更改还是丢弃更改？"
+"_: Argument is application name\n"
+"This configuration section is already opened in %1"
+msgstr "此配置节已经在 %1 中打开了"
 
-#: tdeparts/part.cpp:494
-msgid "Close Document"
-msgstr "关闭文档"
+#: tdeutils/tdecmoduleproxy.cpp:325
+msgid "<big>Loading...</big>"
+msgstr "<big>正在装入...</big>"
 
-#: tdeparts/browserrun.cpp:275
-msgid "Do you really want to execute '%1'? "
-msgstr "您真的要执行“%1”吗？"
+#: tdeutils/kreplacedialog.cpp:142
+msgid "Your replacement string is referencing a capture greater than '\\%1', "
+msgstr "您的替换字符串引用了大于“%1”的抓取。"
 
-#: tdeparts/browserrun.cpp:276
-msgid "Execute File?"
-msgstr "覆盖文件吗？"
+#: tdeutils/kreplacedialog.cpp:145
+#, c-format
+msgid ""
+"_n: but your pattern only defines 1 capture.\n"
+"but your pattern only defines %n captures."
+msgstr "但是您的模式只定义了 %n 次抓取。"
 
-#: tdeparts/browserrun.cpp:276
-msgid "Execute"
-msgstr "执行"
+#: tdeutils/kreplacedialog.cpp:146
+msgid "but your pattern defines no captures."
+msgstr "但您的模式未定义抓取。"
 
-#: tdeparts/browserrun.cpp:294
+#: tdeutils/kreplacedialog.cpp:147
 msgid ""
-"Open '%2'?\n"
-"Type: %1"
+"\n"
+"Please correct."
 msgstr ""
-"打开“%2”吗？\n"
-"类型：%1"
+"\n"
+"请纠正。"
 
-#: tdeparts/browserrun.cpp:296
+#: tdeutils/kpluginselector.cpp:111
 msgid ""
-"Open '%3'?\n"
-"Name: %2\n"
-"Type: %1"
+"<qt>"
+"<table>"
+"<tr>"
+"<td><b>Description:</b></td>"
+"<td>%1</td></tr>"
+"<tr>"
+"<td><b>Author:</b></td>"
+"<td>%2</td></tr>"
+"<tr>"
+"<td><b>Version:</b></td>"
+"<td>%3</td></tr>"
+"<tr>"
+"<td><b>License:</b></td>"
+"<td>%4</td></tr></table></qt>"
 msgstr ""
-"打开“%3”吗？\n"
-"名称：%2\n"
-"类型：%1"
-
-#: tdeparts/browserrun.cpp:310
-msgid "&Open with '%1'"
-msgstr "用“%1”打开(&O)"
-
-#: tdeparts/browserrun.cpp:311
-msgid "&Open With..."
-msgstr "打开方式(&O)..."
+"<qt>"
+"<table>"
+"<tr>"
+"<td><b>描述：</b></td>"
+"<td>%1</td></tr>"
+"<tr>"
+"<td><b>作者：</b></td>"
+"<td>%2</td></tr>"
+"<tr>"
+"<td><b>版本：</b></td>"
+"<td>%3</td></tr>"
+"<tr>"
+"<td><b>许可：</b></td>"
+"<td>%4</td></tr></table></qt>"
 
-#: tdeparts/browserrun.cpp:353
-msgid "&Open"
-msgstr "打开(&O)"
+#: tdeutils/kpluginselector.cpp:536
+msgid "(This plugin is not configurable)"
+msgstr "(此插件不可配置)"
 
 #: tdeutils/kfinddialog.cpp:55 tdeutils/kfinddialog.cpp:66
 msgid "Find Text"
@@ -8000,69 +6839,78 @@ msgstr "替换文本(&M)："
 msgid "Use p&laceholders"
 msgstr "使用占位符(&L)"
 
-#: tdeutils/kfinddialog.cpp:152
+#: tdeutils/kfinddialog.cpp:153
 msgid "Insert Place&holder"
 msgstr "插入占位符(&H)"
 
-#: tdeutils/kfinddialog.cpp:168
+#: tdeutils/kfinddialog.cpp:169
 msgid "C&ase sensitive"
 msgstr "区分大小写(&A)"
 
-#: tdeutils/kfinddialog.cpp:169
+#: tdeutils/kfinddialog.cpp:170
 msgid "&Whole words only"
 msgstr "匹配整个单词(&W)"
 
-#: tdeutils/kfinddialog.cpp:170
+#: tdeutils/kfinddialog.cpp:171
 msgid "From c&ursor"
 msgstr "从光标处(&U)"
 
-#: tdeutils/kfinddialog.cpp:172
+#: tdeui/keditcl2.cpp:730 tdeui/keditcl2.cpp:870 tdeutils/kfinddialog.cpp:172
+msgid "Find &backwards"
+msgstr "反向查找(&B)"
+
+#: tdeutils/kfinddialog.cpp:173
 msgid "&Selected text"
 msgstr "选中文本(&S)"
 
-#: tdeutils/kfinddialog.cpp:179
+#: tdeutils/kfinddialog.cpp:180
 msgid "&Prompt on replace"
 msgstr "替换时提示(&P)"
 
-#: tdeutils/kfinddialog.cpp:232
+#: tdeutils/kfinddialog.cpp:233
 msgid "Start replace"
 msgstr "开始替换"
 
-#: tdeutils/kfinddialog.cpp:233
+#: tdeutils/kfinddialog.cpp:234
 msgid ""
 "<qt>If you press the <b>Replace</b> button, the text you entered above is "
 "searched for within the document and any occurrence is replaced with the "
 "replacement text.</qt>"
 msgstr "<qt>如果您点击<b>替换</b>按钮，将在文档中查找您上面输入的文本，并且用替换文本对所有出现的地方进行替换。"
 
+#: tdeui/keditcl2.cpp:701 tdeui/keditcl2.cpp:833 tdeui/kstdguiitem.cpp:254
 #: tdeutils/kfinddialog.cpp:240
+msgid "&Find"
+msgstr "查找(&F)"
+
+#: tdeutils/kfinddialog.cpp:241
 msgid "Start searching"
 msgstr "开始搜索"
 
-#: tdeutils/kfinddialog.cpp:241
+#: tdeutils/kfinddialog.cpp:242
 msgid ""
 "<qt>If you press the <b>Find</b> button, the text you entered above is searched "
 "for within the document.</qt>"
 msgstr "<qt>如果您点击<b>查找</b>按钮，将在文档中查找您上面输入的文本。"
 
-#: tdeutils/kfinddialog.cpp:247
+#: tdeutils/kfinddialog.cpp:248
 msgid ""
 "Enter a pattern to search for, or select a previous pattern from the list."
 msgstr "输入要搜索的模式，或者从列表中选择以前的模式。"
 
-#: tdeutils/kfinddialog.cpp:250
+#: tdeutils/kfinddialog.cpp:251
 msgid "If enabled, search for a regular expression."
 msgstr "如果启用的话，将搜索正则表达式。"
 
-#: tdeutils/kfinddialog.cpp:252
+#: tdeutils/kfinddialog.cpp:253
 msgid "Click here to edit your regular expression using a graphical editor."
 msgstr "单击此处使用图形化编辑器编辑您的正则表达式。"
 
-#: tdeutils/kfinddialog.cpp:254
+#: tdeutils/kfinddialog.cpp:255
 msgid "Enter a replacement string, or select a previous one from the list."
 msgstr "输入替换字符串，或者从列表中选择以前的字符串。"
 
-#: tdeutils/kfinddialog.cpp:256
+#: tdeutils/kfinddialog.cpp:257
 msgid ""
 "<qt>If enabled, any occurrence of <code><b>\\N</b></code>, where <code><b>N</b>"
 "</code> is a integer number, will be replaced with the corresponding capture "
@@ -8075,100 +6923,127 @@ msgstr ""
 "<p>要在您的替换中包含字面的 <code><b>\\N</b></code>，请在前面放一个额外的反斜线，即 <code><b>\\\\N</b>"
 "</code>。</qt>"
 
-#: tdeutils/kfinddialog.cpp:263
+#: tdeutils/kfinddialog.cpp:264
 msgid "Click for a menu of available captures."
 msgstr "单击可列出可用抓取的菜单。"
 
-#: tdeutils/kfinddialog.cpp:265
+#: tdeutils/kfinddialog.cpp:266
 msgid "Require word boundaries in both ends of a match to succeed."
 msgstr "匹配要成功执行，需要在两端都有单词包围符。"
 
-#: tdeutils/kfinddialog.cpp:267
+#: tdeutils/kfinddialog.cpp:268
 msgid "Start searching at the current cursor location rather than at the top."
 msgstr "在光标的当前位置开始搜索，而不是从头开始搜索。"
 
-#: tdeutils/kfinddialog.cpp:269
+#: tdeutils/kfinddialog.cpp:270
 msgid "Only search within the current selection."
 msgstr "仅在选中范围内查找。"
 
-#: tdeutils/kfinddialog.cpp:271
+#: tdeutils/kfinddialog.cpp:272
 msgid ""
 "Perform a case sensitive search: entering the pattern 'Joe' will not match "
 "'joe' or 'JOE', only 'Joe'."
 msgstr "执行区分大小写的搜索：输入模式“Joe”将不会匹配“joe”或“JOE”，只能匹配“Joe”。"
 
-#: tdeutils/kfinddialog.cpp:274
+#: tdeutils/kfinddialog.cpp:275
 msgid "Search backwards."
 msgstr "反向查找。"
 
-#: tdeutils/kfinddialog.cpp:276
+#: tdeutils/kfinddialog.cpp:277
 msgid "Ask before replacing each match found."
 msgstr "替换每次匹配前询问。"
 
-#: tdeutils/kfinddialog.cpp:449
+#: tdeutils/kfinddialog.cpp:462
 msgid "Any Character"
 msgstr "任意字符"
 
-#: tdeutils/kfinddialog.cpp:450
+#: tdeutils/kfinddialog.cpp:463
 msgid "Start of Line"
 msgstr "行首"
 
-#: tdeutils/kfinddialog.cpp:452
+#: tdeutils/kfinddialog.cpp:465
 msgid "Set of Characters"
 msgstr "字符集"
 
-#: tdeutils/kfinddialog.cpp:453
+#: tdeutils/kfinddialog.cpp:466
 msgid "Repeats, Zero or More Times"
 msgstr "重复，零次或多次"
 
-#: tdeutils/kfinddialog.cpp:454
+#: tdeutils/kfinddialog.cpp:467
 msgid "Repeats, One or More Times"
 msgstr "重复，一次或多次"
 
-#: tdeutils/kfinddialog.cpp:455
+#: tdeutils/kfinddialog.cpp:468
 msgid "Optional"
 msgstr "可选"
 
-#: tdeutils/kfinddialog.cpp:456
+#: tdeutils/kfinddialog.cpp:469
 msgid "Escape"
 msgstr "Esc"
 
-#: tdeutils/kfinddialog.cpp:457
+#: tdeutils/kfinddialog.cpp:470
 msgid "TAB"
 msgstr "TAB"
 
-#: tdeutils/kfinddialog.cpp:458
+#: tdeutils/kfinddialog.cpp:471
 msgid "Newline"
 msgstr "新行"
 
-#: tdeutils/kfinddialog.cpp:459
+#: tdeutils/kfinddialog.cpp:472
 msgid "Carriage Return"
 msgstr "回车"
 
-#: tdeutils/kfinddialog.cpp:460
+#: tdeutils/kfinddialog.cpp:473
 msgid "White Space"
 msgstr "空白"
 
-#: tdeutils/kfinddialog.cpp:461
+#: tdeutils/kfinddialog.cpp:474
 msgid "Digit"
 msgstr "数字"
 
-#: tdeutils/kfinddialog.cpp:510
+#: tdeutils/kfinddialog.cpp:523
 msgid "Complete Match"
 msgstr "补全匹配"
 
-#: tdeutils/kfinddialog.cpp:515
+#: tdeutils/kfinddialog.cpp:528
 msgid "Captured Text (%1)"
 msgstr "抓取的文本(%1)"
 
-#: tdeutils/kfinddialog.cpp:523
+#: tdeutils/kfinddialog.cpp:536
 msgid "You must enter some text to search for."
 msgstr "您必须输入要查找的文本。"
 
-#: tdeutils/kfinddialog.cpp:534
+#: tdeutils/kfinddialog.cpp:547
 msgid "Invalid regular expression."
 msgstr "无效的正则表达式。"
 
+#: tdeutils/kfind.cpp:53
+msgid "<qt>Find next occurrence of '<b>%1</b>'?</qt>"
+msgstr "<qt>查找下一个“<b>%1</b>”吗？</qt>"
+
+#: tdeutils/kfind.cpp:623 tdeutils/kfind.cpp:643
+#, c-format
+msgid ""
+"_n: 1 match found.\n"
+"%n matches found."
+msgstr "找到了 %n 个匹配。"
+
+#: tdeutils/kfind.cpp:625
+msgid "<qt>No matches found for '<b>%1</b>'.</qt>"
+msgstr "<qt>没有找到“<b>%1</b>”的匹配项。</qt>"
+
+#: tdeutils/kfind.cpp:645
+msgid "No matches found for '<b>%1</b>'."
+msgstr "没有找到“<b>%1</b>”的匹配项。"
+
+#: tdeutils/kfind.cpp:659
+msgid "Continue from the end?"
+msgstr "从结尾处继续吗？"
+
+#: tdeutils/kfind.cpp:660
+msgid "Continue from the beginning?"
+msgstr "从开头处继续吗？"
+
 #: tdeutils/tdecmoduleloader.cpp:98
 msgid ""
 "<qt>There was an error when loading the module '%1'."
@@ -8185,37 +7060,47 @@ msgstr ""
 msgid "The specified library %1 could not be found."
 msgstr "找不到指定的库 %1。"
 
-#: tdeutils/tdecmoduleloader.cpp:132
+#: tdeutils/tdecmoduleloader.cpp:134 tdeutils/tdecmoduleloader.cpp:143
 msgid "The module %1 could not be found."
 msgstr "找不到指定的模块 %1。"
 
-#: tdeutils/tdecmoduleloader.cpp:133
+#: tdeutils/tdecmoduleloader.cpp:136
+msgid ""
+"<qt>"
+"<p>The Lisa and lan:/ ioslave modules are not installed by default in Kubuntu, "
+"because they are obsolete and replaced by zeroconf."
+"<br> If you still wish to use them, you should install the lisa package from "
+"the Universe repository.</p></qt>"
+msgstr ""
+
+#: tdeutils/tdecmoduleloader.cpp:145
+#, fuzzy
 msgid ""
 "<qt>"
 "<p>The diagnostics is:"
-"<br>The desktop file %1 could not be found.</qt>"
+"<br>The desktop file %1 could not be found.</p></qt>"
 msgstr "<qt><p>诊断信息为：<br>找不到桌面文件 %1。</qt>"
 
-#: tdeutils/tdecmoduleloader.cpp:152
+#: tdeutils/tdecmoduleloader.cpp:166
 msgid "The module %1 could not be loaded."
 msgstr "无法装入模块 %1。"
 
-#: tdeutils/tdecmoduleloader.cpp:171
+#: tdeutils/tdecmoduleloader.cpp:185
 msgid "The module %1 is not a valid configuration module."
 msgstr "模块 %1 不是有效的配置模块。"
 
-#: tdeutils/tdecmoduleloader.cpp:172
+#: tdeutils/tdecmoduleloader.cpp:186
 msgid ""
 "<qt>"
 "<p>The diagnostics is:"
 "<br>The desktop file %1 does not specify a library.</qt>"
 msgstr "<qt><p>诊断信息为：<br>桌面文件 %1 不指定库。</qt>"
 
-#: tdeutils/tdecmoduleloader.cpp:206
+#: tdeutils/tdecmoduleloader.cpp:220
 msgid "There was an error loading the module."
 msgstr "装入模块时出错。"
 
-#: tdeutils/tdecmoduleloader.cpp:206 tdeutils/tdecmoduleloader.cpp:274
+#: tdeutils/tdecmoduleloader.cpp:220 tdeutils/tdecmoduleloader.cpp:288
 msgid ""
 "<qt>"
 "<p>The diagnostics is:"
@@ -8238,187 +7123,2134 @@ msgstr ""
 "<li>您的系统中有第三方的软件模块。</ul>"
 "<p>请仔细检查这些情况，尝试删除错误信息中提到的模块。如果这样仍然失败，请考虑和您的发行商或者软件包装者联系。</p></qt>"
 
-#: tdeutils/kreplace.cpp:49
-msgid "&All"
-msgstr "全部(&A)"
+#: tdeutils/ksettings/componentsdialog.cpp:48
+msgid "Select Components"
+msgstr "选择组件"
 
-#: tdeutils/kreplace.cpp:49
-msgid "&Skip"
-msgstr "跳过(&S)"
+#: tdeutils/ksettings/dialog.cpp:590
+msgid "Select Components..."
+msgstr "选择组件..."
 
-#: tdeutils/kreplace.cpp:58
-msgid "Replace '%1' with '%2'?"
-msgstr "将“%1”替换为“%2”吗？"
+#: tdeui/keditcl2.cpp:105 tdeui/keditcl2.cpp:375 tdeui/keditcl2.cpp:454
+msgid ""
+"End of document reached.\n"
+"Continue from the beginning?"
+msgstr ""
+"已到文件结尾。\n"
+"由开头继续?"
 
-#: tdeutils/kreplace.cpp:105 tdeutils/kreplace.cpp:300
-msgid "No text was replaced."
-msgstr "没有替换任何文本。"
+#: tdeui/keditcl2.cpp:118 tdeui/keditcl2.cpp:388 tdeui/keditcl2.cpp:467
+msgid ""
+"Beginning of document reached.\n"
+"Continue from the end?"
+msgstr ""
+"已到文档开头。\n"
+"由结尾继续?"
 
-#: tdeutils/kreplace.cpp:107 tdeutils/kreplace.cpp:302
+#: tdeui/keditcl2.cpp:711 tdeui/keditcl2.cpp:844
+msgid "Find:"
+msgstr "查找："
+
+#: tdeui/keditcl2.cpp:728 tdeui/keditcl2.cpp:868
+msgid "Case &sensitive"
+msgstr "区分大小写(&S)"
+
+#: tdeui/keditcl2.cpp:833
+msgid "Replace &All"
+msgstr "全部替换(&A)"
+
+#: tdeui/keditcl2.cpp:852
+msgid "Replace with:"
+msgstr "替换为："
+
+#: tdeui/keditcl2.cpp:984
+msgid "Go to line:"
+msgstr "跳至行："
+
+#: kded/khostname.cpp:372 kded/tde-menu.cpp:119 kded/tdebuildsycoca.cpp:724
+#: kded/tdebuildsycoca.cpp:725 tdeui/tdeaboutdialog.cpp:90
+msgid "Author"
+msgstr "作者"
+
+#: tdeui/tdeaboutdialog.cpp:93
+msgid "Task"
+msgstr "任务"
+
+#: tdeui/tdeaboutdialog.cpp:704
+#, fuzzy
+msgid "%1 %2 (Using Trinity %3)"
+msgstr "%1 %2 (使用 TDE %3)"
+
+#: tdeui/tdeaboutdialog.cpp:706
+msgid "%1 %2, %3"
+msgstr "%1 %2，%3"
+
+#: tdeui/tdeaboutdialog.cpp:1326
+msgid "Other Contributors:"
+msgstr "其它贡献者："
+
+#: tdeui/tdeaboutdialog.cpp:1327
+msgid "(No logo available)"
+msgstr "(没有可用的徽标)"
+
+#: tdeui/khelpmenu.cpp:228 tdeui/tdeaboutdialog.cpp:1535
+#: tdeui/tdemessagebox.cpp:975
+#, c-format
+msgid "About %1"
+msgstr "关于 %1"
+
+#: tdeui/tdeaboutdialog.cpp:1772
+msgid "Image missing"
+msgstr "缺少图像"
+
+#: tdeui/tdeactionclasses.cpp:2093
+msgid "Exit F&ull Screen Mode"
+msgstr "退出全屏模式(&U)"
+
+#: tdeui/kstdaction_p.h:98 tdeui/tdeactionclasses.cpp:2098
+msgid "F&ull Screen Mode"
+msgstr "全屏模式(&U)"
+
+#: tdespell2/ui/dialog.cpp:62 tdeui/tdespelldlg.cpp:53
+msgid "Check Spelling"
+msgstr "检查拼写"
+
+#: tdespell2/ui/dialog.cpp:64 tdeui/tdespelldlg.cpp:54
+msgid "&Finished"
+msgstr "已完成(&F)"
+
+#: tdeui/ktabbar.cpp:196
+msgid "Close this tab"
+msgstr "关闭此标签"
+
+#: tdeui/ksconfig.cpp:102
+msgid "Create &root/affix combinations not in dictionary"
+msgstr "创建字典中没有的词根或词缀复合词(&R)"
+
+#: tdeui/ksconfig.cpp:107
+msgid "Consider run-together &words as spelling errors"
+msgstr "把连在一起的词认作拼写错误(&W)"
+
+#: tdeui/ksconfig.cpp:118
+msgid "&Dictionary:"
+msgstr "字典(&D)："
+
+#: tdeui/ksconfig.cpp:143
+msgid "&Encoding:"
+msgstr "编码(&E)："
+
+#: tdeui/ksconfig.cpp:148
+msgid "International Ispell"
+msgstr "国际语言 Ispell"
+
+#: tdeui/ksconfig.cpp:149
+msgid "Aspell"
+msgstr "Aspell"
+
+#: tdeui/ksconfig.cpp:150
+msgid "Hspell"
+msgstr "Hspell"
+
+#: tdeui/ksconfig.cpp:151
+msgid "Zemberek"
+msgstr "Zemberek"
+
+#: tdeui/ksconfig.cpp:156
+msgid "&Client:"
+msgstr "客户(&C)："
+
+#: tdeui/ksconfig.cpp:297
+msgid "Spanish"
+msgstr "西班牙语"
+
+#: tdeui/ksconfig.cpp:300
+msgid "Danish"
+msgstr "丹麦语"
+
+#: tdeui/ksconfig.cpp:303
+msgid "German"
+msgstr "德语"
+
+#: tdeui/ksconfig.cpp:306
+msgid "German (new spelling)"
+msgstr "德语 (新拼写)"
+
+#: tdeui/ksconfig.cpp:309
+msgid "Brazilian Portuguese"
+msgstr "巴西葡萄牙语"
+
+#: tdeui/ksconfig.cpp:312
+msgid "Portuguese"
+msgstr "葡萄牙语"
+
+#: tdeui/ksconfig.cpp:315
+msgid "Esperanto"
+msgstr "世界语"
+
+#: tdeui/ksconfig.cpp:318
+msgid "Norwegian"
+msgstr "挪威语"
+
+#: tdeui/ksconfig.cpp:321
+msgid "Polish"
+msgstr "波兰语"
+
+#: tdeui/ksconfig.cpp:327
+msgid "Slovenian"
+msgstr "斯洛文尼亚语"
+
+#: tdeui/ksconfig.cpp:330
+msgid "Slovak"
+msgstr "斯洛伐克语"
+
+#: tdeui/ksconfig.cpp:333
+msgid "Czech"
+msgstr "捷克语"
+
+#: tdeui/ksconfig.cpp:336
+msgid "Swedish"
+msgstr "瑞典语"
+
+#: tdeui/ksconfig.cpp:339
+msgid "Swiss German"
+msgstr "瑞士德语"
+
+#: tdeui/ksconfig.cpp:345
+msgid "Lithuanian"
+msgstr "立陶宛语"
+
+#: tdeui/ksconfig.cpp:348
+msgid "French"
+msgstr "法语"
+
+#: tdeui/ksconfig.cpp:351
+msgid "Belarusian"
+msgstr "白俄罗斯语"
+
+#: tdeui/ksconfig.cpp:354
+msgid "Hungarian"
+msgstr "匈牙利语"
+
+#: tdeui/ksconfig.cpp:358
+msgid ""
+"_: Unknown ispell dictionary\n"
+"Unknown"
+msgstr "未知"
+
+#: tdeui/ksconfig.cpp:440 tdeui/ksconfig.cpp:594
+msgid "ISpell Default"
+msgstr "ISpell 默认"
+
+#: tdeui/ksconfig.cpp:488 tdeui/ksconfig.cpp:642
+msgid ""
+"_: default spelling dictionary\n"
+"Default - %1 [%2]"
+msgstr "默认 - %1 [%2]"
+
+#: tdeui/ksconfig.cpp:508 tdeui/ksconfig.cpp:668
+msgid "ASpell Default"
+msgstr "ASpell 默认"
+
+#: tdeui/ksconfig.cpp:573 tdeui/ksconfig.cpp:733
 #, c-format
 msgid ""
-"_n: 1 replacement done.\n"
-"%n replacements done."
-msgstr "完成了 %n 次替换。"
+"_: default spelling dictionary\n"
+"Default - %1"
+msgstr "默认 - %1"
 
-#: tdeutils/kfind.cpp:650 tdeutils/kreplace.cpp:307
-msgid "Beginning of document reached."
-msgstr "已到文档开头。"
+#. i18n "??" is displayed as (pseudo-)version when no data is known about the application
+#: tdeui/tdeaboutapplication.cpp:63
+msgid "??"
+msgstr "??"
 
-#: tdeutils/kfind.cpp:652 tdeutils/kreplace.cpp:309
-msgid "End of document reached."
-msgstr "已到文件结尾。"
+#: tdeui/tdeaboutapplication.cpp:67
+msgid ""
+"No information available.\n"
+"The supplied TDEAboutData object does not exist."
+msgstr ""
+"抱歉，没有可用的信息。\n"
+"提供的 TDEAboutData 对象不存在。"
 
-#: tdeutils/kreplace.cpp:316
-msgid "Do you want to restart search from the end?"
-msgstr "您想要从结尾重新开始搜索吗？"
+#: tdeui/tdeaboutapplication.cpp:107
+msgid "A&uthor"
+msgstr "作者(&U)"
 
-#: tdeutils/kreplace.cpp:317
-msgid "Do you want to restart search at the beginning?"
-msgstr "您想要从开头重新开始搜索吗？"
+#: tdeui/tdeaboutapplication.cpp:107
+msgid "A&uthors"
+msgstr "作者(&U)"
 
-#: tdeutils/kreplace.cpp:319
-msgid "Restart"
-msgstr "重新开始"
+#: tdeui/tdeaboutapplication.cpp:117
+#, fuzzy
+msgid ""
+"Please use <a href=\"http://bugs.pearsoncomputing.net\">"
+"http://bugs.pearsoncomputing.net</a> to report bugs.\n"
+msgstr ""
+"请使用 <a href=\"http://bugs.kde.org\">http://bugs.kde.org</a> 报告错误。\n"
 
-#: tdeutils/kpluginselector.cpp:111
+#: tdeui/tdeaboutapplication.cpp:121 tdeui/tdeaboutapplication.cpp:124
 msgid ""
-"<qt>"
-"<table>"
-"<tr>"
-"<td><b>Description:</b></td>"
-"<td>%1</td></tr>"
-"<tr>"
-"<td><b>Author:</b></td>"
-"<td>%2</td></tr>"
-"<tr>"
-"<td><b>Version:</b></td>"
-"<td>%3</td></tr>"
-"<tr>"
-"<td><b>License:</b></td>"
-"<td>%4</td></tr></table></qt>"
+"Please report bugs to <a href=\"mailto:%1\">%2</a>.\n"
 msgstr ""
-"<qt>"
-"<table>"
-"<tr>"
-"<td><b>描述：</b></td>"
-"<td>%1</td></tr>"
-"<tr>"
-"<td><b>作者：</b></td>"
-"<td>%2</td></tr>"
-"<tr>"
-"<td><b>版本：</b></td>"
-"<td>%3</td></tr>"
-"<tr>"
-"<td><b>许可：</b></td>"
-"<td>%4</td></tr></table></qt>"
+"请将错误报告给 <a href=\"mailto:%1\">%2</a>。\n"
 
-#: tdeutils/kpluginselector.cpp:536
-msgid "(This plugin is not configurable)"
-msgstr "(此插件不可配置)"
+#: tdeui/tdeaboutapplication.cpp:149
+msgid "&Thanks To"
+msgstr "感谢(&T)"
 
-#: tdeutils/kreplacedialog.cpp:142
-msgid "Your replacement string is referencing a capture greater than '\\%1', "
-msgstr "您的替换字符串引用了大于“%1”的抓取。"
+#: tdeui/tdeaboutapplication.cpp:176
+msgid "T&ranslation"
+msgstr "翻译(&R)"
 
-#: tdeutils/kreplacedialog.cpp:145
+#: tdeui/tdeaboutapplication.cpp:181
+msgid "&License Agreement"
+msgstr "授权协议(&L)"
+
+#: tdeui/kbugreport.cpp:70
+msgid "Submit Bug Report"
+msgstr "提交错误报告"
+
+#: tdeui/kbugreport.cpp:111
+msgid ""
+"Your email address. If incorrect, use the Configure Email button to change it"
+msgstr "您的电子邮件地址。如果不正确，请使用“配置电子邮件”按钮来修改它"
+
+#: tdeui/kbugreport.cpp:112
+msgid "From:"
+msgstr "发件人："
+
+#: tdeui/kbugreport.cpp:121
+msgid "Configure Email..."
+msgstr "配置电子邮件..."
+
+#: tdeui/kbugreport.cpp:128
+msgid "The email address this bug report is sent to."
+msgstr "错误报告要发送的电子邮件地址。"
+
+#: tdeui/kbugreport.cpp:129
+msgid "To:"
+msgstr "收件人："
+
+#: tdeui/kbugreport.cpp:136
+msgid "&Send"
+msgstr "发送(&S)"
+
+#: tdeui/kbugreport.cpp:136
+msgid "Send bug report."
+msgstr "发送错误报告。"
+
+#: tdeui/kbugreport.cpp:137
 #, c-format
+msgid "Send this bug report to %1."
+msgstr "把该错误报告发送到 %1。"
+
+#: tdeui/kbugreport.cpp:148
 msgid ""
-"_n: but your pattern only defines 1 capture.\n"
-"but your pattern only defines %n captures."
-msgstr "但是您的模式只定义了 %n 次抓取。"
+"The application for which you wish to submit a bug report - if incorrect, "
+"please use the Report Bug menu item of the correct application"
+msgstr "您要提交错误报告的程序 - 如果不正确，请使用正确程序的“报告错误”菜单"
 
-#: tdeutils/kreplacedialog.cpp:146
-msgid "but your pattern defines no captures."
-msgstr "但您的模式未定义抓取。"
+#: tdeui/kbugreport.cpp:149
+msgid "Application: "
+msgstr "应用程序："
 
-#: tdeutils/kreplacedialog.cpp:147
+#: tdeui/kbugreport.cpp:174
+msgid ""
+"The version of this application - please make sure that no newer version is "
+"available before sending a bug report"
+msgstr "这个程序的版本 - 请在发送错误报告前确定没有新的版本"
+
+#: tdenewstuff/uploaddialog.cpp:73 tdeui/kbugreport.cpp:175
+msgid "Version:"
+msgstr "版本："
+
+#: tdeui/kbugreport.cpp:181
+msgid "no version set (programmer error!)"
+msgstr "没有设置版本(程序错误！)"
+
+#: tdeui/kbugreport.cpp:192
+msgid "OS:"
+msgstr "操作系统："
+
+#: tdeui/kbugreport.cpp:204
+msgid "Compiler:"
+msgstr "编译器："
+
+#: tdeui/kbugreport.cpp:212
+msgid "Se&verity"
+msgstr "严重程度(&V)"
+
+#: tdeui/kbugreport.cpp:214
+msgid "Critical"
+msgstr "紧急"
+
+#: tdeui/kbugreport.cpp:214
+msgid "Grave"
+msgstr "严重"
+
+#: tdeui/kbugreport.cpp:214
+msgid ""
+"_: normal severity\n"
+"Normal"
+msgstr "普通"
+
+#: tdeui/kbugreport.cpp:214
+msgid "Wishlist"
+msgstr "愿望"
+
+#: tdeui/kbugreport.cpp:214
+msgid "Translation"
+msgstr "翻译"
+
+#: tdeui/kbugreport.cpp:227
+msgid "S&ubject: "
+msgstr "主题(&U)："
+
+#: tdeui/kbugreport.cpp:234
 msgid ""
+"Enter the text (in English if possible) that you wish to submit for the bug "
+"report.\n"
+"If you press \"Send\", a mail message will be sent to the maintainer of this "
+"program.\n"
+msgstr ""
+"请输入您要提交的错误报告的文字，尽量用英文。\n"
+"如果您按下“发送”按钮，邮件将被发送给该程序的维护者。\n"
+
+#: tdeui/kbugreport.cpp:254
+msgid ""
+"Reporting bugs and requesting enhancements are maintained using the Bugzilla "
+"reporting system.\n"
+"You'll need a login account and password to use the reporting system.\n"
+"To control spam and rogue elements the login requires a valid email address.\n"
+"Consider using any large email service if you want to avoid using your private "
+"email address.\n"
 "\n"
-"Please correct."
+"Selecting the button below opens your web browser to "
+"http://bugs.trinitydesktop.org,\n"
+"where you will find the report form.\n"
+"The information displayed above will be transferred to the reporting system.\n"
+"Session cookies must be enabled to use the reporting system.\n"
+"\n"
+"Thank you for helping!"
+msgstr ""
+
+#: tdeui/kbugreport.cpp:270
+msgid "&Launch Bug Report Wizard"
+msgstr "调用错误报告向导(&L)"
+
+#: tdeui/kbugreport.cpp:309
+msgid ""
+"_: unknown program name\n"
+"unknown"
+msgstr "未知"
+
+#: tdeui/kbugreport.cpp:387
+msgid ""
+"You must specify both a subject and a description before the report can be "
+"sent."
+msgstr "您必须指定主题和描述才能发出错误报告。"
+
+#: tdeui/kbugreport.cpp:397
+msgid ""
+"<p>You chose the severity <b>Critical</b>. Please note that this severity is "
+"intended only for bugs that</p>"
+"<ul>"
+"<li>break unrelated software on the system (or the whole system)</li>"
+"<li>cause serious data loss</li>"
+"<li>introduce a security hole on the system where the affected package is "
+"installed</li></ul>\n"
+"<p>Does the bug you are reporting cause any of the above damage? If it does "
+"not, please select a lower severity. Thank you!</p>"
+msgstr ""
+"<p>您选择了严重程度<b>紧急</b>。请注意这个严重程度只用于如下错误：</p>"
+"<ul>"
+"<li>使系统中不相关的软件(或整个系统)出问题</li>"
+"<li>导致严重的数据丢失</li>"
+"<li>在安装受影响的软件包的系统上引入安全漏洞</li></ul>\n"
+"<p>您报告的错误引起上面的危害了吗？如果没有，请选择较低的严重程度。谢谢！</p>"
+
+#: tdeui/kbugreport.cpp:408
+msgid ""
+"<p>You chose the severity <b>Grave</b>. Please note that this severity is "
+"intended only for bugs that</p>"
+"<ul>"
+"<li>make the package in question unusable or mostly so</li>"
+"<li>cause data loss</li>"
+"<li>introduce a security hole allowing access to the accounts of users who use "
+"the affected package</li></ul>\n"
+"<p>Does the bug you are reporting cause any of the above damage? If it does "
+"not, please select a lower severity. Thank you!</p>"
+msgstr ""
+"<p>您选择了严重程度<b>严重</b>。请注意这个严重程度只用于如下错误：</p>"
+"<ul>"
+"<li>使相关的软件包无法使用或几乎无法使用</li>"
+"<li>导致数据丢失</li>"
+"<li>导致安全漏洞，允许对使用受影响的软件包的用户的帐号进行非授权访问</li></ul>\n"
+"<p>您报告的错误引起上面的危害了吗？如果没有，请选择较低的严重程度。谢谢！</p>"
+
+#: tdeui/kbugreport.cpp:420
+#, fuzzy
+msgid ""
+"Unable to send the bug report.\n"
+"Please submit a bug report manually...\n"
+"See http://bugs.pearsoncomputing.net/ for instructions."
+msgstr ""
+"无法发送错误报告。\n"
+"请手工发出错误报告，非常抱歉...\n"
+"请参考 http://bugs.kde.org/ 上的说明。"
+
+#: tdeui/kbugreport.cpp:428
+msgid "Bug report sent, thank you for your input."
+msgstr "已发出错误报告，感谢您的帮助。"
+
+#: tdeui/kbugreport.cpp:437
+msgid ""
+"Close and discard\n"
+"edited message?"
+msgstr ""
+"关闭并放弃\n"
+"已编辑的消息？"
+
+#: tdeui/kbugreport.cpp:438
+msgid "Close Message"
+msgstr "关闭消息"
+
+#: tdeui/kedittoolbar.cpp:49
+msgid "--- line separator ---"
+msgstr "--- 分行符 ---"
+
+#: tdeui/kedittoolbar.cpp:50
+msgid "--- separator ---"
+msgstr "--- 分隔符 ---"
+
+#: tdeui/kedittoolbar.cpp:380 tdeui/kedittoolbar.cpp:392
+#: tdeui/kedittoolbar.cpp:402 tdeui/kedittoolbar.cpp:411
+msgid "Configure Toolbars"
+msgstr "配置工具栏"
+
+#: tdeui/kedittoolbar.cpp:447
+msgid ""
+"Do you really want to reset all toolbars of this application to their default? "
+"The changes will be applied immediately."
+msgstr "您真的想要将此应用程序的全部工具栏重置为其默认值吗？更改将会立即生效。"
+
+#: tdeui/kedittoolbar.cpp:447
+msgid "Reset Toolbars"
+msgstr "重置工具栏"
+
+#: tdeui/kedittoolbar.cpp:761
+msgid "&Toolbar:"
+msgstr "工具栏(&T)："
+
+#: tdeui/kedittoolbar.cpp:777
+msgid "A&vailable actions:"
+msgstr "可用的动作(&V)："
+
+#: tdeui/kedittoolbar.cpp:795
+msgid "Curr&ent actions:"
+msgstr "当前动作(&E)："
+
+#: tdeui/kedittoolbar.cpp:818
+msgid "Change &Icon..."
+msgstr "更改图标(&I)..."
+
+#: tdeui/kedittoolbar.cpp:991
+msgid ""
+"This element will be replaced with all the elements of an embedded component."
+msgstr "这个元件将被一个嵌入部件的全部元件代替。"
+
+#: tdeui/kedittoolbar.cpp:993
+msgid "<Merge>"
+msgstr "<合并>"
+
+#: tdeui/kedittoolbar.cpp:995
+msgid "<Merge %1>"
+msgstr "<合并 %1>"
+
+#: tdeui/kedittoolbar.cpp:1001
+msgid ""
+"This is a dynamic list of actions. You can move it, but if you remove it you "
+"won't be able to re-add it."
+msgstr "这是动作的动态列表。您可以移动它，但如果您删除它，您将无法重新添加它。"
+
+#: tdeui/kedittoolbar.cpp:1002
+#, c-format
+msgid "ActionList: %1"
+msgstr "动作列表：%1"
+
+#: tdeui/kauthicon.cpp:99
+msgid "Editing disabled"
+msgstr "编辑已禁用"
+
+#: tdeui/kauthicon.cpp:100
+msgid "Editing enabled"
+msgstr "编辑已启用"
+
+#: tdeui/tdespell.cpp:1176
+msgid "You have to restart the dialog for changes to take effect"
+msgstr "要使更改生效，您需要重新启动对话框"
+
+#: tdeui/tdespell.cpp:1402
+msgid "Spell Checker"
+msgstr "拼写检查器"
+
+#: tdeui/kcharselect.cpp:366
+msgid ""
+"_: Character\n"
+"<qt><font size=\"+4\" face=\"%1\">%2</font>"
+"<br>Unicode code point: U+%3"
+"<br>(In decimal: %4)"
+"<br>(Character: %5)</qt>"
+msgstr ""
+"<qt><font size=\"+4\" face=\"%1\">%2</font>"
+"<br>Unicode 代码点：U+%3"
+"<br>(十进制：%4)"
+"<br>(字符：%5)</qt>"
+
+#: tdeui/kcharselect.cpp:383 tdeui/tdefontdialog.cpp:144
+msgid "Font:"
+msgstr "字体："
+
+#: tdeui/kcharselect.cpp:394
+msgid "Table:"
+msgstr "表："
+
+#: tdeui/kcharselect.cpp:404
+msgid "&Unicode code point:"
+msgstr "&Unicode 代码点："
+
+#: tdeui/tdetoolbarhandler.cpp:86
+msgid "Show Toolbar"
+msgstr "显示工具栏"
+
+#: tdeui/tdetoolbarhandler.cpp:87
+msgid "Hide Toolbar"
+msgstr "隐藏工具栏"
+
+#: tdeui/tdetoolbarhandler.cpp:91
+msgid "Toolbars"
+msgstr "工具栏"
+
+#: tdeui/khelpmenu.cpp:131 tdeui/kstdaction_p.h:108
+msgid "%1 &Handbook"
+msgstr "%1 手册(&H)"
+
+#: tdeui/khelpmenu.cpp:140
+msgid "What's &This"
+msgstr "这是什么(&T)"
+
+#: tdeui/khelpmenu.cpp:151 tdeui/kstdaction_p.h:111
+msgid "&Report Bug/Request Enhancement..."
+msgstr ""
+
+#: tdeui/khelpmenu.cpp:160 tdeui/kstdaction_p.h:112
+msgid "Switch application &language..."
+msgstr "切换应用程序语言(&L)..."
+
+#: tdeui/khelpmenu.cpp:171 tdeui/kstdaction_p.h:113
+#, c-format
+msgid "&About %1"
+msgstr "关于 %1(&A)"
+
+#: tdeui/khelpmenu.cpp:177 tdeui/kstdaction_p.h:114
+#, fuzzy
+msgid "About &Trinity"
+msgstr "关于 &TDE"
+
+#: tdeui/klineeditdlg.cpp:92
+msgid "&Browse..."
+msgstr "浏览(&B)..."
+
+#: tdeui/ktip.cpp:206
+msgid "Tip of the Day"
+msgstr "日积月累"
+
+#: tdeui/ktip.cpp:224
+msgid ""
+"Did you know...?\n"
+msgstr ""
+"您知道吗...？\n"
+
+#: tdeui/ktip.cpp:287
+msgid "&Show tips on startup"
+msgstr "在启动时显示提示(&S)"
+
+#: tdeui/kpixmapregionselectordialog.cpp:28
+msgid "Select Region of Image"
+msgstr "选择图像范围"
+
+#: tdeui/kpixmapregionselectordialog.cpp:31
+msgid "Please click and drag on the image to select the region of interest:"
+msgstr "请单击并拖曳图像以便选择您感兴趣的范围："
+
+#: tdeui/kpassdlg.cpp:250
+msgid "&Password:"
+msgstr "密码(&P)："
+
+#: tdeui/kpassdlg.cpp:269
+msgid "&Keep password"
+msgstr "保存密码(&K)"
+
+#: tdeui/kpassdlg.cpp:289
+msgid "&Verify:"
+msgstr "校验(&V)："
+
+#: tdeui/kpassdlg.cpp:311
+msgid "Password strength meter:"
+msgstr "密码强度衡量："
+
+#: tdeui/kpassdlg.cpp:315
+msgid ""
+"The password strength meter gives an indication of the security of the password "
+"you have entered.  To improve the strength of the password, try:\n"
+" - using a longer password;\n"
+" - using a mixture of upper- and lower-case letters;\n"
+" - using numbers or symbols, such as #, as well as letters."
+msgstr ""
+"密码强度衡量可表明您所输入的密码的安全性。要改进密码的强度，请试着：\n"
+" - 使用更长的密码；\n"
+" - 混合使用大小写字母；\n"
+" - 将字母与数字或符号组合使用，比如 #。"
+
+#: tdeui/kpassdlg.cpp:331 tdeui/kpassdlg.cpp:525
+msgid "Passwords do not match"
+msgstr "密码不匹配"
+
+#: tdeui/kpassdlg.cpp:408
+msgid "You entered two different passwords. Please try again."
+msgstr "您输入了两个不同的密码。请重新输入。"
+
+#: tdeui/kpassdlg.cpp:415
+msgid ""
+"The password you have entered has a low strength. To improve the strength of "
+"the password, try:\n"
+" - using a longer password;\n"
+" - using a mixture of upper- and lower-case letters;\n"
+" - using numbers or symbols as well as letters.\n"
+"\n"
+"Would you like to use this password anyway?"
 msgstr ""
+"您所输入的密码长度较低。要改进密码的强度，请试着：\n"
+" - 使用更长的密码；\n"
+" - 混合使用大小写字母；\n"
+" - 将字母与数字或符号组合使用。\n"
 "\n"
-"请纠正。"
+"您是否仍然想要使用此密码？"
 
-#: tdeutils/kfind.cpp:53
-msgid "<qt>Find next occurrence of '<b>%1</b>'?</qt>"
-msgstr "<qt>查找下一个“<b>%1</b>”吗？</qt>"
+#: tdeui/kpassdlg.cpp:423
+msgid "Low Password Strength"
+msgstr "密码太简单"
 
-#: tdeutils/kfind.cpp:623 tdeutils/kfind.cpp:643
+#: tdeui/kpassdlg.cpp:519
+msgid "Password is empty"
+msgstr "密码为空"
+
+#: tdeui/kpassdlg.cpp:522
 #, c-format
 msgid ""
-"_n: 1 match found.\n"
-"%n matches found."
-msgstr "找到了 %n 个匹配。"
+"_n: Password must be at least 1 character long\n"
+"Password must be at least %n characters long"
+msgstr "密码必须至少有 %n 个字符"
 
-#: tdeutils/kfind.cpp:625
-msgid "<qt>No matches found for '<b>%1</b>'.</qt>"
-msgstr "<qt>没有找到“<b>%1</b>”的匹配项。</qt>"
+#: tdeui/kpassdlg.cpp:524
+msgid "Passwords match"
+msgstr "密码匹配"
 
-#: tdeutils/kfind.cpp:645
-msgid "No matches found for '<b>%1</b>'."
-msgstr "没有找到“<b>%1</b>”的匹配项。"
+#: tdeui/tdelistviewsearchline.cpp:243
+msgid "Search Columns"
+msgstr "搜索列"
 
-#: tdeutils/kfind.cpp:659
-msgid "Continue from the end?"
-msgstr "从结尾处继续吗？"
+#: tdeui/tdelistviewsearchline.cpp:245
+msgid "All Visible Columns"
+msgstr "全部可见列"
 
-#: tdeutils/kfind.cpp:660
-msgid "Continue from the beginning?"
-msgstr "从开头处继续吗？"
+#: tdeui/tdelistviewsearchline.cpp:260
+msgid ""
+"_: Column number %1\n"
+"Column No. %1"
+msgstr "第 %1 列"
+
+#: tdeui/tdelistviewsearchline.cpp:455
+msgid "S&earch:"
+msgstr "搜索(&E)："
 
-#: tdeutils/tdecmoduleproxy.cpp:212
+#: tdeui/kcolordialog.cpp:84
 msgid ""
-"<b>Changes in this section requires root access.</b><br />"
-"Click the \"Administrator Mode\" button to allow modifications."
-msgstr "<b>更改本节需要 root 权限。</b><br />单击“管理员模式”按钮可允许修改。"
+"_: palette name\n"
+"* Recent Colors *"
+msgstr "* 最近使用的颜色 *"
 
-#: tdeutils/tdecmoduleproxy.cpp:219
+#: tdeui/kcolordialog.cpp:85
 msgid ""
-"This section requires special permissions, probably for system-wide changes; "
-"therefore, it is required that you provide the root password to be able to "
-"change the module's properties. If you do not provide the password, the module "
-"will be disabled."
-msgstr "本节需要特殊权限，可能涉及到整个系统的更改；因此需要您提供 root 密码才能更改模块属性。如果您不提供密码，那么本模块将被禁用。"
+"_: palette name\n"
+"* Custom Colors *"
+msgstr "* 自定义颜色 *"
+
+#: tdeui/kcolordialog.cpp:86
+msgid ""
+"_: palette name\n"
+"Forty Colors"
+msgstr "四十种颜色"
+
+#: tdeui/kcolordialog.cpp:87
+msgid ""
+"_: palette name\n"
+"Rainbow Colors"
+msgstr "彩虹颜色"
+
+#: tdeui/kcolordialog.cpp:88
+msgid ""
+"_: palette name\n"
+"Royal Colors"
+msgstr "精选颜色"
+
+#: tdeui/kcolordialog.cpp:89
+msgid ""
+"_: palette name\n"
+"Web Colors"
+msgstr "Web 颜色"
+
+#: tdeui/kcolordialog.cpp:563
+msgid "Named Colors"
+msgstr "命名颜色"
+
+#: tdeui/kcolordialog.cpp:717
+msgid ""
+"Unable to read X11 RGB color strings. The following file location(s) were "
+"examined:\n"
+msgstr ""
+"无法读取 X11 RGB 颜色字符串。以下文件位置已被检查过：\n"
+
+#: tdeui/kcolordialog.cpp:940
+msgid "Select Color"
+msgstr "选择颜色"
+
+#: tdeui/kcolordialog.cpp:1005
+msgid "H:"
+msgstr "H："
+
+#: tdeui/kcolordialog.cpp:1014
+msgid "S:"
+msgstr "S："
+
+#: tdeui/kcolordialog.cpp:1023
+msgid "V:"
+msgstr "V："
+
+#: tdeui/kcolordialog.cpp:1035
+msgid "R:"
+msgstr "R："
+
+#: tdeui/kcolordialog.cpp:1044
+msgid "G:"
+msgstr "G："
+
+#: tdeui/kcolordialog.cpp:1053
+msgid "B:"
+msgstr "B："
+
+#: tdeui/kcolordialog.cpp:1108
+msgid "&Add to Custom Colors"
+msgstr "添加到自定义颜色中(&A)"
+
+#: tdenewstuff/uploaddialog.cpp:58 tderesources/configdialog.cpp:53
+#: tdeui/kcolordialog.cpp:1133
+msgid "Name:"
+msgstr "名称："
+
+#: tdeui/kcolordialog.cpp:1140
+msgid "HTML:"
+msgstr "HTML："
+
+#: tdeui/kcolordialog.cpp:1219
+msgid "Default color"
+msgstr "默认颜色"
+
+#: tdeui/kcolordialog.cpp:1247
+msgid "-default-"
+msgstr "-默认-"
+
+#: tdeui/kcolordialog.cpp:1463
+msgid "-unnamed-"
+msgstr "-未命名-"
+
+#: tdeui/kstdaction.cpp:51 tdeui/kstdguiitem.cpp:188
+msgid ""
+"_: go back\n"
+"&Back"
+msgstr "后退(&B)"
+
+#: tdeui/kstdaction.cpp:56 tdeui/kstdguiitem.cpp:196
+msgid ""
+"_: go forward\n"
+"&Forward"
+msgstr "前进(&F)"
+
+#: tdeui/kstdaction.cpp:61
+msgid ""
+"_: beginning (of line)\n"
+"&Home"
+msgstr "首页(&H)"
+
+#: tdeui/kstdaction.cpp:62 tdeui/kstdguiitem.cpp:168
+msgid ""
+"_: show help\n"
+"&Help"
+msgstr "帮助(&H)"
+
+#: tdeui/kstdaction.cpp:240
+msgid "Show Menubar<p>Shows the menubar again after it has been hidden"
+msgstr "显示菜单栏<p>隐藏菜单栏后再次显示菜单栏"
+
+#: tdeui/kstdaction.cpp:242
+msgid "Hide &Menubar"
+msgstr "隐藏菜单栏(&M)"
+
+#: tdeui/kstdaction.cpp:243
+msgid ""
+"Hide Menubar"
+"<p>Hide the menubar. You can usually get it back using the right mouse button "
+"inside the window itself."
+msgstr "隐藏菜单栏<p>隐藏菜单栏。您可以在窗口内使用鼠标右键重新显示。"
+
+#: tdeui/kstdaction.cpp:274 tdeui/kstdaction_p.h:97
+msgid "Show St&atusbar"
+msgstr "显示状态栏(&A)"
+
+#: tdeui/kstdaction.cpp:276
+msgid ""
+"Show Statusbar"
+"<p>Shows the statusbar, which is the bar at the bottom of the window used for "
+"status information."
+msgstr "显示状态栏<p>显示状态栏，即位于窗口底部用于显示状态信息的长条。"
+
+#: tdeui/kstdaction.cpp:278
+msgid "Hide St&atusbar"
+msgstr "隐藏状态栏(&A)"
+
+#: tdeui/kstdaction.cpp:279
+msgid ""
+"Hide Statusbar"
+"<p>Hides the statusbar, which is the bar at the bottom of the window used for "
+"status information."
+msgstr "隐藏状态栏<p>隐藏状态栏，即位于窗口底部用于显示状态信息的长条。"
+
+#: tdeui/kswitchlanguagedialog.cpp:90
+msgid "Switch application language"
+msgstr "切换应用程序语言"
+
+#: tdeui/kswitchlanguagedialog.cpp:96
+msgid "Please choose language which should be used for this application"
+msgstr "请此应用程序应使用的语言"
+
+#: tdeui/kswitchlanguagedialog.cpp:123
+msgid "Add fallback language"
+msgstr "添加后备语言"
+
+#: tdeui/kswitchlanguagedialog.cpp:124
+msgid ""
+"Adds one more language which will be used if other translations do not contain "
+"proper translation"
+msgstr "如果所选应用程序不包含指定语言的翻译，在此指定的一种或多种语言将会顺序使用。"
+
+#: tdeui/kswitchlanguagedialog.cpp:222
+msgid ""
+"Language for this application has been changed. The change will take effect "
+"upon next start of application"
+msgstr "此应用程序所使用的语言已更改。更改将会在应用程序下次启动时生效"
+
+#: tdeui/kswitchlanguagedialog.cpp:223
+msgid "Application language changed"
+msgstr "应用程序语言已更改"
+
+#: tdeui/kswitchlanguagedialog.cpp:282
+msgid "Primary language:"
+msgstr "首选语言："
+
+#: tdeui/kswitchlanguagedialog.cpp:282
+msgid "Fallback language:"
+msgstr "后备语言："
+
+#: tdeui/kswitchlanguagedialog.cpp:316
+msgid ""
+"This is main application language which will be used first before any other "
+"languages"
+msgstr "这种语言是主要应用程序语言，该语言将会在其它语言之前被使用"
+
+#: tdeui/kswitchlanguagedialog.cpp:320
+msgid ""
+"This is language which will be used if any previous languages does not contain "
+"proper translation"
+msgstr "当以上语言都不包含相应的翻译时，将使用此语言的翻译"
+
+#: tdeui/tdeabouttde.cpp:34
+msgid ""
+"The <b>Trinity Desktop Environment</b> was born as a fork of the K Desktop "
+"Environment version 3.5, which was originally written by the KDE Team, a "
+"world-wide network of software engineers committed to <a "
+"href=\"http://www.gnu.org/philosophy/free-sw.html\">Free Software</a> "
+"development. The name <i>Trinity</i> was chosen because the word means <i>"
+"Three</i> as in <i>continuation of KDE 3</i>."
+"<br>Since then, TDE has evolved to be an indipendent and standalone computer "
+"desktop environment project. The developers have molded the code to its own "
+"identity without giving up on the efficiency, productivity and traditional user "
+"interface experience characteristic of the original KDE 3 series."
+"<br>"
+"<br>No single group, company or organization controls the Trinity source code. "
+"Everyone is welcome to contribute to Trinity."
+"<br>"
+"<br>Visit <A HREF=\"http://www.trinitydesktop.org\">"
+"http://www.trinitydesktop.org</A> for more information about Trinity, and <A "
+"HREF=\"http://www.kde.org\">http://www.kde.org</A> for more information on the "
+"KDE project. "
+msgstr ""
+
+#: tdeui/tdeabouttde.cpp:50
+#, fuzzy
+msgid ""
+"Software can always be improved, and the Trinity Team is ready to do so. "
+"However, you - the user - must tell us when something does not work as expected "
+"or could be done better."
+"<br>"
+"<br>The Trinity Desktop Environment has a bug tracking system. Visit <A "
+"HREF=\"http://bugs.pearsoncomputing.net\">http://bugs.pearsoncomputing.net</A> "
+"or use the \"Report Bug...\" dialog from the \"Help\" menu to report bugs."
+"<br>"
+"<br>If you have a suggestion for improvement then you are welcome to use the "
+"bug tracking system to register your wish. Make sure you use the severity "
+"called \"Wishlist\"."
+msgstr ""
+"软件总是可以改进的，TDE 团队乐意这样做。然而，您 - 作为用户 - 必须在某些程序运行起来不如意或可以做得更好时告诉我们。"
+"<br>"
+"<br>K 桌面环境有一个错误跟踪系统，请访问 <A HREF=\"http://bugs.kde.org/\">"
+"http://bugs.kde.org/</A> 或使用“帮助”菜单的“报告错误”对话框来报告错误。"
+"<br>"
+"<br>如果您有改进的建议，欢迎使用错误跟踪系统来登记您的愿望，并确认您使用“愿望”严重程度。"
+
+#: tdeui/tdeabouttde.cpp:61
+#, fuzzy
+msgid ""
+"You do not have to be a software developer to be a member of the Trinity team. "
+"You can join the national teams that translate program interfaces. You can "
+"provide graphics, themes, sounds, and improved documentation. You decide!"
+"<br>"
+"<br>Visit the <A HREF=\"http://www.trinitydesktop.org/jobs\">TDE Development</A> "
+"webpage to find out how you can contribute or mail us using one of the "
+"available <A HREF=\"http://www.trinitydesktop.org/mailinglist.php\">"
+"mailing lists</A>."
+"<br>"
+"<br>If you need more information or documentation, then a visit to <A "
+"HREF=\"http://www.trinitydesktop.org/docs\">http://www.trinitydesktop.org/docs</"
+"A> will provide you with what you need."
+msgstr ""
+"您不必是软件开发者就可以成为 TDE 组织的一员。您可以参加翻译程序界面的小组。您可以提供图片、主题、音效或改进文档。您可以自己决定！"
+"<br>"
+"<br>请访问 <A HREF=\"http://www.kde.org/jobs/\">http://www.kde.org/jobs/</A> "
+"来了解您可参与计划的信息。而要想参与 TDE 的简体中文翻译工作，请查看 <A HREF=\"http://i18n.linux.net.cn/\">"
+"http://i18n.linux.net.cn/</A>。"
+"<br>"
+"<br>如果您需要更多的信息或文档，请访问 <A HREF=\"http://developer.kde.org/\">"
+"http://developer.kde.org/</A>。"
+
+#: tdeui/tdeabouttde.cpp:76
+#, fuzzy
+msgid ""
+"TDE is available free of charge, but making it is not free."
+"<br>"
+"<br>The Trinity team <i>does need</i> financial support. The money is used to "
+"support the expenses incurred to keep the TDE servers running, so that you - "
+"the user - can access them at any time. You are encouraged to support Trinity "
+"through a financial or hardware donation, using one of the ways described at <a "
+"href=\"http://www.trinitydesktop.org/donate.php\">http://www.trinitydesktop.org/"
+"donate.php</a>."
+"<br>"
+"<br>Thank you very much in advance for your support!"
+msgstr ""
+"TDE 是免费的，但是开发的过程却不是免费的。"
+"<br>"
+"<br>为此，TDE 团队成立了 TDE 协会，一个在德国合法建立的非营利组织。TDE 协会在法律和财政方面代表了 TDE 计划。请参看 <a "
+"href=\"http://www.kde.org/kde-ev/\">http://www.kde.org/kde-ev/<a> "
+"中关于 TDE 协会的信息。"
+"<br>"
+"<br>TDE 团队的确需要资金支持。其中大部分的资金用于偿还成员和其它人在为 TDE 做出贡献的时候所付出的开支。我们鼓励您通过资金捐助来支持 "
+"TDE。详细的捐助方法在 <a href=\"http://www.kde.org/support/\">"
+"http://www.kde.org/support/</a> 上有描述。"
+"<br>"
+"<br>这里先行谢过了。"
+
+#: tdeui/tdeabouttde.cpp:86
+#, fuzzy, c-format
+msgid "Trinity Desktop Environment. Release %1"
+msgstr "K 桌面环境 版本 %1"
+
+#: tdeui/tdeabouttde.cpp:88
+#, fuzzy
+msgid ""
+"_: About Trinity\n"
+"&About"
+msgstr "关于(&A)"
+
+#: tdeui/tdeabouttde.cpp:89
+msgid "&Report Bugs/Request Enhancements"
+msgstr ""
+
+#: tdeui/tdeabouttde.cpp:90
+#, fuzzy
+msgid "&Join the Trinity Team"
+msgstr "加入 TDE 团队(&J)"
+
+#: tdeui/tdeabouttde.cpp:91
+#, fuzzy
+msgid "&Support Trinity"
+msgstr "支持 TDE(&S)"
+
+#: tdeui/kcolorcombo.cpp:187 tdeui/kcolorcombo.cpp:240
+msgid "Custom..."
+msgstr "自定义..."
+
+#: tdeui/kdialog.cpp:381
+#, fuzzy
+msgid "Trinity Desktop Environment"
+msgstr "K 桌面环境 版本 %1"
+
+#: tdeui/kdialog.cpp:418 tdeui/kdialog.cpp:481
+msgid "Pondering what to do next"
+msgstr ""
+
+#: tdeui/kdialog.cpp:449
+#, fuzzy
+msgid "Please wait..."
+msgstr "重新命名列表..."
+
+#: tdeui/kdialog.cpp:507
+msgid "Starting DCOP"
+msgstr ""
+
+#: tdeui/kdialog.cpp:508
+#, fuzzy
+msgid "Starting TDE daemon"
+msgstr "TDE 守护进程"
+
+#: tdeui/kdialog.cpp:509
+#, fuzzy
+msgid "Starting services"
+msgstr "服务"
+
+#: tdeui/kdialog.cpp:510
+#, fuzzy
+msgid "Starting session"
+msgstr "开始搜索"
+
+#: tdeui/kdialog.cpp:511
+msgid "Initializing window manager"
+msgstr ""
+
+#: tdeui/kdialog.cpp:512
+#, fuzzy
+msgid "Loading desktop"
+msgstr "正在载入 Applet"
+
+#: tdeui/kdialog.cpp:513
+#, fuzzy
+msgid "Loading panels"
+msgstr "正在载入 Applet"
+
+#: tdeui/kdialog.cpp:514
+#, fuzzy
+msgid "Restoring applications"
+msgstr "退出程序"
+
+#: tdeui/kwhatsthismanager.cpp:50
+msgid ""
+"<b>Not Defined</b>"
+"<br>There is no \"What's This?\" help assigned to this widget. If you want to "
+"help us to  describe the widget, you are welcome to <a "
+"href=\"submit-whatsthis\">send us your own \"What's This?\" help</a> for it."
+msgstr ""
+"<b>未定义</b>"
+"<br>没有为此部件指派“这是什么”帮助。如果您想要帮助我们描述此部件，欢迎<a href=\"submit-whatsthis\">"
+"向我们发送“这是什么”帮助</a>。"
+
+#: tdemdi/tdemdichildfrm.cpp:1263 tdeui/ksystemtray.cpp:160
+msgid "&Minimize"
+msgstr "最小化(&M)"
+
+#: tdeui/ksystemtray.cpp:195
+msgid "<qt>Are you sure you want to quit <b>%1</b>?</qt>"
+msgstr "<qt>您确定想要退出 <b>%1</b> 吗？</qt>"
 
-#: tdeutils/tdecmoduleproxy.cpp:251
+#: tdeui/ksystemtray.cpp:198
+msgid "Confirm Quit From System Tray"
+msgstr "确认从系统托盘退出"
+
+#: tdeui/ksyntaxhighlighter.cpp:477 tdeui/ksyntaxhighlighter.cpp:586
+msgid "As-you-type spell checking enabled."
+msgstr "即输即查已启用。"
+
+#: tdeui/ksyntaxhighlighter.cpp:479
+msgid "As-you-type spell checking disabled."
+msgstr "即输即查已禁用。"
+
+#: tdeui/ksyntaxhighlighter.cpp:528
+msgid "Incremental Spellcheck"
+msgstr "渐进式拼写检查"
+
+#: tdeui/ksyntaxhighlighter.cpp:588
+msgid "Too many misspelled words. As-you-type spell checking disabled."
+msgstr "拼错的单词太多了。即输即查已禁用。"
+
+#: tdeui/kcombobox.cpp:601
+msgid "No further item in the history."
+msgstr "在历史中没有更多项目。"
+
+#: tdeui/kcombobox.cpp:730
+msgid "History Editor"
+msgstr ""
+
+#: tdeui/kcombobox.cpp:732
+#, fuzzy
+msgid "&Delete Entry"
+msgstr "删除(&D)"
+
+#: tdeui/kcombobox.cpp:738
+msgid "This dialog allows you to delete unwanted history items."
+msgstr ""
+
+#: tdeui/kcombobox.cpp:745 tdeui/kkeydialog.cpp:321
+msgid "Clear Search"
+msgstr "清除搜索"
+
+#: tdeui/kcombobox.cpp:747 tdeui/kkeydialog.cpp:324
+msgid "&Search:"
+msgstr "搜索(&S)："
+
+#: tdeui/kdialogbase.cpp:636
+msgid "&Try"
+msgstr "试用(&T)"
+
+#: tdeui/kdialogbase.cpp:904
+msgid ""
+"If you press the <b>OK</b> button, all changes\n"
+"you made will be used to proceed."
+msgstr ""
+"如果您按下<b>确定</b> 按钮，您所做的所有\n"
+"修改将会生效。"
+
+#: tdeui/kdialogbase.cpp:911
+msgid "Accept settings"
+msgstr "接受设置"
+
+#: tdeui/kdialogbase.cpp:932
+msgid ""
+"When clicking <b>Apply</b>, the settings will be\n"
+"handed over to the program, but the dialog\n"
+"will not be closed. Use this to try different settings. "
+msgstr ""
+"当点击<b>应用</b>后，设置会被程序\n"
+"使用，但是对话框不会被关闭。\n"
+"可以使用<b>应用</b>来试验不同设置。"
+
+#: tdeui/kdialogbase.cpp:941
+msgid "Apply settings"
+msgstr "应用设置"
+
+#: tdeui/kdialogbase.cpp:1130
+msgid "&Details"
+msgstr "细节(&D)"
+
+#: tdeui/kdialogbase.cpp:1538
+msgid "Get help..."
+msgstr "获得帮助..."
+
+#: tdeui/twindowlistmenu.cpp:129
+msgid "Unclutter Windows"
+msgstr "排列窗口"
+
+#: tdeui/twindowlistmenu.cpp:131
+msgid "Cascade Windows"
+msgstr "层叠窗口"
+
+#: tdeui/twindowlistmenu.cpp:185
+msgid "On All Desktops"
+msgstr "在全部桌面"
+
+#: tdeui/twindowlistmenu.cpp:213
+msgid "No Windows"
+msgstr "无窗口"
+
+#: tdeui/tdefontrequester.cpp:38
+msgid "Choose..."
+msgstr "选择..."
+
+#: tdeui/tdefontrequester.cpp:102
+msgid "Click to select a font"
+msgstr "单击可选择字体"
+
+#: tdeui/tdefontrequester.cpp:109
+msgid "Preview of the selected font"
+msgstr "选中字体的预览"
+
+#: tdeui/tdefontrequester.cpp:111
+msgid ""
+"This is a preview of the selected font. You can change it by clicking the "
+"\"Choose...\" button."
+msgstr "这是所选择的字体的预览。您可以点击“选择...”按钮来更改它。"
+
+#: tdeui/tdefontrequester.cpp:117
+msgid "Preview of the \"%1\" font"
+msgstr "字体“%1”的预览"
+
+#: tdeui/tdefontrequester.cpp:119
+msgid ""
+"This is a preview of the \"%1\" font. You can change it by clicking the "
+"\"Choose...\" button."
+msgstr "这是字体“%1”的预览。您可以点击“选择...”按钮来更改它。"
+
+#: tdeui/kpixmapregionselectorwidget.cpp:141
+msgid "Image Operations"
+msgstr "图像操作"
+
+#: tdeui/kpixmapregionselectorwidget.cpp:143
+msgid "&Rotate Clockwise"
+msgstr "顺时针旋转(&R)"
+
+#: tdeui/kpixmapregionselectorwidget.cpp:148
+msgid "Rotate &Counterclockwise"
+msgstr "逆时针旋转(&C)"
+
+#: tdeui/tdeactionselector.cpp:69
+msgid "&Available:"
+msgstr "可用的动作(&A)："
+
+#: tdeui/tdeactionselector.cpp:84
+msgid "&Selected:"
+msgstr "已选(&S)："
+
+#: tdeui/kdockwidget.cpp:237
+msgid ""
+"_: Freeze the window geometry\n"
+"Freeze"
+msgstr "冻结"
+
+#: tdeui/kdockwidget.cpp:244
+msgid ""
+"_: Dock this window\n"
+"Dock"
+msgstr "停靠"
+
+#: tdeui/kdockwidget.cpp:251
+msgid "Detach"
+msgstr "漂移"
+
+#: tdemdi/tdemdi/guiclient.cpp:152 tdemdi/tdemdiguiclient.cpp:265
+#: tdeui/kdockwidget.cpp:2939
+#, c-format
+msgid "Hide %1"
+msgstr "隐藏 %1"
+
+#: tdemdi/tdemdi/guiclient.cpp:148 tdemdi/tdemdiguiclient.cpp:260
+#: tdeui/kdockwidget.cpp:2945
 #, c-format
+msgid "Show %1"
+msgstr "显示 %1"
+
+#: tdeui/kkeydialog.cpp:331
 msgid ""
-"_: Argument is application name\n"
-"This configuration section is already opened in %1"
-msgstr "此配置节已经在 %1 中打开了"
+"Search interactively for shortcut names (e.g. Copy) or combination of keys "
+"(e.g. Ctrl+C) by typing them here."
+msgstr "交互式搜索快捷键名称(如复制)或者按键组合(如 Ctrl+C)，只需在此输入。"
 
-#: tdeutils/tdecmoduleproxy.cpp:324
-msgid "<big>Loading...</big>"
-msgstr "<big>正在装入...</big>"
+#: tdeui/kkeydialog.cpp:354
+msgid ""
+"Here you can see a list of key bindings, i.e. associations between actions "
+"(e.g. 'Copy') shown in the left column and keys or combination of keys (e.g. "
+"Ctrl+V) shown in the right column."
+msgstr "在此您可以看到键关联的列表，也就是左边显示的动作(例如“复制”)和右边显示的键或组合键(例如Ctrl+V)之间的关联。"
 
-#: tdeutils/ksettings/componentsdialog.cpp:48
-msgid "Select Components"
-msgstr "选择组件"
+#: tdeui/kkeydialog.cpp:363
+msgid "Action"
+msgstr "动作"
 
-#: tdeutils/ksettings/dialog.cpp:590
-msgid "Select Components..."
-msgstr "选择组件..."
+#: tdeui/kkeydialog.cpp:364
+msgid "Shortcut"
+msgstr "快捷键"
 
-#: tderesources/resource.cpp:61
-msgid "resource"
-msgstr "资源"
+#: tdeui/kkeydialog.cpp:365
+msgid "Alternate"
+msgstr "备选"
 
-#: tderesources/selectdialog.cpp:95
-msgid "There is no resource available!"
-msgstr "没有可用的资源！"
+#: tdeui/kkeydialog.cpp:380
+msgid "Shortcut for Selected Action"
+msgstr "选中动作的快捷键"
 
-#: tderesources/kcmtderesources.cpp:44
-msgid "kcmtderesources"
-msgstr "kcmtderesources"
+#: tdeui/kkeydialog.cpp:393
+msgid ""
+"_: no key\n"
+"&None"
+msgstr "无(&N)"
 
-#: tderesources/kcmtderesources.cpp:45
-msgid "TDE Resources configuration module"
-msgstr "TDE 资源配置模块"
+#: tdeui/kkeydialog.cpp:398
+msgid "The selected action will not be associated with any key."
+msgstr "选中的动作不会和任何键关联。"
 
-#: tderesources/kcmtderesources.cpp:47
-msgid "(c) 2003 Tobias Koenig"
-msgstr "(c) 2003 Tobias Koenig"
+#: tdeui/kkeydialog.cpp:401
+msgid ""
+"_: default key\n"
+"De&fault"
+msgstr "默认(&F)"
+
+#: tdeui/kkeydialog.cpp:406
+msgid ""
+"This will bind the default key to the selected action. Usually a reasonable "
+"choice."
+msgstr "这会将默认键关联到选中的动作。通常是一个较合理的选择。"
+
+#: tdeui/kkeydialog.cpp:409
+msgid "C&ustom"
+msgstr "自定义(&U)"
+
+#: tdeui/kkeydialog.cpp:414
+msgid ""
+"If this option is selected you can create a customized key binding for the "
+"selected action using the buttons below."
+msgstr "如果选中了该选项，您可以用下面的按钮为选中的动作创建一个定制的组合键。"
+
+#: tdeui/kkeydialog.cpp:428
+msgid ""
+"Use this button to choose a new shortcut key. Once you click it, you can press "
+"the key-combination which you would like to be assigned to the currently "
+"selected action."
+msgstr "使用该按钮来选择新的快捷键。一旦您点击它，您可以按下您想要指派给当前选中动作的组合键。"
+
+#: tdeui/kkeydialog.cpp:470
+msgid "Shortcuts"
+msgstr "快捷键"
+
+#: tdeui/kkeydialog.cpp:536
+msgid "Default key:"
+msgstr "默认键："
+
+#: tdeui/kkeybutton.cpp:89 tdeui/kkeydialog.cpp:536 tdeui/klineedit.cpp:889
+msgid "None"
+msgstr "无"
+
+#: tdeui/kkeydialog.cpp:715
+msgid ""
+"In order to use the '%1' key as a shortcut, it must be combined with the Win, "
+"Alt, Ctrl, and/or Shift keys."
+msgstr ""
+"要使用“%1”键作为快捷键，它必须带有\n"
+"Meta、Alt、Ctrl 和(或) Shift 键。"
+
+#: tdeui/kkeydialog.cpp:718
+msgid "Invalid Shortcut Key"
+msgstr "无效快捷键"
+
+#: tdeui/kkeydialog.cpp:943
+msgid ""
+"The '%1' key combination has already been allocated to the \"%2\" action.\n"
+"Please choose a unique key combination."
+msgstr ""
+"按键组合“%1”已经被分配给“%2”动作。\n"
+"请选择一个独特的按键组合。"
+
+#: tdeui/kkeydialog.cpp:958
+msgid "Conflict with Standard Application Shortcut"
+msgstr "和标准程序快捷键冲突"
+
+#: tdeui/kkeydialog.cpp:959
+msgid ""
+"The '%1' key combination has already been allocated to the standard action "
+"\"%2\".\n"
+"Do you want to reassign it from that action to the current one?"
+msgstr ""
+"组合键“%1”已经被分配给标准动作“%2”。\n"
+"您是否想要将其重新分配给当前操作？"
+
+#: tdeui/kkeydialog.cpp:964
+msgid "Conflict with Global Shortcut"
+msgstr "和全局快捷键冲突"
+
+#: tdeui/kkeydialog.cpp:965
+msgid ""
+"The '%1' key combination has already been allocated to the global action "
+"\"%2\".\n"
+"Do you want to reassign it from that action to the current one?"
+msgstr ""
+"按键组合“%1”已经被分配给全局动作“%2”。\n"
+"您是否想要将其重新分配给当前操作？"
+
+#: tdeui/kkeydialog.cpp:970
+msgid "Key Conflict"
+msgstr "按键冲突"
+
+#: tdeui/kkeydialog.cpp:971
+msgid ""
+"The '%1' key combination has already been allocated to the \"%2\" action.\n"
+"Do you want to reassign it from that action to the current one?"
+msgstr ""
+"按键组合“%1”已经被分配给动作“%2”。\n"
+"您是否想要将其重新分配给当前操作？"
+
+#: tdeui/kkeydialog.cpp:977
+msgid "Reassign"
+msgstr "重新指派"
+
+#: tdeui/kkeydialog.cpp:1091 tdeui/kkeydialog.cpp:1103
+msgid "Configure Shortcuts"
+msgstr "配置快捷键"
+
+#: tdeui/kjanuswidget.cpp:161
+msgid "Empty Page"
+msgstr "空页面"
+
+#: tdeui/tdeshortcutdialog.cpp:68
+msgid "Configure Shortcut"
+msgstr "配置快捷键"
+
+#: tdeui/tdeshortcutdialog.cpp:71
+msgid "Advanced"
+msgstr "高级"
+
+#: tdeui/ktextedit.cpp:231
+msgid "Check Spelling..."
+msgstr "检查拼写..."
+
+#: tdeui/ktextedit.cpp:237
+msgid "Auto Spell Check"
+msgstr "自动检查拼写"
+
+#: tdeui/ktextedit.cpp:241
+msgid "Allow Tabulations"
+msgstr "允许跳格"
+
+#: tdeui/keditlistbox.cpp:124
+msgid "&Add"
+msgstr "添加(&A)"
+
+#: tdeui/keditlistbox.cpp:148
+msgid "Move &Up"
+msgstr "上移(&U)"
+
+#: tdeui/keditlistbox.cpp:153
+msgid "Move &Down"
+msgstr "下移(&D)"
+
+#: tdeui/kdatepicker.cpp:88
+#, c-format
+msgid "Week %1"
+msgstr "第 %1 周"
+
+#: tdeui/kdatepicker.cpp:163
+msgid "Next year"
+msgstr "下一年"
+
+#: tdeui/kdatepicker.cpp:164
+msgid "Previous year"
+msgstr "上一年"
+
+#: tdeui/kdatepicker.cpp:165
+msgid "Next month"
+msgstr "下一月"
+
+#: tdeui/kdatepicker.cpp:166
+msgid "Previous month"
+msgstr "上一月"
+
+#: tdeui/kdatepicker.cpp:167
+msgid "Select a week"
+msgstr "选择星期"
+
+#: tdeui/kdatepicker.cpp:168
+msgid "Select a month"
+msgstr "选择月份"
+
+#: tdeui/kdatepicker.cpp:169
+msgid "Select a year"
+msgstr "选择年份"
+
+#: tdeui/kdatepicker.cpp:170
+msgid "Select the current day"
+msgstr "选择今天"
+
+#: tdeui/kxmlguibuilder.cpp:166 tdeui/kxmlguibuilder.cpp:365
+msgid "No text!"
+msgstr "没有文字！"
+
+#: tdeui/kwizard.cpp:48
+msgid "&Back"
+msgstr "上一步(&B)"
+
+#: tdeui/kwizard.cpp:49
+msgid ""
+"_: Opposite to Back\n"
+"&Next"
+msgstr "下一步(&N)"
+
+#: tdeui/kstdguiitem.cpp:120
+msgid "Discard changes"
+msgstr "丢弃更改"
+
+#: tdeui/kstdguiitem.cpp:121
+msgid ""
+"Pressing this button will discard all recent changes made in this dialog"
+msgstr "按下该按钮将放弃在这个对话框中所做的修改"
+
+#: tdeui/kstdguiitem.cpp:127
+msgid "Save data"
+msgstr "保存数据"
+
+#: tdeui/kstdguiitem.cpp:132
+msgid "&Do Not Save"
+msgstr "不保存(&D)"
+
+#: tdeui/kstdguiitem.cpp:133
+msgid "Don't save data"
+msgstr "不保存数据"
+
+#: tdeui/kstdaction_p.h:44 tdeui/kstdguiitem.cpp:138
+msgid "Save &As..."
+msgstr "另存为(&A)..."
+
+#: tdeui/kstdguiitem.cpp:139
+msgid "Save file with another name"
+msgstr "将文件保存为另外的名称"
+
+#: tdeui/kstdguiitem.cpp:144
+msgid "Apply changes"
+msgstr "应用更改"
+
+#: tdeui/kstdguiitem.cpp:145
+msgid ""
+"When clicking <b>Apply</b>, the settings will be handed over to the program, "
+"but the dialog will not be closed.\n"
+"Use this to try different settings."
+msgstr ""
+"当点击<b>应用</b>后，设置会被程序使用，但是对话框不会被关闭。\n"
+"请用它来尝试不同的设置。"
+
+#: tdeui/kstdguiitem.cpp:153
+msgid "Administrator &Mode..."
+msgstr "管理员模式(&M)..."
+
+#: tdeui/kstdguiitem.cpp:153
+msgid "Enter Administrator Mode"
+msgstr "进入管理员模式"
+
+#: tdeui/kstdguiitem.cpp:154
+msgid ""
+"When clicking <b>Administrator Mode</b> you will be prompted for the "
+"administrator (root) password in order to make changes which require root "
+"privileges."
+msgstr "单击<b>管理员模式</b>之后，您需要输入管理员(root)的密码，以便进行需要 root 权限的更改。"
+
+#: tdeui/kstdguiitem.cpp:162
+msgid "Clear input"
+msgstr "清除输入"
+
+#: tdeui/kstdguiitem.cpp:163
+msgid "Clear the input in the edit field"
+msgstr "清除编辑区的输入"
+
+#: tdeui/kstdguiitem.cpp:169
+msgid "Show help"
+msgstr "显示帮助"
+
+#: tdeui/kstdguiitem.cpp:175
+msgid "Close the current window or document"
+msgstr "关闭当前窗口或文档"
+
+#: tdeui/kstdguiitem.cpp:181
+msgid "Reset all items to their default values"
+msgstr "把所有项目重设为它们的默认值"
+
+#: tdeui/kstdguiitem.cpp:189
+msgid "Go back one step"
+msgstr "后退一步"
+
+#: tdeui/kstdguiitem.cpp:197
+msgid "Go forward one step"
+msgstr "前进一步"
+
+#: tdeui/kstdguiitem.cpp:208
+msgid "Opens the print dialog to print the current document"
+msgstr "打开打印对话框来打印当前文档"
+
+#: tdeui/kstdguiitem.cpp:214
+msgid "C&ontinue"
+msgstr "继续(&O)"
+
+#: tdeui/kstdguiitem.cpp:215
+msgid "Continue operation"
+msgstr "继续操作"
+
+#: tdeui/kstdguiitem.cpp:221
+msgid "Delete item(s)"
+msgstr "删除项目"
+
+#: tdeui/kstdguiitem.cpp:227
+msgid "Open file"
+msgstr "打开文件"
+
+#: tdeui/kstdguiitem.cpp:233
+msgid "Quit application"
+msgstr "退出程序"
+
+#: tdeui/kstdguiitem.cpp:238
+msgid "&Reset"
+msgstr "重置(&R)"
+
+#: tdeui/kstdguiitem.cpp:239
+msgid "Reset configuration"
+msgstr "重置配置"
+
+#: tdeui/kstdguiitem.cpp:244
+msgid ""
+"_: Verb\n"
+"&Insert"
+msgstr "插入(&I)"
+
+#: tdeui/kstdguiitem.cpp:249
+msgid "Confi&gure..."
+msgstr "配置(&G)..."
+
+#: tdeui/kstdguiitem.cpp:274
+msgid "Test"
+msgstr "测试"
+
+#: tdeui/kstdguiitem.cpp:284
+msgid "&Overwrite"
+msgstr "覆盖(&O)"
+
+#: tdeui/ktimezonewidget.cpp:45
+msgid "Area"
+msgstr "区域"
+
+#: kab/addressbook.cc:295 tdeui/ktimezonewidget.cpp:47
+msgid "Comment"
+msgstr "备注"
+
+#: tdeui/klineedit.cpp:890
+msgid "Manual"
+msgstr "手动"
+
+#: tdeui/klineedit.cpp:891
+msgid "Automatic"
+msgstr "自动"
+
+#: tdeui/klineedit.cpp:892
+msgid "Dropdown List"
+msgstr "下拉列表"
+
+#: tdeui/klineedit.cpp:893
+msgid "Short Automatic"
+msgstr "半自动"
+
+#: tdeui/klineedit.cpp:894
+msgid "Dropdown List && Automatic"
+msgstr "下拉列表和自动"
+
+#: tdeui/tdetoolbar.cpp:2046
+msgid "Toolbar Menu"
+msgstr "工具栏菜单"
+
+#: tdeui/tdetoolbar.cpp:2049
+msgid ""
+"_: toolbar position string\n"
+"Top"
+msgstr "上边"
+
+#: tdeui/tdetoolbar.cpp:2050
+msgid ""
+"_: toolbar position string\n"
+"Left"
+msgstr "左边"
+
+#: tdeui/tdetoolbar.cpp:2051
+msgid ""
+"_: toolbar position string\n"
+"Right"
+msgstr "右边"
+
+#: tdeui/tdetoolbar.cpp:2052
+msgid ""
+"_: toolbar position string\n"
+"Bottom"
+msgstr "下边"
+
+#: tdeui/tdetoolbar.cpp:2054
+msgid ""
+"_: toolbar position string\n"
+"Floating"
+msgstr "浮动"
+
+#: tdeui/tdetoolbar.cpp:2055
+msgid ""
+"_: min toolbar\n"
+"Flat"
+msgstr "平面"
+
+#: tdeui/tdetoolbar.cpp:2058
+msgid "Icons Only"
+msgstr "仅图标"
+
+#: tdeui/tdetoolbar.cpp:2059
+msgid "Text Only"
+msgstr "仅文字"
+
+#: tdeui/tdetoolbar.cpp:2060
+msgid "Text Alongside Icons"
+msgstr "文字在图标旁"
+
+#: tdeui/tdetoolbar.cpp:2061
+msgid "Text Under Icons"
+msgstr "文字在图标下"
+
+#: tdeui/tdetoolbar.cpp:2086 tdeui/tdetoolbar.cpp:2107
+msgid "Small (%1x%2)"
+msgstr "小 (%1x%2)"
+
+#: tdeui/tdetoolbar.cpp:2088 tdeui/tdetoolbar.cpp:2109
+msgid "Medium (%1x%2)"
+msgstr "中 (%1x%2)"
+
+#: tdeui/tdetoolbar.cpp:2090 tdeui/tdetoolbar.cpp:2111
+msgid "Large (%1x%2)"
+msgstr "大 (%1x%2)"
+
+#: tdeui/tdetoolbar.cpp:2092 tdeui/tdetoolbar.cpp:2113
+msgid "Huge (%1x%2)"
+msgstr "巨大 (%1x%2)"
+
+#: tdeui/tdetoolbar.cpp:2124
+msgid "Text Position"
+msgstr "文字位置"
+
+#: tdeui/tdetoolbar.cpp:2126
+msgid "Icon Size"
+msgstr "图标大小"
+
+#: tdenewstuff/downloaddialog.cpp:306 tdenewstuff/downloaddialog.cpp:544
+#: tdeui/tdemessagebox.cpp:246
+msgid "Details"
+msgstr "细节"
+
+#: tdeui/tdemessagebox.cpp:428 tdeui/tdemessagebox.cpp:479
+msgid "Question"
+msgstr "疑问"
+
+#: tdeui/tdemessagebox.cpp:442 tdeui/tdemessagebox.cpp:494
+#: tdeui/tdemessagebox.cpp:575 tdeui/tdemessagebox.cpp:647
+#: tdeui/tdemessagebox.cpp:723
+msgid "Do not ask again"
+msgstr "不再提问"
+
+#: tdeui/kcommand.cpp:151 tdeui/kcommand.cpp:166 tdeui/kcommand.cpp:199
+#: tdeui/kcommand.cpp:241
+#, c-format
+msgid "&Undo: %1"
+msgstr "撤消(&U)：%1"
+
+#: tdeui/kcommand.cpp:192 tdeui/kcommand.cpp:247
+#, c-format
+msgid "&Redo: %1"
+msgstr "重做(&R)：%1"
+
+#: tdeui/kcommand.cpp:322
+#, c-format
+msgid "Undo: %1"
+msgstr "撤消：%1"
+
+#: tdeui/kcommand.cpp:341 tdeui/kcommand.cpp:346
+#, c-format
+msgid "Redo: %1"
+msgstr "重做：%1"
+
+#: tdeui/tdefontdialog.cpp:101
+msgid "Here you can choose the font to be used."
+msgstr "在此选择要使用的字体。"
+
+#: tdeui/tdefontdialog.cpp:113
+msgid "Requested Font"
+msgstr "要求的字体"
+
+#: tdeui/tdefontdialog.cpp:136
+msgid "Change font family?"
+msgstr "更改字体族？"
+
+#: tdeui/tdefontdialog.cpp:138
+msgid "Enable this checkbox to change the font family settings."
+msgstr "启用该选项来更改字体族设置。"
+
+#: tdeui/tdefontdialog.cpp:151
+msgid "Font style"
+msgstr "字体样式"
+
+#: tdeui/tdefontdialog.cpp:155
+msgid "Change font style?"
+msgstr "更改字体样式？"
+
+#: tdeui/tdefontdialog.cpp:157
+msgid "Enable this checkbox to change the font style settings."
+msgstr "启用该选项来更改字体样式设置。"
+
+#: tdeui/tdefontdialog.cpp:163
+msgid "Font style:"
+msgstr "字体样式："
+
+#: tdeui/tdefontdialog.cpp:171
+msgid "Size"
+msgstr "大小"
+
+#: tdeui/tdefontdialog.cpp:175
+msgid "Change font size?"
+msgstr "更改字体大小？"
+
+#: tdeui/tdefontdialog.cpp:177
+msgid "Enable this checkbox to change the font size settings."
+msgstr "使用该选项来修改字体大小设置。"
+
+#: tdeui/tdefontdialog.cpp:183
+msgid "Size:"
+msgstr "大小："
+
+#: tdeui/tdefontdialog.cpp:199
+msgid "Here you can choose the font family to be used."
+msgstr "在此选择要使用的字体族。"
+
+#: tdeui/tdefontdialog.cpp:221
+msgid "Here you can choose the font style to be used."
+msgstr "在此选择要使用的字体样式。"
+
+#: tdeui/tdefontdialog.cpp:224 tdeui/tdefontdialog.cpp:473
+#: tdeui/tdefontdialog.cpp:475 tdeui/tdefontdialog.cpp:484
+#: tdeui/tdefontdialog.cpp:485
+msgid "Regular"
+msgstr "常规"
+
+#: tdeui/tdefontdialog.cpp:226
+msgid "Bold"
+msgstr "粗体"
+
+#: tdeui/tdefontdialog.cpp:227
+msgid "Bold Italic"
+msgstr "粗斜体"
+
+#: tdeui/tdefontdialog.cpp:244
+msgid "Relative"
+msgstr "相对"
+
+#: tdeui/tdefontdialog.cpp:246
+msgid "Font size<br><i>fixed</i> or <i>relative</i><br>to environment"
+msgstr "字体大小<br><i>固定</i>或<i>相对<i><br>于环境"
+
+#: tdeui/tdefontdialog.cpp:248
+msgid ""
+"Here you can switch between fixed font size and font size to be calculated "
+"dynamically and adjusted to changing environment (e.g. widget dimensions, paper "
+"size)."
+msgstr "在此您可以选择使用固定大小字体，或根据环境(例如，构件大小、纸张大小等)动态计算。"
+
+#: tdeui/tdefontdialog.cpp:272
+msgid "Here you can choose the font size to be used."
+msgstr "在此选择要使用的字体大小。"
+
+#. i18n: This is a classical test phrase. (It contains all letters from A to Z.)
+#: tdeui/tdefontdialog.cpp:296
+msgid "The Quick Brown Fox Jumps Over The Lazy Dog"
+msgstr "The Quick Brown Fox 跳过那只懒狗"
+
+#: tdeui/tdefontdialog.cpp:301
+msgid ""
+"This sample text illustrates the current settings. You may edit it to test "
+"special characters."
+msgstr "该示例文字显示当前的设置。您可以编辑它来测试特殊字符。"
+
+#: tdeui/tdefontdialog.cpp:310 tdeui/tdefontdialog.cpp:320
+msgid "Actual Font"
+msgstr "实际字体"
+
+#: tdemdi/tdemdi/guiclient.cpp:79 tdemdi/tdemdiguiclient.cpp:139
+msgid "Tool &Views"
+msgstr "工具视图(&V)"
+
+#: tdemdi/tdemdiguiclient.cpp:142
+msgid "MDI Mode"
+msgstr "MDI 模式"
+
+#: tdemdi/tdemdiguiclient.cpp:144 tdemdi/tdemdimainfrm.cpp:2594
+msgid "&Toplevel Mode"
+msgstr "顶级模式(&T)"
+
+#: tdemdi/tdemdiguiclient.cpp:144 tdemdi/tdemdimainfrm.cpp:2595
+msgid "C&hildframe Mode"
+msgstr "子框架模式(&H)"
+
+#: tdemdi/tdemdiguiclient.cpp:144 tdemdi/tdemdimainfrm.cpp:2596
+msgid "Ta&b Page Mode"
+msgstr "标签页模式(&B)"
+
+#: tdemdi/tdemdiguiclient.cpp:144 tdemdi/tdemdimainfrm.cpp:2597
+msgid "I&DEAl Mode"
+msgstr "I&DEAl 模式"
+
+#: tdemdi/tdemdi/guiclient.cpp:81 tdemdi/tdemdiguiclient.cpp:154
+msgid "Tool &Docks"
+msgstr "工具停靠(&D)"
+
+#: tdemdi/tdemdi/guiclient.cpp:82 tdemdi/tdemdiguiclient.cpp:155
+msgid "Switch Top Dock"
+msgstr "切换顶部停靠区"
+
+#: tdemdi/tdemdi/guiclient.cpp:84 tdemdi/tdemdiguiclient.cpp:157
+msgid "Switch Left Dock"
+msgstr "切换左边停靠区"
+
+#: tdemdi/tdemdi/guiclient.cpp:86 tdemdi/tdemdiguiclient.cpp:159
+msgid "Switch Right Dock"
+msgstr "切换左边停靠区"
+
+#: tdemdi/tdemdi/guiclient.cpp:88 tdemdi/tdemdiguiclient.cpp:161
+msgid "Switch Bottom Dock"
+msgstr "切换底部停靠区"
+
+#: tdemdi/tdemdi/guiclient.cpp:91 tdemdi/tdemdiguiclient.cpp:164
+msgid "Previous Tool View"
+msgstr "上一工具视图"
+
+#: tdemdi/tdemdi/guiclient.cpp:93 tdemdi/tdemdiguiclient.cpp:166
+msgid "Next Tool View"
+msgstr "下一工具视图"
+
+#: tdemdi/tdemdichildfrmcaption.cpp:71 tdemdi/tdemdichildview.cpp:63
+#: tdemdi/tdemdichildview.cpp:89
+msgid "Unnamed"
+msgstr "未命名"
+
+#: tdemdi/tdemdichildfrm.cpp:1239
+msgid "R&esize"
+msgstr "大小(&E)"
+
+#: tdemdi/tdemdichildfrm.cpp:1240
+msgid "M&inimize"
+msgstr "最小化(&I)"
+
+#: tdemdi/tdemdichildfrm.cpp:1241
+msgid "M&aximize"
+msgstr "最大化(&A)"
+
+#: tdemdi/tdemdichildfrm.cpp:1261
+msgid "&Maximize"
+msgstr "最大化(&M)"
+
+#: tdemdi/tdemdichildfrm.cpp:1265
+msgid "M&ove"
+msgstr "移动(&O)"
+
+#: tdemdi/tdemdichildfrm.cpp:1267
+msgid "&Resize"
+msgstr "大小(&R)"
+
+#: tdemdi/tdemdichildfrm.cpp:1270
+msgid "&Undock"
+msgstr "取消停靠(&U)"
+
+#: tdemdi/tdemdi/dockcontainer.cpp:195 tdemdi/tdemdidockcontainer.cpp:218
+msgid ""
+"_: Switch between overlap and side by side mode\n"
+"Overlap"
+msgstr "叠放"
+
+#: tdemdi/tdemdimainfrm.cpp:979
+msgid "Window"
+msgstr "窗口"
+
+#: tdemdi/tdemdimainfrm.cpp:992
+msgid "Undock"
+msgstr "取消停靠"
+
+#: tdemdi/tdemdimainfrm.cpp:1002
+msgid "Dock"
+msgstr "停靠"
+
+#: tdemdi/tdemdimainfrm.cpp:1007
+msgid "Operations"
+msgstr "操作"
+
+#: tdemdi/tdemdimainfrm.cpp:2577
+msgid "Close &All"
+msgstr "全部关闭(&A)"
+
+#: tdemdi/tdemdimainfrm.cpp:2586
+msgid "&Minimize All"
+msgstr "全部最小化(&M)"
+
+#: tdemdi/tdemdimainfrm.cpp:2592
+msgid "&MDI Mode"
+msgstr "MDI 模式(&M)"
+
+#: tdemdi/tdemdimainfrm.cpp:2619
+msgid "&Tile"
+msgstr "平铺(&T)"
+
+#: tdemdi/tdemdimainfrm.cpp:2621
+msgid "Ca&scade Windows"
+msgstr "层叠窗口(&S)"
+
+#: tdemdi/tdemdimainfrm.cpp:2622
+msgid "Cascade &Maximized"
+msgstr "最大化层叠(&M)"
+
+#: tdemdi/tdemdimainfrm.cpp:2623
+msgid "Expand &Vertically"
+msgstr "垂直扩展(&V)"
+
+#: tdemdi/tdemdimainfrm.cpp:2624
+msgid "Expand &Horizontally"
+msgstr "水平扩展(&H)"
+
+#: tdemdi/tdemdimainfrm.cpp:2625
+msgid "Tile &Non-Overlapped"
+msgstr "不叠放平铺(&N)"
+
+#: tdemdi/tdemdimainfrm.cpp:2626
+msgid "Tile Overla&pped"
+msgstr "叠放平铺(&P)"
+
+#: tdemdi/tdemdimainfrm.cpp:2627
+msgid "Tile V&ertically"
+msgstr "垂直平铺(&E)"
+
+#: tdemdi/tdemdimainfrm.cpp:2633
+msgid "&Dock/Undock"
+msgstr "停靠/取消停靠(&D)"
+
+#: tdewidgets/maketdewidgets.cpp:15
+msgid "Builds Qt widget plugins from an ini style description file."
+msgstr "从 INI 样式的描述文件中创建 Qt 部件插件。"
+
+#: tdewidgets/maketdewidgets.cpp:113
+msgid "Output file"
+msgstr "输出文件"
+
+#: tdewidgets/maketdewidgets.cpp:114
+msgid "Name of the plugin class to generate"
+msgstr "要生成的插件类的名称"
+
+#: tdewidgets/maketdewidgets.cpp:115
+msgid "Default widget group name to display in designer"
+msgstr "要在设计器里显示的默认部件组名"
+
+#: tdewidgets/maketdewidgets.cpp:116
+msgid "Embed pixmaps from a source directory"
+msgstr "从源文件目录中嵌入位图"
+
+#: tdewidgets/maketdewidgets.cpp:129
+msgid "maketdewidgets"
+msgstr "maketdewidgets"
+
+#: tderesources/resource.cpp:61
+msgid "resource"
+msgstr "资源"
 
 #: tderesources/configdialog.cpp:40 tderesources/configpage.cpp:103
 #: tderesources/configpage.cpp:297
@@ -8441,6 +9273,22 @@ msgstr "%1 资源设置"
 msgid "Please enter a resource name."
 msgstr "请输入资源的名称。"
 
+#: tderesources/selectdialog.cpp:95
+msgid "There is no resource available!"
+msgstr "没有可用的资源！"
+
+#: tderesources/kcmtderesources.cpp:44
+msgid "kcmtderesources"
+msgstr "kcmtderesources"
+
+#: tderesources/kcmtderesources.cpp:45
+msgid "TDE Resources configuration module"
+msgstr "TDE 资源配置模块"
+
+#: tderesources/kcmtderesources.cpp:47
+msgid "(c) 2003 Tobias Koenig"
+msgstr "(c) 2003 Tobias Koenig"
+
 #: tderesources/configpage.cpp:120
 msgid "Type"
 msgstr "类型"
@@ -8495,6 +9343,685 @@ msgid ""
 "read-only nor inactive."
 msgstr "没有合法的标准资源！请选择一个既不是只读的也不是不活跃的资源。"
 
+#: tdeunittest/modrunner.cpp:36
+msgid "A command-line application that can be used to run KUnitTest modules."
+msgstr "可用于运行 KUnitTest 模块的命令应用程序。"
+
+#: tdeunittest/modrunner.cpp:42
+msgid "Only run modules whose filenames match the regexp."
+msgstr "只运行文件名匹配正则表达式的模块。"
+
+#: tdeunittest/modrunner.cpp:43
+msgid ""
+"Only run tests modules which are found in the folder. Use the query option to "
+"select modules."
+msgstr "只运行文件夹中找到的测试模块。使用查询选项选择模块。"
+
+#: tdeunittest/modrunner.cpp:44
+msgid ""
+"Disables debug capturing. You typically use this option when you use the GUI."
+msgstr "禁用调试捕捉。在您使用 GUI 时可能会用到此选项。"
+
+#: tdeunittest/modrunner.cpp:53
+msgid "KUnitTest ModRunner"
+msgstr "KUnitTest 模块运行器"
+
+#: kded/tde-menu.cpp:36
+msgid "Output data in UTF-8 instead of local encoding"
+msgstr "用 UTF-8 而非本地编码输出数据"
+
+#: kded/tde-menu.cpp:37
+msgid ""
+"Print menu-id of the menu that contains\n"
+"the application"
+msgstr "输出包含该应用程序的菜单的菜单标识号"
+
+#: kded/tde-menu.cpp:38
+msgid ""
+"Print menu name (caption) of the menu that\n"
+"contains the application"
+msgstr "输出包含该应用程序的菜单的菜单名称(标题)"
+
+#: kded/tde-menu.cpp:39
+msgid "Highlight the entry in the menu"
+msgstr "在菜单中加亮显示该菜单项"
+
+#: kded/tde-menu.cpp:40
+msgid "Do not check if sycoca database is up to date"
+msgstr "不检查 sycoca 数据库是否最新"
+
+#: kded/tde-menu.cpp:41
+msgid "The id of the menu entry to locate"
+msgstr "要定位的菜单项的标识号"
+
+#: kded/tde-menu.cpp:99
+msgid "Menu item '%1' could not be highlighted."
+msgstr "菜单项“%1”无法被加亮显示。"
+
+#: kded/tde-menu.cpp:111
+msgid ""
+"TDE Menu query tool.\n"
+"This tool can be used to find in which menu a specific application is shown.\n"
+"The --highlight option can be used to visually indicate to the user where\n"
+"in the TDE menu a specific application is located."
+msgstr ""
+"TDE 菜单查询工具。\n"
+"这个工具可以用来查找指定的应用程序显示在哪个菜单中。\n"
+"--highlight 选项可以用可视化方式向用户指示指定的应用程序在 TDE 菜单中位于何处。"
+
+#: kded/tde-menu.cpp:116
+msgid "tde-menu"
+msgstr "tde-menu"
+
+#: kded/tde-menu.cpp:133
+msgid "You must specify an application-id such as 'tde-konsole.desktop'"
+msgstr "您必须指定一个应用程序标识，比如“tde-konsole.desktop”"
+
+#: kded/tde-menu.cpp:142
+msgid ""
+"You must specify at least one of --print-menu-id, --print-menu-name or "
+"--highlight"
+msgstr "您必须指定以下至少一个选项：--print-menu-id、--print-menu-name 或者 --highlight"
+
+#: kded/tde-menu.cpp:164
+msgid "No menu item '%1'."
+msgstr "无菜单项“%1”。"
+
+#: kded/tde-menu.cpp:168
+msgid "Menu item '%1' not found in menu."
+msgstr "未在菜单中找到菜单项“%1”。"
+
+#: kded/khostname.cpp:41
+msgid "Old hostname"
+msgstr "旧主机名"
+
+#: kded/khostname.cpp:42
+msgid "New hostname"
+msgstr "新主机名"
+
+#: kded/khostname.cpp:79
+msgid ""
+"Error: HOME environment variable not set.\n"
+msgstr ""
+"错误：没有设置 HOME 环境变量。\n"
+
+#: kded/khostname.cpp:88
+msgid ""
+"Error: DISPLAY environment variable not set.\n"
+msgstr ""
+"错误：没有设置 DISPLAY 环境变量。\n"
+
+#: kded/khostname.cpp:369
+msgid "KDontChangeTheHostName"
+msgstr "KDontChangeTheHostName"
+
+#: kded/khostname.cpp:370
+msgid "Informs TDE about a change in hostname"
+msgstr "通知 TDE 主机名更改"
+
+#: kded/tdebuildsycoca.cpp:483
+msgid ""
+"Error creating database '%1'.\n"
+"Check that the permissions are correct on the directory and the disk is not "
+"full.\n"
+msgstr ""
+"创建数据库“%1”出错。\n"
+"请检查目录的权限是否正确，磁盘是否已满。\n"
+
+#: kded/tdebuildsycoca.cpp:483 kded/tdebuildsycoca.cpp:512
+#: kded/tdebuildsycoca.cpp:721
+msgid "KBuildSycoca"
+msgstr "KBuildSycoca"
+
+#: kded/tdebuildsycoca.cpp:512
+#, fuzzy
+msgid ""
+"[tdebuildsycoca] Error writing database '%1'.\n"
+"Check that the permissions are correct on the directory and the disk is not "
+"full.\n"
+msgstr ""
+"写入数据库“%1”出错。\n"
+"请检查目录的权限是否正确，磁盘是否已满。\n"
+
+#: kded/tdebuildsycoca.cpp:695
+msgid "Do not signal applications to update"
+msgstr "不请求应用程序进行更新"
+
+#: kded/tdebuildsycoca.cpp:696
+msgid "Disable incremental update, re-read everything"
+msgstr "禁用递增更新，重新读取所有数据"
+
+#: kded/tdebuildsycoca.cpp:697
+msgid "Check file timestamps"
+msgstr "检查文件时间戳"
+
+#: kded/tdebuildsycoca.cpp:698
+msgid "Disable checking files (dangerous)"
+msgstr "禁用文件检查(危险)"
+
+#: kded/tdebuildsycoca.cpp:699
+msgid "Create global database"
+msgstr "创建全局数据库"
+
+#: kded/tdebuildsycoca.cpp:700
+msgid "Perform menu generation test run only"
+msgstr "只进行菜单创建测试"
+
+#: kded/tdebuildsycoca.cpp:701
+msgid "Track menu id for debug purposes"
+msgstr "跟踪菜单 ID 以进行调试"
+
+#: kded/tdebuildsycoca.cpp:703
+msgid "Silent - work without windows and stderr"
+msgstr "静默 - 没有窗口和标准错误输出"
+
+#: kded/tdebuildsycoca.cpp:704
+msgid "Show progress information (even if 'silent' mode is on)"
+msgstr "显示进度信息(即使开启了“静默”模式)"
+
+#: kded/tdebuildsycoca.cpp:722
+msgid "Rebuilds the system configuration cache."
+msgstr "重建系统配置缓存。"
+
+#: kded/tdebuildsycoca.cpp:750
+msgid "Reloading TDE configuration, please wait..."
+msgstr "正在重新装入 TDE 配置，请稍候..."
+
+#: kded/tdebuildsycoca.cpp:751
+msgid "TDE Configuration Manager"
+msgstr "TDE 配置管理器"
+
+#: kded/tdebuildsycoca.cpp:753
+msgid "Do you want to reload TDE configuration?"
+msgstr "您是否想要重新装入 TDE 配置？"
+
+#: kded/tdebuildsycoca.cpp:753
+msgid "Do Not Reload"
+msgstr "不重新装入"
+
+#: kded/tdebuildsycoca.cpp:953
+#, fuzzy
+msgid "[tdebuildsycoca] Configuration information reloaded successfully."
+msgstr "配置信息已成功装入。"
+
+#: kded/kded.cpp:737
+msgid "Check Sycoca database only once"
+msgstr "只检查一次 Sycoca 数据库"
+
+#: kded/kded.cpp:877
+msgid "TDE Daemon"
+msgstr "TDE 守护进程"
+
+#: kded/kded.cpp:879
+msgid "TDE Daemon - triggers Sycoca database updates when needed"
+msgstr "TDE 守护进程 - 在需要的时候触发 Sycoca 数据库的更新"
+
+#: tdeparts/part.cpp:492
+msgid ""
+"The document \"%1\" has been modified.\n"
+"Do you want to save your changes or discard them?"
+msgstr ""
+"文档“%1”已经被修改。\n"
+"您想要保存更改还是丢弃更改？"
+
+#: tdeparts/part.cpp:494
+msgid "Close Document"
+msgstr "关闭文档"
+
+#: tdeparts/browserextension.cpp:485
+msgid "<qt>Do you want to search the Internet for <b>%1</b>?"
+msgstr "<qt>您真的要在 Internet 上搜索 <b>%1</b> 吗？"
+
+#: tdeparts/browserextension.cpp:486
+msgid "Internet Search"
+msgstr "Internet 搜索"
+
+#: tdeparts/browserextension.cpp:486
+msgid "&Search"
+msgstr "搜索(&S)"
+
+#: tdeparts/browserrun.cpp:275
+msgid "Do you really want to execute '%1'? "
+msgstr "您真的要执行“%1”吗？"
+
+#: tdeparts/browserrun.cpp:276
+msgid "Execute File?"
+msgstr "覆盖文件吗？"
+
+#: tdeparts/browserrun.cpp:276
+msgid "Execute"
+msgstr "执行"
+
+#: tdeparts/browserrun.cpp:294
+msgid ""
+"Open '%2'?\n"
+"Type: %1"
+msgstr ""
+"打开“%2”吗？\n"
+"类型：%1"
+
+#: tdeparts/browserrun.cpp:296
+msgid ""
+"Open '%3'?\n"
+"Name: %2\n"
+"Type: %1"
+msgstr ""
+"打开“%3”吗？\n"
+"名称：%2\n"
+"类型：%1"
+
+#: tdeparts/browserrun.cpp:310
+msgid "&Open with '%1'"
+msgstr "用“%1”打开(&O)"
+
+#: tdeparts/browserrun.cpp:311
+msgid "&Open With..."
+msgstr "打开方式(&O)..."
+
+#: tdeparts/browserrun.cpp:353
+msgid "&Open"
+msgstr "打开(&O)"
+
+#: tdestyles/web/plugin.cpp:9
+msgid "Web style plugin"
+msgstr "Web 风格插件"
+
+#: tdestyles/utils/installtheme/main.cpp:35
+msgid "TDE Tool to build a cache list of all pixmap themes installed"
+msgstr "创建所有安装了的位图主题的缓存列表的 TDE 工具"
+
+#: tdestyles/utils/installtheme/main.cpp:40
+msgid "KInstalltheme"
+msgstr "KInstalltheme"
+
+#: tdestyles/klegacy/plugin.cpp:28
+#, fuzzy
+msgid "KDE LegacyStyle plugin"
+msgstr "TDE 旧有风格插件"
+
+#: tdenewstuff/provider.cpp:261
+#, fuzzy
+msgid "Error parsing category list."
+msgstr "分析提供者列表出错。"
+
+#: tdenewstuff/provider.cpp:394
+msgid "Error parsing providers list."
+msgstr "分析提供者列表出错。"
+
+#: tdenewstuff/knewstuff.cpp:38 tdenewstuff/knewstuffbutton.cpp:61
+#, c-format
+msgid "Download New %1"
+msgstr "下载新 %1"
+
+#: tdenewstuff/providerdialog.cpp:53
+msgid "Hot New Stuff Providers"
+msgstr "百宝箱提供者"
+
+#: tdenewstuff/providerdialog.cpp:61
+msgid "Please select one of the providers listed below:"
+msgstr "请从下面列出的提供者中选择一个："
+
+#: tdenewstuff/providerdialog.cpp:88
+msgid "No provider selected."
+msgstr "没有选择提供者。"
+
+#: tdenewstuff/knewstuffgeneric.cpp:139
+msgid "The file '%1' already exists. Do you want to overwrite it?"
+msgstr "文件“%1”已经存在。您确定要覆盖它吗？"
+
+#: tdenewstuff/ghns.cpp:50
+msgid "Get hot new stuff:"
+msgstr "获得百宝箱："
+
+#: tdenewstuff/knewstuffsecure.cpp:83
+msgid ""
+"There was an error with the downloaded resource tarball file. Possible causes "
+"are damaged archive or invalid directory structure in the archive."
+msgstr "下载的资源 tarball 文件有错。可能的原因是存档文件已损坏或者存档中的目录结构无效。"
+
+#: tdenewstuff/knewstuffsecure.cpp:83
+msgid "Resource Installation Error"
+msgstr "资源安装错误"
+
+#: tdenewstuff/knewstuffsecure.cpp:94
+msgid "No keys were found."
+msgstr "未找到密钥。"
+
+#: tdenewstuff/knewstuffsecure.cpp:99
+msgid "The validation failed for unknown reason."
+msgstr "由于未知原因，校验失败。"
+
+#: tdenewstuff/knewstuffsecure.cpp:106
+msgid "The MD5SUM check failed, the archive might be broken."
+msgstr "MD5SUM 校验失败，存档可能已损坏。"
+
+#: tdenewstuff/knewstuffsecure.cpp:111
+msgid "The signature is bad, the archive might be broken or altered."
+msgstr "签名无效，存档可能已损坏或已被篡改。"
+
+#: tdenewstuff/knewstuffsecure.cpp:121
+msgid "The signature is valid, but untrusted."
+msgstr "签名有效，但不可信。"
+
+#: tdenewstuff/knewstuffsecure.cpp:127
+msgid "The signature is unknown."
+msgstr "签名未知。"
+
+#: tdenewstuff/knewstuffsecure.cpp:131
+msgid ""
+"The resource was signed with key <i>0x%1</i>, belonging to <i>%2 &lt;%3&gt;</i>"
+"."
+msgstr "资源用密钥 <i>0x%1</i> 签名，该密钥属于 <i>%2 &lt;%3&gt;</i>。"
+
+#: tdenewstuff/knewstuffsecure.cpp:137
+msgid ""
+"<qt>There is a problem with the resource file you have downloaded. The errors "
+"are :<b>%1</b>"
+"<br>%2"
+"<br>"
+"<br>Installation of the resource is <b>not recommended</b>."
+"<br>"
+"<br>Do you want to proceed with the installation?</qt>"
+msgstr ""
+"<qt>您下载的资源文件有问题。出现的错误为：<b>%1</b>"
+"<br>%2"
+"<br>"
+"<br><b>不推荐</b>安装该资源。"
+"<br>"
+"<br>您是否想要继续安装？</qt>"
+
+#: tdenewstuff/knewstuffsecure.cpp:137
+msgid "Problematic Resource File"
+msgstr "有问题的资源文件"
+
+#: tdenewstuff/knewstuffsecure.cpp:140
+msgid "<qt>%1<br><br>Press OK to install it.</qt>"
+msgstr "<qt>%1<br><br>单击确定可安装。</qt>"
+
+#: tdenewstuff/knewstuffsecure.cpp:140
+msgid "Valid Resource"
+msgstr "有效的资源"
+
+#: tdenewstuff/knewstuffsecure.cpp:190
+msgid "The signing failed for unknown reason."
+msgstr "签名失败，原因未知。"
+
+#: tdenewstuff/knewstuffsecure.cpp:195
+msgid ""
+"There are no keys usable for signing or you did not entered the correct "
+"passphrase.\n"
+"Proceed without signing the resource?"
+msgstr ""
+"没有可用于签名的密钥，或者您没有输入正确的密码句。\n"
+"不签名资源而继续吗？"
+
+#: tdenewstuff/tdehotnewstuff.cpp:31
+msgid "Display only media of this type"
+msgstr "只显示此类型的媒体"
+
+#: tdenewstuff/tdehotnewstuff.cpp:32
+msgid "Provider list to use"
+msgstr "要使用的提供者列表"
+
+#: tdenewstuff/security.cpp:63
+msgid ""
+"<qt>Cannot start <i>gpg</i> and retrieve the available keys. Make sure that <i>"
+"gpg</i> is installed, otherwise verification of downloaded resources will not "
+"be possible.</qt>"
+msgstr "<qt>无法启动 <i>gpg</i> 获取可用的密钥。请确定 <i>gpg</i> 已安装，否则将无法校验下载的资源。</qt>"
+
+#: tdenewstuff/security.cpp:177
+msgid ""
+"<qt>Enter passphrase for key <b>0x%1</b>, belonging to"
+"<br><i>%2&lt;%3&gt;</i>:</qt>"
+msgstr "<qt>输入密钥 <b>0x%1</b> 的密码句，该密钥属于 <br><i>%2&lt;%3&gt;</i>：</qt>"
+
+#: tdenewstuff/security.cpp:257
+msgid ""
+"<qt>Cannot start <i>gpg</i> and check the validity of the file. Make sure that "
+"<i>gpg</i> is installed, otherwise verification of downloaded resources will "
+"not be possible.</qt>"
+msgstr "<qt>无法启动 <i>gpg</i> 检查文件的有效性。请确定 <i>gpg</i> 已安装，否则将无法校验下载的资源。</qt>"
+
+#: tdenewstuff/security.cpp:317
+msgid "Select Signing Key"
+msgstr "选择签名密钥"
+
+#: tdenewstuff/security.cpp:317
+msgid "Key used for signing:"
+msgstr "用于签名的密钥："
+
+#: tdenewstuff/security.cpp:338
+msgid ""
+"<qt>Cannot start <i>gpg</i> and sign the file. Make sure that <i>gpg</i> "
+"is installed, otherwise signing of the resources will not be possible.</qt>"
+msgstr "<qt>无法启动 <i>gpg</i> 并签名文件。请确定 <i>gpg</i> 已安装，否则将对资源签名。</qt>"
+
+#: tdenewstuff/uploaddialog.cpp:47
+msgid "Share Hot New Stuff"
+msgstr "共享百宝箱"
+
+#: tdenewstuff/uploaddialog.cpp:63
+msgid "Author:"
+msgstr "作者："
+
+#: tdenewstuff/uploaddialog.cpp:68
+msgid "Email:"
+msgstr "电子邮件："
+
+#: tdenewstuff/uploaddialog.cpp:78
+msgid "Release:"
+msgstr "放出："
+
+#: tdenewstuff/uploaddialog.cpp:84
+msgid "License:"
+msgstr "许可："
+
+#: tdenewstuff/uploaddialog.cpp:88
+msgid "GPL"
+msgstr "GPL"
+
+#: tdenewstuff/uploaddialog.cpp:89
+msgid "LGPL"
+msgstr "LGPL"
+
+#: tdenewstuff/uploaddialog.cpp:90
+msgid "BSD"
+msgstr "BSD"
+
+#: tdenewstuff/uploaddialog.cpp:93
+msgid "Language:"
+msgstr "语言："
+
+#: tdenewstuff/uploaddialog.cpp:99
+msgid "Preview URL:"
+msgstr "预览 URL："
+
+#: tdenewstuff/uploaddialog.cpp:104
+msgid "Summary:"
+msgstr "概览："
+
+#: tdenewstuff/uploaddialog.cpp:121
+msgid "Please put in a name."
+msgstr "请输入名称。"
+
+#: tdenewstuff/uploaddialog.cpp:191
+msgid "Old upload information found, fill out fields?"
+msgstr "未找到旧的上传信息，要填写吗？"
+
+#: tdenewstuff/uploaddialog.cpp:191
+msgid "Fill Out"
+msgstr "填充"
+
+#: tdenewstuff/uploaddialog.cpp:191
+msgid "Do Not Fill Out"
+msgstr "不填充"
+
+#: tdenewstuff/engine.cpp:219
+msgid "Successfully installed hot new stuff."
+msgstr "成功安装了百宝箱。"
+
+#: tdenewstuff/engine.cpp:224
+msgid "Failed to install hot new stuff."
+msgstr "安装百宝箱失败。"
+
+#: tdenewstuff/engine.cpp:279
+msgid "Unable to create file to upload."
+msgstr "无法创建要上传的文件。"
+
+#: tdenewstuff/engine.cpp:294
+msgid ""
+"The files to be uploaded have been created at:\n"
+msgstr ""
+"要上传的文件已经创建于：\n"
+
+#: tdenewstuff/engine.cpp:295
+msgid ""
+"Data file: %1\n"
+msgstr ""
+"数据文件：%1\n"
+
+#: tdenewstuff/engine.cpp:297
+msgid ""
+"Preview image: %1\n"
+msgstr ""
+"预览图像：%1\n"
+
+#: tdenewstuff/engine.cpp:299
+msgid ""
+"Content information: %1\n"
+msgstr ""
+"内容信息：%1\n"
+
+#: tdenewstuff/engine.cpp:300
+msgid ""
+"Those files can now be uploaded.\n"
+msgstr ""
+"无法上传这些文件。\n"
+
+#: tdenewstuff/engine.cpp:301
+msgid "Beware that any people might have access to them at any time."
+msgstr "请小心，任何人都可在任何时刻访问。"
+
+#: tdenewstuff/engine.cpp:303
+msgid "Upload Files"
+msgstr "上传文件"
+
+#: tdenewstuff/engine.cpp:308
+msgid "Please upload the files manually."
+msgstr "请手动上传文件。"
+
+#: tdenewstuff/engine.cpp:312
+msgid "Upload Info"
+msgstr "上传信息"
+
+#: tdenewstuff/engine.cpp:320
+msgid "&Upload"
+msgstr "上传(&U)"
+
+#: tdenewstuff/engine.cpp:422
+msgid "Successfully uploaded new stuff."
+msgstr "成功上传了新宝物。"
+
+#: tdenewstuff/knewstuffbutton.cpp:49
+msgid "Download New Stuff"
+msgstr "下载新宝物"
+
+#: tdenewstuff/downloaddialog.cpp:106 tdenewstuff/downloaddialog.cpp:113
+#: tdenewstuff/downloaddialog.cpp:129 tdenewstuff/downloaddialog.cpp:136
+msgid "Get Hot New Stuff"
+msgstr "获得百宝箱"
+
+#: tdenewstuff/downloaddialog.cpp:151
+msgid "Welcome"
+msgstr "欢迎"
+
+#: tdenewstuff/downloaddialog.cpp:153
+msgid "Loading data providers..."
+msgstr ""
+
+#: tdenewstuff/downloaddialog.cpp:212
+msgid "Loading data listings..."
+msgstr ""
+
+#: tdenewstuff/downloaddialog.cpp:270
+msgid "Highest Rated"
+msgstr "最受欢迎"
+
+#: tdenewstuff/downloaddialog.cpp:271
+msgid "Most Downloads"
+msgstr "最多下载"
+
+#: tdenewstuff/downloaddialog.cpp:272
+msgid "Latest"
+msgstr "最新"
+
+#: tdenewstuff/downloaddialog.cpp:283
+msgid "Rating"
+msgstr "评分"
+
+#: tdenewstuff/downloaddialog.cpp:289
+msgid "Downloads"
+msgstr "下载数"
+
+#: tdenewstuff/downloaddialog.cpp:295
+msgid "Release Date"
+msgstr "放出日期"
+
+#: tdenewstuff/downloaddialog.cpp:305
+msgid "Install"
+msgstr "安装"
+
+#: tdenewstuff/downloaddialog.cpp:516
+msgid ""
+"Name: %1\n"
+"Author: %2\n"
+"License: %3\n"
+"Version: %4\n"
+"Release: %5\n"
+"Rating: %6\n"
+"Downloads: %7\n"
+"Release date: %8\n"
+"Summary: %9\n"
+msgstr ""
+"名称：%1\n"
+"作者：%2\n"
+"许可：%3\n"
+"版本：%4\n"
+"放出：%5\n"
+"评分：%6\n"
+"下载数：%7\n"
+"发表日期：%8\n"
+"概览：%9\n"
+
+#: tdenewstuff/downloaddialog.cpp:538
+msgid ""
+"Preview: %1\n"
+"Payload: %2\n"
+msgstr ""
+"预览：%1\n"
+"下载：%2\n"
+
+#: tdenewstuff/downloaddialog.cpp:718
+msgid "Installation successful."
+msgstr "安装成功。"
+
+#: tdenewstuff/downloaddialog.cpp:718 tdenewstuff/downloaddialog.cpp:720
+msgid "Installation"
+msgstr "安装"
+
+#: tdenewstuff/downloaddialog.cpp:720
+msgid "Installation failed."
+msgstr "安装失败。"
+
+#: tdenewstuff/downloaddialog.cpp:814
+msgid "Preview not available."
+msgstr "预览不可用。"
+
+#: tdespell2/ui/configdialog.cpp:38
+msgid "KSpell2 Configuration"
+msgstr "KSpell2 配置"
+
 #: kab/addressbook.cc:168
 msgid "Headline"
 msgstr "标题"
@@ -8840,6 +10367,92 @@ msgstr "日期"
 msgid "Your new entry could not be added."
 msgstr "无法添加这个新项目。"
 
+#: tdewallet/backend/tdewalletbackend.cc:258
+msgid "Already open."
+msgstr "已打开。"
+
+#: tdewallet/backend/tdewalletbackend.cc:260
+msgid "Error opening file."
+msgstr "打开文件时出错。"
+
+#: tdewallet/backend/tdewalletbackend.cc:262
+msgid "Not a wallet file."
+msgstr "不是钱包文件。"
+
+#: tdewallet/backend/tdewalletbackend.cc:264
+msgid "Unsupported file format revision."
+msgstr "不支持的文件格式版本。"
+
+#: tdewallet/backend/tdewalletbackend.cc:266
+msgid "Unknown encryption scheme."
+msgstr "未知的加密方案。"
+
+#: tdewallet/backend/tdewalletbackend.cc:268
+msgid "Corrupt file?"
+msgstr "文件损坏？"
+
+#: tdewallet/backend/tdewalletbackend.cc:270
+msgid "Error validating wallet integrity. Possibly corrupted."
+msgstr "校验钱包完整性出错。可能已损坏。"
+
+#: tdewallet/backend/tdewalletbackend.cc:274
+msgid "Read error - possibly incorrect password."
+msgstr "读取错误 - 可能密码不正确。"
+
+#: tdewallet/backend/tdewalletbackend.cc:276
+msgid "Decryption error."
+msgstr "解密错误。"
+
+#: tderandr/libtderandr.cc:703
+#, fuzzy
+msgid "Setting gamma failed."
+msgstr "保存失败。"
+
+#: tderandr/libtderandr.cc:708
+msgid "XRandR encountered a problem"
+msgstr ""
+
+#: tderandr/libtderandr.cc:1224
+msgid "%1:%2"
+msgstr ""
+
+#: tderandr/libtderandr.cc:1225
+msgid "%1. %2 output on %3"
+msgstr ""
+
+#: tderandr/libtderandr.cc:1231
+msgid "%1. %2 on %3 on card %4"
+msgstr ""
+
+#: tderandr/libtderandr.cc:1281 tderandr/libtderandr.cc:1285
+msgid "%1 x %2"
+msgstr ""
+
+#: tderandr/libtderandr.cc:1400
+#, fuzzy
+msgid "disconnected"
+msgstr "本地已经连接上"
+
+#: tderandr/libtderandr.cc:1406 tderandr/libtderandr.cc:1448
+msgid "N/A"
+msgstr ""
+
+#: tderandr/libtderandr.cc:1441
+msgid "Default output on generic video card"
+msgstr ""
+
+#: tdehtml/tdehtml_settings.cc:152
+msgid "Accept"
+msgstr "接受"
+
+#: tdehtml/tdehtml_settings.cc:153
+msgid "Reject"
+msgstr "拒绝"
+
+#: tdehtml/tdehtml_settings.cc:779
+msgid "Filter error"
+msgstr "过滤器错误"
+
 #: arts/kde/kconverttest.cc:23 arts/kde/kiotest.cc:17
 #: arts/kde/kiotestslow.cc:83
 msgid "URL to open"
@@ -8906,7 +10519,8 @@ msgstr "客户"
 msgid "Import &All"
 msgstr "全部导入(&A)"
 
-#: tdecert/tdecertpart.cc:183 tdecert/tdecertpart.cc:274 tdecert/tdecertpart.cc:359
+#: tdecert/tdecertpart.cc:183 tdecert/tdecertpart.cc:274
+#: tdecert/tdecertpart.cc:359
 msgid "TDE Secure Certificate Import"
 msgstr "TDE 安全证书导入"
 
@@ -8990,10 +10604,12 @@ msgstr "完成(&D)"
 msgid "Save failed."
 msgstr "保存失败。"
 
-#: tdecert/tdecertpart.cc:418 tdecert/tdecertpart.cc:440 tdecert/tdecertpart.cc:455
-#: tdecert/tdecertpart.cc:460 tdecert/tdecertpart.cc:496 tdecert/tdecertpart.cc:532
-#: tdecert/tdecertpart.cc:566 tdecert/tdecertpart.cc:600 tdecert/tdecertpart.cc:730
-#: tdecert/tdecertpart.cc:741 tdecert/tdecertpart.cc:746 tdecert/tdecertpart.cc:759
+#: tdecert/tdecertpart.cc:418 tdecert/tdecertpart.cc:440
+#: tdecert/tdecertpart.cc:455 tdecert/tdecertpart.cc:460
+#: tdecert/tdecertpart.cc:496 tdecert/tdecertpart.cc:532
+#: tdecert/tdecertpart.cc:566 tdecert/tdecertpart.cc:600
+#: tdecert/tdecertpart.cc:730 tdecert/tdecertpart.cc:741
+#: tdecert/tdecertpart.cc:746 tdecert/tdecertpart.cc:759
 #: tdecert/tdecertpart.cc:873
 msgid "Certificate Import"
 msgstr "导入证书"
@@ -9056,54 +10672,6 @@ msgstr ""
 msgid "TDE Certificate Part"
 msgstr "TDE 证书部分"
 
-#: tdehtml/tdehtml_settings.cc:152
-msgid "Accept"
-msgstr "接受"
-
-#: tdehtml/tdehtml_settings.cc:153
-msgid "Reject"
-msgstr "拒绝"
-
-#: tdehtml/tdehtml_settings.cc:779
-msgid "Filter error"
-msgstr "过滤器错误"
-
-#: tdewallet/backend/tdewalletbackend.cc:258
-msgid "Already open."
-msgstr "已打开。"
-
-#: tdewallet/backend/tdewalletbackend.cc:260
-msgid "Error opening file."
-msgstr "打开文件时出错。"
-
-#: tdewallet/backend/tdewalletbackend.cc:262
-msgid "Not a wallet file."
-msgstr "不是钱包文件。"
-
-#: tdewallet/backend/tdewalletbackend.cc:264
-msgid "Unsupported file format revision."
-msgstr "不支持的文件格式版本。"
-
-#: tdewallet/backend/tdewalletbackend.cc:266
-msgid "Unknown encryption scheme."
-msgstr "未知的加密方案。"
-
-#: tdewallet/backend/tdewalletbackend.cc:268
-msgid "Corrupt file?"
-msgstr "文件损坏？"
-
-#: tdewallet/backend/tdewalletbackend.cc:270
-msgid "Error validating wallet integrity. Possibly corrupted."
-msgstr "校验钱包完整性出错。可能已损坏。"
-
-#: tdewallet/backend/tdewalletbackend.cc:274
-msgid "Read error - possibly incorrect password."
-msgstr "读取错误 - 可能密码不正确。"
-
-#: tdewallet/backend/tdewalletbackend.cc:276
-msgid "Decryption error."
-msgstr "解密错误。"
-
 #: tdeui/kstdaction_p.h:40
 msgid "&New"
 msgstr "新建(&N)"
@@ -9276,109 +10844,109 @@ msgstr "用户路径：desktop|autostart|trash|document"
 msgid "Prefix to install resource files to"
 msgstr "安装资源文件的前缀"
 
-#: tdecore/tde-config.cpp.in:168
+#: tdecore/tde-config.cpp.in:169
 msgid "Applications menu (.desktop files)"
 msgstr "应用程序菜单(.desktop 文件)"
 
-#: tdecore/tde-config.cpp.in:169
+#: tdecore/tde-config.cpp.in:170
 msgid "CGIs to run from kdehelp"
 msgstr "kdehelp 中运行的 CGI"
 
-#: tdecore/tde-config.cpp.in:170
+#: tdecore/tde-config.cpp.in:171
 msgid "Configuration files"
 msgstr "配置文件"
 
-#: tdecore/tde-config.cpp.in:171
+#: tdecore/tde-config.cpp.in:172
 msgid "Where applications store data"
 msgstr "应用程序存储数据的位置"
 
-#: tdecore/tde-config.cpp.in:172
+#: tdecore/tde-config.cpp.in:173
 msgid "Executables in $prefix/bin"
 msgstr "$prefix/bin 中的可执行文件"
 
-#: tdecore/tde-config.cpp.in:173
+#: tdecore/tde-config.cpp.in:174
 msgid "HTML documentation"
 msgstr "HTML 文档"
 
-#: tdecore/tde-config.cpp.in:174
+#: tdecore/tde-config.cpp.in:175
 msgid "Icons"
 msgstr "图标"
 
-#: tdecore/tde-config.cpp.in:175
+#: tdecore/tde-config.cpp.in:176
 msgid "Configuration description files"
 msgstr "配置描述文件"
 
-#: tdecore/tde-config.cpp.in:176
+#: tdecore/tde-config.cpp.in:177
 msgid "Libraries"
 msgstr "库"
 
-#: tdecore/tde-config.cpp.in:177
+#: tdecore/tde-config.cpp.in:178
 msgid "Includes/Headers"
 msgstr "包含/头文件"
 
-#: tdecore/tde-config.cpp.in:178
+#: tdecore/tde-config.cpp.in:179
 msgid "Translation files for TDELocale"
 msgstr "TDELocale 的翻译文件"
 
-#: tdecore/tde-config.cpp.in:179
+#: tdecore/tde-config.cpp.in:180
 msgid "Mime types"
 msgstr "MIME 类型"
 
-#: tdecore/tde-config.cpp.in:180
+#: tdecore/tde-config.cpp.in:181
 msgid "Loadable modules"
 msgstr "可装入的模块"
 
-#: tdecore/tde-config.cpp.in:181
+#: tdecore/tde-config.cpp.in:182
 msgid "Qt plugins"
 msgstr "Qt 插件"
 
-#: tdecore/tde-config.cpp.in:182
+#: tdecore/tde-config.cpp.in:183
 msgid "Services"
 msgstr "服务"
 
-#: tdecore/tde-config.cpp.in:183
+#: tdecore/tde-config.cpp.in:184
 msgid "Service types"
 msgstr "服务类型"
 
-#: tdecore/tde-config.cpp.in:184
+#: tdecore/tde-config.cpp.in:185
 msgid "Application sounds"
 msgstr "应用程序声音"
 
-#: tdecore/tde-config.cpp.in:185
+#: tdecore/tde-config.cpp.in:186
 msgid "Templates"
 msgstr "模板"
 
-#: tdecore/tde-config.cpp.in:186
+#: tdecore/tde-config.cpp.in:187
 msgid "Wallpapers"
 msgstr "壁纸"
 
-#: tdecore/tde-config.cpp.in:187
+#: tdecore/tde-config.cpp.in:188
 msgid "XDG Application menu (.desktop files)"
 msgstr "XDG 应用程序菜单(.desktop 文件)"
 
-#: tdecore/tde-config.cpp.in:188
+#: tdecore/tde-config.cpp.in:189
 msgid "XDG Menu descriptions (.directory files)"
 msgstr "XDG 菜单描述(.directory 文件)"
 
-#: tdecore/tde-config.cpp.in:189
+#: tdecore/tde-config.cpp.in:190
 msgid "XDG Menu layout (.menu files)"
 msgstr "XDG 菜单布局(.menu 文件)"
 
-#: tdecore/tde-config.cpp.in:190
+#: tdecore/tde-config.cpp.in:191
 msgid "Temporary files (specific for both current host and current user)"
 msgstr "临时文件(特别用于当前主机和当前用户)"
 
-#: tdecore/tde-config.cpp.in:191
+#: tdecore/tde-config.cpp.in:192
 msgid "UNIX Sockets (specific for both current host and current user)"
 msgstr "UNIX 套接字(特别用于当前主机和当前用户)"
 
-#: tdecore/tde-config.cpp.in:203
+#: tdecore/tde-config.cpp.in:204
 msgid ""
 "%1 - unknown type\n"
 msgstr ""
 "%1 - 未知类型\n"
 
-#: tdecore/tde-config.cpp.in:228
+#: tdecore/tde-config.cpp.in:229
 msgid ""
 "%1 - unknown type of userpath\n"
 msgstr ""
@@ -10748,3 +12316,27 @@ msgid ""
 "_: QXml\n"
 "error in the text declaration of an external entity"
 msgstr "外部实体的文本声明错误"
+
+#~ msgid "The <b>K Desktop Environment</b> is written and maintained by the TDE Team, a world-wide network of software engineers committed to <a href=\"http://www.gnu.org/philosophy/free-sw.html\">Free Software</a> development.<br><br>No single group, company or organization controls the TDE source code. Everyone is welcome to contribute to TDE.<br><br>Visit <A HREF=\"http://www.kde.org/\">http://www.kde.org</A> for more information on the TDE project. "
+#~ msgstr "<b>K 桌面环境</b>由 TDE 团队编写和维护，该团队是一个由全世界联网的参与<a href=\"http://www.gnu.org/philosophy/free-sw.html\">自由软件</a>开发的工程师组成的组织。<br><br>TDE 的源代码不受任何单独的团体、公司或机构控制。欢迎每个人对 TDE 作出贡献。<br><br>访问 <A HREF=\"http://www.kde.org/\">http://www.kde.org/</A> 来了解有关 TDE 计划的更多信息。"
+
+#~ msgid "&Report Bugs or Wishes"
+#~ msgstr "报告错误或愿望(&R)"
+
+#~ msgid ""
+#~ "To submit a bug report, click on the button below.\n"
+#~ "This will open a web browser window on http://bugs.kde.org where you will find a form to fill in.\n"
+#~ "The information displayed above will be transferred to that server."
+#~ msgstr ""
+#~ "要提交错误报告，请单击下面的链接。\n"
+#~ "这样会打开一个显示 http://bugs.kde.org 网页的浏览器窗口，在那里您将找到一个可以填写的表格。\n"
+#~ "上面显示的信息将被传送到那个服务器上。"
+
+#~ msgid "&Report Bug..."
+#~ msgstr "报告错误(&R)..."
+
+#~ msgid "Konqueror has the ability to store the password in an encrypted wallet. When the wallet is unlocked, it can then automatically restore the login information next time you submit this form. Do you want to store the information now?"
+#~ msgstr "Konqueror 具有用加密的钱包存储密码的能力。当钱包未加锁时，下次您提交这一表单时它能自动恢复登录信息。您现在要存储信息吗？"
+
+#~ msgid "Konqueror has the ability to store the password in an encrypted wallet. When the wallet is unlocked, it can then automatically restore the login information next time you visit %1. Do you want to store the information now?"
+#~ msgstr "Konqueror 具有用加密的钱包保存密码的能力。当钱包未加锁时，下次您访问 %1 时它能自动恢复登录信息。您现在要存储信息吗？"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdelibs_colors.po b/tde-i18n-zh_CN/messages/tdelibs/tdelibs_colors.po
index bb1289cc514..b450f52ea3a 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdelibs_colors.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdelibs_colors.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdelibs_colors\n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2003-12-27 23:03+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdeprint.po b/tde-i18n-zh_CN/messages/tdelibs/tdeprint.po
index 0fa16a6be8d..8994cf0446c 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdeprint.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdeprint.po
@@ -8,445 +8,27 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2007-08-27 01:12+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2005-05-17 00:33+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: ext/kextprinterimpl.cpp:47
-msgid "Empty print command."
-msgstr "空的打印命令。"
-
-#: ext/kmextmanager.cpp:41
-msgid "PS_printer"
-msgstr "PS打印机"
-
-#: ext/kmextmanager.cpp:43
-msgid "PostScript file generator"
-msgstr "PostScript 文件生成器"
-
-#: kpgeneralpage.cpp:88 lpd/lpdtools.cpp:28
-msgid "Ledger"
-msgstr "Ledger"
-
-#: kpgeneralpage.cpp:87 lpd/lpdtools.cpp:29
-msgid "US Legal"
-msgstr "US Legal"
-
-#: kpgeneralpage.cpp:86 lpd/lpdtools.cpp:30
-msgid "US Letter"
-msgstr "US Letter"
-
-#: lpd/lpdtools.cpp:31
-msgid "A4"
-msgstr "A4"
-
-#: lpd/lpdtools.cpp:32
-msgid "A3"
-msgstr "A3"
-
-#: lpd/lpdtools.cpp:33
-msgid "B4"
-msgstr "B4"
-
-#: lpd/lpdtools.cpp:34
-msgid "B5"
-msgstr "B5"
-
-#: kpgeneralpage.cpp:416 lpd/lpdtools.cpp:39 lpr/editentrydialog.cpp:50
-msgid "Enabled"
-msgstr "已启用"
-
-#: kpgeneralpage.cpp:415 lpd/lpdtools.cpp:40 management/kmconfiggeneral.cpp:52
-msgid "Disabled"
-msgstr "已禁用"
-
-#: lpd/lpdtools.cpp:233
-msgid "GhostScript settings"
-msgstr "GhostScript 设置"
-
-#: lpd/lpdtools.cpp:239 management/kmpropdriver.cpp:53
-#: management/kmwend.cpp:104
-msgid "Driver"
-msgstr "驱动程序"
-
-#: lpd/lpdtools.cpp:254
-msgid "Resolution"
-msgstr "分辨率"
-
-#: lpd/lpdtools.cpp:277
-msgid "Color depth"
-msgstr "颜色深度"
-
-#: lpd/lpdtools.cpp:301
-msgid "Additional GS options"
-msgstr "其它 GS 选项"
-
-#: driver.cpp:377 kpgeneralpage.cpp:260 lpd/lpdtools.cpp:307
-#: management/kmconfiggeneral.cpp:44 management/kmpropgeneral.cpp:54
-#: management/kmwend.cpp:49
-msgid "General"
-msgstr "常规"
-
-#: lpd/lpdtools.cpp:313
-msgid "Page size"
-msgstr "页面大小"
-
-#: lpd/lpdtools.cpp:329
-msgid "Pages per sheet"
-msgstr "每张纸上打印页数"
-
-#: lpd/lpdtools.cpp:345
-msgid "Left/right margin (1/72 in)"
-msgstr "左右页边距(1/72英寸)"
-
-#: lpd/lpdtools.cpp:350
-msgid "Top/bottom margin (1/72 in)"
-msgstr "上下页边距(1/72英寸)"
-
-#: lpd/lpdtools.cpp:356
-msgid "Text options"
-msgstr "文本选项"
-
-#: lpd/lpdtools.cpp:362
-msgid "Send EOF after job to eject page"
-msgstr "在作业结束后发送 EOF 出纸"
-
-#: lpd/lpdtools.cpp:370
-msgid "Fix stair-stepping text"
-msgstr "调整行错位文本"
-
-#: lpd/lpdtools.cpp:382
-msgid "Fast text printing (non-PS printers only)"
-msgstr "快速文本打印(仅用于非 PS 打印机)"
-
-#: lpd/klpdprinterimpl.cpp:46 rlpr/krlprprinterimpl.cpp:53
-msgid ""
-"The <b>%1</b> executable could not be found in your path. Check your "
-"installation."
-msgstr "在搜索路径中找不到可执行程序<b>%1</b>。检查您的安装。"
-
-#: lpd/kmlpduimanager.cpp:44
-msgid "Local printer (parallel, serial, USB)"
-msgstr "本地打印机(并口、串口和 USB)"
-
-#: lpd/kmlpduimanager.cpp:45 management/kmpropbackend.cpp:68
-#: rlpr/kmwrlpr.cpp:116
-msgid "Remote LPD queue"
-msgstr "远程 LPD 队列"
-
-#: lpd/kmlpduimanager.cpp:46
-msgid "SMB shared printer (Windows)"
-msgstr "SMB 共享打印机(Windows)"
-
-#: lpd/kmlpduimanager.cpp:47
-msgid "Network printer (TCP)"
-msgstr "网络打印机(TCP)"
-
-#: lpd/kmlpduimanager.cpp:48
-msgid "File printer (print to file)"
-msgstr "文件打印机(打印到文件)"
-
-#: lpd/kmlpdmanager.cpp:87
-msgid "Local printer queue (%1)"
-msgstr "本地打印机队列 (%1)"
-
-#: lpd/kmlpdmanager.cpp:87
-msgid ""
-"_: Unknown type of local printer queue\n"
-"Unknown"
-msgstr "未知"
-
-#: lpd/kmlpdmanager.cpp:88
-msgid "<Not available>"
-msgstr "<不可用>"
-
-#: lpd/kmlpdmanager.cpp:89
-msgid ""
-"_: Unknown Driver\n"
-"Unknown"
-msgstr "未知"
-
-#: lpd/kmlpdmanager.cpp:95
-msgid "Remote LPD queue %1@%2"
-msgstr "远程 LPD 队列 %1@%2"
-
-#: lpd/kmlpdmanager.cpp:158
-msgid "Unable to create spool directory %1 for printer %2."
-msgstr "无法为打印机 %2 创建假脱机目录 %1。"
-
-#: lpd/kmlpdmanager.cpp:165
-msgid "Unable to save information for printer <b>%1</b>."
-msgstr "无法为打印机<b>%1</b>保存信息。"
-
-#: lpd/kmlpdmanager.cpp:193
-msgid ""
-"Unable to set correct permissions on spool directory %1 for printer <b>%2</b>."
-msgstr "无法为打印机<b>%2</b>的假脱机目录 %1 设置正确的权限。"
-
-#: lpd/kmlpdmanager.cpp:237
-msgid "Permission denied: you must be root."
-msgstr "没有权限：您必须是 root。"
-
-#: lpd/kmlpdmanager.cpp:244
-msgid "Unable to execute command \"%1\"."
-msgstr "无法执行命令“%1”。"
-
-#: lpd/kmlpdmanager.cpp:317
-msgid "Unable to write printcap file."
-msgstr "无法写 printcap 文件。"
-
-#: lpd/kmlpdmanager.cpp:372
-msgid "Couldn't find driver <b>%1</b> in printtool database."
-msgstr "在打印工具数据库中找不到驱动程序 <b>%1</b>。"
-
-#: lpd/kmlpdmanager.cpp:411
-msgid "Couldn't find printer <b>%1</b> in printcap file."
-msgstr "在 printcap 文件中找不到打印机 <b>%1</b>。"
-
-#: lpd/kmlpdmanager.cpp:440
-msgid "No driver found (raw printer)"
-msgstr "没有找到驱动程序(raw 打印机)"
-
-#: lpd/kmlpdmanager.cpp:442
-msgid "Printer type not recognized."
-msgstr "不认识的打印机类型。"
-
-#: lpd/kmlpdmanager.cpp:452
-msgid ""
-"The driver device <b>%1</b> is not compiled in your GhostScript distribution. "
-"Check your installation or use another driver."
-msgstr "在您的 GhostScript 中没有编译进驱动程序 <b>%1</b>。请检查您的安装或使用另外的驱动程序。"
-
-#: lpd/kmlpdmanager.cpp:560
-msgid "Unable to write driver associated files in spool directory."
-msgstr "无法在假脱机目录中写和驱动程序相关的文件。"
-
-#: lpr/apshandler.cpp:68
-msgid "APS Driver (%1)"
-msgstr "APS 驱动程序(%1)"
-
-#: lpr/apshandler.cpp:112 lpr/lprhandler.cpp:74 lpr/lprngtoolhandler.cpp:72
-msgid "Network printer (%1)"
-msgstr "网络打印机(%1)"
-
-#: lpr/apshandler.cpp:215 lpr/lprhandler.cpp:127 lpr/lprngtoolhandler.cpp:276
-#: lpr/matichandler.cpp:421
-#, c-format
-msgid "Unsupported backend: %1."
-msgstr "不支持的后端：%1。"
-
-#: lpr/apshandler.cpp:221
-#, c-format
-msgid "Unable to create directory %1."
-msgstr "无法创建目录 %1。"
-
-#: lpr/apshandler.cpp:241
-#, c-format
-msgid "Missing element: %1."
-msgstr "缺少元素：%1。"
-
-#: lpr/apshandler.cpp:258 lpr/apshandler.cpp:289 lpr/lprngtoolhandler.cpp:323
-#, c-format
-msgid "Invalid printer backend specification: %1"
-msgstr "无效的打印机后端规范：%1"
-
-#: lpr/apshandler.cpp:264 lpr/apshandler.cpp:295 lpr/apshandler.cpp:367
-#, c-format
-msgid "Unable to create the file %1."
-msgstr "无法创建文件 %1。"
-
-#: lpr/apshandler.cpp:322
-msgid "The APS driver is not defined."
-msgstr "没有定义 APS 驱动程序。"
-
-#: lpr/apshandler.cpp:380
-#, c-format
-msgid "Unable to remove directory %1."
-msgstr "无法删除目录 %1。"
-
-#: lpr/lprhandler.cpp:59 lpr/lprhandler.cpp:97
-msgid "Unknown (unrecognized entry)"
-msgstr "未知(不认识的项)"
-
-#: lpr/lprhandler.cpp:67 lpr/lprhandler.cpp:91
-msgid "Remote queue (%1) on %2"
-msgstr "在 %2 上的远程打印队列(%1)"
-
-#: lpr/lprhandler.cpp:81 lpr/matichandler.cpp:86
-#, c-format
-msgid "Local printer on %1"
-msgstr "%1 上的本地打印机"
-
-#: lpr/lprhandler.cpp:104 lpr/lprhandler.cpp:110 lpr/lprhandler.cpp:116
-msgid "Unrecognized entry."
-msgstr "不认识的项。"
-
-#: lpr/kmlprmanager.cpp:289
-msgid "The printcap file is a remote file (NIS). It cannot be written."
-msgstr "printcap 文件是远程文件(NIS)。它无法被写入。"
-
-#: lpr/kmlprmanager.cpp:305
-msgid ""
-"Unable to save printcap file. Check that you have write permissions for that "
-"file."
-msgstr "无法保存 printcap 文件。检查您是否有写权限。"
-
-#: lpr/kmlprmanager.cpp:330
-msgid "Internal error: no handler defined."
-msgstr "内部错误：没有定义处理程序。"
-
-#: lpr/kmlprmanager.cpp:344
-msgid "Couldn't determine spool directory. See options dialog."
-msgstr "无法确定假脱机目录。请查看选项对话。"
-
-#: lpr/kmlprmanager.cpp:350
-msgid ""
-"Unable to create the spool directory %1. Check that you have the required "
-"permissions for that operation."
-msgstr "无法创建假脱机目录 %1。请检查您是否具备该操作的权限。"
-
-#: lpr/kmlprmanager.cpp:382
-#, c-format
-msgid ""
-"The printer has been created but the print daemon could not be restarted. %1"
-msgstr "打印机被创建，但是打印进程无法重新启动。%1"
-
-#: lpr/kmlprmanager.cpp:410
-msgid ""
-"Unable to remove spool directory %1. Check that you have write permissions for "
-"that directory."
-msgstr "无法删除假脱机目录 %1。请检查您是否具备该目录中的写权限。"
-
-#: lpr/kmlprmanager.cpp:458
-msgid "&Edit printcap Entry..."
-msgstr "编辑 printcap 项(&E)..."
-
-#: lpr/kmlprmanager.cpp:473
-msgid ""
-"Editing a printcap entry manually should only be done by confirmed system "
-"administrator. This may prevent your printer from working. Do you want to "
-"continue?"
-msgstr "手工编辑 printcap 项目只应该由确认的系统管理员进行。这可能会导致您的打印机不能正常工作。您想继续吗？"
-
-#: lpr/kmlprmanager.cpp:489
-#, c-format
-msgid "Spooler type: %1"
-msgstr "假脱机类型：%1"
-
-#: lpr/kmlprjobmanager.cpp:83
-msgid "Unsupported operation."
-msgstr "不支持的操作。"
-
-#: lpr/kmconfiglpr.cpp:33 lpr/kmconfiglpr.cpp:37
-msgid "Spooler"
-msgstr "假脱机程序"
-
-#: lpr/kmconfiglpr.cpp:34
-msgid "Spooler Settings"
-msgstr "假脱机程序设置"
-
-#: lpr/lpchelper.cpp:235 lpr/lpchelper.cpp:273 lpr/lpchelper.cpp:291
-#: lpr/lpchelper.cpp:314
-msgid "The executable %1 couldn't be found in your PATH."
-msgstr "在搜索路径中找不到可执行程序 %1。"
-
-#: lpr/lpchelper.cpp:256 lpr/lpchelper.cpp:280 lpr/lpchelper.cpp:298
-msgid "Permission denied."
-msgstr "没有权限。"
-
-#: lpr/lpchelper.cpp:259
-msgid "Printer %1 does not exist."
-msgstr "打印机 %1 不存在。"
-
-#: lpr/lpchelper.cpp:263
-#, c-format
-msgid "Unknown error: %1"
-msgstr "未知的错误：%1"
-
-#: lpr/lpchelper.cpp:282
-#, c-format
-msgid "Execution of lprm failed: %1"
-msgstr "执行 lprm 失败：%1"
-
-#: lpr/lprngtoolhandler.cpp:99
-msgid "IFHP Driver (%1)"
-msgstr "IFHP 驱动程序(%1)"
-
-#: lpr/lprngtoolhandler.cpp:99 lpr/lprngtoolhandler.cpp:170
-msgid "unknown"
-msgstr "未知"
-
-#: lpr/lprngtoolhandler.cpp:162
-msgid "No driver defined for that printer. It might be a raw printer."
-msgstr "该打印机没有定义任何驱动程序。它可能是一个原始打印机。"
-
-#: lpr/lprngtoolhandler.cpp:170
-msgid "LPRngTool Common Driver (%1)"
-msgstr "LPRngTool 公用驱动程序(%1)"
-
-#: lpr/matichandler.cpp:82
-msgid "Network printer"
-msgstr "网络打印机"
-
-#: lpr/matichandler.cpp:245
-msgid "Internal error."
-msgstr "内部错误。"
-
-#: cups/kmcupsmanager.cpp:583 lpr/matichandler.cpp:254
-#: lpr/matichandler.cpp:358
-msgid ""
-"Unable to find the executable foomatic-datafile in your PATH. Check that "
-"Foomatic is correctly installed."
-msgstr "在 PATH 中找不到可执行的 foomatic-datafile。请检查是否正确安装了Foomatic。"
-
-#: cups/kmcupsmanager.cpp:615 lpr/matichandler.cpp:286
-#: lpr/matichandler.cpp:405
-msgid ""
-"Unable to create the Foomatic driver [%1,%2]. Either that driver does not "
-"exist, or you don't have the required permissions to perform that operation."
-msgstr "无法创建 Foomatic 驱动程序[%1,%2]。驱动程序不存在，或者您没有执行此操作的权限。"
-
-#: lpr/matichandler.cpp:339
-msgid ""
-"You probably don't have the required permissions to perform that operation."
-msgstr "您可能没有执行该操作所需要的权限。"
-
-#: lpr/matichandler.cpp:426
-msgid ""
-"Unable to find executable lpdomatic. Check that Foomatic is correctly installed "
-"and that lpdomatic is installed in a standard location."
-msgstr "找不到可执行的 lpdomatic。请检查 Foomatic 是否被正确安装了，以及 lpdomatic 是否被安装在标准位置上。"
-
-#: lpr/matichandler.cpp:457
-#, c-format
-msgid "Unable to remove driver file %1."
-msgstr "无法删除驱动程序文件 %1。"
-
-#: lpr/editentrydialog.cpp:40
-msgid "Aliases:"
-msgstr "别名："
-
-#: lpr/editentrydialog.cpp:46 management/kxmlcommanddlg.cpp:107
-msgid "String"
-msgstr "字符串"
-
-#: lpr/editentrydialog.cpp:47
-msgid "Number"
-msgstr "数字"
+#: ppdloader.cpp:173
+msgid "(line %1): "
+msgstr "(第 %1 行)："
 
-#: lpr/editentrydialog.cpp:48 management/kxmlcommanddlg.cpp:111
-msgid "Boolean"
-msgstr "布尔值"
+#: marginpreview.cpp:135
+msgid "No preview available"
+msgstr "没有可用的预览"
 
-#: lpr/editentrydialog.cpp:72
-#, c-format
-msgid "Printcap Entry: %1"
-msgstr "Printcap 项：%1"
+#: kmfactory.cpp:221
+msgid "<qt>There was an error loading %1. The diagnostic is:<p>%2</p></qt>"
+msgstr "<qt>在载入 %1 时发生错误。诊断信息是：<p>%2</p></qt>"
 
 #: kprintdialog.cpp:97
 msgid ""
@@ -575,12 +157,13 @@ msgid ""
 msgstr "<qt><b>额外的打印任务选项</b>此按钮将显示或隐藏额外的打印选项。</qt>"
 
 #: kprintdialog.cpp:170
+#, fuzzy
 msgid ""
 " <qt><b>System Options:</b>  "
 "<p>This button starts a new dialog where you can adjust various settings of "
 "your printing system. Amongst them: "
 "<ul>"
-"<li> Should TDE applications embed all fonts into the PostScript they generate "
+"<li> Should \tDE applications embed all fonts into the PostScript they generate "
 "for printing? "
 "<li> Should TDE use an external PostScript viewer like <em>gv</em> "
 "for print page previews? "
@@ -703,7 +286,7 @@ msgstr ""
 "<p><b>注意：</b>仅当<em>系统选项</em> --> <em>常规</em> --> <em>杂项</em>：<em>"
 "“默认值为应用程序中上次所用的打印机”</em>禁用时，此按钮才可见。</qt>"
 
-#: kprintdialog.cpp:265 management/kmmainview.cpp:290 management/kmwend.cpp:90
+#: kprintdialog.cpp:265 management/kmmainview.cpp:289 management/kmwend.cpp:90
 #: management/smbview.cpp:43
 msgid "Printer"
 msgstr "打印机"
@@ -815,529 +398,284 @@ msgstr "打印到文件"
 msgid "All Files"
 msgstr "所有文件"
 
-#: cups/kpschedulepage.cpp:40
-msgid ""
-" <qt> "
-"<p><b>Print Job Billing and Accounting</b></p>  "
-"<p>Insert a meaningful string here to associate the current print job with a "
-"certain account. This string will appear in the CUPS \"page_log\" to help with "
-"the print accounting in your organization. (Leave it empty if you do not need "
-"it.) "
-"<p> It is useful for people who print on behalf of different \"customers\", "
-"like print service bureaux, letter shops, press and prepress companies, or "
-"secretaries who serve different bosses, etc.</p> "
-"<br>  "
-"<hr>  "
-"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
-"matches  with the CUPS commandline job option parameter:</em>  "
-"<pre>    -o job-billing=...         # example: \"Marketing_Department\" or "
-"\"Joe_Doe\"  </pre> </p>  </qt>"
-msgstr ""
-"<qt>"
-"<p><b>打印任务计费和统计</b></p>"
-"<p>在此插入一个有意义的字符串，以便将当前打印账户关联到确定的账户。此字符串将会出现在 CUPS "
-"的“页面日志”中，这样可以帮助您的组织进行打印统计。(如果您不需要这一功能的话，请将此留空。) "
-"<p>另外一种常见的情况是，人们需要为不同的“客户”打印，如打印店、出版公司、为不同老板服务的秘书，等等。</p>"
-"<br>"
-"<hr>"
-"<p><em><b>高级用户的额外提示：</b>此 TDEPrint GUI 元素可匹配 CUPS 命令行任务选项参数：</em>"
-"<pre>    -o job-billing=...         # 例如“Marketing_Department”或“Joe_Doe”</pre>"
-"</p></qt>"
-
-#: cups/kpschedulepage.cpp:60
-msgid ""
-" <qt> "
-"<p><b>Scheduled Printing</b></p>  "
-"<p>Scheduled printing lets you control the time of the actual printout, while "
-"you can still send away your job <b>now</b> and have it out of your way. "
-"<p> Especially useful is the \"Never (hold indefinitely)\" option. It allows "
-"you to park your job until a time when you (or a printer administrator) decides "
-"to manually release it. "
-"<p> This is often required in enterprise environments, where you normally are "
-"not allowed to directly and immediately access the huge production printers in "
-"your <em>Central Repro Department</em>. However it is okay to send jobs to the "
-"queue which is under the control of the operators (who, after all, need to make "
-"sure that the 10,000 sheets of pink paper which is required by the Marketing "
-"Department for a particular job are available and loaded into the paper "
-"trays).</p> "
-"<br>  "
-"<hr>  "
-"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
-"matches  with the CUPS commandline job option parameter:</em>  "
-"<pre>    -o job-hold-until=...      # example: \"indefinite\" or \"no-hold\"  "
-"</pre> </p>  </qt>"
-msgstr ""
-"<qt>"
-"<p><b>计划打印</b></p>"
-"<p>计划打印允许您控制实际打印输出的时间，而您仍然可以<b>现在</b>发送您的任务，而让其按照您需要的方式输出。"
-"<p>更有用的选项是“从不(无限等待)”选项。它允许您将任务搁置，直到您(或打印机管理员)决定实际执行该任务时才开始打印。"
-"<p>企业环境中会经常需要这种功能，因为您通常不允许直接或立即访问<em>中心部门</em>的高性能打印机。但是，您仍然可以将任务发送到队列中，而管理员会对队列"
-"进行有效的控制(而管理员需要先确定等待市场部特定打印任务所需的一万张粉色纸已经就绪，并已放进了进纸槽中)。</p>"
-"<br>"
-"<hr>"
-"<p><em><b>高级用户的额外提示：</b>此 TDEPrint GUI 元素可匹配 CUPS 命令行任务选项参数：</em>"
-"<pre>    -o job-hold-until=...      # 例如“indefinite”或“no-hold”</pre></p></qt>"
-
-#: cups/kpschedulepage.cpp:87
-msgid ""
-" <qt> "
-"<p><b>Page Labels</b></p>  "
-"<p>Page Labels are printed by CUPS at the top and bottom of each page. They "
-"appear on the pages surrounded by a little frame box. "
-"<p>They contain any string you type into the line edit field.</p> "
-"<br>  "
-"<hr>  "
-"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
-"matches  with the CUPS commandline job option parameter:</em>  "
-"<pre>    -o page-label=\"...\"      # example: \"Company Confidential\"  </pre> "
-"</p>  </qt>"
-msgstr ""
-"<qt>"
-"<p><b>页面标签</b></p>  "
-"<p>页面标签会被 CUPS 打印在每页的顶部和底部，周围还会围绕一个小方框。"
-"<p>其中还会包含您在行编辑域输入的任何字符串。</p>"
-"<br>"
-"<hr>"
-"<p><em><b>高级用户的额外提示：</b>此 TDEPrint GUI 元素可匹配 CUPS 命令行任务选项参数：</em>"
-"<pre>    -o page-label=\"...\"      # 例如“Company Confidential”</pre></p></qt>"
-
-#: cups/kpschedulepage.cpp:102
-msgid ""
-" <qt> "
-"<p><b>Job Priority</b></p>  "
-"<p>Usually CUPS prints all jobs per queue according to the \"FIFO\" principle: "
-"<em>First In, First Out</em>. "
-"<p> The job priority option allows you to re-order the queue according to your "
-"needs. "
-"<p> It works in both directions: you can increase as well as decrease "
-"priorities. (Usually you can only control your <b>own</b> jobs). "
-"<p> Since the default job priority is \"50\", any job sent with, for example, "
-"\"49\" will be printed only after all those others have finished. Conversely, a "
-"\"51\" or higher priority job will go right to the top of a populated queue (if "
-"no other, higher prioritized one is present).</p> "
-"<br>  "
-"<hr>  "
-"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
-"matches  with the CUPS commandline job option parameter:</em>  "
-"<pre>    -o job-priority=...   # example: \"10\" or \"66\" or \"99\"  </pre> "
-"</p>  </qt>"
-msgstr ""
-"<qt>"
-"<p><b>任务优先级</b></p>"
-"<p>通常，CUPS 会根据“FIFO”规则对全部队列进行排队：<em>先进先出</em>。"
-"<p>任务优先级选项允许您根据需要对队列的顺序进行调整。"
-"<p>优先级可在两个方向进行调整：您可以增加或减少优先级。通常您只能控制您<b>自己</b>的任务。"
-"<p>由于任务的默认优先级为“50”，那么任何以“49”优先级发送的任务都将等待其它任务全部完成后才开始打印。同样的，“51”或更高优先级的打印任务将会直接排到"
-"打印队列的开始位置(如果没有优先级更高的打印任务的话)。</p>"
-"<br>"
-"<hr>"
-"<p><em><b>高级用户的额外提示：</b>此 TDEPrint GUI 元素可匹配 CUPS 命令行任务选项参数：</em>"
-"<pre>    -o job-priority=...   # 例如“10”、“66”或“99”</pre></p></qt>"
-
-#: cups/kpschedulepage.cpp:126
-msgid "Advanced Options"
-msgstr "高级选项"
-
-#: cups/kpschedulepage.cpp:137
-msgid "Immediately"
-msgstr "立即"
-
-#: cups/kpschedulepage.cpp:138
-msgid "Never (hold indefinitely)"
-msgstr "从不(无限等待)"
-
-#: cups/kpschedulepage.cpp:139
-msgid "Daytime (6 am - 6 pm)"
-msgstr "白天(早上 6 点到下午 6 点)"
-
-#: cups/kpschedulepage.cpp:140
-msgid "Evening (6 pm - 6 am)"
-msgstr "晚间(下午 6 点到早上 6 点)"
-
-#: cups/kpschedulepage.cpp:141
-msgid "Night (6 pm - 6 am)"
-msgstr "午夜(下午 6 点到早上 6 点)"
-
-#: cups/kpschedulepage.cpp:142
-msgid "Weekend"
-msgstr "周末"
-
-#: cups/kpschedulepage.cpp:143
-msgid "Second Shift (4 pm - 12 am)"
-msgstr "第二班(下午 4 点到午夜 12 点)"
-
-#: cups/kpschedulepage.cpp:144
-msgid "Third Shift (12 am - 8 am)"
-msgstr "第三班(午夜 12 点到上午 8 点)"
-
-#: cups/kpschedulepage.cpp:145
-msgid "Specified Time"
-msgstr "指定时间"
-
-#: cups/kpschedulepage.cpp:160
-msgid "&Scheduled printing:"
-msgstr "调度打印(&S)："
-
-#: cups/kpschedulepage.cpp:163
-msgid "&Billing information:"
-msgstr "计费信息(&B)："
-
-#: cups/kpschedulepage.cpp:166
-msgid "T&op/Bottom page label:"
-msgstr "顶部/底部页面标记(&O)："
-
-#: cups/kpschedulepage.cpp:169
-msgid "&Job priority:"
-msgstr "作业优先级(&J)："
-
-#: cups/kpschedulepage.cpp:200
-msgid "The time specified is not valid."
-msgstr "指定的时间无效。"
-
-#: cups/kmwbanners.cpp:57
-msgid "No Banner"
-msgstr "无横幅"
-
-#: cups/kmwbanners.cpp:58
-msgid "Classified"
-msgstr "分类"
-
-#: cups/kmwbanners.cpp:59
-msgid "Confidential"
-msgstr "机密"
-
-#: cups/kmwbanners.cpp:60
-msgid "Secret"
-msgstr "机密"
+#: kprintprocess.cpp:75
+msgid "File transfer failed."
+msgstr "文件传送失败。"
 
-#: cups/kmwbanners.cpp:61
-msgid "Standard"
-msgstr "标准"
+#: kprintprocess.cpp:81
+msgid "Abnormal process termination (<b>%1</b>)."
+msgstr "异常进程终止(<b>%1</b>)。"
 
-#: cups/kmwbanners.cpp:62
-msgid "Top Secret"
-msgstr "绝密"
+#: kprintprocess.cpp:83
+msgid "<b>%1</b>: execution failed with message:<p>%2</p>"
+msgstr "<b>%1</b>：执行失败，信息是：<p>%2</p>"
 
-#: cups/kmwbanners.cpp:63
-msgid "Unclassified"
-msgstr "未分类"
+#: lpr/kmlprjobmanager.cpp:83
+msgid "Unsupported operation."
+msgstr "不支持的操作。"
 
-#: cups/kmwbanners.cpp:86
-msgid "Banner Selection"
-msgstr "横幅选择"
+#: lpr/kmconfiglpr.cpp:33 lpr/kmconfiglpr.cpp:37
+msgid "Spooler"
+msgstr "假脱机程序"
 
-#: cups/kmpropbanners.cpp:35 cups/kmwbanners.cpp:92
-msgid "&Starting banner:"
-msgstr "开始横幅(&S)："
+#: lpr/kmconfiglpr.cpp:34
+msgid "Spooler Settings"
+msgstr "假脱机程序设置"
 
-#: cups/kmpropbanners.cpp:36 cups/kmwbanners.cpp:93
-msgid "&Ending banner:"
-msgstr "结束横幅(&E)："
+#: lpr/kmlprmanager.cpp:289
+msgid "The printcap file is a remote file (NIS). It cannot be written."
+msgstr "printcap 文件是远程文件(NIS)。它无法被写入。"
 
-#: cups/kmwbanners.cpp:99
+#: lpr/kmlprmanager.cpp:305
 msgid ""
-"<p>Select the default banners associated with this printer. These banners will "
-"be inserted before and/or after each print job sent to the printer. If you "
-"don't want to use banners, select <b>No Banner</b>.</p>"
-msgstr ""
-"<p>选择该打印机的默认横幅。这些横幅将被插入到送往该打印机的每项打印作业之前和/或之后。如果您不希望使用横幅，选择<b>无</b>。</p>"
-
-#: cups/cupsaddsmb2.cpp:55 cups/cupsaddsmb2.cpp:363
-msgid "&Export"
-msgstr "导出(&E)"
-
-#: cups/cupsaddsmb2.cpp:61
-msgid "Export Printer Driver to Windows Clients"
-msgstr "将打印机驱动程序导出到 Windows 客户端"
-
-#: cups/cupsaddsmb2.cpp:72
-msgid "&Username:"
-msgstr "用户名(&U)："
+"Unable to save printcap file. Check that you have write permissions for that "
+"file."
+msgstr "无法保存 printcap 文件。检查您是否有写权限。"
 
-#: cups/cupsaddsmb2.cpp:73
-msgid "&Samba server:"
-msgstr "&Samba 服务器："
+#: lpr/kmlprmanager.cpp:330
+msgid "Internal error: no handler defined."
+msgstr "内部错误：没有定义处理程序。"
 
-#: cups/cupsaddsmb2.cpp:74 management/kmwpassword.cpp:50
-msgid "&Password:"
-msgstr "密码(&P)："
+#: lpr/kmlprmanager.cpp:344
+msgid "Couldn't determine spool directory. See options dialog."
+msgstr "无法确定假脱机目录。请查看选项对话。"
 
-#: cups/cupsaddsmb2.cpp:79
+#: lpr/kmlprmanager.cpp:350
 msgid ""
-"<p><b>Samba server</b></p>Adobe Windows PostScript driver files plus the CUPS "
-"printer PPD will be exported to the <tt>[print$]</tt> "
-"special share of the Samba server (to change the source CUPS server, use the "
-"<nobr><i>Configure Manager -> CUPS server</i></nobr> first). The <tt>"
-"[print$]</tt> share must exist on the Samba side prior to clicking the <b>"
-"Export</b> button below."
-msgstr ""
-"<p><b>Samba 服务器</b></p>Adobe Windows PostScript 驱动程序文件，以及 CUPS 打印机 PPD 将会被导出到 "
-"Samba 服务器的特殊共享 <tt>[print$]</tt>(要改变源 CUPS 服务器，首先使用<nobr><i>配置管理器 -> "
-"CUPS 服务器</i></nobr>)。 在点击下面的 <b>导出</b><tt> 按钮前，[print$]</tt> 共享必须在 Samba 一端存在。"
+"Unable to create the spool directory %1. Check that you have the required "
+"permissions for that operation."
+msgstr "无法创建假脱机目录 %1。请检查您是否具备该操作的权限。"
 
-#: cups/cupsaddsmb2.cpp:88
+#: lpr/kmlprmanager.cpp:382
+#, c-format
 msgid ""
-"<p><b>Samba username</b></p>User needs to have write access to the <tt>"
-"[print$]</tt> share on the Samba server. <tt>[print$]</tt> "
-"holds printer drivers prepared for download to Windows clients. This dialog "
-"does not work for Samba servers configured with <tt>security = share</tt> "
-"(but works fine with <tt>security = user</tt>)."
-msgstr ""
-"<p><b>Samba 用户名</b></p>用户需要拥有到 Samba 服务器上的<tt>[print$]</tt> 共享的写权限。<tt>"
-"[print$]</tt> 上有为下载到 Windows 客户准备的打印机驱动程序。该对话框在使用 <tt>security = share</tt> "
-"配置的 Samba 服务器中无法奏效(但在使用 <tt>security = user</tt> 配置的服务器中可以)。"
+"The printer has been created but the print daemon could not be restarted. %1"
+msgstr "打印机被创建，但是打印进程无法重新启动。%1"
 
-#: cups/cupsaddsmb2.cpp:96
+#: lpr/kmlprmanager.cpp:410
 msgid ""
-"<p><b>Samba password</b></p>The Samba setting <tt>encrypt passwords = yes</tt> "
-"(default) requires prior use of <tt>smbpasswd -a [username]</tt> "
-"command, to create an encrypted Samba password and have Samba recognize it."
-msgstr ""
-"<p><b>Samba 密码</b></p>Samba 设置 <tt>encrypt passwords = yes</tt> (默认) 需要预先使用 <tt>"
-"smbpasswd -a [username]</tt> 命令来创建加密的 Samba 密码并使 Samba 识别它。"
+"Unable to remove spool directory %1. Check that you have write permissions for "
+"that directory."
+msgstr "无法删除假脱机目录 %1。请检查您是否具备该目录中的写权限。"
 
-#: cups/cupsaddsmb2.cpp:267
-#, c-format
-msgid "Creating folder %1"
-msgstr "创建文件夹 %1"
+#: lpr/kmlprmanager.cpp:458
+msgid "&Edit printcap Entry..."
+msgstr "编辑 printcap 项(&E)..."
 
-#: cups/cupsaddsmb2.cpp:275
-#, c-format
-msgid "Uploading %1"
-msgstr "上传“%1”"
+#: lpr/kmlprmanager.cpp:473
+msgid ""
+"Editing a printcap entry manually should only be done by confirmed system "
+"administrator. This may prevent your printer from working. Do you want to "
+"continue?"
+msgstr "手工编辑 printcap 项目只应该由确认的系统管理员进行。这可能会导致您的打印机不能正常工作。您想继续吗？"
 
-#: cups/cupsaddsmb2.cpp:283
+#: lpr/kmlprmanager.cpp:489
 #, c-format
-msgid "Installing driver for %1"
-msgstr "安装 %1 的驱动程序"
+msgid "Spooler type: %1"
+msgstr "假脱机类型：%1"
 
-#: cups/cupsaddsmb2.cpp:291
+#: lpr/matichandler.cpp:82
+msgid "Network printer"
+msgstr "网络打印机"
+
+#: lpr/lprhandler.cpp:81 lpr/matichandler.cpp:86
 #, c-format
-msgid "Installing printer %1"
-msgstr "安装打印机 %1"
+msgid "Local printer on %1"
+msgstr "%1 上的本地打印机"
 
-#: cups/cupsaddsmb2.cpp:333
-msgid "Driver successfully exported."
-msgstr "成功导出驱动程序。"
+#: lpr/matichandler.cpp:245
+msgid "Internal error."
+msgstr "内部错误。"
 
-#: cups/cupsaddsmb2.cpp:343
+#: cups/kmcupsmanager.cpp:634 lpr/matichandler.cpp:254
+#: lpr/matichandler.cpp:358
 msgid ""
-"Operation failed. Possible reasons are: permission denied or invalid Samba "
-"configuration (see <a href=\"man:/cupsaddsmb\">cupsaddsmb</a> "
-"manual page for detailed information, you need <a href=\"http://www.cups.org\">"
-"CUPS</a> version 1.1.11 or higher). You may want to try again with another "
-"login/password."
-msgstr ""
-"操作失败。可能的原因是：没有权限或无效的 Samba 配置(详见 <a href=\"man:/cupsaddsmb\">cupsaddsmb</a>"
-"手册，你需要<a href=\"http://www.cups.org\">CUPS</a>版本 1.1.11 或更高)。你可以用另外的登录名/密码重试。"
-
-#: cups/cupsaddsmb2.cpp:352
-msgid "Operation aborted (process killed)."
-msgstr "操作已中止(进程被杀死)。"
-
-#: cups/cupsaddsmb2.cpp:358
-msgid "<h3>Operation failed.</h3><p>%1</p>"
-msgstr "<h3>操作失败。</h3><p>%1</p>"
+"Unable to find the executable foomatic-datafile in your PATH. Check that "
+"Foomatic is correctly installed."
+msgstr "在 PATH 中找不到可执行的 foomatic-datafile。请检查是否正确安装了Foomatic。"
 
-#: cups/cupsaddsmb2.cpp:373
+#: cups/kmcupsmanager.cpp:666 lpr/matichandler.cpp:286
+#: lpr/matichandler.cpp:405
 msgid ""
-"You are about to prepare the <b>%1</b> driver to be shared out to Windows "
-"clients through Samba. This operation requires the <a "
-"href=\"http://www.adobe.com/products/printerdrivers/main.html\">"
-"Adobe PostScript Driver</a>, a recent version of Samba 2.2.x and a running SMB "
-"service on the target server. Click <b>Export</b> to start the operation. Read "
-"the <a href=\"man:/cupsaddsmb\">cupsaddsmb</a> manual page in Konqueror or type "
-"<tt>man cupsaddsmb</tt> in a console window to learn more about this "
-"functionality."
-msgstr ""
-"您即将筹备 <b>%1</b> 驱动程序来通过 Samba 在 Windows 客户中共享。该操作需要 <a "
-"href=\"http://www.adobe.com/products/printerdrivers/main.html\">"
-"Adobe PostScript Driver</a>、一个较新版本的 Samba 2.2.x、以及在目标服务器上正运行的 SMB 服务。单击 <b>"
-"导出</b> 来开始此项操作。阅读 Konqueror 中的 <a href=\"man:/cupsaddsmb\">cupsaddsmb</a> "
-"说明手册或在控制台窗口中键入 <tt>man cupsaddsmb</tt> 来了解该功能的详情。"
+"Unable to create the Foomatic driver [%1,%2]. Either that driver does not "
+"exist, or you don't have the required permissions to perform that operation."
+msgstr "无法创建 Foomatic 驱动程序[%1,%2]。驱动程序不存在，或者您没有执行此操作的权限。"
 
-#: cups/cupsaddsmb2.cpp:393
+#: lpr/matichandler.cpp:339
 msgid ""
-"Some driver files are missing. You can get them on <a "
-"href=\"http://www.adobe.com\">Adobe</a> web site. See <a "
-"href=\"man:/cupsaddsmb\">cupsaddsmb</a> manual page for more details (you need "
-"<a href=\"http://www.cups.org\">CUPS</a> version 1.1.11 or higher)."
-msgstr ""
-"缺少某些驱动程序文件。你可以从<a href=\"http://www.adobe.com\">Adobe</a>"
-"网站上获得。详见<a href=\"man:/cupsaddsmb\">cupsaddsmb</a>手册(你需要<a "
-"href=\"http://www.cups.org\">CUPS</a>版本 1.1.11 或更高)。"
+"You probably don't have the required permissions to perform that operation."
+msgstr "您可能没有执行该操作所需要的权限。"
 
-#: cups/cupsaddsmb2.cpp:404
+#: lpr/apshandler.cpp:215 lpr/lprhandler.cpp:127 lpr/lprngtoolhandler.cpp:276
+#: lpr/matichandler.cpp:421
 #, c-format
-msgid "Preparing to upload driver to host %1"
-msgstr "正在准备把驱动程序文件上传到主机 %1"
-
-#: cups/cupsaddsmb2.cpp:409 management/networkscanner.cpp:149
-msgid "&Abort"
-msgstr "中止(&A)"
+msgid "Unsupported backend: %1."
+msgstr "不支持的后端：%1。"
 
-#: cups/cupsaddsmb2.cpp:415
-msgid "The driver for printer <b>%1</b> could not be found."
-msgstr "找不到打印机 <b>%1</b> 的驱动程序。"
+#: lpr/matichandler.cpp:426
+msgid ""
+"Unable to find executable lpdomatic. Check that Foomatic is correctly installed "
+"and that lpdomatic is installed in a standard location."
+msgstr "找不到可执行的 lpdomatic。请检查 Foomatic 是否被正确安装了，以及 lpdomatic 是否被安装在标准位置上。"
 
-#: cups/cupsaddsmb2.cpp:455
+#: lpr/matichandler.cpp:457
 #, c-format
-msgid "Preparing to install driver on host %1"
-msgstr "正在准备在主机 %1 上安装驱动程序"
-
-#: cups/kmwippselect.cpp:36
-msgid "Remote IPP Printer Selection"
-msgstr "远程 IPP 打印机选择"
-
-#: cups/kmwippselect.cpp:49
-msgid "You must select a printer."
-msgstr "您必须选择一个打印机。"
+msgid "Unable to remove driver file %1."
+msgstr "无法删除驱动程序文件 %1。"
 
-#: cups/ipprequest.cpp:110
-msgid "You don't have access to the requested resource."
-msgstr "您没有被请求资源的访问权限。"
+#: lpr/editentrydialog.cpp:40
+msgid "Aliases:"
+msgstr "别名："
 
-#: cups/ipprequest.cpp:113
-msgid "You are not authorized to access the requested resource."
-msgstr "您没有被授权访问所请求的资源。"
+#: lpr/editentrydialog.cpp:46 management/kxmlcommanddlg.cpp:107
+msgid "String"
+msgstr "字符串"
 
-#: cups/ipprequest.cpp:116
-msgid "The requested operation cannot be completed."
-msgstr "请求的操作无法完成。"
+#: lpr/editentrydialog.cpp:47
+msgid "Number"
+msgstr "数字"
 
-#: cups/ipprequest.cpp:119
-msgid "The requested service is currently unavailable."
-msgstr "请求的服务目前不可用。"
+#: lpr/editentrydialog.cpp:48 management/kxmlcommanddlg.cpp:111
+msgid "Boolean"
+msgstr "布尔值"
 
-#: cups/ipprequest.cpp:122
-msgid "The target printer is not accepting print jobs."
-msgstr "目的打印机不接受打印任务。"
+#: kpgeneralpage.cpp:417 lpd/lpdtools.cpp:39 lpr/editentrydialog.cpp:50
+msgid "Enabled"
+msgstr "已启用"
 
-#: cups/ipprequest.cpp:233
-msgid ""
-"Connection to CUPS server failed. Check that the CUPS server is correctly "
-"installed and running."
-msgstr "到 CUPS 服务器的连接失败。请检查 CUPS 服务器是否安装正确并正在运行。"
+#: lpr/editentrydialog.cpp:72
+#, c-format
+msgid "Printcap Entry: %1"
+msgstr "Printcap 项：%1"
 
-#: cups/ipprequest.cpp:236
-msgid "The IPP request failed for an unknown reason."
-msgstr "IPP 请求失败，原因未知。"
+#: lpr/lprhandler.cpp:59 lpr/lprhandler.cpp:97
+msgid "Unknown (unrecognized entry)"
+msgstr "未知(不认识的项)"
 
-#: cups/ipprequest.cpp:356
-msgid "Attribute"
-msgstr "属性"
+#: lpr/lprhandler.cpp:67 lpr/lprhandler.cpp:91
+msgid "Remote queue (%1) on %2"
+msgstr "在 %2 上的远程打印队列(%1)"
 
-#: cups/ipprequest.cpp:357
-msgid "Values"
-msgstr "值"
+#: lpr/apshandler.cpp:112 lpr/lprhandler.cpp:74 lpr/lprngtoolhandler.cpp:72
+msgid "Network printer (%1)"
+msgstr "网络打印机(%1)"
 
-#: cups/ipprequest.cpp:388
-msgid "True"
-msgstr "True"
+#: lpr/lprhandler.cpp:104 lpr/lprhandler.cpp:110 lpr/lprhandler.cpp:116
+msgid "Unrecognized entry."
+msgstr "不认识的项。"
 
-#: cups/ipprequest.cpp:388
-msgid "False"
-msgstr "False"
+#: lpr/lprngtoolhandler.cpp:99
+msgid "IFHP Driver (%1)"
+msgstr "IFHP 驱动程序(%1)"
 
-#: cups/kmpropquota.cpp:39 cups/kmwquota.cpp:96
-msgid "&Period:"
-msgstr "时段(&P)："
+#: lpr/lprngtoolhandler.cpp:99 lpr/lprngtoolhandler.cpp:170
+msgid "unknown"
+msgstr "未知"
 
-#: cups/kmpropquota.cpp:40 cups/kmwquota.cpp:97
-msgid "&Size limit (KB):"
-msgstr "大小限制(KB)(&S)："
+#: lpr/lprngtoolhandler.cpp:162
+msgid "No driver defined for that printer. It might be a raw printer."
+msgstr "该打印机没有定义任何驱动程序。它可能是一个原始打印机。"
 
-#: cups/kmpropquota.cpp:41 cups/kmwquota.cpp:98
-msgid "&Page limit:"
-msgstr "页面限制(&P)："
+#: lpr/lprngtoolhandler.cpp:170
+msgid "LPRngTool Common Driver (%1)"
+msgstr "LPRngTool 公用驱动程序(%1)"
 
-#: cups/kmpropquota.cpp:57
-msgid "Quotas"
-msgstr "配额"
+#: lpr/apshandler.cpp:258 lpr/apshandler.cpp:289 lpr/lprngtoolhandler.cpp:323
+#, c-format
+msgid "Invalid printer backend specification: %1"
+msgstr "无效的打印机后端规范：%1"
 
-#: cups/kmpropquota.cpp:58
-msgid "Quota Settings"
-msgstr "配额设置"
+#: lpr/lpchelper.cpp:235 lpr/lpchelper.cpp:273 lpr/lpchelper.cpp:291
+#: lpr/lpchelper.cpp:314
+msgid "The executable %1 couldn't be found in your PATH."
+msgstr "在搜索路径中找不到可执行程序 %1。"
 
-#: cups/kmpropquota.cpp:78 cups/kmwquota.cpp:84
-msgid "No quota"
-msgstr "没有配额"
+#: lpr/lpchelper.cpp:256 lpr/lpchelper.cpp:280 lpr/lpchelper.cpp:298
+msgid "Permission denied."
+msgstr "没有权限。"
 
-#: cups/kmpropquota.cpp:79 cups/kmpropquota.cpp:80 cups/kmwquota.cpp:87
-#: cups/kmwquota.cpp:90
-msgid "None"
-msgstr "无"
+#: lpr/lpchelper.cpp:259
+msgid "Printer %1 does not exist."
+msgstr "打印机 %1 不存在。"
 
-#: cups/kmwipp.cpp:35
-msgid "Remote IPP server"
-msgstr "远程 IPP 服务器"
+#: lpr/lpchelper.cpp:263
+#, c-format
+msgid "Unknown error: %1"
+msgstr "未知的错误：%1"
 
-#: cups/kmwipp.cpp:39
-msgid ""
-"<p>Enter the information concerning the remote IPP server owning the targeted "
-"printer. This wizard will poll the server before continuing.</p>"
-msgstr "<p>输入目标打印机所在的远程 IPP 服务器的信息。该向导将在继续前查询服务器。</p>"
+#: lpr/lpchelper.cpp:282
+#, c-format
+msgid "Execution of lprm failed: %1"
+msgstr "执行 lprm 失败：%1"
 
-#: cups/kmwipp.cpp:42 management/kmwlpd.cpp:46 rlpr/kmproprlpr.cpp:34
-#: rlpr/kmwrlpr.cpp:62
-msgid "Host:"
-msgstr "主机："
+#: lpr/apshandler.cpp:68
+msgid "APS Driver (%1)"
+msgstr "APS 驱动程序(%1)"
 
-#: cups/kmwipp.cpp:43
-msgid "Port:"
-msgstr "端口："
+#: lpr/apshandler.cpp:221
+#, c-format
+msgid "Unable to create directory %1."
+msgstr "无法创建目录 %1。"
 
-#: cups/kmwipp.cpp:52 management/kmwsmb.cpp:79
-msgid "Empty server name."
-msgstr "空服务器名。"
+#: lpr/apshandler.cpp:241
+#, c-format
+msgid "Missing element: %1."
+msgstr "缺少元素：%1。"
 
-#: cups/kmwipp.cpp:59
-msgid "Incorrect port number."
-msgstr "不正确的端口号。"
+#: lpr/apshandler.cpp:264 lpr/apshandler.cpp:295 lpr/apshandler.cpp:367
+#, c-format
+msgid "Unable to create the file %1."
+msgstr "无法创建文件 %1。"
 
-#: cups/kmwipp.cpp:72
-msgid "<nobr>Unable to connect to <b>%1</b> on port <b>%2</b> .</nobr>"
-msgstr "<nobr>无法连接到 <b>%1</b> 的端口 <b>%2</b>。</nobr>"
+#: lpr/apshandler.cpp:322
+msgid "The APS driver is not defined."
+msgstr "没有定义 APS 驱动程序。"
 
-#: cups/kmpropbanners.cpp:49 kpgeneralpage.cpp:297
-msgid "Banners"
-msgstr "标题"
+#: lpr/apshandler.cpp:380
+#, c-format
+msgid "Unable to remove directory %1."
+msgstr "无法删除目录 %1。"
 
-#: cups/kmpropbanners.cpp:50
-msgid "Banner Settings"
-msgstr "横幅设置"
+#: kpdriverpage.cpp:30 management/kmpropdriver.cpp:54
+msgid "Driver Settings"
+msgstr "驱动程序设置"
 
-#: cups/ippreportdlg.cpp:34
-msgid "IPP Report"
-msgstr "IPP 报告"
+#: kpdriverpage.cpp:48
+msgid ""
+"<qt>Some options selected are in conflict. You must resolve these conflicts "
+"before continuing. See <b>Driver Settings</b> tab for detailed information.</qt>"
+msgstr "<qt>某些选中的选项产生了冲突。您必须先解决冲突才能继续。请查看<b>驱动程序设置</b>标签页来了解详细的信息。</qt>"
 
-#: cups/ippreportdlg.cpp:93
-msgid "Internal error: unable to generate HTML report."
-msgstr "内部错误：无法生成 HTML 报告。"
+#: posterpreview.cpp:115
+#, fuzzy
+msgid ""
+"Poster preview not available. Either the <b>poster</b> "
+"executable is not properly installed, or you don't have the required version"
+msgstr "海报预览不可用。也许是 <b>poster</b> 可执行文件没有被正确安装，也许是您没有所需的版本.。"
 
-#: cups/kmpropusers.cpp:39 cups/kmwusers.cpp:36
-msgid "Users Access Settings"
-msgstr "用户访问设置"
+#: cups/kptextpage.cpp:195 kpmarginpage.cpp:42 kpmarginpage.cpp:45
+msgid "Margins"
+msgstr "页边距"
 
 #: cups/kmpropusers.cpp:38 cups/kmwusers.cpp:39
 msgid "Users"
 msgstr "用户"
 
-#: cups/kmwusers.cpp:41
-msgid "Allowed Users"
-msgstr "允许的用户"
+#: cups/kmpropusers.cpp:39 cups/kmwusers.cpp:36
+msgid "Users Access Settings"
+msgstr "用户访问设置"
 
-#: cups/kmwusers.cpp:42
-msgid "Denied Users"
+#: cups/kmpropusers.cpp:55
+msgid "Denied users"
 msgstr "拒绝的用户"
 
-#: cups/kmwusers.cpp:44
-msgid "Define here a group of allowed/denied users for this printer."
-msgstr "在此定义一组该打印机允许或拒绝的用户。"
+#: cups/kmpropusers.cpp:62
+msgid "Allowed users"
+msgstr "允许的用户"
 
-#: cups/kmwusers.cpp:45 management/kxmlcommanddlg.cpp:117
-msgid "&Type:"
-msgstr "类型(&T)："
+#: cups/kmpropusers.cpp:76
+msgid "All users allowed"
+msgstr "允许所有用户"
 
 #: cups/kptextpage.cpp:41
 msgid ""
@@ -1392,7 +730,7 @@ msgid ""
 "<p>These settings control the appearance of text on printouts. They are only "
 "valid for  printing text files or input directly through kprinter. </p>  "
 "<p><b>Note:</b> These settings have no effect whatsoever for other input "
-"formats than  text, or for printing from applications such as the TDE Advanced "
+"formats than  text, or for printing from applications such as the KDE Advanced "
 "Text Editor. (Applications  in general send PostScript to the print system, and "
 "'kate' in particular has its own  knobs to control the print output. </p>. "
 "<hr>  "
@@ -1411,7 +749,7 @@ msgid ""
 "valid for  jobs originating from applications which define their own page "
 "layout internally and  send PostScript to TDEPrint (such as KOffice or "
 "OpenOffice.org). </p>  "
-"<p>When printing from TDE applications, such as KMail and Konqueror, or "
+"<p>When printing from KDE applications, such as KMail and Konqueror, or "
 "printing an ASCII text  file through kprinter, you can choose your preferred "
 "margin settings here. </p>  "
 "<p>Margins may be set individually for each edge of the paper. The combo box at "
@@ -1491,10 +829,6 @@ msgstr "文本格式"
 msgid "Syntax Highlighting"
 msgstr "语法突出显示"
 
-#: cups/kptextpage.cpp:195 kpmarginpage.cpp:42 kpmarginpage.cpp:45
-msgid "Margins"
-msgstr "页边距"
-
 #: cups/kptextpage.cpp:200
 msgid "&Chars per inch:"
 msgstr "每英寸字符数(&C)："
@@ -1515,92 +849,112 @@ msgstr "已禁用(&D)"
 msgid "&Enabled"
 msgstr "已启用(&E)"
 
-#: cups/kmconfigcupsdir.cpp:34
-msgid "Folder"
-msgstr "文件夹"
+#: cups/kmconfigcups.cpp:32
+msgid "CUPS Server"
+msgstr "CUPS 服务器"
 
-#: cups/kmconfigcupsdir.cpp:35
-msgid "CUPS Folder Settings"
-msgstr "CUPS 文件夹设置"
+#: cups/kmconfigcups.cpp:33
+msgid "CUPS Server Settings"
+msgstr "CUPS 服务器设置"
 
-#: cups/kmconfigcupsdir.cpp:38
-msgid "Installation Folder"
-msgstr "安装文件夹"
+#: cups/kphpgl2page.cpp:33
+msgid ""
+" <qt>  <b>Print in Black Only (Blackplot)</b>  "
+"<p>The 'blackplot' option specifies that all pens should plot in black-only: "
+"The default is to use the colors defined in the plot file, or the standard  pen "
+"colors defined in the HP-GL/2 reference manual from Hewlett Packard. </p>  "
+"<br>  "
+"<hr>  "
+"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
+"matches  with the CUPS commandline job option parameter:</em>  "
+"<pre>    -o blackplot=true  </pre>  </p>  </qt>"
+msgstr ""
 
-#: cups/kmconfigcupsdir.cpp:41
-msgid "Standard installation (/)"
-msgstr "标准安装(/)"
+#: cups/kphpgl2page.cpp:48
+msgid ""
+" <qt>  <b>Scale Print Image to Page Size</b>  "
+"<p>The 'fitplot' option specifies that the HP-GL image should be scaled to fill "
+" exactly the page with the (elsewhere selected) media size. </p>  "
+"<p>The default is 'fitplot is disabled'. The default will therefore use the "
+"absolute  distances specified in the plot file. (You should be aware that HP-GL "
+"files are very  often CAD drawings intended for large format plotters. On "
+"standard office printers  they will therefore lead to the drawing printout "
+"being spread across multiple pages.) </p>  "
+"<p><b>Note:</b>This feature depends upon an accurate plot size (PS) command in "
+"the  HP-GL/2 file. If no plot size is given in the file the filter converting "
+"the HP-GL  to PostScript assumes the plot is ANSI E size. </p>  "
+"<br>  "
+"<hr>  "
+"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
+"matches with the CUPS commandline job option parameter:</em>  "
+"<pre>     -o fitplot=true   </pre> </p>  </qt>"
+msgstr ""
 
-#: cups/kptagspage.cpp:36
+#: cups/kphpgl2page.cpp:68
 msgid ""
-" <qt>"
-"<p><b>Additional Tags</b></p> You may send additional commands to the CUPS "
-"server via this editable list.  There are 3 purposes for this: "
-"<ul> "
-"<li>Use any current or future standard CUPS job option not supported by the  "
-"TDEPrint GUI. </li> "
-"<li>Control any custom job option you may want to support in custom CUPS "
-"filters  and backends plugged into the CUPS filtering chain.</li>  "
-"<li>Send short messages to the operators of your production printers in your  "
-"<em>Central Repro Department</em>. </ul>  "
-"<p><b>Standard CUPS job options:</b> A complete list of standard CUPS job  "
-"options is in the <a href=\"http://localhost:631/sum.html\">CUPS User Manual</a>"
-".  Mappings of the kprinter user interface widgets to respective CUPS job "
-"option  names are named in the various <em>WhatsThis</em> help items..</p> "
-"<p><b>Custom CUPS job options:</b> CUPS print servers may be customized with "
-"additional  print filters and backends which understand custom job options. You "
-"can specify such  custom job options here. If in doubt, ask your system "
-"administrator..</p> "
-"<p><b> </b></p> "
-"<p><b>Operator Messages:</b> You may send additional messages to the "
-"operator(s) of your production printers (e.g. in your <em>"
-"Central Repro Department</p>) Messages can be read by the operator(s) (or "
-"yourself) by viewing the <em>\"Job IPP Report\"</em> for the job.</p> <b>"
-"Examples:</b>"
-"<br> "
-"<pre> A standard CUPS job option:"
-"<br>    <em>(Name) number-up</em>                -- <em>(Value) 9</em>                     "
-"<br> "
-"<br> A job option for custom CUPS filters or backends:"
-"<br>    <em>(Name) DANKA_watermark</em>          -- <em>"
-"(Value) Company_Confidential</em>   "
-"<br> "
-"<br> A message to the operator(s):"
-"<br>    <em>(Name) Deliver_after_completion</em> -- <em>"
-"(Value) to_Marketing_Departm.</em>"
-"<br> </pre> "
-"<p><b>Note:</b> the fields must not include spaces, tabs or quotes. You may "
-"need to  double-click on a field to edit it. "
-"<p><b>Warning:</b> Do not use such standard CUPS option names which also can be "
-"used  through the TDEPrint GUI. Results may be  unpredictable if they conflict, "
-" or if they are sent multiple times. For all options supported by the GUI, "
-"please do use  the GUI. (Each GUI element's  'WhatsThis' names the related CUPS "
-"option name.) </p>  </qt>"
+" <qt>  <b>Set Pen Width for HP-GL (if not defined in file)</b>.  "
+"<p>The pen width value can be set here in case the original HP-GL file does not "
+"have it  set. The pen width specifies the value in micrometers. The default "
+"value of 1000 produces  lines that are 1000 micrometers == 1 millimeter in "
+"width. Specifying a pen width of 0  produces lines that are exactly 1 pixel "
+"wide. </p>  "
+"<p><b>Note:</b> The penwidth option set here is ignored if the pen widths are "
+"set inside  the plot file itself..</p>  "
+"<br>  "
+"<hr>  "
+"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
+"matches with the CUPS commandline job option parameter:</em>  "
+"<pre>    -o penwidth=...   # example: \"2000\" or \"500\"  </pre> </p>  </qt>"
 msgstr ""
 
-#: cups/kptagspage.cpp:77
-msgid "Additional Tags"
-msgstr "其它标签"
+#: cups/kphpgl2page.cpp:85
+msgid ""
+" <qt>  <b>HP-GL Print Options</b>  "
+"<p>All options on this page are only applicable if you use TDEPrint to send "
+"HP-GL and  HP-GL/2 files to one of your printers. </p>  "
+"<p>HP-GL and HP-GL/2 are page description languages developed by "
+"Hewlett-Packard to drive  Pen Plotting devices. </p>  "
+"<p>TDEPrint can (with the help of CUPS) convert the HP-GL file format and print "
+"it  on any installed printer. </p>  "
+"<p><b>Note 1:</b> To print HP-GL files, start 'kprinter' and simply load the "
+"file into  the running kprinter.</p> "
+"<p><b>Note 2:</b> The 'fitplot' parameter provided on this dialog does also "
+"work for  printing PDF files (if your CUPS version is more recent than "
+"1.1.22).</p>  "
+"<br>  "
+"<hr>  "
+"<p><em><b>Additional hint for power users:</b> These TDEPrint GUI elements "
+"match with CUPS commandline job option parameters:</em>  "
+"<pre>     -o blackplot=...  # examples: \"true\" or \"false\"  "
+"<br>     -o fitplot=...    # examples: \"true\" or \"false\"  "
+"<br>     -o penwidth=...   # examples: \"true\" or \"false\"  </pre> </p>  </qt>"
+msgstr ""
 
-#: cups/kptagspage.cpp:82 tdefilelist.cpp:101 kpfilterpage.cpp:406
-#: management/kmjobviewer.cpp:237 management/kmwend.cpp:51
-#: management/kxmlcommanddlg.cpp:141 management/kxmlcommanddlg.cpp:545
-msgid "Name"
-msgstr "名称"
+#: cups/kphpgl2page.cpp:113
+msgid "HP-GL/2 Options"
+msgstr "HP-GL/2 选项"
 
-#: cups/kptagspage.cpp:83
-msgid "Value"
-msgstr "值"
+#: cups/kphpgl2page.cpp:115
+msgid "&Use only black pen"
+msgstr "仅使用黑墨水(&U)"
 
-#: cups/kptagspage.cpp:92
-msgid "Read-Only"
-msgstr "只读"
+#: cups/kphpgl2page.cpp:118
+msgid "&Fit plot to page"
+msgstr "适合页面(&F)"
 
-#: cups/kptagspage.cpp:115
-msgid "The tag name must not contain any spaces, tabs or quotes: <b>%1</b>."
-msgstr "标签名不能含有空格、跳格或引号：<b>%1</b>。"
+#: cups/kphpgl2page.cpp:122
+msgid "&Pen width:"
+msgstr "笔宽(&P)："
 
-#: cups/kmcupsuimanager.cpp:85
+#: cups/kmwippselect.cpp:38
+msgid "Remote IPP Printer Selection"
+msgstr "远程 IPP 打印机选择"
+
+#: cups/kmwippselect.cpp:51
+msgid "You must select a printer."
+msgstr "您必须选择一个打印机。"
+
+#: cups/kmcupsuimanager.cpp:87
 msgid ""
 "<qt>"
 "<p>Print queue on remote CUPS server</p>"
@@ -1612,7 +966,7 @@ msgstr ""
 "<p>远程 CUPS 服务器上的打印队列</p>"
 "<p>适合运行着 CUPS 服务器的远程计算机上的打印队列。即使 CUPS 浏览已关闭，仍可以使用远程计算机。</p></qt>"
 
-#: cups/kmcupsuimanager.cpp:92
+#: cups/kmcupsuimanager.cpp:94
 msgid ""
 "<qt>"
 "<p>Network IPP printer</p>"
@@ -1624,7 +978,7 @@ msgstr ""
 "<p>网络 IPP 打印机</p>"
 "<p>适合使用 IPP 协议的网络打印机。现代的高端打印机都可使用此模式。如果您的打印机还支持 TCP，也请使用此模式。</p></qt>"
 
-#: cups/kmcupsuimanager.cpp:99
+#: cups/kmcupsuimanager.cpp:101
 msgid ""
 "<qt>"
 "<p>Fax/Modem printer</p>"
@@ -1638,7 +992,7 @@ msgstr ""
 "<p>适合传真/调制解调器打印机。这需要事先安装 <a href=\"http://vigna.dsi.unimi.it/fax4CUPS/\">"
 "fax4CUPS</a> 后端。发送给此打印机的文档将会被传真给指定的传真号码。</p></qt>"
 
-#: cups/kmcupsuimanager.cpp:106
+#: cups/kmcupsuimanager.cpp:108
 msgid ""
 "<qt>"
 "<p>Other printer</p>"
@@ -1652,7 +1006,7 @@ msgstr ""
 "<p>适合任何打印机类型。要使用此选项，您必须指定您想要安装的打印机的 URI。请参看 CUPS 的文档中关于打印机 URI "
 "的更多信息。此选项主要用于使用第三方后端的打印机。</p></qt>"
 
-#: cups/kmcupsuimanager.cpp:114
+#: cups/kmcupsuimanager.cpp:116
 msgid ""
 "<qt>"
 "<p>Class of printers</p>"
@@ -1665,196 +1019,607 @@ msgstr ""
 "<p>打印机类</p>"
 "<p>适合创建一类打印机。将文档发送到该类时，文档将会被发送到该类中第一个空闲的打印机。请参看 CUPS 的文档中关于打印机类的更多信息。</p></qt>"
 
-#: cups/kmcupsuimanager.cpp:127
+#: cups/kmcupsuimanager.cpp:129
 msgid "Re&mote CUPS server (IPP/HTTP)"
 msgstr "远程 CUPS 服务器(IPP/HTTP)(&M)"
 
-#: cups/kmcupsuimanager.cpp:128
+#: cups/kmcupsuimanager.cpp:130
 msgid "Network printer w/&IPP (IPP/HTTP)"
 msgstr "&IPP 网络打印机(IPP/HTTP)"
 
-#: cups/kmcupsuimanager.cpp:129
+#: cups/kmcupsuimanager.cpp:131
 msgid "S&erial Fax/Modem printer"
 msgstr "串行传真/调制解调器打印机(&E)"
 
-#: cups/kmcupsuimanager.cpp:130
+#: cups/kmcupsuimanager.cpp:132
 msgid "Other &printer type"
 msgstr "其它打印机类型(&P)"
 
-#: cups/kmcupsuimanager.cpp:132
+#: cups/kmcupsuimanager.cpp:134
 msgid "Cl&ass of printers"
 msgstr "打印机类(&A)"
 
-#: cups/kmcupsuimanager.cpp:169
+#: cups/kmcupsuimanager.cpp:190
 msgid "An error occurred while retrieving the list of available backends:"
 msgstr "获取可用的后端列表时发生错误："
 
-#: cups/kmcupsuimanager.cpp:215
+#: cups/kmcupsuimanager.cpp:236
 msgid "Priority"
 msgstr "优先级"
 
-#: cups/kmcupsuimanager.cpp:217
+#: cups/kmcupsuimanager.cpp:238
 msgid "Billing Information"
 msgstr "计费信息"
 
-#: cups/kmwfax.cpp:37
-msgid "Fax Serial Device"
-msgstr "传真串行设备"
+#: cups/kmconfigcupsdir.cpp:34
+msgid "Folder"
+msgstr "文件夹"
 
-#: cups/kmwfax.cpp:41
-msgid "<p>Select the device which your serial Fax/Modem is connected to.</p>"
-msgstr "<p>选择您的串行传真/调制解调器连接到的设备。</p>"
+#: cups/kmconfigcupsdir.cpp:35
+msgid "CUPS Folder Settings"
+msgstr "CUPS 文件夹设置"
 
-#: cups/kmwfax.cpp:71
-msgid "You must select a device."
-msgstr "您必须选择一个设备。"
+#: cups/kmconfigcupsdir.cpp:38
+msgid "Installation Folder"
+msgstr "安装文件夹"
+
+#: cups/kmconfigcupsdir.cpp:41
+msgid "Standard installation (/)"
+msgstr "标准安装(/)"
+
+#: cups/kmwusers.cpp:41
+msgid "Allowed Users"
+msgstr "允许的用户"
+
+#: cups/kmwusers.cpp:42
+msgid "Denied Users"
+msgstr "拒绝的用户"
+
+#: cups/kmwusers.cpp:44
+msgid "Define here a group of allowed/denied users for this printer."
+msgstr "在此定义一组该打印机允许或拒绝的用户。"
+
+#: cups/kmwusers.cpp:45 management/kxmlcommanddlg.cpp:117
+msgid "&Type:"
+msgstr "类型(&T)："
+
+#: cups/cupsaddsmb2.cpp:55 cups/cupsaddsmb2.cpp:363
+msgid "&Export"
+msgstr "导出(&E)"
+
+#: cups/cupsaddsmb2.cpp:61
+msgid "Export Printer Driver to Windows Clients"
+msgstr "将打印机驱动程序导出到 Windows 客户端"
+
+#: cups/cupsaddsmb2.cpp:72
+msgid "&Username:"
+msgstr "用户名(&U)："
+
+#: cups/cupsaddsmb2.cpp:73
+msgid "&Samba server:"
+msgstr "&Samba 服务器："
+
+#: cups/cupsaddsmb2.cpp:74 management/kmwpassword.cpp:50
+msgid "&Password:"
+msgstr "密码(&P)："
+
+#: cups/cupsaddsmb2.cpp:79
+msgid ""
+"<p><b>Samba server</b></p>Adobe Windows PostScript driver files plus the CUPS "
+"printer PPD will be exported to the <tt>[print$]</tt> "
+"special share of the Samba server (to change the source CUPS server, use the "
+"<nobr><i>Configure Manager -> CUPS server</i></nobr> first). The <tt>"
+"[print$]</tt> share must exist on the Samba side prior to clicking the <b>"
+"Export</b> button below."
+msgstr ""
+"<p><b>Samba 服务器</b></p>Adobe Windows PostScript 驱动程序文件，以及 CUPS 打印机 PPD 将会被导出到 "
+"Samba 服务器的特殊共享 <tt>[print$]</tt>(要改变源 CUPS 服务器，首先使用<nobr><i>配置管理器 -> "
+"CUPS 服务器</i></nobr>)。 在点击下面的 <b>导出</b><tt> 按钮前，[print$]</tt> 共享必须在 Samba 一端存在。"
+
+#: cups/cupsaddsmb2.cpp:88
+msgid ""
+"<p><b>Samba username</b></p>User needs to have write access to the <tt>"
+"[print$]</tt> share on the Samba server. <tt>[print$]</tt> "
+"holds printer drivers prepared for download to Windows clients. This dialog "
+"does not work for Samba servers configured with <tt>security = share</tt> "
+"(but works fine with <tt>security = user</tt>)."
+msgstr ""
+"<p><b>Samba 用户名</b></p>用户需要拥有到 Samba 服务器上的<tt>[print$]</tt> 共享的写权限。<tt>"
+"[print$]</tt> 上有为下载到 Windows 客户准备的打印机驱动程序。该对话框在使用 <tt>security = share</tt> "
+"配置的 Samba 服务器中无法奏效(但在使用 <tt>security = user</tt> 配置的服务器中可以)。"
+
+#: cups/cupsaddsmb2.cpp:96
+msgid ""
+"<p><b>Samba password</b></p>The Samba setting <tt>encrypt passwords = yes</tt> "
+"(default) requires prior use of <tt>smbpasswd -a [username]</tt> "
+"command, to create an encrypted Samba password and have Samba recognize it."
+msgstr ""
+"<p><b>Samba 密码</b></p>Samba 设置 <tt>encrypt passwords = yes</tt> (默认) 需要预先使用 <tt>"
+"smbpasswd -a [username]</tt> 命令来创建加密的 Samba 密码并使 Samba 识别它。"
 
-#: cups/kmcupsmanager.cpp:768
+#: cups/cupsaddsmb2.cpp:267
+#, c-format
+msgid "Creating folder %1"
+msgstr "创建文件夹 %1"
+
+#: cups/cupsaddsmb2.cpp:275
+#, c-format
+msgid "Uploading %1"
+msgstr "上传“%1”"
+
+#: cups/cupsaddsmb2.cpp:283
+#, c-format
+msgid "Installing driver for %1"
+msgstr "安装 %1 的驱动程序"
+
+#: cups/cupsaddsmb2.cpp:291
+#, c-format
+msgid "Installing printer %1"
+msgstr "安装打印机 %1"
+
+#: cups/cupsaddsmb2.cpp:333
+msgid "Driver successfully exported."
+msgstr "成功导出驱动程序。"
+
+#: cups/cupsaddsmb2.cpp:343
+msgid ""
+"Operation failed. Possible reasons are: permission denied or invalid Samba "
+"configuration (see <a href=\"man:/cupsaddsmb\">cupsaddsmb</a> "
+"manual page for detailed information, you need <a href=\"http://www.cups.org\">"
+"CUPS</a> version 1.1.11 or higher). You may want to try again with another "
+"login/password."
+msgstr ""
+"操作失败。可能的原因是：没有权限或无效的 Samba 配置(详见 <a href=\"man:/cupsaddsmb\">cupsaddsmb</a>"
+"手册，你需要<a href=\"http://www.cups.org\">CUPS</a>版本 1.1.11 或更高)。你可以用另外的登录名/密码重试。"
+
+#: cups/cupsaddsmb2.cpp:352
+msgid "Operation aborted (process killed)."
+msgstr "操作已中止(进程被杀死)。"
+
+#: cups/cupsaddsmb2.cpp:358
+msgid "<h3>Operation failed.</h3><p>%1</p>"
+msgstr "<h3>操作失败。</h3><p>%1</p>"
+
+#: cups/cupsaddsmb2.cpp:373
+msgid ""
+"You are about to prepare the <b>%1</b> driver to be shared out to Windows "
+"clients through Samba. This operation requires the <a "
+"href=\"http://www.adobe.com/products/printerdrivers/main.html\">"
+"Adobe PostScript Driver</a>, a recent version of Samba 2.2.x and a running SMB "
+"service on the target server. Click <b>Export</b> to start the operation. Read "
+"the <a href=\"man:/cupsaddsmb\">cupsaddsmb</a> manual page in Konqueror or type "
+"<tt>man cupsaddsmb</tt> in a console window to learn more about this "
+"functionality."
+msgstr ""
+"您即将筹备 <b>%1</b> 驱动程序来通过 Samba 在 Windows 客户中共享。该操作需要 <a "
+"href=\"http://www.adobe.com/products/printerdrivers/main.html\">"
+"Adobe PostScript Driver</a>、一个较新版本的 Samba 2.2.x、以及在目标服务器上正运行的 SMB 服务。单击 <b>"
+"导出</b> 来开始此项操作。阅读 Konqueror 中的 <a href=\"man:/cupsaddsmb\">cupsaddsmb</a> "
+"说明手册或在控制台窗口中键入 <tt>man cupsaddsmb</tt> 来了解该功能的详情。"
+
+#: cups/cupsaddsmb2.cpp:393
+msgid ""
+"Some driver files are missing. You can get them on <a "
+"href=\"http://www.adobe.com\">Adobe</a> web site. See <a "
+"href=\"man:/cupsaddsmb\">cupsaddsmb</a> manual page for more details (you need "
+"<a href=\"http://www.cups.org\">CUPS</a> version 1.1.11 or higher)."
+msgstr ""
+"缺少某些驱动程序文件。你可以从<a href=\"http://www.adobe.com\">Adobe</a>"
+"网站上获得。详见<a href=\"man:/cupsaddsmb\">cupsaddsmb</a>手册(你需要<a "
+"href=\"http://www.cups.org\">CUPS</a>版本 1.1.11 或更高)。"
+
+#: cups/cupsaddsmb2.cpp:404
+#, c-format
+msgid "Preparing to upload driver to host %1"
+msgstr "正在准备把驱动程序文件上传到主机 %1"
+
+#: cups/cupsaddsmb2.cpp:409 management/networkscanner.cpp:149
+msgid "&Abort"
+msgstr "中止(&A)"
+
+#: cups/cupsaddsmb2.cpp:415
+msgid "The driver for printer <b>%1</b> could not be found."
+msgstr "找不到打印机 <b>%1</b> 的驱动程序。"
+
+#: cups/cupsaddsmb2.cpp:455
+#, c-format
+msgid "Preparing to install driver on host %1"
+msgstr "正在准备在主机 %1 上安装驱动程序"
+
+#: cups/kmwquota.cpp:46
+msgid "second(s)"
+msgstr "秒"
+
+#: cups/kmwquota.cpp:47
+msgid "minute(s)"
+msgstr "分钟"
+
+#: cups/kmwquota.cpp:48
+msgid "hour(s)"
+msgstr "小时"
+
+#: cups/kmwquota.cpp:49
+msgid "day(s)"
+msgstr "天"
+
+#: cups/kmwquota.cpp:50
+msgid "week(s)"
+msgstr "星期"
+
+#: cups/kmwquota.cpp:51
+msgid "month(s)"
+msgstr "月"
+
+#: cups/kmwquota.cpp:79
+msgid "Printer Quota Settings"
+msgstr "打印机配额设置"
+
+#: cups/kmpropquota.cpp:78 cups/kmwquota.cpp:84
+msgid "No quota"
+msgstr "没有配额"
+
+#: cups/kmpropquota.cpp:79 cups/kmpropquota.cpp:80 cups/kmwquota.cpp:87
+#: cups/kmwquota.cpp:90
+msgid "None"
+msgstr "无"
+
+#: cups/kmpropquota.cpp:39 cups/kmwquota.cpp:96
+msgid "&Period:"
+msgstr "时段(&P)："
+
+#: cups/kmpropquota.cpp:40 cups/kmwquota.cpp:97
+msgid "&Size limit (KB):"
+msgstr "大小限制(KB)(&S)："
+
+#: cups/kmpropquota.cpp:41 cups/kmwquota.cpp:98
+msgid "&Page limit:"
+msgstr "页面限制(&P)："
+
+#: cups/kmwquota.cpp:104
+msgid ""
+"<p>Set here the quota for this printer. Using limits of <b>0</b> "
+"means that no quota will be used. This is equivalent to set quota period to <b>"
+"<nobr>No quota</nobr></b> (-1). Quota limits are defined on a per-user base and "
+"applied to all users.</p>"
+msgstr ""
+"<p>在此设置该打印机的配额。使用 <b>0</b> 表示不设配额。这相当于将配额时间设为 <b><nobr>没有配额</nobr></b> "
+"(-1)。配额按照每个用户定义，并应用到所有用户。</p>"
+
+#: cups/kmwquota.cpp:130
+msgid "You must specify at least one quota limit."
+msgstr "您必须至少指定一个配额。"
+
+#: cups/kmcupsconfigwidget.cpp:65
+msgid "Server Information"
+msgstr "服务器信息"
+
+#: cups/kmcupsconfigwidget.cpp:66
+msgid "Account Information"
+msgstr "账户信息"
+
+#: cups/kmcupsconfigwidget.cpp:67 rlpr/kmproxywidget.cpp:34
+msgid "&Host:"
+msgstr "主机(&H)："
+
+#: cups/kmcupsconfigwidget.cpp:68 management/kmwsocketutil.cpp:53
+#: management/networkscanner.cpp:339 rlpr/kmproxywidget.cpp:35
+msgid "&Port:"
+msgstr "端口(&P)："
+
+#: cups/kmcupsconfigwidget.cpp:75
+msgid "&User:"
+msgstr "用户(&U)："
+
+#: cups/kmcupsconfigwidget.cpp:76
+msgid "Pass&word:"
+msgstr "密码(&W)："
+
+#: cups/kmcupsconfigwidget.cpp:79
+msgid "&Store password in configuration file"
+msgstr "在配置文件中存储密码(&S)"
+
+#: cups/kmcupsconfigwidget.cpp:81
+msgid "Use &anonymous access"
+msgstr "匿名访问(&A)"
+
+#: cups/kpschedulepage.cpp:40
+msgid ""
+" <qt> "
+"<p><b>Print Job Billing and Accounting</b></p>  "
+"<p>Insert a meaningful string here to associate the current print job with a "
+"certain account. This string will appear in the CUPS \"page_log\" to help with "
+"the print accounting in your organization. (Leave it empty if you do not need "
+"it.) "
+"<p> It is useful for people who print on behalf of different \"customers\", "
+"like print service bureaux, letter shops, press and prepress companies, or "
+"secretaries who serve different bosses, etc.</p> "
+"<br>  "
+"<hr>  "
+"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
+"matches  with the CUPS commandline job option parameter:</em>  "
+"<pre>    -o job-billing=...         # example: \"Marketing_Department\" or "
+"\"Joe_Doe\"  </pre> </p>  </qt>"
+msgstr ""
+"<qt>"
+"<p><b>打印任务计费和统计</b></p>"
+"<p>在此插入一个有意义的字符串，以便将当前打印账户关联到确定的账户。此字符串将会出现在 CUPS "
+"的“页面日志”中，这样可以帮助您的组织进行打印统计。(如果您不需要这一功能的话，请将此留空。) "
+"<p>另外一种常见的情况是，人们需要为不同的“客户”打印，如打印店、出版公司、为不同老板服务的秘书，等等。</p>"
+"<br>"
+"<hr>"
+"<p><em><b>高级用户的额外提示：</b>此 TDEPrint GUI 元素可匹配 CUPS 命令行任务选项参数：</em>"
+"<pre>    -o job-billing=...         # 例如“Marketing_Department”或“Joe_Doe”</pre>"
+"</p></qt>"
+
+#: cups/kpschedulepage.cpp:60
+msgid ""
+" <qt> "
+"<p><b>Scheduled Printing</b></p>  "
+"<p>Scheduled printing lets you control the time of the actual printout, while "
+"you can still send away your job <b>now</b> and have it out of your way. "
+"<p> Especially useful is the \"Never (hold indefinitely)\" option. It allows "
+"you to park your job until a time when you (or a printer administrator) decides "
+"to manually release it. "
+"<p> This is often required in enterprise environments, where you normally are "
+"not allowed to directly and immediately access the huge production printers in "
+"your <em>Central Repro Department</em>. However it is okay to send jobs to the "
+"queue which is under the control of the operators (who, after all, need to make "
+"sure that the 10,000 sheets of pink paper which is required by the Marketing "
+"Department for a particular job are available and loaded into the paper "
+"trays).</p> "
+"<br>  "
+"<hr>  "
+"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
+"matches  with the CUPS commandline job option parameter:</em>  "
+"<pre>    -o job-hold-until=...      # example: \"indefinite\" or \"no-hold\"  "
+"</pre> </p>  </qt>"
+msgstr ""
+"<qt>"
+"<p><b>计划打印</b></p>"
+"<p>计划打印允许您控制实际打印输出的时间，而您仍然可以<b>现在</b>发送您的任务，而让其按照您需要的方式输出。"
+"<p>更有用的选项是“从不(无限等待)”选项。它允许您将任务搁置，直到您(或打印机管理员)决定实际执行该任务时才开始打印。"
+"<p>企业环境中会经常需要这种功能，因为您通常不允许直接或立即访问<em>中心部门</em>的高性能打印机。但是，您仍然可以将任务发送到队列中，而管理员会对队列"
+"进行有效的控制(而管理员需要先确定等待市场部特定打印任务所需的一万张粉色纸已经就绪，并已放进了进纸槽中)。</p>"
+"<br>"
+"<hr>"
+"<p><em><b>高级用户的额外提示：</b>此 TDEPrint GUI 元素可匹配 CUPS 命令行任务选项参数：</em>"
+"<pre>    -o job-hold-until=...      # 例如“indefinite”或“no-hold”</pre></p></qt>"
+
+#: cups/kpschedulepage.cpp:87
+msgid ""
+" <qt> "
+"<p><b>Page Labels</b></p>  "
+"<p>Page Labels are printed by CUPS at the top and bottom of each page. They "
+"appear on the pages surrounded by a little frame box. "
+"<p>They contain any string you type into the line edit field.</p> "
+"<br>  "
+"<hr>  "
+"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
+"matches  with the CUPS commandline job option parameter:</em>  "
+"<pre>    -o page-label=\"...\"      # example: \"Company Confidential\"  </pre> "
+"</p>  </qt>"
+msgstr ""
+"<qt>"
+"<p><b>页面标签</b></p>  "
+"<p>页面标签会被 CUPS 打印在每页的顶部和底部，周围还会围绕一个小方框。"
+"<p>其中还会包含您在行编辑域输入的任何字符串。</p>"
+"<br>"
+"<hr>"
+"<p><em><b>高级用户的额外提示：</b>此 TDEPrint GUI 元素可匹配 CUPS 命令行任务选项参数：</em>"
+"<pre>    -o page-label=\"...\"      # 例如“Company Confidential”</pre></p></qt>"
+
+#: cups/kpschedulepage.cpp:102
+msgid ""
+" <qt> "
+"<p><b>Job Priority</b></p>  "
+"<p>Usually CUPS prints all jobs per queue according to the \"FIFO\" principle: "
+"<em>First In, First Out</em>. "
+"<p> The job priority option allows you to re-order the queue according to your "
+"needs. "
+"<p> It works in both directions: you can increase as well as decrease "
+"priorities. (Usually you can only control your <b>own</b> jobs). "
+"<p> Since the default job priority is \"50\", any job sent with, for example, "
+"\"49\" will be printed only after all those others have finished. Conversely, a "
+"\"51\" or higher priority job will go right to the top of a populated queue (if "
+"no other, higher prioritized one is present).</p> "
+"<br>  "
+"<hr>  "
+"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
+"matches  with the CUPS commandline job option parameter:</em>  "
+"<pre>    -o job-priority=...   # example: \"10\" or \"66\" or \"99\"  </pre> "
+"</p>  </qt>"
+msgstr ""
+"<qt>"
+"<p><b>任务优先级</b></p>"
+"<p>通常，CUPS 会根据“FIFO”规则对全部队列进行排队：<em>先进先出</em>。"
+"<p>任务优先级选项允许您根据需要对队列的顺序进行调整。"
+"<p>优先级可在两个方向进行调整：您可以增加或减少优先级。通常您只能控制您<b>自己</b>的任务。"
+"<p>由于任务的默认优先级为“50”，那么任何以“49”优先级发送的任务都将等待其它任务全部完成后才开始打印。同样的，“51”或更高优先级的打印任务将会直接排到"
+"打印队列的开始位置(如果没有优先级更高的打印任务的话)。</p>"
+"<br>"
+"<hr>"
+"<p><em><b>高级用户的额外提示：</b>此 TDEPrint GUI 元素可匹配 CUPS 命令行任务选项参数：</em>"
+"<pre>    -o job-priority=...   # 例如“10”、“66”或“99”</pre></p></qt>"
+
+#: cups/kpschedulepage.cpp:126
+msgid "Advanced Options"
+msgstr "高级选项"
+
+#: cups/kpschedulepage.cpp:137
+msgid "Immediately"
+msgstr "立即"
+
+#: cups/kpschedulepage.cpp:138
+msgid "Never (hold indefinitely)"
+msgstr "从不(无限等待)"
+
+#: cups/kpschedulepage.cpp:139
+msgid "Daytime (6 am - 6 pm)"
+msgstr "白天(早上 6 点到下午 6 点)"
+
+#: cups/kpschedulepage.cpp:140
+msgid "Evening (6 pm - 6 am)"
+msgstr "晚间(下午 6 点到早上 6 点)"
+
+#: cups/kpschedulepage.cpp:141
+msgid "Night (6 pm - 6 am)"
+msgstr "午夜(下午 6 点到早上 6 点)"
+
+#: cups/kpschedulepage.cpp:142
+msgid "Weekend"
+msgstr "周末"
+
+#: cups/kpschedulepage.cpp:143
+msgid "Second Shift (4 pm - 12 am)"
+msgstr "第二班(下午 4 点到午夜 12 点)"
+
+#: cups/kpschedulepage.cpp:144
+msgid "Third Shift (12 am - 8 am)"
+msgstr "第三班(午夜 12 点到上午 8 点)"
+
+#: cups/kpschedulepage.cpp:145
+msgid "Specified Time"
+msgstr "指定时间"
+
+#: cups/kpschedulepage.cpp:160
+msgid "&Scheduled printing:"
+msgstr "调度打印(&S)："
+
+#: cups/kpschedulepage.cpp:163
+msgid "&Billing information:"
+msgstr "计费信息(&B)："
+
+#: cups/kpschedulepage.cpp:166
+msgid "T&op/Bottom page label:"
+msgstr "顶部/底部页面标记(&O)："
+
+#: cups/kpschedulepage.cpp:169
+msgid "&Job priority:"
+msgstr "作业优先级(&J)："
+
+#: cups/kpschedulepage.cpp:200
+msgid "The time specified is not valid."
+msgstr "指定的时间无效。"
+
+#: cups/kmpropquota.cpp:57
+msgid "Quotas"
+msgstr "配额"
+
+#: cups/kmpropquota.cpp:58
+msgid "Quota Settings"
+msgstr "配额设置"
+
+#: cups/ippreportdlg.cpp:34
+msgid "IPP Report"
+msgstr "IPP 报告"
+
+#: cups/ippreportdlg.cpp:93
+msgid "Internal error: unable to generate HTML report."
+msgstr "内部错误：无法生成 HTML 报告。"
+
+#: cups/kmcupsmanager.cpp:819
 msgid "Library cupsdconf not found. Check your installation."
 msgstr "没有找到 cupsdconf 库。请检查您的安装。"
 
-#: cups/kmcupsmanager.cpp:774
+#: cups/kmcupsmanager.cpp:825
 msgid "Symbol %1 not found in cupsdconf library."
 msgstr "在 cupsdconf 库中没有找到符号 %1。"
 
-#: cups/kmcupsmanager.cpp:849
+#: cups/kmcupsmanager.cpp:920
 msgid "&Export Driver..."
 msgstr "导出驱动程序(&E)..."
 
-#: cups/kmcupsmanager.cpp:851
+#: cups/kmcupsmanager.cpp:922
 msgid "&Printer IPP Report"
 msgstr "打印机 IPP 报告(&P)"
 
-#: cups/kmcupsmanager.cpp:897 cups/kmwippprinter.cpp:218
+#: cups/kmcupsmanager.cpp:968 cups/kmwippprinter.cpp:218
 #, c-format
 msgid "IPP Report for %1"
 msgstr "%1 的 IPP 报告"
 
-#: cups/kmcupsmanager.cpp:901
+#: cups/kmcupsmanager.cpp:972
 msgid "Unable to retrieve printer information. Error received:"
 msgstr "无法检索打印机信息。接收到错误信息："
 
-#: cups/kmcupsmanager.cpp:914
+#: cups/kmcupsmanager.cpp:985
 msgid "Server"
 msgstr "服务器"
 
-#: cups/kmcupsmanager.cpp:954
+#: cups/kmcupsmanager.cpp:1025
 #, c-format
 msgid ""
 "Connection to CUPS server failed. Check that the CUPS server is correctly "
 "installed and running. Error: %1."
 msgstr "到 CUPS 服务器的连接失败。请检查 CUPS 服务器是否安装正确并正在运行。 错误：%1。"
 
-#: cups/kmcupsmanager.cpp:955
+#: cups/kmcupsmanager.cpp:1026
 msgid "the IPP request failed for an unknown reason"
 msgstr "IPP 请求失败，原因未知。"
 
-#: cups/kmcupsmanager.cpp:989
+#: cups/kmcupsmanager.cpp:1060
 msgid "connection refused"
 msgstr "拒绝连接"
 
-#: cups/kmcupsmanager.cpp:992
+#: cups/kmcupsmanager.cpp:1063
 msgid "host not found"
 msgstr "没有找到主机"
 
-#: cups/kmcupsmanager.cpp:996
+#: cups/kmcupsmanager.cpp:1067
 msgid "read failed (%1)"
 msgstr "读取失败(%1)"
 
-#: cups/kmcupsmanager.cpp:1000
+#: cups/kmcupsmanager.cpp:1071
 msgid ""
 "Connection to CUPS server failed. Check that the CUPS server is correctly "
 "installed and running. Error: %2: %1."
 msgstr "到 CUPS 服务器的连接失败。请检查 CUPS 服务器是否安装正确并正在运行。错误：%2：%1。"
 
-#: cups/kphpgl2page.cpp:33
-msgid ""
-" <qt>  <b>Print in Black Only (Blackplot)</b>  "
-"<p>The 'blackplot' option specifies that all pens should plot in black-only: "
-"The default is to use the colors defined in the plot file, or the standard  pen "
-"colors defined in the HP-GL/2 reference manual from Hewlett Packard. </p>  "
-"<br>  "
-"<hr>  "
-"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
-"matches  with the CUPS commandline job option parameter:</em>  "
-"<pre>    -o blackplot=true  </pre>  </p>  </qt>"
-msgstr ""
+#: cups/ipprequest.cpp:164
+msgid "You don't have access to the requested resource."
+msgstr "您没有被请求资源的访问权限。"
 
-#: cups/kphpgl2page.cpp:48
-msgid ""
-" <qt>  <b>Scale Print Image to Page Size</b>  "
-"<p>The 'fitplot' option specifies that the HP-GL image should be scaled to fill "
-" exactly the page with the (elsewhere selected) media size. </p>  "
-"<p>The default is 'fitplot is disabled'. The default will therefore use the "
-"absolute  distances specified in the plot file. (You should be aware that HP-GL "
-"files are very  often CAD drawings intended for large format plotters. On "
-"standard office printers  they will therefore lead to the drawing printout "
-"being spread across multiple pages.) </p>  "
-"<p><b>Note:</b>This feature depends upon an accurate plot size (PS) command in "
-"the  HP-GL/2 file. If no plot size is given in the file the filter converting "
-"the HP-GL  to PostScript assumes the plot is ANSI E size. </p>  "
-"<br>  "
-"<hr>  "
-"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
-"matches with the CUPS commandline job option parameter:</em>  "
-"<pre>     -o fitplot=true   </pre> </p>  </qt>"
-msgstr ""
+#: cups/ipprequest.cpp:167
+msgid "You are not authorized to access the requested resource."
+msgstr "您没有被授权访问所请求的资源。"
 
-#: cups/kphpgl2page.cpp:68
-msgid ""
-" <qt>  <b>Set Pen Width for HP-GL (if not defined in file)</b>.  "
-"<p>The pen width value can be set here in case the original HP-GL file does not "
-"have it  set. The pen width specifies the value in micrometers. The default "
-"value of 1000 produces  lines that are 1000 micrometers == 1 millimeter in "
-"width. Specifying a pen width of 0  produces lines that are exactly 1 pixel "
-"wide. </p>  "
-"<p><b>Note:</b> The penwidth option set here is ignored if the pen widths are "
-"set inside  the plot file itself..</p>  "
-"<br>  "
-"<hr>  "
-"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
-"matches with the CUPS commandline job option parameter:</em>  "
-"<pre>    -o penwidth=...   # example: \"2000\" or \"500\"  </pre> </p>  </qt>"
-msgstr ""
+#: cups/ipprequest.cpp:170
+msgid "The requested operation cannot be completed."
+msgstr "请求的操作无法完成。"
 
-#: cups/kphpgl2page.cpp:85
+#: cups/ipprequest.cpp:173
+msgid "The requested service is currently unavailable."
+msgstr "请求的服务目前不可用。"
+
+#: cups/ipprequest.cpp:176
+msgid "The target printer is not accepting print jobs."
+msgstr "目的打印机不接受打印任务。"
+
+#: cups/ipprequest.cpp:313
 msgid ""
-" <qt>  <b>HP-GL Print Options</b>  "
-"<p>All options on this page are only applicable if you use TDEPrint to send "
-"HP-GL and  HP-GL/2 files to one of your printers. </p>  "
-"<p>HP-GL and HP-GL/2 are page description languages developed by "
-"Hewlett-Packard to drive  Pen Plotting devices. </p>  "
-"<p>TDEPrint can (with the help of CUPS) convert the HP-GL file format and print "
-"it  on any installed printer. </p>  "
-"<p><b>Note 1:</b> To print HP-GL files, start 'kprinter' and simply load the "
-"file into  the running kprinter.</p> "
-"<p><b>Note 2:</b> The 'fitplot' parameter provided on this dialog does also "
-"work for  printing PDF files (if your CUPS version is more recent than "
-"1.1.22).</p>  "
-"<br>  "
-"<hr>  "
-"<p><em><b>Additional hint for power users:</b> These TDEPrint GUI elements "
-"match with CUPS commandline job option parameters:</em>  "
-"<pre>     -o blackplot=...  # examples: \"true\" or \"false\"  "
-"<br>     -o fitplot=...    # examples: \"true\" or \"false\"  "
-"<br>     -o penwidth=...   # examples: \"true\" or \"false\"  </pre> </p>  </qt>"
-msgstr ""
+"Connection to CUPS server failed. Check that the CUPS server is correctly "
+"installed and running."
+msgstr "到 CUPS 服务器的连接失败。请检查 CUPS 服务器是否安装正确并正在运行。"
 
-#: cups/kphpgl2page.cpp:113
-msgid "HP-GL/2 Options"
-msgstr "HP-GL/2 选项"
+#: cups/ipprequest.cpp:316
+msgid "The IPP request failed for an unknown reason."
+msgstr "IPP 请求失败，原因未知。"
 
-#: cups/kphpgl2page.cpp:115
-msgid "&Use only black pen"
-msgstr "仅使用黑墨水(&U)"
+#: cups/ipprequest.cpp:461
+msgid "Attribute"
+msgstr "属性"
 
-#: cups/kphpgl2page.cpp:118
-msgid "&Fit plot to page"
-msgstr "适合页面(&F)"
+#: cups/ipprequest.cpp:462
+msgid "Values"
+msgstr "值"
 
-#: cups/kphpgl2page.cpp:122
-msgid "&Pen width:"
-msgstr "笔宽(&P)："
+#: cups/ipprequest.cpp:500 cups/ipprequest.cpp:567
+msgid "True"
+msgstr "True"
+
+#: cups/ipprequest.cpp:500 cups/ipprequest.cpp:567
+msgid "False"
+msgstr "False"
 
 #: cups/kmwippprinter.cpp:45
 msgid "IPP Printer Information"
@@ -1878,11 +1643,11 @@ msgstr "&IPP 报告"
 msgid "You must enter a printer URI."
 msgstr "您必须输入打印机 URI。"
 
-#: cups/kmwippprinter.cpp:119 management/kmwsocket.cpp:116
+#: cups/kmwippprinter.cpp:119 management/kmwsocket.cpp:117
 msgid "No printer found at this address/port."
 msgstr "该地址/端口上没有找到打印机。"
 
-#: cups/kmwippprinter.cpp:139 management/kmwsocket.cpp:135
+#: cups/kmwippprinter.cpp:139 management/kmwsocket.cpp:136
 msgid ""
 "_: Unknown host - 1 is the IP\n"
 "<Unknown> (%1)"
@@ -1962,100 +1727,21 @@ msgstr "URL："
 msgid "CUPS Server %1:%2"
 msgstr "CUPS 服务器 %1:%2"
 
-#: cups/kmcupsconfigwidget.cpp:65
-msgid "Server Information"
-msgstr "服务器信息"
-
-#: cups/kmcupsconfigwidget.cpp:66
-msgid "Account Information"
-msgstr "账户信息"
-
-#: cups/kmcupsconfigwidget.cpp:67 rlpr/kmproxywidget.cpp:34
-msgid "&Host:"
-msgstr "主机(&H)："
-
-#: cups/kmcupsconfigwidget.cpp:68 management/kmwsocketutil.cpp:53
-#: management/networkscanner.cpp:339 rlpr/kmproxywidget.cpp:35
-msgid "&Port:"
-msgstr "端口(&P)："
-
-#: cups/kmcupsconfigwidget.cpp:75
-msgid "&User:"
-msgstr "用户(&U)："
-
-#: cups/kmcupsconfigwidget.cpp:76
-msgid "Pass&word:"
-msgstr "密码(&W)："
-
-#: cups/kmcupsconfigwidget.cpp:79
-msgid "&Store password in configuration file"
-msgstr "在配置文件中存储密码(&S)"
-
-#: cups/kmcupsconfigwidget.cpp:81
-msgid "Use &anonymous access"
-msgstr "匿名访问(&A)"
-
-#: cups/kmwquota.cpp:46
-msgid "second(s)"
-msgstr "秒"
-
-#: cups/kmwquota.cpp:47
-msgid "minute(s)"
-msgstr "分钟"
-
-#: cups/kmwquota.cpp:48
-msgid "hour(s)"
-msgstr "小时"
-
-#: cups/kmwquota.cpp:49
-msgid "day(s)"
-msgstr "天"
-
-#: cups/kmwquota.cpp:50
-msgid "week(s)"
-msgstr "星期"
-
-#: cups/kmwquota.cpp:51
-msgid "month(s)"
-msgstr "月"
-
-#: cups/kmwquota.cpp:79
-msgid "Printer Quota Settings"
-msgstr "打印机配额设置"
-
-#: cups/kmwquota.cpp:104
-msgid ""
-"<p>Set here the quota for this printer. Using limits of <b>0</b> "
-"means that no quota will be used. This is equivalent to set quota period to <b>"
-"<nobr>No quota</nobr></b> (-1). Quota limits are defined on a per-user base and "
-"applied to all users.</p>"
-msgstr ""
-"<p>在此设置该打印机的配额。使用 <b>0</b> 表示不设配额。这相当于将配额时间设为 <b><nobr>没有配额</nobr></b> "
-"(-1)。配额按照每个用户定义，并应用到所有用户。</p>"
-
-#: cups/kmwquota.cpp:130
-msgid "You must specify at least one quota limit."
-msgstr "您必须至少指定一个配额。"
-
-#: cups/kmconfigcups.cpp:32
-msgid "CUPS Server"
-msgstr "CUPS 服务器"
-
-#: cups/kmconfigcups.cpp:33
-msgid "CUPS Server Settings"
-msgstr "CUPS 服务器设置"
+#: cups/kmpropbanners.cpp:35 cups/kmwbanners.cpp:92
+msgid "&Starting banner:"
+msgstr "开始横幅(&S)："
 
-#: cups/kmpropusers.cpp:55
-msgid "Denied users"
-msgstr "拒绝的用户"
+#: cups/kmpropbanners.cpp:36 cups/kmwbanners.cpp:93
+msgid "&Ending banner:"
+msgstr "结束横幅(&E)："
 
-#: cups/kmpropusers.cpp:62
-msgid "Allowed users"
-msgstr "允许的用户"
+#: cups/kmpropbanners.cpp:49 kpgeneralpage.cpp:298
+msgid "Banners"
+msgstr "标题"
 
-#: cups/kmpropusers.cpp:76
-msgid "All users allowed"
-msgstr "允许所有用户"
+#: cups/kmpropbanners.cpp:50
+msgid "Banner Settings"
+msgstr "横幅设置"
 
 #: cups/kpimagepage.cpp:44
 msgid ""
@@ -2328,126 +2014,581 @@ msgstr "原始图像大小百分比"
 msgid "&Image size type:"
 msgstr "图像大小类型(&I)："
 
-#: cups/kmcupsjobmanager.cpp:277
+#: cups/kmcupsjobmanager.cpp:349
 msgid "Job Report"
 msgstr "作业报告"
 
-#: cups/kmcupsjobmanager.cpp:279 cups/kmcupsjobmanager.cpp:384
+#: cups/kmcupsjobmanager.cpp:351 cups/kmcupsjobmanager.cpp:456
 msgid "Unable to retrieve job information: "
 msgstr "无法检索作业信息："
 
-#: cups/kmcupsjobmanager.cpp:288
+#: cups/kmcupsjobmanager.cpp:360
 msgid "&Job IPP Report"
 msgstr "作业 IPP 报告(&J)"
 
-#: cups/kmcupsjobmanager.cpp:290
+#: cups/kmcupsjobmanager.cpp:362
 msgid "&Increase Priority"
 msgstr "提高优先级(&I)"
 
-#: cups/kmcupsjobmanager.cpp:292
+#: cups/kmcupsjobmanager.cpp:364
 msgid "&Decrease Priority"
 msgstr "降低优先级(&D)"
 
-#: cups/kmcupsjobmanager.cpp:294
+#: cups/kmcupsjobmanager.cpp:366
 msgid "&Edit Attributes..."
 msgstr "编辑属性(&E)..."
 
-#: cups/kmcupsjobmanager.cpp:347
+#: cups/kmcupsjobmanager.cpp:419
 msgid "Unable to change job priority: "
 msgstr "无法改变作业优先级："
 
-#: cups/kmcupsjobmanager.cpp:405
+#: cups/kmcupsjobmanager.cpp:477
 #, c-format
 msgid "Unable to find printer %1."
 msgstr "找不到打印机 %1。"
 
-#: cups/kmcupsjobmanager.cpp:422
+#: cups/kmcupsjobmanager.cpp:494
 msgid "Attributes of Job %1@%2 (%3)"
 msgstr "作业 %1@%2 (%3) 的属性"
 
-#: cups/kmcupsjobmanager.cpp:444
+#: cups/kmcupsjobmanager.cpp:516
 msgid "Unable to set job attributes: "
 msgstr "无法设置打印机属性："
 
-#: rlpr/krlprprinterimpl.cpp:73
-msgid "The printer is incompletely defined. Try to reinstall it."
-msgstr "打印机没有被完整定义。请尝试重新安装它。"
+#: cups/kmwipp.cpp:35
+msgid "Remote IPP server"
+msgstr "远程 IPP 服务器"
 
-#: rlpr/kmproprlpr.cpp:49 rlpr/kmwrlpr.cpp:50
-msgid "Remote LPD Queue Settings"
-msgstr "远程 LPD 队列设置"
+#: cups/kmwipp.cpp:39
+msgid ""
+"<p>Enter the information concerning the remote IPP server owning the targeted "
+"printer. This wizard will poll the server before continuing.</p>"
+msgstr "<p>输入目标打印机所在的远程 IPP 服务器的信息。该向导将在继续前查询服务器。</p>"
 
-#: management/kmwlpd.cpp:47 rlpr/kmproprlpr.cpp:35 rlpr/kmwrlpr.cpp:63
-msgid "Queue:"
-msgstr "队列："
+#: cups/kmwipp.cpp:42 management/kmwlpd.cpp:46 rlpr/kmproprlpr.cpp:34
+#: rlpr/kmwrlpr.cpp:62
+msgid "Host:"
+msgstr "主机："
 
-#: rlpr/kmrlprmanager.cpp:47 rlpr/kmwrlpr.cpp:85
-msgid "Empty host name."
-msgstr "空主机名。"
+#: cups/kmwipp.cpp:43
+msgid "Port:"
+msgstr "端口："
 
-#: rlpr/kmrlprmanager.cpp:49 rlpr/kmwrlpr.cpp:87
-msgid "Empty queue name."
-msgstr "空队列名。"
+#: cups/kmwipp.cpp:52 management/kmwsmb.cpp:79
+msgid "Empty server name."
+msgstr "空服务器名。"
 
-#: rlpr/kmwrlpr.cpp:124
-msgid "Remote queue %1 on %2"
-msgstr "在 %2 上的远程打印队列 %1"
+#: cups/kmwipp.cpp:59
+msgid "Incorrect port number."
+msgstr "不正确的端口号。"
 
-#: rlpr/kmwrlpr.cpp:199
-msgid "No Predefined Printers"
-msgstr "没有预定义的打印机"
+#: cups/kmwipp.cpp:72
+msgid "<nobr>Unable to connect to <b>%1</b> on port <b>%2</b> .</nobr>"
+msgstr "<nobr>无法连接到 <b>%1</b> 的端口 <b>%2</b>。</nobr>"
 
-#: management/kmwend.cpp:82 rlpr/kmproprlpr.cpp:48
-msgid "Queue"
-msgstr "队列"
+#: cups/kptagspage.cpp:36
+msgid ""
+" <qt>"
+"<p><b>Additional Tags</b></p> You may send additional commands to the CUPS "
+"server via this editable list.  There are 3 purposes for this: "
+"<ul> "
+"<li>Use any current or future standard CUPS job option not supported by the  "
+"TDEPrint GUI. </li> "
+"<li>Control any custom job option you may want to support in custom CUPS "
+"filters  and backends plugged into the CUPS filtering chain.</li>  "
+"<li>Send short messages to the operators of your production printers in your  "
+"<em>Central Repro Department</em>. </ul>  "
+"<p><b>Standard CUPS job options:</b> A complete list of standard CUPS job  "
+"options is in the <a href=\"http://localhost:631/sum.html\">CUPS User Manual</a>"
+".  Mappings of the kprinter user interface widgets to respective CUPS job "
+"option  names are named in the various <em>WhatsThis</em> help items..</p> "
+"<p><b>Custom CUPS job options:</b> CUPS print servers may be customized with "
+"additional  print filters and backends which understand custom job options. You "
+"can specify such  custom job options here. If in doubt, ask your system "
+"administrator..</p> "
+"<p><b> </b></p> "
+"<p><b>Operator Messages:</b> You may send additional messages to the "
+"operator(s) of your production printers (e.g. in your <em>"
+"Central Repro Department</p>) Messages can be read by the operator(s) (or "
+"yourself) by viewing the <em>\"Job IPP Report\"</em> for the job.</p> <b>"
+"Examples:</b>"
+"<br> "
+"<pre> A standard CUPS job option:"
+"<br>    <em>(Name) number-up</em>                -- <em>(Value) 9</em>                     "
+"<br> "
+"<br> A job option for custom CUPS filters or backends:"
+"<br>    <em>(Name) DANKA_watermark</em>          -- <em>"
+"(Value) Company_Confidential</em>   "
+"<br> "
+"<br> A message to the operator(s):"
+"<br>    <em>(Name) Deliver_after_completion</em> -- <em>"
+"(Value) to_Marketing_Departm.</em>"
+"<br> </pre> "
+"<p><b>Note:</b> the fields must not include spaces, tabs or quotes. You may "
+"need to  double-click on a field to edit it. "
+"<p><b>Warning:</b> Do not use such standard CUPS option names which also can be "
+"used  through the TDEPrint GUI. Results may be  unpredictable if they conflict, "
+" or if they are sent multiple times. For all options supported by the GUI, "
+"please do use  the GUI. (Each GUI element's  'WhatsThis' names the related CUPS "
+"option name.) </p>  </qt>"
+msgstr ""
 
-#: management/kmwsmb.cpp:81 rlpr/kmrlprmanager.cpp:45
-msgid "Empty printer name."
-msgstr "空打印机名。"
+#: cups/kptagspage.cpp:77
+msgid "Additional Tags"
+msgstr "其它标签"
 
-#: rlpr/kmrlprmanager.cpp:63
-msgid "Printer not found."
-msgstr "没有找到打印机。"
+#: cups/kptagspage.cpp:82 kpfilterpage.cpp:406 management/kmjobviewer.cpp:237
+#: management/kmwend.cpp:51 management/kxmlcommanddlg.cpp:141
+#: management/kxmlcommanddlg.cpp:545 tdefilelist.cpp:101
+msgid "Name"
+msgstr "名称"
 
-#: rlpr/kmrlprmanager.cpp:75
-msgid "Not implemented yet."
-msgstr "还没有实现。"
+#: cups/kptagspage.cpp:83
+msgid "Value"
+msgstr "值"
 
-#: rlpr/kmconfigproxy.cpp:29
-msgid "Proxy"
-msgstr "代理"
+#: cups/kptagspage.cpp:92
+msgid "Read-Only"
+msgstr "只读"
 
-#: rlpr/kmconfigproxy.cpp:30
-msgid "RLPR Proxy Server Settings"
-msgstr "RLPR 代理服务器设置"
+#: cups/kptagspage.cpp:115
+msgid "The tag name must not contain any spaces, tabs or quotes: <b>%1</b>."
+msgstr "标签名不能含有空格、跳格或引号：<b>%1</b>。"
 
-#: rlpr/kmproxywidget.cpp:32
-msgid "Proxy Settings"
-msgstr "代理设置"
+#: cups/kmwbanners.cpp:57
+msgid "No Banner"
+msgstr "无横幅"
 
-#: rlpr/kmproxywidget.cpp:36
-msgid "&Use proxy server"
-msgstr "使用代理服务器(&U)"
+#: cups/kmwbanners.cpp:58
+msgid "Classified"
+msgstr "分类"
 
-#: kmjob.cpp:114
-msgid "Queued"
-msgstr "已排队"
+#: cups/kmwbanners.cpp:59
+msgid "Confidential"
+msgstr "机密"
 
-#: kmjob.cpp:117
-msgid "Held"
-msgstr "保持"
+#: cups/kmwbanners.cpp:60
+msgid "Secret"
+msgstr "机密"
 
-#: kmjob.cpp:123
-msgid "Canceled"
-msgstr "已取消"
+#: cups/kmwbanners.cpp:61
+msgid "Standard"
+msgstr "标准"
 
-#: kmjob.cpp:126
-msgid "Aborted"
-msgstr "已中止"
+#: cups/kmwbanners.cpp:62
+msgid "Top Secret"
+msgstr "绝密"
 
-#: kmjob.cpp:129
-msgid "Completed"
-msgstr "已完成"
+#: cups/kmwbanners.cpp:63
+msgid "Unclassified"
+msgstr "未分类"
+
+#: cups/kmwbanners.cpp:86
+msgid "Banner Selection"
+msgstr "横幅选择"
+
+#: cups/kmwbanners.cpp:99
+msgid ""
+"<p>Select the default banners associated with this printer. These banners will "
+"be inserted before and/or after each print job sent to the printer. If you "
+"don't want to use banners, select <b>No Banner</b>.</p>"
+msgstr ""
+"<p>选择该打印机的默认横幅。这些横幅将被插入到送往该打印机的每项打印作业之前和/或之后。如果您不希望使用横幅，选择<b>无</b>。</p>"
+
+#: cups/kmwfax.cpp:39
+msgid "Fax Serial Device"
+msgstr "传真串行设备"
+
+#: cups/kmwfax.cpp:43
+msgid "<p>Select the device which your serial Fax/Modem is connected to.</p>"
+msgstr "<p>选择您的串行传真/调制解调器连接到的设备。</p>"
+
+#: cups/kmwfax.cpp:81
+msgid "You must select a device."
+msgstr "您必须选择一个设备。"
+
+#: foomatic/kfoomaticprinterimpl.cpp:51 lpdunix/klpdunixprinterimpl.cpp:72
+msgid ""
+"No valid print executable was found in your path. Check your installation."
+msgstr "在搜索路径中没有找到有效的打印程序。请检查您的安装。"
+
+#: foomatic/kmfoomaticmanager.cpp:70
+msgid "This is not a Foomatic printer"
+msgstr "这不是 Foomatic 打印机"
+
+#: foomatic/kmfoomaticmanager.cpp:75
+msgid "Some printer information are missing"
+msgstr "缺少某些打印机信息"
+
+#: kmmanager.cpp:70
+msgid "This operation is not implemented."
+msgstr "该操作未实现。"
+
+#: kmmanager.cpp:169
+msgid "Unable to locate test page."
+msgstr "无法定位测试页。"
+
+#: kmmanager.cpp:449
+msgid "Can't overwrite regular printer with special printer settings."
+msgstr "无法用特殊打印机的设置来覆盖常规打印机。"
+
+#: kmmanager.cpp:478
+#, c-format
+msgid "Parallel Port #%1"
+msgstr "并行端口 #%1"
+
+#: kmmanager.cpp:486 kmmanager.cpp:502 kxmlcommand.cpp:661
+#, c-format
+msgid "Unable to load TDE print management library: %1"
+msgstr "无法载入 TDE 打印管理库：%1"
+
+#: kmmanager.cpp:491 kxmlcommand.cpp:669
+msgid "Unable to find wizard object in management library."
+msgstr "在管理库中找不到向导对象。"
+
+#: kmmanager.cpp:507
+msgid "Unable to find options dialog in management library."
+msgstr "在管理库中找不到选项对话框。"
+
+#: kmmanager.cpp:534
+msgid "No plugin information available"
+msgstr "没有可用插件信息"
+
+#: kprintpreview.cpp:140
+msgid "Do you want to continue printing anyway?"
+msgstr "您要继续打印吗？"
+
+#: kprintpreview.cpp:148 kprintpreview.cpp:227
+msgid "Print Preview"
+msgstr "打印预览"
+
+#: kprintpreview.cpp:278
+msgid ""
+"The preview program %1 cannot be found. Check that the program is correctly "
+"installed and located in a directory included in your PATH environment "
+"variable."
+msgstr "找不到预览程序 %1。请检查是否正确安装了此程序，是否在一个 PATH 环境变量中指定的目录中。"
+
+#: kprintpreview.cpp:303
+msgid ""
+"Preview failed: neither the internal TDE PostScript viewer (KGhostView) nor any "
+"other external PostScript viewer could be found."
+msgstr "预览失败：找不到 TDE 内建的 PostScript 查看器(KGhostView) 或其它外部的 PostScript 查看器。"
+
+#: kprintpreview.cpp:307
+#, c-format
+msgid ""
+"Preview failed: TDE could not find any application to preview files of type %1."
+msgstr "预览失败：TDE 无法找到可预览 %1 类型文件的应用程序。"
+
+#: kprintpreview.cpp:317
+#, c-format
+msgid "Preview failed: unable to start program %1."
+msgstr "预览失败：无法启动程序 %1。"
+
+#: kprintpreview.cpp:322
+msgid "Do you want to continue printing?"
+msgstr "您要继续打印吗？"
+
+#: marginwidget.cpp:37
+msgid ""
+" <qt>  "
+"<p><b>Top Margin</b></p>.  "
+"<p>This spinbox/text edit field lets you control the top margin of your "
+"printout if the printing  application does not define its margins internally. "
+"</p>  "
+"<p>The setting works for instance for ASCII text file printing, or for printing "
+"from KMail and  and Konqueror.. </p> "
+"<p><b>Note:</b></p>This margin setting is not intended for KOffice or "
+"OpenOffice.org printing,  because these applications (or rather their users) "
+"are expected to do it by themselves.  It also does not work for PostScript or "
+"PDF file, which in most cases have their margins hardcoded  internally.</p>  "
+"<br>  "
+"<hr>  "
+"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
+"matches  with the CUPS commandline job option parameter:</em>  "
+"<pre>    -o page-top=...      # use values from \"0\" or higher. \"72\" is "
+"equal to 1 inch.  </pre> </p>  </qt>"
+msgstr ""
+
+#: marginwidget.cpp:57
+msgid ""
+" <qt>  "
+"<p><b>Bottom Margin</b></p>.  "
+"<p>This spinbox/text edit field lets you control the bottom margin of your "
+"printout if the printing  application does not define its margins internally. "
+"</p>  "
+"<p>The setting works for instance for ASCII text file printing, or for printing "
+"from KMail and  and Konqueror. </p> "
+"<p><b>Note:</b></p>This margin setting is not intended for KOffice or "
+"OpenOffice.org printing,  because these applications (or rather their users) "
+"are expected to do it by themselves.  It also does not work for PostScript or "
+"PDF file, which in most cases have their margins hardcoded  internally.</p>  "
+"<br>  "
+"<hr>  "
+"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
+"matches  with the CUPS commandline job option parameter:</em>  "
+"<pre>    -o page-bottom=...      # use values from \"0\" or higher. \"72\" is "
+"equal to 1 inch.  </pre> </qt>"
+msgstr ""
+
+#: marginwidget.cpp:76
+msgid ""
+" <qt>  "
+"<p><b>Left Margin</b></p>.  "
+"<p>This spinbox/text edit field lets you control the left margin of your "
+"printout if the printing  application does not define its margins internally. "
+"</p>  "
+"<p>The setting works for instance for ASCII text file printing, or for printing "
+"from KMail and  and Konqueror. </p> "
+"<p><b>Note:</b></p>This margin setting is not intended for KOffice or "
+"OpenOffice.org printing,  because these applications (or rather their users) "
+"are expected to do it by themselves.  It also does not work for PostScript or "
+"PDF file, which in most cases have their margins hardcoded  internally.</p>  "
+"<br>  "
+"<hr>  "
+"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
+"matches  with the CUPS commandline job option parameter:</em>  "
+"<pre>    -o page-left=...      # use values from \"0\" or higher. \"72\" is "
+"equal to 1 inch.  </pre> </qt>"
+msgstr ""
+
+#: marginwidget.cpp:95
+msgid ""
+" <qt>  "
+"<p><b>Right Margin</b></p>.  "
+"<p>This spinbox/text edit field lets you control the right margin of your "
+"printout if the printing  application does not define its margins internally. "
+"</p>  "
+"<p>The setting works for instance for ASCII text file printing, or for printing "
+"from KMail and  and Konqueror. </p> "
+"<p><b>Note:</b></p>This margin setting is not intended for KOffice or "
+"OpenOffice.org printing,  because these applications (or rather their users) "
+"are expected to do it by themselves.  It also does not work for PostScript or "
+"PDF file, which in most cases have their margins hardcoded  internally.</p>  "
+"<br>  "
+"<hr>  "
+"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
+"matches  with the CUPS commandline job option parameter:</em>  "
+"<pre>    -o page-right=...      # use values from \"0\" or higher. \"72\" is "
+"equal to 1 inch.  </pre> </qt>"
+msgstr ""
+
+#: marginwidget.cpp:114
+msgid ""
+" <qt>  "
+"<p><b>Change Measurement Unit<b></p>.  "
+"<p>You can change the units of measurement for the page margins here. Select "
+"from Millimeter, Centimeter, Inch or Pixels (1 pixel == 1/72 inch).  </p>  </qt>"
+msgstr ""
+
+#: marginwidget.cpp:121
+msgid ""
+" <qt>  "
+"<p><b>Custom Margins Checkbox</b></p>.  "
+"<p>Enable this checkbox if you want to modify the margins of your printouts  "
+"<p>You can change margin settings in 4 ways:  "
+"<ul>  "
+"<li>Edit the text fields. </li>  "
+"<li>Click spinbox arrows. </li>  "
+"<li>Scroll wheel of wheelmouses. </li>  "
+"<li>Drag margins in preview frame with mouse. </li>  </ul>  <b>Note:</b> "
+"The margin setting does not work if you load such files directly into  "
+"kprinter, which have their print margins hardcoded internally, like as most  "
+"PDF or PostScript files. It works for all ASCII text files however. It also may "
+"not  work with non-TDE applications which fail to  fully utilize the TDEPrint "
+"framework, such as OpenOffice.org. </p>  </qt>"
+msgstr ""
+
+#: marginwidget.cpp:138
+msgid ""
+" <qt>  "
+"<p><b>\"Drag-your-Margins\" </p>.  "
+"<p>Use your mouse to drag and set each margin on this little preview window. "
+"</p>  </qt>"
+msgstr ""
+
+#: marginwidget.cpp:148
+msgid "&Use custom margins"
+msgstr "使用定制页边距(&U)"
+
+#: marginwidget.cpp:158
+msgid "&Top:"
+msgstr "顶部(&T)："
+
+#: marginwidget.cpp:159
+msgid "&Bottom:"
+msgstr "底部(&B)："
+
+#: marginwidget.cpp:160
+msgid "Le&ft:"
+msgstr "左边(&F)："
+
+#: marginwidget.cpp:161
+msgid "&Right:"
+msgstr "右边(&R)："
+
+#: marginwidget.cpp:164
+msgid "Pixels (1/72nd in)"
+msgstr "像素(1/72英寸)"
+
+#: marginwidget.cpp:167
+msgid "Inches (in)"
+msgstr "英寸(in)"
+
+#: marginwidget.cpp:168
+msgid "Centimeters (cm)"
+msgstr "厘米(cm)"
+
+#: marginwidget.cpp:169
+msgid "Millimeters (mm)"
+msgstr "毫米(mm)"
+
+#: kprinterimpl.cpp:156
+msgid "Cannot copy multiple files into one file."
+msgstr "无法将多个文件复制入一个文件。"
+
+#: kprinterimpl.cpp:165
+msgid "Cannot save print file to %1. Check that you have write access to it."
+msgstr "无法将打印文件保存到 %1。请检查您是否有写权限。"
+
+#: kprinterimpl.cpp:233
+#, c-format
+msgid "Printing document: %1"
+msgstr "正在打印文档：%1"
+
+#: kprinterimpl.cpp:251
+#, c-format
+msgid "Sending print data to printer: %1"
+msgstr "正在把打印数据发送到打印机：%1"
+
+#: kprinterimpl.cpp:279
+msgid "Unable to start child print process. "
+msgstr "无法启动打印子进程。"
+
+#: kprinterimpl.cpp:281
+msgid ""
+"The TDE print server (<b>tdeprintd</b>) could not be contacted. Check that this "
+"server is running."
+msgstr "无法联系 TDE 打印服务器(<b>tdeprintd</b>)。请检查服务器是否正在运行。"
+
+#: kprinterimpl.cpp:283
+msgid ""
+"_: 1 is the command that <files> is given to\n"
+"Check the command syntax:\n"
+"%1 <files>"
+msgstr ""
+"检查命令语法：\n"
+"%1 <files>"
+
+#: kprinterimpl.cpp:290
+msgid "No valid file was found for printing. Operation aborted."
+msgstr "没有找到要打印的有效文件。中止操作。"
+
+#: kprinterimpl.cpp:325
+msgid ""
+"<p>Unable to perform the requested page selection. The filter <b>psselect</b> "
+"cannot be inserted in the current filter chain. See <b>Filter</b> "
+"tab in the printer properties dialog for further information.</p>"
+msgstr ""
+"<p>无法执行请求的页面选择。过滤器<b>psselect</b>无法被插入当前的过滤器链。查看打印机属性对话框中的<b>过滤器</b>"
+"标签来获得更多信息。</p>"
+
+#: kprinterimpl.cpp:355
+msgid "<p>Could not load filter description for <b>%1</b>.</p>"
+msgstr "<p>无法装入 <b>%1</b> 的过滤器描述。</p>"
+
+#: kprinterimpl.cpp:371
+msgid ""
+"<p>Error while reading filter description for <b>%1</b>"
+". Empty command line received.</p>"
+msgstr "<p>读取<b>%1</b>的过滤描述时发生错误。接收到空命令行。</p>"
+
+#: kprinterimpl.cpp:385
+msgid ""
+"The MIME type %1 is not supported as input of the filter chain (this may happen "
+"with non-CUPS spoolers when performing page selection on a non-PostScript "
+"file). Do you want TDE to convert the file to a supported format?</p>"
+msgstr ""
+"MIME 类型 %1 不能作为过滤器链的输入(当使用非 CUPS 假脱机程序对非 PostScript 文件进行页面选择时可能会发生)。你想让 TDE "
+"将它转换成被支持的格式吗？</p>"
+
+#: kprinterimpl.cpp:389 kprinterimpl.cpp:509
+msgid "Convert"
+msgstr "转换"
+
+#: kprinterimpl.cpp:399
+msgid "Select MIME Type"
+msgstr "选择 MIME 类型"
+
+#: kprinterimpl.cpp:400
+msgid "Select the target format for the conversion:"
+msgstr "选择转换的目标格式："
+
+#: kprinterimpl.cpp:404 kprinterimpl.cpp:430
+msgid "Operation aborted."
+msgstr "操作中止。"
+
+#: kprinterimpl.cpp:410
+msgid "No appropriate filter found. Select another target format."
+msgstr "没有找到合适的过滤器。请选择另外的目标格式。"
+
+#: kprinterimpl.cpp:423
+msgid ""
+"<qt>Operation failed with message:"
+"<br>%1"
+"<br>Select another target format.</qt>"
+msgstr "<qt>操作失败，信息是：<br>%1<br>请选择另外的目标格式。</qt>"
+
+#: kprinterimpl.cpp:441
+msgid "Filtering print data"
+msgstr "过滤打印数据"
+
+#: kprinterimpl.cpp:445
+msgid "Error while filtering. Command was: <b>%1</b>."
+msgstr "在过滤时发生错误。命令为：<b>%1</b>。"
+
+#: kprinterimpl.cpp:487
+msgid "<qt>The print file is empty and will be ignored:<p>%1</p></qt>"
+msgstr "<qt>打印文件为空，将被忽略：<p>%1</p></qt>"
+
+#: kprinterimpl.cpp:497
+msgid ""
+"<qt>The file format <em> %1 </em> is not directly supported by the current "
+"print system. You now have 3 options: "
+"<ul> "
+"<li> TDE can attempt to convert this file automatically to a supported format. "
+"(Select <em>Convert</em>) </li>"
+"<li> You can try to send the file to the printer without any conversion. "
+"(Select <em>Keep</em>) </li>"
+"<li> You can cancel the printjob. (Select <em>Cancel</em>) </li></ul> "
+"Do you want TDE to attempt and convert this file to %2?</qt>"
+msgstr ""
+"<qt>打印系统不直接支持文件格式 <em>%1</em>。您有三个选项："
+"<ul> "
+"<li>TDE 可以试图将此文件自动转换为支持的格式。(选择<em>转换</em>)</li>"
+"<li>您可以试着将此文件发送给打印机，而不进行任何转换。(选择<em>保持</em>)</li>"
+"<li>您可以取消打印任务。(选择<em>取消</em>)</li></ul>您想要 TDE 尝试将此文件转换为 %2 吗？</qt>"
+
+#: kprinterimpl.cpp:510 management/kmwname.cpp:62
+msgid "Keep"
+msgstr "保留"
+
+#: kprinterimpl.cpp:518
+msgid ""
+"<qt>No appropriate filter was found to convert the file format %1 into %2."
+"<br>"
+"<ul>"
+"<li>Go to <i>System Options -> Commands</i> to look through the list of "
+"possible filters. Each filter executes an external program.</li>"
+"<li> See if the required external program is available.on your system.</li></ul>"
+"</qt>"
+msgstr ""
+"<qt>没有找到可将文件格式 %1 转化为 %2 的适当过滤器。"
+"<br>"
+"<ul>"
+"<li>转到<i>系统选项->命令</i>可查看可用的过滤器。每个过滤器都执行了一个外部程序。</li>"
+"<li>请看您的系统上是否有可用的外部程序。</li></ul></qt>"
 
 #: tools/escputil/escpwidget.cpp:45
 msgid "EPSON InkJet Printer Utilities"
@@ -2521,391 +2662,249 @@ msgstr "操作终止并有错误。"
 msgid "Output"
 msgstr "输出"
 
-#: management/kmmainview.cpp:71
+#: kprintaction.cpp:117 kprintaction.cpp:122 kprintaction.cpp:127
+msgid "&Export..."
+msgstr "导出(&E)..."
+
+#: driver.cpp:385 foomatic2loader.cpp:268
+msgid "Adjustments"
+msgstr "调整"
+
+#: kmprinter.cpp:144
+msgid "(rejecting jobs)"
+msgstr "(正在拒绝作业)"
+
+#: kmprinter.cpp:144
+msgid "(accepting jobs)"
+msgstr "(正在接收作业)"
+
+#: management/kmmainview.cpp:72
 msgid ""
 "The printer %1 already exists. Continuing will overwrite existing printer. Do "
 "you want to continue?"
 msgstr "打印机 %1 已经存在。继续将会覆盖已存在的打印机。您要继续吗？"
 
-#: management/kmmainview.cpp:132 management/kmmainview.cpp:779
-#: management/kmmainview.cpp:855 management/kmmainview.cpp:879
+#: management/kmmainview.cpp:133 management/kmmainview.cpp:783
+#: management/kmmainview.cpp:859 management/kmmainview.cpp:883
 msgid "Initializing manager..."
 msgstr "正在初始化管理器..."
 
-#: management/kmmainview.cpp:179
+#: management/kmmainview.cpp:180
 msgid "&Icons,&List,&Tree"
 msgstr "图标(&I),列表(&L),树(&T)"
 
-#: management/kmmainview.cpp:183
+#: management/kmmainview.cpp:184
 msgid "Start/Stop Printer"
 msgstr "启动/停止打印机"
 
-#: management/kmmainview.cpp:185
+#: management/kmmainview.cpp:186
 msgid "&Start Printer"
 msgstr "启动打印机(&S)"
 
-#: management/kmmainview.cpp:186
+#: management/kmmainview.cpp:187
 msgid "Sto&p Printer"
 msgstr "停止打印机(&P)"
 
-#: management/kmmainview.cpp:188
+#: management/kmmainview.cpp:189
 msgid "Enable/Disable Job Spooling"
 msgstr "启用/禁用作业假脱机"
 
-#: management/kmmainview.cpp:190
+#: management/kmmainview.cpp:191
 msgid "&Enable Job Spooling"
 msgstr "启用作业假脱机(&E)"
 
-#: management/kmmainview.cpp:191
+#: management/kmmainview.cpp:192
 msgid "&Disable Job Spooling"
 msgstr "禁用作业假脱机(&D)"
 
-#: management/kmmainview.cpp:194
+#: management/kmmainview.cpp:195
 msgid "&Configure..."
 msgstr "配置(&C)..."
 
-#: management/kmmainview.cpp:195
+#: management/kmmainview.cpp:196
 msgid "Add &Printer/Class..."
 msgstr "添加打印机/类(&P)..."
 
-#: management/kmmainview.cpp:196
+#: management/kmmainview.cpp:197
 msgid "Add &Special (pseudo) Printer..."
 msgstr "添加特殊(伪)打印机(&S)..."
 
-#: management/kmmainview.cpp:197
+#: management/kmmainview.cpp:198
 msgid "Set as &Local Default"
 msgstr "设为本地默认值(&L)"
 
-#: management/kmmainview.cpp:198
+#: management/kmmainview.cpp:199
 msgid "Set as &User Default"
 msgstr "设为用户默认值(&U)"
 
-#: management/kmmainview.cpp:199
+#: management/kmmainview.cpp:200
 msgid "&Test Printer..."
 msgstr "测试打印机(&T)..."
 
-#: management/kmmainview.cpp:200
+#: management/kmmainview.cpp:201
 msgid "Configure &Manager..."
 msgstr "配置管理器(&M)..."
 
-#: management/kmmainview.cpp:201
+#: management/kmmainview.cpp:202
 msgid "Initialize Manager/&View"
 msgstr "初始化管理器/视图(&V)"
 
-#: management/kmmainview.cpp:203
+#: management/kmmainview.cpp:204
 msgid "&Orientation"
 msgstr "方向(&O)"
 
-#: management/kmmainview.cpp:206
+#: management/kmmainview.cpp:207
 msgid "&Vertical,&Horizontal"
 msgstr "垂直(&V),水平(&H)"
 
-#: management/kmmainview.cpp:210
+#: management/kmmainview.cpp:211
 msgid "R&estart Server"
 msgstr "重新启动服务器(&E)"
 
-#: management/kmmainview.cpp:211
+#: management/kmmainview.cpp:212
 msgid "Configure &Server..."
 msgstr "配置服务器(&S)..."
 
-#: management/kmmainview.cpp:214
+#: management/kmmainview.cpp:213
+#, fuzzy
+msgid "Configure Server Access..."
+msgstr "配置服务器(&S)..."
+
+#: management/kmmainview.cpp:216
 msgid "Hide &Toolbar"
 msgstr "隐藏工具栏(&T)"
 
-#: management/kmmainview.cpp:216
+#: management/kmmainview.cpp:218
 msgid "Show Me&nu Toolbar"
 msgstr "显示菜单工具栏(&N)"
 
-#: management/kmmainview.cpp:217
+#: management/kmmainview.cpp:219
 msgid "Hide Me&nu Toolbar"
 msgstr "隐藏菜单工具栏(&N)"
 
-#: management/kmmainview.cpp:219
+#: management/kmmainview.cpp:221
 msgid "Show Pr&inter Details"
 msgstr "显示打印机细节(&I)"
 
-#: management/kmmainview.cpp:220
+#: management/kmmainview.cpp:222
 msgid "Hide Pr&inter Details"
 msgstr "隐藏打印机细节(&I)"
 
-#: management/kmmainview.cpp:224
+#: management/kmmainview.cpp:226
 msgid "Toggle Printer &Filtering"
 msgstr "切换打印机过滤(&F)"
 
-#: management/kmmainview.cpp:228
-msgid "%1 &Handbook"
-msgstr "%1 手册(&H)"
-
-#: management/kmmainview.cpp:229
-msgid "%1 &Web Site"
-msgstr "%1 网站(&W)"
-
-#: management/kmmainview.cpp:231
+#: management/kmmainview.cpp:230
 msgid "Pri&nter Tools"
 msgstr "打印机工具(&N)"
 
-#: management/kmmainview.cpp:296
+#: management/kmmainview.cpp:295
 msgid "Print Server"
 msgstr "打印服务器"
 
-#: management/kmmainview.cpp:302
+#: management/kmmainview.cpp:301
 msgid "Print Manager"
 msgstr "打印机管理器"
 
-#: management/kmmainview.cpp:319
-msgid "Documentation"
-msgstr "文档"
-
-#: management/kmmainview.cpp:340
+#: management/kmmainview.cpp:334
 msgid "An error occurred while retrieving the printer list."
 msgstr "检索打印机列表时发生错误。"
 
-#: management/kmmainview.cpp:514
+#: management/kmmainview.cpp:511
 #, c-format
 msgid "Unable to modify the state of printer %1."
 msgstr "无法修改打印机 %1 的状态。"
 
-#: management/kmmainview.cpp:525
+#: management/kmmainview.cpp:522
 msgid "Do you really want to remove %1?"
 msgstr "您真的要删除 %1 吗？"
 
-#: management/kmmainview.cpp:529
+#: management/kmmainview.cpp:526
 #, c-format
 msgid "Unable to remove special printer %1."
 msgstr "无法删除特殊打印机 %1。"
 
-#: management/kmmainview.cpp:532
+#: management/kmmainview.cpp:529
 #, c-format
 msgid "Unable to remove printer %1."
 msgstr "无法删除打印机 %1。"
 
-#: management/kmmainview.cpp:562
+#: management/kmmainview.cpp:559
 #, c-format
 msgid "Configure %1"
 msgstr "配置 %1"
 
-#: management/kmmainview.cpp:569
+#: management/kmmainview.cpp:566
 #, c-format
 msgid "Unable to modify settings of printer %1."
 msgstr "无法修改打印机 %1 的设置。"
 
-#: management/kmmainview.cpp:573
+#: management/kmmainview.cpp:570
 #, c-format
 msgid "Unable to load a valid driver for printer %1."
 msgstr "无法为打印机 %1 载入有效的驱动程序。"
 
-#: management/kmmainview.cpp:585
+#: management/kmmainview.cpp:582
 msgid "Unable to create printer."
 msgstr "无法创建打印机。"
 
-#: management/kmmainview.cpp:597
+#: management/kmmainview.cpp:594
 msgid "Unable to define printer %1 as default."
 msgstr "无法将打印机 %1 设为默认。"
 
-#: management/kminstancepage.cpp:265 management/kmmainview.cpp:632
+#: management/kminstancepage.cpp:265 management/kmmainview.cpp:629
 msgid "You are about to print a test page on %1. Do you want to continue?"
 msgstr "您即将在 %1 上打印测试页。您要继续吗？"
 
-#: management/kminstancepage.cpp:265 management/kmmainview.cpp:632
+#: management/kminstancepage.cpp:265 management/kmmainview.cpp:629
 msgid "Print Test Page"
 msgstr "打印测试页"
 
-#: management/kminstancepage.cpp:270 management/kmmainview.cpp:635
+#: management/kminstancepage.cpp:270 management/kmmainview.cpp:632
 #, c-format
 msgid "Test page successfully sent to printer %1."
 msgstr "成功地将测试页发送到打印机 %1 上。"
 
-#: management/kmmainview.cpp:637
+#: management/kmmainview.cpp:634
 #, c-format
 msgid "Unable to test printer %1."
 msgstr "无法测试打印机 %1。"
 
-#: management/kmmainview.cpp:650
+#: management/kmmainview.cpp:647
 msgid "Error message received from manager:</p><p>%1</p>"
 msgstr "从管理器收到错误信息：</p><p>%1</p>"
 
-#: management/kmmainview.cpp:652
+#: management/kmmainview.cpp:649
 msgid "Internal error (no error message)."
 msgstr "内部错误(没有错误信息)。"
 
-#: management/kmmainview.cpp:670
+#: management/kmmainview.cpp:667
 msgid "Unable to restart print server."
 msgstr "无法重新启动打印服务器。"
 
-#: management/kmmainview.cpp:675
+#: management/kmmainview.cpp:672
 msgid "Restarting server..."
 msgstr "正在重新启动服务器..."
 
-#: management/kmmainview.cpp:685
+#: management/kmmainview.cpp:682
 msgid "Unable to configure print server."
 msgstr "无法配置打印服务器。"
 
-#: management/kmmainview.cpp:690
+#: management/kmmainview.cpp:687
 msgid "Configuring server..."
 msgstr "配置服务器..."
 
-#: management/kmmainview.cpp:838
+#: management/kmmainview.cpp:842
 msgid ""
 "Unable to start printer tool. Possible reasons are: no printer selected, the "
 "selected printer doesn't have any local device defined (printer port), or the "
 "tool library could not be found."
 msgstr "无法启动打印机工具。可能的原因有：没有选择打印机；选择的打印机没有定义本地设备(打印机端口)；或者找不到工具库。"
 
-#: management/kmmainview.cpp:862
+#: management/kmmainview.cpp:866
 msgid "Unable to retrieve the printer list."
 msgstr "无法检索打印机列表。"
 
-#: management/kmconfigcommand.cpp:33
-msgid "Commands"
-msgstr "命令"
-
-#: management/kmconfigcommand.cpp:34
-msgid "Command Settings"
-msgstr "命令设置"
-
-#: management/kmconfigcommand.cpp:37
-msgid "Edit/Create Commands"
-msgstr "编辑/创建命令"
-
-#: management/kmconfigcommand.cpp:39
-msgid ""
-"<p>Command objects perform a conversion from input to output."
-"<br>They are used as the basis to build both print filters and special "
-"printers. They are described by a command string, a set of options, a set of "
-"requirements and associated mime types. Here you can create new command objects "
-"and edit existing ones. All changes will only be effective for you."
-msgstr ""
-"<p>执行输入到输出转换的命令对象。"
-"<br>这些对象被用作建立打印过滤器和特殊打印机的基础。它们使用命令字符串、一组选项、一组要求及相关 MIME "
-"类型来描述。此处，您可以创建新命令对象或编辑现存的对象。所有改变将仅对您有效。"
-
-#: management/kmwizard.cpp:64 management/kmwizard.cpp:209
-msgid "&Next >"
-msgstr "下一步(&N) >"
-
-#: management/kmwizard.cpp:66
-msgid "< &Back"
-msgstr "< 上一步(&B)"
-
-#: management/kmwizard.cpp:131 management/kmwizard.cpp:166
-#: management/kmwizard.cpp:191
-msgid "Add Printer Wizard"
-msgstr "添加打印机向导"
-
-#: management/kmwizard.cpp:166
-msgid "Modify Printer"
-msgstr "修改打印机"
-
-#: management/kmwizard.cpp:191
-msgid "Unable to find the requested page."
-msgstr "找不到请求的页面。"
-
-#: management/kmwizard.cpp:207 management/kmwizard.cpp:234
-msgid "&Finish"
-msgstr "完成(&F)"
-
-#: management/tdeprint_management_module.cpp:48
-msgid "Select Command"
-msgstr "选择命令"
-
-#: management/kmwlocal.cpp:38
-msgid "Local Port Selection"
-msgstr "本地端口选择"
-
-#: management/kmwlocal.cpp:50
-msgid "Local System"
-msgstr "本地系统"
-
-#: management/kmwlocal.cpp:57
-msgid "Parallel"
-msgstr "并口"
-
-#: management/kmwlocal.cpp:58
-msgid "Serial"
-msgstr "串口"
-
-#: management/kmwlocal.cpp:59
-msgid "USB"
-msgstr "USB"
-
-#: driver.cpp:389 management/kmwlocal.cpp:60
-msgid "Others"
-msgstr "其它"
-
-#: management/kmwlocal.cpp:63
-msgid ""
-"<p>Select a valid detected port, or enter directly the corresponding URI in the "
-"bottom edit field.</p>"
-msgstr "<p>选择一个有效的检测到的端口，或者直接在下面的编辑区域里输入相应的 URI。</p>"
-
-#: management/kmwlocal.cpp:78
-msgid ""
-"_: The URI is empty\n"
-"Empty URI."
-msgstr "空 URI。"
-
-#: management/kmwlocal.cpp:83
-msgid "The local URI doesn't correspond to a detected port. Continue?"
-msgstr "本地 URL 没有对应于一个检测到的端口。继续吗？"
-
-#: management/kmwlocal.cpp:85
-msgid "Select a valid port."
-msgstr "选择一个有效的端口。"
-
-#: management/kmwlocal.cpp:166
-msgid "Unable to detect local ports."
-msgstr "无法检测本地端口。"
-
-#: management/kmpropbackend.cpp:34
-msgid "Printer type:"
-msgstr "打印机类型："
-
-#: management/kmpropbackend.cpp:48
-msgid "Interface"
-msgstr "接口"
-
-#: management/kmpropbackend.cpp:49
-msgid "Interface Settings"
-msgstr "接口设置"
-
-#: management/kmpropbackend.cpp:62
-msgid "IPP Printer"
-msgstr "IPP 打印机"
-
-#: management/kmpropbackend.cpp:63
-msgid "Local USB Printer"
-msgstr "本地 USB 打印机"
-
-#: management/kmpropbackend.cpp:64
-msgid "Local Parallel Printer"
-msgstr "本地并行打印机"
-
-#: management/kmpropbackend.cpp:65
-msgid "Local Serial Printer"
-msgstr "本地串行打印机"
-
-#: management/kmpropbackend.cpp:66
-msgid "Network Printer (socket)"
-msgstr "网络打印机(套接字)"
-
-#: management/kmpropbackend.cpp:67
-msgid "SMB printers (Windows)"
-msgstr "SMB 打印机(Windows)"
-
-#: management/kmpropbackend.cpp:69
-msgid "File printer"
-msgstr "文件打印机"
-
-#: management/kmpropbackend.cpp:70
-msgid "Serial Fax/Modem printer"
-msgstr "串行传真/调制解调器打印机"
-
-#: management/kmpropbackend.cpp:71
-msgid ""
-"_: Unknown Protocol\n"
-"Unknown"
-msgstr "未知"
-
 #: management/kminfopage.cpp:44 management/kmpropgeneral.cpp:38
 msgid ""
 "_: Physical Location\n"
@@ -2957,133 +2956,9 @@ msgid ""
 "Unknown"
 msgstr "未知"
 
-#: management/kmwclass.cpp:37
-msgid "Class Composition"
-msgstr "类合成"
-
-#: management/kmwclass.cpp:52
-msgid "Available printers:"
-msgstr "可用的打印机："
-
-#: management/kmwclass.cpp:53
-msgid "Class printers:"
-msgstr "类打印机："
-
-#: management/kmwclass.cpp:79
-msgid "You must select at least one printer."
-msgstr "您必须至少指定一个打印机。"
-
-#: management/kmpropgeneral.cpp:37
-msgid "Printer name:"
-msgstr "打印机名："
-
-#: management/kmconfiggeneral.cpp:45 management/kmpropgeneral.cpp:55
-msgid "General Settings"
-msgstr "常规设置"
-
-#: management/networkscanner.cpp:104 management/networkscanner.cpp:184
-msgid "Sc&an"
-msgstr "扫描(&A)"
-
-#: management/networkscanner.cpp:111
-msgid "Network scan:"
-msgstr "网络扫描："
-
-#: management/networkscanner.cpp:112 management/networkscanner.cpp:299
-#: management/networkscanner.cpp:310
-#, c-format
-msgid "Subnet: %1"
-msgstr "子网：%1"
-
-#: management/networkscanner.cpp:161
-msgid ""
-"You are about to scan a subnet (%1.*) that does not correspond to the current "
-"subnet of this computer (%2.*). Do you want to scan the specified subnet "
-"anyway?"
-msgstr "您即将扫描与当前计算机的子网(%2.*)不对应的子网(%1.*)。您仍想扫描指定的子网吗？"
-
-#: management/networkscanner.cpp:164
-msgid "&Scan"
-msgstr "扫描(&S)"
-
-#: management/kmwsocketutil.cpp:52 management/networkscanner.cpp:338
-msgid "&Subnetwork:"
-msgstr "子网(&S)："
-
-#: management/kmwsocketutil.cpp:54 management/networkscanner.cpp:340
-msgid "&Timeout (ms):"
-msgstr "超时(毫秒)(&T)："
-
-#: management/kmwsocketutil.cpp:92 management/networkscanner.cpp:378
-msgid "Scan Configuration"
-msgstr "扫描配置"
-
-#: management/kmwsocketutil.cpp:104 management/kmwsocketutil.cpp:110
-#: management/networkscanner.cpp:390 management/networkscanner.cpp:396
-msgid "Wrong subnetwork specification."
-msgstr "错误的子网说明。"
-
-#: management/kmwsocketutil.cpp:118 management/networkscanner.cpp:404
-msgid "Wrong timeout specification."
-msgstr "错误的超时说明。"
-
-#: management/kmwsocketutil.cpp:121 management/networkscanner.cpp:407
-msgid "Wrong port specification."
-msgstr "错误的端口说明。"
-
-#: management/kmdriverdialog.cpp:48
-msgid ""
-"Some options are in conflict. You must resolve those conflicts before "
-"continuing."
-msgstr "某些选项产生了冲突。您必须先解决冲突才能继续。"
-
-#: management/kmwfile.cpp:35
-msgid "File Selection"
-msgstr "文件选择"
-
-#: management/kmwfile.cpp:41
-msgid ""
-"<p>The printing will be redirected to a file. Enter here the path of the file "
-"you want to use for redirection. Use an absolute path or the browse button for "
-"graphical selection.</p>"
-msgstr "<p>打印将被重定向到文件中。在此输入您要重定向的文件。使用绝对路径或使用浏览按钮来选择。</p>"
-
-#: management/kmwfile.cpp:44
-msgid "Print to file:"
-msgstr "打印到文件："
-
-#: management/kmconfiggeneral.cpp:137 management/kmwfile.cpp:60
-msgid "Empty file name."
-msgstr "空文件名。"
-
-#: management/kmwfile.cpp:66
-msgid "Directory does not exist."
-msgstr "目录不存在。"
-
-#: management/kmconfigpreview.cpp:35
-msgid "Preview"
-msgstr "预览"
-
-#: management/kmconfigpreview.cpp:36
-msgid "Preview Settings"
-msgstr "预览设置"
-
-#: management/kmconfigpreview.cpp:39
-msgid "Preview Program"
-msgstr "预览程序"
-
-#: management/kmconfigpreview.cpp:41
-msgid "&Use external preview program"
-msgstr "使用外部预览程序(&U)"
-
-#: management/kmconfigpreview.cpp:44
-msgid ""
-"You can use an external preview program (PS viewer) instead of the TDE built-in "
-"preview system. Note that if the TDE default PS viewer (KGhostView) cannot be "
-"found, TDE tries automatically to find another external PostScript viewer"
-msgstr ""
-"您可以使用外部预览程序(PS 查看器)来代替 TDE 内建的预览系统。注意，如果 TDE 的默认 PS 查看器(KGhostView)没有找到，TDE "
-"会自动试图寻找其它外部 PS 查看器。"
+#: management/kmpropcontainer.cpp:35
+msgid "Change..."
+msgstr "更改..."
 
 #: management/kmwdrivertest.cpp:41
 msgid "Printer Test"
@@ -3137,130 +3012,6 @@ msgstr "无法删除临时打印机。"
 msgid "Unable to create temporary printer."
 msgstr "无法创建临时打印机。"
 
-#: management/kmpropwidget.cpp:50
-msgid ""
-"<qt>Unable to change printer properties. Error received from manager:"
-"<p>%1</p></qt>"
-msgstr "<qt>无法改变打印机属性。从管理器收到的错误为：<p>%1</p></qt>"
-
-#: management/kaddprinterwizard.cpp:10
-msgid "Configure TDE Print"
-msgstr "配置 TDE 打印"
-
-#: management/kaddprinterwizard.cpp:11
-msgid "Configure print server"
-msgstr "配置打印服务器"
-
-#: management/kaddprinterwizard.cpp:18
-msgid "Start the add printer wizard"
-msgstr "启动添加打印机向导"
-
-#: management/kmdbcreator.cpp:92
-msgid ""
-"No executable defined for the creation of the driver database. This operation "
-"is not implemented."
-msgstr "没有定义用于创建驱动程序数据库的可执行文件。该操作没有实现。"
-
-#: management/kmdbcreator.cpp:95
-msgid ""
-"The executable %1 could not be found in your PATH. Check that this program "
-"exists and is accessible in your PATH variable."
-msgstr "在您的 PATH 中没有找到 %1 可执行文件。请检查该程序是否存在，是否可从您的 PATH 变量定义的目录中找到。"
-
-#: management/kmdbcreator.cpp:99
-msgid ""
-"Unable to start the creation of the driver database. The execution of %1 "
-"failed."
-msgstr "无法开始创建驱动程序数据库。执行 %1 失败。"
-
-#: management/kmdbcreator.cpp:113
-msgid "Please wait while TDE rebuilds a driver database."
-msgstr "TDE 正在重建驱动程序数据库，请稍候。"
-
-#: management/kmdbcreator.cpp:114
-msgid "Driver Database"
-msgstr "驱动程序数据库"
-
-#: management/kmdbcreator.cpp:171
-msgid ""
-"Error while creating driver database: abnormal child-process termination."
-msgstr "创建驱动程序库时发生错误：不正常的子进程终止。"
-
-#: management/kmwpassword.cpp:37
-msgid "User Identification"
-msgstr "用户身份"
-
-#: management/kmwpassword.cpp:43
-msgid ""
-"<p>This backend may require a login/password to work properly. Select the type "
-"of access to use and fill in the login and password entries if needed.</p>"
-msgstr "<p>这个后端需要登录名和密码才能正常工作。请选择要使用的访问类型并填入所需的登录名和密码项。</p>"
-
-#: management/kmwpassword.cpp:49
-msgid "&Login:"
-msgstr "登录名(&L)："
-
-#: management/kmwpassword.cpp:53
-msgid "&Anonymous (no login/password)"
-msgstr "匿名(无用户名/密码)(&A)"
-
-#: management/kmwpassword.cpp:54
-msgid "&Guest account (login=\"guest\")"
-msgstr "访客账户(用户名为“guest”)(&G)"
-
-#: management/kmwpassword.cpp:55
-msgid "Nor&mal account"
-msgstr "普通账户(&M)"
-
-#: management/kmwpassword.cpp:88
-msgid "Select one option"
-msgstr "请选择一个选项。"
-
-#: management/kmwpassword.cpp:90
-msgid "User name is empty."
-msgstr "用户名为空。"
-
-#: management/kmwsocket.cpp:38
-msgid "Network Printer Information"
-msgstr "网络打印机信息"
-
-#: management/kmwsocket.cpp:48
-msgid "&Printer address:"
-msgstr "打印机地址(&P)："
-
-#: management/kmwsocket.cpp:49
-msgid "P&ort:"
-msgstr "端口(&O)："
-
-#: management/kmwsocket.cpp:98
-msgid "You must enter a printer address."
-msgstr "您必须输入打印机地址。"
-
-#: management/kmwsocket.cpp:109
-msgid "Wrong port number."
-msgstr "错误的端口号。"
-
-#: management/kmpropcontainer.cpp:35
-msgid "Change..."
-msgstr "更改..."
-
-#: management/kmconfigdialog.cpp:38
-msgid "TDE Print Configuration"
-msgstr "TDE 打印配置"
-
-#: management/kmwdriver.cpp:33
-msgid "Printer Model Selection"
-msgstr "打印机型号选择"
-
-#: management/kmwdriver.cpp:80 management/kmwend.cpp:106
-#: management/kmwname.cpp:83
-msgid "Raw printer"
-msgstr "原始打印机"
-
-#: management/kmwdriver.cpp:113
-msgid "Internal error: unable to locate the driver."
-msgstr "内部错误：无法定位驱动程序。"
-
 #: management/kmjobviewer.cpp:101 management/kmjobviewer.cpp:158
 msgid "No Printer"
 msgstr "没有打印机"
@@ -3387,198 +3138,620 @@ msgstr "操作失败。"
 msgid "Print Job Settings"
 msgstr "打印作业设置"
 
-#: management/kmconfiggeneral.cpp:48
-msgid "Refresh Interval"
-msgstr "刷新间隔"
+#: management/kmconfigcommand.cpp:33
+msgid "Commands"
+msgstr "命令"
 
-#: management/kmconfiggeneral.cpp:51
-msgid " sec"
-msgstr " 秒"
+#: management/kmconfigcommand.cpp:34
+msgid "Command Settings"
+msgstr "命令设置"
 
-#: management/kmconfiggeneral.cpp:53
+#: management/kmconfigcommand.cpp:37
+msgid "Edit/Create Commands"
+msgstr "编辑/创建命令"
+
+#: management/kmconfigcommand.cpp:39
 msgid ""
-"This time setting controls the refresh rate of various <b>TDE Print</b> "
-"components like the print manager and the job viewer."
-msgstr "该时间设置控制各种<b>TDE打印</b>部件的刷新率，例如打印管理器和作业查看器。"
+"<p>Command objects perform a conversion from input to output."
+"<br>They are used as the basis to build both print filters and special "
+"printers. They are described by a command string, a set of options, a set of "
+"requirements and associated mime types. Here you can create new command objects "
+"and edit existing ones. All changes will only be effective for you."
+msgstr ""
+"<p>执行输入到输出转换的命令对象。"
+"<br>这些对象被用作建立打印过滤器和特殊打印机的基础。它们使用命令字符串、一组选项、一组要求及相关 MIME "
+"类型来描述。此处，您可以创建新命令对象或编辑现存的对象。所有改变将仅对您有效。"
 
-#: management/kmconfiggeneral.cpp:57
-msgid "Test Page"
-msgstr "测试页"
+#: management/tdeprint_management_module.cpp:48
+msgid "Select Command"
+msgstr "选择命令"
 
-#: management/kmconfiggeneral.cpp:58
-msgid "&Specify personal test page"
-msgstr "指定个人的测试页(&S)"
+#: management/kmwbackend.cpp:54
+msgid "Backend Selection"
+msgstr "后端选择"
 
-#: management/kmconfiggeneral.cpp:60
-msgid "Preview..."
-msgstr "预览..."
+#: management/kmwbackend.cpp:68
+msgid "You must select a backend."
+msgstr "您必须选择一个后端。"
 
-#: management/kmconfiggeneral.cpp:70
-msgid "Sho&w printing status message box"
-msgstr "显示打印状态信息框(&W)"
+#: management/kmwbackend.cpp:115
+msgid "&Local printer (parallel, serial, USB)"
+msgstr "本地打印机(并口、串口和 USB )(&L)"
 
-#: management/kmconfiggeneral.cpp:71
-msgid "De&faults to the last printer used in the application"
-msgstr "默认为该应用程序中使用的最后一个打印机(&F)"
+#: management/kmwbackend.cpp:116
+msgid ""
+"<qt>"
+"<p>Locally-connected printer</p>"
+"<p>Use this for a printer connected to the computer via a parallel, serial or "
+"USB port.</p></qt>"
+msgstr "<qt><p>本地连接的打印机</p><p>适合通过并口、串口或 USB 端口连接到计算机的打印机。</p></qt>"
 
-#: management/kmconfiggeneral.cpp:127
+#: management/kmwbackend.cpp:122
+msgid "&SMB shared printer (Windows)"
+msgstr "SMB 共享打印机(Windows)(&S)"
+
+#: management/kmwbackend.cpp:123
 msgid ""
-"The selected test page is not a PostScript file. You may not be able to test "
-"your printer anymore."
-msgstr "所选中的测试页不是 PostScript 文件。您可能无法测试您的打印机。"
+"<qt>"
+"<p>Shared Windows printer</p>"
+"<p>Use this for a printer installed on a Windows server and shared on the "
+"network using the SMB protocol (samba).</p></qt>"
+msgstr ""
+"<qt>"
+"<p>共享的 Windows 打印机</p>"
+"<p>适合安装在 Windows 服务器并使用 SMB 协议(samba)共享的打印机。</p></qt>"
 
-#: management/smbview.cpp:44
-msgid "Comment"
-msgstr "备注"
+#: management/kmwbackend.cpp:130
+msgid "&Remote LPD queue"
+msgstr "远程 LPD 队列(&R)"
 
-#: management/kmwend.cpp:33
-msgid "Confirmation"
-msgstr "确认"
+#: management/kmwbackend.cpp:131
+msgid ""
+"<qt>"
+"<p>Print queue on a remote LPD server</p>"
+"<p>Use this for a print queue existing on a remote machine running a LPD print "
+"server.</p></qt>"
+msgstr "<qt><p>远程 LPD 服务器上的打印队列</p><p>适合运行着 LPD 打印服务器的远程计算机上打印队列。</p></qt>"
 
-#: tdefilelist.cpp:102 management/kmwend.cpp:50 management/kmwend.cpp:106
-#: management/kmwend.cpp:109
-msgid "Type"
-msgstr "类型"
+#: management/kmwbackend.cpp:137
+msgid "Ne&twork printer (TCP)"
+msgstr "网络打印机(&TCP)"
 
-#: management/kmwend.cpp:52
-msgid "Location"
-msgstr "位置"
+#: management/kmwbackend.cpp:138
+msgid ""
+"<qt>"
+"<p>Network TCP printer</p>"
+"<p>Use this for a network-enabled printer using TCP (usually on port 9100) as "
+"communication protocol. Most network printers can use this mode.</p></qt>"
+msgstr ""
+"<qt>"
+"<p>网络 TCP 打印机</p>"
+"<p>适合使用 TCP(通常是端口 9100)作为通讯协议的网络打印机。大多数网络打印机都支持此模式。</p></qt>"
 
-#: management/kmwend.cpp:53 management/kmwend.cpp:112
-#: management/kxmlcommanddlg.cpp:142 management/kxmlcommanddlg.cpp:545
-msgid "Description"
-msgstr "描述"
+#: management/kmwfile.cpp:35
+msgid "File Selection"
+msgstr "文件选择"
+
+#: management/kmwfile.cpp:41
+msgid ""
+"<p>The printing will be redirected to a file. Enter here the path of the file "
+"you want to use for redirection. Use an absolute path or the browse button for "
+"graphical selection.</p>"
+msgstr "<p>打印将被重定向到文件中。在此输入您要重定向的文件。使用绝对路径或使用浏览按钮来选择。</p>"
+
+#: management/kmwfile.cpp:44
+msgid "Print to file:"
+msgstr "打印到文件："
+
+#: management/kmconfiggeneral.cpp:137 management/kmwfile.cpp:60
+msgid "Empty file name."
+msgstr "空文件名。"
+
+#: management/kmwfile.cpp:66
+msgid "Directory does not exist."
+msgstr "目录不存在。"
+
+#: management/kmdriverdbwidget.cpp:51
+msgid "&PostScript printer"
+msgstr "PostScript 打印机(&P)"
+
+#: management/kmdriverdbwidget.cpp:52
+msgid "&Raw printer (no driver needed)"
+msgstr "原始打印机(不需要驱动程序)(&R)"
+
+#: management/kmdriverdbwidget.cpp:55
+msgid "&Other..."
+msgstr "其它(&O)..."
+
+#: management/kmdriverdbwidget.cpp:56
+msgid "&Manufacturer:"
+msgstr "制造商(&M)："
+
+#: management/kmdriverdbwidget.cpp:57
+msgid "Mo&del:"
+msgstr "型号(&D)："
+
+#: management/kmdriverdbwidget.cpp:157 management/kmdriverdbwidget.cpp:166
+msgid "Loading..."
+msgstr "正在载入..."
+
+#: management/kmdriverdbwidget.cpp:217
+msgid "Unable to find the PostScript driver."
+msgstr "找不到 PostScript 驱动程序。"
+
+#: management/kmdriverdbwidget.cpp:230
+msgid "Select Driver"
+msgstr "选择驱动程序"
+
+#: management/kmdriverdbwidget.cpp:247 management/kmdriverdbwidget.cpp:249
+msgid "<Unknown>"
+msgstr "<未知>"
+
+#: management/kmdriverdbwidget.cpp:252
+msgid "Database"
+msgstr "数据库"
+
+#: management/kmdriverdbwidget.cpp:259
+msgid "Wrong driver format."
+msgstr "驱动程序格式不正确。"
+
+#: management/kmdriverdbwidget.cpp:268
+msgid "Other"
+msgstr "其它"
+
+#: management/networkscanner.cpp:104 management/networkscanner.cpp:184
+msgid "Sc&an"
+msgstr "扫描(&A)"
+
+#: management/networkscanner.cpp:111
+msgid "Network scan:"
+msgstr "网络扫描："
+
+#: management/networkscanner.cpp:112 management/networkscanner.cpp:299
+#: management/networkscanner.cpp:310
+#, c-format
+msgid "Subnet: %1"
+msgstr "子网：%1"
+
+#: management/networkscanner.cpp:161
+msgid ""
+"You are about to scan a subnet (%1.*) that does not correspond to the current "
+"subnet of this computer (%2.*). Do you want to scan the specified subnet "
+"anyway?"
+msgstr "您即将扫描与当前计算机的子网(%2.*)不对应的子网(%1.*)。您仍想扫描指定的子网吗？"
+
+#: management/networkscanner.cpp:164
+msgid "&Scan"
+msgstr "扫描(&S)"
+
+#: management/kmwsocketutil.cpp:52 management/networkscanner.cpp:338
+msgid "&Subnetwork:"
+msgstr "子网(&S)："
+
+#: management/kmwsocketutil.cpp:54 management/networkscanner.cpp:340
+msgid "&Timeout (ms):"
+msgstr "超时(毫秒)(&T)："
+
+#: management/kmwsocketutil.cpp:92 management/networkscanner.cpp:378
+msgid "Scan Configuration"
+msgstr "扫描配置"
+
+#: management/kmwsocketutil.cpp:104 management/kmwsocketutil.cpp:110
+#: management/networkscanner.cpp:390 management/networkscanner.cpp:396
+msgid "Wrong subnetwork specification."
+msgstr "错误的子网说明。"
+
+#: management/kmwsocketutil.cpp:118 management/networkscanner.cpp:404
+msgid "Wrong timeout specification."
+msgstr "错误的超时说明。"
+
+#: management/kmwsocketutil.cpp:121 management/networkscanner.cpp:407
+msgid "Wrong port specification."
+msgstr "错误的端口说明。"
+
+#: management/kxmlcommandselector.cpp:54
+msgid "New command"
+msgstr "新建命令"
+
+#: management/kxmlcommandselector.cpp:55
+msgid "Edit command"
+msgstr "编辑命令"
+
+#: management/kxmlcommandselector.cpp:72
+msgid "&Browse..."
+msgstr "浏览(&B)..."
+
+#: management/kxmlcommandselector.cpp:73
+msgid "Use co&mmand:"
+msgstr "使用命令(&M)："
+
+#: management/kxmlcommandselector.cpp:174
+msgid "Command Name"
+msgstr "命令名"
+
+#: management/kxmlcommandselector.cpp:174
+msgid "Enter an identification name for the new command:"
+msgstr "输入新建命令的标识名称："
+
+#: management/kxmlcommandselector.cpp:183
+msgid ""
+"A command named %1 already exists. Do you want to continue and edit the "
+"existing one?"
+msgstr "名为 %1 的命令已经存在。您要继续并编辑已存在的命令吗？"
+
+#: management/kxmlcommandselector.cpp:220
+msgid "Internal error. The XML driver for the command %1 could not be found."
+msgstr "内部错误。找不到命令 %1 的 XML 驱动程序。"
+
+#: management/kxmlcommandselector.cpp:238
+msgid "output"
+msgstr "输出"
+
+#: management/kxmlcommandselector.cpp:242
+msgid "undefined"
+msgstr "未定义"
+
+#: management/kxmlcommandselector.cpp:247
+msgid "not allowed"
+msgstr "不允许"
+
+#: management/kxmlcommandselector.cpp:253
+msgid "(Unavailable: requirements not satisfied)"
+msgstr "(不可用：请求未满足)"
+
+#: management/kmconfigpreview.cpp:35
+msgid "Preview"
+msgstr "预览"
+
+#: management/kmconfigpreview.cpp:36
+msgid "Preview Settings"
+msgstr "预览设置"
+
+#: management/kmconfigpreview.cpp:39
+msgid "Preview Program"
+msgstr "预览程序"
+
+#: management/kmconfigpreview.cpp:41
+msgid "&Use external preview program"
+msgstr "使用外部预览程序(&U)"
+
+#: management/kmconfigpreview.cpp:44
+msgid ""
+"You can use an external preview program (PS viewer) instead of the TDE built-in "
+"preview system. Note that if the TDE default PS viewer (KGhostView) cannot be "
+"found, TDE tries automatically to find another external PostScript viewer"
+msgstr ""
+"您可以使用外部预览程序(PS 查看器)来代替 TDE 内建的预览系统。注意，如果 TDE 的默认 PS 查看器(KGhostView)没有找到，TDE "
+"会自动试图寻找其它外部 PS 查看器。"
+
+#: management/kmwclass.cpp:37
+msgid "Class Composition"
+msgstr "类合成"
+
+#: management/kmwclass.cpp:52
+msgid "Available printers:"
+msgstr "可用的打印机："
+
+#: management/kmwclass.cpp:53
+msgid "Class printers:"
+msgstr "类打印机："
+
+#: management/kmwclass.cpp:79
+msgid "You must select at least one printer."
+msgstr "您必须至少指定一个打印机。"
 
 #: management/kmpropmembers.cpp:39 management/kmwend.cpp:59
 msgid "Members"
 msgstr "成员"
 
-#: management/kmwend.cpp:69
-msgid "Backend"
-msgstr "后端"
+#: management/kmpropmembers.cpp:40
+msgid "Class Members"
+msgstr "类成员"
 
-#: management/kmwend.cpp:74
-msgid "Device"
-msgstr "设备"
+#: management/kaddprinterwizard.cpp:10
+msgid "Configure TDE Print"
+msgstr "配置 TDE 打印"
 
-#: management/kmwend.cpp:77
-msgid "Printer IP"
-msgstr "打印机 IP"
+#: management/kaddprinterwizard.cpp:11
+msgid "Configure print server"
+msgstr "配置打印服务器"
 
-#: management/kmwend.cpp:78 management/kmwend.cpp:89
-msgid "Port"
-msgstr "端口"
+#: management/kaddprinterwizard.cpp:18
+msgid "Start the add printer wizard"
+msgstr "启动添加打印机向导"
 
-#: management/kmwend.cpp:81 management/kmwend.cpp:88
-msgid "Host"
-msgstr "主机"
+#: management/kmpropwidget.cpp:50
+msgid ""
+"<qt>Unable to change printer properties. Error received from manager:"
+"<p>%1</p></qt>"
+msgstr "<qt>无法改变打印机属性。从管理器收到的错误为：<p>%1</p></qt>"
 
-#: management/kmwend.cpp:91
-msgid "Account"
-msgstr "账户"
+#: management/kmdbcreator.cpp:92
+msgid ""
+"No executable defined for the creation of the driver database. This operation "
+"is not implemented."
+msgstr "没有定义用于创建驱动程序数据库的可执行文件。该操作没有实现。"
 
-#: management/kmwend.cpp:96
-msgid "URI"
-msgstr "URI"
+#: management/kmdbcreator.cpp:95
+msgid ""
+"The executable %1 could not be found in your PATH. Check that this program "
+"exists and is accessible in your PATH variable."
+msgstr "在您的 PATH 中没有找到 %1 可执行文件。请检查该程序是否存在，是否可从您的 PATH 变量定义的目录中找到。"
 
-#: management/kmwend.cpp:109
-msgid "DB driver"
-msgstr "DB 驱动程序"
+#: management/kmdbcreator.cpp:99
+msgid ""
+"Unable to start the creation of the driver database. The execution of %1 "
+"failed."
+msgstr "无法开始创建驱动程序数据库。执行 %1 失败。"
 
-#: management/kmwend.cpp:109
-msgid "External driver"
-msgstr "外部驱动程序"
+#: management/kmdbcreator.cpp:113
+msgid "Please wait while TDE rebuilds a driver database."
+msgstr "TDE 正在重建驱动程序数据库，请稍候。"
 
-#: management/kmwend.cpp:110
-msgid "Manufacturer"
-msgstr "制造商"
+#: management/kmdbcreator.cpp:114
+msgid "Driver Database"
+msgstr "驱动程序数据库"
 
-#: management/kmwend.cpp:111
-msgid "Model"
-msgstr "型号"
+#: management/kmdbcreator.cpp:171
+msgid ""
+"Error while creating driver database: abnormal child-process termination."
+msgstr "创建驱动程序库时发生错误：不正常的子进程终止。"
 
-#: management/kmconfigfonts.cpp:43
-msgid "Font Settings"
-msgstr "字体设置"
+#: management/kmwname.cpp:34
+msgid "General Information"
+msgstr "常规信息"
 
-#: management/kmconfigfonts.cpp:46
-msgid "Fonts Embedding"
-msgstr "字体嵌入"
+#: management/kmwname.cpp:37
+msgid ""
+"<p>Enter the information concerning your printer or class. <b>Name</b> "
+"is mandatory, <b>Location</b> and <b>Description</b> "
+"are not (they may even not be used on some systems).</p>"
+msgstr ""
+"<p>输入关于您的打印机或类的信息。<b>名称</b>是必需的，而<b>位置</b>和<b>描述</b>则不是(在某些系统上甚至不用它们)。</p>"
 
-#: management/kmconfigfonts.cpp:47
-msgid "Fonts Path"
-msgstr "字体路径"
+#: management/kmwname.cpp:39
+msgid "Name:"
+msgstr "名称："
 
-#: management/kmconfigfonts.cpp:49
-msgid "&Embed fonts in PostScript data when printing"
-msgstr "打印时在 PostScript 数据中嵌入字体(&E)"
+#: management/kmwname.cpp:48
+msgid "You must supply at least a name."
+msgstr "您必须至少提供一个名称。"
 
-#: management/kmconfigfonts.cpp:57
-msgid "&Up"
-msgstr "上移(&U)"
+#: management/kmwname.cpp:56
+msgid ""
+"It is usually not a good idea to include spaces in printer name: it may prevent "
+"your printer from working correctly. The wizard can strip all spaces from the "
+"string you entered, resulting in %1; what do you want to do?"
+msgstr ""
+"在打印机名称中包含空格通常不是一个好主意：这可能会导致您的打印机无法正确运行。该向导会从您输入的字符串中剥离所有的空格，其结果为 %1；您想怎么办？"
 
-#: management/kmconfigfonts.cpp:58
-msgid "&Down"
-msgstr "下移(&D)"
+#: management/kmwname.cpp:62
+msgid "Strip"
+msgstr "剥离"
 
-#: management/kmconfigfonts.cpp:59
-msgid "&Add"
-msgstr "添加(&A)"
+#: management/kmwdriver.cpp:80 management/kmwend.cpp:106
+#: management/kmwname.cpp:83
+msgid "Raw printer"
+msgstr "原始打印机"
 
-#: management/kmconfigfonts.cpp:61
-msgid "Additional director&y:"
-msgstr "额外目录(&Y)："
+#: management/kmwpassword.cpp:37
+msgid "User Identification"
+msgstr "用户身份"
 
-#: management/kmconfigfonts.cpp:85
+#: management/kmwpassword.cpp:43
 msgid ""
-"These options will automatically put fonts in the PostScript file which are not "
-"present on the printer. Font embedding usually produces better print results "
-"(closer to what you see on the screen), but larger print data as well."
-msgstr ""
-"这些选项会自动把打印机中没有的字体放入 PostScript 文件。字体嵌入通常会生成较佳的打印结果(近似于您在屏幕中所见)，但是其所用打印数据也较大。"
+"<p>This backend may require a login/password to work properly. Select the type "
+"of access to use and fill in the login and password entries if needed.</p>"
+msgstr "<p>这个后端需要登录名和密码才能正常工作。请选择要使用的访问类型并填入所需的登录名和密码项。</p>"
 
-#: management/kmconfigfonts.cpp:89
+#: management/kmwpassword.cpp:49
+msgid "&Login:"
+msgstr "登录名(&L)："
+
+#: management/kmwpassword.cpp:53
+msgid "&Anonymous (no login/password)"
+msgstr "匿名(无用户名/密码)(&A)"
+
+#: management/kmwpassword.cpp:54
+msgid "&Guest account (login=\"guest\")"
+msgstr "访客账户(用户名为“guest”)(&G)"
+
+#: management/kmwpassword.cpp:55
+msgid "Nor&mal account"
+msgstr "普通账户(&M)"
+
+#: management/kmwpassword.cpp:88
+msgid "Select one option"
+msgstr "请选择一个选项。"
+
+#: management/kmwpassword.cpp:90
+msgid "User name is empty."
+msgstr "用户名为空。"
+
+#: management/kmwdriverselect.cpp:37
+msgid "Driver Selection"
+msgstr "驱动程序选择"
+
+#: management/kmwdriverselect.cpp:43
 msgid ""
-"When using font embedding you can select additional directories where TDE "
-"should search for embeddable font files. By default, the X server font path is "
-"used, so adding those directories is not needed. The default search path should "
-"be sufficient in most cases."
-msgstr ""
-"在使用字体嵌入时，您可以选择 TDE 应在其中搜索可嵌入字体文件的额外目录。默认情况下，TDE 使用 X "
-"服务器字体路径，因此您不必添加这些目录。多数情况下，默认搜索路径应足以满足需要。"
+"<p>Several drivers have been detected for this model. Select the driver you "
+"want to use. You will have the opportunity to test it as well as to change it "
+"if necessary.</p>"
+msgstr "<p>已检测到用于该型号的某些驱动程序。选择您要使用的驱动程序。您有机会测试它，如果需要的话也可以改变它。</p>"
 
-#: management/kmwsmb.cpp:35
-msgid "SMB Printer Settings"
-msgstr "SMB 打印机设置"
+#: management/kmwdriverselect.cpp:46
+msgid "Driver Information"
+msgstr "驱动程序信息"
 
-#: management/kmwsmb.cpp:41
-msgid "Scan"
-msgstr "扫描"
+#: management/kmwdriverselect.cpp:62
+msgid "You must select a driver."
+msgstr "您必须选择一个驱动程序。"
 
-#: management/kmwsmb.cpp:42
-msgid "Abort"
-msgstr "中止"
+#: management/kmwdriverselect.cpp:82
+msgid " [recommended]"
+msgstr " [推荐]"
 
-#: management/kmwsmb.cpp:44
-msgid "Workgroup:"
-msgstr "工作组："
+#: management/kmwdriverselect.cpp:113
+msgid "No information about the selected driver."
+msgstr "没有关于选中驱动程序的信息。"
 
-#: management/kmwsmb.cpp:45
-msgid "Server:"
-msgstr "服务器："
+#: management/kmpropbackend.cpp:34
+msgid "Printer type:"
+msgstr "打印机类型："
 
-#: management/kmwsmb.cpp:99
-#, c-format
-msgid "Login: %1"
-msgstr "登录名：%1"
+#: management/kmpropbackend.cpp:48
+msgid "Interface"
+msgstr "接口"
 
-#: management/kmwsmb.cpp:99
-msgid "<anonymous>"
-msgstr "<匿名>"
+#: management/kmpropbackend.cpp:49
+msgid "Interface Settings"
+msgstr "接口设置"
 
-#: management/kmpropmembers.cpp:40
-msgid "Class Members"
-msgstr "类成员"
+#: management/kmpropbackend.cpp:62
+msgid "IPP Printer"
+msgstr "IPP 打印机"
+
+#: management/kmpropbackend.cpp:63
+msgid "Local USB Printer"
+msgstr "本地 USB 打印机"
+
+#: management/kmpropbackend.cpp:64
+msgid "Local Parallel Printer"
+msgstr "本地并行打印机"
+
+#: management/kmpropbackend.cpp:65
+msgid "Local Serial Printer"
+msgstr "本地串行打印机"
+
+#: management/kmpropbackend.cpp:66
+msgid "Network Printer (socket)"
+msgstr "网络打印机(套接字)"
+
+#: management/kmpropbackend.cpp:67
+msgid "SMB printers (Windows)"
+msgstr "SMB 打印机(Windows)"
+
+#: lpd/kmlpduimanager.cpp:45 management/kmpropbackend.cpp:68
+#: rlpr/kmwrlpr.cpp:116
+msgid "Remote LPD queue"
+msgstr "远程 LPD 队列"
+
+#: management/kmpropbackend.cpp:69
+msgid "File printer"
+msgstr "文件打印机"
+
+#: management/kmpropbackend.cpp:70
+msgid "Serial Fax/Modem printer"
+msgstr "串行传真/调制解调器打印机"
+
+#: management/kmpropbackend.cpp:71
+msgid ""
+"_: Unknown Protocol\n"
+"Unknown"
+msgstr "未知"
+
+#: management/kmconfigdialog.cpp:38
+msgid "TDE Print Configuration"
+msgstr "TDE 打印配置"
+
+#: management/kmpropdriver.cpp:36
+msgid "Manufacturer:"
+msgstr "制造商："
+
+#: management/kmpropdriver.cpp:37
+msgid "Printer model:"
+msgstr "打印机型号："
+
+#: management/kmpropdriver.cpp:38
+msgid "Driver info:"
+msgstr "驱动程序信息："
+
+#: lpd/lpdtools.cpp:239 management/kmpropdriver.cpp:53
+#: management/kmwend.cpp:104
+msgid "Driver"
+msgstr "驱动程序"
+
+#: management/kmwsocket.cpp:38
+msgid "Network Printer Information"
+msgstr "网络打印机信息"
+
+#: management/kmwsocket.cpp:48
+msgid "&Printer address:"
+msgstr "打印机地址(&P)："
+
+#: management/kmwsocket.cpp:49
+msgid "P&ort:"
+msgstr "端口(&O)："
+
+#: management/kmwsocket.cpp:99
+msgid "You must enter a printer address."
+msgstr "您必须输入打印机地址。"
+
+#: management/kmwsocket.cpp:110
+msgid "Wrong port number."
+msgstr "错误的端口号。"
+
+#: management/kmwizard.cpp:64 management/kmwizard.cpp:209
+msgid "&Next >"
+msgstr "下一步(&N) >"
+
+#: management/kmwizard.cpp:66
+msgid "< &Back"
+msgstr "< 上一步(&B)"
+
+#: management/kmwizard.cpp:131 management/kmwizard.cpp:166
+#: management/kmwizard.cpp:191
+msgid "Add Printer Wizard"
+msgstr "添加打印机向导"
+
+#: management/kmwizard.cpp:166
+msgid "Modify Printer"
+msgstr "修改打印机"
+
+#: management/kmwizard.cpp:191
+msgid "Unable to find the requested page."
+msgstr "找不到请求的页面。"
+
+#: management/kmwizard.cpp:207 management/kmwizard.cpp:234
+msgid "&Finish"
+msgstr "完成(&F)"
+
+#: management/kmwinfopage.cpp:32
+msgid "Introduction"
+msgstr "介绍"
+
+#: management/kmwinfopage.cpp:37
+#, fuzzy
+msgid ""
+"<p>Welcome,</p>"
+"<br>"
+"<p>This wizard will help to install a new printer on your computer. It will "
+"guide you through the various steps of the process of installing and "
+"configuring a printer for your printing system. At each step, you can always go "
+"back using the <b>Back</b> button.</p>"
+"<br>"
+"<p>We hope you enjoy this tool!</p>"
+"<br>"
+msgstr ""
+"<p>欢迎，</p>"
+"<br>"
+"<p>本向导将帮助您在计算机上安装新的打印机。它将指导您通过安装的多个步骤，并为您的打印系统配置一台打印机。在每一步骤里，您都可以使用<b>后退</b>"
+"按钮来退回到前面的步骤。</p>"
+"<br>"
+"<p>我们希望您能喜欢这个工具！</p>"
+"<br><p align=right><i>TDE打印系统小组</i>。</p>"
+
+#: management/kmconfigjobs.cpp:33 management/kmpages.cpp:59
+msgid "Jobs"
+msgstr "作业"
+
+#: management/kmconfigjobs.cpp:37
+msgid "Jobs Shown"
+msgstr "显示的作业"
+
+#: management/kmconfigjobs.cpp:42
+msgid "Maximum number of jobs shown:"
+msgstr "显示作业的最大数量："
 
 #: management/kxmlcommanddlg.cpp:108
 msgid "Integer"
@@ -3625,6 +3798,11 @@ msgstr "最小值(&A)："
 msgid "Ma&ximum value:"
 msgstr "最大值(&X)："
 
+#: management/kmwend.cpp:53 management/kmwend.cpp:112
+#: management/kxmlcommanddlg.cpp:142 management/kxmlcommanddlg.cpp:545
+msgid "Description"
+msgstr "描述"
+
 #: management/kxmlcommanddlg.cpp:150
 msgid "Add value"
 msgstr "添加值"
@@ -3649,11 +3827,11 @@ msgstr "添加选项"
 msgid "Delete item"
 msgstr "删除项"
 
-#: tdefilelist.cpp:135 management/kxmlcommanddlg.cpp:157
+#: management/kxmlcommanddlg.cpp:157 tdefilelist.cpp:135
 msgid "Move up"
 msgstr "上移"
 
-#: tdefilelist.cpp:142 management/kxmlcommanddlg.cpp:158
+#: management/kxmlcommanddlg.cpp:158 tdefilelist.cpp:142
 msgid "Move down"
 msgstr "下移"
 
@@ -3818,341 +3996,59 @@ msgstr "ID 名称："
 msgid "exec:/"
 msgstr "exec:/"
 
-#: management/kmwlpd.cpp:41
-msgid "LPD Queue Information"
-msgstr "LPD 队列信息"
-
-#: management/kmwlpd.cpp:44
-msgid ""
-"<p>Enter the information concerning the remote LPD queue; this wizard will "
-"check it before continuing.</p>"
-msgstr "<p>输入远程 LPD 队列的相关信息；该向导将在继续前检查这些信息。</p>"
-
-#: management/kmwlpd.cpp:54
-msgid "Some information is missing."
-msgstr "缺少某些信息。"
-
-#: management/kmwlpd.cpp:61
-msgid "Cannot find queue %1 on server %2; do you want to continue anyway?"
-msgstr "在服务器 %2 上找不到队列 %1；您要继续吗？"
-
-#: management/kmconfigfilter.cpp:40
-msgid "Filter"
-msgstr "过滤器"
-
-#: management/kmconfigfilter.cpp:41
-msgid "Printer Filtering Settings"
-msgstr "打印机过滤设置"
-
-#: management/kmconfigfilter.cpp:44
-msgid "Printer Filter"
-msgstr "打印机过滤器"
-
-#: management/kmconfigfilter.cpp:56
-msgid ""
-"The printer filtering allows you to view only a specific set of printers "
-"instead of all of them. This may be useful when there are a lot of printers "
-"available but you only use a few ones. Select the printers you want to see from "
-"the list on the left or enter a <b>Location</b> filter (ex: Group_1*). Both are "
-"cumulative and ignored if empty."
-msgstr ""
-"打印机过滤允许您查看部分的打印机而不是全部。在有很多打印机而您仅使用其中的几个时很有用。从左边的列表中选择您希望看到的打印机，或者输入一个<b>位置</b>"
-"过滤器(例如：Group_1*)。两者皆为累积，如果是空的则被忽略。"
-
-#: management/kmconfigfilter.cpp:62
-msgid "Location filter:"
-msgstr "位置过滤器："
-
-#: management/kmwdriverselect.cpp:37
-msgid "Driver Selection"
-msgstr "驱动程序选择"
-
-#: management/kmwdriverselect.cpp:43
-msgid ""
-"<p>Several drivers have been detected for this model. Select the driver you "
-"want to use. You will have the opportunity to test it as well as to change it "
-"if necessary.</p>"
-msgstr "<p>已检测到用于该型号的某些驱动程序。选择您要使用的驱动程序。您有机会测试它，如果需要的话也可以改变它。</p>"
-
-#: management/kmwdriverselect.cpp:46
-msgid "Driver Information"
-msgstr "驱动程序信息"
-
-#: management/kmwdriverselect.cpp:62
-msgid "You must select a driver."
-msgstr "您必须选择一个驱动程序。"
-
-#: management/kmwdriverselect.cpp:82
-msgid " [recommended]"
-msgstr " [推荐]"
-
-#: management/kmwdriverselect.cpp:113
-msgid "No information about the selected driver."
-msgstr "没有关于选中驱动程序的信息。"
-
-#: management/kmwinfopage.cpp:32
-msgid "Introduction"
-msgstr "介绍"
-
-#: management/kmwinfopage.cpp:37
-msgid ""
-"<p>Welcome,</p>"
-"<br>"
-"<p>This wizard will help to install a new printer on your computer. It will "
-"guide you through the various steps of the process of installing and "
-"configuring a printer for your printing system. At each step, you can always go "
-"back using the <b>Back</b> button.</p>"
-"<br>"
-"<p>We hope you'll enjoy this tool!</p>"
-"<br><p align=right><i>The TDE printing team</i>.</p>"
-msgstr ""
-"<p>欢迎，</p>"
-"<br>"
-"<p>本向导将帮助您在计算机上安装新的打印机。它将指导您通过安装的多个步骤，并为您的打印系统配置一台打印机。在每一步骤里，您都可以使用<b>后退</b>"
-"按钮来退回到前面的步骤。</p>"
-"<br>"
-"<p>我们希望您能喜欢这个工具！</p>"
-"<br><p align=right><i>TDE打印系统小组</i>。</p>"
-
-#: management/kmdriverdbwidget.cpp:51
-msgid "&PostScript printer"
-msgstr "PostScript 打印机(&P)"
-
-#: management/kmdriverdbwidget.cpp:52
-msgid "&Raw printer (no driver needed)"
-msgstr "原始打印机(不需要驱动程序)(&R)"
-
-#: management/kmdriverdbwidget.cpp:55
-msgid "&Other..."
-msgstr "其它(&O)..."
-
-#: management/kmdriverdbwidget.cpp:56
-msgid "&Manufacturer:"
-msgstr "制造商(&M)："
-
-#: management/kmdriverdbwidget.cpp:57
-msgid "Mo&del:"
-msgstr "型号(&D)："
-
-#: management/kmdriverdbwidget.cpp:157 management/kmdriverdbwidget.cpp:166
-msgid "Loading..."
-msgstr "正在载入..."
-
-#: management/kmdriverdbwidget.cpp:217
-msgid "Unable to find the PostScript driver."
-msgstr "找不到 PostScript 驱动程序。"
-
-#: management/kmdriverdbwidget.cpp:230
-msgid "Select Driver"
-msgstr "选择驱动程序"
-
-#: management/kmdriverdbwidget.cpp:247 management/kmdriverdbwidget.cpp:249
-msgid "<Unknown>"
-msgstr "<未知>"
-
-#: management/kmdriverdbwidget.cpp:252
-msgid "Database"
-msgstr "数据库"
-
-#: management/kmdriverdbwidget.cpp:259
-msgid "Wrong driver format."
-msgstr "驱动程序格式不正确。"
-
-#: management/kmdriverdbwidget.cpp:268
-msgid "Other"
-msgstr "其它"
-
-#: management/kxmlcommandselector.cpp:54
-msgid "New command"
-msgstr "新建命令"
-
-#: management/kxmlcommandselector.cpp:55
-msgid "Edit command"
-msgstr "编辑命令"
-
-#: management/kxmlcommandselector.cpp:72
-msgid "&Browse..."
-msgstr "浏览(&B)..."
-
-#: management/kxmlcommandselector.cpp:73
-msgid "Use co&mmand:"
-msgstr "使用命令(&M)："
-
-#: management/kxmlcommandselector.cpp:174
-msgid "Command Name"
-msgstr "命令名"
-
-#: management/kxmlcommandselector.cpp:174
-msgid "Enter an identification name for the new command:"
-msgstr "输入新建命令的标识名称："
-
-#: management/kxmlcommandselector.cpp:183
-msgid ""
-"A command named %1 already exists. Do you want to continue and edit the "
-"existing one?"
-msgstr "名为 %1 的命令已经存在。您要继续并编辑已存在的命令吗？"
-
-#: management/kxmlcommandselector.cpp:220
-msgid "Internal error. The XML driver for the command %1 could not be found."
-msgstr "内部错误。找不到命令 %1 的 XML 驱动程序。"
-
-#: management/kxmlcommandselector.cpp:238
-msgid "output"
-msgstr "输出"
-
-#: management/kxmlcommandselector.cpp:242
-msgid "undefined"
-msgstr "未定义"
-
-#: management/kxmlcommandselector.cpp:247
-msgid "not allowed"
-msgstr "不允许"
-
-#: management/kxmlcommandselector.cpp:253
-msgid "(Unavailable: requirements not satisfied)"
-msgstr "(不可用：请求未满足)"
-
-#: management/kmlistview.cpp:125
-msgid "Print System"
-msgstr "打印系统"
-
-#: management/kmlistview.cpp:128
-msgid "Classes"
-msgstr "类"
-
-#: management/kmlistview.cpp:131
-msgid "Printers"
-msgstr "打印机"
-
-#: management/kmlistview.cpp:134
-msgid "Specials"
-msgstr "特殊文件"
-
-#: management/kmpropdriver.cpp:36
-msgid "Manufacturer:"
-msgstr "制造商："
-
-#: management/kmpropdriver.cpp:37
-msgid "Printer model:"
-msgstr "打印机型号："
-
-#: management/kmpropdriver.cpp:38
-msgid "Driver info:"
-msgstr "驱动程序信息："
-
-#: kpdriverpage.cpp:30 management/kmpropdriver.cpp:54
-msgid "Driver Settings"
-msgstr "驱动程序设置"
-
-#: management/kmconfigjobs.cpp:33 management/kmpages.cpp:59
-msgid "Jobs"
-msgstr "作业"
-
-#: management/kmconfigjobs.cpp:37
-msgid "Jobs Shown"
-msgstr "显示的作业"
-
-#: management/kmconfigjobs.cpp:42
-msgid "Maximum number of jobs shown:"
-msgstr "显示作业的最大数量："
-
-#: management/kmwname.cpp:34
-msgid "General Information"
-msgstr "常规信息"
-
-#: management/kmwname.cpp:37
-msgid ""
-"<p>Enter the information concerning your printer or class. <b>Name</b> "
-"is mandatory, <b>Location</b> and <b>Description</b> "
-"are not (they may even not be used on some systems).</p>"
-msgstr ""
-"<p>输入关于您的打印机或类的信息。<b>名称</b>是必需的，而<b>位置</b>和<b>描述</b>则不是(在某些系统上甚至不用它们)。</p>"
-
-#: management/kmwname.cpp:39
-msgid "Name:"
-msgstr "名称："
-
-#: management/kmwname.cpp:48
-msgid "You must supply at least a name."
-msgstr "您必须至少提供一个名称。"
-
-#: management/kmwname.cpp:56
-msgid ""
-"It is usually not a good idea to include spaces in printer name: it may prevent "
-"your printer from working correctly. The wizard can strip all spaces from the "
-"string you entered, resulting in %1; what do you want to do?"
-msgstr ""
-"在打印机名称中包含空格通常不是一个好主意：这可能会导致您的打印机无法正确运行。该向导会从您输入的字符串中剥离所有的空格，其结果为 %1；您想怎么办？"
-
-#: management/kmwname.cpp:62
-msgid "Strip"
-msgstr "剥离"
+#: driver.cpp:377 kpgeneralpage.cpp:261 lpd/lpdtools.cpp:307
+#: management/kmconfiggeneral.cpp:44 management/kmpropgeneral.cpp:54
+#: management/kmwend.cpp:49
+msgid "General"
+msgstr "常规"
 
-#: kprinterimpl.cpp:510 management/kmwname.cpp:62
-msgid "Keep"
-msgstr "保留"
+#: management/kmconfiggeneral.cpp:45 management/kmpropgeneral.cpp:55
+msgid "General Settings"
+msgstr "常规设置"
 
-#: management/kmwbackend.cpp:54
-msgid "Backend Selection"
-msgstr "后端选择"
+#: management/kmconfiggeneral.cpp:48
+msgid "Refresh Interval"
+msgstr "刷新间隔"
 
-#: management/kmwbackend.cpp:68
-msgid "You must select a backend."
-msgstr "您必须选择一个后端。"
+#: management/kmconfiggeneral.cpp:51
+msgid " sec"
+msgstr " 秒"
 
-#: management/kmwbackend.cpp:115
-msgid "&Local printer (parallel, serial, USB)"
-msgstr "本地打印机(并口、串口和 USB )(&L)"
+#: kpgeneralpage.cpp:416 lpd/lpdtools.cpp:40 management/kmconfiggeneral.cpp:52
+msgid "Disabled"
+msgstr "已禁用"
 
-#: management/kmwbackend.cpp:116
+#: management/kmconfiggeneral.cpp:53
 msgid ""
-"<qt>"
-"<p>Locally-connected printer</p>"
-"<p>Use this for a printer connected to the computer via a parallel, serial or "
-"USB port.</p></qt>"
-msgstr "<qt><p>本地连接的打印机</p><p>适合通过并口、串口或 USB 端口连接到计算机的打印机。</p></qt>"
+"This time setting controls the refresh rate of various <b>TDE Print</b> "
+"components like the print manager and the job viewer."
+msgstr "该时间设置控制各种<b>TDE打印</b>部件的刷新率，例如打印管理器和作业查看器。"
 
-#: management/kmwbackend.cpp:122
-msgid "&SMB shared printer (Windows)"
-msgstr "SMB 共享打印机(Windows)(&S)"
+#: management/kmconfiggeneral.cpp:57
+msgid "Test Page"
+msgstr "测试页"
 
-#: management/kmwbackend.cpp:123
-msgid ""
-"<qt>"
-"<p>Shared Windows printer</p>"
-"<p>Use this for a printer installed on a Windows server and shared on the "
-"network using the SMB protocol (samba).</p></qt>"
-msgstr ""
-"<qt>"
-"<p>共享的 Windows 打印机</p>"
-"<p>适合安装在 Windows 服务器并使用 SMB 协议(samba)共享的打印机。</p></qt>"
+#: management/kmconfiggeneral.cpp:58
+msgid "&Specify personal test page"
+msgstr "指定个人的测试页(&S)"
 
-#: management/kmwbackend.cpp:130
-msgid "&Remote LPD queue"
-msgstr "远程 LPD 队列(&R)"
+#: management/kmconfiggeneral.cpp:60
+msgid "Preview..."
+msgstr "预览..."
 
-#: management/kmwbackend.cpp:131
-msgid ""
-"<qt>"
-"<p>Print queue on a remote LPD server</p>"
-"<p>Use this for a print queue existing on a remote machine running a LPD print "
-"server.</p></qt>"
-msgstr "<qt><p>远程 LPD 服务器上的打印队列</p><p>适合运行着 LPD 打印服务器的远程计算机上打印队列。</p></qt>"
+#: management/kmconfiggeneral.cpp:70
+msgid "Sho&w printing status message box"
+msgstr "显示打印状态信息框(&W)"
 
-#: management/kmwbackend.cpp:137
-msgid "Ne&twork printer (TCP)"
-msgstr "网络打印机(&TCP)"
+#: management/kmconfiggeneral.cpp:71
+msgid "De&faults to the last printer used in the application"
+msgstr "默认为该应用程序中使用的最后一个打印机(&F)"
 
-#: management/kmwbackend.cpp:138
+#: management/kmconfiggeneral.cpp:127
 msgid ""
-"<qt>"
-"<p>Network TCP printer</p>"
-"<p>Use this for a network-enabled printer using TCP (usually on port 9100) as "
-"communication protocol. Most network printers can use this mode.</p></qt>"
-msgstr ""
-"<qt>"
-"<p>网络 TCP 打印机</p>"
-"<p>适合使用 TCP(通常是端口 9100)作为通讯协议的网络打印机。大多数网络打印机都支持此模式。</p></qt>"
+"The selected test page is not a PostScript file. You may not be able to test "
+"your printer anymore."
+msgstr "所选中的测试页不是 PostScript 文件。您可能无法测试您的打印机。"
 
 #: management/kminstancepage.cpp:61
 msgid ""
@@ -4241,9 +4137,174 @@ msgstr "内部错误：没有找到打印机。"
 msgid "Unable to send test page to %1."
 msgstr "无法把测试页发送到 %1。"
 
-#: management/kmpages.cpp:69
-msgid "Instances"
-msgstr "实例"
+#: management/kmdriverdialog.cpp:48
+msgid ""
+"Some options are in conflict. You must resolve those conflicts before "
+"continuing."
+msgstr "某些选项产生了冲突。您必须先解决冲突才能继续。"
+
+#: management/kmlistview.cpp:125
+msgid "Print System"
+msgstr "打印系统"
+
+#: management/kmlistview.cpp:128
+msgid "Classes"
+msgstr "类"
+
+#: management/kmlistview.cpp:131
+msgid "Printers"
+msgstr "打印机"
+
+#: management/kmlistview.cpp:134
+msgid "Specials"
+msgstr "特殊文件"
+
+#: management/kmwlocal.cpp:38
+msgid "Local Port Selection"
+msgstr "本地端口选择"
+
+#: management/kmwlocal.cpp:50
+msgid "Local System"
+msgstr "本地系统"
+
+#: management/kmwlocal.cpp:57
+msgid "Parallel"
+msgstr "并口"
+
+#: management/kmwlocal.cpp:58
+msgid "Serial"
+msgstr "串口"
+
+#: management/kmwlocal.cpp:59
+msgid "USB"
+msgstr "USB"
+
+#: driver.cpp:389 management/kmwlocal.cpp:60
+msgid "Others"
+msgstr "其它"
+
+#: management/kmwlocal.cpp:63
+msgid ""
+"<p>Select a valid detected port, or enter directly the corresponding URI in the "
+"bottom edit field.</p>"
+msgstr "<p>选择一个有效的检测到的端口，或者直接在下面的编辑区域里输入相应的 URI。</p>"
+
+#: management/kmwlocal.cpp:78
+msgid ""
+"_: The URI is empty\n"
+"Empty URI."
+msgstr "空 URI。"
+
+#: management/kmwlocal.cpp:83
+msgid "The local URI doesn't correspond to a detected port. Continue?"
+msgstr "本地 URL 没有对应于一个检测到的端口。继续吗？"
+
+#: management/kmwlocal.cpp:85
+msgid "Select a valid port."
+msgstr "选择一个有效的端口。"
+
+#: management/kmwlocal.cpp:166
+msgid "Unable to detect local ports."
+msgstr "无法检测本地端口。"
+
+#: management/kmwlpd.cpp:41
+msgid "LPD Queue Information"
+msgstr "LPD 队列信息"
+
+#: management/kmwlpd.cpp:44
+msgid ""
+"<p>Enter the information concerning the remote LPD queue; this wizard will "
+"check it before continuing.</p>"
+msgstr "<p>输入远程 LPD 队列的相关信息；该向导将在继续前检查这些信息。</p>"
+
+#: management/kmwlpd.cpp:47 rlpr/kmproprlpr.cpp:35 rlpr/kmwrlpr.cpp:63
+msgid "Queue:"
+msgstr "队列："
+
+#: management/kmwlpd.cpp:54
+msgid "Some information is missing."
+msgstr "缺少某些信息。"
+
+#: management/kmwlpd.cpp:61
+msgid "Cannot find queue %1 on server %2; do you want to continue anyway?"
+msgstr "在服务器 %2 上找不到队列 %1；您要继续吗？"
+
+#: management/kmconfigfilter.cpp:40
+msgid "Filter"
+msgstr "过滤器"
+
+#: management/kmconfigfilter.cpp:41
+msgid "Printer Filtering Settings"
+msgstr "打印机过滤设置"
+
+#: management/kmconfigfilter.cpp:44
+msgid "Printer Filter"
+msgstr "打印机过滤器"
+
+#: management/kmconfigfilter.cpp:56
+msgid ""
+"The printer filtering allows you to view only a specific set of printers "
+"instead of all of them. This may be useful when there are a lot of printers "
+"available but you only use a few ones. Select the printers you want to see from "
+"the list on the left or enter a <b>Location</b> filter (ex: Group_1*). Both are "
+"cumulative and ignored if empty."
+msgstr ""
+"打印机过滤允许您查看部分的打印机而不是全部。在有很多打印机而您仅使用其中的几个时很有用。从左边的列表中选择您希望看到的打印机，或者输入一个<b>位置</b>"
+"过滤器(例如：Group_1*)。两者皆为累积，如果是空的则被忽略。"
+
+#: management/kmconfigfilter.cpp:62
+msgid "Location filter:"
+msgstr "位置过滤器："
+
+#: management/kmconfigfonts.cpp:43
+msgid "Font Settings"
+msgstr "字体设置"
+
+#: management/kmconfigfonts.cpp:46
+msgid "Fonts Embedding"
+msgstr "字体嵌入"
+
+#: management/kmconfigfonts.cpp:47
+msgid "Fonts Path"
+msgstr "字体路径"
+
+#: management/kmconfigfonts.cpp:49
+msgid "&Embed fonts in PostScript data when printing"
+msgstr "打印时在 PostScript 数据中嵌入字体(&E)"
+
+#: management/kmconfigfonts.cpp:57
+msgid "&Up"
+msgstr "上移(&U)"
+
+#: management/kmconfigfonts.cpp:58
+msgid "&Down"
+msgstr "下移(&D)"
+
+#: management/kmconfigfonts.cpp:59
+msgid "&Add"
+msgstr "添加(&A)"
+
+#: management/kmconfigfonts.cpp:61
+msgid "Additional director&y:"
+msgstr "额外目录(&Y)："
+
+#: management/kmconfigfonts.cpp:85
+msgid ""
+"These options will automatically put fonts in the PostScript file which are not "
+"present on the printer. Font embedding usually produces better print results "
+"(closer to what you see on the screen), but larger print data as well."
+msgstr ""
+"这些选项会自动把打印机中没有的字体放入 PostScript 文件。字体嵌入通常会生成较佳的打印结果(近似于您在屏幕中所见)，但是其所用打印数据也较大。"
+
+#: management/kmconfigfonts.cpp:89
+msgid ""
+"When using font embedding you can select additional directories where TDE "
+"should search for embeddable font files. By default, the X server font path is "
+"used, so adding those directories is not needed. The default search path should "
+"be sufficient in most cases."
+msgstr ""
+"在使用字体嵌入时，您可以选择 TDE 应在其中搜索可嵌入字体文件的额外目录。默认情况下，TDE 使用 X "
+"服务器字体路径，因此您不必添加这些目录。多数情况下，默认搜索路径应足以满足需要。"
 
 #: management/kmspecialprinterdlg.cpp:46
 msgid "Add Special Printer"
@@ -4322,482 +4383,193 @@ msgstr "无效的设置。%1。"
 msgid "Configuring %1"
 msgstr "正在配置 %1"
 
-#: tdefilelist.cpp:42
-msgid ""
-" <qt> <b>Add File button</b> "
-"<p>This button calls the <em>'File Open'</em> dialog to let you select a file "
-"for printing. Note, that  "
-"<ul>"
-"<li>you can select ASCII or International Text, PDF, PostScript, JPEG, TIFF, "
-"PNG, GIF and many other graphic formats. "
-"<li>you can select various files from different paths and send them as one "
-"\"multi-file job\" to the printing system. </ul> </qt>"
-msgstr ""
-"<qt><b>添加文件按钮</b>此按钮将调用“打开文件”对话框，您可从中选择进行打印的文件。请注意，"
-"<ul>"
-"<li>您可以选择 ASCII 或国际文本、PDF、PostScript、JPEG、TIFF、PNG、GIF 及许多其它图形格式。"
-"<li>您可以从不同的路径中选择各种文件，并将它们作为“多文件任务”一同发送给打印系统。</ul></qt>"
-
-#: tdefilelist.cpp:54
-msgid ""
-" <qt> <b>Remove File button</b> "
-"<p>This button removes the highlighted file from the list of to-be-printed "
-"files. </qt>"
-msgstr "<qt><b>删除文件按钮</b>此按钮将从要打印的文件列表中删除突出显示的文件。</qt>"
-
-#: tdefilelist.cpp:59
-msgid ""
-" <qt> <b>Move File Up button</b> "
-"<p>This button moves the highlighted file up in the list of files to be "
-"printed.</p> "
-"<p>In effect, this changes the order of the files' printout.</p> </qt>"
-msgstr ""
-"<qt><b>上移文件按钮</b>"
-"<p>此按钮将把待打印文件列表中突出显示的文件向上移动。</p>"
-"<p>实际上，这会更改文件打印的顺序。</p></qt>"
-
-#: tdefilelist.cpp:66
-msgid ""
-" <qt> <b>Move File Down button</b> "
-"<p>This button moves the highlighted file down in the list of files to be "
-"printed.</p> "
-"<p>In effect, this changes the order of the files' printout.</p> </qt>"
-msgstr ""
-"<qt><b>下移文件按钮</b>"
-"<p>此按钮将把待打印文件列表中突出显示的文件向下移动。</p>"
-"<p>实际上，这会更改文件打印的顺序。</p></qt>"
-
-#: tdefilelist.cpp:73
-msgid ""
-" <qt> <b>File Open button</b> "
-"<p>This button tries to open the highlighted file, so you can view or edit it "
-"before you send it to the printing system.</p> "
-"<p>If you open files, TDEPrint will use the application matching the MIME type "
-"of the file.</p> </qt>"
-msgstr ""
-"<qt><b>打开文件按钮</b>"
-"<p>此按钮将试图打开突出显示的文件，这样您就可以在将其发送给打印系统前先查看或编辑该文件。</p>"
-"<p>如果您打开文件，TDEPrint 将会使用匹配文件 MIME 类型的应用程序。</qt>"
-
-#: tdefilelist.cpp:82
-msgid ""
-" <qt> <b>File List view</b> "
-"<p>This list displays all the files you selected for printing. You can see the "
-"file name(s), file path(s) and the file (MIME) type(s) as determined by "
-"TDEPrint. You may re-arrange the  initial order of the list  with the help of "
-"the arrow buttons on the right.</p> "
-"<p>The files will be printed as a single job, in the same order as displayed in "
-"the list.</p> "
-"<p><b>Note:</b> You can select multiple files. The files may be in multiple "
-"locations. The files may be of multiple MIME types. The buttons on the right "
-"side let you add more files, remove already selected files from the list,  "
-"re-order the list (by moving files up or down), and open files. If you open "
-"files, TDEPrint will use the application matching the MIME type of the file.</p> "
-"</qt>"
-msgstr ""
-"<qt><b>文件列表视图</b>"
-"<p>此列表显示了您要打印的全部文件。您可以看到文件名、文件路经和 TDEPrint "
-"决定的文件(MIME)类型。此列表的最初顺序与您最初的选择顺序相同。</p>"
-"<p>此列表最终将按照显示的顺序进行打印。</p>"
-"<p><b>注意：</b>您可以选择多个文件。文件也可以在多个位置。文件的 MIME "
-"类型也可以不同。右侧的按钮可让您添加更多的文件，从列表中删除选中的文件，更改列表的顺序(将文件上下移动)，以及打开文件。如果您想要打开文件，TDEPrint "
-"将会使用匹配文件 MIME 类型的应用程序。</p></qt>"
-
-#: tdefilelist.cpp:103
-msgid "Path"
-msgstr "路径"
-
-#: tdefilelist.cpp:115
-msgid "Add file"
-msgstr "添加文件"
-
-#: tdefilelist.cpp:121
-msgid "Remove file"
-msgstr "删除文件"
-
-#: tdefilelist.cpp:128
-msgid "Open file"
-msgstr "打开文件"
-
-#: tdefilelist.cpp:149
-msgid ""
-"Drag file(s) here or use the button to open a file dialog. Leave empty for <b>"
-"&lt;STDIN&gt;</b>."
-msgstr "将文件拖放到这里，或者用按钮打开一个文件对话框。将<b>&lt;STDIN&gt;</b>留为空值。"
-
-#: driver.cpp:385 foomatic2loader.cpp:268
-msgid "Adjustments"
-msgstr "调整"
-
-#: plugincombobox.cpp:33
-msgid ""
-" <qt><b>Print Subsystem Selection</b> "
-"<p>This combo box shows (and lets you select) a print subsystem to be used by "
-"TDEPrint. (This print subsystem must, of course, be installed inside your "
-"Operating System.) TDEPrint usually auto-detects the correct print subsystem by "
-"itself upon first startup. Most Linux distributions have \"CUPS\", the <em>"
-"Common UNIX Printing System</em>. </qt>"
-msgstr ""
-"<qt><b>打印子系统选择</b>此组合框显示(您也可以选择) TDEPrint "
-"要使用的打印子系统。(当然，此打印子系统必须已经安装在您的操作系统中。)TDEPrint 通常能够自动进行检测。大多数 Linux "
-"发行版都有“CUPS”，即<em>公共 Unix 打印系统</em>。</qt>"
-
-#: plugincombobox.cpp:45
-msgid "Print s&ystem currently used:"
-msgstr "目前使用的打印系统(&Y)："
+#: management/smbview.cpp:44
+msgid "Comment"
+msgstr "备注"
 
-#: plugincombobox.cpp:91
-msgid ""
-" <qt><b>Current Connection</b> "
-"<p>This line shows which CUPS server your PC is currently connected to for "
-"printing and retrieving printer info. To switch to a different CUPS server, "
-"click \"System Options\", then select \"Cups server\" and fill in the required "
-"info. </qt>"
-msgstr ""
-"<qt><b>当前连接</b>本行显示了您的电脑连接并获取打印机信息的 CUPS 服务器。要切换到不同的 CUPS "
-"服务器，请点击“系统选项”，然后选择“CUPS 服务器”并填入必需的信息。</qt>"
+#: management/kmwend.cpp:33
+msgid "Confirmation"
+msgstr "确认"
 
-#: driverview.cpp:47
-msgid ""
-" <qt>  <b>List of Driver Options (from PPD)</b>.  "
-"<p>The upper pane of this dialog page contains all printjob options as laid  "
-"down in the printer's description file (PostScript Printer Description == "
-"'PPD') </p> "
-"<p>Click on any item in the list and watch the lower pane of this dialog page  "
-"display the available values. </p>  "
-"<p>Set the values as needed. Then use one of the pushbuttons below to "
-"proceed:</p>  "
-"<ul>  "
-"<li><em>'Save'</em> your settings if you want to re-use  them in your next "
-"job(s) too. <em>'Save'</em> will store your settings permanently until  you "
-"change them again. </li>. "
-"<li>Click <em>'OK'</em> (without a prior click on <em>'Save'</em>"
-", if you want to use  your selected settings just once, for the next print job. "
-"<em>'OK'</em>  will forget your current settings when kprinter is closed again, "
-"and will start next time  with the previously saved defaults. </li> "
-"<li><em>'Cancel'</em> will not change anything. If you proceed to print after "
-"clicking  <em>'Cancel'</em>, the job will print with the default settings of "
-"this queue.  </ul> "
-"<p><b>Note.</b> The number of available job options depends strongly on the "
-"actual  driver used for your print queue. <em>'Raw'</em> "
-"queues do not have a driver or a   PPD. For raw queues this tab page is not "
-"loaded by TDEPrint, and thus is not present  in the kprinter dialog.</p>  </qt>"
-msgstr ""
+#: management/kmwend.cpp:50 management/kmwend.cpp:106
+#: management/kmwend.cpp:109 tdefilelist.cpp:102
+msgid "Type"
+msgstr "类型"
 
-#: driverview.cpp:71
-msgid ""
-" <qt>  <b>List of Possible Values for given Option (from PPD)</b>.  "
-"<p>The lower pane of this dialog page contains all possible values of the "
-"printoption  highlighted above, as laid  down in the printer's description file "
-"(PostScript Printer Description == 'PPD') </p> "
-"<p>Select the value you want and proceed. </p>  "
-"<p>Then use one of the pushbuttons below to leave this dialog:</p>  "
-"<ul>  "
-"<li><em>'Save'</em> your settings if you want to re-use  them in your next "
-"job(s) too. <em>'Save'</em> will store your settings permanently until  you "
-"change them again. </li>. "
-"<li>Click <em>'OK'</em> if you want to use your selected settings just once, "
-"for the  next print job. <em>'OK'</em>  will forget your current settings when "
-"kprinter is closed again, and will start next time  with your previous "
-"defaults. </li> "
-"<li><em>'Cancel'</em> will not change anything. If you proceed to print after "
-"clicking  <em>'Cancel'</em>, the job will print with the default settings of "
-"this queue.  </ul> "
-"<p><b>Note.</b> The number of available job options depends strongly on the "
-"actual  driver used for your print queue. <em>'Raw'</em> "
-"queues do not have a driver or a   PPD. For raw queues this tab page is not "
-"loaded by TDEPrint, and thus is not present  in the kprinter dialog.</p>  </qt>"
-msgstr ""
+#: management/kmwend.cpp:52
+msgid "Location"
+msgstr "位置"
 
-#: kprinter.cpp:280
-msgid "Initialization..."
-msgstr "初始化..."
+#: management/kmwend.cpp:69
+msgid "Backend"
+msgstr "后端"
 
-#: kprinter.cpp:283 kprinter.cpp:909
-#, c-format
-msgid "Generating print data: page %1"
-msgstr "正在生成打印数据：第 %1 页"
+#: management/kmwend.cpp:74
+msgid "Device"
+msgstr "设备"
 
-#: kprinter.cpp:429
-msgid "Previewing..."
-msgstr "预览..."
+#: management/kmwend.cpp:77
+msgid "Printer IP"
+msgstr "打印机 IP"
 
-#: tdeprintd.cpp:158 kprinter.cpp:690
-#, c-format
-msgid ""
-"<p><nobr>A print error occurred. Error message received from system:</nobr></p>"
-"<br>%1"
-msgstr "<p><nobr>出现打印错误。从系统接收到错误信息：</nobr></p><br>%1"
+#: management/kmwend.cpp:78 management/kmwend.cpp:89
+msgid "Port"
+msgstr "端口"
 
-#: foomatic/kfoomaticprinterimpl.cpp:51 lpdunix/klpdunixprinterimpl.cpp:72
-msgid ""
-"No valid print executable was found in your path. Check your installation."
-msgstr "在搜索路径中没有找到有效的打印程序。请检查您的安装。"
+#: management/kmwend.cpp:81 management/kmwend.cpp:88
+msgid "Host"
+msgstr "主机"
 
-#: foomatic/kmfoomaticmanager.cpp:70
-msgid "This is not a Foomatic printer"
-msgstr "这不是 Foomatic 打印机"
+#: management/kmwend.cpp:82 rlpr/kmproprlpr.cpp:48
+msgid "Queue"
+msgstr "队列"
 
-#: foomatic/kmfoomaticmanager.cpp:75
-msgid "Some printer information are missing"
-msgstr "缺少某些打印机信息"
+#: management/kmwend.cpp:91
+msgid "Account"
+msgstr "账户"
 
-#: kmmanager.cpp:70
-msgid "This operation is not implemented."
-msgstr "该操作未实现。"
+#: management/kmwend.cpp:96
+msgid "URI"
+msgstr "URI"
 
-#: kmmanager.cpp:169
-msgid "Unable to locate test page."
-msgstr "无法定位测试页。"
+#: management/kmwend.cpp:109
+msgid "DB driver"
+msgstr "DB 驱动程序"
 
-#: kmmanager.cpp:449
-msgid "Can't overwrite regular printer with special printer settings."
-msgstr "无法用特殊打印机的设置来覆盖常规打印机。"
+#: management/kmwend.cpp:109
+msgid "External driver"
+msgstr "外部驱动程序"
 
-#: kmmanager.cpp:478
-#, c-format
-msgid "Parallel Port #%1"
-msgstr "并行端口 #%1"
+#: management/kmwend.cpp:110
+msgid "Manufacturer"
+msgstr "制造商"
 
-#: kmmanager.cpp:486 kmmanager.cpp:502 kxmlcommand.cpp:661
-#, c-format
-msgid "Unable to load TDE print management library: %1"
-msgstr "无法载入 TDE 打印管理库：%1"
+#: management/kmwend.cpp:111
+msgid "Model"
+msgstr "型号"
 
-#: kmmanager.cpp:491 kxmlcommand.cpp:669
-msgid "Unable to find wizard object in management library."
-msgstr "在管理库中找不到向导对象。"
+#: management/kmwdriver.cpp:33
+msgid "Printer Model Selection"
+msgstr "打印机型号选择"
 
-#: kmmanager.cpp:507
-msgid "Unable to find options dialog in management library."
-msgstr "在管理库中找不到选项对话框。"
+#: management/kmwdriver.cpp:113
+msgid "Internal error: unable to locate the driver."
+msgstr "内部错误：无法定位驱动程序。"
 
-#: kmmanager.cpp:534
-msgid "No plugin information available"
-msgstr "没有可用插件信息"
+#: management/kmpropgeneral.cpp:37
+msgid "Printer name:"
+msgstr "打印机名："
 
-#: lpdunix/kmlpdunixmanager.cpp:210
-msgid "Description unavailable"
-msgstr "没有描述"
+#: management/kmwsmb.cpp:35
+msgid "SMB Printer Settings"
+msgstr "SMB 打印机设置"
 
-#: lpdunix/kmlpdunixmanager.cpp:220 lpdunix/kmlpdunixmanager.cpp:271
-#: lpdunix/kmlpdunixmanager.cpp:318 lpdunix/kmlpdunixmanager.cpp:380
-#, c-format
-msgid "Remote printer queue on %1"
-msgstr "在 %1 上的远程打印队列"
+#: management/kmwsmb.cpp:41
+msgid "Scan"
+msgstr "扫描"
 
-#: kmspecialmanager.cpp:53
-msgid ""
-"A file share/tdeprint/specials.desktop was found in your local TDE directory. "
-"This file probably comes from a previous TDE release and should be removed in "
-"order to manage global pseudo printers."
-msgstr ""
-"在你的本地 TDE 目录里发现了文件 share/tdeprint/specials.desktop。该文件可能是较早版本的 TDE "
-"使用的，应该被删除以管理全局的伪打印机。"
+#: management/kmwsmb.cpp:42
+msgid "Abort"
+msgstr "中止"
 
-#: kprinterimpl.cpp:156
-msgid "Cannot copy multiple files into one file."
-msgstr "无法将多个文件复制入一个文件。"
+#: management/kmwsmb.cpp:44
+msgid "Workgroup:"
+msgstr "工作组："
 
-#: kprinterimpl.cpp:165
-msgid "Cannot save print file to %1. Check that you have write access to it."
-msgstr "无法将打印文件保存到 %1。请检查您是否有写权限。"
+#: management/kmwsmb.cpp:45
+msgid "Server:"
+msgstr "服务器："
 
-#: kprinterimpl.cpp:233
-#, c-format
-msgid "Printing document: %1"
-msgstr "正在打印文档：%1"
+#: management/kmwsmb.cpp:81 rlpr/kmrlprmanager.cpp:45
+msgid "Empty printer name."
+msgstr "空打印机名。"
 
-#: kprinterimpl.cpp:251
+#: management/kmwsmb.cpp:99
 #, c-format
-msgid "Sending print data to printer: %1"
-msgstr "正在把打印数据发送到打印机：%1"
-
-#: kprinterimpl.cpp:279
-msgid "Unable to start child print process. "
-msgstr "无法启动打印子进程。"
-
-#: kprinterimpl.cpp:281
-msgid ""
-"The TDE print server (<b>tdeprintd</b>) could not be contacted. Check that this "
-"server is running."
-msgstr "无法联系 TDE 打印服务器(<b>tdeprintd</b>)。请检查服务器是否正在运行。"
-
-#: kprinterimpl.cpp:283
-msgid ""
-"_: 1 is the command that <files> is given to\n"
-"Check the command syntax:\n"
-"%1 <files>"
-msgstr ""
-"检查命令语法：\n"
-"%1 <files>"
-
-#: kprinterimpl.cpp:290
-msgid "No valid file was found for printing. Operation aborted."
-msgstr "没有找到要打印的有效文件。中止操作。"
-
-#: kprinterimpl.cpp:325
-msgid ""
-"<p>Unable to perform the requested page selection. The filter <b>psselect</b> "
-"cannot be inserted in the current filter chain. See <b>Filter</b> "
-"tab in the printer properties dialog for further information.</p>"
-msgstr ""
-"<p>无法执行请求的页面选择。过滤器<b>psselect</b>无法被插入当前的过滤器链。查看打印机属性对话框中的<b>过滤器</b>"
-"标签来获得更多信息。</p>"
-
-#: kprinterimpl.cpp:355
-msgid "<p>Could not load filter description for <b>%1</b>.</p>"
-msgstr "<p>无法装入 <b>%1</b> 的过滤器描述。</p>"
-
-#: kprinterimpl.cpp:371
-msgid ""
-"<p>Error while reading filter description for <b>%1</b>"
-". Empty command line received.</p>"
-msgstr "<p>读取<b>%1</b>的过滤描述时发生错误。接收到空命令行。</p>"
-
-#: kprinterimpl.cpp:385
-msgid ""
-"The MIME type %1 is not supported as input of the filter chain (this may happen "
-"with non-CUPS spoolers when performing page selection on a non-PostScript "
-"file). Do you want TDE to convert the file to a supported format?</p>"
-msgstr ""
-"MIME 类型 %1 不能作为过滤器链的输入(当使用非 CUPS 假脱机程序对非 PostScript 文件进行页面选择时可能会发生)。你想让 TDE "
-"将它转换成被支持的格式吗？</p>"
-
-#: kprinterimpl.cpp:389 kprinterimpl.cpp:509
-msgid "Convert"
-msgstr "转换"
-
-#: kprinterimpl.cpp:399
-msgid "Select MIME Type"
-msgstr "选择 MIME 类型"
-
-#: kprinterimpl.cpp:400
-msgid "Select the target format for the conversion:"
-msgstr "选择转换的目标格式："
-
-#: kprinterimpl.cpp:404 kprinterimpl.cpp:430
-msgid "Operation aborted."
-msgstr "操作中止。"
-
-#: kprinterimpl.cpp:410
-msgid "No appropriate filter found. Select another target format."
-msgstr "没有找到合适的过滤器。请选择另外的目标格式。"
-
-#: kprinterimpl.cpp:423
-msgid ""
-"<qt>Operation failed with message:"
-"<br>%1"
-"<br>Select another target format.</qt>"
-msgstr "<qt>操作失败，信息是：<br>%1<br>请选择另外的目标格式。</qt>"
+msgid "Login: %1"
+msgstr "登录名：%1"
 
-#: kprinterimpl.cpp:441
-msgid "Filtering print data"
-msgstr "过滤打印数据"
+#: management/kmwsmb.cpp:99
+msgid "<anonymous>"
+msgstr "<匿名>"
 
-#: kprinterimpl.cpp:445
-msgid "Error while filtering. Command was: <b>%1</b>."
-msgstr "在过滤时发生错误。命令为：<b>%1</b>。"
+#: management/kmpages.cpp:69
+msgid "Instances"
+msgstr "实例"
 
-#: kprinterimpl.cpp:487
-msgid "<qt>The print file is empty and will be ignored:<p>%1</p></qt>"
-msgstr "<qt>打印文件为空，将被忽略：<p>%1</p></qt>"
+#: kpgeneralpage.cpp:86
+msgid "ISO A4"
+msgstr "ISO A4"
 
-#: kprinterimpl.cpp:497
-msgid ""
-"<qt>The file format <em> %1 </em> is not directly supported by the current "
-"print system. You now have 3 options: "
-"<ul> "
-"<li> TDE can attempt to convert this file automatically to a supported format. "
-"(Select <em>Convert</em>) </li>"
-"<li> You can try to send the file to the printer without any conversion. "
-"(Select <em>Keep</em>) </li>"
-"<li> You can cancel the printjob. (Select <em>Cancel</em>) </li></ul> "
-"Do you want TDE to attempt and convert this file to %2?</qt>"
-msgstr ""
-"<qt>打印系统不直接支持文件格式 <em>%1</em>。您有三个选项："
-"<ul> "
-"<li>TDE 可以试图将此文件自动转换为支持的格式。(选择<em>转换</em>)</li>"
-"<li>您可以试着将此文件发送给打印机，而不进行任何转换。(选择<em>保持</em>)</li>"
-"<li>您可以取消打印任务。(选择<em>取消</em>)</li></ul>您想要 TDE 尝试将此文件转换为 %2 吗？</qt>"
+#: kpgeneralpage.cpp:87 lpd/lpdtools.cpp:30
+msgid "US Letter"
+msgstr "US Letter"
 
-#: kprinterimpl.cpp:518
-msgid ""
-"<qt>No appropriate filter was found to convert the file format %1 into %2."
-"<br>"
-"<ul>"
-"<li>Go to <i>System Options -> Commands</i> to look through the list of "
-"possible filters. Each filter executes an external program.</li>"
-"<li> See if the required external program is available.on your system.</li></ul>"
-"</qt>"
-msgstr ""
-"<qt>没有找到可将文件格式 %1 转化为 %2 的适当过滤器。"
-"<br>"
-"<ul>"
-"<li>转到<i>系统选项->命令</i>可查看可用的过滤器。每个过滤器都执行了一个外部程序。</li>"
-"<li>请看您的系统上是否有可用的外部程序。</li></ul></qt>"
+#: kpgeneralpage.cpp:88 lpd/lpdtools.cpp:29
+msgid "US Legal"
+msgstr "US Legal"
 
-#: kpgeneralpage.cpp:85
-msgid "ISO A4"
-msgstr "ISO A4"
+#: kpgeneralpage.cpp:89 lpd/lpdtools.cpp:28
+msgid "Ledger"
+msgstr "Ledger"
 
-#: kpgeneralpage.cpp:89
+#: kpgeneralpage.cpp:90
 msgid "Folio"
 msgstr "Folio"
 
-#: kpgeneralpage.cpp:90
+#: kpgeneralpage.cpp:91
 msgid "US #10 Envelope"
 msgstr "US #10 Envelope"
 
-#: kpgeneralpage.cpp:91
+#: kpgeneralpage.cpp:92
 msgid "ISO DL Envelope"
 msgstr "ISO DL Envelope"
 
-#: kpgeneralpage.cpp:92
+#: kpgeneralpage.cpp:93
 msgid "Tabloid"
 msgstr "Tabloid"
 
-#: kpgeneralpage.cpp:93
+#: kpgeneralpage.cpp:94
 msgid "ISO A3"
 msgstr "ISO A3"
 
-#: kpgeneralpage.cpp:94
+#: kpgeneralpage.cpp:95
 msgid "ISO A2"
 msgstr "ISO A2"
 
-#: kpgeneralpage.cpp:95
+#: kpgeneralpage.cpp:96
 msgid "ISO A1"
 msgstr "ISO A1"
 
-#: kpgeneralpage.cpp:96
+#: kpgeneralpage.cpp:97
 msgid "ISO A0"
 msgstr "ISO A0"
 
-#: kpgeneralpage.cpp:106
+#: kpgeneralpage.cpp:107
 msgid "Upper Tray"
 msgstr "上托架"
 
-#: kpgeneralpage.cpp:107
+#: kpgeneralpage.cpp:108
 msgid "Lower Tray"
 msgstr "底托架"
 
-#: kpgeneralpage.cpp:108
+#: kpgeneralpage.cpp:109
 msgid "Multi-Purpose Tray"
 msgstr "多功能托架"
 
-#: kpgeneralpage.cpp:109
+#: kpgeneralpage.cpp:110
 msgid "Large Capacity Tray"
 msgstr "大容量托架"
 
-#: kpgeneralpage.cpp:113
+#: kpgeneralpage.cpp:114
 msgid "Normal"
 msgstr "普通"
 
-#: kpgeneralpage.cpp:114
+#: kpgeneralpage.cpp:115
 msgid "Transparency"
 msgstr "透明"
 
-#: kpgeneralpage.cpp:123
+#: kpgeneralpage.cpp:124
 msgid ""
 " <qt>  "
 "<p><b>\"General\"</b> </p>  "
@@ -4807,7 +4579,7 @@ msgid ""
 "of the  text labels or GUI elements of this dialog.  </qt>"
 msgstr ""
 
-#: kpgeneralpage.cpp:131
+#: kpgeneralpage.cpp:132
 msgid ""
 " <qt>  "
 "<p><b>Page size:</b> Select paper size to be printed on from  the drop-down "
@@ -4822,7 +4594,7 @@ msgid ""
 "</qt>"
 msgstr ""
 
-#: kpgeneralpage.cpp:144
+#: kpgeneralpage.cpp:145
 msgid ""
 " <qt>  "
 "<p><b>Paper type:</b> Select paper type to be printed on from  the drop-down "
@@ -4836,7 +4608,7 @@ msgid ""
 "<pre>    -o MediaType=...        # example: \"Transparency\"  </pre> </p>  </qt>"
 msgstr ""
 
-#: kpgeneralpage.cpp:157
+#: kpgeneralpage.cpp:158
 msgid ""
 " <qt>  "
 "<p><b>Paper source:</b> Select paper source tray for the paper to be printed on "
@@ -4851,7 +4623,7 @@ msgid ""
 "</pre> </p>  </qt>"
 msgstr ""
 
-#: kpgeneralpage.cpp:170
+#: kpgeneralpage.cpp:171
 msgid ""
 " <qt>  "
 "<p><b>Image Orientation:</b> Orientation of the printed  page image on your "
@@ -4873,7 +4645,7 @@ msgid ""
 "\"reverse-portrait\"  </pre> </p>  </qt>"
 msgstr ""
 
-#: kpgeneralpage.cpp:191
+#: kpgeneralpage.cpp:192
 msgid ""
 " <qt>  "
 "<p><b>Duplex Printing:</b> These controls may be grayed out if your printer  "
@@ -4899,7 +4671,7 @@ msgid ""
 " </pre> </p>  </qt>"
 msgstr ""
 
-#: kpgeneralpage.cpp:217
+#: kpgeneralpage.cpp:218
 msgid ""
 " <qt>  "
 "<p><b>Banner Page(s):</b> Select banner(s) to print one or two special sheets  "
@@ -4924,7 +4696,7 @@ msgid ""
 "</pre> </p>  </qt>"
 msgstr ""
 
-#: kpgeneralpage.cpp:239
+#: kpgeneralpage.cpp:240
 msgid ""
 " <qt>  "
 "<p><b>Pages per Sheet:</b>  You can choose to print more than one page onto "
@@ -4944,108 +4716,445 @@ msgid ""
 "<pre>    -o number-up=...        # examples: \"2\" or \"4\"  </pre> </p>  </qt>"
 msgstr ""
 
-#: kpgeneralpage.cpp:263 kpqtpage.cpp:118
+#: kpgeneralpage.cpp:264 kpqtpage.cpp:118
 msgid "Page s&ize:"
 msgstr "纸张大小(&I)："
 
-#: kpgeneralpage.cpp:267
+#: kpgeneralpage.cpp:268
 msgid "Paper t&ype:"
 msgstr "纸张类型(&Y)："
 
-#: kpgeneralpage.cpp:271
+#: kpgeneralpage.cpp:272
 msgid "Paper so&urce:"
 msgstr "纸张来源(&U)："
 
-#: kpgeneralpage.cpp:291
+#: kpgeneralpage.cpp:292
 msgid "Duplex Printing"
 msgstr "双面打印"
 
-#: kpgeneralpage.cpp:294 kpqtpage.cpp:143
+#: kpgeneralpage.cpp:295 kpqtpage.cpp:143
 msgid "Pages per Sheet"
 msgstr "每张纸上打印页数"
 
-#: kpgeneralpage.cpp:300 kpqtpage.cpp:125
+#: kpgeneralpage.cpp:301 kpqtpage.cpp:125
 msgid "&Portrait"
 msgstr "纵向(&P)"
 
-#: kpgeneralpage.cpp:301 kpqtpage.cpp:128
+#: kpgeneralpage.cpp:302 kpqtpage.cpp:128
 msgid "&Landscape"
 msgstr "横向(&L)"
 
-#: kpgeneralpage.cpp:302
+#: kpgeneralpage.cpp:303
 msgid "&Reverse landscape"
 msgstr "反转横向(&R)"
 
-#: kpgeneralpage.cpp:303
+#: kpgeneralpage.cpp:304
 msgid "R&everse portrait"
 msgstr "反转纵向(&E)"
 
-#: kpgeneralpage.cpp:308
+#: kpgeneralpage.cpp:309
 msgid ""
 "_: duplex orientation\n"
 "&None"
 msgstr "无(&N)"
 
-#: kpgeneralpage.cpp:309
+#: kpgeneralpage.cpp:310
 msgid ""
 "_: duplex orientation\n"
 "Lon&g side"
 msgstr "长边(&G)"
 
-#: kpgeneralpage.cpp:310
+#: kpgeneralpage.cpp:311
 msgid ""
 "_: duplex orientation\n"
 "S&hort side"
 msgstr "短边(&H)"
 
-#: kpgeneralpage.cpp:322
+#: kpgeneralpage.cpp:323
 msgid "S&tart:"
 msgstr "开始(&T)："
 
-#: kpgeneralpage.cpp:323
+#: kpgeneralpage.cpp:324
 msgid "En&d:"
 msgstr "结束(&D)："
 
-#: ppdloader.cpp:173
-msgid "(line %1): "
-msgstr "(第 %1 行)："
+#: kpfileselectpage.cpp:33
+msgid "&Files"
+msgstr "文件(&F)"
 
-#: droptionview.cpp:61
-msgid "Value:"
-msgstr "值："
+#: kpqtpage.cpp:70
+msgid ""
+" <qt>  <b>Selection of color mode:</b> You can choose between 2 options:  "
+"<ul>"
+"<li><b>Color</b> and</li>  "
+"<li><b>Grayscale</b></li></ul>  <b>Note:</b> This selection field may be grayed "
+"out and made inactive.  This happens if TDEPrint can not retrieve  enough "
+"information about your print file. In this case the embedded color- or "
+"grayscale information  of your printfile, and the default handling of the "
+"printer take precedence.  </qt>"
+msgstr ""
 
-#: droptionview.cpp:167
-msgid "String value:"
-msgstr "字符串值："
+#: kpqtpage.cpp:79
+msgid ""
+" <qt>  <b>Selection of page size:</b> Select paper size to be printed on from  "
+"the drop-down menu.  "
+"<p>The exact list of choices depends on the printer driver (\"PPD\") you have "
+"installed.  </qt>"
+msgstr ""
 
-#: droptionview.cpp:306 droptionview.cpp:341
-msgid "No Option Selected"
-msgstr "没有选中的选项"
+#: kpqtpage.cpp:84
+msgid ""
+" <qt>  <b>Selection of pages per sheet:</b>  You can choose to print more than "
+"one page onto each sheet of paper.  This is sometimes useful to save paper.  "
+"<p><b>Note 1:</b> the page images get scaled down accordingly to print 2 or 4 "
+"pages per sheet.  The page image does not get scaled if you print 1 page per "
+"sheet (the default setting.).  "
+"<p><b>Note 2:</b> If you select multiple pages per sheet here, the scaling and "
+"re-arranging is done  by your printing system.  "
+"<p><b>Note 3, regarding \"Other\":</b> You cannot really select <em>Other</em> "
+"as the number of  pages to print on one sheet.\"Other\" is checkmarked here for "
+"information purposes only.  "
+"<p>To select 8, 9, 16 or other numbers of  pages per sheet:  "
+"<ul>  "
+"<li> go to the tab headlined \"Filter\"</li> "
+"<li> enable the <em>Multiple Pages per Sheet</em> filter </li> "
+"<li> and configure it (bottom-most button on the right of the \"Filters\" tab). "
+"</li> </ul> </qt>"
+msgstr ""
+
+#: kpqtpage.cpp:102
+msgid ""
+" <qt>  <b>Selection of image orientation:</b> Orientation of the printed  "
+"pageimage on your paper is controlled by the radio buttons. By default,  the "
+"orientation is <em>Portrait</em>  "
+"<p>You can select 2 alternatives:  "
+"<ul>  "
+"<li> <b>Portrait.</b>.Portrait is the default setting. </li>  "
+"<li> <b>Landscape.</b> </li>  </ul>  The icon changes according to your "
+"selection. </qt>"
+msgstr ""
+
+#: kpqtpage.cpp:113
+msgid "Print Format"
+msgstr "打印格式"
+
+#: kpqtpage.cpp:123
+msgid "Color Mode"
+msgstr "彩色模式"
+
+#: kpqtpage.cpp:135
+msgid "Colo&r"
+msgstr "彩色(&R)"
+
+#: kpqtpage.cpp:138
+msgid "&Grayscale"
+msgstr "灰度(&G)"
+
+#: kpqtpage.cpp:151
+msgid "Ot&her"
+msgstr "其它(&H)"
+
+#: lpdunix/kmlpdunixmanager.cpp:210
+msgid "Description unavailable"
+msgstr "没有描述"
+
+#: lpdunix/kmlpdunixmanager.cpp:220 lpdunix/kmlpdunixmanager.cpp:271
+#: lpdunix/kmlpdunixmanager.cpp:318 lpdunix/kmlpdunixmanager.cpp:380
+#, c-format
+msgid "Remote printer queue on %1"
+msgstr "在 %1 上的远程打印队列"
+
+#: kprinterpropertydialog.cpp:78 kprinterpropertydialog.cpp:138
+msgid "Printer Configuration"
+msgstr "打印机配置"
+
+#: kprinterpropertydialog.cpp:138
+msgid "No configurable options for that printer."
+msgstr "该打印机没有可配置的选项。"
+
+#: kmvirtualmanager.cpp:161
+msgid ""
+"<qt>You are about to set a pseudo-printer as your personal default. This "
+"setting is specific to TDE and will not be available outside TDE applications. "
+"Note that this will only make your personal default printer as undefined for "
+"non-TDE applications and should not prevent you from printing normally. Do you "
+"really want to set <b>%1</b> as your personal default?</qt>"
+msgstr ""
+"<qt>您即将把伪打印机设置为您的个人默认打印机。此设置特别针对 TDE，在非 TDE 应用程序中无法生效。请注意，对于非 TDE "
+"应用程序，这只是将您个人的默认打印机设为未定义，也不会影响您的正常打印。您真的想要将 <b>%1</b> 设置为您的个人默认值吗？</qt>"
+
+#: rlpr/kmrlprmanager.cpp:47 rlpr/kmwrlpr.cpp:85
+msgid "Empty host name."
+msgstr "空主机名。"
+
+#: rlpr/kmrlprmanager.cpp:49 rlpr/kmwrlpr.cpp:87
+msgid "Empty queue name."
+msgstr "空队列名。"
+
+#: rlpr/kmrlprmanager.cpp:63
+msgid "Printer not found."
+msgstr "没有找到打印机。"
+
+#: rlpr/kmrlprmanager.cpp:75
+msgid "Not implemented yet."
+msgstr "还没有实现。"
+
+#: rlpr/kmconfigproxy.cpp:29
+msgid "Proxy"
+msgstr "代理"
+
+#: rlpr/kmconfigproxy.cpp:30
+msgid "RLPR Proxy Server Settings"
+msgstr "RLPR 代理服务器设置"
+
+#: rlpr/kmproprlpr.cpp:49 rlpr/kmwrlpr.cpp:50
+msgid "Remote LPD Queue Settings"
+msgstr "远程 LPD 队列设置"
+
+#: rlpr/kmproxywidget.cpp:32
+msgid "Proxy Settings"
+msgstr "代理设置"
+
+#: rlpr/kmproxywidget.cpp:36
+msgid "&Use proxy server"
+msgstr "使用代理服务器(&U)"
+
+#: rlpr/kmwrlpr.cpp:124
+msgid "Remote queue %1 on %2"
+msgstr "在 %2 上的远程打印队列 %1"
+
+#: rlpr/kmwrlpr.cpp:199
+msgid "No Predefined Printers"
+msgstr "没有预定义的打印机"
+
+#: lpd/klpdprinterimpl.cpp:46 rlpr/krlprprinterimpl.cpp:53
+msgid ""
+"The <b>%1</b> executable could not be found in your path. Check your "
+"installation."
+msgstr "在搜索路径中找不到可执行程序<b>%1</b>。检查您的安装。"
+
+#: rlpr/krlprprinterimpl.cpp:73
+msgid "The printer is incompletely defined. Try to reinstall it."
+msgstr "打印机没有被完整定义。请尝试重新安装它。"
+
+#: kmspecialmanager.cpp:53
+#, fuzzy
+msgid ""
+"A file share/tdeprint/specials.desktop was found in your local KDE directory. "
+"This file probably comes from a previous KDE release and should be removed in "
+"order to manage global pseudo printers."
+msgstr ""
+"在你的本地 TDE 目录里发现了文件 share/tdeprint/specials.desktop。该文件可能是较早版本的 TDE "
+"使用的，应该被删除以管理全局的伪打印机。"
+
+#: kmjob.cpp:114
+msgid "Queued"
+msgstr "已排队"
+
+#: kmjob.cpp:117
+msgid "Held"
+msgstr "保持"
+
+#: kmjob.cpp:123
+msgid "Canceled"
+msgstr "已取消"
+
+#: kmjob.cpp:126
+msgid "Aborted"
+msgstr "已中止"
+
+#: kmjob.cpp:129
+msgid "Completed"
+msgstr "已完成"
+
+#. i18n: file kprintpreviewui.rc line 13
+#: rc.cpp:9 rc.cpp:21
+#, no-c-format
+msgid "&PageMarks"
+msgstr "页标记(&P)"
 
 #: kmuimanager.cpp:158
 #, c-format
 msgid "Configuration of %1"
 msgstr "%1 的配置"
 
-#: kmprinter.cpp:144
-msgid "(rejecting jobs)"
-msgstr "(正在拒绝作业)"
+#: ext/kextprinterimpl.cpp:47
+msgid "Empty print command."
+msgstr "空的打印命令。"
 
-#: kmprinter.cpp:144
-msgid "(accepting jobs)"
-msgstr "(正在接收作业)"
+#: ext/kmextmanager.cpp:41
+msgid "PS_printer"
+msgstr "PS打印机"
 
-#: kprintprocess.cpp:75
-msgid "File transfer failed."
-msgstr "文件传送失败。"
+#: ext/kmextmanager.cpp:43
+msgid "PostScript file generator"
+msgstr "PostScript 文件生成器"
 
-#: kprintprocess.cpp:81
-msgid "Abnormal process termination (<b>%1</b>)."
-msgstr "异常进程终止(<b>%1</b>)。"
+#: kpposterpage.cpp:42
+msgid " <qt>  5.  </qt>"
+msgstr " <qt>  5.  </qt>"
 
-#: kprintprocess.cpp:83
-msgid "<b>%1</b>: execution failed with message:<p>%2</p>"
-msgstr "<b>%1</b>：执行失败，信息是：<p>%2</p>"
+#: kpposterpage.cpp:46
+msgid ""
+" <qt>  <b>Print Poster</b> (enabled or disabled).  "
+"<p>If you enable this option, you can print posters of different sizes  The "
+"printout will happen in the form <em>'tiles'</em> printed on smaller  paper "
+"sizes, which you can stitch together later. <em>If you enable this  option "
+"here, the <em>'Poster Printing' filter</em> will be auto-loaded in  the "
+"'Filters' tab of this dialog. </p> "
+"<p>This tab is only visible if the external <em>'poster'</em> "
+"utility is  discovered by TDEPrint on your system. [<em>'poster'</em> "
+"is a commandline  utility that enables you to convert PostScript files into "
+"tiled printouts  which allow for oversized appearance of the stitched-together "
+"tiles.] </p> "
+"<p><b>Note:</b> The standard version of 'poster' will not work. Your system  "
+"must use a patched version of 'poster'. Ask your operating system vendor to  "
+"provide a patched version of 'poster' if he does not already. </p> </qt>"
+msgstr ""
+
+#: kpposterpage.cpp:62
+msgid ""
+" <qt>  <b>Tile Selection widget</b>  "
+"<p>This GUI element is <em>not only for viewing</em> "
+"your selections: it also  lets you interactively select the tile(s) you want to "
+"print.  </p> "
+"<p><b>Hints</b>  "
+"<ul>  "
+"<li>Click any tile to select it for printing.</li>  "
+"<li>To select multiple tiles to be printed  at once, <em>'shift-click'</em> "
+"on the tiles ('shift-click' means: hold down the  [SHIFT]-key on your keyboard "
+"and click with the mouse while [SHIFT]-key is held.)   <em>Be aware</em> "
+"that the order  of your clicking is also significant to the order of printing "
+"the different tiles. </li> </ul>  <b>Note 1:</b> The order of your selection "
+"(and the order for printout of the tiles)  is indicated by the contents of the "
+"text field below,  labelled as <em>'Tile pages (to be printed):'</em>"
+"<p> <b>Note 2:</b> By default no tile is selected. Before you can print (a part "
+" of) your poster, you must select at least one tile. </p>  </qt>"
+msgstr ""
+
+#: kpposterpage.cpp:83
+msgid ""
+" <qt>  <b>Poster Size</b>  "
+"<p>Select the poster size you want from the dropdown list. </p>  "
+"Available sizes are all standard paper sizes up to  'A0'. [A0 is the same size "
+"as 16 sheets of A4, or '84cm x 118.2cm'.] </p>  "
+"<p><b>Notice</b>, how the little preview window below changes with your change "
+"of poster  size. It indicates to you how many tiles need to be printed to make "
+"the poster,  given the selected paper size.</p>   "
+"<p><b>Hint:</b> The little preview window below is not just a passive icon. You "
+"can click  on its individual tiles to select them for printing. To select "
+"multiple tiles to be printed  at once, you need to <em>'shift-click'</em> "
+"on the tiles ('shift-click' means: hold down the  [SHIFT]-key on your keyboard "
+"and click with the mouse while [SHIFT]-key is held.) The order  of your "
+"clicking is significant to the order of printing the different tiles. The order "
+"of  your selection (and for the printed tiles) is indicated by the contents of "
+"the text field  labelled as <em>'Tile pages (to be printed):'</em>"
+"<p> <b>Note:</b> By default no tile is selected. Before you can print (a part  "
+"of) your poster, you must select at least one tile. </p>  </qt>"
+msgstr ""
+
+#: kpposterpage.cpp:102
+msgid ""
+" <qt>  <b>Paper Size</b>  "
+"<p>This field indicates the paper size the poster tiles will be printed on.  To "
+"select a different paper size for your poster tiles, go to the 'General' tab  "
+"of this dialog and select one from the dropdown list. </p>  "
+"Available sizes are most standard paper sizes supported by your printer. Your "
+"printer's  supported paper sizes are read from the printer driver info (as laid "
+"down in the <em>'PPD'</em>,  the printer description file). <em>"
+"Be aware that the 'Paper Size' selected may not be supported  by 'poster' "
+"(example: 'HalfLetter') while it may well be supported by your printer.</em>  "
+"If  you hit that obstacle, simply use another, supported Paper Size, like 'A4' "
+"or 'Letter'.  "
+"<p><b>Notice</b>, how the little preview window below changes with your change "
+"of paper  size. It indicates how many tiles need to be printed to make up the "
+"poster,  given the selected paper and poster size.</p>   "
+"<p><b>Hint:</b> The little preview window below is not just a passive icon. You "
+"can click  on its individual tiles to select them for printing. To select "
+"multiple tiles to be printed  at once, you need to <em>'shift-click'</em> "
+"on the tiles ('shift-click' means: hold down the  [SHIFT]-key on your keyboard "
+"and click with the mouse while [SHIFT]-key is held.) The order  of your "
+"clicking is significant to the order of printing the different tiles. The order "
+"of  your selection (and for the printed tiles) is indicated by the contents of "
+"the text field  labelled as <em>'Tile pages (to be printed):'</em>"
+"<p> <b>Note:</b> By default no tile is selected. Before you can print (a part  "
+"of) your poster, you must select at least one tile. </p>  </qt>"
+msgstr ""
+
+#: kpposterpage.cpp:126
+msgid ""
+" <qt>  <b>Cut Margin selection</b>  "
+"<p>Slider and spinbox let you determine a <em>'cut margin'</em> "
+"which will be printed onto  each tile of your poster to help you cut the pieces "
+"as needed. </p> "
+"<p><b>Notice</b>, how the little preview window above changes with your change "
+"of cut  margins. It indicates to you how much space the cut margins will take "
+"away from each tile.  "
+"<p><b>Be aware</b>, that your cut margins need to be equal to or greater than "
+"the margins your  printer uses. The printer's capabilities are described in the "
+"<em>'ImageableArea'</em>  keywords of its driver PPD file. </p>  </qt>"
+msgstr ""
+
+#: kpposterpage.cpp:137
+msgid ""
+" <qt>  <b>Order and number of tile pages to be printed</b>  "
+"<p>This field displays and sets the individual tiles to be printed, as well as "
+"the order  for their printout. </p>  You can file the field with 2 different "
+"methods:  "
+"<ul>  "
+"<li>Either use the interactive thumbnail preview above and '[SHIFT]-click' on "
+"the tiles. </li>  "
+"<li>Or edit this text field accordingly. </li>  </ul>  "
+"<p>When editing the field, you can use a '3-7' syntax instead of a '3,4,5,6,7' "
+"one. </p>  "
+"<p><b>Examples:</b></p>  "
+"<pre>    \"2,3,7,9,3\"  "
+"<br>    \"1-3,6,8-11\"  </qt>"
+msgstr ""
+
+#: kpposterpage.cpp:154
+msgid "Poster"
+msgstr "海报"
+
+#: kpposterpage.cpp:156
+msgid "&Print poster"
+msgstr "打印海报(&P)"
+
+#: kpposterpage.cpp:170
+msgid "Poste&r size:"
+msgstr "海报大小(&R)："
+
+#: kpposterpage.cpp:172
+msgid "Media size:"
+msgstr "纸张大小："
+
+#: kpposterpage.cpp:174
+msgid "Pri&nt size:"
+msgstr "打印大小(&N)："
+
+#: kpposterpage.cpp:181
+#, no-c-format
+msgid "C&ut margin (% of media):"
+msgstr "裁剪边距(纸张的百分比)(&U)："
+
+#: kpposterpage.cpp:185
+msgid "&Tile pages (to be printed):"
+msgstr "平铺页面(要打印的)(&T)："
+
+#: kpposterpage.cpp:192
+msgid "Link/unlink poster and print size"
+msgstr "链接/取消链接海报和打印大小"
+
+#: kpposterpage.cpp:257
+msgid "Unknown"
+msgstr "未知"
+
+#: kprinter.cpp:690 tdeprintd.cpp:158
+#, c-format
+msgid ""
+"<p><nobr>A print error occurred. Error message received from system:</nobr></p>"
+"<br>%1"
+msgstr "<p><nobr>出现打印错误。从系统接收到错误信息：</nobr></p><br>%1"
 
 #: tdeprintd.cpp:176
 msgid ""
@@ -5072,11 +5181,70 @@ msgstr "打印系统"
 msgid "Authentication failed (user name=%1)"
 msgstr "验证失败！(用户名=%1)"
 
-#. i18n: file kprintpreviewui.rc line 13
-#: rc.cpp:9 rc.cpp:21
-#, no-c-format
-msgid "&PageMarks"
-msgstr "页标记(&P)"
+#: kprinter.cpp:280
+msgid "Initialization..."
+msgstr "初始化..."
+
+#: kprinter.cpp:283 kprinter.cpp:909
+#, c-format
+msgid "Generating print data: page %1"
+msgstr "正在生成打印数据：第 %1 页"
+
+#: kprinter.cpp:429
+msgid "Previewing..."
+msgstr "预览..."
+
+#: driverview.cpp:47
+msgid ""
+" <qt>  <b>List of Driver Options (from PPD)</b>.  "
+"<p>The upper pane of this dialog page contains all printjob options as laid  "
+"down in the printer's description file (PostScript Printer Description == "
+"'PPD') </p> "
+"<p>Click on any item in the list and watch the lower pane of this dialog page  "
+"display the available values. </p>  "
+"<p>Set the values as needed. Then use one of the pushbuttons below to "
+"proceed:</p>  "
+"<ul>  "
+"<li><em>'Save'</em> your settings if you want to re-use  them in your next "
+"job(s) too. <em>'Save'</em> will store your settings permanently until  you "
+"change them again. </li>. "
+"<li>Click <em>'OK'</em> (without a prior click on <em>'Save'</em>"
+", if you want to use  your selected settings just once, for the next print job. "
+"<em>'OK'</em>  will forget your current settings when kprinter is closed again, "
+"and will start next time  with the previously saved defaults. </li> "
+"<li><em>'Cancel'</em> will not change anything. If you proceed to print after "
+"clicking  <em>'Cancel'</em>, the job will print with the default settings of "
+"this queue.  </ul> "
+"<p><b>Note.</b> The number of available job options depends strongly on the "
+"actual  driver used for your print queue. <em>'Raw'</em> "
+"queues do not have a driver or a   PPD. For raw queues this tab page is not "
+"loaded by TDEPrint, and thus is not present  in the kprinter dialog.</p>  </qt>"
+msgstr ""
+
+#: driverview.cpp:71
+msgid ""
+" <qt>  <b>List of Possible Values for given Option (from PPD)</b>.  "
+"<p>The lower pane of this dialog page contains all possible values of the "
+"printoption  highlighted above, as laid  down in the printer's description file "
+"(PostScript Printer Description == 'PPD') </p> "
+"<p>Select the value you want and proceed. </p>  "
+"<p>Then use one of the pushbuttons below to leave this dialog:</p>  "
+"<ul>  "
+"<li><em>'Save'</em> your settings if you want to re-use  them in your next "
+"job(s) too. <em>'Save'</em> will store your settings permanently until  you "
+"change them again. </li>. "
+"<li>Click <em>'OK'</em> if you want to use your selected settings just once, "
+"for the  next print job. <em>'OK'</em>  will forget your current settings when "
+"kprinter is closed again, and will start next time  with your previous "
+"defaults. </li> "
+"<li><em>'Cancel'</em> will not change anything. If you proceed to print after "
+"clicking  <em>'Cancel'</em>, the job will print with the default settings of "
+"this queue.  </ul> "
+"<p><b>Note.</b> The number of available job options depends strongly on the "
+"actual  driver used for your print queue. <em>'Raw'</em> "
+"queues do not have a driver or a   PPD. For raw queues this tab page is not "
+"loaded by TDEPrint, and thus is not present  in the kprinter dialog.</p>  </qt>"
+msgstr ""
 
 #: kpcopiespage.cpp:46
 msgid ""
@@ -5093,9 +5261,10 @@ msgid ""
 msgstr "<qt><b>全部页面：</b>选择“全部”将打印整个文档。由于这是默认值，系统已经为您预先选中了。</p></qt>"
 
 #: kpcopiespage.cpp:55
+#, fuzzy
 msgid ""
 " <qt><b>Current Page:</b> Select <em>\"Current\"</em> "
-"if you want  to print the page currently visible in your TDE application.</p> "
+"if you want  to print the page currently visible in your KDE application.</p> "
 "<p><b>Note:</b> this field is disabled if you print from non-TDE applications "
 "like Mozilla or OpenOffice.org, since here TDEPrint has no means to determine "
 "which document page you are currently viewing.</p></qt>"
@@ -5303,402 +5472,307 @@ msgstr "页面集(&S)："
 msgid "Pages"
 msgstr "页面"
 
-#: kprintpreview.cpp:137
-msgid "Do you want to continue printing anyway?"
-msgstr "您要继续打印吗？"
+#: plugincombobox.cpp:33
+msgid ""
+" <qt><b>Print Subsystem Selection</b> "
+"<p>This combo box shows (and lets you select) a print subsystem to be used by "
+"TDEPrint. (This print subsystem must, of course, be installed inside your "
+"Operating System.) TDEPrint usually auto-detects the correct print subsystem by "
+"itself upon first startup. Most Linux distributions have \"CUPS\", the <em>"
+"Common UNIX Printing System</em>. </qt>"
+msgstr ""
+"<qt><b>打印子系统选择</b>此组合框显示(您也可以选择) TDEPrint "
+"要使用的打印子系统。(当然，此打印子系统必须已经安装在您的操作系统中。)TDEPrint 通常能够自动进行检测。大多数 Linux "
+"发行版都有“CUPS”，即<em>公共 Unix 打印系统</em>。</qt>"
 
-#: kprintpreview.cpp:145 kprintpreview.cpp:224
-msgid "Print Preview"
-msgstr "打印预览"
+#: plugincombobox.cpp:45
+msgid "Print s&ystem currently used:"
+msgstr "目前使用的打印系统(&Y)："
 
-#: kprintpreview.cpp:275
+#: plugincombobox.cpp:91
 msgid ""
-"The preview program %1 cannot be found. Check that the program is correctly "
-"installed and located in a directory included in your PATH environment "
-"variable."
-msgstr "找不到预览程序 %1。请检查是否正确安装了此程序，是否在一个 PATH 环境变量中指定的目录中。"
+" <qt><b>Current Connection</b> "
+"<p>This line shows which CUPS server your PC is currently connected to for "
+"printing and retrieving printer info. To switch to a different CUPS server, "
+"click \"System Options\", then select \"Cups server\" and fill in the required "
+"info. </qt>"
+msgstr ""
+"<qt><b>当前连接</b>本行显示了您的电脑连接并获取打印机信息的 CUPS 服务器。要切换到不同的 CUPS "
+"服务器，请点击“系统选项”，然后选择“CUPS 服务器”并填入必需的信息。</qt>"
 
-#: kprintpreview.cpp:300
+#: tdefilelist.cpp:42
 msgid ""
-"Preview failed: neither the internal TDE PostScript viewer (KGhostView) nor any "
-"other external PostScript viewer could be found."
-msgstr "预览失败：找不到 TDE 内建的 PostScript 查看器(KGhostView) 或其它外部的 PostScript 查看器。"
+" <qt> <b>Add File button</b> "
+"<p>This button calls the <em>'File Open'</em> dialog to let you select a file "
+"for printing. Note, that  "
+"<ul>"
+"<li>you can select ASCII or International Text, PDF, PostScript, JPEG, TIFF, "
+"PNG, GIF and many other graphic formats. "
+"<li>you can select various files from different paths and send them as one "
+"\"multi-file job\" to the printing system. </ul> </qt>"
+msgstr ""
+"<qt><b>添加文件按钮</b>此按钮将调用“打开文件”对话框，您可从中选择进行打印的文件。请注意，"
+"<ul>"
+"<li>您可以选择 ASCII 或国际文本、PDF、PostScript、JPEG、TIFF、PNG、GIF 及许多其它图形格式。"
+"<li>您可以从不同的路径中选择各种文件，并将它们作为“多文件任务”一同发送给打印系统。</ul></qt>"
 
-#: kprintpreview.cpp:304
-#, c-format
+#: tdefilelist.cpp:54
 msgid ""
-"Preview failed: TDE could not find any application to preview files of type %1."
-msgstr "预览失败：TDE 无法找到可预览 %1 类型文件的应用程序。"
-
-#: kprintpreview.cpp:314
-#, c-format
-msgid "Preview failed: unable to start program %1."
-msgstr "预览失败：无法启动程序 %1。"
+" <qt> <b>Remove File button</b> "
+"<p>This button removes the highlighted file from the list of to-be-printed "
+"files. </qt>"
+msgstr "<qt><b>删除文件按钮</b>此按钮将从要打印的文件列表中删除突出显示的文件。</qt>"
 
-#: kprintpreview.cpp:319
-msgid "Do you want to continue printing?"
-msgstr "您要继续打印吗？"
+#: tdefilelist.cpp:59
+msgid ""
+" <qt> <b>Move File Up button</b> "
+"<p>This button moves the highlighted file up in the list of files to be "
+"printed.</p> "
+"<p>In effect, this changes the order of the files' printout.</p> </qt>"
+msgstr ""
+"<qt><b>上移文件按钮</b>"
+"<p>此按钮将把待打印文件列表中突出显示的文件向上移动。</p>"
+"<p>实际上，这会更改文件打印的顺序。</p></qt>"
 
-#: kmfactory.cpp:221
-msgid "<qt>There was an error loading %1. The diagnostic is:<p>%2</p></qt>"
-msgstr "<qt>在载入 %1 时发生错误。诊断信息是：<p>%2</p></qt>"
+#: tdefilelist.cpp:66
+msgid ""
+" <qt> <b>Move File Down button</b> "
+"<p>This button moves the highlighted file down in the list of files to be "
+"printed.</p> "
+"<p>In effect, this changes the order of the files' printout.</p> </qt>"
+msgstr ""
+"<qt><b>下移文件按钮</b>"
+"<p>此按钮将把待打印文件列表中突出显示的文件向下移动。</p>"
+"<p>实际上，这会更改文件打印的顺序。</p></qt>"
 
-#: kpdriverpage.cpp:48
+#: tdefilelist.cpp:73
 msgid ""
-"<qt>Some options selected are in conflict. You must resolve these conflicts "
-"before continuing. See <b>Driver Settings</b> tab for detailed information.</qt>"
-msgstr "<qt>某些选中的选项产生了冲突。您必须先解决冲突才能继续。请查看<b>驱动程序设置</b>标签页来了解详细的信息。</qt>"
+" <qt> <b>File Open button</b> "
+"<p>This button tries to open the highlighted file, so you can view or edit it "
+"before you send it to the printing system.</p> "
+"<p>If you open files, TDEPrint will use the application matching the MIME type "
+"of the file.</p> </qt>"
+msgstr ""
+"<qt><b>打开文件按钮</b>"
+"<p>此按钮将试图打开突出显示的文件，这样您就可以在将其发送给打印系统前先查看或编辑该文件。</p>"
+"<p>如果您打开文件，TDEPrint 将会使用匹配文件 MIME 类型的应用程序。</qt>"
 
-#: posterpreview.cpp:115
+#: tdefilelist.cpp:82
 msgid ""
-"Poster preview not available. Either the <b>poster</b> "
-"executable is not properly installed, or you don't have the required version."
+" <qt> <b>File List view</b> "
+"<p>This list displays all the files you selected for printing. You can see the "
+"file name(s), file path(s) and the file (MIME) type(s) as determined by "
+"TDEPrint. You may re-arrange the  initial order of the list  with the help of "
+"the arrow buttons on the right.</p> "
+"<p>The files will be printed as a single job, in the same order as displayed in "
+"the list.</p> "
+"<p><b>Note:</b> You can select multiple files. The files may be in multiple "
+"locations. The files may be of multiple MIME types. The buttons on the right "
+"side let you add more files, remove already selected files from the list,  "
+"re-order the list (by moving files up or down), and open files. If you open "
+"files, TDEPrint will use the application matching the MIME type of the file.</p> "
+"</qt>"
 msgstr ""
-"海报预览不可用。也许是 <b>poster</b> 可执行文件没有被正确安装，也许是您没有所需的版本.。"
+"<qt><b>文件列表视图</b>"
+"<p>此列表显示了您要打印的全部文件。您可以看到文件名、文件路经和 TDEPrint "
+"决定的文件(MIME)类型。此列表的最初顺序与您最初的选择顺序相同。</p>"
+"<p>此列表最终将按照显示的顺序进行打印。</p>"
+"<p><b>注意：</b>您可以选择多个文件。文件也可以在多个位置。文件的 MIME "
+"类型也可以不同。右侧的按钮可让您添加更多的文件，从列表中删除选中的文件，更改列表的顺序(将文件上下移动)，以及打开文件。如果您想要打开文件，TDEPrint "
+"将会使用匹配文件 MIME 类型的应用程序。</p></qt>"
 
-#: kprinterpropertydialog.cpp:78 kprinterpropertydialog.cpp:138
-msgid "Printer Configuration"
-msgstr "打印机配置"
+#: tdefilelist.cpp:103
+msgid "Path"
+msgstr "路径"
 
-#: kprinterpropertydialog.cpp:138
-msgid "No configurable options for that printer."
-msgstr "该打印机没有可配置的选项。"
+#: tdefilelist.cpp:115
+msgid "Add file"
+msgstr "添加文件"
 
-#: marginpreview.cpp:135
-msgid "No preview available"
-msgstr "没有可用的预览"
+#: tdefilelist.cpp:121
+msgid "Remove file"
+msgstr "删除文件"
 
-#: kpfileselectpage.cpp:33
-msgid "&Files"
-msgstr "文件(&F)"
+#: tdefilelist.cpp:128
+msgid "Open file"
+msgstr "打开文件"
 
-#: marginwidget.cpp:37
+#: tdefilelist.cpp:149
 msgid ""
-" <qt>  "
-"<p><b>Top Margin</b></p>.  "
-"<p>This spinbox/text edit field lets you control the top margin of your "
-"printout if the printing  application does not define its margins internally. "
-"</p>  "
-"<p>The setting works for instance for ASCII text file printing, or for printing "
-"from KMail and  and Konqueror.. </p> "
-"<p><b>Note:</b></p>This margin setting is not intended for KOffice or "
-"OpenOffice.org printing,  because these applications (or rather their users) "
-"are expected to do it by themselves.  It also does not work for PostScript or "
-"PDF file, which in most cases have their margins hardcoded  internally.</p>  "
-"<br>  "
-"<hr>  "
-"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
-"matches  with the CUPS commandline job option parameter:</em>  "
-"<pre>    -o page-top=...      # use values from \"0\" or higher. \"72\" is "
-"equal to 1 inch.  </pre> </p>  </qt>"
-msgstr ""
+"Drag file(s) here or use the button to open a file dialog. Leave empty for <b>"
+"&lt;STDIN&gt;</b>."
+msgstr "将文件拖放到这里，或者用按钮打开一个文件对话框。将<b>&lt;STDIN&gt;</b>留为空值。"
 
-#: marginwidget.cpp:57
-msgid ""
-" <qt>  "
-"<p><b>Bottom Margin</b></p>.  "
-"<p>This spinbox/text edit field lets you control the bottom margin of your "
-"printout if the printing  application does not define its margins internally. "
-"</p>  "
-"<p>The setting works for instance for ASCII text file printing, or for printing "
-"from KMail and  and Konqueror. </p> "
-"<p><b>Note:</b></p>This margin setting is not intended for KOffice or "
-"OpenOffice.org printing,  because these applications (or rather their users) "
-"are expected to do it by themselves.  It also does not work for PostScript or "
-"PDF file, which in most cases have their margins hardcoded  internally.</p>  "
-"<br>  "
-"<hr>  "
-"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
-"matches  with the CUPS commandline job option parameter:</em>  "
-"<pre>    -o page-bottom=...      # use values from \"0\" or higher. \"72\" is "
-"equal to 1 inch.  </pre> </qt>"
-msgstr ""
+#: droptionview.cpp:61
+msgid "Value:"
+msgstr "值："
 
-#: marginwidget.cpp:76
-msgid ""
-" <qt>  "
-"<p><b>Left Margin</b></p>.  "
-"<p>This spinbox/text edit field lets you control the left margin of your "
-"printout if the printing  application does not define its margins internally. "
-"</p>  "
-"<p>The setting works for instance for ASCII text file printing, or for printing "
-"from KMail and  and Konqueror. </p> "
-"<p><b>Note:</b></p>This margin setting is not intended for KOffice or "
-"OpenOffice.org printing,  because these applications (or rather their users) "
-"are expected to do it by themselves.  It also does not work for PostScript or "
-"PDF file, which in most cases have their margins hardcoded  internally.</p>  "
-"<br>  "
-"<hr>  "
-"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
-"matches  with the CUPS commandline job option parameter:</em>  "
-"<pre>    -o page-left=...      # use values from \"0\" or higher. \"72\" is "
-"equal to 1 inch.  </pre> </qt>"
-msgstr ""
+#: droptionview.cpp:167
+msgid "String value:"
+msgstr "字符串值："
 
-#: marginwidget.cpp:95
-msgid ""
-" <qt>  "
-"<p><b>Right Margin</b></p>.  "
-"<p>This spinbox/text edit field lets you control the right margin of your "
-"printout if the printing  application does not define its margins internally. "
-"</p>  "
-"<p>The setting works for instance for ASCII text file printing, or for printing "
-"from KMail and  and Konqueror. </p> "
-"<p><b>Note:</b></p>This margin setting is not intended for KOffice or "
-"OpenOffice.org printing,  because these applications (or rather their users) "
-"are expected to do it by themselves.  It also does not work for PostScript or "
-"PDF file, which in most cases have their margins hardcoded  internally.</p>  "
-"<br>  "
-"<hr>  "
-"<p><em><b>Additional hint for power users:</b> This TDEPrint GUI element "
-"matches  with the CUPS commandline job option parameter:</em>  "
-"<pre>    -o page-right=...      # use values from \"0\" or higher. \"72\" is "
-"equal to 1 inch.  </pre> </qt>"
-msgstr ""
+#: droptionview.cpp:306 droptionview.cpp:341
+msgid "No Option Selected"
+msgstr "没有选中的选项"
 
-#: marginwidget.cpp:114
-msgid ""
-" <qt>  "
-"<p><b>Change Measurement Unit<b></p>.  "
-"<p>You can change the units of measurement for the page margins here. Select "
-"from Millimeter, Centimeter, Inch or Pixels (1 pixel == 1/72 inch).  </p>  </qt>"
-msgstr ""
+#: lpd/kmlpduimanager.cpp:44
+msgid "Local printer (parallel, serial, USB)"
+msgstr "本地打印机(并口、串口和 USB)"
 
-#: marginwidget.cpp:121
-msgid ""
-" <qt>  "
-"<p><b>Custom Margins Checkbox</b></p>.  "
-"<p>Enable this checkbox if you want to modify the margins of your printouts  "
-"<p>You can change margin settings in 4 ways:  "
-"<ul>  "
-"<li>Edit the text fields. </li>  "
-"<li>Click spinbox arrows. </li>  "
-"<li>Scroll wheel of wheelmouses. </li>  "
-"<li>Drag margins in preview frame with mouse. </li>  </ul>  <b>Note:</b> "
-"The margin setting does not work if you load such files directly into  "
-"kprinter, which have their print margins hardcoded internally, like as most  "
-"PDF or PostScript files. It works for all ASCII text files however. It also may "
-"not  work with non-TDE applications which fail to  fully utilize the TDEPrint "
-"framework, such as OpenOffice.org. </p>  </qt>"
-msgstr ""
+#: lpd/kmlpduimanager.cpp:46
+msgid "SMB shared printer (Windows)"
+msgstr "SMB 共享打印机(Windows)"
 
-#: marginwidget.cpp:138
-msgid ""
-" <qt>  "
-"<p><b>\"Drag-your-Margins\" </p>.  "
-"<p>Use your mouse to drag and set each margin on this little preview window. "
-"</p>  </qt>"
-msgstr ""
+#: lpd/kmlpduimanager.cpp:47
+msgid "Network printer (TCP)"
+msgstr "网络打印机(TCP)"
 
-#: marginwidget.cpp:148
-msgid "&Use custom margins"
-msgstr "使用定制页边距(&U)"
+#: lpd/kmlpduimanager.cpp:48
+msgid "File printer (print to file)"
+msgstr "文件打印机(打印到文件)"
 
-#: marginwidget.cpp:158
-msgid "&Top:"
-msgstr "顶部(&T)："
+#: lpd/lpdtools.cpp:31
+msgid "A4"
+msgstr "A4"
 
-#: marginwidget.cpp:159
-msgid "&Bottom:"
-msgstr "底部(&B)："
+#: lpd/lpdtools.cpp:32
+msgid "A3"
+msgstr "A3"
 
-#: marginwidget.cpp:160
-msgid "Le&ft:"
-msgstr "左边(&F)："
+#: lpd/lpdtools.cpp:33
+msgid "B4"
+msgstr "B4"
 
-#: marginwidget.cpp:161
-msgid "&Right:"
-msgstr "右边(&R)："
+#: lpd/lpdtools.cpp:34
+msgid "B5"
+msgstr "B5"
 
-#: marginwidget.cpp:164
-msgid "Pixels (1/72nd in)"
-msgstr "像素(1/72英寸)"
+#: lpd/lpdtools.cpp:233
+msgid "GhostScript settings"
+msgstr "GhostScript 设置"
 
-#: marginwidget.cpp:167
-msgid "Inches (in)"
-msgstr "英寸(in)"
+#: lpd/lpdtools.cpp:254
+msgid "Resolution"
+msgstr "分辨率"
 
-#: marginwidget.cpp:168
-msgid "Centimeters (cm)"
-msgstr "厘米(cm)"
+#: lpd/lpdtools.cpp:277
+msgid "Color depth"
+msgstr "颜色深度"
 
-#: marginwidget.cpp:169
-msgid "Millimeters (mm)"
-msgstr "毫米(mm)"
+#: lpd/lpdtools.cpp:301
+msgid "Additional GS options"
+msgstr "其它 GS 选项"
 
-#: driver.cpp:387
-msgid "JCL"
-msgstr "JCL"
+#: lpd/lpdtools.cpp:313
+msgid "Page size"
+msgstr "页面大小"
 
-#: kmvirtualmanager.cpp:161
-msgid ""
-"<qt>You are about to set a pseudo-printer as your personal default. This "
-"setting is specific to TDE and will not be available outside TDE applications. "
-"Note that this will only make your personal default printer as undefined for "
-"non-TDE applications and should not prevent you from printing normally. Do you "
-"really want to set <b>%1</b> as your personal default?</qt>"
-msgstr ""
-"<qt>您即将把伪打印机设置为您的个人默认打印机。此设置特别针对 TDE，在非 TDE 应用程序中无法生效。请注意，对于非 TDE "
-"应用程序，这只是将您个人的默认打印机设为未定义，也不会影响您的正常打印。您真的想要将 <b>%1</b> 设置为您的个人默认值吗？</qt>"
+#: lpd/lpdtools.cpp:329
+msgid "Pages per sheet"
+msgstr "每张纸上打印页数"
 
-#: kpposterpage.cpp:42
-msgid " <qt>  5.  </qt>"
-msgstr " <qt>  5.  </qt>"
+#: lpd/lpdtools.cpp:345
+msgid "Left/right margin (1/72 in)"
+msgstr "左右页边距(1/72英寸)"
 
-#: kpposterpage.cpp:46
-msgid ""
-" <qt>  <b>Print Poster</b> (enabled or disabled).  "
-"<p>If you enable this option, you can print posters of different sizes  The "
-"printout will happen in the form <em>'tiles'</em> printed on smaller  paper "
-"sizes, which you can stitch together later. <em>If you enable this  option "
-"here, the <em>'Poster Printing' filter</em> will be auto-loaded in  the "
-"'Filters' tab of this dialog. </p> "
-"<p>This tab is only visible if the external <em>'poster'</em> "
-"utility is  discovered by TDEPrint on your system. [<em>'poster'</em> "
-"is a commandline  utility that enables you to convert PostScript files into "
-"tiled printouts  which allow for oversized appearance of the stitched-together "
-"tiles.] </p> "
-"<p><b>Note:</b> The standard version of 'poster' will not work. Your system  "
-"must use a patched version of 'poster'. Ask your operating system vendor to  "
-"provide a patched version of 'poster' if he does not already. </p></qt>"
-msgstr ""
+#: lpd/lpdtools.cpp:350
+msgid "Top/bottom margin (1/72 in)"
+msgstr "上下页边距(1/72英寸)"
 
-#: kpposterpage.cpp:68
-msgid ""
-" <qt>  <b>Tile Selection widget</b>  "
-"<p>This GUI element is <em>not only for viewing</em> "
-"your selections: it also  lets you interactively select the tile(s) you want to "
-"print.  </p> "
-"<p><b>Hints</b>  "
-"<ul>  "
-"<li>Click any tile to select it for printing.</li>  "
-"<li>To select multiple tiles to be printed  at once, <em>'shift-click'</em> "
-"on the tiles ('shift-click' means: hold down the  [SHIFT]-key on your keyboard "
-"and click with the mouse while [SHIFT]-key is held.)   <em>Be aware</em> "
-"that the order  of your clicking is also significant to the order of printing "
-"the different tiles. </li> </ul>  <b>Note 1:</b> The order of your selection "
-"(and the order for printout of the tiles)  is indicated by the contents of the "
-"text field below,  labelled as <em>'Tile pages (to be printed):'</em>"
-"<p> <b>Note 2:</b> By default no tile is selected. Before you can print (a part "
-" of) your poster, you must select at least one tile. </p>  </qt>"
-msgstr ""
+#: lpd/lpdtools.cpp:356
+msgid "Text options"
+msgstr "文本选项"
 
-#: kpposterpage.cpp:89
-msgid ""
-" <qt>  <b>Poster Size</b>  "
-"<p>Select the poster size you want from the dropdown list. </p>  "
-"Available sizes are all standard paper sizes up to  'A0'. [A0 is the same size "
-"as 16 sheets of A4, or '84cm x 118.2cm'.] </p>  "
-"<p><b>Notice</b>, how the little preview window below changes with your change "
-"of poster  size. It indicates to you how many tiles need to be printed to make "
-"the poster,  given the selected paper size.</p>   "
-"<p><b>Hint:</b> The little preview window below is not just a passive icon. You "
-"can click  on its individual tiles to select them for printing. To select "
-"multiple tiles to be printed  at once, you need to <em>'shift-click'</em> "
-"on the tiles ('shift-click' means: hold down the  [SHIFT]-key on your keyboard "
-"and click with the mouse while [SHIFT]-key is held.) The order  of your "
-"clicking is significant to the order of printing the different tiles. The order "
-"of  your selection (and for the printed tiles) is indicated by the contents of "
-"the text field  labelled as <em>'Tile pages (to be printed):'</em>"
-"<p> <b>Note:</b> By default no tile is selected. Before you can print (a part  "
-"of) your poster, you must select at least one tile. </p>  </qt>"
-msgstr ""
+#: lpd/lpdtools.cpp:362
+msgid "Send EOF after job to eject page"
+msgstr "在作业结束后发送 EOF 出纸"
+
+#: lpd/lpdtools.cpp:370
+msgid "Fix stair-stepping text"
+msgstr "调整行错位文本"
+
+#: lpd/lpdtools.cpp:382
+msgid "Fast text printing (non-PS printers only)"
+msgstr "快速文本打印(仅用于非 PS 打印机)"
 
-#: kpposterpage.cpp:108
+#: lpd/kmlpdmanager.cpp:87
+msgid "Local printer queue (%1)"
+msgstr "本地打印机队列 (%1)"
+
+#: lpd/kmlpdmanager.cpp:87
 msgid ""
-" <qt>  <b>Paper Size</b>  "
-"<p>This field indicates the paper size the poster tiles will be printed on.  To "
-"select a different paper size for your poster tiles, go to the 'General' tab  "
-"of this dialog and select one from the dropdown list. </p>  "
-"Available sizes are most standard paper sizes supported by your printer. Your "
-"printer's  supported paper sizes are read from the printer driver info (as laid "
-"down in the <em>'PPD'</em>,  the printer description file). <em>"
-"Be aware that the 'Paper Size' selected may not be supported  by 'poster' "
-"(example: 'HalfLetter') while it may well be supported by your printer.</em>  "
-"If  you hit that obstacle, simply use another, supported Paper Size, like 'A4' "
-"or 'Letter'.  "
-"<p><b>Notice</b>, how the little preview window below changes with your change "
-"of paper  size. It indicates how many tiles need to be printed to make up the "
-"poster,  given the selected paper and poster size.</p>   "
-"<p><b>Hint:</b> The little preview window below is not just a passive icon. You "
-"can click  on its individual tiles to select them for printing. To select "
-"multiple tiles to be printed  at once, you need to <em>'shift-click'</em> "
-"on the tiles ('shift-click' means: hold down the  [SHIFT]-key on your keyboard "
-"and click with the mouse while [SHIFT]-key is held.) The order  of your "
-"clicking is significant to the order of printing the different tiles. The order "
-"of  your selection (and for the printed tiles) is indicated by the contents of "
-"the text field  labelled as <em>'Tile pages (to be printed):'</em>"
-"<p> <b>Note:</b> By default no tile is selected. Before you can print (a part  "
-"of) your poster, you must select at least one tile. </p>  </qt>"
-msgstr ""
+"_: Unknown type of local printer queue\n"
+"Unknown"
+msgstr "未知"
 
-#: kpposterpage.cpp:132
+#: lpd/kmlpdmanager.cpp:88
+msgid "<Not available>"
+msgstr "<不可用>"
+
+#: lpd/kmlpdmanager.cpp:89
 msgid ""
-" <qt>  <b>Cut Margin selection</b>  "
-"<p>Slider and spinbox let you determine a <em>'cut margin'</em> "
-"which will be printed onto  each tile of your poster to help you cut the pieces "
-"as needed. </p> "
-"<p><b>Notice</b>, how the little preview window above changes with your change "
-"of cut  margins. It indicates to you how much space the cut margins will take "
-"away from each tile.  "
-"<p><b>Be aware</b>, that your cut margins need to be equal to or greater than "
-"the margins your  printer uses. The printer's capabilities are described in the "
-"<em>'ImageableArea'</em>  keywords of its driver PPD file. </p>  </qt>"
-msgstr ""
+"_: Unknown Driver\n"
+"Unknown"
+msgstr "未知"
+
+#: lpd/kmlpdmanager.cpp:95
+msgid "Remote LPD queue %1@%2"
+msgstr "远程 LPD 队列 %1@%2"
+
+#: lpd/kmlpdmanager.cpp:158
+msgid "Unable to create spool directory %1 for printer %2."
+msgstr "无法为打印机 %2 创建假脱机目录 %1。"
+
+#: lpd/kmlpdmanager.cpp:165
+msgid "Unable to save information for printer <b>%1</b>."
+msgstr "无法为打印机<b>%1</b>保存信息。"
 
-#: kpposterpage.cpp:143
+#: lpd/kmlpdmanager.cpp:193
 msgid ""
-" <qt>  <b>Order and number of tile pages to be printed</b>  "
-"<p>This field displays and sets the individual tiles to be printed, as well as "
-"the order  for their printout. </p>  You can file the field with 2 different "
-"methods:  "
-"<ul>  "
-"<li>Either use the interactive thumbnail preview above and '[SHIFT]-click' on "
-"the tiles. </li>  "
-"<li>Or edit this text field accordingly. </li>  </ul>  "
-"<p>When editing the field, you can use a '3-7' syntax instead of a '3,4,5,6,7' "
-"one. </p>  "
-"<p><b>Examples:</b></p>  "
-"<pre>    \"2,3,7,9,3\"  "
-"<br>    \"1-3,6,8-11\"  </qt>"
-msgstr ""
+"Unable to set correct permissions on spool directory %1 for printer <b>%2</b>."
+msgstr "无法为打印机<b>%2</b>的假脱机目录 %1 设置正确的权限。"
 
-#: kpposterpage.cpp:160
-msgid "Poster"
-msgstr "海报"
+#: lpd/kmlpdmanager.cpp:237
+msgid "Permission denied: you must be root."
+msgstr "没有权限：您必须是 root。"
 
-#: kpposterpage.cpp:162
-msgid "&Print poster"
-msgstr "打印海报(&P)"
+#: lpd/kmlpdmanager.cpp:244
+msgid "Unable to execute command \"%1\"."
+msgstr "无法执行命令“%1”。"
 
-#: kpposterpage.cpp:176
-msgid "Poste&r size:"
-msgstr "海报大小(&R)："
+#: lpd/kmlpdmanager.cpp:317
+msgid "Unable to write printcap file."
+msgstr "无法写 printcap 文件。"
 
-#: kpposterpage.cpp:178
-msgid "Media size:"
-msgstr "纸张大小："
+#: lpd/kmlpdmanager.cpp:372
+msgid "Couldn't find driver <b>%1</b> in printtool database."
+msgstr "在打印工具数据库中找不到驱动程序 <b>%1</b>。"
 
-#: kpposterpage.cpp:180
-msgid "Pri&nt size:"
-msgstr "打印大小(&N)："
+#: lpd/kmlpdmanager.cpp:411
+msgid "Couldn't find printer <b>%1</b> in printcap file."
+msgstr "在 printcap 文件中找不到打印机 <b>%1</b>。"
 
-#: kpposterpage.cpp:187
-#, no-c-format
-msgid "C&ut margin (% of media):"
-msgstr "裁剪边距(纸张的百分比)(&U)："
+#: lpd/kmlpdmanager.cpp:440
+msgid "No driver found (raw printer)"
+msgstr "没有找到驱动程序(raw 打印机)"
 
-#: kpposterpage.cpp:191
-msgid "&Tile pages (to be printed):"
-msgstr "平铺页面(要打印的)(&T)："
+#: lpd/kmlpdmanager.cpp:442
+msgid "Printer type not recognized."
+msgstr "不认识的打印机类型。"
 
-#: kpposterpage.cpp:198
-msgid "Link/unlink poster and print size"
-msgstr "链接/取消链接海报和打印大小"
+#: lpd/kmlpdmanager.cpp:452
+msgid ""
+"The driver device <b>%1</b> is not compiled in your GhostScript distribution. "
+"Check your installation or use another driver."
+msgstr "在您的 GhostScript 中没有编译进驱动程序 <b>%1</b>。请检查您的安装或使用另外的驱动程序。"
 
-#: kpposterpage.cpp:263
-msgid "Unknown"
-msgstr "未知"
+#: lpd/kmlpdmanager.cpp:560
+msgid "Unable to write driver associated files in spool directory."
+msgstr "无法在假脱机目录中写和驱动程序相关的文件。"
+
+#: driver.cpp:387
+msgid "JCL"
+msgstr "JCL"
 
 #: kxmlcommand.cpp:789
 msgid "One of the command object's requirements is not met."
@@ -5709,10 +5783,6 @@ msgstr "命令对象的一个必要条件没有满足。"
 msgid "The command does not contain the required tag %1."
 msgstr "命令没有包含必需的标记“%1”。"
 
-#: kprintaction.cpp:117 kprintaction.cpp:122 kprintaction.cpp:127
-msgid "&Export..."
-msgstr "导出(&E)..."
-
 #: kpfilterpage.cpp:42
 msgid ""
 " <qt> <b>Add Filter button</b> "
@@ -5843,74 +5913,11 @@ msgstr "<p>过滤器链有错误。至少有一个过滤器的输出格式不被
 msgid "Input"
 msgstr "输入"
 
-#: kpqtpage.cpp:70
-msgid ""
-" <qt>  <b>Selection of color mode:</b> You can choose between 2 options:  "
-"<ul>"
-"<li><b>Color</b> and</li>  "
-"<li><b>Grayscale</b></li></ul>  <b>Note:</b> This selection field may be grayed "
-"out and made inactive.  This happens if TDEPrint can not retrieve  enough "
-"information about your print file. In this case the embedded color- or "
-"grayscale information  of your printfile, and the default handling of the "
-"printer take precedence.  </qt>"
-msgstr ""
+#~ msgid "%1 &Handbook"
+#~ msgstr "%1 手册(&H)"
 
-#: kpqtpage.cpp:79
-msgid ""
-" <qt>  <b>Selection of page size:</b> Select paper size to be printed on from  "
-"the drop-down menu.  "
-"<p>The exact list of choices depends on the printer driver (\"PPD\") you have "
-"installed.  </qt>"
-msgstr ""
+#~ msgid "%1 &Web Site"
+#~ msgstr "%1 网站(&W)"
 
-#: kpqtpage.cpp:84
-msgid ""
-" <qt>  <b>Selection of pages per sheet:</b>  You can choose to print more than "
-"one page onto each sheet of paper.  This is sometimes useful to save paper.  "
-"<p><b>Note 1:</b> the page images get scaled down accordingly to print 2 or 4 "
-"pages per sheet.  The page image does not get scaled if you print 1 page per "
-"sheet (the default setting.).  "
-"<p><b>Note 2:</b> If you select multiple pages per sheet here, the scaling and "
-"re-arranging is done  by your printing system.  "
-"<p><b>Note 3, regarding \"Other\":</b> You cannot really select <em>Other</em> "
-"as the number of  pages to print on one sheet.\"Other\" is checkmarked here for "
-"information purposes only.  "
-"<p>To select 8, 9, 16 or other numbers of  pages per sheet:  "
-"<ul>  "
-"<li> go to the tab headlined \"Filter\"</li> "
-"<li> enable the <em>Multiple Pages per Sheet</em> filter </li> "
-"<li> and configure it (bottom-most button on the right of the \"Filters\" tab). "
-"</li> </ul> </qt>"
-msgstr ""
-
-#: kpqtpage.cpp:102
-msgid ""
-" <qt>  <b>Selection of image orientation:</b> Orientation of the printed  "
-"pageimage on your paper is controlled by the radio buttons. By default,  the "
-"orientation is <em>Portrait</em>  "
-"<p>You can select 2 alternatives:  "
-"<ul>  "
-"<li> <b>Portrait.</b>.Portrait is the default setting. </li>  "
-"<li> <b>Landscape.</b> </li>  </ul>  The icon changes according to your "
-"selection. </qt>"
-msgstr ""
-
-#: kpqtpage.cpp:113
-msgid "Print Format"
-msgstr "打印格式"
-
-#: kpqtpage.cpp:123
-msgid "Color Mode"
-msgstr "彩色模式"
-
-#: kpqtpage.cpp:135
-msgid "Colo&r"
-msgstr "彩色(&R)"
-
-#: kpqtpage.cpp:138
-msgid "&Grayscale"
-msgstr "灰度(&G)"
-
-#: kpqtpage.cpp:151
-msgid "Ot&her"
-msgstr "其它(&H)"
+#~ msgid "Documentation"
+#~ msgstr "文档"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdestyle_highcontrast_config.po b/tde-i18n-zh_CN/messages/tdelibs/tdestyle_highcontrast_config.po
index 0b211209e1a..fa3ebeb1843 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdestyle_highcontrast_config.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdestyle_highcontrast_config.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdestyle_hicontract_config\n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2005-06-12 16:53+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdestyle_plastik_config.po b/tde-i18n-zh_CN/messages/tdelibs/tdestyle_plastik_config.po
index 2c659cd2bca..d93a91f44ec 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdestyle_plastik_config.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdestyle_plastik_config.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdestyle_plastik_config\n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2005-01-03 22:47+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdetexteditor_autobookmarker.po b/tde-i18n-zh_CN/messages/tdelibs/tdetexteditor_autobookmarker.po
index 314748596c3..b856360bb54 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdetexteditor_autobookmarker.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdetexteditor_autobookmarker.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdetexteditor_autobookmarker\n"
-"POT-Creation-Date: 2005-06-14 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2004-05-03 13:09+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -17,43 +18,43 @@ msgstr "自动书签"
 msgid "Configure AutoBookmarks"
 msgstr "配置自动书签"
 
-#: autobookmarker.cpp:280
+#: autobookmarker.cpp:279
 msgid "Edit Entry"
 msgstr "编辑项"
 
-#: autobookmarker.cpp:288
+#: autobookmarker.cpp:287
 msgid "&Pattern:"
 msgstr "模式(&P)："
 
-#: autobookmarker.cpp:294
+#: autobookmarker.cpp:293
 msgid "<p>A regular expression. Matching lines will be bookmarked.</p>"
 msgstr "<p>正规表达式。匹配的行将会被加为书签。</p>"
 
-#: autobookmarker.cpp:298
+#: autobookmarker.cpp:297
 msgid "Case &sensitive"
 msgstr "区分大小写(&S)"
 
-#: autobookmarker.cpp:302
+#: autobookmarker.cpp:301
 msgid ""
 "<p>If enabled, the pattern matching will be case sensitive, otherwise not.</p>"
 msgstr "<p>启用后，模式匹配将会区分大小写，否则不会。</p>"
 
-#: autobookmarker.cpp:305
+#: autobookmarker.cpp:304
 msgid "&Minimal matching"
 msgstr "最小匹配(&M)"
 
-#: autobookmarker.cpp:309
+#: autobookmarker.cpp:308
 msgid ""
 "<p>If enabled, the pattern matching will use minimal matching; if you do not "
 "know what that is, please read the appendix on regular expressions in the kate "
 "manual.</p>"
 msgstr "<p>启用后，模式匹配将会使用最小匹配；如果您不知道最小匹配是什么的话，请阅读 kate 手册中关于正规表达式的俘虏。</p>"
 
-#: autobookmarker.cpp:313
+#: autobookmarker.cpp:312
 msgid "&File mask:"
 msgstr "文件通配符(&F)："
 
-#: autobookmarker.cpp:319
+#: autobookmarker.cpp:318
 msgid ""
 "<p>A list of filename masks, separated by semicolons. This can be used to limit "
 "the usage of this entity to files with matching names.</p>"
@@ -63,11 +64,11 @@ msgstr ""
 "<p>以分号分隔的文件名通配符列表。此列表可用于限制此项仅针对特定扩展名的文件。</p>"
 "<p>使用 MIME 类型项右侧的向导按钮可轻松的填入这两个列表。</p>"
 
-#: autobookmarker.cpp:324
+#: autobookmarker.cpp:323
 msgid "MIME &types:"
 msgstr "MIME 类型(&T)："
 
-#: autobookmarker.cpp:330
+#: autobookmarker.cpp:329
 msgid ""
 "<p>A list of mime types, separated by semicolon. This can be used to limit the "
 "usage of this entity to files with matching mime types.</p>"
@@ -77,14 +78,14 @@ msgstr ""
 "<p>以分号分隔的 MIME 类型列表。此列表可用于限制此项仅针对特定 MIME 类型的文件。</p>"
 "<p>使用右侧的向导按钮可获得现有的文件类型列表，您可从中加以选择，这样也可以同时填入文件通配符。</p>"
 
-#: autobookmarker.cpp:340
+#: autobookmarker.cpp:339
 msgid ""
 "<p>Click this button to display a checkable list of mimetypes available on your "
 "system. When used, the file masks entry above will be filled in with the "
 "corresponding masks.</p>"
 msgstr "<p>单击此按钮可显示您系统中可用的 MIME 类型列表。如果您选中了某项，就会在上面的文件通配符中填入相应的通配符。</p>"
 
-#: autobookmarker.cpp:365
+#: autobookmarker.cpp:364
 msgid ""
 "Select the MimeTypes for this pattern.\n"
 "Please note that this will automatically edit the associated file extensions as "
@@ -93,27 +94,27 @@ msgstr ""
 "选择此模式的 MIME 类型。\n"
 "请注意，这也将自动编辑关联的文件扩展名。"
 
-#: autobookmarker.cpp:367
+#: autobookmarker.cpp:366
 msgid "Select Mime Types"
 msgstr "选择 MIME 类型"
 
-#: autobookmarker.cpp:385
+#: autobookmarker.cpp:384
 msgid "&Patterns"
 msgstr "模式(&P)"
 
-#: autobookmarker.cpp:388
+#: autobookmarker.cpp:387
 msgid "Pattern"
 msgstr "模式"
 
-#: autobookmarker.cpp:389
+#: autobookmarker.cpp:388
 msgid "Mime Types"
 msgstr "MIME 类型"
 
-#: autobookmarker.cpp:390
+#: autobookmarker.cpp:389
 msgid "File Masks"
 msgstr "文件通配符"
 
-#: autobookmarker.cpp:394
+#: autobookmarker.cpp:393
 msgid ""
 "<p>This list shows your configured autobookmark entities. When a document is "
 "opened, each entity is used in the following way: "
@@ -130,22 +131,22 @@ msgstr ""
 "<li>否则，将会对文档的每一行比对模式，并在匹配行上设置书签。</li></ul>"
 "<p>使用下面的按钮可管理您的自动书签项。</p>"
 
-#: autobookmarker.cpp:406
+#: autobookmarker.cpp:405
 msgid "&New..."
 msgstr "新建(&N)..."
 
-#: autobookmarker.cpp:409
+#: autobookmarker.cpp:408
 msgid "Press this button to create a new autobookmark entity."
 msgstr "按此按钮可创建新的自动书签项。"
 
-#: autobookmarker.cpp:414
+#: autobookmarker.cpp:413
 msgid "Press this button to delete the currently selected entity."
 msgstr "按此按钮可删除目前选中的项。"
 
-#: autobookmarker.cpp:416
+#: autobookmarker.cpp:415
 msgid "&Edit..."
 msgstr "编辑(&E)..."
 
-#: autobookmarker.cpp:419
+#: autobookmarker.cpp:418
 msgid "Press this button to edit the currently selected entity."
 msgstr "按此按钮可编辑目前选中的项。"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdetexteditor_docwordcompletion.po b/tde-i18n-zh_CN/messages/tdelibs/tdetexteditor_docwordcompletion.po
index c2dbaf31fcb..dc5a7aace41 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdetexteditor_docwordcompletion.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdetexteditor_docwordcompletion.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdetexteditor_docwordcompletion\n"
-"POT-Creation-Date: 2007-02-18 02:38+0100\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2005-01-20 01:21+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdetexteditor_insertfile.po b/tde-i18n-zh_CN/messages/tdelibs/tdetexteditor_insertfile.po
index 9ce6dad7104..cb88bb0ad0c 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdetexteditor_insertfile.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdetexteditor_insertfile.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdetexteditor_insertfile\n"
-"POT-Creation-Date: 2005-06-14 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2003-12-27 23:11+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdetexteditor_isearch.po b/tde-i18n-zh_CN/messages/tdelibs/tdetexteditor_isearch.po
index 737aaf67158..4c556b030bc 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdetexteditor_isearch.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdetexteditor_isearch.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdetexteditor_isearch\n"
-"POT-Creation-Date: 2007-05-29 02:14+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2003-01-12 16:06-0500\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdetexteditor_kdatatool.po b/tde-i18n-zh_CN/messages/tdelibs/tdetexteditor_kdatatool.po
index c78b24c8652..c6daa4d22cd 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdetexteditor_kdatatool.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdetexteditor_kdatatool.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdetexteditor_kdatatool\n"
-"POT-Creation-Date: 2005-05-18 21:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:46-0500\n"
 "PO-Revision-Date: 2002-10-10 14:04+0800\n"
 "Last-Translator: Funda Wang <fundawang@en2china.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/artsbuilder.po b/tde-i18n-zh_CN/messages/tdemultimedia/artsbuilder.po
index bca84df48ac..7e20f90132b 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/artsbuilder.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/artsbuilder.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: artsbuilder\n"
-"POT-Creation-Date: 2005-07-24 01:37+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-07-12 19:35+0800\n"
 "Last-Translator: Funda Wang <fundawang@en2china.com>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/artscontrol.po b/tde-i18n-zh_CN/messages/tdemultimedia/artscontrol.po
index 625dac8d48c..e59708cbaea 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/artscontrol.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/artscontrol.po
@@ -10,20 +10,21 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: artscontrol\n"
-"POT-Creation-Date: 2005-01-08 01:21+0100\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2003-12-21 00:12+0800\n"
 "Last-Translator: Liu Songhe <jackliu9999@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: artscontrolapplet_private.h:85
+#: artscontrolapplet_private.h:86
 msgid "Toggle &Inline FFT Scope"
 msgstr "切换内部 FFT 视图(&I)"
 
-#: artscontrolapplet_private.h:98 fftscopeview.cpp:89
+#: artscontrolapplet_private.h:99 fftscopeview.cpp:89
 msgid "VU-Style"
 msgstr "VU风格"
 
diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/artsmodules.po b/tde-i18n-zh_CN/messages/tdemultimedia/artsmodules.po
index 5c67b41eaae..6ef309954d3 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/artsmodules.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/artsmodules.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: artsmodules 3.2\n"
-"POT-Creation-Date: 2007-10-24 01:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2003-12-26 23:32+0800\n"
 "Last-Translator: Yan Shuangchun <yahzee@d3eye.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/audiocd_encoder_lame.po b/tde-i18n-zh_CN/messages/tdemultimedia/audiocd_encoder_lame.po
index 967dda8c859..269d09cce28 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/audiocd_encoder_lame.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/audiocd_encoder_lame.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: audiocd_encodier_lame\n"
-"POT-Creation-Date: 2005-05-09 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2005-08-02 16:48+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/audiocd_encoder_vorbis.po b/tde-i18n-zh_CN/messages/tdemultimedia/audiocd_encoder_vorbis.po
index 1534a490b5e..b9705546b58 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/audiocd_encoder_vorbis.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/audiocd_encoder_vorbis.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: audiocd_encoder_vorbis\n"
-"POT-Creation-Date: 2005-05-09 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2005-08-02 16:53+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/juk.po b/tde-i18n-zh_CN/messages/tdemultimedia/juk.po
index 65282f560e3..1558cd9b79f 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/juk.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/juk.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: juk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2005-10-08 22:07+0800\n"
 "Last-Translator: Yan Shuangchun <yahzee@d3eye.com>\n"
 "Language-Team: zh_CN <18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -502,15 +503,15 @@ msgstr "历史"
 msgid "&Output To"
 msgstr "输出到(&O)"
 
-#: playermanager.cpp:249 playermanager.cpp:552
+#: playermanager.cpp:249 playermanager.cpp:563
 msgid "aRts"
 msgstr "aRts"
 
-#: playermanager.cpp:252 playermanager.cpp:554
+#: playermanager.cpp:252 playermanager.cpp:565
 msgid "GStreamer"
 msgstr "GStreamer"
 
-#: playermanager.cpp:255 playermanager.cpp:260 playermanager.cpp:556
+#: playermanager.cpp:255 playermanager.cpp:260 playermanager.cpp:567
 msgid "aKode"
 msgstr "aKode"
 
@@ -552,13 +553,13 @@ msgid "Track Name"
 msgstr "曲目名"
 
 #. i18n: file coverdialogbase.ui line 25
-#: playlist.cpp:1518 rc.cpp:48 rc.cpp:122 rc.cpp:322 tagrenameroptions.cpp:95
+#: playlist.cpp:1518 rc.cpp:48 rc.cpp:122 rc.cpp:322 tagrenameroptions.cpp:97
 #, no-c-format
 msgid "Artist"
 msgstr "艺人"
 
 #. i18n: file exampleoptionsbase.ui line 109
-#: playlist.cpp:1519 rc.cpp:128 rc.cpp:325 tagrenameroptions.cpp:95
+#: playlist.cpp:1519 rc.cpp:128 rc.cpp:325 tagrenameroptions.cpp:97
 #, no-c-format
 msgid "Album"
 msgstr "专辑"
@@ -568,19 +569,19 @@ msgid "Cover"
 msgstr "封面"
 
 #. i18n: file trackpickerdialogbase.ui line 122
-#: playlist.cpp:1521 rc.cpp:328 tagrenameroptions.cpp:96
+#: playlist.cpp:1521 rc.cpp:328 tagrenameroptions.cpp:98
 #, no-c-format
 msgid "Track"
 msgstr "音轨"
 
 #. i18n: file exampleoptionsbase.ui line 179
-#: playlist.cpp:1522 rc.cpp:146 tagrenameroptions.cpp:96
+#: playlist.cpp:1522 rc.cpp:146 tagrenameroptions.cpp:98
 #, no-c-format
 msgid "Genre"
 msgstr "流派"
 
 #. i18n: file trackpickerdialogbase.ui line 133
-#: playlist.cpp:1523 rc.cpp:331 tagrenameroptions.cpp:96
+#: playlist.cpp:1523 rc.cpp:331 tagrenameroptions.cpp:98
 #, no-c-format
 msgid "Year"
 msgstr "年份"
@@ -779,7 +780,7 @@ msgid "&Rename File"
 msgstr "重命名文件(&R)"
 
 #. i18n: file coverdialogbase.ui line 16
-#: playlistcollection.cpp:885 rc.cpp:45 viewmode.h:155
+#: playlistcollection.cpp:885 rc.cpp:45 viewmode.h:158
 #, no-c-format
 msgid "Cover Manager"
 msgstr "封面管理器"
@@ -995,7 +996,7 @@ msgid "Example Tags"
 msgstr "示例标签"
 
 #. i18n: file exampleoptionsbase.ui line 101
-#: rc.cpp:125 tagrenameroptions.cpp:95
+#: rc.cpp:125 tagrenameroptions.cpp:97
 #, no-c-format
 msgid "Title"
 msgstr "标题"
@@ -1490,7 +1491,7 @@ msgstr "启用"
 msgid "Tag Guesser Configuration"
 msgstr "标签猜测器配置"
 
-#: tagrenameroptions.cpp:102
+#: tagrenameroptions.cpp:104
 msgid "Unknown"
 msgstr "未知"
 
@@ -1582,11 +1583,11 @@ msgstr "封面不可用"
 msgid "Playlist"
 msgstr "播放列表"
 
-#: viewmode.h:103
+#: viewmode.h:104
 msgid "Compact"
 msgstr "紧凑"
 
-#: viewmode.h:128
+#: viewmode.h:130
 msgid "Tree"
 msgstr "树型"
 
diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/kaboodle.po b/tde-i18n-zh_CN/messages/tdemultimedia/kaboodle.po
index 4dc3623c1a2..33a65ee423f 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/kaboodle.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/kaboodle.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kaboodle 3.1\n"
-"POT-Creation-Date: 2005-01-24 01:34+0100\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2002-11-11 23:30+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -67,7 +68,8 @@ msgid "URL to open"
 msgstr "要打开的 URL"
 
 #: main.cpp:40
-msgid "Turn on Qt Debug output"
+#, fuzzy
+msgid "Turn on TQt Debug output"
 msgstr "打开 Qt 调试输出"
 
 #: player.cpp:63
diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/kaudiocreator.po b/tde-i18n-zh_CN/messages/tdemultimedia/kaudiocreator.po
index 280517de125..41384b60cee 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/kaudiocreator.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/kaudiocreator.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kaudiocreator\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2005-08-02 06:27+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/kcmaudiocd.po b/tde-i18n-zh_CN/messages/tdemultimedia/kcmaudiocd.po
index 040ecf68682..0b6ce14f67e 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/kcmaudiocd.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/kcmaudiocd.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmaudiocd\n"
-"POT-Creation-Date: 2007-03-26 02:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2005-01-21 17:24+0800\n"
 "Last-Translator: Lou Bingyong <loubingyong@hotmail.com>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/kcmcddb.po b/tde-i18n-zh_CN/messages/tdemultimedia/kcmcddb.po
index df430144237..7edfbaceb0e 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/kcmcddb.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/kcmcddb.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcddb\n"
-"POT-Creation-Date: 2005-01-31 01:32+0100\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2005-01-21 17:20+0800\n"
 "Last-Translator: Xiong Jiang <jxiong@offtopic.org>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/kmix.po b/tde-i18n-zh_CN/messages/tdemultimedia/kmix.po
index cf9c84cd498..cee56ea805c 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/kmix.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/kmix.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmix 3.4\n"
-"POT-Creation-Date: 2008-08-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2005-07-17 09:54+0800\n"
 "Last-Translator: Liu Songhe <jackliu9999@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -55,7 +56,7 @@ msgstr "配置全局快捷键(&G)..."
 msgid "Hardware &Information"
 msgstr "硬件信息(&I)"
 
-#: kmix.cpp:120 kmixdockwidget.cpp:369
+#: kmix.cpp:120 kmixdockwidget.cpp:399
 msgid "Hide Mixer Window"
 msgstr "隐藏混音器窗口"
 
@@ -79,11 +80,11 @@ msgstr "当前混音器："
 msgid "Select Channel"
 msgstr "选择声道"
 
-#: kmix.cpp:513
+#: kmix.cpp:520
 msgid "The change of orientation will be adopted on the next start of KMix."
 msgstr "对方向的更改要等到 KMix 下次启动才会生效。"
 
-#: kmix.cpp:594
+#: kmix.cpp:601
 msgid "Mixer Hardware Information"
 msgstr "混音器硬件信息"
 
@@ -140,27 +141,27 @@ msgstr "恢复默认音量"
 msgid "KMixCtrl"
 msgstr "KMixCtrl"
 
-#: kmixdockwidget.cpp:82
+#: kmixdockwidget.cpp:84
 msgid "M&ute"
 msgstr "静音(&U)"
 
-#: kmixdockwidget.cpp:90
+#: kmixdockwidget.cpp:92
 msgid "Select Master Channel..."
 msgstr "选择主声道..."
 
-#: kmixdockwidget.cpp:177
+#: kmixdockwidget.cpp:183
 msgid "Mixer cannot be found"
 msgstr "找不到混音器"
 
-#: kmixdockwidget.cpp:188
+#: kmixdockwidget.cpp:194
 msgid "Volume at %1%"
 msgstr "音量为 %1%"
 
-#: kmixdockwidget.cpp:190
+#: kmixdockwidget.cpp:196
 msgid " (Muted)"
 msgstr " (已静音)"
 
-#: kmixdockwidget.cpp:373
+#: kmixdockwidget.cpp:403
 msgid "Show Mixer Window"
 msgstr "显示混音器窗口"
 
@@ -225,34 +226,46 @@ msgid "Restore volumes on login"
 msgstr "登录时恢复音量"
 
 #: kmixprefdlg.cpp:72
+msgid "Middle click on system tray icon toggles muting"
+msgstr ""
+
+#: kmixprefdlg.cpp:76
 msgid "Numbers"
 msgstr "数值"
 
-#: kmixprefdlg.cpp:74
+#: kmixprefdlg.cpp:78
 msgid "Volume Values: "
 msgstr "音量值："
 
-#: kmixprefdlg.cpp:75
+#: kmixprefdlg.cpp:79
 msgid "&None"
 msgstr "无(&N)"
 
-#: kmixprefdlg.cpp:76
+#: kmixprefdlg.cpp:80
 msgid "A&bsolute"
 msgstr "绝对(&B)"
 
-#: kmixprefdlg.cpp:77
+#: kmixprefdlg.cpp:81
 msgid "&Relative"
 msgstr "相对(&R)"
 
 #: kmixprefdlg.cpp:93
+msgid "&Autostart"
+msgstr ""
+
+#: kmixprefdlg.cpp:95
+msgid "Automatically start mixer when you login"
+msgstr ""
+
+#: kmixprefdlg.cpp:101
 msgid "Slider Orientation: "
 msgstr "滑块方向："
 
-#: kmixprefdlg.cpp:94
+#: kmixprefdlg.cpp:102
 msgid "&Horizontal"
 msgstr "水平(&H)"
 
-#: kmixprefdlg.cpp:95
+#: kmixprefdlg.cpp:103
 msgid "&Vertical"
 msgstr "垂直(&V)"
 
@@ -362,7 +375,7 @@ msgstr "切换开关"
 msgid "unknown"
 msgstr "未知"
 
-#: mixer_alsa9.cpp:807
+#: mixer_alsa9.cpp:795
 msgid ""
 "You do not have permission to access the alsa mixer device.\n"
 "Please verify if all alsa devices are properly created."
@@ -370,7 +383,7 @@ msgstr ""
 "您没有权限访问 ALSA 混音器设备。\n"
 "请校验是否所有的 ALSA 设备都被正确创建了。"
 
-#: mixer_alsa9.cpp:811
+#: mixer_alsa9.cpp:799
 msgid ""
 "Alsa mixer cannot be found.\n"
 "Please check that the soundcard is installed and the\n"
@@ -543,7 +556,7 @@ msgstr "3D 中心"
 msgid "unused"
 msgstr "未使用"
 
-#: mixer_oss.cpp:211 mixer_oss4.cpp:341
+#: mixer_oss.cpp:211 mixer_oss4.cpp:364
 msgid ""
 "kmix: You do not have permission to access the mixer device.\n"
 "Login as root and do a 'chmod a+rw /dev/mixer*' to allow the access."
@@ -551,7 +564,7 @@ msgstr ""
 "kmix：您没有权限访问混音器设备。\n"
 "以超级用户身份登录，使用“chmod a+rw /dev/mixer*”命令来打开访问。"
 
-#: mixer_oss.cpp:215 mixer_oss4.cpp:345
+#: mixer_oss.cpp:215
 msgid ""
 "kmix: Mixer cannot be found.\n"
 "Please check that the soundcard is installed and the\n"
@@ -564,6 +577,26 @@ msgstr ""
 "在 Linux 上您应该使用“insmod”来载入驱动。\n"
 "如果使用商业的 OSS，用“soundon”。"
 
+#: mixer_oss4.cpp:368
+#, fuzzy
+msgid ""
+"kmix: Mixer cannot be found.\n"
+"Please check that the soundcard is installed and the\n"
+"soundcard driver is loaded.\n"
+"On Linux you might need to use 'insmod' to load the driver.\n"
+"Use 'soundon' when using OSS4 from 4front."
+msgstr ""
+"kmix: 无法找到混音器设备。\n"
+"请检查是否安装了声卡，是否载入了声卡驱动程序。\n"
+"在 Linux 上您应该使用“insmod”来载入驱动。\n"
+"如果使用商业的 OSS，用“soundon”。"
+
+#: mixer_oss4.cpp:375
+msgid ""
+"kmix expected an OSSv4 mixer module,\n"
+"but instead found an older version."
+msgstr ""
+
 #: mixer_sun.cpp:66
 msgid "Master Volume"
 msgstr "主音量"
@@ -596,11 +629,11 @@ msgstr ""
 "kmix：您没有权限访问混音器设备。\n"
 "请求您的系统管理员修改 /dev/audioctl 以便允许访问。"
 
-#: mixertoolbox.cpp:196
+#: mixertoolbox.cpp:225
 msgid "Sound drivers supported:"
 msgstr "支持的声音驱动程序："
 
-#: mixertoolbox.cpp:197
+#: mixertoolbox.cpp:226
 msgid "Sound drivers used:"
 msgstr "使用的声音驱动程序："
 
diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/krec.po b/tde-i18n-zh_CN/messages/tdemultimedia/krec.po
index df2f88de36b..7c921d7cba4 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/krec.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/krec.po
@@ -9,10 +9,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2006-08-20 04:11+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-03-24 17:06+0800\n"
 "Last-Translator: redarmy <redarmy@linuxaid.com.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -466,8 +467,9 @@ msgid "Unable to Find Compressor"
 msgstr "无法找到压缩器"
 
 #: main.cpp:30
+#, fuzzy
 msgid ""
-"This is a recording tool for TDE.\n"
+"This is a recording tool for KDE.\n"
 "It uses aRts, just look at the audiomanager\n"
 "and you will find it there accepting sound\n"
 "for recording."
@@ -515,7 +517,7 @@ msgstr "播放"
 msgid "Compressor"
 msgstr "压缩器"
 
-#: tips.cpp:3
+#: tips.txt:3
 msgid ""
 "<h4>...that KRec does non-destructive Recording?</h4>\n"
 "<p>\n"
@@ -531,7 +533,7 @@ msgstr ""
 "\n"
 "</p>\n"
 
-#: tips.cpp:11
+#: tips.txt:11
 msgid ""
 "<h4>...which event caused the first version of KRec?</h4>\n"
 "<p>\n"
@@ -547,7 +549,7 @@ msgstr ""
 "KRec 了。\n"
 "</p>\n"
 
-#: tips.cpp:19
+#: tips.txt:19
 msgid ""
 "<h4>...that developers are very happy to hear from the users?</h4>\n"
 "<p>\n"
@@ -563,7 +565,7 @@ msgstr ""
 "KRec”中得到作者的邮件地址。\n"
 "</p>\n"
 
-#: tips.cpp:27
+#: tips.txt:27
 msgid ""
 "<h4>...that you are invited to report bugs?</h4>\n"
 "<p>\n"
@@ -578,7 +580,7 @@ msgstr ""
 "http://bugs.kde.org 报告错误。\n"
 "</p>\n"
 
-#: tips.cpp:35
+#: tips.txt:35
 msgid ""
 "<h4>...that KRec is far from complete?</h4>\n"
 "<p>\n"
diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/kscd.po b/tde-i18n-zh_CN/messages/tdemultimedia/kscd.po
index c90ea49e202..a90c736b045 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/kscd.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/kscd.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kscd 3.4\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2005-07-17 09:56+0800\n"
 "Last-Translator: Liu Songhe <jackliu9999@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/libkcddb.po b/tde-i18n-zh_CN/messages/tdemultimedia/libkcddb.po
index 3db13c572cb..acd43055f19 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/libkcddb.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/libkcddb.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkcddb\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2005-08-02 06:23+0800\n"
 "Last-Translator: Yan Shuangchun <yahzee@d3eye.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/noatun.po b/tde-i18n-zh_CN/messages/tdemultimedia/noatun.po
index a474d3df25a..90725edecfd 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/noatun.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/noatun.po
@@ -7,405 +7,418 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-08-01 16:49+0800\n"
 "Last-Translator: Liu Songhe <jackliu9999@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. i18n: file ./library/equalizerwidget.ui line 16
-#: library/equalizerview.cpp:111 rc.cpp:3
-#, no-c-format
-msgid "Equalizer"
-msgstr "均衡器"
-
-#. i18n: file ./library/equalizerwidget.ui line 38
-#: rc.cpp:6
-#, no-c-format
-msgid "Pre&amp:"
-msgstr "前置放大器(&A)："
-
-#. i18n: file ./library/equalizerwidget.ui line 123
-#: rc.cpp:9
-#, no-c-format
-msgid "+/-"
-msgstr "+/-"
-
-#. i18n: file ./library/equalizerwidget.ui line 138
+#. i18n: file ./modules/simple/propertiesdialog.ui line 38
 #: rc.cpp:12
 #, no-c-format
-msgid "&Bands"
-msgstr "波段(&B)"
+msgid "&Details"
+msgstr "细节(&D)"
 
-#. i18n: file ./library/equalizerwidget.ui line 173
+#. i18n: file ./modules/simple/propertiesdialog.ui line 138
 #: rc.cpp:15
 #, no-c-format
-msgid "&Presets"
-msgstr "预置(&P)"
+msgid "Type:"
+msgstr "类型："
 
-#. i18n: file ./library/equalizerwidget.ui line 217
+#. i18n: file ./modules/simple/propertiesdialog.ui line 163
+#: rc.cpp:18
+#, no-c-format
+msgid "Length:"
+msgstr "长度："
+
+#. i18n: file ./modules/simple/propertiesdialog.ui line 184
 #: rc.cpp:21
 #, no-c-format
-msgid "A&dd"
-msgstr "添加(&D)"
+msgid "Audio:"
+msgstr "音频："
 
-#. i18n: file ./library/equalizerwidget.ui line 252
+#. i18n: file ./modules/simple/propertiesdialog.ui line 205
 #: rc.cpp:24
 #, no-c-format
-msgid "&Enabled"
-msgstr "启用(&E)"
+msgid "Video:"
+msgstr "视频："
 
-#. i18n: file ./library/equalizerwidget.ui line 277
+#. i18n: file ./modules/simple/propertiesdialog.ui line 228
 #: rc.cpp:27
 #, no-c-format
-msgid "&Number of bands:"
-msgstr "波段数(&N)："
+msgid "&PlayObject"
+msgstr "播放对象(&P)"
 
-#. i18n: file ./library/equalizerwidget.ui line 316
+#. i18n: file ./modules/simple/propertiesdialog.ui line 257
 #: rc.cpp:30
 #, no-c-format
-msgid "Re&set EQ"
-msgstr "重置均衡(&S)"
+msgid "Description:"
+msgstr "描述："
 
-#. i18n: file ./modules/excellent/excellentui.rc line 12
-#: rc.cpp:36 rc.cpp:120
+#. i18n: file ./modules/simple/propertiesdialog.ui line 268
+#: rc.cpp:33
+#, no-c-format
+msgid "Capabilities"
+msgstr "容量"
+
+#. i18n: file ./modules/kaiman/kaimanui.rc line 16
+#: rc.cpp:42 rc.cpp:57
 #, no-c-format
 msgid "&Go"
 msgstr "播放(&G)"
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 31
-#: rc.cpp:48
+#: rc.cpp:66
 #, no-c-format
 msgid "&General"
 msgstr "常规(&G)"
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 42
-#: rc.cpp:51
+#: rc.cpp:69
 #, no-c-format
 msgid "Show a &tooltip for the current track"
 msgstr "显示关于当前曲目的工具提示(&T)"
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 50
-#: rc.cpp:54
+#: rc.cpp:72
 #, no-c-format
 msgid "Show &covers in popup window and tooltip"
 msgstr "以弹出式窗口和工具提示显示封面(&C)"
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 58
-#: rc.cpp:57
+#: rc.cpp:75
 #, no-c-format
 msgid "Popup Window"
 msgstr "弹出窗口"
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 69
-#: rc.cpp:60
+#: rc.cpp:78
 #, no-c-format
 msgid "Display popup window t&ime:"
 msgstr "显示弹出窗口时间(&I)："
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 80
-#: rc.cpp:63
+#: rc.cpp:81
 #, no-c-format
 msgid "Show &buttons in popup window"
 msgstr "在弹出窗口中显示按钮(&B)"
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 88
-#: rc.cpp:66
+#: rc.cpp:84
 #, no-c-format
 msgid "s"
 msgstr "秒"
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 106
-#: rc.cpp:69
+#: rc.cpp:87
 #, no-c-format
 msgid "Announce tracks with a &popup window"
 msgstr "以弹出式窗口通知曲目(&P)"
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 116
-#: rc.cpp:72
+#: rc.cpp:90
 #, no-c-format
 msgid "State Icon Display"
 msgstr "状态图标显示"
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 130
-#: rc.cpp:75
+#: rc.cpp:93
 #, no-c-format
 msgid "&Animated"
 msgstr "动画(&A)"
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 138
-#: rc.cpp:78
+#: rc.cpp:96
 #, no-c-format
 msgid "&Flashing"
 msgstr "闪烁(&F)"
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 146
-#: rc.cpp:81
+#: rc.cpp:99
 #, no-c-format
 msgid "&Static"
 msgstr "静态(&S)"
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 157
 #: library/noatunstdaction.cpp:165 modules/kaiman/userinterface.cpp:539
-#: modules/kjofol-skin/kjbutton.cpp:230 rc.cpp:84 rc.cpp:190
+#: modules/kjofol-skin/kjbutton.cpp:230 rc.cpp:102 rc.cpp:144
 #, no-c-format
 msgid "&None"
 msgstr "无(&N)"
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 186
-#: rc.cpp:87
+#: rc.cpp:105
 #, no-c-format
 msgid "Ad&vanced"
 msgstr "高级(&V)"
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 197
-#: rc.cpp:90
+#: rc.cpp:108
 #, no-c-format
 msgid "Middle Mouse Button Action"
 msgstr "鼠标中键动作"
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 208
-#: rc.cpp:93
+#: rc.cpp:111
 #, no-c-format
 msgid "Hide / Show play&list"
 msgstr "隐藏/显示播放列表(&L)"
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 216
-#: rc.cpp:96
+#: rc.cpp:114
 #, no-c-format
 msgid "&Play / Pause"
 msgstr "播放/暂停(&P)"
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 226
-#: rc.cpp:99
+#: rc.cpp:117
 #, no-c-format
 msgid "Mouse &Wheel"
 msgstr "鼠标滚轮(&W)"
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 245
-#: rc.cpp:102
+#: rc.cpp:120
 #, no-c-format
 msgid "&Keyboard modifier:"
 msgstr "键盘修饰(&K)："
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 263
-#: rc.cpp:105
+#: rc.cpp:123
 #, no-c-format
 msgid "Action:"
 msgstr "动作："
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 271
-#: rc.cpp:108
+#: rc.cpp:126
 #, no-c-format
 msgid "&Nothing"
 msgstr "无(&N)"
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 279
-#: rc.cpp:111
+#: rc.cpp:129
 #, no-c-format
 msgid "Change v&olume"
 msgstr "更改音量(&O)"
 
 #. i18n: file ./modules/systray/yhconfigwidget.ui line 287
-#: rc.cpp:114
+#: rc.cpp:132
 #, no-c-format
 msgid "Switch &track"
 msgstr "切换音轨(&T)"
 
-#. i18n: file ./modules/simple/propertiesdialog.ui line 38
-#: rc.cpp:132
-#, no-c-format
-msgid "&Details"
-msgstr "细节(&D)"
-
-#. i18n: file ./modules/simple/propertiesdialog.ui line 138
-#: rc.cpp:135
-#, no-c-format
-msgid "Type:"
-msgstr "类型："
-
-#. i18n: file ./modules/simple/propertiesdialog.ui line 163
-#: rc.cpp:138
-#, no-c-format
-msgid "Length:"
-msgstr "长度："
-
-#. i18n: file ./modules/simple/propertiesdialog.ui line 184
-#: rc.cpp:141
-#, no-c-format
-msgid "Audio:"
-msgstr "音频："
-
-#. i18n: file ./modules/simple/propertiesdialog.ui line 205
-#: rc.cpp:144
-#, no-c-format
-msgid "Video:"
-msgstr "视频："
-
-#. i18n: file ./modules/simple/propertiesdialog.ui line 228
-#: rc.cpp:147
-#, no-c-format
-msgid "&PlayObject"
-msgstr "播放对象(&P)"
-
-#. i18n: file ./modules/simple/propertiesdialog.ui line 257
-#: rc.cpp:150
-#, no-c-format
-msgid "Description:"
-msgstr "描述："
-
-#. i18n: file ./modules/simple/propertiesdialog.ui line 268
-#: rc.cpp:153
-#, no-c-format
-msgid "Capabilities"
-msgstr "容量"
-
-#. i18n: file ./modules/kjofol-skin/kjskinselectorwidget.ui line 51
-#: rc.cpp:165
-#, no-c-format
-msgid "Preview"
-msgstr "预览"
-
-#. i18n: file ./modules/kjofol-skin/kjskinselectorwidget.ui line 153
-#: rc.cpp:168
-#, no-c-format
-msgid "About skin:"
-msgstr "关于皮肤："
-
-#. i18n: file ./modules/kjofol-skin/kjskinselectorwidget.ui line 170
-#: rc.cpp:171
-#, no-c-format
-msgid ""
-"Here you will see all the comments people wrote about their skins.\n"
-"It can be several lines and usually does not contain anything interesting but "
-"still this will be shown."
-msgstr ""
-"此处您可以看到人们写的关于他们的皮肤的全部注释。\n"
-"它可以有若干行，并且通常不包含任何有趣的东西，但是这仍然会显示出来。"
-
-#. i18n: file ./modules/kjofol-skin/kjskinselectorwidget.ui line 205
-#: rc.cpp:175
-#, no-c-format
-msgid "Install Skin"
-msgstr "安装皮肤"
-
-#. i18n: file ./modules/kjofol-skin/kjskinselectorwidget.ui line 213
-#: rc.cpp:178
-#, no-c-format
-msgid "Remove Skin"
-msgstr "删除皮肤"
-
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 38
-#: rc.cpp:181
+#: rc.cpp:135
 #, no-c-format
 msgid "Visualization"
 msgstr "视觉插件"
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 55
-#: rc.cpp:184
+#: rc.cpp:138
 #, no-c-format
 msgid "Oscillo&scope"
 msgstr "示波器(&S)"
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 63
-#: rc.cpp:187
+#: rc.cpp:141
 #, no-c-format
 msgid "&Analyzer"
 msgstr "频谱分析器(&A)"
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 101
-#: rc.cpp:193
+#: rc.cpp:147
 #, no-c-format
 msgid "U&pdate every:"
 msgstr "更新间隔(&P)："
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 121
-#: rc.cpp:196
+#: rc.cpp:150
 #, no-c-format
 msgid "ms"
 msgstr "毫秒"
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 133
 #: modules/kjofol-skin/kjsliders.cpp:244
-#: modules/kjofol-skin/kjtextdisplay.cpp:537 rc.cpp:199
+#: modules/kjofol-skin/kjtextdisplay.cpp:537 rc.cpp:153
 #, no-c-format
 msgid "Pitch"
 msgstr "音色"
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 172
-#: rc.cpp:202
+#: rc.cpp:156
 #, no-c-format
 msgid "&Lower limit:"
 msgstr "下限(&L)："
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 192
-#: rc.cpp:205 rc.cpp:211
+#: rc.cpp:159 rc.cpp:165
 #, no-c-format
 msgid "%"
 msgstr "%"
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 224
-#: rc.cpp:208
+#: rc.cpp:162
 #, no-c-format
 msgid "&Upper limit:"
 msgstr "上限(&U)："
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 258
-#: rc.cpp:214
+#: rc.cpp:168
 #, no-c-format
 msgid "Display &tooltips"
 msgstr "显示工具提示(&T)"
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 266
-#: rc.cpp:217
+#: rc.cpp:171
 #, no-c-format
 msgid "Display splash sc&reen"
 msgstr "显示欢迎画面(&R)"
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 305
-#: rc.cpp:220
+#: rc.cpp:174
 #, no-c-format
 msgid "T&itle display scrolling speed:"
 msgstr "标题显示滚动速度(&I)："
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 316
-#: rc.cpp:223
+#: rc.cpp:177
 #, no-c-format
 msgid "Slow"
 msgstr "慢"
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 356
-#: modules/winskin/winSkinConfig.cpp:74 rc.cpp:226
+#: modules/winskin/winSkinConfig.cpp:74 rc.cpp:180
 #, no-c-format
 msgid "Fast"
 msgstr "快"
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 366
-#: rc.cpp:229
+#: rc.cpp:183
 #, no-c-format
 msgid "System Font"
 msgstr "系统字体"
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 389
-#: rc.cpp:232
+#: rc.cpp:186
 #, no-c-format
 msgid "Color:"
 msgstr "颜色："
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 397
-#: rc.cpp:235
+#: rc.cpp:189
 #, no-c-format
 msgid "Font:"
 msgstr "字体："
 
 #. i18n: file ./modules/kjofol-skin/kjguisettingswidget.ui line 416
-#: rc.cpp:238
+#: rc.cpp:192
 #, no-c-format
 msgid "Use system font"
 msgstr "使用系统字体"
 
+#. i18n: file ./modules/kjofol-skin/kjskinselectorwidget.ui line 51
+#: rc.cpp:195
+#, no-c-format
+msgid "Preview"
+msgstr "预览"
+
+#. i18n: file ./modules/kjofol-skin/kjskinselectorwidget.ui line 153
+#: rc.cpp:198
+#, no-c-format
+msgid "About skin:"
+msgstr "关于皮肤："
+
+#. i18n: file ./modules/kjofol-skin/kjskinselectorwidget.ui line 170
+#: rc.cpp:201
+#, no-c-format
+msgid ""
+"Here you will see all the comments people wrote about their skins.\n"
+"It can be several lines and usually does not contain anything interesting but "
+"still this will be shown."
+msgstr ""
+"此处您可以看到人们写的关于他们的皮肤的全部注释。\n"
+"它可以有若干行，并且通常不包含任何有趣的东西，但是这仍然会显示出来。"
+
+#. i18n: file ./modules/kjofol-skin/kjskinselectorwidget.ui line 205
+#: rc.cpp:205
+#, no-c-format
+msgid "Install Skin"
+msgstr "安装皮肤"
+
+#. i18n: file ./modules/kjofol-skin/kjskinselectorwidget.ui line 213
+#: rc.cpp:208
+#, no-c-format
+msgid "Remove Skin"
+msgstr "删除皮肤"
+
+#. i18n: file ./library/equalizerwidget.ui line 16
+#: library/equalizerview.cpp:111 rc.cpp:211
+#, no-c-format
+msgid "Equalizer"
+msgstr "均衡器"
+
+#. i18n: file ./library/equalizerwidget.ui line 38
+#: rc.cpp:214
+#, no-c-format
+msgid "Pre&amp:"
+msgstr "前置放大器(&A)："
+
+#. i18n: file ./library/equalizerwidget.ui line 123
+#: rc.cpp:217
+#, no-c-format
+msgid "+/-"
+msgstr "+/-"
+
+#. i18n: file ./library/equalizerwidget.ui line 138
+#: rc.cpp:220
+#, no-c-format
+msgid "&Bands"
+msgstr "波段(&B)"
+
+#. i18n: file ./library/equalizerwidget.ui line 173
+#: rc.cpp:223
+#, no-c-format
+msgid "&Presets"
+msgstr "预置(&P)"
+
+#. i18n: file ./library/equalizerwidget.ui line 217
+#: rc.cpp:229
+#, no-c-format
+msgid "A&dd"
+msgstr "添加(&D)"
+
+#. i18n: file ./library/equalizerwidget.ui line 252
+#: rc.cpp:232
+#, no-c-format
+msgid "&Enabled"
+msgstr "启用(&E)"
+
+#. i18n: file ./library/equalizerwidget.ui line 277
+#: rc.cpp:235
+#, no-c-format
+msgid "&Number of bands:"
+msgstr "波段数(&N)："
+
+#. i18n: file ./library/equalizerwidget.ui line 316
+#: rc.cpp:238
+#, no-c-format
+msgid "Re&set EQ"
+msgstr "重置均衡(&S)"
+
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "开源软件国际化之简体中文组"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "i18n-translation@lists.linux.net.cn"
+
 #: app/main.cpp:8
 msgid "The Fusion of Frequencies"
 msgstr "频率熔合"
@@ -456,434 +469,361 @@ msgstr "扩展 K-Jofol 皮肤支持，扩展 M3U 播放列表装载"
 msgid "Special help with the equalizer"
 msgstr "对均衡器给予的特殊帮助"
 
-#: library/video.cpp:119
-msgid "Video - Noatun"
-msgstr "视频 - Noatun"
+#: modules/simple/propertiesdialog.ui.h:39
+#: modules/simple/propertiesdialog.ui.h:40
+#: modules/simple/propertiesdialog.ui.h:41
+#: modules/simple/propertiesdialog.ui.h:42
+#: modules/simple/propertiesdialog.ui.h:43
+msgid "unknown"
+msgstr "未知"
 
-#: library/ksaver.cpp:81 modules/splitplaylist/view.cpp:470
+#: modules/simple/propertiesdialog.ui.h:49
 #, c-format
-msgid "Could not write to %1."
-msgstr "无法写入 %1。"
-
-#: library/cmodule.cpp:32
-msgid "General"
-msgstr "常规"
-
-#: library/cmodule.cpp:32
-msgid "General Options"
-msgstr "常规选项"
-
-#: library/cmodule.cpp:34
-msgid "&Return to start of playlist on finish"
-msgstr "播放完毕返回播放列表开头(&R)"
-
-#: library/cmodule.cpp:36
-msgid ""
-"When the playlist is finished playing, return to the start, but do not start "
-"playing."
-msgstr "当播放列表播放结束时，返回到开头处，但不再播放。"
+msgid "Properties for %1"
+msgstr "%1 的属性"
 
-#: library/cmodule.cpp:38
-msgid "Allow only one &instance of Noatun"
-msgstr "仅允许单个 Noatun 实例(&I)"
+#: modules/simple/userinterface.cpp:130
+msgid "&Properties"
+msgstr "属性(&P)"
 
-#: library/cmodule.cpp:40
-msgid ""
-"Starting noatun a second time will cause it to just append items from the start "
-"to the current instance."
-msgstr "重复启动 Noatun 将把播放项目从启动的实例添加到当前的实例中。"
+#: modules/simple/userinterface.cpp:208
+msgid "Play / Pause"
+msgstr "播放/暂停"
 
-#: library/cmodule.cpp:42
-msgid "Clear playlist &when opening a file"
-msgstr "打开文件时清除播放列表(&W)"
+#: modules/keyz/keyz.cpp:42 modules/kjofol-skin/kjbutton.cpp:139
+#: modules/noatunui/userinterface.cpp:60 modules/simple/userinterface.cpp:214
+msgid "Forward"
+msgstr "前进"
 
-#: library/cmodule.cpp:44
-msgid ""
-"Opening a file with the global Open menu item will clear the playlist first."
-msgstr "当通过全局的打开菜单打开一个文件时，将会首先清除播放列表。"
+#: modules/kjofol-skin/kjbutton.cpp:123 modules/noatunui/userinterface.cpp:67
+#: modules/simple/userinterface.cpp:227 modules/splitplaylist/view.cpp:935
+msgid "Playlist"
+msgstr "播放列表"
 
-#: library/cmodule.cpp:46
-msgid "&Use fast hardware volume control"
-msgstr "使用快速硬件音量控制(&U)"
+#: modules/kjofol-skin/kjsliders.cpp:53 modules/kjofol-skin/kjsliders.cpp:143
+#: modules/kjofol-skin/kjtextdisplay.cpp:429
+#: modules/simple/userinterface.cpp:233
+msgid "Volume"
+msgstr "音量"
 
-#: library/cmodule.cpp:48
-msgid ""
-"Use the hardware mixer instead of aRts'. It affects all streams, not just "
-"Noatun's, but is a little faster."
-msgstr "使用硬件的混音器而不使用 aRts 的。这将影响到所有的流，不仅仅是 Noatun 的，但会稍快一些。"
+#: modules/winskin/winSkinConfig.cpp:27
+msgid "Winskin"
+msgstr "Winskin"
 
-#: library/cmodule.cpp:50
-msgid "Display &remaining play time"
-msgstr "显示剩余的播放时间(&R)"
+#: modules/winskin/winSkinConfig.cpp:28
+msgid "Skin Selection for the Winskin Plugin"
+msgstr "Winskin 插件皮肤选择"
 
-#: library/cmodule.cpp:52
-msgid ""
-"Counters count down towards zero, showing remaining time instead of elapsed "
-"time."
-msgstr "从高往低计数，显示剩余的时间，而不是已播放的时间。"
+#: modules/winskin/winSkinConfig.cpp:43
+msgid "&Install New Skin..."
+msgstr "安装新皮肤(&I)..."
 
-#: library/cmodule.cpp:54
-msgid "Title &format:"
-msgstr "标题格式(&F)："
+#: modules/winskin/winSkinConfig.cpp:46
+msgid "&Remove Skin"
+msgstr "删除皮肤(&R)"
 
-#: library/cmodule.cpp:59
-msgid ""
-"Select a title to use for each file (in the playlist and user interface). Each "
-"element such as $(title) is replaced with the property with the name as given "
-"in the parentheses. The properties include, but are not limited to: title, "
-"author, date, comments and album."
-msgstr ""
-"请选择每个文件所使用的标题(在播放列表以及用户界面中)。每个元素如 $(title) "
-"将以括号中给出的名称的属性来替代。这些属性包括(但不只限于)：title(标题)、author(作者)、date(日期)、comments(评注) 和 "
-"album(专辑)。"
+#: modules/winskin/winSkinConfig.cpp:58
+msgid "Settings"
+msgstr "设置"
 
-#: library/cmodule.cpp:64
-msgid "&Download folder:"
-msgstr "下载文件夹(&D)："
+#: modules/winskin/winSkinConfig.cpp:62
+msgid "T&itle scrolling speed:"
+msgstr "标题显示滚动速度(&I)："
 
-#: library/cmodule.cpp:69
-msgid "When opening a non-local file, download it to the selected folder."
-msgstr "当打开一个非本地文件时，将它下载到选定的文件夹。"
+#: modules/infrared/irprefs.cpp:170 modules/systray/cmodule.cpp:55
+#: modules/winskin/winSkinConfig.cpp:63
+msgid "None"
+msgstr "无"
 
-#: library/cmodule.cpp:71
-msgid "Play Behavior on Startup"
-msgstr "启动时的播放行为"
+#: modules/winskin/winSkinConfig.cpp:159
+msgid "You cannot remove this skin."
+msgstr "您不能删除这个皮肤。"
 
-#: library/cmodule.cpp:74
-msgid "Restore &play state"
-msgstr "恢复播放状态(&P)"
+#: modules/winskin/winSkinConfig.cpp:166
+msgid "<qt>Are you sure you want to remove the <b>%1</b> skin?</qt>"
+msgstr "<qt>您确实要删除 <b>%1</b> 皮肤吗？</qt>"
 
-#: library/cmodule.cpp:78
-msgid "Automatically play &first file"
-msgstr "自动播放第一个文件(&F)"
+#: modules/winskin/waSkin.cpp:451
+msgid "Seek to: %1/%2 (%3%)"
+msgstr "搜索至：%1/%2 (%3%)"
 
-#: library/cmodule.cpp:82
-msgid "&Do not start playing"
-msgstr "不开始播放(&D)"
+#: modules/winskin/waSkin.cpp:558
+msgid "Balance: Center"
+msgstr "平衡：居中"
 
-#: library/pluginmodule.cpp:140
-msgid "Plugins"
-msgstr "插件"
+#: modules/winskin/waSkin.cpp:561
+msgid "Balance: %1% Left"
+msgstr "平衡：%1% 左"
 
-#: library/pluginmodule.cpp:140
-msgid "Select Your Plugins"
-msgstr "选择您的插件"
+#: modules/winskin/waSkin.cpp:563
+msgid "Balance: %1% Right"
+msgstr "平衡：%1% 右"
 
-#: library/pluginmodule.cpp:148
-msgid "<b>Select one or more interfaces to use:</b>"
-msgstr "<b>选择一个或者多个要使用的界面：</b>"
+#: modules/winskin/waSkin.cpp:675
+msgid "Volume: %1%"
+msgstr "音量：%1%"
 
-#: library/pluginmodule.cpp:151 library/pluginmodule.cpp:163
-#: library/pluginmodule.cpp:174 library/pluginmodule.cpp:186
-msgid "Name"
-msgstr "名称"
+#: modules/winskin/guiSpectrumAnalyser.cpp:37
+msgid "Visualization Mode"
+msgstr "视觉插件模式"
 
-#: library/pluginmodule.cpp:152 library/pluginmodule.cpp:164
-#: library/pluginmodule.cpp:175 library/pluginmodule.cpp:187
-msgid "Description"
-msgstr "描述"
+#: modules/winskin/guiSpectrumAnalyser.cpp:38
+msgid "Analyzer Mode"
+msgstr "频谱分析器模式"
 
-#: library/pluginmodule.cpp:153 library/pluginmodule.cpp:165
-#: library/pluginmodule.cpp:176 library/pluginmodule.cpp:188
-msgid "Author"
-msgstr "作者"
+#: modules/winskin/guiSpectrumAnalyser.cpp:40
+msgid "Analyzer"
+msgstr "频谱分析器"
 
-#: library/pluginmodule.cpp:154 library/pluginmodule.cpp:166
-#: library/pluginmodule.cpp:177 library/pluginmodule.cpp:189
-msgid "License"
-msgstr "许可证"
+#: modules/winskin/guiSpectrumAnalyser.cpp:41
+msgid "Disabled"
+msgstr "已禁用"
 
-#: library/pluginmodule.cpp:156
-msgid "&Interfaces"
-msgstr "界面(&I)"
+#: modules/winskin/guiSpectrumAnalyser.cpp:45
+msgid "Normal"
+msgstr "普通"
 
-#: library/pluginmodule.cpp:160
-msgid "<b>Select one playlist to use:</b>"
-msgstr "<b>选择一个要使用的播放列表：</b>"
+#: modules/winskin/guiSpectrumAnalyser.cpp:46
+msgid "Fire"
+msgstr "火焰"
 
-#: library/noatunstdaction.cpp:175 library/pluginmodule.cpp:168
-#: modules/kaiman/userinterface.cpp:543 modules/kjofol-skin/kjbutton.cpp:232
-msgid "&Playlist"
-msgstr "播放列表(&P)"
+#: modules/winskin/guiSpectrumAnalyser.cpp:47
+msgid "Vertical Lines"
+msgstr "竖线"
 
-#: library/pluginmodule.cpp:172
-msgid "<b>Select any visualizations to use:</b>"
-msgstr "<b>选择要使用的任何视觉插件：</b>"
+#: library/noatunstdaction.cpp:25 library/noatunstdaction.cpp:45
+#: modules/infrared/irprefs.cpp:252 modules/kjofol-skin/kjbutton.cpp:117
+#: modules/noatunui/userinterface.cpp:54
+msgid "Play"
+msgstr "播放"
 
-#: library/noatunstdaction.cpp:115 library/pluginmodule.cpp:179
-msgid "&Visualizations"
-msgstr "视觉插件(&V)"
+#: modules/noatunui/userinterface.cpp:73
+msgid "Change loop style"
+msgstr "改变循环方式"
 
-#: library/pluginmodule.cpp:184
-msgid "<b>Select any other plugins to use:</b>"
-msgstr "<b>选择要使用的任何其它插件：</b>"
+#: modules/noatunui/userinterface.cpp:104
+#: modules/noatunui/userinterface.cpp:218
+msgid "No File Loaded"
+msgstr "没有载入文件"
 
-#: library/pluginmodule.cpp:191
-msgid "O&ther Plugins"
-msgstr "其它插件(&T)"
+#: modules/excellent/userinterface.cpp:317
+#: modules/noatunui/userinterface.cpp:263
+msgid "No looping"
+msgstr "不循环播放"
 
-#: library/pluginmodule.cpp:401
-msgid ""
-"<qt>Changing your playlist plugin will stop playback. Different playlists may "
-"use different methods of storing information, so after changing playlists you "
-"may have to recreate your playlist.</qt>"
-msgstr ""
-"<qt>改变播放列表插件将会停止播放。由于不同的播放列表可能使用不同信息储存方式，因此在改变播放列表以后，您也许需要重新创建您的播放列表。</qt>"
+#: modules/excellent/userinterface.cpp:320
+#: modules/noatunui/userinterface.cpp:267
+msgid "Song looping"
+msgstr "单曲循环播放"
 
-#: library/downloader.cpp:101
-msgid "Unknown"
-msgstr "未知"
+#: modules/excellent/userinterface.cpp:323
+#: modules/noatunui/userinterface.cpp:271
+msgid "Playlist looping"
+msgstr "列表循环播放"
 
-#: library/equalizerview.cpp:45 library/equalizerview.cpp:51
-#: library/equalizerview.cpp:146 library/equalizerview.cpp:270
-msgid "Custom"
-msgstr "自定义"
+#: modules/excellent/userinterface.cpp:326
+#: modules/noatunui/userinterface.cpp:275
+msgid "Random play"
+msgstr "随机播放"
 
-#: library/equalizerview.cpp:284
-msgid "New Preset"
-msgstr "新建预置"
+#: modules/infrared/irprefs.cpp:55
+msgid "Infrared Control"
+msgstr "红外控制"
 
-#: library/noatuntags/tags.cpp:181
-msgid "Tagging"
-msgstr "标签"
+#: modules/infrared/irprefs.cpp:55
+msgid "Configure Infrared Commands"
+msgstr "配置红外命令"
 
-#: library/noatuntags/tags.cpp:181
-msgid "Settings for Tag Loaders"
-msgstr "标签加载设置"
+#: modules/infrared/irprefs.cpp:60
+msgid "Remote control &commands:"
+msgstr "遥控命令(&C)："
 
-#: library/noatuntags/tags.cpp:184
-msgid "Rescan All Tags"
-msgstr "重新扫描所有标签"
+#: modules/infrared/irprefs.cpp:66
+msgid "&Action:"
+msgstr "动作(&A)："
 
-#: library/noatuntags/tags.cpp:189
-msgid "Load tags &automatically"
-msgstr "自动加载标签(&A)"
+#: modules/infrared/irprefs.cpp:73
+msgid "&Repeat"
+msgstr "重复(&R)"
 
-#: library/noatuntags/tags.cpp:202
-msgid ""
-"_: The time between each time noatun scans for a new file, and updates tags "
-"(e.g., ID3)\n"
-"Interval:"
-msgstr "时间间隔："
+#: modules/infrared/irprefs.cpp:77
+msgid "&Interval:"
+msgstr "间隔(&I)："
 
-#: library/noatuntags/tags.cpp:210
-msgid ""
-"_: Milliseconds\n"
-" ms"
-msgstr " 毫秒"
+#: modules/infrared/irprefs.cpp:132
+msgid "You do not have any remote control configured."
+msgstr "您还没有配置任何遥控控制。"
 
-#: library/pref.cpp:12
-msgid "Preferences - Noatun"
-msgstr "首选项 - Noatun"
+#: modules/infrared/irprefs.cpp:133
+msgid "Please make sure lirc is setup correctly."
+msgstr "请确认 LIRC 已经正确设置。"
 
-#: library/engine.cpp:257
-msgid "There was an error communicating to the aRts daemon."
-msgstr "与 aRts 守护进程通讯时出现错误。"
+#: modules/infrared/irprefs.cpp:137
+msgid "Connection could not be established."
+msgstr "无法建立连接。"
 
-#: library/engine.cpp:257
-msgid "aRts error"
-msgstr "aRts 错误"
+#: modules/infrared/irprefs.cpp:138
+msgid "Please make sure lirc is setup correctly and lircd is running."
+msgstr "请确认 LIRC 已经正确设置并正在运行。"
 
-#: library/engine.cpp:577
-msgid ""
-"Connecting/starting aRts soundserver failed. Make sure that artsd is configured "
-"properly."
-msgstr "连接/启动 aRts 声音服务器失败。请确认正确配置了 artsd。"
+#: modules/infrared/irprefs.cpp:144
+msgid "Button"
+msgstr "按钮"
 
-#: library/app.cpp:118 modules/marquis/marquis.cpp:161
-msgid ""
-"No playlist plugin was found. Please make sure that Noatun was installed "
-"correctly."
-msgstr "没有找到播放列表插件。请确定 Noatun 安装正确。"
+#: modules/infrared/irprefs.cpp:145
+msgid "Action"
+msgstr "动作"
 
-#: library/app.cpp:409 modules/kjofol-skin/kjbutton.cpp:217
-#: modules/splitplaylist/view.cpp:896
-msgid "Select File to Play"
-msgstr "选择要播放的文件"
+#: modules/infrared/irprefs.cpp:146
+msgid "Interval"
+msgstr "间隔"
 
-#: library/playlistsaver.cpp:110 library/playlistsaver.cpp:306
-#: library/playlistsaver.cpp:559
-#, c-format
-msgid "Stream from %1"
-msgstr "来自 %1 的流"
+#: modules/infrared/irprefs.cpp:258 modules/kjofol-skin/kjbutton.cpp:135
+msgid "Next"
+msgstr "下一首"
 
-#: library/playlistsaver.cpp:751
-msgid "Stream from %1 (port: %2)"
-msgstr "来自 %1 (端口：%2)的流"
+#: modules/infrared/irprefs.cpp:260 modules/keyz/keyz.cpp:60
+msgid "Volume Down"
+msgstr "音量减小"
 
-#: library/playlistsaver.cpp:753
-msgid "Stream from %1, (ip: %2, port: %3)"
-msgstr "来自 %1 (IP：%2，端口：%3) 的流"
+#: modules/infrared/irprefs.cpp:262 modules/keyz/keyz.cpp:57
+msgid "Volume Up"
+msgstr "音量增大"
 
-#: library/noatunstdaction.cpp:25 library/noatunstdaction.cpp:45
-#: modules/infrared/irprefs.cpp:252 modules/kjofol-skin/kjbutton.cpp:117
-#: modules/noatunui/userinterface.cpp:54
-msgid "Play"
-msgstr "播放"
+#: modules/infrared/irprefs.cpp:264 modules/keyz/keyz.cpp:63
+msgid "Mute"
+msgstr "静音"
 
 #: library/noatunstdaction.cpp:39 modules/infrared/irprefs.cpp:266
 #: modules/kjofol-skin/kjbutton.cpp:119
 msgid "Pause"
 msgstr "暂停"
 
+#: modules/infrared/irprefs.cpp:268 modules/keyz/keyz.cpp:69
+msgid "Seek Backward"
+msgstr "向后寻曲"
+
+#: modules/infrared/irprefs.cpp:270 modules/keyz/keyz.cpp:66
+msgid "Seek Forward"
+msgstr "向前寻曲"
+
 #: library/noatunstdaction.cpp:50 modules/infrared/irprefs.cpp:272
 msgid "Show Playlist"
 msgstr "显示播放列表"
 
-#: library/noatunstdaction.cpp:52
-msgid "Hide Playlist"
-msgstr "隐藏播放列表"
-
-#: library/noatunstdaction.cpp:71
-msgid "&Actions"
-msgstr "动作(&A)"
-
-#: library/noatunstdaction.cpp:163
-msgid "&Loop"
-msgstr "循环(&L)"
-
-#: library/noatunstdaction.cpp:170 modules/kaiman/userinterface.cpp:541
-#: modules/kjofol-skin/kjbutton.cpp:231
-msgid "&Song"
-msgstr "歌曲(&S)"
-
-#: library/noatunstdaction.cpp:180 modules/kaiman/userinterface.cpp:545
-#: modules/kjofol-skin/kjbutton.cpp:233
-msgid "&Random"
-msgstr "随机播放(&R)"
-
-#: library/noatunstdaction.cpp:242
-msgid "&Effects..."
-msgstr "效果(&E)..."
+#: modules/infrared/irprefs.cpp:274 modules/keyz/keyz.cpp:72
+msgid "Next Section"
+msgstr "下一首"
 
-#: library/noatunstdaction.cpp:247
-msgid "E&qualizer..."
-msgstr "均衡器(&Q)..."
+#: modules/infrared/irprefs.cpp:276 modules/keyz/keyz.cpp:75
+msgid "Previous Section"
+msgstr "上一首"
 
-#: library/noatunstdaction.cpp:252
-msgid "&Back"
-msgstr "上一首(&B)"
+#: modules/infrared/lirc.cpp:22
+msgid ""
+"Could not create a socket to receive infrared signals. The error is:\n"
+msgstr ""
+"无法创建用于接收红外信号的套接字。错误是：\n"
 
-#: library/noatunstdaction.cpp:270
-msgid "&Forward"
-msgstr "下一首(&F)"
+#: modules/infrared/lirc.cpp:30
+msgid ""
+"Could not establish a connection to receive infrared signals. The error is:\n"
+msgstr ""
+"无法建立用于接收红外信号的连接。错误是：\n"
 
-#: library/noatunstdaction.cpp:275
-msgid "&Play"
-msgstr "播放(&P)"
+#: library/app.cpp:118 modules/marquis/marquis.cpp:161
+msgid ""
+"No playlist plugin was found. Please make sure that Noatun was installed "
+"correctly."
+msgstr "没有找到播放列表插件。请确定 Noatun 安装正确。"
 
-#: library/noatunstdaction.cpp:288
-msgid "&Pause"
-msgstr "暂停(&P)"
+#: modules/metatag/edit.cpp:27
+msgid "Tag Editor"
+msgstr "标签编辑器"
 
-#: library/vequalizer.cpp:845
-msgid "Trance"
-msgstr "恍惚"
+#: modules/metatag/edit.cpp:84
+msgid "&Title"
+msgstr "标题(&T)"
 
-#: library/vequalizer.cpp:846
-msgid "Dance"
-msgstr "舞曲"
+#: modules/metatag/edit.cpp:85
+msgid "&Artist"
+msgstr "艺人(&A)"
 
-#: library/vequalizer.cpp:847
-msgid "Metal"
-msgstr "金属"
+#: modules/metatag/edit.cpp:86
+msgid "A&lbum"
+msgstr "专辑(&L)"
 
-#: library/vequalizer.cpp:848
-msgid "Jazz"
-msgstr "爵士"
+#: modules/metatag/edit.cpp:87
+msgid "&Date"
+msgstr "日期(&D)"
 
-#: library/vequalizer.cpp:849
-msgid "Zero"
-msgstr "零点"
+#: modules/metatag/edit.cpp:88
+msgid "T&rack"
+msgstr "曲目(&R)"
 
-#: library/vequalizer.cpp:850
-msgid "Eclectic Guitar"
-msgstr "电吉他"
+#: modules/metatag/edit.cpp:89
+msgid "&Genre"
+msgstr "流派(&G)"
 
-#: library/effectview.cpp:75
-msgid "Effects"
-msgstr "效果"
+#: modules/metatag/edit.cpp:90
+msgid "Co&mment"
+msgstr "评注(&M)"
 
-#: library/effectview.cpp:104
-msgid "Effects - Noatun"
-msgstr "效果 - Noatun"
+#: modules/metatag/metatag.cpp:35
+msgid "&Tag Editor..."
+msgstr "标签编辑器(&T)..."
 
-#: library/effectview.cpp:112
-msgid "Available Effects"
-msgstr "可用的效果"
+#: modules/htmlexport/htmlexport.cpp:20
+msgid "&Export Playlist..."
+msgstr "导出播放列表(&E)..."
 
-#: library/effectview.cpp:122
-msgid "Active Effects"
-msgstr "已启用的效果"
+#: modules/htmlexport/htmlexport.cpp:42
+msgid "Export Playlist"
+msgstr "导出播放列表"
 
-#: library/effectview.cpp:156
-msgid "Up"
-msgstr "上移"
+#: modules/htmlexport/htmlexport.cpp:60 modules/htmlexport/htmlexport.cpp:90
+msgid "Noatun Playlist"
+msgstr "Noatun 播放列表"
 
-#: library/effectview.cpp:157
-msgid "Down"
-msgstr "下移"
+#: modules/htmlexport/htmlexport.cpp:175
+msgid "Playlist Export"
+msgstr "播放列表导出"
 
-#: library/effectview.cpp:170
-msgid ""
-"This shows all available effects.\n"
-"\n"
-"To activate a plugin, drag files from here to the active pane on the right."
-msgstr ""
-"这是所有可用的效果。\n"
-"\n"
-"要启用一个插件，请用右边的按钮把文件从这里拖到下面的启用框中。"
+#: modules/htmlexport/htmlexport.cpp:175
+msgid "Colors & Settings for HTML Export"
+msgstr "HTML 导出的颜色和设置"
 
-#: library/effectview.cpp:171
-msgid "This will place the selected effect at the bottom of your chain."
-msgstr "这将把选中的效果置于链的底部。"
+#: modules/htmlexport/htmlexport.cpp:201
+msgid "HTML Color Settings"
+msgstr "HTML 颜色设置"
 
-#: library/effectview.cpp:172
-msgid ""
-"This shows your effect chain. Noatun supports an unlimited amount of effects in "
-"any order. You can even have the same effect twice.\n"
-"\n"
-"Drag the items to and from here to add and remove them, respectively. You may "
-"also reorder them with drag-and-drop. These actions can also be performed with "
-"the buttons to the right."
-msgstr ""
-"这里是您的效果链。Noatun 支持不限数量并可按任意顺序排列的效果。您甚至还可以把同一效果使用两次。\n"
-"\n"
-"把效果项拖到或者拖离这里就可以添加或者删除它们。您还可以通过拖放对它们重新排序。这些操作也可以通过右边的按钮来进行。"
+#: modules/htmlexport/htmlexport.cpp:215
+msgid "Text:"
+msgstr "文字："
 
-#: library/effectview.cpp:173
-msgid "Move the currently selected effect up in the chain."
-msgstr "选中的效果在链中上移。"
+#: modules/htmlexport/htmlexport.cpp:219
+msgid "Background:"
+msgstr "背景："
 
-#: library/effectview.cpp:174
-msgid "Move the currently selected effect down in the chain."
-msgstr "选中的效果在链中下移。"
+#: modules/htmlexport/htmlexport.cpp:223
+msgid "Heading:"
+msgstr "题头："
 
-#: library/effectview.cpp:175
-msgid ""
-"Configure the currently selected effect.\n"
-"\n"
-"You can change things such as intensity from here."
-msgstr ""
-"配置当前选中的效果。\n"
-"\n"
-"您可以从这里改变一些东西比如强度等。"
+#: modules/htmlexport/htmlexport.cpp:227
+msgid "Link hover:"
+msgstr "鼠标悬停链接："
 
-#: library/effectview.cpp:176
-msgid "This will remove the selected effect from your chain."
-msgstr "将选中的效果从链中删除。"
+#: modules/htmlexport/htmlexport.cpp:248
+msgid "Background Image"
+msgstr "背景图像"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "开源软件国际化之简体中文组"
+#: modules/htmlexport/htmlexport.cpp:259
+msgid "Hyper&link playlist entries to their URL"
+msgstr "创建从播放列表项指向相应 URL 的超连接(&L)"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "i18n-translation@lists.linux.net.cn"
+#: modules/htmlexport/htmlexport.cpp:263
+msgid "&Number playlist entries"
+msgstr "用数字标注播放列表项(&N)"
 
 #: modules/keyz/keyz.cpp:33
 msgid "Play/Pause"
@@ -893,11 +833,6 @@ msgstr "播放/暂停"
 msgid "Stop Playing"
 msgstr "停止播放"
 
-#: modules/keyz/keyz.cpp:42 modules/kjofol-skin/kjbutton.cpp:139
-#: modules/noatunui/userinterface.cpp:60 modules/simple/userinterface.cpp:214
-msgid "Forward"
-msgstr "前进"
-
 #: modules/keyz/keyz.cpp:45
 msgid "Show/Hide Playlist"
 msgstr "显示/隐藏播放列表"
@@ -914,34 +849,6 @@ msgstr "效果配置"
 msgid "Preferences"
 msgstr "首选项"
 
-#: modules/infrared/irprefs.cpp:262 modules/keyz/keyz.cpp:57
-msgid "Volume Up"
-msgstr "音量增大"
-
-#: modules/infrared/irprefs.cpp:260 modules/keyz/keyz.cpp:60
-msgid "Volume Down"
-msgstr "音量减小"
-
-#: modules/infrared/irprefs.cpp:264 modules/keyz/keyz.cpp:63
-msgid "Mute"
-msgstr "静音"
-
-#: modules/infrared/irprefs.cpp:270 modules/keyz/keyz.cpp:66
-msgid "Seek Forward"
-msgstr "向前寻曲"
-
-#: modules/infrared/irprefs.cpp:268 modules/keyz/keyz.cpp:69
-msgid "Seek Backward"
-msgstr "向后寻曲"
-
-#: modules/infrared/irprefs.cpp:274 modules/keyz/keyz.cpp:72
-msgid "Next Section"
-msgstr "下一首"
-
-#: modules/infrared/irprefs.cpp:276 modules/keyz/keyz.cpp:75
-msgid "Previous Section"
-msgstr "上一首"
-
 #: modules/keyz/keyz.cpp:78
 msgid "Copy Song Title to Clipboard"
 msgstr "复制乐曲标题到剪贴板"
@@ -966,73 +873,75 @@ msgstr "单像管"
 msgid "Toggle Monoscope"
 msgstr "切换单像管"
 
-#: modules/excellent/userinterface.cpp:85
-msgid "Show &Volume Control"
-msgstr "显示音量控制(&V)"
+#: modules/voiceprint/prefs.cpp:12 modules/voiceprint/voiceprint.cpp:25
+msgid "Voiceprint"
+msgstr "声波纹"
 
-#: modules/excellent/userinterface.cpp:86
-msgid "Hide &Volume Control"
-msgstr "隐藏音量控制(&V)"
+#: modules/voiceprint/prefs.cpp:12
+msgid "Options for the Voiceprint Visualization"
+msgstr "声波纹视觉插件选项"
 
-#: modules/excellent/userinterface.cpp:317
-#: modules/noatunui/userinterface.cpp:263
-msgid "No looping"
-msgstr "不循环播放"
+#: modules/voiceprint/prefs.cpp:19
+msgid "&Foreground color:"
+msgstr "前景颜色(&F)："
 
-#: modules/excellent/userinterface.cpp:320
-#: modules/noatunui/userinterface.cpp:267
-msgid "Song looping"
-msgstr "单曲循环播放"
+#: modules/voiceprint/prefs.cpp:25
+msgid "&Background color:"
+msgstr "背景颜色(&B)："
 
-#: modules/excellent/userinterface.cpp:323
-#: modules/noatunui/userinterface.cpp:271
-msgid "Playlist looping"
-msgstr "列表循环播放"
+#: modules/voiceprint/prefs.cpp:31
+msgid "&Sweep color:"
+msgstr "扫描线颜色(&S)："
 
-#: modules/excellent/userinterface.cpp:326
-#: modules/noatunui/userinterface.cpp:275
-msgid "Random play"
-msgstr "随机播放"
+#: modules/kaiman/style.cpp:1381
+msgid "Cannot load style. Style not installed."
+msgstr "无法载入样式。样式没有安装。"
 
-#: modules/excellent/userinterface.cpp:338
-msgid "<qt>Press %1 to show the menubar.</qt>"
-msgstr "<qt>按 %1 显示菜单栏。</qt>"
+#: modules/kaiman/style.cpp:1385
+msgid "Cannot load style. Unsupported or faulty style description."
+msgstr "无法载入样式。不支持的或错误的样式描述。"
 
-#: modules/metatag/edit.cpp:27
-msgid "Tag Editor"
-msgstr "标签编辑器"
+#: modules/kaiman/userinterface.cpp:91
+msgid "Cannot load skin %1. Switching to default skin."
+msgstr "无法载入皮肤 %1。切换回默认皮肤。"
 
-#: modules/metatag/edit.cpp:84
-msgid "&Title"
-msgstr "标题(&T)"
+#: modules/kaiman/userinterface.cpp:94
+#, c-format
+msgid "Cannot load default skin %1."
+msgstr "无法载入默认皮肤 %1。"
 
-#: modules/metatag/edit.cpp:85
-msgid "&Artist"
-msgstr "艺人(&A)"
+#: modules/kaiman/userinterface.cpp:523
+msgid ""
+"_: TITLE (LENGTH)\n"
+"%1 (%2)"
+msgstr "%1 (%2)"
 
-#: modules/metatag/edit.cpp:86
-msgid "A&lbum"
-msgstr "专辑(&L)"
+#: modules/kaiman/userinterface.cpp:538 modules/kjofol-skin/kjbutton.cpp:229
+msgid "Loop Style"
+msgstr "循环方式"
 
-#: modules/metatag/edit.cpp:87
-msgid "&Date"
-msgstr "日期(&D)"
+#: library/noatunstdaction.cpp:170 modules/kaiman/userinterface.cpp:541
+#: modules/kjofol-skin/kjbutton.cpp:231
+msgid "&Song"
+msgstr "歌曲(&S)"
 
-#: modules/metatag/edit.cpp:88
-msgid "T&rack"
-msgstr "曲目(&R)"
+#: library/noatunstdaction.cpp:175 library/pluginmodule.cpp:168
+#: modules/kaiman/userinterface.cpp:543 modules/kjofol-skin/kjbutton.cpp:232
+msgid "&Playlist"
+msgstr "播放列表(&P)"
 
-#: modules/metatag/edit.cpp:89
-msgid "&Genre"
-msgstr "流派(&G)"
+#: library/noatunstdaction.cpp:180 modules/kaiman/userinterface.cpp:545
+#: modules/kjofol-skin/kjbutton.cpp:233
+msgid "&Random"
+msgstr "随机播放(&R)"
 
-#: modules/metatag/edit.cpp:90
-msgid "Co&mment"
-msgstr "评注(&M)"
+#: modules/kaiman/pref.cpp:35 modules/kaiman/pref.cpp:39
+msgid "Kaiman Skins"
+msgstr "Kaiman 皮肤"
 
-#: modules/metatag/metatag.cpp:35
-msgid "&Tag Editor..."
-msgstr "标签编辑器(&T)..."
+#: modules/kaiman/pref.cpp:35
+msgid "Skin Selection for the Kaiman Plugin"
+msgstr "Kaiman 插件皮肤选择"
 
 #: modules/splitplaylist/find.cpp:8
 msgid "Find"
@@ -1054,6 +963,11 @@ msgstr "往回查找(&B)"
 msgid "Time"
 msgstr "时间"
 
+#: library/ksaver.cpp:81 modules/splitplaylist/view.cpp:470
+#, c-format
+msgid "Could not write to %1."
+msgstr "无法写入 %1。"
+
 #: modules/splitplaylist/view.cpp:645
 msgid "Add &Files..."
 msgstr "添加文件(&F)..."
@@ -1086,14 +1000,38 @@ msgstr "保存播放列表"
 msgid "Open Playlist"
 msgstr "打开新播放列表"
 
+#: library/app.cpp:409 modules/kjofol-skin/kjbutton.cpp:217
+#: modules/splitplaylist/view.cpp:896
+msgid "Select File to Play"
+msgstr "选择要播放的文件"
+
 #: modules/splitplaylist/view.cpp:907
 msgid "Select Folder"
 msgstr "选择文件夹"
 
-#: modules/kjofol-skin/kjbutton.cpp:123 modules/noatunui/userinterface.cpp:67
-#: modules/simple/userinterface.cpp:227 modules/splitplaylist/view.cpp:935
-msgid "Playlist"
-msgstr "播放列表"
+#: modules/excellent/userinterface.cpp:85
+msgid "Show &Volume Control"
+msgstr "显示音量控制(&V)"
+
+#: modules/excellent/userinterface.cpp:86
+msgid "Hide &Volume Control"
+msgstr "隐藏音量控制(&V)"
+
+#: modules/excellent/userinterface.cpp:338
+msgid "<qt>Press %1 to show the menubar.</qt>"
+msgstr "<qt>按 %1 显示菜单栏。</qt>"
+
+#: modules/systray/systray.cpp:202
+msgid "Noatun - Paused"
+msgstr "Noatun - 已暂停"
+
+#: modules/systray/systray.cpp:207
+msgid "Noatun - Playing"
+msgstr "Noatun - 正播放"
+
+#: modules/systray/systray.cpp:259
+msgid "Noatun - Stopped"
+msgstr "Noatun - 已停止"
 
 #: modules/systray/cmodule.cpp:48
 msgid "System Tray Icon"
@@ -1103,11 +1041,6 @@ msgstr "系统托盘图标"
 msgid "Configure System Tray Icon"
 msgstr "配置系统托盘图标"
 
-#: modules/infrared/irprefs.cpp:170 modules/systray/cmodule.cpp:55
-#: modules/winskin/winSkinConfig.cpp:63
-msgid "None"
-msgstr "无"
-
 #: modules/systray/cmodule.cpp:56
 msgid "Shift"
 msgstr "Shift"
@@ -1120,79 +1053,9 @@ msgstr "Alt"
 msgid "Ctrl"
 msgstr "Ctrl"
 
-#: modules/systray/systray.cpp:202
-msgid "Noatun - Paused"
-msgstr "Noatun - 已暂停"
-
-#: modules/systray/systray.cpp:207
-msgid "Noatun - Playing"
-msgstr "Noatun - 正播放"
-
-#: modules/systray/systray.cpp:259
-msgid "Noatun - Stopped"
-msgstr "Noatun - 已停止"
-
-#: modules/kaiman/style.cpp:1381
-msgid "Cannot load style. Style not installed."
-msgstr "无法载入样式。样式没有安装。"
-
-#: modules/kaiman/style.cpp:1385
-msgid "Cannot load style. Unsupported or faulty style description."
-msgstr "无法载入样式。不支持的或错误的样式描述。"
-
-#: modules/kaiman/userinterface.cpp:91
-msgid "Cannot load skin %1. Switching to default skin."
-msgstr "无法载入皮肤 %1。切换回默认皮肤。"
-
-#: modules/kaiman/userinterface.cpp:94
-#, c-format
-msgid "Cannot load default skin %1."
-msgstr "无法载入默认皮肤 %1。"
-
-#: modules/kaiman/userinterface.cpp:523
-msgid ""
-"_: TITLE (LENGTH)\n"
-"%1 (%2)"
-msgstr "%1 (%2)"
-
-#: modules/kaiman/userinterface.cpp:538 modules/kjofol-skin/kjbutton.cpp:229
-msgid "Loop Style"
-msgstr "循环方式"
-
-#: modules/kaiman/pref.cpp:35 modules/kaiman/pref.cpp:39
-msgid "Kaiman Skins"
-msgstr "Kaiman 皮肤"
-
-#: modules/kaiman/pref.cpp:35
-msgid "Skin Selection for the Kaiman Plugin"
-msgstr "Kaiman 插件皮肤选择"
-
-#: modules/simple/propertiesdialog.ui.h:39
-#: modules/simple/propertiesdialog.ui.h:40
-#: modules/simple/propertiesdialog.ui.h:41
-#: modules/simple/propertiesdialog.ui.h:42
-#: modules/simple/propertiesdialog.ui.h:43
-msgid "unknown"
-msgstr "未知"
-
-#: modules/simple/propertiesdialog.ui.h:49
-#, c-format
-msgid "Properties for %1"
-msgstr "%1 的属性"
-
-#: modules/simple/userinterface.cpp:130
-msgid "&Properties"
-msgstr "属性(&P)"
-
-#: modules/simple/userinterface.cpp:208
-msgid "Play / Pause"
-msgstr "播放/暂停"
-
-#: modules/kjofol-skin/kjsliders.cpp:53 modules/kjofol-skin/kjsliders.cpp:143
-#: modules/kjofol-skin/kjtextdisplay.cpp:429
-#: modules/simple/userinterface.cpp:233
-msgid "Volume"
-msgstr "音量"
+#: modules/kjofol-skin/kjloader.cpp:145
+msgid "There was trouble loading skin %1. Please select another skin file."
+msgstr "载入皮肤 %1 时出现错误。请选择其它皮肤文件。"
 
 #: modules/kjofol-skin/kjprefs.cpp:49
 msgid "K-Jöfol Skins"
@@ -1262,30 +1125,6 @@ msgstr ""
 msgid "Confirmation"
 msgstr "确认"
 
-#: modules/kjofol-skin/kjtextdisplay.cpp:66
-msgid "Welcome to Noatun"
-msgstr "欢迎使用 Noatun"
-
-#: modules/kjofol-skin/kjtextdisplay.cpp:177
-msgid "Filename"
-msgstr "文件名"
-
-#: modules/kjofol-skin/kjtextdisplay.cpp:335
-msgid "Play time left"
-msgstr "剩余播放时间"
-
-#: modules/kjofol-skin/kjtextdisplay.cpp:337
-msgid "Current play time"
-msgstr "当前播放时间"
-
-#: modules/kjofol-skin/kjtextdisplay.cpp:643
-msgid "Sample rate in kHz"
-msgstr "以 kHz 表示的采样率"
-
-#: modules/kjofol-skin/kjtextdisplay.cpp:645
-msgid "Bitrate in kbps"
-msgstr "以 kHz 表示的位率"
-
 #: modules/kjofol-skin/kjbutton.cpp:111
 msgid "Minimize"
 msgstr "最小化"
@@ -1310,10 +1149,6 @@ msgstr "关闭均衡器"
 msgid "Reset Equalizer"
 msgstr "重置均衡器"
 
-#: modules/infrared/irprefs.cpp:258 modules/kjofol-skin/kjbutton.cpp:135
-msgid "Next"
-msgstr "下一首"
-
 #: modules/kjofol-skin/kjbutton.cpp:137
 msgid "Previous"
 msgstr "上一首"
@@ -1334,231 +1169,397 @@ msgstr "切换至停靠模式"
 msgid "Return from dockmode"
 msgstr "从停靠模式返回"
 
-#: modules/kjofol-skin/kjloader.cpp:145
-msgid "There was trouble loading skin %1. Please select another skin file."
-msgstr "载入皮肤 %1 时出现错误。请选择其它皮肤文件。"
+#: modules/kjofol-skin/kjtextdisplay.cpp:66
+msgid "Welcome to Noatun"
+msgstr "欢迎使用 Noatun"
 
-#: modules/voiceprint/prefs.cpp:12 modules/voiceprint/voiceprint.cpp:25
-msgid "Voiceprint"
-msgstr "声波纹"
+#: modules/kjofol-skin/kjtextdisplay.cpp:177
+msgid "Filename"
+msgstr "文件名"
 
-#: modules/voiceprint/prefs.cpp:12
-msgid "Options for the Voiceprint Visualization"
-msgstr "声波纹视觉插件选项"
+#: modules/kjofol-skin/kjtextdisplay.cpp:335
+msgid "Play time left"
+msgstr "剩余播放时间"
 
-#: modules/voiceprint/prefs.cpp:19
-msgid "&Foreground color:"
-msgstr "前景颜色(&F)："
+#: modules/kjofol-skin/kjtextdisplay.cpp:337
+msgid "Current play time"
+msgstr "当前播放时间"
 
-#: modules/voiceprint/prefs.cpp:25
-msgid "&Background color:"
-msgstr "背景颜色(&B)："
+#: modules/kjofol-skin/kjtextdisplay.cpp:643
+msgid "Sample rate in kHz"
+msgstr "以 kHz 表示的采样率"
 
-#: modules/voiceprint/prefs.cpp:31
-msgid "&Sweep color:"
-msgstr "扫描线颜色(&S)："
+#: modules/kjofol-skin/kjtextdisplay.cpp:645
+msgid "Bitrate in kbps"
+msgstr "以 kHz 表示的位率"
 
-#: modules/infrared/lirc.cpp:22
+#: library/noatuntags/tags.cpp:181
+msgid "Tagging"
+msgstr "标签"
+
+#: library/noatuntags/tags.cpp:181
+msgid "Settings for Tag Loaders"
+msgstr "标签加载设置"
+
+#: library/noatuntags/tags.cpp:184
+msgid "Rescan All Tags"
+msgstr "重新扫描所有标签"
+
+#: library/noatuntags/tags.cpp:189
+msgid "Load tags &automatically"
+msgstr "自动加载标签(&A)"
+
+#: library/noatuntags/tags.cpp:202
 msgid ""
-"Could not create a socket to receive infrared signals. The error is:\n"
+"_: The time between each time noatun scans for a new file, and updates tags "
+"(e.g., ID3)\n"
+"Interval:"
+msgstr "时间间隔："
+
+#: library/noatuntags/tags.cpp:210
+msgid ""
+"_: Milliseconds\n"
+" ms"
+msgstr " 毫秒"
+
+#: library/noatunstdaction.cpp:52
+msgid "Hide Playlist"
+msgstr "隐藏播放列表"
+
+#: library/noatunstdaction.cpp:71
+msgid "&Actions"
+msgstr "动作(&A)"
+
+#: library/noatunstdaction.cpp:115 library/pluginmodule.cpp:179
+msgid "&Visualizations"
+msgstr "视觉插件(&V)"
+
+#: library/noatunstdaction.cpp:163
+msgid "&Loop"
+msgstr "循环(&L)"
+
+#: library/noatunstdaction.cpp:242
+msgid "&Effects..."
+msgstr "效果(&E)..."
+
+#: library/noatunstdaction.cpp:247
+msgid "E&qualizer..."
+msgstr "均衡器(&Q)..."
+
+#: library/noatunstdaction.cpp:252
+msgid "&Back"
+msgstr "上一首(&B)"
+
+#: library/noatunstdaction.cpp:270
+msgid "&Forward"
+msgstr "下一首(&F)"
+
+#: library/noatunstdaction.cpp:275
+msgid "&Play"
+msgstr "播放(&P)"
+
+#: library/noatunstdaction.cpp:288
+msgid "&Pause"
+msgstr "暂停(&P)"
+
+#: library/effectview.cpp:75
+msgid "Effects"
+msgstr "效果"
+
+#: library/effectview.cpp:104
+msgid "Effects - Noatun"
+msgstr "效果 - Noatun"
+
+#: library/effectview.cpp:112
+msgid "Available Effects"
+msgstr "可用的效果"
+
+#: library/effectview.cpp:122
+msgid "Active Effects"
+msgstr "已启用的效果"
+
+#: library/effectview.cpp:156
+msgid "Up"
+msgstr "上移"
+
+#: library/effectview.cpp:157
+msgid "Down"
+msgstr "下移"
+
+#: library/effectview.cpp:170
+msgid ""
+"This shows all available effects.\n"
+"\n"
+"To activate a plugin, drag files from here to the active pane on the right."
 msgstr ""
-"无法创建用于接收红外信号的套接字。错误是：\n"
+"这是所有可用的效果。\n"
+"\n"
+"要启用一个插件，请用右边的按钮把文件从这里拖到下面的启用框中。"
 
-#: modules/infrared/lirc.cpp:30
+#: library/effectview.cpp:171
+msgid "This will place the selected effect at the bottom of your chain."
+msgstr "这将把选中的效果置于链的底部。"
+
+#: library/effectview.cpp:172
 msgid ""
-"Could not establish a connection to receive infrared signals. The error is:\n"
+"This shows your effect chain. Noatun supports an unlimited amount of effects in "
+"any order. You can even have the same effect twice.\n"
+"\n"
+"Drag the items to and from here to add and remove them, respectively. You may "
+"also reorder them with drag-and-drop. These actions can also be performed with "
+"the buttons to the right."
 msgstr ""
-"无法建立用于接收红外信号的连接。错误是：\n"
+"这里是您的效果链。Noatun 支持不限数量并可按任意顺序排列的效果。您甚至还可以把同一效果使用两次。\n"
+"\n"
+"把效果项拖到或者拖离这里就可以添加或者删除它们。您还可以通过拖放对它们重新排序。这些操作也可以通过右边的按钮来进行。"
 
-#: modules/infrared/irprefs.cpp:55
-msgid "Infrared Control"
-msgstr "红外控制"
+#: library/effectview.cpp:173
+msgid "Move the currently selected effect up in the chain."
+msgstr "选中的效果在链中上移。"
 
-#: modules/infrared/irprefs.cpp:55
-msgid "Configure Infrared Commands"
-msgstr "配置红外命令"
+#: library/effectview.cpp:174
+msgid "Move the currently selected effect down in the chain."
+msgstr "选中的效果在链中下移。"
 
-#: modules/infrared/irprefs.cpp:60
-msgid "Remote control &commands:"
-msgstr "遥控命令(&C)："
+#: library/effectview.cpp:175
+msgid ""
+"Configure the currently selected effect.\n"
+"\n"
+"You can change things such as intensity from here."
+msgstr ""
+"配置当前选中的效果。\n"
+"\n"
+"您可以从这里改变一些东西比如强度等。"
 
-#: modules/infrared/irprefs.cpp:66
-msgid "&Action:"
-msgstr "动作(&A)："
+#: library/effectview.cpp:176
+msgid "This will remove the selected effect from your chain."
+msgstr "将选中的效果从链中删除。"
 
-#: modules/infrared/irprefs.cpp:73
-msgid "&Repeat"
-msgstr "重复(&R)"
+#: library/playlistsaver.cpp:110 library/playlistsaver.cpp:306
+#: library/playlistsaver.cpp:559
+#, c-format
+msgid "Stream from %1"
+msgstr "来自 %1 的流"
 
-#: modules/infrared/irprefs.cpp:77
-msgid "&Interval:"
-msgstr "间隔(&I)："
+#: library/playlistsaver.cpp:751
+msgid "Stream from %1 (port: %2)"
+msgstr "来自 %1 (端口：%2)的流"
 
-#: modules/infrared/irprefs.cpp:132
-msgid "You do not have any remote control configured."
-msgstr "您还没有配置任何遥控控制。"
+#: library/playlistsaver.cpp:753
+msgid "Stream from %1, (ip: %2, port: %3)"
+msgstr "来自 %1 (IP：%2，端口：%3) 的流"
 
-#: modules/infrared/irprefs.cpp:133
-msgid "Please make sure lirc is setup correctly."
-msgstr "请确认 LIRC 已经正确设置。"
+#: library/downloader.cpp:101
+msgid "Unknown"
+msgstr "未知"
 
-#: modules/infrared/irprefs.cpp:137
-msgid "Connection could not be established."
-msgstr "无法建立连接。"
+#: library/pref.cpp:12
+msgid "Preferences - Noatun"
+msgstr "首选项 - Noatun"
 
-#: modules/infrared/irprefs.cpp:138
-msgid "Please make sure lirc is setup correctly and lircd is running."
-msgstr "请确认 LIRC 已经正确设置并正在运行。"
+#: library/pluginmodule.cpp:140
+msgid "Plugins"
+msgstr "插件"
 
-#: modules/infrared/irprefs.cpp:144
-msgid "Button"
-msgstr "按钮"
+#: library/pluginmodule.cpp:140
+msgid "Select Your Plugins"
+msgstr "选择您的插件"
 
-#: modules/infrared/irprefs.cpp:145
-msgid "Action"
-msgstr "动作"
+#: library/pluginmodule.cpp:148
+msgid "<b>Select one or more interfaces to use:</b>"
+msgstr "<b>选择一个或者多个要使用的界面：</b>"
 
-#: modules/infrared/irprefs.cpp:146
-msgid "Interval"
-msgstr "间隔"
+#: library/pluginmodule.cpp:151 library/pluginmodule.cpp:163
+#: library/pluginmodule.cpp:174 library/pluginmodule.cpp:186
+msgid "Name"
+msgstr "名称"
 
-#: modules/htmlexport/htmlexport.cpp:20
-msgid "&Export Playlist..."
-msgstr "导出播放列表(&E)..."
+#: library/pluginmodule.cpp:152 library/pluginmodule.cpp:164
+#: library/pluginmodule.cpp:175 library/pluginmodule.cpp:187
+msgid "Description"
+msgstr "描述"
 
-#: modules/htmlexport/htmlexport.cpp:42
-msgid "Export Playlist"
-msgstr "导出播放列表"
+#: library/pluginmodule.cpp:153 library/pluginmodule.cpp:165
+#: library/pluginmodule.cpp:176 library/pluginmodule.cpp:188
+msgid "Author"
+msgstr "作者"
 
-#: modules/htmlexport/htmlexport.cpp:60 modules/htmlexport/htmlexport.cpp:90
-msgid "Noatun Playlist"
-msgstr "Noatun 播放列表"
+#: library/pluginmodule.cpp:154 library/pluginmodule.cpp:166
+#: library/pluginmodule.cpp:177 library/pluginmodule.cpp:189
+msgid "License"
+msgstr "许可证"
 
-#: modules/htmlexport/htmlexport.cpp:175
-msgid "Playlist Export"
-msgstr "播放列表导出"
+#: library/pluginmodule.cpp:156
+msgid "&Interfaces"
+msgstr "界面(&I)"
 
-#: modules/htmlexport/htmlexport.cpp:175
-msgid "Colors & Settings for HTML Export"
-msgstr "HTML 导出的颜色和设置"
+#: library/pluginmodule.cpp:160
+msgid "<b>Select one playlist to use:</b>"
+msgstr "<b>选择一个要使用的播放列表：</b>"
 
-#: modules/htmlexport/htmlexport.cpp:201
-msgid "HTML Color Settings"
-msgstr "HTML 颜色设置"
+#: library/pluginmodule.cpp:172
+msgid "<b>Select any visualizations to use:</b>"
+msgstr "<b>选择要使用的任何视觉插件：</b>"
 
-#: modules/htmlexport/htmlexport.cpp:215
-msgid "Text:"
-msgstr "文字："
+#: library/pluginmodule.cpp:184
+msgid "<b>Select any other plugins to use:</b>"
+msgstr "<b>选择要使用的任何其它插件：</b>"
 
-#: modules/htmlexport/htmlexport.cpp:219
-msgid "Background:"
-msgstr "背景："
+#: library/pluginmodule.cpp:191
+msgid "O&ther Plugins"
+msgstr "其它插件(&T)"
 
-#: modules/htmlexport/htmlexport.cpp:223
-msgid "Heading:"
-msgstr "题头："
+#: library/pluginmodule.cpp:401
+msgid ""
+"<qt>Changing your playlist plugin will stop playback. Different playlists may "
+"use different methods of storing information, so after changing playlists you "
+"may have to recreate your playlist.</qt>"
+msgstr ""
+"<qt>改变播放列表插件将会停止播放。由于不同的播放列表可能使用不同信息储存方式，因此在改变播放列表以后，您也许需要重新创建您的播放列表。</qt>"
 
-#: modules/htmlexport/htmlexport.cpp:227
-msgid "Link hover:"
-msgstr "鼠标悬停链接："
+#: library/vequalizer.cpp:845
+msgid "Trance"
+msgstr "恍惚"
 
-#: modules/htmlexport/htmlexport.cpp:248
-msgid "Background Image"
-msgstr "背景图像"
+#: library/vequalizer.cpp:846
+msgid "Dance"
+msgstr "舞曲"
 
-#: modules/htmlexport/htmlexport.cpp:259
-msgid "Hyper&link playlist entries to their URL"
-msgstr "创建从播放列表项指向相应 URL 的超连接(&L)"
+#: library/vequalizer.cpp:847
+msgid "Metal"
+msgstr "金属"
 
-#: modules/htmlexport/htmlexport.cpp:263
-msgid "&Number playlist entries"
-msgstr "用数字标注播放列表项(&N)"
+#: library/vequalizer.cpp:848
+msgid "Jazz"
+msgstr "爵士"
 
-#: modules/winskin/waSkin.cpp:451
-msgid "Seek to: %1/%2 (%3%)"
-msgstr "搜索至：%1/%2 (%3%)"
+#: library/vequalizer.cpp:849
+msgid "Zero"
+msgstr "零点"
 
-#: modules/winskin/waSkin.cpp:558
-msgid "Balance: Center"
-msgstr "平衡：居中"
+#: library/vequalizer.cpp:850
+msgid "Eclectic Guitar"
+msgstr "电吉他"
 
-#: modules/winskin/waSkin.cpp:561
-msgid "Balance: %1% Left"
-msgstr "平衡：%1% 左"
+#: library/equalizerview.cpp:45 library/equalizerview.cpp:51
+#: library/equalizerview.cpp:146 library/equalizerview.cpp:270
+msgid "Custom"
+msgstr "自定义"
 
-#: modules/winskin/waSkin.cpp:563
-msgid "Balance: %1% Right"
-msgstr "平衡：%1% 右"
+#: library/equalizerview.cpp:284
+msgid "New Preset"
+msgstr "新建预置"
 
-#: modules/winskin/waSkin.cpp:675
-msgid "Volume: %1%"
-msgstr "音量：%1%"
+#: library/engine.cpp:257
+msgid "There was an error communicating to the aRts daemon."
+msgstr "与 aRts 守护进程通讯时出现错误。"
 
-#: modules/winskin/guiSpectrumAnalyser.cpp:37
-msgid "Visualization Mode"
-msgstr "视觉插件模式"
+#: library/engine.cpp:257
+msgid "aRts error"
+msgstr "aRts 错误"
 
-#: modules/winskin/guiSpectrumAnalyser.cpp:38
-msgid "Analyzer Mode"
-msgstr "频谱分析器模式"
+#: library/engine.cpp:577
+msgid ""
+"Connecting/starting aRts soundserver failed. Make sure that artsd is configured "
+"properly."
+msgstr "连接/启动 aRts 声音服务器失败。请确认正确配置了 artsd。"
 
-#: modules/winskin/guiSpectrumAnalyser.cpp:40
-msgid "Analyzer"
-msgstr "频谱分析器"
+#: library/video.cpp:119
+msgid "Video - Noatun"
+msgstr "视频 - Noatun"
 
-#: modules/winskin/guiSpectrumAnalyser.cpp:41
-msgid "Disabled"
-msgstr "已禁用"
+#: library/cmodule.cpp:32
+msgid "General"
+msgstr "常规"
 
-#: modules/winskin/guiSpectrumAnalyser.cpp:45
-msgid "Normal"
-msgstr "普通"
+#: library/cmodule.cpp:32
+msgid "General Options"
+msgstr "常规选项"
 
-#: modules/winskin/guiSpectrumAnalyser.cpp:46
-msgid "Fire"
-msgstr "火焰"
+#: library/cmodule.cpp:34
+msgid "&Return to start of playlist on finish"
+msgstr "播放完毕返回播放列表开头(&R)"
 
-#: modules/winskin/guiSpectrumAnalyser.cpp:47
-msgid "Vertical Lines"
-msgstr "竖线"
+#: library/cmodule.cpp:36
+msgid ""
+"When the playlist is finished playing, return to the start, but do not start "
+"playing."
+msgstr "当播放列表播放结束时，返回到开头处，但不再播放。"
 
-#: modules/winskin/winSkinConfig.cpp:27
-msgid "Winskin"
-msgstr "Winskin"
+#: library/cmodule.cpp:38
+msgid "Allow only one &instance of Noatun"
+msgstr "仅允许单个 Noatun 实例(&I)"
 
-#: modules/winskin/winSkinConfig.cpp:28
-msgid "Skin Selection for the Winskin Plugin"
-msgstr "Winskin 插件皮肤选择"
+#: library/cmodule.cpp:40
+msgid ""
+"Starting noatun a second time will cause it to just append items from the start "
+"to the current instance."
+msgstr "重复启动 Noatun 将把播放项目从启动的实例添加到当前的实例中。"
 
-#: modules/winskin/winSkinConfig.cpp:43
-msgid "&Install New Skin..."
-msgstr "安装新皮肤(&I)..."
+#: library/cmodule.cpp:42
+msgid "Clear playlist &when opening a file"
+msgstr "打开文件时清除播放列表(&W)"
 
-#: modules/winskin/winSkinConfig.cpp:46
-msgid "&Remove Skin"
-msgstr "删除皮肤(&R)"
+#: library/cmodule.cpp:44
+msgid ""
+"Opening a file with the global Open menu item will clear the playlist first."
+msgstr "当通过全局的打开菜单打开一个文件时，将会首先清除播放列表。"
 
-#: modules/winskin/winSkinConfig.cpp:58
-msgid "Settings"
-msgstr "设置"
+#: library/cmodule.cpp:46
+msgid "&Use fast hardware volume control"
+msgstr "使用快速硬件音量控制(&U)"
 
-#: modules/winskin/winSkinConfig.cpp:62
-msgid "T&itle scrolling speed:"
-msgstr "标题显示滚动速度(&I)："
+#: library/cmodule.cpp:48
+msgid ""
+"Use the hardware mixer instead of aRts'. It affects all streams, not just "
+"Noatun's, but is a little faster."
+msgstr "使用硬件的混音器而不使用 aRts 的。这将影响到所有的流，不仅仅是 Noatun 的，但会稍快一些。"
 
-#: modules/winskin/winSkinConfig.cpp:159
-msgid "You cannot remove this skin."
-msgstr "您不能删除这个皮肤。"
+#: library/cmodule.cpp:50
+msgid "Display &remaining play time"
+msgstr "显示剩余的播放时间(&R)"
 
-#: modules/winskin/winSkinConfig.cpp:166
-msgid "<qt>Are you sure you want to remove the <b>%1</b> skin?</qt>"
-msgstr "<qt>您确实要删除 <b>%1</b> 皮肤吗？</qt>"
+#: library/cmodule.cpp:52
+msgid ""
+"Counters count down towards zero, showing remaining time instead of elapsed "
+"time."
+msgstr "从高往低计数，显示剩余的时间，而不是已播放的时间。"
 
-#: modules/noatunui/userinterface.cpp:73
-msgid "Change loop style"
-msgstr "改变循环方式"
+#: library/cmodule.cpp:54
+msgid "Title &format:"
+msgstr "标题格式(&F)："
 
-#: modules/noatunui/userinterface.cpp:104
-#: modules/noatunui/userinterface.cpp:218
-msgid "No File Loaded"
-msgstr "没有载入文件"
+#: library/cmodule.cpp:59
+msgid ""
+"Select a title to use for each file (in the playlist and user interface). Each "
+"element such as $(title) is replaced with the property with the name as given "
+"in the parentheses. The properties include, but are not limited to: title, "
+"author, date, comments and album."
+msgstr ""
+"请选择每个文件所使用的标题(在播放列表以及用户界面中)。每个元素如 $(title) "
+"将以括号中给出的名称的属性来替代。这些属性包括(但不只限于)：title(标题)、author(作者)、date(日期)、comments(评注) 和 "
+"album(专辑)。"
+
+#: library/cmodule.cpp:64
+msgid "&Download folder:"
+msgstr "下载文件夹(&D)："
+
+#: library/cmodule.cpp:69
+msgid "When opening a non-local file, download it to the selected folder."
+msgstr "当打开一个非本地文件时，将它下载到选定的文件夹。"
+
+#: library/cmodule.cpp:71
+msgid "Play Behavior on Startup"
+msgstr "启动时的播放行为"
+
+#: library/cmodule.cpp:74
+msgid "Restore &play state"
+msgstr "恢复播放状态(&P)"
+
+#: library/cmodule.cpp:78
+msgid "Automatically play &first file"
+msgstr "自动播放第一个文件(&F)"
+
+#: library/cmodule.cpp:82
+msgid "&Do not start playing"
+msgstr "不开始播放(&D)"
diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_au.po b/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_au.po
index 716d514a4eb..cb8ecf5fb1a 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_au.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_au.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_au\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2002-11-12 03:55-0500\n"
 "Last-Translator: Liu Songhe <jackliu9999@263.net>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_avi.po b/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_avi.po
index 1125503783f..440e7cc8f35 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_avi.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_avi.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_avi 3.1\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2002-11-12 00:25+0800\n"
 "Last-Translator: Liu Songhe <jackliu9999@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_flac.po b/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_flac.po
index 968f7aad302..1615a409a3c 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_flac.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_flac.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_flac\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-07-12 19:48+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_m3u.po b/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_m3u.po
index e0f7f9906b4..7a8447691b7 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_m3u.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_m3u.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_m3u\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2002-11-12 04:00-0500\n"
 "Last-Translator: Liu Songhe <jackliu9999@263.net>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_mp3.po b/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_mp3.po
index 1f8fcaab534..d1f4efb6107 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_mp3.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_mp3.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_mp3\n"
-"POT-Creation-Date: 2005-05-26 01:24+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2003-12-21 23:36+0800\n"
 "Last-Translator: Liu Songhe <jackliu9999@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_mpc.po b/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_mpc.po
index 536acf58359..5b0d883d4b2 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_mpc.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_mpc.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_mpc for kde 3.3\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-09-14 03:55+0800\n"
 "Last-Translator: Liu Songhe <jack@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_mpeg.po b/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_mpeg.po
index a47e0ca358b..a8a32d496aa 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_mpeg.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_mpeg.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_mpeg\n"
-"POT-Creation-Date: 2006-08-16 04:08+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2005-08-02 16:33+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_ogg.po b/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_ogg.po
index ccd4fee1c50..4c4dfae4a40 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_ogg.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_ogg.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_ogg\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2003-07-28 09:40+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@126.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -88,7 +89,8 @@ msgstr " Hz"
 msgid "Upper Bitrate"
 msgstr "高端位率"
 
-#: tdefile_ogg.cpp:131 tdefile_ogg.cpp:135 tdefile_ogg.cpp:139 tdefile_ogg.cpp:145
+#: tdefile_ogg.cpp:131 tdefile_ogg.cpp:135 tdefile_ogg.cpp:139
+#: tdefile_ogg.cpp:145
 msgid " kbps"
 msgstr " kbps"
 
diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_sid.po b/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_sid.po
index f494052483f..1d304953fda 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_sid.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_sid.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_sid\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-07-12 19:46+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_theora.po b/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_theora.po
index cb42cfde85e..d7aeab8c050 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_theora.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_theora.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_theora\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2005-01-20 19:30+0800\n"
 "Last-Translator: Liu Songhe <jack@linux.net.cn>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_wav.po b/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_wav.po
index 56caee81773..a0dfe6af751 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_wav.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/tdefile_wav.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_wav\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2002-11-12 04:14-0500\n"
 "Last-Translator: Mai Hao Hui <mhh@126.com>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/tdeio_audiocd.po b/tde-i18n-zh_CN/messages/tdemultimedia/tdeio_audiocd.po
index cf43805d787..1ed5aa76283 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/tdeio_audiocd.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/tdeio_audiocd.po
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_audiocd\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-19 02:40+0100\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2005-08-02 06:24+0800\n"
 "Last-Translator: Liu Songhe <jack@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,29 +34,29 @@ msgstr "协议名"
 msgid "Socket name"
 msgstr "套接字名"
 
-#: audiocd.cpp:110
+#: audiocd.cpp:109
 msgid "Full CD"
 msgstr "整张 CD"
 
-#: audiocd.cpp:201
+#: audiocd.cpp:200
 msgid ""
 "You cannot specify a host with this protocol. Please use the audiocd:/ format "
 "instead."
 msgstr "您不能在这个协议中指定一个主机。请用 audiocd:/ 格式代替。"
 
-#: audiocd.cpp:755
+#: audiocd.cpp:754
 msgid ""
 "Device doesn't have read permissions for this account.  Check the read "
 "permissions on the device."
 msgstr "此账户没有对设备的读权限。请检查该设备的读权限。"
 
-#: audiocd.cpp:757
+#: audiocd.cpp:756
 msgid ""
 "Device doesn't have write permissions for this account.  Check the write "
 "permissions on the device."
 msgstr "此账户没有对设备的写权限。请检查该设备的写权限。"
 
-#: audiocd.cpp:761
+#: audiocd.cpp:760
 msgid ""
 "Unknown error.  If you have a cd in the drive try running cdparanoia -vsQ as "
 "yourself (not root). Do you see a track list? If not, make sure you have "
@@ -70,19 +71,19 @@ msgstr ""
 "刻录机)，那么请确保您核实了您拥有普通 SCSI 设备的读写权限，这些设备很可能是 /dev/sg0，/dev/sg1，等等。如果这些都不奏效，请尝试输入 "
 "audiocd:/?device=/dev/sg0 (或者类似的字符串)来告知 tdeio_audiocd 您的 CD-ROM 到底是哪个设备。"
 
-#: audiocd.cpp:835
+#: audiocd.cpp:834
 msgid "AudioCD: Disk damage detected on this track, risk of data corruption."
 msgstr "AudioCD：在本轨道上侦测到盘片损伤，有数据破坏的危险。"
 
-#: audiocd.cpp:841
+#: audiocd.cpp:840
 msgid "Error reading audio data for %1 from the CD"
 msgstr "从 CD 读取 %1 的音频数据出错"
 
-#: audiocd.cpp:851 audiocd.cpp:929
+#: audiocd.cpp:850 audiocd.cpp:928
 msgid "Couldn't read %1: encoding failed"
 msgstr "无法读取 %1：编码失败"
 
-#: audiocd.cpp:1061
+#: audiocd.cpp:1060
 #, c-format
 msgid "Track %1"
 msgstr "轨道 %1"
diff --git a/tde-i18n-zh_CN/messages/tdemultimedia/tdemid.po b/tde-i18n-zh_CN/messages/tdemultimedia/tdemid.po
index 82fbdd4672a..e9ddde32d31 100644
--- a/tde-i18n-zh_CN/messages/tdemultimedia/tdemid.po
+++ b/tde-i18n-zh_CN/messages/tdemultimedia/tdemid.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdemid\n"
-"POT-Creation-Date: 2005-08-24 02:38+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-01-09 13:01+0800\n"
 "Last-Translator: Liu Songhe <jackliu9999@263.net>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -105,6 +106,46 @@ msgstr "改变收藏集的名称"
 msgid "Enter the name of the selected collection:"
 msgstr "输入选中的收藏集的名字："
 
+#: main.cpp:63
+msgid "File to open"
+msgstr "要打开的文件"
+
+#: midicfgdlg.cpp:42
+msgid "Configure MIDI Devices"
+msgstr "配置 MIDI 设备"
+
+#: midicfgdlg.cpp:49
+msgid "Select the MIDI device you want to use:"
+msgstr "选择您要使用的 MIDI 设备："
+
+#: midicfgdlg.cpp:68
+msgid "Use the MIDI map:"
+msgstr "使用 MIDI 映射表："
+
+#: midicfgdlg.cpp:82 midicfgdlg.cpp:92 midicfgdlg.cpp:132
+msgid "None"
+msgstr "无"
+
+#: midicfgdlg.cpp:117 tdemidframe.cpp:286 tdemidframe.cpp:561
+msgid "Only local files are currently supported."
+msgstr "目前仅支持本地文件。"
+
+#. i18n: file tdemidui.rc line 7
+#: rc.cpp:6
+#, no-c-format
+msgid "&Song"
+msgstr "乐曲(&S)"
+
+#. i18n: file tdemidui.rc line 15
+#: rc.cpp:9
+#, no-c-format
+msgid "&Collections"
+msgstr "收藏集(&C)"
+
+#: slman.cpp:225
+msgid "Temporary Collection"
+msgstr "临时收藏集"
+
 #: tdemid_part.cpp:51
 msgid "MIDI/Karaoke file player"
 msgstr "MIDI/卡拉OK 文件播放器"
@@ -286,10 +327,6 @@ msgstr "改变字体(&F)..."
 msgid "MIDI &Setup..."
 msgstr "MIDI 设置(&S)..."
 
-#: tdemidframe.cpp:286 tdemidframe.cpp:561 midicfgdlg.cpp:117
-msgid "Only local files are currently supported."
-msgstr "目前仅支持本地文件。"
-
 #: tdemidframe.cpp:469
 msgid ""
 "Could not open /dev/sequencer to get some info.\n"
@@ -310,42 +347,6 @@ msgstr ""
 msgid "Overwrite"
 msgstr "覆盖"
 
-#: main.cpp:63
-msgid "File to open"
-msgstr "要打开的文件"
-
-#: midicfgdlg.cpp:42
-msgid "Configure MIDI Devices"
-msgstr "配置 MIDI 设备"
-
-#: midicfgdlg.cpp:49
-msgid "Select the MIDI device you want to use:"
-msgstr "选择您要使用的 MIDI 设备："
-
-#: midicfgdlg.cpp:68
-msgid "Use the MIDI map:"
-msgstr "使用 MIDI 映射表："
-
-#: midicfgdlg.cpp:82 midicfgdlg.cpp:92 midicfgdlg.cpp:132
-msgid "None"
-msgstr "无"
-
-#. i18n: file tdemidui.rc line 7
-#: rc.cpp:6
-#, no-c-format
-msgid "&Song"
-msgstr "乐曲(&S)"
-
-#. i18n: file tdemidui.rc line 15
-#: rc.cpp:9
-#, no-c-format
-msgid "&Collections"
-msgstr "收藏集(&C)"
-
-#: slman.cpp:225
-msgid "Temporary Collection"
-msgstr "临时收藏集"
-
 #: instrname.i18n:6
 msgid "Acoustic Grand Piano"
 msgstr "原声大钢琴"
diff --git a/tde-i18n-zh_CN/messages/tdenetwork/dcoprss.po b/tde-i18n-zh_CN/messages/tdenetwork/dcoprss.po
index cb0bd30107d..e7e3853135c 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/dcoprss.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/dcoprss.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: dcopservice\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2003-12-28 18:40+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdenetwork/kcm_krfb.po b/tde-i18n-zh_CN/messages/tdenetwork/kcm_krfb.po
index fdc4b85b984..8885d9d08c9 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/kcm_krfb.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/kcm_krfb.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcm_krfb\n"
-"POT-Creation-Date: 2008-01-11 01:16+0100\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-01-14 16:14+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdenetwork/kcmktalkd.po b/tde-i18n-zh_CN/messages/tdenetwork/kcmktalkd.po
index 71a79adf4ca..d268369692f 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/kcmktalkd.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/kcmktalkd.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmktalkd\n"
-"POT-Creation-Date: 2005-08-24 02:37+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2003-12-28 18:41+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdenetwork/kcmlanbrowser.po b/tde-i18n-zh_CN/messages/tdenetwork/kcmlanbrowser.po
index 9bd328aee97..764670ba16d 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/kcmlanbrowser.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/kcmlanbrowser.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmlanbrowser\n"
-"POT-Creation-Date: 2005-08-10 10:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2005-08-02 17:23+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -500,35 +501,35 @@ msgid ""
 "<br>Make sure that the reslisa binary is installed <i>suid root</i>."
 msgstr "现在应该已经正确配置了 ResLISa 守护进程。<br>请确定已经以 <i>suid root</i> 身份安装了 reslisa 程序。"
 
-#: kcmkiolan.cpp:41
+#: kcmtdeiolan.cpp:41
 msgid "Show Links for Following Services"
 msgstr "显示下列服务的链接"
 
-#: kcmkiolan.cpp:43
+#: kcmtdeiolan.cpp:43
 msgid "FTP (TCP, port 21): "
 msgstr "FTP (TCP 端口 21)："
 
-#: kcmkiolan.cpp:44
+#: kcmtdeiolan.cpp:44
 msgid "HTTP (TCP, port 80): "
 msgstr "HTTP (TCP 端口 80)"
 
-#: kcmkiolan.cpp:45
+#: kcmtdeiolan.cpp:45
 msgid "NFS (TCP, port 2049): "
 msgstr "NFS (TCP 端口 2049)："
 
-#: kcmkiolan.cpp:46
+#: kcmtdeiolan.cpp:46
 msgid "Windows shares (TCP, ports 445 and 139):"
 msgstr "Windows 共享(TCP 端口 445 和 139)："
 
-#: kcmkiolan.cpp:47
+#: kcmtdeiolan.cpp:47
 msgid "Secure Shell/Fish (TCP, port 22): "
 msgstr "安全 Shell/Fish(TCP 端口 22)："
 
-#: kcmkiolan.cpp:48
+#: kcmtdeiolan.cpp:48
 msgid "Show &short hostnames (without domain suffix)"
 msgstr "显示短主机名(不显示域名后缀)(&S)"
 
-#: kcmkiolan.cpp:51
+#: kcmtdeiolan.cpp:51
 msgid "Default LISa server host: "
 msgstr "默认 LISa 服务器主机："
 
diff --git a/tde-i18n-zh_CN/messages/tdenetwork/kcmwifi.po b/tde-i18n-zh_CN/messages/tdenetwork/kcmwifi.po
index e7142f77ffd..647cd284efe 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/kcmwifi.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/kcmwifi.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmwifi\n"
-"POT-Creation-Date: 2006-11-25 02:36+0100\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2005-12-03 22:16+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -617,6 +618,5 @@ msgid ""
 "Center module."
 msgstr "选中此框后，在您调用控制中心模块时，您的设置将被立即应用。"
 
-#: wificonfig.cpp:239 wificonfig.cpp:261 wificonfig.cpp:280
-msgid "Unable to autodetect wireless interface."
-msgstr "无法自动检测无线接口。"
+#~ msgid "Unable to autodetect wireless interface."
+#~ msgstr "无法自动检测无线接口。"
diff --git a/tde-i18n-zh_CN/messages/tdenetwork/kdict.po b/tde-i18n-zh_CN/messages/tdenetwork/kdict.po
index 1548f4edd1f..12ac308d202 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/kdict.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/kdict.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdict\n"
-"POT-Creation-Date: 2005-05-16 01:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-06-18 23:01+0800\n"
 "Last-Translator: Li Zongliang <li-zongliang@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdenetwork/kdictapplet.po b/tde-i18n-zh_CN/messages/tdenetwork/kdictapplet.po
index 8230584cea6..f4d812cf460 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/kdictapplet.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/kdictapplet.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdictapplet\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2003-12-28 18:37+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@126.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdenetwork/kget.po b/tde-i18n-zh_CN/messages/tdenetwork/kget.po
index e2d5fb287e6..91e8c8f5adf 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/kget.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/kget.po
@@ -10,10 +10,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2005-08-04 04:58+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -143,6 +144,416 @@ msgstr "最小化"
 msgid "Sticky"
 msgstr "粘附"
 
+#: logwindow.cpp:96
+msgid "Id"
+msgstr "ID"
+
+#: logwindow.cpp:97
+msgid "Name"
+msgstr "名字"
+
+#: logwindow.cpp:159
+msgid "Log Window"
+msgstr "日志窗口"
+
+#: logwindow.cpp:163
+msgid "Mixed"
+msgstr "混合的"
+
+#: logwindow.cpp:172
+msgid "Separated"
+msgstr "分开的"
+
+#: main.cpp:44
+msgid "An advanced download manager for TDE"
+msgstr "TDE 的高级下载管理器"
+
+#: main.cpp:50
+msgid "Start KGet with drop target"
+msgstr "KGet 启动为拖放目标"
+
+#: main.cpp:51
+msgid "URL(s) to download"
+msgstr "要下载的 URL"
+
+#: kget_plug_in/kget_linkview.cpp:43 main.cpp:199
+msgid "KGet"
+msgstr "KGet"
+
+#. i18n: file dlgadvancedbase.ui line 27
+#: rc.cpp:3
+#, no-c-format
+msgid "Advanced Options"
+msgstr "高级选项"
+
+#. i18n: file dlgadvancedbase.ui line 38
+#: rc.cpp:6
+#, no-c-format
+msgid "Add new transfers as:"
+msgstr "新传输添加为："
+
+#. i18n: file dlgadvancedbase.ui line 63
+#: rc.cpp:9
+#, no-c-format
+msgid "Iconified"
+msgstr "图标化"
+
+#. i18n: file dlgadvancedbase.ui line 71
+#: rc.cpp:12
+#, no-c-format
+msgid "Advanced individual windows"
+msgstr "高级的单独窗口"
+
+#. i18n: file dlgadvancedbase.ui line 79
+#: rc.cpp:15
+#, no-c-format
+msgid "Mark partial downloads"
+msgstr "标记部分下载"
+
+#. i18n: file dlgadvancedbase.ui line 87
+#: rc.cpp:18
+#, no-c-format
+msgid "Remove files from a list after success"
+msgstr "下载成功后将文件从列表中删除"
+
+#. i18n: file dlgadvancedbase.ui line 95
+#: rc.cpp:21
+#, no-c-format
+msgid "Get file sizes"
+msgstr "获取文件大小"
+
+#. i18n: file dlgadvancedbase.ui line 103
+#: rc.cpp:24
+#, no-c-format
+msgid "Expert mode (do not prompt for Cancel or Delete)"
+msgstr "专家模式(取消或删除皆不再询问)"
+
+#. i18n: file dlgadvancedbase.ui line 111
+#: rc.cpp:27
+#, no-c-format
+msgid "Use KGet as Download Manager for Konqueror"
+msgstr "将 KGet 用作 Konqueror 的下载管理器"
+
+#. i18n: file dlgadvancedbase.ui line 119
+#: rc.cpp:30
+#, no-c-format
+msgid "Show main window at startup"
+msgstr "启动时显示主窗口"
+
+#. i18n: file dlgadvancedbase.ui line 127
+#: rc.cpp:33
+#, no-c-format
+msgid "Show individual windows"
+msgstr "显示单独的窗口"
+
+#. i18n: file dlgadvancedbase.ui line 158
+#: rc.cpp:36
+#, no-c-format
+msgid "Queued"
+msgstr "已排队"
+
+#. i18n: file dlgadvancedbase.ui line 166
+#: rc.cpp:39
+#, no-c-format
+msgid "Delayed"
+msgstr "已推迟"
+
+#. i18n: file dlgautomationbase.ui line 27
+#: rc.cpp:42
+#, no-c-format
+msgid "Automation Options"
+msgstr "自动选项"
+
+#. i18n: file dlgautomationbase.ui line 38
+#: rc.cpp:45 rc.cpp:78 rc.cpp:93 rc.cpp:99
+#, no-c-format
+msgid " min"
+msgstr " 分钟"
+
+#. i18n: file dlgautomationbase.ui line 52
+#: rc.cpp:48
+#, no-c-format
+msgid "Auto disconnect after completing downloads"
+msgstr "完成下载后自动断开连接"
+
+#. i18n: file dlgautomationbase.ui line 60
+#: rc.cpp:51
+#, no-c-format
+msgid "Autosave file list every:"
+msgstr "自动保存文件列表间隔："
+
+#. i18n: file dlgautomationbase.ui line 68
+#: rc.cpp:54
+#, no-c-format
+msgid "Timed disconnect"
+msgstr "定时断开连接"
+
+#. i18n: file dlgautomationbase.ui line 76
+#: rc.cpp:57
+#, no-c-format
+msgid "Disconnect command:"
+msgstr "断开连接命令："
+
+#. i18n: file dlgautomationbase.ui line 94
+#: rc.cpp:60
+#, no-c-format
+msgid "Auto paste from clipboard"
+msgstr "自动从剪贴板中粘贴"
+
+#. i18n: file dlgautomationbase.ui line 102
+#: rc.cpp:63
+#, no-c-format
+msgid "Auto shutdown after completing downloads"
+msgstr "完成下载后自动关机"
+
+#. i18n: file dlgconnectionbase.ui line 27
+#: rc.cpp:66
+#, no-c-format
+msgid "Reconnect Options"
+msgstr "重新连接选项"
+
+#. i18n: file dlgconnectionbase.ui line 38
+#: rc.cpp:69
+#, no-c-format
+msgid "On login or timeout error"
+msgstr "发生登录或超时错误时重连"
+
+#. i18n: file dlgconnectionbase.ui line 46
+#: rc.cpp:72
+#, no-c-format
+msgid "Reconnect after:"
+msgstr "重新连接延时："
+
+#. i18n: file dlgconnectionbase.ui line 54
+#: rc.cpp:75
+#, no-c-format
+msgid "Number of retries:"
+msgstr "重试次数："
+
+#. i18n: file dlgconnectionbase.ui line 84
+#: rc.cpp:81
+#, no-c-format
+msgid "On broken connection"
+msgstr "连接中断时重连"
+
+#. i18n: file dlgconnectionbase.ui line 128
+#: rc.cpp:84
+#, no-c-format
+msgid "Timeout Options"
+msgstr "超时选项"
+
+#. i18n: file dlgconnectionbase.ui line 156
+#: rc.cpp:87
+#, no-c-format
+msgid "If no data arrives in:"
+msgstr "如果没有数据到达，等待："
+
+#. i18n: file dlgconnectionbase.ui line 164
+#: rc.cpp:90
+#, no-c-format
+msgid "If server cannot resume:"
+msgstr "如果服务器无法续传："
+
+#. i18n: file dlgconnectionbase.ui line 203
+#: rc.cpp:96
+#, no-c-format
+msgid "or"
+msgstr "或"
+
+#. i18n: file dlgconnectionbase.ui line 227
+#: rc.cpp:102
+#, no-c-format
+msgid "Connection Type"
+msgstr "连接类型"
+
+#. i18n: file dlgconnectionbase.ui line 236
+#: rc.cpp:105
+#, no-c-format
+msgid "Permanent"
+msgstr "永久"
+
+#. i18n: file dlgconnectionbase.ui line 241
+#: rc.cpp:108
+#, no-c-format
+msgid "Ethernet"
+msgstr "以太网"
+
+#. i18n: file dlgconnectionbase.ui line 246
+#: rc.cpp:111
+#, no-c-format
+msgid "PLIP"
+msgstr "PLIP"
+
+#. i18n: file dlgconnectionbase.ui line 251
+#: rc.cpp:114
+#, no-c-format
+msgid "SLIP"
+msgstr "SLIP"
+
+#. i18n: file dlgconnectionbase.ui line 256
+#: rc.cpp:117
+#, no-c-format
+msgid "PPP"
+msgstr "PPP"
+
+#. i18n: file dlgconnectionbase.ui line 261
+#: rc.cpp:120
+#, no-c-format
+msgid "ISDN"
+msgstr "ISDN"
+
+#. i18n: file dlgconnectionbase.ui line 273
+#: rc.cpp:123
+#, no-c-format
+msgid "Offline mode"
+msgstr "离线模式"
+
+#. i18n: file dlgconnectionbase.ui line 298
+#: rc.cpp:126
+#, no-c-format
+msgid "Link number:"
+msgstr "连接号："
+
+#. i18n: file dlgdirectoriesbase.ui line 78
+#: rc.cpp:129
+#, no-c-format
+msgid "Extension"
+msgstr "扩展名"
+
+#. i18n: file dlgdirectoriesbase.ui line 89
+#: rc.cpp:132
+#, no-c-format
+msgid "Default Folder"
+msgstr "默认文件夹"
+
+#. i18n: file dlgdirectoriesbase.ui line 186
+#: rc.cpp:144
+#, no-c-format
+msgid "Extension (* for all files):"
+msgstr "扩展名(* 代表全部文件)："
+
+#. i18n: file dlgdirectoriesbase.ui line 199
+#: rc.cpp:147
+#, no-c-format
+msgid "Default folder:"
+msgstr "默认文件夹："
+
+#. i18n: file dlglimitsbase.ui line 27
+#: rc.cpp:150
+#, no-c-format
+msgid "Limits Options"
+msgstr "限制选项"
+
+#. i18n: file dlglimitsbase.ui line 38
+#: rc.cpp:153
+#, no-c-format
+msgid "Maximum open connections:"
+msgstr "打开连接的最大数目："
+
+#. i18n: file dlglimitsbase.ui line 46
+#: rc.cpp:156
+#, no-c-format
+msgid "Minimum network bandwidth:"
+msgstr "最小网络带宽："
+
+#. i18n: file dlglimitsbase.ui line 54
+#: rc.cpp:159
+#, no-c-format
+msgid "Maximum network bandwidth:"
+msgstr "最大网络带宽："
+
+#. i18n: file dlglimitsbase.ui line 70
+#: rc.cpp:162 rc.cpp:165
+#, no-c-format
+msgid " bytes/sec"
+msgstr " 字节/秒"
+
+#. i18n: file dlgsystembase.ui line 27
+#: rc.cpp:168
+#, no-c-format
+msgid "Use animation"
+msgstr "使用动画"
+
+#. i18n: file dlgsystembase.ui line 38
+#: rc.cpp:171
+#, no-c-format
+msgid "Window style:"
+msgstr "窗口风格："
+
+#. i18n: file dlgsystembase.ui line 46
+#: rc.cpp:174
+#, no-c-format
+msgid "Font:"
+msgstr "字体："
+
+#. i18n: file dlgsystembase.ui line 79
+#: rc.cpp:177
+#, no-c-format
+msgid "Normal"
+msgstr "正常"
+
+#. i18n: file dlgsystembase.ui line 87
+#: rc.cpp:180
+#, no-c-format
+msgid "Docked"
+msgstr "停靠"
+
+#. i18n: file dlgsystembase.ui line 95
+#: rc.cpp:183
+#, no-c-format
+msgid "Drop target"
+msgstr "拖放目标"
+
+#. i18n: file kgetui.rc line 14
+#: rc.cpp:189
+#, no-c-format
+msgid "&Transfer"
+msgstr "传输(&T)"
+
+#: safedelete.cpp:18
+msgid ""
+"Not deleting\n"
+"%1\n"
+"as it is a directory."
+msgstr ""
+"未删除\n"
+"%1\n"
+"因其是一个目录。"
+
+#: safedelete.cpp:20 safedelete.cpp:32
+msgid "Not Deleted"
+msgstr "未删除"
+
+#: safedelete.cpp:30
+msgid ""
+"Not deleting\n"
+"%1\n"
+"as it is not a local file."
+msgstr ""
+"未删除\n"
+"%1\n"
+"因其不是本地文件。"
+
+#: settings.cpp:131
+msgid ""
+"This is the first time that you have run KGet.\n"
+"Do you want to use KGet as Download Manager for Konqueror?"
+msgstr ""
+"这是您第一次运行 KGet。\n"
+"您是否想要将 KGet 用作 Konqueror 的下载管理器？"
+
+#: settings.cpp:131
+msgid "Konqueror Integration"
+msgstr "Konqueror 集成"
+
+#: settings.cpp:131
+msgid "Enable"
+msgstr "启用"
+
+#: settings.cpp:131
+msgid "Do Not Enable"
+msgstr "不启用"
+
 #: tdefileio.cpp:45
 #, c-format
 msgid ""
@@ -256,7 +667,7 @@ msgstr "欢迎使用 KGet"
 msgid "Could not create valid socket"
 msgstr "无法建立有效的套接字"
 
-#: tdemainwidget.cpp:253 tdemainwidget.cpp:1765 tdemainwidget.cpp:2247
+#: tdemainwidget.cpp:253 tdemainwidget.cpp:1763 tdemainwidget.cpp:2247
 msgid "Offline"
 msgstr "离线"
 
@@ -292,27 +703,27 @@ msgstr "移到开头(&B)"
 msgid "Move to &End"
 msgstr "移到结尾(&E)"
 
-#: tdemainwidget.cpp:366 transfer.cpp:127
+#: tdemainwidget.cpp:366 transfer.cpp:129
 msgid "&Resume"
 msgstr "续传(&R)"
 
-#: tdemainwidget.cpp:367 transfer.cpp:129
+#: tdemainwidget.cpp:367 transfer.cpp:131
 msgid "&Pause"
 msgstr "暂停(&P)"
 
-#: tdemainwidget.cpp:369 transfer.cpp:133
+#: tdemainwidget.cpp:369 transfer.cpp:135
 msgid "Re&start"
 msgstr "重新开始(&S)"
 
-#: tdemainwidget.cpp:371 transfer.cpp:135
+#: tdemainwidget.cpp:371 transfer.cpp:137
 msgid "&Queue"
 msgstr "排队(&Q)"
 
-#: tdemainwidget.cpp:372 transfer.cpp:137
+#: tdemainwidget.cpp:372 transfer.cpp:139
 msgid "&Timer"
 msgstr "定时器(&T)"
 
-#: tdemainwidget.cpp:373 transfer.cpp:139
+#: tdemainwidget.cpp:373 transfer.cpp:141
 msgid "De&lay"
 msgstr "延迟(&L)"
 
@@ -352,23 +763,23 @@ msgstr "显示日志窗口(&L)"
 msgid "Hide &Log Window"
 msgstr "隐藏日志窗口(&L)"
 
-#: tdemainwidget.cpp:402 tdemainwidget.cpp:1906
+#: tdemainwidget.cpp:402 tdemainwidget.cpp:1904
 msgid "Show Drop &Target"
 msgstr "显示拖放目标(&T)"
 
-#: tdemainwidget.cpp:403 tdemainwidget.cpp:1934
+#: tdemainwidget.cpp:403 tdemainwidget.cpp:1932
 msgid "Enable &KGet as Konqueror Download Manager"
 msgstr "将 &KGet 设置为 Konqueror 的下载管理器"
 
-#: tdemainwidget.cpp:405 tdemainwidget.cpp:1930
+#: tdemainwidget.cpp:405 tdemainwidget.cpp:1928
 msgid "Disable &KGet as Konqueror Download Manager"
 msgstr "不要将 &KGet 设置为 Konqueror 的下载管理器"
 
-#: tdemainwidget.cpp:414 tdemainwidget.cpp:2169
+#: tdemainwidget.cpp:414 tdemainwidget.cpp:2167
 msgid " Transfers: %1 "
 msgstr " 传输：%1 "
 
-#: tdemainwidget.cpp:415 tdemainwidget.cpp:2170
+#: tdemainwidget.cpp:415 tdemainwidget.cpp:2168
 msgid " Files: %1 "
 msgstr " 文件：%1 "
 
@@ -376,7 +787,7 @@ msgstr " 文件：%1 "
 msgid " Size: %1 KB "
 msgstr " 大小：%1 KB "
 
-#: tdemainwidget.cpp:417 tdemainwidget.cpp:2172
+#: tdemainwidget.cpp:417 tdemainwidget.cpp:2170
 msgid " Time: %1 "
 msgstr " 时间：%1 "
 
@@ -629,12 +1040,12 @@ msgstr ""
 msgid "Are you sure you want to delete these transfers?"
 msgstr "您确定要删除这些传输吗？"
 
-#: tdemainwidget.cpp:824 tdemainwidget.cpp:833 tdemainwidget.cpp:2216
+#: tdemainwidget.cpp:824 tdemainwidget.cpp:833 tdemainwidget.cpp:2214
 #: tdemainwidget.cpp:2486
 msgid "Question"
 msgstr "请问"
 
-#: tdemainwidget.cpp:832 transfer.cpp:457
+#: tdemainwidget.cpp:832 transfer.cpp:463
 msgid "Are you sure you want to delete this transfer?"
 msgstr "您确定要删除这个传输吗？"
 
@@ -705,107 +1116,107 @@ msgstr "已添加了 %n 个下载。"
 msgid "Starting another queued job."
 msgstr "开始另外一个排队的任务。"
 
-#: tdemainwidget.cpp:1510
+#: tdemainwidget.cpp:1508
 msgid "All the downloads are finished."
 msgstr "全部下载都已完成。"
 
-#: tdemainwidget.cpp:1514
+#: tdemainwidget.cpp:1512
 msgid "<i>%1</i> successfully downloaded."
 msgstr "<i>%1</i> 已成功下载。"
 
-#: tdemainwidget.cpp:1763
+#: tdemainwidget.cpp:1761
 msgid "Offline mode on."
 msgstr "离线模式启用。"
 
-#: tdemainwidget.cpp:1768
+#: tdemainwidget.cpp:1766
 msgid "Offline mode off."
 msgstr "离线模式关闭。"
 
-#: tdemainwidget.cpp:1793
+#: tdemainwidget.cpp:1791
 msgid "Expert mode on."
 msgstr "专家模式启用。"
 
-#: tdemainwidget.cpp:1795
+#: tdemainwidget.cpp:1793
 msgid "Expert mode off."
 msgstr "专家模式关闭。"
 
-#: tdemainwidget.cpp:1814
+#: tdemainwidget.cpp:1812
 msgid "Use last folder on."
 msgstr "使用最后访问文件夹启用。"
 
-#: tdemainwidget.cpp:1816
+#: tdemainwidget.cpp:1814
 msgid "Use last folder off."
 msgstr "使用最后访问文件夹模式关闭。"
 
-#: tdemainwidget.cpp:1834
+#: tdemainwidget.cpp:1832
 msgid "Auto disconnect on."
 msgstr "自动断开模式启用。"
 
-#: tdemainwidget.cpp:1836
+#: tdemainwidget.cpp:1834
 msgid "Auto disconnect off."
 msgstr "自动断开模式关闭。"
 
-#: tdemainwidget.cpp:1855
+#: tdemainwidget.cpp:1853
 msgid "Auto shutdown on."
 msgstr "自动关机模式启用。"
 
-#: tdemainwidget.cpp:1857
+#: tdemainwidget.cpp:1855
 msgid "Auto shutdown off."
 msgstr "自动关机模式关闭。"
 
-#: tdemainwidget.cpp:1878
+#: tdemainwidget.cpp:1876
 msgid "Auto paste on."
 msgstr "自动粘贴模式启用。"
 
-#: tdemainwidget.cpp:1881
+#: tdemainwidget.cpp:1879
 msgid "Auto paste off."
 msgstr "自动粘贴模式关闭。"
 
-#: tdemainwidget.cpp:1902
+#: tdemainwidget.cpp:1900
 msgid "Hide Drop &Target"
 msgstr "隐藏拖放目标(&T)"
 
-#: tdemainwidget.cpp:2171
+#: tdemainwidget.cpp:2169
 msgid " Size: %1 "
 msgstr " 大小：%1 "
 
-#: tdemainwidget.cpp:2173
+#: tdemainwidget.cpp:2171
 msgid " %1/s "
 msgstr " %1/秒 "
 
-#: tdemainwidget.cpp:2182
+#: tdemainwidget.cpp:2180
 msgid "<b>Transfers:</b> %1 "
 msgstr "<b>传输：</b> %1 "
 
-#: tdemainwidget.cpp:2183
+#: tdemainwidget.cpp:2181
 msgid "<br /><b>Files:</b> %1 "
 msgstr "<br /><b>文件</b>：%1 "
 
-#: tdemainwidget.cpp:2184
+#: tdemainwidget.cpp:2182
 msgid "<br /><b>Size:</b> %1 "
 msgstr "<br /><b>大小</b>：%1 "
 
-#: tdemainwidget.cpp:2185
+#: tdemainwidget.cpp:2183
 msgid "<br /><b>Time:</b> %1 "
 msgstr "<br /><b>时间</b>：%1 "
 
-#: tdemainwidget.cpp:2186
+#: tdemainwidget.cpp:2184
 msgid "<br /><b>Speed:</b> %1/s"
 msgstr "<br /><b>速度：</b> %1/s"
 
-#: tdemainwidget.cpp:2215
+#: tdemainwidget.cpp:2213
 msgid "Do you really want to disconnect?"
 msgstr "您真的要断开连接吗？"
 
-#: tdemainwidget.cpp:2217
+#: tdemainwidget.cpp:2215
 msgid "Disconnect"
 msgstr "断开连接"
 
-#: tdemainwidget.cpp:2217
+#: tdemainwidget.cpp:2215
 msgid "Stay Connected"
 msgstr "保持连接"
 
-#: tdemainwidget.cpp:2223
+#: tdemainwidget.cpp:2221
 msgid "Disconnecting..."
 msgstr "正在断开连接..."
 
@@ -840,504 +1251,94 @@ msgstr ""
 msgid "Download Again"
 msgstr "再次下载"
 
-#: logwindow.cpp:96
-msgid "Id"
-msgstr "ID"
-
-#: logwindow.cpp:97
-msgid "Name"
-msgstr "名字"
-
-#: logwindow.cpp:159
-msgid "Log Window"
-msgstr "日志窗口"
-
-#: logwindow.cpp:163
-msgid "Mixed"
-msgstr "混合的"
-
-#: logwindow.cpp:172
-msgid "Separated"
-msgstr "分开的"
-
-#: main.cpp:45
-msgid "An advanced download manager for TDE"
-msgstr "TDE 的高级下载管理器"
-
-#: main.cpp:51
-msgid "Start KGet with drop target"
-msgstr "KGet 启动为拖放目标"
-
-#: main.cpp:52
-msgid "URL(s) to download"
-msgstr "要下载的 URL"
-
-#: kget_plug_in/kget_linkview.cpp:43 main.cpp:200
-msgid "KGet"
-msgstr "KGet"
-
-#. i18n: file dlgadvancedbase.ui line 27
-#: rc.cpp:3
-#, no-c-format
-msgid "Advanced Options"
-msgstr "高级选项"
-
-#. i18n: file dlgadvancedbase.ui line 38
-#: rc.cpp:6
-#, no-c-format
-msgid "Add new transfers as:"
-msgstr "新传输添加为："
-
-#. i18n: file dlgadvancedbase.ui line 63
-#: rc.cpp:9
-#, no-c-format
-msgid "Iconified"
-msgstr "图标化"
-
-#. i18n: file dlgadvancedbase.ui line 71
-#: rc.cpp:12
-#, no-c-format
-msgid "Advanced individual windows"
-msgstr "高级的单独窗口"
-
-#. i18n: file dlgadvancedbase.ui line 79
-#: rc.cpp:15
-#, no-c-format
-msgid "Mark partial downloads"
-msgstr "标记部分下载"
-
-#. i18n: file dlgadvancedbase.ui line 87
-#: rc.cpp:18
-#, no-c-format
-msgid "Remove files from a list after success"
-msgstr "下载成功后将文件从列表中删除"
-
-#. i18n: file dlgadvancedbase.ui line 95
-#: rc.cpp:21
-#, no-c-format
-msgid "Get file sizes"
-msgstr "获取文件大小"
-
-#. i18n: file dlgadvancedbase.ui line 103
-#: rc.cpp:24
-#, no-c-format
-msgid "Expert mode (do not prompt for Cancel or Delete)"
-msgstr "专家模式(取消或删除皆不再询问)"
-
-#. i18n: file dlgadvancedbase.ui line 111
-#: rc.cpp:27
-#, no-c-format
-msgid "Use KGet as Download Manager for Konqueror"
-msgstr "将 KGet 用作 Konqueror 的下载管理器"
-
-#. i18n: file dlgadvancedbase.ui line 119
-#: rc.cpp:30
-#, no-c-format
-msgid "Show main window at startup"
-msgstr "启动时显示主窗口"
-
-#. i18n: file dlgadvancedbase.ui line 127
-#: rc.cpp:33
-#, no-c-format
-msgid "Show individual windows"
-msgstr "显示单独的窗口"
-
-#. i18n: file dlgadvancedbase.ui line 158
-#: rc.cpp:36
-#, no-c-format
-msgid "Queued"
-msgstr "已排队"
-
-#. i18n: file dlgadvancedbase.ui line 166
-#: rc.cpp:39
-#, no-c-format
-msgid "Delayed"
-msgstr "已推迟"
-
-#. i18n: file dlgautomationbase.ui line 27
-#: rc.cpp:42
-#, no-c-format
-msgid "Automation Options"
-msgstr "自动选项"
-
-#. i18n: file dlgautomationbase.ui line 38
-#: rc.cpp:45 rc.cpp:78 rc.cpp:93 rc.cpp:99
-#, no-c-format
-msgid " min"
-msgstr " 分钟"
-
-#. i18n: file dlgautomationbase.ui line 52
-#: rc.cpp:48
-#, no-c-format
-msgid "Auto disconnect after completing downloads"
-msgstr "完成下载后自动断开连接"
-
-#. i18n: file dlgautomationbase.ui line 60
-#: rc.cpp:51
-#, no-c-format
-msgid "Autosave file list every:"
-msgstr "自动保存文件列表间隔："
-
-#. i18n: file dlgautomationbase.ui line 68
-#: rc.cpp:54
-#, no-c-format
-msgid "Timed disconnect"
-msgstr "定时断开连接"
-
-#. i18n: file dlgautomationbase.ui line 76
-#: rc.cpp:57
-#, no-c-format
-msgid "Disconnect command:"
-msgstr "断开连接命令："
-
-#. i18n: file dlgautomationbase.ui line 94
-#: rc.cpp:60
-#, no-c-format
-msgid "Auto paste from clipboard"
-msgstr "自动从剪贴板中粘贴"
-
-#. i18n: file dlgautomationbase.ui line 102
-#: rc.cpp:63
-#, no-c-format
-msgid "Auto shutdown after completing downloads"
-msgstr "完成下载后自动关机"
-
-#. i18n: file dlgconnectionbase.ui line 27
-#: rc.cpp:66
-#, no-c-format
-msgid "Reconnect Options"
-msgstr "重新连接选项"
-
-#. i18n: file dlgconnectionbase.ui line 38
-#: rc.cpp:69
-#, no-c-format
-msgid "On login or timeout error"
-msgstr "发生登录或超时错误时重连"
-
-#. i18n: file dlgconnectionbase.ui line 46
-#: rc.cpp:72
-#, no-c-format
-msgid "Reconnect after:"
-msgstr "重新连接延时："
-
-#. i18n: file dlgconnectionbase.ui line 54
-#: rc.cpp:75
-#, no-c-format
-msgid "Number of retries:"
-msgstr "重试次数："
-
-#. i18n: file dlgconnectionbase.ui line 84
-#: rc.cpp:81
-#, no-c-format
-msgid "On broken connection"
-msgstr "连接中断时重连"
-
-#. i18n: file dlgconnectionbase.ui line 128
-#: rc.cpp:84
-#, no-c-format
-msgid "Timeout Options"
-msgstr "超时选项"
-
-#. i18n: file dlgconnectionbase.ui line 156
-#: rc.cpp:87
-#, no-c-format
-msgid "If no data arrives in:"
-msgstr "如果没有数据到达，等待："
-
-#. i18n: file dlgconnectionbase.ui line 164
-#: rc.cpp:90
-#, no-c-format
-msgid "If server cannot resume:"
-msgstr "如果服务器无法续传："
-
-#. i18n: file dlgconnectionbase.ui line 203
-#: rc.cpp:96
-#, no-c-format
-msgid "or"
-msgstr "或"
-
-#. i18n: file dlgconnectionbase.ui line 227
-#: rc.cpp:102
-#, no-c-format
-msgid "Connection Type"
-msgstr "连接类型"
-
-#. i18n: file dlgconnectionbase.ui line 236
-#: rc.cpp:105
-#, no-c-format
-msgid "Permanent"
-msgstr "永久"
-
-#. i18n: file dlgconnectionbase.ui line 241
-#: rc.cpp:108
-#, no-c-format
-msgid "Ethernet"
-msgstr "以太网"
-
-#. i18n: file dlgconnectionbase.ui line 246
-#: rc.cpp:111
-#, no-c-format
-msgid "PLIP"
-msgstr "PLIP"
-
-#. i18n: file dlgconnectionbase.ui line 251
-#: rc.cpp:114
-#, no-c-format
-msgid "SLIP"
-msgstr "SLIP"
-
-#. i18n: file dlgconnectionbase.ui line 256
-#: rc.cpp:117
-#, no-c-format
-msgid "PPP"
-msgstr "PPP"
-
-#. i18n: file dlgconnectionbase.ui line 261
-#: rc.cpp:120
-#, no-c-format
-msgid "ISDN"
-msgstr "ISDN"
-
-#. i18n: file dlgconnectionbase.ui line 273
-#: rc.cpp:123
-#, no-c-format
-msgid "Offline mode"
-msgstr "离线模式"
-
-#. i18n: file dlgconnectionbase.ui line 298
-#: rc.cpp:126
-#, no-c-format
-msgid "Link number:"
-msgstr "连接号："
-
-#. i18n: file dlgdirectoriesbase.ui line 78
-#: rc.cpp:129
-#, no-c-format
-msgid "Extension"
-msgstr "扩展名"
-
-#. i18n: file dlgdirectoriesbase.ui line 89
-#: rc.cpp:132
-#, no-c-format
-msgid "Default Folder"
-msgstr "默认文件夹"
-
-#. i18n: file dlgdirectoriesbase.ui line 186
-#: rc.cpp:144
-#, no-c-format
-msgid "Extension (* for all files):"
-msgstr "扩展名(* 代表全部文件)："
-
-#. i18n: file dlgdirectoriesbase.ui line 199
-#: rc.cpp:147
-#, no-c-format
-msgid "Default folder:"
-msgstr "默认文件夹："
-
-#. i18n: file dlglimitsbase.ui line 27
-#: rc.cpp:150
-#, no-c-format
-msgid "Limits Options"
-msgstr "限制选项"
-
-#. i18n: file dlglimitsbase.ui line 38
-#: rc.cpp:153
-#, no-c-format
-msgid "Maximum open connections:"
-msgstr "打开连接的最大数目："
-
-#. i18n: file dlglimitsbase.ui line 46
-#: rc.cpp:156
-#, no-c-format
-msgid "Minimum network bandwidth:"
-msgstr "最小网络带宽："
-
-#. i18n: file dlglimitsbase.ui line 54
-#: rc.cpp:159
-#, no-c-format
-msgid "Maximum network bandwidth:"
-msgstr "最大网络带宽："
-
-#. i18n: file dlglimitsbase.ui line 70
-#: rc.cpp:162 rc.cpp:165
-#, no-c-format
-msgid " bytes/sec"
-msgstr " 字节/秒"
-
-#. i18n: file dlgsystembase.ui line 27
-#: rc.cpp:168
-#, no-c-format
-msgid "Use animation"
-msgstr "使用动画"
-
-#. i18n: file dlgsystembase.ui line 38
-#: rc.cpp:171
-#, no-c-format
-msgid "Window style:"
-msgstr "窗口风格："
-
-#. i18n: file dlgsystembase.ui line 46
-#: rc.cpp:174
-#, no-c-format
-msgid "Font:"
-msgstr "字体："
-
-#. i18n: file dlgsystembase.ui line 79
-#: rc.cpp:177
-#, no-c-format
-msgid "Normal"
-msgstr "正常"
-
-#. i18n: file dlgsystembase.ui line 87
-#: rc.cpp:180
-#, no-c-format
-msgid "Docked"
-msgstr "停靠"
-
-#. i18n: file dlgsystembase.ui line 95
-#: rc.cpp:183
-#, no-c-format
-msgid "Drop target"
-msgstr "拖放目标"
-
-#. i18n: file kgetui.rc line 14
-#: rc.cpp:189
-#, no-c-format
-msgid "&Transfer"
-msgstr "传输(&T)"
-
-#: safedelete.cpp:18
-msgid ""
-"Not deleting\n"
-"%1\n"
-"as it is a directory."
-msgstr ""
-"未删除\n"
-"%1\n"
-"因其是一个目录。"
-
-#: safedelete.cpp:20 safedelete.cpp:32
-msgid "Not Deleted"
-msgstr "未删除"
-
-#: safedelete.cpp:30
-msgid ""
-"Not deleting\n"
-"%1\n"
-"as it is not a local file."
-msgstr ""
-"未删除\n"
-"%1\n"
-"因其不是本地文件。"
-
-#: settings.cpp:131
-msgid ""
-"This is the first time that you have run KGet.\n"
-"Do you want to use KGet as Download Manager for Konqueror?"
-msgstr ""
-"这是您第一次运行 KGet。\n"
-"您是否想要将 KGet 用作 Konqueror 的下载管理器？"
-
-#: settings.cpp:131
-msgid "Konqueror Integration"
-msgstr "Konqueror 集成"
-
-#: settings.cpp:131
-msgid "Enable"
-msgstr "启用"
-
-#: settings.cpp:131
-msgid "Do Not Enable"
-msgstr "不启用"
-
-#: transfer.cpp:275
+#: transfer.cpp:278
 #, c-format
 msgid "Copy file from: %1"
 msgstr "从 %1 复制文件"
 
-#: transfer.cpp:276
+#: transfer.cpp:279
 #, c-format
 msgid "To: %1"
 msgstr "收件人：%1"
 
-#: transfer.cpp:298
+#: transfer.cpp:300
 msgid "unknown"
 msgstr "未知"
 
-#: transfer.cpp:389
+#: transfer.cpp:391
 #, c-format
 msgid "Attempt number %1"
 msgstr "第 %1 次重试"
 
-#: transfer.cpp:402
+#: transfer.cpp:405
 msgid "Stopping"
 msgstr "正停止"
 
-#: transfer.cpp:424
+#: transfer.cpp:428
 msgid "Pausing"
 msgstr "正暂停"
 
-#: transfer.cpp:493
+#: transfer.cpp:502
 msgid "Queueing"
 msgstr "正排队"
 
-#: transfer.cpp:508
+#: transfer.cpp:517
 msgid "Scheduling"
 msgstr "正调度"
 
-#: transfer.cpp:532
+#: transfer.cpp:542
 msgid "Delaying"
 msgstr "正延迟"
 
-#: transfer.cpp:562
+#: transfer.cpp:573
 msgid "Download finished"
 msgstr "下载完毕"
 
-#: transfer.cpp:605 transfer.cpp:606 transfer.cpp:608
+#: transfer.cpp:616 transfer.cpp:617 transfer.cpp:619
 msgid "Stalled"
 msgstr "暂停"
 
-#: transfer.cpp:611 transfer.cpp:704
+#: transfer.cpp:622 transfer.cpp:715
 msgid ""
 "_: OK as in 'finished'\n"
 "OK"
 msgstr "完毕"
 
-#: transfer.cpp:612 transfer.cpp:613 transfer.cpp:615
+#: transfer.cpp:623 transfer.cpp:624 transfer.cpp:626
 msgid "Finished"
 msgstr "完成"
 
-#: transfer.cpp:620 transfer.cpp:621 transfer.cpp:623
+#: transfer.cpp:631 transfer.cpp:632 transfer.cpp:634
 msgid "Stopped"
 msgstr "已停止"
 
-#: transfer.cpp:626
+#: transfer.cpp:637
 msgid "%1/s"
 msgstr "%1/秒"
 
-#: transfer.cpp:647
+#: transfer.cpp:658
 msgid "Total size is %1 bytes"
 msgstr "总计大小是 %1 字节"
 
-#: transfer.cpp:663
+#: transfer.cpp:674
 msgid "The file size does not match."
 msgstr "文件大小不相同。"
 
-#: transfer.cpp:665
+#: transfer.cpp:676
 msgid "File Size checked"
 msgstr "文件大小已检查"
 
-#: transfer.cpp:785
+#: transfer.cpp:796
 msgid ""
 "Malformed URL:\n"
 msgstr ""
 "不正确的 URL：\n"
 
-#: transfer.cpp:924
+#: transfer.cpp:936
 msgid "Download resumed"
 msgstr "下载已续传"
 
-#: transfer.cpp:1017
+#: transfer.cpp:1030
 msgid "checking if file is in cache...no"
 msgstr "正在检查文件是否已缓存...否"
 
diff --git a/tde-i18n-zh_CN/messages/tdenetwork/kinetd.po b/tde-i18n-zh_CN/messages/tdenetwork/kinetd.po
index 9f0b52dc584..99ed2752f19 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/kinetd.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/kinetd.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kinetd\n"
-"POT-Creation-Date: 2006-07-28 03:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2002-10-29 13:17+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdenetwork/knewsticker.po b/tde-i18n-zh_CN/messages/tdenetwork/knewsticker.po
index 79ce3ba608b..7bda1a3ac9c 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/knewsticker.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/knewsticker.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: knewsticker\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2005-10-07 00:55+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -109,7 +110,7 @@ msgstr "新闻查询间隔："
 msgid "All News Sources"
 msgstr "全部新闻源"
 
-#: common/newsengine.cpp:88 common/newsengine.h:71 knewstickerconfig.cpp:242
+#: common/newsengine.cpp:88 common/newsengine.h:72 knewstickerconfig.cpp:242
 #: knewstickerstub/knewstickerstub.cpp:59 newsscroller.cpp:192
 msgid "Unknown"
 msgstr "未知"
@@ -542,7 +543,7 @@ msgid "Hide"
 msgstr "隐藏"
 
 #. i18n: file knewstickerconfigwidget.ui line 546
-#: common/configaccess.cpp:394 common/configaccess.cpp:616 rc.cpp:165
+#: common/configaccess.cpp:277 common/configaccess.cpp:499 rc.cpp:165
 #: rc.cpp:689
 #, no-c-format
 msgid "Show"
@@ -569,7 +570,7 @@ msgid "articles from"
 msgstr "文章来自"
 
 #. i18n: file knewstickerconfigwidget.ui line 587
-#: common/configaccess.cpp:376 common/configaccess.cpp:617 rc.cpp:177
+#: common/configaccess.cpp:259 common/configaccess.cpp:500 rc.cpp:177
 #: rc.cpp:701
 #, no-c-format
 msgid "all news sources"
@@ -611,8 +612,8 @@ msgid ""
 "<ul>\n"
 "<li><b>contain</b>, <b>does not contain</b> - you should probably enter a "
 "keyword here, like \"TDE\", \"Baseball\" or \"Business\". The keyword is not "
-"case-sensitive so it does not matter whether you type \"kde\", \"TDE\" or "
-"\"kDe\".</li>\n"
+"case-sensitive so it does not matter whether you type \"tde\", \"TDE\" or "
+"\"tDe\".</li>\n"
 "<li><b>equals</b>, <b>does not equal</b> - enter a phrase or expression here to "
 "have the filter match only those articles whose headlines match <b>exactly</b> "
 "the text you typed. The phrase you type will be considered to be "
@@ -630,26 +631,26 @@ msgid "headlines"
 msgstr "头条"
 
 #. i18n: file knewstickerconfigwidget.ui line 650
-#: common/configaccess.cpp:381 common/configaccess.cpp:618 rc.cpp:201
+#: common/configaccess.cpp:264 common/configaccess.cpp:501 rc.cpp:201
 #: rc.cpp:725
 #, no-c-format
 msgid "contain"
 msgstr "包含"
 
 #. i18n: file knewstickerconfigwidget.ui line 655
-#: common/configaccess.cpp:383 rc.cpp:204 rc.cpp:728
+#: common/configaccess.cpp:266 rc.cpp:204 rc.cpp:728
 #, no-c-format
 msgid "do not contain"
 msgstr "不包含"
 
 #. i18n: file knewstickerconfigwidget.ui line 660
-#: common/configaccess.cpp:385 rc.cpp:207 rc.cpp:731
+#: common/configaccess.cpp:268 rc.cpp:207 rc.cpp:731
 #, no-c-format
 msgid "equal"
 msgstr "相等"
 
 #. i18n: file knewstickerconfigwidget.ui line 665
-#: common/configaccess.cpp:387 rc.cpp:210 rc.cpp:734
+#: common/configaccess.cpp:270 rc.cpp:210 rc.cpp:734
 #, no-c-format
 msgid "do not equal"
 msgstr "不相等"
diff --git a/tde-i18n-zh_CN/messages/tdenetwork/kopete.po b/tde-i18n-zh_CN/messages/tdenetwork/kopete.po
index 5ca10381486..dfc5a2d7f07 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/kopete.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/kopete.po
@@ -5,210 +5,412 @@
 # Sarah Smith <sarahs@redhat.com>, 2002.
 # Xiong Jiang <jxiong@offtopic.org>, 2002,2003
 # Funda Wang <fundawang@linux.net.cn>, 2003,2004,2007
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2008-01-29 17:02+0000\n"
 "Last-Translator: Lie_Ex <lilith.ex@gmail.com>\n"
 "Language-Team: zh_CN <kde-china@kde.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Vim (7.0)\n"
 
-#. i18n: file ./libkopete/ui/fileconfirmbase.ui line 16
-#: libkopete/ui/kopetefileconfirmdialog.cpp:35 rc.cpp:24
-#, no-c-format
-msgid "A User Would Like to Send You a File"
-msgstr "有用户想给您发送文件"
+#: _translatorinfo.cpp:1 kopete/main.cpp:96
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "TDE 简体中文翻译组,,Launchpad Contributions:,Funda Wang,Lie_Ex,Tao Wei"
 
-#: libkopete/ui/kopetefileconfirmdialog.cpp:36
-msgid "&Refuse"
-msgstr "拒绝(&R)"
+#: _translatorinfo.cpp:3 kopete/main.cpp:97
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+"i18n-translation@lists.linux.net.cn,,,,lilith.ex@gmail.com,weitao1979@gmail.com"
 
-#: libkopete/ui/kopetefileconfirmdialog.cpp:36
-msgid "&Accept"
-msgstr "接受(&A)"
+#: plugins/translator/translatorguiclient.cpp:44
+msgid "Translate"
+msgstr "翻译"
 
-#: libkopete/ui/kopetefileconfirmdialog.cpp:64
-msgid "File Transfer"
-msgstr "文件传送"
+#: plugins/translator/translatordialog.cpp:24
+msgid "Translator Plugin"
+msgstr "翻译者插件"
 
-#: libkopete/ui/kopetefileconfirmdialog.cpp:86
-msgid ""
-"The file '%1' already exists.\n"
-"Do you want to overwrite it ?"
-msgstr ""
-"已经存在文件“%1”。\n"
-"您想要覆盖吗？"
+#: libkopete/kopeteonlinestatus.cpp:126 plugins/cryptography/kgpgselkey.cpp:89
+#: plugins/translator/translatorlanguages.cpp:35
+#: protocols/groupwise/gwprotocol.cpp:62 protocols/irc/ircaccount.cpp:270
+#: protocols/oscar/icq/icqpresence.cpp:131
+msgid "Unknown"
+msgstr "未知"
 
-#: libkopete/ui/kopetefileconfirmdialog.cpp:87
-msgid "Overwrite File"
-msgstr "覆盖文件"
+#: plugins/translator/translatorlanguages.cpp:36
+msgid "English"
+msgstr "英语"
 
-#: libkopete/ui/kopetefileconfirmdialog.cpp:96
-msgid "You must provide a valid local filename"
-msgstr "您必须提供有效的本地文件名"
+#: plugins/translator/translatorlanguages.cpp:37
+msgid "Chinese"
+msgstr "汉语"
 
-#: libkopete/ui/contactaddednotifydialog.cpp:62
-msgid "Someone Has Added You"
-msgstr "某些人将您添加为好友"
+#: plugins/translator/translatorlanguages.cpp:38
+msgid "French"
+msgstr "法语"
 
-#: libkopete/ui/contactaddednotifydialog.cpp:73
+#: plugins/translator/translatorlanguages.cpp:39
+msgid "German"
+msgstr "德语"
+
+#: plugins/translator/translatorlanguages.cpp:40
+msgid "Italian"
+msgstr "意大利语"
+
+#: plugins/translator/translatorlanguages.cpp:41
+msgid "Japanese"
+msgstr "日语"
+
+#: plugins/translator/translatorlanguages.cpp:42
+msgid "Korean"
+msgstr "韩语"
+
+#: plugins/translator/translatorlanguages.cpp:43
+msgid "Portuguese"
+msgstr "葡萄牙语"
+
+#: plugins/translator/translatorlanguages.cpp:44
+msgid "Russian"
+msgstr "俄语"
+
+#: plugins/translator/translatorlanguages.cpp:45
+msgid "Spanish"
+msgstr "西班牙语"
+
+#: plugins/translator/translatorplugin.cpp:48
+msgid "Translator"
+msgstr "翻译者"
+
+#: plugins/translator/translatorplugin.cpp:79
+msgid "Set &Language"
+msgstr "设置语言(&L)"
+
+#: plugins/translator/translatorplugin.cpp:367
 msgid ""
-"<qt><img src=\"kopete-account-icon:%1\" /> The contact <b>%2</b> "
-"has added you to his/her contactlist. (Account %3)</qt>"
+"%2 \n"
+"Auto Translated: \n"
+"%1"
 msgstr ""
-"<qt><img src=\"kopete-account-icon:%1\" />联系人 <b>%2</b> "
-"已将您添加到他/她的联系人列表中。(账户 %3)</qt>"
+"%2 \n"
+"自动转换： \n"
+"%1"
+
+#: plugins/cryptography/cryptographyselectuserkey.cpp:29
+msgid "Select Contact's Public Key"
+msgstr "选择联系人的公钥"
+
+#: plugins/cryptography/cryptographyselectuserkey.cpp:38
+#, c-format
+msgid "Select public key for %1"
+msgstr "选择 %1 的公开密钥"
+
+#: plugins/cryptography/cryptographyguiclient.cpp:51
+msgid "Encrypt Messages"
+msgstr "加密消息"
+
+#: plugins/cryptography/kgpgselkey.cpp:41
+msgid "Private Key List"
+msgstr "私钥列表"
+
+#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage1.ui line 72
+#: plugins/cryptography/kgpgselkey.cpp:53
+#: plugins/cryptography/popuppublic.cpp:127 rc.cpp:1816 rc.cpp:2701
+#: rc.cpp:4164 rc.cpp:4221 rc.cpp:4977
+#, no-c-format
+msgid "Name"
+msgstr "名称"
+
+#: plugins/cryptography/kgpgselkey.cpp:57
+msgid "Choose secret key:"
+msgstr "选择密钥："
+
+#: plugins/cryptography/kgpgselkey.cpp:64
+msgid "Local signature (cannot be exported)"
+msgstr "本地签名(不能被导出)"
+
+#: plugins/cryptography/kgpgselkey.cpp:84
+#: plugins/cryptography/popuppublic.cpp:401
+msgid "Unlimited"
+msgstr "无限制"
+
+#: plugins/cryptography/kgpgselkey.cpp:92
+msgid "Invalid"
+msgstr "无效"
+
+#: plugins/cryptography/kgpgselkey.cpp:95
+msgid "Disabled"
+msgstr "已禁用"
+
+#: plugins/cryptography/kgpgselkey.cpp:98
+msgid "Revoked"
+msgstr "已撤回"
+
+#: plugins/cryptography/kgpgselkey.cpp:101
+msgid "Expired"
+msgstr "已过期"
+
+#: plugins/cryptography/kgpgselkey.cpp:104
+msgid "Undefined"
+msgstr "未定义"
+
+#: plugins/cryptography/kgpgselkey.cpp:107
+msgid "None"
+msgstr "无"
+
+#: plugins/cryptography/kgpgselkey.cpp:110
+msgid "Marginal"
+msgstr "勉强"
+
+#: plugins/cryptography/kgpgselkey.cpp:113
+msgid "Full"
+msgstr "完全"
+
+#: plugins/cryptography/kgpgselkey.cpp:116
+msgid "Ultimate"
+msgstr "极端"
+
+#: plugins/cryptography/kgpgselkey.cpp:119
+msgid "?"
+msgstr "?"
+
+#: plugins/cryptography/kgpgselkey.cpp:150
+msgid "ID: %1, trust: %2, expiration: %3"
+msgstr "ID：%1，信任：%2，有效性：%3"
+
+#: plugins/cryptography/popuppublic.cpp:94
+msgid "Select Public Key"
+msgstr "选择公钥"
+
+#: plugins/cryptography/popuppublic.cpp:111
+#, c-format
+msgid "Select Public Key for %1"
+msgstr "选择 %1 的公钥"
+
+#: plugins/cryptography/popuppublic.cpp:119
+msgid "Clear Search"
+msgstr "清除搜索"
+
+#: plugins/cryptography/popuppublic.cpp:122
+msgid "Search: "
+msgstr "搜索： "
 
-#. i18n: file ./libkopete/ui/addressbookselectorwidget_base.ui line 99
+#. i18n: file ./protocols/jabber/ui/dlgbrowse.ui line 79
 #: libkopete/ui/addressbookselectorwidget.cpp:77
-#: plugins/cryptography/popuppublic.cpp:128 rc.cpp:116 rc.cpp:3556 rc.cpp:4737
+#: plugins/cryptography/popuppublic.cpp:128 rc.cpp:2680 rc.cpp:3441
+#: rc.cpp:4980
 #, no-c-format
 msgid "Email"
 msgstr "电子邮件"
 
-#: libkopete/ui/addressbookselectorwidget.cpp:147
-msgid "New Address Book Entry"
-msgstr "新建地址簿条目"
+#: plugins/cryptography/popuppublic.cpp:129
+msgid "ID"
+msgstr "ID"
 
-#: libkopete/ui/addressbookselectorwidget.cpp:147
-msgid "Name the new entry:"
-msgstr "给新条目命名："
+#: plugins/cryptography/popuppublic.cpp:147
+msgid "&Go to Default Key"
+msgstr "转到默认密钥(&G)"
 
-#: libkopete/ui/userinfodialog.cpp:62 protocols/winpopup/wpuserinfo.cpp:41
-#, c-format
-msgid "User Info for %1"
-msgstr "%1 的用户信息"
+#: plugins/cryptography/popuppublic.cpp:150
+msgid "ASCII armored encryption"
+msgstr "ASCII 代码的加密"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 435
-#: libkopete/ui/userinfodialog.cpp:209 rc.cpp:3160 rc.cpp:3214 rc.cpp:3457
-#: rc.cpp:3989
-#, no-c-format
-msgid "Name:"
-msgstr "姓名："
+#: plugins/cryptography/popuppublic.cpp:151
+msgid "Allow encryption with untrusted keys"
+msgstr "允许用不信任的密钥加密"
 
-#: libkopete/ui/userinfodialog.cpp:213
-msgid "Contact ID:"
-msgstr "联系人 ID："
+#: plugins/cryptography/popuppublic.cpp:152
+msgid "Hide user id"
+msgstr "隐藏用户 ID"
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 76
-#: libkopete/ui/userinfodialog.cpp:217 rc.cpp:5213
-#, no-c-format
-msgid "Status:"
-msgstr "状态："
+#: plugins/cryptography/popuppublic.cpp:155
+msgid ""
+"<b>Public keys list</b>: select the key that will be used for encryption."
+msgstr "<b>公钥列表</b>：选择要用来加密的密钥。"
 
-#. i18n: file ./protocols/oscar/aim/ui/aiminfobase.ui line 106
-#: libkopete/ui/userinfodialog.cpp:221 rc.cpp:3310
-#, no-c-format
-msgid "Warning level:"
-msgstr "警告级别："
+#: plugins/cryptography/popuppublic.cpp:157
+msgid ""
+"<b>ASCII encryption</b>: makes it possible to open the encrypted file/message "
+"in a text editor"
+msgstr "<b>输出为 ASCII 代码的加密</b>使用输出为 ASCII 代码的加密，加密后的文件/信件能用文本编辑器打开。"
 
-#. i18n: file ./protocols/oscar/aim/ui/aiminfobase.ui line 148
-#: libkopete/ui/userinfodialog.cpp:225 rc.cpp:3316
-#, no-c-format
-msgid "Online since:"
-msgstr "上线时间："
+#: plugins/cryptography/popuppublic.cpp:159
+msgid ""
+"<b>Hide user ID</b>: Do not put the keyid into encrypted packets. This option "
+"hides the receiver of the message and is a countermeasure against traffic "
+"analysis. It may slow down the decryption process because all available secret "
+"keys are tried."
+msgstr ""
+"<b>隐藏用户 ID</b>：不把 keyid "
+"放入加密的报文中。此选项将会隐藏信息的接收者，并且会增加流量分析的难度。这一操作还会减慢解密过程，因为必须逐一尝试可用的全部密钥。"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqworkinfowidget.ui line 128
-#: libkopete/ui/userinfodialog.cpp:229 rc.cpp:3463 rc.cpp:3998
-#, no-c-format
-msgid "Address:"
-msgstr "地址："
+#: plugins/cryptography/popuppublic.cpp:163
+msgid ""
+"<b>Allow encryption with untrusted keys</b>: when you import a public key, it "
+"is usually marked as untrusted and you cannot use it unless you sign it in "
+"order to make it 'trusted'. Checking this box enables you to use any key, even "
+"if it has not be signed."
+msgstr ""
+"<b>允许用不受信任的密钥加密</b>：当您导入一个公钥时，它通常被标记为不受信任的，除非您对它签名使它成为“受信任的”，不然您还不能使用它。选中此项能让您使用"
+"一个即使还没签名的公开密钥。"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqworkinfowidget.ui line 35
-#: libkopete/ui/userinfodialog.cpp:233 rc.cpp:3442 rc.cpp:3983
-#, no-c-format
-msgid "Phone:"
-msgstr "电话："
+#: plugins/cryptography/popuppublic.cpp:172
+msgid "Shred source file"
+msgstr "粉碎源文件"
 
-#. i18n: file ./protocols/oscar/aim/ui/aiminfobase.ui line 174
-#: libkopete/ui/userinfodialog.cpp:238 rc.cpp:3319
-#, no-c-format
-msgid "Away message:"
-msgstr "离开消息："
+#: plugins/cryptography/popuppublic.cpp:174
+msgid ""
+"<b>Shred source file</b>: permanently remove source file. No recovery will be "
+"possible"
+msgstr "<b>粉碎源文件</b>：永久性删除源文件，不再可能被恢复。"
 
-#: libkopete/ui/userinfodialog.cpp:246
-msgid "User info:"
-msgstr "用户信息："
+#: plugins/cryptography/popuppublic.cpp:176
+msgid ""
+"<qt><b>Shred source file:</b><br />"
+"<p>Checking this option will shred (overwrite several times before erasing) the "
+"files you have encrypted. This way, it is almost impossible that the source "
+"file is recovered.</p>"
+"<p><b>But you must be aware that this is not secure</b> "
+"on all file systems, and that parts of the file may have been saved in a "
+"temporary file or in the spooler of your printer if you previously opened it in "
+"an editor or tried to print it. Only works on files (not on folders).</p></qt>"
+msgstr ""
+"<qt><b>粉碎源文件：</b><br />"
+"<p>选中此选项将会粉碎(删除前覆盖多次)您加密的文件。这样，几乎不可能恢复源文件。</p>"
+"<p><b>但是您必须知道，</b>在所有的文件系统中安全都不是绝对的。如果您先前在编辑器中打开了该文件，文件的某一部分可能保存在临时文件中；如果您先前打印了该"
+"文件，那么打印机的打印池中也可能存有该文件的副本。此功能只适用于文件(而不是文件夹)。</p></qt>"
 
-#: libkopete/ui/kopetestdaction.cpp:43
-msgid "&Configure Kopete..."
-msgstr "配置 Kopete(&C)..."
+#: plugins/cryptography/popuppublic.cpp:177
+msgid "<a href=\"whatsthis:%1\">Read this before using shredding</a>"
+msgstr "<a href=\"whatsthis:%1\">使用粉碎前请仔细阅读</a>"
 
-#: libkopete/ui/kopetestdaction.cpp:73
-msgid "Start &Chat..."
-msgstr "开始聊天(&C)..."
+#: plugins/cryptography/popuppublic.cpp:182
+msgid "Symmetrical encryption"
+msgstr "对称加密"
 
-#: libkopete/ui/kopetestdaction.cpp:78
-msgid "&Send Single Message..."
-msgstr "发送单条消息(&S)..."
+#: plugins/cryptography/popuppublic.cpp:184
+msgid ""
+"<b>Symmetrical encryption</b>: encryption does not use keys. You just need to "
+"give a password to encrypt/decrypt the file"
+msgstr "<b>对称加密</b>：这种加密不使用密钥对。您只需要给出口令就能加密/解密文件"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 515
-#: libkopete/ui/kopetestdaction.cpp:83 rc.cpp:2447
-#, no-c-format
-msgid "User &Info"
-msgstr "用户信息(&I)"
+#: plugins/cryptography/cryptographyplugin.cpp:51
+msgid "Cryptography"
+msgstr "加密算法"
 
-#: libkopete/ui/kopetestdaction.cpp:88
-msgid "Send &File..."
-msgstr "发送文件(&F)..."
+#: plugins/cryptography/cryptographyplugin.cpp:71
+msgid "&Select Cryptography Public Key..."
+msgstr "选择加密公密(&S).."
 
-#: libkopete/ui/kopetestdaction.cpp:93
-msgid "View &History..."
-msgstr "查看历史(&H)..."
+#: plugins/cryptography/cryptographyplugin.cpp:188
+msgid "Outgoing Encrypted Message: "
+msgstr "送出的加密消息： "
 
-#: libkopete/ui/kopetestdaction.cpp:98
-msgid "&Create Group..."
-msgstr "创建组(&C)..."
+#: plugins/cryptography/cryptographyplugin.cpp:219
+msgid "Incoming Encrypted Message: "
+msgstr "进来的加密消息： "
 
-#: libkopete/ui/kopetestdaction.cpp:103
-msgid "Cha&nge Meta Contact..."
-msgstr "更改超级联系人(&N)..."
+#: plugins/cryptography/kgpginterface.cpp:99
+msgid "Enter passphrase for <b>%1</b>:"
+msgstr "请输入 <b>%1<b> 的密码句："
 
-#: libkopete/ui/kopetestdaction.cpp:108
-msgid "&Delete Contact"
-msgstr "删除联系人(&D)"
+#: plugins/cryptography/kgpginterface.cpp:101
+msgid "<b>Bad passphrase</b><br> You have %1 tries left.<br>"
+msgstr "<b>无效的密码句</b><br>您还剩下 %1 次重试机会。<br>"
 
-#: libkopete/ui/kopetestdaction.cpp:113
-msgid "Change A&lias..."
-msgstr "更改别名(&L)..."
+#: plugins/smpppdcs/smpppdcsprefsimpl.cpp:97
+#: protocols/groupwise/ui/gwsearch.cpp:135
+msgid "Searching"
+msgstr "搜索"
 
-#: libkopete/ui/kopetestdaction.cpp:118
-msgid "&Block Contact"
-msgstr "屏蔽联系人(&B)"
+#: plugins/smpppdcs/smpppdcsprefsimpl.cpp:97
+msgid "Searching for a SMPPPD on the local network..."
+msgstr "正在搜索局域网中的 SMPPPD..."
 
-#: libkopete/ui/kopetestdaction.cpp:123
-msgid "Un&block Contact"
-msgstr "取消联系人屏蔽(&B)"
+#: plugins/smpppdcs/unittest/main.cpp:26 plugins/smpppdcs/unittest/main.cpp:31
+msgid "SMPPPDClientTests"
+msgstr "SMPPPDClientTests"
 
-#: libkopete/ui/addressbooklinkwidget.cpp:77
-msgid "Choose the corresponding entry for '%1'"
-msgstr "选择“%1”的相应条目"
+#: plugins/smpppdcs/smpppdcspreferences.cpp:57
+msgid "connection status is managed by Kopete"
+msgstr "连接状态由 Kopete 管理"
 
-#: libkopete/ui/addressbooklinkwidget.cpp:79
-msgid "Choose the corresponding entry in the address book"
-msgstr "在地址簿中选择相应条目"
+#: plugins/statistics/statisticsdialog.cpp:45
+#, c-format
+msgid "Statistics for %1"
+msgstr "%1 的历史"
 
-#: kopete/config/identity/kopeteidentityconfig.cpp:506
-#: libkopete/ui/addressbooklinkwidget.cpp:81
-msgid "Addressbook Association"
-msgstr "地址簿关联"
+#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 33
+#: plugins/statistics/statisticsdialog.cpp:62 rc.cpp:1148 rc.cpp:1194
+#, no-c-format
+msgid "General"
+msgstr "常规"
 
-#: libkopete/knotification.cpp:121 libkopete/knotification.cpp:142
-#: protocols/jabber/jabberaccount.cpp:1125
-#: protocols/jabber/jabbercontact.cpp:920
-msgid "Notification"
-msgstr "通知"
+#: plugins/statistics/statisticsdialog.cpp:193
+msgid "<h1>Statistics for %1</h1>"
+msgstr "<h1>%1 的统计</h1>"
 
-#: libkopete/knotification.cpp:130 libkopete/knotification.cpp:151
-msgid "Fatal"
-msgstr "严重"
+#: plugins/statistics/statisticsdialog.cpp:196
+msgid ""
+"<div class=\"statgroup\"><b><a href=\"main:generalinfo\" title=\"General "
+"summary view\">General</a></b>"
+"<br><span title=\"Select the a day or a month to view the stat for\"><b>"
+"Days: </b><a href=\"dayofweek:1\">Monday</a>&nbsp;<a href=\"dayofweek:2\">"
+"Tuesday</a>&nbsp;<a href=\"dayofweek:3\">Wednesday</a>"
+"&nbsp;<a href=\"dayofweek:4\">Thursday</a>&nbsp;<a href=\"dayofweek:5\">"
+"Friday</a>&nbsp;<a href=\"dayofweek:6\">Saturday</a>"
+"&nbsp;<a href=\"dayofweek:7\">Sunday</a>"
+"<br><b>Months: </b><a href=\"monthofyear:1\">January</a>"
+"&nbsp;<a href=\"monthofyear:2\">February</a>&nbsp;<a href=\"monthofyear:3\">"
+"March</a>&nbsp;<a href=\"monthofyear:4\">April</a>&nbsp;<a "
+"href=\"monthofyear:5\">May</a>&nbsp;<a href=\"monthofyear:6\">June</a>"
+"&nbsp;<a href=\"monthofyear:7\">July</a>&nbsp;<a href=\"monthofyear:8\">"
+"August</a>&nbsp;<a href=\"monthofyear:9\">September</a>"
+"&nbsp;<a href=\"monthofyear:10\">October</a>&nbsp;<a href=\"monthofyear:11\">"
+"November</a>&nbsp;<a href=\"monthofyear:12\">December</a>&nbsp;</span></div>"
+"<br>"
+msgstr ""
+"<div class=\"statgroup\"><b><a href=\"main:generalinfo\" title=\"常规概览视图\">常规</a>"
+"</b>"
+"<br><span title=\"选择日或月以便查看统计\"><b>日：</b><a href=\"dayofweek:1\">周一</a>"
+"&nbsp;<a href=\"dayofweek:2\">周二</a>&nbsp;<a href=\"dayofweek:3\">周三</a>"
+"&nbsp;<a href=\"dayofweek:4\">周四</a>&nbsp;<a href=\"dayofweek:5\">周五</a>"
+"&nbsp;<a href=\"dayofweek:6\">周六</a>&nbsp;<a href=\"dayofweek:7\">周日</a>"
+"<br><b>月：</b><a href=\"monthofyear:1\">一月</a>&nbsp;<a href=\"monthofyear:2\">"
+"二月</a>&nbsp;<a href=\"monthofyear:3\">三月</a>&nbsp;<a href=\"monthofyear:4\">"
+"四月</a>&nbsp;<a href=\"monthofyear:5\">五月</a>&nbsp;<a href=\"monthofyear:6\">"
+"六月</a>&nbsp;<a href=\"monthofyear:7\">七月</a>&nbsp;<a href=\"monthofyear:8\">"
+"八月</a>&nbsp;<a href=\"monthofyear:9\">九月</a>&nbsp;<a href=\"monthofyear:10\">"
+"十月</a>&nbsp;<a href=\"monthofyear:11\">十一月</a>&nbsp;<a href=\"monthofyear:12\">"
+"十二月</a>&nbsp;</span></div>"
+"<br>"
+
+#: plugins/statistics/statisticsdialog.cpp:227
+msgid ""
+"<div class=\"statgroup\" title=\"Contact status history for today\">"
+"<h2>Today</h2><table width=\"100%\">"
+"<tr>"
+"<td>Status</td>"
+"<td>From</td>"
+"<td>To</td></tr>"
+msgstr ""
+"<div class=\"statgroup\" title=\"今天的联系人状态历史\">"
+"<h2>今天</h2><table width=\"100%\">"
+"<tr>"
+"<td>状态</td>"
+"<td>自</td>"
+"<td>至</td></tr>"
 
 #: libkopete/kopetemetacontact.cpp:503 libkopete/kopeteonlinestatus.cpp:110
 #: plugins/statistics/statisticscontact.cpp:362
@@ -219,7 +421,7 @@ msgstr "严重"
 #: protocols/jabber/jabbercontact.cpp:156
 #: protocols/jabber/jabberprotocol.cpp:75
 #: protocols/meanwhile/meanwhileprotocol.cpp:42
-#: protocols/msn/msnprotocol.cpp:52 protocols/oscar/aim/aimaccount.cpp:311
+#: protocols/oscar/aim/aimaccount.cpp:311
 #: protocols/oscar/aim/aimprotocol.cpp:232
 #: protocols/oscar/icq/icqpresence.cpp:77 protocols/sms/smsprotocol.cpp:37
 #: protocols/winpopup/wpprotocol.cpp:53 protocols/yahoo/yahooprotocol.cpp:43
@@ -240,20 +442,6 @@ msgstr "在线"
 msgid "Away"
 msgstr "离开"
 
-#: libkopete/kopeteonlinestatus.cpp:116 protocols/gadu/gaduprotocol.cpp:75
-#: protocols/groupwise/gwprotocol.cpp:66 protocols/irc/ircprotocol.cpp:145
-#: protocols/jabber/jabberprotocol.cpp:81 protocols/msn/msnprotocol.cpp:62
-#: protocols/sms/smsprotocol.cpp:38 protocols/yahoo/yahooprotocol.cpp:56
-msgid "Connecting"
-msgstr "正在连接"
-
-#: libkopete/kopeteonlinestatus.cpp:119 protocols/gadu/gaduprotocol.cpp:67
-#: protocols/gadu/gaduprotocol.cpp:69 protocols/jabber/jabbercontact.cpp:166
-#: protocols/jabber/jabberprotocol.cpp:80 protocols/msn/msnprotocol.cpp:59
-#: protocols/yahoo/yahooprotocol.cpp:53
-msgid "Invisible"
-msgstr "隐身"
-
 #: libkopete/kopetemetacontact.cpp:507 libkopete/kopeteonlinestatus.cpp:122
 #: plugins/statistics/statisticscontact.cpp:364
 #: plugins/statistics/statisticsdialog.cpp:350
@@ -262,710 +450,1067 @@ msgstr "隐身"
 #: protocols/irc/ircprotocol.cpp:118 protocols/irc/ircprotocol.cpp:147
 #: protocols/jabber/jabberprotocol.cpp:79
 #: protocols/meanwhile/meanwhileprotocol.cpp:37
-#: protocols/msn/msnprotocol.cpp:58 protocols/oscar/aim/aimaccount.cpp:319
+#: protocols/oscar/aim/aimaccount.cpp:319
 #: protocols/oscar/aim/aimprotocol.cpp:233
 #: protocols/oscar/icq/icqpresence.cpp:71 protocols/sms/smsprotocol.cpp:39
 #: protocols/winpopup/wpprotocol.cpp:55 protocols/yahoo/yahooprotocol.cpp:42
 msgid "Offline"
 msgstr "离线"
 
-#: libkopete/kopeteonlinestatus.cpp:126 plugins/cryptography/kgpgselkey.cpp:89
-#: plugins/translator/translatorlanguages.cpp:35
-#: protocols/groupwise/gwprotocol.cpp:62 protocols/irc/ircaccount.cpp:270
-#: protocols/oscar/icq/icqpresence.cpp:131
-msgid "Unknown"
-msgstr "未知"
+#: plugins/statistics/statisticsdialog.cpp:387
+msgid "<div class=\"statgroup\">"
+msgstr "<div class=\"statgroup\">"
 
-#: libkopete/kopetetransfermanager.cpp:190
-msgid "<unknown>"
-msgstr "<未知>"
+#: plugins/statistics/statisticsdialog.cpp:388
+msgid ""
+"<b title=\"The total time I have been able to see %1 status\">"
+"Total seen time :</b> %2 hour(s)"
+"<br>"
+msgstr "<b title=\"我可以看到 %1 状态的总计时间\">总计看到时间：</b>%2 小时<br>"
 
-#: libkopete/kopetetransfermanager.cpp:237 protocols/gadu/gaducontact.cpp:99
-#: protocols/irc/ircusercontact.cpp:150
-#: protocols/jabber/jabbercontact.cpp:1018
-#: protocols/jabber/jabbergroupcontact.cpp:299
-#: protocols/jabber/jabbergroupmembercontact.cpp:153
-#: protocols/msn/msncontact.cpp:593
-msgid "Kopete File Transfer"
-msgstr "Kopete 文件传送"
+#: plugins/statistics/statisticsdialog.cpp:390
+msgid ""
+"<b title=\"The total time I have seen %1 online\">Total online time :</b> "
+"%2 hour(s)"
+"<br>"
+msgstr "<b title=\"我看到 %1 在线的总计时间\">总计在线时间：</b>%2 小时<br>"
 
-#: libkopete/kopetetransfermanager.cpp:258
+#: plugins/statistics/statisticsdialog.cpp:392
 msgid ""
-"Sorry, sending files which are not stored locally is not yet supported by this "
-"protocol.\n"
-"Please copy this file to your computer and try again."
-msgstr ""
-"抱歉，此协议尚不支持未存储于本地的文件。\n"
-"请将此文件复制到您的计算机，然后再试一次。"
+"<b title=\"The total time I have seen %1 away\">Total busy time :</b> "
+"%2 hour(s)"
+"<br>"
+msgstr "<b title=\"我看到 %1 离开的总计时间\">总计忙碌时间：</b>%2 小时<br>"
 
-#: libkopete/tests/kopetepasswordtest_program.cpp:35
-msgid "Config group to store password in"
-msgstr "配置存储密码的组"
+#: plugins/statistics/statisticsdialog.cpp:393
+msgid ""
+"<b title=\"The total time I have seen %1 offline\">Total offline time :</b> "
+"%2 hour(s)"
+msgstr "<b title=\"我看到 %1 离线的总计时间\">总计离线时间：</b>%2 小时"
 
-#: libkopete/tests/kopetepasswordtest_program.cpp:36
-msgid "Set password to new"
-msgstr "重设密码"
+#: plugins/statistics/statisticsdialog.cpp:396
+#: plugins/statistics/statisticsdialog.cpp:464
+#: plugins/statistics/statisticsdialog.cpp:482
+msgid "General information"
+msgstr "常规信息"
 
-#: libkopete/tests/kopetepasswordtest_program.cpp:37
-msgid "Claim password was erroneous"
-msgstr "声明密码不对"
+#: plugins/statistics/statisticsdialog.cpp:402
+msgid "<b>Average message length :</b> %1 characters<br>"
+msgstr "<b>平均消息长度：</b>%1 个字符<br>"
 
-#: libkopete/tests/kopetepasswordtest_program.cpp:38
-msgid "Password prompt"
-msgstr "密码提示"
+#: plugins/statistics/statisticsdialog.cpp:403
+msgid "<b>Time between two messages : </b> %1 second(s)"
+msgstr "<b>两条消息之间的时间：</b>%1 秒"
 
-#: libkopete/tests/kopetepasswordtest_program.cpp:39
-msgid "Image to display in password dialog"
-msgstr "要在密码对话框中显示的图像"
+#: plugins/statistics/statisticsdialog.cpp:407
+msgid "<b title=\"The last time you talked with %1\">Last talk :</b> %2<br>"
+msgstr "<b title=\"您与 %1 上次对话的时间\">上次对话：</b>%2<br>"
 
-#: libkopete/tests/kopetepasswordtest_program.cpp:120
+#: plugins/statistics/statisticsdialog.cpp:408
 msgid ""
-"Hopefully this popped up because you set the password to the empty string."
-msgstr "弹出此提示是因为您将密码设置为空字符串。"
+"<b title=\"The last time I have seen %1 online or away\">"
+"Last time contact was present :</b> %2"
+msgstr "<b title=\"我上次看到 %1 在线或离开\">联系人上次出现：</b>%2"
 
-#: libkopete/kopetechatsession.cpp:251
-msgid "Outgoing Message Sent"
-msgstr "已发出的信息"
+#: plugins/statistics/statisticsdialog.cpp:418
+msgid "Current status"
+msgstr "当前状态"
 
-#: libkopete/kopetechatsession.cpp:267
-msgid "A contact sent you a buzz/nudge."
-msgstr "联系人向您发送了闪屏振动。"
+#: plugins/statistics/statisticsdialog.cpp:419
+msgid "Is <b>%1</b> since <b>%2</b>"
+msgstr "自 <b>%2</b> 后为 <b>%1</b>"
 
-#: libkopete/kopetechatsession.cpp:451
-msgid ""
-"<qt>An error has occurred while creating a new chat window. The chat window has "
-"not been created.</qt>"
-msgstr "<qt>创建新聊天窗口时出错。聊天窗口未创建。</qt>"
+#: plugins/statistics/statisticsdialog.cpp:429
+msgid "When have I seen this contact ?"
+msgstr "我什么时候看过此联系人？"
 
-#: libkopete/kopetechatsession.cpp:452
-msgid "Error While Creating Chat Window"
-msgstr "创建聊天窗口时出错"
+#: plugins/statistics/statisticsdialog.cpp:443
+msgid "Between %1:00 and %2:00, I was able to see %3 status %4% of the hour."
+msgstr "在 %1:00 和 %2:00 之间，我在 %4% 的时间看到 %3 的状态。"
 
-#: libkopete/kopeteprotocol.cpp:61
-#: protocols/meanwhile/meanwhileprotocol.cpp:60
-msgid "Account Offline"
-msgstr "账户离线"
+#: plugins/statistics/statisticsdialog.cpp:452
+msgid "Online time"
+msgstr "上线时间"
 
-#: libkopete/connectionmanager.cpp:144
-msgid ""
-"A network connection was disconnected.  The application is now in offline mode. "
-" Do you want the application to resume network operations when the network is "
-"available again?"
-msgstr "网络连接已经断开。应用程序现在转入离线模式。您是否希望应用程序在网络连通之后恢复网络操作？"
+#: plugins/statistics/statisticsdialog.cpp:452
+msgid "Away time"
+msgstr "离开时间"
 
-#: libkopete/connectionmanager.cpp:145
-msgid "This application is currently in offline mode.  Do you want to connect?"
-msgstr "此应用程序目前位于离线模式。您是否想要连接？"
+#: plugins/statistics/statisticsdialog.cpp:452
+msgid "Offline time"
+msgstr "下线时间"
 
-#: libkopete/connectionmanager.cpp:147
+#: plugins/statistics/statisticsdialog.cpp:457
+msgid "online"
+msgstr "在线"
+
+#: plugins/statistics/statisticsdialog.cpp:459
+msgid "away"
+msgstr "离开"
+
+#: plugins/statistics/statisticsdialog.cpp:461
+msgid "offline"
+msgstr "离线"
+
+#: plugins/statistics/statisticsdialog.cpp:502
+msgid "Between %1:00 and %2:00, I have seen %3 %4% %5."
+msgstr "在 %1:00 和 %2:00，我看到了 %3 %4% %5。"
+
+#: plugins/statistics/statisticsdialog.cpp:526
 msgid ""
-"This application is currently in offline mode.  Do you want to connect in order "
-"to carry out this operation?"
-msgstr "此应用程序目前位于离线模式。您是否想要连接以便执行此操作？"
+"_: 1 is date, 2 is contact name, 3 is online status\n"
+"%1, %2 was %3"
+msgstr "%1时%2 %3"
 
-#: libkopete/connectionmanager.cpp:148
-msgid "Leave Offline Mode?"
-msgstr "离开离线模式吗？"
+#: plugins/statistics/statisticsplugin.cpp:46
+msgid "Statistics"
+msgstr "统计"
 
-#: libkopete/connectionmanager.cpp:149
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:81
-msgid "Connect"
-msgstr "连接"
+#: plugins/statistics/statisticsplugin.cpp:55
+msgid "View &Statistics"
+msgstr "查看统计(&S)"
 
-#: libkopete/connectionmanager.cpp:149
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:81
-msgid "Stay Offline"
-msgstr "保持离线"
+#: plugins/latex/latexguiclient.cpp:44
+msgid "Preview Latex Images"
+msgstr "预览 Latex 图像"
 
-#: libkopete/kopeteutils.cpp:38
-msgid "You have been disconnected."
-msgstr "您已经断开。"
+#: plugins/latex/latexguiclient.cpp:62
+msgid ""
+"There are no latex in the message you are typing.  The latex formula must be "
+"included between $$ and $$ "
+msgstr "您正在输入的消息没有 Latex。Latex 公式周围必须有 $$ "
 
-#: libkopete/kopeteutils.cpp:39
-msgid "Connection Lost."
-msgstr "连接已丢失。"
+#: plugins/latex/latexguiclient.cpp:62
+msgid "No Latex Formula"
+msgstr "无 Latex 公式"
 
-#: libkopete/kopeteutils.cpp:40
+#: plugins/latex/latexguiclient.cpp:67
+#, c-format
+msgid "<b>Preview of the latex message :</b> <br />%1"
+msgstr "<b>Latex 消息的预览：</b> <br />%1"
+
+#: plugins/latex/latexplugin.cpp:95
 msgid ""
-"Kopete lost the channel used to talk to the instant messaging system.\n"
-"This can be because either your internet access went down, the service is "
-"experiencing problems, or the service disconnected you because you tried to "
-"connect with the same account from another location. Try connecting again "
-"later."
+"I cannot find the Magick convert program.\n"
+"convert is required to render the Latex formulas.\n"
+"Please go to www.imagemagick.org or to your distribution site and get the right "
+"package."
 msgstr ""
-"Kopete 丢失了即时消息系统正在使用的对话频道。\n"
-"这可能是因为您的网络连接已断开，对方的网络服务问题，或是因为您正从另一个地方尝试登录同一账户导致服务中断。请稍后再尝试重新连接。"
+"找不到 Magick 转换程序。\n"
+"要渲染 Latex 公式，需要 convert 程序。\n"
+"请转到 www.imagemagick.org，或者前往您发行版的网站抓到正确的软件包。"
 
-#: libkopete/kopeteutils.cpp:42
-msgid "Can't connect with the instant messaging server or peers."
-msgstr "无法连接到即时通讯服务器或对方。"
+#: plugins/highlight/highlightpreferences.cpp:207
+msgid "Rename Filter"
+msgstr "重命名过滤器"
 
-#: libkopete/kopeteutils.cpp:43
-msgid "Can't connect."
-msgstr "无法连接。"
+#: plugins/highlight/highlightpreferences.cpp:207
+msgid "Please enter the new name for the filter:"
+msgstr "请输入过滤器的新名称："
 
-#: libkopete/kopeteutils.cpp:44
+#: plugins/highlight/highlightconfig.cpp:72
+msgid "-New filter-"
+msgstr "-新过滤器-"
+
+#: plugins/nowlistening/nowlisteningguiclient.cpp:37
+msgid "Send Media Info"
+msgstr "发送媒体信息"
+
+#: plugins/nowlistening/nowlisteningguiclient.cpp:60
 msgid ""
-"This means Kopete can't reach the instant messaging server or peers.\n"
-"This can be because either your internet access is down or the server is "
-"experiencing problems. Try connecting again later."
-msgstr ""
-"这意味着 Kopete 无法联系到即时消息服务器或对象个人。\n"
-"这可能是因为您的网络连接已断开或是对方的网络服务问题。请稍后再尝试重新连接。"
+"None of the supported media players (KsCD, JuK, amaroK, Noatun or Kaffeine) are "
+"playing anything."
+msgstr "目前支持的任何一种播放器(KsCD、JuK、amaroK、Noatun 或 Kaffeine)都没有正在播放的曲目。"
 
-#: libkopete/kopeteutils.cpp:55
-msgid "More Information..."
-msgstr "更多信息..."
+#: plugins/nowlistening/nowlisteningguiclient.cpp:61
+msgid "Nothing to Send"
+msgstr "没有可发送的"
 
-#: libkopete/kopeteaccount.cpp:142
-msgid "You have been disconnected"
-msgstr "您已经断开了连接"
+#: plugins/nowlistening/nowlisteningplugin.cpp:135
+msgid "USAGE: /media - Displays information on current song"
+msgstr "用法：/media - 显示当前歌曲的信息"
 
-#: libkopete/kopeteaccount.cpp:142
-msgid "You have connected from another client or computer to the account '%1'"
-msgstr "您已从另外一个客户机或计算机上连接到账户“%1”"
+#: plugins/nowlistening/nowlisteningplugin.cpp:174
+msgid ""
+"_: Message from Kopete user to another user; used when sending media "
+"information even though there are no songs playing or no media players running\n"
+"Now Listening for Kopete - it would tell you what I am listening to, if I was "
+"listening to something on a supported media player."
+msgstr "Kopete 正在收听 - 如果我正在使用支持的媒体播放器收听音乐的话，您可以知道我现在正在听什么。"
 
-#: libkopete/kopeteaccount.cpp:142
+#: plugins/nowlistening/nowlisteningplugin.cpp:405
+msgid "Unknown track"
+msgstr "未知音轨"
+
+#: plugins/nowlistening/nowlisteningplugin.cpp:414
+msgid "Unknown artist"
+msgstr "未知艺术家"
+
+#: plugins/nowlistening/nowlisteningplugin.cpp:421
+msgid "Unknown album"
+msgstr "未知专辑"
+
+#: plugins/nowlistening/nowlisteningplugin.cpp:428
+msgid "Unknown player"
+msgstr "未知演奏者"
+
+#: plugins/autoreplace/autoreplaceconfig.cpp:67
 msgid ""
-"Most proprietary Instant Messaging services do not allow you to connect from "
-"more than one location. Check that nobody is using your account without your "
-"permission. If you need a service that supports connection from various "
-"locations at the same time, use the Jabber protocol."
-msgstr ""
-"大多数私有的即时消息服务不允许一个账号被多个来源同时连接，请确认没有其他人正在未经授权使用您的账户。如果您需要一个支持在同一时刻能够让不同来源连接同一账户的服务"
-"，请使用 Jabber 协议。"
+"_: list_of_words_to_replace\n"
+"ur,your,r,are,u,you,theres,there is,arent,are not,dont,do not"
+msgstr "ur,your,r,are,u,you,theres,there is,arent,are not,dont,do not"
 
-#: libkopete/kopeteaccount.cpp:258 libkopete/kopeteaccount.cpp:324
+#: plugins/autoreplace/autoreplacepreferences.cpp:46
+msgid "Text"
+msgstr "文本"
+
+#: plugins/autoreplace/autoreplacepreferences.cpp:47
+msgid "Replacement"
+msgstr "替换"
+
+#. i18n: file ./plugins/autoreplace/autoreplaceprefs.ui line 108
+#: plugins/alias/aliaspreferences.cpp:326
+#: protocols/oscar/oscarlistnonservercontacts.cpp:33 rc.cpp:384 rc.cpp:4170
+#, no-c-format
+msgid "&Add"
+msgstr "添加(&A)"
+
+#: plugins/alias/aliaspreferences.cpp:336
+#: plugins/alias/aliaspreferences.cpp:425
 msgid ""
-"You are not allowed to add yourself to the contact list. The addition of \"%1\" "
-"to account \"%2\" will not take place."
-msgstr "您无法将您自己添加到联系人列表。将“%1”添加到账户“%2”的操作将不会生效。"
+"<qt>Could not add alias <b>%1</b>. An alias name cannot contain the characters "
+"\"_\" or \"=\".</qt>"
+msgstr "<qt>无法添加别名 <b>%1</b>。别名不能包含“_”或“=”。</qt>"
 
-#: libkopete/kopeteaccount.cpp:258 libkopete/kopeteaccount.cpp:324
-msgid "Error Creating Contact"
-msgstr "创建联系人时出错"
+#: plugins/alias/aliaspreferences.cpp:338
+#: plugins/alias/aliaspreferences.cpp:427
+msgid "Invalid Alias Name"
+msgstr "无效的别名"
 
-#: libkopete/kopeteaccount.cpp:368 protocols/jabber/jabbertransport.cpp:130
-#: protocols/oscar/aim/aimaccount.cpp:309
-msgid "%2 <%1>"
-msgstr "%2 <%1>"
+#: plugins/alias/aliaspreferences.cpp:354
+#: plugins/alias/aliaspreferences.cpp:450
+msgid ""
+"<qt>Could not add alias <b>%1</b>. This command is already being handled by "
+"either another alias or Kopete itself.</qt>"
+msgstr "<qt>无法添加别名 <b>%1</b>。此命令已经被其他别名或者 Kopete 自己所使用。</qt>"
 
-#: kopete/config/accounts/kopeteaccountconfig.cpp:198
-#: libkopete/kopeteaccount.cpp:514
-msgid "Edit Account"
-msgstr "编辑账户"
+#: plugins/alias/aliaspreferences.cpp:356
+#: plugins/alias/aliaspreferences.cpp:452
+msgid "Could Not Add Alias"
+msgstr "无法添加别名"
 
-#: kopete/kopetewindow.cpp:998 libkopete/kopeteawayaction.cpp:85
-msgid "No Message"
-msgstr "无消息"
+#: plugins/alias/aliaspreferences.cpp:469
+msgid "Are you sure you want to delete the selected aliases?"
+msgstr "您确定想要删除选中的别名吗？"
 
-#: libkopete/kopeteawayaction.cpp:86
-msgid "New Message..."
-msgstr "新建消息..."
+#: plugins/alias/aliaspreferences.cpp:469
+msgid "Delete Aliases"
+msgstr "删除别名"
 
-#: libkopete/kopeteawayaction.cpp:113
-msgid "New Away Message"
-msgstr "新建离开消息"
+#: plugins/history/historyguiclient.cpp:44
+msgid "History Last"
+msgstr "最后一次历史"
 
-#: libkopete/kopeteawayaction.cpp:113
-msgid "Please enter your away reason:"
-msgstr "请输入您的离开理由："
+#: plugins/history/converter.cpp:40
+msgid "Would you like to remove old history files?"
+msgstr "您想删除旧的历史文件吗？"
 
-#: libkopete/kopeteaway.cpp:170
-msgid "Sorry, I am busy right now"
-msgstr "抱歉，我现在正忙"
+#: plugins/history/converter.cpp:40
+msgid "History Converter"
+msgstr "历史转换器"
 
-#: libkopete/kopeteaway.cpp:171 libkopete/kopeteaway.cpp:184
-msgid "I am gone right now, but I will be back later"
-msgstr "我现在已离开，不过稍后会回来"
+#: plugins/history/converter.cpp:40 protocols/jabber/jabberaccount.cpp:1125
+#: protocols/jabber/jabbercontact.cpp:921
+msgid "Keep"
+msgstr "保持"
 
-#: libkopete/kopeteawaydialog.cpp:37
-msgid "Global Away Message"
-msgstr "全局离开消息"
+#: plugins/history/converter.cpp:42
+msgid "History converter"
+msgstr "历史转换器"
 
-#: libkopete/kopetemimetypehandler.cpp:153
+#: plugins/history/converter.cpp:109
 #, c-format
-msgid "Unable to find the file %1."
-msgstr "找不到文件 %1。"
+msgid "Parsing old history in %1"
+msgstr "正在处理 %1 中的旧历史"
 
-#: libkopete/kopetemimetypehandler.cpp:157
+#: plugins/history/converter.cpp:119
 msgid ""
-"<qt>Unable to download the requested file;"
-"<br>please check that address %1 is correct.</qt>"
-msgstr "<qt>无法下载请求的文件；<br>请检查地址 %1 是否正确。</qt>"
+"Parsing old history in %1:\n"
+"%2"
+msgstr ""
+"正在处理 %1 中的旧历史：\n"
+"%2"
 
-#: libkopete/tdeabcpersistence.cpp:294
-msgid "<qt>\"%1\" is not supported by Kopete.</qt>"
-msgstr "<qt>Kopete 不支持“%1”。</qt>"
+#: plugins/history/historydialog.cpp:98 plugins/history/historydialog.cpp:556
+#, c-format
+msgid "History for %1"
+msgstr "%1 的历史"
 
-#: libkopete/tdeabcpersistence.cpp:295
-msgid "Could Not Sync with TDE Address Book"
-msgstr "无法与 TDE 地址簿同步"
+#: plugins/history/historydialog.cpp:119
+msgid "All"
+msgstr "全部"
 
-#: libkopete/tdeabcpersistence.cpp:342
-msgid ""
-"<qt>An address was added to this contact by another application."
-"<br>Would you like to use it in Kopete?"
-"<br><b>Protocol:</b> %1"
-"<br><b>Address:</b> %2</qt>"
-msgstr ""
-"<qt>其它应用程序向此联系人中添加了新地址。"
-"<br>您是否想要在 Kopete 中使用？"
-"<br><b>协议：</b>%1"
-"<br><b>地址：</b>%2</qt>"
+#: kopete/chatwindow/chatmessagepart.cpp:267
+#: plugins/history/historydialog.cpp:178
+msgid "Copy Link Address"
+msgstr "复制链接地址"
 
-#: libkopete/tdeabcpersistence.cpp:342
-msgid "Import Address From Address Book"
-msgstr "从地址簿导入地址"
+#: plugins/history/historydialog.cpp:213
+msgid "Loading..."
+msgstr "正在装入..."
 
-#: libkopete/tdeabcpersistence.cpp:342
-msgid "Use"
-msgstr "使用"
+#: plugins/history/historydialog.cpp:470
+msgid "Searching..."
+msgstr "正在搜索..."
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 304
-#: libkopete/tdeabcpersistence.cpp:342 rc.cpp:3130
+#. i18n: file ./plugins/history/historyviewer.ui line 125
+#: plugins/history/historydialog.cpp:536 rc.cpp:469
 #, no-c-format
-msgid "Do Not Use"
-msgstr "不使用"
+msgid "Se&arch"
+msgstr "搜索(&A)"
 
-#: libkopete/tdeabcpersistence.cpp:356
-msgid ""
-"<qt>One or more of your accounts using %1 are offline.  Most systems have to be "
-"connected to add contacts.  Please connect these accounts and try again.</qt>"
-msgstr "<qt>您使用 %1 的账户中有一个或多个处于离线状态。大多数系统需要上线后才能添加联系人。请连接这些账户然后再试。</qt>"
+#: plugins/history/historydialog.cpp:549
+msgid "History for All Contacts"
+msgstr "全部联系人的历史"
 
-#: libkopete/tdeabcpersistence.cpp:357 protocols/gadu/gadusession.cpp:217
-#: protocols/gadu/gadusession.cpp:230 protocols/gadu/gadusession.cpp:242
-#: protocols/gadu/gadusession.cpp:275 protocols/gadu/gadusession.cpp:289
-#: protocols/gadu/gadusession.cpp:307 protocols/irc/ui/channellist.cpp:304
-msgid "Not Connected"
-msgstr "未连接"
+#. i18n: file ./plugins/history/historyviewer.ui line 55
+#: plugins/history/historydialog.cpp:572 rc.cpp:463
+#, no-c-format
+msgid "Ready"
+msgstr "就绪"
 
-#: libkopete/tdeabcpersistence.cpp:367 protocols/oscar/aim/aimprotocol.cpp:164
-#: protocols/oscar/icq/icqprotocol.cpp:119
-msgid "Choose Account"
-msgstr "选择账户"
+#: plugins/history/historyplugin.cpp:41
+msgid "History"
+msgstr "历史"
 
-#: libkopete/tdeabcpersistence.cpp:381
+#: plugins/history/historyplugin.cpp:47
+msgid "View &History"
+msgstr "查看历史(&H)"
+
+#: plugins/history/historyplugin.cpp:66
 msgid ""
-"<qt>You do not have an account configured for <b>%1</b> "
-"yet.  Please create an account, connect it, and try again.</qt>"
-msgstr "<qt>您尚未配置过 <b>%1</b> 的账户。请创建一个账户，连接该账户，然后再试一次。</qt>"
+"Old history files from Kopete 0.6.x or older has been detected.\n"
+"Do you want to import and convert it to the new history format?"
+msgstr ""
+"检测到了 Kopete 0.6.x 或更旧的历史文件。\n"
+"您想要将其导入并转换为新的历史格式吗？"
 
-#: libkopete/tdeabcpersistence.cpp:382
-msgid "No Account Found"
-msgstr "没有找到账户"
+#: plugins/history/historyplugin.cpp:68
+msgid "History Plugin"
+msgstr "历史插件"
 
-#: libkopete/tdeabcpersistence.cpp:398
-msgid "<qt>It was not possible to add the contact.</qt>"
-msgstr "<qt>无法添加联系人。</qt>"
+#: plugins/history/historyplugin.cpp:68
+msgid "Import && Convert"
+msgstr "导入并转换"
 
-#: libkopete/tdeabcpersistence.cpp:399
-msgid "Could Not Add Contact"
-msgstr "无法添加联系人"
+#: plugins/history/historyplugin.cpp:68
+msgid "Do Not Import"
+msgstr "不导入"
 
-#: libkopete/kopetemetacontact.cpp:345 libkopete/kopetemetacontact.cpp:363
-#: libkopete/kopetemetacontact.cpp:439
+#: plugins/contactnotes/contactnotesedit.cpp:29
+msgid "Contact Notes"
+msgstr "联系人备注"
+
+#: plugins/contactnotes/contactnotesedit.cpp:36
+msgid "Notes about %1:"
+msgstr "关于 %1 的备注："
+
+#: plugins/contactnotes/contactnotesplugin.cpp:40
+msgid "&Notes"
+msgstr "备注(&N)"
+
+#: plugins/webpresence/webpresenceplugin.cpp:208
 msgid ""
-"This user is not reachable at the moment. Please make sure you are connected "
-"and using a protocol that supports offline sending, or wait until this user "
-"comes online."
-msgstr "此时无法联系到此用户。请确定您已经上线，并且使用了支持离线发送消息的协议，或者等到该用户上线后再发。"
+"An error occurred when uploading your presence page.\n"
+"Check the path and write permissions of the destination."
+msgstr ""
+"上传您的上线页面时发生了错误。\n"
+"请检查目标的路径和写权限。"
 
-#: libkopete/kopetecontact.cpp:453 libkopete/kopetemetacontact.cpp:346
-#: libkopete/kopetemetacontact.cpp:364 libkopete/kopetemetacontact.cpp:440
-msgid "User is Not Reachable"
-msgstr "无法联系用户"
+#: plugins/webpresence/webpresenceplugin.cpp:218
+msgid "Not yet known"
+msgstr "未知"
 
-#: libkopete/kopetemetacontact.cpp:510 protocols/irc/ircprotocol.cpp:150
-#: protocols/msn/msnprotocol.cpp:61
-msgid "Status not available"
-msgstr "状态不可用"
+#: kopete/chatwindow/kopeteemoticonaction.cpp:65
+msgid "Add Smiley"
+msgstr "添加笑脸"
 
-#: libkopete/kopetetask.cpp:32
-msgid "The operation has not finished yet"
-msgstr "操作尚未完成"
+#: kopete/chatwindow/krichtexteditpart.cpp:117
+msgid "KopeteRichTextEditPart"
+msgstr "KopeteRichTextEditPart"
 
-#: libkopete/kopetetask.cpp:67
-msgid "Aborted"
-msgstr "已中止"
+#: kopete/chatwindow/krichtexteditpart.cpp:118
+msgid "A simple rich text editor part for Kopete"
+msgstr "Kopete 简单的丰富文字编辑器部件"
 
-#: libkopete/kopetepasswordedaccount.cpp:83
-msgid ""
-"<b>The password was wrong;</b> please re-enter your password for %1 account <b>"
-"%2</b>"
-msgstr "<b>密码不对；</b>请重新输入您 %1 账户 <b>%2</b> 的密码"
+#: kopete/chatwindow/krichtexteditpart.cpp:127
+msgid "Enable &Rich Text"
+msgstr "启用丰富文本(&R)"
 
-#: libkopete/kopetepasswordedaccount.cpp:85
-msgid "Please enter your password for %1 account <b>%2</b>"
-msgstr "请输入 %1 账户 <b>%2</b> 的密码"
+#: kopete/chatwindow/krichtexteditpart.cpp:129
+msgid "Disable &Rich Text"
+msgstr "禁用丰富文本(&R)"
 
-#: libkopete/kopetecommandhandler.cpp:107
-msgid ""
-"USAGE: /help [<command>] - Used to list available commands, or show help for a "
-"specified command."
-msgstr "用法：/help [<命令>] - 用于列出可用的命令，或者显示指定命令的帮助。"
+#: kopete/chatwindow/krichtexteditpart.cpp:133
+msgid "Check &Spelling"
+msgstr "拼写检查(&S)"
 
-#: libkopete/kopetecommandhandler.cpp:110
-msgid "USAGE: /close - Closes the current view."
-msgstr "用法：/close - 关闭当前视图。"
+#: kopete/chatwindow/krichtexteditpart.cpp:137
+msgid "Text &Color..."
+msgstr "文字颜色(&C)..."
 
-#: libkopete/kopetecommandhandler.cpp:114
-msgid "USAGE: /part - Closes the current view."
-msgstr "用法：/part - 关闭当前视图。"
+#: kopete/chatwindow/krichtexteditpart.cpp:142
+msgid "Background Co&lor..."
+msgstr "背景颜色(&L)..."
 
-#: libkopete/kopetecommandhandler.cpp:117
-msgid "USAGE: /clear - Clears the active view's chat buffer."
-msgstr "用法：/clear - 清除当前视图的聊天缓冲。"
+#: kopete/chatwindow/krichtexteditpart.cpp:147
+msgid "&Font"
+msgstr "字体(&F)"
 
-#: libkopete/kopetecommandhandler.cpp:123
-msgid ""
-"USAGE: /away [<reason>] - Marks you as away/back for the current account only."
-msgstr "用法：/away [<原因>] - 只对当前账户设为离开/回来。"
+#: kopete/chatwindow/krichtexteditpart.cpp:153
+msgid "Font &Size"
+msgstr "字体大小(&S)"
 
-#: libkopete/kopetecommandhandler.cpp:126
-msgid "USAGE: /awayall [<reason>] - Marks you as away/back for all accounts."
-msgstr "用法：/awayall [<原因>] - 对所有账户设为离开/回来。"
+#: kopete/chatwindow/krichtexteditpart.cpp:159
+msgid "&Bold"
+msgstr "粗体(&B)"
 
-#: libkopete/kopetecommandhandler.cpp:129
+#: kopete/chatwindow/krichtexteditpart.cpp:164
+msgid "&Italic"
+msgstr "斜体(&I)"
+
+#: kopete/chatwindow/krichtexteditpart.cpp:169
+msgid "&Underline"
+msgstr "下划线(&U)"
+
+#: kopete/chatwindow/krichtexteditpart.cpp:183
+msgid "Align &Left"
+msgstr "左对齐(&L)"
+
+#: kopete/chatwindow/krichtexteditpart.cpp:188
+msgid "Align &Center"
+msgstr "居中对齐(&C)"
+
+#: kopete/chatwindow/krichtexteditpart.cpp:193
+msgid "Align &Right"
+msgstr "右对齐(&R)"
+
+#: kopete/chatwindow/krichtexteditpart.cpp:198
+msgid "&Justify"
+msgstr "两端对齐(&J)"
+
+#: kopete/chatwindow/chatmessagepart.cpp:266
+#: kopete/chatwindow/chatmessagepart.cpp:291
+msgid "Import Emoticon"
+msgstr "导入表情"
+
+#: kopete/chatwindow/chatmessagepart.cpp:292
 msgid ""
-"USAGE: /say <text> - Say text in this chat. This is the same as just typing a "
-"message, but is very useful for scripts."
-msgstr "用法：/say <文字> - 在此聊天中说话。这和输入消息功能相同，但可用于脚本。"
+"<qt><img src=\"%1\">"
+"<br>Insert the string for the emoticon"
+"<br>separated by space if you want multiple strings</qt>"
+msgstr ""
 
-#: libkopete/kopetecommandhandler.cpp:133
+#: kopete/chatwindow/chatmessagepart.cpp:339
+msgid "Save Conversation"
+msgstr "保存对话"
+
+#: kopete/chatwindow/chatmessagepart.cpp:377
+msgid "<qt>Could not open <b>%1</b> for writing.</qt>"
+msgstr "<qt>无法打开 <b>%1</b> 进行写入。</qt>"
+
+#: kopete/chatwindow/chatmessagepart.cpp:378
+msgid "Error While Saving"
+msgstr "保存时出错"
+
+#: kopete/chatwindow/chatmessagepart.cpp:726
+msgid "User Has Left"
+msgstr "用户离开了"
+
+#: kopete/chatwindow/kopeteemailwindow.cpp:155
+msgid "<< Prev"
+msgstr "<< 上次"
+
+#: kopete/chatwindow/kopeteemailwindow.cpp:160
+msgid "(0) Next >>"
+msgstr "(0) 下次 >>"
+
+#: kopete/chatwindow/kopetechatwindow.cpp:316
+#: kopete/chatwindow/kopeteemailwindow.cpp:209
+msgid "&Send Message"
+msgstr "发送消息(&S)"
+
+#: kopete/chatwindow/kopeteemailwindow.cpp:220
+msgid "&Set Font..."
+msgstr "设定字体(&S)..."
+
+#: kopete/chatwindow/kopeteemailwindow.cpp:222
+msgid "Set Text &Color..."
+msgstr "设定文字颜色(&C)..."
+
+#: kopete/chatwindow/kopetechatwindow.cpp:359
+#: kopete/chatwindow/kopeteemailwindow.cpp:224
+msgid "Set &Background Color..."
+msgstr "设定背景颜色(&B)..."
+
+#: kopete/chatwindow/kopetechatwindow.cpp:415
+#: kopete/chatwindow/kopeteemailwindow.cpp:248
+msgid "Toolbar Animation"
+msgstr "工具栏动画"
+
+#: kopete/chatwindow/kopeteemailwindow.cpp:347
+msgid "(%1) Next >>"
+msgstr "(%1) 下次 >>"
+
+#: kopete/chatwindow/chatview.cpp:356
+#: kopete/chatwindow/kopeteemailwindow.cpp:425
 msgid ""
-"USAGE: /exec [-o] <command> - Executes the specified command and displays the "
-"output in the chat buffer. If -o is specified, the output is sent to all "
-"members of the chat."
-msgstr "用法：/exec [-o] <命令> - 执行指定命令并将输出显示到聊天缓冲中。如果指定了 -o，输出将发送到聊天的所有成员。"
+"<qt>You are about to leave the group chat session <b>%1</b>."
+"<br>You will not receive future messages from this conversation.</qt>"
+msgstr "<qt>您即将离开小组聊天会话 <b>%1</b>。<br>您将不会从对话中收到将来的消息。</qt>"
 
-#: libkopete/kopetecommandhandler.cpp:236
+#: kopete/chatwindow/chatview.cpp:357
+#: kopete/chatwindow/kopeteemailwindow.cpp:426
+msgid "Closing Group Chat"
+msgstr "关闭小组聊天"
+
+#: kopete/chatwindow/chatview.cpp:358 kopete/chatwindow/chatview.cpp:365
+#: kopete/chatwindow/chatview.cpp:372
+#: kopete/chatwindow/kopeteemailwindow.cpp:427
+#: kopete/chatwindow/kopeteemailwindow.cpp:434
+#: kopete/chatwindow/kopeteemailwindow.cpp:441
+msgid "Cl&ose Chat"
+msgstr "关闭聊天(&O)"
+
+#: kopete/chatwindow/chatview.cpp:363
+#: kopete/chatwindow/kopeteemailwindow.cpp:432
 msgid ""
-"Available Commands:\n"
-msgstr ""
-"可用的命令：\n"
+"<qt>You have received a message from <b>%1</b> in the last second. Are you sure "
+"you want to close this chat?</qt>"
+msgstr "<qt>您在上一秒收到了来自 <b>%1</b> 的消息。您确定想要关闭此聊天吗？</qt>"
 
-#: libkopete/kopetecommandhandler.cpp:249
+#: kopete/chatwindow/chatview.cpp:364
+#: kopete/chatwindow/kopeteemailwindow.cpp:433
+msgid "Unread Message"
+msgstr "未读消息"
+
+#: kopete/chatwindow/chatview.cpp:370
+#: kopete/chatwindow/kopeteemailwindow.cpp:439
 msgid ""
-"\n"
-"Type /help <command> for more information."
-msgstr ""
-"\n"
-"输入 /help <命令> 可查看更多信息。"
+"You have a message send in progress, which will be aborted if this chat is "
+"closed. Are you sure you want to close this chat?"
+msgstr "您仍有消息处于发送中。如果关闭了此聊天，发送将会被迫中断。您确定想要关闭此聊天吗？"
 
-#: libkopete/kopetecommandhandler.cpp:258
-msgid "There is no help available for '%1'."
-msgstr "“%1”没有可用的帮助。"
+#: kopete/chatwindow/chatview.cpp:371
+#: kopete/chatwindow/kopeteemailwindow.cpp:440
+msgid "Message in Transit"
+msgstr "消息传送中"
 
-#: libkopete/kopetecommandhandler.cpp:304
+#: kopete/chatwindow/kopetechatwindow.cpp:194
+#: kopete/chatwindow/kopeteemailwindow.cpp:466
+#: kopete/chatwindow/kopeteemailwindow.cpp:484
+msgid "Send"
+msgstr "发送"
+
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 774
+#: kopete/chatwindow/kopeteemailwindow.cpp:473 rc.cpp:4935
+#, no-c-format
+msgid "Reply"
+msgstr "答复"
+
+#: kopete/chatwindow/chatview.cpp:408
+#, c-format
 msgid ""
-"ERROR: Shell access has been restricted on your system. The /exec command will "
-"not function."
-msgstr "错误：您的系统限制了 Shell 访问。/exec 命令将无法工作。"
+"_n: One other person in the chat\n"
+"%n other people in the chat"
+msgstr "聊天中的 %n 个其它人"
 
-#: libkopete/kopetepassword.cpp:181
-msgid "Password Required"
-msgstr "需要密码"
+#: kopete/chatwindow/chatview.cpp:551
+msgid "%1 is typing a message"
+msgstr "%1 正在输入消息"
 
-#: libkopete/kopetepassword.cpp:293
+#: kopete/chatwindow/chatview.cpp:555
 msgid ""
-"<qt>Kopete is unable to save your password securely in your wallet;"
-"<br>do you want to save the password in the <b>unsafe</b> "
-"configuration file instead?</qt>"
-msgstr "<qt>Kopete 无法将您的密码安全地保存于钱包中；<br>您想要将密码保存于<b>不安全的</b>配置文件中吗？</qt>"
+"_: %1 is a list of names\n"
+"%1 are typing a message"
+msgstr "%1 正在输入消息"
 
-#: libkopete/kopetepassword.cpp:295
-msgid "Unable to Store Secure Password"
-msgstr "无法存储安全密码"
+#: kopete/chatwindow/chatview.cpp:597 kopete/chatwindow/chatview.cpp:606
+msgid "%1 is now known as %2"
+msgstr "%1 现在是 %2"
 
-#: libkopete/kopetepassword.cpp:296
-msgid "Store &Unsafe"
-msgstr "非安全存储(&U)"
+#: kopete/chatwindow/chatview.cpp:635
+msgid "%1 has joined the chat."
+msgstr "%1 加入了交谈。"
 
-#: kopete/contactlist/kopetegrouplistaction.cpp:62
-#: libkopete/kopetegroup.cpp:47
-msgid "Top Level"
-msgstr "顶级"
+#: kopete/chatwindow/chatview.cpp:686
+msgid "%1 has left the chat."
+msgstr "%1 离开了交谈"
 
-#: libkopete/kopetegroup.cpp:55
-msgid "Not in your contact list"
-msgstr "不在您的联系人列表中"
+#: kopete/chatwindow/chatview.cpp:688
+msgid "%1 has left the chat (%2)."
+msgstr "%1 离开了交谈(%2)。"
 
-#: libkopete/kopetegroup.cpp:217
-msgid "(Unnamed Group)"
-msgstr "(未命名组)"
+#: kopete/chatwindow/chatview.cpp:788
+#, c-format
+msgid "You are now marked as %1."
+msgstr "您已经标为 %1。"
 
-#: libkopete/kopetecontact.cpp:212
-msgid "&Add to Your Contact List"
-msgstr "添加到您的联系人列表(&A)"
+#: kopete/chatwindow/chatview.cpp:795 kopete/chatwindow/chatview.cpp:801
+msgid "%2 is now %1."
+msgstr "%2 现在是 %1。"
 
-#: libkopete/kopetecontact.cpp:270 libkopete/kopetecontact.cpp:318
-msgid "Move Contact"
-msgstr "移动联系人"
+#: kopete/chatwindow/kopetechatwindow.cpp:205
+msgid "Ready."
+msgstr "就绪。"
 
-#: libkopete/kopetecontact.cpp:276
-msgid "Select the meta contact to which you want to move this contact:"
-msgstr "选择您想把此联系人移入哪个超级联系人："
+#: kopete/chatwindow/kopetechatwindow.cpp:323
+msgid "Close All Chats"
+msgstr "关闭全部聊天"
 
-#: libkopete/kopetecontact.cpp:279
-msgid "Create a new metacontact for this contact"
-msgstr "创建新空的超级联系人来容纳该联系人"
+#: kopete/chatwindow/kopetechatwindow.cpp:327
+msgid "&Activate Next Tab"
+msgstr "激活下个标签(&A)"
 
-#: libkopete/kopetecontact.cpp:280
+#: kopete/chatwindow/kopetechatwindow.cpp:329
+msgid "&Activate Previous Tab"
+msgstr "激活上个标签(&A)"
+
+#: kopete/chatwindow/kopetechatwindow.cpp:334
+msgid "Nic&k Completion"
+msgstr "昵称补全(&K)"
+
+#: kopete/chatwindow/kopetechatwindow.cpp:337
+msgid "&Detach Chat"
+msgstr "漂移聊天(&D)"
+
+#: kopete/chatwindow/kopetechatwindow.cpp:341
+msgid "&Move Tab to Window"
+msgstr "将标签移动到窗口(&M)"
+
+#: kopete/chatwindow/kopetechatwindow.cpp:347
+msgid "&Tab Placement"
+msgstr "标签放置(&T)"
+
+#: kopete/chatwindow/kopetechatwindow.cpp:357
+msgid "Set Default &Font..."
+msgstr "设定默认字体(&F)..."
+
+#: kopete/chatwindow/kopetechatwindow.cpp:358
+msgid "Set Default Text &Color..."
+msgstr "设定默认文字颜色(&C)..."
+
+#: kopete/chatwindow/kopetechatwindow.cpp:361
+msgid "Previous History"
+msgstr "上次历史"
+
+#: kopete/chatwindow/kopetechatwindow.cpp:365
+msgid "Next History"
+msgstr "下次历史"
+
+#: kopete/chatwindow/kopetechatwindow.cpp:374
+msgid "Place to Left of Chat Area"
+msgstr "放到聊天区左侧"
+
+#: kopete/chatwindow/kopetechatwindow.cpp:376
+msgid "Place to Right of Chat Area"
+msgstr "放到聊天区右侧"
+
+#: kopete/chatwindow/kopetechatwindow.cpp:378
+msgid "Show"
+msgstr "显示"
+
+#: kopete/chatwindow/kopetechatwindow.cpp:380
+msgid "Hide"
+msgstr "隐藏"
+
+#: kopete/chatwindow/kopetechatwindow.cpp:381
+msgid "Automatic Spell Checking"
+msgstr "自动检查拼写"
+
+#: kopete/chatwindow/kopetechatwindow.cpp:389
+msgid "Co&ntacts"
+msgstr "联系人(&N)"
+
+#: kopete/chatwindow/kopetechatwindow.cpp:608
+msgid "Close the current tab"
+msgstr "关闭当前标签"
+
+#: kopete/chatwindow/kopetechatwindow.cpp:996
+msgid "More..."
+msgstr "更多..."
+
+#: kopete/chatwindow/kopetechatwindow.cpp:1199
+msgid "Plugin Actions"
+msgstr "插件操作"
+
+#: kopete/kimifaceimpl.cpp:383
 msgid ""
-"If you select this option, a new metacontact will be created in the top-level "
-"group with the name of this contact and the contact will be moved to it."
-msgstr "如果您选择了此选项，将会在顶层以此联系人的名称创建一个新的超级联系人。而此联系人将会被移动到该组中。"
+"Another TDE application tried to use Kopete for instant messaging, but Kopete "
+"could not find the specified contact in the TDE address book."
+msgstr "另外一个 TDE 应用程序想要使用 Kopete 进行即时通讯。但 Kopete 无法在 TDE 地址簿中找到指定联系人。"
 
-#: libkopete/kopetecontact.cpp:315
+#: kopete/contactlist/kopetecontactlistview.cpp:1451
+#: kopete/contactlist/kopetecontactlistview.cpp:1454
+#: kopete/kimifaceimpl.cpp:383
+msgid "Not Found in Address Book"
+msgstr "未在地址簿中找到"
+
+#: kopete/kimifaceimpl.cpp:388
 msgid ""
-"You are moving the contact `%1' to the meta contact `%2'.\n"
-"`%3' will be empty afterwards. Do you want to delete this contact?"
+"_: Translators: %1 is the name of a person taken from the TDE address book, who "
+"Kopete doesn't know about.  Kopete must either be told that an existing contact "
+"in Kopete is this person, or add a new contact for them\n"
+"<qt>"
+"<p>The TDE Address Book has no instant messaging information for</p>"
+"<p><b>%1</b>.</p>"
+"<p>If he/she is already present in the Kopete contact list, indicate the "
+"correct addressbook entry in their properties.</p>"
+"<p>Otherwise, add a new contact using the Add Contact wizard.</p></qt>"
 msgstr ""
-"您即将把“%1”移动到“%2”。\n"
-"这样的话，“%3”就空了。您想要删除此联系人吗？"
+"<qt>"
+"<p>TDE 地址簿中没有 <b>%1</b> 的即时通讯信息。</p>"
+"<p>如果他/她已经出现在 Kopete 联系人列表中，表明其属性中有正确的地址簿项。</p>"
+"<p>否则，请使用添加联系人向导添加新联系人。</p></qt>"
 
-#: libkopete/kopetecontact.cpp:318
-msgid "&Keep"
-msgstr "保持(&K)"
+#: kopete/kimifaceimpl.cpp:390
+msgid "No Instant Messaging Address"
+msgstr "无即时通讯地址"
 
-#: libkopete/kopetecontact.cpp:452
+#: kopete/addcontactwizard/fastaddcontactwizard.cpp:89
 msgid ""
-"This user is not reachable at the moment. Please try a protocol that supports "
-"offline sending, or wait until this user comes online."
-msgstr "此时无法联系到此用户。请试着换用支持离线发送消息的协议，或者等到该用户上线后再发。"
+"_: The account name is prepended here\n"
+"%1 contact information"
+msgstr "%1 联系人信息"
 
-#: libkopete/kopetecontact.cpp:460
-msgid ""
-"Are you sure you want to remove the contact  '%1' from your contact list?"
-msgstr "您确定想要从联系人列表中删除联系人“%1”吗？"
+#: kopete/addcontactwizard/addcontactwizard.cpp:163
+#: kopete/contactlist/kopetecontactlistview.cpp:599
+#: kopete/contactlist/kopetemetacontactlvi.cpp:645
+msgid "New Group"
+msgstr "新组"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1375
-#: libkopete/kopetecontact.cpp:461
-msgid "Remove Contact"
-msgstr "删除联系人"
+#: kopete/addcontactwizard/addcontactwizard.cpp:164
+#: kopete/contactlist/kopetecontactlistview.cpp:600
+#: kopete/contactlist/kopetemetacontactlvi.cpp:645
+msgid "Please enter the name for the new group:"
+msgstr "请输入新组的名称："
 
-#: libkopete/kopetecontact.cpp:658
+#: kopete/addcontactwizard/addcontactwizard.cpp:286
 msgid ""
-"_: <b>DISPLAY NAME</b>"
-"<br><img src=\"%2\">&nbsp;CONTACT STATUS\n"
-"<b><nobr>%3</nobr></b>"
-"<br><img src=\"%2\">&nbsp;%1"
-msgstr "<b><nobr>%3</nobr></b><br><img src=\"%2\">&nbsp;%1"
+"_: The user has to select the contact to add to the given account name\n"
+"Choose New Contact For %1 Account <b>%2</b>"
+msgstr "为 %1 账户 <b>%2</b> 选择新联系人"
 
-#: libkopete/kopetecontact.cpp:665
-msgid ""
-"_: <b>DISPLAY NAME</b> (CONTACT ID)"
-"<br><img src=\"%2\">&nbsp;CONTACT STATUS\n"
-"<nobr><b>%4</b> (%3)</nobr>"
-"<br><img src=\"%2\">&nbsp;%1"
-msgstr "<nobr><b>%4</b> (%3)</nobr><br><img src=\"%2\">&nbsp;%1"
+#: kopete/contactlist/kopetecontactlistview.cpp:291
+msgid "Online contacts (%1)"
+msgstr "在线联系人(%1)"
 
-#: libkopete/kopetecontact.cpp:682
-msgid ""
-"_: "
-"<br><b>Full Name:</b>&nbsp;FORMATTED NAME\n"
-"<br><b>Full Name:</b>&nbsp;<nobr>%1</nobr>"
-msgstr "<br><b>全名：</b>&nbsp;<nobr>%1</nobr>"
+#: kopete/contactlist/kopetecontactlistview.cpp:292
+msgid "Offline contacts (%1)"
+msgstr "离线联系人(%1)"
 
-#: libkopete/kopetecontact.cpp:691
-msgid ""
-"_: "
-"<br><b>Idle:</b>&nbsp;FORMATTED IDLE TIME\n"
-"<br><b>Idle:</b>&nbsp;<nobr>%1</nobr>"
-msgstr "<br><b>发呆：</b>&nbsp;<nobr>%1</nobr>"
+#: kopete/contactlist/kopetecontactlistview.cpp:447
+msgid "Contacts"
+msgstr "联系人"
 
-#: libkopete/kopetecontact.cpp:700
-msgid ""
-"_: "
-"<br><b>Home Page:</b>&nbsp;FORMATTED URL\n"
-"<br><b>Home Page:</b>&nbsp;<a href=\"%1\"><nobr>%2</nobr></a>"
-msgstr "<br><b>主页：</b>&nbsp;<a href=\"%1\"><nobr>%2</nobr></a>"
+#: kopete/contactlist/kopetecontactlistview.cpp:470
+msgid "Create New Group..."
+msgstr "创建新组..."
 
-#: libkopete/kopetecontact.cpp:710
-#, c-format
-msgid ""
-"_: "
-"<br><b>Away Message:</b>&nbsp;FORMATTED AWAY MESSAGE\n"
-"<br><b>Away&nbsp;Message:</b>&nbsp;%1"
-msgstr "<br><b>离开消息：</b>&nbsp;%1"
+#: kopete/contactlist/kopetecontactlistview.cpp:478
+msgid "&Move To"
+msgstr "移动到(&M)"
 
-#: libkopete/kopetecontact.cpp:747
+#: kopete/contactlist/kopetecontactlistview.cpp:480
+msgid "&Copy To"
+msgstr "复制到(&C)"
+
+#: kopete/contactlist/kopetecontactlistview.cpp:485
+msgid "Send Email..."
+msgstr "发送邮件..."
+
+#: kopete/contactlist/kopetecontactlistview.cpp:488
+#: kopete/contactlist/kopetecontactlistview.cpp:1395
+msgid "Rename"
+msgstr "重命名"
+
+#. i18n: file ./protocols/irc/ui/ircadd.ui line 34
+#: kopete/contactlist/kopetecontactlistview.cpp:493
+#: kopete/kopetewindow.cpp:208 rc.cpp:4650
+#, no-c-format
+msgid "&Add Contact"
+msgstr "添加联系人(&A)"
+
+#: kopete/contactlist/kopetecontactlistview.cpp:495
+msgid "Select Account"
+msgstr "选择账户"
+
+#: kopete/contactlist/kopetecontactlistview.cpp:497
+msgid "Add to Your Contact List"
+msgstr "添加到您的联系人列表"
+
+#. i18n: file ./protocols/groupwise/ui/gwchatsearchwidget.ui line 79
+#: kopete/contactlist/kopetecontactlistview.cpp:505 rc.cpp:4122
+#, no-c-format
+msgid "&Properties"
+msgstr "属性(&P)"
+
+#: kopete/contactlist/kopetecontactlistview.cpp:690
 msgid ""
-"_: "
-"<br><b>PROPERTY LABEL:</b>&nbsp;PROPERTY VALUE\n"
-"<br><nobr><b>%2:</b></nobr>&nbsp;%1"
-msgstr "<br><nobr><b>%2:</b></nobr>&nbsp;%1"
+"_: Translators: format: '<nickname> (<online status>)'\n"
+"%1 (%2)"
+msgstr "%1 (%2)"
 
-#: libkopete/kopetecontact.cpp:770
+#: kopete/contactlist/kopetecontactlistview.cpp:715
 msgid ""
-"_: firstName lastName\n"
-"%2 %1"
-msgstr "%2 %1"
+"_: Translators: format: '<displayName> (<id>)'\n"
+"%2 <%1>"
+msgstr "%2 <%1>"
 
-#: libkopete/kopetecontact.cpp:806
+#. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 479
+#: kopete/contactlist/kopetecontactlistview.cpp:760
+#: kopete/contactlist/kopetecontactlistview.cpp:991
+#: kopete/contactlist/kopetecontactlistview.cpp:1007
+#: kopete/contactlist/kopetecontactlistview.cpp:1477 kopete/main.cpp:52
+#: protocols/irc/ui/irceditaccountwidget.cpp:275
+#: protocols/oscar/liboscar/userdetails.cpp:323 rc.cpp:3064
+#, no-c-format
+msgid "Kopete"
+msgstr "Kopete"
+
+#: kopete/contactlist/kopetecontactlistview.cpp:989
 msgid ""
-"_: <days>d <hours>h <minutes>m <seconds>s\n"
-"%4d %3h %2m %1s"
-msgstr "%4天%3小时%2分%1秒"
+"<qt>Would you like to add <b>%1</b> to your contact list as a member of <b>"
+"%2</b>?</qt>"
+msgstr "<qt>您想把 <b>%1</1> 添加到您的联系人列表中作为 <b>%2</b> 的成员吗？</qt>"
 
-#: libkopete/kopetecontact.cpp:814
+#: kopete/contactlist/kopetecontactlistview.cpp:991
+#: kopete/contactlist/kopetecontactlistview.cpp:1007
+#: kopete/contactlist/kopetecontactlistview.cpp:1477
+#: protocols/oscar/aim/aimprotocol.cpp:193
+#: protocols/oscar/icq/icqprotocol.cpp:148
+msgid "Do Not Add"
+msgstr "不添加"
+
+#: kopete/contactlist/kopetecontactlistview.cpp:1005
 msgid ""
-"_: <hours>h <minutes>m <seconds>s\n"
-"%3h %2m %1s"
-msgstr "%3小时%2分%1秒"
+"<qt>Would you like to add <b>%1</b> to your contact list as a child contact of "
+"<b>%2</b>?</qt>"
+msgstr "<qt>您想把 <b>%1</1> 添加到您的联系人列表中作为 <b>%2</b> 的子联系人吗？</qt>"
 
-#: libkopete/kopetecontact.cpp:821
-#, fuzzy, c-format
+#: kopete/contactlist/kopetecontactlistview.cpp:1056
 msgid ""
-"_: <minutes>m <seconds>s\n"
-"%2m %1s"
-msgstr "%2分%1秒"
+"<qt>This contact is already on your contact list. It is a child contact of <b>"
+"%1</b></qt>"
+msgstr "<qt>此联系人已经位于您的联系人列表中。它是 <b>%1</b> 的子联系人</qt>"
 
-#: libkopete/private/kopetecommand.cpp:64
-msgid "Enter Arguments"
-msgstr "输入参数"
+#: kopete/contactlist/kopetecontactlistview.cpp:1374
+msgid "Rename Contact"
+msgstr "重命名联系人"
 
-#: libkopete/private/kopetecommand.cpp:64
-msgid "Enter the arguments to %1:"
-msgstr "输入 %1 的参数："
+#: kopete/contactlist/kopetecontactlistview.cpp:1375
+#: libkopete/kopetecontact.cpp:461
+msgid "Remove Contact"
+msgstr "删除联系人"
 
-#: libkopete/private/kopetecommand.cpp:77
-msgid "Alias \"%1\" expands to itself."
-msgstr "别名“%1”自行展开。"
+#: kopete/contactlist/kopetecontactlistview.cpp:1376
+msgid "Send Single Message..."
+msgstr "发送单条消息..."
 
-#: libkopete/private/kopetecommand.cpp:82
+#: kopete/contactlist/kopetecontactlistview.cpp:1379
+msgid "&Add Subcontact"
+msgstr "添加子联系人(&A)"
+
+#: kopete/contactlist/kopetecontactlistview.cpp:1384
+msgid "Rename Group"
+msgstr "重命名组"
+
+#: kopete/contactlist/kopetecontactlistview.cpp:1385
+msgid "Remove Group"
+msgstr "删除组"
+
+#: kopete/contactlist/kopetecontactlistview.cpp:1386
+msgid "Send Message to Group"
+msgstr "发送群组消息"
+
+#: kopete/contactlist/kopetecontactlistview.cpp:1390
+msgid "&Add Contact to Group"
+msgstr "将联系人添加到组中(&A)"
+
+#: kopete/contactlist/kopetecontactlistview.cpp:1448
+msgid "There is no email address set for this contact in the TDE address book."
+msgstr "没有在 TDE 地址簿中为此联系人设置电子邮件地址。"
+
+#: kopete/contactlist/kopetecontactlistview.cpp:1448
+msgid "No Email Address in Address Book"
+msgstr "地址簿中无电子邮件地址"
+
+#: kopete/contactlist/kopetecontactlistview.cpp:1451
 msgid ""
-"_n: \"%1\" requires at least %n argument.\n"
-"\"%1\" requires at least %n arguments."
-msgstr "“%1”至少需要 %n 个参数。"
+"This contact was not found in the TDE address book. Check that a contact is "
+"selected in the properties dialog."
+msgstr "并未在 TDE 地址簿中找到此联系人。请确定已经在属性对话框中选中了该联系人。"
 
-#: libkopete/private/kopetecommand.cpp:88
+#: kopete/contactlist/kopetecontactlistview.cpp:1454
 msgid ""
-"_n: \"%1\" has a maximum of %n argument.\n"
-"\"%1\" has a maximum of %n arguments."
-msgstr "“%1”最多有 %n 个参数。"
+"This contact is not associated with a TDE address book entry, where the email "
+"address is stored. Check that a contact is selected in the properties dialog."
+msgstr "此联系人不与 TDE 地址簿中的任何一项关联，后者用于存储电子邮件地址。请确定已经在属性对话框中选中了该联系人。"
 
-#: libkopete/private/kopetecommand.cpp:93
-msgid "You are not authorized to perform the command \"%1\"."
-msgstr "您不能执行命令“%1”。"
+#: kopete/contactlist/kopetecontactlistview.cpp:1476
+msgid "<qt>Would you like to add this contact to your contact list?</qt>"
+msgstr "<qt>您想把这个联系人添加到您的联系人列表中吗？</qt>"
 
-#: libkopete/private/kopetecommand.cpp:132
-msgid "Command Error"
-msgstr "命令错误"
+#: kopete/contactlist/kopetecontactlistview.cpp:1556
+msgid ""
+"<qt>Are you sure you want to remove the contact <b>%1</b> "
+"from your contact list?</qt>"
+msgstr "<qt>您确定想要从联系人列表中删除联系人 <b>%1</b> 吗？</qt>"
 
-#: libkopete/private/kopeteviewmanager.cpp:225
-msgid "<qt>Incoming message from %1<br>\"%2\"</qt>"
-msgstr "<qt>收到来自 %1 的消息<br>“%2”</qt>"
+#: kopete/contactlist/kopetecontactlistview.cpp:1562
+msgid ""
+"<qt>Are you sure you want to remove the group <b>%1</b> "
+"and all contacts that are contained within it?</qt>"
+msgstr "<qt>您确定想要删除组 <b>%1</b> 以及其中包含的所有联系人吗？</qt>"
 
-#: libkopete/private/kopeteviewmanager.cpp:234
-msgid "<qt>A highlighted message arrived from %1<br>\"%2\"</qt>"
-msgstr "<qt>来自 %1 突出显示的消息<br>“%2”</qt>"
+#: kopete/contactlist/kopetecontactlistview.cpp:1579
+msgid "Are you sure you want to remove these contacts from your contact list?"
+msgstr "您确定想要从联系人列表中删除这些联系人吗？"
 
-#: libkopete/kopeteglobal.cpp:112 protocols/irc/ircprotocol.cpp:160
-msgid "Full Name"
-msgstr "全名"
+#: kopete/contactlist/kopetecontactlistview.cpp:1581
+msgid ""
+"Are you sure you want to remove these groups and contacts from your contact "
+"list?"
+msgstr "您确定想要从联系人列表中删除这些组和联系人吗？"
 
-#: libkopete/kopeteglobal.cpp:118
-msgid "Idle Time"
-msgstr "发呆时长"
+#: kopete/contactlist/kopetecontactlistview.cpp:1689
+#: kopete/kopetewindow.cpp:1061
+msgid "Add Contact"
+msgstr "添加联系人"
 
-#: libkopete/kopeteglobal.cpp:124
-msgid "Online Since"
-msgstr "上线时间"
+#: kopete/contactlist/tdeabcexport.cpp:90
+msgid "No writeable addressbook resource found."
+msgstr "未找到可写的地址簿资源。"
 
-#: libkopete/kopeteglobal.cpp:130
-msgid "Last Seen"
-msgstr "上次遇见"
+#: kopete/contactlist/tdeabcexport.cpp:91
+msgid "Add or enable one using the Trinity Control Center."
+msgstr "使用 TDE 控制中心添加或启用。"
 
-#: libkopete/kopeteglobal.cpp:136
-msgid "Away Message"
-msgstr "离开消息"
+#: kopete/contactlist/tdeabcexport.cpp:102
+msgid " (already in address book)"
+msgstr " (已在地址簿中)"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 383
-#: libkopete/kopeteglobal.cpp:142 rc.cpp:3550 rc.cpp:4728 rc.cpp:5066
-#, no-c-format
-msgid "First Name"
-msgstr "名"
+#: kopete/contactlist/kopetemetacontactlvi.cpp:134
+msgid ""
+"_: "
+"<tr>"
+"<td>STATUS ICON <b>PROTOCOL NAME</b> (ACCOUNT NAME)</td>"
+"<td>STATUS DESCRIPTION</td></tr>\n"
+"<tr>"
+"<td><img src=\"%1\">&nbsp;<nobr><b>%2</b></nobr>&nbsp;<nobr>(%3)</nobr></td>"
+"<td align=\"right\"><nobr>%4</nobr></td></tr>"
+msgstr ""
+"<tr>"
+"<td><img src=\"%1\">&nbsp;<nobr><b>%2</b></nobr>&nbsp;<nobr>(%3)</nobr></td>"
+"<td align=\"right\"><nobr>%4</nobr></td></tr>"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 394
-#: libkopete/kopeteglobal.cpp:148 rc.cpp:3553 rc.cpp:4731 rc.cpp:5069
+#: kopete/contactlist/kopetemetacontactlvi.cpp:384
+msgid "<qt><i>%1</i> is now %2.</qt>"
+msgstr "<qt><i>%1</i> 现在是 %2。</qt>"
+
+#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 16
+#: kopete/contactlist/kopetemetacontactlvi.cpp:441
+#: kopete/contactlist/kopetemetacontactlvi.cpp:445 rc.cpp:1269
 #, no-c-format
-msgid "Last Name"
-msgstr "姓"
+msgid "Chat"
+msgstr "聊天"
 
-#: libkopete/kopeteglobal.cpp:154
-msgid "Private Phone"
-msgstr "私人电话"
+#: kopete/contactlist/kopeteaddrbookexport.cpp:76
+#: kopete/contactlist/kopeteaddrbookexport.cpp:83
+#: kopete/contactlist/kopeteaddrbookexport.cpp:90
+#: kopete/contactlist/kopeteaddrbookexport.cpp:99
+#: kopete/contactlist/kopeteaddrbookexport.cpp:119
+msgid "<Not Set>"
+msgstr "<未设置>"
 
-#: libkopete/kopeteglobal.cpp:160
-msgid "Private Mobile Phone"
-msgstr "私人移动电话"
+#: kopete/contactlist/kopeteaddrbookexport.cpp:177
+msgid "Export to Address Book"
+msgstr "导出到地址簿"
 
-#: libkopete/kopeteglobal.cpp:166
-msgid "Work Phone"
-msgstr "工作电话"
+#: kopete/contactlist/kopeteaddrbookexport.cpp:181
+msgid "Set address book fields using the selected data from Kopete"
+msgstr "将地址簿域设置为使用 Kopete 中选中的数据"
 
-#: libkopete/kopeteglobal.cpp:172
-msgid "Work Mobile Phone"
-msgstr "工作移动电话"
+#: kopete/contactlist/kopetegroupviewitem.cpp:169
+msgid ""
+"_: (NUMBER OF ONLINE CONTACTS/NUMBER OF CONTACTS IN GROUP)\n"
+"(%1/%2)"
+msgstr "(%1/%2)"
 
-#: libkopete/kopeteglobal.cpp:178
-#: protocols/groupwise/ui/gwcontactproperties.cpp:116
-msgid "Email Address"
-msgstr "电子邮件地址"
+#: kopete/contactlist/kopetegrouplistaction.cpp:62
+#: libkopete/kopetegroup.cpp:47
+msgid "Top Level"
+msgstr "顶级"
 
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 439
-#: libkopete/kopeteglobal.cpp:184 rc.cpp:3259
-#, no-c-format
-msgid "Nick Name"
-msgstr "昵称"
+#: kopete/contactlist/kopetelviprops.cpp:69
+#, c-format
+msgid "Properties of Group %1"
+msgstr "组 %1 的属性"
 
-#. i18n: file ./libkopete/ui/addressbookselectorwidget_base.ui line 77
-#: libkopete/kopeteglobal.cpp:190 rc.cpp:110 rc.cpp:1079 rc.cpp:4359
-#, no-c-format
-msgid "Photo"
-msgstr "照片"
+#: kopete/contactlist/kopetelviprops.cpp:76
+#: kopete/contactlist/kopetelviprops.cpp:169
+msgid "Custom &Notifications"
+msgstr "自定义通知(&N)"
 
-#: libkopete/kopeteglobal.cpp:232
-msgid "Could not find suitable place to install emoticon themes into."
-msgstr "找不到合适的位置来安装表情主题。"
+#: kopete/contactlist/kopetelviprops.cpp:149
+#, c-format
+msgid "Properties of Meta Contact %1"
+msgstr "超级联系人 %1 的属性"
 
-#: libkopete/kopeteglobal.cpp:238
-msgid "Installing Emoticon Themes..."
-msgstr "正在安装表情主题..."
+#: kopete/contactlist/kopetelviprops.cpp:164
+msgid "Sync KABC..."
+msgstr "同步 KABC..."
 
-#: libkopete/kopeteglobal.cpp:260
-msgid "Could not open \"%1\" for unpacking."
-msgstr "无法打开“%1”解包。"
+#: kopete/config/identity/kopeteidentityconfig.cpp:367
+#: kopete/contactlist/kopetelviprops.cpp:357
+msgid "No Contacts with Photo Support"
+msgstr "没有支持照片的联系人"
 
-#: libkopete/kopeteglobal.cpp:285
-msgid "<qt>The file \"%1\" is not a valid emoticon theme archive.</qt>"
-msgstr "<qt>文件“%1”不是有效的表情主题存档。</qt>"
+#: kopete/contactlist/kopetelviprops.cpp:513
+msgid "No contacts were imported from the address book."
+msgstr "没有从地址簿中导入联系人。"
 
-#: libkopete/kopeteglobal.cpp:296
-msgid "<qt>Installing <strong>%1</strong> emoticon theme</qt>"
-msgstr "<qt>安装 <strong>%1</strong> 表情主题</qt>"
+#: kopete/contactlist/kopetelviprops.cpp:514
+msgid "No Change"
+msgstr "无更改"
 
-#: libkopete/kopeteglobal.cpp:334
+#: kopete/kopeteiface.cpp:160
 msgid ""
-"<qt>A problem occurred during the installation process. However, some of the "
-"emoticon themes in the archive may have been installed.</qt>"
-msgstr "<qt>安装过程中出现了问题。但是，可能已经安装了压缩包中的某些表情主题。</qt>"
+"An external application is attempting to add the  '%1' contact '%2' to your "
+"contact list. Do you want to allow this?"
+msgstr "外部应用程序试图将“%1”联系人“%2”添加到您的联系人列表中。您允许吗？"
 
-#: _translatorinfo.cpp:1 kopete/main.cpp:95
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "TDE 简体中文翻译组,,Launchpad Contributions:,Funda Wang,Lie_Ex,Tao Wei"
+#: kopete/kopeteiface.cpp:162
+msgid "Allow Contact?"
+msgstr "允许联系人？"
+
+#: kopete/kopeteiface.cpp:162
+msgid "Allow"
+msgstr "允许"
+
+#: kopete/kopeteiface.cpp:162
+msgid "Reject"
+msgstr "拒绝"
 
-#: _translatorinfo.cpp:3 kopete/main.cpp:96
+#: kopete/kopeteiface.cpp:175
 msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr ""
-"i18n-translation@lists.linux.net.cn,,,,lilith.ex@gmail.com,weitao1979@gmail.com"
+"An external application has attempted to add a contact using  the %1 protocol, "
+"which either does not exist or is not loaded."
+msgstr "外部应用程序试图使用 %1 协议添加联系人，而该协议不存在或未装入。"
+
+#: kopete/kopeteiface.cpp:177
+msgid "Missing Protocol"
+msgstr "缺少协议"
 
 #: kopete/systemtray.cpp:304
 msgid ""
@@ -973,21 +1518,28 @@ msgid ""
 "<br><nobr>\"%2\"</nobr></qt>"
 msgstr "<qt><nobr><b>来自 %1 的新消息：</b></nobr><br><nobr>“%2”</nobr></qt>"
 
+#: kopete/kopeteballoon.cpp:98
+msgid ""
+"_: to view\n"
+"View"
+msgstr "查看"
+
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 602
+#: kopete/kopeteballoon.cpp:100 protocols/yahoo/yahooaccount.cpp:1231
+#: protocols/yahoo/yahooaccount.cpp:1685 protocols/yahoo/yahooaccount.cpp:1896
+#: rc.cpp:4875 rc.cpp:4890 rc.cpp:4908 rc.cpp:4926
+#, no-c-format
+msgid "Ignore"
+msgstr "忽略"
+
 #: kopete/kopetewindow.cpp:145
 msgid "Global status message"
 msgstr "全局状态消息"
 
-#. i18n: file ./protocols/irc/ui/ircadd.ui line 34
-#: kopete/contactlist/kopetecontactlistview.cpp:493
-#: kopete/kopetewindow.cpp:208 rc.cpp:2260
-#, no-c-format
-msgid "&Add Contact"
-msgstr "添加联系人(&A)"
-
 #. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 122
 #: kopete/kopetewindow.cpp:222 protocols/gadu/gaduprotocol.cpp:59
 #: protocols/groupwise/gwprotocol.cpp:48
-#: protocols/oscar/icq/icqpresence.cpp:71 rc.cpp:3036
+#: protocols/oscar/icq/icqpresence.cpp:71 rc.cpp:4292
 #, no-c-format
 msgid "O&ffline"
 msgstr "离线(&F)"
@@ -997,19 +1549,19 @@ msgid "&Export Contacts..."
 msgstr "导出联系人(&E)..."
 
 #: kopete/kopetewindow.cpp:240 protocols/groupwise/gwprotocol.cpp:54
-#: protocols/msn/msnprotocol.cpp:55 protocols/oscar/icq/icqpresence.cpp:75
+#: protocols/oscar/icq/icqpresence.cpp:75
 msgid "&Away"
 msgstr "离开(&A)"
 
 #. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 88
 #: kopete/kopetewindow.cpp:244 protocols/groupwise/gwprotocol.cpp:52
-#: protocols/msn/msnprotocol.cpp:53 rc.cpp:3018
+#: rc.cpp:4274
 #, no-c-format
 msgid "&Busy"
 msgstr "忙碌(&B)"
 
 #. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 105
-#: kopete/kopetewindow.cpp:249 protocols/msn/msnprotocol.cpp:59 rc.cpp:3027
+#: kopete/kopetewindow.cpp:249 rc.cpp:4283
 #, no-c-format
 msgid "&Invisible"
 msgstr "隐身(&I)"
@@ -1017,7 +1569,7 @@ msgstr "隐身(&I)"
 #. i18n: file ./protocols/yahoo/ui/yahoostealthsetting.ui line 61
 #: kopete/kopetewindow.cpp:260 protocols/gadu/gaduprotocol.cpp:71
 #: protocols/gadu/gaduprotocol.cpp:73 protocols/groupwise/gwprotocol.cpp:50
-#: rc.cpp:3974
+#: rc.cpp:2203
 #, no-c-format
 msgid "&Online"
 msgstr "在线(&O)"
@@ -1055,13 +1607,13 @@ msgid "Se&arch:"
 msgstr "搜索(&A)："
 
 #. i18n: file ./kopete/kopeteui.rc line 55
-#: kopete/kopetewindow.cpp:303 rc.cpp:908
+#: kopete/kopetewindow.cpp:303 rc.cpp:1838
 #, no-c-format
 msgid "Quick Search Bar"
 msgstr "快速搜索栏"
 
 #. i18n: file ./plugins/history/historyviewer.ui line 89
-#: kopete/kopetewindow.cpp:304 rc.cpp:1768
+#: kopete/kopetewindow.cpp:304 rc.cpp:466
 #, no-c-format
 msgid "Search:"
 msgstr "搜索："
@@ -1087,7 +1639,7 @@ msgid "Set Status Message"
 msgstr "设定状态消息"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 284
-#: kopete/kopetewindow.cpp:330 rc.cpp:5327
+#: kopete/kopetewindow.cpp:330 rc.cpp:3834
 #, no-c-format
 msgid "Read Message"
 msgstr "阅读消息"
@@ -1133,43 +1685,371 @@ msgstr ""
 "<nobr><img src=\"kopete-account-icon:%3:%4\"> <b>%1:</b> %2 (<i>%5</i>)"
 "<br/>"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1689
-#: kopete/kopetewindow.cpp:1059
-msgid "Add Contact"
-msgstr "添加联系人"
+#: kopete/kopetewindow.cpp:1000 libkopete/kopeteawayaction.cpp:85
+msgid "No Message"
+msgstr "无消息"
 
-#: kopete/kimifaceimpl.cpp:383
+#: kopete/config/plugins/kopetepluginconfig.cpp:43
+msgid "Configure Plugins"
+msgstr "配置插件"
+
+#: kopete/config/plugins/kopetepluginconfig.cpp:44
+msgid "&Reset"
+msgstr "重置(&R)"
+
+#: kopete/config/plugins/kopetepluginconfig.cpp:62
+msgid "General Plugins"
+msgstr "常规插件"
+
+#. i18n: file ./kopete/contactlist/kopetegvipropswidget.ui line 31
+#: kopete/config/behavior/behaviorconfig.cpp:59 rc.cpp:827 rc.cpp:845
+#: rc.cpp:2818
+#, no-c-format
+msgid "&General"
+msgstr "常规(&G)"
+
+#: kopete/config/behavior/behaviorconfig.cpp:63
+msgid "&Events"
+msgstr "事件(&E)"
+
+#: kopete/config/behavior/behaviorconfig.cpp:67
+msgid "A&way Settings"
+msgstr "离开设置(&W)"
+
+#: kopete/config/behavior/behaviorconfig.cpp:71
+msgid "Cha&t"
+msgstr "聊天(&T)"
+
+#: kopete/config/avdevice/avdeviceconfig.cpp:69
+msgid "&Video"
+msgstr "视频(&V)"
+
+#: kopete/config/appearance/appearanceconfig.cpp:152
+#: kopete/config/appearance/appearanceconfig.cpp:653
+msgid "The Chat Window style was successfully installed."
+msgstr "聊天窗口已经成功安装。"
+
+#: kopete/config/appearance/appearanceconfig.cpp:152
+#: kopete/config/appearance/appearanceconfig.cpp:653
+msgid "Install successful"
+msgstr "安装成功"
+
+#: kopete/config/appearance/appearanceconfig.cpp:157
+#: kopete/config/appearance/appearanceconfig.cpp:640
 msgid ""
-"Another TDE application tried to use Kopete for instant messaging, but Kopete "
-"could not find the specified contact in the TDE address book."
-msgstr "另外一个 TDE 应用程序想要使用 Kopete 进行即时通讯。但 Kopete 无法在 TDE 地址簿中找到指定联系人。"
+"The specified archive cannot be opened.\n"
+"Make sure that the archive is valid ZIP or TAR archive."
+msgstr ""
+"无法打开指定的存档。\n"
+"请确定存档是有效的 ZIP 或 TAR 压缩包。"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1451
-#: kopete/contactlist/kopetecontactlistview.cpp:1454
-#: kopete/kimifaceimpl.cpp:383
-msgid "Not Found in Address Book"
-msgstr "未在地址簿中找到"
+#: kopete/config/appearance/appearanceconfig.cpp:157
+msgid "Cannot open archive"
+msgstr "无法打开存档"
 
-#: kopete/kimifaceimpl.cpp:388
+#: kopete/config/appearance/appearanceconfig.cpp:162
+#: kopete/config/appearance/appearanceconfig.cpp:645
 msgid ""
-"_: Translators: %1 is the name of a person taken from the TDE address book, who "
-"Kopete doesn't know about.  Kopete must either be told that an existing contact "
-"in Kopete is this person, or add a new contact for them\n"
-"<qt>"
-"<p>The TDE Address Book has no instant messaging information for</p>"
-"<p><b>%1</b>.</p>"
-"<p>If he/she is already present in the Kopete contact list, indicate the "
-"correct addressbook entry in their properties.</p>"
-"<p>Otherwise, add a new contact using the Add Contact wizard.</p></qt>"
+"Could not find a suitable place to install the Chat Window style in user "
+"directory."
+msgstr "无法在用户中目录中找到合适的位置来安装聊天窗口样式。"
+
+#: kopete/config/appearance/appearanceconfig.cpp:162
+msgid "Cannot find styles directory"
+msgstr "找不到样式目录"
+
+#: kopete/config/appearance/appearanceconfig.cpp:167
+#: kopete/config/appearance/appearanceconfig.cpp:649
+msgid "The specified archive does not contain a valid Chat Window style."
+msgstr "指定的存档不包含有效的聊天窗口样式。"
+
+#: kopete/config/appearance/appearanceconfig.cpp:167
+#: kopete/config/appearance/appearanceconfig.cpp:649
+msgid "Invalid Style"
+msgstr "无效的样式"
+
+#: kopete/config/appearance/appearanceconfig.cpp:174
+#: kopete/config/appearance/appearanceconfig.cpp:659
+msgid "An unknow error occurred while trying to install the Chat Window style."
+msgstr "试图安装聊天窗口样式时发生了未知错误。"
+
+#: kopete/config/appearance/appearanceconfig.cpp:174
+#: kopete/config/appearance/appearanceconfig.cpp:659
+msgid "Unknow error"
+msgstr "未知错误"
+
+#: kopete/config/appearance/appearanceconfig.cpp:212
+msgid "&Emoticons"
+msgstr "表情(&E)"
+
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 33
+#: kopete/config/appearance/appearanceconfig.cpp:251 rc.cpp:1464
+#, no-c-format
+msgid "Chat Window"
+msgstr "聊天窗口"
+
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 190
+#: kopete/config/appearance/appearanceconfig.cpp:287 rc.cpp:1497
+#, no-c-format
+msgid "Contact List"
+msgstr "联系人列表"
+
+#: kopete/config/appearance/appearanceconfig.cpp:325
+msgid "Colors && Fonts"
+msgstr "颜色和字体"
+
+#: kopete/config/appearance/appearanceconfig.cpp:589
+msgid "(No Variant)"
+msgstr "(没有样式变体)"
+
+#: kopete/config/appearance/appearanceconfig.cpp:627
+msgid "Choose Chat Window style to install."
+msgstr "选择要安装的聊天窗口样式。"
+
+#: kopete/config/appearance/appearanceconfig.cpp:640
+msgid "Can't open archive"
+msgstr "无法打开存档"
+
+#: kopete/config/appearance/appearanceconfig.cpp:645
+msgid "Can't find styles directory"
+msgstr "找不到样式目录"
+
+#: kopete/config/appearance/appearanceconfig.cpp:676
+msgid ""
+"_: It's the deleted style name\n"
+"The style %1 was successfully deleted."
+msgstr "样式 %1 已经成功删除。"
+
+#: kopete/config/appearance/appearanceconfig.cpp:685
+msgid ""
+"_: It's the deleted style name\n"
+"An error occured while trying to delete %1 style."
+msgstr "试图删除 %1 样式时发生了错误。"
+
+#: kopete/config/appearance/appearanceconfig.cpp:743
+msgid ""
+"_: This is the myself preview contact id\n"
+"myself@preview"
+msgstr "myself@preview"
+
+#: kopete/config/appearance/appearanceconfig.cpp:744
+msgid ""
+"_: This is the myself preview contact nickname\n"
+"Myself"
+msgstr "我自己"
+
+#: kopete/config/appearance/appearanceconfig.cpp:746
+msgid ""
+"_: This is the other preview contact id\n"
+"jack@preview"
+msgstr "zhangsan@preview"
+
+#: kopete/config/appearance/appearanceconfig.cpp:747
+msgid ""
+"_: This is the other preview contact nickname\n"
+"Jack"
+msgstr "张三"
+
+#: kopete/config/appearance/appearanceconfig.cpp:748
+msgid "Myself"
+msgstr "我自己"
+
+#: kopete/config/appearance/appearanceconfig.cpp:750
+msgid "Jack"
+msgstr "张三"
+
+#: kopete/config/appearance/appearanceconfig.cpp:762
+msgid "Hello, this is an incoming message :-)"
+msgstr "你好，这是收到的消息 :-)"
+
+#: kopete/config/appearance/appearanceconfig.cpp:763
+msgid "Hello, this is an incoming consecutive message."
+msgstr "你好，这是收到的消息 :-)。"
+
+#: kopete/config/appearance/appearanceconfig.cpp:765
+msgid "Ok, this is an outgoing message"
+msgstr "好的，这是发出的消息"
+
+#: kopete/config/appearance/appearanceconfig.cpp:766
+msgid "Ok, a outgoing consecutive message."
+msgstr "好的，这是发出的消息。"
+
+#: kopete/config/appearance/appearanceconfig.cpp:768
+msgid "Here is an incoming colored message"
+msgstr "这是收到的彩色消息"
+
+#: kopete/config/appearance/appearanceconfig.cpp:771
+msgid "This is an internal message"
+msgstr "这是内部消息"
+
+#: kopete/config/appearance/appearanceconfig.cpp:772
+msgid "performed an action"
+msgstr "执行了操作"
+
+#: kopete/config/appearance/appearanceconfig.cpp:774
+msgid "This is a highlighted message"
+msgstr "这是突出显示的消息"
+
+#: kopete/config/appearance/appearanceconfig.cpp:777
+msgid ""
+"_: This special UTF-8 string is to test if the style support Right-to-Left "
+"language display.\n"
+"הודעות טקסט"
+msgstr "הודעות טקסט"
+
+#: kopete/config/appearance/appearanceconfig.cpp:778
+msgid ""
+"That message was in a Right-to-Left language, which Kopete also supports."
+msgstr "此消息使用从右到左语言书写，Kopete 同样支持它。"
+
+#: kopete/config/appearance/appearanceconfig.cpp:779
+msgid "Bye"
+msgstr "再见"
+
+#: kopete/config/appearance/appearanceconfig.cpp:814
+msgid "Drag or Type Emoticon Theme URL"
+msgstr "拖曳或输入表情主题 URL"
+
+#: kopete/config/appearance/appearanceconfig.cpp:821
+msgid "Sorry, emoticon themes must be installed from local files."
+msgstr "抱歉，必须从本地文件中安装表情主题。"
+
+#: kopete/config/appearance/appearanceconfig.cpp:822
+msgid "Could Not Install Emoticon Theme"
+msgstr "无法安装表情主题"
+
+#: kopete/config/appearance/appearanceconfig.cpp:838
+msgid ""
+"<qt>Are you sure you want to remove the <strong>%1</strong> emoticon theme?"
+"<br>"
+"<br>This will delete the files installed by this theme.</qt>"
+msgstr "<qt>您确定想要删除 <b>%1</b> 表情主题吗？<br><br>这将删除删除该主题所安装的全部文件。</qt>"
+
+#: kopete/config/appearance/appearanceconfig.cpp:844
+msgid "Confirmation"
+msgstr "确认"
+
+#: kopete/config/appearance/appearanceconfig.cpp:865
+#: kopete/config/appearance/appearanceconfig.cpp:867
+msgid "Get New Emoticons"
+msgstr "获得新表情"
+
+#: kopete/config/appearance/tooltipeditdialog.cpp:56
+msgid "Tooltip Editor"
+msgstr "工具提示编辑器"
+
+#: kopete/config/appearance/emoticonseditdialog.cpp:58
+msgid ""
+"Insert the string for the emoticon\n"
+"separated by space if you want multiple strings"
 msgstr ""
-"<qt>"
-"<p>TDE 地址簿中没有 <b>%1</b> 的即时通讯信息。</p>"
-"<p>如果他/她已经出现在 Kopete 联系人列表中，表明其属性中有正确的地址簿项。</p>"
-"<p>否则，请使用添加联系人向导添加新联系人。</p></qt>"
 
-#: kopete/kimifaceimpl.cpp:390
-msgid "No Instant Messaging Address"
-msgstr "无即时通讯地址"
+#: kopete/config/appearance/emoticonseditdialog.cpp:82
+#, fuzzy
+msgid "Emoticons Editor"
+msgstr "表情(&E)"
+
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 167
+#: kopete/config/appearance/emoticonseditdialog.cpp:90
+#: protocols/gadu/gaducontact.cpp:204 rc.cpp:269 rc.cpp:1524
+#, no-c-format
+msgid "Edit..."
+msgstr "编辑..."
+
+#: kopete/config/identity/kopeteidentityconfig.cpp:416
+msgid "New Identity"
+msgstr "新建身份"
+
+#: kopete/config/identity/kopeteidentityconfig.cpp:416
+#: kopete/config/identity/kopeteidentityconfig.cpp:431
+#: kopete/config/identity/kopeteidentityconfig.cpp:456
+msgid "Identity name:"
+msgstr "身份名称："
+
+#: kopete/config/identity/kopeteidentityconfig.cpp:431
+msgid "Copy Identity"
+msgstr "复制身份"
+
+#: kopete/config/identity/kopeteidentityconfig.cpp:446
+#: kopete/config/identity/kopeteidentityconfig.cpp:474
+msgid "An identity with the same name was found."
+msgstr "找到了同名身份。"
+
+#: kopete/config/identity/kopeteidentityconfig.cpp:446
+#: kopete/config/identity/kopeteidentityconfig.cpp:474
+#: kopete/config/identity/kopeteidentityconfig.cpp:573
+#: kopete/config/identity/kopeteidentityconfig.cpp:582
+msgid "Identity Configuration"
+msgstr "身份配置"
+
+#: kopete/config/identity/kopeteidentityconfig.cpp:456
+msgid "Rename Identity"
+msgstr "重命名身份"
+
+#: kopete/config/identity/kopeteidentityconfig.cpp:506
+#: libkopete/ui/addressbooklinkwidget.cpp:81
+msgid "Addressbook Association"
+msgstr "地址簿关联"
+
+#: kopete/config/identity/kopeteidentityconfig.cpp:506
+msgid "Choose the person who is yourself."
+msgstr "选择您自己是谁。"
+
+#: kopete/config/identity/kopeteidentityconfig.cpp:572
+#: kopete/config/identity/kopeteidentityconfig.cpp:581
+msgid "An error occurred when trying to save the custom photo for %1 identity."
+msgstr "试图保存 %1 身份的自定义照片时发生了错误。"
+
+#: kopete/config/identity/globalidentitiesmanager.cpp:164
+msgid "Default Identity"
+msgstr "默认身份"
+
+#: kopete/config/accounts/kopeteaccountconfig.cpp:198
+#: libkopete/kopeteaccount.cpp:514
+msgid "Edit Account"
+msgstr "编辑账户"
+
+#: kopete/config/accounts/kopeteaccountconfig.cpp:234
+msgid "Are you sure you want to remove the account \"%1\"?"
+msgstr "您确定想要删除账户“%1”吗？"
+
+#: kopete/config/accounts/kopeteaccountconfig.cpp:235
+msgid "Remove Account"
+msgstr "删除账户"
+
+#: kopete/addaccountwizard/addaccountwizard.cpp:49
+msgid ""
+"_: 1st message shown to users on first run of Kopete. Please keep the "
+"formatting.\n"
+"<h2>Welcome to Kopete</h2>"
+"<p>Which messaging service do you want to connect to?</p>"
+msgstr "<h2>欢迎使用 Kopete</h2><p>您想要连接到哪种信使服务？</p>"
+
+#: kopete/addaccountwizard/addaccountwizard.cpp:56
+msgid ""
+"_: 2nd message shown to users on first run of Kopete. Please keep the "
+"formatting.\n"
+"<h2>Congratulations</h2>"
+"<p>You have finished configuring the account. You can add more accounts with <i>"
+"Settings->Configure</i>.  Please click the \"Finish\" button.</p>"
+msgstr "<h2>恭喜</h2><p>您已经配置完账户了。您可以使用<i>设置->配置</i>添加更多账户。请单击“完成”按钮。</p>"
+
+#: kopete/addaccountwizard/addaccountwizard.cpp:131
+msgid "Cannot load the %1 protocol plugin."
+msgstr "无法装入 %1 协议插件。"
+
+#: kopete/addaccountwizard/addaccountwizard.cpp:132
+#: kopete/addaccountwizard/addaccountwizard.cpp:141
+msgid "Error While Adding Account"
+msgstr "添加账户时出错"
+
+#: kopete/addaccountwizard/addaccountwizard.cpp:140
+msgid "This protocol does not currently support adding accounts."
+msgstr "此协议目前不支持添加账户。"
+
+#: kopete/addaccountwizard/addaccountwizard.cpp:145
+msgid "Step Two: Account Information"
+msgstr "第二步：账户信息"
 
 #: kopete/kopeteeditglobalidentitywidget.cpp:166
 #: kopete/kopeteeditglobalidentitywidget.cpp:173
@@ -1224,20 +2104,10 @@ msgstr ""
 msgid "URLs to pass to kopete / emoticon themes to install"
 msgstr "传递给 kopete 的 URL / 要安装的表情主题"
 
-#. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 479
-#: kopete/contactlist/kopetecontactlistview.cpp:760
-#: kopete/contactlist/kopetecontactlistview.cpp:991
-#: kopete/contactlist/kopetecontactlistview.cpp:1007
-#: kopete/contactlist/kopetecontactlistview.cpp:1477 kopete/main.cpp:52
-#: protocols/irc/ui/irceditaccountwidget.cpp:275
-#: protocols/msn/msncontact.cpp:321
-#: protocols/oscar/liboscar/userdetails.cpp:323 rc.cpp:4614
-#, no-c-format
-msgid "Kopete"
-msgstr "Kopete"
-
 #: kopete/main.cpp:54
+#, fuzzy
 msgid ""
+"(c) 2009-2010, Timothy Pearson\n"
 "(c) 2001-2004, Duncan Mac-Vicar Prett\n"
 "(c) 2002-2005, Kopete Development Team"
 msgstr ""
@@ -1249,4177 +2119,5236 @@ msgid "Developer and Project founder"
 msgstr "开发者和项目创立者"
 
 #: kopete/main.cpp:57
+#, fuzzy
+msgid "Developer, maintainer"
+msgstr "开发者，UI 维护者"
+
+#: kopete/main.cpp:58
 msgid "Developer, Yahoo plugin maintainer"
 msgstr "开发者，Yahoo 插件维护者"
 
-#: kopete/main.cpp:58 kopete/main.cpp:64
+#: kopete/main.cpp:59 kopete/main.cpp:65
 msgid "Developer"
 msgstr "开发者"
 
-#: kopete/main.cpp:59
+#: kopete/main.cpp:60
 msgid "Developer, Yahoo"
 msgstr "开发者，Yahoo"
 
-#: kopete/main.cpp:60
+#: kopete/main.cpp:61
 msgid "Developer, Connection status plugin author"
 msgstr "开发者，连接状态插件作者"
 
-#: kopete/main.cpp:61
+#: kopete/main.cpp:62
 msgid "Developer, Video device support"
 msgstr "开发者，视频设备支持"
 
-#: kopete/main.cpp:62
+#: kopete/main.cpp:63
 msgid "Developer, MSN"
 msgstr "开发者，MSN"
 
-#: kopete/main.cpp:63
+#: kopete/main.cpp:64
 msgid "Developer, Gadu plugin maintainer"
 msgstr "开发者，Gadu 插件维护者"
 
-#: kopete/main.cpp:65
+#: kopete/main.cpp:66
 msgid "Lead Developer, AIM and ICQ plugin maintainer"
 msgstr "首席开发者，AIM 和 ICQ 插件维护者"
 
-#: kopete/main.cpp:66
+#: kopete/main.cpp:67
 msgid "IRC plugin maintainer"
 msgstr "IRC 插件维护者"
 
-#: kopete/main.cpp:67
+#: kopete/main.cpp:68
 msgid "Lead Developer"
 msgstr "首席开发者"
 
-#: kopete/main.cpp:68
+#: kopete/main.cpp:69
 msgid "Lead Developer, MSN plugin maintainer"
 msgstr "首席开发者，MSN 插件维护者"
 
-#: kopete/main.cpp:69
+#: kopete/main.cpp:70
 msgid "Artist / Developer, Artwork maintainer"
 msgstr "美工/开发者，美工维护者"
 
-#: kopete/main.cpp:70
+#: kopete/main.cpp:71
 msgid "Developer, UI maintainer"
 msgstr "开发者，UI 维护者"
 
-#: kopete/main.cpp:71
+#: kopete/main.cpp:72
 msgid "Developer, Jabber plugin maintainer"
 msgstr "开发者，Jabber 插件维护者"
 
-#: kopete/main.cpp:72
+#: kopete/main.cpp:73
 msgid "Lead Developer, GroupWise maintainer"
 msgstr "首席开发者，GroupWise 维护者"
 
-#: kopete/main.cpp:74
+#: kopete/main.cpp:75
 msgid "Konki style author"
 msgstr "Konki 样式作者"
 
-#: kopete/main.cpp:75
+#: kopete/main.cpp:76
 msgid "Hacker style author"
 msgstr "Hacker 样式作者"
 
-#: kopete/main.cpp:76
+#: kopete/main.cpp:77
 msgid "Kopete's icon author"
 msgstr "Kopete 图标的作者"
 
-#: kopete/main.cpp:77
+#: kopete/main.cpp:78
 msgid "Sounds"
 msgstr "声音"
 
-#: kopete/main.cpp:78
+#: kopete/main.cpp:79
 msgid "Kopete Docugoddess, Bug and Patch Testing."
 msgstr "Kopete 文档女神，臭虫与补丁测试。"
 
-#: kopete/main.cpp:79
+#: kopete/main.cpp:80
 msgid "Iris Jabber Backend Library"
 msgstr "Iris Jabber 后端库"
 
-#: kopete/main.cpp:80
+#: kopete/main.cpp:81
 msgid "OscarSocket author"
 msgstr "OscarSocket 作者"
 
-#: kopete/main.cpp:81
+#: kopete/main.cpp:82
 msgid "Kmerlin MSN code"
 msgstr "Kmerlin MSN 编码"
 
-#: kopete/main.cpp:82
+#: kopete/main.cpp:83
 msgid "Former developer, project co-founder"
 msgstr "先前开发者，项目的联系创立者"
 
-#: kopete/main.cpp:83 kopete/main.cpp:84 kopete/main.cpp:85 kopete/main.cpp:86
-#: kopete/main.cpp:89 kopete/main.cpp:92
+#: kopete/main.cpp:84 kopete/main.cpp:85 kopete/main.cpp:86 kopete/main.cpp:87
+#: kopete/main.cpp:90 kopete/main.cpp:93
 msgid "Former developer"
 msgstr "先前开发者"
 
-#: kopete/main.cpp:87
+#: kopete/main.cpp:88
 msgid "Misc bugfixes and enhancements"
 msgstr "杂项、排错和少量增强"
 
-#: kopete/main.cpp:88
+#: kopete/main.cpp:89
 msgid "Former developer, original Gadu plugin author"
 msgstr "先前开发者，Gadu 插件原作者"
 
-#: kopete/main.cpp:90
+#: kopete/main.cpp:91
 msgid "Former developer, Jabber plugin author"
 msgstr "先前开发者，Jabber 插件作者"
 
-#: kopete/main.cpp:91
+#: kopete/main.cpp:92
 msgid "Former developer, Oscar plugin"
 msgstr "先前开发者，Oscar 插件"
 
-#: kopete/main.cpp:93
+#: kopete/main.cpp:94
 msgid "Former developer and WinPopup maintainer"
 msgstr "先前开发者，WinPopup 插件维护者"
 
-#: kopete/config/avdevice/avdeviceconfig.cpp:69
-msgid "&Video"
-msgstr "视频(&V)"
+#: protocols/winpopup/wpprotocol.cpp:144
+msgid "The Samba configuration file is modified."
+msgstr "Samba 配置文件已修改。"
 
-#. i18n: file ./kopete/contactlist/kopetegvipropswidget.ui line 31
-#: kopete/config/behavior/behaviorconfig.cpp:59 rc.cpp:1025 rc.cpp:1043
-#: rc.cpp:4338
-#, no-c-format
-msgid "&General"
-msgstr "常规(&G)"
+#: protocols/winpopup/wpprotocol.cpp:144
+msgid "Configuration Succeeded"
+msgstr "配置成功"
 
-#: kopete/config/behavior/behaviorconfig.cpp:63
-msgid "&Events"
-msgstr "事件(&E)"
+#: protocols/winpopup/wpprotocol.cpp:146
+msgid "Updating the Samba configuration file failed."
+msgstr "更新 Samba 配置文件失败。"
 
-#: kopete/config/behavior/behaviorconfig.cpp:67
-msgid "A&way Settings"
-msgstr "离开设置(&W)"
+#: protocols/winpopup/wpprotocol.cpp:146
+msgid "Configuration Failed"
+msgstr "配置失败"
 
-#: kopete/config/behavior/behaviorconfig.cpp:71
-msgid "Cha&t"
-msgstr "聊天(&T)"
+#: protocols/winpopup/wpaddcontact.cpp:90
+msgid "<qt>You must enter a valid hostname.</qt>"
+msgstr "<qt>您必须输入一个有效的主机名。</qt>"
 
-#: kopete/config/identity/kopeteidentityconfig.cpp:367
-#: kopete/contactlist/kopetelviprops.cpp:357
-msgid "No Contacts with Photo Support"
-msgstr "没有支持照片的联系人"
+#: protocols/winpopup/wpaddcontact.cpp:90
+#: protocols/winpopup/wpaddcontact.cpp:97
+#: protocols/winpopup/wpeditaccount.cpp:100
+#: protocols/winpopup/wpeditaccount.cpp:106
+msgid "WinPopup"
+msgstr "WinPopup"
 
-#: kopete/config/identity/kopeteidentityconfig.cpp:416
-msgid "New Identity"
-msgstr "新建身份"
+#: protocols/winpopup/wpaddcontact.cpp:97
+msgid "<qt>LOCALHOST is not allowed as contact.</qt>"
+msgstr "<qt>LOCALHOST 不允许是联系人。</qt>"
 
-#: kopete/config/identity/kopeteidentityconfig.cpp:416
-#: kopete/config/identity/kopeteidentityconfig.cpp:431
-#: kopete/config/identity/kopeteidentityconfig.cpp:456
-msgid "Identity name:"
-msgstr "身份名称："
+#: protocols/winpopup/wpuserinfo.cpp:37
+msgid "N/A"
+msgstr "不可用"
 
-#: kopete/config/identity/kopeteidentityconfig.cpp:431
-msgid "Copy Identity"
-msgstr "复制身份"
+#: libkopete/ui/userinfodialog.cpp:62 protocols/winpopup/wpuserinfo.cpp:41
+#, c-format
+msgid "User Info for %1"
+msgstr "%1 的用户信息"
 
-#: kopete/config/identity/kopeteidentityconfig.cpp:446
-#: kopete/config/identity/kopeteidentityconfig.cpp:474
-msgid "An identity with the same name was found."
-msgstr "找到了同名身份。"
+#: protocols/winpopup/wpuserinfo.cpp:48 protocols/winpopup/wpuserinfo.cpp:49
+#: protocols/winpopup/wpuserinfo.cpp:50 protocols/winpopup/wpuserinfo.cpp:51
+msgid "Looking"
+msgstr "查找"
 
-#: kopete/config/identity/kopeteidentityconfig.cpp:446
-#: kopete/config/identity/kopeteidentityconfig.cpp:474
-#: kopete/config/identity/kopeteidentityconfig.cpp:573
-#: kopete/config/identity/kopeteidentityconfig.cpp:582
-msgid "Identity Configuration"
-msgstr "身份配置"
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:106
+msgid ""
+"Working directory %1 does not exist.\n"
+"If you have not configured anything yet (samba) please see\n"
+"Install Into Samba (Configure... -> Account -> Edit) information\n"
+"on how to do this.\n"
+"Should the directory be created? (May need root password)"
+msgstr ""
+"工作目录 %1 不存在。\n"
+"如果您还没有配置过 Samba，请查看\n"
+"安装到 Samba(配置...->账户->编辑)信息以获得\n"
+"该如何做的指示。\n"
+"是否要创建该目录？(可能需要 root 密码)"
 
-#: kopete/config/identity/kopeteidentityconfig.cpp:456
-msgid "Rename Identity"
-msgstr "重命名身份"
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:111
+msgid "Create Directory"
+msgstr "创建目录"
 
-#: kopete/config/identity/kopeteidentityconfig.cpp:506
-msgid "Choose the person who is yourself."
-msgstr "选择您自己是谁。"
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:111
+msgid "Do Not Create"
+msgstr "不创建"
 
-#: kopete/config/identity/kopeteidentityconfig.cpp:572
-#: kopete/config/identity/kopeteidentityconfig.cpp:581
-msgid "An error occurred when trying to save the custom photo for %1 identity."
-msgstr "试图保存 %1 身份的自定义照片时发生了错误。"
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:125
+msgid ""
+"Permissions of the working directory %1 are wrong!\n"
+"You will not receive messages if you say no.\n"
+"You can also correct it manually (chmod 0777 %1) and restart kopete.\n"
+"Fix? (May need root password)"
+msgstr ""
+"工作目录 %1 的权限有错误！\n"
+"如果您回答“否”，将无法收到任何信息。\n"
+"您也可以手动校正其权限(chmod 0777 %1)并重新启动 kopete。\n"
+"要校正吗？(可能需要 root 密码)"
 
-#: kopete/config/identity/globalidentitiesmanager.cpp:164
-msgid "Default Identity"
-msgstr "默认身份"
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:130
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:306
+msgid "Fix"
+msgstr "修复"
 
-#: kopete/config/accounts/kopeteaccountconfig.cpp:234
-msgid "Are you sure you want to remove the account \"%1\"?"
-msgstr "您确定想要删除账户“%1”吗？"
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:130
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:306
+msgid "Do Not Fix"
+msgstr "不修复"
 
-#: kopete/config/accounts/kopeteaccountconfig.cpp:235
-msgid "Remove Account"
-msgstr "删除账户"
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:234
+msgid ""
+"Connection to localhost failed!\n"
+"Is your samba server running?"
+msgstr ""
+"连接到 localhost 失败！\n"
+"您的 Samba 服务器是否已经运行？"
 
-#: kopete/config/appearance/tooltipeditdialog.cpp:56
-msgid "Tooltip Editor"
-msgstr "工具提示编辑器"
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:303
+msgid ""
+"A message file could not be removed; maybe the permissions are wrong.\n"
+"Fix? (May need root password)"
+msgstr ""
+"消息文件无法删除；可能权限不对。\n"
+"修复吗？(可能需要 root 密码)"
 
-#: kopete/config/appearance/appearanceconfig.cpp:150
-#: kopete/config/appearance/appearanceconfig.cpp:641
-msgid "The Chat Window style was successfully installed."
-msgstr "聊天窗口已经成功安装。"
+#: protocols/winpopup/libwinpopup/libwinpopup.cpp:311
+msgid "Still cannot remove it; please fix manually."
+msgstr "仍然无法删除；请手动修复。"
 
-#: kopete/config/appearance/appearanceconfig.cpp:150
-#: kopete/config/appearance/appearanceconfig.cpp:641
-msgid "Install successful"
-msgstr "安装成功"
+#: protocols/winpopup/wpaccount.cpp:163
+msgid "WinPopup (%1)"
+msgstr "WinPopup (%1)"
 
-#: kopete/config/appearance/appearanceconfig.cpp:155
-#: kopete/config/appearance/appearanceconfig.cpp:628
-msgid ""
-"The specified archive cannot be opened.\n"
-"Make sure that the archive is valid ZIP or TAR archive."
-msgstr ""
-"无法打开指定的存档。\n"
-"请确定存档是有效的 ZIP 或 TAR 压缩包。"
+#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:151
+#: protocols/oscar/aim/ui/aimaddcontactpage.cpp:65
+#: protocols/winpopup/wpeditaccount.cpp:100
+#: protocols/yahoo/yahooeditaccount.cpp:108
+msgid "<qt>You must enter a valid screen name.</qt>"
+msgstr "<qt>您必须输入一个有效的屏幕名。</qt>"
 
-#: kopete/config/appearance/appearanceconfig.cpp:155
-msgid "Cannot open archive"
-msgstr "无法打开存档"
+#: protocols/winpopup/wpeditaccount.cpp:106
+msgid "<qt>You must enter a valid smbclient path.</qt>"
+msgstr "<qt>您必须输入一个有效的 smbclient 路径。</qt>"
 
-#: kopete/config/appearance/appearanceconfig.cpp:160
-#: kopete/config/appearance/appearanceconfig.cpp:633
-msgid ""
-"Could not find a suitable place to install the Chat Window style in user "
-"directory."
-msgstr "无法在用户中目录中找到合适的位置来安装聊天窗口样式。"
+#: protocols/yahoo/yahooconferencemessagemanager.cpp:50
+msgid "&Invite others"
+msgstr "邀请别人(&I)"
 
-#: kopete/config/appearance/appearanceconfig.cpp:160
-msgid "Cannot find styles directory"
-msgstr "找不到样式目录"
+#: protocols/yahoo/yahooverifyaccount.cpp:41
+msgid "Account Verification - Yahoo"
+msgstr "账户验证 - Yahoo"
 
-#: kopete/config/appearance/appearanceconfig.cpp:165
-#: kopete/config/appearance/appearanceconfig.cpp:637
-msgid "The specified archive does not contain a valid Chat Window style."
-msgstr "指定的存档不包含有效的聊天窗口样式。"
+#: protocols/yahoo/yahoochatsession.cpp:56
+msgid "Buzz Contact"
+msgstr "闪屏振动"
 
-#: kopete/config/appearance/appearanceconfig.cpp:165
-#: kopete/config/appearance/appearanceconfig.cpp:637
-msgid "Invalid Style"
-msgstr "无效的样式"
+#: protocols/yahoo/yahoochatsession.cpp:57
+msgid "Show User Info"
+msgstr "显示用户信息"
 
-#: kopete/config/appearance/appearanceconfig.cpp:172
-#: kopete/config/appearance/appearanceconfig.cpp:647
-msgid "An unknow error occurred while trying to install the Chat Window style."
-msgstr "试图安装聊天窗口样式时发生了未知错误。"
+#: protocols/yahoo/yahoochatsession.cpp:58
+msgid "Request Webcam"
+msgstr "请求摄像头"
 
-#: kopete/config/appearance/appearanceconfig.cpp:172
-#: kopete/config/appearance/appearanceconfig.cpp:647
-msgid "Unknow error"
-msgstr "未知错误"
+#: protocols/yahoo/yahoochatsession.cpp:59
+#: protocols/yahoo/yahoocontact.cpp:380
+msgid "Invite to view your Webcam"
+msgstr "邀请查看您的摄像头"
 
-#: kopete/config/appearance/appearanceconfig.cpp:208
-msgid "&Emoticons"
-msgstr "表情(&E)"
+#: protocols/jabber/jabberchatsession.cpp:88
+#: protocols/yahoo/yahoochatsession.cpp:60
+msgid "Send File"
+msgstr "发送文件"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 33
-#: kopete/config/appearance/appearanceconfig.cpp:247 rc.cpp:772
-#, no-c-format
-msgid "Chat Window"
-msgstr "聊天窗口"
+#: protocols/yahoo/yahoochatsession.cpp:65
+msgid "Yahoo Display Picture"
+msgstr "Yahoo 显示图片"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 190
-#: kopete/config/appearance/appearanceconfig.cpp:281 rc.cpp:805
+#: protocols/yahoo/yahooprotocol.cpp:44
+msgid "Be right back"
+msgstr "马上回来"
+
+#: protocols/gadu/gaduprotocol.cpp:63 protocols/gadu/gaduprotocol.cpp:65
+#: protocols/groupwise/gwprotocol.cpp:52
+#: protocols/meanwhile/meanwhileprotocol.cpp:51
+#: protocols/yahoo/yahooprotocol.cpp:45
+msgid "Busy"
+msgstr "忙碌"
+
+#: protocols/yahoo/yahooprotocol.cpp:46
+msgid "Not at home"
+msgstr "不在家"
+
+#: protocols/yahoo/yahooprotocol.cpp:47
+msgid "Not at my desk"
+msgstr "不再办公桌"
+
+#: protocols/yahoo/yahooprotocol.cpp:48
+msgid "Not in the office"
+msgstr "不在办公室"
+
+#: protocols/yahoo/yahooprotocol.cpp:49
+msgid "On the phone"
+msgstr "在打电话"
+
+#: protocols/yahoo/yahooprotocol.cpp:50
+msgid "On vacation"
+msgstr "度假中"
+
+#: protocols/yahoo/yahooprotocol.cpp:51
+msgid "Out to lunch"
+msgstr "外出就餐"
+
+#: protocols/yahoo/yahooprotocol.cpp:52
+msgid "Stepped out"
+msgstr "散步"
+
+#: libkopete/kopeteonlinestatus.cpp:119 protocols/gadu/gaduprotocol.cpp:67
+#: protocols/gadu/gaduprotocol.cpp:69 protocols/jabber/jabbercontact.cpp:166
+#: protocols/jabber/jabberprotocol.cpp:80 protocols/yahoo/yahooprotocol.cpp:53
+msgid "Invisible"
+msgstr "隐身"
+
+#: protocols/yahoo/yahooprotocol.cpp:54
+msgid "Custom"
+msgstr "自定义"
+
+#: protocols/groupwise/gwprotocol.cpp:56
+#: protocols/meanwhile/meanwhileprotocol.cpp:56
+#: protocols/yahoo/yahooprotocol.cpp:55
+msgid "Idle"
+msgstr "空闲"
+
+#: libkopete/kopeteonlinestatus.cpp:116 protocols/gadu/gaduprotocol.cpp:75
+#: protocols/groupwise/gwprotocol.cpp:66 protocols/irc/ircprotocol.cpp:145
+#: protocols/jabber/jabberprotocol.cpp:81 protocols/sms/smsprotocol.cpp:38
+#: protocols/yahoo/yahooprotocol.cpp:56
+msgid "Connecting"
+msgstr "正在连接"
+
+#: protocols/yahoo/yahooprotocol.cpp:58
+msgid "Buddy Icon Checksum"
+msgstr "好友图标校验和"
+
+#: protocols/yahoo/yahooprotocol.cpp:59
+msgid "Buddy Icon Expire"
+msgstr "好友图标过期"
+
+#: protocols/yahoo/yahooprotocol.cpp:60
+msgid "Buddy Icon Remote Url"
+msgstr "好友图标远程 URL"
+
+#: protocols/groupwise/ui/gwcontactproperties.cpp:114
+#: protocols/yahoo/yahooprotocol.cpp:65
+msgid "Title"
+msgstr "职务"
+
+#: protocols/yahoo/yahooprotocol.cpp:68
+msgid "YAB Id"
+msgstr "YAB Id"
+
+#: protocols/yahoo/yahooprotocol.cpp:69
+msgid "Pager number"
+msgstr "寻呼号"
+
+#: protocols/yahoo/yahooprotocol.cpp:70
+msgid "Fax number"
+msgstr "传真号码"
+
+#: protocols/yahoo/yahooprotocol.cpp:71
+msgid "Additional number"
+msgstr "额外号码"
+
+#: protocols/yahoo/yahooprotocol.cpp:72 protocols/yahoo/yahooprotocol.cpp:73
+msgid "Alternative email 1"
+msgstr "备选邮件地址 1"
+
+#: protocols/oscar/aim/aimprotocol.cpp:187
+#: protocols/oscar/oscaraccount.cpp:809 protocols/yahoo/yahooprotocol.cpp:74
+msgid "AIM"
+msgstr "AIM"
+
+#: protocols/oscar/icq/icqprotocol.cpp:139
+#: protocols/oscar/oscaraccount.cpp:809 protocols/yahoo/yahooprotocol.cpp:75
+msgid "ICQ"
+msgstr "ICQ"
+
+#: protocols/yahoo/yahooprotocol.cpp:76
+msgid "GoogleTalk"
+msgstr "GoogleTalk"
+
+#: protocols/yahoo/yahooprotocol.cpp:77
+msgid "Skype"
+msgstr "Skype"
+
+#. i18n: file ./protocols/irc/ircchatui.rc line 5
+#: protocols/yahoo/yahooprotocol.cpp:78 rc.cpp:4647
 #, no-c-format
-msgid "Contact List"
-msgstr "联系人列表"
+msgid "IRC"
+msgstr "IRC"
 
-#: kopete/config/appearance/appearanceconfig.cpp:317
-msgid "Colors && Fonts"
-msgstr "颜色和字体"
+#: protocols/yahoo/yahooprotocol.cpp:79
+msgid "QQ"
+msgstr "QQ"
 
-#: kopete/config/appearance/appearanceconfig.cpp:577
-msgid "(No Variant)"
-msgstr "(没有样式变体)"
+#: protocols/yahoo/yahooprotocol.cpp:80
+msgid "Private Address"
+msgstr "私人地址"
 
-#: kopete/config/appearance/appearanceconfig.cpp:615
-msgid "Choose Chat Window style to install."
-msgstr "选择要安装的聊天窗口样式。"
+#: protocols/yahoo/yahooprotocol.cpp:81
+msgid "Private City"
+msgstr "私人城市"
 
-#: kopete/config/appearance/appearanceconfig.cpp:628
-msgid "Can't open archive"
-msgstr "无法打开存档"
+#: protocols/yahoo/yahooprotocol.cpp:82
+msgid "Private State"
+msgstr "私人州/省"
 
-#: kopete/config/appearance/appearanceconfig.cpp:633
-msgid "Can't find styles directory"
-msgstr "找不到样式目录"
+#: protocols/yahoo/yahooprotocol.cpp:83
+msgid "Private ZIP"
+msgstr "私人邮编"
 
-#: kopete/config/appearance/appearanceconfig.cpp:664
-msgid ""
-"_: It's the deleted style name\n"
-"The style %1 was successfully deleted."
-msgstr "样式 %1 已经成功删除。"
+#: protocols/yahoo/yahooprotocol.cpp:84
+msgid "Private Country"
+msgstr "私人国家"
 
-#: kopete/config/appearance/appearanceconfig.cpp:673
-msgid ""
-"_: It's the deleted style name\n"
-"An error occured while trying to delete %1 style."
-msgstr "试图删除 %1 样式时发生了错误。"
+#: protocols/yahoo/yahooprotocol.cpp:86
+msgid "Private URL"
+msgstr "私人 URL"
 
-#: kopete/config/appearance/appearanceconfig.cpp:731
-msgid ""
-"_: This is the myself preview contact id\n"
-"myself@preview"
-msgstr "myself@preview"
+#: protocols/yahoo/yahooprotocol.cpp:87
+msgid "Corporation"
+msgstr "公司"
 
-#: kopete/config/appearance/appearanceconfig.cpp:732
-msgid ""
-"_: This is the myself preview contact nickname\n"
-"Myself"
-msgstr "我自己"
+#: protocols/yahoo/yahooprotocol.cpp:88
+msgid "Work Address"
+msgstr "工作地址"
 
-#: kopete/config/appearance/appearanceconfig.cpp:734
-msgid ""
-"_: This is the other preview contact id\n"
-"jack@preview"
-msgstr "zhangsan@preview"
+#: protocols/jabber/jabberprotocol.cpp:109
+#: protocols/yahoo/yahooprotocol.cpp:89
+msgid "Work City"
+msgstr "工作城市"
 
-#: kopete/config/appearance/appearanceconfig.cpp:735
-msgid ""
-"_: This is the other preview contact nickname\n"
-"Jack"
-msgstr "张三"
+#: protocols/yahoo/yahooprotocol.cpp:90
+msgid "Work State"
+msgstr "工作州/省"
 
-#: kopete/config/appearance/appearanceconfig.cpp:736
-msgid "Myself"
-msgstr "我自己"
+#: protocols/yahoo/yahooprotocol.cpp:91
+msgid "Work ZIP"
+msgstr "工作邮编"
 
-#: kopete/config/appearance/appearanceconfig.cpp:738
-msgid "Jack"
-msgstr "张三"
+#: protocols/jabber/jabberprotocol.cpp:111
+#: protocols/yahoo/yahooprotocol.cpp:92
+msgid "Work Country"
+msgstr "工作国家"
 
-#: kopete/config/appearance/appearanceconfig.cpp:750
-msgid "Hello, this is an incoming message :-)"
-msgstr "你好，这是收到的消息 :-)"
+#: protocols/yahoo/yahooprotocol.cpp:94
+msgid "Work URL"
+msgstr "工作 URL"
 
-#: kopete/config/appearance/appearanceconfig.cpp:751
-msgid "Hello, this is an incoming consecutive message."
-msgstr "你好，这是收到的消息 :-)。"
+#: protocols/jabber/jabberprotocol.cpp:99 protocols/yahoo/yahooprotocol.cpp:95
+msgid "Birthday"
+msgstr "生日"
 
-#: kopete/config/appearance/appearanceconfig.cpp:753
-msgid "Ok, this is an outgoing message"
-msgstr "好的，这是发出的消息"
+#: protocols/yahoo/yahooprotocol.cpp:96
+msgid "Anniversary"
+msgstr "纪念日"
 
-#: kopete/config/appearance/appearanceconfig.cpp:754
-msgid "Ok, a outgoing consecutive message."
-msgstr "好的，这是发出的消息。"
+#: protocols/yahoo/yahooprotocol.cpp:97
+msgid "Notes"
+msgstr "备注"
 
-#: kopete/config/appearance/appearanceconfig.cpp:756
-msgid "Here is an incoming colored message"
-msgstr "这是收到的彩色消息"
+#: protocols/yahoo/yahooprotocol.cpp:98
+msgid "Additional 1"
+msgstr "额外 1"
 
-#: kopete/config/appearance/appearanceconfig.cpp:759
-msgid "This is an internal message"
-msgstr "这是内部消息"
+#: protocols/yahoo/yahooprotocol.cpp:99
+msgid "Additional 2"
+msgstr "额外 2"
 
-#: kopete/config/appearance/appearanceconfig.cpp:760
-msgid "performed an action"
-msgstr "执行了操作"
+#: protocols/yahoo/yahooprotocol.cpp:100
+msgid "Additional 3"
+msgstr "额外 3"
 
-#: kopete/config/appearance/appearanceconfig.cpp:762
-msgid "This is a highlighted message"
-msgstr "这是突出显示的消息"
+#: protocols/yahoo/yahooprotocol.cpp:101
+msgid "Additional 4"
+msgstr "额外 4"
 
-#: kopete/config/appearance/appearanceconfig.cpp:765
-msgid ""
-"_: This special UTF-8 string is to test if the style support Right-to-Left "
-"language display.\n"
-"הודעות טקסט"
-msgstr "הודעות טקסט"
+#: protocols/yahoo/yahooeditaccount.cpp:108
+#: protocols/yahoo/yahooeditaccount.cpp:113
+msgid "Yahoo"
+msgstr "Yahoo"
 
-#: kopete/config/appearance/appearanceconfig.cpp:766
+#: protocols/yahoo/yahooeditaccount.cpp:113
+msgid "<qt>You must enter a valid password.</qt>"
+msgstr "<qt>您必须输入一个有效的密码。</qt>"
+
+#: protocols/yahoo/yahooeditaccount.cpp:167
+msgid "Yahoo Buddy Icon"
+msgstr "Yahoo 好友图标"
+
+#: protocols/yahoo/yahooaccount.cpp:1806
+#: protocols/yahoo/yahooeditaccount.cpp:180
+msgid "An error occurred when trying to change the display picture."
+msgstr "试图更改显示图片时发生了错误。"
+
+#: protocols/yahoo/yahooaccount.cpp:829 protocols/yahoo/yahooaccount.cpp:832
+#: protocols/yahoo/yahooaccount.cpp:1501 protocols/yahoo/yahooaccount.cpp:1693
+#: protocols/yahoo/yahooaccount.cpp:1791 protocols/yahoo/yahooaccount.cpp:1806
+#: protocols/yahoo/yahooeditaccount.cpp:180
+#: protocols/yahoo/yahooeditaccount.cpp:186
+msgid "Yahoo Plugin"
+msgstr "Yahoo 插件"
+
+#: protocols/yahoo/yahooeditaccount.cpp:186
 msgid ""
-"That message was in a Right-to-Left language, which Kopete also supports."
-msgstr "此消息使用从右到左语言书写，Kopete 同样支持它。"
+"<qt>The selected buddy icon could not be opened. "
+"<br>Please set a new buddy icon.</qt>"
+msgstr "<qt>选中的好友图标无法打开。<br>请设定新的好友图标。</qt>"
 
-#: kopete/config/appearance/appearanceconfig.cpp:767
-msgid "Bye"
-msgstr "再见"
+#: protocols/yahoo/yahoocontact.cpp:117
+msgid "%1|Stealthed"
+msgstr "%1|隐身"
 
-#: kopete/config/appearance/appearanceconfig.cpp:802
-msgid "Drag or Type Emoticon Theme URL"
-msgstr "拖曳或输入表情主题 URL"
+#: protocols/yahoo/yahoocontact.cpp:369
+msgid "View &Webcam"
+msgstr "查看摄像头(&W)"
 
-#: kopete/config/appearance/appearanceconfig.cpp:809
-msgid "Sorry, emoticon themes must be installed from local files."
-msgstr "抱歉，必须从本地文件中安装表情主题。"
+#: protocols/yahoo/yahoocontact.cpp:391
+msgid "&Buzz Contact"
+msgstr "闪屏振动(&B)"
 
-#: kopete/config/appearance/appearanceconfig.cpp:810
-msgid "Could Not Install Emoticon Theme"
-msgstr "无法安装表情主题"
+#: protocols/yahoo/yahoocontact.cpp:401
+msgid "&Stealth Setting"
+msgstr "选择性隐身设置(&C)"
+
+#: protocols/yahoo/yahoocontact.cpp:411
+msgid "&Invite to Conference"
+msgstr "邀请加入会议(&I)"
+
+#: protocols/yahoo/yahoocontact.cpp:421
+msgid "&View Yahoo Profile"
+msgstr "查看 Yahoo 配置文件(&V)"
+
+#: protocols/yahoo/yahoocontact.cpp:465
+msgid "Stealth Setting"
+msgstr "选择性隐身设置"
+
+#: protocols/yahoo/yahoocontact.cpp:519
+msgid "Buzzz!!!"
+msgstr "闪屏振动"
 
-#: kopete/config/appearance/appearanceconfig.cpp:826
+#: protocols/yahoo/yahoocontact.cpp:609 protocols/yahoo/yahoocontact.cpp:664
 msgid ""
-"<qt>Are you sure you want to remove the <strong>%1</strong> emoticon theme?"
-"<br>"
-"<br>This will delete the files installed by this theme.</qt>"
-msgstr "<qt>您确定想要删除 <b>%1</b> 表情主题吗？<br><br>这将删除删除该主题所安装的全部文件。</qt>"
+"I cannot find the jasper image convert program.\n"
+"jasper is required to render the yahoo webcam images.\n"
+"Please see %1 for further information."
+msgstr ""
+"找不到 jasper 图像转换程序。\n"
+"渲染 Yahoo 摄像头图像，需要使用 jasper。\n"
+"请转到 %1 获取更多信息。"
 
-#: kopete/config/appearance/appearanceconfig.cpp:832
-msgid "Confirmation"
-msgstr "确认"
+#: protocols/yahoo/yahooaccount.cpp:97
+msgid "Open Inbo&x..."
+msgstr "打开收件箱(&X)..."
 
-#: kopete/config/appearance/appearanceconfig.cpp:853
-#: kopete/config/appearance/appearanceconfig.cpp:855
-msgid "Get New Emoticons"
-msgstr "获得新表情"
+#: protocols/yahoo/yahooaccount.cpp:98
+msgid "Open &Addressbook..."
+msgstr "打开地址簿(&A)..."
 
-#: kopete/config/plugins/kopetepluginconfig.cpp:43
-msgid "Configure Plugins"
-msgstr "配置插件"
+#: protocols/yahoo/yahooaccount.cpp:99
+msgid "&Edit my contact details..."
+msgstr "编辑我得联系人细节(&E)..."
 
-#: kopete/config/plugins/kopetepluginconfig.cpp:44
-msgid "&Reset"
-msgstr "重置(&R)"
+#: protocols/yahoo/yahooaccount.cpp:100
+#, fuzzy
+msgid "&Join chat room..."
+msgstr "加入聊天..."
 
-#: kopete/config/plugins/kopetepluginconfig.cpp:62
-msgid "General Plugins"
-msgstr "常规插件"
+#: protocols/yahoo/yahooaccount.cpp:753
+#, fuzzy
+msgid ""
+"Could not log into the Yahoo service: your account has been locked.\n"
+"Visit %1 to reactivate it."
+msgstr ""
+"无法登录到 Yahoo 服务：您的账户已被锁定。\n"
+"请前往 %1 重新激活。"
 
-#: kopete/kopeteiface.cpp:160
+#: protocols/yahoo/yahooaccount.cpp:762
 msgid ""
-"An external application is attempting to add the  '%1' contact '%2' to your "
-"contact list. Do you want to allow this?"
-msgstr "外部应用程序试图将“%1”联系人“%2”添加到您的联系人列表中。您允许吗？"
+"Could not log into the Yahoo service: the username specified was invalid."
+msgstr "无法登录到 Yahoo 服务：指定的用户名无效。"
 
-#: kopete/kopeteiface.cpp:162
-msgid "Allow Contact?"
-msgstr "允许联系人？"
+#: protocols/yahoo/yahooaccount.cpp:771
+msgid ""
+"You have been logged out of the Yahoo service, possibly due to a duplicate "
+"login."
+msgstr "您已经注销了 Yahoo 服务，可能是有重复登录的情况发生。"
 
-#: kopete/kopeteiface.cpp:162
-msgid "Allow"
-msgstr "允许"
+#: protocols/yahoo/yahooaccount.cpp:803
+msgid ""
+"%1 has been disconnected.\n"
+"Error message:\n"
+"%2 - %3"
+msgstr ""
+"%1 已经断开。\n"
+"错误消息：\n"
+"%2 - %3"
 
-#: kopete/kopeteiface.cpp:162
-msgid "Reject"
-msgstr "拒绝"
+#: protocols/yahoo/yahooaccount.cpp:816
+msgid ""
+"There was an error while connecting %1 to the Yahoo server.\n"
+"Error message:\n"
+"%2 - %3"
+msgstr ""
+"在将 %1 连接到 Yahoo 服务器时出错。\n"
+"错误消息：\n"
+"%2 - %3"
 
-#: kopete/kopeteiface.cpp:175
+#: protocols/yahoo/yahooaccount.cpp:828 protocols/yahoo/yahooaccount.cpp:831
+#, fuzzy
 msgid ""
-"An external application has attempted to add a contact using  the %1 protocol, "
-"which either does not exist or is not loaded."
-msgstr "外部应用程序试图使用 %1 协议添加联系人，而该协议不存在或未装入。"
+"%1\n"
+"\n"
+"Reason: %2"
+msgstr ""
+"%1\n"
+"\n"
+"原因：%2 - %3"
 
-#: kopete/kopeteiface.cpp:177
-msgid "Missing Protocol"
-msgstr "缺少协议"
+#: protocols/yahoo/yahooaccount.cpp:891
+msgid "User %1 has granted your authorization request."
+msgstr "用户 %1 同意了您的身份验证请求。"
 
-#: kopete/addaccountwizard/addaccountwizard.cpp:49
+#: protocols/yahoo/yahooaccount.cpp:902
+#, fuzzy
 msgid ""
-"_: 1st message shown to users on first run of Kopete. Please keep the "
-"formatting.\n"
-"<h2>Welcome to Kopete</h2>"
-"<p>Which messaging service do you want to connect to?</p>"
-msgstr "<h2>欢迎使用 Kopete</h2><p>您想要连接到哪种信使服务？</p>"
+"User %1 has rejected your authorization request.\n"
+"%2"
+msgstr ""
+"用户 %1 同意了您的身份验证请求。\n"
+"%2"
 
-#: kopete/addaccountwizard/addaccountwizard.cpp:56
+#: protocols/yahoo/yahooaccount.cpp:1192
+#, fuzzy
 msgid ""
-"_: 2nd message shown to users on first run of Kopete. Please keep the "
-"formatting.\n"
-"<h2>Congratulations</h2>"
-"<p>You have finished configuring the account. You can add more accounts with <i>"
-"Settings->Configure</i>.  Please click the \"Finish\" button.</p>"
-msgstr "<h2>恭喜</h2><p>您已经配置完账户了。您可以使用<i>设置->配置</i>添加更多账户。请单击“完成”按钮。</p>"
+"_: This string is shown when the user is buzzed by a contact\n"
+"Buzz"
+msgstr "闪屏振动"
 
-#: kopete/addaccountwizard/addaccountwizard.cpp:131
-msgid "Cannot load the %1 protocol plugin."
-msgstr "无法装入 %1 协议插件。"
+#: protocols/yahoo/yahooaccount.cpp:1230
+#, fuzzy
+msgid ""
+"%1 has invited you to join a conference with %2.\n"
+"\n"
+"His/her message: %3\n"
+"\n"
+"Accept?"
+msgstr ""
+"%1 邀请您加入与 %2 的会议。\n"
+"\n"
+"他的消息是：%3\n"
+"\n"
+"接受吗？"
 
-#: kopete/addaccountwizard/addaccountwizard.cpp:132
-#: kopete/addaccountwizard/addaccountwizard.cpp:141
-msgid "Error While Adding Account"
-msgstr "添加账户时出错"
+#: protocols/yahoo/yahooaccount.cpp:1231 protocols/yahoo/yahooaccount.cpp:1685
+#: protocols/yahoo/yahooaccount.cpp:1896
+msgid "Accept"
+msgstr "接受"
 
-#: kopete/addaccountwizard/addaccountwizard.cpp:140
-msgid "This protocol does not currently support adding accounts."
-msgstr "此协议目前不支持添加账户。"
+#: protocols/yahoo/yahooaccount.cpp:1332
+#, fuzzy
+msgid "%1 has declined to join the conference: \"%2\""
+msgstr "%1 拒绝加入会议：“%2”"
 
-#: kopete/addaccountwizard/addaccountwizard.cpp:145
-msgid "Step Two: Account Information"
-msgstr "第二步：账户信息"
+#: protocols/yahoo/yahooaccount.cpp:1646
+#, c-format
+msgid ""
+"_n: You have one unread message in your Yahoo inbox.\n"
+"You have %n unread messages in your Yahoo inbox."
+msgstr "您的 Yahoo 收件箱有 %n 封未读的信件。"
 
-#: kopete/contactlist/kopetelviprops.cpp:69
+#: protocols/yahoo/yahooaccount.cpp:1654
+#, fuzzy
+msgid "You have a message from %1 in your Yahoo inbox. <br><br>Subject: %2"
+msgstr "您的 Yahoo 收件箱中有一封从 %1 来的新信件。"
+
+#: protocols/yahoo/yahooaccount.cpp:1684
+msgid "%1 has invited you to view his/her webcam. Accept?"
+msgstr "%1 邀请您查看他/她的摄像头。接受吗？"
+
+#: protocols/yahoo/yahooaccount.cpp:1693
+msgid "Webcam for %1 is not available."
+msgstr "%1 的摄像头不可用。"
+
+#: protocols/yahoo/yahooaccount.cpp:1791
+#, fuzzy
+msgid ""
+"<qt>The selected buddy icon could not be opened. <br />"
+"Please set a new buddy icon.</qt>"
+msgstr "<qt>选中的好友图标无法打开。<br>请设定新的好友图标。</qt>"
+
+#: protocols/yahoo/yahooaccount.cpp:1895
+msgid "%1 wants to view your webcam. Grant access?"
+msgstr "%1 想要查看您的摄像头。同意吗？"
+
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:43
+msgid "Yahoo User Information"
+msgstr "Yahoo 用户信息"
+
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:43
+msgid "Save and Close"
+msgstr "保存并关闭"
+
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:43
+msgid "Merge with existing entry"
+msgstr "与已有项合并"
+
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:48
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:48
+msgid "General Info"
+msgstr "常规信息"
+
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:49
+msgid "General Yahoo Information"
+msgstr "Yahoo 常规信息"
+
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:55
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:55
+msgid "Work Info"
+msgstr "工作信息"
+
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:56
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:56
+msgid "Work Information"
+msgstr "工作信息"
+
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:62
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:62
+msgid "Other Info"
+msgstr "其它信息"
+
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:63
+msgid "Other Yahoo Information"
+msgstr "Yahoo 其它信息"
+
+#: protocols/yahoo/ui/yahoouserinfodialog.cpp:209
+msgid "Replace existing entry"
+msgstr "替换已有项"
+
+#: protocols/yahoo/ui/yahoowebcamdialog.cpp:31
 #, c-format
-msgid "Properties of Group %1"
-msgstr "组 %1 的属性"
+msgid "Webcam for %1"
+msgstr "%1 的摄像头"
 
-#: kopete/contactlist/kopetelviprops.cpp:76
-#: kopete/contactlist/kopetelviprops.cpp:169
-msgid "Custom &Notifications"
-msgstr "自定义通知(&N)"
+#: protocols/yahoo/ui/yahoowebcamdialog.cpp:45
+msgid "No webcam image received"
+msgstr "未收到摄像头图像"
 
-#: kopete/contactlist/kopetelviprops.cpp:149
+#: protocols/yahoo/ui/yahoowebcamdialog.cpp:80
+msgid "%1 has stopped broadcasting"
+msgstr "%1 停止了广播"
+
+#: protocols/yahoo/ui/yahoowebcamdialog.cpp:82
+msgid "%1 has cancelled viewing permission"
+msgstr "%1 取消了查看权限"
+
+#: protocols/yahoo/ui/yahoowebcamdialog.cpp:84
+msgid "%1 has declined permission to view webcam"
+msgstr "%1 拒绝了查看摄像头的许可"
+
+#: protocols/yahoo/ui/yahoowebcamdialog.cpp:86
+msgid "%1 does not have his/her webcam online"
+msgstr "%1 的摄像头未上线"
+
+#: protocols/yahoo/ui/yahoowebcamdialog.cpp:88
+msgid "Unable to view the webcam of %1 for an unknown reason"
+msgstr "无法查看 %1 的摄像头，原因未知"
+
+#: protocols/yahoo/ui/yahoowebcamdialog.cpp:97
+msgid "%1 viewer(s)"
+msgstr "%1 个查看者"
+
+#: protocols/yahoo/libkyahoo/picturenotifiertask.cpp:151
+#: protocols/yahoo/libkyahoo/sendpicturetask.cpp:79
+msgid "The picture was not successfully uploaded"
+msgstr "图片已成功上传"
+
+#: protocols/yahoo/libkyahoo/sendpicturetask.cpp:108
 #, c-format
-msgid "Properties of Meta Contact %1"
-msgstr "超级联系人 %1 的属性"
+msgid "Error opening file: %1"
+msgstr "打开文件时发生了错误：%1"
 
-#: kopete/contactlist/kopetelviprops.cpp:164
-msgid "Sync KABC..."
-msgstr "同步 KABC..."
+#: protocols/yahoo/libkyahoo/webcamtask.cpp:199
+msgid ""
+"Webcam connection to the user %1 could not be established.\n"
+"\n"
+"Please relogin and try again."
+msgstr ""
+"无法和用户 %1 建立视频连接。\n"
+"\n"
+"请重新登录后再尝试。"
 
-#: kopete/contactlist/kopetelviprops.cpp:513
-msgid "No contacts were imported from the address book."
-msgstr "没有从地址簿中导入联系人。"
+#: protocols/yahoo/libkyahoo/webcamtask.cpp:537
+#, fuzzy
+msgid "An error occurred closing the webcam session. "
+msgstr "关闭摄像头时发生了错误。 "
 
-#: kopete/contactlist/kopetelviprops.cpp:514
-msgid "No Change"
-msgstr "无更改"
+#: protocols/yahoo/libkyahoo/webcamtask.cpp:537
+#, fuzzy
+msgid "You tried to close a connection that did not exist."
+msgstr "您正尝试关闭一个事实不存在的连接。"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:291
-msgid "Online contacts (%1)"
-msgstr "在线联系人(%1)"
+#: protocols/yahoo/libkyahoo/sendmessagetask.cpp:42
+#, fuzzy
+msgid "An error occurred while sending the message"
+msgstr "发送消息时出错"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:292
-msgid "Offline contacts (%1)"
-msgstr "离线联系人(%1)"
+#: protocols/yahoo/libkyahoo/sendmessagetask.cpp:42
+msgid "The message is empty."
+msgstr "消息为空。"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:447
-msgid "Contacts"
-msgstr "联系人"
+#: protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp:84
+#, fuzzy
+msgid "An error occurred while downloading a buddy icon (%1)"
+msgstr "下载好友图标时出错(%1)"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:470
-msgid "Create New Group..."
-msgstr "创建新组..."
+#: protocols/yahoo/libkyahoo/statusnotifiertask.cpp:103
+#, fuzzy
+msgid "An unknown error has occurred."
+msgstr "发生了未知错误。"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:478
-msgid "&Move To"
-msgstr "移动到(&M)"
+#: protocols/yahoo/libkyahoo/yahoochattask.cpp:270
+#: protocols/yahoo/libkyahoo/yahoochattask.cpp:274
+#: protocols/yahoo/libkyahoo/yahoochattask.cpp:278
+#, fuzzy
+msgid "Could not join chat"
+msgstr "无法添加联系人"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:480
-msgid "&Copy To"
-msgstr "复制到(&C)"
+#: protocols/yahoo/libkyahoo/yahoochattask.cpp:271
+msgid "The room is full. Please choose another one."
+msgstr ""
 
-#: kopete/contactlist/kopetecontactlistview.cpp:485
-#: protocols/msn/msncontact.cpp:144
-msgid "Send Email..."
-msgstr "发送邮件..."
+#: protocols/yahoo/libkyahoo/yahoochattask.cpp:275
+#, fuzzy
+msgid "Invalid user."
+msgstr "无效的用户ID。"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:488
-#: kopete/contactlist/kopetecontactlistview.cpp:1395
-msgid "Rename"
-msgstr "重命名"
+#: protocols/yahoo/libkyahoo/yahoochattask.cpp:279
+#, fuzzy
+msgid "An unknown error occurred while joining the chat room."
+msgstr "试图安装聊天窗口样式时发生了未知错误。"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:495
-msgid "Select Account"
-msgstr "选择账户"
+#: protocols/yahoo/libkyahoo/yabtask.cpp:119
+#, fuzzy
+msgid "Could not retrieve server side address book for user info."
+msgstr "无法从服务器端地址簿获取用户信息。"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:497
-msgid "Add to Your Contact List"
-msgstr "添加到您的联系人列表"
+#: protocols/yahoo/libkyahoo/sendfiletask.cpp:101
+#, fuzzy
+msgid "Unknown error"
+msgstr "未知错误。"
 
-#. i18n: file ./protocols/groupwise/ui/gwchatsearchwidget.ui line 79
-#: kopete/contactlist/kopetecontactlistview.cpp:505 rc.cpp:5156
-#, no-c-format
-msgid "&Properties"
-msgstr "属性(&P)"
+#: protocols/yahoo/libkyahoo/sendfiletask.cpp:144
+#, fuzzy
+msgid "Unable to connect to file transfer server"
+msgstr "无法连接服务器。"
 
-#: kopete/addcontactwizard/addcontactwizard.cpp:163
-#: kopete/contactlist/kopetecontactlistview.cpp:599
-#: kopete/contactlist/kopetemetacontactlvi.cpp:644
-msgid "New Group"
-msgstr "新组"
+#: protocols/yahoo/libkyahoo/sendfiletask.cpp:209
+#, fuzzy
+msgid "An error occurred while sending the file."
+msgstr "发送文件时出错。"
 
-#: kopete/addcontactwizard/addcontactwizard.cpp:164
-#: kopete/contactlist/kopetecontactlistview.cpp:600
-#: kopete/contactlist/kopetemetacontactlvi.cpp:644
-msgid "Please enter the name for the new group:"
-msgstr "请输入新组的名称："
+#: protocols/yahoo/libkyahoo/receivefiletask.cpp:55
+#: protocols/yahoo/libkyahoo/receivefiletask.cpp:174
+msgid "Could not open file for writing."
+msgstr "无法打开文件写入。"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:690
+#: protocols/yahoo/libkyahoo/receivefiletask.cpp:143
+#, fuzzy
+msgid "An error occurred while downloading the file."
+msgstr "下载文件时出错。"
+
+#: protocols/yahoo/libkyahoo/modifyyabtask.cpp:93
+#: protocols/yahoo/libkyahoo/modifyyabtask.cpp:121
+#, fuzzy
+msgid "An error occurred while saving the address book entry."
+msgstr "保存地址簿条目时出错。"
+
+#: protocols/yahoo/libkyahoo/modifyyabtask.cpp:177
+#, fuzzy
 msgid ""
-"_: Translators: format: '<nickname> (<online status>)'\n"
-"%1 (%2)"
-msgstr "%1 (%2)"
+"The Yahoo Address Book entry could not be saved:\n"
+"%1 - %2"
+msgstr ""
+"无法保存 Yahoo 地址簿条目：\n"
+"%1 - %2"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:715
+#: protocols/yahoo/libkyahoo/modifyyabtask.cpp:184
+#, fuzzy
 msgid ""
-"_: Translators: format: '<displayName> (<id>)'\n"
-"%2 <%1>"
-msgstr "%2 <%1>"
+"The Yahoo Address Book entry could not be created:\n"
+"%1 - %2"
+msgstr ""
+"无法创建 Yahoo 地址簿条目：\n"
+"%1 - %2"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:989
+#: protocols/yahoo/libkyahoo/modifyyabtask.cpp:191
+#, fuzzy
 msgid ""
-"<qt>Would you like to add <b>%1</b> to your contact list as a member of <b>"
-"%2</b>?</qt>"
-msgstr "<qt>您想把 <b>%1</1> 添加到您的联系人列表中作为 <b>%2</b> 的成员吗？</qt>"
+"The Yahoo Address Book entry could not be deleted:\n"
+"%1 - %2"
+msgstr ""
+"无法删除 Yahoo 地址簿条目：\n"
+"%1 - %2"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:991
-#: kopete/contactlist/kopetecontactlistview.cpp:1007
-#: kopete/contactlist/kopetecontactlistview.cpp:1477
-#: protocols/oscar/aim/aimprotocol.cpp:193
-#: protocols/oscar/icq/icqprotocol.cpp:148
-msgid "Do Not Add"
-msgstr "不添加"
+#: protocols/meanwhile/meanwhileaccount.cpp:141
+msgid "&Change Status Message"
+msgstr "更改状态消息(&C)"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1005
-msgid ""
-"<qt>Would you like to add <b>%1</b> to your contact list as a child contact of "
-"<b>%2</b>?</qt>"
-msgstr "<qt>您想把 <b>%1</1> 添加到您的联系人列表中作为 <b>%2</b> 的子联系人吗？</qt>"
+#: protocols/meanwhile/meanwhileaccount.cpp:204
+msgid "Meanwhile Plugin: Message from server"
+msgstr "Meanwhile 插件：服务器的消息"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1056
+#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:152
+#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:159
+#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:166
+#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:173
+#: protocols/meanwhile/meanwhilesession.cpp:202
+msgid "Meanwhile Plugin"
+msgstr "Meanwhile 常规插件"
+
+#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:158
 msgid ""
-"<qt>This contact is already on your contact list. It is a child contact of <b>"
-"%1</b></qt>"
-msgstr "<qt>此联系人已经位于您的联系人列表中。它是 <b>%1</b> 的子联系人</qt>"
+"<qt>You must deselect password remembering or enter a valid password.</qt>"
+msgstr "<qt>您必须不选中密码记忆，或者输入有效的密码。</qt>"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1374
-msgid "Rename Contact"
-msgstr "重命名联系人"
+#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:165
+msgid "<qt>You must enter the server's hostname/ip address.</qt>"
+msgstr "<qt>您必须输入服务器的主机名或 IP 地址。</qt>"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1376
-msgid "Send Single Message..."
-msgstr "发送单条消息..."
+#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:172
+msgid "<qt>0 is not a valid port number.</qt>"
+msgstr "<qt>0 不是有效的端口号码。</qt>"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1379
-msgid "&Add Subcontact"
-msgstr "添加子联系人(&A)"
+#: libkopete/kopeteprotocol.cpp:61
+#: protocols/meanwhile/meanwhileprotocol.cpp:60
+msgid "Account Offline"
+msgstr "账户离线"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1384
-msgid "Rename Group"
-msgstr "重命名组"
+#: protocols/meanwhile/meanwhileprotocol.cpp:63
+msgid "Status Message"
+msgstr "状态消息"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1385
-msgid "Remove Group"
-msgstr "删除组"
+#: protocols/meanwhile/meanwhilesession.cpp:202
+msgid "Could not connect to server"
+msgstr "无法连接服务器"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1386
-msgid "Send Message to Group"
-msgstr "发送群组消息"
+#: protocols/meanwhile/meanwhilesession.cpp:961
+msgid "Meanwhile Plugin: Conference invitation"
+msgstr "Meanwhile 插件：会议邀请"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1390
-msgid "&Add Contact to Group"
-msgstr "将联系人添加到组中(&A)"
+#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage1.ui line 83
+#: protocols/sms/smseditaccountwidget.cpp:134 rc.cpp:1819 rc.cpp:2719
+#, no-c-format
+msgid "Description"
+msgstr "描述"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1448
-msgid "There is no email address set for this contact in the TDE address book."
-msgstr "没有在 TDE 地址簿中为此联系人设置电子邮件地址。"
+#: protocols/sms/services/gsmlib.cpp:447
+msgid ""
+"<qt>GSMLib is a library (and utilities) for sending SMS via a GSM device. The "
+"program can be found on <a href=\"%1\">%1</a></qt>"
+msgstr ""
+"<qt>GSMLib 是一个通过 GSM 设备发送 SMS 短消息的程序。该程序可以在 <a href=\"%1\">%1</a> 找到</qt>"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1448
-msgid "No Email Address in Address Book"
-msgstr "地址簿中无电子邮件地址"
+#: protocols/sms/services/smsclient.cpp:66
+msgid "No provider configured"
+msgstr "未配置提供商"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1451
-msgid ""
-"This contact was not found in the TDE address book. Check that a contact is "
-"selected in the properties dialog."
-msgstr "并未在 TDE 地址簿中找到此联系人。请确定已经在属性对话框中选中了该联系人。"
+#: protocols/sms/services/smsclient.cpp:66
+#: protocols/sms/services/smssend.cpp:57
+#: protocols/sms/services/smssendprovider.cpp:216
+#: protocols/sms/services/smssendprovider.cpp:224
+#: protocols/sms/smscontact.cpp:57
+msgid "Could Not Send Message"
+msgstr "无法发送消息"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1454
+#: protocols/sms/services/smsclient.cpp:178
 msgid ""
-"This contact is not associated with a TDE address book entry, where the email "
-"address is stored. Check that a contact is selected in the properties dialog."
-msgstr "此联系人不与 TDE 地址簿中的任何一项关联，后者用于存储电子邮件地址。请确定已经在属性对话框中选中了该联系人。"
+"<qt>SMSClient is a program for sending SMS with the modem. The program can be "
+"found on <a href=\"%1\">%1</a></qt>"
+msgstr ""
+"<qt>SMSClient 是一个通过调制解调器发送 SMS 短消息的程序。该程序可以在 <a href=\"%1\">%1</a> 找到</qt>"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1476
-msgid "<qt>Would you like to add this contact to your contact list?</qt>"
-msgstr "<qt>您想把这个联系人添加到您的联系人列表中吗？</qt>"
+#: protocols/sms/services/smssend.cpp:57
+msgid "No provider configured."
+msgstr "未配置提供商。"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1556
+#: protocols/sms/services/smssend.cpp:64
 msgid ""
-"<qt>Are you sure you want to remove the contact <b>%1</b> "
-"from your contact list?</qt>"
-msgstr "<qt>您确定想要从联系人列表中删除联系人 <b>%1</b> 吗？</qt>"
+"No prefix set for SMSSend, please change it in the configuration dialog."
+msgstr "未指定 SMSSend 的前缀。请在配置对话框中改变它。"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1562
-msgid ""
-"<qt>Are you sure you want to remove the group <b>%1</b> "
-"and all contacts that are contained within it?</qt>"
-msgstr "<qt>您确定想要删除组 <b>%1</b> 以及其中包含的所有联系人吗？</qt>"
+#: protocols/sms/services/smssend.cpp:64
+msgid "No Prefix"
+msgstr "无前缀"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1579
-msgid "Are you sure you want to remove these contacts from your contact list?"
-msgstr "您确定想要从联系人列表中删除这些联系人吗？"
+#: protocols/sms/services/smssend.cpp:184
+msgid "%1 Settings"
+msgstr "%1 设置"
 
-#: kopete/contactlist/kopetecontactlistview.cpp:1581
+#: protocols/sms/services/smssend.cpp:240
 msgid ""
-"Are you sure you want to remove these groups and contacts from your contact "
-"list?"
-msgstr "您确定想要从联系人列表中删除这些组和联系人吗？"
+"<qt>SMSSend is a program for sending SMS through gateways on the web. It can be "
+"found on <a href=\"%1\">%2</a></qt>"
+msgstr ""
+"<qt>SMSSend 是一个通过互联网中的网关发送 SMS 短消息的程序。该程序可以在 <a href=\"%1\">%2</a> 找到</qt>"
 
-#: kopete/contactlist/tdeabcexport.cpp:90
-msgid "No writeable addressbook resource found."
-msgstr "未找到可写的地址簿资源。"
+#: protocols/sms/services/smssendprovider.cpp:215
+msgid "Could not determine which argument which should contain the message."
+msgstr "无法确定应该是哪个参数包含消息。"
 
-#: kopete/contactlist/tdeabcexport.cpp:91
-msgid "Add or enable one using the Trinity Control Center."
-msgstr "使用 TDE 控制中心添加或启用。"
+#: protocols/sms/services/smssendprovider.cpp:223
+msgid "Could not determine which argument which should contain the number."
+msgstr "无法确定应该是哪个参数包含号码。"
 
-#: kopete/contactlist/tdeabcexport.cpp:102
-msgid " (already in address book)"
-msgstr " (已在地址簿中)"
+#: protocols/sms/serviceloader.cpp:46
+#, c-format
+msgid "Could not load service %1."
+msgstr "无法加载服务 %1。"
 
-#: kopete/contactlist/kopeteaddrbookexport.cpp:76
-#: kopete/contactlist/kopeteaddrbookexport.cpp:83
-#: kopete/contactlist/kopeteaddrbookexport.cpp:90
-#: kopete/contactlist/kopeteaddrbookexport.cpp:99
-#: kopete/contactlist/kopeteaddrbookexport.cpp:119
-msgid "<Not Set>"
-msgstr "<未设置>"
+#: protocols/sms/serviceloader.cpp:47
+msgid "Error Loading Service"
+msgstr "加载服务出错"
 
-#: kopete/contactlist/kopeteaddrbookexport.cpp:177
-msgid "Export to Address Book"
-msgstr "导出到地址簿"
+#: protocols/sms/smscontact.cpp:56
+msgid "Something went wrong when sending message."
+msgstr "发送消息时出现某些错误。"
 
-#: kopete/contactlist/kopeteaddrbookexport.cpp:181
-msgid "Set address book fields using the selected data from Kopete"
-msgstr "将地址簿域设置为使用 Kopete 中选中的数据"
+#: protocols/sms/smscontact.cpp:126
+msgid "&Contact Settings"
+msgstr "联系人设置(&C)"
 
-#: kopete/contactlist/kopetegroupviewitem.cpp:163
+#: protocols/sms/smsaccount.cpp:86
 msgid ""
-"_: (NUMBER OF ONLINE CONTACTS/NUMBER OF CONTACTS IN GROUP)\n"
-"(%1/%2)"
-msgstr "(%1/%2)"
+"This message is longer than the maximum length (%1). Should it be divided to %2 "
+"messages?"
+msgstr "这条消息超过了最大长度(%1)。要将它分割为 %2 条消息吗？"
 
-#: kopete/contactlist/kopetemetacontactlvi.cpp:134
-msgid ""
-"_: "
-"<tr>"
-"<td>STATUS ICON <b>PROTOCOL NAME</b> (ACCOUNT NAME)</td>"
-"<td>STATUS DESCRIPTION</td></tr>\n"
-"<tr>"
-"<td><img src=\"%1\">&nbsp;<nobr><b>%2</b></nobr>&nbsp;<nobr>(%3)</nobr></td>"
-"<td align=\"right\"><nobr>%4</nobr></td></tr>"
-msgstr ""
-"<tr>"
-"<td><img src=\"%1\">&nbsp;<nobr><b>%2</b></nobr>&nbsp;<nobr>(%3)</nobr></td>"
-"<td align=\"right\"><nobr>%4</nobr></td></tr>"
+#: protocols/sms/smsaccount.cpp:87
+msgid "Message Too Long"
+msgstr "消息太长"
 
-#: kopete/contactlist/kopetemetacontactlvi.cpp:383
-msgid "<qt><i>%1</i> is now %2.</qt>"
-msgstr "<qt><i>%1</i> 现在是 %2。</qt>"
+#: protocols/sms/smsaccount.cpp:87
+msgid "Divide"
+msgstr "拆分"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 16
-#: kopete/contactlist/kopetemetacontactlvi.cpp:440
-#: kopete/contactlist/kopetemetacontactlvi.cpp:444 rc.cpp:386
-#, no-c-format
-msgid "Chat"
-msgstr "聊天"
+#: protocols/sms/smsaccount.cpp:87
+msgid "Do Not Divide"
+msgstr "不拆分"
 
-#: kopete/kopeteballoon.cpp:98
-msgid ""
-"_: to view\n"
-"View"
-msgstr "查看"
+#: protocols/sms/smsaccount.cpp:149
+msgid "Message too long."
+msgstr "消息过长。"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 602
-#: kopete/kopeteballoon.cpp:100 protocols/yahoo/yahooaccount.cpp:1086
-#: protocols/yahoo/yahooaccount.cpp:1527 protocols/yahoo/yahooaccount.cpp:1750
-#: rc.cpp:2170 rc.cpp:2185 rc.cpp:2203 rc.cpp:2221
-#, no-c-format
-msgid "Ignore"
-msgstr "忽略"
+#: protocols/sms/smsuserpreferences.cpp:27
+msgid "User Preferences"
+msgstr "用户首选项"
 
-#: kopete/chatwindow/kopetechatwindow.cpp:194
-#: kopete/chatwindow/kopeteemailwindow.cpp:466
-#: kopete/chatwindow/kopeteemailwindow.cpp:484
-msgid "Send"
-msgstr "发送"
+#: protocols/jabber/jabbergroupcontact.cpp:116
+msgid "Change nick name"
+msgstr "更改昵称"
 
-#: kopete/chatwindow/kopetechatwindow.cpp:205
-msgid "Ready."
-msgstr "就绪。"
+#: protocols/jabber/jabbercontact.cpp:340
+#: protocols/jabber/jabbergroupcontact.cpp:164
+#: protocols/jabber/jabbergroupmembercontact.cpp:120
+msgid "Your message could not be delivered: \"%1\", Reason: \"%2\""
+msgstr "无法投递您的消息：“%1”，原因：“%2”"
 
-#: kopete/chatwindow/kopetechatwindow.cpp:316
-#: kopete/chatwindow/kopeteemailwindow.cpp:209
-msgid "&Send Message"
-msgstr "发送消息(&S)"
+#: libkopete/kopetetransfermanager.cpp:237 protocols/gadu/gaducontact.cpp:99
+#: protocols/irc/ircusercontact.cpp:150
+#: protocols/jabber/jabbercontact.cpp:1018
+#: protocols/jabber/jabbergroupcontact.cpp:299
+#: protocols/jabber/jabbergroupmembercontact.cpp:153
+msgid "Kopete File Transfer"
+msgstr "Kopete 文件传送"
 
-#: kopete/chatwindow/kopetechatwindow.cpp:323
-msgid "Close All Chats"
-msgstr "关闭全部聊天"
+#: protocols/jabber/jabbergroupcontact.cpp:356
+msgid "Change nickanme - Jabber Plugin"
+msgstr "更改昵称 - Jabber 插件"
 
-#: kopete/chatwindow/kopetechatwindow.cpp:327
-msgid "&Activate Next Tab"
-msgstr "激活下个标签(&A)"
+#: protocols/jabber/jabbergroupcontact.cpp:357
+msgid "Please enter the new nick name you want to have on the room <i>%1</i>"
+msgstr ""
+"请输入您想要显示在聊天室内的新昵称：\r\n"
+"<i>%1</i>"
 
-#: kopete/chatwindow/kopetechatwindow.cpp:329
-msgid "&Activate Previous Tab"
-msgstr "激活上个标签(&A)"
+#: protocols/jabber/jabberchatsession.cpp:68
+#: protocols/jabber/jabbercontact.cpp:233
+msgid "Voice call"
+msgstr "语音对话"
 
-#: kopete/chatwindow/kopetechatwindow.cpp:334
-msgid "Nic&k Completion"
-msgstr "昵称补全(&K)"
+#: protocols/jabber/jabberchatsession.cpp:120
+msgid ""
+"_: a contact's online status in parenthesis.\n"
+" (%1)"
+msgstr " (%1)"
 
-#: kopete/chatwindow/kopetechatwindow.cpp:337
-msgid "&Detach Chat"
-msgstr "漂移聊天(&D)"
+#: protocols/jabber/jabberchatsession.cpp:267
+#: protocols/jabber/jabbergroupchatmanager.cpp:103
+msgid "This message is encrypted."
+msgstr "消息被加密。"
 
-#: kopete/chatwindow/kopetechatwindow.cpp:341
-msgid "&Move Tab to Window"
-msgstr "将标签移动到窗口(&M)"
+#: libkopete/kopeteaccount.cpp:368 protocols/jabber/jabbertransport.cpp:128
+#: protocols/oscar/aim/aimaccount.cpp:309
+msgid "%2 <%1>"
+msgstr "%2 <%1>"
 
-#: kopete/chatwindow/kopetechatwindow.cpp:347
-msgid "&Tab Placement"
-msgstr "标签放置(&T)"
+#: protocols/jabber/jabberbasecontact.cpp:133
+msgid "You cannot see each others' status."
+msgstr "双方都无法看到对方的状态。"
 
-#: kopete/chatwindow/kopetechatwindow.cpp:357
-msgid "Set Default &Font..."
-msgstr "设定默认字体(&F)..."
+#: protocols/jabber/jabberbasecontact.cpp:137
+msgid "You can see this contact's status but they cannot see your status."
+msgstr "您可以看到此联系人的状态，但他看不到您的状态。"
 
-#: kopete/chatwindow/kopetechatwindow.cpp:358
-msgid "Set Default Text &Color..."
-msgstr "设定默认文字颜色(&C)..."
+#: protocols/jabber/jabberbasecontact.cpp:141
+msgid "This contact can see your status but you cannot see their status."
+msgstr "此联系人可以看到您的状态，但您看不到他的状态。"
 
-#: kopete/chatwindow/kopetechatwindow.cpp:359
-#: kopete/chatwindow/kopeteemailwindow.cpp:224
-msgid "Set &Background Color..."
-msgstr "设定背景颜色(&B)..."
+#: protocols/jabber/jabberbasecontact.cpp:145
+msgid "You can see each others' status."
+msgstr "您可以看到其他人的状态。"
 
-#: kopete/chatwindow/kopetechatwindow.cpp:361
-msgid "Previous History"
-msgstr "上次历史"
+#: protocols/jabber/jabberbasecontact.cpp:255
+msgid "Client"
+msgstr "客户"
 
-#: kopete/chatwindow/kopetechatwindow.cpp:365
-msgid "Next History"
-msgstr "下次历史"
+#: protocols/jabber/jabberbasecontact.cpp:280
+msgid "Timestamp"
+msgstr "时间戳"
 
-#: kopete/chatwindow/kopetechatwindow.cpp:374
-msgid "Place to Left of Chat Area"
-msgstr "放到聊天区左侧"
+#: protocols/jabber/jabberbasecontact.cpp:287
+msgid "Message"
+msgstr "消息"
 
-#: kopete/chatwindow/kopetechatwindow.cpp:376
-msgid "Place to Right of Chat Area"
-msgstr "放到聊天区右侧"
+#: protocols/jabber/jabberbasecontact.cpp:651
+#: protocols/jabber/ui/dlgjabbervcard.cpp:480
+msgid "Downloading of Jabber contact photo failed!"
+msgstr "下载 Jabber 联系人照片失败！"
 
-#: kopete/chatwindow/kopetechatwindow.cpp:378
-msgid "Show"
-msgstr "显示"
+#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:47
+#, c-format
+msgid "Voice session with %1"
+msgstr "正在和 %1 进行语音会话"
 
-#: kopete/chatwindow/kopetechatwindow.cpp:380
-msgid "Hide"
-msgstr "隐藏"
+#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:72
+msgid "Incoming Session..."
+msgstr "正在接收会话..."
 
-#: kopete/chatwindow/kopetechatwindow.cpp:381
-msgid "Automatic Spell Checking"
-msgstr "自动检查拼写"
+#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:98
+msgid "Waiting for other peer..."
+msgstr "正在等待对方回应..."
 
-#: kopete/chatwindow/kopetechatwindow.cpp:389
-msgid "Co&ntacts"
-msgstr "联系人(&N)"
+#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:109
+#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:162
+msgid "Session accepted."
+msgstr "会话已接受。"
 
-#: kopete/chatwindow/kopetechatwindow.cpp:415
-#: kopete/chatwindow/kopeteemailwindow.cpp:248
-msgid "Toolbar Animation"
-msgstr "工具栏动画"
+#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:121
+#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:174
+msgid "Session declined."
+msgstr "会话被拒绝。"
 
-#: kopete/chatwindow/kopetechatwindow.cpp:608
-msgid "Close the current tab"
-msgstr "关闭当前标签"
+#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:134
+#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:186
+msgid "Session terminated."
+msgstr "会话结束。"
 
-#: kopete/chatwindow/kopetechatwindow.cpp:996
-msgid "More..."
-msgstr "更多..."
+#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:150
+msgid "Session in progress."
+msgstr "会话进行中。"
 
-#: kopete/chatwindow/kopetechatwindow.cpp:1199
-msgid "Plugin Actions"
-msgstr "插件操作"
+#: protocols/gadu/gadudcctransaction.cpp:237
+#: protocols/jabber/jabberfiletransfer.cpp:148
+msgid "&Resume"
+msgstr "续传(&R)"
 
-#: kopete/chatwindow/chatmessagepart.cpp:262
-#: plugins/history/historydialog.cpp:178
-msgid "Copy Link Address"
-msgstr "复制链接地址"
+#: protocols/gadu/gadudcctransaction.cpp:238
+#: protocols/jabber/jabberfiletransfer.cpp:149
+msgid "Over&write"
+msgstr "覆盖(&W)"
 
-#: kopete/chatwindow/chatmessagepart.cpp:287
-msgid "Save Conversation"
-msgstr "保存对话"
+#: protocols/gadu/gadudcctransaction.cpp:240
+#: protocols/jabber/jabberfiletransfer.cpp:152
+msgid "The file %1 already exists, do you want to resume or overwrite it?"
+msgstr "文件 %1 已经存在，您是想要续传还是覆盖？"
 
-#: kopete/chatwindow/chatmessagepart.cpp:325
-msgid "<qt>Could not open <b>%1</b> for writing.</qt>"
-msgstr "<qt>无法打开 <b>%1</b> 进行写入。</qt>"
+#: protocols/gadu/gadudcctransaction.cpp:241
+#: protocols/jabber/jabberfiletransfer.cpp:153
+#, c-format
+msgid "File Exists: %1"
+msgstr "文件已存在：%1"
 
-#: kopete/chatwindow/chatmessagepart.cpp:326
-msgid "Error While Saving"
-msgstr "保存时出错"
+#: protocols/jabber/jabberaccount.cpp:166
+msgid ""
+"Could not bind Jabber file transfer manager to local port. Please check if the "
+"file transfer port is already in use or choose another port in the account "
+"settings."
+msgstr "无法将 Jabber 文件传送管理器绑定到本地端口上。请检查文件传送端口是否已在使用，或者在账户设置中选择另外一个端口。"
 
-#: kopete/chatwindow/chatmessagepart.cpp:674
-msgid "User Has Left"
-msgstr "用户离开了"
+#: protocols/jabber/jabberaccount.cpp:167
+msgid "Failed to start Jabber File Transfer Manager"
+msgstr "启动 Jabber 文件传送管理器失败"
 
-#: kopete/chatwindow/kopeteemailwindow.cpp:155
-msgid "<< Prev"
-msgstr "<< 上次"
+#: protocols/jabber/jabberaccount.cpp:181
+msgid "Join Groupchat..."
+msgstr "加入小组聊天..."
 
-#: kopete/chatwindow/kopeteemailwindow.cpp:160
-msgid "(0) Next >>"
-msgstr "(0) 下次 >>"
+#: protocols/jabber/jabberaccount.cpp:192
+msgid "Services..."
+msgstr "服务..."
 
-#: kopete/chatwindow/kopeteemailwindow.cpp:220
-msgid "&Set Font..."
-msgstr "设定字体(&S)..."
+#: protocols/jabber/jabberaccount.cpp:197
+msgid "Send Raw Packet to Server..."
+msgstr "给服务器发送原始包..."
 
-#: kopete/chatwindow/kopeteemailwindow.cpp:222
-msgid "Set Text &Color..."
-msgstr "设定文字颜色(&C)..."
+#: protocols/jabber/jabberaccount.cpp:202
+#: protocols/oscar/aim/aimaccount.cpp:334
+msgid "Edit User Info..."
+msgstr "编辑用户信息..."
 
-#: kopete/chatwindow/kopeteemailwindow.cpp:347
-msgid "(%1) Next >>"
-msgstr "(%1) 下次 >>"
+#: protocols/jabber/jabberaccount.cpp:259
+msgid "Please connect first."
+msgstr "请先连接。"
 
-#: kopete/chatwindow/chatview.cpp:355
-#: kopete/chatwindow/kopeteemailwindow.cpp:425
+#: protocols/jabber/jabberaccount.cpp:259
+#: protocols/jabber/ui/dlgjabberbrowse.cpp:63
+#: protocols/jabber/ui/dlgjabberchatroomslist.cpp:89
+#: protocols/jabber/ui/dlgjabberregister.cpp:53
+#: protocols/jabber/ui/dlgjabberservices.cpp:125
+msgid "Jabber Error"
+msgstr "Jabber 错误"
+
+#: protocols/groupwise/gwaccount.cpp:251
+#: protocols/jabber/jabberaccount.cpp:424
+#: protocols/jabber/ui/jabberregisteraccount.cpp:267
+#, fuzzy
 msgid ""
-"<qt>You are about to leave the group chat session <b>%1</b>."
-"<br>You will not receive future messages from this conversation.</qt>"
-msgstr "<qt>您即将离开小组聊天会话 <b>%1</b>。<br>您将不会从对话中收到将来的消息。</qt>"
+"SSL support could not be initialized for account %1. This is most likely "
+"because the TQCA TLS plugin is not installed on your system."
+msgstr "无法为账户 %1 初始化 SSL。这很可能是因为您的系统中未安装 QCA TLS 插件。"
 
-#: kopete/chatwindow/chatview.cpp:356
-#: kopete/chatwindow/kopeteemailwindow.cpp:426
-msgid "Closing Group Chat"
-msgstr "关闭小组聊天"
+#: protocols/jabber/jabberaccount.cpp:426
+#: protocols/jabber/ui/jabberregisteraccount.cpp:269
+msgid "Jabber SSL Error"
+msgstr "Jabber SSL 错误"
 
-#: kopete/chatwindow/chatview.cpp:357 kopete/chatwindow/chatview.cpp:364
-#: kopete/chatwindow/chatview.cpp:371
-#: kopete/chatwindow/kopeteemailwindow.cpp:427
-#: kopete/chatwindow/kopeteemailwindow.cpp:434
-#: kopete/chatwindow/kopeteemailwindow.cpp:441
-msgid "Cl&ose Chat"
-msgstr "关闭聊天(&O)"
+#: protocols/groupwise/gwaccount.cpp:720
+#: protocols/jabber/jabberaccount.cpp:455
+msgid "No certificate was presented."
+msgstr "没有证书。"
 
-#: kopete/chatwindow/chatview.cpp:362
-#: kopete/chatwindow/kopeteemailwindow.cpp:432
+#: protocols/groupwise/gwaccount.cpp:724
+#: protocols/jabber/jabberaccount.cpp:459
+msgid "The host name does not match the one in the certificate."
+msgstr "主机名与证书不符。"
+
+#: protocols/groupwise/gwaccount.cpp:728
+#: protocols/jabber/jabberaccount.cpp:463
+msgid "The Certificate Authority rejected the certificate."
+msgstr "证书颁发机构拒绝了证书。"
+
+#: protocols/groupwise/gwaccount.cpp:733
+#: protocols/jabber/jabberaccount.cpp:468
+msgid "The certificate is untrusted."
+msgstr "证书不可信。"
+
+#: protocols/groupwise/gwaccount.cpp:737
+#: protocols/jabber/jabberaccount.cpp:472
+msgid "The signature is invalid."
+msgstr "签名无效。"
+
+#: protocols/groupwise/gwaccount.cpp:741
+#: protocols/jabber/jabberaccount.cpp:476
+msgid "The Certificate Authority is invalid."
+msgstr "证书颁发机构无效。"
+
+#: protocols/groupwise/gwaccount.cpp:746
+#: protocols/jabber/jabberaccount.cpp:481
+msgid "Invalid certificate purpose."
+msgstr "无效的证书用途。"
+
+#: protocols/groupwise/gwaccount.cpp:750
+#: protocols/jabber/jabberaccount.cpp:485
+msgid "The certificate is self-signed."
+msgstr "证书自签名。"
+
+#: protocols/groupwise/gwaccount.cpp:754
+#: protocols/jabber/jabberaccount.cpp:489
+msgid "The certificate has been revoked."
+msgstr "证书已被吊销。"
+
+#: protocols/groupwise/gwaccount.cpp:758
+#: protocols/jabber/jabberaccount.cpp:493
+msgid "Maximum certificate chain length was exceeded."
+msgstr "超过了证书链的最大长度。"
+
+#: protocols/groupwise/gwaccount.cpp:762
+#: protocols/jabber/jabberaccount.cpp:497
+msgid "The certificate has expired."
+msgstr "证书已过期。"
+
+#: protocols/groupwise/gwaccount.cpp:767
+#: protocols/jabber/jabberaccount.cpp:502
+msgid "An unknown error occurred trying to validate the certificate."
+msgstr "试图验证证书时发生了未知错误。"
+
+#: protocols/jabber/jabberaccount.cpp:508
 msgid ""
-"<qt>You have received a message from <b>%1</b> in the last second. Are you sure "
-"you want to close this chat?</qt>"
-msgstr "<qt>您在上一秒收到了来自 <b>%1</b> 的消息。您确定想要关闭此聊天吗？</qt>"
+"<qt>"
+"<p>The certificate of server %1 could not be validated for account %2: %3</p>"
+"<p>Do you want to continue?</p></qt>"
+msgstr "<qt><p>服务器 %1 的证书无法被账户 %2 验证：%3</p><p>您想要继续吗？</p></qt>"
 
-#: kopete/chatwindow/chatview.cpp:363
-#: kopete/chatwindow/kopeteemailwindow.cpp:433
-msgid "Unread Message"
-msgstr "未读消息"
+#: protocols/jabber/jabberaccount.cpp:510
+msgid "Jabber Connection Certificate Problem"
+msgstr "Jabber 连接证书问题"
 
-#: kopete/chatwindow/chatview.cpp:369
-#: kopete/chatwindow/kopeteemailwindow.cpp:439
+#: protocols/jabber/jabberaccount.cpp:542
 msgid ""
-"You have a message send in progress, which will be aborted if this chat is "
-"closed. Are you sure you want to close this chat?"
-msgstr "您仍有消息处于发送中。如果关闭了此聊天，发送将会被迫中断。您确定想要关闭此聊天吗？"
+"An encrypted connection with the Jabber server could not be established."
+msgstr "无法建立与 Jabber 服务器的加密连接。"
 
-#: kopete/chatwindow/chatview.cpp:370
-#: kopete/chatwindow/kopeteemailwindow.cpp:440
-msgid "Message in Transit"
-msgstr "消息传送中"
+#: protocols/jabber/jabberaccount.cpp:543
+msgid "Jabber Connection Error"
+msgstr "Jabber 连接错误"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 774
-#: kopete/chatwindow/kopeteemailwindow.cpp:473 rc.cpp:2230
-#, no-c-format
-msgid "Reply"
-msgstr "答复"
+#: protocols/jabber/jabberaccount.cpp:743
+msgid "Malformed packet received."
+msgstr "接收到了格式错误的包。"
 
-#: kopete/chatwindow/kopeteemoticonaction.cpp:65
-msgid "Add Smiley"
-msgstr "添加笑脸"
+#: protocols/jabber/jabberaccount.cpp:748
+msgid "There was an unrecoverable error in the protocol."
+msgstr "协议中有不可恢复的错误。"
 
-#: kopete/chatwindow/krichtexteditpart.cpp:117
-msgid "KopeteRichTextEditPart"
-msgstr "KopeteRichTextEditPart"
+#: protocols/jabber/jabberaccount.cpp:755
+msgid "Generic stream error (sorry, I do not have a more-detailed reason)"
+msgstr "常规系统错误(抱歉，没有更详细的原因)"
 
-#: kopete/chatwindow/krichtexteditpart.cpp:118
-msgid "A simple rich text editor part for Kopete"
-msgstr "Kopete 简单的丰富文字编辑器部件"
+#: protocols/jabber/jabberaccount.cpp:759
+msgid "There was a conflict in the information received."
+msgstr "接收到的信息有冲突。"
 
-#: kopete/chatwindow/krichtexteditpart.cpp:127
-msgid "Enable &Rich Text"
-msgstr "启用丰富文本(&R)"
+#: protocols/jabber/jabberaccount.cpp:762
+msgid "The stream timed out."
+msgstr "流超时。"
 
-#: kopete/chatwindow/krichtexteditpart.cpp:129
-msgid "Disable &Rich Text"
-msgstr "禁用丰富文本(&R)"
+#: protocols/jabber/jabberaccount.cpp:765
+msgid "Internal server error."
+msgstr "服务器内部错误。"
 
-#: kopete/chatwindow/krichtexteditpart.cpp:133
-msgid "Check &Spelling"
-msgstr "拼写检查(&S)"
+#: protocols/jabber/jabberaccount.cpp:768
+msgid "Stream packet received from an invalid address."
+msgstr "从无效地址接收到了流包。"
 
-#: kopete/chatwindow/krichtexteditpart.cpp:137
-msgid "Text &Color..."
-msgstr "文字颜色(&C)..."
+#: protocols/jabber/jabberaccount.cpp:771
+msgid "Malformed stream packet received."
+msgstr "接收到了格式错误的流包。"
 
-#: kopete/chatwindow/krichtexteditpart.cpp:142
-msgid "Background Co&lor..."
-msgstr "背景颜色(&L)..."
+#: protocols/jabber/jabberaccount.cpp:775
+msgid "Policy violation in the protocol stream."
+msgstr "协议流违反了策略。"
 
-#: kopete/chatwindow/krichtexteditpart.cpp:147
-msgid "&Font"
-msgstr "字体(&F)"
+#: protocols/jabber/jabberaccount.cpp:779
+msgid "Resource constraint."
+msgstr "资源约束。"
 
-#: kopete/chatwindow/krichtexteditpart.cpp:153
-msgid "Font &Size"
-msgstr "字体大小(&S)"
+#: protocols/jabber/jabberaccount.cpp:783
+msgid "System shutdown."
+msgstr "系统关闭。"
 
-#: kopete/chatwindow/krichtexteditpart.cpp:159
-msgid "&Bold"
-msgstr "粗体(&B)"
+#: protocols/jabber/jabberaccount.cpp:786
+msgid "Unknown reason."
+msgstr "未知原因。"
 
-#: kopete/chatwindow/krichtexteditpart.cpp:164
-msgid "&Italic"
-msgstr "斜体(&I)"
+#: protocols/jabber/jabberaccount.cpp:790
+#, c-format
+msgid "There was an error in the protocol stream: %1"
+msgstr "协议流有错：%1。"
 
-#: kopete/chatwindow/krichtexteditpart.cpp:169
-msgid "&Underline"
-msgstr "下划线(&U)"
+#: protocols/jabber/jabberaccount.cpp:798
+msgid "Host not found."
+msgstr "找不到主机。"
 
-#: kopete/chatwindow/krichtexteditpart.cpp:183
-msgid "Align &Left"
-msgstr "左对齐(&L)"
+#: protocols/jabber/jabberaccount.cpp:801
+msgid "Address is already in use."
+msgstr "地址已在使用中。"
 
-#: kopete/chatwindow/krichtexteditpart.cpp:188
-msgid "Align &Center"
-msgstr "居中对齐(&C)"
+#: protocols/jabber/jabberaccount.cpp:804
+msgid "Cannot recreate the socket."
+msgstr "无法重建套接字。"
 
-#: kopete/chatwindow/krichtexteditpart.cpp:193
-msgid "Align &Right"
-msgstr "右对齐(&R)"
+#: protocols/jabber/jabberaccount.cpp:807
+msgid "Cannot bind the socket again."
+msgstr "无法再次绑定套接字。"
 
-#: kopete/chatwindow/krichtexteditpart.cpp:198
-msgid "&Justify"
-msgstr "两端对齐(&J)"
+#: protocols/jabber/jabberaccount.cpp:810
+msgid "Socket is already connected."
+msgstr "套接字已在连接中。"
 
-#: kopete/chatwindow/chatview.cpp:407
-#, c-format
-msgid ""
-"_n: One other person in the chat\n"
-"%n other people in the chat"
-msgstr "聊天中的 %n 个其它人"
+#: protocols/jabber/jabberaccount.cpp:813
+msgid "Socket is not connected."
+msgstr "套接字未连接。"
 
-#: kopete/chatwindow/chatview.cpp:550
-msgid "%1 is typing a message"
-msgstr "%1 正在输入消息"
+#: protocols/jabber/jabberaccount.cpp:816
+msgid "Socket is not bound."
+msgstr "套接字未绑定。"
 
-#: kopete/chatwindow/chatview.cpp:554
+#: protocols/jabber/jabberaccount.cpp:819
+msgid "Socket has not been created."
+msgstr "套接字尚未创建。"
+
+#: protocols/jabber/jabberaccount.cpp:822
 msgid ""
-"_: %1 is a list of names\n"
-"%1 are typing a message"
-msgstr "%1 正在输入消息"
+"Socket operation would block. You should not see this error, please use "
+"\"Report Bug\" from the Help menu."
+msgstr "套接字操作将阻塞。您不应该看到此错误，请使用帮助菜单中的“报告错误”。"
 
-#: kopete/chatwindow/chatview.cpp:596 kopete/chatwindow/chatview.cpp:605
-msgid "%1 is now known as %2"
-msgstr "%1 现在是 %2"
+#: protocols/jabber/jabberaccount.cpp:825
+msgid "Connection refused."
+msgstr "连接被拒绝。"
 
-#: kopete/chatwindow/chatview.cpp:634
-msgid "%1 has joined the chat."
-msgstr "%1 加入了交谈。"
+#: protocols/jabber/jabberaccount.cpp:828
+msgid "Connection timed out."
+msgstr "连接超时。"
 
-#: kopete/chatwindow/chatview.cpp:685
-msgid "%1 has left the chat."
-msgstr "%1 离开了交谈"
+#: protocols/jabber/jabberaccount.cpp:831
+msgid "Connection attempt already in progress."
+msgstr "连接已经在进行中."
 
-#: kopete/chatwindow/chatview.cpp:687
-msgid "%1 has left the chat (%2)."
-msgstr "%1 离开了交谈(%2)。"
+#: protocols/jabber/jabberaccount.cpp:834
+msgid "Network failure."
+msgstr "网络失败。"
+
+#: protocols/jabber/jabberaccount.cpp:837
+msgid "Operation is not supported."
+msgstr "操作不支持。"
+
+#: protocols/jabber/jabberaccount.cpp:840
+msgid "Socket timed out."
+msgstr "套接字超时。"
 
-#: kopete/chatwindow/chatview.cpp:787
+#: protocols/jabber/jabberaccount.cpp:848
 #, c-format
-msgid "You are now marked as %1."
-msgstr "您已经标为 %1。"
+msgid "There was a connection error: %1"
+msgstr "连接发生错误：%1"
 
-#: kopete/chatwindow/chatview.cpp:794 kopete/chatwindow/chatview.cpp:800
-msgid "%2 is now %1."
-msgstr "%2 现在是 %1。"
+#: protocols/jabber/jabberaccount.cpp:856
+msgid "Unknown host."
+msgstr "未知主机。"
 
-#: kopete/addcontactwizard/fastaddcontactwizard.cpp:89
-msgid ""
-"_: The account name is prepended here\n"
-"%1 contact information"
-msgstr "%1 联系人信息"
+#: protocols/jabber/jabberaccount.cpp:860
+msgid "Could not connect to a required remote resource."
+msgstr "无法连接到所请求的远程资源。"
 
-#: kopete/addcontactwizard/addcontactwizard.cpp:286
+#: protocols/jabber/jabberaccount.cpp:863
 msgid ""
-"_: The user has to select the contact to add to the given account name\n"
-"Choose New Contact For %1 Account <b>%2</b>"
-msgstr "为 %1 账户 <b>%2</b> 选择新联系人"
+"It appears we have been redirected to another server; I do not know how to "
+"handle this."
+msgstr "似乎被重定向到另外一台服务器。目前尚无法处理这种情况。"
 
-#. i18n: file ./libkopete/ui/kopetepassworddialog.ui line 64
-#: rc.cpp:3 rc.cpp:1990 rc.cpp:2869
-#, no-c-format
-msgid "&Password:"
-msgstr "密码(&P)："
+#: protocols/jabber/jabberaccount.cpp:866
+msgid "Unsupported protocol version."
+msgstr "不支持的协议版本。"
 
-#. i18n: file ./libkopete/ui/kopetepassworddialog.ui line 82
-#: rc.cpp:6
-#, no-c-format
-msgid "&Remember password"
-msgstr "记住密码(&R)"
+#: protocols/jabber/jabberaccount.cpp:869
+#: protocols/jabber/jabberaccount.cpp:886
+#: protocols/jabber/jabberaccount.cpp:930
+#: protocols/jabber/jabberaccount.cpp:947
+#: protocols/jabber/jabberaccount.cpp:964
+#: protocols/jabber/jabberaccount.cpp:972
+msgid "Unknown error."
+msgstr "未知错误。"
 
-#. i18n: file ./libkopete/ui/kopetepasswordwidgetbase.ui line 36
-#: rc.cpp:9
-#, no-c-format
-msgid "Remember password"
-msgstr "记住密码"
+#: protocols/jabber/jabberaccount.cpp:873
+#, c-format
+msgid "There was a negotiation error: %1"
+msgstr "谈判发生错误：%1"
 
-#. i18n: file ./libkopete/ui/kopetepasswordwidgetbase.ui line 39
-#: rc.cpp:12
-#, no-c-format
+#: protocols/jabber/jabberaccount.cpp:880
+msgid "Server rejected our request to start the TLS handshake."
+msgstr "服务器拒绝开始 TLS 握手的请求。"
+
+#: protocols/jabber/jabberaccount.cpp:883
+msgid "Failed to establish a secure connection."
+msgstr "建立安全连接失败。"
+
+#: protocols/jabber/jabberaccount.cpp:890
+#, c-format
+msgid "There was a Transport Layer Security (TLS) error: %1"
+msgstr "传送层安全性(TLS)有错：%1"
+
+#: protocols/jabber/jabberaccount.cpp:897
+msgid "Login failed with unknown reason."
+msgstr "连接失败，原因未知。"
+
+#: protocols/jabber/jabberaccount.cpp:900
+msgid "No appropriate authentication mechanism available."
+msgstr "没有适当的身份验证算法。"
+
+#: protocols/jabber/jabberaccount.cpp:903
+msgid "Bad SASL authentication protocol."
+msgstr "无效的 SASL 认证协议。"
+
+#: protocols/jabber/jabberaccount.cpp:906
+msgid "Server failed mutual authentication."
+msgstr "服务器双向身份验证失败。"
+
+#: protocols/jabber/jabberaccount.cpp:909
+msgid "Encryption is required but not present."
+msgstr "需要加密但没有加密。"
+
+#: protocols/jabber/jabberaccount.cpp:912
+msgid "Invalid user ID."
+msgstr "无效的用户ID。"
+
+#: protocols/jabber/jabberaccount.cpp:915
+msgid "Invalid mechanism."
+msgstr "无效的算法。"
+
+#: protocols/jabber/jabberaccount.cpp:918
+msgid "Invalid realm."
+msgstr "无效域。"
+
+#: protocols/jabber/jabberaccount.cpp:921
+msgid "Mechanism too weak."
+msgstr "算法太弱。"
+
+#: protocols/jabber/jabberaccount.cpp:924
+msgid "Wrong credentials supplied. (check your user ID and password)"
+msgstr "提供了错误的凭证。(请检查您的用户 ID 和密码)"
+
+#: protocols/jabber/jabberaccount.cpp:927
+msgid "Temporary failure, please try again later."
+msgstr "临时失败。请稍候重试。"
+
+#: protocols/jabber/jabberaccount.cpp:934
+#, c-format
+msgid "There was an error authenticating with the server: %1"
+msgstr "与服务器进行身份验证时出错：%1"
+
+#: protocols/jabber/jabberaccount.cpp:941
+msgid "Transport Layer Security (TLS) problem."
+msgstr "传送层安全(TLS)有问题。"
+
+#: protocols/jabber/jabberaccount.cpp:944
+msgid "Simple Authentication and Security Layer (SASL) problem."
+msgstr "简单身份验证和安全层(SASL)问题。"
+
+#: protocols/jabber/jabberaccount.cpp:951
+#, c-format
+msgid "There was an error in the security layer: %1"
+msgstr "安全层有错：%1"
+
+#: protocols/jabber/jabberaccount.cpp:958
+msgid "No permission to bind the resource."
+msgstr "没有权限绑定资源。"
+
+#: protocols/jabber/jabberaccount.cpp:961
+msgid "The resource is already in use."
+msgstr "资源已在使用中。"
+
+#: protocols/jabber/jabberaccount.cpp:968
+#, c-format
+msgid "Could not bind a resource: %1"
+msgstr "无法绑定资源：%1"
+
+#: protocols/jabber/jabberaccount.cpp:984
+#, c-format
+msgid "Connection problem with Jabber server %1"
+msgstr "连接到 Jabber 服务器 %1 时出错"
+
+#: protocols/jabber/jabberaccount.cpp:1122
 msgid ""
-"Check this and enter your password below if you would like your password to be "
-"stored in your wallet, so Kopete does not have to ask you for it each time it "
-"is needed."
-msgstr "如果您想要在钱包中保存您的密码，请选中此选项，然后再下面输入您的密码。这样，Kopete 将不会在每次需要时询问您的密码。"
+"The Jabber user %1 removed %2's subscription to them. This account will no "
+"longer be able to view their online/offline status. Do you want to delete the "
+"contact?"
+msgstr "Jabber 用户 %1 删除了 %2 对他的订阅。此账户将无法再看到他的在线/离线状态。您想要删除该联系人吗？"
 
-#. i18n: file ./libkopete/ui/kopetepasswordwidgetbase.ui line 64
-#: rc.cpp:15
-#, no-c-format
-msgid "Password:"
-msgstr "密码："
+#: libkopete/knotification.cpp:121 libkopete/knotification.cpp:142
+#: protocols/jabber/jabberaccount.cpp:1125
+#: protocols/jabber/jabbercontact.cpp:920
+msgid "Notification"
+msgstr "通知"
 
-#. i18n: file ./libkopete/ui/kopetepasswordwidgetbase.ui line 83
-#: rc.cpp:18
-#, no-c-format
-msgid "Enter your password here."
-msgstr "请在此输入您的密码。"
+#: protocols/jabber/jabberaccount.cpp:1302
+msgid "Waiting for authorization"
+msgstr "等待认证"
 
-#. i18n: file ./libkopete/ui/kopetepasswordwidgetbase.ui line 86
-#: rc.cpp:21
-#, no-c-format
+#: protocols/jabber/jabberaccount.cpp:1515
+#, c-format
+msgid "A password is required to join the room %1."
+msgstr "进入房间 %1 需要密码。"
+
+#: protocols/jabber/jabberaccount.cpp:1524
+msgid "Error trying to join %1 : nickname %2 is already in use"
+msgstr "试图加入 %1 时出错：昵称 %2 已正被使用"
+
+#: protocols/jabber/jabberaccount.cpp:1525
+msgid "Give your nickname"
+msgstr "您的昵称"
+
+#: protocols/jabber/jabberaccount.cpp:1538
+msgid "You can't join the room %1 because you were banned"
+msgstr "<qt>您无法加入房间 %1，因为您被屏蔽了。</qt>"
+
+#: protocols/jabber/jabberaccount.cpp:1539
+#: protocols/jabber/jabberaccount.cpp:1546
+#: protocols/jabber/jabberaccount.cpp:1556
+msgid "Jabber Group Chat"
+msgstr "Jabber 小组聊天"
+
+#: protocols/jabber/jabberaccount.cpp:1545
+msgid "You can't join the room %1 because the maximum users has been reached"
+msgstr "您无法进入房间 %1，因为此房间已达人数上限。"
+
+#: protocols/jabber/jabberaccount.cpp:1551
+msgid "No reason given by the server"
+msgstr "服务器未给出原因"
+
+#: protocols/jabber/jabberaccount.cpp:1555
 msgid ""
-"Enter your password here. If you would rather not save your password, uncheck "
-"the Remember password checkbox above; you will then be prompted for your "
-"password whenever it is needed."
-msgstr "在此输入您的密码。如果您不想保存您的密码，请去掉上面的记住密码复选框；每当需要提供密码时，您都会被提示输入。"
+"There was an error processing your request for group chat %1. (Reason: %2, Code "
+"%3)"
+msgstr "处理您在群组聊天 %1 中的请求出错。(原因：%2，代码：%3)"
 
-#. i18n: file ./libkopete/ui/fileconfirmbase.ui line 33
-#: rc.cpp:27
-#, no-c-format
+#: protocols/jabber/jabberaccount.cpp:1688
 msgid ""
-"A user is trying to send you a file. The file will only be downloaded if you "
-"accept this dialog. If you do not wish to receive it, please click 'Refuse'. "
-"This file will never be executed by Kopete at any point during or after the "
-"transfer."
+"Do you want to also unregister \"%1\" from the Jabber server ?\n"
+"If you unregister, all your contact list may be removed on the server,And you "
+"will never be able to connect to this account with any client"
 msgstr ""
-"有用户尝试向您发送文件。只有您接受此对话框后，才会下载该文件。如果您不想接收该文件，请单击“拒绝”。在传输进行的过程及传送完成后的任何时刻，Kopete "
-"都不会执行该文件。"
+"您希望同时从 Jabber 服务器上注销账户“%1”吗？\n"
+"如果您选择注销，您的全部联系人列表将从服务器上被删除，同时您再也无法使用任何客户端连接到此账户。"
 
-#. i18n: file ./libkopete/ui/fileconfirmbase.ui line 44
-#: rc.cpp:30
-#, no-c-format
-msgid "From:"
-msgstr "来自："
+#: protocols/jabber/jabberaccount.cpp:1691
+msgid "Unregister"
+msgstr "注销"
 
-#. i18n: file ./libkopete/ui/fileconfirmbase.ui line 52
-#: rc.cpp:33
-#, no-c-format
-msgid "File name:"
-msgstr "文件名："
+#: protocols/jabber/jabberaccount.cpp:1692
+msgid "Remove and Unregister"
+msgstr "删除并注销"
 
-#. i18n: file ./libkopete/ui/fileconfirmbase.ui line 65
-#: rc.cpp:36
-#, no-c-format
-msgid "&Browse..."
-msgstr "浏览(&B)..."
+#: protocols/jabber/jabberaccount.cpp:1693
+msgid "Remove from kopete only"
+msgstr "只从 Kopete 删除"
 
-#. i18n: file ./libkopete/ui/fileconfirmbase.ui line 73
-#: rc.cpp:39
-#, no-c-format
-msgid "Size:"
-msgstr "大小："
+#: protocols/jabber/jabberaccount.cpp:1737
+#, c-format
+msgid ""
+"An error occured when trying to remove the account:\n"
+"%1"
+msgstr ""
+"试图删除账户时出错：\n"
+"%1"
 
-#. i18n: file ./libkopete/ui/fileconfirmbase.ui line 81
-#: rc.cpp:42 rc.cpp:5309
-#, no-c-format
-msgid "Description:"
-msgstr "描述："
+#: protocols/jabber/jabberaccount.cpp:1738
+msgid "Jabber Account Unregistration"
+msgstr "Jabber 账户注销"
 
-#. i18n: file ./libkopete/ui/fileconfirmbase.ui line 114
-#: rc.cpp:45
-#, no-c-format
-msgid "Save to:"
-msgstr "保存到："
+#: protocols/jabber/jabbercontact.cpp:135
+msgid "Authorization"
+msgstr "身份认证"
 
-#. i18n: file ./libkopete/ui/addressbooklinkwidget_base.ui line 41
-#: rc.cpp:48
-#, no-c-format
-msgid "The TDE Address Book entry associated with this Kopete Contact"
-msgstr "与此 Kopete 联系人关联的 TDE 地址簿项"
+#: protocols/jabber/jabbercontact.cpp:139
+msgid "(Re)send Authorization To"
+msgstr "(重新)发送授权"
 
-#. i18n: file ./libkopete/ui/addressbooklinkwidget_base.ui line 63
-#: rc.cpp:54 rc.cpp:546
-#, no-c-format
-msgid "C&hange..."
-msgstr "更改(&H)..."
+#: protocols/jabber/jabbercontact.cpp:144
+msgid "(Re)request Authorization From"
+msgstr "(重新)请求授权"
 
-#. i18n: file ./libkopete/ui/addressbooklinkwidget_base.ui line 66
-#: rc.cpp:57
-#, no-c-format
-msgid "Select an address book entry"
-msgstr "选择地址簿项"
+#: protocols/jabber/jabbercontact.cpp:149
+msgid "Remove Authorization From"
+msgstr "删除请求授权"
 
-#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 25
-#: rc.cpp:60
-#, no-c-format
-msgid "The contact XXX added you in his contactlist"
-msgstr "联系人 XXX 将您添加到好友列表"
+#: protocols/jabber/jabbercontact.cpp:154
+msgid "Set Availability"
+msgstr "设置是否有空"
 
-#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 61
-#: rc.cpp:63
-#, no-c-format
-msgid "Read More Info About This Contact"
-msgstr "读取关于此联系人的更多信息"
+#: protocols/jabber/jabbercontact.cpp:158
+msgid "Free to Chat"
+msgstr "欢迎聊天"
 
-#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 71
-#: rc.cpp:66
-#, no-c-format
-msgid "Authorize this contact to see my status"
-msgstr "允许此联系人查看我的状态"
+#: protocols/jabber/jabbercontact.cpp:162
+#: protocols/jabber/jabberprotocol.cpp:77
+msgid "Extended Away"
+msgstr "延长离开"
 
-#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 82
-#: rc.cpp:69
-#, no-c-format
-msgid "Add this contact in my contactlist"
-msgstr "将此联系人添加到我的联系人列表中"
+#: protocols/jabber/jabbercontact.cpp:164
+#: protocols/oscar/icq/icqpresence.cpp:72
+msgid "Do Not Disturb"
+msgstr "请勿打扰"
 
-#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 112
-#: rc.cpp:72 rc.cpp:2574
-#, no-c-format
-msgid "Display name:"
-msgstr "显示名："
+#: protocols/jabber/jabbercontact.cpp:169
+msgid "Select Resource"
+msgstr "选择资源"
 
-#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 115
-#: rc.cpp:75 rc.cpp:82
-#, no-c-format
-msgid ""
-"The display name of the contact.  Leave it empty to use the contact nickname"
-msgstr "联系人的显示名。留空可使用联系人昵称"
+#: protocols/jabber/jabbercontact.cpp:186
+msgid "Automatic (best/default resource)"
+msgstr "自动(最佳/默认资源)"
 
-#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 119
-#: rc.cpp:78 rc.cpp:85
-#, no-c-format
+#: protocols/jabber/jabbercontact.cpp:266
+msgid "The original message is : <i>\" %1 \"</i><br>"
+msgstr "原始消息为：<i>“ %1 ”</i><br>"
+
+#: protocols/jabber/jabbercontact.cpp:267
 msgid ""
-"Enter the contact display name. This is how the contact will appears in the "
-"contactlist.\n"
-"Leave it empty if you want to see the contact nickname as display name."
+"<qt><i>%1</i> invited you to join the conference <b>%2</b>"
+"<br>%3"
+"<br>If you want to accept and join, just <b>enter your nickname</b> "
+"and press ok"
+"<br>If you want to decline, press cancel</qt>"
 msgstr ""
-"输入联系人的显示名。这是联系人出现在联系人列表中的名称。\n"
-"如果您想要将联系人的昵称设定为显示名，可以留空。"
-
-#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 149
-#: rc.cpp:89
-#, no-c-format
-msgid "In the group:"
-msgstr "位于组："
+"<qt><i>%1</i> 邀请您加入会议 <b>%2</b>"
+"<br>%3"
+"<br>如果您接受邀请，只需 <b>输入您的昵称</b>并按下确认"
+"<br>如果您想要拒绝，请按下取消</qt>"
 
-#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 152
-#: rc.cpp:92 rc.cpp:95
-#, no-c-format
-msgid ""
-"Enter the group where the contact should be added. Leave it empty to add it in "
-"the top level group."
-msgstr "输入此联系人要被加入的组名，留空则加入到顶级组。"
+#: protocols/jabber/jabbercontact.cpp:273
+msgid "Invited to a conference - Jabber Plugin"
+msgstr "邀请加入会议 - Jabber 插件"
 
-#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 181
-#: rc.cpp:98
-#, no-c-format
-msgid "Addressbook link:"
-msgstr "地址簿链接："
+#: protocols/jabber/jabbercontact.cpp:290
+msgid "Message has been displayed"
+msgstr "消息已被显示"
 
-#. i18n: file ./libkopete/ui/addressbookselectorwidget_base.ui line 24
-#: rc.cpp:101 rc.cpp:128
-#, no-c-format
-msgid "Select Contact"
-msgstr "选择联系人"
+#: protocols/jabber/jabbercontact.cpp:292
+msgid "Message has been delivered"
+msgstr "消息已被送达"
 
-#. i18n: file ./libkopete/ui/addressbookselectorwidget_base.ui line 55
-#: rc.cpp:104
-#, no-c-format
-msgid "Create New Entr&y..."
-msgstr "创建新条目(&Y)..."
+#: protocols/jabber/jabbercontact.cpp:295
+msgid "Message stored on the server, contact offline"
+msgstr "消息存储于服务器上，联系人离线"
 
-#. i18n: file ./libkopete/ui/addressbookselectorwidget_base.ui line 58
-#: rc.cpp:107
-#, no-c-format
-msgid "Create a new entry in your address book"
-msgstr "在您的地址簿中创建新条目"
+#: protocols/jabber/jabbercontact.cpp:302
+msgid "%1 has ended their participation in the chat session."
+msgstr "%1 已结束了聊天会话。"
 
-#. i18n: file ./libkopete/ui/addressbookselectorwidget_base.ui line 88
-#: plugins/cryptography/kgpgselkey.cpp:53
-#: plugins/cryptography/popuppublic.cpp:127 rc.cpp:113 rc.cpp:826 rc.cpp:3256
-#: rc.cpp:4326 rc.cpp:5171
-#, no-c-format
-msgid "Name"
-msgstr "名称"
+#: protocols/jabber/jabbercontact.cpp:919
+msgid ""
+"Do you also want to remove the authorization from user %1 to see your status?"
+msgstr "您想要同时禁止用户 %1 查看您的状态吗？"
 
-#. i18n: file ./libkopete/ui/addressbookselectorwidget_base.ui line 126
-#: rc.cpp:119
-#, no-c-format
-msgid "Select the contact you want to communicate with via Instant Messaging"
-msgstr "选择您想要通过即时通讯进行交流的联系人"
+#: protocols/jabber/jabbercontact.cpp:1089
+msgid ""
+"You have preselected a resource for contact %1, but you still have open chat "
+"windows for this contact. The preselected resource will only apply to newly "
+"opened chat windows."
+msgstr "您为联系人 %1 预先选择了资源，但是您仍然可以为此联系人打开聊天窗口。预先选择的资源只对新打开的聊天窗口生效。"
 
-#. i18n: file ./libkopete/ui/addressbookselectorwidget_base.ui line 150
-#: rc.cpp:122 rc.cpp:131
-#, no-c-format
-msgid "S&earch:"
-msgstr "搜索(&E)："
+#: protocols/jabber/jabbercontact.cpp:1093
+msgid "Jabber Resource Selector"
+msgstr "Jabber 资源选择器"
 
-#. i18n: file ./libkopete/ui/kopeteawaydialogbase.ui line 27
-#: rc.cpp:125
-#, no-c-format
-msgid "Please specify an away message, or choose a predefined one."
-msgstr "请指定离开消息，或者选择预先定义的离开消息。"
+#: protocols/jabber/jabberbookmarks.cpp:132
+msgid "Groupchat bookmark"
+msgstr "群组书签"
 
-#. i18n: file ./libkopete/ui/metacontactselectorwidget_base.ui line 80
-#: rc.cpp:134
-#, no-c-format
-msgid "Meta Contact"
-msgstr "超级联系人"
+#: protocols/jabber/jabberprotocol.cpp:74
+msgid "Free for Chat"
+msgstr "欢迎聊天"
 
-#. i18n: file ./libkopete/kopetecommandui.rc line 6
-#: rc.cpp:137
-#, no-c-format
-msgid "Commands"
-msgstr "命令"
+#: protocols/jabber/jabberprotocol.cpp:78
+msgid "Do not Disturb"
+msgstr "请勿打扰"
 
-#. i18n: file ./kopete/groupkabcselectorwidget.ui line 49
-#: rc.cpp:140
+#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 96
+#: protocols/jabber/jabberprotocol.cpp:93 rc.cpp:2755
 #, no-c-format
-msgid "Addressbook entry:"
-msgstr "地址簿项："
+msgid "Subscription"
+msgstr "订阅"
 
-#. i18n: file ./kopete/groupkabcselectorwidget.ui line 65
-#: rc.cpp:143
-#, no-c-format
-msgid "&Group"
-msgstr "组(&G)"
+#: protocols/jabber/jabberprotocol.cpp:94
+msgid "Authorization Status"
+msgstr "认证状态"
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 24
-#: rc.cpp:146
-#, no-c-format
-msgid "Video"
-msgstr "视频"
+#: protocols/jabber/jabberprotocol.cpp:95
+msgid "Available Resources"
+msgstr "可用的资源"
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 47
-#: rc.cpp:149
-#, no-c-format
-msgid "Device"
-msgstr "设备"
+#: protocols/jabber/jabberprotocol.cpp:96
+msgid "vCard Cache Timestamp"
+msgstr "vCard 缓存时间戳"
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 66
-#: rc.cpp:152
-#, no-c-format
-msgid "&Video Device Configuration"
-msgstr "视频设备配置(&V)"
+#: protocols/jabber/jabberprotocol.cpp:98
+msgid "Jabber ID"
+msgstr "Jabber ID"
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 93
-#: rc.cpp:155 rc.cpp:2806
-#, no-c-format
-msgid "Device:"
-msgstr "设备："
+#: protocols/jabber/jabberprotocol.cpp:100
+msgid "Timezone"
+msgstr "时区"
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 101
-#: rc.cpp:158
-#, no-c-format
-msgid "Input:"
-msgstr "输入："
+#: protocols/jabber/jabberprotocol.cpp:101
+msgid "Homepage"
+msgstr "主页"
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 109
-#: rc.cpp:161
-#, no-c-format
-msgid "Standard:"
-msgstr "标准："
+#: protocols/jabber/jabberprotocol.cpp:102
+msgid "Company name"
+msgstr "公司名称"
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 174
-#: rc.cpp:164
-#, no-c-format
-msgid "Con&trols"
-msgstr "控制(&T)"
+#: protocols/jabber/jabberprotocol.cpp:103
+msgid "Company Departement"
+msgstr "公司部门"
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 193
-#: rc.cpp:167
-#, no-c-format
-msgid "&Image Adjustment"
-msgstr "图像调整(&I)"
+#: protocols/jabber/jabberprotocol.cpp:104
+msgid "Company Position"
+msgstr "公司职位"
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 228
-#: rc.cpp:170
-#, no-c-format
-msgid "Brightness:"
-msgstr "亮度："
+#: protocols/jabber/jabberprotocol.cpp:105
+msgid "Company Role"
+msgstr "公司角色"
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 244
-#: rc.cpp:173
-#, no-c-format
-msgid "Contrast:"
-msgstr "对比度："
+#: protocols/jabber/jabberprotocol.cpp:106
+msgid "Work Street"
+msgstr "工作街道"
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 260
-#: rc.cpp:176
-#, no-c-format
-msgid "Saturation:"
-msgstr "饱和度："
+#: protocols/jabber/jabberprotocol.cpp:107
+msgid "Work Extra Address"
+msgstr "工作额外地址"
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 276
-#: rc.cpp:179
-#, no-c-format
-msgid "Whiteness:"
-msgstr "白度："
+#: protocols/jabber/jabberprotocol.cpp:108
+msgid "Work PO Box"
+msgstr "工作邮箱"
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 292
-#: rc.cpp:182
-#, no-c-format
-msgid "Hue:"
-msgstr "色度："
+#: protocols/jabber/jabberprotocol.cpp:110
+msgid "Work Postal Code"
+msgstr "工作邮政编码"
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 443
-#: rc.cpp:185
-#, no-c-format
-msgid "Optio&ns"
-msgstr "选项(&N)"
+#: protocols/jabber/jabberprotocol.cpp:112
+msgid "Work Email Address"
+msgstr "工作电子邮件地址"
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 470
-#: rc.cpp:188
-#, no-c-format
-msgid "Image options"
-msgstr "图像选项"
+#: protocols/jabber/jabberprotocol.cpp:113
+msgid "Home Street"
+msgstr "家庭街道"
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 489
-#: rc.cpp:191
-#, no-c-format
-msgid "Au&tomatic brightness/contrast adjustment"
-msgstr "自动调整亮度/对比度(&T)"
+#: protocols/jabber/jabberprotocol.cpp:114
+msgid "Home Extra Address"
+msgstr "家庭额外地址"
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 505
-#: rc.cpp:194
-#, no-c-format
-msgid "Automatic color correction"
-msgstr "自动纠正颜色"
+#: protocols/jabber/jabberprotocol.cpp:115
+msgid "Home PO Box"
+msgstr "家庭邮箱"
 
-#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 524
-#: rc.cpp:197
-#, no-c-format
-msgid "See preview mirrored"
-msgstr "镜像显示预览"
+#: protocols/jabber/jabberprotocol.cpp:116
+msgid "Home City"
+msgstr "家庭城市"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 16
-#: plugins/statistics/statisticsdialog.cpp:62 rc.cpp:200 rc.cpp:446
-#: rc.cpp:2608
-#, no-c-format
-msgid "General"
-msgstr "常规"
+#: protocols/jabber/jabberprotocol.cpp:117
+msgid "Home Postal Code"
+msgstr "家庭邮政编码"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 27
-#: rc.cpp:203
-#, no-c-format
-msgid "System Tray"
-msgstr "系统托盘"
+#: protocols/jabber/jabberprotocol.cpp:118
+msgid "Home Country"
+msgstr "家庭国家"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 38
-#: rc.cpp:206
-#, no-c-format
-msgid "Show system tray &icon"
-msgstr "显示系统托盘图标(&I)"
+#: protocols/jabber/jabberprotocol.cpp:119
+msgid "Fax"
+msgstr "传真"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 41
-#: rc.cpp:209
-#, no-c-format
-msgid "Show the icon in the system tray"
-msgstr "在系统托盘中显示图标"
+#: protocols/jabber/jabbergroupchatmanager.cpp:148
+#, c-format
+msgid "You have been invited to %1"
+msgstr "您已被邀请到 %1"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 44
-#: rc.cpp:212
-#, no-c-format
-msgid ""
-"By default, the system tray icon indicates new incoming messages by flashing "
-"and showing a bubble. A left or middle mouse click on the icon will open the "
-"message in a new chat window. Pressing the \"View\" button in the bubble has "
-"the same effect."
-msgstr ""
-"默认情况下，系统托盘在收到新消息时将会闪烁并显示气泡。用鼠标左键或中键单击图标将在新的聊天窗口中打开盖消息。按下气泡中的“查看”按钮作用相同。"
+#: protocols/jabber/ui/jabberchooseserver.cpp:34
+msgid "Choose Jabber Server"
+msgstr "选择 Jabber 服务器"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 55
-#: rc.cpp:215
-#, no-c-format
-msgid "Start with hidden &main window"
-msgstr "启动时隐藏主窗口(&M)"
+#: protocols/jabber/ui/jabberchooseserver.cpp:44
+msgid "Retrieving server list..."
+msgstr "正在获取服务器列表..."
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 58
-#: rc.cpp:218
-#, no-c-format
-msgid "Start with the main window minimized to the system tray"
-msgstr "启动时主窗口最小化到系统托盘"
+#: protocols/jabber/ui/jabberchooseserver.cpp:111
+msgid "Could not retrieve server list."
+msgstr "无法获取服务器列表。"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 61
-#: rc.cpp:221
-#, no-c-format
-msgid ""
-"Start with the main window hidden. The only visible item is the system tray "
-"icon."
-msgstr "启动时隐藏主窗口。唯一可见的项目是系统托盘图标。"
+#: protocols/jabber/ui/jabberchooseserver.cpp:126
+msgid "Could not parse the server list."
+msgstr "无法分析服务器列表。"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 71
-#: rc.cpp:224
-#, no-c-format
-msgid "Message Handling"
-msgstr "消息处理"
+#: protocols/jabber/ui/jabberregisteraccount.cpp:51
+msgid "Register New Jabber Account"
+msgstr "注册新的 Jabber 账户"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 82
-#: rc.cpp:227
-#, no-c-format
-msgid "Open messages instantl&y"
-msgstr "立即打开消息(&Y)"
+#: protocols/jabber/ui/jabberregisteraccount.cpp:63
+msgid "Register"
+msgstr "注册"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 85
-#: rc.cpp:230
-#, no-c-format
-msgid "Instantly open incoming messages"
-msgstr "立即打开收到的消息"
+#: protocols/jabber/ui/jabberregisteraccount.cpp:128
+msgid "Please enter a server name, or click Choose."
+msgstr "请输入服务器名称，或单击选择。"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 88
-#: rc.cpp:233
-#, no-c-format
-msgid ""
-"If there is no existing chat window a new window will be opened when a new "
-"message comes in. If there is already a chat window opened for the sender of "
-"the message it will be displayed there instantly."
-msgstr "当新的消息送达时如果没有既存的聊天窗口则打开一个新的窗口，如果已经存在一个聊天窗口的消息发送方和此消息来源一致，则当即在此予以显示。"
+#: protocols/jabber/ui/jabberregisteraccount.cpp:139
+msgid "Please enter a valid Jabber ID."
+msgstr "请输入有效的 Jabber ID。"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 96
-#: rc.cpp:236
-#, no-c-format
-msgid "Use message &queue"
-msgstr "使用消息队列(&Q)"
+#: protocols/gadu/gaduregisteraccount.cpp:99
+#: protocols/jabber/ui/jabberregisteraccount.cpp:152
+msgid "Please enter the same password twice."
+msgstr "请输入两次同样的密码。"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 99
-#: rc.cpp:239
-#, no-c-format
-msgid "Use a message queue to store incoming messages"
-msgstr "使用消息队列存储收到的消息"
+#: protocols/gadu/gaduregisteraccount.cpp:106
+#: protocols/jabber/ui/jabberregisteraccount.cpp:161
+msgid "Password entries do not match."
+msgstr "两次密码不符。"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 102
-#: rc.cpp:242
-#, no-c-format
+#: protocols/jabber/ui/jabberregisteraccount.cpp:193
 msgid ""
-"Store new incoming messages in a message queue. New messages are messages that "
-"cannot be displayed in an already open chat window. Only queued or stacked "
-"messages trigger notification via bubble, a flashing tray icon, or both.."
-msgstr "对新收到的消息使用队列。新消息是指那些无法显示在已打开的聊天窗口中的消息。只有队列中的消息才可通过气泡和/或闪烁托盘触发通知。"
+"Unless you know what you are doing, your JID should be of the form "
+"\"username@server.com\".  In your case for example \"username@%1\"."
+msgstr "除非您知道您在做什么，您的 JID 格式应该是“username@server.com”。您的情况就应该是“username@%1”。"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 110
-#: rc.cpp:245
-#, no-c-format
-msgid "Use message stac&k"
-msgstr "使用消息栈(&K)"
+#: protocols/jabber/ui/jabberregisteraccount.cpp:248
+msgid "Connecting to server..."
+msgstr "正在连接到服务器..."
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 113
-#: rc.cpp:248
-#, no-c-format
-msgid "Use a message stack to store incoming messages"
-msgstr "对收到的消息使用队列"
+#: protocols/jabber/ui/jabberregisteraccount.cpp:314
+msgid "Protocol error."
+msgstr "协议错误。"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 116
-#: rc.cpp:251
-#, no-c-format
-msgid ""
-"Store new incoming messages in a message stack. New messages are messages that "
-"cannot be displayed in an already open chat window. Only queued or stacked "
-"messages trigger notification via bubble and flashing tray."
-msgstr "对新收到的消息使用队列。新消息是指那些无法显示在已打开的聊天窗口中的消息。只有队列中的消息才可通过气泡和闪烁托盘触发通知。"
+#: protocols/jabber/ui/jabberregisteraccount.cpp:327
+msgid "Connected successfully, registering new account..."
+msgstr "连接成功，正在注册新账户..."
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 127
-#: rc.cpp:254
-#, no-c-format
-msgid "Queue/stack &unread messages"
-msgstr "未读消息排队(&U)"
+#: protocols/jabber/ui/jabberregisteraccount.cpp:342
+msgid "Registration successful."
+msgstr "注册成功。"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 130
-#: rc.cpp:257
-#, no-c-format
-msgid "Also add unread messages to queue/stack"
-msgstr "也将未读消息添加到队列"
+#: protocols/jabber/ui/jabberregisteraccount.cpp:376
+msgid "Registration failed."
+msgstr "注册失败。"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 133
-#: rc.cpp:260
-#, no-c-format
+#: protocols/jabber/ui/jabberregisteraccount.cpp:378
 msgid ""
-"Unread messages are messages that will be displayed in an already opened but "
-"inactive chat window. Only incoming queued messages trigger notification via "
-"the bubble, the flashing tray icon, or both. With this option disabled only new "
-"incoming messages are queued, i.e. messages that cannot be displayed in an "
-"already open chat window."
-msgstr ""
-"未读的消息会在一个已经打开的非活动聊天窗口内显示，只有新到消息队列会通过弹出气泡或闪烁系统托盘(或是两者皆有)来通知用户。如果启用此选项将不再只有新到消息会被转"
-"入队列，这意味着这些消息将不能够在一个已经打开的聊天窗口内显示。"
+"Unable to create account on the server. The Jabber ID is probably already in "
+"use."
+msgstr "无法在服务器上创建账户。Jabber ID 可能已经被别人使用了。"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 154
-#: rc.cpp:266
-#, no-c-format
-msgid "Connect automatically at &startup"
-msgstr "启动时自动连接(&S)"
+#: protocols/jabber/ui/jabberregisteraccount.cpp:379
+msgid "Jabber Account Registration"
+msgstr "Jabber 账户注册"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 157
-#: rc.cpp:269
-#, no-c-format
-msgid "Connect all your accounts automatically when starting Kopete"
-msgstr "启动 Kopete 时自动连接到您的全部账户"
+#: protocols/jabber/ui/dlgjabbervcard.cpp:64
+msgid "Jabber vCard"
+msgstr "Jabber vCard"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 160
-#: rc.cpp:272
-#, no-c-format
-msgid ""
-"When starting Kopete all your accounts will be connected automatically. Note: "
-"You can exclude accounts individually in their properties."
-msgstr "启动 Kopete 时您的账户将会被自动连接。注意：您可以在账户的属性中单独排除账户。"
+#: protocols/jabber/ui/dlgjabbervcard.cpp:64
+msgid "&Save User Info"
+msgstr "保存用户信息(&S)"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 16
-#: rc.cpp:275
-#, no-c-format
-msgid "Events"
-msgstr "事件"
+#: protocols/jabber/ui/dlgjabbervcard.cpp:64
+msgid "&Fetch vCard"
+msgstr "获取 vCard(&F)"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 27
-#: rc.cpp:278
-#, no-c-format
-msgid "Tray Flash && Bubble"
-msgstr "托盘闪烁和气泡"
+#: protocols/jabber/ui/dlgjabbervcard.cpp:299
+msgid "Saving vCard to server..."
+msgstr "将 vCard 保存到服务器..."
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 38
-#: rc.cpp:281
-#, no-c-format
-msgid "Flash s&ystem tray"
-msgstr "闪烁系统托盘(&Y)"
+#: protocols/jabber/ui/dlgjabbervcard.cpp:421
+msgid "vCard save sucessful."
+msgstr "vCard 名片保存成功。"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 41
-#: rc.cpp:284
-#, no-c-format
-msgid "Flash the system tray icon on an incoming message"
-msgstr "收到消息时闪烁系统托盘图标"
+#: protocols/jabber/ui/dlgjabbervcard.cpp:426
+msgid "Error: Unable to save vCard."
+msgstr "出错：无法保存 vCard"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 44
-#: rc.cpp:287
-#, no-c-format
-msgid "Flash the system tray icon whenever a message comes in."
-msgstr "收到消息时时闪烁系统托盘图标。"
+#: protocols/jabber/ui/dlgjabbervcard.cpp:434
+msgid "Fetching contact vCard..."
+msgstr "正在获取联系人的 vCard 名片..."
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 80
-#: rc.cpp:290
-#, no-c-format
-msgid "&Left mouse click opens message"
-msgstr "左键单击打开消息(&L)"
+#: protocols/jabber/ui/dlgjabbervcard.cpp:457
+msgid "vCard fetching Done."
+msgstr "vCard 名片获取完成。"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 83
-#: rc.cpp:293
-#, no-c-format
+#: protocols/jabber/ui/dlgjabbervcard.cpp:461
 msgid ""
-"Left mouse click on flashing system tray opens message instead of "
-"restoring/minimizing contact list"
-msgstr "左键单击闪烁的系统托盘将打开消息而不是恢复/最小化联系人列表"
+"Error: vCard could not be fetched correctly. Check connectivity with the Jabber "
+"server."
+msgstr "出错：无法正确获取到 vCard 名片，请检查程序与 Jabber 服务器的连接状态。"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 86
-#: rc.cpp:296
-#, no-c-format
+#: protocols/jabber/ui/dlgjabbervcard.cpp:472
+msgid "Jabber Photo"
+msgstr "Jabber 照片"
+
+#: protocols/jabber/ui/dlgjabbervcard.cpp:535
 msgid ""
-"A left mouse click on the flashing system tray icon opens the incoming message "
-"instead of restoring/minimizing the contact list (e.g. to check who is sending "
-"messages). A middle click always opens this message."
-msgstr "左键单击闪烁的系统托盘将打开消息而不是恢复/最小化联系人列表(例如为了查知是谁发送了消息)，中键单机时打开此消息。"
+"<qt>An error occurred when trying to change the photo."
+"<br>Make sure that you have selected a correct image file</qt>"
+msgstr "<qt>试图更改照片时出错。<br>请确定您选择了正确的图像文件</qt>"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 96
-#: rc.cpp:299
-#, no-c-format
-msgid "Sho&w bubble"
-msgstr "显示气泡(&W)"
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:34
+msgid "Change Jabber Password"
+msgstr "更改 Jabber 密码"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 99
-#: rc.cpp:302
-#, no-c-format
-msgid "Show a bubble on an incoming message"
-msgstr "收到消息时显示气泡"
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:56
+msgid "You entered your current password incorrectly."
+msgstr "您输入了不正确的密码。"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 102
-#: rc.cpp:305
-#, no-c-format
-msgid "Show a bubble whenever a message comes in."
-msgstr "收到消息时显示气泡。"
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:57
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:65
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:73
+msgid "Password Incorrect"
+msgstr "密码不正确"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 138
-#: rc.cpp:308
-#, no-c-format
-msgid "Button \"&Ignore\" closes chat"
-msgstr "按钮“忽略”关闭聊天(&I)"
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:64
+msgid "Your new passwords do not match. Please enter them again."
+msgstr "您的新密码不匹配。请重新输入一次。"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 141
-#: rc.cpp:311
-#, no-c-format
-msgid ""
-"The \"Ignore\" button of the bubble closes the chat window for the sender"
-msgstr "气泡的“忽略”按钮将关闭发送者的聊天窗口"
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:72
+msgid "For security reasons, you are not allowed to set an empty password."
+msgstr "为安全起见，您不允许设定新密码。"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 144
-#: rc.cpp:314
-#, no-c-format
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:80
 msgid ""
-"If there is already a chat window opened for the sender of the message "
-"displayed in the bubble the \"Ignore\" button will close this chat window."
-msgstr "如果已经有一个和气泡中消息的发送者相对应的聊天窗口，点击“忽略”将会关闭此窗口。"
+"Your account needs to be connected before the password can be changed. Do you "
+"want to try to connect now?"
+msgstr "在更改密码之前需要线连接您的账户。您是否想要现在连接？"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 182
-#: rc.cpp:317
-#, no-c-format
-msgid "Close &bubble automatically after"
-msgstr "自动关闭气泡前等(&B)"
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:81
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:121
+msgid "Jabber Password Change"
+msgstr "Jabber 密码更改"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 188
-#: rc.cpp:320
-#, no-c-format
-msgid "Automatically close bubble after fixed amount of time"
-msgstr "在既定等待时间后自动关闭气泡"
+#: libkopete/connectionmanager.cpp:149
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:81
+msgid "Connect"
+msgstr "连接"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 191
-#: rc.cpp:323
-#, no-c-format
+#: libkopete/connectionmanager.cpp:149
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:81
+msgid "Stay Offline"
+msgstr "保持离线"
+
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:120
 msgid ""
-"Bubbles will automatically be closed after a fixed amount of time. A closed one "
-"will be replaced by a new one if another message is waiting."
-msgstr "气泡会在一定的时间后自动关闭。如果已存在另一条等待在队列中的消息，它将会替换此气泡。"
+"Your password has been changed successfully. Please note that the change may "
+"not be instantaneous. If you have problems logging in with your new password, "
+"please contact the administrator."
+msgstr "您的密码已经成功更改。请注意更改可能不是实时生效的。如果您使用新密码登录遇到问题，请与管理员联系。"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 202
-#: rc.cpp:326 rc.cpp:685
-#, no-c-format
-msgid " Sec"
-msgstr " 秒"
+#: protocols/jabber/ui/dlgjabberchangepassword.cpp:128
+msgid ""
+"Your password could not be changed. Either your server does not support this "
+"feature or the administrator does not allow you to change your password."
+msgstr "您的密码无法更改。可能是您的服务器不支持这个功能，或者管理员不允许您更改密码。"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 238
-#: rc.cpp:329
-#, no-c-format
-msgid "Exclude non-highlighted messages in grou&p chats"
-msgstr "在群组聊天中排除非突出显示的消息(&P)"
+#: protocols/jabber/ui/dlgjabberchatjoin.cpp:34
+msgid "Join Jabber Groupchat"
+msgstr "加入 Jabber 小组聊天"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 241
-#: rc.cpp:332
-#, no-c-format
-msgid "Notify only highlighted messages in group chats"
-msgstr "仅通知群组聊天中突出显示的消息"
+#: protocols/jabber/ui/jabberaddcontactpage.cpp:52
+msgid "Loading instruction from gateway..."
+msgstr "正在从网关载入指令..."
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 244
-#: rc.cpp:335
-#, no-c-format
-msgid ""
-"In very active group chats important messages can be singled out by excluding "
-"non-highlighted messages from notification."
-msgstr "在发言非常活跃的群组聊天中，可以仅对被高亮突出显示的重要消息发出系统通知。"
+#: protocols/groupwise/ui/gwaddcontactpage.cpp:63
+#: protocols/jabber/ui/jabberaddcontactpage.cpp:62
+#: protocols/oscar/aim/aimprotocol.cpp:186
+#: protocols/oscar/aim/ui/aimaddcontactpage.cpp:42
+msgid "You need to be connected to be able to add contacts."
+msgstr "您需要被连接上才能够添加联系人。"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 252
-#: rc.cpp:338
-#, no-c-format
-msgid "Exclude messages in chats on current des&ktop"
-msgstr "排除当前桌面中的聊天消息(&K)"
+#: protocols/jabber/ui/jabberaddcontactpage.cpp:63
+msgid "Connect to the Jabber network and try again."
+msgstr "连接到 Jabber 网络后再重试。"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 255
-#: rc.cpp:341
-#, no-c-format
-msgid ""
-"Do not display notification for messages in chat windows on current desktop"
-msgstr "不显示当前桌面中聊天窗口的消息通知"
+#: protocols/jabber/ui/jabberaddcontactpage.cpp:150
+msgid "An error occured while loading instructions from gateway."
+msgstr "从网关载入指令时出错。"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 258
-#: rc.cpp:344
-#, no-c-format
+#: protocols/jabber/ui/dlgjabberregister.cpp:53
 msgid ""
-"This option allows you to turn off the notification of events for chat windows "
-"that are on the current desktop. If this option is turned on, then only chat "
-"windows on different desktops than the current one will notify you that an "
-"event has occured. Otherwise, all chat windows will notify you that an event "
-"has occured."
+"Unable to retrieve registration form.\n"
+"Reason: \"%1\""
 msgstr ""
-"此选项允许您在当前桌面上屏蔽来自聊天窗口的系统通知事件。如果您启用此选项，只有来自当前以外桌面上的聊天窗口所激发的事件会发出系统通知，若反之，所有聊天窗口的事件"
-"都会给出通知。"
+"无法获取注册表单。\n"
+"原因：“%1”"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 279
-#: rc.cpp:350
-#, no-c-format
-msgid "E&nable events while away"
-msgstr "离开时启用事件(&N)"
+#: protocols/jabber/ui/dlgjabberregister.cpp:95
+msgid "Registration sent successfully."
+msgstr "注册已成功发送。"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 282
-#: rc.cpp:353
-#, no-c-format
-msgid "Enable events if your account status is \"Away\""
-msgstr "如果您的账户状态变成“离开”，则启用事件"
+#: protocols/jabber/ui/dlgjabberregister.cpp:95
+#: protocols/jabber/ui/dlgjabberregister.cpp:102
+msgid "Jabber Registration"
+msgstr "Jabber 注册"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 285
-#: rc.cpp:356
-#, no-c-format
+#: protocols/jabber/ui/dlgjabberregister.cpp:102
 msgid ""
-"Enable notification events even if your account status is \"Away\" or less "
-"available, e.g. \"Not Available\" or \"Do not Disturb\". Note: This does not "
-"affect the flashing of the system tray icon."
-msgstr "即使账户处于“离开”或更隐秘化的状态(例如“不在”或“请勿打扰”)也依然启用通知事件。注意：此选项不对系统托盘图标的闪烁产生影响。"
+"The server denied the registration form.\n"
+"Reason: \"%1\""
+msgstr ""
+"服务器拒绝了注册表单。\n"
+"原因：“%1”"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 293
-#: rc.cpp:359
-#, no-c-format
-msgid "Enable events for acti&ve chat windows"
-msgstr "聊天窗口激活时启用事件(&V)"
+#: protocols/jabber/ui/dlgjabberbrowse.cpp:63
+msgid "Unable to retrieve search form."
+msgstr "无法获取搜索表单。"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 296
-#: rc.cpp:362
-#, no-c-format
-msgid "Enable events for incoming messages if the chat window is active"
-msgstr "聊天窗口激活时启用收到消息的事件"
+#: protocols/jabber/ui/dlgjabberbrowse.cpp:114
+msgid "The Jabber server declined the search."
+msgstr "Jabber 服务器拒绝了搜索。"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 299
-#: rc.cpp:365
+#. i18n: file ./protocols/jabber/ui/dlgbrowse.ui line 16
+#: protocols/jabber/ui/dlgjabberbrowse.cpp:114 rc.cpp:2659
 #, no-c-format
-msgid ""
-"Enable notification events for incoming messages even if the receiving chat "
-"window is active. Note: Neither the system tray icon flashes nor the bubble is "
-"shown."
-msgstr "即使接收聊天消息的窗口正处于活动状态也依然对收到的消息启用通知事件。注意：不闪烁系统托盘图标，也不会显示弹出气泡。"
+msgid "Jabber Search"
+msgstr "Jabber 搜索"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 307
-#: rc.cpp:368
-#, no-c-format
-msgid "Switch &to desktop containing chat on opening message"
-msgstr "打开消息时切换到包含聊天的桌面(&T)"
+#: protocols/jabber/ui/dlgjabberservices.cpp:125
+#, c-format
+msgid ""
+"Unable to retrieve the list of services.\n"
+"Reason: %1"
+msgstr ""
+"无法获取服务器列表。\n"
+"原因：%1"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 310
-#: rc.cpp:371
-#, no-c-format
+#: protocols/jabber/ui/jabbereditaccountwidget.cpp:149
 msgid ""
-"Switch to the desktop which contains the chat window for the sender when "
-"opening his/her message"
-msgstr "打开消息时切换到包含发送者聊天窗口的桌面"
+"The changes you just made will take effect next time you log in with Jabber."
+msgstr "在您注销后再次登录 Jabber，您所做的改变将会生效。"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 313
-#: rc.cpp:374
-#, no-c-format
+#: protocols/jabber/ui/jabbereditaccountwidget.cpp:150
+msgid "Jabber Changes During Online Jabber Session"
+msgstr "在线 Jabber 会话期间，Jabber 发生了变化"
+
+#: protocols/jabber/ui/jabbereditaccountwidget.cpp:205
 msgid ""
-"If there is already a chat window open for the sender of the message, opening "
-"his/her message will cause a switch to the desktop which contains this chat "
-"window."
-msgstr "如果已经有一个和气泡中消息的发送者相对应的聊天窗口，打开此消息将会切换到包含这个聊天窗口的桌面。"
+"The Jabber ID you have chosen is invalid. Please make sure it is in the form "
+"user@server.com, like an email address."
+msgstr "您选择的 Jabber ID 无效。请确定其格式为 user@server.com，和电子邮件地址一样。"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 321
-#: rc.cpp:377
-#, no-c-format
-msgid "&Raise window on incoming message"
-msgstr "新消息到达时升起窗口(&R)"
+#: protocols/jabber/ui/jabbereditaccountwidget.cpp:207
+msgid "Invalid Jabber ID"
+msgstr "无效的 Jabber ID"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 324
-#: rc.cpp:380
+#. i18n: file ./protocols/jabber/ui/dlgchatroomslist.ui line 16
+#: protocols/jabber/ui/dlgjabberchatroomslist.cpp:36 rc.cpp:2767
 #, no-c-format
-msgid "Raise the chat window/tab on an incoming message"
-msgstr "收到消息时升起聊天窗口/标签"
+msgid "List Chatrooms"
+msgstr "列出聊天室"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 327
-#: rc.cpp:383
-#, no-c-format
+#: protocols/jabber/ui/dlgjabberchatroomslist.cpp:89
+msgid "Unable to retrieve the list of chat rooms."
+msgstr "无法获取聊天室列表。"
+
+#: protocols/jabber/tdeioslave/jabberdisco.cpp:109
+#: protocols/jabber/tdeioslave/jabberdisco.cpp:210
+msgid "TLS"
+msgstr "TLS"
+
+#: protocols/jabber/tdeioslave/jabberdisco.cpp:188
+msgid "The server certificate is invalid. Do you want to continue? "
+msgstr "服务器证书无效。您想要继续吗？ "
+
+#: protocols/jabber/tdeioslave/jabberdisco.cpp:189
+msgid "Certificate Warning"
+msgstr "认证警告"
+
+#: protocols/jabber/tdeioslave/jabberdisco.cpp:320
+msgid "The login details are incorrect. Do you want to try again?"
+msgstr "登录细节不正确。您是否想要再试一次？"
+
+#: protocols/oscar/icq/icqcontact.cpp:542
+#: protocols/oscar/liboscar/userdetails.cpp:129
 msgid ""
-"If there is already a chat window opened for the sender of an incoming message "
-"this window will be put on the current desktop and in front of all other "
-"windows."
-msgstr "如果已经有一个和气泡中消息的发送者相对应的聊天窗口，此窗口将被移置到当前的桌面并被放在所有其它窗口的前面。"
+"_: Translators: client-name client-version\n"
+"%1 %2"
+msgstr "%1 %2"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 27
-#: rc.cpp:389
-#, no-c-format
-msgid "&Interface Preference"
-msgstr "界面首选项(&I)"
+#: protocols/oscar/liboscar/userdetails.cpp:328
+msgid "MICQ"
+msgstr "MICQ"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 90
-#: rc.cpp:392
-#, no-c-format
-msgid "Chat Window Grouping &Policy"
-msgstr "聊天窗口分组策略(&P)"
+#: protocols/oscar/liboscar/userdetails.cpp:333
+msgid "SIM"
+msgstr "SIM"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 99
-#: rc.cpp:395
-#, no-c-format
-msgid "Open All Messages in New Chat Window"
-msgstr "在新聊天窗口中打开所有消息"
+#: protocols/oscar/liboscar/userdetails.cpp:338
+msgid "Trillian"
+msgstr "Trillian"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 104
-#: rc.cpp:398
-#, no-c-format
-msgid "Group Messages From Same Account in Same Chat Window"
-msgstr "在同一聊天窗口中按照账户对消息分组"
+#: protocols/oscar/liboscar/userdetails.cpp:343
+msgid "MacICQ"
+msgstr "MacICQ"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 109
-#: rc.cpp:401
-#, no-c-format
-msgid "Group All Messages in Same Chat Window"
-msgstr "在同一聊天窗口中按消息分组"
+#: protocols/oscar/liboscar/userdetails.cpp:350
+msgid "Licq SSL"
+msgstr "Licq SSL"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 114
-#: rc.cpp:404
-#, no-c-format
-msgid "Group Messages From Contacts in Same Group in Same Chat Window"
-msgstr "将来自同一组联系人的消息分组在相同的聊天窗口中"
+#: protocols/oscar/liboscar/userdetails.cpp:352
+msgid "Licq"
+msgstr "Licq"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 119
-#: rc.cpp:407
-#, no-c-format
-msgid "Group Messages From Same Metacontact in Same Chat Window"
-msgstr "将来自同一组联系人的消息分组在相同的聊天窗口中"
+#: protocols/oscar/oscarencodingselectiondialog.cpp:28
+msgid "Select Encoding"
+msgstr "选择编码"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 138
-#: rc.cpp:410
-#, no-c-format
-msgid ""
-"<dl>\n"
-"                                <dt><tt>Open all messages in a new chat "
-"window</tt>\n"
-"                                <dd>Every chat will have its own window.\n"
-"                                <dt><tt>Group messages from the same account in "
-"the same chat window</tt>\n"
-"                                <dd>All chats for one account get grouped in to "
-"one window by using tabs.\n"
-"                                <dt><tt>Group all messages in the same chat "
-"window</tt>\n"
-"                                <dd>All chats get grouped in to one window by "
-"using tabs.\n"
-"                                <dt><tt>Group messages from contacts in the "
-"same group in the same chat window</tt>\n"
-"                                <dd>All chats from one group get grouped in to "
-"one window by using tabs.\n"
-"                                <dt><tt>Group messages from the same "
-"metacontact in the same chat window</tt>\n"
-"                                <dd>All chats from one metacontact get grouped "
-"in to one window by using tabs.\n"
-"                                </dl>\n"
-"                        "
-msgstr ""
-"<dl>\n"
-"                                <dt><tt>在新聊天窗口中打开所有消息</tt>\n"
-"                                <dd>每一段聊天对话都有专属于自己的聊天窗口。\n"
-"                                <dt><tt>在同一聊天窗口中按照账户对消息分组</tt>\n"
-"                                <dd>来自同一账户的所有消息都会被按标签分组到一个聊天窗口内。\n"
-"                                <dt><tt>在同一聊天窗口中按消息分组</tt>\n"
-"                                <dd>所有消息都被按标签分组到一个聊天窗口内。\n"
-"                                <dt><tt>将来自同一组联系人的消息分组在相同的聊天窗口中</tt>\n"
-"                                <dd>来自同一组的所有消息都被按标签分组到一个聊天窗口内。\n"
-"                                <dt><tt>将来自同一超级联系人的消息分组在相同的聊天窗口中</tt>\n"
-"                                <dd>来自同一超级联系人的所有消息都被按标签分组到一个聊天窗口内。\n"
-"                                </dl>\n"
-"                        "
+#: protocols/oscar/icq/icqprotocol.cpp:537
+#: protocols/oscar/oscarencodingselectiondialog.cpp:36
+msgid "Big5"
+msgstr "Big5"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 156
-#: rc.cpp:425
-#, no-c-format
-msgid "High&light messages containing your nickname"
-msgstr "突出显示包含您昵称的消息(&L)"
+#: protocols/oscar/icq/icqprotocol.cpp:538
+#: protocols/oscar/oscarencodingselectiondialog.cpp:37
+msgid "Big5-HKSCS"
+msgstr "Big5-HKSCS"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 172
-#: rc.cpp:428
-#, no-c-format
-msgid "E&nable automatic spell checking"
-msgstr "启用自动检查拼写(&N)"
+#: protocols/oscar/icq/icqprotocol.cpp:539
+#: protocols/oscar/oscarencodingselectiondialog.cpp:38
+msgid "euc-JP Japanese"
+msgstr "euc-JP 日语"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 180
-#: rc.cpp:431
-#, no-c-format
-msgid "&Show events in chat window"
-msgstr "在聊天窗口中显示事件(&S)"
+#: protocols/oscar/icq/icqprotocol.cpp:540
+#: protocols/oscar/oscarencodingselectiondialog.cpp:39
+msgid "euc-KR Korean"
+msgstr "euc-KR 韩语"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 196
-#: rc.cpp:434
-#, no-c-format
-msgid "T&runcate contact name with more characters than:"
-msgstr "截断联系人姓名，若字符数多于(&R)："
+#: protocols/oscar/icq/icqprotocol.cpp:541
+#: protocols/oscar/oscarencodingselectiondialog.cpp:40
+msgid "GB-2312 Chinese"
+msgstr "GB-2312 中文"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 245
-#: rc.cpp:437
-#, no-c-format
-msgid "&Maximum number of chat window lines:"
-msgstr "最多的聊天窗口行数(&M)："
+#: protocols/oscar/icq/icqprotocol.cpp:542
+#: protocols/oscar/oscarencodingselectiondialog.cpp:41
+msgid "GBK Chinese"
+msgstr "GBK 中文"
 
-#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 251
-#: rc.cpp:440
-#, no-c-format
-msgid ""
-"Limit the maximum number of lines visible in a chat window to improve speed for "
-"complex layouts."
-msgstr "限制聊天窗口中可见的最多行数，以便改进复杂版面的速度。"
+#: protocols/oscar/icq/icqprotocol.cpp:543
+#: protocols/oscar/oscarencodingselectiondialog.cpp:42
+msgid "GB18030 Chinese"
+msgstr "GB18030 中文"
 
-#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 16
-#: rc.cpp:443
-#, no-c-format
-msgid "Away Configuration"
-msgstr "离开配置"
+#: protocols/oscar/icq/icqprotocol.cpp:545
+#: protocols/oscar/oscarencodingselectiondialog.cpp:44
+msgid "JIS Japanese"
+msgstr "JIS 日语"
 
-#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 44
-#: rc.cpp:449
-#, no-c-format
-msgid "Number of away messages to remember:"
-msgstr "要记住的离开消息数："
+#: protocols/oscar/icq/icqprotocol.cpp:546
+#: protocols/oscar/oscarencodingselectiondialog.cpp:45
+msgid "Shift-JIS Japanese"
+msgstr "Shift-JIS 日语"
 
-#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 47
-#: rc.cpp:452 rc.cpp:455 rc.cpp:458 rc.cpp:461
-#, no-c-format
-msgid ""
-"Kopete will remember this many away messages for use at a later date; if this "
-"limit is exceeded, the least-used message will be removed."
-msgstr "Kopete 将会记住次这么多离开消息，以便稍后使用；如果达到了此限制，最少使用的消息将会被丢弃。"
+#: protocols/oscar/icq/icqprotocol.cpp:548
+#: protocols/oscar/oscarencodingselectiondialog.cpp:47
+msgid "KOI8-R Russian"
+msgstr "KOI8-R 俄语"
 
-#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 94
-#: rc.cpp:464
-#, no-c-format
-msgid "Auto Away"
-msgstr "自动离开"
+#: protocols/oscar/icq/icqprotocol.cpp:549
+#: protocols/oscar/oscarencodingselectiondialog.cpp:48
+msgid "KOI8-U Ukrainian"
+msgstr "KOI8-U 乌克兰语"
 
-#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 98
-#: rc.cpp:467
-#, no-c-format
-msgid ""
-"<p>If you check the <i>Use auto away</i> checkbox, Kopete will automaticaly set "
-"you globaly away when the TDE screen saver start, or after the selected minutes "
-"of user inactivity (i.e no mouse move, or key pressed)</p>\n"
-"<p>Kopete will set you available again when you come back if you checked <i>"
-"Become available when detecting activity again</i></p>"
-msgstr ""
-"<p>如果您选中了<i>使用自动离开</i>复选框，Kopete 将会在 TDE "
-"屏幕保护程序启动或用户发呆了指定时间(即不移动鼠标也不碰键盘)以后将您设置为全局离开</p>"
-"<p>如果您选中了<i>再次检测到活动后就上线</i>选项，Kopete 将会在您回来的时候将您设置为上线</p>"
+#: protocols/oscar/icq/icqprotocol.cpp:551
+#: protocols/oscar/oscarencodingselectiondialog.cpp:50
+msgid "ISO-8859-1 Western"
+msgstr "ISO-8859-1 西方"
 
-#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 109
-#: rc.cpp:471
-#, no-c-format
-msgid "&Use auto away"
-msgstr "使用自动离开(&U)"
+#: protocols/oscar/icq/icqprotocol.cpp:552
+#: protocols/oscar/oscarencodingselectiondialog.cpp:51
+msgid "ISO-8859-2 Central European"
+msgstr "ISO-8859-2 中欧"
 
-#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 128
-#: rc.cpp:474
-#, no-c-format
-msgid "Become away after"
-msgstr "发呆"
+#: protocols/oscar/icq/icqprotocol.cpp:553
+#: protocols/oscar/oscarencodingselectiondialog.cpp:52
+msgid "ISO-8859-3 Central European"
+msgstr "ISO-8859-3 中欧"
 
-#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 153
-#: rc.cpp:477
-#, no-c-format
-msgid "minutes of user inactivity"
-msgstr "分钟后就离开"
+#: protocols/oscar/icq/icqprotocol.cpp:554
+#: protocols/oscar/oscarencodingselectiondialog.cpp:53
+msgid "ISO-8859-4 Baltic"
+msgstr "ISO-8859-4 波罗的语"
 
-#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 183
-#: rc.cpp:480
-#, no-c-format
-msgid "Become available when detecting activity again"
-msgstr "再次检测到活动后就上线"
+#: protocols/oscar/icq/icqprotocol.cpp:555
+#: protocols/oscar/oscarencodingselectiondialog.cpp:54
+msgid "ISO-8859-5 Cyrillic"
+msgstr "ISO-8859-5 西里尔语"
 
-#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 196
-#: rc.cpp:483
-#, no-c-format
-msgid "Auto Away Message"
-msgstr "自动离开消息"
+#: protocols/oscar/icq/icqprotocol.cpp:556
+#: protocols/oscar/oscarencodingselectiondialog.cpp:55
+msgid "ISO-8859-6 Arabic"
+msgstr "ISO-8859-6 阿拉伯语"
 
-#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 210
-#: rc.cpp:486
-#, no-c-format
-msgid "Display the last away message used"
-msgstr "显示上次所用的离开消息"
+#: protocols/oscar/icq/icqprotocol.cpp:557
+#: protocols/oscar/oscarencodingselectiondialog.cpp:56
+msgid "ISO-8859-7 Greek"
+msgstr "ISO-8859-7 希腊语"
 
-#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 224
-#: rc.cpp:489
-#, no-c-format
-msgid "Display the following away message:"
-msgstr "显示下列离开消息："
+#: protocols/oscar/icq/icqprotocol.cpp:558
+#: protocols/oscar/oscarencodingselectiondialog.cpp:57
+msgid "ISO-8859-8 Hebrew, visually ordered"
+msgstr "ISO-8859-8 希伯来语，可视顺序"
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 25
-#: rc.cpp:492
-#, no-c-format
-msgid "Enable &global identity"
-msgstr "启用全局身份(&G)"
+#: protocols/oscar/icq/icqprotocol.cpp:559
+#: protocols/oscar/oscarencodingselectiondialog.cpp:58
+msgid "ISO-8859-8-I Hebrew, logically ordered"
+msgstr "ISO-8859-8-I 希伯来语，本地顺序"
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 41
-#: rc.cpp:495
-#, no-c-format
-msgid "Identity:"
-msgstr "身份："
+#: protocols/oscar/icq/icqprotocol.cpp:560
+#: protocols/oscar/oscarencodingselectiondialog.cpp:59
+msgid "ISO-8859-9 Turkish"
+msgstr "ISO-8859-9 土耳其语"
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 75
-#: rc.cpp:498
-#, no-c-format
-msgid "Ne&w Identity..."
-msgstr "新建身份(&W)..."
+#: protocols/oscar/icq/icqprotocol.cpp:561
+#: protocols/oscar/oscarencodingselectiondialog.cpp:60
+msgid "ISO-8859-10"
+msgstr "ISO-8859-10"
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 83
-#: rc.cpp:501
-#, no-c-format
-msgid "Cop&y Identity..."
-msgstr "复制身份(&Y)..."
+#: protocols/oscar/icq/icqprotocol.cpp:562
+#: protocols/oscar/oscarencodingselectiondialog.cpp:61
+msgid "ISO-8859-13"
+msgstr "ISO-8859-13"
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 91
-#: rc.cpp:504
-#, no-c-format
-msgid "Rename I&dentity..."
-msgstr "重命名身份(&D)..."
+#: protocols/oscar/icq/icqprotocol.cpp:563
+#: protocols/oscar/oscarencodingselectiondialog.cpp:62
+msgid "ISO-8859-14"
+msgstr "ISO-8859-14"
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 99
-#: rc.cpp:507
-#, no-c-format
-msgid "Remo&ve Identity"
-msgstr "删除身份(&V)"
+#: protocols/oscar/icq/icqprotocol.cpp:564
+#: protocols/oscar/oscarencodingselectiondialog.cpp:63
+msgid "ISO-8859-15 Western"
+msgstr "ISO-8859-15 西方"
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 113
-#: rc.cpp:510
-#, no-c-format
-msgid "&Nickname"
-msgstr "昵称(&N)"
+#: protocols/oscar/icq/icqprotocol.cpp:566
+#: protocols/oscar/oscarencodingselectiondialog.cpp:65
+msgid "Windows-1250 Central European"
+msgstr "Windows-1250 中欧"
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 152
-#: rc.cpp:513
-#, no-c-format
-msgid "Cu&stom:"
-msgstr "自定义(&S)："
+#: protocols/oscar/icq/icqprotocol.cpp:567
+#: protocols/oscar/oscarencodingselectiondialog.cpp:66
+msgid "Windows-1251 Cyrillic"
+msgstr "Windows-1251 斯拉夫语"
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 165
-#: rc.cpp:516
-#, no-c-format
-msgid "Use address boo&k name (need address book link)"
-msgstr "使用地址簿姓名(需要地址簿链接)(&K)"
+#: protocols/oscar/icq/icqprotocol.cpp:568
+#: protocols/oscar/oscarencodingselectiondialog.cpp:67
+msgid "Windows-1252 Western"
+msgstr "Windows-1252 西方"
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 173
-#: rc.cpp:519
-#, no-c-format
-msgid "Use nickname from con&tact for global nickname:"
-msgstr "全局昵称使用联系人的昵称(&T)："
+#: protocols/oscar/icq/icqprotocol.cpp:569
+#: protocols/oscar/oscarencodingselectiondialog.cpp:68
+msgid "Windows-1253 Greek"
+msgstr "Windows-1253 希腊语"
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 189
-#: rc.cpp:522 rc.cpp:1070 rc.cpp:1088
-#, no-c-format
-msgid "Contact to synchronize the displayname with."
-msgstr "要与显示名称同步的联系人。"
+#: protocols/oscar/icq/icqprotocol.cpp:570
+#: protocols/oscar/oscarencodingselectiondialog.cpp:69
+msgid "Windows-1254 Turkish"
+msgstr "Windows-1254 土耳其语"
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 220
-#: rc.cpp:525
-#, no-c-format
-msgid "P&hoto"
-msgstr "照片(&H)"
+#: protocols/oscar/icq/icqprotocol.cpp:571
+#: protocols/oscar/oscarencodingselectiondialog.cpp:70
+msgid "Windows-1255 Hebrew"
+msgstr "Windows-1255 希伯来语"
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 275
-#: rc.cpp:528
-#, no-c-format
-msgid "S&ync address book photo with global photo"
-msgstr "将地址簿的照片与全局照片同步(&Y)"
+#: protocols/oscar/icq/icqprotocol.cpp:572
+#: protocols/oscar/oscarencodingselectiondialog.cpp:71
+msgid "Windows-1256 Arabic"
+msgstr "Windows-1256 阿拉伯语"
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 296
-#: rc.cpp:531 rc.cpp:1073
-#, no-c-format
-msgid "Cus&tom:"
-msgstr "自定义(&T)："
+#: protocols/oscar/icq/icqprotocol.cpp:573
+#: protocols/oscar/oscarencodingselectiondialog.cpp:72
+msgid "Windows-1257 Baltic"
+msgstr "Windows-1257 波罗的语"
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 304
-#: rc.cpp:534
-#, no-c-format
-msgid "U&se photo from contact for global photo:"
-msgstr "全局照片使用联系人的照片(&S)："
+#: protocols/oscar/icq/icqprotocol.cpp:574
+#: protocols/oscar/oscarencodingselectiondialog.cpp:73
+msgid "Windows-1258 Viet Nam"
+msgstr "Windows-1258 越南语"
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 312
-#: rc.cpp:537
-#, no-c-format
-msgid "Use a&ddress book photo (needs address book link)"
-msgstr "使用地址簿照片(需要地址簿链接)(&D)"
+#: protocols/oscar/icq/icqprotocol.cpp:576
+#: protocols/oscar/oscarencodingselectiondialog.cpp:75
+msgid "IBM 850"
+msgstr "IBM 850"
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 365
-#: rc.cpp:540
-#, no-c-format
-msgid "<center>Photo</center>"
-msgstr "<center>照片</center>"
+#: protocols/oscar/icq/icqprotocol.cpp:577
+#: protocols/oscar/oscarencodingselectiondialog.cpp:76
+msgid "IBM 866"
+msgstr "IBM 866"
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 419
-#: rc.cpp:543
-#, no-c-format
-msgid "Address &Book Link"
-msgstr "地址簿链接(&B)"
+#: protocols/oscar/icq/icqprotocol.cpp:579
+#: protocols/oscar/oscarencodingselectiondialog.cpp:78
+msgid "TIS-620 Thai"
+msgstr "TIS-620 泰语"
 
-#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 460
-#: rc.cpp:549
-#, no-c-format
+#: protocols/oscar/icq/icqprotocol.cpp:581
+#: protocols/oscar/oscarencodingselectiondialog.cpp:80
+msgid "UTF-8 Unicode"
+msgstr "UTF-8 Unicode"
+
+#: protocols/oscar/icq/icqprotocol.cpp:582
+#: protocols/oscar/oscarencodingselectiondialog.cpp:81
+msgid "UTF-16 Unicode"
+msgstr "UTF-16 Unicode"
+
+#: protocols/oscar/oscarcontact.cpp:174
+msgid "Mobile AIM Client"
+msgstr "手机 AIM 客户"
+
+#: protocols/oscar/oscarcontact.cpp:180
+#, c-format
 msgid ""
-"<b>Note:</b> The address book link uses KAddressBook's \n"
-"current user contact."
-msgstr "<b>注意：</b>地址簿链接使用 KAddressBook 的当前用户联系人。"
+"_: Translators: client name and version\n"
+"%1"
+msgstr "%1"
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 17
-#: rc.cpp:553
-#, no-c-format
-msgid "Manage Accounts"
-msgstr "管理账户"
+#: protocols/oscar/oscarcontact.cpp:186
+msgid "Buddy icons"
+msgstr "好友图标"
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 31
-#: rc.cpp:556 rc.cpp:2005
-#, no-c-format
-msgid "&New..."
-msgstr "新建(&N)..."
+#: protocols/oscar/icq/icqcontact.cpp:551 protocols/oscar/oscarcontact.cpp:188
+msgid "UTF-8"
+msgstr "UTF-8"
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 34
-#: rc.cpp:559
-#, no-c-format
-msgid "Add new account"
-msgstr "添加新账户"
+#: protocols/oscar/oscarcontact.cpp:190
+msgid "Rich text messages"
+msgstr "丰富文本消息"
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 42
-#: rc.cpp:562
-#, no-c-format
-msgid "&Modify..."
-msgstr "修改(&M)..."
+#: protocols/oscar/oscarcontact.cpp:192
+msgid "Group chat"
+msgstr "群组聊天"
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 45
-#: rc.cpp:565
-#, no-c-format
-msgid "Modify selected account"
-msgstr "修改选中账户"
+#: protocols/oscar/oscarcontact.cpp:194
+msgid "Voice chat"
+msgstr "语音聊天"
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 48
-#: rc.cpp:568
-#, no-c-format
-msgid "Let you edit the account's properties."
-msgstr "让您编辑联系人的属性。"
+#: protocols/oscar/icq/icqcontact.cpp:555 protocols/oscar/oscarcontact.cpp:196
+msgid "DirectIM/IMImage"
+msgstr "二人世界/图像"
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 59
-#: rc.cpp:574 rc.cpp:577
-#, no-c-format
-msgid "Remove selected account"
-msgstr "删除选中账户"
+#: protocols/oscar/oscarcontact.cpp:198
+msgid "Send buddy list"
+msgstr "发送好友列表"
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 68
-#: rc.cpp:580 rc.cpp:1184 rc.cpp:1266
-#, no-c-format
-msgid "Protocol"
-msgstr "协议"
+#: protocols/oscar/oscarcontact.cpp:200
+msgid "File transfers"
+msgstr "文件传送"
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 79
-#: rc.cpp:583 rc.cpp:1181 rc.cpp:1263 rc.cpp:1903
-#, no-c-format
-msgid "Account"
-msgstr "账户"
+#: protocols/oscar/icq/icqprotocol.cpp:616
+#: protocols/oscar/oscarcontact.cpp:202
+msgid "Games"
+msgstr "游戏"
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 100
-#: rc.cpp:586
-#, no-c-format
-msgid "Use &custom color"
-msgstr "使用自定义颜色(&C)"
+#: protocols/oscar/oscarcontact.cpp:204
+msgid "Trillian user"
+msgstr "Trillian 用户"
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 103
-#: rc.cpp:589
-#, no-c-format
-msgid "Use custom color for account"
-msgstr "账户使用自定义颜色"
+#: libkopete/tdeabcpersistence.cpp:367 protocols/oscar/aim/aimprotocol.cpp:164
+#: protocols/oscar/icq/icqprotocol.cpp:119
+msgid "Choose Account"
+msgstr "选择账户"
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 106
-#: rc.cpp:592
-#, no-c-format
-msgid "Allows you to set a custom color for this account"
-msgstr "允许您为此账户设置自定义颜色"
+#: protocols/oscar/icq/icqprotocol.cpp:139
+#: protocols/oscar/icq/ui/icqaddcontactpage.cpp:86
+msgid "You must be online to add a contact."
+msgstr "要添加联系人，您必须上线。"
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 117
-#: rc.cpp:595 rc.cpp:853 rc.cpp:884
+#: protocols/oscar/icq/icqprotocol.cpp:144
+msgid "'%1'"
+msgstr "“%1”"
+
+#: protocols/oscar/icq/icqprotocol.cpp:145
+msgid "'%1' (%2)"
+msgstr "“%1”(%2)"
+
+#: protocols/oscar/icq/icqprotocol.cpp:148
+msgid "Do you want to add %1 to your contact list?"
+msgstr "您要把 %1 添加到您的联系人列表吗？"
+
+#: protocols/oscar/icq/icqprotocol.cpp:182
+msgid "IP Address"
+msgstr "IP 地址"
+
+#: protocols/oscar/aim/aimprotocol.cpp:242
+#: protocols/oscar/icq/icqprotocol.cpp:183
+msgid "Client Features"
+msgstr "客户特性"
+
+#: protocols/oscar/aim/aimprotocol.cpp:244
+#: protocols/oscar/icq/icqprotocol.cpp:184
+msgid "Buddy Icon MD5 Hash"
+msgstr "好友图标 MD5 哈希"
+
+#: protocols/oscar/icq/icqprotocol.cpp:185
+msgid "Contact Encoding"
+msgstr "联系人编码"
+
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 267
+#: protocols/oscar/icq/icqprotocol.cpp:215 rc.cpp:4203 rc.cpp:4506
 #, no-c-format
-msgid "Account custom color selector"
-msgstr "账户自定义颜色选择器"
+msgid "Female"
+msgstr "女"
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 121
-#: rc.cpp:598
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 262
+#: protocols/oscar/icq/icqprotocol.cpp:216 rc.cpp:4200 rc.cpp:4509
 #, no-c-format
+msgid "Male"
+msgstr "男"
+
+#: protocols/oscar/icq/icqprotocol.cpp:235
+msgid "Ascension Island"
+msgstr "阿森松群岛"
+
+#: protocols/oscar/icq/icqprotocol.cpp:237
+msgid "Australian Antarctic Territory"
+msgstr "澳属南极地区"
+
+#: protocols/oscar/icq/icqprotocol.cpp:244
+msgid "Barbuda"
+msgstr "巴布达"
+
+#: protocols/oscar/icq/icqprotocol.cpp:255
+msgid "British Virgin Islands"
+msgstr "不列颠维尔金群岛"
+
+#: protocols/oscar/icq/icqprotocol.cpp:281
+msgid "Diego Garcia"
+msgstr "迭哥伽西亚"
+
+#: protocols/oscar/icq/icqprotocol.cpp:297
+msgid "French Antilles"
+msgstr "法属安的列斯"
+
+#: protocols/oscar/icq/icqprotocol.cpp:311
+msgid "Guantanamo Bay"
+msgstr "关塔那摩湾"
+
+#: protocols/oscar/icq/icqprotocol.cpp:320
+msgid "INMARSAT (Atlantic-East)"
+msgstr "国际海事卫星电话 (大西洋-东)"
+
+#: protocols/oscar/icq/icqprotocol.cpp:321
+msgid "INMARSAT (Atlantic-West)"
+msgstr "国际海事卫星电话 (大西洋-西)"
+
+#: protocols/oscar/icq/icqprotocol.cpp:322
+msgid "INMARSAT (Indian)"
+msgstr "国际海事卫星电话 (印度)"
+
+#: protocols/oscar/icq/icqprotocol.cpp:323
+msgid "INMARSAT (Pacific)"
+msgstr "国际海事卫星电话 (太平洋)"
+
+#: protocols/oscar/icq/icqprotocol.cpp:324
+msgid "INMARSAT"
+msgstr "国际海事卫星电话"
+
+#: protocols/oscar/icq/icqprotocol.cpp:328
+msgid "International Freephone Service"
+msgstr "国际免费电话服务"
+
+#: protocols/oscar/icq/icqprotocol.cpp:334
+#: protocols/oscar/icq/icqprotocol.cpp:408
+msgid "Ivory Coast"
+msgstr "象牙海岸"
+
+#: protocols/oscar/icq/icqprotocol.cpp:380
+msgid "Nevis"
+msgstr "吉维斯"
+
+#: protocols/oscar/icq/icqprotocol.cpp:402
+msgid "Reunion Island"
+msgstr "留尼汪岛"
+
+#: protocols/oscar/icq/icqprotocol.cpp:404
+msgid "Rota Island"
+msgstr "罗塔岛"
+
+#: protocols/oscar/icq/icqprotocol.cpp:437
+msgid "Tinian Island"
+msgstr "天年岛"
+
+#. i18n("Arabic")
+#: protocols/oscar/icq/icqprotocol.cpp:475
+msgid "Bhojpuri"
+msgstr "博杰普尔语"
+
+#. i18n("Bulgarian")
+#. i18n("Burmese")
+#: protocols/oscar/icq/icqprotocol.cpp:478
+msgid "Cantonese"
+msgstr "粤语"
+
+#. i18n("Catalan")
+#. i18n("Chinese")
+#. i18n("Croatian")
+#. i18n("Czech")
+#. i18n("Danish")
+#. i18n("Dutch")
+#. i18n("English")
+#. i18n("Esperanto")
+#. i18n("Estonian")
+#: protocols/oscar/icq/icqprotocol.cpp:488
+msgid "Farsi"
+msgstr "波斯"
+
+#. i18n("Finnish")
+#. i18n("French")
+#. i18n("Gaelic")
+#. i18n("German")
+#. i18n("Greek")
+#. i18n("Hebrew")
+#. i18n("Hindi")
+#. i18n("Hungarian")
+#. i18n("Icelandic")
+#. i18n("Indonesian")
+#. i18n("Italian")
+#. i18n("Japanese")
+#. i18n("Khmer")
+#. i18n("Korean")
+#. i18n("Lao")
+#. i18n("Latvian")
+#. i18n("Lithuanian")
+#. i18n("Malay")
+#. i18n("Norwegian")
+#. i18n("Polish")
+#. i18n("Portuguese")
+#. i18n("Romanian")
+#. i18n("Russian")
+#. i18n("Serbian")
+#. i18n("Slovak")
+#. i18n("Slovenian")
+#. i18n("Somali")
+#. i18n("Spanish")
+#. i18n("Swahili")
+#. i18n("Swedish")
+#. i18n("Tagalog")
+#. i18n("Tatar")
+#. i18n("Thai")
+#. i18n("Turkish")
+#. i18n("Ukrainian")
+#. i18n("Urdu")
+#. i18n("Vietnamese")
+#. i18n("Yiddish")
+#. i18n("Yoruba")
+#: protocols/oscar/icq/icqprotocol.cpp:528
+msgid "Taiwanese"
+msgstr "中国台湾"
+
+#: protocols/oscar/icq/icqprotocol.cpp:596
+msgid "Single"
+msgstr "单身"
+
+#: protocols/oscar/icq/icqprotocol.cpp:597
+msgid "Long term relationship"
+msgstr "长期关系"
+
+#: protocols/oscar/icq/icqprotocol.cpp:598
+msgid "Engaged"
+msgstr "忙碌中"
+
+#: protocols/oscar/icq/icqprotocol.cpp:599
+msgid "Married"
+msgstr "已婚"
+
+#: protocols/oscar/icq/icqprotocol.cpp:600
+msgid "Divorced"
+msgstr "离婚"
+
+#: protocols/oscar/icq/icqprotocol.cpp:601
+msgid "Separated"
+msgstr "分居"
+
+#: protocols/oscar/icq/icqprotocol.cpp:602
+msgid "Widowed"
+msgstr "丧偶"
+
+#: protocols/oscar/icq/icqprotocol.cpp:609
+msgid "Art"
+msgstr "艺术"
+
+#: protocols/oscar/icq/icqprotocol.cpp:610
+msgid "Cars"
+msgstr "汽车"
+
+#: protocols/oscar/icq/icqprotocol.cpp:611
+msgid "Celebrities"
+msgstr "明星"
+
+#: protocols/oscar/icq/icqprotocol.cpp:612
+msgid "Collections"
+msgstr "收藏"
+
+#: protocols/oscar/icq/icqprotocol.cpp:613
+msgid "Computers"
+msgstr "计算机"
+
+#: protocols/oscar/icq/icqprotocol.cpp:614
+msgid "Culture"
+msgstr "文化"
+
+#: protocols/oscar/icq/icqprotocol.cpp:615
+msgid "Fitness"
+msgstr "健身"
+
+#: protocols/oscar/icq/icqprotocol.cpp:617
+msgid "Hobbies"
+msgstr "嗜好"
+
+#: protocols/oscar/icq/icqprotocol.cpp:618
+msgid "ICQ - Help"
+msgstr "ICQ - 帮助"
+
+#: protocols/oscar/icq/icqprotocol.cpp:619
+msgid "Internet"
+msgstr "互联网"
+
+#: protocols/oscar/icq/icqprotocol.cpp:620
+msgid "Lifestyle"
+msgstr "生活方式"
+
+#: protocols/oscar/icq/icqprotocol.cpp:621
+msgid "Movies"
+msgstr "电影"
+
+#: protocols/oscar/icq/icqprotocol.cpp:622
+msgid "Music"
+msgstr "音乐"
+
+#: protocols/oscar/icq/icqprotocol.cpp:623
+msgid "Outdoors"
+msgstr "户外"
+
+#: protocols/oscar/icq/icqprotocol.cpp:624
+msgid "Parenting"
+msgstr "抚育儿女"
+
+#: protocols/oscar/icq/icqprotocol.cpp:625
+msgid "Pets and animals"
+msgstr "宠物"
+
+#: protocols/oscar/icq/icqprotocol.cpp:626
+msgid "Religion"
+msgstr "宗教信仰"
+
+#: protocols/oscar/icq/icqprotocol.cpp:627
+msgid "Science"
+msgstr "科学"
+
+#: protocols/oscar/icq/icqprotocol.cpp:628
+msgid "Skills"
+msgstr "技能"
+
+#: protocols/oscar/icq/icqprotocol.cpp:629
+msgid "Sports"
+msgstr "运动"
+
+#: protocols/oscar/icq/icqprotocol.cpp:630
+msgid "Web design"
+msgstr "Web 设计"
+
+#: protocols/oscar/icq/icqprotocol.cpp:631
+msgid "Ecology"
+msgstr "生态学"
+
+#: protocols/oscar/icq/icqprotocol.cpp:632
+msgid "News and media"
+msgstr "新闻与传媒"
+
+#: protocols/oscar/icq/icqprotocol.cpp:633
+msgid "Government"
+msgstr "政府"
+
+#: protocols/oscar/icq/icqprotocol.cpp:634
+msgid "Business"
+msgstr "商务"
+
+#: protocols/oscar/icq/icqprotocol.cpp:635
+msgid "Mystics"
+msgstr "神秘主义"
+
+#: protocols/oscar/icq/icqprotocol.cpp:636
+msgid "Travel"
+msgstr "旅行"
+
+#: protocols/oscar/icq/icqprotocol.cpp:637
+msgid "Astronomy"
+msgstr "天文"
+
+#: protocols/oscar/icq/icqprotocol.cpp:638
+msgid "Space"
+msgstr "空间"
+
+#: protocols/oscar/icq/icqprotocol.cpp:639
+msgid "Clothing"
+msgstr "衣着"
+
+#: protocols/oscar/icq/icqprotocol.cpp:640
+msgid "Parties"
+msgstr "派对"
+
+#: protocols/oscar/icq/icqprotocol.cpp:641
+msgid "Women"
+msgstr "女人"
+
+#: protocols/oscar/icq/icqprotocol.cpp:642
+msgid "Social science"
+msgstr "社会科学"
+
+#: protocols/oscar/icq/icqprotocol.cpp:643
+msgid "60's"
+msgstr "六十年代"
+
+#: protocols/oscar/icq/icqprotocol.cpp:644
+msgid "70's"
+msgstr "七十年代"
+
+#: protocols/oscar/icq/icqprotocol.cpp:645
+msgid "40's"
+msgstr "四十年代"
+
+#: protocols/oscar/icq/icqprotocol.cpp:646
+msgid "50's"
+msgstr "五十年代"
+
+#: protocols/oscar/icq/icqprotocol.cpp:647
+msgid "Finance and corporate"
+msgstr "金融与公司"
+
+#: protocols/oscar/icq/icqprotocol.cpp:648
+msgid "Entertainment"
+msgstr "娱乐"
+
+#: protocols/oscar/icq/icqprotocol.cpp:649
+msgid "Consumer electronics"
+msgstr "消费电子"
+
+#: protocols/oscar/icq/icqprotocol.cpp:650
+msgid "Retail stores"
+msgstr "零售店"
+
+#: protocols/oscar/icq/icqprotocol.cpp:651
+msgid "Health and beauty"
+msgstr "健康与美容"
+
+#: protocols/oscar/icq/icqprotocol.cpp:652
+msgid "Media"
+msgstr "媒体"
+
+#: protocols/oscar/icq/icqprotocol.cpp:653
+msgid "Household products"
+msgstr "家居产品"
+
+#: protocols/oscar/icq/icqprotocol.cpp:654
+msgid "Mail order catalog"
+msgstr "邮购目录"
+
+#: protocols/oscar/icq/icqprotocol.cpp:655
+msgid "Business services"
+msgstr "商务服务"
+
+#: protocols/oscar/icq/icqprotocol.cpp:656
+msgid "Audio and visual"
+msgstr "影音享受"
+
+#: protocols/oscar/icq/icqprotocol.cpp:657
+msgid "Sporting and athletic"
+msgstr "运动"
+
+#: protocols/oscar/icq/icqprotocol.cpp:658
+msgid "Publishing"
+msgstr "出版"
+
+#: protocols/oscar/icq/icqprotocol.cpp:659
+msgid "Home automation"
+msgstr "居家自动化"
+
+#: protocols/oscar/icq/icqcontact.cpp:253
+msgid "Request Authorization"
+msgstr "请求验证"
+
+#: protocols/oscar/icq/icqcontact.cpp:254
+msgid "Reason for requesting authorization:"
+msgstr "请求验证的原因："
+
+#: protocols/oscar/icq/icqcontact.cpp:278
 msgid ""
-"Allows you to set a custom color for this account.\n"
-"The icon of every contact of this account will be coloured with this color. "
-"Useful if you have several accounts of the same protocol"
+"User %1 has granted your authorization request.\n"
+"Reason: %2"
 msgstr ""
-"允许您为此账户设置自定义颜色。\n"
-"此账户的每个联系人图标都会用此颜色着色。如果您在同一协议下有多个账户，则此功能可帮助您区分不同账户下的联系人。"
-
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 163
-#: rc.cpp:602
-#, no-c-format
-msgid "Increase the priority"
-msgstr "增加优先级"
+"用户 %1 同意了您的身份验证请求。\n"
+"原因：%2"
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 167
-#: rc.cpp:605 rc.cpp:612
-#, no-c-format
+#: protocols/oscar/icq/icqcontact.cpp:287
 msgid ""
-"Uses these buttons to increase or decrease the priority.\n"
-"The priority is used to determine which contact to use when you click on a "
-"metacontact: Kopete will use the contact of the account with the greatest "
-"priority (if all contacts have the same online status.)"
+"User %1 has rejected the authorization request.\n"
+"Reason: %2"
 msgstr ""
-"使用这两个按钮可增加或减少优先级。\n"
-"优先级用于决定当您单击超级联系人时要使用哪个联系人：Kopete 将使用优先级最高的账户(如果全部联系人的在线状态都相同的话。)"
+"用户 %1 拒绝了您的身份验证请求。\n"
+"原因：%2"
 
-#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 201
-#: rc.cpp:609
-#, no-c-format
-msgid "Decrease the priority"
-msgstr "减少优先级"
+#: protocols/oscar/icq/icqcontact.cpp:553
+msgid "RTF-Messages"
+msgstr "RTF 消息"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 24
-#: rc.cpp:616
-#, no-c-format
-msgid "Chat Window Appearance"
-msgstr "聊天窗口外观"
+#: protocols/oscar/icq/icqcontact.cpp:557
+msgid "Groupchat"
+msgstr "群组聊天"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 43
-#: rc.cpp:619
-#, no-c-format
-msgid "Styles"
-msgstr "样式"
+#: protocols/oscar/icq/icqcontact.cpp:628
+msgid ""
+"<qt>You must be logged on to ICQ before you can send a message to a user.</qt>"
+msgstr "<qt>您必须登录到 ICQ 之后才能给用户发送消息。</qt>"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 113
-#: rc.cpp:622
-#, no-c-format
-msgid "&Get New..."
-msgstr "获得新样式(&G)..."
+#: protocols/oscar/icq/icqcontact.cpp:630
+msgid "Not Signed On"
+msgstr "未签入"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 116
-#: rc.cpp:625
-#, no-c-format
-msgid "Get new Chat Window styles over the Internet"
-msgstr "从 Internet 上获取聊天窗口样式"
+#: protocols/oscar/icq/icqcontact.cpp:690
+msgid "&Request Authorization"
+msgstr "请求验证(&R)"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 124
-#: rc.cpp:628
-#, no-c-format
-msgid "&Install..."
-msgstr "安装(&I)..."
+#: protocols/oscar/icq/icqcontact.cpp:692
+msgid "&Grant Authorization"
+msgstr "通过身份验证(&G)"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 142
-#: rc.cpp:634
-#, no-c-format
-msgid "Style Variant:"
-msgstr "样式变体："
+#: protocols/oscar/icq/icqcontact.cpp:703
+msgid "&Ignore"
+msgstr "忽略(&I)"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 165
-#: rc.cpp:637
-#, no-c-format
-msgid "Display"
-msgstr "显示"
+#: protocols/oscar/aim/aimcontact.cpp:95
+#: protocols/oscar/icq/icqcontact.cpp:705
+msgid "Always &Visible To"
+msgstr "总是对谁显身(&V)"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 176
-#: rc.cpp:640
-#, no-c-format
-msgid "Group consecuti&ve messages"
-msgstr "分组连续的消息(&V)"
+#: protocols/oscar/aim/aimcontact.cpp:97
+#: protocols/oscar/icq/icqcontact.cpp:707
+msgid "Always &Invisible To"
+msgstr "总是对谁隐身(&I)"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 16
-#: rc.cpp:643
-#, no-c-format
-msgid "Contact List Appearance"
-msgstr "联系人列表外观"
+#: protocols/oscar/icq/icqcontact.cpp:719
+msgid "Select Encoding..."
+msgstr "选择编码..."
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 27
-#: rc.cpp:646
-#, no-c-format
-msgid "Layout"
-msgstr "布局"
+#: protocols/oscar/icq/icqpresence.cpp:72
+msgid "&Do Not Disturb"
+msgstr "请勿打扰(&D)"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 38
-#: rc.cpp:649
-#, no-c-format
-msgid "Arrange metacontacts by &group"
-msgstr "按组排列超级联系人(&G)"
+#: protocols/oscar/icq/icqpresence.cpp:72
+msgid "Do Not Disturb (Invisible)"
+msgstr "请勿打扰(隐身)"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 46
-#: rc.cpp:652
-#, no-c-format
-msgid "Show tree &branch lines"
-msgstr "显示树形线(&B)"
+#: protocols/oscar/icq/icqpresence.cpp:73
+msgid "O&ccupied"
+msgstr "正忙(&C)"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 79
-#: rc.cpp:655
-#, no-c-format
-msgid "In&dent contacts"
-msgstr "缩进联系人(&D)"
+#: protocols/oscar/icq/icqpresence.cpp:73
+msgid "Occupied"
+msgstr "正忙"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 91
-#: rc.cpp:658
-#, no-c-format
-msgid "Contact Display Mode"
-msgstr "联系人显示模式"
+#: protocols/oscar/icq/icqpresence.cpp:73
+msgid "Occupied (Invisible)"
+msgstr "正忙(隐身)"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 102
-#: rc.cpp:661
-#, no-c-format
-msgid "List Style"
-msgstr "列表样式"
+#: protocols/oscar/icq/icqpresence.cpp:74
+msgid "Not A&vailable"
+msgstr "不在(&V)"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 113
-#: rc.cpp:664
-#, no-c-format
-msgid "&Classic, left-aligned status icons"
-msgstr "经典的左对齐状态图标(&C)"
+#: protocols/oscar/icq/icqpresence.cpp:74
+msgid "Not Available"
+msgstr "不在"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 124
-#: rc.cpp:667
-#, no-c-format
-msgid "&Right-aligned status icons"
-msgstr "右对齐的状态图标(&R)"
+#: protocols/oscar/icq/icqpresence.cpp:74
+msgid "Not Available (Invisible)"
+msgstr "不在(隐身)"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 132
-#: rc.cpp:670
-#, no-c-format
-msgid "Detailed &view"
-msgstr "细节视图(&V)"
+#: protocols/oscar/icq/icqpresence.cpp:75
+msgid "Away (Invisible)"
+msgstr "离开(隐身)"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 142
-#: rc.cpp:673
-#, no-c-format
-msgid "Use contact photos when available"
-msgstr "可用时使用联系人照片"
+#: protocols/oscar/icq/icqpresence.cpp:76
+msgid "&Free for Chat"
+msgstr "欢迎聊天(&F)"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 152
-#: rc.cpp:676
-#, no-c-format
-msgid "Contact List Auto-Hide"
-msgstr "联系人列表自动隐藏"
+#: protocols/oscar/icq/icqpresence.cpp:76
+msgid "Free For Chat"
+msgstr "欢迎聊天"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 155
-#: rc.cpp:679
+#: protocols/oscar/icq/icqpresence.cpp:76
+msgid "Free For Chat (Invisible)"
+msgstr "欢迎聊天(隐身)"
+
+#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 71
+#: protocols/oscar/icq/icqpresence.cpp:77 rc.cpp:4265
 #, no-c-format
+msgid "O&nline"
+msgstr "在线(&N)"
+
+#: protocols/oscar/icq/icqpresence.cpp:77
+msgid "Online (Invisible)"
+msgstr "在线(隐身)"
+
+#: protocols/oscar/aim/aimprotocol.cpp:240
+#: protocols/oscar/icq/icqpresence.cpp:129
+msgid "Connecting..."
+msgstr "正在连接..."
+
+#: protocols/oscar/icq/icqpresence.cpp:133
+msgid "Waiting for Authorization"
+msgstr "等待认证"
+
+#: protocols/oscar/icq/icqreadaway.cpp:34
+msgid "&Fetch Again"
+msgstr "再次获取(&F)"
+
+#: protocols/oscar/icq/icqreadaway.cpp:40
+#: protocols/oscar/icq/icqreadaway.cpp:82
+msgid "'%2' Message for %1"
+msgstr "%1 的“%2”消息"
+
+#: protocols/oscar/icq/icqreadaway.cpp:77
+msgid "Fetching '%2' Message for %1..."
+msgstr "正在获取 %1 的“%2”消息..."
+
+#: protocols/oscar/icq/ui/icqauthreplydialog.cpp:28
+msgid "Authorization Reply"
+msgstr "身份验证回复"
+
+#: protocols/oscar/icq/ui/icqauthreplydialog.cpp:53
+msgid "<b>%1</b> requested authorization to add you to his/her contact list."
+msgstr "<b>%1</b> 请求将您添加到他/她的联系人列表中。"
+
+#: protocols/oscar/icq/ui/icqauthreplydialog.cpp:55
+msgid "Authorization reply to <b>%1</b>."
+msgstr "对 <b>%1</b> 的身份验证回复。"
+
+#: protocols/oscar/aim/aimaccount.cpp:790
+#: protocols/oscar/icq/icqaccount.cpp:227
+#: protocols/oscar/icq/ui/icqaddcontactpage.cpp:86
+#: protocols/oscar/icq/ui/icqaddcontactpage.cpp:94
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:83
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:108
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:147
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:196
+msgid "ICQ Plugin"
+msgstr "ICQ 插件"
+
+#: protocols/oscar/icq/ui/icqaddcontactpage.cpp:94
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:108
+msgid "You must enter a valid UIN."
+msgstr "您必须输入一个有效的 UIN。"
+
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:44
+msgid "ICQ User Information"
+msgstr "ICQ 用户信息"
+
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:49
+msgid "General ICQ Information"
+msgstr "ICQ 常规信息"
+
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:63
+msgid "Other ICQ Information"
+msgstr "ICQ 其它信息"
+
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:69
+msgid "Interest Info"
+msgstr "兴趣信息"
+
+#: protocols/oscar/icq/ui/icquserinfowidget.cpp:70
+msgid "Interest"
+msgstr "兴趣"
+
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:45
+msgid "ICQ User Search"
+msgstr "ICQ 用户搜索"
+
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:83
+msgid "You must be online to search the ICQ Whitepages."
+msgstr "要搜索 ICQ 白页，您必须上线。"
+
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:147
+msgid "You must enter search criteria."
+msgstr "您必须输入搜索条件。"
+
+#: protocols/oscar/icq/ui/icqsearchdialog.cpp:196
+msgid "You must be online to display user info."
+msgstr "要显示用户信息，您必须上线。"
+
+#: protocols/oscar/icq/icqaccount.cpp:130
+msgid "In&visible"
+msgstr "隐身(&V)"
+
+#: protocols/oscar/aim/aimaccount.cpp:328
+#: protocols/oscar/icq/icqaccount.cpp:137
+msgid "Set Visibility..."
+msgstr "设置是否有空..."
+
+#: protocols/oscar/aim/aimaccount.cpp:789
+#: protocols/oscar/icq/icqaccount.cpp:226
+msgid "You must be online to set users visibility."
+msgstr "要设定用户可见性，您必须上线。"
+
+#: protocols/oscar/oscarlistnonservercontacts.cpp:28
+msgid "Add Contacts to Server List"
+msgstr "将联系人添加到服务器列表"
+
+#: protocols/oscar/oscarlistnonservercontacts.cpp:34
+msgid "Do &Not Add"
+msgstr "不添加(&N)"
+
+#: protocols/oscar/aim/aimaccount.cpp:211
 msgid ""
-"When enabled, the contact list will automatically be hidden a fixed amount of "
-"time after the mouse cursor leaves the window. You can set the amount of time "
-"in the 'Time until autohide' box below."
-msgstr "启用时，当鼠标指针离开窗口指定时间后将会自动隐藏联系人列表。您可以在下面的“自动隐藏的等待时长”中设定该时间。"
+"Visit the Kopete website at <a href=\"http://kopete.kde.org\">"
+"http://kopete.kde.org</a>"
+msgstr ""
+"浏览 Kopete 的网站：<a href=\"http://kopete.kde.org\">http://kopete.kde.org</a>"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 166
-#: rc.cpp:682
-#, no-c-format
-msgid "A&uto-hide contact list"
-msgstr "自动隐藏联系人列表(&U)"
+#: protocols/oscar/aim/aimaccount.cpp:325
+msgid "Join Chat..."
+msgstr "加入聊天..."
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 214
-#: rc.cpp:688
-#, no-c-format
-msgid "The timeout value for both contact list and scrollbar auto-hiding."
-msgstr "联系人列表和滚动条自动隐藏的超时值。"
+#: protocols/oscar/aim/aimaccount.cpp:385
+msgid "Editing your user info is not possible because you are not connected."
+msgstr "无法编辑您的用户信息，原因是您没有连接。"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 225
-#: rc.cpp:691
-#, no-c-format
-msgid "after the cursor left the window"
-msgstr "光标离开窗口后"
+#: protocols/oscar/aim/aimaccount.cpp:387
+msgid "Unable to edit user info"
+msgstr "无法编辑用户信息"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 254
-#: rc.cpp:694
-#, no-c-format
-msgid "Contact List Animations"
-msgstr "联系人列表动画"
+#: protocols/oscar/aim/aimaccount.cpp:511
+msgid "Joining an AIM chat room is not possible because you are not connected."
+msgstr "在未处于连接状态时您无法加入 AIM 聊天室。"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 265
-#: rc.cpp:697
-#, no-c-format
-msgid "&Animate changes to contact list items"
-msgstr "联系人列表项的更改用动画显示(&A)"
+#: protocols/oscar/aim/aimaccount.cpp:513
+msgid "Unable to Join AIM Chat Room"
+msgstr "无法加入 AIM 聊天室"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 273
-#: rc.cpp:700
-#, no-c-format
-msgid "Fade in / out contacts as the&y appear / disappear"
-msgstr "联系人出现/消失时淡入淡出(&Y)"
+#: protocols/oscar/aim/aimcontact.cpp:93
+msgid "&Warn User"
+msgstr "警告用户(&W)"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 281
-#: rc.cpp:703
-#, no-c-format
-msgid "Fo&ld in / out contacts as they appear / disappear"
-msgstr "联系人出现/消失时拉入拉出(&L)"
+#: protocols/oscar/aim/aimcontact.cpp:350
+msgid ""
+"<qt>Would you like to warn %1 anonymously or with your name?"
+"<br>(Warning a user on AIM will result in a \"Warning Level\" increasing for "
+"the user you warn. Once this level has reached a certain point, they will not "
+"be able to sign on. Please do not abuse this function, it is meant for "
+"legitimate practices.)</qt>"
+msgstr ""
+"<qt>您想匿名警告 %1 还是留名警告？"
+"<br>(警告 AIM "
+"上的用户会导致该用户的“警告级别”被提高。一旦该级别达到一定数值，这些用户将无法登录。请不要滥用该功能，它是出于正当考虑而设置的。)</qt>"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 299
-#: rc.cpp:706
-#, no-c-format
-msgid "Change &Tooltip Contents..."
-msgstr "更改工具提示内容(&T)..."
+#: protocols/oscar/aim/aimcontact.cpp:358
+msgid "Warn User %1?"
+msgstr "警告用户 %1 吗？"
 
-#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 46
-#: rc.cpp:709
-#, no-c-format
+#: protocols/oscar/aim/aimcontact.cpp:359
+msgid "Warn Anonymously"
+msgstr "匿名警告"
+
+#: protocols/oscar/aim/aimcontact.cpp:359
+msgid "Warn"
+msgstr "警告"
+
+#: protocols/oscar/aim/aimprotocol.cpp:192
+msgid "Do you want to add '%1' to your contact list?"
+msgstr "您想要把“%1”添加到您的联系人列表吗？"
+
+#: protocols/oscar/aim/aimprotocol.cpp:214
 msgid ""
-"Using the arrow buttons, put on the right the items you want to see in the "
-"contact tooltips. You can then sort them."
-msgstr "使用箭头按钮将您想要在联系人工具提示中看到的内容放到右侧。您可以再对其进行排序。"
+"Unable to connect to the chat room %1 because the account for %2 is not "
+"connected."
+msgstr "无法连接到聊天室 %1，原因是 %2 的帐户未连接。"
 
-#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 57
-#: rc.cpp:712
-#, no-c-format
-msgid "<b>Here you can customize the contact tooltips</b>"
-msgstr "<b>您可以在此自定义联系人工具提示</b>"
+#: protocols/oscar/aim/aimprotocol.cpp:236
+msgid "Mobile"
+msgstr "手机"
 
-#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 87
-#: rc.cpp:715
-#, no-c-format
+#: protocols/oscar/aim/aimprotocol.cpp:239
+msgid "Mobile Away"
+msgstr "手机离开"
+
+#: protocols/oscar/aim/aimprotocol.cpp:243
+msgid "User Profile"
+msgstr "用户配置文件"
+
+#: protocols/oscar/aim/ui/aimaddcontactpage.cpp:43
+msgid "Connect to the AIM network and try again."
+msgstr "连接到 AIM 网络后再重试。"
+
+#: protocols/oscar/aim/ui/aimaddcontactpage.cpp:66
+msgid "No Screen Name"
+msgstr "无屏幕名"
+
+#: protocols/oscar/aim/aimuserinfo.cpp:41
+#: protocols/oscar/aim/aimuserinfo.cpp:136
+#: protocols/oscar/aim/aimuserinfo.cpp:153
+#, c-format
+msgid "User Information on %1"
+msgstr "%1 的用户信息"
+
+#: protocols/oscar/aim/aimuserinfo.cpp:90
+msgid "&Save Profile"
+msgstr "保存配置文件(&S)"
+
+#: protocols/oscar/aim/aimuserinfo.cpp:116
+msgid "Requesting User Profile, please wait..."
+msgstr "正在请求用户配置文件，请稍候..."
+
+#: protocols/oscar/aim/aimuserinfo.cpp:198
+msgid "<html><body><I>No user information provided</I></body></html>"
+msgstr "<html><body><I>没有提供用户信息</I></body></html>"
+
+#: protocols/oscar/aim/aimjoinchat.cpp:31
+msgid "Join AIM Chat Room"
+msgstr "加入 AIM 聊天室"
+
+#: protocols/oscar/aim/aimjoinchat.cpp:32
+msgid "Join"
+msgstr "加入"
+
+#: protocols/oscar/oscaraccount.cpp:237 protocols/oscar/oscaraccount.cpp:616
+#: protocols/oscar/oscaraccount.cpp:622
+msgid "Buddies"
+msgstr "好友"
+
+#: protocols/oscar/oscaraccount.cpp:406
+msgid "ICQ Web Express"
+msgstr "ICQ Web 特快"
+
+#: protocols/oscar/oscaraccount.cpp:408
+msgid "ICQ Email Express"
+msgstr "ICQ 电邮特快"
+
+#: protocols/oscar/oscaraccount.cpp:730 protocols/oscar/oscaraccount.cpp:747
 msgid ""
-"This list contains elements which are currently <b>not present</b> "
-"in the contact tooltip."
-msgstr "此列表包含目前<b>不出现</b>在联系人工具提示中的元素。"
+"_: account has been disconnected\n"
+"%1 disconnected"
+msgstr "%1 已断开"
 
-#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 128
-#: rc.cpp:718
-#, no-c-format
-msgid "v"
-msgstr "v"
+#: protocols/oscar/oscaraccount.cpp:771
+msgid ""
+"There was an error in the protocol handling; it was not fatal, so you will not "
+"be disconnected."
+msgstr "协议处理时出错；这个错误不太严重，所以您不会被断开连接。"
 
-#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 131
-#: rc.cpp:721
-#, no-c-format
-msgid "Use this arrow to reorder the items in the list."
-msgstr "使用此箭头更改列表中项目的顺序。"
+#: protocols/oscar/oscaraccount.cpp:773
+msgid ""
+"There was an error in the protocol handling; automatic reconnection occurring."
+msgstr "协议处理时有错；发生了自动重连接。"
 
-#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 139
-#: rc.cpp:724
-#, no-c-format
-msgid "^"
-msgstr "~"
+#: protocols/oscar/oscaraccount.cpp:775
+msgid "OSCAR Protocol error"
+msgstr "OSCAR 协议错误"
 
-#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 147
-#: rc.cpp:727
-#, no-c-format
-msgid "<"
-msgstr "<"
+#: protocols/oscar/oscaraccount.cpp:810
+msgid ""
+"_: ICQ user id\n"
+"UIN"
+msgstr "UIN"
 
-#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 155
-#: rc.cpp:730
-#, no-c-format
-msgid ">"
-msgstr ">"
+#: protocols/oscar/oscaraccount.cpp:810
+msgid ""
+"_: AIM user id\n"
+"screen name"
+msgstr "屏幕名"
 
-#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 158
-#: rc.cpp:733
-#, no-c-format
-msgid "Use this arrows to add or remove items to your contact tooltips."
-msgstr "使用此箭头向您的联系人工具提示中添加或删除项目。"
+#: protocols/oscar/oscaraccount.cpp:820
+msgid ""
+"You have logged in more than once with the same %1, account %2 is now "
+"disconnected."
+msgstr "您用同一个 %1 登录的次数多于一次，账户 %2 现已断开。"
 
-#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 201
-#: rc.cpp:736
-#, no-c-format
+#: protocols/oscar/oscaraccount.cpp:826
 msgid ""
-"This list contains elements which are currently <b>present</b> "
-"in the contact tooltips."
-msgstr "此列表包含目前<b>出现</b>在联系人工具提示中的元素。"
+"Sign on failed because either your %1 or password are invalid. Please check "
+"your settings for account %2."
+msgstr "签入失败，原因是您的 %1 或密码不对。请检查您对账户 %2 的设置。"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 24
-#: rc.cpp:739
-#, no-c-format
-msgid "&Use emoticons"
-msgstr "使用表情(&U)"
+#: protocols/oscar/oscaraccount.cpp:834
+msgid "The %1 service is temporarily unavailable. Please try again later."
+msgstr "%1 服务暂时不可用。请稍候再试。"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 30
-#: rc.cpp:742
-#, no-c-format
+#: protocols/oscar/oscaraccount.cpp:839
 msgid ""
-"If this is checked, the text representation of emoticons in messages will be "
-"replaced by an image"
-msgstr "如果选中了此选项，消息中用文本表示的表情将被替换为图像"
+"Could not sign on to %1 with account %2 because the password was incorrect."
+msgstr "无法以账户 %2 签入 %1，因为密码不对。"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 38
-#: rc.cpp:745
-#, no-c-format
-msgid "&Require separators (spaces) around emoticons"
-msgstr "表情周围需要分隔符(空格)(&R)"
+#: protocols/oscar/oscaraccount.cpp:844
+msgid "Could not sign on to %1 with nonexistent account %2."
+msgstr "无法以不存在的账户 %2 签入 %1。"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 44
-#: rc.cpp:748
-#, no-c-format
+#: protocols/oscar/oscaraccount.cpp:848
+msgid "Sign on to %1 failed because your account %2 expired."
+msgstr "签入 %1 失败，因为您的账户 %2 已经过期。"
+
+#: protocols/oscar/oscaraccount.cpp:852
+msgid "Sign on to %1 failed because your account %2 is currently suspended."
+msgstr "签入 %1 失败，因为您的账户 %2 目前正暂停。"
+
+#: protocols/oscar/oscaraccount.cpp:858
 msgid ""
-"If this is checked, only emoticons that are separated from the text by spaces "
-"will be shown as images."
-msgstr "如果选中的话，只有那些与文本之间用空格分隔的表情会显示为图像。"
+"Could not sign on to %1 as there are too many clients from the same computer."
+msgstr "无法签入 %1，因为从同一计算机签入的客户太多。"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 55
-#: rc.cpp:751
-#, no-c-format
-msgid "Select emoticon theme:"
-msgstr "选择表情主题："
+#: protocols/oscar/oscaraccount.cpp:864
+msgid ""
+"Account %1 was blocked on the %2 server for sending messages too quickly. Wait "
+"ten minutes and try again. If you continue to try, you will need to wait even "
+"longer."
+msgstr "%2 服务器已经屏蔽了 %1 账户，因为您发送消息太快。请稍候 10 分钟后再试。如果您继续尝试，那将需要等待更长时间。"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 68
-#: rc.cpp:754
-#, no-c-format
-msgid "Preview:"
-msgstr "预览："
+#: protocols/oscar/oscaraccount.cpp:873
+msgid ""
+"Account %1 was blocked on the %2 server for reconnecting too quickly. Wait ten "
+"minutes and try again. If you continue to try, you will need to wait even "
+"longer."
+msgstr "%2 服务器已经屏蔽了 %1 账户，因为您重新连接太快。请稍候 10 分钟后再试。如果您继续尝试，那将需要等待更长时间。"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 106
-#: rc.cpp:757
-#, no-c-format
-msgid "&Get New Themes..."
-msgstr "获得新主题(&G)..."
+#: protocols/oscar/oscaraccount.cpp:885 protocols/oscar/oscaraccount.cpp:905
+msgid "Sign on to %1 with your account %2 failed."
+msgstr "用您的账户 %2 签入 %1 失败。"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 109
-#: rc.cpp:760
-#, no-c-format
-msgid "Download emoticon theme from the Internet"
-msgstr "下载互联网上的表情主题"
+#: protocols/oscar/oscaraccount.cpp:892
+msgid ""
+"The %1 server thinks the client you are using is too old. Please report this as "
+"a bug at http://bugs.kde.org"
+msgstr "%1 服务器认为您正在使用的客户端太旧。请在 http://bugs.kde.org 报告此问题"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 117
-#: rc.cpp:763
-#, no-c-format
-msgid "&Install Theme File..."
-msgstr "安装主题文件(&I)..."
+#: protocols/oscar/oscaraccount.cpp:898
+msgid ""
+"Account %1 was disabled on the %2 server because of your age (less than 13)."
+msgstr "在服务器 %2 上禁用了账户 %1，因为您的年龄小于十三岁。"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 133
-#: rc.cpp:766
-#, no-c-format
-msgid "Remove Theme"
-msgstr "删除主题"
+#: protocols/oscar/oscarvisibilitydialog.cpp:29
+msgid "Add Contacts to Visible or Invisible List"
+msgstr "将联系人添加到可见或隐藏列表"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 16
-#: rc.cpp:769 rc.cpp:1394
-#, no-c-format
-msgid "Colors"
-msgstr "颜色"
+#: protocols/groupwise/gwmessagemanager.cpp:65
+msgid "&Invite"
+msgstr "邀请(&I)"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 44
-#: rc.cpp:775
-#, no-c-format
-msgid "Base font:"
-msgstr "基本字体："
+#: protocols/groupwise/gwmessagemanager.cpp:68
+#: protocols/groupwise/gwmessagemanager.cpp:506
+msgid "Security Status"
+msgstr "安全状态"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 60
-#: rc.cpp:778
-#, no-c-format
-msgid "Highlight foreground:"
-msgstr "突出显示前景："
+#: protocols/groupwise/gwmessagemanager.cpp:69
+msgid "Conversation is secure"
+msgstr "安全对话"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 91
-#: rc.cpp:781
-#, no-c-format
-msgid "Base font color:"
-msgstr "基本字体颜色："
+#: protocols/groupwise/gwmessagemanager.cpp:71
+#: protocols/groupwise/gwmessagemanager.cpp:513
+msgid "Archiving Status"
+msgstr "存档状态"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 122
-#: rc.cpp:784
-#, no-c-format
-msgid "Highlight background:"
-msgstr "突出显示背景："
+#: protocols/groupwise/gwmessagemanager.cpp:199
+#, c-format
+msgid "An error occurred when trying to start a chat: %1"
+msgstr "试图开始聊天时发生了错误：%1"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 130
-#: rc.cpp:787
-#, no-c-format
-msgid "Link color:"
-msgstr "链接颜色："
+#: protocols/groupwise/gwmessagemanager.cpp:226
+msgid ""
+"Your message could not be sent. You cannot send messages while your status is "
+"Appear Offline. "
+msgstr "您的消息未发出。在您位于隐身状态下无法发送消息。 "
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 138
-#: rc.cpp:790
-#, no-c-format
-msgid "Background color:"
-msgstr "背景颜色："
+#: protocols/groupwise/gwmessagemanager.cpp:319
+msgid "&Other..."
+msgstr "其它(&O)..."
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 153
-#: rc.cpp:793
-#, no-c-format
-msgid "Formatting Overrides"
-msgstr "格式覆盖"
+#: protocols/groupwise/gwmessagemanager.cpp:338
+#: protocols/groupwise/gwmessagemanager.cpp:384
+msgid "Enter Invitation Message"
+msgstr "输入邀请消息"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 164
-#: rc.cpp:796
-#, no-c-format
-msgid "Do not show user specified &background color"
-msgstr "不显示用户指定的背景色(&B)"
+#: protocols/groupwise/gwmessagemanager.cpp:339
+#: protocols/groupwise/gwmessagemanager.cpp:385
+msgid "Enter the reason for the invitation, or leave blank for no reason:"
+msgstr "输入邀请的理由，留空代表没有理由："
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 172
-#: rc.cpp:799
-#, no-c-format
-msgid "Do not show user specified &foreground color"
-msgstr "不显示用户指定的前景色(&F)"
+#: protocols/groupwise/gwmessagemanager.cpp:363
+msgid "Search for Contact to Invite"
+msgstr "搜索要邀请的联系人"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 180
-#: rc.cpp:802
-#, no-c-format
-msgid "Do not show user specified &rich text"
-msgstr "不显示用户指定的丰富文本(&R)"
+#: protocols/groupwise/gwmessagemanager.cpp:398
+msgid ""
+"_: label attached to contacts who have been invited but are yet to join a chat\n"
+"(pending)"
+msgstr "(未决)"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 201
-#: rc.cpp:808
-#, no-c-format
-msgid "Use custom fonts for contact list items"
-msgstr "为联系人列表项使用自定义字体"
+#: protocols/groupwise/gwmessagemanager.cpp:445
+msgid ""
+"All the other participants have left, and other invitations are still pending. "
+"Your messages will not be delivered until someone else joins the chat."
+msgstr "所有其他参与者都已离开，其他邀请仍在等待中。除非有别人加入此聊天，否则您的消息不会被发出。"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 245
-#: rc.cpp:811
-#, no-c-format
-msgid "Small font:"
-msgstr "小字体："
+#: protocols/groupwise/gwmessagemanager.cpp:471
+msgid "%1 has rejected an invitation to join this conversation."
+msgstr "%1 拒绝了加入此对话的邀请。"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 264
-#: rc.cpp:814
-#, no-c-format
-msgid "Normal font:"
-msgstr "普通字体："
+#: protocols/groupwise/gwmessagemanager.cpp:493
+msgid "Conversation is being administratively logged"
+msgstr "对话将以管理员身份记录"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 311
-#: rc.cpp:817
-#, no-c-format
-msgid "Recolor contacts marked as idle:"
-msgstr "将标为发呆的联系人重新着色为："
+#: protocols/groupwise/gwmessagemanager.cpp:498
+msgid "Conversation is not being administratively logged"
+msgstr "对话不被以管理员身份记录"
 
-#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 319
-#: rc.cpp:820
-#, no-c-format
-msgid "Group name color:"
-msgstr "组名颜色："
+#: protocols/groupwise/gwmessagemanager.cpp:506
+msgid "This conversation is secured with SSL security."
+msgstr "此对话被 SSL 安全性保护。"
 
-#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage1.ui line 22
-#: rc.cpp:823
-#, no-c-format
-msgid "Step One: Select Messaging Service"
-msgstr "第一步：选择信使服务"
+#: protocols/groupwise/gwmessagemanager.cpp:513
+msgid "This conversation is being logged administratively."
+msgstr "此对话将被以管理员身份记录。"
 
-#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage1.ui line 83
-#: protocols/sms/smseditaccountwidget.cpp:134 rc.cpp:829 rc.cpp:4259
-#, no-c-format
-msgid "Description"
-msgstr "描述"
+#: protocols/groupwise/gwaccount.cpp:82
+msgid "&Set Auto-Reply..."
+msgstr "设定自动回复(&S)..."
 
-#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage1.ui line 122
-#: rc.cpp:832
-#, no-c-format
+#: protocols/groupwise/gwaccount.cpp:84
+msgid "&Join Channel..."
+msgstr "加入频道(&J)..."
+
+#: protocols/groupwise/gwaccount.cpp:86
+msgid "&Manage Privacy..."
+msgstr "管理隐私(&M)..."
+
+#: protocols/groupwise/gwaccount.cpp:253
+msgid "GroupWise SSL Error"
+msgstr "GroupWise SSL 错误"
+
+#: protocols/groupwise/gwaccount.cpp:367
 msgid ""
-"<h2>Welcome to the Add Account Wizard</h2>\n"
-"<p>Select the messaging service from the list below.</p>"
+"_: Message Sending Failed\n"
+"Kopete was not able to send the last message sent on account '%1'.\n"
+"If possible, please send the console output from Kopete to "
+"<wstephenson@novell.com> for analysis."
 msgstr ""
-"<h2>欢迎使用添加账户向导。</h2>\n"
-"\n"
-"<p>请从下面的列表中选择信使服务。</p>"
+"Kopete 无法发送账户“%1”的最近一条消息。\n"
+"如果可能，请将 Kopete 的控制台输出发送到 <wstephenson@novell.com> 供分析。"
 
-#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 16
-#: rc.cpp:836 rc.cpp:865 rc.cpp:1281
-#, no-c-format
-msgid "Finished"
-msgstr "完成"
+#: protocols/groupwise/gwaccount.cpp:367
+msgid "Unable to Send Message on Account '%1'"
+msgstr "不能够发送信息在帐户 '%1'"
 
-#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 39
-#: rc.cpp:839
-#, no-c-format
+#: protocols/groupwise/gwaccount.cpp:577
+msgid "Conflicting Changes Made Offline"
+msgstr "脱机更改冲突"
+
+#: protocols/groupwise/gwaccount.cpp:577
 msgid ""
-"<h2>Congratulations</h2>\n"
-"<p>You have finished configuring the account. Please click the \"Finish\" "
-"button.</p>"
+"A change happened to your GroupWise contact list while you were offline which "
+"was impossible to reconcile."
+msgstr "您在离线状态时对 GroupWise 联系人列表所做的改动将无法和真实信息保持一致。"
+
+#: protocols/groupwise/gwaccount.cpp:650
+msgid ""
+"_: Error shown when connecting failed\n"
+"Kopete was not able to connect to the GroupWise Messenger server for account "
+"'%1'.\n"
+"Please check your server and port settings and try again."
 msgstr ""
-"<h2>恭喜</h2> \n"
-"<p>您已经完成了账户配置。请单击“完成”按钮。</p>"
+"Kopete 无法连接到账户“%1”所用的 GroupWise 信使服务器。\n"
+"请检查您的服务器和端口设置，然后再试一次。"
 
-#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 59
-#: rc.cpp:843 rc.cpp:874
-#, no-c-format
+#: protocols/groupwise/gwaccount.cpp:650
+msgid "Unable to Connect '%1'"
+msgstr "无法连接“%1”"
+
+#: protocols/groupwise/gwaccount.cpp:773
+msgid "The certificate of server %1 could not be validated for account %2: %3"
+msgstr "服务器 %1 的证书无法被账户 %2 验证：%3"
+
+#: protocols/groupwise/gwaccount.cpp:777
+msgid "GroupWise Connection Certificate Problem"
+msgstr "GroupWise 连接证书问题"
+
+#: protocols/groupwise/gwaccount.cpp:826
 msgid ""
-"Use &custom color\n"
-"for account:"
-msgstr "账户使用自定义颜色(&C)："
+"_: Prefix used for automatically generated auto-reply messages when the contact "
+"is Away, contains contact's name\n"
+"Auto reply from %1: "
+msgstr "来自 %1 的自动回复： "
 
-#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 62
-#: rc.cpp:847 rc.cpp:878
-#, no-c-format
-msgid "Use a custom color for this account"
-msgstr "为此账户使用自定义颜色"
+#: protocols/groupwise/gwaccount.cpp:832
+msgid ""
+"_: Prefix used for broadcast messages\n"
+"Broadcast message from %1: "
+msgstr "来自 %1 的广播消息： "
 
-#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 65
-#: rc.cpp:850 rc.cpp:881
-#, no-c-format
+#: protocols/groupwise/gwaccount.cpp:838
 msgid ""
-"Account are often differentiated by the protocol icon. But if you have severals "
-"accounts of the same protocol, you may apply a color filter to that icon to "
-"differentiate accounts from the same protocols."
-msgstr "账户通常是使用协议图标来区分的。但是如果您在同一协议下有多个账户，您还可以对图标应用不同的颜色滤镜以便区分同一协议的不同账户。"
+"_: Prefix used for system broadcast messages\n"
+"System Broadcast message from %1: "
+msgstr "来自 %1 的系统广播消息： "
 
-#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 131
-#: rc.cpp:856 rc.cpp:887
-#, no-c-format
-msgid "Co&nnect now"
-msgstr "立即连接(&N)"
+#: protocols/groupwise/gwaccount.cpp:1212
+msgid ""
+"The contact %1 could not be added to the contact list, with error message: %2"
+msgstr "无法联系人 %1 添加到联系人列表，错误消息为：%2"
 
-#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 137
-#: rc.cpp:859 rc.cpp:890
-#, no-c-format
-msgid "Connect right after Finish is pressed"
-msgstr "按下完成后立即连接"
+#: protocols/groupwise/gwaccount.cpp:1214
+msgid "Error Adding Contact"
+msgstr "添加联系人时出错"
 
-#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 140
-#: rc.cpp:862 rc.cpp:893
-#, no-c-format
+#: protocols/groupwise/gwaccount.cpp:1258
+msgid "Signed in as %1 Elsewhere"
+msgstr "在别处以 %1 嵌入"
+
+#: protocols/groupwise/gwaccount.cpp:1259
 msgid ""
-"If this is checked, the account will be connected right after you clicked on <i>"
-"Finished</i>."
-msgstr "如果选中此选项，在您单击<i>完成</i>后将会立即连接账户。"
+"_: The parameter is the user's own account id for this protocol\n"
+"You have been disconnected from GroupWise Messenger because you signed in as %1 "
+"elsewhere"
+msgstr "您已经从 GroupWise 信使断开，因为您在别处以 %1 嵌入了"
 
-#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage3.ui line 41
-#: rc.cpp:868
-#, no-c-format
+#: protocols/groupwise/gwaccount.cpp:1367
+msgid "%1 has been invited to join this conversation."
+msgstr "邀请了 %1 加入此对话。"
+
+#: protocols/groupwise/gwaccount.cpp:1393
+msgid "Enter Auto-Reply Message"
+msgstr "输入自动回复消息"
+
+#: protocols/groupwise/gwaccount.cpp:1394
 msgid ""
-"<h2>Congratulations</h2> \n"
-"<p>You have finished configuring the account. Please click the \"Finish\" "
-"button.</p>\n"
-"\n"
-msgstr ""
-"<h2>恭喜</h2> \n"
-"<p>您已经完成了账户配置。请单击“完成”按钮。</p>\n"
-"\n"
+"Please enter an Auto-Reply message that will be shown to users who message you "
+"while Away or Busy"
+msgstr "请输入一条自动离开消息，当您离开或忙时将会自动给用户显示此消息"
 
-#. i18n: file ./kopete/kopeteui.rc line 61
-#: rc.cpp:911
-#, no-c-format
-msgid "Global Identity Bar"
-msgstr "全局身份栏"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:29
+msgid "Access denied"
+msgstr "拒绝存取"
 
-#. i18n: file ./kopete/kopeteui.rc line 70
-#: rc.cpp:914
-#, no-c-format
-msgid "&Other Actions"
-msgstr "其它动作(&O)"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:32
+msgid "Not supported"
+msgstr "不支持"
 
-#. i18n: file ./kopete/kopeteui.rc line 77
-#: rc.cpp:917
-#, no-c-format
-msgid "&Groups"
-msgstr "组(&G)"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:35
+msgid "Password expired"
+msgstr "密码过期"
 
-#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 16
-#: rc.cpp:920
-#, no-c-format
-msgid "Export Contacts"
-msgstr "导出联系人"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:38
+msgid "Invalid password"
+msgstr "密码无效"
 
-#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 23
-#: rc.cpp:923
-#, no-c-format
-msgid "Export Contacts to Address Book"
-msgstr "将联系人导出到地址簿"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:41
+msgid "User not found"
+msgstr "未找到用户"
 
-#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 42
-#: rc.cpp:926
-#, no-c-format
-msgid ""
-"This wizard helps you export instant messaging contacts to the TDE address "
-"book."
-msgstr "此想到将帮助您将即时通讯账户导出至 TDE 地址簿。"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:44
+msgid "Attribute not found"
+msgstr "未找到属性"
 
-#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 61
-#: rc.cpp:929
-#, no-c-format
-msgid "&Select Address Book"
-msgstr "选择地址簿(&S)"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:47
+msgid "User is disabled"
+msgstr "用户被禁用"
 
-#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 92
-#: rc.cpp:932
-#, no-c-format
-msgid "Select Contacts to Export"
-msgstr "选择要导出的联系人"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:50
+msgid "Directory failure"
+msgstr "目录失败"
 
-#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 111
-#: rc.cpp:935
-#, no-c-format
-msgid "Selected contacts will be added to the TDE address book."
-msgstr "选中的联系人将添加到 TDE 地址簿中。"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:53
+msgid "Host not found"
+msgstr "找不到主机"
 
-#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 117
-#: rc.cpp:938 rc.cpp:1777
-#, no-c-format
-msgid "Contact"
-msgstr "联系人"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:56
+msgid "Locked by admin"
+msgstr "被 admin 锁定"
 
-#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 149
-#: rc.cpp:941
-#, no-c-format
-msgid "Select &All"
-msgstr "全部选中(&A)"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:59
+msgid "Duplicate participant"
+msgstr "重复的参与者"
 
-#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 157
-#: rc.cpp:944
-#, no-c-format
-msgid "&Deselect All"
-msgstr "全部不选(&D)"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:62
+msgid "Server busy"
+msgstr "服务器忙"
 
-#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 16
-#: rc.cpp:947
-#, no-c-format
-msgid "Merge with Address Book"
-msgstr "与地址簿合并"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:65
+msgid "Object not found"
+msgstr "未找到对象"
 
-#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 27
-#: rc.cpp:950 rc.cpp:3860 rc.cpp:5222
-#, no-c-format
-msgid "First name:"
-msgstr "名："
+#: protocols/groupwise/libgroupwise/gwerror.cpp:68
+msgid "Directory update"
+msgstr "目录更新"
 
-#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 38
-#: rc.cpp:953
-#, no-c-format
-msgid "Home phone:"
-msgstr "宅电："
+#: protocols/groupwise/libgroupwise/gwerror.cpp:71
+msgid "Duplicate folder"
+msgstr "重复的目录"
 
-#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 73
-#: rc.cpp:956
-#, no-c-format
-msgid "Work phone:"
-msgstr "工作电话："
+#: protocols/groupwise/libgroupwise/gwerror.cpp:74
+msgid "Contact list entry already exists"
+msgstr "联系人列表条目已存在"
 
-#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 84
-#: rc.cpp:959
-#, no-c-format
-msgid "Mobile phone:"
-msgstr "移动电话："
+#: protocols/groupwise/libgroupwise/gwerror.cpp:77
+msgid "User not allowed"
+msgstr "不允许用户"
 
-#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 95
-#: rc.cpp:962
-#, no-c-format
-msgid "URL:"
-msgstr "URL："
+#: protocols/groupwise/libgroupwise/gwerror.cpp:80
+msgid "Too many contacts"
+msgstr "联系人过多"
 
-#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 121
-#: rc.cpp:965 rc.cpp:3866 rc.cpp:5231
-#, no-c-format
-msgid "Last name:"
-msgstr "姓："
+#: protocols/groupwise/libgroupwise/gwerror.cpp:83
+msgid "Conference not found"
+msgstr "会议未找到"
 
-#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 140
-#: rc.cpp:968 rc.cpp:4386 rc.cpp:4398
-#, no-c-format
-msgid "Email:"
-msgstr "电子邮件："
+#: protocols/groupwise/libgroupwise/gwerror.cpp:86
+msgid "Too many folders"
+msgstr "太多文件夹"
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 32
-#: rc.cpp:971
-#, no-c-format
-msgid "On &event:"
-msgstr "事件(&E)："
+#: protocols/groupwise/libgroupwise/gwerror.cpp:89
+msgid "Server protocol error"
+msgstr "服务器端协议错误"
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 43
-#: rc.cpp:974
-#, no-c-format
-msgid "Choose the event that should have a custom notification"
-msgstr "选择要使用自定义通知的事件"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:92
+msgid "Conversation invitation error"
+msgstr "对话邀请错误"
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 64
-#: rc.cpp:977
-#, no-c-format
-msgid "Select the sound to play"
-msgstr "选择要播放的声音"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:95
+msgid "User is blocked"
+msgstr "用户被屏蔽了"
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 72
-#: rc.cpp:980
-#, no-c-format
-msgid "&Play a sound:"
-msgstr "播放声音(&P)："
+#: protocols/groupwise/libgroupwise/gwerror.cpp:98
+msgid "Master archive is missing"
+msgstr "主归档丢失"
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 75
-#: rc.cpp:983
-#, no-c-format
-msgid "Play a sound when this event occurs for this contact"
-msgstr "当此联系人发生此事件时播放声音"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:101
+msgid "Expired password in use"
+msgstr "过期密码仍在使用中"
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 100
-#: rc.cpp:986
-#, no-c-format
-msgid "Start a cha&t"
-msgstr "开始聊天(&T)"
+#: protocols/groupwise/libgroupwise/gwerror.cpp:104
+msgid "Credentials missing"
+msgstr "证书丢失"
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 103
-#: rc.cpp:989
-#, no-c-format
+#: protocols/groupwise/libgroupwise/gwerror.cpp:107
+msgid "Authentication failed"
+msgstr "认证失败"
+
+#: protocols/groupwise/libgroupwise/gwerror.cpp:110
+msgid "Eval connection limit"
+msgstr "评估连接受限"
+
+#: protocols/groupwise/libgroupwise/gwerror.cpp:113
+msgid "Unsupported client version"
+msgstr "不支持的客户端版本"
+
+#: protocols/groupwise/libgroupwise/gwerror.cpp:116
+msgid "A duplicate chat was found"
+msgstr "发现重复的聊天对话"
+
+#: protocols/groupwise/libgroupwise/gwerror.cpp:119
+msgid "Chat not found"
+msgstr "找不到聊天对话"
+
+#: protocols/groupwise/libgroupwise/gwerror.cpp:122
+msgid "Invalid chat name"
+msgstr "无效的聊天名"
+
+#: protocols/groupwise/libgroupwise/gwerror.cpp:125
+msgid "The chat is active"
+msgstr "聊天进行中"
+
+#: protocols/groupwise/libgroupwise/gwerror.cpp:128
+msgid "Chat is busy; try again"
+msgstr "聊天处理忙碌中；重试"
+
+#: protocols/groupwise/libgroupwise/gwerror.cpp:131
+msgid "Tried request too soon after another; try again"
+msgstr "请求尝试间隔过短；重试"
+
+#: protocols/groupwise/libgroupwise/gwerror.cpp:134
+msgid "Server's chat subsystem is not active"
+msgstr "服务器上的聊天子系统未激活"
+
+#: protocols/groupwise/libgroupwise/gwerror.cpp:137
+msgid "The chat update request is invalid"
+msgstr "无效的聊天更新请求"
+
+#: protocols/groupwise/libgroupwise/gwerror.cpp:140
+msgid "Write failed due to directory mismatch"
+msgstr "因目录不匹配而写操作失败"
+
+#: protocols/groupwise/libgroupwise/gwerror.cpp:143
+msgid "Recipient's client version is too old"
+msgstr "对方的客户端版本过旧"
+
+#: protocols/groupwise/libgroupwise/gwerror.cpp:146
+msgid "Chat has been removed from server"
+msgstr "聊天特性已从服务器上被删除"
+
+#: protocols/groupwise/libgroupwise/gwerror.cpp:149
+#, c-format
+msgid "Unrecognized error code: %s"
+msgstr "不可识别的错误代码：%s"
+
+#: protocols/groupwise/gwprotocol.cpp:59
+msgid "Appear Offline"
+msgstr "隐身"
+
+#: protocols/groupwise/gwprotocol.cpp:59
+msgid "A&ppear Offline"
+msgstr "隐身(&P)"
+
+#: protocols/groupwise/gwprotocol.cpp:64
+msgid "Invalid Status"
+msgstr "无效的状态"
+
+#: protocols/groupwise/gwprotocol.cpp:71
+msgid "Auto Reply Message"
+msgstr "自动消息"
+
+#: protocols/groupwise/gwprotocol.cpp:72
+msgid "Common Name"
+msgstr "公共名"
+
+#: protocols/groupwise/ui/gwcontactproperties.cpp:81
+msgid "Contact Properties"
+msgstr "联系人属性"
+
+#: protocols/groupwise/ui/gwcontactproperties.cpp:104
+msgid "Telephone Number"
+msgstr "电话号码"
+
+#: protocols/groupwise/ui/gwcontactproperties.cpp:106
+msgid "Department"
+msgstr "部门"
+
+#: protocols/groupwise/ui/gwcontactproperties.cpp:108
+msgid "Location"
+msgstr "位置"
+
+#: protocols/groupwise/ui/gwcontactproperties.cpp:110
+msgid "Mailstop"
+msgstr "邮箱"
+
+#: protocols/groupwise/ui/gwcontactproperties.cpp:112
+msgid "Personal Title"
+msgstr "私人职务"
+
+#: libkopete/kopeteglobal.cpp:178
+#: protocols/groupwise/ui/gwcontactproperties.cpp:116
+msgid "Email Address"
+msgstr "电子邮件地址"
+
+#: protocols/groupwise/ui/gwprivacydialog.cpp:52
+#, c-format
 msgid ""
-"Open a chat window with this contact when this event occurs for this contact"
-msgstr "当此事件发生在此联系人身上时打开此联系人的聊天窗口"
+"_: Account specific privacy settings\n"
+"Manage Privacy for %1"
+msgstr "管理 %1 的隐私"
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 111
-#: rc.cpp:992
-#, no-c-format
-msgid "&Display a message:"
-msgstr "显示消息(&D)："
+#: protocols/groupwise/ui/gwprivacydialog.cpp:62
+msgid "Privacy settings have been administratively locked"
+msgstr "隐私设置已被管理员锁定"
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 114
-#: rc.cpp:995
-#, no-c-format
+#: protocols/groupwise/ui/gwprivacydialog.cpp:100
+msgid "<Everyone Else>"
+msgstr "<别人>"
+
+#: protocols/groupwise/ui/gwprivacydialog.cpp:180
+msgid "Search for Contact to Block"
+msgstr "搜索要屏蔽的联系人"
+
+#: protocols/groupwise/ui/gwprivacydialog.cpp:346
 msgid ""
-"Display a message on your screen when this event occurs for this contact"
-msgstr "此联系人发生此事件时在您的屏幕上显示消息"
+"You can only change privacy settings while you are logged in to the GroupWise "
+"Messenger server."
+msgstr "仅当您登录到 GroupWise 信使服务器时才能更改隐私设置。"
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 125
-#: rc.cpp:998
-#, no-c-format
-msgid "Enter the message to display"
-msgstr "输入要显示的消息"
+#: protocols/groupwise/ui/gwprivacydialog.cpp:346
+msgid "'%1' Not Logged In"
+msgstr "“%1”尚未登入"
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 136
-#: rc.cpp:1001
-#, no-c-format
-msgid "D&isplay once"
-msgstr "显示一次(&I)"
+#: protocols/groupwise/ui/gwchatsearchdialog.cpp:38
+msgid "Search Chatrooms"
+msgstr "搜索聊天室"
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 139
-#: rc.cpp:1004
-#, no-c-format
-msgid "Only display a message the next time the event occurs"
-msgstr "仅在事件下次发生时显示消息"
+#: protocols/groupwise/ui/gwchatsearchdialog.cpp:67
+msgid "Updating chatroom list..."
+msgstr "正在更新聊天室列表..."
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 150
-#: rc.cpp:1007
-#, no-c-format
-msgid "P&lay once"
-msgstr "播放一次(&L)"
+#: protocols/groupwise/ui/gwsearch.cpp:167
+#, c-format
+msgid ""
+"_n: 1 matching user found\n"
+"%n matching users found"
+msgstr "找到了 %n 个匹配的用户"
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 153
-#: rc.cpp:1010
-#, no-c-format
-msgid "Only play a sound the next time the event occurs"
-msgstr "仅在事件下次发生时播放声音"
+#: protocols/groupwise/ui/gwreceiveinvitationdialog.cpp:37
+msgid "Invitation to Conversation"
+msgstr "对话邀请"
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 164
-#: rc.cpp:1013
-#, no-c-format
-msgid "T&rigger once"
-msgstr "触发一次(&R)"
+#: protocols/groupwise/ui/gwchatpropsdialog.cpp:33
+#: protocols/groupwise/ui/gwchatpropsdialog.cpp:41
+msgid "Chatroom properties"
+msgstr "聊天室属性"
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 167
-#: rc.cpp:1016
-#, no-c-format
-msgid "Only start a chat the next time the event occurs"
-msgstr "仅当事件下次发生时启动聊天"
+#: protocols/groupwise/ui/gweditaccountwidget.cpp:104
+msgid ""
+"The changes you just made will take effect next time you log in with GroupWise."
+msgstr "在您注销后再次登录 GroupWise，您所做的改变将会生效。"
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 177
-#: rc.cpp:1019
-#, no-c-format
-msgid "S&uppress standard notifications"
-msgstr "禁止标准通知(&U)"
+#: protocols/groupwise/ui/gweditaccountwidget.cpp:105
+msgid "GroupWise Settings Changed While Signed In"
+msgstr "登入时 GroupWise 设置发生了更改"
 
-#. i18n: file ./kopete/contactlist/customnotifications.ui line 183
-#: rc.cpp:1022
-#, no-c-format
+#: protocols/groupwise/ui/gwaddcontactpage.cpp:64
+msgid "Connect to GroupWise Messenger and try again."
+msgstr "连接到 GroupWise Messenger 然后再试一次。"
+
+#: protocols/groupwise/gwcontact.cpp:166
+msgid "Unblock User"
+msgstr "解除屏蔽用户"
+
+#: protocols/groupwise/gwcontact.cpp:166
+msgid "Block User"
+msgstr "屏蔽用户"
+
+#: protocols/groupwise/gwcontact.cpp:240
+msgid "%1|Blocked"
+msgstr "%1|被屏蔽"
+
+#: protocols/gadu/gadudcctransaction.cpp:408
 msgid ""
-"Check to prevent notifications common to all contacts from happening for this "
-"contact"
-msgstr "选中可使得全部联系人的通知不对此联系人生效"
+"Connection to peer was refused; it possibly does not listen for incoming "
+"connections."
+msgstr "连接到对方被拒绝；可能对方没有监听传入的连接。"
 
-#. i18n: file ./kopete/contactlist/kopetegvipropswidget.ui line 50
-#: rc.cpp:1028 rc.cpp:5168
-#, no-c-format
-msgid "&Name:"
-msgstr "名字(&N)："
+#: protocols/gadu/gadudcctransaction.cpp:412
+msgid "File transfer transaction was not agreed by peer."
+msgstr "对方不同意文件传送。"
 
-#. i18n: file ./kopete/contactlist/kopetegvipropswidget.ui line 68
-#: rc.cpp:1031 rc.cpp:1100
-#, no-c-format
-msgid "Icons"
-msgstr "图标"
+#: protocols/gadu/gadudcctransaction.cpp:416
+msgid "File-transfer handshake failure."
+msgstr "文件传送握手失败。"
 
-#. i18n: file ./kopete/contactlist/kopetegvipropswidget.ui line 87
-#: rc.cpp:1034
-#, no-c-format
-msgid "O&pen:"
-msgstr "打开的(&P)："
+#: protocols/gadu/gadudcctransaction.cpp:419
+msgid "File transfer had problems with the file."
+msgstr "传送此文件时有问题。"
 
-#. i18n: file ./kopete/contactlist/kopetegvipropswidget.ui line 98
-#: rc.cpp:1037
-#, no-c-format
-msgid "C&losed:"
-msgstr "关闭的(&L)："
+#: protocols/gadu/gadudcctransaction.cpp:422
+msgid "There was network error during file transfer."
+msgstr "文件传送过程中网络有错。"
 
-#. i18n: file ./kopete/contactlist/kopetegvipropswidget.ui line 117
-#: rc.cpp:1040
-#, no-c-format
-msgid "Use custom &icons"
-msgstr "使用自定义图标(&I)"
+#: protocols/gadu/gadudcctransaction.cpp:425
+msgid "Unknown File-Transfer error."
+msgstr "未知文件传送错误。"
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 50
-#: rc.cpp:1046
-#, no-c-format
-msgid "Address Book Link"
-msgstr "地址簿链接"
+#: protocols/gadu/gaducontact.cpp:198
+msgid "Show Profile"
+msgstr "显示配置文件"
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 77
-#: rc.cpp:1049
-#, no-c-format
-msgid "E&xport Details..."
-msgstr "导出细节(&X)..."
+#: protocols/gadu/gaducontact.cpp:229
+msgid "Gadu contact"
+msgstr "Gadu 联系人"
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 80
-#: rc.cpp:1052
-#, no-c-format
-msgid "Export contact's details to the TDE Address Book"
-msgstr "将联系人细节导出到 TDE 地址簿"
+#: protocols/gadu/gaducontact.cpp:247
+msgid "<qt>Please go online to remove a contact from your contact list.</qt>"
+msgstr "<qt>请转为在线模式来删除联系人。</qt>"
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 108
-#: rc.cpp:1055
-#, no-c-format
-msgid "&Import Contacts"
-msgstr "导入联系人(&I)"
+#: protocols/gadu/gaducontact.cpp:248
+msgid "Gadu-Gadu Plugin"
+msgstr "Gadu-Gadu 插件"
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 111
-#: rc.cpp:1058
+#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 19
+#: protocols/gadu/gaduaway.cpp:40 rc.cpp:4254
 #, no-c-format
-msgid "Import contacts from the TDE Address Book"
-msgstr "从 TDE 地址簿导入联系人"
+msgid "Away Dialog"
+msgstr "离开对话框"
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 123
-#: rc.cpp:1061
-#, no-c-format
-msgid "Display Name Source"
-msgstr "显示名称源"
+#: protocols/gadu/gadueditcontact.cpp:50 protocols/gadu/gadueditcontact.cpp:68
+msgid "Edit Contact's Properties"
+msgstr "编辑联系人属性"
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 134
-#: rc.cpp:1064
-#, no-c-format
-msgid "Use addressbook &name (needs addressbook link)"
-msgstr "使用地址簿名称(需要地址簿链接)(&N)"
+#: protocols/gadu/gaduregisteraccount.cpp:39
+msgid "Register New Account"
+msgstr "注册新账户"
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 150
-#: rc.cpp:1067 rc.cpp:1085
+#. i18n: file ./protocols/jabber/ui/dlgservices.ui line 151
+#: protocols/gadu/gaduregisteraccount.cpp:45 rc.cpp:2704 rc.cpp:3175
 #, no-c-format
-msgid "From contact:"
-msgstr "从联系人："
+msgid "&Register"
+msgstr "注册(&R)"
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 235
-#: rc.cpp:1076
-#, no-c-format
-msgid "Photo Source"
-msgstr "照片源"
+#: protocols/gadu/gaduregisteraccount.cpp:67
+msgid "Retrieving token"
+msgstr "注册验证码"
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 275
-#: rc.cpp:1082
-#, no-c-format
-msgid "U&se addressbook photo (needs addressbook link)"
-msgstr "使用地址簿照片(需要地址簿链接)(&S)"
+#: protocols/gadu/gaduregisteraccount.cpp:89
+msgid "Please enter a valid E-Mail Address."
+msgstr "请输入一个有效的电子邮件地址。"
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 342
-#: rc.cpp:1091
-#, no-c-format
-msgid "Custom:"
-msgstr "自定义："
+#: protocols/gadu/gaduregisteraccount.cpp:113
+msgid "Please enter the verification sequence."
+msgstr "请输入校验序列。"
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 398
-#: rc.cpp:1094
-#, no-c-format
-msgid "S&ync photo to addressbook"
-msgstr "照片同步到地址簿(&Y)"
+#: protocols/gadu/gaduregisteraccount.cpp:159
+#, c-format
+msgid "Account created; your new UIN is %1."
+msgstr "账户已创建；您新的 UIN 是 %1。"
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 408
-#: rc.cpp:1097 rc.cpp:5396
-#, no-c-format
-msgid "Ad&vanced"
-msgstr "高级(&V)"
+#: protocols/gadu/gaduregisteraccount.cpp:167
+#, c-format
+msgid "Registration failed: %1"
+msgstr "注册失败：%1"
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 430
-#: rc.cpp:1103
-#, no-c-format
-msgid "Awa&y:"
-msgstr "离开(&Y)："
+#: protocols/gadu/gaduprotocol.cpp:57
+msgid "Blocked"
+msgstr "被屏蔽"
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 441
-#: rc.cpp:1106
-#, no-c-format
-msgid "&Online:"
-msgstr "在线(&O)："
+#: protocols/gadu/gaduprotocol.cpp:61
+msgid "A&way"
+msgstr "离开(&W)"
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 452
-#: rc.cpp:1109
-#, no-c-format
-msgid "Use custom status &icons"
-msgstr "使用自定义状态图标(&I)"
+#: protocols/gadu/gaduprotocol.cpp:63 protocols/gadu/gaduprotocol.cpp:65
+msgid "B&usy"
+msgstr "忙碌(&U)"
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 455
-#: rc.cpp:1112
-#, no-c-format
-msgid "Check to set custom icons for this contact"
-msgstr "为此账户使用自定义颜色"
+#: protocols/gadu/gaduprotocol.cpp:67 protocols/gadu/gaduprotocol.cpp:69
+msgid "I&nvisible"
+msgstr "隐身(&N)"
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 495
-#: rc.cpp:1115
-#, no-c-format
-msgid "O&ffline:"
-msgstr "离线(&F)："
+#: protocols/gadu/gaduaccount.cpp:186
+msgid "&Search for Friends"
+msgstr "搜索朋友(&S)"
 
-#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 506
-#: rc.cpp:1118
-#, no-c-format
-msgid "Un&known:"
-msgstr "未知(&K)："
+#: protocols/gadu/gaduaccount.cpp:188
+msgid "Export Contacts to Server"
+msgstr "将联系人导出至服务器"
 
-#. i18n: file ./kopete/chatwindow/kopeterichtexteditpartfull.rc line 4
-#: rc.cpp:1121
-#, no-c-format
-msgid "F&ormat"
-msgstr "格式(&O)"
+#: protocols/gadu/gaduaccount.cpp:190
+msgid "Export Contacts to File..."
+msgstr "将联系人导出至文件..."
 
-#. i18n: file ./kopete/chatwindow/kopeterichtexteditpartfull.rc line 11
-#: rc.cpp:1124
-#, no-c-format
-msgid "&Alignment"
-msgstr "对齐(&A)"
+#: protocols/gadu/gaduaccount.cpp:192
+msgid "Import Contacts From File..."
+msgstr "从文件导入联系人..."
 
-#. i18n: file ./kopete/chatwindow/kopeterichtexteditpartfull.rc line 32
-#: rc.cpp:1130 rc.cpp:1169
-#, no-c-format
-msgid "Format Toolbar"
-msgstr "格式工具栏"
+#: protocols/gadu/gaduaccount.cpp:194
+msgid "Only for Friends"
+msgstr "只对朋友"
 
-#. i18n: file ./kopete/chatwindow/kopeteemailwindow.rc line 5
-#: rc.cpp:1133 rc.cpp:1148 rc.cpp:2602 rc.cpp:4130 rc.cpp:4812 rc.cpp:5399
-#, no-c-format
-msgid "&Chat"
-msgstr "聊天(&C)"
+#: protocols/gadu/gaduaccount.cpp:255
+msgid "%1 <%2> "
+msgstr "%1 <%2> "
 
-#. i18n: file ./kopete/chatwindow/kopeteemailwindow.rc line 14
-#: rc.cpp:1136 rc.cpp:1151
-#, no-c-format
-msgid "&Format"
-msgstr "格式(&F)"
+#: protocols/gadu/gaduaccount.cpp:289
+msgid "Go O&nline"
+msgstr "转为在线(&N)"
 
-#. i18n: file ./kopete/chatwindow/kopeteemailwindow.rc line 41
-#: rc.cpp:1145 rc.cpp:1166 rc.cpp:3001 rc.cpp:3253 rc.cpp:5063
-#, no-c-format
-msgid "Status"
-msgstr "状态"
+#: protocols/gadu/gaduaccount.cpp:293
+msgid "Set &Busy"
+msgstr "设为忙碌(&B)"
 
-#. i18n: file ./kopete/chatwindow/kopetechatwindow.rc line 23
-#: rc.cpp:1154
-#, no-c-format
-msgid "&Tabs"
-msgstr "标签(&T)"
+#: protocols/gadu/gaduaccount.cpp:297
+msgid "Set &Invisible"
+msgstr "设置为隐身(&I)"
 
-#. i18n: file ./kopete/chatwindow/kopetechatwindow.rc line 35
-#: rc.cpp:1160
-#, no-c-format
-msgid "&Chat Members List"
-msgstr "聊天成员列表(&C)"
+#: protocols/gadu/gaduaccount.cpp:301
+msgid "Go &Offline"
+msgstr "转为离线(&O)"
 
-#. i18n: file ./kopete/addcontactwizard/fastaddcontactwizard_base.ui line 16
-#: rc.cpp:1172
-#, no-c-format
-msgid "Fast Contact Addition Wizard"
-msgstr "联系人添加快速向导"
+#: protocols/gadu/gaduaccount.cpp:305
+msgid "Set &Description..."
+msgstr "设置描述(&D)..."
 
-#. i18n: file ./kopete/addcontactwizard/fastaddcontactwizard_base.ui line 23
-#: rc.cpp:1175 rc.cpp:1251
-#, no-c-format
-msgid "Select Instant Messaging Accounts"
-msgstr "选择即时通讯账户"
+#: protocols/gadu/gaduaccount.cpp:685
+msgid "connection using SSL was not possible, retrying without."
+msgstr "无法使用 SSL 连接，将取消 SSL 后重试。"
 
-#. i18n: file ./kopete/addcontactwizard/fastaddcontactwizard_base.ui line 80
-#: rc.cpp:1178
-#, no-c-format
-msgid "<p><h2>Select IM Accounts</h2></p>"
-msgstr "<p><h2>选择即时通讯账户</h2></p>"
+#: protocols/gadu/gaduaccount.cpp:713
+msgid "unable to connect to the Gadu-Gadu server(\"%1\")."
+msgstr "无法连接到 Gadu-Gadu 服务器(“%1”)。"
 
-#. i18n: file ./kopete/addcontactwizard/fastaddcontactwizard_base.ui line 113
-#: rc.cpp:1187 rc.cpp:1269
-#, no-c-format
-msgid ""
-"Select the Instant Messaging systems to message the contact.  If they use more "
-"than one IM system, select them all here"
-msgstr "选择与联系人通讯的即时通讯系统。如果该联系人使用多个即时通讯系统，请在此全部选中"
+#: protocols/gadu/gaduaccount.cpp:714 protocols/gadu/gaducommands.cpp:328
+#: protocols/gadu/gaducommands.cpp:336 protocols/gadu/gaducommands.cpp:384
+msgid "Connection Error"
+msgstr "连接错误"
 
-#. i18n: file ./kopete/addcontactwizard/fastaddcontactwizard_base.ui line 125
-#: rc.cpp:1190
-#, no-c-format
-msgid "Done"
+#: protocols/gadu/gaduaccount.cpp:897
+msgid "Contacts exported to the server."
+msgstr "联系人已经导出至服务器。"
+
+#: protocols/gadu/gaduaccount.cpp:928
+msgid "Save Contacts List for Account %1 As"
+msgstr "将账户 %1 的联系人列表另存为"
+
+#: protocols/gadu/gaduaccount.cpp:936
+msgid "Unable to create temporary file."
+msgstr "无法创建临时文件。"
+
+#: protocols/gadu/gaduaccount.cpp:936 protocols/gadu/gaduaccount.cpp:950
+msgid "Save Contacts List Failed"
+msgstr "保存联系人列表失败"
+
+#: protocols/gadu/gaduaccount.cpp:974
+msgid "Load Contacts List for Account %1 As"
+msgstr "将账户 %1 的联系人列表装入为"
+
+#: protocols/gadu/gaduaccount.cpp:994 protocols/gadu/gaduaccount.cpp:1000
+msgid "Contacts List Load Has Failed"
+msgstr "联系人列表装入失败"
+
+#: protocols/gadu/gadupubdir.cpp:74 protocols/gadu/gadupubdir.cpp:315
+msgid "Search &More..."
+msgstr "搜索更多人(&M)..."
+
+#: protocols/gadu/gadupubdir.cpp:95
+msgid "Gadu-Gadu Public Directory"
+msgstr "Gadu-Gadu 公开目录"
+
+#: protocols/gadu/gadupubdir.cpp:102
+msgid "&New Search"
+msgstr "新建搜索(&N)"
+
+#: protocols/gadu/gadupubdir.cpp:103 protocols/gadu/gadupubdir.cpp:280
+#: protocols/irc/ui/channellist.cpp:207
+msgid "S&earch"
+msgstr "搜索(&E)"
+
+#: protocols/gadu/gadupubdir.cpp:104
+msgid "&Add User..."
+msgstr "添加用户(&A)..."
+
+#: libkopete/tdeabcpersistence.cpp:357 protocols/gadu/gadusession.cpp:217
+#: protocols/gadu/gadusession.cpp:230 protocols/gadu/gadusession.cpp:242
+#: protocols/gadu/gadusession.cpp:275 protocols/gadu/gadusession.cpp:289
+#: protocols/gadu/gadusession.cpp:307 protocols/irc/ui/channellist.cpp:304
+msgid "Not Connected"
+msgstr "未连接"
+
+#: protocols/gadu/gadusession.cpp:217 protocols/gadu/gadusession.cpp:230
+#: protocols/gadu/gadusession.cpp:242 protocols/gadu/gadusession.cpp:275
+msgid "You are not connected to the server."
+msgstr "您还没有连接到服务器上。"
+
+#: protocols/gadu/gadusession.cpp:289 protocols/gadu/gadusession.cpp:307
+msgid "You have to be connected to the server to change your status."
+msgstr "您必须要连接到服务器上才能改变您的状态。"
+
+#: protocols/gadu/gadusession.cpp:574
+msgid "idle"
+msgstr "空闲"
+
+#: protocols/gadu/gadusession.cpp:576
+msgid "resolving host"
+msgstr "正在解析主机"
+
+#: protocols/gadu/gadusession.cpp:578
+msgid "connecting"
+msgstr "正在连接"
+
+#: protocols/gadu/gadusession.cpp:580
+msgid "reading data"
+msgstr "正在读取数据"
+
+#: protocols/gadu/gadusession.cpp:582
+msgid "error"
+msgstr "错误"
+
+#: protocols/gadu/gadusession.cpp:584
+msgid "connecting to hub"
+msgstr "正在连接到集线器"
+
+#: protocols/gadu/gadusession.cpp:586
+msgid "connecting to server"
+msgstr "正在连接到服务器"
+
+#: protocols/gadu/gadusession.cpp:588
+msgid "retrieving key"
+msgstr "获取密钥"
+
+#: protocols/gadu/gadusession.cpp:590
+msgid "waiting for reply"
+msgstr "等待回复"
+
+#: protocols/gadu/gadusession.cpp:592
+msgid "connected"
+msgstr "已连接"
+
+#: protocols/gadu/gadusession.cpp:594
+msgid "sending query"
+msgstr "发送查询"
+
+#: protocols/gadu/gadusession.cpp:596
+msgid "reading header"
+msgstr "读取头"
+
+#: protocols/gadu/gadusession.cpp:598
+msgid "parse data"
+msgstr "分析数据"
+
+#: protocols/gadu/gadusession.cpp:600
+msgid "done"
 msgstr "完成"
 
-#. i18n: file ./kopete/addcontactwizard/fastaddcontactwizard_base.ui line 183
-#: rc.cpp:1193
-#, no-c-format
-msgid ""
-"<p>"
-"<h2>Contact added.</h2></p>\n"
-"<p>That was <i>fast.</i></p>"
-msgstr ""
-"<p>"
-"<h2>联系人已添加。</h2></p>\n"
-"<p>真的<i>太快了。</i></p>"
+#: protocols/gadu/gadusession.cpp:602
+msgid "Tls connection negotiation"
+msgstr "TLS 连接谈判"
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 16
-#: rc.cpp:1197
-#, no-c-format
-msgid "Contact Addition Wizard"
-msgstr "添加联系人向导"
+#: protocols/gadu/gadusession.cpp:604
+msgid "unknown"
+msgstr "未知"
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 23
-#: rc.cpp:1200
-#, no-c-format
-msgid "Introduction"
-msgstr "介绍"
+#: protocols/gadu/gadusession.cpp:612
+msgid "Resolving error."
+msgstr "解析出错。"
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 44
-#: rc.cpp:1203
-#, no-c-format
+#: protocols/gadu/gadusession.cpp:614
+msgid "Connecting error."
+msgstr "连接出错。"
+
+#: protocols/gadu/gadusession.cpp:616
+msgid "Reading error."
+msgstr "读取错误。"
+
+#: protocols/gadu/gadusession.cpp:618
+msgid "Writing error."
+msgstr "写入错误。"
+
+#: protocols/gadu/gadusession.cpp:620 protocols/gadu/gadusession.cpp:645
+#, c-format
+msgid "Unknown error number %1."
+msgstr "未知错误号 %1。"
+
+#: protocols/gadu/gadusession.cpp:629
+msgid "Unable to resolve server address. DNS failure."
+msgstr "无法解析服务器地址。DNS 失败。"
+
+#: protocols/gadu/gadusession.cpp:631
+msgid "Unable to connect to server."
+msgstr "无法连接服务器。"
+
+#: protocols/gadu/gadusession.cpp:633
+msgid "Server send incorrect data. Protocol error."
+msgstr "服务器发送了不正确的数据。协议错误。"
+
+#: protocols/gadu/gadusession.cpp:635
+msgid "Problem reading data from server."
+msgstr "从服务器读取数据出错。"
+
+#: protocols/gadu/gadusession.cpp:637
+msgid "Problem sending data to server."
+msgstr "向服务器发送数据有问题。"
+
+#: protocols/gadu/gadusession.cpp:639
+msgid "Incorrect password."
+msgstr "密码不对。"
+
+#: protocols/gadu/gadusession.cpp:643
 msgid ""
-"<h2>Welcome to the Add Contact Wizard</h2>\n"
-"\n"
-"<p>This wizard will guide you through the process of adding a new contact to "
-"Kopete.</p>"
+"Unable to connect over encrypted channel.\n"
+"Try to turn off encryption support in Gadu account settings and reconnect."
 msgstr ""
-"<h2>欢迎使用添加联系人向导</h2>\n"
-"\n"
-"<p>此向导将指引您向 Kopete 中添加新的联系人。</p>"
+"无法通过加密通道连接。\n"
+"试着关闭 Gadu 账户设置中的加密支持，然后重新连接。"
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 56
-#: rc.cpp:1208
-#, no-c-format
+#: protocols/gadu/gaducommands.cpp:146 protocols/gadu/gaducommands.cpp:183
+#: protocols/gadu/gaducommands.cpp:199 protocols/gadu/gaducommands.cpp:234
+#: protocols/gadu/gaducommands.cpp:250 protocols/gadu/gadueditaccount.cpp:194
+#: protocols/gadu/gadueditaccount.cpp:215
+#: protocols/gadu/gadueditaccount.cpp:220
+#: protocols/gadu/gadueditaccount.cpp:225
+#: protocols/gadu/gadueditaccount.cpp:256
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: protocols/gadu/gaducommands.cpp:146 protocols/gadu/gaducommands.cpp:234
+msgid "Unable to retrieve token."
+msgstr "无法获取验证码。"
+
+#: protocols/gadu/gaducommands.cpp:183
+msgid "Registration FAILED"
+msgstr "注册失败"
+
+#: protocols/gadu/gaducommands.cpp:199
+msgid "Unknown connection error while retrieving token."
+msgstr "在获取验证码时出现未知连接错误。"
+
+#: protocols/gadu/gaducommands.cpp:207
+#, c-format
+msgid "Token retrieving status: %1"
+msgstr "令牌获取状态：%1"
+
+#: protocols/gadu/gaducommands.cpp:216
+msgid "Gadu-Gadu token retrieve problem"
+msgstr "Gadu-Gadu 令牌获取出错"
+
+#: protocols/gadu/gaducommands.cpp:250
+msgid "Unknown connection error while registering."
+msgstr "在注册时出现未知连接错误。"
+
+#: protocols/gadu/gaducommands.cpp:257
+#, c-format
+msgid "Registration status: %1"
+msgstr "注册状态：%1"
+
+#: protocols/gadu/gaducommands.cpp:266
+msgid "Gadu-Gadu Registration Error"
+msgstr "Gadu-Gadu 注册错误"
+
+#: protocols/gadu/gaducommands.cpp:278
+msgid "Registration Finished"
+msgstr "注册完成"
+
+#: protocols/gadu/gaducommands.cpp:278
+msgid "Registration has completed successfully."
+msgstr "注册已成功完成。"
+
+#: protocols/gadu/gaducommands.cpp:281
+msgid "Registration Error"
+msgstr "注册错误"
+
+#: protocols/gadu/gaducommands.cpp:281
+msgid "Incorrect data sent to server."
+msgstr "向服务器发送了不正确的数据。"
+
+#: protocols/gadu/gaducommands.cpp:328 protocols/gadu/gaducommands.cpp:336
+msgid "Password reminding finished prematurely due to a connection error."
+msgstr "由于连接错误，密码提示过早结束。"
+
+#: protocols/gadu/gaducommands.cpp:344
+msgid "Successfully"
+msgstr "成功"
+
+#: protocols/gadu/gaducommands.cpp:344
+msgid "Unsuccessful. Please retry."
+msgstr "不成功，请重试。"
+
+#: protocols/gadu/gaducommands.cpp:345
+msgid "Remind Password"
+msgstr "提示密码"
+
+#: protocols/gadu/gaducommands.cpp:345
+msgid "Remind password finished: "
+msgstr "密码提示结束： "
+
+#: protocols/gadu/gaducommands.cpp:384
+msgid "Password changing finished prematurely due to a connection error."
+msgstr "由于连接错误，密码改变过早结束。"
+
+#: protocols/gadu/gaducommands.cpp:392
+msgid "State Error"
+msgstr "状态错误"
+
+#: protocols/gadu/gaducommands.cpp:393
 msgid ""
-"<p>Kopete shares contact information with the TDE Addressbook.  This gives you "
-"seamless integration between instant messaging, e-mail and other personal "
-"information management applications.</p>\n"
-"<p>If you prefer not to store instant messaging information in the TDE "
-"Addressbook, uncheck the box below.</p>"
-msgstr ""
-"<p>Kopete 与 TDE 地址簿共享联系人信息。这将使得您的即时通讯、电子邮件和其它个人信息管理程序之间无缝集成。</p>\n"
-"<p>如果您更愿意不将即时通讯信息存储在 TDE 地址簿中，请不要选中下面的选项。</p>"
+"Password changing finished prematurely due to a session related problem (try "
+"again later)."
+msgstr "由于会话相关的问题(请稍后重试)，密码改变过早结束。"
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 64
-#: rc.cpp:1212
-#, no-c-format
-msgid "<p>Press the \"Next\" button to begin.</p>"
-msgstr "<p>单击“下一步”按钮开始。</p>"
+#: protocols/gadu/gaducommands.cpp:400
+msgid "Changed Password"
+msgstr "已更改密码"
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 123
-#: rc.cpp:1215
-#, no-c-format
-msgid "&Use the TDE address book for this contact"
-msgstr "为此联系人使用 TDE 地址簿(&U)"
+#: protocols/gadu/gaducommands.cpp:400
+msgid "Your password has been changed."
+msgstr "您的密码已经改变。"
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 129
-#: rc.cpp:1218
-#, no-c-format
+#: protocols/gadu/gadueditaccount.cpp:88
 msgid ""
-"Check this box if you do not want to integrate other TDE applications with "
-"Kopete"
-msgstr "如果您不想将 Kopete 集成到其它 TDE 应用程序中，请选中此框"
+"_: personal information being fetched from server\n"
+"<p align=\"center\">Fetching from server</p>"
+msgstr "<p align=\"center\">正从服务器获取</p>"
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 156
-#: rc.cpp:1221
-#, no-c-format
-msgid "Select Address Book Entry"
-msgstr "选择地址簿条目"
+#: protocols/gadu/gadueditaccount.cpp:194
+msgid "<b>Registration FAILED.</b>"
+msgstr "<b>注册失败。</b>"
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 169
-#: rc.cpp:1224
-#, no-c-format
-msgid "Select Display Name & Group"
-msgstr "选择显示名和组"
+#: protocols/gadu/gadueditaccount.cpp:215
+msgid "<b>Enter UIN please.</b>"
+msgstr "<b>请输入 UNI。</b>"
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 180
-#: rc.cpp:1227
-#, no-c-format
-msgid "<qt><p><h2>Select Display Name and Group</h2></p></qt>"
-msgstr "<qt><p><h2>选择显示名和组</h2></p></qt>"
+#: protocols/gadu/gadueditaccount.cpp:220
+msgid "<b>UIN should be a positive number.</b>"
+msgstr "<b>UIN 应该是一个正数。</b>"
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 194
-#: rc.cpp:1230
-#, no-c-format
-msgid ""
-"Enter the contact's displa&y name.  This is how the contact will appear in "
-"Kopete:"
-msgstr "输入联系人的显示名。这是联系人出现在 Kopete 中的名称(&Y)："
+#: protocols/gadu/gadueditaccount.cpp:225
+msgid "<b>Enter password please.</b>"
+msgstr "<b>请输入的密码。</b>"
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 205
-#: rc.cpp:1233
-#, no-c-format
-msgid "Leave this blank to use any display name set by the contact"
-msgstr "将此处留空代表使用联系人自己设定的任何显示名"
+#: protocols/gadu/gadueditaccount.cpp:256
+msgid "<b>Starting DCC listening socket failed; dcc is not working now.</b>"
+msgstr "<b>启动二人世界监听套接字失败；现在无法进行二人世界。</b>"
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 244
-#: rc.cpp:1236
-#, no-c-format
-msgid "Select the contact list &group(s) that this contact should belong to :"
-msgstr "选择此联系人所属的组(&G)："
+#: protocols/irc/ircservercontact.cpp:95 protocols/irc/ircusercontact.cpp:219
+msgid "%1 @ %2"
+msgstr "%1 @ %2"
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 256
-#: rc.cpp:1239
-#, no-c-format
-msgid "Groups"
-msgstr "组"
+#: protocols/irc/ircservercontact.cpp:106
+msgid "KIRC Error - Parse error: "
+msgstr "KIRC 错误 - 分析错误： "
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 272
-#: rc.cpp:1242
-#, no-c-format
-msgid "A contact may be present in more than one group"
-msgstr "联系人可出现于多个组中"
+#: protocols/irc/ircservercontact.cpp:109
+msgid "KIRC Error - Unknown command: "
+msgstr "KIRC 错误 - 未知命令： "
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 280
-#: rc.cpp:1245
-#, no-c-format
-msgid "Create New G&roup..."
-msgstr "创建新组(&R)..."
+#: protocols/irc/ircservercontact.cpp:112
+msgid "KIRC Error - Unknown numeric reply: "
+msgstr "KIRC 错误 - 未知数字回复： "
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 283
-#: rc.cpp:1248
-#, no-c-format
-msgid "Click here to create a new group"
-msgstr "单击此处创建新组"
+#: protocols/irc/ircservercontact.cpp:115
+msgid "KIRC Error - Invalid number of arguments: "
+msgstr "KIRC 错误 - 无效的参数数目： "
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 321
-#: rc.cpp:1254
-#, no-c-format
-msgid "<p><h2>Select Instant Messaging Accounts</h2></p>"
-msgstr "<p><h2>选择即时通讯账户</h2></p>"
+#: protocols/irc/ircservercontact.cpp:118
+msgid "KIRC Error - Method failed: "
+msgstr "KIRC 错误 - 方法失败： "
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 332
-#: rc.cpp:1257
-#, no-c-format
+#: protocols/irc/ircservercontact.cpp:121
+msgid "KIRC Error - Unknown error: "
+msgstr "KIRC 错误 - 未知错误： "
+
+#: protocols/irc/ircservercontact.cpp:131
 msgid ""
-"Select the &account(s) you would like to use for this contact from the list "
-"below."
-msgstr "请从下面的列表中您想要为此联系人所使用的账户(&A)。"
+"You can not talk to the server, you can only issue commands here. Type /help "
+"for supported commands."
+msgstr "您无法与服务器交谈，您只能在此使用命令。请输入 /help 查看支持的命令。"
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 343
-#: rc.cpp:1260
-#, no-c-format
+#: protocols/irc/ircservercontact.cpp:150
+#: protocols/irc/ircservercontact.cpp:164
+msgid "NOTICE from %1: %2"
+msgstr "来自 %1 的 NOTICE：%2"
+
+#: protocols/irc/ircservercontact.cpp:158
+msgid "NOTICE from %1 (%2): %3"
+msgstr "来自 %1(%2) 的 NOTICE：%3"
+
+#: protocols/irc/ircusercontact.cpp:188
+msgid "%1 is away (%2)"
+msgstr "%1 离开了(%2)"
+
+#: protocols/irc/ircusercontact.cpp:417
+msgid "True"
+msgstr "真"
+
+#: protocols/irc/ircusercontact.cpp:435
+msgid "%1 is (%2@%3): %4<br/>"
+msgstr "%1 是(%2@%3)：%4<br/>"
+
+#: protocols/irc/ircusercontact.cpp:442
+msgid "%1 is authenticated with NICKSERV<br/>"
+msgstr "%1 已经用 NICKSERV 进行了身份验证<br/>"
+
+#: protocols/irc/ircusercontact.cpp:445
+msgid "%1 is an IRC operator<br/>"
+msgstr "%1 是一名 IRC 操作员<br/>"
+
+#: protocols/irc/ircusercontact.cpp:448
+msgid "on channels %1<br/>"
+msgstr "在频道 %1<br/>"
+
+#: protocols/irc/ircusercontact.cpp:451
+msgid "on IRC via server %1 ( %2 )<br/>"
+msgstr "在 IRC 服务器 %1 ( %2 )<br/>"
+
+#: protocols/irc/ircusercontact.cpp:455
+msgid "idle: %2<br/>"
+msgstr "发呆：%2<br/>"
+
+#: protocols/irc/ircusercontact.cpp:468
 msgid ""
-"<p><i>Note</i>: If a messaging service is missing from the list, please make "
-"sure you have created an account for it in Kopete, and that it ready to add new "
-"contacts.</p>"
+"%1 was (%2@%3): %4\n"
 msgstr ""
-"<p><i>注意</i>：如果列表从缺少某种信使服务，请确定您已经在 Kopete 中创建了该服务下的账户，而且您可以在该账户下添加新联系人。</p>"
+"%1 是(%2@%3)：%4\n"
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 399
-#: rc.cpp:1272 rc.cpp:1278
-#, no-c-format
+#: protocols/irc/ircusercontact.cpp:474
 msgid ""
-"How do you want to message the contact?  If they use more than one Instant "
-"Messaging system, select them all here"
-msgstr "您想要如何与联系人进行通讯？如果联系人使用多于一种即时通讯系统，请将这些系统全部选中。"
+"Last Online: %1\n"
+msgstr ""
+"上次在线：%1\n"
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 407
-#: rc.cpp:1275
-#, no-c-format
-msgid "You can always add more ways to message this contact later."
-msgstr "您总可以再稍后添加与此联系人通讯的更多方式。"
+#: protocols/irc/ircusercontact.cpp:538
+msgid "C&TCP"
+msgstr "C&TCP"
 
-#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 443
-#: rc.cpp:1284
-#, no-c-format
-msgid ""
-"<p>"
-"<h2>Congratulations</h2></p>\n"
-"\n"
-"<p>You have finished configuring a contact. Please click Finish and your "
-"contact will be added to your contact list.</p>\n"
-"\n"
-"<p><i>Note</i>: If adding this contact requires authorization from one or more "
-"of the messaging services, Kopete may prompt you for further information after "
-"this screen.</p>"
-msgstr ""
-"<p>"
-"<h2>恭喜</h2></p>\n"
-"\n"
-"<p>您已经完成了联系人的配置。请单击完成，您的联系人将会添加到您的联系人列表中。</p>\n"
-"\n"
-"<p><i>注意</i>：如果添加此联系人需要一种或多种信使服务的认证，Kopete 可能在此屏幕之后提示您有关信息。</p>"
+#: protocols/irc/ircusercontact.cpp:539
+msgid "&Version"
+msgstr "版本(&V)"
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 16
-#: rc.cpp:1294
-#, no-c-format
-msgid "Now Listening"
-msgstr "正在收听"
+#: protocols/irc/ircusercontact.cpp:541
+msgid "&Ping"
+msgstr "&Ping"
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 33
-#: rc.cpp:1297
-#, no-c-format
-msgid "<b>Share Your Musical Taste</b>"
-msgstr "<b>分享您的音乐品味</b>"
+#: protocols/irc/ircusercontact.cpp:544
+msgid "&Modes"
+msgstr "管理(&M)"
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 59
-#: rc.cpp:1300
-#, no-c-format
-msgid "Messa&ge"
-msgstr "消息(&G)"
+#: protocols/irc/ircusercontact.cpp:545
+msgid "&Op"
+msgstr "&Op"
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 78
-#: rc.cpp:1303
-#, no-c-format
-msgid "Use this message when advertising:"
-msgstr "广告时使用如下消息："
+#: protocols/irc/ircusercontact.cpp:547
+msgid "&Deop"
+msgstr "&Deop"
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 87
-#: rc.cpp:1306
-#, no-c-format
-msgid ""
-"%track, %artist, %album, %player will be substituted if known.\n"
-"Expressions in brackets depend on a substitution being made."
-msgstr ""
-"%track, %artist, %album, %player 如果已知的话会被替换。\n"
-"括号里的表达式依靠实际作出的替换。"
+#: protocols/irc/ircusercontact.cpp:549
+msgid "&Voice"
+msgstr "语音(&V)"
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 106
-#: rc.cpp:1310
-#, no-c-format
-msgid "Start with:"
-msgstr "开始于："
+#: protocols/irc/ircusercontact.cpp:551
+msgid "Devoice"
+msgstr "取消语音"
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 120
-#: rc.cpp:1313
-#, no-c-format
-msgid "Now Listening To: "
-msgstr "正在收听： "
+#: protocols/irc/ircusercontact.cpp:555
+msgid "&Kick"
+msgstr "踢出(&K)"
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 128
-#: rc.cpp:1316
-#, no-c-format
-msgid "For each track:"
-msgstr "对每一轨道："
+#: protocols/irc/ircusercontact.cpp:558
+msgid "&Ban"
+msgstr "屏蔽(&B)"
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 142
-#: rc.cpp:1319
-#, no-c-format
-msgid "%track (by %artist)(on %album)"
-msgstr "%track (表演 %artist)(专辑 %album)"
+#: protocols/irc/ircusercontact.cpp:559
+msgid "Host (*!*@host.domain.net)"
+msgstr "主机(*!*@host.domain.net)"
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 150
-#: rc.cpp:1322
-#, no-c-format
-msgid "Conjunction (if >1 track):"
-msgstr "连接(如果 >1 轨道)："
+#: protocols/irc/ircusercontact.cpp:561
+msgid "Domain (*!*@*.domain.net)"
+msgstr "域名(*!*@*.domain.net)"
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 164
-#: rc.cpp:1325
-#, no-c-format
-msgid ", and "
-msgstr "，和 "
+#: protocols/irc/ircusercontact.cpp:563
+msgid "User@Host (*!*user@host.domain.net)"
+msgstr "用户@主机(*!*user@host.domain.net)"
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 195
-#: rc.cpp:1328
-#, no-c-format
-msgid "A&dvertising Mode"
-msgstr "广告模式(&D)"
+#: protocols/irc/ircusercontact.cpp:565
+msgid "User@Domain (*!*user@*.domain.net)"
+msgstr "用户@域名(*!*user@*.domain.net)"
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 222
-#: rc.cpp:1331
-#, no-c-format
-msgid ""
-"Explicit &via \"Tools->Send Media Info\",\n"
-"or by typing \"/media\" in the chat\n"
-"window edit area."
-msgstr ""
-"选择“工具->发送媒体信息”，或者在聊天窗口\n"
-"编辑区域中输入“/media”时才使用(&V)。"
+#: protocols/irc/ircchannelcontact.cpp:683
+#: protocols/irc/ircusercontact.cpp:569
+msgid "&Encoding"
+msgstr "编码(&E)"
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 230
-#: rc.cpp:1336
-#, no-c-format
-msgid "&Show in chat window (automatic)"
-msgstr "显示于聊天窗口(自动)(&S)"
+#: protocols/irc/irccontact.cpp:189
+msgid "Quit: \"%1\" "
+msgstr "退出：“%1” "
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 239
-#: rc.cpp:1339
-#, no-c-format
-msgid ""
-"Show &the music you are listening to \n"
-"in place of your status message."
-msgstr "在您的状态消息中显示您正在收听的音乐(&T)。"
+#: protocols/irc/ircprotocol.cpp:121 protocols/irc/ircprotocol.cpp:127
+msgid "Op"
+msgstr "Op"
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 247
-#: rc.cpp:1343
-#, no-c-format
-msgid "Appe&nd to your status message"
-msgstr "追到您的状态消息(&N)"
+#: protocols/irc/ircprotocol.cpp:133
+msgid "Voice"
+msgstr "语音"
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 276
-#: rc.cpp:1346
-#, no-c-format
-msgid "Media Pla&yer"
-msgstr "媒体播放机(&Y)"
+#: libkopete/kopetemetacontact.cpp:510 protocols/irc/ircprotocol.cpp:150
+msgid "Status not available"
+msgstr "状态不可用"
 
-#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 295
-#: rc.cpp:1349
-#, no-c-format
-msgid "Use &specified media player"
-msgstr "使用指定的媒体播放机(&S)"
+#: protocols/irc/ircprotocol.cpp:152 protocols/irc/ui/channellist.cpp:193
+#: protocols/irc/ui/channellist.cpp:213
+msgid "Topic"
+msgstr "话题"
 
-#. i18n: file ./plugins/translator/translatorprefsbase.ui line 38
-#: rc.cpp:1358
+#. i18n: file ./protocols/groupwise/ui/gwchatsearchwidget.ui line 44
+#: protocols/irc/ircprotocol.cpp:153 rc.cpp:4119
 #, no-c-format
-msgid "Translation service:"
-msgstr "翻译服务："
+msgid "Members"
+msgstr "成员"
 
-#. i18n: file ./plugins/translator/translatorprefsbase.ui line 46
-#: rc.cpp:1361
-#, no-c-format
-msgid "Default native language:"
-msgstr "默认的母语："
+#: protocols/irc/ircprotocol.cpp:154
+msgid "Home Page"
+msgstr "主页"
 
-#. i18n: file ./plugins/translator/translatorprefsbase.ui line 67
-#: rc.cpp:1364
-#, no-c-format
-msgid "Incoming Messages"
-msgstr "收到的消息"
+#: protocols/irc/ircprotocol.cpp:156
+msgid "IRC User"
+msgstr "IRC 用户"
 
-#. i18n: file ./plugins/translator/translatorprefsbase.ui line 78
-#: rc.cpp:1367 rc.cpp:1379
-#, no-c-format
-msgid "Do not translate"
-msgstr "不翻译"
+#: protocols/irc/ircprotocol.cpp:157
+msgid "IRC Server"
+msgstr "IRC 服务器"
 
-#. i18n: file ./plugins/translator/translatorprefsbase.ui line 92
-#: rc.cpp:1370 rc.cpp:1382
-#, no-c-format
-msgid "Show the original message"
-msgstr "显示原始消息"
+#: protocols/irc/ircprotocol.cpp:158
+msgid "IRC Channels"
+msgstr "IRC 频道"
 
-#. i18n: file ./plugins/translator/translatorprefsbase.ui line 106
-#: rc.cpp:1373 rc.cpp:1385
-#, no-c-format
-msgid "Translate directly"
-msgstr "直接翻译"
+#: protocols/irc/ircprotocol.cpp:159
+msgid "IRC Hops"
+msgstr "IRC Hops"
 
-#. i18n: file ./plugins/translator/translatorprefsbase.ui line 119
-#: rc.cpp:1376
-#, no-c-format
-msgid "Outgoing Messages"
-msgstr "送出的消息"
+#: libkopete/kopeteglobal.cpp:112 protocols/irc/ircprotocol.cpp:160
+msgid "Full Name"
+msgstr "全名"
 
-#. i18n: file ./plugins/translator/translatorprefsbase.ui line 166
-#: rc.cpp:1388
-#, no-c-format
-msgid "Show dialog before sending"
-msgstr "发送前显示对话框"
+#: protocols/irc/ircprotocol.cpp:161
+msgid "User Is Authenticated"
+msgstr "用户已通过身份验证"
 
-#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 35
-#: rc.cpp:1391
-#, no-c-format
-msgid "&Colors"
-msgstr "颜色(&C)"
+#: protocols/irc/ircprotocol.cpp:173
+msgid "USAGE: /raw <text> - Sends the text in raw form to the server."
+msgstr "用法：/raw <文本> - 将文本原样发送给服务器。"
 
-#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 62
-#: rc.cpp:1397
-#, no-c-format
-msgid "&Add..."
-msgstr "添加(&A)..."
+#: protocols/irc/ircprotocol.cpp:177
+msgid "USAGE: /quote <text> - Sends the text in quoted form to the server."
+msgstr "用法：/quote <文本> - 将文本以引用格式发送给服务器。"
 
-#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 78
-#: rc.cpp:1403
-#, no-c-format
-msgid "Move &Up"
-msgstr "上移(&U)"
+#: protocols/irc/ircprotocol.cpp:181
+msgid "USAGE: /ctcp <nick> <message> - Send the CTCP message to nick<action>."
+msgstr "用法：/ctcp <昵称> <消息> - 对给定昵称发送 CTCP 消息动作。"
 
-#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 86
-#: rc.cpp:1406
-#, no-c-format
-msgid "Move &Down"
-msgstr "下移(&D)"
+#: protocols/irc/ircprotocol.cpp:185
+msgid "USAGE: /ping <nickname> - Alias for /CTCP <nickname> PING."
+msgstr "用法：/ping <昵称> - /CTCP <昵称> PING 的替换写法。"
 
-#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 113
-#: rc.cpp:1409
-#, no-c-format
-msgid "Random order"
-msgstr "随机顺序"
+#: protocols/irc/ircprotocol.cpp:189
+msgid ""
+"USAGE: /motd [<server>] - Shows the message of the day for the current or the "
+"given server."
+msgstr "用法：/motd [<服务器>] - 显示指定服务器的当日消息。"
 
-#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 135
-#: rc.cpp:1412
-#, no-c-format
-msgid "Change global text foreground color"
-msgstr "更改文字的整体前景色"
+#: protocols/irc/ircprotocol.cpp:193
+msgid "USAGE: /list - List the public channels on the server."
+msgstr "用法：/list - 列出当前服务器上的公开频道列表。"
 
-#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 143
-#: rc.cpp:1415
-#, no-c-format
-msgid "Change color every letter"
-msgstr "每个字母变一次颜色"
+#: protocols/irc/ircprotocol.cpp:197
+msgid "USAGE: /join <#channel 1> [<password>] - Joins the specified channel."
+msgstr "用法：/join <#频道 1> [<密码>] - 加入指定的频道。"
 
-#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 151
-#: rc.cpp:1418
-#, no-c-format
-msgid "Change color every word"
-msgstr "每个单词变一次颜色"
+#: protocols/irc/ircprotocol.cpp:201
+msgid ""
+"USAGE: /topic [<topic>] - Sets and/or displays the topic for the active "
+"channel."
+msgstr "用法：/topic [<话题>] - 设定并/或显示此活动频道的讨论话题。"
 
-#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 161
-#: rc.cpp:1421
-#, no-c-format
-msgid "Effects"
-msgstr "效果"
+#: protocols/irc/ircprotocol.cpp:206
+msgid "USAGE: /whois <nickname> - Display whois info on this user."
+msgstr "用法：/whois <昵称> - 显示此用户的 whois 信息。"
 
-#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 180
-#: rc.cpp:1424
-#, no-c-format
-msgid "L4m3r t4lk"
-msgstr "L4m3r t4lk"
+#: protocols/irc/ircprotocol.cpp:210
+msgid "USAGE: /whowas <nickname> - Display whowas info on this user."
+msgstr "用法：/whowas <昵称> - 显示此用户的 whowas 信息。"
 
-#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 196
-#: rc.cpp:1427
-#, no-c-format
-msgid "CasE wAVes"
-msgstr "随机大小写(CasE wAVes)"
+#: protocols/irc/ircprotocol.cpp:214
+msgid "USAGE: /who <nickname|channel> - Display who info on this user/channel."
+msgstr "用法：/who <昵称|频道> - 显示此用户或频道的 who 信息。"
 
-#. i18n: file ./plugins/netmeeting/netmeetingprefs_ui.ui line 27
-#: rc.cpp:1433
-#, no-c-format
+#: protocols/irc/ircprotocol.cpp:218
 msgid ""
-"The NetMeeting Plugin allows you to start a video or voice chat with your MSN "
-"Messenger contacts.\n"
-"\n"
-"This is not the same as webcam chat you can find in the newer Windows "
-"Messenger®,  but uses the older NetMeeting chat you can find in old versions."
-msgstr ""
-"NetMeeting 插件允许您与您的 MSN Messenger 联系人开始视频或语音聊天。\n"
-"\n"
-"这与您在较新版本的 Windows Messenger(R) 中看到的摄像头功能不同，而是使用您在较早版本中可找到的 NetMeeting 聊天。"
+"USAGE: /query <nickname> [<message>] - Open a private chat with this user."
+msgstr "用法：/query <昵称> [<消息>] - 对某一用户开启私聊。"
 
-#. i18n: file ./plugins/netmeeting/netmeetingprefs_ui.ui line 60
-#: rc.cpp:1438
-#, no-c-format
-msgid "Application to launch:"
-msgstr "要调用的应用程序："
+#: protocols/irc/ircprotocol.cpp:222
+msgid "USAGE: /mode <channel> <modes> - Set modes on the given channel."
+msgstr "用法：/mode <频道名> <模式> - 设定指定频道的属性模式。"
 
-#. i18n: file ./plugins/netmeeting/netmeetingprefs_ui.ui line 66
-#: rc.cpp:1441
-#, no-c-format
-msgid "ekiga -c callto://%1"
-msgstr "ekiga -c callto://%1"
+#: protocols/irc/ircprotocol.cpp:226
+msgid "USAGE: /nick <nickname> - Change your nickname to the given one."
+msgstr "用法：/nick <昵称> - 改变您的昵称。"
 
-#. i18n: file ./plugins/netmeeting/netmeetingprefs_ui.ui line 71
-#: rc.cpp:1444
-#, no-c-format
-msgid "konference callto://%1"
-msgstr "konference callto://%1"
+#: protocols/irc/ircprotocol.cpp:230
+msgid "USAGE: /me <action> - Do something."
+msgstr "用法：/me <动作> - 做动作。"
 
-#. i18n: file ./plugins/netmeeting/netmeetingprefs_ui.ui line 99
-#: rc.cpp:1447
-#, no-c-format
-msgid "<b>%1</b> will be replaced by the ip to call"
-msgstr "<b>%1</b> 将被替换为要呼叫的 IP 地址"
+#: protocols/irc/ircprotocol.cpp:234
+msgid "USAGE: /ame <action> - Do something in every open chat."
+msgstr "用法：/ame <动作> - 在所有已打开的对话中做动作。"
 
-#. i18n: file ./plugins/netmeeting/netmeetingprefs_ui.ui line 135
-#: rc.cpp:1450
-#, no-c-format
+#: protocols/irc/ircprotocol.cpp:238
 msgid ""
-"You can download Konference here: <a "
-"href=\"http://www.kde-apps.org/content/show.php?content=10395\">"
-"http://www.kde-apps.org/content/show.php?content=10395</a>"
-msgstr ""
-"您可从下面下载到 Konference：<a "
-"href=\"http://www.kde-apps.org/content/show.php?content=10395\">"
-"http://www.kde-apps.org/content/show.php?content=10395</a>"
+"USAGE: /kick <nickname> [<reason>] - Kick someone from the channel (requires "
+"operator status)."
+msgstr "用法：/kick <昵称> [<原因>] - 将某人从频道中踢出(需要操作员身份来执行)。"
 
-#. i18n: file ./plugins/alias/aliasdialogbase.ui line 22
-#: rc.cpp:1453
-#, no-c-format
-msgid "Alias"
-msgstr "别名"
+#: protocols/irc/ircprotocol.cpp:243
+msgid ""
+"USAGE: /ban <mask> - Add someone to this channel's ban list. (requires operator "
+"status)."
+msgstr "用法：/ban <网络掩码> - 将某些人添加到频道的封禁列表(需要操作员身份来执行)。"
 
-#. i18n: file ./plugins/alias/aliasdialogbase.ui line 33
-#: rc.cpp:1456 rc.cpp:2251
-#, no-c-format
-msgid "Command"
-msgstr "命令"
+#: protocols/irc/ircprotocol.cpp:248
+msgid ""
+"USAGE: /bannick <nickname> - Add someone to this channel's ban list. Uses the "
+"hostmask nickname!*@* (requires operator status)."
+msgstr "用法：/bannick <昵称> - 以“昵称!*@*”为掩码将某些人添加到频道的封禁列表(需要操作员身份来执行)。"
 
-#. i18n: file ./plugins/alias/aliasdialogbase.ui line 44
-#: rc.cpp:1459 rc.cpp:1505
-#, no-c-format
-msgid "Protocols"
-msgstr "协议"
+#: protocols/irc/ircprotocol.cpp:252
+msgid ""
+"USAGE: /op <nickname 1> [<nickname 2> <...>] - Give channel operator status to "
+"someone (requires operator status)."
+msgstr "用法：/op <昵称 1> [<昵称 2> <...>] - 将频道操作员身份授予给某些人(需要操作员身份来执行)。"
 
-#. i18n: file ./plugins/alias/aliasdialogbase.ui line 69
-#: rc.cpp:1462
-#, no-c-format
+#: protocols/irc/ircprotocol.cpp:257
 msgid ""
-"This is the list of custom aliases and the commands that you have already added"
-msgstr "这是您已经添加的自定义别名和命令列表"
+"USAGE: /deop <nickname> [<nickname 2> <...>]- Remove channel operator status "
+"from someone (requires operator status)."
+msgstr "用法：/deop <昵称 1> [<昵称 2> <...>] - 解除某些人的频道操作员身份(需要操作员身份来执行)。"
 
-#. i18n: file ./plugins/alias/aliasdialogbase.ui line 77
-#: rc.cpp:1465
-#, no-c-format
-msgid "&Add New Alias..."
-msgstr "添加新别名(&A)..."
+#: protocols/irc/ircprotocol.cpp:261
+msgid ""
+"USAGE: /voice <nickname> [<nickname 2> <...>]- Give channel voice status to "
+"someone (requires operator status)."
+msgstr "用法：/voice <昵称> [<昵称 2> <...>] - 将频道语音用户身份授予给某些人(需要操作员身份来执行)。"
 
-#. i18n: file ./plugins/alias/aliasdialogbase.ui line 85
-#: rc.cpp:1468
-#, no-c-format
-msgid "&Delete Selected"
-msgstr "删除选中(&D)"
+#: protocols/irc/ircprotocol.cpp:266
+msgid ""
+"USAGE: /devoice <nickname> [<nickname 2> <...>]- Remove channel voice status "
+"from someone (requires operator status)."
+msgstr "用法：/devoice <昵称> [<昵称 2> <...>] - 收回某些人的频道语音用户身份(需要操作员身份来执行)。"
 
-#. i18n: file ./plugins/alias/aliasdialogbase.ui line 93
-#: rc.cpp:1471
-#, no-c-format
-msgid "Edit Alias..."
-msgstr "编辑别名..."
+#: protocols/irc/ircprotocol.cpp:270
+msgid ""
+"USAGE: /quit [<reason>] - Disconnect from IRC, optionally leaving a message."
+msgstr "用法：/quit [<原因>] - 从 IRC 断开连接，您可随意地留下一句退出消息。"
 
-#. i18n: file ./plugins/alias/aliasdialog.ui line 16
-#: rc.cpp:1474
-#, no-c-format
-msgid "Add New Alias"
-msgstr "添加新别名"
+#: protocols/irc/ircprotocol.cpp:274
+msgid ""
+"USAGE: /part [<reason>] - Part from a channel, optionally leaving a message."
+msgstr "用法：/part [<原因>] - 离开此频道，您可随意地留下一句离开消息。"
 
-#. i18n: file ./plugins/alias/aliasdialog.ui line 27
-#: rc.cpp:1477
-#, no-c-format
-msgid "Command:"
-msgstr "命令："
+#: protocols/irc/ircprotocol.cpp:278
+msgid ""
+"USAGE: /invite <nickname> [<channel>] - Invite a user to join a channel."
+msgstr "用法：/invite <昵称> [<频道>] - 邀请一个用户加入此频道。"
 
-#. i18n: file ./plugins/alias/aliasdialog.ui line 38
-#: rc.cpp:1480
-#, no-c-format
-msgid "This is the command that you want to run when you execute this alias. "
-msgstr "当您执行此别名时，要运行这个命令。 "
+#: protocols/irc/ircprotocol.cpp:282
+msgid "USAGE: /j <#channel 1> [<password>] - Alias for JOIN."
+msgstr "用法：/j <#频道 1> [<密码>] - JOIN 的替换写法。"
 
-#. i18n: file ./plugins/alias/aliasdialog.ui line 45
-#: rc.cpp:1483
-#, no-c-format
+#: protocols/irc/ircprotocol.cpp:287
 msgid ""
-"<qt>This is the command that you want to run when you execute this alias.\n"
-"\n"
-"You can use the variables <b>%1, %2 ... %9</b> in your command, and they will "
-"be replaced with the arguments of the alias. The variable <b>%s</b> "
-"will be replaced with all arguments. <b>%n</b> expands to your nickname.\n"
-"\n"
-"Do not include the '/' in the command (if you do it will be stripped off "
-"anyway).</qt>"
-msgstr ""
-"<qt>这是当您执行此别名时想要运行的命令。\n"
-"\n"
-"您可以在命令中使用变量 <b>%1，%2……%9</b>，这些变量将会被替换为别名的参数。变量 <b>%s</b> 将被替换为全部参数。<b>%n</b> "
-"将被替换为您的昵称。\n"
-"\n"
-"请不要再命令中包含“/”(就算您写上了，这个字符也会被剔除)</qt>"
+"USAGE: /msg <nickname> [<message>] - Alias for QUERY <nickname> <message>."
+msgstr "用法：/msg <昵称> [<消息>] - QUERY <昵称> <消息> 的替换写法。"
 
-#. i18n: file ./plugins/alias/aliasdialog.ui line 53
-#: rc.cpp:1490
-#, no-c-format
-msgid "Alias:"
-msgstr "别名："
+#: protocols/irc/ircprotocol.cpp:457 protocols/irc/ircprotocol.cpp:472
+msgid "You must enter some text to send to the server."
+msgstr "您必须输入一些文字才能发送给服务器。"
 
-#. i18n: file ./plugins/alias/aliasdialog.ui line 64
-#: rc.cpp:1493
-#, no-c-format
+#: protocols/irc/ircprotocol.cpp:521 protocols/irc/ircprotocol.cpp:721
+msgid "You must be in a channel to use this command."
+msgstr "要完成这一操作，您必须处于频道中。"
+
+#: protocols/irc/ircaccount.cpp:784 protocols/irc/ircprotocol.cpp:538
+#: protocols/irc/ircprotocol.cpp:558
 msgid ""
-"This is the alias you are adding (what you will type after the command "
-"identifier, '/')."
-msgstr "这是您正在添加的别名(您在命令标识符“/”后输入的文字)。"
+"\"%1\" is an invalid channel. Channels must start with '#', '!', '+', or '&'."
+msgstr "“%1”是无效的频道。频道必须以“#”、“!”、“+”或“&”开头。"
 
-#. i18n: file ./plugins/alias/aliasdialog.ui line 67
-#: rc.cpp:1496
-#, no-c-format
+#: protocols/irc/ircprotocol.cpp:578 protocols/irc/ircprotocol.cpp:682
+#: protocols/irc/ircprotocol.cpp:699 protocols/irc/ircprotocol.cpp:764
+msgid "You must be a channel operator to perform this operation."
+msgstr "要完成这一操作，您必须是频道管理员。"
+
+#: protocols/irc/ircprotocol.cpp:602
 msgid ""
-"This is the alias you are adding (what you will type after the command "
-"identifier, '/'). Do not include the '/' (it will be stripped off if you do "
-"anyway)."
-msgstr "这是您正在添加的别名(您在命令标识符“/”后输入的文字)。请不要包含“/”(就算您写上了，这个字符也会被剔除)。"
+"\"%1\" is an invalid nickname. Nicknames must not start with '#','!','+', or "
+"'&'."
+msgstr "“%1”是无效的昵称。昵称必须不以“#”、“!”、“+”或“&”开头。"
 
-#. i18n: file ./plugins/alias/aliasdialog.ui line 123
-#: rc.cpp:1508 rc.cpp:1511
-#, no-c-format
+#: protocols/irc/ircprotocol.cpp:919
 msgid ""
-"If you want this alias to only be active for certain protocols, select those "
-"protocols here."
-msgstr "如果您想要此别名仅对特定协议激活，请在此选择协议。"
+"<qt>Are you sure you want to delete the network <b>%1</b>?"
+"<br>Any accounts which use this network will have to be modified.</qt>"
+msgstr "<qt>您确定想要删网络 <b>%1</b> 吗？<br>使用此网络的任何账户都需要进行修改。</qt>"
 
-#. i18n: file ./plugins/alias/aliasdialog.ui line 137
-#: rc.cpp:1514
-#, no-c-format
-msgid "For protocols:"
-msgstr "针对协议："
+#: protocols/irc/ircprotocol.cpp:921
+msgid "Deleting Network"
+msgstr "删除网络"
 
-#. i18n: file ./plugins/latex/latexprefsbase.ui line 29
-#: rc.cpp:1520
-#, no-c-format
+#: protocols/irc/ircprotocol.cpp:922
+msgid "&Delete Network"
+msgstr "删除网络(&D)"
+
+#: protocols/irc/ircprotocol.cpp:946
+msgid "<qt>Are you sure you want to delete the host <b>%1</b>?</qt>"
+msgstr "<qt>您确定想要删除主机 <b>%1</b> 吗</qt>"
+
+#: protocols/irc/ircprotocol.cpp:947
+msgid "Deleting Host"
+msgstr "删除主机"
+
+#: protocols/irc/ircprotocol.cpp:948
+msgid "&Delete Host"
+msgstr "删除主机(&D)"
+
+#: protocols/irc/ircprotocol.cpp:1001
+msgid "New Host"
+msgstr "新建主机"
+
+#: protocols/irc/ircprotocol.cpp:1002
+msgid "Enter the hostname of the new server:"
+msgstr "输入新服务器的主机名："
+
+#: protocols/irc/ircprotocol.cpp:1009
+msgid "A host already exists with that name"
+msgstr "已经存在该名称的主机"
+
+#: protocols/irc/ircprotocol.cpp:1039
+msgid "Rename Network"
+msgstr "重命名网络"
+
+#: protocols/irc/ircprotocol.cpp:1040
+msgid "Enter the new name for this network:"
+msgstr "输入此网络的新名称："
+
+#: protocols/irc/ircprotocol.cpp:1050
+msgid "A network already exists with that name"
+msgstr "已经存在该名称的网络"
+
+#: protocols/irc/ircchannelcontact.cpp:62
+msgid "Only Operators Can Change &Topic"
+msgstr "只有管理员可更改话题(&T)"
+
+#: protocols/irc/ircchannelcontact.cpp:63
+msgid "&No Outside Messages"
+msgstr "无送出的消息(&N)"
+
+#: protocols/irc/ircchannelcontact.cpp:64
+msgid "&Secret"
+msgstr "绝密(&S)"
+
+#: protocols/irc/ircchannelcontact.cpp:65
+msgid "&Moderated"
+msgstr "监管(&M)"
+
+#: protocols/irc/ircchannelcontact.cpp:66
+msgid "&Invite Only"
+msgstr "凭邀请(&I)"
+
+#: protocols/irc/ircchannelcontact.cpp:275
+msgid "Topic for %1 is set empty."
+msgstr "%1 的话题为空。"
+
+#: protocols/irc/ircchannelcontact.cpp:280
+msgid "Topic for %1 is %2"
+msgstr "%1 的话题为 %2"
+
+#: protocols/irc/ircchannelcontact.cpp:365
+#, c-format
+msgid "You have joined channel %1"
+msgstr "您已经加入了频道 %1"
+
+#: protocols/irc/ircchannelcontact.cpp:381
+msgid "User <b>%1</b> joined channel %2"
+msgstr "用户 <b>%1</b> 加入了频道 %2"
+
+#: protocols/irc/ircchannelcontact.cpp:416
+msgid "%1 was kicked by %2. Reason: %3"
+msgstr "%1 被 %2 踢出。原因：%3"
+
+#: protocols/irc/ircchannelcontact.cpp:418
+msgid "%1 was kicked by %2."
+msgstr "%1 被 %2 踢出。"
+
+#: protocols/irc/ircchannelcontact.cpp:437
+msgid "You were kicked from %1 by %2. Reason: %3"
+msgstr "您被 %2 从 %1 中踢出。原因：%3"
+
+#: protocols/irc/ircchannelcontact.cpp:439
+msgid "You were kicked from %1 by %2."
+msgstr "您被 %2 从 %1 中踢出。"
+
+#: protocols/irc/ircaccount.cpp:228 protocols/irc/ircaccount.cpp:246
+#: protocols/irc/ircaccount.cpp:698 protocols/irc/ircaccount.cpp:785
+#: protocols/irc/ircchannelcontact.cpp:442
+#: protocols/irc/ircchannelcontact.cpp:568
+#: protocols/irc/ircchannelcontact.cpp:575
+#: protocols/irc/ircchannelcontact.cpp:583
+#: protocols/irc/ircchannelcontact.cpp:589
+msgid "IRC Plugin"
+msgstr "IRC 插件"
+
+#: protocols/irc/ircchannelcontact.cpp:459
+msgid "New Topic"
+msgstr "新话题"
+
+#: protocols/irc/ircchannelcontact.cpp:459
+msgid "Enter the new topic:"
+msgstr "输入新话题："
+
+#: protocols/irc/ircchannelcontact.cpp:471
+msgid "You must be a channel operator on %1 to do that."
+msgstr "要完成这一操作，您必须是 %1 的频道管理员。"
+
+#: protocols/irc/ircchannelcontact.cpp:486
+msgid "%1 has changed the topic to: %2"
+msgstr "%1 已经将话题改为：%2"
+
+#: protocols/irc/ircchannelcontact.cpp:497
+msgid "Topic set by %1 at %2"
+msgstr "%1 在 %2 设置了话题"
+
+#: protocols/irc/ircchannelcontact.cpp:506
+msgid "%1 sets mode %2 on %3"
+msgstr "%1 将 %3 的模式设置为 %2"
+
+#: protocols/irc/ircchannelcontact.cpp:567
+msgid "<qt>You can not join %1 because you have been banned.</qt>"
+msgstr "<qt>您无法加入 %1，因为您被屏蔽了。</qt>"
+
+#: protocols/irc/ircchannelcontact.cpp:575
 msgid ""
-"<p>The <font size=\"+1\">KopeTeX</font> plugin allows <font size=\"+1\">"
-"Kopet</font>e to render Latex formulas in the chat window. The sender must "
-"enclose the formula between two $ signs. ie: $$formula$$</p>\n"
-"<p>This plugin requires ImageMagick convert program installed in order to "
-"work.</p>"
-msgstr ""
-"<p><font size=\"+1\">KopeTeX</font> 插件允许 <font size=\"+1\">Kopete</font> "
-"在聊天窗口中渲染 Latex 公式。服务器必须将公式包围在两个 $ 符号中即：$$formula$$</p>\n"
-"<p>要让此功能生效，您必须安装 ImageMagick 转换程序。</p>"
+"<qt>You can not join %1 because it is set to invite only, and no one has "
+"invited you.</qt>"
+msgstr "<qt>您无法加入 %1，因为您没有受到邀请。</qt>"
 
-#. i18n: file ./plugins/latex/latexprefsbase.ui line 73
-#: rc.cpp:1527
-#, no-c-format
-msgid "Rendering resolution (DPI):"
-msgstr "渲染分辨率(DPI)："
+#: protocols/irc/ircchannelcontact.cpp:582
+msgid "<qt>You can not join %1 because it has reached its user limit.</qt>"
+msgstr "<qt>您无法加入 %1，因为该频道人数已满。</qt>"
 
-#. i18n: file ./plugins/latex/latexprefsbase.ui line 113
-#: rc.cpp:1530
-#, no-c-format
-msgid "x"
-msgstr "x"
+#: protocols/irc/ircchannelcontact.cpp:590
+msgid "Please enter key for channel %1: "
+msgstr "请输入频道 %1 的密钥： "
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 33
-#: rc.cpp:1533
+#. i18n: file ./protocols/jabber/ui/dlgchatroomslist.ui line 128
+#: protocols/irc/ircchannelcontact.cpp:661 rc.cpp:2782 rc.cpp:3160
 #, no-c-format
-msgid "Uploading"
-msgstr "上传"
+msgid "&Join"
+msgstr "加入(&J)"
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 56
-#: rc.cpp:1536
-#, no-c-format
-msgid "Uplo&ad to:"
-msgstr "上传到(&A)："
+#: protocols/irc/ircchannelcontact.cpp:662
+msgid "&Part"
+msgstr "参与(&P)"
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 91
-#: rc.cpp:1539
-#, no-c-format
-msgid "Formatting"
-msgstr "格式化"
+#: protocols/irc/ircchannelcontact.cpp:663
+msgid "Change &Topic..."
+msgstr "更改话题(&T)..."
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 108
-#: rc.cpp:1542
-#, no-c-format
-msgid "HTML (simple loo&k)"
-msgstr "HTML(简洁外观)(&K)"
+#: protocols/irc/ircchannelcontact.cpp:664
+msgid "Channel Modes"
+msgstr "频道模式"
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 114
-#: rc.cpp:1545
-#, no-c-format
+#: protocols/irc/ircchannelcontact.cpp:668
+msgid "Visit &Homepage"
+msgstr "浏览主页(&H)"
+
+#: protocols/irc/ui/irceditaccountwidget.cpp:177
+msgid "Remove Command"
+msgstr "删除命令"
+
+#: protocols/irc/ui/irceditaccountwidget.cpp:185
+msgid "Remove CTCP Reply"
+msgstr "删除 CTCP 回复"
+
+#: protocols/irc/ui/irceditaccountwidget.cpp:275
+msgid "<qt>You must enter a nickname.</qt>"
+msgstr "<qt>您必须输入一个有效的昵称。</qt>"
+
+#: protocols/irc/ui/channellist.cpp:182
+msgid " members"
+msgstr " 成员"
+
+#: protocols/irc/ui/channellist.cpp:190 protocols/irc/ui/channellist.cpp:211
+msgid "Channel"
+msgstr "频道"
+
+#: protocols/irc/ui/channellist.cpp:191 protocols/irc/ui/channellist.cpp:212
+msgid "Users"
+msgstr "用户"
+
+#: protocols/irc/ui/channellist.cpp:200
+msgid "Search for:"
+msgstr "搜索："
+
+#: protocols/irc/ui/channellist.cpp:201 protocols/irc/ui/channellist.cpp:205
 msgid ""
-"HTML 4.01 Transitional using the ISO-8859-1 (aka. Latin 1) character set "
-"encoding."
-msgstr "HTML 4.01 Transitional，使用 ISO-8859-1(Latin 1)字符集编码。"
+"You may search for channels on the IRC server for a text string entered here."
+msgstr "您可搜索 IRC 服务器中包含在此输入的字符串的频道。"
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 119
-#: rc.cpp:1548
-#, no-c-format
+#: protocols/irc/ui/channellist.cpp:202 protocols/irc/ui/channellist.cpp:203
+msgid "Channels returned must have at least this many members."
+msgstr "返回的频道必须至少有这么多成员。"
+
+#: protocols/irc/ui/channellist.cpp:204 protocols/irc/ui/channellist.cpp:206
 msgid ""
-"HTML 4.01 Transitional formatting using ISO-8859-1 (aka. Latin 1) character set "
-"encoding.\n"
-"\n"
-"This version should be easily opened by most web browsers."
-msgstr ""
-"HTML 4.01 Transitional，使用 ISO-8859-1(Latin 1)字符集编码。\n"
-"\n"
-"此版本应该可使用大多数 Web 浏览器轻易打开。"
+"You may search for channels on the IRC server for a text string entered here.  "
+"For instance, you may type 'linux' to find channels that have something to do "
+"with linux."
+msgstr "您可搜索 IRC 服务器中包含在此输入的字符串的频道。例如，您可以输入“linux”，这样可以找到与 linux 相关的频道。"
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 127
-#: rc.cpp:1553
-#, no-c-format
-msgid "XHTML (simple look)"
-msgstr "XHTML(简洁外观)"
+#: protocols/irc/ui/channellist.cpp:208
+msgid "Perform a channel search."
+msgstr "执行频道搜索。"
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 130
-#: rc.cpp:1556
-#, no-c-format
-msgid "XHTML 1.0 Strict"
-msgstr "XHTML 1.0 Strict"
+#: protocols/irc/ui/channellist.cpp:209
+msgid ""
+"Perform a channel search.  Please be patient, as this can be slow depending on "
+"the number of channels on the server."
+msgstr "执行频道搜索。请稍候，根据服务器频道的多少，搜索的速度可能有快慢之别。"
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 135
-#: rc.cpp:1559
-#, no-c-format
+#: protocols/irc/ui/channellist.cpp:210
+msgid "Double click on a channel to select it."
+msgstr "双击频道可加以选择。"
+
+#: protocols/irc/ui/channellist.cpp:255
+msgid "You have been disconnected from the IRC server."
+msgstr "您已经断开到 IRC 服务器的连接。"
+
+#: protocols/irc/ui/channellist.cpp:256
+msgid "Disconnected"
+msgstr "已断开连接"
+
+#: protocols/irc/ui/channellist.cpp:303
+msgid "You must be connected to the IRC server to perform a channel listing."
+msgstr "您必须要连接到 IRC 服务器上才能执行频道监听。"
+
+#: protocols/irc/ircaccount.cpp:82
+msgid "Kopete IRC Plugin %1 [http://kopete.kde.org]"
+msgstr "Kopete IRC 插件 %1 [http://kopete.kde.org]"
+
+#: protocols/irc/ircaccount.cpp:112
+msgid "Set Away"
+msgstr "设置离开"
+
+#: protocols/irc/ircaccount.cpp:176
+#, c-format
+msgid "Temporary Network - %1"
+msgstr "临时网络 - %1"
+
+#: protocols/irc/ircaccount.cpp:177
+msgid "Network imported from previous version of Kopete, or an IRC URI"
+msgstr "从 Kopete 先前版本导入的网络，或者 IRC URI"
+
+#: protocols/irc/ircaccount.cpp:210
+msgid "Join Channel..."
+msgstr "加入频道..."
+
+#: protocols/irc/ircaccount.cpp:212
+msgid "Search Channels..."
+msgstr "搜索频道..."
+
+#: protocols/irc/ircaccount.cpp:219
+msgid "Plugin Unloaded"
+msgstr "插件已卸载"
+
+#: protocols/irc/ircaccount.cpp:229
+msgid "The nickname %1 is already in use. Please enter an alternate nickname:"
+msgstr "昵称 %1 已在使用中。请输入备选的昵称："
+
+#: protocols/irc/ircaccount.cpp:246
+msgid "The nickname %1 is already in use"
+msgstr "昵称 %1 已在使用中"
+
+#: protocols/irc/ircaccount.cpp:308
 msgid ""
-"The resulting page will be formatted using the XHTML 1.0 Strict W3C "
-"Recommendation. The character set encoding is UTF-8.\n"
-"\n"
-"Note that some web browsers do not support XHTML. You should also make sure "
-"your web server serves it out with the correct mime type, such as "
-"application/xhtml+xml."
-msgstr ""
-"结果页面将使用 XHTML 1.0 Strict W3C 推荐标准格式化。字符集为 UTF-8。\n"
-"\n"
-"请注意，某些 Web 浏览器不支持 XHTML。您还应该确定您的 Web 服务器可以正确输出 MIME 类型，比如 "
-"application/xhtml+xml。"
+"<qt>The network associated with this account, <b>%1</b>"
+", no longer exists. Please ensure that the account has a valid network. The "
+"account will not be enabled until you do so.</qt>"
+msgstr "<qt>与此账户关联的网络 <b>%1</b> 不再存在。请确定账户的网络有效。直到您确认网络之后，此账户才会启用。</qt>"
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 143
-#: rc.cpp:1564
-#, no-c-format
-msgid "&XML"
-msgstr "&XML"
+#: protocols/irc/ircaccount.cpp:310
+#, c-format
+msgid "Problem Loading %1"
+msgstr "装入 %1 出现问题"
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 146
-#: rc.cpp:1567
-#, no-c-format
-msgid "Save the output in XML format using UTF-8 character set."
-msgstr "使用 UTF-8 字符集将结果以 XML 格式保存。"
+#: protocols/irc/ircaccount.cpp:429
+msgid "Show Server Window"
+msgstr "显示服务器窗口"
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 149
-#: rc.cpp:1570
-#, no-c-format
-msgid "Save the output in XML format using the UTF-8 encoding."
-msgstr "使用 UTF-8 编码将结果以 XML 格式保存。"
+#: protocols/irc/ircaccount.cpp:433
+msgid "Show Security Information"
+msgstr "显示安全信息"
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 157
-#: rc.cpp:1573
-#, no-c-format
-msgid "XML transformation &using this XSLT sheet:"
-msgstr "使用此 XSLT 样式表转换 XML(&U)："
+#: protocols/irc/ircaccount.cpp:458
+msgid ""
+"<qt>The network associated with this account, <b>%1</b>"
+", has no valid hosts. Please ensure that the account has a valid network.</qt>"
+msgstr "<qt>与此账户关联的网络 <b>%1</b> 没有有效的主机。请确定账户的网络有效。</qt>"
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 200
-#: rc.cpp:1576
-#, no-c-format
-msgid "Repla&ce protocol text with images in (X)HTML"
-msgstr "在 (X)HTML 中将协议文本替换为图像(&C)"
+#: protocols/irc/ircaccount.cpp:459
+msgid "Network is Empty"
+msgstr "网络为空"
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 203
-#: rc.cpp:1579
-#, no-c-format
-msgid "Replaces the protocol names, such as MSN and IRC with images."
-msgstr "将协议名称(如 MSN、IRC)替换为图像。"
+#: protocols/irc/ircaccount.cpp:465
+msgid ""
+"<qt>Kopete could not connect to any of the servers in the network associated "
+"with this account (<b>%1</b>). Please try again later.</qt>"
+msgstr "<qt>Kopete 无法连接到与此账户(<b>%1</b>)关联的网络。请稍后再试。</qt>"
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 220
-#: rc.cpp:1582
-#, no-c-format
+#: protocols/irc/ircaccount.cpp:466
+msgid "Network is Unavailable"
+msgstr "网络不可用"
+
+#: protocols/irc/ircaccount.cpp:493
+msgid "Connecting to %1..."
+msgstr "正在连接到 %1..."
+
+#: protocols/irc/ircaccount.cpp:495
+msgid "Using SSL"
+msgstr "使用 SSL"
+
+#: protocols/irc/ircaccount.cpp:590
+msgid "The IRC server is currently too busy to respond to this request."
+msgstr "IRC 目前正忙，无法响应此请求。"
+
+#: protocols/irc/ircaccount.cpp:591
+msgid "Server is Busy"
+msgstr "服务器忙"
+
+#: protocols/irc/ircaccount.cpp:600
+#, c-format
+msgid "Channel List for %1"
+msgstr "%1 的频道列表"
+
+#: protocols/irc/ircaccount.cpp:698
+msgid "\"You are not allowed to add yourself to your contact list."
+msgstr "您不能将您自己添加到您的联系人列表中。"
+
+#: protocols/irc/ircaccount.cpp:751
+msgid "Please enter name of the channel you want to join:"
+msgstr "请输入您想要加入的频道名称："
+
+#: protocols/irc/ircaccount.cpp:792
+msgid "CTCP %1 REPLY: %2"
+msgstr "CTCP %1 REPLY：%2"
+
+#: protocols/irc/ircaccount.cpp:798
+msgid "The channel \"%1\" does not exist"
+msgstr "频道“%1”不存在"
+
+#: protocols/irc/ircaccount.cpp:800
+msgid "The nickname \"%1\" does not exist"
+msgstr "昵称“%1”不存在"
+
+#: protocols/irc/ircaddcontactpage.cpp:74
+msgid "<qt>You need to specify a channel to join, or query to open.</qt>"
+msgstr "<qt>您需要指定要加入的聊天室，或要打开的查询。</qt>"
+
+#: protocols/irc/ircaddcontactpage.cpp:74
+msgid "You Must Specify a Channel"
+msgstr "您必须指定一个聊天室"
+
+#: protocols/irc/libkirc/kirctransfer.cpp:359
+msgid "Acknowledge size is greater than the expected file size"
+msgstr "承认的大小比期待的文件大小要大"
+
+#: protocols/irc/libkirc/ksslsocket.cpp:371
 msgid ""
-"Replaces the protocol names, such as MSN and IRC with images.\n"
-"\n"
-"Note that you have to manually copy the PNG files into place.\n"
-"\n"
-"The following files are used by default:\n"
-"\n"
-"images/msn_protocol.png\n"
-"images/icq_protocol.png\n"
-"images/jabber_protocol.png\n"
-"images/yahoo_protocol.png\n"
-"images/aim_protocol.png\n"
-"images/irc_protocol.png\n"
-"images/sms_protocol.png\n"
-"images/gadu_protocol.png\n"
-"images/winpopup_protocol.png"
-msgstr ""
-"将协议名称(如 MSN 和 IRC)替换为图像。\n"
-"\n"
-"请注意，您必须手动复制 PNG 文件至正确的位置。\n"
-"\n"
-"默认使用下列文件：\n"
-"\n"
-"images/msn_protocol.png\n"
-"images/icq_protocol.png\n"
-"images/jabber_protocol.png\n"
-"images/yahoo_protocol.png\n"
-"images/aim_protocol.png\n"
-"images/irc_protocol.png\n"
-"images/sms_protocol.png\n"
-"images/gadu_protocol.png\n"
-"images/winpopup_protocol.png"
+"The IP address of the host %1 does not match the one the certificate was issued "
+"to."
+msgstr "主机 %1 的 IP 地址与证书发行时的地址不同。"
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 230
-#: rc.cpp:1599
-#, no-c-format
-msgid "Display Name"
-msgstr "显示名字"
+#: protocols/irc/libkirc/ksslsocket.cpp:376
+#: protocols/irc/libkirc/ksslsocket.cpp:386
+#: protocols/irc/libkirc/ksslsocket.cpp:407
+msgid "Server Authentication"
+msgstr "服务器身份验证"
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 247
-#: rc.cpp:1602
-#, no-c-format
-msgid "Use one of &your IM names"
-msgstr "使用您的即时通讯姓名(&Y)"
+#: protocols/irc/libkirc/ksslsocket.cpp:377
+#: protocols/irc/libkirc/ksslsocket.cpp:387
+msgid "&Details"
+msgstr "细节(&D)"
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 258
-#: rc.cpp:1605
-#, no-c-format
-msgid "Use another &name:"
-msgstr "使用其他姓名(&N)："
+#: protocols/irc/libkirc/ksslsocket.cpp:378
+#: protocols/irc/libkirc/ksslsocket.cpp:388
+msgid "Co&ntinue"
+msgstr "继续(&N)"
 
-#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 301
-#: rc.cpp:1608
+#: protocols/irc/libkirc/ksslsocket.cpp:382
+msgid "The server certificate failed the authenticity test (%1)."
+msgstr "服务器证书进行身份验证测试失败(%1)。"
+
+#: protocols/irc/libkirc/ksslsocket.cpp:404
+msgid ""
+"Would you like to accept this certificate forever without being prompted?"
+msgstr "您是否想要永远接收此证书，而不再提示？"
+
+#: protocols/irc/libkirc/ksslsocket.cpp:408
+msgid "&Forever"
+msgstr "永远(&F)"
+
+#: protocols/irc/libkirc/ksslsocket.cpp:409
+msgid "&Current Sessions Only"
+msgstr "只对当前会话(&C)"
+
+#. i18n: file ./plugins/translator/translatorprefsbase.ui line 38
+#: rc.cpp:9
 #, no-c-format
-msgid "Include &IM addresses"
-msgstr "包含即时通讯地址(&I)"
+msgid "Translation service:"
+msgstr "翻译服务："
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 17
-#: rc.cpp:1611
+#. i18n: file ./plugins/translator/translatorprefsbase.ui line 46
+#: rc.cpp:12
 #, no-c-format
-msgid "HighlighPrefsUI"
-msgstr "HighlighPrefsUI"
+msgid "Default native language:"
+msgstr "默认的母语："
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 36
-#: rc.cpp:1614
+#. i18n: file ./plugins/translator/translatorprefsbase.ui line 67
+#: rc.cpp:15
 #, no-c-format
-msgid "Available Filters"
-msgstr "可用的过滤器"
+msgid "Incoming Messages"
+msgstr "收到的消息"
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 69
-#: rc.cpp:1623
+#. i18n: file ./plugins/translator/translatorprefsbase.ui line 78
+#: rc.cpp:18 rc.cpp:30
 #, no-c-format
-msgid "Rename..."
-msgstr "重命名..."
+msgid "Do not translate"
+msgstr "不翻译"
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 75
-#: rc.cpp:1626
+#. i18n: file ./plugins/translator/translatorprefsbase.ui line 92
+#: rc.cpp:21 rc.cpp:33
 #, no-c-format
-msgid "Filters"
-msgstr "过滤器"
+msgid "Show the original message"
+msgstr "显示原始消息"
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 111
-#: rc.cpp:1629
+#. i18n: file ./plugins/translator/translatorprefsbase.ui line 106
+#: rc.cpp:24 rc.cpp:36
 #, no-c-format
-msgid "Criteria"
-msgstr "条件"
+msgid "Translate directly"
+msgstr "直接翻译"
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 130
-#: rc.cpp:1632
+#. i18n: file ./plugins/translator/translatorprefsbase.ui line 119
+#: rc.cpp:27
 #, no-c-format
-msgid "If the message contains:"
-msgstr "如果消息包含："
+msgid "Outgoing Messages"
+msgstr "送出的消息"
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 151
-#: rc.cpp:1635
+#. i18n: file ./plugins/translator/translatorprefsbase.ui line 166
+#: rc.cpp:39
 #, no-c-format
-msgid "Regular expression"
-msgstr "正则表达式"
+msgid "Show dialog before sending"
+msgstr "发送前显示对话框"
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 167
-#: protocols/gadu/gaducontact.cpp:204 rc.cpp:1638
+#. i18n: file ./plugins/addbookmarks/addbookmarksprefsui.ui line 24
+#: rc.cpp:42
 #, no-c-format
-msgid "Edit..."
-msgstr "编辑..."
+msgid "Use Subfolder for Each Contact"
+msgstr "为每个联系人使用子文件夹"
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 194
-#: rc.cpp:1641
+#. i18n: file ./plugins/addbookmarks/addbookmarksprefsui.ui line 38
+#: rc.cpp:45
 #, no-c-format
-msgid "Case sensitive"
-msgstr "区分大小写"
+msgid "Always"
+msgstr "总是"
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 212
-#: rc.cpp:1644
+#. i18n: file ./plugins/addbookmarks/addbookmarksprefsui.ui line 52
+#: rc.cpp:48 rc.cpp:109
 #, no-c-format
-msgid "Action"
-msgstr "动作"
+msgid "Never"
+msgstr "从不"
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 239
-#: rc.cpp:1647
+#. i18n: file ./plugins/addbookmarks/addbookmarksprefsui.ui line 66
+#: rc.cpp:51
 #, no-c-format
-msgid "Set the message importance to:"
-msgstr "将消息优先级设为："
+msgid "Onl&y the selected contacts"
+msgstr "仅对选中的联系人(&Y)"
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 245
-#: rc.cpp:1650
+#. i18n: file ./plugins/addbookmarks/addbookmarksprefsui.ui line 83
+#: rc.cpp:54
 #, no-c-format
-msgid "Low"
-msgstr "低"
+msgid "Not the selected contacts"
+msgstr "未选中的联系人"
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 250
-#: rc.cpp:1653
+#. i18n: file ./plugins/addbookmarks/addbookmarksprefsui.ui line 98
+#: rc.cpp:57
 #, no-c-format
-msgid "Normal"
-msgstr "普通"
+msgid "Add Bookmarks from Contacts Not In Your Contact List"
+msgstr "从不在您的联系人列表中的联系人处添加书签"
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 255
-#: rc.cpp:1656
+#. i18n: file ./plugins/motionautoaway/motionawayprefs.ui line 33
+#: rc.cpp:60
 #, no-c-format
-msgid "Highlight"
-msgstr "突出显示"
+msgid ""
+"<p>Motion Auto-Away can set you to be away automatically when it does not "
+"detect motion from your webcam or any video4linux device.</p> "
+"<p>It will put you online again when it detects you moving in front of the "
+"camera.</p>"
+msgstr ""
+"<p>自动离开功能可在您的摄像头或任何 video4linux 设备中无法检测到任何动作的时候自动将您设定为离开。</p>"
+"<p>当该插件检测到摄像头中重新出现动作的时候，还会自动将您转为在线。</p>"
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 302
-#: rc.cpp:1659
+#. i18n: file ./plugins/motionautoaway/motionawayprefs.ui line 55
+#: rc.cpp:63
 #, no-c-format
-msgid "Change the background color to:"
-msgstr "将背景色更改为："
+msgid "Video Settings"
+msgstr "视频设置"
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 353
-#: rc.cpp:1662
+#. i18n: file ./plugins/motionautoaway/motionawayprefs.ui line 74
+#: rc.cpp:66
 #, no-c-format
-msgid "Change the foreground color to:"
-msgstr "将前景色更改为："
+msgid "&Video4Linux device:"
+msgstr "&Video4Linux 设备："
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 404
-#: rc.cpp:1665
+#. i18n: file ./plugins/motionautoaway/motionawayprefs.ui line 102
+#: rc.cpp:69
 #, no-c-format
-msgid "Play a sound:"
-msgstr "播放声音："
+msgid "/dev/video0"
+msgstr "/dev/video0"
 
-#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 427
-#: rc.cpp:1668
+#. i18n: file ./plugins/motionautoaway/motionawayprefs.ui line 131
+#: rc.cpp:72
 #, no-c-format
-msgid "Raise window"
-msgstr "升起窗口"
+msgid "Away Settings"
+msgstr "离开设置"
 
-#. i18n: file ./plugins/cryptography/cryptographyuserkey_ui.ui line 24
-#: rc.cpp:1671
+#. i18n: file ./plugins/motionautoaway/motionawayprefs.ui line 150
+#: rc.cpp:75
 #, no-c-format
-msgid "PGP key:"
-msgstr "PGP 密钥："
+msgid "Become available when &detecting activity again"
+msgstr "再次检测到活动后就上线(&D)"
 
-#. i18n: file ./plugins/cryptography/cryptographyuserkey_ui.ui line 40
-#: rc.cpp:1674 rc.cpp:1692
+#. i18n: file ./plugins/motionautoaway/motionawayprefs.ui line 188
+#: rc.cpp:78
 #, no-c-format
-msgid "Select..."
-msgstr "选择..."
+msgid "&Become away after this many minutes of inactivity:"
+msgstr "不活动多少分钟后变成离开(&B)："
 
-#. i18n: file ./plugins/cryptography/cryptographyuserkey_ui.ui line 73
-#: rc.cpp:1680
+#. i18n: file ./plugins/motionautoaway/motionawayprefs.ui line 231
+#: rc.cpp:81 rc.cpp:103
 #, no-c-format
-msgid "TextLabel2"
-msgstr "TextLabel2"
+msgid "minutes"
+msgstr "分"
 
 #. i18n: file ./plugins/cryptography/cryptographyprefsbase.ui line 25
-#: rc.cpp:1689
+#: rc.cpp:84
 #, no-c-format
 msgid "Your private PGP key:"
 msgstr "您的 PGP 私钥："
 
+#. i18n: file ./plugins/cryptography/cryptographyprefsbase.ui line 33
+#: rc.cpp:87 rc.cpp:124
+#, no-c-format
+msgid "Select..."
+msgstr "选择..."
+
 #. i18n: file ./plugins/cryptography/cryptographyprefsbase.ui line 49
-#: rc.cpp:1695
+#: rc.cpp:90
 #, no-c-format
 msgid "Encrypt outgoing messages with this key"
 msgstr "用此密钥加密送出的消息"
 
 #. i18n: file ./plugins/cryptography/cryptographyprefsbase.ui line 53
-#: rc.cpp:1698
+#: rc.cpp:93
 #, no-c-format
 msgid ""
 "<qt>Check this box if you want to encrypt outgoing messages with this key, so "
@@ -5433,3270 +7362,3452 @@ msgstr ""
 "<b>警告：</b>这可能增加消息的大小，而且某些协议将会因为超长的缘故而拒绝发送您的消息。"
 
 #. i18n: file ./plugins/cryptography/cryptographyprefsbase.ui line 78
-#: rc.cpp:1702
+#: rc.cpp:97
 #, no-c-format
 msgid "Cache Passphrase"
 msgstr "缓存密码句"
 
 #. i18n: file ./plugins/cryptography/cryptographyprefsbase.ui line 89
-#: rc.cpp:1705
+#: rc.cpp:100
 #, no-c-format
 msgid "Until Kopete closes"
 msgstr "直到 Kopete 关闭"
 
-#. i18n: file ./plugins/cryptography/cryptographyprefsbase.ui line 130
-#: rc.cpp:1708 rc.cpp:1963
-#, no-c-format
-msgid "minutes"
-msgstr "分"
-
 #. i18n: file ./plugins/cryptography/cryptographyprefsbase.ui line 146
-#: rc.cpp:1711
+#: rc.cpp:106
 #, no-c-format
 msgid "For"
 msgstr "等"
 
-#. i18n: file ./plugins/cryptography/cryptographyprefsbase.ui line 154
-#: rc.cpp:1714 rc.cpp:1828
-#, no-c-format
-msgid "Never"
-msgstr "从不"
-
 #. i18n: file ./plugins/cryptography/cryptographyprefsbase.ui line 164
-#: rc.cpp:1717
+#: rc.cpp:112
 #, no-c-format
 msgid "Do not ask for the passphrase"
 msgstr "不询问密码句"
 
-#. i18n: file ./plugins/history/historyprefsui.ui line 17
-#: rc.cpp:1723
+#. i18n: file ./plugins/cryptography/cryptographyuserkey_ui.ui line 24
+#: rc.cpp:121
 #, no-c-format
-msgid "HistoryPrefsWidget"
-msgstr "HistoryPrefsWidget"
+msgid "PGP key:"
+msgstr "PGP 密钥："
 
-#. i18n: file ./plugins/history/historyprefsui.ui line 28
-#: rc.cpp:1726
+#. i18n: file ./plugins/cryptography/cryptographyuserkey_ui.ui line 73
+#: rc.cpp:130
 #, no-c-format
-msgid "Chat History"
-msgstr "聊天历史"
+msgid "TextLabel2"
+msgstr "TextLabel2"
 
-#. i18n: file ./plugins/history/historyprefsui.ui line 39
-#: rc.cpp:1729
+#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 17
+#: rc.cpp:133
 #, no-c-format
-msgid "Number of messages per page:"
-msgstr "每页显示的消息数："
+msgid "SMPPPDCS Preferences"
+msgstr "SMPPPDCS 首选项"
 
-#. i18n: file ./plugins/history/historyprefsui.ui line 42
-#: rc.cpp:1732
+#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 32
+#: rc.cpp:136
+#, no-c-format
+msgid "&Connection"
+msgstr "连接(&C)"
+
+#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 57
+#: rc.cpp:139
+#, no-c-format
+msgid "Method of Connection Status Detection"
+msgstr "连接状态检测方式"
+
+#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 74
+#: rc.cpp:142
+#, no-c-format
+msgid "&netstat - Standard method of connection status detection"
+msgstr "netstat - 连接状态检测的标准方式(&N)"
+
+#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 80
+#: rc.cpp:145
 #, no-c-format
 msgid ""
-"The number of messages that are shown when browsing history in the chat window"
-msgstr "在聊天窗口中浏览历史时所显示的消息数量"
+"Uses the netstat command to find a gateway; suitable on dial-up computers"
+msgstr "使用 netstat 命令查找网关；适合拨号计算机"
 
-#. i18n: file ./plugins/history/historyprefsui.ui line 59
-#: rc.cpp:1735
+#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 88
+#: rc.cpp:148
+#, no-c-format
+msgid "smpppd - Ad&vanced method of connection status detection"
+msgstr "smpppd - 连接状态检测的高级方式(&V)"
+
+#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 91
+#: rc.cpp:151
 #, no-c-format
 msgid ""
-"The number of message that are shown when borwsing history in the chat window"
-msgstr "在聊天窗口中浏览历史时所显示的消息数量"
+"Uses the smpppd on a gateway; suitable for a computer in a private network"
+msgstr "使用 smpppd 查找网关；适合位于私有网络中的计算机"
 
-#. i18n: file ./plugins/history/historyprefsui.ui line 67
-#: rc.cpp:1738
+#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 107
+#: rc.cpp:154
 #, no-c-format
-msgid "Color of messages:"
-msgstr "消息颜色："
+msgid "&Try to Detect Automatically"
+msgstr "试图自动检测(&T)"
 
-#. i18n: file ./plugins/history/historyprefsui.ui line 73
-#: rc.cpp:1741 rc.cpp:1744
+#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 110
+#: rc.cpp:157
 #, no-c-format
-msgid "Color of history messages in the chat window"
-msgstr "聊天窗口中历史消息的颜色"
+msgid "Tries to find an appropriate connection method"
+msgstr "尝试查找适当的连接方式"
 
-#. i18n: file ./plugins/history/historyprefsui.ui line 108
-#: rc.cpp:1747 rc.cpp:1753
+#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 142
+#: rc.cpp:160
 #, no-c-format
-msgid ""
-"This is the number of messages that will be added automatically in the chat "
-"window when opening a new chat."
-msgstr "这时当您打开一个新的聊天对话时，会被自动加入聊天窗口的历史消息的数量。"
+msgid "Location of the SMPPPD"
+msgstr "SMPPPD 的位置"
 
-#. i18n: file ./plugins/history/historyprefsui.ui line 116
-#: rc.cpp:1750
+#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 187
+#: rc.cpp:163
 #, no-c-format
-msgid "Number of messages to show:"
-msgstr "显示的消息数："
+msgid "Acco&unts"
+msgstr "账户(&U)"
 
-#. i18n: file ./plugins/history/historyprefsui.ui line 130
-#: rc.cpp:1756
+#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 218
+#: rc.cpp:166
 #, no-c-format
-msgid "Show chat history in new chats"
-msgstr "在新聊天窗口中显示聊天历史"
+msgid "Choose the accounts to ignore:"
+msgstr "选择要忽略的账户："
 
-#. i18n: file ./plugins/history/historyprefsui.ui line 136
-#: rc.cpp:1759
+#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 224
+#: rc.cpp:169 rc.cpp:774 rc.cpp:811 rc.cpp:1720
 #, no-c-format
-msgid ""
-"When a new chat is opened, automatically add the last few messages between you "
-"and that contact."
-msgstr "打开新聊天时，自动将您与该联系人的前几条消息添加进去。"
+msgid "Account"
+msgstr "账户"
 
-#. i18n: file ./plugins/history/historyviewer.ui line 55
-#: plugins/history/historydialog.cpp:572 rc.cpp:1765
+#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 16
+#: rc.cpp:172
 #, no-c-format
-msgid "Ready"
-msgstr "就绪"
+msgid "SMPPPDLocation"
+msgstr "SMPPPD 位置"
 
-#. i18n: file ./plugins/history/historyviewer.ui line 125
-#: plugins/history/historydialog.cpp:536 rc.cpp:1771
+#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 27
+#: rc.cpp:175 rc.cpp:2281 rc.cpp:2389 rc.cpp:3022 rc.cpp:3660 rc.cpp:3915
 #, no-c-format
-msgid "Se&arch"
-msgstr "搜索(&A)"
+msgid "Ser&ver:"
+msgstr "服务器(&V)："
 
-#. i18n: file ./plugins/history/historyviewer.ui line 179
-#: rc.cpp:1774
+#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 41
+#: rc.cpp:178
 #, no-c-format
-msgid "Date"
-msgstr "日期"
+msgid "localhost"
+msgstr "localhost"
 
-#. i18n: file ./plugins/history/historyviewer.ui line 275
-#: rc.cpp:1780
+#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 47
+#: rc.cpp:181
 #, no-c-format
-msgid "Contact:"
-msgstr "联系人："
+msgid "The server on which the SMPPPD is running"
+msgstr "SMPPPD 所运行的服务器"
 
-#. i18n: file ./plugins/history/historyviewer.ui line 296
-#: rc.cpp:1783
+#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 55
+#: rc.cpp:184 rc.cpp:2299
 #, no-c-format
-msgid "Message Filter:"
-msgstr "消息过滤："
+msgid "P&ort:"
+msgstr "端口(&O)："
 
-#. i18n: file ./plugins/history/historyviewer.ui line 302
-#: rc.cpp:1786
+#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 83
+#: rc.cpp:187
 #, no-c-format
-msgid "All messages"
-msgstr "全部消息"
+msgid "The port on which the SMPPPD is running on"
+msgstr "SMPPPD 所运行的端口"
 
-#. i18n: file ./plugins/history/historyviewer.ui line 307
-#: rc.cpp:1789
+#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 91
+#: rc.cpp:190
 #, no-c-format
-msgid "Only incoming"
-msgstr "仅收到"
+msgid "Default: 3185"
+msgstr "默认：3185"
 
-#. i18n: file ./plugins/history/historyviewer.ui line 312
-#: rc.cpp:1792
+#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 118
+#: rc.cpp:193 rc.cpp:2797
 #, no-c-format
-msgid "Only outgoing"
-msgstr "仅发出"
+msgid "Pass&word:"
+msgstr "密码(&W)："
+
+#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 135
+#: rc.cpp:196
+#, no-c-format
+msgid "The password to authenticate with the smpppd"
+msgstr "与 smpppd 进行身份验证的密码"
 
 #. i18n: file ./plugins/statistics/statisticswidget.ui line 36
-#: rc.cpp:1795
+#: rc.cpp:199
 #, no-c-format
 msgid "Ask &Database"
 msgstr "询问数据库(&D)"
 
 #. i18n: file ./plugins/statistics/statisticswidget.ui line 47
-#: rc.cpp:1798
+#: rc.cpp:202
 #, no-c-format
 msgid "Date && Time"
 msgstr "日期和时间"
 
 #. i18n: file ./plugins/statistics/statisticswidget.ui line 112
-#: rc.cpp:1801
+#: rc.cpp:205
 #, no-c-format
 msgid "Time :"
 msgstr "时间："
 
 #. i18n: file ./plugins/statistics/statisticswidget.ui line 167
-#: rc.cpp:1804
+#: rc.cpp:208
 #, no-c-format
 msgid "Question"
 msgstr "问题"
 
 #. i18n: file ./plugins/statistics/statisticswidget.ui line 184
-#: rc.cpp:1807
+#: rc.cpp:211
 #, no-c-format
 msgid "Contact Status at Date & Time"
 msgstr "指定日期和时间的联系人状态"
 
 #. i18n: file ./plugins/statistics/statisticswidget.ui line 189
-#: rc.cpp:1810
+#: rc.cpp:214
 #, no-c-format
 msgid "Most Used Status at Date"
 msgstr "指定日期的最常用状态"
 
 #. i18n: file ./plugins/statistics/statisticswidget.ui line 209
-#: rc.cpp:1813
+#: rc.cpp:217
 #, no-c-format
 msgid "&Ask"
 msgstr "询问(&A)"
 
 #. i18n: file ./plugins/statistics/statisticswidget.ui line 221
-#: rc.cpp:1816
+#: rc.cpp:220
 #, no-c-format
 msgid "Answer"
 msgstr "答案"
 
-#. i18n: file ./plugins/addbookmarks/addbookmarksprefsui.ui line 24
-#: rc.cpp:1822
+#. i18n: file ./plugins/latex/latexprefsbase.ui line 29
+#: rc.cpp:226
 #, no-c-format
-msgid "Use Subfolder for Each Contact"
-msgstr "为每个联系人使用子文件夹"
+msgid ""
+"<p>The <font size=\"+1\">KopeTeX</font> plugin allows <font size=\"+1\">"
+"Kopet</font>e to render Latex formulas in the chat window. The sender must "
+"enclose the formula between two $ signs. ie: $$formula$$</p>\n"
+"<p>This plugin requires ImageMagick convert program installed in order to "
+"work.</p>"
+msgstr ""
+"<p><font size=\"+1\">KopeTeX</font> 插件允许 <font size=\"+1\">Kopete</font> "
+"在聊天窗口中渲染 Latex 公式。服务器必须将公式包围在两个 $ 符号中即：$$formula$$</p>\n"
+"<p>要让此功能生效，您必须安装 ImageMagick 转换程序。</p>"
 
-#. i18n: file ./plugins/addbookmarks/addbookmarksprefsui.ui line 38
-#: rc.cpp:1825
+#. i18n: file ./plugins/latex/latexprefsbase.ui line 73
+#: rc.cpp:233
 #, no-c-format
-msgid "Always"
-msgstr "总是"
+msgid "Rendering resolution (DPI):"
+msgstr "渲染分辨率(DPI)："
 
-#. i18n: file ./plugins/addbookmarks/addbookmarksprefsui.ui line 66
-#: rc.cpp:1831
+#. i18n: file ./plugins/latex/latexprefsbase.ui line 113
+#: rc.cpp:236
 #, no-c-format
-msgid "Onl&y the selected contacts"
-msgstr "仅对选中的联系人(&Y)"
+msgid "x"
+msgstr "x"
 
-#. i18n: file ./plugins/addbookmarks/addbookmarksprefsui.ui line 83
-#: rc.cpp:1834
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 17
+#: rc.cpp:242
 #, no-c-format
-msgid "Not the selected contacts"
-msgstr "未选中的联系人"
+msgid "HighlighPrefsUI"
+msgstr "HighlighPrefsUI"
 
-#. i18n: file ./plugins/addbookmarks/addbookmarksprefsui.ui line 98
-#: rc.cpp:1837
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 36
+#: rc.cpp:245
 #, no-c-format
-msgid "Add Bookmarks from Contacts Not In Your Contact List"
-msgstr "从不在您的联系人列表中的联系人处添加书签"
+msgid "Available Filters"
+msgstr "可用的过滤器"
 
-#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 16
-#: rc.cpp:1840
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 69
+#: rc.cpp:254
 #, no-c-format
-msgid "SMPPPDLocation"
-msgstr "SMPPPD 位置"
+msgid "Rename..."
+msgstr "重命名..."
 
-#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 27
-#: rc.cpp:1843 rc.cpp:3376 rc.cpp:4088 rc.cpp:4199 rc.cpp:4572 rc.cpp:5111
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 75
+#: rc.cpp:257
 #, no-c-format
-msgid "Ser&ver:"
-msgstr "服务器(&V)："
+msgid "Filters"
+msgstr "过滤器"
 
-#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 41
-#: rc.cpp:1846
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 111
+#: rc.cpp:260
 #, no-c-format
-msgid "localhost"
-msgstr "localhost"
+msgid "Criteria"
+msgstr "条件"
 
-#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 47
-#: rc.cpp:1849
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 130
+#: rc.cpp:263
 #, no-c-format
-msgid "The server on which the SMPPPD is running"
-msgstr "SMPPPD 所运行的服务器"
+msgid "If the message contains:"
+msgstr "如果消息包含："
 
-#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 55
-#: rc.cpp:1852 rc.cpp:4106
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 151
+#: rc.cpp:266
 #, no-c-format
-msgid "P&ort:"
-msgstr "端口(&O)："
+msgid "Regular expression"
+msgstr "正则表达式"
 
-#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 83
-#: rc.cpp:1855
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 194
+#: rc.cpp:272
 #, no-c-format
-msgid "The port on which the SMPPPD is running on"
-msgstr "SMPPPD 所运行的端口"
+msgid "Case sensitive"
+msgstr "区分大小写"
 
-#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 91
-#: rc.cpp:1858
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 212
+#: rc.cpp:275
 #, no-c-format
-msgid "Default: 3185"
-msgstr "默认：3185"
+msgid "Action"
+msgstr "动作"
 
-#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 118
-#: rc.cpp:1861 rc.cpp:4473
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 239
+#: rc.cpp:278
 #, no-c-format
-msgid "Pass&word:"
-msgstr "密码(&W)："
+msgid "Set the message importance to:"
+msgstr "将消息优先级设为："
 
-#. i18n: file ./plugins/smpppdcs/smpppdlocationui.ui line 135
-#: rc.cpp:1864
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 245
+#: rc.cpp:281
 #, no-c-format
-msgid "The password to authenticate with the smpppd"
-msgstr "与 smpppd 进行身份验证的密码"
+msgid "Low"
+msgstr "低"
 
-#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 17
-#: rc.cpp:1867
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 250
+#: rc.cpp:284
 #, no-c-format
-msgid "SMPPPDCS Preferences"
-msgstr "SMPPPDCS 首选项"
+msgid "Normal"
+msgstr "普通"
 
-#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 32
-#: rc.cpp:1870
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 255
+#: rc.cpp:287
 #, no-c-format
-msgid "&Connection"
-msgstr "连接(&C)"
+msgid "Highlight"
+msgstr "突出显示"
 
-#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 57
-#: rc.cpp:1873
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 302
+#: rc.cpp:290
 #, no-c-format
-msgid "Method of Connection Status Detection"
-msgstr "连接状态检测方式"
+msgid "Change the background color to:"
+msgstr "将背景色更改为："
 
-#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 74
-#: rc.cpp:1876
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 353
+#: rc.cpp:293
 #, no-c-format
-msgid "&netstat - Standard method of connection status detection"
-msgstr "netstat - 连接状态检测的标准方式(&N)"
+msgid "Change the foreground color to:"
+msgstr "将前景色更改为："
 
-#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 80
-#: rc.cpp:1879
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 404
+#: rc.cpp:296
+#, no-c-format
+msgid "Play a sound:"
+msgstr "播放声音："
+
+#. i18n: file ./plugins/highlight/highlightprefsbase.ui line 427
+#: rc.cpp:299
+#, no-c-format
+msgid "Raise window"
+msgstr "升起窗口"
+
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 16
+#: rc.cpp:305
+#, no-c-format
+msgid "Now Listening"
+msgstr "正在收听"
+
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 33
+#: rc.cpp:308
+#, no-c-format
+msgid "<b>Share Your Musical Taste</b>"
+msgstr "<b>分享您的音乐品味</b>"
+
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 59
+#: rc.cpp:311
+#, no-c-format
+msgid "Messa&ge"
+msgstr "消息(&G)"
+
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 78
+#: rc.cpp:314
+#, no-c-format
+msgid "Use this message when advertising:"
+msgstr "广告时使用如下消息："
+
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 87
+#: rc.cpp:317
 #, no-c-format
 msgid ""
-"Uses the netstat command to find a gateway; suitable on dial-up computers"
-msgstr "使用 netstat 命令查找网关；适合拨号计算机"
+"%track, %artist, %album, %player will be substituted if known.\n"
+"Expressions in brackets depend on a substitution being made."
+msgstr ""
+"%track, %artist, %album, %player 如果已知的话会被替换。\n"
+"括号里的表达式依靠实际作出的替换。"
 
-#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 88
-#: rc.cpp:1882
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 106
+#: rc.cpp:321
 #, no-c-format
-msgid "smpppd - Ad&vanced method of connection status detection"
-msgstr "smpppd - 连接状态检测的高级方式(&V)"
+msgid "Start with:"
+msgstr "开始于："
 
-#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 91
-#: rc.cpp:1885
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 120
+#: rc.cpp:324
+#, no-c-format
+msgid "Now Listening To: "
+msgstr "正在收听： "
+
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 128
+#: rc.cpp:327
+#, no-c-format
+msgid "For each track:"
+msgstr "对每一轨道："
+
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 142
+#: rc.cpp:330
+#, no-c-format
+msgid "%track (by %artist)(on %album)"
+msgstr "%track (表演 %artist)(专辑 %album)"
+
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 150
+#: rc.cpp:333
+#, no-c-format
+msgid "Conjunction (if >1 track):"
+msgstr "连接(如果 >1 轨道)："
+
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 164
+#: rc.cpp:336
+#, no-c-format
+msgid ", and "
+msgstr "，和 "
+
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 195
+#: rc.cpp:339
+#, no-c-format
+msgid "A&dvertising Mode"
+msgstr "广告模式(&D)"
+
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 222
+#: rc.cpp:342
 #, no-c-format
 msgid ""
-"Uses the smpppd on a gateway; suitable for a computer in a private network"
-msgstr "使用 smpppd 查找网关；适合位于私有网络中的计算机"
+"Explicit &via \"Tools->Send Media Info\",\n"
+"or by typing \"/media\" in the chat\n"
+"window edit area."
+msgstr ""
+"选择“工具->发送媒体信息”，或者在聊天窗口\n"
+"编辑区域中输入“/media”时才使用(&V)。"
 
-#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 107
-#: rc.cpp:1888
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 230
+#: rc.cpp:347
 #, no-c-format
-msgid "&Try to Detect Automatically"
-msgstr "试图自动检测(&T)"
+msgid "&Show in chat window (automatic)"
+msgstr "显示于聊天窗口(自动)(&S)"
 
-#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 110
-#: rc.cpp:1891
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 239
+#: rc.cpp:350
 #, no-c-format
-msgid "Tries to find an appropriate connection method"
-msgstr "尝试查找适当的连接方式"
+msgid ""
+"Show &the music you are listening to \n"
+"in place of your status message."
+msgstr "在您的状态消息中显示您正在收听的音乐(&T)。"
 
-#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 142
-#: rc.cpp:1894
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 247
+#: rc.cpp:354
 #, no-c-format
-msgid "Location of the SMPPPD"
-msgstr "SMPPPD 的位置"
+msgid "Appe&nd to your status message"
+msgstr "追到您的状态消息(&N)"
 
-#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 187
-#: rc.cpp:1897
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 276
+#: rc.cpp:357
 #, no-c-format
-msgid "Acco&unts"
-msgstr "账户(&U)"
+msgid "Media Pla&yer"
+msgstr "媒体播放机(&Y)"
 
-#. i18n: file ./plugins/smpppdcs/smpppdcsprefs.ui line 218
-#: rc.cpp:1900
+#. i18n: file ./plugins/nowlistening/nowlisteningprefs.ui line 295
+#: rc.cpp:360
 #, no-c-format
-msgid "Choose the accounts to ignore:"
-msgstr "选择要忽略的账户："
+msgid "Use &specified media player"
+msgstr "使用指定的媒体播放机(&S)"
 
 #. i18n: file ./plugins/autoreplace/autoreplaceprefs.ui line 25
-#: rc.cpp:1906
+#: rc.cpp:363
 #, no-c-format
 msgid "Sentence Options"
 msgstr "语句选项"
 
 #. i18n: file ./plugins/autoreplace/autoreplaceprefs.ui line 36
-#: rc.cpp:1909
+#: rc.cpp:366
 #, no-c-format
 msgid "Add a dot at the end of each sent line"
 msgstr "在送出的每一行后加句点"
 
 #. i18n: file ./plugins/autoreplace/autoreplaceprefs.ui line 44
-#: rc.cpp:1912
+#: rc.cpp:369
 #, no-c-format
 msgid "Start each sent line with a capital letter"
 msgstr "送出的每一行都用大写字母开头"
 
 #. i18n: file ./plugins/autoreplace/autoreplaceprefs.ui line 54
-#: rc.cpp:1915
+#: rc.cpp:372
 #, no-c-format
 msgid "Replacement Options"
 msgstr "替换选项"
 
 #. i18n: file ./plugins/autoreplace/autoreplaceprefs.ui line 65
-#: rc.cpp:1918
+#: rc.cpp:375
 #, no-c-format
 msgid "Auto replace on incoming messages"
 msgstr "自动替换收到的消息"
 
 #. i18n: file ./plugins/autoreplace/autoreplaceprefs.ui line 73
-#: rc.cpp:1921
+#: rc.cpp:378
 #, no-c-format
 msgid "Auto replace on outgoing messages"
 msgstr "自动替换送出的消息"
 
 #. i18n: file ./plugins/autoreplace/autoreplaceprefs.ui line 86
-#: rc.cpp:1924
+#: rc.cpp:381
 #, no-c-format
 msgid "Replacements List"
 msgstr "替换列表"
 
-#. i18n: file ./plugins/autoreplace/autoreplaceprefs.ui line 108
-#: plugins/alias/aliaspreferences.cpp:326
-#: protocols/oscar/oscarlistnonservercontacts.cpp:33 rc.cpp:1927 rc.cpp:5177
-#, no-c-format
-msgid "&Add"
-msgstr "添加(&A)"
-
 #. i18n: file ./plugins/autoreplace/autoreplaceprefs.ui line 171
-#: rc.cpp:1936
+#: rc.cpp:393
 #, no-c-format
 msgid "Te&xt:"
 msgstr "文字(&X)："
 
 #. i18n: file ./plugins/autoreplace/autoreplaceprefs.ui line 187
-#: rc.cpp:1939
+#: rc.cpp:396
 #, no-c-format
 msgid "Re&placement:"
 msgstr "替换(&P)："
 
-#. i18n: file ./plugins/motionautoaway/motionawayprefs.ui line 33
-#: rc.cpp:1942
+#. i18n: file ./plugins/alias/aliasdialog.ui line 16
+#: rc.cpp:399
 #, no-c-format
-msgid ""
-"<p>Motion Auto-Away can set you to be away automatically when it does not "
-"detect motion from your webcam or any video4linux device.</p> "
-"<p>It will put you online again when it detects you moving in front of the "
-"camera.</p>"
-msgstr ""
-"<p>自动离开功能可在您的摄像头或任何 video4linux 设备中无法检测到任何动作的时候自动将您设定为离开。</p>"
-"<p>当该插件检测到摄像头中重新出现动作的时候，还会自动将您转为在线。</p>"
+msgid "Add New Alias"
+msgstr "添加新别名"
 
-#. i18n: file ./plugins/motionautoaway/motionawayprefs.ui line 55
-#: rc.cpp:1945
+#. i18n: file ./plugins/alias/aliasdialog.ui line 27
+#: rc.cpp:402
 #, no-c-format
-msgid "Video Settings"
-msgstr "视频设置"
+msgid "Command:"
+msgstr "命令："
 
-#. i18n: file ./plugins/motionautoaway/motionawayprefs.ui line 74
-#: rc.cpp:1948
+#. i18n: file ./plugins/alias/aliasdialog.ui line 38
+#: rc.cpp:405
 #, no-c-format
-msgid "&Video4Linux device:"
-msgstr "&Video4Linux 设备："
+msgid "This is the command that you want to run when you execute this alias. "
+msgstr "当您执行此别名时，要运行这个命令。 "
 
-#. i18n: file ./plugins/motionautoaway/motionawayprefs.ui line 102
-#: rc.cpp:1951
+#. i18n: file ./plugins/alias/aliasdialog.ui line 45
+#: rc.cpp:408
 #, no-c-format
-msgid "/dev/video0"
-msgstr "/dev/video0"
+msgid ""
+"<qt>This is the command that you want to run when you execute this alias.\n"
+"\n"
+"You can use the variables <b>%1, %2 ... %9</b> in your command, and they will "
+"be replaced with the arguments of the alias. The variable <b>%s</b> "
+"will be replaced with all arguments. <b>%n</b> expands to your nickname.\n"
+"\n"
+"Do not include the '/' in the command (if you do it will be stripped off "
+"anyway).</qt>"
+msgstr ""
+"<qt>这是当您执行此别名时想要运行的命令。\n"
+"\n"
+"您可以在命令中使用变量 <b>%1，%2……%9</b>，这些变量将会被替换为别名的参数。变量 <b>%s</b> 将被替换为全部参数。<b>%n</b> "
+"将被替换为您的昵称。\n"
+"\n"
+"请不要再命令中包含“/”(就算您写上了，这个字符也会被剔除)</qt>"
 
-#. i18n: file ./plugins/motionautoaway/motionawayprefs.ui line 131
-#: rc.cpp:1954
+#. i18n: file ./plugins/alias/aliasdialog.ui line 53
+#: rc.cpp:415
 #, no-c-format
-msgid "Away Settings"
-msgstr "离开设置"
+msgid "Alias:"
+msgstr "别名："
 
-#. i18n: file ./plugins/motionautoaway/motionawayprefs.ui line 150
-#: rc.cpp:1957
+#. i18n: file ./plugins/alias/aliasdialog.ui line 64
+#: rc.cpp:418
 #, no-c-format
-msgid "Become available when &detecting activity again"
-msgstr "再次检测到活动后就上线(&D)"
+msgid ""
+"This is the alias you are adding (what you will type after the command "
+"identifier, '/')."
+msgstr "这是您正在添加的别名(您在命令标识符“/”后输入的文字)。"
 
-#. i18n: file ./plugins/motionautoaway/motionawayprefs.ui line 188
-#: rc.cpp:1960
+#. i18n: file ./plugins/alias/aliasdialog.ui line 67
+#: rc.cpp:421
 #, no-c-format
-msgid "&Become away after this many minutes of inactivity:"
-msgstr "不活动多少分钟后变成离开(&B)："
+msgid ""
+"This is the alias you are adding (what you will type after the command "
+"identifier, '/'). Do not include the '/' (it will be stripped off if you do "
+"anyway)."
+msgstr "这是您正在添加的别名(您在命令标识符“/”后输入的文字)。请不要包含“/”(就算您写上了，这个字符也会被剔除)。"
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 16
-#: rc.cpp:1969
+#. i18n: file ./plugins/alias/aliasdialog.ui line 92
+#: rc.cpp:430 rc.cpp:448
 #, no-c-format
-msgid "Network Configuration"
-msgstr "网络配置"
+msgid "Protocols"
+msgstr "协议"
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 40
-#: rc.cpp:1972
+#. i18n: file ./plugins/alias/aliasdialog.ui line 123
+#: rc.cpp:433 rc.cpp:436
 #, no-c-format
-msgid "&Description:"
-msgstr "描述(&D)："
+msgid ""
+"If you want this alias to only be active for certain protocols, select those "
+"protocols here."
+msgstr "如果您想要此别名仅对特定协议激活，请在此选择协议。"
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 62
-#: rc.cpp:1975
+#. i18n: file ./plugins/alias/aliasdialog.ui line 137
+#: rc.cpp:439
 #, no-c-format
-msgid "Host Con&figuration"
-msgstr "主机配置(&F)"
+msgid "For protocols:"
+msgstr "针对协议："
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 81
-#: rc.cpp:1978
+#. i18n: file ./plugins/alias/aliasdialogbase.ui line 22
+#: rc.cpp:442
 #, no-c-format
-msgid "The IRC servers associated with this network"
-msgstr "与此网站关联的 IRC 服务器"
+msgid "Alias"
+msgstr "别名"
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 84
-#: rc.cpp:1981
+#. i18n: file ./plugins/alias/aliasdialogbase.ui line 33
+#: rc.cpp:445 rc.cpp:4956
 #, no-c-format
-msgid ""
-"The IRC servers associated with this network. Use the up and down buttons to "
-"alter the order in which connections are attempted."
-msgstr "与此网络关联的 IRC 服务器。使用上下按钮可切换连接尝试的顺序。"
+msgid "Command"
+msgstr "命令"
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 95
-#: rc.cpp:1984
+#. i18n: file ./plugins/alias/aliasdialogbase.ui line 69
+#: rc.cpp:451
 #, no-c-format
-msgid "Most IRC servers do not require a password"
-msgstr "大多数 IRC 服务器不需要密码"
+msgid ""
+"This is the list of custom aliases and the commands that you have already added"
+msgstr "这是您已经添加的自定义别名和命令列表"
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 103
-#: rc.cpp:1987 rc.cpp:4646
+#. i18n: file ./plugins/alias/aliasdialogbase.ui line 77
+#: rc.cpp:454
 #, no-c-format
-msgid "Por&t:"
-msgstr "端口(&T)："
+msgid "&Add New Alias..."
+msgstr "添加新别名(&A)..."
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 139
-#: rc.cpp:1993
+#. i18n: file ./plugins/alias/aliasdialogbase.ui line 85
+#: rc.cpp:457
 #, no-c-format
-msgid "&Host:"
-msgstr "主机(&H)："
+msgid "&Delete Selected"
+msgstr "删除选中(&D)"
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 161
-#: rc.cpp:1996
+#. i18n: file ./plugins/alias/aliasdialogbase.ui line 93
+#: rc.cpp:460
 #, no-c-format
-msgid "Use SS&L"
-msgstr "使用 SSL(&L)"
+msgid "Edit Alias..."
+msgstr "编辑别名..."
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 164
-#: rc.cpp:1999
+#. i18n: file ./plugins/history/historyviewer.ui line 179
+#: rc.cpp:472
 #, no-c-format
-msgid "Check this to enable SSL for this connection"
-msgstr "选中此框将启用此连接的 SSL"
+msgid "Date"
+msgstr "日期"
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 224
-#: rc.cpp:2008
+#. i18n: file ./plugins/history/historyviewer.ui line 190
+#: rc.cpp:475 rc.cpp:965
 #, no-c-format
-msgid "Down"
-msgstr "下移"
+msgid "Contact"
+msgstr "联系人"
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 227
-#: rc.cpp:2011
+#. i18n: file ./plugins/history/historyviewer.ui line 275
+#: rc.cpp:478
 #, no-c-format
-msgid "Move this server down"
-msgstr "将此服务器下移"
+msgid "Contact:"
+msgstr "联系人："
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 230
-#: rc.cpp:2014
+#. i18n: file ./plugins/history/historyviewer.ui line 296
+#: rc.cpp:481
 #, no-c-format
-msgid "Move this server down in connection attempt priority"
-msgstr "将此服务器下移，以便降低尝试优先级"
+msgid "Message Filter:"
+msgstr "消息过滤："
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 258
-#: rc.cpp:2017
+#. i18n: file ./plugins/history/historyviewer.ui line 302
+#: rc.cpp:484
 #, no-c-format
-msgid "Up"
-msgstr "上移"
+msgid "All messages"
+msgstr "全部消息"
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 261
-#: rc.cpp:2020
+#. i18n: file ./plugins/history/historyviewer.ui line 307
+#: rc.cpp:487
 #, no-c-format
-msgid "Move this server up"
-msgstr "将此服务器上移"
+msgid "Only incoming"
+msgstr "仅收到"
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 264
-#: rc.cpp:2023
+#. i18n: file ./plugins/history/historyviewer.ui line 312
+#: rc.cpp:490
 #, no-c-format
-msgid "Move this server up in connection attempt priority"
-msgstr "将此服务器上移，以便提高尝试优先级"
+msgid "Only outgoing"
+msgstr "仅发出"
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 290
-#: rc.cpp:2032
+#. i18n: file ./plugins/history/historyprefsui.ui line 17
+#: rc.cpp:493
 #, no-c-format
-msgid "Ne&w"
-msgstr "新建(&W)"
+msgid "HistoryPrefsWidget"
+msgstr "HistoryPrefsWidget"
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 328
-#: rc.cpp:2035
+#. i18n: file ./plugins/history/historyprefsui.ui line 28
+#: rc.cpp:496
 #, no-c-format
-msgid "Rena&me..."
-msgstr "重命名(&M)..."
+msgid "Chat History"
+msgstr "聊天历史"
 
-#. i18n: file ./protocols/irc/ui/networkconfig.ui line 336
-#: rc.cpp:2038
+#. i18n: file ./plugins/history/historyprefsui.ui line 39
+#: rc.cpp:499
 #, no-c-format
-msgid "Remo&ve"
-msgstr "删除(&V)"
+msgid "Number of messages per page:"
+msgstr "每页显示的消息数："
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 50
-#: rc.cpp:2041 rc.cpp:2653 rc.cpp:3063 rc.cpp:4166 rc.cpp:5084
+#. i18n: file ./plugins/history/historyprefsui.ui line 42
+#: rc.cpp:502
 #, no-c-format
-msgid "B&asic Setup"
-msgstr "基本设置(&A)"
+msgid ""
+"The number of messages that are shown when browsing history in the chat window"
+msgstr "在聊天窗口中浏览历史时所显示的消息数量"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 92
-#: rc.cpp:2044
+#. i18n: file ./plugins/history/historyprefsui.ui line 59
+#: rc.cpp:505
 #, no-c-format
 msgid ""
-"<p><b>Note:</b> Most IRC servers do not require a password, and only a nickname "
-"is required to connect</p>"
-msgstr "<p><b>注意：</b>大多数 IRC 服务器不需要密码，连接时只需要您选择的昵称</p>"
+"The number of message that are shown when borwsing history in the chat window"
+msgstr "在聊天窗口中浏览历史时所显示的消息数量"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 109
-#: rc.cpp:2047 rc.cpp:2335 rc.cpp:2656 rc.cpp:3066 rc.cpp:3331 rc.cpp:4037
-#: rc.cpp:4169 rc.cpp:4500 rc.cpp:4890 rc.cpp:5087
+#. i18n: file ./plugins/history/historyprefsui.ui line 67
+#: rc.cpp:508
 #, no-c-format
-msgid "Account Information"
-msgstr "账户信息"
+msgid "Color of messages:"
+msgstr "消息颜色："
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 120
-#: rc.cpp:2050 rc.cpp:2929
+#. i18n: file ./plugins/history/historyprefsui.ui line 73
+#: rc.cpp:511 rc.cpp:514
 #, no-c-format
-msgid "N&ickname:"
-msgstr "昵称(&I)："
+msgid "Color of history messages in the chat window"
+msgstr "聊天窗口中历史消息的颜色"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 126
-#: rc.cpp:2053 rc.cpp:2062
+#. i18n: file ./plugins/history/historyprefsui.ui line 108
+#: rc.cpp:517 rc.cpp:523
 #, no-c-format
-msgid "This is the name that everyone will see everytime you say something"
-msgstr "这是别人看到的您的名字"
+msgid ""
+"This is the number of messages that will be added automatically in the chat "
+"window when opening a new chat."
+msgstr "这时当您打开一个新的聊天对话时，会被自动加入聊天窗口的历史消息的数量。"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 134
-#: rc.cpp:2056
+#. i18n: file ./plugins/history/historyprefsui.ui line 116
+#: rc.cpp:520
 #, no-c-format
-msgid "Alternate ni&ckname:"
-msgstr "备选昵称(&C)："
+msgid "Number of messages to show:"
+msgstr "显示的消息数："
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 140
-#: rc.cpp:2059 rc.cpp:2068 rc.cpp:2071
+#. i18n: file ./plugins/history/historyprefsui.ui line 130
+#: rc.cpp:526
 #, no-c-format
-msgid ""
-"When the nickname is already in use when connecting, this name will be used "
-"instead"
-msgstr "如果连接时昵称已经被使用了，将会换用此名称"
+msgid "Show chat history in new chats"
+msgstr "在新聊天窗口中显示聊天历史"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 159
-#: rc.cpp:2065
+#. i18n: file ./plugins/history/historyprefsui.ui line 136
+#: rc.cpp:529
 #, no-c-format
 msgid ""
-"The alias you would like to use on IRC.  You may change this once online with "
-"the /nick command."
-msgstr "您想要在 IRC 中使用的别名。只要上线后，您就可以使用 /nick 命令更改别名。"
+"When a new chat is opened, automatically add the last few messages between you "
+"and that contact."
+msgstr "打开新聊天时，自动将您与该联系人的前几条消息添加进去。"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 183
-#: rc.cpp:2074
+#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 35
+#: rc.cpp:538
 #, no-c-format
-msgid "&Real name:"
-msgstr "真实姓名(&R)："
+msgid "&Colors"
+msgstr "颜色(&C)"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 194
-#: rc.cpp:2077
+#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 46
+#: rc.cpp:541 rc.cpp:1461
 #, no-c-format
-msgid "&Username:"
-msgstr "用户名(&U)："
+msgid "Colors"
+msgstr "颜色"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 200
-#: rc.cpp:2080 rc.cpp:2083 rc.cpp:2086 rc.cpp:2092
+#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 62
+#: rc.cpp:544
 #, no-c-format
-msgid ""
-"The username you would prefer to use on IRC, if your system does not have "
-"identd support.  Leave blank to use your system account name."
-msgstr "您在 IRC 中想要使用的用户名，如果您的系统不支持 identd 的话。留空则是用您的系统账户名。"
+msgid "&Add..."
+msgstr "添加(&A)..."
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 241
-#: rc.cpp:2089
+#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 78
+#: rc.cpp:550
 #, no-c-format
-msgid ""
-"The username you would prefer to use on IRC, if your system does not have "
-"identd support."
-msgstr "您在 IRC 中想要使用的用户名，如果您的系统不支持 identd 的话。"
+msgid "Move &Up"
+msgstr "上移(&U)"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 256
-#: rc.cpp:2095 rc.cpp:4193
+#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 86
+#: rc.cpp:553
 #, no-c-format
-msgid "Connection"
-msgstr "连接"
+msgid "Move &Down"
+msgstr "下移(&D)"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 323
-#: rc.cpp:2098
+#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 113
+#: rc.cpp:556
 #, no-c-format
-msgid "&Edit..."
-msgstr "编辑(&E)..."
+msgid "Random order"
+msgstr "随机顺序"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 350
-#: rc.cpp:2101
+#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 135
+#: rc.cpp:559
 #, no-c-format
-msgid "&Network:"
-msgstr "网络(&N)："
+msgid "Change global text foreground color"
+msgstr "更改文字的整体前景色"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 371
-#: rc.cpp:2104 rc.cpp:3109 rc.cpp:3370 rc.cpp:3629 rc.cpp:4082 rc.cpp:4196
-#: rc.cpp:4554
+#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 143
+#: rc.cpp:562
 #, no-c-format
-msgid "Connection Preferences"
-msgstr "连接首选项"
+msgid "Change color every letter"
+msgstr "每个字母变一次颜色"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 382
-#: rc.cpp:2107
+#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 151
+#: rc.cpp:565
 #, no-c-format
-msgid "&Prefer SSL-based connections"
-msgstr "首选基于 SSL 的连接(&P)"
+msgid "Change color every word"
+msgstr "每个单词变一次颜色"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 390
-#: rc.cpp:2110 rc.cpp:2353 rc.cpp:3084 rc.cpp:3352 rc.cpp:3607 rc.cpp:4055
-#: rc.cpp:4187 rc.cpp:4518 rc.cpp:5105
+#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 161
+#: rc.cpp:568
 #, no-c-format
-msgid "E&xclude from connect all"
-msgstr "从全部连接中排除(&X)"
+msgid "Effects"
+msgstr "效果"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 393
-#: rc.cpp:2113 rc.cpp:3355 rc.cpp:3610
+#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 180
+#: rc.cpp:571
 #, no-c-format
-msgid ""
-"If you check that case, the account will not be connected when you press the "
-"\"Connect All\" button, or at startup even if you selected to automatically "
-"connect at startup"
-msgstr "如果您选中了此选项，当您按下“全部连接”按钮时，此账户将不会连接。当然，即便您选择了启动时自动登录，应用程序启动时也不会登录此账户"
+msgid "L4m3r t4lk"
+msgstr "L4m3r t4lk"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 409
-#: rc.cpp:2116
+#. i18n: file ./plugins/texteffect/texteffectprefs.ui line 196
+#: rc.cpp:574
 #, no-c-format
-msgid "Default &charset:"
-msgstr "默认字符集(&C)："
+msgid "CasE wAVes"
+msgstr "随机大小写(CasE wAVes)"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 446
-#: rc.cpp:2119
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 33
+#: rc.cpp:580
 #, no-c-format
-msgid "Default Messages"
-msgstr "默认消息"
+msgid "Uploading"
+msgstr "上传"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 457
-#: rc.cpp:2122
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 56
+#: rc.cpp:583
 #, no-c-format
-msgid "&Part message:"
-msgstr "加入消息(&P)："
+msgid "Uplo&ad to:"
+msgstr "上传到(&A)："
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 468
-#: rc.cpp:2125
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 91
+#: rc.cpp:586
 #, no-c-format
-msgid "&Quit message:"
-msgstr "退出消息(&Q)："
+msgid "Formatting"
+msgstr "格式化"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 479
-#: rc.cpp:2128 rc.cpp:2131
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 108
+#: rc.cpp:589
 #, no-c-format
-msgid ""
-"The message you want people to see when you part a channel without giving a "
-"reason. Leave this field blank to use the Kopete default message."
-msgstr "当您没有给出理由而加入频道时，人们将会看到这一消息。将此处留空将使用 Kopete 默认的信息。"
+msgid "HTML (simple loo&k)"
+msgstr "HTML(简洁外观)(&K)"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 490
-#: rc.cpp:2134 rc.cpp:2137
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 114
+#: rc.cpp:592
 #, no-c-format
 msgid ""
-"The message you want people to see when you disconnect from IRC without giving "
-"a reason. Leave this field blank to use the Kopete default message."
-msgstr "当您没有给出理由而离开频道时，人们将会看到这一消息。将此处留空将使用 Kopete 默认的信息。"
+"HTML 4.01 Transitional using the ISO-8859-1 (aka. Latin 1) character set "
+"encoding."
+msgstr "HTML 4.01 Transitional，使用 ISO-8859-1(Latin 1)字符集编码。"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 522
-#: rc.cpp:2140
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 119
+#: rc.cpp:595
 #, no-c-format
-msgid "A&dvanced Configuration"
-msgstr "高级配置(&D)"
+msgid ""
+"HTML 4.01 Transitional formatting using ISO-8859-1 (aka. Latin 1) character set "
+"encoding.\n"
+"\n"
+"This version should be easily opened by most web browsers."
+msgstr ""
+"HTML 4.01 Transitional，使用 ISO-8859-1(Latin 1)字符集编码。\n"
+"\n"
+"此版本应该可使用大多数 Web 浏览器轻易打开。"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 533
-#: rc.cpp:2143
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 127
+#: rc.cpp:600
 #, no-c-format
-msgid "Message Destinations"
-msgstr "消息目的"
+msgid "XHTML (simple look)"
+msgstr "XHTML(简洁外观)"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 544
-#: rc.cpp:2146
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 130
+#: rc.cpp:603
 #, no-c-format
-msgid "Auto-show anonymous windows"
-msgstr "自动显示匿名窗口"
+msgid "XHTML 1.0 Strict"
+msgstr "XHTML 1.0 Strict"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 552
-#: rc.cpp:2149
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 135
+#: rc.cpp:606
 #, no-c-format
-msgid "Auto-show the server window"
-msgstr "自动显示服务器窗口"
+msgid ""
+"The resulting page will be formatted using the XHTML 1.0 Strict W3C "
+"Recommendation. The character set encoding is UTF-8.\n"
+"\n"
+"Note that some web browsers do not support XHTML. You should also make sure "
+"your web server serves it out with the correct mime type, such as "
+"application/xhtml+xml."
+msgstr ""
+"结果页面将使用 XHTML 1.0 Strict W3C 推荐标准格式化。字符集为 UTF-8。\n"
+"\n"
+"请注意，某些 Web 浏览器不支持 XHTML。您还应该确定您的 Web 服务器可以正确输出 MIME 类型，比如 "
+"application/xhtml+xml。"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 568
-#: rc.cpp:2152
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 143
+#: rc.cpp:611
 #, no-c-format
-msgid "Server messages:"
-msgstr "服务器消息："
+msgid "&XML"
+msgstr "&XML"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 576
-#: rc.cpp:2155
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 146
+#: rc.cpp:614
 #, no-c-format
-msgid "Server notices:"
-msgstr "服务器通知："
+msgid "Save the output in XML format using UTF-8 character set."
+msgstr "使用 UTF-8 字符集将结果以 XML 格式保存。"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 582
-#: rc.cpp:2158 rc.cpp:2173 rc.cpp:2191 rc.cpp:2209
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 149
+#: rc.cpp:617
 #, no-c-format
-msgid "Active Window"
-msgstr "当前窗口"
+msgid "Save the output in XML format using the UTF-8 encoding."
+msgstr "使用 UTF-8 编码将结果以 XML 格式保存。"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 587
-#: rc.cpp:2161 rc.cpp:2176 rc.cpp:2194 rc.cpp:2212
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 157
+#: rc.cpp:620
 #, no-c-format
-msgid "Server Window"
-msgstr "服务器窗口"
+msgid "XML transformation &using this XSLT sheet:"
+msgstr "使用此 XSLT 样式表转换 XML(&U)："
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 592
-#: rc.cpp:2164 rc.cpp:2179 rc.cpp:2197 rc.cpp:2215
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 200
+#: rc.cpp:623
 #, no-c-format
-msgid "Anonymous Window"
-msgstr "匿名窗口"
+msgid "Repla&ce protocol text with images in (X)HTML"
+msgstr "在 (X)HTML 中将协议文本替换为图像(&C)"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 597
-#: rc.cpp:2167 rc.cpp:2182 rc.cpp:2200 rc.cpp:2218
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 203
+#: rc.cpp:626
+#, fuzzy, no-c-format
+msgid "Replaces the protocol names, such as IRC with images."
+msgstr "将协议名称(如 MSN、IRC)替换为图像。"
+
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 219
+#: rc.cpp:629
+#, fuzzy, no-c-format
+msgid ""
+"Replaces the protocol names, such as IRC with images.\n"
+"\n"
+"Note that you have to manually copy the PNG files into place.\n"
+"\n"
+"The following files are used by default:\n"
+"\n"
+"images/icq_protocol.png\n"
+"images/jabber_protocol.png\n"
+"images/yahoo_protocol.png\n"
+"images/aim_protocol.png\n"
+"images/irc_protocol.png\n"
+"images/sms_protocol.png\n"
+"images/gadu_protocol.png\n"
+"images/winpopup_protocol.png"
+msgstr ""
+"将协议名称(如 MSN 和 IRC)替换为图像。\n"
+"\n"
+"请注意，您必须手动复制 PNG 文件至正确的位置。\n"
+"\n"
+"默认使用下列文件：\n"
+"\n"
+"images/msn_protocol.png\n"
+"images/icq_protocol.png\n"
+"images/jabber_protocol.png\n"
+"images/yahoo_protocol.png\n"
+"images/aim_protocol.png\n"
+"images/irc_protocol.png\n"
+"images/sms_protocol.png\n"
+"images/gadu_protocol.png\n"
+"images/winpopup_protocol.png"
+
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 229
+#: rc.cpp:645
 #, no-c-format
-msgid "KNotify"
-msgstr "KNotify"
+msgid "Display Name"
+msgstr "显示名字"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 660
-#: rc.cpp:2188
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 246
+#: rc.cpp:648
 #, no-c-format
-msgid "Error messages:"
-msgstr "错误消息："
+msgid "Use one of &your IM names"
+msgstr "使用您的即时通讯姓名(&Y)"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 698
-#: rc.cpp:2206
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 257
+#: rc.cpp:651
 #, no-c-format
-msgid "Information replies:"
-msgstr "信息回复："
+msgid "Use another &name:"
+msgstr "使用其他姓名(&N)："
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 754
-#: rc.cpp:2224
+#. i18n: file ./plugins/webpresence/webpresenceprefs.ui line 300
+#: rc.cpp:654
 #, no-c-format
-msgid "Custom CTCP Replies"
-msgstr "自定义 CTCP 回复"
+msgid "Include &IM addresses"
+msgstr "包含即时通讯地址(&I)"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 763
-#: rc.cpp:2227
+#. i18n: file ./kopete/chatwindow/kopeteemailwindow.rc line 5
+#: rc.cpp:657 rc.cpp:672 rc.cpp:2026 rc.cpp:2632 rc.cpp:3741
 #, no-c-format
-msgid "CTCP"
-msgstr "CTCP"
+msgid "&Chat"
+msgstr "聊天(&C)"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 807
-#: rc.cpp:2233
+#. i18n: file ./kopete/chatwindow/kopeteemailwindow.rc line 14
+#: rc.cpp:660 rc.cpp:675
 #, no-c-format
-msgid ""
-"You can use this dialog to add custom replies for when people send CTCP "
-"requests to you. You can also use this dialog to override the built-in replies "
-"for VERSION, USERINFO, and CLIENTINFO."
-msgstr ""
-"您可使用此对话框添加一些自定义回复，以便应付别人给您发送的 CTCP 请求。您还可以使用此对话框来覆盖程序对 VERSION、USERINFO 和 "
-"CLIENTINFO 的内建回复。"
+msgid "&Format"
+msgstr "格式(&F)"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 823
-#: rc.cpp:2236
+#. i18n: file ./kopete/chatwindow/kopeteemailwindow.rc line 41
+#: rc.cpp:669 rc.cpp:690 rc.cpp:4053 rc.cpp:4218 rc.cpp:4257
 #, no-c-format
-msgid "&CTCP:"
-msgstr "&CTCP："
+msgid "Status"
+msgstr "状态"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 839
-#: rc.cpp:2239
+#. i18n: file ./kopete/chatwindow/kopetechatwindow.rc line 23
+#: rc.cpp:678
 #, no-c-format
-msgid "&Reply:"
-msgstr "回复(&R)："
+msgid "&Tabs"
+msgstr "标签(&T)"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 855
-#: rc.cpp:2242
+#. i18n: file ./kopete/chatwindow/kopetechatwindow.rc line 35
+#: rc.cpp:684
 #, no-c-format
-msgid "Add Repl&y"
-msgstr "添加回复(&Y)"
+msgid "&Chat Members List"
+msgstr "聊天成员列表(&C)"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 881
-#: rc.cpp:2245
+#. i18n: file ./kopete/chatwindow/kopetechatwindow.rc line 60
+#: rc.cpp:693 rc.cpp:705
 #, no-c-format
-msgid "Run Following Commands on Connect"
-msgstr "连接时运行下列命令"
+msgid "Format Toolbar"
+msgstr "格式工具栏"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 913
-#: rc.cpp:2248
+#. i18n: file ./kopete/chatwindow/kopeterichtexteditpartfull.rc line 4
+#: rc.cpp:696
 #, no-c-format
-msgid "Add Co&mmand"
-msgstr "添加命令(&M)"
+msgid "F&ormat"
+msgstr "格式(&O)"
 
-#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 954
-#: rc.cpp:2254 rc.cpp:2257
+#. i18n: file ./kopete/chatwindow/kopeterichtexteditpartfull.rc line 11
+#: rc.cpp:699
 #, no-c-format
-msgid ""
-"Any commands added here will be run as soon as you are connected to the IRC "
-"server."
-msgstr "在此添加的任何命令都会在您连接到 IRC 服务器后立即运行。"
+msgid "&Alignment"
+msgstr "对齐(&A)"
 
-#. i18n: file ./protocols/irc/ui/ircadd.ui line 59
-#: rc.cpp:2263
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 16
+#: rc.cpp:708
 #, no-c-format
-msgid "N&ickname/channel to add:"
-msgstr "要添加的昵称/频道(&I)："
+msgid "Contact Addition Wizard"
+msgstr "添加联系人向导"
 
-#. i18n: file ./protocols/irc/ui/ircadd.ui line 65
-#: rc.cpp:2266 rc.cpp:2272
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 23
+#: rc.cpp:711
 #, no-c-format
-msgid "The name of the IRC contact or channel you would like to add."
-msgstr "您想要添加的 IRC 联系人或频道的名称。"
+msgid "Introduction"
+msgstr "介绍"
 
-#. i18n: file ./protocols/irc/ui/ircadd.ui line 68
-#: rc.cpp:2269
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 44
+#: rc.cpp:714
 #, no-c-format
 msgid ""
-"The name of the IRC contact or channel you would like to add.  You may type "
-"simply the text of a person's nickname, or you may type a channel name, "
-"preceded by a pound sign ('#')."
-msgstr "您想要添加的 IRC 联系人或频道的名称。您可以简单的输入别人的昵称，或者输入以井号“#”开头的频道名。"
+"<h2>Welcome to the Add Contact Wizard</h2>\n"
+"\n"
+"<p>This wizard will guide you through the process of adding a new contact to "
+"Kopete.</p>"
+msgstr ""
+"<h2>欢迎使用添加联系人向导</h2>\n"
+"\n"
+"<p>此向导将指引您向 Kopete 中添加新的联系人。</p>"
 
-#. i18n: file ./protocols/irc/ui/ircadd.ui line 79
-#: rc.cpp:2275
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 56
+#: rc.cpp:719
 #, no-c-format
 msgid ""
-"The name of the IRC contact or channel you would like to add.  You may type "
-"simply the text of a person's nickname, or you may type a channel name, "
-"preceded by a pound sign ('#')"
-msgstr "您想要添加的 IRC 联系人或频道的名称。您可以简单的输入别人的昵称，或者输入以井号“#”开头的频道名"
+"<p>Kopete shares contact information with the TDE Addressbook.  This gives you "
+"seamless integration between instant messaging, e-mail and other personal "
+"information management applications.</p>\n"
+"<p>If you prefer not to store instant messaging information in the TDE "
+"Addressbook, uncheck the box below.</p>"
+msgstr ""
+"<p>Kopete 与 TDE 地址簿共享联系人信息。这将使得您的即时通讯、电子邮件和其它个人信息管理程序之间无缝集成。</p>\n"
+"<p>如果您更愿意不将即时通讯信息存储在 TDE 地址簿中，请不要选中下面的选项。</p>"
 
-#. i18n: file ./protocols/irc/ui/ircadd.ui line 89
-#: rc.cpp:2278
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 64
+#: rc.cpp:723
 #, no-c-format
-msgid "<i>(for example: joe_bob or #somechannel)</i>"
-msgstr "<i>(例如：张三 或 #somechannel)</i>"
+msgid "<p>Press the \"Next\" button to begin.</p>"
+msgstr "<p>单击“下一步”按钮开始。</p>"
 
-#. i18n: file ./protocols/irc/ui/ircadd.ui line 119
-#: rc.cpp:2281
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 123
+#: rc.cpp:726
 #, no-c-format
-msgid "&Search Channels"
-msgstr "搜索频道(&S)"
+msgid "&Use the TDE address book for this contact"
+msgstr "为此联系人使用 TDE 地址簿(&U)"
 
-#. i18n: file ./protocols/irc/ircchatui.rc line 5
-#: protocols/yahoo/yahooprotocol.cpp:79 rc.cpp:2284
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 129
+#: rc.cpp:729
 #, no-c-format
-msgid "IRC"
-msgstr "IRC"
+msgid ""
+"Check this box if you do not want to integrate other TDE applications with "
+"Kopete"
+msgstr "如果您不想将 Kopete 集成到其它 TDE 应用程序中，请选中此框"
 
-#. i18n: file ./protocols/msn/ui/msndebugrawcommand_base.ui line 30
-#: rc.cpp:2287
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 156
+#: rc.cpp:732
 #, no-c-format
-msgid "&Parameters:"
-msgstr "参数(&P)："
+msgid "Select Address Book Entry"
+msgstr "选择地址簿条目"
 
-#. i18n: file ./protocols/msn/ui/msndebugrawcommand_base.ui line 46
-#: rc.cpp:2290
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 169
+#: rc.cpp:735
 #, no-c-format
-msgid "Co&mmand:"
-msgstr "命令(&M)："
+msgid "Select Display Name & Group"
+msgstr "选择显示名和组"
 
-#. i18n: file ./protocols/msn/ui/msndebugrawcommand_base.ui line 62
-#: rc.cpp:2293
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 180
+#: rc.cpp:738
 #, no-c-format
-msgid "Add &ID"
-msgstr "添加 ID(&I)"
+msgid "<qt><p><h2>Select Display Name and Group</h2></p></qt>"
+msgstr "<qt><p><h2>选择显示名和组</h2></p></qt>"
 
-#. i18n: file ./protocols/msn/ui/msndebugrawcommand_base.ui line 73
-#: rc.cpp:2296
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 194
+#: rc.cpp:741
 #, no-c-format
-msgid "Add &new line"
-msgstr "添加新行(&N)"
+msgid ""
+"Enter the contact's displa&y name.  This is how the contact will appear in "
+"Kopete:"
+msgstr "输入联系人的显示名。这是联系人出现在 Kopete 中的名称(&Y)："
 
-#. i18n: file ./protocols/msn/ui/msndebugrawcommand_base.ui line 92
-#: rc.cpp:2299
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 205
+#: rc.cpp:744
 #, no-c-format
-msgid "Message:"
-msgstr "消息："
+msgid "Leave this blank to use any display name set by the contact"
+msgstr "将此处留空代表使用联系人自己设定的任何显示名"
 
-#. i18n: file ./protocols/msn/ui/msnadd.ui line 38
-#: rc.cpp:2302 rc.cpp:2338
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 244
+#: rc.cpp:747
 #, no-c-format
-msgid "&MSN Passport ID:"
-msgstr "&MSN Passport ID："
+msgid "Select the contact list &group(s) that this contact should belong to :"
+msgstr "选择此联系人所属的组(&G)："
 
-#. i18n: file ./protocols/msn/ui/msnadd.ui line 47
-#: rc.cpp:2305 rc.cpp:2311
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 256
+#: rc.cpp:750
 #, no-c-format
-msgid "The user ID of the MSN contact you would like to add."
-msgstr "您想要添加的 MSN 联系人的用户 ID。"
+msgid "Groups"
+msgstr "组"
 
-#. i18n: file ./protocols/msn/ui/msnadd.ui line 50
-#: rc.cpp:2308 rc.cpp:2314
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 272
+#: rc.cpp:753
 #, no-c-format
-msgid ""
-"The user ID of the MSN contact you would like to add.  This should be in the "
-"form of a valid E-mail address."
-msgstr "您想要添加的 MSN 联系人的用户 ID。格式应该为有效的电子邮件地址。"
+msgid "A contact may be present in more than one group"
+msgstr "联系人可出现于多个组中"
 
-#. i18n: file ./protocols/msn/ui/msnadd.ui line 71
-#: rc.cpp:2317
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 280
+#: rc.cpp:756
 #, no-c-format
-msgid "<i>(for example: joe@hotmail.com)</i>"
-msgstr "<i>(例如：joe@hotmail.com)</i>"
+msgid "Create New G&roup..."
+msgstr "创建新组(&R)..."
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 17
-#: rc.cpp:2320
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 283
+#: rc.cpp:759
 #, no-c-format
-msgid "Account Preferences - MSN"
-msgstr "账户首选项 - MSN"
+msgid "Click here to create a new group"
+msgstr "单击此处创建新组"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 41
-#: rc.cpp:2323 rc.cpp:3328 rc.cpp:3586 rc.cpp:4034 rc.cpp:4497
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 310
+#: rc.cpp:762 rc.cpp:805
 #, no-c-format
-msgid "&Basic Setup"
-msgstr "基本设置(&B)"
+msgid "Select Instant Messaging Accounts"
+msgstr "选择即时通讯账户"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 77
-#: rc.cpp:2326 rc.cpp:3090 rc.cpp:3358 rc.cpp:3616 rc.cpp:4064 rc.cpp:4527
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 321
+#: rc.cpp:765
 #, no-c-format
-msgid "Registration"
-msgstr "注册"
+msgid "<p><h2>Select Instant Messaging Accounts</h2></p>"
+msgstr "<p><h2>选择即时通讯账户</h2></p>"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 102
-#: rc.cpp:2329
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 332
+#: rc.cpp:768
 #, no-c-format
 msgid ""
-"To connect to the Microsoft network, you will need a Microsoft Passport."
-"<br>"
-"<br>If you do not currently have a Passport, please click the button to create "
-"one."
-msgstr ""
-"要连接到 Microsoft Network，您必须有一张 Microsoft Passport。"
-"<br>"
-"<br>如果您从未申请过 Passport，您可以在下面链接处的网站进行注册。"
+"Select the &account(s) you would like to use for this contact from the list "
+"below."
+msgstr "请从下面的列表中您想要为此联系人所使用的账户(&A)。"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 113
-#: rc.cpp:2332 rc.cpp:3097 rc.cpp:3364 rc.cpp:3623 rc.cpp:4533
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 343
+#: rc.cpp:771
 #, no-c-format
-msgid "Re&gister New Account"
-msgstr "注册新账户(&G)"
+msgid ""
+"<p><i>Note</i>: If a messaging service is missing from the list, please make "
+"sure you have created an account for it in Kopete, and that it ready to add new "
+"contacts.</p>"
+msgstr ""
+"<p><i>注意</i>：如果列表从缺少某种信使服务，请确定您已经在 Kopete 中创建了该服务下的账户，而且您可以在该账户下添加新联系人。</p>"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 156
-#: rc.cpp:2341 rc.cpp:2347
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 360
+#: rc.cpp:777 rc.cpp:814 rc.cpp:1717
 #, no-c-format
-msgid "The user ID of the MSN contact you would like to use."
-msgstr "您想要使用的 MSN 联系人的用户 ID。"
+msgid "Protocol"
+msgstr "协议"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 159
-#: rc.cpp:2344 rc.cpp:2350
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 379
+#: rc.cpp:780 rc.cpp:817
 #, no-c-format
 msgid ""
-"The user ID of the MSN contact you would like to use.  This should be in the "
-"form of a valid E-mail address."
-msgstr "您想要使用的 MSN 联系人的用户 ID。格式应该为有效的电子邮件地址。"
+"Select the Instant Messaging systems to message the contact.  If they use more "
+"than one IM system, select them all here"
+msgstr "选择与联系人通讯的即时通讯系统。如果该联系人使用多个即时通讯系统，请在此全部选中"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 194
-#: rc.cpp:2356
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 399
+#: rc.cpp:783 rc.cpp:789
 #, no-c-format
 msgid ""
-"If you check this checkbox, the account will not be connected when you press "
-"the \"Connect All\" button, or at startup when automatic connection at startup "
-"is enabled."
-msgstr "如果您选中了此选项，当您按下“全部连接”按钮时，此账户将不会连接。当然，即便您选择了启动时自动登录，应用程序启动时也不会登录此账户。"
-
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 202
-#: rc.cpp:2359 rc.cpp:3349 rc.cpp:3613 rc.cpp:4524
-#, no-c-format
-msgid "Exclu&de from Global Identity"
-msgstr "从全局身份中排除(&D)"
+"How do you want to message the contact?  If they use more than one Instant "
+"Messaging system, select them all here"
+msgstr "您想要如何与联系人进行通讯？如果联系人使用多于一种即时通讯系统，请将这些系统全部选中。"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 214
-#: rc.cpp:2362
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 407
+#: rc.cpp:786
 #, no-c-format
-msgid "MSN &Settings"
-msgstr "MSN 设置(&S)"
+msgid "You can always add more ways to message this contact later."
+msgstr "您总可以再稍后添加与此联系人通讯的更多方式。"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 230
-#: rc.cpp:2365
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 420
+#: rc.cpp:792 rc.cpp:1753 rc.cpp:1782
 #, no-c-format
-msgid "<qt><b>Note:</b> These settings are applicable to all MSN accounts"
-msgstr "<qt><b>注意：</b>这些设置针对全部 MSN 账户"
+msgid "Finished"
+msgstr "完成"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 241
-#: rc.cpp:2368
+#. i18n: file ./kopete/addcontactwizard/addcontactwizard_base.ui line 443
+#: rc.cpp:795
 #, no-c-format
-msgid "Global MSN Options"
-msgstr "全局 MSN 选项"
+msgid ""
+"<p>"
+"<h2>Congratulations</h2></p>\n"
+"\n"
+"<p>You have finished configuring a contact. Please click Finish and your "
+"contact will be added to your contact list.</p>\n"
+"\n"
+"<p><i>Note</i>: If adding this contact requires authorization from one or more "
+"of the messaging services, Kopete may prompt you for further information after "
+"this screen.</p>"
+msgstr ""
+"<p>"
+"<h2>恭喜</h2></p>\n"
+"\n"
+"<p>您已经完成了联系人的配置。请单击完成，您的联系人将会添加到您的联系人列表中。</p>\n"
+"\n"
+"<p><i>注意</i>：如果添加此联系人需要一种或多种信使服务的认证，Kopete 可能在此屏幕之后提示您有关信息。</p>"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 260
-#: rc.cpp:2371
+#. i18n: file ./kopete/addcontactwizard/fastaddcontactwizard_base.ui line 16
+#: rc.cpp:802
 #, no-c-format
-msgid "Au&tomatically open a chat window when someone starts a conversation"
-msgstr "有人发起对话时自动打开聊天窗口(&T)"
+msgid "Fast Contact Addition Wizard"
+msgstr "联系人添加快速向导"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 263
-#: rc.cpp:2374
+#. i18n: file ./kopete/addcontactwizard/fastaddcontactwizard_base.ui line 80
+#: rc.cpp:808
 #, no-c-format
-msgid ""
-"This option will notify you when a contact starts typing their message, before "
-"the message is sent or finished."
-msgstr "有联系人开始打字的时候就通知您，而不等到该消息发出或完成。"
+msgid "<p><h2>Select IM Accounts</h2></p>"
+msgstr "<p><h2>选择即时通讯账户</h2></p>"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 279
-#: rc.cpp:2377
+#. i18n: file ./kopete/addcontactwizard/fastaddcontactwizard_base.ui line 125
+#: rc.cpp:820
 #, no-c-format
-msgid "Download the msn picture:"
-msgstr "下载 MSN 图片："
+msgid "Done"
+msgstr "完成"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 285
-#: rc.cpp:2380
+#. i18n: file ./kopete/addcontactwizard/fastaddcontactwizard_base.ui line 183
+#: rc.cpp:823
 #, no-c-format
 msgid ""
-"<qt>"
-"<p>Indicate when Kopete will download the display pictures of contacts</p>\n"
-"<dl><dt>Only manually</dt><dd>The picture is not downloaded automatically. It "
-"is only downloaded when the user requests it</dd>\n"
-"<dt>When a chat is open</dt><dd>The picture is downloaded when a conversation "
-"socket is opened, i.e. when you open a chat window</dd>\n"
-"<dt>Automatically</dt><dd>Always try to download the picture if the contact has "
-"one.  <b>Note:</b> this will open a socket, and let the user know you are "
-"downloading their picture.</dd></dl>"
+"<p>"
+"<h2>Contact added.</h2></p>\n"
+"<p>That was <i>fast.</i></p>"
 msgstr ""
-"<qt>"
-"<p>标明 Kopete 何时下载联系人图片</p>\n"
-"<dl><dt>仅手动</dt><dd>图片不会自动下载，仅当用户请求时才下载</dd>\n"
-"<dt>打开聊天时</dt><dd>当对话套接字打开之后下载图片，也就是当您打开聊天窗口时下载图片</dd>\n"
-"<dt>自动</dt><dd>只要联系人有图片，就总是试图下载。<b>注意：</b>这将打开一个套接字，并让用户知道您正在下载其图片。</dd></dl>"
-
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 291
-#: rc.cpp:2386
-#, no-c-format
-msgid "Only Manually"
-msgstr "仅手动"
+"<p>"
+"<h2>联系人已添加。</h2></p>\n"
+"<p>真的<i>太快了。</i></p>"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 296
-#: rc.cpp:2389
+#. i18n: file ./kopete/contactlist/kopetegvipropswidget.ui line 50
+#: rc.cpp:830 rc.cpp:3882
 #, no-c-format
-msgid "When a Chat is Open"
-msgstr "打开聊天时"
+msgid "&Name:"
+msgstr "名字(&N)："
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 301
-#: rc.cpp:2392
+#. i18n: file ./kopete/contactlist/kopetegvipropswidget.ui line 68
+#: rc.cpp:833 rc.cpp:902
 #, no-c-format
-msgid "Automatically"
-msgstr "自动"
+msgid "Icons"
+msgstr "图标"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 322
-#: rc.cpp:2395
+#. i18n: file ./kopete/contactlist/kopetegvipropswidget.ui line 87
+#: rc.cpp:836
 #, no-c-format
-msgid ""
-"<qt>"
-"<p>Indicate when Kopete will download the pictures of contacts</p>\n"
-"<dl><dt>Only manually</dt><dd>The picture is not downloaded automatically. It "
-"is only downloaded when the user requests it</dd>\n"
-"<dt>When a chat is open</dt><dd>The picture is downloaded when a conversation "
-"socket is opened, i.e. when you open a chat window</dd>\n"
-"<dt>Automatically</dt><dd>Always try to download the picture if the contact has "
-"one.  <b>Note:</b> this will open a socket, and let the user know you are "
-"downloading their picture.</dd></dl>"
-msgstr ""
-"<qt>"
-"<p>标明 Kopete 何时下载联系人图片</p>\n"
-"<dl><dt>仅手动</dt><dd>图片不会自动下载，仅当用户请求时才下载</dd>\n"
-"<dt>打开聊天时</dt><dd>当对话套接字打开之后下载图片，也就是当您打开聊天窗口时下载图片</dd>\n"
-"<dt>自动</dt><dd>只要联系人有图片，就总是试图下载。<b>注意：</b>这将打开一个套接字，并让用户知道您正在下载其图片。</dd></dl>"
+msgid "O&pen:"
+msgstr "打开的(&P)："
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 332
-#: rc.cpp:2401
+#. i18n: file ./kopete/contactlist/kopetegvipropswidget.ui line 98
+#: rc.cpp:839
 #, no-c-format
-msgid "&Download and show custom emoticons"
-msgstr "下载并显示自定义表情(&D)"
+msgid "C&losed:"
+msgstr "关闭的(&L)："
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 338
-#: rc.cpp:2404
+#. i18n: file ./kopete/contactlist/kopetegvipropswidget.ui line 117
+#: rc.cpp:842
 #, no-c-format
-msgid ""
-"MSN Messenger allows users to download and use custom emoticons. If this option "
-"is enabled, Kopete will download these emoticons and show them."
-msgstr "MSN Messenger 可让您选择某些自定义表情。如果选中了此选项，Kopete 将会下载并显示这些表情。"
+msgid "Use custom &icons"
+msgstr "使用自定义图标(&I)"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 346
-#: rc.cpp:2407
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 50
+#: rc.cpp:848
 #, no-c-format
-msgid "E&xport the current emoticon theme to users"
-msgstr "将当前表情主题导出给用户(&X)"
+msgid "Address Book Link"
+msgstr "地址簿链接"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 349
-#: rc.cpp:2410
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 77
+#: rc.cpp:851
 #, no-c-format
-msgid "Only work with emoticons in the PNG format"
-msgstr "只适用于 PNG 各式的表情"
+msgid "E&xport Details..."
+msgstr "导出细节(&X)..."
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 353
-#: rc.cpp:2413
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 80
+#: rc.cpp:854
 #, no-c-format
-msgid ""
-"Export all the emoticon themes as custom emoticons.\n"
-"Only works for emoticons in the PNG format."
-msgstr ""
-"将全部表情主题导出为自定义表情。\n"
-"仅支持 PNG 格式的表情。"
+msgid "Export contact's details to the TDE Address Book"
+msgstr "将联系人细节导出到 TDE 地址簿"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 363
-#: rc.cpp:2417
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 108
+#: rc.cpp:857
 #, no-c-format
-msgid "Privacy"
-msgstr "隐私"
+msgid "&Import Contacts"
+msgstr "导入联系人(&I)"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 377
-#: rc.cpp:2420
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 111
+#: rc.cpp:860
 #, no-c-format
-msgid "Send client information"
-msgstr "发送客户端信息"
+msgid "Import contacts from the TDE Address Book"
+msgstr "从 TDE 地址簿导入联系人"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 386
-#: rc.cpp:2423
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 123
+#: rc.cpp:863
 #, no-c-format
-msgid ""
-"<qt>Make it possible for your contacts to detect if you are using Kopete."
-"<br>We recommend leaving this checked.</qt>"
-msgstr "<qt>让您的联系人检测到您是否正在使用 Kopete。<br>我们建议您将此选项选中。</qt>"
+msgid "Display Name Source"
+msgstr "显示名称源"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 389
-#: rc.cpp:2426
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 134
+#: rc.cpp:866
 #, no-c-format
-msgid ""
-"Third party MSN clients, such as Kopete, give users the ability to let other "
-"third party clients guess which client they are using. We recommend leaving "
-"this checkbox checked."
-msgstr "第三方 MSN 客户端，比如 Kopete，可让使用其它第三方客户端软件的用户知晓互相正在使用何种客户端。我们建议您将此复选框选中。"
+msgid "Use addressbook &name (needs addressbook link)"
+msgstr "使用地址簿名称(需要地址簿链接)(&N)"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 400
-#: rc.cpp:2429
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 150
+#: rc.cpp:869 rc.cpp:887
 #, no-c-format
-msgid "Send &typing notifications"
-msgstr "发送打字通知(&T)"
+msgid "From contact:"
+msgstr "从联系人："
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 406
-#: rc.cpp:2432
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 183
+#: rc.cpp:872 rc.cpp:890 rc.cpp:1659
 #, no-c-format
-msgid ""
-"<qt>Check this box to send <b>Typing notifications</b> "
-"to your contacts. When you are composing a message, you might want your contact "
-"to know that you are typing so that he knows you are answering.</qt>"
-msgstr ""
-"<qt>选中此复选框可向您的联系人发送<b>打字通知</b>。当您正在撰写消息时，您可能想要您的联系人知道您正在打字，以便让他知道您正在答复。</qt>"
+msgid "Contact to synchronize the displayname with."
+msgstr "要与显示名称同步的联系人。"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 422
-#: rc.cpp:2435
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 201
+#: rc.cpp:875 rc.cpp:1668
 #, no-c-format
-msgid "Expose my Jabber account to Jabber users"
-msgstr "向 Jabber 用户公布我的 Jabber 账户"
+msgid "Cus&tom:"
+msgstr "自定义(&T)："
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 428
-#: rc.cpp:2438 rc.cpp:2441
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 235
+#: rc.cpp:878
 #, no-c-format
-msgid ""
-"If you have a Jabber account, you may let Jabber users on an MSN gateway know "
-"that you are also using Jabber."
-msgstr "如果您有 Jabber 账户，您可以让使用 MSN 网关的 Jabber 用户知道您也在使用 Jabber。"
+msgid "Photo Source"
+msgstr "照片源"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 483
-#: rc.cpp:2444
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 264
+#: libkopete/kopeteglobal.cpp:190 rc.cpp:881 rc.cpp:2839 rc.cpp:4974
 #, no-c-format
-msgid "There are also privacy options in the \"Contacts\" tab"
-msgstr "“联系人”标签上还有隐私选项"
+msgid "Photo"
+msgstr "照片"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 548
-#: rc.cpp:2450 rc.cpp:3526 rc.cpp:3740 rc.cpp:3869
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 275
+#: rc.cpp:884
 #, no-c-format
-msgid "&Nickname:"
-msgstr "昵称(&N)："
+msgid "U&se addressbook photo (needs addressbook link)"
+msgstr "使用地址簿照片(需要地址簿链接)(&S)"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 554
-#: rc.cpp:2453 rc.cpp:2456
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 342
+#: rc.cpp:893
 #, no-c-format
-msgid ""
-"The alias you would like to use on MSN.  You may change this at any time you "
-"wish."
-msgstr "您想要在 MSN 上使用的别名。您可在您喜欢的任何时候加以更改。"
+msgid "Custom:"
+msgstr "自定义："
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 575
-#: rc.cpp:2459
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 398
+#: rc.cpp:896
 #, no-c-format
-msgid "Phone Numbers"
-msgstr "电话号码"
+msgid "S&ync photo to addressbook"
+msgstr "照片同步到地址簿(&Y)"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 586
-#: rc.cpp:2462
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 408
+#: rc.cpp:899 rc.cpp:3978
 #, no-c-format
-msgid "Hom&e:"
-msgstr "宅电(&E)："
+msgid "Ad&vanced"
+msgstr "高级(&V)"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 597
-#: rc.cpp:2465
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 430
+#: rc.cpp:905
 #, no-c-format
-msgid "&Work:"
-msgstr "单位(&W)："
+msgid "Awa&y:"
+msgstr "离开(&Y)："
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 618
-#: rc.cpp:2468
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 441
+#: rc.cpp:908
 #, no-c-format
-msgid "&Mobile:"
-msgstr "手机(&M)："
+msgid "&Online:"
+msgstr "在线(&O)："
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 636
-#: rc.cpp:2471
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 452
+#: rc.cpp:911
 #, no-c-format
-msgid "Display Picture"
-msgstr "显示图片"
+msgid "Use custom status &icons"
+msgstr "使用自定义状态图标(&I)"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 655
-#: rc.cpp:2474
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 455
+#: rc.cpp:914
 #, no-c-format
-msgid "E&xport a display picture"
-msgstr "导出显示图片(&X)"
+msgid "Check to set custom icons for this contact"
+msgstr "为此账户使用自定义颜色"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 674
-#: rc.cpp:2477
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 495
+#: rc.cpp:917
 #, no-c-format
-msgid "Please select a square image. The image will be scaled to 96x96."
-msgstr "请选择方形图像。图像将会被缩放至 96x96。"
+msgid "O&ffline:"
+msgstr "离线(&F)："
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 696
-#: rc.cpp:2480
+#. i18n: file ./kopete/contactlist/kopetemetalvipropswidget.ui line 506
+#: rc.cpp:920
 #, no-c-format
-msgid "&Select Image..."
-msgstr "选择图像(&S)..."
+msgid "Un&known:"
+msgstr "未知(&K)："
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 837
-#: rc.cpp:2483
+#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 16
+#: rc.cpp:923
 #, no-c-format
-msgid "WARNING: You need to be connected to modify this page."
-msgstr "警告：要修改此页，您必须在线。"
+msgid "Merge with Address Book"
+msgstr "与地址簿合并"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 850
-#: rc.cpp:2486
+#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 27
+#: rc.cpp:926 rc.cpp:2125 rc.cpp:4143
 #, no-c-format
-msgid "Con&tacts"
-msgstr "联系人(&T)"
+msgid "First name:"
+msgstr "名："
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 863
-#: rc.cpp:2489
+#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 38
+#: rc.cpp:929
 #, no-c-format
-msgid ""
-"<i>Italics</i> contacts are not on your contact list."
-"<br>\n"
-"<br>\n"
-"<b>Bold</b> contacts are in your contact list but you are not in their contact "
-"list."
-msgstr ""
-"<i>斜体</i>的联系人是没有在您的联系人列表中出现的。"
-"<br>\n"
-"<br>\n"
-"<b>粗体</b>的联系人是位于您的联系人列表，但您没有出现在对方的联系人列表中的"
+msgid "Home phone:"
+msgstr "宅电："
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 879
-#: rc.cpp:2494
+#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 73
+#: rc.cpp:932
 #, no-c-format
-msgid "Bloc&ked contacts:"
-msgstr "屏蔽的联系人(&K)："
+msgid "Work phone:"
+msgstr "工作电话："
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 903
-#: rc.cpp:2497
+#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 84
+#: rc.cpp:935
 #, no-c-format
-msgid "&>"
-msgstr "&>"
+msgid "Mobile phone:"
+msgstr "移动电话："
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 911
-#: rc.cpp:2500
+#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 95
+#: rc.cpp:938
 #, no-c-format
-msgid "&<"
-msgstr "&<"
+msgid "URL:"
+msgstr "URL："
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 938
-#: rc.cpp:2503
+#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 121
+#: rc.cpp:941 rc.cpp:2131 rc.cpp:4152
 #, no-c-format
-msgid "Allo&wed contacts:"
-msgstr "允许的联系人(&W)："
+msgid "Last name:"
+msgstr "姓："
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 981
-#: rc.cpp:2506
+#. i18n: file ./kopete/contactlist/kopeteaddrbookexportui.ui line 140
+#: rc.cpp:944 rc.cpp:2866 rc.cpp:2878
 #, no-c-format
-msgid "Block all users not in 'Allowed' &list"
-msgstr "屏蔽全部未处于“允许”列表中的用户(&L)"
+msgid "Email:"
+msgstr "电子邮件："
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 984
-#: rc.cpp:2509
+#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 16
+#: rc.cpp:947
 #, no-c-format
-msgid ""
-"Checking this box will block all users not explicitly shown in the allowed list "
-"here, including any contacts not on your contact list."
-msgstr "选中此框将会屏蔽未显式列在允许列表中的全部用户，包括任何未位于您联系人列表中的联系人。"
+msgid "Export Contacts"
+msgstr "导出联系人"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 1042
-#: rc.cpp:2512
+#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 23
+#: rc.cpp:950
 #, no-c-format
-msgid "View &Reverse List"
-msgstr "查看反向列表(&R)"
+msgid "Export Contacts to Address Book"
+msgstr "将联系人导出到地址簿"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 1045
-#: rc.cpp:2515 rc.cpp:2518
+#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 42
+#: rc.cpp:953
 #, no-c-format
 msgid ""
-"The reverse list is the list of contacts who added you to their own contact "
-"list."
-msgstr "反向列表是将您添加到好友列表的联系人清单。"
+"This wizard helps you export instant messaging contacts to the TDE address "
+"book."
+msgstr "此想到将帮助您将即时通讯账户导出至 TDE 地址簿。"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 1087
-#: rc.cpp:2521
+#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 61
+#: rc.cpp:956
 #, no-c-format
-msgid "WARNING: You need to be connected to modify this page"
-msgstr "警告：要修改此页，您必须在线"
+msgid "&Select Address Book"
+msgstr "选择地址簿(&S)"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 1100
-#: rc.cpp:2524 rc.cpp:4551
+#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 92
+#: rc.cpp:959
 #, no-c-format
-msgid "Co&nnection"
-msgstr "连接(&N)"
+msgid "Select Contacts to Export"
+msgstr "选择要导出的联系人"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 1111
-#: rc.cpp:2527
+#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 111
+#: rc.cpp:962
 #, no-c-format
-msgid "Connection Preferences (for advanced users)"
-msgstr "连接首选项(适用于高级用户)"
+msgid "Selected contacts will be added to the TDE address book."
+msgstr "选中的联系人将添加到 TDE 地址簿中。"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 1122
-#: rc.cpp:2530 rc.cpp:3373 rc.cpp:3665 rc.cpp:4569
+#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 149
+#: rc.cpp:968
 #, no-c-format
-msgid "&Override default server information"
-msgstr "覆盖服务器默认信息(&O)"
+msgid "Select &All"
+msgstr "全部选中(&A)"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 1152
-#: rc.cpp:2533 rc.cpp:3656
+#. i18n: file ./kopete/contactlist/tdeabcexport_base.ui line 157
+#: rc.cpp:971
 #, no-c-format
-msgid "Ser&ver /"
-msgstr "服务器(&V) /"
+msgid "&Deselect All"
+msgstr "全部不选(&D)"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 1166
-#: rc.cpp:2536 rc.cpp:3208
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 32
+#: rc.cpp:974
 #, no-c-format
-msgid "po&rt:"
-msgstr "端口(&R)："
+msgid "On &event:"
+msgstr "事件(&E)："
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 1190
-#: rc.cpp:2539
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 43
+#: rc.cpp:977
 #, no-c-format
-msgid "messenger.hotmail.com"
-msgstr "messenger.hotmail.com"
+msgid "Choose the event that should have a custom notification"
+msgstr "选择要使用自定义通知的事件"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 1193
-#: rc.cpp:2542 rc.cpp:2545 rc.cpp:2548 rc.cpp:2551
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 64
+#: rc.cpp:980
 #, no-c-format
-msgid ""
-"Only modify these values if you want to use a special IM proxy server, like "
-"SIMP"
-msgstr "请仅当您想要使用特殊的 IM 代理服务器(如 SIMP)时才修改这些值"
+msgid "Select the sound to play"
+msgstr "选择要播放的声音"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 1229
-#: rc.cpp:2554
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 72
+#: rc.cpp:983
 #, no-c-format
-msgid "Use &HTTP method"
-msgstr "使用 HTTP 方式(&H)"
+msgid "&Play a sound:"
+msgstr "播放声音(&P)："
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 1234
-#: rc.cpp:2557
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 75
+#: rc.cpp:986
 #, no-c-format
-msgid ""
-"Connect to MSN Messenger using an HTTP-like protocol on port 80.\n"
-"This may be used to connect on a network with a restrictive firewall.\n"
-"Only check this option if the normal connection doesn't work."
-msgstr ""
-"在 80 端口使用类似 HTTP 的协议连接到 MSN Messenger。\n"
-"这可以用于连接到防火墙后的网络。\n"
-"仅当普通连接方式无效工作时，才选中此选项。"
+msgid "Play a sound when this event occurs for this contact"
+msgstr "当此联系人发生此事件时播放声音"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 1250
-#: rc.cpp:2562
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 100
+#: rc.cpp:989
 #, no-c-format
-msgid "S&pecify a base port for incoming webcam connections:"
-msgstr "指定摄像头连入的基准端口(&P)："
+msgid "Start a cha&t"
+msgstr "开始聊天(&T)"
 
-#. i18n: file ./protocols/msn/ui/msneditaccountui.ui line 1253
-#: rc.cpp:2565 rc.cpp:2568
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 103
+#: rc.cpp:992
 #, no-c-format
 msgid ""
-"If you are behind a firewall, you may specify a base port to use for the "
-"incoming connection, and configure your firewall to accept connections on a "
-"range of 10 ports, starting at this one. Incoming connections are used for the "
-"webcam. If you don't specify a port yourself, the operating system will choose "
-"an available port for you. It is recommended to leave the checkbox unchecked."
-msgstr ""
-"如果您位于防火墙之后，您可能需要指定一个用于接收进入连接的基准端口，并在防火墙处开放从此向后的 10 "
-"个端口。摄像头会使用到此连接，如果您未明确指定，系统将会为您自动选取一个可用的端口，如果您希望这样的话建议不要选中此组合框。"
+"Open a chat window with this contact when this event occurs for this contact"
+msgstr "当此事件发生在此联系人身上时打开此联系人的聊天窗口"
 
-#. i18n: file ./protocols/msn/ui/msninfo.ui line 46
-#: rc.cpp:2571
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 111
+#: rc.cpp:995
 #, no-c-format
-msgid "Email address:"
-msgstr "电子邮件："
+msgid "&Display a message:"
+msgstr "显示消息(&D)："
 
-#. i18n: file ./protocols/msn/ui/msninfo.ui line 112
-#: rc.cpp:2577
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 114
+#: rc.cpp:998
 #, no-c-format
-msgid "Personal message:"
-msgstr "个人消息："
+msgid ""
+"Display a message on your screen when this event occurs for this contact"
+msgstr "此联系人发生此事件时在您的屏幕上显示消息"
 
-#. i18n: file ./protocols/msn/ui/msninfo.ui line 130
-#: rc.cpp:2580
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 125
+#: rc.cpp:1001
 #, no-c-format
-msgid "Phones"
-msgstr "电话"
+msgid "Enter the message to display"
+msgstr "输入要显示的消息"
 
-#. i18n: file ./protocols/msn/ui/msninfo.ui line 141
-#: rc.cpp:2583 rc.cpp:4437
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 136
+#: rc.cpp:1004
 #, no-c-format
-msgid "Home:"
-msgstr "宅电："
+msgid "D&isplay once"
+msgstr "显示一次(&I)"
 
-#. i18n: file ./protocols/msn/ui/msninfo.ui line 149
-#: rc.cpp:2586 rc.cpp:4434
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 139
+#: rc.cpp:1007
 #, no-c-format
-msgid "Work:"
-msgstr "单位："
+msgid "Only display a message the next time the event occurs"
+msgstr "仅在事件下次发生时显示消息"
 
-#. i18n: file ./protocols/msn/ui/msninfo.ui line 173
-#: rc.cpp:2589
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 150
+#: rc.cpp:1010
 #, no-c-format
-msgid "Mobile:"
-msgstr "手机："
+msgid "P&lay once"
+msgstr "播放一次(&L)"
 
-#. i18n: file ./protocols/msn/ui/msninfo.ui line 191
-#: rc.cpp:2592
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 153
+#: rc.cpp:1013
 #, no-c-format
-msgid "I am on &the contact list of this contact"
-msgstr "我位于此联系人的联系人列表中(&T)"
+msgid "Only play a sound the next time the event occurs"
+msgstr "仅在事件下次发生时播放声音"
 
-#. i18n: file ./protocols/msn/ui/msninfo.ui line 194
-#: rc.cpp:2595
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 164
+#: rc.cpp:1016
 #, no-c-format
-msgid "Show whether you are on the contact list of this user"
-msgstr "显示您是否位于该用户的联系人列表中"
+msgid "T&rigger once"
+msgstr "触发一次(&R)"
 
-#. i18n: file ./protocols/msn/ui/msninfo.ui line 198
-#: rc.cpp:2598
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 167
+#: rc.cpp:1019
 #, no-c-format
-msgid ""
-"If this box is checked, you are on this user's contact list.\n"
-"If not, the user has not added you to their list, or has removed you."
-msgstr ""
-"如果选中了此框，您就会出现于该用户的联系人列表中。\n"
-"如果此框未选中，该用户就没有将您添加到联系人列表中，或者已经将您删除。"
+msgid "Only start a chat the next time the event occurs"
+msgstr "仅当事件下次发生时启动聊天"
 
-#. i18n: file ./protocols/msn/msnchatui.rc line 13
-#: rc.cpp:2605
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 177
+#: rc.cpp:1022
 #, no-c-format
-msgid "&Debug"
-msgstr "调试(&D)"
+msgid "S&uppress standard notifications"
+msgstr "禁止标准通知(&U)"
 
-#. i18n: file ./protocols/msn/config/msnprefs.ui line 57
-#: rc.cpp:2611
+#. i18n: file ./kopete/contactlist/customnotifications.ui line 183
+#: rc.cpp:1025
 #, no-c-format
-msgid "&Automatically open a chat window when someone starts a conversation"
-msgstr "有人发起对话时自动打开聊天窗口(&A)"
+msgid ""
+"Check to prevent notifications common to all contacts from happening for this "
+"contact"
+msgstr "选中可使得全部联系人的通知不对此联系人生效"
 
-#. i18n: file ./protocols/msn/config/msnprefs.ui line 65
-#: rc.cpp:2614
+#. i18n: file ./kopete/grouptdeabcselectorwidget.ui line 49
+#: rc.cpp:1028
 #, no-c-format
-msgid "&Automatically download the display picture if possible"
-msgstr "可能时自动下载显示图片(&A)"
+msgid "Addressbook entry:"
+msgstr "地址簿项："
 
-#. i18n: file ./protocols/msn/config/msnprefs.ui line 76
-#: rc.cpp:2617
+#. i18n: file ./kopete/grouptdeabcselectorwidget.ui line 65
+#: rc.cpp:1031
 #, no-c-format
-msgid "Download and show custom emoticons (experimental)"
-msgstr "下载并显示自定义表情(试验中)"
+msgid "&Group"
+msgstr "组(&G)"
 
-#. i18n: file ./protocols/msn/config/msnprefs.ui line 97
-#: rc.cpp:2620
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 16
+#: rc.cpp:1034
 #, no-c-format
-msgid "Away Messages"
-msgstr "离开消息"
+msgid "Events"
+msgstr "事件"
 
-#. i18n: file ./protocols/msn/config/msnprefs.ui line 132
-#: rc.cpp:2623
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 27
+#: rc.cpp:1037
 #, no-c-format
-msgid "Send &away messages"
-msgstr "发送离开消息(&A)"
+msgid "Tray Flash && Bubble"
+msgstr "托盘闪烁和气泡"
 
-#. i18n: file ./protocols/msn/config/msnprefs.ui line 151
-#: rc.cpp:2626
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 38
+#: rc.cpp:1040
 #, no-c-format
-msgid "Do not send more than one away message every"
-msgstr "发送多个离开消息的间隔要大于"
+msgid "Flash s&ystem tray"
+msgstr "闪烁系统托盘(&Y)"
 
-#. i18n: file ./protocols/msn/config/msnprefs.ui line 170
-#: rc.cpp:2629
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 41
+#: rc.cpp:1043
 #, no-c-format
-msgid "seconds"
-msgstr "秒"
+msgid "Flash the system tray icon on an incoming message"
+msgstr "收到消息时闪烁系统托盘图标"
 
-#. i18n: file ./protocols/sms/ui/smsuserprefs.ui line 40
-#: rc.cpp:2632
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 44
+#: rc.cpp:1046
 #, no-c-format
-msgid "Some One"
-msgstr "有人"
+msgid "Flash the system tray icon whenever a message comes in."
+msgstr "收到消息时时闪烁系统托盘图标。"
 
-#. i18n: file ./protocols/sms/ui/smsuserprefs.ui line 70
-#: rc.cpp:2635 rc.cpp:2761 rc.cpp:2947
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 80
+#: rc.cpp:1049
 #, no-c-format
-msgid "&Telephone number:"
-msgstr "电话号码(&T)："
+msgid "&Left mouse click opens message"
+msgstr "左键单击打开消息(&L)"
 
-#. i18n: file ./protocols/sms/ui/smsuserprefs.ui line 76
-#: rc.cpp:2638 rc.cpp:2644
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 83
+#: rc.cpp:1052
 #, no-c-format
-msgid "The telephone number of the contact."
-msgstr "联系人的电话号码。"
+msgid ""
+"Left mouse click on flashing system tray opens message instead of "
+"restoring/minimizing contact list"
+msgstr "左键单击闪烁的系统托盘将打开消息而不是恢复/最小化联系人列表"
 
-#. i18n: file ./protocols/sms/ui/smsuserprefs.ui line 79
-#: rc.cpp:2641 rc.cpp:2647
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 86
+#: rc.cpp:1055
 #, no-c-format
 msgid ""
-"The telephone number of the contact.  This should be a number with SMS service "
-"available."
-msgstr "联系人的电话号码。这应该是已经开通了短信息服务的号码。"
+"A left mouse click on the flashing system tray icon opens the incoming message "
+"instead of restoring/minimizing the contact list (e.g. to check who is sending "
+"messages). A middle click always opens this message."
+msgstr "左键单击闪烁的系统托盘将打开消息而不是恢复/最小化联系人列表(例如为了查知是谁发送了消息)，中键单机时打开此消息。"
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 25
-#: rc.cpp:2650
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 96
+#: rc.cpp:1058
 #, no-c-format
-msgid "Account Preferences - SMS"
-msgstr "账户首选项 - SMS"
+msgid "Sho&w bubble"
+msgstr "显示气泡(&W)"
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 82
-#: rc.cpp:2659 rc.cpp:5402
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 99
+#: rc.cpp:1061
 #, no-c-format
-msgid "&Account name:"
-msgstr "账户名(&A)："
+msgid "Show a bubble on an incoming message"
+msgstr "收到消息时显示气泡"
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 88
-#: rc.cpp:2662 rc.cpp:2665 rc.cpp:2677 rc.cpp:2773 rc.cpp:2776 rc.cpp:2785
-#: rc.cpp:2788
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 102
+#: rc.cpp:1064
 #, no-c-format
-msgid "A unique name for this SMS account."
-msgstr "短信息账户的唯一名称。"
+msgid "Show a bubble whenever a message comes in."
+msgstr "收到消息时显示气泡。"
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 99
-#: rc.cpp:2668
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 138
+#: rc.cpp:1067
 #, no-c-format
-msgid "&SMS delivery service:"
-msgstr "短信息发送服务(&S)："
+msgid "Button \"&Ignore\" closes chat"
+msgstr "按钮“忽略”关闭聊天(&I)"
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 105
-#: rc.cpp:2671 rc.cpp:2680
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 141
+#: rc.cpp:1070
 #, no-c-format
-msgid "The delivery service that you would like to use."
-msgstr "您想要使用的短信息发送服务。"
+msgid ""
+"The \"Ignore\" button of the bubble closes the chat window for the sender"
+msgstr "气泡的“忽略”按钮将关闭发送者的聊天窗口"
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 108
-#: rc.cpp:2674 rc.cpp:2683
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 144
+#: rc.cpp:1073
 #, no-c-format
 msgid ""
-"The delivery service that you would like to use.  Note that you will need to "
-"have this software installed prior to using this account."
-msgstr "您想要使用的短信息发送服务。请注意，要使用此账户，您需要先安装此软件。"
+"If there is already a chat window opened for the sender of the message "
+"displayed in the bubble the \"Ignore\" button will close this chat window."
+msgstr "如果已经有一个和气泡中消息的发送者相对应的聊天窗口，点击“忽略”将会关闭此窗口。"
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 151
-#: rc.cpp:2686
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 182
+#: rc.cpp:1076
 #, no-c-format
-msgid "&Description"
-msgstr "描述(&D)"
+msgid "Close &bubble automatically after"
+msgstr "自动关闭气泡前等(&B)"
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 154
-#: rc.cpp:2689
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 188
+#: rc.cpp:1079
 #, no-c-format
-msgid "Description of the SMS delivery service."
-msgstr "短信息发送服务的描述。"
+msgid "Automatically close bubble after fixed amount of time"
+msgstr "在既定等待时间后自动关闭气泡"
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 157
-#: rc.cpp:2692
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 191
+#: rc.cpp:1082
 #, no-c-format
-msgid "Description of the SMS delivery service, including download locations."
-msgstr "短信息发送服务的描述，包括下载位置。"
+msgid ""
+"Bubbles will automatically be closed after a fixed amount of time. A closed one "
+"will be replaced by a new one if another message is waiting."
+msgstr "气泡会在一定的时间后自动关闭。如果已存在另一条等待在队列中的消息，它将会替换此气泡。"
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 188
-#: rc.cpp:2698
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 202
+#: rc.cpp:1085 rc.cpp:1449
 #, no-c-format
-msgid "To use SMS, you will need an account with a delivery service."
-msgstr "要使用短信息，您需要在发送服务处注册一个账户。"
+msgid " Sec"
+msgstr " 秒"
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 220
-#: rc.cpp:2701 rc.cpp:3106
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 238
+#: rc.cpp:1088
 #, no-c-format
-msgid "A&ccount Preferences"
-msgstr "账户首选项(&C)"
+msgid "Exclude non-highlighted messages in grou&p chats"
+msgstr "在群组聊天中排除非突出显示的消息(&P)"
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 231
-#: rc.cpp:2704
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 241
+#: rc.cpp:1091
 #, no-c-format
-msgid "Messaging Preferences"
-msgstr "时限首选项"
+msgid "Notify only highlighted messages in group chats"
+msgstr "仅通知群组聊天中突出显示的消息"
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 250
-#: rc.cpp:2707
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 244
+#: rc.cpp:1094
 #, no-c-format
-msgid "If the message is too &long:"
-msgstr "若消息过长(&L)："
+msgid ""
+"In very active group chats important messages can be singled out by excluding "
+"non-highlighted messages from notification."
+msgstr "在发言非常活跃的群组聊天中，可以仅对被高亮突出显示的重要消息发出系统通知。"
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 256
-#: rc.cpp:2710 rc.cpp:2725
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 252
+#: rc.cpp:1097
+#, no-c-format
+msgid "Exclude messages in chats on current des&ktop"
+msgstr "排除当前桌面中的聊天消息(&K)"
+
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 255
+#: rc.cpp:1100
 #, no-c-format
 msgid ""
-"What should happen if you type a message that is too long to fit in a single "
-"SMS message."
-msgstr "如果您输入的文字过长，一条短信息中容纳不下，则应采取什么操作。"
+"Do not display notification for messages in chat windows on current desktop"
+msgstr "不显示当前桌面中聊天窗口的消息通知"
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 259
-#: rc.cpp:2713 rc.cpp:2728
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 258
+#: rc.cpp:1103
 #, no-c-format
 msgid ""
-"What should happen if you type a message that is too long to fit in a single "
-"SMS message.  You can either choose to break it up into smaller messages "
-"automatically, cancel the message from being sent entirely, or have Kopete "
-"prompt you each time you enter a message that is too long."
+"This option allows you to turn off the notification of events for chat windows "
+"that are on the current desktop. If this option is turned on, then only chat "
+"windows on different desktops than the current one will notify you that an "
+"event has occured. Otherwise, all chat windows will notify you that an event "
+"has occured."
 msgstr ""
-"如果您输入的文字过长，一条短信息中容纳不下，则应采取什么操作。您可以选择将其自动拆成多条长度适当的信息，取消信息发送，或者让 Kopete "
-"每次提示您应该如何操作。"
+"此选项允许您在当前桌面上屏蔽来自聊天窗口的系统通知事件。如果您启用此选项，只有来自当前以外桌面上的聊天窗口所激发的事件会发出系统通知，若反之，所有聊天窗口的事件"
+"都会给出通知。"
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 265
-#: rc.cpp:2716
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 279
+#: rc.cpp:1109
 #, no-c-format
-msgid "Prompt (recommended)"
-msgstr "提示(推荐)"
+msgid "E&nable events while away"
+msgstr "离开时启用事件(&N)"
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 270
-#: rc.cpp:2719
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 282
+#: rc.cpp:1112
 #, no-c-format
-msgid "Break Into Multiple"
-msgstr "拆成多条"
+msgid "Enable events if your account status is \"Away\""
+msgstr "如果您的账户状态变成“离开”，则启用事件"
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 275
-#: rc.cpp:2722
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 285
+#: rc.cpp:1115
 #, no-c-format
-msgid "Cancel Sending"
-msgstr "取消发送"
+msgid ""
+"Enable notification events even if your account status is \"Away\" or less "
+"available, e.g. \"Not Available\" or \"Do not Disturb\". Note: This does not "
+"affect the flashing of the system tray icon."
+msgstr "即使账户处于“离开”或更隐秘化的状态(例如“不在”或“请勿打扰”)也依然启用通知事件。注意：此选项不对系统托盘图标的闪烁产生影响。"
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 295
-#: rc.cpp:2731
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 293
+#: rc.cpp:1118
 #, no-c-format
-msgid "&Enable phone number internationalization"
-msgstr "启用电话号码的国际化(&E)"
+msgid "Enable events for acti&ve chat windows"
+msgstr "聊天窗口激活时启用事件(&V)"
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 298
-#: rc.cpp:2734
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 296
+#: rc.cpp:1121
 #, no-c-format
-msgid "Check if you would like to enable phone number internationalization."
-msgstr "如果您想要将电话号码国际化，请选中此处。"
+msgid "Enable events for incoming messages if the chat window is active"
+msgstr "聊天窗口激活时启用收到消息的事件"
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 301
-#: rc.cpp:2737
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 299
+#: rc.cpp:1124
 #, no-c-format
 msgid ""
-"Check if you would like to enable phone number internationalization.  Without "
-"this option, you will only be able to use SMS for accounts within your country."
-msgstr "如果您想要将电话号码国际化，请选中此处。如果没有此选项，您将只能在您的国家内使用短信息账户。"
+"Enable notification events for incoming messages even if the receiving chat "
+"window is active. Note: Neither the system tray icon flashes nor the bubble is "
+"shown."
+msgstr "即使接收聊天消息的窗口正处于活动状态也依然对收到的消息启用通知事件。注意：不闪烁系统托盘图标，也不会显示弹出气泡。"
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 328
-#: rc.cpp:2740
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 307
+#: rc.cpp:1127
 #, no-c-format
-msgid "Substitute leading &zero with code:"
-msgstr "将前导零替换为代码(&Z)："
+msgid "Switch &to desktop containing chat on opening message"
+msgstr "打开消息时切换到包含聊天的桌面(&T)"
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 334
-#: rc.cpp:2743 rc.cpp:2746 rc.cpp:2755 rc.cpp:2758
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 310
+#: rc.cpp:1130
 #, no-c-format
-msgid "What you would like to substitute a leading zero with."
-msgstr "您想要将前导零替换为什么内容。"
+msgid ""
+"Switch to the desktop which contains the chat window for the sender when "
+"opening his/her message"
+msgstr "打开消息时切换到包含发送者聊天窗口的桌面"
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 356
-#: rc.cpp:2749
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 313
+#: rc.cpp:1133
 #, no-c-format
-msgid "+"
-msgstr "+"
+msgid ""
+"If there is already a chat window open for the sender of the message, opening "
+"his/her message will cause a switch to the desktop which contains this chat "
+"window."
+msgstr "如果已经有一个和气泡中消息的发送者相对应的聊天窗口，打开此消息将会切换到包含这个聊天窗口的桌面。"
 
-#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 359
-#: rc.cpp:2752
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 321
+#: rc.cpp:1136
 #, no-c-format
-msgid "1234567890+"
-msgstr "1234567890+"
+msgid "&Raise window on incoming message"
+msgstr "新消息到达时升起窗口(&R)"
 
-#. i18n: file ./protocols/sms/ui/smsadd.ui line 60
-#: rc.cpp:2764 rc.cpp:2779
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 324
+#: rc.cpp:1139
 #, no-c-format
-msgid "The telephone number of the contact you would like to add."
-msgstr "您想要添加的联系人电话号码。"
+msgid "Raise the chat window/tab on an incoming message"
+msgstr "收到消息时升起聊天窗口/标签"
 
-#. i18n: file ./protocols/sms/ui/smsadd.ui line 63
-#: rc.cpp:2767 rc.cpp:2782
+#. i18n: file ./kopete/config/behavior/behaviorconfig_events.ui line 327
+#: rc.cpp:1142
 #, no-c-format
 msgid ""
-"The telephone number of the contact you would like to add.  This should be a "
-"number with SMS service available."
-msgstr "您想要添加的联系人电话号码。这应该是已经开通了短信息服务的号码。"
+"If there is already a chat window opened for the sender of an incoming message "
+"this window will be put on the current desktop and in front of all other "
+"windows."
+msgstr "如果已经有一个和气泡中消息的发送者相对应的聊天窗口，此窗口将被移置到当前的桌面并被放在所有其它窗口的前面。"
 
-#. i18n: file ./protocols/sms/ui/smsadd.ui line 71
-#: rc.cpp:2770
+#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 16
+#: rc.cpp:1145
 #, no-c-format
-msgid "Contact na&me:"
-msgstr "联系人名称(&M)："
+msgid "Away Configuration"
+msgstr "离开配置"
 
-#. i18n: file ./protocols/sms/services/smsclientprefs.ui line 49
-#: rc.cpp:2791
+#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 44
+#: rc.cpp:1151
 #, no-c-format
-msgid "SMSClient Settings"
-msgstr "短信息设置"
+msgid "Number of away messages to remember:"
+msgstr "要记住的离开消息数："
 
-#. i18n: file ./protocols/sms/services/smsclientprefs.ui line 79
-#: rc.cpp:2794
+#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 47
+#: rc.cpp:1154 rc.cpp:1157 rc.cpp:1160 rc.cpp:1163
 #, no-c-format
-msgid "SMSClient &program:"
-msgstr "短信息客户程序(&P)："
+msgid ""
+"Kopete will remember this many away messages for use at a later date; if this "
+"limit is exceeded, the least-used message will be removed."
+msgstr "Kopete 将会记住次这么多离开消息，以便稍后使用；如果达到了此限制，最少使用的消息将会被丢弃。"
 
-#. i18n: file ./protocols/sms/services/smsclientprefs.ui line 90
-#: rc.cpp:2797 rc.cpp:2812
+#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 94
+#: rc.cpp:1166
 #, no-c-format
-msgid "Pro&vider:"
-msgstr "提供商(&V)："
+msgid "Auto Away"
+msgstr "自动离开"
 
-#. i18n: file ./protocols/sms/services/smsclientprefs.ui line 116
-#: rc.cpp:2800
+#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 98
+#: rc.cpp:1169
+#, fuzzy, no-c-format
+msgid ""
+"<p>If you check the <i>Use auto away</i> checkbox, Kopete will automaticaly set "
+"you globally away when the TDE screen saver starts, or after the selected "
+"minutes of user inactivity (i.e no mouse move, or key pressed)</p>\n"
+"<p>Kopete will set you available again when you come back if you checked <i>"
+"Become available when detecting activity again</i></p>"
+msgstr ""
+"<p>如果您选中了<i>使用自动离开</i>复选框，Kopete 将会在 TDE "
+"屏幕保护程序启动或用户发呆了指定时间(即不移动鼠标也不碰键盘)以后将您设置为全局离开</p>"
+"<p>如果您选中了<i>再次检测到活动后就上线</i>选项，Kopete 将会在您回来的时候将您设置为上线</p>"
+
+#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 109
+#: rc.cpp:1173
 #, no-c-format
-msgid "SMSClient &config path:"
-msgstr "短信息客户配置路径(&C)："
+msgid "&Use auto away"
+msgstr "使用自动离开(&U)"
 
-#. i18n: file ./protocols/sms/services/gsmlibprefs.ui line 49
-#: rc.cpp:2803
+#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 128
+#: rc.cpp:1176
 #, no-c-format
-msgid "GSMLib Settings"
-msgstr "GSMLib 设置"
+msgid "Become away after"
+msgstr "发呆"
 
-#. i18n: file ./protocols/sms/services/smssendprefs.ui line 49
-#: rc.cpp:2809
+#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 153
+#: rc.cpp:1179
 #, no-c-format
-msgid "SMSSend Options"
-msgstr "短信息发送选项"
+msgid "minutes of user inactivity"
+msgstr "分钟后就离开"
 
-#. i18n: file ./protocols/sms/services/smssendprefs.ui line 124
-#: rc.cpp:2815
+#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 183
+#: rc.cpp:1182
 #, no-c-format
-msgid "SMSSend prefi&x:"
-msgstr "短信息发送前缀(&X)："
+msgid "Become available when detecting activity again"
+msgstr "再次检测到活动后就上线"
 
-#. i18n: file ./protocols/sms/services/smssendprefs.ui line 159
-#: rc.cpp:2818
+#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 196
+#: rc.cpp:1185
 #, no-c-format
-msgid "Provider Options"
-msgstr "供应者选项"
+msgid "Auto Away Message"
+msgstr "自动离开消息"
 
-#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 16
-#: rc.cpp:2821
+#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 210
+#: rc.cpp:1188
 #, no-c-format
-msgid "Register Account - Gadu-Gadu"
-msgstr "注册账户 - Gadu-Gadu"
+msgid "Display the last away message used"
+msgstr "显示上次所用的离开消息"
 
-#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 66
-#: rc.cpp:2824
+#. i18n: file ./kopete/config/behavior/kopeteawayconfigbase.ui line 224
+#: rc.cpp:1191
 #, no-c-format
-msgid "Repeat pass&word:"
-msgstr "重复密码(&W)："
+msgid "Display the following away message:"
+msgstr "显示下列离开消息："
 
-#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 72
-#: rc.cpp:2827 rc.cpp:2878
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 27
+#: rc.cpp:1197
 #, no-c-format
-msgid "A confirmation of the password you would like to use."
-msgstr "对您想要使用的密码进行确认。"
+msgid "System Tray"
+msgstr "系统托盘"
 
-#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 75
-#: rc.cpp:2830 rc.cpp:2881
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 38
+#: rc.cpp:1200
 #, no-c-format
-msgid "A confirmation of the password you would like to use for this account."
-msgstr "对您想要为此账户使用的密码进行确认。"
+msgid "Show system tray &icon"
+msgstr "显示系统托盘图标(&I)"
 
-#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 86
-#: rc.cpp:2833 rc.cpp:2872
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 41
+#: rc.cpp:1203
 #, no-c-format
-msgid "The password you would like to use."
-msgstr "您想要使用的密码。"
+msgid "Show the icon in the system tray"
+msgstr "在系统托盘中显示图标"
 
-#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 89
-#: rc.cpp:2836 rc.cpp:2875
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 44
+#: rc.cpp:1206
 #, no-c-format
-msgid "The password you would like to use for this account."
-msgstr "您想要为此账户使用的密码。"
+msgid ""
+"By default, the system tray icon indicates new incoming messages by flashing "
+"and showing a bubble. A left or middle mouse click on the icon will open the "
+"message in a new chat window. Pressing the \"View\" button in the bubble has "
+"the same effect."
+msgstr ""
+"默认情况下，系统托盘在收到新消息时将会闪烁并显示气泡。用鼠标左键或中键单击图标将在新的聊天窗口中打开盖消息。按下气泡中的“查看”按钮作用相同。"
 
-#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 97
-#: rc.cpp:2839 rc.cpp:2848
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 55
+#: rc.cpp:1209
 #, no-c-format
-msgid "Your E-mail address."
-msgstr "您的电子邮件地址："
+msgid "Start with hidden &main window"
+msgstr "启动时隐藏主窗口(&M)"
 
-#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 100
-#: rc.cpp:2842 rc.cpp:2851
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 58
+#: rc.cpp:1212
 #, no-c-format
-msgid "The E-mail address you would like to use to register this account."
-msgstr "您想要用来注册此账户的电子邮件地址。"
+msgid "Start with the main window minimized to the system tray"
+msgstr "启动时主窗口最小化到系统托盘"
 
-#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 136
-#: rc.cpp:2845
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 61
+#: rc.cpp:1215
 #, no-c-format
-msgid "&E-Mail address:"
-msgstr "电子邮件地址(&E)："
+msgid ""
+"Start with the main window hidden. The only visible item is the system tray "
+"icon."
+msgstr "启动时隐藏主窗口。唯一可见的项目是系统托盘图标。"
 
-#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 184
-#: rc.cpp:2854
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 71
+#: rc.cpp:1218
 #, no-c-format
-msgid "&Verification sequence:"
-msgstr "校验序列(&V)："
+msgid "Message Handling"
+msgstr "消息处理"
 
-#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 190
-#: rc.cpp:2857 rc.cpp:2863
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 82
+#: rc.cpp:1221
 #, no-c-format
-msgid "The text from the image below."
-msgstr "上图中的文字。"
+msgid "Open messages instantl&y"
+msgstr "立即打开消息(&Y)"
 
-#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 193
-#: rc.cpp:2860 rc.cpp:2866
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 85
+#: rc.cpp:1224
+#, no-c-format
+msgid "Instantly open incoming messages"
+msgstr "立即打开收到的消息"
+
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 88
+#: rc.cpp:1227
 #, no-c-format
 msgid ""
-"The text from the image below.  This is used to prevent abusive automated "
-"registration scripts."
-msgstr "上图中的文字。这可以避免自动注册脚本的滥用。"
+"If there is no existing chat window a new window will be opened when a new "
+"message comes in. If there is already a chat window opened for the sender of "
+"the message it will be displayed there instantly."
+msgstr "当新的消息送达时如果没有既存的聊天窗口则打开一个新的窗口，如果已经存在一个聊天窗口的消息发送方和此消息来源一致，则当即在此予以显示。"
 
-#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 337
-#: rc.cpp:2884
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 96
+#: rc.cpp:1230
 #, no-c-format
-msgid "Gadu-Gadu registration token."
-msgstr "Gadu-Gadu 注册标记。"
+msgid "Use message &queue"
+msgstr "使用消息队列(&Q)"
 
-#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 340
-#: rc.cpp:2887
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 99
+#: rc.cpp:1233
 #, no-c-format
-msgid ""
-"This field contains an image with number that you need to type into the <b>"
-"Verification Sequence</b> field above."
-msgstr "此域中的图片中包含数字。要注册新帐户，您需要在下面的<b>校验序列</b>文字域输入图片所示的数字。"
+msgid "Use a message queue to store incoming messages"
+msgstr "使用消息队列存储收到的消息"
 
-#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 375
-#: rc.cpp:2890
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 102
+#: rc.cpp:1236
 #, no-c-format
 msgid ""
-"<i>Type the letters and numbers shown in the image above into the <b>"
-"Verification Sequence</b> field.  This is used to prevent automated "
-"registration abuse.</i>"
-msgstr "<i>输入上面<b>验证序列</b>域图像中显示的字母和数字。此功能用于防止自动注册机。</i>"
+"Store new incoming messages in a message queue. New messages are messages that "
+"cannot be displayed in an already open chat window. Only queued or stacked "
+"messages trigger notification via bubble, a flashing tray icon, or both.."
+msgstr "对新收到的消息使用队列。新消息是指那些无法显示在已打开的聊天窗口中的消息。只有队列中的消息才可通过气泡和/或闪烁托盘触发通知。"
 
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 40
-#: rc.cpp:2893 rc.cpp:3069
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 110
+#: rc.cpp:1239
 #, no-c-format
-msgid "Gadu-Gadu &UIN:"
-msgstr "Gadu-Gadu &UIN："
+msgid "Use message stac&k"
+msgstr "使用消息栈(&K)"
 
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 55
-#: rc.cpp:2896 rc.cpp:2902
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 113
+#: rc.cpp:1242
 #, no-c-format
-msgid "The user ID of the Gadu-Gadu account you would like to add."
-msgstr "您想要添加的 Gadu-Gadu 账户的用户 ID。"
+msgid "Use a message stack to store incoming messages"
+msgstr "对收到的消息使用队列"
 
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 58
-#: rc.cpp:2899 rc.cpp:2905
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 116
+#: rc.cpp:1245
 #, no-c-format
 msgid ""
-"The user ID of the Gadu-Gadu account you would like to add.  This should be in "
-"the form of a number (no decimals, no spaces).  This field is mandatory."
-msgstr "您想要添加的 Gadu-Gadu 账户的用户 ID，其格式应为数字(没有小数点，没有空格)。此域是必需的。"
-
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 79
-#: rc.cpp:2908
-#, no-c-format
-msgid "<i>(for example: 1234567)</i>"
-msgstr "<i>(例如：1234567)</i>"
+"Store new incoming messages in a message stack. New messages are messages that "
+"cannot be displayed in an already open chat window. Only queued or stacked "
+"messages trigger notification via bubble and flashing tray."
+msgstr "对新收到的消息使用队列。新消息是指那些无法显示在已打开的聊天窗口中的消息。只有队列中的消息才可通过气泡和闪烁托盘触发通知。"
 
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 109
-#: rc.cpp:2911
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 127
+#: rc.cpp:1248
 #, no-c-format
-msgid "&Forename:"
-msgstr "名(&F)："
+msgid "Queue/stack &unread messages"
+msgstr "未读消息排队(&U)"
 
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 115
-#: rc.cpp:2914 rc.cpp:2956
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 130
+#: rc.cpp:1251
 #, no-c-format
-msgid "The forename of the contact you wish to add."
-msgstr "您想要添加的联系人的名。"
+msgid "Also add unread messages to queue/stack"
+msgstr "也将未读消息添加到队列"
 
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 118
-#: rc.cpp:2917 rc.cpp:2959
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 133
+#: rc.cpp:1254
 #, no-c-format
 msgid ""
-"The forename (first name) of the contact you wish to add.  Optionally this may "
-"include a middle name."
-msgstr "您想要添加的联系人的名。这里也可以包含中间名。"
+"Unread messages are messages that will be displayed in an already opened but "
+"inactive chat window. Only incoming queued messages trigger notification via "
+"the bubble, the flashing tray icon, or both. With this option disabled only new "
+"incoming messages are queued, i.e. messages that cannot be displayed in an "
+"already open chat window."
+msgstr ""
+"未读的消息会在一个已经打开的非活动聊天窗口内显示，只有新到消息队列会通过弹出气泡或闪烁系统托盘(或是两者皆有)来通知用户。如果启用此选项将不再只有新到消息会被转"
+"入队列，这意味着这些消息将不能够在一个已经打开的聊天窗口内显示。"
 
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 129
-#: rc.cpp:2920
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 154
+#: rc.cpp:1260
 #, no-c-format
-msgid "&Surname:"
-msgstr "姓(&S)："
+msgid "Connect automatically at &startup"
+msgstr "启动时自动连接(&S)"
 
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 135
-#: rc.cpp:2923 rc.cpp:2962
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 157
+#: rc.cpp:1263
 #, no-c-format
-msgid "The surname of the contact you wish to add."
-msgstr "您想要添加的联系人的姓。"
+msgid "Connect all your accounts automatically when starting Kopete"
+msgstr "启动 Kopete 时自动连接到您的全部账户"
 
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 138
-#: rc.cpp:2926 rc.cpp:2965
+#. i18n: file ./kopete/config/behavior/behaviorconfig_general.ui line 160
+#: rc.cpp:1266
 #, no-c-format
-msgid "The surname (last name) of the contact you wish to add."
-msgstr "您想要添加的联系人的姓。"
+msgid ""
+"When starting Kopete all your accounts will be connected automatically. Note: "
+"You can exclude accounts individually in their properties."
+msgstr "启动 Kopete 时您的账户将会被自动连接。注意：您可以在账户的属性中单独排除账户。"
 
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 160
-#: rc.cpp:2932 rc.cpp:2935 rc.cpp:2968 rc.cpp:2971
+#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 27
+#: rc.cpp:1272
 #, no-c-format
-msgid "A nickname for the contact you wish to add."
-msgstr "您想要添加的联系人的昵称。"
+msgid "&Interface Preference"
+msgstr "界面首选项(&I)"
 
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 182
-#: rc.cpp:2938
+#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 90
+#: rc.cpp:1275
 #, no-c-format
-msgid "&Email address:"
-msgstr "电子邮件地址(&E)："
+msgid "Chat Window Grouping &Policy"
+msgstr "聊天窗口分组策略(&P)"
 
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 188
-#: rc.cpp:2941 rc.cpp:2944 rc.cpp:2950 rc.cpp:2953 rc.cpp:2974 rc.cpp:2977
-#: rc.cpp:2980 rc.cpp:2983
+#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 99
+#: rc.cpp:1278
 #, no-c-format
-msgid "E-Mail address for this contact."
-msgstr "此联系人的电子邮件地址。"
+msgid "Open All Messages in New Chat Window"
+msgstr "在新聊天窗口中打开所有消息"
 
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 311
-#: rc.cpp:2986
+#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 104
+#: rc.cpp:1281
 #, no-c-format
-msgid "Offline to contact when you set \"&Just for friends\""
-msgstr "设置“只对好友”时对此联系人离线(&J)"
+msgid "Group Messages From Same Account in Same Chat Window"
+msgstr "在同一聊天窗口中按照账户对消息分组"
 
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 314
-#: rc.cpp:2989 rc.cpp:2992
+#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 109
+#: rc.cpp:1284
 #, no-c-format
-msgid ""
-"Check if you want to exclude this contact from the \"Just for friends\" status "
-"mode."
-msgstr "如果您想要将此联系人排除在“只对好友”状态模式之外，请选中此处。"
+msgid "Group All Messages in Same Chat Window"
+msgstr "在同一聊天窗口中按消息分组"
 
-#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 323
-#: rc.cpp:2995
+#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 114
+#: rc.cpp:1287
 #, no-c-format
-msgid "Group"
-msgstr "组"
+msgid "Group Messages From Contacts in Same Group in Same Chat Window"
+msgstr "将来自同一组联系人的消息分组在相同的聊天窗口中"
 
-#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 19
-#: protocols/gadu/gaduaway.cpp:40 rc.cpp:2998
+#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 119
+#: rc.cpp:1290
 #, no-c-format
-msgid "Away Dialog"
-msgstr "离开对话框"
+msgid "Group Messages From Same Metacontact in Same Chat Window"
+msgstr "将来自同一组联系人的消息分组在相同的聊天窗口中"
 
-#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 52
-#: rc.cpp:3004
+#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 138
+#: rc.cpp:1293
 #, no-c-format
 msgid ""
-"Choose status, by default present status is selected. \n"
-"So all you need to do is just to type in your description. \n"
-"Choosing Offline status will disconnect you, with given description."
+"<dl>\n"
+"                                <dt><tt>Open all messages in a new chat "
+"window</tt>\n"
+"                                <dd>Every chat will have its own window.\n"
+"                                <dt><tt>Group messages from the same account in "
+"the same chat window</tt>\n"
+"                                <dd>All chats for one account get grouped in to "
+"one window by using tabs.\n"
+"                                <dt><tt>Group all messages in the same chat "
+"window</tt>\n"
+"                                <dd>All chats get grouped in to one window by "
+"using tabs.\n"
+"                                <dt><tt>Group messages from contacts in the "
+"same group in the same chat window</tt>\n"
+"                                <dd>All chats from one group get grouped in to "
+"one window by using tabs.\n"
+"                                <dt><tt>Group messages from the same "
+"metacontact in the same chat window</tt>\n"
+"                                <dd>All chats from one metacontact get grouped "
+"in to one window by using tabs.\n"
+"                                </dl>\n"
+"                        "
 msgstr ""
-"选择状态，默认情况下会选中当前状态。\n"
-"所以，您所需要的做的仅仅是输入您的描述。\n"
-"选择离线状态将把您断开，并给出相应描述。"
+"<dl>\n"
+"                                <dt><tt>在新聊天窗口中打开所有消息</tt>\n"
+"                                <dd>每一段聊天对话都有专属于自己的聊天窗口。\n"
+"                                <dt><tt>在同一聊天窗口中按照账户对消息分组</tt>\n"
+"                                <dd>来自同一账户的所有消息都会被按标签分组到一个聊天窗口内。\n"
+"                                <dt><tt>在同一聊天窗口中按消息分组</tt>\n"
+"                                <dd>所有消息都被按标签分组到一个聊天窗口内。\n"
+"                                <dt><tt>将来自同一组联系人的消息分组在相同的聊天窗口中</tt>\n"
+"                                <dd>来自同一组的所有消息都被按标签分组到一个聊天窗口内。\n"
+"                                <dt><tt>将来自同一超级联系人的消息分组在相同的聊天窗口中</tt>\n"
+"                                <dd>来自同一超级联系人的所有消息都被按标签分组到一个聊天窗口内。\n"
+"                                </dl>\n"
+"                        "
 
-#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 71
-#: protocols/msn/msnprotocol.cpp:52 protocols/oscar/icq/icqpresence.cpp:77
-#: rc.cpp:3009
+#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 156
+#: rc.cpp:1308
 #, no-c-format
-msgid "O&nline"
-msgstr "在线(&N)"
+msgid "High&light messages containing your nickname"
+msgstr "突出显示包含您昵称的消息(&L)"
 
-#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 77
-#: rc.cpp:3012
+#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 172
+#: rc.cpp:1311
 #, no-c-format
-msgid "Set your status to Online."
-msgstr "将您的状态设为在线。"
+msgid "E&nable automatic spell checking"
+msgstr "启用自动检查拼写(&N)"
 
-#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 80
-#: rc.cpp:3015
+#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 180
+#: rc.cpp:1314
 #, no-c-format
-msgid ""
-"Set your status to Online, indicating that you are available to chat with "
-"anyone who wishes."
-msgstr "将您的状态设为在线，这表明您可以和别人开聊。"
+msgid "&Show events in chat window"
+msgstr "在聊天窗口中显示事件(&S)"
 
-#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 94
-#: rc.cpp:3021
+#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 196
+#: rc.cpp:1317
 #, no-c-format
-msgid "Set your status to busy."
-msgstr "将您的状态设为忙碌。"
+msgid "T&runcate contact name with more characters than:"
+msgstr "截断联系人姓名，若字符数多于(&R)："
 
-#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 97
-#: rc.cpp:3024
+#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 245
+#: rc.cpp:1320
 #, no-c-format
-msgid ""
-"Set your status to busy, indicating that you may should not be bothered with "
-"trivial chat, and may not be able to reply immediately."
-msgstr "将您的状态设为忙碌，这表明您可能正处于免打扰的私聊中，而无法立即回复。"
+msgid "&Maximum number of chat window lines:"
+msgstr "最多的聊天窗口行数(&M)："
 
-#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 111
-#: rc.cpp:3030
+#. i18n: file ./kopete/config/behavior/behaviorconfig_chat.ui line 251
+#: rc.cpp:1323
 #, no-c-format
 msgid ""
-"Set status to invisible, which will hide your presence from other users."
-msgstr "将状态设为隐身，这将使其他用户无法看到您。"
+"Limit the maximum number of lines visible in a chat window to improve speed for "
+"complex layouts."
+msgstr "限制聊天窗口中可见的最多行数，以便改进复杂版面的速度。"
 
-#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 114
-#: rc.cpp:3033
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 24
+#: rc.cpp:1326
 #, no-c-format
-msgid ""
-"Set status to invisible, which will hide your presence from other users (who "
-"will see you as offline).  However you may still chat, and see the online "
-"presence of others."
-msgstr "将状态设为隐身，这将使其他用户无法看到您(而只会看到您离线)。但是，您仍然可以参与聊天，并查看其他在线联系人的状态。"
+msgid "Video"
+msgstr "视频"
 
-#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 128
-#: rc.cpp:3039 rc.cpp:3042
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 47
+#: rc.cpp:1329
 #, no-c-format
-msgid "Choose this status to disconnect with description entered below."
-msgstr "选择此状态将以下面的描述断开连接。"
+msgid "Device"
+msgstr "设备"
 
-#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 151
-#: rc.cpp:3045
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 66
+#: rc.cpp:1332
 #, no-c-format
-msgid "&Message:"
-msgstr "消息(&M)："
+msgid "&Video Device Configuration"
+msgstr "视频设备配置(&V)"
 
-#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 157
-#: rc.cpp:3048 rc.cpp:3054
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 93
+#: rc.cpp:1335 rc.cpp:2470
 #, no-c-format
-msgid "Description of your status."
-msgstr "您状态的描述。"
+msgid "Device:"
+msgstr "设备："
 
-#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 160
-#: rc.cpp:3051 rc.cpp:3057
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 101
+#: rc.cpp:1338
 #, no-c-format
-msgid "Description of your status (up to 70 characters)."
-msgstr "在此输入您的状态描述(最多70个字符)。"
+msgid "Input:"
+msgstr "输入："
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 24
-#: rc.cpp:3060
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 109
+#: rc.cpp:1341
 #, no-c-format
-msgid "Account Preferences - Gadu-Gadu"
-msgstr "账户首选项 - Gadu-Gadu"
+msgid "Standard:"
+msgstr "标准："
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 78
-#: rc.cpp:3072 rc.cpp:3078
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 174
+#: rc.cpp:1344
 #, no-c-format
-msgid "The user ID of your Gadu-Gadu account."
-msgstr "您 Gadu-Gadu 账户的用户 ID。"
+msgid "Con&trols"
+msgstr "控制(&T)"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 81
-#: rc.cpp:3075 rc.cpp:3081
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 193
+#: rc.cpp:1347
 #, no-c-format
-msgid ""
-"The user ID of your Gadu-Gadu account.  This should be in the form of a number "
-"(no decimals, no spaces)."
-msgstr "您 Gadu-Gadu 账户的用户 ID，其格式应为数字(无小数点，无空格)。"
+msgid "&Image Adjustment"
+msgstr "图像调整(&I)"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 125
-#: rc.cpp:3087
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 228
+#: rc.cpp:1350
 #, no-c-format
-msgid ""
-"Check to disable automatic connection.  If checked, you may connect to this "
-"account manually using the icon in the bottom of the main Kopete window."
-msgstr "选中此处禁止自动连接。如果选中的话，您可以使用 Kopete 主窗口底部的图标手动连接此账户。"
+msgid "Brightness:"
+msgstr "亮度："
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 169
-#: rc.cpp:3093
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 244
+#: rc.cpp:1353
 #, no-c-format
-msgid ""
-"To connect to the Gadu-Gadu network, you will need a Gadu-Gadu account."
-"<br>"
-"<br>\n"
-"If you do not currently have an account, please click the button to create one."
-msgstr ""
-"要连接到 Gadu-Gadu 网络，您必须有一个 Gadu-Gadu 账户。"
-"<br>"
-"<br>\n"
-"如果您从未申请过 Gadu-Gadu 账户，请点击上面的注册按钮。"
+msgid "Contrast:"
+msgstr "对比度："
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 186
-#: rc.cpp:3100 rc.cpp:3103 rc.cpp:4073 rc.cpp:4076 rc.cpp:4536 rc.cpp:4539
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 260
+#: rc.cpp:1356
 #, no-c-format
-msgid "Register a new account on this network."
-msgstr "在此网络上注册新账户。"
+msgid "Saturation:"
+msgstr "饱和度："
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 260
-#: rc.cpp:3112
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 276
+#: rc.cpp:1359
 #, no-c-format
-msgid "&Use direct connections (DCC)"
-msgstr "使用直接连接(DCC)(&U)"
+msgid "Whiteness:"
+msgstr "白度："
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 279
-#: rc.cpp:3115
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 292
+#: rc.cpp:1362
 #, no-c-format
-msgid "Use protocol encr&yption (SSL):"
-msgstr "使用协议加密(SSL)(&Y)："
+msgid "Hue:"
+msgstr "色度："
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 285
-#: rc.cpp:3118 rc.cpp:3133
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 443
+#: rc.cpp:1365
 #, no-c-format
-msgid ""
-"Whether or not you want to enable SSL encrypted communication with the server."
-msgstr "您是否要在与服务器通讯时启用 SSL 加密。"
+msgid "Optio&ns"
+msgstr "选项(&N)"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 288
-#: rc.cpp:3121 rc.cpp:3136
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 470
+#: rc.cpp:1368
 #, no-c-format
-msgid ""
-"Whether or not you want to enable SSL encrypted communication with the server.  "
-"Note that this is not end-to-end encryption, but rather encrypted communication "
-"with the server."
-msgstr "您是否要在与服务器通讯时启用 SSL 加密。请注意，这不是端到端的加密，而只是与服务器的通讯加密。"
+msgid "Image options"
+msgstr "图像选项"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 294
-#: rc.cpp:3124
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 489
+#: rc.cpp:1371
 #, no-c-format
-msgid "If Available"
-msgstr "若可用"
+msgid "Au&tomatic brightness/contrast adjustment"
+msgstr "自动调整亮度/对比度(&T)"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 299
-#: rc.cpp:3127
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 505
+#: rc.cpp:1374
 #, no-c-format
-msgid "Required"
-msgstr "按需"
+msgid "Automatic color correction"
+msgstr "自动纠正颜色"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 333
-#: rc.cpp:3139
+#. i18n: file ./kopete/config/avdevice/avdeviceconfig_videoconfig.ui line 524
+#: rc.cpp:1377
 #, no-c-format
-msgid "C&ache server information"
-msgstr "缓存服务器信息(&A)"
+msgid "See preview mirrored"
+msgstr "镜像显示预览"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 339
-#: rc.cpp:3142
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 16
+#: rc.cpp:1380
 #, no-c-format
-msgid ""
-"Cache connection information for each server connected to in case the main "
-"load-balancing server fails."
-msgstr "缓存每个服务器的连接信息，以防主负载均衡服务器宕机。"
+msgid "Contact List Appearance"
+msgstr "联系人列表外观"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 342
-#: rc.cpp:3145
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 35
+#: rc.cpp:1383
 #, no-c-format
-msgid ""
-"This option is used whenever the primary Gadu-Gadu load-balancing server fails. "
-" If this is checked, Kopete will try to connect to the actual servers directly "
-"using cached information about them.  This prevents connection errors when the "
-"main load-balancing server does not answer. In practice it only helps very "
-"rarely."
-msgstr ""
-"当主 Gadu-Gadu 负载均衡服务器宕机时，会使用此选项。如果选中了此选项，Kopete "
-"将会试图按照缓存的信息直接连接到实际服务器。当主负载均衡服务器不响应时，这样将会避免连接错误。不过从实际上来说，发生这种情况的可能性微乎其微。"
+msgid "Layout"
+msgstr "布局"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 353
-#: rc.cpp:3148
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 46
+#: rc.cpp:1386
 #, no-c-format
-msgid "Ignore people off your contact list"
-msgstr "忽略不在您的联系人列表中的人"
+msgid "Arrange metacontacts by &group"
+msgstr "按组排列超级联系人(&G)"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 371
-#: rc.cpp:3151
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 54
+#: rc.cpp:1389
 #, no-c-format
-msgid "U&ser Information"
-msgstr "用户信息(&S)"
+msgid "Show tree &branch lines"
+msgstr "显示树形线(&B)"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 397
-#: rc.cpp:3154
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 87
+#: rc.cpp:1392
 #, no-c-format
-msgid ""
-"<p align=\"center\">You must be connected to change your Personal "
-"Information.</p>"
-msgstr "<p align=\"center\">要更改您的个人信息，您必须先连接。</p>"
+msgid "In&dent contacts"
+msgstr "缩进联系人(&D)"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 408
-#: rc.cpp:3157
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 99
+#: rc.cpp:1395
 #, no-c-format
-msgid "User Information"
-msgstr "用户信息"
+msgid "Contact Display Mode"
+msgstr "联系人显示模式"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 443
-#: rc.cpp:3163 rc.cpp:3217
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 110
+#: rc.cpp:1398
 #, no-c-format
-msgid "Surname:"
-msgstr "姓："
+msgid "List Style"
+msgstr "列表样式"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 451
-#: rc.cpp:3166
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 121
+#: rc.cpp:1401
 #, no-c-format
-msgid "Your nick name:"
-msgstr "您的昵称："
+msgid "&Classic, left-aligned status icons"
+msgstr "经典的左对齐状态图标(&C)"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 459
-#: rc.cpp:3169 rc.cpp:3232
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 124
+#: rc.cpp:1404
 #, no-c-format
-msgid "Gender:"
-msgstr "性别："
+msgid "Alt+C"
+msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 467
-#: rc.cpp:3172
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 135
+#: rc.cpp:1407
 #, no-c-format
-msgid "Year of birth:"
-msgstr "出生年份："
+msgid "&Right-aligned status icons"
+msgstr "右对齐的状态图标(&R)"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 475
-#: rc.cpp:3175 rc.cpp:3223 rc.cpp:3472 rc.cpp:3767 rc.cpp:4004 rc.cpp:4377
-#: rc.cpp:4392
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 138
+#: rc.cpp:1410
 #, no-c-format
-msgid "City:"
-msgstr "城市："
+msgid "Alt+R"
+msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 520
-#: protocols/oscar/icq/icqprotocol.cpp:215 rc.cpp:3178 rc.cpp:3238
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 146
+#: rc.cpp:1413
 #, no-c-format
-msgid "Female"
-msgstr "女"
+msgid "Detailed &view"
+msgstr "细节视图(&V)"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 525
-#: protocols/oscar/icq/icqprotocol.cpp:216 rc.cpp:3181 rc.cpp:3235
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 149
+#: rc.cpp:1416
 #, no-c-format
-msgid "Male"
-msgstr "男"
+msgid "Alt+V"
+msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 560
-#: rc.cpp:3184
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 159
+#: rc.cpp:1419
 #, no-c-format
-msgid ""
-"Values below are going to be used in search, but will not appear in results."
-msgstr "下面的值将会用于搜索，但不会出现在结果中。"
+msgid "Use contact photos when available"
+msgstr "可用时使用联系人照片"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 601
-#: rc.cpp:3187
-#, no-c-format
-msgid "Maiden name:"
-msgstr "婚前性："
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 171
+#: rc.cpp:1422
+#, fuzzy, no-c-format
+msgid "Displayed Theme Path"
+msgstr "显示名字"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 609
-#: rc.cpp:3190
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 192
+#: rc.cpp:1425
 #, no-c-format
-msgid "City of origin:"
-msgstr "出生城市："
+msgid "Contact List Animations"
+msgstr "联系人列表动画"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 651
-#: rc.cpp:3193
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 203
+#: rc.cpp:1428
 #, no-c-format
-msgid "&File Transfer"
-msgstr "文件传送(&F)"
+msgid "&Animate changes to contact list items"
+msgstr "联系人列表项的更改用动画显示(&A)"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 665
-#: rc.cpp:3196
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 206
+#: rc.cpp:1431
 #, no-c-format
-msgid "Global DCC Options"
-msgstr "全局 DCC 选项"
+msgid "Alt+A"
+msgstr ""
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 676
-#: rc.cpp:3199
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 214
+#: rc.cpp:1434
 #, no-c-format
-msgid ""
-"<qt><p align=\"center\"><font color=\"#ff0000\">These options affect <b>all</b> "
-"Gadu-Gadu accounts.</font></p></qt>"
-msgstr ""
-"<qt><p align=\"center\"><font color=\"#ff0000\">这些选项影响<b>全部</b> "
-"Gadu-Gadu 账户。</font></p></qt>"
+msgid "Fade in / out contacts as the&y appear / disappear"
+msgstr "联系人出现/消失时淡入淡出(&Y)"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 684
-#: rc.cpp:3202
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 222
+#: rc.cpp:1437
 #, no-c-format
-msgid "&Override default configuration"
-msgstr "覆盖默认配置(&O)"
+msgid "Fo&ld in / out contacts as they appear / disappear"
+msgstr "联系人出现/消失时拉入拉出(&L)"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 714
-#: rc.cpp:3205
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 232
+#: rc.cpp:1440
 #, no-c-format
-msgid "Local &IP address /"
-msgstr "本地 IP 地址(&I) /"
+msgid "Contact List Auto-Hide"
+msgstr "联系人列表自动隐藏"
 
-#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 752
-#: rc.cpp:3211
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 235
+#: rc.cpp:1443
 #, no-c-format
-msgid "0.0.0.0"
-msgstr "0.0.0.0"
+msgid ""
+"When enabled, the contact list will automatically be hidden a fixed amount of "
+"time after the mouse cursor leaves the window. You can set the amount of time "
+"in the 'Time until autohide' box below."
+msgstr "启用时，当鼠标指针离开窗口指定时间后将会自动隐藏联系人列表。您可以在下面的“自动隐藏的等待时长”中设定该时间。"
 
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 104
-#: rc.cpp:3220 rc.cpp:4701
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 246
+#: rc.cpp:1446
 #, no-c-format
-msgid "Nick:"
-msgstr "昵称："
+msgid "A&uto-hide contact list"
+msgstr "自动隐藏联系人列表(&U)"
 
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 162
-#: rc.cpp:3226
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 294
+#: rc.cpp:1452
 #, no-c-format
-msgid "Age from:"
-msgstr "年龄从："
+msgid "The timeout value for both contact list and scrollbar auto-hiding."
+msgstr "联系人列表和滚动条自动隐藏的超时值。"
 
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 190
-#: rc.cpp:3229
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 305
+#: rc.cpp:1455
 #, no-c-format
-msgid "to:"
-msgstr "到："
+msgid "after the cursor left the window"
+msgstr "光标离开窗口后"
 
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 304
-#: rc.cpp:3241
+#. i18n: file ./kopete/config/appearance/appearanceconfig_contactlist.ui line 342
+#: rc.cpp:1458
 #, no-c-format
-msgid "User number:"
-msgstr "用户号："
+msgid "Change &Tooltip Contents..."
+msgstr "更改工具提示内容(&T)..."
 
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 327
-#: rc.cpp:3244
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 44
+#: rc.cpp:1467
 #, no-c-format
-msgid "Request information about user:"
-msgstr "请求关于用户的信息："
+msgid "Base font:"
+msgstr "基本字体："
 
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 341
-#: rc.cpp:3247
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 60
+#: rc.cpp:1470
 #, no-c-format
-msgid "Search by specified data:"
-msgstr "按照指定数据搜索："
+msgid "Highlight foreground:"
+msgstr "突出显示前景："
 
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 357
-#: rc.cpp:3250
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 91
+#: rc.cpp:1473
 #, no-c-format
-msgid "Lookup only those that are currently online"
-msgstr "只查阅在线用户"
+msgid "Base font color:"
+msgstr "基本字体颜色："
 
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 450
-#: rc.cpp:3262
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 122
+#: rc.cpp:1476
 #, no-c-format
-msgid "Age"
-msgstr "年龄"
+msgid "Highlight background:"
+msgstr "突出显示背景："
 
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 461
-#: rc.cpp:3265
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 130
+#: rc.cpp:1479
 #, no-c-format
-msgid "City"
-msgstr "城市"
+msgid "Link color:"
+msgstr "链接颜色："
 
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 472
-#: rc.cpp:3268 rc.cpp:3544
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 138
+#: rc.cpp:1482
 #, no-c-format
-msgid "UIN"
-msgstr "UIN"
+msgid "Background color:"
+msgstr "背景颜色："
 
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 483
-#: rc.cpp:3271
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 153
+#: rc.cpp:1485
 #, no-c-format
-msgid "12"
-msgstr "12"
+msgid "Formatting Overrides"
+msgstr "格式覆盖"
 
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 486
-#: rc.cpp:3274
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 164
+#: rc.cpp:1488
 #, no-c-format
-msgid "DONT_TRANSLATE"
-msgstr "不翻译"
+msgid "Do not show user specified &background color"
+msgstr "不显示用户指定的背景色(&B)"
 
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 489
-#: rc.cpp:3277 rc.cpp:3283
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 172
+#: rc.cpp:1491
 #, no-c-format
-msgid "DONT_TRANSL"
-msgstr "不翻译"
+msgid "Do not show user specified &foreground color"
+msgstr "不显示用户指定的前景色(&F)"
 
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 492
-#: rc.cpp:3280
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 180
+#: rc.cpp:1494
 #, no-c-format
-msgid "999"
-msgstr "999"
+msgid "Do not show user specified &rich text"
+msgstr "不显示用户指定的丰富文本(&R)"
 
-#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 498
-#: rc.cpp:3286
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 201
+#: rc.cpp:1500
 #, no-c-format
-msgid "245324956234"
-msgstr "245324956234"
+msgid "Use custom fonts for contact list items"
+msgstr "为联系人列表项使用自定义字体"
 
-#. i18n: file ./protocols/oscar/aim/ui/aimjoinchatbase.ui line 27
-#: rc.cpp:3289
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 253
+#: rc.cpp:1503
+#, fuzzy, no-c-format
+msgid "Group font:"
+msgstr "群组聊天"
+
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 282
+#: rc.cpp:1506
 #, no-c-format
-msgid "Please enter the name of the chat room you wish to join."
-msgstr "请输入您想要加入的聊天室名称。"
+msgid "Normal font:"
+msgstr "普通字体："
 
-#. i18n: file ./protocols/oscar/aim/ui/aimjoinchatbase.ui line 69
-#: rc.cpp:3292
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 311
+#: rc.cpp:1509
 #, no-c-format
-msgid "Room &name:"
-msgstr "房间名(&N)："
+msgid "Small font:"
+msgstr "小字体："
 
-#. i18n: file ./protocols/oscar/aim/ui/aimjoinchatbase.ui line 80
-#: rc.cpp:3295
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 360
+#: rc.cpp:1512
 #, no-c-format
-msgid "E&xchange:"
-msgstr "交换(&X)："
+msgid "Recolor contacts marked as idle:"
+msgstr "将标为发呆的联系人重新着色为："
 
-#. i18n: file ./protocols/oscar/aim/ui/aimaddcontactui.ui line 27
-#: rc.cpp:3298 rc.cpp:3884
+#. i18n: file ./kopete/config/appearance/appearanceconfig_colors.ui line 368
+#: rc.cpp:1515
 #, no-c-format
-msgid "Contact Information"
-msgstr "联系人信息"
+msgid "Group name color:"
+msgstr "组名颜色："
 
-#. i18n: file ./protocols/oscar/aim/ui/aimaddcontactui.ui line 53
-#: rc.cpp:3301
+#. i18n: file ./kopete/config/appearance/emoticonseditwidget.ui line 16
+#: rc.cpp:1518
+#, fuzzy, no-c-format
+msgid "EmoticonsEditWidget"
+msgstr "表情(&E)"
+
+#. i18n: file ./kopete/config/appearance/emoticonseditwidget.ui line 35
+#: rc.cpp:1521
 #, no-c-format
-msgid "AIM screen name:"
-msgstr "AIM 屏幕名："
+msgid "Add..."
+msgstr "添加..."
 
-#. i18n: file ./protocols/oscar/aim/ui/aiminfobase.ui line 51
-#: rc.cpp:3304 rc.cpp:4356
+#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 24
+#: rc.cpp:1530
 #, no-c-format
-msgid "Nickname:"
-msgstr "昵称："
+msgid "&Use emoticons"
+msgstr "使用表情(&U)"
 
-#. i18n: file ./protocols/oscar/aim/ui/aiminfobase.ui line 80
-#: rc.cpp:3307
+#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 30
+#: rc.cpp:1533
 #, no-c-format
-msgid "Screen name:"
-msgstr "屏幕名："
+msgid ""
+"If this is checked, the text representation of emoticons in messages will be "
+"replaced by an image"
+msgstr "如果选中了此选项，消息中用文本表示的表情将被替换为图像"
 
-#. i18n: file ./protocols/oscar/aim/ui/aiminfobase.ui line 122
-#: rc.cpp:3313
+#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 38
+#: rc.cpp:1536
 #, no-c-format
-msgid "Idle minutes:"
-msgstr "发呆分钟："
+msgid "&Require separators (spaces) around emoticons"
+msgstr "表情周围需要分隔符(空格)(&R)"
 
-#. i18n: file ./protocols/oscar/aim/ui/aiminfobase.ui line 201
-#: rc.cpp:3322
+#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 44
+#: rc.cpp:1539
 #, no-c-format
-msgid "Profile:"
-msgstr "配置文件："
+msgid ""
+"If this is checked, only emoticons that are separated from the text by spaces "
+"will be shown as images."
+msgstr "如果选中的话，只有那些与文本之间用空格分隔的表情会显示为图像。"
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 24
-#: rc.cpp:3325
+#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 55
+#: rc.cpp:1542
 #, no-c-format
-msgid "Account Preferences - AIM"
-msgstr "账户首选项 - AIM"
+msgid "Select emoticon theme:"
+msgstr "选择表情主题："
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 86
-#: rc.cpp:3334
+#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 68
+#: rc.cpp:1545
 #, no-c-format
-msgid "AIM &screen name:"
-msgstr "AIM 屏幕名(&S)："
+msgid "Preview:"
+msgstr "预览："
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 92
-#: rc.cpp:3337 rc.cpp:3343
+#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 106
+#: rc.cpp:1548
 #, no-c-format
-msgid "The screen name of your AIM account."
-msgstr "您 AIM 账户的屏幕名。"
+msgid "&Get New Themes..."
+msgstr "获得新主题(&G)..."
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 95
-#: rc.cpp:3340 rc.cpp:3346
+#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 109
+#: rc.cpp:1551
 #, no-c-format
-msgid ""
-"The screen name of your AIM account.  This should be in the form of an "
-"alphanumeric string (spaces allowed, not case sensitive)."
-msgstr "您 AIM 账户的屏幕名，其格式应为字母和数字组成的字符串(允许空格，不区分大小写)。"
+msgid "Download emoticon theme from the Internet"
+msgstr "下载互联网上的表情主题"
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 175
-#: rc.cpp:3361
+#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 117
+#: rc.cpp:1554 rc.cpp:1560
 #, no-c-format
-msgid ""
-"To connect to the AOL Instant Messaging network, you will need to use a screen "
-"name from AIM, AOL, or .Mac."
-"<br>"
-"<br>If you do not currently have an AIM screen name, please click the button to "
-"create one."
-msgstr ""
-"要连接到 AOL 即时通讯网络，您需要使用来自 AIM，AOL 或 @mac 的屏幕名。"
-"<br>"
-"<br>如果您目前还没有 AIM 屏幕名，您可以在下面链接的网站处注册。"
+msgid "&Edit Theme..."
+msgstr "编辑主题(&E)..."
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 215
-#: rc.cpp:3367 rc.cpp:3626
+#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 120
+#: rc.cpp:1557 rc.cpp:1563
 #, no-c-format
-msgid "Accou&nt Preferences"
-msgstr "账户首选项(&N)"
+msgid "Edit the selected emoticons theme"
+msgstr "编辑选择的表情主题"
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 265
-#: rc.cpp:3379 rc.cpp:3388
+#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 139
+#: rc.cpp:1566
 #, no-c-format
-msgid "The IP address or hostmask of the AIM server you wish to connect to."
-msgstr "您想要连接的 AIM 服务器的 IP 地址或主机名。"
+msgid "&Install Theme File..."
+msgstr "安装主题文件(&I)..."
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 268
-#: rc.cpp:3382 rc.cpp:3391
+#. i18n: file ./kopete/config/appearance/appearanceconfig_emoticons.ui line 155
+#: rc.cpp:1569
 #, no-c-format
-msgid ""
-"The IP address or hostmask of the AIM server you wish to connect to.  Normally "
-"you will want the default (login.oscar.aol.com)."
-msgstr "您想要连接的 AIM 服务器的 IP 地址或主机名。通常，您只需保留默认值(login.oscar.aol.com)。"
+msgid "Remove Theme"
+msgstr "删除主题"
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 279
-#: rc.cpp:3385
+#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 24
+#: rc.cpp:1572
 #, no-c-format
-msgid "login.oscar.aol.com"
-msgstr "login.oscar.aol.com"
+msgid "Chat Window Appearance"
+msgstr "聊天窗口外观"
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 296
-#: rc.cpp:3394 rc.cpp:3647 rc.cpp:4214 rc.cpp:4587 rc.cpp:5126
+#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 43
+#: rc.cpp:1575
 #, no-c-format
-msgid "Po&rt:"
-msgstr "端口(&R)："
+msgid "Styles"
+msgstr "样式"
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 302
-#: rc.cpp:3397 rc.cpp:3403
+#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 113
+#: rc.cpp:1578
 #, no-c-format
-msgid "The port on the AIM server that you would like to connect to."
-msgstr "您想要连接的 AIM 服务器的端口。"
+msgid "&Get New..."
+msgstr "获得新样式(&G)..."
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 305
-#: rc.cpp:3400 rc.cpp:3406
+#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 116
+#: rc.cpp:1581
 #, no-c-format
-msgid ""
-"The port on the AIM server that you would like to connect to.  Normally this is "
-"5190."
-msgstr "您想要连接的 AIM 服务器的端口。通常为 5190。"
+msgid "Get new Chat Window styles over the Internet"
+msgstr "从 Internet 上获取聊天窗口样式"
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 368
-#: rc.cpp:3409 rc.cpp:3698
+#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 124
+#: rc.cpp:1584
 #, no-c-format
-msgid "Default to the following &encoding for messages:"
-msgstr "消息默认使用下列编码(&E)："
+msgid "&Install..."
+msgstr "安装(&I)..."
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 381
-#: rc.cpp:3412 rc.cpp:4659
+#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 142
+#: rc.cpp:1590
 #, no-c-format
-msgid "Pri&vacy"
-msgstr "隐私(&V)"
+msgid "Style Variant:"
+msgstr "样式变体："
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 392
-#: rc.cpp:3415
+#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 165
+#: rc.cpp:1593
 #, no-c-format
-msgid "Visibility settings"
-msgstr "可见性设置"
+msgid "Display"
+msgstr "显示"
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 403
-#: rc.cpp:3418
+#. i18n: file ./kopete/config/appearance/appearanceconfig_chatwindow.ui line 176
+#: rc.cpp:1596
 #, no-c-format
-msgid "Allow only from visible list"
-msgstr "只允许来自可见列表的用户"
+msgid "Group consecuti&ve messages"
+msgstr "分组连续的消息(&V)"
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 411
-#: rc.cpp:3421
+#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 46
+#: rc.cpp:1599
 #, no-c-format
-msgid "Block all users"
-msgstr "屏蔽全部用户"
+msgid ""
+"Using the arrow buttons, put on the right the items you want to see in the "
+"contact tooltips. You can then sort them."
+msgstr "使用箭头按钮将您想要在联系人工具提示中看到的内容放到右侧。您可以再对其进行排序。"
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 419
-#: rc.cpp:3424
+#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 57
+#: rc.cpp:1602
 #, no-c-format
-msgid "Block AIM users"
-msgstr "屏蔽 AIM 用户"
+msgid "<b>Here you can customize the contact tooltips</b>"
+msgstr "<b>您可以在此自定义联系人工具提示</b>"
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 427
-#: rc.cpp:3427
+#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 87
+#: rc.cpp:1605
 #, no-c-format
-msgid "Block only from invisible list"
-msgstr "只屏蔽来自不可见列表的用户"
+msgid ""
+"This list contains elements which are currently <b>not present</b> "
+"in the contact tooltip."
+msgstr "此列表包含目前<b>不出现</b>在联系人工具提示中的元素。"
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 435
-#: rc.cpp:3430
+#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 128
+#: rc.cpp:1608
 #, no-c-format
-msgid "Allow all users"
-msgstr "允许全部用户"
+msgid "v"
+msgstr "v"
 
-#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 443
-#: rc.cpp:3433
+#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 131
+#: rc.cpp:1611
 #, no-c-format
-msgid "Allow only contact list's users"
-msgstr "只允许联系人列表中的用户"
+msgid "Use this arrow to reorder the items in the list."
+msgstr "使用此箭头更改列表中项目的顺序。"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqinterestinfowidget.ui line 24
-#: rc.cpp:3436
+#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 139
+#: rc.cpp:1614
 #, no-c-format
-msgid "Interests"
-msgstr "兴趣"
+msgid "^"
+msgstr "~"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqworkinfowidget.ui line 24
-#: rc.cpp:3439 rc.cpp:3980
+#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 147
+#: rc.cpp:1617
 #, no-c-format
-msgid "Personal Work Information"
-msgstr "个人工作信息"
+msgid "<"
+msgstr "<"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqworkinfowidget.ui line 43
-#: rc.cpp:3445 rc.cpp:4428
+#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 155
+#: rc.cpp:1620
 #, no-c-format
-msgid "Fax:"
-msgstr "传真："
+msgid ">"
+msgstr ">"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqworkinfowidget.ui line 51
-#: rc.cpp:3448 rc.cpp:4419
+#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 158
+#: rc.cpp:1623
 #, no-c-format
-msgid "Department:"
-msgstr "部门："
+msgid "Use this arrows to add or remove items to your contact tooltips."
+msgstr "使用此箭头向您的联系人工具提示中添加或删除项目。"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqworkinfowidget.ui line 67
-#: rc.cpp:3451 rc.cpp:4413
+#. i18n: file ./kopete/config/appearance/tooltipeditwidget.ui line 201
+#: rc.cpp:1626
 #, no-c-format
-msgid "Position:"
-msgstr "职位："
+msgid ""
+"This list contains elements which are currently <b>present</b> "
+"in the contact tooltips."
+msgstr "此列表包含目前<b>出现</b>在联系人工具提示中的元素。"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqworkinfowidget.ui line 101
-#: rc.cpp:3454 rc.cpp:3986
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 25
+#: rc.cpp:1629
 #, no-c-format
-msgid "Company Location Information"
-msgstr "公司位置信息"
+msgid "Enable &global identity"
+msgstr "启用全局身份(&G)"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqworkinfowidget.ui line 120
-#: rc.cpp:3460 rc.cpp:3992 rc.cpp:4344
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 41
+#: rc.cpp:1632
 #, no-c-format
-msgid "Homepage:"
-msgstr "主页："
+msgid "Identity:"
+msgstr "身份："
 
-#. i18n: file ./protocols/oscar/icq/ui/icqworkinfowidget.ui line 136
-#: rc.cpp:3466 rc.cpp:4007
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 75
+#: rc.cpp:1635
 #, no-c-format
-msgid "Zip:"
-msgstr "邮政编码："
+msgid "Ne&w Identity..."
+msgstr "新建身份(&W)..."
 
-#. i18n: file ./protocols/oscar/icq/ui/icqworkinfowidget.ui line 144
-#: rc.cpp:3469 rc.cpp:3773 rc.cpp:4001
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 83
+#: rc.cpp:1638
 #, no-c-format
-msgid "State:"
-msgstr "省："
+msgid "Cop&y Identity..."
+msgstr "复制身份(&Y)..."
 
-#. i18n: file ./protocols/oscar/icq/ui/icqworkinfowidget.ui line 168
-#: rc.cpp:3475 rc.cpp:3770 rc.cpp:3995 rc.cpp:4380 rc.cpp:4401
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 91
+#: rc.cpp:1641
 #, no-c-format
-msgid "Country:"
-msgstr "国家："
+msgid "Rename I&dentity..."
+msgstr "重命名身份(&D)..."
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 27
-#: rc.cpp:3478
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 99
+#: rc.cpp:1644
 #, no-c-format
-msgid "C&lear"
-msgstr "清除(&L)"
+msgid "Remo&ve Identity"
+msgstr "删除身份(&V)"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 33
-#: rc.cpp:3481
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 113
+#: rc.cpp:1647
 #, no-c-format
-msgid "Clear the results"
-msgstr "清除结果"
+msgid "&Nickname"
+msgstr "昵称(&N)"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 47
-#: rc.cpp:3487
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 152
+#: rc.cpp:1650
 #, no-c-format
-msgid "Close this dialog"
-msgstr "关闭对话框"
+msgid "Cu&stom:"
+msgstr "自定义(&S)："
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 67
-#: rc.cpp:3493
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 165
+#: rc.cpp:1653
 #, no-c-format
-msgid "Stops the search"
-msgstr "停止搜索"
+msgid "Use address boo&k name (need address book link)"
+msgstr "使用地址簿姓名(需要地址簿链接)(&K)"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 87
-#: rc.cpp:3499
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 173
+#: rc.cpp:1656
 #, no-c-format
-msgid "Add the selected user to your contact list"
-msgstr "将选中的联系人添加到您的联系人列表中"
+msgid "Use nickname from con&tact for global nickname:"
+msgstr "全局昵称使用联系人的昵称(&T)："
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 98
-#: rc.cpp:3502
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 220
+#: rc.cpp:1662
 #, no-c-format
-msgid "User Info"
-msgstr "用户信息"
+msgid "P&hoto"
+msgstr "照片(&H)"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 104
-#: rc.cpp:3505
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 275
+#: rc.cpp:1665
 #, no-c-format
-msgid "Show information about the selected contact"
-msgstr "显示关于选中联系人的信息"
+msgid "S&ync address book photo with global photo"
+msgstr "将地址簿的照片与全局照片同步(&Y)"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 133
-#: rc.cpp:3508
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 304
+#: rc.cpp:1671
 #, no-c-format
-msgid "UIN Search"
-msgstr "UIN 搜索"
+msgid "U&se photo from contact for global photo:"
+msgstr "全局照片使用联系人的照片(&S)："
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 144
-#: rc.cpp:3511 rc.cpp:3743
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 312
+#: rc.cpp:1674
 #, no-c-format
-msgid "&UIN #:"
-msgstr "UIN 号(&U)："
+msgid "Use a&ddress book photo (needs address book link)"
+msgstr "使用地址簿照片(需要地址簿链接)(&D)"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 179
-#: rc.cpp:3514
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 365
+#: rc.cpp:1677
 #, no-c-format
-msgid "ICQ Whitepages Search"
-msgstr "ICQ 白页搜索"
+msgid "<center>Photo</center>"
+msgstr "<center>照片</center>"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 200
-#: rc.cpp:3517
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 419
+#: rc.cpp:1680
 #, no-c-format
-msgid "&Last name:"
-msgstr "姓(&L)："
+msgid "Address &Book Link"
+msgstr "地址簿链接(&B)"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 211
-#: rc.cpp:3520
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 449
+#: rc.cpp:1683 rc.cpp:5078
 #, no-c-format
-msgid "&First name:"
-msgstr "名(&F)："
+msgid "C&hange..."
+msgstr "更改(&H)..."
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 222
-#: rc.cpp:3523 rc.cpp:3719 rc.cpp:3893
+#. i18n: file ./kopete/config/identity/kopeteidentityconfigbase.ui line 460
+#: rc.cpp:1686
 #, no-c-format
-msgid "&Email:"
-msgstr "电子邮件(&E)："
+msgid ""
+"<b>Note:</b> The address book link uses KAddressBook's \n"
+"current user contact."
+msgstr "<b>注意：</b>地址簿链接使用 KAddressBook 的当前用户联系人。"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 249
-#: rc.cpp:3529
+#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 17
+#: rc.cpp:1690
 #, no-c-format
-msgid "Lan&guage:"
-msgstr "语言(&G)："
+msgid "Manage Accounts"
+msgstr "管理账户"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 270
-#: rc.cpp:3532 rc.cpp:3704 rc.cpp:3926
+#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 31
+#: rc.cpp:1693 rc.cpp:4710
 #, no-c-format
-msgid "&City:"
-msgstr "城市(&C)："
+msgid "&New..."
+msgstr "新建(&N)..."
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 291
-#: rc.cpp:3535
+#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 34
+#: rc.cpp:1696
 #, no-c-format
-msgid "&Gender:"
-msgstr "性别(&G)："
+msgid "Add new account"
+msgstr "添加新账户"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 307
-#: rc.cpp:3538
+#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 42
+#: rc.cpp:1699
 #, no-c-format
-msgid "Only search for online contacts"
-msgstr "只搜索在线联系人"
+msgid "&Modify..."
+msgstr "修改(&M)..."
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 315
-#: rc.cpp:3541
+#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 45
+#: rc.cpp:1702
 #, no-c-format
-msgid "C&ountry:"
-msgstr "国家/地区(&O)："
+msgid "Modify selected account"
+msgstr "修改选中账户"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 372
-#: rc.cpp:3547
+#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 48
+#: rc.cpp:1705
 #, no-c-format
-msgid "Nickname"
-msgstr "昵称"
+msgid "Let you edit the account's properties."
+msgstr "让您编辑联系人的属性。"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 416
-#: rc.cpp:3559
+#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 59
+#: rc.cpp:1711 rc.cpp:1714
 #, no-c-format
-msgid "Requires Authorization?"
-msgstr "请求身份验证吗？"
+msgid "Remove selected account"
+msgstr "删除选中账户"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 432
-#: rc.cpp:3562
+#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 100
+#: rc.cpp:1723
 #, no-c-format
-msgid ""
-"This is where the results from your search are displayed. If you double-click a "
-"result, the search window will close and pass the UIN of the contact you wish "
-"to add back to the Add Contact Wizard. You can only add one contact at a time."
-msgstr ""
-"这里将会显示您搜索的结果。如果您双击某个结果，搜索窗口将会关闭，并且将您想要添加的联系人的 UIN 返回到添加联系人向导。您一次只能添加一个联系人。"
+msgid "Use &custom color"
+msgstr "使用自定义颜色(&C)"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 440
-#: rc.cpp:3565 rc.cpp:3803 rc.cpp:4740 rc.cpp:5048
+#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 103
+#: rc.cpp:1726
 #, no-c-format
-msgid "&Search"
-msgstr "搜索(&S)"
+msgid "Use custom color for account"
+msgstr "账户使用自定义颜色"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 443
-#: rc.cpp:3568
+#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 106
+#: rc.cpp:1729
 #, no-c-format
-msgid "Search the ICQ Whitepages with your search criteria"
-msgstr "使用您的搜索条件搜索 ICQ 白页"
+msgid "Allows you to set a custom color for this account"
+msgstr "允许您为此账户设置自定义颜色"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 454
-#: rc.cpp:3571
+#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 117
+#: rc.cpp:1732 rc.cpp:1770 rc.cpp:1801
 #, no-c-format
-msgid "New Search"
-msgstr "新建搜索"
+msgid "Account custom color selector"
+msgstr "账户自定义颜色选择器"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 457
-#: rc.cpp:3574
+#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 121
+#: rc.cpp:1735
 #, no-c-format
-msgid "Clears both search fields and results"
-msgstr "清除搜索域和结果"
+msgid ""
+"Allows you to set a custom color for this account.\n"
+"The icon of every contact of this account will be coloured with this color. "
+"Useful if you have several accounts of the same protocol"
+msgstr ""
+"允许您为此账户设置自定义颜色。\n"
+"此账户的每个联系人图标都会用此颜色着色。如果您在同一协议下有多个账户，则此功能可帮助您区分不同账户下的联系人。"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqotherinfowidget.ui line 41
-#: rc.cpp:3577
+#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 163
+#: rc.cpp:1739
 #, no-c-format
-msgid "Email addresses:"
-msgstr "电子邮件地址："
+msgid "Increase the priority"
+msgstr "增加优先级"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqotherinfowidget.ui line 54
-#: rc.cpp:3580
+#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 167
+#: rc.cpp:1742 rc.cpp:1749
 #, no-c-format
-msgid "Contact notes:"
-msgstr "联系人备注："
+msgid ""
+"Uses these buttons to increase or decrease the priority.\n"
+"The priority is used to determine which contact to use when you click on a "
+"metacontact: Kopete will use the contact of the account with the greatest "
+"priority (if all contacts have the same online status.)"
+msgstr ""
+"使用这两个按钮可增加或减少优先级。\n"
+"优先级用于决定当您单击超级联系人时要使用哪个联系人：Kopete 将使用优先级最高的账户(如果全部联系人的在线状态都相同的话。)"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 16
-#: rc.cpp:3583
+#. i18n: file ./kopete/config/accounts/kopeteaccountconfigbase.ui line 201
+#: rc.cpp:1746
 #, no-c-format
-msgid "Account Preferences - ICQ"
-msgstr "账户首选项 - ICQ"
+msgid "Decrease the priority"
+msgstr "减少优先级"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 48
-#: rc.cpp:3589
+#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 39
+#: rc.cpp:1756
 #, no-c-format
-msgid "Account Preferences"
-msgstr "账户首选项"
+msgid ""
+"<h2>Congratulations</h2>\n"
+"<p>You have finished configuring the account. Please click the \"Finish\" "
+"button.</p>"
+msgstr ""
+"<h2>恭喜</h2> \n"
+"<p>您已经完成了账户配置。请单击“完成”按钮。</p>"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 67
-#: rc.cpp:3592
+#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 59
+#: rc.cpp:1760 rc.cpp:1791
 #, no-c-format
-msgid "IC&Q UIN:"
-msgstr "IC&Q UIN："
+msgid ""
+"Use &custom color\n"
+"for account:"
+msgstr "账户使用自定义颜色(&C)："
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 73
-#: rc.cpp:3595 rc.cpp:3601
+#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 62
+#: rc.cpp:1764 rc.cpp:1795
 #, no-c-format
-msgid "The user ID of your ICQ account."
-msgstr "您 ICQ 账户的用户 ID。"
+msgid "Use a custom color for this account"
+msgstr "为此账户使用自定义颜色"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 76
-#: rc.cpp:3598 rc.cpp:3604
+#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 65
+#: rc.cpp:1767 rc.cpp:1798
 #, no-c-format
 msgid ""
-"The user ID of your ICQ account.  This should be in the form of a number (no "
-"decimals, no spaces)."
-msgstr "您 ICQ 账户的用户 ID，其格式应为数字(无小数点，无空格)。"
+"Account are often differentiated by the protocol icon. But if you have severals "
+"accounts of the same protocol, you may apply a color filter to that icon to "
+"differentiate accounts from the same protocols."
+msgstr "账户通常是使用协议图标来区分的。但是如果您在同一协议下有多个账户，您还可以对图标应用不同的颜色滤镜以便区分同一协议的不同账户。"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 160
-#: rc.cpp:3619
+#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 131
+#: rc.cpp:1773 rc.cpp:1804
 #, no-c-format
-msgid ""
-"To connect to the ICQ network, you will need an ICQ account."
-"<br>"
-"<br>\n"
-"If you do not currently have an ICQ account, please click the button to create "
-"one."
-msgstr "要连接到 ICQ 网络，您需要有 ICQ 账户。如果您还没有 ICQ 账户，您可以从下面链接的网站处注册。"
+msgid "Co&nnect now"
+msgstr "立即连接(&N)"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 234
-#: rc.cpp:3632 rc.cpp:3650
+#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 137
+#: rc.cpp:1776 rc.cpp:1807
 #, no-c-format
-msgid "The port on the ICQ server that you would like to connect to."
-msgstr "您想要连接的 ICQ 服务器的端口。"
+msgid "Connect right after Finish is pressed"
+msgstr "按下完成后立即连接"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 237
-#: rc.cpp:3635 rc.cpp:3653
+#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage2.ui line 140
+#: rc.cpp:1779 rc.cpp:1810
 #, no-c-format
 msgid ""
-"The port on the ICQ server that you would like to connect to.  Normally this is "
-"5190."
-msgstr "您想要连接的 ICQ 服务器的端口。通常为 5190。"
+"If this is checked, the account will be connected right after you clicked on <i>"
+"Finished</i>."
+msgstr "如果选中此选项，在您单击<i>完成</i>后将会立即连接账户。"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 248
-#: rc.cpp:3638
+#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage3.ui line 41
+#: rc.cpp:1785
 #, no-c-format
-msgid "login.icq.com"
-msgstr "login.icq.com"
+msgid ""
+"<h2>Congratulations</h2> \n"
+"<p>You have finished configuring the account. Please click the \"Finish\" "
+"button.</p>\n"
+"\n"
+msgstr ""
+"<h2>恭喜</h2> \n"
+"<p>您已经完成了账户配置。请单击“完成”按钮。</p>\n"
+"\n"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 251
-#: rc.cpp:3641 rc.cpp:3659
+#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage1.ui line 22
+#: rc.cpp:1813
 #, no-c-format
-msgid "The IP address or hostmask of the ICQ server you wish to connect to."
-msgstr "您想要连接的 ICQ 服务器的 IP 地址或主机名。"
+msgid "Step One: Select Messaging Service"
+msgstr "第一步：选择信使服务"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 254
-#: rc.cpp:3644 rc.cpp:3662
+#. i18n: file ./kopete/addaccountwizard/addaccountwizardpage1.ui line 122
+#: rc.cpp:1822
 #, no-c-format
 msgid ""
-"The IP address or hostmask of the ICQ server you wish to connect to.  Normally "
-"you will want the default (login.icq.com)."
-msgstr "您想要连接的 ICQ 服务器的 IP 地址或主机名。通常，您只需保留默认值(login.icq.com)。"
+"<h2>Welcome to the Add Account Wizard</h2>\n"
+"<p>Select the messaging service from the list below.</p>"
+msgstr ""
+"<h2>欢迎使用添加账户向导。</h2>\n"
+"\n"
+"<p>请从下面的列表中选择信使服务。</p>"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 312
-#: rc.cpp:3668
+#. i18n: file ./kopete/kopeteui.rc line 61
+#: rc.cpp:1841
 #, no-c-format
-msgid "Privacy Options"
-msgstr "隐私选项"
+msgid "Global Identity Bar"
+msgstr "全局身份栏"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 323
-#: rc.cpp:3671
+#. i18n: file ./kopete/kopeteui.rc line 70
+#: rc.cpp:1844
 #, no-c-format
-msgid "&Require authorization before someone can add you to their contact list"
-msgstr "别人将您添加到联系人列表时需要身份验证(&R)"
+msgid "&Other Actions"
+msgstr "其它动作(&O)"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 326
-#: rc.cpp:3674
+#. i18n: file ./kopete/kopeteui.rc line 77
+#: rc.cpp:1847
 #, no-c-format
-msgid ""
-"Enable authorization requirement, which will not allow users to add you to "
-"their contact list without authorization from you."
-msgstr "启用认证请求。其他用户在没有得到您的同意的情况下，将无法将您加入他们的联系人列表。"
+msgid "&Groups"
+msgstr "组(&G)"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 329
-#: rc.cpp:3677
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 16
+#: rc.cpp:1850
 #, no-c-format
-msgid ""
-"Enable authorization requirement, which will not allow users to add you to "
-"their contact list without authorization from you.  Check this box, and you "
-"will have to confirm any users who add you to their list before they may see "
-"your online status."
-msgstr ""
-"启用认证请求。其他用户在没有得到您的同意的情况下，将无法将您加入他们的联系人列表。选中此框，您就需要对每个想要将您加入好友的请求加以确认。在您确认之前，他们无法"
-"看到您的在线状态。"
+msgid "Account Preferences - WinPopup"
+msgstr "账户首选项 - WinPopup"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 337
-#: rc.cpp:3680
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 48
+#: rc.cpp:1853
 #, no-c-format
-msgid "Hide &IP address"
-msgstr "隐藏 IP 地址(&I)"
+msgid "Basi&c Setup"
+msgstr "基本设置(&C)"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 340
-#: rc.cpp:3683
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 59
+#: rc.cpp:1856 rc.cpp:2230 rc.cpp:2359 rc.cpp:2509 rc.cpp:2950 rc.cpp:3615
+#: rc.cpp:3891 rc.cpp:4394 rc.cpp:4752
 #, no-c-format
-msgid ""
-"Check this to hide your IP address from people when they view your user info"
-msgstr "选中此项可对其他用户隐藏您的 IP 地址。"
+msgid "Account Information"
+msgstr "账户信息"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 343
-#: rc.cpp:3686
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 78
+#: rc.cpp:1859
+#, no-c-format
+msgid "Hos&tname:"
+msgstr "主机名(&T)："
+
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 84
+#: rc.cpp:1862 rc.cpp:1868
+#, no-c-format
+msgid "The hostname you would like to use to send WinPopup messages as."
+msgstr "您想要用于发送 WinPopup 信息的主机名。"
+
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 87
+#: rc.cpp:1865 rc.cpp:1871
 #, no-c-format
 msgid ""
-"Checking this box will not allow people to see what your IP address if they "
-"view your ICQ user details such as name, address, or age."
-msgstr "选中此框将不允许别人在查看您的 ICQ 用户资料(比如姓名、地址或年龄)时同时查看您的 IP 地址。"
+"The hostname you would like to use to send WinPopup messages as.  Note that "
+"this does not have to be the actual hostname of the machine to send messages, "
+"but it does to receive them."
+msgstr "您想要用于发送 WinPopup 信息的主机名。请注意，要发送信息，这里并不要求是实际的主机名，而如果要接受信息的话，则应该是实际的主机名。"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 351
-#: rc.cpp:3689
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 106
+#: rc.cpp:1874
 #, no-c-format
-msgid "Make my status available via &ICQ's unified messaging center"
-msgstr "把我的状态通过 ICQ 统一消息中心放在网站上(&I)"
+msgid "I&nstall Into Samba"
+msgstr "安装到 Samba(&N)"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 357
-#: rc.cpp:3692
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 109
+#: rc.cpp:1877 rc.cpp:1880
 #, no-c-format
-msgid "Check this box to enable Web Aware functionality."
-msgstr "选中此框将启用 Web 状态功能。"
+msgid "Install support into Samba to enable this service."
+msgstr "在 Samba 中安装支持以启用此服务。"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 360
-#: rc.cpp:3695
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 143
+#: rc.cpp:1886
 #, no-c-format
 msgid ""
-"Check this box to enable ICQ's Web Aware functionality, which allows people to "
-"see your online status from ICQ's web page, and send you a message without "
-"necessarily having ICQ themselves."
-msgstr "选中此框将启用 Web 状态功能，这将允许别人从网页上看到您的在线状态，并无需拥有 ICQ 即可给您发送信息。"
+"To receive WinPopup messages sent from other machines, the hostname above must "
+"be set to this machine's hostname."
+msgstr "要从其它计算机接收 WinPopup 信息，上面的主机名必须设定为此计算机的主机名。"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 24
-#: rc.cpp:3701
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 154
+#: rc.cpp:1889
 #, no-c-format
-msgid "Location && Contact Information"
-msgstr "位置和联系人信息"
+msgid "The samba server must be configured and running."
+msgstr "必须先配置并运行 samba 服务器。"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 46
-#: rc.cpp:3707 rc.cpp:3917
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 164
+#: rc.cpp:1892
 #, no-c-format
-msgid "&Address:"
-msgstr "地址(&A)："
+msgid ""
+"\"Install into Samba\" is a simple method to create the directory for the "
+"temporary message files and configure your samba server."
+"<br>\n"
+"However, the recommended way is to ask your administrator to create this "
+"directory ('mkdir -p -m 0777 /var/lib/winpopup') and add\n"
+"'message command = _PATH_TO_/winpopup-send.sh %s %m %t &' (substitute _PATH_TO_ "
+"by the real path) to your smb.conf [global]-section."
+msgstr ""
+"“安装到 Samba” 是一种创建储存临时消息文件所需目录并配置好您的 samba 服务器的简便方案。"
+"<br>\n"
+"然而，我们建议更好的方案是求询您的系统管理员来创建此目录(“mkdir -p -m 0777 /var/lib/winpopup”)并添加\n"
+"“message command = _PATH_TO_/winpopup-send.sh %s %m %t &”(用实际路径替换 "
+"_PATH_TO_)配置行到您的 smb.conf 文件中的 [global] 区段。"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 57
-#: rc.cpp:3710 rc.cpp:3908
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 196
+#: rc.cpp:1897
 #, no-c-format
-msgid "&Phone:"
-msgstr "电话(&P)："
+msgid "S&ystem"
+msgstr "系统(&Y)"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 68
-#: rc.cpp:3713 rc.cpp:3923
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 235
+#: rc.cpp:1903
 #, no-c-format
-msgid "&State:"
-msgstr "省(&S)："
+msgid "<i>These options apply to all WinPopup accounts.</i>"
+msgstr "<i>这些选项应用到全部 WinPopup 账户。</i>"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 95
-#: rc.cpp:3716 rc.cpp:3920
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 245
+#: rc.cpp:1906
 #, no-c-format
-msgid "Countr&y:"
-msgstr "国家(&Y)："
+msgid "Protocol Preferences"
+msgstr "协议首选项"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 149
-#: rc.cpp:3722 rc.cpp:3890
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 256
+#: rc.cpp:1909
 #, no-c-format
-msgid "&Homepage:"
-msgstr "主页(&H)："
+msgid "Host check frequency:"
+msgstr "主机检查频率："
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 200
-#: rc.cpp:3725 rc.cpp:3902
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 264
+#: rc.cpp:1912
 #, no-c-format
-msgid "Fa&x:"
-msgstr "传真(&X)："
+msgid "Path to 'smbclient' executable:"
+msgstr "“sambclient”可执行文件的路径："
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 230
-#: rc.cpp:3728 rc.cpp:3911
+#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 315
+#: rc.cpp:1915
 #, no-c-format
-msgid "Ce&ll:"
-msgstr "移动电话(&L)："
+msgid "second(s)"
+msgstr "秒钟"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 257
-#: rc.cpp:3731 rc.cpp:3929
+#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 48
+#: rc.cpp:1918
 #, no-c-format
-msgid "&Zip:"
-msgstr "邮政编码(&Z)："
+msgid "&Computer name:"
+msgstr "计算机名(&C)："
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 289
-#: rc.cpp:3734 rc.cpp:3857
+#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 54
+#: rc.cpp:1921 rc.cpp:1924 rc.cpp:1957 rc.cpp:1960
 #, no-c-format
-msgid "Personal Information"
-msgstr "个人信息"
+msgid "The hostname of the computer for this contact."
+msgstr "此联系人计算机的主机名。"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 316
-#: rc.cpp:3737
+#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 65
+#: rc.cpp:1927
 #, no-c-format
-msgid "&Full name:"
-msgstr "全名(&F)："
+msgid "Comment:"
+msgstr "注释："
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 398
-#: rc.cpp:3746
+#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 73
+#: rc.cpp:1930 rc.cpp:1996
 #, no-c-format
-msgid "&Birthday:"
-msgstr "生日(&B)："
+msgid "&Workgroup/domain:"
+msgstr "工作组/域(&W)："
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 414
-#: rc.cpp:3749
+#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 79
+#: rc.cpp:1933 rc.cpp:1936 rc.cpp:1969 rc.cpp:1972
 #, no-c-format
-msgid "Gen&der:"
-msgstr "性别(&D)："
+msgid "The workgroup or domain the contact's computer is on."
+msgstr "此联系人计算机所在的工作组或域。"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 449
-#: rc.cpp:3752
+#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 90
+#: rc.cpp:1939
 #, no-c-format
-msgid "&IP:"
-msgstr "&IP："
+msgid "Operating s&ystem:"
+msgstr "操作系统(&Y)："
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 460
-#: rc.cpp:3755
+#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 96
+#: rc.cpp:1942 rc.cpp:1945 rc.cpp:1975 rc.cpp:1978
 #, no-c-format
-msgid "&Timezone:"
-msgstr "时区(&T)："
+msgid "The operating system the contact's computer is running."
+msgstr "此联系人计算机所运行的操作系统。"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 471
-#: rc.cpp:3758
+#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 107
+#: rc.cpp:1948
 #, no-c-format
-msgid "Marital status:"
-msgstr "婚姻状态："
+msgid "Ser&ver software:"
+msgstr "服务器软件(&V)："
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 487
-#: rc.cpp:3761
+#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 113
+#: rc.cpp:1951 rc.cpp:1954 rc.cpp:1981 rc.cpp:1984
 #, no-c-format
-msgid "A&ge:"
-msgstr "年龄(&G)："
+msgid "The software the contact's computer is running."
+msgstr "此联系人计算机所运行的软件。"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 508
-#: rc.cpp:3764
+#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 151
+#: rc.cpp:1963 rc.cpp:1966
 #, no-c-format
-msgid "Origin"
-msgstr "来自"
+msgid "The comment of the computer for this contact."
+msgstr "此联系人计算机的注释。"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqauthreplyui.ui line 16
-#: rc.cpp:3776
+#. i18n: file ./protocols/winpopup/ui/wpaddcontactbase.ui line 50
+#: rc.cpp:1987
 #, no-c-format
-msgid "ICQ Authorization Reply"
-msgstr "ICQ 身份验证回复"
+msgid "Com&puter hostname:"
+msgstr "计算机名(&P)："
 
-#. i18n: file ./protocols/oscar/icq/ui/icqauthreplyui.ui line 43
-#: rc.cpp:3779
+#. i18n: file ./protocols/winpopup/ui/wpaddcontactbase.ui line 56
+#: rc.cpp:1990 rc.cpp:1993 rc.cpp:2005 rc.cpp:2008
 #, no-c-format
-msgid "Reason:"
-msgstr "原因："
+msgid "The hostname you would like to use to send WinPopup messages to."
+msgstr "您想要发送 WinPopup 信息的目的主机名。"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqauthreplyui.ui line 108
-#: rc.cpp:3782
+#. i18n: file ./protocols/winpopup/ui/wpaddcontactbase.ui line 73
+#: rc.cpp:1999 rc.cpp:2002 rc.cpp:2011 rc.cpp:2014
 #, no-c-format
-msgid "&Grant authorization"
-msgstr "通过身份验证(&G)"
+msgid ""
+"The workgroup or domain the computer is on that you would like to use to send "
+"WinPopup messages to."
+msgstr "您想要将 WinPopup 信息发送到哪个工作组或域。"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqauthreplyui.ui line 119
-#: rc.cpp:3785
+#. i18n: file ./protocols/winpopup/ui/wpaddcontactbase.ui line 148
+#: rc.cpp:2017 rc.cpp:4125
 #, no-c-format
-msgid "&Decline authorization"
-msgstr "拒绝身份验证(&D)"
+msgid "&Refresh"
+msgstr "刷新(&R)"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqauthreplyui.ui line 148
-#: rc.cpp:3788
+#. i18n: file ./protocols/winpopup/ui/wpaddcontactbase.ui line 151
+#: rc.cpp:2020 rc.cpp:2023
 #, no-c-format
-msgid "%1 requested authorization to add you to his/her contact list."
-msgstr "%1 请求将您加入联系人列表。为此，需要您的同意。"
+msgid ""
+"Refresh the list of available workgroups & domains on the Windows network."
+msgstr "刷新 Windows 网络中可用的工作组和域。"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqauthreplyui.ui line 172
-#: rc.cpp:3791
+#. i18n: file ./protocols/yahoo/ui/yahooworkinfowidget.ui line 24
+#: rc.cpp:2029 rc.cpp:3321
 #, no-c-format
-msgid "Request Reason:"
-msgstr "请求原因："
+msgid "Personal Work Information"
+msgstr "个人工作信息"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqauthreplyui.ui line 188
-#: rc.cpp:3794
+#. i18n: file ./protocols/yahoo/ui/yahooworkinfowidget.ui line 35
+#: libkopete/ui/userinfodialog.cpp:233 rc.cpp:2032 rc.cpp:3324
 #, no-c-format
-msgid "Some reason..."
-msgstr "具体原因..."
+msgid "Phone:"
+msgstr "电话："
 
-#. i18n: file ./protocols/oscar/icq/ui/icqadd.ui line 38
-#: rc.cpp:3797
+#. i18n: file ./protocols/yahoo/ui/yahooworkinfowidget.ui line 61
+#: rc.cpp:2035 rc.cpp:3336
 #, no-c-format
-msgid "UIN #:"
-msgstr "UIN 号："
+msgid "Company Location Information"
+msgstr "公司位置信息"
 
-#. i18n: file ./protocols/oscar/icq/ui/icqadd.ui line 61
-#: rc.cpp:3800
+#. i18n: file ./protocols/yahoo/ui/yahooworkinfowidget.ui line 72
+#: libkopete/ui/userinfodialog.cpp:209 rc.cpp:2038 rc.cpp:3339 rc.cpp:4179
+#: rc.cpp:4488
 #, no-c-format
-msgid "Alternatively, you can search the ICQ Whitepages :"
-msgstr "另外，您也可以在 ICQ 白页上搜索："
+msgid "Name:"
+msgstr "姓名："
 
-#. i18n: file ./protocols/oscar/oscarencodingselectionbase.ui line 27
-#: rc.cpp:3806
+#. i18n: file ./protocols/yahoo/ui/yahooworkinfowidget.ui line 80
+#: rc.cpp:2041 rc.cpp:2824 rc.cpp:3342
 #, no-c-format
-msgid "Use this &encoding when chatting with this contact:"
-msgstr "与此联系人聊天时使用此编码(&E)："
+msgid "Homepage:"
+msgstr "主页："
 
-#. i18n: file ./protocols/oscar/oscarvisibilitybase.ui line 24
-#: rc.cpp:3809
+#. i18n: file ./protocols/yahoo/ui/yahooworkinfowidget.ui line 112
+#: rc.cpp:2044 rc.cpp:2860 rc.cpp:2881 rc.cpp:3357 rc.cpp:3561
 #, no-c-format
-msgid "Always visible:"
-msgstr "总是显身："
+msgid "Country:"
+msgstr "国家："
 
-#. i18n: file ./protocols/oscar/oscarvisibilitybase.ui line 32
-#: rc.cpp:3812
+#. i18n: file ./protocols/yahoo/ui/yahooworkinfowidget.ui line 133
+#: libkopete/ui/userinfodialog.cpp:229 rc.cpp:2047 rc.cpp:3345
 #, no-c-format
-msgid "Contacts:"
-msgstr "联系人："
+msgid "Address:"
+msgstr "地址："
 
-#. i18n: file ./protocols/oscar/oscarvisibilitybase.ui line 155
-#: rc.cpp:3827
+#. i18n: file ./protocols/yahoo/ui/yahooworkinfowidget.ui line 174
+#: rc.cpp:2050 rc.cpp:3351 rc.cpp:3564
 #, no-c-format
-msgid "Always invisible:"
-msgstr "总是隐身："
+msgid "State:"
+msgstr "省："
 
-#. i18n: file ./protocols/oscar/oscarlistcontactsbase.ui line 24
-#: rc.cpp:3830
+#. i18n: file ./protocols/yahoo/ui/yahooworkinfowidget.ui line 182
+#: rc.cpp:2053 rc.cpp:2857 rc.cpp:2872 rc.cpp:3354 rc.cpp:3558 rc.cpp:4188
+#: rc.cpp:4503
 #, no-c-format
-msgid ""
-"The following contacts are not on your contact list. Would you like to add "
-"them?"
-msgstr "下列联系人未在您的联系人列表中。您是否想要添加？"
+msgid "City:"
+msgstr "城市："
 
-#. i18n: file ./protocols/oscar/oscarlistcontactsbase.ui line 43
-#: rc.cpp:3833
+#. i18n: file ./protocols/yahoo/ui/yahooworkinfowidget.ui line 190
+#: rc.cpp:2056 rc.cpp:3348
 #, no-c-format
-msgid "Do &not ask again"
-msgstr "不再询问(&N)"
+msgid "Zip:"
+msgstr "邮政编码："
 
 #. i18n: file ./protocols/yahoo/ui/yahooadd.ui line 16
-#: rc.cpp:3836
+#: rc.cpp:2059
 #, no-c-format
 msgid "Add Yahoo Contact"
 msgstr "添加 Yahoo 联系人"
 
 #. i18n: file ./protocols/yahoo/ui/yahooadd.ui line 41
-#: rc.cpp:3839 rc.cpp:4040
+#: rc.cpp:2062 rc.cpp:2233
 #, no-c-format
 msgid "&Yahoo username:"
 msgstr "&Yahoo 用户名："
 
 #. i18n: file ./protocols/yahoo/ui/yahooadd.ui line 47
-#: rc.cpp:3842 rc.cpp:3848
+#: rc.cpp:2065 rc.cpp:2071
 #, no-c-format
 msgid "The account name of the Yahoo account you would like to add."
 msgstr "您想要添加的 Yahoo 账户的账户名。"
 
 #. i18n: file ./protocols/yahoo/ui/yahooadd.ui line 50
-#: rc.cpp:3845 rc.cpp:3851
+#: rc.cpp:2068 rc.cpp:2074
 #, no-c-format
 msgid ""
 "The account name of the Yahoo account you would like to add.  This should be in "
@@ -8704,209 +10815,300 @@ msgid ""
 msgstr "您想要添加的 Yahoo 账户的账户名，其格式应该为由字母和数字组成的字符串(无空格)。"
 
 #. i18n: file ./protocols/yahoo/ui/yahooadd.ui line 71
-#: rc.cpp:3854
+#: rc.cpp:2077
 #, no-c-format
 msgid "<i>(for example: joe8752)</i>"
 msgstr "<i>(例如：joe8752)</i>"
 
+#. i18n: file ./protocols/yahoo/ui/yahooverifyaccountbase.ui line 30
+#: rc.cpp:2080
+#, no-c-format
+msgid ""
+"Your Account has to be verified because of too many false login attempts."
+"<br>"
+msgstr "由于登录尝试错误过多，现在需要核验您的账户。<br>"
+
+#. i18n: file ./protocols/yahoo/ui/yahooverifyaccountbase.ui line 46
+#: rc.cpp:2083
+#, no-c-format
+msgid "Please enter the chars shown in the picture:"
+msgstr "请输入图片中显示的字符："
+
+#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 16
+#: rc.cpp:2086
+#, no-c-format
+msgid "Invite Friends to Conference"
+msgstr "邀请朋友参加会议"
+
+#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 35
+#: rc.cpp:2089
+#, no-c-format
+msgid "Conference Members"
+msgstr "会议成原"
+
+#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 54
+#: rc.cpp:2092
+#, no-c-format
+msgid "Friend List"
+msgstr "朋友列表"
+
+#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 60
+#: rc.cpp:2095 rc.cpp:2101
+#, no-c-format
+msgid "New Item"
+msgstr "新建项目"
+
+#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 88
+#: rc.cpp:2098
+#, no-c-format
+msgid "Chat Invitation List"
+msgstr "聊天邀请列表"
+
+#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 162
+#: rc.cpp:2107
+#, no-c-format
+msgid "Add >>"
+msgstr "添加 >>"
+
+#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 170
+#: rc.cpp:2110
+#, no-c-format
+msgid "<< Remove"
+msgstr "<< 删除"
+
+#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 207
+#: rc.cpp:2113
+#, no-c-format
+msgid "Invitation Message"
+msgstr "邀请消息"
+
+#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 288
+#: rc.cpp:2119
+#, no-c-format
+msgid "Invite"
+msgstr "邀请"
+
+#. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 24
+#: rc.cpp:2122 rc.cpp:3525
+#, no-c-format
+msgid "Personal Information"
+msgstr "个人信息"
+
 #. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 46
-#: rc.cpp:3863
+#: rc.cpp:2128
 #, no-c-format
 msgid "Second name:"
 msgstr "曾用名："
 
+#. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 92
+#: rc.cpp:2134 rc.cpp:3411 rc.cpp:3531
+#, no-c-format
+msgid "&Nickname:"
+msgstr "昵称(&N)："
+
 #. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 119
-#: rc.cpp:3872
+#: rc.cpp:2137
 #, no-c-format
 msgid "Yahoo ID:"
 msgstr "Yahoo ID："
 
 #. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 130
-#: rc.cpp:3875
+#: rc.cpp:2140
 #, no-c-format
 msgid "Title:"
 msgstr "头衔："
 
 #. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 141
-#: rc.cpp:3878
+#: rc.cpp:2143
 #, no-c-format
 msgid "Anniversary:"
 msgstr "纪念日："
 
 #. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 203
-#: rc.cpp:3881 rc.cpp:4341
+#: rc.cpp:2146 rc.cpp:2821
 #, no-c-format
 msgid "Birthday:"
 msgstr "生日："
 
+#. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 233
+#: rc.cpp:2149 rc.cpp:3603
+#, no-c-format
+msgid "Contact Information"
+msgstr "联系人信息"
+
 #. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 244
-#: rc.cpp:3887
+#: rc.cpp:2152
 #, no-c-format
 msgid "Pager:"
 msgstr "寻呼："
 
+#. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 255
+#: rc.cpp:2155 rc.cpp:3513
+#, no-c-format
+msgid "&Homepage:"
+msgstr "主页(&H)："
+
+#. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 282
+#: rc.cpp:2158 rc.cpp:3408 rc.cpp:3510
+#, no-c-format
+msgid "&Email:"
+msgstr "电子邮件(&E)："
+
 #. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 293
-#: rc.cpp:3896
+#: rc.cpp:2161
 #, no-c-format
 msgid "Email &3:"
 msgstr "电子邮件 &3："
 
 #. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 304
-#: rc.cpp:3899
+#: rc.cpp:2164
 #, no-c-format
 msgid "Email &2:"
 msgstr "电子邮件 &2："
 
+#. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 371
+#: rc.cpp:2167 rc.cpp:3516
+#, no-c-format
+msgid "Fa&x:"
+msgstr "传真(&X)："
+
 #. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 382
-#: rc.cpp:3905
+#: rc.cpp:2170
 #, no-c-format
 msgid "Additional:"
 msgstr "额外："
 
-#. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 476
-#: rc.cpp:3914
-#, no-c-format
-msgid "Location Information"
-msgstr "位置信息"
-
-#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 16
-#: rc.cpp:3932
-#, no-c-format
-msgid "Invite Friends to Conference"
-msgstr "邀请朋友参加会议"
-
-#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 35
-#: rc.cpp:3935
+#. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 425
+#: rc.cpp:2173 rc.cpp:3501
 #, no-c-format
-msgid "Conference Members"
-msgstr "会议成原"
+msgid "&Phone:"
+msgstr "电话(&P)："
 
-#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 54
-#: rc.cpp:3938
+#. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 452
+#: rc.cpp:2176 rc.cpp:3519
 #, no-c-format
-msgid "Friend List"
-msgstr "朋友列表"
+msgid "Ce&ll:"
+msgstr "移动电话(&L)："
 
-#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 60
-#: rc.cpp:3941 rc.cpp:3947
+#. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 476
+#: rc.cpp:2179
 #, no-c-format
-msgid "New Item"
-msgstr "新建项目"
+msgid "Location Information"
+msgstr "位置信息"
 
-#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 88
-#: rc.cpp:3944
+#. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 487
+#: rc.cpp:2182 rc.cpp:3498
 #, no-c-format
-msgid "Chat Invitation List"
-msgstr "聊天邀请列表"
+msgid "&Address:"
+msgstr "地址(&A)："
 
-#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 162
-#: rc.cpp:3953
+#. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 498
+#: rc.cpp:2185 rc.cpp:3507
 #, no-c-format
-msgid "Add >>"
-msgstr "添加 >>"
+msgid "Countr&y:"
+msgstr "国家(&Y)："
 
-#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 170
-#: rc.cpp:3956
+#. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 531
+#: rc.cpp:2188 rc.cpp:3504
 #, no-c-format
-msgid "<< Remove"
-msgstr "<< 删除"
+msgid "&State:"
+msgstr "省(&S)："
 
-#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 207
-#: rc.cpp:3959
+#. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 558
+#: rc.cpp:2191 rc.cpp:3417 rc.cpp:3495
 #, no-c-format
-msgid "Invitation Message"
-msgstr "邀请消息"
+msgid "&City:"
+msgstr "城市(&C)："
 
-#. i18n: file ./protocols/yahoo/ui/yahooinvitelistbase.ui line 288
-#: rc.cpp:3965
+#. i18n: file ./protocols/yahoo/ui/yahoogeneralinfowidget.ui line 593
+#: rc.cpp:2194 rc.cpp:3522
 #, no-c-format
-msgid "Invite"
-msgstr "邀请"
+msgid "&Zip:"
+msgstr "邮政编码(&Z)："
 
 #. i18n: file ./protocols/yahoo/ui/yahoostealthsetting.ui line 30
-#: rc.cpp:3968
+#: rc.cpp:2197
 #, no-c-format
 msgid "Show Me As"
 msgstr "将我显示为"
 
 #. i18n: file ./protocols/yahoo/ui/yahoostealthsetting.ui line 45
-#: rc.cpp:3971
+#: rc.cpp:2200
 #, no-c-format
 msgid "Perma&nently offline"
 msgstr "永久离线(&N)"
 
 #. i18n: file ./protocols/yahoo/ui/yahoostealthsetting.ui line 83
-#: rc.cpp:3977
+#: rc.cpp:2206
 #, no-c-format
 msgid "Off&line"
 msgstr "离线(&L)"
 
 #. i18n: file ./protocols/yahoo/ui/yahoootherinfowidget.ui line 24
-#: rc.cpp:4010
+#: rc.cpp:2209
 #, no-c-format
 msgid "Contact comments:"
 msgstr "联系人备注："
 
 #. i18n: file ./protocols/yahoo/ui/yahoootherinfowidget.ui line 40
-#: rc.cpp:4013
+#: rc.cpp:2212
 #, no-c-format
 msgid "Note 1:"
 msgstr "注释 1："
 
 #. i18n: file ./protocols/yahoo/ui/yahoootherinfowidget.ui line 56
-#: rc.cpp:4016
+#: rc.cpp:2215
 #, no-c-format
 msgid "Note 2:"
 msgstr "注释 2："
 
 #. i18n: file ./protocols/yahoo/ui/yahoootherinfowidget.ui line 80
-#: rc.cpp:4019
+#: rc.cpp:2218
 #, no-c-format
 msgid "Note 3:"
 msgstr "注释 3："
 
 #. i18n: file ./protocols/yahoo/ui/yahoootherinfowidget.ui line 96
-#: rc.cpp:4022
+#: rc.cpp:2221
 #, no-c-format
 msgid "Note 4:"
 msgstr "注释 4："
 
-#. i18n: file ./protocols/yahoo/ui/yahooverifyaccountbase.ui line 30
-#: rc.cpp:4025
-#, no-c-format
-msgid ""
-"Your Account has to be verified because of too many false login attempts."
-"<br>"
-msgstr "由于登录尝试错误过多，现在需要核验您的账户。<br>"
-
-#. i18n: file ./protocols/yahoo/ui/yahooverifyaccountbase.ui line 46
-#: rc.cpp:4028
-#, no-c-format
-msgid "Please enter the chars shown in the picture:"
-msgstr "请输入图片中显示的字符："
-
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 16
-#: rc.cpp:4031
+#: rc.cpp:2224
 #, no-c-format
 msgid "Account Preferences - Yahoo"
 msgstr "账户首选项 - Yahoo"
 
+#. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 43
+#: rc.cpp:2227 rc.cpp:2947 rc.cpp:3200 rc.cpp:3612
+#, no-c-format
+msgid "&Basic Setup"
+msgstr "基本设置(&B)"
+
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 79
-#: rc.cpp:4043 rc.cpp:4049
+#: rc.cpp:2236 rc.cpp:2242
 #, no-c-format
 msgid "The account name of your Yahoo account."
 msgstr "您 Yahoo 账户的账户名。"
 
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 82
-#: rc.cpp:4046 rc.cpp:4052
+#: rc.cpp:2239 rc.cpp:2245
 #, no-c-format
 msgid ""
 "The account name of your Yahoo account.  This should be in the form of an "
 "alphanumeric string (no spaces)."
 msgstr "您 Yahoo 账户的账户名，其格式应该为由字母和数字组成的字符串(无空格)。"
 
+#. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 103
+#: rc.cpp:2248 rc.cpp:2377 rc.cpp:2968 rc.cpp:3221 rc.cpp:3636 rc.cpp:3909
+#: rc.cpp:4412 rc.cpp:4815
+#, no-c-format
+msgid "E&xclude from connect all"
+msgstr "从全部连接中排除(&X)"
+
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 106
-#: rc.cpp:4058 rc.cpp:4190 rc.cpp:4521 rc.cpp:5108
+#: rc.cpp:2251 rc.cpp:2380 rc.cpp:2971 rc.cpp:3912
 #, no-c-format
 msgid ""
 "Check to disable automatic connection.  If checked, you may connect to this "
@@ -8914,13 +11116,19 @@ msgid ""
 msgstr "选中此处可禁用自动连接。如果选中的话，您仍然可以使用 Kopete 窗口底部的图标手动连接此账户。"
 
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 114
-#: rc.cpp:4061
+#: rc.cpp:2254
 #, no-c-format
 msgid "Exclude from &Global Identity"
 msgstr "从全局身份中排除(&G)"
 
+#. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 132
+#: rc.cpp:2257 rc.cpp:2977 rc.cpp:3230 rc.cpp:3642 rc.cpp:4418
+#, no-c-format
+msgid "Registration"
+msgstr "注册"
+
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 157
-#: rc.cpp:4067
+#: rc.cpp:2260
 #, no-c-format
 msgid ""
 "To connect to the Yahoo network, you will need a Yahoo account."
@@ -8930,31 +11138,44 @@ msgid ""
 msgstr "要连接到 Yahoo 网络，您需要有 Yahoo 账户。<br><br>如果您还没有 Yahoo 账户，您可以从下面链接的网站处注册。"
 
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 171
-#: rc.cpp:4070
+#: rc.cpp:2263
 #, no-c-format
 msgid "Register &New Account"
 msgstr "注册新账户(&N)"
 
+#. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 174
+#: rc.cpp:2266 rc.cpp:2269 rc.cpp:2986 rc.cpp:2989 rc.cpp:4428 rc.cpp:4431
+#, no-c-format
+msgid "Register a new account on this network."
+msgstr "在此网络上注册新账户。"
+
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 206
-#: rc.cpp:4079
+#: rc.cpp:2272
 #, no-c-format
 msgid "Accoun&t Preferences"
 msgstr "账户首选项(&T)"
 
+#. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 234
+#: rc.cpp:2275 rc.cpp:2386 rc.cpp:3004 rc.cpp:3243 rc.cpp:3654 rc.cpp:4437
+#: rc.cpp:4809
+#, no-c-format
+msgid "Connection Preferences"
+msgstr "连接首选项"
+
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 245
-#: rc.cpp:4085
+#: rc.cpp:2278
 #, no-c-format
 msgid "O&verride default server information"
 msgstr "覆盖服务器默认信息(&O)"
 
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 273
-#: rc.cpp:4091 rc.cpp:4100
+#: rc.cpp:2284 rc.cpp:2293
 #, no-c-format
 msgid "The IP address or hostmask of the Yahoo server you wish to connect to."
 msgstr "您想要连接的 Yahoo 服务器的 IP 地址或主机名。"
 
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 276
-#: rc.cpp:4094 rc.cpp:4103
+#: rc.cpp:2287 rc.cpp:2296
 #, no-c-format
 msgid ""
 "The IP address or hostmask of the Yahoo server you wish to connect to.  "
@@ -8962,19 +11183,19 @@ msgid ""
 msgstr "您想要连接的 Yahoo 服务器的 IP 地址或主机名。通常，您只需保留默认值(scs.msg.yahoo.com)。"
 
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 287
-#: rc.cpp:4097
+#: rc.cpp:2290
 #, no-c-format
 msgid "scs.msg.yahoo.com"
 msgstr "scs.msg.yahoo.com"
 
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 310
-#: rc.cpp:4109
+#: rc.cpp:2302
 #, no-c-format
 msgid "The port on the Yahoo server that you would like to connect to."
 msgstr "您想要连接的 Yahoo 服务器的端口。"
 
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 313
-#: rc.cpp:4112 rc.cpp:4118
+#: rc.cpp:2305 rc.cpp:2311
 #, no-c-format
 msgid ""
 "The port on the Yahoo server that you would like to connect to.  Normally this "
@@ -8982,98 +11203,116 @@ msgid ""
 msgstr "您想要连接的 Yahoo 服务器的端口。通常为 5050，但如果您在防火墙后，Yahoo 也允许使用 80 端口。"
 
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 333
-#: rc.cpp:4115
+#: rc.cpp:2308
 #, no-c-format
 msgid "The port on the Yahoo server that you would like to connect  to."
 msgstr "您想要连接的 Yahoo 服务器的端口。"
 
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 348
-#: rc.cpp:4121
+#: rc.cpp:2314
 #, no-c-format
 msgid "Buddy Icon"
 msgstr "好友图标"
 
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 364
-#: rc.cpp:4124
+#: rc.cpp:2317
 #, no-c-format
 msgid "Select Picture..."
 msgstr "选择图片..."
 
 #. i18n: file ./protocols/yahoo/ui/yahooeditaccountbase.ui line 404
-#: rc.cpp:4127
+#: rc.cpp:2320
 #, no-c-format
 msgid "Se&nd buddy icon to other users"
 msgstr "将好友图标发送给其他用户(&N)"
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileaddcontactbase.ui line 16
-#: rc.cpp:4133
+#: rc.cpp:2323
 #, no-c-format
 msgid "Add Sametime Contact"
 msgstr "添加 Sametime 联系人"
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileaddcontactbase.ui line 41
-#: rc.cpp:4136
+#: rc.cpp:2326
 #, no-c-format
 msgid "&Userid:"
 msgstr "用户 ID(&U)："
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileaddcontactbase.ui line 47
-#: rc.cpp:4139 rc.cpp:4142 rc.cpp:4145 rc.cpp:4148
+#: rc.cpp:2329 rc.cpp:2332 rc.cpp:2335 rc.cpp:2338
 #, no-c-format
 msgid "The user id of the contact you would like to add."
 msgstr "您想要添加的联系人的用户 ID。"
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileaddcontactbase.ui line 69
-#: rc.cpp:4151
+#: rc.cpp:2341
 #, no-c-format
 msgid "&Find"
 msgstr "查找(&F)"
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileaddcontactbase.ui line 72
-#: rc.cpp:4154 rc.cpp:4157
+#: rc.cpp:2344 rc.cpp:2347
 #, no-c-format
 msgid "Find Userid"
 msgstr "查找用户 ID"
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileaddcontactbase.ui line 85
-#: rc.cpp:4160
+#: rc.cpp:2350
 #, no-c-format
 msgid "<i>(for example: johndoe)</i>"
 msgstr "<i>(例如：joedoe)</i>"
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 16
-#: rc.cpp:4163
+#: rc.cpp:2353
 #, no-c-format
 msgid "Edit Meanwhile Account"
 msgstr "编辑 Meanwhile 账户"
 
+#. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 31
+#: rc.cpp:2356 rc.cpp:2506 rc.cpp:3888 rc.cpp:4391 rc.cpp:4746
+#, no-c-format
+msgid "B&asic Setup"
+msgstr "基本设置(&A)"
+
 #. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 61
-#: rc.cpp:4172
+#: rc.cpp:2362
 #, no-c-format
 msgid "Meanwhile &username:"
 msgstr "Meanwhile 用户名(&U)："
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 67
-#: rc.cpp:4175 rc.cpp:4178 rc.cpp:4181 rc.cpp:4184
+#: rc.cpp:2365 rc.cpp:2368 rc.cpp:2371 rc.cpp:2374
 #, no-c-format
 msgid "Your Sametime userid"
 msgstr "您的 Sametime 用户 ID"
 
+#. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 111
+#: rc.cpp:2383 rc.cpp:4800
+#, no-c-format
+msgid "Connection"
+msgstr "连接"
+
 #. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 155
-#: rc.cpp:4202 rc.cpp:4205 rc.cpp:4208 rc.cpp:4211
+#: rc.cpp:2392 rc.cpp:2395 rc.cpp:2398 rc.cpp:2401
 #, no-c-format
 msgid ""
 "The IP address or hostname of the Sametime server you wish to connect to."
 msgstr "您想要连接的 Sametime 服务器的 IP 地址或主机名。"
 
+#. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 187
+#: rc.cpp:2404 rc.cpp:3037 rc.cpp:3261 rc.cpp:3678 rc.cpp:3930
+#, no-c-format
+msgid "Po&rt:"
+msgstr "端口(&R)："
+
 #. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 193
-#: rc.cpp:4217 rc.cpp:4223
+#: rc.cpp:2407 rc.cpp:2413
 #, no-c-format
 msgid "The port on the Sametime server that you would like to connect to."
 msgstr "您想要连接的 Sametime 服务器的端口。"
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 196
-#: rc.cpp:4220 rc.cpp:4226
+#: rc.cpp:2410 rc.cpp:2416
 #, no-c-format
 msgid ""
 "The port on the Sametime server that you would like to connect to.  Usually "
@@ -9081,287 +11320,743 @@ msgid ""
 msgstr "您想要连接的 Sametime 服务器的端口。通常为 1533。"
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 228
-#: rc.cpp:4229
+#: rc.cpp:2419
 #, no-c-format
 msgid "Client Identifier"
 msgstr "客户端标识符"
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 239
-#: rc.cpp:4232
+#: rc.cpp:2422
 #, no-c-format
 msgid "Use custom client identifier"
 msgstr "使用自定义客户端标识符"
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 266
-#: rc.cpp:4235
+#: rc.cpp:2425
 #, no-c-format
 msgid "Client identifier"
 msgstr "客户端标识符"
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 299
-#: rc.cpp:4238
+#: rc.cpp:2428
 #, no-c-format
 msgid "."
 msgstr "."
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 326
-#: rc.cpp:4241
+#: rc.cpp:2431
 #, no-c-format
 msgid "Client version (major.minor)"
 msgstr "客户端版本(主版本号.次要版本号)"
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 341
-#: rc.cpp:4244
+#: rc.cpp:2434
 #, no-c-format
 msgid "Restore &Defaults"
 msgstr "重置为默认(&D)"
 
 #. i18n: file ./protocols/meanwhile/ui/meanwhileeditaccountbase.ui line 344
-#: rc.cpp:4247 rc.cpp:4250
+#: rc.cpp:2437 rc.cpp:2440
 #, no-c-format
 msgid "Restore the server and port values to their defaults."
 msgstr "将服务器和端口值恢复为默认值。"
 
+#. i18n: file ./protocols/sms/services/smsclientprefs.ui line 49
+#: rc.cpp:2443
+#, no-c-format
+msgid "SMSClient Settings"
+msgstr "短信息设置"
+
+#. i18n: file ./protocols/sms/services/smsclientprefs.ui line 79
+#: rc.cpp:2446
+#, no-c-format
+msgid "SMSClient &program:"
+msgstr "短信息客户程序(&P)："
+
+#. i18n: file ./protocols/sms/services/smsclientprefs.ui line 90
+#: rc.cpp:2449 rc.cpp:2458
+#, no-c-format
+msgid "Pro&vider:"
+msgstr "提供商(&V)："
+
+#. i18n: file ./protocols/sms/services/smsclientprefs.ui line 116
+#: rc.cpp:2452
+#, no-c-format
+msgid "SMSClient &config path:"
+msgstr "短信息客户配置路径(&C)："
+
+#. i18n: file ./protocols/sms/services/smssendprefs.ui line 49
+#: rc.cpp:2455
+#, no-c-format
+msgid "SMSSend Options"
+msgstr "短信息发送选项"
+
+#. i18n: file ./protocols/sms/services/smssendprefs.ui line 124
+#: rc.cpp:2461
+#, no-c-format
+msgid "SMSSend prefi&x:"
+msgstr "短信息发送前缀(&X)："
+
+#. i18n: file ./protocols/sms/services/smssendprefs.ui line 159
+#: rc.cpp:2464
+#, no-c-format
+msgid "Provider Options"
+msgstr "供应者选项"
+
+#. i18n: file ./protocols/sms/services/gsmlibprefs.ui line 49
+#: rc.cpp:2467
+#, no-c-format
+msgid "GSMLib Settings"
+msgstr "GSMLib 设置"
+
+#. i18n: file ./protocols/sms/ui/smsadd.ui line 54
+#: rc.cpp:2473 rc.cpp:2617 rc.cpp:4596
+#, no-c-format
+msgid "&Telephone number:"
+msgstr "电话号码(&T)："
+
+#. i18n: file ./protocols/sms/ui/smsadd.ui line 60
+#: rc.cpp:2476 rc.cpp:2491
+#, no-c-format
+msgid "The telephone number of the contact you would like to add."
+msgstr "您想要添加的联系人电话号码。"
+
+#. i18n: file ./protocols/sms/ui/smsadd.ui line 63
+#: rc.cpp:2479 rc.cpp:2494
+#, no-c-format
+msgid ""
+"The telephone number of the contact you would like to add.  This should be a "
+"number with SMS service available."
+msgstr "您想要添加的联系人电话号码。这应该是已经开通了短信息服务的号码。"
+
+#. i18n: file ./protocols/sms/ui/smsadd.ui line 71
+#: rc.cpp:2482
+#, no-c-format
+msgid "Contact na&me:"
+msgstr "联系人名称(&M)："
+
+#. i18n: file ./protocols/sms/ui/smsadd.ui line 77
+#: rc.cpp:2485 rc.cpp:2488 rc.cpp:2497 rc.cpp:2500 rc.cpp:2515 rc.cpp:2518
+#: rc.cpp:2530
+#, no-c-format
+msgid "A unique name for this SMS account."
+msgstr "短信息账户的唯一名称。"
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 25
+#: rc.cpp:2503
+#, no-c-format
+msgid "Account Preferences - SMS"
+msgstr "账户首选项 - SMS"
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 82
+#: rc.cpp:2512 rc.cpp:3744
+#, no-c-format
+msgid "&Account name:"
+msgstr "账户名(&A)："
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 99
+#: rc.cpp:2521
+#, no-c-format
+msgid "&SMS delivery service:"
+msgstr "短信息发送服务(&S)："
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 105
+#: rc.cpp:2524 rc.cpp:2533
+#, no-c-format
+msgid "The delivery service that you would like to use."
+msgstr "您想要使用的短信息发送服务。"
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 108
+#: rc.cpp:2527 rc.cpp:2536
+#, no-c-format
+msgid ""
+"The delivery service that you would like to use.  Note that you will need to "
+"have this software installed prior to using this account."
+msgstr "您想要使用的短信息发送服务。请注意，要使用此账户，您需要先安装此软件。"
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 151
+#: rc.cpp:2539
+#, no-c-format
+msgid "&Description"
+msgstr "描述(&D)"
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 154
+#: rc.cpp:2542
+#, no-c-format
+msgid "Description of the SMS delivery service."
+msgstr "短信息发送服务的描述。"
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 157
+#: rc.cpp:2545
+#, no-c-format
+msgid "Description of the SMS delivery service, including download locations."
+msgstr "短信息发送服务的描述，包括下载位置。"
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 188
+#: rc.cpp:2551
+#, no-c-format
+msgid "To use SMS, you will need an account with a delivery service."
+msgstr "要使用短信息，您需要在发送服务处注册一个账户。"
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 220
+#: rc.cpp:2554 rc.cpp:4434
+#, no-c-format
+msgid "A&ccount Preferences"
+msgstr "账户首选项(&C)"
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 231
+#: rc.cpp:2557
+#, no-c-format
+msgid "Messaging Preferences"
+msgstr "时限首选项"
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 250
+#: rc.cpp:2560
+#, no-c-format
+msgid "If the message is too &long:"
+msgstr "若消息过长(&L)："
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 256
+#: rc.cpp:2563 rc.cpp:2578
+#, no-c-format
+msgid ""
+"What should happen if you type a message that is too long to fit in a single "
+"SMS message."
+msgstr "如果您输入的文字过长，一条短信息中容纳不下，则应采取什么操作。"
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 259
+#: rc.cpp:2566 rc.cpp:2581
+#, no-c-format
+msgid ""
+"What should happen if you type a message that is too long to fit in a single "
+"SMS message.  You can either choose to break it up into smaller messages "
+"automatically, cancel the message from being sent entirely, or have Kopete "
+"prompt you each time you enter a message that is too long."
+msgstr ""
+"如果您输入的文字过长，一条短信息中容纳不下，则应采取什么操作。您可以选择将其自动拆成多条长度适当的信息，取消信息发送，或者让 Kopete "
+"每次提示您应该如何操作。"
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 265
+#: rc.cpp:2569
+#, no-c-format
+msgid "Prompt (recommended)"
+msgstr "提示(推荐)"
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 270
+#: rc.cpp:2572
+#, no-c-format
+msgid "Break Into Multiple"
+msgstr "拆成多条"
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 275
+#: rc.cpp:2575
+#, no-c-format
+msgid "Cancel Sending"
+msgstr "取消发送"
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 295
+#: rc.cpp:2584
+#, no-c-format
+msgid "&Enable phone number internationalization"
+msgstr "启用电话号码的国际化(&E)"
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 298
+#: rc.cpp:2587
+#, no-c-format
+msgid "Check if you would like to enable phone number internationalization."
+msgstr "如果您想要将电话号码国际化，请选中此处。"
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 301
+#: rc.cpp:2590
+#, no-c-format
+msgid ""
+"Check if you would like to enable phone number internationalization.  Without "
+"this option, you will only be able to use SMS for accounts within your country."
+msgstr "如果您想要将电话号码国际化，请选中此处。如果没有此选项，您将只能在您的国家内使用短信息账户。"
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 328
+#: rc.cpp:2593
+#, no-c-format
+msgid "Substitute leading &zero with code:"
+msgstr "将前导零替换为代码(&Z)："
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 334
+#: rc.cpp:2596 rc.cpp:2599 rc.cpp:2608 rc.cpp:2611
+#, no-c-format
+msgid "What you would like to substitute a leading zero with."
+msgstr "您想要将前导零替换为什么内容。"
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 356
+#: rc.cpp:2602
+#, no-c-format
+msgid "+"
+msgstr "+"
+
+#. i18n: file ./protocols/sms/ui/smsactprefs.ui line 359
+#: rc.cpp:2605
+#, no-c-format
+msgid "1234567890+"
+msgstr "1234567890+"
+
+#. i18n: file ./protocols/sms/ui/smsuserprefs.ui line 40
+#: rc.cpp:2614
+#, no-c-format
+msgid "Some One"
+msgstr "有人"
+
+#. i18n: file ./protocols/sms/ui/smsuserprefs.ui line 76
+#: rc.cpp:2620 rc.cpp:2626
+#, no-c-format
+msgid "The telephone number of the contact."
+msgstr "联系人的电话号码。"
+
+#. i18n: file ./protocols/sms/ui/smsuserprefs.ui line 79
+#: rc.cpp:2623 rc.cpp:2629
+#, no-c-format
+msgid ""
+"The telephone number of the contact.  This should be a number with SMS service "
+"available."
+msgstr "联系人的电话号码。这应该是已经开通了短信息服务的号码。"
+
+#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 16
+#: rc.cpp:2635
+#, no-c-format
+msgid "JabberVoiceSessionDialogBase"
+msgstr "JabberVoiceSessionDialogBase"
+
+#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 60
+#: rc.cpp:2638
+#, no-c-format
+msgid "Voice session with:"
+msgstr "语音会话和："
+
+#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 178
+#: rc.cpp:2641
+#, no-c-format
+msgid "Contact displayname"
+msgstr "联系人显示名"
+
+#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 266
+#: rc.cpp:2644
+#, no-c-format
+msgid "Accep&t"
+msgstr "接受(&T)"
+
+#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 277
+#: rc.cpp:2647
+#, no-c-format
+msgid "&Decline"
+msgstr "拒绝(&D)"
+
+#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 288
+#: rc.cpp:2650
+#, no-c-format
+msgid "Termi&nate"
+msgstr "终止(&N)"
+
+#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 323
+#: rc.cpp:2653
+#, no-c-format
+msgid "Current status:"
+msgstr "当前状态："
+
+#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 339
+#: rc.cpp:2656
+#, no-c-format
+msgid "Session status"
+msgstr "会话状态"
+
+#. i18n: file ./protocols/jabber/ui/dlgbrowse.ui line 34
+#: rc.cpp:2662
+#, no-c-format
+msgid "Search For"
+msgstr "搜索"
+
+#. i18n: file ./protocols/jabber/ui/dlgbrowse.ui line 48
+#: rc.cpp:2665
+#, no-c-format
+msgid "Please wait while retrieving search form..."
+msgstr "正在获取搜索表单，请稍候..."
+
+#. i18n: file ./protocols/jabber/ui/dlgbrowse.ui line 59
+#: rc.cpp:2668
+#, no-c-format
+msgid "JID"
+msgstr "JID"
+
+#. i18n: file ./protocols/jabber/ui/dlgbrowse.ui line 64
+#: libkopete/kopeteglobal.cpp:142 rc.cpp:2671 rc.cpp:3435 rc.cpp:4056
+#, no-c-format
+msgid "First Name"
+msgstr "名"
+
+#. i18n: file ./protocols/jabber/ui/dlgbrowse.ui line 69
+#: libkopete/kopeteglobal.cpp:148 rc.cpp:2674 rc.cpp:3438 rc.cpp:4059
+#, no-c-format
+msgid "Last Name"
+msgstr "姓"
+
+#. i18n: file ./protocols/jabber/ui/dlgbrowse.ui line 74
+#: rc.cpp:2677
+#, no-c-format
+msgid "Nick"
+msgstr "昵称"
+
+#. i18n: file ./protocols/jabber/ui/dlgbrowse.ui line 154
+#: rc.cpp:2683 rc.cpp:3450 rc.cpp:3489 rc.cpp:4038
+#, no-c-format
+msgid "&Search"
+msgstr "搜索(&S)"
+
+#. i18n: file ./protocols/jabber/ui/dlgservices.ui line 16
+#: rc.cpp:2689
+#, no-c-format
+msgid "Jabber Service Management"
+msgstr "Jabber 服务管理"
+
+#. i18n: file ./protocols/jabber/ui/dlgservices.ui line 46
+#: rc.cpp:2692 rc.cpp:3157
+#, no-c-format
+msgid "Server:"
+msgstr "服务器："
+
+#. i18n: file ./protocols/jabber/ui/dlgservices.ui line 75
+#: rc.cpp:2695
+#, no-c-format
+msgid "&Query Server"
+msgstr "查询服务器(&Q)"
+
+#. i18n: file ./protocols/jabber/ui/dlgservices.ui line 89
+#: rc.cpp:2698
+#, no-c-format
+msgid "Jid"
+msgstr "Jid"
+
+#. i18n: file ./protocols/jabber/ui/dlgservices.ui line 167
+#: rc.cpp:2707
+#, no-c-format
+msgid "&Browse"
+msgstr "浏览(&B)"
+
 #. i18n: file ./protocols/jabber/ui/dlgjabberchooseserver.ui line 22
-#: rc.cpp:4253
+#: rc.cpp:2713
 #, no-c-format
 msgid "Choose Server - Jabber"
 msgstr "选择服务器 - Jabber"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabberchooseserver.ui line 31
-#: rc.cpp:4256 rc.cpp:4296
+#: rc.cpp:2716 rc.cpp:2770
 #, no-c-format
 msgid "Server"
 msgstr "服务器"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabberchooseserver.ui line 85
-#: rc.cpp:4262
+#: rc.cpp:2722
 #, no-c-format
 msgid ""
 "<a href=\"http://www.jabber.org/network/\">Details about free public Jabber "
 "servers</a>"
 msgstr "<a href=\"http://www.jabber.org/network\">关于免费公开的 Jabber 服务器的细节</a>"
 
-#. i18n: file ./protocols/jabber/ui/dlgregister.ui line 24
-#: rc.cpp:4265
+#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 16
+#: rc.cpp:2725
 #, no-c-format
-msgid "Register with Jabber Service"
-msgstr "注册 Jabber 服务"
+msgid "Send Raw XML Packet"
+msgstr "发送原始 XML 报文"
 
-#. i18n: file ./protocols/jabber/ui/dlgregister.ui line 49
-#: rc.cpp:4268
+#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 42
+#: rc.cpp:2728
 #, no-c-format
-msgid "Registration Form"
-msgstr "注册表单"
+msgid "Type in the packet that should be sent to the server:"
+msgstr "输入应该发送给服务器的报文："
 
-#. i18n: file ./protocols/jabber/ui/dlgregister.ui line 68
-#: rc.cpp:4271
+#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 56
+#: rc.cpp:2731
 #, no-c-format
-msgid "Please wait while querying the server..."
-msgstr "正在查询服务器，请稍候..."
+msgid "User Defined"
+msgstr "定义的用户"
 
-#. i18n: file ./protocols/jabber/ui/dlgregister.ui line 129
-#: protocols/gadu/gaduregisteraccount.cpp:45 rc.cpp:4274 rc.cpp:4329
+#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 61
+#: rc.cpp:2734
 #, no-c-format
-msgid "&Register"
-msgstr "注册(&R)"
+msgid "Account Deletion"
+msgstr "账户删除"
 
-#. i18n: file ./protocols/jabber/ui/dlgchangepassword.ui line 24
-#: rc.cpp:4280
+#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 66
+#: rc.cpp:2737
 #, no-c-format
-msgid "Current password:"
-msgstr "当前密码："
+msgid "Availability Status"
+msgstr "闲忙状态"
 
-#. i18n: file ./protocols/jabber/ui/dlgchangepassword.ui line 32
-#: rc.cpp:4283 rc.cpp:4286
+#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 71
+#: rc.cpp:2740
 #, no-c-format
-msgid "New password:"
-msgstr "新密码："
+msgid "Last Active Time"
+msgstr "上次活动时间"
 
-#. i18n: file ./protocols/jabber/ui/dlgchangepassword.ui line 72
-#: rc.cpp:4289
+#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 76
+#: rc.cpp:2743
 #, no-c-format
-msgid ""
-"Please enter your current password first\n"
-"and then your new password twice."
-msgstr "请输入两次同样的密码。"
+msgid "Message with Body"
+msgstr "带内容的信件"
 
-#. i18n: file ./protocols/jabber/ui/dlgchatroomslist.ui line 16
-#: protocols/jabber/ui/dlgjabberchatroomslist.cpp:36 rc.cpp:4293
+#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 81
+#: rc.cpp:2746
 #, no-c-format
-msgid "List Chatrooms"
-msgstr "列出聊天室"
+msgid "Message with Subject"
+msgstr "带主题的信件"
+
+#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 86
+#: rc.cpp:2749
+#, no-c-format
+msgid "Add Roster Item"
+msgstr "添加花名册项目"
+
+#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 91
+#: rc.cpp:2752
+#, no-c-format
+msgid "Delete Roster Item"
+msgstr "删除花名册项目"
+
+#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 116
+#: rc.cpp:2758
+#, no-c-format
+msgid "Clea&r"
+msgstr "清除(&R)"
+
+#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 124
+#: rc.cpp:2761
+#, no-c-format
+msgid "&Send"
+msgstr "发送(&S)"
 
 #. i18n: file ./protocols/jabber/ui/dlgchatroomslist.ui line 48
-#: rc.cpp:4299
+#: rc.cpp:2773
 #, no-c-format
 msgid "&Query"
 msgstr "查询(&Q)"
 
 #. i18n: file ./protocols/jabber/ui/dlgchatroomslist.ui line 56
-#: rc.cpp:4302
+#: rc.cpp:2776
 #, no-c-format
 msgid "Chatroom Name"
 msgstr "聊天室名"
 
 #. i18n: file ./protocols/jabber/ui/dlgchatroomslist.ui line 64
-#: rc.cpp:4305
+#: rc.cpp:2779
 #, no-c-format
 msgid "Chatroom Description"
 msgstr "聊天室描述"
 
-#. i18n: file ./protocols/jabber/ui/dlgchatroomslist.ui line 128
-#: protocols/irc/ircchannelcontact.cpp:661 rc.cpp:4308 rc.cpp:4710
-#, no-c-format
-msgid "&Join"
-msgstr "加入(&J)"
-
 #. i18n: file ./protocols/jabber/ui/dlgchatroomslist.ui line 136
-#: rc.cpp:4311
+#: rc.cpp:2785
 #, no-c-format
 msgid "Clos&e"
 msgstr "关闭(&E)"
 
-#. i18n: file ./protocols/jabber/ui/dlgservices.ui line 16
-#: rc.cpp:4314
+#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 22
+#: rc.cpp:2788
 #, no-c-format
-msgid "Jabber Service Management"
-msgstr "Jabber 服务管理"
+msgid "Register Account - Jabber"
+msgstr "注册账户 - Jabber"
 
-#. i18n: file ./protocols/jabber/ui/dlgservices.ui line 46
-#: rc.cpp:4317 rc.cpp:4707
+#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 33
+#: rc.cpp:2791
 #, no-c-format
-msgid "Server:"
-msgstr "服务器："
+msgid "Desired Jabber &ID:"
+msgstr "喜欢的 Jabber ID(&I)："
 
-#. i18n: file ./protocols/jabber/ui/dlgservices.ui line 75
-#: rc.cpp:4320
+#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 77
+#: rc.cpp:2794
 #, no-c-format
-msgid "&Query Server"
-msgstr "查询服务器(&Q)"
+msgid "C&hoose..."
+msgstr "选择(&H)..."
 
-#. i18n: file ./protocols/jabber/ui/dlgservices.ui line 89
-#: rc.cpp:4323
+#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 122
+#: rc.cpp:2800 rc.cpp:3007
 #, no-c-format
-msgid "Jid"
-msgstr "Jid"
+msgid "Use protocol encr&yption (SSL)"
+msgstr "使用协议加密(SSL)(&Y)"
 
-#. i18n: file ./protocols/jabber/ui/dlgservices.ui line 167
-#: rc.cpp:4332
+#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 128
+#: rc.cpp:2803 rc.cpp:3010
 #, no-c-format
-msgid "&Browse"
-msgstr "浏览(&B)"
+msgid "Check this box to enable SSL encrypted communication with the server."
+msgstr "选中此框可在与服务器通讯时启用 SSL 加密。"
+
+#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 131
+#: rc.cpp:2806 rc.cpp:3013
+#, no-c-format
+msgid ""
+"Check this box to enable SSL encrypted communication with the server.  Note "
+"that this is not end-to-end encryption, but rather encrypted communication with "
+"the server."
+msgstr "选中此框可在与服务器通讯时启用 SSL 加密。请注意，这不是端到端的加密，而只是与服务器的通讯加密。"
+
+#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 156
+#: rc.cpp:2809
+#, no-c-format
+msgid "&Port:"
+msgstr "端口(&P)："
+
+#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 170
+#: rc.cpp:2812
+#, no-c-format
+msgid "&Repeat password:"
+msgstr "重复密码(&R)："
+
+#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 206
+#: rc.cpp:2815
+#, no-c-format
+msgid "Jabber &server:"
+msgstr "Jabber 服务器(&S)："
 
 #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 173
-#: rc.cpp:4347
+#: rc.cpp:2827
 #, no-c-format
 msgid "Timezone:"
 msgstr "时区："
 
 #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 204
-#: rc.cpp:4350
+#: rc.cpp:2830
 #, no-c-format
 msgid "Jabber ID:"
 msgstr "Jabber ID："
 
 #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 235
-#: rc.cpp:4353
+#: rc.cpp:2833
 #, no-c-format
 msgid "Full name:"
 msgstr "全名："
 
+#. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 269
+#: rc.cpp:2836 rc.cpp:3582
+#, no-c-format
+msgid "Nickname:"
+msgstr "昵称："
+
 #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 337
-#: rc.cpp:4362
+#: rc.cpp:2842
 #, no-c-format
 msgid "&Select Photo..."
 msgstr "选择照片(&S)..."
 
 #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 345
-#: rc.cpp:4365
+#: rc.cpp:2845
 #, no-c-format
 msgid "Clear Pho&to"
 msgstr "清除照片(&T)"
 
 #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 422
-#: rc.cpp:4368
+#: rc.cpp:2848
 #, no-c-format
 msgid "&Home Address"
 msgstr "家庭地址(&H)"
 
 #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 441
-#: rc.cpp:4371 rc.cpp:4404
+#: rc.cpp:2851 rc.cpp:2884
 #, no-c-format
 msgid "Postal code:"
 msgstr "邮政编码："
 
 #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 449
-#: rc.cpp:4374 rc.cpp:4395
+#: rc.cpp:2854 rc.cpp:2875
 #, no-c-format
 msgid "PO box:"
 msgstr "邮政邮箱："
 
 #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 550
-#: rc.cpp:4383 rc.cpp:4407
+#: rc.cpp:2863 rc.cpp:2887
 #, no-c-format
 msgid "Street:"
 msgstr "街道："
 
 #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 620
-#: rc.cpp:4389
+#: rc.cpp:2869
 #, no-c-format
 msgid "&Work Address"
 msgstr "工作地址(&W)"
 
 #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 818
-#: rc.cpp:4410
+#: rc.cpp:2890
 #, no-c-format
 msgid "Wor&k Information"
 msgstr "工作信息(&K)"
 
+#. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 864
+#: rc.cpp:2893 rc.cpp:3333
+#, no-c-format
+msgid "Position:"
+msgstr "职位："
+
 #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 882
-#: rc.cpp:4416
+#: rc.cpp:2896
 #, no-c-format
 msgid "Role:"
 msgstr "职务："
 
+#. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 890
+#: rc.cpp:2899 rc.cpp:3330
+#, no-c-format
+msgid "Department:"
+msgstr "部门："
+
 #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 898
-#: rc.cpp:4422
+#: rc.cpp:2902
 #, no-c-format
 msgid "Company:"
 msgstr "公司："
 
 #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 910
-#: rc.cpp:4425
+#: rc.cpp:2905
 #, no-c-format
 msgid "Phone &Numbers"
 msgstr "电话号码(&N)"
 
+#. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 956
+#: rc.cpp:2908 rc.cpp:3327
+#, no-c-format
+msgid "Fax:"
+msgstr "传真："
+
 #. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 969
-#: rc.cpp:4431
+#: rc.cpp:2911
 #, no-c-format
 msgid "Cell:"
 msgstr "移动电话："
 
+#. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 982
+#: rc.cpp:2914
+#, no-c-format
+msgid "Work:"
+msgstr "单位："
+
+#. i18n: file ./protocols/jabber/ui/dlgvcard.ui line 990
+#: rc.cpp:2917
+#, no-c-format
+msgid "Home:"
+msgstr "宅电："
+
 #. i18n: file ./protocols/jabber/ui/dlgaddcontact.ui line 16
-#: rc.cpp:4443
+#: rc.cpp:2923
 #, no-c-format
 msgid "Add Contacts"
 msgstr "添加联系人"
 
 #. i18n: file ./protocols/jabber/ui/dlgaddcontact.ui line 41
-#: rc.cpp:4446 rc.cpp:4503
+#: rc.cpp:2926 rc.cpp:2953
 #, no-c-format
 msgid "&Jabber ID:"
 msgstr "&Jabber ID："
 
 #. i18n: file ./protocols/jabber/ui/dlgaddcontact.ui line 50
-#: rc.cpp:4449 rc.cpp:4455
+#: rc.cpp:2929 rc.cpp:2935
 #, no-c-format
 msgid "The Jabber ID for the account you would like to add."
 msgstr "您想要添加的账户的 Jabber ID。"
 
 #. i18n: file ./protocols/jabber/ui/dlgaddcontact.ui line 53
-#: rc.cpp:4452 rc.cpp:4458
+#: rc.cpp:2932 rc.cpp:2938
 #, no-c-format
 msgid ""
 "The Jabber ID for the account you would like to add.  Note that this must "
@@ -9370,82 +12065,25 @@ msgid ""
 msgstr "您想要添加的账户的 Jabber ID。请注意，您必须写全用户名和域名(和电子邮件地址一样)，因为有很多台 Jabber 服务器。"
 
 #. i18n: file ./protocols/jabber/ui/dlgaddcontact.ui line 74
-#: rc.cpp:4461
+#: rc.cpp:2941
 #, no-c-format
 msgid "<i>(for example: joe@jabber.org)</i>"
 msgstr "<i>(例如：joe@jabber.org)</i>"
 
-#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 22
-#: rc.cpp:4464
-#, no-c-format
-msgid "Register Account - Jabber"
-msgstr "注册账户 - Jabber"
-
-#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 33
-#: rc.cpp:4467
-#, no-c-format
-msgid "Desired Jabber &ID:"
-msgstr "喜欢的 Jabber ID(&I)："
-
-#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 77
-#: rc.cpp:4470
-#, no-c-format
-msgid "C&hoose..."
-msgstr "选择(&H)..."
-
-#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 122
-#: rc.cpp:4476 rc.cpp:4557
-#, no-c-format
-msgid "Use protocol encr&yption (SSL)"
-msgstr "使用协议加密(SSL)(&Y)"
-
-#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 128
-#: rc.cpp:4479 rc.cpp:4560
-#, no-c-format
-msgid "Check this box to enable SSL encrypted communication with the server."
-msgstr "选中此框可在与服务器通讯时启用 SSL 加密。"
-
-#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 131
-#: rc.cpp:4482 rc.cpp:4563
-#, no-c-format
-msgid ""
-"Check this box to enable SSL encrypted communication with the server.  Note "
-"that this is not end-to-end encryption, but rather encrypted communication with "
-"the server."
-msgstr "选中此框可在与服务器通讯时启用 SSL 加密。请注意，这不是端到端的加密，而只是与服务器的通讯加密。"
-
-#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 156
-#: rc.cpp:4485
-#, no-c-format
-msgid "&Port:"
-msgstr "端口(&P)："
-
-#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 170
-#: rc.cpp:4488
-#, no-c-format
-msgid "&Repeat password:"
-msgstr "重复密码(&R)："
-
-#. i18n: file ./protocols/jabber/ui/dlgjabberregisteraccount.ui line 206
-#: rc.cpp:4491
-#, no-c-format
-msgid "Jabber &server:"
-msgstr "Jabber 服务器(&S)："
-
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 17
-#: rc.cpp:4494
+#: rc.cpp:2944
 #, no-c-format
 msgid "Account Preferences - Jabber"
 msgstr "账户首选项 - Jabber"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 77
-#: rc.cpp:4506 rc.cpp:4512
+#: rc.cpp:2956 rc.cpp:2962
 #, no-c-format
 msgid "The Jabber ID for the account you would like to use."
 msgstr "您想要使用的账户的 Jabber ID。"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 80
-#: rc.cpp:4509
+#: rc.cpp:2959
 #, no-c-format
 msgid ""
 "The Jabber ID for the account you would like to use.  Note that this must "
@@ -9454,7 +12092,7 @@ msgid ""
 msgstr "您想要使用的账户的 Jabber ID。请注意，您必须写全用户名和域名(和电子邮件地址一样)，因为有很多台 Jabber 服务器。"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 94
-#: rc.cpp:4515
+#: rc.cpp:2965
 #, no-c-format
 msgid ""
 "The Jabber ID for the account you would like to use.  Note that this must "
@@ -9463,8 +12101,14 @@ msgid ""
 msgstr ""
 "您想要使用的账户的 Jabber ID。请注意，您必须写全用户名和域名(如 joe@jabber.org)，因为有很多台 Jabber 服务器。"
 
+#. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 120
+#: rc.cpp:2974 rc.cpp:3227 rc.cpp:3633
+#, no-c-format
+msgid "Exclu&de from Global Identity"
+msgstr "从全局身份中排除(&D)"
+
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 163
-#: rc.cpp:4530
+#: rc.cpp:2980
 #, no-c-format
 msgid ""
 "To connect to the Jabber network, you will need an account on a Jabber server.  "
@@ -9472,40 +12116,58 @@ msgid ""
 msgstr ""
 "要连接到 Jabber 网络，您需要在 Jabber 服务器上拥有一个账户。如果您还没有账户，请在上面设定用户名、密码和服务器，然后点击注册。"
 
+#. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 174
+#: rc.cpp:2983 rc.cpp:3237 rc.cpp:3648 rc.cpp:4425
+#, no-c-format
+msgid "Re&gister New Account"
+msgstr "注册新账户(&G)"
+
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 198
-#: rc.cpp:4542
+#: rc.cpp:2992
 #, no-c-format
 msgid "Change Password"
 msgstr "更改密码"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 209
-#: rc.cpp:4545
+#: rc.cpp:2995
 #, no-c-format
 msgid "Change &Your Password"
 msgstr "更改您的密码(&Y)"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 228
-#: rc.cpp:4548
+#: rc.cpp:2998
 #, no-c-format
 msgid ""
 "If you have an existing Jabber account and would like to change its password, "
 "you can use this button to enter a new password."
 msgstr "如果您已经有 Jabber 账户，并且想要更改密码的话，您可以使用此按钮输入新密码。"
 
+#. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 260
+#: rc.cpp:3001
+#, no-c-format
+msgid "Co&nnection"
+msgstr "连接(&N)"
+
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 296
-#: rc.cpp:4566
+#: rc.cpp:3016
 #, no-c-format
 msgid "Allow plain-te&xt password authentication"
 msgstr "允许纯文本密码验证(&X)"
 
+#. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 307
+#: rc.cpp:3019 rc.cpp:3279 rc.cpp:3657
+#, no-c-format
+msgid "&Override default server information"
+msgstr "覆盖服务器默认信息(&O)"
+
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 343
-#: rc.cpp:4575 rc.cpp:4581 rc.cpp:5114 rc.cpp:5120
+#: rc.cpp:3025 rc.cpp:3031 rc.cpp:3918 rc.cpp:3924
 #, no-c-format
 msgid "The IP address or hostname of the server you would like to connect to."
 msgstr "您想要连接的服务器的 IP 地址或主机名。"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 346
-#: rc.cpp:4578 rc.cpp:4584
+#: rc.cpp:3028 rc.cpp:3034
 #, no-c-format
 msgid ""
 "The IP address or hostname of the server you would like to connect to (for "
@@ -9513,38 +12175,38 @@ msgid ""
 msgstr "您想要连接的服务器的 IP 地址或主机名(如 jabber.org)。"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 388
-#: rc.cpp:4590 rc.cpp:4596 rc.cpp:5129 rc.cpp:5135
+#: rc.cpp:3040 rc.cpp:3046 rc.cpp:3933 rc.cpp:3939
 #, no-c-format
 msgid "The port on the server that you would like to connect to."
 msgstr "您想要连接的服务器的端口。"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 391
-#: rc.cpp:4593 rc.cpp:4599 rc.cpp:5132 rc.cpp:5138
+#: rc.cpp:3043 rc.cpp:3049 rc.cpp:3936 rc.cpp:3942
 #, no-c-format
 msgid ""
 "The port on the server that you would like to connect to (default is 5222)."
 msgstr "您想要连接的服务器的端口(默认为 5222)。"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 437
-#: rc.cpp:4602
+#: rc.cpp:3052
 #, no-c-format
 msgid "Location Settings"
 msgstr "位置设置"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 448
-#: rc.cpp:4605
+#: rc.cpp:3055
 #, no-c-format
 msgid "R&esource:"
 msgstr "资源(&E)："
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 454
-#: rc.cpp:4608 rc.cpp:4617 rc.cpp:4626
+#: rc.cpp:3058 rc.cpp:3067 rc.cpp:3076
 #, no-c-format
 msgid "The resource name you would like to use on the Jabber network."
 msgstr "您想要在 Jabber 网络上使用的资源名称。"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 457
-#: rc.cpp:4611 rc.cpp:4620 rc.cpp:4629
+#: rc.cpp:3061 rc.cpp:3070 rc.cpp:3079
 #, no-c-format
 msgid ""
 "The resource name you would like to use on the Jabber network.  Jabber allows "
@@ -9554,13 +12216,13 @@ msgstr ""
 "您想要在 Jabber 网络上使用的资源名称。Jabber 允许您从多个位置以不同的资源名称签入同一个账户，所以您可以在此输入“家用”、“办公”等类似文字。"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 518
-#: rc.cpp:4623
+#: rc.cpp:3073
 #, no-c-format
 msgid "P&riority:"
 msgstr "优先级(&R)："
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 563
-#: rc.cpp:4632
+#: rc.cpp:3082
 #, no-c-format
 msgid ""
 "<qt>Each resource can have different <b>priority </b> "
@@ -9575,31 +12237,37 @@ msgstr ""
 "如果两个资源具有相同的优先级，则消息将会发送给最后连接的资源。</qt>"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 592
-#: rc.cpp:4637
+#: rc.cpp:3087
 #, no-c-format
 msgid "Fi&le Transfer"
 msgstr "文件传送(&L)"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 603
-#: rc.cpp:4640
+#: rc.cpp:3090
 #, no-c-format
 msgid "File Transfer Settings"
 msgstr "文件传送设置"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 627
-#: rc.cpp:4643
+#: rc.cpp:3093
 #, no-c-format
 msgid "Pro&xy JID:"
 msgstr "代理 JID(&X)："
 
+#. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 651
+#: rc.cpp:3096 rc.cpp:4692
+#, no-c-format
+msgid "Por&t:"
+msgstr "端口(&T)："
+
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 675
-#: rc.cpp:4649
+#: rc.cpp:3099
 #, no-c-format
 msgid "Public &IP address:"
 msgstr "公布 IP 地址(&I)："
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 692
-#: rc.cpp:4652
+#: rc.cpp:3102
 #, no-c-format
 msgid ""
 "<i>"
@@ -9620,20 +12288,26 @@ msgstr ""
 "<li>对这些域的更改会在您下次启动 Kopete 时生效。</li>\n"
 "<li>您可为每个帐户单独配置代理 JID。</li></ul></i>"
 
+#. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 724
+#: rc.cpp:3109 rc.cpp:3696
+#, no-c-format
+msgid "Pri&vacy"
+msgstr "隐私(&V)"
+
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 735
-#: rc.cpp:4662
+#: rc.cpp:3112
 #, no-c-format
 msgid "General Privacy"
 msgstr "常规隐私"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 763
-#: rc.cpp:4665
+#: rc.cpp:3115
 #, no-c-format
 msgid "&Hide system and client info"
 msgstr "隐藏系统和客户信息(&H)"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 766
-#: rc.cpp:4668
+#: rc.cpp:3118
 #, no-c-format
 msgid ""
 "By default, Kopete gives the other users some info about your system and the "
@@ -9641,32 +12315,32 @@ msgid ""
 msgstr "默认情况下，Kopete 将向其它用户发送关于您系统和客户段某些信息。选中此框可以隐藏这些信息。"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 776
-#: rc.cpp:4671
+#: rc.cpp:3121
 #, no-c-format
 msgid "Notifications"
 msgstr "通知"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 790
-#: rc.cpp:4674
+#: rc.cpp:3124
 #, no-c-format
 msgid "Always send not&ifications"
 msgstr "总是发送通知(&I)"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 796
-#: rc.cpp:4677
+#: rc.cpp:3127
 #, no-c-format
 msgid ""
 "Check this box if you want to always send notifications to your contacts."
 msgstr "如果您想要总是想您的联系人发送通知的话，请选中此框。"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 840
-#: rc.cpp:4680
+#: rc.cpp:3130
 #, no-c-format
 msgid "Alwa&ys send delivered notifications"
 msgstr "总是发送投递通知(&Y)"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 846
-#: rc.cpp:4683
+#: rc.cpp:3133
 #, no-c-format
 msgid ""
 "<qt>Check this box to send the <b>Delivered notification</b> "
@@ -9677,13 +12351,13 @@ msgstr ""
 "会通知您的联系人此消息已被正确送达。</qt>"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 857
-#: rc.cpp:4686
+#: rc.cpp:3136
 #, no-c-format
 msgid "Al&ways send displayed notifications"
 msgstr "总是发送显示通知(&W)"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 863
-#: rc.cpp:4689
+#: rc.cpp:3139
 #, no-c-format
 msgid ""
 "<qt>Check this box to send the <b>Displayed notification</b> "
@@ -9694,13 +12368,13 @@ msgstr ""
 "会通知您的联系人此消息已被正常显示。</qt>"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 874
-#: rc.cpp:4692
+#: rc.cpp:3142
 #, no-c-format
 msgid "Always send &typing notifications"
 msgstr "总是发送打字通知(&T)"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 880
-#: rc.cpp:4695
+#: rc.cpp:3145
 #, no-c-format
 msgid ""
 "<qt>Check this box to send the <b>Typing notification</b> "
@@ -9710,6905 +12384,3886 @@ msgstr ""
 "<qt>选中此复选框可向您的联系人发送<b>打字通知</b>：当您正在撰写消息时，您可能想要您的联系人知道您正在打字，以便让他知道您正在答复。</qt>"
 
 #. i18n: file ./protocols/jabber/ui/dlgjabbereditaccountwidget.ui line 888
-#: rc.cpp:4698
+#: rc.cpp:3148
 #, no-c-format
 msgid "Always send &gone notifications (closing the window)"
 msgstr "总是发送离开通知(&G)"
 
+#. i18n: file ./protocols/jabber/ui/dlgchatjoin.ui line 24
+#: rc.cpp:3151 rc.cpp:4185
+#, no-c-format
+msgid "Nick:"
+msgstr "昵称："
+
 #. i18n: file ./protocols/jabber/ui/dlgchatjoin.ui line 47
-#: rc.cpp:4704
+#: rc.cpp:3154
 #, no-c-format
 msgid "Room:"
 msgstr "房间："
 
 #. i18n: file ./protocols/jabber/ui/dlgchatjoin.ui line 99
-#: rc.cpp:4713
+#: rc.cpp:3163
 #, no-c-format
 msgid "Bro&wse"
 msgstr "浏览(&W)"
 
-#. i18n: file ./protocols/jabber/ui/dlgbrowse.ui line 16
-#: protocols/jabber/ui/dlgjabberbrowse.cpp:114 rc.cpp:4716
+#. i18n: file ./protocols/jabber/ui/dlgregister.ui line 24
+#: rc.cpp:3166
 #, no-c-format
-msgid "Jabber Search"
-msgstr "Jabber 搜索"
+msgid "Register with Jabber Service"
+msgstr "注册 Jabber 服务"
 
-#. i18n: file ./protocols/jabber/ui/dlgbrowse.ui line 34
-#: rc.cpp:4719
+#. i18n: file ./protocols/jabber/ui/dlgregister.ui line 49
+#: rc.cpp:3169
 #, no-c-format
-msgid "Search For"
-msgstr "搜索"
+msgid "Registration Form"
+msgstr "注册表单"
 
-#. i18n: file ./protocols/jabber/ui/dlgbrowse.ui line 48
-#: rc.cpp:4722
+#. i18n: file ./protocols/jabber/ui/dlgregister.ui line 68
+#: rc.cpp:3172
 #, no-c-format
-msgid "Please wait while retrieving search form..."
-msgstr "正在获取搜索表单，请稍候..."
+msgid "Please wait while querying the server..."
+msgstr "正在查询服务器，请稍候..."
 
-#. i18n: file ./protocols/jabber/ui/dlgbrowse.ui line 59
-#: rc.cpp:4725
+#. i18n: file ./protocols/jabber/ui/dlgchangepassword.ui line 24
+#: rc.cpp:3181
 #, no-c-format
-msgid "JID"
-msgstr "JID"
+msgid "Current password:"
+msgstr "当前密码："
 
-#. i18n: file ./protocols/jabber/ui/dlgbrowse.ui line 74
-#: rc.cpp:4734
+#. i18n: file ./protocols/jabber/ui/dlgchangepassword.ui line 32
+#: rc.cpp:3184 rc.cpp:3187
 #, no-c-format
-msgid "Nick"
-msgstr "昵称"
+msgid "New password:"
+msgstr "新密码："
 
-#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 16
-#: rc.cpp:4746
+#. i18n: file ./protocols/jabber/ui/dlgchangepassword.ui line 72
+#: rc.cpp:3190
 #, no-c-format
-msgid "Send Raw XML Packet"
-msgstr "发送原始 XML 报文"
+msgid ""
+"Please enter your current password first\n"
+"and then your new password twice."
+msgstr "请输入两次同样的密码。"
 
-#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 42
-#: rc.cpp:4749
+#. i18n: file ./protocols/oscar/oscarencodingselectionbase.ui line 27
+#: rc.cpp:3194
 #, no-c-format
-msgid "Type in the packet that should be sent to the server:"
-msgstr "输入应该发送给服务器的报文："
+msgid "Use this &encoding when chatting with this contact:"
+msgstr "与此联系人聊天时使用此编码(&E)："
 
-#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 56
-#: rc.cpp:4752
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 16
+#: rc.cpp:3197
 #, no-c-format
-msgid "User Defined"
-msgstr "定义的用户"
+msgid "Account Preferences - ICQ"
+msgstr "账户首选项 - ICQ"
 
-#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 61
-#: rc.cpp:4755
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 48
+#: rc.cpp:3203
 #, no-c-format
-msgid "Account Deletion"
-msgstr "账户删除"
+msgid "Account Preferences"
+msgstr "账户首选项"
 
-#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 66
-#: rc.cpp:4758
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 67
+#: rc.cpp:3206
 #, no-c-format
-msgid "Availability Status"
-msgstr "闲忙状态"
+msgid "IC&Q UIN:"
+msgstr "IC&Q UIN："
 
-#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 71
-#: rc.cpp:4761
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 73
+#: rc.cpp:3209 rc.cpp:3215
 #, no-c-format
-msgid "Last Active Time"
-msgstr "上次活动时间"
+msgid "The user ID of your ICQ account."
+msgstr "您 ICQ 账户的用户 ID。"
 
-#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 76
-#: rc.cpp:4764
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 76
+#: rc.cpp:3212 rc.cpp:3218
 #, no-c-format
-msgid "Message with Body"
-msgstr "带内容的信件"
+msgid ""
+"The user ID of your ICQ account.  This should be in the form of a number (no "
+"decimals, no spaces)."
+msgstr "您 ICQ 账户的用户 ID，其格式应为数字(无小数点，无空格)。"
 
-#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 81
-#: rc.cpp:4767
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 108
+#: rc.cpp:3224 rc.cpp:3639 rc.cpp:4818
 #, no-c-format
-msgid "Message with Subject"
-msgstr "带主题的信件"
+msgid ""
+"If you check that case, the account will not be connected when you press the "
+"\"Connect All\" button, or at startup even if you selected to automatically "
+"connect at startup"
+msgstr "如果您选中了此选项，当您按下“全部连接”按钮时，此账户将不会连接。当然，即便您选择了启动时自动登录，应用程序启动时也不会登录此账户"
 
-#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 86
-#: rc.cpp:4770
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 160
+#: rc.cpp:3233
 #, no-c-format
-msgid "Add Roster Item"
-msgstr "添加花名册项目"
+msgid ""
+"To connect to the ICQ network, you will need an ICQ account."
+"<br>"
+"<br>\n"
+"If you do not currently have an ICQ account, please click the button to create "
+"one."
+msgstr "要连接到 ICQ 网络，您需要有 ICQ 账户。如果您还没有 ICQ 账户，您可以从下面链接的网站处注册。"
 
-#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 91
-#: rc.cpp:4773
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 200
+#: rc.cpp:3240 rc.cpp:3651
 #, no-c-format
-msgid "Delete Roster Item"
-msgstr "删除花名册项目"
+msgid "Accou&nt Preferences"
+msgstr "账户首选项(&N)"
 
-#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 96
-#: protocols/jabber/jabberprotocol.cpp:93 rc.cpp:4776
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 234
+#: rc.cpp:3246 rc.cpp:3264
 #, no-c-format
-msgid "Subscription"
-msgstr "订阅"
+msgid "The port on the ICQ server that you would like to connect to."
+msgstr "您想要连接的 ICQ 服务器的端口。"
 
-#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 116
-#: rc.cpp:4779
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 237
+#: rc.cpp:3249 rc.cpp:3267
 #, no-c-format
-msgid "Clea&r"
-msgstr "清除(&R)"
+msgid ""
+"The port on the ICQ server that you would like to connect to.  Normally this is "
+"5190."
+msgstr "您想要连接的 ICQ 服务器的端口。通常为 5190。"
 
-#. i18n: file ./protocols/jabber/ui/dlgsendraw.ui line 124
-#: rc.cpp:4782
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 248
+#: rc.cpp:3252
 #, no-c-format
-msgid "&Send"
-msgstr "发送(&S)"
+msgid "login.icq.com"
+msgstr "login.icq.com"
 
-#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 16
-#: rc.cpp:4788
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 251
+#: rc.cpp:3255 rc.cpp:3273
 #, no-c-format
-msgid "JabberVoiceSessionDialogBase"
-msgstr "JabberVoiceSessionDialogBase"
+msgid "The IP address or hostmask of the ICQ server you wish to connect to."
+msgstr "您想要连接的 ICQ 服务器的 IP 地址或主机名。"
 
-#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 60
-#: rc.cpp:4791
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 254
+#: rc.cpp:3258 rc.cpp:3276
 #, no-c-format
-msgid "Voice session with:"
-msgstr "语音会话和："
+msgid ""
+"The IP address or hostmask of the ICQ server you wish to connect to.  Normally "
+"you will want the default (login.icq.com)."
+msgstr "您想要连接的 ICQ 服务器的 IP 地址或主机名。通常，您只需保留默认值(login.icq.com)。"
 
-#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 178
-#: rc.cpp:4794
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 285
+#: rc.cpp:3270
 #, no-c-format
-msgid "Contact displayname"
-msgstr "联系人显示名"
+msgid "Ser&ver /"
+msgstr "服务器(&V) /"
 
-#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 266
-#: rc.cpp:4797
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 312
+#: rc.cpp:3282
 #, no-c-format
-msgid "Accep&t"
-msgstr "接受(&T)"
+msgid "Privacy Options"
+msgstr "隐私选项"
 
-#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 277
-#: rc.cpp:4800
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 323
+#: rc.cpp:3285
 #, no-c-format
-msgid "&Decline"
-msgstr "拒绝(&D)"
+msgid "&Require authorization before someone can add you to their contact list"
+msgstr "别人将您添加到联系人列表时需要身份验证(&R)"
 
-#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 288
-#: rc.cpp:4803
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 326
+#: rc.cpp:3288
 #, no-c-format
-msgid "Termi&nate"
-msgstr "终止(&N)"
+msgid ""
+"Enable authorization requirement, which will not allow users to add you to "
+"their contact list without authorization from you."
+msgstr "启用认证请求。其他用户在没有得到您的同意的情况下，将无法将您加入他们的联系人列表。"
 
-#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 323
-#: rc.cpp:4806
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 329
+#: rc.cpp:3291
 #, no-c-format
-msgid "Current status:"
-msgstr "当前状态："
+msgid ""
+"Enable authorization requirement, which will not allow users to add you to "
+"their contact list without authorization from you.  Check this box, and you "
+"will have to confirm any users who add you to their list before they may see "
+"your online status."
+msgstr ""
+"启用认证请求。其他用户在没有得到您的同意的情况下，将无法将您加入他们的联系人列表。选中此框，您就需要对每个想要将您加入好友的请求加以确认。在您确认之前，他们无法"
+"看到您的在线状态。"
 
-#. i18n: file ./protocols/jabber/jingle/jinglevoicesessiondialogbase.ui line 339
-#: rc.cpp:4809
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 337
+#: rc.cpp:3294
 #, no-c-format
-msgid "Session status"
-msgstr "会话状态"
+msgid "Hide &IP address"
+msgstr "隐藏 IP 地址(&I)"
 
-#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 48
-#: rc.cpp:4815
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 340
+#: rc.cpp:3297
 #, no-c-format
-msgid "&Computer name:"
-msgstr "计算机名(&C)："
+msgid ""
+"Check this to hide your IP address from people when they view your user info"
+msgstr "选中此项可对其他用户隐藏您的 IP 地址。"
 
-#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 54
-#: rc.cpp:4818 rc.cpp:4821 rc.cpp:4854 rc.cpp:4857
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 343
+#: rc.cpp:3300
 #, no-c-format
-msgid "The hostname of the computer for this contact."
-msgstr "此联系人计算机的主机名。"
+msgid ""
+"Checking this box will not allow people to see what your IP address if they "
+"view your ICQ user details such as name, address, or age."
+msgstr "选中此框将不允许别人在查看您的 ICQ 用户资料(比如姓名、地址或年龄)时同时查看您的 IP 地址。"
 
-#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 65
-#: rc.cpp:4824
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 351
+#: rc.cpp:3303
 #, no-c-format
-msgid "Comment:"
-msgstr "注释："
+msgid "Make my status available via &ICQ's unified messaging center"
+msgstr "把我的状态通过 ICQ 统一消息中心放在网站上(&I)"
 
-#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 73
-#: rc.cpp:4827 rc.cpp:4961
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 357
+#: rc.cpp:3306
 #, no-c-format
-msgid "&Workgroup/domain:"
-msgstr "工作组/域(&W)："
+msgid "Check this box to enable Web Aware functionality."
+msgstr "选中此框将启用 Web 状态功能。"
 
-#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 79
-#: rc.cpp:4830 rc.cpp:4833 rc.cpp:4866 rc.cpp:4869
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 360
+#: rc.cpp:3309
 #, no-c-format
-msgid "The workgroup or domain the contact's computer is on."
-msgstr "此联系人计算机所在的工作组或域。"
+msgid ""
+"Check this box to enable ICQ's Web Aware functionality, which allows people to "
+"see your online status from ICQ's web page, and send you a message without "
+"necessarily having ICQ themselves."
+msgstr "选中此框将启用 Web 状态功能，这将允许别人从网页上看到您的在线状态，并无需拥有 ICQ 即可给您发送信息。"
 
-#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 90
-#: rc.cpp:4836
+#. i18n: file ./protocols/oscar/icq/ui/icqeditaccountui.ui line 398
+#: rc.cpp:3312 rc.cpp:3693
 #, no-c-format
-msgid "Operating s&ystem:"
-msgstr "操作系统(&Y)："
+msgid "Default to the following &encoding for messages:"
+msgstr "消息默认使用下列编码(&E)："
 
-#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 96
-#: rc.cpp:4839 rc.cpp:4842 rc.cpp:4872 rc.cpp:4875
+#. i18n: file ./protocols/oscar/icq/ui/icqotherinfowidget.ui line 41
+#: rc.cpp:3315
 #, no-c-format
-msgid "The operating system the contact's computer is running."
-msgstr "此联系人计算机所运行的操作系统。"
+msgid "Email addresses:"
+msgstr "电子邮件地址："
 
-#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 107
-#: rc.cpp:4845
+#. i18n: file ./protocols/oscar/icq/ui/icqotherinfowidget.ui line 54
+#: rc.cpp:3318
 #, no-c-format
-msgid "Ser&ver software:"
-msgstr "服务器软件(&V)："
+msgid "Contact notes:"
+msgstr "联系人备注："
 
-#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 113
-#: rc.cpp:4848 rc.cpp:4851 rc.cpp:4878 rc.cpp:4881
+#. i18n: file ./protocols/oscar/icq/ui/icqinterestinfowidget.ui line 24
+#: rc.cpp:3360
 #, no-c-format
-msgid "The software the contact's computer is running."
-msgstr "此联系人计算机所运行的软件。"
+msgid "Interests"
+msgstr "兴趣"
 
-#. i18n: file ./protocols/winpopup/ui/wpuserinfowidget.ui line 151
-#: rc.cpp:4860 rc.cpp:4863
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 27
+#: rc.cpp:3363
 #, no-c-format
-msgid "The comment of the computer for this contact."
-msgstr "此联系人计算机的注释。"
+msgid "C&lear"
+msgstr "清除(&L)"
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 16
-#: rc.cpp:4884
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 33
+#: rc.cpp:3366
 #, no-c-format
-msgid "Account Preferences - WinPopup"
-msgstr "账户首选项 - WinPopup"
+msgid "Clear the results"
+msgstr "清除结果"
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 48
-#: rc.cpp:4887
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 47
+#: rc.cpp:3372
 #, no-c-format
-msgid "Basi&c Setup"
-msgstr "基本设置(&C)"
+msgid "Close this dialog"
+msgstr "关闭对话框"
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 78
-#: rc.cpp:4893
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 67
+#: rc.cpp:3378
 #, no-c-format
-msgid "Hos&tname:"
-msgstr "主机名(&T)："
+msgid "Stops the search"
+msgstr "停止搜索"
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 84
-#: rc.cpp:4896 rc.cpp:4902
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 87
+#: rc.cpp:3384
 #, no-c-format
-msgid "The hostname you would like to use to send WinPopup messages as."
-msgstr "您想要用于发送 WinPopup 信息的主机名。"
+msgid "Add the selected user to your contact list"
+msgstr "将选中的联系人添加到您的联系人列表中"
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 87
-#: rc.cpp:4899 rc.cpp:4905
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 98
+#: rc.cpp:3387
 #, no-c-format
-msgid ""
-"The hostname you would like to use to send WinPopup messages as.  Note that "
-"this does not have to be the actual hostname of the machine to send messages, "
-"but it does to receive them."
-msgstr "您想要用于发送 WinPopup 信息的主机名。请注意，要发送信息，这里并不要求是实际的主机名，而如果要接受信息的话，则应该是实际的主机名。"
+msgid "User Info"
+msgstr "用户信息"
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 106
-#: rc.cpp:4908
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 104
+#: rc.cpp:3390
 #, no-c-format
-msgid "I&nstall Into Samba"
-msgstr "安装到 Samba(&N)"
+msgid "Show information about the selected contact"
+msgstr "显示关于选中联系人的信息"
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 109
-#: rc.cpp:4911 rc.cpp:4914
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 133
+#: rc.cpp:3393
 #, no-c-format
-msgid "Install support into Samba to enable this service."
-msgstr "在 Samba 中安装支持以启用此服务。"
+msgid "UIN Search"
+msgstr "UIN 搜索"
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 143
-#: rc.cpp:4920
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 144
+#: rc.cpp:3396 rc.cpp:3534
 #, no-c-format
-msgid ""
-"To receive WinPopup messages sent from other machines, the hostname above must "
-"be set to this machine's hostname."
-msgstr "要从其它计算机接收 WinPopup 信息，上面的主机名必须设定为此计算机的主机名。"
+msgid "&UIN #:"
+msgstr "UIN 号(&U)："
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 154
-#: rc.cpp:4923
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 179
+#: rc.cpp:3399
 #, no-c-format
-msgid "The samba server must be configured and running."
-msgstr "必须先配置并运行 samba 服务器。"
+msgid "ICQ Whitepages Search"
+msgstr "ICQ 白页搜索"
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 164
-#: rc.cpp:4926
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 200
+#: rc.cpp:3402
 #, no-c-format
-msgid ""
-"\"Install into Samba\" is a simple method to create the directory for the "
-"temporary message files and configure your samba server."
-"<br>\n"
-"However, the recommended way is to ask your administrator to create this "
-"directory ('mkdir -p -m 0777 /var/lib/winpopup') and add\n"
-"'message command = _PATH_TO_/winpopup-send.sh %s %m %t &' (substitute _PATH_TO_ "
-"by the real path) to your smb.conf [global]-section."
-msgstr ""
-"“安装到 Samba” 是一种创建储存临时消息文件所需目录并配置好您的 samba 服务器的简便方案。"
-"<br>\n"
-"然而，我们建议更好的方案是求询您的系统管理员来创建此目录(“mkdir -p -m 0777 /var/lib/winpopup”)并添加\n"
-"“message command = _PATH_TO_/winpopup-send.sh %s %m %t &”(用实际路径替换 "
-"_PATH_TO_)配置行到您的 smb.conf 文件中的 [global] 区段。"
+msgid "&Last name:"
+msgstr "姓(&L)："
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 196
-#: rc.cpp:4931
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 211
+#: rc.cpp:3405
 #, no-c-format
-msgid "S&ystem"
-msgstr "系统(&Y)"
+msgid "&First name:"
+msgstr "名(&F)："
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 235
-#: rc.cpp:4937
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 249
+#: rc.cpp:3414
 #, no-c-format
-msgid "<i>These options apply to all WinPopup accounts.</i>"
-msgstr "<i>这些选项应用到全部 WinPopup 账户。</i>"
+msgid "Lan&guage:"
+msgstr "语言(&G)："
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 245
-#: rc.cpp:4940
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 291
+#: rc.cpp:3420
 #, no-c-format
-msgid "Protocol Preferences"
-msgstr "协议首选项"
+msgid "&Gender:"
+msgstr "性别(&G)："
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 256
-#: rc.cpp:4943
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 307
+#: rc.cpp:3423
 #, no-c-format
-msgid "Host check frequency:"
-msgstr "主机检查频率："
+msgid "Only search for online contacts"
+msgstr "只搜索在线联系人"
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 264
-#: rc.cpp:4946
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 315
+#: rc.cpp:3426
 #, no-c-format
-msgid "Path to 'smbclient' executable:"
-msgstr "“sambclient”可执行文件的路径："
+msgid "C&ountry:"
+msgstr "国家/地区(&O)："
 
-#. i18n: file ./protocols/winpopup/ui/wpeditaccountbase.ui line 315
-#: rc.cpp:4949
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 361
+#: rc.cpp:3429 rc.cpp:4233
 #, no-c-format
-msgid "second(s)"
-msgstr "秒钟"
+msgid "UIN"
+msgstr "UIN"
 
-#. i18n: file ./protocols/winpopup/ui/wpaddcontactbase.ui line 50
-#: rc.cpp:4952
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 372
+#: rc.cpp:3432
 #, no-c-format
-msgid "Com&puter hostname:"
-msgstr "计算机名(&P)："
+msgid "Nickname"
+msgstr "昵称"
 
-#. i18n: file ./protocols/winpopup/ui/wpaddcontactbase.ui line 56
-#: rc.cpp:4955 rc.cpp:4958 rc.cpp:4970 rc.cpp:4973
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 416
+#: rc.cpp:3444
 #, no-c-format
-msgid "The hostname you would like to use to send WinPopup messages to."
-msgstr "您想要发送 WinPopup 信息的目的主机名。"
+msgid "Requires Authorization?"
+msgstr "请求身份验证吗？"
 
-#. i18n: file ./protocols/winpopup/ui/wpaddcontactbase.ui line 73
-#: rc.cpp:4964 rc.cpp:4967 rc.cpp:4976 rc.cpp:4979
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 432
+#: rc.cpp:3447
 #, no-c-format
 msgid ""
-"The workgroup or domain the computer is on that you would like to use to send "
-"WinPopup messages to."
-msgstr "您想要将 WinPopup 信息发送到哪个工作组或域。"
+"This is where the results from your search are displayed. If you double-click a "
+"result, the search window will close and pass the UIN of the contact you wish "
+"to add back to the Add Contact Wizard. You can only add one contact at a time."
+msgstr ""
+"这里将会显示您搜索的结果。如果您双击某个结果，搜索窗口将会关闭，并且将您想要添加的联系人的 UIN 返回到添加联系人向导。您一次只能添加一个联系人。"
 
-#. i18n: file ./protocols/winpopup/ui/wpaddcontactbase.ui line 148
-#: rc.cpp:4982 rc.cpp:5159
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 443
+#: rc.cpp:3453
 #, no-c-format
-msgid "&Refresh"
-msgstr "刷新(&R)"
+msgid "Search the ICQ Whitepages with your search criteria"
+msgstr "使用您的搜索条件搜索 ICQ 白页"
 
-#. i18n: file ./protocols/winpopup/ui/wpaddcontactbase.ui line 151
-#: rc.cpp:4985 rc.cpp:4988
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 454
+#: rc.cpp:3456
 #, no-c-format
-msgid ""
-"Refresh the list of available workgroups & domains on the Windows network."
-msgstr "刷新 Windows 网络中可用的工作组和域。"
+msgid "New Search"
+msgstr "新建搜索"
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 16
-#: rc.cpp:4991
+#. i18n: file ./protocols/oscar/icq/ui/icqsearchbase.ui line 457
+#: rc.cpp:3459
 #, no-c-format
-msgid "Search GroupWise Messenger"
-msgstr "搜索 GroupWise Messenger"
+msgid "Clears both search fields and results"
+msgstr "清除搜索域和结果"
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 35
-#: rc.cpp:4994
+#. i18n: file ./protocols/oscar/icq/ui/icqauthreplyui.ui line 16
+#: rc.cpp:3462
 #, no-c-format
-msgid "&First name"
-msgstr "名(&F)"
+msgid "ICQ Authorization Reply"
+msgstr "ICQ 身份验证回复"
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 46
-#: rc.cpp:4997
+#. i18n: file ./protocols/oscar/icq/ui/icqauthreplyui.ui line 43
+#: rc.cpp:3465
 #, no-c-format
-msgid "&User ID"
-msgstr "用户 ID(&U)"
+msgid "Reason:"
+msgstr "原因："
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 57
-#: rc.cpp:5000
+#. i18n: file ./protocols/oscar/icq/ui/icqauthreplyui.ui line 108
+#: rc.cpp:3468
 #, no-c-format
-msgid "&Title"
-msgstr "职务(&T)"
+msgid "&Grant authorization"
+msgstr "通过身份验证(&G)"
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 78
-#: rc.cpp:5003
+#. i18n: file ./protocols/oscar/icq/ui/icqauthreplyui.ui line 119
+#: rc.cpp:3471
 #, no-c-format
-msgid "&Department"
-msgstr "部门(&D)"
+msgid "&Decline authorization"
+msgstr "拒绝身份验证(&D)"
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 87
-#: rc.cpp:5006 rc.cpp:5015 rc.cpp:5024 rc.cpp:5039 rc.cpp:5051
+#. i18n: file ./protocols/oscar/icq/ui/icqauthreplyui.ui line 148
+#: rc.cpp:3474
 #, no-c-format
-msgid "contains"
-msgstr "包含"
+msgid "%1 requested authorization to add you to his/her contact list."
+msgstr "%1 请求将您加入联系人列表。为此，需要您的同意。"
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 92
-#: rc.cpp:5009 rc.cpp:5018 rc.cpp:5027 rc.cpp:5042 rc.cpp:5054
+#. i18n: file ./protocols/oscar/icq/ui/icqauthreplyui.ui line 172
+#: rc.cpp:3477
 #, no-c-format
-msgid "begins with"
-msgstr "开始为"
+msgid "Request Reason:"
+msgstr "请求原因："
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 97
-#: rc.cpp:5012 rc.cpp:5021 rc.cpp:5030 rc.cpp:5045 rc.cpp:5057
+#. i18n: file ./protocols/oscar/icq/ui/icqauthreplyui.ui line 188
+#: rc.cpp:3480
 #, no-c-format
-msgid "equals"
-msgstr "等于"
+msgid "Some reason..."
+msgstr "具体原因..."
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 154
-#: rc.cpp:5033
+#. i18n: file ./protocols/oscar/icq/ui/icqadd.ui line 38
+#: rc.cpp:3483
 #, no-c-format
-msgid "Last &name"
-msgstr "姓(&N)"
+msgid "UIN #:"
+msgstr "UIN 号："
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 165
-#: rc.cpp:5036
+#. i18n: file ./protocols/oscar/icq/ui/icqadd.ui line 61
+#: rc.cpp:3486
 #, no-c-format
-msgid "Cl&ear"
-msgstr "清除(&E)"
+msgid "Alternatively, you can search the ICQ Whitepages :"
+msgstr "另外，您也可以在 ICQ 白页上搜索："
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 250
-#: rc.cpp:5060
+#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 24
+#: rc.cpp:3492
 #, no-c-format
-msgid "&Results:"
-msgstr "结果(&R)："
+msgid "Location && Contact Information"
+msgstr "位置和联系人信息"
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 300
-#: rc.cpp:5072
+#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 316
+#: rc.cpp:3528
 #, no-c-format
-msgid "User ID"
-msgstr "用户 ID"
+msgid "&Full name:"
+msgstr "全名(&F)："
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 335
-#: rc.cpp:5075
+#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 398
+#: rc.cpp:3537
 #, no-c-format
-msgid "Detai&ls"
-msgstr "细节(&L)"
+msgid "&Birthday:"
+msgstr "生日(&B)："
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 364
-#: rc.cpp:5078
+#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 414
+#: rc.cpp:3540
 #, no-c-format
-msgid "0 matching users found"
-msgstr "没有找到用户"
+msgid "Gen&der:"
+msgstr "性别(&D)："
 
-#. i18n: file ./protocols/groupwise/ui/gwaccountpreferences.ui line 16
-#: rc.cpp:5081
+#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 449
+#: rc.cpp:3543
 #, no-c-format
-msgid "Account Preferences - Groupwise"
-msgstr "账户首选项 - Groupwise"
+msgid "&IP:"
+msgstr "&IP："
 
-#. i18n: file ./protocols/groupwise/ui/gwaccountpreferences.ui line 67
-#: rc.cpp:5090
+#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 460
+#: rc.cpp:3546
 #, no-c-format
-msgid "&User ID:"
-msgstr "用户 ID(&U)："
+msgid "&Timezone:"
+msgstr "时区(&T)："
 
-#. i18n: file ./protocols/groupwise/ui/gwaccountpreferences.ui line 73
-#: rc.cpp:5093 rc.cpp:5096 rc.cpp:5099 rc.cpp:5102
+#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 471
+#: rc.cpp:3549
 #, no-c-format
-msgid "The account name of your account."
-msgstr "您账户的账户名。"
+msgid "Marital status:"
+msgstr "婚姻状态："
 
-#. i18n: file ./protocols/groupwise/ui/gwaccountpreferences.ui line 155
-#: rc.cpp:5117 rc.cpp:5123
+#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 487
+#: rc.cpp:3552
+#, no-c-format
+msgid "A&ge:"
+msgstr "年龄(&G)："
+
+#. i18n: file ./protocols/oscar/icq/ui/icqgeneralinfo.ui line 508
+#: rc.cpp:3555
+#, no-c-format
+msgid "Origin"
+msgstr "来自"
+
+#. i18n: file ./protocols/oscar/oscarlistcontactsbase.ui line 24
+#: rc.cpp:3567
 #, no-c-format
 msgid ""
-"The IP address or hostname of the server you would like to connect to (for "
-"example im.yourcorp.com)."
-msgstr "您想要连接的服务器的 IP 地址或主机名(如 im.yourcorp.com)。"
+"The following contacts are not on your contact list. Would you like to add "
+"them?"
+msgstr "下列联系人未在您的联系人列表中。您是否想要添加？"
 
-#. i18n: file ./protocols/groupwise/ui/gwaccountpreferences.ui line 248
-#: rc.cpp:5141
+#. i18n: file ./protocols/oscar/oscarlistcontactsbase.ui line 43
+#: rc.cpp:3570
 #, no-c-format
-msgid "Advanced &Options"
-msgstr "高级选项(&O)"
+msgid "Do &not ask again"
+msgstr "不再询问(&N)"
 
-#. i18n: file ./protocols/groupwise/ui/gwaccountpreferences.ui line 259
-#: rc.cpp:5144 rc.cpp:5204
+#. i18n: file ./protocols/oscar/aim/ui/aimjoinchatbase.ui line 27
+#: rc.cpp:3573
 #, no-c-format
-msgid "A&lways accept invitations"
-msgstr "总是接受邀请(&L)"
+msgid "Please enter the name of the chat room you wish to join."
+msgstr "请输入您想要加入的聊天室名称。"
 
-#. i18n: file ./protocols/groupwise/ui/gwchatsearchwidget.ui line 22
-#: rc.cpp:5147
+#. i18n: file ./protocols/oscar/aim/ui/aimjoinchatbase.ui line 69
+#: rc.cpp:3576
 #, no-c-format
-msgid "Chatroom "
-msgstr "聊天室 "
+msgid "Room &name:"
+msgstr "房间名(&N)："
 
-#. i18n: file ./protocols/groupwise/ui/gwchatsearchwidget.ui line 33
-#: rc.cpp:5150
+#. i18n: file ./protocols/oscar/aim/ui/aimjoinchatbase.ui line 80
+#: rc.cpp:3579
 #, no-c-format
-msgid "Owner"
-msgstr "所有者"
+msgid "E&xchange:"
+msgstr "交换(&X)："
 
-#. i18n: file ./protocols/groupwise/ui/gwchatsearchwidget.ui line 44
-#: protocols/irc/ircprotocol.cpp:153 rc.cpp:5153
+#. i18n: file ./protocols/oscar/aim/ui/aiminfobase.ui line 80
+#: rc.cpp:3585
 #, no-c-format
-msgid "Members"
-msgstr "成员"
+msgid "Screen name:"
+msgstr "屏幕名："
 
-#. i18n: file ./protocols/groupwise/ui/gwcustomstatusedit.ui line 54
-#: rc.cpp:5162
+#. i18n: file ./protocols/oscar/aim/ui/aiminfobase.ui line 106
+#: libkopete/ui/userinfodialog.cpp:221 rc.cpp:3588
 #, no-c-format
-msgid "&Status:"
-msgstr "状态(&S)："
+msgid "Warning level:"
+msgstr "警告级别："
 
-#. i18n: file ./protocols/groupwise/ui/gwcustomstatusedit.ui line 65
-#: rc.cpp:5165
+#. i18n: file ./protocols/oscar/aim/ui/aiminfobase.ui line 122
+#: rc.cpp:3591
 #, no-c-format
-msgid "Awa&y message:"
-msgstr "离开消息(&Y)："
+msgid "Idle minutes:"
+msgstr "发呆分钟："
 
-#. i18n: file ./protocols/groupwise/ui/gwcustomstatuswidget.ui line 36
-#: rc.cpp:5174
+#. i18n: file ./protocols/oscar/aim/ui/aiminfobase.ui line 148
+#: libkopete/ui/userinfodialog.cpp:225 rc.cpp:3594
 #, no-c-format
-msgid "Auto Reply"
-msgstr "自动回复"
+msgid "Online since:"
+msgstr "上线时间："
 
-#. i18n: file ./protocols/groupwise/ui/gwshowinvitation.ui line 35
-#: rc.cpp:5186
+#. i18n: file ./protocols/oscar/aim/ui/aiminfobase.ui line 174
+#: libkopete/ui/userinfodialog.cpp:238 rc.cpp:3597
 #, no-c-format
-msgid "<p align=\"right\">From:</p>"
-msgstr "<p align=\"right\">来自：</p>"
+msgid "Away message:"
+msgstr "离开消息："
 
-#. i18n: file ./protocols/groupwise/ui/gwshowinvitation.ui line 43
-#: rc.cpp:5189
+#. i18n: file ./protocols/oscar/aim/ui/aiminfobase.ui line 201
+#: rc.cpp:3600
 #, no-c-format
-msgid "<p align=\"right\">Sent:</p>"
-msgstr "<p align=\"right\">发送时间：</p>"
+msgid "Profile:"
+msgstr "配置文件："
 
-#. i18n: file ./protocols/groupwise/ui/gwshowinvitation.ui line 59
-#: rc.cpp:5192
+#. i18n: file ./protocols/oscar/aim/ui/aimaddcontactui.ui line 53
+#: rc.cpp:3606
 #, no-c-format
-msgid "INVITE_DATE_TIME"
-msgstr "INVITE_DATE_TIME"
+msgid "AIM screen name:"
+msgstr "AIM 屏幕名："
 
-#. i18n: file ./protocols/groupwise/ui/gwshowinvitation.ui line 67
-#: rc.cpp:5195
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 24
+#: rc.cpp:3609
 #, no-c-format
-msgid "CONTACT_NAME"
-msgstr "CONTACT_NAME"
+msgid "Account Preferences - AIM"
+msgstr "账户首选项 - AIM"
 
-#. i18n: file ./protocols/groupwise/ui/gwshowinvitation.ui line 83
-#: rc.cpp:5198
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 86
+#: rc.cpp:3618
 #, no-c-format
-msgid "INVITE_MESSAGE"
-msgstr "INVITE_MESSAGE"
+msgid "AIM &screen name:"
+msgstr "AIM 屏幕名(&S)："
 
-#. i18n: file ./protocols/groupwise/ui/gwshowinvitation.ui line 102
-#: rc.cpp:5201
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 92
+#: rc.cpp:3621 rc.cpp:3627
 #, no-c-format
-msgid "Would you like to join the conversation?"
-msgstr "您想要加入对话吗？"
+msgid "The screen name of your AIM account."
+msgstr "您 AIM 账户的屏幕名。"
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 32
-#: rc.cpp:5207
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 95
+#: rc.cpp:3624 rc.cpp:3630
 #, no-c-format
-msgid "USER_ID"
-msgstr "USER_ID"
+msgid ""
+"The screen name of your AIM account.  This should be in the form of an "
+"alphanumeric string (spaces allowed, not case sensitive)."
+msgstr "您 AIM 账户的屏幕名，其格式应为字母和数字组成的字符串(允许空格，不区分大小写)。"
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 68
-#: rc.cpp:5210 rc.cpp:5216 rc.cpp:5228
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 175
+#: rc.cpp:3645
 #, no-c-format
-msgid "Change the display name used for this contact"
-msgstr "更改此联系人的显示名"
+msgid ""
+"To connect to the AOL Instant Messaging network, you will need to use a screen "
+"name from AIM, AOL, or .Mac."
+"<br>"
+"<br>If you do not currently have an AIM screen name, please click the button to "
+"create one."
+msgstr ""
+"要连接到 AOL 即时通讯网络，您需要使用来自 AIM，AOL 或 @mac 的屏幕名。"
+"<br>"
+"<br>如果您目前还没有 AIM 屏幕名，您可以在下面链接的网站处注册。"
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 98
-#: rc.cpp:5219
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 265
+#: rc.cpp:3663 rc.cpp:3672
 #, no-c-format
-msgid "USER_STATUS"
-msgstr "USER_STATUS"
+msgid "The IP address or hostmask of the AIM server you wish to connect to."
+msgstr "您想要连接的 AIM 服务器的 IP 地址或主机名。"
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 114
-#: rc.cpp:5225
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 268
+#: rc.cpp:3666 rc.cpp:3675
 #, no-c-format
-msgid "&Display name:"
-msgstr "显示名(&D)："
+msgid ""
+"The IP address or hostmask of the AIM server you wish to connect to.  Normally "
+"you will want the default (login.oscar.aol.com)."
+msgstr "您想要连接的 AIM 服务器的 IP 地址或主机名。通常，您只需保留默认值(login.oscar.aol.com)。"
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 163
-#: rc.cpp:5234
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 279
+#: rc.cpp:3669
 #, no-c-format
-msgid "Additional properties:"
-msgstr "额外属性："
+msgid "login.oscar.aol.com"
+msgstr "login.oscar.aol.com"
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 169
-#: rc.cpp:5237
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 302
+#: rc.cpp:3681 rc.cpp:3687
 #, no-c-format
-msgid "Property"
-msgstr "属性"
+msgid "The port on the AIM server that you would like to connect to."
+msgstr "您想要连接的 AIM 服务器的端口。"
 
-#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 180
-#: rc.cpp:5240
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 305
+#: rc.cpp:3684 rc.cpp:3690
 #, no-c-format
-msgid "Value"
-msgstr "值"
+msgid ""
+"The port on the AIM server that you would like to connect to.  Normally this is "
+"5190."
+msgstr "您想要连接的 AIM 服务器的端口。通常为 5190。"
 
-#. i18n: file ./protocols/groupwise/ui/gwprivacy.ui line 24
-#: rc.cpp:5243
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 392
+#: rc.cpp:3699
 #, no-c-format
-msgid "Who can see my online status and send me messages:"
-msgstr "谁可以看到我的在线状态并向我发送消息："
+msgid "Visibility settings"
+msgstr "可见性设置"
 
-#. i18n: file ./protocols/groupwise/ui/gwprivacy.ui line 48
-#: rc.cpp:5246
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 403
+#: rc.cpp:3702
 #, no-c-format
-msgid "A&llowed"
-msgstr "被允许(&L)"
+msgid "Allow only from visible list"
+msgstr "只允许来自可见列表的用户"
 
-#. i18n: file ./protocols/groupwise/ui/gwprivacy.ui line 91
-#: rc.cpp:5249
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 411
+#: rc.cpp:3705
 #, no-c-format
-msgid "&Block >>"
-msgstr "屏蔽(&B) >>"
+msgid "Block all users"
+msgstr "屏蔽全部用户"
 
-#. i18n: file ./protocols/groupwise/ui/gwprivacy.ui line 99
-#: rc.cpp:5252
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 419
+#: rc.cpp:3708
 #, no-c-format
-msgid "<< Allo&w"
-msgstr "<< 允许(&W)"
+msgid "Block AIM users"
+msgstr "屏蔽 AIM 用户"
 
-#. i18n: file ./protocols/groupwise/ui/gwprivacy.ui line 124
-#: rc.cpp:5255
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 427
+#: rc.cpp:3711
 #, no-c-format
-msgid "A&dd..."
-msgstr "添加(&D)..."
+msgid "Block only from invisible list"
+msgstr "只屏蔽来自不可见列表的用户"
 
-#. i18n: file ./protocols/groupwise/ui/gwprivacy.ui line 167
-#: rc.cpp:5261
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 435
+#: rc.cpp:3714
 #, no-c-format
-msgid "Bloc&ked"
-msgstr "被屏蔽(&K)"
+msgid "Allow all users"
+msgstr "允许全部用户"
+
+#. i18n: file ./protocols/oscar/aim/ui/aimeditaccountui.ui line 443
+#: rc.cpp:3717
+#, no-c-format
+msgid "Allow only contact list's users"
+msgstr "只允许联系人列表中的用户"
+
+#. i18n: file ./protocols/oscar/oscarvisibilitybase.ui line 24
+#: rc.cpp:3720
+#, no-c-format
+msgid "Always visible:"
+msgstr "总是显身："
+
+#. i18n: file ./protocols/oscar/oscarvisibilitybase.ui line 32
+#: rc.cpp:3723
+#, no-c-format
+msgid "Contacts:"
+msgstr "联系人："
+
+#. i18n: file ./protocols/oscar/oscarvisibilitybase.ui line 155
+#: rc.cpp:3738
+#, no-c-format
+msgid "Always invisible:"
+msgstr "总是隐身："
+
+#. i18n: file ./protocols/groupwise/gwaddui.ui line 44
+#: rc.cpp:3747 rc.cpp:3750 rc.cpp:3753 rc.cpp:3756
+#, no-c-format
+msgid "The account name of the account you would like to add."
+msgstr "您想要添加的账户的账户名。"
+
+#. i18n: file ./protocols/groupwise/gwaddui.ui line 68
+#: rc.cpp:3759
+#, no-c-format
+msgid "Contact Type"
+msgstr "联系人类型"
+
+#. i18n: file ./protocols/groupwise/gwaddui.ui line 79
+#: rc.cpp:3762
+#, no-c-format
+msgid "&Echo"
+msgstr "回显(&E)"
+
+#. i18n: file ./protocols/groupwise/gwaddui.ui line 85
+#: rc.cpp:3765 rc.cpp:3768
+#, no-c-format
+msgid ""
+"Hey look!  Only one option.  Could you please make this a dropdown and add "
+"Null?"
+msgstr "抱歉，只有一个选项。您是否想要将其变成下拉框，并添加一个空的选项？"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 16
-#: rc.cpp:5264
+#: rc.cpp:3771
 #, no-c-format
 msgid "GroupWiseChatPropertiesWidget"
 msgstr "GroupWiseChatPropertiesWidget"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 27
-#: rc.cpp:5267
+#: rc.cpp:3774
 #, no-c-format
 msgid "DISPLAY NAME"
 msgstr "显示名字"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 49
-#: rc.cpp:5270
+#: rc.cpp:3777
 #, no-c-format
 msgid "The user who created the chatroom"
 msgstr "创建聊天室的用户"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 57
-#: rc.cpp:5273
+#: rc.cpp:3780
 #, no-c-format
 msgid "Query:"
 msgstr "查询："
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 68
-#: rc.cpp:5276
+#: rc.cpp:3783
 #, no-c-format
 msgid "Topic:"
 msgstr "话题："
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 85
-#: rc.cpp:5279
+#: rc.cpp:3786
 #, no-c-format
 msgid "A disclaimer for users entering the chatroom"
 msgstr "用户进入此聊天室前要接受的免责条款"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 93
-#: rc.cpp:5282
+#: rc.cpp:3789
 #, no-c-format
 msgid "Owner:"
 msgstr "所有者："
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 110
-#: rc.cpp:5285
+#: rc.cpp:3792
 #, no-c-format
 msgid "The current topic of the discussion"
 msgstr "当前的讨论话题"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 124
-#: rc.cpp:5288
+#: rc.cpp:3795
 #, no-c-format
 msgid "UNKNOWN"
 msgstr "未知"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 132
-#: rc.cpp:5291
+#: rc.cpp:3798
 #, no-c-format
 msgid "Maximum Users:"
 msgstr "最大用户数："
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 143
-#: rc.cpp:5294
+#: rc.cpp:3801
 #, no-c-format
 msgid "Created on:"
 msgstr "创建于："
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 154
-#: rc.cpp:5297
+#: rc.cpp:3804
 #, no-c-format
 msgid "Disclaimer:"
 msgstr "免责条款："
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 171
-#: rc.cpp:5300
+#: rc.cpp:3807
 #, no-c-format
 msgid "General description of the chatroom"
 msgstr "聊天室描述"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 185
-#: rc.cpp:5303
+#: rc.cpp:3810
 #, no-c-format
 msgid "Maximum simultaneous users allowed in the chatroom"
 msgstr "此聊天室允许的最大同时在线用户数"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 193
-#: rc.cpp:5306
+#: rc.cpp:3813
 #, no-c-format
 msgid "Creator:"
 msgstr "创建者："
 
+#. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 204
+#: rc.cpp:3816 rc.cpp:5022
+#, no-c-format
+msgid "Description:"
+msgstr "描述："
+
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 221
-#: rc.cpp:5312
+#: rc.cpp:3819
 #, no-c-format
 msgid "Date and time the chatroom was created"
 msgstr "聊天室的创建日期和时间"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 229
-#: rc.cpp:5315
+#: rc.cpp:3822
 #, no-c-format
 msgid "Archived"
 msgstr "已存档"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 235
-#: rc.cpp:5318
+#: rc.cpp:3825
 #, no-c-format
 msgid "Indicates if the chatroom is being archived on the server"
 msgstr "如果聊天室已被存档到服务器则提示"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 249
-#: rc.cpp:5321
+#: rc.cpp:3828
 #, no-c-format
 msgid "The user who owns this chatroom"
 msgstr "拥有此聊天室的用户"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 273
-#: rc.cpp:5324
+#: rc.cpp:3831
 #, no-c-format
 msgid "Default Access"
 msgstr "默认访问"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 290
-#: rc.cpp:5330
+#: rc.cpp:3837
 #, no-c-format
 msgid "General permission to read messages in the chatroom"
 msgstr "在聊天室内阅读消息的常规权限"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 298
-#: rc.cpp:5333
+#: rc.cpp:3840
 #, no-c-format
 msgid "Write Message"
 msgstr "写消息"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 304
-#: rc.cpp:5336
+#: rc.cpp:3843
 #, no-c-format
 msgid "General permission to write messages in the chatroom"
 msgstr "在聊天室内写消息的常规权限"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 312
-#: rc.cpp:5339
+#: rc.cpp:3846
 #, no-c-format
 msgid "Modify Access"
 msgstr "修改访问"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 318
-#: rc.cpp:5342
+#: rc.cpp:3849
 #, no-c-format
 msgid "General permission to modify the chatroom's access control list"
 msgstr "要修改的聊天室访问控制列表的一般权限"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 328
-#: rc.cpp:5345
+#: rc.cpp:3852
 #, no-c-format
 msgid "Access Control List"
 msgstr "访问控制列表"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 339
-#: rc.cpp:5348
+#: rc.cpp:3855
 #, no-c-format
 msgid "Access permissions for specific users"
 msgstr "针对指定用户的访问权限"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 355
-#: rc.cpp:5351
+#: rc.cpp:3858
 #, no-c-format
 msgid "A&dd"
 msgstr "添加(&D)"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 358
-#: rc.cpp:5354
+#: rc.cpp:3861
 #, no-c-format
 msgid "Add a new ACL entry"
 msgstr "添加一条 ACL 条目"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 366
-#: rc.cpp:5357
+#: rc.cpp:3864
 #, no-c-format
 msgid "Ed&it"
 msgstr "编辑(&I)"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 369
-#: rc.cpp:5360
+#: rc.cpp:3867
 #, no-c-format
 msgid "Edit an existing ACL entry"
 msgstr "编辑已存在的 ACL 条目"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 377
-#: rc.cpp:5363
+#: rc.cpp:3870
 #, no-c-format
 msgid "D&elete"
 msgstr "删除(&E)"
 
 #. i18n: file ./protocols/groupwise/ui/gwchatpropswidget.ui line 380
-#: rc.cpp:5366
+#: rc.cpp:3873
 #, no-c-format
 msgid "Delete a ACL entry"
 msgstr "删除 ACL 项"
 
+#. i18n: file ./protocols/groupwise/ui/gwcustomstatusedit.ui line 54
+#: rc.cpp:3876
+#, no-c-format
+msgid "&Status:"
+msgstr "状态(&S)："
+
+#. i18n: file ./protocols/groupwise/ui/gwcustomstatusedit.ui line 65
+#: rc.cpp:3879
+#, no-c-format
+msgid "Awa&y message:"
+msgstr "离开消息(&Y)："
+
+#. i18n: file ./protocols/groupwise/ui/gwaccountpreferences.ui line 16
+#: rc.cpp:3885
+#, no-c-format
+msgid "Account Preferences - Groupwise"
+msgstr "账户首选项 - Groupwise"
+
+#. i18n: file ./protocols/groupwise/ui/gwaccountpreferences.ui line 67
+#: rc.cpp:3894
+#, no-c-format
+msgid "&User ID:"
+msgstr "用户 ID(&U)："
+
+#. i18n: file ./protocols/groupwise/ui/gwaccountpreferences.ui line 73
+#: rc.cpp:3897 rc.cpp:3900 rc.cpp:3903 rc.cpp:3906
+#, no-c-format
+msgid "The account name of your account."
+msgstr "您账户的账户名。"
+
+#. i18n: file ./protocols/groupwise/ui/gwaccountpreferences.ui line 155
+#: rc.cpp:3921 rc.cpp:3927
+#, no-c-format
+msgid ""
+"The IP address or hostname of the server you would like to connect to (for "
+"example im.yourcorp.com)."
+msgstr "您想要连接的服务器的 IP 地址或主机名(如 im.yourcorp.com)。"
+
+#. i18n: file ./protocols/groupwise/ui/gwaccountpreferences.ui line 248
+#: rc.cpp:3945
+#, no-c-format
+msgid "Advanced &Options"
+msgstr "高级选项(&O)"
+
+#. i18n: file ./protocols/groupwise/ui/gwaccountpreferences.ui line 259
+#: rc.cpp:3948 rc.cpp:4110
+#, no-c-format
+msgid "A&lways accept invitations"
+msgstr "总是接受邀请(&L)"
+
 #. i18n: file ./protocols/groupwise/ui/gwaddui.ui line 16
-#: rc.cpp:5369
+#: rc.cpp:3951
 #, no-c-format
 msgid "TestbedAddUI"
 msgstr "TestbedAddUI"
 
 #. i18n: file ./protocols/groupwise/ui/gwaddui.ui line 40
-#: rc.cpp:5372
+#: rc.cpp:3954
 #, no-c-format
 msgid "&Basic"
 msgstr "基本(&B)"
 
 #. i18n: file ./protocols/groupwise/ui/gwaddui.ui line 51
-#: rc.cpp:5375
+#: rc.cpp:3957
 #, no-c-format
 msgid "Add Using"
 msgstr "添加方式"
 
 #. i18n: file ./protocols/groupwise/ui/gwaddui.ui line 65
-#: rc.cpp:5378
+#: rc.cpp:3960
 #, no-c-format
 msgid "A full or partial name. Asterisks are ignored"
 msgstr "全名或部分名称。星号将被忽略"
 
 #. i18n: file ./protocols/groupwise/ui/gwaddui.ui line 68
-#: rc.cpp:5381
+#: rc.cpp:3963
 #, no-c-format
 msgid "Type some or all of the contact's name.  Matches will be shown below"
 msgstr "输入联系人姓名的一部分或全部。匹配项将会在下面显示"
 
 #. i18n: file ./protocols/groupwise/ui/gwaddui.ui line 76
-#: rc.cpp:5384
+#: rc.cpp:3966
 #, no-c-format
 msgid "User &ID:"
 msgstr "用户 &ID："
 
 #. i18n: file ./protocols/groupwise/ui/gwaddui.ui line 90
-#: rc.cpp:5387
+#: rc.cpp:3969
 #, no-c-format
 msgid "Userna&me:"
 msgstr "用户名(&M)："
 
 #. i18n: file ./protocols/groupwise/ui/gwaddui.ui line 101
-#: rc.cpp:5390
+#: rc.cpp:3972
 #, no-c-format
 msgid "A correct User ID"
 msgstr "正确的用户 ID"
 
 #. i18n: file ./protocols/groupwise/ui/gwaddui.ui line 104
-#: rc.cpp:5393
+#: rc.cpp:3975
 #, no-c-format
 msgid ""
 "Use this field to add a contact if you already know the user's exact User ID"
 msgstr "当您已经知道了用户确切的 ID 以后，可以使用此域直接添加联系人"
 
-#. i18n: file ./protocols/groupwise/gwaddui.ui line 44
-#: rc.cpp:5405 rc.cpp:5408 rc.cpp:5411 rc.cpp:5414
+#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 16
+#: rc.cpp:3981
 #, no-c-format
-msgid "The account name of the account you would like to add."
-msgstr "您想要添加的账户的账户名。"
+msgid "Search GroupWise Messenger"
+msgstr "搜索 GroupWise Messenger"
 
-#. i18n: file ./protocols/groupwise/gwaddui.ui line 68
-#: rc.cpp:5417
+#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 35
+#: rc.cpp:3984
 #, no-c-format
-msgid "Contact Type"
-msgstr "联系人类型"
+msgid "&First name"
+msgstr "名(&F)"
 
-#. i18n: file ./protocols/groupwise/gwaddui.ui line 79
-#: rc.cpp:5420
+#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 46
+#: rc.cpp:3987
 #, no-c-format
-msgid "&Echo"
-msgstr "回显(&E)"
+msgid "&User ID"
+msgstr "用户 ID(&U)"
 
-#. i18n: file ./protocols/groupwise/gwaddui.ui line 85
-#: rc.cpp:5423 rc.cpp:5426
+#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 57
+#: rc.cpp:3990
 #, no-c-format
-msgid ""
-"Hey look!  Only one option.  Could you please make this a dropdown and add "
-"Null?"
-msgstr "抱歉，只有一个选项。您是否想要将其变成下拉框，并添加一个空的选项？"
-
-#: plugins/nowlistening/nowlisteningguiclient.cpp:37
-msgid "Send Media Info"
-msgstr "发送媒体信息"
-
-#: plugins/nowlistening/nowlisteningguiclient.cpp:60
-msgid ""
-"None of the supported media players (KsCD, JuK, amaroK, Noatun or Kaffeine) are "
-"playing anything."
-msgstr "目前支持的任何一种播放器(KsCD、JuK、amaroK、Noatun 或 Kaffeine)都没有正在播放的曲目。"
-
-#: plugins/nowlistening/nowlisteningguiclient.cpp:61
-msgid "Nothing to Send"
-msgstr "没有可发送的"
-
-#: plugins/nowlistening/nowlisteningplugin.cpp:134
-msgid "USAGE: /media - Displays information on current song"
-msgstr "用法：/media - 显示当前歌曲的信息"
-
-#: plugins/nowlistening/nowlisteningplugin.cpp:173
-msgid ""
-"_: Message from Kopete user to another user; used when sending media "
-"information even though there are no songs playing or no media players running\n"
-"Now Listening for Kopete - it would tell you what I am listening to, if I was "
-"listening to something on a supported media player."
-msgstr "Kopete 正在收听 - 如果我正在使用支持的媒体播放器收听音乐的话，您可以知道我现在正在听什么。"
-
-#: plugins/nowlistening/nowlisteningplugin.cpp:452
-msgid "Unknown track"
-msgstr "未知音轨"
-
-#: plugins/nowlistening/nowlisteningplugin.cpp:461
-msgid "Unknown artist"
-msgstr "未知艺术家"
-
-#: plugins/nowlistening/nowlisteningplugin.cpp:468
-msgid "Unknown album"
-msgstr "未知专辑"
-
-#: plugins/nowlistening/nowlisteningplugin.cpp:475
-msgid "Unknown player"
-msgstr "未知演奏者"
-
-#: plugins/translator/translatorlanguages.cpp:36
-msgid "English"
-msgstr "英语"
-
-#: plugins/translator/translatorlanguages.cpp:37
-msgid "Chinese"
-msgstr "汉语"
-
-#: plugins/translator/translatorlanguages.cpp:38
-msgid "French"
-msgstr "法语"
-
-#: plugins/translator/translatorlanguages.cpp:39
-msgid "German"
-msgstr "德语"
-
-#: plugins/translator/translatorlanguages.cpp:40
-msgid "Italian"
-msgstr "意大利语"
-
-#: plugins/translator/translatorlanguages.cpp:41
-msgid "Japanese"
-msgstr "日语"
-
-#: plugins/translator/translatorlanguages.cpp:42
-msgid "Korean"
-msgstr "韩语"
-
-#: plugins/translator/translatorlanguages.cpp:43
-msgid "Portuguese"
-msgstr "葡萄牙语"
-
-#: plugins/translator/translatorlanguages.cpp:44
-msgid "Russian"
-msgstr "俄语"
-
-#: plugins/translator/translatorlanguages.cpp:45
-msgid "Spanish"
-msgstr "西班牙语"
-
-#: plugins/translator/translatordialog.cpp:24
-msgid "Translator Plugin"
-msgstr "翻译者插件"
-
-#: plugins/translator/translatorplugin.cpp:46
-msgid "Translator"
-msgstr "翻译者"
+msgid "&Title"
+msgstr "职务(&T)"
 
-#: plugins/translator/translatorplugin.cpp:77
-msgid "Set &Language"
-msgstr "设置语言(&L)"
+#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 78
+#: rc.cpp:3993
+#, no-c-format
+msgid "&Department"
+msgstr "部门(&D)"
 
-#: plugins/translator/translatorplugin.cpp:363
-msgid ""
-"%2\n"
-"Auto Translated: %1"
-msgstr ""
-"%2\n"
-"自动翻译为 %1："
+#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 87
+#: rc.cpp:3996 rc.cpp:4005 rc.cpp:4014 rc.cpp:4029 rc.cpp:4041
+#, no-c-format
+msgid "contains"
+msgstr "包含"
 
-#: plugins/translator/translatorguiclient.cpp:44
-msgid "Translate"
-msgstr "翻译"
+#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 92
+#: rc.cpp:3999 rc.cpp:4008 rc.cpp:4017 rc.cpp:4032 rc.cpp:4044
+#, no-c-format
+msgid "begins with"
+msgstr "开始为"
 
-#: plugins/netmeeting/netmeetinginvitation.cpp:36
-#: plugins/netmeeting/netmeetingplugin.cpp:35
-msgid "NetMeeting"
-msgstr "NetMeeting"
-
-#: plugins/netmeeting/netmeetingguiclient.cpp:41
-msgid "Invite to Use NetMeeting"
-msgstr "邀请使用 NetMeeting"
-
-#: plugins/netmeeting/netmeetinginvitation.cpp:67
-msgid "%1 wants to start a chat with NetMeeting; do you want to accept it? "
-msgstr "%1 想要启动以 NetMeeting 的聊天；您接受吗？ "
-
-#: plugins/netmeeting/netmeetinginvitation.cpp:68
-#: protocols/msn/msnaccount.cpp:346 protocols/msn/msnaccount.cpp:1285
-#: protocols/msn/msnaddcontactpage.cpp:76 protocols/msn/msnchatsession.cpp:356
-#: protocols/msn/msnchatsession.cpp:365 protocols/msn/msncontact.cpp:175
-#: protocols/msn/msncontact.cpp:252
-#: protocols/msn/ui/msneditaccountwidget.cpp:238
-#: protocols/msn/ui/msneditaccountwidget.cpp:278
-#: protocols/msn/ui/msneditaccountwidget.cpp:336
-#: protocols/msn/ui/msneditaccountwidget.cpp:356
-msgid "MSN Plugin"
-msgstr "MSN 插件"
-
-#: plugins/netmeeting/netmeetinginvitation.cpp:68 protocols/msn/webcam.cpp:91
-#: protocols/yahoo/yahooaccount.cpp:1086 protocols/yahoo/yahooaccount.cpp:1527
-#: protocols/yahoo/yahooaccount.cpp:1750
-msgid "Accept"
-msgstr "接受"
+#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 97
+#: rc.cpp:4002 rc.cpp:4011 rc.cpp:4020 rc.cpp:4035 rc.cpp:4047
+#, no-c-format
+msgid "equals"
+msgstr "等于"
 
-#: plugins/netmeeting/netmeetinginvitation.cpp:68
-msgid "Refuse"
-msgstr "拒绝"
+#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 154
+#: rc.cpp:4023
+#, no-c-format
+msgid "Last &name"
+msgstr "姓(&N)"
 
-#: plugins/alias/aliaspreferences.cpp:336
-#: plugins/alias/aliaspreferences.cpp:425
-msgid ""
-"<qt>Could not add alias <b>%1</b>. An alias name cannot contain the characters "
-"\"_\" or \"=\".</qt>"
-msgstr "<qt>无法添加别名 <b>%1</b>。别名不能包含“_”或“=”。</qt>"
+#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 165
+#: rc.cpp:4026
+#, no-c-format
+msgid "Cl&ear"
+msgstr "清除(&E)"
 
-#: plugins/alias/aliaspreferences.cpp:338
-#: plugins/alias/aliaspreferences.cpp:427
-msgid "Invalid Alias Name"
-msgstr "无效的别名"
+#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 250
+#: rc.cpp:4050
+#, no-c-format
+msgid "&Results:"
+msgstr "结果(&R)："
 
-#: plugins/alias/aliaspreferences.cpp:354
-#: plugins/alias/aliaspreferences.cpp:450
-msgid ""
-"<qt>Could not add alias <b>%1</b>. This command is already being handled by "
-"either another alias or Kopete itself.</qt>"
-msgstr "<qt>无法添加别名 <b>%1</b>。此命令已经被其他别名或者 Kopete 自己所使用。</qt>"
+#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 300
+#: rc.cpp:4062
+#, no-c-format
+msgid "User ID"
+msgstr "用户 ID"
 
-#: plugins/alias/aliaspreferences.cpp:356
-#: plugins/alias/aliaspreferences.cpp:452
-msgid "Could Not Add Alias"
-msgstr "无法添加别名"
+#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 335
+#: rc.cpp:4065
+#, no-c-format
+msgid "Detai&ls"
+msgstr "细节(&L)"
 
-#: plugins/alias/aliaspreferences.cpp:469
-msgid "Are you sure you want to delete the selected aliases?"
-msgstr "您确定想要删除选中的别名吗？"
+#. i18n: file ./protocols/groupwise/ui/gwcontactsearch.ui line 364
+#: rc.cpp:4068
+#, no-c-format
+msgid "0 matching users found"
+msgstr "没有找到用户"
 
-#: plugins/alias/aliaspreferences.cpp:469
-msgid "Delete Aliases"
-msgstr "删除别名"
+#. i18n: file ./protocols/groupwise/ui/gwprivacy.ui line 24
+#: rc.cpp:4071
+#, no-c-format
+msgid "Who can see my online status and send me messages:"
+msgstr "谁可以看到我的在线状态并向我发送消息："
 
-#: plugins/latex/latexplugin.cpp:95
-msgid ""
-"I cannot find the Magick convert program.\n"
-"convert is required to render the Latex formulas.\n"
-"Please go to www.imagemagick.org or to your distribution site and get the right "
-"package."
-msgstr ""
-"找不到 Magick 转换程序。\n"
-"要渲染 Latex 公式，需要 convert 程序。\n"
-"请转到 www.imagemagick.org，或者前往您发行版的网站抓到正确的软件包。"
+#. i18n: file ./protocols/groupwise/ui/gwprivacy.ui line 48
+#: rc.cpp:4074
+#, no-c-format
+msgid "A&llowed"
+msgstr "被允许(&L)"
 
-#: plugins/latex/latexguiclient.cpp:44
-msgid "Preview Latex Images"
-msgstr "预览 Latex 图像"
+#. i18n: file ./protocols/groupwise/ui/gwprivacy.ui line 91
+#: rc.cpp:4077
+#, no-c-format
+msgid "&Block >>"
+msgstr "屏蔽(&B) >>"
 
-#: plugins/latex/latexguiclient.cpp:62
-msgid ""
-"There are no latex in the message you are typing.  The latex formula must be "
-"included between $$ and $$ "
-msgstr "您正在输入的消息没有 Latex。Latex 公式周围必须有 $$ "
+#. i18n: file ./protocols/groupwise/ui/gwprivacy.ui line 99
+#: rc.cpp:4080
+#, no-c-format
+msgid "<< Allo&w"
+msgstr "<< 允许(&W)"
 
-#: plugins/latex/latexguiclient.cpp:62
-msgid "No Latex Formula"
-msgstr "无 Latex 公式"
+#. i18n: file ./protocols/groupwise/ui/gwprivacy.ui line 124
+#: rc.cpp:4083
+#, no-c-format
+msgid "A&dd..."
+msgstr "添加(&D)..."
 
-#: plugins/latex/latexguiclient.cpp:67
-#, c-format
-msgid "<b>Preview of the latex message :</b> <br />%1"
-msgstr "<b>Latex 消息的预览：</b> <br />%1"
+#. i18n: file ./protocols/groupwise/ui/gwprivacy.ui line 167
+#: rc.cpp:4089
+#, no-c-format
+msgid "Bloc&ked"
+msgstr "被屏蔽(&K)"
 
-#: plugins/webpresence/webpresenceplugin.cpp:208
-msgid ""
-"An error occurred when uploading your presence page.\n"
-"Check the path and write permissions of the destination."
-msgstr ""
-"上传您的上线页面时发生了错误。\n"
-"请检查目标的路径和写权限。"
+#. i18n: file ./protocols/groupwise/ui/gwshowinvitation.ui line 35
+#: rc.cpp:4092
+#, no-c-format
+msgid "<p align=\"right\">From:</p>"
+msgstr "<p align=\"right\">来自：</p>"
 
-#: plugins/webpresence/webpresenceplugin.cpp:218
-msgid "Not yet known"
-msgstr "未知"
+#. i18n: file ./protocols/groupwise/ui/gwshowinvitation.ui line 43
+#: rc.cpp:4095
+#, no-c-format
+msgid "<p align=\"right\">Sent:</p>"
+msgstr "<p align=\"right\">发送时间：</p>"
 
-#: plugins/highlight/highlightpreferences.cpp:207
-msgid "Rename Filter"
-msgstr "重命名过滤器"
+#. i18n: file ./protocols/groupwise/ui/gwshowinvitation.ui line 59
+#: rc.cpp:4098
+#, no-c-format
+msgid "INVITE_DATE_TIME"
+msgstr "INVITE_DATE_TIME"
 
-#: plugins/highlight/highlightpreferences.cpp:207
-msgid "Please enter the new name for the filter:"
-msgstr "请输入过滤器的新名称："
+#. i18n: file ./protocols/groupwise/ui/gwshowinvitation.ui line 67
+#: rc.cpp:4101
+#, no-c-format
+msgid "CONTACT_NAME"
+msgstr "CONTACT_NAME"
 
-#: plugins/highlight/highlightconfig.cpp:72
-msgid "-New filter-"
-msgstr "-新过滤器-"
+#. i18n: file ./protocols/groupwise/ui/gwshowinvitation.ui line 83
+#: rc.cpp:4104
+#, no-c-format
+msgid "INVITE_MESSAGE"
+msgstr "INVITE_MESSAGE"
 
-#: plugins/cryptography/cryptographyselectuserkey.cpp:29
-msgid "Select Contact's Public Key"
-msgstr "选择联系人的公钥"
+#. i18n: file ./protocols/groupwise/ui/gwshowinvitation.ui line 102
+#: rc.cpp:4107
+#, no-c-format
+msgid "Would you like to join the conversation?"
+msgstr "您想要加入对话吗？"
 
-#: plugins/cryptography/cryptographyselectuserkey.cpp:38
-#, c-format
-msgid "Select public key for %1"
-msgstr "选择 %1 的公开密钥"
+#. i18n: file ./protocols/groupwise/ui/gwchatsearchwidget.ui line 22
+#: rc.cpp:4113
+#, no-c-format
+msgid "Chatroom "
+msgstr "聊天室 "
 
-#: plugins/cryptography/kgpgselkey.cpp:41
-msgid "Private Key List"
-msgstr "私钥列表"
+#. i18n: file ./protocols/groupwise/ui/gwchatsearchwidget.ui line 33
+#: rc.cpp:4116
+#, no-c-format
+msgid "Owner"
+msgstr "所有者"
 
-#: plugins/cryptography/kgpgselkey.cpp:57
-msgid "Choose secret key:"
-msgstr "选择密钥："
+#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 32
+#: rc.cpp:4128
+#, no-c-format
+msgid "USER_ID"
+msgstr "USER_ID"
 
-#: plugins/cryptography/kgpgselkey.cpp:64
-msgid "Local signature (cannot be exported)"
-msgstr "本地签名(不能被导出)"
+#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 68
+#: rc.cpp:4131 rc.cpp:4137 rc.cpp:4149
+#, no-c-format
+msgid "Change the display name used for this contact"
+msgstr "更改此联系人的显示名"
 
-#: plugins/cryptography/kgpgselkey.cpp:84
-#: plugins/cryptography/popuppublic.cpp:401
-msgid "Unlimited"
-msgstr "无限制"
+#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 76
+#: libkopete/ui/userinfodialog.cpp:217 rc.cpp:4134
+#, no-c-format
+msgid "Status:"
+msgstr "状态："
 
-#: plugins/cryptography/kgpgselkey.cpp:92
-msgid "Invalid"
-msgstr "无效"
+#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 98
+#: rc.cpp:4140
+#, no-c-format
+msgid "USER_STATUS"
+msgstr "USER_STATUS"
 
-#: plugins/cryptography/kgpgselkey.cpp:95
-msgid "Disabled"
-msgstr "已禁用"
+#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 114
+#: rc.cpp:4146
+#, no-c-format
+msgid "&Display name:"
+msgstr "显示名(&D)："
 
-#: plugins/cryptography/kgpgselkey.cpp:98
-msgid "Revoked"
-msgstr "已撤回"
+#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 163
+#: rc.cpp:4155
+#, no-c-format
+msgid "Additional properties:"
+msgstr "额外属性："
 
-#: plugins/cryptography/kgpgselkey.cpp:101
-msgid "Expired"
-msgstr "已过期"
+#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 169
+#: rc.cpp:4158
+#, no-c-format
+msgid "Property"
+msgstr "属性"
 
-#: plugins/cryptography/kgpgselkey.cpp:104
-msgid "Undefined"
-msgstr "未定义"
+#. i18n: file ./protocols/groupwise/ui/gwcontactpropswidget.ui line 180
+#: rc.cpp:4161
+#, no-c-format
+msgid "Value"
+msgstr "值"
 
-#: plugins/cryptography/kgpgselkey.cpp:107
-msgid "None"
-msgstr "无"
+#. i18n: file ./protocols/groupwise/ui/gwcustomstatuswidget.ui line 36
+#: rc.cpp:4167
+#, no-c-format
+msgid "Auto Reply"
+msgstr "自动回复"
 
-#: plugins/cryptography/kgpgselkey.cpp:110
-msgid "Marginal"
-msgstr "勉强"
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 96
+#: rc.cpp:4182 rc.cpp:4491
+#, no-c-format
+msgid "Surname:"
+msgstr "姓："
 
-#: plugins/cryptography/kgpgselkey.cpp:113
-msgid "Full"
-msgstr "完全"
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 162
+#: rc.cpp:4191
+#, no-c-format
+msgid "Age from:"
+msgstr "年龄从："
 
-#: plugins/cryptography/kgpgselkey.cpp:116
-msgid "Ultimate"
-msgstr "极端"
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 190
+#: rc.cpp:4194
+#, no-c-format
+msgid "to:"
+msgstr "到："
 
-#: plugins/cryptography/kgpgselkey.cpp:119
-msgid "?"
-msgstr "?"
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 245
+#: rc.cpp:4197 rc.cpp:4497
+#, no-c-format
+msgid "Gender:"
+msgstr "性别："
 
-#: plugins/cryptography/kgpgselkey.cpp:150
-msgid "ID: %1, trust: %2, expiration: %3"
-msgstr "ID：%1，信任：%2，有效性：%3"
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 304
+#: rc.cpp:4206
+#, no-c-format
+msgid "User number:"
+msgstr "用户号："
 
-#: plugins/cryptography/popuppublic.cpp:94
-msgid "Select Public Key"
-msgstr "选择公钥"
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 327
+#: rc.cpp:4209
+#, no-c-format
+msgid "Request information about user:"
+msgstr "请求关于用户的信息："
 
-#: plugins/cryptography/popuppublic.cpp:111
-#, c-format
-msgid "Select Public Key for %1"
-msgstr "选择 %1 的公钥"
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 341
+#: rc.cpp:4212
+#, no-c-format
+msgid "Search by specified data:"
+msgstr "按照指定数据搜索："
 
-#: plugins/cryptography/popuppublic.cpp:119
-msgid "Clear Search"
-msgstr "清除搜索"
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 357
+#: rc.cpp:4215
+#, no-c-format
+msgid "Lookup only those that are currently online"
+msgstr "只查阅在线用户"
 
-#: plugins/cryptography/popuppublic.cpp:122
-msgid "Search: "
-msgstr "搜索： "
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 439
+#: libkopete/kopeteglobal.cpp:184 rc.cpp:4224
+#, no-c-format
+msgid "Nick Name"
+msgstr "昵称"
 
-#: plugins/cryptography/popuppublic.cpp:129
-msgid "ID"
-msgstr "ID"
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 450
+#: rc.cpp:4227
+#, no-c-format
+msgid "Age"
+msgstr "年龄"
 
-#: plugins/cryptography/popuppublic.cpp:147
-msgid "&Go to Default Key"
-msgstr "转到默认密钥(&G)"
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 461
+#: rc.cpp:4230
+#, no-c-format
+msgid "City"
+msgstr "城市"
 
-#: plugins/cryptography/popuppublic.cpp:150
-msgid "ASCII armored encryption"
-msgstr "ASCII 代码的加密"
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 483
+#: rc.cpp:4236
+#, no-c-format
+msgid "12"
+msgstr "12"
 
-#: plugins/cryptography/popuppublic.cpp:151
-msgid "Allow encryption with untrusted keys"
-msgstr "允许用不信任的密钥加密"
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 486
+#: rc.cpp:4239
+#, no-c-format
+msgid "DONT_TRANSLATE"
+msgstr "不翻译"
 
-#: plugins/cryptography/popuppublic.cpp:152
-msgid "Hide user id"
-msgstr "隐藏用户 ID"
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 489
+#: rc.cpp:4242 rc.cpp:4248
+#, no-c-format
+msgid "DONT_TRANSL"
+msgstr "不翻译"
 
-#: plugins/cryptography/popuppublic.cpp:155
-msgid ""
-"<b>Public keys list</b>: select the key that will be used for encryption."
-msgstr "<b>公钥列表</b>：选择要用来加密的密钥。"
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 492
+#: rc.cpp:4245
+#, no-c-format
+msgid "999"
+msgstr "999"
 
-#: plugins/cryptography/popuppublic.cpp:157
-msgid ""
-"<b>ASCII encryption</b>: makes it possible to open the encrypted file/message "
-"in a text editor"
-msgstr "<b>输出为 ASCII 代码的加密</b>使用输出为 ASCII 代码的加密，加密后的文件/信件能用文本编辑器打开。"
+#. i18n: file ./protocols/gadu/ui/gadusearch.ui line 498
+#: rc.cpp:4251
+#, no-c-format
+msgid "245324956234"
+msgstr "245324956234"
 
-#: plugins/cryptography/popuppublic.cpp:159
+#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 52
+#: rc.cpp:4260
+#, no-c-format
 msgid ""
-"<b>Hide user ID</b>: Do not put the keyid into encrypted packets. This option "
-"hides the receiver of the message and is a countermeasure against traffic "
-"analysis. It may slow down the decryption process because all available secret "
-"keys are tried."
+"Choose status, by default present status is selected. \n"
+"So all you need to do is just to type in your description. \n"
+"Choosing Offline status will disconnect you, with given description."
 msgstr ""
-"<b>隐藏用户 ID</b>：不把 keyid "
-"放入加密的报文中。此选项将会隐藏信息的接收者，并且会增加流量分析的难度。这一操作还会减慢解密过程，因为必须逐一尝试可用的全部密钥。"
+"选择状态，默认情况下会选中当前状态。\n"
+"所以，您所需要的做的仅仅是输入您的描述。\n"
+"选择离线状态将把您断开，并给出相应描述。"
 
-#: plugins/cryptography/popuppublic.cpp:163
+#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 77
+#: rc.cpp:4268
+#, no-c-format
+msgid "Set your status to Online."
+msgstr "将您的状态设为在线。"
+
+#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 80
+#: rc.cpp:4271
+#, no-c-format
 msgid ""
-"<b>Allow encryption with untrusted keys</b>: when you import a public key, it "
-"is usually marked as untrusted and you cannot use it unless you sign it in "
-"order to make it 'trusted'. Checking this box enables you to use any key, even "
-"if it has not be signed."
-msgstr ""
-"<b>允许用不受信任的密钥加密</b>：当您导入一个公钥时，它通常被标记为不受信任的，除非您对它签名使它成为“受信任的”，不然您还不能使用它。选中此项能让您使用"
-"一个即使还没签名的公开密钥。"
+"Set your status to Online, indicating that you are available to chat with "
+"anyone who wishes."
+msgstr "将您的状态设为在线，这表明您可以和别人开聊。"
 
-#: plugins/cryptography/popuppublic.cpp:172
-msgid "Shred source file"
-msgstr "粉碎源文件"
+#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 94
+#: rc.cpp:4277
+#, no-c-format
+msgid "Set your status to busy."
+msgstr "将您的状态设为忙碌。"
 
-#: plugins/cryptography/popuppublic.cpp:174
+#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 97
+#: rc.cpp:4280
+#, no-c-format
 msgid ""
-"<b>Shred source file</b>: permanently remove source file. No recovery will be "
-"possible"
-msgstr "<b>粉碎源文件</b>：永久性删除源文件，不再可能被恢复。"
+"Set your status to busy, indicating that you may should not be bothered with "
+"trivial chat, and may not be able to reply immediately."
+msgstr "将您的状态设为忙碌，这表明您可能正处于免打扰的私聊中，而无法立即回复。"
 
-#: plugins/cryptography/popuppublic.cpp:176
+#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 111
+#: rc.cpp:4286
+#, no-c-format
 msgid ""
-"<qt><b>Shred source file:</b><br />"
-"<p>Checking this option will shred (overwrite several times before erasing) the "
-"files you have encrypted. This way, it is almost impossible that the source "
-"file is recovered.</p>"
-"<p><b>But you must be aware that this is not secure</b> "
-"on all file systems, and that parts of the file may have been saved in a "
-"temporary file or in the spooler of your printer if you previously opened it in "
-"an editor or tried to print it. Only works on files (not on folders).</p></qt>"
-msgstr ""
-"<qt><b>粉碎源文件：</b><br />"
-"<p>选中此选项将会粉碎(删除前覆盖多次)您加密的文件。这样，几乎不可能恢复源文件。</p>"
-"<p><b>但是您必须知道，</b>在所有的文件系统中安全都不是绝对的。如果您先前在编辑器中打开了该文件，文件的某一部分可能保存在临时文件中；如果您先前打印了该"
-"文件，那么打印机的打印池中也可能存有该文件的副本。此功能只适用于文件(而不是文件夹)。</p></qt>"
-
-#: plugins/cryptography/popuppublic.cpp:177
-msgid "<a href=\"whatsthis:%1\">Read this before using shredding</a>"
-msgstr "<a href=\"whatsthis:%1\">使用粉碎前请仔细阅读</a>"
-
-#: plugins/cryptography/popuppublic.cpp:182
-msgid "Symmetrical encryption"
-msgstr "对称加密"
+"Set status to invisible, which will hide your presence from other users."
+msgstr "将状态设为隐身，这将使其他用户无法看到您。"
 
-#: plugins/cryptography/popuppublic.cpp:184
+#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 114
+#: rc.cpp:4289
+#, no-c-format
 msgid ""
-"<b>Symmetrical encryption</b>: encryption does not use keys. You just need to "
-"give a password to encrypt/decrypt the file"
-msgstr "<b>对称加密</b>：这种加密不使用密钥对。您只需要给出口令就能加密/解密文件"
-
-#: plugins/cryptography/cryptographyplugin.cpp:51
-msgid "Cryptography"
-msgstr "加密算法"
-
-#: plugins/cryptography/cryptographyplugin.cpp:71
-msgid "&Select Cryptography Public Key..."
-msgstr "选择加密公密(&S).."
-
-#: plugins/cryptography/cryptographyplugin.cpp:188
-msgid "Outgoing Encrypted Message: "
-msgstr "送出的加密消息： "
-
-#: plugins/cryptography/cryptographyplugin.cpp:219
-msgid "Incoming Encrypted Message: "
-msgstr "进来的加密消息： "
-
-#: plugins/cryptography/kgpginterface.cpp:99
-msgid "Enter passphrase for <b>%1</b>:"
-msgstr "请输入 <b>%1<b> 的密码句："
-
-#: plugins/cryptography/kgpginterface.cpp:101
-msgid "<b>Bad passphrase</b><br> You have %1 tries left.<br>"
-msgstr "<b>无效的密码句</b><br>您还剩下 %1 次重试机会。<br>"
-
-#: plugins/cryptography/cryptographyguiclient.cpp:51
-msgid "Encrypt Messages"
-msgstr "加密消息"
-
-#: plugins/history/historydialog.cpp:98 plugins/history/historydialog.cpp:556
-#, c-format
-msgid "History for %1"
-msgstr "%1 的历史"
-
-#: plugins/history/historydialog.cpp:119
-msgid "All"
-msgstr "全部"
-
-#: plugins/history/historydialog.cpp:213
-msgid "Loading..."
-msgstr "正在装入..."
-
-#: plugins/history/historydialog.cpp:470
-msgid "Searching..."
-msgstr "正在搜索..."
-
-#: plugins/history/historydialog.cpp:549
-msgid "History for All Contacts"
-msgstr "全部联系人的历史"
-
-#: plugins/history/historyplugin.cpp:41
-msgid "History"
-msgstr "历史"
+"Set status to invisible, which will hide your presence from other users (who "
+"will see you as offline).  However you may still chat, and see the online "
+"presence of others."
+msgstr "将状态设为隐身，这将使其他用户无法看到您(而只会看到您离线)。但是，您仍然可以参与聊天，并查看其他在线联系人的状态。"
 
-#: plugins/history/historyplugin.cpp:47
-msgid "View &History"
-msgstr "查看历史(&H)"
+#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 128
+#: rc.cpp:4295 rc.cpp:4298
+#, no-c-format
+msgid "Choose this status to disconnect with description entered below."
+msgstr "选择此状态将以下面的描述断开连接。"
 
-#: plugins/history/historyplugin.cpp:66
-msgid ""
-"Old history files from Kopete 0.6.x or older has been detected.\n"
-"Do you want to import and convert it to the new history format?"
-msgstr ""
-"检测到了 Kopete 0.6.x 或更旧的历史文件。\n"
-"您想要将其导入并转换为新的历史格式吗？"
+#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 151
+#: rc.cpp:4301
+#, no-c-format
+msgid "&Message:"
+msgstr "消息(&M)："
 
-#: plugins/history/historyplugin.cpp:68
-msgid "History Plugin"
-msgstr "历史插件"
+#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 157
+#: rc.cpp:4304 rc.cpp:4310
+#, no-c-format
+msgid "Description of your status."
+msgstr "您状态的描述。"
 
-#: plugins/history/historyplugin.cpp:68
-msgid "Import && Convert"
-msgstr "导入并转换"
+#. i18n: file ./protocols/gadu/ui/gaduawayui.ui line 160
+#: rc.cpp:4307 rc.cpp:4313
+#, no-c-format
+msgid "Description of your status (up to 70 characters)."
+msgstr "在此输入您的状态描述(最多70个字符)。"
 
-#: plugins/history/historyplugin.cpp:68
-msgid "Do Not Import"
-msgstr "不导入"
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 16
+#: rc.cpp:4316
+#, no-c-format
+msgid "Register Account - Gadu-Gadu"
+msgstr "注册账户 - Gadu-Gadu"
 
-#: plugins/history/converter.cpp:40
-msgid "Would you like to remove old history files?"
-msgstr "您想删除旧的历史文件吗？"
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 66
+#: rc.cpp:4319
+#, no-c-format
+msgid "Repeat pass&word:"
+msgstr "重复密码(&W)："
 
-#: plugins/history/converter.cpp:40
-msgid "History Converter"
-msgstr "历史转换器"
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 72
+#: rc.cpp:4322 rc.cpp:4373
+#, no-c-format
+msgid "A confirmation of the password you would like to use."
+msgstr "对您想要使用的密码进行确认。"
 
-#: plugins/history/converter.cpp:40 protocols/jabber/jabberaccount.cpp:1125
-#: protocols/jabber/jabbercontact.cpp:921
-msgid "Keep"
-msgstr "保持"
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 75
+#: rc.cpp:4325 rc.cpp:4376
+#, no-c-format
+msgid "A confirmation of the password you would like to use for this account."
+msgstr "对您想要为此账户使用的密码进行确认。"
 
-#: plugins/history/converter.cpp:42
-msgid "History converter"
-msgstr "历史转换器"
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 86
+#: rc.cpp:4328 rc.cpp:4367
+#, no-c-format
+msgid "The password you would like to use."
+msgstr "您想要使用的密码。"
 
-#: plugins/history/converter.cpp:115
-#, c-format
-msgid "Parsing old history in %1"
-msgstr "正在处理 %1 中的旧历史"
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 89
+#: rc.cpp:4331 rc.cpp:4370
+#, no-c-format
+msgid "The password you would like to use for this account."
+msgstr "您想要为此账户使用的密码。"
 
-#: plugins/history/converter.cpp:125
-msgid ""
-"Parsing old history in %1:\n"
-"%2"
-msgstr ""
-"正在处理 %1 中的旧历史：\n"
-"%2"
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 97
+#: rc.cpp:4334 rc.cpp:4343
+#, no-c-format
+msgid "Your E-mail address."
+msgstr "您的电子邮件地址："
 
-#: plugins/history/historyguiclient.cpp:44
-msgid "History Last"
-msgstr "最后一次历史"
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 100
+#: rc.cpp:4337 rc.cpp:4346
+#, no-c-format
+msgid "The E-mail address you would like to use to register this account."
+msgstr "您想要用来注册此账户的电子邮件地址。"
 
-#: plugins/statistics/statisticsdialog.cpp:45
-#, c-format
-msgid "Statistics for %1"
-msgstr "%1 的历史"
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 136
+#: rc.cpp:4340
+#, no-c-format
+msgid "&E-Mail address:"
+msgstr "电子邮件地址(&E)："
 
-#: plugins/statistics/statisticsdialog.cpp:193
-msgid "<h1>Statistics for %1</h1>"
-msgstr "<h1>%1 的统计</h1>"
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 184
+#: rc.cpp:4349
+#, no-c-format
+msgid "&Verification sequence:"
+msgstr "校验序列(&V)："
 
-#: plugins/statistics/statisticsdialog.cpp:196
-msgid ""
-"<div class=\"statgroup\"><b><a href=\"main:generalinfo\" title=\"General "
-"summary view\">General</a></b>"
-"<br><span title=\"Select the a day or a month to view the stat for\"><b>"
-"Days: </b><a href=\"dayofweek:1\">Monday</a>&nbsp;<a href=\"dayofweek:2\">"
-"Tuesday</a>&nbsp;<a href=\"dayofweek:3\">Wednesday</a>"
-"&nbsp;<a href=\"dayofweek:4\">Thursday</a>&nbsp;<a href=\"dayofweek:5\">"
-"Friday</a>&nbsp;<a href=\"dayofweek:6\">Saturday</a>"
-"&nbsp;<a href=\"dayofweek:7\">Sunday</a>"
-"<br><b>Months: </b><a href=\"monthofyear:1\">January</a>"
-"&nbsp;<a href=\"monthofyear:2\">February</a>&nbsp;<a href=\"monthofyear:3\">"
-"March</a>&nbsp;<a href=\"monthofyear:4\">April</a>&nbsp;<a "
-"href=\"monthofyear:5\">May</a>&nbsp;<a href=\"monthofyear:6\">June</a>"
-"&nbsp;<a href=\"monthofyear:7\">July</a>&nbsp;<a href=\"monthofyear:8\">"
-"August</a>&nbsp;<a href=\"monthofyear:9\">September</a>"
-"&nbsp;<a href=\"monthofyear:10\">October</a>&nbsp;<a href=\"monthofyear:11\">"
-"November</a>&nbsp;<a href=\"monthofyear:12\">December</a>&nbsp;</span></div>"
-"<br>"
-msgstr ""
-"<div class=\"statgroup\"><b><a href=\"main:generalinfo\" title=\"常规概览视图\">常规</a>"
-"</b>"
-"<br><span title=\"选择日或月以便查看统计\"><b>日：</b><a href=\"dayofweek:1\">周一</a>"
-"&nbsp;<a href=\"dayofweek:2\">周二</a>&nbsp;<a href=\"dayofweek:3\">周三</a>"
-"&nbsp;<a href=\"dayofweek:4\">周四</a>&nbsp;<a href=\"dayofweek:5\">周五</a>"
-"&nbsp;<a href=\"dayofweek:6\">周六</a>&nbsp;<a href=\"dayofweek:7\">周日</a>"
-"<br><b>月：</b><a href=\"monthofyear:1\">一月</a>&nbsp;<a href=\"monthofyear:2\">"
-"二月</a>&nbsp;<a href=\"monthofyear:3\">三月</a>&nbsp;<a href=\"monthofyear:4\">"
-"四月</a>&nbsp;<a href=\"monthofyear:5\">五月</a>&nbsp;<a href=\"monthofyear:6\">"
-"六月</a>&nbsp;<a href=\"monthofyear:7\">七月</a>&nbsp;<a href=\"monthofyear:8\">"
-"八月</a>&nbsp;<a href=\"monthofyear:9\">九月</a>&nbsp;<a href=\"monthofyear:10\">"
-"十月</a>&nbsp;<a href=\"monthofyear:11\">十一月</a>&nbsp;<a href=\"monthofyear:12\">"
-"十二月</a>&nbsp;</span></div>"
-"<br>"
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 190
+#: rc.cpp:4352 rc.cpp:4358
+#, no-c-format
+msgid "The text from the image below."
+msgstr "上图中的文字。"
 
-#: plugins/statistics/statisticsdialog.cpp:227
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 193
+#: rc.cpp:4355 rc.cpp:4361
+#, no-c-format
 msgid ""
-"<div class=\"statgroup\" title=\"Contact status history for today\">"
-"<h2>Today</h2><table width=\"100%\">"
-"<tr>"
-"<td>Status</td>"
-"<td>From</td>"
-"<td>To</td></tr>"
-msgstr ""
-"<div class=\"statgroup\" title=\"今天的联系人状态历史\">"
-"<h2>今天</h2><table width=\"100%\">"
-"<tr>"
-"<td>状态</td>"
-"<td>自</td>"
-"<td>至</td></tr>"
-
-#: plugins/statistics/statisticsdialog.cpp:387
-msgid "<div class=\"statgroup\">"
-msgstr "<div class=\"statgroup\">"
+"The text from the image below.  This is used to prevent abusive automated "
+"registration scripts."
+msgstr "上图中的文字。这可以避免自动注册脚本的滥用。"
 
-#: plugins/statistics/statisticsdialog.cpp:388
-msgid ""
-"<b title=\"The total time I have been able to see %1 status\">"
-"Total seen time :</b> %2 hour(s)"
-"<br>"
-msgstr "<b title=\"我可以看到 %1 状态的总计时间\">总计看到时间：</b>%2 小时<br>"
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 240
+#: rc.cpp:4364 rc.cpp:4695 rc.cpp:4998
+#, no-c-format
+msgid "&Password:"
+msgstr "密码(&P)："
 
-#: plugins/statistics/statisticsdialog.cpp:390
-msgid ""
-"<b title=\"The total time I have seen %1 online\">Total online time :</b> "
-"%2 hour(s)"
-"<br>"
-msgstr "<b title=\"我看到 %1 在线的总计时间\">总计在线时间：</b>%2 小时<br>"
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 337
+#: rc.cpp:4379
+#, no-c-format
+msgid "Gadu-Gadu registration token."
+msgstr "Gadu-Gadu 注册标记。"
 
-#: plugins/statistics/statisticsdialog.cpp:392
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 340
+#: rc.cpp:4382
+#, no-c-format
 msgid ""
-"<b title=\"The total time I have seen %1 away\">Total busy time :</b> "
-"%2 hour(s)"
-"<br>"
-msgstr "<b title=\"我看到 %1 离开的总计时间\">总计忙碌时间：</b>%2 小时<br>"
+"This field contains an image with number that you need to type into the <b>"
+"Verification Sequence</b> field above."
+msgstr "此域中的图片中包含数字。要注册新帐户，您需要在下面的<b>校验序列</b>文字域输入图片所示的数字。"
 
-#: plugins/statistics/statisticsdialog.cpp:393
+#. i18n: file ./protocols/gadu/ui/gaduregisteraccountui.ui line 375
+#: rc.cpp:4385
+#, no-c-format
 msgid ""
-"<b title=\"The total time I have seen %1 offline\">Total offline time :</b> "
-"%2 hour(s)"
-msgstr "<b title=\"我看到 %1 离线的总计时间\">总计离线时间：</b>%2 小时"
-
-#: plugins/statistics/statisticsdialog.cpp:396
-#: plugins/statistics/statisticsdialog.cpp:464
-#: plugins/statistics/statisticsdialog.cpp:482
-msgid "General information"
-msgstr "常规信息"
+"<i>Type the letters and numbers shown in the image above into the <b>"
+"Verification Sequence</b> field.  This is used to prevent automated "
+"registration abuse.</i>"
+msgstr "<i>输入上面<b>验证序列</b>域图像中显示的字母和数字。此功能用于防止自动注册机。</i>"
 
-#: plugins/statistics/statisticsdialog.cpp:402
-msgid "<b>Average message length :</b> %1 characters<br>"
-msgstr "<b>平均消息长度：</b>%1 个字符<br>"
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 24
+#: rc.cpp:4388
+#, no-c-format
+msgid "Account Preferences - Gadu-Gadu"
+msgstr "账户首选项 - Gadu-Gadu"
 
-#: plugins/statistics/statisticsdialog.cpp:403
-msgid "<b>Time between two messages : </b> %1 second(s)"
-msgstr "<b>两条消息之间的时间：</b>%1 秒"
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 72
+#: rc.cpp:4397 rc.cpp:4542
+#, no-c-format
+msgid "Gadu-Gadu &UIN:"
+msgstr "Gadu-Gadu &UIN："
 
-#: plugins/statistics/statisticsdialog.cpp:407
-msgid "<b title=\"The last time you talked with %1\">Last talk :</b> %2<br>"
-msgstr "<b title=\"您与 %1 上次对话的时间\">上次对话：</b>%2<br>"
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 78
+#: rc.cpp:4400 rc.cpp:4406
+#, no-c-format
+msgid "The user ID of your Gadu-Gadu account."
+msgstr "您 Gadu-Gadu 账户的用户 ID。"
 
-#: plugins/statistics/statisticsdialog.cpp:408
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 81
+#: rc.cpp:4403 rc.cpp:4409
+#, no-c-format
 msgid ""
-"<b title=\"The last time I have seen %1 online or away\">"
-"Last time contact was present :</b> %2"
-msgstr "<b title=\"我上次看到 %1 在线或离开\">联系人上次出现：</b>%2"
-
-#: plugins/statistics/statisticsdialog.cpp:418
-msgid "Current status"
-msgstr "当前状态"
-
-#: plugins/statistics/statisticsdialog.cpp:419
-msgid "Is <b>%1</b> since <b>%2</b>"
-msgstr "自 <b>%2</b> 后为 <b>%1</b>"
-
-#: plugins/statistics/statisticsdialog.cpp:429
-msgid "When have I seen this contact ?"
-msgstr "我什么时候看过此联系人？"
-
-#: plugins/statistics/statisticsdialog.cpp:443
-msgid "Between %1:00 and %2:00, I was able to see %3 status %4% of the hour."
-msgstr "在 %1:00 和 %2:00 之间，我在 %4% 的时间看到 %3 的状态。"
-
-#: plugins/statistics/statisticsdialog.cpp:452
-msgid "Online time"
-msgstr "上线时间"
-
-#: plugins/statistics/statisticsdialog.cpp:452
-msgid "Away time"
-msgstr "离开时间"
-
-#: plugins/statistics/statisticsdialog.cpp:452
-msgid "Offline time"
-msgstr "下线时间"
-
-#: plugins/statistics/statisticsdialog.cpp:457
-msgid "online"
-msgstr "在线"
-
-#: plugins/statistics/statisticsdialog.cpp:459
-msgid "away"
-msgstr "离开"
-
-#: plugins/statistics/statisticsdialog.cpp:461
-msgid "offline"
-msgstr "离线"
-
-#: plugins/statistics/statisticsdialog.cpp:502
-msgid "Between %1:00 and %2:00, I have seen %3 %4% %5."
-msgstr "在 %1:00 和 %2:00，我看到了 %3 %4% %5。"
+"The user ID of your Gadu-Gadu account.  This should be in the form of a number "
+"(no decimals, no spaces)."
+msgstr "您 Gadu-Gadu 账户的用户 ID，其格式应为数字(无小数点，无空格)。"
 
-#: plugins/statistics/statisticsdialog.cpp:526
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 125
+#: rc.cpp:4415
+#, no-c-format
 msgid ""
-"_: 1 is date, 2 is contact name, 3 is online status\n"
-"%1, %2 was %3"
-msgstr "%1时%2 %3"
-
-#: plugins/statistics/statisticsplugin.cpp:46
-msgid "Statistics"
-msgstr "统计"
-
-#: plugins/statistics/statisticsplugin.cpp:55
-msgid "View &Statistics"
-msgstr "查看统计(&S)"
-
-#: plugins/smpppdcs/smpppdcsprefsimpl.cpp:97
-#: protocols/groupwise/ui/gwsearch.cpp:135
-msgid "Searching"
-msgstr "搜索"
-
-#: plugins/smpppdcs/smpppdcsprefsimpl.cpp:97
-msgid "Searching for a SMPPPD on the local network..."
-msgstr "正在搜索局域网中的 SMPPPD..."
-
-#: plugins/smpppdcs/smpppdcspreferences.cpp:57
-msgid "connection status is managed by Kopete"
-msgstr "连接状态由 Kopete 管理"
-
-#: plugins/smpppdcs/unittest/main.cpp:26 plugins/smpppdcs/unittest/main.cpp:31
-msgid "SMPPPDClientTests"
-msgstr "SMPPPDClientTests"
-
-#: plugins/autoreplace/autoreplacepreferences.cpp:46
-msgid "Text"
-msgstr "文本"
-
-#: plugins/autoreplace/autoreplacepreferences.cpp:47
-msgid "Replacement"
-msgstr "替换"
+"Check to disable automatic connection.  If checked, you may connect to this "
+"account manually using the icon in the bottom of the main Kopete window."
+msgstr "选中此处禁止自动连接。如果选中的话，您可以使用 Kopete 主窗口底部的图标手动连接此账户。"
 
-#: plugins/autoreplace/autoreplaceconfig.cpp:67
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 169
+#: rc.cpp:4421
+#, no-c-format
 msgid ""
-"_: list_of_words_to_replace\n"
-"ur,your,r,are,u,you,theres,there is,arent,are not,dont,do not"
-msgstr "ur,your,r,are,u,you,theres,there is,arent,are not,dont,do not"
-
-#: plugins/contactnotes/contactnotesedit.cpp:29
-msgid "Contact Notes"
-msgstr "联系人备注"
-
-#: plugins/contactnotes/contactnotesedit.cpp:36
-msgid "Notes about %1:"
-msgstr "关于 %1 的备注："
-
-#: plugins/contactnotes/contactnotesplugin.cpp:40
-msgid "&Notes"
-msgstr "备注(&N)"
-
-#: protocols/irc/ui/irceditaccountwidget.cpp:177
-msgid "Remove Command"
-msgstr "删除命令"
-
-#: protocols/irc/ui/irceditaccountwidget.cpp:185
-msgid "Remove CTCP Reply"
-msgstr "删除 CTCP 回复"
-
-#: protocols/irc/ui/irceditaccountwidget.cpp:275
-msgid "<qt>You must enter a nickname.</qt>"
-msgstr "<qt>您必须输入一个有效的昵称。</qt>"
-
-#: protocols/irc/ui/channellist.cpp:182
-msgid " members"
-msgstr " 成员"
-
-#: protocols/irc/ui/channellist.cpp:190 protocols/irc/ui/channellist.cpp:211
-msgid "Channel"
-msgstr "频道"
-
-#: protocols/irc/ui/channellist.cpp:191 protocols/irc/ui/channellist.cpp:212
-msgid "Users"
-msgstr "用户"
-
-#: protocols/irc/ircprotocol.cpp:152 protocols/irc/ui/channellist.cpp:193
-#: protocols/irc/ui/channellist.cpp:213
-msgid "Topic"
-msgstr "话题"
-
-#: protocols/irc/ui/channellist.cpp:200
-msgid "Search for:"
-msgstr "搜索："
+"To connect to the Gadu-Gadu network, you will need a Gadu-Gadu account."
+"<br>"
+"<br>\n"
+"If you do not currently have an account, please click the button to create one."
+msgstr ""
+"要连接到 Gadu-Gadu 网络，您必须有一个 Gadu-Gadu 账户。"
+"<br>"
+"<br>\n"
+"如果您从未申请过 Gadu-Gadu 账户，请点击上面的注册按钮。"
 
-#: protocols/irc/ui/channellist.cpp:201 protocols/irc/ui/channellist.cpp:205
-msgid ""
-"You may search for channels on the IRC server for a text string entered here."
-msgstr "您可搜索 IRC 服务器中包含在此输入的字符串的频道。"
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 260
+#: rc.cpp:4440
+#, no-c-format
+msgid "&Use direct connections (DCC)"
+msgstr "使用直接连接(DCC)(&U)"
 
-#: protocols/irc/ui/channellist.cpp:202 protocols/irc/ui/channellist.cpp:203
-msgid "Channels returned must have at least this many members."
-msgstr "返回的频道必须至少有这么多成员。"
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 279
+#: rc.cpp:4443
+#, no-c-format
+msgid "Use protocol encr&yption (SSL):"
+msgstr "使用协议加密(SSL)(&Y)："
 
-#: protocols/irc/ui/channellist.cpp:204 protocols/irc/ui/channellist.cpp:206
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 285
+#: rc.cpp:4446 rc.cpp:4461
+#, no-c-format
 msgid ""
-"You may search for channels on the IRC server for a text string entered here.  "
-"For instance, you may type 'linux' to find channels that have something to do "
-"with linux."
-msgstr "您可搜索 IRC 服务器中包含在此输入的字符串的频道。例如，您可以输入“linux”，这样可以找到与 linux 相关的频道。"
-
-#: protocols/gadu/gadupubdir.cpp:103 protocols/gadu/gadupubdir.cpp:280
-#: protocols/irc/ui/channellist.cpp:207
-msgid "S&earch"
-msgstr "搜索(&E)"
-
-#: protocols/irc/ui/channellist.cpp:208
-msgid "Perform a channel search."
-msgstr "执行频道搜索。"
+"Whether or not you want to enable SSL encrypted communication with the server."
+msgstr "您是否要在与服务器通讯时启用 SSL 加密。"
 
-#: protocols/irc/ui/channellist.cpp:209
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 288
+#: rc.cpp:4449 rc.cpp:4464
+#, no-c-format
 msgid ""
-"Perform a channel search.  Please be patient, as this can be slow depending on "
-"the number of channels on the server."
-msgstr "执行频道搜索。请稍候，根据服务器频道的多少，搜索的速度可能有快慢之别。"
-
-#: protocols/irc/ui/channellist.cpp:210
-msgid "Double click on a channel to select it."
-msgstr "双击频道可加以选择。"
-
-#: protocols/irc/ui/channellist.cpp:255
-msgid "You have been disconnected from the IRC server."
-msgstr "您已经断开到 IRC 服务器的连接。"
-
-#: protocols/irc/ui/channellist.cpp:256
-msgid "Disconnected"
-msgstr "已断开连接"
-
-#: protocols/irc/ui/channellist.cpp:303
-msgid "You must be connected to the IRC server to perform a channel listing."
-msgstr "您必须要连接到 IRC 服务器上才能执行频道监听。"
-
-#: protocols/irc/ircusercontact.cpp:188
-msgid "%1 is away (%2)"
-msgstr "%1 离开了(%2)"
-
-#: protocols/irc/ircservercontact.cpp:95 protocols/irc/ircusercontact.cpp:219
-msgid "%1 @ %2"
-msgstr "%1 @ %2"
-
-#: protocols/irc/ircusercontact.cpp:417
-msgid "True"
-msgstr "真"
-
-#: protocols/irc/ircusercontact.cpp:435
-msgid "%1 is (%2@%3): %4<br/>"
-msgstr "%1 是(%2@%3)：%4<br/>"
-
-#: protocols/irc/ircusercontact.cpp:442
-msgid "%1 is authenticated with NICKSERV<br/>"
-msgstr "%1 已经用 NICKSERV 进行了身份验证<br/>"
+"Whether or not you want to enable SSL encrypted communication with the server.  "
+"Note that this is not end-to-end encryption, but rather encrypted communication "
+"with the server."
+msgstr "您是否要在与服务器通讯时启用 SSL 加密。请注意，这不是端到端的加密，而只是与服务器的通讯加密。"
 
-#: protocols/irc/ircusercontact.cpp:445
-msgid "%1 is an IRC operator<br/>"
-msgstr "%1 是一名 IRC 操作员<br/>"
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 294
+#: rc.cpp:4452
+#, no-c-format
+msgid "If Available"
+msgstr "若可用"
 
-#: protocols/irc/ircusercontact.cpp:448
-msgid "on channels %1<br/>"
-msgstr "在频道 %1<br/>"
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 299
+#: rc.cpp:4455
+#, no-c-format
+msgid "Required"
+msgstr "按需"
 
-#: protocols/irc/ircusercontact.cpp:451
-msgid "on IRC via server %1 ( %2 )<br/>"
-msgstr "在 IRC 服务器 %1 ( %2 )<br/>"
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 304
+#: libkopete/tdeabcpersistence.cpp:342 rc.cpp:4458
+#, no-c-format
+msgid "Do Not Use"
+msgstr "不使用"
 
-#: protocols/irc/ircusercontact.cpp:455
-msgid "idle: %2<br/>"
-msgstr "发呆：%2<br/>"
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 333
+#: rc.cpp:4467
+#, no-c-format
+msgid "C&ache server information"
+msgstr "缓存服务器信息(&A)"
 
-#: protocols/irc/ircusercontact.cpp:468
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 339
+#: rc.cpp:4470
+#, no-c-format
 msgid ""
-"%1 was (%2@%3): %4\n"
-msgstr ""
-"%1 是(%2@%3)：%4\n"
+"Cache connection information for each server connected to in case the main "
+"load-balancing server fails."
+msgstr "缓存每个服务器的连接信息，以防主负载均衡服务器宕机。"
 
-#: protocols/irc/ircusercontact.cpp:474
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 342
+#: rc.cpp:4473
+#, no-c-format
 msgid ""
-"Last Online: %1\n"
+"This option is used whenever the primary Gadu-Gadu load-balancing server fails. "
+" If this is checked, Kopete will try to connect to the actual servers directly "
+"using cached information about them.  This prevents connection errors when the "
+"main load-balancing server does not answer. In practice it only helps very "
+"rarely."
 msgstr ""
-"上次在线：%1\n"
-
-#: protocols/irc/ircusercontact.cpp:538
-msgid "C&TCP"
-msgstr "C&TCP"
-
-#: protocols/irc/ircusercontact.cpp:539
-msgid "&Version"
-msgstr "版本(&V)"
-
-#: protocols/irc/ircusercontact.cpp:541
-msgid "&Ping"
-msgstr "&Ping"
-
-#: protocols/irc/ircusercontact.cpp:544
-msgid "&Modes"
-msgstr "管理(&M)"
-
-#: protocols/irc/ircusercontact.cpp:545
-msgid "&Op"
-msgstr "&Op"
-
-#: protocols/irc/ircusercontact.cpp:547
-msgid "&Deop"
-msgstr "&Deop"
-
-#: protocols/irc/ircusercontact.cpp:549
-msgid "&Voice"
-msgstr "语音(&V)"
-
-#: protocols/irc/ircusercontact.cpp:551
-msgid "Devoice"
-msgstr "取消语音"
-
-#: protocols/irc/ircusercontact.cpp:555
-msgid "&Kick"
-msgstr "踢出(&K)"
-
-#: protocols/irc/ircusercontact.cpp:558
-msgid "&Ban"
-msgstr "屏蔽(&B)"
-
-#: protocols/irc/ircusercontact.cpp:559
-msgid "Host (*!*@host.domain.net)"
-msgstr "主机(*!*@host.domain.net)"
-
-#: protocols/irc/ircusercontact.cpp:561
-msgid "Domain (*!*@*.domain.net)"
-msgstr "域名(*!*@*.domain.net)"
-
-#: protocols/irc/ircusercontact.cpp:563
-msgid "User@Host (*!*user@host.domain.net)"
-msgstr "用户@主机(*!*user@host.domain.net)"
-
-#: protocols/irc/ircusercontact.cpp:565
-msgid "User@Domain (*!*user@*.domain.net)"
-msgstr "用户@域名(*!*user@*.domain.net)"
-
-#: protocols/irc/ircchannelcontact.cpp:683
-#: protocols/irc/ircusercontact.cpp:569
-msgid "&Encoding"
-msgstr "编码(&E)"
+"当主 Gadu-Gadu 负载均衡服务器宕机时，会使用此选项。如果选中了此选项，Kopete "
+"将会试图按照缓存的信息直接连接到实际服务器。当主负载均衡服务器不响应时，这样将会避免连接错误。不过从实际上来说，发生这种情况的可能性微乎其微。"
 
-#: protocols/irc/irccontact.cpp:189
-msgid "Quit: \"%1\" "
-msgstr "退出：“%1” "
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 353
+#: rc.cpp:4476
+#, no-c-format
+msgid "Ignore people off your contact list"
+msgstr "忽略不在您的联系人列表中的人"
 
-#: protocols/irc/libkirc/kirctransfer.cpp:359
-msgid "Acknowledge size is greater than the expected file size"
-msgstr "承认的大小比期待的文件大小要大"
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 371
+#: rc.cpp:4479
+#, no-c-format
+msgid "U&ser Information"
+msgstr "用户信息(&S)"
 
-#: protocols/irc/libkirc/ksslsocket.cpp:367
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 397
+#: rc.cpp:4482
+#, no-c-format
 msgid ""
-"The IP address of the host %1 does not match the one the certificate was issued "
-"to."
-msgstr "主机 %1 的 IP 地址与证书发行时的地址不同。"
-
-#: protocols/irc/libkirc/ksslsocket.cpp:372
-#: protocols/irc/libkirc/ksslsocket.cpp:382
-#: protocols/irc/libkirc/ksslsocket.cpp:403
-msgid "Server Authentication"
-msgstr "服务器身份验证"
+"<p align=\"center\">You must be connected to change your Personal "
+"Information.</p>"
+msgstr "<p align=\"center\">要更改您的个人信息，您必须先连接。</p>"
 
-#: protocols/irc/libkirc/ksslsocket.cpp:373
-#: protocols/irc/libkirc/ksslsocket.cpp:383
-msgid "&Details"
-msgstr "细节(&D)"
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 408
+#: rc.cpp:4485
+#, no-c-format
+msgid "User Information"
+msgstr "用户信息"
 
-#: protocols/irc/libkirc/ksslsocket.cpp:374
-#: protocols/irc/libkirc/ksslsocket.cpp:384
-msgid "Co&ntinue"
-msgstr "继续(&N)"
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 451
+#: rc.cpp:4494
+#, no-c-format
+msgid "Your nick name:"
+msgstr "您的昵称："
 
-#: protocols/irc/libkirc/ksslsocket.cpp:378
-msgid "The server certificate failed the authenticity test (%1)."
-msgstr "服务器证书进行身份验证测试失败(%1)。"
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 467
+#: rc.cpp:4500
+#, no-c-format
+msgid "Year of birth:"
+msgstr "出生年份："
 
-#: protocols/irc/libkirc/ksslsocket.cpp:400
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 560
+#: rc.cpp:4512
+#, no-c-format
 msgid ""
-"Would you like to accept this certificate forever without being prompted?"
-msgstr "您是否想要永远接收此证书，而不再提示？"
-
-#: protocols/irc/libkirc/ksslsocket.cpp:404
-msgid "&Forever"
-msgstr "永远(&F)"
-
-#: protocols/irc/libkirc/ksslsocket.cpp:405
-msgid "&Current Sessions Only"
-msgstr "只对当前会话(&C)"
-
-#: protocols/irc/ircaddcontactpage.cpp:74
-msgid "<qt>You need to specify a channel to join, or query to open.</qt>"
-msgstr "<qt>您需要指定要加入的聊天室，或要打开的查询。</qt>"
-
-#: protocols/irc/ircaddcontactpage.cpp:74
-msgid "You Must Specify a Channel"
-msgstr "您必须指定一个聊天室"
-
-#: protocols/irc/ircaccount.cpp:82
-msgid "Kopete IRC Plugin %1 [http://kopete.kde.org]"
-msgstr "Kopete IRC 插件 %1 [http://kopete.kde.org]"
-
-#: protocols/irc/ircaccount.cpp:112
-msgid "Set Away"
-msgstr "设置离开"
-
-#: protocols/irc/ircaccount.cpp:176
-#, c-format
-msgid "Temporary Network - %1"
-msgstr "临时网络 - %1"
-
-#: protocols/irc/ircaccount.cpp:177
-msgid "Network imported from previous version of Kopete, or an IRC URI"
-msgstr "从 Kopete 先前版本导入的网络，或者 IRC URI"
-
-#: protocols/irc/ircaccount.cpp:210
-msgid "Join Channel..."
-msgstr "加入频道..."
-
-#: protocols/irc/ircaccount.cpp:212
-msgid "Search Channels..."
-msgstr "搜索频道..."
+"Values below are going to be used in search, but will not appear in results."
+msgstr "下面的值将会用于搜索，但不会出现在结果中。"
 
-#: protocols/irc/ircaccount.cpp:219
-msgid "Plugin Unloaded"
-msgstr "插件已卸载"
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 601
+#: rc.cpp:4515
+#, no-c-format
+msgid "Maiden name:"
+msgstr "婚前性："
 
-#: protocols/irc/ircaccount.cpp:228 protocols/irc/ircaccount.cpp:246
-#: protocols/irc/ircaccount.cpp:698 protocols/irc/ircaccount.cpp:785
-#: protocols/irc/ircchannelcontact.cpp:442
-#: protocols/irc/ircchannelcontact.cpp:568
-#: protocols/irc/ircchannelcontact.cpp:575
-#: protocols/irc/ircchannelcontact.cpp:583
-#: protocols/irc/ircchannelcontact.cpp:589
-msgid "IRC Plugin"
-msgstr "IRC 插件"
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 609
+#: rc.cpp:4518
+#, no-c-format
+msgid "City of origin:"
+msgstr "出生城市："
 
-#: protocols/irc/ircaccount.cpp:229
-msgid "The nickname %1 is already in use. Please enter an alternate nickname:"
-msgstr "昵称 %1 已在使用中。请输入备选的昵称："
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 651
+#: rc.cpp:4521
+#, no-c-format
+msgid "&File Transfer"
+msgstr "文件传送(&F)"
 
-#: protocols/irc/ircaccount.cpp:246
-msgid "The nickname %1 is already in use"
-msgstr "昵称 %1 已在使用中"
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 665
+#: rc.cpp:4524
+#, no-c-format
+msgid "Global DCC Options"
+msgstr "全局 DCC 选项"
 
-#: protocols/irc/ircaccount.cpp:308
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 676
+#: rc.cpp:4527
+#, no-c-format
 msgid ""
-"<qt>The network associated with this account, <b>%1</b>"
-", no longer exists. Please ensure that the account has a valid network. The "
-"account will not be enabled until you do so.</qt>"
-msgstr "<qt>与此账户关联的网络 <b>%1</b> 不再存在。请确定账户的网络有效。直到您确认网络之后，此账户才会启用。</qt>"
+"<qt><p align=\"center\"><font color=\"#ff0000\">These options affect <b>all</b> "
+"Gadu-Gadu accounts.</font></p></qt>"
+msgstr ""
+"<qt><p align=\"center\"><font color=\"#ff0000\">这些选项影响<b>全部</b> "
+"Gadu-Gadu 账户。</font></p></qt>"
 
-#: protocols/irc/ircaccount.cpp:310
-#, c-format
-msgid "Problem Loading %1"
-msgstr "装入 %1 出现问题"
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 684
+#: rc.cpp:4530
+#, no-c-format
+msgid "&Override default configuration"
+msgstr "覆盖默认配置(&O)"
 
-#: protocols/irc/ircaccount.cpp:429
-msgid "Show Server Window"
-msgstr "显示服务器窗口"
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 714
+#: rc.cpp:4533
+#, no-c-format
+msgid "Local &IP address /"
+msgstr "本地 IP 地址(&I) /"
 
-#: protocols/irc/ircaccount.cpp:433
-msgid "Show Security Information"
-msgstr "显示安全信息"
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 728
+#: rc.cpp:4536
+#, no-c-format
+msgid "po&rt:"
+msgstr "端口(&R)："
 
-#: protocols/irc/ircaccount.cpp:458
-msgid ""
-"<qt>The network associated with this account, <b>%1</b>"
-", has no valid hosts. Please ensure that the account has a valid network.</qt>"
-msgstr "<qt>与此账户关联的网络 <b>%1</b> 没有有效的主机。请确定账户的网络有效。</qt>"
+#. i18n: file ./protocols/gadu/ui/gadueditaccountui.ui line 752
+#: rc.cpp:4539
+#, no-c-format
+msgid "0.0.0.0"
+msgstr "0.0.0.0"
 
-#: protocols/irc/ircaccount.cpp:459
-msgid "Network is Empty"
-msgstr "网络为空"
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 55
+#: rc.cpp:4545 rc.cpp:4551
+#, no-c-format
+msgid "The user ID of the Gadu-Gadu account you would like to add."
+msgstr "您想要添加的 Gadu-Gadu 账户的用户 ID。"
 
-#: protocols/irc/ircaccount.cpp:465
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 58
+#: rc.cpp:4548 rc.cpp:4554
+#, no-c-format
 msgid ""
-"<qt>Kopete could not connect to any of the servers in the network associated "
-"with this account (<b>%1</b>). Please try again later.</qt>"
-msgstr "<qt>Kopete 无法连接到与此账户(<b>%1</b>)关联的网络。请稍后再试。</qt>"
-
-#: protocols/irc/ircaccount.cpp:466
-msgid "Network is Unavailable"
-msgstr "网络不可用"
-
-#: protocols/irc/ircaccount.cpp:493
-msgid "Connecting to %1..."
-msgstr "正在连接到 %1..."
-
-#: protocols/irc/ircaccount.cpp:495
-msgid "Using SSL"
-msgstr "使用 SSL"
-
-#: protocols/irc/ircaccount.cpp:590
-msgid "The IRC server is currently too busy to respond to this request."
-msgstr "IRC 目前正忙，无法响应此请求。"
-
-#: protocols/irc/ircaccount.cpp:591
-msgid "Server is Busy"
-msgstr "服务器忙"
+"The user ID of the Gadu-Gadu account you would like to add.  This should be in "
+"the form of a number (no decimals, no spaces).  This field is mandatory."
+msgstr "您想要添加的 Gadu-Gadu 账户的用户 ID，其格式应为数字(没有小数点，没有空格)。此域是必需的。"
 
-#: protocols/irc/ircaccount.cpp:600
-#, c-format
-msgid "Channel List for %1"
-msgstr "%1 的频道列表"
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 79
+#: rc.cpp:4557
+#, no-c-format
+msgid "<i>(for example: 1234567)</i>"
+msgstr "<i>(例如：1234567)</i>"
 
-#: protocols/irc/ircaccount.cpp:698
-msgid "\"You are not allowed to add yourself to your contact list."
-msgstr "您不能将您自己添加到您的联系人列表中。"
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 109
+#: rc.cpp:4560
+#, no-c-format
+msgid "&Forename:"
+msgstr "名(&F)："
 
-#: protocols/irc/ircaccount.cpp:751
-msgid "Please enter name of the channel you want to join:"
-msgstr "请输入您想要加入的频道名称："
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 115
+#: rc.cpp:4563 rc.cpp:4605
+#, no-c-format
+msgid "The forename of the contact you wish to add."
+msgstr "您想要添加的联系人的名。"
 
-#: protocols/irc/ircaccount.cpp:784 protocols/irc/ircprotocol.cpp:538
-#: protocols/irc/ircprotocol.cpp:558
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 118
+#: rc.cpp:4566 rc.cpp:4608
+#, no-c-format
 msgid ""
-"\"%1\" is an invalid channel. Channels must start with '#', '!', '+', or '&'."
-msgstr "“%1”是无效的频道。频道必须以“#”、“!”、“+”或“&”开头。"
-
-#: protocols/irc/ircaccount.cpp:792
-msgid "CTCP %1 REPLY: %2"
-msgstr "CTCP %1 REPLY：%2"
+"The forename (first name) of the contact you wish to add.  Optionally this may "
+"include a middle name."
+msgstr "您想要添加的联系人的名。这里也可以包含中间名。"
 
-#: protocols/irc/ircaccount.cpp:798
-msgid "The channel \"%1\" does not exist"
-msgstr "频道“%1”不存在"
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 129
+#: rc.cpp:4569
+#, no-c-format
+msgid "&Surname:"
+msgstr "姓(&S)："
 
-#: protocols/irc/ircaccount.cpp:800
-msgid "The nickname \"%1\" does not exist"
-msgstr "昵称“%1”不存在"
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 135
+#: rc.cpp:4572 rc.cpp:4611
+#, no-c-format
+msgid "The surname of the contact you wish to add."
+msgstr "您想要添加的联系人的姓。"
 
-#: protocols/irc/ircservercontact.cpp:106
-msgid "KIRC Error - Parse error: "
-msgstr "KIRC 错误 - 分析错误： "
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 138
+#: rc.cpp:4575 rc.cpp:4614
+#, no-c-format
+msgid "The surname (last name) of the contact you wish to add."
+msgstr "您想要添加的联系人的姓。"
 
-#: protocols/irc/ircservercontact.cpp:109
-msgid "KIRC Error - Unknown command: "
-msgstr "KIRC 错误 - 未知命令： "
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 154
+#: rc.cpp:4578 rc.cpp:4755
+#, no-c-format
+msgid "N&ickname:"
+msgstr "昵称(&I)："
 
-#: protocols/irc/ircservercontact.cpp:112
-msgid "KIRC Error - Unknown numeric reply: "
-msgstr "KIRC 错误 - 未知数字回复： "
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 160
+#: rc.cpp:4581 rc.cpp:4584 rc.cpp:4617 rc.cpp:4620
+#, no-c-format
+msgid "A nickname for the contact you wish to add."
+msgstr "您想要添加的联系人的昵称。"
 
-#: protocols/irc/ircservercontact.cpp:115
-msgid "KIRC Error - Invalid number of arguments: "
-msgstr "KIRC 错误 - 无效的参数数目： "
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 182
+#: rc.cpp:4587
+#, no-c-format
+msgid "&Email address:"
+msgstr "电子邮件地址(&E)："
 
-#: protocols/irc/ircservercontact.cpp:118
-msgid "KIRC Error - Method failed: "
-msgstr "KIRC 错误 - 方法失败： "
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 188
+#: rc.cpp:4590 rc.cpp:4593 rc.cpp:4599 rc.cpp:4602 rc.cpp:4623 rc.cpp:4626
+#: rc.cpp:4629 rc.cpp:4632
+#, no-c-format
+msgid "E-Mail address for this contact."
+msgstr "此联系人的电子邮件地址。"
 
-#: protocols/irc/ircservercontact.cpp:121
-msgid "KIRC Error - Unknown error: "
-msgstr "KIRC 错误 - 未知错误： "
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 311
+#: rc.cpp:4635
+#, no-c-format
+msgid "Offline to contact when you set \"&Just for friends\""
+msgstr "设置“只对好友”时对此联系人离线(&J)"
 
-#: protocols/irc/ircservercontact.cpp:131
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 314
+#: rc.cpp:4638 rc.cpp:4641
+#, no-c-format
 msgid ""
-"You can not talk to the server, you can only issue commands here. Type /help "
-"for supported commands."
-msgstr "您无法与服务器交谈，您只能在此使用命令。请输入 /help 查看支持的命令。"
-
-#: protocols/irc/ircservercontact.cpp:150
-#: protocols/irc/ircservercontact.cpp:164
-msgid "NOTICE from %1: %2"
-msgstr "来自 %1 的 NOTICE：%2"
-
-#: protocols/irc/ircservercontact.cpp:158
-msgid "NOTICE from %1 (%2): %3"
-msgstr "来自 %1(%2) 的 NOTICE：%3"
-
-#: protocols/irc/ircchannelcontact.cpp:62
-msgid "Only Operators Can Change &Topic"
-msgstr "只有管理员可更改话题(&T)"
-
-#: protocols/irc/ircchannelcontact.cpp:63
-msgid "&No Outside Messages"
-msgstr "无送出的消息(&N)"
-
-#: protocols/irc/ircchannelcontact.cpp:64
-msgid "&Secret"
-msgstr "绝密(&S)"
-
-#: protocols/irc/ircchannelcontact.cpp:65
-msgid "&Moderated"
-msgstr "监管(&M)"
-
-#: protocols/irc/ircchannelcontact.cpp:66
-msgid "&Invite Only"
-msgstr "凭邀请(&I)"
-
-#: protocols/irc/ircchannelcontact.cpp:275
-msgid "Topic for %1 is set empty."
-msgstr "%1 的话题为空。"
-
-#: protocols/irc/ircchannelcontact.cpp:280
-msgid "Topic for %1 is %2"
-msgstr "%1 的话题为 %2"
-
-#: protocols/irc/ircchannelcontact.cpp:365
-#, c-format
-msgid "You have joined channel %1"
-msgstr "您已经加入了频道 %1"
-
-#: protocols/irc/ircchannelcontact.cpp:381
-msgid "User <b>%1</b> joined channel %2"
-msgstr "用户 <b>%1</b> 加入了频道 %2"
-
-#: protocols/irc/ircchannelcontact.cpp:416
-msgid "%1 was kicked by %2. Reason: %3"
-msgstr "%1 被 %2 踢出。原因：%3"
-
-#: protocols/irc/ircchannelcontact.cpp:418
-msgid "%1 was kicked by %2."
-msgstr "%1 被 %2 踢出。"
-
-#: protocols/irc/ircchannelcontact.cpp:437
-msgid "You were kicked from %1 by %2. Reason: %3"
-msgstr "您被 %2 从 %1 中踢出。原因：%3"
-
-#: protocols/irc/ircchannelcontact.cpp:439
-msgid "You were kicked from %1 by %2."
-msgstr "您被 %2 从 %1 中踢出。"
-
-#: protocols/irc/ircchannelcontact.cpp:459
-msgid "New Topic"
-msgstr "新话题"
-
-#: protocols/irc/ircchannelcontact.cpp:459
-msgid "Enter the new topic:"
-msgstr "输入新话题："
-
-#: protocols/irc/ircchannelcontact.cpp:471
-msgid "You must be a channel operator on %1 to do that."
-msgstr "要完成这一操作，您必须是 %1 的频道管理员。"
-
-#: protocols/irc/ircchannelcontact.cpp:486
-msgid "%1 has changed the topic to: %2"
-msgstr "%1 已经将话题改为：%2"
+"Check if you want to exclude this contact from the \"Just for friends\" status "
+"mode."
+msgstr "如果您想要将此联系人排除在“只对好友”状态模式之外，请选中此处。"
 
-#: protocols/irc/ircchannelcontact.cpp:497
-msgid "Topic set by %1 at %2"
-msgstr "%1 在 %2 设置了话题"
+#. i18n: file ./protocols/gadu/ui/gaduadd.ui line 323
+#: rc.cpp:4644
+#, no-c-format
+msgid "Group"
+msgstr "组"
 
-#: protocols/irc/ircchannelcontact.cpp:506
-msgid "%1 sets mode %2 on %3"
-msgstr "%1 将 %3 的模式设置为 %2"
+#. i18n: file ./protocols/irc/ui/ircadd.ui line 59
+#: rc.cpp:4653
+#, no-c-format
+msgid "N&ickname/channel to add:"
+msgstr "要添加的昵称/频道(&I)："
 
-#: protocols/irc/ircchannelcontact.cpp:567
-msgid "<qt>You can not join %1 because you have been banned.</qt>"
-msgstr "<qt>您无法加入 %1，因为您被屏蔽了。</qt>"
+#. i18n: file ./protocols/irc/ui/ircadd.ui line 65
+#: rc.cpp:4656 rc.cpp:4662
+#, no-c-format
+msgid "The name of the IRC contact or channel you would like to add."
+msgstr "您想要添加的 IRC 联系人或频道的名称。"
 
-#: protocols/irc/ircchannelcontact.cpp:575
+#. i18n: file ./protocols/irc/ui/ircadd.ui line 68
+#: rc.cpp:4659
+#, no-c-format
 msgid ""
-"<qt>You can not join %1 because it is set to invite only, and no one has "
-"invited you.</qt>"
-msgstr "<qt>您无法加入 %1，因为您没有受到邀请。</qt>"
-
-#: protocols/irc/ircchannelcontact.cpp:582
-msgid "<qt>You can not join %1 because it has reached its user limit.</qt>"
-msgstr "<qt>您无法加入 %1，因为该频道人数已满。</qt>"
-
-#: protocols/irc/ircchannelcontact.cpp:590
-msgid "Please enter key for channel %1: "
-msgstr "请输入频道 %1 的密钥： "
-
-#: protocols/irc/ircchannelcontact.cpp:662
-msgid "&Part"
-msgstr "参与(&P)"
-
-#: protocols/irc/ircchannelcontact.cpp:663
-msgid "Change &Topic..."
-msgstr "更改话题(&T)..."
-
-#: protocols/irc/ircchannelcontact.cpp:664
-msgid "Channel Modes"
-msgstr "频道模式"
-
-#: protocols/irc/ircchannelcontact.cpp:668
-msgid "Visit &Homepage"
-msgstr "浏览主页(&H)"
-
-#: protocols/irc/ircprotocol.cpp:121 protocols/irc/ircprotocol.cpp:127
-msgid "Op"
-msgstr "Op"
-
-#: protocols/irc/ircprotocol.cpp:133
-msgid "Voice"
-msgstr "语音"
-
-#: protocols/irc/ircprotocol.cpp:154
-msgid "Home Page"
-msgstr "主页"
-
-#: protocols/irc/ircprotocol.cpp:156
-msgid "IRC User"
-msgstr "IRC 用户"
-
-#: protocols/irc/ircprotocol.cpp:157
-msgid "IRC Server"
-msgstr "IRC 服务器"
-
-#: protocols/irc/ircprotocol.cpp:158
-msgid "IRC Channels"
-msgstr "IRC 频道"
-
-#: protocols/irc/ircprotocol.cpp:159
-msgid "IRC Hops"
-msgstr "IRC Hops"
-
-#: protocols/irc/ircprotocol.cpp:161
-msgid "User Is Authenticated"
-msgstr "用户已通过身份验证"
-
-#: protocols/irc/ircprotocol.cpp:173
-msgid "USAGE: /raw <text> - Sends the text in raw form to the server."
-msgstr "用法：/raw <文本> - 将文本原样发送给服务器。"
-
-#: protocols/irc/ircprotocol.cpp:177
-msgid "USAGE: /quote <text> - Sends the text in quoted form to the server."
-msgstr "用法：/quote <文本> - 将文本以引用格式发送给服务器。"
-
-#: protocols/irc/ircprotocol.cpp:181
-msgid "USAGE: /ctcp <nick> <message> - Send the CTCP message to nick<action>."
-msgstr "用法：/ctcp <昵称> <消息> - 对给定昵称发送 CTCP 消息动作。"
-
-#: protocols/irc/ircprotocol.cpp:185
-msgid "USAGE: /ping <nickname> - Alias for /CTCP <nickname> PING."
-msgstr "用法：/ping <昵称> - /CTCP <昵称> PING 的替换写法。"
+"The name of the IRC contact or channel you would like to add.  You may type "
+"simply the text of a person's nickname, or you may type a channel name, "
+"preceded by a pound sign ('#')."
+msgstr "您想要添加的 IRC 联系人或频道的名称。您可以简单的输入别人的昵称，或者输入以井号“#”开头的频道名。"
 
-#: protocols/irc/ircprotocol.cpp:189
+#. i18n: file ./protocols/irc/ui/ircadd.ui line 79
+#: rc.cpp:4665
+#, no-c-format
 msgid ""
-"USAGE: /motd [<server>] - Shows the message of the day for the current or the "
-"given server."
-msgstr "用法：/motd [<服务器>] - 显示指定服务器的当日消息。"
+"The name of the IRC contact or channel you would like to add.  You may type "
+"simply the text of a person's nickname, or you may type a channel name, "
+"preceded by a pound sign ('#')"
+msgstr "您想要添加的 IRC 联系人或频道的名称。您可以简单的输入别人的昵称，或者输入以井号“#”开头的频道名"
 
-#: protocols/irc/ircprotocol.cpp:193
-msgid "USAGE: /list - List the public channels on the server."
-msgstr "用法：/list - 列出当前服务器上的公开频道列表。"
+#. i18n: file ./protocols/irc/ui/ircadd.ui line 89
+#: rc.cpp:4668
+#, no-c-format
+msgid "<i>(for example: joe_bob or #somechannel)</i>"
+msgstr "<i>(例如：张三 或 #somechannel)</i>"
 
-#: protocols/irc/ircprotocol.cpp:197
-msgid "USAGE: /join <#channel 1> [<password>] - Joins the specified channel."
-msgstr "用法：/join <#频道 1> [<密码>] - 加入指定的频道。"
+#. i18n: file ./protocols/irc/ui/ircadd.ui line 119
+#: rc.cpp:4671
+#, no-c-format
+msgid "&Search Channels"
+msgstr "搜索频道(&S)"
 
-#: protocols/irc/ircprotocol.cpp:201
-msgid ""
-"USAGE: /topic [<topic>] - Sets and/or displays the topic for the active "
-"channel."
-msgstr "用法：/topic [<话题>] - 设定并/或显示此活动频道的讨论话题。"
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 16
+#: rc.cpp:4674
+#, no-c-format
+msgid "Network Configuration"
+msgstr "网络配置"
 
-#: protocols/irc/ircprotocol.cpp:206
-msgid "USAGE: /whois <nickname> - Display whois info on this user."
-msgstr "用法：/whois <昵称> - 显示此用户的 whois 信息。"
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 40
+#: rc.cpp:4677
+#, no-c-format
+msgid "&Description:"
+msgstr "描述(&D)："
 
-#: protocols/irc/ircprotocol.cpp:210
-msgid "USAGE: /whowas <nickname> - Display whowas info on this user."
-msgstr "用法：/whowas <昵称> - 显示此用户的 whowas 信息。"
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 62
+#: rc.cpp:4680
+#, no-c-format
+msgid "Host Con&figuration"
+msgstr "主机配置(&F)"
 
-#: protocols/irc/ircprotocol.cpp:214
-msgid "USAGE: /who <nickname|channel> - Display who info on this user/channel."
-msgstr "用法：/who <昵称|频道> - 显示此用户或频道的 who 信息。"
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 81
+#: rc.cpp:4683
+#, no-c-format
+msgid "The IRC servers associated with this network"
+msgstr "与此网站关联的 IRC 服务器"
 
-#: protocols/irc/ircprotocol.cpp:218
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 84
+#: rc.cpp:4686
+#, no-c-format
 msgid ""
-"USAGE: /query <nickname> [<message>] - Open a private chat with this user."
-msgstr "用法：/query <昵称> [<消息>] - 对某一用户开启私聊。"
-
-#: protocols/irc/ircprotocol.cpp:222
-msgid "USAGE: /mode <channel> <modes> - Set modes on the given channel."
-msgstr "用法：/mode <频道名> <模式> - 设定指定频道的属性模式。"
-
-#: protocols/irc/ircprotocol.cpp:226
-msgid "USAGE: /nick <nickname> - Change your nickname to the given one."
-msgstr "用法：/nick <昵称> - 改变您的昵称。"
+"The IRC servers associated with this network. Use the up and down buttons to "
+"alter the order in which connections are attempted."
+msgstr "与此网络关联的 IRC 服务器。使用上下按钮可切换连接尝试的顺序。"
 
-#: protocols/irc/ircprotocol.cpp:230
-msgid "USAGE: /me <action> - Do something."
-msgstr "用法：/me <动作> - 做动作。"
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 95
+#: rc.cpp:4689
+#, no-c-format
+msgid "Most IRC servers do not require a password"
+msgstr "大多数 IRC 服务器不需要密码"
 
-#: protocols/irc/ircprotocol.cpp:234
-msgid "USAGE: /ame <action> - Do something in every open chat."
-msgstr "用法：/ame <动作> - 在所有已打开的对话中做动作。"
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 139
+#: rc.cpp:4698
+#, no-c-format
+msgid "&Host:"
+msgstr "主机(&H)："
 
-#: protocols/irc/ircprotocol.cpp:238
-msgid ""
-"USAGE: /kick <nickname> [<reason>] - Kick someone from the channel (requires "
-"operator status)."
-msgstr "用法：/kick <昵称> [<原因>] - 将某人从频道中踢出(需要操作员身份来执行)。"
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 161
+#: rc.cpp:4701
+#, no-c-format
+msgid "Use SS&L"
+msgstr "使用 SSL(&L)"
 
-#: protocols/irc/ircprotocol.cpp:243
-msgid ""
-"USAGE: /ban <mask> - Add someone to this channel's ban list. (requires operator "
-"status)."
-msgstr "用法：/ban <网络掩码> - 将某些人添加到频道的封禁列表(需要操作员身份来执行)。"
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 164
+#: rc.cpp:4704
+#, no-c-format
+msgid "Check this to enable SSL for this connection"
+msgstr "选中此框将启用此连接的 SSL"
 
-#: protocols/irc/ircprotocol.cpp:248
-msgid ""
-"USAGE: /bannick <nickname> - Add someone to this channel's ban list. Uses the "
-"hostmask nickname!*@* (requires operator status)."
-msgstr "用法：/bannick <昵称> - 以“昵称!*@*”为掩码将某些人添加到频道的封禁列表(需要操作员身份来执行)。"
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 224
+#: rc.cpp:4713
+#, no-c-format
+msgid "Down"
+msgstr "下移"
 
-#: protocols/irc/ircprotocol.cpp:252
-msgid ""
-"USAGE: /op <nickname 1> [<nickname 2> <...>] - Give channel operator status to "
-"someone (requires operator status)."
-msgstr "用法：/op <昵称 1> [<昵称 2> <...>] - 将频道操作员身份授予给某些人(需要操作员身份来执行)。"
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 227
+#: rc.cpp:4716
+#, no-c-format
+msgid "Move this server down"
+msgstr "将此服务器下移"
 
-#: protocols/irc/ircprotocol.cpp:257
-msgid ""
-"USAGE: /deop <nickname> [<nickname 2> <...>]- Remove channel operator status "
-"from someone (requires operator status)."
-msgstr "用法：/deop <昵称 1> [<昵称 2> <...>] - 解除某些人的频道操作员身份(需要操作员身份来执行)。"
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 230
+#: rc.cpp:4719
+#, no-c-format
+msgid "Move this server down in connection attempt priority"
+msgstr "将此服务器下移，以便降低尝试优先级"
 
-#: protocols/irc/ircprotocol.cpp:261
-msgid ""
-"USAGE: /voice <nickname> [<nickname 2> <...>]- Give channel voice status to "
-"someone (requires operator status)."
-msgstr "用法：/voice <昵称> [<昵称 2> <...>] - 将频道语音用户身份授予给某些人(需要操作员身份来执行)。"
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 258
+#: rc.cpp:4722
+#, no-c-format
+msgid "Up"
+msgstr "上移"
 
-#: protocols/irc/ircprotocol.cpp:266
-msgid ""
-"USAGE: /devoice <nickname> [<nickname 2> <...>]- Remove channel voice status "
-"from someone (requires operator status)."
-msgstr "用法：/devoice <昵称> [<昵称 2> <...>] - 收回某些人的频道语音用户身份(需要操作员身份来执行)。"
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 261
+#: rc.cpp:4725
+#, no-c-format
+msgid "Move this server up"
+msgstr "将此服务器上移"
 
-#: protocols/irc/ircprotocol.cpp:270
-msgid ""
-"USAGE: /quit [<reason>] - Disconnect from IRC, optionally leaving a message."
-msgstr "用法：/quit [<原因>] - 从 IRC 断开连接，您可随意地留下一句退出消息。"
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 264
+#: rc.cpp:4728
+#, no-c-format
+msgid "Move this server up in connection attempt priority"
+msgstr "将此服务器上移，以便提高尝试优先级"
 
-#: protocols/irc/ircprotocol.cpp:274
-msgid ""
-"USAGE: /part [<reason>] - Part from a channel, optionally leaving a message."
-msgstr "用法：/part [<原因>] - 离开此频道，您可随意地留下一句离开消息。"
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 290
+#: rc.cpp:4737
+#, no-c-format
+msgid "Ne&w"
+msgstr "新建(&W)"
 
-#: protocols/irc/ircprotocol.cpp:278
-msgid ""
-"USAGE: /invite <nickname> [<channel>] - Invite a user to join a channel."
-msgstr "用法：/invite <昵称> [<频道>] - 邀请一个用户加入此频道。"
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 328
+#: rc.cpp:4740
+#, no-c-format
+msgid "Rena&me..."
+msgstr "重命名(&M)..."
 
-#: protocols/irc/ircprotocol.cpp:282
-msgid "USAGE: /j <#channel 1> [<password>] - Alias for JOIN."
-msgstr "用法：/j <#频道 1> [<密码>] - JOIN 的替换写法。"
+#. i18n: file ./protocols/irc/ui/networkconfig.ui line 336
+#: rc.cpp:4743
+#, no-c-format
+msgid "Remo&ve"
+msgstr "删除(&V)"
 
-#: protocols/irc/ircprotocol.cpp:287
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 92
+#: rc.cpp:4749
+#, no-c-format
 msgid ""
-"USAGE: /msg <nickname> [<message>] - Alias for QUERY <nickname> <message>."
-msgstr "用法：/msg <昵称> [<消息>] - QUERY <昵称> <消息> 的替换写法。"
-
-#: protocols/irc/ircprotocol.cpp:457 protocols/irc/ircprotocol.cpp:472
-msgid "You must enter some text to send to the server."
-msgstr "您必须输入一些文字才能发送给服务器。"
+"<p><b>Note:</b> Most IRC servers do not require a password, and only a nickname "
+"is required to connect</p>"
+msgstr "<p><b>注意：</b>大多数 IRC 服务器不需要密码，连接时只需要您选择的昵称</p>"
 
-#: protocols/irc/ircprotocol.cpp:521 protocols/irc/ircprotocol.cpp:721
-msgid "You must be in a channel to use this command."
-msgstr "要完成这一操作，您必须处于频道中。"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 126
+#: rc.cpp:4758 rc.cpp:4767
+#, no-c-format
+msgid "This is the name that everyone will see everytime you say something"
+msgstr "这是别人看到的您的名字"
 
-#: protocols/irc/ircprotocol.cpp:578 protocols/irc/ircprotocol.cpp:682
-#: protocols/irc/ircprotocol.cpp:699 protocols/irc/ircprotocol.cpp:764
-msgid "You must be a channel operator to perform this operation."
-msgstr "要完成这一操作，您必须是频道管理员。"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 134
+#: rc.cpp:4761
+#, no-c-format
+msgid "Alternate ni&ckname:"
+msgstr "备选昵称(&C)："
 
-#: protocols/irc/ircprotocol.cpp:602
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 140
+#: rc.cpp:4764 rc.cpp:4773 rc.cpp:4776
+#, no-c-format
 msgid ""
-"\"%1\" is an invalid nickname. Nicknames must not start with '#','!','+', or "
-"'&'."
-msgstr "“%1”是无效的昵称。昵称必须不以“#”、“!”、“+”或“&”开头。"
+"When the nickname is already in use when connecting, this name will be used "
+"instead"
+msgstr "如果连接时昵称已经被使用了，将会换用此名称"
 
-#: protocols/irc/ircprotocol.cpp:919
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 159
+#: rc.cpp:4770
+#, no-c-format
 msgid ""
-"<qt>Are you sure you want to delete the network <b>%1</b>?"
-"<br>Any accounts which use this network will have to be modified.</qt>"
-msgstr "<qt>您确定想要删网络 <b>%1</b> 吗？<br>使用此网络的任何账户都需要进行修改。</qt>"
-
-#: protocols/irc/ircprotocol.cpp:921
-msgid "Deleting Network"
-msgstr "删除网络"
-
-#: protocols/irc/ircprotocol.cpp:922
-msgid "&Delete Network"
-msgstr "删除网络(&D)"
-
-#: protocols/irc/ircprotocol.cpp:946
-msgid "<qt>Are you sure you want to delete the host <b>%1</b>?</qt>"
-msgstr "<qt>您确定想要删除主机 <b>%1</b> 吗</qt>"
-
-#: protocols/irc/ircprotocol.cpp:947
-msgid "Deleting Host"
-msgstr "删除主机"
-
-#: protocols/irc/ircprotocol.cpp:948
-msgid "&Delete Host"
-msgstr "删除主机(&D)"
-
-#: protocols/irc/ircprotocol.cpp:1001
-msgid "New Host"
-msgstr "新建主机"
-
-#: protocols/irc/ircprotocol.cpp:1002
-msgid "Enter the hostname of the new server:"
-msgstr "输入新服务器的主机名："
-
-#: protocols/irc/ircprotocol.cpp:1009
-msgid "A host already exists with that name"
-msgstr "已经存在该名称的主机"
-
-#: protocols/irc/ircprotocol.cpp:1039
-msgid "Rename Network"
-msgstr "重命名网络"
+"The alias you would like to use on IRC.  You may change this once online with "
+"the /nick command."
+msgstr "您想要在 IRC 中使用的别名。只要上线后，您就可以使用 /nick 命令更改别名。"
 
-#: protocols/irc/ircprotocol.cpp:1040
-msgid "Enter the new name for this network:"
-msgstr "输入此网络的新名称："
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 183
+#: rc.cpp:4779
+#, no-c-format
+msgid "&Real name:"
+msgstr "真实姓名(&R)："
 
-#: protocols/irc/ircprotocol.cpp:1050
-msgid "A network already exists with that name"
-msgstr "已经存在该名称的网络"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 194
+#: rc.cpp:4782
+#, no-c-format
+msgid "&Username:"
+msgstr "用户名(&U)："
 
-#: protocols/msn/ui/msneditaccountwidget.cpp:237
-#: protocols/msn/ui/msneditaccountwidget.cpp:355
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 200
+#: rc.cpp:4785 rc.cpp:4788 rc.cpp:4791 rc.cpp:4797
+#, no-c-format
 msgid ""
-"<qt>An error occurred when trying to change the display picture."
-"<br>Make sure that you have selected a correct image file</qt>"
-msgstr "<qt>试图更改显示图片时出错。<br>请确定您选择了正确的图像文件</qt>"
-
-#: protocols/msn/msnaccount.cpp:346 protocols/msn/msnaddcontactpage.cpp:76
-#: protocols/msn/msnchatsession.cpp:365
-#: protocols/msn/ui/msneditaccountwidget.cpp:278
-msgid "<qt>You must enter a valid email address.</qt>"
-msgstr "<qt>您必须输入一个有效的电子邮件地址。</qt>"
-
-#: protocols/msn/ui/msneditaccountwidget.cpp:322
-msgid "Here you can see a list of contacts who added you to their contact list"
-msgstr "您可在这里看到将您添加到好友列表的联系人清单。"
-
-#: protocols/msn/ui/msneditaccountwidget.cpp:323
-msgid "Reverse List - MSN Plugin"
-msgstr "反转列表 - MSN 插件"
-
-#: protocols/msn/msnchatsession.cpp:105
-#: protocols/msn/ui/msneditaccountwidget.cpp:330
-msgid "MSN Display Picture"
-msgstr "MSN 显示图片"
-
-#: protocols/msn/ui/msneditaccountwidget.cpp:336
-msgid "Downloading of display image failed"
-msgstr "下载显示图像失败"
+"The username you would prefer to use on IRC, if your system does not have "
+"identd support.  Leave blank to use your system account name."
+msgstr "您在 IRC 中想要使用的用户名，如果您的系统不支持 identd 的话。留空则是用您的系统账户名。"
 
-#: protocols/msn/webcam.cpp:88
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 241
+#: rc.cpp:4794
+#, no-c-format
 msgid ""
-"<qt>The contact %1 wants to see <b>your</b> webcam, do you want them to see "
-"it?</qt>"
-msgstr "<qt>联系人 %1 想要查看<b>您的</b>摄像头视频，您是否同意？</qt>"
-
-#: protocols/msn/webcam.cpp:89
-msgid "The contact %1 wants to show you his/her webcam, do you want to see it?"
-msgstr "联系人 %1 想要显示他/她的摄像头视频，您是否同意？"
-
-#: protocols/msn/webcam.cpp:91
-msgid "Webcam invitation - Kopete MSN Plugin"
-msgstr "网络视频邀请 - Kopete MSN 插件"
-
-#: protocols/msn/webcam.cpp:91
-msgid "Decline"
-msgstr "拒绝"
-
-#: protocols/msn/msnfiletransfersocket.cpp:44
-msgid "File Transfer - MSN Plugin"
-msgstr "文件传送 - MSN 插件"
-
-#: protocols/msn/msnfiletransfersocket.cpp:158
-#: protocols/msn/msnfiletransfersocket.cpp:213
-#: protocols/msn/msnfiletransfersocket.cpp:450
-msgid "An unknown error occurred"
-msgstr "出现了未知错误"
-
-#: protocols/msn/msnfiletransfersocket.cpp:225
-msgid "Connection timed out"
-msgstr "连接超时"
-
-#: protocols/msn/msnfiletransfersocket.cpp:413
-msgid "The remote user aborted"
-msgstr "远程用户已中止"
-
-#: protocols/msn/incomingtransfer.cpp:112
-msgid "Cannot open file for writing"
-msgstr "无法打开文件写入"
-
-#: protocols/msn/incomingtransfer.cpp:297
-#: protocols/msn/outgoingtransfer.cpp:211
-#: protocols/msn/outgoingtransfer.cpp:318
-msgid "File transfer canceled."
-msgstr "文件传送已取消。"
-
-#: protocols/msn/msnprotocol.cpp:42
-msgid "MSN Messenger"
-msgstr "MSN Messenger"
-
-#: protocols/gadu/gaduprotocol.cpp:63 protocols/gadu/gaduprotocol.cpp:65
-#: protocols/groupwise/gwprotocol.cpp:52
-#: protocols/meanwhile/meanwhileprotocol.cpp:51
-#: protocols/msn/msnprotocol.cpp:53 protocols/yahoo/yahooprotocol.cpp:45
-msgid "Busy"
-msgstr "忙碌"
-
-#: protocols/msn/msnprotocol.cpp:54
-msgid "Be Right Back"
-msgstr "马上回来"
-
-#: protocols/msn/msnprotocol.cpp:54
-msgid "Be &Right Back"
-msgstr "马上回来(&R)"
-
-#: protocols/msn/msnprotocol.cpp:55
-msgid "Away From Computer"
-msgstr "离开了计算机"
-
-#: protocols/msn/msnprotocol.cpp:56
-msgid "On the Phone"
-msgstr "在打电话"
-
-#: protocols/msn/msnprotocol.cpp:56
-msgid "On The &Phone"
-msgstr "在打电话(&P)"
-
-#: protocols/msn/msnprotocol.cpp:57
-msgid "Out to Lunch"
-msgstr "外出就餐"
-
-#: protocols/msn/msnprotocol.cpp:57
-msgid "Out To &Lunch"
-msgstr "外出就餐(&L)"
-
-#: protocols/msn/msnprotocol.cpp:58
-msgid "&Offline"
-msgstr "离线(&O)"
+"The username you would prefer to use on IRC, if your system does not have "
+"identd support."
+msgstr "您在 IRC 中想要使用的用户名，如果您的系统不支持 identd 的话。"
 
-#: protocols/groupwise/gwprotocol.cpp:56
-#: protocols/meanwhile/meanwhileprotocol.cpp:56
-#: protocols/msn/msnprotocol.cpp:60 protocols/yahoo/yahooprotocol.cpp:55
-msgid "Idle"
-msgstr "空闲"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 323
+#: rc.cpp:4803
+#, no-c-format
+msgid "&Edit..."
+msgstr "编辑(&E)..."
 
-#: protocols/msn/msnprotocol.cpp:60
-msgid "&Idle"
-msgstr "空闲(&I)"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 350
+#: rc.cpp:4806
+#, no-c-format
+msgid "&Network:"
+msgstr "网络(&N)："
 
-#: protocols/msn/msnprotocol.cpp:67
-msgid "Remote Client"
-msgstr "远程客户"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 382
+#: rc.cpp:4812
+#, no-c-format
+msgid "&Prefer SSL-based connections"
+msgstr "首选基于 SSL 的连接(&P)"
 
-#: protocols/msn/msnprotocol.cpp:68
-msgid "Contact GUID"
-msgstr "联系人 GUID"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 409
+#: rc.cpp:4821
+#, no-c-format
+msgid "Default &charset:"
+msgstr "默认字符集(&C)："
 
-#: protocols/msn/msnswitchboardsocket.cpp:122
-msgid ""
-"Invalid user:\n"
-"this MSN user does not exist; please check the MSN ID."
-msgstr ""
-"无效用户：\n"
-"该 MSN 用户不存在；请检查 MSN ID。"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 446
+#: rc.cpp:4824
+#, no-c-format
+msgid "Default Messages"
+msgstr "默认消息"
 
-#: protocols/msn/msnswitchboardsocket.cpp:126
-msgid "user never joined"
-msgstr "用户从未加入"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 457
+#: rc.cpp:4827
+#, no-c-format
+msgid "&Part message:"
+msgstr "加入消息(&P)："
 
-#: protocols/msn/msnswitchboardsocket.cpp:131
-msgid "The user %1 is already in this chat."
-msgstr "用户 %1 已经在本次交谈中了。"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 468
+#: rc.cpp:4830
+#, no-c-format
+msgid "&Quit message:"
+msgstr "退出消息(&Q)："
 
-#: protocols/msn/msnswitchboardsocket.cpp:139
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 479
+#: rc.cpp:4833 rc.cpp:4836
+#, no-c-format
 msgid ""
-"The user %1 is online but has blocked you:\n"
-"you can not talk to this user."
-msgstr ""
-"用户 %1 已在线但是屏蔽了您：\n"
-"您不能和他们开始聊天。"
-
-#: protocols/msn/msnswitchboardsocket.cpp:142
-#: protocols/msn/msnswitchboardsocket.cpp:159
-msgid "user blocked you"
-msgstr "用户屏蔽了您"
+"The message you want people to see when you part a channel without giving a "
+"reason. Leave this field blank to use the Kopete default message."
+msgstr "当您没有给出理由而加入频道时，人们将会看到这一消息。将此处留空将使用 Kopete 默认的信息。"
 
-#: protocols/msn/msnswitchboardsocket.cpp:148
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 490
+#: rc.cpp:4839 rc.cpp:4842
+#, no-c-format
 msgid ""
-"The user %1 is currently not signed in.\n"
-"Messages will not be delivered."
-msgstr ""
-"用户 %1 目前没有登录。\n"
-"消息将不会被传递。"
+"The message you want people to see when you disconnect from IRC without giving "
+"a reason. Leave this field blank to use the Kopete default message."
+msgstr "当您没有给出理由而离开频道时，人们将会看到这一消息。将此处留空将使用 Kopete 默认的信息。"
 
-#: protocols/msn/msnswitchboardsocket.cpp:151
-msgid "user disconnected"
-msgstr "用户已断开连接"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 522
+#: rc.cpp:4845
+#, no-c-format
+msgid "A&dvanced Configuration"
+msgstr "高级配置(&D)"
 
-#: protocols/msn/msnswitchboardsocket.cpp:156
-msgid ""
-"You are trying to invite too many contacts to this chat at the same time"
-msgstr "您试图同时向此聊天中邀请的联系人太多"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 533
+#: rc.cpp:4848
+#, no-c-format
+msgid "Message Destinations"
+msgstr "消息目的"
 
-#: protocols/msn/msnswitchboardsocket.cpp:164
-msgid "Kopete MSN plugin has trouble authenticating with switchboard server."
-msgstr "Kopete MSN 插件在交换服务器验证时出错。"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 544
+#: rc.cpp:4851
+#, no-c-format
+msgid "Auto-show anonymous windows"
+msgstr "自动显示匿名窗口"
 
-#: protocols/msn/msnswitchboardsocket.cpp:218
-msgid "timeout"
-msgstr "超时"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 552
+#: rc.cpp:4854
+#, no-c-format
+msgid "Auto-show the server window"
+msgstr "自动显示服务器窗口"
 
-#: protocols/msn/msnswitchboardsocket.cpp:771
-msgid ""
-"The message you are trying to send is too long; it will be split into %1 "
-"messages."
-msgstr "您试图发送的消息太长；将会被拆分为 %1 条消息。"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 568
+#: rc.cpp:4857
+#, no-c-format
+msgid "Server messages:"
+msgstr "服务器消息："
 
-#: protocols/msn/msnswitchboardsocket.cpp:772
-msgid "Message too big - MSN Plugin"
-msgstr "消息太大 - MSN 插件"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 576
+#: rc.cpp:4860
+#, no-c-format
+msgid "Server notices:"
+msgstr "服务器通知："
 
-#: protocols/msn/msnswitchboardsocket.cpp:843
-msgid "connection closed"
-msgstr "连接已关闭"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 582
+#: rc.cpp:4863 rc.cpp:4878 rc.cpp:4896 rc.cpp:4914
+#, no-c-format
+msgid "Active Window"
+msgstr "当前窗口"
 
-#: protocols/msn/msnswitchboardsocket.cpp:923
-msgid "<img src=\"%1\" alt=\"Typewrited message\" />"
-msgstr "<img src=\"%1\" alt=\"打字机消息\" />"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 587
+#: rc.cpp:4866 rc.cpp:4881 rc.cpp:4899 rc.cpp:4917
+#, no-c-format
+msgid "Server Window"
+msgstr "服务器窗口"
 
-#: protocols/msn/msnnotifysocket.cpp:125
-msgid "<qt>The MSN user '%1' does not exist.<br>Please check the MSN ID.</qt>"
-msgstr "<qt>MSN 用户“%1”不存在。<br>请检查 MSN ID。</qt>"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 592
+#: rc.cpp:4869 rc.cpp:4884 rc.cpp:4902 rc.cpp:4920
+#, no-c-format
+msgid "Anonymous Window"
+msgstr "匿名窗口"
 
-#: protocols/msn/msnnotifysocket.cpp:133
-msgid ""
-"<qt>An internal error occurred in the MSN plugin."
-"<br>MSN Error: %1"
-"<br>please send us a detailed bug report at kopete-devel@kde.org containing the "
-"raw debug output on the console (in gzipped format, as it is probably a lot of "
-"output.)"
-msgstr ""
-"<qt>MSN 插件发生了内部错误。"
-"<br>MSN 错误：%1请向我们发送一份详细的错误报告：kopete-devel@kde.org。请包括控制台上的原始输出(使用 gzip "
-"格式，因为可能会有大量输出。)"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 597
+#: rc.cpp:4872 rc.cpp:4887 rc.cpp:4905 rc.cpp:4923
+#, no-c-format
+msgid "KNotify"
+msgstr "KNotify"
 
-#: protocols/msn/msnnotifysocket.cpp:145
-msgid ""
-"Unable to change your display name.\n"
-"Please ensure your display is not too long and does not contains censored "
-"words."
-msgstr ""
-"无法更改您的显示名。\n"
-"请确保您的显示名没有超过长度，而且不包含敏感的单词。"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 660
+#: rc.cpp:4893
+#, no-c-format
+msgid "Error messages:"
+msgstr "错误消息："
 
-#: protocols/msn/msnnotifysocket.cpp:160
-msgid "Your contact list is full; you cannot add any new contacts."
-msgstr "您的联系人列表已满；您无法添加新联系人。"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 698
+#: rc.cpp:4911
+#, no-c-format
+msgid "Information replies:"
+msgstr "信息回复："
 
-#: protocols/msn/msnnotifysocket.cpp:166
-msgid ""
-"<qt>The user '%1' already exists in this group on the MSN server;"
-"<br>if Kopete does not show the user, please send us a detailed bug report at "
-"kopete-devel@kde.org containing the raw debug output on the console (in gzipped "
-"format, as it is probably a lot of output.)</qt>"
-msgstr ""
-"<qt>用户“%1”已经在 MSN 服务器的这个组中存在；"
-"<br>如果 Koepte 不显示该用户，请向我们发送一份详细的错误报告：kopete-devel@kde.org。请包括控制台上的原始输出(使用 gzip "
-"格式，因为可能会有大量输出。)</qt>"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 754
+#: rc.cpp:4929
+#, no-c-format
+msgid "Custom CTCP Replies"
+msgstr "自定义 CTCP 回复"
 
-#: protocols/msn/msnnotifysocket.cpp:183
-msgid "The user '%1' seems to already be blocked or allowed on the server."
-msgstr "用户“%1”似乎已经在服务器上被屏蔽或允许。"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 763
+#: rc.cpp:4932
+#, no-c-format
+msgid "CTCP"
+msgstr "CTCP"
 
-#: protocols/msn/msnnotifysocket.cpp:189
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 807
+#: rc.cpp:4938
+#, no-c-format
 msgid ""
-"You have reached the maximum number of groups:\n"
-"MSN does not support more than 30 groups."
+"You can use this dialog to add custom replies for when people send CTCP "
+"requests to you. You can also use this dialog to override the built-in replies "
+"for VERSION, USERINFO, and CLIENTINFO."
 msgstr ""
-"您达到了组的最大数目：\n"
-"MSN 不支持多于 30 个组。"
+"您可使用此对话框添加一些自定义回复，以便应付别人给您发送的 CTCP 请求。您还可以使用此对话框来覆盖程序对 VERSION、USERINFO 和 "
+"CLIENTINFO 的内建回复。"
 
-#: protocols/msn/msnnotifysocket.cpp:198
-msgid ""
-"Kopete is trying to perform an operation on a group or a contact that does not "
-"exists on the server.\n"
-"This might happen if the Kopete contact list and the MSN-server contact list "
-"are not correctly synchronized; if this is the case, you probably should send a "
-"bug report."
-msgstr ""
-"Kopete 试图对服务器上没有的组或联系人执行操作。\n"
-"这可能是因为 Kopete 的联系人列表和 MSN 服务器上的联系人列表不同步；如果是这种情况的话，您可能想要发送一封错误报告。"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 823
+#: rc.cpp:4941
+#, no-c-format
+msgid "&CTCP:"
+msgstr "&CTCP："
 
-#: protocols/msn/msnnotifysocket.cpp:206
-msgid "The group name is too long; it has not been changed on the MSN server."
-msgstr "组名太长；未在 MSN 服务器上更改。"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 839
+#: rc.cpp:4944
+#, no-c-format
+msgid "&Reply:"
+msgstr "回复(&R)："
 
-#: protocols/msn/msnnotifysocket.cpp:212
-msgid ""
-"You cannot open a Hotmail inbox because you do not have an MSN account with a "
-"valid Hotmail or MSN mailbox."
-msgstr "您无法打开 Hotmail 邮箱，因为您没有与有效的 Hotmail 或 MSN 邮箱关联的 MSN 账户。"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 855
+#: rc.cpp:4947
+#, no-c-format
+msgid "Add Repl&y"
+msgstr "添加回复(&Y)"
 
-#: protocols/msn/msnnotifysocket.cpp:245
-msgid ""
-"You can not send messages when you are offline or when you are invisible."
-msgstr "您在离线时或隐身时不能够发送消息。"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 881
+#: rc.cpp:4950
+#, no-c-format
+msgid "Run Following Commands on Connect"
+msgstr "连接时运行下列命令"
 
-#: protocols/msn/msnnotifysocket.cpp:251
-msgid ""
-"You are trying to perform an action you are not allowed to perform in 'kid "
-"mode'."
-msgstr "您试图执行不被允许的操作，因为您现在处于“儿童模式”。"
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 913
+#: rc.cpp:4953
+#, no-c-format
+msgid "Add Co&mmand"
+msgstr "添加命令(&M)"
 
-#: protocols/msn/msnnotifysocket.cpp:757
-#, c-format
+#. i18n: file ./protocols/irc/ui/irceditaccount.ui line 954
+#: rc.cpp:4959 rc.cpp:4962
+#, no-c-format
 msgid ""
-"_n: You have one unread message in your MSN inbox.\n"
-"You have %n unread messages in your MSN inbox."
-msgstr "您的 MSN 收件箱有 %n 封未读的信件。"
-
-#: protocols/msn/msnnotifysocket.cpp:757 protocols/msn/msnnotifysocket.cpp:779
-#: protocols/yahoo/yahooaccount.cpp:1491 protocols/yahoo/yahooaccount.cpp:1498
-msgid "Open Inbox..."
-msgstr "打开收件箱..."
-
-#: protocols/msn/msnnotifysocket.cpp:778
-msgid "You have one new email from %1 in your MSN inbox."
-msgstr "您的 MSN 收件箱中有一封从 %1 来的新信件。"
-
-#: protocols/msn/msnnotifysocket.cpp:905
-msgid "More Information"
-msgstr "更多信息"
+"Any commands added here will be run as soon as you are connected to the IRC "
+"server."
+msgstr "在此添加的任何命令都会在您连接到 IRC 服务器后立即运行。"
 
-#: protocols/msn/msnnotifysocket.cpp:908
-msgid "Manage Subscription"
-msgstr "管理订阅"
+#. i18n: file ./libkopete/ui/addressbookselectorwidget_base.ui line 24
+#: rc.cpp:4965 rc.cpp:4989
+#, no-c-format
+msgid "Select Contact"
+msgstr "选择联系人"
 
-#: protocols/msn/msnnotifysocket.cpp:1017
-msgid "Now Listening: ♫ %1 ♫"
-msgstr "正在收听：♫ %1 ♫"
+#. i18n: file ./libkopete/ui/addressbookselectorwidget_base.ui line 55
+#: rc.cpp:4968
+#, no-c-format
+msgid "Create New Entr&y..."
+msgstr "创建新条目(&Y)..."
 
-#: protocols/msn/msnsocket.cpp:184
-msgid ""
-"There was an error while connecting to the MSN server.\n"
-"Error message:\n"
-msgstr ""
-"在连接 MSN 服务器时出错。\n"
-"错误消息是：\n"
+#. i18n: file ./libkopete/ui/addressbookselectorwidget_base.ui line 58
+#: rc.cpp:4971
+#, no-c-format
+msgid "Create a new entry in your address book"
+msgstr "在您的地址簿中创建新条目"
 
-#: protocols/msn/msnsocket.cpp:186
-#, c-format
-msgid "Unable to lookup %1"
-msgstr "无法查阅 %1"
+#. i18n: file ./libkopete/ui/addressbookselectorwidget_base.ui line 126
+#: rc.cpp:4983
+#, no-c-format
+msgid "Select the contact you want to communicate with via Instant Messaging"
+msgstr "选择您想要通过即时通讯进行交流的联系人"
 
-#: protocols/msn/msnsocket.cpp:568
-msgid "An internal server error occurred. Please try again later."
-msgstr "发生了内部服务器错误。请以后再试。"
+#. i18n: file ./libkopete/ui/addressbookselectorwidget_base.ui line 150
+#: rc.cpp:4986 rc.cpp:4992
+#, no-c-format
+msgid "S&earch:"
+msgstr "搜索(&E)："
 
-#: protocols/msn/msnsocket.cpp:572
-msgid ""
-"It is no longer possible to perform this operation. The MSN server does not "
-"allow it anymore."
-msgstr "无法执行此操作。MSN 服务器不再允许此操作。"
+#. i18n: file ./libkopete/ui/metacontactselectorwidget_base.ui line 80
+#: rc.cpp:4995
+#, no-c-format
+msgid "Meta Contact"
+msgstr "超级联系人"
 
-#: protocols/msn/msnsocket.cpp:580
-msgid "The MSN server is busy. Please try again later."
-msgstr "MSN 服务器正忙。请稍候重试。"
+#. i18n: file ./libkopete/ui/kopetepassworddialog.ui line 82
+#: rc.cpp:5001
+#, no-c-format
+msgid "&Remember password"
+msgstr "记住密码(&R)"
 
-#: protocols/msn/msnsocket.cpp:590
-msgid "The server is not available at the moment. Please try again later."
-msgstr "服务器此时不可用。请稍候再试。"
+#. i18n: file ./libkopete/ui/fileconfirmbase.ui line 16
+#: libkopete/ui/kopetefileconfirmdialog.cpp:35 rc.cpp:5004
+#, no-c-format
+msgid "A User Would Like to Send You a File"
+msgstr "有用户想给您发送文件"
 
-#: protocols/msn/msnsocket.cpp:596
+#. i18n: file ./libkopete/ui/fileconfirmbase.ui line 33
+#: rc.cpp:5007
+#, no-c-format
 msgid ""
-"Unhandled MSN error code %1 \n"
-"Please fill a bug report with a detailed description and if possible the last "
-"console debug output."
+"A user is trying to send you a file. The file will only be downloaded if you "
+"accept this dialog. If you do not wish to receive it, please click 'Refuse'. "
+"This file will never be executed by Kopete at any point during or after the "
+"transfer."
 msgstr ""
-"无法处理的 MSN 错误代号 %1\n"
-"请将详细描述提交为一份错误报告。如果可能的话，请附带最后的控制台调试输出。"
-
-#: protocols/groupwise/gwcontact.cpp:166 protocols/msn/msncontact.cpp:133
-msgid "Unblock User"
-msgstr "解除屏蔽用户"
-
-#: protocols/groupwise/gwcontact.cpp:166 protocols/msn/msncontact.cpp:133
-msgid "Block User"
-msgstr "屏蔽用户"
-
-#: protocols/gadu/gaducontact.cpp:198 protocols/msn/msncontact.cpp:140
-msgid "Show Profile"
-msgstr "显示配置文件"
-
-#: protocols/msn/msnchatsession.cpp:89 protocols/msn/msncontact.cpp:148
-msgid "View Contact's Webcam"
-msgstr "查看联系人的摄像头"
-
-#: protocols/msn/msnchatsession.cpp:92 protocols/msn/msncontact.cpp:151
-msgid "Send Webcam"
-msgstr "发起视频邀请"
-
-#: protocols/msn/msncontact.cpp:174
-msgid "<qt>Please go online to block or unblock a contact.</qt>"
-msgstr "<qt>请转为在线模式来屏蔽或解除屏蔽联系人。</qt>"
-
-#: protocols/gadu/gaducontact.cpp:247 protocols/msn/msncontact.cpp:252
-msgid "<qt>Please go online to remove a contact from your contact list.</qt>"
-msgstr "<qt>请转为在线模式来删除联系人。</qt>"
-
-#: protocols/msn/msncontact.cpp:315
-msgid "Web Messenger"
-msgstr "Web Messenger"
-
-#: protocols/msn/msncontact.cpp:317
-msgid "Windows Mobile"
-msgstr "Windows Mobile"
-
-#: protocols/msn/msncontact.cpp:319
-msgid "MSN Mobile"
-msgstr "MSN Mobile"
+"有用户尝试向您发送文件。只有您接受此对话框后，才会下载该文件。如果您不想接收该文件，请单击“拒绝”。在传输进行的过程及传送完成后的任何时刻，Kopete "
+"都不会执行该文件。"
 
-#: protocols/groupwise/gwcontact.cpp:240 protocols/msn/msncontact.cpp:618
-msgid "%1|Blocked"
-msgstr "%1|被屏蔽"
+#. i18n: file ./libkopete/ui/fileconfirmbase.ui line 44
+#: rc.cpp:5010
+#, no-c-format
+msgid "From:"
+msgstr "来自："
 
-#: protocols/msn/webcam/msnwebcamdialog.cpp:31
-#: protocols/yahoo/ui/yahoowebcamdialog.cpp:31
-#, c-format
-msgid "Webcam for %1"
-msgstr "%1 的摄像头"
+#. i18n: file ./libkopete/ui/fileconfirmbase.ui line 52
+#: rc.cpp:5013
+#, no-c-format
+msgid "File name:"
+msgstr "文件名："
 
-#: protocols/groupwise/gwmessagemanager.cpp:65
-#: protocols/msn/msnchatsession.cpp:78
-msgid "&Invite"
-msgstr "邀请(&I)"
+#. i18n: file ./libkopete/ui/fileconfirmbase.ui line 65
+#: rc.cpp:5016
+#, no-c-format
+msgid "&Browse..."
+msgstr "浏览(&B)..."
 
-#: protocols/msn/msnaccount.cpp:271 protocols/msn/msnchatsession.cpp:82
-msgid "Send Raw C&ommand..."
-msgstr "发送原始命令(&O)..."
+#. i18n: file ./libkopete/ui/fileconfirmbase.ui line 73
+#: rc.cpp:5019
+#, no-c-format
+msgid "Size:"
+msgstr "大小："
 
-#: protocols/msn/msnchatsession.cpp:86
-msgid "Send Nudge"
-msgstr "发送闪屏振动"
+#. i18n: file ./libkopete/ui/fileconfirmbase.ui line 114
+#: rc.cpp:5025
+#, no-c-format
+msgid "Save to:"
+msgstr "保存到："
 
-#: protocols/jabber/jabberchatsession.cpp:87
-#: protocols/msn/msnchatsession.cpp:95 protocols/yahoo/yahoochatsession.cpp:60
-msgid "Send File"
-msgstr "发送文件"
+#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 25
+#: rc.cpp:5028
+#, no-c-format
+msgid "The contact XXX added you in his contactlist"
+msgstr "联系人 XXX 将您添加到好友列表"
 
-#: protocols/msn/msnchatsession.cpp:98
-msgid "Request Display Picture"
-msgstr "请求显示图片"
+#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 61
+#: rc.cpp:5031
+#, no-c-format
+msgid "Read More Info About This Contact"
+msgstr "读取关于此联系人的更多信息"
 
-#: protocols/msn/msnchatsession.cpp:247
-msgid "Connection closed"
-msgstr "连接已关闭"
+#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 71
+#: rc.cpp:5034
+#, no-c-format
+msgid "Authorize this contact to see my status"
+msgstr "允许此联系人查看我的状态"
 
-#: protocols/msn/msnchatsession.cpp:327
-msgid "Other..."
-msgstr "其它..."
+#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 82
+#: rc.cpp:5037
+#, no-c-format
+msgid "Add this contact in my contactlist"
+msgstr "将此联系人添加到我的联系人列表中"
 
-#: protocols/msn/msnchatsession.cpp:357
-msgid "Please enter the email address of the person you want to invite:"
-msgstr "请输入您要邀请的人的电子邮件地址："
+#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 112
+#: rc.cpp:5040
+#, no-c-format
+msgid "Display name:"
+msgstr "显示名："
 
-#: protocols/msn/msnchatsession.cpp:411
-#, c-format
+#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 115
+#: rc.cpp:5043 rc.cpp:5050
+#, no-c-format
 msgid ""
-"The following message has not been sent correctly:\n"
-"%1"
-msgstr ""
-"如下消息没有被正确发送：\n"
-"%1"
+"The display name of the contact.  Leave it empty to use the contact nickname"
+msgstr "联系人的显示名。留空可使用联系人昵称"
 
-#: protocols/msn/msnchatsession.cpp:468
+#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 119
+#: rc.cpp:5046 rc.cpp:5053
+#, no-c-format
 msgid ""
-"%1 has sent an unimplemented invitation, the invitation was rejected.\n"
-"The invitation was: %2"
+"Enter the contact display name. This is how the contact will appears in the "
+"contactlist.\n"
+"Leave it empty if you want to see the contact nickname as display name."
 msgstr ""
-"%1 有一个未实现的邀请，该邀请已被拒绝。\n"
-"该邀请是：%2"
-
-#: protocols/msn/msnchatsession.cpp:624
-msgid "%1 has started a chat with you"
-msgstr "%1 已经开始了与您的聊天"
-
-#: protocols/msn/msnchatsession.cpp:639
-msgid "has sent a nudge"
-msgstr "发送了闪屏振动"
+"输入联系人的显示名。这是联系人出现在联系人列表中的名称。\n"
+"如果您想要将联系人的昵称设定为显示名，可以留空。"
 
-#: protocols/msn/msnchatsession.cpp:652
-msgid "has sent you a nudge"
-msgstr "向您发送了闪屏振动"
+#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 149
+#: rc.cpp:5057
+#, no-c-format
+msgid "In the group:"
+msgstr "位于组："
 
-#: protocols/msn/msnchatsession.cpp:718
+#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 152
+#: rc.cpp:5060 rc.cpp:5063
+#, no-c-format
 msgid ""
-"The following message has not been sent correctly  (%1): \n"
-"%2"
-msgstr ""
-"如下消息没有被正确发送(%1)：\n"
-"%2"
-
-#: protocols/msn/msnchatsession.cpp:725
-msgid "These messages have not been sent correctly (%1): <br /><ul>"
-msgstr "如下消息没有被正确发送(%1)：<br /><ul>"
-
-#: protocols/msn/msnchatsession.cpp:760
-msgid "Impossible to establish the connection"
-msgstr "无法建立连接"
-
-#: protocols/msn/msndebugrawcmddlg.cpp:32
-msgid "DEBUG: Send Raw Command - MSN Plugin"
-msgstr "调试：发送原样命令 - MSN 插件"
-
-#: protocols/msn/msnaccount.cpp:83 protocols/yahoo/yahooaccount.cpp:99
-msgid "Open Inbo&x..."
-msgstr "打开收件箱(&X)..."
-
-#: protocols/msn/msnaccount.cpp:84
-msgid "&Change Display Name..."
-msgstr "更改显示名称(&C)..."
-
-#: protocols/msn/msnaccount.cpp:85
-msgid "&Start Chat..."
-msgstr "开始聊天(&S)..."
+"Enter the group where the contact should be added. Leave it empty to add it in "
+"the top level group."
+msgstr "输入此联系人要被加入的组名，留空则加入到顶级组。"
 
-#: protocols/msn/msnaccount.cpp:332
-msgid "Start Chat - MSN Plugin"
-msgstr "开始聊天 - MSN 插件"
+#. i18n: file ./libkopete/ui/contactaddednotifywidget.ui line 181
+#: rc.cpp:5066
+#, no-c-format
+msgid "Addressbook link:"
+msgstr "地址簿链接："
 
-#: protocols/msn/msnaccount.cpp:333
-msgid ""
-"Please enter the email address of the person with whom you want to chat:"
-msgstr "请输入您要与之聊天的人的电子邮件地址："
+#. i18n: file ./libkopete/ui/kopeteawaydialogbase.ui line 27
+#: rc.cpp:5069
+#, no-c-format
+msgid "Please specify an away message, or choose a predefined one."
+msgstr "请指定离开消息，或者选择预先定义的离开消息。"
 
-#: protocols/msn/msnaccount.cpp:377 protocols/msn/msnaccount.cpp:388
-msgid "Change Display Name - MSN Plugin"
-msgstr "更改显示名称 - MSN 插件"
+#. i18n: file ./libkopete/ui/addressbooklinkwidget_base.ui line 41
+#: rc.cpp:5072
+#, no-c-format
+msgid "The TDE Address Book entry associated with this Kopete Contact"
+msgstr "与此 Kopete 联系人关联的 TDE 地址簿项"
 
-#: protocols/msn/msnaccount.cpp:378
-msgid ""
-"Enter the new display name by which you want to be visible to your friends on "
-"MSN:"
-msgstr "输入您想使用的公开名字，您的 MSN 朋友们将会看到这个名字："
+#. i18n: file ./libkopete/ui/addressbooklinkwidget_base.ui line 66
+#: rc.cpp:5081
+#, no-c-format
+msgid "Select an address book entry"
+msgstr "选择地址簿项"
 
-#: protocols/msn/msnaccount.cpp:386
-msgid ""
-"<qt>The display name you entered is too long. Please use a shorter name.\n"
-"Your display name has <b>not</b> been changed.</qt>"
-msgstr ""
-"<qt>您输入的显示名称太长。请输入较短的名称。\n"
-"您的显示名字<b>没有</b>被改变。</qt>"
+#. i18n: file ./libkopete/ui/kopetepasswordwidgetbase.ui line 36
+#: rc.cpp:5084
+#, no-c-format
+msgid "Remember password"
+msgstr "记住密码"
 
-#: protocols/msn/msnaccount.cpp:434
+#. i18n: file ./libkopete/ui/kopetepasswordwidgetbase.ui line 39
+#: rc.cpp:5087
+#, no-c-format
 msgid ""
-"The connection with the MSN server was lost unexpectedly.\n"
-"If you cannot reconnect now, the server might be down. In that case, please try "
-"again later."
-msgstr ""
-"与 MSN 服务器的连接意外丢失。\n"
-"如果您现在无法重新连接，那么可能是因为服务器停机。此时请稍候再试。"
-
-#: protocols/msn/msnaccount.cpp:436
-msgid "Connection Lost - MSN Plugin"
-msgstr "连接丢失 - MSN 插件"
-
-#: protocols/sms/serviceloader.cpp:46
-#, c-format
-msgid "Could not load service %1."
-msgstr "无法加载服务 %1。"
-
-#: protocols/sms/serviceloader.cpp:47
-msgid "Error Loading Service"
-msgstr "加载服务出错"
-
-#: protocols/sms/smscontact.cpp:56
-msgid "Something went wrong when sending message."
-msgstr "发送消息时出现某些错误。"
-
-#: protocols/sms/services/smsclient.cpp:66
-#: protocols/sms/services/smssend.cpp:57
-#: protocols/sms/services/smssendprovider.cpp:216
-#: protocols/sms/services/smssendprovider.cpp:224
-#: protocols/sms/smscontact.cpp:57
-msgid "Could Not Send Message"
-msgstr "无法发送消息"
+"Check this and enter your password below if you would like your password to be "
+"stored in your wallet, so Kopete does not have to ask you for it each time it "
+"is needed."
+msgstr "如果您想要在钱包中保存您的密码，请选中此选项，然后再下面输入您的密码。这样，Kopete 将不会在每次需要时询问您的密码。"
 
-#: protocols/sms/smscontact.cpp:126
-msgid "&Contact Settings"
-msgstr "联系人设置(&C)"
+#. i18n: file ./libkopete/ui/kopetepasswordwidgetbase.ui line 64
+#: rc.cpp:5090
+#, no-c-format
+msgid "Password:"
+msgstr "密码："
 
-#: protocols/sms/smsuserpreferences.cpp:27
-msgid "User Preferences"
-msgstr "用户首选项"
+#. i18n: file ./libkopete/ui/kopetepasswordwidgetbase.ui line 83
+#: rc.cpp:5093
+#, no-c-format
+msgid "Enter your password here."
+msgstr "请在此输入您的密码。"
 
-#: protocols/sms/smsaccount.cpp:86
+#. i18n: file ./libkopete/ui/kopetepasswordwidgetbase.ui line 86
+#: rc.cpp:5096
+#, no-c-format
 msgid ""
-"This message is longer than the maximum length (%1). Should it be divided to %2 "
-"messages?"
-msgstr "这条消息超过了最大长度(%1)。要将它分割为 %2 条消息吗？"
+"Enter your password here. If you would rather not save your password, uncheck "
+"the Remember password checkbox above; you will then be prompted for your "
+"password whenever it is needed."
+msgstr "在此输入您的密码。如果您不想保存您的密码，请去掉上面的记住密码复选框；每当需要提供密码时，您都会被提示输入。"
 
-#: protocols/sms/smsaccount.cpp:87
-msgid "Message Too Long"
-msgstr "消息太长"
+#. i18n: file ./libkopete/kopetecommandui.rc line 6
+#: rc.cpp:5099
+#, no-c-format
+msgid "Commands"
+msgstr "命令"
 
-#: protocols/sms/smsaccount.cpp:87
-msgid "Divide"
-msgstr "拆分"
+#: libkopete/tests/kopetepasswordtest_program.cpp:35
+msgid "Config group to store password in"
+msgstr "配置存储密码的组"
 
-#: protocols/sms/smsaccount.cpp:87
-msgid "Do Not Divide"
-msgstr "不拆分"
+#: libkopete/tests/kopetepasswordtest_program.cpp:36
+msgid "Set password to new"
+msgstr "重设密码"
 
-#: protocols/sms/smsaccount.cpp:149
-msgid "Message too long."
-msgstr "消息过长。"
+#: libkopete/tests/kopetepasswordtest_program.cpp:37
+msgid "Claim password was erroneous"
+msgstr "声明密码不对"
 
-#: protocols/sms/services/gsmlib.cpp:447
-msgid ""
-"<qt>GSMLib is a library (and utilities) for sending SMS via a GSM device. The "
-"program can be found on <a href=\"%1\">%1</a></qt>"
-msgstr ""
-"<qt>GSMLib 是一个通过 GSM 设备发送 SMS 短消息的程序。该程序可以在 <a href=\"%1\">%1</a> 找到</qt>"
+#: libkopete/tests/kopetepasswordtest_program.cpp:38
+msgid "Password prompt"
+msgstr "密码提示"
 
-#: protocols/sms/services/smssend.cpp:57
-msgid "No provider configured."
-msgstr "未配置提供商。"
+#: libkopete/tests/kopetepasswordtest_program.cpp:39
+msgid "Image to display in password dialog"
+msgstr "要在密码对话框中显示的图像"
 
-#: protocols/sms/services/smssend.cpp:64
+#: libkopete/tests/kopetepasswordtest_program.cpp:120
 msgid ""
-"No prefix set for SMSSend, please change it in the configuration dialog."
-msgstr "未指定 SMSSend 的前缀。请在配置对话框中改变它。"
-
-#: protocols/sms/services/smssend.cpp:64
-msgid "No Prefix"
-msgstr "无前缀"
+"Hopefully this popped up because you set the password to the empty string."
+msgstr "弹出此提示是因为您将密码设置为空字符串。"
 
-#: protocols/sms/services/smssend.cpp:184
-msgid "%1 Settings"
-msgstr "%1 设置"
+#: libkopete/kopetetransfermanager.cpp:190
+msgid "<unknown>"
+msgstr "<未知>"
 
-#: protocols/sms/services/smssend.cpp:240
+#: libkopete/kopetetransfermanager.cpp:258
 msgid ""
-"<qt>SMSSend is a program for sending SMS through gateways on the web. It can be "
-"found on <a href=\"%1\">%2</a></qt>"
+"Sorry, sending files which are not stored locally is not yet supported by this "
+"protocol.\n"
+"Please copy this file to your computer and try again."
 msgstr ""
-"<qt>SMSSend 是一个通过互联网中的网关发送 SMS 短消息的程序。该程序可以在 <a href=\"%1\">%2</a> 找到</qt>"
-
-#: protocols/sms/services/smsclient.cpp:66
-msgid "No provider configured"
-msgstr "未配置提供商"
+"抱歉，此协议尚不支持未存储于本地的文件。\n"
+"请将此文件复制到您的计算机，然后再试一次。"
 
-#: protocols/sms/services/smsclient.cpp:179
+#: libkopete/kopetemetacontact.cpp:345 libkopete/kopetemetacontact.cpp:363
+#: libkopete/kopetemetacontact.cpp:439
 msgid ""
-"<qt>SMSClient is a program for sending SMS with the modem. The program can be "
-"found on <a href=\"%1\">%1</a></qt>"
-msgstr ""
-"<qt>SMSClient 是一个通过调制解调器发送 SMS 短消息的程序。该程序可以在 <a href=\"%1\">%1</a> 找到</qt>"
-
-#: protocols/sms/services/smssendprovider.cpp:215
-msgid "Could not determine which argument which should contain the message."
-msgstr "无法确定应该是哪个参数包含消息。"
-
-#: protocols/sms/services/smssendprovider.cpp:223
-msgid "Could not determine which argument which should contain the number."
-msgstr "无法确定应该是哪个参数包含号码。"
-
-#: protocols/gadu/gadusession.cpp:217 protocols/gadu/gadusession.cpp:230
-#: protocols/gadu/gadusession.cpp:242 protocols/gadu/gadusession.cpp:275
-msgid "You are not connected to the server."
-msgstr "您还没有连接到服务器上。"
-
-#: protocols/gadu/gadusession.cpp:289 protocols/gadu/gadusession.cpp:307
-msgid "You have to be connected to the server to change your status."
-msgstr "您必须要连接到服务器上才能改变您的状态。"
-
-#: protocols/gadu/gadusession.cpp:574
-msgid "idle"
-msgstr "空闲"
-
-#: protocols/gadu/gadusession.cpp:576
-msgid "resolving host"
-msgstr "正在解析主机"
-
-#: protocols/gadu/gadusession.cpp:578
-msgid "connecting"
-msgstr "正在连接"
-
-#: protocols/gadu/gadusession.cpp:580
-msgid "reading data"
-msgstr "正在读取数据"
-
-#: protocols/gadu/gadusession.cpp:582
-msgid "error"
-msgstr "错误"
-
-#: protocols/gadu/gadusession.cpp:584
-msgid "connecting to hub"
-msgstr "正在连接到集线器"
-
-#: protocols/gadu/gadusession.cpp:586
-msgid "connecting to server"
-msgstr "正在连接到服务器"
-
-#: protocols/gadu/gadusession.cpp:588
-msgid "retrieving key"
-msgstr "获取密钥"
-
-#: protocols/gadu/gadusession.cpp:590
-msgid "waiting for reply"
-msgstr "等待回复"
-
-#: protocols/gadu/gadusession.cpp:592
-msgid "connected"
-msgstr "已连接"
-
-#: protocols/gadu/gadusession.cpp:594
-msgid "sending query"
-msgstr "发送查询"
-
-#: protocols/gadu/gadusession.cpp:596
-msgid "reading header"
-msgstr "读取头"
-
-#: protocols/gadu/gadusession.cpp:598
-msgid "parse data"
-msgstr "分析数据"
-
-#: protocols/gadu/gadusession.cpp:600
-msgid "done"
-msgstr "完成"
-
-#: protocols/gadu/gadusession.cpp:602
-msgid "Tls connection negotiation"
-msgstr "TLS 连接谈判"
-
-#: protocols/gadu/gadusession.cpp:604
-msgid "unknown"
-msgstr "未知"
-
-#: protocols/gadu/gadusession.cpp:612
-msgid "Resolving error."
-msgstr "解析出错。"
-
-#: protocols/gadu/gadusession.cpp:614
-msgid "Connecting error."
-msgstr "连接出错。"
-
-#: protocols/gadu/gadusession.cpp:616
-msgid "Reading error."
-msgstr "读取错误。"
-
-#: protocols/gadu/gadusession.cpp:618
-msgid "Writing error."
-msgstr "写入错误。"
-
-#: protocols/gadu/gadusession.cpp:620 protocols/gadu/gadusession.cpp:645
-#, c-format
-msgid "Unknown error number %1."
-msgstr "未知错误号 %1。"
-
-#: protocols/gadu/gadusession.cpp:629
-msgid "Unable to resolve server address. DNS failure."
-msgstr "无法解析服务器地址。DNS 失败。"
-
-#: protocols/gadu/gadusession.cpp:631
-msgid "Unable to connect to server."
-msgstr "无法连接服务器。"
-
-#: protocols/gadu/gadusession.cpp:633
-msgid "Server send incorrect data. Protocol error."
-msgstr "服务器发送了不正确的数据。协议错误。"
+"This user is not reachable at the moment. Please make sure you are connected "
+"and using a protocol that supports offline sending, or wait until this user "
+"comes online."
+msgstr "此时无法联系到此用户。请确定您已经上线，并且使用了支持离线发送消息的协议，或者等到该用户上线后再发。"
 
-#: protocols/gadu/gadusession.cpp:635
-msgid "Problem reading data from server."
-msgstr "从服务器读取数据出错。"
+#: libkopete/kopetecontact.cpp:453 libkopete/kopetemetacontact.cpp:346
+#: libkopete/kopetemetacontact.cpp:364 libkopete/kopetemetacontact.cpp:440
+msgid "User is Not Reachable"
+msgstr "无法联系用户"
 
-#: protocols/gadu/gadusession.cpp:637
-msgid "Problem sending data to server."
-msgstr "向服务器发送数据有问题。"
+#: libkopete/kopetechatsession.cpp:251
+msgid "Outgoing Message Sent"
+msgstr "已发出的信息"
 
-#: protocols/gadu/gadusession.cpp:639
-msgid "Incorrect password."
-msgstr "密码不对。"
+#: libkopete/kopetechatsession.cpp:267
+msgid "A contact sent you a buzz/nudge."
+msgstr "联系人向您发送了闪屏振动。"
 
-#: protocols/gadu/gadusession.cpp:643
+#: libkopete/kopetechatsession.cpp:451
 msgid ""
-"Unable to connect over encrypted channel.\n"
-"Try to turn off encryption support in Gadu account settings and reconnect."
-msgstr ""
-"无法通过加密通道连接。\n"
-"试着关闭 Gadu 账户设置中的加密支持，然后重新连接。"
-
-#: protocols/gadu/gaduregisteraccount.cpp:39
-msgid "Register New Account"
-msgstr "注册新账户"
-
-#: protocols/gadu/gaduregisteraccount.cpp:67
-msgid "Retrieving token"
-msgstr "注册验证码"
-
-#: protocols/gadu/gaduregisteraccount.cpp:89
-msgid "Please enter a valid E-Mail Address."
-msgstr "请输入一个有效的电子邮件地址。"
-
-#: protocols/gadu/gaduregisteraccount.cpp:99
-#: protocols/jabber/ui/jabberregisteraccount.cpp:152
-msgid "Please enter the same password twice."
-msgstr "请输入两次同样的密码。"
-
-#: protocols/gadu/gaduregisteraccount.cpp:106
-#: protocols/jabber/ui/jabberregisteraccount.cpp:161
-msgid "Password entries do not match."
-msgstr "两次密码不符。"
-
-#: protocols/gadu/gaduregisteraccount.cpp:113
-msgid "Please enter the verification sequence."
-msgstr "请输入校验序列。"
-
-#: protocols/gadu/gaduregisteraccount.cpp:159
-#, c-format
-msgid "Account created; your new UIN is %1."
-msgstr "账户已创建；您新的 UIN 是 %1。"
-
-#: protocols/gadu/gaduregisteraccount.cpp:167
-#, c-format
-msgid "Registration failed: %1"
-msgstr "注册失败：%1"
-
-#: protocols/gadu/gadueditcontact.cpp:50 protocols/gadu/gadueditcontact.cpp:68
-msgid "Edit Contact's Properties"
-msgstr "编辑联系人属性"
-
-#: protocols/gadu/gaducontact.cpp:229
-msgid "Gadu contact"
-msgstr "Gadu 联系人"
-
-#: protocols/gadu/gaducontact.cpp:248
-msgid "Gadu-Gadu Plugin"
-msgstr "Gadu-Gadu 插件"
-
-#: protocols/gadu/gaducommands.cpp:146 protocols/gadu/gaducommands.cpp:183
-#: protocols/gadu/gaducommands.cpp:199 protocols/gadu/gaducommands.cpp:234
-#: protocols/gadu/gaducommands.cpp:250 protocols/gadu/gadueditaccount.cpp:194
-#: protocols/gadu/gadueditaccount.cpp:215
-#: protocols/gadu/gadueditaccount.cpp:220
-#: protocols/gadu/gadueditaccount.cpp:225
-#: protocols/gadu/gadueditaccount.cpp:256
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
-
-#: protocols/gadu/gaducommands.cpp:146 protocols/gadu/gaducommands.cpp:234
-msgid "Unable to retrieve token."
-msgstr "无法获取验证码。"
-
-#: protocols/gadu/gaducommands.cpp:183
-msgid "Registration FAILED"
-msgstr "注册失败"
-
-#: protocols/gadu/gaducommands.cpp:199
-msgid "Unknown connection error while retrieving token."
-msgstr "在获取验证码时出现未知连接错误。"
-
-#: protocols/gadu/gaducommands.cpp:207
-#, c-format
-msgid "Token retrieving status: %1"
-msgstr "令牌获取状态：%1"
-
-#: protocols/gadu/gaducommands.cpp:216
-msgid "Gadu-Gadu token retrieve problem"
-msgstr "Gadu-Gadu 令牌获取出错"
-
-#: protocols/gadu/gaducommands.cpp:250
-msgid "Unknown connection error while registering."
-msgstr "在注册时出现未知连接错误。"
-
-#: protocols/gadu/gaducommands.cpp:257
-#, c-format
-msgid "Registration status: %1"
-msgstr "注册状态：%1"
-
-#: protocols/gadu/gaducommands.cpp:266
-msgid "Gadu-Gadu Registration Error"
-msgstr "Gadu-Gadu 注册错误"
-
-#: protocols/gadu/gaducommands.cpp:278
-msgid "Registration Finished"
-msgstr "注册完成"
-
-#: protocols/gadu/gaducommands.cpp:278
-msgid "Registration has completed successfully."
-msgstr "注册已成功完成。"
-
-#: protocols/gadu/gaducommands.cpp:281
-msgid "Registration Error"
-msgstr "注册错误"
-
-#: protocols/gadu/gaducommands.cpp:281
-msgid "Incorrect data sent to server."
-msgstr "向服务器发送了不正确的数据。"
-
-#: protocols/gadu/gaduaccount.cpp:714 protocols/gadu/gaducommands.cpp:328
-#: protocols/gadu/gaducommands.cpp:336 protocols/gadu/gaducommands.cpp:384
-msgid "Connection Error"
-msgstr "连接错误"
-
-#: protocols/gadu/gaducommands.cpp:328 protocols/gadu/gaducommands.cpp:336
-msgid "Password reminding finished prematurely due to a connection error."
-msgstr "由于连接错误，密码提示过早结束。"
-
-#: protocols/gadu/gaducommands.cpp:344
-msgid "Successfully"
-msgstr "成功"
+"<qt>An error has occurred while creating a new chat window. The chat window has "
+"not been created.</qt>"
+msgstr "<qt>创建新聊天窗口时出错。聊天窗口未创建。</qt>"
 
-#: protocols/gadu/gaducommands.cpp:344
-msgid "Unsuccessful. Please retry."
-msgstr "不成功，请重试。"
+#: libkopete/kopetechatsession.cpp:452
+msgid "Error While Creating Chat Window"
+msgstr "创建聊天窗口时出错"
 
-#: protocols/gadu/gaducommands.cpp:345
-msgid "Remind Password"
-msgstr "提示密码"
+#: libkopete/knotification.cpp:130 libkopete/knotification.cpp:151
+msgid "Fatal"
+msgstr "严重"
 
-#: protocols/gadu/gaducommands.cpp:345
-msgid "Remind password finished: "
-msgstr "密码提示结束： "
+#: libkopete/kopetegroup.cpp:55
+msgid "Not in your contact list"
+msgstr "不在您的联系人列表中"
 
-#: protocols/gadu/gaducommands.cpp:384
-msgid "Password changing finished prematurely due to a connection error."
-msgstr "由于连接错误，密码改变过早结束。"
+#: libkopete/kopetegroup.cpp:217
+msgid "(Unnamed Group)"
+msgstr "(未命名组)"
 
-#: protocols/gadu/gaducommands.cpp:392
-msgid "State Error"
-msgstr "状态错误"
+#: libkopete/kopetepassword.cpp:181
+msgid "Password Required"
+msgstr "需要密码"
 
-#: protocols/gadu/gaducommands.cpp:393
+#: libkopete/kopetepassword.cpp:293
 msgid ""
-"Password changing finished prematurely due to a session related problem (try "
-"again later)."
-msgstr "由于会话相关的问题(请稍后重试)，密码改变过早结束。"
+"<qt>Kopete is unable to save your password securely in your wallet;"
+"<br>do you want to save the password in the <b>unsafe</b> "
+"configuration file instead?</qt>"
+msgstr "<qt>Kopete 无法将您的密码安全地保存于钱包中；<br>您想要将密码保存于<b>不安全的</b>配置文件中吗？</qt>"
 
-#: protocols/gadu/gaducommands.cpp:400
-msgid "Changed Password"
-msgstr "已更改密码"
+#: libkopete/kopetepassword.cpp:295
+msgid "Unable to Store Secure Password"
+msgstr "无法存储安全密码"
 
-#: protocols/gadu/gaducommands.cpp:400
-msgid "Your password has been changed."
-msgstr "您的密码已经改变。"
+#: libkopete/kopetepassword.cpp:296
+msgid "Store &Unsafe"
+msgstr "非安全存储(&U)"
 
-#: protocols/gadu/gadueditaccount.cpp:88
+#: libkopete/connectionmanager.cpp:144
 msgid ""
-"_: personal information being fetched from server\n"
-"<p align=\"center\">Fetching from server</p>"
-msgstr "<p align=\"center\">正从服务器获取</p>"
-
-#: protocols/gadu/gadueditaccount.cpp:194
-msgid "<b>Registration FAILED.</b>"
-msgstr "<b>注册失败。</b>"
-
-#: protocols/gadu/gadueditaccount.cpp:215
-msgid "<b>Enter UIN please.</b>"
-msgstr "<b>请输入 UNI。</b>"
-
-#: protocols/gadu/gadueditaccount.cpp:220
-msgid "<b>UIN should be a positive number.</b>"
-msgstr "<b>UIN 应该是一个正数。</b>"
-
-#: protocols/gadu/gadueditaccount.cpp:225
-msgid "<b>Enter password please.</b>"
-msgstr "<b>请输入的密码。</b>"
-
-#: protocols/gadu/gadueditaccount.cpp:256
-msgid "<b>Starting DCC listening socket failed; dcc is not working now.</b>"
-msgstr "<b>启动二人世界监听套接字失败；现在无法进行二人世界。</b>"
-
-#: protocols/gadu/gaduaccount.cpp:186
-msgid "&Search for Friends"
-msgstr "搜索朋友(&S)"
-
-#: protocols/gadu/gaduaccount.cpp:188
-msgid "Export Contacts to Server"
-msgstr "将联系人导出至服务器"
-
-#: protocols/gadu/gaduaccount.cpp:190
-msgid "Export Contacts to File..."
-msgstr "将联系人导出至文件..."
-
-#: protocols/gadu/gaduaccount.cpp:192
-msgid "Import Contacts From File..."
-msgstr "从文件导入联系人..."
-
-#: protocols/gadu/gaduaccount.cpp:194
-msgid "Only for Friends"
-msgstr "只对朋友"
-
-#: protocols/gadu/gaduaccount.cpp:255
-msgid "%1 <%2> "
-msgstr "%1 <%2> "
-
-#: protocols/gadu/gaduaccount.cpp:289
-msgid "Go O&nline"
-msgstr "转为在线(&N)"
-
-#: protocols/gadu/gaduaccount.cpp:293
-msgid "Set &Busy"
-msgstr "设为忙碌(&B)"
-
-#: protocols/gadu/gaduaccount.cpp:297
-msgid "Set &Invisible"
-msgstr "设置为隐身(&I)"
-
-#: protocols/gadu/gaduaccount.cpp:301
-msgid "Go &Offline"
-msgstr "转为离线(&O)"
-
-#: protocols/gadu/gaduaccount.cpp:305
-msgid "Set &Description..."
-msgstr "设置描述(&D)..."
-
-#: protocols/gadu/gaduaccount.cpp:685
-msgid "connection using SSL was not possible, retrying without."
-msgstr "无法使用 SSL 连接，将取消 SSL 后重试。"
-
-#: protocols/gadu/gaduaccount.cpp:713
-msgid "unable to connect to the Gadu-Gadu server(\"%1\")."
-msgstr "无法连接到 Gadu-Gadu 服务器(“%1”)。"
-
-#: protocols/gadu/gaduaccount.cpp:897
-msgid "Contacts exported to the server."
-msgstr "联系人已经导出至服务器。"
-
-#: protocols/gadu/gaduaccount.cpp:928
-msgid "Save Contacts List for Account %1 As"
-msgstr "将账户 %1 的联系人列表另存为"
-
-#: protocols/gadu/gaduaccount.cpp:936
-msgid "Unable to create temporary file."
-msgstr "无法创建临时文件。"
-
-#: protocols/gadu/gaduaccount.cpp:936 protocols/gadu/gaduaccount.cpp:950
-msgid "Save Contacts List Failed"
-msgstr "保存联系人列表失败"
-
-#: protocols/gadu/gaduaccount.cpp:974
-msgid "Load Contacts List for Account %1 As"
-msgstr "将账户 %1 的联系人列表装入为"
-
-#: protocols/gadu/gaduaccount.cpp:994 protocols/gadu/gaduaccount.cpp:1000
-msgid "Contacts List Load Has Failed"
-msgstr "联系人列表装入失败"
-
-#: protocols/gadu/gadudcctransaction.cpp:237
-#: protocols/jabber/jabberfiletransfer.cpp:148
-msgid "&Resume"
-msgstr "续传(&R)"
-
-#: protocols/gadu/gadudcctransaction.cpp:238
-#: protocols/jabber/jabberfiletransfer.cpp:149
-msgid "Over&write"
-msgstr "覆盖(&W)"
-
-#: protocols/gadu/gadudcctransaction.cpp:240
-#: protocols/jabber/jabberfiletransfer.cpp:152
-msgid "The file %1 already exists, do you want to resume or overwrite it?"
-msgstr "文件 %1 已经存在，您是想要续传还是覆盖？"
+"A network connection was disconnected.  The application is now in offline mode. "
+" Do you want the application to resume network operations when the network is "
+"available again?"
+msgstr "网络连接已经断开。应用程序现在转入离线模式。您是否希望应用程序在网络连通之后恢复网络操作？"
 
-#: protocols/gadu/gadudcctransaction.cpp:241
-#: protocols/jabber/jabberfiletransfer.cpp:153
-#, c-format
-msgid "File Exists: %1"
-msgstr "文件已存在：%1"
+#: libkopete/connectionmanager.cpp:145
+msgid "This application is currently in offline mode.  Do you want to connect?"
+msgstr "此应用程序目前位于离线模式。您是否想要连接？"
 
-#: protocols/gadu/gadudcctransaction.cpp:408
+#: libkopete/connectionmanager.cpp:147
 msgid ""
-"Connection to peer was refused; it possibly does not listen for incoming "
-"connections."
-msgstr "连接到对方被拒绝；可能对方没有监听传入的连接。"
-
-#: protocols/gadu/gadudcctransaction.cpp:412
-msgid "File transfer transaction was not agreed by peer."
-msgstr "对方不同意文件传送。"
-
-#: protocols/gadu/gadudcctransaction.cpp:416
-msgid "File-transfer handshake failure."
-msgstr "文件传送握手失败。"
-
-#: protocols/gadu/gadudcctransaction.cpp:419
-msgid "File transfer had problems with the file."
-msgstr "传送此文件时有问题。"
-
-#: protocols/gadu/gadudcctransaction.cpp:422
-msgid "There was network error during file transfer."
-msgstr "文件传送过程中网络有错。"
-
-#: protocols/gadu/gadudcctransaction.cpp:425
-msgid "Unknown File-Transfer error."
-msgstr "未知文件传送错误。"
-
-#: protocols/gadu/gadupubdir.cpp:74 protocols/gadu/gadupubdir.cpp:315
-msgid "Search &More..."
-msgstr "搜索更多人(&M)..."
-
-#: protocols/gadu/gadupubdir.cpp:95
-msgid "Gadu-Gadu Public Directory"
-msgstr "Gadu-Gadu 公开目录"
-
-#: protocols/gadu/gadupubdir.cpp:102
-msgid "&New Search"
-msgstr "新建搜索(&N)"
-
-#: protocols/gadu/gadupubdir.cpp:104
-msgid "&Add User..."
-msgstr "添加用户(&A)..."
-
-#: protocols/gadu/gaduprotocol.cpp:57
-msgid "Blocked"
-msgstr "被屏蔽"
-
-#: protocols/gadu/gaduprotocol.cpp:61
-msgid "A&way"
-msgstr "离开(&W)"
-
-#: protocols/gadu/gaduprotocol.cpp:63 protocols/gadu/gaduprotocol.cpp:65
-msgid "B&usy"
-msgstr "忙碌(&U)"
-
-#: protocols/gadu/gaduprotocol.cpp:67 protocols/gadu/gaduprotocol.cpp:69
-msgid "I&nvisible"
-msgstr "隐身(&N)"
-
-#: protocols/groupwise/ui/gwaddcontactpage.cpp:63
-#: protocols/jabber/ui/jabberaddcontactpage.cpp:62
-#: protocols/oscar/aim/aimprotocol.cpp:186
-#: protocols/oscar/aim/ui/aimaddcontactpage.cpp:42
-msgid "You need to be connected to be able to add contacts."
-msgstr "您需要被连接上才能够添加联系人。"
-
-#: protocols/oscar/aim/ui/aimaddcontactpage.cpp:43
-msgid "Connect to the AIM network and try again."
-msgstr "连接到 AIM 网络后再重试。"
+"This application is currently in offline mode.  Do you want to connect in order "
+"to carry out this operation?"
+msgstr "此应用程序目前位于离线模式。您是否想要连接以便执行此操作？"
 
-#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:151
-#: protocols/oscar/aim/ui/aimaddcontactpage.cpp:65
-#: protocols/winpopup/wpeditaccount.cpp:100
-#: protocols/yahoo/yahooeditaccount.cpp:108
-msgid "<qt>You must enter a valid screen name.</qt>"
-msgstr "<qt>您必须输入一个有效的屏幕名。</qt>"
+#: libkopete/connectionmanager.cpp:148
+msgid "Leave Offline Mode?"
+msgstr "离开离线模式吗？"
 
-#: protocols/oscar/aim/ui/aimaddcontactpage.cpp:66
-msgid "No Screen Name"
-msgstr "无屏幕名"
+#: libkopete/kopeteaway.cpp:170
+msgid "Sorry, I am busy right now"
+msgstr "抱歉，我现在正忙"
 
-#: protocols/oscar/aim/aimcontact.cpp:93
-msgid "&Warn User"
-msgstr "警告用户(&W)"
+#: libkopete/kopeteaway.cpp:171 libkopete/kopeteaway.cpp:184
+msgid "I am gone right now, but I will be back later"
+msgstr "我现在已离开，不过稍后会回来"
 
-#: protocols/oscar/aim/aimcontact.cpp:95
-#: protocols/oscar/icq/icqcontact.cpp:705
-msgid "Always &Visible To"
-msgstr "总是对谁显身(&V)"
+#: libkopete/kopeteutils.cpp:38
+msgid "You have been disconnected."
+msgstr "您已经断开。"
 
-#: protocols/oscar/aim/aimcontact.cpp:97
-#: protocols/oscar/icq/icqcontact.cpp:707
-msgid "Always &Invisible To"
-msgstr "总是对谁隐身(&I)"
+#: libkopete/kopeteutils.cpp:39
+msgid "Connection Lost."
+msgstr "连接已丢失。"
 
-#: protocols/oscar/aim/aimcontact.cpp:350
+#: libkopete/kopeteutils.cpp:40
 msgid ""
-"<qt>Would you like to warn %1 anonymously or with your name?"
-"<br>(Warning a user on AIM will result in a \"Warning Level\" increasing for "
-"the user you warn. Once this level has reached a certain point, they will not "
-"be able to sign on. Please do not abuse this function, it is meant for "
-"legitimate practices.)</qt>"
+"Kopete lost the channel used to talk to the instant messaging system.\n"
+"This can be because either your internet access went down, the service is "
+"experiencing problems, or the service disconnected you because you tried to "
+"connect with the same account from another location. Try connecting again "
+"later."
 msgstr ""
-"<qt>您想匿名警告 %1 还是留名警告？"
-"<br>(警告 AIM "
-"上的用户会导致该用户的“警告级别”被提高。一旦该级别达到一定数值，这些用户将无法登录。请不要滥用该功能，它是出于正当考虑而设置的。)</qt>"
-
-#: protocols/oscar/aim/aimcontact.cpp:358
-msgid "Warn User %1?"
-msgstr "警告用户 %1 吗？"
-
-#: protocols/oscar/aim/aimcontact.cpp:359
-msgid "Warn Anonymously"
-msgstr "匿名警告"
-
-#: protocols/oscar/aim/aimcontact.cpp:359
-msgid "Warn"
-msgstr "警告"
-
-#: protocols/oscar/aim/aimuserinfo.cpp:41
-#: protocols/oscar/aim/aimuserinfo.cpp:136
-#: protocols/oscar/aim/aimuserinfo.cpp:153
-#, c-format
-msgid "User Information on %1"
-msgstr "%1 的用户信息"
-
-#: protocols/oscar/aim/aimuserinfo.cpp:90
-msgid "&Save Profile"
-msgstr "保存配置文件(&S)"
+"Kopete 丢失了即时消息系统正在使用的对话频道。\n"
+"这可能是因为您的网络连接已断开，对方的网络服务问题，或是因为您正从另一个地方尝试登录同一账户导致服务中断。请稍后再尝试重新连接。"
 
-#: protocols/oscar/aim/aimuserinfo.cpp:116
-msgid "Requesting User Profile, please wait..."
-msgstr "正在请求用户配置文件，请稍候..."
+#: libkopete/kopeteutils.cpp:42
+msgid "Can't connect with the instant messaging server or peers."
+msgstr "无法连接到即时通讯服务器或对方。"
 
-#: protocols/oscar/aim/aimuserinfo.cpp:198
-msgid "<html><body><I>No user information provided</I></body></html>"
-msgstr "<html><body><I>没有提供用户信息</I></body></html>"
+#: libkopete/kopeteutils.cpp:43
+msgid "Can't connect."
+msgstr "无法连接。"
 
-#: protocols/oscar/aim/aimaccount.cpp:211
+#: libkopete/kopeteutils.cpp:44
 msgid ""
-"Visit the Kopete website at <a href=\"http://kopete.kde.org\">"
-"http://kopete.kde.org</a>"
+"This means Kopete can't reach the instant messaging server or peers.\n"
+"This can be because either your internet access is down or the server is "
+"experiencing problems. Try connecting again later."
 msgstr ""
-"浏览 Kopete 的网站：<a href=\"http://kopete.kde.org\">http://kopete.kde.org</a>"
-
-#: protocols/oscar/aim/aimaccount.cpp:325
-msgid "Join Chat..."
-msgstr "加入聊天..."
-
-#: protocols/oscar/aim/aimaccount.cpp:328
-#: protocols/oscar/icq/icqaccount.cpp:137
-msgid "Set Visibility..."
-msgstr "设置是否有空..."
-
-#: protocols/jabber/jabberaccount.cpp:202
-#: protocols/oscar/aim/aimaccount.cpp:334
-msgid "Edit User Info..."
-msgstr "编辑用户信息..."
-
-#: protocols/oscar/aim/aimaccount.cpp:385
-msgid "Editing your user info is not possible because you are not connected."
-msgstr "无法编辑您的用户信息，原因是您没有连接。"
-
-#: protocols/oscar/aim/aimaccount.cpp:387
-msgid "Unable to edit user info"
-msgstr "无法编辑用户信息"
-
-#: protocols/oscar/aim/aimaccount.cpp:511
-msgid "Joining an AIM chat room is not possible because you are not connected."
-msgstr "在未处于连接状态时您无法加入 AIM 聊天室。"
-
-#: protocols/oscar/aim/aimaccount.cpp:513
-msgid "Unable to Join AIM Chat Room"
-msgstr "无法加入 AIM 聊天室"
-
-#: protocols/oscar/aim/aimaccount.cpp:789
-#: protocols/oscar/icq/icqaccount.cpp:226
-msgid "You must be online to set users visibility."
-msgstr "要设定用户可见性，您必须上线。"
-
-#: protocols/oscar/aim/aimaccount.cpp:790
-#: protocols/oscar/icq/icqaccount.cpp:227
-#: protocols/oscar/icq/ui/icqaddcontactpage.cpp:86
-#: protocols/oscar/icq/ui/icqaddcontactpage.cpp:94
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:83
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:108
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:147
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:196
-msgid "ICQ Plugin"
-msgstr "ICQ 插件"
+"这意味着 Kopete 无法联系到即时消息服务器或对象个人。\n"
+"这可能是因为您的网络连接已断开或是对方的网络服务问题。请稍后再尝试重新连接。"
 
-#: protocols/oscar/aim/aimprotocol.cpp:187
-#: protocols/oscar/oscaraccount.cpp:809 protocols/yahoo/yahooprotocol.cpp:74
-msgid "AIM"
-msgstr "AIM"
+#: libkopete/kopeteutils.cpp:55
+msgid "More Information..."
+msgstr "更多信息..."
 
-#: protocols/oscar/aim/aimprotocol.cpp:192
-msgid "Do you want to add '%1' to your contact list?"
-msgstr "您想要把“%1”添加到您的联系人列表吗？"
+#: libkopete/kopetemimetypehandler.cpp:153
+#, c-format
+msgid "Unable to find the file %1."
+msgstr "找不到文件 %1。"
 
-#: protocols/oscar/aim/aimprotocol.cpp:214
+#: libkopete/kopetemimetypehandler.cpp:157
 msgid ""
-"Unable to connect to the chat room %1 because the account for %2 is not "
-"connected."
-msgstr "无法连接到聊天室 %1，原因是 %2 的帐户未连接。"
-
-#: protocols/oscar/aim/aimprotocol.cpp:236
-msgid "Mobile"
-msgstr "手机"
-
-#: protocols/oscar/aim/aimprotocol.cpp:239
-msgid "Mobile Away"
-msgstr "手机离开"
-
-#: protocols/oscar/aim/aimprotocol.cpp:240
-#: protocols/oscar/icq/icqpresence.cpp:129
-msgid "Connecting..."
-msgstr "正在连接..."
-
-#: protocols/oscar/aim/aimprotocol.cpp:242
-#: protocols/oscar/icq/icqprotocol.cpp:183
-msgid "Client Features"
-msgstr "客户特性"
-
-#: protocols/oscar/aim/aimprotocol.cpp:243
-msgid "User Profile"
-msgstr "用户配置文件"
-
-#: protocols/oscar/aim/aimprotocol.cpp:244
-#: protocols/oscar/icq/icqprotocol.cpp:184
-msgid "Buddy Icon MD5 Hash"
-msgstr "好友图标 MD5 哈希"
-
-#: protocols/oscar/aim/aimjoinchat.cpp:31
-msgid "Join AIM Chat Room"
-msgstr "加入 AIM 聊天室"
-
-#: protocols/oscar/aim/aimjoinchat.cpp:32
-msgid "Join"
-msgstr "加入"
-
-#: protocols/oscar/icq/icqprotocol.cpp:139
-#: protocols/oscar/icq/ui/icqaddcontactpage.cpp:86
-msgid "You must be online to add a contact."
-msgstr "要添加联系人，您必须上线。"
-
-#: protocols/oscar/icq/ui/icqaddcontactpage.cpp:94
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:108
-msgid "You must enter a valid UIN."
-msgstr "您必须输入一个有效的 UIN。"
-
-#: protocols/oscar/icq/ui/icqauthreplydialog.cpp:28
-msgid "Authorization Reply"
-msgstr "身份验证回复"
-
-#: protocols/oscar/icq/ui/icqauthreplydialog.cpp:53
-msgid "<b>%1</b> requested authorization to add you to his/her contact list."
-msgstr "<b>%1</b> 请求将您添加到他/她的联系人列表中。"
-
-#: protocols/oscar/icq/ui/icqauthreplydialog.cpp:55
-msgid "Authorization reply to <b>%1</b>."
-msgstr "对 <b>%1</b> 的身份验证回复。"
-
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:44
-msgid "ICQ User Information"
-msgstr "ICQ 用户信息"
-
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:48
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:48
-msgid "General Info"
-msgstr "常规信息"
-
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:49
-msgid "General ICQ Information"
-msgstr "ICQ 常规信息"
-
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:55
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:55
-msgid "Work Info"
-msgstr "工作信息"
-
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:56
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:56
-msgid "Work Information"
-msgstr "工作信息"
-
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:62
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:62
-msgid "Other Info"
-msgstr "其它信息"
-
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:63
-msgid "Other ICQ Information"
-msgstr "ICQ 其它信息"
-
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:69
-msgid "Interest Info"
-msgstr "兴趣信息"
-
-#: protocols/oscar/icq/ui/icquserinfowidget.cpp:70
-msgid "Interest"
-msgstr "兴趣"
-
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:45
-msgid "ICQ User Search"
-msgstr "ICQ 用户搜索"
-
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:83
-msgid "You must be online to search the ICQ Whitepages."
-msgstr "要搜索 ICQ 白页，您必须上线。"
-
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:147
-msgid "You must enter search criteria."
-msgstr "您必须输入搜索条件。"
-
-#: protocols/oscar/icq/ui/icqsearchdialog.cpp:196
-msgid "You must be online to display user info."
-msgstr "要显示用户信息，您必须上线。"
-
-#: protocols/oscar/icq/icqprotocol.cpp:139
-#: protocols/oscar/oscaraccount.cpp:809 protocols/yahoo/yahooprotocol.cpp:75
-msgid "ICQ"
-msgstr "ICQ"
-
-#: protocols/oscar/icq/icqprotocol.cpp:144
-msgid "'%1'"
-msgstr "“%1”"
-
-#: protocols/oscar/icq/icqprotocol.cpp:145
-msgid "'%1' (%2)"
-msgstr "“%1”(%2)"
-
-#: protocols/oscar/icq/icqprotocol.cpp:148
-msgid "Do you want to add %1 to your contact list?"
-msgstr "您要把 %1 添加到您的联系人列表吗？"
-
-#: protocols/oscar/icq/icqprotocol.cpp:182
-msgid "IP Address"
-msgstr "IP 地址"
-
-#: protocols/oscar/icq/icqprotocol.cpp:185
-msgid "Contact Encoding"
-msgstr "联系人编码"
-
-#: protocols/oscar/icq/icqprotocol.cpp:235
-msgid "Ascension Island"
-msgstr "阿森松群岛"
-
-#: protocols/oscar/icq/icqprotocol.cpp:237
-msgid "Australian Antarctic Territory"
-msgstr "澳属南极地区"
-
-#: protocols/oscar/icq/icqprotocol.cpp:244
-msgid "Barbuda"
-msgstr "巴布达"
-
-#: protocols/oscar/icq/icqprotocol.cpp:255
-msgid "British Virgin Islands"
-msgstr "不列颠维尔金群岛"
-
-#: protocols/oscar/icq/icqprotocol.cpp:281
-msgid "Diego Garcia"
-msgstr "迭哥伽西亚"
-
-#: protocols/oscar/icq/icqprotocol.cpp:297
-msgid "French Antilles"
-msgstr "法属安的列斯"
-
-#: protocols/oscar/icq/icqprotocol.cpp:311
-msgid "Guantanamo Bay"
-msgstr "关塔那摩湾"
-
-#: protocols/oscar/icq/icqprotocol.cpp:320
-msgid "INMARSAT (Atlantic-East)"
-msgstr "国际海事卫星电话 (大西洋-东)"
-
-#: protocols/oscar/icq/icqprotocol.cpp:321
-msgid "INMARSAT (Atlantic-West)"
-msgstr "国际海事卫星电话 (大西洋-西)"
-
-#: protocols/oscar/icq/icqprotocol.cpp:322
-msgid "INMARSAT (Indian)"
-msgstr "国际海事卫星电话 (印度)"
-
-#: protocols/oscar/icq/icqprotocol.cpp:323
-msgid "INMARSAT (Pacific)"
-msgstr "国际海事卫星电话 (太平洋)"
-
-#: protocols/oscar/icq/icqprotocol.cpp:324
-msgid "INMARSAT"
-msgstr "国际海事卫星电话"
-
-#: protocols/oscar/icq/icqprotocol.cpp:328
-msgid "International Freephone Service"
-msgstr "国际免费电话服务"
-
-#: protocols/oscar/icq/icqprotocol.cpp:334
-#: protocols/oscar/icq/icqprotocol.cpp:408
-msgid "Ivory Coast"
-msgstr "象牙海岸"
-
-#: protocols/oscar/icq/icqprotocol.cpp:380
-msgid "Nevis"
-msgstr "吉维斯"
-
-#: protocols/oscar/icq/icqprotocol.cpp:402
-msgid "Reunion Island"
-msgstr "留尼汪岛"
-
-#: protocols/oscar/icq/icqprotocol.cpp:404
-msgid "Rota Island"
-msgstr "罗塔岛"
-
-#: protocols/oscar/icq/icqprotocol.cpp:437
-msgid "Tinian Island"
-msgstr "天年岛"
-
-#. i18n("Arabic")
-#: protocols/oscar/icq/icqprotocol.cpp:475
-msgid "Bhojpuri"
-msgstr "博杰普尔语"
-
-#. i18n("Bulgarian")
-#. i18n("Burmese")
-#: protocols/oscar/icq/icqprotocol.cpp:478
-msgid "Cantonese"
-msgstr "粤语"
-
-#. i18n("Catalan")
-#. i18n("Chinese")
-#. i18n("Croatian")
-#. i18n("Czech")
-#. i18n("Danish")
-#. i18n("Dutch")
-#. i18n("English")
-#. i18n("Esperanto")
-#. i18n("Estonian")
-#: protocols/oscar/icq/icqprotocol.cpp:488
-msgid "Farsi"
-msgstr "波斯"
-
-#. i18n("Finnish")
-#. i18n("French")
-#. i18n("Gaelic")
-#. i18n("German")
-#. i18n("Greek")
-#. i18n("Hebrew")
-#. i18n("Hindi")
-#. i18n("Hungarian")
-#. i18n("Icelandic")
-#. i18n("Indonesian")
-#. i18n("Italian")
-#. i18n("Japanese")
-#. i18n("Khmer")
-#. i18n("Korean")
-#. i18n("Lao")
-#. i18n("Latvian")
-#. i18n("Lithuanian")
-#. i18n("Malay")
-#. i18n("Norwegian")
-#. i18n("Polish")
-#. i18n("Portuguese")
-#. i18n("Romanian")
-#. i18n("Russian")
-#. i18n("Serbian")
-#. i18n("Slovak")
-#. i18n("Slovenian")
-#. i18n("Somali")
-#. i18n("Spanish")
-#. i18n("Swahili")
-#. i18n("Swedish")
-#. i18n("Tagalog")
-#. i18n("Tatar")
-#. i18n("Thai")
-#. i18n("Turkish")
-#. i18n("Ukrainian")
-#. i18n("Urdu")
-#. i18n("Vietnamese")
-#. i18n("Yiddish")
-#. i18n("Yoruba")
-#: protocols/oscar/icq/icqprotocol.cpp:528
-msgid "Taiwanese"
-msgstr "中国台湾"
-
-#: protocols/oscar/icq/icqprotocol.cpp:537
-#: protocols/oscar/oscarencodingselectiondialog.cpp:36
-msgid "Big5"
-msgstr "Big5"
-
-#: protocols/oscar/icq/icqprotocol.cpp:538
-#: protocols/oscar/oscarencodingselectiondialog.cpp:37
-msgid "Big5-HKSCS"
-msgstr "Big5-HKSCS"
-
-#: protocols/oscar/icq/icqprotocol.cpp:539
-#: protocols/oscar/oscarencodingselectiondialog.cpp:38
-msgid "euc-JP Japanese"
-msgstr "euc-JP 日语"
-
-#: protocols/oscar/icq/icqprotocol.cpp:540
-#: protocols/oscar/oscarencodingselectiondialog.cpp:39
-msgid "euc-KR Korean"
-msgstr "euc-KR 韩语"
-
-#: protocols/oscar/icq/icqprotocol.cpp:541
-#: protocols/oscar/oscarencodingselectiondialog.cpp:40
-msgid "GB-2312 Chinese"
-msgstr "GB-2312 中文"
-
-#: protocols/oscar/icq/icqprotocol.cpp:542
-#: protocols/oscar/oscarencodingselectiondialog.cpp:41
-msgid "GBK Chinese"
-msgstr "GBK 中文"
-
-#: protocols/oscar/icq/icqprotocol.cpp:543
-#: protocols/oscar/oscarencodingselectiondialog.cpp:42
-msgid "GB18030 Chinese"
-msgstr "GB18030 中文"
-
-#: protocols/oscar/icq/icqprotocol.cpp:545
-#: protocols/oscar/oscarencodingselectiondialog.cpp:44
-msgid "JIS Japanese"
-msgstr "JIS 日语"
-
-#: protocols/oscar/icq/icqprotocol.cpp:546
-#: protocols/oscar/oscarencodingselectiondialog.cpp:45
-msgid "Shift-JIS Japanese"
-msgstr "Shift-JIS 日语"
-
-#: protocols/oscar/icq/icqprotocol.cpp:548
-#: protocols/oscar/oscarencodingselectiondialog.cpp:47
-msgid "KOI8-R Russian"
-msgstr "KOI8-R 俄语"
-
-#: protocols/oscar/icq/icqprotocol.cpp:549
-#: protocols/oscar/oscarencodingselectiondialog.cpp:48
-msgid "KOI8-U Ukrainian"
-msgstr "KOI8-U 乌克兰语"
-
-#: protocols/oscar/icq/icqprotocol.cpp:551
-#: protocols/oscar/oscarencodingselectiondialog.cpp:50
-msgid "ISO-8859-1 Western"
-msgstr "ISO-8859-1 西方"
-
-#: protocols/oscar/icq/icqprotocol.cpp:552
-#: protocols/oscar/oscarencodingselectiondialog.cpp:51
-msgid "ISO-8859-2 Central European"
-msgstr "ISO-8859-2 中欧"
-
-#: protocols/oscar/icq/icqprotocol.cpp:553
-#: protocols/oscar/oscarencodingselectiondialog.cpp:52
-msgid "ISO-8859-3 Central European"
-msgstr "ISO-8859-3 中欧"
-
-#: protocols/oscar/icq/icqprotocol.cpp:554
-#: protocols/oscar/oscarencodingselectiondialog.cpp:53
-msgid "ISO-8859-4 Baltic"
-msgstr "ISO-8859-4 波罗的语"
-
-#: protocols/oscar/icq/icqprotocol.cpp:555
-#: protocols/oscar/oscarencodingselectiondialog.cpp:54
-msgid "ISO-8859-5 Cyrillic"
-msgstr "ISO-8859-5 西里尔语"
-
-#: protocols/oscar/icq/icqprotocol.cpp:556
-#: protocols/oscar/oscarencodingselectiondialog.cpp:55
-msgid "ISO-8859-6 Arabic"
-msgstr "ISO-8859-6 阿拉伯语"
-
-#: protocols/oscar/icq/icqprotocol.cpp:557
-#: protocols/oscar/oscarencodingselectiondialog.cpp:56
-msgid "ISO-8859-7 Greek"
-msgstr "ISO-8859-7 希腊语"
-
-#: protocols/oscar/icq/icqprotocol.cpp:558
-#: protocols/oscar/oscarencodingselectiondialog.cpp:57
-msgid "ISO-8859-8 Hebrew, visually ordered"
-msgstr "ISO-8859-8 希伯来语，可视顺序"
-
-#: protocols/oscar/icq/icqprotocol.cpp:559
-#: protocols/oscar/oscarencodingselectiondialog.cpp:58
-msgid "ISO-8859-8-I Hebrew, logically ordered"
-msgstr "ISO-8859-8-I 希伯来语，本地顺序"
-
-#: protocols/oscar/icq/icqprotocol.cpp:560
-#: protocols/oscar/oscarencodingselectiondialog.cpp:59
-msgid "ISO-8859-9 Turkish"
-msgstr "ISO-8859-9 土耳其语"
-
-#: protocols/oscar/icq/icqprotocol.cpp:561
-#: protocols/oscar/oscarencodingselectiondialog.cpp:60
-msgid "ISO-8859-10"
-msgstr "ISO-8859-10"
-
-#: protocols/oscar/icq/icqprotocol.cpp:562
-#: protocols/oscar/oscarencodingselectiondialog.cpp:61
-msgid "ISO-8859-13"
-msgstr "ISO-8859-13"
-
-#: protocols/oscar/icq/icqprotocol.cpp:563
-#: protocols/oscar/oscarencodingselectiondialog.cpp:62
-msgid "ISO-8859-14"
-msgstr "ISO-8859-14"
-
-#: protocols/oscar/icq/icqprotocol.cpp:564
-#: protocols/oscar/oscarencodingselectiondialog.cpp:63
-msgid "ISO-8859-15 Western"
-msgstr "ISO-8859-15 西方"
-
-#: protocols/oscar/icq/icqprotocol.cpp:566
-#: protocols/oscar/oscarencodingselectiondialog.cpp:65
-msgid "Windows-1250 Central European"
-msgstr "Windows-1250 中欧"
-
-#: protocols/oscar/icq/icqprotocol.cpp:567
-#: protocols/oscar/oscarencodingselectiondialog.cpp:66
-msgid "Windows-1251 Cyrillic"
-msgstr "Windows-1251 斯拉夫语"
-
-#: protocols/oscar/icq/icqprotocol.cpp:568
-#: protocols/oscar/oscarencodingselectiondialog.cpp:67
-msgid "Windows-1252 Western"
-msgstr "Windows-1252 西方"
-
-#: protocols/oscar/icq/icqprotocol.cpp:569
-#: protocols/oscar/oscarencodingselectiondialog.cpp:68
-msgid "Windows-1253 Greek"
-msgstr "Windows-1253 希腊语"
-
-#: protocols/oscar/icq/icqprotocol.cpp:570
-#: protocols/oscar/oscarencodingselectiondialog.cpp:69
-msgid "Windows-1254 Turkish"
-msgstr "Windows-1254 土耳其语"
-
-#: protocols/oscar/icq/icqprotocol.cpp:571
-#: protocols/oscar/oscarencodingselectiondialog.cpp:70
-msgid "Windows-1255 Hebrew"
-msgstr "Windows-1255 希伯来语"
-
-#: protocols/oscar/icq/icqprotocol.cpp:572
-#: protocols/oscar/oscarencodingselectiondialog.cpp:71
-msgid "Windows-1256 Arabic"
-msgstr "Windows-1256 阿拉伯语"
-
-#: protocols/oscar/icq/icqprotocol.cpp:573
-#: protocols/oscar/oscarencodingselectiondialog.cpp:72
-msgid "Windows-1257 Baltic"
-msgstr "Windows-1257 波罗的语"
-
-#: protocols/oscar/icq/icqprotocol.cpp:574
-#: protocols/oscar/oscarencodingselectiondialog.cpp:73
-msgid "Windows-1258 Viet Nam"
-msgstr "Windows-1258 越南语"
-
-#: protocols/oscar/icq/icqprotocol.cpp:576
-#: protocols/oscar/oscarencodingselectiondialog.cpp:75
-msgid "IBM 850"
-msgstr "IBM 850"
-
-#: protocols/oscar/icq/icqprotocol.cpp:577
-#: protocols/oscar/oscarencodingselectiondialog.cpp:76
-msgid "IBM 866"
-msgstr "IBM 866"
-
-#: protocols/oscar/icq/icqprotocol.cpp:579
-#: protocols/oscar/oscarencodingselectiondialog.cpp:78
-msgid "TIS-620 Thai"
-msgstr "TIS-620 泰语"
-
-#: protocols/oscar/icq/icqprotocol.cpp:581
-#: protocols/oscar/oscarencodingselectiondialog.cpp:80
-msgid "UTF-8 Unicode"
-msgstr "UTF-8 Unicode"
-
-#: protocols/oscar/icq/icqprotocol.cpp:582
-#: protocols/oscar/oscarencodingselectiondialog.cpp:81
-msgid "UTF-16 Unicode"
-msgstr "UTF-16 Unicode"
-
-#: protocols/oscar/icq/icqprotocol.cpp:596
-msgid "Single"
-msgstr "单身"
-
-#: protocols/oscar/icq/icqprotocol.cpp:597
-msgid "Long term relationship"
-msgstr "长期关系"
-
-#: protocols/oscar/icq/icqprotocol.cpp:598
-msgid "Engaged"
-msgstr "忙碌中"
-
-#: protocols/oscar/icq/icqprotocol.cpp:599
-msgid "Married"
-msgstr "已婚"
-
-#: protocols/oscar/icq/icqprotocol.cpp:600
-msgid "Divorced"
-msgstr "离婚"
-
-#: protocols/oscar/icq/icqprotocol.cpp:601
-msgid "Separated"
-msgstr "分居"
-
-#: protocols/oscar/icq/icqprotocol.cpp:602
-msgid "Widowed"
-msgstr "丧偶"
-
-#: protocols/oscar/icq/icqprotocol.cpp:609
-msgid "Art"
-msgstr "艺术"
-
-#: protocols/oscar/icq/icqprotocol.cpp:610
-msgid "Cars"
-msgstr "汽车"
-
-#: protocols/oscar/icq/icqprotocol.cpp:611
-msgid "Celebrities"
-msgstr "明星"
-
-#: protocols/oscar/icq/icqprotocol.cpp:612
-msgid "Collections"
-msgstr "收藏"
-
-#: protocols/oscar/icq/icqprotocol.cpp:613
-msgid "Computers"
-msgstr "计算机"
-
-#: protocols/oscar/icq/icqprotocol.cpp:614
-msgid "Culture"
-msgstr "文化"
-
-#: protocols/oscar/icq/icqprotocol.cpp:615
-msgid "Fitness"
-msgstr "健身"
-
-#: protocols/oscar/icq/icqprotocol.cpp:616
-#: protocols/oscar/oscarcontact.cpp:202
-msgid "Games"
-msgstr "游戏"
-
-#: protocols/oscar/icq/icqprotocol.cpp:617
-msgid "Hobbies"
-msgstr "嗜好"
-
-#: protocols/oscar/icq/icqprotocol.cpp:618
-msgid "ICQ - Help"
-msgstr "ICQ - 帮助"
-
-#: protocols/oscar/icq/icqprotocol.cpp:619
-msgid "Internet"
-msgstr "互联网"
-
-#: protocols/oscar/icq/icqprotocol.cpp:620
-msgid "Lifestyle"
-msgstr "生活方式"
-
-#: protocols/oscar/icq/icqprotocol.cpp:621
-msgid "Movies"
-msgstr "电影"
-
-#: protocols/oscar/icq/icqprotocol.cpp:622
-msgid "Music"
-msgstr "音乐"
-
-#: protocols/oscar/icq/icqprotocol.cpp:623
-msgid "Outdoors"
-msgstr "户外"
-
-#: protocols/oscar/icq/icqprotocol.cpp:624
-msgid "Parenting"
-msgstr "抚育儿女"
-
-#: protocols/oscar/icq/icqprotocol.cpp:625
-msgid "Pets and animals"
-msgstr "宠物"
-
-#: protocols/oscar/icq/icqprotocol.cpp:626
-msgid "Religion"
-msgstr "宗教信仰"
-
-#: protocols/oscar/icq/icqprotocol.cpp:627
-msgid "Science"
-msgstr "科学"
-
-#: protocols/oscar/icq/icqprotocol.cpp:628
-msgid "Skills"
-msgstr "技能"
-
-#: protocols/oscar/icq/icqprotocol.cpp:629
-msgid "Sports"
-msgstr "运动"
-
-#: protocols/oscar/icq/icqprotocol.cpp:630
-msgid "Web design"
-msgstr "Web 设计"
-
-#: protocols/oscar/icq/icqprotocol.cpp:631
-msgid "Ecology"
-msgstr "生态学"
-
-#: protocols/oscar/icq/icqprotocol.cpp:632
-msgid "News and media"
-msgstr "新闻与传媒"
-
-#: protocols/oscar/icq/icqprotocol.cpp:633
-msgid "Government"
-msgstr "政府"
-
-#: protocols/oscar/icq/icqprotocol.cpp:634
-msgid "Business"
-msgstr "商务"
-
-#: protocols/oscar/icq/icqprotocol.cpp:635
-msgid "Mystics"
-msgstr "神秘主义"
-
-#: protocols/oscar/icq/icqprotocol.cpp:636
-msgid "Travel"
-msgstr "旅行"
-
-#: protocols/oscar/icq/icqprotocol.cpp:637
-msgid "Astronomy"
-msgstr "天文"
-
-#: protocols/oscar/icq/icqprotocol.cpp:638
-msgid "Space"
-msgstr "空间"
-
-#: protocols/oscar/icq/icqprotocol.cpp:639
-msgid "Clothing"
-msgstr "衣着"
-
-#: protocols/oscar/icq/icqprotocol.cpp:640
-msgid "Parties"
-msgstr "派对"
-
-#: protocols/oscar/icq/icqprotocol.cpp:641
-msgid "Women"
-msgstr "女人"
-
-#: protocols/oscar/icq/icqprotocol.cpp:642
-msgid "Social science"
-msgstr "社会科学"
-
-#: protocols/oscar/icq/icqprotocol.cpp:643
-msgid "60's"
-msgstr "六十年代"
-
-#: protocols/oscar/icq/icqprotocol.cpp:644
-msgid "70's"
-msgstr "七十年代"
-
-#: protocols/oscar/icq/icqprotocol.cpp:645
-msgid "40's"
-msgstr "四十年代"
-
-#: protocols/oscar/icq/icqprotocol.cpp:646
-msgid "50's"
-msgstr "五十年代"
-
-#: protocols/oscar/icq/icqprotocol.cpp:647
-msgid "Finance and corporate"
-msgstr "金融与公司"
-
-#: protocols/oscar/icq/icqprotocol.cpp:648
-msgid "Entertainment"
-msgstr "娱乐"
-
-#: protocols/oscar/icq/icqprotocol.cpp:649
-msgid "Consumer electronics"
-msgstr "消费电子"
-
-#: protocols/oscar/icq/icqprotocol.cpp:650
-msgid "Retail stores"
-msgstr "零售店"
-
-#: protocols/oscar/icq/icqprotocol.cpp:651
-msgid "Health and beauty"
-msgstr "健康与美容"
-
-#: protocols/oscar/icq/icqprotocol.cpp:652
-msgid "Media"
-msgstr "媒体"
-
-#: protocols/oscar/icq/icqprotocol.cpp:653
-msgid "Household products"
-msgstr "家居产品"
-
-#: protocols/oscar/icq/icqprotocol.cpp:654
-msgid "Mail order catalog"
-msgstr "邮购目录"
-
-#: protocols/oscar/icq/icqprotocol.cpp:655
-msgid "Business services"
-msgstr "商务服务"
-
-#: protocols/oscar/icq/icqprotocol.cpp:656
-msgid "Audio and visual"
-msgstr "影音享受"
-
-#: protocols/oscar/icq/icqprotocol.cpp:657
-msgid "Sporting and athletic"
-msgstr "运动"
-
-#: protocols/oscar/icq/icqprotocol.cpp:658
-msgid "Publishing"
-msgstr "出版"
-
-#: protocols/oscar/icq/icqprotocol.cpp:659
-msgid "Home automation"
-msgstr "居家自动化"
-
-#: protocols/oscar/icq/icqcontact.cpp:253
-msgid "Request Authorization"
-msgstr "请求验证"
+"<qt>Unable to download the requested file;"
+"<br>please check that address %1 is correct.</qt>"
+msgstr "<qt>无法下载请求的文件；<br>请检查地址 %1 是否正确。</qt>"
 
-#: protocols/oscar/icq/icqcontact.cpp:254
-msgid "Reason for requesting authorization:"
-msgstr "请求验证的原因："
+#: libkopete/kopeteawayaction.cpp:86
+msgid "New Message..."
+msgstr "新建消息..."
 
-#: protocols/oscar/icq/icqcontact.cpp:278
-msgid ""
-"User %1 has granted your authorization request.\n"
-"Reason: %2"
-msgstr ""
-"用户 %1 同意了您的身份验证请求。\n"
-"原因：%2"
+#: libkopete/kopeteawayaction.cpp:113
+msgid "New Away Message"
+msgstr "新建离开消息"
 
-#: protocols/oscar/icq/icqcontact.cpp:287
-msgid ""
-"User %1 has rejected the authorization request.\n"
-"Reason: %2"
-msgstr ""
-"用户 %1 拒绝了您的身份验证请求。\n"
-"原因：%2"
+#: libkopete/kopeteawayaction.cpp:113
+msgid "Please enter your away reason:"
+msgstr "请输入您的离开理由："
 
-#: protocols/oscar/icq/icqcontact.cpp:542
-#: protocols/oscar/liboscar/userdetails.cpp:129
-msgid ""
-"_: Translators: client-name client-version\n"
-"%1 %2"
-msgstr "%1 %2"
+#: libkopete/private/kopeteviewmanager.cpp:225
+msgid "<qt>Incoming message from %1<br>\"%2\"</qt>"
+msgstr "<qt>收到来自 %1 的消息<br>“%2”</qt>"
 
-#: protocols/oscar/icq/icqcontact.cpp:551 protocols/oscar/oscarcontact.cpp:188
-msgid "UTF-8"
-msgstr "UTF-8"
+#: libkopete/private/kopeteviewmanager.cpp:234
+msgid "<qt>A highlighted message arrived from %1<br>\"%2\"</qt>"
+msgstr "<qt>来自 %1 突出显示的消息<br>“%2”</qt>"
 
-#: protocols/oscar/icq/icqcontact.cpp:553
-msgid "RTF-Messages"
-msgstr "RTF 消息"
+#: libkopete/private/kopetecommand.cpp:64
+msgid "Enter Arguments"
+msgstr "输入参数"
 
-#: protocols/oscar/icq/icqcontact.cpp:555 protocols/oscar/oscarcontact.cpp:196
-msgid "DirectIM/IMImage"
-msgstr "二人世界/图像"
+#: libkopete/private/kopetecommand.cpp:64
+msgid "Enter the arguments to %1:"
+msgstr "输入 %1 的参数："
 
-#: protocols/oscar/icq/icqcontact.cpp:557
-msgid "Groupchat"
-msgstr "群组聊天"
+#: libkopete/private/kopetecommand.cpp:77
+msgid "Alias \"%1\" expands to itself."
+msgstr "别名“%1”自行展开。"
 
-#: protocols/oscar/icq/icqcontact.cpp:628
+#: libkopete/private/kopetecommand.cpp:82
 msgid ""
-"<qt>You must be logged on to ICQ before you can send a message to a user.</qt>"
-msgstr "<qt>您必须登录到 ICQ 之后才能给用户发送消息。</qt>"
-
-#: protocols/oscar/icq/icqcontact.cpp:630
-msgid "Not Signed On"
-msgstr "未签入"
-
-#: protocols/oscar/icq/icqcontact.cpp:690
-msgid "&Request Authorization"
-msgstr "请求验证(&R)"
-
-#: protocols/oscar/icq/icqcontact.cpp:692
-msgid "&Grant Authorization"
-msgstr "通过身份验证(&G)"
-
-#: protocols/oscar/icq/icqcontact.cpp:703
-msgid "&Ignore"
-msgstr "忽略(&I)"
-
-#: protocols/oscar/icq/icqcontact.cpp:719
-msgid "Select Encoding..."
-msgstr "选择编码..."
-
-#: protocols/oscar/icq/icqaccount.cpp:130
-msgid "In&visible"
-msgstr "隐身(&V)"
-
-#: protocols/oscar/icq/icqpresence.cpp:72
-msgid "&Do Not Disturb"
-msgstr "请勿打扰(&D)"
-
-#: protocols/jabber/jabbercontact.cpp:164
-#: protocols/oscar/icq/icqpresence.cpp:72
-msgid "Do Not Disturb"
-msgstr "请勿打扰"
-
-#: protocols/oscar/icq/icqpresence.cpp:72
-msgid "Do Not Disturb (Invisible)"
-msgstr "请勿打扰(隐身)"
-
-#: protocols/oscar/icq/icqpresence.cpp:73
-msgid "O&ccupied"
-msgstr "正忙(&C)"
-
-#: protocols/oscar/icq/icqpresence.cpp:73
-msgid "Occupied"
-msgstr "正忙"
-
-#: protocols/oscar/icq/icqpresence.cpp:73
-msgid "Occupied (Invisible)"
-msgstr "正忙(隐身)"
-
-#: protocols/oscar/icq/icqpresence.cpp:74
-msgid "Not A&vailable"
-msgstr "不在(&V)"
-
-#: protocols/oscar/icq/icqpresence.cpp:74
-msgid "Not Available"
-msgstr "不在"
-
-#: protocols/oscar/icq/icqpresence.cpp:74
-msgid "Not Available (Invisible)"
-msgstr "不在(隐身)"
-
-#: protocols/oscar/icq/icqpresence.cpp:75
-msgid "Away (Invisible)"
-msgstr "离开(隐身)"
-
-#: protocols/oscar/icq/icqpresence.cpp:76
-msgid "&Free for Chat"
-msgstr "欢迎聊天(&F)"
-
-#: protocols/oscar/icq/icqpresence.cpp:76
-msgid "Free For Chat"
-msgstr "欢迎聊天"
-
-#: protocols/oscar/icq/icqpresence.cpp:76
-msgid "Free For Chat (Invisible)"
-msgstr "欢迎聊天(隐身)"
-
-#: protocols/oscar/icq/icqpresence.cpp:77
-msgid "Online (Invisible)"
-msgstr "在线(隐身)"
-
-#: protocols/oscar/icq/icqpresence.cpp:133
-msgid "Waiting for Authorization"
-msgstr "等待认证"
-
-#: protocols/oscar/icq/icqreadaway.cpp:34
-msgid "&Fetch Again"
-msgstr "再次获取(&F)"
-
-#: protocols/oscar/icq/icqreadaway.cpp:40
-#: protocols/oscar/icq/icqreadaway.cpp:82
-msgid "'%2' Message for %1"
-msgstr "%1 的“%2”消息"
-
-#: protocols/oscar/icq/icqreadaway.cpp:77
-msgid "Fetching '%2' Message for %1..."
-msgstr "正在获取 %1 的“%2”消息..."
-
-#: protocols/oscar/oscarlistnonservercontacts.cpp:28
-msgid "Add Contacts to Server List"
-msgstr "将联系人添加到服务器列表"
-
-#: protocols/oscar/oscarlistnonservercontacts.cpp:34
-msgid "Do &Not Add"
-msgstr "不添加(&N)"
-
-#: protocols/oscar/oscarcontact.cpp:174
-msgid "Mobile AIM Client"
-msgstr "手机 AIM 客户"
+"_n: \"%1\" requires at least %n argument.\n"
+"\"%1\" requires at least %n arguments."
+msgstr "“%1”至少需要 %n 个参数。"
 
-#: protocols/oscar/oscarcontact.cpp:180
-#, c-format
+#: libkopete/private/kopetecommand.cpp:88
 msgid ""
-"_: Translators: client name and version\n"
-"%1"
-msgstr "%1"
-
-#: protocols/oscar/oscarcontact.cpp:186
-msgid "Buddy icons"
-msgstr "好友图标"
-
-#: protocols/oscar/oscarcontact.cpp:190
-msgid "Rich text messages"
-msgstr "丰富文本消息"
-
-#: protocols/oscar/oscarcontact.cpp:192
-msgid "Group chat"
-msgstr "群组聊天"
-
-#: protocols/oscar/oscarcontact.cpp:194
-msgid "Voice chat"
-msgstr "语音聊天"
+"_n: \"%1\" has a maximum of %n argument.\n"
+"\"%1\" has a maximum of %n arguments."
+msgstr "“%1”最多有 %n 个参数。"
 
-#: protocols/oscar/oscarcontact.cpp:198
-msgid "Send buddy list"
-msgstr "发送好友列表"
+#: libkopete/private/kopetecommand.cpp:93
+msgid "You are not authorized to perform the command \"%1\"."
+msgstr "您不能执行命令“%1”。"
 
-#: protocols/oscar/oscarcontact.cpp:200
-msgid "File transfers"
-msgstr "文件传送"
+#: libkopete/private/kopetecommand.cpp:132
+msgid "Command Error"
+msgstr "命令错误"
 
-#: protocols/oscar/oscarcontact.cpp:204
-msgid "Trillian user"
-msgstr "Trillian 用户"
+#: libkopete/kopeteawaydialog.cpp:37
+msgid "Global Away Message"
+msgstr "全局离开消息"
 
-#: protocols/oscar/oscarencodingselectiondialog.cpp:28
-msgid "Select Encoding"
-msgstr "选择编码"
+#: libkopete/kopeteglobal.cpp:118
+msgid "Idle Time"
+msgstr "发呆时长"
 
-#: protocols/oscar/oscaraccount.cpp:237 protocols/oscar/oscaraccount.cpp:616
-#: protocols/oscar/oscaraccount.cpp:622
-msgid "Buddies"
-msgstr "好友"
+#: libkopete/kopeteglobal.cpp:124
+msgid "Online Since"
+msgstr "上线时间"
 
-#: protocols/oscar/oscaraccount.cpp:406
-msgid "ICQ Web Express"
-msgstr "ICQ Web 特快"
+#: libkopete/kopeteglobal.cpp:130
+msgid "Last Seen"
+msgstr "上次遇见"
 
-#: protocols/oscar/oscaraccount.cpp:408
-msgid "ICQ Email Express"
-msgstr "ICQ 电邮特快"
+#: libkopete/kopeteglobal.cpp:136
+msgid "Away Message"
+msgstr "离开消息"
 
-#: protocols/oscar/oscaraccount.cpp:730 protocols/oscar/oscaraccount.cpp:747
-msgid ""
-"_: account has been disconnected\n"
-"%1 disconnected"
-msgstr "%1 已断开"
+#: libkopete/kopeteglobal.cpp:154
+msgid "Private Phone"
+msgstr "私人电话"
 
-#: protocols/oscar/oscaraccount.cpp:771
-msgid ""
-"There was an error in the protocol handling; it was not fatal, so you will not "
-"be disconnected."
-msgstr "协议处理时出错；这个错误不太严重，所以您不会被断开连接。"
+#: libkopete/kopeteglobal.cpp:160
+msgid "Private Mobile Phone"
+msgstr "私人移动电话"
 
-#: protocols/oscar/oscaraccount.cpp:773
-msgid ""
-"There was an error in the protocol handling; automatic reconnection occurring."
-msgstr "协议处理时有错；发生了自动重连接。"
+#: libkopete/kopeteglobal.cpp:166
+msgid "Work Phone"
+msgstr "工作电话"
 
-#: protocols/oscar/oscaraccount.cpp:775
-msgid "OSCAR Protocol error"
-msgstr "OSCAR 协议错误"
+#: libkopete/kopeteglobal.cpp:172
+msgid "Work Mobile Phone"
+msgstr "工作移动电话"
 
-#: protocols/oscar/oscaraccount.cpp:810
-msgid ""
-"_: ICQ user id\n"
-"UIN"
-msgstr "UIN"
+#: libkopete/kopeteglobal.cpp:232
+msgid "Could not find suitable place to install emoticon themes into."
+msgstr "找不到合适的位置来安装表情主题。"
 
-#: protocols/oscar/oscaraccount.cpp:810
-msgid ""
-"_: AIM user id\n"
-"screen name"
-msgstr "屏幕名"
+#: libkopete/kopeteglobal.cpp:238
+msgid "Installing Emoticon Themes..."
+msgstr "正在安装表情主题..."
 
-#: protocols/oscar/oscaraccount.cpp:820
-msgid ""
-"You have logged in more than once with the same %1, account %2 is now "
-"disconnected."
-msgstr "您用同一个 %1 登录的次数多于一次，账户 %2 现已断开。"
+#: libkopete/kopeteglobal.cpp:260
+msgid "Could not open \"%1\" for unpacking."
+msgstr "无法打开“%1”解包。"
 
-#: protocols/oscar/oscaraccount.cpp:826
-msgid ""
-"Sign on failed because either your %1 or password are invalid. Please check "
-"your settings for account %2."
-msgstr "签入失败，原因是您的 %1 或密码不对。请检查您对账户 %2 的设置。"
+#: libkopete/kopeteglobal.cpp:285
+msgid "<qt>The file \"%1\" is not a valid emoticon theme archive.</qt>"
+msgstr "<qt>文件“%1”不是有效的表情主题存档。</qt>"
 
-#: protocols/oscar/oscaraccount.cpp:834
-msgid "The %1 service is temporarily unavailable. Please try again later."
-msgstr "%1 服务暂时不可用。请稍候再试。"
+#: libkopete/kopeteglobal.cpp:296
+msgid "<qt>Installing <strong>%1</strong> emoticon theme</qt>"
+msgstr "<qt>安装 <strong>%1</strong> 表情主题</qt>"
 
-#: protocols/oscar/oscaraccount.cpp:839
+#: libkopete/kopeteglobal.cpp:334
 msgid ""
-"Could not sign on to %1 with account %2 because the password was incorrect."
-msgstr "无法以账户 %2 签入 %1，因为密码不对。"
-
-#: protocols/oscar/oscaraccount.cpp:844
-msgid "Could not sign on to %1 with nonexistent account %2."
-msgstr "无法以不存在的账户 %2 签入 %1。"
-
-#: protocols/oscar/oscaraccount.cpp:848
-msgid "Sign on to %1 failed because your account %2 expired."
-msgstr "签入 %1 失败，因为您的账户 %2 已经过期。"
+"<qt>A problem occurred during the installation process. However, some of the "
+"emoticon themes in the archive may have been installed.</qt>"
+msgstr "<qt>安装过程中出现了问题。但是，可能已经安装了压缩包中的某些表情主题。</qt>"
 
-#: protocols/oscar/oscaraccount.cpp:852
-msgid "Sign on to %1 failed because your account %2 is currently suspended."
-msgstr "签入 %1 失败，因为您的账户 %2 目前正暂停。"
+#: libkopete/kopeteaccount.cpp:142
+msgid "You have been disconnected"
+msgstr "您已经断开了连接"
 
-#: protocols/oscar/oscaraccount.cpp:858
-msgid ""
-"Could not sign on to %1 as there are too many clients from the same computer."
-msgstr "无法签入 %1，因为从同一计算机签入的客户太多。"
+#: libkopete/kopeteaccount.cpp:142
+msgid "You have connected from another client or computer to the account '%1'"
+msgstr "您已从另外一个客户机或计算机上连接到账户“%1”"
 
-#: protocols/oscar/oscaraccount.cpp:864
+#: libkopete/kopeteaccount.cpp:142
 msgid ""
-"Account %1 was blocked on the %2 server for sending messages too quickly. Wait "
-"ten minutes and try again. If you continue to try, you will need to wait even "
-"longer."
-msgstr "%2 服务器已经屏蔽了 %1 账户，因为您发送消息太快。请稍候 10 分钟后再试。如果您继续尝试，那将需要等待更长时间。"
+"Most proprietary Instant Messaging services do not allow you to connect from "
+"more than one location. Check that nobody is using your account without your "
+"permission. If you need a service that supports connection from various "
+"locations at the same time, use the Jabber protocol."
+msgstr ""
+"大多数私有的即时消息服务不允许一个账号被多个来源同时连接，请确认没有其他人正在未经授权使用您的账户。如果您需要一个支持在同一时刻能够让不同来源连接同一账户的服务"
+"，请使用 Jabber 协议。"
 
-#: protocols/oscar/oscaraccount.cpp:873
+#: libkopete/kopeteaccount.cpp:258 libkopete/kopeteaccount.cpp:324
 msgid ""
-"Account %1 was blocked on the %2 server for reconnecting too quickly. Wait ten "
-"minutes and try again. If you continue to try, you will need to wait even "
-"longer."
-msgstr "%2 服务器已经屏蔽了 %1 账户，因为您重新连接太快。请稍候 10 分钟后再试。如果您继续尝试，那将需要等待更长时间。"
-
-#: protocols/oscar/oscaraccount.cpp:885 protocols/oscar/oscaraccount.cpp:905
-msgid "Sign on to %1 with your account %2 failed."
-msgstr "用您的账户 %2 签入 %1 失败。"
+"You are not allowed to add yourself to the contact list. The addition of \"%1\" "
+"to account \"%2\" will not take place."
+msgstr "您无法将您自己添加到联系人列表。将“%1”添加到账户“%2”的操作将不会生效。"
 
-#: protocols/oscar/oscaraccount.cpp:892
-msgid ""
-"The %1 server thinks the client you are using is too old. Please report this as "
-"a bug at http://bugs.kde.org"
-msgstr "%1 服务器认为您正在使用的客户端太旧。请在 http://bugs.kde.org 报告此问题"
+#: libkopete/kopeteaccount.cpp:258 libkopete/kopeteaccount.cpp:324
+msgid "Error Creating Contact"
+msgstr "创建联系人时出错"
 
-#: protocols/oscar/oscaraccount.cpp:898
+#: libkopete/kopetepasswordedaccount.cpp:83
 msgid ""
-"Account %1 was disabled on the %2 server because of your age (less than 13)."
-msgstr "在服务器 %2 上禁用了账户 %1，因为您的年龄小于十三岁。"
-
-#: protocols/oscar/oscarvisibilitydialog.cpp:29
-msgid "Add Contacts to Visible or Invisible List"
-msgstr "将联系人添加到可见或隐藏列表"
-
-#: protocols/oscar/liboscar/userdetails.cpp:328
-msgid "MICQ"
-msgstr "MICQ"
-
-#: protocols/oscar/liboscar/userdetails.cpp:333
-msgid "SIM"
-msgstr "SIM"
-
-#: protocols/oscar/liboscar/userdetails.cpp:338
-msgid "Trillian"
-msgstr "Trillian"
-
-#: protocols/oscar/liboscar/userdetails.cpp:343
-msgid "MacICQ"
-msgstr "MacICQ"
-
-#: protocols/oscar/liboscar/userdetails.cpp:350
-msgid "Licq SSL"
-msgstr "Licq SSL"
-
-#: protocols/oscar/liboscar/userdetails.cpp:352
-msgid "Licq"
-msgstr "Licq"
-
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:43
-msgid "Yahoo User Information"
-msgstr "Yahoo 用户信息"
-
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:43
-msgid "Save and Close"
-msgstr "保存并关闭"
+"<b>The password was wrong;</b> please re-enter your password for %1 account <b>"
+"%2</b>"
+msgstr "<b>密码不对；</b>请重新输入您 %1 账户 <b>%2</b> 的密码"
 
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:43
-msgid "Merge with existing entry"
-msgstr "与已有项合并"
+#: libkopete/kopetepasswordedaccount.cpp:85
+msgid "Please enter your password for %1 account <b>%2</b>"
+msgstr "请输入 %1 账户 <b>%2</b> 的密码"
 
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:49
-msgid "General Yahoo Information"
-msgstr "Yahoo 常规信息"
+#: libkopete/ui/kopetestdaction.cpp:43
+msgid "&Configure Kopete..."
+msgstr "配置 Kopete(&C)..."
 
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:63
-msgid "Other Yahoo Information"
-msgstr "Yahoo 其它信息"
+#: libkopete/ui/kopetestdaction.cpp:73
+msgid "Start &Chat..."
+msgstr "开始聊天(&C)..."
 
-#: protocols/yahoo/ui/yahoouserinfodialog.cpp:211
-msgid "Replace existing entry"
-msgstr "替换已有项"
+#: libkopete/ui/kopetestdaction.cpp:78
+msgid "&Send Single Message..."
+msgstr "发送单条消息(&S)..."
 
-#: protocols/yahoo/ui/yahoowebcamdialog.cpp:45
-msgid "No webcam image received"
-msgstr "未收到摄像头图像"
+#: libkopete/ui/kopetestdaction.cpp:83
+msgid "User &Info"
+msgstr "用户信息(&I)"
 
-#: protocols/yahoo/ui/yahoowebcamdialog.cpp:80
-msgid "%1 has stopped broadcasting"
-msgstr "%1 停止了广播"
+#: libkopete/ui/kopetestdaction.cpp:88
+msgid "Send &File..."
+msgstr "发送文件(&F)..."
 
-#: protocols/yahoo/ui/yahoowebcamdialog.cpp:82
-msgid "%1 has cancelled viewing permission"
-msgstr "%1 取消了查看权限"
+#: libkopete/ui/kopetestdaction.cpp:93
+msgid "View &History..."
+msgstr "查看历史(&H)..."
 
-#: protocols/yahoo/ui/yahoowebcamdialog.cpp:84
-msgid "%1 has declined permission to view webcam"
-msgstr "%1 拒绝了查看摄像头的许可"
+#: libkopete/ui/kopetestdaction.cpp:98
+msgid "&Create Group..."
+msgstr "创建组(&C)..."
 
-#: protocols/yahoo/ui/yahoowebcamdialog.cpp:86
-msgid "%1 does not have his/her webcam online"
-msgstr "%1 的摄像头未上线"
+#: libkopete/ui/kopetestdaction.cpp:103
+msgid "Cha&nge Meta Contact..."
+msgstr "更改超级联系人(&N)..."
 
-#: protocols/yahoo/ui/yahoowebcamdialog.cpp:88
-msgid "Unable to view the webcam of %1 for an unknown reason"
-msgstr "无法查看 %1 的摄像头，原因未知"
+#: libkopete/ui/kopetestdaction.cpp:108
+msgid "&Delete Contact"
+msgstr "删除联系人(&D)"
 
-#: protocols/yahoo/ui/yahoowebcamdialog.cpp:97
-msgid "%1 viewer(s)"
-msgstr "%1 个查看者"
+#: libkopete/ui/kopetestdaction.cpp:113
+msgid "Change A&lias..."
+msgstr "更改别名(&L)..."
 
-#: protocols/yahoo/yahoocontact.cpp:117
-msgid "%1|Stealthed"
-msgstr "%1|隐身"
+#: libkopete/ui/kopetestdaction.cpp:118
+msgid "&Block Contact"
+msgstr "屏蔽联系人(&B)"
 
-#: protocols/yahoo/yahoocontact.cpp:369
-msgid "View &Webcam"
-msgstr "查看摄像头(&W)"
+#: libkopete/ui/kopetestdaction.cpp:123
+msgid "Un&block Contact"
+msgstr "取消联系人屏蔽(&B)"
 
-#: protocols/yahoo/yahoochatsession.cpp:59
-#: protocols/yahoo/yahoocontact.cpp:380
-msgid "Invite to view your Webcam"
-msgstr "邀请查看您的摄像头"
+#: libkopete/ui/addressbookselectorwidget.cpp:147
+msgid "New Address Book Entry"
+msgstr "新建地址簿条目"
 
-#: protocols/yahoo/yahoocontact.cpp:391
-msgid "&Buzz Contact"
-msgstr "闪屏振动(&B)"
+#: libkopete/ui/addressbookselectorwidget.cpp:147
+msgid "Name the new entry:"
+msgstr "给新条目命名："
 
-#: protocols/yahoo/yahoocontact.cpp:401
-msgid "&Stealth Setting"
-msgstr "选择性隐身设置(&C)"
+#: libkopete/ui/addressbooklinkwidget.cpp:77
+msgid "Choose the corresponding entry for '%1'"
+msgstr "选择“%1”的相应条目"
 
-#: protocols/yahoo/yahoocontact.cpp:411
-msgid "&Invite to Conference"
-msgstr "邀请加入会议(&I)"
+#: libkopete/ui/addressbooklinkwidget.cpp:79
+msgid "Choose the corresponding entry in the address book"
+msgstr "在地址簿中选择相应条目"
 
-#: protocols/yahoo/yahoocontact.cpp:421
-msgid "&View Yahoo Profile"
-msgstr "查看 Yahoo 配置文件(&V)"
+#: libkopete/ui/kopetefileconfirmdialog.cpp:36
+msgid "&Refuse"
+msgstr "拒绝(&R)"
 
-#: protocols/yahoo/yahoocontact.cpp:465
-msgid "Stealth Setting"
-msgstr "选择性隐身设置"
+#: libkopete/ui/kopetefileconfirmdialog.cpp:36
+msgid "&Accept"
+msgstr "接受(&A)"
 
-#: protocols/yahoo/yahoocontact.cpp:519
-msgid "Buzzz!!!"
-msgstr "闪屏振动"
+#: libkopete/ui/kopetefileconfirmdialog.cpp:64
+msgid "File Transfer"
+msgstr "文件传送"
 
-#: protocols/yahoo/yahoocontact.cpp:602 protocols/yahoo/yahoocontact.cpp:657
+#: libkopete/ui/kopetefileconfirmdialog.cpp:86
 msgid ""
-"I cannot find the jasper image convert program.\n"
-"jasper is required to render the yahoo webcam images.\n"
-"Please see %1 for further information."
+"The file '%1' already exists.\n"
+"Do you want to overwrite it ?"
 msgstr ""
-"找不到 jasper 图像转换程序。\n"
-"渲染 Yahoo 摄像头图像，需要使用 jasper。\n"
-"请转到 %1 获取更多信息。"
-
-#: protocols/yahoo/libkyahoo/sendmessagetask.cpp:42
-msgid "An error occured sending the message"
-msgstr "发送消息时出错"
-
-#: protocols/yahoo/libkyahoo/sendmessagetask.cpp:42
-msgid "The message is empty."
-msgstr "消息为空。"
-
-#: protocols/yahoo/libkyahoo/modifyyabtask.cpp:93
-#: protocols/yahoo/libkyahoo/modifyyabtask.cpp:120
-msgid "An error occured saving the Addressbook entry."
-msgstr "保存地址簿条目时出错。"
+"已经存在文件“%1”。\n"
+"您想要覆盖吗？"
 
-#: protocols/yahoo/libkyahoo/modifyyabtask.cpp:178
-msgid ""
-"The Yahoo Addressbook entry could not be saved:\n"
-"%1 - %2"
-msgstr ""
-"无法保存 Yahoo 地址簿条目：\n"
-"%1 - %2"
+#: libkopete/ui/kopetefileconfirmdialog.cpp:87
+msgid "Overwrite File"
+msgstr "覆盖文件"
 
-#: protocols/yahoo/libkyahoo/modifyyabtask.cpp:185
-msgid ""
-"The Yahoo Addressbook entry could not be created:\n"
-"%1 - %2"
-msgstr ""
-"无法创建 Yahoo 地址簿条目：\n"
-"%1 - %2"
+#: libkopete/ui/kopetefileconfirmdialog.cpp:96
+msgid "You must provide a valid local filename"
+msgstr "您必须提供有效的本地文件名"
 
-#: protocols/yahoo/libkyahoo/modifyyabtask.cpp:192
-msgid ""
-"The Yahoo Addressbook entry could not be deleted:\n"
-"%1 - %2"
-msgstr ""
-"无法删除 Yahoo 地址簿条目：\n"
-"%1 - %2"
+#: libkopete/ui/contactaddednotifydialog.cpp:62
+msgid "Someone Has Added You"
+msgstr "某些人将您添加为好友"
 
-#: protocols/yahoo/libkyahoo/webcamtask.cpp:200
+#: libkopete/ui/contactaddednotifydialog.cpp:73
 msgid ""
-"Webcam connection to the user %1 could not be established.\n"
-"\n"
-"Please relogin and try again."
+"<qt><img src=\"kopete-account-icon:%1\" /> The contact <b>%2</b> "
+"has added you to his/her contactlist. (Account %3)</qt>"
 msgstr ""
-"无法和用户 %1 建立视频连接。\n"
-"\n"
-"请重新登录后再尝试。"
-
-#: protocols/yahoo/libkyahoo/webcamtask.cpp:526
-msgid "An error occured closing the webcam session. "
-msgstr "关闭摄像头时发生了错误。 "
-
-#: protocols/yahoo/libkyahoo/webcamtask.cpp:526
-msgid "You tried to close a connection that didn't exist."
-msgstr "您正尝试关闭一个事实不存在的连接。"
-
-#: protocols/yahoo/libkyahoo/receivefiletask.cpp:54
-#: protocols/yahoo/libkyahoo/receivefiletask.cpp:173
-msgid "Could not open file for writing."
-msgstr "无法打开文件写入。"
-
-#: protocols/yahoo/libkyahoo/receivefiletask.cpp:142
-msgid "An error occured while downloading the file."
-msgstr "下载文件时出错。"
-
-#: protocols/yahoo/libkyahoo/picturenotifiertask.cpp:148
-#: protocols/yahoo/libkyahoo/sendpicturetask.cpp:78
-msgid "The picture was not successfully uploaded"
-msgstr "图片已成功上传"
-
-#: protocols/yahoo/libkyahoo/sendfiletask.cpp:93
-msgid "An error occured sending the file."
-msgstr "发送文件时出错。"
-
-#: protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp:85
-msgid "An error occured while downloading buddy icon (%1)"
-msgstr "下载好友图标时出错(%1)"
-
-#: protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp:98
-msgid "Fatal Error occured while downloading buddy icon."
-msgstr "下载好友图标时出现严重错误。"
-
-#: protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp:98
-msgid "IconLoadJob has an empty KTempFile pointer."
-msgstr "IconLoadJob 类里有空的 KTempFile 指针。"
-
-#: protocols/yahoo/libkyahoo/statusnotifiertask.cpp:105
-msgid "An unknown error has occured."
-msgstr "发生了未知错误。"
+"<qt><img src=\"kopete-account-icon:%1\" />联系人 <b>%2</b> "
+"已将您添加到他/她的联系人列表中。(账户 %3)</qt>"
 
-#: protocols/yahoo/libkyahoo/yabtask.cpp:121
-msgid "Could not retrieve server side addressbook for user info."
-msgstr "无法从服务器端地址簿获取用户信息。"
+#: libkopete/ui/userinfodialog.cpp:213
+msgid "Contact ID:"
+msgstr "联系人 ID："
 
-#: protocols/yahoo/libkyahoo/sendpicturetask.cpp:107
-#, c-format
-msgid "Error opening file: %1"
-msgstr "打开文件时发生了错误：%1"
+#: libkopete/ui/userinfodialog.cpp:246
+msgid "User info:"
+msgstr "用户信息："
 
-#: protocols/yahoo/yahooaccount.cpp:100
-msgid "Open &Addressbook..."
-msgstr "打开地址簿(&A)..."
+#: libkopete/kopetecontact.cpp:212
+msgid "&Add to Your Contact List"
+msgstr "添加到您的联系人列表(&A)"
 
-#: protocols/yahoo/yahooaccount.cpp:101
-msgid "&Edit my contact details..."
-msgstr "编辑我得联系人细节(&E)..."
+#: libkopete/kopetecontact.cpp:270 libkopete/kopetecontact.cpp:318
+msgid "Move Contact"
+msgstr "移动联系人"
 
-#: protocols/yahoo/yahooaccount.cpp:692
-msgid ""
-"Could not log into Yahoo service: your account has been locked.\n"
-"Visit %1 to reactivate it."
-msgstr ""
-"无法登录到 Yahoo 服务：您的账户已被锁定。\n"
-"请前往 %1 重新激活。"
+#: libkopete/kopetecontact.cpp:276
+msgid "Select the meta contact to which you want to move this contact:"
+msgstr "选择您想把此联系人移入哪个超级联系人："
 
-#: protocols/yahoo/yahooaccount.cpp:701
-msgid ""
-"Could not log into the Yahoo service: the username specified was invalid."
-msgstr "无法登录到 Yahoo 服务：指定的用户名无效。"
+#: libkopete/kopetecontact.cpp:279
+msgid "Create a new metacontact for this contact"
+msgstr "创建新空的超级联系人来容纳该联系人"
 
-#: protocols/yahoo/yahooaccount.cpp:710
+#: libkopete/kopetecontact.cpp:280
 msgid ""
-"You have been logged out of the Yahoo service, possibly due to a duplicate "
-"login."
-msgstr "您已经注销了 Yahoo 服务，可能是有重复登录的情况发生。"
+"If you select this option, a new metacontact will be created in the top-level "
+"group with the name of this contact and the contact will be moved to it."
+msgstr "如果您选择了此选项，将会在顶层以此联系人的名称创建一个新的超级联系人。而此联系人将会被移动到该组中。"
 
-#: protocols/yahoo/yahooaccount.cpp:741
+#: libkopete/kopetecontact.cpp:315
 msgid ""
-"%1 has been disconnected.\n"
-"Error message:\n"
-"%2 - %3"
+"You are moving the contact `%1' to the meta contact `%2'.\n"
+"`%3' will be empty afterwards. Do you want to delete this contact?"
 msgstr ""
-"%1 已经断开。\n"
-"错误消息：\n"
-"%2 - %3"
+"您即将把“%1”移动到“%2”。\n"
+"这样的话，“%3”就空了。您想要删除此联系人吗？"
 
-#: protocols/yahoo/yahooaccount.cpp:754
-msgid ""
-"There was an error while connecting %1 to the Yahoo server.\n"
-"Error message:\n"
-"%2 - %3"
-msgstr ""
-"在将 %1 连接到 Yahoo 服务器时出错。\n"
-"错误消息：\n"
-"%2 - %3"
+#: libkopete/kopetecontact.cpp:318
+msgid "&Keep"
+msgstr "保持(&K)"
 
-#: protocols/yahoo/yahooaccount.cpp:765 protocols/yahoo/yahooaccount.cpp:768
+#: libkopete/kopetecontact.cpp:452
 msgid ""
-"%1\n"
-"\n"
-"Reason: %2 - %3"
-msgstr ""
-"%1\n"
-"\n"
-"原因：%2 - %3"
-
-#: protocols/yahoo/yahooaccount.cpp:766 protocols/yahoo/yahooaccount.cpp:769
-#: protocols/yahoo/yahooaccount.cpp:1348 protocols/yahoo/yahooaccount.cpp:1535
-#: protocols/yahoo/yahooaccount.cpp:1639 protocols/yahoo/yahooaccount.cpp:1654
-#: protocols/yahoo/yahooeditaccount.cpp:180
-#: protocols/yahoo/yahooeditaccount.cpp:186
-msgid "Yahoo Plugin"
-msgstr "Yahoo 插件"
-
-#: protocols/yahoo/yahooaccount.cpp:790
-msgid "User %1 has granted your authorization request."
-msgstr "用户 %1 同意了您的身份验证请求。"
+"This user is not reachable at the moment. Please try a protocol that supports "
+"offline sending, or wait until this user comes online."
+msgstr "此时无法联系到此用户。请试着换用支持离线发送消息的协议，或者等到该用户上线后再发。"
 
-#: protocols/yahoo/yahooaccount.cpp:802
+#: libkopete/kopetecontact.cpp:460
 msgid ""
-"User %1 has granted your authorization request.\n"
-"%2"
-msgstr ""
-"用户 %1 同意了您的身份验证请求。\n"
-"%2"
+"Are you sure you want to remove the contact  '%1' from your contact list?"
+msgstr "您确定想要从联系人列表中删除联系人“%1”吗？"
 
-#: protocols/yahoo/yahooaccount.cpp:1048
+#: libkopete/kopetecontact.cpp:658
 msgid ""
-"_: This string is shown when the user is buzzed by a contact\n"
-"Buzz!!"
-msgstr "闪屏振动"
+"_: <b>DISPLAY NAME</b>"
+"<br><img src=\"%2\">&nbsp;CONTACT STATUS\n"
+"<b><nobr>%3</nobr></b>"
+"<br><img src=\"%2\">&nbsp;%1"
+msgstr "<b><nobr>%3</nobr></b><br><img src=\"%2\">&nbsp;%1"
 
-#: protocols/yahoo/yahooaccount.cpp:1085
+#: libkopete/kopetecontact.cpp:665
 msgid ""
-"%1 has invited you to join a conference with %2.\n"
-"\n"
-"His message: %3\n"
-"\n"
-" Accept?"
-msgstr ""
-"%1 邀请您加入与 %2 的会议。\n"
-"\n"
-"他的消息是：%3\n"
-"\n"
-"接受吗？"
-
-#: protocols/yahoo/yahooaccount.cpp:1179
-msgid "%1 declined to join the conference: \"%2\""
-msgstr "%1 拒绝加入会议：“%2”"
+"_: <b>DISPLAY NAME</b> (CONTACT ID)"
+"<br><img src=\"%2\">&nbsp;CONTACT STATUS\n"
+"<nobr><b>%4</b> (%3)</nobr>"
+"<br><img src=\"%2\">&nbsp;%1"
+msgstr "<nobr><b>%4</b> (%3)</nobr><br><img src=\"%2\">&nbsp;%1"
 
-#: protocols/yahoo/yahooaccount.cpp:1491
-#, c-format
+#: libkopete/kopetecontact.cpp:682
 msgid ""
-"_n: You have one unread message in your Yahoo inbox.\n"
-"You have %n unread messages in your Yahoo inbox."
-msgstr "您的 Yahoo 收件箱有 %n 封未读的信件。"
-
-#: protocols/yahoo/yahooaccount.cpp:1497
-msgid "You have a message from %1 in your Yahoo inbox."
-msgstr "您的 Yahoo 收件箱中有一封从 %1 来的新信件。"
-
-#: protocols/yahoo/yahooaccount.cpp:1526
-msgid "%1 has invited you to view his/her webcam. Accept?"
-msgstr "%1 邀请您查看他/她的摄像头。接受吗？"
-
-#: protocols/yahoo/yahooaccount.cpp:1535
-msgid "Webcam for %1 is not available."
-msgstr "%1 的摄像头不可用。"
+"_: "
+"<br><b>Full Name:</b>&nbsp;FORMATTED NAME\n"
+"<br><b>Full Name:</b>&nbsp;<nobr>%1</nobr>"
+msgstr "<br><b>全名：</b>&nbsp;<nobr>%1</nobr>"
 
-#: protocols/yahoo/yahooaccount.cpp:1639
-#: protocols/yahoo/yahooeditaccount.cpp:186
+#: libkopete/kopetecontact.cpp:691
 msgid ""
-"<qt>The selected buddy icon could not be opened. "
-"<br>Please set a new buddy icon.</qt>"
-msgstr "<qt>选中的好友图标无法打开。<br>请设定新的好友图标。</qt>"
-
-#: protocols/yahoo/yahooaccount.cpp:1654
-#: protocols/yahoo/yahooeditaccount.cpp:180
-msgid "An error occurred when trying to change the display picture."
-msgstr "试图更改显示图片时发生了错误。"
-
-#: protocols/yahoo/yahooaccount.cpp:1749
-msgid "%1 wants to view your webcam. Grant access?"
-msgstr "%1 想要查看您的摄像头。同意吗？"
-
-#: protocols/yahoo/yahooprotocol.cpp:44
-msgid "Be right back"
-msgstr "马上回来"
-
-#: protocols/yahoo/yahooprotocol.cpp:46
-msgid "Not at home"
-msgstr "不在家"
-
-#: protocols/yahoo/yahooprotocol.cpp:47
-msgid "Not at my desk"
-msgstr "不再办公桌"
-
-#: protocols/yahoo/yahooprotocol.cpp:48
-msgid "Not in the office"
-msgstr "不在办公室"
-
-#: protocols/yahoo/yahooprotocol.cpp:49
-msgid "On the phone"
-msgstr "在打电话"
-
-#: protocols/yahoo/yahooprotocol.cpp:50
-msgid "On vacation"
-msgstr "度假中"
-
-#: protocols/yahoo/yahooprotocol.cpp:51
-msgid "Out to lunch"
-msgstr "外出就餐"
-
-#: protocols/yahoo/yahooprotocol.cpp:52
-msgid "Stepped out"
-msgstr "散步"
-
-#: protocols/yahoo/yahooprotocol.cpp:54
-msgid "Custom"
-msgstr "自定义"
-
-#: protocols/yahoo/yahooprotocol.cpp:58
-msgid "Buddy Icon Checksum"
-msgstr "好友图标校验和"
-
-#: protocols/yahoo/yahooprotocol.cpp:59
-msgid "Buddy Icon Expire"
-msgstr "好友图标过期"
-
-#: protocols/yahoo/yahooprotocol.cpp:60
-msgid "Buddy Icon Remote Url"
-msgstr "好友图标远程 URL"
-
-#: protocols/groupwise/ui/gwcontactproperties.cpp:114
-#: protocols/yahoo/yahooprotocol.cpp:65
-msgid "Title"
-msgstr "职务"
-
-#: protocols/yahoo/yahooprotocol.cpp:68
-msgid "YAB Id"
-msgstr "YAB Id"
-
-#: protocols/yahoo/yahooprotocol.cpp:69
-msgid "Pager number"
-msgstr "寻呼号"
-
-#: protocols/yahoo/yahooprotocol.cpp:70
-msgid "Fax number"
-msgstr "传真号码"
-
-#: protocols/yahoo/yahooprotocol.cpp:71
-msgid "Additional number"
-msgstr "额外号码"
-
-#: protocols/yahoo/yahooprotocol.cpp:72 protocols/yahoo/yahooprotocol.cpp:73
-msgid "Alternative email 1"
-msgstr "备选邮件地址 1"
-
-#: protocols/yahoo/yahooprotocol.cpp:76
-msgid "MSN"
-msgstr "MSN"
-
-#: protocols/yahoo/yahooprotocol.cpp:77
-msgid "GoogleTalk"
-msgstr "GoogleTalk"
-
-#: protocols/yahoo/yahooprotocol.cpp:78
-msgid "Skype"
-msgstr "Skype"
-
-#: protocols/yahoo/yahooprotocol.cpp:80
-msgid "QQ"
-msgstr "QQ"
-
-#: protocols/yahoo/yahooprotocol.cpp:81
-msgid "Private Address"
-msgstr "私人地址"
-
-#: protocols/yahoo/yahooprotocol.cpp:82
-msgid "Private City"
-msgstr "私人城市"
-
-#: protocols/yahoo/yahooprotocol.cpp:83
-msgid "Private State"
-msgstr "私人州/省"
-
-#: protocols/yahoo/yahooprotocol.cpp:84
-msgid "Private ZIP"
-msgstr "私人邮编"
-
-#: protocols/yahoo/yahooprotocol.cpp:85
-msgid "Private Country"
-msgstr "私人国家"
-
-#: protocols/yahoo/yahooprotocol.cpp:87
-msgid "Private URL"
-msgstr "私人 URL"
-
-#: protocols/yahoo/yahooprotocol.cpp:88
-msgid "Corporation"
-msgstr "公司"
-
-#: protocols/yahoo/yahooprotocol.cpp:89
-msgid "Work Address"
-msgstr "工作地址"
-
-#: protocols/jabber/jabberprotocol.cpp:109
-#: protocols/yahoo/yahooprotocol.cpp:90
-msgid "Work City"
-msgstr "工作城市"
-
-#: protocols/yahoo/yahooprotocol.cpp:91
-msgid "Work State"
-msgstr "工作州/省"
-
-#: protocols/yahoo/yahooprotocol.cpp:92
-msgid "Work ZIP"
-msgstr "工作邮编"
-
-#: protocols/jabber/jabberprotocol.cpp:111
-#: protocols/yahoo/yahooprotocol.cpp:93
-msgid "Work Country"
-msgstr "工作国家"
-
-#: protocols/yahoo/yahooprotocol.cpp:95
-msgid "Work URL"
-msgstr "工作 URL"
-
-#: protocols/jabber/jabberprotocol.cpp:99 protocols/yahoo/yahooprotocol.cpp:96
-msgid "Birthday"
-msgstr "生日"
-
-#: protocols/yahoo/yahooprotocol.cpp:97
-msgid "Anniversary"
-msgstr "纪念日"
-
-#: protocols/yahoo/yahooprotocol.cpp:98
-msgid "Notes"
-msgstr "备注"
-
-#: protocols/yahoo/yahooprotocol.cpp:99
-msgid "Additional 1"
-msgstr "额外 1"
-
-#: protocols/yahoo/yahooprotocol.cpp:100
-msgid "Additional 2"
-msgstr "额外 2"
-
-#: protocols/yahoo/yahooprotocol.cpp:101
-msgid "Additional 3"
-msgstr "额外 3"
-
-#: protocols/yahoo/yahooprotocol.cpp:102
-msgid "Additional 4"
-msgstr "额外 4"
-
-#: protocols/yahoo/yahooeditaccount.cpp:108
-#: protocols/yahoo/yahooeditaccount.cpp:113
-msgid "Yahoo"
-msgstr "Yahoo"
-
-#: protocols/yahoo/yahooeditaccount.cpp:113
-msgid "<qt>You must enter a valid password.</qt>"
-msgstr "<qt>您必须输入一个有效的密码。</qt>"
-
-#: protocols/yahoo/yahooeditaccount.cpp:167
-msgid "Yahoo Buddy Icon"
-msgstr "Yahoo 好友图标"
-
-#: protocols/yahoo/yahooverifyaccount.cpp:41
-msgid "Account Verification - Yahoo"
-msgstr "账户验证 - Yahoo"
-
-#: protocols/yahoo/yahoochatsession.cpp:56
-msgid "Buzz Contact"
-msgstr "闪屏振动"
-
-#: protocols/yahoo/yahoochatsession.cpp:57
-msgid "Show User Info"
-msgstr "显示用户信息"
-
-#: protocols/yahoo/yahoochatsession.cpp:58
-msgid "Request Webcam"
-msgstr "请求摄像头"
-
-#: protocols/yahoo/yahoochatsession.cpp:65
-msgid "Yahoo Display Picture"
-msgstr "Yahoo 显示图片"
-
-#: protocols/yahoo/yahooconferencemessagemanager.cpp:50
-msgid "&Invite others"
-msgstr "邀请别人(&I)"
-
-#: protocols/meanwhile/meanwhileaccount.cpp:141
-msgid "&Change Status Message"
-msgstr "更改状态消息(&C)"
-
-#: protocols/meanwhile/meanwhileaccount.cpp:204
-msgid "Meanwhile Plugin: Message from server"
-msgstr "Meanwhile 插件：服务器的消息"
-
-#: protocols/meanwhile/meanwhileprotocol.cpp:63
-msgid "Status Message"
-msgstr "状态消息"
-
-#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:152
-#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:159
-#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:166
-#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:173
-#: protocols/meanwhile/meanwhilesession.cpp:202
-msgid "Meanwhile Plugin"
-msgstr "Meanwhile 常规插件"
+"_: "
+"<br><b>Idle:</b>&nbsp;FORMATTED IDLE TIME\n"
+"<br><b>Idle:</b>&nbsp;<nobr>%1</nobr>"
+msgstr "<br><b>发呆：</b>&nbsp;<nobr>%1</nobr>"
 
-#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:158
+#: libkopete/kopetecontact.cpp:700
 msgid ""
-"<qt>You must deselect password remembering or enter a valid password.</qt>"
-msgstr "<qt>您必须不选中密码记忆，或者输入有效的密码。</qt>"
-
-#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:165
-msgid "<qt>You must enter the server's hostname/ip address.</qt>"
-msgstr "<qt>您必须输入服务器的主机名或 IP 地址。</qt>"
-
-#: protocols/meanwhile/meanwhileeditaccountwidget.cpp:172
-msgid "<qt>0 is not a valid port number.</qt>"
-msgstr "<qt>0 不是有效的端口号码。</qt>"
-
-#: protocols/meanwhile/meanwhilesession.cpp:202
-msgid "Could not connect to server"
-msgstr "无法连接服务器"
-
-#: protocols/meanwhile/meanwhilesession.cpp:961
-msgid "Meanwhile Plugin: Conference invitation"
-msgstr "Meanwhile 插件：会议邀请"
-
-#: protocols/jabber/ui/jabberregisteraccount.cpp:51
-msgid "Register New Jabber Account"
-msgstr "注册新的 Jabber 账户"
-
-#: protocols/jabber/ui/jabberregisteraccount.cpp:63
-msgid "Register"
-msgstr "注册"
-
-#: protocols/jabber/ui/jabberregisteraccount.cpp:128
-msgid "Please enter a server name, or click Choose."
-msgstr "请输入服务器名称，或单击选择。"
-
-#: protocols/jabber/ui/jabberregisteraccount.cpp:139
-msgid "Please enter a valid Jabber ID."
-msgstr "请输入有效的 Jabber ID。"
+"_: "
+"<br><b>Home Page:</b>&nbsp;FORMATTED URL\n"
+"<br><b>Home Page:</b>&nbsp;<a href=\"%1\"><nobr>%2</nobr></a>"
+msgstr "<br><b>主页：</b>&nbsp;<a href=\"%1\"><nobr>%2</nobr></a>"
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:193
+#: libkopete/kopetecontact.cpp:710
+#, c-format
 msgid ""
-"Unless you know what you are doing, your JID should be of the form "
-"\"username@server.com\".  In your case for example \"username@%1\"."
-msgstr "除非您知道您在做什么，您的 JID 格式应该是“username@server.com”。您的情况就应该是“username@%1”。"
-
-#: protocols/jabber/ui/jabberregisteraccount.cpp:248
-msgid "Connecting to server..."
-msgstr "正在连接到服务器..."
+"_: "
+"<br><b>Away Message:</b>&nbsp;FORMATTED AWAY MESSAGE\n"
+"<br><b>Away&nbsp;Message:</b>&nbsp;%1"
+msgstr "<br><b>离开消息：</b>&nbsp;%1"
 
-#: protocols/groupwise/gwaccount.cpp:251
-#: protocols/jabber/jabberaccount.cpp:424
-#: protocols/jabber/ui/jabberregisteraccount.cpp:267
+#: libkopete/kopetecontact.cpp:747
 msgid ""
-"SSL support could not be initialized for account %1. This is most likely "
-"because the QCA TLS plugin is not installed on your system."
-msgstr "无法为账户 %1 初始化 SSL。这很可能是因为您的系统中未安装 QCA TLS 插件。"
-
-#: protocols/jabber/jabberaccount.cpp:426
-#: protocols/jabber/ui/jabberregisteraccount.cpp:269
-msgid "Jabber SSL Error"
-msgstr "Jabber SSL 错误"
-
-#: protocols/jabber/ui/jabberregisteraccount.cpp:314
-msgid "Protocol error."
-msgstr "协议错误。"
-
-#: protocols/jabber/ui/jabberregisteraccount.cpp:327
-msgid "Connected successfully, registering new account..."
-msgstr "连接成功，正在注册新账户..."
-
-#: protocols/jabber/ui/jabberregisteraccount.cpp:342
-msgid "Registration successful."
-msgstr "注册成功。"
-
-#: protocols/jabber/ui/jabberregisteraccount.cpp:376
-msgid "Registration failed."
-msgstr "注册失败。"
+"_: "
+"<br><b>PROPERTY LABEL:</b>&nbsp;PROPERTY VALUE\n"
+"<br><nobr><b>%2:</b></nobr>&nbsp;%1"
+msgstr "<br><nobr><b>%2:</b></nobr>&nbsp;%1"
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:378
+#: libkopete/kopetecontact.cpp:770
 msgid ""
-"Unable to create account on the server. The Jabber ID is probably already in "
-"use."
-msgstr "无法在服务器上创建账户。Jabber ID 可能已经被别人使用了。"
-
-#: protocols/jabber/ui/jabberregisteraccount.cpp:379
-msgid "Jabber Account Registration"
-msgstr "Jabber 账户注册"
-
-#: protocols/jabber/ui/dlgjabberchatroomslist.cpp:89
-msgid "Unable to retrieve the list of chat rooms."
-msgstr "无法获取聊天室列表。"
-
-#: protocols/jabber/jabberaccount.cpp:259
-#: protocols/jabber/ui/dlgjabberbrowse.cpp:63
-#: protocols/jabber/ui/dlgjabberchatroomslist.cpp:89
-#: protocols/jabber/ui/dlgjabberregister.cpp:53
-#: protocols/jabber/ui/dlgjabberservices.cpp:125
-msgid "Jabber Error"
-msgstr "Jabber 错误"
+"_: firstName lastName\n"
+"%2 %1"
+msgstr "%2 %1"
 
-#: protocols/jabber/ui/jabbereditaccountwidget.cpp:149
+#: libkopete/kopetecontact.cpp:806
 msgid ""
-"The changes you just made will take effect next time you log in with Jabber."
-msgstr "在您注销后再次登录 Jabber，您所做的改变将会生效。"
-
-#: protocols/jabber/ui/jabbereditaccountwidget.cpp:150
-msgid "Jabber Changes During Online Jabber Session"
-msgstr "在线 Jabber 会话期间，Jabber 发生了变化"
+"_: <days>d <hours>h <minutes>m <seconds>s\n"
+"%4d %3h %2m %1s"
+msgstr "%4天%3小时%2分%1秒"
 
-#: protocols/jabber/ui/jabbereditaccountwidget.cpp:205
+#: libkopete/kopetecontact.cpp:814
 msgid ""
-"The Jabber ID you have chosen is invalid. Please make sure it is in the form "
-"user@server.com, like an email address."
-msgstr "您选择的 Jabber ID 无效。请确定其格式为 user@server.com，和电子邮件地址一样。"
-
-#: protocols/jabber/ui/jabbereditaccountwidget.cpp:207
-msgid "Invalid Jabber ID"
-msgstr "无效的 Jabber ID"
-
-#: protocols/jabber/ui/dlgjabbervcard.cpp:64
-msgid "Jabber vCard"
-msgstr "Jabber vCard"
-
-#: protocols/jabber/ui/dlgjabbervcard.cpp:64
-msgid "&Save User Info"
-msgstr "保存用户信息(&S)"
-
-#: protocols/jabber/ui/dlgjabbervcard.cpp:64
-msgid "&Fetch vCard"
-msgstr "获取 vCard(&F)"
-
-#: protocols/jabber/ui/dlgjabbervcard.cpp:299
-msgid "Saving vCard to server..."
-msgstr "将 vCard 保存到服务器..."
-
-#: protocols/jabber/ui/dlgjabbervcard.cpp:421
-msgid "vCard save sucessful."
-msgstr "vCard 名片保存成功。"
-
-#: protocols/jabber/ui/dlgjabbervcard.cpp:426
-msgid "Error: Unable to save vCard."
-msgstr "出错：无法保存 vCard"
-
-#: protocols/jabber/ui/dlgjabbervcard.cpp:434
-msgid "Fetching contact vCard..."
-msgstr "正在获取联系人的 vCard 名片..."
-
-#: protocols/jabber/ui/dlgjabbervcard.cpp:457
-msgid "vCard fetching Done."
-msgstr "vCard 名片获取完成。"
+"_: <hours>h <minutes>m <seconds>s\n"
+"%3h %2m %1s"
+msgstr "%3小时%2分%1秒"
 
-#: protocols/jabber/ui/dlgjabbervcard.cpp:461
+#: libkopete/kopetecontact.cpp:821
+#, fuzzy, c-format
 msgid ""
-"Error: vCard could not be fetched correctly. Check connectivity with the Jabber "
-"server."
-msgstr "出错：无法正确获取到 vCard 名片，请检查程序与 Jabber 服务器的连接状态。"
-
-#: protocols/jabber/ui/dlgjabbervcard.cpp:472
-msgid "Jabber Photo"
-msgstr "Jabber 照片"
-
-#: protocols/jabber/jabberbasecontact.cpp:651
-#: protocols/jabber/ui/dlgjabbervcard.cpp:480
-msgid "Downloading of Jabber contact photo failed!"
-msgstr "下载 Jabber 联系人照片失败！"
+"_: <minutes>m <seconds>s\n"
+"%2m %1s"
+msgstr "%2分%1秒"
 
-#: protocols/jabber/ui/dlgjabbervcard.cpp:535
-msgid ""
-"<qt>An error occurred when trying to change the photo."
-"<br>Make sure that you have selected a correct image file</qt>"
-msgstr "<qt>试图更改照片时出错。<br>请确定您选择了正确的图像文件</qt>"
+#: libkopete/tdeabcpersistence.cpp:294
+msgid "<qt>\"%1\" is not supported by Kopete.</qt>"
+msgstr "<qt>Kopete 不支持“%1”。</qt>"
 
-#: protocols/jabber/ui/dlgjabberchatjoin.cpp:34
-msgid "Join Jabber Groupchat"
-msgstr "加入 Jabber 小组聊天"
+#: libkopete/tdeabcpersistence.cpp:295
+msgid "Could Not Sync with TDE Address Book"
+msgstr "无法与 TDE 地址簿同步"
 
-#: protocols/jabber/ui/dlgjabberservices.cpp:125
-#, c-format
+#: libkopete/tdeabcpersistence.cpp:342
 msgid ""
-"Unable to retrieve the list of services.\n"
-"Reason: %1"
+"<qt>An address was added to this contact by another application."
+"<br>Would you like to use it in Kopete?"
+"<br><b>Protocol:</b> %1"
+"<br><b>Address:</b> %2</qt>"
 msgstr ""
-"无法获取服务器列表。\n"
-"原因：%1"
-
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:34
-msgid "Change Jabber Password"
-msgstr "更改 Jabber 密码"
-
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:56
-msgid "You entered your current password incorrectly."
-msgstr "您输入了不正确的密码。"
-
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:57
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:65
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:73
-msgid "Password Incorrect"
-msgstr "密码不正确"
-
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:64
-msgid "Your new passwords do not match. Please enter them again."
-msgstr "您的新密码不匹配。请重新输入一次。"
-
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:72
-msgid "For security reasons, you are not allowed to set an empty password."
-msgstr "为安全起见，您不允许设定新密码。"
+"<qt>其它应用程序向此联系人中添加了新地址。"
+"<br>您是否想要在 Kopete 中使用？"
+"<br><b>协议：</b>%1"
+"<br><b>地址：</b>%2</qt>"
 
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:80
-msgid ""
-"Your account needs to be connected before the password can be changed. Do you "
-"want to try to connect now?"
-msgstr "在更改密码之前需要线连接您的账户。您是否想要现在连接？"
+#: libkopete/tdeabcpersistence.cpp:342
+msgid "Import Address From Address Book"
+msgstr "从地址簿导入地址"
 
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:81
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:121
-msgid "Jabber Password Change"
-msgstr "Jabber 密码更改"
+#: libkopete/tdeabcpersistence.cpp:342
+msgid "Use"
+msgstr "使用"
 
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:120
+#: libkopete/tdeabcpersistence.cpp:356
 msgid ""
-"Your password has been changed successfully. Please note that the change may "
-"not be instantaneous. If you have problems logging in with your new password, "
-"please contact the administrator."
-msgstr "您的密码已经成功更改。请注意更改可能不是实时生效的。如果您使用新密码登录遇到问题，请与管理员联系。"
+"<qt>One or more of your accounts using %1 are offline.  Most systems have to be "
+"connected to add contacts.  Please connect these accounts and try again.</qt>"
+msgstr "<qt>您使用 %1 的账户中有一个或多个处于离线状态。大多数系统需要上线后才能添加联系人。请连接这些账户然后再试。</qt>"
 
-#: protocols/jabber/ui/dlgjabberchangepassword.cpp:128
+#: libkopete/tdeabcpersistence.cpp:381
 msgid ""
-"Your password could not be changed. Either your server does not support this "
-"feature or the administrator does not allow you to change your password."
-msgstr "您的密码无法更改。可能是您的服务器不支持这个功能，或者管理员不允许您更改密码。"
-
-#: protocols/jabber/ui/jabberchooseserver.cpp:34
-msgid "Choose Jabber Server"
-msgstr "选择 Jabber 服务器"
-
-#: protocols/jabber/ui/jabberchooseserver.cpp:44
-msgid "Retrieving server list..."
-msgstr "正在获取服务器列表..."
+"<qt>You do not have an account configured for <b>%1</b> "
+"yet.  Please create an account, connect it, and try again.</qt>"
+msgstr "<qt>您尚未配置过 <b>%1</b> 的账户。请创建一个账户，连接该账户，然后再试一次。</qt>"
 
-#: protocols/jabber/ui/jabberchooseserver.cpp:111
-msgid "Could not retrieve server list."
-msgstr "无法获取服务器列表。"
+#: libkopete/tdeabcpersistence.cpp:382
+msgid "No Account Found"
+msgstr "没有找到账户"
 
-#: protocols/jabber/ui/jabberchooseserver.cpp:126
-msgid "Could not parse the server list."
-msgstr "无法分析服务器列表。"
+#: libkopete/tdeabcpersistence.cpp:398
+msgid "<qt>It was not possible to add the contact.</qt>"
+msgstr "<qt>无法添加联系人。</qt>"
 
-#: protocols/jabber/ui/dlgjabberregister.cpp:53
-msgid ""
-"Unable to retrieve registration form.\n"
-"Reason: \"%1\""
-msgstr ""
-"无法获取注册表单。\n"
-"原因：“%1”"
+#: libkopete/tdeabcpersistence.cpp:399
+msgid "Could Not Add Contact"
+msgstr "无法添加联系人"
 
-#: protocols/jabber/ui/dlgjabberregister.cpp:95
-msgid "Registration sent successfully."
-msgstr "注册已成功发送。"
+#: libkopete/kopetetask.cpp:32
+msgid "The operation has not finished yet"
+msgstr "操作尚未完成"
 
-#: protocols/jabber/ui/dlgjabberregister.cpp:95
-#: protocols/jabber/ui/dlgjabberregister.cpp:102
-msgid "Jabber Registration"
-msgstr "Jabber 注册"
+#: libkopete/kopetetask.cpp:67
+msgid "Aborted"
+msgstr "已中止"
 
-#: protocols/jabber/ui/dlgjabberregister.cpp:102
+#: libkopete/kopetecommandhandler.cpp:107
 msgid ""
-"The server denied the registration form.\n"
-"Reason: \"%1\""
-msgstr ""
-"服务器拒绝了注册表单。\n"
-"原因：“%1”"
-
-#: protocols/jabber/ui/jabberaddcontactpage.cpp:52
-msgid "Loading instruction from gateway..."
-msgstr "正在从网关载入指令..."
-
-#: protocols/jabber/ui/jabberaddcontactpage.cpp:63
-msgid "Connect to the Jabber network and try again."
-msgstr "连接到 Jabber 网络后再重试。"
-
-#: protocols/jabber/ui/jabberaddcontactpage.cpp:150
-msgid "An error occured while loading instructions from gateway."
-msgstr "从网关载入指令时出错。"
-
-#: protocols/jabber/ui/dlgjabberbrowse.cpp:63
-msgid "Unable to retrieve search form."
-msgstr "无法获取搜索表单。"
-
-#: protocols/jabber/ui/dlgjabberbrowse.cpp:114
-msgid "The Jabber server declined the search."
-msgstr "Jabber 服务器拒绝了搜索。"
-
-#: protocols/jabber/jabbercontact.cpp:135
-msgid "Authorization"
-msgstr "身份认证"
-
-#: protocols/jabber/jabbercontact.cpp:139
-msgid "(Re)send Authorization To"
-msgstr "(重新)发送授权"
-
-#: protocols/jabber/jabbercontact.cpp:144
-msgid "(Re)request Authorization From"
-msgstr "(重新)请求授权"
-
-#: protocols/jabber/jabbercontact.cpp:149
-msgid "Remove Authorization From"
-msgstr "删除请求授权"
-
-#: protocols/jabber/jabbercontact.cpp:154
-msgid "Set Availability"
-msgstr "设置是否有空"
-
-#: protocols/jabber/jabbercontact.cpp:158
-msgid "Free to Chat"
-msgstr "欢迎聊天"
-
-#: protocols/jabber/jabbercontact.cpp:162
-#: protocols/jabber/jabberprotocol.cpp:77
-msgid "Extended Away"
-msgstr "延长离开"
-
-#: protocols/jabber/jabbercontact.cpp:169
-msgid "Select Resource"
-msgstr "选择资源"
+"USAGE: /help [<command>] - Used to list available commands, or show help for a "
+"specified command."
+msgstr "用法：/help [<命令>] - 用于列出可用的命令，或者显示指定命令的帮助。"
 
-#: protocols/jabber/jabbercontact.cpp:186
-msgid "Automatic (best/default resource)"
-msgstr "自动(最佳/默认资源)"
+#: libkopete/kopetecommandhandler.cpp:110
+msgid "USAGE: /close - Closes the current view."
+msgstr "用法：/close - 关闭当前视图。"
 
-#: protocols/jabber/jabberchatsession.cpp:67
-#: protocols/jabber/jabbercontact.cpp:233
-msgid "Voice call"
-msgstr "语音对话"
+#: libkopete/kopetecommandhandler.cpp:114
+msgid "USAGE: /part - Closes the current view."
+msgstr "用法：/part - 关闭当前视图。"
 
-#: protocols/jabber/jabbercontact.cpp:266
-msgid "The original message is : <i>\" %1 \"</i><br>"
-msgstr "原始消息为：<i>“ %1 ”</i><br>"
+#: libkopete/kopetecommandhandler.cpp:117
+msgid "USAGE: /clear - Clears the active view's chat buffer."
+msgstr "用法：/clear - 清除当前视图的聊天缓冲。"
 
-#: protocols/jabber/jabbercontact.cpp:267
+#: libkopete/kopetecommandhandler.cpp:123
 msgid ""
-"<qt><i>%1</i> invited you to join the conference <b>%2</b>"
-"<br>%3"
-"<br>If you want to accept and join, just <b>enter your nickname</b> "
-"and press ok"
-"<br>If you want to decline, press cancel</qt>"
-msgstr ""
-"<qt><i>%1</i> 邀请您加入会议 <b>%2</b>"
-"<br>%3"
-"<br>如果您接受邀请，只需 <b>输入您的昵称</b>并按下确认"
-"<br>如果您想要拒绝，请按下取消</qt>"
-
-#: protocols/jabber/jabbercontact.cpp:273
-msgid "Invited to a conference - Jabber Plugin"
-msgstr "邀请加入会议 - Jabber 插件"
-
-#: protocols/jabber/jabbercontact.cpp:290
-msgid "Message has been displayed"
-msgstr "消息已被显示"
-
-#: protocols/jabber/jabbercontact.cpp:292
-msgid "Message has been delivered"
-msgstr "消息已被送达"
-
-#: protocols/jabber/jabbercontact.cpp:295
-msgid "Message stored on the server, contact offline"
-msgstr "消息存储于服务器上，联系人离线"
-
-#: protocols/jabber/jabbercontact.cpp:302
-msgid "%1 has ended their participation in the chat session."
-msgstr "%1 已结束了聊天会话。"
+"USAGE: /away [<reason>] - Marks you as away/back for the current account only."
+msgstr "用法：/away [<原因>] - 只对当前账户设为离开/回来。"
 
-#: protocols/jabber/jabbercontact.cpp:340
-#: protocols/jabber/jabbergroupcontact.cpp:164
-#: protocols/jabber/jabbergroupmembercontact.cpp:120
-msgid "Your message could not be delivered: \"%1\", Reason: \"%2\""
-msgstr "无法投递您的消息：“%1”，原因：“%2”"
+#: libkopete/kopetecommandhandler.cpp:126
+msgid "USAGE: /awayall [<reason>] - Marks you as away/back for all accounts."
+msgstr "用法：/awayall [<原因>] - 对所有账户设为离开/回来。"
 
-#: protocols/jabber/jabbercontact.cpp:919
+#: libkopete/kopetecommandhandler.cpp:129
 msgid ""
-"Do you also want to remove the authorization from user %1 to see your status?"
-msgstr "您想要同时禁止用户 %1 查看您的状态吗？"
+"USAGE: /say <text> - Say text in this chat. This is the same as just typing a "
+"message, but is very useful for scripts."
+msgstr "用法：/say <文字> - 在此聊天中说话。这和输入消息功能相同，但可用于脚本。"
 
-#: protocols/jabber/jabbercontact.cpp:1089
+#: libkopete/kopetecommandhandler.cpp:133
 msgid ""
-"You have preselected a resource for contact %1, but you still have open chat "
-"windows for this contact. The preselected resource will only apply to newly "
-"opened chat windows."
-msgstr "您为联系人 %1 预先选择了资源，但是您仍然可以为此联系人打开聊天窗口。预先选择的资源只对新打开的聊天窗口生效。"
-
-#: protocols/jabber/jabbercontact.cpp:1093
-msgid "Jabber Resource Selector"
-msgstr "Jabber 资源选择器"
-
-#: protocols/jabber/jabberbookmarks.cpp:132
-msgid "Groupchat bookmark"
-msgstr "群组书签"
-
-#: protocols/jabber/jabberprotocol.cpp:74
-msgid "Free for Chat"
-msgstr "欢迎聊天"
-
-#: protocols/jabber/jabberprotocol.cpp:78
-msgid "Do not Disturb"
-msgstr "请勿打扰"
-
-#: protocols/jabber/jabberprotocol.cpp:94
-msgid "Authorization Status"
-msgstr "认证状态"
-
-#: protocols/jabber/jabberprotocol.cpp:95
-msgid "Available Resources"
-msgstr "可用的资源"
-
-#: protocols/jabber/jabberprotocol.cpp:96
-msgid "vCard Cache Timestamp"
-msgstr "vCard 缓存时间戳"
-
-#: protocols/jabber/jabberprotocol.cpp:98
-msgid "Jabber ID"
-msgstr "Jabber ID"
-
-#: protocols/jabber/jabberprotocol.cpp:100
-msgid "Timezone"
-msgstr "时区"
-
-#: protocols/jabber/jabberprotocol.cpp:101
-msgid "Homepage"
-msgstr "主页"
-
-#: protocols/jabber/jabberprotocol.cpp:102
-msgid "Company name"
-msgstr "公司名称"
-
-#: protocols/jabber/jabberprotocol.cpp:103
-msgid "Company Departement"
-msgstr "公司部门"
-
-#: protocols/jabber/jabberprotocol.cpp:104
-msgid "Company Position"
-msgstr "公司职位"
-
-#: protocols/jabber/jabberprotocol.cpp:105
-msgid "Company Role"
-msgstr "公司角色"
-
-#: protocols/jabber/jabberprotocol.cpp:106
-msgid "Work Street"
-msgstr "工作街道"
-
-#: protocols/jabber/jabberprotocol.cpp:107
-msgid "Work Extra Address"
-msgstr "工作额外地址"
-
-#: protocols/jabber/jabberprotocol.cpp:108
-msgid "Work PO Box"
-msgstr "工作邮箱"
-
-#: protocols/jabber/jabberprotocol.cpp:110
-msgid "Work Postal Code"
-msgstr "工作邮政编码"
-
-#: protocols/jabber/jabberprotocol.cpp:112
-msgid "Work Email Address"
-msgstr "工作电子邮件地址"
-
-#: protocols/jabber/jabberprotocol.cpp:113
-msgid "Home Street"
-msgstr "家庭街道"
-
-#: protocols/jabber/jabberprotocol.cpp:114
-msgid "Home Extra Address"
-msgstr "家庭额外地址"
-
-#: protocols/jabber/jabberprotocol.cpp:115
-msgid "Home PO Box"
-msgstr "家庭邮箱"
-
-#: protocols/jabber/jabberprotocol.cpp:116
-msgid "Home City"
-msgstr "家庭城市"
-
-#: protocols/jabber/jabberprotocol.cpp:117
-msgid "Home Postal Code"
-msgstr "家庭邮政编码"
-
-#: protocols/jabber/jabberprotocol.cpp:118
-msgid "Home Country"
-msgstr "家庭国家"
-
-#: protocols/jabber/jabberprotocol.cpp:119
-msgid "Fax"
-msgstr "传真"
-
-#: protocols/jabber/jabberchatsession.cpp:266
-#: protocols/jabber/jabbergroupchatmanager.cpp:103
-msgid "This message is encrypted."
-msgstr "消息被加密。"
-
-#: protocols/jabber/jabbergroupchatmanager.cpp:148
-#, c-format
-msgid "You have been invited to %1"
-msgstr "您已被邀请到 %1"
-
-#: protocols/jabber/tdeioslave/jabberdisco.cpp:109
-#: protocols/jabber/tdeioslave/jabberdisco.cpp:210
-msgid "TLS"
-msgstr "TLS"
-
-#: protocols/jabber/tdeioslave/jabberdisco.cpp:188
-msgid "The server certificate is invalid. Do you want to continue? "
-msgstr "服务器证书无效。您想要继续吗？ "
-
-#: protocols/jabber/tdeioslave/jabberdisco.cpp:189
-msgid "Certificate Warning"
-msgstr "认证警告"
-
-#: protocols/jabber/tdeioslave/jabberdisco.cpp:320
-msgid "The login details are incorrect. Do you want to try again?"
-msgstr "登录细节不正确。您是否想要再试一次？"
+"USAGE: /exec [-o] <command> - Executes the specified command and displays the "
+"output in the chat buffer. If -o is specified, the output is sent to all "
+"members of the chat."
+msgstr "用法：/exec [-o] <命令> - 执行指定命令并将输出显示到聊天缓冲中。如果指定了 -o，输出将发送到聊天的所有成员。"
 
-#: protocols/jabber/jabberaccount.cpp:166
+#: libkopete/kopetecommandhandler.cpp:236
 msgid ""
-"Could not bind Jabber file transfer manager to local port. Please check if the "
-"file transfer port is already in use or choose another port in the account "
-"settings."
-msgstr "无法将 Jabber 文件传送管理器绑定到本地端口上。请检查文件传送端口是否已在使用，或者在账户设置中选择另外一个端口。"
-
-#: protocols/jabber/jabberaccount.cpp:167
-msgid "Failed to start Jabber File Transfer Manager"
-msgstr "启动 Jabber 文件传送管理器失败"
-
-#: protocols/jabber/jabberaccount.cpp:181
-msgid "Join Groupchat..."
-msgstr "加入小组聊天..."
-
-#: protocols/jabber/jabberaccount.cpp:192
-msgid "Services..."
-msgstr "服务..."
-
-#: protocols/jabber/jabberaccount.cpp:197
-msgid "Send Raw Packet to Server..."
-msgstr "给服务器发送原始包..."
-
-#: protocols/jabber/jabberaccount.cpp:259
-msgid "Please connect first."
-msgstr "请先连接。"
-
-#: protocols/groupwise/gwaccount.cpp:720
-#: protocols/jabber/jabberaccount.cpp:455
-msgid "No certificate was presented."
-msgstr "没有证书。"
-
-#: protocols/groupwise/gwaccount.cpp:724
-#: protocols/jabber/jabberaccount.cpp:459
-msgid "The host name does not match the one in the certificate."
-msgstr "主机名与证书不符。"
-
-#: protocols/groupwise/gwaccount.cpp:728
-#: protocols/jabber/jabberaccount.cpp:463
-msgid "The Certificate Authority rejected the certificate."
-msgstr "证书颁发机构拒绝了证书。"
-
-#: protocols/groupwise/gwaccount.cpp:733
-#: protocols/jabber/jabberaccount.cpp:468
-msgid "The certificate is untrusted."
-msgstr "证书不可信。"
-
-#: protocols/groupwise/gwaccount.cpp:737
-#: protocols/jabber/jabberaccount.cpp:472
-msgid "The signature is invalid."
-msgstr "签名无效。"
-
-#: protocols/groupwise/gwaccount.cpp:741
-#: protocols/jabber/jabberaccount.cpp:476
-msgid "The Certificate Authority is invalid."
-msgstr "证书颁发机构无效。"
-
-#: protocols/groupwise/gwaccount.cpp:746
-#: protocols/jabber/jabberaccount.cpp:481
-msgid "Invalid certificate purpose."
-msgstr "无效的证书用途。"
-
-#: protocols/groupwise/gwaccount.cpp:750
-#: protocols/jabber/jabberaccount.cpp:485
-msgid "The certificate is self-signed."
-msgstr "证书自签名。"
-
-#: protocols/groupwise/gwaccount.cpp:754
-#: protocols/jabber/jabberaccount.cpp:489
-msgid "The certificate has been revoked."
-msgstr "证书已被吊销。"
-
-#: protocols/groupwise/gwaccount.cpp:758
-#: protocols/jabber/jabberaccount.cpp:493
-msgid "Maximum certificate chain length was exceeded."
-msgstr "超过了证书链的最大长度。"
-
-#: protocols/groupwise/gwaccount.cpp:762
-#: protocols/jabber/jabberaccount.cpp:497
-msgid "The certificate has expired."
-msgstr "证书已过期。"
-
-#: protocols/groupwise/gwaccount.cpp:767
-#: protocols/jabber/jabberaccount.cpp:502
-msgid "An unknown error occurred trying to validate the certificate."
-msgstr "试图验证证书时发生了未知错误。"
+"Available Commands:\n"
+msgstr ""
+"可用的命令：\n"
 
-#: protocols/jabber/jabberaccount.cpp:508
+#: libkopete/kopetecommandhandler.cpp:249
 msgid ""
-"<qt>"
-"<p>The certificate of server %1 could not be validated for account %2: %3</p>"
-"<p>Do you want to continue?</p></qt>"
-msgstr "<qt><p>服务器 %1 的证书无法被账户 %2 验证：%3</p><p>您想要继续吗？</p></qt>"
+"\n"
+"Type /help <command> for more information."
+msgstr ""
+"\n"
+"输入 /help <命令> 可查看更多信息。"
 
-#: protocols/jabber/jabberaccount.cpp:510
-msgid "Jabber Connection Certificate Problem"
-msgstr "Jabber 连接证书问题"
+#: libkopete/kopetecommandhandler.cpp:258
+msgid "There is no help available for '%1'."
+msgstr "“%1”没有可用的帮助。"
 
-#: protocols/jabber/jabberaccount.cpp:542
+#: libkopete/kopetecommandhandler.cpp:304
 msgid ""
-"An encrypted connection with the Jabber server could not be established."
-msgstr "无法建立与 Jabber 服务器的加密连接。"
-
-#: protocols/jabber/jabberaccount.cpp:543
-msgid "Jabber Connection Error"
-msgstr "Jabber 连接错误"
-
-#: protocols/jabber/jabberaccount.cpp:743
-msgid "Malformed packet received."
-msgstr "接收到了格式错误的包。"
-
-#: protocols/jabber/jabberaccount.cpp:748
-msgid "There was an unrecoverable error in the protocol."
-msgstr "协议中有不可恢复的错误。"
-
-#: protocols/jabber/jabberaccount.cpp:755
-msgid "Generic stream error (sorry, I do not have a more-detailed reason)"
-msgstr "常规系统错误(抱歉，没有更详细的原因)"
-
-#: protocols/jabber/jabberaccount.cpp:759
-msgid "There was a conflict in the information received."
-msgstr "接收到的信息有冲突。"
-
-#: protocols/jabber/jabberaccount.cpp:762
-msgid "The stream timed out."
-msgstr "流超时。"
-
-#: protocols/jabber/jabberaccount.cpp:765
-msgid "Internal server error."
-msgstr "服务器内部错误。"
-
-#: protocols/jabber/jabberaccount.cpp:768
-msgid "Stream packet received from an invalid address."
-msgstr "从无效地址接收到了流包。"
-
-#: protocols/jabber/jabberaccount.cpp:771
-msgid "Malformed stream packet received."
-msgstr "接收到了格式错误的流包。"
-
-#: protocols/jabber/jabberaccount.cpp:775
-msgid "Policy violation in the protocol stream."
-msgstr "协议流违反了策略。"
-
-#: protocols/jabber/jabberaccount.cpp:779
-msgid "Resource constraint."
-msgstr "资源约束。"
-
-#: protocols/jabber/jabberaccount.cpp:783
-msgid "System shutdown."
-msgstr "系统关闭。"
-
-#: protocols/jabber/jabberaccount.cpp:786
-msgid "Unknown reason."
-msgstr "未知原因。"
-
-#: protocols/jabber/jabberaccount.cpp:790
-#, c-format
-msgid "There was an error in the protocol stream: %1"
-msgstr "协议流有错：%1。"
+"ERROR: Shell access has been restricted on your system. The /exec command will "
+"not function."
+msgstr "错误：您的系统限制了 Shell 访问。/exec 命令将无法工作。"
 
-#: protocols/jabber/jabberaccount.cpp:798
-msgid "Host not found."
-msgstr "找不到主机。"
+#~ msgid ""
+#~ "The NetMeeting Plugin allows you to start a video or voice chat with your MSN Messenger contacts.\n"
+#~ "\n"
+#~ "This is not the same as webcam chat you can find in the newer Windows Messenger®,  but uses the older NetMeeting chat you can find in old versions."
+#~ msgstr ""
+#~ "NetMeeting 插件允许您与您的 MSN Messenger 联系人开始视频或语音聊天。\n"
+#~ "\n"
+#~ "这与您在较新版本的 Windows Messenger(R) 中看到的摄像头功能不同，而是使用您在较早版本中可找到的 NetMeeting 聊天。"
 
-#: protocols/jabber/jabberaccount.cpp:801
-msgid "Address is already in use."
-msgstr "地址已在使用中。"
+#~ msgid "Application to launch:"
+#~ msgstr "要调用的应用程序："
 
-#: protocols/jabber/jabberaccount.cpp:804
-msgid "Cannot recreate the socket."
-msgstr "无法重建套接字。"
+#~ msgid "ekiga -c callto://%1"
+#~ msgstr "ekiga -c callto://%1"
 
-#: protocols/jabber/jabberaccount.cpp:807
-msgid "Cannot bind the socket again."
-msgstr "无法再次绑定套接字。"
+#~ msgid "konference callto://%1"
+#~ msgstr "konference callto://%1"
 
-#: protocols/jabber/jabberaccount.cpp:810
-msgid "Socket is already connected."
-msgstr "套接字已在连接中。"
+#~ msgid "<b>%1</b> will be replaced by the ip to call"
+#~ msgstr "<b>%1</b> 将被替换为要呼叫的 IP 地址"
 
-#: protocols/jabber/jabberaccount.cpp:813
-msgid "Socket is not connected."
-msgstr "套接字未连接。"
+#~ msgid "You can download Konference here: <a href=\"http://www.kde-apps.org/content/show.php?content=10395\">http://www.kde-apps.org/content/show.php?content=10395</a>"
+#~ msgstr "您可从下面下载到 Konference：<a href=\"http://www.kde-apps.org/content/show.php?content=10395\">http://www.kde-apps.org/content/show.php?content=10395</a>"
 
-#: protocols/jabber/jabberaccount.cpp:816
-msgid "Socket is not bound."
-msgstr "套接字未绑定。"
+#~ msgid "&Parameters:"
+#~ msgstr "参数(&P)："
 
-#: protocols/jabber/jabberaccount.cpp:819
-msgid "Socket has not been created."
-msgstr "套接字尚未创建。"
+#~ msgid "Co&mmand:"
+#~ msgstr "命令(&M)："
 
-#: protocols/jabber/jabberaccount.cpp:822
-msgid ""
-"Socket operation would block. You should not see this error, please use "
-"\"Report Bug\" from the Help menu."
-msgstr "套接字操作将阻塞。您不应该看到此错误，请使用帮助菜单中的“报告错误”。"
+#~ msgid "Add &ID"
+#~ msgstr "添加 ID(&I)"
 
-#: protocols/jabber/jabberaccount.cpp:825
-msgid "Connection refused."
-msgstr "连接被拒绝。"
+#~ msgid "Add &new line"
+#~ msgstr "添加新行(&N)"
 
-#: protocols/jabber/jabberaccount.cpp:828
-msgid "Connection timed out."
-msgstr "连接超时。"
+#~ msgid "Message:"
+#~ msgstr "消息："
 
-#: protocols/jabber/jabberaccount.cpp:831
-msgid "Connection attempt already in progress."
-msgstr "连接已经在进行中."
+#~ msgid "&MSN Passport ID:"
+#~ msgstr "&MSN Passport ID："
 
-#: protocols/jabber/jabberaccount.cpp:834
-msgid "Network failure."
-msgstr "网络失败。"
+#~ msgid "The user ID of the MSN contact you would like to add."
+#~ msgstr "您想要添加的 MSN 联系人的用户 ID。"
 
-#: protocols/jabber/jabberaccount.cpp:837
-msgid "Operation is not supported."
-msgstr "操作不支持。"
+#~ msgid "The user ID of the MSN contact you would like to add.  This should be in the form of a valid E-mail address."
+#~ msgstr "您想要添加的 MSN 联系人的用户 ID。格式应该为有效的电子邮件地址。"
 
-#: protocols/jabber/jabberaccount.cpp:840
-msgid "Socket timed out."
-msgstr "套接字超时。"
+#~ msgid "<i>(for example: joe@hotmail.com)</i>"
+#~ msgstr "<i>(例如：joe@hotmail.com)</i>"
 
-#: protocols/jabber/jabberaccount.cpp:848
-#, c-format
-msgid "There was a connection error: %1"
-msgstr "连接发生错误：%1"
+#~ msgid "Account Preferences - MSN"
+#~ msgstr "账户首选项 - MSN"
 
-#: protocols/jabber/jabberaccount.cpp:856
-msgid "Unknown host."
-msgstr "未知主机。"
+#~ msgid "To connect to the Microsoft network, you will need a Microsoft Passport.<br><br>If you do not currently have a Passport, please click the button to create one."
+#~ msgstr "要连接到 Microsoft Network，您必须有一张 Microsoft Passport。<br><br>如果您从未申请过 Passport，您可以在下面链接处的网站进行注册。"
 
-#: protocols/jabber/jabberaccount.cpp:860
-msgid "Could not connect to a required remote resource."
-msgstr "无法连接到所请求的远程资源。"
+#~ msgid "The user ID of the MSN contact you would like to use."
+#~ msgstr "您想要使用的 MSN 联系人的用户 ID。"
 
-#: protocols/jabber/jabberaccount.cpp:863
-msgid ""
-"It appears we have been redirected to another server; I do not know how to "
-"handle this."
-msgstr "似乎被重定向到另外一台服务器。目前尚无法处理这种情况。"
+#~ msgid "The user ID of the MSN contact you would like to use.  This should be in the form of a valid E-mail address."
+#~ msgstr "您想要使用的 MSN 联系人的用户 ID。格式应该为有效的电子邮件地址。"
 
-#: protocols/jabber/jabberaccount.cpp:866
-msgid "Unsupported protocol version."
-msgstr "不支持的协议版本。"
+#~ msgid "If you check this checkbox, the account will not be connected when you press the \"Connect All\" button, or at startup when automatic connection at startup is enabled."
+#~ msgstr "如果您选中了此选项，当您按下“全部连接”按钮时，此账户将不会连接。当然，即便您选择了启动时自动登录，应用程序启动时也不会登录此账户。"
 
-#: protocols/jabber/jabberaccount.cpp:869
-#: protocols/jabber/jabberaccount.cpp:886
-#: protocols/jabber/jabberaccount.cpp:930
-#: protocols/jabber/jabberaccount.cpp:947
-#: protocols/jabber/jabberaccount.cpp:964
-#: protocols/jabber/jabberaccount.cpp:972
-msgid "Unknown error."
-msgstr "未知错误。"
-
-#: protocols/jabber/jabberaccount.cpp:873
-#, c-format
-msgid "There was a negotiation error: %1"
-msgstr "谈判发生错误：%1"
-
-#: protocols/jabber/jabberaccount.cpp:880
-msgid "Server rejected our request to start the TLS handshake."
-msgstr "服务器拒绝开始 TLS 握手的请求。"
-
-#: protocols/jabber/jabberaccount.cpp:883
-msgid "Failed to establish a secure connection."
-msgstr "建立安全连接失败。"
-
-#: protocols/jabber/jabberaccount.cpp:890
-#, c-format
-msgid "There was a Transport Layer Security (TLS) error: %1"
-msgstr "传送层安全性(TLS)有错：%1"
+#~ msgid "MSN &Settings"
+#~ msgstr "MSN 设置(&S)"
 
-#: protocols/jabber/jabberaccount.cpp:897
-msgid "Login failed with unknown reason."
-msgstr "连接失败，原因未知。"
-
-#: protocols/jabber/jabberaccount.cpp:900
-msgid "No appropriate authentication mechanism available."
-msgstr "没有适当的身份验证算法。"
+#~ msgid "<qt><b>Note:</b> These settings are applicable to all MSN accounts"
+#~ msgstr "<qt><b>注意：</b>这些设置针对全部 MSN 账户"
 
-#: protocols/jabber/jabberaccount.cpp:903
-msgid "Bad SASL authentication protocol."
-msgstr "无效的 SASL 认证协议。"
+#~ msgid "Global MSN Options"
+#~ msgstr "全局 MSN 选项"
 
-#: protocols/jabber/jabberaccount.cpp:906
-msgid "Server failed mutual authentication."
-msgstr "服务器双向身份验证失败。"
+#~ msgid "Au&tomatically open a chat window when someone starts a conversation"
+#~ msgstr "有人发起对话时自动打开聊天窗口(&T)"
 
-#: protocols/jabber/jabberaccount.cpp:909
-msgid "Encryption is required but not present."
-msgstr "需要加密但没有加密。"
+#~ msgid "This option will notify you when a contact starts typing their message, before the message is sent or finished."
+#~ msgstr "有联系人开始打字的时候就通知您，而不等到该消息发出或完成。"
 
-#: protocols/jabber/jabberaccount.cpp:912
-msgid "Invalid user ID."
-msgstr "无效的用户ID。"
+#~ msgid "Download the msn picture:"
+#~ msgstr "下载 MSN 图片："
 
-#: protocols/jabber/jabberaccount.cpp:915
-msgid "Invalid mechanism."
-msgstr "无效的算法。"
-
-#: protocols/jabber/jabberaccount.cpp:918
-msgid "Invalid realm."
-msgstr "无效域。"
+#~ msgid ""
+#~ "<qt><p>Indicate when Kopete will download the display pictures of contacts</p>\n"
+#~ "<dl><dt>Only manually</dt><dd>The picture is not downloaded automatically. It is only downloaded when the user requests it</dd>\n"
+#~ "<dt>When a chat is open</dt><dd>The picture is downloaded when a conversation socket is opened, i.e. when you open a chat window</dd>\n"
+#~ "<dt>Automatically</dt><dd>Always try to download the picture if the contact has one.  <b>Note:</b> this will open a socket, and let the user know you are downloading their picture.</dd></dl>"
+#~ msgstr ""
+#~ "<qt><p>标明 Kopete 何时下载联系人图片</p>\n"
+#~ "<dl><dt>仅手动</dt><dd>图片不会自动下载，仅当用户请求时才下载</dd>\n"
+#~ "<dt>打开聊天时</dt><dd>当对话套接字打开之后下载图片，也就是当您打开聊天窗口时下载图片</dd>\n"
+#~ "<dt>自动</dt><dd>只要联系人有图片，就总是试图下载。<b>注意：</b>这将打开一个套接字，并让用户知道您正在下载其图片。</dd></dl>"
 
-#: protocols/jabber/jabberaccount.cpp:921
-msgid "Mechanism too weak."
-msgstr "算法太弱。"
+#~ msgid "Only Manually"
+#~ msgstr "仅手动"
 
-#: protocols/jabber/jabberaccount.cpp:924
-msgid "Wrong credentials supplied. (check your user ID and password)"
-msgstr "提供了错误的凭证。(请检查您的用户 ID 和密码)"
+#~ msgid "When a Chat is Open"
+#~ msgstr "打开聊天时"
 
-#: protocols/jabber/jabberaccount.cpp:927
-msgid "Temporary failure, please try again later."
-msgstr "临时失败。请稍候重试。"
+#~ msgid "Automatically"
+#~ msgstr "自动"
 
-#: protocols/jabber/jabberaccount.cpp:934
-#, c-format
-msgid "There was an error authenticating with the server: %1"
-msgstr "与服务器进行身份验证时出错：%1"
+#~ msgid ""
+#~ "<qt><p>Indicate when Kopete will download the pictures of contacts</p>\n"
+#~ "<dl><dt>Only manually</dt><dd>The picture is not downloaded automatically. It is only downloaded when the user requests it</dd>\n"
+#~ "<dt>When a chat is open</dt><dd>The picture is downloaded when a conversation socket is opened, i.e. when you open a chat window</dd>\n"
+#~ "<dt>Automatically</dt><dd>Always try to download the picture if the contact has one.  <b>Note:</b> this will open a socket, and let the user know you are downloading their picture.</dd></dl>"
+#~ msgstr ""
+#~ "<qt><p>标明 Kopete 何时下载联系人图片</p>\n"
+#~ "<dl><dt>仅手动</dt><dd>图片不会自动下载，仅当用户请求时才下载</dd>\n"
+#~ "<dt>打开聊天时</dt><dd>当对话套接字打开之后下载图片，也就是当您打开聊天窗口时下载图片</dd>\n"
+#~ "<dt>自动</dt><dd>只要联系人有图片，就总是试图下载。<b>注意：</b>这将打开一个套接字，并让用户知道您正在下载其图片。</dd></dl>"
 
-#: protocols/jabber/jabberaccount.cpp:941
-msgid "Transport Layer Security (TLS) problem."
-msgstr "传送层安全(TLS)有问题。"
+#~ msgid "&Download and show custom emoticons"
+#~ msgstr "下载并显示自定义表情(&D)"
 
-#: protocols/jabber/jabberaccount.cpp:944
-msgid "Simple Authentication and Security Layer (SASL) problem."
-msgstr "简单身份验证和安全层(SASL)问题。"
+#~ msgid "MSN Messenger allows users to download and use custom emoticons. If this option is enabled, Kopete will download these emoticons and show them."
+#~ msgstr "MSN Messenger 可让您选择某些自定义表情。如果选中了此选项，Kopete 将会下载并显示这些表情。"
 
-#: protocols/jabber/jabberaccount.cpp:951
-#, c-format
-msgid "There was an error in the security layer: %1"
-msgstr "安全层有错：%1"
+#~ msgid "E&xport the current emoticon theme to users"
+#~ msgstr "将当前表情主题导出给用户(&X)"
 
-#: protocols/jabber/jabberaccount.cpp:958
-msgid "No permission to bind the resource."
-msgstr "没有权限绑定资源。"
+#~ msgid "Only work with emoticons in the PNG format"
+#~ msgstr "只适用于 PNG 各式的表情"
 
-#: protocols/jabber/jabberaccount.cpp:961
-msgid "The resource is already in use."
-msgstr "资源已在使用中。"
+#~ msgid ""
+#~ "Export all the emoticon themes as custom emoticons.\n"
+#~ "Only works for emoticons in the PNG format."
+#~ msgstr ""
+#~ "将全部表情主题导出为自定义表情。\n"
+#~ "仅支持 PNG 格式的表情。"
 
-#: protocols/jabber/jabberaccount.cpp:968
-#, c-format
-msgid "Could not bind a resource: %1"
-msgstr "无法绑定资源：%1"
+#~ msgid "Privacy"
+#~ msgstr "隐私"
 
-#: protocols/jabber/jabberaccount.cpp:984
-#, c-format
-msgid "Connection problem with Jabber server %1"
-msgstr "连接到 Jabber 服务器 %1 时出错"
+#~ msgid "Send client information"
+#~ msgstr "发送客户端信息"
 
-#: protocols/jabber/jabberaccount.cpp:1122
-msgid ""
-"The Jabber user %1 removed %2's subscription to them. This account will no "
-"longer be able to view their online/offline status. Do you want to delete the "
-"contact?"
-msgstr "Jabber 用户 %1 删除了 %2 对他的订阅。此账户将无法再看到他的在线/离线状态。您想要删除该联系人吗？"
+#~ msgid "<qt>Make it possible for your contacts to detect if you are using Kopete.<br>We recommend leaving this checked.</qt>"
+#~ msgstr "<qt>让您的联系人检测到您是否正在使用 Kopete。<br>我们建议您将此选项选中。</qt>"
 
-#: protocols/jabber/jabberaccount.cpp:1302
-msgid "Waiting for authorization"
-msgstr "等待认证"
+#~ msgid "Third party MSN clients, such as Kopete, give users the ability to let other third party clients guess which client they are using. We recommend leaving this checkbox checked."
+#~ msgstr "第三方 MSN 客户端，比如 Kopete，可让使用其它第三方客户端软件的用户知晓互相正在使用何种客户端。我们建议您将此复选框选中。"
 
-#: protocols/jabber/jabberaccount.cpp:1515
-#, c-format
-msgid "A password is required to join the room %1."
-msgstr "进入房间 %1 需要密码。"
+#~ msgid "Send &typing notifications"
+#~ msgstr "发送打字通知(&T)"
 
-#: protocols/jabber/jabberaccount.cpp:1524
-msgid "Error trying to join %1 : nickname %2 is already in use"
-msgstr "试图加入 %1 时出错：昵称 %2 已正被使用"
+#~ msgid "<qt>Check this box to send <b>Typing notifications</b> to your contacts. When you are composing a message, you might want your contact to know that you are typing so that he knows you are answering.</qt>"
+#~ msgstr "<qt>选中此复选框可向您的联系人发送<b>打字通知</b>。当您正在撰写消息时，您可能想要您的联系人知道您正在打字，以便让他知道您正在答复。</qt>"
 
-#: protocols/jabber/jabberaccount.cpp:1525
-msgid "Give your nickname"
-msgstr "您的昵称"
+#~ msgid "Expose my Jabber account to Jabber users"
+#~ msgstr "向 Jabber 用户公布我的 Jabber 账户"
 
-#: protocols/jabber/jabberaccount.cpp:1538
-msgid "You can't join the room %1 because you were banned"
-msgstr "<qt>您无法加入房间 %1，因为您被屏蔽了。</qt>"
+#~ msgid "If you have a Jabber account, you may let Jabber users on an MSN gateway know that you are also using Jabber."
+#~ msgstr "如果您有 Jabber 账户，您可以让使用 MSN 网关的 Jabber 用户知道您也在使用 Jabber。"
 
-#: protocols/jabber/jabberaccount.cpp:1539
-#: protocols/jabber/jabberaccount.cpp:1546
-#: protocols/jabber/jabberaccount.cpp:1556
-msgid "Jabber Group Chat"
-msgstr "Jabber 小组聊天"
+#~ msgid "There are also privacy options in the \"Contacts\" tab"
+#~ msgstr "“联系人”标签上还有隐私选项"
 
-#: protocols/jabber/jabberaccount.cpp:1545
-msgid "You can't join the room %1 because the maximum users has been reached"
-msgstr "您无法进入房间 %1，因为此房间已达人数上限。"
+#~ msgid "The alias you would like to use on MSN.  You may change this at any time you wish."
+#~ msgstr "您想要在 MSN 上使用的别名。您可在您喜欢的任何时候加以更改。"
 
-#: protocols/jabber/jabberaccount.cpp:1551
-msgid "No reason given by the server"
-msgstr "服务器未给出原因"
+#~ msgid "Phone Numbers"
+#~ msgstr "电话号码"
 
-#: protocols/jabber/jabberaccount.cpp:1555
-msgid ""
-"There was an error processing your request for group chat %1. (Reason: %2, Code "
-"%3)"
-msgstr "处理您在群组聊天 %1 中的请求出错。(原因：%2，代码：%3)"
+#~ msgid "Hom&e:"
+#~ msgstr "宅电(&E)："
 
-#: protocols/jabber/jabberaccount.cpp:1688
-msgid ""
-"Do you want to also unregister \"%1\" from the Jabber server ?\n"
-"If you unregister, all your contact list may be removed on the server,And you "
-"will never be able to connect to this account with any client"
-msgstr ""
-"您希望同时从 Jabber 服务器上注销账户“%1”吗？\n"
-"如果您选择注销，您的全部联系人列表将从服务器上被删除，同时您再也无法使用任何客户端连接到此账户。"
+#~ msgid "&Work:"
+#~ msgstr "单位(&W)："
 
-#: protocols/jabber/jabberaccount.cpp:1691
-msgid "Unregister"
-msgstr "注销"
+#~ msgid "&Mobile:"
+#~ msgstr "手机(&M)："
 
-#: protocols/jabber/jabberaccount.cpp:1692
-msgid "Remove and Unregister"
-msgstr "删除并注销"
+#~ msgid "Display Picture"
+#~ msgstr "显示图片"
 
-#: protocols/jabber/jabberaccount.cpp:1693
-msgid "Remove from kopete only"
-msgstr "只从 Kopete 删除"
+#~ msgid "E&xport a display picture"
+#~ msgstr "导出显示图片(&X)"
 
-#: protocols/jabber/jabberaccount.cpp:1737
-#, c-format
-msgid ""
-"An error occured when trying to remove the account:\n"
-"%1"
-msgstr ""
-"试图删除账户时出错：\n"
-"%1"
+#~ msgid "Please select a square image. The image will be scaled to 96x96."
+#~ msgstr "请选择方形图像。图像将会被缩放至 96x96。"
 
-#: protocols/jabber/jabberaccount.cpp:1738
-msgid "Jabber Account Unregistration"
-msgstr "Jabber 账户注销"
+#~ msgid "&Select Image..."
+#~ msgstr "选择图像(&S)..."
 
-#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:47
-#, c-format
-msgid "Voice session with %1"
-msgstr "正在和 %1 进行语音会话"
+#~ msgid "WARNING: You need to be connected to modify this page."
+#~ msgstr "警告：要修改此页，您必须在线。"
 
-#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:72
-msgid "Incoming Session..."
-msgstr "正在接收会话..."
+#~ msgid "Con&tacts"
+#~ msgstr "联系人(&T)"
 
-#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:98
-msgid "Waiting for other peer..."
-msgstr "正在等待对方回应..."
+#~ msgid ""
+#~ "<i>Italics</i> contacts are not on your contact list.<br>\n"
+#~ "<br>\n"
+#~ "<b>Bold</b> contacts are in your contact list but you are not in their contact list."
+#~ msgstr ""
+#~ "<i>斜体</i>的联系人是没有在您的联系人列表中出现的。<br>\n"
+#~ "<br>\n"
+#~ "<b>粗体</b>的联系人是位于您的联系人列表，但您没有出现在对方的联系人列表中的"
 
-#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:109
-#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:162
-msgid "Session accepted."
-msgstr "会话已接受。"
+#~ msgid "Bloc&ked contacts:"
+#~ msgstr "屏蔽的联系人(&K)："
 
-#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:121
-#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:174
-msgid "Session declined."
-msgstr "会话被拒绝。"
+#~ msgid "&>"
+#~ msgstr "&>"
 
-#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:134
-#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:186
-msgid "Session terminated."
-msgstr "会话结束。"
+#~ msgid "&<"
+#~ msgstr "&<"
 
-#: protocols/jabber/jingle/jinglevoicesessiondialog.cpp:150
-msgid "Session in progress."
-msgstr "会话进行中。"
+#~ msgid "Allo&wed contacts:"
+#~ msgstr "允许的联系人(&W)："
 
-#: protocols/jabber/jabberchatsession.cpp:119
-msgid ""
-"_: a contact's online status in parenthesis.\n"
-" (%1)"
-msgstr " (%1)"
+#~ msgid "Block all users not in 'Allowed' &list"
+#~ msgstr "屏蔽全部未处于“允许”列表中的用户(&L)"
 
-#: protocols/jabber/jabberbasecontact.cpp:133
-msgid "You cannot see each others' status."
-msgstr "双方都无法看到对方的状态。"
+#~ msgid "Checking this box will block all users not explicitly shown in the allowed list here, including any contacts not on your contact list."
+#~ msgstr "选中此框将会屏蔽未显式列在允许列表中的全部用户，包括任何未位于您联系人列表中的联系人。"
 
-#: protocols/jabber/jabberbasecontact.cpp:137
-msgid "You can see this contact's status but they cannot see your status."
-msgstr "您可以看到此联系人的状态，但他看不到您的状态。"
+#~ msgid "View &Reverse List"
+#~ msgstr "查看反向列表(&R)"
 
-#: protocols/jabber/jabberbasecontact.cpp:141
-msgid "This contact can see your status but you cannot see their status."
-msgstr "此联系人可以看到您的状态，但您看不到他的状态。"
+#~ msgid "The reverse list is the list of contacts who added you to their own contact list."
+#~ msgstr "反向列表是将您添加到好友列表的联系人清单。"
 
-#: protocols/jabber/jabberbasecontact.cpp:145
-msgid "You can see each others' status."
-msgstr "您可以看到其他人的状态。"
+#~ msgid "WARNING: You need to be connected to modify this page"
+#~ msgstr "警告：要修改此页，您必须在线"
 
-#: protocols/jabber/jabberbasecontact.cpp:255
-msgid "Client"
-msgstr "客户"
+#~ msgid "Connection Preferences (for advanced users)"
+#~ msgstr "连接首选项(适用于高级用户)"
 
-#: protocols/jabber/jabberbasecontact.cpp:280
-msgid "Timestamp"
-msgstr "时间戳"
+#~ msgid "messenger.hotmail.com"
+#~ msgstr "messenger.hotmail.com"
 
-#: protocols/jabber/jabberbasecontact.cpp:287
-msgid "Message"
-msgstr "消息"
+#~ msgid "Only modify these values if you want to use a special IM proxy server, like SIMP"
+#~ msgstr "请仅当您想要使用特殊的 IM 代理服务器(如 SIMP)时才修改这些值"
 
-#: protocols/jabber/jabbergroupcontact.cpp:116
-msgid "Change nick name"
-msgstr "更改昵称"
+#~ msgid "Use &HTTP method"
+#~ msgstr "使用 HTTP 方式(&H)"
 
-#: protocols/jabber/jabbergroupcontact.cpp:356
-msgid "Change nickanme - Jabber Plugin"
-msgstr "更改昵称 - Jabber 插件"
+#~ msgid ""
+#~ "Connect to MSN Messenger using an HTTP-like protocol on port 80.\n"
+#~ "This may be used to connect on a network with a restrictive firewall.\n"
+#~ "Only check this option if the normal connection doesn't work."
+#~ msgstr ""
+#~ "在 80 端口使用类似 HTTP 的协议连接到 MSN Messenger。\n"
+#~ "这可以用于连接到防火墙后的网络。\n"
+#~ "仅当普通连接方式无效工作时，才选中此选项。"
 
-#: protocols/jabber/jabbergroupcontact.cpp:357
-msgid "Please enter the new nick name you want to have on the room <i>%1</i>"
-msgstr ""
-"请输入您想要显示在聊天室内的新昵称：\r\n"
-"<i>%1</i>"
+#~ msgid "S&pecify a base port for incoming webcam connections:"
+#~ msgstr "指定摄像头连入的基准端口(&P)："
 
-#: protocols/winpopup/wpuserinfo.cpp:37
-msgid "N/A"
-msgstr "不可用"
+#~ msgid "If you are behind a firewall, you may specify a base port to use for the incoming connection, and configure your firewall to accept connections on a range of 10 ports, starting at this one. Incoming connections are used for the webcam. If you don't specify a port yourself, the operating system will choose an available port for you. It is recommended to leave the checkbox unchecked."
+#~ msgstr "如果您位于防火墙之后，您可能需要指定一个用于接收进入连接的基准端口，并在防火墙处开放从此向后的 10 个端口。摄像头会使用到此连接，如果您未明确指定，系统将会为您自动选取一个可用的端口，如果您希望这样的话建议不要选中此组合框。"
 
-#: protocols/winpopup/wpuserinfo.cpp:48 protocols/winpopup/wpuserinfo.cpp:49
-#: protocols/winpopup/wpuserinfo.cpp:50 protocols/winpopup/wpuserinfo.cpp:51
-msgid "Looking"
-msgstr "查找"
+#~ msgid "Email address:"
+#~ msgstr "电子邮件："
 
-#: protocols/winpopup/wpaddcontact.cpp:90
-#: protocols/winpopup/wpaddcontact.cpp:97
-#: protocols/winpopup/wpeditaccount.cpp:100
-#: protocols/winpopup/wpeditaccount.cpp:106
-msgid "WinPopup"
-msgstr "WinPopup"
+#~ msgid "Personal message:"
+#~ msgstr "个人消息："
 
-#: protocols/winpopup/wpeditaccount.cpp:106
-msgid "<qt>You must enter a valid smbclient path.</qt>"
-msgstr "<qt>您必须输入一个有效的 smbclient 路径。</qt>"
+#~ msgid "Phones"
+#~ msgstr "电话"
 
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:106
-msgid ""
-"Working directory %1 does not exist.\n"
-"If you have not configured anything yet (samba) please see\n"
-"Install Into Samba (Configure... -> Account -> Edit) information\n"
-"on how to do this.\n"
-"Should the directory be created? (May need root password)"
-msgstr ""
-"工作目录 %1 不存在。\n"
-"如果您还没有配置过 Samba，请查看\n"
-"安装到 Samba(配置...->账户->编辑)信息以获得\n"
-"该如何做的指示。\n"
-"是否要创建该目录？(可能需要 root 密码)"
+#~ msgid "Mobile:"
+#~ msgstr "手机："
 
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:111
-msgid "Create Directory"
-msgstr "创建目录"
+#~ msgid "I am on &the contact list of this contact"
+#~ msgstr "我位于此联系人的联系人列表中(&T)"
 
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:111
-msgid "Do Not Create"
-msgstr "不创建"
+#~ msgid "Show whether you are on the contact list of this user"
+#~ msgstr "显示您是否位于该用户的联系人列表中"
 
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:125
-msgid ""
-"Permissions of the working directory %1 are wrong!\n"
-"You will not receive messages if you say no.\n"
-"You can also correct it manually (chmod 0777 %1) and restart kopete.\n"
-"Fix? (May need root password)"
-msgstr ""
-"工作目录 %1 的权限有错误！\n"
-"如果您回答“否”，将无法收到任何信息。\n"
-"您也可以手动校正其权限(chmod 0777 %1)并重新启动 kopete。\n"
-"要校正吗？(可能需要 root 密码)"
+#~ msgid ""
+#~ "If this box is checked, you are on this user's contact list.\n"
+#~ "If not, the user has not added you to their list, or has removed you."
+#~ msgstr ""
+#~ "如果选中了此框，您就会出现于该用户的联系人列表中。\n"
+#~ "如果此框未选中，该用户就没有将您添加到联系人列表中，或者已经将您删除。"
 
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:130
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:306
-msgid "Fix"
-msgstr "修复"
+#~ msgid "&Debug"
+#~ msgstr "调试(&D)"
 
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:130
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:306
-msgid "Do Not Fix"
-msgstr "不修复"
+#~ msgid "&Automatically open a chat window when someone starts a conversation"
+#~ msgstr "有人发起对话时自动打开聊天窗口(&A)"
 
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:234
-msgid ""
-"Connection to localhost failed!\n"
-"Is your samba server running?"
-msgstr ""
-"连接到 localhost 失败！\n"
-"您的 Samba 服务器是否已经运行？"
+#~ msgid "&Automatically download the display picture if possible"
+#~ msgstr "可能时自动下载显示图片(&A)"
 
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:303
-msgid ""
-"A message file could not be removed; maybe the permissions are wrong.\n"
-"Fix? (May need root password)"
-msgstr ""
-"消息文件无法删除；可能权限不对。\n"
-"修复吗？(可能需要 root 密码)"
+#~ msgid "Download and show custom emoticons (experimental)"
+#~ msgstr "下载并显示自定义表情(试验中)"
 
-#: protocols/winpopup/libwinpopup/libwinpopup.cpp:311
-msgid "Still cannot remove it; please fix manually."
-msgstr "仍然无法删除；请手动修复。"
+#~ msgid "Away Messages"
+#~ msgstr "离开消息"
 
-#: protocols/winpopup/wpprotocol.cpp:144
-msgid "The Samba configuration file is modified."
-msgstr "Samba 配置文件已修改。"
+#~ msgid "Send &away messages"
+#~ msgstr "发送离开消息(&A)"
 
-#: protocols/winpopup/wpprotocol.cpp:144
-msgid "Configuration Succeeded"
-msgstr "配置成功"
+#~ msgid "Do not send more than one away message every"
+#~ msgstr "发送多个离开消息的间隔要大于"
 
-#: protocols/winpopup/wpprotocol.cpp:146
-msgid "Updating the Samba configuration file failed."
-msgstr "更新 Samba 配置文件失败。"
+#~ msgid "seconds"
+#~ msgstr "秒"
 
-#: protocols/winpopup/wpprotocol.cpp:146
-msgid "Configuration Failed"
-msgstr "配置失败"
+#~ msgid ""
+#~ "%2\n"
+#~ "Auto Translated: %1"
+#~ msgstr ""
+#~ "%2\n"
+#~ "自动翻译为 %1："
 
-#: protocols/winpopup/wpaddcontact.cpp:90
-msgid "<qt>You must enter a valid hostname.</qt>"
-msgstr "<qt>您必须输入一个有效的主机名。</qt>"
+#~ msgid "NetMeeting"
+#~ msgstr "NetMeeting"
 
-#: protocols/winpopup/wpaddcontact.cpp:97
-msgid "<qt>LOCALHOST is not allowed as contact.</qt>"
-msgstr "<qt>LOCALHOST 不允许是联系人。</qt>"
+#~ msgid "Invite to Use NetMeeting"
+#~ msgstr "邀请使用 NetMeeting"
 
-#: protocols/winpopup/wpaccount.cpp:163
-msgid "WinPopup (%1)"
-msgstr "WinPopup (%1)"
+#~ msgid "%1 wants to start a chat with NetMeeting; do you want to accept it? "
+#~ msgstr "%1 想要启动以 NetMeeting 的聊天；您接受吗？ "
 
-#: protocols/groupwise/ui/gweditaccountwidget.cpp:104
-msgid ""
-"The changes you just made will take effect next time you log in with GroupWise."
-msgstr "在您注销后再次登录 GroupWise，您所做的改变将会生效。"
+#~ msgid "MSN Plugin"
+#~ msgstr "MSN 插件"
 
-#: protocols/groupwise/ui/gweditaccountwidget.cpp:105
-msgid "GroupWise Settings Changed While Signed In"
-msgstr "登入时 GroupWise 设置发生了更改"
+#~ msgid "Refuse"
+#~ msgstr "拒绝"
 
-#: protocols/groupwise/ui/gwreceiveinvitationdialog.cpp:37
-msgid "Invitation to Conversation"
-msgstr "对话邀请"
+#~ msgid "<qt>An error occurred when trying to change the display picture.<br>Make sure that you have selected a correct image file</qt>"
+#~ msgstr "<qt>试图更改显示图片时出错。<br>请确定您选择了正确的图像文件</qt>"
 
-#: protocols/groupwise/ui/gwprivacydialog.cpp:52
-#, c-format
-msgid ""
-"_: Account specific privacy settings\n"
-"Manage Privacy for %1"
-msgstr "管理 %1 的隐私"
+#~ msgid "<qt>You must enter a valid email address.</qt>"
+#~ msgstr "<qt>您必须输入一个有效的电子邮件地址。</qt>"
 
-#: protocols/groupwise/ui/gwprivacydialog.cpp:62
-msgid "Privacy settings have been administratively locked"
-msgstr "隐私设置已被管理员锁定"
+#~ msgid "Here you can see a list of contacts who added you to their contact list"
+#~ msgstr "您可在这里看到将您添加到好友列表的联系人清单。"
 
-#: protocols/groupwise/ui/gwprivacydialog.cpp:100
-msgid "<Everyone Else>"
-msgstr "<别人>"
+#~ msgid "Reverse List - MSN Plugin"
+#~ msgstr "反转列表 - MSN 插件"
 
-#: protocols/groupwise/ui/gwprivacydialog.cpp:180
-msgid "Search for Contact to Block"
-msgstr "搜索要屏蔽的联系人"
+#~ msgid "MSN Display Picture"
+#~ msgstr "MSN 显示图片"
 
-#: protocols/groupwise/ui/gwprivacydialog.cpp:346
-msgid ""
-"You can only change privacy settings while you are logged in to the GroupWise "
-"Messenger server."
-msgstr "仅当您登录到 GroupWise 信使服务器时才能更改隐私设置。"
+#~ msgid "Downloading of display image failed"
+#~ msgstr "下载显示图像失败"
 
-#: protocols/groupwise/ui/gwprivacydialog.cpp:346
-msgid "'%1' Not Logged In"
-msgstr "“%1”尚未登入"
+#~ msgid "<qt>The contact %1 wants to see <b>your</b> webcam, do you want them to see it?</qt>"
+#~ msgstr "<qt>联系人 %1 想要查看<b>您的</b>摄像头视频，您是否同意？</qt>"
 
-#: protocols/groupwise/ui/gwaddcontactpage.cpp:64
-msgid "Connect to GroupWise Messenger and try again."
-msgstr "连接到 GroupWise Messenger 然后再试一次。"
+#~ msgid "The contact %1 wants to show you his/her webcam, do you want to see it?"
+#~ msgstr "联系人 %1 想要显示他/她的摄像头视频，您是否同意？"
 
-#: protocols/groupwise/ui/gwchatsearchdialog.cpp:38
-msgid "Search Chatrooms"
-msgstr "搜索聊天室"
+#~ msgid "Webcam invitation - Kopete MSN Plugin"
+#~ msgstr "网络视频邀请 - Kopete MSN 插件"
 
-#: protocols/groupwise/ui/gwchatsearchdialog.cpp:67
-msgid "Updating chatroom list..."
-msgstr "正在更新聊天室列表..."
+#~ msgid "Decline"
+#~ msgstr "拒绝"
 
-#: protocols/groupwise/ui/gwchatpropsdialog.cpp:33
-#: protocols/groupwise/ui/gwchatpropsdialog.cpp:41
-msgid "Chatroom properties"
-msgstr "聊天室属性"
+#~ msgid "File Transfer - MSN Plugin"
+#~ msgstr "文件传送 - MSN 插件"
 
-#: protocols/groupwise/ui/gwsearch.cpp:167
-#, c-format
-msgid ""
-"_n: 1 matching user found\n"
-"%n matching users found"
-msgstr "找到了 %n 个匹配的用户"
+#~ msgid "An unknown error occurred"
+#~ msgstr "出现了未知错误"
 
-#: protocols/groupwise/ui/gwcontactproperties.cpp:81
-msgid "Contact Properties"
-msgstr "联系人属性"
+#~ msgid "Connection timed out"
+#~ msgstr "连接超时"
 
-#: protocols/groupwise/ui/gwcontactproperties.cpp:104
-msgid "Telephone Number"
-msgstr "电话号码"
+#~ msgid "The remote user aborted"
+#~ msgstr "远程用户已中止"
 
-#: protocols/groupwise/ui/gwcontactproperties.cpp:106
-msgid "Department"
-msgstr "部门"
+#~ msgid "Cannot open file for writing"
+#~ msgstr "无法打开文件写入"
 
-#: protocols/groupwise/ui/gwcontactproperties.cpp:108
-msgid "Location"
-msgstr "位置"
+#~ msgid "File transfer canceled."
+#~ msgstr "文件传送已取消。"
 
-#: protocols/groupwise/ui/gwcontactproperties.cpp:110
-msgid "Mailstop"
-msgstr "邮箱"
+#~ msgid "MSN Messenger"
+#~ msgstr "MSN Messenger"
 
-#: protocols/groupwise/ui/gwcontactproperties.cpp:112
-msgid "Personal Title"
-msgstr "私人职务"
+#~ msgid "Be Right Back"
+#~ msgstr "马上回来"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:29
-msgid "Access denied"
-msgstr "拒绝存取"
+#~ msgid "Be &Right Back"
+#~ msgstr "马上回来(&R)"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:32
-msgid "Not supported"
-msgstr "不支持"
-
-#: protocols/groupwise/libgroupwise/gwerror.cpp:35
-msgid "Password expired"
-msgstr "密码过期"
-
-#: protocols/groupwise/libgroupwise/gwerror.cpp:38
-msgid "Invalid password"
-msgstr "密码无效"
+#~ msgid "Away From Computer"
+#~ msgstr "离开了计算机"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:41
-msgid "User not found"
-msgstr "未找到用户"
+#~ msgid "On the Phone"
+#~ msgstr "在打电话"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:44
-msgid "Attribute not found"
-msgstr "未找到属性"
+#~ msgid "On The &Phone"
+#~ msgstr "在打电话(&P)"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:47
-msgid "User is disabled"
-msgstr "用户被禁用"
+#~ msgid "Out to Lunch"
+#~ msgstr "外出就餐"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:50
-msgid "Directory failure"
-msgstr "目录失败"
+#~ msgid "Out To &Lunch"
+#~ msgstr "外出就餐(&L)"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:53
-msgid "Host not found"
-msgstr "找不到主机"
+#~ msgid "&Offline"
+#~ msgstr "离线(&O)"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:56
-msgid "Locked by admin"
-msgstr "被 admin 锁定"
+#~ msgid "&Idle"
+#~ msgstr "空闲(&I)"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:59
-msgid "Duplicate participant"
-msgstr "重复的参与者"
+#~ msgid "Remote Client"
+#~ msgstr "远程客户"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:62
-msgid "Server busy"
-msgstr "服务器忙"
+#~ msgid "Contact GUID"
+#~ msgstr "联系人 GUID"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:65
-msgid "Object not found"
-msgstr "未找到对象"
+#~ msgid ""
+#~ "Invalid user:\n"
+#~ "this MSN user does not exist; please check the MSN ID."
+#~ msgstr ""
+#~ "无效用户：\n"
+#~ "该 MSN 用户不存在；请检查 MSN ID。"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:68
-msgid "Directory update"
-msgstr "目录更新"
+#~ msgid "user never joined"
+#~ msgstr "用户从未加入"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:71
-msgid "Duplicate folder"
-msgstr "重复的目录"
+#~ msgid "The user %1 is already in this chat."
+#~ msgstr "用户 %1 已经在本次交谈中了。"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:74
-msgid "Contact list entry already exists"
-msgstr "联系人列表条目已存在"
+#~ msgid ""
+#~ "The user %1 is online but has blocked you:\n"
+#~ "you can not talk to this user."
+#~ msgstr ""
+#~ "用户 %1 已在线但是屏蔽了您：\n"
+#~ "您不能和他们开始聊天。"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:77
-msgid "User not allowed"
-msgstr "不允许用户"
+#~ msgid "user blocked you"
+#~ msgstr "用户屏蔽了您"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:80
-msgid "Too many contacts"
-msgstr "联系人过多"
+#~ msgid ""
+#~ "The user %1 is currently not signed in.\n"
+#~ "Messages will not be delivered."
+#~ msgstr ""
+#~ "用户 %1 目前没有登录。\n"
+#~ "消息将不会被传递。"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:83
-msgid "Conference not found"
-msgstr "会议未找到"
+#~ msgid "user disconnected"
+#~ msgstr "用户已断开连接"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:86
-msgid "Too many folders"
-msgstr "太多文件夹"
+#~ msgid "You are trying to invite too many contacts to this chat at the same time"
+#~ msgstr "您试图同时向此聊天中邀请的联系人太多"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:89
-msgid "Server protocol error"
-msgstr "服务器端协议错误"
+#~ msgid "Kopete MSN plugin has trouble authenticating with switchboard server."
+#~ msgstr "Kopete MSN 插件在交换服务器验证时出错。"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:92
-msgid "Conversation invitation error"
-msgstr "对话邀请错误"
+#~ msgid "timeout"
+#~ msgstr "超时"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:95
-msgid "User is blocked"
-msgstr "用户被屏蔽了"
+#~ msgid "The message you are trying to send is too long; it will be split into %1 messages."
+#~ msgstr "您试图发送的消息太长；将会被拆分为 %1 条消息。"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:98
-msgid "Master archive is missing"
-msgstr "主归档丢失"
+#~ msgid "Message too big - MSN Plugin"
+#~ msgstr "消息太大 - MSN 插件"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:101
-msgid "Expired password in use"
-msgstr "过期密码仍在使用中"
+#~ msgid "connection closed"
+#~ msgstr "连接已关闭"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:104
-msgid "Credentials missing"
-msgstr "证书丢失"
+#~ msgid "<img src=\"%1\" alt=\"Typewrited message\" />"
+#~ msgstr "<img src=\"%1\" alt=\"打字机消息\" />"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:107
-msgid "Authentication failed"
-msgstr "认证失败"
+#~ msgid "<qt>The MSN user '%1' does not exist.<br>Please check the MSN ID.</qt>"
+#~ msgstr "<qt>MSN 用户“%1”不存在。<br>请检查 MSN ID。</qt>"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:110
-msgid "Eval connection limit"
-msgstr "评估连接受限"
+#~ msgid "<qt>An internal error occurred in the MSN plugin.<br>MSN Error: %1<br>please send us a detailed bug report at kopete-devel@kde.org containing the raw debug output on the console (in gzipped format, as it is probably a lot of output.)"
+#~ msgstr "<qt>MSN 插件发生了内部错误。<br>MSN 错误：%1请向我们发送一份详细的错误报告：kopete-devel@kde.org。请包括控制台上的原始输出(使用 gzip 格式，因为可能会有大量输出。)"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:113
-msgid "Unsupported client version"
-msgstr "不支持的客户端版本"
+#~ msgid ""
+#~ "Unable to change your display name.\n"
+#~ "Please ensure your display is not too long and does not contains censored words."
+#~ msgstr ""
+#~ "无法更改您的显示名。\n"
+#~ "请确保您的显示名没有超过长度，而且不包含敏感的单词。"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:116
-msgid "A duplicate chat was found"
-msgstr "发现重复的聊天对话"
+#~ msgid "Your contact list is full; you cannot add any new contacts."
+#~ msgstr "您的联系人列表已满；您无法添加新联系人。"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:119
-msgid "Chat not found"
-msgstr "找不到聊天对话"
+#~ msgid "<qt>The user '%1' already exists in this group on the MSN server;<br>if Kopete does not show the user, please send us a detailed bug report at kopete-devel@kde.org containing the raw debug output on the console (in gzipped format, as it is probably a lot of output.)</qt>"
+#~ msgstr "<qt>用户“%1”已经在 MSN 服务器的这个组中存在；<br>如果 Koepte 不显示该用户，请向我们发送一份详细的错误报告：kopete-devel@kde.org。请包括控制台上的原始输出(使用 gzip 格式，因为可能会有大量输出。)</qt>"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:122
-msgid "Invalid chat name"
-msgstr "无效的聊天名"
+#~ msgid "The user '%1' seems to already be blocked or allowed on the server."
+#~ msgstr "用户“%1”似乎已经在服务器上被屏蔽或允许。"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:125
-msgid "The chat is active"
-msgstr "聊天进行中"
+#~ msgid ""
+#~ "You have reached the maximum number of groups:\n"
+#~ "MSN does not support more than 30 groups."
+#~ msgstr ""
+#~ "您达到了组的最大数目：\n"
+#~ "MSN 不支持多于 30 个组。"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:128
-msgid "Chat is busy; try again"
-msgstr "聊天处理忙碌中；重试"
+#~ msgid ""
+#~ "Kopete is trying to perform an operation on a group or a contact that does not exists on the server.\n"
+#~ "This might happen if the Kopete contact list and the MSN-server contact list are not correctly synchronized; if this is the case, you probably should send a bug report."
+#~ msgstr ""
+#~ "Kopete 试图对服务器上没有的组或联系人执行操作。\n"
+#~ "这可能是因为 Kopete 的联系人列表和 MSN 服务器上的联系人列表不同步；如果是这种情况的话，您可能想要发送一封错误报告。"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:131
-msgid "Tried request too soon after another; try again"
-msgstr "请求尝试间隔过短；重试"
+#~ msgid "The group name is too long; it has not been changed on the MSN server."
+#~ msgstr "组名太长；未在 MSN 服务器上更改。"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:134
-msgid "Server's chat subsystem is not active"
-msgstr "服务器上的聊天子系统未激活"
+#~ msgid "You cannot open a Hotmail inbox because you do not have an MSN account with a valid Hotmail or MSN mailbox."
+#~ msgstr "您无法打开 Hotmail 邮箱，因为您没有与有效的 Hotmail 或 MSN 邮箱关联的 MSN 账户。"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:137
-msgid "The chat update request is invalid"
-msgstr "无效的聊天更新请求"
+#~ msgid "You can not send messages when you are offline or when you are invisible."
+#~ msgstr "您在离线时或隐身时不能够发送消息。"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:140
-msgid "Write failed due to directory mismatch"
-msgstr "因目录不匹配而写操作失败"
+#~ msgid "You are trying to perform an action you are not allowed to perform in 'kid mode'."
+#~ msgstr "您试图执行不被允许的操作，因为您现在处于“儿童模式”。"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:143
-msgid "Recipient's client version is too old"
-msgstr "对方的客户端版本过旧"
+#~ msgid ""
+#~ "_n: You have one unread message in your MSN inbox.\n"
+#~ "You have %n unread messages in your MSN inbox."
+#~ msgstr "您的 MSN 收件箱有 %n 封未读的信件。"
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:146
-msgid "Chat has been removed from server"
-msgstr "聊天特性已从服务器上被删除"
+#~ msgid "Open Inbox..."
+#~ msgstr "打开收件箱..."
 
-#: protocols/groupwise/libgroupwise/gwerror.cpp:149
-#, c-format
-msgid "Unrecognized error code: %s"
-msgstr "不可识别的错误代码：%s"
+#~ msgid "You have one new email from %1 in your MSN inbox."
+#~ msgstr "您的 MSN 收件箱中有一封从 %1 来的新信件。"
 
-#: protocols/groupwise/gwprotocol.cpp:59
-msgid "Appear Offline"
-msgstr "隐身"
+#~ msgid "More Information"
+#~ msgstr "更多信息"
 
-#: protocols/groupwise/gwprotocol.cpp:59
-msgid "A&ppear Offline"
-msgstr "隐身(&P)"
+#~ msgid "Manage Subscription"
+#~ msgstr "管理订阅"
 
-#: protocols/groupwise/gwprotocol.cpp:64
-msgid "Invalid Status"
-msgstr "无效的状态"
+#~ msgid "Now Listening: ♫ %1 ♫"
+#~ msgstr "正在收听：♫ %1 ♫"
 
-#: protocols/groupwise/gwprotocol.cpp:71
-msgid "Auto Reply Message"
-msgstr "自动消息"
+#~ msgid ""
+#~ "There was an error while connecting to the MSN server.\n"
+#~ "Error message:\n"
+#~ msgstr ""
+#~ "在连接 MSN 服务器时出错。\n"
+#~ "错误消息是：\n"
 
-#: protocols/groupwise/gwprotocol.cpp:72
-msgid "Common Name"
-msgstr "公共名"
+#~ msgid "Unable to lookup %1"
+#~ msgstr "无法查阅 %1"
 
-#: protocols/groupwise/gwaccount.cpp:82
-msgid "&Set Auto-Reply..."
-msgstr "设定自动回复(&S)..."
+#~ msgid "An internal server error occurred. Please try again later."
+#~ msgstr "发生了内部服务器错误。请以后再试。"
 
-#: protocols/groupwise/gwaccount.cpp:84
-msgid "&Join Channel..."
-msgstr "加入频道(&J)..."
+#~ msgid "It is no longer possible to perform this operation. The MSN server does not allow it anymore."
+#~ msgstr "无法执行此操作。MSN 服务器不再允许此操作。"
 
-#: protocols/groupwise/gwaccount.cpp:86
-msgid "&Manage Privacy..."
-msgstr "管理隐私(&M)..."
+#~ msgid "The MSN server is busy. Please try again later."
+#~ msgstr "MSN 服务器正忙。请稍候重试。"
 
-#: protocols/groupwise/gwaccount.cpp:253
-msgid "GroupWise SSL Error"
-msgstr "GroupWise SSL 错误"
+#~ msgid "The server is not available at the moment. Please try again later."
+#~ msgstr "服务器此时不可用。请稍候再试。"
 
-#: protocols/groupwise/gwaccount.cpp:367
-msgid ""
-"_: Message Sending Failed\n"
-"Kopete was not able to send the last message sent on account '%1'.\n"
-"If possible, please send the console output from Kopete to "
-"<wstephenson@novell.com> for analysis."
-msgstr ""
-"Kopete 无法发送账户“%1”的最近一条消息。\n"
-"如果可能，请将 Kopete 的控制台输出发送到 <wstephenson@novell.com> 供分析。"
+#~ msgid ""
+#~ "Unhandled MSN error code %1 \n"
+#~ "Please fill a bug report with a detailed description and if possible the last console debug output."
+#~ msgstr ""
+#~ "无法处理的 MSN 错误代号 %1\n"
+#~ "请将详细描述提交为一份错误报告。如果可能的话，请附带最后的控制台调试输出。"
 
-#: protocols/groupwise/gwaccount.cpp:367
-msgid "Unable to Send Message on Account '%1'"
-msgstr "不能够发送信息在帐户 '%1'"
+#~ msgid "View Contact's Webcam"
+#~ msgstr "查看联系人的摄像头"
 
-#: protocols/groupwise/gwaccount.cpp:577
-msgid "Conflicting Changes Made Offline"
-msgstr "脱机更改冲突"
+#~ msgid "Send Webcam"
+#~ msgstr "发起视频邀请"
 
-#: protocols/groupwise/gwaccount.cpp:577
-msgid ""
-"A change happened to your GroupWise contact list while you were offline which "
-"was impossible to reconcile."
-msgstr "您在离线状态时对 GroupWise 联系人列表所做的改动将无法和真实信息保持一致。"
+#~ msgid "<qt>Please go online to block or unblock a contact.</qt>"
+#~ msgstr "<qt>请转为在线模式来屏蔽或解除屏蔽联系人。</qt>"
 
-#: protocols/groupwise/gwaccount.cpp:650
-msgid ""
-"_: Error shown when connecting failed\n"
-"Kopete was not able to connect to the GroupWise Messenger server for account "
-"'%1'.\n"
-"Please check your server and port settings and try again."
-msgstr ""
-"Kopete 无法连接到账户“%1”所用的 GroupWise 信使服务器。\n"
-"请检查您的服务器和端口设置，然后再试一次。"
+#~ msgid "Web Messenger"
+#~ msgstr "Web Messenger"
 
-#: protocols/groupwise/gwaccount.cpp:650
-msgid "Unable to Connect '%1'"
-msgstr "无法连接“%1”"
+#~ msgid "Windows Mobile"
+#~ msgstr "Windows Mobile"
 
-#: protocols/groupwise/gwaccount.cpp:773
-msgid "The certificate of server %1 could not be validated for account %2: %3"
-msgstr "服务器 %1 的证书无法被账户 %2 验证：%3"
+#~ msgid "MSN Mobile"
+#~ msgstr "MSN Mobile"
 
-#: protocols/groupwise/gwaccount.cpp:777
-msgid "GroupWise Connection Certificate Problem"
-msgstr "GroupWise 连接证书问题"
+#~ msgid "Send Raw C&ommand..."
+#~ msgstr "发送原始命令(&O)..."
 
-#: protocols/groupwise/gwaccount.cpp:826
-msgid ""
-"_: Prefix used for automatically generated auto-reply messages when the contact "
-"is Away, contains contact's name\n"
-"Auto reply from %1: "
-msgstr "来自 %1 的自动回复： "
+#~ msgid "Send Nudge"
+#~ msgstr "发送闪屏振动"
 
-#: protocols/groupwise/gwaccount.cpp:832
-msgid ""
-"_: Prefix used for broadcast messages\n"
-"Broadcast message from %1: "
-msgstr "来自 %1 的广播消息： "
+#~ msgid "Request Display Picture"
+#~ msgstr "请求显示图片"
 
-#: protocols/groupwise/gwaccount.cpp:838
-msgid ""
-"_: Prefix used for system broadcast messages\n"
-"System Broadcast message from %1: "
-msgstr "来自 %1 的系统广播消息： "
+#~ msgid "Connection closed"
+#~ msgstr "连接已关闭"
 
-#: protocols/groupwise/gwaccount.cpp:1212
-msgid ""
-"The contact %1 could not be added to the contact list, with error message: %2"
-msgstr "无法联系人 %1 添加到联系人列表，错误消息为：%2"
+#~ msgid "Other..."
+#~ msgstr "其它..."
 
-#: protocols/groupwise/gwaccount.cpp:1214
-msgid "Error Adding Contact"
-msgstr "添加联系人时出错"
+#~ msgid "Please enter the email address of the person you want to invite:"
+#~ msgstr "请输入您要邀请的人的电子邮件地址："
 
-#: protocols/groupwise/gwaccount.cpp:1258
-msgid "Signed in as %1 Elsewhere"
-msgstr "在别处以 %1 嵌入"
+#~ msgid ""
+#~ "The following message has not been sent correctly:\n"
+#~ "%1"
+#~ msgstr ""
+#~ "如下消息没有被正确发送：\n"
+#~ "%1"
 
-#: protocols/groupwise/gwaccount.cpp:1259
-msgid ""
-"_: The parameter is the user's own account id for this protocol\n"
-"You have been disconnected from GroupWise Messenger because you signed in as %1 "
-"elsewhere"
-msgstr "您已经从 GroupWise 信使断开，因为您在别处以 %1 嵌入了"
+#~ msgid ""
+#~ "%1 has sent an unimplemented invitation, the invitation was rejected.\n"
+#~ "The invitation was: %2"
+#~ msgstr ""
+#~ "%1 有一个未实现的邀请，该邀请已被拒绝。\n"
+#~ "该邀请是：%2"
 
-#: protocols/groupwise/gwaccount.cpp:1367
-msgid "%1 has been invited to join this conversation."
-msgstr "邀请了 %1 加入此对话。"
+#~ msgid "%1 has started a chat with you"
+#~ msgstr "%1 已经开始了与您的聊天"
 
-#: protocols/groupwise/gwaccount.cpp:1393
-msgid "Enter Auto-Reply Message"
-msgstr "输入自动回复消息"
+#~ msgid "has sent a nudge"
+#~ msgstr "发送了闪屏振动"
 
-#: protocols/groupwise/gwaccount.cpp:1394
-msgid ""
-"Please enter an Auto-Reply message that will be shown to users who message you "
-"while Away or Busy"
-msgstr "请输入一条自动离开消息，当您离开或忙时将会自动给用户显示此消息"
+#~ msgid "has sent you a nudge"
+#~ msgstr "向您发送了闪屏振动"
 
-#: protocols/groupwise/gwmessagemanager.cpp:68
-#: protocols/groupwise/gwmessagemanager.cpp:506
-msgid "Security Status"
-msgstr "安全状态"
+#~ msgid ""
+#~ "The following message has not been sent correctly  (%1): \n"
+#~ "%2"
+#~ msgstr ""
+#~ "如下消息没有被正确发送(%1)：\n"
+#~ "%2"
 
-#: protocols/groupwise/gwmessagemanager.cpp:69
-msgid "Conversation is secure"
-msgstr "安全对话"
+#~ msgid "These messages have not been sent correctly (%1): <br /><ul>"
+#~ msgstr "如下消息没有被正确发送(%1)：<br /><ul>"
 
-#: protocols/groupwise/gwmessagemanager.cpp:71
-#: protocols/groupwise/gwmessagemanager.cpp:513
-msgid "Archiving Status"
-msgstr "存档状态"
+#~ msgid "Impossible to establish the connection"
+#~ msgstr "无法建立连接"
 
-#: protocols/groupwise/gwmessagemanager.cpp:199
-#, c-format
-msgid "An error occurred when trying to start a chat: %1"
-msgstr "试图开始聊天时发生了错误：%1"
+#~ msgid "DEBUG: Send Raw Command - MSN Plugin"
+#~ msgstr "调试：发送原样命令 - MSN 插件"
 
-#: protocols/groupwise/gwmessagemanager.cpp:226
-msgid ""
-"Your message could not be sent. You cannot send messages while your status is "
-"Appear Offline. "
-msgstr "您的消息未发出。在您位于隐身状态下无法发送消息。 "
+#~ msgid "&Change Display Name..."
+#~ msgstr "更改显示名称(&C)..."
 
-#: protocols/groupwise/gwmessagemanager.cpp:319
-msgid "&Other..."
-msgstr "其它(&O)..."
+#~ msgid "&Start Chat..."
+#~ msgstr "开始聊天(&S)..."
 
-#: protocols/groupwise/gwmessagemanager.cpp:338
-#: protocols/groupwise/gwmessagemanager.cpp:384
-msgid "Enter Invitation Message"
-msgstr "输入邀请消息"
+#~ msgid "Start Chat - MSN Plugin"
+#~ msgstr "开始聊天 - MSN 插件"
 
-#: protocols/groupwise/gwmessagemanager.cpp:339
-#: protocols/groupwise/gwmessagemanager.cpp:385
-msgid "Enter the reason for the invitation, or leave blank for no reason:"
-msgstr "输入邀请的理由，留空代表没有理由："
+#~ msgid "Please enter the email address of the person with whom you want to chat:"
+#~ msgstr "请输入您要与之聊天的人的电子邮件地址："
 
-#: protocols/groupwise/gwmessagemanager.cpp:363
-msgid "Search for Contact to Invite"
-msgstr "搜索要邀请的联系人"
+#~ msgid "Change Display Name - MSN Plugin"
+#~ msgstr "更改显示名称 - MSN 插件"
 
-#: protocols/groupwise/gwmessagemanager.cpp:398
-msgid ""
-"_: label attached to contacts who have been invited but are yet to join a chat\n"
-"(pending)"
-msgstr "(未决)"
+#~ msgid "Enter the new display name by which you want to be visible to your friends on MSN:"
+#~ msgstr "输入您想使用的公开名字，您的 MSN 朋友们将会看到这个名字："
 
-#: protocols/groupwise/gwmessagemanager.cpp:445
-msgid ""
-"All the other participants have left, and other invitations are still pending. "
-"Your messages will not be delivered until someone else joins the chat."
-msgstr "所有其他参与者都已离开，其他邀请仍在等待中。除非有别人加入此聊天，否则您的消息不会被发出。"
+#~ msgid ""
+#~ "<qt>The display name you entered is too long. Please use a shorter name.\n"
+#~ "Your display name has <b>not</b> been changed.</qt>"
+#~ msgstr ""
+#~ "<qt>您输入的显示名称太长。请输入较短的名称。\n"
+#~ "您的显示名字<b>没有</b>被改变。</qt>"
 
-#: protocols/groupwise/gwmessagemanager.cpp:471
-msgid "%1 has rejected an invitation to join this conversation."
-msgstr "%1 拒绝了加入此对话的邀请。"
+#~ msgid ""
+#~ "The connection with the MSN server was lost unexpectedly.\n"
+#~ "If you cannot reconnect now, the server might be down. In that case, please try again later."
+#~ msgstr ""
+#~ "与 MSN 服务器的连接意外丢失。\n"
+#~ "如果您现在无法重新连接，那么可能是因为服务器停机。此时请稍候再试。"
 
-#: protocols/groupwise/gwmessagemanager.cpp:493
-msgid "Conversation is being administratively logged"
-msgstr "对话将以管理员身份记录"
+#~ msgid "Connection Lost - MSN Plugin"
+#~ msgstr "连接丢失 - MSN 插件"
 
-#: protocols/groupwise/gwmessagemanager.cpp:498
-msgid "Conversation is not being administratively logged"
-msgstr "对话不被以管理员身份记录"
+#~ msgid "Fatal Error occured while downloading buddy icon."
+#~ msgstr "下载好友图标时出现严重错误。"
 
-#: protocols/groupwise/gwmessagemanager.cpp:506
-msgid "This conversation is secured with SSL security."
-msgstr "此对话被 SSL 安全性保护。"
+#~ msgid "IconLoadJob has an empty KTempFile pointer."
+#~ msgstr "IconLoadJob 类里有空的 KTempFile 指针。"
 
-#: protocols/groupwise/gwmessagemanager.cpp:513
-msgid "This conversation is being logged administratively."
-msgstr "此对话将被以管理员身份记录。"
+#~ msgid "MSN"
+#~ msgstr "MSN"
 
 #~ msgid "Device options"
 #~ msgstr "设备选项"
@@ -16641,26 +16296,5 @@ msgstr "此对话将被以管理员身份记录。"
 #~ "由于垂直滚动条会占用一定的空间，我们引入了这一自动隐藏的特性。垂直滚动条将会被隐藏，除非您将鼠标指向联系人列表。<br>\n"
 #~ "(如果选择了上方的“<b>隐藏垂直滚动条</b>”选项，则此功能被<b>禁用</b>。)"
 
-#~ msgid ""
-#~ "%2 \n"
-#~ "Auto Translated: \n"
-#~ "%1"
-#~ msgstr ""
-#~ "%2 \n"
-#~ "自动转换： \n"
-#~ "%1"
-
-#~ msgid "Import Emoticon"
-#~ msgstr "导入表情"
-
 #~ msgid "Respect other contacts' &wish to require authorization"
 #~ msgstr "遵照其它联系人的愿望请求验证(&W)"
-
-#~ msgid "&Edit Theme..."
-#~ msgstr "编辑主题(&E)..."
-
-#~ msgid "Edit the selected emoticons theme"
-#~ msgstr "编辑选择的表情主题"
-
-#~ msgid "Add..."
-#~ msgstr "添加..."
diff --git a/tde-i18n-zh_CN/messages/tdenetwork/kpf.po b/tde-i18n-zh_CN/messages/tdenetwork/kpf.po
index 2e2bf516023..b0db624aed1 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/kpf.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/kpf.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kpf\n"
-"POT-Creation-Date: 2008-08-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2003-12-28 18:44+0800\n"
 "Last-Translator: Liang Meng <mengliang99@sohu.com>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -163,19 +164,19 @@ msgstr "%1 Mb/s"
 msgid "Idle"
 msgstr "空闲"
 
-#: ConfigDialogPage.cpp:51 PropertiesDialogPlugin.cpp:326 ServerWizard.cpp:132
+#: ConfigDialogPage.cpp:51 PropertiesDialogPlugin.cpp:325 ServerWizard.cpp:132
 msgid "&Listen port:"
 msgstr "监听端口(&L)："
 
-#: ConfigDialogPage.cpp:52 PropertiesDialogPlugin.cpp:327 ServerWizard.cpp:135
+#: ConfigDialogPage.cpp:52 PropertiesDialogPlugin.cpp:326 ServerWizard.cpp:135
 msgid "&Bandwidth limit:"
 msgstr "带宽限制(&B)："
 
-#: ConfigDialogPage.cpp:59 PropertiesDialogPlugin.cpp:329 ServerWizard.cpp:141
+#: ConfigDialogPage.cpp:59 PropertiesDialogPlugin.cpp:328 ServerWizard.cpp:141
 msgid "&Server name:"
 msgstr "服务器名称(&S)："
 
-#: ConfigDialogPage.cpp:66 PropertiesDialogPlugin.cpp:340
+#: ConfigDialogPage.cpp:66 PropertiesDialogPlugin.cpp:339
 msgid "&Follow symbolic links"
 msgstr "跟随符号连接(&F)"
 
@@ -183,13 +184,13 @@ msgstr "跟随符号连接(&F)"
 msgid " kB/s"
 msgstr " kB/s"
 
-#: ConfigDialogPage.cpp:133 PropertiesDialogPlugin.cpp:403 ServerWizard.cpp:82
+#: ConfigDialogPage.cpp:133 PropertiesDialogPlugin.cpp:402 ServerWizard.cpp:82
 msgid ""
 "<p>Specify the network `port' on which the server should listen for "
 "connections.</p>"
 msgstr "<p>指定服务器应该监听连接的网络“端口”。</p>"
 
-#: ConfigDialogPage.cpp:142 PropertiesDialogPlugin.cpp:412 ServerWizard.cpp:95
+#: ConfigDialogPage.cpp:142 PropertiesDialogPlugin.cpp:411 ServerWizard.cpp:95
 msgid ""
 "<p>Specify the maximum amount of data (in kilobytes) that will be sent out per "
 "second.</p>"
@@ -197,7 +198,7 @@ msgid ""
 "connections with kpf to hog your connection.</p>"
 msgstr "<p>指定每秒发送的最大数据量(以千字节计)。</p><p>这允许您为自己保留一定的带宽，而避免了kpf连接阻塞您的连接。</p>"
 
-#: ConfigDialogPage.cpp:155 PropertiesDialogPlugin.cpp:425
+#: ConfigDialogPage.cpp:155 PropertiesDialogPlugin.cpp:424
 msgid ""
 "<p>Specify the maximum number of connections allowed at any one time.</p>"
 msgstr "<p>指定每个时刻允许的最大连接数。</p>"
@@ -304,29 +305,31 @@ msgid "&Sharing"
 msgstr "共享(&S)"
 
 #: PropertiesDialogPlugin.cpp:285
+#, fuzzy
 msgid ""
 "<p>To share files via the web, you need to be running an 'applet' in your TDE "
-"panel. This 'applet' is a small program which provides file sharing "
-"capabilities.</p>"
+"panel named kpf. This 'applet' is a small program that provides public file "
+"sharing capabilities.</p>"
 msgstr "<p>要通过 Web 共享文件，您需要在您的 TDE 面板上运行一个小程序。该小程序是一个提供文件共享能力的小程序。</p>"
 
-#: PropertiesDialogPlugin.cpp:295
+#: PropertiesDialogPlugin.cpp:294
 msgid "Start Applet"
 msgstr "启动小程序"
 
-#: PropertiesDialogPlugin.cpp:302 PropertiesDialogPlugin.cpp:558
-msgid "Applet status: <strong>not running</strong>"
+#: PropertiesDialogPlugin.cpp:301 PropertiesDialogPlugin.cpp:557
+#, fuzzy
+msgid "kpf applet status: <strong>not running</strong>"
 msgstr "小程序状态：<strong>没有运行</strong>"
 
-#: PropertiesDialogPlugin.cpp:324
+#: PropertiesDialogPlugin.cpp:323
 msgid "Share this directory on the &Web"
 msgstr "在 Web 上共享此目录(&W)"
 
-#: PropertiesDialogPlugin.cpp:349
+#: PropertiesDialogPlugin.cpp:348
 msgid "kB/s"
 msgstr "kB/s"
 
-#: PropertiesDialogPlugin.cpp:378
+#: PropertiesDialogPlugin.cpp:377
 msgid ""
 "<p>Setting this option makes all files in this directory and any subdirectories "
 "available for reading to anyone who wishes to view them.</p>"
@@ -341,7 +344,7 @@ msgstr ""
 "<p><strong>警告！</strong>在共享目录之前，您应该确保其中没有包括敏感信息，比如密码、公司秘密、您的地址簿等等。</p>"
 "<p>注意您不能共享您的主目录 (%1)</p>"
 
-#: PropertiesDialogPlugin.cpp:434
+#: PropertiesDialogPlugin.cpp:433
 msgid ""
 "<p>Allow serving of files which have a symbolic link in the path from / to the "
 "file, or are a symbolic link themselves.</p>"
@@ -351,19 +354,22 @@ msgstr ""
 "<p>允许对由根目录到文件的符号连接，或本身为符号连接的文件进行服务。</p>"
 "<p><strong>警告！</strong>这会成为一个安全隐患。仅在您清楚该问题的情况下使用。</p>"
 
-#: PropertiesDialogPlugin.cpp:511
-msgid "Applet status: <strong>starting...</strong>"
+#: PropertiesDialogPlugin.cpp:510
+#, fuzzy
+msgid "kpf applet status: <strong>starting...</strong>"
 msgstr "小程序状态：<strong>正在启动...</strong>"
 
-#: PropertiesDialogPlugin.cpp:523
-msgid "Applet status: <strong>failed to start</strong>"
+#: PropertiesDialogPlugin.cpp:522
+#, fuzzy
+msgid "kpf applet status: <strong>failed to start</strong>"
 msgstr "小程序状态：<strong>启动失败</strong>"
 
-#: PropertiesDialogPlugin.cpp:536
-msgid "Applet status: <strong>running</strong>"
+#: PropertiesDialogPlugin.cpp:535
+#, fuzzy
+msgid "kpf applet status: <strong>running</strong>"
 msgstr "小程序状态：<strong>正在运行</strong>"
 
-#: PropertiesDialogPlugin.cpp:678
+#: PropertiesDialogPlugin.cpp:677
 msgid ""
 "<p>Before you share a directory, be <strong>absolutely certain</strong> "
 "that it does not contain sensitive information.</p>"
@@ -377,11 +383,11 @@ msgstr ""
 "<p>共享一个目录使得目录中的所有信息以及<strong>所有子目录</strong>能被想访问它们的<strong>任何人</strong>读取。</p>"
 "<p>如果您有系统管理员的话，请在这样共享目录前得到许可。</p>"
 
-#: PropertiesDialogPlugin.cpp:693
+#: PropertiesDialogPlugin.cpp:692
 msgid "Warning - Sharing Sensitive Information?"
 msgstr "警告 - 共享敏感信息？"
 
-#: PropertiesDialogPlugin.cpp:694
+#: PropertiesDialogPlugin.cpp:693
 msgid "&Share Directory"
 msgstr "共享目录(&S)"
 
@@ -427,7 +433,8 @@ msgid "Configuring Server %1 - kpf"
 msgstr "配置服务器 %1 - kpf"
 
 #: StartingKPFDialog.cpp:57
-msgid "Starting TDE public fileserver applet"
+#, fuzzy
+msgid "Starting KDE public fileserver applet"
 msgstr "正在启动 TDE 公共文件服务器小程序"
 
 #: StartingKPFDialog.cpp:70
diff --git a/tde-i18n-zh_CN/messages/tdenetwork/kppp.po b/tde-i18n-zh_CN/messages/tdenetwork/kppp.po
index 5a07bcfbda2..d896deaf213 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/kppp.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/kppp.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kppp\n"
-"POT-Creation-Date: 2006-06-13 04:00+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-06-18 22:59+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -539,15 +540,15 @@ msgstr "正在运行启动命令..."
 msgid "Done"
 msgstr "完成"
 
-#: connect.cpp:1279 edit.cpp:157 general.cpp:262 modem.cpp:187
+#: connect.cpp:1280 edit.cpp:157 general.cpp:262 modem.cpp:187
 msgid "None"
 msgstr "无"
 
-#: connect.cpp:1281 general.cpp:260 modem.cpp:188 pppdata.cpp:546
+#: connect.cpp:1282 general.cpp:260 modem.cpp:188 pppdata.cpp:546
 msgid "Hardware [CRTSCTS]"
 msgstr "硬件 [CRTSCTS]"
 
-#: connect.cpp:1339
+#: connect.cpp:1340
 msgid "pppd command + command-line arguments exceed 2024 characters in length."
 msgstr "pppd 命令＋命令行参数长度超过了 2024 个字符。"
 
@@ -2166,11 +2167,11 @@ msgstr ""
 "“%1”\n"
 "这也许能给您点提示，为何连接会失败。"
 
-#: ppplog.cpp:191
+#: ppplog.cpp:192
 msgid "Unable to provide help."
 msgstr "无法提供帮助。"
 
-#: ppplog.cpp:215
+#: ppplog.cpp:218
 msgid ""
 "KPPP could not prepare a PPP log. It's very likely that pppd was started "
 "without the \"debug\" option.\n"
@@ -2182,34 +2183,34 @@ msgstr ""
 "没有此选项，找出 PPP 问题所在将非常困难，所以您应该打开 debug 选项。\n"
 "是否现在打开该选项？"
 
-#: ppplog.cpp:219
+#: ppplog.cpp:222
 msgid "Restart pppd"
 msgstr "重新启动 pppd"
 
-#: ppplog.cpp:219
+#: ppplog.cpp:222
 msgid "Do Not Restart"
 msgstr "不重新启动"
 
-#: ppplog.cpp:224
+#: ppplog.cpp:227
 msgid ""
 "The \"debug\" option has been added. You should now try to reconnect. If that "
 "fails again, you will get a PPP log that may help you to track down the "
 "connection problem."
 msgstr "已经加入了“debug”选项。您应该现在试着重新连接。如果仍然失败的话，您可以从PPP 日志中找出连接中的问题。"
 
-#: ppplog.cpp:238
+#: ppplog.cpp:241
 msgid "PPP Log"
 msgstr "PPP 日志"
 
-#: ppplog.cpp:242
+#: ppplog.cpp:245
 msgid "kppp's diagnosis (just guessing):"
 msgstr "kppp 的诊断 (仅为猜测)："
 
-#: ppplog.cpp:247
+#: ppplog.cpp:250
 msgid "Write to File"
 msgstr "写入文件"
 
-#: ppplog.cpp:281
+#: ppplog.cpp:284
 msgid ""
 "The PPP log has been saved\n"
 "as \"%1\"!\n"
diff --git a/tde-i18n-zh_CN/messages/tdenetwork/kppplogview.po b/tde-i18n-zh_CN/messages/tdenetwork/kppplogview.po
index e8e4bb5e5a9..52c5f359a17 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/kppplogview.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/kppplogview.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kppplogview\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-01-16 14:01+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdenetwork/krdc.po b/tde-i18n-zh_CN/messages/tdenetwork/krdc.po
index d903ce5bdd0..712c817e369 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/krdc.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/krdc.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: krdc\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2005-08-02 17:28+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,19 +33,19 @@ msgstr "i18n-translation@lists.linux.net.cn"
 msgid "Enter Key Combination"
 msgstr "输入按键组合"
 
-#: krdc.cpp:133 krdc.cpp:156
+#: krdc.cpp:134 krdc.cpp:157
 msgid "The entered host does not have the required form."
 msgstr "输入的主机不符合所需的格式。"
 
-#: krdc.cpp:134 krdc.cpp:157
+#: krdc.cpp:135 krdc.cpp:158
 msgid "Malformed URL or Host"
 msgstr "URL 或主机格式错误"
 
-#: krdc.cpp:163
+#: krdc.cpp:164
 msgid "%1 - Remote Desktop Connection"
 msgstr "%1 - 远程桌面连接"
 
-#: krdc.cpp:192
+#: krdc.cpp:193
 msgid ""
 "Here you can see the remote desktop. If the other side allows you to control "
 "it, you can also move the mouse, click or enter keystrokes. If the content does "
@@ -54,76 +55,76 @@ msgstr ""
 "您可以在这里看到远程桌面。如果对方允许您控制桌面，您还可以移动鼠标、单击或按键。如果内容不适合您的屏幕，可以单击工具栏上的全屏按钮或缩放按钮。要中止会话，只需关"
 "闭窗口。"
 
-#: krdc.cpp:225
+#: krdc.cpp:228
 msgid "Establishing connection..."
 msgstr "正在建立连接..."
 
-#: krdc.cpp:231
+#: krdc.cpp:234
 msgid "Authenticating..."
 msgstr "正在认证..."
 
-#: krdc.cpp:236
+#: krdc.cpp:239
 msgid "Preparing desktop..."
 msgstr "正在准备桌面..."
 
-#: krdc.cpp:383
+#: krdc.cpp:390
 msgid "View Only"
 msgstr "只查看"
 
-#: krdc.cpp:387
+#: krdc.cpp:394
 msgid "Always Show Local Cursor"
 msgstr "总是显示本地光标"
 
-#: krdc.cpp:472
+#: krdc.cpp:491
 msgid "Autohide on/off"
 msgstr "自动隐藏开/关"
 
-#: krdc.cpp:479 krdc.cpp:573 krdc.cpp:575
+#: krdc.cpp:497 krdc.cpp:595 krdc.cpp:597
 msgid "Fullscreen"
 msgstr "全屏"
 
-#: krdc.cpp:485 krdc.cpp:487 krdc.cpp:605
+#: krdc.cpp:503 krdc.cpp:505 krdc.cpp:627
 msgid "Advanced options"
 msgstr "高级选项"
 
-#: krdc.cpp:500 krdc.cpp:584
+#: krdc.cpp:517 krdc.cpp:606
 msgid "Scale view"
 msgstr "缩放视图"
 
-#: krdc.cpp:508
+#: krdc.cpp:525
 msgid "Minimize"
 msgstr "最小化"
 
-#: krdc.cpp:576
+#: krdc.cpp:598
 msgid ""
 "Switches to full screen. If the remote desktop has a different screen "
 "resolution, Remote Desktop Connection will automatically switch to the nearest "
 "resolution."
 msgstr "切换到全屏。如果远程桌面的屏幕分辨率不同，远程桌面连接将会自动切换到最接近的分辨率。"
 
-#: krdc.cpp:582
+#: krdc.cpp:604
 msgid "Scale"
 msgstr "缩放"
 
-#: krdc.cpp:585
+#: krdc.cpp:607
 msgid "This option scales the remote screen to fit your window size."
 msgstr "此选项将缩放远程屏幕来适应您的窗口大小。"
 
-#: krdc.cpp:591
+#: krdc.cpp:613
 msgid "Special Keys"
 msgstr "特殊按键"
 
-#: krdc.cpp:593
+#: krdc.cpp:615
 msgid "Enter special keys."
 msgstr "输入特殊按键。"
 
-#: krdc.cpp:594
+#: krdc.cpp:616
 msgid ""
 "This option allows you to send special key combinations like Ctrl-Alt-Del to "
 "the remote host."
 msgstr "此选项允许您给远程主机发送像 Ctrl-Alt-Del 这样的组合键。"
 
-#: krdc.cpp:603
+#: krdc.cpp:625
 msgid "Advanced"
 msgstr "高级"
 
@@ -175,27 +176,27 @@ msgstr "主机名称，例如“localhost:1”"
 msgid "Remote Desktop Connection"
 msgstr "远程桌面连接"
 
-#: main.cpp:86
+#: main.cpp:88
 msgid "RDP backend"
 msgstr "RDP 后端"
 
-#: main.cpp:88
+#: main.cpp:90
 msgid "Original VNC viewer and protocol design"
 msgstr "原始的 VNC 查看器和协议设计"
 
-#: main.cpp:90
+#: main.cpp:92
 msgid "TightVNC encoding"
 msgstr "TightVNC 编码"
 
-#: main.cpp:92
+#: main.cpp:94
 msgid "ZLib encoding"
 msgstr "Zlib 编码"
 
-#: main.cpp:136
+#: main.cpp:138
 msgid "The password file '%1' does not exist."
 msgstr "密码文件“%1”不存在。"
 
-#: main.cpp:150
+#: main.cpp:152
 msgid "Wrong geometry format, must be widthXheight"
 msgstr "几何格式不对，必须是宽X高"
 
@@ -479,7 +480,7 @@ msgid ""
 msgstr "您可以在这里看到网络中允许您连接的系统。请注意，管理员可以隐藏系统，所以列表不总是完整的。单击项目可以选中，双击将立即连接。"
 
 #. i18n: file rdp/rdpprefs.ui line 27
-#: rc.cpp:173 rc.cpp:335
+#: rc.cpp:173 rc.cpp:338
 #, no-c-format
 msgid "Connection"
 msgstr "连接"
@@ -508,304 +509,310 @@ msgstr "大 (1024x768)"
 msgid "Custom (...)"
 msgstr "自定义 (...)"
 
-#. i18n: file rdp/rdpprefs.ui line 92
+#. i18n: file rdp/rdpprefs.ui line 73
 #: rc.cpp:188
 #, no-c-format
+msgid "Full Screen (Maximized)"
+msgstr ""
+
+#. i18n: file rdp/rdpprefs.ui line 97
+#: rc.cpp:191
+#, no-c-format
 msgid ""
 "Here you can specify the resolution of the remote desktop. This resolution "
 "determines the size of the desktop that will be presented to you."
 msgstr "您可在此指定远程桌面的分辨率。此分辨率决定了您所能看到的桌面大小。"
 
-#. i18n: file rdp/rdpprefs.ui line 109
-#: rc.cpp:191
+#. i18n: file rdp/rdpprefs.ui line 114
+#: rc.cpp:194
 #, no-c-format
 msgid ""
 "This is the width of the remote desktop. You can only change this value "
 "manually if you select Custom as desktop resolution above."
 msgstr "这是远程桌面的宽度。只有当您在上面选择了自定义桌面分辨率时，才能手动更改此值。"
 
-#. i18n: file rdp/rdpprefs.ui line 120
-#: rc.cpp:194
+#. i18n: file rdp/rdpprefs.ui line 125
+#: rc.cpp:197
 #, no-c-format
 msgid "H&eight:"
 msgstr "高度(&E)："
 
-#. i18n: file rdp/rdpprefs.ui line 143
-#: rc.cpp:197
+#. i18n: file rdp/rdpprefs.ui line 148
+#: rc.cpp:200
 #, no-c-format
 msgid ""
 "This is the height of the remote desktop. You can only change this value "
 "manually if you select Custom as desktop resolution above."
 msgstr "这是远程桌面的高度。只有当您在上面选择了自定义桌面分辨率时，才能手动更改此值。"
 
-#. i18n: file rdp/rdpprefs.ui line 149
-#: rc.cpp:200
+#. i18n: file rdp/rdpprefs.ui line 154
+#: rc.cpp:203
 #, no-c-format
 msgid "Arabic (ar)"
 msgstr "阿拉伯(ar)"
 
-#. i18n: file rdp/rdpprefs.ui line 154
-#: rc.cpp:203
+#. i18n: file rdp/rdpprefs.ui line 159
+#: rc.cpp:206
 #, no-c-format
 msgid "Czech (cs)"
 msgstr ""
 
-#. i18n: file rdp/rdpprefs.ui line 159
-#: rc.cpp:206
+#. i18n: file rdp/rdpprefs.ui line 164
+#: rc.cpp:209
 #, no-c-format
 msgid "Danish (da)"
 msgstr "丹麦(da)"
 
-#. i18n: file rdp/rdpprefs.ui line 164
-#: rc.cpp:209
+#. i18n: file rdp/rdpprefs.ui line 169
+#: rc.cpp:212
 #, no-c-format
 msgid "German (de)"
 msgstr "德(de)"
 
-#. i18n: file rdp/rdpprefs.ui line 169
-#: rc.cpp:212
+#. i18n: file rdp/rdpprefs.ui line 174
+#: rc.cpp:215
 #, fuzzy, no-c-format
 msgid "Swiss German (de-ch)"
 msgstr "德(de)"
 
-#. i18n: file rdp/rdpprefs.ui line 174
-#: rc.cpp:215
+#. i18n: file rdp/rdpprefs.ui line 179
+#: rc.cpp:218
 #, no-c-format
 msgid "British English (en-gb)"
 msgstr "英国英(en-gb)"
 
-#. i18n: file rdp/rdpprefs.ui line 179
-#: rc.cpp:218
+#. i18n: file rdp/rdpprefs.ui line 184
+#: rc.cpp:221
 #, no-c-format
 msgid "US English (en-us)"
 msgstr "美国英(en-us)"
 
-#. i18n: file rdp/rdpprefs.ui line 184
-#: rc.cpp:221
+#. i18n: file rdp/rdpprefs.ui line 189
+#: rc.cpp:224
 #, no-c-format
 msgid "Spanish (es)"
 msgstr "西班牙(es)"
 
-#. i18n: file rdp/rdpprefs.ui line 189
-#: rc.cpp:224
+#. i18n: file rdp/rdpprefs.ui line 194
+#: rc.cpp:227
 #, fuzzy, no-c-format
 msgid "Estonian (et)"
 msgstr "立陶宛(lt)"
 
-#. i18n: file rdp/rdpprefs.ui line 194
-#: rc.cpp:227
+#. i18n: file rdp/rdpprefs.ui line 199
+#: rc.cpp:230
 #, no-c-format
 msgid "Finnish (fi)"
 msgstr "芬兰(fi)"
 
-#. i18n: file rdp/rdpprefs.ui line 199
-#: rc.cpp:230
+#. i18n: file rdp/rdpprefs.ui line 204
+#: rc.cpp:233
 #, no-c-format
 msgid "French (fr)"
 msgstr "法(fr)"
 
-#. i18n: file rdp/rdpprefs.ui line 204
-#: rc.cpp:233
+#. i18n: file rdp/rdpprefs.ui line 209
+#: rc.cpp:236
 #, no-c-format
 msgid "Belgium (fr-be)"
 msgstr "比利时(fr-be)"
 
-#. i18n: file rdp/rdpprefs.ui line 209
-#: rc.cpp:236
+#. i18n: file rdp/rdpprefs.ui line 214
+#: rc.cpp:239
 #, fuzzy, no-c-format
 msgid "French Canadian (fr-ca)"
 msgstr "法(fr)"
 
-#. i18n: file rdp/rdpprefs.ui line 214
-#: rc.cpp:239
+#. i18n: file rdp/rdpprefs.ui line 219
+#: rc.cpp:242
 #, fuzzy, no-c-format
 msgid "Swiss French (fr-ch)"
 msgstr "法(fr)"
 
-#. i18n: file rdp/rdpprefs.ui line 219
-#: rc.cpp:242
+#. i18n: file rdp/rdpprefs.ui line 224
+#: rc.cpp:245
 #, fuzzy, no-c-format
 msgid "Croatian (hr)"
 msgstr "Croation (hr)"
 
-#. i18n: file rdp/rdpprefs.ui line 224
-#: rc.cpp:245
+#. i18n: file rdp/rdpprefs.ui line 229
+#: rc.cpp:248
 #, no-c-format
 msgid "Hungarian (hu)"
 msgstr "匈牙利(hu)"
 
-#. i18n: file rdp/rdpprefs.ui line 229
-#: rc.cpp:248
+#. i18n: file rdp/rdpprefs.ui line 234
+#: rc.cpp:251
 #, fuzzy, no-c-format
 msgid "Icelandic (is)"
 msgstr "意大利(it)"
 
-#. i18n: file rdp/rdpprefs.ui line 234
-#: rc.cpp:251
+#. i18n: file rdp/rdpprefs.ui line 239
+#: rc.cpp:254
 #, no-c-format
 msgid "Italian (it)"
 msgstr "意大利(it)"
 
-#. i18n: file rdp/rdpprefs.ui line 239
-#: rc.cpp:254
+#. i18n: file rdp/rdpprefs.ui line 244
+#: rc.cpp:257
 #, no-c-format
 msgid "Japanese (ja)"
 msgstr "日(ja)"
 
-#. i18n: file rdp/rdpprefs.ui line 244
-#: rc.cpp:257
+#. i18n: file rdp/rdpprefs.ui line 249
+#: rc.cpp:260
 #, no-c-format
 msgid "Lithuanian (lt)"
 msgstr "立陶宛(lt)"
 
-#. i18n: file rdp/rdpprefs.ui line 249
-#: rc.cpp:260
+#. i18n: file rdp/rdpprefs.ui line 254
+#: rc.cpp:263
 #, no-c-format
 msgid "Latvian (lv)"
 msgstr "拉脱维亚(lv)"
 
-#. i18n: file rdp/rdpprefs.ui line 254
-#: rc.cpp:263
+#. i18n: file rdp/rdpprefs.ui line 259
+#: rc.cpp:266
 #, no-c-format
 msgid "Macedonian (mk)"
 msgstr "马其顿(mk)"
 
-#. i18n: file rdp/rdpprefs.ui line 259
-#: rc.cpp:266
+#. i18n: file rdp/rdpprefs.ui line 264
+#: rc.cpp:269
 #, no-c-format
 msgid "Dutch (nl)"
 msgstr ""
 
-#. i18n: file rdp/rdpprefs.ui line 264
-#: rc.cpp:269
+#. i18n: file rdp/rdpprefs.ui line 269
+#: rc.cpp:272
 #, fuzzy, no-c-format
 msgid "Belgian Dutch (nl-be)"
 msgstr "比利时(fr-be)"
 
-#. i18n: file rdp/rdpprefs.ui line 269
-#: rc.cpp:272
+#. i18n: file rdp/rdpprefs.ui line 274
+#: rc.cpp:275
 #, no-c-format
 msgid "Norwegian (no)"
 msgstr "挪威(no)"
 
-#. i18n: file rdp/rdpprefs.ui line 274
-#: rc.cpp:275
+#. i18n: file rdp/rdpprefs.ui line 279
+#: rc.cpp:278
 #, no-c-format
 msgid "Polish (pl)"
 msgstr "波兰(pl)"
 
-#. i18n: file rdp/rdpprefs.ui line 279
-#: rc.cpp:278
+#. i18n: file rdp/rdpprefs.ui line 284
+#: rc.cpp:281
 #, no-c-format
 msgid "Portuguese (pt)"
 msgstr "葡萄牙(pt)"
 
-#. i18n: file rdp/rdpprefs.ui line 284
-#: rc.cpp:281
+#. i18n: file rdp/rdpprefs.ui line 289
+#: rc.cpp:284
 #, no-c-format
 msgid "Brazilian (pt-br)"
 msgstr "巴西(pt-br)"
 
-#. i18n: file rdp/rdpprefs.ui line 289
-#: rc.cpp:284
+#. i18n: file rdp/rdpprefs.ui line 294
+#: rc.cpp:287
 #, no-c-format
 msgid "Russian (ru)"
 msgstr "俄罗斯(ru)"
 
-#. i18n: file rdp/rdpprefs.ui line 294
-#: rc.cpp:287
+#. i18n: file rdp/rdpprefs.ui line 299
+#: rc.cpp:290
 #, no-c-format
 msgid "Slovenian (sl)"
 msgstr "斯洛文尼亚(sl)"
 
-#. i18n: file rdp/rdpprefs.ui line 299
-#: rc.cpp:290
+#. i18n: file rdp/rdpprefs.ui line 304
+#: rc.cpp:293
 #, no-c-format
 msgid "Swedish (sv)"
 msgstr "瑞典(sv)"
 
-#. i18n: file rdp/rdpprefs.ui line 304
-#: rc.cpp:293
+#. i18n: file rdp/rdpprefs.ui line 309
+#: rc.cpp:296
 #, no-c-format
 msgid "Thai (th)"
 msgstr "泰国(th)"
 
-#. i18n: file rdp/rdpprefs.ui line 309
-#: rc.cpp:296
+#. i18n: file rdp/rdpprefs.ui line 314
+#: rc.cpp:299
 #, no-c-format
 msgid "Turkish (tr)"
 msgstr "土耳其(tr)"
 
-#. i18n: file rdp/rdpprefs.ui line 336
-#: rc.cpp:299
+#. i18n: file rdp/rdpprefs.ui line 341
+#: rc.cpp:302
 #, no-c-format
 msgid ""
 "Use this to specify your keyboard layout. This layout setting is used to send "
 "the correct keyboard codes to the server."
 msgstr "使用此处指定您的键盘布局。此布局设置用于向服务器发送正确的键盘代码。"
 
-#. i18n: file rdp/rdpprefs.ui line 352
-#: rc.cpp:302
+#. i18n: file rdp/rdpprefs.ui line 357
+#: rc.cpp:305
 #, no-c-format
 msgid "&Keyboard layout:"
 msgstr "键盘布局(&K)："
 
-#. i18n: file rdp/rdpprefs.ui line 366
-#: rc.cpp:305 rc.cpp:344
+#. i18n: file rdp/rdpprefs.ui line 371
+#: rc.cpp:308 rc.cpp:347
 #, no-c-format
 msgid "Use K&Wallet for passwords"
 msgstr "使用 TDEWallet 保存密码(&W)"
 
-#. i18n: file rdp/rdpprefs.ui line 369
-#: rc.cpp:308 rc.cpp:347
+#. i18n: file rdp/rdpprefs.ui line 374
+#: rc.cpp:311 rc.cpp:350
 #, no-c-format
 msgid "Enable this option to store your passwords with TDEWallet."
 msgstr "启用此选项可使用 TDEWallet 存储您的密码。"
 
-#. i18n: file rdp/rdpprefs.ui line 385
-#: rc.cpp:311
+#. i18n: file rdp/rdpprefs.ui line 390
+#: rc.cpp:314
 #, no-c-format
 msgid "Desktop &resolution:"
 msgstr "桌面分辨率(&R)："
 
-#. i18n: file rdp/rdpprefs.ui line 404
-#: rc.cpp:314
+#. i18n: file rdp/rdpprefs.ui line 409
+#: rc.cpp:317
 #, no-c-format
 msgid "Color &depth:"
 msgstr "颜色深度(&D)："
 
-#. i18n: file rdp/rdpprefs.ui line 418
-#: rc.cpp:317
+#. i18n: file rdp/rdpprefs.ui line 423
+#: rc.cpp:320
 #, no-c-format
 msgid "&Width:"
 msgstr "宽度(&W)："
 
-#. i18n: file rdp/rdpprefs.ui line 430
-#: rc.cpp:320
+#. i18n: file rdp/rdpprefs.ui line 435
+#: rc.cpp:323
 #, no-c-format
 msgid "Low Color (8 Bit)"
 msgstr "低彩色(8位)"
 
-#. i18n: file rdp/rdpprefs.ui line 435
-#: rc.cpp:323
+#. i18n: file rdp/rdpprefs.ui line 440
+#: rc.cpp:326
 #, no-c-format
 msgid "High Color (16 Bit)"
 msgstr "高彩色(16位)"
 
-#. i18n: file rdp/rdpprefs.ui line 440
-#: rc.cpp:326
+#. i18n: file rdp/rdpprefs.ui line 445
+#: rc.cpp:329
 #, no-c-format
 msgid "True Color (24 Bit)"
 msgstr "真彩色(24位)"
 
-#. i18n: file rdp/rdpprefs.ui line 454
-#: rc.cpp:329 rc.cpp:365
+#. i18n: file rdp/rdpprefs.ui line 459
+#: rc.cpp:332 rc.cpp:368
 #, no-c-format
 msgid "&Show this dialog again for this host"
 msgstr "为此主机再次显示此对话框(&S)"
 
-#. i18n: file rdp/rdpprefs.ui line 457
-#: rc.cpp:332 rc.cpp:368
+#. i18n: file rdp/rdpprefs.ui line 462
+#: rc.cpp:335 rc.cpp:371
 #, no-c-format
 msgid ""
 "Select this option if you do not want to be asked for the settings when "
@@ -815,13 +822,13 @@ msgstr ""
 "如果您以后连接到主机时不想再被询问此设置，请选中此选项。对于已经存在配置文件的主机，将会使用相应的配置文件。新建的主机将会使用默认值进行配置。"
 
 #. i18n: file vnc/vncprefs.ui line 41
-#: rc.cpp:338
+#: rc.cpp:341
 #, no-c-format
 msgid "&Enable encryption (secure, but slow and not always possible)"
 msgstr "启用加密(安全，但是将变慢，而且不总是可用)(&E)"
 
 #. i18n: file vnc/vncprefs.ui line 44
-#: rc.cpp:341
+#: rc.cpp:344
 #, no-c-format
 msgid ""
 "Enable this option to encrypt the connection. Only newer servers support this "
@@ -830,31 +837,31 @@ msgid ""
 msgstr "启用此选项可以加密连接。仅有较新的服务器支持此选项。加密能够避免他人窃听，但将显著降低连接的速度。"
 
 #. i18n: file vnc/vncprefs.ui line 74
-#: rc.cpp:350
+#: rc.cpp:353
 #, no-c-format
 msgid "Connection &type:"
 msgstr "连接类型(&T)："
 
 #. i18n: file vnc/vncprefs.ui line 83
-#: rc.cpp:353
+#: rc.cpp:356
 #, no-c-format
 msgid "High Quality (LAN, direct connection)"
 msgstr "高质量(LAN，直接连接)"
 
 #. i18n: file vnc/vncprefs.ui line 88
-#: rc.cpp:356
+#: rc.cpp:359
 #, no-c-format
 msgid "Medium Quality (DSL, Cable, fast Internet)"
 msgstr "中质量(DSL、有线电视网、快速Internet)"
 
 #. i18n: file vnc/vncprefs.ui line 93
-#: rc.cpp:359
+#: rc.cpp:362
 #, no-c-format
 msgid "Low Quality (Modem, ISDN, slow Internet)"
 msgstr "低质量(调制解调器，ISDN，慢速Internet)"
 
 #. i18n: file vnc/vncprefs.ui line 114
-#: rc.cpp:362
+#: rc.cpp:365
 #, no-c-format
 msgid ""
 "Use this to specify the performance of your connection. Note that you should "
@@ -869,37 +876,37 @@ msgstr ""
 "就算您有高速连接，但如果对方使用慢的调制解调器，您的高速网络也起不到作用。在慢速连接上选择太高的质量将导致响应时间变缓。选择较低质量将增加高速连接的等待时间并导"
 "致较低的图像质量，特别是“低质量”模式。"
 
-#: rdp/krdpview.cpp:170
+#: rdp/krdpview.cpp:172
 #, c-format
 msgid "RDP Host Preferences for %1"
 msgstr "%1 的 RDP 主机首选项"
 
-#: rdp/krdpview.cpp:262
+#: rdp/krdpview.cpp:279
 msgid "Please enter the password."
 msgstr "请输入密码。"
 
-#: rdp/krdpview.cpp:284
+#: rdp/krdpview.cpp:301
 msgid "Could not start rdesktop; make sure rdesktop is properly installed."
 msgstr "无法启动 rdesktop；请确定 rdesktop 已经正确安装。"
 
-#: rdp/krdpview.cpp:285
+#: rdp/krdpview.cpp:302
 msgid "rdesktop Failure"
 msgstr "rdesktop 失败"
 
-#: rdp/krdpview.cpp:345 vnc/kvncview.cpp:458
+#: rdp/krdpview.cpp:367 vnc/kvncview.cpp:467
 msgid "Connection attempt to host failed."
 msgstr "连接到主机失败。"
 
-#: rdp/krdpview.cpp:346 vnc/kvncview.cpp:223 vnc/kvncview.cpp:459
-#: vnc/kvncview.cpp:464 vnc/kvncview.cpp:469 vnc/kvncview.cpp:474
-#: vnc/kvncview.cpp:479 vnc/kvncview.cpp:484
+#: rdp/krdpview.cpp:368 vnc/kvncview.cpp:225 vnc/kvncview.cpp:468
+#: vnc/kvncview.cpp:473 vnc/kvncview.cpp:478 vnc/kvncview.cpp:483
+#: vnc/kvncview.cpp:488 vnc/kvncview.cpp:493
 msgid "Connection Failure"
 msgstr "连接失败"
 
 #: rdp/rdphostpref.cpp:112
 msgid ""
-"Show Preferences: %1, Resolution: %2x%3, Color Depth: %4, Keymap: %5, TDEWallet: "
-"%6"
+"Show Preferences: %1, Resolution: %2x%3, Color Depth: %4, Keymap: %5, "
+"TDEWallet: %6"
 msgstr "显示首选项：%1，分辨率：%2x%3，颜色深度：%4，键盘映射：%5，TDEWallet：%6"
 
 #: rdp/rdphostpref.cpp:113 rdp/rdphostpref.cpp:114 vnc/vnchostpref.cpp:99
@@ -910,52 +917,55 @@ msgstr "是"
 msgid "no"
 msgstr "否"
 
-#: vnc/kvncview.cpp:222
+#: vnc/kvncview.cpp:224
 msgid "It is not possible to connect to a local desktop sharing service."
 msgstr "不可能连接到本地桌面共享服务。"
 
-#: vnc/kvncview.cpp:237
+#: vnc/kvncview.cpp:239
 #, c-format
 msgid "VNC Host Preferences for %1"
 msgstr "%1 的 VNC 主机首选项"
 
-#: vnc/kvncview.cpp:407
+#: vnc/kvncview.cpp:416
 msgid "Access to the system requires a password."
 msgstr "访问系统需要密码。"
 
-#: vnc/kvncview.cpp:463
+#: vnc/kvncview.cpp:472
 msgid "Remote host is using an incompatible protocol."
 msgstr "远程主机使用的协议不兼容。"
 
-#: vnc/kvncview.cpp:468
+#: vnc/kvncview.cpp:477
 msgid "The connection to the host has been interrupted."
 msgstr "到主机的连接被中断。"
 
-#: vnc/kvncview.cpp:473
+#: vnc/kvncview.cpp:482
 msgid "Connection failed. The server does not accept new connections."
 msgstr "连接失败。服务器不接受新连接。"
 
-#: vnc/kvncview.cpp:478
+#: vnc/kvncview.cpp:487
 msgid "Connection failed. A server with the given name cannot be found."
 msgstr "连接失败。找不到给定名称的服务器。"
 
-#: vnc/kvncview.cpp:483
-msgid "Connection failed. No server running at the given address and port."
+#: vnc/kvncview.cpp:492
+#, fuzzy
+msgid ""
+"Connection failed. No server running at the given address and port. Verify the "
+"KDED TDE Internet Daemon is running at the remote server."
 msgstr "连接失败。给定地址和端口没有运行服务器。"
 
-#: vnc/kvncview.cpp:492
+#: vnc/kvncview.cpp:501
 msgid "Authentication failed. Connection aborted."
 msgstr "认证失败。连接中止。"
 
-#: vnc/kvncview.cpp:493
+#: vnc/kvncview.cpp:502
 msgid "Authentication Failure"
 msgstr "认证失败"
 
-#: vnc/kvncview.cpp:497
+#: vnc/kvncview.cpp:506
 msgid "Unknown error."
 msgstr "未知错误。"
 
-#: vnc/kvncview.cpp:498
+#: vnc/kvncview.cpp:507
 msgid "Unknown Error"
 msgstr "未知错误"
 
diff --git a/tde-i18n-zh_CN/messages/tdenetwork/krfb.po b/tde-i18n-zh_CN/messages/tdenetwork/krfb.po
index f0320b6c3e7..f6a7c0636fc 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/krfb.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/krfb.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: krfb\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2005-01-09 21:58+0800\n"
 "Last-Translator: Funda Wang <fundawnag@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdenetwork/ksirc.po b/tde-i18n-zh_CN/messages/tdenetwork/ksirc.po
index 3d0f2c6a492..ff12e296a97 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/ksirc.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/ksirc.po
@@ -9,10 +9,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksirc\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2005-09-23 13:58+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdenetwork/kwifimanager.po b/tde-i18n-zh_CN/messages/tdenetwork/kwifimanager.po
index d5ae7237bb2..84712cd5a20 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/kwifimanager.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/kwifimanager.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kwifimanager\n"
-"POT-Creation-Date: 2006-11-26 03:33+0100\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2005-01-09 21:38+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,44 +30,44 @@ msgstr "i18n-translation@lists.linux.net.cn"
 msgid "UNKNOWN"
 msgstr "未知"
 
-#: interface_wireless_wirelessextensions.cpp:524
+#: interface_wireless_wirelessextensions.cpp:528
 msgid "Network Name"
 msgstr "网络名称"
 
-#: interface_wireless_wirelessextensions.cpp:525
+#: interface_wireless_wirelessextensions.cpp:529
 msgid "Mode"
 msgstr "模式"
 
-#: interface_wireless_wirelessextensions.cpp:526
+#: interface_wireless_wirelessextensions.cpp:530
 msgid "Quality"
 msgstr "质量"
 
-#: interface_wireless_wirelessextensions.cpp:527
+#: interface_wireless_wirelessextensions.cpp:531
 msgid "WEP"
 msgstr "WEP"
 
-#: interface_wireless_wirelessextensions.cpp:541
+#: interface_wireless_wirelessextensions.cpp:545
 msgid ""
 "Unable to perform the scan. Please make sure the executable \"iwlist\" is in "
 "your $PATH."
 msgstr "无法执行扫描。请确定可执行文件“iwlist”位于您的 $PATH 中。"
 
-#: interface_wireless_wirelessextensions.cpp:542
-#: interface_wireless_wirelessextensions.cpp:567
+#: interface_wireless_wirelessextensions.cpp:546
+#: interface_wireless_wirelessextensions.cpp:571
 msgid "Scanning not possible"
 msgstr "无法扫描"
 
-#: interface_wireless_wirelessextensions.cpp:566
+#: interface_wireless_wirelessextensions.cpp:570
 msgid ""
 "Your card does not support scanning. The results window will not contain any "
 "results."
 msgstr "您的网卡不支持扫描。结果窗口将不包含任何结果。"
 
-#: interface_wireless_wirelessextensions.cpp:584 networkscanning.cpp:130
+#: interface_wireless_wirelessextensions.cpp:588 networkscanning.cpp:130
 msgid "Managed"
 msgstr "被管制"
 
-#: interface_wireless_wirelessextensions.cpp:586
+#: interface_wireless_wirelessextensions.cpp:590
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
diff --git a/tde-i18n-zh_CN/messages/tdenetwork/kwireless.po b/tde-i18n-zh_CN/messages/tdenetwork/kwireless.po
index f68e06cf1d0..9f8b0c11a67 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/kwireless.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/kwireless.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kwireless\n"
-"POT-Creation-Date: 2004-12-11 01:20+0100\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2005-01-09 21:39+0800\n"
 "Last-Translator: Yan Shuangchun <yahzee@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdenetwork/tdefile_torrent.po b/tde-i18n-zh_CN/messages/tdenetwork/tdefile_torrent.po
index 12f115a33c1..1668dfb822f 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/tdefile_torrent.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/tdefile_torrent.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_torrent\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2005-02-04 02:36+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdenetwork/tdefileshare.po b/tde-i18n-zh_CN/messages/tdenetwork/tdefileshare.po
index cd5d88384c1..173eb486d3d 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/tdefileshare.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/tdefileshare.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefileshare\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2004-11-27 17:43+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -122,7 +123,7 @@ msgid "Shared Folders"
 msgstr "共享的文件夹"
 
 #. i18n: file ./simple/controlcenter.ui line 303
-#: rc.cpp:54 rc.cpp:914
+#: rc.cpp:54 rc.cpp:1443
 #, no-c-format
 msgid "Path"
 msgstr "路径"
@@ -152,7 +153,7 @@ msgid "Chang&e..."
 msgstr "更改(&E)..."
 
 #. i18n: file ./simple/controlcenter.ui line 388
-#: rc.cpp:69 rc.cpp:986
+#: rc.cpp:69 rc.cpp:1515
 #, no-c-format
 msgid "Rem&ove"
 msgstr "删除(&O)"
@@ -627,810 +628,1604 @@ msgstr "域控制器(&N)："
 msgid "&Domain:"
 msgstr "域(&D)："
 
-#. i18n: file ./advanced/kcm_sambaconf/userselectdlg.ui line 16
+#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 16
 #: rc.cpp:306
 #, no-c-format
-msgid "Select Users"
-msgstr "选择用户"
+msgid "Select Groups"
+msgstr "选择组"
 
-#. i18n: file ./advanced/kcm_sambaconf/userselectdlg.ui line 36
-#: rc.cpp:309
+#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 136
+#: rc.cpp:315
 #, no-c-format
-msgid "Select &Users"
-msgstr "选择用户(&U)"
+msgid "Selec&t Groups"
+msgstr "选择组(&T)"
 
-#. i18n: file ./advanced/kcm_sambaconf/userselectdlg.ui line 51
-#: rc.cpp:312 rc.cpp:657 rc.cpp:911 rc.cpp:941 rc.cpp:971 rc.cpp:992
-#: rc.cpp:2150 rc.cpp:2285
+#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 151
+#: rc.cpp:318 rc.cpp:825 rc.cpp:1440 rc.cpp:1470 rc.cpp:1500 rc.cpp:1521
+#: rc.cpp:2679 rc.cpp:2718
 #, no-c-format
 msgid "Name"
 msgstr "名称"
 
-#. i18n: file ./advanced/kcm_sambaconf/userselectdlg.ui line 62
-#: rc.cpp:315 rc.cpp:974 rc.cpp:995 rc.cpp:2153
-#, no-c-format
-msgid "UID"
-msgstr "UID"
-
-#. i18n: file ./advanced/kcm_sambaconf/userselectdlg.ui line 73
-#: rc.cpp:318 rc.cpp:660 rc.cpp:2156
+#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 162
+#: rc.cpp:321 rc.cpp:2685 rc.cpp:2724
 #, no-c-format
 msgid "GID"
 msgstr "GID"
 
-#. i18n: file ./advanced/kcm_sambaconf/userselectdlg.ui line 104
-#: rc.cpp:321 rc.cpp:663
+#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 201
+#: rc.cpp:324 rc.cpp:2727
 #, no-c-format
 msgid "Acc&ess"
 msgstr "访问(&E)"
 
-#. i18n: file ./advanced/kcm_sambaconf/userselectdlg.ui line 121
-#: rc.cpp:324 rc.cpp:666
+#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 226
+#: rc.cpp:327 rc.cpp:2730
 #, no-c-format
 msgid "&Default"
 msgstr "默认(&D)"
 
-#. i18n: file ./advanced/kcm_sambaconf/userselectdlg.ui line 135
-#: rc.cpp:327 rc.cpp:669
+#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 248
+#: rc.cpp:330 rc.cpp:2733
 #, no-c-format
 msgid "&Read access"
 msgstr "读取访问(&R)"
 
-#. i18n: file ./advanced/kcm_sambaconf/userselectdlg.ui line 146
-#: rc.cpp:330 rc.cpp:672
+#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 267
+#: rc.cpp:333 rc.cpp:2736
 #, no-c-format
 msgid "&Write access"
 msgstr "写入访问(&W)"
 
-#. i18n: file ./advanced/kcm_sambaconf/userselectdlg.ui line 157
-#: rc.cpp:333 rc.cpp:675
+#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 286
+#: rc.cpp:336 rc.cpp:2739
 #, no-c-format
 msgid "&Admin access"
 msgstr "管理权限(&A)"
 
-#. i18n: file ./advanced/kcm_sambaconf/userselectdlg.ui line 168
-#: rc.cpp:336 rc.cpp:678
+#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 305
+#: rc.cpp:339 rc.cpp:2742
 #, no-c-format
 msgid "&No access at all"
 msgstr "根本不允许访问(&N)"
 
-#. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 37
+#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 318
+#: rc.cpp:342
+#, no-c-format
+msgid "&Kind of Group"
+msgstr "组类型(&K)"
+
+#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 343
 #: rc.cpp:345
 #, no-c-format
+msgid "&UNIX group"
+msgstr "UNIX 组(&U)"
+
+#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 368
+#: rc.cpp:348
+#, no-c-format
+msgid "NI&S group"
+msgstr "NIS 组(&S)"
+
+#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 393
+#: rc.cpp:351
+#, no-c-format
+msgid "UNIX and NIS gr&oup"
+msgstr "UNIX 和 NIS 组(&O)"
+
+#. i18n: file ./advanced/kcm_sambaconf/expertuserdlg.ui line 16
+#: rc.cpp:354
+#, no-c-format
+msgid "User Settings"
+msgstr "用户设置"
+
+#. i18n: file ./advanced/kcm_sambaconf/expertuserdlg.ui line 38
+#: rc.cpp:357
+#, no-c-format
+msgid "&Valid users:"
+msgstr "有效用户(&V)："
+
+#. i18n: file ./advanced/kcm_sambaconf/expertuserdlg.ui line 62
+#: rc.cpp:360
+#, no-c-format
+msgid "&Admin users:"
+msgstr "管理用户(&A)："
+
+#. i18n: file ./advanced/kcm_sambaconf/expertuserdlg.ui line 86
+#: rc.cpp:363
+#, no-c-format
+msgid "&Invalid users:"
+msgstr "无效用户(&I)："
+
+#. i18n: file ./advanced/kcm_sambaconf/expertuserdlg.ui line 202
+#: rc.cpp:372
+#, no-c-format
+msgid "&Write list:"
+msgstr "写入列表(&W)："
+
+#. i18n: file ./advanced/kcm_sambaconf/expertuserdlg.ui line 231
+#: rc.cpp:375
+#, no-c-format
+msgid "&Read list:"
+msgstr "读取列表(&R)："
+
+#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 37
+#: rc.cpp:378 rc.cpp:2182
+#, no-c-format
+msgid "Socket Options"
+msgstr "套接字选项"
+
+#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 71
+#: rc.cpp:381
+#, no-c-format
+msgid "SO_SNDLOWAT:"
+msgstr "SO_SNDLOWAT："
+
+#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 79
+#: rc.cpp:384
+#, no-c-format
+msgid "IPTOS_THROUGHPUT"
+msgstr "IPTOS_THROUGHPUT"
+
+#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 87
+#: rc.cpp:387
+#, no-c-format
+msgid "SO_SNDBUF:"
+msgstr "SO_SNDBUF："
+
+#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 95
+#: rc.cpp:390
+#, no-c-format
+msgid "SO_KEEPALIVE"
+msgstr "SO_KEEPALIVE"
+
+#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 103
+#: rc.cpp:393 rc.cpp:2212
+#, no-c-format
+msgid "SO_RCVBUF:"
+msgstr "SO_RCVBUF："
+
+#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 133
+#: rc.cpp:396 rc.cpp:2191
+#, no-c-format
+msgid "SO_BROADCAST"
+msgstr "SO_BROADCAST"
+
+#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 141
+#: rc.cpp:399 rc.cpp:2197
+#, no-c-format
+msgid "IPTOS_LOWDELAY"
+msgstr "IPTOS_LOWDELAY"
+
+#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 149
+#: rc.cpp:402
+#, no-c-format
+msgid "TCP_NODELAY"
+msgstr "TCP_NODELAY"
+
+#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 157
+#: rc.cpp:405
+#, no-c-format
+msgid "SO_RCVLOWAT:"
+msgstr "SO_RCVLOWAT："
+
+#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 187
+#: rc.cpp:408
+#, no-c-format
+msgid "SO_REUSEADDR"
+msgstr "SO_REUSEADDR"
+
+#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 225
+#: rc.cpp:414 rc.cpp:714 rc.cpp:1282 rc.cpp:1330
+#, no-c-format
+msgid "F1"
+msgstr "F1"
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 72
+#: rc.cpp:423
+#, no-c-format
+msgid "Not share&d"
+msgstr "不共享(&D)"
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 86
+#: rc.cpp:426
+#, no-c-format
+msgid "&Shared"
+msgstr "已共享(&S)"
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 103
+#: rc.cpp:429
+#, no-c-format
+msgid "Bas&e Options"
+msgstr "基本选项(&E)"
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 124
+#: rc.cpp:432 rc.cpp:1446 rc.cpp:1476
+#, no-c-format
+msgid "Comment"
+msgstr "注释"
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 127
+#: rc.cpp:435 rc.cpp:453
+#, no-c-format
+msgid ""
+"This is a text field that is seen next to a share when a client queries the "
+"server, either via the network neighborhood or via net view, to list what "
+"shares are available."
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 139
+#: rc.cpp:438
+#, no-c-format
+msgid "Name of the share"
+msgstr "共享名称"
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 142
+#: rc.cpp:441 rc.cpp:447
+#, no-c-format
+msgid "This is the name of the share"
+msgstr "这是共享的名称"
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 154
+#: rc.cpp:444 rc.cpp:540
+#, no-c-format
+msgid "&Name:"
+msgstr "名称(&N)："
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 178
+#: rc.cpp:450
+#, no-c-format
+msgid "Commen&t:"
+msgstr "注释(&T)："
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 198
+#: rc.cpp:456
+#, no-c-format
+msgid "Security Options"
+msgstr "安全选项"
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 219
+#: rc.cpp:459 rc.cpp:468 rc.cpp:624 rc.cpp:627 rc.cpp:639 rc.cpp:645
+#: rc.cpp:786 rc.cpp:798
+#, no-c-format
+msgid ""
+"The opposite of hosts allow - hosts listed here are NOT permitted access to "
+"services unless the specific services have their own lists to override this "
+"one. Where the lists conflict, the allow list takes precedence."
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 231
+#: rc.cpp:462 rc.cpp:474 rc.cpp:630 rc.cpp:636 rc.cpp:792 rc.cpp:801
+#: rc.cpp:907 rc.cpp:913 rc.cpp:919 rc.cpp:925 rc.cpp:958 rc.cpp:964
+#: rc.cpp:970 rc.cpp:994 rc.cpp:1018
+#, no-c-format
+msgid ""
+"This parameter is a comma, space, or tab delimited set of hosts which are "
+"permitted to access a service."
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 243
+#: rc.cpp:465
+#, no-c-format
+msgid "Hosts den&y:"
+msgstr "禁止主机(&Y)："
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 261
+#: rc.cpp:471
+#, no-c-format
+msgid "&Hosts allow:"
+msgstr "允许主机(&H)："
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 279
+#: rc.cpp:477
+#, no-c-format
+msgid "Guest &account:"
+msgstr "访客帐户(&A)："
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 285
+#: rc.cpp:480 rc.cpp:651 rc.cpp:774
+#, no-c-format
+msgid ""
+"This is a username which will be used for access to services which are "
+"specified as guest ok. Whatever privileges this user has will be available to "
+"any client connecting to the guest service. Typically this user will exist in "
+"the password file, but will not have a valid login. The user account "
+"\\\"ftp\\\" is often a good choice for this parameter. If a username is "
+"specified in a given service, the specified username overrides this one."
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 297
+#: rc.cpp:483
+#, no-c-format
+msgid "&Read only"
+msgstr "只读(&R)"
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 300
+#: rc.cpp:486
+#, no-c-format
+msgid ""
+"If this is checked, then users of a service may not create or modify files in "
+"the service's directory."
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 312
+#: rc.cpp:489
+#, no-c-format
+msgid "G&uests allowed"
+msgstr "允许访客(&U)"
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 318
+#: rc.cpp:492 rc.cpp:780 rc.cpp:819
+#, no-c-format
+msgid ""
+"If this is checked , then no password is required to connect to the service. "
+"Privileges will be those of the guest account."
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 333
+#: rc.cpp:495
+#, no-c-format
+msgid ""
+"This is a username which will be used for access this directory if guests are "
+"allowed"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 347
+#: rc.cpp:498 rc.cpp:1105
+#, no-c-format
+msgid "Other Options"
+msgstr "其它选项"
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 368
+#: rc.cpp:501 rc.cpp:552 rc.cpp:759
+#, no-c-format
+msgid "Bro&wseable"
+msgstr "可浏览(&W)"
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 371
+#: rc.cpp:504
+#, no-c-format
+msgid ""
+"This controls whether this share is seen in the list of available shares in a "
+"net view and in the browse list."
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 391
+#: rc.cpp:507 rc.cpp:549 rc.cpp:762
+#, no-c-format
+msgid "A&vailable"
+msgstr "可用(&V)"
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 394
+#: rc.cpp:510
+#, no-c-format
+msgid ""
+"Checkbox lets you \\\"turn off\\\" a service. If not checked, then ALL attempts "
+"to connect to the service will fail. Such failures are logged."
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 435
+#: rc.cpp:513
+#, no-c-format
+msgid "More Opt&ions"
+msgstr "更多选项(&I)"
+
+#. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 37
+#: rc.cpp:516
+#, no-c-format
 msgid "Printer Settings"
 msgstr "打印机设置"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 58
-#: rc.cpp:348 rc.cpp:827 rc.cpp:2186
+#: rc.cpp:519 rc.cpp:726 rc.cpp:1356
 #, no-c-format
 msgid "&Base Settings"
 msgstr "基本设置(&B)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 111
-#: rc.cpp:351 rc.cpp:2189
+#: rc.cpp:522 rc.cpp:729
 #, no-c-format
 msgid "Pixmap"
 msgstr "像素图"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 127
-#: rc.cpp:354
+#: rc.cpp:525
 #, no-c-format
 msgid "Pr&inter"
 msgstr "打印机(&I)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 163
-#: rc.cpp:357
+#: rc.cpp:528
 #, no-c-format
 msgid "Pa&th:"
 msgstr "路径(&T)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 174
-#: rc.cpp:360
+#: rc.cpp:531
 #, no-c-format
 msgid "&Queue:"
 msgstr "队列(&Q)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 207
-#: rc.cpp:363
+#: rc.cpp:534
 #, no-c-format
 msgid "Sha&re all printers"
 msgstr "共享全部打印机(&R)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 223
-#: rc.cpp:366
+#: rc.cpp:537
 #, no-c-format
 msgid "I&dentifier"
 msgstr "标识符(&D)"
 
-#. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 240
-#: rc.cpp:369 rc.cpp:714
-#, no-c-format
-msgid "&Name:"
-msgstr "名称(&N)："
-
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 251
-#: rc.cpp:372
+#: rc.cpp:543
 #, no-c-format
 msgid "Comm&ent:"
 msgstr "注释(&E)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 274
-#: rc.cpp:375
+#: rc.cpp:546
 #, no-c-format
 msgid "Main Properties"
 msgstr "主要属性"
 
-#. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 291
-#: rc.cpp:378 rc.cpp:777 rc.cpp:2222
-#, no-c-format
-msgid "A&vailable"
-msgstr "可用(&V)"
-
-#. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 299
-#: rc.cpp:381 rc.cpp:771 rc.cpp:2219
-#, no-c-format
-msgid "Bro&wseable"
-msgstr "可浏览(&W)"
-
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 307
-#: rc.cpp:384 rc.cpp:2216
+#: rc.cpp:555 rc.cpp:756
 #, no-c-format
 msgid "Pub&lic"
 msgstr "公开(&L)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 336
-#: rc.cpp:387
+#: rc.cpp:558
 #, no-c-format
 msgid "&Printing"
 msgstr "打印(&P)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 369
-#: rc.cpp:390
+#: rc.cpp:561
 #, no-c-format
 msgid "Printer dri&ver:"
 msgstr "打印机驱动程序(&V)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 390
-#: rc.cpp:393
+#: rc.cpp:564
 #, no-c-format
 msgid "Print&er driver location:"
 msgstr "打印机驱动程序位置(&E)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 406
-#: rc.cpp:396
+#: rc.cpp:567
 #, no-c-format
 msgid "PostScr&ipt"
 msgstr "PostScr&ipt"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 414
-#: rc.cpp:399
+#: rc.cpp:570
 #, no-c-format
 msgid "Printin&g:"
 msgstr "打印(&G)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 423
-#: rc.cpp:402
+#: rc.cpp:573
 #, no-c-format
 msgid "sysv"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 428
-#: rc.cpp:405
+#: rc.cpp:576
 #, no-c-format
 msgid "aix"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 433
-#: rc.cpp:408
+#: rc.cpp:579
 #, no-c-format
 msgid "hpux"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 438
-#: rc.cpp:411
+#: rc.cpp:582
 #, no-c-format
 msgid "bsd"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 443
-#: rc.cpp:414
+#: rc.cpp:585
 #, no-c-format
 msgid "qnx"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 448
-#: rc.cpp:417
+#: rc.cpp:588
 #, no-c-format
 msgid "plp"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 453
-#: rc.cpp:420
+#: rc.cpp:591
 #, no-c-format
 msgid "lprng"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 458
-#: rc.cpp:423
+#: rc.cpp:594
 #, no-c-format
 msgid "softq"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 463
-#: rc.cpp:426
+#: rc.cpp:597
 #, no-c-format
 msgid "cups"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 468
-#: rc.cpp:429
+#: rc.cpp:600
 #, no-c-format
 msgid "nt"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 473
-#: rc.cpp:432
+#: rc.cpp:603
 #, no-c-format
 msgid "os2"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 485
-#: rc.cpp:435
+#: rc.cpp:606
 #, no-c-format
 msgid "Max reported print &jobs:"
 msgstr "报告的最多打印任务数(&J)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 496
-#: rc.cpp:438
+#: rc.cpp:609
 #, no-c-format
 msgid "Ma&x print jobs:"
 msgstr "最多打印任务(&X)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 550
-#: rc.cpp:441
+#: rc.cpp:612
 #, no-c-format
 msgid "Use c&lient driver"
 msgstr "使用客户端驱动程序(&L)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 558
-#: rc.cpp:444
+#: rc.cpp:615
 #, no-c-format
 msgid "De&fault devmode"
 msgstr "默认设备模式(&F)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 568
-#: rc.cpp:447 rc.cpp:2225
+#: rc.cpp:618 rc.cpp:765
 #, no-c-format
 msgid "&Security"
 msgstr "安全(&S)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 579
-#: rc.cpp:450 rc.cpp:2255
+#: rc.cpp:621 rc.cpp:795
 #, no-c-format
 msgid "Hosts &deny:"
 msgstr "禁止主机(&D)："
 
-#. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 585
-#: rc.cpp:453 rc.cpp:456 rc.cpp:468 rc.cpp:474 rc.cpp:729 rc.cpp:738
-#: rc.cpp:2246 rc.cpp:2258
-#, no-c-format
-msgid ""
-"The opposite of hosts allow - hosts listed here are NOT permitted access to "
-"services unless the specific services have their own lists to override this "
-"one. Where the lists conflict, the allow list takes precedence."
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 601
-#: rc.cpp:459 rc.cpp:465 rc.cpp:732 rc.cpp:744 rc.cpp:2252 rc.cpp:2261
-#: rc.cpp:2367 rc.cpp:2373 rc.cpp:2379 rc.cpp:2385 rc.cpp:2418 rc.cpp:2424
-#: rc.cpp:2430 rc.cpp:2454 rc.cpp:2478
-#, no-c-format
-msgid ""
-"This parameter is a comma, space, or tab delimited set of hosts which are "
-"permitted to access a service."
-msgstr ""
-
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 609
-#: rc.cpp:462
+#: rc.cpp:633
 #, no-c-format
 msgid "Hosts a&llow:"
 msgstr "允许主机(&L)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 648
-#: rc.cpp:471
+#: rc.cpp:642
 #, no-c-format
 msgid "P&rinter admin:"
 msgstr "打印机管理(&R)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 662
-#: rc.cpp:477 rc.cpp:2231
+#: rc.cpp:648 rc.cpp:771
 #, no-c-format
 msgid "&Guest account:"
 msgstr "访客账户(&G)："
 
-#. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 668
-#: rc.cpp:480 rc.cpp:750 rc.cpp:2234
-#, no-c-format
-msgid ""
-"This is a username which will be used for access to services which are "
-"specified as guest ok. Whatever privileges this user has will be available to "
-"any client connecting to the guest service. Typically this user will exist in "
-"the password file, but will not have a valid login. The user account "
-"\\\"ftp\\\" is often a good choice for this parameter. If a username is "
-"specified in a given service, the specified username overrides this one."
-msgstr ""
-
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 700
-#: rc.cpp:483
+#: rc.cpp:654
 #, no-c-format
 msgid "Co&mmands"
 msgstr "命令(&M)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 717
-#: rc.cpp:486
+#: rc.cpp:657
 #, no-c-format
 msgid "Pr&int command:"
 msgstr "打印命令(&I)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 733
-#: rc.cpp:489
+#: rc.cpp:660
 #, no-c-format
 msgid "lpq comma&nd:"
 msgstr "lpq 命令(&N)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 754
-#: rc.cpp:492
+#: rc.cpp:663
 #, no-c-format
 msgid "lprm comman&d:"
 msgstr "lprm 命令(&D)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 775
-#: rc.cpp:495
+#: rc.cpp:666
 #, no-c-format
 msgid "lp&resume:"
 msgstr "lp&resume："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 786
-#: rc.cpp:498
+#: rc.cpp:669
 #, no-c-format
 msgid "&queuepause:"
 msgstr "&queuepause："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 797
-#: rc.cpp:501
+#: rc.cpp:672
 #, no-c-format
 msgid "&lppause:"
 msgstr "&lppause："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 818
-#: rc.cpp:504
+#: rc.cpp:675
 #, no-c-format
 msgid "qu&eueresume:"
 msgstr "qu&eueresume："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 848
-#: rc.cpp:507 rc.cpp:2348
+#: rc.cpp:678 rc.cpp:888
 #, no-c-format
 msgid "&Advanced"
 msgstr "高级(&A)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 859
-#: rc.cpp:510
+#: rc.cpp:681
 #, no-c-format
 msgid "Miscella&neous"
 msgstr "杂项(&N)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 886
-#: rc.cpp:513
+#: rc.cpp:684
 #, no-c-format
 msgid "p&reexec:"
 msgstr "p&reexec："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 897
-#: rc.cpp:516
+#: rc.cpp:687
 #, no-c-format
 msgid "root pr&eexec:"
 msgstr "root pr&eexec："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 918
-#: rc.cpp:519
+#: rc.cpp:690
 #, no-c-format
 msgid "root postexec:"
 msgstr "root postexec"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 929
-#: rc.cpp:522
+#: rc.cpp:693
 #, no-c-format
 msgid "poste&xec:"
 msgstr "poste&xec："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 959
-#: rc.cpp:525
+#: rc.cpp:696
 #, no-c-format
 msgid "Tunin&g"
 msgstr "调整(&G)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 984
-#: rc.cpp:528
+#: rc.cpp:699
 #, no-c-format
 msgid "M&in print space:"
 msgstr "最小打印空间(&I)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 1008
-#: rc.cpp:531
+#: rc.cpp:702
 #, no-c-format
 msgid "kB"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 1019
-#: rc.cpp:534
+#: rc.cpp:705
 #, no-c-format
 msgid "&Logging"
 msgstr "日志(&L)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 1036
-#: rc.cpp:537
+#: rc.cpp:708
 #, no-c-format
 msgid "S&tatus"
 msgstr "状态(&T)"
 
-#. i18n: file ./advanced/kcm_sambaconf/kcmprinterdlg.ui line 1066
-#: rc.cpp:543 rc.cpp:588 rc.cpp:636 rc.cpp:2742
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 37
+#: rc.cpp:723
 #, no-c-format
-msgid "F1"
-msgstr "F1"
+msgid "Add/Edit Share"
+msgstr "添加/编辑共享"
 
-#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 37
-#: rc.cpp:552 rc.cpp:1653
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 130
+#: rc.cpp:732
 #, no-c-format
-msgid "Socket Options"
-msgstr "套接字选项"
+msgid "D&irectory"
+msgstr "目录(&I)"
 
-#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 71
-#: rc.cpp:555
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 164
+#: rc.cpp:735
 #, no-c-format
-msgid "SO_SNDLOWAT:"
-msgstr "SO_SNDLOWAT："
+msgid "&Path:"
+msgstr "路径(&P)："
 
-#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 79
-#: rc.cpp:558
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 185
+#: rc.cpp:738
 #, no-c-format
-msgid "IPTOS_THROUGHPUT"
-msgstr "IPTOS_THROUGHPUT"
+msgid "Share all home &directories"
+msgstr "共享全部主目录(&D)"
 
-#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 87
-#: rc.cpp:561
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 197
+#: rc.cpp:741
 #, no-c-format
-msgid "SO_SNDBUF:"
-msgstr "SO_SNDBUF："
+msgid "Iden&tifier"
+msgstr "标识符(&T)"
 
-#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 95
-#: rc.cpp:564
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 214
+#: rc.cpp:744
 #, no-c-format
-msgid "SO_KEEPALIVE"
-msgstr "SO_KEEPALIVE"
+msgid "Na&me:"
+msgstr "名称(&M)："
 
-#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 103
-#: rc.cpp:567 rc.cpp:1683
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 225
+#: rc.cpp:747
 #, no-c-format
-msgid "SO_RCVBUF:"
-msgstr "SO_RCVBUF："
+msgid "Comme&nt:"
+msgstr "注释(&N)："
 
-#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 133
-#: rc.cpp:570 rc.cpp:1662
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 248
+#: rc.cpp:750
 #, no-c-format
-msgid "SO_BROADCAST"
-msgstr "SO_BROADCAST"
+msgid "Main P&roperties"
+msgstr "主要属性(&R)"
 
-#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 141
-#: rc.cpp:573 rc.cpp:1668
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 265
+#: rc.cpp:753
 #, no-c-format
-msgid "IPTOS_LOWDELAY"
-msgstr "IPTOS_LOWDELAY"
+msgid "Read onl&y"
+msgstr "只读(&Y)"
 
-#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 149
-#: rc.cpp:576
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 338
+#: rc.cpp:768
 #, no-c-format
-msgid "TCP_NODELAY"
-msgstr "TCP_NODELAY"
+msgid "Gu&ests"
+msgstr "访客(&E)"
 
-#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 157
-#: rc.cpp:579
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 397
+#: rc.cpp:777
 #, no-c-format
-msgid "SO_RCVLOWAT:"
-msgstr "SO_RCVLOWAT："
+msgid "Only allow guest connect&ions"
+msgstr "只允许访客连接(&I)"
 
-#. i18n: file ./advanced/kcm_sambaconf/socketoptionsdlg.ui line 187
-#: rc.cpp:582
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 410
+#: rc.cpp:783
 #, no-c-format
-msgid "SO_REUSEADDR"
-msgstr "SO_REUSEADDR"
+msgid "Hos&ts"
+msgstr "主机(&T)"
 
-#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 16
-#: rc.cpp:597
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 435
+#: rc.cpp:789
 #, no-c-format
-msgid "Access Modifiers"
-msgstr "访问修饰"
+msgid "Hosts allo&w:"
+msgstr "允许主机(&W)："
 
-#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 34
-#: rc.cpp:600
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 473
+#: rc.cpp:804
 #, no-c-format
-msgid "Access Permissions"
-msgstr "访问权限"
+msgid "Sy&mbolic Links"
+msgstr "符号链接(&M)"
 
-#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 103
-#: rc.cpp:603
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 490
+#: rc.cpp:807
 #, no-c-format
-msgid "Others"
-msgstr "其它"
+msgid "Allow following of symbolic lin&ks"
+msgstr "允许跟随符号链接(&K)"
 
-#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 115
-#: rc.cpp:606
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 501
+#: rc.cpp:810
 #, no-c-format
-msgid "Read"
-msgstr "读取"
+msgid ""
+"Allow following of symbolic links that &point to areas outside the directory "
+"tree"
+msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 139
-#: rc.cpp:609 rc.cpp:2688
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 511
+#: rc.cpp:813
 #, no-c-format
-msgid "Exec"
-msgstr "执行"
+msgid ""
+"<qt>Validate password against the following usernames if the client cannot "
+"supply a username:</qt>"
+msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 151
-#: rc.cpp:612
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 527
+#: rc.cpp:816
 #, no-c-format
-msgid "Write"
-msgstr "写入"
+msgid "Only allow connections with use&rnames specified in this username list"
+msgstr "只允许此用户名列表中的用户名连接(&R)"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 557
+#: rc.cpp:822
+#, no-c-format
+msgid "Hidden &Files"
+msgstr "隐藏文件(&F)"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 583
+#: rc.cpp:828
+#, no-c-format
+msgid "Hidden"
+msgstr "隐藏"
 
-#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 235
-#: rc.cpp:615 rc.cpp:2306
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 594
+#: rc.cpp:831
+#, no-c-format
+msgid "Veto"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 605
+#: rc.cpp:834
+#, no-c-format
+msgid "Veto Oplock"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 616
+#: rc.cpp:837
+#, no-c-format
+msgid "Size"
+msgstr "大小"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 627
+#: rc.cpp:840
+#, no-c-format
+msgid "Date"
+msgstr "日期"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 638
+#: rc.cpp:843
+#, no-c-format
+msgid "Permissions"
+msgstr "权限"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 649
+#: rc.cpp:846 rc.cpp:1309
 #, no-c-format
 msgid "Owner"
 msgstr "属主"
 
-#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 259
-#: rc.cpp:618 rc.cpp:2309
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 660
+#: rc.cpp:849 rc.cpp:1312
 #, no-c-format
 msgid "Group"
 msgstr "组"
 
-#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 283
-#: rc.cpp:621
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 681
+#: rc.cpp:852
 #, no-c-format
-msgid "Sticky"
-msgstr "粘附"
+msgid "Se&lected Files"
+msgstr "选中的文件(&L)"
 
-#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 295
-#: rc.cpp:624
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 698
+#: rc.cpp:855
 #, no-c-format
-msgid "Set GID"
-msgstr "设置 GID"
+msgid "Hi&de"
+msgstr "隐藏(&D)"
 
-#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 307
-#: rc.cpp:627
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 706
+#: advanced/kcm_sambaconf/hiddenfileview.cpp:116 rc.cpp:858
 #, no-c-format
-msgid "Set UID"
-msgstr "设置 UID"
+msgid "&Veto"
+msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 319
-#: rc.cpp:630
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 714
+#: rc.cpp:861
 #, no-c-format
-msgid "Special"
-msgstr "特殊"
+msgid "Veto oploc&k"
+msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 16
-#: rc.cpp:645
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 724
+#: rc.cpp:864
 #, no-c-format
-msgid "Select Groups"
-msgstr "选择组"
+msgid "&Manual Configuration"
+msgstr "手动配置(&M)"
 
-#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 136
-#: rc.cpp:654
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 755
+#: rc.cpp:867
 #, no-c-format
-msgid "Selec&t Groups"
-msgstr "选择组(&T)"
+msgid "Ve&to files:"
+msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 318
-#: rc.cpp:681
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 766
+#: rc.cpp:870
 #, no-c-format
-msgid "&Kind of Group"
-msgstr "组类型(&K)"
+msgid "Veto oplock f&iles:"
+msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 343
-#: rc.cpp:684
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 792
+#: rc.cpp:873
 #, no-c-format
-msgid "&UNIX group"
-msgstr "UNIX 组(&U)"
+msgid "Hidde&n files:"
+msgstr "隐藏文件(&N)："
 
-#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 368
-#: rc.cpp:687
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 819
+#: rc.cpp:876
 #, no-c-format
-msgid "NI&S group"
-msgstr "NIS 组(&S)"
+msgid "Hide un&writable files"
+msgstr "隐藏不可写文件(&W)"
 
-#. i18n: file ./advanced/kcm_sambaconf/groupselectdlg.ui line 393
-#: rc.cpp:690
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 827
+#: rc.cpp:879
 #, no-c-format
-msgid "UNIX and NIS gr&oup"
-msgstr "UNIX 和 NIS 组(&O)"
+msgid "Hide s&pecial files"
+msgstr "隐藏特殊文件(&P)"
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 72
-#: rc.cpp:693
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 835
+#: rc.cpp:882
 #, no-c-format
-msgid "Not share&d"
-msgstr "不共享(&D)"
+msgid "Hide files startin&g with a dot "
+msgstr "隐藏以句点开始的文件(&G)"
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 86
-#: rc.cpp:696
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 843
+#: rc.cpp:885
 #, no-c-format
-msgid "&Shared"
-msgstr "已共享(&S)"
+msgid "Hide un&readable files"
+msgstr "隐藏不可读文件(&R)"
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 103
-#: rc.cpp:699
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 932
+#: rc.cpp:891 rc.cpp:1536
 #, no-c-format
-msgid "Bas&e Options"
-msgstr "基本选项(&E)"
+msgid ""
+"Here you can change advanced options of the SAMBA server.\n"
+"Only change something if you know what you are doing."
+msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 124
-#: rc.cpp:702 rc.cpp:917 rc.cpp:947
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 944
+#: rc.cpp:895 rc.cpp:1540
 #, no-c-format
-msgid "Comment"
-msgstr "注释"
+msgid "Advanced Dump"
+msgstr "高级转存"
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 127
-#: rc.cpp:705 rc.cpp:723
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 959
+#: advanced/kcm_sambaconf/kcmsambaconf.cpp:295 rc.cpp:898 rc.cpp:1543
 #, no-c-format
-msgid ""
-"This is a text field that is seen next to a share when a client queries the "
-"server, either via the network neighborhood or via net view, to list what "
-"shares are available."
+msgid "Security"
+msgstr "安全"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 973
+#: rc.cpp:901
+#, no-c-format
+msgid "Force Modes"
+msgstr "强制模式"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 990
+#: rc.cpp:904
+#, no-c-format
+msgid "Forc&e directory security mode:"
+msgstr "强制目录安全模式(&E)："
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1004
+#: rc.cpp:910
+#, no-c-format
+msgid "Fo&rce security mode:"
+msgstr "强制安全模式(&R)："
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1018
+#: rc.cpp:916
+#, no-c-format
+msgid "Force director&y mode:"
+msgstr "强制目录模式(&Y)："
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1032
+#: rc.cpp:922
+#, no-c-format
+msgid "Force create mo&de:"
+msgstr "强制创建模式(&D)："
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1060
+#: rc.cpp:928 rc.cpp:931 rc.cpp:946 rc.cpp:949 rc.cpp:973 rc.cpp:976
+#: rc.cpp:979 rc.cpp:1000
+#, no-c-format
+msgid "..."
+msgstr "..."
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1096
+#: rc.cpp:934 rc.cpp:937 rc.cpp:940 rc.cpp:943 rc.cpp:982 rc.cpp:985
+#: rc.cpp:988 rc.cpp:997 rc.cpp:1024
+#, no-c-format
+msgid "01234567"
+msgstr "01234567"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1209
+#: rc.cpp:952
+#, no-c-format
+msgid "Masks"
+msgstr "掩码"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1226
+#: rc.cpp:955
+#, no-c-format
+msgid "Directory security mask:"
+msgstr "目录安全掩码："
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1240
+#: rc.cpp:961
+#, no-c-format
+msgid "Security &mask:"
+msgstr "安全掩码(&M)："
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1254
+#: rc.cpp:967
+#, no-c-format
+msgid "Direc&tory mask:"
+msgstr "目录掩码(&T)："
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1376
+#: rc.cpp:991
+#, no-c-format
+msgid "Create mas&k:"
+msgstr "创建掩码(&K)："
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1428
+#: rc.cpp:1003
+#, no-c-format
+msgid "ACL"
+msgstr "ACL"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1445
+#: rc.cpp:1006
+#, no-c-format
+msgid "&Profile acls"
+msgstr "配置文件 ACL(&P)"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1453
+#: rc.cpp:1009
+#, no-c-format
+msgid "Inherit ac&ls"
+msgstr "继承 ACL(&L)"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1461
+#: rc.cpp:1012
+#, no-c-format
+msgid "&NT ACL support"
+msgstr "NT ACL 支持(&N)"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1472
+#: rc.cpp:1015
+#, no-c-format
+msgid "Force unkno&wn acl user:"
+msgstr "强制未知 ACL 用户(&W)："
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1486
+#: rc.cpp:1021
+#, no-c-format
+msgid "Map acl &inherit"
+msgstr "映射 ACL 继承(&I)"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1510
+#: rc.cpp:1027 rc.cpp:1576 rc.cpp:1774
+#, no-c-format
+msgid "General"
+msgstr "常规"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1527
+#: rc.cpp:1030
+#, no-c-format
+msgid "Inherit permissions from parent directory"
+msgstr "从父目录继承权限"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1535
+#: rc.cpp:1033
+#, no-c-format
+msgid "Allow deletion of readonly files"
+msgstr "允许删除只读文件"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1545
+#: rc.cpp:1036
+#, no-c-format
+msgid "DOS Attribute Mapping"
+msgstr "DOS 属性映射"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1562
+#: rc.cpp:1039
+#, no-c-format
+msgid "Map DOS archi&ve to UNIX owner execute"
+msgstr "将 DOS 存档映射为 UNIX 属主执行(&V)"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1570
+#: rc.cpp:1042
+#, no-c-format
+msgid "Map DOS hidden to UNI&X world execute"
+msgstr "将 DOS 隐藏映射为 UNIX 世界执行(&X)"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1578
+#: rc.cpp:1045
+#, no-c-format
+msgid "Map DOS system to UNIX &group execute"
+msgstr "将 DOS 系统映射为 UNIX 组执行(&G)"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1586
+#: rc.cpp:1048
+#, no-c-format
+msgid "Store DOS attributes onto extended attribute"
+msgstr "将 DOS 属性存储为扩展属性"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1599
+#: rc.cpp:1051
+#, no-c-format
+msgid "OS/2"
+msgstr "OS/2"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1610
+#: rc.cpp:1054
+#, no-c-format
+msgid "OS/2 style extended attributes support"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 139
-#: rc.cpp:708
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1622
+#: advanced/kcm_sambaconf/kcmsambaconf.cpp:301 rc.cpp:1057 rc.cpp:1813
 #, no-c-format
-msgid "Name of the share"
-msgstr "共享名称"
+msgid "Tuning"
+msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 142
-#: rc.cpp:711 rc.cpp:717
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1642
+#: rc.cpp:1060
 #, no-c-format
-msgid "This is the name of the share"
-msgstr "这是共享的名称"
+msgid "Sync al&ways"
+msgstr "总是同步(&W)"
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 178
-#: rc.cpp:720
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1650
+#: rc.cpp:1063
 #, no-c-format
-msgid "Commen&t:"
-msgstr "注释(&T)："
+msgid "Strict s&ync"
+msgstr "严格同步(&Y)"
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 198
-#: rc.cpp:726
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1658
+#: rc.cpp:1066
 #, no-c-format
-msgid "Security Options"
-msgstr "安全选项"
+msgid "St&rict allocate"
+msgstr "严格分配(&R)"
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 243
-#: rc.cpp:735
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1666
+#: rc.cpp:1069
 #, no-c-format
-msgid "Hosts den&y:"
-msgstr "禁止主机(&Y)："
+msgid "Use sen&dfile"
+msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 261
-#: rc.cpp:741
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1691
+#: rc.cpp:1072
 #, no-c-format
-msgid "&Hosts allow:"
-msgstr "允许主机(&H)："
+msgid "Bloc&k size:"
+msgstr "块大小(&K)："
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 279
-#: rc.cpp:747
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1702
+#: rc.cpp:1075
 #, no-c-format
-msgid "Guest &account:"
-msgstr "访客帐户(&A)："
+msgid "Client-side cachin&g policy:"
+msgstr "客户端缓存策略(&G)："
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 297
-#: rc.cpp:753
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1713
+#: rc.cpp:1078 rc.cpp:1096
 #, no-c-format
-msgid "&Read only"
-msgstr "只读(&R)"
+msgid "bytes"
+msgstr "字节"
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 300
-#: rc.cpp:756
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1721
+#: rc.cpp:1081
 #, no-c-format
-msgid ""
-"If this is checked, then users of a service may not create or modify files in "
-"the service's directory."
+msgid "Write cache si&ze:"
+msgstr "写缓存大小(&Z)："
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1730
+#: rc.cpp:1084
+#, no-c-format
+msgid "manual"
+msgstr "手动"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1735
+#: rc.cpp:1087
+#, no-c-format
+msgid "documents"
+msgstr "文档"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1740
+#: rc.cpp:1090
+#, no-c-format
+msgid "programs"
+msgstr "程序"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1745
+#: rc.cpp:1093
+#, no-c-format
+msgid "disable"
+msgstr "禁用"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1804
+#: rc.cpp:1099
+#, no-c-format
+msgid "&Maximum number of simultaneous connections:"
+msgstr "同时连接的最大数(&M)："
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1828
+#: advanced/kcm_sambaconf/kcmsambaconf.cpp:304 rc.cpp:1102 rc.cpp:2017
+#, no-c-format
+msgid "Filenames"
+msgstr "文件名"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1876
+#: rc.cpp:1108
+#, no-c-format
+msgid "Hide traili&ng dot"
+msgstr "隐藏尾随句点(&N)"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1886
+#: rc.cpp:1111
+#, no-c-format
+msgid "DOS"
+msgstr "DOS"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1903
+#: rc.cpp:1114
+#, no-c-format
+msgid "&DOS file mode"
+msgstr "DOS 文件模式(&D)"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1911
+#: rc.cpp:1117
+#, no-c-format
+msgid "DOS f&ile times"
+msgstr "DOS 文件时间(&I)"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1919
+#: rc.cpp:1120
+#, no-c-format
+msgid "DOS file time resolution"
+msgstr "DOS 文件时间解析"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1972
+#: rc.cpp:1123
+#, no-c-format
+msgid "Name Mangling"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 312
-#: rc.cpp:759
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1995
+#: rc.cpp:1126
 #, no-c-format
-msgid "G&uests allowed"
-msgstr "允许访客(&U)"
+msgid "Mangling cha&r:"
+msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 318
-#: rc.cpp:762 rc.cpp:2240 rc.cpp:2279
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2066
+#: rc.cpp:1129
 #, no-c-format
-msgid ""
-"If this is checked , then no password is required to connect to the service. "
-"Privileges will be those of the guest account."
+msgid "Mangled ma&p:"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 333
-#: rc.cpp:765
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2098
+#: rc.cpp:1132
 #, no-c-format
-msgid ""
-"This is a username which will be used for access this directory if guests are "
-"allowed"
+msgid "Enable na&me mangling"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 347
-#: rc.cpp:768 rc.cpp:2565
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2114
+#: rc.cpp:1135
 #, no-c-format
-msgid "Other Options"
-msgstr "其它选项"
+msgid "Man&gle case"
+msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 371
-#: rc.cpp:774
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2130
+#: rc.cpp:1138
 #, no-c-format
-msgid ""
-"This controls whether this share is seen in the list of available shares in a "
-"net view and in the browse list."
+msgid "Mangling method:"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 394
-#: rc.cpp:780
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2139
+#: rc.cpp:1141
 #, no-c-format
-msgid ""
-"Checkbox lets you \\\"turn off\\\" a service. If not checked, then ALL attempts "
-"to connect to the service will fail. Such failures are logged."
+msgid "hash"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/konqinterface.ui line 435
-#: rc.cpp:783
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2144
+#: rc.cpp:1144
 #, no-c-format
-msgid "More Opt&ions"
-msgstr "更多选项(&I)"
+msgid "hash2"
+msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/expertuserdlg.ui line 16
-#: rc.cpp:786
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2172
+#: rc.cpp:1147
 #, no-c-format
-msgid "User Settings"
-msgstr "用户设置"
+msgid "Preser&ve case"
+msgstr "保留大小写(&V)"
 
-#. i18n: file ./advanced/kcm_sambaconf/expertuserdlg.ui line 38
-#: rc.cpp:789
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2191
+#: rc.cpp:1150
 #, no-c-format
-msgid "&Valid users:"
-msgstr "有效用户(&V)："
+msgid "Short pr&eserve case"
+msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/expertuserdlg.ui line 62
-#: rc.cpp:792
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2207
+#: rc.cpp:1153
 #, no-c-format
-msgid "&Admin users:"
-msgstr "管理用户(&A)："
+msgid "Defau&lt case:"
+msgstr "默认为(&L)："
 
-#. i18n: file ./advanced/kcm_sambaconf/expertuserdlg.ui line 86
-#: rc.cpp:795
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2216
+#: rc.cpp:1156
 #, no-c-format
-msgid "&Invalid users:"
-msgstr "无效用户(&I)："
+msgid "Lower"
+msgstr "小写"
 
-#. i18n: file ./advanced/kcm_sambaconf/expertuserdlg.ui line 202
-#: rc.cpp:804
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2221
+#: rc.cpp:1159
 #, no-c-format
-msgid "&Write list:"
-msgstr "写入列表(&W)："
+msgid "Upper"
+msgstr "大写"
 
-#. i18n: file ./advanced/kcm_sambaconf/expertuserdlg.ui line 231
-#: rc.cpp:807
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2247
+#: rc.cpp:1162 rc.cpp:1204
+#, fuzzy, no-c-format
+msgid "Automatic"
+msgstr "自动"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2293
+#: rc.cpp:1171
+#, fuzzy, no-c-format
+msgid "Case sensi&tive:"
+msgstr "区分大小写(&T)"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2306
+#: advanced/kcm_sambaconf/kcmsambaconf.cpp:307 rc.cpp:1174 rc.cpp:2041
 #, no-c-format
-msgid "&Read list:"
-msgstr "读取列表(&R)："
+msgid "Locking"
+msgstr "锁定"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2343
+#: rc.cpp:1177
+#, no-c-format
+msgid "Locki&ng"
+msgstr "锁定(&N)"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2360
+#: rc.cpp:1180
+#, no-c-format
+msgid "Issue oppo&rtunistic locks (oplocks) "
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2368
+#: rc.cpp:1183
+#, no-c-format
+msgid "O&plocks"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2411
+#: rc.cpp:1186
+#, no-c-format
+msgid "Oplock contention li&mit:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2422
+#: rc.cpp:1189
+#, no-c-format
+msgid "Le&vel2 oplocks"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2432
+#: rc.cpp:1192
+#, no-c-format
+msgid "Fak&e oplocks"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2443
+#: rc.cpp:1195
+#, no-c-format
+msgid "Share mo&des"
+msgstr "共享模式(&D)"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2451
+#: rc.cpp:1198
+#, no-c-format
+msgid "Posi&x locking"
+msgstr "Posix 锁定(&X)"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2467
+#: rc.cpp:1201
+#, fuzzy, no-c-format
+msgid "S&trict locking:"
+msgstr "严格锁定(&T)"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2525
+#: rc.cpp:1213
+#, no-c-format
+msgid "Blockin&g locks"
+msgstr "屏蔽锁定(&G)"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2535
+#: rc.cpp:1216
+#, no-c-format
+msgid "Enable lock&ing"
+msgstr "允许锁定(&I)"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2545
+#: rc.cpp:1219 rc.cpp:2514
+#, no-c-format
+msgid "VFS"
+msgstr "VFS"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2584
+#: rc.cpp:1222
+#, no-c-format
+msgid "Vfs ob&jects:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2595
+#: rc.cpp:1225
+#, no-c-format
+msgid "Vfs o&ptions:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2613
+#: rc.cpp:1228 rc.cpp:1303
+#, no-c-format
+msgid "Exec"
+msgstr "执行"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2630
+#: rc.cpp:1231
+#, no-c-format
+msgid "preexec c&lose"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2638
+#: rc.cpp:1234
+#, no-c-format
+msgid "root pree&xec close"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2663
+#: rc.cpp:1237
+#, no-c-format
+msgid "Pos&texec:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2674
+#: rc.cpp:1240
+#, no-c-format
+msgid "Root pr&eexec:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2685
+#: rc.cpp:1243
+#, no-c-format
+msgid "P&reexec:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2701
+#: rc.cpp:1246
+#, no-c-format
+msgid "Root &postexec:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2729
+#: advanced/kcm_sambaconf/kcmsambaconf.cpp:331 rc.cpp:1249 rc.cpp:2607
+#, no-c-format
+msgid "Misc"
+msgstr "杂类"
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2760
+#: rc.cpp:1252
+#, no-c-format
+msgid "Fst&ype:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2781
+#: rc.cpp:1255
+#, no-c-format
+msgid "Ma&gic script:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2792
+#: rc.cpp:1258
+#, no-c-format
+msgid "&Volume:"
+msgstr "卷(&V)："
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2808
+#: rc.cpp:1261
+#, no-c-format
+msgid "Mag&ic output:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2819
+#: rc.cpp:1264
+#, no-c-format
+msgid "Fa&ke directory create times"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2827
+#: rc.cpp:1267
+#, no-c-format
+msgid "Ms&dfs root"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2835
+#: rc.cpp:1270
+#, no-c-format
+msgid "Setdir command allo&wed"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2843
+#: rc.cpp:1273
+#, no-c-format
+msgid "Do &not descend:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2859
+#: rc.cpp:1276
+#, no-c-format
+msgid "Msdfs pro&xy:"
+msgstr ""
+
+#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 16
+#: rc.cpp:1291
+#, no-c-format
+msgid "Access Modifiers"
+msgstr "访问修饰"
+
+#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 34
+#: rc.cpp:1294
+#, no-c-format
+msgid "Access Permissions"
+msgstr "访问权限"
+
+#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 103
+#: rc.cpp:1297
+#, no-c-format
+msgid "Others"
+msgstr "其它"
+
+#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 115
+#: rc.cpp:1300
+#, no-c-format
+msgid "Read"
+msgstr "读取"
+
+#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 151
+#: rc.cpp:1306
+#, no-c-format
+msgid "Write"
+msgstr "写入"
+
+#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 283
+#: rc.cpp:1315
+#, no-c-format
+msgid "Sticky"
+msgstr "粘附"
+
+#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 295
+#: rc.cpp:1318
+#, no-c-format
+msgid "Set GID"
+msgstr "设置 GID"
+
+#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 307
+#: rc.cpp:1321
+#, no-c-format
+msgid "Set UID"
+msgstr "设置 UID"
+
+#. i18n: file ./advanced/kcm_sambaconf/filemodedlg.ui line 319
+#: rc.cpp:1324
+#, no-c-format
+msgid "Special"
+msgstr "特殊"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 73
-#: rc.cpp:810
+#: rc.cpp:1339
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -1452,92 +2247,92 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 117
-#: rc.cpp:830
+#: rc.cpp:1359
 #, no-c-format
 msgid "Samba config file:"
 msgstr "Samba 配置文件："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 136
-#: rc.cpp:833
+#: rc.cpp:1362
 #, no-c-format
 msgid "&Load"
 msgstr "装入(&L)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 150
-#: rc.cpp:836
+#: rc.cpp:1365
 #, no-c-format
 msgid "Server Identification"
 msgstr "服务器身份"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 171
-#: rc.cpp:839
+#: rc.cpp:1368
 #, no-c-format
 msgid "Wor&kgroup:"
 msgstr "工作组(&K)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 186
-#: rc.cpp:842
+#: rc.cpp:1371
 #, no-c-format
 msgid "Enter here the name of your workgroup/domain."
 msgstr "在此输入您工作组/域的名称。"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 216
-#: rc.cpp:845
+#: rc.cpp:1374
 #, no-c-format
 msgid "Server strin&g:"
 msgstr "服务器字符串(&G)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 231
-#: rc.cpp:848
+#: rc.cpp:1377
 #, no-c-format
 msgid "NetBIOS name:"
 msgstr "NetBIOS 名称："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 248
-#: rc.cpp:851
+#: rc.cpp:1380
 #, no-c-format
 msgid "Securit&y Level"
 msgstr "安全级别(&Y)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 283
-#: rc.cpp:854
+#: rc.cpp:1383
 #, no-c-format
 msgid "Share"
 msgstr "共享"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 286
-#: rc.cpp:857 rc.cpp:863 rc.cpp:869 rc.cpp:878 rc.cpp:932 rc.cpp:1026
-#: rc.cpp:1032 rc.cpp:1044 rc.cpp:1065 rc.cpp:1787
-#, no-c-format
-msgid "Alt+"
+#: rc.cpp:1386 rc.cpp:1392 rc.cpp:1398 rc.cpp:1407 rc.cpp:1461 rc.cpp:1555
+#: rc.cpp:1561 rc.cpp:1573 rc.cpp:1594 rc.cpp:2316
+#, fuzzy, no-c-format
+msgid "Alt+ "
 msgstr "Alt+"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 301
-#: rc.cpp:860
+#: rc.cpp:1389
 #, no-c-format
 msgid "User"
 msgstr "用户"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 316
-#: rc.cpp:866 rc.cpp:1206
+#: rc.cpp:1395 rc.cpp:1735
 #, no-c-format
 msgid "Server"
 msgstr "服务器"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 331
-#: rc.cpp:872
+#: rc.cpp:1401
 #, no-c-format
 msgid "Domai&n"
 msgstr "域(&N)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 343
-#: rc.cpp:875
+#: rc.cpp:1404
 #, no-c-format
 msgid "ADS"
 msgstr "ADS"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 368
-#: rc.cpp:881
+#: rc.cpp:1410
 #, no-c-format
 msgid ""
 "Use the <i>share</i> security level if you have a home network or a small "
@@ -1546,1349 +2341,1311 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 391
-#: rc.cpp:884
+#: rc.cpp:1413
 #, no-c-format
 msgid "Further Options"
 msgstr "更多选项"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 415
-#: rc.cpp:887
+#: rc.cpp:1416
 #, no-c-format
 msgid "Password server address/name:"
 msgstr "密码服务器地址/名称："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 441
-#: rc.cpp:890
+#: rc.cpp:1419
 #, no-c-format
 msgid "Real&m:"
 msgstr "域(&M)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 459
-#: rc.cpp:893
+#: rc.cpp:1422
 #, no-c-format
 msgid "Allo&w guest logins"
 msgstr "允许访客登录(&W)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 496
-#: rc.cpp:896
+#: rc.cpp:1425
 #, no-c-format
 msgid "Guest acc&ount:"
 msgstr "访客账户(&O)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 585
-#: rc.cpp:902
+#: rc.cpp:1431
 #, no-c-format
 msgid "For detailed help about every option please look at:"
 msgstr "要查看关于每个选项的详细帮助，请查看："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 604
-#: rc.cpp:905
+#: rc.cpp:1434
 #, no-c-format
 msgid "man:smb.conf"
 msgstr "man:smb.conf"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 650
-#: rc.cpp:908
+#: rc.cpp:1437
 #, no-c-format
 msgid "&Shares"
 msgstr "共享(&S)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 742
-#: rc.cpp:923
+#: rc.cpp:1452
 #, no-c-format
 msgid "Edit Defau&lts..."
 msgstr "编辑默认值(&L)..."
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 767
-#: rc.cpp:926
+#: rc.cpp:1455
 #, no-c-format
 msgid "Add &New Share..."
 msgstr "添加新共享(&N)..."
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 775
-#: rc.cpp:929
+#: rc.cpp:1458
 #, no-c-format
 msgid "Edit Share..."
 msgstr "编辑共享..."
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 786
-#: rc.cpp:935
+#: rc.cpp:1464
 #, no-c-format
 msgid "Re&move Share"
 msgstr "删除共享(&M)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 798
-#: rc.cpp:938
+#: rc.cpp:1467
 #, no-c-format
 msgid "Prin&ters"
 msgstr "打印机(&T)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 824
-#: rc.cpp:944
+#: rc.cpp:1473
 #, no-c-format
 msgid "Printer"
 msgstr "打印机"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 890
-#: rc.cpp:953
+#: rc.cpp:1482
 #, no-c-format
 msgid "Edit Defau&lts"
 msgstr "编辑默认值(&L)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 915
-#: rc.cpp:956
+#: rc.cpp:1485
 #, no-c-format
 msgid "Add Ne&w Printer"
 msgstr "添加新打印机(&W)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 923
-#: rc.cpp:959
+#: rc.cpp:1488
 #, no-c-format
 msgid "Edit Pri&nter"
 msgstr "编辑打印机(&N)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 931
-#: rc.cpp:962
+#: rc.cpp:1491
 #, no-c-format
 msgid "Re&move Printer"
 msgstr "删除打印机(&M)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 943
 #: advanced/kcm_sambaconf/printerdlgimpl.cpp:109
-#: advanced/kcm_sambaconf/sharedlgimpl.cpp:123 rc.cpp:965
+#: advanced/kcm_sambaconf/sharedlgimpl.cpp:123 rc.cpp:1494
 #, no-c-format
 msgid "&Users"
 msgstr "用户(&U)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 974
-#: rc.cpp:968
+#: rc.cpp:1497
 #, no-c-format
 msgid "Sa&mba Users"
 msgstr "Samba 用户(&M)"
 
+#. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1000
+#: rc.cpp:1503 rc.cpp:1524 rc.cpp:2682 rc.cpp:2721
+#, no-c-format
+msgid "UID"
+msgstr "UID"
+
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1011
-#: rc.cpp:977 rc.cpp:1185 rc.cpp:1221
+#: rc.cpp:1506 rc.cpp:1714 rc.cpp:1750
 #, no-c-format
 msgid "Disabled"
 msgstr "禁用"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1022
-#: rc.cpp:980
+#: rc.cpp:1509
 #, no-c-format
 msgid "No Password"
 msgstr "无密码"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1152
-#: rc.cpp:989
+#: rc.cpp:1518
 #, no-c-format
 msgid "UNI&X Users"
 msgstr "UNIX 用户(&X)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1222
-#: rc.cpp:998
+#: rc.cpp:1527
 #, no-c-format
 msgid "Chan&ge Password..."
 msgstr "更改密码(&G)..."
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1233
-#: rc.cpp:1001
+#: rc.cpp:1530
 #, no-c-format
 msgid "&Join Domain"
 msgstr "加入域(&J)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1262
-#: rc.cpp:1004
+#: rc.cpp:1533
 #, no-c-format
 msgid "Advan&ced"
 msgstr "高级(&C)"
 
-#. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1337
-#: rc.cpp:1007 rc.cpp:2351
-#, no-c-format
-msgid ""
-"Here you can change advanced options of the SAMBA server.\n"
-"Only change something if you know what you are doing."
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1349
-#: rc.cpp:1011 rc.cpp:2355
-#, no-c-format
-msgid "Advanced Dump"
-msgstr "高级转存"
-
-#. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1373
-#: advanced/kcm_sambaconf/kcmsambaconf.cpp:295 rc.cpp:1014 rc.cpp:2358
-#, no-c-format
-msgid "Security"
-msgstr "安全"
-
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1394
-#: rc.cpp:1017 rc.cpp:1377 rc.cpp:1515
+#: rc.cpp:1546 rc.cpp:1906 rc.cpp:2044
 #, no-c-format
 msgid "&General"
 msgstr "常规(&G)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1428
-#: rc.cpp:1020
+#: rc.cpp:1549
 #, no-c-format
 msgid "PAM"
 msgstr "PAM"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1449
-#: rc.cpp:1023
+#: rc.cpp:1552
 #, no-c-format
 msgid "Obey PAM restrictions"
 msgstr "遵从 PAM 限制"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1464
-#: rc.cpp:1029
+#: rc.cpp:1558
 #, no-c-format
 msgid "PAM password change"
 msgstr "PAM 密码更改"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1477
-#: rc.cpp:1035
+#: rc.cpp:1564
 #, no-c-format
 msgid "Other Switches"
 msgstr "其它开关"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1498
-#: rc.cpp:1038
+#: rc.cpp:1567
 #, no-c-format
 msgid "A&llow trusted domains"
 msgstr "允许信任的域(&L)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1506
-#: rc.cpp:1041
+#: rc.cpp:1570
 #, no-c-format
 msgid "Paranoid server security"
 msgstr "苛刻的服务器安全性"
 
-#. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1519
-#: rc.cpp:1047 rc.cpp:1245 rc.cpp:2487
-#, no-c-format
-msgid "General"
-msgstr "常规"
-
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1540
-#: rc.cpp:1050
+#: rc.cpp:1579
 #, no-c-format
 msgid "Auth methods:"
 msgstr "认证方式："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1555
-#: rc.cpp:1053
+#: rc.cpp:1582
 #, no-c-format
 msgid "Root director&y:"
 msgstr "根目录(&Y)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1566
-#: rc.cpp:1056
+#: rc.cpp:1585
 #, no-c-format
 msgid "I&nterfaces:"
 msgstr "接口(&N)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1589
-#: rc.cpp:1059
+#: rc.cpp:1588
 #, no-c-format
 msgid "Map to guest:"
 msgstr "访客映射："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1600
-#: rc.cpp:1062
+#: rc.cpp:1591
 #, no-c-format
 msgid "Bind interfaces only"
 msgstr "只绑定接口"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1609
-#: rc.cpp:1068
+#: rc.cpp:1597
 #, no-c-format
 msgid "Never"
 msgstr "从不"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1614
-#: rc.cpp:1071
+#: rc.cpp:1600
 #, no-c-format
 msgid "Bad User"
 msgstr "用户有错"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1619
-#: rc.cpp:1074
+#: rc.cpp:1603
 #, no-c-format
 msgid "Bad Password"
 msgstr "密码有错"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1635
-#: rc.cpp:1077
+#: rc.cpp:1606
 #, no-c-format
 msgid "Hosts e&quiv:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1692
-#: rc.cpp:1080
+#: rc.cpp:1609
 #, no-c-format
 msgid "Algorithmic rid base:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1746
-#: rc.cpp:1083
+#: rc.cpp:1612
 #, no-c-format
 msgid "Private dir:"
 msgstr "私有目录："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1770
-#: rc.cpp:1086
+#: rc.cpp:1615
 #, no-c-format
 msgid "Pass&word"
 msgstr "密码(&W)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1804
-#: rc.cpp:1089
+#: rc.cpp:1618
 #, no-c-format
 msgid "Migration"
 msgstr "升迁"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1825
-#: rc.cpp:1092
+#: rc.cpp:1621
 #, no-c-format
 msgid "Update encr&ypted"
 msgstr "加密更新(&Y)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1835
-#: rc.cpp:1095
+#: rc.cpp:1624
 #, no-c-format
 msgid "Samba Passwords"
 msgstr "Samba 密码"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1856
-#: rc.cpp:1098
+#: rc.cpp:1627
 #, no-c-format
 msgid "E&ncrypt passwords"
 msgstr "加密密码(&N)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1871
-#: rc.cpp:1101
+#: rc.cpp:1630
 #, no-c-format
 msgid "Smb passwd file:"
 msgstr "Smb 密码文件："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1895
-#: rc.cpp:1104
+#: rc.cpp:1633
 #, no-c-format
 msgid "Passdb bac&kend:"
 msgstr "Passdb 后端(&K)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1928
-#: rc.cpp:1107
+#: rc.cpp:1636
 #, no-c-format
 msgid "Passwd chat:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1943
-#: rc.cpp:1110
+#: rc.cpp:1639
 #, no-c-format
 msgid "Passwd chat debug"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1951
-#: rc.cpp:1113 rc.cpp:1131 rc.cpp:1326 rc.cpp:1332 rc.cpp:1344 rc.cpp:1347
-#: rc.cpp:1464 rc.cpp:1467 rc.cpp:1772 rc.cpp:1886 rc.cpp:1931
+#: rc.cpp:1642 rc.cpp:1660 rc.cpp:1855 rc.cpp:1861 rc.cpp:1873 rc.cpp:1876
+#: rc.cpp:1993 rc.cpp:1996 rc.cpp:2301 rc.cpp:2415 rc.cpp:2460
 #, no-c-format
 msgid "Sec"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1964
-#: rc.cpp:1116
+#: rc.cpp:1645
 #, no-c-format
 msgid "Passwd chat timeout:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 1985
-#: rc.cpp:1119
+#: rc.cpp:1648
 #, no-c-format
 msgid "Password"
 msgstr "密码"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2006
-#: rc.cpp:1122
+#: rc.cpp:1651
 #, no-c-format
 msgid "Password level:"
 msgstr "密码级别："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2021
-#: rc.cpp:1125
+#: rc.cpp:1654
 #, no-c-format
 msgid "Min password length:"
 msgstr "最小密码长度："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2032
-#: rc.cpp:1128
+#: rc.cpp:1657
 #, no-c-format
 msgid "Machine password timeout:"
 msgstr "计算机密码超时："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2093
-#: rc.cpp:1134
+#: rc.cpp:1663
 #, no-c-format
 msgid "Nu&ll passwords"
 msgstr "空密码(&L)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2115
-#: rc.cpp:1137
+#: rc.cpp:1666
 #, no-c-format
 msgid "UNIX Passwords"
 msgstr "UNIX 密码"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2136
-#: rc.cpp:1140
+#: rc.cpp:1669
 #, no-c-format
 msgid "Passwd program:"
 msgstr "Passwd 程序："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2160
-#: rc.cpp:1143
+#: rc.cpp:1672
 #, no-c-format
 msgid "UNI&X password sync"
 msgstr "UNIX 密码同步(&X)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2172
-#: rc.cpp:1146
+#: rc.cpp:1675
 #, no-c-format
 msgid "Userna&me"
 msgstr "用户名(&M)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2193
-#: rc.cpp:1149
+#: rc.cpp:1678
 #, no-c-format
 msgid "User&name map:"
 msgstr "用户名映射(&N)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2217
-#: rc.cpp:1152
+#: rc.cpp:1681
 #, no-c-format
 msgid "Username &level:"
 msgstr "用户名级别(&L)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2261
-#: rc.cpp:1155
+#: rc.cpp:1684
 #, no-c-format
 msgid "Hide local users"
 msgstr "隐藏本地用户"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2273
-#: rc.cpp:1158
+#: rc.cpp:1687
 #, no-c-format
 msgid "Restrict anon&ymous"
 msgstr "限制匿名(&Y)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2285
-#: rc.cpp:1161
+#: rc.cpp:1690
 #, no-c-format
 msgid "Use rhosts"
 msgstr "使用 rhosts"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2312
-#: rc.cpp:1164
+#: rc.cpp:1693
 #, no-c-format
 msgid "Authenticati&on"
 msgstr "身份验证(&O)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2329
-#: rc.cpp:1167
+#: rc.cpp:1696
 #, no-c-format
 msgid "Client"
 msgstr "客户"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2346
-#: rc.cpp:1170
+#: rc.cpp:1699
 #, no-c-format
 msgid "C&lient signing:"
 msgstr "客户签名(&L)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2361
-#: rc.cpp:1173
+#: rc.cpp:1702
 #, no-c-format
 msgid "Client plainte&xt authentication"
 msgstr "客户纯文本验证(&X)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2373
-#: rc.cpp:1176
+#: rc.cpp:1705
 #, no-c-format
 msgid "Client lanman authentication"
 msgstr "客户 lanman 身份验证"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2379
-#: rc.cpp:1179 rc.cpp:1194 rc.cpp:1215 rc.cpp:1230 rc.cpp:1898 rc.cpp:1943
+#: rc.cpp:1708 rc.cpp:1723 rc.cpp:1744 rc.cpp:1759 rc.cpp:2427 rc.cpp:2472
 #, no-c-format
 msgid "Auto"
 msgstr "自动"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2384
-#: rc.cpp:1182 rc.cpp:1218
+#: rc.cpp:1711 rc.cpp:1747
 #, no-c-format
 msgid "Mandatory"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2421
-#: rc.cpp:1197
+#: rc.cpp:1726
 #, no-c-format
 msgid "Client channel:"
 msgstr "客户频道："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2436
-#: rc.cpp:1200
+#: rc.cpp:1729
 #, no-c-format
 msgid "Client use spnego"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2448
-#: rc.cpp:1203
+#: rc.cpp:1732
 #, no-c-format
 msgid "Client NTLMv&2 authentication"
 msgstr "客户 NTLMv2 身份验证(&2)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2492
-#: rc.cpp:1209
+#: rc.cpp:1738
 #, no-c-format
 msgid "Server signing:"
 msgstr "服务器签名"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2507
-#: rc.cpp:1212
+#: rc.cpp:1741
 #, no-c-format
 msgid "Lanman authentication"
 msgstr "Lanman 身份验证"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2555
-#: rc.cpp:1233
+#: rc.cpp:1762
 #, no-c-format
 msgid "Server channel:"
 msgstr "服务器频道："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2570
-#: rc.cpp:1236
+#: rc.cpp:1765
 #, no-c-format
 msgid "Use sp&nego"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2582
-#: rc.cpp:1239
+#: rc.cpp:1768
 #, no-c-format
 msgid "NTLM authentication"
 msgstr "NTLM 身份验证"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2631
-#: advanced/kcm_sambaconf/kcmsambaconf.cpp:298 rc.cpp:1242
+#: advanced/kcm_sambaconf/kcmsambaconf.cpp:298 rc.cpp:1771
 #, no-c-format
 msgid "Logging"
 msgstr "日志"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2693
-#: rc.cpp:1248
+#: rc.cpp:1777
 #, no-c-format
 msgid "L&og file:"
 msgstr "日志文件(&O)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2709
-#: rc.cpp:1251
+#: rc.cpp:1780
 #, no-c-format
 msgid "KB"
 msgstr "KB"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2717
-#: rc.cpp:1254
+#: rc.cpp:1783
 #, no-c-format
 msgid "Ma&x log size:"
 msgstr "最大日志大小(&X)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2745
-#: rc.cpp:1257
+#: rc.cpp:1786
 #, no-c-format
 msgid "S&yslog:"
 msgstr "系统日志(&Y)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2778
-#: rc.cpp:1260
+#: rc.cpp:1789
 #, no-c-format
 msgid "Log &level:"
 msgstr "日志级别(&L)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2804
-#: rc.cpp:1263 rc.cpp:1407 rc.cpp:1775
+#: rc.cpp:1792 rc.cpp:1936 rc.cpp:2304
 #, no-c-format
 msgid "S&witches"
 msgstr "开关(&W)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2829
-#: rc.cpp:1266
+#: rc.cpp:1795
 #, no-c-format
 msgid "Syslog o&nly"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2837
-#: rc.cpp:1269
+#: rc.cpp:1798
 #, no-c-format
 msgid "Status"
 msgstr "状态"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2856
-#: rc.cpp:1272
+#: rc.cpp:1801
 #, no-c-format
 msgid "Ti&mestamp"
 msgstr "时间戳(&M)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2870
-#: rc.cpp:1275 rc.cpp:1533
+#: rc.cpp:1804 rc.cpp:2062
 #, no-c-format
 msgid "microseconds"
 msgstr "毫秒"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2886
-#: rc.cpp:1278
+#: rc.cpp:1807
 #, no-c-format
 msgid "Debug pid"
 msgstr "调试 pid"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2894
-#: rc.cpp:1281
+#: rc.cpp:1810
 #, no-c-format
 msgid "Debu&g uid"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2925
-#: advanced/kcm_sambaconf/kcmsambaconf.cpp:301 rc.cpp:1284 rc.cpp:2517
-#, no-c-format
-msgid "Tuning"
-msgstr ""
-
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2942
-#: rc.cpp:1287
+#: rc.cpp:1816
 #, no-c-format
 msgid "Modules"
 msgstr "模块"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2959
-#: rc.cpp:1290
+#: rc.cpp:1819
 #, no-c-format
 msgid "Pre&load modules:"
 msgstr "预载模块(&L)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2977
-#: rc.cpp:1293
+#: rc.cpp:1822
 #, no-c-format
 msgid "Numbers"
 msgstr "数字"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 2994
-#: rc.cpp:1296
+#: rc.cpp:1825
 #, no-c-format
 msgid "Max smbd processes:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3005
-#: rc.cpp:1299
+#: rc.cpp:1828
 #, no-c-format
 msgid "Max open files:"
 msgstr "打开的最多文件数："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3068
-#: rc.cpp:1302
+#: rc.cpp:1831
 #, no-c-format
 msgid "Sizes"
 msgstr "大小"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3085
-#: rc.cpp:1305
+#: rc.cpp:1834
 #, no-c-format
 msgid "Max disk size:"
 msgstr "最大的磁盘大小："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3096
-#: rc.cpp:1308
+#: rc.cpp:1837
 #, no-c-format
 msgid "Read si&ze:"
 msgstr "读取大小(&Z)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3107
-#: rc.cpp:1311
+#: rc.cpp:1840
 #, no-c-format
 msgid "Stat cache size:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3159
-#: rc.cpp:1314
+#: rc.cpp:1843
 #, no-c-format
 msgid "MB"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3183
-#: rc.cpp:1317
+#: rc.cpp:1846
 #, no-c-format
 msgid "Ma&x xmit:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3196
-#: rc.cpp:1320
+#: rc.cpp:1849
 #, no-c-format
 msgid "Times"
 msgstr "次数"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3213
-#: rc.cpp:1323
+#: rc.cpp:1852
 #, no-c-format
 msgid "Change notify timeout:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3233
-#: rc.cpp:1329
+#: rc.cpp:1858
 #, no-c-format
 msgid "&Keepalive:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3269
-#: rc.cpp:1335 rc.cpp:2099
+#: rc.cpp:1864 rc.cpp:2628
 #, no-c-format
 msgid "Min"
 msgstr "最小"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3278
-#: rc.cpp:1338
+#: rc.cpp:1867
 #, no-c-format
 msgid "Deadtime:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3297
-#: rc.cpp:1341
+#: rc.cpp:1870
 #, no-c-format
 msgid "Lp&q cache time:"
 msgstr "Lpq 缓存时间(&Q)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3334
-#: rc.cpp:1350
+#: rc.cpp:1879
 #, no-c-format
 msgid "&Name cache timeout:"
 msgstr "名称缓存超时(&N)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3355
-#: rc.cpp:1353
+#: rc.cpp:1882
 #, no-c-format
 msgid "Switches"
 msgstr "开关"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3372
-#: rc.cpp:1356
+#: rc.cpp:1885
 #, no-c-format
 msgid "&Getwd cache"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3380
-#: rc.cpp:1359
+#: rc.cpp:1888
 #, no-c-format
 msgid "Use &mmap"
 msgstr "使用 mmap(&M)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3388
-#: rc.cpp:1362
+#: rc.cpp:1891
 #, no-c-format
 msgid "Kernel change notif&y"
 msgstr "内核更改通知(&Y)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3396
-#: rc.cpp:1365
+#: rc.cpp:1894
 #, no-c-format
 msgid "H&ostname lookups"
 msgstr "主机名查阅(&O)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3408
-#: rc.cpp:1368
+#: rc.cpp:1897
 #, no-c-format
 msgid "Read ra&w"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3423
-#: rc.cpp:1371
+#: rc.cpp:1900
 #, no-c-format
 msgid "Write raw"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3438
-#: advanced/kcm_sambaconf/kcmsambaconf.cpp:310 rc.cpp:1374
+#: advanced/kcm_sambaconf/kcmsambaconf.cpp:310 rc.cpp:1903
 #, no-c-format
 msgid "Printing"
 msgstr "打印"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3472
-#: rc.cpp:1380
+#: rc.cpp:1909
 #, no-c-format
 msgid "Total print &jobs:"
 msgstr "总计打印任务(&J)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3510
-#: rc.cpp:1383
+#: rc.cpp:1912
 #, no-c-format
 msgid "Drivers"
 msgstr "驱动程序"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3527
-#: rc.cpp:1386
+#: rc.cpp:1915
 #, no-c-format
 msgid "OS&2 driver map:"
 msgstr "OS2 驱动映射(&2)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3538
-#: rc.cpp:1389
+#: rc.cpp:1918
 #, no-c-format
 msgid "Printcap na&me:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3564
-#: rc.cpp:1392
+#: rc.cpp:1921
 #, no-c-format
 msgid "Pri&nter driver file: "
 msgstr "打印机驱动程序文件(&N)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3582
-#: advanced/kcm_sambaconf/kcmsambaconf.cpp:334 rc.cpp:1395 rc.cpp:2051
+#: advanced/kcm_sambaconf/kcmsambaconf.cpp:334 rc.cpp:1924 rc.cpp:2580
 #, no-c-format
 msgid "Commands"
 msgstr "命令"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3599
-#: rc.cpp:1398
+#: rc.cpp:1927
 #, no-c-format
 msgid "Enumports command:"
 msgstr "穷举端口命令："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3610
-#: rc.cpp:1401
+#: rc.cpp:1930
 #, no-c-format
 msgid "Addprinter command:"
 msgstr "添加打印机命令："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3621
-#: rc.cpp:1404
+#: rc.cpp:1933
 #, no-c-format
 msgid "Deleteprinter command:"
 msgstr "删除打印机命令："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3666
-#: rc.cpp:1410
+#: rc.cpp:1939
 #, no-c-format
 msgid "L&oad printers"
 msgstr "装入打印机(&O)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3674
-#: rc.cpp:1413
+#: rc.cpp:1942
 #, no-c-format
 msgid "Disab&le spools"
 msgstr "禁用 spool(&L)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3682
-#: rc.cpp:1416
+#: rc.cpp:1945
 #, no-c-format
 msgid "Show add printer wi&zard"
 msgstr "显示添加打印机向导(&Z)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3711
-#: rc.cpp:1419
+#: rc.cpp:1948
 #, no-c-format
 msgid "Domain"
 msgstr "域"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3769
-#: rc.cpp:1422
+#: rc.cpp:1951
 #, no-c-format
 msgid "L&ocal master"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3777
-#: rc.cpp:1425
+#: rc.cpp:1954
 #, no-c-format
 msgid "Domai&n master"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3785
-#: rc.cpp:1428
+#: rc.cpp:1957
 #, no-c-format
 msgid "Domain lo&gons"
 msgstr "域登录(&G)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3801
-#: rc.cpp:1431
+#: rc.cpp:1960
 #, no-c-format
 msgid "Preferred &master"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3834
-#: rc.cpp:1434
+#: rc.cpp:1963
 #, no-c-format
 msgid "OS &level:"
 msgstr "操作系统级别(&L)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3849
-#: rc.cpp:1437
+#: rc.cpp:1966
 #, no-c-format
 msgid "Domain admin group:"
 msgstr "域管理员组："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3864
-#: rc.cpp:1440
+#: rc.cpp:1969
 #, no-c-format
 msgid "Domain guest group:"
 msgstr "与访客组："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3887
-#: rc.cpp:1443
+#: rc.cpp:1972
 #, no-c-format
 msgid "WINS"
 msgstr "WINS"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3930
-#: rc.cpp:1446
+#: rc.cpp:1975
 #, no-c-format
 msgid "Deactivate &WINS"
 msgstr "禁用 &WINS"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3944
-#: rc.cpp:1449
+#: rc.cpp:1978
 #, no-c-format
 msgid "Act as a WI&NS server"
 msgstr "作为 WINS 服务器(&N)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3952
-#: rc.cpp:1452
+#: rc.cpp:1981
 #, no-c-format
 msgid "Use an&other WINS server"
 msgstr "使用另外一台 WINS 服务器(&O)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3965
-#: rc.cpp:1455
+#: rc.cpp:1984
 #, no-c-format
 msgid "WINS Server Settin&gs"
 msgstr "WINS 服务器设置(&G)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 3986
-#: rc.cpp:1458
+#: rc.cpp:1987
 #, no-c-format
 msgid "Max WINS tt&l:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4001
-#: rc.cpp:1461
+#: rc.cpp:1990
 #, no-c-format
 msgid "&Min WINS ttl:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4078
-#: rc.cpp:1470
+#: rc.cpp:1999
 #, no-c-format
 msgid "WINS hoo&k:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4100
-#: rc.cpp:1473
+#: rc.cpp:2002
 #, no-c-format
 msgid "DNS prox&y"
 msgstr "DNS 代理(&Y)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4116
-#: rc.cpp:1476
+#: rc.cpp:2005
 #, no-c-format
 msgid "WINS Server IP or DNS Name"
 msgstr "WINS 服务器 IP 或 DNS 名称"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4143
-#: rc.cpp:1479
+#: rc.cpp:2008
 #, no-c-format
 msgid "General Options"
 msgstr "常规选项"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4160
-#: rc.cpp:1482
+#: rc.cpp:2011
 #, no-c-format
 msgid "WINS partners:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4187
-#: rc.cpp:1485
+#: rc.cpp:2014
 #, no-c-format
 msgid "WINS pro&xy"
 msgstr "WINS 代理(&X)"
 
-#. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4219
-#: advanced/kcm_sambaconf/kcmsambaconf.cpp:304 rc.cpp:1488 rc.cpp:2562
-#, no-c-format
-msgid "Filenames"
-msgstr "文件名"
-
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4236
-#: rc.cpp:1491
+#: rc.cpp:2020
 #, no-c-format
 msgid "Ge&neral"
 msgstr "常规(&N)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4253
-#: rc.cpp:1494
+#: rc.cpp:2023
 #, no-c-format
 msgid "Strip d&ot"
 msgstr "去掉点(&O)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4263
-#: rc.cpp:1497
+#: rc.cpp:2026
 #, no-c-format
 msgid "&Mangling"
 msgstr "管制(&M)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4304
-#: rc.cpp:1500
+#: rc.cpp:2029
 #, no-c-format
 msgid "Mangled stac&k:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4323
-#: rc.cpp:1503
+#: rc.cpp:2032
 #, no-c-format
 msgid "Mangle prefi&x:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4364
-#: rc.cpp:1506
+#: rc.cpp:2035
 #, no-c-format
 msgid "Specia&l"
 msgstr "特殊(&L)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4381
-#: rc.cpp:1509
+#: rc.cpp:2038
 #, no-c-format
 msgid "Stat cache"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4410
-#: advanced/kcm_sambaconf/kcmsambaconf.cpp:307 rc.cpp:1512 rc.cpp:2634
-#, no-c-format
-msgid "Locking"
-msgstr "锁定"
-
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4444
-#: rc.cpp:1518
+#: rc.cpp:2047
 #, no-c-format
 msgid "Use ker&nel oplocks"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4454
-#: rc.cpp:1521
+#: rc.cpp:2050
 #, no-c-format
 msgid "Direct&ories"
 msgstr "目录(&O)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4471
-#: rc.cpp:1524
+#: rc.cpp:2053
 #, no-c-format
 msgid "Loc&k directory:"
 msgstr "锁定目录(&K)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4487
-#: rc.cpp:1527
+#: rc.cpp:2056
 #, no-c-format
 msgid "Pid director&y:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4505
-#: rc.cpp:1530
+#: rc.cpp:2059
 #, no-c-format
 msgid "Lock Spin"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4546
-#: rc.cpp:1536
+#: rc.cpp:2065
 #, no-c-format
 msgid "&Lock spin count:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4557
-#: rc.cpp:1539
+#: rc.cpp:2068
 #, no-c-format
 msgid "Lock spin ti&me:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4587
-#: rc.cpp:1542
+#: rc.cpp:2071
 #, no-c-format
 msgid "Very Advanced"
 msgstr "非常高级"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4608
-#: rc.cpp:1545
+#: rc.cpp:2074
 #, no-c-format
 msgid "Oplock break &wait time:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4630
-#: rc.cpp:1548 rc.cpp:2030
+#: rc.cpp:2077 rc.cpp:2559
 #, no-c-format
 msgid "milliseconds"
 msgstr "毫秒"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4676
-#: advanced/kcm_sambaconf/kcmsambaconf.cpp:319 rc.cpp:1551
+#: advanced/kcm_sambaconf/kcmsambaconf.cpp:319 rc.cpp:2080
 #, no-c-format
 msgid "Charset"
 msgstr "字符集"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4693
-#: rc.cpp:1554
+#: rc.cpp:2083
 #, no-c-format
 msgid "Samba &3.x"
 msgstr "Samba 3.x(&3)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4714
-#: rc.cpp:1557
+#: rc.cpp:2086
 #, no-c-format
 msgid "D&OS charset:"
 msgstr "DOS 字符集(&O)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4738
-#: rc.cpp:1560
+#: rc.cpp:2089
 #, no-c-format
 msgid "UNI&X charset:"
 msgstr "UNIX 字符集(&X)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4762
-#: rc.cpp:1563
+#: rc.cpp:2092
 #, no-c-format
 msgid "Displa&y charset:"
 msgstr "显示字符集(&Y)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4782
-#: rc.cpp:1566
+#: rc.cpp:2095
 #, no-c-format
 msgid "U&nicode"
 msgstr "Unicode(&N)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4792
-#: rc.cpp:1569
+#: rc.cpp:2098
 #, no-c-format
 msgid "Samba &2.x"
 msgstr "Samba 2.x(&2)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4809
-#: rc.cpp:1572
+#: rc.cpp:2101
 #, no-c-format
 msgid "Character set:"
 msgstr "字符集："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4834
-#: rc.cpp:1575
+#: rc.cpp:2104
 #, no-c-format
 msgid "Va&lid chars:"
 msgstr "有效字符(&L)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4863
-#: rc.cpp:1578
+#: rc.cpp:2107
 #, no-c-format
 msgid "Code page directory:"
 msgstr "代码页目录："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4887
-#: rc.cpp:1581
+#: rc.cpp:2110
 #, no-c-format
 msgid "Codin&g system:"
 msgstr "编码系统(&G)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4902
-#: rc.cpp:1584
+#: rc.cpp:2113
 #, no-c-format
 msgid "Client code page:"
 msgstr "客户代码页："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4934
-#: advanced/kcm_sambaconf/kcmsambaconf.cpp:313 rc.cpp:1587 rc.cpp:1632
+#: advanced/kcm_sambaconf/kcmsambaconf.cpp:313 rc.cpp:2116 rc.cpp:2161
 #, no-c-format
 msgid "Logon"
 msgstr "登录"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4951
-#: rc.cpp:1590
+#: rc.cpp:2119
 #, no-c-format
 msgid "Add Scripts"
 msgstr "添加脚本"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4968
-#: rc.cpp:1593
+#: rc.cpp:2122
 #, no-c-format
 msgid "Add user script:"
 msgstr "添加用户脚本："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4984
-#: rc.cpp:1596
+#: rc.cpp:2125
 #, no-c-format
 msgid "Add user to group script:"
 msgstr "将用户添加到组脚本："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 4995
-#: rc.cpp:1599
+#: rc.cpp:2128
 #, no-c-format
 msgid "Add gr&oup script:"
 msgstr "添加组脚本(&O)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5016
-#: rc.cpp:1602
+#: rc.cpp:2131
 #, no-c-format
 msgid "Add machine script:"
 msgstr "添加计算机脚本："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5051
-#: rc.cpp:1605
+#: rc.cpp:2134
 #, no-c-format
 msgid "Delete Scripts"
 msgstr "删除脚本"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5083
-#: rc.cpp:1608
+#: rc.cpp:2137
 #, no-c-format
 msgid "Delete group script:"
 msgstr "删除组脚本："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5094
-#: rc.cpp:1611
+#: rc.cpp:2140
 #, no-c-format
 msgid "Delete user script:"
 msgstr "删除用户脚本："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5105
-#: rc.cpp:1614
+#: rc.cpp:2143
 #, no-c-format
 msgid "Delete user from group script:"
 msgstr "从组中删除用户脚本："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5118
-#: rc.cpp:1617
+#: rc.cpp:2146
 #, no-c-format
 msgid "Primary Group Script"
 msgstr "主要组脚本"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5135
-#: rc.cpp:1620
+#: rc.cpp:2149
 #, no-c-format
 msgid "Set primar&y group script:"
 msgstr "设置主要组脚本(&Y)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5153
-#: rc.cpp:1623
+#: rc.cpp:2152
 #, no-c-format
 msgid "Shutdown"
 msgstr "关机"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5170
-#: rc.cpp:1626
+#: rc.cpp:2155
 #, no-c-format
 msgid "Shutdo&wn script:"
 msgstr "关机脚本(&W)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5181
-#: rc.cpp:1629
+#: rc.cpp:2158
 #, no-c-format
 msgid "Abort shutdown script:"
 msgstr "中断关机脚本："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5221
-#: rc.cpp:1635
+#: rc.cpp:2164
 #, no-c-format
 msgid "Logo&n path:"
 msgstr "登录路径(&N)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5237
-#: rc.cpp:1638
+#: rc.cpp:2167
 #, no-c-format
 msgid "Logon ho&me:"
 msgstr "登录主目录(&M)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5253
-#: rc.cpp:1641
+#: rc.cpp:2170
 #, no-c-format
 msgid "&Logon drive:"
 msgstr "登录驱动器(&L)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5269
-#: rc.cpp:1644
+#: rc.cpp:2173
 #, no-c-format
 msgid "Lo&gon script:"
 msgstr "登录脚本(&G)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5289
-#: advanced/kcm_sambaconf/kcmsambaconf.cpp:322 rc.cpp:1647
+#: advanced/kcm_sambaconf/kcmsambaconf.cpp:322 rc.cpp:2176
 #, no-c-format
 msgid "Socket"
 msgstr "套接字"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5320
-#: rc.cpp:1650
+#: rc.cpp:2179
 #, no-c-format
 msgid "Socket address:"
 msgstr "套接字地址："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5355
-#: rc.cpp:1656
+#: rc.cpp:2185
 #, no-c-format
 msgid "SO_&KEEPALIVE"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5363
-#: rc.cpp:1659
+#: rc.cpp:2188
 #, no-c-format
 msgid "SO_S&NDBUF:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5401
-#: rc.cpp:1665
+#: rc.cpp:2194
 #, no-c-format
 msgid "TCP_NODELA&Y"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5417
-#: rc.cpp:1671
+#: rc.cpp:2200
 #, no-c-format
 msgid "SO_RCV&LOWAT:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5425
-#: rc.cpp:1674
+#: rc.cpp:2203
 #, no-c-format
 msgid "S&O_REUSEADDR"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5433
-#: rc.cpp:1677
+#: rc.cpp:2206
 #, no-c-format
 msgid "SO_SNDLO&WAT:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5452
-#: rc.cpp:1680
+#: rc.cpp:2209
 #, no-c-format
 msgid "IPTOS_THROU&GHPUT"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5517
-#: advanced/kcm_sambaconf/kcmsambaconf.cpp:325 rc.cpp:1686
+#: advanced/kcm_sambaconf/kcmsambaconf.cpp:325 rc.cpp:2215
 #, no-c-format
 msgid "SSL"
 msgstr "SSL"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5534
-#: rc.cpp:1689
+#: rc.cpp:2218
 #, no-c-format
 msgid "E&nable SSL"
 msgstr "启用 SSL(&N)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5537
-#: rc.cpp:1692
+#: rc.cpp:2221
 #, no-c-format
 msgid "Enables or disables the entire SSL mode"
 msgstr "启用或禁用整个 SSL 模式"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5542
-#: rc.cpp:1695
+#: rc.cpp:2224
 #, no-c-format
 msgid ""
 "This enables or disables the entire SSL mode. If it is set to no, the "
@@ -2901,1546 +3658,790 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5587
-#: rc.cpp:1700
+#: rc.cpp:2229
 #, no-c-format
 msgid "SSL h&osts:"
 msgstr "SSL 主机(&O)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5617
-#: rc.cpp:1703
+#: rc.cpp:2232
 #, no-c-format
 msgid "SSL entrop&y bytes:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5658
-#: rc.cpp:1706
+#: rc.cpp:2235
 #, no-c-format
 msgid "SSL ciphers:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5669
-#: rc.cpp:1709
+#: rc.cpp:2238
 #, no-c-format
 msgid "SSL hosts resi&gn:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5692
-#: rc.cpp:1712
+#: rc.cpp:2241
 #, no-c-format
 msgid "ssl2"
 msgstr "ssl2"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5697
-#: rc.cpp:1715
+#: rc.cpp:2244
 #, no-c-format
 msgid "ssl3"
 msgstr "ssl3"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5702
-#: rc.cpp:1718
+#: rc.cpp:2247
 #, no-c-format
 msgid "ssl2or3"
 msgstr "ssl2or3"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5707
-#: rc.cpp:1721
+#: rc.cpp:2250
 #, no-c-format
 msgid "tls1"
 msgstr "tls1"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5719
-#: rc.cpp:1724
+#: rc.cpp:2253
 #, no-c-format
 msgid "SSL co&mpatibility"
 msgstr "SSL 兼容性(&M)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5746
-#: rc.cpp:1727
+#: rc.cpp:2256
 #, no-c-format
 msgid "SSL CA certDir:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5762
-#: rc.cpp:1730
+#: rc.cpp:2259
 #, no-c-format
 msgid "SSL entropy file:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5773
-#: rc.cpp:1733
+#: rc.cpp:2262
 #, no-c-format
 msgid "SSL egd socket:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5784
-#: rc.cpp:1736
+#: rc.cpp:2265
 #, no-c-format
 msgid "SSL version:"
 msgstr "SSL 版本："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5800
-#: rc.cpp:1739
+#: rc.cpp:2268
 #, no-c-format
 msgid "SSL CA certFile:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5832
-#: rc.cpp:1742
+#: rc.cpp:2271
 #, no-c-format
 msgid "SSL require clientcert"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5840
-#: rc.cpp:1745
+#: rc.cpp:2274
 #, no-c-format
 msgid "SSL client key:"
 msgstr "SSL 客户密钥："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5851
-#: rc.cpp:1748
+#: rc.cpp:2277
 #, no-c-format
 msgid "SSL re&quire servercert"
 msgstr "SSL 请求服务器证书(&Q)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5864
-#: rc.cpp:1751
+#: rc.cpp:2280
 #, no-c-format
 msgid "SS&L server cert:"
 msgstr "SSL 服务器证书(&L)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5875
-#: rc.cpp:1754
+#: rc.cpp:2283
 #, no-c-format
 msgid "SSL client cert:"
 msgstr "SSL 客户证书："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5896
-#: rc.cpp:1757
+#: rc.cpp:2286
 #, no-c-format
 msgid "SSL server &key:"
 msgstr "SSL 服务器密钥(&K)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5930
-#: advanced/kcm_sambaconf/kcmsambaconf.cpp:316 rc.cpp:1760
+#: advanced/kcm_sambaconf/kcmsambaconf.cpp:316 rc.cpp:2289
 #, no-c-format
 msgid "Protocol"
 msgstr "协议"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5964
-#: rc.cpp:1763
+#: rc.cpp:2292
 #, no-c-format
 msgid "Limits"
 msgstr "限制"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 5996
-#: rc.cpp:1766
+#: rc.cpp:2295
 #, no-c-format
 msgid "Ma&x mux:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6011
-#: rc.cpp:1769
+#: rc.cpp:2298
 #, no-c-format
 msgid "Max tt&l:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6078
-#: rc.cpp:1778
+#: rc.cpp:2307
 #, no-c-format
 msgid "Ti&me server"
 msgstr "时间服务器(&M)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6086
-#: rc.cpp:1781
+#: rc.cpp:2310
 #, no-c-format
 msgid "Lar&ge readwrite"
 msgstr "大读写(&G)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6094
-#: rc.cpp:1784
+#: rc.cpp:2313
 #, no-c-format
 msgid "UNIX extensions"
 msgstr "UNIX 扩展"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6109
-#: rc.cpp:1790
+#: rc.cpp:2319
 #, no-c-format
 msgid "Read bmpx"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6119
-#: rc.cpp:1793
+#: rc.cpp:2322
 #, no-c-format
 msgid "Protocol Versions"
 msgstr "协议版本"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6136
-#: rc.cpp:1796
+#: rc.cpp:2325
 #, no-c-format
 msgid "Max protocol:"
 msgstr "最大协议："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6147
-#: rc.cpp:1799
+#: rc.cpp:2328
 #, no-c-format
 msgid "Announce version:"
 msgstr "发布版本："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6158
-#: rc.cpp:1802
+#: rc.cpp:2331
 #, no-c-format
 msgid "A&nnounce as:"
 msgstr "发布为(&N)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6169
-#: rc.cpp:1805
+#: rc.cpp:2334
 #, no-c-format
 msgid "Min protocol:"
 msgstr "最小协议："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6180
-#: rc.cpp:1808
+#: rc.cpp:2337
 #, no-c-format
 msgid "Pr&otocol:"
 msgstr "协议(&O)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6206
-#: rc.cpp:1811 rc.cpp:1826 rc.cpp:1841
+#: rc.cpp:2340 rc.cpp:2355 rc.cpp:2370
 #, no-c-format
 msgid "NT1"
 msgstr "NT1"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6211
-#: rc.cpp:1814 rc.cpp:1829 rc.cpp:1844
+#: rc.cpp:2343 rc.cpp:2358 rc.cpp:2373
 #, no-c-format
 msgid "LANMAN2"
 msgstr "LANMAN2"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6216
-#: rc.cpp:1817 rc.cpp:1832 rc.cpp:1847
+#: rc.cpp:2346 rc.cpp:2361 rc.cpp:2376
 #, no-c-format
 msgid "LANMAN1"
 msgstr "LANMAN1"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6221
-#: rc.cpp:1820 rc.cpp:1835 rc.cpp:1850
+#: rc.cpp:2349 rc.cpp:2364 rc.cpp:2379
 #, no-c-format
 msgid "CORE"
 msgstr "CORE"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6226
-#: rc.cpp:1823 rc.cpp:1838 rc.cpp:1853
+#: rc.cpp:2352 rc.cpp:2367 rc.cpp:2382
 #, no-c-format
 msgid "COREPLUS"
 msgstr "COREPLUS"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6320
-#: rc.cpp:1856
+#: rc.cpp:2385
 #, no-c-format
 msgid "NT"
 msgstr "NT"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6325
-#: rc.cpp:1859
+#: rc.cpp:2388
 #, no-c-format
 msgid "NT Workstation"
 msgstr "NT Workstation"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6330
-#: rc.cpp:1862
+#: rc.cpp:2391
 #, no-c-format
 msgid "win95"
 msgstr "win95"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6335
-#: rc.cpp:1865
+#: rc.cpp:2394
 #, no-c-format
 msgid "WfW"
 msgstr "WfW"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6363
-#: rc.cpp:1868
+#: rc.cpp:2397
 #, no-c-format
 msgid "4.2"
 msgstr "4.2"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6373
-#: rc.cpp:1871
+#: rc.cpp:2400
 #, no-c-format
 msgid "Listening SMB Ports"
 msgstr "监听 SMB 端口"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6390
-#: rc.cpp:1874
+#: rc.cpp:2403
 #, no-c-format
 msgid "SMB ports:"
 msgstr "SMB 端口："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6427
-#: advanced/kcm_sambaconf/kcmsambaconf.cpp:328 rc.cpp:1877
+#: advanced/kcm_sambaconf/kcmsambaconf.cpp:328 rc.cpp:2406
 #, no-c-format
 msgid "Browsing"
 msgstr "浏览"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6444
-#: rc.cpp:1880
+#: rc.cpp:2409
 #, no-c-format
 msgid "LM i&nterval:"
 msgstr "LM 间隔(&N)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6455
-#: rc.cpp:1883
+#: rc.cpp:2412
 #, no-c-format
 msgid "L&M announce:"
 msgstr "LM 发布(&M)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6504
-#: rc.cpp:1889
+#: rc.cpp:2418
 #, no-c-format
 msgid "Remote browse s&ync:"
 msgstr "远程浏览同步(&Y)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6535
-#: rc.cpp:1901
+#: rc.cpp:2430
 #, no-c-format
 msgid "Bro&wse list"
 msgstr "浏览列表(&W)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6543
-#: rc.cpp:1904
+#: rc.cpp:2433
 #, no-c-format
 msgid "Enhanced browsin&g"
 msgstr "增强式浏览(&G)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6568
-#: rc.cpp:1907
+#: rc.cpp:2436
 #, no-c-format
 msgid "Pre&load:"
 msgstr "预载(&L)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6586
-#: rc.cpp:1910
+#: rc.cpp:2439
 #, no-c-format
 msgid "Winbind"
 msgstr "Winbind"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6600
-#: rc.cpp:1913
+#: rc.cpp:2442
 #, no-c-format
 msgid "&Winbind/Idmap UID:"
 msgstr "&Winbind/Idmap UID："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6621
-#: rc.cpp:1916
+#: rc.cpp:2445
 #, no-c-format
 msgid "Winbind/Idmap &GID:"
 msgstr "Winbind/Idmap &GID："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6632
-#: rc.cpp:1919
+#: rc.cpp:2448
 #, no-c-format
 msgid "Template h&omedir:"
 msgstr "模板主目录(&O)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6648
-#: rc.cpp:1922
+#: rc.cpp:2451
 #, no-c-format
 msgid "Temp&late shell:"
 msgstr "模板 shell(&L)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6664
-#: rc.cpp:1925
+#: rc.cpp:2454
 #, no-c-format
 msgid "Winbind separator:"
 msgstr "Winbind 分隔符："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6680
-#: rc.cpp:1928
+#: rc.cpp:2457
 #, no-c-format
 msgid "Template primary group:"
 msgstr "模板主要组："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6704
-#: rc.cpp:1934
+#: rc.cpp:2463
 #, no-c-format
 msgid "Winbind cache ti&me:"
 msgstr "Winbind 缓存时间(&M)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6741
-#: rc.cpp:1937
+#: rc.cpp:2466
 #, no-c-format
 msgid "Windows NT 4"
 msgstr "Windows NT 4"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6746
-#: rc.cpp:1940
+#: rc.cpp:2469
 #, no-c-format
 msgid "Windows 2000"
 msgstr "Windows 2000"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6763
-#: rc.cpp:1946
+#: rc.cpp:2475
 #, no-c-format
 msgid "Acl compatibilit&y:"
 msgstr "ACL 兼容性(&Y)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6774
-#: rc.cpp:1949
+#: rc.cpp:2478
 #, no-c-format
 msgid "Wi&nbind enum users"
 msgstr "Winbind 枚举用户(&N)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6782
-#: rc.cpp:1952
+#: rc.cpp:2481
 #, no-c-format
 msgid "Winbind enum groups"
 msgstr "Winbind 枚举组"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6790
-#: rc.cpp:1955
+#: rc.cpp:2484
 #, no-c-format
 msgid "Winbind use default domain"
 msgstr "Winbind 使用默认域"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6798
-#: rc.cpp:1958
+#: rc.cpp:2487
 #, no-c-format
 msgid "Winbind enable local accounts"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6806
-#: rc.cpp:1961
+#: rc.cpp:2490
 #, no-c-format
 msgid "Winbind trusted domains only"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6814
-#: rc.cpp:1964
+#: rc.cpp:2493
 #, no-c-format
 msgid "Winbind nested groups"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6841
-#: rc.cpp:1967
+#: rc.cpp:2496
 #, no-c-format
 msgid "NetBIOS"
 msgstr "NetBIOS"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6879
-#: rc.cpp:1970
+#: rc.cpp:2499
 #, no-c-format
 msgid "NetBIOS sc&ope:"
 msgstr "NetBIOS 范围(&O)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6894
-#: rc.cpp:1973
+#: rc.cpp:2502
 #, no-c-format
 msgid "&NetBIOS aliases:"
 msgstr "NetBIOS 别名(&N)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6905
-#: rc.cpp:1976
+#: rc.cpp:2505
 #, no-c-format
 msgid "Disab&le netbios"
 msgstr "禁用 NetBIOS(&L)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6913
-#: rc.cpp:1979
+#: rc.cpp:2508
 #, no-c-format
 msgid "Na&me resolve order:"
 msgstr "名称解析顺序(&M)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6956
-#: rc.cpp:1982
+#: rc.cpp:2511
 #, no-c-format
 msgid "lmhosts host wins bcast"
 msgstr "lmhosts host wins bcast"
 
-#. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6966
-#: rc.cpp:1985 rc.cpp:2679
-#, no-c-format
-msgid "VFS"
-msgstr "VFS"
-
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 6983
-#: rc.cpp:1988
+#: rc.cpp:2517
 #, no-c-format
 msgid "H&ost msdfs"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7010
-#: rc.cpp:1991
+#: rc.cpp:2520
 #, no-c-format
 msgid "LDAP"
 msgstr "LDAP"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7031
-#: rc.cpp:1994
+#: rc.cpp:2523
 #, no-c-format
 msgid "LDAP suffi&x:"
 msgstr "LDAP 后缀(&X)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7046
-#: rc.cpp:1997
+#: rc.cpp:2526
 #, no-c-format
 msgid "LDAP machine suffix:"
 msgstr "LDAP 计算机后缀："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7061
-#: rc.cpp:2000
+#: rc.cpp:2529
 #, no-c-format
 msgid "LDAP user suffix:"
 msgstr "LDAP 用户后缀："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7076
-#: rc.cpp:2003
+#: rc.cpp:2532
 #, no-c-format
 msgid "LDAP &group suffix:"
 msgstr "LDAP 组后缀(&G)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7091
-#: rc.cpp:2006
+#: rc.cpp:2535
 #, no-c-format
 msgid "LDAP idmap suffix:"
 msgstr "LDAP idmap 后缀："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7106
-#: rc.cpp:2009
+#: rc.cpp:2538
 #, no-c-format
 msgid "LDAP filter:"
 msgstr "LDAP 过滤器："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7121
-#: rc.cpp:2012
+#: rc.cpp:2541
 #, no-c-format
 msgid "LDAP ad&min dn:"
 msgstr "LDAP 管理 dn(&M)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7149
-#: rc.cpp:2015
+#: rc.cpp:2544
 #, no-c-format
 msgid "LDAP delete d&n"
 msgstr "LDAP 删除 dn(&N)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7157
-#: rc.cpp:2018
+#: rc.cpp:2547
 #, no-c-format
 msgid "LDAP s&ync:"
 msgstr "LDAP 同步(&Y)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7168
-#: rc.cpp:2021
+#: rc.cpp:2550
 #, no-c-format
 msgid "&LDAP ssl:"
 msgstr "LDAP ssl(&L)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7183
-#: rc.cpp:2024
+#: rc.cpp:2553
 #, no-c-format
 msgid "Idmap bac&kend:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7198
-#: rc.cpp:2027
+#: rc.cpp:2556
 #, no-c-format
 msgid "LDAP replication sleep:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7300
-#: rc.cpp:2036
+#: rc.cpp:2565
 #, no-c-format
 msgid "Start_tls"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7325
-#: rc.cpp:2048
+#: rc.cpp:2577
 #, no-c-format
 msgid "Only"
 msgstr "仅"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7373
-#: rc.cpp:2054
+#: rc.cpp:2583
 #, no-c-format
 msgid "Add share c&ommand:"
 msgstr "添加共享命令(&O)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7384
-#: rc.cpp:2057
+#: rc.cpp:2586
 #, no-c-format
 msgid "Change share command:"
 msgstr "更改共享命令："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7395
-#: rc.cpp:2060
+#: rc.cpp:2589
 #, no-c-format
 msgid "De&lete share command:"
 msgstr "删除共享命令(&L)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7406
-#: rc.cpp:2063
+#: rc.cpp:2592
 #, no-c-format
 msgid "Messa&ge command:"
 msgstr "消息命令(&G)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7417
-#: rc.cpp:2066
+#: rc.cpp:2595
 #, no-c-format
 msgid "Dfree co&mmand:"
 msgstr "Dfree 命令(&M)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7428
-#: rc.cpp:2069
+#: rc.cpp:2598
 #, no-c-format
 msgid "Set &quota command:"
 msgstr "设置配置命令(&Q)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7439
-#: rc.cpp:2072
+#: rc.cpp:2601
 #, no-c-format
 msgid "Get quota command:"
 msgstr "获得配额命令："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7467
-#: rc.cpp:2075
+#: rc.cpp:2604
 #, no-c-format
 msgid "Pa&nic action:"
 msgstr ""
 
-#. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7520
-#: advanced/kcm_sambaconf/kcmsambaconf.cpp:331 rc.cpp:2078 rc.cpp:2709
-#, no-c-format
-msgid "Misc"
-msgstr "杂类"
-
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7554
-#: rc.cpp:2084
+#: rc.cpp:2613
 #, no-c-format
 msgid "Time &offset:"
 msgstr "时间偏移量(&O)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7575
-#: rc.cpp:2087
+#: rc.cpp:2616
 #, no-c-format
 msgid "Default service:"
 msgstr "默认服务："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7586
-#: rc.cpp:2090
+#: rc.cpp:2619
 #, no-c-format
 msgid "Remote a&nnounce:"
 msgstr "远程发布(&N)："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7602
-#: rc.cpp:2093
+#: rc.cpp:2622
 #, no-c-format
 msgid "Source environment:"
 msgstr "源环境："
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7613
-#: rc.cpp:2096
+#: rc.cpp:2625
 #, no-c-format
 msgid "Hide &local users"
 msgstr "隐藏本地用户(&L)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7660
-#: rc.cpp:2102
+#: rc.cpp:2631
 #, no-c-format
 msgid "NIS"
 msgstr "NIS"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7677
-#: rc.cpp:2105
+#: rc.cpp:2634
 #, no-c-format
 msgid "NIS homedir"
 msgstr "NIS 主目录"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7685
-#: rc.cpp:2108
+#: rc.cpp:2637
 #, no-c-format
 msgid "Homedir map:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7703
-#: rc.cpp:2111
+#: rc.cpp:2640
 #, no-c-format
 msgid "UTMP"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7720
-#: rc.cpp:2114
+#: rc.cpp:2643
 #, no-c-format
 msgid "Utmp director&y:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7736
-#: rc.cpp:2117
+#: rc.cpp:2646
 #, no-c-format
 msgid "&Wtmp directory:"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7752
-#: rc.cpp:2120
+#: rc.cpp:2649
 #, no-c-format
 msgid "Ut&mp"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7781
-#: rc.cpp:2123
+#: rc.cpp:2652
 #, no-c-format
 msgid "Debug"
 msgstr "调试"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7798
-#: rc.cpp:2126
+#: rc.cpp:2655
 #, no-c-format
 msgid "&NT status support"
 msgstr "NT 状态报告(&N)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7810
-#: rc.cpp:2129
+#: rc.cpp:2658
 #, no-c-format
 msgid "NT S&MB support"
 msgstr "NT SMB 支持(&M)"
 
 #. i18n: file ./advanced/kcm_sambaconf/kcminterface.ui line 7825
-#: rc.cpp:2132
+#: rc.cpp:2661
 #, no-c-format
 msgid "NT pipe supp&ort"
 msgstr ""
 
 #. i18n: file ./advanced/kcm_sambaconf/usertab.ui line 16
-#: rc.cpp:2135
+#: rc.cpp:2664
 #, no-c-format
 msgid "Users"
 msgstr "用户"
 
 #. i18n: file ./advanced/kcm_sambaconf/usertab.ui line 27
-#: rc.cpp:2138
+#: rc.cpp:2667
 #, no-c-format
 msgid "All U&nspecified Users"
 msgstr "未指定的全部用户(&N)"
 
 #. i18n: file ./advanced/kcm_sambaconf/usertab.ui line 36
-#: rc.cpp:2141
+#: rc.cpp:2670
 #, no-c-format
 msgid "Allow"
 msgstr "允许"
 
 #. i18n: file ./advanced/kcm_sambaconf/usertab.ui line 41
-#: advanced/kcm_sambaconf/usertabimpl.cpp:222 rc.cpp:2144
+#: advanced/kcm_sambaconf/usertabimpl.cpp:222 rc.cpp:2673
 #, no-c-format
 msgid "Reject"
 msgstr "拒绝"
 
 #. i18n: file ./advanced/kcm_sambaconf/usertab.ui line 63
-#: rc.cpp:2147
+#: rc.cpp:2676
 #, no-c-format
 msgid "Spec&ified Users"
 msgstr "指定的用户(&I)"
 
 #. i18n: file ./advanced/kcm_sambaconf/usertab.ui line 87
-#: rc.cpp:2159
+#: rc.cpp:2688
 #, no-c-format
 msgid "Access Rights"
 msgstr "访问权限"
 
 #. i18n: file ./advanced/kcm_sambaconf/usertab.ui line 125
-#: rc.cpp:2162
+#: rc.cpp:2691
 #, no-c-format
 msgid "A&dd User..."
 msgstr "添加用户(&D)..."
 
 #. i18n: file ./advanced/kcm_sambaconf/usertab.ui line 133
-#: rc.cpp:2165
+#: rc.cpp:2694
 #, no-c-format
 msgid "E&xpert"
 msgstr "专家(&X)"
 
 #. i18n: file ./advanced/kcm_sambaconf/usertab.ui line 141
-#: rc.cpp:2168
+#: rc.cpp:2697
 #, no-c-format
 msgid "Add &Group..."
 msgstr "添加组(&G)..."
 
 #. i18n: file ./advanced/kcm_sambaconf/usertab.ui line 149
-#: rc.cpp:2171
+#: rc.cpp:2700
 #, no-c-format
 msgid "Remo&ve Selected"
 msgstr "删除选中项(&V)"
 
 #. i18n: file ./advanced/kcm_sambaconf/usertab.ui line 184
-#: rc.cpp:2174
+#: rc.cpp:2703
 #, no-c-format
 msgid "All Users Should be Forced to the Follo&wing User/Group"
 msgstr "全部用户都强制为下列用户/组(&W)"
 
 #. i18n: file ./advanced/kcm_sambaconf/usertab.ui line 203
-#: rc.cpp:2177
+#: rc.cpp:2706
 #, no-c-format
 msgid "Forc&e user:"
 msgstr "强制用户(&E)："
 
 #. i18n: file ./advanced/kcm_sambaconf/usertab.ui line 235
-#: rc.cpp:2180
+#: rc.cpp:2709
 #, no-c-format
 msgid "Fo&rce group:"
 msgstr "强制组(&R)："
 
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 37
-#: rc.cpp:2183
-#, no-c-format
-msgid "Add/Edit Share"
-msgstr "添加/编辑共享"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 130
-#: rc.cpp:2192
-#, no-c-format
-msgid "D&irectory"
-msgstr "目录(&I)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 164
-#: rc.cpp:2195
-#, no-c-format
-msgid "&Path:"
-msgstr "路径(&P)："
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 185
-#: rc.cpp:2198
-#, no-c-format
-msgid "Share all home &directories"
-msgstr "共享全部主目录(&D)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 197
-#: rc.cpp:2201
-#, no-c-format
-msgid "Iden&tifier"
-msgstr "标识符(&T)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 214
-#: rc.cpp:2204
-#, no-c-format
-msgid "Na&me:"
-msgstr "名称(&M)："
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 225
-#: rc.cpp:2207
-#, no-c-format
-msgid "Comme&nt:"
-msgstr "注释(&N)："
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 248
-#: rc.cpp:2210
-#, no-c-format
-msgid "Main P&roperties"
-msgstr "主要属性(&R)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 265
-#: rc.cpp:2213
-#, no-c-format
-msgid "Read onl&y"
-msgstr "只读(&Y)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 338
-#: rc.cpp:2228
-#, no-c-format
-msgid "Gu&ests"
-msgstr "访客(&E)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 397
-#: rc.cpp:2237
-#, no-c-format
-msgid "Only allow guest connect&ions"
-msgstr "只允许访客连接(&I)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 410
-#: rc.cpp:2243
-#, no-c-format
-msgid "Hos&ts"
-msgstr "主机(&T)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 435
-#: rc.cpp:2249
-#, no-c-format
-msgid "Hosts allo&w:"
-msgstr "允许主机(&W)："
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 473
-#: rc.cpp:2264
-#, no-c-format
-msgid "Sy&mbolic Links"
-msgstr "符号链接(&M)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 490
-#: rc.cpp:2267
-#, no-c-format
-msgid "Allow following of symbolic lin&ks"
-msgstr "允许跟随符号链接(&K)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 501
-#: rc.cpp:2270
-#, no-c-format
-msgid ""
-"Allow following of symbolic links that &point to areas outside the directory "
-"tree"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 511
-#: rc.cpp:2273
-#, no-c-format
-msgid ""
-"<qt>Validate password against the following usernames if the client cannot "
-"supply a username:</qt>"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 527
-#: rc.cpp:2276
-#, no-c-format
-msgid "Only allow connections with use&rnames specified in this username list"
-msgstr "只允许此用户名列表中的用户名连接(&R)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 557
-#: rc.cpp:2282
-#, no-c-format
-msgid "Hidden &Files"
-msgstr "隐藏文件(&F)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 583
-#: rc.cpp:2288
-#, no-c-format
-msgid "Hidden"
-msgstr "隐藏"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 594
-#: rc.cpp:2291
-#, no-c-format
-msgid "Veto"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 605
-#: rc.cpp:2294
-#, no-c-format
-msgid "Veto Oplock"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 616
-#: rc.cpp:2297
-#, no-c-format
-msgid "Size"
-msgstr "大小"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 627
-#: rc.cpp:2300
-#, no-c-format
-msgid "Date"
-msgstr "日期"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 638
-#: rc.cpp:2303
-#, no-c-format
-msgid "Permissions"
-msgstr "权限"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 681
-#: rc.cpp:2312
-#, no-c-format
-msgid "Se&lected Files"
-msgstr "选中的文件(&L)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 698
-#: rc.cpp:2315
-#, no-c-format
-msgid "Hi&de"
-msgstr "隐藏(&D)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 706
-#: advanced/kcm_sambaconf/hiddenfileview.cpp:116 rc.cpp:2318
-#, no-c-format
-msgid "&Veto"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 714
-#: rc.cpp:2321
-#, no-c-format
-msgid "Veto oploc&k"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 724
-#: rc.cpp:2324
-#, no-c-format
-msgid "&Manual Configuration"
-msgstr "手动配置(&M)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 755
-#: rc.cpp:2327
-#, no-c-format
-msgid "Ve&to files:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 766
-#: rc.cpp:2330
-#, no-c-format
-msgid "Veto oplock f&iles:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 792
-#: rc.cpp:2333
-#, no-c-format
-msgid "Hidde&n files:"
-msgstr "隐藏文件(&N)："
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 819
-#: rc.cpp:2336
-#, no-c-format
-msgid "Hide un&writable files"
-msgstr "隐藏不可写文件(&W)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 827
-#: rc.cpp:2339
-#, no-c-format
-msgid "Hide s&pecial files"
-msgstr "隐藏特殊文件(&P)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 835
-#: rc.cpp:2342
-#, no-c-format
-msgid "Hide files startin&g with a dot "
-msgstr "隐藏以句点开始的文件(&G)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 843
-#: rc.cpp:2345
-#, no-c-format
-msgid "Hide un&readable files"
-msgstr "隐藏不可读文件(&R)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 973
-#: rc.cpp:2361
-#, no-c-format
-msgid "Force Modes"
-msgstr "强制模式"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 990
-#: rc.cpp:2364
-#, no-c-format
-msgid "Forc&e directory security mode:"
-msgstr "强制目录安全模式(&E)："
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1004
-#: rc.cpp:2370
-#, no-c-format
-msgid "Fo&rce security mode:"
-msgstr "强制安全模式(&R)："
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1018
-#: rc.cpp:2376
-#, no-c-format
-msgid "Force director&y mode:"
-msgstr "强制目录模式(&Y)："
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1032
-#: rc.cpp:2382
-#, no-c-format
-msgid "Force create mo&de:"
-msgstr "强制创建模式(&D)："
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1060
-#: rc.cpp:2388 rc.cpp:2391 rc.cpp:2406 rc.cpp:2409 rc.cpp:2433 rc.cpp:2436
-#: rc.cpp:2439 rc.cpp:2460
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1096
-#: rc.cpp:2394 rc.cpp:2397 rc.cpp:2400 rc.cpp:2403 rc.cpp:2442 rc.cpp:2445
-#: rc.cpp:2448 rc.cpp:2457 rc.cpp:2484
-#, no-c-format
-msgid "01234567"
-msgstr "01234567"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1209
-#: rc.cpp:2412
-#, no-c-format
-msgid "Masks"
-msgstr "掩码"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1226
-#: rc.cpp:2415
-#, no-c-format
-msgid "Directory security mask:"
-msgstr "目录安全掩码："
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1240
-#: rc.cpp:2421
-#, no-c-format
-msgid "Security &mask:"
-msgstr "安全掩码(&M)："
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1254
-#: rc.cpp:2427
-#, no-c-format
-msgid "Direc&tory mask:"
-msgstr "目录掩码(&T)："
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1376
-#: rc.cpp:2451
-#, no-c-format
-msgid "Create mas&k:"
-msgstr "创建掩码(&K)："
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1428
-#: rc.cpp:2463
-#, no-c-format
-msgid "ACL"
-msgstr "ACL"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1445
-#: rc.cpp:2466
-#, no-c-format
-msgid "&Profile acls"
-msgstr "配置文件 ACL(&P)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1453
-#: rc.cpp:2469
-#, no-c-format
-msgid "Inherit ac&ls"
-msgstr "继承 ACL(&L)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1461
-#: rc.cpp:2472
-#, no-c-format
-msgid "&NT ACL support"
-msgstr "NT ACL 支持(&N)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1472
-#: rc.cpp:2475
-#, no-c-format
-msgid "Force unkno&wn acl user:"
-msgstr "强制未知 ACL 用户(&W)："
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1486
-#: rc.cpp:2481
-#, no-c-format
-msgid "Map acl &inherit"
-msgstr "映射 ACL 继承(&I)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1527
-#: rc.cpp:2490
-#, no-c-format
-msgid "Inherit permissions from parent directory"
-msgstr "从父目录继承权限"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1535
-#: rc.cpp:2493
-#, no-c-format
-msgid "Allow deletion of readonly files"
-msgstr "允许删除只读文件"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1545
-#: rc.cpp:2496
-#, no-c-format
-msgid "DOS Attribute Mapping"
-msgstr "DOS 属性映射"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1562
-#: rc.cpp:2499
-#, no-c-format
-msgid "Map DOS archi&ve to UNIX owner execute"
-msgstr "将 DOS 存档映射为 UNIX 属主执行(&V)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1570
-#: rc.cpp:2502
-#, no-c-format
-msgid "Map DOS hidden to UNI&X world execute"
-msgstr "将 DOS 隐藏映射为 UNIX 世界执行(&X)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1578
-#: rc.cpp:2505
-#, no-c-format
-msgid "Map DOS system to UNIX &group execute"
-msgstr "将 DOS 系统映射为 UNIX 组执行(&G)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1586
-#: rc.cpp:2508
-#, no-c-format
-msgid "Store DOS attributes onto extended attribute"
-msgstr "将 DOS 属性存储为扩展属性"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1599
-#: rc.cpp:2511
-#, no-c-format
-msgid "OS/2"
-msgstr "OS/2"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1610
-#: rc.cpp:2514
-#, no-c-format
-msgid "OS/2 style extended attributes support"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1642
-#: rc.cpp:2520
-#, no-c-format
-msgid "Sync al&ways"
-msgstr "总是同步(&W)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1650
-#: rc.cpp:2523
-#, no-c-format
-msgid "Strict s&ync"
-msgstr "严格同步(&Y)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1658
-#: rc.cpp:2526
-#, no-c-format
-msgid "St&rict allocate"
-msgstr "严格分配(&R)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1666
-#: rc.cpp:2529
-#, no-c-format
-msgid "Use sen&dfile"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1691
-#: rc.cpp:2532
-#, no-c-format
-msgid "Bloc&k size:"
-msgstr "块大小(&K)："
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1702
-#: rc.cpp:2535
-#, no-c-format
-msgid "Client-side cachin&g policy:"
-msgstr "客户端缓存策略(&G)："
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1713
-#: rc.cpp:2538 rc.cpp:2556
-#, no-c-format
-msgid "bytes"
-msgstr "字节"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1721
-#: rc.cpp:2541
-#, no-c-format
-msgid "Write cache si&ze:"
-msgstr "写缓存大小(&Z)："
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1730
-#: rc.cpp:2544
-#, no-c-format
-msgid "manual"
-msgstr "手动"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1735
-#: rc.cpp:2547
-#, no-c-format
-msgid "documents"
-msgstr "文档"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1740
-#: rc.cpp:2550
-#, no-c-format
-msgid "programs"
-msgstr "程序"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1745
-#: rc.cpp:2553
-#, no-c-format
-msgid "disable"
-msgstr "禁用"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1804
-#: rc.cpp:2559
-#, no-c-format
-msgid "&Maximum number of simultaneous connections:"
-msgstr "同时连接的最大数(&M)："
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1876
-#: rc.cpp:2568
-#, no-c-format
-msgid "Hide traili&ng dot"
-msgstr "隐藏尾随句点(&N)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1886
-#: rc.cpp:2571
-#, no-c-format
-msgid "DOS"
-msgstr "DOS"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1903
-#: rc.cpp:2574
-#, no-c-format
-msgid "&DOS file mode"
-msgstr "DOS 文件模式(&D)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1911
-#: rc.cpp:2577
-#, no-c-format
-msgid "DOS f&ile times"
-msgstr "DOS 文件时间(&I)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1919
-#: rc.cpp:2580
-#, no-c-format
-msgid "DOS file time resolution"
-msgstr "DOS 文件时间解析"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1972
-#: rc.cpp:2583
-#, no-c-format
-msgid "Name Mangling"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 1995
-#: rc.cpp:2586
-#, no-c-format
-msgid "Mangling cha&r:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2066
-#: rc.cpp:2589
-#, no-c-format
-msgid "Mangled ma&p:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2098
-#: rc.cpp:2592
-#, no-c-format
-msgid "Enable na&me mangling"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2114
-#: rc.cpp:2595
-#, no-c-format
-msgid "Man&gle case"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2130
-#: rc.cpp:2598
-#, no-c-format
-msgid "Mangling method:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2139
-#: rc.cpp:2601
-#, no-c-format
-msgid "hash"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2144
-#: rc.cpp:2604
-#, no-c-format
-msgid "hash2"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2172
-#: rc.cpp:2607
-#, no-c-format
-msgid "Preser&ve case"
-msgstr "保留大小写(&V)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2191
-#: rc.cpp:2610
-#, no-c-format
-msgid "Short pr&eserve case"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2207
-#: rc.cpp:2613
-#, no-c-format
-msgid "Defau&lt case:"
-msgstr "默认为(&L)："
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2216
-#: rc.cpp:2616
-#, no-c-format
-msgid "Lower"
-msgstr "小写"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2221
-#: rc.cpp:2619
-#, no-c-format
-msgid "Upper"
-msgstr "大写"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2247
-#: rc.cpp:2622 rc.cpp:2664
-#, fuzzy, no-c-format
-msgid "Automatic"
-msgstr "自动"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2293
-#: rc.cpp:2631
-#, fuzzy, no-c-format
-msgid "Case sensi&tive:"
-msgstr "区分大小写(&T)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2343
-#: rc.cpp:2637
-#, no-c-format
-msgid "Locki&ng"
-msgstr "锁定(&N)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2360
-#: rc.cpp:2640
-#, no-c-format
-msgid "Issue oppo&rtunistic locks (oplocks) "
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2368
-#: rc.cpp:2643
-#, no-c-format
-msgid "O&plocks"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2411
-#: rc.cpp:2646
-#, no-c-format
-msgid "Oplock contention li&mit:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2422
-#: rc.cpp:2649
-#, no-c-format
-msgid "Le&vel2 oplocks"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2432
-#: rc.cpp:2652
-#, no-c-format
-msgid "Fak&e oplocks"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2443
-#: rc.cpp:2655
-#, no-c-format
-msgid "Share mo&des"
-msgstr "共享模式(&D)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2451
-#: rc.cpp:2658
-#, no-c-format
-msgid "Posi&x locking"
-msgstr "Posix 锁定(&X)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2467
-#: rc.cpp:2661
-#, fuzzy, no-c-format
-msgid "S&trict locking:"
-msgstr "严格锁定(&T)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2525
-#: rc.cpp:2673
-#, no-c-format
-msgid "Blockin&g locks"
-msgstr "屏蔽锁定(&G)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2535
-#: rc.cpp:2676
-#, no-c-format
-msgid "Enable lock&ing"
-msgstr "允许锁定(&I)"
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2584
-#: rc.cpp:2682
-#, no-c-format
-msgid "Vfs ob&jects:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2595
-#: rc.cpp:2685
-#, no-c-format
-msgid "Vfs o&ptions:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2630
-#: rc.cpp:2691
-#, no-c-format
-msgid "preexec c&lose"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2638
-#: rc.cpp:2694
-#, no-c-format
-msgid "root pree&xec close"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2663
-#: rc.cpp:2697
-#, no-c-format
-msgid "Pos&texec:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2674
-#: rc.cpp:2700
-#, no-c-format
-msgid "Root pr&eexec:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2685
-#: rc.cpp:2703
-#, no-c-format
-msgid "P&reexec:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2701
-#: rc.cpp:2706
-#, no-c-format
-msgid "Root &postexec:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2760
+#. i18n: file ./advanced/kcm_sambaconf/userselectdlg.ui line 16
 #: rc.cpp:2712
 #, no-c-format
-msgid "Fst&ype:"
-msgstr ""
+msgid "Select Users"
+msgstr "选择用户"
 
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2781
+#. i18n: file ./advanced/kcm_sambaconf/userselectdlg.ui line 36
 #: rc.cpp:2715
 #, no-c-format
-msgid "Ma&gic script:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2792
-#: rc.cpp:2718
-#, no-c-format
-msgid "&Volume:"
-msgstr "卷(&V)："
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2808
-#: rc.cpp:2721
-#, no-c-format
-msgid "Mag&ic output:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2819
-#: rc.cpp:2724
-#, no-c-format
-msgid "Fa&ke directory create times"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2827
-#: rc.cpp:2727
-#, no-c-format
-msgid "Ms&dfs root"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2835
-#: rc.cpp:2730
-#, no-c-format
-msgid "Setdir command allo&wed"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2843
-#: rc.cpp:2733
-#, no-c-format
-msgid "Do &not descend:"
-msgstr ""
-
-#. i18n: file ./advanced/kcm_sambaconf/share.ui line 2859
-#: rc.cpp:2736
-#, no-c-format
-msgid "Msdfs pro&xy:"
-msgstr ""
+msgid "Select &Users"
+msgstr "选择用户(&U)"
 
 #. i18n: file ./advanced/propsdlgplugin/propertiespagegui.ui line 35
 #: rc.cpp:2751
@@ -4514,27 +4515,27 @@ msgstr "公开(&U)"
 msgid "Mor&e Samba Options"
 msgstr "更多 Samba 选项(&E)"
 
-#: simple/fileshare.cpp:98
+#: simple/fileshare.cpp:99
 msgid "No NFS server installed on this system"
 msgstr "没有在此系统上安装 NFS 服务器"
 
-#: simple/fileshare.cpp:104
+#: simple/fileshare.cpp:105
 msgid "No Samba server installed on this system"
 msgstr "没有在此系统上安装 Samba 服务器"
 
-#: simple/fileshare.cpp:300
+#: simple/fileshare.cpp:301
 msgid "Could not save settings."
 msgstr "无法保存设置。"
 
-#: simple/fileshare.cpp:301
+#: simple/fileshare.cpp:302
 msgid "Could not open file '%1' for writing: %2"
 msgstr "无法打开文件“%1”写入：%2"
 
-#: simple/fileshare.cpp:303
+#: simple/fileshare.cpp:304
 msgid "Saving Failed"
 msgstr "保存失败"
 
-#: simple/fileshare.cpp:344
+#: simple/fileshare.cpp:345
 msgid ""
 "<h1>File Sharing</h1>"
 "<p>This module can be used to enable file sharing over the network using the "
@@ -4542,7 +4543,7 @@ msgid ""
 "share your files with Windows(R) computers on your network.</p>"
 msgstr ""
 
-#: simple/fileshare.cpp:358
+#: simple/fileshare.cpp:359
 msgid "Share Folder"
 msgstr "共享文件夹"
 
@@ -4650,9 +4651,9 @@ msgstr "无主机名/IP 地址"
 msgid "The host '%1' already exists."
 msgstr "主机“%1”已存在。"
 
-#: advanced/kcm_sambaconf/sambafile.cpp:217
-msgid "Unnamed"
-msgstr "未命名"
+#: advanced/kcm_sambaconf/dictmanager.cpp:61
+msgid "The option <em>%1</em> is not supported by your Samba version"
+msgstr "您的 Samba 版本不支持选项 <em>%1</em>"
 
 #: advanced/kcm_sambaconf/linuxpermissionchecker.cpp:116
 msgid ""
@@ -4715,6 +4716,10 @@ msgstr "更改用户 %1 的密码失败。"
 msgid "<h1>Samba Configuration</h1> here you can configure your SAMBA server."
 msgstr "<h1>Samba 配置</h1>您可在此配置您的 SAMBA 服务器。"
 
+#: advanced/kcm_sambaconf/sambafile.cpp:217
+msgid "Unnamed"
+msgstr "未命名"
+
 #: advanced/kcm_sambaconf/hiddenfileview.cpp:115
 msgid "&Hide"
 msgstr "隐藏(&H)"
@@ -4794,10 +4799,6 @@ msgstr "可写"
 msgid "Admin"
 msgstr "管理"
 
-#: advanced/kcm_sambaconf/dictmanager.cpp:61
-msgid "The option <em>%1</em> is not supported by your Samba version"
-msgstr "您的 Samba 版本不支持选项 <em>%1</em>"
-
 #: advanced/kcm_sambaconf/kcminterface.ui.h:101
 msgid ""
 "Use the <i>share</i> security level if you have a home network or a small "
diff --git a/tde-i18n-zh_CN/messages/tdenetwork/tdeio_jabberdisco.po b/tde-i18n-zh_CN/messages/tdenetwork/tdeio_jabberdisco.po
index 4dc048980ef..582aaa77a90 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/tdeio_jabberdisco.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/tdeio_jabberdisco.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_jabberdisco\n"
-"POT-Creation-Date: 2005-06-03 01:26+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2005-09-23 13:44+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdenetwork/tdeio_lan.po b/tde-i18n-zh_CN/messages/tdenetwork/tdeio_lan.po
index 9d635fe40ee..49983975b1b 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/tdeio_lan.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/tdeio_lan.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_lan\n"
-"POT-Creation-Date: 2005-03-25 01:18+0100\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2002-11-03 12:31+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@126.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdenetwork/tdeio_zeroconf.po b/tde-i18n-zh_CN/messages/tdenetwork/tdeio_zeroconf.po
index 6add02b0844..1af4f72a726 100644
--- a/tde-i18n-zh_CN/messages/tdenetwork/tdeio_zeroconf.po
+++ b/tde-i18n-zh_CN/messages/tdenetwork/tdeio_zeroconf.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_zeroconf\n"
-"POT-Creation-Date: 2007-04-13 02:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:50-0500\n"
 "PO-Revision-Date: 2005-02-04 02:36+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdepim/akregator.po b/tde-i18n-zh_CN/messages/tdepim/akregator.po
index 8dfb9a980d5..02bfe4d2b84 100644
--- a/tde-i18n-zh_CN/messages/tdepim/akregator.po
+++ b/tde-i18n-zh_CN/messages/tdepim/akregator.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: akregator\n"
-"POT-Creation-Date: 2008-07-08 01:23+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-12-03 22:22+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +25,7 @@ msgid ""
 "Your emails"
 msgstr "i18n-translation@lists.linux.net.cn"
 
-#: aboutdata.cpp:32 akregator_part.cpp:946 articleviewer.cpp:396
+#: aboutdata.cpp:32 akregator_part.cpp:956 articleviewer.cpp:396
 msgid "Akregator"
 msgstr "Akregator"
 
@@ -189,25 +190,25 @@ msgid "Ma&rk All Feeds as Read"
 msgstr "将全部种子标为已读(&R)"
 
 #. i18n: file akregator.kcfg line 9
-#: actionmanagerimpl.cpp:317 rc.cpp:312 rc.cpp:819
+#: actionmanagerimpl.cpp:317 rc.cpp:321 rc.cpp:675
 #, no-c-format
 msgid "Show Quick Filter"
 msgstr "显示快速过滤器"
 
 #. i18n: file settings_browser.ui line 108
-#: actionmanagerimpl.cpp:320 rc.cpp:240 rc.cpp:255 rc.cpp:639 rc.cpp:654
+#: actionmanagerimpl.cpp:320 rc.cpp:246 rc.cpp:261 rc.cpp:651 rc.cpp:666
 #, no-c-format
 msgid "Open in Tab"
 msgstr "在标签中打开"
 
 #. i18n: file settings_browser.ui line 113
-#: actionmanagerimpl.cpp:321 rc.cpp:243 rc.cpp:258 rc.cpp:642 rc.cpp:657
+#: actionmanagerimpl.cpp:321 rc.cpp:249 rc.cpp:264 rc.cpp:654 rc.cpp:669
 #, no-c-format
 msgid "Open in Background Tab"
 msgstr "在后台标签中打开"
 
 #. i18n: file settings_browser.ui line 118
-#: actionmanagerimpl.cpp:322 rc.cpp:246 rc.cpp:261 rc.cpp:645 rc.cpp:660
+#: actionmanagerimpl.cpp:322 rc.cpp:252 rc.cpp:267 rc.cpp:657 rc.cpp:672
 #, no-c-format
 msgid "Open in External Browser"
 msgstr "在外部浏览器中打开"
@@ -355,7 +356,7 @@ msgid "&Close Tab"
 msgstr "关闭标签(&C)"
 
 #. i18n: file addfeedwidgetbase.ui line 16
-#: addfeeddialog.cpp:53 rc.cpp:48 rc.cpp:609
+#: addfeeddialog.cpp:53 rc.cpp:48 rc.cpp:621
 #, no-c-format
 msgid "Add Feed"
 msgstr "添加种子"
@@ -388,105 +389,97 @@ msgid "Feeds"
 msgstr "种子"
 
 #: akregator_part.cpp:366
-msgid "Akregator News"
-msgstr "Akregator 新闻"
+msgid "Trinity Desktop News"
+msgstr ""
 
 #: akregator_part.cpp:371
-msgid "Akregator Blog"
-msgstr "Akregator 博客"
+msgid "LXer Linux News"
+msgstr ""
 
 #: akregator_part.cpp:376
-msgid "TDE Dot News"
-msgstr "TDE Dot News"
+msgid "Tuxmachines"
+msgstr ""
 
 #: akregator_part.cpp:381
-msgid "Planet TDE"
-msgstr "Planet TDE"
-
-#: akregator_part.cpp:386
-msgid "TDE Apps"
-msgstr "TDE Apps"
-
-#: akregator_part.cpp:391
-msgid "TDE Look"
-msgstr "TDE Look"
+msgid "lwn.net"
+msgstr ""
 
-#: akregator_part.cpp:400
+#: akregator_part.cpp:390
 msgid "Opening Feed List..."
 msgstr "正在打开种子列表..."
 
-#: akregator_part.cpp:435
+#: akregator_part.cpp:425
 msgid ""
 "<qt>The standard feed list is corrupted (invalid XML). A backup was created:"
 "<p><b>%2</b></p></qt>"
 msgstr "<qt>标准种子列表已损坏(无效的 XML)。备份创建于：<p><b>%2</b></p></qt>"
 
-#: akregator_part.cpp:435
+#: akregator_part.cpp:425
 msgid "XML Parsing Error"
 msgstr "XML 分析错误"
 
-#: akregator_part.cpp:450
+#: akregator_part.cpp:440
 msgid ""
 "<qt>The standard feed list is corrupted (no valid OPML). A backup was created:"
 "<p><b>%2</b></p></qt>"
 msgstr "<qt>标准种子列表已损坏(无效的 OPML)。备份创建于：<p><b>%2</b></p></qt>"
 
-#: akregator_part.cpp:450 akregator_part.cpp:642
+#: akregator_part.cpp:440 akregator_part.cpp:632
 msgid "OPML Parsing Error"
 msgstr "OPML 分析错误"
 
-#: akregator_part.cpp:489
+#: akregator_part.cpp:479
 msgid "Access denied: cannot save feed list (%1)"
 msgstr "访问被禁止：无法保存种子列表(%1)"
 
-#: akregator_part.cpp:489
+#: akregator_part.cpp:479
 msgid "Write error"
 msgstr "写错误"
 
-#: akregator_part.cpp:593
+#: akregator_part.cpp:583
 msgid "Interesting"
 msgstr "有兴趣"
 
-#: akregator_part.cpp:642
+#: akregator_part.cpp:632
 msgid "Could not import the file %1 (no valid OPML)"
 msgstr "无法导入文件 %1(无有效的 OPML)"
 
-#: akregator_part.cpp:645
+#: akregator_part.cpp:635
 msgid ""
 "The file %1 could not be read, check if it exists or if it is readable for the "
 "current user."
 msgstr "无法读取文件 %1，请检查该文件是否存在，或者当前用户是否可读取该文件。"
 
-#: akregator_part.cpp:645
+#: akregator_part.cpp:635
 msgid "Read Error"
 msgstr "读取错误"
 
-#: akregator_part.cpp:659
+#: akregator_part.cpp:649
 msgid "The file %1 already exists; do you want to overwrite it?"
 msgstr "文件 %1 已存在；您是否想要覆盖？"
 
-#: akregator_part.cpp:661
+#: akregator_part.cpp:651
 msgid "Overwrite"
 msgstr "覆盖"
 
-#: akregator_part.cpp:667
+#: akregator_part.cpp:657
 #, c-format
 msgid "Access denied: cannot write to file %1"
 msgstr "访问被禁止：无法写入文件 %1"
 
-#: akregator_part.cpp:667
+#: akregator_part.cpp:657
 msgid "Write Error"
 msgstr "写错误"
 
-#: akregator_part.cpp:696 akregator_part.cpp:706
+#: akregator_part.cpp:686 akregator_part.cpp:696
 msgid "OPML Outlines (*.opml, *.xml)"
 msgstr "OPML 大纲(*.opml, *.xml)"
 
-#: akregator_part.cpp:697 akregator_part.cpp:707
+#: akregator_part.cpp:687 akregator_part.cpp:697
 msgid "All Files"
 msgstr "全部文件"
 
-#: akregator_part.cpp:975
+#: akregator_part.cpp:985
 msgid ""
 "<qt>%1 already seems to be running on another display on this machine. <b>"
 "Running %2 more than once is not supported by the %3 backend and can cause the "
@@ -497,7 +490,7 @@ msgstr ""
 "<qt>%1 似乎已经运行于本机的另外一个显示上。<b>%3 后端不支持运行多次 %2，并且可能造成存档文章的丢失以及启动时崩溃。</b>"
 "您现在应该禁用存档，除非您确定 %2 并未运行。</qt>"
 
-#: akregator_part.cpp:987
+#: akregator_part.cpp:997
 msgid ""
 "<qt>%1 seems to be running on another display on this machine. <b>"
 "Running %1 and %2 at the same time is not supported by the %3 backend and can "
@@ -508,7 +501,7 @@ msgstr ""
 "<qt>%1 似乎已经运行于本机的另外一个显示上。<b>%3 后端不支持同时运行 %1 和 %2，并且可能造成存档文章的丢失以及启动时崩溃。</b>"
 "您现在应该禁用存档，除非您确定 %2 并未运行。</qt>"
 
-#: akregator_part.cpp:998
+#: akregator_part.cpp:1008
 msgid ""
 "<qt>%1 already seems to be running on %2. <b>Running %1 more than once is not "
 "supported by the %3 backend and can cause the loss of archived articles and "
@@ -518,7 +511,7 @@ msgstr ""
 "<qt>%1 似乎已经运行于 %2 上。<b>%3 后端不支持运行多次 %1，并且可能造成存档文章的丢失以及启动时崩溃。</b>"
 "您现在应该禁用存档，除非您确定 %2 上并未运行。</qt>"
 
-#: akregator_part.cpp:1006
+#: akregator_part.cpp:1016
 msgid ""
 "<qt>%1 seems to be running on %3. <b>Running %1 and %2 at the same time is not "
 "supported by the %4 backend and can cause the loss of archived articles and "
@@ -528,11 +521,11 @@ msgstr ""
 "<qt>%1 似乎已经运行于 %3 上。<b>%4 后端不支持同时运行 %1 和 %2，并且可能造成存档文章的丢失以及启动时崩溃。</b>"
 "您现在应该禁用存档，除非您确定 %1 并未在 %3 上运行。</qt>"
 
-#: akregator_part.cpp:1018
+#: akregator_part.cpp:1028
 msgid "Force Access"
 msgstr "强制访问"
 
-#: akregator_part.cpp:1019
+#: akregator_part.cpp:1029
 msgid "Disable Archive"
 msgstr "禁用存档"
 
@@ -590,46 +583,46 @@ msgstr "文章列表。"
 msgid "Browsing area."
 msgstr "浏览区域。"
 
-#: akregator_view.cpp:320 akregator_view.cpp:789
+#: akregator_view.cpp:320 akregator_view.cpp:797
 msgid "Articles"
 msgstr "文章"
 
-#: akregator_view.cpp:510 main.cpp:70
+#: akregator_view.cpp:518 main.cpp:70
 msgid "Imported Folder"
 msgstr "导入的文件夹"
 
-#: akregator_view.cpp:513
+#: akregator_view.cpp:521
 msgid "Add Imported Folder"
 msgstr "添加导入的文件夹"
 
-#: akregator_view.cpp:513
+#: akregator_view.cpp:521
 msgid "Imported folder name:"
 msgstr "导入的文件夹名称："
 
-#: akregator_view.cpp:949
+#: akregator_view.cpp:957
 msgid "Add Folder"
 msgstr "添加文件夹"
 
-#: akregator_view.cpp:949
+#: akregator_view.cpp:957
 msgid "Folder name:"
 msgstr "文件夹名称："
 
-#: akregator_view.cpp:1065
+#: akregator_view.cpp:1073
 msgid "Fetching Feeds..."
 msgstr "正在获取种子..."
 
-#: akregator_view.cpp:1307
+#: akregator_view.cpp:1315
 msgid "<qt>Are you sure you want to delete article <b>%1</b>?</qt>"
 msgstr "<qt>您确定想要删除文章 <b>%1</b> 吗？</qt>"
 
-#: akregator_view.cpp:1311
+#: akregator_view.cpp:1319
 #, c-format
 msgid ""
 "_n: <qt>Are you sure you want to delete the selected article?</qt>\n"
 "<qt>Are you sure you want to delete the %n selected articles?</qt>"
 msgstr "<qt>您确定想要删除 %n 篇选中的文章吗？</qt>"
 
-#: akregator_view.cpp:1315
+#: akregator_view.cpp:1323
 msgid "Delete Article"
 msgstr "删除文章"
 
@@ -699,12 +692,13 @@ msgid "&Scroll Down"
 msgstr "向下滚动(&S)"
 
 #: articleviewer.cpp:381
+#, fuzzy
 msgid ""
 "_: %1: Akregator version; %2: help:// URL; %3: homepage URL; --- end of comment "
 "---\n"
 "<h2 style='margin-top: 0px;'>Welcome to Akregator %1</h2>"
-"<p>Akregator is an RSS feed aggregator for the K Desktop Environment. Feed "
-"aggregators provide a convenient way to browse different kinds of content, "
+"<p>Akregator is an RSS feed aggregator for the Trinity Desktop Environment. "
+"Feed aggregators provide a convenient way to browse different kinds of content, "
 "including news, blogs, and other content from online sites. Instead of checking "
 "all your favorite web sites manually for updates, Akregator collects the "
 "content for you.</p>"
@@ -726,7 +720,8 @@ msgstr ""
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; Akregator 团队</p>\n"
 
 #: articleviewer.cpp:398
-msgid "An RSS feed reader for the K Desktop Environment."
+#, fuzzy
+msgid "An RSS feed reader for the Trinity Desktop Environment."
 msgstr "K 桌面环境的 RSS 种子阅读器。"
 
 #: articleviewer.cpp:428 articleviewer.cpp:429 articleviewer.cpp:524
@@ -759,13 +754,13 @@ msgid "Keep Enabled"
 msgstr "保持启用"
 
 #. i18n: file settings_appearance.ui line 17
-#: configdialog.cpp:46 rc.cpp:159 rc.cpp:264 rc.cpp:486 rc.cpp:528
+#: configdialog.cpp:46 rc.cpp:159 rc.cpp:270 rc.cpp:852 rc.cpp:897
 #, no-c-format
 msgid "General"
 msgstr "常规"
 
 #. i18n: file settings_advancedbase.ui line 28
-#: configdialog.cpp:47 rc.cpp:138 rc.cpp:189 rc.cpp:561 rc.cpp:786
+#: configdialog.cpp:47 rc.cpp:138 rc.cpp:195 rc.cpp:585 rc.cpp:960
 #, no-c-format
 msgid "Archive"
 msgstr "存档"
@@ -819,7 +814,8 @@ msgstr ""
 "<center><img source=\"systray_shot\"></center></p></qt>"
 
 #: mainwindow.cpp:268
-msgid "Docking in System Tray"
+#, fuzzy
+msgid "TQt::Docking in System Tray"
 msgstr "在系统托盘停靠"
 
 #: notificationmanager.cpp:79
@@ -909,7 +905,7 @@ msgid "Fetch aborted"
 msgstr "获取中止"
 
 #. i18n: file propertieswidgetbase.ui line 16
-#: propertiesdialog.cpp:69 propertiesdialog.cpp:103 rc.cpp:60 rc.cpp:663
+#: propertiesdialog.cpp:69 propertiesdialog.cpp:103 rc.cpp:60 rc.cpp:498
 #, no-c-format
 msgid "Feed Properties"
 msgstr "种子属性"
@@ -920,820 +916,850 @@ msgid "Properties of %1"
 msgstr "%1 的属性"
 
 #. i18n: file akregator_part.rc line 29
-#: rc.cpp:9 rc.cpp:27 rc.cpp:45 rc.cpp:483 rc.cpp:591 rc.cpp:777
+#: rc.cpp:9 rc.cpp:27 rc.cpp:45 rc.cpp:579 rc.cpp:612 rc.cpp:942
 #, no-c-format
 msgid "&Go"
 msgstr "转到(&G)"
 
 #. i18n: file akregator_part.rc line 43
-#: rc.cpp:12 rc.cpp:780
+#: rc.cpp:12 rc.cpp:615
 #, no-c-format
 msgid "F&eed"
 msgstr "种子(&E)"
 
 #. i18n: file akregator_part.rc line 56
-#: rc.cpp:15 rc.cpp:33 rc.cpp:597 rc.cpp:783
+#: rc.cpp:15 rc.cpp:33 rc.cpp:618 rc.cpp:948
 #, no-c-format
 msgid "&Article"
 msgstr "文章(&A)"
 
 #. i18n: file akregator_shell.rc line 26
-#: rc.cpp:30 rc.cpp:594
+#: rc.cpp:30 rc.cpp:945
 #, no-c-format
 msgid "&Feed"
 msgstr "种子(&F)"
 
 #. i18n: file akregator_shell.rc line 52
-#: rc.cpp:42 rc.cpp:606
+#: rc.cpp:42 rc.cpp:957
 #, no-c-format
 msgid "Speech Toolbar"
 msgstr "语音工具栏"
 
 #. i18n: file addfeedwidgetbase.ui line 95
-#: rc.cpp:51 rc.cpp:612
+#: rc.cpp:51 rc.cpp:624
 #, no-c-format
 msgid "Add New Source"
 msgstr "添加新源"
 
 #. i18n: file addfeedwidgetbase.ui line 103
-#: rc.cpp:54 rc.cpp:615
+#: rc.cpp:54 rc.cpp:627
 #, no-c-format
 msgid "Feed &URL:"
 msgstr "种子 &URL："
 
 #. i18n: file addfeedwidgetbase.ui line 118
-#: rc.cpp:57 rc.cpp:618
+#: rc.cpp:57 rc.cpp:630
 #, no-c-format
 msgid "Status"
 msgstr "状态"
 
 #. i18n: file propertieswidgetbase.ui line 34
-#: rc.cpp:63 rc.cpp:666
+#: rc.cpp:63 rc.cpp:501
 #, no-c-format
 msgid "&General"
 msgstr "常规(&G)"
 
 #. i18n: file propertieswidgetbase.ui line 53
-#: rc.cpp:66 rc.cpp:669
+#: rc.cpp:66 rc.cpp:504
 #, no-c-format
 msgid "&URL:"
 msgstr "&URL："
 
 #. i18n: file propertieswidgetbase.ui line 64
-#: rc.cpp:69 rc.cpp:672
+#: rc.cpp:69 rc.cpp:507
 #, no-c-format
 msgid "&Name:"
 msgstr "名称(&N)："
 
 #. i18n: file propertieswidgetbase.ui line 83
-#: rc.cpp:72 rc.cpp:675
+#: rc.cpp:72 rc.cpp:510
 #, no-c-format
 msgid "Display name of RSS column"
 msgstr "RSS 列的显示名称"
 
 #. i18n: file propertieswidgetbase.ui line 98
-#: rc.cpp:75 rc.cpp:678
+#: rc.cpp:75 rc.cpp:513
 #, no-c-format
 msgid "U&se a custom update interval"
 msgstr "使用自定义更新间隔(&S)"
 
 #. i18n: file propertieswidgetbase.ui line 134
-#: rc.cpp:78 rc.cpp:681
+#: rc.cpp:78 rc.cpp:516
 #, no-c-format
 msgid "Update &every:"
 msgstr "更新频率(&E)："
 
 #. i18n: file propertieswidgetbase.ui line 160
-#: rc.cpp:81 rc.cpp:684
+#: rc.cpp:81 rc.cpp:519
 #, no-c-format
 msgid "Minutes"
 msgstr "分钟"
 
 #. i18n: file propertieswidgetbase.ui line 165
-#: rc.cpp:84 rc.cpp:687
+#: rc.cpp:84 rc.cpp:522
 #, no-c-format
 msgid "Hours"
 msgstr "小时"
 
 #. i18n: file propertieswidgetbase.ui line 170
-#: rc.cpp:87 rc.cpp:690
+#: rc.cpp:87 rc.cpp:525
 #, no-c-format
 msgid "Days"
 msgstr "天"
 
 #. i18n: file propertieswidgetbase.ui line 175
-#: rc.cpp:90 rc.cpp:693
+#: rc.cpp:90 rc.cpp:528
 #, no-c-format
 msgid "Never"
 msgstr "从不"
 
 #. i18n: file propertieswidgetbase.ui line 192
-#: rc.cpp:93 rc.cpp:696
+#: rc.cpp:93 rc.cpp:531
 #, no-c-format
 msgid "Notify when new articles arri&ve"
 msgstr "新文章到达时通知(&V)"
 
 #. i18n: file propertieswidgetbase.ui line 202
-#: rc.cpp:96 rc.cpp:699
+#: rc.cpp:96 rc.cpp:534
 #, no-c-format
 msgid "Ar&chive"
 msgstr "存档(&C)"
 
 #. i18n: file propertieswidgetbase.ui line 233
-#: rc.cpp:99 rc.cpp:702
+#: rc.cpp:99 rc.cpp:537
 #, no-c-format
 msgid "&Keep all articles"
 msgstr "保留全部文章(&K)"
 
 #. i18n: file propertieswidgetbase.ui line 241
-#: rc.cpp:102 rc.cpp:705
+#: rc.cpp:102 rc.cpp:540
 #, no-c-format
 msgid "Limit archi&ve to:"
 msgstr "存档限制为(&V)："
 
 #. i18n: file propertieswidgetbase.ui line 249
-#: rc.cpp:105 rc.cpp:708
+#: rc.cpp:105 rc.cpp:543
 #, no-c-format
 msgid "&Delete articles older than:"
 msgstr "删除指定时间前的文章(&D)："
 
 #. i18n: file propertieswidgetbase.ui line 260
-#: rc.cpp:108 rc.cpp:213 rc.cpp:711 rc.cpp:810
+#: rc.cpp:108 rc.cpp:219 rc.cpp:546 rc.cpp:984
 #, no-c-format
 msgid " days"
 msgstr " 天"
 
 #. i18n: file propertieswidgetbase.ui line 263
-#: rc.cpp:111 rc.cpp:216 rc.cpp:714 rc.cpp:813
+#: rc.cpp:111 rc.cpp:222 rc.cpp:549 rc.cpp:987
 #, no-c-format
 msgid "1 day"
 msgstr "1 天"
 
 #. i18n: file propertieswidgetbase.ui line 317
-#: rc.cpp:114 rc.cpp:207 rc.cpp:717 rc.cpp:804
+#: rc.cpp:114 rc.cpp:213 rc.cpp:552 rc.cpp:978
 #, no-c-format
 msgid " articles"
 msgstr " 篇文章"
 
 #. i18n: file propertieswidgetbase.ui line 320
-#: rc.cpp:117 rc.cpp:210 rc.cpp:720 rc.cpp:807
+#: rc.cpp:117 rc.cpp:216 rc.cpp:555 rc.cpp:981
 #, no-c-format
 msgid "1 article"
 msgstr "1 篇文章"
 
 #. i18n: file propertieswidgetbase.ui line 334
-#: rc.cpp:120 rc.cpp:723
+#: rc.cpp:120 rc.cpp:558
 #, no-c-format
 msgid "Di&sable archiving"
 msgstr "禁用存档(&S)"
 
 #. i18n: file propertieswidgetbase.ui line 342
-#: rc.cpp:123 rc.cpp:726
+#: rc.cpp:123 rc.cpp:561
 #, no-c-format
 msgid "&Use default settings"
 msgstr "使用默认设置(&U)"
 
 #. i18n: file propertieswidgetbase.ui line 357
-#: rc.cpp:126 rc.cpp:729
+#: rc.cpp:126 rc.cpp:564
 #, no-c-format
 msgid "Adva&nced"
 msgstr "高级(&N)"
 
 #. i18n: file propertieswidgetbase.ui line 376
-#: rc.cpp:129 rc.cpp:732
+#: rc.cpp:129 rc.cpp:567
 #, no-c-format
 msgid "Load the &full website when reading articles"
 msgstr "阅读文章时装入整个网站(&F)"
 
 #. i18n: file propertieswidgetbase.ui line 384
-#: rc.cpp:132 rc.cpp:735
+#: rc.cpp:132 rc.cpp:570
 #, no-c-format
 msgid "Mar&k articles as read when they arrive"
 msgstr "文章到达时将其标为已读(&K)"
 
 #. i18n: file settings_advancedbase.ui line 17
-#: rc.cpp:135 rc.cpp:558
+#: rc.cpp:135 rc.cpp:582
 #, no-c-format
 msgid "SettingsAdvanced"
 msgstr "SettingsAdvanced"
 
 #. i18n: file settings_advancedbase.ui line 39
-#: rc.cpp:141 rc.cpp:564
+#: rc.cpp:141 rc.cpp:588
 #, no-c-format
 msgid "Archive backend:"
 msgstr "存档后端："
 
 #. i18n: file settings_advancedbase.ui line 52
-#: rc.cpp:144 rc.cpp:567
+#: rc.cpp:144 rc.cpp:591
 #, no-c-format
 msgid "&Configure..."
 msgstr "配置(&C)..."
 
 #. i18n: file settings_advancedbase.ui line 62
-#: rc.cpp:147 rc.cpp:570
+#: rc.cpp:147 rc.cpp:594
 #, no-c-format
 msgid "Article List"
 msgstr "文章列表"
 
 #. i18n: file settings_advancedbase.ui line 76
-#: rc.cpp:150 rc.cpp:573
+#: rc.cpp:150 rc.cpp:597
 #, no-c-format
 msgid " sec"
 msgstr " 秒"
 
 #. i18n: file settings_advancedbase.ui line 104
-#: rc.cpp:153 rc.cpp:576
+#: rc.cpp:153 rc.cpp:600
 #, no-c-format
 msgid "Reset search bar when changing feeds"
 msgstr "更改种子时重置搜索栏"
 
 #. i18n: file settings_advancedbase.ui line 118
-#: rc.cpp:156 rc.cpp:579
+#: rc.cpp:156 rc.cpp:603
 #, no-c-format
 msgid "Mar&k selected article read after"
 msgstr "将选中文章标为已读前等(&K)"
 
 #. i18n: file settings_appearance.ui line 42
-#: rc.cpp:165 rc.cpp:534
+#: rc.cpp:165 rc.cpp:903
 #, no-c-format
 msgid "Minimum font size:"
 msgstr "最小字体大小："
 
 #. i18n: file settings_appearance.ui line 81
-#: rc.cpp:168 rc.cpp:537
+#: rc.cpp:168 rc.cpp:906
 #, no-c-format
 msgid "Medium font size:"
 msgstr "中等字体大小："
 
 #. i18n: file settings_appearance.ui line 133
-#: rc.cpp:174 rc.cpp:543
+#: rc.cpp:174 rc.cpp:912
 #, no-c-format
 msgid "Standard font:"
 msgstr "标准字体："
 
 #. i18n: file settings_appearance.ui line 146
-#: rc.cpp:177 rc.cpp:546
+#: rc.cpp:177 rc.cpp:915
 #, no-c-format
 msgid "Fixed font:"
 msgstr "等宽字体："
 
 #. i18n: file settings_appearance.ui line 159
-#: rc.cpp:180 rc.cpp:549
+#: rc.cpp:180 rc.cpp:918
 #, no-c-format
 msgid "Serif font:"
 msgstr "Serif 字体："
 
 #. i18n: file settings_appearance.ui line 172
-#: rc.cpp:183 rc.cpp:552
+#: rc.cpp:183 rc.cpp:921
 #, no-c-format
 msgid "Sans serif font:"
 msgstr "Sans serif 字体："
 
 #. i18n: file settings_appearance.ui line 187
-#: rc.cpp:186 rc.cpp:555
+#: rc.cpp:186 rc.cpp:924
 #, no-c-format
 msgid "&Underline links"
 msgstr "链接加下划线(&U)"
 
+#. i18n: file settings_appearance.ui line 195
+#: rc.cpp:189 rc.cpp:927
+#, no-c-format
+msgid "&Enable favicons"
+msgstr ""
+
+#. i18n: file settings_appearance.ui line 203
+#: rc.cpp:192 rc.cpp:930
+#, no-c-format
+msgid "Automatically load &images"
+msgstr ""
+
 #. i18n: file settings_archive.ui line 39
-#: rc.cpp:192 rc.cpp:789
+#: rc.cpp:198 rc.cpp:963
 #, no-c-format
 msgid "Default Archive Settings"
 msgstr "默认存档设置"
 
 #. i18n: file settings_archive.ui line 50
-#: rc.cpp:195 rc.cpp:792
+#: rc.cpp:201 rc.cpp:966
 #, no-c-format
 msgid "Keep all articles"
 msgstr "保留全部文章"
 
 #. i18n: file settings_archive.ui line 58
-#: rc.cpp:198 rc.cpp:795
+#: rc.cpp:204 rc.cpp:969
 #, no-c-format
 msgid "Limit feed archive size to:"
 msgstr "种子存档大小限制为："
 
 #. i18n: file settings_archive.ui line 66
-#: rc.cpp:201 rc.cpp:798
+#: rc.cpp:207 rc.cpp:972
 #, no-c-format
 msgid "Delete articles older than: "
 msgstr "删除指定时间前的文章："
 
 #. i18n: file settings_archive.ui line 74
-#: rc.cpp:204 rc.cpp:801
+#: rc.cpp:210 rc.cpp:975
 #, no-c-format
 msgid "Disable archiving"
 msgstr "禁用存档"
 
 #. i18n: file settings_archive.ui line 133
-#: rc.cpp:219 rc.cpp:816
+#: rc.cpp:225 rc.cpp:990
 #, no-c-format
 msgid "Do not expire important articles"
 msgstr "不使重要文章过期"
 
 #. i18n: file settings_browser.ui line 17
-#: rc.cpp:222 rc.cpp:621
+#: rc.cpp:228 rc.cpp:633
 #, no-c-format
 msgid "ExternalBrowser"
 msgstr "外部浏览器"
 
 #. i18n: file settings_browser.ui line 31
-#: rc.cpp:225 rc.cpp:624
+#: rc.cpp:231 rc.cpp:636
 #, no-c-format
 msgid "For External Browsing"
 msgstr "对外部浏览"
 
 #. i18n: file settings_browser.ui line 45
-#: rc.cpp:228 rc.cpp:447 rc.cpp:627 rc.cpp:954
+#: rc.cpp:234 rc.cpp:462 rc.cpp:639 rc.cpp:816
 #, no-c-format
 msgid "Use default TDE web browser"
 msgstr "使用 TDE 默认的 Web 浏览器"
 
 #. i18n: file settings_browser.ui line 56
-#: rc.cpp:231 rc.cpp:453 rc.cpp:630 rc.cpp:960
+#: rc.cpp:237 rc.cpp:468 rc.cpp:642 rc.cpp:822
 #, no-c-format
 msgid "Use this command:"
 msgstr "使用此命令："
 
 #. i18n: file settings_browser.ui line 67
-#: rc.cpp:234 rc.cpp:633
+#: rc.cpp:240 rc.cpp:645
 #, no-c-format
 msgid "firefox %u"
 msgstr "firefox %u"
 
 #. i18n: file settings_browser.ui line 77
-#: rc.cpp:237 rc.cpp:636
+#: rc.cpp:243 rc.cpp:648
 #, no-c-format
 msgid "Show tab close button on hover"
 msgstr "悬停时显示关闭标签按钮"
 
 #. i18n: file settings_browser.ui line 146
-#: rc.cpp:249 rc.cpp:648
+#: rc.cpp:255 rc.cpp:660
 #, no-c-format
 msgid "Middle mouse click:"
 msgstr "鼠标中键单击："
 
 #. i18n: file settings_browser.ui line 162
-#: rc.cpp:252 rc.cpp:651
+#: rc.cpp:258 rc.cpp:663
 #, no-c-format
 msgid "Left mouse click:"
 msgstr "鼠标左键单击："
 
 #. i18n: file settings_general.ui line 31
-#: rc.cpp:267 rc.cpp:489
+#: rc.cpp:273 rc.cpp:855
 #, no-c-format
 msgid "Global"
 msgstr "全局"
 
 #. i18n: file settings_general.ui line 42
-#: rc.cpp:270 rc.cpp:492
+#: rc.cpp:276 rc.cpp:858
 #, no-c-format
 msgid "&Use interval fetching"
 msgstr "使用间隔性获取(&U)"
 
 #. i18n: file settings_general.ui line 50
-#: rc.cpp:273 rc.cpp:495
+#: rc.cpp:279 rc.cpp:861
 #, no-c-format
 msgid "Use &notifications for all feeds"
 msgstr "为全部种子使用通知(&N)"
 
 #. i18n: file settings_general.ui line 56
-#: rc.cpp:276 rc.cpp:498
+#: rc.cpp:282 rc.cpp:864
 #, no-c-format
 msgid "Select this if you want to get notified when there are new articles."
 msgstr "如果您想要在有新文章时获得通知，请选中此选项。"
 
 #. i18n: file settings_general.ui line 64
-#: rc.cpp:279 rc.cpp:501
+#: rc.cpp:285 rc.cpp:867
 #, no-c-format
 msgid "Show tra&y icon"
 msgstr "显示托盘图标(&Y)"
 
 #. i18n: file settings_general.ui line 75
-#: rc.cpp:282 rc.cpp:504
+#: rc.cpp:288 rc.cpp:870
 #, no-c-format
 msgid "Fetch feeds every:"
 msgstr "种子获取间隔："
 
 #. i18n: file settings_general.ui line 86
-#: rc.cpp:285 rc.cpp:507
+#: rc.cpp:291 rc.cpp:873
 #, no-c-format
 msgid " minutes"
 msgstr " 分钟"
 
 #. i18n: file settings_general.ui line 89
-#: rc.cpp:288 rc.cpp:510
+#: rc.cpp:294 rc.cpp:876
 #, no-c-format
 msgid "1 minute"
 msgstr "1 分钟"
 
 #. i18n: file settings_general.ui line 108
-#: rc.cpp:291 rc.cpp:513
+#: rc.cpp:297 rc.cpp:879
 #, no-c-format
 msgid "Startup"
 msgstr "启动"
 
 #. i18n: file settings_general.ui line 119
-#: rc.cpp:294 rc.cpp:516
+#: rc.cpp:300 rc.cpp:882
 #, no-c-format
 msgid "Mark &all feeds as read on startup"
 msgstr "启动时将全部种子标为已读(&A)"
 
 #. i18n: file settings_general.ui line 127
-#: rc.cpp:297 rc.cpp:519
+#: rc.cpp:303 rc.cpp:885
 #, no-c-format
 msgid "Fetch all fee&ds on startup"
 msgstr "启动时获取全部种子(&D)"
 
-#. i18n: file settings_general.ui line 154
-#: rc.cpp:300 rc.cpp:522
+#. i18n: file settings_general.ui line 135
+#: rc.cpp:306 rc.cpp:888
+#, fuzzy, no-c-format
+msgid "Disable the &introduction page"
+msgstr "禁用介绍页面"
+
+#. i18n: file settings_general.ui line 162
+#: rc.cpp:309 rc.cpp:891
 #, no-c-format
 msgid "Network"
 msgstr "网络"
 
-#. i18n: file settings_general.ui line 165
-#: rc.cpp:303 rc.cpp:525
+#. i18n: file settings_general.ui line 173
+#: rc.cpp:312 rc.cpp:894
 #, no-c-format
 msgid "Use the &browser cache (less network traffic)"
 msgstr "使用浏览器缓存(可降低网络流量)(&B)"
 
 #. i18n: file tagpropertieswidgetbase.ui line 36
-#: rc.cpp:306 rc.cpp:738
+#: rc.cpp:315 rc.cpp:573
 #, no-c-format
 msgid "Title:"
 msgstr "标题："
 
 #. i18n: file tagpropertieswidgetbase.ui line 76
-#: rc.cpp:309 rc.cpp:741
+#: rc.cpp:318 rc.cpp:576
 #, no-c-format
 msgid "Icon:"
 msgstr "图标："
 
 #. i18n: file akregator.kcfg line 10
-#: rc.cpp:315 rc.cpp:822
+#: rc.cpp:324 rc.cpp:678
 #, no-c-format
 msgid "Show Quick Filter Bar"
 msgstr "显示快速过滤器栏"
 
 #. i18n: file akregator.kcfg line 14
-#: rc.cpp:318 rc.cpp:825
+#: rc.cpp:327 rc.cpp:681
 #, no-c-format
 msgid "Status Filter"
 msgstr "状态过滤器"
 
 #. i18n: file akregator.kcfg line 15
-#: rc.cpp:321 rc.cpp:828
+#: rc.cpp:330 rc.cpp:684
 #, no-c-format
 msgid "Stores the last status filter setting"
 msgstr "存储上次的状态过滤器设置"
 
 #. i18n: file akregator.kcfg line 19
-#: rc.cpp:324 rc.cpp:831
+#: rc.cpp:333 rc.cpp:687
 #, no-c-format
 msgid "Text Filter"
 msgstr "文本过滤器"
 
 #. i18n: file akregator.kcfg line 20
-#: rc.cpp:327 rc.cpp:834
+#: rc.cpp:336 rc.cpp:690
 #, no-c-format
 msgid "Stores the last search line text"
 msgstr "存储上次搜索的文本"
 
 #. i18n: file akregator.kcfg line 23
-#: rc.cpp:330 rc.cpp:837
+#: rc.cpp:339 rc.cpp:693
 #, no-c-format
 msgid "View Mode"
 msgstr "视图模式"
 
 #. i18n: file akregator.kcfg line 24
-#: rc.cpp:333 rc.cpp:840
+#: rc.cpp:342 rc.cpp:696
 #, no-c-format
 msgid "Article display mode."
 msgstr "文章显示模式。"
 
 #. i18n: file akregator.kcfg line 28
-#: rc.cpp:336 rc.cpp:843
+#: rc.cpp:345 rc.cpp:699
 #, no-c-format
 msgid "Sizes for first splitter"
 msgstr "第一分隔符的大小"
 
 #. i18n: file akregator.kcfg line 29
-#: rc.cpp:339 rc.cpp:846
+#: rc.cpp:348 rc.cpp:702
 #, no-c-format
 msgid "First (usually vertical) splitter widget sizes."
 msgstr "第一个分隔符(通常为垂直)部件的大小。"
 
 #. i18n: file akregator.kcfg line 33
-#: rc.cpp:342 rc.cpp:849
+#: rc.cpp:351 rc.cpp:705
 #, no-c-format
 msgid "Sizes for second splitter"
 msgstr "第二分隔符的大小"
 
 #. i18n: file akregator.kcfg line 34
-#: rc.cpp:345 rc.cpp:852
+#: rc.cpp:354 rc.cpp:708
 #, no-c-format
 msgid "Second (usually horizontal) splitter widget sizes."
 msgstr "第二个分隔符(通常为水平)部件的大小。"
 
-#. i18n: file akregator.kcfg line 57
-#: rc.cpp:348 rc.cpp:855
+#. i18n: file akregator.kcfg line 61
+#: rc.cpp:357 rc.cpp:711
 #, no-c-format
 msgid "Archive Mode"
 msgstr "存档模式"
 
-#. i18n: file akregator.kcfg line 61
-#: rc.cpp:351 rc.cpp:858
+#. i18n: file akregator.kcfg line 65
+#: rc.cpp:360 rc.cpp:714
 #, no-c-format
 msgid "Keep All Articles"
 msgstr "保留全部文章"
 
-#. i18n: file akregator.kcfg line 62
-#: rc.cpp:354 rc.cpp:861
+#. i18n: file akregator.kcfg line 66
+#: rc.cpp:363 rc.cpp:717
 #, no-c-format
 msgid "Save an unlimited number of articles."
 msgstr "保存时不限制文章数。"
 
-#. i18n: file akregator.kcfg line 65
-#: rc.cpp:357 rc.cpp:864
+#. i18n: file akregator.kcfg line 69
+#: rc.cpp:366 rc.cpp:720
 #, no-c-format
 msgid "Limit Number of Articles"
 msgstr "限制文章数"
 
-#. i18n: file akregator.kcfg line 66
-#: rc.cpp:360 rc.cpp:867
+#. i18n: file akregator.kcfg line 70
+#: rc.cpp:369 rc.cpp:723
 #, no-c-format
 msgid "Limit the number of articles in a feed"
 msgstr "限制一个种子中的文章数"
 
-#. i18n: file akregator.kcfg line 69
-#: rc.cpp:363 rc.cpp:870
+#. i18n: file akregator.kcfg line 73
+#: rc.cpp:372 rc.cpp:726
 #, no-c-format
 msgid "Delete Expired Articles"
 msgstr "删除过期文章"
 
-#. i18n: file akregator.kcfg line 70
-#: rc.cpp:366 rc.cpp:873
+#. i18n: file akregator.kcfg line 74
+#: rc.cpp:375 rc.cpp:729
 #, no-c-format
 msgid "Delete expired articles"
 msgstr "删除过期的文章"
 
-#. i18n: file akregator.kcfg line 73
-#: rc.cpp:369 rc.cpp:876
+#. i18n: file akregator.kcfg line 77
+#: rc.cpp:378 rc.cpp:732
 #, no-c-format
 msgid "Disable Archiving"
 msgstr "禁用存档"
 
-#. i18n: file akregator.kcfg line 74
-#: rc.cpp:372 rc.cpp:879
+#. i18n: file akregator.kcfg line 78
+#: rc.cpp:381 rc.cpp:735
 #, no-c-format
 msgid "Do not save any articles"
 msgstr "不保存任何文章"
 
-#. i18n: file akregator.kcfg line 79
-#: rc.cpp:375 rc.cpp:882
+#. i18n: file akregator.kcfg line 83
+#: rc.cpp:384 rc.cpp:738
 #, no-c-format
 msgid "Expiry Age"
 msgstr "过期时限"
 
-#. i18n: file akregator.kcfg line 80
-#: rc.cpp:378 rc.cpp:885
+#. i18n: file akregator.kcfg line 84
+#: rc.cpp:387 rc.cpp:741
 #, no-c-format
 msgid "Default expiry age for articles in days."
 msgstr "文章的默认过期时限，以天计。"
 
-#. i18n: file akregator.kcfg line 84
-#: rc.cpp:381 rc.cpp:888
+#. i18n: file akregator.kcfg line 88
+#: rc.cpp:390 rc.cpp:744
 #, no-c-format
 msgid "Article Limit"
 msgstr "文章限制"
 
-#. i18n: file akregator.kcfg line 85
-#: rc.cpp:384 rc.cpp:891
+#. i18n: file akregator.kcfg line 89
+#: rc.cpp:393 rc.cpp:747
 #, no-c-format
 msgid "Number of articles to keep per feed."
 msgstr "每个种子要保留的文章数。"
 
-#. i18n: file akregator.kcfg line 89
-#: rc.cpp:387 rc.cpp:894
+#. i18n: file akregator.kcfg line 93
+#: rc.cpp:396 rc.cpp:750
 #, no-c-format
 msgid "Do Not Expire Important Articles"
 msgstr "不让重要文章过期"
 
-#. i18n: file akregator.kcfg line 90
-#: rc.cpp:390 rc.cpp:897
+#. i18n: file akregator.kcfg line 94
+#: rc.cpp:399 rc.cpp:753
 #, no-c-format
 msgid ""
 "When this option is enabled, articles you marked as important will not be "
 "removed when limit the archive size by either age or number of the articles."
 msgstr "启用此选项时，您标为重要的文章在达到文章时限或数量限制时将不会被删除。"
 
-#. i18n: file akregator.kcfg line 96
-#: rc.cpp:393 rc.cpp:900
+#. i18n: file akregator.kcfg line 100
+#: rc.cpp:402 rc.cpp:756
 #, no-c-format
 msgid "Concurrent Fetches"
 msgstr "并发获取"
 
-#. i18n: file akregator.kcfg line 97
-#: rc.cpp:396 rc.cpp:903
+#. i18n: file akregator.kcfg line 101
+#: rc.cpp:405 rc.cpp:759
 #, no-c-format
 msgid "Number of concurrent fetches"
 msgstr "并发获取数"
 
-#. i18n: file akregator.kcfg line 101
-#: rc.cpp:399 rc.cpp:906
+#. i18n: file akregator.kcfg line 105
+#: rc.cpp:408 rc.cpp:762
 #, no-c-format
 msgid "Use HTML Cache"
 msgstr "使用 HTML 缓存"
 
-#. i18n: file akregator.kcfg line 102
-#: rc.cpp:402 rc.cpp:909
+#. i18n: file akregator.kcfg line 106
+#: rc.cpp:411 rc.cpp:765
 #, no-c-format
 msgid ""
 "Use the TDE-wide HTML cache settings when downloading feeds, to avoid "
 "unnecessary traffic. Disable only when necessary."
 msgstr "下载种子时使用 TDE 全局的 HTML 缓存设置，以避免不必要的流量。请仅当需要时才禁用。"
 
-#. i18n: file akregator.kcfg line 108
-#: rc.cpp:405 rc.cpp:912
+#. i18n: file akregator.kcfg line 112
+#: rc.cpp:414 rc.cpp:768
+#, fuzzy, no-c-format
+msgid "Disable the introduction page"
+msgstr "禁用介绍页面"
+
+#. i18n: file akregator.kcfg line 113
+#: rc.cpp:417 rc.cpp:771
+#, fuzzy, no-c-format
+msgid "Disable the introduction page."
+msgstr "禁用介绍页面"
+
+#. i18n: file akregator.kcfg line 117
+#: rc.cpp:420 rc.cpp:774
 #, no-c-format
 msgid "Fetch on startup"
 msgstr "启动时获取"
 
-#. i18n: file akregator.kcfg line 109
-#: rc.cpp:408 rc.cpp:915
+#. i18n: file akregator.kcfg line 118
+#: rc.cpp:423 rc.cpp:777
 #, no-c-format
 msgid "Fetch feedlist on startup."
 msgstr "启动时获取种子列表。"
 
-#. i18n: file akregator.kcfg line 113
-#: rc.cpp:411 rc.cpp:918
+#. i18n: file akregator.kcfg line 122
+#: rc.cpp:426 rc.cpp:780
 #, no-c-format
 msgid "Mark all feeds as read on startup"
 msgstr "启动时将全部种子标为已读"
 
-#. i18n: file akregator.kcfg line 114
-#: rc.cpp:414 rc.cpp:921
+#. i18n: file akregator.kcfg line 123
+#: rc.cpp:429 rc.cpp:783
 #, no-c-format
 msgid "Mark all feeds as read on startup."
 msgstr "启动时将全部种子标为已读。"
 
-#. i18n: file akregator.kcfg line 118
-#: rc.cpp:417 rc.cpp:924
+#. i18n: file akregator.kcfg line 127
+#: rc.cpp:432 rc.cpp:786
 #, no-c-format
 msgid "Use interval fetching"
 msgstr "使用间隔性获取"
 
-#. i18n: file akregator.kcfg line 119
-#: rc.cpp:420 rc.cpp:927
+#. i18n: file akregator.kcfg line 128
+#: rc.cpp:435 rc.cpp:789
 #, no-c-format
 msgid "Fetch all feeds every %1 minutes."
 msgstr "每隔 %1 分钟获取全部种子。"
 
-#. i18n: file akregator.kcfg line 123
-#: rc.cpp:423 rc.cpp:930
+#. i18n: file akregator.kcfg line 132
+#: rc.cpp:438 rc.cpp:792
 #, no-c-format
 msgid "Interval for autofetching"
 msgstr "自动获取的间隔"
 
-#. i18n: file akregator.kcfg line 124
-#: rc.cpp:426 rc.cpp:933
+#. i18n: file akregator.kcfg line 133
+#: rc.cpp:441 rc.cpp:795
 #, no-c-format
 msgid "Interval for autofetching in minutes."
 msgstr "自动获取的间隔，以分钟计。"
 
-#. i18n: file akregator.kcfg line 128
-#: rc.cpp:429 rc.cpp:936
+#. i18n: file akregator.kcfg line 137
+#: rc.cpp:444 rc.cpp:798
 #, no-c-format
 msgid "Use notifications"
 msgstr "使用通知"
 
-#. i18n: file akregator.kcfg line 129
-#: rc.cpp:432 rc.cpp:939
+#. i18n: file akregator.kcfg line 138
+#: rc.cpp:447 rc.cpp:801
 #, no-c-format
 msgid "Specifies if the balloon notifications are used or not."
 msgstr "指定是否要使用气泡通知。"
 
-#. i18n: file akregator.kcfg line 133
-#: rc.cpp:435 rc.cpp:942
+#. i18n: file akregator.kcfg line 142
+#: rc.cpp:450 rc.cpp:804
 #, no-c-format
 msgid "Show tray icon"
 msgstr "显示托盘图标"
 
-#. i18n: file akregator.kcfg line 134
-#: rc.cpp:438 rc.cpp:945
+#. i18n: file akregator.kcfg line 143
+#: rc.cpp:453 rc.cpp:807
 #, no-c-format
 msgid "Specifies if the tray icon is shown or not."
 msgstr "指定是否要显示托盘图标。"
 
-#. i18n: file akregator.kcfg line 140
-#: rc.cpp:441 rc.cpp:948
+#. i18n: file akregator.kcfg line 149
+#: rc.cpp:456 rc.cpp:810
 #, no-c-format
 msgid "Show close buttons on tabs"
 msgstr "在标签上显示关闭按钮"
 
-#. i18n: file akregator.kcfg line 141
-#: rc.cpp:444 rc.cpp:951
+#. i18n: file akregator.kcfg line 150
+#: rc.cpp:459 rc.cpp:813
 #, no-c-format
 msgid "Show close buttons on tabs instead of icons"
 msgstr "在标签上显示关闭按钮而非图标"
 
-#. i18n: file akregator.kcfg line 147
-#: rc.cpp:450 rc.cpp:957
+#. i18n: file akregator.kcfg line 156
+#: rc.cpp:465 rc.cpp:819
 #, no-c-format
 msgid "Use TDE web browser when opening in external browser."
 msgstr "在外部浏览器中打开时使用 TDE Web 浏览器。"
 
-#. i18n: file akregator.kcfg line 152
-#: rc.cpp:456 rc.cpp:963
+#. i18n: file akregator.kcfg line 161
+#: rc.cpp:471 rc.cpp:825
 #, no-c-format
 msgid "Use the specified command when opening in external browser."
 msgstr "在外部浏览器中打开时使用指定的命令。"
 
-#. i18n: file akregator.kcfg line 156
-#: rc.cpp:459 rc.cpp:966
+#. i18n: file akregator.kcfg line 165
+#: rc.cpp:474 rc.cpp:828
 #, no-c-format
 msgid "Command to launch external browser.  URL will substitute for %u."
 msgstr "调用外部浏览器的命令。URL 将会替代 %u 占位符。"
 
-#. i18n: file akregator.kcfg line 160
-#: rc.cpp:462 rc.cpp:969
+#. i18n: file akregator.kcfg line 169
+#: rc.cpp:477 rc.cpp:831
 #, no-c-format
 msgid "What the click with left mouse button should do."
 msgstr "单击鼠标左键时应执行何种操作。"
 
-#. i18n: file akregator.kcfg line 169
-#: rc.cpp:465 rc.cpp:972
+#. i18n: file akregator.kcfg line 178
+#: rc.cpp:480 rc.cpp:834
 #, no-c-format
 msgid "What the click with middle mouse button should do."
 msgstr "单击鼠标中键时应执行何种操作。"
 
-#. i18n: file akregator.kcfg line 197
-#: rc.cpp:468 rc.cpp:975
+#. i18n: file akregator.kcfg line 206
+#: rc.cpp:483 rc.cpp:837
 #, no-c-format
 msgid "Archive Backend"
 msgstr "存档后端"
 
-#. i18n: file akregator.kcfg line 201
-#: rc.cpp:471 rc.cpp:978
+#. i18n: file akregator.kcfg line 210
+#: rc.cpp:486 rc.cpp:840
 #, no-c-format
 msgid "Whether to delay before marking an article as read upon selecting it."
 msgstr "选中文章和将其标为已读之间是否要延迟。"
 
-#. i18n: file akregator.kcfg line 205
-#: rc.cpp:474 rc.cpp:981
+#. i18n: file akregator.kcfg line 214
+#: rc.cpp:489 rc.cpp:843
 #, no-c-format
 msgid ""
 "Configurable delay between selecting and article and it being marked as read."
 msgstr "配置选中文章和标为已读之间的延时。"
 
-#. i18n: file akregator.kcfg line 209
-#: rc.cpp:477 rc.cpp:984
+#. i18n: file akregator.kcfg line 218
+#: rc.cpp:492 rc.cpp:846
 #, no-c-format
 msgid "Resets the quick filter when changing feeds."
 msgstr "更改种子时重置快速过滤器。"
 
-#. i18n: file akregator.kcfg line 214
-#: rc.cpp:480 rc.cpp:987
+#. i18n: file akregator.kcfg line 223
+#: rc.cpp:495 rc.cpp:849
 #, no-c-format
 msgid "Show Tagging GUI elements (unfinished)"
 msgstr "显示标签 GUI 元素(未完成)"
 
-#. i18n: file ./mk4storage/mk4config.kcfg line 9
-#: rc.cpp:744
-#, no-c-format
-msgid "Commit Interval"
-msgstr "提交间隔"
-
-#. i18n: file ./mk4storage/mk4config.kcfg line 10
-#: rc.cpp:747
-#, no-c-format
-msgid "Commit interval in seconds for writing back changes"
-msgstr "回写更改时，提交间隔的秒数"
-
-#. i18n: file ./mk4storage/mk4config.kcfg line 14
-#: rc.cpp:750
-#, no-c-format
-msgid "Path to archive"
-msgstr "无存档路径"
-
 #. i18n: file ./mk4storage/mk4confwidgetbase.ui line 16
-#: rc.cpp:753
+#: rc.cpp:993
 #, no-c-format
 msgid "Metakit Settings"
 msgstr "Metakit 设置"
 
 #. i18n: file ./mk4storage/mk4confwidgetbase.ui line 41
-#: rc.cpp:756
+#: rc.cpp:996
 #, no-c-format
 msgid "Use default location"
 msgstr "使用默认位置"
 
 #. i18n: file ./mk4storage/mk4confwidgetbase.ui line 60
-#: rc.cpp:759
+#: rc.cpp:999
 #, no-c-format
 msgid "Archive location:"
 msgstr "存档位置："
 
+#. i18n: file ./mk4storage/mk4config.kcfg line 9
+#: rc.cpp:1011
+#, no-c-format
+msgid "Commit Interval"
+msgstr "提交间隔"
+
+#. i18n: file ./mk4storage/mk4config.kcfg line 10
+#: rc.cpp:1014
+#, no-c-format
+msgid "Commit interval in seconds for writing back changes"
+msgstr "回写更改时，提交间隔的秒数"
+
+#. i18n: file ./mk4storage/mk4config.kcfg line 14
+#: rc.cpp:1017
+#, no-c-format
+msgid "Path to archive"
+msgstr "无存档路径"
+
 #: searchbar.cpp:75
 msgid "S&earch:"
 msgstr "搜索(&E)："
@@ -1798,7 +1824,7 @@ msgstr "标记属性"
 msgid "Akregator - RSS Feed Reader"
 msgstr "Akregator - RSS 种子阅读器"
 
-#: trayicon.cpp:134
+#: trayicon.cpp:146
 #, c-format
 msgid ""
 "_n: Akregator - 1 unread article\n"
@@ -1820,3 +1846,21 @@ msgstr "复制链接地址(&L)"
 #: viewer.cpp:80
 msgid "&Save Link As..."
 msgstr "链接另存为(&S)..."
+
+#~ msgid "Akregator News"
+#~ msgstr "Akregator 新闻"
+
+#~ msgid "Akregator Blog"
+#~ msgstr "Akregator 博客"
+
+#~ msgid "TDE Dot News"
+#~ msgstr "TDE Dot News"
+
+#~ msgid "Planet TDE"
+#~ msgstr "Planet TDE"
+
+#~ msgid "TDE Apps"
+#~ msgstr "TDE Apps"
+
+#~ msgid "TDE Look"
+#~ msgstr "TDE Look"
diff --git a/tde-i18n-zh_CN/messages/tdepim/kaddressbook.po b/tde-i18n-zh_CN/messages/tdepim/kaddressbook.po
index 5b3e8c5dcac..693284faf82 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kaddressbook.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kaddressbook.po
@@ -9,16 +9,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kaddressbook\n"
-"POT-Creation-Date: 2008-08-19 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-02-25 16:47+0800\n"
 "Last-Translator: Levin <zsdjw@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: customfieldswidget.h:156
+#: customfieldswidget.h:159
 msgid "Custom Fields"
 msgstr "自定义字段"
 
@@ -1026,7 +1027,7 @@ msgid ""
 "Address Types"
 msgstr "地址类型"
 
-#: addresseeeditordialog.cpp:39 undocmds.cpp:197
+#: addresseeeditordialog.cpp:39 undocmds.cpp:213
 msgid "Edit Contact"
 msgstr "编辑联系人"
 
@@ -1034,7 +1035,7 @@ msgstr "编辑联系人"
 msgid "Edit Contact '%1'"
 msgstr "编辑联系人“%1”"
 
-#: addresseeeditorextension.cpp:68
+#: addresseeeditorextension.cpp:74
 msgid "Contact Editor"
 msgstr "联系人编辑器"
 
@@ -1072,7 +1073,7 @@ msgstr "%1："
 msgid "Blog feed:"
 msgstr "博客种子："
 
-#: addresseeeditorwidget.cpp:292 tdeabcore.cpp:1356
+#: addresseeeditorwidget.cpp:292 kabcore.cpp:1418
 msgid "Select Categories..."
 msgstr "选择类别..."
 
@@ -1198,46 +1199,46 @@ msgstr "时间"
 msgid "Date & Time"
 msgstr "日期和时间"
 
-#: customfieldswidget.cpp:405
+#: customfieldswidget.cpp:433
 msgid "A field with the same name already exists, please choose another one."
 msgstr "同名的字段已经存在，请选择另一个名称。"
 
-#: customfieldswidget.cpp:434
+#: customfieldswidget.cpp:462
 msgid "Remove Field"
 msgstr "删除字段"
 
-#: customfieldswidget.cpp:435
+#: customfieldswidget.cpp:463
 msgid "Select the field you want to remove:"
 msgstr "选择您想要删除的字段："
 
-#: customfieldswidget.cpp:466
+#: customfieldswidget.cpp:494
 msgid "Add Field..."
 msgstr "添加字段..."
 
-#: customfieldswidget.cpp:469
+#: customfieldswidget.cpp:497
 msgid "Remove Field..."
 msgstr "删除字段..."
 
-#: distributionlisteditor.cpp:161
+#: distributionlisteditor.cpp:165
 msgid "Edit Distribution List"
 msgstr "编辑分发列表"
 
-#: distributionlisteditor.cpp:170 filtereditdialog.cpp:122
+#: distributionlisteditor.cpp:174 filtereditdialog.cpp:122
 #: simpleaddresseeeditor.cpp:70
 msgid "Name:"
 msgstr "姓名："
 
-#: distributionlisteditor.cpp:180
+#: distributionlisteditor.cpp:184
 msgid "Distribution list members:"
 msgstr "分发列表成员："
 
-#: distributionlisteditor.cpp:259
+#: distributionlisteditor.cpp:264
 msgid ""
 "A distribution list with the name %1 already exists. Please choose another "
 "name."
 msgstr "名为 %1 的分发列表已经存在。请选择另一个名称。"
 
-#: distributionlisteditor.cpp:259
+#: distributionlisteditor.cpp:264
 msgid "Name in Use"
 msgstr "名称已使用"
 
@@ -1350,11 +1351,11 @@ msgstr "仅显示不符合选中类别的联系人"
 msgid "Edit Address Book Filters"
 msgstr "编辑地址簿过滤器"
 
-#: filtereditdialog.cpp:269
+#: features/resourceselection.cpp:187 filtereditdialog.cpp:269
 msgid "&Add..."
 msgstr "添加(&A)..."
 
-#: filtereditdialog.cpp:270
+#: features/resourceselection.cpp:182 filtereditdialog.cpp:270
 msgid "&Edit..."
 msgstr "编辑(&E)..."
 
@@ -1418,7 +1419,7 @@ msgstr "找不到此联系人的图像。"
 msgid "Reset"
 msgstr "重置"
 
-#: imagewidget.cpp:258
+#: imagewidget.cpp:260
 msgid "Picture"
 msgstr "图片"
 
@@ -1465,353 +1466,400 @@ msgstr "可见字段"
 msgid "All Fields"
 msgstr "全部字段"
 
-#: tdeabcore.cpp:115
+#: kabcore.cpp:117
 msgid "Unable to load '%1'."
 msgstr "无法加载“%1”。"
 
-#: tdeabcore.cpp:121 ldapsearchdialog.cpp:95 ldapsearchdialog.cpp:307
+#: kabcore.cpp:123 ldapsearchdialog.cpp:95 ldapsearchdialog.cpp:307
 msgid "Department"
 msgstr "部门"
 
-#: tdeabcore.cpp:124
+#: kabcore.cpp:126
 msgid "Profession"
 msgstr "职业"
 
-#: tdeabcore.cpp:126
+#: kabcore.cpp:128
 msgid "Assistant's Name"
 msgstr "助手姓名"
 
-#: tdeabcore.cpp:128
+#: kabcore.cpp:130
 msgid "Manager's Name"
 msgstr "经理姓名"
 
-#: tdeabcore.cpp:130
+#: kabcore.cpp:132
 msgid "Partner's Name"
 msgstr "合作伙伴姓名"
 
-#: tdeabcore.cpp:132
+#: kabcore.cpp:134
 msgid "Office"
 msgstr "办公室"
 
-#: tdeabcore.cpp:134
+#: kabcore.cpp:136
 msgid "IM Address"
 msgstr "即时通讯地址"
 
-#: tdeabcore.cpp:136
+#: kabcore.cpp:138
 msgid "Anniversary"
 msgstr "周年纪念日"
 
-#: tdeabcore.cpp:138
+#: kabcore.cpp:140
 msgid "Blog"
 msgstr "网志"
 
-#: tdeabcore.cpp:297
+#: kabcore.cpp:315
 msgid "KAddressBook"
 msgstr "KAddressBook"
 
-#: tdeabcore.cpp:298
+#: kabcore.cpp:316
 msgid "The TDE Address Book"
 msgstr "TDE 地址簿"
 
-#: tdeabcore.cpp:300
-msgid "(c) 1997-2005, The TDE PIM Team"
+#: kabcore.cpp:318
+#, fuzzy
+msgid ""
+"(c) 2008-2010, The Trinity Team\n"
+"(c) 1997-2005, The KDE PIM Team"
 msgstr "(c) 1997-2005，TDE PIM 开发组"
 
-#: tdeabcore.cpp:301
+#: kabcore.cpp:319
 msgid "Current maintainer"
 msgstr "目前维护者"
 
-#: tdeabcore.cpp:302
+#: kabcore.cpp:320
+#, fuzzy
+msgid "Previous maintainer"
+msgstr "目前维护者"
+
+#: kabcore.cpp:321
 msgid "Original author"
 msgstr "原作者"
 
-#: tdeabcore.cpp:304
+#: kabcore.cpp:323
 msgid "Co-maintainer, libtdeabc port, CSV import/export"
 msgstr "合作维护者，libtdeabc 移植，CSV 导入/导出"
 
-#: tdeabcore.cpp:306
+#: kabcore.cpp:325
 msgid "GUI and framework redesign"
 msgstr "GUI 和框架重新设计"
 
-#: tdeabcore.cpp:308
+#: kabcore.cpp:327
 msgid "DCOP interface"
 msgstr "DCOP 接口"
 
-#: tdeabcore.cpp:309
+#: kabcore.cpp:328
 msgid "Contact pinning"
 msgstr "联系人插销"
 
-#: tdeabcore.cpp:310 tdeabcore.cpp:312
+#: kabcore.cpp:329 kabcore.cpp:331
 msgid "LDAP Lookup"
 msgstr "LDAP 查询"
 
-#: tdeabcore.cpp:467
+#: kabcore.cpp:500
 #, c-format
 msgid ""
 "_n: Do you really want to delete this distribution list?\n"
 "Do you really want to delete these %n distribution lists?"
 msgstr "您真的想要删除这 %n 个分发列表吗？"
 
-#: tdeabcore.cpp:493
+#: kabcore.cpp:531
 #, c-format
 msgid ""
-"_n: Do you really want to delete this contact?\n"
-"Do you really want to delete these %n contacts?"
-msgstr "您真的想要删除选中的 %n 个联系人吗？"
+"_n: <qt>Do you really want to delete this contact from your addressbook?"
+"<br><b>Note:</b>The contact will be also removed from all distribution "
+"lists.</qt>\n"
+"<qt>Do you really want to delete these %n contacts from your addressbook?"
+"<br><b>Note:</b>The contacts will be also removed from all distribution "
+"lists.</qt>"
+msgstr ""
 
-#: tdeabcore.cpp:589
+#: kabcore.cpp:638
 msgid "Please select only one contact."
 msgstr "请只选择一个联系人。"
 
-#: tdeabcore.cpp:593
+#: kabcore.cpp:642
 msgid ""
 "<qt>Do you really want to use <b>%1</b> as your new personal contact?</qt>"
 msgstr "<qt>您确定要使用 <b>%1</b> 作为您新的个人联系人吗？</qt>"
 
-#: tdeabcore.cpp:594
+#: kabcore.cpp:643
 msgid "Use"
 msgstr "使用"
 
-#: tdeabcore.cpp:594
+#: kabcore.cpp:643
 msgid "Do Not Use"
 msgstr "不使用"
 
-#: features/distributionlistwidget.cpp:266 tdeabcore.cpp:664
+#: features/distributionlistwidget.cpp:266 kabcore.cpp:717
 msgid "New Distribution List"
 msgstr "新建分发列表"
 
-#: tdeabcore.cpp:670
+#: kabcore.cpp:723
 msgid "New Distribution List (%1)"
 msgstr "新建分发列表(%1)"
 
-#: tdeabcore.cpp:859
+#: kabcore.cpp:900
 msgid "<qt>Unable to save address book <b>%1</b>.</qt>"
 msgstr "<qt>无法保存地址簿 <b>%1</b>。</qt>"
 
-#: tdeabcore.cpp:866
+#: kabcore.cpp:907
 msgid "<qt>Unable to get access for saving the address book <b>%1</b>.</qt>"
 msgstr "<qt>无法获得保存地址簿 <b>%1</b> 的访问权。</qt>"
 
-#: tdeabcore.cpp:970
+#: kabcore.cpp:1021
 msgid ""
 "Your TDE installation is missing LDAP support, please ask your administrator or "
 "distributor for more information."
 msgstr "您的 TDE 安装缺少 LDAP 支持，有关详情请询问您的管理员或发行版。"
 
-#: tdeabcore.cpp:972
+#: kabcore.cpp:1023
 msgid "No LDAP IO Slave Available"
 msgstr "没有可用的 LDAP IO 仆人"
 
-#: tdeabcore.cpp:1008
+#: kabcore.cpp:1059
 msgid "Address Book"
 msgstr "地址簿"
 
-#: tdeabcore.cpp:1011
+#: kabcore.cpp:1062
 msgid "Print Addresses"
 msgstr "打印地址"
 
-#: tdeabcore.cpp:1177 tdeabcore.cpp:1630
+#: kabcore.cpp:1228 kabcore.cpp:1731
 msgid "Contacts"
 msgstr "联系人"
 
-#: tdeabcore.cpp:1258
+#: kabcore.cpp:1242
+#, fuzzy
+msgid "Add contacts to the distribution list"
+msgstr "添加分发列表"
+
+#: kabcore.cpp:1244
+msgid ""
+"Click this button if you want to add more contacts to the current distribution "
+"list. You will be shown a dialog that allows to enter a list of existing "
+"contacts to this distribution list."
+msgstr ""
+
+#: kabcore.cpp:1256
+#, fuzzy
+msgid "Remove contacts from the distribution list"
+msgstr "删除分发列表"
+
+#: kabcore.cpp:1258
+msgid ""
+"Click this button if you want to remove the selected contacts from the current "
+"distribution list."
+msgstr ""
+
+#: kabcore.cpp:1320
 msgid "&Send Email to Contact..."
 msgstr "给联系人发送电子邮件(&S)..."
 
-#: tdeabcore.cpp:1261
+#: kabcore.cpp:1323
 msgid "Send a mail to all selected contacts."
 msgstr "给选中的全部联系人发送邮件。"
 
-#: tdeabcore.cpp:1262
+#: kabcore.cpp:1324
 msgid "Print a special number of contacts."
 msgstr "打印特别数目的联系人。"
 
-#: tdeabcore.cpp:1266
+#: kabcore.cpp:1328
 msgid "Save all changes of the address book to the storage backend."
 msgstr "将对地址簿的全部更改保存到存储后台中。"
 
-#: tdeabcore.cpp:1268
+#: kabcore.cpp:1330
 msgid "&New Contact..."
 msgstr "新建联系人(&N)..."
 
-#: tdeabcore.cpp:1270
+#: kabcore.cpp:1332
 msgid ""
 "Create a new contact"
 "<p>You will be presented with a dialog where you can add all data about a "
 "person, including addresses and phone numbers."
 msgstr "创建新联系人<p>显示对话框，让您添加新联系人的所有数据，包括地址和电话号码在内。"
 
-#: tdeabcore.cpp:1272
+#: kabcore.cpp:1334
 msgid "&New Distribution List..."
 msgstr "新建分发列表(&N)..."
 
-#: tdeabcore.cpp:1274
+#: kabcore.cpp:1336
 msgid ""
 "Create a new distribution list"
 "<p>You will be presented with a dialog where you can create a new distribution "
 "list."
 msgstr "创建新分发列表<p>将显示一个对话框，以便让您可创建新的分发列表。"
 
-#: tdeabcore.cpp:1276
+#: kabcore.cpp:1338
 msgid "Send &Contact..."
 msgstr "发送联系人(&C)..."
 
-#: tdeabcore.cpp:1279
+#: kabcore.cpp:1341
 msgid "Send a mail with the selected contact as attachment."
 msgstr "将选中联系人发送为电子邮件附件。"
 
-#: tdeabcore.cpp:1281
+#: kabcore.cpp:1343
 msgid "Chat &With..."
 msgstr "开始聊天(&W)..."
 
-#: tdeabcore.cpp:1284
+#: kabcore.cpp:1346
 msgid "Start a chat with the selected contact."
 msgstr "与选中联系人开始聊天。"
 
-#: tdeabcore.cpp:1286
+#: kabcore.cpp:1348
 msgid "&Edit Contact..."
 msgstr "编辑联系人(&E)..."
 
-#: tdeabcore.cpp:1289
+#: kabcore.cpp:1351
 msgid ""
 "Edit a contact"
 "<p>You will be presented with a dialog where you can change all data about a "
 "person, including addresses and phone numbers."
 msgstr "编辑联系人<p>显示对话框，让您可更改联系人的所有数据，包括地址和电话号码在内。"
 
-#: tdeabcore.cpp:1291
+#: kabcore.cpp:1353
 msgid "&Merge Contacts"
 msgstr "合并联系人(&M)"
 
-#: tdeabcore.cpp:1300
+#: kabcore.cpp:1362
 msgid ""
 "Copy the currently selected contact(s) to system clipboard in vCard format."
 msgstr "将目前选中的联系人以 vCard 格式复制到系统剪贴板中。"
 
-#: tdeabcore.cpp:1301
+#: kabcore.cpp:1363
 msgid ""
 "Cuts the currently selected contact(s) to system clipboard in vCard format."
 msgstr "将目前选中的联系人以 vCard 格式剪切到系统剪贴板中。"
 
-#: tdeabcore.cpp:1302
+#: kabcore.cpp:1364
 msgid "Paste the previously cut or copied contacts from clipboard."
 msgstr "粘贴先前剪切或复制到剪贴板的联系人。"
 
-#: tdeabcore.cpp:1303
+#: kabcore.cpp:1365
 msgid "Selects all visible contacts from current view."
 msgstr "选中当前视图中所有可见的联系人。"
 
-#: tdeabcore.cpp:1307
+#: kabcore.cpp:1369
 msgid "&Delete Contact"
 msgstr "删除联系人(&D)"
 
-#: tdeabcore.cpp:1310
+#: kabcore.cpp:1372
 msgid "Delete all selected contacts."
 msgstr "删除选中的全部联系人。"
 
-#: tdeabcore.cpp:1313
+#: kabcore.cpp:1375
 msgid "&Copy Contact To..."
 msgstr "将联系人复制到(&C)..."
 
-#: tdeabcore.cpp:1316
+#: kabcore.cpp:1378
 msgid ""
 "Store a contact in a different Addressbook"
 "<p>You will be presented with a dialog where you can select a new storage place "
 "for this contact."
 msgstr "在不同的地址簿中保存联系人<p>将显示一个对话框，以便让您可为此联系人选择新的存储位置。"
 
-#: tdeabcore.cpp:1319
+#: kabcore.cpp:1381
 msgid "M&ove Contact To..."
 msgstr "将联系人移至(&O)..."
 
-#: tdeabcore.cpp:1325
+#: kabcore.cpp:1387
 msgid "Show Jump Bar"
 msgstr "显示跳转栏"
 
-#: tdeabcore.cpp:1327
+#: kabcore.cpp:1389
 msgid "Toggle whether the jump button bar shall be visible."
 msgstr "切换跳转按钮栏是否可见。"
 
-#: tdeabcore.cpp:1328
+#: kabcore.cpp:1390
 msgid "Hide Jump Bar"
 msgstr "隐藏跳转栏"
 
-#: tdeabcore.cpp:1331
+#: kabcore.cpp:1393
 msgid "Show Details"
 msgstr "显示细节"
 
-#: tdeabcore.cpp:1333
+#: kabcore.cpp:1395
 msgid "Toggle whether the details page shall be visible."
 msgstr "切换细节页是否可见。"
 
-#: tdeabcore.cpp:1334
+#: kabcore.cpp:1396
 msgid "Hide Details"
 msgstr "隐藏细节"
 
-#: tdeabcore.cpp:1338
+#: kabcore.cpp:1400
 msgid "&Configure Address Book..."
 msgstr "配置地址簿(&C)..."
 
-#: tdeabcore.cpp:1344
+#: kabcore.cpp:1406
 msgid ""
 "You will be presented with a dialog, that offers you all possibilities to "
 "configure KAddressBook."
 msgstr "将显示一个对话框，以便让您可以完全配置 KAddressBook。"
 
-#: tdeabcore.cpp:1347
+#: kabcore.cpp:1409
 msgid "&Lookup Addresses in LDAP Directory..."
 msgstr "在 LDAP 目录中查阅地址(&L)..."
 
-#: tdeabcore.cpp:1349
+#: kabcore.cpp:1411
 msgid ""
 "Search for contacts on a LDAP server"
 "<p>You will be presented with a dialog, where you can search for contacts and "
 "select the ones you want to add to your local address book."
 msgstr "在 LDAP 服务器上搜索联系人<p>将显示一个对话框，以便让您可搜索联系人以及选择您想要添加到本地地址簿中的人。"
 
-#: tdeabcore.cpp:1351
+#: kabcore.cpp:1413
 msgid "Set as Personal Contact Data"
 msgstr "设为个人联系数据"
 
-#: tdeabcore.cpp:1354
+#: kabcore.cpp:1416
 msgid ""
 "Set the personal contact"
 "<p>The data of this contact will be used in many other TDE applications, so you "
 "do not have to input your personal data several times."
 msgstr "设定个人联系人<p>此联系人的数据将会在其它 TDE 应用程序中使用，这样您就不必频繁输入您个人的数据了。"
 
-#: tdeabcore.cpp:1359
+#: kabcore.cpp:1421
 msgid "Set the categories for all selected contacts."
 msgstr "设定选中所有联系人的类别。"
 
-#: tdeabcore.cpp:1361
+#: kabcore.cpp:1423
 msgid "Clear Search Bar"
 msgstr "清除搜索栏"
 
-#: tdeabcore.cpp:1364
+#: kabcore.cpp:1426
 msgid "Clear Search Bar<p>Clears the content of the quick search bar."
 msgstr "清除搜索栏<p>清除快速搜索栏。"
 
-#: tdeabcore.cpp:1438
+#: kabcore.cpp:1505
 msgid "Merge with existing categories?"
 msgstr "与已有类别合并吗？"
 
-#: tdeabcore.cpp:1439
+#: kabcore.cpp:1506
 msgid "Merge"
 msgstr "合并"
 
-#: tdeabcore.cpp:1439
+#: kabcore.cpp:1506
 msgid "Do Not Merge"
 msgstr "不合并"
 
-#: tdeabcore.cpp:1490
+#: kabcore.cpp:1557
 #, c-format
 msgid ""
 "_n: %n contact matches\n"
 "%n contacts matching"
 msgstr "匹配 %n 个联系人"
 
-#: tdeabcore.cpp:1630
+#: kabcore.cpp:1632
+msgid ""
+"_n: <qt>Do you really want to remove this contact from the %1 distribution "
+"list?"
+"<br><b>Note:</b>The contact will be not be removed from your addressbook nor "
+"from any other distribution list.</qt>\n"
+"<qt>Do you really want to remove these %n contacts from the %1 distribution "
+"list?"
+"<br><b>Note:</b>The contacts will be not be removed from your addressbook nor "
+"from any other distribution list.</qt>"
+msgstr ""
+
+#: kabcore.cpp:1732
 #, c-format
 msgid "Distribution List: %1"
 msgstr "新建分发列表：%1"
@@ -1820,7 +1868,7 @@ msgstr "新建分发列表：%1"
 msgid "Address Book Browser"
 msgstr "地址簿浏览器"
 
-#: kaddressbookmain.cpp:151
+#: kaddressbookmain.cpp:157
 msgid ""
 "You will be presented with a dialog, where you can configure the application "
 "wide shortcuts."
@@ -1842,7 +1890,7 @@ msgstr "密钥类型"
 msgid "Select the key type:"
 msgstr "选择密钥类型："
 
-#: keywidget.cpp:124 xxport/csv_xxport.cpp:68 xxport/ldif_xxport.cpp:117
+#: keywidget.cpp:124 xxport/csv_xxport.cpp:73 xxport/ldif_xxport.cpp:123
 msgid "<qt>Unable to open file <b>%1</b>.</qt>"
 msgstr "<qt>无法打开文件 <b>%1</b>。</qt>"
 
@@ -1995,18 +2043,18 @@ msgid ""
 "Imported from LDAP directory %1 on %2"
 msgstr "于 %2 从 LDAP 目录 %1 导入"
 
-#: ldapsearchdialog.cpp:588
+#: ldapsearchdialog.cpp:595
 #, c-format
 msgid ""
 "_n: The following contact was imported into your address book:\n"
 "The following %n contacts were imported into your address book:"
 msgstr "下列 %n 个联系人已导入到您的地址簿中："
 
-#: ldapsearchdialog.cpp:603
+#: ldapsearchdialog.cpp:607
 msgid "Please select the contacts you want to add to the distribution list."
 msgstr "请选择您想要添加到分发列表中的联系人。"
 
-#: ldapsearchdialog.cpp:603
+#: ldapsearchdialog.cpp:607
 msgid "No Contacts Selected"
 msgstr "未选中联系人"
 
@@ -2155,7 +2203,7 @@ msgid "Contact Toolbar"
 msgstr "联系人工具栏"
 
 #. i18n: file editors/imaddressbase.ui line 24
-#: editors/imeditorwidget.cpp:369 rc.cpp:63
+#: editors/imeditorwidget.cpp:371 rc.cpp:63
 #, no-c-format
 msgid ""
 "_: Instant messaging\n"
@@ -2388,8 +2436,8 @@ msgstr "用于向移动电话发送 GSM 文本短消息的脚本"
 
 #. i18n: file common/kaddressbook.kcfg line 34
 #: rc.cpp:174
-#, no-c-format
-msgid "Honor TDE single click"
+#, fuzzy, no-c-format
+msgid "Honor KDE single click"
 msgstr "遵从 TDE 单击"
 
 #. i18n: file common/kaddressbook.kcfg line 59
@@ -2418,34 +2466,48 @@ msgstr "此字段所存储的声音文件应包含联系人姓名的发音。"
 msgid "Save only the URL to the sound file, not the whole object."
 msgstr "只保存声音文件的 URL，而不是整个对象。"
 
-#: undocmds.cpp:46
+#: undocmds.cpp:58
 #, c-format
 msgid ""
 "_n: Delete Contact\n"
 "Delete %n Contacts"
 msgstr "删除 %n 个联系人"
 
-#: undocmds.cpp:97
+#: undocmds.cpp:111
 #, c-format
 msgid ""
 "_n: Paste Contact\n"
 "Paste %n Contacts"
 msgstr "粘贴 %n 个联系人"
 
-#: undocmds.cpp:153
+#: undocmds.cpp:167
 #, c-format
 msgid ""
 "_n: New Contact\n"
 "New %n Contacts"
 msgstr "新建 %n 个联系人"
 
-#: undocmds.cpp:222
+#: undocmds.cpp:244
 #, c-format
 msgid ""
 "_n: Cut Contact\n"
 "Cut %n Contacts"
 msgstr "剪切 %n 个联系人"
 
+#: undocmds.cpp:310
+#, fuzzy, c-format
+msgid ""
+"_n: Copy Contact To\n"
+"Copy %n Contacts To"
+msgstr "剪切 %n 个联系人"
+
+#: undocmds.cpp:359
+#, fuzzy, c-format
+msgid ""
+"_n: Move Contact To\n"
+"Move %n Contacts To"
+msgstr "新建 %n 个联系人"
+
 #: viewconfigurefieldspage.cpp:205
 msgid "Select Fields to Display"
 msgstr "选择要显示的字段"
@@ -2490,7 +2552,7 @@ msgstr "修改视图："
 msgid "<qt>Are you sure that you want to delete the view <b>%1</b>?</qt>"
 msgstr "<qt>您确定想要删除视图 <b>%1</b> 吗？</qt>"
 
-#: editors/imeditorwidget.cpp:424 viewmanager.cpp:311
+#: editors/imeditorwidget.cpp:426 viewmanager.cpp:311
 msgid "Confirm Delete"
 msgstr "确认删除"
 
@@ -2509,64 +2571,64 @@ msgstr "导入联系人吗？"
 msgid "Do Not Import"
 msgstr "不导入"
 
-#: viewmanager.cpp:538 views/configuretableviewdialog.cpp:123
+#: viewmanager.cpp:543 views/configuretableviewdialog.cpp:123
 #: xxport/csvimportdialog.cpp:419
 msgid "None"
 msgstr "无"
 
-#: viewmanager.cpp:539
+#: viewmanager.cpp:544
 msgid "Unfiled"
 msgstr "未存档"
 
-#: viewmanager.cpp:562
+#: viewmanager.cpp:567
 msgid "Select View"
 msgstr "选择视图"
 
-#: viewmanager.cpp:571
+#: viewmanager.cpp:576
 msgid "Modify View..."
 msgstr "修改视图..."
 
-#: viewmanager.cpp:574
+#: viewmanager.cpp:579
 msgid ""
 "By pressing this button a dialog opens that allows you to modify the view of "
 "the addressbook. There you can add or remove fields that you want to be shown "
 "or hidden in the addressbook like the name for example."
 msgstr "按下此按钮，将打开一个对话框。您可在该对话框中修改地址簿的视图。例如，您可以添加或删除要在地址簿中显示或隐藏的字段。"
 
-#: viewmanager.cpp:576
+#: viewmanager.cpp:581
 msgid "Add View..."
 msgstr "添加视图..."
 
-#: viewmanager.cpp:579
+#: viewmanager.cpp:584
 msgid ""
 "You can add a new view by choosing one from the dialog that appears after "
 "pressing the button. You have to give the view a name, so that you can "
 "distinguish between the different views."
 msgstr "按下此按钮将出现一个对话框，您可从中选择要添加的新视图。您必须给视图命名，这样才能区分不同的视图。"
 
-#: viewmanager.cpp:581
+#: viewmanager.cpp:586
 msgid "Delete View"
 msgstr "删除视图"
 
-#: viewmanager.cpp:584
+#: viewmanager.cpp:589
 msgid ""
 "By pressing this button you can delete the actual view, which you have added "
 "before."
 msgstr "按下此按钮，您可以删除当前视图，该视图是您先前添加的。"
 
-#: viewmanager.cpp:586
+#: viewmanager.cpp:591
 msgid "Refresh View"
 msgstr "刷新视图"
 
-#: viewmanager.cpp:589
+#: viewmanager.cpp:594
 msgid "The view will be refreshed by pressing this button."
 msgstr "按此按钮后会刷新视图。"
 
-#: viewmanager.cpp:591
+#: viewmanager.cpp:596
 msgid "Edit &Filters..."
 msgstr "编辑过滤器(&F)..."
 
-#: viewmanager.cpp:594
+#: viewmanager.cpp:599
 msgid ""
 "Edit the contact filters"
 "<p>You will be presented with a dialog, where you can add, remove and edit "
@@ -2745,30 +2807,30 @@ msgid ""
 "Add Address"
 msgstr "添加地址"
 
-#: editors/imeditorwidget.cpp:423
+#: editors/imeditorwidget.cpp:425
 #, c-format
 msgid ""
 "_n: Do you really want to delete the selected address?\n"
 "Do you really want to delete the %n selected addresses?"
 msgstr "您真的想要删除选中的 %n 个地址吗？"
 
-#: features/distributionlistngwidget.cpp:111
+#: features/distributionlistngwidget.cpp:110
 msgid "Distribution List Editor NG"
 msgstr "分发列表编辑器 NG"
 
-#: features/distributionlistngwidget.cpp:128
+#: features/distributionlistngwidget.cpp:127
 msgid "Distribution Lists"
 msgstr "分发列表"
 
-#: features/distributionlistngwidget.cpp:134
+#: features/distributionlistngwidget.cpp:133
 msgid "Add distribution list"
 msgstr "添加分发列表"
 
-#: features/distributionlistngwidget.cpp:140
+#: features/distributionlistngwidget.cpp:139
 msgid "Edit distribution list"
 msgstr "编辑分发列表"
 
-#: features/distributionlistngwidget.cpp:146
+#: features/distributionlistngwidget.cpp:145
 msgid "Remove distribution list"
 msgstr "删除分发列表"
 
@@ -2776,6 +2838,7 @@ msgstr "删除分发列表"
 msgid "New Distribution List..."
 msgstr "新建分发列表..."
 
+#: features/distributionlistngwidget.cpp:175
 #: features/distributionlistngwidget.cpp:236
 msgid "All Contacts"
 msgstr "全部联系人"
@@ -2852,40 +2915,40 @@ msgstr "电子邮件地址"
 msgid "Preferred address"
 msgstr "首选地址"
 
-#: features/resourceselection.cpp:166 features/resourceselection.cpp:374
-#: features/resourceselection.cpp:395
+#: features/resourceselection.cpp:172
+msgid "Re&load"
+msgstr ""
+
+#: features/resourceselection.cpp:224 features/resourceselection.cpp:494
+#: features/resourceselection.cpp:515
 msgid "Address Books"
 msgstr "地址簿"
 
-#: features/resourceselection.cpp:180
+#: features/resourceselection.cpp:238
 msgid "Add Address Book"
 msgstr "添加地址簿"
 
-#: features/resourceselection.cpp:181
+#: features/resourceselection.cpp:239
 msgid "Please select type of the new address book:"
 msgstr "请选择新地址簿的类型："
 
-#: features/resourceselection.cpp:191
+#: features/resourceselection.cpp:249
 msgid "<qt>Unable to create an address book of type <b>%1</b>.</qt>"
 msgstr "<qt>无法创建 <b>%1</b> 类型的地址簿。</qt>"
 
-#: features/resourceselection.cpp:196
-msgid "%1 address book"
-msgstr "%1 地址簿"
-
-#: features/resourceselection.cpp:237
+#: features/resourceselection.cpp:300
 msgid "<qt>Do you really want to remove the address book <b>%1</b>?</qt>"
 msgstr "<qt>您确定要删除地址簿 <b>%1</b> 吗？</qt>"
 
-#: features/resourceselection.cpp:380
+#: features/resourceselection.cpp:500
 msgid "Add addressbook"
 msgstr "添加地址簿"
 
-#: features/resourceselection.cpp:385
+#: features/resourceselection.cpp:505
 msgid "Edit addressbook settings"
 msgstr "编辑地址簿设置"
 
-#: features/resourceselection.cpp:390
+#: features/resourceselection.cpp:510
 msgid "Remove addressbook"
 msgstr "删除地址簿"
 
@@ -3283,11 +3346,17 @@ msgstr "导入 CSV 列表..."
 msgid "Export CSV List..."
 msgstr "导出 CSV 列表..."
 
-#: xxport/csv_xxport.cpp:55 xxport/ldif_xxport.cpp:102
+#: xxport/csv_xxport.cpp:53 xxport/csvimportdialog.cpp:861
+#: xxport/ldif_xxport.cpp:100 xxport/vcard_xxport.cpp:296
+#: xxport/vcard_xxport.cpp:318
+msgid "Do you want to overwrite file \"%1\""
+msgstr ""
+
+#: xxport/csv_xxport.cpp:60 xxport/ldif_xxport.cpp:108
 msgid "<qt>Unable to open file <b>%1</b>.%2.</qt>"
 msgstr "<qt>无法打开文件 <b>%1</b>.%2。</qt>"
 
-#: xxport/csv_xxport.cpp:76
+#: xxport/csv_xxport.cpp:81
 msgid "The contacts have been exported successfully."
 msgstr "联系人已经成功导出。"
 
@@ -3421,15 +3490,15 @@ msgstr "模板选择"
 msgid "Please select a template, that matches the CSV file:"
 msgstr "请选择匹配 CSV 文件的模板："
 
-#: xxport/csvimportdialog.cpp:860
+#: xxport/csvimportdialog.cpp:864
 msgid "Template Name"
 msgstr "模板名称"
 
-#: xxport/csvimportdialog.cpp:860
+#: xxport/csvimportdialog.cpp:864
 msgid "Please enter a name for the template:"
 msgstr "请输入模板的名称："
 
-#: xxport/csvimportdialog.cpp:930
+#: xxport/csvimportdialog.cpp:934
 msgid "Cannot open input file."
 msgstr "无法打开输入文件。"
 
@@ -3449,11 +3518,11 @@ msgstr "从移动电话导入..."
 msgid "Export to Mobile Phone..."
 msgstr "导出到移动电话..."
 
-#: xxport/gnokii_xxport.cpp:134 xxport/gnokii_xxport.cpp:824
+#: xxport/gnokii_xxport.cpp:134 xxport/gnokii_xxport.cpp:820
 msgid "Failed to initialize the gnokii library."
 msgstr "初始化 Gnokii 库失败。"
 
-#: xxport/gnokii_xxport.cpp:140 xxport/gnokii_xxport.cpp:853
+#: xxport/gnokii_xxport.cpp:140 xxport/gnokii_xxport.cpp:849
 msgid ""
 "<qt>"
 "<center>Mobile Phone interface initialization failed."
@@ -3474,42 +3543,42 @@ msgstr ""
 "<br>您可能需要在命令行运行“gnokii --identify”，以便检查可用的连接方式，并验证您的 gnokii 配置是否正确。</center>"
 "</qt>"
 
-#: xxport/gnokii_xxport.cpp:179 xxport/gnokii_xxport.cpp:953
+#: xxport/gnokii_xxport.cpp:179 xxport/gnokii_xxport.cpp:949
 msgid "Mobile Phone information:"
 msgstr "移动电话信息："
 
-#: xxport/gnokii_xxport.cpp:180 xxport/gnokii_xxport.cpp:954
+#: xxport/gnokii_xxport.cpp:180 xxport/gnokii_xxport.cpp:950
 msgid "Manufacturer"
 msgstr "制造商"
 
-#: xxport/gnokii_xxport.cpp:181 xxport/gnokii_xxport.cpp:955
+#: xxport/gnokii_xxport.cpp:181 xxport/gnokii_xxport.cpp:951
 msgid "Phone model"
 msgstr "电话型号"
 
-#: xxport/gnokii_xxport.cpp:182 xxport/gnokii_xxport.cpp:956
+#: xxport/gnokii_xxport.cpp:182 xxport/gnokii_xxport.cpp:952
 msgid "Revision"
 msgstr "版本"
 
-#: xxport/gnokii_xxport.cpp:183 xxport/gnokii_xxport.cpp:957
+#: xxport/gnokii_xxport.cpp:183 xxport/gnokii_xxport.cpp:953
 msgid "IMEI"
 msgstr "IMEI"
 
-#: xxport/gnokii_xxport.cpp:184 xxport/gnokii_xxport.cpp:958
+#: xxport/gnokii_xxport.cpp:184 xxport/gnokii_xxport.cpp:954
 msgid "Phonebook status"
 msgstr "电话簿状态"
 
-#: xxport/gnokii_xxport.cpp:185 xxport/gnokii_xxport.cpp:959
+#: xxport/gnokii_xxport.cpp:185 xxport/gnokii_xxport.cpp:955
 msgid "%1 out of %2 contacts used"
 msgstr "已使用 %2 个联系人中的 %1 个"
 
-#: xxport/gnokii_xxport.cpp:211 xxport/gnokii_xxport.cpp:995
+#: xxport/gnokii_xxport.cpp:211 xxport/gnokii_xxport.cpp:991
 msgid ""
 "<qt>Importing <b>%1</b> contacts from <b>%2</b> of the Mobile Phone."
 "<br>"
 "<br>%3</qt>"
 msgstr "<qt>从移动电话的 <b>%2</b> 导入 <b>%1</b> 个联系人。<br><br>%3</qt>"
 
-#: xxport/gnokii_xxport.cpp:532 xxport/gnokii_xxport.cpp:1327
+#: xxport/gnokii_xxport.cpp:532 xxport/gnokii_xxport.cpp:1323
 msgid ""
 "<qt>Please connect your Mobile Phone to your computer and press <b>Continue</b> "
 "to start importing the personal contacts."
@@ -3522,12 +3591,12 @@ msgstr ""
 "<br>"
 "<br>请注意，如果您的移动电话连接检测不正确，可能要花掉几分钟时间，其间 KAddressbook 可能无法响应。</qt>"
 
-#: xxport/gnokii_xxport.cpp:540 xxport/gnokii_xxport.cpp:1335
+#: xxport/gnokii_xxport.cpp:540 xxport/gnokii_xxport.cpp:1331
 msgid "Mobile Phone Import"
 msgstr "移动电话导入"
 
-#: xxport/gnokii_xxport.cpp:541 xxport/gnokii_xxport.cpp:590
-#: xxport/gnokii_xxport.cpp:1336 xxport/gnokii_xxport.cpp:1385
+#: xxport/gnokii_xxport.cpp:541 xxport/gnokii_xxport.cpp:588
+#: xxport/gnokii_xxport.cpp:1332 xxport/gnokii_xxport.cpp:1379
 msgid ""
 "<qt>"
 "<center>Establishing connection to the Mobile Phone."
@@ -3535,11 +3604,11 @@ msgid ""
 "<br>Please wait...</center></qt>"
 msgstr "<qt><center>正在建立到移动电话的连接。<br><br>请稍候...</center></qt>"
 
-#: xxport/gnokii_xxport.cpp:564 xxport/gnokii_xxport.cpp:1359
+#: xxport/gnokii_xxport.cpp:562 xxport/gnokii_xxport.cpp:1353
 msgid "&Stop Import"
 msgstr "停止导入(&S)"
 
-#: xxport/gnokii_xxport.cpp:581 xxport/gnokii_xxport.cpp:1376
+#: xxport/gnokii_xxport.cpp:579 xxport/gnokii_xxport.cpp:1370
 msgid ""
 "<qt>Please connect your Mobile Phone to your computer and press <b>Continue</b> "
 "to start exporting the selected personal contacts."
@@ -3552,12 +3621,12 @@ msgstr ""
 "<br>"
 "<br>请注意，如果您的移动电话连接检测不正确，可能要花掉几分钟时间，其间 KAddressbook 可能无法响应。</qt>"
 
-#: xxport/gnokii_xxport.cpp:589 xxport/gnokii_xxport.cpp:773
-#: xxport/gnokii_xxport.cpp:1384 xxport/gnokii_xxport.cpp:1568
+#: xxport/gnokii_xxport.cpp:587 xxport/gnokii_xxport.cpp:769
+#: xxport/gnokii_xxport.cpp:1378 xxport/gnokii_xxport.cpp:1560
 msgid "Mobile Phone Export"
 msgstr "移动电话导出"
 
-#: xxport/gnokii_xxport.cpp:645 xxport/gnokii_xxport.cpp:1440
+#: xxport/gnokii_xxport.cpp:641 xxport/gnokii_xxport.cpp:1432
 msgid ""
 "<qt>Do you want the selected contacts to be <b>appended</b> "
 "to the current mobile phonebook or should they <b>replace</b> "
@@ -3571,30 +3640,30 @@ msgstr ""
 "<br>"
 "<br>请注意，如果您选择了替换电话簿现有项，您电话中的全部联系人都将被删除，而您的电话中将只能看到新导出的联系人。</qt>"
 
-#: xxport/gnokii_xxport.cpp:651 xxport/gnokii_xxport.cpp:1446
+#: xxport/gnokii_xxport.cpp:647 xxport/gnokii_xxport.cpp:1438
 msgid "Export to Mobile Phone"
 msgstr "导出到移动电话"
 
-#: xxport/gnokii_xxport.cpp:652 xxport/gnokii_xxport.cpp:1447
+#: xxport/gnokii_xxport.cpp:648 xxport/gnokii_xxport.cpp:1439
 msgid "&Append to Current Phonebook"
 msgstr "追加到当前电话簿(&A)"
 
-#: xxport/gnokii_xxport.cpp:653 xxport/gnokii_xxport.cpp:1448
+#: xxport/gnokii_xxport.cpp:649 xxport/gnokii_xxport.cpp:1440
 msgid "&Replace Current Phonebook with New Contacts"
 msgstr "将当前电话簿替换为新联系人(&R)"
 
-#: xxport/gnokii_xxport.cpp:660 xxport/gnokii_xxport.cpp:1455
+#: xxport/gnokii_xxport.cpp:656 xxport/gnokii_xxport.cpp:1447
 msgid "&Stop Export"
 msgstr "停止导出(&S)"
 
-#: xxport/gnokii_xxport.cpp:661 xxport/gnokii_xxport.cpp:1456
+#: xxport/gnokii_xxport.cpp:657 xxport/gnokii_xxport.cpp:1448
 msgid ""
 "<qt>Exporting <b>%1</b> contacts to the <b>%2</b> of the Mobile Phone."
 "<br>"
 "<br>%3</qt>"
 msgstr "<qt>将 <b>%1</b> 个联系人导出至移动电话的 <b>%2</b>。<br><br>%3</qt>"
 
-#: xxport/gnokii_xxport.cpp:728 xxport/gnokii_xxport.cpp:1523
+#: xxport/gnokii_xxport.cpp:724 xxport/gnokii_xxport.cpp:1515
 msgid ""
 "<qt>"
 "<center>All selected contacts have been sucessfully copied to the Mobile Phone."
@@ -3607,15 +3676,15 @@ msgstr ""
 "<br>"
 "<br>请稍候，正在删除移动电话中的所有剩余孤立联系人。</center></qt>"
 
-#: xxport/gnokii_xxport.cpp:733 xxport/gnokii_xxport.cpp:1528
+#: xxport/gnokii_xxport.cpp:729 xxport/gnokii_xxport.cpp:1520
 msgid "&Stop Delete"
 msgstr "停止删除(&S)"
 
-#: xxport/gnokii_xxport.cpp:753 xxport/gnokii_xxport.cpp:1548
+#: xxport/gnokii_xxport.cpp:749 xxport/gnokii_xxport.cpp:1540
 msgid "Export to phone finished."
 msgstr "导出到电话完成。"
 
-#: xxport/gnokii_xxport.cpp:764 xxport/gnokii_xxport.cpp:1559
+#: xxport/gnokii_xxport.cpp:760 xxport/gnokii_xxport.cpp:1551
 msgid ""
 "<qt>The following contacts could not be exported to the Mobile Phone. Possible "
 "Reasons for this problem could be:"
@@ -3636,11 +3705,11 @@ msgstr ""
 "<li>您的移动电话不允许存储多个地址、电子邮件、主页……</li>"
 "<li>其它与存储空间相关的问题。</li></ul>要在将来避免此类问题，请减少上述联系人不同字段的数量。</qt>"
 
-#: xxport/gnokii_xxport.cpp:827
+#: xxport/gnokii_xxport.cpp:823
 msgid "Gnokii is not yet configured."
 msgstr "Gnokii 尚未配置。"
 
-#: xxport/gnokii_xxport.cpp:839
+#: xxport/gnokii_xxport.cpp:835
 msgid ""
 "Gnokii reports a 'Lock File Error'.\n"
 " Please exit all other running instances of gnokii, check if you have write "
@@ -3649,23 +3718,23 @@ msgstr ""
 "Gnokii 报告了“锁定文件错误”。\n"
 "请退出正在运行的所有其它 gnokii 实例，检查对 /var/lock 目录是否有写的权限，然后再试一次。"
 
-#: xxport/gnokii_xxport.cpp:868
+#: xxport/gnokii_xxport.cpp:864
 msgid "Unknown"
 msgstr "未知"
 
-#: xxport/gnokii_xxport.cpp:965
+#: xxport/gnokii_xxport.cpp:961
 msgid "internal memory"
 msgstr "手机存储"
 
-#: xxport/gnokii_xxport.cpp:966
+#: xxport/gnokii_xxport.cpp:962
 msgid "SIM-card memory"
 msgstr "SIM 卡存储"
 
-#: xxport/gnokii_xxport.cpp:967
+#: xxport/gnokii_xxport.cpp:963
 msgid "unknown memory"
 msgstr "未知存储"
 
-#: xxport/gnokii_xxport.cpp:1586 xxport/gnokii_xxport.cpp:1594
+#: xxport/gnokii_xxport.cpp:1578 xxport/gnokii_xxport.cpp:1586
 msgid ""
 "Gnokii interface is not available.\n"
 "Please ask your distributor to add gnokii at compile time."
@@ -3674,11 +3743,13 @@ msgstr ""
 "请要求您的发行版在编译时将 gnokii 加入。"
 
 #: xxport/kde2_xxport.cpp:45
-msgid "Import TDE 2 Addressbook..."
+#, fuzzy
+msgid "Import KDE 2 Addressbook..."
 msgstr "导入 TDE 2 地址簿..."
 
 #: xxport/kde2_xxport.cpp:52
-msgid "<qt>Could not find a TDE 2 address book <b>%1</b>.</qt>"
+#, fuzzy
+msgid "<qt>Could not find a KDE 2 address book <b>%1</b>.</qt>"
 msgstr "<qt>找不到 TDE 2 地址簿 <b>%1</b>。</qt>"
 
 #: xxport/kde2_xxport.cpp:57
@@ -3686,7 +3757,8 @@ msgid "Override previously imported entries?"
 msgstr "覆盖先前导入的项目吗？"
 
 #: xxport/kde2_xxport.cpp:58
-msgid "Import TDE 2 Addressbook"
+#, fuzzy
+msgid "Import KDE 2 Addressbook"
 msgstr "导入 TDE 2 地址簿"
 
 #: xxport/ldif_xxport.cpp:56
@@ -3737,80 +3809,88 @@ msgstr "导出 vCard 2.1..."
 msgid "Export vCard 3.0..."
 msgstr "导出 vCard 3.0..."
 
-#: xxport/vcard_xxport.cpp:125
+#: xxport/vcard_xxport.cpp:131
 msgid ""
 "You have selected a list of contacts, shall they be exported to several files?"
 msgstr "您选中了一组联系人，是否要将他们导出到几个文件中？"
 
-#: xxport/vcard_xxport.cpp:128
+#: xxport/vcard_xxport.cpp:134
 msgid "Export to Several Files"
 msgstr "导出到多个文件"
 
-#: xxport/vcard_xxport.cpp:128
+#: xxport/vcard_xxport.cpp:134
 msgid "Export to One File"
 msgstr "导出到一个文件"
 
-#: xxport/vcard_xxport.cpp:190
+#: xxport/vcard_xxport.cpp:212
 msgid "Select vCard to Import"
 msgstr "选择要导入的 vCard"
 
-#: xxport/vcard_xxport.cpp:197
+#: xxport/vcard_xxport.cpp:219
 msgid "vCard Import Failed"
 msgstr "vCard 导入失败"
 
-#: xxport/vcard_xxport.cpp:213
+#: xxport/vcard_xxport.cpp:252
 msgid ""
 "<qt>When trying to read the vCard, there was an error opening the file '%1': "
 "%2</qt>"
 msgstr "<qt>试图读取 vCard 时，打开文件“%1”出错：%2</qt>"
 
-#: xxport/vcard_xxport.cpp:221
+#: xxport/vcard_xxport.cpp:260
 msgid "<qt>Unable to access vCard: %1</qt>"
 msgstr "<qt>无法访问 vCard：%1</qt>"
 
-#: xxport/vcard_xxport.cpp:232
+#: xxport/vcard_xxport.cpp:271
 msgid "No contacts were imported, due to errors with the vCards."
 msgstr "没有导入联系人，因为 vCards 出错。"
 
-#: xxport/vcard_xxport.cpp:234
+#: xxport/vcard_xxport.cpp:273
 msgid "The vCard does not contain any contacts."
 msgstr "vCard 不包含任何联系人。"
 
-#: xxport/vcard_xxport.cpp:402
+#: xxport/vcard_xxport.cpp:469
 msgid "Import vCard"
 msgstr "导入 vCard"
 
-#: xxport/vcard_xxport.cpp:409
+#: xxport/vcard_xxport.cpp:476
 msgid "Do you want to import this contact in your address book?"
 msgstr "将这个联系人导入到您的地址簿中吗？"
 
-#: xxport/vcard_xxport.cpp:420
+#: xxport/vcard_xxport.cpp:487
 msgid "Import All..."
 msgstr "全部导入..."
 
-#: xxport/vcard_xxport.cpp:475
+#: xxport/vcard_xxport.cpp:542
 msgid "Select vCard Fields"
 msgstr "选择 vCard 字段"
 
-#: xxport/vcard_xxport.cpp:482
+#: xxport/vcard_xxport.cpp:549
 msgid "Select the fields which shall be exported in the vCard."
 msgstr "选择要导出到 vCard 的字段。"
 
-#: xxport/vcard_xxport.cpp:485
+#: xxport/vcard_xxport.cpp:552
 msgid "Private fields"
 msgstr "私有字段"
 
-#: xxport/vcard_xxport.cpp:488
+#: xxport/vcard_xxport.cpp:555
 msgid "Business fields"
 msgstr "业务字段"
 
-#: xxport/vcard_xxport.cpp:491
+#: xxport/vcard_xxport.cpp:558
 msgid "Other fields"
 msgstr "其它字段"
 
-#: xxport/vcard_xxport.cpp:494
+#: xxport/vcard_xxport.cpp:561
 msgid "Encryption keys"
 msgstr "加密密钥"
 
+#~ msgid ""
+#~ "_n: Do you really want to delete this contact?\n"
+#~ "Do you really want to delete these %n contacts?"
+#~ msgstr "您真的想要删除选中的 %n 个联系人吗？"
+
+#~ msgid "%1 address book"
+#~ msgstr "%1 地址簿"
+
 #~ msgid "Show Extension"
 #~ msgstr "显示扩展"
diff --git a/tde-i18n-zh_CN/messages/tdepim/kalarm.po b/tde-i18n-zh_CN/messages/tdepim/kalarm.po
index e71b633b567..9212fdc1839 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kalarm.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kalarm.po
@@ -7,16 +7,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2008-08-19 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2008-01-30 13:58+0800\n"
 "Last-Translator: Lie_Ex <lilith.ex@g.com>\n"
 "Language-Team: zh_CN <kde-china@kde.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: fontcolour.h:42
+#: fontcolour.h:43
 msgid "Requested font"
 msgstr "请求的字体"
 
@@ -99,65 +100,65 @@ msgstr ""
 "无法下载日历：\n"
 "%1"
 
-#: alarmevent.cpp:2077
+#: alarmevent.cpp:2082
 msgid ""
 "_: Brief form of 'At Login'\n"
 "Login"
 msgstr "登录"
 
-#: alarmevent.cpp:2077
+#: alarmevent.cpp:2082
 msgid "At login"
 msgstr "登录时"
 
-#: alarmevent.cpp:2085 alarmevent.cpp:2119
+#: alarmevent.cpp:2090 alarmevent.cpp:2124
 #, c-format
 msgid ""
 "_n: 1 Minute\n"
 "%n Minutes"
 msgstr "%n分钟"
 
-#: alarmevent.cpp:2087 alarmevent.cpp:2121
+#: alarmevent.cpp:2092 alarmevent.cpp:2126
 #, c-format
 msgid ""
 "_n: 1 Hour\n"
 "%n Hours"
 msgstr "%n小时"
 
-#: alarmevent.cpp:2091 alarmevent.cpp:2123
+#: alarmevent.cpp:2096 alarmevent.cpp:2128
 msgid ""
 "_: Hours and Minutes\n"
 "%1H %2M"
 msgstr "%1小时%2分"
 
-#: alarmevent.cpp:2094 alarmevent.cpp:2126
+#: alarmevent.cpp:2099 alarmevent.cpp:2131
 #, c-format
 msgid ""
 "_n: 1 Day\n"
 "%n Days"
 msgstr "%n天"
 
-#: alarmevent.cpp:2096 alarmevent.cpp:2127
+#: alarmevent.cpp:2101 alarmevent.cpp:2132
 #, c-format
 msgid ""
 "_n: 1 Week\n"
 "%n Weeks"
 msgstr "%n星期"
 
-#: alarmevent.cpp:2098
+#: alarmevent.cpp:2103
 #, c-format
 msgid ""
 "_n: 1 Month\n"
 "%n Months"
 msgstr "%n个月"
 
-#: alarmevent.cpp:2100
+#: alarmevent.cpp:2105
 #, c-format
 msgid ""
 "_n: 1 Year\n"
 "%n Years"
 msgstr "%n年"
 
-#: alarmevent.cpp:2106 alarmevent.cpp:2129 soundpicker.cpp:52
+#: alarmevent.cpp:2111 alarmevent.cpp:2134 soundpicker.cpp:52
 msgid "None"
 msgstr "无"
 
@@ -555,13 +556,13 @@ msgid ""
 "&From:"
 msgstr "来自(&F)："
 
-#: editdlg.cpp:156 messagewin.cpp:456
+#: editdlg.cpp:156 messagewin.cpp:458
 msgid ""
 "_: Email addressee\n"
 "To:"
 msgstr "到："
 
-#: editdlg.cpp:157 messagewin.cpp:463
+#: editdlg.cpp:157 messagewin.cpp:465
 msgid ""
 "_: Email subject\n"
 "Subject:"
@@ -886,16 +887,16 @@ msgstr ""
 "邮件发送到：\n"
 "%1%2"
 
-#: editdlg.cpp:1550 messagewin.cpp:1541
+#: editdlg.cpp:1551 messagewin.cpp:1543
 msgid "Defer Alarm"
 msgstr "推迟提醒"
 
-#: editdlg.cpp:1704
+#: editdlg.cpp:1705
 msgid ""
 "Log file must be the name or path of a local file, with write permission."
 msgstr "日志文件必须是本地文件的名称或路径，而且必须拥有写权限。"
 
-#: editdlg.cpp:1730
+#: editdlg.cpp:1731
 #, c-format
 msgid ""
 "Invalid email address:\n"
@@ -904,11 +905,11 @@ msgstr ""
 "无效的邮件地址：\n"
 "%1"
 
-#: editdlg.cpp:1737
+#: editdlg.cpp:1738
 msgid "No email address specified"
 msgstr "没有指定邮件地址"
 
-#: editdlg.cpp:1754
+#: editdlg.cpp:1755
 #, c-format
 msgid ""
 "Invalid email attachment:\n"
@@ -917,31 +918,31 @@ msgstr ""
 "无效的邮件附件：\n"
 "%1"
 
-#: editdlg.cpp:1783
+#: editdlg.cpp:1784
 msgid "Display the alarm message now"
 msgstr "现在就显示提醒消息"
 
-#: editdlg.cpp:1800
+#: editdlg.cpp:1801
 msgid "Display the file now"
 msgstr "现在就显示文件"
 
-#: editdlg.cpp:1812
+#: editdlg.cpp:1813
 msgid "Execute the specified command now"
 msgstr "现在就执行指定命令"
 
-#: editdlg.cpp:1823
+#: editdlg.cpp:1824
 msgid "Send the email to the specified addressees now"
 msgstr "现在就将邮件发送到指定地址。"
 
-#: editdlg.cpp:1897
+#: editdlg.cpp:1898
 msgid "Choose File to Attach"
 msgstr "选择要附加的文件"
 
-#: editdlg.cpp:2004
+#: editdlg.cpp:2005
 msgid "Please select a file to display"
 msgstr "请选择要显示的文件"
 
-#: editdlg.cpp:2006
+#: editdlg.cpp:2007
 msgid ""
 "%1\n"
 "not found"
@@ -949,7 +950,7 @@ msgstr ""
 "%1\n"
 "没有找到"
 
-#: editdlg.cpp:2007
+#: editdlg.cpp:2008
 msgid ""
 "%1\n"
 "is a folder"
@@ -957,7 +958,7 @@ msgstr ""
 "%1\n"
 "是一个文件夹"
 
-#: editdlg.cpp:2008
+#: editdlg.cpp:2009
 msgid ""
 "%1\n"
 "is not readable"
@@ -965,7 +966,7 @@ msgstr ""
 "%1\n"
 "不可读"
 
-#: editdlg.cpp:2009
+#: editdlg.cpp:2010
 msgid ""
 "%1\n"
 "appears not to be a text or image file"
@@ -1097,55 +1098,55 @@ msgstr "此文字是对应当前字体和颜色设置的样例。您可以编辑
 msgid "Choose Alarm Font & Color"
 msgstr "选择提醒字体和颜色"
 
-#: functions.cpp:505
+#: functions.cpp:507
 msgid "Error saving alarms"
 msgstr "保存提醒出错"
 
-#: functions.cpp:506
+#: functions.cpp:508
 msgid "Error saving alarm"
 msgstr "保存提醒出错"
 
-#: functions.cpp:509
+#: functions.cpp:511
 msgid "Error deleting alarms"
 msgstr "删除提醒出错"
 
-#: functions.cpp:510
+#: functions.cpp:512
 msgid "Error deleting alarm"
 msgstr "删除提醒出错"
 
-#: functions.cpp:513
+#: functions.cpp:515
 msgid "Error saving reactivated alarms"
 msgstr "保存重新激活的提醒出错"
 
-#: functions.cpp:514
+#: functions.cpp:516
 msgid "Error saving reactivated alarm"
 msgstr "保存重新激活的提醒出错"
 
-#: functions.cpp:517
+#: functions.cpp:519
 msgid "Error saving alarm template"
 msgstr "保存提醒模板出错"
 
-#: functions.cpp:532
+#: functions.cpp:534
 msgid "Unable to show alarms in KOrganizer"
 msgstr "无法在 KOrganizer 中显示提醒"
 
-#: functions.cpp:533
+#: functions.cpp:535
 msgid "Unable to show alarm in KOrganizer"
 msgstr "无法在 KOrganizer 中显示提醒"
 
-#: functions.cpp:536
+#: functions.cpp:538
 msgid "Unable to update alarm in KOrganizer"
 msgstr "无法更新 KOrganizer 中的提醒"
 
-#: functions.cpp:539
+#: functions.cpp:541
 msgid "Unable to delete alarms from KOrganizer"
 msgstr "无法从 KOrganizer 中删除提醒"
 
-#: functions.cpp:540
+#: functions.cpp:542
 msgid "Unable to delete alarm from KOrganizer"
 msgstr "无法从 KOrganizer 中删除提醒"
 
-#: functions.cpp:634
+#: functions.cpp:636
 msgid ""
 "_: Please set the 'From' email address...\n"
 "%1\n"
@@ -1154,7 +1155,7 @@ msgstr ""
 "%1\n"
 "请在首选项对话框中设置。"
 
-#: functions.cpp:638
+#: functions.cpp:640
 msgid ""
 "Alarms are currently disabled.\n"
 "Do you want to enable alarms now?"
@@ -1162,15 +1163,15 @@ msgstr ""
 "提醒现在被禁用。\n"
 "现在要启用吗？"
 
-#: functions.cpp:639
+#: functions.cpp:641
 msgid "Enable"
 msgstr "启用"
 
-#: functions.cpp:639
+#: functions.cpp:641
 msgid "Keep Disabled"
 msgstr "保持禁用"
 
-#: functions.cpp:706
+#: functions.cpp:708
 msgid ""
 "Unable to start KMail\n"
 "(%1)"
@@ -1311,7 +1312,8 @@ msgstr ""
 #: kamail.cpp:137
 msgid ""
 "No 'From' email address is configured.\n"
-"Please set it in the Trinity Control Center or in the KAlarm Preferences dialog."
+"Please set it in the Trinity Control Center or in the KAlarm Preferences "
+"dialog."
 msgstr ""
 "“发件人”电子邮件地址没有配置。\n"
 "请在 TDE 控制中心或 KAlarm 首选项对话框中设置。"
@@ -1635,7 +1637,7 @@ msgstr "创建模板(&P)..."
 msgid "&Copy..."
 msgstr "复制(&C)..."
 
-#: mainwindow.cpp:334 messagewin.cpp:520 templatedlg.cpp:66
+#: mainwindow.cpp:334 messagewin.cpp:522 templatedlg.cpp:66
 msgid "&Edit..."
 msgstr "编辑(&E)..."
 
@@ -1675,7 +1677,7 @@ msgstr "刷新提醒(&R)"
 msgid "New Alarm"
 msgstr "新提醒"
 
-#: mainwindow.cpp:611 messagewin.cpp:1459
+#: mainwindow.cpp:611 messagewin.cpp:1461
 msgid "Edit Alarm"
 msgstr "编辑提醒"
 
@@ -1724,61 +1726,61 @@ msgstr "启用(&B)"
 msgid "Disa&ble"
 msgstr "禁用(&B)"
 
-#: messagewin.cpp:290 messagewin.cpp:323
+#: messagewin.cpp:292 messagewin.cpp:325
 msgid "Reminder"
 msgstr "提示"
 
-#: messagewin.cpp:290
+#: messagewin.cpp:292
 msgid "Message"
 msgstr "消息"
 
-#: messagewin.cpp:318
+#: messagewin.cpp:320
 msgid ""
 "The scheduled date/time for the message (as opposed to the actual time of "
 "display)."
 msgstr "消息安排的日期/时间(相对实际显示时间)"
 
-#: messagewin.cpp:341
+#: messagewin.cpp:343
 msgid "The file whose contents are displayed below"
 msgstr "该文件的内容显示在下面"
 
-#: messagewin.cpp:367
+#: messagewin.cpp:369
 msgid "The contents of the file to be displayed"
 msgstr "要显示的文件内容"
 
-#: messagewin.cpp:375
+#: messagewin.cpp:377
 msgid "File is a folder"
 msgstr "文件是一个文件夹"
 
-#: messagewin.cpp:375
+#: messagewin.cpp:377
 msgid "Failed to open file"
 msgstr "无法打开文件"
 
-#: messagewin.cpp:375 sounddlg.cpp:445
+#: messagewin.cpp:377 sounddlg.cpp:445
 msgid "File not found"
 msgstr "文件没有找到"
 
-#: messagewin.cpp:394
+#: messagewin.cpp:396
 msgid "The alarm message"
 msgstr "提醒消息"
 
-#: messagewin.cpp:452
+#: messagewin.cpp:454
 msgid "The email to send"
 msgstr "要发送的电子邮件"
 
-#: messagewin.cpp:515
+#: messagewin.cpp:517
 msgid "Acknowledge the alarm"
 msgstr "接受提醒"
 
-#: messagewin.cpp:525
+#: messagewin.cpp:527
 msgid "Edit the alarm."
 msgstr "编辑提醒。"
 
-#: messagewin.cpp:531
+#: messagewin.cpp:533
 msgid "&Defer..."
 msgstr "推迟(&D)..."
 
-#: messagewin.cpp:537
+#: messagewin.cpp:539
 msgid ""
 "Defer the alarm until later.\n"
 "You will be prompted to specify when the alarm should be redisplayed."
@@ -1786,82 +1788,82 @@ msgstr ""
 "推迟提醒到以后。\n"
 "将弹出对话框让您指定何时再次显示提醒。"
 
-#: messagewin.cpp:553 sounddlg.cpp:314
+#: messagewin.cpp:555 sounddlg.cpp:314
 msgid "Stop sound"
 msgstr "停止声音"
 
-#: messagewin.cpp:554 sounddlg.cpp:315
+#: messagewin.cpp:556 sounddlg.cpp:315
 msgid "Stop playing the sound"
 msgstr "停止播放声音"
 
-#: messagewin.cpp:570
+#: messagewin.cpp:572
 msgid ""
 "_: Locate this email in KMail\n"
 "Locate in KMail"
 msgstr "在 KMail 中定位"
 
-#: messagewin.cpp:571
+#: messagewin.cpp:573
 msgid "Locate and highlight this email in KMail"
 msgstr "在 KMail 中定位并突出显示此电子邮件"
 
-#: messagewin.cpp:583
+#: messagewin.cpp:585
 msgid "Activate KAlarm"
 msgstr "激活 KAlarm"
 
-#: messagewin.cpp:625
+#: messagewin.cpp:629
 msgid "Today"
 msgstr "今天"
 
-#: messagewin.cpp:627
+#: messagewin.cpp:631
 #, c-format
 msgid ""
 "_n: Tomorrow\n"
 "in %n days' time"
 msgstr "%n 天的时间"
 
-#: messagewin.cpp:629
+#: messagewin.cpp:633
 #, c-format
 msgid ""
 "_n: in 1 week's time\n"
 "in %n weeks' time"
 msgstr "%n 星期的时间"
 
-#: messagewin.cpp:643
+#: messagewin.cpp:647
 #, c-format
 msgid ""
 "_n: in 1 minute's time\n"
 "in %n minutes' time"
 msgstr "%n 分钟的时间"
 
-#: messagewin.cpp:645
+#: messagewin.cpp:649
 #, c-format
 msgid ""
 "_n: in 1 hour's time\n"
 "in %n hours' time"
 msgstr "%n 小时的时间"
 
-#: messagewin.cpp:647
+#: messagewin.cpp:651
 #, c-format
 msgid ""
 "_n: in 1 hour 1 minute's time\n"
 "in %n hours 1 minute's time"
 msgstr "%n 小时 1 分钟的时间"
 
-#: messagewin.cpp:649
+#: messagewin.cpp:653
 msgid ""
 "_n: in 1 hour %1 minutes' time\n"
 "in %n hours %1 minutes' time"
 msgstr "%n 小时 %1 分钟的时间"
 
-#: messagewin.cpp:822 messagewin.cpp:836
+#: messagewin.cpp:826 messagewin.cpp:840
 msgid "Unable to speak message"
 msgstr "输入读出消息"
 
-#: messagewin.cpp:836
+#: messagewin.cpp:840
 msgid "DCOP Call sayMessage failed"
 msgstr "DCOP 调用 sayMessage 失败"
 
-#: messagewin.cpp:858 sounddlg.cpp:302
+#: messagewin.cpp:862 sounddlg.cpp:302
 #, c-format
 msgid ""
 "Cannot open audio file:\n"
@@ -1870,7 +1872,7 @@ msgstr ""
 "无法打开声音文件：\n"
 "%1"
 
-#: messagewin.cpp:882
+#: messagewin.cpp:885
 msgid ""
 "Unable to set master volume\n"
 "(Error accessing KMix:\n"
@@ -1880,19 +1882,19 @@ msgstr ""
 "(访问 KMix 出错：\n"
 "%1)"
 
-#: messagewin.cpp:1403
+#: messagewin.cpp:1405
 msgid "Do you really want to acknowledge this alarm?"
 msgstr "您真的要接受这个提醒吗？"
 
-#: messagewin.cpp:1404
+#: messagewin.cpp:1406
 msgid "Acknowledge Alarm"
 msgstr "接受提醒"
 
-#: messagewin.cpp:1404
+#: messagewin.cpp:1406
 msgid "&Acknowledge"
 msgstr "接受(&A)"
 
-#: messagewin.cpp:1449
+#: messagewin.cpp:1451
 msgid "Unable to locate this email in KMail"
 msgstr "无法在 KMail 中定位此电子邮件"
 
@@ -2169,8 +2171,8 @@ msgstr "使用控制中心里的地址(&U)"
 
 #: prefdlg.cpp:661
 msgid ""
-"Check to use the email address set in the Trinity Control Center, to identify you "
-"as the sender when sending email alarms."
+"Check to use the email address set in the Trinity Control Center, to identify "
+"you as the sender when sending email alarms."
 msgstr "选中此项使用 TDE 控制中心里设置的电子邮件地址来作为发送电子邮件提醒的发送者。"
 
 #: prefdlg.cpp:665
@@ -2207,8 +2209,8 @@ msgstr "使用控制中心里的地址(&E)"
 
 #: prefdlg.cpp:702
 msgid ""
-"Check to use the email address set in the Trinity Control Center, for blind copying "
-"email alarms to yourself."
+"Check to use the email address set in the Trinity Control Center, for blind "
+"copying email alarms to yourself."
 msgstr "选中此项使用 TDE 控制中心里设置的电子邮件地址来作为电子邮件提醒的密件抄送者。"
 
 #: prefdlg.cpp:708
@@ -2661,164 +2663,164 @@ msgstr "天"
 msgid "Enter the number of days between repetitions of the alarm"
 msgstr "输入重复提醒之间的天数。"
 
-#: recurrenceedit.cpp:1228
+#: recurrenceedit.cpp:1227
 msgid "Select the days of the week on which the alarm is allowed to occur"
 msgstr "选择一周中允许发生提醒的日子"
 
-#: recurrenceedit.cpp:1230 recurrenceedit.cpp:1244
-msgid "Select the days of the week on which to repeat the alarm"
-msgstr "选择一周中要重复提醒的日子"
-
-#: recurrenceedit.cpp:1242
+#: recurrenceedit.cpp:1238
 msgid "week(s)"
 msgstr "星期"
 
-#: recurrenceedit.cpp:1243
+#: recurrenceedit.cpp:1239
 msgid "Enter the number of weeks between repetitions of the alarm"
 msgstr "输入重复提醒之间的星期数"
 
-#: recurrenceedit.cpp:1267
+#: recurrenceedit.cpp:1240
+msgid "Select the days of the week on which to repeat the alarm"
+msgstr "选择一周中要重复提醒的日子"
+
+#: recurrenceedit.cpp:1263
 msgid ""
 "_: On day number in the month\n"
 "O&n day"
 msgstr "日期(&N)"
 
-#: recurrenceedit.cpp:1271
+#: recurrenceedit.cpp:1267
 msgid "Repeat the alarm on the selected day of the month"
 msgstr "在每月选定的日子进行重新提醒"
 
-#: recurrenceedit.cpp:1277
+#: recurrenceedit.cpp:1273
 msgid ""
 "_: Last day of month\n"
 "Last"
 msgstr "最后一个"
 
-#: recurrenceedit.cpp:1280
+#: recurrenceedit.cpp:1276
 msgid "Select the day of the month on which to repeat the alarm"
 msgstr "选择每月内进行重复提醒的日子"
 
-#: recurrenceedit.cpp:1292
+#: recurrenceedit.cpp:1288
 msgid ""
 "_: On the 1st Tuesday\n"
 "On t&he"
 msgstr "在(&H)"
 
-#: recurrenceedit.cpp:1297
+#: recurrenceedit.cpp:1293
 msgid ""
 "Repeat the alarm on one day of the week, in the selected week of the month"
 msgstr "在每月选定星期的某一天重复提醒"
 
-#: recurrenceedit.cpp:1300
+#: recurrenceedit.cpp:1296
 msgid "1st"
 msgstr "第1"
 
-#: recurrenceedit.cpp:1301
+#: recurrenceedit.cpp:1297
 msgid "2nd"
 msgstr "第2"
 
-#: recurrenceedit.cpp:1302
+#: recurrenceedit.cpp:1298
 msgid "3rd"
 msgstr "第3"
 
-#: recurrenceedit.cpp:1303
+#: recurrenceedit.cpp:1299
 msgid "4th"
 msgstr "第4"
 
-#: recurrenceedit.cpp:1304
+#: recurrenceedit.cpp:1300
 msgid "5th"
 msgstr "第5"
 
-#: recurrenceedit.cpp:1305
+#: recurrenceedit.cpp:1301
 msgid ""
 "_: Last Monday in March\n"
 "Last"
 msgstr "最后一个"
 
-#: recurrenceedit.cpp:1306
+#: recurrenceedit.cpp:1302
 msgid "2nd Last"
 msgstr "倒数第二个"
 
-#: recurrenceedit.cpp:1307
+#: recurrenceedit.cpp:1303
 msgid "3rd Last"
 msgstr "倒数第三个"
 
-#: recurrenceedit.cpp:1308
+#: recurrenceedit.cpp:1304
 msgid "4th Last"
 msgstr "倒数第四个"
 
-#: recurrenceedit.cpp:1309
+#: recurrenceedit.cpp:1305
 msgid "5th Last"
 msgstr "倒数第五个"
 
-#: recurrenceedit.cpp:1312
+#: recurrenceedit.cpp:1308
 msgid ""
 "_: Every (Monday...) in month\n"
 "Every"
 msgstr "每个"
 
-#: recurrenceedit.cpp:1315
+#: recurrenceedit.cpp:1311
 msgid "Select the week of the month in which to repeat the alarm"
 msgstr "选择每月内进行重复提醒的星期"
 
-#: recurrenceedit.cpp:1328
+#: recurrenceedit.cpp:1324
 msgid "Select the day of the week on which to repeat the alarm"
 msgstr "选择每周内进行重复提醒的日子"
 
-#: recurrenceedit.cpp:1446
+#: recurrenceedit.cpp:1442
 msgid "month(s)"
 msgstr "月"
 
-#: recurrenceedit.cpp:1447
+#: recurrenceedit.cpp:1443
 msgid "Enter the number of months between repetitions of the alarm"
 msgstr "输入重复提醒之间的月数"
 
-#: recurrenceedit.cpp:1458
+#: recurrenceedit.cpp:1454
 msgid "year(s)"
 msgstr "年"
 
-#: recurrenceedit.cpp:1459
+#: recurrenceedit.cpp:1455
 msgid "Enter the number of years between repetitions of the alarm"
 msgstr "输入重复提醒之间的年数"
 
-#: recurrenceedit.cpp:1464
+#: recurrenceedit.cpp:1460
 msgid ""
 "_: List of months to select\n"
 "Months:"
 msgstr ""
 
-#: recurrenceedit.cpp:1483
+#: recurrenceedit.cpp:1479
 msgid "Select the months of the year in which to repeat the alarm"
 msgstr "选择一年中要重复提醒的月份"
 
-#: recurrenceedit.cpp:1490
+#: recurrenceedit.cpp:1486
 msgid "February 2&9th alarm in non-leap years:"
 msgstr "非闰年中二月二十九日的提醒(&9)："
 
-#: recurrenceedit.cpp:1493
+#: recurrenceedit.cpp:1489
 msgid ""
 "_: No date\n"
 "None"
 msgstr "无"
 
-#: recurrenceedit.cpp:1494
+#: recurrenceedit.cpp:1490
 msgid ""
 "_: 1st March (short form)\n"
 "1 Mar"
 msgstr "三月一日"
 
-#: recurrenceedit.cpp:1495
+#: recurrenceedit.cpp:1491
 msgid ""
 "_: 28th February (short form)\n"
 "28 Feb"
 msgstr "二月二十八日"
 
-#: recurrenceedit.cpp:1501
+#: recurrenceedit.cpp:1497
 msgid ""
 "Select which date, if any, the February 29th alarm should trigger in non-leap "
 "years"
 msgstr "在非闰年中应如何触发二月二十九日的提醒"
 
-#: recurrenceedit.cpp:1585
+#: recurrenceedit.cpp:1581
 msgid "No month selected"
 msgstr "没有选中的月"
 
@@ -3256,12 +3258,12 @@ msgstr "自定义..."
 msgid "Date cannot be earlier than %1"
 msgstr "日期不能早于 %1"
 
-#: lib/dateedit.cpp:68
+#: lib/dateedit.cpp:69
 #, c-format
 msgid "Date cannot be later than %1"
 msgstr "日期不能晚于 %1"
 
-#: lib/dateedit.cpp:79
+#: lib/dateedit.cpp:81
 msgid "today"
 msgstr "今天"
 
diff --git a/tde-i18n-zh_CN/messages/tdepim/kandy.po b/tde-i18n-zh_CN/messages/tdepim/kandy.po
index 9faa33c4bf4..8078ecb2e0e 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kandy.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kandy.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kandy\n"
-"POT-Creation-Date: 2006-07-25 03:59+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-08-03 21:28+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdepim/karm.po b/tde-i18n-zh_CN/messages/tdepim/karm.po
index aa5af2429a3..d9e55b327bd 100644
--- a/tde-i18n-zh_CN/messages/tdepim/karm.po
+++ b/tde-i18n-zh_CN/messages/tdepim/karm.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2008-04-21 01:46+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-08-03 21:33+0800\n"
 "Last-Translator: Funda Wang <fundawnag@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdepim/kcmkabconfig.po b/tde-i18n-zh_CN/messages/tdepim/kcmkabconfig.po
index d653009fd28..44eb0dcdfb8 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kcmkabconfig.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kcmkabconfig.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2005-08-13 01:40+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-01-26 17:08+0800\n"
 "Last-Translator: Levin <zsdjw@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -96,74 +97,74 @@ msgstr "保留名称"
 msgid "Extension Settings"
 msgstr "扩展设置"
 
-#: tdeabconfigwidget.cpp:62 tdeabconfigwidget.cpp:154
+#: kabconfigwidget.cpp:62 kabconfigwidget.cpp:154
 msgid "General"
 msgstr "常规"
 
-#: tdeabconfigwidget.cpp:66
+#: kabconfigwidget.cpp:66
 msgid "Honor TDE single click"
 msgstr "使用 TDE 单击风格"
 
-#: tdeabconfigwidget.cpp:69
+#: kabconfigwidget.cpp:69
 msgid "Automatic name parsing for new addressees"
 msgstr "自动分析新地址名"
 
-#: tdeabconfigwidget.cpp:72
+#: kabconfigwidget.cpp:72
 msgid "Trade single name component as family name"
 msgstr "将单独的姓名识别为姓"
 
-#: tdeabconfigwidget.cpp:80
+#: kabconfigwidget.cpp:80
 msgid "Limit unfiltered display to 100 contacts"
 msgstr "限制未过滤的显示为100个联系人"
 
-#: tdeabconfigwidget.cpp:85
+#: kabconfigwidget.cpp:85
 msgid "Addressee editor type:"
 msgstr "收件人编辑器类型："
 
-#: tdeabconfigwidget.cpp:89
+#: kabconfigwidget.cpp:89
 msgid "Full Editor"
 msgstr "完全编辑器"
 
-#: tdeabconfigwidget.cpp:90
+#: kabconfigwidget.cpp:90
 msgid "Simple Editor"
 msgstr "简单编辑器"
 
-#: tdeabconfigwidget.cpp:99
+#: kabconfigwidget.cpp:99
 msgid "Script-Hooks"
 msgstr "脚本拦截"
 
-#: tdeabconfigwidget.cpp:102
+#: kabconfigwidget.cpp:102
 msgid "Phone:"
 msgstr "电话："
 
-#: tdeabconfigwidget.cpp:106
+#: kabconfigwidget.cpp:106
 msgid "<ul><li>%N: Phone Number</li></ul>"
 msgstr "<ul><li>%N：电话号码</li></ul>"
 
-#: tdeabconfigwidget.cpp:109
+#: kabconfigwidget.cpp:109
 msgid "Fax:"
 msgstr "传真："
 
-#: tdeabconfigwidget.cpp:113
+#: kabconfigwidget.cpp:113
 msgid "<ul><li>%N: Fax Number</li></ul>"
 msgstr "<ul><li>%N：传真号码</li></ul>"
 
-#: tdeabconfigwidget.cpp:117
+#: kabconfigwidget.cpp:117
 msgid "SMS Text:"
 msgstr "短消息文本："
 
-#: tdeabconfigwidget.cpp:121
+#: kabconfigwidget.cpp:121
 msgid ""
 "<ul>"
 "<li>%N: Phone Number</li>"
 "<li>%F: File containing the text message(s)</li></ul>"
 msgstr "<ul><li>%N：电话号码</li><li>%F：包含文本消息的文件</li></ul>"
 
-#: tdeabconfigwidget.cpp:129
+#: kabconfigwidget.cpp:129
 msgid "Location Map"
 msgstr "位置地图"
 
-#: tdeabconfigwidget.cpp:135
+#: kabconfigwidget.cpp:135
 msgid ""
 "<ul> "
 "<li>%s: Street</li>"
@@ -179,7 +180,7 @@ msgstr ""
 "<li>%z：邮政编码</li>"
 "<li>%c：国家 ISO 代码</li></ul>"
 
-#: tdeabconfigwidget.cpp:158
+#: kabconfigwidget.cpp:158
 msgid "Contact"
 msgstr "联系人"
 
diff --git a/tde-i18n-zh_CN/messages/tdepim/kcmkontactnt.po b/tde-i18n-zh_CN/messages/tdepim/kcmkontactnt.po
index 49ec19e0254..5a9120277b2 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kcmkontactnt.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kcmkontactnt.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkontactnt\n"
-"POT-Creation-Date: 2006-03-20 03:58+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-08-05 11:20+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdepim/kdgantt.po b/tde-i18n-zh_CN/messages/tdepim/kdgantt.po
index 70a60a9a2ba..fc9b60a17ef 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kdgantt.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kdgantt.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2008-01-26 01:18+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-08-03 21:37+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdepim/kgantt.po b/tde-i18n-zh_CN/messages/tdepim/kgantt.po
index b97c255fa0b..3870d93ebfd 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kgantt.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kgantt.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kgantt\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2003-12-28 15:57+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdepim/kleopatra.po b/tde-i18n-zh_CN/messages/tdepim/kleopatra.po
index 42858b82525..97d928a8b45 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kleopatra.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kleopatra.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kleopatra\n"
-"POT-Creation-Date: 2008-08-19 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-08-05 03:52+0800\n"
 "Last-Translator: Levin Du <zsdjw@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -190,7 +191,7 @@ msgstr "程序不能执行"
 msgid "Issuer certificate not found ( %1)"
 msgstr "找不到颁发者证书(%1)"
 
-#: certificateinfowidgetimpl.cpp:380 certmanager.cpp:1153
+#: certificateinfowidgetimpl.cpp:380 certmanager.cpp:1154
 msgid "Additional Information for Key"
 msgstr "密钥的附加信息"
 
@@ -220,8 +221,8 @@ msgid "Could not start certificate generation: %1"
 msgstr "不能开始生成证书：%1"
 
 #: certificatewizardimpl.cpp:259 certificatewizardimpl.cpp:282
-#: certmanager.cpp:876 certmanager.cpp:878 certmanager.cpp:937
-#: certmanager.cpp:992 certmanager.cpp:994 crlview.cpp:111 crlview.cpp:134
+#: certmanager.cpp:876 certmanager.cpp:878 certmanager.cpp:938
+#: certmanager.cpp:993 certmanager.cpp:995 crlview.cpp:111 crlview.cpp:134
 msgid "Certificate Manager Error"
 msgstr "证书管理器错误"
 
@@ -247,16 +248,16 @@ msgstr ""
 msgid "DCOP Communication Error, unable to send certificate using KMail."
 msgstr "DCOP 通讯出错，不能使用 KMail 发送证书"
 
-#: certificatewizardimpl.cpp:483 certmanager.cpp:1240
+#: certificatewizardimpl.cpp:483 certmanager.cpp:1241
 msgid ""
 "A file named \"%1\" already exists. Are you sure you want to overwrite it?"
 msgstr "名为”%1“的文件已经存在。您确认真的要覆盖它吗？"
 
-#: certificatewizardimpl.cpp:485 certmanager.cpp:1242
+#: certificatewizardimpl.cpp:485 certmanager.cpp:1243
 msgid "Overwrite File?"
 msgstr "是否覆盖文件？"
 
-#: certificatewizardimpl.cpp:486 certmanager.cpp:1243
+#: certificatewizardimpl.cpp:486 certmanager.cpp:1244
 msgid "&Overwrite"
 msgstr "覆盖(&O)"
 
@@ -538,29 +539,31 @@ msgstr ""
 msgid "CRL file imported successfully."
 msgstr "CRL 文件成功导入。"
 
-#: certmanager.cpp:880 certmanager.cpp:996
+#: certmanager.cpp:880 certmanager.cpp:997
 msgid "Certificate Manager Information"
 msgstr "证书管理器信息"
 
-#: certmanager.cpp:892
-msgid "Certificate Revocation List (*.crl *.arl *-crl.der *-arl.der)"
+#: certmanager.cpp:893
+#, fuzzy
+msgid ""
+"Certificate Revocation List, DER encoded (*.crl *.arl *-crl.der *-arl.der)"
 msgstr "证书吊销列表 (*.crl *.arl *-crl.der *-arl.der)"
 
-#: certmanager.cpp:896
+#: certmanager.cpp:897
 msgid "Select CRL File"
 msgstr "选择 CRL 文件"
 
-#: certmanager.cpp:937
+#: certmanager.cpp:938
 msgid "Unable to start %1 process. Please check your installation."
 msgstr "不能启动 %1 进程，请检查您的安装。"
 
-#: certmanager.cpp:992
+#: certmanager.cpp:993
 msgid ""
 "The DirMngr process that tried to clear the CRL cache ended prematurely because "
 "of an unexpected error."
 msgstr "DirMngr 进程在尝试清除 CRL 缓存时，因非预期错误而提前结束。"
 
-#: certmanager.cpp:994
+#: certmanager.cpp:995
 #, c-format
 msgid ""
 "An error occurred when trying to clear the CRL cache. The output from DirMngr "
@@ -568,26 +571,26 @@ msgid ""
 "%1"
 msgstr "尝试清除 CRL 缓存时出错，DirMngr 的输出为：%1"
 
-#: certmanager.cpp:996
+#: certmanager.cpp:997
 msgid "CRL cache cleared successfully."
 msgstr "CRL 缓存清除成功。"
 
-#: certmanager.cpp:1002
+#: certmanager.cpp:1003
 msgid ""
 "<qt>"
 "<p>An error occurred while trying to delete the certificates:</p>"
 "<p><b>%1</b></p></qt>"
 msgstr "<qt><p>尝试删除证书时出错：</p><p><b>%1</b></p></qt>"
 
-#: certmanager.cpp:1006 certmanager.cpp:1101
+#: certmanager.cpp:1007 certmanager.cpp:1102
 msgid "Certificate Deletion Failed"
 msgstr "证书删除失败"
 
-#: certmanager.cpp:1040
+#: certmanager.cpp:1041
 msgid "Checking key dependencies..."
 msgstr "正在检查密钥依赖性..."
 
-#: certmanager.cpp:1066
+#: certmanager.cpp:1067
 msgid ""
 "Some or all of the selected certificates are issuers (CA certificates) for "
 "other, non-selected certificates.\n"
@@ -596,11 +599,11 @@ msgstr ""
 "所选的部分或全部证书为其它未选证书的颁发机构。\n"
 "删除颁发机构的证书会同时删除其颁发的全部证书。"
 
-#: certmanager.cpp:1071
+#: certmanager.cpp:1072
 msgid "Deleting CA Certificates"
 msgstr "正在删除 CA 证书"
 
-#: certmanager.cpp:1077
+#: certmanager.cpp:1078
 msgid ""
 "_n: Do you really want to delete this certificate and the %1 certificates it "
 "certified?\n"
@@ -608,18 +611,18 @@ msgid ""
 "certified?"
 msgstr "您真的要删除这 %n 张证书，以及其认证过的 %1 张证书吗？"
 
-#: certmanager.cpp:1080
+#: certmanager.cpp:1081
 #, c-format
 msgid ""
 "_n: Do you really want to delete this certificate?\n"
 "Do you really want to delete these %n certificates?"
 msgstr "您真的要删除这 %n 张证书吗？"
 
-#: certmanager.cpp:1083
+#: certmanager.cpp:1084
 msgid "Delete Certificates"
 msgstr "删除证书"
 
-#: certmanager.cpp:1093
+#: certmanager.cpp:1094
 msgid ""
 "<qt>"
 "<p>An error occurred while trying to delete the certificate:</p>"
@@ -627,7 +630,7 @@ msgid ""
 "<p></qt>"
 msgstr "<qt><p>尝试删除证书时出错：</p><p><b>%1</b><p></qt>"
 
-#: certmanager.cpp:1096
+#: certmanager.cpp:1097
 msgid ""
 "<qt>"
 "<p>An error occurred while trying to delete the certificates:</p>"
@@ -635,77 +638,77 @@ msgid ""
 "<p></qt>"
 msgstr "<qt><p>尝试删除证书时出错：</p><p><b>%1</b><p></qt>"
 
-#: certmanager.cpp:1100
+#: certmanager.cpp:1101
 msgid "Operation not supported by the backend."
 msgstr "后端不支持该操作。"
 
-#: certmanager.cpp:1115
+#: certmanager.cpp:1116
 msgid "Deleting keys..."
 msgstr "正在删除密钥..."
 
-#: certmanager.cpp:1205
+#: certmanager.cpp:1206
 msgid ""
 "<qt>"
 "<p>An error occurred while trying to export the certificate:</p>"
 "<p><b>%1</b></p></qt>"
 msgstr "<qt><p>尝试导出证书时出错：</p><p><b>%1</b></p></qt>"
 
-#: certmanager.cpp:1209
+#: certmanager.cpp:1210
 msgid "Certificate Export Failed"
 msgstr "证书导出失败"
 
-#: certmanager.cpp:1224
+#: certmanager.cpp:1225
 msgid "Exporting certificate..."
 msgstr "正在导出证书..."
 
-#: certmanager.cpp:1259
+#: certmanager.cpp:1260
 msgid "ASCII Armored Certificate Bundles (*.pem)"
 msgstr ""
 
-#: certmanager.cpp:1263 certmanager.cpp:1380
+#: certmanager.cpp:1264 certmanager.cpp:1383
 msgid "Save Certificate"
 msgstr "保存证书"
 
-#: certmanager.cpp:1279
+#: certmanager.cpp:1280
 msgid "Secret Key Export"
 msgstr "私有密钥导出"
 
-#: certmanager.cpp:1280
+#: certmanager.cpp:1282
 msgid ""
 "Select the secret key to export (<b>Warning: The PKCS#12 format is insecure; "
 "exporting secret keys is discouraged</b>):"
 msgstr "选择要导出的私有密钥 (<b>警告： PKCS#12 格式不安全，不建议导出私有密钥</b>)："
 
-#: certmanager.cpp:1298
+#: certmanager.cpp:1301
 msgid ""
 "<qt>"
 "<p>An error occurred while trying to export the secret key:</p>"
 "<p><b>%1</b></p></qt>"
 msgstr "<qt><p>尝试导出私有密钥时出错：</p><p><b>%1</b></p></qt>"
 
-#: certmanager.cpp:1302
+#: certmanager.cpp:1305
 msgid "Secret-Key Export Failed"
 msgstr "私有密钥导出失败"
 
-#: certmanager.cpp:1344 certmanager.cpp:1359
+#: certmanager.cpp:1347 certmanager.cpp:1362
 msgid "Exporting secret key..."
 msgstr "正在导出私有密钥..."
 
-#: certmanager.cpp:1345
+#: certmanager.cpp:1348
 msgid ""
 "Choose a charset for encoding the pkcs#12 passphrase (utf8 is recommended)"
 msgstr ""
 
-#: certmanager.cpp:1376
+#: certmanager.cpp:1379
 msgid "PKCS#12 Key Bundle (*.p12)"
 msgstr "PKCS#12 密钥集 (*.p12)"
 
-#: certmanager.cpp:1427
+#: certmanager.cpp:1430
 msgid ""
 "Could not start GnuPG LogViewer (kwatchgnupg). Please check your installation!"
 msgstr "不能启动 GnuPG 日志查看器 (kwatchgnupg)，请检查您的安装。"
 
-#: certmanager.cpp:1429
+#: certmanager.cpp:1432
 msgid "Kleopatra Error"
 msgstr "Kleopatra 错误"
 
diff --git a/tde-i18n-zh_CN/messages/tdepim/kmail.po b/tde-i18n-zh_CN/messages/tdepim/kmail.po
index fc3638b6a97..122dd515bee 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kmail.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kmail.po
@@ -11,10 +11,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmail 3.5\n"
-"POT-Creation-Date: 2008-08-19 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2008-01-29 14:12+0800\n"
 "Last-Translator: Lie_Ex <lilith.ex@gmail.com>\n"
 "Language-Team: zh_CN <kde-china@kde.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -103,7 +104,7 @@ msgstr "“传送完成”状态消息的时间戳"
 msgid "multiple encryption keys per address"
 msgstr "每个地址用多个加密密钥"
 
-#: aboutdata.cpp:212 kmreaderwin.cpp:1336 kmstartup.cpp:148
+#: aboutdata.cpp:212 kmreaderwin.cpp:1300 kmstartup.cpp:149
 #: mailinglistpropertiesdialog.cpp:97
 msgid "KMail"
 msgstr "KMail"
@@ -147,7 +148,8 @@ msgid "Locking Method"
 msgstr "锁定方式"
 
 #: accountdialog.cpp:368
-msgid "Procmail loc&kfile:"
+#, fuzzy
+msgid "Procmail loc&tdefile:"
 msgstr "Procmail 文件锁(&K)："
 
 #: accountdialog.cpp:380
@@ -201,7 +203,7 @@ msgid "Check inter&val:"
 msgstr "检查间隔(&V)："
 
 #: accountdialog.cpp:438 accountdialog.cpp:537 accountdialog.cpp:741
-#: accountdialog.cpp:1059 configuredialog.cpp:2655
+#: accountdialog.cpp:1059 configuredialog.cpp:2733
 msgid " min"
 msgstr " 分钟"
 
@@ -234,8 +236,8 @@ msgstr "手动检查邮件时包含(&M)"
 msgid "Account Type: POP Account"
 msgstr "账户类型：POP 账户"
 
-#: accountdialog.cpp:582 accountdialog.cpp:851 configuredialog.cpp:2526
-#: identitydialog.cpp:109 kmfilterdlg.cpp:160 kmtransport.cpp:376
+#: accountdialog.cpp:582 accountdialog.cpp:851 configuredialog.cpp:2550
+#: identitydialog.cpp:112 kmfilterdlg.cpp:164 kmtransport.cpp:376
 msgid "&General"
 msgstr "常规(&G)"
 
@@ -333,7 +335,7 @@ msgstr "其它(&E)"
 msgid "Check &What the Server Supports"
 msgstr "检查服务器所支持的方式(&W)"
 
-#: accountdialog.cpp:782 accountdialog.cpp:1097 kmheaders.cpp:137
+#: accountdialog.cpp:782 accountdialog.cpp:1097 kmheaders.cpp:140
 #: kmtransport.cpp:502
 msgid "Encryption"
 msgstr "加密"
@@ -457,7 +459,8 @@ msgid "Sho&w hidden folders"
 msgstr "显示隐藏的文件夹(&W)"
 
 #: accountdialog.cpp:987
-msgid "Show only s&ubscribed folders"
+#, fuzzy
+msgid "Show only serverside s&ubscribed folders"
 msgstr "仅显示订阅的文件夹(&U)"
 
 #: accountdialog.cpp:992
@@ -509,9 +512,9 @@ msgstr "过滤(&F)"
 msgid "<none>"
 msgstr "<无>"
 
-#: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:244
-#: kmfoldercachedimap.cpp:2085 kmfolderimap.cpp:204 kmfolderimap.cpp:907
-#: kmkernel.cpp:1374 subscriptiondialog.cpp:172
+#: accountdialog.cpp:1421 accountdialog.cpp:1428 kmfoldercachedimap.cpp:258
+#: kmfoldercachedimap.cpp:2255 kmfolderimap.cpp:200 kmfolderimap.cpp:901
+#: kmkernel.cpp:1424 subscriptiondialog.cpp:172
 msgid "inbox"
 msgstr "收件箱"
 
@@ -592,7 +595,7 @@ msgstr ""
 "服务器似乎不支持获取信件头，但是要在服务器上过滤信件，必须使用此特性；因此，此选项已被禁用。\n"
 "由于某些服务器无法正确声明其能力，您仍然有机会关闭在服务器上过滤信件的功能。"
 
-#: accountdialog.cpp:1734 vacationdialog.cpp:163
+#: accountdialog.cpp:1734 vacationdialog.cpp:76 vacationdialog.cpp:165
 msgid ""
 "_n:  day\n"
 " days"
@@ -630,12 +633,12 @@ msgstr "清空"
 msgid "Edit Namespace '%1'"
 msgstr "编辑命名空间“%1”"
 
-#: accountmanager.cpp:101
+#: accountmanager.cpp:103
 #, c-format
 msgid "Account %1"
 msgstr "账户 %1"
 
-#: accountmanager.cpp:181
+#: accountmanager.cpp:183
 msgid ""
 "Account %1 has no mailbox defined:\n"
 "mail checking aborted;\n"
@@ -645,24 +648,24 @@ msgstr ""
 "邮件检查已中止；\n"
 "请检查您的账户设置。"
 
-#: accountmanager.cpp:196
+#: accountmanager.cpp:226
 msgid "Checking account %1 for new mail"
 msgstr "检查账户 %1 中的新邮件"
 
-#: accountmanager.cpp:214 accountmanager.cpp:217 accountwizard.cpp:441
+#: accountmanager.cpp:244 accountmanager.cpp:247 accountwizard.cpp:441
 #: accountwizard.cpp:477
 msgid "Local Account"
 msgstr "本地账户"
 
-#: accountmanager.cpp:220
+#: accountmanager.cpp:250
 msgid "POP Account"
 msgstr "POP 账户"
 
-#: accountmanager.cpp:223 accountmanager.cpp:225
+#: accountmanager.cpp:253 accountmanager.cpp:255
 msgid "IMAP Account"
 msgstr "IMAP 账户"
 
-#: accountmanager.cpp:308
+#: accountmanager.cpp:343
 msgid ""
 "You need to add an account in the network section of the settings in order to "
 "receive mail."
@@ -768,13 +771,13 @@ msgstr "使用本地投递"
 msgid "Server Information"
 msgstr "服务器信息"
 
-#. i18n: file customtemplates_base.ui line 248
-#: accountwizard.cpp:329 rc.cpp:212
+#. i18n: file customtemplates_base.ui line 302
+#: accountwizard.cpp:329 rc.cpp:221
 #, no-c-format
 msgid "None"
 msgstr "无"
 
-#: accountwizard.cpp:384 configuredialog.cpp:792
+#: accountwizard.cpp:384 configuredialog.cpp:794
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -782,13 +785,13 @@ msgstr "Sendmail"
 msgid "Check for supported security capabilities of %1..."
 msgstr "检查 %1 的安全性支持能力..."
 
-#: actionscheduler.cpp:598 kmfiltermgr.cpp:152 kmfiltermgr.cpp:255
-#: kmfiltermgr.cpp:293
+#: actionscheduler.cpp:598 kmfiltermgr.cpp:150 kmfiltermgr.cpp:253
+#: kmfiltermgr.cpp:291
 msgid "<b>Evaluating filter rules:</b> "
 msgstr "<b>评估过滤器规则：</b> "
 
-#: actionscheduler.cpp:605 kmfiltermgr.cpp:159 kmfiltermgr.cpp:262
-#: kmfiltermgr.cpp:299
+#: actionscheduler.cpp:605 kmfiltermgr.cpp:157 kmfiltermgr.cpp:260
+#: kmfiltermgr.cpp:297
 msgid "<b>Filter rules have matched.</b>"
 msgstr "<b>过滤器规则已经匹配。</b>"
 
@@ -797,111 +800,111 @@ msgstr "<b>过滤器规则已经匹配。</b>"
 msgid "<b>Applying filter action:</b> %1"
 msgstr "<b>应用过滤动作：</b>%1"
 
-#: antispamwizard.cpp:101
+#: antispamwizard.cpp:100
 msgid "Anti-Spam Wizard"
 msgstr "反垃圾向导"
 
-#: antispamwizard.cpp:102
+#: antispamwizard.cpp:101
 msgid "Anti-Virus Wizard"
 msgstr "反病毒向导"
 
-#: antispamwizard.cpp:106
+#: antispamwizard.cpp:105
 msgid "Welcome to the KMail Anti-Spam Wizard"
 msgstr "欢迎使用 KMail 的反垃圾向导"
 
-#: antispamwizard.cpp:107
+#: antispamwizard.cpp:106
 msgid "Welcome to the KMail Anti-Virus Wizard"
 msgstr "欢迎来到 KMail 的反病毒向导。"
 
-#: antispamwizard.cpp:113
+#: antispamwizard.cpp:112
 msgid "Options to fine-tune the handling of spam messages"
 msgstr "调整垃圾邮件处理的选项"
 
-#: antispamwizard.cpp:119
+#: antispamwizard.cpp:118
 msgid "Options to fine-tune the handling of virus messages"
 msgstr "调整病毒邮件处理的选项"
 
-#: antispamwizard.cpp:131
+#: antispamwizard.cpp:130
 msgid "Summary of changes to be made by this wizard"
 msgstr "此向导所执行的更改"
 
-#: antispamwizard.cpp:200
+#: antispamwizard.cpp:199
 msgid "Virus handling"
 msgstr "病毒处理"
 
-#: antispamwizard.cpp:284 antispamwizard.cpp:286 antispamwizard.cpp:572
+#: antispamwizard.cpp:283 antispamwizard.cpp:285 antispamwizard.cpp:577
 msgid "Spam handling"
 msgstr "垃圾邮件处理"
 
-#: antispamwizard.cpp:325 antispamwizard.cpp:327 antispamwizard.cpp:585
+#: antispamwizard.cpp:324 antispamwizard.cpp:326 antispamwizard.cpp:590
 msgid "Semi spam (unsure) handling"
 msgstr "半垃圾(不确定)邮件处理"
 
-#: antispamwizard.cpp:387 antispamwizard.cpp:389 antispamwizard.cpp:593
+#: antispamwizard.cpp:386 antispamwizard.cpp:388 antispamwizard.cpp:598
 msgid "Classify as spam"
 msgstr "分类为垃圾邮件"
 
-#: antispamwizard.cpp:419 antispamwizard.cpp:421 antispamwizard.cpp:595
+#: antispamwizard.cpp:418 antispamwizard.cpp:420 antispamwizard.cpp:600
 msgid "Classify as NOT spam"
 msgstr "分类为“非”垃圾邮件"
 
-#: antispamwizard.cpp:493
+#: antispamwizard.cpp:498
 msgid "Scanning for %1..."
 msgstr "正在扫描 %1..."
 
-#: antispamwizard.cpp:524
+#: antispamwizard.cpp:529
 msgid "Scanning for anti-spam tools finished."
 msgstr "反垃圾工具扫描完成。"
 
-#: antispamwizard.cpp:525
+#: antispamwizard.cpp:530
 msgid "Scanning for anti-virus tools finished."
 msgstr "反病毒工具扫描完成。"
 
-#: antispamwizard.cpp:528
+#: antispamwizard.cpp:533
 msgid ""
 "<p>No spam detection tools have been found. Install your spam detection "
 "software and re-run this wizard.</p>"
 msgstr "<p>未找到垃圾邮件检测工具。请安装您的垃圾邮件检测工具，然后重新运行此向导。</p>"
 
-#: antispamwizard.cpp:531
+#: antispamwizard.cpp:536
 msgid "Scanning complete. No anti-virus tools found."
 msgstr "扫描完成。未找到反病毒工具。"
 
-#: antispamwizard.cpp:555
+#: antispamwizard.cpp:560
 msgid "<p>Messages classified as spam are marked as read."
 msgstr "<p>分类为垃圾邮件的信件已标为已读。"
 
-#: antispamwizard.cpp:557
+#: antispamwizard.cpp:562
 msgid "<p>Messages classified as spam are not marked as read."
 msgstr "<p>分类为垃圾邮件的信件未标为已读。"
 
-#: antispamwizard.cpp:560
+#: antispamwizard.cpp:565
 msgid "<br>Spam messages are moved into the folder named <i>"
 msgstr "<br>垃圾邮件将被移入文件夹<i>"
 
-#: antispamwizard.cpp:563
+#: antispamwizard.cpp:568
 msgid "<br>Spam messages are not moved into a certain folder.</p>"
 msgstr "<br>垃圾邮件未移入特定文件夹。</p>"
 
-#: antispamwizard.cpp:587
+#: antispamwizard.cpp:592
 msgid "<p>The folder for messages classified as unsure (probably spam) is <i>"
 msgstr "<p>分类为未确定的信件(可能是垃圾邮件)将<i>"
 
-#: antispamwizard.cpp:600
+#: antispamwizard.cpp:605
 msgid "<p>The wizard will create the following filters:<ul>"
 msgstr "<p>向导将创建下列过滤器：<ul>"
 
-#: antispamwizard.cpp:603
+#: antispamwizard.cpp:608
 msgid "<p>The wizard will replace the following filters:<ul>"
 msgstr "<p>向导将替换下列过滤器：<ul>"
 
-#: antispamwizard.cpp:860
+#: antispamwizard.cpp:864
 msgid ""
 "The wizard will search for any tools to do spam detection\n"
 "and setup KMail to work with them."
 msgstr "向导将搜索可进行垃圾邮件检测的任何工具，并将 KMail 设置为与其共同工作。"
 
-#: antispamwizard.cpp:864
+#: antispamwizard.cpp:868
 msgid ""
 "<p>Here you can get some assistance in setting up KMail's filter rules to use "
 "some commonly-known anti-virus tools.</p>"
@@ -921,35 +924,35 @@ msgstr ""
 "<p><b>警告：</b>由于在扫描病毒的时候 KMail 将被锁死，您可能会遇到 KMail "
 "失去响应的情况，因为反病毒工具操作比较费时；如果想要返回到先前的行为，您应该考虑删除向导所创建的某些过滤规则。"
 
-#: antispamwizard.cpp:915
+#: antispamwizard.cpp:919
 msgid ""
 "<p>Please select the tools to be used for the detection and go to the next "
 "page.</p>"
 msgstr "<p>请选择要用于检测的工具，然后前进到下一步。</p>"
 
-#: antispamwizard.cpp:941
+#: antispamwizard.cpp:945
 msgid "&Mark detected spam messages as read"
 msgstr "将检测到的垃圾信件标为已读(&M)"
 
-#: antispamwizard.cpp:943
+#: antispamwizard.cpp:947
 msgid "Mark messages which have been classified as spam as read."
 msgstr "将分类为垃圾邮件的信件标为已读。"
 
-#: antispamwizard.cpp:946
+#: antispamwizard.cpp:950
 msgid "Move &known spam to:"
 msgstr "将已知垃圾邮件移动到(&K)："
 
-#: antispamwizard.cpp:948
+#: antispamwizard.cpp:952
 msgid ""
 "The default folder for spam messages is the trash folder, but you may change "
 "that in the folder view below."
 msgstr "垃圾邮件的默认文件夹是废件箱，但是您可以在下面的文件夹视图中更改。"
 
-#: antispamwizard.cpp:962
+#: antispamwizard.cpp:966
 msgid "Move &probable spam to:"
 msgstr "将可能的垃圾邮件移动到(&P)："
 
-#: antispamwizard.cpp:964
+#: antispamwizard.cpp:968
 msgid ""
 "The default folder is the inbox folder, but you may change that in the folder "
 "view below."
@@ -959,11 +962,11 @@ msgstr ""
 "默认文件夹是收件夹，但您可以在下面的文件夹视图中更改。"
 "<p>并非所有的工具都支持分类未不确定。如果您没有选择有这样的功能的工具，您就无法选择此处的文件夹。"
 
-#: antispamwizard.cpp:1064
+#: antispamwizard.cpp:1068
 msgid "Check messages using the anti-virus tools"
 msgstr "使用反病毒工具检查信件"
 
-#: antispamwizard.cpp:1066
+#: antispamwizard.cpp:1070
 msgid ""
 "Let the anti-virus tools check your messages. The wizard will create "
 "appropriate filters. The messages are usually marked by the tools so that "
@@ -972,28 +975,182 @@ msgid ""
 msgstr ""
 "让反病毒工具检查您的信件。向导会创建适当的过滤器。信件通常先由这些工具作标记，再让过滤器起作用，最后采取操作，例如，将感染病毒的信件移到特殊的文件夹。"
 
-#: antispamwizard.cpp:1072
+#: antispamwizard.cpp:1076
 msgid "Move detected viral messages to the selected folder"
 msgstr "将检测到的病毒信件移至选中的文件夹"
 
-#: antispamwizard.cpp:1074
+#: antispamwizard.cpp:1078
 msgid ""
 "A filter to detect messages classified as virus-infected and to move those "
 "messages into a predefined folder is created. The default folder is the trash "
 "folder, but you may change that in the folder view."
 msgstr "过滤器已经创建成功，该过滤器会检测信件，将分类成染毒的信件移至预定的文件夹。默认的文件夹是废件夹，但您可以在文件夹视图中更改。"
 
-#: antispamwizard.cpp:1080
+#: antispamwizard.cpp:1084
 msgid "Additionally, mark detected viral messages as read"
 msgstr "另外将检测到的染毒邮件标为已读"
 
-#: antispamwizard.cpp:1083
+#: antispamwizard.cpp:1087
 msgid ""
 "Mark messages which have been classified as virus-infected as read, as well as "
 "moving them to the selected folder."
 msgstr "将分类为已感染病毒的信件标为已读，并将其移至选中的文件夹。"
 
-#: cachedimapjob.cpp:220 cachedimapjob.cpp:271 cachedimapjob.cpp:825
+#: archivefolderdialog.cpp:48
+msgid ""
+"_: Start of the filename for a mail archive file\n"
+"Archive"
+msgstr ""
+
+#: archivefolderdialog.cpp:53
+#, fuzzy
+msgid "Archive Folder"
+msgstr "收藏夹"
+
+#: archivefolderdialog.cpp:70 importarchivedialog.cpp:54
+#, fuzzy
+msgid "&Folder:"
+msgstr "文件夹(&F)"
+
+#: archivefolderdialog.cpp:80
+#, fuzzy
+msgid "F&ormat:"
+msgstr "普通(&O)："
+
+#: archivefolderdialog.cpp:86
+msgid "Compressed Zip Archive (.zip)"
+msgstr ""
+
+#: archivefolderdialog.cpp:87
+msgid "Uncompressed Archive (.tar)"
+msgstr ""
+
+#: archivefolderdialog.cpp:88
+msgid "BZ2-Compressed Tar Archive (.tar.bz2)"
+msgstr ""
+
+#: archivefolderdialog.cpp:89
+msgid "GZ-Compressed Tar Archive (.tar.gz)"
+msgstr ""
+
+#: archivefolderdialog.cpp:96 importarchivedialog.cpp:61
+#, fuzzy
+msgid "&Archive File:"
+msgstr "附加文件"
+
+#: archivefolderdialog.cpp:111
+#, fuzzy
+msgid "&Delete folders after completion"
+msgstr "从服务器上删除文件夹"
+
+#: archivefolderdialog.cpp:161
+#, fuzzy
+msgid "Please select the folder that should be archived."
+msgstr "请选择需要附加的公钥。"
+
+#: archivefolderdialog.cpp:162
+#, fuzzy
+msgid "No folder selected"
+msgstr "未选中文件夹"
+
+#: backupjob.cpp:123 importjob.cpp:89
+msgid "The operation was canceled by the user."
+msgstr ""
+
+#: backupjob.cpp:151
+#, fuzzy
+msgid "Failed to archive the folder '%1'."
+msgstr "无法创建文件夹"
+
+#: backupjob.cpp:153
+#, fuzzy
+msgid "Archiving failed."
+msgstr "传送失败。"
+
+#: backupjob.cpp:163
+msgid "Unable to finalize the archive file."
+msgstr ""
+
+#: backupjob.cpp:168
+msgid "Archiving finished"
+msgstr ""
+
+#: backupjob.cpp:173
+msgid ""
+"Archiving folder '%1' successfully completed. The archive was written to the "
+"file '%2'."
+msgstr ""
+
+#: backupjob.cpp:177
+#, fuzzy
+msgid ""
+"_n: 1 message of size %1 was archived.\n"
+"%n messages with the total size of %1 were archived."
+msgstr "搜索到了 %n 封信"
+
+#: backupjob.cpp:179
+#, c-format
+msgid "The archive file has a size of %1."
+msgstr ""
+
+#: backupjob.cpp:181
+msgid "Archiving finished."
+msgstr ""
+
+#: backupjob.cpp:216 backupjob.cpp:226
+#, fuzzy
+msgid "Unable to retrieve a message for folder '%1'."
+msgstr "无法将信件添加到文件夹："
+
+#: backupjob.cpp:251
+#, fuzzy
+msgid "Internal error while trying to retrieve a message from folder '%1'."
+msgstr "试图重命名文件夹 %1 出错"
+
+#: backupjob.cpp:321
+#, fuzzy
+msgid "Failed to write a message into the archive folder '%1'."
+msgstr "将检测到的病毒信件移至选中的文件夹"
+
+#: backupjob.cpp:360
+#, fuzzy
+msgid "Downloading a message in folder '%1' failed."
+msgstr "删除文件夹 %1 中的旧信失败。"
+
+#: backupjob.cpp:362
+#, fuzzy
+msgid "Downloading a message in the current folder failed."
+msgstr "叠起当前文件夹内的所有线索"
+
+#: backupjob.cpp:391
+#, fuzzy, c-format
+msgid "Archiving folder %1"
+msgstr "收取文件夹"
+
+#: backupjob.cpp:393 importjob.cpp:210
+#, fuzzy
+msgid "Unable to open folder '%1'."
+msgstr "未知文件夹“%1”"
+
+#: backupjob.cpp:413
+msgid "Unable to create folder structure for folder '%1' within archive file."
+msgstr ""
+
+#: backupjob.cpp:425
+msgid "Unable to backup messages in folder '%1', the index file is corrupted."
+msgstr ""
+
+#: backupjob.cpp:483
+#, fuzzy
+msgid "Unable to open archive for writing."
+msgstr "无法验证：缺少密钥。"
+
+#: backupjob.cpp:489
+#, fuzzy
+msgid "Archiving"
+msgstr "接收(&R)"
+
+#: cachedimapjob.cpp:220 cachedimapjob.cpp:271 cachedimapjob.cpp:886
 msgid "Error while deleting messages on the server: "
 msgstr "删除服务器上的信件出错："
 
@@ -1001,47 +1158,97 @@ msgstr "删除服务器上的信件出错："
 msgid "Error while retrieving message on the server: "
 msgstr "获取服务器上的信件出误："
 
-#: cachedimapjob.cpp:538
+#: cachedimapjob.cpp:541
 msgid "Error while uploading folder"
 msgstr "上传文件夹时发生错误"
 
-#: cachedimapjob.cpp:539
+#: cachedimapjob.cpp:542
 msgid "Could not make the folder <b>%1</b> on the server."
 msgstr "无法在服务器上创建文件夹 <b>%1</b>。"
 
-#: cachedimapjob.cpp:540
+#: cachedimapjob.cpp:543
 msgid ""
 "This could be because you do not have permission to do this, or because the "
 "folder is already present on the server; the error message from the server "
 "communication is here:"
 msgstr "这可能是因为您没有权限这样做，或者因为该文件夹已经存在于服务器上；和服务器通信中的错误消息如下："
 
-#: cachedimapjob.cpp:626
+#: cachedimapjob.cpp:629
 msgid "Error while deleting folder %1 on the server: "
 msgstr "在服务器上删除文件夹 %1 出错："
 
-#: cachedimapjob.cpp:679
+#: cachedimapjob.cpp:682
 msgid "Error while reading folder %1 on the server: "
 msgstr "读取服务器上的文件夹 %1 出错："
 
-#: cachedimapjob.cpp:794
+#: cachedimapjob.cpp:811
+msgid ""
+"Error while trying to subscribe to the renamed folder %1.\n"
+"Renaming itself was successful, but the renamed folder might disappear from the "
+"folder list after the next sync since it is unsubscribed on the server.\n"
+"You can try to manually subscribe to the folder yourself.\n"
+"\n"
+"%2"
+msgstr ""
+
+#: cachedimapjob.cpp:857
 #, c-format
 msgid "Error while trying to rename folder %1"
 msgstr "试图重命名文件夹 %1 出错"
 
-#: callback.cpp:170
+#: callback.cpp:71
+msgid ""
+"<qt>The receiver of this invitation doesn't match any of your identities."
+"<br>Please select the transport which should be used to send your reply.</qt>"
+msgstr ""
+
+#: callback.cpp:74
+msgid ""
+"<qt>The identity matching the receiver of this invitation doesn't have an "
+"associated transport configured."
+"<br>Please select the transport which should be used to send your reply.</qt>"
+msgstr ""
+
+#: callback.cpp:78
+#, fuzzy
+msgid "Select Transport"
+msgstr "设置传送方式为"
+
+#: callback.cpp:97
+#, fuzzy, c-format
+msgid "Declined: %1"
+msgstr " 行：%1 "
+
+#: callback.cpp:99
+#, c-format
+msgid "Tentative: %1"
+msgstr ""
+
+#: callback.cpp:101
+#, fuzzy, c-format
+msgid "Accepted: %1"
+msgstr "附件：%1"
+
+#: callback.cpp:103
+#, fuzzy, c-format
+msgid "Delegated: %1"
+msgstr "已删除"
+
+#: callback.cpp:216
+#, fuzzy
 msgid ""
 "<qt>None of your identities match the receiver of this message,"
-"<br>please choose which of the following addresses is yours, if any:"
+"<br>please choose which of the following addresses is yours, if any, or select "
+"one of your identities to use in the reply:"
 msgstr "<qt>您的身份中没有一个可以匹配此信件，<br>请选择下列哪个地址是您的："
 
-#: callback.cpp:176
+#: callback.cpp:222
 msgid ""
 "<qt>Several of your identities match the receiver of this message,"
 "<br>please choose which of the following addresses is yours:"
 msgstr "<qt>您的身份中有好几个可以匹配此信件，<br>请选择下列哪个地址是您的："
 
-#: callback.cpp:183
+#: callback.cpp:233
 msgid "Select Address"
 msgstr "选择地址"
 
@@ -1066,178 +1273,178 @@ msgstr "文件夹“%1”已成功压缩"
 msgid "Error occurred while compacting \"%1\". Compaction aborted."
 msgstr "压缩“%1”时发生了错误。压缩已终止。"
 
-#: configuredialog.cpp:155
+#: configuredialog.cpp:156
 msgid ""
 "<qt>"
 "<p>This setting has been fixed by your administrator.</p>"
 "<p>If you think this is an error, please contact him.</p></qt>"
 msgstr "<qt><p>此设置已经被您的管理员固定。</p><p>如果您认为不应该这样设置，请联系管理员。</p></qt>"
 
-#: configuredialog.cpp:217
+#: configuredialog.cpp:218
 msgid "&Load Profile..."
 msgstr "装入配置集文件(&L)..."
 
-#: configuredialog.cpp:305 simplestringlisteditor.cpp:85
+#: configuredialog.cpp:308 simplestringlisteditor.cpp:85
 msgid "&Add..."
 msgstr "添加(&A)..."
 
-#: configuredialog.cpp:306 configuredialog.cpp:625 configuredialog.cpp:1096
-#: configuredialog.cpp:3165 simplestringlisteditor.cpp:108
+#: configuredialog.cpp:309 configuredialog.cpp:628 configuredialog.cpp:1102
+#: configuredialog.cpp:3278 simplestringlisteditor.cpp:108
 msgid "&Modify..."
 msgstr "修改(&M)..."
 
-#: configuredialog.cpp:307
+#: configuredialog.cpp:310
 msgid "&Rename"
 msgstr "重命名(&R)"
 
-#: configuredialog.cpp:308 configuredialog.cpp:3115 configuredialog.cpp:3164
+#: configuredialog.cpp:311 configuredialog.cpp:3228 configuredialog.cpp:3277
 msgid "Remo&ve"
 msgstr "删除(&V)"
 
-#: configuredialog.cpp:309
+#: configuredialog.cpp:312
 msgid "Set as &Default"
 msgstr "设置为默认(&D)"
 
-#: configuredialog.cpp:450
+#: configuredialog.cpp:453
 msgid "<qt>Do you really want to remove the identity named <b>%1</b>?</qt>"
 msgstr "<qt>您真的要删除名为 <b>%1</b> 的身份吗？</qt>"
 
-#: configuredialog.cpp:452
+#: configuredialog.cpp:455
 msgid "Remove Identity"
 msgstr "删除身份"
 
-#: configuredialog.cpp:493 configuredialog.cpp:3114
+#: configuredialog.cpp:496 configuredialog.cpp:3227
 msgid "Add..."
 msgstr "添加..."
 
-#: configuredialog.cpp:495 configuredialog.cpp:3116
+#: configuredialog.cpp:498 configuredialog.cpp:3229
 msgid "Modify..."
 msgstr "修改..."
 
-#: configuredialog.cpp:499
+#: configuredialog.cpp:502
 msgid "Set as Default"
 msgstr "设置为默认"
 
-#: configuredialog.cpp:562
+#: configuredialog.cpp:565
 msgid "&Receiving"
 msgstr "接收(&R)"
 
-#: configuredialog.cpp:570
+#: configuredialog.cpp:573
 msgid "&Sending"
 msgstr "发送(&S)"
 
-#: configuredialog.cpp:595
+#: configuredialog.cpp:598
 msgid "Outgoing accounts (add at least one):"
 msgstr "发送账户(至少添加一个)："
 
-#. i18n: file customtemplates_base.ui line 99
-#: configuredialog.cpp:604 configuredialog.cpp:1074 configuredialog.cpp:3290
-#: distributionlistdialog.cpp:115 favoritefolderview.cpp:378
-#: kmcomposewin.cpp:366 rc.cpp:191 recipientspicker.cpp:389
+#. i18n: file customtemplates_base.ui line 89
+#: configuredialog.cpp:607 configuredialog.cpp:1080 configuredialog.cpp:3403
+#: distributionlistdialog.cpp:116 favoritefolderview.cpp:389
+#: kmcomposewin.cpp:397 rc.cpp:191 recipientspicker.cpp:389
 #, no-c-format
 msgid "Name"
 msgstr "名称"
 
-#. i18n: file customtemplates_base.ui line 88
-#: configuredialog.cpp:605 configuredialog.cpp:1075 kmcomposewin.cpp:369
-#: kmfilterdlg.cpp:214 kmmimeparttree.cpp:65 rc.cpp:188
+#. i18n: file customtemplates_base.ui line 78
+#: configuredialog.cpp:608 configuredialog.cpp:1081 kmcomposewin.cpp:400
+#: kmfilterdlg.cpp:218 kmmimeparttree.cpp:65 rc.cpp:188
 #, no-c-format
 msgid "Type"
 msgstr "类型"
 
-#: configuredialog.cpp:618 configuredialog.cpp:1089 configuredialog.cpp:2836
-#: configuredialog.cpp:3087 configuredialog.cpp:3164 configuredialog.cpp:3498
+#: configuredialog.cpp:621 configuredialog.cpp:1095 configuredialog.cpp:2949
+#: configuredialog.cpp:3200 configuredialog.cpp:3277 configuredialog.cpp:3611
 msgid "A&dd..."
 msgstr "添加(&D)..."
 
-#: configuredialog.cpp:633 configuredialog.cpp:1104
+#: configuredialog.cpp:636 configuredialog.cpp:1110
 msgid "R&emove"
 msgstr "删除(&E)"
 
-#: configuredialog.cpp:640
+#: configuredialog.cpp:643
 msgid "Set Default"
 msgstr "设为默认"
 
-#: configuredialog.cpp:650
+#: configuredialog.cpp:653
 msgid "Common Options"
 msgstr "公共选项"
 
-#. i18n: file kmail.kcfg line 382
-#: configuredialog.cpp:658 rc.cpp:788
+#. i18n: file kmail.kcfg line 412
+#: configuredialog.cpp:661 rc.cpp:813
 #, no-c-format
 msgid "Confirm &before send"
 msgstr "发送前确认(&B)"
 
-#: configuredialog.cpp:666
+#: configuredialog.cpp:669
 msgid "Never Automatically"
 msgstr "不自动"
 
-#: configuredialog.cpp:667
+#: configuredialog.cpp:670
 msgid "On Manual Mail Checks"
 msgstr "手动检查邮件时"
 
-#: configuredialog.cpp:668
+#: configuredialog.cpp:671
 msgid "On All Mail Checks"
 msgstr "检查全部邮件时"
 
-#: configuredialog.cpp:676
+#: configuredialog.cpp:679
 msgid "Send Now"
 msgstr "现在发送"
 
-#: configuredialog.cpp:677
+#: configuredialog.cpp:680
 msgid "Send Later"
 msgstr "以后发送"
 
-#: configuredialog.cpp:687
+#: configuredialog.cpp:690
 msgid "Allow 8-bit"
 msgstr "允许使用 8 位字符"
 
-#: configuredialog.cpp:688
+#: configuredialog.cpp:691
 msgid "MIME Compliant (Quoted Printable)"
 msgstr "MIME 兼容 (Quoted Printable)"
 
-#: configuredialog.cpp:701
+#: configuredialog.cpp:704
 msgid "Send &messages in outbox folder:"
 msgstr "发送发件箱中的信件(&M)："
 
-#: configuredialog.cpp:709
+#: configuredialog.cpp:712
 msgid "Defa&ult send method:"
 msgstr "默认发送方式(&U)："
 
-#: configuredialog.cpp:711
+#: configuredialog.cpp:714
 msgid "Message &property:"
 msgstr "信件属性(&P)："
 
-#: configuredialog.cpp:713
+#: configuredialog.cpp:716
 msgid "Defaul&t domain:"
 msgstr "默认域名(&T)："
 
-#: configuredialog.cpp:717
+#: configuredialog.cpp:720
 msgid ""
 "<qt>"
 "<p>The default domain is used to complete email addresses that only consist of "
 "the user's name.</p></qt>"
 msgstr "<qt><p>默认域名用于在只有用户名的情况下补全电子邮件地址。</p></qt>"
 
-#: configuredialog.cpp:741
+#: configuredialog.cpp:744
 msgid ""
 "_: %1: name; %2: number appended to it to make it unique among a list of names\n"
 "%1 %2"
 msgstr "%1 %2"
 
-#: configuredialog.cpp:766 configuredialog.cpp:943 configuredialog.cpp:991
+#: configuredialog.cpp:769 configuredialog.cpp:950 configuredialog.cpp:997
 msgid "smtp (Default)"
 msgstr "smtp (默认)"
 
-#: configuredialog.cpp:768 configuredialog.cpp:945 configuredialog.cpp:993
+#: configuredialog.cpp:771 configuredialog.cpp:952 configuredialog.cpp:999
 msgid "sendmail (Default)"
 msgstr "sendmail (默认)"
 
-#: configuredialog.cpp:799 kmtransport.cpp:248
+#: configuredialog.cpp:801 kmtransport.cpp:248
 msgid "Add Transport"
 msgstr "添加传送方式"
 
-#: configuredialog.cpp:830
+#: configuredialog.cpp:832
 msgid ""
 "_: %1: type of transport. Result used in Configure->Accounts->"
 "Sending listview, \"type\" column, first row, to indicate that this is the "
@@ -1245,396 +1452,387 @@ msgid ""
 "%1 (Default)"
 msgstr "%1 (默认)"
 
-#: configuredialog.cpp:854
+#: configuredialog.cpp:856
 msgid "Modify Transport"
 msgstr "修改传送方式"
 
-#: configuredialog.cpp:890
+#: configuredialog.cpp:892
 #, c-format
 msgid ""
 "_n: This identity has been changed to use the modified transport:\n"
 "These %n identities have been changed to use the modified transport:"
 msgstr "这 %n 个身份已经更改为使用默认传送方式："
 
-#: configuredialog.cpp:921
+#: configuredialog.cpp:927
 #, c-format
 msgid ""
 "_n: This identity has been changed to use the default transport:\n"
 "These %n identities have been changed to use the default transport:"
 msgstr "这 %n 个身份已经更改为使用默认传送方式："
 
-#: configuredialog.cpp:1066
+#: configuredialog.cpp:1072
 msgid "Incoming accounts (add at least one):"
 msgstr "接收账户(至少添加一个)："
 
-#: configuredialog.cpp:1076 kmfolderseldlg.cpp:95 kmfoldertree.cpp:376
-#: searchwindow.cpp:230
+#: configuredialog.cpp:1082 kmfoldertree.cpp:397 searchwindow.cpp:229
+#: simplefoldertree.h:141
 msgid "Folder"
 msgstr "文件夹"
 
-#: configuredialog.cpp:1112
+#: configuredialog.cpp:1118
 msgid "Chec&k mail on startup"
 msgstr "启动时检查邮件(&K)"
 
-#: configuredialog.cpp:1118
+#: configuredialog.cpp:1124
 msgid "New Mail Notification"
 msgstr "新邮件通知"
 
-#: configuredialog.cpp:1123
+#: configuredialog.cpp:1129
 msgid "&Beep"
 msgstr "响铃(&B)"
 
-#: configuredialog.cpp:1131
+#: configuredialog.cpp:1137
 msgid "Deta&iled new mail notification"
 msgstr "详细的新邮件通知(&I)"
 
-#: configuredialog.cpp:1135
+#: configuredialog.cpp:1141
 msgid "Show for each folder the number of newly arrived messages"
 msgstr "显示每个文件夹中新到达的邮件"
 
-#: configuredialog.cpp:1143
+#: configuredialog.cpp:1149
 msgid "Other Actio&ns"
 msgstr "其它动作(&N)"
 
-#: configuredialog.cpp:1221
+#: configuredialog.cpp:1227
 msgid "Unknown account type selected"
 msgstr "选择了未知账户类型"
 
-#: configuredialog.cpp:1230
+#: configuredialog.cpp:1236
 msgid "Unable to create account"
 msgstr "无法创建账户"
 
-#: configuredialog.cpp:1236 kmacctseldlg.cpp:36
+#: configuredialog.cpp:1242 kmacctseldlg.cpp:36
 msgid "Add Account"
 msgstr "添加账户"
 
-#: configuredialog.cpp:1288
+#: configuredialog.cpp:1294
 msgid "Unable to locate account"
 msgstr "无法定位账户"
 
-#: configuredialog.cpp:1315
+#: configuredialog.cpp:1321
 msgid "Modify Account"
 msgstr "修改账户"
 
-#: configuredialog.cpp:1360 configuredialog.cpp:1440
+#: configuredialog.cpp:1366 configuredialog.cpp:1446
 msgid "<qt>Unable to locate account <b>%1</b>.</qt>"
 msgstr "<qt>无法定位账户 <b>%1</b>。</qt>"
 
-#: configuredialog.cpp:1491
+#: configuredialog.cpp:1497
 msgid "Color&s"
 msgstr "颜色(&S)"
 
-#: configuredialog.cpp:1497
+#: configuredialog.cpp:1503
 msgid "La&yout"
 msgstr "布局(&Y)"
 
-#: configuredialog.cpp:1503
+#: configuredialog.cpp:1509
 msgid "M&essage List"
 msgstr "信件列表(&E)"
 
-#: configuredialog.cpp:1509
+#: configuredialog.cpp:1515
 msgid "Message W&indow"
 msgstr "信件窗口(&I)"
 
-#: configuredialog.cpp:1515
+#: configuredialog.cpp:1521
 msgid "System &Tray"
 msgstr "系统托盘(&T)"
 
-#: configuredialog.cpp:1531
+#: configuredialog.cpp:1537
 msgid "Message Body"
 msgstr "信件内容"
 
-#: configuredialog.cpp:1532
+#: configuredialog.cpp:1538
 msgid "Message List"
 msgstr "信件列表"
 
-#: configuredialog.cpp:1533
+#: configuredialog.cpp:1539
 msgid "Message List - New Messages"
 msgstr "信件列表 - 新信件"
 
-#: configuredialog.cpp:1534
+#: configuredialog.cpp:1540
 msgid "Message List - Unread Messages"
 msgstr "信件列表 - 未读信件"
 
-#: configuredialog.cpp:1535
+#: configuredialog.cpp:1541
 msgid "Message List - Important Messages"
 msgstr "信件列表 - 重要信件"
 
-#: configuredialog.cpp:1536
+#: configuredialog.cpp:1542
 msgid "Message List - Todo Messages"
 msgstr "信件列表 - 待办信件"
 
-#: configuredialog.cpp:1537
+#: configuredialog.cpp:1543
 msgid "Message List - Date Field"
 msgstr "信件列表 - 日期字段"
 
-#: configuredialog.cpp:1538 configuredialog.cpp:1859
+#: configuredialog.cpp:1544 configuredialog.cpp:1868
 msgid "Folder List"
 msgstr "文件夹列表"
 
-#: configuredialog.cpp:1539 configuredialog.cpp:1702
+#: configuredialog.cpp:1545 configuredialog.cpp:1708
 msgid "Quoted Text - First Level"
 msgstr "引文 - 第一级"
 
-#: configuredialog.cpp:1540 configuredialog.cpp:1703
+#: configuredialog.cpp:1546 configuredialog.cpp:1709
 msgid "Quoted Text - Second Level"
 msgstr "引文 - 第二级"
 
-#: configuredialog.cpp:1541 configuredialog.cpp:1704
+#: configuredialog.cpp:1547 configuredialog.cpp:1710
 msgid "Quoted Text - Third Level"
 msgstr "引文 - 第三级"
 
-#: configuredialog.cpp:1542
+#: configuredialog.cpp:1548
 msgid "Fixed Width Font"
 msgstr "等宽字体"
 
-#: configuredialog.cpp:1543 kmcomposewin.cpp:356
+#: configuredialog.cpp:1549 kmcomposewin.cpp:386
 msgid "Composer"
 msgstr "撰写器"
 
-#: configuredialog.cpp:1544
+#: configuredialog.cpp:1550
 msgid "Printing Output"
 msgstr "打印输出"
 
-#: configuredialog.cpp:1559
+#: configuredialog.cpp:1565
 msgid "&Use custom fonts"
 msgstr "使用自定义字体(&U)"
 
-#: configuredialog.cpp:1575
+#: configuredialog.cpp:1581
 msgid "Apply &to:"
 msgstr "应用到(&T)："
 
-#: configuredialog.cpp:1699
+#: configuredialog.cpp:1705
 msgid "Composer Background"
 msgstr "撰写器背景"
 
-#: configuredialog.cpp:1700
+#: configuredialog.cpp:1706
 msgid "Alternative Background Color"
 msgstr "备选的背景颜色"
 
-#: configuredialog.cpp:1701
+#: configuredialog.cpp:1707
 msgid "Normal Text"
 msgstr "普通文字"
 
-#: configuredialog.cpp:1705
+#: configuredialog.cpp:1711
 msgid "Link"
 msgstr "链接"
 
-#: configuredialog.cpp:1706
+#: configuredialog.cpp:1712
 msgid "Followed Link"
 msgstr "已访问链接"
 
-#: configuredialog.cpp:1707
+#: configuredialog.cpp:1713
 msgid "Misspelled Words"
 msgstr "拼错的单词"
 
 #. i18n: file templatesconfiguration_base.ui line 71
-#: configuredialog.cpp:1708 rc.cpp:444
+#: configuredialog.cpp:1714 rc.cpp:450
 #, no-c-format
 msgid "New Message"
 msgstr "新信件"
 
-#: configuredialog.cpp:1709
+#: configuredialog.cpp:1715
 msgid "Unread Message"
 msgstr "未读信件"
 
-#: configuredialog.cpp:1710
+#: configuredialog.cpp:1716
 msgid "Important Message"
 msgstr "重要信件"
 
-#: configuredialog.cpp:1711
+#: configuredialog.cpp:1717
 msgid "Todo Message"
 msgstr "待办信件"
 
-#: configuredialog.cpp:1712
+#: configuredialog.cpp:1718
 msgid "OpenPGP Message - Encrypted"
 msgstr "OpenPGP 信件 - 加密的"
 
-#: configuredialog.cpp:1713
+#: configuredialog.cpp:1719
 msgid "OpenPGP Message - Valid Signature with Trusted Key"
 msgstr "OpenPGP 信件 - 带有信任密钥的有效签名"
 
-#: configuredialog.cpp:1714
+#: configuredialog.cpp:1720
 msgid "OpenPGP Message - Valid Signature with Untrusted Key"
 msgstr "OpenPGP 信件 - 带有未信任密钥的有效签名"
 
-#: configuredialog.cpp:1715
+#: configuredialog.cpp:1721
 msgid "OpenPGP Message - Unchecked Signature"
 msgstr "OpenPGP 信件 - 未检查的签名"
 
-#: configuredialog.cpp:1716
+#: configuredialog.cpp:1722
 msgid "OpenPGP Message - Bad Signature"
 msgstr "OpenPGP 信件 - 错误的签名"
 
-#: configuredialog.cpp:1717
+#: configuredialog.cpp:1723
 msgid "Border Around Warning Prepending HTML Messages"
 msgstr "对 HTML 信件前面的警告加边框"
 
-#: configuredialog.cpp:1718
+#: configuredialog.cpp:1724
 msgid "Folder Name and Size When Close to Quota"
 msgstr "接近配额限度时的文件夹名和大小"
 
-#: configuredialog.cpp:1719
+#: configuredialog.cpp:1725
 msgid "HTML Status Bar Background - No HTML Message"
 msgstr "HTML 状态栏背景 - 无 HTML 信件"
 
-#: configuredialog.cpp:1720
+#: configuredialog.cpp:1726
 msgid "HTML Status Bar Foreground - No HTML Message"
 msgstr "HTML 状态栏前景 - 无 HTML 信件"
 
-#: configuredialog.cpp:1721
+#: configuredialog.cpp:1727
 msgid "HTML Status Bar Background - HTML Message"
 msgstr "HTML 状态栏背景 - HTML 信件"
 
-#: configuredialog.cpp:1722
+#: configuredialog.cpp:1728
 msgid "HTML Status Bar Foreground - HTML Message"
 msgstr "HTML 状态栏前景 - HTML 信件"
 
-#: configuredialog.cpp:1734
+#: configuredialog.cpp:1740
 msgid "&Use custom colors"
 msgstr "使用自定义颜色(&U)"
 
-#: configuredialog.cpp:1749
+#: configuredialog.cpp:1755
 msgid "Recycle colors on deep &quoting"
 msgstr "深层次引用时循环使用颜色(&Q)"
 
-#: configuredialog.cpp:1757
+#: configuredialog.cpp:1763
 msgid "Close to quota threshold"
 msgstr "接近配额限度"
 
-#: configuredialog.cpp:1763
+#: configuredialog.cpp:1770
 #, c-format
 msgid "%"
 msgstr "%"
 
-#: configuredialog.cpp:1855
+#: configuredialog.cpp:1864
 msgid "Lon&g folder list"
 msgstr "长文件夹列表(&G)"
 
-#: configuredialog.cpp:1856
+#: configuredialog.cpp:1865
 msgid "Shor&t folder list"
 msgstr "短文件夹列表(&T)"
 
-#: configuredialog.cpp:1865
+#: configuredialog.cpp:1874
 msgid "Abo&ve the message pane"
 msgstr "位于信件面板上(&V)"
 
-#: configuredialog.cpp:1866
+#: configuredialog.cpp:1875
 msgid "&Below the message pane"
 msgstr "位于信件面板下(&B)"
 
-#: configuredialog.cpp:1869
+#: configuredialog.cpp:1878
 msgid "Message Structure Viewer Placement"
 msgstr "信件结构查看器放置"
 
-#: configuredialog.cpp:1874
+#: configuredialog.cpp:1883
 msgid "Show &never"
 msgstr "从不显示(&N)"
 
-#: configuredialog.cpp:1875
+#: configuredialog.cpp:1884
 msgid "Show only for non-plaintext &messages"
 msgstr "只对非纯文本信件显示(&M)"
 
-#: configuredialog.cpp:1876
+#: configuredialog.cpp:1885
 msgid "Show alway&s"
 msgstr "总是显示(&S)"
 
-#: configuredialog.cpp:1879
+#: configuredialog.cpp:1888
 msgid "Message Structure Viewer"
 msgstr "信件结构查看器"
 
-#: configuredialog.cpp:1885
+#: configuredialog.cpp:1894
 msgid "&Do not show a message preview pane"
 msgstr "不显示信件预览面板(&D)"
 
-#: configuredialog.cpp:1886
+#: configuredialog.cpp:1895
 msgid "Show the message preview pane belo&w the message list"
 msgstr "在信件列表下显示信件预览面板(&W)"
 
-#: configuredialog.cpp:1887
+#: configuredialog.cpp:1896
 msgid "Show the message preview pane ne&xt to the message list"
 msgstr "在信件列表旁显示信件预览面板(&X)"
 
-#: configuredialog.cpp:1890
+#: configuredialog.cpp:1899
 msgid "Message Preview Pane"
 msgstr "信件预览面板"
 
-#: configuredialog.cpp:1908
+#: configuredialog.cpp:1917
 msgid "Show favorite folder view"
 msgstr "显示收藏夹目录视图"
 
-#: configuredialog.cpp:1912
-#, fuzzy
-msgid "Show folder quick search field"
-msgstr "显示快速搜索编辑框"
-
-#: configuredialog.cpp:1983
+#: configuredialog.cpp:1986
 msgid "Sta&ndard format (%1)"
 msgstr "标准格式(&N) (%1)"
 
-#: configuredialog.cpp:1984
+#: configuredialog.cpp:1987
 msgid "Locali&zed format (%1)"
 msgstr "本地化格式(&Z) (%1)"
 
-#: configuredialog.cpp:1985
+#: configuredialog.cpp:1988
 msgid "Fancy for&mat (%1)"
 msgstr "亮丽格式(&M) (%1)"
 
-#: configuredialog.cpp:1986
+#: configuredialog.cpp:1989
 msgid "C&ustom format (Shift+F1 for help):"
 msgstr "自定义格式(&U)(Shift+F1 看帮助)："
 
-#: configuredialog.cpp:2003
+#: configuredialog.cpp:2006
 msgid "General Options"
 msgstr "常规选项"
 
-#: configuredialog.cpp:2006
-msgid "Show Quick Search"
-msgstr "显示快速搜索"
-
-#: configuredialog.cpp:2008
+#: configuredialog.cpp:2009
 msgid "Display messa&ge sizes"
 msgstr "显示信件大小(&G)"
 
-#: configuredialog.cpp:2010
+#: configuredialog.cpp:2011
 msgid "Show crypto &icons"
 msgstr "显示加密图标(&I)"
 
-#: configuredialog.cpp:2012
+#: configuredialog.cpp:2013
 msgid "Show attachment icon"
 msgstr "显示附件图标"
 
-#: configuredialog.cpp:2015
+#: configuredialog.cpp:2016
 msgid "&Threaded message list"
 msgstr "信件列表按线索显示(&T)"
 
-#: configuredialog.cpp:2033
+#: configuredialog.cpp:2032
 msgid "Threaded Message List Options"
 msgstr "线索式信件列表选项"
 
-#: configuredialog.cpp:2037
+#: configuredialog.cpp:2036
 msgid "Always &keep threads open"
 msgstr "总是展开线索(&K)"
 
-#: configuredialog.cpp:2040
+#: configuredialog.cpp:2039
 msgid "Threads default to o&pen"
 msgstr "线索默认为打开(&P)"
 
-#: configuredialog.cpp:2043
+#: configuredialog.cpp:2042
 msgid "Threads default to closed"
 msgstr "线索默认为关闭"
 
-#: configuredialog.cpp:2046
+#: configuredialog.cpp:2045
 msgid ""
 "Open threads that contain ne&w, unread or important messages and open watched "
 "threads."
 msgstr "打开包含新的、或未读、或重要信件的以及关注的线索(&W)"
 
-#: configuredialog.cpp:2056
+#: configuredialog.cpp:2055
 msgid "Date Display"
 msgstr "日期显示"
 
-#: configuredialog.cpp:2073
+#: configuredialog.cpp:2072
 msgid ""
 "<qt>"
 "<p><strong>These expressions may be used for the date:</strong></p>"
@@ -1694,113 +1892,162 @@ msgstr ""
 "<li>Z - 数字形式的时区(-0500)</li></ul>"
 "<p><strong>所有输入的其它字符都将被忽略。</strong></p></qt>"
 
-#: configuredialog.cpp:2187
+#: configuredialog.cpp:2185
 msgid ""
 "Changing the global threading setting will override all folder specific values."
 msgstr "改变全局的线索设置将会覆盖各个文件夹特定的设置。"
 
-#: configuredialog.cpp:2224
+#: configuredialog.cpp:2221
+msgid "Close message window after replying or forwarding"
+msgstr ""
+
+#: configuredialog.cpp:2225
 msgid "Show HTML stat&us bar"
 msgstr "显示 HTML 状态栏(&U)"
 
-#: configuredialog.cpp:2228
+#: configuredialog.cpp:2229
 msgid "Show s&pam status in fancy headers"
 msgstr "在亮丽信头中显示垃圾信状态(&P)"
 
-#. i18n: file kmail.kcfg line 541
-#: configuredialog.cpp:2232 rc.cpp:856
+#. i18n: file kmail.kcfg line 583
+#: configuredialog.cpp:2233 rc.cpp:890
 #, no-c-format
 msgid "Replace smileys by emoticons"
 msgstr "将表情以图形方式显示"
 
-#: configuredialog.cpp:2236
+#: configuredialog.cpp:2237
 msgid "Use smaller font for quoted text"
 msgstr "引用的文本使用较小的字体"
 
-#. i18n: file kmail.kcfg line 546
-#: configuredialog.cpp:2240 rc.cpp:862
+#. i18n: file kmail.kcfg line 588
+#: configuredialog.cpp:2241 rc.cpp:896
 #, no-c-format
 msgid "Show expand/collapse quote marks"
 msgstr "显示展开/折叠的引用标记"
 
-#: configuredialog.cpp:2315
+#: configuredialog.cpp:2245
+msgid "Show current sender time"
+msgstr ""
+
+#: configuredialog.cpp:2262
+msgid ""
+"Close the standalone message window after replying or forwarding the message"
+msgstr ""
+
+#: configuredialog.cpp:2328
 msgid "Fallback ch&aracter encoding:"
 msgstr "默认字符编码(&A)："
 
-#: configuredialog.cpp:2325 configuredialog.cpp:2382 kmreaderwin.cpp:650
+#: configuredialog.cpp:2338 configuredialog.cpp:2400 kmreaderwin.cpp:584
 msgid "Auto"
 msgstr "自动"
 
-#: configuredialog.cpp:2336
+#: configuredialog.cpp:2349
 msgid "&Override character encoding:"
 msgstr "覆盖字符编码(&O)："
 
-#. i18n: file kmail.kcfg line 103
-#: configuredialog.cpp:2462 rc.cpp:643
+#. i18n: file kmail.kcfg line 105
+#: configuredialog.cpp:2486 rc.cpp:649
 #, no-c-format
 msgid "Enable system tray icon"
 msgstr "启用系统托盘图标"
 
-#: configuredialog.cpp:2468
+#: configuredialog.cpp:2492
 msgid "System Tray Mode"
 msgstr "系统托盘模式"
 
-#: configuredialog.cpp:2476
+#: configuredialog.cpp:2500
 msgid "Always show KMail in system tray"
 msgstr "总是在系统托盘中显示 KMail"
 
-#: configuredialog.cpp:2479
+#: configuredialog.cpp:2503
 msgid "Only show KMail in system tray if there are unread messages"
 msgstr "仅当有未读信件时才在系统托盘显示 KMail"
 
-#: configuredialog.cpp:2539 identitydialog.cpp:384
+#: configuredialog.cpp:2563 identitydialog.cpp:408
 msgid "&Templates"
 msgstr "模板(&T)"
 
-#: configuredialog.cpp:2545
+#: configuredialog.cpp:2569
 msgid "&Custom Templates"
 msgstr "自定义模板(&C)"
 
-#: configuredialog.cpp:2551
+#: configuredialog.cpp:2575
 msgid "&Subject"
 msgstr "主题(&S)"
 
-#: configuredialog.cpp:2558
+#: configuredialog.cpp:2582
 msgid "Cha&rset"
 msgstr "字符集(&R)"
 
-#: configuredialog.cpp:2564
+#: configuredialog.cpp:2588
 msgid "H&eaders"
 msgstr "信头(&E)"
 
-#: configuredialog.cpp:2570
+#: configuredialog.cpp:2594
 msgid ""
 "_: Config->Composer->Attachments\n"
 "A&ttachments"
 msgstr "附件(&T)"
 
-#: configuredialog.cpp:2654
+#: configuredialog.cpp:2633
+msgid ""
+"When replying, add quote signs in front of all lines of the quoted text,\n"
+"even when the line was created by adding an additional linebreak while\n"
+"word-wrapping the text."
+msgstr ""
+
+#: configuredialog.cpp:2643
+msgid ""
+"When replying, only quote the selected text instead of the complete message "
+"when there is text selected in the message window."
+msgstr ""
+
+#: configuredialog.cpp:2704
+msgid "Warn if too many recipients are specified"
+msgstr ""
+
+#: configuredialog.cpp:2716
+msgid "Warn if more than this many recipients are specified"
+msgstr ""
+
+#: configuredialog.cpp:2732
 msgid "No autosave"
 msgstr "不自动保存"
 
-#: configuredialog.cpp:2661
+#: configuredialog.cpp:2741
+#, fuzzy
+msgid "Default Forwarding Type:"
+msgstr "默认域名(&T)："
+
+#: configuredialog.cpp:2744
+#, fuzzy
+msgid "Inline"
+msgstr "在信件内转发(&I)..."
+
+#: configuredialog.cpp:2745
+#, fuzzy
+msgid "As Attachment"
+msgstr "有附件"
+
+#: configuredialog.cpp:2753
 msgid "Configure Completion Order"
 msgstr "配置补全顺序"
 
-#: configuredialog.cpp:2669 kmlineeditspell.cpp:136
+#: configuredialog.cpp:2761 kmlineeditspell.cpp:159
 msgid "Edit Recent Addresses..."
 msgstr "编辑最近的地址..."
 
-#: configuredialog.cpp:2676 kmedit.cpp:540
+#: configuredialog.cpp:2768 kmedit.cpp:633
 msgid "External Editor"
 msgstr "外部编辑器"
 
-#: configuredialog.cpp:2707
+#: configuredialog.cpp:2799
 #, c-format
 msgid "<b>%f</b> will be replaced with the filename to edit."
 msgstr "<b>%f</b> 将被替换为要编辑的文件名。"
 
-#: configuredialog.cpp:2817
+#: configuredialog.cpp:2930
 msgid ""
 "<qt>The following placeholders are supported in the reply phrases:"
 "<br><b>%D</b>: date, <b>%S</b>: subject,"
@@ -1817,54 +2064,54 @@ msgstr ""
 "<br><b>%C</b>：抄送人姓名，<b>%c</b>：抄送人姓名和地址，"
 "<br><b>%%</b>：百分号，<b>%_</b>：空格，<b>%L</b>：换行</qt>"
 
-#: configuredialog.cpp:2830
+#: configuredialog.cpp:2943
 msgid "Lang&uage:"
 msgstr "语言(&U)："
 
-#: configuredialog.cpp:2839 configuredialog.cpp:3087 configuredialog.cpp:3303
-#: configuredialog.cpp:3498
+#: configuredialog.cpp:2952 configuredialog.cpp:3200 configuredialog.cpp:3416
+#: configuredialog.cpp:3611
 msgid "Re&move"
 msgstr "删除(&M)"
 
-#: configuredialog.cpp:2853
+#: configuredialog.cpp:2966
 msgid "Reply to se&nder:"
 msgstr "回复给发件人(&N)："
 
-#: configuredialog.cpp:2861
+#: configuredialog.cpp:2974
 msgid "Repl&y to all:"
 msgstr "回复给所有人(&Y)："
 
-#: configuredialog.cpp:2869
+#: configuredialog.cpp:2982
 msgid "&Forward:"
 msgstr "转发(&F)："
 
 #. i18n: file templatesconfiguration_base.ui line 285
-#: configuredialog.cpp:2877 rc.cpp:459
+#: configuredialog.cpp:2990 rc.cpp:465
 #, no-c-format
 msgid "&Quote indicator:"
 msgstr "引文符号(&Q)："
 
-#: configuredialog.cpp:2922 kmmessage.cpp:3960
+#: configuredialog.cpp:3035 kmmessage.cpp:4048
 msgid "On %D, you wrote:"
 msgstr "在 %D，您写道："
 
-#: configuredialog.cpp:2923 kmmessage.cpp:3962
+#: configuredialog.cpp:3036 kmmessage.cpp:4050
 msgid "On %D, %F wrote:"
 msgstr "在 %D，%F 写道："
 
-#: configuredialog.cpp:2924 kmmessage.cpp:3964
+#: configuredialog.cpp:3037 kmmessage.cpp:4052
 msgid "Forwarded Message"
 msgstr "转发的信件"
 
-#: configuredialog.cpp:2925
+#: configuredialog.cpp:3038
 msgid ">%_"
 msgstr ">%_"
 
-#: configuredialog.cpp:3074
+#: configuredialog.cpp:3187
 msgid "Repl&y Subject Prefixes"
 msgstr "回信时主题的前缀(&Y)"
 
-#: configuredialog.cpp:3078 configuredialog.cpp:3107
+#: configuredialog.cpp:3191 configuredialog.cpp:3220
 msgid ""
 "Recognize any sequence of the following prefixes\n"
 "(entries are case-insensitive regular expressions):"
@@ -1872,107 +2119,107 @@ msgstr ""
 "识别下列前缀的任意组合\n"
 "(各项都是不区分大小写的正则表达式)："
 
-#: configuredialog.cpp:3088 configuredialog.cpp:3499
+#: configuredialog.cpp:3201 configuredialog.cpp:3612
 msgid "Mod&ify..."
 msgstr "修改(&I)..."
 
-#: configuredialog.cpp:3089
+#: configuredialog.cpp:3202
 msgid "Enter new reply prefix:"
 msgstr "输入新的回复前缀："
 
-#: configuredialog.cpp:3103
+#: configuredialog.cpp:3216
 msgid "For&ward Subject Prefixes"
 msgstr "转发时主题的前缀(&W)"
 
-#: configuredialog.cpp:3117
+#: configuredialog.cpp:3230
 msgid "Enter new forward prefix:"
 msgstr "输入新的转发前缀："
 
-#: configuredialog.cpp:3156
+#: configuredialog.cpp:3269
 msgid ""
 "This list is checked for every outgoing message from the top to the bottom for "
 "a charset that contains all required characters."
 msgstr "这个列表将会由上而下的检查哪个字符集包括发送信件需要的所有字符。"
 
-#: configuredialog.cpp:3165
+#: configuredialog.cpp:3278
 msgid "Enter charset:"
 msgstr "输入字符集："
 
-#: configuredialog.cpp:3171
+#: configuredialog.cpp:3284
 msgid "&Keep original charset when replying or forwarding (if possible)"
 msgstr "在回复或转发时尽可能保持原有字符集(&K)"
 
-#: configuredialog.cpp:3205
+#: configuredialog.cpp:3318
 msgid "This charset is not supported."
 msgstr "不支持这个字符集。"
 
-#: configuredialog.cpp:3256
+#: configuredialog.cpp:3369
 msgid "&Use custom message-id suffix"
 msgstr "使用自定义的 message-id 后缀(&U)"
 
-#: configuredialog.cpp:3269
+#: configuredialog.cpp:3382
 msgid "Custom message-&id suffix:"
 msgstr "自定义 message-id 后缀(&I)："
 
-#: configuredialog.cpp:3283
+#: configuredialog.cpp:3396
 msgid "Define custom mime header fields:"
 msgstr "定义 MIME 信头标记："
 
-#: configuredialog.cpp:3291
+#: configuredialog.cpp:3404
 msgid "Value"
 msgstr "值"
 
-#: configuredialog.cpp:3299
+#: configuredialog.cpp:3412
 msgid "Ne&w"
 msgstr "新建(&W)"
 
 #. i18n: file folderpropertiesdialog.ui line 52
-#: configuredialog.cpp:3312 kmfolderdia.cpp:268 kmmsgpartdlg.cpp:110
-#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:76 rc.cpp:224
-#: rc.cpp:399
+#: configuredialog.cpp:3425 kmfolderdia.cpp:269 kmmsgpartdlg.cpp:110
+#: kmtransport.cpp:329 kmtransport.cpp:383 newfolderdialog.cpp:80 rc.cpp:230
+#: rc.cpp:405
 #, no-c-format
 msgid "&Name:"
 msgstr "名称(&N)："
 
-#: configuredialog.cpp:3321
+#: configuredialog.cpp:3434
 msgid "&Value:"
 msgstr "值(&V)："
 
-#. i18n: file kmail.kcfg line 359
-#: configuredialog.cpp:3468 rc.cpp:782
+#. i18n: file kmail.kcfg line 389
+#: configuredialog.cpp:3581 rc.cpp:807
 #, no-c-format
 msgid "Outlook-compatible attachment naming"
 msgstr "Outlook 兼容的附件命名"
 
-#: configuredialog.cpp:3471
+#: configuredialog.cpp:3584
 msgid ""
 "Turn this option on to make Outlook(tm) understand attachment names containing "
 "non-English characters"
 msgstr "启用此选项，才能让 Outlook(tm) 理解包含非英语字符的附件名"
 
-#: configuredialog.cpp:3482
+#: configuredialog.cpp:3595
 msgid "E&nable detection of missing attachments"
 msgstr "启用对丢失附件的检测(&N)"
 
-#: configuredialog.cpp:3489
+#: configuredialog.cpp:3602
 msgid "Recognize any of the following key words as intention to attach a file:"
 msgstr "识别下列关键字为附件："
 
-#: configuredialog.cpp:3500
+#: configuredialog.cpp:3613
 msgid "Enter new key word:"
 msgstr "输入新关键字："
 
-#: configuredialog.cpp:3521 configuredialog.cpp:3522 kmcomposewin.cpp:2232
-#: kmcomposewin.cpp:2233
+#: configuredialog.cpp:3634 configuredialog.cpp:3635 kmcomposewin.cpp:2297
+#: kmcomposewin.cpp:2298
 msgid "attachment"
 msgstr "附件"
 
-#: configuredialog.cpp:3523 configuredialog.cpp:3524 kmcomposewin.cpp:2234
-#: kmcomposewin.cpp:2235
+#: configuredialog.cpp:3636 configuredialog.cpp:3637 kmcomposewin.cpp:2299
+#: kmcomposewin.cpp:2300
 msgid "attached"
 msgstr "附件"
 
-#: configuredialog.cpp:3542
+#: configuredialog.cpp:3655
 msgid ""
 "You have chosen to encode attachment names containing non-English characters in "
 "a way that is understood by Outlook(tm) and other mail clients that do not "
@@ -1985,27 +2232,27 @@ msgstr ""
 "您选择了将包含非英语字符的附件名按照 Outlook(tm) 和其它不遵从标准编码附件名的邮件客户程序可理解的方式进行编码。\n"
 "请注意，KMail 可以创建不遵从标准的信件，但这将造成遵从标准的邮件客户程序无法读出这些信件；所以，除非您没有其它选择，您不应该启用此选项。"
 
-#: configuredialog.cpp:3569
+#: configuredialog.cpp:3682
 msgid "&Reading"
 msgstr "阅读(&R)"
 
-#: configuredialog.cpp:3575
+#: configuredialog.cpp:3688
 msgid "Composing"
 msgstr "编写"
 
-#: configuredialog.cpp:3581
+#: configuredialog.cpp:3694
 msgid "Warnings"
 msgstr "警告"
 
-#: configuredialog.cpp:3587
+#: configuredialog.cpp:3700
 msgid "S/MIME &Validation"
 msgstr "S/MIME 校验(&V)"
 
-#: configuredialog.cpp:3593
+#: configuredialog.cpp:3706
 msgid "Crypto Backe&nds"
 msgstr "加密算法后端(&N)"
 
-#: configuredialog.cpp:3624
+#: configuredialog.cpp:3737
 msgid ""
 "<qt>"
 "<p>Messages sometimes come in both formats. This option controls whether you "
@@ -2030,7 +2277,7 @@ msgstr ""
 "<p>因此建议<em>不要</em>优先使用HTML。</p>"
 "<p><b>注意：</p>您可以在KMail主窗口中的<i>文件夹</i>菜单中为每个文件夹设置这个选项。</p></qt>"
 
-#: configuredialog.cpp:3641
+#: configuredialog.cpp:3754
 msgid ""
 "<qt>"
 "<p>Some mail advertisements are in HTML and contain references to, for example, "
@@ -2050,7 +2297,7 @@ msgstr ""
 "<p>为了防止这种对KMail显示HTML功能的滥用，这个选项默认是<em>禁用</em>的。</p>"
 "<p>但是，如果您希望查看HTML信件中不是作为附件的图片链接，您可以打开该选项，但是您应该清楚可能存在的问题。</p></qt>"
 
-#: configuredialog.cpp:3654
+#: configuredialog.cpp:3767
 msgid ""
 "<qt>"
 "<h3>Message Disposition Notification Policy</h3>"
@@ -2090,19 +2337,19 @@ msgstr ""
 "<li><em>总是发送</em>：总是发送所请求的处理回执。这意味着来信的作者将知道他的信件已被处理，而且知道它是如何被处理的(已显示、删除等等)。强烈建议您"
 "不要使用这个选项，但因为它对某些场合很有意义，比如客户关系协调，所以软件还是提供这个功能。</li></ul></qt>"
 
-#: configuredialog.cpp:3687
+#: configuredialog.cpp:3800
 msgid "HTML Messages"
 msgstr "HTML 信件"
 
-#: configuredialog.cpp:3690
+#: configuredialog.cpp:3803
 msgid "Prefer H&TML to plain text"
 msgstr "优先使用 HTML 格式(&T)"
 
-#: configuredialog.cpp:3694
+#: configuredialog.cpp:3807
 msgid "Allow messages to load e&xternal references from the Internet"
 msgstr "允许信件从网络上加载外部引用(&X)"
 
-#: configuredialog.cpp:3699
+#: configuredialog.cpp:3812
 msgid ""
 "<b>WARNING:</b> Allowing HTML in email may increase the risk that your system "
 "will be compromised by present and anticipated security exploits. <a "
@@ -2112,190 +2359,204 @@ msgstr ""
 "<b>警告：</b>在邮件中使用 HTML 会增大您的系统被已有的和将有的安全漏洞危及的风险。<a href=\"whatsthis:%1\">"
 "关于 HTML 信件的更多信息...</a> <a href=\"whatsthis:%2\">关于外部引用的更多信息...</a>"
 
-#: configuredialog.cpp:3711
+#: configuredialog.cpp:3824
 msgid "Encrypted Messages"
 msgstr "加密的信件"
 
-#: configuredialog.cpp:3713
+#: configuredialog.cpp:3826
 msgid "Attempt decryption of encrypted messages when viewing"
 msgstr "查看加密信件时尝试解密"
 
-#: configuredialog.cpp:3718
+#: configuredialog.cpp:3831
 msgid "Message Disposition Notifications"
 msgstr "信件处理回执"
 
-#: configuredialog.cpp:3730
+#: configuredialog.cpp:3843
 msgid "Send policy:"
 msgstr "发送策略："
 
-#: configuredialog.cpp:3732 kmmessage.cpp:1361 kmmessage.cpp:1368
+#: configuredialog.cpp:3845 kmmessage.cpp:1381 kmmessage.cpp:1388
 msgid "&Ignore"
 msgstr "忽略(&I)"
 
-#: configuredialog.cpp:3735
+#: configuredialog.cpp:3848
 msgid "As&k"
 msgstr "询问(&K)"
 
-#: configuredialog.cpp:3738
+#: configuredialog.cpp:3851
 msgid "&Deny"
 msgstr "拒绝(&D)"
 
-#: configuredialog.cpp:3741
+#: configuredialog.cpp:3854
 msgid "Al&ways send"
 msgstr "总是发送(&W)"
 
-#: configuredialog.cpp:3759
+#: configuredialog.cpp:3872
 msgid "Quote original message:"
 msgstr "引用信件原文："
 
-#: configuredialog.cpp:3761
+#: configuredialog.cpp:3874
 msgid "Nothin&g"
 msgstr "无(&G)"
 
-#: configuredialog.cpp:3764
+#: configuredialog.cpp:3877
 msgid "&Full message"
 msgstr "完整信件(&F)"
 
-#: configuredialog.cpp:3767
+#: configuredialog.cpp:3880
 msgid "Onl&y headers"
 msgstr "只用信头(&Y)"
 
-#: configuredialog.cpp:3773
+#: configuredialog.cpp:3886
 msgid "Do not send MDNs in response to encrypted messages"
 msgstr "对加密信件的响应不发送 MDNs"
 
-#: configuredialog.cpp:3777
+#: configuredialog.cpp:3890
 msgid ""
 "<b>WARNING:</b> Unconditionally returning confirmations undermines your "
 "privacy. <a href=\"whatsthis:%1\">More...</a>"
 msgstr "<b>警告：</b>无条件回复确认信件将可能会影响您的隐私。<a href=\"whatsthis:%1\">更多信息...</a>"
 
-#: configuredialog.cpp:3786
+#: configuredialog.cpp:3899
 msgid "Certificate && Key Bundle Attachments"
 msgstr "证书和密钥捆绑的附件"
 
-#: configuredialog.cpp:3789
+#: configuredialog.cpp:3902
 msgid "Automatically import keys and certificates"
 msgstr "自动导入密钥和证书"
 
-#: configuredialog.cpp:3850
+#: configuredialog.cpp:3963
 msgid ""
 "Changing the global HTML setting will override all folder specific values."
 msgstr "改变全局的 HTML 设置，将会替代所有文件夹特定的设置。"
 
-#: configuredialog.cpp:4138
+#: configuredialog.cpp:4251
 msgid "This option requires dirmngr >= 0.9.0"
 msgstr "此选项需要 dirmngr >= 0.9.0"
 
 #. i18n: file smimeconfiguration.ui line 216
-#: configuredialog.cpp:4247 rc.cpp:347
+#: configuredialog.cpp:4360 rc.cpp:353
 #, no-c-format
 msgid "no proxy"
 msgstr "无代理"
 
-#: configuredialog.cpp:4248
+#: configuredialog.cpp:4361
 msgid "(Current system setting: %1)"
 msgstr "(当前系统设置：%1)"
 
-#: configuredialog.cpp:4425
+#: configuredialog.cpp:4538
 msgid "&Folders"
 msgstr "文件夹(&F)"
 
-#: configuredialog.cpp:4428
+#: configuredialog.cpp:4541
 msgid "&Groupware"
 msgstr "群件(&G)"
 
-#: configuredialog.cpp:4449
+#: configuredialog.cpp:4562
 msgid ""
 "_: Corresponds to Folder->Move All Messages to Trash\n"
 "Ask for co&nfirmation before moving all messages to trash"
 msgstr "将全部邮件移动到废件夹之前请求确认(&N)"
 
-#: configuredialog.cpp:4456
+#: configuredialog.cpp:4569
 msgid "E&xclude important messages from expiry"
 msgstr "重要邮件不过期(&X)"
 
-#: configuredialog.cpp:4467
+#: configuredialog.cpp:4580
 msgid ""
 "_: to be continued with \"do not loop\", \"loop in current folder\", and \"loop "
 "in all folders\".\n"
 "When trying to find unread messages:"
 msgstr "寻找未读信件时："
 
-#: configuredialog.cpp:4470
+#: configuredialog.cpp:4583
 msgid ""
 "_: continuation of \"When trying to find unread messages:\"\n"
 "Do not Loop"
 msgstr "不循环"
 
-#: configuredialog.cpp:4472
+#: configuredialog.cpp:4585
 msgid ""
 "_: continuation of \"When trying to find unread messages:\"\n"
 "Loop in Current Folder"
 msgstr "在当前文件夹循环"
 
-#: configuredialog.cpp:4474
+#: configuredialog.cpp:4587
 msgid ""
 "_: continuation of \"When trying to find unread messages:\"\n"
 "Loop in All Folders"
 msgstr "在全部文件夹循环"
 
-#: configuredialog.cpp:4487
+#: configuredialog.cpp:4600
 msgid ""
 "_: to be continued with \"jump to first new message\", \"jump to first unread "
 "or new message\",and \"jump to last selected message\".\n"
 "When entering a folder:"
 msgstr "进入文件夹时："
 
-#: configuredialog.cpp:4490
+#: configuredialog.cpp:4603
 msgid ""
 "_: continuation of \"When entering a folder:\"\n"
 "Jump to First New Message"
 msgstr "跳到第一封新信件"
 
-#: configuredialog.cpp:4492
+#: configuredialog.cpp:4605
 msgid ""
 "_: continuation of \"When entering a folder:\"\n"
 "Jump to First Unread or New Message"
 msgstr "跳到第一封未读或新信件"
 
-#: configuredialog.cpp:4494
+#: configuredialog.cpp:4607
 msgid ""
 "_: continuation of \"When entering a folder:\"\n"
 "Jump to Last Selected Message"
 msgstr "跳到上次选中的信件"
 
-#: configuredialog.cpp:4501
+#: configuredialog.cpp:4609
+#, fuzzy
+msgid ""
+"_: continuation of \"When entering a folder:\"\n"
+"Jump to Newest Message"
+msgstr "跳到第一封新信件"
+
+#: configuredialog.cpp:4611
+#, fuzzy
+msgid ""
+"_: continuation of \"When entering a folder:\"\n"
+"Jump to Oldest Message"
+msgstr "跳到第一封新信件"
+
+#: configuredialog.cpp:4618
 msgid "Mar&k selected message as read after"
 msgstr "将选中的信件标为已读，等候(&K)"
 
-#: configuredialog.cpp:4505
+#: configuredialog.cpp:4622
 msgid " sec"
 msgstr " 秒"
 
-#: configuredialog.cpp:4518
+#: configuredialog.cpp:4635
 msgid "Ask for action after &dragging messages to another folder"
 msgstr "将信件拖拽到其它文件夹后询问如何操作(&D)"
 
-#: configuredialog.cpp:4529
+#: configuredialog.cpp:4646
 msgid ""
 "_: to be continued with \"flat files\" and \"directories\", resp.\n"
 "By default, &message folders on disk are:"
 msgstr "默认情况下，在磁盘上的信件文件夹是(&M)："
 
-#: configuredialog.cpp:4532
+#: configuredialog.cpp:4649
 msgid ""
 "_: continuation of \"By default, &message folders on disk are\"\n"
 "Flat Files (\"mbox\" format)"
 msgstr "简单文件(“mbox”格式)"
 
-#: configuredialog.cpp:4534
+#: configuredialog.cpp:4651
 msgid ""
 "_: continuation of \"By default, &message folders on disk are\"\n"
 "Directories (\"maildir\" format)"
 msgstr "目录(“maildir”格式)"
 
-#: configuredialog.cpp:4537
+#: configuredialog.cpp:4654
 msgid ""
 "_: what's this help\n"
 "<qt>"
@@ -2316,35 +2577,35 @@ msgstr ""
 "<p><b>maildir：</b>KMail "
 "的文件夹是由磁盘上的实际文件夹来表示。不同的邮件就是不同的文件。这样可能会浪费一些磁盘空间，但是应该更加稳定，比如，在文件夹之间移动邮件。</p></qt>"
 
-#: configuredialog.cpp:4562
+#: configuredialog.cpp:4679
 msgid "Open this folder on startup:"
 msgstr "启动时打开此文件夹："
 
-#: configuredialog.cpp:4570
+#: configuredialog.cpp:4687
 msgid "Empty local &trash folder on program exit"
 msgstr "程序退出时清空本地废件夹(&T)"
 
-#: configuredialog.cpp:4578
+#: configuredialog.cpp:4695
 msgid "Enable full text &indexing"
 msgstr "启用全文搜索(&I)"
 
-#: configuredialog.cpp:4588
+#: configuredialog.cpp:4705
 msgid "Quota units: "
 msgstr "配额单位："
 
-#: configuredialog.cpp:4590 quotajobs.h:86
+#: configuredialog.cpp:4707 quotajobs.h:86
 msgid "KB"
 msgstr "KB"
 
-#: configuredialog.cpp:4591 quotajobs.h:91
+#: configuredialog.cpp:4708 quotajobs.h:91
 msgid "MB"
 msgstr "MB"
 
-#: configuredialog.cpp:4592 quotajobs.h:96
+#: configuredialog.cpp:4709 quotajobs.h:96
 msgid "GB"
 msgstr "GB"
 
-#: configuredialog.cpp:4601
+#: configuredialog.cpp:4718
 msgid ""
 "_: what's this help\n"
 "<qt>"
@@ -2368,7 +2629,7 @@ msgstr ""
 "<p><b>在全部文件夹循环：</b>搜索将在信件列表顶端继续。如果没有未读的信件，就转入下个文件夹。</p>"
 "<p>同样的，搜索上封未读信件时，搜索将从信件列表底部开始，并根据所选项继续到上一个文件夹。</p></qt>"
 
-#: configuredialog.cpp:4618
+#: configuredialog.cpp:4735
 msgid ""
 "_: what's this help\n"
 "<qt>"
@@ -2385,150 +2646,161 @@ msgstr ""
 "<p>此功能会额外占用一些磁盘空间(大约是信件所占总空间的一半)。</p>"
 "<p>启用功能后会建立一次索引，但这期间您依然可继续使用 KMail。</p></qt>"
 
-#: configuredialog.cpp:4694
+#: configuredialog.cpp:4811
 msgid "&IMAP Resource Folder Options"
 msgstr "&IMAP 资源文件夹选项"
 
-#: configuredialog.cpp:4698
+#: configuredialog.cpp:4815
 msgid "&Enable IMAP resource functionality"
 msgstr "启用 IMAP 资源功能(&E)"
 
-#: configuredialog.cpp:4699
+#: configuredialog.cpp:4816
 msgid "This enables the IMAP storage for the Kontact applications"
 msgstr "这将对 Kontact 应用程序启用 IMAP 存储"
 
-#: configuredialog.cpp:4712
+#: configuredialog.cpp:4829
 msgid "&Format used for the groupware folders:"
 msgstr "群件文件夹所用的格式(&F)："
 
-#: configuredialog.cpp:4714
+#: configuredialog.cpp:4831
 msgid ""
 "Choose the format to use to store the contents of the groupware folders."
 msgstr "选择存储群件文件夹内容所用的格式。"
 
-#: configuredialog.cpp:4723
-msgid "Standard (Ical / Vcard)"
-msgstr "标准(Ical/Vcard)"
+#: configuredialog.cpp:4840
+msgid "Deprecated Kolab1 (iCal/vCard)"
+msgstr ""
 
-#: configuredialog.cpp:4723
-msgid "Kolab (XML)"
+#: configuredialog.cpp:4840
+#, fuzzy
+msgid "Kolab2 (XML)"
 msgstr "Kolab(XML)"
 
-#: configuredialog.cpp:4731
+#: configuredialog.cpp:4848
 msgid "&Language of the groupware folders:"
 msgstr "群件文件夹的语言(&L)："
 
-#: configuredialog.cpp:4734
+#: configuredialog.cpp:4851
 msgid "Set the language of the folder names"
 msgstr "设定文件夹名称的语言"
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "English"
 msgstr "英语"
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "German"
 msgstr "德语"
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "French"
 msgstr "法语"
 
-#: configuredialog.cpp:4743
+#: configuredialog.cpp:4860
 msgid "Dutch"
 msgstr "荷兰语"
 
-#: configuredialog.cpp:4752
+#: configuredialog.cpp:4869
 msgid "Set the parent of the resource folders"
 msgstr "设定资源文件夹的父文件夹"
 
-#: configuredialog.cpp:4781
+#: configuredialog.cpp:4898
 msgid "&Hide groupware folders"
 msgstr "隐藏群件文件夹(&H)"
 
-#: configuredialog.cpp:4785
+#: configuredialog.cpp:4902
 msgid ""
 "When this is checked, you will not see the IMAP resource folders in the folder "
 "tree."
 msgstr "选中此选项时，您将不会在文件夹树中看到 IMAP 资源文件夹。"
 
-#: configuredialog.cpp:4792
+#: configuredialog.cpp:4909
 msgid "&Only show groupware folders for this account"
 msgstr "仅显示此帐户的群件文件夹(&O)"
 
-#: configuredialog.cpp:4796
+#: configuredialog.cpp:4913
 msgid ""
 "When this is checked, you will not see normal  mail folders in the folder tree "
 "for the account configured for groupware."
 msgstr "选中此选项时，您将不会在配置为群件的账户的文件夹树中看到普通邮件夹。"
 
-#: configuredialog.cpp:4804
+#: configuredialog.cpp:4921
 msgid "Synchronize groupware changes immediately"
 msgstr "立即同步群件的更改"
 
-#: configuredialog.cpp:4806
+#: configuredialog.cpp:4923
 msgid ""
 "Synchronize groupware changes in disconnected IMAP folders immediately when "
 "being online."
 msgstr "对离线 IMAP 文件夹进行的群件更改同步会在转为联机状态后立即执行。"
 
-#: configuredialog.cpp:4818
+#: configuredialog.cpp:4935
 msgid "Groupware Compatibility && Legacy Options"
 msgstr "群件兼容性和传统选项"
 
-#: configuredialog.cpp:4823
+#: configuredialog.cpp:4940
 msgid "&Enable groupware functionality"
 msgstr "启用群件功能(&E)"
 
-#: configuredialog.cpp:4831
+#: configuredialog.cpp:4948
 msgid "Mangle From:/To: headers in replies to invitations"
 msgstr "在回复邀请时改动信头中的发件人/收件人"
 
-#: configuredialog.cpp:4832
+#: configuredialog.cpp:4949
 msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitation replies"
 msgstr "启用此选项，才能让 Outlook(tm) 理解您对邀请的回复"
 
-#: configuredialog.cpp:4837
+#: configuredialog.cpp:4954
 msgid "Send invitations in the mail body"
 msgstr "在邮件体中发送邀请"
 
-#: configuredialog.cpp:4838
+#: configuredialog.cpp:4955
 msgid ""
 "Turn this option on in order to make Outlook(tm) understand your answers to "
 "invitations"
 msgstr "启用此选项，才能让 Outlook(tm) 理解您对邀请的回复。"
 
-#: configuredialog.cpp:4846
+#: configuredialog.cpp:4963
 msgid "Exchange compatible invitation naming"
 msgstr "Exchange 兼容的邀请命名形式"
 
-#. i18n: file kmail.kcfg line 183
-#: configuredialog.cpp:4847 rc.cpp:685
-#, no-c-format
+#: configuredialog.cpp:4964
+#, fuzzy
 msgid ""
-"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
-"has a problem understanding standards-compliant groupware e-mail. Turn this "
-"option on to send groupware invitations in a way that Microsoft Exchange "
-"understands."
+"Outlook(tm), when used in combination with a Microsoft Exchange server,\n"
+"has a problem understanding standards-compliant groupware e-mail.\n"
+"Turn this option on to send groupware invitations and replies in an Exchange "
+"compatible way."
 msgstr ""
 "在 Microsoft Exchange 服务器和 Microsoft Outlook 协作时，处理标准兼容的群件邮件会有问题。如果您要以 Microsoft "
 "Exchange 可识别的形式发送群件邀请，请启用此选项。"
 
-#. i18n: file kmail.kcfg line 188
-#: configuredialog.cpp:4853 rc.cpp:688
+#. i18n: file kmail.kcfg line 190
+#: configuredialog.cpp:4970 rc.cpp:694
+#, fuzzy, no-c-format
+msgid "Outlook compatible invitation reply comments"
+msgstr "Outlook 兼容的附件命名"
+
+#: configuredialog.cpp:4971
+msgid ""
+"Send invitation reply comments in a way that Microsoft Outlook(tm) understands."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 196
+#: configuredialog.cpp:4977 rc.cpp:700
 #, no-c-format
 msgid "Automatic invitation sending"
 msgstr "自动发送邀请"
 
-#: configuredialog.cpp:4854
+#: configuredialog.cpp:4978
 msgid ""
 "When this is on, the user will not see the mail composer window. Invitation "
 "mails are sent automatically"
 msgstr "开启此选项时，用户将无法看到邮件撰写器窗口。邀请邮件是自动发送的"
 
-#: configuredialog.cpp:4867
+#: configuredialog.cpp:4991
 msgid ""
 "<qt>Invitations are normally sent as attachments to a mail. This switch changes "
 "the invitation mails to be sent in the text of the mail instead; this is "
@@ -2543,15 +2815,15 @@ msgstr ""
 "<br>但是，当您执行此操作时，您将无法得到邮件程序可阅读的描述性文本；所以，对于那些使用无法理解邀请的电子邮件程序的人们，最后的信件可能看起来十分差劲。"
 "<br>如果用户所使用的电子邮件程序可以理解邀请，则仍没有什么问题。</qt>"
 
-#: configuredialog.cpp:4922
+#: configuredialog.cpp:5048
 msgid "<Choose a Folder>"
 msgstr "<选择文件夹>"
 
-#: configuredialog.cpp:5026
+#: configuredialog.cpp:5154
 msgid "&Resource folders are subfolders of:"
 msgstr "资源文件夹的父文件夹(&R)："
 
-#: configuredialog.cpp:5029
+#: configuredialog.cpp:5157
 msgid "&Resource folders are in account:"
 msgstr "资源文件夹属于账户(&R)："
 
@@ -2619,31 +2891,31 @@ msgid ""
 "Not available"
 msgstr "不可用"
 
-#: customtemplates.cpp:87
+#: customtemplates.cpp:100
 msgid ""
 "_: Message->\n"
 "Universal"
 msgstr "通用"
 
-#: customtemplates.cpp:88 customtemplates.cpp:131
+#: customtemplates.cpp:101 customtemplates.cpp:180
 msgid ""
 "_: Message->\n"
 "Reply"
 msgstr "回复"
 
-#: customtemplates.cpp:89 customtemplates.cpp:133
+#: customtemplates.cpp:102 customtemplates.cpp:182
 msgid ""
 "_: Message->\n"
 "Reply to All"
 msgstr "回复(&R)"
 
-#: customtemplates.cpp:90 customtemplates.cpp:135
+#: customtemplates.cpp:103 customtemplates.cpp:184
 msgid ""
 "_: Message->\n"
 "Forward"
 msgstr "转发"
 
-#: customtemplates.cpp:93
+#: customtemplates.cpp:106
 msgid ""
 "<qt>"
 "<p>Here you can add, edit, and delete custom message templates to use when you "
@@ -2664,207 +2936,230 @@ msgstr ""
 "<p>自定义模板共有四类：<i>回复模板</i>、<i>全部回复模板</i>、<i>转发模板</i>以及适用各种场合的<i>通用模板</i>。注意您不能对<i>"
 "通用模板</i>绑定键盘快捷键。</p></qt>"
 
-#: customtemplates.cpp:107 templatesconfiguration.cpp:105
+#: customtemplates.cpp:120 templatesconfiguration.cpp:105
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
 msgstr "<a href=\"whatsthis:%1\">工作方式解释</a>"
 
-#: customtemplates.cpp:137
+#: customtemplates.cpp:122
+#, fuzzy
+msgid "Additional recipients of the message when forwarding"
+msgstr "查看加密信件时尝试解密"
+
+#: customtemplates.cpp:123
+msgid "Additional recipients who get a copy of the message when forwarding"
+msgstr ""
+
+#: customtemplates.cpp:124
+msgid ""
+"When using this template for forwarding, the default recipients are those you "
+"enter here. This is a comma-separated list of mail addresses."
+msgstr ""
+
+#: customtemplates.cpp:125
+msgid ""
+"When using this template for forwarding, the recipients you enter here will by "
+"default get a copy of this message. This is a comma-separated list of mail "
+"addresses."
+msgstr ""
+
+#: customtemplates.cpp:186
 msgid ""
 "_: Message->\n"
 "Unknown"
 msgstr "未知"
 
-#: customtemplates.cpp:347 customtemplates.cpp:364
+#: customtemplates.cpp:420 customtemplates.cpp:437
 msgid "Key Conflict"
 msgstr "按键冲突"
 
-#: customtemplates.cpp:348
+#: customtemplates.cpp:421
 msgid ""
 "The selected shortcut is already used for another custom template, would you "
 "still like to continue with the assignment?"
 msgstr "选中的快捷键已经用于另外的自定义模板，您是否想要继续指派？"
 
-#: customtemplates.cpp:365
+#: customtemplates.cpp:438
 msgid ""
 "The selected shortcut is already used, would you still like to continue with "
 "the assignment?"
 msgstr "选中的快捷键已经使用了，您是否想要继续指派？"
 
-#: distributionlistdialog.cpp:96
+#: distributionlistdialog.cpp:97
 msgid "Save Distribution List"
 msgstr "保存分发列表"
 
-#: distributionlistdialog.cpp:97
+#: distributionlistdialog.cpp:98
 msgid "Save List"
 msgstr "保存列表"
 
-#: distributionlistdialog.cpp:106
+#: distributionlistdialog.cpp:107
 msgid "Name:"
 msgstr "名称："
 
-#: distributionlistdialog.cpp:116 recipientspicker.cpp:390
+#: distributionlistdialog.cpp:117 recipientspicker.cpp:390
 msgid "Email"
 msgstr "邮件"
 
-#: distributionlistdialog.cpp:170
+#: distributionlistdialog.cpp:169
 msgid ""
 "There are no recipients in your list. First select some recipients, then try "
 "again."
 msgstr "您的列表中没有收件人。请先选择一些收件人，然后再试一次。"
 
-#: distributionlistdialog.cpp:185
+#: distributionlistdialog.cpp:184
 msgid "New Distribution List"
 msgstr "新建分发列表"
 
-#: distributionlistdialog.cpp:186
+#: distributionlistdialog.cpp:185
 msgid "Please enter name:"
 msgstr "请输入姓名："
 
-#: distributionlistdialog.cpp:197
+#: distributionlistdialog.cpp:198
 msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
 msgstr "<qt>已经存在给定名称 <b>%1</b> 的分发列表。请选择不同的名称。</qt>"
 
-#: editorwatcher.cpp:86
+#: editorwatcher.cpp:76
 msgid "Edit with:"
 msgstr "编辑方式："
 
-#: editorwatcher.cpp:169
+#: editorwatcher.cpp:161
+#, fuzzy
 msgid ""
-"KMail is unable to detect when the choosen editor is closed. To avoid data "
-"loss, editing the attachment will be aborted."
+"KMail is unable to detect when the chosen editor is closed. To avoid data loss, "
+"editing the attachment will be aborted."
 msgstr "KMail 无法探测所选编辑器何时关闭。为避免数据丢失，将中止附件编辑。"
 
-#: editorwatcher.cpp:170
+#: editorwatcher.cpp:163
 msgid "Unable to edit attachment"
 msgstr "无法编辑附件"
 
-#: encodingdetector.cpp:1250 encodingdetector.cpp:1352
+#: encodingdetector.cpp:1170 encodingdetector.cpp:1272
 msgid ""
 "_: @item Text character set\n"
 "Unicode"
 msgstr ""
 
-#: encodingdetector.cpp:1252 encodingdetector.cpp:1322
+#: encodingdetector.cpp:1172 encodingdetector.cpp:1242
 msgid ""
 "_: @item Text character set\n"
 "Cyrillic"
 msgstr ""
 
-#: encodingdetector.cpp:1254 encodingdetector.cpp:1337
+#: encodingdetector.cpp:1174 encodingdetector.cpp:1257
 msgid ""
 "_: @item Text character set\n"
 "Western European"
 msgstr ""
 
-#: encodingdetector.cpp:1256 encodingdetector.cpp:1319
+#: encodingdetector.cpp:1176 encodingdetector.cpp:1239
 msgid ""
 "_: @item Text character set\n"
 "Central European"
 msgstr ""
 
-#: encodingdetector.cpp:1258 encodingdetector.cpp:1325
+#: encodingdetector.cpp:1178 encodingdetector.cpp:1245
 msgid ""
 "_: @item Text character set\n"
 "Greek"
 msgstr ""
 
-#: encodingdetector.cpp:1260 encodingdetector.cpp:1328
+#: encodingdetector.cpp:1180 encodingdetector.cpp:1248
 msgid ""
 "_: @item Text character set\n"
 "Hebrew"
 msgstr ""
 
-#: encodingdetector.cpp:1262 encodingdetector.cpp:1334
+#: encodingdetector.cpp:1182 encodingdetector.cpp:1254
 msgid ""
 "_: @item Text character set\n"
 "Turkish"
 msgstr ""
 
-#: encodingdetector.cpp:1264 encodingdetector.cpp:1331
+#: encodingdetector.cpp:1184 encodingdetector.cpp:1251
 msgid ""
 "_: @item Text character set\n"
 "Japanese"
 msgstr ""
 
-#: encodingdetector.cpp:1266 encodingdetector.cpp:1316
+#: encodingdetector.cpp:1186 encodingdetector.cpp:1236
 msgid ""
 "_: @item Text character set\n"
 "Baltic"
 msgstr ""
 
-#: encodingdetector.cpp:1268 encodingdetector.cpp:1313
+#: encodingdetector.cpp:1188 encodingdetector.cpp:1233
 msgid ""
 "_: @item Text character set\n"
 "Arabic"
 msgstr ""
 
-#: encodingdetector.cpp:1340
+#: encodingdetector.cpp:1260
 msgid ""
 "_: @item Text character set\n"
 "Chinese Traditional"
 msgstr ""
 
-#: encodingdetector.cpp:1343
+#: encodingdetector.cpp:1263
 msgid ""
 "_: @item Text character set\n"
 "Chinese Simplified"
 msgstr ""
 
-#: encodingdetector.cpp:1346
+#: encodingdetector.cpp:1266
 msgid ""
 "_: @item Text character set\n"
 "Korean"
 msgstr ""
 
-#: encodingdetector.cpp:1349
+#: encodingdetector.cpp:1269
 msgid ""
 "_: @item Text character set\n"
 "Thai"
 msgstr ""
 
-#: expirejob.cpp:164
+#: expirejob.cpp:177
 msgid ""
 "_n: Removing 1 old message from folder %1...\n"
 "Removing %n old messages from folder %1..."
 msgstr "正在从文件夹 %1 删除 %n 封旧信..."
 
-#: expirejob.cpp:171
+#: expirejob.cpp:184
 msgid "Cannot expire messages from folder %1: destination folder %2 not found"
 msgstr "无法从文件夹 %1 过期信件：找不到目标文件夹 %2"
 
-#: expirejob.cpp:186
+#: expirejob.cpp:199
 msgid ""
 "_n: Moving 1 old message from folder %1 to folder %2...\n"
 "Moving %n old messages from folder %1 to folder %2..."
 msgstr "正在将 %n 封旧信从文件夹 %1 移动到文件夹 %2..."
 
-#: expirejob.cpp:214
+#: expirejob.cpp:227
 msgid ""
 "_n: Removed 1 old message from folder %1.\n"
 "Removed %n old messages from folder %1."
 msgstr "已从文件夹 %1 删除了 %n 封旧信。"
 
-#: expirejob.cpp:220
+#: expirejob.cpp:233
 msgid ""
 "_n: Moved 1 old message from folder %1 to folder %2.\n"
 "Moved %n old messages from folder %1 to folder %2."
 msgstr "已将 %n 封旧信从文件夹 %1 移动到文件夹 %2。"
 
-#: expirejob.cpp:227
+#: expirejob.cpp:240
 msgid "Removing old messages from folder %1 failed."
 msgstr "删除文件夹 %1 中的旧信失败。"
 
-#: expirejob.cpp:231
+#: expirejob.cpp:244
 msgid "Moving old messages from folder %1 to folder %2 failed."
 msgstr "将旧信从文件夹 %1 移动到文件夹 %2 失败。"
 
-#: expirejob.cpp:237
+#: expirejob.cpp:250
 msgid "Removing old messages from folder %1 was canceled."
 msgstr "从文件夹 %1 删除旧信已取消。"
 
-#: expirejob.cpp:241
+#: expirejob.cpp:254
 msgid "Moving old messages from folder %1 to folder %2 was canceled."
 msgstr "将旧信从文件夹 %1 移动到文件夹 %2 已取消。"
 
@@ -2901,78 +3196,95 @@ msgid ""
 "Note: Expiry action will be applied immediately after confirming settings."
 msgstr "注意：确认设置后过期操作将会立即生效。"
 
-#: expirypropertiesdialog.cpp:163
+#: expirypropertiesdialog.cpp:167
 msgid "Please select a folder to expire messages into."
 msgstr "请选择要用来保存过期信件的文件夹。"
 
-#: expirypropertiesdialog.cpp:164
+#: expirypropertiesdialog.cpp:168
 msgid "No Folder Selected"
 msgstr "未选中文件夹"
 
+#: expirypropertiesdialog.cpp:176
+#, fuzzy
+msgid ""
+"Please select a different folder than the current folder to expire message "
+"into."
+msgstr "请选择要用来保存过期信件的文件夹。"
+
+#: expirypropertiesdialog.cpp:178
+#, fuzzy
+msgid "Wrong Folder Selected"
+msgstr "未选中文件夹"
+
 #: favoritefolderview.cpp:90
 msgid "Favorite Folders"
 msgstr "收藏夹"
 
-#: favoritefolderview.cpp:326
-msgid "Remove From Favorites"
-msgstr "从收藏夹删除"
-
-#: favoritefolderview.cpp:328 favoritefolderview.cpp:378
-msgid "Rename Favorite"
-msgstr "重命名收藏夹"
-
-#: favoritefolderview.cpp:337 kmfoldertree.cpp:1153 kmmainwidget.cpp:2767
+#: favoritefolderview.cpp:337 kmfoldertree.cpp:1190 kmmainwidget.cpp:2790
 msgid "&Assign Shortcut..."
 msgstr "指派快捷键(&A)..."
 
-#: favoritefolderview.cpp:338 kmfoldertree.cpp:1158
+#: favoritefolderview.cpp:338 kmfoldertree.cpp:1195
 msgid "Expire..."
 msgstr "过期..."
 
-#: favoritefolderview.cpp:341
+#: favoritefolderview.cpp:342
+msgid "Remove From Favorites"
+msgstr "从收藏夹删除"
+
+#: favoritefolderview.cpp:344 favoritefolderview.cpp:389
+msgid "Rename Favorite"
+msgstr "重命名收藏夹"
+
+#: favoritefolderview.cpp:347
 msgid "Add Favorite Folder..."
 msgstr "添加收藏夹..."
 
-#: favoritefolderview.cpp:395
+#: favoritefolderview.cpp:406
 msgid "Local Inbox"
 msgstr "本地收件箱"
 
-#: favoritefolderview.cpp:397
+#: favoritefolderview.cpp:408
 #, c-format
 msgid "Inbox of %1"
 msgstr "%1 收件箱"
 
-#: favoritefolderview.cpp:401
+#: favoritefolderview.cpp:412
 msgid "%1 on %2"
 msgstr "%2 上的 %1"
 
-#: favoritefolderview.cpp:403
+#: favoritefolderview.cpp:414
 msgid "%1 (local)"
 msgstr "%1(本地)"
 
-#: favoritefolderview.cpp:443
+#: favoritefolderview.cpp:454
 msgid "Add Favorite Folder"
 msgstr "添加收藏夹"
 
-#: filterimporterexporter.cpp:51
+#: filterimporterexporter.cpp:50
 msgid "Select Filters"
 msgstr "选择过滤器"
 
-#: filterimporterexporter.cpp:58
+#: filterimporterexporter.cpp:61
 msgid "Filters"
 msgstr "过滤器"
 
-#: filterimporterexporter.cpp:182
+#: filterimporterexporter.cpp:67
+#, fuzzy
+msgid "Unselect All"
+msgstr "选中所有文本"
+
+#: filterimporterexporter.cpp:213
 msgid "Import Filters"
 msgstr "导入过滤器"
 
-#: filterimporterexporter.cpp:189
+#: filterimporterexporter.cpp:220
 msgid ""
 "The selected file is not readable. Your file access permissions might be "
 "insufficient."
 msgstr "所选文件不可读，可能是对这些文件的访问权限不足。"
 
-#: filterimporterexporter.cpp:204
+#: filterimporterexporter.cpp:235
 msgid "Export Filters"
 msgstr "导出过滤器"
 
@@ -3044,8 +3356,8 @@ msgstr ""
 "写文件 %1 出错，\n"
 "详细错误信息：“%2”。"
 
-#: filterlogdlg.cpp:262 kmcommands.cpp:2706 kmcommands.cpp:2730
-#: kmmainwidget.cpp:1795 kmmainwidget.cpp:1812 urlhandlermanager.cpp:489
+#: filterlogdlg.cpp:262 kmcommands.cpp:2772 kmcommands.cpp:2796
+#: kmmainwidget.cpp:1772 kmmainwidget.cpp:1789 urlhandlermanager.cpp:556
 msgid "KMail Error"
 msgstr "KMail 错误"
 
@@ -3091,61 +3403,78 @@ msgid ""
 msgstr ""
 "用户身份是 IMAP 服务器上用户的登录名。这可以是简单的用户名或者是用户完整的电子邮件地址；您在服务器上自己账户的登录名将会告诉您应该选用哪个。"
 
-#: folderdiaacltab.cpp:106 folderdiaacltab.cpp:341
+#: folderdiaacltab.cpp:103 recipientseditor.cpp:776
+msgid "Se&lect..."
+msgstr "选择(&L)..."
+
+#: folderdiaacltab.cpp:106 folderdiaacltab.cpp:340
 msgid "Permissions"
 msgstr "权限"
 
-#: folderdiaacltab.cpp:247
+#: folderdiaacltab.cpp:118
+msgid "<b>Note: </b>Renaming requires write permissions on the parent folder."
+msgstr ""
+
+#: folderdiaacltab.cpp:245
 msgid "Custom Permissions"
 msgstr "自定义权限"
 
-#: folderdiaacltab.cpp:249
+#: folderdiaacltab.cpp:247
 msgid "Custom Permissions (%1)"
 msgstr "自定义权限(%1)"
 
-#: folderdiaacltab.cpp:340
+#: folderdiaacltab.cpp:339
 msgid "User Id"
 msgstr "用户 ID"
 
-#: folderdiaacltab.cpp:352
+#: folderdiaacltab.cpp:351
 msgid "Add Entry..."
 msgstr "添加条目..."
 
-#: folderdiaacltab.cpp:353
+#: folderdiaacltab.cpp:352
 msgid "Modify Entry..."
 msgstr "修改条目..."
 
-#: folderdiaacltab.cpp:354
+#: folderdiaacltab.cpp:353
 msgid "Remove Entry"
 msgstr "删除条目"
 
-#: folderdiaacltab.cpp:426
+#: folderdiaacltab.cpp:428
 msgid "Error retrieving user permissions."
 msgstr "获取用户权限出错。"
 
-#: folderdiaacltab.cpp:431
-msgid "Information not retrieved from server yet, please use \"Check Mail\"."
+#: folderdiaacltab.cpp:430
+#, fuzzy
+msgid ""
+"You might not have enough permissions to see the permissions of this folder."
+msgstr "您没有权限读写您的废件夹。"
+
+#: folderdiaacltab.cpp:435
+#, fuzzy
+msgid ""
+"Information not retrieved from server, you need to use \"Check Mail\" and have "
+"administrative privileges on the folder."
 msgstr "尚未从服务器获取过信息，请使用“检查邮件”。"
 
-#: folderdiaacltab.cpp:446 folderdiaquotatab.cpp:114
+#: folderdiaacltab.cpp:450 folderdiaquotatab.cpp:114
 msgid "Error: no IMAP account defined for this folder"
 msgstr "错误：未为此文件夹定义 IMAP 账户"
 
-#: folderdiaacltab.cpp:452 folderdiaquotatab.cpp:120
+#: folderdiaacltab.cpp:456 folderdiaquotatab.cpp:120
 msgid "Connecting to server %1, please wait..."
 msgstr "正在连接到服务器 %1，请稍候..."
 
-#: folderdiaacltab.cpp:470 folderdiaquotatab.cpp:139
-#: kmfoldercachedimap.cpp:843
+#: folderdiaacltab.cpp:474 folderdiaquotatab.cpp:139
+#: kmfoldercachedimap.cpp:902
 #, c-format
 msgid "Error connecting to server %1"
 msgstr "连接到服务器 %1 出错"
 
-#: folderdiaacltab.cpp:490 folderdiaacltab.cpp:517
+#: folderdiaacltab.cpp:494 folderdiaacltab.cpp:522
 msgid "This IMAP server does not have support for access control lists (ACL)"
 msgstr "此 IMAP 服务器不支持访问控制列表(ACL)"
 
-#: folderdiaacltab.cpp:519
+#: folderdiaacltab.cpp:524
 #, c-format
 msgid ""
 "Error retrieving access control list (ACL) from server\n"
@@ -3154,15 +3483,15 @@ msgstr ""
 "从服务器获取访问控制列表(ACL)出错\n"
 "%1"
 
-#: folderdiaacltab.cpp:564
+#: folderdiaacltab.cpp:569
 msgid "Modify Permissions"
 msgstr "修改权限"
 
-#: folderdiaacltab.cpp:598
+#: folderdiaacltab.cpp:603
 msgid "Add Permissions"
 msgstr "添加权限"
 
-#: folderdiaacltab.cpp:631
+#: folderdiaacltab.cpp:636
 msgid ""
 "Do you really want to remove your own permissions for this folder? You will not "
 "be able to access it afterwards."
@@ -3197,8 +3526,8 @@ msgstr "用量："
 msgid "Select Folder"
 msgstr "选择文件夹"
 
-#: folderrequester.cpp:95 kmcommands.cpp:1831 kmfoldermgr.cpp:45
-#: kmfoldertree.cpp:552
+#: folderrequester.cpp:95 kmcommands.cpp:1884 kmfoldermgr.cpp:45
+#: kmfoldertree.cpp:576
 msgid "Local Folders"
 msgstr "本地文件夹"
 
@@ -3226,7 +3555,7 @@ msgid ""
 "this folder.</qt>"
 msgstr "<qt>要为当前文件夹选择按键或者按键组合，请单击下面的按钮，然后按下您想要与此文件夹关联的按键。</qt>"
 
-#: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:526 snippetdlg.cpp:93
+#: foldershortcutdialog.cpp:91 kmfilterdlg.cpp:530 snippetdlg.cpp:100
 msgid "The selected shortcut is already used, please select a different one."
 msgstr "选中的快捷键已经使用了，请另外选择一个。"
 
@@ -3242,13 +3571,20 @@ msgstr "复制到此处(&C)"
 msgid "C&ancel"
 msgstr "取消(&A)"
 
-#: headeritem.cpp:157 headeritem.cpp:164
+#: folderutil.cpp:93
+msgid ""
+"<qt>The folder you deleted was associated with the account <b>%1</b> "
+"which delivered mail into it. The folder the account delivers new mail into was "
+"reset to the main Inbox folder.</qt>"
+msgstr "<qt>您所删除的文件夹与账户 <b>%1</b> 投递的邮件关联。账户投递邮件的文件夹将重置为主收件箱。</qt>"
+
+#: headeritem.cpp:179 headeritem.cpp:186
 msgid "Unknown"
 msgstr "未知"
 
-#: headeritem.cpp:171 headerstyle.cpp:140 headerstyle.cpp:238
-#: headerstyle.cpp:442 headerstyle.cpp:625 headerstyle.cpp:778
-#: kmmainwidget.cpp:1057
+#: headeritem.cpp:193 headerstyle.cpp:141 headerstyle.cpp:240
+#: headerstyle.cpp:445 headerstyle.cpp:743 headerstyle.cpp:898
+#: kmmainwidget.cpp:1029
 msgid "No Subject"
 msgstr "无主题"
 
@@ -3268,46 +3604,46 @@ msgstr ""
 msgid "Stat&us:"
 msgstr "状态(&U)："
 
-#: headerlistquicksearch.cpp:72
+#: headerlistquicksearch.cpp:73
 msgid "Any Status"
 msgstr "任何状态"
 
-#: headerlistquicksearch.cpp:91
+#: headerlistquicksearch.cpp:93
 msgid "Open Full Search"
 msgstr "打开完整搜索"
 
-#: headerstyle.cpp:169 headerstyle.cpp:296 headerstyle.cpp:647
-#: headerstyle.cpp:860
+#: headerstyle.cpp:170 headerstyle.cpp:298 headerstyle.cpp:765
+#: headerstyle.cpp:974
 msgid "[vCard]"
 msgstr "[vCard]"
 
-#: headerstyle.cpp:174 headerstyle.cpp:314 headerstyle.cpp:672
-#: headerstyle.cpp:797
+#: headerstyle.cpp:175 headerstyle.cpp:316 headerstyle.cpp:790
+#: headerstyle.cpp:998
 msgid "CC: "
 msgstr "抄送："
 
-#: headerstyle.cpp:177 headerstyle.cpp:318 headerstyle.cpp:679
-#: headerstyle.cpp:800
+#: headerstyle.cpp:178 headerstyle.cpp:320 headerstyle.cpp:797
+#: headerstyle.cpp:1008
 msgid "BCC: "
 msgstr "密送："
 
-#: headerstyle.cpp:272 headerstyle.cpp:685
+#: headerstyle.cpp:274 headerstyle.cpp:803
 msgid "Date: "
 msgstr "日期："
 
-#: headerstyle.cpp:292 headerstyle.cpp:639 headerstyle.cpp:865
+#: headerstyle.cpp:294 headerstyle.cpp:757 headerstyle.cpp:979
 msgid "From: "
 msgstr "发件人："
 
-#: headerstyle.cpp:310 headerstyle.cpp:665 headerstyle.cpp:873
+#: headerstyle.cpp:312 headerstyle.cpp:783 headerstyle.cpp:988
 msgid "To: "
 msgstr "收件人："
 
-#: headerstyle.cpp:322
+#: headerstyle.cpp:324
 msgid "Reply to: "
 msgstr "回复地址："
 
-#: headerstyle.cpp:408
+#: headerstyle.cpp:410
 msgid ""
 "%1% probability of being spam.\n"
 "\n"
@@ -3319,23 +3655,45 @@ msgstr ""
 "完整报告：\n"
 "%2"
 
-#: headerstyle.cpp:609
+#: headerstyle.cpp:612
 msgid "Launch IM"
 msgstr "调用 IM"
 
-#: headerstyle.cpp:642
+#: headerstyle.cpp:660
+msgid "Night"
+msgstr ""
+
+#: headerstyle.cpp:669
+#, fuzzy
+msgid "Morning"
+msgstr "警告"
+
+#: headerstyle.cpp:678
+msgid "Afternoon"
+msgstr ""
+
+#: headerstyle.cpp:687
+msgid "Evening"
+msgstr ""
+
+#: headerstyle.cpp:724
+#, fuzzy
+msgid "Sender's Current Time:"
+msgstr "发送者身份(&S)："
+
+#: headerstyle.cpp:760
 msgid "(resent from %1)"
 msgstr "(从 %1 重新发出)"
 
-#: headerstyle.cpp:694
+#: headerstyle.cpp:812
 msgid "User-Agent: "
 msgstr "用户代理："
 
-#: headerstyle.cpp:703
+#: headerstyle.cpp:821
 msgid "X-Mailer: "
 msgstr "X-Mailer："
 
-#: headerstyle.cpp:723
+#: headerstyle.cpp:843
 msgid "Spam Status:"
 msgstr "垃圾信状态："
 
@@ -3376,15 +3734,15 @@ msgid ""
 "<br>e</qt>"
 msgstr "<qt><br>非<br> <br>H<br>T<br>M<br>L<br> <br>信<br>件</qt>"
 
-#: identitydialog.cpp:90
+#: identitydialog.cpp:93
 msgid "Edit Identity"
 msgstr "编辑身份"
 
-#: identitydialog.cpp:118
+#: identitydialog.cpp:121
 msgid "&Your name:"
 msgstr "您的名字(&Y)："
 
-#: identitydialog.cpp:120
+#: identitydialog.cpp:123
 msgid ""
 "<qt>"
 "<h3>Your name</h3>"
@@ -3398,11 +3756,11 @@ msgstr ""
 "<p>您应该在此域中输入您的姓名，即您想要在发信时出现在信头中的姓名；</p>"
 "<p>如果您将此域留空，将不会出现您真实的姓名，而仅仅是电子邮件地址。</p></qt>"
 
-#: identitydialog.cpp:132
+#: identitydialog.cpp:135
 msgid "Organi&zation:"
 msgstr "组织(&Z)："
 
-#: identitydialog.cpp:134
+#: identitydialog.cpp:137
 msgid ""
 "<qt>"
 "<h3>Organization</h3>"
@@ -3415,15 +3773,19 @@ msgstr ""
 "<p>您应该在此域中输入您组织的名称，如果您想要在发出信的信头中显示组织名称的话。</p>"
 "<p>将此域留空很安全(也是较为普遍的)。</p></qt>"
 
-#: identitydialog.cpp:147
+#: identitydialog.cpp:149
 msgid "&Email address:"
 msgstr "电子邮件地址(&E)："
 
-#: identitydialog.cpp:149
+#: identitydialog.cpp:151
+#, fuzzy
 msgid ""
 "<qt>"
 "<h3>Email address</h3>"
-"<p>This field should have your full email address.</p>"
+"<p>This field should have your full email address</p>"
+"<p>This address is the primary one, used for all outgoing mail. If you have "
+"more than one address, either create a new identity, or add additional alias "
+"addresses in the field below.</p>"
 "<p>If you leave this blank, or get it wrong, people will have trouble replying "
 "to you.</p></qt>"
 msgstr ""
@@ -3432,25 +3794,49 @@ msgstr ""
 "<p>您应该在此域中输入您完整的电子邮件地址。</p>"
 "<p>如果您将此域留空，或者写错了，别人就无法回信给您。</p></qt>"
 
-#: identitydialog.cpp:161
+#: identitydialog.cpp:165
+#, fuzzy
+msgid "Email a&liases:"
+msgstr "电子邮件地址(&E)："
+
+#: identitydialog.cpp:167
+msgid ""
+"<qt>"
+"<h3>Email aliases</h3>"
+"<p>This field contains alias addresses that should also be considered as "
+"belonging to this identity (as opposed to representing a different "
+"identity).</p>"
+"<p>Example:</p>"
+"<table>"
+"<tr>"
+"<th>Primary address:</th>"
+"<td>first.last@example.org</td></tr>"
+"<tr>"
+"<th>Aliases:</th>"
+"<td>first@example.org"
+"<br>last@example.org</td></tr></table>"
+"<p>Type one alias address per line.</p></qt>"
+msgstr ""
+
+#: identitydialog.cpp:185
 msgid "Cryptograph&y"
 msgstr "加密(&Y)"
 
-#: identitydialog.cpp:168 identitydialog.cpp:192 identitydialog.cpp:217
-#: identitydialog.cpp:243
+#: identitydialog.cpp:192 identitydialog.cpp:216 identitydialog.cpp:241
+#: identitydialog.cpp:267
 msgid "Chang&e..."
 msgstr "更改(&E)..."
 
-#: identitydialog.cpp:169
+#: identitydialog.cpp:193
 msgid "Your OpenPGP Signature Key"
 msgstr "您的 OpenPGP 签名密钥"
 
-#: identitydialog.cpp:170
+#: identitydialog.cpp:194
 msgid ""
 "Select the OpenPGP key which should be used to digitally sign your messages."
 msgstr "请选择用于签名您自己的信件时所使用的 OpenPGP 密钥。"
 
-#: identitydialog.cpp:174
+#: identitydialog.cpp:198
 msgid ""
 "<qt>"
 "<p>The OpenPGP key you choose here will be used to digitally sign messages. You "
@@ -3464,21 +3850,21 @@ msgstr ""
 "<p>您可以将此处留空，但是 KMail 将无法使用 OpenPGP 签名邮件；普通的邮件功能不会因此受到影响。</p>"
 "<p>您可以在 <a>http://www.gnupg.org</a> 找到关于密钥得更多信息。</qt>"
 
-#: identitydialog.cpp:181
+#: identitydialog.cpp:205
 msgid "OpenPGP signing key:"
 msgstr "OpenPGP 签名密钥："
 
-#: identitydialog.cpp:193
+#: identitydialog.cpp:217
 msgid "Your OpenPGP Encryption Key"
 msgstr "您的 OpenPGP 加密密钥"
 
-#: identitydialog.cpp:194
+#: identitydialog.cpp:218
 msgid ""
 "Select the OpenPGP key which should be used when encrypting to yourself and for "
 "the \"Attach My Public Key\" feature in the composer."
 msgstr "选择要对您自己加密以及对撰写器中“附加我的公钥”特性时使用的 OpenPGP 密钥。"
 
-#: identitydialog.cpp:199
+#: identitydialog.cpp:223
 msgid ""
 "<qt>"
 "<p>The OpenPGP key you choose here will be used to encrypt messages to yourself "
@@ -3494,21 +3880,21 @@ msgstr ""
 "<p>您可以将此处留空，但是 KMail 将无法使用 OpenPGP 对您寄出信件的副本进行加密；普通的邮件功能不会因此受到影响。</p>"
 "<p>您可以在 <a>http://www.gnupg.org</a> 找到关于密钥的更多信息</qt>"
 
-#: identitydialog.cpp:206
+#: identitydialog.cpp:230
 msgid "OpenPGP encryption key:"
 msgstr "OpenPGP 加密密钥："
 
-#: identitydialog.cpp:218
+#: identitydialog.cpp:242
 msgid "Your S/MIME Signature Certificate"
 msgstr "S/MIME 签名证书"
 
-#: identitydialog.cpp:219
+#: identitydialog.cpp:243
 msgid ""
 "Select the S/MIME certificate which should be used to digitally sign your "
 "messages."
 msgstr "请选择用于对信件数字签名信件所使用的 S/MIME 证书。"
 
-#: identitydialog.cpp:223
+#: identitydialog.cpp:247
 msgid ""
 "<qt>"
 "<p>The S/MIME (X.509) certificate you choose here will be used to digitally "
@@ -3520,21 +3906,21 @@ msgstr ""
 "<p>您在此选择的 S/MIME (X.509) 证书 将用于对信件进行数字签名。</p>"
 "<p>您可以将此处留空，但是 KMail 将无法使用 S/MIME 对电子邮件进行数字签名；普通的邮件功能不会因此受到影响。</p></qt>"
 
-#: identitydialog.cpp:228
+#: identitydialog.cpp:252
 msgid "S/MIME signing certificate:"
 msgstr "S/MIME 签名证书："
 
-#: identitydialog.cpp:244
+#: identitydialog.cpp:268
 msgid "Your S/MIME Encryption Certificate"
 msgstr "您的 S/MIME 加密证书"
 
-#: identitydialog.cpp:245
+#: identitydialog.cpp:269
 msgid ""
 "Select the S/MIME certificate which should be used when encrypting to yourself "
 "and for the \"Attach My Certificate\" feature in the composer."
 msgstr "请选择用于对您自己和撰写器中“附加我的证书”特性所使用的 S/MIME 证书。"
 
-#: identitydialog.cpp:250
+#: identitydialog.cpp:274
 msgid ""
 "<qt>"
 "<p>The S/MIME certificate you choose here will be used to encrypt messages to "
@@ -3547,23 +3933,23 @@ msgstr ""
 "<p>您在此选择的 S/MIME (X.509) 证书 将用于对您自己加密信件以及在撰写器中的“附加我的证书”功能。</p>"
 "<p>您可以将此处留空，但是 KMail 将无法使用 S/MIME 对电子邮件进行数字签名；普通的邮件功能不会因此受到影响。</p></qt>"
 
-#: identitydialog.cpp:256
+#: identitydialog.cpp:280
 msgid "S/MIME encryption certificate:"
 msgstr "S/MIME 加密证书："
 
-#: identitydialog.cpp:277
+#: identitydialog.cpp:301
 msgid "Preferred crypto message format:"
 msgstr "首选的加密算法信件格式："
 
-#: identitydialog.cpp:290
+#: identitydialog.cpp:314
 msgid "&Advanced"
 msgstr "高级(&A)"
 
-#: identitydialog.cpp:300
+#: identitydialog.cpp:324
 msgid "&Reply-To address:"
 msgstr "回信地址(&R)："
 
-#: identitydialog.cpp:302
+#: identitydialog.cpp:326
 msgid ""
 "<qt>"
 "<h3>Reply-To addresses</h3>"
@@ -3581,11 +3967,11 @@ msgstr ""
 "域设成您的邮件地址，但是却让回信发到一组地址。</p>"
 "<p>如果您对此选项不太确定的话，请将此域留空。</p></qt>"
 
-#: identitydialog.cpp:319
+#: identitydialog.cpp:343
 msgid "&BCC addresses:"
 msgstr "密件抄送地址(&B)："
 
-#: identitydialog.cpp:321
+#: identitydialog.cpp:345
 msgid ""
 "<qt>"
 "<h3>BCC (Blind Carbon Copy) addresses</h3>"
@@ -3604,47 +3990,52 @@ msgstr ""
 "<p>要指定多个地址，请使用逗号分隔密件抄送收件人列表。</p>"
 "<p>如果您对此选项不太确定的话，请将此域留空。</p></qt>"
 
-#: identitydialog.cpp:337
+#: identitydialog.cpp:361
 msgid "D&ictionary:"
 msgstr "字典(&I)："
 
-#: identitydialog.cpp:346
+#: identitydialog.cpp:370
 msgid "Sent-mail &folder:"
 msgstr "已发文件夹(&F)："
 
-#: identitydialog.cpp:355
+#: identitydialog.cpp:379
 msgid "&Drafts folder:"
 msgstr "草稿文件夹(&D)："
 
-#: identitydialog.cpp:364
+#: identitydialog.cpp:388
 msgid "&Templates folder:"
 msgstr "模板文件夹(&T)："
 
-#: identitydialog.cpp:369
+#: identitydialog.cpp:393
 msgid "Special &transport:"
 msgstr "特殊传输方式(&T)："
 
-#: identitydialog.cpp:386 kmfolderdia.cpp:717
+#: identitydialog.cpp:410 kmfolderdia.cpp:808
 msgid "&Use custom message templates"
 msgstr "使用自定义信件模板(&U)"
 
-#: identitydialog.cpp:392 kmfolderdia.cpp:725
+#: identitydialog.cpp:416 kmfolderdia.cpp:816
 msgid "&Copy global templates"
 msgstr "复制全局模板(&C)"
 
-#: identitydialog.cpp:407
+#: identitydialog.cpp:431
 msgid "&Signature"
 msgstr "签名(&S)"
 
-#: identitydialog.cpp:411
+#: identitydialog.cpp:435
 msgid "&Picture"
 msgstr "图片(&P)"
 
-#: identitydialog.cpp:486 identitydialog.cpp:498 kmcomposewin.cpp:4004
+#: identitydialog.cpp:510 identitydialog.cpp:522 kmcomposewin.cpp:4117
 msgid "Invalid Email Address"
 msgstr "无效的电子邮件地址"
 
-#: identitydialog.cpp:518
+#: identitydialog.cpp:530
+#, fuzzy
+msgid "Invalid Email Alias \"%1\""
+msgstr "无效的电子邮件地址"
+
+#: identitydialog.cpp:551
 msgid ""
 "One of the configured OpenPGP signing keys does not contain any user ID with "
 "the configured email address for this identity (%1).\n"
@@ -3654,13 +4045,13 @@ msgstr ""
 "所配置的 OpenPGP 签名密钥之一不包含为此身份(%1)配置的电子邮件地址。\n"
 "这可能导致接收方试图校验此配置制作的签名时得到警告。"
 
-#: identitydialog.cpp:527
+#: identitydialog.cpp:560
 msgid ""
 "One of the configured OpenPGP encryption keys does not contain any user ID with "
 "the configured email address for this identity (%1)."
 msgstr "所配置的 OpenPGP 加密密钥之一不包含为此身份(%1)配置的电子邮件地址。"
 
-#: identitydialog.cpp:534
+#: identitydialog.cpp:567
 msgid ""
 "One of the configured S/MIME signing certificates does not contain the "
 "configured email address for this identity (%1).\n"
@@ -3670,37 +4061,37 @@ msgstr ""
 "所配置的 S/MIME 签名证书之一不包含为此身份(%1)配置的电子邮件地址。\n"
 "这可能导致接收方试图校验此配置制作的签名时得到警告。"
 
-#: identitydialog.cpp:543
+#: identitydialog.cpp:576
 msgid ""
 "One of the configured S/MIME encryption certificates does not contain the "
 "configured email address for this identity (%1)."
 msgstr "所配置的 S/MIME 加密证书之一不包含为此身份(%1)配置的电子邮件地址。"
 
-#: identitydialog.cpp:551
+#: identitydialog.cpp:584
 msgid "Email Address Not Found in Key/Certificates"
 msgstr "未在密钥/证书中找到电子邮件地址"
 
-#: identitydialog.cpp:562
+#: identitydialog.cpp:595
 msgid "The signature file is not valid"
 msgstr "签名文件无效"
 
-#: identitydialog.cpp:582
+#: identitydialog.cpp:615
 msgid "Edit Identity \"%1\""
 msgstr "编辑身份“%1”"
 
-#: identitydialog.cpp:606
+#: identitydialog.cpp:640
 msgid ""
 "The custom sent-mail folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default sent-mail folder will be used."
 msgstr "身份“%1”的自定义已发文件夹不存在；因此会使用默认的已发送文件夹。"
 
-#: identitydialog.cpp:617
+#: identitydialog.cpp:651
 msgid ""
 "The custom drafts folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default drafts folder will be used."
 msgstr "身份“%1”的自定义草稿文件夹不存在；因此会使用默认的草稿文件夹。"
 
-#: identitydialog.cpp:628
+#: identitydialog.cpp:662
 msgid ""
 "The custom templates folder for identity \"%1\" does not exist (anymore); "
 "therefore, the default templates folder will be used."
@@ -3721,80 +4112,80 @@ msgstr "身份名称"
 msgid "Email Address"
 msgstr "邮件地址："
 
-#: imapaccountbase.cpp:291 popaccount.cpp:154
+#: imapaccountbase.cpp:293 popaccount.cpp:154
 msgid "You need to supply a username and a password to access this mailbox."
 msgstr "您需要提供一个用户名和一个密码来访问该邮箱。"
 
-#: imapaccountbase.cpp:296
+#: imapaccountbase.cpp:298
 msgid "Authorization Dialog"
 msgstr "身份验证对话框"
 
-#: imapaccountbase.cpp:297 popaccount.cpp:155
+#: imapaccountbase.cpp:299 popaccount.cpp:155
 msgid "Account:"
 msgstr "账户："
 
-#: imapaccountbase.cpp:318
+#: imapaccountbase.cpp:320
 #, c-format
 msgid "Could not start process for %1."
 msgstr "无法启动 %1 协议的进程。"
 
-#: imapaccountbase.cpp:399
+#: imapaccountbase.cpp:403
 msgid "Error while trying to subscribe to %1:"
 msgstr "试图订阅 %1 出错："
 
-#: imapaccountbase.cpp:637
+#: imapaccountbase.cpp:645
 msgid "Retrieving Namespaces"
 msgstr "获取命名空间"
 
-#: imapaccountbase.cpp:728
+#: imapaccountbase.cpp:736
 msgid ""
 "KMail has detected a prefix entry in the configuration of the account \"%1\" "
 "which is obsolete with the support of IMAP namespaces."
 msgstr "KMail 在账户“%1”的配置中检测到了前缀项，这已经被 IMAP 命名空间的支持所取代。"
 
-#: imapaccountbase.cpp:742 imapaccountbase.cpp:756
+#: imapaccountbase.cpp:750 imapaccountbase.cpp:764
 msgid ""
 "The configuration was automatically migrated but you should check your account "
 "configuration."
 msgstr "配置将会自动迁移，但是您还应该再检查一下您的账户配置。"
 
-#: imapaccountbase.cpp:760
+#: imapaccountbase.cpp:768
 msgid ""
 "It was not possible to migrate your configuration automatically so please check "
 "your account configuration."
 msgstr "无法自动迁移您的配置，所以请检查您的账户配置。"
 
-#: imapaccountbase.cpp:874 imapaccountbase.cpp:875
+#: imapaccountbase.cpp:882 imapaccountbase.cpp:883
 msgid "<unknown>"
 msgstr "<未知>"
 
-#: imapaccountbase.cpp:876
+#: imapaccountbase.cpp:884
 msgid "Error while uploading message"
 msgstr "上传信件时发生错误"
 
-#: imapaccountbase.cpp:878
+#: imapaccountbase.cpp:886
 msgid ""
 "Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> "
 "to the server."
 msgstr "无法将 <i>%2<i> 发送于 %1 的信件 <i>%3</i> 上传到服务器。"
 
-#: imapaccountbase.cpp:880
+#: imapaccountbase.cpp:888
 msgid "The destination folder was: <b>%1</b>."
 msgstr "目标文件夹：<b>%1</b>。"
 
-#: imapaccountbase.cpp:882
+#: imapaccountbase.cpp:890
 msgid "The server reported:"
 msgstr "服务器的回应："
 
-#: imapaccountbase.cpp:892
+#: imapaccountbase.cpp:900
 msgid "No detailed quota information available."
 msgstr "没有可用的配额细节信息。"
 
-#: imapaccountbase.cpp:903
+#: imapaccountbase.cpp:911
 msgid "The folder is too close to its quota limit. (%1)"
 msgstr "此文件夹容量已极接近配额限度。(%1)"
 
-#: imapaccountbase.cpp:905
+#: imapaccountbase.cpp:913
 msgid ""
 "\n"
 "Since you do not have write privileges on this folder, please ask the owner of "
@@ -3803,29 +4194,29 @@ msgstr ""
 "\n"
 "您没有对此文件夹的写入权限，请向此文件夹的所有者请求释放部分空间。"
 
-#: imapaccountbase.cpp:951
+#: imapaccountbase.cpp:959
 msgid ""
 "The connection to the server %1 was unexpectedly closed or timed out. It will "
 "be re-established automatically if possible."
 msgstr "到服务器 %1 的连接意外关闭或超时。如果可能的话，系统会自动重新连接。"
 
-#: imapaccountbase.cpp:957
+#: imapaccountbase.cpp:965
 msgid "The connection to account %1 was broken."
 msgstr "到账户 %1 的连接已丢失。"
 
-#: imapaccountbase.cpp:960
+#: imapaccountbase.cpp:968
 msgid "The connection to account %1 timed out."
 msgstr "到账户 %1 的连接超时。"
 
-#: imapaccountbase.cpp:1245
+#: imapaccountbase.cpp:1253
 msgid "Error while uploading status of messages to server: "
 msgstr "将信件状态上传到服务器出错："
 
-#: imapaccountbase.cpp:1290 listjob.cpp:118
+#: imapaccountbase.cpp:1298 listjob.cpp:118
 msgid "retrieving folders"
 msgstr "收取文件夹"
 
-#: imapjob.cpp:153 kmfolderimap.cpp:496
+#: imapjob.cpp:153 kmfolderimap.cpp:490
 msgid "Uploading message data"
 msgstr "上传信件数据"
 
@@ -3849,29 +4240,123 @@ msgstr "信件主题为："
 msgid "Error while retrieving messages from the server."
 msgstr "从服务器获取信件出错。"
 
-#: imapjob.cpp:483
+#: imapjob.cpp:485
 msgid "Error while retrieving information on the structure of a message."
 msgstr "获取信件结构信息出错。"
 
-#: imapjob.cpp:541
+#: imapjob.cpp:543
 msgid "Uploading message data failed."
 msgstr "上传信件数据失败。"
 
-#: imapjob.cpp:546
+#: imapjob.cpp:548
 msgid "Uploading message data completed."
 msgstr "上传信件数据完成。"
 
-#: imapjob.cpp:650
+#: imapjob.cpp:652
 msgid "Error while copying messages."
 msgstr "复制信件时发生错误。"
 
-#: keyresolver.cpp:234
+#: importarchivedialog.cpp:36
+#, fuzzy
+msgid "Import Archive"
+msgstr "邮件列表归档"
+
+#: importarchivedialog.cpp:87
+msgid "Please select an archive file that should be imported."
+msgstr ""
+
+#: importarchivedialog.cpp:88
+#, fuzzy
+msgid "No archive file selected"
+msgstr "未选中文件夹"
+
+#: importarchivedialog.cpp:93
+#, fuzzy
+msgid "Please select the folder where the archive should be imported to."
+msgstr "请选择要用来保存过期信件的文件夹。"
+
+#: importarchivedialog.cpp:94
+#, fuzzy
+msgid "No target folder selected"
+msgstr "未选中文件夹"
+
+#: importjob.cpp:80
+msgid "Importing the archive file '%1' into the folder '%2' succeeded."
+msgstr ""
+
+#: importjob.cpp:82
+#, fuzzy, c-format
+msgid ""
+"_n: 1 message was imported.\n"
+"%n messages were imported."
+msgstr "导入了 %n 个新的绝密密钥。"
+
+#: importjob.cpp:83
+#, fuzzy
+msgid "Import finished."
+msgstr "导入过滤器"
+
+#: importjob.cpp:98
+#, fuzzy
+msgid "Failed to import the archive into folder '%1'."
+msgstr "无法创建文件夹"
+
+#: importjob.cpp:105
+#, fuzzy
+msgid "Importing archive failed."
+msgstr "更新缓存文件"
+
+#: importjob.cpp:114 importjob.cpp:287
+#, fuzzy
+msgid "Unable to create subfolder for folder '%1'."
+msgstr "无法创建文件夹"
+
+#: importjob.cpp:214
+#, fuzzy, c-format
+msgid "Importing folder %1"
+msgstr "删除文件夹"
+
+#: importjob.cpp:234
+#, fuzzy
+msgid "Failed to add a message to the folder '%1'."
+msgstr "无法将信件添加到文件夹："
+
+#: importjob.cpp:254
+#, fuzzy
+msgid "Failed to upload a message to the IMAP server."
+msgstr "在服务器上保留已取的信件(&V)"
+
+#: importjob.cpp:337
+msgid "Unexpected subdirectory named '%1'."
+msgstr ""
+
+#: importjob.cpp:371
+msgid "The file '%1' does not appear to be a valid archive."
+msgstr ""
+
+#: importjob.cpp:376
+msgid "Unable to open archive file '%1'"
+msgstr ""
+
+#: importjob.cpp:382
+#, fuzzy
+msgid "Importing Archive"
+msgstr "邮件列表归档"
+
+#: keyresolver.cpp:306
 msgid ""
 "One or more of your configured OpenPGP encryption keys or S/MIME certificates "
 "is not fully trusted for encryption."
 msgstr "您有一个或更多已配置的 OpenPGP 加密密钥或 S/MIME 证书对加密是不完全信任的。"
 
-#: keyresolver.cpp:240
+#: keyresolver.cpp:309
+#, fuzzy
+msgid ""
+"One or more of the OpenPGP encryption keys or S/MIME certificates for recipient "
+"\"%1\" is not fully trusted for encryption."
+msgstr "您有一个或更多已配置的 OpenPGP 加密密钥或 S/MIME 证书对加密是不完全信任的。"
+
+#: keyresolver.cpp:315
 msgid ""
 "\n"
 "The following keys are only marginally trusted: \n"
@@ -3879,7 +4364,7 @@ msgstr ""
 "\n"
 "以下密钥是勉强信任的：\n"
 
-#: keyresolver.cpp:244
+#: keyresolver.cpp:319
 msgid ""
 "\n"
 "The following keys or certificates have unknown trust level: \n"
@@ -3887,11 +4372,206 @@ msgstr ""
 "\n"
 "以下密钥或证书的信任级别未知：\n"
 
-#: keyresolver.cpp:248
+#: keyresolver.cpp:323
+#, fuzzy
+msgid ""
+"\n"
+"The following keys or certificates are <b>revoked</b>: \n"
+msgstr ""
+"\n"
+"以下密钥或证书的信任级别未知：\n"
+
+#: keyresolver.cpp:327
 msgid "Not Fully Trusted Encryption Keys"
 msgstr "不完全信任的加密密钥"
 
-#: keyresolver.cpp:553
+#: keyresolver.cpp:642
+#, fuzzy
+msgid ""
+"_n: "
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+"<p>您的 OpenPGP 签名密钥</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>即将于 %n 天内过期。</p>"
+
+#: keyresolver.cpp:647
+#, fuzzy
+msgid ""
+"_n: "
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+"<p>您的 OpenPGP 加密密钥</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>即将于 %n 天内过期。</p>"
+
+#: keyresolver.cpp:652
+#, fuzzy
+msgid ""
+"_n: "
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+"<p align=center><b>%1</b> (KeyID 0x%2)</p>"
+"<p>的 OpenPGP 密钥即将于 %n 天内过期。</p>"
+
+#: keyresolver.cpp:662
+#, fuzzy
+msgid ""
+"_n: "
+"<p>The root certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+"<p>您 S/MIME 签名证书的根证书</p><p align=center><b>%3</b></p><p align=center><b>%1</b> "
+"(序列号 %2)</p>"
+"<p>即将于 %n 天内过期。</p>"
+
+#: keyresolver.cpp:669
+#, fuzzy
+msgid ""
+"_n: "
+"<p>The root certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+"<p>您 S/MIME 加密证书的根证书</p><p align=center><b>%3</b></p><p align=center><b>%1</b> "
+"(序列号 %2)</p>"
+"<p>即将于 %n 天内过期。</p>"
+
+#: keyresolver.cpp:676
+#, fuzzy
+msgid ""
+"_n: "
+"<p>The root certificate</p><p align=center><b>%3</b></p>"
+"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The root certificate</p><p align=center><b>%3</b></p>"
+"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+"<p>您 S/MIME 证书的根证书</p><p align=center><b>%3</b></p><p align=center><b>%1</b> "
+"(序列号 %2)</p>"
+"<p>即将于 %n 天内过期。</p>"
+
+#: keyresolver.cpp:684
+#, fuzzy
+msgid ""
+"_n: "
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+"<p>您 S/MIME 签名证书的中介 CA 证书</p><p align=center><b>%3</b></p><p align=center><b>"
+"%1</b> (序列号 %2)</p>"
+"<p>即将于 %n 天内过期。</p>"
+
+#: keyresolver.cpp:691
+#, fuzzy
+msgid ""
+"_n: "
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
+"<p>for your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+"<p>您 S/MIME 加密证书的中介 CA 证书</p><p align=center><b>%3</b></p><p align=center><b>"
+"%1</b> (序列号 %2)</p>"
+"<p>即将于 %n 天内过期。</p>"
+
+#: keyresolver.cpp:698
+#, fuzzy
+msgid ""
+"_n: "
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
+"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
+"<p>for S/MIME certificate</p><p align=center><b>%1</b> (serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+"<p>您 S/MIME 证书的中介 CA 证书</p><p align=center><b>%3</b></p><p align=center><b>"
+"%1</b> (序列号 %2)</p>"
+"<p>即将于 %n 天内过期。</p>"
+
+#: keyresolver.cpp:707
+#, fuzzy
+msgid ""
+"_n: "
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+"<p>您的 S/MIME 签名证书</p><p align=center><b>%1</b> (序列号 %2)</p>"
+"<p>即将于 %n 天内过期。</p>"
+
+#: keyresolver.cpp:712
+#, fuzzy
+msgid ""
+"_n: "
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+"<p>您的 S/MIME 加密证书</p><p align=center><b>%1</b> (序列号 %2)</p>"
+"<p>即将于 %n 天内过期。</p>"
+
+#: keyresolver.cpp:717
+#, fuzzy
+msgid ""
+"_n: "
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired less than a day ago.</p>\n"
+"<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
+"(serial number %2)</p>"
+"<p>expired %n days ago.</p>"
+msgstr ""
+"<p>您的 S/MIME 证书</p><p align=center><b>%1</b> (序列号 %2)</p>"
+"<p>即将于 %n 天内过期。</p>"
+
+#: keyresolver.cpp:724
+#, fuzzy
+msgid "OpenPGP Key Expired"
+msgstr "OpenPGP 密钥即将过期"
+
+#: keyresolver.cpp:725
+#, fuzzy
+msgid "S/MIME Certificate Expired"
+msgstr "S/MIME 证书即将过期"
+
+#: keyresolver.cpp:750
 msgid ""
 "_n: "
 "<p>Your OpenPGP signing key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
@@ -3902,7 +4582,7 @@ msgstr ""
 "<p>您的 OpenPGP 签名密钥</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
 "<p>即将于 %n 天内过期。</p>"
 
-#: keyresolver.cpp:558
+#: keyresolver.cpp:755
 msgid ""
 "_n: "
 "<p>Your OpenPGP encryption key</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
@@ -3913,7 +4593,7 @@ msgstr ""
 "<p>您的 OpenPGP 加密密钥</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
 "<p>即将于 %n 天内过期。</p>"
 
-#: keyresolver.cpp:563
+#: keyresolver.cpp:760
 msgid ""
 "_n: "
 "<p>The OpenPGP key for</p><p align=center><b>%1</b> (KeyID 0x%2)</p>"
@@ -3924,7 +4604,7 @@ msgstr ""
 "<p align=center><b>%1</b> (KeyID 0x%2)</p>"
 "<p>的 OpenPGP 密钥即将于 %n 天内过期。</p>"
 
-#: keyresolver.cpp:573
+#: keyresolver.cpp:770
 msgid ""
 "_n: "
 "<p>The root certificate</p><p align=center><b>%3</b></p>"
@@ -3940,7 +4620,7 @@ msgstr ""
 "(序列号 %2)</p>"
 "<p>即将于 %n 天内过期。</p>"
 
-#: keyresolver.cpp:580
+#: keyresolver.cpp:777
 msgid ""
 "_n: "
 "<p>The root certificate</p><p align=center><b>%3</b></p>"
@@ -3956,7 +4636,7 @@ msgstr ""
 "(序列号 %2)</p>"
 "<p>即将于 %n 天内过期。</p>"
 
-#: keyresolver.cpp:587
+#: keyresolver.cpp:784
 msgid ""
 "_n: "
 "<p>The root certificate</p><p align=center><b>%3</b></p>"
@@ -3970,7 +4650,7 @@ msgstr ""
 "(序列号 %2)</p>"
 "<p>即将于 %n 天内过期。</p>"
 
-#: keyresolver.cpp:595
+#: keyresolver.cpp:792
 msgid ""
 "_n: "
 "<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
@@ -3986,7 +4666,7 @@ msgstr ""
 "%1</b> (序列号 %2)</p>"
 "<p>即将于 %n 天内过期。</p>"
 
-#: keyresolver.cpp:602
+#: keyresolver.cpp:799
 msgid ""
 "_n: "
 "<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
@@ -4002,7 +4682,7 @@ msgstr ""
 "%1</b> (序列号 %2)</p>"
 "<p>即将于 %n 天内过期。</p>"
 
-#: keyresolver.cpp:609
+#: keyresolver.cpp:806
 msgid ""
 "_n: "
 "<p>The intermediate CA certificate</p><p align=center><b>%3</b></p>"
@@ -4016,7 +4696,7 @@ msgstr ""
 "%1</b> (序列号 %2)</p>"
 "<p>即将于 %n 天内过期。</p>"
 
-#: keyresolver.cpp:618
+#: keyresolver.cpp:815
 msgid ""
 "_n: "
 "<p>Your S/MIME signing certificate</p><p align=center><b>%1</b> "
@@ -4029,7 +4709,7 @@ msgstr ""
 "<p>您的 S/MIME 签名证书</p><p align=center><b>%1</b> (序列号 %2)</p>"
 "<p>即将于 %n 天内过期。</p>"
 
-#: keyresolver.cpp:623
+#: keyresolver.cpp:820
 msgid ""
 "_n: "
 "<p>Your S/MIME encryption certificate</p><p align=center><b>%1</b> "
@@ -4042,7 +4722,7 @@ msgstr ""
 "<p>您的 S/MIME 加密证书</p><p align=center><b>%1</b> (序列号 %2)</p>"
 "<p>即将于 %n 天内过期。</p>"
 
-#: keyresolver.cpp:628
+#: keyresolver.cpp:825
 msgid ""
 "_n: "
 "<p>The S/MIME certificate for</p><p align=center><b>%1</b> "
@@ -4055,15 +4735,15 @@ msgstr ""
 "<p>您的 S/MIME 证书</p><p align=center><b>%1</b> (序列号 %2)</p>"
 "<p>即将于 %n 天内过期。</p>"
 
-#: keyresolver.cpp:634
+#: keyresolver.cpp:832
 msgid "OpenPGP Key Expires Soon"
 msgstr "OpenPGP 密钥即将过期"
 
-#: keyresolver.cpp:635
+#: keyresolver.cpp:833
 msgid "S/MIME Certificate Expires Soon"
 msgstr "S/MIME 证书即将过期"
 
-#: keyresolver.cpp:668
+#: keyresolver.cpp:867
 msgid ""
 "One or more of your configured OpenPGP encryption keys or S/MIME certificates "
 "is not usable for encryption. Please reconfigure your encryption keys and "
@@ -4074,11 +4754,11 @@ msgstr ""
 "您所配置的 OpenPGP 加密密钥或 S/MIME 证书之一不可用于加密。请在身份配置对话框中重新配置您为此身份指定的加密密钥以及证书。\n"
 "如果您选择继续的话，而稍后会用到密钥，您将需要指定要使用哪个密钥。"
 
-#: keyresolver.cpp:676 keyresolver.cpp:989 keyresolver.cpp:1016
+#: keyresolver.cpp:875 keyresolver.cpp:1204 keyresolver.cpp:1231
 msgid "Unusable Encryption Keys"
 msgstr "不可用的加密密钥"
 
-#: keyresolver.cpp:712
+#: keyresolver.cpp:911
 msgid ""
 "One or more of your configured OpenPGP signing keys or S/MIME signing "
 "certificates is not usable for signing. Please reconfigure your signing keys "
@@ -4089,11 +4769,11 @@ msgstr ""
 "您所配置的 OpenPGP 签名密钥或 S/MIME 签名证书之一不可用于签名。请在身份配置对话框中重新配置您为此身份指定的签名密钥以及证书。\n"
 "如果您选择继续的话，而稍后会用到密钥，您将需要指定要使用哪个密钥。"
 
-#: keyresolver.cpp:720 keyresolver.cpp:1043 keyresolver.cpp:1059
+#: keyresolver.cpp:919 keyresolver.cpp:1258 keyresolver.cpp:1274
 msgid "Unusable Signing Keys"
 msgstr "不可用的签名密钥"
 
-#: keyresolver.cpp:980
+#: keyresolver.cpp:1195
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using OpenPGP, at least for some recipients;\n"
@@ -4106,7 +4786,7 @@ msgstr ""
 "但是，您没有为此身份配置有效的可信 OpenPGP 加密密钥。\n"
 "您仍然可以继续，而不对自己加密。但请注意，您以后将无法阅读您自己的信件。"
 
-#: keyresolver.cpp:1007
+#: keyresolver.cpp:1222
 msgid ""
 "Examination of recipient's encryption preferences yielded that the message "
 "should be encrypted using S/MIME, at least for some recipients;\n"
@@ -4119,7 +4799,7 @@ msgstr ""
 "但是，您没有为此身份配置有效的可信 S/MIME 加密证书。\n"
 "您仍然可以继续，而不对自己加密。但请注意，您以后将无法阅读您自己的信件。"
 
-#: keyresolver.cpp:1037
+#: keyresolver.cpp:1252
 msgid ""
 "Examination of recipient's signing preferences yielded that the message should "
 "be signed using OpenPGP, at least for some recipients;\n"
@@ -4129,11 +4809,11 @@ msgstr ""
 "对收件人签名首选项的检查要求信件使用 OpenPGP 签名，至少某些收件人是这么要求的；\n"
 "但是，您没有为此身份配置有效的可信 OpenPGP 签名密钥。"
 
-#: keyresolver.cpp:1044
+#: keyresolver.cpp:1259
 msgid "Do Not OpenPGP-Sign"
 msgstr "不使用 OpenPGP 签名"
 
-#: keyresolver.cpp:1053
+#: keyresolver.cpp:1268
 msgid ""
 "Examination of recipient's signing preferences yielded that the message should "
 "be signed using S/MIME, at least for some recipients;\n"
@@ -4143,11 +4823,11 @@ msgstr ""
 "对收件人签名首选项的检查要求信件使用 S/MIME 签名，至少某些收件人是这么要求的；\n"
 "但是，您没有为此身份配置有效的可信 S/MIME 签名证书。"
 
-#: keyresolver.cpp:1060
+#: keyresolver.cpp:1275
 msgid "Do Not S/MIME-Sign"
 msgstr "不使用 S/MIME 签名"
 
-#: keyresolver.cpp:1116
+#: keyresolver.cpp:1331
 msgid ""
 "Examination of recipient's signing preferences showed no common type of "
 "signature matching your available signing keys.\n"
@@ -4156,102 +4836,107 @@ msgstr ""
 "对收件人签名首选项的检查显示没有与您可用的签名密钥相匹配的公共类型。\n"
 "不签名而发送信件吗？"
 
-#: keyresolver.cpp:1120
+#: keyresolver.cpp:1335
 msgid "No signing possible"
 msgstr "没有可用的签名"
 
-#: keyresolver.cpp:1275
+#: keyresolver.cpp:1490
 msgid ""
 "You did not select an encryption key for yourself (encrypt to self). You will "
 "not be able to decrypt your own message if you encrypt it."
 msgstr "您没有为您自己选择加密密钥(对自己加密)。如果您对信件加密的话，您自己将无法解密信件。"
 
-#: keyresolver.cpp:1279 keyresolver.cpp:1303 keyresolver.cpp:1317
+#: keyresolver.cpp:1494 keyresolver.cpp:1518 keyresolver.cpp:1532
 msgid "Missing Key Warning"
 msgstr "缺少密钥警告"
 
-#: keyresolver.cpp:1280 keyresolver.cpp:1318 messagecomposer.cpp:885
-#: messagecomposer.cpp:910 messagecomposer.cpp:957
+#: keyresolver.cpp:1495 keyresolver.cpp:1533 messagecomposer.cpp:883
+#: messagecomposer.cpp:908 messagecomposer.cpp:955
 msgid "&Encrypt"
 msgstr "加密(&E)"
 
-#: keyresolver.cpp:1296
+#: keyresolver.cpp:1511
 msgid ""
 "You did not select an encryption key for the recipient of this message; "
 "therefore, the message will not be encrypted."
 msgstr "您没有为此信件的收件人选择加密密钥；因此，无法加密此信件。"
 
-#: keyresolver.cpp:1299
+#: keyresolver.cpp:1514
 msgid ""
 "You did not select an encryption key for any of the recipients of this message; "
 "therefore, the message will not be encrypted."
 msgstr "您没有为此信件的任何一个收件人选择加密密钥；因此，无法加密此信件。"
 
-#: keyresolver.cpp:1304 messagecomposer.cpp:933
+#: keyresolver.cpp:1519 messagecomposer.cpp:931
 msgid "Send &Unencrypted"
 msgstr "不加密发送(&U)"
 
-#: keyresolver.cpp:1309
+#: keyresolver.cpp:1524
 msgid ""
 "You did not select an encryption key for one of the recipients: this person "
 "will not be able to decrypt the message if you encrypt it."
 msgstr "您没有为此信件的收件人之一选择加密密钥；因此，如果您加密的话，该收件人将无法解密此信件。"
 
-#: keyresolver.cpp:1312
+#: keyresolver.cpp:1527
 msgid ""
 "You did not select encryption keys for some of the recipients: these persons "
 "will not be able to decrypt the message if you encrypt it."
 msgstr "您没有为此信件的某些收件人选择加密密钥；因此，如果您加密的话，这些收件人将无法解密此信件。"
 
-#: keyresolver.cpp:1367
+#: keyresolver.cpp:1585
 msgid "Encryption Key Selection"
 msgstr "加密密钥选择"
 
-#: keyresolver.cpp:1408
+#: keyresolver.cpp:1628
+#, fuzzy
 msgid ""
-"_: if in your language something like 'key(s)' isn't possible please use the "
-"plural in the translation\n"
-"There is a problem with the encryption key(s) for \"%1\".\n"
+"_: if in your language something like 'certificate(s)' isn't possible please "
+"use the plural in the translation\n"
+"There is a problem with the encryption certificate(s) for \"%1\".\n"
 "\n"
-"Please re-select the key(s) which should be used for this recipient."
+"Please re-select the certificate(s) which should be used for this recipient."
 msgstr ""
 "“%1”的加密密钥存在问题。\n"
 "\n"
 "请重新选择应为此收件人使用的密钥。"
 
-#: keyresolver.cpp:1452
+#: keyresolver.cpp:1678
+#, fuzzy
 msgid ""
-"_: if in your language something like 'key(s)' isn't possible please use the "
-"plural in the translation\n"
-"No valid and trusted encryption key was found for \"%1\".\n"
-"\n"
-"Select the key(s) which should be used for this recipient."
+"_: if in your language something like 'certificate(s)' isn't possible please "
+"use the plural in the translation\n"
+"<qt>No valid and trusted encryption certificate was found for \"%1\"."
+"<br/>"
+"<br/>Select the certificate(s) which should be used for this recipient. If "
+"there is no suitable certificate in the list you can also search for external "
+"certificates by clicking the button: search for external certificates.</qt>"
 msgstr ""
 "未找到“%1”的有效且信任的加密密钥。\n"
 "\n"
 "请选择应为此收件人使用的密钥。"
 
-#: keyresolver.cpp:1459
+#: keyresolver.cpp:1687
+#, fuzzy
 msgid ""
-"_: if in your language something like 'key(s)' isn't possible please use the "
-"plural in the translation\n"
-"More than one key matches \"%1\".\n"
+"_: if in your language something like 'certificate(s)' isn't possible please "
+"use the plural in the translation\n"
+"More than one certificate matches \"%1\".\n"
 "\n"
-"Select the key(s) which should be used for this recipient."
+"Select the certificate(s) which should be used for this recipient."
 msgstr ""
 "多个密钥匹配“%1”。\n"
 "\n"
 "请选择应为此收件人使用的密钥。"
 
-#: keyresolver.cpp:1567
+#: keyresolver.cpp:1800
 msgid "Name Selection"
 msgstr "姓名选择"
 
-#: keyresolver.cpp:1567
+#: keyresolver.cpp:1800
 msgid "Which name shall the contact '%1' have in your addressbook?"
 msgstr "联系人“%1”要在地址簿中以何名称出现？"
 
-#: kmaccount.cpp:49 kmaccount.cpp:381 kmsender.cpp:538
+#: kmaccount.cpp:49 kmaccount.cpp:381 kmsender.cpp:539
 #, c-format
 msgid "Executing precommand %1"
 msgstr "正在执行前置命令 %1"
@@ -4283,11 +4968,11 @@ msgstr ""
 msgid "Checking account: %1"
 msgstr "检查账户：%1"
 
-#: kmacctimap.cpp:398 kmfolderimap.cpp:858
+#: kmacctimap.cpp:398 kmfolderimap.cpp:852
 msgid " completed"
 msgstr " 已完成"
 
-#: kmacctimap.cpp:607 kmheaders.cpp:1275
+#: kmacctimap.cpp:607 kmheaders.cpp:1313
 msgid "Unable to process messages: "
 msgstr "无法处理信件："
 
@@ -4318,11 +5003,11 @@ msgstr "传送失败：无法锁住 %1。"
 msgid "Moving message %3 of %2 from %1."
 msgstr "正在从 %1 移动 %2 封信件中的第 %3 封"
 
-#: kmacctlocal.cpp:244
+#: kmacctlocal.cpp:245
 msgid "<qt>Cannot remove mail from mailbox <b>%1</b>:<br>%2</qt>"
 msgstr "<qt>不能从邮箱 <b>%1</b> 中删除邮件：<br>%2</qt>"
 
-#: kmacctlocal.cpp:254
+#: kmacctlocal.cpp:255
 msgid ""
 "_n: Fetched 1 message from mailbox %1.\n"
 "Fetched %n messages from mailbox %1."
@@ -4362,117 +5047,132 @@ msgstr "已断开的 IMAP(&D)"
 msgid "&Maildir mailbox"
 msgstr "Maildir 邮箱(&M)"
 
-#: kmailicalifaceimpl.cpp:90 kmfolderdia.cpp:448 newfolderdialog.cpp:125
+#: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:506 newfolderdialog.cpp:130
 msgid "Mail"
 msgstr "邮件"
 
-#: kmailicalifaceimpl.cpp:91 kmfolderdia.cpp:449 newfolderdialog.cpp:126
+#: kmailicalifaceimpl.cpp:94 kmfolderdia.cpp:507 newfolderdialog.cpp:131
 msgid "Calendar"
 msgstr "日历"
 
-#: kmailicalifaceimpl.cpp:92 kmfolderdia.cpp:450 newfolderdialog.cpp:127
+#: kmailicalifaceimpl.cpp:95 kmfolderdia.cpp:508 newfolderdialog.cpp:132
 msgid "Contacts"
 msgstr "联系人"
 
-#: kmailicalifaceimpl.cpp:93 kmfolderdia.cpp:451 newfolderdialog.cpp:128
+#: kmailicalifaceimpl.cpp:96 kmfolderdia.cpp:509 newfolderdialog.cpp:133
 msgid "Notes"
 msgstr "备忘"
 
-#: kmailicalifaceimpl.cpp:94 kmfolderdia.cpp:452 newfolderdialog.cpp:129
+#: kmailicalifaceimpl.cpp:97 kmfolderdia.cpp:510 newfolderdialog.cpp:134
 msgid "Tasks"
 msgstr "任务"
 
-#: kmailicalifaceimpl.cpp:95 kmfolderdia.cpp:453 newfolderdialog.cpp:130
+#: kmailicalifaceimpl.cpp:98 kmfolderdia.cpp:511 newfolderdialog.cpp:135
 msgid "Journal"
 msgstr "日记"
 
-#: kmailicalifaceimpl.cpp:667
+#: kmailicalifaceimpl.cpp:684
 msgid "%1's %2"
 msgstr "%1 的 %2"
 
-#: kmailicalifaceimpl.cpp:681
+#: kmailicalifaceimpl.cpp:700
 #, fuzzy
 msgid "My %1 (%2)"
 msgstr "我的 %1"
 
-#: kmailicalifaceimpl.cpp:685
+#: kmailicalifaceimpl.cpp:704 kmailicalifaceimpl.cpp:708
 #, c-format
 msgid "My %1"
 msgstr "我的 %1"
 
-#: kmailicalifaceimpl.cpp:1726
+#: kmailicalifaceimpl.cpp:1777
 msgid ""
 "KMail will now create the required groupware folders as subfolders of %1; if "
 "you do not want this, cancel and the IMAP resource will be disabled"
 msgstr "KMail 将在 %1 下创建群件文件夹；如果您不想要这样做，请取消，IMAP 资源将被禁用"
 
-#: kmailicalifaceimpl.cpp:1736
+#: kmailicalifaceimpl.cpp:1787
 msgid "%1: no folder found. It will be created."
 msgstr "%1：未找到文件夹。将创建该文件夹。"
 
-#: kmailicalifaceimpl.cpp:1738
+#: kmailicalifaceimpl.cpp:1789
 msgid "%1: found folder %2. It will be set as the main groupware folder."
 msgstr "%1：找到了文件夹 %2。该文件夹将被设定为主群件文件夹。"
 
-#: kmailicalifaceimpl.cpp:1744
+#: kmailicalifaceimpl.cpp:1795
 msgid ""
 "<qt>KMail found the following groupware folders in %1 and needs to perform the "
 "following operations: %2"
 "<br>If you do not want this, cancel and the IMAP resource will be disabled"
 msgstr "<qt>KMail 在 %1 下找到了下列群件文件夹，并即将执行下列操作：%2<br>如果您不想要这样做，请取消，IMAP 资源将被禁用"
 
-#: kmailicalifaceimpl.cpp:1751
+#: kmailicalifaceimpl.cpp:1802
 msgid "Standard Groupware Folders"
 msgstr "标准群件文件夹"
 
-#: kmailicalifaceimpl.cpp:1953
+#: kmailicalifaceimpl.cpp:1992
+#, fuzzy
+msgid "Default folder"
+msgstr "删除文件夹"
+
+#: kmailicalifaceimpl.cpp:1993
+msgid "There are multiple %1 default folders, please choose one:"
+msgstr ""
+
+#: kmailicalifaceimpl.cpp:2019
 msgid "You do not have read/write permission to your %1 folder."
 msgstr "您没有对您的 %1 文件夹读写的权限。"
 
-#: kmailicalifaceimpl.cpp:2007
+#: kmailicalifaceimpl.cpp:2073
 msgid "You do not have read/write permission to your folder."
 msgstr "您没有对您的文件夹读写的权限。"
 
-#: kmcommands.cpp:300
+#: kmcommands.cpp:304
 msgid "Please wait"
 msgstr "请等待"
 
-#: kmcommands.cpp:302 kmcommands.cpp:403
+#: kmcommands.cpp:306 kmcommands.cpp:407
 #, c-format
 msgid ""
 "_n: Please wait while the message is transferred\n"
 "Please wait while the %n messages are transferred"
 msgstr "请稍等，正在传送 %n 封信件"
 
-#: kmcommands.cpp:594
+#: kmcommands.cpp:598
 msgid "Address copied to clipboard."
 msgstr "地址已复制到剪贴板中。"
 
-#: kmcommands.cpp:601
+#: kmcommands.cpp:605
 msgid "URL copied to clipboard."
 msgstr "URL 已复制到剪贴板中。"
 
-#: kmcommands.cpp:638
+#: kmcommands.cpp:642
 msgid "<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>"
 msgstr "<qt>文件 <b>%1</b> 已经存在。<br>您要替换它吗？</qt>"
 
-#: kmcommands.cpp:639 kmcommands.cpp:939 kmkernel.cpp:1940
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2050
 msgid "Save to File"
 msgstr "保存到文件"
 
-#: kmcommands.cpp:639 kmcommands.cpp:939 kmkernel.cpp:1940
+#: kmcommands.cpp:643 kmcommands.cpp:966 kmkernel.cpp:2050
 msgid "&Replace"
 msgstr "替换(&R)"
 
-#: kmcommands.cpp:739
+#: kmcommands.cpp:743
 msgid "Message as Plain Text"
 msgstr "纯文本信件"
 
-#: kmcommands.cpp:882
+#: kmcommands.cpp:775
+msgid ""
+"*.mbox|email messages (*.mbox)\n"
+"*|all files (*)"
+msgstr ""
+
+#: kmcommands.cpp:908
 msgid "The message was removed while saving it. It has not been saved."
 msgstr "此信件在保存过程中被删除，故未被保存。"
 
-#: kmcommands.cpp:938 kmkernel.cpp:1939
+#: kmcommands.cpp:965 kmkernel.cpp:2049
 msgid ""
 "File %1 exists.\n"
 "Do you want to replace it?"
@@ -4480,19 +5180,19 @@ msgstr ""
 "文件 %1 已经存在。\n"
 "您要替换它吗？"
 
-#: kmcommands.cpp:982
+#: kmcommands.cpp:1009
 msgid "Open Message"
 msgstr "打开信件"
 
-#: kmcommands.cpp:1020 kmcommands.cpp:1048
+#: kmcommands.cpp:1047 kmcommands.cpp:1075
 msgid "The file does not contain a message."
 msgstr "文件不包含信件。"
 
-#: kmcommands.cpp:1066
+#: kmcommands.cpp:1093
 msgid "The file contains multiple messages. Only the first message is shown."
 msgstr "文件包含多封信。仅会显示第一封信。"
 
-#: kmcommands.cpp:1363
+#: kmcommands.cpp:1404
 msgid ""
 "\n"
 "This is a MIME digest forward. The content of the message is contained in the "
@@ -4505,111 +5205,111 @@ msgstr ""
 "\n"
 "\n"
 
-#: kmcommands.cpp:1697 kmheaders.cpp:1407
+#: kmcommands.cpp:1750 kmheaders.cpp:1445
 msgid "Filtering messages"
 msgstr "过滤信件"
 
-#: kmcommands.cpp:1705 kmheaders.cpp:1415
+#: kmcommands.cpp:1758 kmheaders.cpp:1453
 msgid "Filtering message %1 of %2"
 msgstr "正在过滤%2 封信件中的第 %1 封"
 
-#: kmcommands.cpp:1715
+#: kmcommands.cpp:1768
 msgid "Not enough free disk space?"
 msgstr "没有足够的磁盘空间。"
 
-#: kmcommands.cpp:1881 kmfoldertree.cpp:1891
+#: kmcommands.cpp:1934 kmfoldertree.cpp:1929
 msgid "Move to This Folder"
 msgstr "移动到此文件夹"
 
-#: kmcommands.cpp:1883 kmfoldertree.cpp:1893
+#: kmcommands.cpp:1936 kmfoldertree.cpp:1931
 msgid "Copy to This Folder"
 msgstr "复制到此文件夹"
 
-#: kmcommands.cpp:1959
+#: kmcommands.cpp:2012
 msgid "Corrupt IMAP cache detected in folder %1. Copying of messages aborted."
 msgstr "在文件夹 %1 中检测到 IMAP 缓存已损坏。信件复制已中止。"
 
-#: kmcommands.cpp:2133
+#: kmcommands.cpp:2186
 msgid "Moving messages"
 msgstr "移动信件"
 
-#: kmcommands.cpp:2133
+#: kmcommands.cpp:2186
 msgid "Deleting messages"
 msgstr "删除信件"
 
-#: kmcommands.cpp:2406
+#: kmcommands.cpp:2471
 msgid "Opening URL..."
 msgstr "正在打开 URL..."
 
-#: kmcommands.cpp:2413
+#: kmcommands.cpp:2478
 msgid "<qt>Do you really want to execute <b>%1</b>?</qt>"
 msgstr "<qt>您真的要执行 <b>%1</b>吗？</qt>"
 
-#: kmcommands.cpp:2414
+#: kmcommands.cpp:2479
 msgid "Execute"
 msgstr "执行"
 
-#: kmcommands.cpp:2495
+#: kmcommands.cpp:2561
 msgid "Found no attachments to save."
 msgstr "没有发现要保存的附件。"
 
-#: kmcommands.cpp:2508
+#: kmcommands.cpp:2574
 msgid "Save Attachments To"
 msgstr "附件保存至"
 
-#: kmcommands.cpp:2528
+#: kmcommands.cpp:2594
 msgid ""
 "_: filename for an unnamed attachment\n"
 "attachment.1"
 msgstr "attachment.1"
 
-#: kmcommands.cpp:2556
+#: kmcommands.cpp:2622
 msgid ""
 "_: filename for the %1-th unnamed attachment\n"
 "attachment.%1"
 msgstr "attachment.%1"
 
-#: kmcommands.cpp:2595
+#: kmcommands.cpp:2661
 msgid "A file named %1 already exists. Do you want to overwrite it?"
 msgstr "名为 %1 的文件已经存在。您要覆盖它吗？"
 
-#: kmcommands.cpp:2597
+#: kmcommands.cpp:2663
 msgid "File Already Exists"
 msgstr "文件已存在"
 
-#: kmcommands.cpp:2597 util.h:211
+#: kmcommands.cpp:2663 util.h:211
 msgid "&Overwrite"
 msgstr "覆盖(&O)"
 
-#: kmcommands.cpp:2619
+#: kmcommands.cpp:2685
 msgid ""
 "The part %1 of the message is encrypted. Do you want to keep the encryption "
 "when saving?"
 msgstr "信件的第 %1 部分经过加密。您想要在保存时保留加密吗？"
 
-#: kmcommands.cpp:2621 kmcommands.cpp:2630
+#: kmcommands.cpp:2687 kmcommands.cpp:2696
 msgid "KMail Question"
 msgstr "KMail 提问"
 
-#: kmcommands.cpp:2621
+#: kmcommands.cpp:2687
 msgid "Keep Encryption"
 msgstr "保持加密"
 
-#: kmcommands.cpp:2621 kmcommands.cpp:2630
+#: kmcommands.cpp:2687 kmcommands.cpp:2696
 msgid "Do Not Keep"
 msgstr "不保持"
 
-#: kmcommands.cpp:2628
+#: kmcommands.cpp:2694
 msgid ""
 "The part %1 of the message is signed. Do you want to keep the signature when "
 "saving?"
 msgstr "信件的第 %1 部分经过签名。您想要在保存时保留签名吗？"
 
-#: kmcommands.cpp:2630
+#: kmcommands.cpp:2696
 msgid "Keep Signature"
 msgstr "保持签名"
 
-#: kmcommands.cpp:2703
+#: kmcommands.cpp:2769
 msgid ""
 "_: %2 is detailed error description\n"
 "Could not write the file %1:\n"
@@ -4618,19 +5318,19 @@ msgstr ""
 "无法写入文件 %1：\n"
 "%2"
 
-#: kmcommands.cpp:2728
+#: kmcommands.cpp:2794
 #, c-format
 msgid "Could not write the file %1."
 msgstr "无法写入文件 %1。"
 
-#: kmcommands.cpp:2952
+#: kmcommands.cpp:3018
 msgid ""
 "There is no Address Book entry for this email address. Add them to the Address "
 "Book and then add instant messaging addresses using your preferred messaging "
 "client."
 msgstr "没有此电子邮件地址所对应的地址簿项。请将其添加到地址簿，然后使用您喜爱的信使程序将即时消息地址添加进来。"
 
-#: kmcommands.cpp:2955
+#: kmcommands.cpp:3021
 msgid ""
 "More than one Address Book entry uses this email address:\n"
 " %1\n"
@@ -4640,67 +5340,59 @@ msgstr ""
 " %1\n"
 " 无法确定正与谁交谈。"
 
-#: kmcommands.cpp:3179 kmcomposewin.cpp:5128 objecttreeparser.cpp:1632
+#: kmcommands.cpp:3245 kmcomposewin.cpp:5317 objecttreeparser.cpp:1858
 msgid ""
 "Chiasmus backend does not offer the \"x-obtain-keys\" function. Please report "
 "this bug."
 msgstr "Chiasmus 后端无法提供“x-obtain-keys”功能，请报告此错误。"
 
-#: kmcommands.cpp:3181 kmcommands.cpp:3186 kmcommands.cpp:3195
-#: kmcommands.cpp:3204 kmcommands.cpp:3222 kmcommands.cpp:3233
-#: kmcommands.cpp:3273 kmcomposewin.cpp:5130 kmcomposewin.cpp:5135
-#: kmcomposewin.cpp:5144 messagecomposer.cpp:558 messagecomposer.cpp:566
-#: messagecomposer.cpp:580 objecttreeparser.cpp:1638
+#: kmcommands.cpp:3247 kmcommands.cpp:3252 kmcommands.cpp:3261
+#: kmcommands.cpp:3270 kmcommands.cpp:3288 kmcommands.cpp:3299
+#: kmcommands.cpp:3339 kmcomposewin.cpp:5319 kmcomposewin.cpp:5324
+#: kmcomposewin.cpp:5333 messagecomposer.cpp:559 messagecomposer.cpp:567
+#: messagecomposer.cpp:581 objecttreeparser.cpp:1864
 msgid "Chiasmus Backend Error"
 msgstr "Chiasmus 后端出错"
 
-#: kmcommands.cpp:3192 kmcomposewin.cpp:5141 objecttreeparser.cpp:1644
+#: kmcommands.cpp:3258 kmcomposewin.cpp:5330 objecttreeparser.cpp:1870
 msgid ""
 "Unexpected return value from Chiasmus backend: The \"x-obtain-keys\" function "
 "did not return a string list. Please report this bug."
 msgstr "Chiasmus 后端有意外返回值：“x-obtain-keys”功能未返回字符串列表。请报告错误。"
 
-#: kmcommands.cpp:3201 kmcomposewin.cpp:5150 objecttreeparser.cpp:1652
+#: kmcommands.cpp:3267 kmcomposewin.cpp:5339 objecttreeparser.cpp:1878
 msgid ""
 "No keys have been found. Please check that a valid key path has been set in the "
 "Chiasmus configuration."
 msgstr "未找到密钥。请检查 Chiasmus 配置中是否设定了有效的密钥路径。"
 
-#: kmcommands.cpp:3208 objecttreeparser.cpp:1659
+#: kmcommands.cpp:3274 objecttreeparser.cpp:1885
 msgid "Chiasmus Decryption Key Selection"
 msgstr "Chiasmus 解密密钥选择"
 
-#: kmcommands.cpp:3220 objecttreeparser.cpp:1671
+#: kmcommands.cpp:3286 objecttreeparser.cpp:1897
 msgid ""
 "Chiasmus backend does not offer the \"x-decrypt\" function. Please report this "
 "bug."
 msgstr "Chiasmus 后端不提供“x-decrypt”功能。请报告错误。"
 
-#: kmcommands.cpp:3231 objecttreeparser.cpp:1679
+#: kmcommands.cpp:3297 objecttreeparser.cpp:1905
 msgid ""
 "The \"x-decrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr "“x-decrypt”功能不接受意外参数。请报告错误。"
 
-#: kmcommands.cpp:3239 kmcommands.cpp:3265 objecttreeparser.cpp:1685
+#: kmcommands.cpp:3305 kmcommands.cpp:3331 objecttreeparser.cpp:1911
 msgid "Chiasmus Decryption Error"
 msgstr "Chiasmus 解密错误"
 
-#: kmcommands.cpp:3270 objecttreeparser.cpp:1691
+#: kmcommands.cpp:3336 objecttreeparser.cpp:1917
 msgid ""
 "Unexpected return value from Chiasmus backend: The \"x-decrypt\" function did "
 "not return a byte array. Please report this bug."
 msgstr "Chiasmus 后端返回了意外返回值：“x-decrypt”功能未返回字节数组。请报告错误。"
 
-#: kmcommands.cpp:3425
-msgid "This attachment has been deleted."
-msgstr "附件已被删除。"
-
-#: kmcommands.cpp:3427
-msgid "The attachment '%1' has been deleted."
-msgstr "附件“%1”已被删除。"
-
-#: kmcommands.cpp:3541
+#: kmcommands.cpp:3581
 msgid ""
 "From: %1\n"
 "To: %2\n"
@@ -4710,46 +5402,122 @@ msgstr ""
 "收件人：%2\n"
 "主题：%3"
 
-#: kmcommands.cpp:3551
+#: kmcommands.cpp:3591
 #, c-format
 msgid "Mail: %1"
 msgstr "邮件：%1"
 
-#: kmcomposewin.cpp:233
+#: kmcomposewin.cpp:207
+#, fuzzy
+msgid "Select an identity for this message"
+msgstr "使用 HTML 排版此信件。"
+
+#: kmcomposewin.cpp:211
+msgid "Select the dictionary to use when spell-checking this message"
+msgstr ""
+
+#: kmcomposewin.cpp:216
+msgid "Select the sent-mail folder where a copy of this message will be saved"
+msgstr ""
+
+#: kmcomposewin.cpp:220
+msgid "Select the outgoing account to use for sending this message"
+msgstr ""
+
+#: kmcomposewin.cpp:224
+msgid "Set the \"From:\" email address for this message"
+msgstr ""
+
+#: kmcomposewin.cpp:228
+msgid "Set the \"Reply-To:\" email address for this message"
+msgstr ""
+
+#: kmcomposewin.cpp:248
 msgid "Select email address(es)"
 msgstr "选择电子邮件地址"
 
-#: kmcomposewin.cpp:286
+#: kmcomposewin.cpp:295
+#, fuzzy
+msgid "Set a subject for this message"
+msgstr "设置信件主题"
+
+#: kmcomposewin.cpp:297
+msgid "&Identity:"
+msgstr "身份(&I)："
+
+#: kmcomposewin.cpp:298
+msgid "&Dictionary:"
+msgstr "字典(&D)："
+
+#: kmcomposewin.cpp:299
+msgid "&Sent-Mail folder:"
+msgstr "已发文件夹(&S)："
+
+#: kmcomposewin.cpp:300
+msgid "&Mail transport:"
+msgstr "邮件传送(&M)："
+
+#: kmcomposewin.cpp:301
+msgid ""
+"_: sender address field\n"
+"&From:"
+msgstr "来自(&F)："
+
+#: kmcomposewin.cpp:302
+msgid "&Reply to:"
+msgstr "回复给(&R)："
+
+#: kmcomposewin.cpp:303
+msgid "S&ubject:"
+msgstr "主题(&U)："
+
+#: kmcomposewin.cpp:305
 msgid "Sticky"
 msgstr "粘附"
 
-#: kmcomposewin.cpp:367 kmfoldertree.cpp:1681 kmheaders.cpp:138
-#: kmheaders.cpp:183 kmmainwidget.cpp:424 kmmainwidget.cpp:431
-#: kmmainwidget.cpp:438 kmmimeparttree.cpp:67 kmpopfiltercnfrmdlg.cpp:43
+#: kmcomposewin.cpp:308
+msgid "Use the selected value as your identity for future messages"
+msgstr ""
+
+#: kmcomposewin.cpp:311
+msgid "Use the selected value as your sent-mail folder for future messages"
+msgstr ""
+
+#: kmcomposewin.cpp:314
+msgid "Use the selected value as your outgoing account for future messages"
+msgstr ""
+
+#: kmcomposewin.cpp:317
+msgid "Use the selected value as your dictionary for future messages"
+msgstr ""
+
+#: kmcomposewin.cpp:398 kmfoldertree.cpp:1719 kmheaders.cpp:141
+#: kmheaders.cpp:187 kmmainwidget.cpp:416 kmmainwidget.cpp:423
+#: kmmainwidget.cpp:430 kmmimeparttree.cpp:67 kmpopfiltercnfrmdlg.cpp:43
 msgid "Size"
 msgstr "大小"
 
-#: kmcomposewin.cpp:368 kmmimeparttree.cpp:66
+#: kmcomposewin.cpp:399 kmmimeparttree.cpp:66
 msgid "Encoding"
 msgstr "编码"
 
-#: kmcomposewin.cpp:375 kmcomposewin.cpp:3247
+#: kmcomposewin.cpp:406 kmcomposewin.cpp:3327
 msgid "Compress"
 msgstr "压缩"
 
-#: kmcomposewin.cpp:377
+#: kmcomposewin.cpp:408
 msgid "Encrypt"
 msgstr "加密"
 
-#: kmcomposewin.cpp:379
+#: kmcomposewin.cpp:410
 msgid "Sign"
 msgstr "签名"
 
-#: kmcomposewin.cpp:590 kmcomposewin.cpp:3616
+#: kmcomposewin.cpp:621 kmcomposewin.cpp:3703
 msgid "Name of the attachment:"
 msgstr "附件名："
 
-#: kmcomposewin.cpp:828
+#: kmcomposewin.cpp:868
 msgid ""
 "Autosaving the message as %1 failed.\n"
 "Reason: %2"
@@ -4757,60 +5525,24 @@ msgstr ""
 "自动将信件保存为 %1 失败。\n"
 "原因：%2"
 
-#: kmcomposewin.cpp:832
+#: kmcomposewin.cpp:872
 msgid "Autosaving Failed"
 msgstr "自动保存失败"
 
-#: kmcomposewin.cpp:970
-msgid "&Identity:"
-msgstr "身份(&I)："
-
-#: kmcomposewin.cpp:974
-msgid "&Dictionary:"
-msgstr "字典(&D)："
-
-#: kmcomposewin.cpp:978
-msgid "&Sent-Mail folder:"
-msgstr "已发文件夹(&S)："
-
-#: kmcomposewin.cpp:982
-msgid "&Mail transport:"
-msgstr "邮件传送(&M)："
-
-#: kmcomposewin.cpp:986
-msgid ""
-"_: sender address field\n"
-"&From:"
-msgstr "来自(&F)："
-
-#: kmcomposewin.cpp:992
-msgid "&Reply to:"
-msgstr "回复给(&R)："
-
-#: kmcomposewin.cpp:1000
-msgid ""
-"_: recipient address field\n"
-"&To:"
-msgstr "寄给(&T)："
-
-#: kmcomposewin.cpp:1002
+#: kmcomposewin.cpp:1042
 msgid "Primary Recipients"
 msgstr "主收件人"
 
-#: kmcomposewin.cpp:1003
+#: kmcomposewin.cpp:1043
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email.</qt>"
 msgstr "<qt>您在此输入的电子邮件地址将会收到邮件的副本。</qt>"
 
-#: kmcomposewin.cpp:1010
-msgid "&Copy to (CC):"
-msgstr "抄送到(&C)："
-
-#: kmcomposewin.cpp:1012
+#: kmcomposewin.cpp:1052
 msgid "Additional Recipients"
 msgstr "额外收件人"
 
-#: kmcomposewin.cpp:1013
+#: kmcomposewin.cpp:1053
 msgid ""
 "<qt>The email addresses you put in this field receive a copy of the email. "
 "Technically it is the same thing as putting all the addresses in the <b>To:</b> "
@@ -4820,345 +5552,356 @@ msgstr ""
 "<qt>填写在此字段处的邮件地址都会收到一份邮件。技术上来说，这跟将全部邮件地址放在<b>收件人：</b>"
 "字段处的结果一样，而不同之处只是象征性的，抄送(CC)的接收人只是旁听者，而不是主要的收件人。</qt>"
 
-#: kmcomposewin.cpp:1025
-msgid "&Blind copy to (BCC):"
-msgstr "密送到(&B)："
-
-#: kmcomposewin.cpp:1027
+#: kmcomposewin.cpp:1067
 msgid "Hidden Recipients"
 msgstr "隐藏收件人"
 
-#: kmcomposewin.cpp:1028
+#: kmcomposewin.cpp:1068
 msgid ""
 "<qt>Essentially the same thing as the <b>Copy To:</b> "
 "field but differs in that all other recipients do not see who receives a blind "
 "copy.</qt>"
 msgstr "<qt>实际上与<b>抄送到：</b>字段一样，不同之处为，其他收件人并不知道谁收到这份邮件。</qt>"
 
-#: kmcomposewin.cpp:1060
-msgid "S&ubject:"
-msgstr "主题(&U)："
-
-#: kmcomposewin.cpp:1198 kmcomposewin.cpp:1220
+#: kmcomposewin.cpp:1236 kmcomposewin.cpp:1258
 msgid "&Send Mail"
 msgstr "发送邮件(&S)"
 
-#: kmcomposewin.cpp:1202 kmcomposewin.cpp:1224
+#: kmcomposewin.cpp:1240 kmcomposewin.cpp:1262
 msgid "&Send Mail Via"
 msgstr "发送邮件的身份(&S)"
 
-#: kmcomposewin.cpp:1205 kmcomposewin.cpp:1214 kmcomposewin.cpp:4329
-#: redirectdialog.cpp:83
+#: kmcomposewin.cpp:1243 kmcomposewin.cpp:1252 kmcomposewin.cpp:4459
+#: redirectdialog.cpp:84
 msgid "Send &Later"
 msgstr "稍后发送(&L)"
 
-#: kmcomposewin.cpp:1207 kmcomposewin.cpp:1217
+#: kmcomposewin.cpp:1245 kmcomposewin.cpp:1255
 msgid "Send &Later Via"
 msgstr "稍后发送的身份(&L)"
 
-#: kmcomposewin.cpp:1255
+#: kmcomposewin.cpp:1293
 msgid "Save as &Draft"
 msgstr "保存为草稿(&D)"
 
-#: kmcomposewin.cpp:1258
+#: kmcomposewin.cpp:1296
 msgid "Save as &Template"
 msgstr "保存为模板(&T)"
 
-#: kmcomposewin.cpp:1261
+#: kmcomposewin.cpp:1299
 msgid "&Insert File..."
 msgstr "插入文件(&I)..."
 
-#: kmcomposewin.cpp:1264
+#: kmcomposewin.cpp:1302
 msgid "&Insert File Recent"
 msgstr "插入最近的文件(&I)"
 
-#: kmcomposewin.cpp:1271
+#: kmcomposewin.cpp:1309
 msgid "&Address Book"
 msgstr "地址簿(&A)"
 
-#: kmcomposewin.cpp:1274
+#: kmcomposewin.cpp:1312
 msgid "&New Composer"
 msgstr "新建撰写器(&N)"
 
-#: kmcomposewin.cpp:1278
+#: kmcomposewin.cpp:1316
 msgid "New Main &Window"
 msgstr "新建主窗口(&W)"
 
-#: kmcomposewin.cpp:1283
+#: kmcomposewin.cpp:1321
 msgid "Select &Recipients..."
 msgstr "选择收件人(&R)..."
 
-#: kmcomposewin.cpp:1285
+#: kmcomposewin.cpp:1323
 msgid "Save &Distribution List..."
 msgstr "保存分发列表(&D)..."
 
-#: kmcomposewin.cpp:1307
+#: kmcomposewin.cpp:1345
 msgid "Pa&ste as Quotation"
 msgstr "粘贴为引用(&S)"
 
-#: kmcomposewin.cpp:1310
+#: kmcomposewin.cpp:1348
 msgid "Paste as Attac&hment"
 msgstr "粘贴为附件(&H)"
 
-#: kmcomposewin.cpp:1313
+#: kmcomposewin.cpp:1351
 msgid "Add &Quote Characters"
 msgstr "添加引用字符(&Q)"
 
-#: kmcomposewin.cpp:1316
+#: kmcomposewin.cpp:1356
 msgid "Re&move Quote Characters"
 msgstr "删除引用字符(&M)"
 
-#: kmcomposewin.cpp:1320
+#: kmcomposewin.cpp:1362
 msgid "Cl&ean Spaces"
 msgstr "清理空格(&E)"
 
-#. i18n: file kmail.kcfg line 341
-#: kmcomposewin.cpp:1323 kmreaderwin.cpp:683 rc.cpp:779
+#. i18n: file kmail.kcfg line 358
+#: kmcomposewin.cpp:1365 kmreaderwin.cpp:617 rc.cpp:795
 #, no-c-format
 msgid "Use Fi&xed Font"
 msgstr "使用固定宽度字体(&X)"
 
-#: kmcomposewin.cpp:1328
+#: kmcomposewin.cpp:1370
 msgid "&Urgent"
 msgstr "紧急(&U)"
 
-#: kmcomposewin.cpp:1331
+#: kmcomposewin.cpp:1373
 msgid "&Request Disposition Notification"
 msgstr "请求处理回执(&R)"
 
-#: kmcomposewin.cpp:1336
+#: kmcomposewin.cpp:1378
 msgid "Se&t Encoding"
 msgstr "设置编码(&T)"
 
-#: kmcomposewin.cpp:1339
+#: kmcomposewin.cpp:1381
 msgid "&Wordwrap"
 msgstr "自动换行(&W)"
 
-#: kmcomposewin.cpp:1344
+#: kmcomposewin.cpp:1386
 msgid "&Snippets"
 msgstr "片断(&S)"
 
-#: kmcomposewin.cpp:1350
+#: kmcomposewin.cpp:1392
 msgid "&Automatic Spellchecking"
 msgstr "自动拼写检查(&A)"
 
-#: kmcomposewin.cpp:1360
+#: kmcomposewin.cpp:1402
 msgid "Auto-Detect"
 msgstr "自动检测"
 
-#: kmcomposewin.cpp:1365
+#: kmcomposewin.cpp:1407
 msgid "Formatting (HTML)"
 msgstr "格式 (HTML)"
 
-#: kmcomposewin.cpp:1369
+#: kmcomposewin.cpp:1411
 msgid "&All Fields"
 msgstr "全部域(&A)"
 
-#: kmcomposewin.cpp:1372
+#: kmcomposewin.cpp:1414
 msgid "&Identity"
 msgstr "身份(&I)"
 
-#: kmcomposewin.cpp:1375
+#: kmcomposewin.cpp:1417
 msgid "&Dictionary"
 msgstr "字典(&D)"
 
-#: kmcomposewin.cpp:1378
+#: kmcomposewin.cpp:1420
 msgid "&Sent-Mail Folder"
 msgstr "已发文件夹(&S)"
 
-#: kmcomposewin.cpp:1381
+#: kmcomposewin.cpp:1423
 msgid "&Mail Transport"
 msgstr "邮件传送(&M)"
 
-#: kmcomposewin.cpp:1384
+#: kmcomposewin.cpp:1426
 msgid "&From"
 msgstr "发件人(&F)"
 
-#: kmcomposewin.cpp:1387
+#: kmcomposewin.cpp:1429
 msgid "&Reply To"
 msgstr "回复到(&R)"
 
-#: kmcomposewin.cpp:1391
+#: kmcomposewin.cpp:1433
 msgid "&To"
 msgstr "收件人(&T)"
 
-#: kmcomposewin.cpp:1394
+#: kmcomposewin.cpp:1436
 msgid "&CC"
 msgstr "抄送(&C)"
 
-#: kmcomposewin.cpp:1397
+#: kmcomposewin.cpp:1439
 msgid "&BCC"
 msgstr "密送(&B)"
 
-#: kmcomposewin.cpp:1401
+#: kmcomposewin.cpp:1443
 msgid "S&ubject"
 msgstr "主题(&U)"
 
-#: kmcomposewin.cpp:1406
+#: kmcomposewin.cpp:1448
 msgid "Append S&ignature"
 msgstr "附加签名(&I)"
 
-#: kmcomposewin.cpp:1409
+#: kmcomposewin.cpp:1451
 msgid "Prepend S&ignature"
 msgstr "前置签名(&I)"
 
-#: kmcomposewin.cpp:1413
+#: kmcomposewin.cpp:1455
 msgid "Insert Signature At C&ursor Position"
 msgstr "在光标位置插入签名(&U)"
 
-#: kmcomposewin.cpp:1417
+#: kmcomposewin.cpp:1459
 msgid "Attach &Public Key..."
 msgstr "附加公钥(&P)..."
 
-#: kmcomposewin.cpp:1420
+#: kmcomposewin.cpp:1462
 msgid "Attach &My Public Key"
 msgstr "附加我的公钥(&M)"
 
-#: kmcomposewin.cpp:1423 kmcomposewin.cpp:2272
+#: kmcomposewin.cpp:1465 kmcomposewin.cpp:2337
 msgid "&Attach File..."
 msgstr "附加文件(&A)..."
 
-#: kmcomposewin.cpp:1426
+#: kmcomposewin.cpp:1468
 msgid "&Remove Attachment"
 msgstr "删除附件(&R)"
 
-#: kmcomposewin.cpp:1429
+#: kmcomposewin.cpp:1471
 msgid "&Save Attachment As..."
 msgstr "附件另存为(&S)..."
 
-#: kmcomposewin.cpp:1432
+#: kmcomposewin.cpp:1474
 msgid "Attachment Pr&operties"
 msgstr "附件属性(&O)"
 
-#: kmcomposewin.cpp:1442
+#: kmcomposewin.cpp:1484
 msgid "&Spellchecker..."
 msgstr "拼写检查器(&S)..."
 
-#: kmcomposewin.cpp:1446 kmcomposewin.cpp:1449
+#: kmcomposewin.cpp:1488 kmcomposewin.cpp:1491
 msgid "Encrypt Message with Chiasmus..."
 msgstr "用 Chiasmus 加密信件..."
 
-#: kmcomposewin.cpp:1457
+#: kmcomposewin.cpp:1499
 msgid "&Encrypt Message"
 msgstr "加密信件(&E)"
 
-#: kmcomposewin.cpp:1460
+#: kmcomposewin.cpp:1502
 msgid "&Sign Message"
 msgstr "给信件签名(&S)"
 
-#: kmcomposewin.cpp:1507
+#: kmcomposewin.cpp:1549
 msgid "&Cryptographic Message Format"
 msgstr "密文信件格式(&C)"
 
-#: kmcomposewin.cpp:1515 kmcomposewin.cpp:4970
+#: kmcomposewin.cpp:1554
+msgid "Select a cryptographic format for this message"
+msgstr ""
+
+#: kmcomposewin.cpp:1558 kmcomposewin.cpp:5159
 msgid "Standard"
 msgstr "标准"
 
-#: kmcomposewin.cpp:1516 kmcomposewin.cpp:4972
+#: kmcomposewin.cpp:1559 kmcomposewin.cpp:5161
 msgid "Bulleted List (Disc)"
 msgstr "项目符号(圆点)"
 
-#: kmcomposewin.cpp:1517 kmcomposewin.cpp:4974
+#: kmcomposewin.cpp:1560 kmcomposewin.cpp:5163
 msgid "Bulleted List (Circle)"
 msgstr "项目符号(圆圈)"
 
-#: kmcomposewin.cpp:1518 kmcomposewin.cpp:4976
+#: kmcomposewin.cpp:1561 kmcomposewin.cpp:5165
 msgid "Bulleted List (Square)"
 msgstr "项目符号(方点)"
 
-#: kmcomposewin.cpp:1519 kmcomposewin.cpp:4978
+#: kmcomposewin.cpp:1562 kmcomposewin.cpp:5167
 msgid "Ordered List (Decimal)"
 msgstr "编号列表(数字)"
 
-#: kmcomposewin.cpp:1520 kmcomposewin.cpp:4980
+#: kmcomposewin.cpp:1563 kmcomposewin.cpp:5169
 msgid "Ordered List (Alpha lower)"
 msgstr "编号列表(小写字母)"
 
-#: kmcomposewin.cpp:1521 kmcomposewin.cpp:4982
+#: kmcomposewin.cpp:1564 kmcomposewin.cpp:5171
 msgid "Ordered List (Alpha upper)"
 msgstr "编号列表(大写字母)"
 
-#: kmcomposewin.cpp:1523
+#: kmcomposewin.cpp:1566
 msgid "Select Style"
 msgstr "选择样式"
 
-#: kmcomposewin.cpp:1537
+#: kmcomposewin.cpp:1569
+#, fuzzy
+msgid "Select a list style"
+msgstr "选择样式"
+
+#: kmcomposewin.cpp:1574
+#, fuzzy
+msgid "Select a font"
+msgstr "选中所有文本"
+
+#: kmcomposewin.cpp:1579
+#, fuzzy
+msgid "Select a font size"
+msgstr "选择声音文件"
+
+#: kmcomposewin.cpp:1583
 msgid "Align Left"
 msgstr "左对齐"
 
-#: kmcomposewin.cpp:1541
+#: kmcomposewin.cpp:1587
 msgid "Align Right"
 msgstr "右对齐"
 
-#: kmcomposewin.cpp:1544
+#: kmcomposewin.cpp:1590
 msgid "Align Center"
 msgstr "居中对齐"
 
-#: kmcomposewin.cpp:1547
+#: kmcomposewin.cpp:1593
 msgid "&Bold"
 msgstr "粗体(&B)"
 
-#: kmcomposewin.cpp:1550
+#: kmcomposewin.cpp:1596
 msgid "&Italic"
 msgstr "斜体(&I)"
 
-#: kmcomposewin.cpp:1553
+#: kmcomposewin.cpp:1599
 msgid "&Underline"
 msgstr "下划线(&U)"
 
-#: kmcomposewin.cpp:1556
+#: kmcomposewin.cpp:1602
 msgid "Reset Font Settings"
 msgstr "重置字体设置"
 
-#: kmcomposewin.cpp:1559
+#: kmcomposewin.cpp:1605
 msgid "Text Color..."
 msgstr "文本颜色..."
 
-#: kmcomposewin.cpp:1573
+#: kmcomposewin.cpp:1619
 msgid "Configure KMail..."
 msgstr "配置 KMail..."
 
-#: kmcomposewin.cpp:1582
+#: kmcomposewin.cpp:1628
 msgid " Spellcheck: %1 "
 msgstr " 拼写检查：%1 "
 
-#: kmcomposewin.cpp:1583 kmcomposewin.cpp:1597
+#: kmcomposewin.cpp:1629 kmcomposewin.cpp:1643
 msgid " Column: %1 "
 msgstr " 列：%1 "
 
-#: kmcomposewin.cpp:1584 kmcomposewin.cpp:1595
+#: kmcomposewin.cpp:1630 kmcomposewin.cpp:1641
 msgid " Line: %1 "
 msgstr " 行：%1 "
 
-#: kmcomposewin.cpp:2188
+#: kmcomposewin.cpp:2252
 msgid "Re&save as Template"
 msgstr "重新保存为模板(&S)"
 
-#: kmcomposewin.cpp:2189
+#: kmcomposewin.cpp:2253
 msgid "&Save as Draft"
 msgstr "保存为草稿(&S)"
 
-#: kmcomposewin.cpp:2191
+#: kmcomposewin.cpp:2255
 msgid ""
 "Resave this message in the Templates folder. It can then be used at a later "
 "time."
 msgstr "将这封信重新保存在模板文件夹中。您可以稍后再编辑或者发送。"
 
-#: kmcomposewin.cpp:2193
+#: kmcomposewin.cpp:2257
 msgid ""
 "Save this message in the Drafts folder. It can then be edited and sent at a "
 "later time."
 msgstr "将这封信保存在草稿文件夹中。您可以稍后再编辑或者发送。"
 
-#: kmcomposewin.cpp:2197
+#: kmcomposewin.cpp:2261
 msgid "Do you want to save the message for later or discard it?"
 msgstr "您想要丢弃信件，还是保存留作以后使用？"
 
-#: kmcomposewin.cpp:2198
+#: kmcomposewin.cpp:2262
 msgid "Close Composer"
 msgstr "关闭撰写器"
 
-#: kmcomposewin.cpp:2268
+#: kmcomposewin.cpp:2333
 msgid ""
 "The message you have composed seems to refer to an attached file but you have "
 "not attached anything.\n"
@@ -5167,139 +5910,139 @@ msgstr ""
 "您撰写的信件好像引用附件，但是您没有附加任何文件。\n"
 "您是否想要在您的信件中附加文件？"
 
-#: kmcomposewin.cpp:2271
+#: kmcomposewin.cpp:2336
 msgid "File Attachment Reminder"
 msgstr "文件附件提醒"
 
-#: kmcomposewin.cpp:2273
+#: kmcomposewin.cpp:2338 kmcomposewin.cpp:4481
 msgid "&Send as Is"
 msgstr "原样发送(&S)"
 
-#: kmcomposewin.cpp:2350
+#: kmcomposewin.cpp:2415
 msgid ""
 "<qt>"
 "<p>KMail could not recognize the location of the attachment (%1);</p>"
 "<p>you have to specify the full path if you wish to attach a file.</p></qt>"
 msgstr "<qt><p>KMail 无法识别附件(%1)的位置；</p><p>如果您想要附加文件，您必须指定完整路径。</p></qt>"
 
-#: kmcomposewin.cpp:2359
+#: kmcomposewin.cpp:2424
 msgid ""
 "<qt>"
 "<p>Your administrator has disallowed attaching files bigger than %1 MB.</p>"
 msgstr "<qt><p>您的系统管理员已禁止发送大于 %1MB 的附件。</p>"
 
-#: kmcomposewin.cpp:2697
+#: kmcomposewin.cpp:2777
 msgid "Attach File"
 msgstr "附加文件"
 
 #. i18n: file kmcomposerui.rc line 68
-#: kmcomposewin.cpp:2698 rc.cpp:57
+#: kmcomposewin.cpp:2778 rc.cpp:57
 #, no-c-format
 msgid "&Attach"
 msgstr "附件(&A)"
 
-#: kmcomposewin.cpp:2878
+#: kmcomposewin.cpp:2959
 msgid "Insert File"
 msgstr "插入文件"
 
-#: kmcomposewin.cpp:3048
+#: kmcomposewin.cpp:3129
 msgid ""
 "<qt>"
 "<p>An error occurred while trying to export the key from the backend:</p>"
 "<p><b>%1</b></p></qt>"
 msgstr "<qt><p>试图从后端导出密钥时发生了错误：</p><p><b>%1</b></p></qt>"
 
-#: kmcomposewin.cpp:3052
+#: kmcomposewin.cpp:3133
 msgid "Key Export Failed"
 msgstr "密钥导出失败"
 
-#: kmcomposewin.cpp:3079
+#: kmcomposewin.cpp:3160
 msgid "Exporting key..."
 msgstr "正在导出密钥..."
 
-#: kmcomposewin.cpp:3090
+#: kmcomposewin.cpp:3171
 #, c-format
 msgid "OpenPGP key 0x%1"
 msgstr "OpenPGP 密钥 0x%1"
 
-#: kmcomposewin.cpp:3105
+#: kmcomposewin.cpp:3186
 msgid "Attach Public OpenPGP Key"
 msgstr "附加 OpenPGP 公钥"
 
-#: kmcomposewin.cpp:3106
+#: kmcomposewin.cpp:3187
 msgid "Select the public key which should be attached."
 msgstr "请选择需要附加的公钥。"
 
-#: kmcomposewin.cpp:3128 kmmimeparttree.cpp:137 kmreaderwin.cpp:1967
+#: kmcomposewin.cpp:3209 kmmimeparttree.cpp:135 kmreaderwin.cpp:2032
 msgid ""
 "_: to open\n"
 "Open"
 msgstr "打开"
 
-#: kmcomposewin.cpp:3130 kmmimeparttree.cpp:138 kmreaderwin.cpp:1968
+#: kmcomposewin.cpp:3211 kmmimeparttree.cpp:136 kmreaderwin.cpp:2033
 msgid "Open With..."
 msgstr "打开方式..."
 
-#: kmcomposewin.cpp:3132
+#: kmcomposewin.cpp:3213
 msgid ""
 "_: to view\n"
 "View"
 msgstr "查看"
 
-#: kmcomposewin.cpp:3135
+#: kmcomposewin.cpp:3216
 msgid "Edit With..."
 msgstr "编辑方式..."
 
-#: kmcomposewin.cpp:3143
+#: kmcomposewin.cpp:3224
 msgid "Add Attachment..."
 msgstr "添加附件..."
 
-#: kmcomposewin.cpp:3232 kmcomposewin.cpp:3240
+#: kmcomposewin.cpp:3312 kmcomposewin.cpp:3320
 msgid "KMail could not compress the file."
 msgstr "KMail 无法压缩文件。"
 
-#: kmcomposewin.cpp:3246
+#: kmcomposewin.cpp:3326
 msgid ""
 "The compressed file is larger than the original. Do you want to keep the "
 "original one?"
 msgstr "压缩后的文件比原来还大。您想要保留原始文件吗？"
 
-#: kmcomposewin.cpp:3247
+#: kmcomposewin.cpp:3327
 msgid "Keep"
 msgstr "保留"
 
-#: kmcomposewin.cpp:3313 kmcomposewin.cpp:3321
+#: kmcomposewin.cpp:3393 kmcomposewin.cpp:3401
 msgid "KMail could not uncompress the file."
 msgstr "KMail 无法解压缩文件。"
 
-#: kmcomposewin.cpp:3519
+#: kmcomposewin.cpp:3601
 msgid "Save Attachment As"
 msgstr "附件另存为"
 
-#: kmcomposewin.cpp:3769 kmedit.cpp:178
+#: kmcomposewin.cpp:3856 kmedit.cpp:178
 msgid "Add as Text"
 msgstr "添加为文本"
 
-#: kmcomposewin.cpp:3770 kmedit.cpp:179
+#: kmcomposewin.cpp:3857 kmedit.cpp:179
 msgid "Add as Attachment"
 msgstr "添加为附件"
 
-#: kmcomposewin.cpp:3771
+#: kmcomposewin.cpp:3858
 msgid ""
 "Please select whether you want to insert the content as text into the editor, "
 "or append the referenced file as an attachment."
 msgstr "请选择您是要将这些内容作为文本插入编辑器，还是作为关联文件追加到附件中。"
 
-#: kmcomposewin.cpp:3773
+#: kmcomposewin.cpp:3860
 msgid "Paste as text or attachment?"
 msgstr "粘贴为文本还是附件？"
 
-#: kmcomposewin.cpp:3848 kmfilterdlg.cpp:705 kmfolderdia.cpp:274
-#: kmfolderdia.cpp:632 kmfoldertree.cpp:1603 managesievescriptsdialog.cpp:280
+#: kmcomposewin.cpp:3935 kmfilterdlg.cpp:717 kmfolderdia.cpp:331
+#: kmfolderdia.cpp:710 kmfoldertree.cpp:1641 managesievescriptsdialog.cpp:302
 msgid "unnamed"
 msgstr "未命名"
 
-#: kmcomposewin.cpp:3873
+#: kmcomposewin.cpp:3961
 msgid ""
 "<qt>"
 "<p>You have requested that messages be encrypted to yourself, but the currently "
@@ -5311,11 +6054,11 @@ msgstr ""
 "<p>您请求了信件对您自己加密，但目前所选的身份尚未定义此用途的加密密钥(OpenPGP 或 S/MIME)。</p>"
 "<p>请在身份配置中选择要使用的密钥。</p></qt>"
 
-#: kmcomposewin.cpp:3880
+#: kmcomposewin.cpp:3968
 msgid "Undefined Encryption Key"
 msgstr "未定义的加密密钥"
 
-#: kmcomposewin.cpp:3924
+#: kmcomposewin.cpp:4015
 msgid ""
 "<qt>"
 "<p>In order to be able to sign this message you first have to define the "
@@ -5326,135 +6069,155 @@ msgstr ""
 "<p>为了对此信件签名，您必须首先定义要使用的签名密钥(OpenPGP 或 S/MIME)。</p>"
 "<p>请在身份配置中选择要使用的密钥。</p></qt>"
 
-#: kmcomposewin.cpp:3931
+#: kmcomposewin.cpp:4022
 msgid "Undefined Signing Key"
 msgstr "未定义的签名密钥"
 
-#: kmcomposewin.cpp:4016
+#: kmcomposewin.cpp:4129
 msgid ""
 "KMail is currently in offline mode,your messages will be kept in the outbox "
 "until you go online."
 msgstr "KMail 目前位于脱机模式中，您的信件将存放在发件箱中，直到您转为联机模式。"
 
-#: kmcomposewin.cpp:4018 kmkernel.cpp:1243
+#: kmcomposewin.cpp:4131 kmkernel.cpp:1285
 msgid "Online/Offline"
 msgstr "联机/脱机"
 
-#: kmcomposewin.cpp:4033
+#: kmcomposewin.cpp:4146
 msgid ""
 "You must enter your email address in the From: field. You should also set your "
 "email address for all identities, so that you do not have to enter it for each "
 "message."
 msgstr "您必须在“发件人：”域中输入您自己的电子邮件地址。您还应该为全部身份都设置电子邮件地址，省得每封信都要重新输入一次。"
 
-#: kmcomposewin.cpp:4044
+#: kmcomposewin.cpp:4157
 msgid ""
 "You must specify at least one receiver,either in the To: field or as CC or as "
 "BCC."
 msgstr "您必须在“收件人：”、CC 或 BCC 字段中指定至少一个接收者。"
 
-#: kmcomposewin.cpp:4052
+#: kmcomposewin.cpp:4165
 msgid "To field is missing.Send message anyway?"
 msgstr "您没有指定收件人。仍然要发送吗？"
 
-#: kmcomposewin.cpp:4054
+#: kmcomposewin.cpp:4167
 msgid "No To: specified"
 msgstr "未指定收件人"
 
-#: kmcomposewin.cpp:4079
+#: kmcomposewin.cpp:4192
 msgid "You did not specify a subject. Send message anyway?"
 msgstr "您没有指定主题。仍然要发送吗？"
 
-#: kmcomposewin.cpp:4081
+#: kmcomposewin.cpp:4194
 msgid "No Subject Specified"
 msgstr "未指定主题"
 
-#: kmcomposewin.cpp:4082
+#: kmcomposewin.cpp:4195
 msgid "S&end as Is"
 msgstr "原样发送(&E)"
 
-#: kmcomposewin.cpp:4083
+#: kmcomposewin.cpp:4196
 msgid "&Specify the Subject"
 msgstr "指定主题(&S)"
 
-#: kmcomposewin.cpp:4121
+#: kmcomposewin.cpp:4234
 msgid "&Keep markup, do not sign/encrypt"
 msgstr "保留标记，不签名/加密(&K)"
 
-#: kmcomposewin.cpp:4122
+#: kmcomposewin.cpp:4235
 msgid "&Keep markup, do not encrypt"
 msgstr "保留标记，不加密(&K)"
 
-#: kmcomposewin.cpp:4123
+#: kmcomposewin.cpp:4236
 msgid "&Keep markup, do not sign"
 msgstr "保留标记，不签名(&K)"
 
-#: kmcomposewin.cpp:4125
+#: kmcomposewin.cpp:4238
 msgid "Sign/Encrypt (delete markup)"
 msgstr "签名/加密(删除标记)"
 
-#: kmcomposewin.cpp:4126
+#: kmcomposewin.cpp:4239
 msgid "Encrypt (delete markup)"
 msgstr "加密(删除标记)"
 
-#: kmcomposewin.cpp:4127
+#: kmcomposewin.cpp:4240
 msgid "Sign (delete markup)"
 msgstr "签名(删除标记)"
 
-#: kmcomposewin.cpp:4129
+#: kmcomposewin.cpp:4242
 msgid ""
 "<qt>"
 "<p>Inline signing/encrypting of HTML messages is not possible;</p>"
 "<p>do you want to delete your markup?</p></qt>"
 msgstr "<qt><p>无法对 HTML 信件进行嵌入式签名/加密；</p><p>您想要删除信件中的 HTML 标记吗？</p></qt>"
 
-#: kmcomposewin.cpp:4131
+#: kmcomposewin.cpp:4244
 msgid "Sign/Encrypt Message?"
 msgstr "签名/加密信件吗？"
 
-#: kmcomposewin.cpp:4180
+#: kmcomposewin.cpp:4293
 msgid ""
 "The custom drafts or templates folder for identify \"%1\" does not exist "
 "(anymore); therefore, the default drafts or templates folder will be used."
 msgstr "身份“%1”的自定义草稿或模板文件夹不存在；因此会使用默认的草稿或模板文件夹。"
 
-#: kmcomposewin.cpp:4326
+#: kmcomposewin.cpp:4393 kmsender.cpp:114
+msgid "Please create an account for sending and try again."
+msgstr "请创建一个用于发送的账户然后重试。"
+
+#: kmcomposewin.cpp:4456
 msgid "About to send email..."
 msgstr "即将发送信件..."
 
-#: kmcomposewin.cpp:4327
+#: kmcomposewin.cpp:4457
 msgid "Send Confirmation"
 msgstr "发送确认"
 
-#: kmcomposewin.cpp:4328 redirectdialog.cpp:82
+#: kmcomposewin.cpp:4458 redirectdialog.cpp:83
 msgid "&Send Now"
 msgstr "立即发送(&S)"
 
-#: kmcomposewin.cpp:4549
+#: kmcomposewin.cpp:4479
+msgid ""
+"You are trying to send the mail to more than %1 recipients. Send message "
+"anyway?"
+msgstr ""
+
+#: kmcomposewin.cpp:4480
+#, fuzzy
+msgid "Too many receipients"
+msgstr "无收件人"
+
+#: kmcomposewin.cpp:4482
+#, fuzzy
+msgid "&Edit Recipients"
+msgstr "额外收件人"
+
+#: kmcomposewin.cpp:4728
 msgid "Spellcheck: on"
 msgstr "拼写检查：开"
 
-#: kmcomposewin.cpp:4551
+#: kmcomposewin.cpp:4730
 msgid "Spellcheck: off"
 msgstr "拼写检查：关"
 
-#: kmcomposewin.cpp:4608
+#: kmcomposewin.cpp:4787
 msgid " Spell check canceled."
 msgstr "拼写检查已取消。"
 
-#: kmcomposewin.cpp:4611
+#: kmcomposewin.cpp:4790
 msgid " Spell check stopped."
 msgstr "拼写检查已停止。"
 
-#: kmcomposewin.cpp:4614
+#: kmcomposewin.cpp:4793
 msgid " Spell check complete."
 msgstr "拼写检查已完成。"
 
-#: kmcomposewin.cpp:4798 kmcomposewin.cpp:4806
+#: kmcomposewin.cpp:4992 kmcomposewin.cpp:5000
 msgid "Spellchecker"
 msgstr "拼写检查器"
 
-#: kmcomposewin.cpp:5115
+#: kmcomposewin.cpp:5304
 msgid ""
 "Please configure a Crypto Backend to use for Chiasmus encryption first.\n"
 "You can do this in the Crypto Backends tab of the configure dialog's Security "
@@ -5463,54 +6226,65 @@ msgstr ""
 "要使用 Chiasmus 加密，请先配置 Chiasmus 后端。\n"
 "您可以在配置对话框安全节的 Chiasmus 后端中找到此功能。"
 
-#: kmcomposewin.cpp:5119
+#: kmcomposewin.cpp:5308
 msgid ""
 "It looks as though libkleopatra was compiled without Chiasmus support. You "
 "might want to recompile libkleopatra with --enable-chiasmus."
 msgstr ""
 "似乎 libkleopatra 编译时未开启 Chiasmus 支持。您可能想要用 --enable-chiasmus 重新编译 libkleopatra。"
 
-#: kmcomposewin.cpp:5122
+#: kmcomposewin.cpp:5311
 msgid "No Chiasmus Backend Configured"
 msgstr "未配置 Chiasmus 后端"
 
-#: kmcomposewin.cpp:5153
+#: kmcomposewin.cpp:5342
 msgid "No Chiasmus Keys Found"
 msgstr "未找到 Chiasmus 密钥"
 
-#: kmcomposewin.cpp:5157
+#: kmcomposewin.cpp:5346
 msgid "Chiasmus Encryption Key Selection"
 msgstr "Chiasmus 加密密钥选择"
 
-#: kmcomposewin.cpp:5189
+#: kmcomposewin.cpp:5378
 msgid "Message will be signed"
 msgstr "信件会被签名"
 
-#: kmcomposewin.cpp:5189
+#: kmcomposewin.cpp:5378
 msgid "Message will not be signed"
 msgstr "信件不会被签名"
 
-#: kmcomposewin.cpp:5190
+#: kmcomposewin.cpp:5379
 msgid "Message will be encrypted"
 msgstr "信件会被加密"
 
-#: kmcomposewin.cpp:5190
+#: kmcomposewin.cpp:5379
 msgid "Message will not be encrypted"
 msgstr "信件不会被加密"
 
-#: kmedit.cpp:391
+#: kmedit.cpp:458
 msgid "Unable to start external editor."
 msgstr "无法启动外部编辑器。"
 
-#: kmedit.cpp:442
-msgid "Suggestions"
+#: kmedit.cpp:522
+#, fuzzy
+msgid "No Suggestions"
 msgstr "建议"
 
-#: kmedit.cpp:494
+#: kmedit.cpp:529
+#, fuzzy
+msgid "Add to Dictionary"
+msgstr "字典(&D)"
+
+#: kmedit.cpp:530
+#, fuzzy
+msgid "Ignore All"
+msgstr "忽略"
+
+#: kmedit.cpp:587
 msgid "Automatic spellchecking is not possible on text with markup."
 msgstr "自动拼写检查无法处理带有标记的文本。"
 
-#: kmedit.cpp:538
+#: kmedit.cpp:631
 msgid ""
 "The external editor is still running.\n"
 "Abort the external editor or leave it open?"
@@ -5518,33 +6292,38 @@ msgstr ""
 "外部编辑器仍在运行中。\n"
 "中止外部编辑器还是让其保持打开？"
 
-#: kmedit.cpp:541
+#: kmedit.cpp:634
 msgid "Abort Editor"
 msgstr "中止编辑器"
 
-#: kmedit.cpp:541
+#: kmedit.cpp:634
 msgid "Leave Editor Open"
 msgstr "不关闭编辑器"
 
-#: kmedit.cpp:565
+#: kmedit.cpp:661
 msgid "Spellcheck - KMail"
 msgstr "拼写检查 - KMail"
 
-#: kmedit.cpp:734
+#: kmedit.cpp:884
 msgid ""
 "ISpell/Aspell could not be started. Please make sure you have ISpell or Aspell "
 "properly configured and in your PATH."
 msgstr "无法启动 ISpell/Aspell。请确定您正确地配置了 ISpell 或 Aspell，并且在您的 PATH 中。"
 
-#: kmedit.cpp:743
+#: kmedit.cpp:893
 msgid "ISpell/Aspell seems to have crashed."
 msgstr "ISpell/Aspell 似乎已经崩溃了。"
 
-#: kmedit.cpp:752
+#: kmedit.cpp:902
 msgid "No misspellings encountered."
 msgstr "没有遇到拼写错误。"
 
-#: kmfawidgets.cpp:102
+#: kmfawidgets.cpp:39
+#, fuzzy
+msgid "Open Address Book"
+msgstr "在地址簿中打开"
+
+#: kmfawidgets.cpp:107
 msgid "Select Sound File"
 msgstr "选择声音文件"
 
@@ -5567,191 +6346,223 @@ msgid ""
 "<br>Ignoring it.</qt>"
 msgstr "<qt>在过滤规则 <b>%2</b>中有未知的过滤动作 <b>%1</b>。<br>它将被忽略。</qt>"
 
-#: kmfilteraction.cpp:598
+#: kmfilteraction.cpp:601
 msgid "Confirm Delivery"
 msgstr "确认投递"
 
-#: kmfilteraction.cpp:634
+#: kmfilteraction.cpp:637
 msgid "Set Transport To"
 msgstr "设置传送方式为"
 
-#: kmfilteraction.cpp:665
+#: kmfilteraction.cpp:668
 msgid "Set Reply-To To"
 msgstr "设置回信地址为"
 
-#: kmfilteraction.cpp:701
+#: kmfilteraction.cpp:704
 msgid "Set Identity To"
 msgstr "设置身份为"
 
-#: kmfilteraction.cpp:784
+#: kmfilteraction.cpp:787
 msgid "Mark As"
 msgstr "标记为"
 
-#: kmfilteraction.cpp:789
+#: kmfilteraction.cpp:792
 msgid ""
 "_: msg status\n"
 "Important"
 msgstr "重要"
 
-#: kmfilteraction.cpp:790
+#: kmfilteraction.cpp:793
 msgid ""
 "_: msg status\n"
 "Read"
 msgstr "已读"
 
-#: kmfilteraction.cpp:791
+#: kmfilteraction.cpp:794
 msgid ""
 "_: msg status\n"
 "Unread"
 msgstr "未读"
 
-#: kmfilteraction.cpp:792
+#: kmfilteraction.cpp:795
 msgid ""
 "_: msg status\n"
 "Replied"
 msgstr "已回复"
 
-#: kmfilteraction.cpp:793
+#: kmfilteraction.cpp:796
 msgid ""
 "_: msg status\n"
 "Forwarded"
 msgstr "已转发"
 
-#: kmfilteraction.cpp:794
+#: kmfilteraction.cpp:797
 msgid ""
 "_: msg status\n"
 "Old"
 msgstr "旧"
 
-#: kmfilteraction.cpp:795
+#: kmfilteraction.cpp:798
 msgid ""
 "_: msg status\n"
 "New"
 msgstr "新"
 
-#: kmfilteraction.cpp:796
+#: kmfilteraction.cpp:799
 msgid ""
 "_: msg status\n"
 "Watched"
 msgstr "已观察"
 
-#: kmfilteraction.cpp:797
+#: kmfilteraction.cpp:800
 msgid ""
 "_: msg status\n"
 "Ignored"
 msgstr "已忽略"
 
-#: kmfilteraction.cpp:798
+#: kmfilteraction.cpp:801
 msgid ""
 "_: msg status\n"
 "Spam"
 msgstr "垃圾"
 
-#: kmfilteraction.cpp:799
+#: kmfilteraction.cpp:802
 msgid ""
 "_: msg status\n"
 "Ham"
 msgstr "Ham"
 
-#: kmfilteraction.cpp:883
+#: kmfilteraction.cpp:886
 msgid "Send Fake MDN"
 msgstr "发送伪 MDN"
 
-#: kmfilteraction.cpp:888
+#: kmfilteraction.cpp:891
 msgid ""
 "_: MDN type\n"
 "Ignore"
 msgstr "忽略"
 
-#: kmfilteraction.cpp:889
+#: kmfilteraction.cpp:892
 msgid ""
 "_: MDN type\n"
 "Displayed"
 msgstr "已显示"
 
-#: kmfilteraction.cpp:890
+#: kmfilteraction.cpp:893
 msgid ""
 "_: MDN type\n"
 "Deleted"
 msgstr "已删除"
 
-#: kmfilteraction.cpp:891
+#: kmfilteraction.cpp:894
 msgid ""
 "_: MDN type\n"
 "Dispatched"
 msgstr "已分发"
 
-#: kmfilteraction.cpp:892
+#: kmfilteraction.cpp:895
 msgid ""
 "_: MDN type\n"
 "Processed"
 msgstr "已处理"
 
-#: kmfilteraction.cpp:893
+#: kmfilteraction.cpp:896
 msgid ""
 "_: MDN type\n"
 "Denied"
 msgstr "拒绝"
 
-#: kmfilteraction.cpp:894
+#: kmfilteraction.cpp:897
 msgid ""
 "_: MDN type\n"
 "Failed"
 msgstr "失败"
 
-#: kmfilteraction.cpp:963
+#: kmfilteraction.cpp:966
 msgid "Remove Header"
 msgstr "删除信头"
 
-#: kmfilteraction.cpp:1036
+#: kmfilteraction.cpp:1039
 msgid "Add Header"
 msgstr "添加信头"
 
-#: kmfilteraction.cpp:1063
+#: kmfilteraction.cpp:1066
 msgid "With value:"
 msgstr "值："
 
-#: kmfilteraction.cpp:1177
+#: kmfilteraction.cpp:1180
 msgid "Rewrite Header"
 msgstr "改写信头"
 
-#: kmfilteraction.cpp:1213
+#: kmfilteraction.cpp:1216
 msgid "Replace:"
 msgstr "替换："
 
-#: kmfilteraction.cpp:1220
+#: kmfilteraction.cpp:1223
 msgid "With:"
 msgstr "为："
 
-#: kmfilteraction.cpp:1340
+#: kmfilteraction.cpp:1343
 msgid "Move Into Folder"
 msgstr "移入文件夹"
 
-#: kmfilteraction.cpp:1390
+#: kmfilteraction.cpp:1393
 msgid "Copy Into Folder"
 msgstr "复制到文件夹"
 
-#: kmfilteraction.cpp:1452
+#: kmfilteraction.cpp:1467
 msgid "Forward To"
 msgstr "转发给"
 
-#: kmfilteraction.cpp:1565
+#: kmfilteraction.cpp:1508
+msgid "The addressee the message will be forwarded to"
+msgstr ""
+
+#: kmfilteraction.cpp:1509
+msgid "The filter will forward the message to the addressee entered here."
+msgstr ""
+
+#: kmfilteraction.cpp:1515
+#, fuzzy
+msgid "Default Template"
+msgstr "自定义模板(&C)"
+
+#: kmfilteraction.cpp:1525
+#, fuzzy
+msgid "The template used when forwarding"
+msgstr "转发信件模板"
+
+#: kmfilteraction.cpp:1526
+msgid "Set the forwarding template that will be used with this filter."
+msgstr ""
+
+#: kmfilteraction.cpp:1620
+#, fuzzy
+msgid "Forward to %1 with default template "
+msgstr "用自定义模板转发"
+
+#: kmfilteraction.cpp:1622
+#, fuzzy
+msgid "Forward to %1 with template %2"
+msgstr "用自定义模板转发"
+
+#: kmfilteraction.cpp:1643
 msgid "Redirect To"
 msgstr "重定向到"
 
-#: kmfilteraction.cpp:1605
+#: kmfilteraction.cpp:1683
 msgid "Execute Command"
 msgstr "执行命令"
 
-#: kmfilteraction.cpp:1702
+#: kmfilteraction.cpp:1780
 msgid "Pipe Through"
 msgstr "通过管道"
 
-#: kmfilteraction.cpp:1809
+#: kmfilteraction.cpp:1887
 msgid "Play Sound"
 msgstr "播放声音"
 
-#: kmfilterdlg.cpp:51
+#: kmfilterdlg.cpp:55
 msgid ""
 "<qt>"
 "<p>This is the list of defined filters. They are processed top-to-bottom.</p>"
@@ -5762,7 +6573,7 @@ msgstr ""
 "<p>这是所定义过滤器清单。程序将会从上到下进行处理。</p>"
 "<p>单击任意过滤器后，可以使用对话框右侧的控件对其进行编辑。</p></qt>"
 
-#: kmfilterdlg.cpp:57
+#: kmfilterdlg.cpp:61
 msgid ""
 "<qt>"
 "<p>Click this button to create a new filter.</p>"
@@ -5777,7 +6588,7 @@ msgstr ""
 "<p>如果不小心点错了此按钮，可以单击右侧的<em>删除</em>按钮撤消。"
 "<p></qt>"
 
-#: kmfilterdlg.cpp:64
+#: kmfilterdlg.cpp:68
 msgid ""
 "<qt>"
 "<p>Click this button to copy a filter.</p>"
@@ -5785,7 +6596,7 @@ msgid ""
 "on the <em>Delete</em> button.</p></qt>"
 msgstr "<qt><p>点击此按钮可以复制过滤器。</p><p>如果不小心点错了此按钮，可以单击右侧的<em>删除</em>按钮撤消。<p></qt>"
 
-#: kmfilterdlg.cpp:68
+#: kmfilterdlg.cpp:72
 msgid ""
 "<qt>"
 "<p>Click this button to <em>delete</em> the currently-selected filter from the "
@@ -5798,7 +6609,7 @@ msgstr ""
 "<p>点击此按钮<em>删除</em>来从上面的列表中删除当前选中的过滤器。</p>"
 "<p>过滤器一旦被删除，就不能再恢复，但是可以通过<em>取消</em>来放弃所做的修改。</p></qt>"
 
-#: kmfilterdlg.cpp:75
+#: kmfilterdlg.cpp:79
 msgid ""
 "<qt>"
 "<p>Click this button to move the currently-selected filter to the <em>top</em> "
@@ -5811,7 +6622,7 @@ msgstr ""
 "<p>点击此按钮把当前选中的过滤器移动到上面的列表的<em>顶端</em>。</p>"
 "<p>由于过滤器在列表中的次序决定它们被应用于邮件的次序，因此这是有用的：最上面的过滤器最先被使用。</p>"
 
-#: kmfilterdlg.cpp:81
+#: kmfilterdlg.cpp:85
 msgid ""
 "<qt>"
 "<p>Click this button to move the currently-selected filter <em>up</em> "
@@ -5827,7 +6638,7 @@ msgstr ""
 "<p>由于过滤器在列表中的次序决定它们被应用于邮件的次序，因此这是有用的：最上面的过滤器最先被使用。</p>"
 "<p>如果不小心点了此按钮，您可以点右边的<em>下移</em>按钮来取消这个操作。</p></qt>"
 
-#: kmfilterdlg.cpp:89
+#: kmfilterdlg.cpp:93
 msgid ""
 "<qt>"
 "<p>Click this button to move the currently-selected filter <em>down</em> "
@@ -5843,7 +6654,7 @@ msgstr ""
 "<p>由于过滤器在列表中的次序决定它们被应用于邮件的次序，因此这是有用的：最上面的过滤器最先被使用。</p>"
 "<p>如果偶然点了此按钮，您可以点左边的<em>上移</em>按钮来取消这个操作</p>。</qt>"
 
-#: kmfilterdlg.cpp:97
+#: kmfilterdlg.cpp:101
 msgid ""
 "<qt>"
 "<p>Click this button to move the currently-selected filter to the <em>"
@@ -5856,7 +6667,7 @@ msgstr ""
 "<p>点击此按钮把当前选中的过滤器移移动到上面的列表中<em>底端</em>。</p>"
 "<p>由于过滤器在列表中的次序决定它们被应用于邮件的次序，因此这是有用的：最上面的过滤器最先被使用。</p>"
 
-#: kmfilterdlg.cpp:103
+#: kmfilterdlg.cpp:107
 msgid ""
 "<qt>"
 "<p>Click this button to rename the currently-selected filter.</p>"
@@ -5871,7 +6682,7 @@ msgstr ""
 "<p>如果偶然重命名了一个过滤器并且希望自动把名字改回去，点此按钮并选择<em>清除</em>，然后在出现的对话框中点<em>确定</em>按钮。</p>"
 "</qt>"
 
-#: kmfilterdlg.cpp:110
+#: kmfilterdlg.cpp:114
 msgid ""
 "<qt>"
 "<p>Check this button to force the confirmation dialog to be displayed.</p>"
@@ -5886,130 +6697,135 @@ msgstr ""
 "<p>如果您定义了规则集会将信件稍后下载的话，则此选项非常有用。要是不可能强制对话框弹出，如果在服务器上没有大信件等待，或者如果您将规则集更改为将信件进行不同的"
 "标记，不强制显示对话框的话这些信件将永远不可能被下载。</p></qt>"
 
-#: kmfilterdlg.cpp:129
+#: kmfilterdlg.cpp:133
 msgid "POP3 Filter Rules"
 msgstr "POP3 过滤规则"
 
-#: kmfilterdlg.cpp:129
+#: kmfilterdlg.cpp:133
 msgid "Filter Rules"
 msgstr "过滤规则"
 
-#: kmfilterdlg.cpp:151
+#: kmfilterdlg.cpp:155
 msgid "Available Filters"
 msgstr "可用过滤器"
 
-#: kmfilterdlg.cpp:164
+#: kmfilterdlg.cpp:168
 msgid "A&dvanced"
 msgstr "高级(&D)"
 
-#: kmfilterdlg.cpp:171
+#: kmfilterdlg.cpp:175
 msgid "Filter Criteria"
 msgstr "过滤准则"
 
-#: kmfilterdlg.cpp:175
+#: kmfilterdlg.cpp:179
 msgid "Filter Action"
 msgstr "过滤动作"
 
-#: kmfilterdlg.cpp:178
+#: kmfilterdlg.cpp:182
 msgid "Global Options"
 msgstr "全局选项"
 
-#: kmfilterdlg.cpp:179
+#: kmfilterdlg.cpp:183
 msgid "Always &show matched 'Download Later' messages in confirmation dialog"
 msgstr "确认对话框中总是显示符合的“稍后下载”信件(&S)"
 
-#: kmfilterdlg.cpp:184
+#: kmfilterdlg.cpp:188
 msgid "Filter Actions"
 msgstr "过滤动作"
 
-#: kmfilterdlg.cpp:189
+#: kmfilterdlg.cpp:193
 msgid "Advanced Options"
 msgstr "高级选项"
 
-#: kmfilterdlg.cpp:197
+#: kmfilterdlg.cpp:201
 msgid "Apply this filter to incoming messages:"
 msgstr "对收到的信件应用此过滤器："
 
-#: kmfilterdlg.cpp:201
+#: kmfilterdlg.cpp:205
 msgid "from all accounts"
 msgstr "从全部账户"
 
-#: kmfilterdlg.cpp:204
+#: kmfilterdlg.cpp:208
 msgid "from all but online IMAP accounts"
 msgstr "除联机 IMAP 账户外的全部账户"
 
-#: kmfilterdlg.cpp:207
+#: kmfilterdlg.cpp:211
 msgid "from checked accounts only"
 msgstr "从选中的账户"
 
-#: kmfilterdlg.cpp:213
+#: kmfilterdlg.cpp:217
 msgid "Account Name"
 msgstr "账户名"
 
-#: kmfilterdlg.cpp:220
+#: kmfilterdlg.cpp:224
 msgid "Apply this filter to &sent messages"
 msgstr "对发出的信件应用此过滤器(&S)"
 
-#: kmfilterdlg.cpp:223
+#: kmfilterdlg.cpp:227
 msgid "Apply this filter on manual &filtering"
 msgstr "手动过滤时应用此过滤器(&F)"
 
-#: kmfilterdlg.cpp:226
+#: kmfilterdlg.cpp:230
 msgid "If this filter &matches, stop processing here"
 msgstr "如果匹配该过滤器，在此停止处理(&M)"
 
-#: kmfilterdlg.cpp:230
+#: kmfilterdlg.cpp:234
 msgid "Add this filter to the Apply Filter menu"
 msgstr "将此过滤器添加到应用过滤器菜单中"
 
-#: kmfilterdlg.cpp:232
+#: kmfilterdlg.cpp:236
 msgid "Shortcut:"
 msgstr "快捷键："
 
-#: kmfilterdlg.cpp:238
+#: kmfilterdlg.cpp:242
 msgid "Additionally add this filter to the toolbar"
 msgstr "另外将此过滤器添加到工具栏中"
 
-#: kmfilterdlg.cpp:243
+#: kmfilterdlg.cpp:247
 msgid "Icon for this filter:"
 msgstr "此过滤器的图标："
 
-#: kmfilterdlg.cpp:608
+#: kmfilterdlg.cpp:612
 msgid "Up"
 msgstr "上移"
 
-#: kmfilterdlg.cpp:609
+#: kmfilterdlg.cpp:613
 msgid "Down"
 msgstr "下移"
 
-#: kmfilterdlg.cpp:628
+#: kmfilterdlg.cpp:632
 msgid "Rename..."
 msgstr "重命名..."
 
 #. i18n: file kmail_part.rc line 10
-#: kmfilterdlg.cpp:629 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
+#: kmfilterdlg.cpp:633 kmsearchpattern.h:219 rc.cpp:6 rc.cpp:72
 #, no-c-format
 msgid "New"
 msgstr "新建"
 
-#: kmfilterdlg.cpp:744
+#: kmfilterdlg.cpp:645
+#, fuzzy
+msgid "Select Source Folders"
+msgstr "选择文件夹快捷键"
+
+#: kmfilterdlg.cpp:756
 msgid ""
 "At least one filter targets a folder on an online IMAP account. Such filters "
 "will only be applied when manually filtering and when filtering incoming online "
 "IMAP mail."
 msgstr "至少有一个过滤器的目标是联机 IMAP 账户上的文件夹。当您要过滤联机 IMAP 上的新邮件时，只有手动执行这些过滤器才能生效。"
 
-#: kmfilterdlg.cpp:774
+#: kmfilterdlg.cpp:786
 msgid ""
 "The following filters have not been saved because they were invalid (e.g. "
 "containing no actions or no search rules)."
 msgstr "下列过滤器没有保存，原因是这些过滤器无效(如没有包含操作或者没有搜索规则)。"
 
-#: kmfilterdlg.cpp:935
+#: kmfilterdlg.cpp:947
 msgid "Rename Filter"
 msgstr "重命名过滤器"
 
-#: kmfilterdlg.cpp:936
+#: kmfilterdlg.cpp:948
 msgid ""
 "Rename filter \"%1\" to:\n"
 "(leave the field empty for automatic naming)"
@@ -6017,19 +6833,24 @@ msgstr ""
 "将过滤器“%1”重命名为：\n"
 "(留空代表自动命名)"
 
-#: kmfilterdlg.cpp:1113
+#: kmfilterdlg.cpp:973
+#, fuzzy
+msgid "Select Folders to Filter"
+msgstr "选择带焦点的文件夹"
+
+#: kmfilterdlg.cpp:1136
 msgid "Please select an action."
 msgstr "请选择一个动作。"
 
-#: kmfilterdlg.cpp:1280
+#: kmfilterdlg.cpp:1303
 msgid "&Download mail"
 msgstr "下载邮件(&D)"
 
-#: kmfilterdlg.cpp:1281
+#: kmfilterdlg.cpp:1304
 msgid "Download mail la&ter"
 msgstr "以后再下载邮件(&T)"
 
-#: kmfilterdlg.cpp:1282
+#: kmfilterdlg.cpp:1305
 msgid "D&elete mail from server"
 msgstr "从服务器上删除邮件(&E)"
 
@@ -6037,10 +6858,28 @@ msgstr "从服务器上删除邮件(&E)"
 msgid "<qt>Error while creating file <b>%1</b>:<br>%2</qt>"
 msgstr "<qt>创建文件 <b>%1</b> 时发生错误：<br>%2</qt>"
 
-#: kmfolder.cpp:272
+#: kmfolder.cpp:276
 msgid "Failed to create folder"
 msgstr "无法创建文件夹"
 
+#: kmfolder.cpp:907
+msgid ""
+"Folder names cannot contain the / (slash) character; please choose another "
+"folder name."
+msgstr "文件夹名称不能包含斜线字符；请另选一个文件夹名称。"
+
+#: kmfolder.cpp:913
+msgid ""
+"Folder names cannot start with a . (dot) character; please choose another "
+"folder name."
+msgstr "文件夹名称不能包含点字符；请另选一个文件夹名称。"
+
+#: kmfolder.cpp:932
+msgid ""
+"Your IMAP server does not allow the character '%1'; please choose another "
+"folder name."
+msgstr "您的 IMAP 服务器不允许字符“%1”；请另选一个文件夹名称。"
+
 #: kmfoldercachedimap.cpp:107
 msgid "Troubleshooting IMAP Cache"
 msgstr "解决 IMAP 缓存的问题"
@@ -6091,23 +6930,23 @@ msgstr "此帐户的全部文件夹"
 msgid "Refresh &Cache"
 msgstr "刷新缓存(&C)"
 
-#: kmfoldercachedimap.cpp:203
+#: kmfoldercachedimap.cpp:216
 msgid ""
 "The UID cache file for folder %1 could not be read. There could be a problem "
 "with file system permission, or it is corrupted."
 msgstr "文件夹 %1 的 UID 缓存文件不可读。可能是文件系统权限的问题，或是文件已损坏。"
 
-#: kmfoldercachedimap.cpp:452
+#: kmfoldercachedimap.cpp:488
 msgid ""
 "The UID cache file for folder %1 could not be written. There could be a problem "
 "with file system permission."
 msgstr "文件夹 %1 的 UID 缓存文件不可写。可能是文件系统权限的问题。"
 
-#: kmfoldercachedimap.cpp:562
+#: kmfoldercachedimap.cpp:612
 msgid "You must synchronize with the server before renaming IMAP folders."
 msgstr "在重命名 IMAP 文件夹之前您必须和服务器先同步。"
 
-#: kmfoldercachedimap.cpp:679
+#: kmfoldercachedimap.cpp:735
 msgid ""
 "No account setup for this folder.\n"
 "Please try running a sync before this."
@@ -6115,7 +6954,7 @@ msgstr ""
 "尚未为此文件夹设置账户。\n"
 "请在执行此操作之前先同步。"
 
-#: kmfoldercachedimap.cpp:683
+#: kmfoldercachedimap.cpp:739
 msgid ""
 "Are you sure you want to refresh the IMAP cache of the folder %1 and all its "
 "subfolders?\n"
@@ -6124,145 +6963,144 @@ msgstr ""
 "您确定要刷新文件夹 %1 及其全部子文件夹中的 IMAP 缓存吗？\n"
 "这将删除您对本地文件夹已作出的任何改变。"
 
-#: kmfoldercachedimap.cpp:687 kmmainwidget.cpp:1352
+#: kmfoldercachedimap.cpp:743 kmmainwidget.cpp:1316
 msgid "Refresh IMAP Cache"
 msgstr "刷新 IMAP 缓存"
 
-#: kmfoldercachedimap.cpp:688 kmmainwidget.cpp:1352
+#: kmfoldercachedimap.cpp:744 kmmainwidget.cpp:1316
 msgid "&Refresh"
 msgstr "刷新(&R)"
 
-#: kmfoldercachedimap.cpp:711
+#: kmfoldercachedimap.cpp:767
 msgid "The index of this folder has been recreated."
 msgstr "此文件夹的索引已被重建。"
 
-#: kmfoldercachedimap.cpp:721
+#: kmfoldercachedimap.cpp:777
 msgid ""
 "Folder %1 is not in initial sync state (state was %2). Do you want to reset it "
 "to initial sync state and sync anyway?"
 msgstr "文件夹 %1 未处于初始同步状态 (它的状态是%2)。您要将其重置到初始同步状态，并仍然进行同步吗？"
 
-#: kmfoldercachedimap.cpp:721
+#: kmfoldercachedimap.cpp:777
 msgid "Reset && Sync"
 msgstr "重置并同步"
 
-#: kmfoldercachedimap.cpp:741
+#: kmfoldercachedimap.cpp:798
 msgid "Synchronization skipped"
 msgstr "同步已跳过"
 
-#: kmfoldercachedimap.cpp:831
+#: kmfoldercachedimap.cpp:890
 msgid "Synchronizing"
 msgstr "同步"
 
-#: kmfoldercachedimap.cpp:850
+#: kmfoldercachedimap.cpp:909
 #, c-format
 msgid "Connecting to %1"
 msgstr "连接到 %1"
 
-#: kmfoldercachedimap.cpp:872
+#: kmfoldercachedimap.cpp:934
 msgid "Checking permissions"
 msgstr "检查权限"
 
-#: kmfoldercachedimap.cpp:886
+#: kmfoldercachedimap.cpp:956
 msgid "Renaming folder"
 msgstr "重命名文件夹"
 
-#: kmfoldercachedimap.cpp:948
+#: kmfoldercachedimap.cpp:1021
 msgid "Retrieving folderlist"
 msgstr "获取文件夹列表"
 
-#: kmfoldercachedimap.cpp:952
+#: kmfoldercachedimap.cpp:1026
 msgid "Error while retrieving the folderlist"
 msgstr "获取文件夹列表出错"
 
-#: kmfoldercachedimap.cpp:959
+#: kmfoldercachedimap.cpp:1035
 msgid "Retrieving subfolders"
 msgstr "获取子文件夹"
 
-#: kmfoldercachedimap.cpp:966
+#: kmfoldercachedimap.cpp:1043
 msgid "Deleting folders from server"
 msgstr "从服务器上删除文件夹"
 
-#: kmfoldercachedimap.cpp:981
+#: kmfoldercachedimap.cpp:1058
 msgid "Retrieving message list"
 msgstr "获取信件列表"
 
-#: kmfoldercachedimap.cpp:994
+#: kmfoldercachedimap.cpp:1071
 msgid "No messages to delete..."
 msgstr "没有要删除的信件..."
 
-#: kmfoldercachedimap.cpp:1005
+#: kmfoldercachedimap.cpp:1082
 msgid "Expunging deleted messages"
 msgstr "清除已删除的信件"
 
-#: kmfoldercachedimap.cpp:1019
-msgid "Retrieving new messages"
-msgstr "获取新信件"
+#: kmfoldercachedimap.cpp:1096
+#, fuzzy, c-format
+msgid ""
+"_n: Retrieving one new message\n"
+"Retrieving %n new messages"
+msgstr "%1中有 %n 封新信"
 
-#: kmfoldercachedimap.cpp:1031
+#: kmfoldercachedimap.cpp:1108
 msgid "No new messages from server"
 msgstr "服务器上没有新信件"
 
-#: kmfoldercachedimap.cpp:1064
+#: kmfoldercachedimap.cpp:1141
 msgid "Checking annotation support"
 msgstr "检查批注支持"
 
-#: kmfoldercachedimap.cpp:1111
+#: kmfoldercachedimap.cpp:1191
 msgid "Retrieving annotations"
 msgstr "获取批注"
 
-#: kmfoldercachedimap.cpp:1133
+#: kmfoldercachedimap.cpp:1213
 msgid "Setting annotations"
 msgstr "设置批注"
 
-#: kmfoldercachedimap.cpp:1174
+#: kmfoldercachedimap.cpp:1260
 msgid "Setting permissions"
 msgstr "设置权限"
 
-#: kmfoldercachedimap.cpp:1193
+#: kmfoldercachedimap.cpp:1279
 msgid "Retrieving permissions"
 msgstr "获取权限"
 
-#: kmfoldercachedimap.cpp:1203
+#: kmfoldercachedimap.cpp:1306
 msgid "Getting quota information"
 msgstr "获得配额信息"
 
-#: kmfoldercachedimap.cpp:1218
-msgid "Updating cache file"
-msgstr "更新缓存文件"
-
-#: kmfoldercachedimap.cpp:1244
+#: kmfoldercachedimap.cpp:1321
 msgid "Synchronization done"
 msgstr "同步完成"
 
-#: kmfoldercachedimap.cpp:1326
+#: kmfoldercachedimap.cpp:1464
 msgid "Uploading messages to server"
 msgstr "将信件上传到服务器"
 
-#: kmfoldercachedimap.cpp:1342
+#: kmfoldercachedimap.cpp:1480
 msgid ""
 "<p>Your access rights to folder <b>%1</b> have been restricted, it will no "
 "longer be possible to add messages to this folder.</p>"
 msgstr "<p>您对文件夹 <b>%1</b> 的访问受限，以后将不能再向此文件夹内添加信件。</p>"
 
-#: kmfoldercachedimap.cpp:1344
+#: kmfoldercachedimap.cpp:1482
 msgid "Acces rights revoked"
 msgstr "访问权限已撤消"
 
-#: kmfoldercachedimap.cpp:1347 kmfoldercachedimap.cpp:1402
-#: kmfoldercachedimap.cpp:1447
+#: kmfoldercachedimap.cpp:1485 kmfoldercachedimap.cpp:1545
+#: kmfoldercachedimap.cpp:1596
 msgid "No messages to upload to server"
 msgstr "没有信件要上传到服务器"
 
-#: kmfoldercachedimap.cpp:1366 kmfoldercachedimap.cpp:1410
+#: kmfoldercachedimap.cpp:1504 kmfoldercachedimap.cpp:1553
 msgid "Uploading status of messages to server"
 msgstr "将信件状态上传到服务器"
 
-#: kmfoldercachedimap.cpp:1490
+#: kmfoldercachedimap.cpp:1647
 msgid "Creating subfolders on server"
 msgstr "在服务器上创建子文件夹"
 
-#: kmfoldercachedimap.cpp:1546
+#: kmfoldercachedimap.cpp:1707
 msgid ""
 "<qt>"
 "<p>Mails on the server in folder <b>%1</b> were deleted. Do you want to delete "
@@ -6270,55 +7108,55 @@ msgid ""
 "<br>UIDs: %2</p></qt>"
 msgstr "<qt><p>服务器上文件夹 <b>%1</b> 内的邮件将被删除。您想要在本地删除它们吗？<br>UID：%2</p></qt>"
 
-#: kmfoldercachedimap.cpp:1558
+#: kmfoldercachedimap.cpp:1719
 msgid "Deleting removed messages from server"
 msgstr "从服务器上清除已删除的信件"
 
-#: kmfoldercachedimap.cpp:1592
+#: kmfoldercachedimap.cpp:1758
 msgid "Checking folder validity"
 msgstr "检查文件夹有效性"
 
-#: kmfoldercachedimap.cpp:1806
+#: kmfoldercachedimap.cpp:1972
 msgid "Folder listing failed in interesting ways."
 msgstr "因特殊原因，文件夹列表操作失败。"
 
-#: kmfoldercachedimap.cpp:1888
+#: kmfoldercachedimap.cpp:2058
 #, c-format
 msgid "Retrieving folders for namespace %1"
 msgstr "获取命名空间 %1 的文件夹"
 
-#: kmfoldercachedimap.cpp:2130
+#: kmfoldercachedimap.cpp:2300
 msgid ""
 "<qt>"
 "<p>It seems that the folder <b>%1</b> was deleted. Do you want to delete it "
 "from the server?</p></qt>"
 msgstr "<qt><p>似乎文件夹 <b>%1</b> 已删除。您想要从服务器上删除吗？</p></qt>"
 
-#: kmfoldercachedimap.cpp:2411
+#: kmfoldercachedimap.cpp:2597
 msgid "Aborted"
 msgstr "已中止"
 
-#: kmfoldercachedimap.cpp:2592
+#: kmfoldercachedimap.cpp:2812
 msgid ""
 "The IMAP server %1 does not have support for IMAP annotations. The XML storage "
 "cannot be used on this server; please re-configure KMail differently."
 msgstr "IMAP 服务器 %1 不支持 IMAP 批注。此服务器无法使用 XML 存储；请重新用不同的方式配置 KMail。"
 
-#: kmfoldercachedimap.cpp:2620
+#: kmfoldercachedimap.cpp:2840
 msgid ""
 "The IMAP server %1 doesn't have support for imap annotations. The XML storage "
 "cannot be used on this server, please re-configure KMail differently"
 msgstr "IMAP 服务器 %1 不支持 IMAP 批注。此服务器无法使用 XML 存储，请重新用不同的方式配置 KMail"
 
-#: kmfoldercachedimap.cpp:2729
+#: kmfoldercachedimap.cpp:2951
 msgid "Error while setting annotation: "
 msgstr "设置批注出错："
 
-#: kmfoldercachedimap.cpp:2857 kmfoldercachedimap.cpp:2860
+#: kmfoldercachedimap.cpp:3079 kmfoldercachedimap.cpp:3082
 msgid "lost+found"
 msgstr "待认领"
 
-#: kmfoldercachedimap.cpp:2895
+#: kmfoldercachedimap.cpp:3117
 msgid ""
 "<p>There are new messages in folder <b>%1</b>, which have not been uploaded to "
 "the server yet, but the folder has been deleted on the server or you do not "
@@ -6329,11 +7167,11 @@ msgstr ""
 "<p>文件夹 <b>%1</b> 中有尚未上传到服务器的新信件，而此文件夹似乎已在服务器上被删除，或者您没有上传这些信件至文件夹的足够权限。</p>"
 "<p>为避免数据丢失，所有受影响的信件将被移动到 <b>%2</b>。</p>"
 
-#: kmfoldercachedimap.cpp:2901
+#: kmfoldercachedimap.cpp:3123
 msgid "Insufficient access rights"
 msgstr "访问权限不足"
 
-#: kmfoldercachedimap.cpp:2907
+#: kmfoldercachedimap.cpp:3129
 msgid ""
 "<p>There are new messages in this folder (%1), which have not been uploaded to "
 "the server yet, but the folder has been deleted on the server or you do not "
@@ -6347,55 +7185,62 @@ msgstr ""
 "的文件夹。</p>"
 "<p>您现在是否想要将这些信件移至另外一个文件夹？</p>"
 
-#: kmfoldercachedimap.cpp:2914 kmkernel.cpp:1801
+#: kmfoldercachedimap.cpp:3136 kmkernel.cpp:1903
 msgid "Do Not Move"
 msgstr "不移动"
 
-#: kmfoldercachedimap.cpp:2916
+#: kmfoldercachedimap.cpp:3138
 msgid "Move Messages to Folder"
 msgstr "移动信件到文件夹"
 
-#: kmfolderdia.cpp:83
+#: kmfolderdia.cpp:84
 msgid "Permissions (ACL)"
 msgstr "权限(ACL)"
 
 #. i18n: file folderpropertiesdialog.ui line 30
-#: kmfolderdia.cpp:121 rc.cpp:221 snippetwidget.cpp:119
+#: kmfolderdia.cpp:122 rc.cpp:227 snippetwidget.cpp:119
 #, no-c-format
 msgid "General"
 msgstr "常规"
 
-#: kmfolderdia.cpp:124
+#: kmfolderdia.cpp:125
 msgid "Templates"
 msgstr "模板"
 
-#: kmfolderdia.cpp:133
+#: kmfolderdia.cpp:134
 msgid "Access Control"
 msgstr "访问控制"
 
-#: kmfolderdia.cpp:140
+#: kmfolderdia.cpp:141
 msgid "Quota"
 msgstr "配额"
 
+#: kmfolderdia.cpp:327
+msgid ""
+"Not enough permissions to rename this folder.\n"
+"The parent folder doesn't have write support.\n"
+"A sync is needed after changing the permissions."
+msgstr ""
+
 #. i18n: file folderpropertiesdialog.ui line 243
-#: kmfolderdia.cpp:299 rc.cpp:239
+#: kmfolderdia.cpp:356 rc.cpp:245
 #, no-c-format
 msgid "Use custom &icons"
 msgstr "使用自定义图标(&I)"
 
-#: kmfolderdia.cpp:304
+#: kmfolderdia.cpp:361
 msgid "&Normal:"
 msgstr "普通(&N)："
 
-#: kmfolderdia.cpp:319
+#: kmfolderdia.cpp:376
 msgid "&Unread:"
 msgstr "未读(&U)："
 
-#: kmfolderdia.cpp:356
+#: kmfolderdia.cpp:413
 msgid "Act on new/unread mail in this folder"
 msgstr "通知此文件夹中的新邮件/未读邮件"
 
-#: kmfolderdia.cpp:358
+#: kmfolderdia.cpp:415
 msgid ""
 "<qt>"
 "<p>If this option is enabled then you will be notified about new/unread mail in "
@@ -6411,49 +7256,49 @@ msgstr ""
 "<p>如果您不想收到这类通知，或想要在转到下一个/上一个有未读信件的文件夹时略过此文件夹，请取消此选项。在需要忽略废件夹和垃圾信件夹中的新/未读邮件的场合下，这"
 "么做非常有用。</p></qt>"
 
-#: kmfolderdia.cpp:374
+#: kmfolderdia.cpp:431
 msgid "Include this folder in mail checks"
 msgstr "检查邮件时包含此文件夹"
 
-#: kmfolderdia.cpp:385
+#: kmfolderdia.cpp:442
 msgid "Keep replies in this folder"
 msgstr "保留此文件夹中的回复"
 
-#: kmfolderdia.cpp:387
+#: kmfolderdia.cpp:444
 msgid ""
 "Check this option if you want replies you write to mails in this folder to be "
 "put in this same folder after sending, instead of in the configured sent-mail "
 "folder."
 msgstr "如果您想要将在此文件夹中撰写的回信在发送后仍然保存在同一文件夹，而不是系统配置的已发邮件文件夹，请选中此选项。"
 
-#: kmfolderdia.cpp:402
+#: kmfolderdia.cpp:459
 msgid "Show Sender/Receiver Column in List of Messages"
 msgstr "在信件列表中显示发件人/收件人列"
 
-#: kmfolderdia.cpp:404
+#: kmfolderdia.cpp:461
 msgid "Sho&w column:"
 msgstr "显示列(&W)："
 
 #. i18n: file folderpropertiesdialog.ui line 520
-#: kmfolderdia.cpp:411 kmheaders.cpp:181 kmheaders.cpp:243 kmheaders.cpp:378
-#: kmheaders.cpp:549 kmheaders.cpp:765 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:287
+#: kmfolderdia.cpp:468 kmheaders.cpp:185 kmheaders.cpp:248 kmheaders.cpp:392
+#: kmheaders.cpp:577 kmheaders.cpp:794 kmpopfiltercnfrmdlg.cpp:40 rc.cpp:293
 #, no-c-format
 msgid "Sender"
 msgstr "发件人"
 
 #. i18n: file folderpropertiesdialog.ui line 525
-#: kmfolderdia.cpp:412 kmheaders.cpp:139 kmheaders.cpp:184 kmheaders.cpp:240
-#: kmheaders.cpp:245 kmheaders.cpp:380 kmheaders.cpp:551 kmheaders.cpp:767
-#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:290
+#: kmfolderdia.cpp:469 kmheaders.cpp:142 kmheaders.cpp:188 kmheaders.cpp:245
+#: kmheaders.cpp:250 kmheaders.cpp:394 kmheaders.cpp:579 kmheaders.cpp:796
+#: kmpopfiltercnfrmdlg.cpp:41 rc.cpp:296
 #, no-c-format
 msgid "Receiver"
 msgstr "收件人"
 
-#: kmfolderdia.cpp:423
+#: kmfolderdia.cpp:480
 msgid "&Sender identity:"
 msgstr "发送者身份(&S)："
 
-#: kmfolderdia.cpp:429
+#: kmfolderdia.cpp:486
 msgid ""
 "Select the sender identity to be used when writing new mail or replying to mail "
 "in this folder. This means that if you are in one of your work folders, you can "
@@ -6464,15 +7309,15 @@ msgstr ""
 "选择针对此文件夹撰写新邮件或回复邮件的发件人身份。这意味着当您在一个工作文件夹中时，您可以使 KMail "
 "自动选用发件人地址、签名或加密密钥。在主配置对话框中也可以设定身份(设置->配置 KMail)。"
 
-#: kmfolderdia.cpp:442
+#: kmfolderdia.cpp:500
 msgid "&Folder contents:"
 msgstr "文件夹内容(&F)："
 
-#: kmfolderdia.cpp:475
+#: kmfolderdia.cpp:533
 msgid "Generate free/&busy and activate alarms for:"
 msgstr "生成忙/闲及激活提醒的用户(&B)："
 
-#: kmfolderdia.cpp:482
+#: kmfolderdia.cpp:540
 msgid ""
 "This setting defines which users sharing this folder should get \"busy\" "
 "periods in their freebusy lists and should see the alarms for the events or "
@@ -6494,28 +7339,40 @@ msgstr ""
 "另一方面，如果一个工作组要为组会议共享日历，所有此文件夹的读者都应该为此次会议标记为“忙碌”。\n"
 "一个含有可选事件的面向全公司的文件夹应使用“无人”设定，因为不能确知会有谁参与此事件。"
 
-#: kmfolderdia.cpp:497
+#: kmfolderdia.cpp:555
 msgid "Nobody"
 msgstr "无人"
 
-#: kmfolderdia.cpp:498
+#: kmfolderdia.cpp:556
 msgid "Admins of This Folder"
 msgstr "此文件夹的管理员"
 
-#: kmfolderdia.cpp:499
+#: kmfolderdia.cpp:557
 msgid "All Readers of This Folder"
 msgstr "此文件夹的全部读者"
 
-#: kmfolderdia.cpp:502
+#: kmfolderdia.cpp:560
 msgid ""
 "This setting allows you to disable alarms for folders shared by others. "
 msgstr "此设置允许您禁止对共享文件夹的提醒。"
 
-#: kmfolderdia.cpp:506
-msgid "Block free/&busy and alarms locally"
+#: kmfolderdia.cpp:562
+#, fuzzy
+msgid "Block alarms locally"
 msgstr "在本地屏蔽忙/闲信息及提醒(&B)"
 
-#: kmfolderdia.cpp:585
+#: kmfolderdia.cpp:576
+msgid "Share unread state with all users"
+msgstr ""
+
+#: kmfolderdia.cpp:579
+msgid ""
+"If enabled, the unread state of messages in this folder will be the same for "
+"all users having access to this folders. If disabled (the default), every user "
+"with access to this folder has her own unread state."
+msgstr ""
+
+#: kmfolderdia.cpp:661
 msgid ""
 "You have configured this folder to contain groupware information and the "
 "general configuration option to hide groupware folders is set. That means that "
@@ -6526,70 +7383,70 @@ msgstr ""
 "您将此文件夹配置为包含群件信息，但却在常规配置选项中隐藏群件文件夹。这意味着，关闭此对话框后，此文件夹将会立即消失。如果您想要再次删除此文件夹，您需要临时禁止隐"
 "藏群件文件夹才能看到此文件夹。"
 
-#: kmfolderdir.cpp:184
+#: kmfolderdir.cpp:209
 msgid "<qt>Cannot enter folder <b>%1</b>.</qt>"
 msgstr "<qt>无法进入文件夹 <b>%1</b>。</qt>"
 
-#: kmfolderdir.cpp:192
+#: kmfolderdir.cpp:217
 msgid "<qt>Folder <b>%1</b> is unreadable.</qt>"
 msgstr "<qt>文件夹 <b>%1</b> 不可读。</qt>"
 
-#: kmfolderimap.cpp:251
+#: kmfolderimap.cpp:247
 msgid "Removing folder"
 msgstr "删除文件夹"
 
-#: kmfolderimap.cpp:252 searchjob.cpp:270
+#: kmfolderimap.cpp:248 searchjob.cpp:270
 #, c-format
 msgid "URL: %1"
 msgstr "URL：%1"
 
-#: kmfolderimap.cpp:267
+#: kmfolderimap.cpp:263
 msgid "Error while removing a folder."
 msgstr "删除文件夹时出错。"
 
-#: kmfolderimap.cpp:497
+#: kmfolderimap.cpp:491
 #, c-format
 msgid "Destination folder: %1"
 msgstr "目标文件夹：%1"
 
-#: kmfolderimap.cpp:1068
+#: kmfolderimap.cpp:1069
 msgid "checking"
 msgstr "检查"
 
-#: kmfolderimap.cpp:1118
+#: kmfolderimap.cpp:1119
 msgid "Error while querying the server status."
 msgstr "查询服务器状态出错。"
 
-#: kmfolderimap.cpp:1233
+#: kmfolderimap.cpp:1234
 msgid "Retrieving message status"
 msgstr "获取信件状态"
 
-#: kmfolderimap.cpp:1248 kmfolderimap.cpp:1343
+#: kmfolderimap.cpp:1249 kmfolderimap.cpp:1344
 msgid "Retrieving messages"
 msgstr "获取信件"
 
-#: kmfolderimap.cpp:1273
+#: kmfolderimap.cpp:1274
 #, c-format
 msgid "Error while listing the contents of the folder %1."
 msgstr "列出文件夹 %1 的内容时出错。"
 
-#: kmfolderimap.cpp:1694
+#: kmfolderimap.cpp:1695
 msgid "Error while retrieving messages."
 msgstr "获取信件时出错。"
 
-#: kmfolderimap.cpp:1763
+#: kmfolderimap.cpp:1764
 msgid "Error while creating a folder."
 msgstr "创建文件夹时出错。"
 
-#: kmfolderimap.cpp:2130
+#: kmfolderimap.cpp:2131
 msgid "updating message counts"
 msgstr "更新信件计数"
 
-#: kmfolderimap.cpp:2154
+#: kmfolderimap.cpp:2155
 msgid "Error while getting folder information."
 msgstr "获取文件夹信息出错。"
 
-#: kmfolderindex.cpp:334
+#: kmfolderindex.cpp:369
 msgid ""
 "The mail index for '%1' is from an unknown version of KMail (%2).\n"
 "This index can be regenerated from your mail folder, but some information, "
@@ -6598,18 +7455,19 @@ msgstr ""
 "%1 的邮件索引是来自一个未知版本的KMail (%2)。\n"
 "这个索引可以从您的文件夹中重新生成，但是某些信息，包括状态标记，可能会丢失。您希望把您的索引文件降级吗？"
 
-#: kmfolderindex.cpp:337
+#: kmfolderindex.cpp:372
 msgid "Downgrade"
 msgstr "降级"
 
-#: kmfolderindex.cpp:337
+#: kmfolderindex.cpp:372
 msgid "Do Not Downgrade"
 msgstr "不降级"
 
-#: kmfolderindex.cpp:491
+#: kmfolderindex.cpp:529
+#, fuzzy
 msgid ""
 "The mail index for '%1' is corrupted and will be regenerated now, but some "
-"information, including status flags, will be lost."
+"information, like status flags, might get lost."
 msgstr "%1 的邮件索引已损坏，现在需要重新生成。但是包括状态标记在内的部分信息可能会丢失。"
 
 #: kmfoldermaildir.cpp:89
@@ -6626,23 +7484,23 @@ msgstr "打开 %1 出错；可能不是合法的 maildir 文件夹，或者您�
 msgid "Folder `%1' changed; recreating index."
 msgstr "文件夹“%1”已更改；正在重新建立索引。"
 
-#: kmfoldermaildir.cpp:252
+#: kmfoldermaildir.cpp:253
 msgid "Could not sync maildir folder."
 msgstr "无法同步 maildir 文件夹。"
 
-#: kmfoldermaildir.cpp:417
+#: kmfoldermaildir.cpp:418
 msgid "Message could not be added to the folder, possibly disk space is low."
 msgstr "信件无法添加到文件夹中，可能是磁盘空间不够。"
 
-#: kmfoldermaildir.cpp:510
+#: kmfoldermaildir.cpp:514
 msgid "KMFolderMaildir::addMsg: abnormally terminating to prevent data loss."
 msgstr "KMFolderMaildir::addMsg: 为了避免数据丢失异常中止。"
 
-#: kmfoldermaildir.cpp:884 kmfoldermbox.cpp:794
+#: kmfoldermaildir.cpp:888 kmfoldermbox.cpp:799
 msgid "Writing index file"
 msgstr "正在写入索引文件"
 
-#: kmfoldermaildir.cpp:892 kmfoldermbox.cpp:803
+#: kmfoldermaildir.cpp:896 kmfoldermbox.cpp:808
 msgid ""
 "Your outbox contains messages which were most-likely not created by KMail;\n"
 "please remove them from there if you do not want KMail to send them."
@@ -6650,7 +7508,7 @@ msgstr ""
 "您的发件箱包含了很有可能不是由 KMail 创建的信件；\n"
 "如果您不希望 KMail 发送它们，请把它们从那里删除。"
 
-#: kmfoldermbox.cpp:111
+#: kmfoldermbox.cpp:112
 msgid ""
 "Cannot open file \"%1\":\n"
 "%2"
@@ -6658,7 +7516,7 @@ msgstr ""
 "无法打开文件“%1”：\n"
 "%2"
 
-#: kmfoldermbox.cpp:128
+#: kmfoldermbox.cpp:129
 msgid ""
 "<qt>"
 "<p>The index of folder '%2' seems to be out of date. To prevent message "
@@ -6672,38 +7530,38 @@ msgstr ""
 "<p>文件夹“%2”的索引可能已经过期。为了避免信件损坏，现在将重新生成索引。可能导致删除的信件重新出现，状态标记也可能丢失。</p>"
 "<p>请在 <a href=\"%1\">KMail 手册的常见问题解答章节</a>中的相关条目中查找如何避免此问题再次出现的信息。</p></qt>"
 
-#: kmfoldermbox.cpp:152 kmfoldermbox.cpp:158
+#: kmfoldermbox.cpp:153 kmfoldermbox.cpp:159
 msgid "Index Out of Date"
 msgstr "索引过期"
 
-#: kmfoldermbox.cpp:165
+#: kmfoldermbox.cpp:166
 msgid "Folder `%1' changed. Recreating index."
 msgstr "文件夹“%1”被修改。正在重新建立索引。"
 
-#: kmfoldermbox.cpp:298
+#: kmfoldermbox.cpp:300
 msgid "Could not sync index file <b>%1</b>: %2"
 msgstr "无法同步索引文件 <b>%1</b>：%2"
 
-#: kmfoldermbox.cpp:298
+#: kmfoldermbox.cpp:300
 msgid "Internal error. Please copy down the details and report a bug."
 msgstr "内部错误。请复制以下细节并提交错误报告。"
 
-#: kmfoldermbox.cpp:597
+#: kmfoldermbox.cpp:602
 #, c-format
 msgid ""
 "_n: Creating index file: one message done\n"
 "Creating index file: %n messages done"
 msgstr "正在创建索引文件：已完成 %n 封信件"
 
-#: kmfoldermbox.cpp:1038
+#: kmfoldermbox.cpp:1043
 msgid "Could not add message to folder: "
 msgstr "无法将信件添加到文件夹："
 
-#: kmfoldermbox.cpp:1119
+#: kmfoldermbox.cpp:1127
 msgid "Could not add message to folder:"
 msgstr "无法将信件添加到文件夹："
 
-#: kmfoldermbox.cpp:1121
+#: kmfoldermbox.cpp:1129
 msgid "Could not add message to folder (No space left on device?)"
 msgstr "无法将信件添加到文件夹(驱动器上没有剩余空间了？)"
 
@@ -6711,11 +7569,11 @@ msgstr "无法将信件添加到文件夹(驱动器上没有剩余空间了？)"
 msgid "Are you sure you want to expire old messages?"
 msgstr "您确定要将旧信件过期删除吗？"
 
-#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1366
+#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1330
 msgid "Expire Old Messages?"
 msgstr "删除过期旧信件？"
 
-#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1366
+#: kmfoldermgr.cpp:69 kmmainwidget.cpp:1330
 msgid "Expire"
 msgstr "删除过期信件"
 
@@ -6727,7 +7585,7 @@ msgstr ""
 "“%1”好像不是文件夹。\n"
 "请先将文件移出。"
 
-#: kmfoldermgr.cpp:153 kmkernel.cpp:1325
+#: kmfoldermgr.cpp:153 kmkernel.cpp:1368
 msgid ""
 "The permissions of the folder '%1' are incorrect;\n"
 "please make sure that you can view and modify the content of this folder."
@@ -6735,7 +7593,7 @@ msgstr ""
 "文件夹“%1”的权限不正确；\n"
 "请确定您可以查看并修改此文件夹的内容。"
 
-#: kmfoldermgr.cpp:163 kmkernel.cpp:1317
+#: kmfoldermgr.cpp:163 kmkernel.cpp:1360
 msgid ""
 "KMail could not create folder '%1';\n"
 "please make sure that you can view and modify the content of the folder '%2'."
@@ -6753,7 +7611,7 @@ msgstr "在检查完最后一份邮件后同名文件夹会被删除。您需要
 msgid "Could Not Create Folder"
 msgstr "无法创建文件夹"
 
-#: kmfoldermgr.cpp:329 kmkernel.cpp:1611
+#: kmfoldermgr.cpp:329 kmkernel.cpp:1676
 msgid ""
 "Cannot create file `%1' in %2.\n"
 "KMail cannot start without it."
@@ -6761,218 +7619,224 @@ msgstr ""
 "无法在 %2 中创建文件夹“%1”。\n"
 "KMail 没有它无法启动。"
 
-#: kmfolderseldlg.cpp:96 kmfolderseldlg.cpp:380 kmfolderseldlg.cpp:414
-#: kmfolderseldlg.cpp:416
-msgid "Path"
-msgstr "路径"
-
-#: kmfolderseldlg.cpp:283 kmfolderseldlg.cpp:445 kmfolderseldlg.cpp:465
-#: kmfoldertree.cpp:1056 kmfoldertree.cpp:1077
+#: kmfolderseldlg.cpp:25 kmfolderseldlg.cpp:47 kmfoldertree.cpp:1091
+#: kmfoldertree.cpp:1112 treebase.cpp:99
 msgid "&New Subfolder..."
 msgstr "新建子文件夹(&N)..."
 
-#: kmfolderseldlg.cpp:446 kmfolderseldlg.cpp:466
+#: kmfolderseldlg.cpp:26 kmfolderseldlg.cpp:48
 msgid "Create a new subfolder under the currently selected folder"
 msgstr "在目前选中的文件夹中创建新的子文件夹"
 
-#: kmfoldertree.cpp:386 kmheaders.cpp:128
+#: kmfolderseldlg.cpp:36 kmfolderseldlg.cpp:55
+msgid "You can start typing to filter the list of folders"
+msgstr ""
+
+#: kmfoldertree.cpp:407 kmheaders.cpp:130
 msgid "View Columns"
 msgstr "查看列"
 
-#: kmfoldertree.cpp:388
+#: kmfoldertree.cpp:409
 msgid "Unread Column"
 msgstr "未读列"
 
-#: kmfoldertree.cpp:389
+#: kmfoldertree.cpp:410
 msgid "Total Column"
 msgstr "总计列"
 
-#: kmfoldertree.cpp:390
+#: kmfoldertree.cpp:411
 msgid "Size Column"
 msgstr "大小列"
 
-#: kmfoldertree.cpp:567 kmfoldertree.cpp:1059
+#: kmfoldertree.cpp:591 kmfoldertree.cpp:1094
 msgid "Searches"
 msgstr "搜索"
 
-#: kmfoldertree.cpp:884
+#: kmfoldertree.cpp:920
 msgid "<qt>Go to the next unread message in folder <b>%1</b>?</qt>"
 msgstr "<qt>跳转到文件夹 <b>%1</b> 中下一条未读的信件？</qt>"
 
-#: kmfoldertree.cpp:886
+#: kmfoldertree.cpp:922
 msgid "Go to Next Unread Message"
 msgstr "转到下一条未读的信件"
 
-#: kmfoldertree.cpp:887
+#: kmfoldertree.cpp:923
 msgid "Go To"
 msgstr "转到"
 
-#: kmfoldertree.cpp:887
+#: kmfoldertree.cpp:923
 msgid "Do Not Go To"
 msgstr "不转到"
 
-#: kmfoldertree.cpp:1057 kmmainwidget.cpp:2757
+#: kmfoldertree.cpp:1092 kmmainwidget.cpp:2780
 msgid "&New Folder..."
 msgstr "新建文件夹(&N)..."
 
-#: kmfoldertree.cpp:1068 kmmainwidget.cpp:2645
+#: kmfoldertree.cpp:1103 kmmainwidget.cpp:2668
 msgid "Check &Mail"
 msgstr "检查邮件(&M)"
 
-#: kmfoldertree.cpp:1084
+#: kmfoldertree.cpp:1119
 msgid "&Copy Folder To"
 msgstr "文件夹复制到(&C)"
 
-#: kmfoldertree.cpp:1090
+#: kmfoldertree.cpp:1125
 msgid "&Move Folder To"
 msgstr "文件夹移至(&M)"
 
-#: kmfoldertree.cpp:1104
+#: kmfoldertree.cpp:1141
 msgid "Add to Favorite Folders"
 msgstr "添加到收藏夹"
 
-#: kmfoldertree.cpp:1123
-msgid "Subscription..."
+#: kmfoldertree.cpp:1160
+#, fuzzy
+msgid "Serverside Subscription..."
 msgstr "订阅..."
 
-#: kmfoldertree.cpp:1126
+#: kmfoldertree.cpp:1163
 msgid "Local Subscription..."
 msgstr "本地订阅..."
 
-#: kmfoldertree.cpp:1133
+#: kmfoldertree.cpp:1170
 msgid "Refresh Folder List"
 msgstr "刷新文件夹列表"
 
-#: kmfoldertree.cpp:1140 kmmainwidget.cpp:3737
+#: kmfoldertree.cpp:1177 kmmainwidget.cpp:3771
 msgid "&Troubleshoot IMAP Cache..."
 msgstr "IMAP 缓存疑难解答(&T)..."
 
-#: kmfoldertree.cpp:1242
+#: kmfoldertree.cpp:1280
+#, fuzzy
 msgid ""
-"<qt>Cannot create folder <b>%1</b> because of insufficient permissions on the "
-"server. If you think you should be able to create subfolders here, ask your "
+"<qt>Cannot create folder under <b>%1</b> because of insufficient permissions on "
+"the server. If you think you should be able to create subfolders here, ask your "
 "administrator to grant you rights to do so.</qt> "
 msgstr ""
 "<qt>无法创建文件夹 <b>%1</b>，原因是服务器上的权限不够。如果您认为您应该可以在此创建子文件夹，请要求您的管理员给予您相应的权限。</qt> "
 
-#: kmfoldertree.cpp:1657 kmmainwidget.cpp:420 kmmainwidget.cpp:427
-#: kmmainwidget.cpp:434 kmsearchpattern.h:220
+#: kmfoldertree.cpp:1695 kmmainwidget.cpp:412 kmmainwidget.cpp:419
+#: kmmainwidget.cpp:426 kmsearchpattern.h:220
 msgid "Unread"
 msgstr "未读"
 
-#: kmfoldertree.cpp:1670 kmmainwidget.cpp:422 kmmainwidget.cpp:429
-#: kmmainwidget.cpp:436
+#: kmfoldertree.cpp:1708 kmmainwidget.cpp:414 kmmainwidget.cpp:421
+#: kmmainwidget.cpp:428
 msgid "Total"
 msgstr "总计"
 
-#: kmfoldertree.cpp:1951
+#: kmfoldertree.cpp:1989
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> here because a folder with the same "
 "name already exists.</qt>"
 msgstr "<qt>无法复制或移动文件夹 <b>%1</b> 到这里，因为同名文件夹已存在。</qt>"
 
-#: kmfoldertree.cpp:1961
+#: kmfoldertree.cpp:2000
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> because it is not completely copied "
 "itself.</qt>"
 msgstr "<qt>无法复制或移动文件夹 <b>%1</b>，因为没有复制完全。</qt>"
 
-#: kmfoldertree.cpp:1970
+#: kmfoldertree.cpp:2010
 msgid ""
 "<qt>Cannot move or copy folder <b>%1</b> into a subfolder below itself.</qt>"
 msgstr "<qt>无法复制或移动文件夹 <b>%1</b> 到其自身的子文件夹下。</qt>"
 
-#: kmfoldertree.cpp:2012
+#: kmfoldertree.cpp:2055
 msgid "Moving the selected folders is not possible"
 msgstr "不能移动选中的文件夹"
 
-#: kmheaders.cpp:130
+#: kmheaders.cpp:132
 msgid "Status"
 msgstr "状态"
 
-#: kmheaders.cpp:131 kmsearchpattern.h:218
+#: kmheaders.cpp:133 kmsearchpattern.h:218
 msgid "Important"
 msgstr "重要"
 
-#: kmheaders.cpp:132
+#: kmheaders.cpp:134
 msgid "Action Item"
 msgstr "活动项目"
 
-#: kmheaders.cpp:133
+#: kmheaders.cpp:135
 msgid "Attachment"
 msgstr "附件"
 
-#: kmheaders.cpp:134
+#: kmheaders.cpp:136 kmsearchpattern.h:233
+#, fuzzy
+msgid "Invitation"
+msgstr "文档"
+
+#: kmheaders.cpp:137
 msgid "Spam/Ham"
 msgstr "垃圾/有害"
 
-#: kmheaders.cpp:135
+#: kmheaders.cpp:138
 msgid "Watched/Ignored"
 msgstr "监视/忽略"
 
-#: kmheaders.cpp:136
+#: kmheaders.cpp:139
 msgid "Signature"
 msgstr "签名"
 
-#: kmheaders.cpp:180 kmheaders.cpp:775 kmheaders.cpp:2604
-#: kmpopfiltercnfrmdlg.cpp:39 searchwindow.cpp:224
-#: templatesinsertcommand.cpp:142 templatesinsertcommand.cpp:243
+#: kmheaders.cpp:184 kmheaders.cpp:804 kmheaders.cpp:2646
+#: kmpopfiltercnfrmdlg.cpp:39 kmsearchpatternedit.cpp:41 searchwindow.cpp:223
+#: templatesinsertcommand.cpp:145 templatesinsertcommand.cpp:246
 msgid "Subject"
 msgstr "主题"
 
-#: kmheaders.cpp:182 kmheaders.cpp:770 kmheaders.cpp:2599
-#: kmpopfiltercnfrmdlg.cpp:42 searchwindow.cpp:228
-#: templatesinsertcommand.cpp:66 templatesinsertcommand.cpp:167
+#: kmheaders.cpp:186 kmheaders.cpp:799 kmheaders.cpp:2641
+#: kmpopfiltercnfrmdlg.cpp:42 searchwindow.cpp:227
+#: templatesinsertcommand.cpp:66 templatesinsertcommand.cpp:170
 msgid "Date"
 msgstr "日期"
 
-#: kmheaders.cpp:772 kmheaders.cpp:2601
+#: kmheaders.cpp:801 kmheaders.cpp:2643
 msgid "Order of Arrival"
 msgstr "到达顺序"
 
-#: kmheaders.cpp:777 kmheaders.cpp:2606
+#: kmheaders.cpp:806 kmheaders.cpp:2648
 msgid " (Status)"
 msgstr " (状态)"
 
-#: kmheaders.cpp:1360
+#: kmheaders.cpp:1398
 #, c-format
 msgid ""
 "_n: 1 unsent\n"
 "%n unsent"
 msgstr "%n 封未发"
 
-#: kmheaders.cpp:1360
+#: kmheaders.cpp:1398
 msgid "0 unsent"
 msgstr "无已发送"
 
-#: kmheaders.cpp:1362
+#: kmheaders.cpp:1400
 #, c-format
 msgid ""
 "_n: 1 unread\n"
 "%n unread"
 msgstr "%n 封未读"
 
-#: kmheaders.cpp:1362
+#: kmheaders.cpp:1400
 msgid "0 unread"
 msgstr "无未读"
 
-#: kmheaders.cpp:1364
+#: kmheaders.cpp:1402
 msgid ""
 "_n: 1 message, %1.\n"
 "%n messages, %1."
 msgstr "%n 封信，%1。"
 
-#: kmheaders.cpp:1365
+#: kmheaders.cpp:1403
 msgid "0 messages"
 msgstr "无信件"
 
-#: kmheaders.cpp:1367
+#: kmheaders.cpp:1405
 msgid ""
 "_: %1 = n messages, m unread.\n"
 "%1 Folder is read-only."
 msgstr "%1 文件夹为只读。"
 
-#: kmheaders.cpp:1560
+#: kmheaders.cpp:1598
 #, c-format
 msgid ""
 "_n: <qt>Do you really want to delete the selected message?"
@@ -6981,49 +7845,49 @@ msgid ""
 "<br>Once deleted, they cannot be restored.</qt>"
 msgstr "<qt>您真要删除选中的 %n 封信件吗？<br>一旦删除将无法恢复。</qt>"
 
-#: kmheaders.cpp:1562
+#: kmheaders.cpp:1600
 msgid "Delete Messages"
 msgstr "删除信件"
 
-#: kmheaders.cpp:1562
+#: kmheaders.cpp:1600
 msgid "Delete Message"
 msgstr "删除信件"
 
-#: kmheaders.cpp:1586
+#: kmheaders.cpp:1624
 msgid "Messages deleted successfully."
 msgstr "信件删除成功。"
 
-#: kmheaders.cpp:1586
+#: kmheaders.cpp:1624
 msgid "Messages moved successfully"
 msgstr "信件移动成功"
 
-#: kmheaders.cpp:1609
+#: kmheaders.cpp:1647
 msgid "Deleting messages failed."
 msgstr "信件删除失败。"
 
-#: kmheaders.cpp:1609
+#: kmheaders.cpp:1647
 msgid "Moving messages failed."
 msgstr "信件移动失败。"
 
-#: kmheaders.cpp:1612
+#: kmheaders.cpp:1650
 msgid "Deleting messages canceled."
 msgstr "信件删除取消。"
 
-#: kmheaders.cpp:1612
+#: kmheaders.cpp:1650
 msgid "Moving messages canceled."
 msgstr "信件移动取消。"
 
-#: kmheaders.cpp:2431 kmmainwidget.cpp:2977 kmreadermainwin.cpp:470
-#: searchwindow.cpp:833
+#: kmheaders.cpp:2470 kmmainwidget.cpp:2989 kmreadermainwin.cpp:508
+#: searchwindow.cpp:856
 msgid "&Copy To"
 msgstr "复制到(&C)"
 
-#: kmheaders.cpp:2434 kmheaders.cpp:2440 kmmainwidget.cpp:2974
-#: searchwindow.cpp:834
+#: kmheaders.cpp:2473 kmheaders.cpp:2479 kmmainwidget.cpp:2986
+#: searchwindow.cpp:857
 msgid "&Move To"
 msgstr "移到(&M)"
 
-#: kmheaders.cpp:2774 kmheaders.cpp:2814
+#: kmheaders.cpp:2818 kmheaders.cpp:2858
 msgid ""
 "Failure modifying %1\n"
 "(No space left on device?)"
@@ -7031,84 +7895,96 @@ msgstr ""
 "无法修改 %1\n"
 "(设备中没有空间？)"
 
-#: kmkernel.cpp:684
+#: kmkernel.cpp:712
 msgid "Certificate Signature Request"
 msgstr "请求证书签名"
 
-#: kmkernel.cpp:687
+#: kmkernel.cpp:715
 msgid "Please create a certificate from attachment and return to sender."
 msgstr "请从附件创建证书，并返回发件人。"
 
-#: kmkernel.cpp:1210
+#: kmkernel.cpp:1246
 msgid "KMail is set to be offline; all network jobs are suspended"
 msgstr "KMail 设置为脱机；所有的网络任务都将被推迟"
 
-#: kmkernel.cpp:1220
+#: kmkernel.cpp:1256
 msgid "KMail is set to be online; all network jobs resumed"
 msgstr "KMail 设置为联机；所有的网络任务都已恢复"
 
-#: kmkernel.cpp:1241
+#: kmkernel.cpp:1283
 msgid "KMail is currently in offline mode. How do you want to proceed?"
 msgstr "KMail 目前工作于脱机模式中。您是否想要继续？"
 
-#: kmkernel.cpp:1244 kmmainwidget.cpp:1899
+#: kmkernel.cpp:1286 kmmainwidget.cpp:1924
 msgid "Work Online"
 msgstr "联机工作"
 
-#: kmkernel.cpp:1245 kmmainwidget.cpp:1897
+#: kmkernel.cpp:1287 kmmainwidget.cpp:1922
 msgid "Work Offline"
 msgstr "脱机工作"
 
-#: kmkernel.cpp:1379
+#: kmkernel.cpp:1429
 msgid "You do not have read/write permission to your inbox folder."
 msgstr "您没有权限读写您的收件夹。"
 
-#: kmkernel.cpp:1387
+#: kmkernel.cpp:1437
 msgid "outbox"
 msgstr "发件箱"
 
-#: kmkernel.cpp:1389
+#: kmkernel.cpp:1439
 msgid "You do not have read/write permission to your outbox folder."
 msgstr "您没有权限读写您的发件夹。"
 
-#: kmkernel.cpp:1406
+#: kmkernel.cpp:1456
 msgid "sent-mail"
 msgstr "已发邮件"
 
-#: kmkernel.cpp:1408
+#: kmkernel.cpp:1458
 msgid "You do not have read/write permission to your sent-mail folder."
 msgstr "您没有权限读写您的已发文件夹。"
 
-#: kmkernel.cpp:1415
+#: kmkernel.cpp:1465
 msgid "trash"
 msgstr "废件夹"
 
-#: kmkernel.cpp:1417
+#: kmkernel.cpp:1467
 msgid "You do not have read/write permission to your trash folder."
 msgstr "您没有权限读写您的废件夹。"
 
-#: kmkernel.cpp:1424
+#: kmkernel.cpp:1474
 msgid "drafts"
 msgstr "草稿"
 
-#: kmkernel.cpp:1426
+#: kmkernel.cpp:1476
 msgid "You do not have read/write permission to your drafts folder."
 msgstr "您没有权限读写您的草稿夹。"
 
-#: kmkernel.cpp:1435
+#: kmkernel.cpp:1485
 msgid "templates"
 msgstr "模板"
 
-#: kmkernel.cpp:1437
+#: kmkernel.cpp:1487
 msgid "You do not have read/write permission to your templates folder."
 msgstr "您没有权限读写您的模板文件夹。"
 
-#: kmkernel.cpp:1480 searchwindow.cpp:255 searchwindow.cpp:490
-#: searchwindow.cpp:633
+#: kmkernel.cpp:1531 searchwindow.cpp:256 searchwindow.cpp:477
 msgid "Last Search"
 msgstr "上次搜索"
 
-#: kmkernel.cpp:1777
+#: kmkernel.cpp:1716
+msgid ""
+"There is a problem with the mail index of the following folders, the indices "
+"will now be regenerated.\n"
+"This can happen because the index files are out of date, missing or corrupted.\n"
+"Contact your administrator if this happens frequently.\n"
+"Some information, like status flags, might get lost."
+msgstr ""
+
+#: kmkernel.cpp:1721
+msgid "Problem with mail indices"
+msgstr ""
+
+#: kmkernel.cpp:1879
 msgid ""
 "_: %1-%3 is the application name, %4-%7 are folder path\n"
 "<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
@@ -7121,7 +7997,7 @@ msgstr ""
 "<p>%2 可为您将 <i>%6<i> 中的内容移至此文件夹，但是这可能替换 <i>%7</i> 中相同名称的任何文件。"
 "<p><strong>您是否想要 %3 现在移动邮件文件？</strong></qt>"
 
-#: kmkernel.cpp:1789
+#: kmkernel.cpp:1891
 msgid ""
 "_: %1-%3 is the application name, %4-%6 are folder path\n"
 "<qt>The <i>%4</i> folder exists. %1 now uses the <i>%5</i> "
@@ -7132,15 +8008,15 @@ msgstr ""
 "<qt><i>%4</i> 文件夹已存在。%1 现在将使用 <i>%5</i> 文件夹存储邮件。%2 可为您将 <i>%6<i> 中的内容移至此文件夹。"
 "<p><strong>您是否想要 %3 现在移动邮件文件？</strong></qt>"
 
-#: kmkernel.cpp:1798
+#: kmkernel.cpp:1900
 msgid "Migrate Mail Files?"
 msgstr "升迁邮件文件吗？"
 
-#: kmkernel.cpp:2023
+#: kmkernel.cpp:2135
 msgid "KMail encountered a fatal error and will terminate now"
 msgstr "KMail 遇到一个致命错误，即将退出。"
 
-#: kmkernel.cpp:2025
+#: kmkernel.cpp:2137
 #, c-format
 msgid ""
 "KMail encountered a fatal error and will terminate now.\n"
@@ -7151,149 +8027,161 @@ msgstr ""
 "错误是：\n"
 "%1"
 
-#: kmkernel.cpp:2158 kmmainwidget.cpp:1176
+#: kmkernel.cpp:2270 kmmainwidget.cpp:1151
 msgid "Empty Trash"
 msgstr "清空废件夹"
 
-#: kmkernel.cpp:2159
+#: kmkernel.cpp:2271
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "您确定要清空全部账户的废件夹吗？"
 
-#: kmlineeditspell.cpp:105
+#: kmlineeditspell.cpp:134
 msgid "vCard Import Failed"
 msgstr "vCard 导入失败"
 
-#: kmlineeditspell.cpp:116
+#: kmlineeditspell.cpp:135
 msgid "<qt>Unable to access <b>%1</b>.</qt>"
 msgstr "<qt>无法访问 <b>%1</b>。</qt>"
 
-#: kmlineeditspell.cpp:168 recipientspicker.cpp:578
+#: kmlineeditspell.cpp:194 recipientspicker.cpp:578
 msgid "Recent Addresses"
 msgstr "最近的地址"
 
-#: kmmainwidget.cpp:611
+#: kmmainwidget.cpp:601
 msgid "S&earch:"
 msgstr "搜索(&E)："
 
-#: kmmainwidget.cpp:674 kmmainwidget.cpp:1709
+#: kmmainwidget.cpp:664 kmmainwidget.cpp:1686
 msgid "Move Message to Folder"
 msgstr "移动信件到文件夹"
 
-#: kmmainwidget.cpp:679 kmmainwidget.cpp:1818
+#: kmmainwidget.cpp:669 kmmainwidget.cpp:1795
 msgid "Copy Message to Folder"
 msgstr "复制信件到文件夹"
 
-#: kmmainwidget.cpp:684 kmmainwidget.cpp:1697
+#: kmmainwidget.cpp:674 kmmainwidget.cpp:1674
 msgid "Jump to Folder"
 msgstr "跳转到文件夹"
 
-#: kmmainwidget.cpp:743
+#: kmmainwidget.cpp:717
 msgid "Remove Duplicate Messages"
 msgstr "删除重复的信件"
 
-#: kmmainwidget.cpp:748
+#: kmmainwidget.cpp:722
 msgid "Abort Current Operation"
 msgstr "中止当前操作"
 
-#: kmmainwidget.cpp:753
+#: kmmainwidget.cpp:727
 msgid "Focus on Next Folder"
 msgstr "焦点移到下一个文件夹"
 
-#: kmmainwidget.cpp:758
+#: kmmainwidget.cpp:732
 msgid "Focus on Previous Folder"
 msgstr "焦点移到上一个文件夹"
 
-#: kmmainwidget.cpp:763
+#: kmmainwidget.cpp:737
 msgid "Select Folder with Focus"
 msgstr "选择带焦点的文件夹"
 
-#: kmmainwidget.cpp:768
+#: kmmainwidget.cpp:742
 msgid "Focus on Next Message"
 msgstr "焦点移到下一封信"
 
-#: kmmainwidget.cpp:773
+#: kmmainwidget.cpp:747
 msgid "Focus on Previous Message"
 msgstr "焦点移到上一封信"
 
-#: kmmainwidget.cpp:778
+#: kmmainwidget.cpp:752
 msgid "Select Message with Focus"
 msgstr "带焦点选中信件"
 
-#: kmmainwidget.cpp:977
+#: kmmainwidget.cpp:951
 msgid ""
 "_n: 1 new message in %1\n"
 "%n new messages in %1"
 msgstr "%1中有 %n 封新信"
 
-#: kmmainwidget.cpp:993
+#: kmmainwidget.cpp:967
 msgid ""
 "_: %1 is a list of the number of new messages per folder\n"
 "<b>New mail arrived</b>"
 "<br>%1"
 msgstr "<b>新邮件已到达</b><br>%1"
 
-#: kmmainwidget.cpp:997
+#: kmmainwidget.cpp:971
 msgid "New mail arrived"
 msgstr "新邮件到达"
 
-#: kmmainwidget.cpp:1128
+#: kmmainwidget.cpp:1100
 #, c-format
 msgid "Properties of Folder %1"
 msgstr "文件夹 %1 的属性"
 
-#: kmmainwidget.cpp:1149
+#: kmmainwidget.cpp:1124
 msgid "This folder does not have any expiry options set"
 msgstr "文件夹没有设置任何过期选项"
 
-#: kmmainwidget.cpp:1157
+#: kmmainwidget.cpp:1132
 msgid "<qt>Are you sure you want to expire the folder <b>%1</b>?</qt>"
 msgstr "<qt>您确定要对文件夹 <b>%1</b> 进行过期删除？</qt>"
 
-#: kmmainwidget.cpp:1158
+#: kmmainwidget.cpp:1133
 msgid "Expire Folder"
 msgstr "将文件夹设为过期删除"
 
-#: kmmainwidget.cpp:1159
+#: kmmainwidget.cpp:1134
 msgid "&Expire"
 msgstr "过期(&E)"
 
-#: kmmainwidget.cpp:1176
+#: kmmainwidget.cpp:1151
 msgid "Move to Trash"
 msgstr "移动到废件夹"
 
-#: kmmainwidget.cpp:1178
+#: kmmainwidget.cpp:1153
 msgid "Are you sure you want to empty the trash folder?"
 msgstr "您确定要清空废件夹？"
 
-#: kmmainwidget.cpp:1179
+#: kmmainwidget.cpp:1154
 msgid ""
 "<qt>Are you sure you want to move all messages from folder <b>%1</b> "
 "to the trash?</qt>"
 msgstr "<qt>您确定要将文件夹 <b>%1</b> 中的全部信件移动到废件夹？</qt>"
 
-#: kmmainwidget.cpp:1198
+#: kmmainwidget.cpp:1173
 msgid "Moved all messages to the trash"
 msgstr "将所有信件放入废件夹"
 
-#: kmmainwidget.cpp:1220
+#: kmmainwidget.cpp:1200
+msgid ""
+"It is not possible to delete this folder right now because it is being "
+"syncronized. Please wait until the syncronization of this folder is complete "
+"and then try again."
+msgstr ""
+
+#: kmmainwidget.cpp:1203
+#, fuzzy
+msgid "Unable to delete folder"
+msgstr "无法创建文件夹"
+
+#: kmmainwidget.cpp:1209
 msgid "Delete Search"
 msgstr "删除搜索"
 
-#: kmmainwidget.cpp:1221
+#: kmmainwidget.cpp:1210
 msgid ""
 "<qt>Are you sure you want to delete the search <b>%1</b>?"
 "<br>Any messages it shows will still be available in their original folder.</qt>"
 msgstr "<qt>您确定要删除搜索 <b>%1</b> 吗？<br>该搜索所显示的任何信件仍可从其原始文件夹访问。</qt>"
 
-#: kmmainwidget.cpp:1225
+#: kmmainwidget.cpp:1214
 msgid "Delete Folder"
 msgstr "删除文件夹"
 
-#: kmmainwidget.cpp:1228
+#: kmmainwidget.cpp:1217
 msgid "<qt>Are you sure you want to delete the empty folder <b>%1</b>?</qt>"
 msgstr "<qt>您确定要删除空文件夹 <b>%1</b>？</qt>"
 
-#: kmmainwidget.cpp:1233
+#: kmmainwidget.cpp:1222
 msgid ""
 "<qt>Are you sure you want to delete the empty folder <b>%1</b> "
 "and all its subfolders? Those subfolders might not be empty and their contents "
@@ -7304,7 +8192,7 @@ msgstr ""
 "<qt>您确定要删除空文件夹 <b>%1</b> 和它的子文件夹吗？这些子文件夹可能非空，而这些子邮件夹的内容也将被丢弃。"
 "<p><b>请注意</b>，丢弃的信件不会保存在您的回收站文件夹中，而是永久删除。</qt>"
 
-#: kmmainwidget.cpp:1242
+#: kmmainwidget.cpp:1231
 msgid ""
 "<qt>Are you sure you want to delete the folder <b>%1</b>"
 ", discarding its contents? "
@@ -7314,7 +8202,7 @@ msgstr ""
 "<qt>您确定要删除文件夹 <b>%1</b>，丢弃其中所有内容？"
 "<p><b>请注意</b>，丢弃的信件不会保存在您的回收站文件夹中，而是永久删除。</qt>"
 
-#: kmmainwidget.cpp:1249
+#: kmmainwidget.cpp:1238
 msgid ""
 "<qt>Are you sure you want to delete the folder <b>%1</b> "
 "and all its subfolders, discarding their contents? "
@@ -7324,14 +8212,7 @@ msgstr ""
 "<qt>您确定要删除文件夹 <b>%1</b> 和它的子文件夹，丢弃其中所有内容？"
 "<p><b>请注意</b>，丢弃的信件不会保存在您的回收站文件夹中，而是永久删除。</qt>"
 
-#: kmmainwidget.cpp:1268
-msgid ""
-"<qt>The folder you deleted was associated with the account <b>%1</b> "
-"which delivered mail into it. The folder the account delivers new mail into was "
-"reset to the main Inbox folder.</qt>"
-msgstr "<qt>您所删除的文件夹与账户 <b>%1</b> 投递的邮件关联。账户投递邮件的文件夹将重置为主收件箱。</qt>"
-
-#: kmmainwidget.cpp:1349
+#: kmmainwidget.cpp:1313
 msgid ""
 "Are you sure you want to refresh the IMAP cache?\n"
 "This will remove all changes that you have done locally to your IMAP folders."
@@ -7339,45 +8220,45 @@ msgstr ""
 "您确定要刷新 IMAP 缓存吗？\n"
 "这将删除您对本地文件夹已作出的任何改变。"
 
-#: kmmainwidget.cpp:1365
+#: kmmainwidget.cpp:1329
 msgid "Are you sure you want to expire all old messages?"
 msgstr "您确定要删除所有过期的旧信件？"
 
-#: kmmainwidget.cpp:1389
+#: kmmainwidget.cpp:1353
 msgid ""
 "Use of HTML in mail will make you more vulnerable to \"spam\" and may increase "
 "the likelihood that your system will be compromised by other present and "
 "anticipated security exploits."
 msgstr "在邮件中使用 HTML 将使您更容易受到“垃圾邮件”的攻击，还会增大被其它已有的和将有的安全漏洞危及的可能性。"
 
-#: kmmainwidget.cpp:1392 kmmainwidget.cpp:1416 kmsender.cpp:503
+#: kmmainwidget.cpp:1356 kmmainwidget.cpp:1380 kmsender.cpp:504
 msgid "Security Warning"
 msgstr "安全警告"
 
-#: kmmainwidget.cpp:1393
+#: kmmainwidget.cpp:1357
 msgid "Use HTML"
 msgstr "使用 HTML"
 
-#: kmmainwidget.cpp:1413
+#: kmmainwidget.cpp:1377
 msgid ""
 "Loading external references in html mail will make you more vulnerable to "
 "\"spam\" and may increase the likelihood that your system will be compromised "
 "by other present and anticipated security exploits."
 msgstr "在 HTML 邮件中装入外部引用将使您更容易受到“垃圾邮件”的攻击，还会增大被其它已有的和将有的安全漏洞危及的可能性。"
 
-#: kmmainwidget.cpp:1417
+#: kmmainwidget.cpp:1381
 msgid "Load External References"
 msgstr "装入外部引用"
 
-#: kmmainwidget.cpp:1658
+#: kmmainwidget.cpp:1634
 msgid "Filter on Mailing-List..."
 msgstr "按邮件列表过滤..."
 
-#: kmmainwidget.cpp:1663
+#: kmmainwidget.cpp:1639
 msgid "Filter on Mailing-List %1..."
 msgstr "按邮件列表 %1 过滤..."
 
-#: kmmainwidget.cpp:1761
+#: kmmainwidget.cpp:1738
 msgid ""
 "KMail's Out of Office Reply functionality relies on server-side filtering. You "
 "have not yet configured an IMAP server for this.\n"
@@ -7386,562 +8267,574 @@ msgstr ""
 "KMail 的自动回复功能要依靠服务器端的过滤。您还没有为此配置 IMAP 服务器。\n"
 "您可以在 IMAP 账户配置的“过滤”标签中配置它。"
 
-#: kmmainwidget.cpp:1766
+#: kmmainwidget.cpp:1743
 msgid "No Server-Side Filtering Configured"
 msgstr "未配置服务器端过滤"
 
-#: kmmainwidget.cpp:1793
-msgid "Could not start certificate manager; please check your installation."
+#: kmmainwidget.cpp:1770
+#, fuzzy
+msgid ""
+"Could not start certificate manager 'kleopatra'; please check your "
+"installation."
 msgstr "无法启动证书管理器；请检查您的安装。"
 
-#: kmmainwidget.cpp:1810
+#: kmmainwidget.cpp:1787
 msgid ""
 "Could not start GnuPG LogViewer (kwatchgnupg); please check your installation."
 msgstr "无法启动 GnuPG LogViewer (kwatchgnupg)；请检查您的安装。"
 
-#: kmmainwidget.cpp:2485
+#: kmmainwidget.cpp:2508
 msgid "Forward With Custom Template"
 msgstr "用自定义模板转发"
 
-#: kmmainwidget.cpp:2494
+#: kmmainwidget.cpp:2517
 msgid "Reply With Custom Template"
 msgstr "用自定义模板回复"
 
-#: kmmainwidget.cpp:2502
+#: kmmainwidget.cpp:2525
 msgid "Reply to All With Custom Template"
 msgstr "用自定义模板全部回复"
 
-#: kmmainwidget.cpp:2597 kmmainwidget.cpp:2602 kmmainwidget.cpp:2607
+#: kmmainwidget.cpp:2620 kmmainwidget.cpp:2625 kmmainwidget.cpp:2630
 msgid "(no custom templates)"
 msgstr "(无自定义模板)"
 
-#: kmmainwidget.cpp:2622 kmmimeparttree.cpp:141
+#: kmmainwidget.cpp:2645 kmmimeparttree.cpp:139
 msgid "Save &As..."
 msgstr "另存为(&A)..."
 
-#: kmmainwidget.cpp:2629
+#: kmmainwidget.cpp:2652
 msgid "&Compact All Folders"
 msgstr "压缩所有文件夹(&C)"
 
-#: kmmainwidget.cpp:2633
+#: kmmainwidget.cpp:2656
 msgid "&Expire All Folders"
 msgstr "所有文件夹设置为过期删除(&E)"
 
-#: kmmainwidget.cpp:2637
+#: kmmainwidget.cpp:2660
 msgid "&Refresh Local IMAP Cache"
 msgstr "刷新本地 IMAP 缓存(&R)"
 
-#: kmmainwidget.cpp:2641
+#: kmmainwidget.cpp:2664
 msgid "Empty All &Trash Folders"
 msgstr "清空全部垃圾文件夹(&T)"
 
-#: kmmainwidget.cpp:2649
+#: kmmainwidget.cpp:2672
 msgid "Check Mail in Favorite Folders"
 msgstr "检查收藏夹中的邮件"
 
-#: kmmainwidget.cpp:2656
+#: kmmainwidget.cpp:2679
 msgid "Check Mail &In"
 msgstr "检查邮件(&I)"
 
-#: kmmainwidget.cpp:2666
+#: kmmainwidget.cpp:2689
 msgid "&Send Queued Messages"
 msgstr "发出队列中的信件(&S)"
 
-#: kmmainwidget.cpp:2669
+#: kmmainwidget.cpp:2692
 msgid "Online Status (unknown)"
 msgstr "在线状态(未知)"
 
-#: kmmainwidget.cpp:2673
+#: kmmainwidget.cpp:2696
 msgid "Send Queued Messages Via"
 msgstr "发出队列中的信件身份"
 
-#: kmmainwidget.cpp:2684
+#: kmmainwidget.cpp:2707
 msgid "&Address Book..."
 msgstr "地址簿(&A)..."
 
-#: kmmainwidget.cpp:2689
+#: kmmainwidget.cpp:2712
 msgid "Certificate Manager..."
 msgstr "证书管理器..."
 
-#: kmmainwidget.cpp:2694
+#: kmmainwidget.cpp:2717
 msgid "GnuPG Log Viewer..."
 msgstr "GnuPG 日志查看器..."
 
-#: kmmainwidget.cpp:2699
+#: kmmainwidget.cpp:2722
 msgid "&Import Messages..."
 msgstr "导入信件(&I)..."
 
-#: kmmainwidget.cpp:2704
+#: kmmainwidget.cpp:2727
 msgid "&Debug Sieve..."
 msgstr "调试筛选(&D)..."
 
-#: kmmainwidget.cpp:2710
+#: kmmainwidget.cpp:2733
 msgid "Edit \"Out of Office\" Replies..."
 msgstr "编辑外出自动回复..."
 
-#: kmmainwidget.cpp:2716
+#: kmmainwidget.cpp:2739
 msgid "Filter &Log Viewer..."
 msgstr "过滤器日志查看器(&L)..."
 
-#: kmmainwidget.cpp:2719
+#: kmmainwidget.cpp:2742
 msgid "&Anti-Spam Wizard..."
 msgstr "反垃圾向导(&A)..."
 
-#: kmmainwidget.cpp:2721
+#: kmmainwidget.cpp:2744
 msgid "&Anti-Virus Wizard..."
 msgstr "反病毒向导(&A)..."
 
-#: kmmainwidget.cpp:2725 kmreadermainwin.cpp:316
+#: kmmainwidget.cpp:2748 kmreadermainwin.cpp:367
 msgid "&Move to Trash"
 msgstr "移到废件夹(&M)"
 
-#: kmmainwidget.cpp:2726 kmreadermainwin.cpp:317
+#: kmmainwidget.cpp:2749 kmreadermainwin.cpp:368
 msgid "Move message to trashcan"
 msgstr "将信件放入废件夹"
 
-#: kmmainwidget.cpp:2738
+#: kmmainwidget.cpp:2761
 msgid "M&ove Thread to Trash"
 msgstr "将线索移至废件夹(&O)"
 
-#: kmmainwidget.cpp:2739
+#: kmmainwidget.cpp:2762
 msgid "Move thread to trashcan"
 msgstr "将线索放入废件夹"
 
-#: kmmainwidget.cpp:2743
+#: kmmainwidget.cpp:2766
 msgid "Delete T&hread"
 msgstr "删除线索(&H)"
 
-#: kmmainwidget.cpp:2747
+#: kmmainwidget.cpp:2770
 msgid "&Find Messages..."
 msgstr "查找信件(&F)..."
 
-#: kmmainwidget.cpp:2750
+#: kmmainwidget.cpp:2773
 msgid "&Find in Message..."
 msgstr "在信件中查找(&F)..."
 
-#: kmmainwidget.cpp:2753
+#: kmmainwidget.cpp:2776
 msgid "Select &All Messages"
 msgstr "选中所有的信件(&A)"
 
-#: kmmainwidget.cpp:2760
+#: kmmainwidget.cpp:2783
 msgid "&Properties"
 msgstr "属性(&P)"
 
-#: kmmainwidget.cpp:2763
+#: kmmainwidget.cpp:2786
 msgid "&Mailing List Management..."
 msgstr "邮件列表管理(&M)..."
 
-#: kmmainwidget.cpp:2772
+#: kmmainwidget.cpp:2795
 msgid "Mark All Messages as &Read"
 msgstr "标记所有的信件为已读(&R)"
 
-#: kmmainwidget.cpp:2775
+#: kmmainwidget.cpp:2798
 msgid "&Expiration Settings"
 msgstr "过期设置(&E)"
 
-#: kmmainwidget.cpp:2778
+#: kmmainwidget.cpp:2801
 msgid "&Compact Folder"
 msgstr "压缩文件夹(&C)"
 
-#: kmmainwidget.cpp:2781
+#: kmmainwidget.cpp:2804
 msgid "Check Mail &in This Folder"
 msgstr "检查此文件夹中的邮件(&I)"
 
-#: kmmainwidget.cpp:2793
+#: kmmainwidget.cpp:2816
+#, fuzzy
+msgid "&Archive Folder..."
+msgstr "新建文件夹(&N)..."
+
+#: kmmainwidget.cpp:2820
 msgid "Prefer &HTML to Plain Text"
 msgstr "优先使用 HTML 格式(&H)"
 
-#: kmmainwidget.cpp:2796
+#: kmmainwidget.cpp:2823
 msgid "Load E&xternal References"
 msgstr "装入外部引用(&X)"
 
-#: kmmainwidget.cpp:2799
+#: kmmainwidget.cpp:2826
 msgid "&Thread Messages"
 msgstr "按线索排列信件(&T)"
 
-#: kmmainwidget.cpp:2802
+#: kmmainwidget.cpp:2829
 msgid "Thread Messages also by &Subject"
 msgstr "按主题和线索排列信件(&S)"
 
-#: kmmainwidget.cpp:2805
+#: kmmainwidget.cpp:2832
 msgid "Copy Folder"
 msgstr "复制文件夹"
 
-#: kmmainwidget.cpp:2807
+#: kmmainwidget.cpp:2834
 msgid "Cut Folder"
 msgstr "剪切文件夹"
 
-#: kmmainwidget.cpp:2809
+#: kmmainwidget.cpp:2836
 msgid "Paste Folder"
 msgstr "粘贴文件夹"
 
-#: kmmainwidget.cpp:2812
+#: kmmainwidget.cpp:2839
 msgid "Copy Messages"
 msgstr "复制信件"
 
-#: kmmainwidget.cpp:2814
+#: kmmainwidget.cpp:2841
 msgid "Cut Messages"
 msgstr "剪切信件"
 
-#: kmmainwidget.cpp:2816
+#: kmmainwidget.cpp:2843
 msgid "Paste Messages"
 msgstr "粘贴信件"
 
-#: kmmainwidget.cpp:2820
+#: kmmainwidget.cpp:2847
 msgid "&New Message..."
 msgstr "新信件(&N)..."
 
-#: kmmainwidget.cpp:2823 kmmainwidget.cpp:2915
+#: kmmainwidget.cpp:2850 kmmainwidget.cpp:2927
 msgid "New Message From &Template"
 msgstr "新建基于模板的信件(&T)"
 
-#: kmmainwidget.cpp:2831
+#: kmmainwidget.cpp:2858
 msgid "New Message t&o Mailing-List..."
 msgstr "撰写新信件到邮件列表(&O)..."
 
-#: kmmainwidget.cpp:2836 kmreadermainwin.cpp:327 searchwindow.cpp:320
+#: kmmainwidget.cpp:2863 kmreadermainwin.cpp:378 searchwindow.cpp:321
 msgid ""
 "_: Message->\n"
 "&Forward"
 msgstr "转发(&F)"
 
-#: kmmainwidget.cpp:2840 kmreadermainwin.cpp:330 searchwindow.cpp:329
+#: kmmainwidget.cpp:2867 kmreadermainwin.cpp:381 searchwindow.cpp:330
 msgid "&Inline..."
 msgstr "在信件内转发(&I)..."
 
-#: kmmainwidget.cpp:2846 kmreadermainwin.cpp:336 searchwindow.cpp:325
+#: kmmainwidget.cpp:2873 kmreadermainwin.cpp:387 searchwindow.cpp:326
 msgid ""
 "_: Message->Forward->\n"
 "As &Attachment..."
 msgstr "为附件(&A)..."
 
-#: kmmainwidget.cpp:2852 kmreadermainwin.cpp:342 searchwindow.cpp:341
+#: kmmainwidget.cpp:2879 kmreadermainwin.cpp:393 searchwindow.cpp:342
 msgid ""
 "_: Message->Forward->\n"
 "As Di&gest..."
 msgstr "为摘要(&G)..."
 
-#: kmmainwidget.cpp:2858 kmreadermainwin.cpp:348 searchwindow.cpp:346
+#: kmmainwidget.cpp:2885 kmreadermainwin.cpp:399 searchwindow.cpp:347
 msgid ""
 "_: Message->Forward->\n"
 "&Redirect..."
 msgstr "重发(&R)..."
 
-#: kmmainwidget.cpp:2885
+#: kmmainwidget.cpp:2897
 msgid "Send A&gain..."
 msgstr "重新发送(&G)..."
 
-#: kmmainwidget.cpp:2890
+#: kmmainwidget.cpp:2902
 msgid "&Create Filter"
 msgstr "创建过滤器(&C)"
 
-#: kmmainwidget.cpp:2893
+#: kmmainwidget.cpp:2905
 msgid "Filter on &Subject..."
 msgstr "按主题过滤(&S)..."
 
-#: kmmainwidget.cpp:2898
+#: kmmainwidget.cpp:2910
 msgid "Filter on &From..."
 msgstr "按发件人过滤(&F)..."
 
-#: kmmainwidget.cpp:2903
+#: kmmainwidget.cpp:2915
 msgid "Filter on &To..."
 msgstr "按收件人过滤(&T)..."
 
-#: kmmainwidget.cpp:2908
+#: kmmainwidget.cpp:2920
 msgid "Filter on Mailing-&List..."
 msgstr "按邮件列表过滤(&L)..."
 
-#: kmmainwidget.cpp:2921
+#: kmmainwidget.cpp:2933
 msgid "Mark &Thread"
 msgstr "标记线索(&T)"
 
-#: kmmainwidget.cpp:2924
+#: kmmainwidget.cpp:2936
 msgid "Mark Thread as &Read"
 msgstr "将线索标为已读(&R)"
 
-#: kmmainwidget.cpp:2925
+#: kmmainwidget.cpp:2937
 msgid "Mark all messages in the selected thread as read"
 msgstr "将选中线索中的全部信件标为已读"
 
-#: kmmainwidget.cpp:2930
+#: kmmainwidget.cpp:2942
 msgid "Mark Thread as &New"
 msgstr "将线索标为新的(&N)"
 
-#: kmmainwidget.cpp:2931
+#: kmmainwidget.cpp:2943
 msgid "Mark all messages in the selected thread as new"
 msgstr "将选中线索中的全部信件标为新的"
 
-#: kmmainwidget.cpp:2936
+#: kmmainwidget.cpp:2948
 msgid "Mark Thread as &Unread"
 msgstr "将线索标为未读(&U)"
 
-#: kmmainwidget.cpp:2937
+#: kmmainwidget.cpp:2949
 msgid "Mark all messages in the selected thread as unread"
 msgstr "将选中线索中的全部信件标为未读"
 
-#: kmmainwidget.cpp:2945
+#: kmmainwidget.cpp:2957
 msgid "Mark Thread as &Important"
 msgstr "将线索标为重要(&I)"
 
-#: kmmainwidget.cpp:2948
+#: kmmainwidget.cpp:2960
 msgid "Remove &Important Thread Mark"
 msgstr "删除重要线索标记(&I)"
 
-#: kmmainwidget.cpp:2951
+#: kmmainwidget.cpp:2963
 msgid "Mark Thread as &Action Item"
 msgstr "将线索标为活动项目(&A)"
 
-#: kmmainwidget.cpp:2954
+#: kmmainwidget.cpp:2966
 msgid "Remove &Action Item Thread Mark"
 msgstr "删除活动项目线索标记(&A)"
 
-#: kmmainwidget.cpp:2958
+#: kmmainwidget.cpp:2970
 msgid "&Watch Thread"
 msgstr "观察线索(&W)"
 
-#: kmmainwidget.cpp:2962
+#: kmmainwidget.cpp:2974
 msgid "&Ignore Thread"
 msgstr "忽略线索(&I)"
 
-#: kmmainwidget.cpp:2970
+#: kmmainwidget.cpp:2982
 msgid "Save A&ttachments..."
 msgstr "保存附件(&T)..."
 
-#: kmmainwidget.cpp:2980
+#: kmmainwidget.cpp:2992
 msgid "Appl&y All Filters"
 msgstr "应用全部过滤器(&Y)"
 
-#. i18n: file kmail_part.rc line 141
-#: kmmainwidget.cpp:2985 rc.cpp:30 rc.cpp:96
+#. i18n: file kmail_part.rc line 142
+#: kmmainwidget.cpp:2997 rc.cpp:30 rc.cpp:96
 #, no-c-format
 msgid "A&pply Filter"
 msgstr "应用过滤器(&P)"
 
-#: kmmainwidget.cpp:2992
+#: kmmainwidget.cpp:3004
 msgid ""
 "_: View->\n"
 "&Unread Count"
 msgstr "未读统计(&U)"
 
-#: kmmainwidget.cpp:2994
+#: kmmainwidget.cpp:3006
 msgid "Choose how to display the count of unread messages"
 msgstr "选择如何显示未读邮件统计"
 
-#: kmmainwidget.cpp:2996
+#: kmmainwidget.cpp:3008
 msgid ""
 "_: View->Unread Count\n"
 "View in &Separate Column"
 msgstr "在单独列中查看(&S)"
 
-#: kmmainwidget.cpp:3002
+#: kmmainwidget.cpp:3014
 msgid ""
 "_: View->Unread Count\n"
 "View After &Folder Name"
 msgstr "在文件夹名称后查看(&F)"
 
-#: kmmainwidget.cpp:3009
+#: kmmainwidget.cpp:3021
 msgid ""
 "_: View->\n"
 "&Total Column"
 msgstr "总和列(&T)"
 
-#: kmmainwidget.cpp:3012
+#: kmmainwidget.cpp:3024
 msgid ""
 "Toggle display of column showing the total number of messages in folders."
 msgstr "切换文件夹中信件总数的列是否显示。"
 
-#: kmmainwidget.cpp:3014
+#: kmmainwidget.cpp:3026
 msgid ""
 "_: View->\n"
 "&Size Column"
 msgstr "大小列(&S)"
 
-#: kmmainwidget.cpp:3017
+#: kmmainwidget.cpp:3029
 msgid "Toggle display of column showing the total size of messages in folders."
 msgstr "切换文件夹中信件大小的列是否显示。"
 
-#: kmmainwidget.cpp:3020
+#: kmmainwidget.cpp:3032
 msgid ""
 "_: View->\n"
 "&Expand Thread"
 msgstr "展开线索(&E)"
 
-#: kmmainwidget.cpp:3021
+#: kmmainwidget.cpp:3033
 msgid "Expand the current thread"
 msgstr "展开当前线索"
 
-#: kmmainwidget.cpp:3026
+#: kmmainwidget.cpp:3038
 msgid ""
 "_: View->\n"
 "&Collapse Thread"
 msgstr "折叠线索(&C)"
 
-#: kmmainwidget.cpp:3027
+#: kmmainwidget.cpp:3039
 msgid "Collapse the current thread"
 msgstr "折叠当前线索"
 
-#: kmmainwidget.cpp:3032
+#: kmmainwidget.cpp:3044
 msgid ""
 "_: View->\n"
 "Ex&pand All Threads"
 msgstr "展开全部线索(&P)"
 
-#: kmmainwidget.cpp:3033
+#: kmmainwidget.cpp:3045
 msgid "Expand all threads in the current folder"
 msgstr "展开当前文件夹内的所有线索"
 
-#: kmmainwidget.cpp:3038
+#: kmmainwidget.cpp:3050
 msgid ""
 "_: View->\n"
 "C&ollapse All Threads"
 msgstr "折叠全部线索(&O)"
 
-#: kmmainwidget.cpp:3039
+#: kmmainwidget.cpp:3051
 msgid "Collapse all threads in the current folder"
 msgstr "叠起当前文件夹内的所有线索"
 
-#: kmmainwidget.cpp:3044 kmreadermainwin.cpp:322
+#: kmmainwidget.cpp:3056 kmreadermainwin.cpp:373
 msgid "&View Source"
 msgstr "查看源文件(&V)"
 
-#: kmmainwidget.cpp:3048
+#: kmmainwidget.cpp:3060
 msgid "&Display Message"
 msgstr "显示信件(&D)"
 
-#: kmmainwidget.cpp:3054
+#: kmmainwidget.cpp:3066
 msgid "&Next Message"
 msgstr "下一封信件(&N)"
 
-#: kmmainwidget.cpp:3055
+#: kmmainwidget.cpp:3067
 msgid "Go to the next message"
 msgstr "跳转到下一封信件"
 
-#: kmmainwidget.cpp:3059
+#: kmmainwidget.cpp:3071
 msgid "Next &Unread Message"
 msgstr "下一封未读信件(&U)"
 
-#: kmmainwidget.cpp:3061
+#: kmmainwidget.cpp:3073
 msgid "Go to the next unread message"
 msgstr "跳转到下一封未读的信件"
 
 #. i18n("Go to the next important message") ),
-#: kmmainwidget.cpp:3072
+#: kmmainwidget.cpp:3084
 msgid "&Previous Message"
 msgstr "上一封信件(&P)"
 
-#: kmmainwidget.cpp:3073
+#: kmmainwidget.cpp:3085
 msgid "Go to the previous message"
 msgstr "跳转到上一封信件"
 
-#: kmmainwidget.cpp:3077
+#: kmmainwidget.cpp:3089
 msgid "Previous Unread &Message"
 msgstr "上一封未读信件(&M)"
 
-#: kmmainwidget.cpp:3079
+#: kmmainwidget.cpp:3091
 msgid "Go to the previous unread message"
 msgstr "跳转到上一封未读的信件"
 
-#: kmmainwidget.cpp:3091
+#: kmmainwidget.cpp:3103
 msgid "Next Unread &Folder"
 msgstr "下一个未读文件夹(&F)"
 
-#: kmmainwidget.cpp:3092
+#: kmmainwidget.cpp:3104
 msgid "Go to the next folder with unread messages"
 msgstr "跳转到下一个有未读信件的文件夹"
 
-#: kmmainwidget.cpp:3100
+#: kmmainwidget.cpp:3112
 msgid "Previous Unread F&older"
 msgstr "上一个未读文件夹(&O)"
 
-#: kmmainwidget.cpp:3101
+#: kmmainwidget.cpp:3113
 msgid "Go to the previous folder with unread messages"
 msgstr "跳转到上一个有未读信件的文件夹"
 
-#: kmmainwidget.cpp:3108
+#: kmmainwidget.cpp:3120
 msgid ""
 "_: Go->\n"
 "Next Unread &Text"
 msgstr "下一段未读的文本(&T)"
 
-#: kmmainwidget.cpp:3109
+#: kmmainwidget.cpp:3121
 msgid "Go to the next unread text"
 msgstr "移动到下一段未读的文本"
 
-#: kmmainwidget.cpp:3110
+#: kmmainwidget.cpp:3122
 msgid ""
 "Scroll down current message. If at end of current message, go to next unread "
 "message."
 msgstr "往下滚动当前信件。如果遇到了信件尾部，则跳到下一封未读信件。"
 
-#: kmmainwidget.cpp:3117
+#: kmmainwidget.cpp:3129
+msgid "Show Quick Search"
+msgstr "显示快速搜索"
+
+#: kmmainwidget.cpp:3136
 msgid "Configure &Filters..."
 msgstr "配置过滤器(&F)..."
 
-#: kmmainwidget.cpp:3119
+#: kmmainwidget.cpp:3138
 msgid "Configure &POP Filters..."
 msgstr "配置 POP 过滤器(&P)..."
 
-#: kmmainwidget.cpp:3121
+#: kmmainwidget.cpp:3140
 msgid "Manage &Sieve Scripts..."
 msgstr "管理筛选脚本(&S)..."
 
-#: kmmainwidget.cpp:3124
+#: kmmainwidget.cpp:3143
 msgid "KMail &Introduction"
 msgstr "KMail 介绍(&I)"
 
-#: kmmainwidget.cpp:3125
+#: kmmainwidget.cpp:3144
 msgid "Display KMail's Welcome Page"
 msgstr "显示 KMail 欢迎页"
 
-#: kmmainwidget.cpp:3131
+#: kmmainwidget.cpp:3150
 msgid "Configure &Notifications..."
 msgstr "配置通知(&N)..."
 
-#: kmmainwidget.cpp:3136
+#: kmmainwidget.cpp:3155
 msgid "&Configure KMail..."
 msgstr "配置 KMail(&C)..."
 
-#: kmmainwidget.cpp:3431
+#: kmmainwidget.cpp:3454
 msgid "E&mpty Trash"
 msgstr "清空废件夹(&M)"
 
-#: kmmainwidget.cpp:3431
+#: kmmainwidget.cpp:3455
 msgid "&Move All Messages to Trash"
 msgstr "将所有信件放入废件夹(&M)"
 
-#: kmmainwidget.cpp:3434
+#: kmmainwidget.cpp:3464
 msgid "&Delete Search"
 msgstr "删除搜索(&D)"
 
-#: kmmainwidget.cpp:3434
+#: kmmainwidget.cpp:3465
 msgid "&Delete Folder"
 msgstr "删除文件夹(&D)"
 
-#: kmmainwidget.cpp:3615
+#: kmmainwidget.cpp:3649
 #, c-format
 msgid ""
 "_n: Removed %n duplicate message.\n"
 "Removed %n duplicate messages."
 msgstr "删除了 %n 封重复的信件。"
 
-#: kmmainwidget.cpp:3617
+#: kmmainwidget.cpp:3651
 msgid "No duplicate messages found."
 msgstr "没有找到重复的信件。"
 
-#: kmmainwidget.cpp:3687
+#: kmmainwidget.cpp:3721
 #, c-format
 msgid "Filter %1"
 msgstr "过滤器 %1"
 
-#: kmmainwidget.cpp:3821
+#: kmmainwidget.cpp:3855
 msgid "Subscription"
 msgstr "订阅"
 
-#: kmmainwidget.cpp:3838
+#: kmmainwidget.cpp:3872
 msgid "Local Subscription"
 msgstr "本地订阅"
 
-#: kmmainwidget.cpp:3971
+#: kmmainwidget.cpp:4007
 msgid "Out of office reply active"
 msgstr "激活的外出回复"
 
@@ -7953,7 +8846,7 @@ msgstr "新建窗口(&W)"
 msgid " Initializing..."
 msgstr " 正在初始化..."
 
-#: kmmessage.cpp:1316
+#: kmmessage.cpp:1336
 msgid ""
 "This message contains a request to return a notification about your reception "
 "of the message.\n"
@@ -7963,7 +8856,7 @@ msgstr ""
 "此信件含有一个请求，希望您发送接收回执。\n"
 "您可以忽略这个请求，或者让 KMail 发送一个“拒绝”或者正常的回应。"
 
-#: kmmessage.cpp:1321
+#: kmmessage.cpp:1341
 msgid ""
 "This message contains a request to send a notification about your reception of "
 "the message.\n"
@@ -7975,7 +8868,7 @@ msgstr ""
 "它含有一个标记为“必需”的处理指令，但对 KMail 这是一个未知的指令。\n"
 "您可以忽略该请求，或者让 KMail 发送一个“失败”回应。"
 
-#: kmmessage.cpp:1328
+#: kmmessage.cpp:1348
 msgid ""
 "This message contains a request to send a notification about your reception of "
 "the message,\n"
@@ -7987,7 +8880,7 @@ msgstr ""
 "但是它请求将通知发送到多个地址。\n"
 "您可以忽略该请求，或者让 KMail 发送一个“拒绝”或者正常回应。"
 
-#: kmmessage.cpp:1335
+#: kmmessage.cpp:1355
 msgid ""
 "This message contains a request to send a notification about your reception of "
 "the message,\n"
@@ -7999,7 +8892,7 @@ msgstr ""
 "但是它没有设置回复路径。\n"
 "您可以忽略该请求，或者让 KMail 发送一个“拒绝”或者正常回应。"
 
-#: kmmessage.cpp:1341
+#: kmmessage.cpp:1361
 msgid ""
 "This message contains a request to send a notification about your reception of "
 "the message,\n"
@@ -8012,52 +8905,60 @@ msgstr ""
 "但是它的回信地址和请求将处理回执发送到的目的地址不同。\n"
 "您可以忽略该请求，或者让 KMail 发送一个“拒绝”或者正常回应。"
 
-#: kmmessage.cpp:1359 kmmessage.cpp:1366
+#: kmmessage.cpp:1379 kmmessage.cpp:1386
 msgid "Message Disposition Notification Request"
 msgstr "信件处理回执请求"
 
-#: kmmessage.cpp:1361
+#: kmmessage.cpp:1381
 msgid "Send \"&denied\""
 msgstr "发送“拒绝”(&D)"
 
-#: kmmessage.cpp:1361 kmmessage.cpp:1368
+#: kmmessage.cpp:1381 kmmessage.cpp:1388
 msgid "&Send"
 msgstr "发送(&S)"
 
-#: kmmessage.cpp:1436
+#: kmmessage.cpp:1458
 msgid ""
 "Header \"Disposition-Notification-Options\" contained required, but unknown "
 "parameter"
 msgstr "信头“处理回执选项 (Disposition-Notification-Options)”含有必需的、但未知的参数"
 
-#: kmmessage.cpp:1628
+#: kmmessage.cpp:1650
 msgid "Receipt: "
 msgstr "收件人："
 
-#: kmmessage.cpp:3128 urlhandlermanager.cpp:551
+#: kmmessage.cpp:3168 urlhandlermanager.cpp:692
 #, c-format
 msgid "Attachment: %1"
 msgstr "附件：%1"
 
-#: kmmimeparttree.cpp:139 kmreaderwin.cpp:1969
+#: kmmessage.cpp:3199
+msgid "This attachment has been deleted."
+msgstr "附件已被删除。"
+
+#: kmmessage.cpp:3201
+msgid "The attachment '%1' has been deleted."
+msgstr "附件“%1”已被删除。"
+
+#: kmmimeparttree.cpp:137 kmreaderwin.cpp:2034
 msgid ""
 "_: to view something\n"
 "View"
 msgstr "查看"
 
-#: kmmimeparttree.cpp:147
+#: kmmimeparttree.cpp:145
 msgid "Save All Attachments..."
 msgstr "保存全部附件..."
 
-#: kmmimeparttree.cpp:154 kmreaderwin.cpp:1975 kmreaderwin.cpp:2626
+#: kmmimeparttree.cpp:152 kmreaderwin.cpp:2041 kmreaderwin.cpp:2805
 msgid "Delete Attachment"
 msgstr "删除附件"
 
-#: kmmimeparttree.cpp:157 kmreaderwin.cpp:1973 kmreaderwin.cpp:2638
+#: kmmimeparttree.cpp:155 kmreaderwin.cpp:2039 kmreaderwin.cpp:2861
 msgid "Edit Attachment"
 msgstr "编辑附件"
 
-#: kmmimeparttree.cpp:370
+#: kmmimeparttree.cpp:368
 msgid "Unspecified Binary Data"
 msgstr "未指定的二进制数据"
 
@@ -8248,217 +9149,230 @@ msgstr "无主题"
 msgid "unknown"
 msgstr "未知"
 
-#: kmreadermainwin.cpp:477 searchwindow.cpp:352
+#: kmreadermainwin.cpp:515 searchwindow.cpp:353
 msgid "Save Attachments..."
 msgstr "保存附件..."
 
-#: kmreaderwin.cpp:562
+#: kmreaderwin.cpp:489
 msgid ""
 "_: View->\n"
 "&Headers"
 msgstr "信头(&H)"
 
-#: kmreaderwin.cpp:563
+#: kmreaderwin.cpp:490
 msgid "Choose display style of message headers"
 msgstr "选择信头的显示样式"
 
-#: kmreaderwin.cpp:568
+#: kmreaderwin.cpp:495
 msgid ""
 "_: View->headers->\n"
 "&Enterprise Headers"
 msgstr "企业信头(&E)"
 
-#: kmreaderwin.cpp:571
+#: kmreaderwin.cpp:498
 msgid "Show the list of headers in Enterprise style"
 msgstr "以企业化风格显示信头列表"
 
-#: kmreaderwin.cpp:575
+#: kmreaderwin.cpp:502
 msgid ""
 "_: View->headers->\n"
 "&Fancy Headers"
 msgstr "漂亮信头(&F)"
 
-#: kmreaderwin.cpp:578
+#: kmreaderwin.cpp:505
 msgid "Show the list of headers in a fancy format"
 msgstr "使用漂亮格式显示信头列表"
 
-#: kmreaderwin.cpp:582
+#: kmreaderwin.cpp:509
 msgid ""
 "_: View->headers->\n"
 "&Brief Headers"
 msgstr "简要信头(&B)"
 
-#: kmreaderwin.cpp:585
+#: kmreaderwin.cpp:512
 msgid "Show brief list of message headers"
 msgstr "显示信头的简要列表"
 
-#: kmreaderwin.cpp:589
+#: kmreaderwin.cpp:516
 msgid ""
 "_: View->headers->\n"
 "&Standard Headers"
 msgstr "标准信头(&S)"
 
-#: kmreaderwin.cpp:592
+#: kmreaderwin.cpp:519
 msgid "Show standard list of message headers"
 msgstr "显示信头的标准列表"
 
-#: kmreaderwin.cpp:596
+#: kmreaderwin.cpp:523
 msgid ""
 "_: View->headers->\n"
 "&Long Headers"
 msgstr "长信头(&L)"
 
-#: kmreaderwin.cpp:599
+#: kmreaderwin.cpp:526
 msgid "Show long list of message headers"
 msgstr "显示信头的长列表"
 
-#: kmreaderwin.cpp:603
+#: kmreaderwin.cpp:530
 msgid ""
 "_: View->headers->\n"
 "&All Headers"
 msgstr "全部信头(&A)"
 
-#: kmreaderwin.cpp:606
+#: kmreaderwin.cpp:533
 msgid "Show all message headers"
 msgstr "显示全部信头"
 
-#: kmreaderwin.cpp:612
+#: kmreaderwin.cpp:539
 msgid ""
 "_: View->\n"
 "&Attachments"
 msgstr "附件(&A)"
 
-#: kmreaderwin.cpp:613
+#: kmreaderwin.cpp:540
 msgid "Choose display style of attachments"
 msgstr "选择附件的显示样式"
 
-#: kmreaderwin.cpp:617
+#: kmreaderwin.cpp:544
 msgid ""
 "_: View->attachments->\n"
 "&As Icons"
 msgstr "图标(&A)"
 
-#: kmreaderwin.cpp:620
+#: kmreaderwin.cpp:547
 msgid "Show all attachments as icons. Click to see them."
 msgstr "附件以小图标表示，点击打开。"
 
-#: kmreaderwin.cpp:624
+#: kmreaderwin.cpp:551
 msgid ""
 "_: View->attachments->\n"
 "&Smart"
 msgstr "智能(&S)"
 
-#: kmreaderwin.cpp:627
+#: kmreaderwin.cpp:554
 msgid "Show attachments as suggested by sender."
 msgstr "附件以发件人建议的方式显示。"
 
-#: kmreaderwin.cpp:631
+#: kmreaderwin.cpp:558
 msgid ""
 "_: View->attachments->\n"
 "&Inline"
 msgstr "内嵌(&I)"
 
-#: kmreaderwin.cpp:634
+#: kmreaderwin.cpp:561
 msgid "Show all attachments inline (if possible)"
 msgstr "附件直接显示在信件里(如果可能的话)"
 
-#: kmreaderwin.cpp:638
+#: kmreaderwin.cpp:565
 msgid ""
 "_: View->attachments->\n"
 "&Hide"
 msgstr "隐藏(&H)"
 
-#: kmreaderwin.cpp:641
+#: kmreaderwin.cpp:568
 msgid "Do not show attachments in the message viewer"
 msgstr "不在信件查看器中显示附件"
 
-#: kmreaderwin.cpp:646
+#: kmreaderwin.cpp:572
+#, fuzzy
+msgid ""
+"_: View->attachments->\n"
+"In Header &Only"
+msgstr "隐藏(&H)"
+
+#: kmreaderwin.cpp:575
+#, fuzzy
+msgid "Show Attachments only in the header of the mail"
+msgstr "附件以小图标表示，点击打开。"
+
+#: kmreaderwin.cpp:580
 msgid "&Set Encoding"
 msgstr "设置编码(&S)"
 
-#: kmreaderwin.cpp:654
+#: kmreaderwin.cpp:588
 msgid "New Message To..."
 msgstr "撰写新信件给..."
 
-#: kmreaderwin.cpp:657
+#: kmreaderwin.cpp:591
 msgid "Reply To..."
 msgstr "回复给..."
 
-#: kmreaderwin.cpp:660
+#: kmreaderwin.cpp:594
 msgid "Forward To..."
 msgstr "转发给..."
 
-#: kmreaderwin.cpp:663
+#: kmreaderwin.cpp:597
 msgid "Add to Address Book"
 msgstr "添加到地址簿中"
 
-#: kmreaderwin.cpp:666
+#: kmreaderwin.cpp:600
 msgid "Open in Address Book"
 msgstr "在地址簿中打开"
 
-#: kmreaderwin.cpp:670
+#: kmreaderwin.cpp:604
 msgid "Select All Text"
 msgstr "选中所有文本"
 
-#: kmreaderwin.cpp:672
+#: kmreaderwin.cpp:606 kmreaderwin.cpp:1994
 msgid "Copy Link Address"
 msgstr "复制链接地址"
 
-#: kmreaderwin.cpp:674
+#: kmreaderwin.cpp:608
 msgid "Open URL"
 msgstr "打开 URL"
 
-#: kmreaderwin.cpp:676
+#: kmreaderwin.cpp:610
 msgid "Bookmark This Link"
 msgstr "将此链接加为书签"
 
-#: kmreaderwin.cpp:680
+#: kmreaderwin.cpp:614
 msgid "Save Link As..."
 msgstr "链接另存为..."
 
-#: kmreaderwin.cpp:687
+#: kmreaderwin.cpp:621
 msgid "Chat &With..."
 msgstr "聊天对象(&W)..."
 
-#: kmreaderwin.cpp:1294
+#: kmreaderwin.cpp:1258
 msgid "Full namespace support for IMAP"
 msgstr "IMAP 的完整命名空间支持"
 
-#: kmreaderwin.cpp:1295
+#: kmreaderwin.cpp:1259
 msgid "Offline mode"
 msgstr "脱机模式"
 
-#: kmreaderwin.cpp:1296
+#: kmreaderwin.cpp:1260
 msgid "Sieve script management and editing"
 msgstr "筛选脚本管理和编辑"
 
-#: kmreaderwin.cpp:1297
+#: kmreaderwin.cpp:1261
 msgid "Account specific filtering"
 msgstr "账户特定过滤"
 
-#: kmreaderwin.cpp:1298
+#: kmreaderwin.cpp:1262
 msgid "Filtering of incoming mail for online IMAP accounts"
 msgstr "过滤联机 IMAP 账户收到的邮件"
 
-#: kmreaderwin.cpp:1299
+#: kmreaderwin.cpp:1263
 msgid "Online IMAP folders can be used when filtering into folders"
 msgstr "过滤到文件夹时可以使用在线 IMAP 文件夹"
 
-#: kmreaderwin.cpp:1300
+#: kmreaderwin.cpp:1264
 msgid "Automatically delete older mails on POP servers"
 msgstr "自动从 POP 服务器上删除旧邮件"
 
-#: kmreaderwin.cpp:1338
-msgid "The email client for the K Desktop Environment."
+#: kmreaderwin.cpp:1302
+#, fuzzy
+msgid "The email client for the Trinity Desktop Environment."
 msgstr "K 桌面环境的电子邮件客户。"
 
-#: kmreaderwin.cpp:1346
+#: kmreaderwin.cpp:1310
 msgid ""
 "<h2 style='margin-top: 0px;'>Retrieving Folder Contents</h2>"
 "<p>Please wait . . .</p>&nbsp;"
 msgstr "<h2 style='margin-top: 0px;'>正在接收文件夹内容</h2><p>请稍候……</p>&nbsp;"
 
-#: kmreaderwin.cpp:1354
+#: kmreaderwin.cpp:1318
 msgid ""
 "<h2 style='margin-top: 0px;'>Offline</h2>"
 "<p>KMail is currently in offline mode. Click <a href=\"kmail:goOnline\">here</a> "
@@ -8467,7 +9381,7 @@ msgstr ""
 "<h2 style='margin-top: 0px;'>脱机</h2>"
 "<p>KMail 目前位于脱机模式，请单击<a href=\"kmail:goOnline\">此处</a>转为联机……</p>&nbsp;"
 
-#: kmreaderwin.cpp:1371
+#: kmreaderwin.cpp:1335
 msgid ""
 "_: %1: KMail version; %2: help:// URL; %3: homepage URL; %4: prior KMail "
 "version; %5: prior TDE version; %6: generated list of new features; %7: "
@@ -8506,13 +9420,13 @@ msgstr ""
 "<p>非常感谢</p>\n"
 "<p style='margin-bottom: 0px'>&nbsp; &nbsp; KMail 开发组</p>"
 
-#: kmreaderwin.cpp:1394 kmreaderwin.cpp:1416
+#: kmreaderwin.cpp:1358 kmreaderwin.cpp:1380
 msgid ""
 "<li>%1</li>\n"
 msgstr ""
 "<li>%1</li>\n"
 
-#: kmreaderwin.cpp:1399
+#: kmreaderwin.cpp:1363
 msgid ""
 "<p>Please take a moment to fill in the KMail configuration panel at "
 "Settings-&gt;Configure KMail.\n"
@@ -8522,7 +9436,7 @@ msgstr ""
 "<p>请您花一点时间完成 KMail 配置面板，它在设置-&gt;配置 KMail 菜单里。\n"
 "您需要至少创建一个默认的身份，以及接收和发送邮件的账户。</p>\n"
 
-#: kmreaderwin.cpp:1411
+#: kmreaderwin.cpp:1375
 msgid ""
 "<p><span style='font-size:125%; font-weight:bold;'>Important changes</span> "
 "(compared to KMail %1):</p>\n"
@@ -8530,39 +9444,48 @@ msgstr ""
 "<p><span style='font-size:125%; font-weight:bold;'>重要更改</span>"
 "(与 KMail %1 比较)：</p>\n"
 
-#: kmreaderwin.cpp:1555
+#: kmreaderwin.cpp:1518
 msgid "( body part )"
 msgstr "(正文部分)"
 
-#: kmreaderwin.cpp:1854
+#: kmreaderwin.cpp:1890
 msgid "Could not send MDN."
 msgstr "无法发送 MDN。"
 
-#: kmreaderwin.cpp:1978
+#: kmreaderwin.cpp:1992
+#, fuzzy
+msgid "Copy Email Address"
+msgstr "邮件地址："
+
+#: kmreaderwin.cpp:2044
 msgid "Decrypt With Chiasmus..."
 msgstr "用 Chiasmus 解密..."
 
-#: kmreaderwin.cpp:2133 kmreaderwin.cpp:2169 kmreaderwin.cpp:2188
+#: kmreaderwin.cpp:2050
+msgid "Scroll To"
+msgstr ""
+
+#: kmreaderwin.cpp:2208 kmreaderwin.cpp:2244 kmreaderwin.cpp:2264
 #, c-format
 msgid "View Attachment: %1"
 msgstr "查看附件：%1"
 
-#: kmreaderwin.cpp:2181
+#: kmreaderwin.cpp:2257
 #, c-format
 msgid ""
 "_n: [KMail: Attachment contains binary data. Trying to show first character.]\n"
 "[KMail: Attachment contains binary data. Trying to show first %n characters.]"
 msgstr "[KMail：附件包含二进制数据。正在试图显示前 %n 个字符。]"
 
-#: kmreaderwin.cpp:2277
+#: kmreaderwin.cpp:2353
 msgid "&Open with '%1'"
 msgstr "用“%1”打开(&O)"
 
-#: kmreaderwin.cpp:2279
+#: kmreaderwin.cpp:2355
 msgid "&Open With..."
 msgstr "打开方式(&O)..."
 
-#: kmreaderwin.cpp:2281
+#: kmreaderwin.cpp:2357
 msgid ""
 "Open attachment '%1'?\n"
 "Note that opening an attachment may compromise your system's security."
@@ -8570,35 +9493,35 @@ msgstr ""
 "打开附件“%1”吗？\n"
 "请注意，打开附件可能会危及您系统的安全。"
 
-#: kmreaderwin.cpp:2286
+#: kmreaderwin.cpp:2362
 msgid "Open Attachment?"
 msgstr "打开附件？"
 
-#: kmreaderwin.cpp:2625
+#: kmreaderwin.cpp:2804
 msgid ""
 "Deleting an attachment might invalidate any digital signature on this message."
 msgstr "删除附件可能使信件中的任何数字签名失效。"
 
-#: kmreaderwin.cpp:2637
+#: kmreaderwin.cpp:2860
 msgid ""
 "Modifying an attachment might invalidate any digital signature on this message."
 msgstr "编辑附件可能使信件中的任何数字签名失效。"
 
-#: kmreaderwin.cpp:2685
+#: kmreaderwin.cpp:2956
 msgid "Attachments:"
 msgstr "附件："
 
-#: kmsearchpattern.cpp:898
+#: kmsearchpattern.cpp:913
 msgid ""
 "_: name used for a virgin filter\n"
 "unknown"
 msgstr "未知"
 
-#: kmsearchpattern.cpp:904
+#: kmsearchpattern.cpp:919
 msgid "(match any of the following)"
 msgstr "(匹配以下任意)"
 
-#: kmsearchpattern.cpp:906
+#: kmsearchpattern.cpp:921
 msgid "(match all of the following)"
 msgstr "(匹配以下全部)"
 
@@ -8630,33 +9553,52 @@ msgstr "天数"
 msgid "Message Status"
 msgstr "信件状态"
 
-#: kmsearchpatternedit.cpp:391
+#: kmsearchpatternedit.cpp:42
+#, fuzzy
+msgid "From"
+msgstr "发件人(&F)"
+
+#: kmsearchpatternedit.cpp:43 recipientseditor.cpp:100
+msgid "To"
+msgstr "收件人"
+
+#: kmsearchpatternedit.cpp:44 recipientseditor.cpp:102
+msgid "CC"
+msgstr "抄送"
+
+#: kmsearchpatternedit.cpp:45
+#, fuzzy
+msgid "Reply To"
+msgstr "回复到(&R)"
+
+#: kmsearchpatternedit.cpp:46
+#, fuzzy
+msgid "Organization"
+msgstr "组织："
+
+#: kmsearchpatternedit.cpp:397
 msgid "Search Criteria"
 msgstr "搜索准则"
 
-#: kmsearchpatternedit.cpp:408
+#: kmsearchpatternedit.cpp:414
 msgid "Match a&ll of the following"
 msgstr "匹配以下全部(&L)"
 
-#: kmsearchpatternedit.cpp:409
+#: kmsearchpatternedit.cpp:415
 msgid "Match an&y of the following"
 msgstr "匹配以下任意(&Y)"
 
-#: kmsender.cpp:114
-msgid "Please create an account for sending and try again."
-msgstr "请创建一个用于发送的账户然后重试。"
-
 #: kmsender.cpp:171
 msgid "Cannot add message to outbox folder"
 msgstr "不能把信件添加到 发件箱 文件夹"
 
-#: kmsender.cpp:373
+#: kmsender.cpp:374
 msgid ""
 "Critical error: Unable to process sent mail (out of space?)Moving failing "
 "message to \"sent-mail\" folder."
 msgstr "严重错误: 无法处理已发信件(没有空间?)。失败的信件移到“已发邮件夹”中。"
 
-#: kmsender.cpp:385
+#: kmsender.cpp:386
 msgid ""
 "Moving the sent message \"%1\" from the \"outbox\" to the \"sent-mail\" folder "
 "failed.\n"
@@ -8666,7 +9608,7 @@ msgstr ""
 "将已发送信件 %1 从“发件夹”移动到“已发文件夹”失败。\n"
 "可能的原因是缺少磁盘空间或写权限。请试着修复此问题然后手工移动信件。"
 
-#: kmsender.cpp:431
+#: kmsender.cpp:432
 msgid ""
 "It's not possible to send messages without specifying a sender address.\n"
 "Please set the email address of identity '%1' in the Identities section of the "
@@ -8675,50 +9617,50 @@ msgstr ""
 "没有指定发件人地址，无法发送信件。\n"
 "请在配置对话框的身份一节中设置身份“%1”的电子邮件地址，然后再试一次。"
 
-#: kmsender.cpp:453
+#: kmsender.cpp:454
 #, c-format
 msgid ""
 "_n: %n queued message successfully sent.\n"
 "%n queued messages successfully sent."
 msgstr "队列中的 %n 封信件已成功发出。"
 
-#: kmsender.cpp:456
+#: kmsender.cpp:457
 msgid "%1 of %2 queued messages successfully sent."
 msgstr "队列中的 %2 封信件已成功发出 %1 封。"
 
-#: kmsender.cpp:471
+#: kmsender.cpp:472
 msgid "Sending messages"
 msgstr "发送信件"
 
-#: kmsender.cpp:472
+#: kmsender.cpp:473
 msgid "Initiating sender process..."
 msgstr "正在初始化发送过程..."
 
-#: kmsender.cpp:502
+#: kmsender.cpp:503
 msgid ""
 "You have chosen to send all queued email using an unencrypted transport, do you "
 "want to continue? "
 msgstr "您选择了使用不加密传送发送队列中的邮件，您是否想要继续？"
 
-#: kmsender.cpp:504
+#: kmsender.cpp:505
 msgid "Send Unencrypted"
 msgstr "发送不加密的"
 
-#: kmsender.cpp:556
+#: kmsender.cpp:557
 msgid "Unrecognized transport protocol. Unable to send message."
 msgstr "不能识别的传送协议。无法发送邮件。"
 
-#: kmsender.cpp:597
+#: kmsender.cpp:598
 msgid ""
 "_: %3: subject of message\n"
 "Sending message %1 of %2: %3"
 msgstr "发送邮件 %1 / %2：%3"
 
-#: kmsender.cpp:616
+#: kmsender.cpp:617
 msgid "Failed to send (some) queued messages."
 msgstr "不能发出(一些)队列中的邮件。"
 
-#: kmsender.cpp:693
+#: kmsender.cpp:694
 msgid ""
 "Sending aborted:\n"
 "%1\n"
@@ -8734,11 +9676,11 @@ msgstr ""
 "使用的是如下传送协议：\n"
 "  %2"
 
-#: kmsender.cpp:701 kmsender.cpp:746
+#: kmsender.cpp:702 kmsender.cpp:747
 msgid "Sending aborted."
 msgstr "发送已中止。"
 
-#: kmsender.cpp:719
+#: kmsender.cpp:720
 msgid ""
 "<p>Sending failed:</p>"
 "<p>%1</p>"
@@ -8754,19 +9696,19 @@ msgstr ""
 "<p>使用的是如下传送协议：%2</p>"
 "<p>您是否还想继续发送剩下的信件？</p>"
 
-#: kmsender.cpp:729
+#: kmsender.cpp:730
 msgid "Continue Sending"
 msgstr "继续发送"
 
-#: kmsender.cpp:729
+#: kmsender.cpp:730
 msgid "&Continue Sending"
 msgstr "继续发送(&C)"
 
-#: kmsender.cpp:730
+#: kmsender.cpp:731
 msgid "&Abort Sending"
 msgstr "中止发送(&A)"
 
-#: kmsender.cpp:732
+#: kmsender.cpp:733
 msgid ""
 "Sending failed:\n"
 "%1\n"
@@ -8781,11 +9723,11 @@ msgstr ""
 "使用的是如下传送协议：\n"
 "  %2"
 
-#: kmsender.cpp:930
+#: kmsender.cpp:931
 msgid "Please specify a mailer program in the settings."
 msgstr "请在设置中指定一个邮件发送程序。"
 
-#: kmsender.cpp:931
+#: kmsender.cpp:932
 msgid ""
 "Sending failed:\n"
 "%1\n"
@@ -8801,65 +9743,65 @@ msgstr ""
 "使用的是如下传送协议：\n"
 " %2"
 
-#: kmsender.cpp:979
+#: kmsender.cpp:980
 #, c-format
 msgid "Failed to execute mailer program %1"
 msgstr "执行邮件发送程序 %1 失败"
 
-#: kmsender.cpp:1029
+#: kmsender.cpp:1030
 msgid "Sendmail exited abnormally."
 msgstr "Sendmail 异常退出。"
 
-#: kmsender.cpp:1099
+#: kmsender.cpp:1100
 msgid "You need to supply a username and a password to use this SMTP server."
 msgstr "您需要提供用户名和密码来使用这个 SMTP 服务器。"
 
-#: kmstartup.cpp:197
+#: kmstartup.cpp:198
 msgid ""
 "%1 already seems to be running on another display on this machine. Running %2 "
 "more than once can cause the loss of mail. You should not start %1 unless you "
 "are sure that it is not already running."
 msgstr "%1 似乎正在运行于本机的另外一个显示上。多次运行 %2 可能会导致丢失邮件。不应该启动 %1，除非您确定并未在运行。"
 
-#: kmstartup.cpp:207
+#: kmstartup.cpp:208
 msgid ""
 "%1 seems to be running on another display on this machine. Running %1 and %2 at "
 "the same time can cause the loss of mail. You should not start %2 unless you "
 "are sure that %1 is not running."
 msgstr "%1 似乎正在运行于本机的另外一个显示上。同时运行 %1 和 %2 可能会导致丢失邮件。不应该启动 %2，除非您确定 %1 未在运行。"
 
-#: kmstartup.cpp:215
+#: kmstartup.cpp:216
 msgid ""
 "%1 already seems to be running on %2. Running %1 more than once can cause the "
 "loss of mail. You should not start %1 on this computer unless you are sure that "
 "it is not already running on %2."
 msgstr "%1 似乎正在运行于 %2 上。多次运行 %1 可能会导致丢失邮件。不应该启动 %1，除非您确定它并未运行在 %2 上。"
 
-#: kmstartup.cpp:221
+#: kmstartup.cpp:222
 msgid ""
 "%1 seems to be running on %3. Running %1 and %2 at the same time can cause the "
 "loss of mail. You should not start %2 on this computer unless you are sure that "
 "%1 is not running on %3."
 msgstr "%1 似乎正在运行于 %3 上。同时运行 %1 和 %2 可能会导致丢失邮件。不应该启动 %2，除非您确定 %1 并未运行在 %3 上。"
 
-#: kmstartup.cpp:231
+#: kmstartup.cpp:232
 #, c-format
 msgid "Start %1"
 msgstr "启动 %1"
 
-#: kmstartup.cpp:232
+#: kmstartup.cpp:233
 msgid "Exit"
 msgstr "退出"
 
-#: kmsystemtray.cpp:337
+#: kmsystemtray.cpp:357
 msgid "New Messages In"
 msgstr "新邮件位于"
 
-#: kmsystemtray.cpp:547
+#: kmsystemtray.cpp:567
 msgid "There are no unread messages"
 msgstr "无未读信件"
 
-#: kmsystemtray.cpp:549
+#: kmsystemtray.cpp:569
 #, c-format
 msgid ""
 "_n: There is 1 unread message.\n"
@@ -9117,51 +10059,56 @@ msgstr "管理筛选脚本"
 msgid "Available Scripts"
 msgstr "可用脚本"
 
-#: managesievescriptsdialog.cpp:116
+#: managesievescriptsdialog.cpp:121
 msgid "No Sieve URL configured"
 msgstr "未配置筛选 URL"
 
-#: managesievescriptsdialog.cpp:135
+#: managesievescriptsdialog.cpp:140
 msgid "Failed to fetch the list of scripts"
 msgstr "获取脚本列表失败"
 
-#: managesievescriptsdialog.cpp:160
+#: managesievescriptsdialog.cpp:165
 msgid "Delete Script"
 msgstr "删除脚本"
 
-#: managesievescriptsdialog.cpp:161
+#: managesievescriptsdialog.cpp:166
 msgid "Edit Script..."
 msgstr "编辑脚本..."
 
-#: managesievescriptsdialog.cpp:164
+#: managesievescriptsdialog.cpp:167
+#, fuzzy
+msgid "Deactivate Script"
+msgstr "删除脚本"
+
+#: managesievescriptsdialog.cpp:170
 msgid "New Script..."
 msgstr "新建脚本..."
 
-#: managesievescriptsdialog.cpp:233
+#: managesievescriptsdialog.cpp:256
 msgid "Really delete script \"%1\" from the server?"
 msgstr "真的要从服务器上删除脚本“%1”吗？"
 
-#: managesievescriptsdialog.cpp:234
+#: managesievescriptsdialog.cpp:257
 msgid "Delete Sieve Script Confirmation"
 msgstr "删除筛选脚本确认"
 
-#: managesievescriptsdialog.cpp:278
+#: managesievescriptsdialog.cpp:300
 msgid "New Sieve Script"
 msgstr "新建筛选脚本"
 
-#: managesievescriptsdialog.cpp:279
+#: managesievescriptsdialog.cpp:301
 msgid "Please enter a name for the new Sieve script:"
 msgstr "请输入新筛选脚本的名称："
 
-#: managesievescriptsdialog.cpp:293
+#: managesievescriptsdialog.cpp:315
 msgid "Edit Sieve Script"
 msgstr "编辑筛选脚本"
 
-#: managesievescriptsdialog.cpp:337
+#: managesievescriptsdialog.cpp:367
 msgid "The Sieve script was successfully uploaded."
 msgstr "筛选脚本已成功上传。"
 
-#: managesievescriptsdialog.cpp:338
+#: managesievescriptsdialog.cpp:368
 msgid "Sieve Script Upload"
 msgstr "筛选脚本上传"
 
@@ -9171,7 +10118,7 @@ msgid ""
 "&Reply"
 msgstr "回复(&R)"
 
-#: messageactions.cpp:48 searchwindow.cpp:311
+#: messageactions.cpp:48 searchwindow.cpp:312
 msgid "&Reply..."
 msgstr "回复(&R)..."
 
@@ -9179,11 +10126,11 @@ msgstr "回复(&R)..."
 msgid "Reply to A&uthor..."
 msgstr "回复作者(&U)..."
 
-#: messageactions.cpp:58 searchwindow.cpp:313
+#: messageactions.cpp:58 searchwindow.cpp:314
 msgid "Reply to &All..."
 msgstr "回复所有人(&A)..."
 
-#: messageactions.cpp:63 searchwindow.cpp:316
+#: messageactions.cpp:63 searchwindow.cpp:317
 msgid "Reply to Mailing-&List..."
 msgstr "回复到邮件列表(&L)..."
 
@@ -9244,7 +10191,7 @@ msgstr "删除活动项信件标记(&A)"
 msgid "&Edit Message"
 msgstr "编辑信件(&E)"
 
-#: messagecomposer.cpp:222
+#: messagecomposer.cpp:223
 msgid ""
 "<qt>"
 "<p>Structuring information returned by the Crypto plug-in could not be "
@@ -9252,7 +10199,7 @@ msgid ""
 "<p>Please contact your system administrator.</p></qt>"
 msgstr "<qt><p>加密算法插件返回的结构信息无法正确处理；插件可能已经损坏。</p><p>请联系您的系统管理员。</p></qt>"
 
-#: messagecomposer.cpp:226
+#: messagecomposer.cpp:227
 msgid ""
 "<p>No active Crypto Plug-In was found and the built-in OpenPGP code did not run "
 "successfully.</p>"
@@ -9269,7 +10216,7 @@ msgstr ""
 "<li><em>或者</em>使用设置->配置 KMail->插件对话框激活插件；</li>"
 "<li><em>或者</em>在同一对话框的身份->高级标签中指定传统的 OpenPGP 设置。</li></ul>"
 
-#: messagecomposer.cpp:444
+#: messagecomposer.cpp:445
 msgid ""
 "No suitable encoding could be found for your message.\n"
 "Please set an encoding using the 'Options' menu."
@@ -9277,29 +10224,29 @@ msgstr ""
 "找不到合适的编码发送您的信件。\n"
 "请在“选项”菜单中设定一种编码。"
 
-#: messagecomposer.cpp:556
+#: messagecomposer.cpp:557
 msgid ""
 "Chiasmus backend does not offer the \"x-encrypt\" function. Please report this "
 "bug."
 msgstr "Chiasmus 后端不提供“x-encrypt”功能。请报告错误。"
 
-#: messagecomposer.cpp:564
+#: messagecomposer.cpp:565
 msgid ""
 "The \"x-encrypt\" function does not accept the expected parameters. Please "
 "report this bug."
 msgstr "“x-encrypt”功能不接受意外参数。请报告错误。"
 
-#: messagecomposer.cpp:572
+#: messagecomposer.cpp:573
 msgid "Chiasmus Encryption Error"
 msgstr "Chiasmus 加密出错"
 
-#: messagecomposer.cpp:577
+#: messagecomposer.cpp:578
 msgid ""
 "Unexpected return value from Chiasmus backend: The \"x-encrypt\" function did "
 "not return a byte array. Please report this bug."
 msgstr "Chiasmus 后端返回了意外值：“x-encrypt”功能未返回字节数组。请报告错误。"
 
-#: messagecomposer.cpp:638
+#: messagecomposer.cpp:636
 msgid ""
 "The inline OpenPGP crypto message format does not support encryption or signing "
 "of attachments.\n"
@@ -9308,19 +10255,19 @@ msgstr ""
 "内嵌的 OpenPGP 加密信件格式不支持附件的加密或签名。\n"
 "真的要使用我们不推荐的内嵌 OpenPGP 吗？"
 
-#: messagecomposer.cpp:642
+#: messagecomposer.cpp:640
 msgid "Insecure Message Format"
 msgstr "不安全的信件格式"
 
-#: messagecomposer.cpp:643
+#: messagecomposer.cpp:641
 msgid "Use Inline OpenPGP"
 msgstr "使用内嵌 OpenPGP"
 
-#: messagecomposer.cpp:644
+#: messagecomposer.cpp:642
 msgid "Use OpenPGP/MIME"
 msgstr "使用 OpenPGP/MIME"
 
-#: messagecomposer.cpp:760
+#: messagecomposer.cpp:758
 msgid ""
 "Examination of the recipient's signing preferences yielded that you be asked "
 "whether or not to sign this message.\n"
@@ -9329,21 +10276,21 @@ msgstr ""
 "对收件人签名首选项的检查要求询问您是否要对此信件签名。\n"
 "对此信件签名吗？"
 
-#: messagecomposer.cpp:765 messagecomposer.cpp:788
+#: messagecomposer.cpp:763 messagecomposer.cpp:786
 msgid "Sign Message?"
 msgstr "给信件签名?"
 
-#: messagecomposer.cpp:766 messagecomposer.cpp:789
+#: messagecomposer.cpp:764 messagecomposer.cpp:787
 msgid ""
 "_: to sign\n"
 "&Sign"
 msgstr "签名(&S)"
 
-#: messagecomposer.cpp:767 messagecomposer.cpp:790
+#: messagecomposer.cpp:765 messagecomposer.cpp:788
 msgid "Do &Not Sign"
 msgstr "不签名(&N)"
 
-#: messagecomposer.cpp:784
+#: messagecomposer.cpp:782
 msgid ""
 "There are conflicting signing preferences for these recipients.\n"
 "Sign this message?"
@@ -9351,21 +10298,21 @@ msgstr ""
 "这些收件人的签名首选项之间有冲突。\n"
 "对此信件签名吗？"
 
-#: messagecomposer.cpp:806
+#: messagecomposer.cpp:804
 msgid ""
 "You have requested to sign this message, but no valid signing keys have been "
 "configured for this identity."
 msgstr "您请求了对此信件签名，但并未为此身份配置有效的签名密钥。"
 
-#: messagecomposer.cpp:810
+#: messagecomposer.cpp:808
 msgid "Send Unsigned?"
 msgstr "不签名发送吗？"
 
-#: messagecomposer.cpp:811
+#: messagecomposer.cpp:809
 msgid "Send &Unsigned"
 msgstr "不签名发送(&U)"
 
-#: messagecomposer.cpp:826
+#: messagecomposer.cpp:824
 msgid ""
 "Some parts of this message will not be signed.\n"
 "Sending only partially signed messages might violate site policy.\n"
@@ -9375,7 +10322,7 @@ msgstr ""
 "发送部分签名的信件可能破坏站点策略。\n"
 "对每个部分签名吗？"
 
-#: messagecomposer.cpp:829
+#: messagecomposer.cpp:827
 msgid ""
 "This message will not be signed.\n"
 "Sending unsigned message might violate site policy.\n"
@@ -9385,23 +10332,23 @@ msgstr ""
 "发送不签名的信件可能破坏站点策略。\n"
 "对信件签名吗？"
 
-#: messagecomposer.cpp:833
+#: messagecomposer.cpp:831
 msgid "&Sign All Parts"
 msgstr "给所有部分签名(&S)"
 
-#: messagecomposer.cpp:833
+#: messagecomposer.cpp:831
 msgid "&Sign"
 msgstr "签名(&S)"
 
-#: messagecomposer.cpp:835
+#: messagecomposer.cpp:833
 msgid "Unsigned-Message Warning"
 msgstr "未签名信件警告"
 
-#: messagecomposer.cpp:837
+#: messagecomposer.cpp:835
 msgid "Send &As Is"
 msgstr "原样发送(&A)"
 
-#: messagecomposer.cpp:875
+#: messagecomposer.cpp:873
 msgid ""
 "Valid trusted encryption keys were found for all recipients.\n"
 "Encrypt this message?"
@@ -9409,7 +10356,7 @@ msgstr ""
 "找到了所有收件人的有效可信加密密钥。\n"
 "加密此信件吗？"
 
-#: messagecomposer.cpp:877
+#: messagecomposer.cpp:875
 msgid ""
 "Examination of the recipient's encryption preferences yielded that you be asked "
 "whether or not to encrypt this message.\n"
@@ -9418,43 +10365,43 @@ msgstr ""
 "对收件人加密首选项的检查要求询问您是否要对此信件加密。\n"
 "对此信件加密吗？"
 
-#: messagecomposer.cpp:882 messagecomposer.cpp:909
+#: messagecomposer.cpp:880 messagecomposer.cpp:907
 msgid "Encrypt Message?"
 msgstr "加密信件吗？"
 
-#: messagecomposer.cpp:884
+#: messagecomposer.cpp:882
 msgid "Sign && &Encrypt"
 msgstr "签名并加密(&E)"
 
-#: messagecomposer.cpp:887 messagecomposer.cpp:962
+#: messagecomposer.cpp:885 messagecomposer.cpp:960
 msgid "&Sign Only"
 msgstr "只签名(&S)"
 
-#: messagecomposer.cpp:888 messagecomposer.cpp:963
+#: messagecomposer.cpp:886 messagecomposer.cpp:961
 msgid "&Send As-Is"
 msgstr "原样发送(&S)"
 
-#: messagecomposer.cpp:905
+#: messagecomposer.cpp:903
 msgid ""
 "There are conflicting encryption preferences for these recipients.\n"
 "Encrypt this message?"
 msgstr "这些收件人之间的加密首选项有冲突。此信件是否还要加密？"
 
-#: messagecomposer.cpp:911
+#: messagecomposer.cpp:909
 msgid "Do &Not Encrypt"
 msgstr "不加密(&N)"
 
-#: messagecomposer.cpp:927
+#: messagecomposer.cpp:925
 msgid ""
 "You have requested to encrypt this message, and to encrypt a copy to yourself, "
 "but no valid trusted encryption keys have been configured for this identity."
 msgstr "您已要求加密此信件，并给自己保留一份加密副本，但是您还没有为此身份配置一个有效的可信任加密密钥。"
 
-#: messagecomposer.cpp:932
+#: messagecomposer.cpp:930
 msgid "Send Unencrypted?"
 msgstr "发送不加密信件？"
 
-#: messagecomposer.cpp:948
+#: messagecomposer.cpp:946
 msgid ""
 "Some parts of this message will not be encrypted.\n"
 "Sending only partially encrypted messages might violate site policy and/or leak "
@@ -9465,7 +10412,7 @@ msgstr ""
 "发送部分签名的加密信件可能会损害站点安全性并/或泄漏敏感信息。\n"
 "要加密整个信件吗？"
 
-#: messagecomposer.cpp:952
+#: messagecomposer.cpp:950
 msgid ""
 "This message will not be encrypted.\n"
 "Sending unencrypted messages might violate site policy and/or leak sensitive "
@@ -9476,15 +10423,15 @@ msgstr ""
 "发送未加密信件可能会损害站点安全性并/或泄漏敏感信息。\n"
 "要加密信件吗？"
 
-#: messagecomposer.cpp:957
+#: messagecomposer.cpp:955
 msgid "&Encrypt All Parts"
 msgstr "加密所有部分(&E)"
 
-#: messagecomposer.cpp:959
+#: messagecomposer.cpp:957
 msgid "Unencrypted Message Warning"
 msgstr "未加密信件警告"
 
-#: messagecomposer.cpp:2040
+#: messagecomposer.cpp:2038
 msgid ""
 "<qt>"
 "<p>Error: The backend did not return any encoded data.</p>"
@@ -9492,76 +10439,83 @@ msgid ""
 "<br>%2</p></qt>"
 msgstr "<qt><p>错误：后端没有返回任何编码后的数据。</p><p>请报告此错误：<br>%2</p></qt>"
 
-#: messagecomposer.cpp:2113
+#: messagecomposer.cpp:2111
 msgid ""
 "<qt>Not all characters fit into the chosen encoding."
 "<br>"
 "<br>Send the message anyway?</qt>"
 msgstr "<qt>不是所有的字符都符合所选的编码。<br><br>还是要发送吗？</qt>"
 
-#: messagecomposer.cpp:2115
+#: messagecomposer.cpp:2113
 msgid "Some Characters Will Be Lost"
 msgstr "某些字符将会丢失"
 
-#: messagecomposer.cpp:2116
+#: messagecomposer.cpp:2114
 msgid "Lose Characters"
 msgstr "丢失字符"
 
-#: messagecomposer.cpp:2116
+#: messagecomposer.cpp:2114
 msgid "Change Encoding"
 msgstr "更改编码"
 
-#: messagecomposer.cpp:2164
+#: messagecomposer.cpp:2149
+#, fuzzy
+msgid ""
+"This message could not be signed, since no valid signing keys have been found; "
+"this should actually never happen, please report this bug."
+msgstr "无法签名此信件，因为选中的后端似乎不支持签名。但这种情况绝对不该发生，请报告此错误。"
+
+#: messagecomposer.cpp:2168
 msgid ""
 "This message could not be signed, since the chosen backend does not seem to "
 "support signing; this should actually never happen, please report this bug."
 msgstr "无法签名此信件，因为选中的后端似乎不支持签名。但这种情况绝对不该发生，请报告此错误。"
 
-#: messagecomposer.cpp:2185
+#: messagecomposer.cpp:2195
 msgid "GnuPG Audit Log for Signing Operation"
 msgstr "GnuPG 签名操作审核日志"
 
-#: messagecomposer.cpp:2190
+#: messagecomposer.cpp:2200
 msgid ""
 "The signing operation failed. Please make sure that the gpg-agent program is "
 "running."
 msgstr "签名操作失败。请确认 gpg-agent 程序正在运行。"
 
-#: messagecomposer.cpp:2213
+#: messagecomposer.cpp:2223
 msgid ""
 "This message could not be encrypted, since the chosen backend does not seem to "
 "support encryption; this should actually never happen, please report this bug."
 msgstr "无法加密此信件，因为选中的后端似乎不支持加密。但这种情况绝对不该发生，请报告此错误。"
 
-#: messagecomposer.cpp:2233 messagecomposer.cpp:2278
+#: messagecomposer.cpp:2249 messagecomposer.cpp:2300
 msgid "GnuPG Audit Log for Encryption Operation"
 msgstr "GnuPG 加密操作审核日志"
 
-#: messagecomposer.cpp:2255
+#: messagecomposer.cpp:2271
 msgid ""
 "This message could not be signed and encrypted, since the chosen backend does "
 "not seem to support combined signing and encryption; this should actually never "
 "happen, please report this bug."
 msgstr "无法签名并加密此信件，因为选中的后端似乎不支持签名和加密同时进行。但这种情况绝对不该发生，请报告此错误。"
 
-#: newfolderdialog.cpp:58
+#: newfolderdialog.cpp:59
 msgid "New Folder"
 msgstr "新建文件夹"
 
-#: newfolderdialog.cpp:65
+#: newfolderdialog.cpp:69
 #, c-format
 msgid "New Subfolder of %1"
 msgstr "新建 %1 的子文件夹"
 
-#: newfolderdialog.cpp:81
+#: newfolderdialog.cpp:85
 msgid "Enter a name for the new folder."
 msgstr "输入新文件夹的名称。"
 
-#: newfolderdialog.cpp:92
+#: newfolderdialog.cpp:96
 msgid "Mailbox &format:"
 msgstr "邮箱格式(&F)："
 
-#: newfolderdialog.cpp:97
+#: newfolderdialog.cpp:101
 msgid ""
 "Select whether you want to store the messages in this folder as one file per  "
 "message (maildir) or as one big file (mbox). KMail uses maildir by default and "
@@ -9571,131 +10525,118 @@ msgstr ""
 "选择是将信件存储为每封信件一个文件(maildir)还是在统一在一个大文件中(mbox)。KMail 默认会使用 maildir "
 "格式，只有在很少的场合下您才需要更改此设定。如果您不确认是否要改动，请将此选项保留不变。"
 
-#: newfolderdialog.cpp:119
+#: newfolderdialog.cpp:124
 msgid "Folder &contains:"
 msgstr "文件夹包含(&C)："
 
-#: newfolderdialog.cpp:124
+#: newfolderdialog.cpp:129
 msgid ""
 "Select whether you want the new folder to be used for mail storage of for "
 "storage of groupware items such as tasks or notes. The default is mail. If you "
 "are unsure, leave this option as-is."
 msgstr "选择要将新文件夹设定为适用于邮件存储还是适用于任务或便笺一类群件项目的存储。默认为适用邮件，如果您不确认是否要改动，请将此选项保留不变。"
 
-#: newfolderdialog.cpp:160
+#: newfolderdialog.cpp:165
 msgid "Namespace for &folder:"
 msgstr "文件夹的命名空间(&F)："
 
-#: newfolderdialog.cpp:165
+#: newfolderdialog.cpp:170
 msgid "Select the personal namespace the folder should be created in."
 msgstr "请选择创建文件夹的个人命名空间。"
 
-#: newfolderdialog.cpp:188
+#: newfolderdialog.cpp:193
 msgid "Please specify a name for the new folder."
 msgstr "请指定新文件夹的名称。"
 
-#: newfolderdialog.cpp:189
+#: newfolderdialog.cpp:194
 msgid "No Name Specified"
 msgstr "未指定名称"
 
-#: newfolderdialog.cpp:198
-msgid ""
-"Folder names cannot contain the / (slash) character; please choose another "
-"folder name."
-msgstr "文件夹名称不能包含斜线字符；请另选一个文件夹名称。"
-
-#: newfolderdialog.cpp:204
-msgid ""
-"Folder names cannot start with a . (dot) character; please choose another "
-"folder name."
-msgstr "文件夹名称不能包含点字符；请另选一个文件夹名称。"
-
-#: newfolderdialog.cpp:223
-msgid ""
-"Your IMAP server does not allow the character '%1'; please choose another "
-"folder name."
-msgstr "您的 IMAP 服务器不允许字符“%1”；请另选一个文件夹名称。"
-
-#: newfolderdialog.cpp:240
+#: newfolderdialog.cpp:216
 msgid "<qt>Failed to create folder <b>%1</b>, folder already exists.</qt>"
 msgstr "<qt>创建文件夹 <b>%1</b>失败，文件夹已存在。</qt>"
 
-#: newfolderdialog.cpp:246
+#: newfolderdialog.cpp:222
 msgid "<qt>Failed to create folder <b>%1</b>.</qt> "
 msgstr "<qt>创建文件夹 <b>%1</b> 失败。</qt>"
 
-#: objecttreeparser.cpp:450
+#: objecttreeparser.cpp:490
 msgid "Wrong Crypto Plug-In."
 msgstr "错误的加密插件。"
 
-#: objecttreeparser.cpp:490 objecttreeparser.cpp:1909
+#: objecttreeparser.cpp:594 objecttreeparser.cpp:2130
 msgid "Different results for signatures"
 msgstr "签名结果不同"
 
-#: objecttreeparser.cpp:573
+#: objecttreeparser.cpp:667
 msgid "The crypto engine returned no cleartext data."
 msgstr "加密引擎没有纯文本数据返回。"
 
-#: objecttreeparser.cpp:576 objecttreeparser.cpp:2350
-#: objecttreeparser.cpp:2393
+#: objecttreeparser.cpp:670 objecttreeparser.cpp:2594
+#: objecttreeparser.cpp:2637
 msgid "Status: "
 msgstr "状态："
 
-#: objecttreeparser.cpp:583
+#: objecttreeparser.cpp:677
 msgid "(unknown)"
 msgstr "(未知)"
 
-#: objecttreeparser.cpp:594 objecttreeparser.cpp:748
+#: objecttreeparser.cpp:688 objecttreeparser.cpp:903
 msgid "Crypto plug-in \"%1\" is not initialized."
 msgstr "加密算法插件“%1”无法初始化。"
 
-#: objecttreeparser.cpp:598
+#: objecttreeparser.cpp:692
 msgid "Crypto plug-in \"%1\" cannot verify signatures."
 msgstr "加密算法插件“%1”无法校验签名。"
 
-#: objecttreeparser.cpp:603 objecttreeparser.cpp:756
+#: objecttreeparser.cpp:697 objecttreeparser.cpp:911
 msgid "No appropriate crypto plug-in was found."
 msgstr "没有找到合适的加密算法插件。"
 
-#: objecttreeparser.cpp:606
+#: objecttreeparser.cpp:700
 msgid ""
 "_: %1 is either 'OpenPGP' or 'S/MIME'\n"
 "No %1 plug-in was found."
 msgstr "没有发现 %1 插件。"
 
-#: objecttreeparser.cpp:610
+#: objecttreeparser.cpp:704
 #, c-format
 msgid ""
 "The message is signed, but the validity of the signature cannot be verified.<br "
 "/>Reason: %1"
 msgstr "信件已签名，但是无法校验签名的有效性。<br />原因：%1"
 
-#: objecttreeparser.cpp:667
+#: objecttreeparser.cpp:737
+#, fuzzy
+msgid "Encrypted data not shown"
+msgstr "加密数据未显示。"
+
+#: objecttreeparser.cpp:755
 msgid "This message is encrypted."
 msgstr "此信件已加密。"
 
-#: objecttreeparser.cpp:672
+#: objecttreeparser.cpp:760
 msgid "Decrypt Message"
 msgstr "解密信件"
 
-#: objecttreeparser.cpp:731 objecttreeparser.cpp:744 objecttreeparser.cpp:773
+#: objecttreeparser.cpp:886 objecttreeparser.cpp:899 objecttreeparser.cpp:928
 msgid "Encrypted data not shown."
 msgstr "加密数据未显示。"
 
-#: objecttreeparser.cpp:734
+#: objecttreeparser.cpp:889
 msgid "Crypto plug-in \"%1\" could not decrypt the data."
 msgstr "加密插件“%1”无法解密数据。"
 
-#: objecttreeparser.cpp:737
+#: objecttreeparser.cpp:892
 #, c-format
 msgid "Error: %1"
 msgstr "错误：%1"
 
-#: objecttreeparser.cpp:752
+#: objecttreeparser.cpp:907
 msgid "Crypto plug-in \"%1\" cannot decrypt messages."
 msgstr "加密算法插件“%1”无法解密任何信件。"
 
-#: objecttreeparser.cpp:844
+#: objecttreeparser.cpp:1000
 msgid ""
 "<b>Note:</b> This HTML message may contain external references to images etc. "
 "For security/privacy reasons external references are not loaded. If you trust "
@@ -9705,7 +10646,7 @@ msgstr ""
 "<b>注意：</b>这封 HTML 信件可能包含对外部图像的引用。为安全起见，外部引用不会装入。如果您信任此信件的发件人，您可以单击<a "
 "href=\"kmail:loadExternal\">此处</a>装入此新建的外部引用。"
 
-#: objecttreeparser.cpp:854
+#: objecttreeparser.cpp:1010
 msgid ""
 "<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
 "code is shown. If you trust the sender of this message then you can activate "
@@ -9715,313 +10656,341 @@ msgstr ""
 "<b>注意：</b>这是一封 HTML 信件。为安全起见，仅显示 HTML 源代码。如果您信任此信件的发件人，您可以单击<a "
 "href=\"kmail:showHTML\">此处</a>显示排版后的 HTML。"
 
-#: objecttreeparser.cpp:1451
+#: objecttreeparser.cpp:1227
+msgid ""
+"This message is a <i>Toltec</i> Groupware object, it can only be viewed with "
+"Microsoft Outlook in combination with the Toltec connector."
+msgstr ""
+
+#: objecttreeparser.cpp:1239
+#, fuzzy
+msgid "Show Raw Message"
+msgstr "转发的信件"
+
+#: objecttreeparser.cpp:1658
 #, c-format
 msgid "Sorry, certificate could not be imported.<br>Reason: %1"
 msgstr "证书无法导入。<br>原因：%1"
 
-#: objecttreeparser.cpp:1461
+#: objecttreeparser.cpp:1668
 msgid "Sorry, no certificates were found in this message."
 msgstr "抱歉，此信件上没有找到任何证书。"
 
-#: objecttreeparser.cpp:1464
+#: objecttreeparser.cpp:1671
 msgid "Certificate import status:"
 msgstr "证书导入状态："
 
-#: objecttreeparser.cpp:1467
+#: objecttreeparser.cpp:1674
 #, c-format
 msgid ""
 "_n: 1 new certificate was imported.\n"
 "%n new certificates were imported."
 msgstr "导入了 %n 个新证书。"
 
-#: objecttreeparser.cpp:1470
+#: objecttreeparser.cpp:1677
 #, c-format
 msgid ""
 "_n: 1 certificate was unchanged.\n"
 "%n certificates were unchanged."
 msgstr "%n 个新证书未更改。"
 
-#: objecttreeparser.cpp:1473
+#: objecttreeparser.cpp:1680
 #, c-format
 msgid ""
 "_n: 1 new secret key was imported.\n"
 "%n new secret keys were imported."
 msgstr "导入了 %n 个新的绝密密钥。"
 
-#: objecttreeparser.cpp:1476
+#: objecttreeparser.cpp:1683
 #, c-format
 msgid ""
 "_n: 1 secret key was unchanged.\n"
 "%n secret keys were unchanged."
 msgstr "%n 个绝密密钥没有更改。"
 
-#: objecttreeparser.cpp:1485
+#: objecttreeparser.cpp:1692
 msgid "Sorry, no details on certificate import available."
 msgstr "抱歉，没有关于证书导入的详情。"
 
-#: objecttreeparser.cpp:1488
+#: objecttreeparser.cpp:1695
 msgid "Certificate import details:"
 msgstr "证书导入详情："
 
-#: objecttreeparser.cpp:1491
+#: objecttreeparser.cpp:1698
 msgid "Failed: %1 (%2)"
 msgstr "失败：%1 (%2)"
 
-#: objecttreeparser.cpp:1496
+#: objecttreeparser.cpp:1703
 msgid "New or changed: %1 (secret key available)"
 msgstr "新建或变更：%1 (密钥可用)"
 
-#: objecttreeparser.cpp:1498
+#: objecttreeparser.cpp:1706
 #, c-format
 msgid "New or changed: %1"
 msgstr "新建或变更：%1"
 
-#: objecttreeparser.cpp:1891
+#: objecttreeparser.cpp:2112
 msgid "Error: Signature not verified"
 msgstr "错误：没有验证签名！"
 
-#: objecttreeparser.cpp:1894
+#: objecttreeparser.cpp:2115
 msgid "Good signature"
 msgstr "有效的签名"
 
-#: objecttreeparser.cpp:1897
+#: objecttreeparser.cpp:2118
 msgid "<b>Bad</b> signature"
 msgstr "<b>无效</b>签名"
 
-#: objecttreeparser.cpp:1900
+#: objecttreeparser.cpp:2121
 msgid "No public key to verify the signature"
 msgstr "没有公开密钥可以验证签名"
 
-#: objecttreeparser.cpp:1903
+#: objecttreeparser.cpp:2124
 msgid "No signature found"
 msgstr "没有找到签名。"
 
-#: objecttreeparser.cpp:1906
+#: objecttreeparser.cpp:2127
 msgid "Error verifying the signature"
 msgstr "验证签名错误"
 
-#: objecttreeparser.cpp:1929
+#: objecttreeparser.cpp:2150
 msgid "No status information available."
 msgstr "没有可用的状态信息。"
 
-#: objecttreeparser.cpp:1936 objecttreeparser.cpp:2020
+#: objecttreeparser.cpp:2157 objecttreeparser.cpp:2241
 msgid "Good signature."
 msgstr "有效签名。"
 
-#: objecttreeparser.cpp:1957
+#: objecttreeparser.cpp:2178
 msgid "One key has expired."
 msgstr "有一个密钥已经过期了。"
 
-#: objecttreeparser.cpp:1961
+#: objecttreeparser.cpp:2182
 msgid "The signature has expired."
 msgstr "签名已过期。"
 
-#: objecttreeparser.cpp:1966
+#: objecttreeparser.cpp:2187
 msgid "Unable to verify: key missing."
 msgstr "无法验证：缺少密钥。"
 
-#: objecttreeparser.cpp:1973
+#: objecttreeparser.cpp:2194
 msgid "CRL not available."
 msgstr "CRL 不可用。"
 
-#: objecttreeparser.cpp:1977
+#: objecttreeparser.cpp:2198
 msgid "Available CRL is too old."
 msgstr "可用的 CRL 已经太旧了"
 
-#: objecttreeparser.cpp:1981
+#: objecttreeparser.cpp:2202
 msgid "A policy was not met."
 msgstr "不符合策略。"
 
-#: objecttreeparser.cpp:1985
+#: objecttreeparser.cpp:2206
 msgid "A system error occurred."
 msgstr "发生系统错误。"
 
-#: objecttreeparser.cpp:1996
+#: objecttreeparser.cpp:2217
 msgid "One key has been revoked."
 msgstr "一个密钥已经被吊销。"
 
-#: objecttreeparser.cpp:2022
+#: objecttreeparser.cpp:2243
 msgid "<b>Bad</b> signature."
 msgstr "<b>无效</b>签名。"
 
-#: objecttreeparser.cpp:2049
+#: objecttreeparser.cpp:2270
 msgid "Invalid signature."
 msgstr "无效签名。"
 
-#: objecttreeparser.cpp:2051
+#: objecttreeparser.cpp:2272
 msgid "Not enough information to check signature validity."
 msgstr "没有足够的信息检查签名有效性。"
 
-#: objecttreeparser.cpp:2060
+#: objecttreeparser.cpp:2281
 msgid "Signature is valid."
 msgstr "签名有效。"
 
-#: objecttreeparser.cpp:2062
+#: objecttreeparser.cpp:2283
 msgid "Signed by <a href=\"mailto:%1\">%2</a>."
 msgstr "由 <a href=\"mailto:%1\">%2</a> 签名。"
 
-#: objecttreeparser.cpp:2066
+#: objecttreeparser.cpp:2287
 msgid "Unknown signature state"
 msgstr "未知的签名状态"
 
-#: objecttreeparser.cpp:2070
+#: objecttreeparser.cpp:2291
 msgid "Show Details"
 msgstr "显示细节"
 
-#: objecttreeparser.cpp:2082
+#: objecttreeparser.cpp:2308
 msgid "No Audit Log available"
 msgstr "无可用的审核日志"
 
-#: objecttreeparser.cpp:2089
+#: objecttreeparser.cpp:2310
+#, fuzzy, c-format
+msgid "Error Retrieving Audit Log: %1"
+msgstr ""
+"从服务器获取配额信息出错\n"
+"%1"
+
+#: objecttreeparser.cpp:2320
 msgid ""
 "_: The Audit Log is a detailed error log from the gnupg backend\n"
 "Show Audit Log"
 msgstr ""
 
-#: objecttreeparser.cpp:2097
+#: objecttreeparser.cpp:2331
 msgid "Hide Details"
 msgstr "隐藏细节"
 
-#: objecttreeparser.cpp:2124 objecttreeparser.cpp:2126
+#: objecttreeparser.cpp:2357 objecttreeparser.cpp:2359
 msgid "Encapsulated message"
 msgstr "封装的信件"
 
-#: objecttreeparser.cpp:2135
+#: objecttreeparser.cpp:2368
+#, fuzzy
+msgid "Please wait while the message is being decrypted..."
+msgstr "此信件已加密。"
+
+#: objecttreeparser.cpp:2370
 msgid "Encrypted message"
 msgstr "加密的信件"
 
-#: objecttreeparser.cpp:2137
+#: objecttreeparser.cpp:2372
 msgid "Encrypted message (decryption not possible)"
 msgstr "加密信件(无法解密)"
 
-#: objecttreeparser.cpp:2139
+#: objecttreeparser.cpp:2374
 #, c-format
 msgid "Reason: %1"
 msgstr "原因：%1"
 
-#: objecttreeparser.cpp:2194
+#: objecttreeparser.cpp:2384
+#, fuzzy
+msgid "Please wait while the signature is being verified..."
+msgstr "无法校验签名的有效性。"
+
+#: objecttreeparser.cpp:2438
 msgid "[Details]"
 msgstr "[详细数据]"
 
-#: objecttreeparser.cpp:2233 objecttreeparser.cpp:2235
+#: objecttreeparser.cpp:2477 objecttreeparser.cpp:2479
 #, fuzzy
 msgid "certificate"
 msgstr "证书"
 
-#: objecttreeparser.cpp:2242 objecttreeparser.cpp:2267
+#: objecttreeparser.cpp:2486 objecttreeparser.cpp:2511
 msgid "Warning:"
 msgstr "警告："
 
-#: objecttreeparser.cpp:2244
+#: objecttreeparser.cpp:2488
 msgid "Sender's mail address is not stored in the %1 used for signing."
 msgstr "用于签名的 %1 中没有存储发件人地址。"
 
-#: objecttreeparser.cpp:2247
+#: objecttreeparser.cpp:2491
 msgid "sender: "
 msgstr "发件人："
 
-#: objecttreeparser.cpp:2250
+#: objecttreeparser.cpp:2494
 msgid "stored: "
 msgstr "已存储的："
 
-#: objecttreeparser.cpp:2269
+#: objecttreeparser.cpp:2513
 msgid ""
 "No mail address is stored in the %1 used for signing, so we cannot compare it "
 "to the sender's address %2."
 msgstr "用于签名的 %1 中没有存储电子邮件地址，所以我们无法比较发件人的地址 %2。"
 
-#: objecttreeparser.cpp:2292
+#: objecttreeparser.cpp:2536
 #, c-format
 msgid "Not enough information to check signature. %1"
 msgstr "没有足够的信息检查签名：%1"
 
-#: objecttreeparser.cpp:2309 objecttreeparser.cpp:2387
+#: objecttreeparser.cpp:2553 objecttreeparser.cpp:2631
 msgid "Message was signed with unknown key."
 msgstr "信件由未知的密钥签名。"
 
-#: objecttreeparser.cpp:2311 objecttreeparser.cpp:2425
-#: objecttreeparser.cpp:2469
+#: objecttreeparser.cpp:2555 objecttreeparser.cpp:2669
+#: objecttreeparser.cpp:2713
 #, c-format
 msgid "Message was signed by %1."
 msgstr "信件由 %1 签名。"
 
-#: objecttreeparser.cpp:2318 objecttreeparser.cpp:2327
-#: objecttreeparser.cpp:2338
+#: objecttreeparser.cpp:2562 objecttreeparser.cpp:2571
+#: objecttreeparser.cpp:2582
 #, c-format
 msgid "Message was signed with key %1."
 msgstr "信件由密钥 %1 签名。"
 
-#: objecttreeparser.cpp:2321
+#: objecttreeparser.cpp:2565
 msgid "Message was signed on %1 with key %2."
 msgstr "信件用密钥 %2 在 %1 签名。"
 
-#: objecttreeparser.cpp:2330
+#: objecttreeparser.cpp:2574
 msgid "Message was signed by %3 on %1 with key %2"
 msgstr "信件由 %3 用密钥 %2 在 %1 签名。"
 
-#: objecttreeparser.cpp:2341
+#: objecttreeparser.cpp:2585
 msgid "Message was signed by %2 with key %1."
 msgstr "信件由 %2 用密钥 %1 签名。"
 
-#: objecttreeparser.cpp:2379
+#: objecttreeparser.cpp:2623
 msgid "Message was signed on %1 with unknown key %2."
 msgstr "信件由未知的密钥 %2 在 %1 签名。"
 
-#: objecttreeparser.cpp:2383
+#: objecttreeparser.cpp:2627
 #, c-format
 msgid "Message was signed with unknown key %1."
 msgstr "信件由未知的密钥 %1 签名。"
 
-#: objecttreeparser.cpp:2389
+#: objecttreeparser.cpp:2633
 msgid "The validity of the signature cannot be verified."
 msgstr "无法校验签名的有效性。"
 
-#: objecttreeparser.cpp:2421 objecttreeparser.cpp:2465
+#: objecttreeparser.cpp:2665 objecttreeparser.cpp:2709
 msgid "Message was signed by %2 (Key ID: %1)."
 msgstr "信件由 %2 签名(密钥 ID：%1)。"
 
-#: objecttreeparser.cpp:2431
+#: objecttreeparser.cpp:2675
 msgid "The signature is valid, but the key's validity is unknown."
 msgstr "签名是有效的，但无法确认密钥的有效性。"
 
-#: objecttreeparser.cpp:2435
+#: objecttreeparser.cpp:2679
 msgid "The signature is valid and the key is marginally trusted."
 msgstr "签名是有效的，而密钥大约是可信的。"
 
-#: objecttreeparser.cpp:2439
+#: objecttreeparser.cpp:2683
 msgid "The signature is valid and the key is fully trusted."
 msgstr "签名是有效的，而且密钥完全可信。"
 
-#: objecttreeparser.cpp:2443
+#: objecttreeparser.cpp:2687
 msgid "The signature is valid and the key is ultimately trusted."
 msgstr "签名是有效的，而且密钥绝对可信。"
 
-#: objecttreeparser.cpp:2447
+#: objecttreeparser.cpp:2691
 msgid "The signature is valid, but the key is untrusted."
 msgstr "签名是有效的，但是密钥不可信。"
 
-#: objecttreeparser.cpp:2471
+#: objecttreeparser.cpp:2715
 msgid "Warning: The signature is bad."
 msgstr "错误：坏的签名。"
 
-#: objecttreeparser.cpp:2495
+#: objecttreeparser.cpp:2739
 msgid "End of signed message"
 msgstr "签名信件结束"
 
-#: objecttreeparser.cpp:2501
+#: objecttreeparser.cpp:2745
 msgid "End of encrypted message"
 msgstr "加密信件结束"
 
-#: objecttreeparser.cpp:2508
+#: objecttreeparser.cpp:2752
 msgid "End of encapsulated message"
 msgstr "封装信件结束"
 
-#: partNode.cpp:481
+#: partNode.cpp:505
 msgid "internal part"
 msgstr "内部部分"
 
-#: partNode.cpp:483
+#: partNode.cpp:507
 msgid "body part"
 msgstr "正文部分"
 
@@ -10099,19 +11068,19 @@ msgstr "转到(&G)"
 msgid "F&older"
 msgstr "文件夹(&O)"
 
-#. i18n: file kmail_part.rc line 115
+#. i18n: file kmail_part.rc line 116
 #: rc.cpp:21 rc.cpp:45 rc.cpp:87 rc.cpp:120
 #, no-c-format
 msgid "&Message"
 msgstr "信件(&M)"
 
-#. i18n: file kmail_part.rc line 121
+#. i18n: file kmail_part.rc line 122
 #: rc.cpp:24 rc.cpp:90 rc.cpp:123
 #, no-c-format
 msgid "Reply Special"
 msgstr "特殊回复"
 
-#. i18n: file kmail_part.rc line 127
+#. i18n: file kmail_part.rc line 128
 #: rc.cpp:27 rc.cpp:93 rc.cpp:126
 #, no-c-format
 msgid "&Forward"
@@ -10253,158 +11222,170 @@ msgstr "若启用此选项，只要可以并且您希望加密，您发送的所
 msgid "Never sign/encrypt when sa&ving as draft"
 msgstr "保存为草稿时从不签名/加密(&V)"
 
-#. i18n: file customtemplates_base.ui line 180
-#: rc.cpp:194
+#. i18n: file customtemplates_base.ui line 118
+#: rc.cpp:194 rc.cpp:462
+#, no-c-format
+msgid "How does this work?"
+msgstr "工作方式"
+
+#. i18n: file customtemplates_base.ui line 169
+#: rc.cpp:197 templateparser.cpp:417
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "收件人："
+
+#. i18n: file customtemplates_base.ui line 177
+#: rc.cpp:200 templateparser.cpp:421
+#, fuzzy, no-c-format
+msgid "CC:"
+msgstr "抄送："
+
+#. i18n: file customtemplates_base.ui line 234
+#: rc.cpp:203
 #, no-c-format
 msgid "Universal"
 msgstr "通用"
 
-#. i18n: file customtemplates_base.ui line 185
-#: rc.cpp:197
+#. i18n: file customtemplates_base.ui line 239
+#: rc.cpp:206
 #, no-c-format
 msgid "Reply"
 msgstr "回复"
 
-#. i18n: file customtemplates_base.ui line 190
-#: rc.cpp:200
+#. i18n: file customtemplates_base.ui line 244
+#: rc.cpp:209
 #, no-c-format
 msgid "Reply to All"
 msgstr "全部回复"
 
-#. i18n: file customtemplates_base.ui line 195
-#: rc.cpp:203
+#. i18n: file customtemplates_base.ui line 249
+#: rc.cpp:212
 #, no-c-format
 msgid "Forward"
 msgstr "转发"
 
-#. i18n: file customtemplates_base.ui line 207
-#: rc.cpp:206
+#. i18n: file customtemplates_base.ui line 261
+#: rc.cpp:215
 #, no-c-format
 msgid "Shortc&ut:"
 msgstr "快捷键(&U)："
 
-#. i18n: file customtemplates_base.ui line 229
-#: rc.cpp:209
+#. i18n: file customtemplates_base.ui line 283
+#: rc.cpp:218
 #, no-c-format
 msgid "&Template type:"
 msgstr "模板类型(&T)："
 
-#. i18n: file customtemplates_base.ui line 256
-#: rc.cpp:215 rc.cpp:456
-#, no-c-format
-msgid "How does this work?"
-msgstr "工作方式"
-
 #. i18n: file folderpropertiesdialog.ui line 16
-#: rc.cpp:218
+#: rc.cpp:224
 #, no-c-format
 msgid "Folder Properties"
 msgstr "文件夹属性"
 
 #. i18n: file folderpropertiesdialog.ui line 63
-#: rc.cpp:227
+#: rc.cpp:233
 #, no-c-format
 msgid "Folder holds a &mailing list"
 msgstr "文件夹存放邮件列表(&M)"
 
 #. i18n: file folderpropertiesdialog.ui line 91
-#: rc.cpp:230
+#: rc.cpp:236
 #, no-c-format
 msgid "List &address:"
 msgstr "列表地址(&A)："
 
 #. i18n: file folderpropertiesdialog.ui line 122
-#: rc.cpp:233
+#: rc.cpp:239
 #, no-c-format
 msgid "N&ormal:"
 msgstr "普通(&O)："
 
 #. i18n: file folderpropertiesdialog.ui line 215
-#: rc.cpp:236
+#: rc.cpp:242
 #, no-c-format
 msgid "Unr&ead:"
 msgstr "未读(&E)："
 
 #. i18n: file folderpropertiesdialog.ui line 269
-#: rc.cpp:242
+#: rc.cpp:248
 #, no-c-format
 msgid "Message Expiring"
 msgstr "信件过期"
 
 #. i18n: file folderpropertiesdialog.ui line 283
-#: rc.cpp:245
+#: rc.cpp:251
 #, no-c-format
 msgid "E&xpire after:"
 msgstr "过期时间(&X)："
 
 #. i18n: file folderpropertiesdialog.ui line 311
-#: rc.cpp:248
+#: rc.cpp:254
 #, no-c-format
 msgid "Expire &read messages"
 msgstr "将已读的信件设成过期(&R)"
 
 #. i18n: file folderpropertiesdialog.ui line 339
-#: rc.cpp:251
+#: rc.cpp:257
 #, no-c-format
 msgid "Expire a&fter:"
 msgstr "过期时间(&F)："
 
 #. i18n: file folderpropertiesdialog.ui line 350
-#: rc.cpp:254
+#: rc.cpp:260
 #, no-c-format
 msgid "Expire &unread messages"
 msgstr "将未读的信件设成过期(&U)"
 
 #. i18n: file folderpropertiesdialog.ui line 384
-#: rc.cpp:257 rc.cpp:266
+#: rc.cpp:263 rc.cpp:272
 #, no-c-format
 msgid "Day(s)"
 msgstr "天"
 
 #. i18n: file folderpropertiesdialog.ui line 389
-#: rc.cpp:260 rc.cpp:269
+#: rc.cpp:266 rc.cpp:275
 #, no-c-format
 msgid "Week(s)"
 msgstr "周"
 
 #. i18n: file folderpropertiesdialog.ui line 394
-#: rc.cpp:263 rc.cpp:272
+#: rc.cpp:269 rc.cpp:278
 #, no-c-format
 msgid "Month(s)"
 msgstr "月"
 
 #. i18n: file folderpropertiesdialog.ui line 451
-#: rc.cpp:275
+#: rc.cpp:281
 #, no-c-format
 msgid "Advanced"
 msgstr "高级"
 
 #. i18n: file folderpropertiesdialog.ui line 462
-#: rc.cpp:278
+#: rc.cpp:284
 #, no-c-format
 msgid "Sender identit&y:"
 msgstr "发送者身份(&Y)："
 
 #. i18n: file folderpropertiesdialog.ui line 483
-#: rc.cpp:281
+#: rc.cpp:287
 #, no-c-format
 msgid "&Storage format:"
 msgstr "存储格式(&S)："
 
 #. i18n: file folderpropertiesdialog.ui line 494
-#: rc.cpp:284
+#: rc.cpp:290
 #, no-c-format
 msgid "&List displays:"
 msgstr "列表显示(&L)："
 
 #. i18n: file smimeconfiguration.ui line 24
-#: rc.cpp:293
+#: rc.cpp:299
 #, no-c-format
 msgid "Validate certificates using CRLs"
 msgstr "使用 CRL 验证证书"
 
 #. i18n: file smimeconfiguration.ui line 30
-#: rc.cpp:296
+#: rc.cpp:302
 #, no-c-format
 msgid ""
 "If this option is selected, S/MIME certificates are validated using Certificate "
@@ -10412,13 +11393,13 @@ msgid ""
 msgstr "如果选中此项，程序会用证书吊销列表(CRL)校验 S/MIME 证书。"
 
 #. i18n: file smimeconfiguration.ui line 38
-#: rc.cpp:299
+#: rc.cpp:305
 #, no-c-format
 msgid "Validate certificates online (OCSP)"
 msgstr "在线验证证书(OCSP)"
 
 #. i18n: file smimeconfiguration.ui line 41
-#: rc.cpp:302
+#: rc.cpp:308
 #, no-c-format
 msgid ""
 "If this option is selected, S/MIME certificates are validated online using the "
@@ -10427,19 +11408,19 @@ msgid ""
 msgstr "如果选中此项，程序会用在线证书状态协议(OCSP)校验 S/MIME 证书。请在下面填入 OCSP 响应者 URL。"
 
 #. i18n: file smimeconfiguration.ui line 49
-#: rc.cpp:305
+#: rc.cpp:311
 #, no-c-format
 msgid "Online Certificate Validation"
 msgstr "在线证书校验"
 
 #. i18n: file smimeconfiguration.ui line 68
-#: rc.cpp:308
+#: rc.cpp:314
 #, no-c-format
 msgid "OCSP responder URL:"
 msgstr "OCSP 响应者 URL："
 
 #. i18n: file smimeconfiguration.ui line 76
-#: rc.cpp:311
+#: rc.cpp:317
 #, no-c-format
 msgid ""
 "Enter here the address of the server for online validation of certificates "
@@ -10447,25 +11428,25 @@ msgid ""
 msgstr "在此输入在线证书校验(OCSP 响应者)服务器的地址。此 URL 通常以 http:// 开头。"
 
 #. i18n: file smimeconfiguration.ui line 94
-#: rc.cpp:314
+#: rc.cpp:320
 #, no-c-format
 msgid "OCSP responder signature:"
 msgstr "OCSP 回应签名："
 
 #. i18n: file smimeconfiguration.ui line 126
-#: rc.cpp:317
+#: rc.cpp:323
 #, no-c-format
 msgid "Ignore service URL of certificates"
 msgstr "忽略证书的服务 URL"
 
 #. i18n: file smimeconfiguration.ui line 136
-#: rc.cpp:320
+#: rc.cpp:326
 #, no-c-format
 msgid "Do not check certificate policies"
 msgstr "不检查证书策略"
 
 #. i18n: file smimeconfiguration.ui line 139
-#: rc.cpp:323
+#: rc.cpp:329
 #, no-c-format
 msgid ""
 "By default GnuPG uses the file ~/.gnupg/policies.txt to check if a certificate "
@@ -10473,13 +11454,13 @@ msgid ""
 msgstr "GnuPG 默认使用 ~/.gnupg/policies.txt 文件来检查特定证书策略是否被允许。如果选中此项，将不会检查策略。"
 
 #. i18n: file smimeconfiguration.ui line 147
-#: rc.cpp:326
+#: rc.cpp:332
 #, no-c-format
 msgid "Never consult a CRL"
 msgstr "从不检查 CRL"
 
 #. i18n: file smimeconfiguration.ui line 150
-#: rc.cpp:329
+#: rc.cpp:335
 #, no-c-format
 msgid ""
 "If this option is checked, Certificate Revocation Lists are never used to "
@@ -10487,13 +11468,13 @@ msgid ""
 msgstr "如果选中此项，将永不使用证书吊销列表校验 S/MIME 证书。"
 
 #. i18n: file smimeconfiguration.ui line 158
-#: rc.cpp:332
+#: rc.cpp:338
 #, no-c-format
 msgid "Fetch missing issuer certificates"
 msgstr "获取缺少的发行者证书"
 
 #. i18n: file smimeconfiguration.ui line 161
-#: rc.cpp:335
+#: rc.cpp:341
 #, no-c-format
 msgid ""
 "If this option is checked, missing issuer certificates are fetched when "
@@ -10501,37 +11482,37 @@ msgid ""
 msgstr "如果选中此项。程序会在需要时自动获取缺失的发行者证书(对 CRL 和 OCSP 两种校验方式都有效)。"
 
 #. i18n: file smimeconfiguration.ui line 169
-#: rc.cpp:338
+#: rc.cpp:344
 #, no-c-format
 msgid "HTTP Requests"
 msgstr "HTTP 请求"
 
 #. i18n: file smimeconfiguration.ui line 180
-#: rc.cpp:341
+#: rc.cpp:347
 #, no-c-format
 msgid "Do not perform any HTTP requests"
 msgstr "不执行任何 HTTP 请求"
 
 #. i18n: file smimeconfiguration.ui line 183
-#: rc.cpp:344
+#: rc.cpp:350
 #, no-c-format
 msgid "Entirely disables the use of HTTP for S/MIME."
 msgstr "完全禁止为 S/MIME 使用 HTTP。"
 
 #. i18n: file smimeconfiguration.ui line 224
-#: rc.cpp:350
+#: rc.cpp:356
 #, no-c-format
 msgid "Use this proxy for HTTP requests: "
 msgstr "HTTP 请求使用此代理："
 
 #. i18n: file smimeconfiguration.ui line 232
-#: rc.cpp:353
+#: rc.cpp:359
 #, no-c-format
 msgid "Use system HTTP proxy:"
 msgstr "使用系统 HTTP 代理："
 
 #. i18n: file smimeconfiguration.ui line 235
-#: rc.cpp:356
+#: rc.cpp:362
 #, no-c-format
 msgid ""
 "If this option is selected, the value of the HTTP proxy shown on the right "
@@ -10540,7 +11521,7 @@ msgid ""
 msgstr "如果选中此项，右侧显示的 HTTP 代理设定(来自 http_proxy 环境变量)将被用于任何 HTTP 请求。"
 
 #. i18n: file smimeconfiguration.ui line 243
-#: rc.cpp:359
+#: rc.cpp:365
 #, no-c-format
 msgid ""
 "Enter here the location of your HTTP Proxy, which will be used for all HTTP "
@@ -10551,13 +11532,13 @@ msgstr ""
 "myproxy.nowhere.com:3128。"
 
 #. i18n: file smimeconfiguration.ui line 253
-#: rc.cpp:362
+#: rc.cpp:368
 #, no-c-format
 msgid "Ignore HTTP CRL distribution point of certificates"
 msgstr "忽略证书的 HTTP CRL 发布点"
 
 #. i18n: file smimeconfiguration.ui line 256
-#: rc.cpp:365
+#: rc.cpp:371
 #, no-c-format
 msgid ""
 "When looking for the location of a CRL, the to-be-tested certificate usually "
@@ -10570,31 +11551,31 @@ msgstr ""
 "条目会被使用。如果启用此项，在查询时将忽略所有使用 HTTP 访问方式的条目。"
 
 #. i18n: file smimeconfiguration.ui line 268
-#: rc.cpp:368
+#: rc.cpp:374
 #, no-c-format
 msgid "LDAP Requests"
 msgstr "LDAP 请求"
 
 #. i18n: file smimeconfiguration.ui line 279
-#: rc.cpp:371
+#: rc.cpp:377
 #, no-c-format
 msgid "Do not perform any LDAP requests"
 msgstr "不执行任何 LDAP 请求"
 
 #. i18n: file smimeconfiguration.ui line 282
-#: rc.cpp:374
+#: rc.cpp:380
 #, no-c-format
 msgid "Entirely disables the use of LDAP for S/MIME."
 msgstr "完全禁用 S/MIMe 的 LDAP 用途。"
 
 #. i18n: file smimeconfiguration.ui line 307
-#: rc.cpp:377
+#: rc.cpp:383
 #, no-c-format
 msgid "Ignore LDAP CRL distribution point of certificates"
 msgstr "忽略证书的 LDAP CRL 发布点"
 
 #. i18n: file smimeconfiguration.ui line 310
-#: rc.cpp:380
+#: rc.cpp:386
 #, no-c-format
 msgid ""
 "When looking for the location of a CRL, the to-be-tested certificate usually "
@@ -10607,13 +11588,13 @@ msgstr ""
 "条目会被使用。如果启用此项，在查询时将忽略所有使用 LDAP 访问方式的条目。"
 
 #. i18n: file smimeconfiguration.ui line 326
-#: rc.cpp:383
+#: rc.cpp:389
 #, no-c-format
 msgid "Primary host for LDAP requests:"
 msgstr "LDAP 请求的主要主机："
 
 #. i18n: file smimeconfiguration.ui line 335
-#: rc.cpp:386
+#: rc.cpp:392
 #, no-c-format
 msgid ""
 "Entering a LDAP server here will make all LDAP requests go to that server "
@@ -10629,86 +11610,86 @@ msgstr ""
 "语法为：“主机名”或“主机名:端口”。如果省略端口，则默认采用标准 LDAP 端口 389。"
 
 #. i18n: file snippetdlgbase.ui line 16
-#: rc.cpp:390
+#: rc.cpp:396
 #, no-c-format
 msgid "Add Snippet"
 msgstr "添加片断"
 
 #. i18n: file snippetdlgbase.ui line 52
-#: rc.cpp:393
+#: rc.cpp:399
 #, no-c-format
 msgid "&Add"
 msgstr "添加(&A)"
 
 #. i18n: file snippetdlgbase.ui line 111
-#: rc.cpp:402
+#: rc.cpp:408
 #, no-c-format
 msgid "&Snippet:"
 msgstr "片断(&S)："
 
 #. i18n: file snippetdlgbase.ui line 125
-#: rc.cpp:405
+#: rc.cpp:411
 #, no-c-format
 msgid "Group:"
 msgstr "群组："
 
 #. i18n: file snippetsettingsbase.ui line 16
-#: rc.cpp:408
+#: rc.cpp:414
 #, no-c-format
 msgid "Snippet Settings"
 msgstr "片断设置"
 
 #. i18n: file snippetsettingsbase.ui line 27
-#: rc.cpp:411
+#: rc.cpp:417
 #, no-c-format
 msgid "Tooltips"
 msgstr "工具提示"
 
 #. i18n: file snippetsettingsbase.ui line 38
-#: rc.cpp:414
+#: rc.cpp:420
 #, no-c-format
 msgid "Show snippet's text in &tooltip"
 msgstr "在工具提示中显示片断文字(&T)"
 
 #. i18n: file snippetsettingsbase.ui line 44
-#: rc.cpp:417
+#: rc.cpp:423
 #, no-c-format
 msgid ""
 "Decides if a tooltip should be shown containing text from the bookmarked line"
 msgstr "决定在工具提示中是否显示来自书签行的文字"
 
 #. i18n: file snippetsettingsbase.ui line 71
-#: rc.cpp:420
+#: rc.cpp:426
 #, no-c-format
 msgid "Variables"
 msgstr "变量"
 
 #. i18n: file snippetsettingsbase.ui line 82
-#: rc.cpp:423
+#: rc.cpp:429
 #, no-c-format
 msgid "Input Method for Variables"
 msgstr "输入法变量"
 
 #. i18n: file snippetsettingsbase.ui line 93
-#: rc.cpp:426
+#: rc.cpp:432
 #, no-c-format
 msgid "Single dialog for each variable within a snippet"
 msgstr "为每个片断内的变量显示单独对话框"
 
 #. i18n: file snippetsettingsbase.ui line 102
-#: rc.cpp:429
+#: rc.cpp:435
 #, no-c-format
 msgid "An input dialog will be displayed for every variable within a snippet"
 msgstr "将为每个片断内的变量显示单独的输入对话框"
 
 #. i18n: file snippetsettingsbase.ui line 110
-#: rc.cpp:432
+#: rc.cpp:438
 #, no-c-format
 msgid "One dialog for all variables within a snippet"
 msgstr "为所有片断内的变量显示一个对话框"
 
 #. i18n: file snippetsettingsbase.ui line 119
-#: rc.cpp:435
+#: rc.cpp:441
 #, no-c-format
 msgid ""
 "A single dialog will be displayed where you can enter the values for all "
@@ -10716,49 +11697,49 @@ msgid ""
 msgstr "当您为所有片断内的变量输入值时只显示一个对话框"
 
 #. i18n: file snippetsettingsbase.ui line 137
-#: rc.cpp:438
+#: rc.cpp:444
 #, no-c-format
 msgid "Delimiter:"
 msgstr "定界符："
 
 #. i18n: file templatesconfiguration_base.ui line 30
-#: rc.cpp:441
+#: rc.cpp:447
 #, no-c-format
 msgid "TemplatesConfiguration"
 msgstr "模板配置"
 
 #. i18n: file templatesconfiguration_base.ui line 129
-#: rc.cpp:447
+#: rc.cpp:453
 #, no-c-format
 msgid "Reply to Sender"
 msgstr "回复给发件人"
 
 #. i18n: file templatesconfiguration_base.ui line 172
-#: rc.cpp:450
+#: rc.cpp:456
 #, no-c-format
 msgid "Reply to All / Reply to List"
 msgstr "回复所有人/回复到列表"
 
 #. i18n: file templatesconfiguration_base.ui line 215
-#: rc.cpp:453
+#: rc.cpp:459
 #, no-c-format
 msgid "Forward Message"
 msgstr "转发的信件"
 
 #. i18n: file warningconfiguration.ui line 24
-#: rc.cpp:462
+#: rc.cpp:468
 #, no-c-format
 msgid "Warn when trying to send &unsigned messages"
 msgstr "试图发送未签名信件时警告(&U)"
 
 #. i18n: file warningconfiguration.ui line 30
-#: rc.cpp:465
+#: rc.cpp:471
 #, no-c-format
 msgid "Check to be warned when sending unsigned messages."
 msgstr "选中此选项会在发送未签名信件时得到警告。"
 
 #. i18n: file warningconfiguration.ui line 38
-#: rc.cpp:468
+#: rc.cpp:474
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -10777,19 +11758,19 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 46
-#: rc.cpp:476
+#: rc.cpp:482
 #, no-c-format
 msgid "&Warn when trying to send unencrypted messages"
 msgstr "试图发送未加密信件时警告(&W)"
 
 #. i18n: file warningconfiguration.ui line 52
-#: rc.cpp:479
+#: rc.cpp:485
 #, no-c-format
 msgid "Check to be warned when sending unencrypted messages."
 msgstr "选中此选项会在发送未加密信件时得到警告。"
 
 #. i18n: file warningconfiguration.ui line 60
-#: rc.cpp:482
+#: rc.cpp:488
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -10808,19 +11789,19 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 68
-#: rc.cpp:490
+#: rc.cpp:496
 #, no-c-format
 msgid "Warn if &Receiver's Email Address is Not in Certificate"
 msgstr "若收件人的电子邮件地址不在证书中则警告(&R)"
 
 #. i18n: file warningconfiguration.ui line 74
-#: rc.cpp:493
+#: rc.cpp:499
 #, no-c-format
 msgid "Check to be warned if the address is not in the certificate"
 msgstr "选中此选项会在地址不在证书中时得到警告"
 
 #. i18n: file warningconfiguration.ui line 82
-#: rc.cpp:496
+#: rc.cpp:502
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -10839,38 +11820,38 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 90
-#: rc.cpp:504
+#: rc.cpp:510
 #, no-c-format
 msgid "Warn if certificates/keys expire soon (configure thresholds below)"
 msgstr "如果证书/密钥即将过期则警告(配置下面的阀值)"
 
 #. i18n: file warningconfiguration.ui line 104
-#: rc.cpp:507
+#: rc.cpp:513
 #, no-c-format
 msgid "For signing"
 msgstr "对签名"
 
 #. i18n: file warningconfiguration.ui line 115
-#: rc.cpp:510
+#: rc.cpp:516
 #, no-c-format
 msgid "For encryption"
 msgstr "对加密"
 
 #. i18n: file warningconfiguration.ui line 126
-#: rc.cpp:513 rc.cpp:527 rc.cpp:541 rc.cpp:555 rc.cpp:569 rc.cpp:583
+#: rc.cpp:519 rc.cpp:533 rc.cpp:547 rc.cpp:561 rc.cpp:575 rc.cpp:589
 #: rulewidgethandlermanager.cpp:1437
 #, no-c-format
 msgid " days"
 msgstr " 天"
 
 #. i18n: file warningconfiguration.ui line 138
-#: rc.cpp:516 rc.cpp:530 rc.cpp:544 rc.cpp:558 rc.cpp:572 rc.cpp:586
+#: rc.cpp:522 rc.cpp:536 rc.cpp:550 rc.cpp:564 rc.cpp:578 rc.cpp:592
 #, no-c-format
 msgid "Select the number of days here"
 msgstr "在这里选择天数"
 
 #. i18n: file warningconfiguration.ui line 146
-#: rc.cpp:519
+#: rc.cpp:525
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -10889,7 +11870,7 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 174
-#: rc.cpp:533
+#: rc.cpp:539
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -10908,7 +11889,7 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 202
-#: rc.cpp:547
+#: rc.cpp:553
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -10927,7 +11908,7 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 230
-#: rc.cpp:561
+#: rc.cpp:567
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -10946,7 +11927,7 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 258
-#: rc.cpp:575 rc.cpp:589
+#: rc.cpp:581 rc.cpp:595
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -10965,55 +11946,55 @@ msgstr ""
 "</qt>"
 
 #. i18n: file warningconfiguration.ui line 294
-#: rc.cpp:597
+#: rc.cpp:603
 #, no-c-format
 msgid "For root certificates:"
 msgstr "对根证书："
 
 #. i18n: file warningconfiguration.ui line 305
-#: rc.cpp:600
+#: rc.cpp:606
 #, no-c-format
 msgid "For intermediate CA certificates:"
 msgstr "对中介 CA 证书："
 
 #. i18n: file warningconfiguration.ui line 316
-#: rc.cpp:603
+#: rc.cpp:609
 #, no-c-format
 msgid "For end-user certificates/keys:"
 msgstr "对最终用户证书/密钥："
 
 #. i18n: file warningconfiguration.ui line 388
-#: rc.cpp:606
+#: rc.cpp:612
 #, no-c-format
 msgid "Re-enable All \"Don't Ask Again\" Warnings"
 msgstr "重新启用全部“不再询问”警告"
 
 #. i18n: file customtemplates_kfg.kcfg line 12
-#: rc.cpp:609
+#: rc.cpp:615
 #, no-c-format
 msgid "Template content"
 msgstr "模板内容"
 
 #. i18n: file customtemplates_kfg.kcfg line 17
-#: rc.cpp:612
+#: rc.cpp:618
 #, no-c-format
 msgid "Template shortcut"
 msgstr "模板快捷键"
 
 #. i18n: file customtemplates_kfg.kcfg line 22
-#: rc.cpp:615
+#: rc.cpp:621
 #, no-c-format
 msgid "Template type"
 msgstr "模板类型"
 
-#. i18n: file kmail.kcfg line 59
-#: rc.cpp:618
+#. i18n: file kmail.kcfg line 61
+#: rc.cpp:624
 #, no-c-format
 msgid "Send queued mail on mail check"
 msgstr "检查邮件时发送队列中的邮件"
 
-#. i18n: file kmail.kcfg line 60
-#: rc.cpp:621
+#. i18n: file kmail.kcfg line 62
+#: rc.cpp:627
 #, no-c-format
 msgid ""
 "<qt>"
@@ -11022,16 +12003,16 @@ msgid ""
 "automatically at all. </p></qt>"
 msgstr "<qt><p>如果您不希望 KMail 自动寄出发件箱中的信件，或是在检查邮件时才自动寄出，请选择此项。</p></qt>"
 
-#. i18n: file kmail.kcfg line 70
-#: rc.cpp:624
+#. i18n: file kmail.kcfg line 72
+#: rc.cpp:630
 #, no-c-format
 msgid ""
 "Automatically move non-synced mails from folders with insufficient access "
 "rights"
 msgstr "自动从权限不足的文件夹中移出未同步的邮件"
 
-#. i18n: file kmail.kcfg line 71
-#: rc.cpp:627
+#. i18n: file kmail.kcfg line 73
+#: rc.cpp:633
 #, no-c-format
 msgid ""
 "If there are new messages in a folder, which have not been uploaded to the "
@@ -11040,14 +12021,14 @@ msgid ""
 "folder."
 msgstr "如果在文件夹中中有尚未上传到服务器的新信件，但是您没有上传这些信件至文件夹的足够权限。这些信件将被自动移动到待认领文件夹。"
 
-#. i18n: file kmail.kcfg line 76
-#: rc.cpp:630
+#. i18n: file kmail.kcfg line 78
+#: rc.cpp:636
 #, no-c-format
 msgid "Allow local flags in read-only folders"
 msgstr "允许在只读文件夹上设置本地标记"
 
-#. i18n: file kmail.kcfg line 85
-#: rc.cpp:633
+#. i18n: file kmail.kcfg line 87
+#: rc.cpp:639
 #, no-c-format
 msgid ""
 "This setting allows administrators to set a minimum delay between two mail "
@@ -11058,42 +12039,42 @@ msgstr ""
 "这里允许管理员设定两次邮件检查间的最小延时。\n"
 "普通用户无法选择比此设定更小的值。"
 
-#. i18n: file kmail.kcfg line 91
-#: rc.cpp:637
+#. i18n: file kmail.kcfg line 93
+#: rc.cpp:643
 #, no-c-format
 msgid "The most recently selected folder in the folder selection dialog."
 msgstr "文件夹选择对话框中最近选择的文件夹。"
 
-#. i18n: file kmail.kcfg line 99
-#: rc.cpp:640
+#. i18n: file kmail.kcfg line 101
+#: rc.cpp:646
 #, no-c-format
 msgid ""
 "Disregard the users umask setting and use \"read-write for the user only\" "
 "instead"
 msgstr "忽略用户的 umask 设定，改为“仅对用户可读写”设定。"
 
-#. i18n: file kmail.kcfg line 107
-#: rc.cpp:646
+#. i18n: file kmail.kcfg line 109
+#: rc.cpp:652
 #, no-c-format
 msgid "Policy for showing the system tray icon"
 msgstr "系统托盘图标显示策略"
 
-#. i18n: file kmail.kcfg line 115
-#: rc.cpp:649
+#. i18n: file kmail.kcfg line 117
+#: rc.cpp:655
 #, no-c-format
 msgid ""
 "Close the application when the mainwindow is closed, even if there is a system "
 "tray icon active."
 msgstr "即使系统托盘图标已激活，在关闭主窗口时也同时关闭程序。"
 
-#. i18n: file kmail.kcfg line 119
-#: rc.cpp:652
+#. i18n: file kmail.kcfg line 121
+#: rc.cpp:658
 #, no-c-format
 msgid "Verbose new mail notification"
 msgstr "详细的新邮件通知"
 
-#. i18n: file kmail.kcfg line 120
-#: rc.cpp:655
+#. i18n: file kmail.kcfg line 122
+#: rc.cpp:661
 #, no-c-format
 msgid ""
 "If this option is enabled then for each folder the number of newly arrived "
@@ -11101,40 +12082,40 @@ msgid ""
 "simple 'New mail arrived' message."
 msgstr "如果选中此项，每个文件夹都会在新信件到达时显示新邮件通知。反之，您只会获得一个简单的“新邮件到达”消息。"
 
-#. i18n: file kmail.kcfg line 124
-#: rc.cpp:658
+#. i18n: file kmail.kcfg line 126
+#: rc.cpp:664
 #, no-c-format
 msgid "Specify e&ditor:"
 msgstr "指定编辑器(&D)："
 
-#. i18n: file kmail.kcfg line 128
-#: rc.cpp:661
+#. i18n: file kmail.kcfg line 130
+#: rc.cpp:667
 #, no-c-format
 msgid "Use e&xternal editor instead of composer"
 msgstr "使用外部编辑器(&X)"
 
-#. i18n: file kmail.kcfg line 155
-#: rc.cpp:664
+#. i18n: file kmail.kcfg line 157
+#: rc.cpp:670
 #, no-c-format
 msgid ""
 "The threshold for when to warn the user that a folder is nearing its quota "
 "limit."
 msgstr "决定何时警告用户文件夹配额即将超出限度的阈值。"
 
-#. i18n: file kmail.kcfg line 164
-#: rc.cpp:667
+#. i18n: file kmail.kcfg line 166
+#: rc.cpp:673
 #, no-c-format
 msgid "Enable groupware functionality"
 msgstr "启用群件功能"
 
-#. i18n: file kmail.kcfg line 170
-#: rc.cpp:670
+#. i18n: file kmail.kcfg line 172
+#: rc.cpp:676
 #, no-c-format
 msgid "Mangle From:/To: headers in replies to replies"
 msgstr "在回复邀请时改动信头中的发件人/收件人"
 
-#. i18n: file kmail.kcfg line 171
-#: rc.cpp:673
+#. i18n: file kmail.kcfg line 173
+#: rc.cpp:679
 #, no-c-format
 msgid ""
 "Microsoft Outlook has a number of shortcomings in its implementation of the "
@@ -11144,14 +12125,14 @@ msgstr ""
 "Microsoft Outlook 在实现 iCanlendar 标准时有很多缺点；此选项用来解决这个问题。如果 Outlook "
 "用户无法获得您的回复，请试着开启此选项。"
 
-#. i18n: file kmail.kcfg line 176
-#: rc.cpp:676
+#. i18n: file kmail.kcfg line 178
+#: rc.cpp:682
 #, no-c-format
 msgid "Send groupware invitations in the mail body"
 msgstr "在邮件体中发送群件邀请"
 
-#. i18n: file kmail.kcfg line 177
-#: rc.cpp:679
+#. i18n: file kmail.kcfg line 179
+#: rc.cpp:685
 #, no-c-format
 msgid ""
 "Microsoft Outlook has a number of shortcomings  in its implementation of the "
@@ -11162,16 +12143,36 @@ msgstr ""
 "Microsoft Outlook 在实现 iCanlendar 标准时有很多缺点；此选项用来解决这个问题。如果 Outlook "
 "用户无法获得您的邀请，请试着开启此选项。"
 
-#. i18n: file kmail.kcfg line 182
-#: rc.cpp:682
+#. i18n: file kmail.kcfg line 184
+#: rc.cpp:688
 #, no-c-format
 msgid "Exchange compatible invitations naming"
 msgstr "Exchange 兼容的邀请命名形式"
 
-#. i18n: file kmail.kcfg line 189
+#. i18n: file kmail.kcfg line 185
 #: rc.cpp:691
 #, no-c-format
 msgid ""
+"Microsoft Outlook, when used in combination with a Microsoft Exchange server, "
+"has a problem understanding standards-compliant groupware e-mail. Turn this "
+"option on to send groupware invitations in a way that Microsoft Exchange "
+"understands."
+msgstr ""
+"在 Microsoft Exchange 服务器和 Microsoft Outlook 协作时，处理标准兼容的群件邮件会有问题。如果您要以 Microsoft "
+"Exchange 可识别的形式发送群件邀请，请启用此选项。"
+
+#. i18n: file kmail.kcfg line 191
+#: rc.cpp:697
+#, no-c-format
+msgid ""
+"When replying to invitations, send the reply comment in way that Microsoft "
+"Outlook understands."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 197
+#: rc.cpp:703
+#, no-c-format
+msgid ""
 "When this is checked, you will not see the mail composer window. Instead, all "
 "invitation mails are sent automatically. If you want to see the mail before "
 "sending it, you can uncheck this option. However, be aware that the text in the "
@@ -11181,22 +12182,38 @@ msgstr ""
 "当此项被选中时，您将看不到邮件撰写器窗口。作为替代所有邀请信件都会被自动发送。如果您想先查看要发送的邮件，可以取消此选项。然而，注意撰写器窗口中的文本采用了 "
 "iCalendar 语法，您最好不要尝试手动修改它。"
 
-#. i18n: file kmail.kcfg line 205
-#: rc.cpp:694
+#. i18n: file kmail.kcfg line 213
+#: rc.cpp:706
 #, no-c-format
 msgid "Delete invitation emails after the reply to them has been sent"
 msgstr "在寄出回复信件后删除邀请函"
 
-#. i18n: file kmail.kcfg line 206
-#: rc.cpp:697
+#. i18n: file kmail.kcfg line 214
+#: rc.cpp:709
 #, no-c-format
 msgid ""
 "When this is checked, received invitation emails that have been replied to will "
 "be moved to the Trash folder, once the reply has been successfully sent."
 msgstr "如果选中此项，已回复过的邀请函将被移动到废件箱。"
 
-#. i18n: file kmail.kcfg line 215
-#: rc.cpp:700
+#. i18n: file kmail.kcfg line 219
+#: rc.cpp:712
+#, no-c-format
+msgid ""
+"When encountering a Toltec scheduling message, display a custom replacement "
+"text for it."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 224
+#: rc.cpp:715
+#, no-c-format
+msgid ""
+"The text that will be displayed as a replacement when encountering Toltec "
+"scheduling messages."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 233
+#: rc.cpp:718
 #, no-c-format
 msgid ""
 "<p>Enabling this makes it possible to store the entries from the Kontact "
@@ -11207,16 +12224,16 @@ msgstr ""
 "<p>启用此项可让存储来自 Kontact 应用程序(KOrganizer、KAddressBook 和 KNotes)的数据项成为可能。</p>"
 "<p>如果您要设定此项，必须先将程序设为使用 IMAP 资源，在 TDE 控制中心里可以完成这些操作。</p>"
 
-#. i18n: file kmail.kcfg line 220
-#: rc.cpp:703
+#. i18n: file kmail.kcfg line 238
+#: rc.cpp:721
 #, no-c-format
 msgid ""
 "<p>Usually you will not have any reason to see the folders that hold the IMAP "
 "resources. But if you need to see them, you can set that here.</p>"
 msgstr "<p>通常您没有必要查看正在占有 IMAP 资源的文件夹。但若您需要，可在此设定。</p>"
 
-#. i18n: file kmail.kcfg line 229
-#: rc.cpp:706
+#. i18n: file kmail.kcfg line 247
+#: rc.cpp:724
 #, no-c-format
 msgid ""
 "<p>If the account used for storing groupware information \"\n"
@@ -11230,8 +12247,8 @@ msgstr ""
 "可设定此项使 KMail 只显示群件文件夹。如果您通过另外的\n"
 "在线 IMAP 账户管理常规邮件，此功能会比较有用。</p>"
 
-#. i18n: file kmail.kcfg line 233
-#: rc.cpp:712
+#. i18n: file kmail.kcfg line 251
+#: rc.cpp:730
 #, no-c-format
 msgid ""
 "<p>Choose the storage format of the groupware folders. "
@@ -11249,22 +12266,22 @@ msgstr ""
 "<li>Kolab XML 格式使用自定义的存储模型，形式上更加接近于 Outlook。在采用 Kolab 服务器或其它兼容的解决方案时，此格式可提供更佳的 "
 "Outlook 兼容性。</li></ul></p>"
 
-#. i18n: file kmail.kcfg line 242
-#: rc.cpp:715
+#. i18n: file kmail.kcfg line 260
+#: rc.cpp:733
 #, no-c-format
 msgid ""
 "<p>This chooses the parent of the IMAP resource folders.</p>"
 "<p>By default, the Kolab server sets the IMAP inbox to be the parent.</p>"
 msgstr "<p>在此选择父级 IMAP 资源文件夹。</p><p>默认时，Kolabs 服务器会将 IMAP 收件箱设为父级文件夹。</p>"
 
-#. i18n: file kmail.kcfg line 247
-#: rc.cpp:718
+#. i18n: file kmail.kcfg line 265
+#: rc.cpp:736
 #, no-c-format
 msgid "<p>This is the ID of the account holding the IMAP resource folders.</p>"
 msgstr "<p>这是 IMAP 资源文件夹在接受账户处理时的编号。<p>"
 
-#. i18n: file kmail.kcfg line 252
-#: rc.cpp:721
+#. i18n: file kmail.kcfg line 270
+#: rc.cpp:739
 #, no-c-format
 msgid ""
 "<p>If you want to set the folder names of the IMAP storage to your local "
@@ -11278,101 +12295,89 @@ msgstr ""
 "<p>请注意，这么做的唯一理由是为和 Microsoft Outlook 兼容，基本上我们认为这么做是个馊主意。因为它会使更改语言特性失效。</p>"
 "<p>所以，若非必要请不要设定此项。</p>"
 
-#. i18n: file kmail.kcfg line 258
-#: rc.cpp:724
-#, no-c-format
-msgid "Only filter mails received in disconnected IMAP inbox."
-msgstr "只过滤来自离线 IMAP 收件箱的邮件。"
-
-#. i18n: file kmail.kcfg line 262
-#: rc.cpp:727
+#. i18n: file kmail.kcfg line 276
+#: rc.cpp:742
 #, no-c-format
 msgid "Also filter new mails received in groupware folders."
 msgstr "过滤收取自群件文件夹的新邮件。"
 
-#. i18n: file kmail.kcfg line 267
-#: rc.cpp:730
+#. i18n: file kmail.kcfg line 283
+#: rc.cpp:745
 #, no-c-format
 msgid ""
 "Synchronize groupware changes in DIMAP folders immediately when being online."
 msgstr "在联机时立即同步离线 IMAP 文件夹内发生过的群件更改。"
 
-#. i18n: file kmail.kcfg line 276
-#: rc.cpp:733
+#. i18n: file kmail.kcfg line 292
+#: rc.cpp:748
 #, no-c-format
 msgid ""
 "This value is used to decide whether the KMail Introduction should be "
 "displayed."
 msgstr "此值用于决定是否显示 KMail 介绍界面。"
 
-#. i18n: file kmail.kcfg line 283
-#: rc.cpp:736
+#. i18n: file kmail.kcfg line 299
+#: rc.cpp:751
 #, no-c-format
 msgid "Maximal number of connections per host"
 msgstr "每个主机的最大连接数"
 
-#. i18n: file kmail.kcfg line 284
-#: rc.cpp:739
+#. i18n: file kmail.kcfg line 300
+#: rc.cpp:754
 #, no-c-format
 msgid ""
 "This can be used to restrict the number of connections per host while checking "
 "for new mail. By default the number of connections is unlimited (0)."
 msgstr "此项用于限制检查新邮件时每个主机的最大连接数。默认为无限制(0)。"
 
-#. i18n: file kmail.kcfg line 292
-#: rc.cpp:742
+#. i18n: file kmail.kcfg line 308
+#: rc.cpp:757
 #, no-c-format
 msgid "Show quick search line edit"
 msgstr "显示快速搜索编辑框"
 
-#. i18n: file kmail.kcfg line 293
-#: rc.cpp:745
+#. i18n: file kmail.kcfg line 309
+#: rc.cpp:760
 #, no-c-format
 msgid ""
 "This option enables or disables the search line edit above the message list "
 "which can be used to quickly search the information shown in the message list."
 msgstr "此选项启用或禁用信件列表上方的搜索编辑框，该框用来在信件列表中快速搜索信息。"
 
-#. i18n: file kmail.kcfg line 297
-#: rc.cpp:748
-#, fuzzy, no-c-format
-msgid "Show folder quick search line edit"
-msgstr "显示快速搜索编辑框"
-
-#. i18n: file kmail.kcfg line 301
-#: rc.cpp:751
+#. i18n: file kmail.kcfg line 313
+#: rc.cpp:763
 #, no-c-format
 msgid "Hide local inbox if unused"
 msgstr "不使用时隐藏本地收件箱"
 
-#. i18n: file kmail.kcfg line 309
-#: rc.cpp:754
+#. i18n: file kmail.kcfg line 321
+#: rc.cpp:766
 #, no-c-format
 msgid "Forward Inline As Default."
 msgstr "按默认方式内联转发。"
 
-#. i18n: file kmail.kcfg line 313
-#: rc.cpp:757
+#. i18n: file kmail.kcfg line 325
+#: rc.cpp:769
 #, no-c-format
 msgid ""
 "Allow the semicolon charactor (';') to be used as separator in the message "
 "composer."
 msgstr "允许在信件撰写器中使用分号(“;”)作为分隔符。"
 
-#. i18n: file kmail.kcfg line 316
-#: rc.cpp:760
+#. i18n: file kmail.kcfg line 328
+#: rc.cpp:772
 #, no-c-format
 msgid "Keep original charset when replying or forwarding if possible"
 msgstr "在回复或转发时尽可能保持原有字符集"
 
-#. i18n: file kmail.kcfg line 320
-#: rc.cpp:763
+#. i18n: file kmail.kcfg line 332
+#: rc.cpp:775
 #, no-c-format
 msgid "A&utomatically insert signature"
 msgstr "自动插入签名(&U)"
 
-#. i18n: file kmail.kcfg line 325
-#: rc.cpp:766
+#. i18n: file kmail.kcfg line 337
+#: rc.cpp:778
 #, no-c-format
 msgid ""
 "Remember this identity, so that it will be used in future composer windows as "
@@ -11380,44 +12385,67 @@ msgid ""
 "        "
 msgstr "记住此身份，以后在撰写器窗口中可以用上。"
 
-#. i18n: file kmail.kcfg line 329
-#: rc.cpp:770
+#. i18n: file kmail.kcfg line 341
+#: rc.cpp:782
 #, no-c-format
 msgid ""
 "Remember this folder for sent items, so that it will be used in future composer "
 "windows as well."
 msgstr "记住这个存放已发邮件的文件夹，以后在撰写器窗口中可以用上。"
 
-#. i18n: file kmail.kcfg line 333
-#: rc.cpp:773
+#. i18n: file kmail.kcfg line 345
+#: rc.cpp:785
 #, no-c-format
 msgid ""
 "Remember this mail transport, so that it will be used in future composer "
 "windows as well."
 msgstr "记住这个邮件传送，以后在撰写器窗口中可以用上。"
 
-#. i18n: file kmail.kcfg line 337
-#: rc.cpp:776
+#. i18n: file kmail.kcfg line 350
+#: rc.cpp:788
+#, fuzzy, no-c-format
+msgid ""
+"Remember this dictionary, so that it will be used in future composer windows as "
+"well.\n"
+"        "
+msgstr "记住此身份，以后在撰写器窗口中可以用上。"
+
+#. i18n: file kmail.kcfg line 354
+#: rc.cpp:792
 #, no-c-format
 msgid "Word &wrap at column:"
 msgstr "到此列自动换行(&W)："
 
-#. i18n: file kmail.kcfg line 360
-#: rc.cpp:785
+#. i18n: file kmail.kcfg line 368
+#: rc.cpp:798
+#, fuzzy, no-c-format
+msgid "Warn if the number of recipients is larger than"
+msgstr "若根证书即将过期则警告(&L)："
+
+#. i18n: file kmail.kcfg line 370
+#: rc.cpp:801 rc.cpp:804
+#, no-c-format
+msgid ""
+"If the number of recipients is larger than this value, KMail will warn and ask "
+"for a confirmation before sending the mail. The warning can be turned off."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 390
+#: rc.cpp:810
 #, no-c-format
 msgid ""
 "Turn this option on to make Outlook &#8482; understand attachment names "
 "containing non-English characters"
 msgstr "启用此选项，才能让 Outlook(tm) 理解包含非英语字符的附件名"
 
-#. i18n: file kmail.kcfg line 386
-#: rc.cpp:791
+#. i18n: file kmail.kcfg line 416
+#: rc.cpp:816
 #, no-c-format
 msgid "Automatically request &message disposition notifications"
 msgstr "自动请求信件投递通知(&M)"
 
-#. i18n: file kmail.kcfg line 387
-#: rc.cpp:794
+#. i18n: file kmail.kcfg line 417
+#: rc.cpp:819
 #, no-c-format
 msgid ""
 "<qt>"
@@ -11432,28 +12460,28 @@ msgstr ""
 "<p>此选项只会影响默认值；您仍然可以在每封信的撰写器中启用或禁用 MDN 请求，只需选择菜单项<em>选项</em>->&gt;<em>请求投递通知</em>"
 "。</p></qt>"
 
-#. i18n: file kmail.kcfg line 391
-#: rc.cpp:797
+#. i18n: file kmail.kcfg line 421
+#: rc.cpp:822
 #, no-c-format
 msgid "Use recent addresses for autocompletion"
 msgstr "使用最近的地址进行自动补全"
 
-#. i18n: file kmail.kcfg line 392
-#: rc.cpp:800
+#. i18n: file kmail.kcfg line 422
+#: rc.cpp:825
 #, no-c-format
 msgid ""
 "Disable this option if you do not want recently used addresses to appear in the "
 "autocompletion list in the composer's address fields."
 msgstr "如果您不想最近使用过的地址出现在撰写器地址字段的补全列表中，请禁用此项。"
 
-#. i18n: file kmail.kcfg line 413
-#: rc.cpp:803
+#. i18n: file kmail.kcfg line 443
+#: rc.cpp:828
 #, no-c-format
 msgid "Autosave interval:"
 msgstr "自动保存间隔："
 
-#. i18n: file kmail.kcfg line 414
-#: rc.cpp:806
+#. i18n: file kmail.kcfg line 444
+#: rc.cpp:831
 #, no-c-format
 msgid ""
 "A backup copy of the text in the composer window can be created regularly. The "
@@ -11461,93 +12489,111 @@ msgid ""
 "setting it to the value 0."
 msgstr "KMail 会定时创建撰写器窗口中文本的备份。您可以在此处设置创建备份的间隔。您将此处得值设置为 0 可禁用自动保存。"
 
-#. i18n: file kmail.kcfg line 418
-#: rc.cpp:809
+#. i18n: file kmail.kcfg line 448
+#: rc.cpp:834
 #, no-c-format
 msgid "Insert signatures above quoted text"
 msgstr "在上面以引用文本形式插入签名"
 
-#. i18n: file kmail.kcfg line 425
-#: rc.cpp:812
+#. i18n: file kmail.kcfg line 455
+#: rc.cpp:837
 #, no-c-format
 msgid "Replace recognized prefi&x with \"Re:\""
 msgstr "将识别出的前缀替换为“Re:”(&X)"
 
-#. i18n: file kmail.kcfg line 432
-#: rc.cpp:815
+#. i18n: file kmail.kcfg line 462
+#: rc.cpp:840
 #, no-c-format
 msgid "Replace recognized prefix with \"&Fwd:\""
 msgstr "将识别出的前缀替换为“Fwd:”(&F)"
 
-#. i18n: file kmail.kcfg line 436
-#: rc.cpp:818
+#. i18n: file kmail.kcfg line 466
+#: rc.cpp:843
 #, no-c-format
 msgid "Use smart &quoting"
 msgstr "使用智能引用(&Q)"
 
-#. i18n: file kmail.kcfg line 441
-#: rc.cpp:821
+#. i18n: file kmail.kcfg line 470
+#: rc.cpp:846
+#, fuzzy, no-c-format
+msgid "Remove the signature when replying"
+msgstr "签名已过期。"
+
+#. i18n: file kmail.kcfg line 474
+#: rc.cpp:849
+#, no-c-format
+msgid "Only quote selected text when replying"
+msgstr ""
+
+#. i18n: file kmail.kcfg line 479
+#: rc.cpp:852
 #, no-c-format
 msgid "Type of addressee selector"
 msgstr "收件人选择器类型"
 
-#. i18n: file kmail.kcfg line 443
-#: rc.cpp:824
+#. i18n: file kmail.kcfg line 481
+#: rc.cpp:855
 #, no-c-format
 msgid ""
 "Sets the type of the dialog for selecting recipients for To,\n"
 "        CC and BCC."
 msgstr "设置用于选择收件人、抄送及密送对象的对话框类型。"
 
-#. i18n: file kmail.kcfg line 451
-#: rc.cpp:828
+#. i18n: file kmail.kcfg line 489
+#: rc.cpp:859
 #, no-c-format
 msgid "Type of recipients editor"
 msgstr "收件人编辑器类型"
 
-#. i18n: file kmail.kcfg line 453
-#: rc.cpp:831
+#. i18n: file kmail.kcfg line 491
+#: rc.cpp:862
 #, no-c-format
 msgid ""
 "Sets the type of the recipients editor for editing To,\n"
 "        CC and BCC."
 msgstr "设置用于编辑收件人、抄送及密送对象的编辑器类型。"
 
-#. i18n: file kmail.kcfg line 468
-#: rc.cpp:835
+#. i18n: file kmail.kcfg line 506
+#: rc.cpp:866
 #, no-c-format
 msgid "Maximum number of recipient editor lines."
 msgstr "收件人编辑器的最多行数。"
 
-#. i18n: file kmail.kcfg line 474
-#: rc.cpp:838
+#. i18n: file kmail.kcfg line 512
+#: rc.cpp:869
 #, no-c-format
 msgid ""
 "List of message part types to strip off mails that are being forwarded inline."
 msgstr "信件的部件类型列表，用于过滤内嵌了转发部分的邮件。"
 
-#. i18n: file kmail.kcfg line 478
-#: rc.cpp:841
+#. i18n: file kmail.kcfg line 516
+#: rc.cpp:872
 #, no-c-format
 msgid "The maximum size in MB that email attachments are allowed to have."
 msgstr "允许的最大邮件附件大小(以 MB 计)。"
 
-#. i18n: file kmail.kcfg line 483
-#: rc.cpp:844
+#. i18n: file kmail.kcfg line 521
+#: rc.cpp:875
 #, no-c-format
 msgid "Show the Text Snippet Management and Insertion Panel in the composer."
 msgstr "在撰写器中显示文本片断管理工具和插入面板。"
 
-#. i18n: file kmail.kcfg line 490
-#: rc.cpp:847
+#. i18n: file kmail.kcfg line 528
+#: rc.cpp:878
 #, no-c-format
 msgid ""
 "Show the GnuPG Audit Log even after crypto operations that completed "
 "successfully."
 msgstr "在密文操作成功完成后显示 GnuPG 审核日志。"
 
-#. i18n: file kmail.kcfg line 530
-#: rc.cpp:850
+#. i18n: file kmail.kcfg line 557
+#: rc.cpp:881
+#, fuzzy, no-c-format
+msgid "Close message window after replying or forwarding the message."
+msgstr "在回复或转发时尽可能保持原有字符集"
+
+#. i18n: file kmail.kcfg line 572
+#: rc.cpp:884
 #, no-c-format
 msgid ""
 "Some emails, especially those generated automatically, do not specify the "
@@ -11559,88 +12605,102 @@ msgstr ""
 "有些邮件，尤其是自动生成邮件往往不指定正确显示邮件所必需的字符编码。在这些时候，程序将使用一个回溯字符编码，您可以在这里配置它。请设定一个在您的网络交际圈中最常"
 "用的编码。默认会使用系统全局的配置。"
 
-#. i18n: file kmail.kcfg line 536
-#: rc.cpp:853
+#. i18n: file kmail.kcfg line 578
+#: rc.cpp:887
 #, no-c-format
 msgid ""
 "Changing this from its default 'Auto' will force the use of the specified "
 "encoding for all emails, regardless of what they specify themselves."
 msgstr "更改此项为默认的“自动”以外的设定将强制使用指定编码显示所有邮件，且无视邮件自身的编码描述。"
 
-#. i18n: file kmail.kcfg line 542
-#: rc.cpp:859
+#. i18n: file kmail.kcfg line 584
+#: rc.cpp:893
 #, no-c-format
 msgid ""
 "Enable this if you want smileys like :-) appearing in the message text to be "
 "replaced by emoticons (small pictures)."
 msgstr "如果您想要把邮件文本中类似“:-)”这样的微笑符替换成小尺寸表情图片，请启用此项。"
 
-#. i18n: file kmail.kcfg line 547
-#: rc.cpp:865
+#. i18n: file kmail.kcfg line 589
+#: rc.cpp:899
 #, no-c-format
 msgid ""
 "Enable this option to show different levels of quoted text. Disable to hide the "
 "levels of quoted text."
 msgstr "启用此项可显示出不同级别的引用文本。禁用则会隐藏引用文本的级别。"
 
-#. i18n: file kmail.kcfg line 550
-#: rc.cpp:868
+#. i18n: file kmail.kcfg line 592
+#: rc.cpp:902
 #, no-c-format
 msgid "Automatic collapse level:"
 msgstr "自动折叠级别："
 
-#. i18n: file kmail.kcfg line 558
-#: rc.cpp:871
+#. i18n: file kmail.kcfg line 600
+#: rc.cpp:905
 #, no-c-format
 msgid "Reduce font size for quoted text"
 msgstr "引用的文字以较小字体显示"
 
-#. i18n: file kmail.kcfg line 559
-#: rc.cpp:874
+#. i18n: file kmail.kcfg line 601
+#: rc.cpp:908
 #, no-c-format
 msgid "Enable this option to show quoted text with a smaller font."
 msgstr "启用此选项可以较小字体显示引用的文字。"
 
-#. i18n: file kmail.kcfg line 570
-#: rc.cpp:877
+#. i18n: file kmail.kcfg line 612
+#: rc.cpp:911
+#, fuzzy, no-c-format
+msgid "Show current message sender time"
+msgstr "加密存储已发信件(&P)"
+
+#. i18n: file kmail.kcfg line 613
+#: rc.cpp:914
+#, no-c-format
+msgid ""
+"Enable this if you like to know what time of day are now in sender location "
+"(calculated from sender time zone)."
+msgstr ""
+
+#. i18n: file kmail.kcfg line 618
+#: rc.cpp:917
 #, no-c-format
 msgid "Show user agent in fancy headers"
 msgstr "在亮丽信头中显示用户端代理"
 
-#. i18n: file kmail.kcfg line 571
-#: rc.cpp:880
+#. i18n: file kmail.kcfg line 619
+#: rc.cpp:920
 #, no-c-format
 msgid ""
 "Enable this option to get the User-Agent and X-Mailer header lines displayed "
 "when using fancy headers."
 msgstr "如果您使用亮丽信头，启用此项可以在信头行中显示用户代理和邮件客户端。"
 
-#. i18n: file kmail.kcfg line 576
-#: rc.cpp:883
+#. i18n: file kmail.kcfg line 624
+#: rc.cpp:923
 #, no-c-format
 msgid "Allow to delete attachments of existing mails."
 msgstr "允许删除已有邮件的附件。"
 
-#. i18n: file kmail.kcfg line 580
-#: rc.cpp:886
+#. i18n: file kmail.kcfg line 628
+#: rc.cpp:926
 #, no-c-format
 msgid "Allow to edit attachments of existing mails."
 msgstr "允许编辑已有邮件的附件。"
 
-#. i18n: file kmail.kcfg line 585
-#: rc.cpp:889
+#. i18n: file kmail.kcfg line 633
+#: rc.cpp:929
 #, no-c-format
 msgid "Always decrypt messages when viewing or ask befor decrypting"
 msgstr "在浏览密件前总是先行试图解密。"
 
-#. i18n: file kmail.kcfg line 599
-#: rc.cpp:892
+#. i18n: file kmail.kcfg line 647
+#: rc.cpp:932
 #, no-c-format
 msgid "Send Message Disposition Notifications with an empty sender."
 msgstr "使用空发件人发送信件投递通知。"
 
-#. i18n: file kmail.kcfg line 600
-#: rc.cpp:895
+#. i18n: file kmail.kcfg line 648
+#: rc.cpp:935
 #, no-c-format
 msgid ""
 "Send Message Disposition Notifications with an empty sender string. Some "
@@ -11648,90 +12708,82 @@ msgid ""
 "problems sending MDNs, uncheck this option."
 msgstr "以空发件人字符串发送邮件投递通知。有些服务器会被配置为拒绝发送这类信件，所以如果您在发送 MDN 时遇到问题，请取消此选项。"
 
-#. i18n: file kmail.kcfg line 606
-#: rc.cpp:898
+#. i18n: file kmail.kcfg line 654
+#: rc.cpp:938
 #, no-c-format
 msgid "Phrases has been converted to templates"
 msgstr "词组已转换为模板"
 
-#. i18n: file kmail.kcfg line 607
-#: rc.cpp:901
+#. i18n: file kmail.kcfg line 655
+#: rc.cpp:941
 #, no-c-format
 msgid "Old phrases have been converted to templates"
 msgstr "旧词组已转换为模板"
 
-#. i18n: file kmail.kcfg line 611
-#: rc.cpp:904
+#. i18n: file kmail.kcfg line 659
+#: rc.cpp:944
 #, no-c-format
 msgid "Message template for new message"
 msgstr "新信件模板"
 
-#. i18n: file kmail.kcfg line 616
-#: rc.cpp:907
+#. i18n: file kmail.kcfg line 664
+#: rc.cpp:947
 #, no-c-format
 msgid "Message template for reply"
 msgstr "回复信件模板"
 
-#. i18n: file kmail.kcfg line 621
-#: rc.cpp:910
+#. i18n: file kmail.kcfg line 669
+#: rc.cpp:950
 #, no-c-format
 msgid "Message template for reply to all"
 msgstr "回复全部信件模板"
 
-#. i18n: file kmail.kcfg line 626
-#: rc.cpp:913
+#. i18n: file kmail.kcfg line 674
+#: rc.cpp:953
 #, no-c-format
 msgid "Message template for forward"
 msgstr "转发信件模板"
 
-#. i18n: file kmail.kcfg line 631
-#: rc.cpp:916
+#. i18n: file kmail.kcfg line 679
+#: rc.cpp:956
 #, no-c-format
 msgid "Quote characters"
 msgstr "引用字符"
 
-#. i18n: file kmail.kcfg line 640
-#: rc.cpp:919
+#. i18n: file kmail.kcfg line 688
+#: rc.cpp:959
 #, no-c-format
 msgid "Allow out-of-office settings to to be changeable by the user."
 msgstr "允许用户更改外出回复设置。"
 
-#. i18n: file kmail.kcfg line 644
-#: rc.cpp:922
+#. i18n: file kmail.kcfg line 692
+#: rc.cpp:962
 #, no-c-format
 msgid ""
 "Allow users to upload out-of-office sieve scripts, but disallow them changin "
 "any settings, such as the domain to react to and the spam reaction switch."
 msgstr "允许用户上传外出回复过滤脚本，但不允许更改其中的设定，如对域名的操作和垃圾信过滤规则等。"
 
-#. i18n: file kmail.kcfg line 648
-#: rc.cpp:925
+#. i18n: file kmail.kcfg line 696
+#: rc.cpp:965
 #, no-c-format
 msgid "Send out-of-office replies to mails coming from this domain only."
 msgstr "只对来自此域的邮件发送外出回复。"
 
-#. i18n: file kmail.kcfg line 652
-#: rc.cpp:928
+#. i18n: file kmail.kcfg line 700
+#: rc.cpp:968
 #, no-c-format
 msgid "Allow out-of-office replies to be sent to messages marked as SPAM."
 msgstr "允许对已被标记为垃圾信的来信发送外出回复。"
 
-#. i18n: file kmail.kcfg line 656
-#: rc.cpp:931
+#. i18n: file kmail.kcfg line 704
+#: rc.cpp:971
 #, no-c-format
 msgid ""
 "Check if there is still an active out-of-office reply configured when starting "
 "KMail."
 msgstr "启动 KMail 时检查是否还有激活中的外出回复。"
 
-#: recipientseditor.cpp:100
-msgid "To"
-msgstr "收件人"
-
-#: recipientseditor.cpp:102
-msgid "CC"
-msgstr "抄送"
-
 #: recipientseditor.cpp:104
 msgid "BCC"
 msgstr "密送"
@@ -11744,50 +12796,50 @@ msgstr "<未定义收件人类型>"
 msgid "Select type of recipient"
 msgstr "选择收件人类型"
 
-#: recipientseditor.cpp:181
+#: recipientseditor.cpp:163
+msgid "Set the list of email addresses to receive this message"
+msgstr ""
+
+#: recipientseditor.cpp:183
 msgid "Remove recipient line"
 msgstr "删除收件人行"
 
-#: recipientseditor.cpp:737
+#: recipientseditor.cpp:739
 msgid "<b>To:</b><br/>"
 msgstr "<b>收件人：</b><br/>"
 
-#: recipientseditor.cpp:738
+#: recipientseditor.cpp:740
 msgid "<b>CC:</b><br/>"
 msgstr "<b>抄送：</b><br/>"
 
-#: recipientseditor.cpp:739
+#: recipientseditor.cpp:741
 msgid "<b>BCC:</b><br/>"
 msgstr "<b>密送：</b><br/>"
 
-#: recipientseditor.cpp:766
+#: recipientseditor.cpp:768
 msgid "Save List..."
 msgstr "保存列表..."
 
-#: recipientseditor.cpp:772
+#: recipientseditor.cpp:774
 msgid "Save recipients as distribution list"
 msgstr "将收件人另存为分发列表"
 
-#: recipientseditor.cpp:774
-msgid "Se&lect..."
-msgstr "选择(&L)..."
-
-#: recipientseditor.cpp:777
+#: recipientseditor.cpp:779
 msgid "Select recipients from address book"
 msgstr "从地址簿中选择收件人"
 
-#: recipientseditor.cpp:810
+#: recipientseditor.cpp:812
 msgid "No recipients"
 msgstr "无收件人"
 
-#: recipientseditor.cpp:811
+#: recipientseditor.cpp:813
 #, c-format
 msgid ""
 "_n: 1 recipient\n"
 "%n recipients"
 msgstr "%n 个收件人"
 
-#: recipientseditor.cpp:914
+#: recipientseditor.cpp:917
 msgid "Truncating recipients list to %1 of %2 entries."
 msgstr "将收件人列表中 %2 个条目截到 %1。"
 
@@ -11875,11 +12927,11 @@ msgid ""
 "available addresses."
 msgstr "此按钮将打开一个独立的对话框，您可从可用的地址中选择收件人。"
 
-#: redirectdialog.cpp:107
+#: redirectdialog.cpp:116
 msgid "You cannot redirect the message without an address."
 msgstr "没有地址无法转发信件。"
 
-#: redirectdialog.cpp:108
+#: redirectdialog.cpp:117
 msgid "Empty Redirection Address"
 msgstr "空的重定向地址"
 
@@ -12013,78 +13065,78 @@ msgstr "仅搜索(&O)："
 msgid "I&nclude sub-folders"
 msgstr "包含子文件夹(&N)"
 
-#: searchwindow.cpp:226
+#: searchwindow.cpp:225
 msgid "Sender/Receiver"
 msgstr "发件人/收件人"
 
-#: searchwindow.cpp:249
+#: searchwindow.cpp:250
 msgid "Search folder &name:"
 msgstr "搜索文件夹名称(&N)："
 
-#: searchwindow.cpp:259
+#: searchwindow.cpp:260
 #, fuzzy
 msgid "Op&en Search Folder"
 msgstr "打开完整搜索"
 
-#: searchwindow.cpp:268
+#: searchwindow.cpp:269
 #, fuzzy
 msgid "Open &Message"
 msgstr "打开信件"
 
-#: searchwindow.cpp:274
+#: searchwindow.cpp:275
 msgid "AMiddleLengthText..."
 msgstr "中等长度的文本..."
 
-#: searchwindow.cpp:275
+#: searchwindow.cpp:276
 msgid "Ready."
 msgstr "就绪。"
 
-#: searchwindow.cpp:356
+#: searchwindow.cpp:357
 msgid "Clear Selection"
 msgstr "清除选择"
 
-#: searchwindow.cpp:415
+#: searchwindow.cpp:416
 #, c-format
 msgid ""
 "_n: %n message searched\n"
 "%n messages searched"
 msgstr "搜索到了 %n 封信"
 
-#: searchwindow.cpp:418
+#: searchwindow.cpp:419
 msgid "Done."
 msgstr "完成。"
 
-#: searchwindow.cpp:419
+#: searchwindow.cpp:420
 msgid ""
 "_n: %n match in %1\n"
 "%n matches in %1"
 msgstr "%1 封信中有 %n 封匹配"
 
-#: searchwindow.cpp:422
+#: searchwindow.cpp:423
 msgid "Search canceled."
 msgstr "搜索已取消。"
 
-#: searchwindow.cpp:423
+#: searchwindow.cpp:424
 msgid ""
 "_n: %n match so far in %1\n"
 "%n matches so far in %1"
 msgstr "%1 中找到 %n 个匹配项"
 
-#: searchwindow.cpp:427
+#: searchwindow.cpp:428
 #, c-format
 msgid ""
 "_n: %n message\n"
 "%n messages"
 msgstr "%n 封信"
 
-#: searchwindow.cpp:428
+#: searchwindow.cpp:429
 #, c-format
 msgid ""
 "_n: %n match\n"
 "%n matches"
 msgstr "%n 项匹配"
 
-#: searchwindow.cpp:429
+#: searchwindow.cpp:430
 msgid "Searching in %1. %2 searched so far"
 msgstr "正在 %1 中搜索。搜索了 %2 项"
 
@@ -12116,19 +13168,19 @@ msgstr ""
 "正在收集关于筛选支持的摘要信息...\n"
 "\n"
 
-#: sievedebugdialog.cpp:230
+#: sievedebugdialog.cpp:256
 msgid ""
 "Collecting data for account '%1'...\n"
 msgstr ""
 "正在收集账户“%1”的数据...\n"
 
-#: sievedebugdialog.cpp:231
+#: sievedebugdialog.cpp:257
 msgid ""
 "------------------------------------------------------------\n"
 msgstr ""
 "------------------------------------------------------------\n"
 
-#: sievedebugdialog.cpp:239
+#: sievedebugdialog.cpp:265
 msgid ""
 "(Account does not support Sieve)\n"
 "\n"
@@ -12136,7 +13188,7 @@ msgstr ""
 "(账户不支持筛选)\n"
 "\n"
 
-#: sievedebugdialog.cpp:266
+#: sievedebugdialog.cpp:278
 msgid ""
 "(Account is not an IMAP account)\n"
 "\n"
@@ -12144,13 +13196,13 @@ msgstr ""
 "(账户不是 IMAP 账户)\n"
 "\n"
 
-#: sievedebugdialog.cpp:286
+#: sievedebugdialog.cpp:298
 msgid ""
 "Contents of script '%1':\n"
 msgstr ""
 "脚本“%1”的内容：\n"
 
-#: sievedebugdialog.cpp:321
+#: sievedebugdialog.cpp:320
 msgid ""
 "(This script is empty.)\n"
 "\n"
@@ -12158,7 +13210,7 @@ msgstr ""
 "(此脚本为空。)\n"
 "\n"
 
-#: sievedebugdialog.cpp:326
+#: sievedebugdialog.cpp:325
 msgid ""
 "------------------------------------------------------------\n"
 "%1\n"
@@ -12170,23 +13222,23 @@ msgstr ""
 "------------------------------------------------------------\n"
 "\n"
 
-#: sievedebugdialog.cpp:342
+#: sievedebugdialog.cpp:341
 msgid ""
 "Sieve capabilities:\n"
 msgstr ""
 "筛选能力：\n"
 
-#: sievedebugdialog.cpp:346
+#: sievedebugdialog.cpp:345
 msgid "(No special capabilities available)"
 msgstr "(无特殊的能力)"
 
-#: sievedebugdialog.cpp:355
+#: sievedebugdialog.cpp:354
 msgid ""
 "Available Sieve scripts:\n"
 msgstr ""
 "可用的筛选脚本：\n"
 
-#: sievedebugdialog.cpp:359
+#: sievedebugdialog.cpp:358
 msgid ""
 "(No Sieve scripts available on this server)\n"
 "\n"
@@ -12194,7 +13246,7 @@ msgstr ""
 "(服务器上没有可用的筛选脚本)\n"
 "\n"
 
-#: sievedebugdialog.cpp:367
+#: sievedebugdialog.cpp:366
 msgid ""
 "Active script: %1\n"
 "\n"
@@ -12202,7 +13254,7 @@ msgstr ""
 "活动脚本：%1\n"
 "\n"
 
-#: sievedebugdialog.cpp:394 vacation.cpp:714
+#: sievedebugdialog.cpp:393 vacation.cpp:721
 msgid ""
 "Sieve script installed successfully on the server.\n"
 "Out of Office reply is now active."
@@ -12210,7 +13262,7 @@ msgstr ""
 "筛选脚本成功安装到了服务器上。\n"
 "外出回复现已激活。"
 
-#: sievedebugdialog.cpp:396 vacation.cpp:716
+#: sievedebugdialog.cpp:395 vacation.cpp:723
 msgid ""
 "Sieve script installed successfully on the server.\n"
 "Out of Office reply has been deactivated."
@@ -12295,18 +13347,22 @@ msgstr "指定命令(&P)："
 msgid "New entry:"
 msgstr "新建条目："
 
-#: simplestringlisteditor.cpp:205
+#: simplestringlisteditor.cpp:214
 msgid "New Value"
 msgstr "新值"
 
-#: simplestringlisteditor.cpp:225
+#: simplestringlisteditor.cpp:235
 msgid "Change Value"
 msgstr "更改值"
 
-#: snippetdlg.cpp:71
+#: snippetdlg.cpp:78
 msgid "Sh&ortcut:"
 msgstr "快捷键(&O)："
 
+#: snippetitem.cpp:133 snippetwidget.cpp:171
+msgid "GROUP"
+msgstr ""
+
 #: snippetwidget.cpp:148
 #, c-format
 msgid "Snippet %1"
@@ -12382,9 +13438,10 @@ msgid "Make value &default"
 msgstr "设为默认值(&D)"
 
 #: subscriptiondialog.cpp:376
+#, fuzzy
 msgid ""
-"Currently subscriptions are not used for server %1\n"
-"do you want to enable subscriptions?"
+"Currently subscriptions are not used for server. %1\n"
+"Do you want to enable subscriptions?"
 msgstr ""
 "目前未订阅服务器 %1\n"
 "您是否想要启用订阅？"
@@ -12401,28 +13458,33 @@ msgstr "启用"
 msgid "Do Not Enable"
 msgstr "不启用"
 
-#: templateparser.cpp:238 templateparser.cpp:271
+#: templateparser.cpp:263 templateparser.cpp:296
 msgid "Cannot insert content from file %1: %2"
 msgstr "无法从文件 %1 插入内容：%2"
 
-#: templateparser.cpp:1009 templateparser.cpp:1013
+#: templateparser.cpp:970
+#, fuzzy, c-format
+msgid "Attachment %1"
+msgstr "附件：%1"
+
+#: templateparser.cpp:1150 templateparser.cpp:1154
 msgid "Pipe command exit with status %1: %2"
 msgstr "管道命令退出，返回码是 %1：%2"
 
-#: templateparser.cpp:1024 templateparser.cpp:1028
+#: templateparser.cpp:1165 templateparser.cpp:1169
 msgid "Pipe command killed by signal %1: %2"
 msgstr "管道命令被信号 %1 杀死：%2"
 
-#: templateparser.cpp:1040
+#: templateparser.cpp:1181
 msgid "Pipe command did not finish within %1 seconds: %2"
 msgstr "管道命令未于 %1 秒内完成：%2"
 
-#: templateparser.cpp:1052 templateparser.cpp:1055
+#: templateparser.cpp:1193 templateparser.cpp:1196
 #, c-format
 msgid "Cannot write to process stdin: %1"
 msgstr "无法写到进程标准输入：%1"
 
-#: templateparser.cpp:1063
+#: templateparser.cpp:1204
 #, c-format
 msgid "Cannot start pipe command from template: %1"
 msgstr "无法启动模板的管道命令：%1"
@@ -12486,15 +13548,16 @@ msgstr ""
 "-------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:392
+#, fuzzy
 msgid ""
 "%REM=\"Default forward template\"%-\n"
 "\n"
 "----------  %1  ----------\n"
 "\n"
 "Subject: %OFULLSUBJECT\n"
-"Date: %ODATE\n"
+"Date: %ODATE, %OTIMELONG\n"
 "From: %OFROMADDR\n"
-"To: %OTOADDR\n"
+"%OADDRESSEESADDR\n"
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
@@ -12512,49 +13575,55 @@ msgstr ""
 "-------------------------------------------------------\n"
 
 #: templatesconfiguration.cpp:511
+#, fuzzy
 msgid ""
 "%REM=\"Default new message template\"%-\n"
-"%BLANK"
+"%BLANK\n"
+"%BLANK\n"
+"%BLANK\n"
 msgstr ""
 "%REM=\"新信件默认模板\"%-\n"
 "%BLANK"
 
-#: templatesconfiguration.cpp:518
+#: templatesconfiguration.cpp:520
 #, fuzzy
 msgid ""
+"%CURSOR\n"
+"%BLANK\n"
 "%REM=\"Default reply template\"%-\n"
 "On %ODATEEN %OTIMELONGEN you wrote:\n"
 "%QUOTE\n"
-"%CURSOR\n"
 msgstr ""
 "%REM=\"默认回复模板\"%-\n"
 "在 %ODATEEN %OTIMELONGEN，您写道：\n"
 "%QUOTE\n"
 "%CURSOR\n"
 
-#: templatesconfiguration.cpp:527
+#: templatesconfiguration.cpp:530
 #, fuzzy
 msgid ""
+"%CURSOR\n"
+"%BLANK\n"
 "%REM=\"Default reply all template\"%-\n"
 "On %ODATEEN %OTIMELONGEN %OFROMNAME wrote:\n"
 "%QUOTE\n"
-"%CURSOR\n"
 msgstr ""
 "%REM=\"默认全部回复模板\"%-\n"
 "在 %ODATEEN %OTIMELONGEN，%OFROMNAME 写道：\n"
 "%QUOTE\n"
 "%CURSOR\n"
 
-#: templatesconfiguration.cpp:536
+#: templatesconfiguration.cpp:541
+#, fuzzy
 msgid ""
 "%REM=\"Default forward template\"%-\n"
 "\n"
 "----------  Forwarded Message  ----------\n"
 "\n"
 "Subject: %OFULLSUBJECT\n"
-"Date: %ODATE\n"
+"Date: %ODATE, %OTIMELONG\n"
 "From: %OFROMADDR\n"
-"To: %OTOADDR\n"
+"%OADDRESSEESADDR\n"
 "\n"
 "%TEXT\n"
 "-------------------------------------------------------\n"
@@ -12591,155 +13660,160 @@ msgstr "引用的信件"
 msgid "Message Text as Is"
 msgstr "信件原文"
 
-#: templatesinsertcommand.cpp:62 templatesinsertcommand.cpp:163
+#: templatesinsertcommand.cpp:62 templatesinsertcommand.cpp:166
 msgid "Message Id"
 msgstr "信件 ID"
 
-#: templatesinsertcommand.cpp:70 templatesinsertcommand.cpp:171
+#: templatesinsertcommand.cpp:70 templatesinsertcommand.cpp:174
 msgid "Date in Short Format"
 msgstr "短格式日期"
 
-#: templatesinsertcommand.cpp:74 templatesinsertcommand.cpp:175
+#: templatesinsertcommand.cpp:74 templatesinsertcommand.cpp:178
 msgid "Date in C Locale"
 msgstr "C 语系环境日期"
 
-#: templatesinsertcommand.cpp:78 templatesinsertcommand.cpp:179
+#: templatesinsertcommand.cpp:78 templatesinsertcommand.cpp:182
 msgid "Day of Week"
 msgstr "周中的日"
 
-#: templatesinsertcommand.cpp:82 templatesinsertcommand.cpp:183
+#: templatesinsertcommand.cpp:82 templatesinsertcommand.cpp:186
 msgid "Time"
 msgstr "时间"
 
-#: templatesinsertcommand.cpp:86 templatesinsertcommand.cpp:187
+#: templatesinsertcommand.cpp:86 templatesinsertcommand.cpp:190
 msgid "Time in Long Format"
 msgstr "长格式时间"
 
-#: templatesinsertcommand.cpp:90 templatesinsertcommand.cpp:191
+#: templatesinsertcommand.cpp:90 templatesinsertcommand.cpp:194
 msgid "Time in C Locale"
 msgstr "C 语系环境时间"
 
-#: templatesinsertcommand.cpp:94 templatesinsertcommand.cpp:195
+#: templatesinsertcommand.cpp:94 templatesinsertcommand.cpp:198
 msgid "To Field Address"
 msgstr "收件人字段地址"
 
-#: templatesinsertcommand.cpp:98 templatesinsertcommand.cpp:199
+#: templatesinsertcommand.cpp:98 templatesinsertcommand.cpp:202
 msgid "To Field Name"
 msgstr "收件人字段姓名"
 
-#: templatesinsertcommand.cpp:102 templatesinsertcommand.cpp:203
+#: templatesinsertcommand.cpp:102 templatesinsertcommand.cpp:206
 msgid "To Field First Name"
 msgstr "收件人字段的姓"
 
-#: templatesinsertcommand.cpp:106 templatesinsertcommand.cpp:207
+#: templatesinsertcommand.cpp:106 templatesinsertcommand.cpp:210
 msgid "To Field Last Name"
 msgstr "收件人字段的名"
 
-#: templatesinsertcommand.cpp:110 templatesinsertcommand.cpp:211
+#: templatesinsertcommand.cpp:110 templatesinsertcommand.cpp:214
 msgid "CC Field Address"
 msgstr "抄送字段地址"
 
-#: templatesinsertcommand.cpp:114 templatesinsertcommand.cpp:215
+#: templatesinsertcommand.cpp:114 templatesinsertcommand.cpp:218
 msgid "CC Field Name"
 msgstr "抄送字段姓名"
 
-#: templatesinsertcommand.cpp:118 templatesinsertcommand.cpp:219
+#: templatesinsertcommand.cpp:118 templatesinsertcommand.cpp:222
 msgid "CC Field First Name"
 msgstr "抄送字段的姓"
 
-#: templatesinsertcommand.cpp:122 templatesinsertcommand.cpp:223
+#: templatesinsertcommand.cpp:122 templatesinsertcommand.cpp:226
 msgid "CC Field Last Name"
 msgstr "抄送字段的名"
 
-#: templatesinsertcommand.cpp:126 templatesinsertcommand.cpp:227
+#: templatesinsertcommand.cpp:126 templatesinsertcommand.cpp:230
 msgid "From Field Address"
 msgstr "发件人字段地址"
 
-#: templatesinsertcommand.cpp:130 templatesinsertcommand.cpp:231
+#: templatesinsertcommand.cpp:130 templatesinsertcommand.cpp:234
 msgid "From Field Name"
 msgstr "发件人字段姓名"
 
-#: templatesinsertcommand.cpp:134 templatesinsertcommand.cpp:235
+#: templatesinsertcommand.cpp:134 templatesinsertcommand.cpp:238
 msgid "From Field First Name"
 msgstr "发件人字段的姓"
 
-#: templatesinsertcommand.cpp:138 templatesinsertcommand.cpp:239
+#: templatesinsertcommand.cpp:138 templatesinsertcommand.cpp:242
 msgid "From Field Last Name"
 msgstr "发件人字段的名"
 
-#: templatesinsertcommand.cpp:146
+#: templatesinsertcommand.cpp:142
+#, fuzzy
+msgid "Addresses of all original recipients"
+msgstr "额外收件人"
+
+#: templatesinsertcommand.cpp:149
 msgid "Quoted Headers"
 msgstr "引用的信头"
 
-#: templatesinsertcommand.cpp:150
+#: templatesinsertcommand.cpp:153
 msgid "Headers as Is"
 msgstr "信头原文"
 
-#: templatesinsertcommand.cpp:154 templatesinsertcommand.cpp:247
+#: templatesinsertcommand.cpp:157 templatesinsertcommand.cpp:250
 msgid "Header Content"
 msgstr "信头内容"
 
-#: templatesinsertcommand.cpp:160
+#: templatesinsertcommand.cpp:163
 msgid "Current Message"
 msgstr "当前信件"
 
-#: templatesinsertcommand.cpp:253
+#: templatesinsertcommand.cpp:256
 msgid "Process With External Programs"
 msgstr "外部程序进程"
 
-#: templatesinsertcommand.cpp:256
+#: templatesinsertcommand.cpp:259
 msgid "Insert Result of Command"
 msgstr "插入命令结果"
 
-#: templatesinsertcommand.cpp:260
+#: templatesinsertcommand.cpp:263
 msgid "Pipe Original Message Body and Insert Result as Quoted Text"
 msgstr "管道输出原始信件正文并将处理结果以引用文字形式插入"
 
-#: templatesinsertcommand.cpp:264
+#: templatesinsertcommand.cpp:267
 msgid "Pipe Original Message Body and Insert Result as Is"
 msgstr "管道输出原始信件正文并将处理结果以原始形态插入"
 
-#: templatesinsertcommand.cpp:268
+#: templatesinsertcommand.cpp:271
 msgid "Pipe Original Message with Headers and Insert Result as Is"
 msgstr "管道输出原始信件正文及信头并将处理结果以原始形态插入"
 
-#: templatesinsertcommand.cpp:272
+#: templatesinsertcommand.cpp:275
 msgid "Pipe Current Message Body and Insert Result as Is"
 msgstr "管道输出当前信件正文并将处理结果以原始形态插入"
 
-#: templatesinsertcommand.cpp:276
+#: templatesinsertcommand.cpp:279
 msgid "Pipe Current Message Body and Replace with Result"
 msgstr "管道输出原始信件正文并以处理结果将其替换"
 
-#: templatesinsertcommand.cpp:285
+#: templatesinsertcommand.cpp:288
 msgid "Set Cursor Position"
 msgstr "设置光标位置"
 
-#: templatesinsertcommand.cpp:289
+#: templatesinsertcommand.cpp:292
 msgid "Insert File Content"
 msgstr "插入文件内容"
 
-#: templatesinsertcommand.cpp:293
+#: templatesinsertcommand.cpp:296
 msgid "DNL"
 msgstr "DNL"
 
-#: templatesinsertcommand.cpp:297
+#: templatesinsertcommand.cpp:300
 msgid "Template Comment"
 msgstr "模板注解"
 
-#: templatesinsertcommand.cpp:301
+#: templatesinsertcommand.cpp:304
 msgid "No Operation"
 msgstr "无操作"
 
-#: templatesinsertcommand.cpp:305
+#: templatesinsertcommand.cpp:308
 msgid "Clear Generated Message"
 msgstr "清除生成的信件"
 
-#: templatesinsertcommand.cpp:309
+#: templatesinsertcommand.cpp:312
 msgid "Turn Debug On"
 msgstr "打开调试模式"
 
-#: templatesinsertcommand.cpp:313
+#: templatesinsertcommand.cpp:316
 msgid "Turn Debug Off"
 msgstr "关闭调试模式"
 
@@ -12843,56 +13917,66 @@ msgstr ""
 msgid "There is nothing to undo."
 msgstr "没有操作可供撤消。"
 
-#: urlhandlermanager.cpp:422
+#: urlhandlermanager.cpp:482
 msgid "Turn on HTML rendering for this message."
 msgstr "使用 HTML 排版此信件。"
 
-#: urlhandlermanager.cpp:424
+#: urlhandlermanager.cpp:484
 msgid "Load external references from the Internet for this message."
 msgstr "允许在这封信中装入 Internet 的外部引用。"
 
-#: urlhandlermanager.cpp:426
+#: urlhandlermanager.cpp:486
 msgid "Work online."
 msgstr "联机工作。"
 
-#: urlhandlermanager.cpp:428
+#: urlhandlermanager.cpp:488
 msgid "Decrypt message."
 msgstr "解密的信件。"
 
-#: urlhandlermanager.cpp:430
+#: urlhandlermanager.cpp:490
 msgid "Show signature details."
 msgstr "显示签名细节。"
 
-#: urlhandlermanager.cpp:432
+#: urlhandlermanager.cpp:492
 msgid "Hide signature details."
 msgstr "隐藏签名细节。"
 
-#: urlhandlermanager.cpp:464
+#: urlhandlermanager.cpp:494
+#, fuzzy
+msgid "Hide attachment list"
+msgstr "附件另存为"
+
+#: urlhandlermanager.cpp:496
+#, fuzzy
+msgid "Show attachment list"
+msgstr "显示附件图标"
+
+#: urlhandlermanager.cpp:528
 msgid "Expand all quoted text."
 msgstr "展开全部引用文本。"
 
-#: urlhandlermanager.cpp:466
+#: urlhandlermanager.cpp:531
 msgid "Collapse quoted text."
 msgstr "折叠引用的文本。"
 
-#: urlhandlermanager.cpp:487
+#: urlhandlermanager.cpp:554
 msgid "Could not start certificate manager. Please check your installation."
 msgstr "无法启动证书管理器。请检查您的安装。"
 
-#: urlhandlermanager.cpp:497
+#: urlhandlermanager.cpp:564
 #, c-format
 msgid "Show certificate 0x%1"
 msgstr "显示证书 0x%1"
 
-#: urlhandlermanager.cpp:552
+#: urlhandlermanager.cpp:693
 msgid "Attachment #%1 (unnamed)"
 msgstr "附件 #%1(未命名)"
 
-#: urlhandlermanager.cpp:581
+#: urlhandlermanager.cpp:724
 msgid "Show GnuPG Audit Log for this operation"
 msgstr "显示此操作的 GnuPG 审核日志"
 
-#: vacation.cpp:562
+#: vacation.cpp:566
 msgid ""
 "I am out of office till %1.\n"
 "\n"
@@ -12916,7 +14000,7 @@ msgstr ""
 "您的朋友，\n"
 "-- <在此输入您的姓名和电子邮件地址>\n"
 
-#: vacation.cpp:606
+#: vacation.cpp:612
 msgid ""
 "Your server did not list \"vacation\" in its list of supported Sieve "
 "extensions;\n"
@@ -12927,11 +14011,11 @@ msgstr ""
 "没有它 KMail 无法为您安装外出自动回复。\n"
 "请联系您的系统管理员。"
 
-#: vacation.cpp:616
+#: vacation.cpp:622
 msgid "Configure \"Out of Office\" Replies"
 msgstr "配置“外出”自动回复"
 
-#: vacation.cpp:626
+#: vacation.cpp:632
 msgid ""
 "Someone (probably you) changed the vacation script on the server.\n"
 "KMail is no longer able to determine the parameters for the autoreplies.\n"
@@ -12941,7 +14025,7 @@ msgstr ""
 "KMail 无法确定自动回复的参数。\n"
 "将使用默认值。"
 
-#: vacation.cpp:651
+#: vacation.cpp:657
 msgid ""
 "There is still an active out-of-office reply configured.\n"
 "Do you want to edit it?"
@@ -12949,11 +14033,11 @@ msgstr ""
 "还有一个已配置过的激活中外出回复。\n"
 "您想要编辑它吗？"
 
-#: vacation.cpp:652
+#: vacation.cpp:658
 msgid "Out-of-office reply still active"
 msgstr "外出回复激活中"
 
-#: vacation.cpp:653
+#: vacation.cpp:659
 msgid "Ignore"
 msgstr "忽略"
 
@@ -12965,39 +14049,39 @@ msgstr "配置要发送的休假自动回复信件："
 msgid "&Activate vacation notifications"
 msgstr "激活休假自动回复(&A)"
 
-#: vacationdialog.cpp:76
+#: vacationdialog.cpp:78
 msgid "&Resend notification only after:"
 msgstr "只在如下时间后重新发送通知(&R)："
 
-#: vacationdialog.cpp:82
+#: vacationdialog.cpp:84
 msgid "&Send responses for these addresses:"
 msgstr "对以下地址发送响应(&S)："
 
-#: vacationdialog.cpp:87
+#: vacationdialog.cpp:89
 msgid "Do not send vacation replies to spam messages"
 msgstr "对垃圾信件不寄出休假回复"
 
-#: vacationdialog.cpp:93
+#: vacationdialog.cpp:95
 msgid "Only react to mail coming from domain"
 msgstr "只作用于来自域的邮件"
 
-#: vcardviewer.cpp:41
+#: vcardviewer.cpp:45
 msgid "VCard Viewer"
 msgstr "VCard 查看器"
 
-#: vcardviewer.cpp:42
+#: vcardviewer.cpp:46
 msgid "&Import"
 msgstr "导入(&I)"
 
-#: vcardviewer.cpp:42
+#: vcardviewer.cpp:46
 msgid "&Next Card"
 msgstr "下一张名片(&N)"
 
-#: vcardviewer.cpp:42
+#: vcardviewer.cpp:46
 msgid "&Previous Card"
 msgstr "上一张名片(&P)"
 
-#: vcardviewer.cpp:62
+#: vcardviewer.cpp:70
 msgid "Failed to parse vCard."
 msgstr "分析 vCard 失败。"
 
@@ -13190,7 +14274,7 @@ msgstr "ham"
 msgid "To Do"
 msgstr "待办"
 
-#: kmsearchpattern.h:233
+#: kmsearchpattern.h:234
 msgid "Has Attachment"
 msgstr "有附件"
 
@@ -13198,6 +14282,11 @@ msgstr "有附件"
 msgid "%1 of %2 %3 used"
 msgstr "已经使用了总共 %2 %3 中的 %1"
 
+#: simplefoldertree.h:142 simplefoldertree.h:202 simplefoldertree.h:236
+#: simplefoldertree.h:238
+msgid "Path"
+msgstr "路径"
+
 #: util.h:208
 msgid ""
 "A file named \"%1\" already exists. Are you sure you want to overwrite it?"
@@ -13207,6 +14296,34 @@ msgstr "名为“%1” 的文件已经存在。您要覆盖它吗？"
 msgid "Overwrite File?"
 msgstr "覆盖文件吗？"
 
+#, fuzzy
+#~ msgid "Show folder quick search field"
+#~ msgstr "显示快速搜索编辑框"
+
+#~ msgid "Standard (Ical / Vcard)"
+#~ msgstr "标准(Ical/Vcard)"
+
+#~ msgid ""
+#~ "_: recipient address field\n"
+#~ "&To:"
+#~ msgstr "寄给(&T)："
+
+#~ msgid "&Copy to (CC):"
+#~ msgstr "抄送到(&C)："
+
+#~ msgid "&Blind copy to (BCC):"
+#~ msgstr "密送到(&B)："
+
+#~ msgid "Retrieving new messages"
+#~ msgstr "获取新信件"
+
+#~ msgid "Only filter mails received in disconnected IMAP inbox."
+#~ msgstr "只过滤来自离线 IMAP 收件箱的邮件。"
+
+#, fuzzy
+#~ msgid "Show folder quick search line edit"
+#~ msgstr "显示快速搜索编辑框"
+
 #~ msgid "Op&en"
 #~ msgstr "打开(&E)"
 
@@ -13477,9 +14594,6 @@ msgstr "覆盖文件吗？"
 #~ msgid "Warn if s&ignature certificate expires in less than:"
 #~ msgstr "若签名证书即将过期则警告(&I)："
 
-#~ msgid "Warn if root certificate expires in &less than:"
-#~ msgstr "若根证书即将过期则警告(&L)："
-
 #~ msgid "Warn if signer's email address is &not in certificate"
 #~ msgstr "若收件人的电子邮件地址不在证书中则警告(&N)"
 
diff --git a/tde-i18n-zh_CN/messages/tdepim/kmail_text_calendar_plugin.po b/tde-i18n-zh_CN/messages/tdepim/kmail_text_calendar_plugin.po
index 2191e82c37d..105bc397add 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kmail_text_calendar_plugin.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kmail_text_calendar_plugin.po
@@ -1,93 +1,278 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-08-19 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-09-15 22:42+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: text_calendar.cpp:326
+#: text_calendar.cpp:343
 #, fuzzy
 msgid "Incidence with no summary"
 msgstr "回答：无概要地发生"
 
-#: text_calendar.cpp:330 text_calendar.cpp:341
+#: text_calendar.cpp:347
 #, c-format
 msgid "Answer: %1"
 msgstr "回答：%1"
 
-#: text_calendar.cpp:333
+#: text_calendar.cpp:350
 #, c-format
 msgid "Delegated: %1"
 msgstr ""
 
-#: text_calendar.cpp:336
+#: text_calendar.cpp:353
 #, c-format
 msgid "Forwarded: %1"
 msgstr ""
 
-#: text_calendar.cpp:386
+#: text_calendar.cpp:356
+#, c-format
+msgid "Declined Counter Proposal: %1"
+msgstr ""
+
+#: text_calendar.cpp:412
 msgid "Could not save file to KOrganizer"
 msgstr "无法将文件保存到 KOrganizer"
 
-#: text_calendar.cpp:415 text_calendar.cpp:556
+#: text_calendar.cpp:437 text_calendar.cpp:443
+msgid "\"%1\" occurred already."
+msgstr ""
+
+#: text_calendar.cpp:439 text_calendar.cpp:456
+msgid "\"%1\" is currently in-progress."
+msgstr ""
+
+#: text_calendar.cpp:445
+msgid "\"%1\", happening all day today, is currently in-progress."
+msgstr ""
+
+#: text_calendar.cpp:454 text_calendar.cpp:466
+msgid "\"%1\" is past due."
+msgstr ""
+
+#: text_calendar.cpp:460
+msgid "\"%1\" has already started."
+msgstr ""
+
+#: text_calendar.cpp:469
+msgid "\"%1\", happening all-day today, is currently in-progress."
+msgstr ""
+
+#: text_calendar.cpp:474
+msgid "\"%1\", happening all day, has already started."
+msgstr ""
+
+#: text_calendar.cpp:486
+msgid "Do you still want to accept the invitation?"
+msgstr ""
+
+#: text_calendar.cpp:488
+msgid "Do you still want to accept the task?"
+msgstr ""
+
+#: text_calendar.cpp:492
+msgid "Do you still want to send conditional acceptance of the invitation?"
+msgstr ""
+
+#: text_calendar.cpp:494
+msgid "Do you still want to send conditional acceptance of the task?"
+msgstr ""
+
+#: text_calendar.cpp:497
+msgid "Do you still want to accept the counter proposal?"
+msgstr ""
+
+#: text_calendar.cpp:499
+msgid "Do you still want to send a counter proposal?"
+msgstr ""
+
+#: text_calendar.cpp:501
+msgid "Do you still want to send a decline response?"
+msgstr ""
+
+#: text_calendar.cpp:503
+msgid "Do you still want to decline the counter proposal?"
+msgstr ""
+
+#: text_calendar.cpp:505
+msgid "Do you still want to record this reponse in your calendar?"
+msgstr ""
+
+#: text_calendar.cpp:508
+msgid "Do you still want to delegate this invitation?"
+msgstr ""
+
+#: text_calendar.cpp:510
+msgid "Do you still want to delegate this task?"
+msgstr ""
+
+#: text_calendar.cpp:514
+msgid "Do you still want to forward this invitation?"
+msgstr ""
+
+#: text_calendar.cpp:516
+msgid "Do you still want to forward this task?"
+msgstr ""
+
+#: text_calendar.cpp:519
+msgid "Do you still want to check your calendar?"
+msgstr ""
+
+#: text_calendar.cpp:522
+msgid "Do you still want to record this invitation in your calendar?"
+msgstr ""
+
+#: text_calendar.cpp:524
+msgid "Do you still want to record this task in your calendar?"
+msgstr ""
+
+#: text_calendar.cpp:529
+msgid "%1?"
+msgstr ""
+
+#: text_calendar.cpp:534
+msgid ""
+"%1\n"
+"%2"
+msgstr ""
+
+#: text_calendar.cpp:556
 msgid "Reaction to Invitation"
 msgstr ""
 
-#. i18n("Decline Counter Proposal")
-#: text_calendar.cpp:416 text_calendar.cpp:557
+#: text_calendar.cpp:557 text_calendar.cpp:702
 msgid "Comment:"
 msgstr ""
 
-#: text_calendar.cpp:441
+#: text_calendar.cpp:587
 msgid "Delegation to organizer is not possible."
 msgstr ""
 
-#: text_calendar.cpp:648
-msgid "Accept incidence"
+#: text_calendar.cpp:701
+msgid "Decline Counter Proposal"
+msgstr ""
+
+#: text_calendar.cpp:734
+msgid ""
+"You have no writable calendar folders for invitations, so storing or saving a "
+"response will not be possible.\n"
+"Please create at least 1 writable events calendar and re-sync."
+msgstr ""
+
+#: text_calendar.cpp:754
+msgid ""
+"The calendar invitation stored in this email message is broken in some way. "
+"Unable to continue."
+msgstr ""
+
+#: text_calendar.cpp:808
+msgid ""
+"The organizer is not expecting a reply to this invitation but you can send them "
+"an email message if you desire.\n"
+"\n"
+"Would you like to send the organizer a message regarding this invitation?\n"
+"Press the [Cancel] button to cancel the recording operation."
+msgstr ""
+
+#: text_calendar.cpp:812
+#, fuzzy
+msgid "Send Email to Organizer"
+msgstr "无法将文件保存到 KOrganizer"
+
+#: text_calendar.cpp:813
+msgid "Do Not Send"
+msgstr ""
+
+#: text_calendar.cpp:814
+msgid "Send EMail"
+msgstr ""
+
+#: text_calendar.cpp:823
+#, fuzzy, c-format
+msgid "Re: %1"
+msgstr "回答：%1"
+
+#: text_calendar.cpp:880
+msgid "Open Attachment"
+msgstr ""
+
+#: text_calendar.cpp:881
+msgid "Save Attachment As..."
+msgstr ""
+
+#: text_calendar.cpp:901
+#, fuzzy
+msgid "Accept invitation"
 msgstr "接受发生"
 
-#: text_calendar.cpp:650
-msgid "Accept incidence conditionally"
+#: text_calendar.cpp:903
+#, fuzzy
+msgid "Accept invitation conditionally"
 msgstr "有条件接受发生"
 
-#: text_calendar.cpp:655
+#: text_calendar.cpp:905
+msgid "Accept counter proposal"
+msgstr ""
+
+#: text_calendar.cpp:907
 msgid "Create a counter proposal..."
 msgstr ""
 
-#: text_calendar.cpp:657
+#: text_calendar.cpp:909
 msgid "Throw mail away"
 msgstr "丢弃邮件"
 
-#: text_calendar.cpp:659
-msgid "Decline incidence"
+#: text_calendar.cpp:911
+#, fuzzy
+msgid "Decline invitation"
 msgstr "拒绝发生"
 
-#: text_calendar.cpp:664
+#: text_calendar.cpp:913
+msgid "Decline counter proposal"
+msgstr ""
+
+#: text_calendar.cpp:915
 msgid "Check my calendar..."
 msgstr "检查我的日历..."
 
-#: text_calendar.cpp:666
-msgid "Enter incidence into my calendar"
+#: text_calendar.cpp:917
+#, fuzzy
+msgid "Record response into my calendar"
 msgstr "将发生加入我的日历"
 
-#: text_calendar.cpp:668
+#: text_calendar.cpp:919
 #, fuzzy
-msgid "Delegate incidence"
+msgid "Record invitation into my calendar"
+msgstr "将发生加入我的日历"
+
+#: text_calendar.cpp:921
+msgid "Move this invitation to my trash folder"
+msgstr ""
+
+#: text_calendar.cpp:923
+#, fuzzy
+msgid "Delegate invitation"
 msgstr "拒绝发生"
 
-#: text_calendar.cpp:670
+#: text_calendar.cpp:925
 #, fuzzy
-msgid "Forward incidence"
+msgid "Forward invitation"
 msgstr "接受发生"
 
-#: text_calendar.cpp:672
-msgid "Remove incidence from my calendar"
+#: text_calendar.cpp:927
+#, fuzzy
+msgid "Remove invitation from my calendar"
 msgstr "从我的日历中删除发生"
 
+#: text_calendar.cpp:930
+msgid "Open attachment \"%1\""
+msgstr ""
+
 #: delegateselector.cpp:32
 msgid "Select delegate"
 msgstr ""
@@ -100,10 +285,10 @@ msgstr ""
 msgid "Keep me informed about status changes of this incidence."
 msgstr ""
 
-#: attendeeselector.cpp:31
+#: attendeeselector.cpp:32
 msgid "Select Attendees"
 msgstr ""
 
-#: attendeeselector.cpp:44
+#: attendeeselector.cpp:45
 msgid "Click to add a new attendee"
 msgstr ""
diff --git a/tde-i18n-zh_CN/messages/tdepim/kmail_text_vcard_plugin.po b/tde-i18n-zh_CN/messages/tdepim/kmail_text_vcard_plugin.po
index 38112d209d8..79dd3698eb1 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kmail_text_vcard_plugin.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kmail_text_vcard_plugin.po
@@ -5,22 +5,52 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2004-12-11 01:22+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-09-15 22:34+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: text_vcard.cpp:82
+#: text_vcard.cpp:93
 msgid "Attached business cards"
 msgstr "附加的名片"
 
-#: text_vcard.cpp:95
+#: text_vcard.cpp:106
 msgid "[Add this contact to the addressbook]"
 msgstr "[将此联系人添加到地址簿]"
 
-#: text_vcard.cpp:134
+#: text_vcard.cpp:176
+#, fuzzy
+msgid "View Business Card"
+msgstr "附加的名片"
+
+#: text_vcard.cpp:177
+#, fuzzy
+msgid "Save Business Card As..."
+msgstr "附加的名片"
+
+#: text_vcard.cpp:196
 msgid "Add this contact to the address book."
 msgstr "将此联系人添加到地址簿。"
+
+#: text_vcard.cpp:198
+#, fuzzy
+msgid "Add \"%1\" to the address book."
+msgstr "将此联系人添加到地址簿。"
+
+#: text_vcard.cpp:208
+#, fuzzy
+msgid "Failed to parse the business card."
+msgstr "附加的名片"
+
+#: text_vcard.cpp:225
+#, fuzzy
+msgid "Save Business Card"
+msgstr "附加的名片"
+
+#: text_vcard.cpp:230
+msgid "%1 already exists. Do you want to overwrite it?"
+msgstr ""
diff --git a/tde-i18n-zh_CN/messages/tdepim/kmailcvt.po b/tde-i18n-zh_CN/messages/tdepim/kmailcvt.po
index ec317cef58c..d82a61e27e8 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kmailcvt.po
@@ -8,15 +8,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2007-12-11 01:17+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-08-03 22:39+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "开源软件国际化之 TDE 简体中文翻译组"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "i18n-translation@lists.linux.net.cn"
+
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
 msgstr "从 OS X 邮件中导入"
@@ -29,120 +42,197 @@ msgstr ""
 "<p><b>OS X 邮件导入过滤器</b></p>"
 "<p>此过滤器可从 Apple Mac OS X 的邮件客户端程序中导入电子邮件。</p>"
 
-#: filter_evolution.cxx:58 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:53 filter_oe.cxx:61
-#: filter_opera.cxx:60 filter_outlook.cxx:45 filter_plain.cxx:45
+#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
+#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
+#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
 #: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
 #: filter_thunderbird.cxx:65
 msgid "No directory selected."
 msgstr "没有选中目录。"
 
-#: filter_evolution.cxx:65 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:54 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:51 filter_sylpheed.cxx:63
+#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
+#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
+#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
 #: filter_thebat.cxx:69 filter_thunderbird.cxx:72
 msgid "No files found for import."
 msgstr "没有找到可导入的文件。"
 
-#: filter_evolution.cxx:125 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:89 filter_mailapp.cxx:63
-#: filter_mbox.cxx:55 filter_opera.cxx:87 filter_outlook.cxx:60
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
 #: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
 #: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
 msgid "Unable to open %1, skipping"
 msgstr "无法打开 %1，跳过"
 
-#: filter_evolution.cxx:146 filter_mailapp.cxx:71 filter_mbox.cxx:61
-#: filter_opera.cxx:89 filter_outlook.cxx:58
+#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
+#: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
 msgstr "正在从 %1 导入新邮件..."
 
-#: filter_evolution.cxx:77 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:127 filter_mbox.cxx:133
-#: filter_opera.cxx:141 filter_plain.cxx:81 filter_pmail.cxx:79
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
 #: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
 #, c-format
 msgid "Finished importing emails from %1"
 msgstr "从 %1 导入电子邮件完成"
 
-#: filter_mailapp.cxx:130 filter_mbox.cxx:136
+#: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "未将 %n 封重复的信件导入到 KMail 的文件夹 %1 中"
 
 #: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:138 filter_mbox.cxx:139 filter_oe.cxx:103
-#: filter_opera.cxx:155 filter_plain.cxx:85 filter_sylpheed.cxx:82
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
 #: filter_thebat.cxx:88 filter_thunderbird.cxx:104
 msgid "Finished import, canceled by user."
 msgstr "完成了导入，被用户取消。"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "导入 Thunderbird/Mozilla 本地邮件和文件夹结构"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "导入 Lotus Notes 邮件"
 
-#: filter_thunderbird.cxx:30
+#: filter_lnotes.cxx:32
 msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
+"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
+"<p>This filter will import Structured Text files from an exported Lotus Notes "
+"email client into KMail. Use this filter if you want to import mails from Lotus "
+"or other mailers that use the Lotus Notes Structured Text format.</p>"
+"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
+"your local folder, named using the names of the files the messages came "
+"from.</p>"
 msgstr ""
-"<p><b>Thunderbird/Mozilla  导入过滤器</b></p>"
-"<p>选择您的基础 Thunderbird/Mozilla  邮件文件夹(通常是 ~/.thunderbird/*.default/Mail/Local "
-"Folders/)。</p>"
-"<p><b>注意：</b>绝对不要选择<u>不</u>包含 mbox 文件的文件夹(例如 maildir)。如果您那么做的话，将会得到很多新文件夹。</p>"
-"<p>由于可以重建文件夹结构，文件夹将存储于“Thunderbird-Import”下。</p>"
+"<p><b>Lotus Notes 结构化文本邮件导入过滤器</b></p>"
+"<p>此过滤器将从 Lotus Notes 导出的结构化文本文件中把邮件文件导入至 KMail。如果您想要从 Lotus Notes 或使用 Lotus "
+"Notes 结构化文本格式的其它邮件程序中中导入邮件，请使用此过滤器。</p>"
+"<p><b>注意：</b>由于可以重现文件夹结构，导入的信件将会被存储于本地文件夹“LNotes-Import”的子文件夹中，而子文件夹的名称取决于导入时的文件"
+"名。</p>"
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "开始导入文件 %1..."
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "全部文件(*)"
 
-#: filter_evolution.cxx:196 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:59
-#: filter_plain.cxx:83 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "正在从 %1 导入邮件"
+
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
 #, c-format
+msgid "Message %1"
+msgstr "信件 %1"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "从 Pegasus-Mail 中导入文件夹"
+
+#: filter_pmail.cxx:33
 msgid ""
-"_n: 1 duplicate message not imported\n"
-"%n duplicate messages not imported"
-msgstr "未导入 %n 封重复的信件"
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
+"C:\\pmail\\mail\\admin</p>"
+"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"folders will be stored under: \"PegasusMail-Import\".</p>"
+msgstr ""
+"<p>选择您系统上的 Pegasus-Mail 目录(其中包含 *.CNM，*.PMM 和 *.MBX 文件)。在许多系统中，此目录存储于 "
+"C:\\PMail\\mail 或 C:\\pmail\\mail\\admin</p>"
+"<p><b>注意：</b>由于可以重建文件夹结构，文件夹将存储于“PegasusMail-Import”下。</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "正在统计文件..."
 
-#: filters.cxx:145 filters.cxx:180
+#: filter_pmail.cxx:69
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
-msgstr "<b>严重错误：</b>无法与 KMail 进行 DCOP 通讯。请确认<i>kmail</i>在您的路径中。"
+"Cannot parse the folder structure; continuing import without subfolder support."
+msgstr "无法分析文件夹结构；继续导入而不支持子文件夹。"
 
-#: filters.cxx:153 filters.cxx:188
-msgid "Cannot make folder %1 in KMail"
-msgstr "无法在 KMail 中创建文件夹 %1"
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "正在导入新邮件文件(“.cnm”)..."
 
-#: filters.cxx:156 filters.cxx:191
-msgid "Cannot add message to folder %1 in KMail"
-msgstr "无法将信件添加到 KMail 的文件夹 %1 中"
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "正在导入邮件文件夹(“.pmm”) ..."
 
-#: filters.cxx:162 filters.cxx:194
-msgid "Error while adding message to folder %1 in KMail"
-msgstr "在将信件添加到 KMail 的文件夹 %1 时出错"
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "正在导入“UNIX”邮件文件夹(“.mbx”)..."
 
-#: _translatorinfo.cpp:1
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "正在导入 %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "正在分析文件夹结构..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "导入 Outlook 邮件"
+
+#: filter_outlook.cxx:30
 msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "开源软件国际化之 TDE 简体中文翻译组"
+"<p><b>Outlook email import filter</b></p>"
+"<p>This filter will import mails from a Outlook pst-file. You will need to "
+"locate the folder where the pst-file has been stored by searching for .pst "
+"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
+"<p><b>Note:</b> Emails will be imported into a folder named after the account "
+"they came from, prefixed with OUTLOOK-</p>"
+msgstr ""
+"<p><b>Outlook 电子邮件导入过滤器</b></p>"
+"<p>此过滤器将从 Outlook 的 PST 文件中导入邮件。您需要找到 PST 文件存储的文件夹。在 Windows 2000 及以后版本中，您可以在 "
+"<i>C:\\Documents and Settings</i> 下搜索 .pst 文件"
+"<p>"
+"<p><b>注意：</b>电子邮件将会导入到与账户同名的文件夹中，只是带有前缀“OUTLOOK-”</p>"
 
-#: _translatorinfo.cpp:3
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "正在统计邮件..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "正在统计目录..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "正在统计文件夹..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "正在导入新邮件文件..."
+
+#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
+#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
+#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
+#: filter_thunderbird.cxx:101
+#, c-format
 msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "i18n-translation@lists.linux.net.cn"
+"_n: 1 duplicate message not imported\n"
+"%n duplicate messages not imported"
+msgstr "未导入 %n 封重复的信件"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "导入 Evolution 1.x 本地邮件和文件夹结构"
+
+#: filter_evolution.cxx:33
+msgid ""
+"<p><b>Evolution 1.x import filter</b></p>"
+"<p>Select the base directory of Evolution's mails (usually "
+"~/evolution/local).</p>"
+"<p>Since it is possible to recreate the folder structure, the folders will be "
+"stored under: \"Evolution-Import\".</p>"
+msgstr ""
+"<p><b>Evolution 1.x 导入过滤器</b></p>"
+"<p>选择您的 Evolution 本地邮件文件夹的基目录(通常为 ~/.evolution/local/)。</p>"
+"<p>由于可以重新创建文件夹结构，文件夹将存储于“Evolution-Import”下。</p>"
 
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
@@ -167,146 +257,171 @@ msgid "Import folder %1..."
 msgstr "导入文件夹 %1..."
 
 #: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:68 filter_plain.cxx:72 filter_sylpheed.cxx:153
+#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
 #: filter_sylpheed.cxx:158
 #, c-format
 msgid "Could not import %1"
 msgstr "无法导入 %1"
 
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "KMail 导入过滤器"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005，KMailCVT 开发者"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "原始作者"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "维护者和新过滤器"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "新的界面和清理"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "导入 Evolution 1.x 本地邮件和文件夹结构"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "导入 Evolution 2.x 本地邮件和文件夹结构"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
+"<p><b>Evolution 2.x import filter</b></p>"
+"<p>Select the base directory of your local Evolution mailfolder (usually "
+"~/.evolution/mail/local/).</p>"
+"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example a maildir): if you do, you will get many new "
+"folders.</p>"
 "<p>Since it is possible to recreate the folder structure, the folders will be "
 "stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Evolution 1.x 导入过滤器</b></p>"
-"<p>选择您的 Evolution 本地邮件文件夹的基目录(通常为 ~/.evolution/local/)。</p>"
-"<p>由于可以重新创建文件夹结构，文件夹将存储于“Evolution-Import”下。</p>"
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "导入 Opera 邮件"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Opera 电子邮件导入过滤器</b></p>"
-"<p>此过滤器将导入 Opera 邮件文件夹中的邮件。如果您想要从 Opera 邮件目录中一个账户的全部邮件，请使用此过滤器。</p>"
-"<p>选择账户所在的目录(通常为 ~/.opera/mail/store/account*)。</p>"
-"<p><b>注意：</b>电子邮件将会导入到与账户同名的文件夹中，只是带有前缀“OPERA-”。</p>"
+"<p><b>Evolution 2.x 导入过滤器</b></p>"
+"<p>选择您的 Evolution 本地邮件文件夹的基目录(通常为 ~/.evolution/mail/local/)。</p>"
+"<p><b>注意：</b>不要选择<u>不包含</u> mbox 文件的文件夹(比如 maildir)。如果您不小心选择了的话，您将会得到很多新文件夹。</p>"
+"<p>由于可以创建文件夹结构，文件夹将存储于“Evolution-Import”下。</p>"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:46 filter_plain.cxx:52
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "正在统计文件..."
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "开始导入文件 %1..."
 
-#: filter_opera.cxx:82 filter_outlook.cxx:50 filter_plain.cxx:56
-msgid "Importing new mail files..."
-msgstr "正在导入新邮件文件..."
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>由 %1 编写。</i></p>"
 
-#: kmailcvt.cpp:26
+#: kmailcvt.cpp:28
 msgid "KMailCVT Import Tool"
 msgstr "KMailCVT 导入工具"
 
-#: kmailcvt.cpp:29
+#: kmailcvt.cpp:31
 msgid "Step 1: Select Filter"
 msgstr "第一步：选择过滤器"
 
-#: kmailcvt.cpp:32
+#: kmailcvt.cpp:34
 msgid "Step 2: Importing..."
 msgstr "第二步：导入..."
 
-#: kmailcvt.cpp:53
+#: kmailcvt.cpp:76
 msgid "Import in progress"
 msgstr "导入进行中"
 
-#: kmailcvt.cpp:56
+#: kmailcvt.cpp:79
 msgid "Import finished"
 msgstr "导入已完成"
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "从 Pegasus-Mail 中导入文件夹"
+#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+msgid ""
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
+"kmail</i> is installed."
+msgstr "<b>严重错误：</b>无法与 KMail 进行 DCOP 通讯。请确认<i>kmail</i>在您的路径中。"
 
-#: filter_pmail.cxx:33
+#: filters.cxx:153 filters.cxx:188
+msgid "Cannot make folder %1 in KMail"
+msgstr "无法在 KMail 中创建文件夹 %1"
+
+#: filters.cxx:156 filters.cxx:191
+msgid "Cannot add message to folder %1 in KMail"
+msgstr "无法将信件添加到 KMail 的文件夹 %1 中"
+
+#: filters.cxx:162 filters.cxx:194
+msgid "Error while adding message to folder %1 in KMail"
+msgstr "在将信件添加到 KMail 的文件夹 %1 时出错"
+
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "导入 mbox 文件(UNIX，Evolution)"
+
+#: filter_mbox.cxx:30
 msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
+"<p><b>mbox import filter</b></p>"
+"<p>This filter will import mbox files into KMail. Use this filter if you want "
+"to import mails from Ximian Evolution or other mailers that use this "
+"traditional UNIX format.</p>"
+"<p><b>Note:</b> Emails will be imported into folders named after the file they "
+"came from, prefixed with MBOX-</p>"
 msgstr ""
-"<p>选择您系统上的 Pegasus-Mail 目录(其中包含 *.CNM，*.PMM 和 *.MBX 文件)。在许多系统中，此目录存储于 "
-"C:\\PMail\\mail 或 C:\\pmail\\mail\\admin</p>"
-"<p><b>注意：</b>由于可以重建文件夹结构，文件夹将存储于“PegasusMail-Import”下。</p>"
+"<p><b>mbox 导入过滤器</b></p>"
+"<p>此过滤器将把 mbox 文件导入至 KMail。如果您想要从 Ximian Evolution 或其它使用此传统 UNIX "
+"格式的邮件程序中导入邮件，请使用此过滤器。</p>"
+"<p><b>注意：</b>电子邮件将会导入到与文件同名的文件夹中，只是带有前缀“MBOX-”。</p>"
 
-#: filter_pmail.cxx:69
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "mbox 文件(*)"
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "导入纯文本电子邮件"
+
+#: filter_plain.cxx:29
 msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr "无法分析文件夹结构；继续导入而不支持子文件夹。"
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, prefixed "
+"by PLAIN-</p>"
+"<p>This filter will import all .msg, .eml and .txt emails.</p>"
+msgstr ""
+"<p>选择您系统中包含电子邮件的目录。邮件会被放在与其所在目录同名的文件夹中，只是带有前缀“PLAIN-”。</p>"
+"<p>此过滤器将会导入全部 .msg、.eml 和 .txt 邮件。</p>"
 
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "正在导入新邮件文件(“.cnm”)..."
+#: filter_oe.cxx:40
+msgid "Import Outlook Express Emails"
+msgstr "导入 Outlook Express 邮件"
 
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "正在导入邮件文件夹(“.pmm”) ..."
+#: filter_oe.cxx:42
+msgid ""
+"<p><b>Outlook Express 4/5/6 import filter</b></p>"
+"<p>You will need to locate the folder where the mailbox has been stored by "
+"searching for .dbx or .mbx files under "
+"<ul>"
+"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
+"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
+"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
+"your local folder.</p>"
+msgstr ""
+"<p><b>Outlook Express 4/5/6 导入过滤器</b></p>"
+"<p>您需要找到邮箱存储的文件夹，您可以在下列文件夹下搜索 .dbx 或 .mdx 文件"
+"<ul>"
+"<li>Windows 9x 下的 <i>C:\\Windows\\Application Data</i>"
+"<li>Windows 2000 或更高版本中的 <i>Documents and Settings</i></ul></p>"
+"<p><b>注意：</b>由于可以重建文件夹结构，Outlook Express 5 和 6 "
+"中的文件夹将被存储于您本地文件夹的“OE-Import”下。</p>"
 
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "正在导入“UNIX”邮件文件夹(“.mbx”)..."
+#: filter_oe.cxx:67
+#, c-format
+msgid "No Outlook Express mailboxes found in directory %1."
+msgstr "未在目录 %1 中找到 Outlook Express 邮箱。"
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#: filter_oe.cxx:82
+msgid "Import folder structure..."
+msgstr "导入文件夹结构..."
+
+#: filter_oe.cxx:101
+msgid "Finished importing Outlook Express emails"
+msgstr "导入 Outlook Express 邮件完成"
+
+#: filter_oe.cxx:119
 #, c-format
-msgid "Importing %1"
-msgstr "正在导入 %1"
+msgid "Unable to open mailbox %1"
+msgstr "无法打开邮箱 %1"
 
-#: filter_lnotes.cxx:110 filter_pmail.cxx:279
+#: filter_oe.cxx:130
 #, c-format
-msgid "Message %1"
-msgstr "信件 %1"
+msgid "Importing OE4 Mailbox %1"
+msgstr "导入 OE4 邮箱 %1"
 
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "正在分析文件夹结构..."
+#: filter_oe.cxx:144
+#, c-format
+msgid "Importing OE5+ Mailbox %1"
+msgstr "导入 OE5+ 邮箱 %1"
+
+#: filter_oe.cxx:150
+#, c-format
+msgid "Importing OE5+ Folder file %1"
+msgstr "导入 OE5+ 文件夹文件 %1"
 
 #. i18n: file kimportpagedlg.ui line 91
 #: rc.cpp:3
@@ -381,27 +496,37 @@ msgstr ""
 msgid "Remove &duplicate messages during import"
 msgstr "导入时删除重复邮件(&D)"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "导入 mbox 文件(UNIX，Evolution)"
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "导入 The Bat! 邮件和文件夹结构"
 
-#: filter_mbox.cxx:30
+#: filter_thebat.cxx:35
 msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+"<p><b>The Bat! import filter</b></p>"
+"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
+"import.</p>"
+"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
+"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
+"<p>Since it is possible to recreate the folder structure, the folders will be "
+"stored under: \"TheBat-Import\" in your local account.</p>"
 msgstr ""
-"<p><b>mbox 导入过滤器</b></p>"
-"<p>此过滤器将把 mbox 文件导入至 KMail。如果您想要从 Ximian Evolution 或其它使用此传统 UNIX "
-"格式的邮件程序中导入邮件，请使用此过滤器。</p>"
-"<p><b>注意：</b>电子邮件将会导入到与文件同名的文件夹中，只是带有前缀“MBOX-”。</p>"
+"<p><b>The Bat! 导入过滤器</b></p>"
+"<p>选择您想要导入的 The Bat! 邮件文件夹的基础目录。</p>"
+"<p><b>注意：</b>此过滤器将从 The Bat! 本地文件夹中导入 *.tbb 文件，这适用于 POP 账户，但不适用于 IMAP/DIMAP "
+"账户。</p>"
+"<p>由于可以重建文件夹结构，文件夹将储于您本地账户的“TheBat-Import”下。</p>"
 
-#: filter_mbox.cxx:49
-msgid "mbox Files (*)"
-msgstr "mbox 文件(*)"
+#: filter_kmail_archive.cxx:24
+msgid "Import KMail Archive File"
+msgstr ""
+
+#: filter_kmail_archive.cxx:26
+msgid ""
+"<p><b>KMail Archive File Import Filter</b></p>"
+"<p>This filter will import archives files previously exported by KMail.</p>"
+"<p>Archive files contain a complete folder subtree compressed into a single "
+"file.</p>"
+msgstr ""
 
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
@@ -412,191 +537,79 @@ msgid ""
 "<p><b>KMail import filter</b></p>"
 "<p>Select the base directory of the KMail mailfolder you want to import.</p>"
 "<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck in a "
-"continuous loop. </p>"
+"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
+"in a continuous loop. </p>"
 "<p>This filter does not import KMail mailfolders with mbox files.</p>"
 "<p>Since it is possible to recreate the folder structure, the folders will be "
 "stored under: \"KMail-Import\" in your local folder.</p>"
 msgstr ""
 "<p><b>KMail 导入过滤器</b></p>"
 "<p>选择您想要导入的 KMail 邮件文件夹的基础目录。</p>"
-"<p><b>注意：</b>绝对不要选择您目前的本地 KMail 邮件目录(通常是 ~/Mail 或 ~/.trinity/share/apps/kmail/mail "
-")。否则，KMailCVT 可能陷入死循环之中。</p>"
+"<p><b>注意：</b>绝对不要选择您目前的本地 KMail 邮件目录(通常是 ~/Mail 或 "
+"~/.trinity/share/apps/kmail/mail )。否则，KMailCVT 可能陷入死循环之中。</p>"
 "<p>此过滤器不会导入带 mbox 文件的 KMail 邮件文件夹。</p>"
 "<p>由于可以重建文件夹结构，文件夹将储于您本地文件夹的“KMail-Import”下。</p>"
 
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "导入 Evolution 2.x 本地邮件和文件夹结构"
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "导入 Thunderbird/Mozilla 本地邮件和文件夹结构"
 
-#: filter_evolution_v2.cxx:31
+#: filter_thunderbird.cxx:30
 msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
+"<p><b>Thunderbird/Mozilla import filter</b></p>"
+"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
+"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
 "<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
+"contain mbox-files (for example, a maildir): if you do, you will get many new "
 "folders.</p>"
 "<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Evolution 2.x 导入过滤器</b></p>"
-"<p>选择您的 Evolution 本地邮件文件夹的基目录(通常为 ~/.evolution/mail/local/)。</p>"
-"<p><b>注意：</b>不要选择<u>不包含</u> mbox 文件的文件夹(比如 maildir)。如果您不小心选择了的话，您将会得到很多新文件夹。</p>"
-"<p>由于可以创建文件夹结构，文件夹将存储于“Evolution-Import”下。</p>"
-
-#: filter_oe.cxx:40
-msgid "Import Outlook Express Emails"
-msgstr "导入 Outlook Express 邮件"
-
-#: filter_oe.cxx:42
-msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
-"your local folder.</p>"
-msgstr ""
-"<p><b>Outlook Express 4/5/6 导入过滤器</b></p>"
-"<p>您需要找到邮箱存储的文件夹，您可以在下列文件夹下搜索 .dbx 或 .mdx 文件"
-"<ul>"
-"<li>Windows 9x 下的 <i>C:\\Windows\\Application Data</i>"
-"<li>Windows 2000 或更高版本中的 <i>Documents and Settings</i></ul></p>"
-"<p><b>注意：</b>由于可以重建文件夹结构，Outlook Express 5 和 6 "
-"中的文件夹将被存储于您本地文件夹的“OE-Import”下。</p>"
-
-#: filter_oe.cxx:68
-#, c-format
-msgid "No Outlook Express mailboxes found in directory %1."
-msgstr "未在目录 %1 中找到 Outlook Express 邮箱。"
-
-#: filter_oe.cxx:83
-msgid "Import folder structure..."
-msgstr "导入文件夹结构..."
-
-#: filter_oe.cxx:102
-msgid "Finished importing Outlook Express emails"
-msgstr "导入 Outlook Express 邮件完成"
-
-#: filter_oe.cxx:120
-#, c-format
-msgid "Unable to open mailbox %1"
-msgstr "无法打开邮箱 %1"
-
-#: filter_oe.cxx:131
-#, c-format
-msgid "Importing OE4 Mailbox %1"
-msgstr "导入 OE4 邮箱 %1"
-
-#: filter_oe.cxx:145
-#, c-format
-msgid "Importing OE5+ Mailbox %1"
-msgstr "导入 OE5+ 邮箱 %1"
-
-#: filter_oe.cxx:151
-#, c-format
-msgid "Importing OE5+ Folder file %1"
-msgstr "导入 OE5+ 文件夹文件 %1"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "导入 Lotus Notes 邮件"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
-msgstr ""
-"<p><b>Lotus Notes 结构化文本邮件导入过滤器</b></p>"
-"<p>此过滤器将从 Lotus Notes 导出的结构化文本文件中把邮件文件导入至 KMail。如果您想要从 Lotus Notes 或使用 Lotus "
-"Notes 结构化文本格式的其它邮件程序中中导入邮件，请使用此过滤器。</p>"
-"<p><b>注意：</b>由于可以重现文件夹结构，导入的信件将会被存储于本地文件夹“LNotes-Import”的子文件夹中，而子文件夹的名称取决于导入时的文件"
-"名。</p>"
-
-#: filter_lnotes.cxx:56
-msgid "All Files (*)"
-msgstr "全部文件(*)"
-
-#: filter_lnotes.cxx:65
-#, c-format
-msgid "Importing emails from %1"
-msgstr "正在从 %1 导入邮件"
-
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "导入 The Bat! 邮件和文件夹结构"
-
-#: filter_thebat.cxx:35
-msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
-"<p><b>The Bat! 导入过滤器</b></p>"
-"<p>选择您想要导入的 The Bat! 邮件文件夹的基础目录。</p>"
-"<p><b>注意：</b>此过滤器将从 The Bat! 本地文件夹中导入 *.tbb 文件，这适用于 POP 账户，但不适用于 IMAP/DIMAP "
-"账户。</p>"
-"<p>由于可以重建文件夹结构，文件夹将储于您本地账户的“TheBat-Import”下。</p>"
-
-#: kselfilterpage.cpp:76
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>由 %1 编写。</i></p>"
+"<p><b>Thunderbird/Mozilla  导入过滤器</b></p>"
+"<p>选择您的基础 Thunderbird/Mozilla  邮件文件夹(通常是 ~/.thunderbird/*.default/Mail/Local "
+"Folders/)。</p>"
+"<p><b>注意：</b>绝对不要选择<u>不</u>包含 mbox 文件的文件夹(例如 maildir)。如果您那么做的话，将会得到很多新文件夹。</p>"
+"<p>由于可以重建文件夹结构，文件夹将存储于“Thunderbird-Import”下。</p>"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "导入 Outlook 邮件"
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "导入 Opera 邮件"
 
-#: filter_outlook.cxx:30
+#: filter_opera.cxx:30
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
+"<p><b>Opera email import filter</b></p>"
+"<p>This filter will import mails from Opera mail folder. Use this filter if you "
+"want to import all mails within a account in the Opera maildir.</p>"
+"<p>Select the directory of the account (usually "
+"~/.opera/mail/store/account*).</p>"
 "<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"they came from, prefixed with OPERA-</p>"
 msgstr ""
-"<p><b>Outlook 电子邮件导入过滤器</b></p>"
-"<p>此过滤器将从 Outlook 的 PST 文件中导入邮件。您需要找到 PST 文件存储的文件夹。在 Windows 2000 及以后版本中，您可以在 "
-"<i>C:\\Documents and Settings</i> 下搜索 .pst 文件"
-"<p>"
-"<p><b>注意：</b>电子邮件将会导入到与账户同名的文件夹中，只是带有前缀“OUTLOOK-”</p>"
+"<p><b>Opera 电子邮件导入过滤器</b></p>"
+"<p>此过滤器将导入 Opera 邮件文件夹中的邮件。如果您想要从 Opera 邮件目录中一个账户的全部邮件，请使用此过滤器。</p>"
+"<p>选择账户所在的目录(通常为 ~/.opera/mail/store/account*)。</p>"
+"<p><b>注意：</b>电子邮件将会导入到与账户同名的文件夹中，只是带有前缀“OPERA-”。</p>"
 
-#: filter_outlook.cxx:47
-msgid "Counting mail..."
-msgstr "正在统计邮件..."
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
 
-#: filter_outlook.cxx:48
-msgid "Counting directories..."
-msgstr "正在统计目录..."
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "KMail 导入过滤器"
 
-#: filter_outlook.cxx:49
-msgid "Counting folders..."
-msgstr "正在统计文件夹..."
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005，KMailCVT 开发者"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "导入纯文本电子邮件"
+#: main.cpp:36
+msgid "Original author"
+msgstr "原始作者"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p>选择您系统中包含电子邮件的目录。邮件会被放在与其所在目录同名的文件夹中，只是带有前缀“PLAIN-”。</p>"
-"<p>此过滤器将会导入全部 .msg、.eml 和 .txt 邮件。</p>"
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "维护者和新过滤器"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "新的界面和清理"
diff --git a/tde-i18n-zh_CN/messages/tdepim/kmobile.po b/tde-i18n-zh_CN/messages/tdepim/kmobile.po
index 0ada1885027..f395d00774b 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kmobile.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kmobile.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmobile\n"
-"POT-Creation-Date: 2005-07-25 01:39+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2003-11-16 19:33+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdepim/knode.po b/tde-i18n-zh_CN/messages/tdepim/knode.po
index 4e0ca336f8a..256195e68a9 100644
--- a/tde-i18n-zh_CN/messages/tdepim/knode.po
+++ b/tde-i18n-zh_CN/messages/tdepim/knode.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: knode\n"
-"POT-Creation-Date: 2008-07-22 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-10-29 19:23+0800\n"
 "Last-Translator: Li Zongliang <li-zongliang@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -32,19 +33,19 @@ msgstr "i18n-translation@lists.linux.net.cn"
 msgid "Maintainer"
 msgstr "维护人"
 
-#: aboutdata.cpp:31
+#: aboutdata.cpp:31 aboutdata.cpp:32
 msgid "Former maintainer"
 msgstr "先前维护人"
 
-#: aboutdata.cpp:45 knjobdata.cpp:120
+#: aboutdata.cpp:46 knjobdata.cpp:120
 msgid "KNode"
 msgstr "KNode"
 
-#: aboutdata.cpp:47
+#: aboutdata.cpp:48
 msgid "A newsreader for TDE"
 msgstr "TDE 新闻阅读器"
 
-#: aboutdata.cpp:49
+#: aboutdata.cpp:50
 msgid "Copyright (c) 1999-2005 the KNode authors"
 msgstr "版权所有 (c) 1999-2005 KNode 作者"
 
@@ -127,7 +128,7 @@ msgstr "隐藏(&H)"
 msgid "Chars&et"
 msgstr "字符集(&E)"
 
-#: articlewidget.cpp:196 articlewidget.cpp:1362
+#: articlewidget.cpp:196 articlewidget.cpp:1371
 msgid "Automatic"
 msgstr "自动"
 
@@ -163,19 +164,19 @@ msgstr "打开附件(&O)"
 msgid "&Save Attachment As..."
 msgstr "附件另存为(&S)..."
 
-#: articlewidget.cpp:341
+#: articlewidget.cpp:345
 msgid "Unable to load the article."
 msgstr "无法加载文章。"
 
-#: articlewidget.cpp:373
+#: articlewidget.cpp:377
 msgid "The article contains no data."
 msgstr "文章中不包含数据。"
 
-#: articlewidget.cpp:400
+#: articlewidget.cpp:405
 msgid "Unknown charset. Default charset is used instead."
 msgstr "未知的字符集。使用默认字符集。"
 
-#: articlewidget.cpp:460
+#: articlewidget.cpp:465
 msgid ""
 "<br/><b>This article has the MIME type &quot;message/partial&quot;, which KNode "
 "cannot handle yet."
@@ -185,7 +186,7 @@ msgstr ""
 "<br/><b>这篇文章包含了Mime类型&quot;message/partial&quot;，KNode还不能处理。"
 "<br>您可以将它保存为纯文本文件再手工处理它。</b></qt>"
 
-#: articlewidget.cpp:477
+#: articlewidget.cpp:482
 msgid ""
 "<b>Note:</b> This is an HTML message. For security reasons, only the raw HTML "
 "code is shown. If you trust the sender of this message then you can activate "
@@ -193,71 +194,71 @@ msgid ""
 "by clicking here</a>."
 msgstr ""
 
-#: articlewidget.cpp:523
+#: articlewidget.cpp:528
 msgid "An error occurred."
 msgstr "发生错误。"
 
-#: articlewidget.cpp:656
+#: articlewidget.cpp:663
 msgid "References:"
 msgstr "引用："
 
-#: articlewidget.cpp:742
+#: articlewidget.cpp:750
 #, c-format
 msgid "Message was signed with unknown key 0x%1."
 msgstr "邮件用未知的密钥 0x%1 签名。"
 
-#: articlewidget.cpp:745
+#: articlewidget.cpp:753
 msgid "The validity of the signature cannot be verified."
 msgstr "签名有效性无法验证。"
 
-#: articlewidget.cpp:763
+#: articlewidget.cpp:771
 msgid "Message was signed by %1 (Key ID: 0x%2)."
 msgstr "邮件由 %1 签名 (密钥ID：0x%2)。"
 
-#: articlewidget.cpp:767
+#: articlewidget.cpp:775
 #, c-format
 msgid "Message was signed by %1."
 msgstr "消息由 %1 签名。"
 
-#: articlewidget.cpp:777
+#: articlewidget.cpp:785
 msgid "The signature is valid, but the key's validity is unknown."
 msgstr "签名是有效的，但无法确认密钥的有效性。"
 
-#: articlewidget.cpp:781
+#: articlewidget.cpp:789
 msgid "The signature is valid and the key is marginally trusted."
 msgstr "签名是有效的，且密钥可以被信任。"
 
-#: articlewidget.cpp:785
+#: articlewidget.cpp:793
 msgid "The signature is valid and the key is fully trusted."
 msgstr "签名是有效的，且密钥完全被信任。"
 
-#: articlewidget.cpp:789
+#: articlewidget.cpp:797
 msgid "The signature is valid and the key is ultimately trusted."
 msgstr "签名是有效的，且密钥绝对被信任。"
 
-#: articlewidget.cpp:793
+#: articlewidget.cpp:801
 msgid "The signature is valid, but the key is untrusted."
 msgstr "签名是有效的，但密钥不被信任。"
 
-#: articlewidget.cpp:797
+#: articlewidget.cpp:805
 msgid "Warning: The signature is bad."
 msgstr "警告：签名有错误。"
 
-#: articlewidget.cpp:814
+#: articlewidget.cpp:822
 msgid "End of signed message"
 msgstr "签名邮件结束"
 
-#: articlewidget.cpp:830
+#: articlewidget.cpp:838
 msgid "unnamed"
 msgstr "未命名"
 
-#: articlewidget.cpp:1024
+#: articlewidget.cpp:1032
 msgid ""
 "An error occurred while downloading the article source:\n"
 msgstr ""
 "下载文章源时发生了错误：\n"
 
-#: articlewidget.cpp:1380 kncomposer.cpp:1218
+#: articlewidget.cpp:1389 kncomposer.cpp:1218
 msgid "Select Charset"
 msgstr "选择字符集"
 
@@ -1047,6 +1048,11 @@ msgstr "添加(&D)..."
 msgid "Suggestions"
 msgstr "建议"
 
+#: kncomposer.cpp:2072
+#, fuzzy
+msgid "No Suggestions"
+msgstr "建议"
+
 #: kncomposer.cpp:2498
 msgid "Type"
 msgstr "类型"
@@ -2551,7 +2557,8 @@ msgid " Ready"
 msgstr " 就绪"
 
 #: knmainwidget.cpp:354
-msgid "TDE News Reader"
+#, fuzzy
+msgid "KDE News Reader"
 msgstr "TDE 新闻阅读器"
 
 #: knmainwidget.cpp:552
diff --git a/tde-i18n-zh_CN/messages/tdepim/knotes.po b/tde-i18n-zh_CN/messages/tdepim/knotes.po
index 216485ab53d..a9717e2cfd1 100644
--- a/tde-i18n-zh_CN/messages/tdepim/knotes.po
+++ b/tde-i18n-zh_CN/messages/tdepim/knotes.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: knotes\n"
-"POT-Creation-Date: 2008-01-26 01:19+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-08-03 21:41+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -86,41 +87,41 @@ msgstr "移到桌面"
 msgid "Walk Through Notes"
 msgstr "便笺漫游"
 
-#: knote.cpp:379
+#: knote.cpp:396
 msgid "<qt>Do you really want to delete note <b>%1</b>?</qt>"
 msgstr "<qt>您真要删除便笺 <b>%1</b> 吗？</qt>"
 
-#: knote.cpp:380
+#: knote.cpp:397
 msgid "Confirm Delete"
 msgstr "确认删除"
 
-#: knote.cpp:690
+#: knote.cpp:711
 msgid "Please enter the new name:"
 msgstr "请输入新的名字："
 
-#: knote.cpp:762
+#: knote.cpp:804
 msgid "Send \"%1\""
 msgstr "发送“%1”"
 
-#: knote.cpp:771
+#: knote.cpp:814
 msgid "The host cannot be empty."
 msgstr "主机名不能为空。"
 
-#: knote.cpp:800
+#: knote.cpp:843
 msgid "Unable to start the mail process."
 msgstr "无法启动邮件进程。"
 
-#: knote.cpp:829
+#: knote.cpp:871
 msgid "Save note as plain text"
 msgstr "将便笺另存为纯文本"
 
-#: knote.cpp:844
+#: knote.cpp:890
 msgid ""
 "<qt>A file named <b>%1</b> already exists."
 "<br>Are you sure you want to overwrite it?</qt>"
 msgstr "<qt>已经存在名为 <b>%1</b> 的文件。<br>您确定想要覆盖吗？</qt>"
 
-#: knote.cpp:933
+#: knote.cpp:981
 msgid "&All Desktops"
 msgstr "所有桌面(&A)"
 
@@ -268,79 +269,87 @@ msgstr "端口(&P)："
 msgid "&Style:"
 msgstr "样式(&S)："
 
-#: knoteedit.cpp:69
+#: knoteedit.cpp:71
 msgid "Bold"
 msgstr "粗体"
 
-#: knoteedit.cpp:73
+#: knoteedit.cpp:75
 msgid "Underline"
 msgstr "下划线"
 
-#: knoteedit.cpp:75
+#: knoteedit.cpp:77
 msgid "Strike Out"
 msgstr "删除线"
 
-#: knoteedit.cpp:83
+#: knoteedit.cpp:85
 msgid "Align Left"
 msgstr "左对齐"
 
-#: knoteedit.cpp:87
+#: knoteedit.cpp:89
 msgid "Align Center"
 msgstr "居中对齐"
 
-#: knoteedit.cpp:90
+#: knoteedit.cpp:92
 msgid "Align Right"
 msgstr "右对齐"
 
-#: knoteedit.cpp:93
+#: knoteedit.cpp:95
 msgid "Align Block"
 msgstr "两端对齐"
 
-#: knoteedit.cpp:102
+#: knoteedit.cpp:104
 msgid "List"
 msgstr "列表"
 
-#: knoteedit.cpp:108
+#: knoteedit.cpp:110
 msgid "Superscript"
 msgstr "上标"
 
-#: knoteedit.cpp:111
+#: knoteedit.cpp:113
 msgid "Subscript"
 msgstr "下标"
 
-#: knoteedit.cpp:130
+#: knoteedit.cpp:132
 msgid "Text Color..."
 msgstr "文字颜色..."
 
-#: knoteedit.cpp:133
+#: knoteedit.cpp:135
 msgid "Text Font"
 msgstr "文本字体"
 
-#: knoteedit.cpp:138
+#: knoteedit.cpp:140
 msgid "Text Size"
 msgstr "文本大小"
 
+#: knoteedit.cpp:543
+msgid "Check Spelling..."
+msgstr ""
+
+#: knoteedit.cpp:550
+msgid "Allow Tabulations"
+msgstr ""
+
 #: knotehostdlg.cpp:53
 msgid "Hostname or IP address:"
 msgstr "主机名或 IP 地址："
 
-#: knoteprinter.cpp:117
+#: knoteprinter.cpp:120
 #, c-format
 msgid "Print %1"
 msgstr "打印 %1"
 
-#: knoteprinter.cpp:133
+#: knoteprinter.cpp:136
 #, c-format
 msgid ""
 "_n: Print Note\n"
 "Print %n notes"
 msgstr ""
 
-#: knotesalarm.cpp:74
+#: knotesalarm.cpp:75
 msgid "The following notes triggered alarms:"
 msgstr "下列便笺出发了提醒："
 
-#: knotesalarm.cpp:74
+#: knotesalarm.cpp:75
 msgid "Alarm"
 msgstr "提醒"
 
@@ -372,11 +381,11 @@ msgstr "显示全部便笺"
 msgid "Hide All Notes"
 msgstr "隐藏全部便笺"
 
-#: knotesapp.cpp:544
+#: knotesapp.cpp:567
 msgid "Settings"
 msgstr "设置"
 
-#: knotesapp.cpp:686
+#: knotesapp.cpp:734
 msgid "No Notes"
 msgstr "无便笺"
 
@@ -408,7 +417,8 @@ msgid "Original KNotes Author"
 msgstr "KNotes 原作者"
 
 #: main.cpp:104
-msgid "Ported KNotes to TDE 2"
+#, fuzzy
+msgid "Ported KNotes to KDE 2"
 msgstr "移植 KNotes 到 TDE 2"
 
 #: main.cpp:105
@@ -416,7 +426,8 @@ msgid "Network Interface"
 msgstr "网络接口"
 
 #: main.cpp:106
-msgid "Started TDE Resource Framework Integration"
+#, fuzzy
+msgid "Started KDE Resource Framework Integration"
 msgstr "启动了 TDE 资源框架集成"
 
 #: main.cpp:108
diff --git a/tde-i18n-zh_CN/messages/tdepim/konsolekalendar.po b/tde-i18n-zh_CN/messages/tdepim/konsolekalendar.po
index 54306198fec..6c6519af885 100644
--- a/tde-i18n-zh_CN/messages/tdepim/konsolekalendar.po
+++ b/tde-i18n-zh_CN/messages/tdepim/konsolekalendar.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: konsolekalendar\n"
-"POT-Creation-Date: 2006-06-07 04:03+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-08-03 21:43+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,74 +28,74 @@ msgid ""
 "Your emails"
 msgstr "i18n-translation@lists.linux.net.cn"
 
-#: konsolekalendar.cpp:85
+#: konsolekalendar.cpp:86
 #, c-format
 msgid "Create Calendar <Dry Run>: %1"
 msgstr "创建日历<Dry Run>：%1"
 
-#: konsolekalendar.cpp:95
+#: konsolekalendar.cpp:96
 #, c-format
 msgid "Create Calendar <Verbose>: %1"
 msgstr "创建日历<Verbose>：%1"
 
-#: konsolekalendar.cpp:116
+#: konsolekalendar.cpp:117
 msgid "View Events <Dry Run>:"
 msgstr "查看事件<Dry Run>："
 
-#: konsolekalendar.cpp:144
+#: konsolekalendar.cpp:145
 msgid "View Event <Verbose>:"
 msgstr "查看事件<Verbose>："
 
-#: konsolekalendar.cpp:246
+#: konsolekalendar.cpp:247
 msgid "Sorry, export to HTML by UID is not supported yet"
 msgstr "抱歉，按 UID 导出到 HTML 尚不支持"
 
-#: konsolekalendar.cpp:269
+#: konsolekalendar.cpp:270
 msgid "Events:"
 msgstr "事件："
 
-#: konsolekalendar.cpp:273
+#: konsolekalendar.cpp:274
 #, c-format
 msgid "Events: %1"
 msgstr "事件：%1"
 
-#: konsolekalendar.cpp:276
+#: konsolekalendar.cpp:277
 msgid "Events: %1 - %2"
 msgstr "事件：%1 - %2"
 
-#: konsolekalendar.cpp:436 konsolekalendaradd.cpp:144
+#: konsolekalendar.cpp:437 konsolekalendaradd.cpp:144
 #: konsolekalendarchange.cpp:134 konsolekalendarchange.cpp:161
 #: konsolekalendardelete.cpp:99
 #, c-format
 msgid "  What:  %1"
 msgstr "  内容：%1"
 
-#: konsolekalendar.cpp:440 konsolekalendaradd.cpp:148
+#: konsolekalendar.cpp:441 konsolekalendaradd.cpp:148
 #: konsolekalendarchange.cpp:138 konsolekalendarchange.cpp:165
 #: konsolekalendardelete.cpp:103
 #, c-format
 msgid "  Begin: %1"
 msgstr "  开始：%1"
 
-#: konsolekalendar.cpp:444 konsolekalendaradd.cpp:152
+#: konsolekalendar.cpp:445 konsolekalendaradd.cpp:152
 #: konsolekalendarchange.cpp:142 konsolekalendarchange.cpp:169
 #: konsolekalendardelete.cpp:107
 #, c-format
 msgid "  End:   %1"
 msgstr "  结束：%1"
 
-#: konsolekalendar.cpp:449 konsolekalendaradd.cpp:157
+#: konsolekalendar.cpp:450 konsolekalendaradd.cpp:157
 msgid "  No Time Associated with Event"
 msgstr "  没有与此事件关联的时间"
 
-#: konsolekalendar.cpp:453 konsolekalendaradd.cpp:161
+#: konsolekalendar.cpp:454 konsolekalendaradd.cpp:161
 #: konsolekalendarchange.cpp:146 konsolekalendarchange.cpp:173
 #: konsolekalendardelete.cpp:111
 #, c-format
 msgid "  Desc:  %1"
 msgstr "  描述：%1"
 
-#: konsolekalendar.cpp:457 konsolekalendaradd.cpp:165
+#: konsolekalendar.cpp:458 konsolekalendaradd.cpp:165
 #: konsolekalendarchange.cpp:150 konsolekalendarchange.cpp:177
 #: konsolekalendardelete.cpp:115
 #, c-format
diff --git a/tde-i18n-zh_CN/messages/tdepim/kontact.po b/tde-i18n-zh_CN/messages/tdepim/kontact.po
index b42beb8e3ee..813b97dda74 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kontact.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kontact.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2008-07-24 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-08-03 22:26+0800\n"
 "Last-Translator: Levin <zsdjw@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -59,27 +60,27 @@ msgstr "<p><b>翻译者：</b></p>"
 msgid "%1 License"
 msgstr "%1 许可"
 
-#: src/iconsidepane.cpp:456
+#: src/iconsidepane.cpp:447
 msgid "Icon Size"
 msgstr "图标大小"
 
-#: src/iconsidepane.cpp:457
+#: src/iconsidepane.cpp:448
 msgid "Large"
 msgstr "大"
 
-#: src/iconsidepane.cpp:459
+#: src/iconsidepane.cpp:450
 msgid "Normal"
 msgstr "普通"
 
-#: src/iconsidepane.cpp:461
+#: src/iconsidepane.cpp:452
 msgid "Small"
 msgstr "小"
 
-#: src/iconsidepane.cpp:467
+#: src/iconsidepane.cpp:458
 msgid "Show Icons"
 msgstr "显示图标"
 
-#: src/iconsidepane.cpp:470
+#: src/iconsidepane.cpp:461
 msgid "Show Text"
 msgstr "显示文字"
 
@@ -87,7 +88,7 @@ msgstr "显示文字"
 msgid "kontactconfig"
 msgstr "kontactconfig"
 
-#: src/kcmkontact.cpp:92 src/mainwindow.cpp:292
+#: src/kcmkontact.cpp:92 src/mainwindow.cpp:301
 msgid "TDE Kontact"
 msgstr "TDE Kontact"
 
@@ -95,96 +96,99 @@ msgstr "TDE Kontact"
 msgid "(c), 2003 Cornelius Schumacher"
 msgstr "(c), 2003 Cornelius Schumacher"
 
-#: src/main.cpp:47
+#: src/main.cpp:48
 msgid "TDE personal information manager"
 msgstr "TDE 个人信息管理器"
 
-#: src/main.cpp:125
+#: src/main.cpp:147
 msgid "Kontact"
 msgstr "Kontact"
 
-#: src/main.cpp:126
+#: src/main.cpp:148
 #, fuzzy
-msgid "(C) 2001-2008 The Kontact developers"
+msgid ""
+"(C) 2008-2010 The Trinity Desktop Project\n"
+"(C) 2001-2008 The Kontact developers"
 msgstr "(C) 2001-2004 Kontact 开发者"
 
-#: src/main.cpp:135
+#: src/main.cpp:157
 msgid "Original Author"
 msgstr "原作者"
 
-#: src/mainwindow.cpp:100
+#: src/mainwindow.cpp:101
 #, fuzzy
 msgid "Select Components ..."
 msgstr "选择组件..."
 
-#: src/mainwindow.cpp:260
+#: src/mainwindow.cpp:139
+#, c-format
+msgid "Switch to plugin %1"
+msgstr ""
+
+#: src/mainwindow.cpp:269
 msgid ""
 "<h2 style='text-align:center; margin-top: 0px; margin-bottom: 0px'>%1</h2>"
 msgstr ""
 "<h2 style='text-align:center; margin-top: 0px; margin-bottom: 0px'>%1</h2>"
 
-#: src/mainwindow.cpp:261
+#: src/mainwindow.cpp:270
 msgid "Loading Kontact..."
 msgstr "正在装入 Kontact..."
 
-#: src/mainwindow.cpp:271
+#: src/mainwindow.cpp:280
 msgid " Initializing..."
 msgstr " 正在初始化..."
 
-#: src/mainwindow.cpp:293
+#: src/mainwindow.cpp:302
 msgid "Get Organized!"
 msgstr "打理生活！"
 
-#: src/mainwindow.cpp:294
+#: src/mainwindow.cpp:303
 msgid "The TDE Personal Information Management Suite"
 msgstr "TDE 个人信息管理器套件"
 
-#: src/mainwindow.cpp:328
+#: src/mainwindow.cpp:337
 msgid "New"
 msgstr "新建"
 
-#: src/mainwindow.cpp:337
+#: src/mainwindow.cpp:346
 #, fuzzy
 msgid "Synchronize"
 msgstr "图标大小"
 
-#: src/mainwindow.cpp:341
+#: src/mainwindow.cpp:350
 msgid "Configure Kontact..."
 msgstr "配置 Kontact..."
 
-#: src/mainwindow.cpp:344
+#: src/mainwindow.cpp:353
 #, fuzzy
 msgid "Configure &Profiles..."
 msgstr "配置摘要视图(&C)..."
 
-#: src/mainwindow.cpp:347
+#: src/mainwindow.cpp:356
 msgid "&Kontact Introduction"
 msgstr "&Kontact 容器"
 
-#: src/mainwindow.cpp:349
+#: src/mainwindow.cpp:358
 msgid "&Tip of the Day"
 msgstr "日积月累(&T)"
 
-#: src/mainwindow.cpp:351
-msgid "&Request Feature..."
-msgstr "请求特性(&R)..."
-
-#: src/mainwindow.cpp:683
+#: src/mainwindow.cpp:784
 msgid "Application is running standalone. Foregrounding..."
 msgstr "应用程序正在独立运行。正在转入前台..."
 
-#: src/mainwindow.cpp:695
+#: src/mainwindow.cpp:796
 #, c-format
 msgid "Cannot load part for %1."
 msgstr "无法装入 %1 部件。"
 
-#: src/mainwindow.cpp:749
+#: src/mainwindow.cpp:851
 msgid ""
 "_: Plugin dependent window title\n"
 "%1 - Kontact"
 msgstr "%1 - Kontact"
 
-#: src/mainwindow.cpp:1062
+#: src/mainwindow.cpp:1170
 msgid ""
 "<h2 style='text-align:center; margin-top: 0px;'>Welcome to Kontact %1</h2>"
 "<p>%1</p><table align=\"center\">"
@@ -218,32 +222,32 @@ msgstr ""
 "<br><span id=\"subtext\"><nobr>%1</td></tr></table><p style=\"margin-bottom: "
 "0px\"> <a href=\"%1\">跳过此简介</a></p>"
 
-#: src/mainwindow.cpp:1074
+#: src/mainwindow.cpp:1182
 msgid ""
 "Kontact handles your e-mail, addressbook, calendar, to-do list and more."
 msgstr "Kontact 可处理您的电子邮件、地址簿、日历、待办事宜等内容。"
 
-#: src/mainwindow.cpp:1080
+#: src/mainwindow.cpp:1188
 msgid "Read Manual"
 msgstr "阅读手册"
 
-#: src/mainwindow.cpp:1081
+#: src/mainwindow.cpp:1189
 msgid "Learn more about Kontact and its components"
 msgstr "了解关于 Kontact 及其组件的更多内容"
 
-#: src/mainwindow.cpp:1087
+#: src/mainwindow.cpp:1195
 msgid "Visit Kontact Website"
 msgstr "查看 Kontact 网站"
 
-#: src/mainwindow.cpp:1088
+#: src/mainwindow.cpp:1196
 msgid "Access online resources and tutorials"
 msgstr "访问在线资源和教程"
 
-#: src/mainwindow.cpp:1094
+#: src/mainwindow.cpp:1202
 msgid "Configure Kontact as Groupware Client"
 msgstr "将 Kontact 配置为群件客户"
 
-#: src/mainwindow.cpp:1095
+#: src/mainwindow.cpp:1203
 msgid "Prepare Kontact for use in corporate networks"
 msgstr "在企业网络中采用 Kontact"
 
@@ -365,6 +369,16 @@ msgstr "以图标方式(最小化)启动"
 msgid "List all possible modules and exit"
 msgstr "列出可能的全部模块并退出"
 
+#: interfaces/uniqueapphandler.cpp:191
+#, fuzzy
+msgid "List all possible profiles and exit"
+msgstr "列出可能的全部模块并退出"
+
+#: interfaces/uniqueapphandler.cpp:192
+#, fuzzy
+msgid "Start with a specific Kontact profile"
+msgstr "以指定的 Kontact 模块启动"
+
 #: plugins/akregator/akregator_plugin.cpp:57
 #: plugins/newsticker/kcmkontactknt.cpp:380
 msgid "New Feed..."
@@ -383,15 +397,15 @@ msgstr ""
 msgid "Synchronize Contacts"
 msgstr "查看联系人(&C)"
 
-#: plugins/kaddressbook/kaddressbook_plugin.cpp:160
-#: plugins/korganizer/korganizerplugin.cpp:194
-#: plugins/korganizer/todoplugin.cpp:208
+#: plugins/kaddressbook/kaddressbook_plugin.cpp:159
+#: plugins/korganizer/korganizerplugin.cpp:219
+#: plugins/korganizer/todoplugin.cpp:210
 msgid "Drops of multiple mails are not supported."
 msgstr "不支持丢弃多封邮件。"
 
-#: plugins/kaddressbook/kaddressbook_plugin.cpp:174
-#: plugins/korganizer/korganizerplugin.cpp:211
-#: plugins/korganizer/todoplugin.cpp:226
+#: plugins/kaddressbook/kaddressbook_plugin.cpp:173
+#: plugins/korganizer/korganizerplugin.cpp:236
+#: plugins/korganizer/todoplugin.cpp:228
 msgid "Cannot handle drop events of type '%1'."
 msgstr "无法处理类型“%1”的丢弃事件。"
 
@@ -585,22 +599,28 @@ msgstr "显示全部待办"
 msgid "Show today's to-dos only"
 msgstr "只显示今天的待办"
 
-#: plugins/korganizer/korganizerplugin.cpp:63
+#: plugins/korganizer/korganizerplugin.cpp:67
 msgid "New Event..."
 msgstr "新建事件..."
 
-#: plugins/korganizer/korganizerplugin.cpp:67
+#: plugins/korganizer/korganizerplugin.cpp:71
 #, fuzzy
 msgid "Synchronize Calendar"
 msgstr "活动日历"
 
-#: plugins/korganizer/korganizerplugin.cpp:179
-#: plugins/korganizer/todoplugin.cpp:180
+#: plugins/korganizer/korganizerplugin.cpp:184
+#: plugins/korganizer/todoplugin.cpp:176
 msgid "Meeting"
 msgstr "会议"
 
-#: plugins/korganizer/korganizerplugin.cpp:197
-#: plugins/korganizer/todoplugin.cpp:211
+#: plugins/korganizer/korganizerplugin.cpp:198
+#: plugins/korganizer/todoplugin.cpp:190
+#, fuzzy, c-format
+msgid "Note: %1"
+msgstr "读取便笺：“%1”"
+
+#: plugins/korganizer/korganizerplugin.cpp:222
+#: plugins/korganizer/todoplugin.cpp:213
 msgid ""
 "From: %1\n"
 "To: %2\n"
@@ -610,8 +630,8 @@ msgstr ""
 "寄往：%2\n"
 "主题：%3"
 
-#: plugins/korganizer/korganizerplugin.cpp:205
-#: plugins/korganizer/todoplugin.cpp:220
+#: plugins/korganizer/korganizerplugin.cpp:230
+#: plugins/korganizer/todoplugin.cpp:222
 #, c-format
 msgid "Mail: %1"
 msgstr "邮件：%1"
@@ -621,38 +641,38 @@ msgstr "邮件：%1"
 msgid "Calendar"
 msgstr "活动日历"
 
-#: plugins/korganizer/summarywidget.cpp:173
+#: plugins/korganizer/summarywidget.cpp:164
 #: plugins/specialdates/sdsummarywidget.cpp:445
 msgid "Today"
 msgstr "今日"
 
-#: plugins/korganizer/summarywidget.cpp:177
+#: plugins/korganizer/summarywidget.cpp:168
 #: plugins/specialdates/sdsummarywidget.cpp:447
 msgid "Tomorrow"
 msgstr "明天"
 
-#: plugins/korganizer/summarywidget.cpp:236
+#: plugins/korganizer/summarywidget.cpp:227
 msgid ""
 "_: Time from - to\n"
 "%1 - %2"
 msgstr "%1 - %2"
 
-#: plugins/korganizer/summarywidget.cpp:252
+#: plugins/korganizer/summarywidget.cpp:243
 #, c-format
 msgid ""
 "_n: No appointments pending within the next day\n"
 "No appointments pending within the next %n days"
 msgstr "%n 天内没有推迟的约会"
 
-#: plugins/korganizer/summarywidget.cpp:281
+#: plugins/korganizer/summarywidget.cpp:272
 msgid "&Edit Appointment..."
 msgstr "编辑约会(&E)..."
 
-#: plugins/korganizer/summarywidget.cpp:283
+#: plugins/korganizer/summarywidget.cpp:274
 msgid "&Delete Appointment"
 msgstr "删除约会(&D)"
 
-#: plugins/korganizer/summarywidget.cpp:300
+#: plugins/korganizer/summarywidget.cpp:291
 msgid "Edit Appointment: \"%1\""
 msgstr "编辑约会：“%1”"
 
@@ -664,49 +684,44 @@ msgstr "新建待办事宜..."
 msgid "Synchronize To-do List"
 msgstr ""
 
-#: plugins/korganizer/todoplugin.cpp:192
-#, fuzzy, c-format
-msgid "Note: %1"
-msgstr "读取便笺：“%1”"
-
 #: plugins/korganizer/todosummarywidget.cpp:63
 #, fuzzy
 msgid "To-do"
 msgstr "待办"
 
-#: plugins/korganizer/todosummarywidget.cpp:117
+#: plugins/korganizer/todosummarywidget.cpp:116
 msgid "overdue"
 msgstr "过期"
 
-#: plugins/korganizer/todosummarywidget.cpp:125
+#: plugins/korganizer/todosummarywidget.cpp:124
 msgid "in progress"
 msgstr "进行中"
 
-#: plugins/korganizer/todosummarywidget.cpp:131
+#: plugins/korganizer/todosummarywidget.cpp:130
 msgid "starts today"
 msgstr "今天开始"
 
-#: plugins/korganizer/todosummarywidget.cpp:137
+#: plugins/korganizer/todosummarywidget.cpp:136
 msgid "ends today"
 msgstr "今天结束"
 
-#: plugins/korganizer/todosummarywidget.cpp:188
+#: plugins/korganizer/todosummarywidget.cpp:187
 msgid "No to-dos pending"
 msgstr "没有推迟的待办事项"
 
-#: plugins/korganizer/todosummarywidget.cpp:230
+#: plugins/korganizer/todosummarywidget.cpp:229
 msgid "&Edit To-do..."
 msgstr "编辑待办事宜(&E)..."
 
-#: plugins/korganizer/todosummarywidget.cpp:232
+#: plugins/korganizer/todosummarywidget.cpp:231
 msgid "&Delete To-do"
 msgstr "删除待办事宜(&D)"
 
-#: plugins/korganizer/todosummarywidget.cpp:236
+#: plugins/korganizer/todosummarywidget.cpp:235
 msgid "&Mark To-do Completed"
 msgstr "标为已办事宜(&M)"
 
-#: plugins/korganizer/todosummarywidget.cpp:257
+#: plugins/korganizer/todosummarywidget.cpp:256
 msgid "Edit To-do: \"%1\""
 msgstr "编辑待办：“%1”"
 
@@ -807,7 +822,7 @@ msgstr "不能打开 Hotsync 日志 %1 。"
 msgid "New News Feed"
 msgstr "新建新闻提供者"
 
-#: plugins/knotes/knotes_part_p.h:136 plugins/newsticker/kcmkontactknt.cpp:66
+#: plugins/knotes/knotes_part_p.h:137 plugins/newsticker/kcmkontactknt.cpp:66
 msgid "Name:"
 msgstr "名称："
 
@@ -894,7 +909,7 @@ msgid "Copy URL to Clipboard"
 msgstr "将 URL 复制到剪贴板"
 
 #: plugins/specialdates/kcmsdsummary.cpp:90
-#: plugins/specialdates/specialdates_plugin.cpp:59
+#: plugins/specialdates/specialdates_plugin.cpp:61
 msgid "Special Dates Summary"
 msgstr "特殊日期摘要"
 
@@ -948,19 +963,19 @@ msgstr "默认 KOrganizer 资源"
 msgid "Active Calendar"
 msgstr "活动日历"
 
-#: plugins/specialdates/sdsummarywidget.cpp:289
+#: plugins/specialdates/sdsummarywidget.cpp:290
 msgid "BIRTHDAY"
 msgstr "生日"
 
-#: plugins/specialdates/sdsummarywidget.cpp:304
+#: plugins/specialdates/sdsummarywidget.cpp:305
 msgid "ANNIVERSARY"
 msgstr "纪念日"
 
-#: plugins/specialdates/sdsummarywidget.cpp:319
+#: plugins/specialdates/sdsummarywidget.cpp:320
 msgid "HOLIDAY"
 msgstr "假日"
 
-#: plugins/specialdates/sdsummarywidget.cpp:337
+#: plugins/specialdates/sdsummarywidget.cpp:338
 msgid "SPECIAL OCCASION"
 msgstr "特殊情况"
 
@@ -1017,12 +1032,13 @@ msgstr "查看联系人(&C)"
 msgid "Mail to:\"%1\""
 msgstr "邮寄到：“%1”"
 
-#: plugins/specialdates/specialdates_plugin.cpp:61
+#: plugins/specialdates/specialdates_plugin.cpp:63
 msgid "Kontact Special Dates Summary"
 msgstr "Kontact 特殊日期摘要"
 
-#: plugins/specialdates/specialdates_plugin.cpp:63
-msgid "(c) 2004-2005 The TDE PIM Team"
+#: plugins/specialdates/specialdates_plugin.cpp:65
+#, fuzzy
+msgid "(c) 2004-2005 The KDE PIM Team"
 msgstr "(C) 2004-2005 TDE PIM 团队"
 
 #: plugins/summary/kcmkontactsummary.cpp:98
@@ -1059,15 +1075,15 @@ msgstr "接下来..."
 msgid "Synchronize All"
 msgstr ""
 
-#: plugins/summary/summaryview_plugin.cpp:109
+#: plugins/summary/summaryview_plugin.cpp:112
 msgid "Kontact Summary"
 msgstr "Kontact 摘要"
 
-#: plugins/summary/summaryview_plugin.cpp:111
+#: plugins/summary/summaryview_plugin.cpp:114
 msgid "Kontact Summary View"
 msgstr "Kontact 摘要视图"
 
-#: plugins/summary/summaryview_plugin.cpp:113
+#: plugins/summary/summaryview_plugin.cpp:116
 msgid "(c) 2003 The Kontact developers"
 msgstr "(C) 2003 Kontact 开发者"
 
@@ -1107,7 +1123,7 @@ msgstr "天气信息"
 msgid "Improvements and more code cleanups"
 msgstr "改进和代码清整"
 
-#: plugins/knotes/knotes_part_p.h:121
+#: plugins/knotes/knotes_part_p.h:122
 msgid "Edit Note"
 msgstr "编辑便笺"
 
@@ -1123,6 +1139,9 @@ msgid ""
 "Your emails"
 msgstr "i18n-translation@lists.linux.net.cn"
 
+#~ msgid "&Request Feature..."
+#~ msgstr "请求特性(&R)..."
+
 #~ msgid "New Messages"
 #~ msgstr "新建信件"
 
diff --git a/tde-i18n-zh_CN/messages/tdepim/korganizer.po b/tde-i18n-zh_CN/messages/tdepim/korganizer.po
index f7e6ede5a47..49ce887b831 100644
--- a/tde-i18n-zh_CN/messages/tdepim/korganizer.po
+++ b/tde-i18n-zh_CN/messages/tdepim/korganizer.po
@@ -8,43 +8,30 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: korganizer\n"
-"POT-Creation-Date: 2008-08-19 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-12-03 22:29+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Translator: Wang Jian <lark@linux.net.cn>\n"
 "X-Generator: KBabel 1.0\n"
 
-#: actionmanager.cpp:467 actionmanager.cpp:1447 actionmanager.cpp:1475
-#: koeventpopupmenu.cpp:52 kotodoview.cpp:453
-msgid "&Show"
-msgstr "显示(&S)"
-
-#: actionmanager.cpp:470 actionmanager.cpp:1448 actionmanager.cpp:1476
-#: koeventpopupmenu.cpp:54 kotodoview.cpp:455 resourceview.cpp:599
-msgid "&Edit..."
-msgstr "编辑(&E)..."
-
-#: koeventpopupmenu.cpp:76
-msgid "&Toggle Reminder"
-msgstr "切换提醒(&T)"
-
-#: koeventpopupmenu.cpp:81
-msgid "&Dissociate This Occurrence"
-msgstr "拆分本次重现(&D)"
-
-#: koeventpopupmenu.cpp:84
-msgid "&Dissociate Future Occurrences"
-msgstr "拆分未来的重现(&D)"
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "TDE 简体中文翻译组"
 
-#: koeventpopupmenu.cpp:88
-msgid "Send as iCalendar..."
-msgstr "发送为 &iCalendar..."
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "i18n-translation@lists.linux.net.cn"
 
-#: koeditordetails.cpp:194
+#: koeditordetails.cpp:192
 msgid ""
 "Displays information about current attendees. To edit an attendee, select it in "
 "this list and modify the values in the area below. Clicking on a column title "
@@ -53,90 +40,1308 @@ msgid ""
 msgstr ""
 
 #. i18n: file publishdialog_base.ui line 28
-#: koeditordetails.cpp:201 koprefsdialog.cpp:1063 rc.cpp:417 rc.cpp:1859
+#: koeditordetails.cpp:199 koprefsdialog.cpp:1106 rc.cpp:420 rc.cpp:2162
 #, no-c-format
 msgid "Name"
 msgstr "名字"
 
-#. i18n: file koeditoralarms_base.ui line 282
-#: koeditoralarms.cpp:89 koeditordetails.cpp:202 koprefsdialog.cpp:865
-#: rc.cpp:223 rc.cpp:420 rc.cpp:1862 rc.cpp:1937
+#. i18n: file koeditoralarms_base.ui line 288
+#: koeditoralarms.cpp:119 koeditordetails.cpp:200 koprefsdialog.cpp:903
+#: rc.cpp:223 rc.cpp:423 rc.cpp:2120 rc.cpp:2165
 #, no-c-format
 msgid "Email"
 msgstr "电子邮件"
 
-#: koeditordetails.cpp:203
+#: koeditordetails.cpp:201
 msgid "Role"
 msgstr "角色"
 
-#: koeditordetails.cpp:204
+#: koeditordetails.cpp:202
 msgid "Status"
 msgstr "状态"
 
-#: koeditordetails.cpp:205
+#: koeditordetails.cpp:203
 msgid "RSVP"
 msgstr "恳请回复"
 
-#: koeditordetails.cpp:206
+#: koeditordetails.cpp:204
 #, fuzzy
 msgid "Delegated to"
 msgstr "删除待办事宜"
 
-#: koeditordetails.cpp:207
+#: koeditordetails.cpp:205
 #, fuzzy
 msgid "Delegated from"
 msgstr "删除待办事宜"
 
-#: koeditordetails.cpp:311 koeditorfreebusy.cpp:760
+#: koeditordetails.cpp:331 koeditorfreebusy.cpp:785
 msgid ""
 "%1 does not look like a valid email address. Are you sure you want to invite "
 "this participant?"
 msgstr "%1 似乎不是有效的电子邮件地址。您确定想要邀请此人参与吗？"
 
-#: koeditordetails.cpp:313 koeditorfreebusy.cpp:762
+#: koeditordetails.cpp:333 koeditorfreebusy.cpp:787
 msgid "Invalid email address"
 msgstr "无效的电子邮件地址"
 
-#: koviewmanager.cpp:334
-msgid "Merged calendar"
-msgstr "已合并日历"
+#: koprefs.cpp:87
+msgid ""
+"_: Default export file\n"
+"calendar.html"
+msgstr "calendar.html"
 
-#: koviewmanager.cpp:336
-msgid "Calendars Side by Side"
-msgstr "并列日历"
+#: koprefs.cpp:162
+msgid "Appointment"
+msgstr "约会"
 
-#: filtereditdialog.cpp:51
-msgid "Edit Calendar Filters"
-msgstr "编辑日历过滤"
+#: koprefs.cpp:162
+msgid "Business"
+msgstr "公事"
 
-#: filtereditdialog.cpp:99
-msgid "Press this button to define a new filter."
-msgstr "按此按钮可定义新过滤器"
+#: koprefs.cpp:163
+msgid "Meeting"
+msgstr "会议"
 
-#: filtereditdialog.cpp:100
-msgid "Press this button to remove the currently active filter."
-msgstr "按此按钮可删除目前突出显示的过滤器。"
+#: koprefs.cpp:163
+msgid "Phone Call"
+msgstr "电话"
 
-#: filtereditdialog.cpp:189
+#: koprefs.cpp:163
+msgid "Education"
+msgstr "教育"
+
+#: koprefs.cpp:164 printing/calprintpluginbase.cpp:286
+msgid "Holiday"
+msgstr "假日"
+
+#: koprefs.cpp:164
+msgid "Vacation"
+msgstr "休假"
+
+#: koprefs.cpp:164
+msgid "Special Occasion"
+msgstr "特殊场合"
+
+#: koprefs.cpp:165
+msgid "Personal"
+msgstr "个人的"
+
+#: koprefs.cpp:165
+msgid "Travel"
+msgstr "旅游"
+
+#: koprefs.cpp:166
+msgid "Birthday"
+msgstr "生日"
+
+#: koeventviewer.cpp:63
+msgid "Open the message in KMail"
+msgstr ""
+
+#: koeventviewer.cpp:65
 #, c-format
-msgid "New Filter %1"
-msgstr "新过滤器 %1"
+msgid "Send an email message to %1"
+msgstr ""
 
-#: filtereditdialog.cpp:201 koeditorattachments.cpp:377 koeventeditor.cpp:381
-#: kotodoeditor.cpp:327
-msgid "This item will be permanently deleted."
-msgstr "该项目将被永久地删除。"
+#: koeventviewer.cpp:67
+msgid "Lookup the contact in KAddressbook"
+msgstr ""
 
-#: filtereditdialog.cpp:201
-msgid "Delete Confirmation"
-msgstr "删除确认"
+#: koeventviewer.cpp:73
+#, fuzzy
+msgid "View attachment \"%1\""
+msgstr "编辑附件"
+
+#: koeventviewer.cpp:76
+msgid "Launch a viewer on the link"
+msgstr ""
+
+#: koeventviewer.cpp:175
+#, fuzzy
+msgid "Open Attachment"
+msgstr "编辑附件"
+
+#: koeventviewer.cpp:176
+#, fuzzy
+msgid "Save Attachment As..."
+msgstr "删除附件"
+
+#: koeventviewerdialog.cpp:33
+msgid "Event Viewer"
+msgstr "事件查看器"
+
+#: aboutdata.cpp:32
+msgid "KOrganizer"
+msgstr "KOrganizer"
+
+#: aboutdata.cpp:33
+msgid "A Personal Organizer for TDE"
+msgstr "TDE 的个人助理"
+
+#: aboutdata.cpp:41
+#, fuzzy
+msgid "Current Developer/Maintainer"
+msgstr "目前维护者"
+
+#: aboutdata.cpp:43
+#, fuzzy
+msgid "Previous maintainer"
+msgstr "上一月"
+
+#: aboutdata.cpp:45
+msgid "Co-Maintainer"
+msgstr "联合维护者"
+
+#: aboutdata.cpp:47
+msgid "Original Author"
+msgstr "原作者"
+
+#: kdatenavigator.cpp:190
+msgid ""
+"_: start/end week number of line in date picker\n"
+"%1/%2"
+msgstr "%1/%2"
+
+#: kotodoviewitem.cpp:140
+msgid "--"
+msgstr "--"
+
+#: koeditorgeneraljournal.cpp:63
+msgid "Sets the title of this journal."
+msgstr "设定此日记的标题。"
+
+#: koeditorgeneral.cpp:108 koeditorgeneraljournal.cpp:64
+msgid "T&itle:"
+msgstr "标题(&I)："
+
+#: koeditorgeneraljournal.cpp:83
+msgid "&Date:"
+msgstr "日期(&D)："
+
+#: koeditorgeneraljournal.cpp:92
+msgid "&Time: "
+msgstr "时间(&T)："
+
+#: koeditorgeneraljournal.cpp:198
+msgid "Please specify a valid date, for example '%1'."
+msgstr "请指定一个有效日期，如“%1”。"
+
+#: plugins/datenums/configdialog.cpp:38
+msgid "Configure Day Numbers"
+msgstr "配置日编号"
+
+#: plugins/datenums/configdialog.cpp:45
+msgid "Show Date Number"
+msgstr "显示日编号"
+
+#: plugins/datenums/configdialog.cpp:48
+msgid "Show day number"
+msgstr "显示日编号"
+
+#: plugins/datenums/configdialog.cpp:49
+msgid "Show days to end of year"
+msgstr "显示至每年的结束"
+
+#: plugins/datenums/configdialog.cpp:50
+msgid "Show both"
+msgstr "全部显示"
+
+#: plugins/datenums/datenums.cpp:59
+msgid ""
+"_: dayOfYear / daysTillEndOfYear\n"
+"%1 / %2"
+msgstr "%1 / %2"
+
+#: plugins/datenums/datenums.cpp:71
+msgid "This plugin provides numbers of days and weeks."
+msgstr "这个插件提供日数和周数。"
+
+#: plugins/hebrew/configdialog.cpp:29
+msgid "Configure Holidays"
+msgstr "配置假日"
+
+#: plugins/hebrew/configdialog.cpp:37
+msgid "Use Israeli holidays"
+msgstr "使用伊斯兰假日"
+
+#: plugins/hebrew/configdialog.cpp:41
+msgid "Show weekly parsha"
+msgstr "显示每周 Parsha"
+
+#: plugins/hebrew/configdialog.cpp:45
+msgid "Show day of Omer"
+msgstr "显示 Omer 日"
+
+#: plugins/hebrew/configdialog.cpp:49
+msgid "Show Chol HaMoed"
+msgstr "显示 Chol HaMoed"
+
+#: plugins/hebrew/holiday.cpp:63
+msgid ""
+"_: These are Jewish holidays and mostly do not have translations. They may have "
+"different spellings in your language; otherwise, just translate the sound to "
+"your characters\n"
+"Sh. HaHodesh"
+msgstr "Sh. HaHodesh"
+
+#: plugins/hebrew/holiday.cpp:69
+msgid "Erev Pesach"
+msgstr "Erev Pesach"
+
+#: plugins/hebrew/holiday.cpp:79
+msgid "Sh. HaGadol"
+msgstr "Sh. HaGadol"
+
+#: plugins/hebrew/holiday.cpp:87
+msgid "Pesach"
+msgstr "Pesach"
+
+#: plugins/hebrew/holiday.cpp:98 plugins/hebrew/holiday.cpp:262
+msgid "Chol Hamoed"
+msgstr "Chol Hamoed"
+
+#: plugins/hebrew/holiday.cpp:103
+msgid "Yom HaShoah"
+msgstr "Yom HaShoah"
+
+#: plugins/hebrew/holiday.cpp:127 plugins/hebrew/holiday.cpp:133
+#: plugins/hebrew/holiday.cpp:144
+msgid "Yom HaAtzmaut"
+msgstr "Yom HaAtzmaut"
+
+#: plugins/hebrew/holiday.cpp:129 plugins/hebrew/holiday.cpp:142
+msgid "Yom HaZikaron"
+msgstr "Yom HaZikaron"
+
+#: plugins/hebrew/holiday.cpp:151
+msgid "Yom Yerushalayim"
+msgstr "Yom Yerushalayim"
+
+#: plugins/hebrew/holiday.cpp:154
+msgid "Lag BaOmer"
+msgstr "Lag BaOmer"
+
+#: plugins/hebrew/holiday.cpp:179
+msgid "Erev Shavuot"
+msgstr "Erev Shavuot"
+
+#: plugins/hebrew/holiday.cpp:184
+msgid "Shavuot"
+msgstr "Shavuot"
+
+#: plugins/hebrew/holiday.cpp:193
+msgid "Tzom Tammuz"
+msgstr "Tzom Tammuz"
+
+#: plugins/hebrew/holiday.cpp:200
+msgid "Sh. Hazon"
+msgstr "Sh. Hazon"
+
+#: plugins/hebrew/holiday.cpp:202
+msgid "Sh. Nahamu"
+msgstr "Sh. Nahamu"
+
+#: plugins/hebrew/holiday.cpp:206
+msgid "Tisha B'Av"
+msgstr "Tisha B'Av"
+
+#: plugins/hebrew/holiday.cpp:211
+msgid "S'lichot"
+msgstr "S'lichot"
+
+#: plugins/hebrew/holiday.cpp:213
+msgid "Erev R.H."
+msgstr "Erev R.H."
+
+#: plugins/hebrew/holiday.cpp:221
+msgid "Rosh Hashana"
+msgstr "Rosh Hashana"
+
+#: plugins/hebrew/holiday.cpp:225 plugins/hebrew/holiday.cpp:238
+msgid "Sh. Shuvah"
+msgstr "Sh. Shuvah"
+
+#: plugins/hebrew/holiday.cpp:227 plugins/hebrew/holiday.cpp:231
+msgid "Tzom Gedalia"
+msgstr "Tzom Gedalia"
+
+#: plugins/hebrew/holiday.cpp:241
+msgid "Erev Y.K."
+msgstr "Erev Y.K."
+
+#: plugins/hebrew/holiday.cpp:244
+msgid "Yom Kippur"
+msgstr "Yom Kippur"
+
+#: plugins/hebrew/holiday.cpp:247
+msgid "Erev Sukkot"
+msgstr "Erev Sukkot"
+
+#: plugins/hebrew/holiday.cpp:253
+msgid "Sukkot"
+msgstr "Sukkot"
+
+#: plugins/hebrew/holiday.cpp:265
+msgid "Hoshana Rabah"
+msgstr "Hoshana Rabah"
+
+#: plugins/hebrew/holiday.cpp:268
+msgid "Shmini Atzeret"
+msgstr "Shmini Atzeret"
+
+#: plugins/hebrew/holiday.cpp:272
+msgid "Simchat Torah"
+msgstr "Simchat Torah"
+
+#: plugins/hebrew/holiday.cpp:281
+msgid "Erev Hanukah"
+msgstr "Erev Hanukah"
+
+#: plugins/hebrew/holiday.cpp:283 plugins/hebrew/holiday.cpp:289
+msgid "Hanukah"
+msgstr "Hanukah"
+
+#: plugins/hebrew/holiday.cpp:293
+msgid "Tzom Tevet"
+msgstr "Tzom Tevet"
+
+#: plugins/hebrew/holiday.cpp:304 plugins/hebrew/holiday.cpp:312
+#: plugins/hebrew/holiday.cpp:316 plugins/hebrew/holiday.cpp:320
+msgid "Sh. Shirah"
+msgstr "Sh. Shirah"
+
+#: plugins/hebrew/holiday.cpp:317
+msgid "Tu B'Shvat"
+msgstr "Tu B'Shvat"
+
+#: plugins/hebrew/holiday.cpp:330 plugins/hebrew/holiday.cpp:341
+#: plugins/hebrew/holiday.cpp:349
+msgid "Sh. Shekalim"
+msgstr "Sh. Shekalim"
+
+#: plugins/hebrew/holiday.cpp:338
+msgid "Purim Katan"
+msgstr "Purim Katan"
+
+#: plugins/hebrew/holiday.cpp:356 plugins/hebrew/holiday.cpp:373
+msgid "Ta'anit Ester"
+msgstr "Ta'anit Ester"
+
+#: plugins/hebrew/holiday.cpp:364 plugins/hebrew/holiday.cpp:368
+msgid "Sh. Zachor"
+msgstr "Sh. Zachor"
+
+#: plugins/hebrew/holiday.cpp:370
+msgid "Erev Purim"
+msgstr "Erev Purim"
+
+#: plugins/hebrew/holiday.cpp:376
+msgid "Purim"
+msgstr "Purim"
+
+#: plugins/hebrew/holiday.cpp:380 plugins/hebrew/holiday.cpp:384
+msgid "Shushan Purim"
+msgstr "Shushan Purim"
+
+#: plugins/hebrew/holiday.cpp:394
+msgid "Sh. Parah"
+msgstr "Sh. Parah"
+
+#: plugins/hebrew/holiday.cpp:403
+msgid "Sh. HaHodesh"
+msgstr "Sh. HaHodesh"
+
+#: plugins/hebrew/holiday.cpp:428
+msgid " Omer"
+msgstr " Omer"
+
+#: plugins/hebrew/parsha.cpp:33
+msgid ""
+"_: These are weekly readings and do not have translations. They may have "
+"different spellings in your language; otherwise, just translate the sound to "
+"your characters\n"
+"Bereshit"
+msgstr "Bereshit"
+
+#: plugins/hebrew/parsha.cpp:33
+msgid "Noach"
+msgstr "Noach"
+
+#: plugins/hebrew/parsha.cpp:33
+msgid "Lech L'cha"
+msgstr "Lech L'cha"
+
+#: plugins/hebrew/parsha.cpp:34
+msgid "Vayera"
+msgstr "Vayera"
+
+#: plugins/hebrew/parsha.cpp:34
+msgid "Chaye Sarah"
+msgstr "Chaye Sarah"
+
+#: plugins/hebrew/parsha.cpp:34
+msgid "Toldot"
+msgstr "Toldot"
+
+#: plugins/hebrew/parsha.cpp:35
+msgid "Vayetze"
+msgstr "Vayetze"
+
+#: plugins/hebrew/parsha.cpp:35
+msgid "Vayishlach"
+msgstr "Vayishlach"
+
+#: plugins/hebrew/parsha.cpp:35
+msgid "Vayeshev"
+msgstr "Vayeshev"
+
+#: plugins/hebrew/parsha.cpp:36
+msgid "Miketz"
+msgstr "Miketz"
+
+#: plugins/hebrew/parsha.cpp:36
+msgid "Vayigash"
+msgstr "Vayigash"
+
+#: plugins/hebrew/parsha.cpp:36
+msgid "Vayechi"
+msgstr "Vayechi"
+
+#: plugins/hebrew/parsha.cpp:37
+msgid "Shemot"
+msgstr "Shemot"
+
+#: plugins/hebrew/parsha.cpp:37
+msgid "Vaera"
+msgstr "Vaera"
+
+#: plugins/hebrew/parsha.cpp:37
+msgid "Bo"
+msgstr "Bo"
+
+#: plugins/hebrew/parsha.cpp:37
+msgid "Beshalach"
+msgstr "Beshalach"
+
+#: plugins/hebrew/parsha.cpp:38
+msgid "Yitro"
+msgstr "Yitro"
+
+#: plugins/hebrew/parsha.cpp:38
+msgid "Mishpatim"
+msgstr "Mishpatim"
+
+#: plugins/hebrew/parsha.cpp:38
+msgid "Terumah"
+msgstr "Terumah"
+
+#: plugins/hebrew/parsha.cpp:39
+msgid "Tetzaveh"
+msgstr "Tetzaveh"
+
+#: plugins/hebrew/parsha.cpp:39
+msgid "Ki Tisa"
+msgstr "Ki Tisa"
+
+#: plugins/hebrew/parsha.cpp:39
+msgid "Vayakhel"
+msgstr "Vayakhel"
+
+#: plugins/hebrew/parsha.cpp:40
+msgid "Pekudei"
+msgstr "Pekudei"
+
+#: plugins/hebrew/parsha.cpp:40
+msgid "Vayikra"
+msgstr "Vayikra"
+
+#: plugins/hebrew/parsha.cpp:40
+msgid "Tzav"
+msgstr "Tzav"
+
+#: plugins/hebrew/parsha.cpp:41
+msgid "Shemini"
+msgstr "Shemini"
+
+#: plugins/hebrew/parsha.cpp:41
+msgid "Tazria"
+msgstr "Tazria"
+
+#: plugins/hebrew/parsha.cpp:41
+msgid "Metzora"
+msgstr "Metzora"
+
+#: plugins/hebrew/parsha.cpp:42
+msgid "Acharei Mot"
+msgstr "Acharei Mot"
+
+#: plugins/hebrew/parsha.cpp:42
+msgid "Kedoshim"
+msgstr "Kedoshim"
+
+#: plugins/hebrew/parsha.cpp:42
+msgid "Emor"
+msgstr "Emor"
+
+#: plugins/hebrew/parsha.cpp:43
+msgid "Behar"
+msgstr "Behar"
+
+#: plugins/hebrew/parsha.cpp:43
+msgid "Bechukotai"
+msgstr "Bechukotai"
+
+#: plugins/hebrew/parsha.cpp:43
+msgid "Bemidbar"
+msgstr "Bemidbar"
+
+#: plugins/hebrew/parsha.cpp:44
+msgid "Naso"
+msgstr "Naso"
+
+#: plugins/hebrew/parsha.cpp:44
+msgid "Behaalotcha"
+msgstr "Behaalotcha"
+
+#: plugins/hebrew/parsha.cpp:44
+msgid "Shelach"
+msgstr "Shelach"
+
+#: plugins/hebrew/parsha.cpp:45
+msgid "Korach"
+msgstr "Korach"
+
+#: plugins/hebrew/parsha.cpp:45
+msgid "Chukat"
+msgstr "Chukat"
+
+#: plugins/hebrew/parsha.cpp:45
+msgid "Balak"
+msgstr "Balak"
+
+#: plugins/hebrew/parsha.cpp:46
+msgid "Pinchas"
+msgstr "Pinchas"
+
+#: plugins/hebrew/parsha.cpp:46
+msgid "Matot"
+msgstr "Matot"
+
+#: plugins/hebrew/parsha.cpp:46
+msgid "Masei"
+msgstr "Masei"
+
+#: plugins/hebrew/parsha.cpp:47
+msgid "Devarim"
+msgstr "Devarim"
+
+#: plugins/hebrew/parsha.cpp:47
+msgid "Vaetchanan"
+msgstr "Vaetchanan"
+
+#: plugins/hebrew/parsha.cpp:47
+msgid "Ekev"
+msgstr "Ekev"
+
+#: plugins/hebrew/parsha.cpp:48
+msgid "Reeh"
+msgstr "Reeh"
+
+#: plugins/hebrew/parsha.cpp:48
+msgid "Shoftim"
+msgstr "Shoftim"
+
+#: plugins/hebrew/parsha.cpp:48
+msgid "Ki Tetze"
+msgstr "Ki Tetze"
+
+#: plugins/hebrew/parsha.cpp:49
+msgid "Ki Tavo"
+msgstr "Ki Tavo"
+
+#: plugins/hebrew/parsha.cpp:49
+msgid "Nitzavim"
+msgstr "Nitzavim"
+
+#: plugins/hebrew/parsha.cpp:49
+msgid "Vayelech"
+msgstr "Vayelech"
+
+#: plugins/hebrew/parsha.cpp:50
+msgid "Haazinu"
+msgstr "Haazinu"
+
+#: plugins/hebrew/hebrew.cpp:103
+msgid "This plugin provides the date in the Jewish calendar."
+msgstr "这个插件提供了犹太教日历中的日期。"
+
+#: plugins/printing/journal/journalprint.h:43
+msgid "Print &journal"
+msgstr "打印日记(&J)"
+
+#: plugins/printing/journal/journalprint.h:44
+msgid "Prints all journals for a given date range"
+msgstr "打印给定日期范围中的全部日记"
+
+#: plugins/printing/journal/journalprint.cpp:130
+msgid "Journal entries"
+msgstr "日记项"
+
+#: plugins/printing/whatsnext/whatsnextprint.h:42
+msgid "Print What's Next"
+msgstr "打印下面什么事"
+
+#: plugins/printing/whatsnext/whatsnextprint.h:43
+msgid "Prints a list of all upcoming events and todos."
+msgstr "打印即将到来的事件和待办。"
+
+#: plugins/printing/list/listprint.h:42
+msgid "Print list"
+msgstr "打印列表"
+
+#: plugins/printing/list/listprint.h:43
+msgid "Prints a list of events and to-dos"
+msgstr "打印事件和待办列表"
+
+#: plugins/printing/year/yearprint.h:42
+msgid "Print &Year"
+msgstr "打印全年(&Y)"
+
+#: plugins/printing/year/yearprint.h:43
+msgid "Prints a calendar for an entire year"
+msgstr "打印整年的日历"
+
+#: kowhatsnextview.cpp:283 plugins/printing/year/yearprint.cpp:175
+msgid ""
+"_: date from - to\n"
+"%1 - %2"
+msgstr "%1 - %2"
+
+#: plugins/printing/year/yearprint.cpp:177
+msgid ""
+"_: date from -\n"
+"to\n"
+"%1 -\n"
+"%2"
+msgstr "%1 - %2"
+
+#: plugins/exchange/exchange.cpp:109 plugins/exchange/exchange.cpp:145
+#: plugins/exchange/exchange.cpp:148 plugins/exchange/exchange.cpp:164
+#: plugins/exchange/exchange.cpp:168 plugins/exchange/exchange.cpp:222
+#: plugins/exchange/exchange.cpp:224 plugins/exchange/exchangeconfig.cpp:35
+#: plugins/exchange/exchangedialog.cpp:34
+msgid "Exchange Plugin"
+msgstr "Exchange 插件"
+
+#: plugins/exchange/exchangedialog.cpp:39
+msgid "Start date:"
+msgstr "起始日期："
+
+#: plugins/exchange/exchangedialog.cpp:46
+msgid "End date:"
+msgstr "结束日期："
+
+#: plugins/exchange/exchange.cpp:72
+msgid "&Download..."
+msgstr "下载(&D)..."
+
+#: plugins/exchange/exchange.cpp:75
+msgid "&Upload Event..."
+msgstr "上传事件(&U)..."
+
+#: plugins/exchange/exchange.cpp:83
+msgid "De&lete Event"
+msgstr "删除事件(&L)"
+
+#: plugins/exchange/exchange.cpp:89
+msgid "&Configure..."
+msgstr "配置(&C)..."
+
+#: plugins/exchange/exchange.cpp:104
+msgid ""
+"This plugin imports and export calendar events from/to a Microsoft Exchange "
+"2000 Server."
+msgstr "这个插件从 Microsoft Exchange 2000 服务器导入与导出日历事件。"
+
+#: plugins/exchange/exchange.cpp:145 plugins/exchange/exchange.cpp:164
+msgid "Please select an appointment."
+msgstr "请选择一个约会。"
+
+#: plugins/exchange/exchange.cpp:148
+msgid "Exchange Upload is EXPERIMENTAL, you may lose data on this appointment!"
+msgstr "Exchange 上传是实验性的，您可能丢失这个约会的数据！"
+
+#: plugins/exchange/exchange.cpp:148
+msgid "&Upload"
+msgstr "上传(&U)"
+
+#: plugins/exchange/exchange.cpp:168
+msgid ""
+"Exchange Delete is EXPERIMENTAL, if this is a recurring event it will delete "
+"all instances!"
+msgstr "Exchange 删除是实验性的，如果这是一个重复出现的事件，则会删除所有的出现！"
+
+#: plugins/exchange/exchange.cpp:195
+msgid "No Error"
+msgstr "无错误"
+
+#: plugins/exchange/exchange.cpp:198
+msgid "The Exchange server could not be reached or returned an error."
+msgstr " Exchange 服务器无法连接或者返回错误。"
+
+#: plugins/exchange/exchange.cpp:201
+msgid "Server response could not be interpreted."
+msgstr "无法解释服务器回应。"
+
+#: plugins/exchange/exchange.cpp:204
+msgid "Appointment data could not be interpreted."
+msgstr "无法解释约会数据。"
+
+#: plugins/exchange/exchange.cpp:207
+msgid "This should not happen: trying to upload wrong type of event."
+msgstr "这不该发生：尝试上载事件的类型错误。"
+
+#: plugins/exchange/exchange.cpp:210
+msgid "An error occurred trying to write an appointment to the server."
+msgstr "尝试将约会写入到服务器时发生错误。"
+
+#: plugins/exchange/exchange.cpp:213
+msgid "Trying to delete an event that is not present on the server."
+msgstr "尝试删除服务器上没有的事件。"
+
+#: plugins/exchange/exchange.cpp:217
+msgid "Unknown Error"
+msgstr "未知错误"
+
+#: plugins/exchange/exchangeconfig.cpp:46
+msgid "Exchange server:"
+msgstr "Exchange 服务器："
+
+#: plugins/exchange/exchangeconfig.cpp:50
+msgid "Port:"
+msgstr "端口："
+
+#: plugins/exchange/exchangeconfig.cpp:54
+msgid "User:"
+msgstr "用户："
+
+#. i18n: file kogroupwareprefspage.ui line 205
+#: plugins/exchange/exchangeconfig.cpp:59 rc.cpp:317 rc.cpp:1912
+#, no-c-format
+msgid "Password:"
+msgstr "密码："
+
+#: plugins/exchange/exchangeconfig.cpp:63
+msgid "Determine mailbox automatically"
+msgstr "自动确定邮箱"
+
+#: plugins/exchange/exchangeconfig.cpp:68
+msgid "Mailbox URL:"
+msgstr "邮箱 URL："
+
+#: plugins/timespanview/timespanview.cpp:54
+msgid "&Timespan"
+msgstr "时间长度(&T)"
+
+#: plugins/timespanview/timespanview.cpp:64
+msgid "This plugin provides a Gantt-like Timespan view."
+msgstr "这个插件提供类似甘特图的时间跨度视图。"
+
+#: plugins/timespanview/timespanview.cpp:69
+msgid "Timespan View Plugin"
+msgstr "时间跨图视图插件"
+
+#: kolistview.cpp:208 korgac/alarmdialog.cpp:130 kotodoview.cpp:386
+#: plugins/timespanview/timespanwidget.cpp:51
+#: printing/calprintdefaultplugins.cpp:1212
+#: printing/calprintdefaultplugins.cpp:1296
+msgid "Summary"
+msgstr "摘要"
+
+#: plugins/projectview/koprojectview.cpp:80
+#: plugins/timespanview/timespanwidget.cpp:65
+msgid "Zoom In"
+msgstr "放大"
+
+#: plugins/projectview/koprojectview.cpp:84
+#: plugins/timespanview/timespanwidget.cpp:69
+msgid "Zoom Out"
+msgstr "缩小"
+
+#: plugins/timespanview/timespanwidget.cpp:73
+msgid "Center View"
+msgstr "视图放中间"
+
+#: plugins/projectview/koprojectview.cpp:76
+msgid "Project View"
+msgstr "项目视图"
+
+#: plugins/projectview/koprojectview.cpp:88
+msgid "Select Mode"
+msgstr "选择模式"
+
+#: plugins/projectview/koprojectview.cpp:109
+msgid "main task"
+msgstr "主要任务"
+
+#: plugins/projectview/projectview.cpp:55
+msgid "&Project"
+msgstr "项目(&P)"
+
+#: plugins/projectview/projectview.cpp:65
+msgid "This plugin provides a Gantt diagram as project view."
+msgstr "这个插件提供项目视图所用的甘特图。"
+
+#: plugins/projectview/projectview.cpp:70
+msgid "Project View Plugin"
+msgstr "项目视图插件"
+
+#: calendarview.cpp:264
+msgid ""
+"<p><em>No Item Selected</em></p>"
+"<p>Select an event, to-do or journal entry to view its details here.</p>"
+msgstr ""
+
+#: calendarview.cpp:270
+msgid ""
+"View the details of events, journal entries or to-dos selected in KOrganizer's "
+"main view here."
+msgstr ""
+
+#: calendarview.cpp:456
+msgid "No calendars found, unable to merge the file into your calendar."
+msgstr ""
+
+#: calendarview.cpp:490
+msgid "Could not load calendar '%1'."
+msgstr "无法载入日历“%1”。"
+
+#: calendarview.cpp:719
+msgid ""
+"The timezone setting was changed. Do you want to keep the absolute time of the "
+"items in your calendar, which will show them to be at a different time than "
+"before, or move them to be at the old time also in the new timezone?"
+msgstr ""
+"时区设置已经更改。您是否想要在您的日历中保留项目的绝对时间？也就是说，您是想要这些项目在日历中显示为不同的时间，还是在新时区中也显示为旧时间？"
+
+#: calendarview.cpp:723
+msgid "Keep Absolute Times?"
+msgstr "保留绝对时间吗？"
+
+#: calendarview.cpp:724
+msgid "Keep Times"
+msgstr "保留时间"
+
+#: calendarview.cpp:725
+msgid "Move Times"
+msgstr "移动时间"
+
+#: calendarview.cpp:779
+msgid "To-do completed: %1 (%2)"
+msgstr "已完成的待办：%1(%2)"
+
+#: calendarview.cpp:790
+#, c-format
+msgid "Journal of %1"
+msgstr "%1 的日记"
+
+#: calendarview.cpp:845
+msgid ""
+"The item \"%1\" is filtered by your current filter rules, so it will be hidden "
+"and not appear in the view."
+msgstr "项目“%1”已经被您当前的过滤器规则所规律，所以该项目将被隐藏，不会出现在视图中。"
+
+#: calendarview.cpp:848
+msgid "Filter Applied"
+msgstr "已应用过滤器"
+
+#: calendarview.cpp:904
+msgid "The item \"%1\" will be permanently deleted."
+msgstr "项目“%1”将被永久地删除。"
+
+#: calendarview.cpp:905 calendarview.cpp:929 calendarview.cpp:966
+#: calendarview.cpp:2338 calendarview.cpp:2401 calendarview.cpp:2409
+#: koeventeditor.cpp:393 kojournaleditor.cpp:202 kotodoeditor.cpp:329
+msgid "KOrganizer Confirmation"
+msgstr "KOrganizer 确认"
+
+#: calendarview.cpp:924
+#, fuzzy
+msgid ""
+"The item \"%1\" has sub-to-dos. Do you want to cut just this item and make all "
+"its sub-to-dos independent, or cut the to-do with all its sub-to-dos?"
+msgstr "项目“%1”有子待办事宜。您是想要只删除此项目并将其全部子待办独立，还是删除此项目及其全部子待办事宜？"
+
+#: calendarview.cpp:930
+#, fuzzy
+msgid "Cut Only This"
+msgstr "仅删除本次"
+
+#: calendarview.cpp:931
+msgid "Cut All"
+msgstr ""
+
+#: calendarview.cpp:962
+#, fuzzy
+msgid ""
+"The item \"%1\" has sub-to-dos. Do you want to copy just this item or copy the "
+"to-do with all its sub-to-dos?"
+msgstr "项目“%1”有子待办事宜。您是想要只删除此项目并将其全部子待办独立，还是删除此项目及其全部子待办事宜？"
+
+#: calendarview.cpp:967
+#, fuzzy
+msgid "Copy Only This"
+msgstr "仅删除本次"
+
+#: calendarview.cpp:968
+#, fuzzy
+msgid "Copy All"
+msgstr "复制到(&C)"
+
+#: calendarview.cpp:1064
+#, fuzzy
+msgid "Paste failed: unable to determine a valid target date."
+msgstr "请指定一个有效的起始日期。"
+
+#: calendarview.cpp:1394
+msgid ""
+"Unable to turn sub-to-do into a top-level to-do, because it cannot be locked."
+msgstr "无法将子待办转换为顶级待办，因为该项目无法被锁定。"
+
+#: calendarview.cpp:1419
+msgid "Make sub-to-dos independent"
+msgstr "将子待办事宜独立"
+
+#: calendarview.cpp:1504
+msgid "Dissociate occurrence"
+msgstr "拆分重现"
+
+#: calendarview.cpp:1516
+msgid "Dissociating the occurrence failed."
+msgstr "拆分重现失败。"
+
+#: calendarview.cpp:1517 calendarview.cpp:1547
+msgid "Dissociating Failed"
+msgstr "拆分失败"
+
+#: calendarview.cpp:1538
+msgid "Dissociate future occurrences"
+msgstr "拆分未来的重现"
+
+#: calendarview.cpp:1546
+msgid "Dissociating the future occurrences failed."
+msgstr "拆分未来的重现失败。"
+
+#: calendarview.cpp:1564 calendarview.cpp:1638 calendarview.cpp:1710
+msgid "No item selected."
+msgstr "没有选择项目。"
+
+#: calendarview.cpp:1585 calendarview.cpp:1658
+msgid "The item information was successfully sent."
+msgstr "项目信息已成功发送。"
+
+#: calendarview.cpp:1586
+msgid "Publishing"
+msgstr "发布"
+
+#: calendarview.cpp:1588
+msgid "Unable to publish the item '%1'"
+msgstr "无法发布项目“%1”"
+
+#: calendarview.cpp:1639 calendarview.cpp:1659
+msgid "Forwarding"
+msgstr "转发"
+
+#: calendarview.cpp:1664
+msgid "Unable to forward the item '%1'"
+msgstr "无法转发项目“%1”"
+
+#: calendarview.cpp:1665
+#, fuzzy
+msgid "Forwarding Error"
+msgstr "转发"
+
+#: calendarview.cpp:1688
+msgid "The free/busy information was successfully sent."
+msgstr "忙/闲信息已成功发送。"
+
+#: calendarview.cpp:1689 calendarview.cpp:1732
+msgid "Sending Free/Busy"
+msgstr "发送忙/闲"
+
+#: calendarview.cpp:1691
+msgid "Unable to publish the free/busy data."
+msgstr "无法发布忙/闲数据。"
+
+#: calendarview.cpp:1716
+msgid "The item has no attendees."
+msgstr "该项目没有出席人。"
+
+#: calendarview.cpp:1728
+msgid ""
+"The groupware message for item '%1'was successfully sent.\n"
+"Method: %2"
+msgstr ""
+"项目“%1”的群件消息已经发送。\n"
+"方法：%2"
+
+#: calendarview.cpp:1737
+msgid ""
+"_: Groupware message sending failed. %2 is "
+"request/reply/add/cancel/counter/etc.\n"
+"Unable to send the item '%1'.\n"
+"Method: %2"
+msgstr ""
+"无法发送项目“%1”。\n"
+"方法：%2"
+
+#: calendarview.cpp:1812
+msgid "*.ics|ICalendars"
+msgstr "*.ics|ICalendars"
+
+#: calendarview.cpp:1820 calendarview.cpp:1848
+msgid "Do you want to overwrite %1?"
+msgstr ""
+
+#: calendarview.cpp:1833
+msgid "The journal entries can not be exported to a vCalendar file."
+msgstr "日记项无法导出到 vCalendar 文件中。"
+
+#: calendarview.cpp:1834
+msgid "Data Loss Warning"
+msgstr "数据丢失警告"
+
+#: actionmanager.cpp:996 calendarview.cpp:1834
+msgid "Proceed"
+msgstr "继续"
+
+#: calendarview.cpp:1839
+msgid "*.vcs|vCalendars"
+msgstr "*.vcs|VCalendars"
+
+#: calendarview.cpp:1870
+msgid "&Previous Day"
+msgstr "上一天(&P)"
+
+#: calendarview.cpp:1871
+msgid "&Next Day"
+msgstr "下一天(&N)"
+
+#: calendarview.cpp:1873
+msgid "&Previous Week"
+msgstr "上一周(&P)"
+
+#: calendarview.cpp:1874
+msgid "&Next Week"
+msgstr "下一周(&N)"
+
+#: calendarview.cpp:1984 calendarview.cpp:2017
+msgid "No filter"
+msgstr "无过滤器"
+
+#: calendarview.cpp:2215
+msgid "No resources found. We can not edit the item."
+msgstr ""
+
+#: calendarview.cpp:2333
+msgid ""
+"The item \"%1\" has sub-to-dos. Do you want to delete just this item and make "
+"all its sub-to-dos independent, or delete the to-do with all its sub-to-dos?"
+msgstr "项目“%1”有子待办事宜。您是想要只删除此项目并将其全部子待办独立，还是删除此项目及其全部子待办事宜？"
+
+#: calendarview.cpp:2339
+msgid "Delete Only This"
+msgstr "仅删除本次"
+
+#: calendarview.cpp:2342
+msgid "Deleting sub-to-dos"
+msgstr "删除子待办事宜"
+
+#: calendarview.cpp:2367
+msgid ""
+"The item \"%1\" is marked read-only and cannot be deleted; it probably belongs "
+"to a read-only calendar resource."
+msgstr ""
+
+#: calendarview.cpp:2371
+msgid "Removing not possible"
+msgstr "无法删除"
+
+#: calendarview.cpp:2398
+#, fuzzy
+msgid ""
+"The calendar item \"%1\" recurs over multiple dates; are you sure you want to "
+"delete it and all its recurrences?"
+msgstr "该事件会在好几个日期重复出现，您确实要删除该事件及其所有重复出现吗？"
+
+#: calendarview.cpp:2404
+#, fuzzy
+msgid ""
+"The calendar item \"%1\" recurs over multiple dates. Do you want to delete only "
+"the current one on %2, only all future recurrences, or all its recurrences?"
+msgstr "该事件会在好几个日期重复出现。您是想要删除该事件所有的重现，还是只删除 %1 的重现？"
+
+#: calendarview.cpp:2409
+msgid "Delete C&urrent"
+msgstr "删除当前(&U)"
+
+#: calendarview.cpp:2410
+msgid "Delete &Future"
+msgstr "删除未来(&F)"
+
+#: calendarview.cpp:2411
+msgid "Delete &All"
+msgstr "全部删除(&A)"
+
+#: calendarview.cpp:2514
+msgid "Delete all completed to-dos?"
+msgstr "删除所有已完成的待办事宜吗？"
+
+#: calendarview.cpp:2514
+msgid "Purge To-dos"
+msgstr "销毁待办事宜"
+
+#: calendarview.cpp:2514
+msgid "Purge"
+msgstr "销毁"
+
+#: calendarview.cpp:2518
+msgid "Purging completed to-dos"
+msgstr "销毁已完成的待办事宜"
+
+#: calendarview.cpp:2533
+msgid "Unable to purge to-dos with uncompleted children."
+msgstr "不能销毁有未完成子事件的待办事宜。"
+
+#: calendarview.cpp:2534
+msgid "Delete To-do"
+msgstr "删除待办事宜"
+
+#: calendarview.cpp:2545
+#, fuzzy
+msgid "Unable to edit \"%1\" because it is locked by another process."
+msgstr "无法编辑事件：因其被其它进程锁定。"
+
+#: calendarview.cpp:2579
+#, c-format
+msgid "Unable to copy the item to %1."
+msgstr "无法将项目复制到 %1。"
+
+#: calendarview.cpp:2580
+msgid "Copying Failed"
+msgstr "复制失败"
 
-#: koeditorfreebusy.cpp:177
+#: calendarview.cpp:2623
 #, c-format
-msgid "Location: %1"
-msgstr "位置：%1"
+msgid "Unable to move the item to %1."
+msgstr "无法将项目移至 %1。"
+
+#: calendarview.cpp:2624
+msgid "Moving Failed"
+msgstr "移动失败"
+
+#: calendarview.cpp:2699
+#, fuzzy
+msgid "Cutting Recurring Item"
+msgstr "更改重现项目"
+
+#: calendarview.cpp:2701
+#, fuzzy
+msgid ""
+"The item you try to cut is a recurring item. Do you want to cut only this "
+"single occurrence, only future items, or all items in the recurrence?"
+msgstr "该事件会在好几个日期重复出现。您是想要删除该事件所有的重现，还是只删除 %1 的重现？"
 
-#: koeditorfreebusy.cpp:229
+#: calendarview.cpp:2706
+#, fuzzy
+msgid "Copying Recurring Item"
+msgstr "更改重现项目"
+
+#: calendarview.cpp:2708
+#, fuzzy
+msgid ""
+"The item you try to copy is a recurring item. Do you want to copy only this "
+"single occurrence, only future items, or all items in the recurrence?"
+msgstr "该事件会在好几个日期重复出现。您是想要删除该事件所有的重现，还是只删除 %1 的重现？"
+
+#: calendarview.cpp:2712
+msgid "Changing Recurring Item"
+msgstr "更改重现项目"
+
+#: calendarview.cpp:2714
+msgid ""
+"The item you try to change is a recurring item. Shall the changes be applied "
+"only to this single occurrence, only to the future items, or to all items in "
+"the recurrence?"
+msgstr ""
+
+#: calendarview.cpp:2722
+msgid "Only &This Item"
+msgstr "只有本次(&T)"
+
+#: calendarview.cpp:2722
+msgid "Only &Future Items"
+msgstr "只有未来(&F)"
+
+#: calendarview.cpp:2722
+msgid "&All Occurrences"
+msgstr "每次出现(&A)"
+
+#: calendarview.cpp:2738 koagenda.cpp:1123
+msgid "Dissociate event from recurrence"
+msgstr ""
+
+#: calendarview.cpp:2744
+msgid ""
+"Unable to add the exception item to the calendar. No change will be done."
+msgstr "无法将例外项目添加到日历。未更改。"
+
+#: calendarview.cpp:2745 calendarview.cpp:2766
+msgid "Error Occurred"
+msgstr "发生了错误"
+
+#: calendarview.cpp:2759
+msgid "Split future recurrences"
+msgstr "拆分未来的重现"
+
+#: calendarview.cpp:2765
+msgid "Unable to add the future items to the calendar. No change will be done."
+msgstr "无法将未来的项目添加到日历。未更改。"
+
+#: koviewmanager.cpp:405
+msgid "Merged calendar"
+msgstr "已合并日历"
+
+#: koviewmanager.cpp:407
+msgid "Calendars Side by Side"
+msgstr "并列日历"
+
+#: koeditorfreebusy.cpp:178
+#, fuzzy
+msgid "Freebusy Period"
+msgstr "忙/闲获取密码"
+
+#: koeditorfreebusy.cpp:181
+#, fuzzy
+msgid "Summary:"
+msgstr "摘要"
+
+#: koeditorattachments.cpp:218 koeditorfreebusy.cpp:186
+#, fuzzy
+msgid "Location:"
+msgstr "位置(&L)："
+
+#: koeditorfreebusy.cpp:190
+#, fuzzy
+msgid "Start:"
+msgstr "起始(&S)："
+
+#: koeditorfreebusy.cpp:193
+#, fuzzy
+msgid "End:"
+msgstr "结束(&E)："
+
+#: koeditorfreebusy.cpp:247
 msgid ""
 "Sets the zoom level on the Gantt chart. 'Hour' shows a range of several hours, "
 "'Day' shows a range of a few days, 'Week' shows a range of a few months, and "
@@ -144,764 +1349,852 @@ msgid ""
 "appropriate for the current event or to-do."
 msgstr ""
 
-#: koeditorfreebusy.cpp:236
+#: koeditorfreebusy.cpp:254
 msgid "Scale: "
 msgstr "规模："
 
-#: koeditorfreebusy.cpp:242
+#: koeditorfreebusy.cpp:260
 msgid "Hour"
 msgstr "小时"
 
-#: koeditorfreebusy.cpp:243
+#: koeditorfreebusy.cpp:261
 msgid "Day"
 msgstr "天"
 
-#: koeditorfreebusy.cpp:244
+#: koeditorfreebusy.cpp:262
 msgid "Week"
 msgstr "周"
 
-#: koeditorfreebusy.cpp:245
+#: koeditorfreebusy.cpp:263
 msgid "Month"
 msgstr "月"
 
-#: koeditorfreebusy.cpp:246
+#: koeditorfreebusy.cpp:264
 msgid "Automatic"
 msgstr "自动"
 
-#: koeditorfreebusy.cpp:252
+#: koeditorfreebusy.cpp:270
 msgid "Center on Start"
 msgstr "开始时居中"
 
-#: koeditorfreebusy.cpp:254
+#: koeditorfreebusy.cpp:272
 msgid "Centers the Gantt chart on the start time and day of this event."
 msgstr ""
 
-#: koeditorfreebusy.cpp:261
+#: koeditorfreebusy.cpp:279
 msgid "Pick Date"
 msgstr "拾取日期"
 
-#: koeditorfreebusy.cpp:263
+#: koeditorfreebusy.cpp:281
 msgid "Moves the event to a date and time when all the attendees are free."
 msgstr ""
 
-#: koeditorfreebusy.cpp:272
+#: koeditorfreebusy.cpp:290
 msgid ""
 "Reloads Free/Busy data for all attendees from the corresponding servers."
 msgstr ""
 
-#: koeditorfreebusy.cpp:279
+#: koeditorfreebusy.cpp:297
 msgid ""
 "Shows the free/busy status of all attendees. Double-clicking on an attendees "
 "entry in the list will allow you to enter the location of their Free/Busy "
 "Information."
 msgstr ""
 
-#: koeditorfreebusy.cpp:286
+#: koeditorfreebusy.cpp:304
 msgid "Attendee"
 msgstr "出席者"
 
-#: koeditorfreebusy.cpp:529
+#: koeditorfreebusy.cpp:547
 msgid "The meeting already has suitable start/end times."
 msgstr "会议已经有合适的开始/结束时间。"
 
-#: koeditorfreebusy.cpp:535
+#: koeditorfreebusy.cpp:552
 msgid ""
-"The meeting has been moved to\n"
-"Start: %1\n"
-"End: %2."
+"<qt>The next available time slot for the meeting is:"
+"<br>Start: %1"
+"<br>End: %2"
+"<br>Would you like to move the meeting to this time slot?</qt>"
 msgstr ""
-"此会议已被移动到\n"
-"开始：%1\n"
-"结束：%2。"
 
-#: koeditorfreebusy.cpp:540
+#: koeditorfreebusy.cpp:564
 msgid "No suitable date found."
 msgstr "未找到适合的日期。"
 
-#: koeditorfreebusy.cpp:675
+#: koeditorfreebusy.cpp:700
 msgid ""
 "Of the %1 participants, %2 have accepted, %3 have tentatively accepted, and %4 "
 "have declined."
 msgstr "在 %1 个与会者中，%2 个人已经接受，%3 个人暂时接受，%4 个人拒绝。"
 
-#: koeditorfreebusy.cpp:898
+#: koeditorfreebusy.cpp:957
 msgid ""
 "You are changing the organiser of this event, who is also attending, do you "
 "want to change that attendee as well?"
 msgstr ""
 
-#: koeditorrecurrence.cpp:91
-msgid ""
-"The number of the week from the beginning of the month on which this event or "
-"to-do should recur."
-msgstr ""
+#: importdialog.cpp:41 previewdialog.cpp:53
+#, fuzzy
+msgid "Import Calendar/Event"
+msgstr "导入日历"
 
-#: koeditorrecurrence.cpp:95 koeditorrecurrence.cpp:259
-msgid "1st"
-msgstr "第 1"
+#: importdialog.cpp:48
+#, fuzzy
+msgid "Import calendar/event at '%1' into KOrganizer."
+msgstr "将“%1”处的日历导入到 KOrganizer。"
 
-#: koeditorrecurrence.cpp:96 koeditorrecurrence.cpp:260
-msgid "2nd"
-msgstr "第 2"
+#: importdialog.cpp:57
+msgid "Add as new calendar"
+msgstr "添加为新日历"
 
-#: koeditorrecurrence.cpp:97 koeditorrecurrence.cpp:261
-msgid "3rd"
-msgstr "第 3"
+#: importdialog.cpp:59
+msgid "Merge into existing calendar"
+msgstr "合并入已有日历"
 
-#: koeditorrecurrence.cpp:98 koeditorrecurrence.cpp:262
-msgid "4th"
-msgstr "第 4"
+#: importdialog.cpp:62
+msgid "Open in separate window"
+msgstr "在独立窗口中打开"
 
-#: koeditorrecurrence.cpp:99 koeditorrecurrence.cpp:263
-msgid "5th"
-msgstr "第 5"
+#: actionmanager.cpp:255
+#, fuzzy
+msgid "Import &Event/Calendar (ICS-/VCS-File)..."
+msgstr "导入日历(&C)..."
 
-#: koeditorrecurrence.cpp:100 koeditorrecurrence.cpp:290
-msgid "Last"
-msgstr "最后一"
+#: actionmanager.cpp:257
+#, fuzzy
+msgid "&Import From UNIX Ical tool (.calendar-File)"
+msgstr "从 UNIX Ical 导入(&I)"
 
-#: koeditorrecurrence.cpp:101 koeditorrecurrence.cpp:291
-msgid "2nd Last"
-msgstr "倒数第二"
+#: actionmanager.cpp:259
+msgid "Get &Hot New Stuff..."
+msgstr "获取百宝箱(&H)..."
 
-#: koeditorrecurrence.cpp:102 koeditorrecurrence.cpp:292
-msgid "3rd Last"
-msgstr "倒数第三"
+#: actionmanager.cpp:263
+msgid "Export &Web Page..."
+msgstr "导出网页(&W)..."
 
-#: koeditorrecurrence.cpp:103 koeditorrecurrence.cpp:293
-msgid "4th Last"
-msgstr "倒数第四"
+#: actionmanager.cpp:266
+msgid "&iCalendar..."
+msgstr "&iCalendar..."
 
-#: koeditorrecurrence.cpp:104 koeditorrecurrence.cpp:294
-msgid "5th Last"
-msgstr "倒数第五"
+#: actionmanager.cpp:269
+msgid "&vCalendar..."
+msgstr "&vCalendar..."
 
-#: koeditorrecurrence.cpp:112
-msgid "The weekday on which this event or to-do should recur."
-msgstr ""
+#: actionmanager.cpp:272
+msgid "Upload &Hot New Stuff..."
+msgstr "上载百宝箱(&H)..."
 
-#: koeditorrecurrence.cpp:126
-msgid "The month during which this event or to-do should recur."
-msgstr ""
+#: actionmanager.cpp:278
+msgid "Archive O&ld Entries..."
+msgstr "存档旧的项目(&L)..."
 
-#: koeditorrecurrence.cpp:143
-msgid "Sets how often this event or to-do should recur."
-msgstr ""
+#: actionmanager.cpp:280
+msgid ""
+"_: delete completed to-dos\n"
+"Pur&ge Completed To-dos"
+msgstr "销毁已完成的待办(&G)"
 
-#: koeditorrecurrence.cpp:167 koeditorrecurrence.cpp:181
-#: koeditorrecurrence.cpp:232 koeditorrecurrence.cpp:405
-msgid "&Recur every"
-msgstr "重现周期(&R)"
+#: actionmanager.cpp:338
+msgid "What's &Next"
+msgstr "下面什么事(&N)"
 
-#. i18n: file koeditoralarms_base.ui line 70
-#: koeditorgeneral.cpp:230 koeditorrecurrence.cpp:167
-#: korgac/alarmdialog.cpp:122 rc.cpp:178 rc.cpp:1892
-#, no-c-format
-msgid "day(s)"
-msgstr "天"
+#: actionmanager.cpp:342
+msgid "&Day"
+msgstr "天(&D)"
 
-#: koeditorrecurrence.cpp:181
-msgid "week(s) on:"
-msgstr "周的："
+#: actionmanager.cpp:351
+#, c-format
+msgid ""
+"_n: &Next Day\n"
+"Ne&xt %n Days"
+msgstr "后 %n 天(&X)"
 
-#: koeditorrecurrence.cpp:199
-msgid "Day of the week on which this event or to-do should recur."
-msgstr ""
+#: actionmanager.cpp:353
+msgid "W&ork Week"
+msgstr "工作周(&O)"
 
-#: koeditorrecurrence.cpp:232
-msgid "month(s)"
-msgstr "月"
+#: actionmanager.cpp:357
+msgid "&Week"
+msgstr "周(&W)"
 
-#: koeditorrecurrence.cpp:244
-msgid "&Recur on the"
-msgstr "重现点(&R)"
+#: actionmanager.cpp:361
+msgid "&Month"
+msgstr "月(&M)"
 
-#: koeditorrecurrence.cpp:249
-msgid ""
-"Sets a specific day of the month on which this event or to-do should recur."
-msgstr ""
+#: actionmanager.cpp:365
+msgid "&List"
+msgstr "列表(&L)"
 
-#: koeditorrecurrence.cpp:254 koeditorrecurrence.cpp:430
-msgid "The day of the month on which this event or to-do should recur."
-msgstr ""
+#: actionmanager.cpp:369
+msgid "&To-do List"
+msgstr "待办事宜列表(&T)"
 
-#: koeditorrecurrence.cpp:264
-msgid "6th"
-msgstr "第 6"
+#: actionmanager.cpp:373
+msgid "&Journal"
+msgstr "日记(&J)"
 
-#: koeditorrecurrence.cpp:265
-msgid "7th"
-msgstr "第 7"
+#: actionmanager.cpp:377
+msgid "&Timeline View"
+msgstr "时间线视图(&T)"
 
-#: koeditorrecurrence.cpp:266
-msgid "8th"
-msgstr "第 8"
+#: actionmanager.cpp:383
+msgid "&Refresh"
+msgstr "刷新(&R)"
 
-#: koeditorrecurrence.cpp:267
-msgid "9th"
-msgstr "第 9"
+#: actionmanager.cpp:391
+msgid "F&ilter"
+msgstr "过滤器(&I)"
 
-#: koeditorrecurrence.cpp:268
-msgid "10th"
-msgstr "第 10"
+#: actionmanager.cpp:406
+msgid "Zoom In Horizontally"
+msgstr "水平放大"
 
-#: koeditorrecurrence.cpp:269
-msgid "11th"
-msgstr "第 11"
+#: actionmanager.cpp:409
+msgid "Zoom Out Horizontally"
+msgstr "水平缩小"
 
-#: koeditorrecurrence.cpp:270
-msgid "12th"
-msgstr "第 12"
+#: actionmanager.cpp:412
+msgid "Zoom In Vertically"
+msgstr "垂直放大"
 
-#: koeditorrecurrence.cpp:271
-msgid "13th"
-msgstr "第 13"
+#: actionmanager.cpp:415
+msgid "Zoom Out Vertically"
+msgstr "垂直缩小"
 
-#: koeditorrecurrence.cpp:272
-msgid "14th"
-msgstr "第 14"
+#: actionmanager.cpp:424
+msgid "Go to &Today"
+msgstr "转到今天(&T)"
 
-#: koeditorrecurrence.cpp:273
-msgid "15th"
-msgstr "第 15"
+#: actionmanager.cpp:428
+msgid "Go &Backward"
+msgstr "后退(&B)"
 
-#: koeditorrecurrence.cpp:274
-msgid "16th"
-msgstr "第 16"
+#: actionmanager.cpp:440
+msgid "Go &Forward"
+msgstr "前进(&F)"
 
-#: koeditorrecurrence.cpp:275
-msgid "17th"
-msgstr "第 17"
+#: actionmanager.cpp:450
+msgid "New E&vent..."
+msgstr "新建事件(&V)..."
 
-#: koeditorrecurrence.cpp:276
-msgid "18th"
-msgstr "第 18"
+#: actionmanager.cpp:454 kotodoview.cpp:464
+msgid "New &To-do..."
+msgstr "新建待办事宜(&T)..."
 
-#: koeditorrecurrence.cpp:277
-msgid "19th"
-msgstr "第 19"
+#: actionmanager.cpp:458 kotodoview.cpp:466
+msgid "New Su&b-to-do..."
+msgstr "新建子待办事宜(&B)..."
 
-#: koeditorrecurrence.cpp:278
-msgid "20th"
-msgstr "第 20"
+#: actionmanager.cpp:464
+msgid "New &Journal..."
+msgstr "新建日记(&J)..."
 
-#: koeditorrecurrence.cpp:279
-msgid "21st"
-msgstr "第 21"
+#: actionmanager.cpp:469 actionmanager.cpp:1461 actionmanager.cpp:1489
+#: koeventpopupmenu.cpp:53 kotodoview.cpp:454
+msgid "&Show"
+msgstr "显示(&S)"
 
-#: koeditorrecurrence.cpp:280
-msgid "22nd"
-msgstr "第 22"
+#: actionmanager.cpp:472 actionmanager.cpp:1462 actionmanager.cpp:1490
+#: koeventpopupmenu.cpp:55 kotodoview.cpp:456 resourceview.cpp:715
+msgid "&Edit..."
+msgstr "编辑(&E)..."
 
-#: koeditorrecurrence.cpp:281
-msgid "23rd"
-msgstr "第 23"
+#: actionmanager.cpp:479
+msgid "&Make Sub-to-do Independent"
+msgstr "将子待办事宜独立(&M)"
 
-#: koeditorrecurrence.cpp:282
-msgid "24th"
-msgstr "第 24"
+#: actionmanager.cpp:498
+msgid "&Publish Item Information..."
+msgstr "发布项目信息(&P)..."
 
-#: koeditorrecurrence.cpp:283
-msgid "25th"
-msgstr "第 25"
+#: actionmanager.cpp:503
+msgid "Send &Invitation to Attendees"
+msgstr "给与会者发送邀请(&I)"
 
-#: koeditorrecurrence.cpp:284
-msgid "26th"
-msgstr "第 26"
+#: actionmanager.cpp:511
+msgid "Re&quest Update"
+msgstr "请求更新(&Q)"
 
-#: koeditorrecurrence.cpp:285
-msgid "27th"
-msgstr "第 27"
+#: actionmanager.cpp:518
+msgid "Send &Cancelation to Attendees"
+msgstr "给与会者发送取消(&C)"
 
-#: koeditorrecurrence.cpp:286
-msgid "28th"
-msgstr "第 28"
+#: actionmanager.cpp:525
+msgid "Send Status &Update"
+msgstr "发送状态更新(&U)"
 
-#: koeditorrecurrence.cpp:287
-msgid "29th"
-msgstr "第 29"
+#: actionmanager.cpp:533
+msgid ""
+"_: counter proposal\n"
+"Request Chan&ge"
+msgstr "请求更改(&G)"
 
-#: koeditorrecurrence.cpp:288
-msgid "30th"
-msgstr "第 30"
+#: actionmanager.cpp:540
+msgid "&Send as iCalendar..."
+msgstr "发送为 iCalendar(&S)..."
 
-#: koeditorrecurrence.cpp:289
-msgid "31st"
-msgstr "第 31"
+#: actionmanager.cpp:545
+msgid "&Mail Free Busy Information..."
+msgstr "邮寄忙闲信息(&M)..."
 
-#: koeditorrecurrence.cpp:325
-msgid "day"
-msgstr "天"
+#: actionmanager.cpp:550
+msgid "&Upload Free Busy Information"
+msgstr "上传忙闲信息(&U)"
 
-#: koeditorrecurrence.cpp:332
-msgid ""
-"Sets a weekday and specific week in the month on which this event or to-do "
-"should recur"
-msgstr ""
+#: actionmanager.cpp:556
+msgid "&Addressbook"
+msgstr "地址簿(&A)"
 
-#: koeditorrecurrence.cpp:405
-msgid "year(s)"
-msgstr "年"
+#: actionmanager.cpp:567
+msgid "Show Date Navigator"
+msgstr "显示日期导航器"
 
-#: koeditorrecurrence.cpp:419
-msgid ""
-"_: part before XXX of 'Recur on day XXX of month YYY'\n"
-"&Recur on day "
-msgstr ""
+#: actionmanager.cpp:570
+msgid "Show To-do View"
+msgstr "显示待办视图"
 
-#: koeditorrecurrence.cpp:421
-msgid "&Day "
-msgstr "天(&D) "
+#: actionmanager.cpp:573
+msgid "Show Item Viewer"
+msgstr "显示项目查看器"
 
-#: koeditorrecurrence.cpp:425
-msgid ""
-"Sets a specific day in a specific month on which this event or to-do should "
-"recur."
-msgstr ""
+#: actionmanager.cpp:592
+msgid "Show Resource View"
+msgstr "显示资源视图"
 
-#: koeditorrecurrence.cpp:434
+#: actionmanager.cpp:595
+msgid "Show &Resource Buttons"
+msgstr "显示资源按钮(&R)"
+
+#: actionmanager.cpp:610
+msgid "Configure &Date && Time..."
+msgstr "配置日期和时间(&D)..."
+
+#: actionmanager.cpp:617
+msgid "Manage View &Filters..."
+msgstr "管理视图过滤器(&F)..."
+
+#: actionmanager.cpp:620
+msgid "Manage C&ategories..."
+msgstr "管理类别(&A)..."
+
+#: actionmanager.cpp:624
+msgid "&Configure Calendar..."
+msgstr "配置日历(&C)..."
+
+#: actionmanager.cpp:649 actionmanager.cpp:651
+msgid "Filter: "
+msgstr "过滤器："
+
+#: actionmanager.cpp:713 actionmanager.cpp:801 actionmanager.cpp:1191
+#: previewdialog.cpp:140
+msgid "*.vcs *.ics|Calendar Files"
+msgstr "*.vcs *.ics|日历文件"
+
+#: actionmanager.cpp:752
+#, fuzzy
 msgid ""
-"_: part between XXX and YYY of 'Recur on day XXX of month YYY'\n"
-" &of "
+"You have no .calendar file in your home directory.\n"
+"Import cannot proceed.\n"
 msgstr ""
+"在您的主目录中没有 ical 文件。\n"
+"无法进行导入。\n"
 
-#: koeditorrecurrence.cpp:448
+#: actionmanager.cpp:775
 msgid ""
-"_: Part before XXX in 'Recur on NNN. WEEKDAY of MONTH', short version\n"
-"&On"
-msgstr ""
+"KOrganizer successfully imported and merged your .calendar file from ical into "
+"the currently opened calendar."
+msgstr "KOrganizer 成功地从 ical 中把您的 .calendar 文件导入并合并到了当前打开的日历中。"
 
-#: koeditorrecurrence.cpp:450
+#: actionmanager.cpp:781
 msgid ""
-"_: Part before XXX in 'Recur on NNN. WEEKDAY of MONTH'\n"
-"&On the"
+"KOrganizer encountered some unknown fields while parsing your .calendar ical "
+"file, and had to discard them; please check to see that all your relevant data "
+"was correctly imported."
 msgstr ""
+"KOrganizer 在读入您的 .calendar ical 文件时遇到一些未知的域，必须丢弃这些域；请检查一下，看看您的重要数据是否已经正确导入。"
 
-#: koeditorrecurrence.cpp:454
+#: actionmanager.cpp:785
+msgid "ICal Import Successful with Warning"
+msgstr "成功导入 ICal，有警告"
+
+#: actionmanager.cpp:788
 msgid ""
-"Sets a specific day in a specific week of a specific month on which this event "
-"or to-do should recur."
-msgstr ""
+"KOrganizer encountered an error parsing your .calendar file from ical; import "
+"has failed."
+msgstr "KOrganizer 在从 ical 读入您的 .calendar 文件时遇到错误；导入失败。"
 
-#: koeditorrecurrence.cpp:465
+#: actionmanager.cpp:792
 msgid ""
-"_: part between WEEKDAY and MONTH in 'Recur on NNN. WEEKDAY of MONTH'\n"
-" o&f "
-msgstr ""
+"KOrganizer does not think that your .calendar file is a valid ical calendar; "
+"import has failed."
+msgstr "KOrganizer 觉得您的 .calendar 文件不是正确的 ical 日程表；导入失败。"
 
-#: koeditorrecurrence.cpp:480
-msgid "Day #"
-msgstr ""
+#: actionmanager.cpp:874
+msgid "New calendar '%1'."
+msgstr "新建日历“%1”。"
 
-#: koeditorrecurrence.cpp:482
-msgid "Recur on &day #"
-msgstr "在这一天重现(&D)"
+#: actionmanager.cpp:909
+msgid "Cannot download calendar from '%1'."
+msgstr "无法从“%1”下载日历。"
 
-#: koeditorrecurrence.cpp:484
+#: actionmanager.cpp:947
+msgid "Added calendar resource for URL '%1'."
+msgstr "已添加 URL“%1”的日历资源。"
+
+#: actionmanager.cpp:955
+msgid "Unable to create calendar resource '%1'."
+msgstr "无法创建日历资源“%1”。"
+
+#: actionmanager.cpp:966
+msgid "Merged calendar '%1'."
+msgstr "已合并日历“%1”。"
+
+#: actionmanager.cpp:969
+msgid "Opened calendar '%1'."
+msgstr "已打开日历“%1”。"
+
+#: actionmanager.cpp:994
 msgid ""
-"Sets a specific day within the year on which this event or to-do should recur."
+"Your calendar will be saved in iCalendar format. Use 'Export vCalendar' to save "
+"in vCalendar format."
+msgstr "将用 iCalendar 格式保存您的日历，若需要存成 vCalendar 格式请使用“导出 vCalendar”。"
+
+#: actionmanager.cpp:996
+msgid "Format Conversion"
+msgstr "格式转换"
+
+#: actionmanager.cpp:1020
+msgid "Cannot upload calendar to '%1'"
+msgstr "不能上传日历到“%1”"
+
+#: actionmanager.cpp:1033
+msgid "Saved calendar '%1'."
+msgstr "已保存日历“%1”。"
+
+#: actionmanager.cpp:1064
+msgid "Do you want to overwrite file \"%1\""
 msgstr ""
 
-#: koeditorrecurrence.cpp:495
+#: actionmanager.cpp:1098
+msgid "Could not upload file."
+msgstr "无法上传文件。"
+
+#: actionmanager.cpp:1139
+#, c-format
+msgid "Unable to save calendar to the file %1."
+msgstr "无法将日历保存到文件 %1。"
+
+#: actionmanager.cpp:1164
 msgid ""
-"_: part after NNN of 'Recur on day #NNN of the year'\n"
-" of the &year"
+"The calendar has been modified.\n"
+"Do you want to save it?"
 msgstr ""
+"这个日历已经被修改。\n"
+"您要保存它吗？"
 
-#: koeditorrecurrence.cpp:498
+#: actionmanager.cpp:1267
+#, c-format
 msgid ""
-"_: part after NNN of 'Recur on day #NNN of the year', short version\n"
-" of the year"
-msgstr ""
+"_n: &Next Day\n"
+"&Next %n Days"
+msgstr "后 %n 天(&N)"
 
-#: koeditorrecurrence.cpp:581
-msgid "E&xceptions"
-msgstr "例外(&X)"
+#: actionmanager.cpp:1301
+msgid "Could not start control module for date and time format."
+msgstr "无法启动日期和时间格式控制模块。"
 
-#: koeditorrecurrence.cpp:591
-msgid ""
-"A date that should be considered an exception to the recurrence rules for this "
-"event or to-do."
-msgstr ""
+#: actionmanager.cpp:1447
+msgid "&Show Event"
+msgstr "显示事件(&S)"
 
-#. i18n: file koeditoralarms_base.ui line 546
-#: koeditorrecurrence.cpp:596 rc.cpp:253 rc.cpp:1967
-#, no-c-format
-msgid "&Add"
-msgstr "添加(&A)"
+#: actionmanager.cpp:1448
+msgid "&Edit Event..."
+msgstr "编辑事件(&E)..."
+
+#: actionmanager.cpp:1449
+msgid "&Delete Event"
+msgstr "删除事件(&D)"
+
+#: actionmanager.cpp:1453
+msgid "&Show To-do"
+msgstr "显示待办事宜(&S)"
 
-#: koeditorrecurrence.cpp:598
+#: actionmanager.cpp:1454
+msgid "&Edit To-do..."
+msgstr "编辑待办事宜(&E)..."
+
+#: actionmanager.cpp:1455
+msgid "&Delete To-do"
+msgstr "删除待办事宜(&D)"
+
+#: actionmanager.cpp:1579
 msgid ""
-"Add this date as an exception to the recurrence rules for this event or to-do."
+"\"%1\" is read-only. Please select a writable calendar before attempting to "
+"create a new item."
 msgstr ""
 
-#: koeditorrecurrence.cpp:601
-msgid "&Change"
-msgstr "更改(&C)"
+#: actionmanager.cpp:1582
+#, fuzzy
+msgid "Read-only calendar"
+msgstr "仅有日历"
 
-#: koeditorrecurrence.cpp:603
-msgid "Replace the currently selected date with this date."
+#: actionmanager.cpp:1612
+msgid ""
+"You have no active, writable event folder so saving will not be possible.\n"
+"Please create or activate at least one writable event folder and try again."
 msgstr ""
 
-#: koeditorrecurrence.cpp:607
+#: actionmanager.cpp:1616
 msgid ""
-"Delete the currently selected date from the list of dates that should be "
-"considered exceptions to the recurrence rules for this event or to-do."
+"You have no active, writable to-do (task) folders so saving will not be "
+"possible.\n"
+"Please create or activate at least one writable to-do folder and try again."
 msgstr ""
 
-#: koeditorrecurrence.cpp:614
+#: actionmanager.cpp:1620
 msgid ""
-"Displays current dates that are being considered exceptions to the recurrence "
-"rules for this event or to-do."
+"You have no active, writable journal folder so saving will not be possible.\n"
+"Please create or activate at least one writable journal folder and try again."
 msgstr ""
 
-#: koeditorrecurrence.cpp:678
-msgid "Edit Exceptions"
-msgstr "编辑例外"
-
-#: koeditorrecurrence.cpp:702
-msgid "Recurrence Range"
-msgstr "重现范围"
-
-#: koeditorrecurrence.cpp:705
+#: actionmanager.cpp:1624
 msgid ""
-"Sets a range for which these recurrence rules will apply to this event or "
-"to-do."
+"You have no active, writable calendar folder so saving will not be possible.\n"
+"Please create or activate at least one writable calendar folder and try again."
 msgstr ""
 
-#: koeditorrecurrence.cpp:713
-msgid "Begin on:"
-msgstr "开始于："
+#: actionmanager.cpp:1630
+#, fuzzy
+msgid "No writable calendar"
+msgstr "未找到适合的日期。"
 
-#: koeditorrecurrence.cpp:715
-msgid "The date on which the recurrences for this event or to-do should begin."
+#: actionmanager.cpp:1671 actionmanager.cpp:1794
+msgid "Attach as &link"
 msgstr ""
 
-#: koeditorrecurrence.cpp:722
-msgid "&No ending date"
-msgstr "没有结束日期(&N)"
+#: actionmanager.cpp:1672 actionmanager.cpp:1795
+#, fuzzy
+msgid "Attach &inline"
+msgstr "附件(&M)"
 
-#: koeditorrecurrence.cpp:724
-msgid "Sets the event or to-do to recur forever."
+#: actionmanager.cpp:1673
+msgid "Attach inline &without attachments"
 msgstr ""
 
-#: koeditorrecurrence.cpp:731
-msgid "End &after"
-msgstr "结束于(&A)"
-
-#: koeditorrecurrence.cpp:733
-msgid ""
-"Sets the event or to-do to stop recurring after a certain number of "
-"occurrences."
+#: actionmanager.cpp:1675 actionmanager.cpp:1797 koeditorattachments.cpp:601
+msgid "C&ancel"
 msgstr ""
 
-#: koeditorrecurrence.cpp:738
-msgid "Number of times the event or to-do should recur before stopping."
+#: actionmanager.cpp:1705
+msgid "Removing attachments from an email might invalidate its signature."
 msgstr ""
 
-#: koeditorrecurrence.cpp:744
-msgid "&occurrence(s)"
-msgstr "次(&O)"
+#: actionmanager.cpp:1706
+msgid "Remove Attachments"
+msgstr "删除附件"
 
-#: koeditorrecurrence.cpp:752
-msgid "End &on:"
-msgstr "结束于(&O)："
+#: actionmanager.cpp:1895
+msgid "Undo (%1)"
+msgstr "撤销(%1)"
 
-#: koeditorrecurrence.cpp:754
-msgid "Sets the event or to-do to stop recurring on a certain date."
-msgstr ""
+#: actionmanager.cpp:1907
+msgid "Redo (%1)"
+msgstr "重做(%1)"
 
-#: koeditorrecurrence.cpp:761
-msgid "Date after which the event or to-do should stop recurring"
-msgstr ""
+#: actionmanager.cpp:1919
+msgid ""
+"The calendar contains unsaved changes. Do you want to save them before exiting?"
+msgstr "日历包含未保存的更改。您想要在退出前保存吗？"
 
-#: koeditorrecurrence.cpp:825
-#, c-format
-msgid "Begins on: %1"
-msgstr "开始在：%1"
+#: actionmanager.cpp:1924
+msgid "Unable to save the calendar. Do you still want to close this window?"
+msgstr "无法保存日历。您仍然想要关闭此窗口吗？"
 
-#: koeditorrecurrence.cpp:833
-msgid "Edit Recurrence Range"
-msgstr "编辑重现范围"
+#: actionmanager.cpp:1945
+msgid "Unable to exit. Saving still in progress."
+msgstr "无法退出。保存仍在进行中。"
 
-#: koeditorrecurrence.cpp:880
-msgid "Sets the type of recurrence this event or to-do should have."
+#: actionmanager.cpp:1984
+msgid ""
+"Saving of '%1' failed. Check that the resource is properly configured.\n"
+"Ignore problem and continue without saving or cancel save?"
 msgstr ""
 
-#: koeditorrecurrence.cpp:882
-msgid "Daily"
-msgstr "每天"
+#: actionmanager.cpp:1987
+msgid "Save Error"
+msgstr "保存错误"
 
-#: koeditorrecurrence.cpp:883
-msgid "Weekly"
-msgstr "每周"
+#: actionmanager.cpp:2009
+msgid "URL '%1' is invalid."
+msgstr "URL“%1”无效。"
 
-#: koeditorrecurrence.cpp:884
-msgid "Monthly"
-msgstr "每月"
+#: actionmanager.cpp:2025
+#, fuzzy
+msgid "Unable to open the calendar"
+msgstr "无法创建日历资源“%1”。"
 
-#: koeditorrecurrence.cpp:885
-msgid "Yearly"
-msgstr "每年"
+#: archivedialog.cpp:55
+msgid "Archive/Delete Past Events and To-dos"
+msgstr "存档/删除过去的事件和待办"
 
-#: koeditorrecurrence.cpp:897
-msgid "&Daily"
-msgstr "每天(&D)"
+#: archivedialog.cpp:57
+msgid "&Archive"
+msgstr "存档(&A)"
 
-#: koeditorrecurrence.cpp:899
+#: archivedialog.cpp:66
+#, fuzzy
 msgid ""
-"Sets the event or to-do to recur daily according to the specified rules."
+"Archiving saves old items into the given file and then deletes them in the "
+"current calendar. If the archive file already exists they will be added. (<a "
+"href=\"whatsthis:In order to add an archive to your calendar, use the "
+"&quot;Merge Calendar&quot; function. You can view an archive by opening it in "
+"KOrganizer like any other calendar. It is not saved in a special format, but as "
+"vCalendar.\">How to restore</a>)"
 msgstr ""
+"存档将旧事件存入给定文件，并从当前日历中删除这些事件。如果存档文件已经存在，则会将约会添加到该文件中。(<a "
+"href=\"whatsthis:为了将归档加入您的日历，请使用“合并日历”功能。和其它日历一样，您可以在 KOrganizer "
+"中打开归档文件进行查看。归档文件的格式并不特殊，只是 vCalendar 格式。\">如何恢复</a>)"
 
-#: koeditorrecurrence.cpp:901
-msgid "&Weekly"
-msgstr "每周(&W)"
+#: archivedialog.cpp:82
+msgid "Archive now items older than:"
+msgstr "存档早于此日期的项目："
 
-#: koeditorrecurrence.cpp:903
+#: archivedialog.cpp:87
+#, fuzzy
 msgid ""
-"Sets the event or to-do to recur weekly according to the specified rules."
-msgstr ""
+"The date before which items should be archived. All older events and to-dos "
+"will be saved and deleted, the newer (and events exactly on that date) will be "
+"kept."
+msgstr "存档早于指定日期的事件。更早的全部事件都将被保存并删除，而更新(包括所选日期当天)的事件约会将会保留。"
 
-#: koeditorrecurrence.cpp:905
-msgid "&Monthly"
-msgstr "每月(&M)"
+#: archivedialog.cpp:96
+msgid "Automaticall&y archive items older than:"
+msgstr "自动存档早于指定时间的项目(&Y)："
 
-#: koeditorrecurrence.cpp:907
+#: archivedialog.cpp:99
 msgid ""
-"Sets the event or to-do to recur monthly according to the specified rules."
+"If this feature is enabled, KOrganizer will regularly check if events and "
+"to-dos have to be archived; this means you will not need to use this dialog box "
+"again, except to change the settings."
 msgstr ""
 
-#: koeditorrecurrence.cpp:909
-msgid "&Yearly"
-msgstr "每年(&Y)"
-
-#: koeditorrecurrence.cpp:911
+#: archivedialog.cpp:107
+#, fuzzy
 msgid ""
-"Sets the event or to-do to recur yearly according to the specified rules."
-msgstr ""
+"The age of the events and to-dos to archive. All older items will be saved and "
+"deleted, the newer will be kept."
+msgstr "要存档约会的时间范围。所有更早的约会都将被保存并删除，而更新的约会将会保留。"
 
-#: koeditorrecurrence.cpp:973
-msgid "&Enable recurrence"
-msgstr "启用重复出现(&E)"
+#: archivedialog.cpp:112
+msgid "Day(s)"
+msgstr "天"
 
-#: koeditorrecurrence.cpp:975
-msgid ""
-"Enables recurrence for this event or to-do according to the specified rules."
-msgstr ""
+#: archivedialog.cpp:113
+msgid "Week(s)"
+msgstr "周"
 
-#: koeditorrecurrence.cpp:982
-msgid "Appointment Time "
-msgstr "约会时间"
+#: archivedialog.cpp:114
+msgid "Month(s)"
+msgstr "月"
 
-#: koeditorrecurrence.cpp:985
-msgid "Displays appointment time information."
-msgstr "显示约会时间信息。"
+#: archivedialog.cpp:119
+msgid "Archive &file:"
+msgstr "存档文件(&F)："
 
-#: koeditorrecurrence.cpp:1004
-msgid "Recurrence Rule"
-msgstr "重现规则"
+#: archivedialog.cpp:123
+msgid "*.ics|iCalendar Files"
+msgstr "*.ics|iCalendar 文件"
 
-#: koeditorrecurrence.cpp:1006
+#: archivedialog.cpp:125
+#, fuzzy
 msgid ""
-"Options concerning the type of recurrence this event or to-do should have."
+"The path of the archive. The events and to-dos will be added to the archive "
+"file, so any events that are already in the file will not be modified or "
+"deleted. You can later load or merge the file like any other calendar. It is "
+"not saved in a special format, it uses the iCalendar format. "
 msgstr ""
+"存档的路径。约会将会被添加到存档文件中，所以该文件中已有的约会不会被修改或删除。和其它任何日历一样，您可以稍后装入或合并存档文件。存档文件并不是以特殊格式保存的"
+"，只是 vCalendar 格式。"
 
-#: koeditorrecurrence.cpp:1043
-msgid "Recurrence Range..."
-msgstr "重现范围..."
+#: archivedialog.cpp:134
+msgid "Type of Items to Archive"
+msgstr "要存档的项目类型"
 
-#: koeditorrecurrence.cpp:1046 koeditorrecurrence.cpp:1063
+#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 141
+#: archivedialog.cpp:136 rc.cpp:990 searchdialog.cpp:72
+#, no-c-format
+msgid "&Events"
+msgstr "事件(&E)"
+
+#: archivedialog.cpp:137
+#, fuzzy
+msgid "Completed &To-dos"
+msgstr "隐藏已完成的待办事宜(&M)"
+
+#: archivedialog.cpp:139
 msgid ""
-"Options concerning the time range during which this event or to-do should "
-"recur."
+"Here you can select which items should be archived. Events are archived if they "
+"ended before the date given above; to-dos are archived if they were finished "
+"before the date."
 msgstr ""
 
-#: koeditorrecurrence.cpp:1055
-msgid "Exceptions..."
-msgstr "例外..."
+#: archivedialog.cpp:144
+msgid "&Delete only, do not save"
+msgstr "只删除，不保存(&D)"
 
-#: koeditorrecurrence.cpp:1395
+#: archivedialog.cpp:147
+#, fuzzy
 msgid ""
-"The end date '%1' of the recurrence must be after the start date '%2' of the "
-"event."
-msgstr ""
+"Select this option to delete old events and to-dos without saving them. It is "
+"not possible to recover the events later."
+msgstr "选择此选项可删除旧约会，而不先保存。以后将无法恢复这些约会。"
 
-#: koeditorrecurrence.cpp:1409
+#: archivedialog.cpp:211
 msgid ""
-"A weekly recurring event or task has to have at least one weekday associated "
-"with it."
+"The archive file name is not valid.\n"
 msgstr ""
+"存档文件名无效。\n"
 
-#: koeditorrecurrence.cpp:1443
-#, fuzzy
-msgid "Recurrence"
-msgstr "重现(&U)"
-
-#: koincidenceeditor.cpp:73
-msgid "&Templates..."
-msgstr "模板(&T)..."
+#: koagendaview.cpp:320 koagendaview.cpp:815 multiagendaview.cpp:62
+msgid "All Day"
+msgstr "全天"
 
-#: koincidenceeditor.cpp:86
-msgid "Atte&ndees"
-msgstr "出席者(&N)"
+#: koeditorgeneralevent.cpp:99 koeditorgeneraltodo.cpp:100
+msgid "Date && Time"
+msgstr "日期和时间"
 
-#: koincidenceeditor.cpp:88
-msgid ""
-"The Attendees tab allows you to Add or Remove Attendees to/from this event or "
-"to-do."
+#: koeditorgeneralevent.cpp:101
+msgid "Sets options related to the date and time of the event or to-do."
 msgstr ""
 
-#: koincidenceeditor.cpp:172
-msgid "Unable to find template '%1'."
-msgstr "找不到模板“%1”。"
+#: koeditorgeneralevent.cpp:111
+msgid "&Start:"
+msgstr "起始(&S)："
 
-#: koincidenceeditor.cpp:177
-msgid "Error loading template file '%1'."
-msgstr "载入模板文件“%1”时发生错误。"
+#: koeditorgeneralevent.cpp:121
+msgid "&End:"
+msgstr "结束(&E)："
 
-#: koincidenceeditor.cpp:376 koincidenceeditor.cpp:377
-msgid "Counter proposal"
-msgstr ""
+#: koeditorgeneralevent.cpp:131
+#, fuzzy
+msgid "All-&day"
+msgstr "全天"
 
-#: koeditoralarms.cpp:83
-msgid "Reminder Dialog"
-msgstr "提醒对话框"
+#: koeditorgeneralevent.cpp:150 koeditorgeneraltodo.cpp:157
+#, fuzzy
+msgid "Recurrence:"
+msgstr "重现(&U)"
 
-#. i18n: file koeditoralarms_base.ui line 271
-#: koeditoralarms.cpp:86 rc.cpp:220 rc.cpp:1934
-#, no-c-format
-msgid "Program"
+#: koeditorgeneralevent.cpp:162 koeditorgeneraltodo.cpp:169
+#, fuzzy
+msgid "Reminder:"
+msgstr "提醒(&R)："
+
+#: koeditorgeneralevent.cpp:182
+msgid "S&how time as:"
+msgstr "显示时间为(&H)："
+
+#: koeditorgeneralevent.cpp:183
+msgid "Sets how this time will appear on your Free/Busy information."
 msgstr ""
 
-#: koeditoralarms.cpp:92
-msgid "Audio"
-msgstr "音频"
+#: koeditorgeneralevent.cpp:190
+msgid "Busy"
+msgstr "忙"
 
-#: koeditoralarms.cpp:95 koprefsdialog.cpp:175
-msgid "Unknown"
-msgstr "未知"
+#: koeditorgeneralevent.cpp:191
+msgid "Free"
+msgstr "闲"
 
-#: koeditoralarms.cpp:106 printing/calprintdefaultplugins.cpp:310
-msgid ""
-"_: N days/hours/minutes before/after the start/end\n"
-"%1 before the start"
+#: koeditorgeneralevent.cpp:205
+msgid "You have not yet definitely responded to this invitation."
 msgstr ""
 
-#: koeditoralarms.cpp:109 printing/calprintdefaultplugins.cpp:313
-msgid ""
-"_: N days/hours/minutes before/after the start/end\n"
-"%1 after the start"
-msgstr ""
+#: kocounterdialog.cpp:37 koeditorgeneralevent.cpp:208
+msgid "Accept"
+msgstr "接受"
 
-#: koeditoralarms.cpp:114 printing/calprintdefaultplugins.cpp:318
-msgid ""
-"_: N days/hours/minutes before/after the start/end\n"
-"%1 before the end"
-msgstr ""
+#: kocounterdialog.cpp:37 koeditorgeneralevent.cpp:212
+msgid "Decline"
+msgstr "拒绝"
 
-#: koeditoralarms.cpp:117 printing/calprintdefaultplugins.cpp:321
-msgid ""
-"_: N days/hours/minutes before/after the start/end\n"
-"%1 after the end"
-msgstr ""
+#: koeditorgeneralevent.cpp:434 koeditorgeneralevent.cpp:448
+#: printing/calprintdefaultplugins.cpp:155
+msgid "Duration: "
+msgstr "持续时间："
 
-#: koeditoralarms.cpp:126 printing/calprintdefaultplugins.cpp:330
+#: koeditorgeneralevent.cpp:435
 #, c-format
 msgid ""
-"_n: 1 day\n"
-"%n days"
+"_n: 1 Day\n"
+"%n Days"
 msgstr "%n 天"
 
-#: koeditoralarms.cpp:129 koeditorgeneralevent.cpp:432
-#: printing/calprintdefaultplugins.cpp:333
+#: koeditoralarms.cpp:173 koeditorgeneralevent.cpp:450
+#: printing/calprintdefaultplugins.cpp:352
 #, c-format
 msgid ""
 "_n: 1 hour\n"
 "%n hours"
 msgstr "%n 小时"
 
-#: koeditoralarms.cpp:132 koeditorgeneralevent.cpp:439
-#: printing/calprintdefaultplugins.cpp:336
+#: koeditorgeneralevent.cpp:454
+msgid ", "
+msgstr "，"
+
+#: koeditoralarms.cpp:176 koeditorgeneralevent.cpp:457
+#: printing/calprintdefaultplugins.cpp:355
 #, c-format
 msgid ""
 "_n: 1 minute\n"
 "%n minutes"
 msgstr "%n 分钟"
 
-#: koeditoralarms.cpp:148
-msgid "Edit Reminders"
-msgstr "编辑提醒"
-
-#: koagendaitem.cpp:560
-msgid "Attendee \"%1\" added to the calendar item \"%2\""
-msgstr ""
-
-#: koagendaitem.cpp:560
-msgid "Attendee added"
-msgstr "出席者已添加"
-
-#: koagendaitem.cpp:819 koagendaitem.cpp:917
-msgid "%1 - %2"
-msgstr "%1 - %2"
-
-#: koagendaitem.cpp:828
-#, c-format
-msgid "- %1"
-msgstr "- %1"
-
-#: incidencechanger.cpp:61
+#: koeditorgeneralevent.cpp:465
 msgid ""
-"Some attendees were removed from the incidence. Shall cancel messages be sent "
-"to these attendees?"
+"Shows the duration of the event or to-do with the current start and end dates "
+"and times."
 msgstr ""
 
-#: incidencechanger.cpp:63
-msgid "Attendees Removed"
-msgstr "出席者已删除"
-
-#: incidencechanger.cpp:63
-msgid "Send Messages"
-msgstr "发送信件"
-
-#: incidencechanger.cpp:63 kogroupware.cpp:279 kogroupware.cpp:291
-#: kogroupware.cpp:299
-msgid "Do Not Send"
-msgstr "不发送"
-
-#: incidencechanger.cpp:344 kodialogmanager.cpp:113
-msgid "Unable to save %1 \"%2\"."
-msgstr "无法保存 %1“%2”。"
+#: koeditorgeneralevent.cpp:482
+msgid "From: %1   To: %2   %3"
+msgstr "从：%1  至：%2    %3"
 
-#: importdialog.cpp:41
-msgid "Import Calendar"
-msgstr "导入日历"
+#: koeditorgeneralevent.cpp:495
+msgid "Please specify a valid start time, for example '%1'."
+msgstr "请指定一个有效的起始时间，如“%1”。"
 
-#: importdialog.cpp:48
-msgid "Import calendar at '%1' into KOrganizer."
-msgstr "将“%1”处的日历导入到 KOrganizer。"
+#: koeditorgeneralevent.cpp:502
+msgid "Please specify a valid end time, for example '%1'."
+msgstr "请指定一个有效的结束时间，如“%1”。"
 
-#: importdialog.cpp:57
-msgid "Add as new calendar"
-msgstr "添加为新日历"
+#: koeditorgeneralevent.cpp:510
+msgid "Please specify a valid start date, for example '%1'."
+msgstr "请指定一个有效的起始日期，如“%1”。"
 
-#: importdialog.cpp:59
-msgid "Merge into existing calendar"
-msgstr "合并入已有日历"
+#: koeditorgeneralevent.cpp:517
+msgid "Please specify a valid end date, for example '%1'."
+msgstr "请指定一个有效的结束日期，如“%1”。"
 
-#: importdialog.cpp:62
-msgid "Open in separate window"
-msgstr "在独立窗口中打开"
+#: koeditorgeneralevent.cpp:533
+msgid ""
+"The event ends before it starts.\n"
+"Please correct dates and times."
+msgstr ""
+"该事件在起始前结束。\n"
+"请更正日期和时间。"
 
-#: koprefsdialog.cpp:99
+#: koprefsdialog.cpp:103
 msgid "Saving Calendar"
 msgstr "保存日历"
 
-#: koprefsdialog.cpp:161
+#: koprefsdialog.cpp:165
 msgid "Timezone:"
 msgstr "时区："
 
 #. i18n: file korganizer.kcfg line 135
-#: koprefsdialog.cpp:162 rc.cpp:567 rc.cpp:1154
+#: koprefsdialog.cpp:166 rc.cpp:570 rc.cpp:1200
 #, no-c-format
 msgid ""
 "Select your timezone from the list of locations on this drop down box. If your "
@@ -909,145 +2202,161 @@ msgid ""
 "automatically adjust for daylight savings."
 msgstr ""
 
-#: koprefsdialog.cpp:206
+#: koeditoralarms.cpp:125 koeditorattachments.cpp:198 koprefsdialog.cpp:179
+msgid "Unknown"
+msgstr "未知"
+
+#: koprefsdialog.cpp:210
 msgid "[No selection]"
 msgstr "[没有选择]"
 
 #. i18n: file korganizer.kcfg line 138
-#: koprefsdialog.cpp:255 rc.cpp:570 rc.cpp:1157
+#: koprefsdialog.cpp:259 rc.cpp:573 rc.cpp:1203
 #, no-c-format
 msgid "Use holiday region:"
 msgstr "使用假日区域："
 
 #. i18n: file korganizer.kcfg line 139
-#: koprefsdialog.cpp:256 rc.cpp:573 rc.cpp:1160
+#: koprefsdialog.cpp:260 rc.cpp:576 rc.cpp:1206
 #, no-c-format
 msgid ""
 "Select from which region you want to use the holidays here. Defined holidays "
 "are shown as non-working days in the date navigator, the agenda view, etc."
 msgstr ""
 
-#: koprefsdialog.cpp:292
+#: koprefsdialog.cpp:296
 msgid "(None)"
 msgstr "(无)"
 
-#: koprefsdialog.cpp:319
-msgid "1 minute"
-msgstr "1 分钟"
+#: koprefsdialog.cpp:323
+#, fuzzy
+msgid "Reminders"
+msgstr "提醒"
 
-#: koprefsdialog.cpp:319
-msgid "5 minutes"
-msgstr "5 分钟"
+#: koprefsdialog.cpp:328
+msgid "Default reminder time:"
+msgstr "默认提醒时间："
 
-#: koprefsdialog.cpp:320
-msgid "10 minutes"
-msgstr "10 分钟"
+#. i18n: file koeditoralarms_base.ui line 66
+#: koeditorgeneral.cpp:232 koprefsdialog.cpp:335 korgac/alarmdialog.cpp:157
+#: rc.cpp:172 rc.cpp:2069
+#, no-c-format
+msgid "minute(s)"
+msgstr "分钟"
 
-#: koprefsdialog.cpp:320
-msgid "15 minutes"
-msgstr "15 分钟"
+#. i18n: file koeditoralarms_base.ui line 71
+#: koeditorgeneral.cpp:233 koprefsdialog.cpp:336 korgac/alarmdialog.cpp:158
+#: rc.cpp:175 rc.cpp:2072
+#, no-c-format
+msgid "hour(s)"
+msgstr "小时"
 
-#: koprefsdialog.cpp:321
-msgid "30 minutes"
-msgstr "30 分钟"
+#. i18n: file koeditoralarms_base.ui line 76
+#: koeditorgeneral.cpp:234 koeditorrecurrence.cpp:167 koprefsdialog.cpp:337
+#: korgac/alarmdialog.cpp:159 rc.cpp:178 rc.cpp:2075
+#, no-c-format
+msgid "day(s)"
+msgstr "天"
 
-#: koprefsdialog.cpp:322
-msgid "Default reminder time:"
-msgstr "默认提醒时间："
+#: koprefsdialog.cpp:349
+msgid ""
+"*.ogg *.wav *.mp3 *.wma *.flac *.aiff *.raw *.au *.ra|Audio Files (*.ogg *.wav "
+"*.mp3 *.wma *.flac *.aiff *.raw *.au *.ra)"
+msgstr ""
 
-#: koprefsdialog.cpp:325 koprefsdialog.cpp:328
-msgid "Enter the default reminder time here."
-msgstr "在此输入默认提醒时间。"
+#: koprefsdialog.cpp:363
+msgid "Enable reminders by default:"
+msgstr ""
 
-#: koprefsdialog.cpp:336
+#: koprefsdialog.cpp:371
 msgid "Working Hours"
 msgstr "上班时间"
 
-#: koprefsdialog.cpp:352
+#: koprefsdialog.cpp:387
 msgid ""
 "Check this box to make KOrganizer mark the working hours for this day of the "
 "week. If this is a work day for you, check this box, or the working hours will "
 "not be marked with color."
 msgstr ""
 
-#: koprefsdialog.cpp:473
+#: koprefsdialog.cpp:514
 msgid "Date Navigator"
 msgstr "日期导航器"
 
-#: koprefsdialog.cpp:482
+#: koprefsdialog.cpp:524
 msgid "Agenda View"
 msgstr "议事日程视图"
 
-#: koprefsdialog.cpp:488
+#: koprefsdialog.cpp:530
 msgid ""
 "_: suffix in the hour size spin box\n"
 " pixel"
 msgstr " 像素"
 
-#: koprefsdialog.cpp:495
+#: koprefsdialog.cpp:537
 msgid ""
 "_: suffix in the N days spin box\n"
 " days"
 msgstr " 天"
 
-#: koprefsdialog.cpp:520
+#: koprefsdialog.cpp:558
 msgid "Month View"
 msgstr "月视图"
 
-#: koprefsdialog.cpp:532
+#: koprefsdialog.cpp:568
 msgid "To-do View"
 msgstr "待办视图"
 
-#: koprefsdialog.cpp:577 koprefsdialog.cpp:585
+#: koprefsdialog.cpp:613 koprefsdialog.cpp:621
 msgid "Event text"
 msgstr "事件文本"
 
 #. i18n: file filteredit_base.ui line 193
-#: kolistview.cpp:216 koprefsdialog.cpp:666 kotodoview.cpp:395 rc.cpp:141
-#: rc.cpp:2117
+#: kolistview.cpp:221 koprefsdialog.cpp:703 kotodoview.cpp:394 rc.cpp:141
+#: rc.cpp:2225
 #, no-c-format
 msgid "Categories"
 msgstr "类别"
 
-#: koprefsdialog.cpp:673
+#: koprefsdialog.cpp:711
 msgid ""
 "Select here the event category you want to modify. You can change the selected "
 "category color using the button below."
 msgstr ""
 
-#: koprefsdialog.cpp:680
+#: koprefsdialog.cpp:718
 msgid ""
 "Choose here the color of the event category selected using the combo box above."
 msgstr ""
 
-#: koprefsdialog.cpp:686
+#: koprefsdialog.cpp:724
 msgid "Resources"
 msgstr "资源"
 
-#: koprefsdialog.cpp:692
+#: koprefsdialog.cpp:730
 msgid ""
 "Select here resource you want to modify. You can change the selected resource "
 "color using the button below."
 msgstr ""
 
-#: koprefsdialog.cpp:699
+#: koprefsdialog.cpp:737
 msgid ""
 "Choose here the color of the resource selected using the combo box above."
 msgstr ""
 
-#: koprefsdialog.cpp:844
+#: koprefsdialog.cpp:882
 msgid "Scheduler Mail Client"
 msgstr "日程安排的邮件客户端程序"
 
-#: koprefsdialog.cpp:847
+#: koprefsdialog.cpp:885
 msgid "Mail client"
 msgstr "邮件客户程序"
 
-#: koprefsdialog.cpp:852
+#: koprefsdialog.cpp:890
 msgid "Additional email addresses:"
 msgstr "额外的电子邮件地址："
 
-#: koprefsdialog.cpp:853
+#: koprefsdialog.cpp:891
 msgid ""
 "Add, edit or remove additional e-mails addresses here. These email addresses "
 "are the ones you have in addition to the one set in personal preferences. If "
@@ -1055,273 +2364,209 @@ msgid ""
 "to list this address here so KOrganizer can recognize it as yours."
 msgstr ""
 
-#: koprefsdialog.cpp:868
+#: koprefsdialog.cpp:906
 msgid "Additional email address:"
 msgstr "额外的电子邮件地址："
 
-#: koprefsdialog.cpp:869
+#: koprefsdialog.cpp:907
 msgid ""
 "Edit additional e-mails addresses here. To edit an address select it from the "
 "list above or press the \"New\" button below. These email addresses are the "
 "ones you have in addition to the one set in personal preferences."
 msgstr ""
 
-#: koprefsdialog.cpp:881
+#: koprefsdialog.cpp:919
 msgid "New"
 msgstr "新建"
 
-#: koprefsdialog.cpp:882
+#: koprefsdialog.cpp:920
 msgid ""
 "Press this button to add a new entry to the additional e-mail addresses list. "
 "Use the edit box above to edit the new entry."
 msgstr ""
 
-#: koprefsdialog.cpp:929 publishdialog.cpp:102
+#: koprefsdialog.cpp:967 publishdialog.cpp:102
 msgid "(EmptyEmail)"
 msgstr "(空电子邮件)"
 
-#: koprefsdialog.cpp:1080
+#: koprefsdialog.cpp:1123
 msgid "Configure &Plugin..."
 msgstr "配置插件(&P)..."
 
-#: koprefsdialog.cpp:1081
+#: koprefsdialog.cpp:1124
 msgid ""
 "This button allows you to configure the plugin that you have selected in the "
 "list above"
 msgstr ""
 
-#: koprefsdialog.cpp:1142
+#: koprefsdialog.cpp:1185
 msgid "Unable to configure this plugin"
 msgstr "无法配置此插件"
 
-#: history.cpp:185
-#, c-format
-msgid "Delete %1"
-msgstr "删除%1"
-
-#: history.cpp:214
-#, c-format
-msgid "Add %1"
-msgstr "添加%1"
-
-#: history.cpp:251
-#, c-format
-msgid "Edit %1"
-msgstr "编辑%1"
-
-#: freebusymanager.cpp:228
-msgid ""
-"<qt>No URL configured for uploading your free/busy list. Please set it in "
-"KOrganizer's configuration dialog, on the \"Free/Busy\" page. "
-"<br>Contact your system administrator for the exact URL and the account "
-"details.</qt>"
-msgstr ""
-
-#: freebusymanager.cpp:232
-msgid "No Free/Busy Upload URL"
-msgstr "无忙/闲上传 URL"
-
-#: freebusymanager.cpp:239
-msgid "<qt>The target URL '%1' provided is invalid.</qt>"
-msgstr ""
-
-#: freebusymanager.cpp:240
-msgid "Invalid URL"
-msgstr ""
-
-#: freebusymanager.cpp:330
-msgid ""
-"<qt>The software could not upload your free/busy list to the URL '%1'. There "
-"might be a problem with the access rights, or you specified an incorrect URL. "
-"The system said: <em>%2</em>."
-"<br>Please check the URL or contact your system administrator.</qt>"
-msgstr ""
-"<qt>软件无法将您的忙/闲列表上传到 URL %1 上。可能访问权限有问题，或者是您指定的 URL 不对。系统返回的信息：<em>%2</em>。"
-"<br>请检查 URL 或联系您的系统管理员。</qt>"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "TDE 简体中文翻译组"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "i18n-translation@lists.linux.net.cn"
-
-#: koeditorgeneral.cpp:104
-msgid "Owner:"
-msgstr "所有者："
-
-#: koeditorgeneral.cpp:108
-msgid "Sets the Title of this event or to-do."
-msgstr ""
-
-#: koeditorgeneral.cpp:109 koeditorgeneraljournal.cpp:63
-msgid "T&itle:"
-msgstr "标题(&I)："
-
-#: koeditorgeneral.cpp:127
-msgid "Sets where the event or to-do will take place."
-msgstr ""
-
-#: koeditorgeneral.cpp:128
-msgid "&Location:"
-msgstr "位置(&L)："
+#: searchdialog.cpp:49
+msgid "Find Events"
+msgstr "查找事件"
 
-#: koeditorgeneral.cpp:144
-msgid ""
-"Allows you to select the categories that this event or to-do belongs to."
-msgstr ""
+#: searchdialog.cpp:50
+msgid "&Find"
+msgstr "查找(&F)"
 
-#: koeditorgeneral.cpp:145
-#, fuzzy
-msgid "Categories:"
-msgstr "类别"
+#: searchdialog.cpp:62
+msgid "&Search for:"
+msgstr "搜索(&S)："
 
-#: koeditorgeneral.cpp:154
-#, fuzzy
-msgid "&Select..."
-msgstr "选择收信人..."
+#: searchdialog.cpp:70
+msgid "Search For"
+msgstr "搜索"
 
-#: koeditorgeneral.cpp:164
-msgid "Acc&ess:"
-msgstr "访问(&E)："
+#: searchdialog.cpp:73
+msgid "To-&dos"
+msgstr "待办(&D)"
 
-#: koeditorgeneral.cpp:165
-msgid ""
-"Sets whether the access to this event or to-do is restricted. Please note that "
-"KOrganizer currently does not use this setting, so the implementation of the "
-"restrictions will depend on the groupware server. This means that events or "
-"to-dos marked as private or confidential may be visible to others."
-msgstr ""
+#: searchdialog.cpp:74
+msgid "&Journal entries"
+msgstr "日记项(&J)"
 
-#: koeditorgeneral.cpp:186
-msgid ""
-"Sets the description for this event or to-do. This will be displayed in a "
-"reminder if one is set, as well as in a tooltip when you hover over the event."
-msgstr ""
+#: exportwebdialog.cpp:143 searchdialog.cpp:79
+msgid "Date Range"
+msgstr "日期范围"
 
-#: koeditorgeneral.cpp:210
-#, fuzzy
-msgid "No reminders configured"
-msgstr "配置了 1 个提前提醒"
+#: searchdialog.cpp:87
+msgid "Fr&om:"
+msgstr "来自(&O)："
 
-#: koeditorgeneral.cpp:216
-msgid "&Reminder:"
-msgstr "提醒(&R)："
+#: searchdialog.cpp:91
+msgid "&To:"
+msgstr "至(&T)："
 
-#: koeditorgeneral.cpp:218
-msgid "Activates a reminder for this event or to-do."
-msgstr ""
+#: searchdialog.cpp:95
+msgid "E&vents have to be completely included"
+msgstr "事件必须被完全包含(&V)"
 
-#: koeditorgeneral.cpp:220
-msgid "Sets how long before the event occurs the reminder will be triggered."
-msgstr ""
+#: searchdialog.cpp:98
+msgid "Include to-dos &without due date"
+msgstr "包含无到期时间的待办事宜(&W)"
 
-#. i18n: file koeditoralarms_base.ui line 60
-#: koeditorgeneral.cpp:228 korgac/alarmdialog.cpp:120 rc.cpp:172 rc.cpp:1886
-#, no-c-format
-msgid "minute(s)"
-msgstr "分钟"
+#: searchdialog.cpp:102
+msgid "Search In"
+msgstr "查找范围"
 
-#. i18n: file koeditoralarms_base.ui line 65
-#: koeditorgeneral.cpp:229 korgac/alarmdialog.cpp:121 rc.cpp:175 rc.cpp:1889
-#, no-c-format
-msgid "hour(s)"
-msgstr "小时"
+#: searchdialog.cpp:105
+msgid "Su&mmaries"
+msgstr "摘要(&M)"
 
-#: koeditorgeneral.cpp:237
-msgid "Advanced"
-msgstr "提前"
+#: searchdialog.cpp:107
+msgid "Desc&riptions"
+msgstr "描述(&R)"
 
-#: koeditorgeneral.cpp:322 koeditorgeneral.cpp:399
-msgid "Owner: "
-msgstr "所有者："
+#: searchdialog.cpp:108
+msgid "Cate&gories"
+msgstr "类别(&G)"
 
-#: koeditorgeneral.cpp:357
-#, c-format
+#: searchdialog.cpp:149
 msgid ""
-"_n: 1 advanced reminder configured\n"
-"%n advanced reminders configured"
-msgstr "配置了 %n 个高级提醒"
-
-#: koeditorgeneral.cpp:384
-msgid "1 advanced reminder configured"
-msgstr "配置了 1 个提前提醒"
+"Invalid search expression, cannot perform the search. Please enter a search "
+"expression using the wildcard characters '*' and '?' where needed."
+msgstr "无效的查找表达式，无法执行搜索。如有必要，请在查找表达中使用通配符“*”和“?”。"
 
-#: koeditorgeneral.cpp:422
-#, c-format
-msgid "Calendar: %1"
-msgstr "日历：%1"
+#: searchdialog.cpp:162
+msgid "No events were found matching your search expression."
+msgstr "没有事件匹配您的查找表达式。"
 
-#: koeditorgeneral.cpp:496
-#, c-format
-msgid ""
-"_n: One attendee\n"
-"%n attendees"
-msgstr "%n 个参与者"
+#: konewstuff.cpp:48
+msgid "Could not load calendar."
+msgstr "无法载入日历。"
 
-#: koeditorgeneralevent.cpp:102 koeditorgeneraltodo.cpp:102
-msgid "Date && Time"
-msgstr "日期和时间"
+#: konewstuff.cpp:63
+msgid "The downloaded events will be merged into your current calendar."
+msgstr "已下载的事件会合并到您当前的日历。"
 
-#: koeditorgeneraltodo.cpp:107
+#: koeditorgeneraltodo.cpp:105
 msgid "Sets options for due and start dates and times for this to-do."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:114
+#: koeditorgeneraltodo.cpp:112
 msgid "Sets the start date for this to-do"
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:115
+#: koeditorgeneraltodo.cpp:113
 msgid "Sta&rt:"
 msgstr "起始(&R)："
 
-#: koeditorgeneraltodo.cpp:128
+#: koeditorgeneraltodo.cpp:126
 msgid "Sets the start time for this to-do."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:132
+#: koeditorgeneraltodo.cpp:130
 msgid "Sets the due date for this to-do."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:133
+#: koeditorgeneraltodo.cpp:131
 msgid "&Due:"
 msgstr "到期(&D)："
 
-#: koeditorgeneraltodo.cpp:148
+#: koeditorgeneraltodo.cpp:145
 msgid "Sets the due time for this to-do."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:152
+#: koeditorgeneraltodo.cpp:149
 msgid "Ti&me associated"
 msgstr "关联的时间(&M)"
 
-#: koeditorgeneraltodo.cpp:154
+#: koeditorgeneraltodo.cpp:151
 msgid ""
 "Sets whether or not this to-do's start and due dates have times associated with "
 "them."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:172
-msgid "Sets the current completion status of this to-do as a percentage."
+#: koeditorgeneraltodo.cpp:189
+#, fuzzy
+msgid "&Completed:"
+msgstr "完成"
+
+#: koeditorgeneraltodo.cpp:194
+msgid "Toggle between 0% and 100% complete"
+msgstr ""
+
+#: koeditorgeneraltodo.cpp:196
+#, c-format
+msgid ""
+"Click this checkbox to toggle the completed percentage of the to-do between 0% "
+"or 100%"
+msgstr ""
+
+#: koeditorgeneraltodo.cpp:204
+msgid "Select the completed percentage"
+msgstr ""
+
+#: koeditorgeneraltodo.cpp:206
+msgid "Use this combobox to set the completion percentage of the to-do."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:178
+#: koeditorgeneraltodo.cpp:209
 #, no-c-format
 msgid ""
 "_: Percent complete\n"
 "%1 %"
 msgstr "%1 %"
 
-#: koeditorgeneraltodo.cpp:184 koeditorgeneraltodo.cpp:544
-msgid "co&mpleted"
-msgstr "已完成(&M)"
+#: koeditorgeneraltodo.cpp:215
+#, fuzzy
+msgid ""
+"_: completed on\n"
+"on"
+msgstr "完成于(&M)"
+
+#: koeditorgeneraltodo.cpp:230
+msgid "&Priority:"
+msgstr "优先级(&P)："
 
-#: koeditorgeneraltodo.cpp:197
+#: koeditorgeneraltodo.cpp:235
+#, fuzzy
+msgid "Set the priority of the to-do"
+msgstr "设定此日记的标题。"
+
+#: koeditorgeneraltodo.cpp:237
 msgid ""
 "Sets the priority of this to-do on a scale from one to nine, with one being the "
 "highest priority, five being a medium priority, and nine being the lowest. In "
@@ -1329,915 +2574,924 @@ msgid ""
 "appropriate scale."
 msgstr ""
 
-#: koeditorgeneraltodo.cpp:203
-msgid "&Priority:"
-msgstr "优先级(&P)："
-
-#: koeditorgeneraltodo.cpp:207
+#: koeditorgeneraltodo.cpp:241
 msgid "unspecified"
 msgstr "未指定"
 
-#: koeditorgeneraltodo.cpp:208 kotodoview.cpp:417
+#: koeditorgeneraltodo.cpp:242 kotodoview.cpp:418
 msgid "1 (highest)"
 msgstr "1(最高)"
 
-#: koeditorgeneraltodo.cpp:209 kotodoview.cpp:418
+#: koeditorgeneraltodo.cpp:243 kotodoview.cpp:419
 msgid "2"
 msgstr "2"
 
-#: koeditorgeneraltodo.cpp:210 kotodoview.cpp:419
+#: koeditorgeneraltodo.cpp:244 kotodoview.cpp:420
 msgid "3"
 msgstr "3"
 
-#: koeditorgeneraltodo.cpp:211 kotodoview.cpp:420
+#: koeditorgeneraltodo.cpp:245 kotodoview.cpp:421
 msgid "4"
 msgstr "4"
 
-#: koeditorgeneraltodo.cpp:212 kotodoview.cpp:421
+#: koeditorgeneraltodo.cpp:246 kotodoview.cpp:422
 msgid "5 (medium)"
 msgstr "5(中)"
 
-#: koeditorgeneraltodo.cpp:213 kotodoview.cpp:422
+#: koeditorgeneraltodo.cpp:247 kotodoview.cpp:423
 msgid "6"
 msgstr "6"
 
-#: koeditorgeneraltodo.cpp:214 kotodoview.cpp:423
+#: koeditorgeneraltodo.cpp:248 kotodoview.cpp:424
 msgid "7"
 msgstr "7"
 
-#: koeditorgeneraltodo.cpp:215 kotodoview.cpp:424
+#: koeditorgeneraltodo.cpp:249 kotodoview.cpp:425
 msgid "8"
 msgstr "8"
 
-#: koeditorgeneraltodo.cpp:216 kotodoview.cpp:425
+#: koeditorgeneraltodo.cpp:250 kotodoview.cpp:426
 msgid "9 (lowest)"
 msgstr "9(最低)"
 
-#: koeditorgeneraltodo.cpp:451
+#: koeditorgeneraltodo.cpp:492
 msgid "Please specify a valid due date."
 msgstr "请指定一个有效的到期日期。"
 
-#: koeditorgeneraltodo.cpp:456
+#: koeditorgeneraltodo.cpp:497
 msgid "Please specify a valid due time."
 msgstr "请指定一个有效的到期时间。"
 
-#: koeditorgeneraltodo.cpp:464
+#: koeditorgeneraltodo.cpp:505
 msgid "Please specify a valid start date."
 msgstr "请指定一个有效的起始日期。"
 
-#: koeditorgeneraltodo.cpp:469
+#: koeditorgeneraltodo.cpp:510
 msgid "Please specify a valid start time."
 msgstr "请指定一个有效的起始时间。"
 
-#: koeditorgeneraltodo.cpp:486
+#: koeditorgeneraltodo.cpp:527
 msgid "The start date cannot be after the due date."
 msgstr "起始时间不能在到期时间之后。"
 
-#: koeditorgeneraltodo.cpp:508
+#: koeditorgeneraltodo.cpp:572
 #, c-format
 msgid "Start: %1"
 msgstr "起始：%1"
 
-#: koeditorgeneraltodo.cpp:516
+#: koeditorgeneraltodo.cpp:580
 #, c-format
 msgid "   Due: %1"
 msgstr "   到期：%1"
 
-#: koeditorgeneraltodo.cpp:537
-msgid "co&mpleted on"
-msgstr "完成于(&M)"
-
-#: kogroupware.cpp:168
-#, c-format
-msgid "Error message: %1"
-msgstr ""
+#: exportwebdialog.cpp:73
+msgid "Export Calendar as Web Page"
+msgstr "将日历导出为网页"
 
-#: kogroupware.cpp:172
-msgid "Error while processing an invitation or update."
+#: exportwebdialog.cpp:131
+msgid ""
+"You are about to set all preferences to default values. All custom "
+"modifications will be lost."
 msgstr ""
 
-#: kogroupware.cpp:271
-msgid "event"
-msgstr "事件"
-
-#: kogroupware.cpp:272
-msgid "task"
-msgstr "任务"
+#: exportwebdialog.cpp:132
+msgid "Setting Default Preferences"
+msgstr "设置默认首选项"
 
-#: kogroupware.cpp:273
-msgid "journal entry"
-msgstr "日历项"
+#: exportwebdialog.cpp:133
+msgid "Reset to Defaults"
+msgstr "重置为默认值"
 
-#: kogroupware.cpp:275
-msgid ""
-"This %1 includes other people. Should email be sent out to the attendees?"
-msgstr "此%1包含其他人。是否要给与会人发出电子邮件？"
+#: exportwebdialog.cpp:140 koeventeditor.cpp:122 kojournaleditor.cpp:76
+#: kotodoeditor.cpp:100
+msgid "General"
+msgstr "常规"
 
-#: kogroupware.cpp:279
-msgid "Group Scheduling Email"
-msgstr "分组日程安排邮件"
+#: exportwebdialog.cpp:148
+msgid "View Type"
+msgstr "视图类型"
 
-#: kogroupware.cpp:279
-msgid "Send Email"
-msgstr "发送电子邮件"
+#: exportwebdialog.cpp:161
+msgid "Destination"
+msgstr "目标"
 
-#: kogroupware.cpp:289
-msgid "Do you want to send a status update to the organizer of this task?"
-msgstr "您是否想要给组织者发送此任务的状态更新？"
+#: exportwebdialog.cpp:178
+msgid "To-dos"
+msgstr "待办"
 
-#: kogroupware.cpp:291 kogroupware.cpp:299
-msgid "Send Update"
-msgstr "发送更新"
+#: exportwebdialog.cpp:199
+msgid "Events"
+msgstr "事件"
 
-#: kogroupware.cpp:295
+#: datenavigatorcontainer.cpp:52
 msgid ""
-"Your status as an attendee of this event changed. Do you want to send a status "
-"update to the organizer of this event?"
-msgstr "您对此事件的参与状态发生了变化。您是否想要给组织者发送此任务的状态更新？"
+"<qt>"
+"<p>Select the dates you want to display in KOrganizer's main view here. Hold "
+"down the mouse button to select more than one day.</p>"
+"<p>Press the top buttons to browse to the next / previous months or years.</p>"
+"<p>Each line shows a week. The number in the left column is the number of the "
+"week in the year. Press it to select the whole week.</p></qt>"
+msgstr ""
 
-#: kogroupware.cpp:302
-msgid ""
-"You are not the organizer of this event. Deleting it will bring your calendar "
-"out of sync with the organizers calendar. Do you really want to delete it?"
-msgstr "您并非此事件的组织者。删除此事件将使您的日历与组织者的日历脱离同步。您真的想要删除此事件吗？"
+#: journalentry.cpp:92
+msgid "[Add Journal Entry]"
+msgstr "[添加日记项]"
 
-#: kogroupware.cpp:307
-msgid ""
-"You are not the organizer of this event. Editing it will bring your calendar "
-"out of sync with the organizers calendar. Do you really want to edit it?"
-msgstr "您并非此事件的组织者。编辑此事件将使您的日历与组织者的日历脱离同步。您真的想要编辑此事件吗？"
+#: journalentry.cpp:191
+msgid "Sets the Title of this journal entry."
+msgstr "设置为此日记项的标题。"
 
-#: kogroupware.cpp:323
-msgid "<No summary given>"
-msgstr "<没有给出概览>"
+#: journalentry.cpp:193
+msgid "&Title: "
+msgstr "标题(&T)："
 
-#: kogroupware.cpp:342 mailscheduler.cpp:89
-#, c-format
-msgid "Counter proposal: %1"
-msgstr ""
+#: journalentry.cpp:202
+msgid "Ti&me: "
+msgstr "时间(&M)："
 
-#: kogroupware.cpp:344
-msgid "Proposed new meeting time: %1 - %2"
+#: journalentry.cpp:208
+msgid "Determines whether this journal entry has a time associated with it"
 msgstr ""
 
-#: publishdialog.cpp:43
-msgid "Select Addresses"
-msgstr "选择地址"
-
-#: publishdialog.cpp:101
-msgid "(EmptyName)"
-msgstr "(空名称)"
-
-#: kocorehelper.cpp:43 kodaymatrix.cpp:283 komonthview.cpp:913
-msgid ""
-"_: delimiter for joining holiday names\n"
-", "
-msgstr ""
+#: journalentry.cpp:210
+#, fuzzy
+msgid "Sets the time associated with this journal entry"
+msgstr "设定此日记的标题。"
 
-#: kolistview.cpp:205 korgac/alarmdialog.cpp:97 kotodoview.cpp:387
-#: plugins/timespanview/timespanwidget.cpp:51
-#: printing/calprintdefaultplugins.cpp:1003
-#: printing/calprintdefaultplugins.cpp:1085
-msgid "Summary"
-msgstr "摘要"
+#: journalentry.cpp:217 journalentry.cpp:218
+msgid "Delete this journal entry"
+msgstr "删除此日记项"
 
-#: kolistview.cpp:206 korgac/alarmdialog.cpp:81
-msgid "Reminder"
-msgstr "提醒"
+#: journalentry.cpp:225
+msgid "Edit this journal entry"
+msgstr "编辑此日记项"
 
-#: kolistview.cpp:207 kotodoview.cpp:388
-msgid "Recurs"
-msgstr "重复"
+#: journalentry.cpp:226
+msgid "Opens an editor dialog for this journal entry"
+msgstr "打开此日记项的编辑对话框"
 
-#: kolistview.cpp:208 printing/calprintdefaultplugins.cpp:1004
-msgid "Start Date"
-msgstr "起始日期"
+#: journalentry.cpp:234
+#, fuzzy
+msgid "Print this journal entry"
+msgstr "编辑此日记项"
 
-#: kolistview.cpp:210
-msgid "Start Time"
-msgstr "起始时间："
+#: journalentry.cpp:235
+#, fuzzy
+msgid "Opens the print dialog for this journal entry"
+msgstr "打开此日记项的编辑对话框"
 
-#: kolistview.cpp:212
-msgid "End Date"
-msgstr "结束日期"
+#: koeditoralarms.cpp:113
+msgid "Reminder Dialog"
+msgstr "提醒对话框"
 
-#: kolistview.cpp:214
-msgid "End Time"
-msgstr "结束时间："
+#. i18n: file koeditoralarms_base.ui line 277
+#: koeditoralarms.cpp:116 rc.cpp:220 rc.cpp:2117
+#, no-c-format
+msgid "Program"
+msgstr ""
 
-#: eventarchiver.cpp:104
-#, c-format
-msgid "There are no items before %1"
-msgstr "在 %1 之前没有项目"
+#: koeditoralarms.cpp:122
+msgid "Audio"
+msgstr "音频"
 
-#: eventarchiver.cpp:131
+#: koeditoralarms.cpp:137 printing/calprintdefaultplugins.cpp:329
 msgid ""
-"Delete all items before %1 without saving?\n"
-"The following items will be deleted:"
+"_: N days/hours/minutes before/after the start/end\n"
+"%1 before the start"
 msgstr ""
-"要删除 %1 前的所有项目而不保存吗？\n"
-"下列项目将被删除："
-
-#: eventarchiver.cpp:134
-msgid "Delete Old Items"
-msgstr "删除旧项目"
-
-#: eventarchiver.cpp:202
-#, c-format
-msgid "Cannot write archive file %1."
-msgstr "无法写入存档文件 %1。"
-
-#: eventarchiver.cpp:211
-msgid "Cannot write archive to final destination."
-msgstr "无法将存档写入最终位置。"
-
-#: kotodoview.cpp:218
-msgid "Cannot move to-do to itself or a child of itself."
-msgstr "不能把待办事宜移到它自己或其子事宜上。"
-
-#: kotodoview.cpp:219
-msgid "Drop To-do"
-msgstr "放下待办事宜"
 
-#: kotodoview.cpp:231
-msgid "Unable to change to-do's parent, because the to-do cannot be locked."
+#: koeditoralarms.cpp:141 printing/calprintdefaultplugins.cpp:332
+msgid ""
+"_: N days/hours/minutes before/after the start/end\n"
+"%1 after the start"
 msgstr ""
 
-#: kotodoview.cpp:279
+#: koeditoralarms.cpp:148
 msgid ""
-"Unable to add attendees to the to-do, because the to-do cannot be locked."
+"_: N days/hours/minutes before/after the due date\n"
+"%1 before the to-do is due"
 msgstr ""
 
-#: kotodoview.cpp:369
-msgid "To-dos:"
-msgstr "待办："
-
-#: kotodoview.cpp:373
-msgid "Click to add a new to-do"
-msgstr "单击可添加新待办事宜"
+#: koeditoralarms.cpp:151 printing/calprintdefaultplugins.cpp:337
+msgid ""
+"_: N days/hours/minutes before/after the start/end\n"
+"%1 before the end"
+msgstr ""
 
-#: kotodoview.cpp:389 printing/calprintdefaultplugins.cpp:1006
-#: printing/calprintdefaultplugins.cpp:1077
-msgid "Priority"
-msgstr "优先级"
+#: koeditoralarms.cpp:157
+msgid ""
+"_: N days/hours/minutes before/after the due date\n"
+"%1 after the to-do is due"
+msgstr ""
 
-#: kotodoview.cpp:391 printing/calprintdefaultplugins.cpp:1092
-msgid "Complete"
-msgstr "完成"
+#: koeditoralarms.cpp:160 printing/calprintdefaultplugins.cpp:340
+msgid ""
+"_: N days/hours/minutes before/after the start/end\n"
+"%1 after the end"
+msgstr ""
 
-#: kotodoview.cpp:393
-msgid "Due Date/Time"
-msgstr "到期日期/时间"
+#: koeditoralarms.cpp:170 printing/calprintdefaultplugins.cpp:349
+#, c-format
+msgid ""
+"_n: 1 day\n"
+"%n days"
+msgstr "%n 天"
 
-#: kotodoview.cpp:397
-msgid "Sort Id"
-msgstr "排序 Id"
+#: koeditoralarms.cpp:193
+#, fuzzy
+msgid "Advanced Reminders"
+msgstr "编辑提醒"
 
-#: kotodoview.cpp:416
+#: koeditoralarms.cpp:204
 msgid ""
-"_: Unspecified priority\n"
-"unspecified"
-msgstr "未指定"
-
-#: actionmanager.cpp:452 kotodoview.cpp:463
-msgid "New &To-do..."
-msgstr "新建待办事宜(&T)..."
+"_: Add a new alarm to the alarm list.\n"
+"&Add"
+msgstr ""
 
-#: actionmanager.cpp:456 kotodoview.cpp:465
-msgid "New Su&b-to-do..."
-msgstr "新建子待办事宜(&B)..."
+#: koeditoralarms.cpp:460
+#, fuzzy
+msgid "before the to-do starts"
+msgstr "开始前"
 
-#: kotodoview.cpp:467
-msgid "&Make this To-do Independent"
-msgstr "将此待办事宜独立(&M)"
+#: koeditoralarms.cpp:461
+#, fuzzy
+msgid "after the to-do starts"
+msgstr "开始后"
 
-#: kotodoview.cpp:469
-msgid "Make all Sub-to-dos &Independent"
-msgstr "将全部子待办事宜独立(&I)"
+#: koeditoralarms.cpp:462
+#, fuzzy
+msgid "before the to-do is due"
+msgstr "结束前"
 
-#: kotodoview.cpp:472
-msgid "&Copy To"
-msgstr "复制到(&C)"
+#: koeditoralarms.cpp:463
+#, fuzzy
+msgid "after the to-do is due"
+msgstr "结束后"
 
-#: kotodoview.cpp:473
-msgid "&Move To"
-msgstr "移动到(&M)"
+#: koeditoralarms.cpp:466
+msgid "Select the reminder trigger relative to the start or due time"
+msgstr ""
 
-#: kotodoview.cpp:475
+#: koeditoralarms.cpp:469
 msgid ""
-"_: delete completed to-dos\n"
-"Pur&ge Completed"
-msgstr "销毁已完成(&G)"
-
-#: kotodoview.cpp:484
-msgid "&New To-do..."
-msgstr "新建待办事宜(&N)..."
+"Use this combobox to specify if you want the reminder to trigger before or "
+"after the start or due time."
+msgstr ""
 
-#: kotodoview.cpp:486
+#: kocorehelper.cpp:47 kodaymatrix.cpp:287 komonthview.cpp:1006
 msgid ""
-"_: delete completed to-dos\n"
-"&Purge Completed"
-msgstr "销毁已完成(&P)"
-
-#: koagendaview.cpp:290 koagendaview.cpp:771 multiagendaview.cpp:58
-msgid "All Day"
-msgstr "全天"
+"_: delimiter for joining holiday names\n"
+", "
+msgstr ""
 
-#: koagendaview.cpp:588
-msgid ""
-"_: short_weekday date (e.g. Mon 13)\n"
-"%1 %2"
-msgstr "%1 %2"
+#: printing/calprintdefaultplugins.cpp:142
+#: printing/calprintdefaultplugins.cpp:171
+#: printing/calprintdefaultplugins.cpp:190
+#, fuzzy
+msgid "Start date: "
+msgstr "起始日期："
 
-#: koagendaview.cpp:1402
-msgid "Unable to modify this to-do, because it cannot be locked."
-msgstr "无法修改此待办事宜，因为无法锁定它。"
+#: printing/calprintdefaultplugins.cpp:146
+#: printing/calprintdefaultplugins.cpp:175
+#, fuzzy
+msgid "No start date"
+msgstr "起始日期："
 
-#: kowhatsnextview.cpp:100
-msgid "What's Next?"
-msgstr "下面什么事"
+#: printing/calprintdefaultplugins.cpp:151
+#, fuzzy
+msgid "End date: "
+msgstr "结束日期："
 
-#: kowhatsnextview.cpp:107
+#: printing/calprintdefaultplugins.cpp:158
+#, fuzzy, c-format
 msgid ""
-"_: Date from - to\n"
-"%1 - %2"
-msgstr "%1 - %2"
+"_n: 1 hour \n"
+"%n hours "
+msgstr "%n 小时"
 
-#: kowhatsnextview.cpp:123
-msgid "Events:"
-msgstr "事件："
+#: printing/calprintdefaultplugins.cpp:161
+#, fuzzy, c-format
+msgid ""
+"_n: 1 minute \n"
+"%n minutes "
+msgstr "%n 分钟"
 
-#: kowhatsnextview.cpp:159
-msgid "To-do:"
-msgstr "待办事宜："
+#: printing/calprintdefaultplugins.cpp:164
+#, fuzzy
+msgid "No end date"
+msgstr "没有结束日期(&N)"
 
-#: kowhatsnextview.cpp:198 kowhatsnextview.cpp:219
-msgid "Events and to-dos that need a reply:"
-msgstr "需要回复的事件与待办事宜："
+#: printing/calprintdefaultplugins.cpp:180
+#, fuzzy
+msgid "Due date: "
+msgstr "到期日期"
 
-#: kowhatsnextview.cpp:282 plugins/printing/year/yearprint.cpp:174
-msgid ""
-"_: date from - to\n"
-"%1 - %2"
-msgstr "%1 - %2"
+#: printing/calprintdefaultplugins.cpp:184
+#, fuzzy
+msgid "No due date"
+msgstr "到期日期"
 
-#: kowhatsnextview.cpp:287
+#: printing/calprintdefaultplugins.cpp:298
 msgid ""
-"_: date, from - to\n"
-"%1, %2 - %3"
-msgstr "%1，%2 - %3"
-
-#: kowhatsnextview.cpp:315
-msgid "  (Due: %1)"
-msgstr "  (到期：%1)"
+"_: except for listed dates\n"
+" except"
+msgstr ""
 
-#: kocounterdialog.cpp:36
-msgid "Counter-Event Viewer"
-msgstr "回应事件查看器"
+#: printing/calprintdefaultplugins.cpp:306
+msgid "Repeats: "
+msgstr "重复："
 
-#: kocounterdialog.cpp:37 koeditorgeneralevent.cpp:213
-msgid "Decline"
-msgstr "拒绝"
+#: printing/calprintdefaultplugins.cpp:313
+#, fuzzy
+msgid "No reminders"
+msgstr "提醒"
 
-#: kocounterdialog.cpp:37 koeditorgeneralevent.cpp:209
-msgid "Accept"
-msgstr "接受"
+#: printing/calprintdefaultplugins.cpp:316
+#, fuzzy, c-format
+msgid ""
+"_n: Reminder: \n"
+"%n reminders: "
+msgstr "%n 分钟"
 
-#: koprefs.cpp:87
+#: printing/calprintdefaultplugins.cpp:359
+#: printing/calprintdefaultplugins.cpp:604
 msgid ""
-"_: Default export file\n"
-"calendar.html"
-msgstr "calendar.html"
+"_: Spacer for the joined list of categories\n"
+", "
+msgstr ""
 
-#: koprefs.cpp:163
-msgid "Appointment"
-msgstr "约会"
+#: printing/calprintdefaultplugins.cpp:366
+#, fuzzy
+msgid "Organizer: "
+msgstr "组织者：%1"
 
-#: koprefs.cpp:163
-msgid "Business"
-msgstr "公事"
+#: printing/calprintdefaultplugins.cpp:376
+#, fuzzy
+msgid "Location: "
+msgstr "位置(&L)："
 
-#: koprefs.cpp:164
-msgid "Meeting"
-msgstr "会议"
+#: printing/calprintdefaultplugins.cpp:435
+#, fuzzy
+msgid "Description:"
+msgstr "描述(&D)"
 
-#: koprefs.cpp:164
-msgid "Phone Call"
-msgstr "电话"
+#: printing/calprintdefaultplugins.cpp:441
+msgid "Notes:"
+msgstr ""
 
-#: koprefs.cpp:164
-msgid "Education"
-msgstr "教育"
+#: printing/calprintdefaultplugins.cpp:454
+msgid "No Subitems"
+msgstr ""
 
-#: koprefs.cpp:165 printing/calprintpluginbase.cpp:279
-msgid "Holiday"
-msgstr "假日"
+#: printing/calprintdefaultplugins.cpp:458
+#, fuzzy
+msgid ""
+"_n: 1 Subitem:\n"
+"%1 Subitems:"
+msgstr "%n 分钟"
 
-#: koprefs.cpp:165
-msgid "Vacation"
-msgstr "休假"
+#: printing/calprintdefaultplugins.cpp:475
+msgid ""
+"_: no status\n"
+"none"
+msgstr ""
 
-#: koprefs.cpp:165
-msgid "Special Occasion"
-msgstr "特殊场合"
+#: printing/calprintdefaultplugins.cpp:477
+msgid ""
+"_: unknown status\n"
+"unknown"
+msgstr ""
 
-#: koprefs.cpp:166
-msgid "Personal"
-msgstr "个人的"
+#: printing/calprintdefaultplugins.cpp:484
+#, fuzzy
+msgid ""
+"Start Date: %1\n"
+msgstr "起始日期："
 
-#: koprefs.cpp:166
-msgid "Travel"
-msgstr "旅游"
+#: printing/calprintdefaultplugins.cpp:489
+#, fuzzy
+msgid ""
+"Start Time: %1\n"
+msgstr "起始时间："
 
-#: koprefs.cpp:167
-msgid "Birthday"
-msgstr "生日"
+#: printing/calprintdefaultplugins.cpp:496
+#, fuzzy
+msgid ""
+"Due Date: %1\n"
+msgstr "到期日期"
 
-#: calendarview.cpp:262
+#: printing/calprintdefaultplugins.cpp:501
 msgid ""
-"<p><em>No Item Selected</em></p>"
-"<p>Select an event, to-do or journal entry to view its details here.</p>"
+"_: subitem due time\n"
+"Due Time: %1\n"
 msgstr ""
 
-#: calendarview.cpp:268
+#: printing/calprintdefaultplugins.cpp:506
 msgid ""
-"View the details of events, journal entries or to-dos selected in KOrganizer's "
-"main view here."
+"_n: subitem counter\n"
+"%1: "
 msgstr ""
 
-#: calendarview.cpp:421
-msgid "Could not load calendar '%1'."
-msgstr "无法载入日历“%1”。"
-
-#: calendarview.cpp:644
+#: printing/calprintdefaultplugins.cpp:514
 msgid ""
-"The timezone setting was changed. Do you want to keep the absolute time of the "
-"items in your calendar, which will show them to be at a different time than "
-"before, or move them to be at the old time also in the new timezone?"
+"_: subitem Status: statusString\n"
+"Status: %1\n"
 msgstr ""
-"时区设置已经更改。您是否想要在您的日历中保留项目的绝对时间？也就是说，您是想要这些项目在日历中显示为不同的时间，还是在新时区中也显示为旧时间？"
-
-#: calendarview.cpp:648
-msgid "Keep Absolute Times?"
-msgstr "保留绝对时间吗？"
-
-#: calendarview.cpp:649
-msgid "Keep Times"
-msgstr "保留时间"
 
-#: calendarview.cpp:650
-msgid "Move Times"
-msgstr "移动时间"
-
-#: calendarview.cpp:718
-msgid "To-do completed: %1 (%2)"
-msgstr "已完成的待办：%1(%2)"
-
-#: calendarview.cpp:729
-#, c-format
-msgid "Journal of %1"
-msgstr "%1 的日记"
-
-#: calendarview.cpp:782
+#: printing/calprintdefaultplugins.cpp:517
 msgid ""
-"The item \"%1\" is filtered by your current filter rules, so it will be hidden "
-"and not appear in the view."
-msgstr "项目“%1”已经被您当前的过滤器规则所规律，所以该项目将被隐藏，不会出现在视图中。"
+"_: subitem Priority: N\n"
+"Priority: %1\n"
+msgstr ""
 
-#: calendarview.cpp:785
-msgid "Filter Applied"
-msgstr "已应用过滤器"
+#: printing/calprintdefaultplugins.cpp:519
+msgid ""
+"_: subitem Secrecy: secrecyString\n"
+"Secrecy: %1\n"
+msgstr ""
 
-#: calendarview.cpp:840
-msgid "The item \"%1\" will be permanently deleted."
-msgstr "项目“%1”将被永久地删除。"
+#: printing/calprintdefaultplugins.cpp:522
+msgid "Subitems:"
+msgstr ""
 
-#: calendarview.cpp:841 calendarview.cpp:1979 calendarview.cpp:2041
-#: calendarview.cpp:2049 koeditorattachments.cpp:379 koeventeditor.cpp:382
-#: kojournaleditor.cpp:201 kotodoeditor.cpp:328
-msgid "KOrganizer Confirmation"
-msgstr "KOrganizer 确认"
+#: printing/calprintdefaultplugins.cpp:532
+#, fuzzy
+msgid "No Attachments"
+msgstr "附件(&M)"
 
-#: calendarview.cpp:1164
+#: printing/calprintdefaultplugins.cpp:535
+#, fuzzy
 msgid ""
-"Unable to turn sub-to-do into a top-level to-do, because it cannot be locked."
-msgstr "无法将子待办转换为顶级待办，因为该项目无法被锁定。"
-
-#: calendarview.cpp:1187
-msgid "Make sub-to-dos independent"
-msgstr "将子待办事宜独立"
+"_n: 1 Attachment:\n"
+"%1 Attachments:"
+msgstr "%n 分钟"
 
-#: calendarview.cpp:1254
-msgid "Dissociate occurrence"
-msgstr "拆分重现"
+#: printing/calprintdefaultplugins.cpp:541
+msgid ""
+"_: Spacer for list of attachments\n"
+"  "
+msgstr ""
 
-#: calendarview.cpp:1264
-msgid "Dissociating the occurrence failed."
-msgstr "拆分重现失败。"
+#: printing/calprintdefaultplugins.cpp:555
+#, fuzzy
+msgid "No Attendees"
+msgstr "出席者(&N)"
 
-#: calendarview.cpp:1265 calendarview.cpp:1292
-msgid "Dissociating Failed"
-msgstr "拆分失败"
+#: printing/calprintdefaultplugins.cpp:557
+#, fuzzy, c-format
+msgid ""
+"_n: 1 Attendee:\n"
+"%n Attendees:"
+msgstr "%n 分钟"
 
-#: calendarview.cpp:1282
-msgid "Dissociate future occurrences"
-msgstr "拆分未来的重现"
+#: printing/calprintdefaultplugins.cpp:564
+msgid ""
+"_: Formatting of an attendee: 'Name (Role): Status', e.g. 'Reinhold Kainhofer "
+"<reinhold@kainhofer.com> (Participant): Awaiting Response'\n"
+"%1 (%2): %3"
+msgstr ""
 
-#: calendarview.cpp:1291
-msgid "Dissociating the future occurrences failed."
-msgstr "拆分未来的重现失败。"
+#: printing/calprintdefaultplugins.cpp:568
+#, fuzzy
+msgid "Attendees:"
+msgstr "出席者(&N)"
 
-#: calendarview.cpp:1309 calendarview.cpp:1380 calendarview.cpp:1441
-msgid "No item selected."
-msgstr "没有选择项目。"
+#: printing/calprintdefaultplugins.cpp:575
+#, fuzzy, c-format
+msgid "Status: %1"
+msgstr "起始：%1"
 
-#: calendarview.cpp:1330 calendarview.cpp:1393
-msgid "The item information was successfully sent."
-msgstr "项目信息已成功发送。"
+#: printing/calprintdefaultplugins.cpp:579
+#, fuzzy, c-format
+msgid "Secrecy: %1"
+msgstr "起始：%1"
 
-#: calendarview.cpp:1331
-msgid "Publishing"
-msgstr "发布"
+#: printing/calprintdefaultplugins.cpp:585
+msgid "Show as: Busy"
+msgstr ""
 
-#: calendarview.cpp:1333
-msgid "Unable to publish the item '%1'"
-msgstr "无法发布项目“%1”"
+#: printing/calprintdefaultplugins.cpp:587
+msgid "Show as: Free"
+msgstr ""
 
-#: calendarview.cpp:1394
-msgid "Forwarding"
-msgstr "转发"
+#: printing/calprintdefaultplugins.cpp:593
+msgid "This task is overdue!"
+msgstr ""
 
-#: calendarview.cpp:1396
-msgid "Unable to forward the item '%1'"
-msgstr "无法转发项目“%1”"
+#: printing/calprintdefaultplugins.cpp:599
+msgid "Settings: "
+msgstr ""
 
-#: calendarview.cpp:1419
-msgid "The free/busy information was successfully sent."
-msgstr "忙/闲信息已成功发送。"
+#: printing/calprintdefaultplugins.cpp:603
+msgid "Categories: "
+msgstr "类别："
 
-#: calendarview.cpp:1420 calendarview.cpp:1463
-msgid "Sending Free/Busy"
-msgstr "发送忙/闲"
+#: printing/calprintdefaultplugins.cpp:754
+#, fuzzy
+msgid "Today's Events"
+msgstr "查找事件"
 
-#: calendarview.cpp:1422
-msgid "Unable to publish the free/busy data."
-msgstr "无法发布忙/闲数据。"
+#: printing/calprintdefaultplugins.cpp:776 printing/calprintpluginbase.cpp:986
+#: printing/calprintpluginbase.cpp:1010
+msgid ""
+"_: summary, location\n"
+"%1, %2"
+msgstr ""
 
-#: calendarview.cpp:1447
-msgid "The item has no attendees."
-msgstr "该项目没有出席人。"
+#: printing/calprintdefaultplugins.cpp:935
+msgid ""
+"_: date from-to\n"
+"%1 - %2"
+msgstr "%1 - %2"
 
-#: calendarview.cpp:1459
+#: printing/calprintdefaultplugins.cpp:937
 msgid ""
-"The groupware message for item '%1'was successfully sent.\n"
-"Method: %2"
+"_: date from-\n"
+"to\n"
+"%1 -\n"
+"%2"
 msgstr ""
-"项目“%1”的群件消息已经发送。\n"
-"方法：%2"
+"%1 - \n"
+"%2"
 
-#: calendarview.cpp:1468
+#: printing/calprintdefaultplugins.cpp:958
+#, fuzzy
 msgid ""
-"_: Groupware message sending failed. %2 is "
-"request/reply/add/cancel/counter/etc.\n"
-"Unable to send the item '%1'.\n"
-"Method: %2"
+"_: date from - to (week number)\n"
+"%1 - %2 (Week %3)"
 msgstr ""
-"无法发送项目“%1”。\n"
-"方法：%2"
-
-#: calendarview.cpp:1541
-msgid "*.ics|ICalendars"
-msgstr "*.ics|ICalendars"
-
-#: calendarview.cpp:1554
-msgid "The journal entries can not be exported to a vCalendar file."
-msgstr "日记项无法导出到 vCalendar 文件中。"
+"%1 - %2\n"
+"第 %3 周"
 
-#: calendarview.cpp:1555
-msgid "Data Loss Warning"
-msgstr "数据丢失警告"
+#: printing/calprintdefaultplugins.cpp:960
+#, fuzzy
+msgid ""
+"_: date from -\n"
+"to (week number)\n"
+"%1 -\n"
+"%2 (Week %3)"
+msgstr ""
+"%1 - %2\n"
+"第 %3 周"
 
-#: actionmanager.cpp:992 calendarview.cpp:1555
-msgid "Proceed"
-msgstr "继续"
+#: komonthview.cpp:978 printing/calprintdefaultplugins.cpp:1123
+msgid ""
+"_: monthname year\n"
+"%1 %2"
+msgstr "%2年%1"
 
-#: calendarview.cpp:1560
-msgid "*.vcs|vCalendars"
-msgstr "*.vcs|VCalendars"
+#: printing/calprintdefaultplugins.cpp:1213
+msgid "Start Date"
+msgstr "起始日期"
 
-#: calendarview.cpp:1583
-msgid "&Previous Day"
-msgstr "上一天(&P)"
+#: printing/calprintdefaultplugins.cpp:1214
+msgid "Due Date"
+msgstr "到期日期"
 
-#: calendarview.cpp:1584
-msgid "&Next Day"
-msgstr "下一天(&N)"
+#: kotodoview.cpp:388 printing/calprintdefaultplugins.cpp:1215
+#: printing/calprintdefaultplugins.cpp:1289
+msgid "Priority"
+msgstr "优先级"
 
-#: calendarview.cpp:1586
-msgid "&Previous Week"
-msgstr "上一周(&P)"
+#: printing/calprintdefaultplugins.cpp:1216
+msgid "Percent Complete"
+msgstr "完成百分比"
 
-#: calendarview.cpp:1587
-msgid "&Next Week"
-msgstr "下一周(&N)"
+#: printing/calprintdefaultplugins.cpp:1222
+msgid "Ascending"
+msgstr "升序"
 
-#: calendarview.cpp:1683 calendarview.cpp:1716
-msgid "No filter"
-msgstr "无过滤器"
+#: printing/calprintdefaultplugins.cpp:1223
+msgid "Descending"
+msgstr "降序"
 
-#: calendarview.cpp:1974
-msgid ""
-"The item \"%1\" has sub-to-dos. Do you want to delete just this item and make "
-"all its sub-to-dos independent, or delete the to-do with all its sub-to-dos?"
-msgstr "项目“%1”有子待办事宜。您是想要只删除此项目并将其全部子待办独立，还是删除此项目及其全部子待办事宜？"
+#: printing/calprintdefaultplugins.cpp:1232
+msgid "To-do list"
+msgstr "待办事宜列表"
 
-#: calendarview.cpp:1980
-msgid "Delete Only This"
-msgstr "仅删除本次"
+#: kotodoview.cpp:390 printing/calprintdefaultplugins.cpp:1303
+msgid "Complete"
+msgstr "完成"
 
-#: calendarview.cpp:1983
-msgid "Deleting sub-to-dos"
-msgstr "删除子待办事宜"
+#: printing/calprintdefaultplugins.cpp:1311
+msgid "Due"
+msgstr "到期"
 
-#: calendarview.cpp:2007
-msgid ""
-"The item \"%1\" is marked read-only and cannot be deleted; it probably belongs "
-"to a read-only calendar resource."
+#: printing/calprinter.cpp:133
+msgid "Unable to print, no valid print style was returned."
 msgstr ""
 
-#: calendarview.cpp:2011
-msgid "Removing not possible"
-msgstr "无法删除"
-
-#: calendarview.cpp:2038
-#, fuzzy
-msgid ""
-"The calendar item \"%1\" recurs over multiple dates; are you sure you want to "
-"delete it and all its recurrences?"
-msgstr "该事件会在好几个日期重复出现，您确实要删除该事件及其所有重复出现吗？"
+#: printing/calprinter.cpp:134
+msgid "Printing error"
+msgstr ""
 
-#: calendarview.cpp:2044
-#, fuzzy
-msgid ""
-"The calendar item \"%1\" recurs over multiple dates. Do you want to delete only "
-"the current one on %2, only all future recurrences, or all its recurrences?"
-msgstr "该事件会在好几个日期重复出现。您是想要删除该事件所有的重现，还是只删除 %1 的重现？"
+#: printing/calprinter.cpp:155
+msgid "Print Calendar"
+msgstr "打印日历"
 
-#: calendarview.cpp:2049
-msgid "Delete C&urrent"
-msgstr "删除当前(&U)"
+#: printing/calprinter.cpp:179
+msgid "Print Style"
+msgstr "打印样式"
 
-#: calendarview.cpp:2050
-msgid "Delete &Future"
-msgstr "删除未来(&F)"
+#: printing/calprinter.cpp:193
+msgid "Page &orientation:"
+msgstr "页面方向(&O)："
 
-#: calendarview.cpp:2051
-msgid "Delete &All"
-msgstr "全部删除(&A)"
+#: printing/calprinter.cpp:198
+msgid "Use Default Orientation of Selected Style"
+msgstr "使用选中样式的默认方向"
 
-#: calendarview.cpp:2133
-msgid "Delete all completed to-dos?"
-msgstr "删除所有已完成的待办事宜吗？"
+#: printing/calprinter.cpp:199
+msgid "Use Printer Default"
+msgstr "使用打印机默认值"
 
-#: calendarview.cpp:2133
-msgid "Purge To-dos"
-msgstr "销毁待办事宜"
+#: printing/calprinter.cpp:237 printing/calprinter.cpp:239
+msgid "&Preview"
+msgstr "预览(&P)"
 
-#: calendarview.cpp:2133
-msgid "Purge"
-msgstr "销毁"
+#: printing/cellitem.cpp:36
+msgid "<undefined>"
+msgstr "<未定义>"
 
-#: calendarview.cpp:2137
-msgid "Purging completed to-dos"
-msgstr "销毁已完成的待办事宜"
+#: printing/calprintpluginbase.cpp:142
+msgid "This printing style does not have any configuration options."
+msgstr "此打印样式无任何可配置的选项。"
 
-#: calendarview.cpp:2152
-msgid "Unable to purge to-dos with uncompleted children."
-msgstr "不能销毁有未完成子事件的待办事宜。"
+#: printing/calprintpluginbase.cpp:563
+#, c-format
+msgid ""
+"_: print date: formatted-datetime\n"
+"printed: %1"
+msgstr ""
 
-#: calendarview.cpp:2153
-msgid "Delete To-do"
-msgstr "删除待办事宜"
+#: printing/calprintpluginbase.cpp:908
+msgid ""
+"_: starttime - endtime summary\n"
+"%1-%2 %3"
+msgstr ""
 
-#: calendarview.cpp:2168
-msgid "Unable to edit item: it is locked by another process."
-msgstr "无法编辑事件：因其被其它进程锁定。"
+#: printing/calprintpluginbase.cpp:914
+msgid ""
+"_: starttime - endtime summary, location\n"
+"%1-%2 %3, %4"
+msgstr ""
 
-#: calendarview.cpp:2201
-#, c-format
-msgid "Unable to copy the item to %1."
-msgstr "无法将项目复制到 %1。"
+#: printing/calprintpluginbase.cpp:935
+msgid ""
+"_: weekday month date\n"
+"%1 %2 %3"
+msgstr "%1 %2 %3"
 
-#: calendarview.cpp:2202
-msgid "Copying Failed"
-msgstr "复制失败"
+#: printing/calprintpluginbase.cpp:1018 printing/calprintpluginbase.cpp:1022
+#, fuzzy
+msgid "%1 (Due: %2)"
+msgstr "  (到期：%1)"
 
-#: calendarview.cpp:2243
+#: printing/calprintpluginbase.cpp:1029
 #, c-format
-msgid "Unable to move the item to %1."
-msgstr "无法将项目移至 %1。"
-
-#: calendarview.cpp:2244
-msgid "Moving Failed"
-msgstr "移动失败"
+msgid "To-do: %1"
+msgstr "待办事宜：%1"
 
-#: komailclient.cpp:188
-msgid "No running instance of KMail found."
-msgstr "未发现 KMail 的运行实例。"
+#: printing/calprintpluginbase.cpp:1575
+msgid "%1%"
+msgstr "%1%"
 
-#: kdatenavigator.cpp:187
+#: printing/calprintpluginbase.cpp:1679
 msgid ""
-"_: start/end week number of line in date picker\n"
-"%1/%2"
-msgstr "%1/%2"
-
-#: navigatorbar.cpp:71
-msgid "Previous year"
-msgstr "上一年"
-
-#: navigatorbar.cpp:77
-msgid "Previous month"
-msgstr "上一月"
-
-#: navigatorbar.cpp:84
-msgid "Next month"
-msgstr "下一月"
+"_: Description - date\n"
+"%1 - %2"
+msgstr "%1 - %2"
 
-#: navigatorbar.cpp:90
-msgid "Next year"
-msgstr "下一年"
+#: printing/calprintpluginbase.cpp:1700
+#, c-format
+msgid "Person: %1"
+msgstr "人员：%1"
 
-#: navigatorbar.cpp:97
-msgid "Select a month"
-msgstr "选择月"
+#: printing/calprintpluginbase.cpp:1701
+#, c-format
+msgid "%1"
+msgstr "%1"
 
-#: komonthview.cpp:883 navigatorbar.cpp:161
-#: printing/calprintdefaultplugins.cpp:917
+#: printing/calprintpluginbase.cpp:1719
 msgid ""
-"_: monthname year\n"
-"%1 %2"
-msgstr "%2年%1"
+"_: Date range: Month dayStart - dayEnd\n"
+"%1 %2 - %3"
+msgstr "%1 %2 - %3"
 
-#: datenavigatorcontainer.cpp:51
+#: printing/calprintpluginbase.cpp:1724
 msgid ""
-"<qt>"
-"<p>Select the dates you want to display in KOrganizer's main view here. Hold "
-"down the mouse button to select more than one day.</p>"
-"<p>Press the top buttons to browse to the next / previous months or years.</p>"
-"<p>Each line shows a week. The number in the left column is the number of the "
-"week in the year. Press it to select the whole week.</p></qt>"
-msgstr ""
+"_: Date range: monthStart dayStart - monthEnd dayEnd\n"
+"%1 %2 - %3 %4"
+msgstr "%1 %2 - %3 %4"
 
-#: journalentry.cpp:92
-msgid "[Add Journal Entry]"
-msgstr "[添加日记项]"
+#: printing/calprintdefaultplugins.h:47
+#, fuzzy
+msgid "Print &incidence"
+msgstr "打印整周(&W)"
 
-#: journalentry.cpp:191
-msgid "Sets the Title of this journal entry."
-msgstr "设置为此日记项的标题。"
+#: printing/calprintdefaultplugins.h:51
+#, fuzzy
+msgid "Prints an incidence on one page"
+msgstr "在一页上打印一周的全部"
 
-#: journalentry.cpp:193
-msgid "&Title: "
-msgstr "标题(&T)："
+#: printing/calprintdefaultplugins.h:99
+msgid "Print da&y"
+msgstr "打印整日(&Y)"
 
-#: journalentry.cpp:202
-msgid "Ti&me: "
-msgstr "时间(&M)："
+#: printing/calprintdefaultplugins.h:103
+msgid "Prints all events of a single day on one page"
+msgstr "在一页上打印一天的全部事件"
 
-#: journalentry.cpp:208
-msgid "Determines whether this journal entry has a time associated with it"
-msgstr ""
+#: printing/calprintdefaultplugins.h:136
+msgid "Print &week"
+msgstr "打印整周(&W)"
 
-#: journalentry.cpp:210
-#, fuzzy
-msgid "Sets the time associated with this journal entry"
-msgstr "设定此日记的标题。"
+#: printing/calprintdefaultplugins.h:140
+msgid "Prints all events of one week on one page"
+msgstr "在一页上打印一周的全部"
 
-#: journalentry.cpp:217 journalentry.cpp:218
-msgid "Delete this journal entry"
-msgstr "删除此日记项"
+#: printing/calprintdefaultplugins.h:178
+msgid "Print mont&h"
+msgstr "打印整月(&H)"
 
-#: journalentry.cpp:225
-msgid "Edit this journal entry"
-msgstr "编辑此日记项"
+#: printing/calprintdefaultplugins.h:182
+msgid "Prints all events of one month on one page"
+msgstr "在一页上打印一个月的全部事件"
 
-#: journalentry.cpp:226
-msgid "Opens an editor dialog for this journal entry"
-msgstr "打开此日记项的编辑对话框"
+#: printing/calprintdefaultplugins.h:221
+msgid "Print to-&dos"
+msgstr "打印待办(&D)"
 
-#: journalentry.cpp:234
-#, fuzzy
-msgid "Print this journal entry"
-msgstr "编辑此日记项"
+#: printing/calprintdefaultplugins.h:225
+msgid "Prints all to-dos in a (tree-like) list"
+msgstr "打印树形列表中的全部待办事宜"
 
-#: journalentry.cpp:235
-#, fuzzy
-msgid "Opens the print dialog for this journal entry"
-msgstr "打开此日记项的编辑对话框"
+#: komonthview.cpp:427
+msgid ""
+"_: 'Month day' for month view cells\n"
+"%1 %2"
+msgstr "%1 %2"
 
-#: korgac/alarmdockwindow.cpp:56 korgac/korgacmain.cpp:65
-#: korgac/korgacmain.cpp:66
-msgid "KOrganizer Reminder Daemon"
-msgstr "KOrganizer 提醒守护程序"
+#: filtereditdialog.cpp:51
+msgid "Edit Calendar Filters"
+msgstr "编辑日历过滤"
 
-#: korgac/korgacmain.cpp:70 korgac/korgacmain.cpp:72
-msgid "Maintainer"
-msgstr "维护者"
+#: filtereditdialog.cpp:99
+msgid "Press this button to define a new filter."
+msgstr "按此按钮可定义新过滤器"
 
-#: korgac/alarmdockwindow.cpp:67
-msgid "Suspend All"
-msgstr "全部挂起"
+#: filtereditdialog.cpp:100
+msgid "Press this button to remove the currently active filter."
+msgstr "按此按钮可删除目前突出显示的过滤器。"
 
-#: korgac/alarmdockwindow.cpp:68
-msgid "Dismiss All"
-msgstr "全部错过"
+#: filtereditdialog.cpp:189
+#, c-format
+msgid "New Filter %1"
+msgstr "新过滤器 %1"
 
-#: korgac/alarmdockwindow.cpp:73
-msgid "Reminders Enabled"
-msgstr "提醒已启用"
+#: filtereditdialog.cpp:201 koeventeditor.cpp:392 kotodoeditor.cpp:328
+msgid "This item will be permanently deleted."
+msgstr "该项目将被永久地删除。"
 
-#: korgac/alarmdockwindow.cpp:75
-msgid "Start Reminder Daemon at Login"
-msgstr "登录时启动提醒守护程序"
+#: filtereditdialog.cpp:201
+msgid "Delete Confirmation"
+msgstr "删除确认"
 
-#: korgac/alarmdockwindow.cpp:113
-#, c-format
-msgid ""
-"_n: There is 1 active reminder.\n"
-"There are %n active reminders."
-msgstr "有 %n 个激活的提醒。"
+#: timezone.cpp:39
+msgid "KOrganizer Timezone Test"
+msgstr "KOrganizer 时区测试"
 
-#: korgac/alarmdockwindow.cpp:180
+#: tips.cpp:3
+#, fuzzy
 msgid ""
-"Do you want to start the KOrganizer reminder daemon at login (note that you "
-"will not get reminders whilst the daemon is not running)?"
-msgstr "您是否想要在登录时启动 KOrganizer 提醒守护程序(请注意，若该守护程序不运行，您将无法得到提醒)？"
-
-#: korgac/alarmdockwindow.cpp:182
-msgid "Close KOrganizer Reminder Daemon"
-msgstr "关闭 KOrganizer 提醒守护程序"
-
-#: korgac/alarmdockwindow.cpp:183
-msgid "Start"
-msgstr "启动"
+"<p>...that you can synchronize your calendar data with the data on a Palm Pilot "
+"by using <a href=\"http://www.slac.com/pilone/kpilot_home\">KPilot</a>?\n"
+"</p>\n"
+msgstr ""
+"<p>...您可以用 <a href=\"http://www.slac.com/pilone/kpilot_home\">KPilot</a> "
+"把您的日历和 Palm Pilot 的数据同步。\n"
 
-#: korgac/alarmdockwindow.cpp:183
-msgid "Do Not Start"
-msgstr "不启动"
+#: tips.cpp:9
+msgid ""
+"<p>...that it is possible to show the current time in the calendar? Enable the "
+"current time line in the dialog which appears after selecting <b>Settings</b>"
+", <b>Configure KOrganizer...</b> from the menu bar.\n"
+"</p>\n"
+msgstr ""
 
-#: korgac/testalarmdlg.cpp:37
-msgid "TestKabc"
-msgstr "TestKabc"
+#: tips.cpp:15
+msgid ""
+"<p>...that KOrganizer supports Microsoft Exchange? Add the <b>"
+"Microsoft&reg; Exchange 2000 resource</b> using the <b>Resource View</b> "
+"from the KOrganizer sidebar.\n"
+"</p>\n"
+msgstr ""
 
-#: korgac/alarmdialog.cpp:82
+#: tips.cpp:21
 #, fuzzy
-msgid "Dismiss all"
-msgstr "全部错过"
+msgid ""
+"<p>...that you can select whether the week starts on Monday or on Sunday in the "
+"Trinity Control Center? KOrganizer uses this setting. Look at Regional & "
+"Accessibility->Country/Region & Languages in the Trinity Control Center, or "
+"select <b>Settings</b>,\n"
+"<b>Configure Date & Time...</b> from the menu bar. Select the Time & Dates "
+"tab.\n"
+"</p>\n"
+msgstr ""
+"<p>...您可以在 TDE 控制面板里选择一周的开始是周一还是周日。KOrganizer 会使用这个设置。请查看“个人设置”->"
+"“国家/地区与语言”的“时间与日期”标签。\n"
 
-#: koeditorgeneralevent.cpp:158 korgac/alarmdialog.cpp:82
-msgid "Edit..."
-msgstr "编辑..."
+#: tips.cpp:28
+msgid ""
+"<p>...that you can edit to-dos quickly by right clicking on the property you "
+"wish to change; like the priority, the category or the date?\n"
+"</p>\n"
+msgstr ""
 
-#: korgac/alarmdialog.cpp:82
-msgid "Suspend"
-msgstr "挂起"
+#: tips.cpp:34
+msgid ""
+"<p>...that you can view and edit a calendar from the shell with "
+"konsolekalendar? Run <b>konsolekalendar --help</b> for the available options.\n"
+"</p>\n"
+msgstr ""
 
-#: korgac/alarmdialog.cpp:86
-msgid "Dismiss"
-msgstr "错过"
+#: tips.cpp:40
+msgid ""
+"<p>...that your calender can display birthdays from your address book? It is "
+"even possible to set up reminders for them. To activate this, add the "
+"corresponding 'birthdays' resource to your calender.\n"
+"</p>\n"
+msgstr ""
 
-#: korgac/alarmdialog.cpp:92
-msgid "The following events triggered reminders:"
-msgstr "下列事件触发提醒："
+#: tips.cpp:46
+#, fuzzy
+msgid ""
+"<p>...that you can store your calendar on an FTP server? Use the standard file "
+"dialog to save the calendar to a URL like "
+"<b>ftp://username@ftpserver/filename</b>. You can make your calendar active and "
+"load and save it as if it were local, or add it permanently to your resources "
+"list, using the remote file resource. Just make sure that no two KOrganizer "
+"applications are working on the same file, at the same time.\n"
+"</p>\n"
+msgstr ""
+"<p>...您可在把您的日历存在 FTP 服务器上。使用标准的文件对话框，把您的日历存成类似 "
+"<b>ftp://username@ftpserver/filename</b> "
+"的网址即可。您可以启用、载入、保存您的日历，就像您在本机的日历一样。只是要确定不要有两个 KOrganizer 程序同时用同一个文件就行。\n"
 
-#: korgac/alarmdialog.cpp:98 printing/calprintdefaultplugins.cpp:1100
-msgid "Due"
-msgstr "到期"
+#: tips.cpp:52
+#, fuzzy
+msgid ""
+"<p>...that you can create hierarchical to-dos by clicking with the right mouse "
+"button on an existing to-do and selecting <b>New Sub-to-do</b> "
+"from the context menu?\n"
+"</p>\n"
+msgstr ""
+"<p>...您可以在现有的待办事宜上按鼠标右键、在菜单中选<b>新建子待办事宜</b>就可以创建层次式的待办事宜。\n"
 
-#: korgac/alarmdialog.cpp:114
-msgid "Suspend &duration:"
-msgstr "挂起间隔(&D)："
+#: tips.cpp:58
+msgid ""
+"<p>...that a color can be assigned to each category? Events with a certain "
+"category will be shown in that color. You can assign these in the section <b>"
+"Colors</b> within the dialog which appears after selecting <b>Settings</b>, <b>"
+"Configure KOrganizer...</b> from the menu bar.\n"
+"</p>\n"
+msgstr ""
 
-#: korgac/alarmdialog.cpp:123
-msgid "week(s)"
-msgstr "周"
+#: tips.cpp:64
+msgid ""
+"<p>...that you can view and edit a calendar with Konqueror? Just click on the "
+"calendar file to make Konqueror open it.\n"
+"</p>\n"
+msgstr ""
 
-#: korgac/alarmdialog.cpp:251
-msgid "Could not start KOrganizer."
-msgstr "无法启动 KOrganizer。"
+#: tips.cpp:70
+msgid ""
+"<p>...that it is possible to add an attachment to an event or to-do? To do so, "
+"add a link to the <b>Attachments</b> tab within the <b>Edit Event</b> or <b>"
+"Edit To-do</b> dialog.\n"
+"</p>\n"
+msgstr ""
 
-#: korganizer.cpp:290 kotimelineview.cpp:55 kotimelineview.cpp:123
-#: resourceview.cpp:227 resourceview.cpp:278
-msgid "Calendar"
-msgstr "日历"
+#: tips.cpp:76
+msgid ""
+"<p>...that you can export your calendar to HTML? Select <b>File</b>, <b>"
+"Export</b>, <b>Export Web Page...</b> from the menu bar to open the <b>"
+"Export calendar as web page</b> dialog.\n"
+"</p>\n"
+msgstr ""
 
-#: korganizer.cpp:298
-msgid "New Calendar"
-msgstr "新建日历"
+#: tips.cpp:82
+msgid ""
+"<p>...that you can purge completed to-dos in one step? Go to the <b>File</b> "
+"menu and choose <b>Purge Completed</b>.\n"
+msgstr ""
 
-#: korganizer.cpp:302
-msgid "read-only"
-msgstr "只读"
+#: tips.cpp:87
+msgid ""
+"<p>...that you can create a new sub-to-do by pasting a to-do while another one "
+"is selected?\n"
+"</p>\n"
+msgstr ""
 
 #: freebusyurldialog.cpp:40
 msgid "Edit Free/Busy Location"
@@ -2247,70 +3501,70 @@ msgstr "编辑忙/闲位置"
 msgid "Location of Free/Busy information for %1 <%2>:"
 msgstr "%1 <%2> 的忙/闲信息位置："
 
-#: koattendeeeditor.cpp:63
+#: koattendeeeditor.cpp:73
 msgid ""
 "Sets the identity corresponding to the organizer of this to-do or event. "
 "Identities can be set in the 'Personal' section of the KOrganizer "
 "configuration, or in the 'Security & Privacy'->'Password & User Account' "
-"section of the Trinity Control Center. In addition, identities are gathered from "
-"your KMail settings and from your address book. If you choose to set it "
-"globally for TDE in the Control Center, be sure to check 'Use email settings "
+"section of the Trinity Control Center. In addition, identities are gathered "
+"from your KMail settings and from your address book. If you choose to set it "
+"globally for KDE in the Control Center, be sure to check 'Use email settings "
 "from Control Center' in the 'Personal' section of the KOrganizer configuration."
 msgstr ""
 
-#: koattendeeeditor.cpp:75 koattendeeeditor.cpp:283
+#: koattendeeeditor.cpp:85 koattendeeeditor.cpp:292
 msgid "Identity as organizer:"
 msgstr "标识为组织者："
 
-#: koattendeeeditor.cpp:89
+#: koattendeeeditor.cpp:99
 msgid ""
 "Edits the name of the attendee selected in the list above, or adds a new "
 "attendee if there are no attendeesin the list."
 msgstr ""
 
-#: koattendeeeditor.cpp:94
+#: koattendeeeditor.cpp:104
 msgid "Na&me:"
 msgstr "姓名(&M)："
 
-#: koattendeeeditor.cpp:99
+#: koattendeeeditor.cpp:109
 msgid "Click to add a new attendee"
 msgstr "单击可添加新与会者"
 
-#: koattendeeeditor.cpp:106
+#: koattendeeeditor.cpp:117
 msgid "Edits the role of the attendee selected in the list above."
 msgstr ""
 
-#: koattendeeeditor.cpp:110
+#: koattendeeeditor.cpp:121
 msgid "Ro&le:"
 msgstr "角色(&L)："
 
-#: koattendeeeditor.cpp:124
+#: koattendeeeditor.cpp:135
 msgid ""
 "Edits the current attendance status of the attendee selected in the list above."
 msgstr ""
 
-#: koattendeeeditor.cpp:128
+#: koattendeeeditor.cpp:139
 msgid "Stat&us:"
 msgstr "状态(&U)："
 
-#: koattendeeeditor.cpp:151
+#: koattendeeeditor.cpp:162
 msgid ""
 "Edits whether to send an email to the attendee selected in the list above to "
 "request a response concerning attendance."
 msgstr ""
 
-#: koattendeeeditor.cpp:154
+#: koattendeeeditor.cpp:165
 msgid "Re&quest response"
 msgstr "请求回复(&Q)"
 
 #. i18n: file filteredit_base.ui line 29
-#: koattendeeeditor.cpp:161 rc.cpp:99 rc.cpp:429 rc.cpp:441 rc.cpp:1481
-#: rc.cpp:1871 rc.cpp:2075
+#: koattendeeeditor.cpp:172 rc.cpp:99 rc.cpp:432 rc.cpp:444 rc.cpp:1848
+#: rc.cpp:2174 rc.cpp:2183
 #, no-c-format
 msgid "&New"
 msgstr "新建(&N)"
 
-#: koattendeeeditor.cpp:163
+#: koattendeeeditor.cpp:174
 msgid ""
 "Adds a new attendee to the list. Once the attendee is added, you will be able "
 "to edit the attendee's name, role, attendance status, and whether or not the "
@@ -2318,554 +3572,949 @@ msgid ""
 "your addressbook, click the 'Select Addressee' button instead."
 msgstr ""
 
-#: koattendeeeditor.cpp:175
+#: koattendeeeditor.cpp:186
 msgid "Removes the attendee selected in the list above."
 msgstr ""
 
-#: koattendeeeditor.cpp:179
+#: koattendeeeditor.cpp:190
 msgid "Select Addressee..."
 msgstr "选择收信人..."
 
-#: koattendeeeditor.cpp:182
+#: koattendeeeditor.cpp:193
 msgid "Opens your address book, allowing you to select new attendees from it."
 msgstr "您的地址簿，允许您从中选择新的与会者。"
 
-#: koattendeeeditor.cpp:263
+#: koattendeeeditor.cpp:265
+msgid "Please edit the example attendee, before adding more."
+msgstr ""
+
+#: koattendeeeditor.cpp:272 koattendeeeditor.cpp:551
 msgid "Firstname Lastname"
 msgstr "姓、名"
 
-#: koattendeeeditor.cpp:264
+#: koattendeeeditor.cpp:273
 msgid "name"
 msgstr "名字"
 
-#: koattendeeeditor.cpp:303
+#: koattendeeeditor.cpp:312
 #, c-format
 msgid "Organizer: %1"
 msgstr "组织者：%1"
 
-#: koattendeeeditor.cpp:399
+#: koattendeeeditor.cpp:480
 #, fuzzy, c-format
 msgid "Delegated to %1"
 msgstr "删除%1"
 
-#: koattendeeeditor.cpp:401
+#: koattendeeeditor.cpp:482
 #, fuzzy, c-format
 msgid "Delegated from %1"
 msgstr "删除%1"
 
-#: koattendeeeditor.cpp:403
+#: koattendeeeditor.cpp:484
 #, fuzzy
 msgid "Not delegated"
 msgstr "到期日期"
 
-#: kojournaleditor.cpp:47
-msgid "Edit Journal Entry"
-msgstr "编辑日记项"
+#: koeventeditor.cpp:124 koeventeditor.cpp:146
+msgid ""
+"The General tab allows you to set the most common options for the event."
+msgstr ""
 
-#: exportwebdialog.cpp:139 koeventeditor.cpp:122 kojournaleditor.cpp:74
-#: kotodoeditor.cpp:97
-msgid "General"
-msgstr "常规"
+#: koeventeditor.cpp:135 kotodoeditor.cpp:112
+msgid "Details"
+msgstr "细节"
 
-#: koeventeditor.cpp:147 kojournaleditor.cpp:84 kotodoeditor.cpp:123
+#: koeventeditor.cpp:144 kojournaleditor.cpp:86 kotodoeditor.cpp:124
 msgid "&General"
 msgstr "常规(&G)"
 
-#: kojournaleditor.cpp:200
-msgid "This journal entry will be permanently deleted."
-msgstr "该日记项将会被永久地删除。"
+#. i18n: file ./printing/calprintincidenceconfig_base.ui line 59
+#: koeventeditor.cpp:182 rc.cpp:1650
+#, fuzzy, no-c-format
+msgid "&Attendees"
+msgstr "出席者(&N)"
 
-#: kojournaleditor.cpp:216
-msgid "Template does not contain a valid journal."
-msgstr "模板未包含有效的日记。"
+#: koeventeditor.cpp:184
+msgid ""
+"The Free/Busy tab allows you to see whether other attendees are free or busy "
+"during your event."
+msgstr ""
 
-#: actionmanager.cpp:253
-msgid "Import &Calendar..."
-msgstr "导入日历(&C)..."
+#: koeventeditor.cpp:208
+msgid "Edit Event"
+msgstr "编辑事件"
 
-#: actionmanager.cpp:255
-msgid "&Import From UNIX Ical tool"
-msgstr "从 UNIX Ical 导入(&I)"
+#: koeventeditor.cpp:216
+msgid "New Event"
+msgstr "新建事件"
 
-#: actionmanager.cpp:257
-msgid "Get &Hot New Stuff..."
-msgstr "获取百宝箱(&H)..."
+#: koeventeditor.cpp:277
+msgid ""
+"You didn't change the event, thus no counter proposal has been sent to the "
+"organizer."
+msgstr ""
 
-#: actionmanager.cpp:261
-msgid "Export &Web Page..."
-msgstr "导出网页(&W)..."
+#: koeventeditor.cpp:277
+#, fuzzy
+msgid "No changes"
+msgstr "Exchange"
 
-#: actionmanager.cpp:264
-msgid "&iCalendar..."
-msgstr "&iCalendar..."
+#: koeventeditor.cpp:288
+#, c-format
+msgid "My counter proposal for: %1"
+msgstr ""
 
-#: actionmanager.cpp:267
-msgid "&vCalendar..."
-msgstr "&vCalendar..."
+#: koeventeditor.cpp:401
+msgid "Template does not contain a valid event."
+msgstr "模板中并未包含有效的事件。"
 
-#: actionmanager.cpp:270
-msgid "Upload &Hot New Stuff..."
-msgstr "上载百宝箱(&H)..."
+#: kogroupware.cpp:166
+#, c-format
+msgid "Error message: %1"
+msgstr ""
 
-#: actionmanager.cpp:276
-msgid "Archive O&ld Entries..."
-msgstr "存档旧的项目(&L)..."
+#: kogroupware.cpp:170
+msgid "Error while processing an invitation or update."
+msgstr ""
 
-#: actionmanager.cpp:278
+#: kogroupware.cpp:285
 msgid ""
-"_: delete completed to-dos\n"
-"Pur&ge Completed To-dos"
-msgstr "销毁已完成的待办(&G)"
+"You changed the invitation \"%1\".\n"
+"Do you want to email the attendees an update message?"
+msgstr ""
 
-#: actionmanager.cpp:336
-msgid "What's &Next"
-msgstr "下面什么事(&N)"
+#: kogroupware.cpp:292
+msgid ""
+"You removed the invitation \"%1\".\n"
+"Do you want to email the attendees that the event is canceled?"
+msgstr ""
 
-#: actionmanager.cpp:340
-msgid "&Day"
-msgstr "天(&D)"
+#: kogroupware.cpp:296
+msgid ""
+"You removed the invitation \"%1\".\n"
+"Do you want to email the attendees that the todo is canceled?"
+msgstr ""
+
+#: kogroupware.cpp:303
+#, fuzzy
+msgid ""
+"The event \"%1\" includes other people.\n"
+"Do you want to email the invitation to the attendees?"
+msgstr "此%1包含其他人。是否要给与会人发出电子邮件？"
+
+#: kogroupware.cpp:307
+#, fuzzy
+msgid ""
+"The todo \"%1\" includes other people.\n"
+"Do you want to email the invitation to the attendees?"
+msgstr "此%1包含其他人。是否要给与会人发出电子邮件？"
+
+#: kogroupware.cpp:311
+#, fuzzy
+msgid ""
+"This incidence includes other people. Should an email be sent to the attendees?"
+msgstr "此%1包含其他人。是否要给与会人发出电子邮件？"
+
+#: kogroupware.cpp:321 kogroupware.cpp:363
+msgid "Group Scheduling Email"
+msgstr "分组日程安排邮件"
+
+#: kogroupware.cpp:322
+msgid "Send Email"
+msgstr "发送电子邮件"
+
+#: incidencechanger.cpp:76 kogroupware.cpp:322 kogroupware.cpp:334
+#: kogroupware.cpp:341 kogroupware.cpp:364
+msgid "Do Not Send"
+msgstr "不发送"
+
+#: kogroupware.cpp:332
+msgid "Do you want to send a status update to the organizer of this task?"
+msgstr "您是否想要给组织者发送此任务的状态更新？"
 
-#: actionmanager.cpp:349
+#: kogroupware.cpp:334 kogroupware.cpp:341 kogroupware.cpp:364
+msgid "Send Update"
+msgstr "发送更新"
+
+#: kogroupware.cpp:338
+#, fuzzy
+msgid ""
+"Your status as an attendee of this event changed. Do you want to send a status "
+"update to the event organizer?"
+msgstr "您对此事件的参与状态发生了变化。您是否想要给组织者发送此任务的状态更新？"
+
+#: kogroupware.cpp:359
+#, fuzzy
+msgid ""
+"You had previously accepted an invitation to this event. Do you want to send an "
+"updated response to the organizer declining the invitation?"
+msgstr "您对此事件的参与状态发生了变化。您是否想要给组织者发送此任务的状态更新？"
+
+#: kogroupware.cpp:367
+#, fuzzy
+msgid ""
+"You are not the organizer of this event. Editing it will bring your calendar "
+"out of sync with the organizer's calendar. Do you really want to edit it?"
+msgstr "您并非此事件的组织者。编辑此事件将使您的日历与组织者的日历脱离同步。您真的想要编辑此事件吗？"
+
+#: kogroupware.cpp:384
+msgid "<No summary given>"
+msgstr "<没有给出概览>"
+
+#: kogroupware.cpp:404 mailscheduler.cpp:89
+#, c-format
+msgid "Counter proposal: %1"
+msgstr ""
+
+#: kogroupware.cpp:406
+msgid "Proposed new meeting time: %1 - %2"
+msgstr ""
+
+#: statusdialog.cpp:41
+msgid "Set Your Status"
+msgstr "设置您的状态"
+
+#: statusdialog.cpp:49
+msgid "Set your status"
+msgstr "设置您的状态"
+
+#: history.cpp:185
+#, c-format
+msgid "Delete %1"
+msgstr "删除%1"
+
+#: history.cpp:214
+#, c-format
+msgid "Add %1"
+msgstr "添加%1"
+
+#: history.cpp:251
+#, c-format
+msgid "Edit %1"
+msgstr "编辑%1"
+
+#: koeventpopupmenu.cpp:77
+msgid "&Toggle Reminder"
+msgstr "切换提醒(&T)"
+
+#: koeventpopupmenu.cpp:82
+msgid "&Dissociate This Occurrence"
+msgstr "拆分本次重现(&D)"
+
+#: koeventpopupmenu.cpp:85
+msgid "&Dissociate Future Occurrences"
+msgstr "拆分未来的重现(&D)"
+
+#: koeventpopupmenu.cpp:89
+msgid "Send as iCalendar..."
+msgstr "发送为 &iCalendar..."
+
+#: korgac/testalarmdlg.cpp:39
+msgid "TestKabc"
+msgstr "TestKabc"
+
+#: korgac/alarmdockwindow.cpp:56 korgac/korgacmain.cpp:65
+#: korgac/korgacmain.cpp:66
+msgid "KOrganizer Reminder Daemon"
+msgstr "KOrganizer 提醒守护程序"
+
+#: korgac/korgacmain.cpp:70 korgac/korgacmain.cpp:72
+msgid "Maintainer"
+msgstr "维护者"
+
+#: korgac/alarmdockwindow.cpp:67
+msgid "Suspend All"
+msgstr "全部挂起"
+
+#: korgac/alarmdialog.cpp:104 korgac/alarmdockwindow.cpp:68
+msgid "Dismiss All"
+msgstr "全部错过"
+
+#: korgac/alarmdockwindow.cpp:73
+msgid "Reminders Enabled"
+msgstr "提醒已启用"
+
+#: korgac/alarmdockwindow.cpp:75
+msgid "Start Reminder Daemon at Login"
+msgstr "登录时启动提醒守护程序"
+
+#: korgac/alarmdockwindow.cpp:134
 #, c-format
 msgid ""
-"_n: &Next Day\n"
-"Ne&xt %n Days"
-msgstr "后 %n 天(&X)"
+"_n: There is 1 active reminder.\n"
+"There are %n active reminders."
+msgstr "有 %n 个激活的提醒。"
 
-#: actionmanager.cpp:351
-msgid "W&ork Week"
-msgstr "工作周(&O)"
+#: korgac/alarmdockwindow.cpp:201
+msgid ""
+"Do you want to start the KOrganizer reminder daemon at login (note that you "
+"will not get reminders whilst the daemon is not running)?"
+msgstr "您是否想要在登录时启动 KOrganizer 提醒守护程序(请注意，若该守护程序不运行，您将无法得到提醒)？"
 
-#: actionmanager.cpp:355
-msgid "&Week"
-msgstr "周(&W)"
+#: korgac/alarmdockwindow.cpp:203
+msgid "Close KOrganizer Reminder Daemon"
+msgstr "关闭 KOrganizer 提醒守护程序"
 
-#: actionmanager.cpp:359
-msgid "&Month"
-msgstr "月(&M)"
+#: korgac/alarmdockwindow.cpp:204
+msgid "Start"
+msgstr "启动"
 
-#: actionmanager.cpp:363
-msgid "&List"
-msgstr "列表(&L)"
+#: korgac/alarmdockwindow.cpp:204
+msgid "Do Not Start"
+msgstr "不启动"
 
-#: actionmanager.cpp:367
-msgid "&To-do List"
-msgstr "待办事宜列表(&T)"
+#: kolistview.cpp:209 korgac/alarmdialog.cpp:102
+msgid "Reminder"
+msgstr "提醒"
 
-#: actionmanager.cpp:371
-msgid "&Journal"
-msgstr "日记(&J)"
+#: korgac/alarmdialog.cpp:104
+msgid "Edit..."
+msgstr "编辑..."
 
-#: actionmanager.cpp:375
-msgid "&Timeline View"
-msgstr "时间线视图(&T)"
+#: korgac/alarmdialog.cpp:104
+#, fuzzy
+msgid "Dismiss Reminder"
+msgstr "编辑提醒"
 
-#: actionmanager.cpp:381
-msgid "&Refresh"
-msgstr "刷新(&R)"
+#: korgac/alarmdialog.cpp:116
+msgid "Suspend"
+msgstr "挂起"
 
-#: actionmanager.cpp:389
-msgid "F&ilter"
-msgstr "过滤器(&I)"
+#: korgac/alarmdialog.cpp:122
+#, fuzzy
+msgid "The following items triggered reminders:"
+msgstr "下列事件触发提醒："
 
-#: actionmanager.cpp:404
-msgid "Zoom In Horizontally"
-msgstr "水平放大"
+#: korgac/alarmdialog.cpp:131
+#, fuzzy
+msgid "Date, Time"
+msgstr "日期和时间"
 
-#: actionmanager.cpp:407
-msgid "Zoom Out Horizontally"
-msgstr "水平缩小"
+#: korgac/alarmdialog.cpp:151
+msgid "Suspend &duration:"
+msgstr "挂起间隔(&D)："
 
-#: actionmanager.cpp:410
-msgid "Zoom In Vertically"
-msgstr "垂直放大"
+#: korgac/alarmdialog.cpp:160
+msgid "week(s)"
+msgstr "周"
 
-#: actionmanager.cpp:413
-msgid "Zoom Out Vertically"
-msgstr "垂直缩小"
+#: koeditorgeneral.cpp:396 korgac/alarmdialog.cpp:190
+msgid ""
+"_: elipsis\n"
+"..."
+msgstr ""
 
-#: actionmanager.cpp:422
-msgid "Go to &Today"
-msgstr "转到今天(&T)"
+#: korgac/alarmdialog.cpp:330
+msgid "\"%1\" is a read-only item so modifications are not possible."
+msgstr ""
 
-#: actionmanager.cpp:426
-msgid "Go &Backward"
-msgstr "后退(&B)"
+#: korgac/alarmdialog.cpp:338
+#, fuzzy
+msgid "Could not start KOrganizer so editing is not possible."
+msgstr "无法启动 KOrganizer。"
 
-#: actionmanager.cpp:438
-msgid "Go &Forward"
-msgstr "前进(&F)"
+#: korgac/alarmdialog.cpp:352
+msgid ""
+"An internal KOrganizer error occurred attempting to start the incidence editor"
+msgstr ""
 
-#: actionmanager.cpp:448
-msgid "New E&vent..."
-msgstr "新建事件(&V)..."
+#: koagendaview.cpp:629
+msgid ""
+"_: short_weekday date (e.g. Mon 13)\n"
+"%1 %2"
+msgstr "%1 %2"
 
-#: actionmanager.cpp:462
-msgid "New &Journal..."
-msgstr "新建日记(&J)..."
+#: koagendaview.cpp:1569
+msgid "Unable to modify this to-do, because it cannot be locked."
+msgstr "无法修改此待办事宜，因为无法锁定它。"
 
-#: actionmanager.cpp:477
-msgid "&Make Sub-to-do Independent"
-msgstr "将子待办事宜独立(&M)"
+#: koagendaview.cpp:1756 korganizer.cpp:290 kotimelineview.cpp:55
+#: kotimelineview.cpp:123 kotodoview.cpp:395 resourceview.cpp:270
+#: resourceview.cpp:321
+msgid "Calendar"
+msgstr "日历"
 
-#: actionmanager.cpp:496
-msgid "&Publish Item Information..."
-msgstr "发布项目信息(&P)..."
+#: koeditorrecurrence.cpp:91
+msgid ""
+"The number of the week from the beginning of the month on which this event or "
+"to-do should recur."
+msgstr ""
 
-#: actionmanager.cpp:501
-msgid "Send &Invitation to Attendees"
-msgstr "给与会者发送邀请(&I)"
+#: koeditorrecurrence.cpp:95 koeditorrecurrence.cpp:259
+msgid "1st"
+msgstr "第 1"
 
-#: actionmanager.cpp:508
-msgid "Re&quest Update"
-msgstr "请求更新(&Q)"
+#: koeditorrecurrence.cpp:96 koeditorrecurrence.cpp:260
+msgid "2nd"
+msgstr "第 2"
 
-#: actionmanager.cpp:515
-msgid "Send &Cancelation to Attendees"
-msgstr "给与会者发送取消(&C)"
+#: koeditorrecurrence.cpp:97 koeditorrecurrence.cpp:261
+msgid "3rd"
+msgstr "第 3"
 
-#: actionmanager.cpp:522
-msgid "Send Status &Update"
-msgstr "发送状态更新(&U)"
+#: koeditorrecurrence.cpp:98 koeditorrecurrence.cpp:262
+msgid "4th"
+msgstr "第 4"
+
+#: koeditorrecurrence.cpp:99 koeditorrecurrence.cpp:263
+msgid "5th"
+msgstr "第 5"
+
+#: koeditorrecurrence.cpp:100 koeditorrecurrence.cpp:290
+msgid "Last"
+msgstr "最后一"
+
+#: koeditorrecurrence.cpp:101 koeditorrecurrence.cpp:291
+msgid "2nd Last"
+msgstr "倒数第二"
+
+#: koeditorrecurrence.cpp:102 koeditorrecurrence.cpp:292
+msgid "3rd Last"
+msgstr "倒数第三"
+
+#: koeditorrecurrence.cpp:103 koeditorrecurrence.cpp:293
+msgid "4th Last"
+msgstr "倒数第四"
+
+#: koeditorrecurrence.cpp:104 koeditorrecurrence.cpp:294
+msgid "5th Last"
+msgstr "倒数第五"
+
+#: koeditorrecurrence.cpp:112
+msgid "The weekday on which this event or to-do should recur."
+msgstr ""
+
+#: koeditorrecurrence.cpp:126
+msgid "The month during which this event or to-do should recur."
+msgstr ""
+
+#: koeditorrecurrence.cpp:143
+msgid "Sets how often this event or to-do should recur."
+msgstr ""
 
-#: actionmanager.cpp:529
+#: koeditorrecurrence.cpp:167 koeditorrecurrence.cpp:181
+#: koeditorrecurrence.cpp:232 koeditorrecurrence.cpp:405
+msgid "&Recur every"
+msgstr "重现周期(&R)"
+
+#: koeditorrecurrence.cpp:181
+msgid "week(s) on:"
+msgstr "周的："
+
+#: koeditorrecurrence.cpp:199
+msgid "Day of the week on which this event or to-do should recur."
+msgstr ""
+
+#: koeditorrecurrence.cpp:232
+msgid "month(s)"
+msgstr "月"
+
+#: koeditorrecurrence.cpp:244
+msgid "&Recur on the"
+msgstr "重现点(&R)"
+
+#: koeditorrecurrence.cpp:249
 msgid ""
-"_: counter proposal\n"
-"Request Chan&ge"
-msgstr "请求更改(&G)"
+"Sets a specific day of the month on which this event or to-do should recur."
+msgstr ""
 
-#: actionmanager.cpp:536
-msgid "&Send as iCalendar..."
-msgstr "发送为 iCalendar(&S)..."
+#: koeditorrecurrence.cpp:254 koeditorrecurrence.cpp:430
+msgid "The day of the month on which this event or to-do should recur."
+msgstr ""
 
-#: actionmanager.cpp:541
-msgid "&Mail Free Busy Information..."
-msgstr "邮寄忙闲信息(&M)..."
+#: koeditorrecurrence.cpp:264
+msgid "6th"
+msgstr "第 6"
 
-#: actionmanager.cpp:546
-msgid "&Upload Free Busy Information"
-msgstr "上传忙闲信息(&U)"
+#: koeditorrecurrence.cpp:265
+msgid "7th"
+msgstr "第 7"
 
-#: actionmanager.cpp:552
-msgid "&Addressbook"
-msgstr "地址簿(&A)"
+#: koeditorrecurrence.cpp:266
+msgid "8th"
+msgstr "第 8"
 
-#: actionmanager.cpp:563
-msgid "Show Date Navigator"
-msgstr "显示日期导航器"
+#: koeditorrecurrence.cpp:267
+msgid "9th"
+msgstr "第 9"
 
-#: actionmanager.cpp:566
-msgid "Show To-do View"
-msgstr "显示待办视图"
+#: koeditorrecurrence.cpp:268
+msgid "10th"
+msgstr "第 10"
 
-#: actionmanager.cpp:569
-msgid "Show Item Viewer"
-msgstr "显示项目查看器"
+#: koeditorrecurrence.cpp:269
+msgid "11th"
+msgstr "第 11"
 
-#: actionmanager.cpp:588
-msgid "Show Resource View"
-msgstr "显示资源视图"
+#: koeditorrecurrence.cpp:270
+msgid "12th"
+msgstr "第 12"
 
-#: actionmanager.cpp:591
-msgid "Show &Resource Buttons"
-msgstr "显示资源按钮(&R)"
+#: koeditorrecurrence.cpp:271
+msgid "13th"
+msgstr "第 13"
 
-#: actionmanager.cpp:606
-msgid "Configure &Date && Time..."
-msgstr "配置日期和时间(&D)..."
+#: koeditorrecurrence.cpp:272
+msgid "14th"
+msgstr "第 14"
 
-#: actionmanager.cpp:613
-msgid "Manage View &Filters..."
-msgstr "管理视图过滤器(&F)..."
+#: koeditorrecurrence.cpp:273
+msgid "15th"
+msgstr "第 15"
 
-#: actionmanager.cpp:616
-msgid "Manage C&ategories..."
-msgstr "管理类别(&A)..."
+#: koeditorrecurrence.cpp:274
+msgid "16th"
+msgstr "第 16"
 
-#: actionmanager.cpp:620
-msgid "&Configure Calendar..."
-msgstr "配置日历(&C)..."
+#: koeditorrecurrence.cpp:275
+msgid "17th"
+msgstr "第 17"
 
-#: actionmanager.cpp:645 actionmanager.cpp:647
-msgid "Filter: "
-msgstr "过滤器："
+#: koeditorrecurrence.cpp:276
+msgid "18th"
+msgstr "第 18"
 
-#: actionmanager.cpp:709 actionmanager.cpp:797 actionmanager.cpp:1182
-msgid "*.vcs *.ics|Calendar Files"
-msgstr "*.vcs *.ics|日历文件"
+#: koeditorrecurrence.cpp:277
+msgid "19th"
+msgstr "第 19"
+
+#: koeditorrecurrence.cpp:278
+msgid "20th"
+msgstr "第 20"
+
+#: koeditorrecurrence.cpp:279
+msgid "21st"
+msgstr "第 21"
+
+#: koeditorrecurrence.cpp:280
+msgid "22nd"
+msgstr "第 22"
+
+#: koeditorrecurrence.cpp:281
+msgid "23rd"
+msgstr "第 23"
 
-#: actionmanager.cpp:748
+#: koeditorrecurrence.cpp:282
+msgid "24th"
+msgstr "第 24"
+
+#: koeditorrecurrence.cpp:283
+msgid "25th"
+msgstr "第 25"
+
+#: koeditorrecurrence.cpp:284
+msgid "26th"
+msgstr "第 26"
+
+#: koeditorrecurrence.cpp:285
+msgid "27th"
+msgstr "第 27"
+
+#: koeditorrecurrence.cpp:286
+msgid "28th"
+msgstr "第 28"
+
+#: koeditorrecurrence.cpp:287
+msgid "29th"
+msgstr "第 29"
+
+#: koeditorrecurrence.cpp:288
+msgid "30th"
+msgstr "第 30"
+
+#: koeditorrecurrence.cpp:289
+msgid "31st"
+msgstr "第 31"
+
+#: koeditorrecurrence.cpp:325
+msgid "day"
+msgstr "天"
+
+#: koeditorrecurrence.cpp:332
 msgid ""
-"You have no ical file in your home directory.\n"
-"Import cannot proceed.\n"
+"Sets a weekday and specific week in the month on which this event or to-do "
+"should recur"
 msgstr ""
-"在您的主目录中没有 ical 文件。\n"
-"无法进行导入。\n"
 
-#: actionmanager.cpp:771
+#: koeditorrecurrence.cpp:405
+msgid "year(s)"
+msgstr "年"
+
+#: koeditorrecurrence.cpp:419
 msgid ""
-"KOrganizer successfully imported and merged your .calendar file from ical into "
-"the currently opened calendar."
-msgstr "KOrganizer 成功地从 ical 中把您的 .calendar 文件导入并合并到了当前打开的日历中。"
+"_: part before XXX of 'Recur on day XXX of month YYY'\n"
+"&Recur on day "
+msgstr ""
 
-#: actionmanager.cpp:777
+#: koeditorrecurrence.cpp:421
+msgid "&Day "
+msgstr "天(&D) "
+
+#: koeditorrecurrence.cpp:425
 msgid ""
-"KOrganizer encountered some unknown fields while parsing your .calendar ical "
-"file, and had to discard them; please check to see that all your relevant data "
-"was correctly imported."
+"Sets a specific day in a specific month on which this event or to-do should "
+"recur."
 msgstr ""
-"KOrganizer 在读入您的 .calendar ical 文件时遇到一些未知的域，必须丢弃这些域；请检查一下，看看您的重要数据是否已经正确导入。"
 
-#: actionmanager.cpp:781
-msgid "ICal Import Successful with Warning"
-msgstr "成功导入 ICal，有警告"
+#: koeditorrecurrence.cpp:434
+msgid ""
+"_: part between XXX and YYY of 'Recur on day XXX of month YYY'\n"
+" &of "
+msgstr ""
 
-#: actionmanager.cpp:784
+#: koeditorrecurrence.cpp:448
 msgid ""
-"KOrganizer encountered an error parsing your .calendar file from ical; import "
-"has failed."
-msgstr "KOrganizer 在从 ical 读入您的 .calendar 文件时遇到错误；导入失败。"
+"_: Part before XXX in 'Recur on NNN. WEEKDAY of MONTH', short version\n"
+"&On"
+msgstr ""
 
-#: actionmanager.cpp:788
+#: koeditorrecurrence.cpp:450
 msgid ""
-"KOrganizer does not think that your .calendar file is a valid ical calendar; "
-"import has failed."
-msgstr "KOrganizer 觉得您的 .calendar 文件不是正确的 ical 日程表；导入失败。"
+"_: Part before XXX in 'Recur on NNN. WEEKDAY of MONTH'\n"
+"&On the"
+msgstr ""
 
-#: actionmanager.cpp:870
-msgid "New calendar '%1'."
-msgstr "新建日历“%1”。"
+#: koeditorrecurrence.cpp:454
+msgid ""
+"Sets a specific day in a specific week of a specific month on which this event "
+"or to-do should recur."
+msgstr ""
 
-#: actionmanager.cpp:905
-msgid "Cannot download calendar from '%1'."
-msgstr "无法从“%1”下载日历。"
+#: koeditorrecurrence.cpp:465
+msgid ""
+"_: part between WEEKDAY and MONTH in 'Recur on NNN. WEEKDAY of MONTH'\n"
+" o&f "
+msgstr ""
 
-#: actionmanager.cpp:943
-msgid "Added calendar resource for URL '%1'."
-msgstr "已添加 URL“%1”的日历资源。"
+#: koeditorrecurrence.cpp:480
+msgid "Day #"
+msgstr ""
 
-#: actionmanager.cpp:951
-msgid "Unable to create calendar resource '%1'."
-msgstr "无法创建日历资源“%1”。"
+#: koeditorrecurrence.cpp:482
+msgid "Recur on &day #"
+msgstr "在这一天重现(&D)"
 
-#: actionmanager.cpp:962
-msgid "Merged calendar '%1'."
-msgstr "已合并日历“%1”。"
+#: koeditorrecurrence.cpp:484
+msgid ""
+"Sets a specific day within the year on which this event or to-do should recur."
+msgstr ""
 
-#: actionmanager.cpp:965
-msgid "Opened calendar '%1'."
-msgstr "已打开日历“%1”。"
+#: koeditorrecurrence.cpp:495
+msgid ""
+"_: part after NNN of 'Recur on day #NNN of the year'\n"
+" of the &year"
+msgstr ""
 
-#: actionmanager.cpp:990
+#: koeditorrecurrence.cpp:498
 msgid ""
-"Your calendar will be saved in iCalendar format. Use 'Export vCalendar' to save "
-"in vCalendar format."
-msgstr "将用 iCalendar 格式保存您的日历，若需要存成 vCalendar 格式请使用“导出 vCalendar”。"
+"_: part after NNN of 'Recur on day #NNN of the year', short version\n"
+" of the year"
+msgstr ""
 
-#: actionmanager.cpp:992
-msgid "Format Conversion"
-msgstr "格式转换"
+#: koeditorrecurrence.cpp:581
+msgid "E&xceptions"
+msgstr "例外(&X)"
 
-#: actionmanager.cpp:1016
-msgid "Cannot upload calendar to '%1'"
-msgstr "不能上传日历到“%1”"
+#: koeditorrecurrence.cpp:591
+msgid ""
+"A date that should be considered an exception to the recurrence rules for this "
+"event or to-do."
+msgstr ""
 
-#: actionmanager.cpp:1029
-msgid "Saved calendar '%1'."
-msgstr "已保存日历“%1”。"
+#: koeditorrecurrence.cpp:597
+msgid ""
+"_: Add a new recurrence to the recurrence list\n"
+"&Add"
+msgstr ""
 
-#: actionmanager.cpp:1089
-msgid "Could not upload file."
-msgstr "无法上传文件。"
+#: koeditorrecurrence.cpp:599
+msgid ""
+"Add this date as an exception to the recurrence rules for this event or to-do."
+msgstr ""
 
-#: actionmanager.cpp:1130
-#, c-format
-msgid "Unable to save calendar to the file %1."
-msgstr "无法将日历保存到文件 %1。"
+#: koeditorrecurrence.cpp:602
+msgid "&Change"
+msgstr "更改(&C)"
+
+#: koeditorrecurrence.cpp:604
+msgid "Replace the currently selected date with this date."
+msgstr ""
 
-#: actionmanager.cpp:1155
+#: koeditorrecurrence.cpp:608
 msgid ""
-"The calendar has been modified.\n"
-"Do you want to save it?"
+"Delete the currently selected date from the list of dates that should be "
+"considered exceptions to the recurrence rules for this event or to-do."
 msgstr ""
-"这个日历已经被修改。\n"
-"您要保存它吗？"
 
-#: actionmanager.cpp:1258
-#, c-format
+#: koeditorrecurrence.cpp:615
 msgid ""
-"_n: &Next Day\n"
-"&Next %n Days"
-msgstr "后 %n 天(&N)"
+"Displays current dates that are being considered exceptions to the recurrence "
+"rules for this event or to-do."
+msgstr ""
 
-#: actionmanager.cpp:1292
-msgid "Could not start control module for date and time format."
-msgstr "无法启动日期和时间格式控制模块。"
+#: koeditorrecurrence.cpp:679
+msgid "Edit Exceptions"
+msgstr "编辑例外"
 
-#: actionmanager.cpp:1433
-msgid "&Show Event"
-msgstr "显示事件(&S)"
+#: koeditorrecurrence.cpp:703
+msgid "Recurrence Range"
+msgstr "重现范围"
 
-#: actionmanager.cpp:1434
-msgid "&Edit Event..."
-msgstr "编辑事件(&E)..."
+#: koeditorrecurrence.cpp:706
+msgid ""
+"Sets a range for which these recurrence rules will apply to this event or "
+"to-do."
+msgstr ""
 
-#: actionmanager.cpp:1435
-msgid "&Delete Event"
-msgstr "删除事件(&D)"
+#: koeditorrecurrence.cpp:714
+msgid "Begin on:"
+msgstr "开始于："
 
-#: actionmanager.cpp:1439
-msgid "&Show To-do"
-msgstr "显示待办事宜(&S)"
+#: koeditorrecurrence.cpp:716
+msgid "The date on which the recurrences for this event or to-do should begin."
+msgstr ""
 
-#: actionmanager.cpp:1440
-msgid "&Edit To-do..."
-msgstr "编辑待办事宜(&E)..."
+#: koeditorrecurrence.cpp:723
+msgid "&No ending date"
+msgstr "没有结束日期(&N)"
 
-#: actionmanager.cpp:1441
-msgid "&Delete To-do"
-msgstr "删除待办事宜(&D)"
+#: koeditorrecurrence.cpp:725
+msgid "Sets the event or to-do to recur forever."
+msgstr ""
 
-#: actionmanager.cpp:1560 actionmanager.cpp:1675
-msgid "Attach as &link"
+#: koeditorrecurrence.cpp:732
+msgid "End &after"
+msgstr "结束于(&A)"
+
+#: koeditorrecurrence.cpp:734
+msgid ""
+"Sets the event or to-do to stop recurring after a certain number of "
+"occurrences."
 msgstr ""
 
-#: actionmanager.cpp:1561 actionmanager.cpp:1676
-#, fuzzy
-msgid "Attach &inline"
-msgstr "附件(&M)"
+#: koeditorrecurrence.cpp:739
+msgid "Number of times the event or to-do should recur before stopping."
+msgstr ""
 
-#: actionmanager.cpp:1562
-msgid "Attach inline &without attachments"
+#: koeditorrecurrence.cpp:745
+msgid "&occurrence(s)"
+msgstr "次(&O)"
+
+#: koeditorrecurrence.cpp:753
+msgid "End &on:"
+msgstr "结束于(&O)："
+
+#: koeditorrecurrence.cpp:755
+msgid "Sets the event or to-do to stop recurring on a certain date."
 msgstr ""
 
-#: actionmanager.cpp:1564 actionmanager.cpp:1678
-msgid "C&ancel"
+#: koeditorrecurrence.cpp:762
+msgid "Date after which the event or to-do should stop recurring"
 msgstr ""
 
-#: actionmanager.cpp:1594
-msgid "Removing attachments from an email might invalidate its signature."
+#: koeditorrecurrence.cpp:826
+#, c-format
+msgid "Begins on: %1"
+msgstr "开始在：%1"
+
+#: koeditorrecurrence.cpp:834
+msgid "Edit Recurrence Range"
+msgstr "编辑重现范围"
+
+#: koeditorrecurrence.cpp:881
+msgid "Sets the type of recurrence this event or to-do should have."
 msgstr ""
 
-#: actionmanager.cpp:1595
-msgid "Remove Attachments"
-msgstr "删除附件"
+#: koeditorrecurrence.cpp:883
+msgid "Daily"
+msgstr "每天"
 
-#: actionmanager.cpp:1764
-msgid "Undo (%1)"
-msgstr "撤销(%1)"
+#: koeditorrecurrence.cpp:884
+msgid "Weekly"
+msgstr "每周"
 
-#: actionmanager.cpp:1776
-msgid "Redo (%1)"
-msgstr "重做(%1)"
+#: koeditorrecurrence.cpp:885
+msgid "Monthly"
+msgstr "每月"
+
+#: koeditorrecurrence.cpp:886
+msgid "Yearly"
+msgstr "每年"
+
+#: koeditorrecurrence.cpp:898
+msgid "&Daily"
+msgstr "每天(&D)"
 
-#: actionmanager.cpp:1788
+#: koeditorrecurrence.cpp:900
 msgid ""
-"The calendar contains unsaved changes. Do you want to save them before exiting?"
-msgstr "日历包含未保存的更改。您想要在退出前保存吗？"
+"Sets the event or to-do to recur daily according to the specified rules."
+msgstr ""
 
-#: actionmanager.cpp:1793
-msgid "Unable to save the calendar. Do you still want to close this window?"
-msgstr "无法保存日历。您仍然想要关闭此窗口吗？"
+#: koeditorrecurrence.cpp:902
+msgid "&Weekly"
+msgstr "每周(&W)"
 
-#: actionmanager.cpp:1814
-msgid "Unable to exit. Saving still in progress."
-msgstr "无法退出。保存仍在进行中。"
+#: koeditorrecurrence.cpp:904
+msgid ""
+"Sets the event or to-do to recur weekly according to the specified rules."
+msgstr ""
+
+#: koeditorrecurrence.cpp:906
+msgid "&Monthly"
+msgstr "每月(&M)"
 
-#: actionmanager.cpp:1853
+#: koeditorrecurrence.cpp:908
 msgid ""
-"Saving of '%1' failed. Check that the resource is properly configured.\n"
-"Ignore problem and continue without saving or cancel save?"
+"Sets the event or to-do to recur monthly according to the specified rules."
 msgstr ""
 
-#: actionmanager.cpp:1856
-msgid "Save Error"
-msgstr "保存错误"
+#: koeditorrecurrence.cpp:910
+msgid "&Yearly"
+msgstr "每年(&Y)"
 
-#: actionmanager.cpp:1867
-msgid "URL '%1' is invalid."
-msgstr "URL“%1”无效。"
+#: koeditorrecurrence.cpp:912
+msgid ""
+"Sets the event or to-do to recur yearly according to the specified rules."
+msgstr ""
+
+#: koeditorrecurrence.cpp:974
+msgid "&Enable recurrence"
+msgstr "启用重复出现(&E)"
+
+#: koeditorrecurrence.cpp:976
+msgid ""
+"Enables recurrence for this event or to-do according to the specified rules."
+msgstr ""
+
+#: koeditorrecurrence.cpp:983
+msgid "Appointment Time "
+msgstr "约会时间"
+
+#: koeditorrecurrence.cpp:986
+msgid "Displays appointment time information."
+msgstr "显示约会时间信息。"
+
+#: koeditorrecurrence.cpp:1005
+msgid "Recurrence Rule"
+msgstr "重现规则"
+
+#: koeditorrecurrence.cpp:1007
+msgid ""
+"Options concerning the type of recurrence this event or to-do should have."
+msgstr ""
+
+#: koeditorrecurrence.cpp:1044
+msgid "Recurrence Range..."
+msgstr "重现范围..."
+
+#: koeditorrecurrence.cpp:1047 koeditorrecurrence.cpp:1064
+msgid ""
+"Options concerning the time range during which this event or to-do should "
+"recur."
+msgstr ""
+
+#: koeditorrecurrence.cpp:1056
+msgid "Exceptions..."
+msgstr "例外..."
+
+#: koeditorrecurrence.cpp:1396
+msgid ""
+"The end date '%1' of the recurrence must be after the start date '%2' of the "
+"event."
+msgstr ""
+
+#: koeditorrecurrence.cpp:1410
+msgid ""
+"A weekly recurring event or task has to have at least one weekday associated "
+"with it."
+msgstr ""
+
+#: koeditorrecurrence.cpp:1637
+#, fuzzy
+msgid "Recurrence"
+msgstr "重现(&U)"
 
 #. i18n: file korganizer_part.rc line 11
-#: rc.cpp:6 rc.cpp:54 rc.cpp:1496 rc.cpp:1544
+#: rc.cpp:6 rc.cpp:54 rc.cpp:1041 rc.cpp:2018
 #, no-c-format
 msgid "&Import"
 msgstr "导入(&I)"
 
 #. i18n: file korganizer_part.rc line 18
-#: rc.cpp:9 rc.cpp:57 rc.cpp:1499 rc.cpp:1547
+#: rc.cpp:9 rc.cpp:57 rc.cpp:1044 rc.cpp:2021
 #, no-c-format
 msgid "&Export"
 msgstr "导出(&E)"
 
 #. i18n: file korganizer_part.rc line 73
-#: rc.cpp:21 rc.cpp:69 rc.cpp:1511 rc.cpp:1559
+#: rc.cpp:21 rc.cpp:69 rc.cpp:1056 rc.cpp:2033
 #, no-c-format
 msgid "&Go"
 msgstr "转到(&G)"
 
 #. i18n: file korganizer_part.rc line 80
-#: rc.cpp:24 rc.cpp:72 rc.cpp:1514 rc.cpp:1562
+#: rc.cpp:24 rc.cpp:72 rc.cpp:1059 rc.cpp:2036
 #, no-c-format
 msgid "&Actions"
 msgstr "操作(&A)"
 
 #. i18n: file korganizer_part.rc line 95
-#: rc.cpp:27 rc.cpp:75 rc.cpp:1517 rc.cpp:1565
+#: rc.cpp:27 rc.cpp:75 rc.cpp:1062 rc.cpp:2039
 #, no-c-format
 msgid "S&chedule"
 msgstr "日程(&C)"
 
 #. i18n: file korganizer_part.rc line 108
-#: rc.cpp:33 rc.cpp:81 rc.cpp:1523 rc.cpp:1571
+#: rc.cpp:33 rc.cpp:81 rc.cpp:1068 rc.cpp:2045
 #, no-c-format
 msgid "&Sidebar"
 msgstr "侧边栏(&S)"
 
 #. i18n: file korganizer_part.rc line 131
-#: rc.cpp:39 rc.cpp:87 rc.cpp:1529 rc.cpp:1577
+#: rc.cpp:39 rc.cpp:87 rc.cpp:1074 rc.cpp:2051
 #, no-c-format
 msgid "Main"
 msgstr "主要"
 
 #. i18n: file korganizer_part.rc line 140
-#: rc.cpp:42 rc.cpp:90 rc.cpp:1532 rc.cpp:1580
+#: rc.cpp:42 rc.cpp:90 rc.cpp:1077 rc.cpp:2054
 #, no-c-format
 msgid "Views"
 msgstr "查看"
 
 #. i18n: file korganizer_part.rc line 154
-#: rc.cpp:45 rc.cpp:93 rc.cpp:1535 rc.cpp:1583
+#: rc.cpp:45 rc.cpp:93 rc.cpp:1080 rc.cpp:2057
 #, no-c-format
 msgid "Schedule"
 msgstr "日程"
 
 #. i18n: file korganizer_part.rc line 160
-#: rc.cpp:48 rc.cpp:96 rc.cpp:1538 rc.cpp:1586
+#: rc.cpp:48 rc.cpp:96 rc.cpp:1083 rc.cpp:2060
 #, no-c-format
 msgid "Filters Toolbar"
 msgstr "过滤器工具栏"
 
 #. i18n: file filteredit_base.ui line 45
-#: rc.cpp:105 rc.cpp:2081
+#: rc.cpp:105 rc.cpp:2189
 #, no-c-format
 msgid "Filter Details"
 msgstr "过滤器细节"
 
 #. i18n: file filteredit_base.ui line 64
-#: rc.cpp:108 rc.cpp:423 rc.cpp:1865 rc.cpp:2084
+#: rc.cpp:108 rc.cpp:426 rc.cpp:2168 rc.cpp:2192
 #, no-c-format
 msgid "Name:"
 msgstr "名字："
 
 #. i18n: file filteredit_base.ui line 79
-#: rc.cpp:111 rc.cpp:2087
+#: rc.cpp:111 rc.cpp:2195
 #, no-c-format
 msgid "Hide &recurring events and to-dos"
 msgstr "隐藏重复出现的事件和待办(&R)"
 
 #. i18n: file filteredit_base.ui line 82
-#: rc.cpp:114 rc.cpp:2090
+#: rc.cpp:114 rc.cpp:2198
 #, no-c-format
 msgid ""
 "Select this option if you do not want to show recurring events and to-dos in "
@@ -2874,13 +4523,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 90
-#: rc.cpp:117 rc.cpp:2093
+#: rc.cpp:117 rc.cpp:2201
 #, no-c-format
 msgid "Hide co&mpleted to-dos"
 msgstr "隐藏已完成的待办事宜(&M)"
 
 #. i18n: file filteredit_base.ui line 93
-#: rc.cpp:120 rc.cpp:2096
+#: rc.cpp:120 rc.cpp:2204
 #, no-c-format
 msgid ""
 "If this box is checked, the filter will hide all to-do items from the list, "
@@ -2889,13 +4538,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 129
-#: rc.cpp:123 rc.cpp:2099
+#: rc.cpp:123 rc.cpp:2207
 #, no-c-format
 msgid "Days after completion:"
 msgstr "完成后的天数："
 
 #. i18n: file filteredit_base.ui line 135
-#: rc.cpp:126 rc.cpp:2102
+#: rc.cpp:126 rc.cpp:2210
 #, no-c-format
 msgid ""
 "This option will allow you to select which completed to-dos should be hidden. "
@@ -2904,13 +4553,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 152
-#: rc.cpp:129 rc.cpp:2105
+#: rc.cpp:129 rc.cpp:2213
 #, no-c-format
 msgid "Immediately"
 msgstr "立即"
 
 #. i18n: file filteredit_base.ui line 155
-#: rc.cpp:132 rc.cpp:2108
+#: rc.cpp:132 rc.cpp:2216
 #, no-c-format
 msgid ""
 "Here you can give the number of days a to-do item has to be completed to be "
@@ -2920,13 +4569,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 182
-#: rc.cpp:135 rc.cpp:2111
+#: rc.cpp:135 rc.cpp:2219
 #, no-c-format
 msgid "Hide &inactive to-dos"
 msgstr "隐藏未激活的待办事宜(&I)"
 
 #. i18n: file filteredit_base.ui line 185
-#: rc.cpp:138 rc.cpp:2114
+#: rc.cpp:138 rc.cpp:2222
 #, no-c-format
 msgid ""
 "This option hides all to-dos from your list, where the start date has not been "
@@ -2934,13 +4583,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 235
-#: rc.cpp:144 rc.cpp:2120
+#: rc.cpp:144 rc.cpp:2228
 #, no-c-format
 msgid "Show all except selected"
 msgstr "显示全部未选的"
 
 #. i18n: file filteredit_base.ui line 244
-#: rc.cpp:147 rc.cpp:2123
+#: rc.cpp:147 rc.cpp:2231
 #, no-c-format
 msgid ""
 "When this option is enabled, this filter will show all items which do <i>not</i> "
@@ -2948,13 +4597,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 252
-#: rc.cpp:150 rc.cpp:2126
+#: rc.cpp:150 rc.cpp:2234
 #, no-c-format
 msgid "Show only selected"
 msgstr "显示全部选中的"
 
 #. i18n: file filteredit_base.ui line 261
-#: rc.cpp:153 rc.cpp:2129
+#: rc.cpp:153 rc.cpp:2237
 #, no-c-format
 msgid ""
 "When this option is enabled, this filter will show all items containing at "
@@ -2962,19 +4611,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file filteredit_base.ui line 269
-#: rc.cpp:156 rc.cpp:2132
+#: rc.cpp:156 rc.cpp:2240
 #, no-c-format
 msgid "Change..."
 msgstr "更改..."
 
 #. i18n: file filteredit_base.ui line 282
-#: rc.cpp:159 rc.cpp:2135
+#: rc.cpp:159 rc.cpp:2243
 #, no-c-format
 msgid "Hide to-dos not assigned to me"
 msgstr "隐藏未指派给我的待办"
 
 #. i18n: file filteredit_base.ui line 289
-#: rc.cpp:162 rc.cpp:2138
+#: rc.cpp:162 rc.cpp:2246
 #, no-c-format
 msgid ""
 "This option hides all to-dos from your list which are assigned to someone else."
@@ -2984,184 +4633,180 @@ msgid ""
 msgstr ""
 
 #. i18n: file koeditoralarms_base.ui line 16
-#: rc.cpp:166 rc.cpp:1880
+#: rc.cpp:166 rc.cpp:2063
 #, no-c-format
 msgid "Alarms"
 msgstr "提醒"
 
 #. i18n: file koeditoralarms_base.ui line 30
-#: rc.cpp:169 rc.cpp:262 rc.cpp:1883 rc.cpp:1976
+#: rc.cpp:169 rc.cpp:259 rc.cpp:2066 rc.cpp:2156
 #, fuzzy, no-c-format
 msgid "Time Offset"
 msgstr "偏移"
 
-#. i18n: file koeditoralarms_base.ui line 80
-#: rc.cpp:181 rc.cpp:1895
+#. i18n: file koeditoralarms_base.ui line 86
+#: koeditorgeneral.cpp:240 koeditorgeneral.cpp:439 koeditorgeneral.cpp:444
+#: rc.cpp:181 rc.cpp:2078
 #, fuzzy, no-c-format
 msgid "before the start"
 msgstr "开始前"
 
-#. i18n: file koeditoralarms_base.ui line 85
-#: rc.cpp:184 rc.cpp:1898
+#. i18n: file koeditoralarms_base.ui line 91
+#: rc.cpp:184 rc.cpp:2081
 #, fuzzy, no-c-format
 msgid "after the start"
 msgstr "开始后"
 
-#. i18n: file koeditoralarms_base.ui line 90
-#: rc.cpp:187 rc.cpp:1901
+#. i18n: file koeditoralarms_base.ui line 96
+#: rc.cpp:187 rc.cpp:2084
 #, fuzzy, no-c-format
 msgid "before the end"
 msgstr "结束前"
 
-#. i18n: file koeditoralarms_base.ui line 95
-#: rc.cpp:190 rc.cpp:1904
+#. i18n: file koeditoralarms_base.ui line 101
+#: rc.cpp:190 rc.cpp:2087
 #, fuzzy, no-c-format
 msgid "after the end"
 msgstr "结束后"
 
-#. i18n: file koeditoralarms_base.ui line 128
-#: rc.cpp:193 rc.cpp:1907
+#. i18n: file koeditoralarms_base.ui line 134
+#: rc.cpp:193 rc.cpp:2090
 #, no-c-format
 msgid "&How often:"
 msgstr "频率(&H)："
 
-#. i18n: file koeditoralarms_base.ui line 142
-#: rc.cpp:196 rc.cpp:1910
+#. i18n: file koeditoralarms_base.ui line 148
+#: rc.cpp:196 rc.cpp:2093
 #, no-c-format
 msgid " time(s)"
 msgstr " 次"
 
-#. i18n: file koeditoralarms_base.ui line 159
-#: rc.cpp:199 rc.cpp:1913
+#. i18n: file koeditoralarms_base.ui line 165
+#: rc.cpp:199 rc.cpp:2096
 #, no-c-format
 msgid "&Interval:"
 msgstr "间隔(&I)："
 
-#. i18n: file koeditoralarms_base.ui line 178
-#: rc.cpp:202 rc.cpp:1916
+#. i18n: file koeditoralarms_base.ui line 184
+#: rc.cpp:202 rc.cpp:2099
 #, no-c-format
 msgid "&Repeat:"
 msgstr "重复(&R)："
 
-#. i18n: file koeditoralarms_base.ui line 189
-#: rc.cpp:205 rc.cpp:1919
+#. i18n: file koeditoralarms_base.ui line 195
+#: rc.cpp:205 rc.cpp:2102
 #, no-c-format
 msgid "every "
 msgstr "每隔"
 
-#. i18n: file koeditoralarms_base.ui line 192
-#: rc.cpp:208 rc.cpp:1922
+#. i18n: file koeditoralarms_base.ui line 198
+#: rc.cpp:208 rc.cpp:2105
 #, no-c-format
 msgid " minute(s)"
 msgstr "分钟"
 
-#. i18n: file koeditoralarms_base.ui line 210
-#: rc.cpp:211 rc.cpp:259 rc.cpp:1925 rc.cpp:1973
+#. i18n: file koeditoralarms_base.ui line 216
+#: rc.cpp:211 rc.cpp:256 rc.cpp:2108 rc.cpp:2153
 #, no-c-format
 msgid "Type"
 msgstr "类型"
 
-#. i18n: file koeditoralarms_base.ui line 252
-#: rc.cpp:214 rc.cpp:1928
+#. i18n: file koeditoralarms_base.ui line 258
+#: rc.cpp:214 rc.cpp:2111
 #, no-c-format
 msgid "&Reminder Dialog"
 msgstr "提醒对话框(&R)"
 
-#. i18n: file koeditoralarms_base.ui line 263
-#: rc.cpp:217 rc.cpp:1931
+#. i18n: file koeditoralarms_base.ui line 269
+#: rc.cpp:217 rc.cpp:2114
 #, no-c-format
 msgid "A&udio"
 msgstr "音频(&U)"
 
-#. i18n: file koeditoralarms_base.ui line 341
-#: rc.cpp:226 rc.cpp:1940
+#. i18n: file koeditoralarms_base.ui line 347
+#: rc.cpp:226 rc.cpp:2123
 #, no-c-format
 msgid "Reminder Dialog &text:"
 msgstr "提醒对话框文字(&T)："
 
-#. i18n: file koeditoralarms_base.ui line 373
-#: rc.cpp:229 rc.cpp:1943
+#. i18n: file koeditoralarms_base.ui line 379
+#: rc.cpp:229 rc.cpp:2126
 #, no-c-format
 msgid "Audio &file:"
 msgstr "声音文件(&F)："
 
-#. i18n: file koeditoralarms_base.ui line 384
-#: rc.cpp:232 rc.cpp:1946
+#. i18n: file koeditoralarms_base.ui line 390
+#: rc.cpp:232 rc.cpp:2129
 #, no-c-format
 msgid "audio/x-wav audio/x-mp3 application/ogg"
 msgstr ""
 
-#. i18n: file koeditoralarms_base.ui line 425
-#: rc.cpp:235 rc.cpp:1949
+#. i18n: file koeditoralarms_base.ui line 431
+#: rc.cpp:235 rc.cpp:2132
 #, no-c-format
 msgid "&Program file:"
 msgstr "程序文件(&P)："
 
-#. i18n: file koeditoralarms_base.ui line 436
-#: rc.cpp:238 rc.cpp:1952
+#. i18n: file koeditoralarms_base.ui line 442
+#: rc.cpp:238 rc.cpp:2135
 #, no-c-format
 msgid "*.*|All files"
 msgstr "*.*|全部文件"
 
-#. i18n: file koeditoralarms_base.ui line 444
-#: rc.cpp:241 rc.cpp:1955
+#. i18n: file koeditoralarms_base.ui line 450
+#: rc.cpp:241 rc.cpp:2138
 #, no-c-format
 msgid "Program ar&guments:"
 msgstr "程序参数(&G)："
 
-#. i18n: file koeditoralarms_base.ui line 493
-#: rc.cpp:244 rc.cpp:1958
+#. i18n: file koeditoralarms_base.ui line 499
+#: rc.cpp:244 rc.cpp:2141
 #, no-c-format
 msgid "Email &message text:"
 msgstr "电子邮件文本(&M)："
 
-#. i18n: file koeditoralarms_base.ui line 514
-#: rc.cpp:247 rc.cpp:1961
+#. i18n: file koeditoralarms_base.ui line 520
+#: rc.cpp:247 rc.cpp:2144
 #, no-c-format
 msgid "Email &address(es):"
 msgstr "电子邮件地址(&A)："
 
-#. i18n: file koeditoralarms_base.ui line 538
-#: rc.cpp:250 rc.cpp:1964
-#, no-c-format
-msgid "&Remove..."
-msgstr "删除(&R)..."
-
-#. i18n: file koeditoralarms_base.ui line 554
-#: rc.cpp:256 rc.cpp:1970
+#. i18n: file koeditoralarms_base.ui line 560
+#: rc.cpp:253 rc.cpp:2150
 #, no-c-format
 msgid "D&uplicate"
 msgstr "副本(&U)"
 
-#. i18n: file koeditoralarms_base.ui line 599
-#: rc.cpp:265 rc.cpp:1979
+#. i18n: file koeditoralarms_base.ui line 605
+#: rc.cpp:262 rc.cpp:2159
 #, no-c-format
 msgid "Repeat"
 msgstr "重复"
 
 #. i18n: file kogroupwareprefspage.ui line 31
-#: rc.cpp:268 rc.cpp:891
+#: rc.cpp:265 rc.cpp:1860
 #, no-c-format
 msgid "P&ublish"
 msgstr "发布(&U)"
 
 #. i18n: file kogroupwareprefspage.ui line 42
-#: rc.cpp:271 rc.cpp:894
-#, no-c-format
+#: rc.cpp:268 rc.cpp:1863
+#, fuzzy, no-c-format
 msgid ""
 "By publishing Free/Busy information, you allow others to take your calendar "
 "into account when inviting you for a meeting. Only the times you have already "
-"busy are published, not why they are busy."
+"busy are published, not why they are busy. For Kolab2 Server leave this "
+"disabled (the information is generated on the server)."
 msgstr "发布忙/闲信息后，就可允许其它人在邀请您加入会议时考虑到您的日程安排。只会发布您的繁忙时段，而不公布原因。"
 
 #. i18n: file kogroupwareprefspage.ui line 53
-#: rc.cpp:274 rc.cpp:897
+#: rc.cpp:271 rc.cpp:1866
 #, no-c-format
 msgid "Publish your free/&busy information automatically"
 msgstr "自动发布您的忙/闲信息(&B)"
 
 #. i18n: file kogroupwareprefspage.ui line 58
-#: rc.cpp:277 rc.cpp:900
+#: rc.cpp:274 rc.cpp:1869
 #, no-c-format
 msgid ""
 "Check this box to upload your Free/Busy information automatically.\n"
@@ -3173,13 +4818,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file kogroupwareprefspage.ui line 74
-#: rc.cpp:282 rc.cpp:905
+#: rc.cpp:279 rc.cpp:1874
 #, no-c-format
 msgid "Minimum time between uploads (in minutes):"
 msgstr "上传的最小时间(分钟)："
 
 #. i18n: file kogroupwareprefspage.ui line 80
-#: rc.cpp:285 rc.cpp:288 rc.cpp:908 rc.cpp:911
+#: rc.cpp:282 rc.cpp:285 rc.cpp:1877 rc.cpp:1880
 #, no-c-format
 msgid ""
 "Configure minimum the interval of time in minutes between each upload here. "
@@ -3188,13 +4833,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file kogroupwareprefspage.ui line 109
-#: rc.cpp:291 rc.cpp:914
+#: rc.cpp:288 rc.cpp:1883
 #, no-c-format
 msgid "Publish"
 msgstr "发布"
 
 #. i18n: file kogroupwareprefspage.ui line 115
-#: rc.cpp:294 rc.cpp:297 rc.cpp:303 rc.cpp:917 rc.cpp:920 rc.cpp:926
+#: rc.cpp:291 rc.cpp:294 rc.cpp:300 rc.cpp:1886 rc.cpp:1889 rc.cpp:1895
 #, no-c-format
 msgid ""
 "Configure the number of calendar days you wish to be published and available to "
@@ -3202,36 +4847,34 @@ msgid ""
 msgstr ""
 
 #. i18n: file kogroupwareprefspage.ui line 140
-#: rc.cpp:300 rc.cpp:923
+#: rc.cpp:297 rc.cpp:1892
 #, no-c-format
 msgid "days of free/busy information"
 msgstr "天的忙/闲信息"
 
 #. i18n: file kogroupwareprefspage.ui line 170
-#: rc.cpp:306 rc.cpp:372 rc.cpp:929 rc.cpp:995
+#: rc.cpp:303 rc.cpp:367 rc.cpp:1898 rc.cpp:1962
 #, no-c-format
 msgid "Server Information"
 msgstr "服务器信息"
 
-#. i18n: file kogroupwareprefspage.ui line 186
-#: rc.cpp:309 rc.cpp:346 rc.cpp:932 rc.cpp:969
+#. i18n: file kogroupwareprefspage.ui line 185
+#: rc.cpp:306 rc.cpp:342 rc.cpp:1901 rc.cpp:1937
 #, no-c-format
 msgid ""
 "Enter the URL for the server on which your Free/Busy information shall be "
 "published here.\n"
-"Ask the server administrator for this information.\n"
-"Here is a Kolab2 server URL example: "
-"\"webdavs://kolab2.com/freebusy/joe@kolab2.com.ifb\""
+"Ask the server administrator for this information."
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 194
-#: rc.cpp:314 rc.cpp:937
+#. i18n: file kogroupwareprefspage.ui line 193
+#: rc.cpp:310 rc.cpp:1905
 #, no-c-format
 msgid "Remember p&assword"
 msgstr "记住密码(&A)"
 
-#. i18n: file kogroupwareprefspage.ui line 198
-#: rc.cpp:317 rc.cpp:413 rc.cpp:940 rc.cpp:1036
+#. i18n: file kogroupwareprefspage.ui line 197
+#: rc.cpp:313 rc.cpp:416 rc.cpp:1908 rc.cpp:2011
 #, no-c-format
 msgid ""
 "Check this box to make KOrganizer remember your password and skip asking you "
@@ -3241,22 +4884,16 @@ msgid ""
 "configuration file."
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 206
-#: plugins/exchange/exchangeconfig.cpp:59 rc.cpp:321 rc.cpp:944
-#, no-c-format
-msgid "Password:"
-msgstr "密码："
-
-#. i18n: file kogroupwareprefspage.ui line 212
-#: rc.cpp:324 rc.cpp:327 rc.cpp:404 rc.cpp:407 rc.cpp:947 rc.cpp:950
-#: rc.cpp:1027 rc.cpp:1030
+#. i18n: file kogroupwareprefspage.ui line 211
+#: rc.cpp:320 rc.cpp:323 rc.cpp:407 rc.cpp:410 rc.cpp:1915 rc.cpp:1918
+#: rc.cpp:2002 rc.cpp:2005
 #, no-c-format
 msgid "Enter your groupware server login password here."
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 239
-#: rc.cpp:330 rc.cpp:338 rc.cpp:388 rc.cpp:396 rc.cpp:953 rc.cpp:961
-#: rc.cpp:1011 rc.cpp:1019
+#. i18n: file kogroupwareprefspage.ui line 238
+#: rc.cpp:326 rc.cpp:334 rc.cpp:391 rc.cpp:399 rc.cpp:1921 rc.cpp:1929
+#: rc.cpp:1986 rc.cpp:1994
 #, no-c-format
 msgid ""
 "Enter the login information relative to your account on the server here.\n"
@@ -3266,40 +4903,40 @@ msgid ""
 "also be different. In the last case enter your UID."
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 247
-#: rc.cpp:335 rc.cpp:958
+#. i18n: file kogroupwareprefspage.ui line 246
+#: rc.cpp:331 rc.cpp:1926
 #, no-c-format
 msgid "Username:"
 msgstr "用户名："
 
-#. i18n: file kogroupwareprefspage.ui line 274
-#: rc.cpp:343 rc.cpp:375 rc.cpp:966 rc.cpp:998
+#. i18n: file kogroupwareprefspage.ui line 273
+#: rc.cpp:339 rc.cpp:370 rc.cpp:1934 rc.cpp:1965
 #, no-c-format
 msgid "Server URL:"
 msgstr "服务器 URL："
 
-#. i18n: file kogroupwareprefspage.ui line 311
-#: rc.cpp:351 rc.cpp:974
+#. i18n: file kogroupwareprefspage.ui line 309
+#: rc.cpp:346 rc.cpp:1941
 #, no-c-format
 msgid "&Retrieve"
 msgstr "获取(&R)"
 
-#. i18n: file kogroupwareprefspage.ui line 322
-#: rc.cpp:354 rc.cpp:977
+#. i18n: file kogroupwareprefspage.ui line 320
+#: rc.cpp:349 rc.cpp:1944
 #, no-c-format
 msgid ""
 "By retrieving Free/Busy information that others have published, you can take "
 "their calendar into account when inviting them to a meeting."
 msgstr "获取其他人发布的忙/闲信息后，在邀请他们加入会议时您就会考虑到他们的日程安排。"
 
-#. i18n: file kogroupwareprefspage.ui line 333
-#: rc.cpp:357 rc.cpp:980
+#. i18n: file kogroupwareprefspage.ui line 331
+#: rc.cpp:352 rc.cpp:1947
 #, no-c-format
 msgid "Retrieve other peoples' free/&busy information automatically"
 msgstr "自动获取别人的忙/闲信息(&B)"
 
-#. i18n: file kogroupwareprefspage.ui line 336
-#: rc.cpp:360 rc.cpp:983
+#. i18n: file kogroupwareprefspage.ui line 334
+#: rc.cpp:355 rc.cpp:1950
 #, no-c-format
 msgid ""
 "Check this box to retrieve other peoples' Free/Busy information automatically. "
@@ -3307,21 +4944,21 @@ msgid ""
 "possible."
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 347
-#: rc.cpp:363 rc.cpp:986
+#. i18n: file kogroupwareprefspage.ui line 345
+#: rc.cpp:358 rc.cpp:1953
 #, no-c-format
 msgid "Use full email &address for retrieval"
 msgstr "使用完整的电子邮件地址获取(&A)"
 
-#. i18n: file kogroupwareprefspage.ui line 350
-#: rc.cpp:366 rc.cpp:989
+#. i18n: file kogroupwareprefspage.ui line 348
+#: rc.cpp:361 rc.cpp:1956
 #, no-c-format
 msgid ""
 "Set this to retrieve user@domain.ifb instead of user.ifb from the server"
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 353
-#: rc.cpp:369 rc.cpp:992
+#. i18n: file kogroupwareprefspage.ui line 351
+#: rc.cpp:364 rc.cpp:1959
 #, no-c-format
 msgid ""
 "Check this box to download a free/busy file in the format \"user@domain.ifb\" "
@@ -3330,54 +4967,58 @@ msgid ""
 "you are not sure about how to configure this option."
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 388
-#: rc.cpp:378 rc.cpp:383 rc.cpp:1001 rc.cpp:1006
+#. i18n: file kogroupwareprefspage.ui line 390
+#: rc.cpp:373 rc.cpp:382 rc.cpp:1968 rc.cpp:1977
 #, no-c-format
 msgid ""
 "Enter the URL for the server on which the Free/Busy information is published "
 "here.\n"
 "Ask the server administrator for this information.\n"
-"Here is a Kolab2 server URL example: \"webdavs://kolab2.com/freebusy/\""
+"Here is a Kolab2 Server URL example: \"https://kolab2.example.com/freebusy/\"\n"
+"Here is a generic server example: \"http://myserver.net/%u@%d/?internal.ics\"\n"
+"%u expands to the username, and %d expands to the domain name.\n"
+"Alternatively, you can specify a full path to the Free/Busy file,\n"
+"For example: \"https://kolab2.example.com/freebusy/user.xfb\""
 msgstr ""
 
-#. i18n: file kogroupwareprefspage.ui line 440
-#: rc.cpp:393 rc.cpp:1016
+#. i18n: file kogroupwareprefspage.ui line 446
+#: rc.cpp:396 rc.cpp:1991
 #, no-c-format
 msgid "User&name:"
 msgstr "用户名(&N)："
 
-#. i18n: file kogroupwareprefspage.ui line 456
-#: rc.cpp:401 rc.cpp:1024
+#. i18n: file kogroupwareprefspage.ui line 462
+#: rc.cpp:404 rc.cpp:1999
 #, no-c-format
 msgid "Passwor&d:"
 msgstr "密码(&D)："
 
-#. i18n: file kogroupwareprefspage.ui line 486
-#: rc.cpp:410 rc.cpp:1033
+#. i18n: file kogroupwareprefspage.ui line 492
+#: rc.cpp:413 rc.cpp:2008
 #, no-c-format
 msgid "Re&member password"
 msgstr "记住密码(&M)"
 
 #. i18n: file publishdialog_base.ui line 65
-#: rc.cpp:426 rc.cpp:1868
+#: rc.cpp:429 rc.cpp:2171
 #, no-c-format
 msgid "Email:"
 msgstr "电子邮件："
 
 #. i18n: file publishdialog_base.ui line 94
-#: rc.cpp:432 rc.cpp:1874
+#: rc.cpp:435 rc.cpp:2177
 #, no-c-format
 msgid "Select &Addressee..."
 msgstr "选择收信人(&A)..."
 
 #. i18n: file template_management_dialog_base.ui line 16
-#: rc.cpp:438 rc.cpp:1478
+#: rc.cpp:441 rc.cpp:1845
 #, no-c-format
 msgid "Template Management"
 msgstr "模板管理"
 
 #. i18n: file template_management_dialog_base.ui line 57
-#: rc.cpp:447 rc.cpp:1487
+#: rc.cpp:450 rc.cpp:1854
 #, no-c-format
 msgid ""
 "Select a template and click <b>Apply Template</b> to apply it to the current "
@@ -3386,19 +5027,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file template_management_dialog_base.ui line 65
-#: rc.cpp:450 rc.cpp:1490 templatemanagementdialog.cpp:50
+#: rc.cpp:453 rc.cpp:1857 templatemanagementdialog.cpp:50
 #, no-c-format
 msgid "Apply Template"
 msgstr "应用模板"
 
 #. i18n: file korganizer.kcfg line 11
-#: rc.cpp:453 rc.cpp:1040
+#: rc.cpp:456 rc.cpp:1086
 #, no-c-format
 msgid "Enable automatic saving of manually opened calendar files"
 msgstr "启用手动打开的日历文件的自动保存"
 
 #. i18n: file korganizer.kcfg line 12
-#: rc.cpp:456 rc.cpp:1043
+#: rc.cpp:459 rc.cpp:1089
 #, no-c-format
 msgid ""
 "Check this box to save your calendar file automatically when you exit "
@@ -3408,13 +5049,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 16
-#: rc.cpp:459 rc.cpp:1046
+#: rc.cpp:462 rc.cpp:1092
 #, no-c-format
 msgid "Save &interval in minutes"
 msgstr "保存间隔(分钟)(&I)"
 
 #. i18n: file korganizer.kcfg line 17
-#: rc.cpp:462 rc.cpp:1049
+#: rc.cpp:465 rc.cpp:1095
 #, no-c-format
 msgid ""
 "Set the interval between automatic saving of calendar events in minutes here. "
@@ -3423,55 +5064,55 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 22
-#: rc.cpp:465 rc.cpp:1052
+#: rc.cpp:468 rc.cpp:1098
 #, no-c-format
 msgid "Confirm deletes"
 msgstr "确认删除"
 
 #. i18n: file korganizer.kcfg line 23
-#: rc.cpp:468 rc.cpp:1055
+#: rc.cpp:471 rc.cpp:1101
 #, no-c-format
 msgid "Check this box to display a confirmation dialog when deleting items."
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 28
-#: rc.cpp:471 rc.cpp:1058
+#: rc.cpp:474 rc.cpp:1104
 #, no-c-format
 msgid "Archive events"
 msgstr "存档事件"
 
 #. i18n: file korganizer.kcfg line 32
-#: rc.cpp:474 rc.cpp:1061
+#: rc.cpp:477 rc.cpp:1107
 #, no-c-format
 msgid "Archive to-dos"
 msgstr "存档待办"
 
 #. i18n: file korganizer.kcfg line 37
-#: rc.cpp:477 rc.cpp:1064
+#: rc.cpp:480 rc.cpp:1110
 #, no-c-format
 msgid "Regularly archive events"
 msgstr "定期存档事件"
 
 #. i18n: file korganizer.kcfg line 41
-#: rc.cpp:480 rc.cpp:1067
+#: rc.cpp:483 rc.cpp:1113
 #, no-c-format
 msgid "What to do when archiving"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 44
-#: rc.cpp:483 rc.cpp:1070
+#: rc.cpp:486 rc.cpp:1116
 #, no-c-format
 msgid "Delete old events"
 msgstr "删除旧事件"
 
 #. i18n: file korganizer.kcfg line 47
-#: rc.cpp:486 rc.cpp:1073
+#: rc.cpp:489 rc.cpp:1119
 #, no-c-format
 msgid "Archive old events to a separate file"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 53
-#: rc.cpp:489 rc.cpp:1076
+#: rc.cpp:492 rc.cpp:1122
 #, no-c-format
 msgid ""
 "If auto-archiving is enabled, events older than this amount will be archived. "
@@ -3479,43 +5120,43 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 57
-#: rc.cpp:492 rc.cpp:1079
+#: rc.cpp:495 rc.cpp:1125
 #, no-c-format
 msgid "The unit in which the expiry time is expressed."
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 60
-#: rc.cpp:495 rc.cpp:1082
+#: rc.cpp:498 rc.cpp:1128
 #, no-c-format
 msgid "In days"
 msgstr "按天"
 
 #. i18n: file korganizer.kcfg line 63
-#: rc.cpp:498 rc.cpp:1085
+#: rc.cpp:501 rc.cpp:1131
 #, no-c-format
 msgid "In weeks"
 msgstr "按周"
 
 #. i18n: file korganizer.kcfg line 66
-#: rc.cpp:501 rc.cpp:1088
+#: rc.cpp:504 rc.cpp:1134
 #, no-c-format
 msgid "In months"
 msgstr "按月"
 
 #. i18n: file korganizer.kcfg line 72
-#: rc.cpp:504 rc.cpp:1091
+#: rc.cpp:507 rc.cpp:1137
 #, no-c-format
 msgid "URL of the file where old events should be archived"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 76
-#: rc.cpp:507 rc.cpp:1094
+#: rc.cpp:510 rc.cpp:1140
 #, no-c-format
 msgid "Export to HTML with every save"
 msgstr "每次保存时导出为 HTML"
 
 #. i18n: file korganizer.kcfg line 77
-#: rc.cpp:510 rc.cpp:1097
+#: rc.cpp:513 rc.cpp:1143
 #, no-c-format
 msgid ""
 "Check this box to export the calendar to an HTML-file every time you save it. "
@@ -3524,19 +5165,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 81
-#: rc.cpp:513 rc.cpp:1100
+#: rc.cpp:516 rc.cpp:1146
 #, no-c-format
 msgid "New Events, To-dos and Journal Entries Should"
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 84
-#: rc.cpp:516 rc.cpp:1103
+#: rc.cpp:519 rc.cpp:1149
 #, no-c-format
 msgid "Be added to the standard resource"
 msgstr "添加到标准资源中"
 
 #. i18n: file korganizer.kcfg line 85
-#: rc.cpp:519 rc.cpp:1106
+#: rc.cpp:522 rc.cpp:1152
 #, no-c-format
 msgid ""
 "Select this option to always record new events, to-dos and journal entries "
@@ -3544,13 +5185,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 88
-#: rc.cpp:522 rc.cpp:1109
+#: rc.cpp:525 rc.cpp:1155
 #, no-c-format
 msgid "Be asked which resource to use"
 msgstr "询问要使用哪个资源"
 
 #. i18n: file korganizer.kcfg line 89
-#: rc.cpp:525 rc.cpp:1112
+#: rc.cpp:528 rc.cpp:1158
 #, no-c-format
 msgid ""
 "Select this option to choose the resource to be used to record the item each "
@@ -3560,13 +5201,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 98
-#: rc.cpp:528 rc.cpp:1115
+#: rc.cpp:531 rc.cpp:1161
 #, no-c-format
 msgid "Send copy to owner when mailing events"
 msgstr "邮寄事件时发送副本给主人"
 
 #. i18n: file korganizer.kcfg line 99
-#: rc.cpp:531 rc.cpp:1118
+#: rc.cpp:534 rc.cpp:1164
 #, no-c-format
 msgid ""
 "Check this box to get a copy of all e-mail messages that KOrganizer sends at "
@@ -3574,28 +5215,28 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 103
-#: rc.cpp:534 rc.cpp:1121
+#: rc.cpp:537 rc.cpp:1167
 #, no-c-format
 msgid "Use email settings from Control Center"
 msgstr "使用控制中心的电子邮件设置"
 
 #. i18n: file korganizer.kcfg line 104
-#: rc.cpp:537 rc.cpp:1124
+#: rc.cpp:540 rc.cpp:1170
 #, no-c-format
 msgid ""
 "Check this box to use the TDE-wide e-mail settings, which are defined using the "
-"Trinity Control Center &quot;Password & User Account&quot; Module. Uncheck this box "
-"to be able to specify your full name and e-mail."
+"Trinity Control Center &quot;Password & User Account&quot; Module. Uncheck this "
+"box to be able to specify your full name and e-mail."
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 108
-#: rc.cpp:540 rc.cpp:1127
+#: rc.cpp:543 rc.cpp:1173
 #, no-c-format
 msgid "Full &name"
 msgstr "全名(&N)"
 
 #. i18n: file korganizer.kcfg line 109
-#: rc.cpp:543 rc.cpp:1130
+#: rc.cpp:546 rc.cpp:1176
 #, no-c-format
 msgid ""
 "Enter your full name here. This name will be displayed as \"Organizer\" in "
@@ -3603,13 +5244,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 113
-#: rc.cpp:546 rc.cpp:1133
+#: rc.cpp:549 rc.cpp:1179
 #, no-c-format
 msgid "E&mail address"
 msgstr "电子邮件地址(&M)"
 
 #. i18n: file korganizer.kcfg line 114
-#: rc.cpp:549 rc.cpp:1136
+#: rc.cpp:552 rc.cpp:1182
 #, no-c-format
 msgid ""
 "Enter here your e-mail address. This e-mail address will be used to identify "
@@ -3617,19 +5258,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 118
-#: rc.cpp:552 rc.cpp:1139
+#: rc.cpp:555 rc.cpp:1185
 #, no-c-format
 msgid "Mail Client"
 msgstr "邮件客户"
 
 #. i18n: file korganizer.kcfg line 121
-#: rc.cpp:555 rc.cpp:1142
+#: rc.cpp:558 rc.cpp:1188
 #, no-c-format
 msgid "KMail"
 msgstr "KMail"
 
 #. i18n: file korganizer.kcfg line 122
-#: rc.cpp:558 rc.cpp:1145
+#: rc.cpp:561 rc.cpp:1191
 #, no-c-format
 msgid ""
 "Select this option to use KMail as the mail transport. The mail transport is "
@@ -3637,13 +5278,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 125
-#: rc.cpp:561 rc.cpp:1148
+#: rc.cpp:564 rc.cpp:1194
 #, no-c-format
 msgid "Sendmail"
 msgstr "Sendmail"
 
 #. i18n: file korganizer.kcfg line 126
-#: rc.cpp:564 rc.cpp:1151
+#: rc.cpp:567 rc.cpp:1197
 #, no-c-format
 msgid ""
 "Select this option to use sendmail as the mail transport. The mail transport is "
@@ -3652,13 +5293,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 142
-#: rc.cpp:576 rc.cpp:1163
+#: rc.cpp:579 rc.cpp:1209
 #, no-c-format
 msgid "Default appointment time"
 msgstr "默认约会时间"
 
 #. i18n: file korganizer.kcfg line 143
-#: rc.cpp:579 rc.cpp:1166
+#: rc.cpp:582 rc.cpp:1212
 #, no-c-format
 msgid ""
 "Enter the default time for events here. The default is used if you do not "
@@ -3666,52 +5307,144 @@ msgid ""
 msgstr ""
 
 #. i18n: file korganizer.kcfg line 147
-#: rc.cpp:582 rc.cpp:1169
+#: rc.cpp:585 rc.cpp:1215
 #, no-c-format
 msgid "Default duration of new appointment (HH:MM)"
 msgstr "新约会的默认时间长度(HH:MM)"
 
 #. i18n: file korganizer.kcfg line 148
-#: rc.cpp:585 rc.cpp:1172
+#: rc.cpp:588 rc.cpp:1218
 #, no-c-format
 msgid ""
 "Enter default duration for events here. The default is used if you do not "
 "supply an end time."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 152
-#: rc.cpp:588 rc.cpp:1175
+#. i18n: file korganizer.kcfg line 153
+#: rc.cpp:591 rc.cpp:1221
+#, fuzzy, no-c-format
+msgid "Default reminder time"
+msgstr "默认提醒时间："
+
+#. i18n: file korganizer.kcfg line 154
+#: rc.cpp:594 rc.cpp:1224
 #, no-c-format
-msgid "Default Reminder Time"
-msgstr "默认提醒时间"
+msgid ""
+"Enter the default reminder time for all newly created items. The time unit is "
+"specified in the adjacent combobox."
+msgstr ""
 
-#. i18n: file korganizer.kcfg line 153
-#: rc.cpp:591 rc.cpp:1178
+#. i18n: file korganizer.kcfg line 155
+#: rc.cpp:597 rc.cpp:1227
+#, fuzzy, no-c-format
+msgid "Default time for reminders"
+msgstr "默认提醒时间："
+
+#. i18n: file korganizer.kcfg line 159
+#: rc.cpp:600 rc.cpp:1230
 #, no-c-format
-msgid "Enter the reminder time here."
-msgstr "在此输入默认提醒时间。"
+msgid ""
+"Enter the default reminder time units for all newly created items. The time is "
+"specified in the adjacent spinbox."
+msgstr ""
 
 #. i18n: file korganizer.kcfg line 160
-#: rc.cpp:594 rc.cpp:1181
+#: rc.cpp:603 rc.cpp:1233
+#, fuzzy, no-c-format
+msgid "Default time unit for reminders"
+msgstr "默认提醒时间："
+
+#. i18n: file korganizer.kcfg line 164
+#: rc.cpp:606 rc.cpp:1236
+#, no-c-format
+msgid "Enable a default sound file for audio reminders"
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 165
+#: rc.cpp:609 rc.cpp:1239
+#, no-c-format
+msgid ""
+"Check this box if you want to enable the specified file to be used as the "
+"default sound file for new reminders. You can always specify another file in "
+"the Advanced Reminder accessible from the Event or To-do editors."
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 169
+#: rc.cpp:612 rc.cpp:1242
+#, fuzzy, no-c-format
+msgid "Default audio file"
+msgstr "默认日历"
+
+#. i18n: file korganizer.kcfg line 170
+#: rc.cpp:615 rc.cpp:1245
+#, no-c-format
+msgid ""
+"Set a file to be used as the default sound file for new reminders. You can "
+"always specify another file in the Advanced Reminder accessible from the Event "
+"or To-do editors."
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 173
+#: rc.cpp:618 rc.cpp:1248
+#, no-c-format
+msgid "Enable reminders for new Events"
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 174
+#: rc.cpp:621 rc.cpp:1251
+#, no-c-format
+msgid ""
+"Check this box if you want to enable reminders for all newly created Events. "
+"You can always turn-off the reminders in the Event editor dialog."
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 175
+#: rc.cpp:624 rc.cpp:1254
+#, no-c-format
+msgid "By default, enable reminders for new events"
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 179
+#: rc.cpp:627 rc.cpp:1257
+#, no-c-format
+msgid "Enable reminders for new To-dos"
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 180
+#: rc.cpp:630 rc.cpp:1260
+#, no-c-format
+msgid ""
+"Check this box if you want to enable reminders for all newly created To-dos. "
+"You can always turn-off the reminders in the To-do editor dialog."
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 181
+#: rc.cpp:633 rc.cpp:1263
+#, no-c-format
+msgid "By default, enable reminders for new to-dos"
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 188
+#: rc.cpp:636 rc.cpp:1266
 #, no-c-format
 msgid "Hour size"
 msgstr "小时大小"
 
-#. i18n: file korganizer.kcfg line 161
-#: rc.cpp:597 rc.cpp:1184
+#. i18n: file korganizer.kcfg line 189
+#: rc.cpp:639 rc.cpp:1269
 #, no-c-format
 msgid ""
 "Select on this spin box the height of the hour rows in the schedule view."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 167
-#: rc.cpp:600 rc.cpp:1187
+#. i18n: file korganizer.kcfg line 195
+#: rc.cpp:642 rc.cpp:1272
 #, no-c-format
 msgid "Show events that recur daily in date navigator"
 msgstr "在日期导航器中显示每天重复出现的事件"
 
-#. i18n: file korganizer.kcfg line 168
-#: rc.cpp:603 rc.cpp:1190
+#. i18n: file korganizer.kcfg line 196
+#: rc.cpp:645 rc.cpp:1275
 #, no-c-format
 msgid ""
 "Check this box to show the days containing daily recurring events in bold "
@@ -3719,14 +5452,14 @@ msgid ""
 "(non daily recurring) events."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 172
-#: rc.cpp:606 rc.cpp:1193
+#. i18n: file korganizer.kcfg line 200
+#: rc.cpp:648 rc.cpp:1278
 #, no-c-format
 msgid "Show events that recur weekly in date navigator"
 msgstr "在日期导航器中显示每周重复出现的事件"
 
-#. i18n: file korganizer.kcfg line 173
-#: rc.cpp:609 rc.cpp:1196
+#. i18n: file korganizer.kcfg line 201
+#: rc.cpp:651 rc.cpp:1281
 #, no-c-format
 msgid ""
 "Check this box to show the days containing weekly recurring events in bold "
@@ -3734,56 +5467,70 @@ msgid ""
 "(non weekly recurring) events."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 177
-#: rc.cpp:612 rc.cpp:1199
+#. i18n: file korganizer.kcfg line 205
+#: rc.cpp:654 rc.cpp:1284
+#, no-c-format
+msgid "Week numbers select a work week when in work week view"
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 206
+#: rc.cpp:657 rc.cpp:1287
+#, no-c-format
+msgid ""
+"Check this box to select a work week when clicking on date navigator's week "
+"numbers or uncheck it to chose the whole week."
+msgstr ""
+
+#. i18n: file korganizer.kcfg line 210
+#: rc.cpp:660 rc.cpp:1290
 #, no-c-format
 msgid "Enable tooltips displaying summary of events"
 msgstr "启用工具提示中的事件概要显示"
 
-#. i18n: file korganizer.kcfg line 178
-#: rc.cpp:615 rc.cpp:1202
+#. i18n: file korganizer.kcfg line 211
+#: rc.cpp:663 rc.cpp:1293
 #, no-c-format
 msgid ""
 "Check this box to display an event summary tooltip when hovering the mouse over "
 "an event."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 182
-#: rc.cpp:618 rc.cpp:1205
+#. i18n: file korganizer.kcfg line 215
+#: rc.cpp:666 rc.cpp:1296
 #, no-c-format
 msgid "Show to-dos in day, week and month views"
 msgstr "在日、周、月视图中显示待办"
 
-#. i18n: file korganizer.kcfg line 183
-#: rc.cpp:621 rc.cpp:1208
+#. i18n: file korganizer.kcfg line 216
+#: rc.cpp:669 rc.cpp:1299
 #, no-c-format
 msgid ""
 "Check this box to display to-dos in the day, week, and month view. This is "
 "helpful when you have a lot of (recurring) to-dos."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 187
-#: rc.cpp:624 rc.cpp:1211
+#. i18n: file korganizer.kcfg line 220
+#: rc.cpp:672 rc.cpp:1302
 #, no-c-format
 msgid "Enable scrollbars in month view cells"
 msgstr "在月视图的单元格中启用滚动条"
 
-#. i18n: file korganizer.kcfg line 188
-#: rc.cpp:627 rc.cpp:1214
+#. i18n: file korganizer.kcfg line 221
+#: rc.cpp:675 rc.cpp:1305
 #, no-c-format
 msgid ""
 "Check this box to display scrollbars when clicking on a cell in the month view; "
 "they will only appear when needed though."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 192
-#: rc.cpp:630 rc.cpp:1217
+#. i18n: file korganizer.kcfg line 225
+#: rc.cpp:678 rc.cpp:1308
 #, no-c-format
 msgid "Time range selection in agenda view starts event editor"
 msgstr "在议事日程视图中选择时间范围启动事件编辑器"
 
-#. i18n: file korganizer.kcfg line 193
-#: rc.cpp:633 rc.cpp:1220
+#. i18n: file korganizer.kcfg line 226
+#: rc.cpp:681 rc.cpp:1311
 #, no-c-format
 msgid ""
 "Check this box to start the event editor automatically when you select a time "
@@ -3791,182 +5538,168 @@ msgid ""
 "the start time to the end time of the event you are about to plan."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 198
-#: rc.cpp:636 rc.cpp:1223
+#. i18n: file korganizer.kcfg line 231
+#: rc.cpp:684 rc.cpp:1314
 #, no-c-format
 msgid "Show current-time (Marcus Bains) line"
 msgstr "显示当前时间(Marcus Bains)线"
 
-#. i18n: file korganizer.kcfg line 199
-#: rc.cpp:639 rc.cpp:1226
+#. i18n: file korganizer.kcfg line 232
+#: rc.cpp:687 rc.cpp:1317
 #, no-c-format
 msgid ""
 "Check this box to display a red line in the day or week view indicating the "
 "current-time line (Marcus Bains line)."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 203
-#: rc.cpp:642 rc.cpp:1229
+#. i18n: file korganizer.kcfg line 236
+#: rc.cpp:690 rc.cpp:1320
 #, fuzzy, no-c-format
 msgid "Show seconds on current-time line"
 msgstr "在 Marcus Bains 线上显示秒数"
 
-#. i18n: file korganizer.kcfg line 204
-#: rc.cpp:645 rc.cpp:1232
+#. i18n: file korganizer.kcfg line 237
+#: rc.cpp:693 rc.cpp:1323
 #, fuzzy, no-c-format
 msgid "Check this box if you want to show seconds on the current-time line."
 msgstr "如果您想要在 Marcus Bains 线上显示秒数，请选中此选项。"
 
-#. i18n: file korganizer.kcfg line 209
-#: rc.cpp:648 rc.cpp:1235
+#. i18n: file korganizer.kcfg line 242
+#: rc.cpp:696 rc.cpp:1326
 #, no-c-format
 msgid "Colors used in agenda view"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 210
-#: rc.cpp:651 rc.cpp:1238
+#. i18n: file korganizer.kcfg line 243
+#: rc.cpp:699 rc.cpp:1329
 #, no-c-format
 msgid "Choose the colors of the agenda view items."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 213
-#: rc.cpp:654 rc.cpp:1241
+#. i18n: file korganizer.kcfg line 246
+#: rc.cpp:702 rc.cpp:756 rc.cpp:1332 rc.cpp:1386
 #, no-c-format
 msgid "Category inside, calendar outside"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 216
-#: rc.cpp:657 rc.cpp:1244
+#. i18n: file korganizer.kcfg line 249
+#: rc.cpp:705 rc.cpp:759 rc.cpp:1335 rc.cpp:1389
 #, no-c-format
 msgid "Calendar inside, category outside"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 219
-#: rc.cpp:660 rc.cpp:1247
+#. i18n: file korganizer.kcfg line 252
+#: rc.cpp:708 rc.cpp:762 rc.cpp:1338 rc.cpp:1392
 #, no-c-format
 msgid "Only category"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 222
-#: rc.cpp:663 rc.cpp:1250
+#. i18n: file korganizer.kcfg line 255
+#: rc.cpp:711 rc.cpp:765 rc.cpp:1341 rc.cpp:1395
 #, no-c-format
 msgid "Only calendar"
 msgstr "仅有日历"
 
-#. i18n: file korganizer.kcfg line 229
-#: rc.cpp:666 rc.cpp:1253
+#. i18n: file korganizer.kcfg line 262
+#: rc.cpp:714 rc.cpp:1344
 #, no-c-format
 msgid "Agenda View Calendar Display"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 232
-#: rc.cpp:669 rc.cpp:1256
+#. i18n: file korganizer.kcfg line 265
+#: rc.cpp:717 rc.cpp:1347
 #, fuzzy, no-c-format
 msgid "Merge all calendars into one view"
 msgstr "在独立窗口中打开"
 
-#. i18n: file korganizer.kcfg line 235
-#: rc.cpp:672 rc.cpp:1259
+#. i18n: file korganizer.kcfg line 268
+#: rc.cpp:720 rc.cpp:1350
 #, fuzzy, no-c-format
 msgid "Show calendars side by side"
 msgstr "要装入的日历文件"
 
-#. i18n: file korganizer.kcfg line 238
-#: rc.cpp:675 rc.cpp:1262
+#. i18n: file korganizer.kcfg line 271
+#: rc.cpp:723 rc.cpp:1353
 #, no-c-format
 msgid "Switch between views with tabs"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 247
-#: rc.cpp:678 rc.cpp:1265
+#. i18n: file korganizer.kcfg line 278
+#: rc.cpp:726 rc.cpp:1356
 #, no-c-format
 msgid "Day begins at"
 msgstr "一天开始于"
 
-#. i18n: file korganizer.kcfg line 248
-#: rc.cpp:681 rc.cpp:1268
+#. i18n: file korganizer.kcfg line 279
+#: rc.cpp:729 rc.cpp:1359
 #, no-c-format
 msgid ""
 "Enter the start time for events here. This time should be the earliest time "
 "that you use for events, as it will be displayed at the top."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 253
-#: rc.cpp:684 rc.cpp:1271
+#. i18n: file korganizer.kcfg line 284
+#: rc.cpp:732 rc.cpp:1362
 #, no-c-format
 msgid "Daily starting hour"
 msgstr "每天上班时间"
 
-#. i18n: file korganizer.kcfg line 254
-#: rc.cpp:687 rc.cpp:1274
+#. i18n: file korganizer.kcfg line 285
+#: rc.cpp:735 rc.cpp:1365
 #, no-c-format
 msgid ""
 "Enter the start time for the working hours here. The working hours will be "
 "marked with color by KOrganizer."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 258
-#: rc.cpp:690 rc.cpp:1277
+#. i18n: file korganizer.kcfg line 289
+#: rc.cpp:738 rc.cpp:1368
 #, no-c-format
 msgid "Daily ending hour"
 msgstr "每天下班时间"
 
-#. i18n: file korganizer.kcfg line 259
-#: rc.cpp:693 rc.cpp:1280
+#. i18n: file korganizer.kcfg line 290
+#: rc.cpp:741 rc.cpp:1371
 #, no-c-format
 msgid ""
 "Enter the ending time for the working hours here. The working hours will be "
 "marked with color by KOrganizer."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 266
-#: rc.cpp:696 rc.cpp:1283
+#. i18n: file korganizer.kcfg line 297
+#: rc.cpp:744 rc.cpp:1374
 #, no-c-format
 msgid "Exclude holidays"
 msgstr "假日除外"
 
-#. i18n: file korganizer.kcfg line 267
-#: rc.cpp:699 rc.cpp:1286
+#. i18n: file korganizer.kcfg line 298
+#: rc.cpp:747 rc.cpp:1377
 #, no-c-format
 msgid ""
 "Check this box to prevent KOrganizer from marking the working hours on "
 "holidays."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 272
-#: rc.cpp:702 rc.cpp:1289
+#. i18n: file korganizer.kcfg line 303
+#: rc.cpp:750 rc.cpp:1380
 #, no-c-format
-msgid "Month view uses category colors"
-msgstr "月视图使用类别颜色"
-
-#. i18n: file korganizer.kcfg line 273
-#: rc.cpp:705 rc.cpp:1292
-#, fuzzy, no-c-format
-msgid ""
-"Check this box to make the month view use the category colors of an item."
-msgstr "在 Marcus Bains 线上显示秒数"
-
-#. i18n: file korganizer.kcfg line 278
-#: rc.cpp:708 rc.cpp:1295
-#, fuzzy, no-c-format
-msgid "Month view uses resource colors"
-msgstr "月视图使用类别颜色"
+msgid "Colors used in month view"
+msgstr ""
 
-#. i18n: file korganizer.kcfg line 279
-#: rc.cpp:711 rc.cpp:1298
-#, fuzzy, no-c-format
-msgid ""
-"Check this box to make the month view use the resource colors of an item."
-msgstr "在 Marcus Bains 线上显示秒数"
+#. i18n: file korganizer.kcfg line 304
+#: rc.cpp:753 rc.cpp:1383
+#, no-c-format
+msgid "Choose the colors of the month view items."
+msgstr ""
 
-#. i18n: file korganizer.kcfg line 284
-#: rc.cpp:714 rc.cpp:1301
+#. i18n: file korganizer.kcfg line 323
+#: rc.cpp:768 rc.cpp:1398
 #, no-c-format
 msgid "Month view uses full window"
 msgstr "月视图使用整个窗口"
 
-#. i18n: file korganizer.kcfg line 285
-#: rc.cpp:717 rc.cpp:1304
+#. i18n: file korganizer.kcfg line 324
+#: rc.cpp:771 rc.cpp:1401
 #, no-c-format
 msgid ""
 "Check this box to use the full KOrganizer window when displaying the month "
@@ -3975,14 +5708,14 @@ msgid ""
 "resources list, will not be displayed."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 289
-#: rc.cpp:720 rc.cpp:1307
+#. i18n: file korganizer.kcfg line 328
+#: rc.cpp:774 rc.cpp:1404
 #, fuzzy, no-c-format
 msgid "To-do list view uses full window"
 msgstr "待办事宜视图使用整个窗口"
 
-#. i18n: file korganizer.kcfg line 290
-#: rc.cpp:723 rc.cpp:1310
+#. i18n: file korganizer.kcfg line 329
+#: rc.cpp:777 rc.cpp:1407
 #, no-c-format
 msgid ""
 "Check this box to use the full KOrganizer window when displaying the to-do list "
@@ -3991,28 +5724,28 @@ msgid ""
 "resources list, will not be displayed."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 295
-#: rc.cpp:726 rc.cpp:1313
+#. i18n: file korganizer.kcfg line 334
+#: rc.cpp:780 rc.cpp:1410
 #, fuzzy, no-c-format
 msgid "Record completed to-dos in journal entries"
 msgstr "在日记中记录已完成的待办事宜"
 
-#. i18n: file korganizer.kcfg line 296
-#: rc.cpp:729 rc.cpp:1316
+#. i18n: file korganizer.kcfg line 335
+#: rc.cpp:783 rc.cpp:1413
 #, no-c-format
 msgid ""
 "Check this box to record the completion of a to-do in a new entry of your "
 "journal automatically."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 305
-#: rc.cpp:732 rc.cpp:1319
+#. i18n: file korganizer.kcfg line 344
+#: rc.cpp:786 rc.cpp:1416
 #, no-c-format
 msgid "Next x days"
 msgstr "下几天"
 
-#. i18n: file korganizer.kcfg line 306
-#: rc.cpp:735 rc.cpp:1322
+#. i18n: file korganizer.kcfg line 345
+#: rc.cpp:789 rc.cpp:1419
 #, no-c-format
 msgid ""
 "Select on this spin box the number of &quot;x&quot; days to be displayed in the "
@@ -4020,14 +5753,14 @@ msgid ""
 "&quot;Next X Days&quot; menu item from the &quot;View&quot; menu."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 348
-#: rc.cpp:738 rc.cpp:1325
+#. i18n: file korganizer.kcfg line 387
+#: rc.cpp:792 rc.cpp:1422
 #, no-c-format
 msgid "Use Groupware communication"
 msgstr "使用群件通讯"
 
-#. i18n: file korganizer.kcfg line 349
-#: rc.cpp:741 rc.cpp:1328
+#. i18n: file korganizer.kcfg line 388
+#: rc.cpp:795 rc.cpp:1425
 #, no-c-format
 msgid ""
 "Check this box to enable automatic generation of mails when creating, updating "
@@ -4036,111 +5769,111 @@ msgid ""
 "a TDE Kolab client)."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 357
-#: rc.cpp:744 rc.cpp:1331
+#. i18n: file korganizer.kcfg line 396
+#: rc.cpp:798 rc.cpp:1428
 #, no-c-format
 msgid "Send Outlook-like pseudo counter proposals"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 365
-#: rc.cpp:747 rc.cpp:1334
+#. i18n: file korganizer.kcfg line 404
+#: rc.cpp:801 rc.cpp:1431
 #, no-c-format
 msgid "Holiday color"
 msgstr "假日颜色"
 
-#. i18n: file korganizer.kcfg line 366
-#: rc.cpp:750 rc.cpp:1337
+#. i18n: file korganizer.kcfg line 405
+#: rc.cpp:804 rc.cpp:1434
 #, no-c-format
 msgid ""
 "Select the holiday color here. The holiday color will be used for the holiday "
 "name in the month view and the holiday number in the date navigator."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 370
-#: rc.cpp:753 rc.cpp:1340
+#. i18n: file korganizer.kcfg line 409
+#: rc.cpp:807 rc.cpp:1437
 #, no-c-format
 msgid "Highlight color"
 msgstr "高亮颜色"
 
-#. i18n: file korganizer.kcfg line 371
-#: rc.cpp:756 rc.cpp:1343
+#. i18n: file korganizer.kcfg line 410
+#: rc.cpp:810 rc.cpp:1440
 #, no-c-format
 msgid ""
 "Select the highlight color here. The highlight color will be used for marking "
 "the currently selected area in your agenda and in the date navigator."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 375
-#: rc.cpp:759 rc.cpp:1346
+#. i18n: file korganizer.kcfg line 414
+#: rc.cpp:813 rc.cpp:1443
 #, no-c-format
 msgid "Agenda view background color"
 msgstr "议事日程视图背景色"
 
-#. i18n: file korganizer.kcfg line 376
-#: rc.cpp:762 rc.cpp:1349
+#. i18n: file korganizer.kcfg line 415
+#: rc.cpp:816 rc.cpp:1446
 #, no-c-format
 msgid "Select the agenda view background color here."
 msgstr "在此选择议事日程视图的背景色。"
 
-#. i18n: file korganizer.kcfg line 380
-#: rc.cpp:765 rc.cpp:1352
+#. i18n: file korganizer.kcfg line 419
+#: rc.cpp:819 rc.cpp:1449
 #, no-c-format
 msgid "Working hours color"
 msgstr "上班时间颜色"
 
-#. i18n: file korganizer.kcfg line 381
-#: rc.cpp:768 rc.cpp:1355
+#. i18n: file korganizer.kcfg line 420
+#: rc.cpp:822 rc.cpp:1452
 #, no-c-format
 msgid "Select the working hours color for the agenda view here."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 385
-#: rc.cpp:771 rc.cpp:1358
+#. i18n: file korganizer.kcfg line 424
+#: rc.cpp:825 rc.cpp:1455
 #, no-c-format
 msgid "To-do due today color"
 msgstr "今日到期的待办事宜颜色"
 
-#. i18n: file korganizer.kcfg line 386
-#: rc.cpp:774 rc.cpp:1361
+#. i18n: file korganizer.kcfg line 425
+#: rc.cpp:828 rc.cpp:1458
 #, no-c-format
 msgid "Select the to-do due today color here."
 msgstr "在此选择今日到期的待办事宜颜色。"
 
-#. i18n: file korganizer.kcfg line 390
-#: rc.cpp:777 rc.cpp:1364
+#. i18n: file korganizer.kcfg line 429
+#: rc.cpp:831 rc.cpp:1461
 #, no-c-format
 msgid "To-do overdue color"
 msgstr "过期的待办事宜颜色"
 
-#. i18n: file korganizer.kcfg line 391
-#: rc.cpp:780 rc.cpp:1367
+#. i18n: file korganizer.kcfg line 430
+#: rc.cpp:834 rc.cpp:1464
 #, no-c-format
 msgid "Select the to-do overdue color here."
 msgstr "在此选择过期的待办事宜颜色。"
 
-#. i18n: file korganizer.kcfg line 395
-#: rc.cpp:783 rc.cpp:1370
+#. i18n: file korganizer.kcfg line 434
+#: rc.cpp:837 rc.cpp:1467
 #, no-c-format
-msgid "Default event color"
-msgstr "默认事件颜色"
+msgid "\"No category\" color (for \"Only category\" drawing schemes)"
+msgstr ""
 
-#. i18n: file korganizer.kcfg line 396
-#: rc.cpp:786 rc.cpp:1373
+#. i18n: file korganizer.kcfg line 435
+#: rc.cpp:840 rc.cpp:1470
 #, no-c-format
 msgid ""
-"Select the default event color here. The default event color will be used for "
-"events categories in your agenda. Note that you can specify a separate color "
-"for each event category below."
+"Select a color to use for the \"no category\" or \"unset category\" situation, "
+"when an item does not belong to any category. This color is used when drawing "
+"items in the agenda or month views using the \"Only category\" scheme."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 414
-#: rc.cpp:789 rc.cpp:1376
+#. i18n: file korganizer.kcfg line 453
+#: rc.cpp:843 rc.cpp:1473
 #, no-c-format
 msgid "Time bar"
 msgstr "时间栏"
 
-#. i18n: file korganizer.kcfg line 415
-#: rc.cpp:792 rc.cpp:1379
+#. i18n: file korganizer.kcfg line 454
+#: rc.cpp:846 rc.cpp:1476
 #, no-c-format
 msgid ""
 "Press this button to configure the time bar font. The time bar is the widget "
@@ -4148,14 +5881,14 @@ msgid ""
 "Font&quot; dialog, allowing you to choose the hour font for the time bar."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 418
-#: rc.cpp:795 rc.cpp:1382
+#. i18n: file korganizer.kcfg line 457
+#: rc.cpp:849 rc.cpp:1479
 #, no-c-format
 msgid "Agenda view"
 msgstr "议事日程视图"
 
-#. i18n: file korganizer.kcfg line 419
-#: rc.cpp:798 rc.cpp:1385
+#. i18n: file korganizer.kcfg line 458
+#: rc.cpp:852 rc.cpp:1482
 #, no-c-format
 msgid ""
 "Press this button to configure the agenda view font. This button will open the "
@@ -4163,14 +5896,14 @@ msgid ""
 "in the agenda view."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 422
-#: rc.cpp:801 rc.cpp:1388
+#. i18n: file korganizer.kcfg line 461
+#: rc.cpp:855 rc.cpp:1485
 #, no-c-format
 msgid "Current-time line"
 msgstr "目前时间线"
 
-#. i18n: file korganizer.kcfg line 423
-#: rc.cpp:804 rc.cpp:1391
+#. i18n: file korganizer.kcfg line 462
+#: rc.cpp:858 rc.cpp:1488
 #, no-c-format
 msgid ""
 "Press this button to configure the current-time line font. This button will "
@@ -4178,14 +5911,14 @@ msgid ""
 "the current-time line in the agenda view."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 426
-#: rc.cpp:807 rc.cpp:1394
+#. i18n: file korganizer.kcfg line 465
+#: rc.cpp:861 rc.cpp:1491
 #, no-c-format
 msgid "Month view"
 msgstr "月视图"
 
-#. i18n: file korganizer.kcfg line 427
-#: rc.cpp:810 rc.cpp:1397
+#. i18n: file korganizer.kcfg line 466
+#: rc.cpp:864 rc.cpp:1494
 #, no-c-format
 msgid ""
 "Press this button to configure the month view font. This button will open the "
@@ -4193,56 +5926,56 @@ msgid ""
 "in the month view."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 445
-#: rc.cpp:813 rc.cpp:1400
+#. i18n: file korganizer.kcfg line 484
+#: rc.cpp:867 rc.cpp:1497
 #, no-c-format
 msgid "Free/Busy Publish URL"
 msgstr "忙/闲发布 URL"
 
-#. i18n: file korganizer.kcfg line 446
-#: rc.cpp:816 rc.cpp:1403
+#. i18n: file korganizer.kcfg line 485
+#: rc.cpp:870 rc.cpp:1500
 #, no-c-format
 msgid "URL for publishing free/busy information"
 msgstr "发布忙/闲信息的 URL"
 
-#. i18n: file korganizer.kcfg line 449
-#: rc.cpp:819 rc.cpp:1406
+#. i18n: file korganizer.kcfg line 488
+#: rc.cpp:873 rc.cpp:1503
 #, no-c-format
 msgid "Free/Busy Publish Username"
 msgstr "忙/闲发布用户名"
 
-#. i18n: file korganizer.kcfg line 450
-#: rc.cpp:822 rc.cpp:1409
+#. i18n: file korganizer.kcfg line 489
+#: rc.cpp:876 rc.cpp:1506
 #, no-c-format
 msgid "Username for publishing free/busy information"
 msgstr "发布忙/闲信息的用户名"
 
-#. i18n: file korganizer.kcfg line 453
-#: rc.cpp:825 rc.cpp:1412
+#. i18n: file korganizer.kcfg line 492
+#: rc.cpp:879 rc.cpp:1509
 #, no-c-format
 msgid "Free/Busy Publish Password"
 msgstr "忙/闲发布密码"
 
-#. i18n: file korganizer.kcfg line 454
-#: rc.cpp:828 rc.cpp:1415
+#. i18n: file korganizer.kcfg line 493
+#: rc.cpp:882 rc.cpp:1512
 #, no-c-format
 msgid "Password for publishing free/busy information"
 msgstr "发布忙/闲信息的密码"
 
-#. i18n: file korganizer.kcfg line 461
-#: rc.cpp:831 rc.cpp:1418
+#. i18n: file korganizer.kcfg line 500
+#: rc.cpp:885 rc.cpp:1515
 #, no-c-format
 msgid "Enable Automatic Free/Busy Retrieval"
 msgstr "允许自动获取忙/闲"
 
-#. i18n: file korganizer.kcfg line 466
-#: rc.cpp:834 rc.cpp:1421
+#. i18n: file korganizer.kcfg line 505
+#: rc.cpp:888 rc.cpp:1518
 #, no-c-format
 msgid "Check whether hostname and retrieval email address match"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 467
-#: rc.cpp:837 rc.cpp:1424
+#. i18n: file korganizer.kcfg line 506
+#: rc.cpp:891 rc.cpp:1521
 #, no-c-format
 msgid ""
 "With this setting you can configure whether the domain part of the free/busy "
@@ -4251,14 +5984,14 @@ msgid ""
 "joe@mydomain.com on the server www.yourdomain.com won't work."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 472
-#: rc.cpp:840 rc.cpp:1427
+#. i18n: file korganizer.kcfg line 511
+#: rc.cpp:894 rc.cpp:1524
 #, no-c-format
 msgid "Use full email address for retrieval"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 473
-#: rc.cpp:843 rc.cpp:1430
+#. i18n: file korganizer.kcfg line 512
+#: rc.cpp:897 rc.cpp:1527
 #, no-c-format
 msgid ""
 "With this setting, you can change the filename that will be fetched from the "
@@ -4267,352 +6000,370 @@ msgid ""
 "user.ifb, for example nn.ifb."
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 478
-#: rc.cpp:846 rc.cpp:1433
+#. i18n: file korganizer.kcfg line 517
+#: rc.cpp:900 rc.cpp:1530
 #, no-c-format
 msgid "Free/Busy Retrieval URL"
 msgstr "获取忙/闲的 URL"
 
-#. i18n: file korganizer.kcfg line 481
-#: rc.cpp:849 rc.cpp:1436
+#. i18n: file korganizer.kcfg line 520
+#: rc.cpp:903 rc.cpp:1533
 #, no-c-format
 msgid "Free/Busy Retrieval Username"
 msgstr "忙/闲获取用户名"
 
-#. i18n: file korganizer.kcfg line 484
-#: rc.cpp:852 rc.cpp:1439
+#. i18n: file korganizer.kcfg line 523
+#: rc.cpp:906 rc.cpp:1536
 #, no-c-format
 msgid "Free/Busy Retrieval Password"
 msgstr "忙/闲获取密码"
 
-#. i18n: file korganizer.kcfg line 485
-#: rc.cpp:855 rc.cpp:1442
+#. i18n: file korganizer.kcfg line 524
+#: rc.cpp:909 rc.cpp:1539
 #, no-c-format
 msgid "Password for retrieving free/busy information"
 msgstr "获取忙/闲信息的密码"
 
-#. i18n: file korganizer.kcfg line 495
-#: rc.cpp:858 rc.cpp:1445
+#. i18n: file korganizer.kcfg line 534
+#: rc.cpp:912 rc.cpp:1542
 #, fuzzy, no-c-format
 msgid "Default email attachment method"
 msgstr "默认约会时间"
 
-#. i18n: file korganizer.kcfg line 496
-#: rc.cpp:861 rc.cpp:1448
+#. i18n: file korganizer.kcfg line 535
+#: rc.cpp:915 rc.cpp:1545
 #, no-c-format
 msgid "The default way of attaching dropped emails to an event"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 499
-#: rc.cpp:864 rc.cpp:882 rc.cpp:1451 rc.cpp:1469
+#. i18n: file korganizer.kcfg line 538
+#: rc.cpp:918 rc.cpp:936 rc.cpp:1548 rc.cpp:1566
 #, no-c-format
 msgid "Always ask"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 502
-#: rc.cpp:867 rc.cpp:885 rc.cpp:1454 rc.cpp:1472
+#. i18n: file korganizer.kcfg line 541
+#: rc.cpp:921 rc.cpp:939 rc.cpp:1551 rc.cpp:1569
 #, no-c-format
 msgid "Only attach link to message"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 505
-#: rc.cpp:870 rc.cpp:888 rc.cpp:1457 rc.cpp:1475
+#. i18n: file korganizer.kcfg line 544
+#: rc.cpp:924 rc.cpp:942 rc.cpp:1554 rc.cpp:1572
 #, no-c-format
 msgid "Attach complete message"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 508
-#: rc.cpp:873 rc.cpp:1460
+#. i18n: file korganizer.kcfg line 547
+#: rc.cpp:927 rc.cpp:1557
 #, no-c-format
 msgid "Attach message without attachments"
 msgstr ""
 
-#. i18n: file korganizer.kcfg line 514
-#: rc.cpp:876 rc.cpp:1463
+#. i18n: file korganizer.kcfg line 553
+#: rc.cpp:930 rc.cpp:1560
 #, fuzzy, no-c-format
 msgid "Default todo attachment method"
 msgstr "默认约会时间"
 
-#. i18n: file korganizer.kcfg line 515
-#: rc.cpp:879 rc.cpp:1466
+#. i18n: file korganizer.kcfg line 554
+#: rc.cpp:933 rc.cpp:1563
 #, no-c-format
 msgid "The default way of attaching dropped emails to a task"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 32
-#: rc.cpp:1589 rc.cpp:1802 rc.cpp:1835
-#, no-c-format
-msgid "Include to-&dos that are due on the printed day(s)"
-msgstr "包含印出各日内到期的待办事宜(&D)"
-
-#. i18n: file ./printing/calprintdayconfig_base.ui line 35
-#: rc.cpp:1592
+#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 18
+#: rc.cpp:945
 #, no-c-format
-msgid ""
-"You should check this option if you want to print to-dos which are due on one "
-"of the dates which are in the supplied date range."
+msgid "CalPrintJournal_Base"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 43
-#: rc.cpp:1595 rc.cpp:1736 rc.cpp:1808 rc.cpp:1988 rc.cpp:2045 rc.cpp:2063
+#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 32
+#: rc.cpp:948 rc.cpp:966 rc.cpp:978 rc.cpp:1665 rc.cpp:1737 rc.cpp:1794
 #, no-c-format
 msgid "Date && Time Range"
 msgstr "日期和时间范围"
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 88
-#: rc.cpp:1598 rc.cpp:1664 rc.cpp:1739 rc.cpp:1991 rc.cpp:2054 rc.cpp:2066
+#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 46
+#: rc.cpp:951
+#, no-c-format
+msgid "&All journal entries"
+msgstr "全部日记项(&A)"
+
+#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 60
+#: rc.cpp:954
+#, no-c-format
+msgid "Date &range:"
+msgstr "日期范围(&R)："
+
+#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 96
+#: rc.cpp:957 rc.cpp:969 rc.cpp:981 rc.cpp:1593 rc.cpp:1668 rc.cpp:1797
 #, no-c-format
 msgid "&Start date:"
 msgstr "起始日期(&S)："
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 94
-#: rc.cpp:1601 rc.cpp:1619 rc.cpp:1667
+#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 115
+#: rc.cpp:960 rc.cpp:972 rc.cpp:984 rc.cpp:1599 rc.cpp:1698 rc.cpp:1833
 #, no-c-format
-msgid ""
-"If you want to print more days at once, you can define a range of dates with "
-"this option and the <i>End date</i> option. This option is used to define the "
-"start date."
-msgstr ""
+msgid "&End date:"
+msgstr "结束日期(&E)："
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 102
-#: rc.cpp:1604 rc.cpp:1748
+#. i18n: file ./plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui line 18
+#: rc.cpp:963
 #, no-c-format
-msgid "End ti&me:"
-msgstr "结束时间(&M)："
+msgid "CalPrintWhatsNext_Base"
+msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 108
-#: rc.cpp:1607
+#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 18
+#: rc.cpp:975
 #, no-c-format
-msgid ""
-"It is possible to print only those events which are inside a given timerange. "
-"With this time selection box you can define the end of this time range. The "
-"start time should be defined with the <i>Start time</i> "
-"option. Note you can automatically modify these settings if you check <i>"
-"Extend time range to include all events</i>."
+msgid "CalPrintList_Base"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 126
-#: rc.cpp:1610
+#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 130
+#: rc.cpp:987
 #, no-c-format
-msgid ""
-"It's possible to print only those events which are inside a given timerange. "
-"With this time selection box you can define the end of this time range. The "
-"start time should be defined with the <i>Start time</i> "
-"option. Note you can automatically modify these settings if you check <i>"
-"Extend time range to include all events</i>."
+msgid "Print Incidences of Type"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 134
-#: rc.cpp:1613
+#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 149
+#: rc.cpp:993
 #, no-c-format
-msgid "E&xtend time range to include all events"
-msgstr "将时间范围延长到包含全部事件(&X)"
+msgid "&To-dos"
+msgstr "待办(&T)"
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 137
-#: rc.cpp:1616
+#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 157
+#: rc.cpp:996
 #, no-c-format
-msgid ""
-"Check this option to automatically determine the required time range, so all "
-"events will be shown."
-msgstr ""
+msgid "&Journals"
+msgstr "日记(&J)"
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 166
-#: rc.cpp:1622
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 18
+#: rc.cpp:999
 #, no-c-format
-msgid ""
-"It's possible to print only those events which are inside a given timerange. "
-"With this time selection box you can define the start of this time range. The "
-"end time should be defined with the <i>End time</i> option. Note you can "
-"automatically modify these settings if you check <i>"
-"Extend time range to include all events</i>."
+msgid "CalPrintYear_Base"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 174
-#: rc.cpp:1625 rc.cpp:1757
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 32
+#: rc.cpp:1002
 #, no-c-format
-msgid "Start &time:"
-msgstr "起始时间(&T)："
+msgid "Yearly print options"
+msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 180
-#: rc.cpp:1628
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 46
+#: rc.cpp:1005
+#, fuzzy, no-c-format
+msgid "Print &Year:"
+msgstr "打印整周(&W)"
+
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 57
+#: rc.cpp:1008
 #, no-c-format
-msgid ""
-"It is possible to print only those events which are inside a given timerange. "
-"With this time selection box you can define the start of this time range. The "
-"end time should be defined with the <i>End time</i> option. Note you can "
-"automatically modify these settings if you check <i>"
-"Extend time range to include all events</i>."
+msgid "Number of &pages:"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 191
-#: rc.cpp:1631 rc.cpp:1637 rc.cpp:1673
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 123
+#: rc.cpp:1011
+#, fuzzy, no-c-format
+msgid "Display Options"
+msgstr "显示提醒(&D)"
+
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 134
+#: rc.cpp:1014
 #, no-c-format
-msgid ""
-"If you want to print more days at once, you can define a range of dates with "
-"this option and the <i>Start date</i> option. This option is used to define the "
-"end date."
+msgid "Show sub-day events as:"
 msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 199
-#: rc.cpp:1634 rc.cpp:1670 rc.cpp:1769 rc.cpp:1994 rc.cpp:2057 rc.cpp:2069
-#, no-c-format
-msgid "&End date:"
-msgstr "结束日期(&E)："
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 142
+#: rc.cpp:1017
+#, fuzzy, no-c-format
+msgid "Show holidays as:"
+msgstr "显示时间为(&H)："
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 215
-#: rc.cpp:1640 rc.cpp:1727 rc.cpp:1775
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 148
+#: rc.cpp:1020 rc.cpp:1026
 #, no-c-format
-msgid "&Use colors"
-msgstr "使用颜色(&U)"
+msgid "Text"
+msgstr ""
 
-#. i18n: file ./printing/calprintdayconfig_base.ui line 218
-#: rc.cpp:1643 rc.cpp:1730
+#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 153
+#: rc.cpp:1023 rc.cpp:1029
+#, fuzzy, no-c-format
+msgid "Time Boxes"
+msgstr "时区："
+
+#. i18n: file ./plugins/exchange/exchangeui.rc line 5
+#: rc.cpp:1032
 #, no-c-format
-msgid ""
-"If you want to use colors to distinguish certain categories on the print, check "
-"this option."
-msgstr ""
+msgid "Exchange"
+msgstr "Exchange"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 29
-#: rc.cpp:1646
+#: rc.cpp:1575
 #, no-c-format
 msgid "&Title:"
 msgstr "标题(&T)："
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 40
-#: rc.cpp:1649
+#: rc.cpp:1578
 #, no-c-format
 msgid "To-do List"
 msgstr "待办事宜列表"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 48
-#: rc.cpp:1652
+#: rc.cpp:1581
 #, no-c-format
 msgid "To-dos to Print"
 msgstr "要打印的待办"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 59
-#: rc.cpp:1655
+#: rc.cpp:1584
 #, no-c-format
 msgid "Print &all to-dos"
 msgstr "打印全部待办项目(&A)"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 73
-#: rc.cpp:1658
+#: rc.cpp:1587
 #, no-c-format
 msgid "Print &unfinished to-dos only"
 msgstr "只打印未完成的项目(&U)"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 84
-#: rc.cpp:1661
+#: rc.cpp:1590
 #, no-c-format
 msgid "Print only to-dos due in the &range:"
 msgstr "只打印以下范围内到期的项目(&R)："
 
+#. i18n: file ./printing/calprinttodoconfig_base.ui line 145
+#: rc.cpp:1596 rc.cpp:1800 rc.cpp:1818
+#, no-c-format
+msgid ""
+"If you want to print more days at once, you can define a range of dates with "
+"this option and the <i>End date</i> option. This option is used to define the "
+"start date."
+msgstr ""
+
+#. i18n: file ./printing/calprinttodoconfig_base.ui line 181
+#: rc.cpp:1602 rc.cpp:1830 rc.cpp:1836
+#, no-c-format
+msgid ""
+"If you want to print more days at once, you can define a range of dates with "
+"this option and the <i>Start date</i> option. This option is used to define the "
+"end date."
+msgstr ""
+
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 210
-#: rc.cpp:1676 rc.cpp:1712
+#: rc.cpp:1605 rc.cpp:1641
 #, no-c-format
 msgid "Include Information"
 msgstr "包含信息"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 224
-#: rc.cpp:1679
+#: rc.cpp:1608
 #, no-c-format
 msgid "&Priority"
 msgstr "优先级(&P)"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 235
-#: rc.cpp:1682
+#: rc.cpp:1611
 #, no-c-format
 msgid "&Description"
 msgstr "描述(&D)"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 246
-#: rc.cpp:1685
+#: rc.cpp:1614
 #, no-c-format
 msgid "Due date"
 msgstr "到期日期"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 260
-#: rc.cpp:1688
+#: rc.cpp:1617
 #, no-c-format
 msgid "Per&centage completed"
 msgstr "完成百分比(&C)"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 290
-#: rc.cpp:1691
+#: rc.cpp:1620
 #, no-c-format
 msgid "Sorting Options"
 msgstr "排序选项"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 304
-#: rc.cpp:1694
+#: rc.cpp:1623
 #, no-c-format
 msgid "Sort field:"
 msgstr "排序字段："
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 323
-#: rc.cpp:1697
+#: rc.cpp:1626
 #, no-c-format
 msgid "Sort direction:"
 msgstr "排序方向："
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 375
-#: rc.cpp:1700
+#: rc.cpp:1629
 #, no-c-format
 msgid "Other Options"
 msgstr "其它选项"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 386
-#: rc.cpp:1703
+#: rc.cpp:1632
 #, no-c-format
 msgid "Co&nnect sub-to-dos with its parent"
 msgstr "将子待办事宜连接到父事宜(&N)"
 
 #. i18n: file ./printing/calprinttodoconfig_base.ui line 397
-#: rc.cpp:1706
+#: rc.cpp:1635
 #, no-c-format
 msgid "Strike &out completed to-do summaries"
 msgstr "将已完成的待办事宜概要加删除线(&O)"
 
 #. i18n: file ./printing/calprintincidenceconfig_base.ui line 18
-#: rc.cpp:1709
+#: rc.cpp:1638
 #, no-c-format
 msgid "CalPrintIncidence_Base"
 msgstr ""
 
 #. i18n: file ./printing/calprintincidenceconfig_base.ui line 43
-#: rc.cpp:1715
+#: rc.cpp:1644
 #, no-c-format
 msgid "Detai&ls (visiblility, secrecy, etc.)"
 msgstr ""
 
 #. i18n: file ./printing/calprintincidenceconfig_base.ui line 51
-#: rc.cpp:1718
+#: rc.cpp:1647
 #, no-c-format
 msgid "&Notes, Subitems"
 msgstr ""
 
-#. i18n: file ./printing/calprintincidenceconfig_base.ui line 59
-#: koeventeditor.cpp:197 rc.cpp:1721
-#, fuzzy, no-c-format
-msgid "&Attendees"
-msgstr "出席者(&N)"
-
 #. i18n: file ./printing/calprintincidenceconfig_base.ui line 67
-#: rc.cpp:1724
+#: rc.cpp:1653
 #, no-c-format
 msgid "Attach&ments"
 msgstr "附件(&M)"
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 18
-#: rc.cpp:1733
+#. i18n: file ./printing/calprintincidenceconfig_base.ui line 77
+#: rc.cpp:1656 rc.cpp:1704 rc.cpp:1839
+#, no-c-format
+msgid "&Use colors"
+msgstr "使用颜色(&U)"
+
+#. i18n: file ./printing/calprintincidenceconfig_base.ui line 80
+#: rc.cpp:1659 rc.cpp:1842
+#, no-c-format
+msgid ""
+"If you want to use colors to distinguish certain categories on the print, check "
+"this option."
+msgstr ""
+
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 18
+#: rc.cpp:1662
 #, no-c-format
 msgid "CalPrintWeek_Base"
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 83
-#: rc.cpp:1742 rc.cpp:1745
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 83
+#: rc.cpp:1671 rc.cpp:1674
 #, no-c-format
 msgid ""
 "Here you can choose which events should be printed based on their date. This "
@@ -4620,20 +6371,32 @@ msgid ""
 "End date</i> to enter the end date of the daterange."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 108
-#: rc.cpp:1751 rc.cpp:1754
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 102
+#: rc.cpp:1677 rc.cpp:1803
+#, no-c-format
+msgid "End ti&me:"
+msgstr "结束时间(&M)："
+
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 108
+#: rc.cpp:1680 rc.cpp:1683
 #, no-c-format
 msgid "All events which start later than the given time will not be printed."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 157
-#: rc.cpp:1760 rc.cpp:1763
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 151
+#: rc.cpp:1686 rc.cpp:1824
+#, no-c-format
+msgid "Start &time:"
+msgstr "起始时间(&T)："
+
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 157
+#: rc.cpp:1689 rc.cpp:1692
 #, no-c-format
 msgid "All events which start earlier than the given time will not be printed."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 186
-#: rc.cpp:1766 rc.cpp:1772
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 186
+#: rc.cpp:1695 rc.cpp:1701
 #, no-c-format
 msgid ""
 "Here you can choose which events should be printed based on their date. This "
@@ -4641,41 +6404,41 @@ msgid ""
 "Start date</i> to enter the start date of the daterange."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 213
-#: rc.cpp:1778
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 213
+#: rc.cpp:1707
 #, no-c-format
 msgid ""
 "The timetable view supports colors. If you want to make use of colors you "
 "should check this option. The category colors will be used."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 221
-#: rc.cpp:1781
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 221
+#: rc.cpp:1710
 #, no-c-format
 msgid "Print Layout"
 msgstr "打印布局"
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 232
-#: rc.cpp:1784
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 232
+#: rc.cpp:1713
 #, no-c-format
 msgid "Print as &Filofax page"
 msgstr "打印为 &Filofax 页"
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 238
-#: rc.cpp:1787
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 238
+#: rc.cpp:1716
 #, no-c-format
 msgid ""
 "The Filofax view prints one week per page, so all days have a large surface."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 246
-#: rc.cpp:1790
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 246
+#: rc.cpp:1719
 #, no-c-format
 msgid "Print as &timetable view"
 msgstr "打印为时间表视图(&T)"
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 249
-#: rc.cpp:1793
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 249
+#: rc.cpp:1722
 #, no-c-format
 msgid ""
 "This view is similar to the weekview in KOrganizer. The week is printed in "
@@ -4683,14 +6446,14 @@ msgid ""
 "<i>Use Colors</i>."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 257
-#: rc.cpp:1796
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 257
+#: rc.cpp:1725
 #, no-c-format
 msgid "Print as split week view"
 msgstr "打印为拆分周视图"
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 260
-#: rc.cpp:1799
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 260
+#: rc.cpp:1728
 #, no-c-format
 msgid ""
 "This view is similar to the week view in KOrganizer. The only difference with "
@@ -4698,8 +6461,14 @@ msgid ""
 "split week view in portrait."
 msgstr ""
 
-#. i18n: file ./printing/calprintweekconfig_base.ui line 276
-#: rc.cpp:1805 rc.cpp:1838
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 273
+#: rc.cpp:1731 rc.cpp:1764 rc.cpp:1788
+#, no-c-format
+msgid "Include to-&dos that are due on the printed day(s)"
+msgstr "包含印出各日内到期的待办事宜(&D)"
+
+#. i18n: file ./printing/calprintweetdeconfig_base.ui line 276
+#: rc.cpp:1734 rc.cpp:1767
 #, fuzzy, no-c-format
 msgid ""
 "Check this option if you want to have to-dos on the print, placed by their due "
@@ -4707,13 +6476,13 @@ msgid ""
 msgstr "在 Marcus Bains 线上显示秒数"
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 57
-#: rc.cpp:1811
+#: rc.cpp:1740
 #, no-c-format
 msgid "&Start month:"
 msgstr "起始月(&S)："
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 63
-#: rc.cpp:1814
+#: rc.cpp:1743
 #, no-c-format
 msgid ""
 "When you want to print more months at once, you can define a month range. This "
@@ -4722,7 +6491,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 71
-#: rc.cpp:1817 rc.cpp:1820
+#: rc.cpp:1746 rc.cpp:1749
 #, no-c-format
 msgid ""
 "When you want to print more months at once, you can define a month range. This "
@@ -4731,13 +6500,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 93
-#: rc.cpp:1823
+#: rc.cpp:1752
 #, no-c-format
 msgid "&End month:"
 msgstr "结束月(&E)："
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 99
-#: rc.cpp:1826 rc.cpp:1829 rc.cpp:1832
+#: rc.cpp:1755 rc.cpp:1758 rc.cpp:1761
 #, no-c-format
 msgid ""
 "When you want to print more months at once, you can define a month range. This "
@@ -4746,25 +6515,25 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 162
-#: rc.cpp:1841
+#: rc.cpp:1770
 #, no-c-format
 msgid "Print week &numbers"
 msgstr "打印周序号(&N)"
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 165
-#: rc.cpp:1844
+#: rc.cpp:1773
 #, no-c-format
 msgid "Enable this to print week numbers at the left of each row."
 msgstr ""
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 173
-#: rc.cpp:1847
+#: rc.cpp:1776
 #, no-c-format
 msgid "Print daily re&curring to-dos and events"
 msgstr "打印每日重复出现的事件和待办(&C)"
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 176
-#: rc.cpp:1850
+#: rc.cpp:1779
 #, no-c-format
 msgid ""
 "With this option it is possible to leave out the daily recurring to-dos and "
@@ -4773,1156 +6542,568 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 184
-#: rc.cpp:1853
+#: rc.cpp:1782
 #, no-c-format
 msgid "Print weekl&y recurring to-dos and events"
 msgstr "打印每周重复出现的事件和待办(&Y)"
 
 #. i18n: file ./printing/calprintmonthconfig_base.ui line 187
-#: rc.cpp:1856
+#: rc.cpp:1785
 #, no-c-format
 msgid ""
 "Similar to \"Print daily recurring to-dos and events\". Weekly to-dos and "
 "events will be omitted when making a print of the selected month."
 msgstr ""
 
-#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 18
-#: rc.cpp:1985
+#. i18n: file ./printing/calprintdayconfig_base.ui line 35
+#: rc.cpp:1791
 #, no-c-format
-msgid "CalPrintList_Base"
+msgid ""
+"You should check this option if you want to print to-dos which are due on one "
+"of the dates which are in the supplied date range."
 msgstr ""
 
-#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 130
-#: rc.cpp:1997
+#. i18n: file ./printing/calprintdayconfig_base.ui line 108
+#: rc.cpp:1806
 #, no-c-format
-msgid "Print Incidences of Type"
+msgid ""
+"It is possible to print only those events which are inside a given timerange. "
+"With this time selection box you can define the end of this time range. The "
+"start time should be defined with the <i>Start time</i> "
+"option. Note you can automatically modify these settings if you check <i>"
+"Extend time range to include all events</i>."
 msgstr ""
 
-#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 141
-#: archivedialog.cpp:136 rc.cpp:2000 searchdialog.cpp:72
-#, no-c-format
-msgid "&Events"
-msgstr "事件(&E)"
-
-#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 149
-#: archivedialog.cpp:137 rc.cpp:2003
-#, no-c-format
-msgid "&To-dos"
-msgstr "待办(&T)"
-
-#. i18n: file ./plugins/printing/list/calprintlistconfig_base.ui line 157
-#: rc.cpp:2006
-#, no-c-format
-msgid "&Journals"
-msgstr "日记(&J)"
-
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 18
-#: rc.cpp:2009
+#. i18n: file ./printing/calprintdayconfig_base.ui line 126
+#: rc.cpp:1809
 #, no-c-format
-msgid "CalPrintYear_Base"
+msgid ""
+"It's possible to print only those events which are inside a given timerange. "
+"With this time selection box you can define the end of this time range. The "
+"start time should be defined with the <i>Start time</i> "
+"option. Note you can automatically modify these settings if you check <i>"
+"Extend time range to include all events</i>."
 msgstr ""
 
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 32
-#: rc.cpp:2012
+#. i18n: file ./printing/calprintdayconfig_base.ui line 134
+#: rc.cpp:1812
 #, no-c-format
-msgid "Yearly print options"
-msgstr ""
-
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 46
-#: rc.cpp:2015
-#, fuzzy, no-c-format
-msgid "Print &Year:"
-msgstr "打印整周(&W)"
+msgid "E&xtend time range to include all events"
+msgstr "将时间范围延长到包含全部事件(&X)"
 
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 57
-#: rc.cpp:2018
+#. i18n: file ./printing/calprintdayconfig_base.ui line 137
+#: rc.cpp:1815
 #, no-c-format
-msgid "Number of &pages:"
+msgid ""
+"Check this option to automatically determine the required time range, so all "
+"events will be shown."
 msgstr ""
 
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 123
-#: rc.cpp:2021
-#, fuzzy, no-c-format
-msgid "Display Options"
-msgstr "显示提醒(&D)"
-
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 134
-#: rc.cpp:2024
+#. i18n: file ./printing/calprintdayconfig_base.ui line 166
+#: rc.cpp:1821
 #, no-c-format
-msgid "Show sub-day events as:"
+msgid ""
+"It's possible to print only those events which are inside a given timerange. "
+"With this time selection box you can define the start of this time range. The "
+"end time should be defined with the <i>End time</i> option. Note you can "
+"automatically modify these settings if you check <i>"
+"Extend time range to include all events</i>."
 msgstr ""
 
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 142
-#: rc.cpp:2027
-#, fuzzy, no-c-format
-msgid "Show holidays as:"
-msgstr "显示时间为(&H)："
-
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 148
-#: rc.cpp:2030 rc.cpp:2036
+#. i18n: file ./printing/calprintdayconfig_base.ui line 180
+#: rc.cpp:1827
 #, no-c-format
-msgid "Text"
+msgid ""
+"It is possible to print only those events which are inside a given timerange. "
+"With this time selection box you can define the start of this time range. The "
+"end time should be defined with the <i>End time</i> option. Note you can "
+"automatically modify these settings if you check <i>"
+"Extend time range to include all events</i>."
 msgstr ""
 
-#. i18n: file ./plugins/printing/year/calprintyearconfig_base.ui line 153
-#: rc.cpp:2033 rc.cpp:2039
-#, fuzzy, no-c-format
-msgid "Time Boxes"
-msgstr "时区："
-
-#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 18
-#: rc.cpp:2042
-#, no-c-format
-msgid "CalPrintJournal_Base"
+#: koeditorgeneral.cpp:107
+msgid "Sets the Title of this event or to-do."
 msgstr ""
 
-#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 46
-#: rc.cpp:2048
-#, no-c-format
-msgid "&All journal entries"
-msgstr "全部日记项(&A)"
-
-#. i18n: file ./plugins/printing/journal/calprintjournalconfig_base.ui line 60
-#: rc.cpp:2051
-#, no-c-format
-msgid "Date &range:"
-msgstr "日期范围(&R)："
-
-#. i18n: file ./plugins/printing/whatsnext/calprintwhatsnextconfig_base.ui line 18
-#: rc.cpp:2060
-#, no-c-format
-msgid "CalPrintWhatsNext_Base"
+#: koeditorgeneral.cpp:126
+msgid "Sets where the event or to-do will take place."
 msgstr ""
 
-#. i18n: file ./plugins/exchange/exchangeui.rc line 5
-#: rc.cpp:2072
-#, no-c-format
-msgid "Exchange"
-msgstr "Exchange"
-
-#: konewstuff.cpp:48
-msgid "Could not load calendar."
-msgstr "无法载入日历。"
+#: koeditorgeneral.cpp:127
+msgid "&Location:"
+msgstr "位置(&L)："
 
-#: konewstuff.cpp:63
-msgid "The downloaded events will be merged into your current calendar."
-msgstr "已下载的事件会合并到您当前的日历。"
+#: koeditorgeneral.cpp:143
+msgid ""
+"Allows you to select the categories that this event or to-do belongs to."
+msgstr ""
 
-#: koeditorattachments.cpp:107
-msgid "[Binary data]"
-msgstr "[二进制数据]"
+#: koeditorgeneral.cpp:144
+#, fuzzy
+msgid "Categories:"
+msgstr "类别"
 
-#: koeditorattachments.cpp:194 printing/calprintdefaultplugins.cpp:417
+#: koeditorgeneral.cpp:153
 #, fuzzy
-msgid "Attachments:"
-msgstr "附件(&M)"
+msgid "Select..."
+msgstr "选择收信人..."
 
-#: koeditorattachments.cpp:199
-msgid ""
-"Displays a list of current items (files, mail, etc.) that have been associated "
-"with this event or to-do. "
-msgstr ""
+#: koeditorgeneral.cpp:163
+msgid "Acc&ess:"
+msgstr "访问(&E)："
 
-#: koeditorattachments.cpp:225
-msgid "&Attach File..."
+#: koeditorgeneral.cpp:164
+msgid ""
+"Sets whether the access to this event or to-do is restricted. Please note that "
+"KOrganizer currently does not use this setting, so the implementation of the "
+"restrictions will depend on the groupware server. This means that events or "
+"to-dos marked as private or confidential may be visible to others."
 msgstr ""
 
-#: koeditorattachments.cpp:226
+#: koeditorgeneral.cpp:185
 msgid ""
-"Shows a dialog used to select an attachment to add to this event or to-do as "
-"link as inline data."
+"Sets the description for this event or to-do. This will be displayed in a "
+"reminder if one is set, as well as in a tooltip when you hover over the event."
 msgstr ""
 
-#: koeditorattachments.cpp:229
-msgid "Attach &Link..."
+#: koeditorgeneral.cpp:202
+msgid "Enable reminders for this event or to-do."
 msgstr ""
 
-#: koeditorattachments.cpp:230
-msgid ""
-"Shows a dialog used to select an attachment to add to this event or to-do as "
-"link."
-msgstr ""
+#: koeditorgeneral.cpp:203
+#, fuzzy
+msgid "Enable reminders"
+msgstr "提醒"
 
-#: koeditorattachments.cpp:243
+#: koeditorgeneral.cpp:209
 msgid ""
-"Removes the attachment selected in the list above from this event or to-do."
-msgstr ""
-
-#: koeditorattachments.cpp:272
-msgid "Do you want to link to the attachments, or include them in the event?"
+"Push this button to create an advanced set of reminders for this event or "
+"to-do."
 msgstr ""
 
-#: koeditorattachments.cpp:273
-msgid "Attach as link?"
-msgstr ""
+#: koeditorgeneral.cpp:211
+#, fuzzy
+msgid "Set an advanced reminder"
+msgstr "配置了 1 个提前提醒"
 
-#: koeditorattachments.cpp:273
-msgid "As Link"
+#: koeditorgeneral.cpp:220
+msgid ""
+"Set the time before the event starts when the reminder will be triggered."
 msgstr ""
 
-#: koeditorattachments.cpp:273
-msgid "As File"
+#: koeditorgeneral.cpp:221
+msgid "Set the start time trigger offset"
 msgstr ""
 
-#: koeditorattachments.cpp:315 koeditorattachments.cpp:340
+#: koeditorgeneral.cpp:223
 msgid ""
-"URL (e.g. a web page) or file to be attached (only the link will be attached, "
-"not the file itself):"
+"Set the time before the to-do is due when the reminder will be triggered."
 msgstr ""
 
-#: koeditorattachments.cpp:317 koeditorattachments.cpp:325
-#: koeditorattachments.cpp:348
-msgid "Add Attachment"
-msgstr "编辑附件"
-
-#: koeditorattachments.cpp:342
-msgid "Edit Attachment"
-msgstr "编辑附件"
-
-#: koeditorattachments.cpp:348
-msgid "File to be attached:"
+#: koeditorgeneral.cpp:224
+msgid "Set the due time trigger offset"
 msgstr ""
 
-#: koeditorattachments.cpp:378
+#: koeditorgeneral.cpp:242 koeditorgeneral.cpp:447
 #, fuzzy
-msgid "The selected items will be permanently deleted."
-msgstr "该项目将被永久地删除。"
-
-#: searchdialog.cpp:49
-msgid "Find Events"
-msgstr "查找事件"
-
-#: searchdialog.cpp:50
-msgid "&Find"
-msgstr "查找(&F)"
-
-#: searchdialog.cpp:62
-msgid "&Search for:"
-msgstr "搜索(&S)："
-
-#: searchdialog.cpp:70
-msgid "Search For"
-msgstr "搜索"
-
-#: searchdialog.cpp:73
-msgid "To-&dos"
-msgstr "待办(&D)"
-
-#: searchdialog.cpp:74
-msgid "&Journal entries"
-msgstr "日记项(&J)"
-
-#: exportwebdialog.cpp:142 searchdialog.cpp:79
-msgid "Date Range"
-msgstr "日期范围"
-
-#: searchdialog.cpp:87
-msgid "Fr&om:"
-msgstr "来自(&O)："
-
-#: searchdialog.cpp:91
-msgid "&To:"
-msgstr "至(&T)："
-
-#: searchdialog.cpp:95
-msgid "E&vents have to be completely included"
-msgstr "事件必须被完全包含(&V)"
-
-#: searchdialog.cpp:98
-msgid "Include to-dos &without due date"
-msgstr "包含无到期时间的待办事宜(&W)"
-
-#: searchdialog.cpp:102
-msgid "Search In"
-msgstr "查找范围"
-
-#: searchdialog.cpp:105
-msgid "Su&mmaries"
-msgstr "摘要(&M)"
-
-#: searchdialog.cpp:107
-msgid "Desc&riptions"
-msgstr "描述(&R)"
-
-#: searchdialog.cpp:108
-msgid "Cate&gories"
-msgstr "类别(&G)"
-
-#: searchdialog.cpp:149
-msgid ""
-"Invalid search expression, cannot perform the search. Please enter a search "
-"expression using the wildcard characters '*' and '?' where needed."
-msgstr "无效的查找表达式，无法执行搜索。如有必要，请在查找表达中使用通配符“*”和“?”。"
-
-#: searchdialog.cpp:162
-msgid "No events were found matching your search expression."
-msgstr "没有事件匹配您的查找表达式。"
-
-#: exportwebdialog.cpp:73
-msgid "Export Calendar as Web Page"
-msgstr "将日历导出为网页"
+msgid "before the due time"
+msgstr "结束前"
 
-#: exportwebdialog.cpp:130
-msgid ""
-"You are about to set all preferences to default values. All custom "
-"modifications will be lost."
+#: koeditorgeneral.cpp:429 koeditorgeneral.cpp:468
+#, c-format
+msgid "Triggers %1"
 msgstr ""
 
-#: exportwebdialog.cpp:131
-msgid "Setting Default Preferences"
-msgstr "设置默认首选项"
-
-#: exportwebdialog.cpp:132
-msgid "Reset to Defaults"
-msgstr "重置为默认值"
-
-#: exportwebdialog.cpp:147
-msgid "View Type"
-msgstr "视图类型"
-
-#: exportwebdialog.cpp:158
-msgid "Destination"
-msgstr "目标"
-
-#: exportwebdialog.cpp:175
-msgid "To-dos"
-msgstr "待办"
-
-#: exportwebdialog.cpp:196
-msgid "Events"
-msgstr "事件"
-
-#: aboutdata.cpp:32
-msgid "KOrganizer"
-msgstr "KOrganizer"
-
-#: aboutdata.cpp:33
-msgid "A Personal Organizer for TDE"
-msgstr "TDE 的个人助理"
-
-#: aboutdata.cpp:40
-msgid "Current Maintainer"
-msgstr "目前维护者"
-
-#: aboutdata.cpp:42
-msgid "Co-Maintainer"
-msgstr "联合维护者"
-
-#: aboutdata.cpp:44
-msgid "Original Author"
-msgstr "原作者"
+#: koeditorgeneral.cpp:500
+#, c-format
+msgid "Calendar: %1"
+msgstr "日历：%1"
 
-#: resourceview.cpp:234
+#: koeditorgeneral.cpp:582
 #, fuzzy
-msgid "Add calendar"
-msgstr "添加为新日历"
+msgid "No attendees"
+msgstr "出席者(&N)"
 
-#: resourceview.cpp:236
+#: koeditorgeneral.cpp:584
+#, c-format
 msgid ""
-"<qt>"
-"<p>Press this button to add a resource to KOrganizer.</p>"
-"<p>Events, journal entries and to-dos are retrieved and stored on resources. "
-"Available resources include groupware servers, local files, journal entries as "
-"blogs on a server, etc... </p>"
-"<p>If you have more than one active resource, when creating incidents you will "
-"either automatically use the default resource or be prompted to select the "
-"resource to use.</p></qt>"
-msgstr ""
-
-#: resourceview.cpp:249
-#, fuzzy
-msgid "Edit calendar settings"
-msgstr "编辑日历过滤"
+"_n: One attendee\n"
+"%n attendees"
+msgstr "%n 个参与者"
 
-#: resourceview.cpp:251
+#: eventarchiver.cpp:101
 msgid ""
-"Press this button to edit the resource currently selected on the KOrganizer "
-"resources list above."
+"Unable to archive to-do \"%1\" because at least one of its sub-to-dos does not "
+"meet the archival requirements."
 msgstr ""
 
-#: resourceview.cpp:256
+#: eventarchiver.cpp:103
 #, fuzzy
-msgid "Remove calendar"
-msgstr "激活的日历"
+msgid "Archive To-do"
+msgstr "存档待办"
 
-#: resourceview.cpp:258
+#: eventarchiver.cpp:120
 msgid ""
-"Press this button to delete the resource currently selected on the KOrganizer "
-"resources list above."
+"There are no incidences available to archive before the specified cut-off date "
+"%1. Archiving will not be performed."
 msgstr ""
 
-#: resourceview.cpp:266
+#: eventarchiver.cpp:148
 msgid ""
-"<qt>"
-"<p>Select on this list the active KOrganizer resources. Check the resource box "
-"to make it active. Press the \"Add...\" button below to add new resources to "
-"the list.</p>"
-"<p>Events, journal entries and to-dos are retrieved and stored on resources. "
-"Available resources include groupware servers, local files, journal entries as "
-"blogs on a server, etc...</p>"
-"<p>If you have more than one active resource, when creating incidents you will "
-"either automatically use the default resource or be prompted to select the "
-"resource to use.</p></qt>"
+"Delete all items before %1 without saving?\n"
+"The following items will be deleted:"
 msgstr ""
+"要删除 %1 前的所有项目而不保存吗？\n"
+"下列项目将被删除："
 
-#: resourceview.cpp:326
-#, fuzzy
-msgid "Add Subresource"
-msgstr "%1 资源"
-
-#: resourceview.cpp:327
-#, fuzzy
-msgid "Please enter a name for the new subresource"
-msgstr "请输入新模板的名称："
-
-#: resourceview.cpp:333
-#, fuzzy
-msgid "<qt>Unable to create subresource <b>%1</b>.</qt>"
-msgstr "<qt>无法创建<b>%1</b>类型的资源。</qt>"
-
-#: resourceview.cpp:341
-msgid "Resource Configuration"
-msgstr "资源配置"
-
-#: resourceview.cpp:342
-msgid "Please select type of the new resource:"
-msgstr "请选择新资源的类型："
+#: eventarchiver.cpp:151
+msgid "Delete Old Items"
+msgstr "删除旧项目"
 
-#: resourceview.cpp:352
-msgid "<qt>Unable to create resource of type <b>%1</b>.</qt>"
-msgstr "<qt>无法创建<b>%1</b>类型的资源。</qt>"
+#: eventarchiver.cpp:219
+#, c-format
+msgid "Cannot write archive file %1."
+msgstr "无法写入存档文件 %1。"
 
-#: resourceview.cpp:357
-msgid "%1 resource"
-msgstr "%1 资源"
+#: eventarchiver.cpp:228
+msgid "Cannot write archive to final destination."
+msgstr "无法将存档写入最终位置。"
 
-#: resourceview.cpp:371
-msgid "Unable to create the resource."
-msgstr "无法创建资源。"
+#: korganizer_options.h:35
+#, fuzzy
+msgid "Import the given calendars as new resources into the default calendar"
+msgstr "将 <url> 处的日历导入默认日历中"
 
-#: resourceview.cpp:484
+#: korganizer_options.h:37
 msgid ""
-"<qt>Do you really want to remove the subresource <b>%1</b>"
-"? Note that its contents will be completely deleted. This operation cannot be "
-"undone. </qt>"
+"Merge the given calendars into the standard calendar (i.e. copy the events)"
 msgstr ""
 
-#: resourceview.cpp:487
-msgid "<qt>Do you really want to remove the resource <b>%1</b>?</qt>"
-msgstr "<qt>您真的想要删除资源<b>%1</b>吗？</qt>"
-
-#: resourceview.cpp:497
-msgid "You cannot delete your standard resource."
-msgstr "您不能删除您的标准资源。"
+#: korganizer_options.h:39
+#, fuzzy
+msgid "Open the given calendars in a new window"
+msgstr "在独立窗口中打开"
 
-#: resourceview.cpp:504
+#: korganizer_options.h:40
 msgid ""
-"<qt>Failed to remove the subresource <b>%1</b>. The reason could be that it is "
-"a built-in one which cannot be removed, or that the removal of the underlying "
-"storage folder failed.</qt>"
-msgstr ""
-
-#: resourceview.cpp:581
-msgid "Re&load"
-msgstr "重新装入(&L)"
-
-#: resourceview.cpp:589
-msgid "Show &Info"
-msgstr "显示信息(&I)"
-
-#: resourceview.cpp:593
-msgid "&Assign Color"
-msgstr "指派颜色(&A)"
-
-#: resourceview.cpp:595
-msgid "&Disable Color"
-msgstr "禁用颜色(&D)"
-
-#: resourceview.cpp:596
-msgid "Resources Colors"
-msgstr "资源颜色"
-
-#: resourceview.cpp:603
-msgid "Use as &Default Calendar"
-msgstr "用作默认日历(&D)"
-
-#: resourceview.cpp:609
-msgid "&Add..."
-msgstr "添加(&A)..."
-
-#: printing/calprinter.cpp:133
-msgid "Unable to print, no valid print style was returned."
-msgstr ""
-
-#: printing/calprinter.cpp:134
-msgid "Printing error"
+"Calendar files or urls. Unless -i, -o or -m is explicitly specified, the user "
+"will be asked whether to import, merge or open in a separate window."
 msgstr ""
 
-#: printing/calprinter.cpp:155
-msgid "Print Calendar"
-msgstr "打印日历"
-
-#: printing/calprinter.cpp:179
-msgid "Print Style"
-msgstr "打印样式"
-
-#: printing/calprinter.cpp:193
-msgid "Page &orientation:"
-msgstr "页面方向(&O)："
-
-#: printing/calprinter.cpp:198
-msgid "Use Default Orientation of Selected Style"
-msgstr "使用选中样式的默认方向"
-
-#: printing/calprinter.cpp:199
-msgid "Use Printer Default"
-msgstr "使用打印机默认值"
-
-#: printing/calprinter.cpp:237 printing/calprinter.cpp:239
-msgid "&Preview"
-msgstr "预览(&P)"
-
-#: printing/calprintdefaultplugins.cpp:134
-#: printing/calprintdefaultplugins.cpp:163
-#: printing/calprintdefaultplugins.cpp:182
-#, fuzzy
-msgid "Start date: "
-msgstr "起始日期："
+#: kolistview.cpp:212 kotodoview.cpp:387
+msgid "Recurs"
+msgstr "重复"
 
-#: printing/calprintdefaultplugins.cpp:139
-#: printing/calprintdefaultplugins.cpp:168
+#: kolistview.cpp:215
 #, fuzzy
-msgid "No start date"
-msgstr "起始日期："
+msgid "Start Date/Time"
+msgstr "起始日期"
 
-#: printing/calprintdefaultplugins.cpp:144
+#: kolistview.cpp:218
 #, fuzzy
-msgid "End date: "
-msgstr "结束日期："
-
-#: koeditorgeneralevent.cpp:416 koeditorgeneralevent.cpp:430
-#: printing/calprintdefaultplugins.cpp:147
-msgid "Duration: "
-msgstr "持续时间："
-
-#: printing/calprintdefaultplugins.cpp:150
-#, fuzzy, c-format
-msgid ""
-"_n: 1 hour \n"
-"%n hours "
-msgstr "%n 小时"
+msgid "End Date/Time"
+msgstr "到期日期/时间"
 
-#: printing/calprintdefaultplugins.cpp:153
-#, fuzzy, c-format
-msgid ""
-"_n: 1 minute \n"
-"%n minutes "
-msgstr "%n 分钟"
+#: korgplugins.cpp:37
+msgid "KOrgPlugins"
+msgstr "KOrgPlugins"
 
-#: printing/calprintdefaultplugins.cpp:156
-#, fuzzy
-msgid "No end date"
-msgstr "没有结束日期(&N)"
+#: koeditorattachments.cpp:143
+msgid "[Binary data]"
+msgstr "[二进制数据]"
 
-#: printing/calprintdefaultplugins.cpp:173
-#, fuzzy
-msgid "Due date: "
-msgstr "到期日期"
+#: koeditorattachments.cpp:168 koeditorattachments.cpp:672
+msgid "Add Attachment"
+msgstr "编辑附件"
 
-#: printing/calprintdefaultplugins.cpp:176
+#: koeditorattachments.cpp:186
 #, fuzzy
-msgid "No due date"
-msgstr "到期日期"
-
-#: printing/calprintdefaultplugins.cpp:288
-msgid "Repeats: "
-msgstr "重复："
+msgid "Attachment name"
+msgstr "附件(&M)"
 
-#: printing/calprintdefaultplugins.cpp:294
+#: koeditorattachments.cpp:187
 #, fuzzy
-msgid "No reminders"
-msgstr "提醒"
-
-#: printing/calprintdefaultplugins.cpp:297
-#, fuzzy, c-format
-msgid ""
-"_n: Reminder: \n"
-"%n reminders: "
-msgstr "%n 分钟"
+msgid "Give the attachment a name"
+msgstr "默认约会时间"
 
-#: printing/calprintdefaultplugins.cpp:340
-#: printing/calprintdefaultplugins.cpp:475
-msgid ""
-"_: Spacer for the joined list of categories\n"
-", "
+#: koeditorattachments.cpp:189
+msgid "Type any string you desire here for the name of the attachment"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:347
-#, fuzzy
-msgid "Organizer: "
-msgstr "组织者：%1"
-
-#: printing/calprintdefaultplugins.cpp:357
+#: koeditorattachments.cpp:195
 #, fuzzy
-msgid "Location: "
-msgstr "位置(&L)："
+msgid "Type:"
+msgstr "类型"
 
-#: printing/calprintdefaultplugins.cpp:392
+#: koeditorattachments.cpp:204
 #, fuzzy
-msgid "Description:"
-msgstr "描述(&D)"
-
-#: printing/calprintdefaultplugins.cpp:398
-msgid "Notes:"
-msgstr ""
+msgid "Store attachment inline"
+msgstr "附件(&M)"
 
-#: printing/calprintdefaultplugins.cpp:408
-msgid "Subitems:"
+#: koeditorattachments.cpp:207
+msgid "Store the attachment file inside the calendar"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:426
-#, fuzzy
-msgid "No Attendees"
-msgstr "出席者(&N)"
-
-#: printing/calprintdefaultplugins.cpp:428
-#, fuzzy, c-format
-msgid ""
-"_n: 1 Attendee:\n"
-"%n Attendees:"
-msgstr "%n 分钟"
-
-#: printing/calprintdefaultplugins.cpp:435
+#: koeditorattachments.cpp:210
 msgid ""
-"_: Formatting of an attendee: 'Name (Role): Status', e.g. 'Reinhold Kainhofer "
-"<reinhold@kainhofer.com> (Participant): Awaiting Response'\n"
-"%1 (%2): %3"
+"Checking this option will cause the attachment to be stored inside your "
+"calendar, which can take a lot of space depending on the size of the "
+"attachment. If this option is not checked, then only a link pointing to the "
+"attachment will be stored.  Do not use a link for attachments that change often "
+"or may be moved (or removed) from their current location."
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:439
-#, fuzzy
-msgid "Attendees:"
-msgstr "出席者(&N)"
-
-#: printing/calprintdefaultplugins.cpp:446
-#, fuzzy, c-format
-msgid "Status: %1"
-msgstr "起始：%1"
-
-#: printing/calprintdefaultplugins.cpp:450
-#, fuzzy, c-format
-msgid "Secrecy: %1"
-msgstr "起始：%1"
-
-#: printing/calprintdefaultplugins.cpp:456
-msgid "Show as: Busy"
+#: koeditorattachments.cpp:221
+msgid "Provide a location for the attachment file"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:458
-msgid "Show as: Free"
+#: koeditorattachments.cpp:224
+msgid ""
+"Enter the path to the attachment file or use the file browser by pressing the "
+"adjacent button"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:464
-msgid "This task is overdue!"
+#: koeditorattachments.cpp:234
+msgid "Size:"
 msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:470
-msgid "Settings: "
-msgstr ""
-
-#: printing/calprintdefaultplugins.cpp:474
-msgid "Categories: "
-msgstr "类别："
+#: koeditorattachments.cpp:258
+#, fuzzy
+msgid "New attachment"
+msgstr "编辑附件"
 
-#: printing/calprintdefaultplugins.cpp:741
-msgid ""
-"_: date from-to\n"
-"%1 - %2"
-msgstr "%1 - %2"
+#: koeditorattachments.cpp:457
+#, fuzzy
+msgid "Attachments:"
+msgstr "附件(&M)"
 
-#: printing/calprintdefaultplugins.cpp:743
+#: koeditorattachments.cpp:462
 msgid ""
-"_: date from-\n"
-"to\n"
-"%1 -\n"
-"%2"
+"Displays a list of current items (files, mail, etc.) that have been associated "
+"with this event or to-do. "
 msgstr ""
-"%1 - \n"
-"%2"
 
-#: printing/calprintdefaultplugins.cpp:760
+#: koeditorattachments.cpp:474
 #, fuzzy
+msgid "Add an attachment"
+msgstr "编辑附件"
+
+#: koeditorattachments.cpp:476
 msgid ""
-"_: date from - to (week number)\n"
-"%1 - %2 (Week %3)"
+"Shows a dialog used to select an attachment to add to this event or to-do as "
+"link or as inline data."
 msgstr ""
-"%1 - %2\n"
-"第 %3 周"
 
-#: printing/calprintdefaultplugins.cpp:762
-#, fuzzy
+#: koeditorattachments.cpp:486
 msgid ""
-"_: date from -\n"
-"to (week number)\n"
-"%1 -\n"
-"%2 (Week %3)"
+"Removes the attachment selected in the list above from this event or to-do."
 msgstr ""
-"%1 - %2\n"
-"第 %3 周"
 
-#: printing/calprintdefaultplugins.cpp:1005
-msgid "Due Date"
-msgstr "到期日期"
+#: koeditorattachments.cpp:585
+msgid "&Link here"
+msgstr ""
 
-#: printing/calprintdefaultplugins.cpp:1007
-msgid "Percent Complete"
-msgstr "完成百分比"
+#: koeditorattachments.cpp:593 koeditorattachments.cpp:596
+#, fuzzy
+msgid "&Copy Here"
+msgstr "复制到(&C)"
 
-#: printing/calprintdefaultplugins.cpp:1013
-msgid "Ascending"
-msgstr "升序"
+#: koeditorattachments.cpp:721
+#, fuzzy
+msgid "<qt>Do you really want to remove these attachments?<p>%1</qt>"
+msgstr "<qt>您真的想要删除资源<b>%1</b>吗？</qt>"
 
-#: printing/calprintdefaultplugins.cpp:1014
-msgid "Descending"
-msgstr "降序"
+#: koeditorattachments.cpp:722
+#, fuzzy
+msgid "Remove Attachment?"
+msgstr "删除附件"
 
-#: printing/calprintdefaultplugins.cpp:1023
-msgid "To-do list"
-msgstr "待办事宜列表"
+#: koagendaitem.cpp:565
+msgid "Attendee \"%1\" added to the calendar item \"%2\""
+msgstr ""
 
-#: printing/calprintpluginbase.cpp:135
-msgid "This printing style does not have any configuration options."
-msgstr "此打印样式无任何可配置的选项。"
+#: koagendaitem.cpp:565
+msgid "Attendee added"
+msgstr "出席者已添加"
 
-#: printing/calprintpluginbase.cpp:887
-msgid ""
-"_: weekday month date\n"
-"%1 %2 %3"
-msgstr "%1 %2 %3"
+#: koagendaitem.cpp:841 koagendaitem.cpp:939
+msgid "%1 - %2"
+msgstr "%1 - %2"
 
-#: printing/calprintpluginbase.cpp:949
+#: koagendaitem.cpp:850
 #, c-format
-msgid "To-do: %1"
-msgstr "待办事宜：%1"
+msgid "- %1"
+msgstr "- %1"
 
-#: printing/calprintpluginbase.cpp:1495
-msgid "%1%"
-msgstr "%1%"
+#: kowhatsnextview.cpp:101
+msgid "What's Next?"
+msgstr "下面什么事"
 
-#: printing/calprintpluginbase.cpp:1599
+#: kowhatsnextview.cpp:108
 msgid ""
-"_: Description - date\n"
+"_: Date from - to\n"
 "%1 - %2"
 msgstr "%1 - %2"
 
-#: printing/calprintpluginbase.cpp:1620
-#, c-format
-msgid "Person: %1"
-msgstr "人员：%1"
-
-#: printing/calprintpluginbase.cpp:1621
-#, c-format
-msgid "%1"
-msgstr "%1"
-
-#: printing/calprintpluginbase.cpp:1639
-msgid ""
-"_: Date range: Month dayStart - dayEnd\n"
-"%1 %2 - %3"
-msgstr "%1 %2 - %3"
-
-#: printing/calprintpluginbase.cpp:1644
-msgid ""
-"_: Date range: monthStart dayStart - monthEnd dayEnd\n"
-"%1 %2 - %3 %4"
-msgstr "%1 %2 - %3 %4"
-
-#: printing/cellitem.cpp:36
-msgid "<undefined>"
-msgstr "<未定义>"
-
-#: printing/calprintdefaultplugins.h:45
-#, fuzzy
-msgid "Print &incidence"
-msgstr "打印整周(&W)"
-
-#: printing/calprintdefaultplugins.h:46
-#, fuzzy
-msgid "Prints an incidence on one page"
-msgstr "在一页上打印一周的全部"
-
-#: printing/calprintdefaultplugins.h:85
-msgid "Print da&y"
-msgstr "打印整日(&Y)"
-
-#: printing/calprintdefaultplugins.h:86
-msgid "Prints all events of a single day on one page"
-msgstr "在一页上打印一天的全部事件"
-
-#: printing/calprintdefaultplugins.h:110
-msgid "Print &week"
-msgstr "打印整周(&W)"
-
-#: printing/calprintdefaultplugins.h:111
-msgid "Prints all events of one week on one page"
-msgstr "在一页上打印一周的全部"
-
-#: printing/calprintdefaultplugins.h:139
-msgid "Print mont&h"
-msgstr "打印整月(&H)"
-
-#: printing/calprintdefaultplugins.h:140
-msgid "Prints all events of one month on one page"
-msgstr "在一页上打印一个月的全部事件"
-
-#: printing/calprintdefaultplugins.h:166
-msgid "Print to-&dos"
-msgstr "打印待办(&D)"
-
-#: printing/calprintdefaultplugins.h:167
-msgid "Prints all to-dos in a (tree-like) list"
-msgstr "打印树形列表中的全部待办事宜"
-
-#: koeventeditor.cpp:124 koeventeditor.cpp:149
-msgid ""
-"The General tab allows you to set the most common options for the event."
-msgstr ""
-
-#: koeventeditor.cpp:138 kotodoeditor.cpp:109
-msgid "Details"
-msgstr "细节"
-
-#: koeventeditor.cpp:179 kotodoeditor.cpp:148
-msgid "Rec&urrence"
-msgstr "重现(&U)"
-
-#: koeventeditor.cpp:182
-msgid ""
-"The Recurrence tab allows you to set options on how often this event recurs."
-msgstr ""
-
-#: koeventeditor.cpp:199
-msgid ""
-"The Free/Busy tab allows you to see whether other attendees are free or busy "
-"during your event."
-msgstr ""
+#: kowhatsnextview.cpp:124
+msgid "Events:"
+msgstr "事件："
 
-#: koeventeditor.cpp:219
-msgid "Edit Event"
-msgstr "编辑事件"
+#: kowhatsnextview.cpp:160
+msgid "To-do:"
+msgstr "待办事宜："
 
-#: koeventeditor.cpp:227
-msgid "New Event"
-msgstr "新建事件"
+#: kowhatsnextview.cpp:199 kowhatsnextview.cpp:220
+msgid "Events and to-dos that need a reply:"
+msgstr "需要回复的事件与待办事宜："
 
-#: koeventeditor.cpp:285
+#: kowhatsnextview.cpp:288
 msgid ""
-"You didn't change the event, thus no counter proposal has been sent to the "
-"organizer."
-msgstr ""
-
-#: koeventeditor.cpp:285
-#, fuzzy
-msgid "No changes"
-msgstr "Exchange"
-
-#: koeventeditor.cpp:295
-#, c-format
-msgid "My counter proposal for: %1"
-msgstr ""
-
-#: koeventeditor.cpp:390
-msgid "Template does not contain a valid event."
-msgstr "模板中并未包含有效的事件。"
-
-#: timezone.cpp:39
-msgid "KOrganizer Timezone Test"
-msgstr "KOrganizer 时区测试"
-
-#: kotodoeditor.cpp:173
-msgid "Edit To-do"
-msgstr "编辑待办"
-
-#: kotodoeditor.cpp:182
-msgid "New To-do"
-msgstr "新建待办"
-
-#: kotodoeditor.cpp:343
-msgid "Template does not contain a valid to-do."
-msgstr "模板未包含有效的待办事宜。"
+"_: date, from - to\n"
+"%1, %2 - %3"
+msgstr "%1，%2 - %3"
 
-#: stdcalendar.cpp:74
-msgid "Active Calendar"
-msgstr "激活的日历"
+#: kowhatsnextview.cpp:316
+msgid "  (Due: %1)"
+msgstr "  (到期：%1)"
 
-#: stdcalendar.cpp:83
-msgid "Default Calendar"
-msgstr "默认日历"
+#: navigatorbar.cpp:75
+msgid "Previous year"
+msgstr "上一年"
 
-#: stdcalendar.cpp:98
-msgid "Birthdays"
-msgstr "生日"
+#: navigatorbar.cpp:81
+msgid "Previous month"
+msgstr "上一月"
 
-#: statusdialog.cpp:41
-msgid "Set Your Status"
-msgstr "设置您的状态"
+#: navigatorbar.cpp:88
+msgid "Next month"
+msgstr "下一月"
 
-#: statusdialog.cpp:49
-msgid "Set your status"
-msgstr "设置您的状态"
+#: navigatorbar.cpp:94
+msgid "Next year"
+msgstr "下一年"
 
-#: kotodoviewitem.cpp:125
-msgid "--"
-msgstr "--"
+#: navigatorbar.cpp:101
+msgid "Select a month"
+msgstr "选择月"
 
-#: korganizer_options.h:35
+#: navigatorbar.cpp:108
 #, fuzzy
-msgid "Import the given calendars as new resources into the default calendar"
-msgstr "将 <url> 处的日历导入默认日历中"
+msgid "Select a year"
+msgstr "选择月"
 
-#: korganizer_options.h:37
+#: navigatorbar.cpp:177
+#, fuzzy, c-format
 msgid ""
-"Merge the given calendars into the standard calendar (i.e. copy the events)"
-msgstr ""
-
-#: korganizer_options.h:39
-#, fuzzy
-msgid "Open the given calendars in a new window"
-msgstr "在独立窗口中打开"
+"_: monthname\n"
+"%1"
+msgstr "%2年%1"
 
-#: korganizer_options.h:40
+#: navigatorbar.cpp:178
+#, c-format
 msgid ""
-"Calendar files or urls. Unless -i, -o or -m is explicitly specified, the user "
-"will be asked whether to import, merge or open in a separate window."
-msgstr ""
-
-#: koeditorgeneralevent.cpp:104
-msgid "Sets options related to the date and time of the event or to-do."
+"_: 4 digit year\n"
+"%1"
 msgstr ""
 
-#: koeditorgeneralevent.cpp:114
-msgid "&Start:"
-msgstr "起始(&S)："
-
-#: koeditorgeneralevent.cpp:125
-msgid "&End:"
-msgstr "结束(&E)："
-
-#: koeditorgeneralevent.cpp:135
-#, fuzzy
-msgid "All-&day"
-msgstr "全天"
-
-#: koeditorgeneralevent.cpp:163
-#, fuzzy
-msgid "Reminder:"
-msgstr "提醒(&R)："
-
-#: koeditorgeneralevent.cpp:183
-msgid "S&how time as:"
-msgstr "显示时间为(&H)："
+#: publishdialog.cpp:43
+msgid "Select Addresses"
+msgstr "选择地址"
 
-#: koeditorgeneralevent.cpp:184
-msgid "Sets how this time will appear on your Free/Busy information."
-msgstr ""
+#: publishdialog.cpp:101
+msgid "(EmptyName)"
+msgstr "(空名称)"
 
-#: koeditorgeneralevent.cpp:191
-msgid "Busy"
-msgstr "忙"
+#: kotodoview.cpp:216
+msgid "Cannot move to-do to itself or a child of itself."
+msgstr "不能把待办事宜移到它自己或其子事宜上。"
 
-#: koeditorgeneralevent.cpp:192
-msgid "Free"
-msgstr "闲"
+#: kotodoview.cpp:217
+msgid "Drop To-do"
+msgstr "放下待办事宜"
 
-#: koeditorgeneralevent.cpp:206
-msgid "You have not yet definitely responded to this invitation."
+#: kotodoview.cpp:230
+msgid "Unable to change to-do's parent, because the to-do cannot be locked."
 msgstr ""
 
-#: koeditorgeneralevent.cpp:417
-#, c-format
+#: kotodoview.cpp:278
 msgid ""
-"_n: 1 Day\n"
-"%n Days"
-msgstr "%n 天"
-
-#: koeditorgeneralevent.cpp:436
-msgid ", "
-msgstr "，"
-
-#: koeditorgeneralevent.cpp:447
-msgid ""
-"Shows the duration of the event or to-do with the current start and end dates "
-"and times."
+"Unable to add attendees to the to-do, because the to-do cannot be locked."
 msgstr ""
 
-#: koeditorgeneralevent.cpp:464
-msgid "From: %1   To: %2   %3"
-msgstr "从：%1  至：%2    %3"
-
-#: koeditorgeneralevent.cpp:477
-msgid "Please specify a valid start time, for example '%1'."
-msgstr "请指定一个有效的起始时间，如“%1”。"
+#: kotodoview.cpp:368
+msgid "To-dos:"
+msgstr "待办："
 
-#: koeditorgeneralevent.cpp:484
-msgid "Please specify a valid end time, for example '%1'."
-msgstr "请指定一个有效的结束时间，如“%1”。"
+#: kotodoview.cpp:372
+msgid "Click to add a new to-do"
+msgstr "单击可添加新待办事宜"
 
-#: koeditorgeneralevent.cpp:492
-msgid "Please specify a valid start date, for example '%1'."
-msgstr "请指定一个有效的起始日期，如“%1”。"
+#: kotodoview.cpp:392
+msgid "Due Date/Time"
+msgstr "到期日期/时间"
 
-#: koeditorgeneralevent.cpp:499
-msgid "Please specify a valid end date, for example '%1'."
-msgstr "请指定一个有效的结束日期，如“%1”。"
+#: kotodoview.cpp:397
+msgid "Sort Id"
+msgstr "排序 Id"
 
-#: koeditorgeneralevent.cpp:513
+#: kotodoview.cpp:417
 msgid ""
-"The event ends before it starts.\n"
-"Please correct dates and times."
-msgstr ""
-"该事件在起始前结束。\n"
-"请更正日期和时间。"
-
-#: koeventviewerdialog.cpp:33
-msgid "Event Viewer"
-msgstr "事件查看器"
+"_: Unspecified priority\n"
+"unspecified"
+msgstr "未指定"
 
-#: archivedialog.cpp:55
-msgid "Archive/Delete Past Events and To-dos"
-msgstr "存档/删除过去的事件和待办"
+#: kotodoview.cpp:468
+msgid "&Make this To-do Independent"
+msgstr "将此待办事宜独立(&M)"
 
-#: archivedialog.cpp:57
-msgid "&Archive"
-msgstr "存档(&A)"
+#: kotodoview.cpp:470
+msgid "Make all Sub-to-dos &Independent"
+msgstr "将全部子待办事宜独立(&I)"
 
-#: archivedialog.cpp:66
-#, fuzzy
-msgid ""
-"Archiving saves old items into the given file and then deletes them in the "
-"current calendar. If the archive file already exists they will be added. (<a "
-"href=\"whatsthis:In order to add an archive to your calendar, use the "
-"&quot;Merge Calendar&quot; function. You can view an archive by opening it in "
-"KOrganizer like any other calendar. It is not saved in a special format, but as "
-"vCalendar.\">How to restore</a>)"
-msgstr ""
-"存档将旧事件存入给定文件，并从当前日历中删除这些事件。如果存档文件已经存在，则会将约会添加到该文件中。(<a "
-"href=\"whatsthis:为了将归档加入您的日历，请使用“合并日历”功能。和其它日历一样，您可以在 KOrganizer "
-"中打开归档文件进行查看。归档文件的格式并不特殊，只是 vCalendar 格式。\">如何恢复</a>)"
+#: kotodoview.cpp:473
+msgid "&Copy To"
+msgstr "复制到(&C)"
 
-#: archivedialog.cpp:82
-msgid "Archive now items older than:"
-msgstr "存档早于此日期的项目："
+#: kotodoview.cpp:474
+msgid "&Move To"
+msgstr "移动到(&M)"
 
-#: archivedialog.cpp:87
-#, fuzzy
+#: kotodoview.cpp:476
 msgid ""
-"The date before which items should be archived. All older events and to-dos "
-"will be saved and deleted, the newer (and events exactly on that date) will be "
-"kept."
-msgstr "存档早于指定日期的事件。更早的全部事件都将被保存并删除，而更新(包括所选日期当天)的事件约会将会保留。"
+"_: delete completed to-dos\n"
+"Pur&ge Completed"
+msgstr "销毁已完成(&G)"
 
-#: archivedialog.cpp:96
-msgid "Automaticall&y archive items older than:"
-msgstr "自动存档早于指定时间的项目(&Y)："
+#: kotodoview.cpp:485
+msgid "&New To-do..."
+msgstr "新建待办事宜(&N)..."
 
-#: archivedialog.cpp:99
+#: kotodoview.cpp:487
 msgid ""
-"If this feature is enabled, KOrganizer will regularly check if events and "
-"to-dos have to be archived; this means you will not need to use this dialog box "
-"again, except to change the settings."
-msgstr ""
+"_: delete completed to-dos\n"
+"&Purge Completed"
+msgstr "销毁已完成(&P)"
 
-#: archivedialog.cpp:107
+#: previewdialog.cpp:54
 #, fuzzy
-msgid ""
-"The age of the events and to-dos to archive. All older items will be saved and "
-"deleted, the newer will be kept."
-msgstr "要存档约会的时间范围。所有更早的约会都将被保存并删除，而更新的约会将会保留。"
-
-#: archivedialog.cpp:112
-msgid "Day(s)"
-msgstr "天"
-
-#: archivedialog.cpp:113
-msgid "Week(s)"
-msgstr "周"
-
-#: archivedialog.cpp:114
-msgid "Month(s)"
-msgstr "月"
-
-#: archivedialog.cpp:119
-msgid "Archive &file:"
-msgstr "存档文件(&F)："
-
-#: archivedialog.cpp:123
-msgid "*.ics|iCalendar Files"
-msgstr "*.ics|iCalendar 文件"
+msgid "&Merge into existing calendar"
+msgstr "合并入已有日历"
 
-#: archivedialog.cpp:125
+#: previewdialog.cpp:73
 #, fuzzy
-msgid ""
-"The path of the archive. The events and to-dos will be added to the archive "
-"file, so any events that are already in the file will not be modified or "
-"deleted. You can later load or merge the file like any other calendar. It is "
-"not saved in a special format, it uses the iCalendar format. "
-msgstr ""
-"存档的路径。约会将会被添加到存档文件中，所以该文件中已有的约会不会被修改或删除。和其它任何日历一样，您可以稍后装入或合并存档文件。存档文件并不是以特殊格式保存的"
-"，只是 vCalendar 格式。"
-
-#: archivedialog.cpp:134
-msgid "Type of Items to Archive"
-msgstr "要存档的项目类型"
-
-#: archivedialog.cpp:139
-msgid ""
-"Here you can select which items should be archived. Events are archived if they "
-"ended before the date given above; to-dos are archived if they were finished "
-"before the date."
-msgstr ""
-
-#: archivedialog.cpp:144
-msgid "&Delete only, do not save"
-msgstr "只删除，不保存(&D)"
+msgid "&Add as new calendar..."
+msgstr "添加为新日历"
 
-#: archivedialog.cpp:147
+#: previewdialog.cpp:75
 #, fuzzy
-msgid ""
-"Select this option to delete old events and to-dos without saving them. It is "
-"not possible to recover the events later."
-msgstr "选择此选项可删除旧约会，而不先保存。以后将无法恢复这些约会。"
-
-#: archivedialog.cpp:211
-msgid ""
-"The archive file name is not valid.\n"
-msgstr ""
-"存档文件名无效。\n"
-
-#: komonthview.cpp:349
-msgid ""
-"_: 'Month day' for month view cells\n"
-"%1 %2"
-msgstr "%1 %2"
-
-#: koeditorgeneraljournal.cpp:62
-msgid "Sets the title of this journal."
-msgstr "设定此日记的标题。"
-
-#: koeditorgeneraljournal.cpp:82
-msgid "&Date:"
-msgstr "日期(&D)："
-
-#: koeditorgeneraljournal.cpp:91
-msgid "&Time: "
-msgstr "时间(&T)："
-
-#: koeditorgeneraljournal.cpp:197
-msgid "Please specify a valid date, for example '%1'."
-msgstr "请指定一个有效日期，如“%1”。"
+msgid "&Add as new calendar"
+msgstr "添加为新日历"
 
-#: korgplugins.cpp:37
-msgid "KOrgPlugins"
-msgstr "KOrgPlugins"
+#: previewdialog.cpp:141
+#, fuzzy
+msgid "Select path for new calendar"
+msgstr "添加为新日历"
 
 #: templatemanagementdialog.cpp:50
 msgid "Manage Templates"
@@ -5952,838 +7133,464 @@ msgstr "复制模板名称"
 msgid "Overwrite"
 msgstr "覆盖"
 
-#: tips.cpp:3
-#, fuzzy
+#: incidencechanger.cpp:74
 msgid ""
-"<p>...that you can synchronize your calendar data with the data on a Palm Pilot "
-"by using <a href=\"http://www.slac.com/pilone/kpilot_home\">KPilot</a>?\n"
-"</p>\n"
+"Some attendees were removed from the incidence. Shall cancel messages be sent "
+"to these attendees?"
 msgstr ""
-"<p>...您可以用 <a href=\"http://www.slac.com/pilone/kpilot_home\">KPilot</a> "
-"把您的日历和 Palm Pilot 的数据同步。\n"
 
-#: tips.cpp:9
-msgid ""
-"<p>...that it is possible to show the current time in the calendar? Enable the "
-"current time line in the dialog which appears after selecting <b>Settings</b>"
-", <b>Configure KOrganizer...</b> from the menu bar.\n"
-"</p>\n"
-msgstr ""
+#: incidencechanger.cpp:76
+msgid "Attendees Removed"
+msgstr "出席者已删除"
 
-#: tips.cpp:15
-msgid ""
-"<p>...that KOrganizer supports Microsoft Exchange? Add the <b>"
-"Microsoft&reg; Exchange 2000 resource</b> using the <b>Resource View</b> "
-"from the KOrganizer sidebar.\n"
-"</p>\n"
-msgstr ""
+#: incidencechanger.cpp:76
+msgid "Send Messages"
+msgstr "发送信件"
 
-#: tips.cpp:21
+#: incidencechanger.cpp:388
 #, fuzzy
-msgid ""
-"<p>...that you can select whether the week starts on Monday or on Sunday in the "
-"Trinity Control Center? KOrganizer uses this setting. Look at Regional & "
-"Accessibility->Country/Region & Languages in the Trinity Control Center, or select "
-"<b>Settings</b>,\n"
-"<b>Configure Date & Time...</b> from the menu bar. Select the Time & Dates "
-"tab.\n"
-"</p>\n"
-msgstr ""
-"<p>...您可以在 TDE 控制面板里选择一周的开始是周一还是周日。KOrganizer 会使用这个设置。请查看“个人设置”->"
-"“国家/地区与语言”的“时间与日期”标签。\n"
+msgid "No calendars found, unable to save %1 \"%2\"."
+msgstr "无法保存 %1“%2”。"
 
-#: tips.cpp:28
-msgid ""
-"<p>...that you can edit to-dos quickly by right clicking on the property you "
-"wish to change; like the priority, the category or the date?\n"
-"</p>\n"
-msgstr ""
+#: incidencechanger.cpp:439 kodialogmanager.cpp:113
+msgid "Unable to save %1 \"%2\"."
+msgstr "无法保存 %1“%2”。"
 
-#: tips.cpp:34
-msgid ""
-"<p>...that you can view and edit a calendar from the shell with "
-"konsolekalendar? Run <b>konsolekalendar --help</b> for the available options.\n"
-"</p>\n"
-msgstr ""
+#: incidencechanger.cpp:443
+#, fuzzy
+msgid "Unable to save %1 \"%2\" to calendar %3."
+msgstr "无法保存 %1“%2”。"
 
-#: tips.cpp:40
+#: incidencechanger.cpp:461
 msgid ""
-"<p>...that you can import birthdays from your address book? There is a resource "
-"available which connects the birthdays to your calendar; it is even possible to "
-"set a reminder for each event.\n"
-"</p>\n"
+"Attempt to send the scheduling message failed. Please check your Group "
+"Scheduling settings. Contact your system administrator for more help."
 msgstr ""
 
-#: tips.cpp:46
-#, fuzzy
-msgid ""
-"<p>...that you can store your calendar on an FTP server? Use the standard file "
-"dialog to save the calendar to a URL like "
-"<b>ftp://username@ftpserver/filename</b>. You can make your calendar active and "
-"load and save it as if it were local, or add it permanently to your resources "
-"list, using the remote file resource. Just make sure that no two KOrganizer "
-"applications are working on the same file, at the same time.\n"
-"</p>\n"
-msgstr ""
-"<p>...您可在把您的日历存在 FTP 服务器上。使用标准的文件对话框，把您的日历存成类似 "
-"<b>ftp://username@ftpserver/filename</b> "
-"的网址即可。您可以启用、载入、保存您的日历，就像您在本机的日历一样。只是要确定不要有两个 KOrganizer 程序同时用同一个文件就行。\n"
+#: kojournaleditor.cpp:47
+msgid "Edit Journal Entry"
+msgstr "编辑日记项"
 
-#: tips.cpp:52
+#: kojournaleditor.cpp:201
+msgid "This journal entry will be permanently deleted."
+msgstr "该日记项将会被永久地删除。"
+
+#: kojournaleditor.cpp:217
+msgid "Template does not contain a valid journal."
+msgstr "模板未包含有效的日记。"
+
+#: koagenda.cpp:946
 #, fuzzy
-msgid ""
-"<p>...that you can create hierarchical to-dos by clicking with the right mouse "
-"button on an existing to-do and selecting <b>New Sub-to-do</b> "
-"from the context menu?\n"
-"</p>\n"
-msgstr ""
-"<p>...您可以在现有的待办事宜上按鼠标右键、在菜单中选<b>新建子待办事宜</b>就可以创建层次式的待办事宜。\n"
+msgid "Unable to lock item for modification. You cannot make any changes."
+msgstr "无法锁定对项目的修改。您无法进行任何更改。"
 
-#: tips.cpp:58
-msgid ""
-"<p>...that a color can be assigned to each category? Events with a certain "
-"category will be shown in that color. You can assign these in the section <b>"
-"Colors</b> within the dialog which appears after selecting <b>Settings</b>, <b>"
-"Configure KOrganizer...</b> from the menu bar.\n"
-"</p>\n"
-msgstr ""
+#: koagenda.cpp:948
+msgid "Locking Failed"
+msgstr "锁定失败"
 
-#: tips.cpp:64
+#: freebusymanager.cpp:236
 msgid ""
-"<p>...that you can view and edit a calendar with Konqueror? Just click on the "
-"calendar file to make Konqueror open it.\n"
-"</p>\n"
+"<qt>No URL configured for uploading your free/busy list. Please set it in "
+"KOrganizer's configuration dialog, on the \"Free/Busy\" page. "
+"<br>Contact your system administrator for the exact URL and the account "
+"details.</qt>"
 msgstr ""
 
-#: tips.cpp:70
-msgid ""
-"<p>...that it is possible to add an attachment to an event or to-do? To do so, "
-"add a link to the <b>Attachments</b> tab within the <b>Edit Event</b> or <b>"
-"Edit To-do</b> dialog.\n"
-"</p>\n"
-msgstr ""
+#: freebusymanager.cpp:240
+msgid "No Free/Busy Upload URL"
+msgstr "无忙/闲上传 URL"
 
-#: tips.cpp:76
-msgid ""
-"<p>...that you can export your calendar to HTML? Select <b>File</b>, <b>"
-"Export</b>, <b>Export Web Page...</b> from the menu bar to open the <b>"
-"Export calendar as web page</b> dialog.\n"
-"</p>\n"
+#: freebusymanager.cpp:247
+msgid "<qt>The target URL '%1' provided is invalid.</qt>"
 msgstr ""
 
-#: tips.cpp:82
-msgid ""
-"<p>...that you can purge completed to-dos in one step? Go to the <b>File</b> "
-"menu and choose <b>Purge Completed</b>.\n"
+#: freebusymanager.cpp:248
+msgid "Invalid URL"
 msgstr ""
 
-#: tips.cpp:87
+#: freebusymanager.cpp:352
 msgid ""
-"<p>...that you can create a new sub-to-do by pasting a to-do while another one "
-"is selected?\n"
-"</p>\n"
+"<qt>The software could not upload your free/busy list to the URL '%1'. There "
+"might be a problem with the access rights, or you specified an incorrect URL. "
+"The system said: <em>%2</em>."
+"<br>Please check the URL or contact your system administrator.</qt>"
 msgstr ""
+"<qt>软件无法将您的忙/闲列表上传到 URL %1 上。可能访问权限有问题，或者是您指定的 URL 不对。系统返回的信息：<em>%2</em>。"
+"<br>请检查 URL 或联系您的系统管理员。</qt>"
 
-#: plugins/datenums/datenums.cpp:59
-msgid ""
-"_: dayOfYear / daysTillEndOfYear\n"
-"%1 / %2"
-msgstr "%1 / %2"
-
-#: plugins/datenums/datenums.cpp:71
-msgid "This plugin provides numbers of days and weeks."
-msgstr "这个插件提供日数和周数。"
-
-#: plugins/datenums/configdialog.cpp:38
-msgid "Configure Day Numbers"
-msgstr "配置日编号"
-
-#: plugins/datenums/configdialog.cpp:45
-msgid "Show Date Number"
-msgstr "显示日编号"
-
-#: plugins/datenums/configdialog.cpp:48
-msgid "Show day number"
-msgstr "显示日编号"
-
-#: plugins/datenums/configdialog.cpp:49
-msgid "Show days to end of year"
-msgstr "显示至每年的结束"
+#: komailclient.cpp:247
+msgid "No running instance of KMail found."
+msgstr "未发现 KMail 的运行实例。"
 
-#: plugins/datenums/configdialog.cpp:50
-msgid "Show both"
-msgstr "全部显示"
+#: kotodoeditor.cpp:160
+msgid "Edit To-do"
+msgstr "编辑待办"
 
-#: plugins/projectview/koprojectview.cpp:76
-msgid "Project View"
-msgstr "项目视图"
+#: kotodoeditor.cpp:169
+msgid "New To-do"
+msgstr "新建待办"
 
-#: plugins/projectview/koprojectview.cpp:80
-#: plugins/timespanview/timespanwidget.cpp:65
-msgid "Zoom In"
-msgstr "放大"
+#: kotodoeditor.cpp:344
+msgid "Template does not contain a valid to-do."
+msgstr "模板未包含有效的待办事宜。"
 
-#: plugins/projectview/koprojectview.cpp:84
-#: plugins/timespanview/timespanwidget.cpp:69
-msgid "Zoom Out"
-msgstr "缩小"
+#: kocounterdialog.cpp:36
+msgid "Counter-Event Viewer"
+msgstr "回应事件查看器"
 
-#: plugins/projectview/koprojectview.cpp:88
-msgid "Select Mode"
-msgstr "选择模式"
+#: korganizer.cpp:298
+msgid "New Calendar"
+msgstr "新建日历"
 
-#: plugins/projectview/koprojectview.cpp:109
-msgid "main task"
-msgstr "主要任务"
+#: korganizer.cpp:302
+msgid "read-only"
+msgstr "只读"
 
-#: plugins/projectview/projectview.cpp:55
-msgid "&Project"
-msgstr "项目(&P)"
+#: resourceview.cpp:73
+msgid "My %1 (%2)"
+msgstr ""
 
-#: plugins/projectview/projectview.cpp:65
-msgid "This plugin provides a Gantt diagram as project view."
-msgstr "这个插件提供项目视图所用的甘特图。"
+#: resourceview.cpp:75 resourceview.cpp:78
+#, c-format
+msgid "My %1"
+msgstr ""
 
-#: plugins/projectview/projectview.cpp:70
-msgid "Project View Plugin"
-msgstr "项目视图插件"
+#: resourceview.cpp:277
+#, fuzzy
+msgid "Add calendar"
+msgstr "添加为新日历"
 
-#: plugins/hebrew/parsha.cpp:33
+#: resourceview.cpp:279
 msgid ""
-"_: These are weekly readings and do not have translations. They may have "
-"different spellings in your language; otherwise, just translate the sound to "
-"your characters\n"
-"Bereshit"
-msgstr "Bereshit"
-
-#: plugins/hebrew/parsha.cpp:33
-msgid "Noach"
-msgstr "Noach"
-
-#: plugins/hebrew/parsha.cpp:33
-msgid "Lech L'cha"
-msgstr "Lech L'cha"
-
-#: plugins/hebrew/parsha.cpp:34
-msgid "Vayera"
-msgstr "Vayera"
-
-#: plugins/hebrew/parsha.cpp:34
-msgid "Chaye Sarah"
-msgstr "Chaye Sarah"
-
-#: plugins/hebrew/parsha.cpp:34
-msgid "Toldot"
-msgstr "Toldot"
-
-#: plugins/hebrew/parsha.cpp:35
-msgid "Vayetze"
-msgstr "Vayetze"
-
-#: plugins/hebrew/parsha.cpp:35
-msgid "Vayishlach"
-msgstr "Vayishlach"
-
-#: plugins/hebrew/parsha.cpp:35
-msgid "Vayeshev"
-msgstr "Vayeshev"
-
-#: plugins/hebrew/parsha.cpp:36
-msgid "Miketz"
-msgstr "Miketz"
-
-#: plugins/hebrew/parsha.cpp:36
-msgid "Vayigash"
-msgstr "Vayigash"
-
-#: plugins/hebrew/parsha.cpp:36
-msgid "Vayechi"
-msgstr "Vayechi"
-
-#: plugins/hebrew/parsha.cpp:37
-msgid "Shemot"
-msgstr "Shemot"
-
-#: plugins/hebrew/parsha.cpp:37
-msgid "Vaera"
-msgstr "Vaera"
-
-#: plugins/hebrew/parsha.cpp:37
-msgid "Bo"
-msgstr "Bo"
-
-#: plugins/hebrew/parsha.cpp:37
-msgid "Beshalach"
-msgstr "Beshalach"
-
-#: plugins/hebrew/parsha.cpp:38
-msgid "Yitro"
-msgstr "Yitro"
-
-#: plugins/hebrew/parsha.cpp:38
-msgid "Mishpatim"
-msgstr "Mishpatim"
-
-#: plugins/hebrew/parsha.cpp:38
-msgid "Terumah"
-msgstr "Terumah"
-
-#: plugins/hebrew/parsha.cpp:39
-msgid "Tetzaveh"
-msgstr "Tetzaveh"
-
-#: plugins/hebrew/parsha.cpp:39
-msgid "Ki Tisa"
-msgstr "Ki Tisa"
-
-#: plugins/hebrew/parsha.cpp:39
-msgid "Vayakhel"
-msgstr "Vayakhel"
-
-#: plugins/hebrew/parsha.cpp:40
-msgid "Pekudei"
-msgstr "Pekudei"
-
-#: plugins/hebrew/parsha.cpp:40
-msgid "Vayikra"
-msgstr "Vayikra"
-
-#: plugins/hebrew/parsha.cpp:40
-msgid "Tzav"
-msgstr "Tzav"
-
-#: plugins/hebrew/parsha.cpp:41
-msgid "Shemini"
-msgstr "Shemini"
-
-#: plugins/hebrew/parsha.cpp:41
-msgid "Tazria"
-msgstr "Tazria"
-
-#: plugins/hebrew/parsha.cpp:41
-msgid "Metzora"
-msgstr "Metzora"
-
-#: plugins/hebrew/parsha.cpp:42
-msgid "Acharei Mot"
-msgstr "Acharei Mot"
-
-#: plugins/hebrew/parsha.cpp:42
-msgid "Kedoshim"
-msgstr "Kedoshim"
-
-#: plugins/hebrew/parsha.cpp:42
-msgid "Emor"
-msgstr "Emor"
-
-#: plugins/hebrew/parsha.cpp:43
-msgid "Behar"
-msgstr "Behar"
-
-#: plugins/hebrew/parsha.cpp:43
-msgid "Bechukotai"
-msgstr "Bechukotai"
-
-#: plugins/hebrew/parsha.cpp:43
-msgid "Bemidbar"
-msgstr "Bemidbar"
-
-#: plugins/hebrew/parsha.cpp:44
-msgid "Naso"
-msgstr "Naso"
-
-#: plugins/hebrew/parsha.cpp:44
-msgid "Behaalotcha"
-msgstr "Behaalotcha"
-
-#: plugins/hebrew/parsha.cpp:44
-msgid "Shelach"
-msgstr "Shelach"
-
-#: plugins/hebrew/parsha.cpp:45
-msgid "Korach"
-msgstr "Korach"
-
-#: plugins/hebrew/parsha.cpp:45
-msgid "Chukat"
-msgstr "Chukat"
-
-#: plugins/hebrew/parsha.cpp:45
-msgid "Balak"
-msgstr "Balak"
-
-#: plugins/hebrew/parsha.cpp:46
-msgid "Pinchas"
-msgstr "Pinchas"
-
-#: plugins/hebrew/parsha.cpp:46
-msgid "Matot"
-msgstr "Matot"
-
-#: plugins/hebrew/parsha.cpp:46
-msgid "Masei"
-msgstr "Masei"
-
-#: plugins/hebrew/parsha.cpp:47
-msgid "Devarim"
-msgstr "Devarim"
-
-#: plugins/hebrew/parsha.cpp:47
-msgid "Vaetchanan"
-msgstr "Vaetchanan"
-
-#: plugins/hebrew/parsha.cpp:47
-msgid "Ekev"
-msgstr "Ekev"
-
-#: plugins/hebrew/parsha.cpp:48
-msgid "Reeh"
-msgstr "Reeh"
-
-#: plugins/hebrew/parsha.cpp:48
-msgid "Shoftim"
-msgstr "Shoftim"
-
-#: plugins/hebrew/parsha.cpp:48
-msgid "Ki Tetze"
-msgstr "Ki Tetze"
-
-#: plugins/hebrew/parsha.cpp:49
-msgid "Ki Tavo"
-msgstr "Ki Tavo"
-
-#: plugins/hebrew/parsha.cpp:49
-msgid "Nitzavim"
-msgstr "Nitzavim"
-
-#: plugins/hebrew/parsha.cpp:49
-msgid "Vayelech"
-msgstr "Vayelech"
+"<qt>"
+"<p>Press this button to add a resource to KOrganizer.</p>"
+"<p>Events, journal entries and to-dos are retrieved and stored on resources. "
+"Available resources include groupware servers, local files, journal entries as "
+"blogs on a server, etc... </p>"
+"<p>If you have more than one active resource, when creating incidents you will "
+"either automatically use the default resource or be prompted to select the "
+"resource to use.</p></qt>"
+msgstr ""
 
-#: plugins/hebrew/parsha.cpp:50
-msgid "Haazinu"
-msgstr "Haazinu"
+#: resourceview.cpp:292
+#, fuzzy
+msgid "Edit calendar settings"
+msgstr "编辑日历过滤"
 
-#: plugins/hebrew/holiday.cpp:63
+#: resourceview.cpp:294
 msgid ""
-"_: These are Jewish holidays and mostly do not have translations. They may have "
-"different spellings in your language; otherwise, just translate the sound to "
-"your characters\n"
-"Sh. HaHodesh"
-msgstr "Sh. HaHodesh"
-
-#: plugins/hebrew/holiday.cpp:69
-msgid "Erev Pesach"
-msgstr "Erev Pesach"
-
-#: plugins/hebrew/holiday.cpp:79
-msgid "Sh. HaGadol"
-msgstr "Sh. HaGadol"
-
-#: plugins/hebrew/holiday.cpp:87
-msgid "Pesach"
-msgstr "Pesach"
-
-#: plugins/hebrew/holiday.cpp:98 plugins/hebrew/holiday.cpp:262
-msgid "Chol Hamoed"
-msgstr "Chol Hamoed"
-
-#: plugins/hebrew/holiday.cpp:103
-msgid "Yom HaShoah"
-msgstr "Yom HaShoah"
-
-#: plugins/hebrew/holiday.cpp:127 plugins/hebrew/holiday.cpp:133
-#: plugins/hebrew/holiday.cpp:144
-msgid "Yom HaAtzmaut"
-msgstr "Yom HaAtzmaut"
-
-#: plugins/hebrew/holiday.cpp:129 plugins/hebrew/holiday.cpp:142
-msgid "Yom HaZikaron"
-msgstr "Yom HaZikaron"
-
-#: plugins/hebrew/holiday.cpp:151
-msgid "Yom Yerushalayim"
-msgstr "Yom Yerushalayim"
-
-#: plugins/hebrew/holiday.cpp:154
-msgid "Lag BaOmer"
-msgstr "Lag BaOmer"
-
-#: plugins/hebrew/holiday.cpp:179
-msgid "Erev Shavuot"
-msgstr "Erev Shavuot"
-
-#: plugins/hebrew/holiday.cpp:184
-msgid "Shavuot"
-msgstr "Shavuot"
-
-#: plugins/hebrew/holiday.cpp:193
-msgid "Tzom Tammuz"
-msgstr "Tzom Tammuz"
-
-#: plugins/hebrew/holiday.cpp:200
-msgid "Sh. Hazon"
-msgstr "Sh. Hazon"
-
-#: plugins/hebrew/holiday.cpp:202
-msgid "Sh. Nahamu"
-msgstr "Sh. Nahamu"
-
-#: plugins/hebrew/holiday.cpp:206
-msgid "Tisha B'Av"
-msgstr "Tisha B'Av"
-
-#: plugins/hebrew/holiday.cpp:211
-msgid "S'lichot"
-msgstr "S'lichot"
-
-#: plugins/hebrew/holiday.cpp:213
-msgid "Erev R.H."
-msgstr "Erev R.H."
-
-#: plugins/hebrew/holiday.cpp:221
-msgid "Rosh Hashana"
-msgstr "Rosh Hashana"
-
-#: plugins/hebrew/holiday.cpp:225 plugins/hebrew/holiday.cpp:238
-msgid "Sh. Shuvah"
-msgstr "Sh. Shuvah"
-
-#: plugins/hebrew/holiday.cpp:227 plugins/hebrew/holiday.cpp:231
-msgid "Tzom Gedalia"
-msgstr "Tzom Gedalia"
-
-#: plugins/hebrew/holiday.cpp:241
-msgid "Erev Y.K."
-msgstr "Erev Y.K."
-
-#: plugins/hebrew/holiday.cpp:244
-msgid "Yom Kippur"
-msgstr "Yom Kippur"
-
-#: plugins/hebrew/holiday.cpp:247
-msgid "Erev Sukkot"
-msgstr "Erev Sukkot"
-
-#: plugins/hebrew/holiday.cpp:253
-msgid "Sukkot"
-msgstr "Sukkot"
+"Press this button to edit the resource currently selected on the KOrganizer "
+"resources list above."
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:265
-msgid "Hoshana Rabah"
-msgstr "Hoshana Rabah"
+#: resourceview.cpp:299
+#, fuzzy
+msgid "Remove calendar"
+msgstr "激活的日历"
 
-#: plugins/hebrew/holiday.cpp:268
-msgid "Shmini Atzeret"
-msgstr "Shmini Atzeret"
+#: resourceview.cpp:301
+msgid ""
+"Press this button to delete the resource currently selected on the KOrganizer "
+"resources list above."
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:272
-msgid "Simchat Torah"
-msgstr "Simchat Torah"
+#: resourceview.cpp:309
+msgid ""
+"<qt>"
+"<p>Select on this list the active KOrganizer resources. Check the resource box "
+"to make it active. Press the \"Add...\" button below to add new resources to "
+"the list.</p>"
+"<p>Events, journal entries and to-dos are retrieved and stored on resources. "
+"Available resources include groupware servers, local files, journal entries as "
+"blogs on a server, etc...</p>"
+"<p>If you have more than one active resource, when creating incidents you will "
+"either automatically use the default resource or be prompted to select the "
+"resource to use.</p></qt>"
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:281
-msgid "Erev Hanukah"
-msgstr "Erev Hanukah"
+#: resourceview.cpp:370
+#, fuzzy
+msgid "Add Subresource"
+msgstr "%1 资源"
 
-#: plugins/hebrew/holiday.cpp:283 plugins/hebrew/holiday.cpp:289
-msgid "Hanukah"
-msgstr "Hanukah"
+#: resourceview.cpp:371
+#, fuzzy
+msgid "Please enter a name for the new subresource"
+msgstr "请输入新模板的名称："
 
-#: plugins/hebrew/holiday.cpp:293
-msgid "Tzom Tevet"
-msgstr "Tzom Tevet"
+#: resourceview.cpp:379
+#, fuzzy
+msgid "<qt>Unable to create subresource <b>%1</b>.</qt>"
+msgstr "<qt>无法创建<b>%1</b>类型的资源。</qt>"
 
-#: plugins/hebrew/holiday.cpp:304 plugins/hebrew/holiday.cpp:312
-#: plugins/hebrew/holiday.cpp:316 plugins/hebrew/holiday.cpp:320
-msgid "Sh. Shirah"
-msgstr "Sh. Shirah"
+#: resourceview.cpp:387
+msgid "Resource Configuration"
+msgstr "资源配置"
 
-#: plugins/hebrew/holiday.cpp:317
-msgid "Tu B'Shvat"
-msgstr "Tu B'Shvat"
+#: resourceview.cpp:388
+msgid "Please select type of the new resource:"
+msgstr "请选择新资源的类型："
 
-#: plugins/hebrew/holiday.cpp:330 plugins/hebrew/holiday.cpp:341
-#: plugins/hebrew/holiday.cpp:349
-msgid "Sh. Shekalim"
-msgstr "Sh. Shekalim"
+#: resourceview.cpp:401
+msgid "<qt>Unable to create resource of type <b>%1</b>.</qt>"
+msgstr "<qt>无法创建<b>%1</b>类型的资源。</qt>"
 
-#: plugins/hebrew/holiday.cpp:338
-msgid "Purim Katan"
-msgstr "Purim Katan"
+#: resourceview.cpp:417
+msgid "Unable to create the resource."
+msgstr "无法创建资源。"
 
-#: plugins/hebrew/holiday.cpp:356 plugins/hebrew/holiday.cpp:373
-msgid "Ta'anit Ester"
-msgstr "Ta'anit Ester"
+#: resourceview.cpp:542
+msgid ""
+"<qt>You may not delete your standard calendar resource."
+"<p>You can change the standard calendar resource in the Trinity Control Center "
+"using the TDE Resource settings under the TDE Components area.</qt>"
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:364 plugins/hebrew/holiday.cpp:368
-msgid "Sh. Zachor"
-msgstr "Sh. Zachor"
+#: resourceview.cpp:552
+msgid ""
+"This is a groupware folder so you can always re-subscribe to the folder later "
+"as you desire."
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:370
-msgid "Erev Purim"
-msgstr "Erev Purim"
+#: resourceview.cpp:555
+msgid ""
+"The contents will not be removed so you can always re-add this calendar later "
+"as you desire."
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:376
-msgid "Purim"
-msgstr "Purim"
+#: resourceview.cpp:562
+#, fuzzy
+msgid ""
+"<qt>Do you really want to remove the calendar <b>%1</b>?"
+"<p><b>Note:</b> %2</qt>"
+msgstr "<qt>您真的想要删除资源<b>%1</b>吗？</qt>"
 
-#: plugins/hebrew/holiday.cpp:380 plugins/hebrew/holiday.cpp:384
-msgid "Shushan Purim"
-msgstr "Shushan Purim"
+#: resourceview.cpp:573
+msgid ""
+"<qt>Failed to remove the subresource <b>%1</b>. The reason could be that it is "
+"a built-in one which cannot be removed, or that the removal of the underlying "
+"storage folder failed.</qt>"
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:394
-msgid "Sh. Parah"
-msgstr "Sh. Parah"
+#: resourceview.cpp:601
+msgid "Cannot rename someone else's calendar folder."
+msgstr ""
 
-#: plugins/hebrew/holiday.cpp:403
-msgid "Sh. HaHodesh"
-msgstr "Sh. HaHodesh"
+#: resourceview.cpp:609
+#, fuzzy
+msgid "Rename Subresource"
+msgstr "%1 资源"
 
-#: plugins/hebrew/holiday.cpp:428
-msgid " Omer"
-msgstr " Omer"
+#: resourceview.cpp:610
+msgid ""
+"<qt>Enter a new name for the subresource"
+"<p><b>Note:</b> the new name will take affect after the next sync.</qt>"
+msgstr ""
 
-#: plugins/hebrew/configdialog.cpp:29
-msgid "Configure Holidays"
-msgstr "配置假日"
+#: resourceview.cpp:622
+msgid ""
+"Communication with KMail failed when attempting to change the folder name."
+msgstr ""
 
-#: plugins/hebrew/configdialog.cpp:37
-msgid "Use Israeli holidays"
-msgstr "使用伊斯兰假日"
+#: resourceview.cpp:635
+#, fuzzy
+msgid "<qt>Cannot edit the subresource <b>%1</b>.</qt>"
+msgstr "<qt>无法创建<b>%1</b>类型的资源。</qt>"
 
-#: plugins/hebrew/configdialog.cpp:41
-msgid "Show weekly parsha"
-msgstr "显示每周 Parsha"
+#: resourceview.cpp:691
+msgid "Re&load"
+msgstr "重新装入(&L)"
 
-#: plugins/hebrew/configdialog.cpp:45
-msgid "Show day of Omer"
-msgstr "显示 Omer 日"
+#: resourceview.cpp:699
+msgid "Show &Info"
+msgstr "显示信息(&I)"
 
-#: plugins/hebrew/configdialog.cpp:49
-msgid "Show Chol HaMoed"
-msgstr "显示 Chol HaMoed"
+#: resourceview.cpp:703
+msgid "&Assign Color"
+msgstr "指派颜色(&A)"
 
-#: plugins/hebrew/hebrew.cpp:103
-msgid "This plugin provides the date in the Jewish calendar."
-msgstr "这个插件提供了犹太教日历中的日期。"
+#: resourceview.cpp:705
+msgid "&Disable Color"
+msgstr "禁用颜色(&D)"
 
-#: plugins/timespanview/timespanview.cpp:54
-msgid "&Timespan"
-msgstr "时间长度(&T)"
+#: resourceview.cpp:706
+msgid "Resources Colors"
+msgstr "资源颜色"
 
-#: plugins/timespanview/timespanview.cpp:64
-msgid "This plugin provides a Gantt-like Timespan view."
-msgstr "这个插件提供类似甘特图的时间跨度视图。"
+#: resourceview.cpp:712
+#, fuzzy
+msgid "&Rename..."
+msgstr "删除(&R)..."
 
-#: plugins/timespanview/timespanview.cpp:69
-msgid "Timespan View Plugin"
-msgstr "时间跨图视图插件"
+#: resourceview.cpp:720
+msgid "Use as &Default Calendar"
+msgstr "用作默认日历(&D)"
 
-#: plugins/timespanview/timespanwidget.cpp:73
-msgid "Center View"
-msgstr "视图放中间"
+#: resourceview.cpp:726
+msgid "&Add..."
+msgstr "添加(&A)..."
 
-#: plugins/printing/list/listprint.h:42
-msgid "Print list"
-msgstr "打印列表"
+#: koincidenceeditor.cpp:75
+msgid "&Templates..."
+msgstr "模板(&T)..."
 
-#: plugins/printing/list/listprint.h:43
-msgid "Prints a list of events and to-dos"
-msgstr "打印事件和待办列表"
+#: koincidenceeditor.cpp:88
+msgid "Atte&ndees"
+msgstr "出席者(&N)"
 
-#: plugins/printing/year/yearprint.cpp:176
+#: koincidenceeditor.cpp:90
 msgid ""
-"_: date from -\n"
-"to\n"
-"%1 -\n"
-"%2"
-msgstr "%1 - %2"
+"The Attendees tab allows you to Add or Remove Attendees to/from this event or "
+"to-do."
+msgstr ""
 
-#: plugins/printing/year/yearprint.h:42
-msgid "Print &Year"
-msgstr "打印全年(&Y)"
+#: koincidenceeditor.cpp:174
+msgid "Unable to find template '%1'."
+msgstr "找不到模板“%1”。"
 
-#: plugins/printing/year/yearprint.h:43
-msgid "Prints a calendar for an entire year"
-msgstr "打印整年的日历"
+#: koincidenceeditor.cpp:179
+msgid "Error loading template file '%1'."
+msgstr "载入模板文件“%1”时发生错误。"
 
-#: plugins/printing/journal/journalprint.h:43
-msgid "Print &journal"
-msgstr "打印日记(&J)"
+#: koincidenceeditor.cpp:394 koincidenceeditor.cpp:395
+#, fuzzy
+msgid "Create to-do"
+msgstr "删除待办事宜"
 
-#: plugins/printing/journal/journalprint.h:44
-msgid "Prints all journals for a given date range"
-msgstr "打印给定日期范围中的全部日记"
+#: koincidenceeditor.cpp:404 koincidenceeditor.cpp:405
+msgid "Counter proposal"
+msgstr ""
 
-#: plugins/printing/journal/journalprint.cpp:126
-msgid "Journal entries"
-msgstr "日记项"
+#: stdcalendar.cpp:74
+msgid "Active Calendar"
+msgstr "激活的日历"
 
-#: plugins/printing/whatsnext/whatsnextprint.h:42
-msgid "Print What's Next"
-msgstr "打印下面什么事"
+#: stdcalendar.cpp:83
+msgid "Default Calendar"
+msgstr "默认日历"
 
-#: plugins/printing/whatsnext/whatsnextprint.h:43
-msgid "Prints a list of all upcoming events and todos."
-msgstr "打印即将到来的事件和待办。"
+#: stdcalendar.cpp:98
+msgid "Birthdays"
+msgstr "生日"
 
-#: plugins/exchange/exchange.cpp:109 plugins/exchange/exchange.cpp:145
-#: plugins/exchange/exchange.cpp:148 plugins/exchange/exchange.cpp:164
-#: plugins/exchange/exchange.cpp:168 plugins/exchange/exchange.cpp:222
-#: plugins/exchange/exchange.cpp:224 plugins/exchange/exchangeconfig.cpp:35
-#: plugins/exchange/exchangedialog.cpp:34
-msgid "Exchange Plugin"
-msgstr "Exchange 插件"
+#~ msgid "Location: %1"
+#~ msgstr "位置：%1"
 
-#: plugins/exchange/exchangeconfig.cpp:46
-msgid "Exchange server:"
-msgstr "Exchange 服务器："
+#~ msgid ""
+#~ "The meeting has been moved to\n"
+#~ "Start: %1\n"
+#~ "End: %2."
+#~ msgstr ""
+#~ "此会议已被移动到\n"
+#~ "开始：%1\n"
+#~ "结束：%2。"
 
-#: plugins/exchange/exchangeconfig.cpp:50
-msgid "Port:"
-msgstr "端口："
+#~ msgid "&Add"
+#~ msgstr "添加(&A)"
 
-#: plugins/exchange/exchangeconfig.cpp:54
-msgid "User:"
-msgstr "用户："
+#~ msgid "1 minute"
+#~ msgstr "1 分钟"
 
-#: plugins/exchange/exchangeconfig.cpp:63
-msgid "Determine mailbox automatically"
-msgstr "自动确定邮箱"
+#~ msgid "5 minutes"
+#~ msgstr "5 分钟"
 
-#: plugins/exchange/exchangeconfig.cpp:68
-msgid "Mailbox URL:"
-msgstr "邮箱 URL："
+#~ msgid "10 minutes"
+#~ msgstr "10 分钟"
 
-#: plugins/exchange/exchangedialog.cpp:39
-msgid "Start date:"
-msgstr "起始日期："
+#~ msgid "15 minutes"
+#~ msgstr "15 分钟"
 
-#: plugins/exchange/exchangedialog.cpp:46
-msgid "End date:"
-msgstr "结束日期："
+#~ msgid "30 minutes"
+#~ msgstr "30 分钟"
 
-#: plugins/exchange/exchange.cpp:72
-msgid "&Download..."
-msgstr "下载(&D)..."
+#~ msgid "Enter the default reminder time here."
+#~ msgstr "在此输入默认提醒时间。"
 
-#: plugins/exchange/exchange.cpp:75
-msgid "&Upload Event..."
-msgstr "上传事件(&U)..."
+#~ msgid "Owner:"
+#~ msgstr "所有者："
 
-#: plugins/exchange/exchange.cpp:83
-msgid "De&lete Event"
-msgstr "删除事件(&L)"
+#, fuzzy
+#~ msgid "No reminders configured"
+#~ msgstr "配置了 1 个提前提醒"
 
-#: plugins/exchange/exchange.cpp:89
-msgid "&Configure..."
-msgstr "配置(&C)..."
+#~ msgid "&Reminder:"
+#~ msgstr "提醒(&R)："
 
-#: plugins/exchange/exchange.cpp:104
-msgid ""
-"This plugin imports and export calendar events from/to a Microsoft Exchange "
-"2000 Server."
-msgstr "这个插件从 Microsoft Exchange 2000 服务器导入与导出日历事件。"
+#~ msgid "Advanced"
+#~ msgstr "提前"
 
-#: plugins/exchange/exchange.cpp:145 plugins/exchange/exchange.cpp:164
-msgid "Please select an appointment."
-msgstr "请选择一个约会。"
+#~ msgid "Owner: "
+#~ msgstr "所有者："
 
-#: plugins/exchange/exchange.cpp:148
-msgid "Exchange Upload is EXPERIMENTAL, you may lose data on this appointment!"
-msgstr "Exchange 上传是实验性的，您可能丢失这个约会的数据！"
+#~ msgid ""
+#~ "_n: 1 advanced reminder configured\n"
+#~ "%n advanced reminders configured"
+#~ msgstr "配置了 %n 个高级提醒"
 
-#: plugins/exchange/exchange.cpp:148
-msgid "&Upload"
-msgstr "上传(&U)"
+#~ msgid "co&mpleted"
+#~ msgstr "已完成(&M)"
 
-#: plugins/exchange/exchange.cpp:168
-msgid ""
-"Exchange Delete is EXPERIMENTAL, if this is a recurring event it will delete "
-"all instances!"
-msgstr "Exchange 删除是实验性的，如果这是一个重复出现的事件，则会删除所有的出现！"
+#~ msgid "event"
+#~ msgstr "事件"
 
-#: plugins/exchange/exchange.cpp:195
-msgid "No Error"
-msgstr "无错误"
-
-#: plugins/exchange/exchange.cpp:198
-msgid "The Exchange server could not be reached or returned an error."
-msgstr " Exchange 服务器无法连接或者返回错误。"
+#~ msgid "task"
+#~ msgstr "任务"
 
-#: plugins/exchange/exchange.cpp:201
-msgid "Server response could not be interpreted."
-msgstr "无法解释服务器回应。"
-
-#: plugins/exchange/exchange.cpp:204
-msgid "Appointment data could not be interpreted."
-msgstr "无法解释约会数据。"
+#~ msgid "journal entry"
+#~ msgstr "日历项"
 
-#: plugins/exchange/exchange.cpp:207
-msgid "This should not happen: trying to upload wrong type of event."
-msgstr "这不该发生：尝试上载事件的类型错误。"
+#~ msgid "You are not the organizer of this event. Deleting it will bring your calendar out of sync with the organizers calendar. Do you really want to delete it?"
+#~ msgstr "您并非此事件的组织者。删除此事件将使您的日历与组织者的日历脱离同步。您真的想要删除此事件吗？"
 
-#: plugins/exchange/exchange.cpp:210
-msgid "An error occurred trying to write an appointment to the server."
-msgstr "尝试将约会写入到服务器时发生错误。"
+#~ msgid "End Date"
+#~ msgstr "结束日期"
 
-#: plugins/exchange/exchange.cpp:213
-msgid "Trying to delete an event that is not present on the server."
-msgstr "尝试删除服务器上没有的事件。"
+#~ msgid "End Time"
+#~ msgstr "结束时间："
 
-#: plugins/exchange/exchange.cpp:217
-msgid "Unknown Error"
-msgstr "未知错误"
+#~ msgid "There are no items before %1"
+#~ msgstr "在 %1 之前没有项目"
 
-#: koagenda.cpp:906
 #, fuzzy
-msgid "Unable to lock item for modification. You cannot make any changes."
-msgstr "无法锁定对项目的修改。您无法进行任何更改。"
+#~ msgid "Dismiss all"
+#~ msgstr "全部错过"
 
-#: koagenda.cpp:908
-msgid "Locking Failed"
-msgstr "锁定失败"
+#~ msgid "Dismiss"
+#~ msgstr "错过"
 
-#: koagenda.cpp:1054
-msgid ""
-"The item you try to change is a recurring item. Shall the changes be applied "
-"only to this single occurrence, only to the future items, or to all items in "
-"the recurrence?"
-msgstr ""
+#~ msgid "Default Reminder Time"
+#~ msgstr "默认提醒时间"
 
-#: koagenda.cpp:1057
-msgid "Changing Recurring Item"
-msgstr "更改重现项目"
+#~ msgid "Enter the reminder time here."
+#~ msgstr "在此输入默认提醒时间。"
 
-#: koagenda.cpp:1058
-msgid "Only &This Item"
-msgstr "只有本次(&T)"
+#~ msgid "Month view uses category colors"
+#~ msgstr "月视图使用类别颜色"
 
-#: koagenda.cpp:1058
-msgid "Only &Future Items"
-msgstr "只有未来(&F)"
+#, fuzzy
+#~ msgid "Check this box to make the month view use the category colors of an item."
+#~ msgstr "在 Marcus Bains 线上显示秒数"
 
-#: koagenda.cpp:1058
-msgid "&All Occurrences"
-msgstr "每次出现(&A)"
+#, fuzzy
+#~ msgid "Month view uses resource colors"
+#~ msgstr "月视图使用类别颜色"
 
-#: koagenda.cpp:1073
-msgid "Dissociate event from recurrence"
-msgstr ""
+#, fuzzy
+#~ msgid "Check this box to make the month view use the resource colors of an item."
+#~ msgstr "在 Marcus Bains 线上显示秒数"
 
-#: koagenda.cpp:1087
-msgid ""
-"Unable to add the exception item to the calendar. No change will be done."
-msgstr "无法将例外项目添加到日历。未更改。"
+#~ msgid "Default event color"
+#~ msgstr "默认事件颜色"
 
-#: koagenda.cpp:1088 koagenda.cpp:1115
-msgid "Error Occurred"
-msgstr "发生了错误"
+#, fuzzy
+#~ msgid "The selected items will be permanently deleted."
+#~ msgstr "该项目将被永久地删除。"
 
-#: koagenda.cpp:1101
-msgid "Split future recurrences"
-msgstr "拆分未来的重现"
+#~ msgid "%1 resource"
+#~ msgstr "%1 资源"
 
-#: koagenda.cpp:1114
-msgid "Unable to add the future items to the calendar. No change will be done."
-msgstr "无法将未来的项目添加到日历。未更改。"
+#~ msgid "You cannot delete your standard resource."
+#~ msgstr "您不能删除您的标准资源。"
+
+#~ msgid "Rec&urrence"
+#~ msgstr "重现(&U)"
diff --git a/tde-i18n-zh_CN/messages/tdepim/korn.po b/tde-i18n-zh_CN/messages/tdepim/korn.po
index 5a0c4c12f37..6263501b804 100644
--- a/tde-i18n-zh_CN/messages/tdepim/korn.po
+++ b/tde-i18n-zh_CN/messages/tdepim/korn.po
@@ -6,15 +6,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: korn\n"
-"POT-Creation-Date: 2008-07-08 01:22+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-02-22 17:47+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Translator: Wang Jian <lark@linux.net.cn>\n"
 
+#: maildir_proto.h:47 qmail_proto.cpp:38 qmail_proto.h:50
+msgid "Path:"
+msgstr "路径："
+
+#: mbox_proto.cpp:37 mbox_proto.h:44
+msgid "File:"
+msgstr "文件："
+
+#: process_proto.h:40
+msgid "Program: "
+msgstr "程序："
+
 #: tdeio_proto.h:97
 msgid "Server:"
 msgstr "服务器："
@@ -35,7 +48,7 @@ msgstr "邮箱："
 msgid "Password:"
 msgstr "密码："
 
-#: imap_proto.cpp:59 tdeio_proto.h:102 nntp_proto.cpp:43 pop3_proto.cpp:58
+#: imap_proto.cpp:59 nntp_proto.cpp:43 pop3_proto.cpp:58 tdeio_proto.h:102
 msgid "Save password"
 msgstr "保存密码"
 
@@ -43,18 +56,6 @@ msgstr "保存密码"
 msgid "Authentication:"
 msgstr "身份验证："
 
-#: maildir_proto.h:47 qmail_proto.cpp:38 qmail_proto.h:50
-msgid "Path:"
-msgstr "路径："
-
-#: mbox_proto.cpp:37 mbox_proto.h:44
-msgid "File:"
-msgstr "文件："
-
-#: process_proto.h:40
-msgid "Program: "
-msgstr "程序："
-
 #: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -163,59 +164,6 @@ msgstr "密码"
 msgid "Authentication"
 msgstr "身份验证"
 
-#: tdeio.cpp:211
-msgid "url is not valid"
-msgstr "URL 无效"
-
-#: tdeio_count.cpp:89 tdeio_count.cpp:90
-#, c-format
-msgid "Not able to open a tdeio slave for %1."
-msgstr "无法打开 %1 的 tdeio slave。"
-
-#: tdeio_count.cpp:204 tdeio_count.cpp:254
-msgid "Got unknown job; something must be wrong..."
-msgstr "获得了未知任务；可能发生了错误..."
-
-#: tdeio_count.cpp:210 tdeio_count.cpp:211
-#, c-format
-msgid "The next TDEIO-error occurred by counting: %1"
-msgstr ""
-
-#: tdeio_delete.cpp:110
-msgid "Could not get a connected slave; I cannot delete this way..."
-msgstr ""
-
-#: tdeio_delete.cpp:185
-#, c-format
-msgid "An error occurred when deleting email: %1."
-msgstr ""
-
-#: tdeio_read.cpp:77 tdeio_read.cpp:91
-msgid "Unknown job returned; I will try if this one will do... "
-msgstr ""
-
-#: tdeio_read.cpp:80
-#, c-format
-msgid "An error occurred when fetching the requested email: %1."
-msgstr ""
-
-#: tdeio_single_subject.cpp:128 tdeio_single_subject.cpp:137
-msgid "Got invalid job; something strange happened?"
-msgstr ""
-
-#: tdeio_single_subject.cpp:141
-msgid "Error when fetching %1: %2"
-msgstr ""
-
-#: tdeio_subjects.cpp:66
-msgid "Already a slave pending."
-msgstr ""
-
-#: tdeio_subjects.cpp:104 tdeio_subjects.cpp:105
-#, c-format
-msgid "Not able to open a tdeio-slave for %1."
-msgstr ""
-
 #: kmail_proto.cpp:199
 msgid "KMail name"
 msgstr "KMail 名称"
@@ -601,3 +549,56 @@ msgstr "确认"
 #: subjectsdlg.cpp:427
 msgid "Deleting mail; please wait...."
 msgstr "正在删除邮件；请稍候..."
+
+#: tdeio.cpp:211
+msgid "url is not valid"
+msgstr "URL 无效"
+
+#: tdeio_count.cpp:89 tdeio_count.cpp:90
+#, c-format
+msgid "Not able to open a tdeio slave for %1."
+msgstr "无法打开 %1 的 tdeio slave。"
+
+#: tdeio_count.cpp:204 tdeio_count.cpp:254
+msgid "Got unknown job; something must be wrong..."
+msgstr "获得了未知任务；可能发生了错误..."
+
+#: tdeio_count.cpp:210 tdeio_count.cpp:211
+#, c-format
+msgid "The next TDEIO-error occurred by counting: %1"
+msgstr ""
+
+#: tdeio_delete.cpp:110
+msgid "Could not get a connected slave; I cannot delete this way..."
+msgstr ""
+
+#: tdeio_delete.cpp:185
+#, c-format
+msgid "An error occurred when deleting email: %1."
+msgstr ""
+
+#: tdeio_read.cpp:77 tdeio_read.cpp:91
+msgid "Unknown job returned; I will try if this one will do... "
+msgstr ""
+
+#: tdeio_read.cpp:80
+#, c-format
+msgid "An error occurred when fetching the requested email: %1."
+msgstr ""
+
+#: tdeio_single_subject.cpp:128 tdeio_single_subject.cpp:137
+msgid "Got invalid job; something strange happened?"
+msgstr ""
+
+#: tdeio_single_subject.cpp:141
+msgid "Error when fetching %1: %2"
+msgstr ""
+
+#: tdeio_subjects.cpp:66
+msgid "Already a slave pending."
+msgstr ""
+
+#: tdeio_subjects.cpp:104 tdeio_subjects.cpp:105
+#, c-format
+msgid "Not able to open a tdeio-slave for %1."
+msgstr ""
diff --git a/tde-i18n-zh_CN/messages/tdepim/kres_birthday.po b/tde-i18n-zh_CN/messages/tdepim/kres_birthday.po
index 9c0952c9599..535b6a1a826 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kres_birthday.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kres_birthday.po
@@ -4,47 +4,53 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kres_birthday\n"
-"POT-Creation-Date: 2005-12-15 03:11+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-08-03 22:24+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: resourcekabc.cpp:168
+#: resourcetdeabc.cpp:76
+#, fuzzy
+msgid "Birthdays"
+msgstr "生日"
+
+#: resourcetdeabc.cpp:172
 msgid "%1's birthday"
 msgstr "%1 的生日"
 
-#: resourcekabc.cpp:209
+#: resourcetdeabc.cpp:213
 msgid "Birthday"
 msgstr "生日"
 
-#: resourcekabc.cpp:267
+#: resourcetdeabc.cpp:279
 msgid ""
 "_: insert names of both spouses\n"
 "%1's & %2's anniversary"
 msgstr "%1 和 %2 的纪念日"
 
-#: resourcekabc.cpp:269
+#: resourcetdeabc.cpp:282
 msgid ""
 "_: only one spouse in addressbook, insert the name\n"
 "%1's anniversary"
 msgstr "%1 的纪念日"
 
-#: resourcekabc.cpp:314
+#: resourcetdeabc.cpp:327
 msgid "Anniversary"
 msgstr "纪念日"
 
-#: resourcekabcconfig.cpp:41
+#: resourcetdeabcconfig.cpp:41
 msgid "Set reminder"
 msgstr "设定提醒"
 
-#: resourcekabcconfig.cpp:45
+#: resourcetdeabcconfig.cpp:45
 msgid "Reminder before (in days):"
 msgstr "提醒提前天数："
 
-#: resourcekabcconfig.cpp:55
+#: resourcetdeabcconfig.cpp:55
 msgid "Filter by categories"
 msgstr "按类别过滤"
 
diff --git a/tde-i18n-zh_CN/messages/tdepim/kres_blogging.po b/tde-i18n-zh_CN/messages/tdepim/kres_blogging.po
index dd29b52c94f..cf60c75c398 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kres_blogging.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kres_blogging.po
@@ -4,14 +4,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kres_blogging\n"
-"POT-Creation-Date: 2005-02-02 01:26+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-02-04 02:36+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: kcal_resourceblogging.cpp:44
+msgid "Blogs"
+msgstr ""
+
 #: kcal_resourcebloggingconfig.cpp:35
 msgid ""
 "Currently, the blogging resource is only read-only. You will not be able to add "
diff --git a/tde-i18n-zh_CN/messages/tdepim/kres_exchange.po b/tde-i18n-zh_CN/messages/tdepim/kres_exchange.po
index 0c33b1775b2..32be0f87719 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kres_exchange.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kres_exchange.po
@@ -1,14 +1,19 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kres_exchange\n"
-"POT-Creation-Date: 2006-03-25 04:00+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-08-05 11:34+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: resourceexchange.cpp:94
+msgid "Exchange Server"
+msgstr ""
+
 #: resourceexchangeconfig.cpp:42
 msgid "Host:"
 msgstr "主机："
diff --git a/tde-i18n-zh_CN/messages/tdepim/kres_featureplan.po b/tde-i18n-zh_CN/messages/tdepim/kres_featureplan.po
index e1444ff0b1d..b359df5cfeb 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kres_featureplan.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kres_featureplan.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kres_featureplan\n"
-"POT-Creation-Date: 2005-01-16 01:25+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-02-04 02:36+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdepim/kres_groupware.po b/tde-i18n-zh_CN/messages/tdepim/kres_groupware.po
index d7e45994514..a13654ae7e6 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kres_groupware.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kres_groupware.po
@@ -4,90 +4,95 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kres_groupware\n"
-"POT-Creation-Date: 2005-08-18 04:31+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-08-04 09:56+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tdeabc_resourcegroupware.cpp:253
-msgid "Downloading addressbook"
-msgstr "下载地址簿"
-
-#: tdeabc_resourcegroupwareconfig.cpp:66 kcal_resourcegroupwareconfig.cpp:47
-msgid "URL:"
-msgstr "URL："
-
-#: tdeabc_resourcegroupwareconfig.cpp:72 kcal_resourcegroupwareconfig.cpp:52
-msgid "User:"
-msgstr "用户："
-
-#: tdeabc_resourcegroupwareconfig.cpp:78 kcal_resourcegroupwareconfig.cpp:57
-msgid "Password:"
-msgstr "密码："
-
-#: tdeabc_resourcegroupwareconfig.cpp:90
-msgid "Retrieve Address Book List From Server"
-msgstr "从服务器获取地址簿列表"
-
-#: tdeabc_resourcegroupwareconfig.cpp:94
-msgid "Address Book"
-msgstr "地址簿"
-
-#: tdeabc_resourcegroupwareconfig.cpp:96
-msgid "Personal"
-msgstr "个人"
-
-#: tdeabc_resourcegroupwareconfig.cpp:97
-msgid "Frequent Contacts"
-msgstr "常见联系人"
-
-#: tdeabc_resourcegroupwareconfig.cpp:103
-msgid "Address book for new contacts:"
-msgstr "新联系人的地址簿："
+#: kcal_resourcegroupware.cpp:68 tdeabc_resourcegroupware.cpp:47
+msgid "Groupware Server"
+msgstr ""
 
-#: kcal_resourcegroupware.cpp:164
+#: kcal_resourcegroupware.cpp:168
 msgid "Downloading calendar"
 msgstr "下载日历"
 
-#: kcal_resourcegroupware.cpp:189
+#: kcal_resourcegroupware.cpp:193
 msgid "Error parsing calendar data."
 msgstr "分析日历数据出错。"
 
-#: kcal_resourcegroupware.cpp:279
+#: kcal_resourcegroupware.cpp:283
 msgid "Added"
 msgstr "已添加"
 
-#: kcal_resourcegroupware.cpp:280
+#: kcal_resourcegroupware.cpp:284
 msgid "Changed"
 msgstr "已更改"
 
-#: kcal_resourcegroupware.cpp:281
+#: kcal_resourcegroupware.cpp:285
 msgid "Deleted"
 msgstr "已删除"
 
-#. i18n: file tderesources_tdeabc_groupware.kcfg line 9
-#: rc.cpp:3 rc.cpp:12
+#: kcal_resourcegroupwareconfig.cpp:47 tdeabc_resourcegroupwareconfig.cpp:66
+msgid "URL:"
+msgstr "URL："
+
+#: kcal_resourcegroupwareconfig.cpp:52 tdeabc_resourcegroupwareconfig.cpp:72
+msgid "User:"
+msgstr "用户："
+
+#: kcal_resourcegroupwareconfig.cpp:57 tdeabc_resourcegroupwareconfig.cpp:78
+msgid "Password:"
+msgstr "密码："
+
+#. i18n: file tderesources_kcal_groupware.kcfg line 9
+#: rc.cpp:3 rc.cpp:15
 #, no-c-format
 msgid "Server URL"
 msgstr "服务器 URL"
 
-#. i18n: file tderesources_tdeabc_groupware.kcfg line 12
-#: rc.cpp:6 rc.cpp:15
+#. i18n: file tderesources_kcal_groupware.kcfg line 12
+#: rc.cpp:6 rc.cpp:18
 #, no-c-format
 msgid "User Name"
 msgstr "用户名"
 
-#. i18n: file tderesources_tdeabc_groupware.kcfg line 15
-#: rc.cpp:9 rc.cpp:18
+#. i18n: file tderesources_kcal_groupware.kcfg line 15
+#: rc.cpp:9 rc.cpp:21
 #, no-c-format
 msgid "Password"
 msgstr "密码"
 
 #. i18n: file tderesources_kcal_groupware.kcfg line 18
-#: rc.cpp:21
+#: rc.cpp:12
 #, no-c-format
 msgid "TCP Port"
 msgstr "TCP 端口"
+
+#: tdeabc_resourcegroupware.cpp:255
+msgid "Downloading addressbook"
+msgstr "下载地址簿"
+
+#: tdeabc_resourcegroupwareconfig.cpp:90
+msgid "Retrieve Address Book List From Server"
+msgstr "从服务器获取地址簿列表"
+
+#: tdeabc_resourcegroupwareconfig.cpp:94
+msgid "Address Book"
+msgstr "地址簿"
+
+#: tdeabc_resourcegroupwareconfig.cpp:96
+msgid "Personal"
+msgstr "个人"
+
+#: tdeabc_resourcegroupwareconfig.cpp:97
+msgid "Frequent Contacts"
+msgstr "常见联系人"
+
+#: tdeabc_resourcegroupwareconfig.cpp:103
+msgid "Address book for new contacts:"
+msgstr "新联系人的地址簿："
diff --git a/tde-i18n-zh_CN/messages/tdepim/kres_groupwise.po b/tde-i18n-zh_CN/messages/tdepim/kres_groupwise.po
index de978ba7cd7..fafe31137c5 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kres_groupwise.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kres_groupwise.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kres_groupwise\n"
-"POT-Creation-Date: 2007-08-02 01:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-08-04 09:56+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,55 +25,6 @@ msgid ""
 "Your emails"
 msgstr "i18n-translation@lists.linux.net.cn"
 
-#: tdeabc_resourcegroupwise.cpp:290
-#, c-format
-msgid "Loading GroupWise resource %1"
-msgstr "正在装入 GroupWise 地址簿 %1"
-
-#: tdeabc_resourcegroupwise.cpp:363
-msgid "Fetching System Address Book"
-msgstr "正在获取系统地址簿"
-
-#: tdeabc_resourcegroupwise.cpp:373
-msgid "Fetching User Address Books"
-msgstr "正在获取用户地址簿"
-
-#: tdeabc_resourcegroupwise.cpp:443
-msgid "Updating System Address Book"
-msgstr "更新系统地址簿"
-
-#: tdeabc_resourcegroupwiseconfig.cpp:64 kcal_resourcegroupwiseconfig.cpp:50
-msgid "URL:"
-msgstr "URL："
-
-#: tdeabc_resourcegroupwiseconfig.cpp:70 kcal_resourcegroupwiseconfig.cpp:55
-msgid "User:"
-msgstr "用户："
-
-#: tdeabc_resourcegroupwiseconfig.cpp:76 kcal_resourcegroupwiseconfig.cpp:60
-msgid "Password:"
-msgstr "密码："
-
-#: tdeabc_resourcegroupwiseconfig.cpp:88
-msgid "Retrieve Address Book List From Server"
-msgstr "从服务器获取地址簿列表"
-
-#: tdeabc_resourcegroupwiseconfig.cpp:92
-msgid "Address Book"
-msgstr "地址簿"
-
-#: tdeabc_resourcegroupwiseconfig.cpp:93
-msgid "Personal"
-msgstr "个人"
-
-#: tdeabc_resourcegroupwiseconfig.cpp:94
-msgid "Frequent Contacts"
-msgstr "常见联系人"
-
-#: tdeabc_resourcegroupwiseconfig.cpp:99
-msgid "Address book for new contacts:"
-msgstr "新联系人的地址簿："
-
 #: kcal_resourcegroupwise.cpp:167
 msgid "Downloading calendar"
 msgstr "下载日历"
@@ -97,6 +49,18 @@ msgstr "已更改"
 msgid "Deleted"
 msgstr "已删除"
 
+#: kcal_resourcegroupwiseconfig.cpp:50 tdeabc_resourcegroupwiseconfig.cpp:64
+msgid "URL:"
+msgstr "URL："
+
+#: kcal_resourcegroupwiseconfig.cpp:55 tdeabc_resourcegroupwiseconfig.cpp:70
+msgid "User:"
+msgstr "用户："
+
+#: kcal_resourcegroupwiseconfig.cpp:60 tdeabc_resourcegroupwiseconfig.cpp:76
+msgid "Password:"
+msgstr "密码："
+
 #: kcal_resourcegroupwiseconfig.cpp:66
 msgid "View User Settings"
 msgstr "查看用户设置"
@@ -129,101 +93,138 @@ msgstr "值"
 msgid "Locked"
 msgstr "已锁定"
 
-#. i18n: file tderesources_tdeabc_groupwise.kcfg line 9
-#: rc.cpp:15 rc.cpp:60
+#. i18n: file tderesources_kcal_groupwise.kcfg line 9
+#: rc.cpp:15 rc.cpp:30
 #, no-c-format
 msgid "Server URL"
 msgstr "服务器 URL"
 
-#. i18n: file tderesources_tdeabc_groupwise.kcfg line 10
-#: rc.cpp:18 rc.cpp:63
+#. i18n: file tderesources_kcal_groupwise.kcfg line 10
+#: rc.cpp:18 rc.cpp:33
 #, no-c-format
 msgid "URL of SOAP interface of GroupWise server"
 msgstr "GroupWise 服务器的 SOAP 接口 URL"
 
-#. i18n: file tderesources_tdeabc_groupwise.kcfg line 13
-#: rc.cpp:21 rc.cpp:66
+#. i18n: file tderesources_kcal_groupwise.kcfg line 13
+#: rc.cpp:21 rc.cpp:36
 #, no-c-format
 msgid "User Name"
 msgstr "用户名"
 
-#. i18n: file tderesources_tdeabc_groupwise.kcfg line 16
-#: rc.cpp:24 rc.cpp:69 soap/soapdebug.cpp:40
+#. i18n: file tderesources_kcal_groupwise.kcfg line 16
+#: rc.cpp:24 rc.cpp:39 soap/soapdebug.cpp:40
 #, no-c-format
 msgid "Password"
 msgstr "密码"
 
-#. i18n: file tderesources_tdeabc_groupwise.kcfg line 21
+#. i18n: file tderesources_kcal_groupwise.kcfg line 19
 #: rc.cpp:27
 #, no-c-format
+msgid "TCP Port"
+msgstr "TCP 端口"
+
+#. i18n: file tderesources_tdeabc_groupwise.kcfg line 21
+#: rc.cpp:42
+#, no-c-format
 msgid "Ids of Address Books"
 msgstr "地址簿 ID"
 
 #. i18n: file tderesources_tdeabc_groupwise.kcfg line 24
-#: rc.cpp:30
+#: rc.cpp:45
 #, no-c-format
 msgid "Names of Address Books"
 msgstr "地址簿名称"
 
 #. i18n: file tderesources_tdeabc_groupwise.kcfg line 27
-#: rc.cpp:33
+#: rc.cpp:48
 #, no-c-format
 msgid "Personal State of Address Books"
 msgstr "地址簿的个人状态"
 
 #. i18n: file tderesources_tdeabc_groupwise.kcfg line 30
-#: rc.cpp:36
+#: rc.cpp:51
 #, no-c-format
 msgid "Frequent Contacts state of Address Books"
 msgstr "地址簿的常见联系人状态"
 
 #. i18n: file tderesources_tdeabc_groupwise.kcfg line 33
-#: rc.cpp:39
+#: rc.cpp:54
 #, no-c-format
 msgid "Readable Address Books"
 msgstr "可读地址簿"
 
 #. i18n: file tderesources_tdeabc_groupwise.kcfg line 36
-#: rc.cpp:42
+#: rc.cpp:57
 #, no-c-format
 msgid "Address Book for new Contacts"
 msgstr "新联系人的地址簿"
 
 #. i18n: file tderesources_tdeabc_groupwise.kcfg line 39
-#: rc.cpp:45
+#: rc.cpp:60
 #, no-c-format
 msgid "ID of System Address Book"
 msgstr "系统地址簿 ID"
 
 #. i18n: file tderesources_tdeabc_groupwise.kcfg line 42
-#: rc.cpp:48
+#: rc.cpp:63
 #, no-c-format
 msgid "Last time the Post Office was rebuilt"
 msgstr "邮局上次重建的时间"
 
 #. i18n: file tderesources_tdeabc_groupwise.kcfg line 45
-#: rc.cpp:51
+#: rc.cpp:66
 #, no-c-format
 msgid "The first sequence number of the GW System Address Book held locally"
 msgstr "本地持有的 GroupWise 系统地址簿的第一序列号"
 
 #. i18n: file tderesources_tdeabc_groupwise.kcfg line 48
-#: rc.cpp:54
+#: rc.cpp:69
 #, no-c-format
 msgid "The last sequence number of the GW System Address Book held locally"
 msgstr "本地持有的 GroupWise 系统地址簿的最后序列号"
 
 #. i18n: file tderesources_tdeabc_groupwise.kcfg line 51
-#: rc.cpp:57
+#: rc.cpp:72
 #, no-c-format
 msgid "Applications which should load the System Address Book"
 msgstr "应装入系统地址簿的应用程序"
 
-#. i18n: file tderesources_kcal_groupwise.kcfg line 19
-#: rc.cpp:72
-#, no-c-format
-msgid "TCP Port"
-msgstr "TCP 端口"
+#: tdeabc_resourcegroupwise.cpp:290
+#, c-format
+msgid "Loading GroupWise resource %1"
+msgstr "正在装入 GroupWise 地址簿 %1"
+
+#: tdeabc_resourcegroupwise.cpp:363
+msgid "Fetching System Address Book"
+msgstr "正在获取系统地址簿"
+
+#: tdeabc_resourcegroupwise.cpp:373
+msgid "Fetching User Address Books"
+msgstr "正在获取用户地址簿"
+
+#: tdeabc_resourcegroupwise.cpp:443
+msgid "Updating System Address Book"
+msgstr "更新系统地址簿"
+
+#: tdeabc_resourcegroupwiseconfig.cpp:88
+msgid "Retrieve Address Book List From Server"
+msgstr "从服务器获取地址簿列表"
+
+#: tdeabc_resourcegroupwiseconfig.cpp:92
+msgid "Address Book"
+msgstr "地址簿"
+
+#: tdeabc_resourcegroupwiseconfig.cpp:93
+msgid "Personal"
+msgstr "个人"
+
+#: tdeabc_resourcegroupwiseconfig.cpp:94
+msgid "Frequent Contacts"
+msgstr "常见联系人"
+
+#: tdeabc_resourcegroupwiseconfig.cpp:99
+msgid "Address book for new contacts:"
+msgstr "新联系人的地址簿："
 
 #: soap/contactconverter.cpp:251
 msgid "Resource"
diff --git a/tde-i18n-zh_CN/messages/tdepim/kres_kolab.po b/tde-i18n-zh_CN/messages/tdepim/kres_kolab.po
index 4f5b70cdf40..1466e04460d 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kres_kolab.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kres_kolab.po
@@ -4,88 +4,90 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kres_kolab\n"
-"POT-Creation-Date: 2008-02-29 01:41+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-01-26 16:02+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tdeabc/resourcekolab.cpp:205
-msgid "Loading contacts..."
-msgstr "正在装入联系人..."
+#: kcal/resourcekolab.cpp:77 knotes/resourcekolab.cpp:58
+#: tdeabc/resourcekolab.cpp:86
+msgid "Kolab Server"
+msgstr ""
 
-#: kcal/resourcekolab.cpp:171
+#: kcal/resourcekolab.cpp:170
 msgid "Loading tasks..."
 msgstr "正在装入任务..."
 
-#: kcal/resourcekolab.cpp:172
+#: kcal/resourcekolab.cpp:171
 msgid "Loading journals..."
 msgstr "正在装入日记..."
 
-#: kcal/resourcekolab.cpp:173
+#: kcal/resourcekolab.cpp:172
 msgid "Loading events..."
 msgstr "正在装入事件..."
 
-#: kcal/resourcekolab.cpp:376
+#: kcal/resourcekolab.cpp:426
 #, c-format
 msgid "Copy of: %1"
 msgstr "副本：%1"
 
-#: kcal/resourcekolab.cpp:525
+#: kcal/resourcekolab.cpp:598
 msgid "Choose the folder where you want to store this event"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:527
+#: kcal/resourcekolab.cpp:601
 msgid "Choose the folder where you want to store this task"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:529
+#: kcal/resourcekolab.cpp:603
 msgid "Choose the folder where you want to store this incidence"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:532
+#: kcal/resourcekolab.cpp:607
 #, c-format
 msgid "<b>Summary:</b> %1"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:534
+#: kcal/resourcekolab.cpp:609
 #, c-format
 msgid "<b>Location:</b> %1"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:537
+#: kcal/resourcekolab.cpp:612
 msgid "<b>Start:</b> %1, %2"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:540
+#: kcal/resourcekolab.cpp:615
 #, c-format
 msgid "<b>Start:</b> %1"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:546
+#: kcal/resourcekolab.cpp:621
 msgid "<b>End:</b> %1, %2"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:549
+#: kcal/resourcekolab.cpp:624
 #, c-format
 msgid "<b>End:</b> %1"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:1085
+#: kcal/resourcekolab.cpp:1247
 msgid "Calendar"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:1085
+#: kcal/resourcekolab.cpp:1247
 msgid "Tasks"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:1085
+#: kcal/resourcekolab.cpp:1247
 msgid "Journals"
 msgstr ""
 
-#: kcal/resourcekolab.cpp:1086
+#: kcal/resourcekolab.cpp:1248
 msgid "Which kind of subresource should this be?"
 msgstr ""
 
@@ -107,18 +109,50 @@ msgstr ""
 msgid "Internal kolab data: Do not delete this mail."
 msgstr "Kolab 内部数据：请不要删除此邮件。"
 
-#: shared/resourcekolabbase.cpp:230
+#: shared/resourcekolabbase.cpp:237
+msgid ""
+"You have no writable event folders so saving will not be possible.\n"
+"Please create or activate at least one writable event folder and try again."
+msgstr ""
+
+#: shared/resourcekolabbase.cpp:241
+msgid ""
+"You have no writable task folders so saving will not be possible.\n"
+"Please create or activate at least one writable task folder and try again."
+msgstr ""
+
+#: shared/resourcekolabbase.cpp:245
+msgid ""
+"You have no writable calendar folder so saving will not be possible.\n"
+"Please create or activate at least one writable calendar folder and try again."
+msgstr ""
+
+#: shared/resourcekolabbase.cpp:249
+msgid ""
+"You have no writable notes folders so saving will not be possible.\n"
+"Please create or activate at least one writable notes folder and try again."
+msgstr ""
+
+#: shared/resourcekolabbase.cpp:253
 msgid ""
-"No writable resource was found, saving will not be possible. Reconfigure KMail "
-"first."
-msgstr "没有找到可写的资源，无法保存。请先重新配置 KMail。"
+"You have no writable addressbook folder so saving will not be possible.\n"
+"Please create or activate at least one writable addressbook folder and try "
+"again."
+msgstr ""
 
-#: shared/resourcekolabbase.cpp:239
+#: shared/resourcekolabbase.cpp:268
 msgid ""
 "You have more than one writable resource folder. Please select the one you want "
 "to write to."
 msgstr "您拥有多个可写资源文件夹。请选择您想要写入的文件夹。"
 
-#: shared/resourcekolabbase.cpp:243
+#: shared/resourcekolabbase.cpp:272
 msgid "Select Resource Folder"
 msgstr "选择资源文件夹"
+
+#: tdeabc/resourcekolab.cpp:206
+msgid "Loading contacts..."
+msgstr "正在装入联系人..."
+
+#~ msgid "No writable resource was found, saving will not be possible. Reconfigure KMail first."
+#~ msgstr "没有找到可写的资源，无法保存。请先重新配置 KMail。"
diff --git a/tde-i18n-zh_CN/messages/tdepim/kres_remote.po b/tde-i18n-zh_CN/messages/tdepim/kres_remote.po
index 763c5f03b3d..caa158e0214 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kres_remote.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kres_remote.po
@@ -5,19 +5,44 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kres_remote\n"
-"POT-Creation-Date: 2007-01-26 02:44+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-08-05 11:32+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: resourceremote.cpp:203
+#: resourceremote.cpp:60
+msgid "Remote Calendar"
+msgstr ""
+
+#: resourceremote.cpp:206
 msgid "Downloading Calendar"
 msgstr "下载日历"
 
-#: resourceremote.cpp:317
+#: resourceremote.cpp:227
+msgid "Remote data access failure"
+msgstr ""
+
+#: resourceremote.cpp:227
+msgid "Detailed information"
+msgstr ""
+
+#: resourceremote.cpp:228
+msgid "What would you like to do?"
+msgstr ""
+
+#: resourceremote.cpp:230
+msgid "Remote Data Access Failure"
+msgstr ""
+
+#: resourceremote.cpp:230
+msgid "&Continue with cached resource"
+msgstr ""
+
+#: resourceremote.cpp:333
 #, c-format
 msgid "URL: %1"
 msgstr "URL：%1"
diff --git a/tde-i18n-zh_CN/messages/tdepim/kres_xmlrpc.po b/tde-i18n-zh_CN/messages/tdepim/kres_xmlrpc.po
index e72eefe3bd5..e4ca6441198 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kres_xmlrpc.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kres_xmlrpc.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kres_xmlrpc\n"
-"POT-Creation-Date: 2006-06-16 04:05+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-01-26 17:11+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -13,74 +14,79 @@ msgstr ""
 msgid "Debug Dialog"
 msgstr "调试对话框"
 
-#: tdeabc_resourcexmlrpc.cpp:297
-msgid "Login failed, please check your username and password."
-msgstr "登录失败，请检查您的用户名和密码。"
-
-#: tdeabc_resourcexmlrpc.cpp:316
-msgid "Logout failed, please check your username and password."
-msgstr "注销失败，请检查您的用户名和密码。"
-
-#: tdeabc_resourcexmlrpc.cpp:393
-msgid "<qt>Server sent error %1: <b>%2</b></qt>"
-msgstr "<qt>服务器发送错误 %1：<b>%2</b></qt>"
-
-#: tdeabc_resourcexmlrpc.cpp:407
-msgid "Unable to add contact %1 to server. (%2)"
-msgstr "无法将联系人 %1 添加到服务器。(%2)"
-
-#: tdeabc_resourcexmlrpc.cpp:416
-msgid "Unable to update contact %1 on server. (%2)"
-msgstr "无法在服务器上更新联系人 %1。(%2)"
-
-#: tdeabc_resourcexmlrpc.cpp:436
-msgid "Unable to delete contact %1 from server. (%2)"
-msgstr "无法从服务器上删除联系人 %1。(%2)"
+#: kcal_resourcexmlrpc.cpp:116 knotes_resourcexmlrpc.cpp:63
+#: tdeabc_resourcexmlrpc.cpp:70
+msgid "eGroupware Server"
+msgstr ""
 
-#: tdeabc_resourcexmlrpcconfig.cpp:41 kcal_resourcexmlrpcconfig.cpp:42
-#: knotes_resourcexmlrpcconfig.cpp:42
+#: kcal_resourcexmlrpcconfig.cpp:42 knotes_resourcexmlrpcconfig.cpp:42
+#: tdeabc_resourcexmlrpcconfig.cpp:41
 msgid "URL:"
 msgstr "URL："
 
-#: tdeabc_resourcexmlrpcconfig.cpp:47 kcal_resourcexmlrpcconfig.cpp:48
-#: knotes_resourcexmlrpcconfig.cpp:48
+#: kcal_resourcexmlrpcconfig.cpp:48 knotes_resourcexmlrpcconfig.cpp:48
+#: tdeabc_resourcexmlrpcconfig.cpp:47
 msgid "Domain:"
 msgstr "域："
 
-#: tdeabc_resourcexmlrpcconfig.cpp:53 kcal_resourcexmlrpcconfig.cpp:54
-#: knotes_resourcexmlrpcconfig.cpp:54
+#: kcal_resourcexmlrpcconfig.cpp:54 knotes_resourcexmlrpcconfig.cpp:54
+#: tdeabc_resourcexmlrpcconfig.cpp:53
 msgid "User:"
 msgstr "用户："
 
-#: tdeabc_resourcexmlrpcconfig.cpp:59 kcal_resourcexmlrpcconfig.cpp:60
-#: knotes_resourcexmlrpcconfig.cpp:60
+#: kcal_resourcexmlrpcconfig.cpp:60 knotes_resourcexmlrpcconfig.cpp:60
+#: tdeabc_resourcexmlrpcconfig.cpp:59
 msgid "Password:"
 msgstr "密码："
 
-#. i18n: file tderesources_tdeabc_egroupware.kcfg line 10
+#. i18n: file tderesources_kcal_egroupware.kcfg line 10
 #: rc.cpp:3 rc.cpp:15 rc.cpp:27
 #, no-c-format
 msgid "URL"
 msgstr "URL"
 
-#. i18n: file tderesources_tdeabc_egroupware.kcfg line 13
+#. i18n: file tderesources_kcal_egroupware.kcfg line 13
 #: rc.cpp:6 rc.cpp:18 rc.cpp:30
 #, no-c-format
 msgid "Domain"
 msgstr "域"
 
-#. i18n: file tderesources_tdeabc_egroupware.kcfg line 17
+#. i18n: file tderesources_kcal_egroupware.kcfg line 17
 #: rc.cpp:9 rc.cpp:21 rc.cpp:33
 #, no-c-format
 msgid "User Name"
 msgstr "用户名"
 
-#. i18n: file tderesources_tdeabc_egroupware.kcfg line 20
+#. i18n: file tderesources_kcal_egroupware.kcfg line 20
 #: rc.cpp:12 rc.cpp:24 rc.cpp:36
 #, no-c-format
 msgid "Password"
 msgstr "密码"
 
+#: tdeabc_resourcexmlrpc.cpp:300
+msgid "Login failed, please check your username and password."
+msgstr "登录失败，请检查您的用户名和密码。"
+
+#: tdeabc_resourcexmlrpc.cpp:319
+msgid "Logout failed, please check your username and password."
+msgstr "注销失败，请检查您的用户名和密码。"
+
+#: tdeabc_resourcexmlrpc.cpp:396
+msgid "<qt>Server sent error %1: <b>%2</b></qt>"
+msgstr "<qt>服务器发送错误 %1：<b>%2</b></qt>"
+
+#: tdeabc_resourcexmlrpc.cpp:410
+msgid "Unable to add contact %1 to server. (%2)"
+msgstr "无法将联系人 %1 添加到服务器。(%2)"
+
+#: tdeabc_resourcexmlrpc.cpp:419
+msgid "Unable to update contact %1 on server. (%2)"
+msgstr "无法在服务器上更新联系人 %1。(%2)"
+
+#: tdeabc_resourcexmlrpc.cpp:439
+msgid "Unable to delete contact %1 from server. (%2)"
+msgstr "无法从服务器上删除联系人 %1。(%2)"
+
 #: xmlrpciface.cpp:115
 msgid "Received invalid XML markup: %1 at %2:%3"
 msgstr "接收到无效的 XML 标记：位于 %2:%3 的 %1"
diff --git a/tde-i18n-zh_CN/messages/tdepim/kwatchgnupg.po b/tde-i18n-zh_CN/messages/tdepim/kwatchgnupg.po
index 0d19e71d808..b726a5ea70e 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kwatchgnupg.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kwatchgnupg.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kwatchgnupg\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2005-07-25 01:39+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2007-03-27 20:44+0800\n"
 "Last-Translator: Lie_Ex <lilith.shang@thizgroup.com>\n"
 "Language-Team:  <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdepim/libkcal.po b/tde-i18n-zh_CN/messages/tdepim/libkcal.po
index b3668a147d7..9717a56f98f 100644
--- a/tde-i18n-zh_CN/messages/tdepim/libkcal.po
+++ b/tde-i18n-zh_CN/messages/tdepim/libkcal.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2008-08-19 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-08-03 22:22+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,6 +28,39 @@ msgid ""
 "Your emails"
 msgstr "i18n-translation@lists.linux.net.cn"
 
+#: attachmenthandler.cpp:73
+msgid "No attachment named \"%1\" found in the incidence."
+msgstr ""
+
+#: attachmenthandler.cpp:81
+msgid ""
+"The attachment \"%1\" is a web link that is inaccessible from this computer. "
+msgstr ""
+
+#: attachmenthandler.cpp:103
+msgid ""
+"The incidence that owns the attachment named \"%1\" could not be found. Perhaps "
+"it was removed from your calendar?"
+msgstr ""
+
+#: attachmenthandler.cpp:122
+msgid ""
+"The calendar invitation stored in this email message is broken in some way. "
+"Unable to continue."
+msgstr ""
+
+#: attachmenthandler.cpp:178 attachmenthandler.cpp:232
+msgid "Unable to create a temporary file for the attachment."
+msgstr ""
+
+#: attachmenthandler.cpp:206
+msgid "Save Attachment"
+msgstr ""
+
+#: attachmenthandler.cpp:211
+msgid "%1 already exists. Do you want to overwrite it?"
+msgstr ""
+
 #: attendee.cpp:76
 msgid "Needs Action"
 msgstr "需要操作"
@@ -49,8 +83,7 @@ msgstr ""
 msgid "Delegated"
 msgstr ""
 
-#: attendee.cpp:91 htmlexport.cpp:358 incidence.cpp:718
-#: incidenceformatter.cpp:435
+#: attendee.cpp:91 htmlexport.cpp:366 incidence.cpp:774
 msgid "Completed"
 msgstr ""
 
@@ -58,43 +91,49 @@ msgstr ""
 msgid "In Process"
 msgstr "处理中"
 
-#: attendee.cpp:143
+#: attendee.cpp:97
+msgid ""
+"_: attendee status unknown\n"
+"Unknown"
+msgstr ""
+
+#: attendee.cpp:146
 msgid "Chair"
 msgstr ""
 
-#: attendee.cpp:147
+#: attendee.cpp:150
 msgid "Participant"
 msgstr ""
 
-#: attendee.cpp:150
+#: attendee.cpp:153
 msgid "Optional Participant"
 msgstr "可选参与者"
 
-#: attendee.cpp:153
+#: attendee.cpp:156
 #, fuzzy
 msgid "Observer"
 msgstr "从不"
 
-#: calendar.cpp:64
+#: calendar.cpp:65
 msgid "Unknown Name"
 msgstr "未知姓名"
 
-#: calendar.cpp:64
+#: calendar.cpp:65
 msgid "unknown@nowhere"
 msgstr "unknown@nowhere"
 
-#: calendarlocal.cpp:581
+#: calendarlocal.cpp:746
 msgid ""
 "The timezone setting was changed. In order to display the calendar you are "
 "looking at in the new timezone, it needs to be saved. Do you want to save the "
 "pending changes or rather wait and apply the new timezone on the next reload?"
 msgstr "时区设置以更改。为了以新时区显示您正在查看的日历，必须先保存日历。您是想要保存推迟的更改，还是等到下次重新装入时再应用新时区？"
 
-#: calendarlocal.cpp:587
+#: calendarlocal.cpp:752
 msgid "Save before applying timezones?"
 msgstr "应用时区之前保存吗？"
 
-#: calendarlocal.cpp:589
+#: calendarlocal.cpp:754
 msgid "Apply Timezone Change on Next Reload"
 msgstr "下次重新装入时应用时区"
 
@@ -123,7 +162,8 @@ msgid "UID"
 msgstr "UID"
 
 #: convertqtopia.cpp:42
-msgid "Convert Qtopia calendar file to iCalendar"
+#, fuzzy
+msgid "Convert TQtopia calendar file to iCalendar"
 msgstr "将 Qtopia 日历文件转换为 iCalendar"
 
 #: convertqtopia.cpp:44
@@ -139,7 +179,8 @@ msgid "Input file"
 msgstr "输入文件"
 
 #: convertqtopia.cpp:53
-msgid "Qtopia calendar file converter"
+#, fuzzy
+msgid "TQtopia calendar file converter"
 msgstr "Qtopia 日历文件转换器"
 
 #: convertqtopia.cpp:76
@@ -158,119 +199,126 @@ msgstr "错误：无输入文件。"
 msgid "Error saving to '%1'."
 msgstr "保存到“%1”出错。"
 
-#: exceptions.cpp:40
+#: exceptions.cpp:41
 msgid "%1 Error"
 msgstr "%1 错误"
 
-#: exceptions.cpp:57
+#: exceptions.cpp:60
 msgid "Load Error"
 msgstr "装入错误"
 
-#: exceptions.cpp:60
+#: exceptions.cpp:63
 msgid "Save Error"
 msgstr "保存错误"
 
-#: exceptions.cpp:63
+#: exceptions.cpp:66
 msgid "Parse Error in libical"
 msgstr "libical 分析错误"
 
-#: exceptions.cpp:66
+#: exceptions.cpp:69
 msgid "Parse Error in libkcal"
 msgstr "libkcal 分析错误"
 
-#: exceptions.cpp:69
+#: exceptions.cpp:72
 msgid "No calendar component found."
 msgstr "未找到日历组件。"
 
-#: exceptions.cpp:72
+#: exceptions.cpp:75
 msgid "vCalendar Version 1.0 detected."
 msgstr "检测到了 vCalendar 版本 1.0。"
 
-#: exceptions.cpp:75
+#: exceptions.cpp:78
 msgid "iCalendar Version 2.0 detected."
 msgstr "检测到了 iCalendar 版本 2.0。"
 
-#: exceptions.cpp:78
+#: exceptions.cpp:81
+msgid "Unknown calendar format detected."
+msgstr ""
+
+#: exceptions.cpp:84
 msgid "Restriction violation"
 msgstr ""
 
-#: htmlexport.cpp:149
+#: exceptions.cpp:87
+msgid "No writable resource found"
+msgstr ""
+
+#: htmlexport.cpp:150
 msgid ""
 "_: month_year\n"
 "%1 %2"
 msgstr "%1 %2"
 
-#: htmlexport.cpp:224
+#: htmlexport.cpp:228
 msgid "Start Time"
 msgstr "开始时间"
 
-#: htmlexport.cpp:225
+#: htmlexport.cpp:229
 msgid "End Time"
 msgstr "结束时间"
 
-#: htmlexport.cpp:226
+#: htmlexport.cpp:230
 msgid "Event"
 msgstr "事件"
 
-#: htmlexport.cpp:228 htmlexport.cpp:364 incidenceformatter.cpp:334
-#: incidenceformatter.cpp:413
+#: htmlexport.cpp:232 htmlexport.cpp:372
 msgid "Location"
 msgstr "位置"
 
-#: htmlexport.cpp:232 htmlexport.cpp:368
+#: htmlexport.cpp:236 htmlexport.cpp:376
 msgid "Categories"
 msgstr "类别"
 
-#: htmlexport.cpp:236 htmlexport.cpp:372 incidenceformatter.cpp:158
+#: htmlexport.cpp:240 htmlexport.cpp:380 incidenceformatter.cpp:1950
 msgid "Attendees"
 msgstr ""
 
-#: htmlexport.cpp:356
+#: htmlexport.cpp:364
 msgid "Task"
 msgstr "任务"
 
-#: htmlexport.cpp:357 incidenceformatter.cpp:426
+#: htmlexport.cpp:365
 msgid "Priority"
 msgstr "优先级"
 
-#: htmlexport.cpp:360
+#: htmlexport.cpp:368
 msgid "Due Date"
 msgstr "到期日期"
 
-#: htmlexport.cpp:391
+#: htmlexport.cpp:399
 msgid "Sub-Tasks of: "
 msgstr "父任务："
 
-#: htmlexport.cpp:441
+#: htmlexport.cpp:449
 msgid "Sub-Tasks"
 msgstr "子任务"
 
-#: htmlexport.cpp:454 incidenceformatter.cpp:436
+#: htmlexport.cpp:462
 msgid "%1 %"
 msgstr "%1 %"
 
-#: htmlexport.cpp:605
+#: htmlexport.cpp:613
 msgid "This page was created "
 msgstr "此页面由"
 
-#: htmlexport.cpp:613 htmlexport.cpp:615
+#: htmlexport.cpp:621 htmlexport.cpp:623
 msgid "by <a href=\"mailto:%1\">%2</a> "
 msgstr "<a href=\"mailto:%1\">%2</a> 创建"
 
-#: htmlexport.cpp:618
+#: htmlexport.cpp:626
 msgid "by %1 "
 msgstr "%1 创建"
 
-#: htmlexport.cpp:622
+#: htmlexport.cpp:630
 msgid "with <a href=\"%1\">%2</a>"
 msgstr "<a href=\"%1\">%2</a> 创建"
 
-#: htmlexport.cpp:626
+#: htmlexport.cpp:634
 #, c-format
 msgid "with %1"
 msgstr "%1 创建"
 
-#: htmlexport.cpp:701
+#: htmlexport.cpp:709
 msgid ""
 "_: list of holidays\n"
 "%1, %2"
@@ -284,897 +332,1679 @@ msgstr "无法保存“%1”"
 msgid "libical error"
 msgstr "libical 错误"
 
-#: icalformatimpl.cpp:1990
+#: icalformatimpl.cpp:2127
+msgid "No VERSION property found"
+msgstr ""
+
+#: icalformatimpl.cpp:2136
 msgid "Expected iCalendar format"
 msgstr "期待 iCalendar 格式"
 
-#: incidence.cpp:716
+#: incidence.cpp:772
 msgid ""
 "_: incidence status\n"
 "Tentative"
 msgstr ""
 
-#: incidence.cpp:717
+#: incidence.cpp:773
 msgid "Confirmed"
 msgstr "已确认"
 
-#: incidence.cpp:719
+#: incidence.cpp:775
 msgid "Needs-Action"
 msgstr "需要操作"
 
-#: incidence.cpp:720
+#: incidence.cpp:776
 msgid "Canceled"
 msgstr "已取消"
 
-#: incidence.cpp:721
+#: incidence.cpp:777
 msgid "In-Process"
 msgstr "处理中"
 
-#: incidence.cpp:722
+#: incidence.cpp:778
 msgid "Draft"
 msgstr "草稿"
 
-#: incidence.cpp:723
+#: incidence.cpp:779
 msgid "Final"
 msgstr "终稿"
 
-#: incidence.cpp:751
+#: incidence.cpp:807
 msgid "Public"
 msgstr "公开"
 
-#: incidence.cpp:753
+#: incidence.cpp:809
 msgid "Private"
 msgstr "私有"
 
-#: incidence.cpp:755
+#: incidence.cpp:811
 msgid "Confidential"
 msgstr ""
 
-#: incidence.cpp:757
+#: incidence.cpp:813
 msgid "Undefined"
 msgstr "未定义"
 
-#: incidenceformatter.cpp:151
-msgid "Organizer"
-msgstr "组织者"
-
-#: incidenceformatter.cpp:165
+#: incidenceformatter.cpp:251 incidenceformatter.cpp:1970
+#: incidenceformatter.cpp:3408
 msgid " (delegated by %1)"
 msgstr ""
 
-#: incidenceformatter.cpp:168
+#: incidenceformatter.cpp:254 incidenceformatter.cpp:1973
+#: incidenceformatter.cpp:3411
 msgid " (delegated to %1)"
 msgstr ""
 
-#: incidenceformatter.cpp:186
+#: incidenceformatter.cpp:274 incidenceformatter.cpp:3431
+#, fuzzy
+msgid "Organizer:"
+msgstr "组织者"
+
+#: incidenceformatter.cpp:287 incidenceformatter.cpp:3439
+msgid "Chair:"
+msgstr ""
+
+#: incidenceformatter.cpp:296 incidenceformatter.cpp:3446
+#, fuzzy
+msgid "Required Participants:"
+msgstr "可选参与者"
+
+#: incidenceformatter.cpp:305 incidenceformatter.cpp:3453
+#, fuzzy
+msgid "Optional Participants:"
+msgstr "可选参与者"
+
+#: incidenceformatter.cpp:314 incidenceformatter.cpp:3460
+#, fuzzy
+msgid "Observers:"
+msgstr "从不"
+
+#: incidenceformatter.cpp:333
 msgid "Show mail"
 msgstr "显示邮件"
 
-#: incidenceformatter.cpp:285 incidenceformatter.cpp:295
-#: incidenceformatter.cpp:300
+#: incidenceformatter.cpp:361
+#, fuzzy, c-format
+msgid "Creation date: %1"
+msgstr "创建日期：%1。"
+
+#: incidenceformatter.cpp:468 incidenceformatter.cpp:641
+#: incidenceformatter.cpp:791 incidenceformatter.cpp:3485
 #, fuzzy
-msgid "Time"
-msgstr "结束时间"
+msgid "Calendar:"
+msgstr "iCalendar"
+
+#: incidenceformatter.cpp:476 incidenceformatter.cpp:649
+#: incidenceformatter.cpp:3494 resourcelocalconfig.cpp:49
+#: resourcelocaldirconfig.cpp:48
+msgid "Location:"
+msgstr "位置："
 
-#: incidenceformatter.cpp:286 incidenceformatter.cpp:296
-#: incidenceformatter.cpp:302
+#: incidenceformatter.cpp:502 incidenceformatter.cpp:509
+#: incidenceformatter.cpp:517 incidenceformatter.cpp:524
+#: incidenceformatter.cpp:798 incidenceformatter.cpp:1320
+#: incidenceformatter.cpp:1471
+msgid "Date:"
+msgstr "日期："
+
+#: incidenceformatter.cpp:504 incidenceformatter.cpp:519
+#, fuzzy
 msgid ""
-"_: <beginTime> - <endTime>\n"
+"_: <beginDate> - <endDate>\n"
 "%1 - %2"
 msgstr "%1 - %2"
 
-#: incidenceformatter.cpp:290 incidenceformatter.cpp:309
-#, fuzzy
-msgid "Date"
-msgstr "日期："
-
-#: incidenceformatter.cpp:291 incidenceformatter.cpp:310
+#: incidenceformatter.cpp:511 incidenceformatter.cpp:526
 #, c-format
 msgid ""
 "_: date as string\n"
 "%1"
 msgstr "%1"
 
-#: incidenceformatter.cpp:318
-msgid "Birthday"
-msgstr ""
+#: incidenceformatter.cpp:531 incidenceformatter.cpp:1323
+#, fuzzy
+msgid "Time:"
+msgstr "结束时间"
+
+#: incidenceformatter.cpp:534
+msgid ""
+"_: <beginTime> - <endTime>\n"
+"%1 - %2"
+msgstr "%1 - %2"
 
-#: incidenceformatter.cpp:327 incidenceformatter.cpp:406
+#: incidenceformatter.cpp:550 incidenceformatter.cpp:691
+#: incidenceformatter.cpp:1352 incidenceformatter.cpp:3501
+msgid "Duration:"
+msgstr "持续时间："
+
+#: incidenceformatter.cpp:557 incidenceformatter.cpp:698
+#: incidenceformatter.cpp:1358 incidenceformatter.cpp:3507
 #, fuzzy
-msgid "Description"
+msgid "Recurrence:"
+msgstr "下次出现"
+
+#: incidenceformatter.cpp:567
+msgid "Anniversary:"
+msgstr ""
+
+#: incidenceformatter.cpp:569
+msgid "Birthday:"
+msgstr ""
+
+#: incidenceformatter.cpp:579 incidenceformatter.cpp:707
+#: incidenceformatter.cpp:806 incidenceformatter.cpp:1245
+#: incidenceformatter.cpp:1473 incidenceformatter.cpp:3517
+msgid "Description:"
 msgstr "描述："
 
-#: incidenceformatter.cpp:341 incidenceformatter.cpp:420
+#: incidenceformatter.cpp:590 incidenceformatter.cpp:718
+#: incidenceformatter.cpp:3525
 #, fuzzy, c-format
 msgid ""
-"_n: 1 Category\n"
-"%n Categories"
-msgstr "类别"
+"_n: Reminder:\n"
+"%n Reminders:"
+msgstr "%n 分"
 
-#: incidenceformatter.cpp:350 incidenceformatter.cpp:443
-msgid "Next on"
-msgstr ""
+#: incidenceformatter.cpp:602 incidenceformatter.cpp:730
+#: incidenceformatter.cpp:815 incidenceformatter.cpp:3535
+#, fuzzy, c-format
+msgid ""
+"_n: Category:\n"
+"%n Categories:"
+msgstr "类别"
 
-#: incidenceformatter.cpp:371 incidenceformatter.cpp:464
+#: incidenceformatter.cpp:612
 #, fuzzy, c-format
 msgid ""
-"_n: 1 attachment\n"
-"%n attachments"
+"_n: Attachment:\n"
+"%n Attachments:"
 msgstr "附件"
 
-#: incidenceformatter.cpp:377 incidenceformatter.cpp:470
-#, c-format
-msgid "Creation date: %1."
-msgstr "创建日期：%1。"
+#: incidenceformatter.cpp:662
+#, fuzzy
+msgid "Start:"
+msgstr "开始时间："
 
-#: incidenceformatter.cpp:391
-msgid "Due on"
+#: incidenceformatter.cpp:680
+msgid "Due:"
 msgstr ""
 
-#: incidenceformatter.cpp:430 incidenceformatter.cpp:623
-msgid "Unspecified"
-msgstr "未指定"
+#: incidenceformatter.cpp:738 incidenceformatter.cpp:3293
+#, fuzzy
+msgid "Priority:"
+msgstr "优先级"
 
-#: incidenceformatter.cpp:484
-#, c-format
-msgid "Journal for %1"
-msgstr "%1 的日历"
+#: incidenceformatter.cpp:747 incidenceformatter.cpp:3299
+#, fuzzy
+msgid "Completed:"
+msgstr "%1 % 已完成"
+
+#: incidenceformatter.cpp:751 incidenceformatter.cpp:3302
+msgid "Percent Done:"
+msgstr ""
+
+#: incidenceformatter.cpp:753 incidenceformatter.cpp:2178
+#: incidenceformatter.cpp:2179 incidenceformatter.cpp:3303
+#, fuzzy
+msgid "%1%"
+msgstr "%1 %"
+
+#: incidenceformatter.cpp:762
+#, fuzzy
+msgid ""
+"_n: Attachment:\n"
+"Attachments:"
+msgstr "附件"
 
-#: incidenceformatter.cpp:496 incidenceformatter.cpp:1976
+#: incidenceformatter.cpp:835 incidenceformatter.cpp:3351
 #, c-format
 msgid "Free/Busy information for %1"
 msgstr "%1 的忙/闲信息"
 
-#: incidenceformatter.cpp:498
+#: incidenceformatter.cpp:838
 msgid "Busy times in date range %1 - %2:"
 msgstr ""
 
-#: incidenceformatter.cpp:504
+#: incidenceformatter.cpp:844
 msgid "Busy:"
 msgstr "忙："
 
-#: incidenceformatter.cpp:512 incidenceformatter.cpp:694
-#: incidenceformatter.cpp:778
+#: incidenceformatter.cpp:852 incidenceformatter.cpp:1503
 #, c-format
 msgid ""
 "_n: 1 hour \n"
 "%n hours "
 msgstr "%n 小时"
 
-#: incidenceformatter.cpp:516 incidenceformatter.cpp:697
+#: incidenceformatter.cpp:856
 #, c-format
 msgid ""
 "_n: 1 minute \n"
 "%n minutes "
 msgstr "%n 分"
 
-#: incidenceformatter.cpp:520 incidenceformatter.cpp:786
+#: incidenceformatter.cpp:860 incidenceformatter.cpp:1511
 #, c-format
 msgid ""
 "_n: 1 second\n"
 "%n seconds"
 msgstr "%n 秒"
 
-#: incidenceformatter.cpp:522 incidenceformatter.cpp:788
+#: incidenceformatter.cpp:862 incidenceformatter.cpp:1513
 msgid ""
 "_: startDate for duration\n"
 "%1 for %2"
 msgstr ""
 
-#: incidenceformatter.cpp:528 incidenceformatter.cpp:794
+#: incidenceformatter.cpp:868 incidenceformatter.cpp:1519
 msgid ""
 "_: date, fromTime - toTime \n"
 "%1, %2 - %3"
 msgstr "%1，%2 - %3"
 
-#: incidenceformatter.cpp:533 incidenceformatter.cpp:799
+#: incidenceformatter.cpp:873 incidenceformatter.cpp:1524
 msgid ""
 "_: fromDateTime - toDateTime\n"
 "%1 - %2"
 msgstr "%1 - %2"
 
-#: incidenceformatter.cpp:602
+#: incidenceformatter.cpp:971
 msgid ""
 "_: %1: Start Date, %2: Start Time\n"
 "%1 %2"
 msgstr "%1 %2"
 
-#: incidenceformatter.cpp:605
+#: incidenceformatter.cpp:975
+#, fuzzy
 msgid ""
 "_: %1: Start Date\n"
-"%1 (time unspecified)"
+"%1 (all day)"
 msgstr "%1 (时间未指定)"
 
-#: incidenceformatter.cpp:616
+#: incidenceformatter.cpp:986
 msgid ""
 "_: %1: End Date, %2: End Time\n"
 "%1 %2"
 msgstr "%1 %2"
 
-#: incidenceformatter.cpp:619
+#: incidenceformatter.cpp:990
+#, fuzzy
 msgid ""
 "_: %1: End Date\n"
-"%1 (time unspecified)"
+"%1 (all day)"
 msgstr "%1 (时间未指定)"
 
-#: incidenceformatter.cpp:638 incidenceformatter.cpp:726
-#: incidenceformatter.cpp:749
-msgid "Description:"
-msgstr "描述："
+#: incidenceformatter.cpp:1107
+msgid "Your response is requested"
+msgstr ""
+
+#: incidenceformatter.cpp:1109
+msgid "Your response as <b>%1</b> is requested"
+msgstr ""
 
-#: incidenceformatter.cpp:644
+#: incidenceformatter.cpp:1113
+msgid "No response is necessary"
+msgstr ""
+
+#: incidenceformatter.cpp:1115
+msgid "No response as <b>%1</b> is necessary"
+msgstr ""
+
+#: incidenceformatter.cpp:1126
+msgid "(<b>Note</b>: the Organizer preset your response to <b>%1</b>)"
+msgstr ""
+
+#: incidenceformatter.cpp:1255
 msgid "Comments:"
 msgstr ""
 
-#: incidenceformatter.cpp:662 incidenceformatter.cpp:716
-#: incidenceformatter.cpp:738
+#: incidenceformatter.cpp:1280 incidenceformatter.cpp:1391
+#: incidenceformatter.cpp:1455
 msgid "Summary unspecified"
 msgstr "概要未指定"
 
-#: incidenceformatter.cpp:667
+#: incidenceformatter.cpp:1292 incidenceformatter.cpp:1403
 msgid "Location unspecified"
 msgstr "位置未指定"
 
-#: incidenceformatter.cpp:678
+#: incidenceformatter.cpp:1310 incidenceformatter.cpp:1420
 msgid "What:"
 msgstr "内容："
 
-#: incidenceformatter.cpp:679
+#: incidenceformatter.cpp:1311 incidenceformatter.cpp:1421
 msgid "Where:"
 msgstr "位置："
 
-#: incidenceformatter.cpp:682
+#: incidenceformatter.cpp:1314
+#, fuzzy
+msgid "First Start Time:"
+msgstr "开始时间："
+
+#: incidenceformatter.cpp:1315
+#, fuzzy
+msgid "First End Time:"
+msgstr "结束时间："
+
+#: incidenceformatter.cpp:1329
+msgid ""
+"_: Starting date of an event\n"
+"From:"
+msgstr ""
+
+#: incidenceformatter.cpp:1332 incidenceformatter.cpp:1339
+msgid ""
+"_: Starting time of an event\n"
+"At:"
+msgstr ""
+
+#: incidenceformatter.cpp:1336 incidenceformatter.cpp:1343
+msgid ""
+"_: Ending date of an event\n"
+"To:"
+msgstr ""
+
+#: incidenceformatter.cpp:1344
+#, fuzzy
+msgid "no end date specified"
+msgstr "位置未指定"
+
+#: incidenceformatter.cpp:1368
+#, fuzzy
+msgid "Cancelled on:"
+msgstr "已取消"
+
+#: incidenceformatter.cpp:1424
+#, fuzzy
+msgid "Start Date:"
+msgstr "开始日期："
+
+#: incidenceformatter.cpp:1427
 msgid "Start Time:"
 msgstr "开始时间："
 
-#: incidenceformatter.cpp:685
-msgid "End Time:"
+#: incidenceformatter.cpp:1432 incidenceformatter.cpp:1440
+#, fuzzy
+msgid "Due Date:"
+msgstr "到期日期"
+
+#: incidenceformatter.cpp:1435
+#, fuzzy
+msgid "Due Time:"
 msgstr "结束时间："
 
-#: incidenceformatter.cpp:700
-msgid "Duration:"
-msgstr "持续时间："
+#: incidenceformatter.cpp:1440
+msgid ""
+"_: Due Date: None\n"
+"None"
+msgstr ""
 
-#: incidenceformatter.cpp:717 incidenceformatter.cpp:739
+#: incidenceformatter.cpp:1456
 msgid "Description unspecified"
 msgstr "描述未指定"
 
-#: incidenceformatter.cpp:725 incidenceformatter.cpp:747
+#: incidenceformatter.cpp:1470
 msgid "Summary:"
 msgstr "概要："
 
-#: incidenceformatter.cpp:748
-msgid "Date:"
-msgstr "日期："
-
-#: incidenceformatter.cpp:762
+#: incidenceformatter.cpp:1486
 msgid "Person:"
 msgstr "个人："
 
-#: incidenceformatter.cpp:763
+#: incidenceformatter.cpp:1487
 msgid "Start date:"
 msgstr "开始日期："
 
-#: incidenceformatter.cpp:764
+#: incidenceformatter.cpp:1489
 msgid "End date:"
 msgstr "结束日期："
 
-#: incidenceformatter.cpp:782
+#: incidenceformatter.cpp:1507
 #, c-format
 msgid ""
 "_n: 1 minute\n"
 "%n minutes "
 msgstr "%n 分"
 
-#: incidenceformatter.cpp:818
-msgid "This event has been published"
+#: incidenceformatter.cpp:1564
+#, fuzzy
+msgid "This invitation has been published"
 msgstr "此事件已经发布"
 
-#: incidenceformatter.cpp:821
-#, fuzzy
-msgid "This meeting has been updated"
+#: incidenceformatter.cpp:1567
+#, fuzzy, c-format
+msgid "This invitation has been updated by the organizer %1"
 msgstr "此会议已被取消"
 
-#: incidenceformatter.cpp:822
-msgid "You have been invited to this meeting"
-msgstr "您已被邀请参加此会议"
+#: incidenceformatter.cpp:1571
+#, fuzzy
+msgid "I created this invitation"
+msgstr "发送者接受了会议邀请"
 
-#: incidenceformatter.cpp:824
+#: incidenceformatter.cpp:1581
+#, c-format
+msgid "You received an invitation from %1"
+msgstr ""
+
+#: incidenceformatter.cpp:1583
+msgid "You received an invitation"
+msgstr ""
+
+#: incidenceformatter.cpp:1587
+msgid "You received an invitation from %1 as a representative of %2"
+msgstr ""
+
+#: incidenceformatter.cpp:1590
+msgid "You received an invitation from %1 as the organizer's representative"
+msgstr ""
+
+#: incidenceformatter.cpp:1596
 msgid "This invitation was refreshed"
 msgstr "此邀请已经刷新"
 
-#: incidenceformatter.cpp:826
-msgid "This meeting has been canceled"
+#: incidenceformatter.cpp:1598
+#, fuzzy
+msgid "This invitation has been canceled"
 msgstr "此会议已被取消"
 
-#: incidenceformatter.cpp:828
-msgid "Addition to the meeting invitation"
+#: incidenceformatter.cpp:1600
+#, fuzzy
+msgid "Addition to the invitation"
 msgstr "添加到会议邀请"
 
-#: incidenceformatter.cpp:843
+#: incidenceformatter.cpp:1604 incidenceformatter.cpp:1684
+#: incidenceformatter.cpp:1748 incidenceformatter.cpp:1837
+msgid "%1 makes this counter proposal"
+msgstr ""
+
+#: incidenceformatter.cpp:1605 incidenceformatter.cpp:1617
+#: incidenceformatter.cpp:1685 incidenceformatter.cpp:1689
+#: incidenceformatter.cpp:1749 incidenceformatter.cpp:1761
+#: incidenceformatter.cpp:1838 incidenceformatter.cpp:1842
 #, fuzzy
 msgid "Sender"
 msgstr "提醒"
 
-#: incidenceformatter.cpp:852
+#: incidenceformatter.cpp:1628
 msgid "%1 indicates this invitation still needs some action"
 msgstr ""
 
-#: incidenceformatter.cpp:855
+#: incidenceformatter.cpp:1632
+#, fuzzy, c-format
+msgid "This invitation has been updated by attendee %1"
+msgstr "此会议已被取消"
+
+#: incidenceformatter.cpp:1634
 #, fuzzy
-msgid "%1 accepts this meeting invitation"
+msgid "This invitation has been updated by an attendee"
+msgstr "此会议已被取消"
+
+#: incidenceformatter.cpp:1638
+#, fuzzy
+msgid "%1 accepts this invitation"
 msgstr "发送者接受了会议邀请"
 
-#: incidenceformatter.cpp:856
+#: incidenceformatter.cpp:1640
 #, fuzzy
-msgid "%1 accepts this meeting invitation on behalf of %2"
+msgid "%1 accepts this invitation on behalf of %2"
 msgstr "发送者接受了会议邀请"
 
-#: incidenceformatter.cpp:860
+#: incidenceformatter.cpp:1646
 #, fuzzy
-msgid "%1 tentatively accepts this meeting invitation"
+msgid "%1 tentatively accepts this invitation"
 msgstr "发送者接受了会议邀请"
 
-#: incidenceformatter.cpp:861
+#: incidenceformatter.cpp:1649
 #, fuzzy
-msgid "%1 tentatively accepts this meeting invitation on behalf of %2"
+msgid "%1 tentatively accepts this invitation on behalf of %2"
 msgstr "发送者接受了会议邀请"
 
-#: incidenceformatter.cpp:865
+#: incidenceformatter.cpp:1654
 #, fuzzy
-msgid "%1 declines this meeting invitation"
+msgid "%1 declines this invitation"
 msgstr "发送者拒绝了会议邀请"
 
-#: incidenceformatter.cpp:866
+#: incidenceformatter.cpp:1656
 #, fuzzy
-msgid "%1 declines this meeting invitation on behalf of %2"
+msgid "%1 declines this invitation on behalf of %2"
 msgstr "发送者拒绝了会议邀请"
 
-#: incidenceformatter.cpp:874
+#: incidenceformatter.cpp:1666
 #, fuzzy
-msgid "%1 has delegated this meeting invitation to %2"
+msgid "%1 has delegated this invitation to %2"
 msgstr "发送者拒绝了会议邀请"
 
-#: incidenceformatter.cpp:876
+#: incidenceformatter.cpp:1669
 #, fuzzy
-msgid "%1 has delegated this meeting invitation"
+msgid "%1 has delegated this invitation"
 msgstr "发送者拒绝了会议邀请"
 
-#: incidenceformatter.cpp:879
-msgid "This meeting invitation is now completed"
+#: incidenceformatter.cpp:1673
+#, fuzzy
+msgid "This invitation is now completed"
 msgstr "此会议邀请现已完成"
 
-#: incidenceformatter.cpp:881
+#: incidenceformatter.cpp:1675
 #, fuzzy
 msgid "%1 is still processing the invitation"
 msgstr "发送者仍在处理邀请"
 
-#: incidenceformatter.cpp:883
-msgid "Unknown response to this meeting invitation"
+#: incidenceformatter.cpp:1678
+msgid "Unknown response to this invitation"
 msgstr ""
 
-#: incidenceformatter.cpp:887 incidenceformatter.cpp:952
-#: incidenceformatter.cpp:1009
-msgid "Sender makes this counter proposal"
-msgstr ""
-
-#: incidenceformatter.cpp:889 incidenceformatter.cpp:954
-#: incidenceformatter.cpp:1011
-msgid "Sender declines the counter proposal"
+#: incidenceformatter.cpp:1688 incidenceformatter.cpp:1841
+msgid "%1 declines the counter proposal"
 msgstr ""
 
-#: incidenceformatter.cpp:891 incidenceformatter.cpp:956
-#: incidenceformatter.cpp:1013
+#: incidenceformatter.cpp:1692 incidenceformatter.cpp:1845
+#: incidenceformatter.cpp:1910
 msgid "Error: iMIP message with unknown method: '%1'"
 msgstr ""
 
-#: incidenceformatter.cpp:903
+#: incidenceformatter.cpp:1707
 msgid "This task has been published"
 msgstr ""
 
-#: incidenceformatter.cpp:906
-#, fuzzy
-msgid "This task has been updated"
+#: incidenceformatter.cpp:1710
+#, fuzzy, c-format
+msgid "This task has been updated by the organizer %1"
 msgstr "此事件已经发布"
 
-#: incidenceformatter.cpp:907
+#: incidenceformatter.cpp:1714
+msgid "I created this task"
+msgstr ""
+
+#: incidenceformatter.cpp:1724
+#, fuzzy, c-format
+msgid "You have been assigned this task by %1"
+msgstr "您已被邀请参加此会议"
+
+#: incidenceformatter.cpp:1726
 msgid "You have been assigned this task"
 msgstr ""
 
-#: incidenceformatter.cpp:909
+#: incidenceformatter.cpp:1730
+msgid "You have been assigned this task by %1 as a representative of %2"
+msgstr ""
+
+#: incidenceformatter.cpp:1733
+msgid ""
+"You have been assigned this task by %1 as the organizer's representative"
+msgstr ""
+
+#: incidenceformatter.cpp:1740
 msgid "This task was refreshed"
 msgstr ""
 
-#: incidenceformatter.cpp:911
+#: incidenceformatter.cpp:1742
 msgid "This task was canceled"
 msgstr ""
 
-#: incidenceformatter.cpp:913
+#: incidenceformatter.cpp:1744
 msgid "Addition to the task"
 msgstr ""
 
-#: incidenceformatter.cpp:927
-msgid "Sender indicates this task assignment still needs some action"
+#: incidenceformatter.cpp:1772
+msgid "%1 indicates this task assignment still needs some action"
 msgstr ""
 
-#: incidenceformatter.cpp:929
-msgid "Sender accepts this task"
-msgstr ""
+#: incidenceformatter.cpp:1777
+#, fuzzy, c-format
+msgid "This task has been completed by assignee %1"
+msgstr "此事件已经发布"
 
-#: incidenceformatter.cpp:931
-msgid "Sender tentatively accepts this task"
-msgstr ""
+#: incidenceformatter.cpp:1779
+#, fuzzy, c-format
+msgid "This task has been updated by assignee %1"
+msgstr "此事件已经发布"
 
-#: incidenceformatter.cpp:933
-msgid "Sender declines this task"
-msgstr ""
+#: incidenceformatter.cpp:1783
+#, fuzzy
+msgid "This task has been completed by an assignee"
+msgstr "此事件已经发布"
 
-#: incidenceformatter.cpp:940
-#, c-format
-msgid "Sender has delegated this request for the task to %1"
-msgstr ""
+#: incidenceformatter.cpp:1785
+#, fuzzy
+msgid "This task has been updated by an assignee"
+msgstr "此事件已经发布"
 
-#: incidenceformatter.cpp:941
-msgid "Sender has delegated this request for the task "
-msgstr ""
+#: incidenceformatter.cpp:1790
+#, fuzzy
+msgid "%1 accepts this task"
+msgstr "发送者接受了会议邀请"
+
+#: incidenceformatter.cpp:1792
+#, fuzzy
+msgid "%1 accepts this task on behalf of %2"
+msgstr "发送者接受了会议邀请"
 
-#: incidenceformatter.cpp:944
+#: incidenceformatter.cpp:1798
+#, fuzzy
+msgid "%1 tentatively accepts this task"
+msgstr "发送者接受了会议邀请"
+
+#: incidenceformatter.cpp:1801
+#, fuzzy
+msgid "%1 tentatively accepts this task on behalf of %2"
+msgstr "发送者接受了会议邀请"
+
+#: incidenceformatter.cpp:1806
+#, fuzzy
+msgid "%1 declines this task"
+msgstr "发送者拒绝了会议邀请"
+
+#: incidenceformatter.cpp:1808
+#, fuzzy
+msgid "%1 declines this task on behalf of %2"
+msgstr "发送者拒绝了会议邀请"
+
+#: incidenceformatter.cpp:1818
+#, fuzzy
+msgid "%1 has delegated this request for the task to %2"
+msgstr "发送者拒绝了会议邀请"
+
+#: incidenceformatter.cpp:1821
+#, fuzzy
+msgid "%1 has delegated this request for the task"
+msgstr "发送者拒绝了会议邀请"
+
+#: incidenceformatter.cpp:1826
 msgid "The request for this task is now completed"
 msgstr ""
 
-#: incidenceformatter.cpp:946 incidenceformatter.cpp:1003
-msgid "Sender is still processing the invitation"
+#: incidenceformatter.cpp:1828
+#, fuzzy
+msgid "%1 is still processing the task"
 msgstr "发送者仍在处理邀请"
 
-#: incidenceformatter.cpp:948
+#: incidenceformatter.cpp:1831
 msgid "Unknown response to this task"
 msgstr ""
 
-#: incidenceformatter.cpp:969
+#: incidenceformatter.cpp:1859
 msgid "This journal has been published"
 msgstr ""
 
-#: incidenceformatter.cpp:971
+#: incidenceformatter.cpp:1861
 msgid "You have been assigned this journal"
 msgstr ""
 
-#: incidenceformatter.cpp:973
+#: incidenceformatter.cpp:1863
 msgid "This journal was refreshed"
 msgstr ""
 
-#: incidenceformatter.cpp:975
+#: incidenceformatter.cpp:1865
 msgid "This journal was canceled"
 msgstr ""
 
-#: incidenceformatter.cpp:977
+#: incidenceformatter.cpp:1867
 msgid "Addition to the journal"
 msgstr "添加到日记"
 
-#: incidenceformatter.cpp:991
+#: incidenceformatter.cpp:1871 incidenceformatter.cpp:1906
+msgid "Sender makes this counter proposal"
+msgstr ""
+
+#: incidenceformatter.cpp:1887
 msgid "Sender indicates this journal assignment still needs some action"
 msgstr ""
 
-#: incidenceformatter.cpp:993
+#: incidenceformatter.cpp:1889
 msgid "Sender accepts this journal"
 msgstr ""
 
-#: incidenceformatter.cpp:995
+#: incidenceformatter.cpp:1891
 msgid "Sender tentatively accepts this journal"
 msgstr ""
 
-#: incidenceformatter.cpp:997
+#: incidenceformatter.cpp:1893
 msgid "Sender declines this journal"
 msgstr ""
 
-#: incidenceformatter.cpp:999
+#: incidenceformatter.cpp:1895
 msgid "Sender has delegated this request for the journal"
 msgstr ""
 
-#: incidenceformatter.cpp:1001
+#: incidenceformatter.cpp:1897
 msgid "The request for this journal is now completed"
 msgstr ""
 
-#: incidenceformatter.cpp:1005
+#: incidenceformatter.cpp:1899
+msgid "Sender is still processing the invitation"
+msgstr "发送者仍在处理邀请"
+
+#: incidenceformatter.cpp:1901
 msgid "Unknown response to this journal"
 msgstr ""
 
-#: incidenceformatter.cpp:1025
+#: incidenceformatter.cpp:1908
+msgid "Sender declines the counter proposal"
+msgstr ""
+
+#: incidenceformatter.cpp:1924
 msgid "This free/busy list has been published"
 msgstr "此忙/闲列表已经发布"
 
-#: incidenceformatter.cpp:1027
+#: incidenceformatter.cpp:1926
 msgid "The free/busy list has been requested"
 msgstr "忙/闲列表已经请求"
 
-#: incidenceformatter.cpp:1029
+#: incidenceformatter.cpp:1928
 msgid "This free/busy list was refreshed"
 msgstr "此忙/闲列表已刷新"
 
-#: incidenceformatter.cpp:1031
+#: incidenceformatter.cpp:1930
 msgid "This free/busy list was canceled"
 msgstr "此忙/闲列表已取消"
 
-#: incidenceformatter.cpp:1033
+#: incidenceformatter.cpp:1932
 msgid "Addition to the free/busy list"
 msgstr "添加到忙/闲列表"
 
-#: incidenceformatter.cpp:1036
+#: incidenceformatter.cpp:1935
 msgid "Error: Free/Busy iMIP message with unknown method: '%1'"
 msgstr ""
 
-#: incidenceformatter.cpp:1155
+#: incidenceformatter.cpp:1948
+msgid "Assignees"
+msgstr ""
+
+#: incidenceformatter.cpp:1984
 #, fuzzy
-msgid "The begin of the meeting has been changed from %1 to %2"
+msgid ""
+"_: No attendee\n"
+"None"
+msgstr "无"
+
+#: incidenceformatter.cpp:1999
+msgid "Attached Documents:"
+msgstr ""
+
+#: incidenceformatter.cpp:2158
+#, fuzzy
+msgid "The invitation starting time has been changed from %1 to %2"
 msgstr "此会议已被取消"
 
-#: incidenceformatter.cpp:1158
+#: incidenceformatter.cpp:2161
 #, fuzzy
-msgid "The end of the meeting has been changed from %1 to %2"
+msgid "The invitation ending time has been changed from %1 to %2"
 msgstr "此会议已被取消"
 
-#: incidenceformatter.cpp:1167
+#: incidenceformatter.cpp:2172
+#, fuzzy
+msgid "The task has been completed"
+msgstr "此事件已经发布"
+
+#: incidenceformatter.cpp:2175
+#, fuzzy
+msgid "The task is no longer completed"
+msgstr "此会议邀请现已完成"
+
+#: incidenceformatter.cpp:2180
+#, fuzzy
+msgid "The task completed percentage has changed from %1 to %2"
+msgstr "此会议已被取消"
+
+#: incidenceformatter.cpp:2185
+msgid "A task starting time has been added"
+msgstr ""
+
+#: incidenceformatter.cpp:2188
+#, fuzzy
+msgid "The task starting time has been removed"
+msgstr "此会议已被取消"
+
+#: incidenceformatter.cpp:2192
+#, fuzzy
+msgid "The task starting time has been changed from %1 to %2"
+msgstr "此会议已被取消"
+
+#: incidenceformatter.cpp:2198
+#, fuzzy
+msgid "A task due time has been added"
+msgstr "此事件已经发布"
+
+#: incidenceformatter.cpp:2201
+#, fuzzy
+msgid "The task due time has been removed"
+msgstr "此事件已经发布"
+
+#: incidenceformatter.cpp:2205
+#, fuzzy
+msgid "The task due time has been changed from %1 to %2"
+msgstr "此会议已被取消"
+
+#: incidenceformatter.cpp:2216
 msgid "The summary has been changed to: \"%1\""
 msgstr ""
 
-#: incidenceformatter.cpp:1169
+#: incidenceformatter.cpp:2218
 #, fuzzy
 msgid "The location has been changed to: \"%1\""
 msgstr "此会议已被取消"
 
-#: incidenceformatter.cpp:1171
+#: incidenceformatter.cpp:2220
 #, fuzzy
 msgid "The description has been changed to: \"%1\""
 msgstr "此会议已被取消"
 
-#: incidenceformatter.cpp:1177
+#: incidenceformatter.cpp:2227
 msgid "Attendee %1 has been added"
 msgstr ""
 
-#: incidenceformatter.cpp:1180
+#: incidenceformatter.cpp:2230
 msgid "The status of attendee %1 has been changed to: %2"
 msgstr ""
 
-#: incidenceformatter.cpp:1187
+#: incidenceformatter.cpp:2240
 msgid "Attendee %1 has been removed"
 msgstr ""
 
-#: incidenceformatter.cpp:1279
-msgid ""
-"<p align=\"left\">The following changes have been made by the organizer:</p>"
+#: incidenceformatter.cpp:2304
+msgid "[Record]"
 msgstr ""
 
-#: incidenceformatter.cpp:1288 incidenceformatter.cpp:1307
-#: incidenceformatter.cpp:1352
-msgid "[Enter this into my calendar]"
-msgstr "[输入我的日历]"
-
-#: incidenceformatter.cpp:1304 incidenceformatter.cpp:1350
-msgid "[Enter this into my task list]"
-msgstr "[输入我的任务列表]"
+#: incidenceformatter.cpp:2309
+msgid "[Move to Trash]"
+msgstr ""
 
-#: incidenceformatter.cpp:1315 incidenceformatter.cpp:1357
+#: incidenceformatter.cpp:2316 incidenceformatter.cpp:2367
 msgid "[Accept]"
 msgstr "[接受]"
 
-#: incidenceformatter.cpp:1318
+#: incidenceformatter.cpp:2322
 msgid ""
 "_: Accept conditionally\n"
 "[Accept cond.]"
 msgstr "[有条件接受]"
 
-#: incidenceformatter.cpp:1321
+#: incidenceformatter.cpp:2327
 msgid "[Counter proposal]"
 msgstr ""
 
-#: incidenceformatter.cpp:1324 incidenceformatter.cpp:1359
+#: incidenceformatter.cpp:2332 incidenceformatter.cpp:2372
 msgid "[Decline]"
 msgstr "[拒绝]"
 
-#: incidenceformatter.cpp:1328
+#: incidenceformatter.cpp:2339
 #, fuzzy
 msgid "[Delegate]"
 msgstr "[拒绝]"
 
-#: incidenceformatter.cpp:1332
+#: incidenceformatter.cpp:2344
 msgid "[Forward]"
 msgstr ""
 
-#: incidenceformatter.cpp:1336 incidenceformatter.cpp:1361
+#: incidenceformatter.cpp:2350 incidenceformatter.cpp:2378
 #, fuzzy
 msgid "[Check my calendar]"
 msgstr "[检查我的日历...]"
 
-#: incidenceformatter.cpp:1344
-msgid "[Remove this from my calendar]"
+#: incidenceformatter.cpp:2452
+msgid "The following changes have been made by the organizer:"
+msgstr ""
+
+#: incidenceformatter.cpp:2462
+msgid "The following changes have been made by %1:"
+msgstr ""
+
+#: incidenceformatter.cpp:2464
+msgid "The following changes have been made by an attendee:"
+msgstr ""
+
+#: incidenceformatter.cpp:2516
+msgid "Your <b>%1</b> response has already been recorded"
+msgstr ""
+
+#: incidenceformatter.cpp:2519
+msgid "Your status for this invitation is <b>%1</b>"
+msgstr ""
+
+#: incidenceformatter.cpp:2524
+#, fuzzy
+msgid "This invitation was declined"
+msgstr "此邀请已经刷新"
+
+#: incidenceformatter.cpp:2526
+#, fuzzy
+msgid "This invitation was accepted"
+msgstr "此邀请已经刷新"
+
+#: incidenceformatter.cpp:2531
+msgid "Awaiting delegation response"
+msgstr ""
+
+#: incidenceformatter.cpp:2564
+#, fuzzy
+msgid "[Record invitation in my task list]"
+msgstr "[输入我的任务列表]"
+
+#: incidenceformatter.cpp:2567
+#, fuzzy
+msgid "[Record invitation in my calendar]"
+msgstr "[输入我的日历]"
+
+#: incidenceformatter.cpp:2584
+#, fuzzy
+msgid "[Remove invitation from my task list]"
 msgstr "[从我的日历中删除]"
 
-#: incidenceformatter.cpp:1707
+#: incidenceformatter.cpp:2587
+#, fuzzy
+msgid "[Remove invitation from my calendar]"
+msgstr "[从我的日历中删除]"
+
+#: incidenceformatter.cpp:2630
+#, fuzzy
+msgid "The response has been recorded [%1]"
+msgstr "此会议已被取消"
+
+#: incidenceformatter.cpp:2637
+#, fuzzy
+msgid "[Record response in my task list]"
+msgstr "[输入我的任务列表]"
+
+#: incidenceformatter.cpp:2639
+#, fuzzy
+msgid "[Record response in my calendar]"
+msgstr "[输入我的日历]"
+
+#: incidenceformatter.cpp:3026
 msgid "Reminder"
 msgstr "提醒"
 
-#: incidenceformatter.cpp:1876
+#: incidenceformatter.cpp:3219
 #, c-format
 msgid ""
 "_: Event start\n"
 "<i>From:</i>&nbsp;%1"
 msgstr ""
 
-#: incidenceformatter.cpp:1882
+#: incidenceformatter.cpp:3225
 #, c-format
 msgid ""
 "_: Event end\n"
 "<i>To:</i>&nbsp;%1"
 msgstr ""
 
-#: incidenceformatter.cpp:1890 incidenceformatter.cpp:1940
+#: incidenceformatter.cpp:3233 incidenceformatter.cpp:3314
 #, c-format
 msgid "<i>Date:</i>&nbsp;%1"
 msgstr ""
 
-#: incidenceformatter.cpp:1897
+#: incidenceformatter.cpp:3242
 #, c-format
 msgid ""
 "_: time for event, &nbsp; to prevent ugly line breaks\n"
 "<i>Time:</i>&nbsp;%1"
 msgstr ""
 
-#: incidenceformatter.cpp:1901
+#: incidenceformatter.cpp:3246
 msgid ""
 "_: time range for event, &nbsp; to prevent ugly line breaks\n"
 "<i>Time:</i>&nbsp;%1&nbsp;-&nbsp;%2"
 msgstr ""
 
-#: incidenceformatter.cpp:1919
+#: incidenceformatter.cpp:3269
 #, c-format
 msgid "<i>Start:</i>&nbsp;%1"
 msgstr ""
 
-#: incidenceformatter.cpp:1924
+#: incidenceformatter.cpp:3284
 #, c-format
 msgid "<i>Due:</i>&nbsp;%1"
 msgstr ""
 
-#: incidenceformatter.cpp:1929
-#, c-format
-msgid "<i>Completed:</i>&nbsp;%1"
-msgstr ""
-
-#: incidenceformatter.cpp:1931
-msgid "%1 % completed"
-msgstr "%1 % 已完成"
-
-#: incidenceformatter.cpp:1947 incidenceformatter.cpp:1949
+#: incidenceformatter.cpp:3322 incidenceformatter.cpp:3324
 #, c-format
 msgid "<i>Period start:</i>&nbsp;%1"
 msgstr ""
 
-#: incidenceformatter.cpp:1994
-#, c-format
-msgid "<i>Location:</i>&nbsp;%1"
-msgstr "<i>位置：</i>&nbsp;%1"
+#: incidenceformatter.cpp:3380
+msgid ""
+"_: elipsis\n"
+"..."
+msgstr ""
 
-#: incidenceformatter.cpp:2002
-msgid "<i>Description:</i><br>"
-msgstr "<i>描述：</i><br>"
+#: incidenceformatter.cpp:3384
+msgid ""
+"_: separator for lists of people names\n"
+", "
+msgstr ""
 
-#: incidenceformatter.cpp:2040
+#: incidenceformatter.cpp:3581
 msgid "This is a Free Busy Object"
 msgstr "这是忙闲对象"
 
-#: incidenceformatter.cpp:2050
+#: incidenceformatter.cpp:3591
 msgid ""
 "Summary: %1\n"
 msgstr ""
 "概要：%1\n"
 
-#: incidenceformatter.cpp:2053
+#: incidenceformatter.cpp:3594
 msgid ""
 "Organizer: %1\n"
 msgstr ""
 "组织者：%1\n"
 
-#: incidenceformatter.cpp:2056
+#: incidenceformatter.cpp:3597
 msgid ""
 "Location: %1\n"
 msgstr ""
 "位置：%1\n"
 
-#: incidenceformatter.cpp:2063
+#: incidenceformatter.cpp:3604
 msgid ""
 "_: no recurrence\n"
 "None"
 msgstr "无"
 
-#: incidenceformatter.cpp:2064
+#: incidenceformatter.cpp:3605
 msgid "Minutely"
 msgstr "每分钟"
 
-#: incidenceformatter.cpp:2064
+#: incidenceformatter.cpp:3605
 msgid "Hourly"
 msgstr "每小时"
 
-#: incidenceformatter.cpp:2064
+#: incidenceformatter.cpp:3605
 msgid "Daily"
 msgstr "每天"
 
-#: incidenceformatter.cpp:2065
+#: incidenceformatter.cpp:3606
 msgid "Weekly"
 msgstr "每周"
 
-#: incidenceformatter.cpp:2065
+#: incidenceformatter.cpp:3606
 msgid "Monthly Same Day"
 msgstr "每月同一天"
 
-#: incidenceformatter.cpp:2065
+#: incidenceformatter.cpp:3606
 msgid "Monthly Same Position"
 msgstr "每月同一位置"
 
-#: incidenceformatter.cpp:2066
+#: incidenceformatter.cpp:3607
 msgid "Yearly"
 msgstr "每年"
 
-#: incidenceformatter.cpp:2069 incidenceformatter.cpp:2117
+#: incidenceformatter.cpp:3610 incidenceformatter.cpp:3671
 msgid ""
 "Start Date: %1\n"
 msgstr ""
 "开始日期：%1\n"
 
-#: incidenceformatter.cpp:2071 incidenceformatter.cpp:2119
+#: incidenceformatter.cpp:3613 incidenceformatter.cpp:3674
 msgid ""
 "Start Time: %1\n"
 msgstr ""
 "开始时间：%1\n"
 
-#: incidenceformatter.cpp:2074
+#: incidenceformatter.cpp:3617
 msgid ""
 "End Date: %1\n"
 msgstr ""
 "结束日期：%1\n"
 
-#: incidenceformatter.cpp:2077
+#: incidenceformatter.cpp:3621
 msgid ""
 "End Time: %1\n"
 msgstr ""
 "结束时间：%1\n"
 
-#: incidenceformatter.cpp:2082
+#: incidenceformatter.cpp:3627
 msgid ""
 "Recurs: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2084
+#: incidenceformatter.cpp:3629
 msgid ""
 "Frequency: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2088
+#: incidenceformatter.cpp:3633
 #, c-format
 msgid ""
 "_n: Repeats once\n"
 "Repeats %n times"
 msgstr ""
 
-#: incidenceformatter.cpp:2099
+#: incidenceformatter.cpp:3644
 msgid ""
 "Repeat until: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2101
+#: incidenceformatter.cpp:3646
 msgid ""
 "Repeats forever\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2107 incidenceformatter.cpp:2130
+#: incidenceformatter.cpp:3652
+#, fuzzy
+msgid ""
+"This recurring meeting has been cancelled on the following days:\n"
+msgstr "此会议已被取消"
+
+#: incidenceformatter.cpp:3655
+msgid ""
+"  %1\n"
+msgstr ""
+
+#: incidenceformatter.cpp:3661 incidenceformatter.cpp:3688
 msgid ""
 "Details:\n"
 "%1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2123
+#: incidenceformatter.cpp:3679
 msgid ""
 "Due Date: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2125
+#: incidenceformatter.cpp:3682
 msgid ""
 "Due Time: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2138
+#: incidenceformatter.cpp:3696
 msgid ""
 "Date: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2140
+#: incidenceformatter.cpp:3699
 msgid ""
 "Time: %1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2143
+#: incidenceformatter.cpp:3703
 msgid ""
 "Text of the journal:\n"
 "%1\n"
 msgstr ""
 
-#: incidenceformatter.cpp:2175 incidenceformatter.cpp:2180
+#: incidenceformatter.cpp:3738 incidenceformatter.cpp:3811
 #, fuzzy
 msgid "No recurrence"
 msgstr "下次出现"
 
-#: incidenceformatter.cpp:2183
+#: incidenceformatter.cpp:3741
+msgid "31st Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3742
+msgid "30th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3743
+msgid "29th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3744
+msgid "28th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3745
+msgid "27th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3746
+msgid "26th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3747
+msgid "25th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3748
+msgid "24th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3749
+msgid "23rd Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3750
+msgid "22nd Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3751
+msgid "21st Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3752
+msgid "20th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3753
+msgid "19th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3754
+msgid "18th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3755
+msgid "17th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3756
+msgid "16th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3757
+msgid "15th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3758
+msgid "14th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3759
+msgid "13th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3760
+msgid "12th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3761
+msgid "11th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3762
+msgid "10th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3763
+msgid "9th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3764
+msgid "8th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3765
+msgid "7th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3766
+msgid "6th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3767
+msgid "5th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3768
+msgid "4th Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3769
+msgid "3rd Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3770
+msgid "2nd Last"
+msgstr ""
+
+#: incidenceformatter.cpp:3771
 msgid ""
-"_n: Recurs every minute until %1\n"
-"Recurs every %n minutes until %1"
+"_: last day of the month\n"
+"Last"
 msgstr ""
 
-#: incidenceformatter.cpp:2185
+#: incidenceformatter.cpp:3772
+msgid ""
+"_: unknown day of the month\n"
+"unknown"
+msgstr ""
+
+#: incidenceformatter.cpp:3773
+msgid "1st"
+msgstr ""
+
+#: incidenceformatter.cpp:3774
+msgid "2nd"
+msgstr ""
+
+#: incidenceformatter.cpp:3775
+msgid "3rd"
+msgstr ""
+
+#: incidenceformatter.cpp:3776
+msgid "4th"
+msgstr ""
+
+#: incidenceformatter.cpp:3777
+msgid "5th"
+msgstr ""
+
+#: incidenceformatter.cpp:3778
+msgid "6th"
+msgstr ""
+
+#: incidenceformatter.cpp:3779
+msgid "7th"
+msgstr ""
+
+#: incidenceformatter.cpp:3780
+msgid "8th"
+msgstr ""
+
+#: incidenceformatter.cpp:3781
+msgid "9th"
+msgstr ""
+
+#: incidenceformatter.cpp:3782
+msgid "10th"
+msgstr ""
+
+#: incidenceformatter.cpp:3783
+msgid "11th"
+msgstr ""
+
+#: incidenceformatter.cpp:3784
+msgid "12th"
+msgstr ""
+
+#: incidenceformatter.cpp:3785
+msgid "13th"
+msgstr ""
+
+#: incidenceformatter.cpp:3786
+msgid "14th"
+msgstr ""
+
+#: incidenceformatter.cpp:3787
+msgid "15th"
+msgstr ""
+
+#: incidenceformatter.cpp:3788
+msgid "16th"
+msgstr ""
+
+#: incidenceformatter.cpp:3789
+msgid "17th"
+msgstr ""
+
+#: incidenceformatter.cpp:3790
+msgid "18th"
+msgstr ""
+
+#: incidenceformatter.cpp:3791
+msgid "19th"
+msgstr ""
+
+#: incidenceformatter.cpp:3792
+msgid "20th"
+msgstr ""
+
+#: incidenceformatter.cpp:3793
+msgid "21st"
+msgstr ""
+
+#: incidenceformatter.cpp:3794
+msgid "22nd"
+msgstr ""
+
+#: incidenceformatter.cpp:3795
+msgid "23rd"
+msgstr ""
+
+#: incidenceformatter.cpp:3796
+msgid "24th"
+msgstr ""
+
+#: incidenceformatter.cpp:3797
+msgid "25th"
+msgstr ""
+
+#: incidenceformatter.cpp:3798
+msgid "26th"
+msgstr ""
+
+#: incidenceformatter.cpp:3799
+msgid "27th"
+msgstr ""
+
+#: incidenceformatter.cpp:3800
+msgid "28th"
+msgstr ""
+
+#: incidenceformatter.cpp:3801
+msgid "29th"
+msgstr ""
+
+#: incidenceformatter.cpp:3802
+msgid "30th"
+msgstr ""
+
+#: incidenceformatter.cpp:3803
+msgid "31st"
+msgstr ""
+
+#: incidenceformatter.cpp:3814
 #, fuzzy, c-format
 msgid ""
 "_n: Recurs every minute\n"
 "Recurs every %n minutes"
 msgstr "%n 分"
 
-#: incidenceformatter.cpp:2188
-msgid ""
-"_n: Recurs hourly until %1\n"
-"Recurs every %n hours until %1"
+#: incidenceformatter.cpp:3816 incidenceformatter.cpp:3827
+#: incidenceformatter.cpp:3839
+msgid "%1 until %2"
 msgstr ""
 
-#: incidenceformatter.cpp:2190
+#: incidenceformatter.cpp:3818 incidenceformatter.cpp:3829
+#: incidenceformatter.cpp:3841 incidenceformatter.cpp:3868
+#: incidenceformatter.cpp:3888 incidenceformatter.cpp:3914
+#: incidenceformatter.cpp:3937 incidenceformatter.cpp:3974
+#: incidenceformatter.cpp:3998
+#, fuzzy
+msgid " (%1 occurrences)"
+msgstr "下次出现"
+
+#: incidenceformatter.cpp:3825
 #, fuzzy, c-format
 msgid ""
 "_n: Recurs hourly\n"
 "Recurs every %n hours"
 msgstr "%n 小时"
 
-#: incidenceformatter.cpp:2193
+#: incidenceformatter.cpp:3836
+#, c-format
 msgid ""
-"_n: Recurs daily until %1\n"
-"Recurs every %n days until %1"
+"_n: Recurs daily\n"
+"Recurs every %n days"
 msgstr ""
 
-#: incidenceformatter.cpp:2195
+#: incidenceformatter.cpp:3849
 #, c-format
 msgid ""
-"_n: Recurs daily\n"
-"Recurs every %n days"
+"_n: Recurs weekly\n"
+"Recurs every %n weeks"
 msgstr ""
 
-#: incidenceformatter.cpp:2198
+#: incidenceformatter.cpp:3855
 msgid ""
-"_n: Recurs weekly until %1\n"
-"Recurs every %n weeks until %1"
+"_: separator for list of days\n"
+", "
 msgstr ""
 
-#: incidenceformatter.cpp:2200
-#, c-format
+#: incidenceformatter.cpp:3862
 msgid ""
-"_n: Recurs weekly\n"
-"Recurs every %n weeks"
+"_: Recurs weekly on no days\n"
+"no days"
 msgstr ""
 
-#: incidenceformatter.cpp:2204
-#, c-format
-msgid "Recurs monthly until %1"
+#: incidenceformatter.cpp:3865
+msgid "%1 on %2 until %3"
 msgstr ""
 
-#: incidenceformatter.cpp:2205
-msgid "Recurs monthly"
+#: incidenceformatter.cpp:3872
+msgid "%1 on %2"
+msgstr ""
+
+#: incidenceformatter.cpp:3877 incidenceformatter.cpp:3904
+#, fuzzy, c-format
+msgid ""
+"_n: Recurs monthly\n"
+"Recurs every %n months"
+msgstr "%n 小时"
+
+#: incidenceformatter.cpp:3882
+msgid "%1 on the %2 %3 until %4"
 msgstr ""
 
-#: incidenceformatter.cpp:2210
+#: incidenceformatter.cpp:3892
+msgid "%1 on the %2 %3"
+msgstr ""
+
+#: incidenceformatter.cpp:3909
+msgid "%1 on the %2 day until %3"
+msgstr ""
+
+#: incidenceformatter.cpp:3918
+msgid "%1 on the %2 day"
+msgstr ""
+
+#: incidenceformatter.cpp:3927 incidenceformatter.cpp:3966
+#, fuzzy, c-format
+msgid ""
+"_n: Recurs yearly\n"
+"Recurs every %n years"
+msgstr "%n 小时"
+
+#: incidenceformatter.cpp:3931
+msgid "%1 on %2 %3 until %4"
+msgstr ""
+
+#: incidenceformatter.cpp:3943
+msgid "%1 on %2 %3"
+msgstr ""
+
+#: incidenceformatter.cpp:3950 incidenceformatter.cpp:3955
+msgid "Recurs yearly on %1 %2"
+msgstr ""
+
+#: incidenceformatter.cpp:3969
+msgid "%1 on day %2 until %3"
+msgstr ""
+
+#: incidenceformatter.cpp:3978
+msgid "%1 on day %2"
+msgstr ""
+
+#: incidenceformatter.cpp:3987
 #, c-format
-msgid "Recurs yearly until %1"
+msgid ""
+"_n: Every year\n"
+"Every %n years"
+msgstr ""
+
+#: incidenceformatter.cpp:3991
+msgid "%1 on the %2 %3 of %4 until %5"
 msgstr ""
 
-#: incidenceformatter.cpp:2211
-msgid "Recurs yearly"
+#: incidenceformatter.cpp:4002
+msgid "%1 on the %2 %3 of %4"
 msgstr ""
 
-#: incidenceformatter.cpp:2213
+#: incidenceformatter.cpp:4015
 msgid "Incidence recurs"
 msgstr ""
 
+#: incidenceformatter.cpp:4071 incidenceformatter.cpp:4097
+#: incidenceformatter.cpp:4110
+#, fuzzy, c-format
+msgid ""
+"_n: 1 day\n"
+"%n days"
+msgstr "%n 秒"
+
+#: incidenceformatter.cpp:4077
+#, fuzzy, c-format
+msgid ""
+"_n: 1 hour\n"
+"%n hours"
+msgstr "%n 小时"
+
+#: incidenceformatter.cpp:4083
+#, fuzzy, c-format
+msgid ""
+"_n: 1 minute\n"
+"%n minutes"
+msgstr "%n 分"
+
+#: incidenceformatter.cpp:4101
+#, fuzzy
+msgid "forever"
+msgstr "从不"
+
+#: incidenceformatter.cpp:4143
+msgid ""
+"_: N days/hours/minutes before the start datetime\n"
+"%1 before the start"
+msgstr ""
+
+#: incidenceformatter.cpp:4146
+msgid ""
+"_: N days/hours/minutes after the start datetime\n"
+"%1 after the start"
+msgstr ""
+
+#: incidenceformatter.cpp:4158
+msgid ""
+"_: N days/hours/minutes before the due datetime\n"
+"%1 before the to-do is due"
+msgstr ""
+
+#: incidenceformatter.cpp:4161
+msgid ""
+"_: N days/hours/minutes before the end datetime\n"
+"%1 before the end"
+msgstr ""
+
+#: incidenceformatter.cpp:4166
+msgid ""
+"_: N days/hours/minutes after the due datetime\n"
+"%1 after the to-do is due"
+msgstr ""
+
+#: incidenceformatter.cpp:4169
+msgid ""
+"_: N days/hours/minutes after the end datetime\n"
+"%1 after the end"
+msgstr ""
+
+#: incidenceformatter.cpp:4187
+#, c-format
+msgid ""
+"_: reminder occurs at datetime\n"
+"at %1"
+msgstr ""
+
+#: incidenceformatter.cpp:4194
+#, c-format
+msgid ""
+"_n: repeats once\n"
+"repeats %n times"
+msgstr ""
+
+#: incidenceformatter.cpp:4195
+#, c-format
+msgid ""
+"_: interval is N days/hours/minutes\n"
+"interval is %1"
+msgstr ""
+
+#: incidenceformatter.cpp:4197
+msgid ""
+"_: (repeat string, interval string)\n"
+"(%1, %2)"
+msgstr ""
+
 #: qtopiaformat.cpp:297
 msgid "Could not open file '%1'"
 msgstr ""
@@ -1391,12 +2221,12 @@ msgstr "日记列表标题"
 msgid "Title of the free/busy list"
 msgstr "忙/闲列表标题"
 
-#: resourcecached.cpp:630
+#: resourcecached.cpp:691
 #, c-format
 msgid "Last loaded: %1"
 msgstr "上次装入：%1"
 
-#: resourcecached.cpp:635
+#: resourcecached.cpp:696
 #, c-format
 msgid "Last saved: %1"
 msgstr "上次保存：%1"
@@ -1437,27 +2267,23 @@ msgstr "更改后延迟"
 msgid "On every change"
 msgstr "每次更改时"
 
-#: resourcecalendar.cpp:57
+#: resourcecalendar.cpp:77
 #, c-format
 msgid "Type: %1"
 msgstr "类型：%1"
 
-#: resourcecalendar.cpp:149
+#: resourcecalendar.cpp:175
 msgid ""
 "Error while loading %1.\n"
 msgstr ""
 "装入 %1 出错。\n"
 
-#: resourcecalendar.cpp:186
+#: resourcecalendar.cpp:212
 msgid ""
 "Error while saving %1.\n"
 msgstr ""
 "保存 %1 出错。\n"
 
-#: resourcelocalconfig.cpp:49 resourcelocaldirconfig.cpp:47
-msgid "Location:"
-msgstr "位置："
-
 #: resourcelocalconfig.cpp:54
 msgid "Calendar Format"
 msgstr "日历格式"
@@ -1477,84 +2303,189 @@ msgid ""
 "resource properties."
 msgstr ""
 
-#: scheduler.cpp:50
+#: resourcelocaldirconfig.cpp:72
+msgid "No location specified.  The calendar will be read-only."
+msgstr ""
+
+#: scheduler.cpp:53
 msgid "Updated Publish"
 msgstr "更新了发布"
 
-#: scheduler.cpp:52 scheduler.cpp:154
+#: scheduler.cpp:55 scheduler.cpp:160
 msgid "Publish"
 msgstr "发布"
 
-#: scheduler.cpp:54
+#: scheduler.cpp:57
 msgid "Obsolete"
 msgstr ""
 
-#: scheduler.cpp:56
+#: scheduler.cpp:59
 msgid "New Request"
 msgstr "新请求"
 
-#: scheduler.cpp:58
+#: scheduler.cpp:61
 msgid "Updated Request"
 msgstr "更新了请求"
 
-#: scheduler.cpp:60
+#: scheduler.cpp:63
 #, c-format
 msgid "Unknown Status: %1"
 msgstr "未知状态：%1"
 
-#: scheduler.cpp:156
+#: scheduler.cpp:162
 msgid "Request"
 msgstr "请求"
 
-#: scheduler.cpp:158
+#: scheduler.cpp:164
 msgid "Refresh"
 msgstr "刷新"
 
-#: scheduler.cpp:164
+#: scheduler.cpp:170
 msgid "Reply"
 msgstr "回复"
 
-#: scheduler.cpp:166
+#: scheduler.cpp:172
 msgid ""
 "_: counter proposal\n"
 "Counter"
 msgstr ""
 
-#: scheduler.cpp:168
+#: scheduler.cpp:174
 msgid ""
 "_: decline counter proposal\n"
 "Decline Counter"
 msgstr ""
 
-#: scheduler.cpp:170
+#: scheduler.cpp:176
 msgid "Unknown"
 msgstr "未知"
 
-#: scheduler.cpp:341
+#: scheduler.cpp:310
+msgid ""
+"<qt>You accepted an invitation update, but an earlier version of the item could "
+"not be found in your calendar."
+"<p>This may have occurred because:"
+"<ul>"
+"<li>the organizer did not include you in the original invitation</li>"
+"<li>you did not accept the original invitation yet</li>"
+"<li>you deleted the original invitation from your calendar</li>"
+"<li>you no longer have access to the calendar containing the invitation</li>"
+"</ul>This is not a problem, but we thought you should know.</qt>"
+msgstr ""
+
+#: scheduler.cpp:320
+msgid "Cannot find invitation to be updated"
+msgstr ""
+
+#: scheduler.cpp:329
+msgid "No calendars found, unable to save the invitation."
+msgstr ""
+
+#: scheduler.cpp:357
+msgid ""
+"You canceled the save operation. Therefore, the appointment will not be stored "
+"in your calendar even though you accepted the invitation. Are you certain you "
+"want to discard this invitation? "
+msgstr ""
+
+#: scheduler.cpp:360
+#, fuzzy
+msgid "Discard this invitation?"
+msgstr "发送者拒绝了会议邀请"
+
+#: scheduler.cpp:361
+msgid "Go Back to Folder Selection"
+msgstr ""
+
+#: scheduler.cpp:364
+msgid ""
+"The invitation \"%1\" was not saved to your calendar but you are still listed "
+"as an attendee for that appointment.\n"
+"If you mistakenly accepted the invitation or do not plan to attend, please "
+"notify the organizer %2 and ask them to remove you from the attendee list."
+msgstr ""
+
+#: scheduler.cpp:380
+msgid "Unable to save %1 \"%2\"."
+msgstr ""
+
+#: scheduler.cpp:487
+msgid ""
+"The event or task could not be removed from your calendar. Maybe it has already "
+"been deleted or is not owned by you. Or it might belong to a read-only or "
+"disabled calendar."
+msgstr ""
+
+#: scheduler.cpp:520
+msgid ""
+"The event or task to be canceled could not be removed from your calendar. Maybe "
+"it has already been deleted or is not owned by you. Or it might belong to a "
+"read-only or disabled calendar."
+msgstr ""
+
+#: scheduler.cpp:593
 msgid "%1 wants to attend %2 but was not invited."
 msgstr ""
 
-#: scheduler.cpp:344
+#: scheduler.cpp:596
 msgid "%1 wants to attend %2 on behalf of %3."
 msgstr ""
 
-#: scheduler.cpp:347
+#: scheduler.cpp:599
 msgid "Uninvited attendee"
 msgstr ""
 
-#: scheduler.cpp:348
+#: scheduler.cpp:600
 #, fuzzy
 msgid "Accept Attendance"
 msgstr "已接受"
 
-#: scheduler.cpp:348
+#: scheduler.cpp:600
 msgid "Reject Attendance"
 msgstr ""
 
-#: scheduler.cpp:353
+#: scheduler.cpp:605
 msgid "The organizer rejected your attendance at this meeting."
 msgstr ""
 
+#: scheduler.cpp:627
+msgid ""
+"An attendee was added to the incidence. Do you want to email the attendees an "
+"update message?"
+msgstr ""
+
+#: scheduler.cpp:629
+msgid "Attendee Added"
+msgstr ""
+
+#: scheduler.cpp:629
+msgid "Send Messages"
+msgstr ""
+
+#: scheduler.cpp:630
+msgid "Do Not Send"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Date"
+#~ msgstr "日期："
+
+#, fuzzy
+#~ msgid "Description"
+#~ msgstr "描述："
+
+#~ msgid "Unspecified"
+#~ msgstr "未指定"
+
+#~ msgid "Journal for %1"
+#~ msgstr "%1 的日历"
+
+#~ msgid "<i>Location:</i>&nbsp;%1"
+#~ msgstr "<i>位置：</i>&nbsp;%1"
+
+#~ msgid "<i>Description:</i><br>"
+#~ msgstr "<i>描述：</i><br>"
+
 #~ msgid "Category"
 #~ msgstr "类别"
 
diff --git a/tde-i18n-zh_CN/messages/tdepim/libkholidays.po b/tde-i18n-zh_CN/messages/tdepim/libkholidays.po
index 058ed59eeeb..622be82eac2 100644
--- a/tde-i18n-zh_CN/messages/tdepim/libkholidays.po
+++ b/tde-i18n-zh_CN/messages/tdepim/libkholidays.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkholidays\n"
-"POT-Creation-Date: 2005-02-19 01:28+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-01-26 16:02+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdepim/libkleopatra.po b/tde-i18n-zh_CN/messages/tdepim/libkleopatra.po
index 2209c3a25b4..73650baff43 100644
--- a/tde-i18n-zh_CN/messages/tdepim/libkleopatra.po
+++ b/tde-i18n-zh_CN/messages/tdepim/libkleopatra.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkleopatra\n"
-"POT-Creation-Date: 2008-08-19 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-09-02 16:25+0800\n"
 "Last-Translator: Levin <zsdjw@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -387,19 +388,26 @@ msgstr "扫描结果"
 msgid "&Reset"
 msgstr "重置(&R)"
 
-#: ui/cryptoconfigmodule.cpp:577
+#: ui/cryptoconfigmodule.cpp:132
+msgid ""
+"The gpgconf tool used to provide the information for this dialog does not seem "
+"to be installed properly. It did not return any components. Try running \"%1\" "
+"on the command line for more information."
+msgstr ""
+
+#: ui/cryptoconfigmodule.cpp:605
 msgid "Edit..."
 msgstr "编辑..."
 
-#: ui/cryptoconfigmodule.cpp:609
+#: ui/cryptoconfigmodule.cpp:637
 msgid "Configure LDAP Servers"
 msgstr "配置 LDAP 服务器"
 
-#: ui/cryptoconfigmodule.cpp:628
+#: ui/cryptoconfigmodule.cpp:656
 msgid "No server configured yet"
 msgstr "尚未配置服务器"
 
-#: ui/cryptoconfigmodule.cpp:630
+#: ui/cryptoconfigmodule.cpp:658
 #, c-format
 msgid ""
 "_n: 1 server configured\n"
@@ -498,12 +506,12 @@ msgstr "加密首选项："
 msgid "Change..."
 msgstr "更改..."
 
-#: ui/keyrequester.cpp:218 ui/keyselectiondialog.cpp:216
+#: ui/keyrequester.cpp:218 ui/keyselectiondialog.cpp:224
 msgid "<unknown>"
 msgstr "<未知>"
 
-#: backends/qgpgme/qgpgmekeylistjob.cpp:180 ui/keyrequester.cpp:231
-#: ui/keyselectiondialog.cpp:520
+#: backends/qgpgme/qgpgmekeylistjob.cpp:196 ui/keyrequester.cpp:231
+#: ui/keyselectiondialog.cpp:572
 msgid ""
 "<qt>"
 "<p>An error occurred while fetching the keys from the backend:</p>"
@@ -511,7 +519,7 @@ msgid ""
 msgstr "<qt><p>从后端获取密钥时发生错误：</p><p><b>%1</b></p></qt>"
 
 #: ui/keyrequester.cpp:236 ui/keyrequester.cpp:265 ui/keyrequester.cpp:289
-#: ui/keyselectiondialog.cpp:493 ui/keyselectiondialog.cpp:525
+#: ui/keyselectiondialog.cpp:543 ui/keyselectiondialog.cpp:577
 msgid "Key Listing Failed"
 msgstr "密钥列出时失败"
 
@@ -549,19 +557,19 @@ msgstr "密钥选择"
 msgid "Please select an (OpenPGP or S/MIME) key to use."
 msgstr "请选择要使用的密钥(OpenPGP 或 S/MIME)。"
 
-#: ui/keyselectiondialog.cpp:192
+#: ui/keyselectiondialog.cpp:200
 msgid "Key ID"
 msgstr "密钥标识"
 
-#: ui/keyselectiondialog.cpp:193
+#: ui/keyselectiondialog.cpp:201
 msgid "User ID"
 msgstr "用户标识"
 
-#: ui/keyselectiondialog.cpp:237
+#: ui/keyselectiondialog.cpp:245
 msgid "never"
 msgstr "从不"
 
-#: ui/keyselectiondialog.cpp:240
+#: ui/keyselectiondialog.cpp:248
 msgid ""
 "OpenPGP key for %1\n"
 "Created: %2\n"
@@ -573,13 +581,13 @@ msgstr ""
 "过期：%3\n"
 "指纹：%4"
 
-#: ui/keyselectiondialog.cpp:244 ui/keyselectiondialog.cpp:246
-#: ui/keyselectiondialog.cpp:253 ui/keyselectiondialog.cpp:255
-#: ui/keyselectiondialog.cpp:256
+#: ui/keyselectiondialog.cpp:252 ui/keyselectiondialog.cpp:254
+#: ui/keyselectiondialog.cpp:261 ui/keyselectiondialog.cpp:263
+#: ui/keyselectiondialog.cpp:264
 msgid "unknown"
 msgstr "未知"
 
-#: ui/keyselectiondialog.cpp:248
+#: ui/keyselectiondialog.cpp:256
 msgid ""
 "S/MIME key for %1\n"
 "Created: %2\n"
@@ -593,50 +601,54 @@ msgstr ""
 "指纹：%4\n"
 "发布者：%5"
 
-#: ui/keyselectiondialog.cpp:355
+#: ui/keyselectiondialog.cpp:392
+msgid "Search for &External Certificates"
+msgstr ""
+
+#: ui/keyselectiondialog.cpp:405
 msgid "&Search for:"
 msgstr "搜索(&S)："
 
-#: ui/keyselectiondialog.cpp:375
+#: ui/keyselectiondialog.cpp:425
 msgid "&Remember choice"
 msgstr "记住选择(&R)"
 
-#: ui/keyselectiondialog.cpp:378
+#: ui/keyselectiondialog.cpp:428
 msgid ""
 "<qt>"
 "<p>If you check this box your choice will be stored and you will not be asked "
 "again.</p></qt>"
 msgstr "<qt><p>如果选中该项，您的选择将会储存起来，不会再提问。</p></qt>"
 
-#: ui/keyselectiondialog.cpp:394
+#: ui/keyselectiondialog.cpp:444
 msgid "&Reread Keys"
 msgstr "重读密钥(&R)"
 
-#: ui/keyselectiondialog.cpp:395
+#: ui/keyselectiondialog.cpp:445
 msgid "&Start Certificate Manager"
 msgstr ""
 
-#: ui/keyselectiondialog.cpp:491
+#: ui/keyselectiondialog.cpp:541
 msgid "No backends found for listing keys. Check your installation."
 msgstr "没有找到可以列出密钥的后端，请检查您的安装。"
 
-#: ui/keyselectiondialog.cpp:509
+#: ui/keyselectiondialog.cpp:561
 msgid "Could not start certificate manager; please check your installation."
 msgstr ""
 
-#: ui/keyselectiondialog.cpp:511
+#: ui/keyselectiondialog.cpp:563
 msgid "Certificate Manager Error"
 msgstr ""
 
-#: ui/keyselectiondialog.cpp:558
+#: ui/keyselectiondialog.cpp:612
 msgid "Checking selected keys..."
 msgstr "正在检查选中的密钥..."
 
-#: ui/keyselectiondialog.cpp:558
+#: ui/keyselectiondialog.cpp:612
 msgid "Fetching keys..."
 msgstr "正在获取密钥..."
 
-#: ui/keyselectiondialog.cpp:584
+#: ui/keyselectiondialog.cpp:641
 #, c-format
 msgid ""
 "_n: <qt>One backend returned truncated output."
@@ -645,101 +657,112 @@ msgid ""
 "<br>Not all available keys are shown</qt>"
 msgstr "<qt>有 %n 个后端程序返回截断了的输出。<br>可用的密钥没有全部列出</qt>"
 
-#: ui/keyselectiondialog.cpp:587
+#: ui/keyselectiondialog.cpp:644
 msgid "Key List Result"
 msgstr "密钥列表结果"
 
-#: ui/keyselectiondialog.cpp:694
+#: ui/keyselectiondialog.cpp:759
 msgid "Recheck Key"
 msgstr "重新检查密钥"
 
-#: ui/messagebox.cpp:60
+#: ui/messagebox.cpp:65
 msgid "&Save to Disk..."
 msgstr ""
 
-#: ui/messagebox.cpp:64
+#: ui/messagebox.cpp:69
 msgid "&Copy to Clipboard"
 msgstr ""
 
-#: ui/messagebox.cpp:64
+#: ui/messagebox.cpp:69
 msgid "Copy Audit Log to Clipboard"
 msgstr ""
 
-#: ui/messagebox.cpp:68
+#: ui/messagebox.cpp:73
 msgid "&Show Audit Log"
 msgstr ""
 
-#: ui/messagebox.cpp:75
+#: ui/messagebox.cpp:81
 msgid "View GnuPG Audit Log"
 msgstr ""
 
-#: ui/messagebox.cpp:94
+#: ui/messagebox.cpp:112
 msgid "Choose File to Save GnuPG Audit Log to"
 msgstr ""
 
-#: ui/messagebox.cpp:106
+#: ui/messagebox.cpp:129
 msgid "Couldn't save to file \"%1\": %2"
 msgstr ""
 
-#: ui/messagebox.cpp:108
+#: ui/messagebox.cpp:131
 #, fuzzy
 msgid "File Save Error"
 msgstr "文件错误。"
 
-#: ui/messagebox.cpp:129
+#: ui/messagebox.cpp:153
 msgid "Your system does not have support for GnuPG Audit Logs"
 msgstr ""
 
-#: ui/messagebox.cpp:130
+#: ui/messagebox.cpp:154
 msgid "System Error"
 msgstr ""
 
-#: ui/messagebox.cpp:136
+#: ui/messagebox.cpp:161
+#, c-format
+msgid ""
+"An error occurred while trying to retrieve the GnuPG Audit Log:\n"
+"%1"
+msgstr ""
+
+#: ui/messagebox.cpp:163
+msgid "GnuPG Audit Log Error"
+msgstr ""
+
+#: ui/messagebox.cpp:170
 msgid "No GnuPG Audit Log available for this operation."
 msgstr ""
 
-#: ui/messagebox.cpp:137
+#: ui/messagebox.cpp:171
 msgid "No GnuPG Audit Log"
 msgstr ""
 
-#: ui/messagebox.cpp:153 ui/messagebox.cpp:158
+#: ui/messagebox.cpp:187 ui/messagebox.cpp:192
 msgid "GnuPG Audit Log Viewer"
 msgstr ""
 
-#: ui/messagebox.cpp:163
+#: ui/messagebox.cpp:197
 #, c-format
 msgid "Signing failed: %1"
 msgstr "签名失败：%1"
 
-#: ui/messagebox.cpp:164
+#: ui/messagebox.cpp:198
 msgid "Signing successful"
 msgstr ""
 
-#: backends/chiasmus/chiasmusjob.cpp:209 ui/messagebox.cpp:173
+#: backends/chiasmus/chiasmusjob.cpp:209 ui/messagebox.cpp:207
 #, c-format
 msgid "Encryption failed: %1"
 msgstr "加密失败：%1"
 
-#: ui/messagebox.cpp:174
+#: ui/messagebox.cpp:208
 #, fuzzy
 msgid "Encryption successful"
 msgstr "加密密钥："
 
-#: ui/messagebox.cpp:191
+#: ui/messagebox.cpp:225
 #, fuzzy
 msgid "Signing Result"
 msgstr "扫描结果"
 
-#: ui/messagebox.cpp:201
+#: ui/messagebox.cpp:235
 msgid "Signing Error"
 msgstr ""
 
-#: ui/messagebox.cpp:211 ui/messagebox.cpp:231
+#: ui/messagebox.cpp:245 ui/messagebox.cpp:265
 #, fuzzy
 msgid "Encryption Result"
 msgstr "加密密钥："
 
-#: ui/messagebox.cpp:221 ui/messagebox.cpp:241
+#: ui/messagebox.cpp:255 ui/messagebox.cpp:275
 #, fuzzy
 msgid "Encryption Error"
 msgstr "加密密钥："
diff --git a/tde-i18n-zh_CN/messages/tdepim/libkmime.po b/tde-i18n-zh_CN/messages/tdepim/libkmime.po
index 425648a8ed5..f5d6f583942 100644
--- a/tde-i18n-zh_CN/messages/tdepim/libkmime.po
+++ b/tde-i18n-zh_CN/messages/tdepim/libkmime.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkmime\n"
-"POT-Creation-Date: 2008-04-25 05:30+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-02-14 14:33+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -52,21 +53,21 @@ msgid ""
 msgstr ""
 "对在 ${date} 发送给 ${to} 主题为“${subject}”的信件生成信件投递通知失败。原因在下面的 Failure: 头字段中已给出。"
 
-#: kmime_util.cpp:665
+#: kmime_util.cpp:642
 msgid "unknown"
 msgstr "未知"
 
-#: kmime_util.cpp:682
+#: kmime_util.cpp:659
 #, c-format
 msgid "Today %1"
 msgstr "今天 %1"
 
-#: kmime_util.cpp:689
+#: kmime_util.cpp:666
 #, c-format
 msgid "Yesterday %1"
 msgstr "昨天 %1"
 
-#: kmime_util.cpp:697
+#: kmime_util.cpp:674
 msgid ""
 "_: 1. weekday, 2. time\n"
 "%1 %2"
diff --git a/tde-i18n-zh_CN/messages/tdepim/libkpimexchange.po b/tde-i18n-zh_CN/messages/tdepim/libkpimexchange.po
index 7eb4fe0893d..be7032409a7 100644
--- a/tde-i18n-zh_CN/messages/tdepim/libkpimexchange.po
+++ b/tde-i18n-zh_CN/messages/tdepim/libkpimexchange.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libkpimexchange\n"
-"POT-Creation-Date: 2004-10-12 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-05-06 17:11-0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdepim/libksieve.po b/tde-i18n-zh_CN/messages/tdepim/libksieve.po
index 0a3ea38c556..c20377c4d84 100644
--- a/tde-i18n-zh_CN/messages/tdepim/libksieve.po
+++ b/tde-i18n-zh_CN/messages/tdepim/libksieve.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libksieve\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2004-03-15 22:05+0800\n"
 "Last-Translator: Levin <zsdjw@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdepim/libtdepim.po b/tde-i18n-zh_CN/messages/tdepim/libtdepim.po
index fb6ced66dda..375af03a0d5 100644
--- a/tde-i18n-zh_CN/messages/tdepim/libtdepim.po
+++ b/tde-i18n-zh_CN/messages/tdepim/libtdepim.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: libtdepim\n"
-"POT-Creation-Date: 2008-07-14 01:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-08-03 22:05+0800\n"
 "Last-Translator: Levin <zsdjw@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,98 +22,98 @@ msgstr "<qt>执行签名脚本失败<br><b>%1</b>：<br>%2</qt>"
 msgid "%1 (Default)"
 msgstr "%1 (默认)"
 
-#: ../libkpimidentities/identitymanager.cpp:342
+#: ../libkpimidentities/identitymanager.cpp:340
 msgid "Unnamed"
 msgstr "未命名"
 
-#: ../libemailfunctions/email.cpp:457
+#: ../libemailfunctions/email.cpp:465
 msgid ""
 "The email address you entered is not valid because it contains more than one @. "
 "You will not create valid messages if you do not change your address."
 msgstr "您输入的电子邮件地址无效，因为它包含多个 @ 字符。如果您不更改您的地址，您将无法创建有效的邮件。"
 
-#: ../libemailfunctions/email.cpp:462
+#: ../libemailfunctions/email.cpp:470
 msgid ""
 "The email address you entered is not valid because it does not contain a @.You "
 "will not create valid messages if you do not change your address."
 msgstr "您输入的电子邮件地址无效，因为它不包含 @ 字符。如果您不更改您的地址，您将无法创建有效的邮件。"
 
-#: ../libemailfunctions/email.cpp:467
+#: ../libemailfunctions/email.cpp:475
 msgid "You have to enter something in the email address field."
 msgstr "您必须在电子邮件地址框中输入内容。"
 
-#: ../libemailfunctions/email.cpp:469
+#: ../libemailfunctions/email.cpp:477
 msgid ""
 "The email address you entered is not valid because it does not contain a local "
 "part."
 msgstr "您输入的电子邮件地址无效，因为它不包含用户名。"
 
-#: ../libemailfunctions/email.cpp:472
+#: ../libemailfunctions/email.cpp:480
 msgid ""
 "The email address you entered is not valid because it does not contain a domain "
 "part."
 msgstr "您输入的电子邮件地址无效，因为它不包含域名。"
 
-#: ../libemailfunctions/email.cpp:475
+#: ../libemailfunctions/email.cpp:483
 msgid ""
 "The email address you entered is not valid because it contains unclosed "
 "comments/brackets."
 msgstr "您输入的电子邮件地址无效，因为它包含不匹配的注释/括号。"
 
-#: ../libemailfunctions/email.cpp:478
+#: ../libemailfunctions/email.cpp:486
 msgid "The email address you entered is valid."
 msgstr "您所输入的电子邮件地址有效。"
 
-#: ../libemailfunctions/email.cpp:480
+#: ../libemailfunctions/email.cpp:488
 msgid ""
 "The email address you entered is not valid because it contains an unclosed "
 "anglebracket."
 msgstr "您输入的电子邮件地址无效，因为它不包含右尖括号。"
 
-#: ../libemailfunctions/email.cpp:483
+#: ../libemailfunctions/email.cpp:491
 msgid ""
 "The email address you entered is not valid because it contains an unopened "
 "anglebracket."
 msgstr "您输入的电子邮件地址无效，因为它不包含左尖括号。"
 
-#: ../libemailfunctions/email.cpp:486
+#: ../libemailfunctions/email.cpp:494
 msgid ""
 "The email address you have entered is not valid because it contains an "
 "unexpected comma."
 msgstr "您输入的电子邮件地址无效，因为它包含意外的逗号。"
 
-#: ../libemailfunctions/email.cpp:489
+#: ../libemailfunctions/email.cpp:497
 msgid ""
 "The email address you entered is not valid because it ended unexpectedly, this "
 "probably means you have used an escaping type character like an \\  as the last "
 "character in your email address."
 msgstr "您输入的电子邮件地址无效，因为它异常结束。这可能意味着您在电子邮件地址的最后一个字符处使用了类似“\\”的转码字符。"
 
-#: ../libemailfunctions/email.cpp:494
+#: ../libemailfunctions/email.cpp:502
 msgid ""
 "The email address you entered is not valid because it contains quoted text "
 "which does not end."
 msgstr "您输入的电子邮件地址无效，因为它包含未结束的引号。"
 
-#: ../libemailfunctions/email.cpp:497 ../libemailfunctions/email.cpp:558
+#: ../libemailfunctions/email.cpp:505 ../libemailfunctions/email.cpp:566
 msgid ""
 "The email address you entered is not valid because it does not seem to contain "
 "an actual email address, i.e. something of the form joe@kde.org."
 msgstr "您输入的电子邮件地址无效，因为它不包含实际的电子邮件地址，如类似 joe@kde.org。"
 
-#: ../libemailfunctions/email.cpp:501
+#: ../libemailfunctions/email.cpp:509
 msgid ""
 "The email address you entered is not valid because it contains an illegal "
 "character."
 msgstr "您输入的电子邮件地址无效，因为它包含非法字符。"
 
-#: ../libemailfunctions/email.cpp:504
+#: ../libemailfunctions/email.cpp:512
 msgid ""
 "The email address you have entered is not valid because it contains an invalid "
 "displayname."
 msgstr "您输入的电子邮件地址无效，因为它包含无效的显示名。"
 
-#: ../libemailfunctions/email.cpp:507
+#: ../libemailfunctions/email.cpp:515
 msgid "Unknown problem with email address"
 msgstr "电子邮件地址有未知问题"
 
@@ -128,8 +129,8 @@ msgid ""
 "Your emails"
 msgstr "i18n-translation@lists.linux.net.cn"
 
-#: addresseeemailselection.cpp:47 addressesdialog.cpp:238
-#: addressesdialog.cpp:719
+#: addresseeemailselection.cpp:47 addressesdialog.cpp:243
+#: addressesdialog.cpp:727
 msgid "To"
 msgstr "收件人"
 
@@ -141,17 +142,17 @@ msgstr "Cc"
 msgid "Bcc"
 msgstr "Bcc"
 
-#: addresseeemailselection.cpp:196 addressesdialog.cpp:319
-#: recentaddresses.cpp:167
+#: addresseeemailselection.cpp:196 addressesdialog.cpp:324
+#: completionordereditor.cpp:208 recentaddresses.cpp:167
 msgid "Recent Addresses"
 msgstr "最近使用的地址"
 
-#: addresseelineedit.cpp:553 addressesdialog.cpp:1088
-#: completionordereditor.cpp:204
+#: addresseelineedit.cpp:594 addressesdialog.cpp:1152
+#: completionordereditor.cpp:205
 msgid "Distribution Lists"
 msgstr "分发列表"
 
-#: addresseelineedit.cpp:873
+#: addresseelineedit.cpp:927
 msgid "Configure Completion Order..."
 msgstr "编辑完成顺序..."
 
@@ -227,8 +228,8 @@ msgstr "隐藏自定义域"
 msgid "SMS"
 msgstr "短消息"
 
-#: addresseeview.cpp:254 ldapsearchdialog.cpp:76 ldapsearchdialog.cpp:144
-#: ldapsearchdialog.cpp:275 ldapsearchdialog.cpp:346
+#: addresseeview.cpp:254 ldapsearchdialog.cpp:78 ldapsearchdialog.cpp:156
+#: ldapsearchdialog.cpp:287 ldapsearchdialog.cpp:358
 msgid "Email"
 msgstr "电子邮件"
 
@@ -244,7 +245,7 @@ msgstr "博客种子"
 msgid "Notes"
 msgstr "备注"
 
-#: addresseeview.cpp:343 ldapsearchdialog.cpp:88 ldapsearchdialog.cpp:288
+#: addresseeview.cpp:343 ldapsearchdialog.cpp:90 ldapsearchdialog.cpp:300
 msgid "Department"
 msgstr "部门"
 
@@ -324,43 +325,43 @@ msgstr "打开 URL %1"
 msgid "Chat with %1"
 msgstr "与 %1 聊天"
 
-#: addressesdialog.cpp:123 addressesdialog.cpp:131
+#: addressesdialog.cpp:125 addressesdialog.cpp:133
 msgid "<group>"
 msgstr "<组>"
 
 #. i18n: file addresspicker.ui line 16
-#: addressesdialog.cpp:214 rc.cpp:3
+#: addressesdialog.cpp:216 rc.cpp:3
 #, no-c-format
 msgid "Address Selection"
 msgstr "地址选择"
 
-#: addressesdialog.cpp:249 addressesdialog.cpp:741
+#: addressesdialog.cpp:254 addressesdialog.cpp:748
 msgid "CC"
 msgstr "抄送"
 
-#: addressesdialog.cpp:260 addressesdialog.cpp:763
+#: addressesdialog.cpp:265 addressesdialog.cpp:769
 msgid "BCC"
 msgstr "密送"
 
-#: addressesdialog.cpp:458
+#: addressesdialog.cpp:464
 msgid "Other Addresses"
 msgstr "其它地址"
 
-#: addressesdialog.cpp:883
+#: addressesdialog.cpp:888
 msgid ""
 "There are no addresses in your list. First add some addresses from your address "
 "book, then try again."
 msgstr "您的列表中没有地址。请先从您的地址簿添加一些地址，然后再试一次。"
 
-#: addressesdialog.cpp:890
+#: addressesdialog.cpp:895
 msgid "New Distribution List"
 msgstr "新建分发列表"
 
-#: addressesdialog.cpp:891
+#: addressesdialog.cpp:896
 msgid "Please enter name:"
 msgstr "请输入名称："
 
-#: addressesdialog.cpp:908
+#: addressesdialog.cpp:913
 msgid ""
 "<qt>Distribution list with the given name <b>%1</b> already exists. Please "
 "select a different name.</qt>"
@@ -449,8 +450,8 @@ msgstr "有持续时间"
 msgid "Duration"
 msgstr "持续时间"
 
-#: calendardiffalgo.cpp:135 ksubscription.cpp:270 ldapsearchdialog.cpp:91
-#: ldapsearchdialog.cpp:289
+#: calendardiffalgo.cpp:135 ksubscription.cpp:270 ldapsearchdialog.cpp:93
+#: ldapsearchdialog.cpp:301
 msgid "Description"
 msgstr "描述"
 
@@ -558,12 +559,12 @@ msgstr "新建类别"
 msgid "Select Categories"
 msgstr "选择类别"
 
-#: completionordereditor.cpp:90
+#: completionordereditor.cpp:91
 #, c-format
 msgid "LDAP server %1"
 msgstr "LDAP 服务器 %1"
 
-#: completionordereditor.cpp:176
+#: completionordereditor.cpp:177
 msgid "Edit Completion Order"
 msgstr "编辑完成顺序"
 
@@ -632,50 +633,53 @@ msgid "KCMDesignerfields"
 msgstr "KCMDesignerfields"
 
 #: kcmdesignerfields.cpp:135
-msgid "Qt Designer Fields Dialog"
+#, fuzzy
+msgid "TQt Designer Fields Dialog"
 msgstr "Qt 设计师域对话框"
 
 #: kcmdesignerfields.cpp:137
 msgid "(c), 2004 Tobias Koenig"
 msgstr "(c)，2004 Tobias Koenig"
 
-#: kcmdesignerfields.cpp:178
+#: kcmdesignerfields.cpp:179
 msgid "<qt>Do you really want to delete '<b>%1</b>'?</qt>"
 msgstr "<qt>您真的想要删除“<b>%1</b>”吗？</qt>"
 
-#: kcmdesignerfields.cpp:187
+#: kcmdesignerfields.cpp:188
 msgid "*.ui|Designer Files"
 msgstr "*.ui|设计师文件"
 
-#: kcmdesignerfields.cpp:188
+#: kcmdesignerfields.cpp:189
 msgid "Import Page"
 msgstr "导入页面"
 
-#: kcmdesignerfields.cpp:271
+#: kcmdesignerfields.cpp:272
+#, fuzzy
 msgid ""
-"<qt><b>Warning:</b> Qt Designer could not be found. It is probably not "
+"<qt><b>Warning:</b> TQt Designer could not be found. It is probably not "
 "installed. You will only be able to import existing designer files.</qt>"
 msgstr "<qt><b>警告：</b>找不到 Qt 设计师。可能您没有安装该工具。您只能导入已有的设计师文件。</qt>"
 
-#: kcmdesignerfields.cpp:280
+#: kcmdesignerfields.cpp:281
 msgid "Available Pages"
 msgstr "可用页面"
 
-#: kcmdesignerfields.cpp:286
+#: kcmdesignerfields.cpp:287
 msgid "Preview of Selected Page"
 msgstr "选中页面预览"
 
-#: kcmdesignerfields.cpp:299
+#: kcmdesignerfields.cpp:300
+#, fuzzy
 msgid ""
 "<qt>"
 "<p>This section allows you to add your own GUI  Elements ('<i>Widgets</i>"
 "') to store your own values into %1. Proceed as described below:</p>"
 "<ol>"
-"<li>Click on '<i>Edit with Qt Designer</i>'"
+"<li>Click on '<i>Edit with TQt Designer</i>'"
 "<li>In the dialog, select '<i>Widget</i>', then click <i>OK</i>"
 "<li>Add your widgets to the form"
-"<li>Save the file in the directory proposed by Qt Designer"
-"<li>Close Qt Designer</ol>"
+"<li>Save the file in the directory proposed by TQt Designer"
+"<li>Close TQt Designer</ol>"
 "<p>In case you already have a designer file (*.ui) located somewhere on your "
 "hard disk, simply choose '<i>Import Page</i>'</p>"
 "<p><b>Important:</b> The name of each input widget you place within the form "
@@ -684,7 +688,7 @@ msgid ""
 "X_Foo</i>'.</p>"
 "<p><b>Important:</b> The widget will edit custom fields with an application "
 "name of %2.  To change the application name to be edited, set the widget name "
-"in Qt Designer.</p></qt>"
+"in TQt Designer.</p></qt>"
 msgstr ""
 "<qt>"
 "<p>本节允许您添加您自己的 GUI 元素(“<i>部件</i>”)，以便将您自己的值存储到 %1。请按照下列步骤执行：</p>"
@@ -699,89 +703,39 @@ msgstr ""
 "”相对应，请将部件的 <i>name</i> 属性设置为“<i>X_Foo</i>”。</p>"
 "<p><b>重要：</b>部件将会以 %2 为应用程序名称编辑自定义域。要更改进行编辑的应用程序名称，请在 Qt 设计师中设定部件名称。</p></qt>"
 
-#: kcmdesignerfields.cpp:321
+#: kcmdesignerfields.cpp:322
 msgid "<a href=\"whatsthis:%1\">How does this work?</a>"
 msgstr "<a href=\"whatsthis:%1\">我想知道原理...</a>"
 
-#: kcmdesignerfields.cpp:329
+#: kcmdesignerfields.cpp:330
 msgid "Delete Page"
 msgstr "删除页面"
 
-#: kcmdesignerfields.cpp:332
+#: kcmdesignerfields.cpp:333
 msgid "Import Page..."
 msgstr "导入页面..."
 
-#: kcmdesignerfields.cpp:334
-msgid "Edit with Qt Designer..."
+#: kcmdesignerfields.cpp:335
+#, fuzzy
+msgid "Edit with TQt Designer..."
 msgstr "用 Qt 设计师编辑..."
 
-#: kcmdesignerfields.cpp:362
+#: kcmdesignerfields.cpp:363
 msgid "Key:"
 msgstr "关键字："
 
-#: kcmdesignerfields.cpp:364
+#: kcmdesignerfields.cpp:365
 msgid "Type:"
 msgstr "类型："
 
-#: kcmdesignerfields.cpp:366
+#: kcmdesignerfields.cpp:367
 msgid "Classname:"
 msgstr "类名："
 
-#: kcmdesignerfields.cpp:368
+#: kcmdesignerfields.cpp:369
 msgid "Description:"
 msgstr "描述："
 
-#: tdeconfigpropagator.cpp:39
-msgid "Change Config Value"
-msgstr "更改配置值"
-
-#: tdeconfigwizard.cpp:36 tdeconfigwizard.cpp:45
-msgid "Configuration Wizard"
-msgstr "配置向导"
-
-#: tdeconfigwizard.cpp:84
-msgid "Rules"
-msgstr "规则"
-
-#: tdeconfigwizard.cpp:90
-msgid "Source"
-msgstr "来源"
-
-#: tdeconfigwizard.cpp:91
-msgid "Target"
-msgstr "目标"
-
-#: tdeconfigwizard.cpp:92
-msgid "Condition"
-msgstr "条件"
-
-#: tdeconfigwizard.cpp:125
-msgid "Changes"
-msgstr "更改"
-
-#: tdeconfigwizard.cpp:131
-msgid "Action"
-msgstr "动作"
-
-#: tdeconfigwizard.cpp:132
-msgid "Option"
-msgstr "选项"
-
-#: tdeconfigwizard.cpp:133
-msgid "Value"
-msgstr "值"
-
-#: tdeconfigwizard.cpp:166
-msgid ""
-"Please make sure that the programs which are configured by the wizard do not "
-"run in parallel to the wizard; otherwise, changes done by the wizard could be "
-"lost."
-msgstr "请确定由向导配置的程序未在同时运行；否则，向导所做的更改可能丢失。"
-
-#: tdeconfigwizard.cpp:169
-msgid "Run Wizard Now"
-msgstr "立即运行向导"
-
 #: kdateedit.cpp:332
 msgid "tomorrow"
 msgstr "明天"
@@ -814,153 +768,6 @@ msgstr "下个月(&O)"
 msgid "No Date"
 msgstr "无日期"
 
-#: tdefileio.cpp:31
-msgid "File I/O Error"
-msgstr "文件 I/O 错误"
-
-#: tdefileio.cpp:51 tdefileio.cpp:122
-#, c-format
-msgid ""
-"The specified file does not exist:\n"
-"%1"
-msgstr ""
-"指定文件不存在：\n"
-"%1"
-
-#: tdefileio.cpp:57 tdefileio.cpp:129
-#, c-format
-msgid ""
-"This is a folder and not a file:\n"
-"%1"
-msgstr ""
-"这是文件夹而不是文件：\n"
-"%1"
-
-#: tdefileio.cpp:63 tdefileio.cpp:136
-#, c-format
-msgid ""
-"You do not have read permissions to the file:\n"
-"%1"
-msgstr ""
-"您没有权限读取文件：\n"
-"%1"
-
-#: tdefileio.cpp:74 tdefileio.cpp:147
-#, c-format
-msgid ""
-"Could not read file:\n"
-"%1"
-msgstr ""
-"无法读取文件：\n"
-"%1"
-
-#: tdefileio.cpp:77 tdefileio.cpp:150
-#, c-format
-msgid ""
-"Could not open file:\n"
-"%1"
-msgstr ""
-"无法打开文件：\n"
-"%1"
-
-#: tdefileio.cpp:80 tdefileio.cpp:153
-#, c-format
-msgid ""
-"Error while reading file:\n"
-"%1"
-msgstr ""
-"读取文件时出错：\n"
-"%1"
-
-#: tdefileio.cpp:96 tdefileio.cpp:165
-msgid "Could only read %1 bytes of %2."
-msgstr "无法读取%1字节，共%2字节。"
-
-#: tdefileio.cpp:193
-msgid ""
-"File %1 exists.\n"
-"Do you want to replace it?"
-msgstr ""
-"文件 %1 已存在。\n"
-"您是否想要替换？"
-
-#: tdefileio.cpp:196 tdefileio.cpp:213
-msgid "Save to File"
-msgstr "保存到文件"
-
-#: tdefileio.cpp:196
-msgid "&Replace"
-msgstr "替换(&R)"
-
-#: tdefileio.cpp:211
-msgid ""
-"Failed to make a backup copy of %1.\n"
-"Continue anyway?"
-msgstr ""
-"制作 %1 的备份失败。\n"
-"仍然继续吗？"
-
-#: tdefileio.cpp:224 tdefileio.cpp:241
-#, c-format
-msgid ""
-"Could not write to file:\n"
-"%1"
-msgstr ""
-"无法写入文件：\n"
-"%1"
-
-#: tdefileio.cpp:227
-#, c-format
-msgid ""
-"Could not open file for writing:\n"
-"%1"
-msgstr ""
-"无法打开文件写入：\n"
-"%1"
-
-#: tdefileio.cpp:231
-#, c-format
-msgid ""
-"Error while writing file:\n"
-"%1"
-msgstr ""
-"写入文件出错：\n"
-"%1"
-
-#: tdefileio.cpp:246
-msgid "Could only write %1 bytes of %2."
-msgstr "无法写入%1字节，共%2字节。"
-
-#: tdefileio.cpp:285
-msgid "%1 does not exist"
-msgstr "%1 不存在"
-
-#: tdefileio.cpp:297
-msgid "%1 is not accessible and that is unchangeable."
-msgstr "%1 不可访问，也因此无法更改。"
-
-#: tdefileio.cpp:318
-msgid "%1 is not readable and that is unchangeable."
-msgstr "%1 不可读，也因此无法更改。"
-
-#: tdefileio.cpp:334
-msgid "%1 is not writable and that is unchangeable."
-msgstr "%1 不可写，也因此无法更改。"
-
-#: tdefileio.cpp:349
-msgid "Folder %1 is inaccessible."
-msgstr "文件夹 %1 不可访问。"
-
-#: tdefileio.cpp:380
-msgid ""
-"Some files or folders do not have the right permissions, please correct them "
-"manually."
-msgstr "某些文件或文件夹没有正确的权限，请手动纠正。"
-
-#: tdefileio.cpp:383
-msgid "Permissions Check"
-msgstr "权限检查"
-
 #: kimportdialog.cpp:78
 msgid "Plain"
 msgstr "普通"
@@ -1436,7 +1243,7 @@ msgid "Current changes:"
 msgstr "当前更改："
 
 #. i18n: file addresspicker.ui line 25
-#: ksubscription.cpp:267 ldapsearchdialog.cpp:143 ldapsearchdialog.cpp:341
+#: ksubscription.cpp:267 ldapsearchdialog.cpp:155 ldapsearchdialog.cpp:353
 #: rc.cpp:6 rc.cpp:33
 #, no-c-format
 msgid "Name"
@@ -1481,120 +1288,120 @@ msgid ""
 "Clear"
 msgstr "清除"
 
-#: ldapsearchdialog.cpp:74 ldapsearchdialog.cpp:291
+#: ldapsearchdialog.cpp:76 ldapsearchdialog.cpp:303
 msgid "Title"
 msgstr ""
 
-#: ldapsearchdialog.cpp:75 ldapsearchdialog.cpp:274
+#: ldapsearchdialog.cpp:77 ldapsearchdialog.cpp:286
 #, fuzzy
 msgid "Full Name"
 msgstr "名称"
 
-#: ldapsearchdialog.cpp:77 ldapsearchdialog.cpp:145 ldapsearchdialog.cpp:276
-#: ldapsearchdialog.cpp:348
+#: ldapsearchdialog.cpp:79 ldapsearchdialog.cpp:157 ldapsearchdialog.cpp:288
+#: ldapsearchdialog.cpp:360
 #, fuzzy
 msgid "Home Number"
 msgstr "隐藏电话号码"
 
-#: ldapsearchdialog.cpp:78 ldapsearchdialog.cpp:146 ldapsearchdialog.cpp:277
-#: ldapsearchdialog.cpp:350
+#: ldapsearchdialog.cpp:80 ldapsearchdialog.cpp:158 ldapsearchdialog.cpp:289
+#: ldapsearchdialog.cpp:362
 msgid "Work Number"
 msgstr ""
 
-#: ldapsearchdialog.cpp:79 ldapsearchdialog.cpp:278
+#: ldapsearchdialog.cpp:81 ldapsearchdialog.cpp:290
 msgid "Mobile Number"
 msgstr ""
 
-#: ldapsearchdialog.cpp:80 ldapsearchdialog.cpp:279
+#: ldapsearchdialog.cpp:82 ldapsearchdialog.cpp:291
 msgid "Fax Number"
 msgstr ""
 
-#: ldapsearchdialog.cpp:81
+#: ldapsearchdialog.cpp:83
 msgid "Pager"
 msgstr ""
 
-#: ldapsearchdialog.cpp:82 ldapsearchdialog.cpp:282
+#: ldapsearchdialog.cpp:84 ldapsearchdialog.cpp:294
 msgid "Street"
 msgstr ""
 
-#: ldapsearchdialog.cpp:83 ldapsearchdialog.cpp:283
+#: ldapsearchdialog.cpp:85 ldapsearchdialog.cpp:295
 #, fuzzy
 msgid "State"
 msgstr "状态"
 
-#: ldapsearchdialog.cpp:84 ldapsearchdialog.cpp:284
+#: ldapsearchdialog.cpp:86 ldapsearchdialog.cpp:296
 msgid "Country"
 msgstr ""
 
-#: ldapsearchdialog.cpp:85 ldapsearchdialog.cpp:287
+#: ldapsearchdialog.cpp:87 ldapsearchdialog.cpp:299
 msgid "City"
 msgstr ""
 
-#: ldapsearchdialog.cpp:86 ldapsearchdialog.cpp:281
+#: ldapsearchdialog.cpp:88 ldapsearchdialog.cpp:293
 #, fuzzy
 msgid "Organization"
 msgstr "组织者"
 
-#: ldapsearchdialog.cpp:87 ldapsearchdialog.cpp:280
+#: ldapsearchdialog.cpp:89 ldapsearchdialog.cpp:292
 msgid "Company"
 msgstr ""
 
-#: ldapsearchdialog.cpp:89 ldapsearchdialog.cpp:285
+#: ldapsearchdialog.cpp:91 ldapsearchdialog.cpp:297
 msgid "Zip Code"
 msgstr ""
 
-#: ldapsearchdialog.cpp:90 ldapsearchdialog.cpp:286
+#: ldapsearchdialog.cpp:92 ldapsearchdialog.cpp:298
 #, fuzzy
 msgid "Postal Address"
 msgstr "显示邮政地址"
 
-#: ldapsearchdialog.cpp:92 ldapsearchdialog.cpp:290
+#: ldapsearchdialog.cpp:94 ldapsearchdialog.cpp:302
 #, fuzzy
 msgid "User ID"
 msgstr "UID"
 
-#: ldapsearchdialog.cpp:116 ldapsearchdialog.cpp:123
+#: ldapsearchdialog.cpp:128 ldapsearchdialog.cpp:135
 msgid "Search for Addresses in Directory"
 msgstr ""
 
-#: ldapsearchdialog.cpp:132
+#: ldapsearchdialog.cpp:144
 #, fuzzy
 msgid "Search for:"
 msgstr "搜索："
 
-#: ldapsearchdialog.cpp:139
+#: ldapsearchdialog.cpp:151
 msgid "in"
 msgstr ""
 
-#: ldapsearchdialog.cpp:152 ldapsearchdialog.cpp:406
+#: ldapsearchdialog.cpp:164 ldapsearchdialog.cpp:418
 #, fuzzy
 msgid "Search"
 msgstr "搜索："
 
-#: ldapsearchdialog.cpp:160
+#: ldapsearchdialog.cpp:172
 msgid "Recursive search"
 msgstr ""
 
-#: ldapsearchdialog.cpp:165
+#: ldapsearchdialog.cpp:177
 #, fuzzy
 msgid "Contains"
 msgstr "条件"
 
-#: ldapsearchdialog.cpp:166
+#: ldapsearchdialog.cpp:178
 #, fuzzy
 msgid "Starts With"
 msgstr "开始时间"
 
-#: ldapsearchdialog.cpp:179
+#: ldapsearchdialog.cpp:191
 msgid "Unselect All"
 msgstr ""
 
-#: ldapsearchdialog.cpp:181
+#: ldapsearchdialog.cpp:193
 #, fuzzy
 msgid "Add Selected"
 msgstr "地址选择"
 
-#: ldapsearchdialog.cpp:222
+#: ldapsearchdialog.cpp:234
 msgid ""
 "You must select a LDAP server before searching.\n"
 "You can do this from the menu Settings/Configure KAddressBook."
@@ -1754,14 +1561,212 @@ msgstr "连接未加密"
 msgid "Open detailed progress dialog"
 msgstr "打开详细进度对话框"
 
-#: statusbarprogresswidget.cpp:278
+#: statusbarprogresswidget.cpp:287
 msgid "Hide detailed progress window"
 msgstr "隐藏详细的进度窗口"
 
-#: statusbarprogresswidget.cpp:283
+#: statusbarprogresswidget.cpp:292
 msgid "Show detailed progress window"
 msgstr "显示详细进度对话框"
 
+#: tdeconfigpropagator.cpp:39
+msgid "Change Config Value"
+msgstr "更改配置值"
+
+#: tdeconfigwizard.cpp:36 tdeconfigwizard.cpp:45
+msgid "Configuration Wizard"
+msgstr "配置向导"
+
+#: tdeconfigwizard.cpp:84
+msgid "Rules"
+msgstr "规则"
+
+#: tdeconfigwizard.cpp:90
+msgid "Source"
+msgstr "来源"
+
+#: tdeconfigwizard.cpp:91
+msgid "Target"
+msgstr "目标"
+
+#: tdeconfigwizard.cpp:92
+msgid "Condition"
+msgstr "条件"
+
+#: tdeconfigwizard.cpp:125
+msgid "Changes"
+msgstr "更改"
+
+#: tdeconfigwizard.cpp:131
+msgid "Action"
+msgstr "动作"
+
+#: tdeconfigwizard.cpp:132
+msgid "Option"
+msgstr "选项"
+
+#: tdeconfigwizard.cpp:133
+msgid "Value"
+msgstr "值"
+
+#: tdeconfigwizard.cpp:166
+msgid ""
+"Please make sure that the programs which are configured by the wizard do not "
+"run in parallel to the wizard; otherwise, changes done by the wizard could be "
+"lost."
+msgstr "请确定由向导配置的程序未在同时运行；否则，向导所做的更改可能丢失。"
+
+#: tdeconfigwizard.cpp:169
+msgid "Run Wizard Now"
+msgstr "立即运行向导"
+
+#: tdefileio.cpp:31
+msgid "File I/O Error"
+msgstr "文件 I/O 错误"
+
+#: tdefileio.cpp:51 tdefileio.cpp:122
+#, c-format
+msgid ""
+"The specified file does not exist:\n"
+"%1"
+msgstr ""
+"指定文件不存在：\n"
+"%1"
+
+#: tdefileio.cpp:57 tdefileio.cpp:129
+#, c-format
+msgid ""
+"This is a folder and not a file:\n"
+"%1"
+msgstr ""
+"这是文件夹而不是文件：\n"
+"%1"
+
+#: tdefileio.cpp:63 tdefileio.cpp:136
+#, c-format
+msgid ""
+"You do not have read permissions to the file:\n"
+"%1"
+msgstr ""
+"您没有权限读取文件：\n"
+"%1"
+
+#: tdefileio.cpp:74 tdefileio.cpp:147
+#, c-format
+msgid ""
+"Could not read file:\n"
+"%1"
+msgstr ""
+"无法读取文件：\n"
+"%1"
+
+#: tdefileio.cpp:77 tdefileio.cpp:150
+#, c-format
+msgid ""
+"Could not open file:\n"
+"%1"
+msgstr ""
+"无法打开文件：\n"
+"%1"
+
+#: tdefileio.cpp:80 tdefileio.cpp:153
+#, c-format
+msgid ""
+"Error while reading file:\n"
+"%1"
+msgstr ""
+"读取文件时出错：\n"
+"%1"
+
+#: tdefileio.cpp:96 tdefileio.cpp:165
+msgid "Could only read %1 bytes of %2."
+msgstr "无法读取%1字节，共%2字节。"
+
+#: tdefileio.cpp:193
+msgid ""
+"File %1 exists.\n"
+"Do you want to replace it?"
+msgstr ""
+"文件 %1 已存在。\n"
+"您是否想要替换？"
+
+#: tdefileio.cpp:196 tdefileio.cpp:213
+msgid "Save to File"
+msgstr "保存到文件"
+
+#: tdefileio.cpp:196
+msgid "&Replace"
+msgstr "替换(&R)"
+
+#: tdefileio.cpp:211
+msgid ""
+"Failed to make a backup copy of %1.\n"
+"Continue anyway?"
+msgstr ""
+"制作 %1 的备份失败。\n"
+"仍然继续吗？"
+
+#: tdefileio.cpp:224 tdefileio.cpp:241
+#, c-format
+msgid ""
+"Could not write to file:\n"
+"%1"
+msgstr ""
+"无法写入文件：\n"
+"%1"
+
+#: tdefileio.cpp:227
+#, c-format
+msgid ""
+"Could not open file for writing:\n"
+"%1"
+msgstr ""
+"无法打开文件写入：\n"
+"%1"
+
+#: tdefileio.cpp:231
+#, c-format
+msgid ""
+"Error while writing file:\n"
+"%1"
+msgstr ""
+"写入文件出错：\n"
+"%1"
+
+#: tdefileio.cpp:246
+msgid "Could only write %1 bytes of %2."
+msgstr "无法写入%1字节，共%2字节。"
+
+#: tdefileio.cpp:285
+msgid "%1 does not exist"
+msgstr "%1 不存在"
+
+#: tdefileio.cpp:297
+msgid "%1 is not accessible and that is unchangeable."
+msgstr "%1 不可访问，也因此无法更改。"
+
+#: tdefileio.cpp:318
+msgid "%1 is not readable and that is unchangeable."
+msgstr "%1 不可读，也因此无法更改。"
+
+#: tdefileio.cpp:334
+msgid "%1 is not writable and that is unchangeable."
+msgstr "%1 不可写，也因此无法更改。"
+
+#: tdefileio.cpp:349
+msgid "Folder %1 is inaccessible."
+msgstr "文件夹 %1 不可访问。"
+
+#: tdefileio.cpp:380
+msgid ""
+"Some files or folders do not have the right permissions, please correct them "
+"manually."
+msgstr "某些文件或文件夹没有正确的权限，请手动纠正。"
+
+#: tdefileio.cpp:383
+msgid "Permissions Check"
+msgstr "权限检查"
+
 #~ msgid "Cannot save to addressbook."
 #~ msgstr "无法保存到地址簿。"
 
diff --git a/tde-i18n-zh_CN/messages/tdepim/tdeabc2mutt.po b/tde-i18n-zh_CN/messages/tdepim/tdeabc2mutt.po
index b8fd864e6e2..162083d694f 100644
--- a/tde-i18n-zh_CN/messages/tdepim/tdeabc2mutt.po
+++ b/tde-i18n-zh_CN/messages/tdepim/tdeabc2mutt.po
@@ -5,18 +5,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeabc2mutt\n"
-"POT-Creation-Date: 2005-04-12 18:18+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-08-03 21:13+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tdeabc2mutt.cpp:115
-msgid "preferred"
-msgstr "首选"
-
 #: main.cpp:30
 msgid "tdeabc2mutt"
 msgstr "tdeabc2mutt"
@@ -48,5 +45,10 @@ msgid "Return all mail addresses, not just the preferred one"
 msgstr "返回全部邮件地址，而不仅仅是首选地址"
 
 #: main.cpp:70
-msgid "Searching TDE addressbook"
+#, fuzzy
+msgid "Searching KDE addressbook"
 msgstr "正在搜索 TDE 地址簿"
+
+#: tdeabc2mutt.cpp:115
+msgid "preferred"
+msgstr "首选"
diff --git a/tde-i18n-zh_CN/messages/tdepim/tdeabc_slox.po b/tde-i18n-zh_CN/messages/tdepim/tdeabc_slox.po
index 54abf8f66ed..963d03da5f2 100644
--- a/tde-i18n-zh_CN/messages/tdepim/tdeabc_slox.po
+++ b/tde-i18n-zh_CN/messages/tdepim/tdeabc_slox.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeabc_slox\n"
-"POT-Creation-Date: 2006-05-17 04:02+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-02-15 13:02+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,62 +25,35 @@ msgid ""
 "Your emails"
 msgstr "i18n-translation@lists.linux.net.cn"
 
-#: tdeabcresourceslox.cpp:214
-msgid "Downloading contacts"
-msgstr "下载联系人"
-
-#: tdeabcresourceslox.cpp:523
-msgid "Uploading contacts"
-msgstr "上传联系人"
-
-#: tdeabcresourcesloxconfig.cpp:47
-msgid "URL:"
-msgstr "URL："
-
-#: tdeabcresourcesloxconfig.cpp:53 kcalresourcesloxconfig.cpp:56
-msgid "User:"
-msgstr "用户："
-
-#: tdeabcresourcesloxconfig.cpp:59 kcalresourcesloxconfig.cpp:62
-msgid "Password:"
-msgstr "密码："
-
-#. i18n: file tderesources_tdeabc_slox.kcfg line 19
-#: tdeabcresourcesloxconfig.cpp:66 kcalresourcesloxconfig.cpp:69 rc.cpp:12
-#: rc.cpp:36
-#, no-c-format
-msgid "Only load data since last sync"
-msgstr "仅装入上次同步后的数据"
-
-#: tdeabcresourcesloxconfig.cpp:70
-msgid "Select Folder..."
-msgstr "选择文件夹..."
+#: kcalresourceslox.cpp:74 tdeabcresourceslox.cpp:53
+msgid "OpenXchange Server"
+msgstr ""
 
-#: kcalresourceslox.cpp:178
+#: kcalresourceslox.cpp:180
 msgid "Non-http protocol: '%1'"
 msgstr "非 HTTP 协议：“%1”"
 
-#: kcalresourceslox.cpp:233
+#: kcalresourceslox.cpp:235
 msgid "Downloading events"
 msgstr "下载事件"
 
-#: kcalresourceslox.cpp:278
+#: kcalresourceslox.cpp:280
 msgid "Downloading to-dos"
 msgstr "下载待办"
 
-#: kcalresourceslox.cpp:387
+#: kcalresourceslox.cpp:389
 msgid "Uploading incidence"
 msgstr "上传事件"
 
-#: kcalresourceslox.cpp:1226
+#: kcalresourceslox.cpp:1228
 msgid "Added"
 msgstr "已添加"
 
-#: kcalresourceslox.cpp:1227
+#: kcalresourceslox.cpp:1229
 msgid "Changed"
 msgstr "已更改"
 
-#: kcalresourceslox.cpp:1228
+#: kcalresourceslox.cpp:1230
 msgid "Deleted"
 msgstr "已删除"
 
@@ -87,6 +61,21 @@ msgstr "已删除"
 msgid "Download from:"
 msgstr "下载 URL："
 
+#: kcalresourcesloxconfig.cpp:56 tdeabcresourcesloxconfig.cpp:53
+msgid "User:"
+msgstr "用户："
+
+#: kcalresourcesloxconfig.cpp:62 tdeabcresourcesloxconfig.cpp:59
+msgid "Password:"
+msgstr "密码："
+
+#. i18n: file tderesources_kcal_slox.kcfg line 25
+#: kcalresourcesloxconfig.cpp:69 rc.cpp:18 rc.cpp:36
+#: tdeabcresourcesloxconfig.cpp:66
+#, no-c-format
+msgid "Only load data since last sync"
+msgstr "仅装入上次同步后的数据"
+
 #: kcalresourcesloxconfig.cpp:73
 msgid "Calendar Folder..."
 msgstr "日历文件夹..."
@@ -95,60 +84,60 @@ msgstr "日历文件夹..."
 msgid "Task Folder..."
 msgstr "任务文件夹..."
 
-#. i18n: file tderesources_tdeabc_slox.kcfg line 10
-#: rc.cpp:3 rc.cpp:21
+#. i18n: file tderesources_kcal_slox.kcfg line 10
+#: rc.cpp:3 rc.cpp:27
 #, no-c-format
 msgid "Base Url"
 msgstr "基 URL"
 
-#. i18n: file tderesources_tdeabc_slox.kcfg line 13
-#: rc.cpp:6 rc.cpp:24
+#. i18n: file tderesources_kcal_slox.kcfg line 13
+#: rc.cpp:6 rc.cpp:30
 #, no-c-format
 msgid "User Name"
 msgstr "用户名"
 
-#. i18n: file tderesources_tdeabc_slox.kcfg line 16
-#: rc.cpp:9 rc.cpp:27
+#. i18n: file tderesources_kcal_slox.kcfg line 16
+#: rc.cpp:9 rc.cpp:33
 #, no-c-format
 msgid "Password"
 msgstr "密码"
 
-#. i18n: file tderesources_tdeabc_slox.kcfg line 23
-#: rc.cpp:15 sloxfolderdialog.cpp:37
-#, no-c-format
-msgid "Folder ID"
-msgstr "文件夹 ID"
-
-#. i18n: file tderesources_tdeabc_slox.kcfg line 27
-#: rc.cpp:18
-#, no-c-format
-msgid "Last Sync"
-msgstr "上次同步"
-
 #. i18n: file tderesources_kcal_slox.kcfg line 19
-#: rc.cpp:30
+#: rc.cpp:12
 #, no-c-format
 msgid "Last Event Sync"
 msgstr "上次事件同步"
 
 #. i18n: file tderesources_kcal_slox.kcfg line 22
-#: rc.cpp:33
+#: rc.cpp:15
 #, no-c-format
 msgid "Last To-do Sync"
 msgstr "上次待办同步"
 
 #. i18n: file tderesources_kcal_slox.kcfg line 29
-#: rc.cpp:39
+#: rc.cpp:21
 #, no-c-format
 msgid "Calendar Folder"
 msgstr "日历文件夹"
 
 #. i18n: file tderesources_kcal_slox.kcfg line 33
-#: rc.cpp:42
+#: rc.cpp:24
 #, no-c-format
 msgid "Task Folder"
 msgstr "任务文件夹"
 
+#. i18n: file tderesources_tdeabc_slox.kcfg line 23
+#: rc.cpp:39 sloxfolderdialog.cpp:37
+#, no-c-format
+msgid "Folder ID"
+msgstr "文件夹 ID"
+
+#. i18n: file tderesources_tdeabc_slox.kcfg line 27
+#: rc.cpp:42
+#, no-c-format
+msgid "Last Sync"
+msgstr "上次同步"
+
 #: sloxfolder.cpp:45
 msgid "Global Addressbook"
 msgstr "全局地址簿"
@@ -180,3 +169,19 @@ msgstr "共享文件夹"
 #: sloxfoldermanager.cpp:167
 msgid "System Folder"
 msgstr "系统文件夹"
+
+#: tdeabcresourceslox.cpp:216
+msgid "Downloading contacts"
+msgstr "下载联系人"
+
+#: tdeabcresourceslox.cpp:529
+msgid "Uploading contacts"
+msgstr "上传联系人"
+
+#: tdeabcresourcesloxconfig.cpp:47
+msgid "URL:"
+msgstr "URL："
+
+#: tdeabcresourcesloxconfig.cpp:70
+msgid "Select Folder..."
+msgstr "选择文件夹..."
diff --git a/tde-i18n-zh_CN/messages/tdepim/tdefile_ics.po b/tde-i18n-zh_CN/messages/tdepim/tdefile_ics.po
index 3fdc71bc354..d3567cb40a0 100644
--- a/tde-i18n-zh_CN/messages/tdepim/tdefile_ics.po
+++ b/tde-i18n-zh_CN/messages/tdepim/tdefile_ics.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_ics\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-02-04 02:36+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdepim/tdefile_palm.po b/tde-i18n-zh_CN/messages/tdepim/tdefile_palm.po
index 80b646236e4..02ebc2054da 100644
--- a/tde-i18n-zh_CN/messages/tdepim/tdefile_palm.po
+++ b/tde-i18n-zh_CN/messages/tdepim/tdefile_palm.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_palm\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-08-04 09:45+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdepim/tdefile_rfc822.po b/tde-i18n-zh_CN/messages/tdepim/tdefile_rfc822.po
index a802159beaa..a00cb050d8a 100644
--- a/tde-i18n-zh_CN/messages/tdepim/tdefile_rfc822.po
+++ b/tde-i18n-zh_CN/messages/tdepim/tdefile_rfc822.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_rfc822\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2002-10-29 13:02+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdepim/tdefile_vcf.po b/tde-i18n-zh_CN/messages/tdepim/tdefile_vcf.po
index a1d635336d8..80b86166f2f 100644
--- a/tde-i18n-zh_CN/messages/tdepim/tdefile_vcf.po
+++ b/tde-i18n-zh_CN/messages/tdepim/tdefile_vcf.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_vcf\n"
-"POT-Creation-Date: 2008-01-07 01:17+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2002-10-29 13:12+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdepim/tdeio_groupwise.po b/tde-i18n-zh_CN/messages/tdepim/tdeio_groupwise.po
index 9bd22422ac7..d1f38375ff9 100644
--- a/tde-i18n-zh_CN/messages/tdepim/tdeio_groupwise.po
+++ b/tde-i18n-zh_CN/messages/tdepim/tdeio_groupwise.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_groupwise\n"
-"POT-Creation-Date: 2006-12-12 02:40+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-08-03 21:39+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdepim/tdeio_imap4.po b/tde-i18n-zh_CN/messages/tdepim/tdeio_imap4.po
index aff41547c29..baece662be1 100644
--- a/tde-i18n-zh_CN/messages/tdepim/tdeio_imap4.po
+++ b/tde-i18n-zh_CN/messages/tdepim/tdeio_imap4.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_imap4\n"
-"POT-Creation-Date: 2008-01-26 01:19+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-08-04 09:52+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -92,11 +93,7 @@ msgid ""
 "%2"
 msgstr "获取文件夹 %2 的批注 %1 失败。服务器返回了：%3"
 
-#: imap4.cc:1783
-msgid "Unable to close mailbox."
-msgstr "无法关闭邮箱。"
-
-#: imap4.cc:2051
+#: imap4.cc:2052
 msgid ""
 "The server %1 supports neither IMAP4 nor IMAP4rev1.\n"
 "It identified itself with: %2"
@@ -104,7 +101,7 @@ msgstr ""
 "服务器 %1 既不支持 IMAP4 也不支持 IMAP4rev1。\n"
 "它将自身标识为：%2"
 
-#: imap4.cc:2062
+#: imap4.cc:2063
 msgid ""
 "The server does not support TLS.\n"
 "Disable this security feature to connect unencrypted."
@@ -112,23 +109,23 @@ msgstr ""
 "服务器不支持 TLS。\n"
 "请禁用此安全特性后再不加密连接。"
 
-#: imap4.cc:2087
+#: imap4.cc:2088
 msgid "Starting TLS failed."
 msgstr "启动 TLS 失败。"
 
-#: imap4.cc:2096
+#: imap4.cc:2097
 msgid "LOGIN is disabled by the server."
 msgstr "服务器禁止 LOGIN。"
 
-#: imap4.cc:2103
+#: imap4.cc:2104
 msgid "The authentication method %1 is not supported by the server."
 msgstr "服务器不支持身份验证方式 %1。"
 
-#: imap4.cc:2119
+#: imap4.cc:2132
 msgid "Username and password for your IMAP account:"
 msgstr "您 IMAP 账户的用户名和密码："
 
-#: imap4.cc:2133
+#: imap4.cc:2146
 msgid ""
 "Unable to login. Probably the password is wrong.\n"
 "The server %1 replied:\n"
@@ -138,7 +135,7 @@ msgstr ""
 "服务器 %1 返回了：\n"
 "%2"
 
-#: imap4.cc:2140
+#: imap4.cc:2153
 msgid ""
 "Unable to authenticate via %1.\n"
 "The server %2 replied:\n"
@@ -148,13 +145,16 @@ msgstr ""
 "服务器 %2 返回了：\n"
 "%3"
 
-#: imap4.cc:2147
+#: imap4.cc:2160
 msgid "SASL authentication is not compiled into tdeio_imap4."
 msgstr "SASL 身份验证未编译进 tdeio_imap4。"
 
-#: imap4.cc:2691
+#: imap4.cc:2704
 msgid "Unable to open folder %1. The server replied: %2"
 msgstr "无法打开文件夹 %1。服务器返回了：%2"
 
+#~ msgid "Unable to close mailbox."
+#~ msgstr "无法关闭邮箱。"
+
 #~ msgid "Unable to get information about folder %1. The server replied: %2"
 #~ msgstr "无法获得关于文件夹 %1 的信息。服务器返回了：%2"
diff --git a/tde-i18n-zh_CN/messages/tdepim/tdeio_mobile.po b/tde-i18n-zh_CN/messages/tdepim/tdeio_mobile.po
index 504199c9254..e4b7b30f6d1 100644
--- a/tde-i18n-zh_CN/messages/tdepim/tdeio_mobile.po
+++ b/tde-i18n-zh_CN/messages/tdepim/tdeio_mobile.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_mobile\n"
-"POT-Creation-Date: 2004-12-11 01:22+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2003-12-28 15:48+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdepim/tdeio_sieve.po b/tde-i18n-zh_CN/messages/tdepim/tdeio_sieve.po
index bdd9e1a768f..a347033c7db 100644
--- a/tde-i18n-zh_CN/messages/tdepim/tdeio_sieve.po
+++ b/tde-i18n-zh_CN/messages/tdepim/tdeio_sieve.po
@@ -5,72 +5,113 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_sieve\n"
-"POT-Creation-Date: 2008-03-07 02:10+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2003-12-28 15:50+0800\n"
 "Last-Translator: Zong Yaotang <zong@cosix.com.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: sieve.cpp:332
+#: sieve.cpp:343
 msgid "Connecting to %1..."
 msgstr "正在连接 %1..."
 
-#: sieve.cpp:335
+#: sieve.cpp:346
 msgid "The connection to the server was lost."
 msgstr "到服务器的连接已丢失。"
 
-#: sieve.cpp:347
+#: sieve.cpp:358
 msgid "Server identification failed."
 msgstr "服务器识别失败。"
 
-#: sieve.cpp:374
+#: sieve.cpp:364
+msgid "Can not use TLS. Please enable TLS in the TDE cryptography setting."
+msgstr ""
+
+#: sieve.cpp:371
+msgid ""
+"TLS encryption was requested, but your Sieve server does not advertise TLS in "
+"its capabilities.\n"
+"You can choose to try to initiate TLS negotiations nonetheless, or cancel the "
+"operation."
+msgstr ""
+
+#: sieve.cpp:373
+msgid "Server Does Not Advertise TLS"
+msgstr ""
+
+#: sieve.cpp:373
+msgid "&Start TLS nonetheless"
+msgstr ""
+
+#: sieve.cpp:375
+msgid "TLS encryption requested, but not supported by server."
+msgstr ""
+
+#: sieve.cpp:399
+msgid ""
+"Your Sieve server claims to support TLS, but negotiation was unsuccessful."
+msgstr ""
+
+#: sieve.cpp:401
+#, fuzzy
+msgid "Connection Failed"
+msgstr "认证失败。"
+
+#: sieve.cpp:408
+msgid ""
+"The server does not seem to support TLS. Disable TLS if you want to connect "
+"without encryption."
+msgstr ""
+
+#: sieve.cpp:418
 msgid "Authenticating user..."
 msgstr "正在认证用户..."
 
-#: sieve.cpp:377
+#: sieve.cpp:421
 msgid "Authentication failed."
 msgstr "认证失败。"
 
-#: sieve.cpp:441 sieve.cpp:653 sieve.cpp:743 sieve.cpp:777
+#: sieve.cpp:485 sieve.cpp:697 sieve.cpp:787 sieve.cpp:821
 msgid "Done."
 msgstr "完成。"
 
-#: sieve.cpp:453
+#: sieve.cpp:497
 msgid "Activating script..."
 msgstr "正在激活脚本..."
 
-#: sieve.cpp:469
+#: sieve.cpp:513
 msgid "There was an error activating the script."
 msgstr "激活脚本时发生错误。"
 
-#: sieve.cpp:487
+#: sieve.cpp:531
 msgid "There was an error deactivating the script."
 msgstr "取消激活脚本时发生错误。"
 
-#: sieve.cpp:515
+#: sieve.cpp:559
 msgid "Sending data..."
 msgstr "正在发送数据..."
 
-#: sieve.cpp:532
+#: sieve.cpp:576
 msgid "TDEIO data supply error."
 msgstr "TDEIO 数据提供错误。"
 
-#: sieve.cpp:559
+#: sieve.cpp:603
 msgid "Quota exceeded"
 msgstr "超过配额"
 
-#: sieve.cpp:592 sieve.cpp:1156
+#: sieve.cpp:636 sieve.cpp:1200
 msgid "Network error."
 msgstr "网络错误。"
 
-#: sieve.cpp:603
+#: sieve.cpp:647
 msgid "Verifying upload completion..."
 msgstr "正在核对上传完成..."
 
-#: sieve.cpp:629 sieve.cpp:637
+#: sieve.cpp:673 sieve.cpp:681
 #, c-format
 msgid ""
 "The script did not upload successfully.\n"
@@ -83,7 +124,7 @@ msgstr ""
 "服务器响应：\n"
 "%1"
 
-#: sieve.cpp:642 sieve.cpp:646
+#: sieve.cpp:686 sieve.cpp:690
 msgid ""
 "The script did not upload successfully.\n"
 "The script may contain errors."
@@ -91,49 +132,49 @@ msgstr ""
 "脚本上传不成功。\n"
 "脚本可能含有错误。"
 
-#: sieve.cpp:681
+#: sieve.cpp:725
 msgid "Retrieving data..."
 msgstr "正在获取数据..."
 
-#: sieve.cpp:730
+#: sieve.cpp:774
 msgid "Finishing up..."
 msgstr "正在结束..."
 
-#: sieve.cpp:738
+#: sieve.cpp:782
 msgid "A protocol error occurred while trying to negotiate script downloading."
 msgstr "当试图协商脚本下载时发生协议错误。"
 
-#: sieve.cpp:750
+#: sieve.cpp:794
 msgid "Folders are not supported."
 msgstr "不支持文件夹。"
 
-#: sieve.cpp:758
+#: sieve.cpp:802
 msgid "Deleting file..."
 msgstr "正在删除文件..."
 
-#: sieve.cpp:773
+#: sieve.cpp:817
 msgid "The server would not delete the file."
 msgstr "服务器将不删除文件。"
 
-#: sieve.cpp:792
+#: sieve.cpp:836
 msgid "Cannot chmod to anything but 0700 (active) or 0600 (inactive script)."
 msgstr "不能改变权限到 0700 (激活的)或 0600 (不激活的脚本)到外的任何值。"
 
-#: sieve.cpp:941
+#: sieve.cpp:985
 msgid "No authentication details supplied."
 msgstr "未提供认证细节。"
 
-#: sieve.cpp:999
+#: sieve.cpp:1043
 msgid "Sieve Authentication Details"
 msgstr "Sieve 认证细节"
 
-#: sieve.cpp:1000
+#: sieve.cpp:1044
 msgid ""
 "Please enter your authentication details for your sieve account (usually the "
 "same as your email password):"
 msgstr "请键入您的 Sieve 帐户的认证细节(通常与您的电子邮件密码相同)："
 
-#: sieve.cpp:1067 sieve.cpp:1079
+#: sieve.cpp:1111 sieve.cpp:1123
 #, c-format
 msgid ""
 "A protocol error occurred during authentication.\n"
@@ -142,7 +183,7 @@ msgstr ""
 "在认证时发生协议错误。\n"
 "请为 %1 选择其它认证方法。"
 
-#: sieve.cpp:1127
+#: sieve.cpp:1171
 #, c-format
 msgid ""
 "Authentication failed.\n"
@@ -155,7 +196,7 @@ msgstr ""
 "服务器回应：\n"
 "%1"
 
-#: sieve.cpp:1205
+#: sieve.cpp:1249
 msgid "A protocol error occurred."
 msgstr "发生了协议错误。"
 
diff --git a/tde-i18n-zh_CN/messages/tdepim/tdepimresources.po b/tde-i18n-zh_CN/messages/tdepim/tdepimresources.po
index be6bacfdf9e..748e6e7bbf7 100644
--- a/tde-i18n-zh_CN/messages/tdepim/tdepimresources.po
+++ b/tde-i18n-zh_CN/messages/tdepim/tdepimresources.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdepimresources\n"
-"POT-Creation-Date: 2005-03-13 01:24+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-01-26 16:02+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -99,29 +100,6 @@ msgid ""
 "%n items could not be uploaded."
 msgstr "无法更新 %n 项。"
 
-#: tdeabc_resourcegroupwarebase.cpp:92
-msgid "Downloading addressbook"
-msgstr "下载地址簿"
-
-#: tdeabc_resourcegroupwarebase.cpp:93
-msgid "Uploading addressbook"
-msgstr "上传地址簿"
-
-#: tdeabc_resourcegroupwarebaseconfig.cpp:45
-#: kcal_resourcegroupwarebaseconfig.cpp:54
-msgid "URL:"
-msgstr "URL："
-
-#: tdeabc_resourcegroupwarebaseconfig.cpp:51
-#: kcal_resourcegroupwarebaseconfig.cpp:59
-msgid "User:"
-msgstr "用户："
-
-#: tdeabc_resourcegroupwarebaseconfig.cpp:57
-#: kcal_resourcegroupwarebaseconfig.cpp:64
-msgid "Password:"
-msgstr "密码："
-
 #: kcal_cachesettingsdlg.cpp:42
 msgid "Resource Cache Settings"
 msgstr "资源缓存设置"
@@ -138,6 +116,21 @@ msgstr "已更改"
 msgid "Deleted"
 msgstr "已删除"
 
+#: kcal_resourcegroupwarebaseconfig.cpp:54
+#: tdeabc_resourcegroupwarebaseconfig.cpp:45
+msgid "URL:"
+msgstr "URL："
+
+#: kcal_resourcegroupwarebaseconfig.cpp:59
+#: tdeabc_resourcegroupwarebaseconfig.cpp:51
+msgid "User:"
+msgstr "用户："
+
+#: kcal_resourcegroupwarebaseconfig.cpp:64
+#: tdeabc_resourcegroupwarebaseconfig.cpp:57
+msgid "Password:"
+msgstr "密码："
+
 #: kcal_resourcegroupwarebaseconfig.cpp:76
 msgid "Configure Cache Settings..."
 msgstr "配置缓存设置..."
@@ -200,3 +193,11 @@ msgid ""
 msgstr ""
 "这里按顺序列出了不同数据类型的默认目的位置：\n"
 "事件、待办、日记、联系人、全部、未知"
+
+#: tdeabc_resourcegroupwarebase.cpp:92
+msgid "Downloading addressbook"
+msgstr "下载地址簿"
+
+#: tdeabc_resourcegroupwarebase.cpp:93
+msgid "Uploading addressbook"
+msgstr "上传地址簿"
diff --git a/tde-i18n-zh_CN/messages/tdepim/tdepimwizards.po b/tde-i18n-zh_CN/messages/tdepim/tdepimwizards.po
index cc8e786f136..b3200d980b5 100644
--- a/tde-i18n-zh_CN/messages/tdepim/tdepimwizards.po
+++ b/tde-i18n-zh_CN/messages/tdepim/tdepimwizards.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdepimwizards\n"
-"POT-Creation-Date: 2008-01-26 01:19+0100\n"
+"POT-Creation-Date: 2014-09-29 00:52-0500\n"
 "PO-Revision-Date: 2005-08-03 21:35+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,7 +27,7 @@ msgid "Create eGroupware Addressbook Resource"
 msgstr "创建 eGroupware 地址簿资源"
 
 #: egroupwarewizard.cpp:78 egroupwarewizard.cpp:139 egroupwarewizard.cpp:205
-#: overviewpage.cpp:64
+#: overviewpage.cpp:67
 msgid "eGroupware"
 msgstr "eGroupware"
 
@@ -175,7 +176,7 @@ msgstr "创建 GroupWise 地址簿资源"
 msgid "Update GroupWise Addressbook Resource"
 msgstr "创建 GroupWise 地址簿资源"
 
-#: groupwisewizard.cpp:271 overviewpage.cpp:78
+#: groupwisewizard.cpp:271
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
@@ -227,7 +228,7 @@ msgstr "日记"
 msgid "Create Disconnected IMAP Account for KMail"
 msgstr "为 KMail 创建断开的 IMAP 账户"
 
-#: kmailchanges.cpp:309
+#: kmailchanges.cpp:310
 msgid "Create Online IMAP Account for KMail"
 msgstr "为 KMail 创建在线 IMAP 账户"
 
@@ -293,18 +294,19 @@ msgid "TDE-PIM Groupware Configuration Wizard"
 msgstr "TDE-PIM 群件配置向导"
 
 #: overviewpage.cpp:61
-msgid "Select the type of server you want connect your TDE to:"
+#, fuzzy
+msgid "Select the type of server you want TDE to connect:"
 msgstr "请选择您想要 TDE 连接的服务器类型："
 
-#: overviewpage.cpp:70
+#: overviewpage.cpp:75
 msgid "Kolab"
 msgstr "Kolab"
 
-#: overviewpage.cpp:74
+#: overviewpage.cpp:81
 msgid "SUSE Linux Openexchange (SLOX)"
 msgstr "SUSE LINUX OpenExchange (SLOX)"
 
-#: overviewpage.cpp:82
+#: overviewpage.cpp:87
 msgid "Microsoft Exchange"
 msgstr "Microsoft Exchange"
 
@@ -400,8 +402,8 @@ msgstr "KCal 资源的 ID"
 
 #. i18n: file groupwise.kcfg line 56
 #: rc.cpp:60 rc.cpp:111
-#, no-c-format
-msgid "Id of KABC resource"
+#, fuzzy, no-c-format
+msgid "Id of TDEABC resource"
 msgstr "KABC 资源的 ID"
 
 #. i18n: file groupwise.kcfg line 59
diff --git a/tde-i18n-zh_CN/messages/tdesdk/cervisia.po b/tde-i18n-zh_CN/messages/tdesdk/cervisia.po
index 70e0605493a..e0c02040e74 100644
--- a/tde-i18n-zh_CN/messages/tdesdk/cervisia.po
+++ b/tde-i18n-zh_CN/messages/tdesdk/cervisia.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cervisia\n"
-"POT-Creation-Date: 2007-09-24 01:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-08-02 10:15+0800\n"
 "Last-Translator: Levin Du <zsdjw@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -562,7 +563,7 @@ msgstr "编辑方式"
 #, fuzzy
 msgid ""
 "Cervisia %1\n"
-"(Using TDE %2)\n"
+"(Using KDE %2)\n"
 "\n"
 "Copyright (c) 1999-2002\n"
 "Bernd Gehrmann <bernd@mail.berlios.de>\n"
diff --git a/tde-i18n-zh_CN/messages/tdesdk/cvsservice.po b/tde-i18n-zh_CN/messages/tdesdk/cvsservice.po
index 7d3d56cbbd1..c92d0b6bba8 100644
--- a/tde-i18n-zh_CN/messages/tdesdk/cvsservice.po
+++ b/tde-i18n-zh_CN/messages/tdesdk/cvsservice.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: cvsservice\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-01-05 12:03+0800\n"
 "Last-Translator: Xiong Jiang <jxiong@offtopic.org>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,7 +51,7 @@ msgstr "请在下面输入您的密码。"
 msgid "Repository:"
 msgstr "仓库："
 
-#: cvsloginjob.cpp:116
+#: cvsloginjob.cpp:117
 msgid "Please type in your password for the repository below."
 msgstr "请在下面输入仓库的密码。"
 
diff --git a/tde-i18n-zh_CN/messages/tdesdk/kbabel.po b/tde-i18n-zh_CN/messages/tdesdk/kbabel.po
index cadcae6fdce..0936cf343b0 100644
--- a/tde-i18n-zh_CN/messages/tdesdk/kbabel.po
+++ b/tde-i18n-zh_CN/messages/tdesdk/kbabel.po
@@ -9,1584 +9,26 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kbabel\n"
-"POT-Creation-Date: 2008-07-08 01:21+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-12-25 21:32+0800\n"
 "Last-Translator: Yan Shuangchun <yahzee@d3eye.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: catalogmanager/catalogmanagerview.cpp:89
-msgid "Name"
-msgstr "名称"
-
-#: catalogmanager/catalogmanagerview.cpp:90
-msgid "M"
-msgstr "M"
-
-#: catalogmanager/catalogmanagerview.cpp:91
-msgid "Fuzzy"
-msgstr "模糊翻译"
-
-#: catalogmanager/catalogmanagerview.cpp:92
-msgid "Untranslated"
-msgstr "未翻译"
-
-#: catalogmanager/catalogmanagerview.cpp:93
-msgid "Total"
-msgstr "总计"
-
-#: catalogmanager/catalogmanagerview.cpp:94 catalogmanager/future.cpp:5
-msgid "CVS/SVN Status"
-msgstr "CVS/SVN 状态"
-
-#: catalogmanager/catalogmanagerview.cpp:95
-msgid "Last Revision"
-msgstr "最后修订"
-
-#: addons/tdefile-plugins/tdefile_po.cpp:56
-#: catalogmanager/catalogmanagerview.cpp:96
-msgid "Last Translator"
-msgstr "最后翻译者"
-
-#: catalogmanager/catalogmanagerview.cpp:178
-#: catalogmanager/catalogmanagerview.cpp:2447
-#: catalogmanager/catalogmanagerview.cpp:2458
-msgid "Log Window"
-msgstr "日志窗口"
-
-#: catalogmanager/catalogmanagerview.cpp:180
-msgid "C&lear"
-msgstr "清除(&L)"
-
-#: catalogmanager/catalogmanagerview.cpp:183
-msgid ""
-"<qt>"
-"<p><b>Log window</b></p>\n"
-"<p>In this window the output of the executed commands are shown.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>日志窗口</b></p>\n"
-"<p>该窗口显示执行命令的输出结果。</p></qt>"
-
-#: catalogmanager/catalogmanagerview.cpp:194
-msgid ""
-"<qt>"
-"<p><b>Catalog Manager</b></p>\n"
-"<p>The Catalog Manager merges two folders into one tree and displays all\n"
-"PO and POT files in these folders. This way you can easily see if a\n"
-"template has been added or removed. Also some information about the files\n"
-"is displayed.</p>"
-"<p>For more information see section <b>The Catalog Manager</b> "
-"in the online help.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>目录管理器</b></p>\n"
-"<p>目录管理器将两个目录合并成一个文件树，然后显示这些文件夹中的所有\n"
-"PO 和 POT 文件。这样，您对新近添加或删除的模板文件就会一目了然。\n"
-"此外还显示一些关于文件的信息。\n"
-"</p>"
-"<p>详情请参阅在线帮助中的<b>“目录管理器”</b>。</p></qt>"
-
-#: catalogmanager/catalogmanagerview.cpp:448
-#: catalogmanager/catalogmanagerview.cpp:483 kbabel/kbabelview.cpp:1233
-#: kbabel/kbabelview.cpp:1349 kbabel/kbabelview2.cpp:757
-#, c-format
-msgid ""
-"Error while trying to open file:\n"
-" %1"
-msgstr ""
-"试图打开文件时出错：\n"
-" %1 "
-
-#: catalogmanager/catalogmanagerview.cpp:473
-msgid ""
-"Error while trying to read file:\n"
-" %1\n"
-"Maybe it is not a valid file with list of markings."
-msgstr ""
-"在试图读取文件时出错：\n"
-" %1\n"
-"也许它不是带有标记列表的有效文件。"
-
-#: catalogmanager/catalogmanagerview.cpp:519 kbabel/kbabelview.cpp:1451
-msgid "The file %1 already exists. Do you want to overwrite it?"
-msgstr "文件 %1 已经存在。您要覆盖该文件吗？"
-
-#: catalogmanager/catalogmanagerview.cpp:520 kbabel/kbabelview.cpp:1452
-#: kbabel/kbabelview.cpp:1521
-msgid "&Overwrite"
-msgstr "覆盖(&O)"
-
-#: catalogmanager/catalogmanagerview.cpp:571
-msgid ""
-"An error occurred while trying to write to file:\n"
-"%1\n"
-msgstr ""
-"在试图写入文件时出错：\n"
-"%1\n"
-
-#: catalogmanager/catalogmanagerview.cpp:580
-msgid ""
-"An error occurred while trying to upload the file:\n"
-"%1\n"
-msgstr ""
-"在试图上传文件时出错：\n"
-"%1\n"
-
-#: catalogmanager/catalogmanagerview.cpp:664
-#: catalogmanager/catalogmanagerview.cpp:691
-msgid ""
-"The Catalog Manager is still updating information about the files.\n"
-"If you continue, it will try to update all necessary files, however this can "
-"take a long time and may lead to wrong results. Please wait until all files are "
-"updated."
-msgstr ""
-"目录管理器仍在更新关于这些文件的信息。\n"
-"如果您继续，它会试图更新所有必要的文件，然而这项操作会花很长一段时间，且可能会导致错误的结果。在所有文件都被更新前请耐心等待。"
-
-#: catalogmanager/catalogmanagerview.cpp:769
-msgid ""
-"Statistics for all:\n"
-msgstr ""
-"全部的统计：\n"
-
-#: catalogmanager/catalogmanagerview.cpp:771
-msgid ""
-"Statistics for %1:\n"
-msgstr ""
-"%1 的统计：\n"
-
-#: catalogmanager/catalogmanagerview.cpp:773
-msgid ""
-"Number of packages: %1\n"
-msgstr ""
-"软件包数量：%1\n"
-
-#: catalogmanager/catalogmanagerview.cpp:776
-msgid ""
-"Complete translated: %1 % (%2)\n"
-msgstr ""
-"全部翻译完毕：%1 % (%2)\n"
-
-#: catalogmanager/catalogmanagerview.cpp:779
-msgid ""
-"Only template available: %1 % (%2)\n"
-msgstr ""
-"只有模板的：%1 % (%2)\n"
-
-#: catalogmanager/catalogmanagerview.cpp:781
-msgid ""
-"Only PO file available: %1 % (%2)\n"
-msgstr ""
-"只有 PO 文件的：%1 % (%2)\n"
-
-#: catalogmanager/catalogmanagerview.cpp:783
-msgid ""
-"Number of messages: %1\n"
-msgstr ""
-"消息数量：%1\n"
-
-#: catalogmanager/catalogmanagerview.cpp:787
-msgid ""
-"Translated: %1 % (%2)\n"
-msgstr ""
-"已翻译：%1 % (%2)\n"
-
-#: catalogmanager/catalogmanagerview.cpp:790
-msgid ""
-"Fuzzy: %1 % (%2)\n"
-msgstr ""
-"模糊翻译：%1 % (%2)\n"
-
-#: catalogmanager/catalogmanagerview.cpp:793
-msgid ""
-"Untranslated: %1 % (%2)\n"
-msgstr ""
-"未翻译：%1 % (%2)\n"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 790
-#: catalogmanager/catalogmanagerview.cpp:795 rc.cpp:1001 rc.cpp:1206
-#, no-c-format
-msgid "Statistics"
-msgstr "统计"
-
-#: catalogmanager/catalogmanagerview.cpp:820
-msgid ""
-"The file is syntactically correct.\n"
-"Output of \"msgfmt --statistics\":"
-msgstr ""
-"该文件在语法上是正确的。\n"
-"“msgfmt --statistics”的输出："
-
-#: catalogmanager/catalogmanagerview.cpp:825
-msgid ""
-"The file has syntax errors.\n"
-"Output of \"msgfmt --statistics\":"
-msgstr ""
-"该文件有语法错误。\n"
-"“msgfmt --statistics”的输出："
-
-#: catalogmanager/catalogmanagerview.cpp:830
-msgid ""
-"The file has header syntax error.\n"
-"Output of \"msgfmt --statistics\":"
-msgstr ""
-"该文件的文件头有语法错误。\n"
-"“msgfmt --statistics”的输出："
-
-#: catalogmanager/catalogmanagerview.cpp:835
-msgid "An error occurred while processing \"msgfmt --statistics\""
-msgstr "当执行“msgfmt --statistics”的时候出现错误"
-
-#: catalogmanager/catalogmanagerview.cpp:840
-#: catalogmanager/catalogmanagerview.cpp:929
-#, fuzzy
-msgid ""
-"Cannot execute msgfmt. Please make sure that you have msgfmt in your PATH."
-msgstr "无法执行 msgfmt。请确定您的 PATH 中有 msgfmt 命令。"
-
-#: catalogmanager/catalogmanagerview.cpp:845
-#: catalogmanager/catalogmanagerview.cpp:934 kbabel/kbabelview.cpp:1649
-#, fuzzy
-msgid "You can use gettext tools only for checking PO files."
-msgstr "你只可以用 gettext 工具来检查 GNU 的 PO 文件。"
-
-#: catalogmanager/catalogmanagerview.cpp:868
-msgid ""
-"All files in folder %1 are syntactically correct.\n"
-"Output of \"msgfmt --statistics\":\n"
-msgstr ""
-"%1 文件夹里的文件在语法上都是正确的。\n"
-"“msgfmt --statistics”的输出：\n"
-
-#: catalogmanager/catalogmanagerview.cpp:873
-msgid ""
-"All files in the base folder are syntactically correct.\n"
-"Output of \"msgfmt --statistics\":\n"
-msgstr ""
-"基准文件夹中的文件在语法上都是正确的。\n"
-"“msgfmt --statistics”的输出：\n"
-
-#: catalogmanager/catalogmanagerview.cpp:884
-msgid ""
-"At least one file in folder %1 has syntax errors.\n"
-"Output of \"msgfmt --statistics\":\n"
-msgstr ""
-"文件夹 %1 中至少一个文件有语法错误。\n"
-"“msgfmt --statistics”的输出：\n"
-
-#: catalogmanager/catalogmanagerview.cpp:889
-msgid ""
-"At least one file in the base folder has syntax errors.\n"
-"Output of \"msgfmt --statistics\":\n"
-msgstr ""
-"基准文件夹中至少一个文件有语法错误。\n"
-"“msgfmt --statistics”的输出：\n"
-
-#: catalogmanager/catalogmanagerview.cpp:900
-msgid ""
-"At least one file in folder %1 has header syntax errors.\n"
-"Output of \"msgfmt --statistics\":\n"
-msgstr ""
-"文件夹 %1 中至少一个文件头部有语法错误。\n"
-"“msgfmt --statistics”的输出：\n"
-
-#: catalogmanager/catalogmanagerview.cpp:905
-msgid ""
-"At least one file in the base folder has header syntax errors.\n"
-"Output of \"msgfmt --statistics\":\n"
-msgstr ""
-"基准文件夹中至少一个文件头部有语法错误。\n"
-"“msgfmt --statistics”的输出：\n"
-
-#: catalogmanager/catalogmanagerview.cpp:916
-#, c-format
-msgid ""
-"An error occurred while processing \"msgfmt --statistics *.po\" in folder %1"
-msgstr "在文件夹 %1 中执行“msgfmt --statistics *.po”的时候出现错误"
-
-#: catalogmanager/catalogmanagerview.cpp:921
-msgid ""
-"An error occurred while processing \"msgfmt --statistics *.po\" in the base "
-"folder"
-msgstr "在基准文件夹中执行“msgfmt --statistics *.po”的时候出现错误"
-
-#: catalogmanager/catalogmanagerview.cpp:1502
-msgid "Do you really want to delete the file %1?"
-msgstr "您真的要删除文件 %1 吗？"
-
-#: catalogmanager/catalogmanagerview.cpp:1507
-msgid "Was not able to delete the file %1!"
-msgstr "无法删除文件 %1 !"
-
-#: catalogmanager/catalogmanagerview.cpp:1766
-msgid ""
-"You have not specified a valid folder for the base folder of the PO files:\n"
-"%1\n"
-"Please check your settings in the project settings dialog."
-msgstr ""
-"您没有为 PO 文件指定一个有效的基准文件夹：\n"
-"%1\n"
-"请检查您在工程设置对话框中的设置。"
-
-#: catalogmanager/catalogmanagerview.cpp:1783
-msgid ""
-"You have not specified a valid folder for the base folder of the PO template "
-"files:\n"
-"%1\n"
-"Please check your settings in the project settings dialog."
-msgstr ""
-"您没有为 PO 模板文件指定一个有效的基准文件夹：\n"
-"%1\n"
-"请检查您在工程设置对话框中的设置。"
-
-#: catalogmanager/catalogmanagerview.cpp:1824
-msgid "Reading file information"
-msgstr "正在读取文件信息"
-
-#: catalogmanager/catalogmanagerview.cpp:2999
-#: catalogmanager/validateprogress.cpp:98
-#, fuzzy
-msgid ""
-"Cannot instantiate a validation tool.\n"
-"Please check your installation."
-msgstr ""
-"无法创建检验工具实例。\n"
-"请检查 TDE 的安装。"
-
-#: catalogmanager/catalogmanagerview.cpp:3000
-#: catalogmanager/validateprogress.cpp:99
-msgid "Validation Tool Error"
-msgstr "检验工具错误"
-
-#: catalogmanager/catalogmanagerview.cpp:3008
-msgid "Validation Options"
-msgstr "检验选项"
-
-#: catalogmanager/markpatterndialog.cpp:113
-msgid "Ma&rk files which match the following pattern:"
-msgstr "标记符合下面式样的文件(&R)："
-
-#: catalogmanager/markpatterndialog.cpp:114
-msgid "&Mark Files"
-msgstr "标记文件(&M)"
-
-#: catalogmanager/markpatterndialog.cpp:116
-msgid "Unma&rk files which match the following pattern:"
-msgstr "取消符合下面式样的文件的标记(&R)："
-
-#: catalogmanager/markpatterndialog.cpp:117
-msgid "Un&mark Files"
-msgstr "取消标记文件(&M)"
-
-#: catalogmanager/validateprogress.cpp:56
-msgid ""
-"_: Caption of dialog\n"
-"Validation"
-msgstr "检验"
-
-#: catalogmanager/catalogmanager.cpp:222
-#: catalogmanager/validateprogress.cpp:72
-msgid "&Open"
-msgstr "打开(&O)"
-
-#: catalogmanager/validateprogress.cpp:73
-msgid "&Ignore"
-msgstr "忽略(&I)"
-
-#: catalogmanager/validateprogress.cpp:186
-msgid ""
-"Validation done.\n"
-"\n"
-"Checked files: %1\n"
-"Number of errors: %2\n"
-"Number of ignored errors: %3"
-msgstr ""
-"检验完成。\n"
-"\n"
-"检验了 %1 个文件\n"
-"检查到 %2 个错误\n"
-"忽略了 %3 个错误"
-
-#: catalogmanager/validateprogress.cpp:190
-msgid "Validation Done"
-msgstr "校验完成"
-
-#: catalogmanager/main.cpp:178 kbabel/main.cpp:539
-msgid "File to load configuration from"
-msgstr "要从中载入配置的文件"
-
-#: catalogmanager/main.cpp:186
-msgid "KBabel - Catalog Manager"
-msgstr "KBabel - 目录管理器"
-
-#: catalogmanager/main.cpp:187
-#, fuzzy
-msgid "An advanced catalog manager for KBabel"
-msgstr "一个用于 PO 文件编辑器 KBabel 的高级目录管理器"
-
-#: catalogmanager/main.cpp:188 kbabel/main.cpp:549
-#, fuzzy
-msgid "(c) 1999,2000,2001,2002,2003,2004,2005,2006 The KBabel developers"
-msgstr "(c) 1999,2000,2001,2002,2003,2004,2005 KBabel 开发者"
-
-#: catalogmanager/main.cpp:190 kbabel/main.cpp:551 kbabeldict/main.cpp:118
-msgid "Original author"
-msgstr "最初作者"
-
-#: catalogmanager/main.cpp:191 kbabel/main.cpp:558
-msgid "Current maintainer, porting to TDE3/Qt3."
-msgstr "当前的维护者，移植到 TDE3/Qt3。"
-
-#: catalogmanager/main.cpp:193 kbabel/main.cpp:564 kbabeldict/main.cpp:119
-msgid "Current maintainer"
-msgstr "现在的维护者"
-
-#: catalogmanager/main.cpp:195 kbabel/main.cpp:566
-msgid ""
-"Wrote documentation and sent many bug reports and suggestions for improvements."
-msgstr "编写文档并发送许多错误报告以及改进建议。"
-
-#: catalogmanager/main.cpp:198 kbabel/main.cpp:569
-msgid ""
-"Gave many suggestions for the GUI and the behavior of KBabel. He also "
-"contributed the beautiful splash screen."
-msgstr "提供了许多关于 GUI 以及 KBabel 行为的建议。他还提供了这个美观的欢迎屏幕。"
-
-#: catalogmanager/main.cpp:202 kbabel/main.cpp:553
-msgid "Wrote diff algorithm, fixed KSpell and gave a lot of useful hints."
-msgstr "编写了 diff 算法、修正了 KSpell 并提供了大量有用提示。"
-
-#: catalogmanager/main.cpp:204 kbabel/main.cpp:572
-msgid ""
-"Helped keep KBabel up to date with the TDE API and gave a lot of other help."
-msgstr "帮助保持 KBabel 与 TDE API 的同步更新，并且给予许多其它帮助。"
-
-#: catalogmanager/main.cpp:206 kbabel/main.cpp:576
-msgid "Various validation plugins."
-msgstr "多种检验插件。"
-
-#: catalogmanager/main.cpp:209 kbabel/main.cpp:579
-msgid "Sponsored development of KBabel for a while."
-msgstr "为 KBabel 的开发提供了一段时间的赞助。"
-
-#: catalogmanager/main.cpp:211
-msgid "Support for making diffs and some minor improvements."
-msgstr "支持制作差异和某些改进。"
-
-#: catalogmanager/main.cpp:214 kbabel/main.cpp:581
-msgid "KBabel contains code from Qt"
-msgstr "KBabel 包含来自 Qt 的代码"
-
-#: catalogmanager/main.cpp:216
-msgid "KBabel contains code from GNU gettext"
-msgstr "KBabel 包含来自 GNU gettext 的代码"
-
-#: catalogmanager/multiroughtransdlg.cpp:56
-msgid "Files:"
-msgstr "文件："
-
-#: catalogmanager/multiroughtransdlg.cpp:84
-#: catalogmanager/multiroughtransdlg.cpp:96 kbabel/kbabelview.cpp:1182
-#: kbabel/kbabelview.cpp:1304 kbabel/kbabelview2.cpp:724
-msgid ""
-"Error while trying to read file:\n"
-" %1\n"
-"Maybe it is not a valid PO file."
-msgstr ""
-"在试图读取文件时出错：\n"
-" %1\n"
-"也许它不是一个有效的 PO 文件。"
-
-#: catalogmanager/multiroughtransdlg.cpp:129 commonui/roughtransdlg.cpp:671
-msgid ""
-"Result of the translation:\n"
-"Edited entries: %1\n"
-"Exact translations: %2 (%3%)\n"
-"Approximate translations: %4 (%5%)\n"
-"Nothing found: %6 (%7%)"
-msgstr ""
-"翻译结果：\n"
-"已编辑项目：%1\n"
-"确切翻译：%2 (%3%)\n"
-"大致翻译：%4 (%5%)\n"
-"什么都没找到：%6 (%7%)"
-
-#: catalogmanager/multiroughtransdlg.cpp:143 commonui/roughtransdlg.cpp:685
-msgid "Rough Translation Statistics"
-msgstr "粗略翻译统计"
-
-#: catalogmanager/libcvs/cvshandler.cpp:88
-msgid "No CVS repository"
-msgstr "无 CVS 仓库"
-
-#: catalogmanager/libcvs/cvshandler.cpp:91
-msgid "Not in CVS"
-msgstr "不在 CVS 中"
-
-#: catalogmanager/libcvs/cvshandler.cpp:94
-#: catalogmanager/libsvn/svnhandler.cpp:96
-msgid "Locally added"
-msgstr "已在本地添加"
-
-#: catalogmanager/libcvs/cvshandler.cpp:97
-#: catalogmanager/libsvn/svnhandler.cpp:99
-msgid "Locally removed"
-msgstr "已在本地删除"
-
-#: catalogmanager/libcvs/cvshandler.cpp:100
-#: catalogmanager/libsvn/svnhandler.cpp:102
-msgid "Locally modified"
-msgstr "已在本地修改"
-
-#: catalogmanager/libcvs/cvshandler.cpp:103
-#: catalogmanager/libsvn/svnhandler.cpp:105
-msgid "Up-to-date"
-msgstr "已更新"
-
-#: catalogmanager/libcvs/cvshandler.cpp:106
-#: catalogmanager/libsvn/svnhandler.cpp:108
-msgid "Conflict"
-msgstr "冲突"
-
-#: catalogmanager/libcvs/cvshandler.cpp:109
-#: catalogmanager/libsvn/svnhandler.cpp:113
-msgid "Unknown"
-msgstr "未知"
-
-#: catalogmanager/libcvs/cvshandler.cpp:189
-#: catalogmanager/libcvs/cvshandler.cpp:228
-msgid ""
-"This is not a valid CVS repository. The CVS commands cannot be executed."
-msgstr "这不是一个有效的 CVS 仓库。无法执行CVS命名。"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:311
-#: catalogmanager/libcvs/cvshandler.cpp:375
-#: catalogmanager/libsvn/svndialog.cpp:290
-#: catalogmanager/libsvn/svnhandler.cpp:483
-msgid "[ Starting command ]"
-msgstr "[ 开始命令 ]"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:68
-msgid "CVS Dialog"
-msgstr "CVS 对话框"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:77
-#: catalogmanager/libsvn/svndialog.cpp:74
-msgid "Update the following files:"
-msgstr "更新以下文件："
-
-#: catalogmanager/libcvs/cvsdialog.cpp:80
-#: catalogmanager/libsvn/svndialog.cpp:77
-msgid "Commit the following files:"
-msgstr "交付以下文件："
-
-#: catalogmanager/libcvs/cvsdialog.cpp:83
-msgid "Get status for the following files:"
-msgstr "获取以下文件的状态："
-
-#: catalogmanager/libcvs/cvsdialog.cpp:86
-#: catalogmanager/libsvn/svndialog.cpp:86
-msgid "Get diff for the following files:"
-msgstr "获取以下文件的 diff："
-
-#: catalogmanager/libcvs/cvsdialog.cpp:100
-#: catalogmanager/libsvn/svndialog.cpp:103
-msgid "&Old messages:"
-msgstr "以前的消息(&O)"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:108
-#: catalogmanager/libsvn/svndialog.cpp:111
-msgid "&Log message:"
-msgstr "日志消息(&L)"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:114
-msgid "E&ncoding:"
-msgstr "编码(&N)："
-
-#: catalogmanager/libcvs/cvsdialog.cpp:121
-msgid ""
-"_: Descriptive encoding name\n"
-"Recommended ( %1 )"
-msgstr "推荐(%1)"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:122
-msgid ""
-"_: Descriptive encoding name\n"
-"Locale ( %1 )"
-msgstr "语系(%1)"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:133
-#: catalogmanager/libsvn/svndialog.cpp:124
-msgid "Auto&matically add files if necessary"
-msgstr "必要时自动添加文件(&M)"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:144
-#: catalogmanager/libsvn/svndialog.cpp:135
-msgid "&Commit"
-msgstr "提交(&C)："
-
-#: catalogmanager/libcvs/cvsdialog.cpp:147
-#: catalogmanager/libsvn/svndialog.cpp:139
-msgid "&Get Status"
-msgstr "获取状态(&G)"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:150
-#: catalogmanager/libsvn/svndialog.cpp:142
-msgid "&Get Diff"
-msgstr "获取 Diff(&G)"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:157
-#: catalogmanager/libsvn/svndialog.cpp:152 commonui/roughtransdlg.cpp:83
-msgid "C&ancel"
-msgstr "取消(&A)"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:165
-#: catalogmanager/libsvn/svndialog.cpp:160
-msgid "Command output:"
-msgstr "命令输出："
-
-#: catalogmanager/libcvs/cvsdialog.cpp:237
-#: catalogmanager/libsvn/svndialog.cpp:233
-msgid "The commit log message is empty. Do you want to continue?"
-msgstr "提交日志消息为空。您是否想要继续？"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:247
-#, c-format
-msgid "Cannot find encoding: %1"
-msgstr "找不到编码：%1"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:253
-msgid ""
-"The commit log message cannot be encoded in the selected encoding: %1.\n"
-"Do you want to continue?"
-msgstr ""
-"提交日志消息无法表示为选中编码：%1\n"
-"您是否想要继续？"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:268
-#: catalogmanager/libsvn/svndialog.cpp:247
-msgid "Cannot open temporary file for writing. Aborting."
-msgstr "无法打开临时文件写入。中止。"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:280
-#: catalogmanager/libsvn/svndialog.cpp:259
-msgid "Cannot write to temporary file. Aborting."
-msgstr "无法写入临时文件。中止。"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:322
-#: catalogmanager/libsvn/svndialog.cpp:301
-msgid "The process could not be started."
-msgstr "无法启动进程。"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:351
-#: catalogmanager/libsvn/svndialog.cpp:330
-msgid "[ Exited with status %1 ]"
-msgstr "[ %1 状态下退出]"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:353
-#: catalogmanager/libsvn/svndialog.cpp:332
-msgid "[ Finished ]"
-msgstr "[ 完成 ]"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:358
-#: catalogmanager/libsvn/svndialog.cpp:337 kbabel/kbabel.cpp:642
-msgid "&Show Diff"
-msgstr "显示差别(&S)"
-
-#: catalogmanager/libcvs/cvsdialog.cpp:401
-msgid ""
-"_: Descriptive encoding name\n"
-"Last choice ( %1 )"
-msgstr "上次选择(%1)"
-
-#: catalogmanager/libsvn/svndialog.cpp:65
-msgid "SVN Dialog"
-msgstr "SVN 对话框"
-
-#: catalogmanager/libsvn/svndialog.cpp:80
-msgid "Get remote status for the following files:"
-msgstr "获取以下文件的远程状态："
-
-#: catalogmanager/libsvn/svndialog.cpp:83
-msgid "Get local status for the following files:"
-msgstr "获取以下文件的本地状态："
-
-#: catalogmanager/libsvn/svndialog.cpp:89
-msgid "Get information for the following files:"
-msgstr "获取以下文件的信息："
-
-#: catalogmanager/libsvn/svndialog.cpp:145
-msgid "&Get Information"
-msgstr "获得信息(&G)"
-
-#: catalogmanager/libsvn/svnhandler.cpp:90
-msgid "No SVN repository"
-msgstr "无 SVN 仓库"
-
-#: catalogmanager/libsvn/svnhandler.cpp:93
-msgid "Not in SVN"
-msgstr "不在 SVN 中"
-
-#: catalogmanager/libsvn/svnhandler.cpp:111
-msgid "Error in Working Copy"
-msgstr "工作副本出错"
-
-#: catalogmanager/libsvn/svnhandler.cpp:288
-msgid ""
-"This is not a valid SVN repository. The SVN commands cannot be executed."
-msgstr "这不是一个有效的 SVN 仓库。无法执行 SVN 命令。"
-
-#: catalogmanager/findinfilesdialog.cpp:50
-msgid "File Options"
-msgstr "文件选项"
-
-#: catalogmanager/findinfilesdialog.cpp:53
-msgid "&In all files"
-msgstr "在所有文件中(&I)"
-
-#: catalogmanager/findinfilesdialog.cpp:54
-msgid "&Marked files"
-msgstr "标记的文件(&M)"
-
-#: catalogmanager/findinfilesdialog.cpp:55
-msgid "In &templates"
-msgstr "在模板中(&T)"
-
-#: catalogmanager/findinfilesdialog.cpp:56
-msgid "Ask before ne&xt file"
-msgstr "在下一个文件前询问(&X)"
-
-#: catalogmanager/findinfilesdialog.cpp:57
-msgid "Save &without asking"
-msgstr "保存时不询问(&W)"
-
-#: catalogmanager/findinfilesdialog.cpp:59
-msgid ""
-"<qt>"
-"<p><b>File Options</b></p>"
-"<p>Here you can finetune where to find:"
-"<ul>"
-"<li><b>In all files</b>: search in all files, otherwise searched is the "
-"selected file or files in the selected folder</li>"
-"<li><b>Ask before next file</b>: show a dialog asking to proceed to the next "
-"file</li></ul></qt>"
-msgstr ""
-"<qt>"
-"<p><b>文件选项</b></p>"
-"<p>此处您可以微调要在哪里查找："
-"<ul>"
-"<li><b>在所有文件中</b>：搜索所有文件，否则将会在选中文件夹中的选定文件中搜索</li>"
-"<li><b>在下一个文件前询问</b>显示一个对话框，向您询问是否要在下一个文件中继续</li></ul></qt>"
-
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 78
-#: catalogmanager/future.cpp:4 rc.cpp:21 rc.cpp:39 rc.cpp:45
-#, no-c-format
-msgid "SVN"
-msgstr "SVN"
-
-#: catalogmanager/future.cpp:8
-msgid "Resolved"
-msgstr "已解决"
-
-#: catalogmanager/future.cpp:9
-msgid "Resolved for Marked"
-msgstr "已标记已解决"
-
-#: catalogmanager/future.cpp:10
-msgid "Revert"
-msgstr "还原"
-
-#: catalogmanager/future.cpp:11
-msgid "Revert for Marked"
-msgstr "已标记为还原"
-
-#: catalogmanager/future.cpp:12
-msgid "Cleanup"
-msgstr "清理"
-
-#: catalogmanager/future.cpp:13
-msgid "Cleanup for Marked"
-msgstr "已标记为清理"
-
-#: catalogmanager/future.cpp:16
-msgid "No repository"
-msgstr "没有仓库"
-
-#: catalogmanager/catmanlistitem.cpp:80
-msgid "Message Catalogs"
-msgstr "消息目录"
-
-#: catalogmanager/catmanlistitem.cpp:450 catalogmanager/catmanlistitem.cpp:637
-msgid "No version control"
-msgstr "无版本控制"
-
-#: catalogmanager/catalogmanager.cpp:129 kbabel/kbabel.cpp:132
-#: kbabel/kbabel.cpp:150 kbabel/kbabel.cpp:1754
-#, c-format
-msgid ""
-"Cannot open project file\n"
-"%1"
-msgstr ""
-"无法打开工程文件\n"
-"%1"
-
-#: catalogmanager/catalogmanager.cpp:130 kbabel/kbabel.cpp:133
-#: kbabel/kbabel.cpp:151 kbabel/kbabel.cpp:1755
-msgid "Project File Error"
-msgstr "工程文件出错"
-
-#: catalogmanager/catalogmanager.cpp:225
-msgid "&Open Template"
-msgstr "打开模板(&O)"
-
-#: catalogmanager/catalogmanager.cpp:228
-msgid "Open in &New Window"
-msgstr "在新窗口中打开(&N)"
-
-#: catalogmanager/catalogmanager.cpp:237
-msgid "Fi&nd in Files..."
-msgstr "在文件中查找(&N)..."
-
-#: catalogmanager/catalogmanager.cpp:240
-msgid "Re&place in Files..."
-msgstr "在文件中替换(&P)..."
-
-#: catalogmanager/catalogmanager.cpp:243 kbabel/kbabel.cpp:674
-msgid "&Stop Searching"
-msgstr "停止搜索(&S)"
-
-#: catalogmanager/catalogmanager.cpp:251
-msgid "&Toggle Marking"
-msgstr "切换标记(&T)"
-
-#: catalogmanager/catalogmanager.cpp:254
-msgid "Remove Marking"
-msgstr "删除标记"
-
-#: catalogmanager/catalogmanager.cpp:257
-msgid "Toggle All Markings"
-msgstr "切换所有标记"
-
-#: catalogmanager/catalogmanager.cpp:260
-msgid "Remove All Markings"
-msgstr "删除所有标记"
-
-#: catalogmanager/catalogmanager.cpp:263
-msgid "Mark Modified Files"
-msgstr "标记修改的文件"
-
-#: catalogmanager/catalogmanager.cpp:267
-msgid "&Load Markings..."
-msgstr "载入标记(&L)..."
-
-#: catalogmanager/catalogmanager.cpp:270
-msgid "&Save Markings..."
-msgstr "保存标记(&S)..."
-
-#: catalogmanager/catalogmanager.cpp:273
-msgid "&Mark Files..."
-msgstr "标记文件(&M)..."
-
-#: catalogmanager/catalogmanager.cpp:275
-msgid "&Unmark Files..."
-msgstr "取消标记文件(&N)..."
-
-#: catalogmanager/catalogmanager.cpp:284 kbabel/kbabel.cpp:543
-msgid "Nex&t Untranslated"
-msgstr "下一个未翻译项(&T)"
-
-#: catalogmanager/catalogmanager.cpp:287 kbabel/kbabel.cpp:540
-msgid "Prev&ious Untranslated"
-msgstr "上一个未翻译项(&I)"
-
-#: catalogmanager/catalogmanager.cpp:290 kbabel/kbabel.cpp:537
-msgid "Ne&xt Fuzzy"
-msgstr "下一个模糊项(&X)"
-
-#: catalogmanager/catalogmanager.cpp:293 kbabel/kbabel.cpp:534
-msgid "Pre&vious Fuzzy"
-msgstr "上一个模糊项(&V)"
-
-#: catalogmanager/catalogmanager.cpp:296 kbabel/kbabel.cpp:531
-msgid "N&ext Fuzzy or Untranslated"
-msgstr "下一个模糊或未翻译项(&E)"
-
-#: catalogmanager/catalogmanager.cpp:299 kbabel/kbabel.cpp:528
-msgid "P&revious Fuzzy or Untranslated"
-msgstr "上一个模糊或未翻译项(&R)"
-
-#: catalogmanager/catalogmanager.cpp:303 kbabel/kbabel.cpp:549
-msgid "Next Err&or"
-msgstr "下一个错误(&O)"
-
-#: catalogmanager/catalogmanager.cpp:306 kbabel/kbabel.cpp:546
-msgid "Previo&us Error"
-msgstr "上一个错误(&U)"
-
-#: catalogmanager/catalogmanager.cpp:309
-msgid "Next Te&mplate Only"
-msgstr "仅下一个模板(&M)"
-
-#: catalogmanager/catalogmanager.cpp:312
-msgid "Previous Temp&late Only"
-msgstr "仅上一个模板(&L)"
-
-#: catalogmanager/catalogmanager.cpp:315
-msgid "Next Tran&slation Exists"
-msgstr "下一个翻译存在(&S)"
-
-#: catalogmanager/catalogmanager.cpp:318
-msgid "Previous Transl&ation Exists"
-msgstr "上一个翻译存在(&A)"
-
-#: catalogmanager/catalogmanager.cpp:322
-msgid "Previous Marke&d"
-msgstr "上一个标记项目(&D)"
-
-#: catalogmanager/catalogmanager.cpp:325
-msgid "Next &Marked"
-msgstr "下一个标记项目(&M)"
-
-#: catalogmanager/catalogmanager.cpp:331 kbabel/kbabel.cpp:594
-msgid "&New..."
-msgstr "新建(&N)..."
-
-#: catalogmanager/catalogmanager.cpp:339 kbabel/kbabel.cpp:602
-msgid "C&lose"
-msgstr "关闭(&L)"
-
-#: catalogmanager/catalogmanager.cpp:345 kbabel/kbabel.cpp:607
-msgid "&Configure..."
-msgstr "配置(&C)..."
-
-#: catalogmanager/catalogmanager.cpp:350
-msgid "&Statistics"
-msgstr "统计(&S)"
-
-#: catalogmanager/catalogmanager.cpp:353
-msgid "S&tatistics in Marked"
-msgstr "已标记项目的统计(&T)"
-
-#: catalogmanager/catalogmanager.cpp:356
-msgid "Check S&yntax"
-msgstr "检查语法(&Y)"
-
-#: catalogmanager/catalogmanager.cpp:359
-msgid "S&pell Check"
-msgstr "拼写检查(&P)"
-
-#: catalogmanager/catalogmanager.cpp:362
-msgid "Spell Check in &Marked"
-msgstr "在已标记项目中检查拼写(&M)"
-
-#: catalogmanager/catalogmanager.cpp:365
-msgid "&Rough Translation"
-msgstr "粗略翻译(&R)"
-
-#: catalogmanager/catalogmanager.cpp:368
-msgid "Rough Translation in M&arked"
-msgstr "已标记项目中的粗略翻译(&A)"
-
-#: catalogmanager/catalogmanager.cpp:371
-msgid "Mai&l"
-msgstr "邮寄(&L)"
-
-#: catalogmanager/catalogmanager.cpp:374
-msgid "Mail Mar&ked"
-msgstr "邮寄已标记项目(&K)"
-
-#: catalogmanager/catalogmanager.cpp:378
-msgid "&Pack"
-msgstr "打包(&P)"
-
-#: catalogmanager/catalogmanager.cpp:380
-msgid "Pack &Marked"
-msgstr "打包已标记项目(&M)"
-
-#: catalogmanager/catalogmanager.cpp:399 kbabel/kbabel.cpp:765
-msgid "&Validation"
-msgstr "校验(&V)"
-
-#: catalogmanager/catalogmanager.cpp:412
-msgid "V&alidation Marked"
-msgstr "校验已标记的(&A)"
-
-#: catalogmanager/catalogmanager.cpp:425 catalogmanager/catalogmanager.cpp:451
-msgid "Update"
-msgstr "更新"
-
-#: catalogmanager/catalogmanager.cpp:427 catalogmanager/catalogmanager.cpp:453
-msgid "Update Marked"
-msgstr "更新已标记的文件"
-
-#: catalogmanager/catalogmanager.cpp:429 catalogmanager/catalogmanager.cpp:455
-msgid "Commit"
-msgstr "提交"
-
-#: catalogmanager/catalogmanager.cpp:431 catalogmanager/catalogmanager.cpp:457
-msgid "Commit Marked"
-msgstr "提交已标记的文件"
-
-#: catalogmanager/catalogmanager.cpp:433
-msgid "Status"
-msgstr "状态"
-
-#: catalogmanager/catalogmanager.cpp:435
-msgid "Status for Marked"
-msgstr "已标记文件的状态"
-
-#: catalogmanager/catalogmanager.cpp:437 catalogmanager/catalogmanager.cpp:467
-msgid "Show Diff"
-msgstr "显示 Diff"
-
-#: catalogmanager/catalogmanager.cpp:459
-msgid "Status (Local)"
-msgstr "状态(本地)"
-
-#: catalogmanager/catalogmanager.cpp:461
-msgid "Status (Local) for Marked"
-msgstr "已标记的状态(本地)"
-
-#: catalogmanager/catalogmanager.cpp:463
-msgid "Status (Remote)"
-msgstr "状态(远程)"
-
-#: catalogmanager/catalogmanager.cpp:465
-msgid "Status (Remote) for Marked"
-msgstr "已标记的状态(远程)"
-
-#: catalogmanager/catalogmanager.cpp:469
-msgid "Show Information"
-msgstr "显示信息"
-
-#: catalogmanager/catalogmanager.cpp:471
-msgid "Show Information for Marked"
-msgstr "显示已标记的信息"
-
-#: catalogmanager/catalogmanager.cpp:488 catalogmanager/catalogmanager.cpp:503
-msgid "Update Templates"
-msgstr "更新模板"
-
-#: catalogmanager/catalogmanager.cpp:490 catalogmanager/catalogmanager.cpp:505
-msgid "Update Marked Templates"
-msgstr "更新已标记的模板"
-
-#: catalogmanager/catalogmanager.cpp:492 catalogmanager/catalogmanager.cpp:507
-msgid "Commit Templates"
-msgstr "提交模板"
-
-#: catalogmanager/catalogmanager.cpp:494 catalogmanager/catalogmanager.cpp:509
-msgid "Commit Marked Templates"
-msgstr "提交标记的模板"
-
-#: catalogmanager/catalogmanager.cpp:525 catalogmanager/catalogmanager.cpp:529
-msgid "Commands"
-msgstr "命令"
-
-#: catalogmanager/catalogmanager.cpp:558
-msgid ""
-"<qt>"
-"<p><b>Statusbar</b></p>\n"
-"<p>The statusbar displays information about progress of the current find or "
-"replace operation. The first number in <b>Found:</b> "
-"displays the number of files with an occurrence of the searched text not yet "
-"shown in the KBabel window. The second shows the total number of files "
-"containing the searched text found so far.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>状态栏</b></p>\n"
-"<p>状态栏显示当前的查找替换操作的进度信息。<b>“找到：”</b>中的第一个数字显示包含搜索文本的但还没有在 KBabel "
-"窗口中打开的文件数量。第二个数字显示到目前为止找到的包含搜索文本的文件总数。</p></qt>"
-
-#: catalogmanager/catalogmanager.cpp:663 catalogmanager/catalogmanager.cpp:696
-#: catalogmanager/catalogmanager.cpp:727 catalogmanager/catalogmanager.cpp:757
-#: catalogmanager/catalogmanager.cpp:787 catalogmanager/catalogmanager.cpp:807
-#: catalogmanager/catalogmanager.cpp:827
-#, fuzzy
-msgid ""
-"Cannot send a message to KBabel.\n"
-"Please check your installation of TDE."
-msgstr ""
-"无法向 KBabel 发送消息。\n"
-"请检查 TDE 的安装。"
-
-#: catalogmanager/catalogmanager.cpp:858
-msgid ""
-"Unable to use TDELauncher to start KBabel.\n"
-"You should check the installation of TDE.\n"
-"Please start KBabel manually."
-msgstr ""
-"无法使用 TDELauncher 来启动 KBabel。\n"
-"您应该检查 TDE 的安装。\n"
-"请手工启动 KBabel。"
-
-#: catalogmanager/catalogmanager.cpp:893
-msgid "Found: 0/0"
-msgstr "找到：0/0"
-
-#: catalogmanager/catalogmanager.cpp:915
-msgid "Found: %1/%2"
-msgstr "找到：%1/%2"
-
-#: catalogmanager/catalogmanager.cpp:940
-#: catalogmanager/catalogmanager.cpp:1024 kbabel/kbabelview.cpp:4433
-#: kbabeldict/kbabeldictview.cpp:239
-msgid "Searching"
-msgstr "正在搜索"
-
-#: catalogmanager/catalogmanager.cpp:986
-#: catalogmanager/catalogmanager.cpp:1073
-msgid "DCOP communication with KBabel failed."
-msgstr "与 KBabel 的 DCOP 通讯失败。"
-
-#: catalogmanager/catalogmanager.cpp:986
-#: catalogmanager/catalogmanager.cpp:1073
-msgid "DCOP Communication Error"
-msgstr "DCOP 通讯错误"
-
-#: catalogmanager/catalogmanager.cpp:1001
-#: catalogmanager/catalogmanager.cpp:1087
-msgid "KBabel cannot be started."
-msgstr "KBabel 无法被启动。"
-
-#: catalogmanager/catalogmanager.cpp:1001
-#: catalogmanager/catalogmanager.cpp:1087
-msgid "Cannot Start KBabel"
-msgstr "无法启动 KBabel"
-
-#: catalogmanager/catalogmanager.cpp:1008
-#: catalogmanager/catalogmanager.cpp:1094
-msgid "Search string not found!"
-msgstr "找不到搜索字串！"
-
-#: catalogmanager/catalogmanager.cpp:1235
-#, c-format
-msgid "Cannot open project file %1"
-msgstr "无法打开工程文件 %1"
-
-#: datatools/xml/main.cc:60
-msgid ""
-"_: what check found errors\n"
-"XML tags"
-msgstr "XML 标签"
-
-#: datatools/context/main.cc:58
-msgid ""
-"_: what check found errors\n"
-"context info"
-msgstr "上下文信息"
-
-#: datatools/arguments/main.cc:57
-msgid ""
-"_: what check found errors\n"
-"arguments"
-msgstr "参数"
-
-#: datatools/accelerators/main.cc:58
-msgid ""
-"_: what check found errors\n"
-"accelerator"
-msgstr "快捷键"
-
-#: datatools/whitespace/main.cc:60
-msgid ""
-"_: which check found errors\n"
-"whitespace only translation"
-msgstr "空白的译文"
-
-#: datatools/length/main.cc:61 datatools/regexp/main.cc:55
-msgid ""
-"_: which check found errors\n"
-"translation has inconsistent length"
-msgstr "译文长度不一致"
-
-#: datatools/pluralforms/main.cc:59
-msgid ""
-"_: what check found errors\n"
-"plural forms"
-msgstr "复数形式"
-
-#: datatools/equations/main.cc:58
-msgid ""
-"_: what check found errors\n"
-"equations"
-msgstr "等式"
-
-#: datatools/regexp/main.cc:58
-msgid "Error loading data (%1)"
-msgstr ""
-
-#: datatools/regexp/main.cc:118
-msgid "File not found"
-msgstr "文件未找到"
-
-#: datatools/regexp/main.cc:123
-msgid "The file is not a XML"
-msgstr ""
-
-#: datatools/regexp/main.cc:147
-msgid "Expected tag 'item'"
-msgstr ""
-
-#: datatools/regexp/main.cc:153
-msgid "First child of 'item' is not a node"
-msgstr ""
-
-#: datatools/regexp/main.cc:159
-msgid "Expected tag 'name'"
-msgstr ""
-
-#: datatools/regexp/main.cc:167
-msgid "Expected tag 'exp'"
-msgstr ""
-
-#: datatools/not-translated/main.cc:60
-#, fuzzy
-msgid ""
-"_: which check found errors\n"
-"English text in translation"
-msgstr "译文中含有英文"
-
-#: datatools/punctuation/main.cc:58
-msgid ""
-"_: what check found errors\n"
-"punctuation"
-msgstr "标点符号"
-
-#: _translatorinfo.cpp:1 kbabeldict/main.cpp:121
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "开源软件国际化之简体中文组"
-
-#: _translatorinfo.cpp:3 kbabeldict/main.cpp:122
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "i18n@lists.linux.net.cn"
-
-#: filters/gettext/gettextexport.cpp:74
-msgid "saving file"
-msgstr "正在保存文件"
-
-#: filters/gettext/gettextimport.cpp:83
-msgid "loading file"
-msgstr "正在载入文件"
-
-#: addons/tdefile-plugins/tdefile_po.cpp:50
-msgid "Catalog Information"
-msgstr "目录信息"
-
-#: addons/tdefile-plugins/tdefile_po.cpp:53
-msgid "Total Messages"
-msgstr "总计消息"
-
-#: addons/tdefile-plugins/tdefile_po.cpp:54
-msgid "Fuzzy Messages"
-msgstr "模糊消息"
-
-#: addons/tdefile-plugins/tdefile_po.cpp:55
-msgid "Untranslated Messages"
-msgstr "未翻译消息"
-
-#: addons/tdefile-plugins/tdefile_po.cpp:57
-msgid "Language Team"
-msgstr "语言小组"
-
-#: addons/tdefile-plugins/tdefile_po.cpp:58
-msgid "Revision"
-msgstr "版本"
-
-#: common/kbmailer.cpp:106
-#, fuzzy, c-format
-msgid "Error while trying to download file %1."
-msgstr "在试图打开文件 %1 时出错。"
-
-#: common/kbmailer.cpp:145
-msgid "Enter the name of the archive without file extension"
-msgstr "输入不带文件扩展名的归档名称"
-
-#: common/kbmailer.cpp:178
-msgid "Error while trying to create archive file."
-msgstr "在试图创建归档文件时出错。"
-
-#: common/kbmailer.cpp:193
-#, c-format
-msgid "Error while trying to read file %1."
-msgstr "在试图读取文件 %1 时出错。"
-
-#: common/kbmailer.cpp:208
-#, fuzzy
-msgid "Error while trying to copy file %1 into archive."
-msgstr "在试图打开文件 %1 时出错。"
-
-#: common/kbproject.cpp:53
-msgid "unnamed"
-msgstr "未命名"
-
-#: common/catalog.cpp:592
-msgid ""
-"Free Software Foundation Copyright does not contain any year. It will not be "
-"updated."
-msgstr "自由软件基金会版权没包括年份。它将不会被更新。"
-
-#: common/catalog.cpp:1237
-msgid "validating file"
-msgstr "正在校验文件"
-
-#: common/catalog.cpp:1276
-msgid "applying tool"
-msgstr "正在应用工具"
-
-#: common/catalog.cpp:3128
-msgid "searching matching message"
-msgstr "正在搜索匹配消息"
-
-#: common/catalog.cpp:3217
-msgid "preparing messages for diff"
-msgstr "正在为 diff 准备消息"
-
-#: commonui/roughtransdlg.cpp:69
-msgid ""
-"_: Caption of dialog\n"
-"Rough Translation"
-msgstr "粗略翻译"
-
-#: commonui/roughtransdlg.cpp:82 kbabeldict/kbabeldictview.cpp:111
-msgid "S&top"
-msgstr "停止(&T)"
-
-#: commonui/roughtransdlg.cpp:96
-msgid "What to Translate"
-msgstr "要翻译的项目"
-
-#: commonui/roughtransdlg.cpp:102
-msgid "U&ntranslated entries"
-msgstr "未翻译的项目(&N)"
-
-#: commonui/roughtransdlg.cpp:103
-msgid "&Fuzzy entries"
-msgstr "模糊项目(&F)"
-
-#: commonui/roughtransdlg.cpp:104
-msgid "T&ranslated entries"
-msgstr "已翻译的项目(&R)"
-
-#: commonui/roughtransdlg.cpp:108
-msgid ""
-"<qt>"
-"<p><b>What entries to translate</b></p>"
-"<p>Choose here, for which entries of the file KBabel tries to find a "
-"translation. Changed entries are always marked as fuzzy, no matter which option "
-"you choose.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>要翻译的项目</b></p>"
-"<p>在此处选择 KBabel 要为文件中的哪些项目查找翻译。不管您选择哪个选项，改变的项目总是标记为 fuzzy(模糊翻译)。</p></qt>"
-
-#: commonui/roughtransdlg.cpp:113
-msgid "How to Translate"
-msgstr "如何翻译"
-
-#: commonui/roughtransdlg.cpp:118
-msgid "&Use dictionary settings"
-msgstr "使用字典设置(&U)"
-
-#: commonui/roughtransdlg.cpp:121
-msgid "Fu&zzy translation (slow)"
-msgstr "允许模糊翻译(很慢)(&Z)"
-
-#: commonui/roughtransdlg.cpp:123
-msgid "&Single word translation"
-msgstr "允许单个字词翻译(&S)"
-
-#: commonui/roughtransdlg.cpp:126
-msgid ""
-"<qt>"
-"<p><b>How messages get translated</b></p>"
-"<p>Here you can define if a message can only get translated completely, if "
-"similar messages are acceptable or if KBabel is supposed to try translating the "
-"single words of a message if no translation of the complete message or similar "
-"message was found.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>如何翻译消息</b></p>"
-"<p>此处您可以定义：消息是否仅可以被完全翻译；是否可接受相似的消息；如果没有找到翻译完整的消息或相似的消息，KBabel "
-"是否应该试图翻译某条消息中的单个单词。</p></qt>"
-
-#: commonui/roughtransdlg.cpp:136
-msgid "&Mark changed entries as fuzzy"
-msgstr "把改变的项目标记为模糊项(&M)"
-
-#: commonui/roughtransdlg.cpp:139
-msgid ""
-"<qt>"
-"<p><b>Mark changed entries as fuzzy</b></p>"
-"<p>When a translation for a message is found, the entry will be marked <b>"
-"fuzzy</b> by default. This is because the translation is just guessed by KBabel "
-"and you should always check the results carefully. Deactivate this option only "
-"if you know what you are doing.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>把改变的项目标记为模糊翻译</b></p>"
-"<p>当找到一条消息的翻译时，该项目将会被默认标记为<b>“模糊翻译”</b>。这是因为译文仅仅是 KBabel "
-"的猜测，您应该总是仔细检查结果。只有您知道您正在做什么时才取消该选项。</p></qt>"
-
-#: commonui/roughtransdlg.cpp:150
-msgid "Initialize &TDE-specific entries"
-msgstr "初始化 TDE 特有的项目(&K)"
-
-#: commonui/roughtransdlg.cpp:153
-msgid ""
-"<qt>"
-"<p><b>Initialize TDE-specific entries</b></p>"
-"<p>Initialize \"Comment=\" and \"Name=\" entries if a translation is not found. "
-"Also, \"NAME OF TRANSLATORS\" and \"EMAIL OF TRANSLATORS\" is filled with "
-"identity settings.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>初始化 TDE 特有的项目</b></p>"
-"<p>如果没有找到翻译，初始化“Comment=”和“Name=”项目。此外，使用身份设置来填充“NAME OF TRANSLATORS”和“EMAIL OF "
-"TRANSLATORS”。</p></qt>"
-
-#: commonui/roughtransdlg.cpp:158
-msgid "Dictionaries"
-msgstr "字典"
-
-#: commonui/roughtransdlg.cpp:177
-msgid ""
-"<qt>"
-"<p><b>Dictionaries</b></p>"
-"<p>Choose here, which dictionaries have to be used for finding a translation. "
-"If you select more than one dictionary, they are used in the same order as they "
-"are displayed in the list.</p>"
-"<p>The <b>Configure</b> button allows you to temporarily configure selected "
-"dictionary. The original settings will be restored after closing the dialog.</p>"
-"</qt>"
-msgstr ""
-"<qt>"
-"<p><b>字典</b></p>"
-"<p>在此处选择哪些字典会被用来查找翻译。如果您选择了多个字典，则按它们在列表中显示的顺序来使用它们。</p></qt> "
-"<p><b>配置</b> 按钮允许你暂时配置选中的字典。最初的设置将在关闭对话框之后恢复。</p></qt>"
-
-#: commonui/roughtransdlg.cpp:186
-msgid "Messages:"
-msgstr "消息："
+#: commonui/context.cpp:97
+msgid "Corresponding source file not found"
+msgstr "找不到对应源文件"
 
-#: commonui/roughtransdlg.cpp:744
+#: commonui/context.cpp:265 commonui/context.cpp:275 commonui/context.cpp:285
 msgid ""
-"<qt>"
-"<p>When a translation for a message is found, the entry will be marked <b>"
-"fuzzy</b> by default. This is because the translation is just guessed by KBabel "
-"and you should always check the results carefully. Deactivate this option only "
-"if you know what you are doing.</p></qt>"
+"KBabel cannot start a text editor component.\n"
+"Please check your TDE installation."
 msgstr ""
-"<qt>"
-"<p>当找到一条消息的翻译时，该项目将会被默认标记为<b>“模糊翻译”</b>。这是因为译文仅仅是 KBabel "
-"的猜测，您应该总是仔细检查结果。只有在您知道您正在做什么时才取消该选项。</p></qt>"
-
-#: commonui/projectpref.cpp:70
-msgid ""
-"_: title of page in preferences dialog\n"
-"Identity"
-msgstr "身份"
-
-#: commonui/projectpref.cpp:72
-msgid "Information About You and Translation Team"
-msgstr "关于您以及翻译小组的信息"
-
-#: commonui/projectpref.cpp:76 kbabel/kbabelview.cpp:1595
-msgid ""
-"_: title of page in preferences dialog\n"
-"Save"
-msgstr "保存"
-
-#: commonui/projectpref.cpp:78 kbabel/kbabelview.cpp:1597
-msgid "Options for File Saving"
-msgstr "文件保存的选项"
-
-#: commonui/projectpref.cpp:82
-msgid ""
-"_: title of page in preferences dialog\n"
-"Spelling"
-msgstr "拼写"
-
-#: commonui/projectpref.cpp:84
-msgid "Options for Spell Checking"
-msgstr "拼写检查选项"
-
-#: commonui/projectpref.cpp:89
-msgid ""
-"_: title of page in preferences dialog\n"
-"Source"
-msgstr "来源"
-
-#: commonui/projectpref.cpp:91
-msgid "Options for Showing Source Context"
-msgstr "显示源文件上下文的选项"
-
-#: commonui/projectpref.cpp:96
-msgid ""
-"_: title of page in preferences dialog\n"
-"Miscellaneous"
-msgstr "其它"
-
-#: commonui/projectpref.cpp:98
-msgid "Miscellaneous Settings"
-msgstr "其它设置"
-
-#: commonui/projectpref.cpp:101
-msgid ""
-"_: title of page in preferences dialog\n"
-"Folders"
-msgstr "文件夹"
-
-#: commonui/projectpref.cpp:103
-msgid "Paths to Message Catalogs & Catalog Templates"
-msgstr "到消息目录和目录模板的路径"
-
-#: commonui/projectpref.cpp:106
-msgid ""
-"_: title of page in preferences dialog\n"
-"Folder Commands"
-msgstr "文件夹命令"
-
-#: commonui/projectpref.cpp:108
-msgid "User-Defined Commands for Folder Items"
-msgstr "用户定义的用于文件夹项目的命令"
-
-#: commonui/projectpref.cpp:113
-msgid ""
-"_: title of page in preferences dialog\n"
-"File Commands"
-msgstr "文件命令"
-
-#: commonui/projectpref.cpp:115
-msgid "User-Defined Commands for File Items"
-msgstr "用户定义的用于文件项目的命令"
-
-#: commonui/projectpref.cpp:120
-msgid ""
-"_: title of page in preferences dialog\n"
-"Catalog Manager"
-msgstr "目录管理器"
-
-#: commonui/projectpref.cpp:122
-msgid "Catalog Manager View Settings"
-msgstr "目录管理器查看设置"
-
-#: commonui/projectpref.cpp:125 kbabel/kbabelpref.cpp:85
-msgid ""
-"_: title of page in preferences dialog\n"
-"Diff"
-msgstr "Diff"
-
-#: commonui/projectpref.cpp:127
-msgid "Searching for Differences"
-msgstr "正在搜索差异"
+"KBabel 无法启动某个文本编辑器组件。\n"
+"请检查您的 TDE 安装。"
 
 #: commonui/cmdedit.cpp:51
 #, fuzzy
@@ -1601,34 +43,6 @@ msgstr "命令(&M)："
 msgid "&Add"
 msgstr "添加(&A)"
 
-#: commonui/tdeactionselector.cpp:81
-msgid "&Available:"
-msgstr "可用的(&A)："
-
-#: commonui/tdeactionselector.cpp:96
-msgid "&Selected:"
-msgstr "选中的(&S)："
-
-#: commonui/projectwizard.cpp:78
-msgid "Basic Project Information"
-msgstr "基本工程信息"
-
-#: commonui/projectwizard.cpp:83
-msgid "Translation Files"
-msgstr "翻译文件"
-
-#: commonui/projectwizard.cpp:140
-msgid ""
-"The file '%1' already exists.\n"
-"Do you want to replace it?"
-msgstr ""
-"文件“%1”已经存在。\n"
-"您要覆盖它吗？"
-
-#: commonui/projectwizard.cpp:141
-msgid "File Exists"
-msgstr "文件已存在"
-
 #: commonui/finddialog.cpp:62
 msgid "&Find:"
 msgstr "查找(&F)："
@@ -1696,7 +110,7 @@ msgid ""
 msgstr "<qt><p><b>在哪里搜索</b></p><p>在此选择您想要在目录项的哪些部分中搜索。</p></qt>"
 
 #. i18n: file ./catalogmanager/markpatternwidget.ui line 54
-#: commonui/finddialog.cpp:124 rc.cpp:69
+#: commonui/finddialog.cpp:124 rc.cpp:1219
 #, no-c-format
 msgid "C&ase sensitive"
 msgstr "区分大小写(&A)"
@@ -1722,7 +136,7 @@ msgid "F&ind backwards"
 msgstr "向前查找(&I)"
 
 #. i18n: file ./catalogmanager/markpatternwidget.ui line 86
-#: commonui/finddialog.cpp:133 rc.cpp:81
+#: commonui/finddialog.cpp:133 rc.cpp:1231
 #, no-c-format
 msgid "Use regu&lar expression"
 msgstr "使用正则表达式(&L)"
@@ -1853,7 +267,7 @@ msgid "No autosave"
 msgstr "无自动保存"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 29
-#: commonui/projectprefwidgets.cpp:188 rc.cpp:420
+#: commonui/projectprefwidgets.cpp:188 rc.cpp:271
 #, no-c-format
 msgid "&General"
 msgstr "常规(&G)"
@@ -2232,11 +646,12 @@ msgid "&Marker for keyboard accelerator:"
 msgstr "加速键标记符号(&M)："
 
 #: commonui/projectprefwidgets.cpp:682
+#, fuzzy
 msgid ""
 "<qt>"
 "<p><b>Marker for keyboard accelerator</b></p>"
 "<p>Define here, what character marks the following character as keyboard "
-"accelerator. For example in Qt it is '&amp;' and in Gtk it is '_'.</p></qt>"
+"accelerator. For example in TQt it is '&amp;' and in Gtk it is '_'.</p></qt>"
 msgstr ""
 "<qt>"
 "<p><b>加速键标记符号</b></p>"
@@ -2308,13 +723,13 @@ msgstr ""
 "<p>激活此项，KBabel 将会在每次拼写检查的时候都忽略您在拼写检查对话框中选择要<i>“全部忽略”</i>的那些字词。</p></qt>"
 
 #. i18n: file ./commonui/projectwizardwidget2.ui line 68
-#: commonui/projectprefwidgets.cpp:890 rc.cpp:313
+#: commonui/projectprefwidgets.cpp:890 rc.cpp:199
 #, no-c-format
 msgid "&Base folder of PO files:"
 msgstr "PO 文件的基准文件夹(&B)："
 
 #. i18n: file ./commonui/projectwizardwidget2.ui line 110
-#: commonui/projectprefwidgets.cpp:903 rc.cpp:316
+#: commonui/projectprefwidgets.cpp:903 rc.cpp:202
 #, no-c-format
 msgid "Ba&se folder of POT files:"
 msgstr "POT 文件的基准文件夹(&S)："
@@ -2542,238 +957,425 @@ msgstr "源码的基准文件夹(&B)："
 msgid "Path Patterns"
 msgstr "路径模板"
 
-#: commonui/context.cpp:97
-msgid "Corresponding source file not found"
-msgstr "找不到对应源文件"
+#: commonui/tdeactionselector.cpp:81
+msgid "&Available:"
+msgstr "可用的(&A)："
 
-#: commonui/context.cpp:265 commonui/context.cpp:275 commonui/context.cpp:285
+#: commonui/tdeactionselector.cpp:96
+msgid "&Selected:"
+msgstr "选中的(&S)："
+
+#: commonui/projectpref.cpp:70
 msgid ""
-"KBabel cannot start a text editor component.\n"
-"Please check your TDE installation."
-msgstr ""
-"KBabel 无法启动某个文本编辑器组件。\n"
-"请检查您的 TDE 安装。"
+"_: title of page in preferences dialog\n"
+"Identity"
+msgstr "身份"
 
-#. i18n: file ./kbabel/headerwidget.ui line 24
-#: kbabel/commentview.cpp:78 rc.cpp:414
-#, no-c-format
-msgid "&Comment:"
-msgstr "注释(&C)："
+#: commonui/projectpref.cpp:72
+msgid "Information About You and Translation Team"
+msgstr "关于您以及翻译小组的信息"
 
-#: kbabel/commentview.cpp:88
+#: commonui/projectpref.cpp:76 kbabel/kbabelview.cpp:1595
 msgid ""
-"<qt>"
-"<p><b>Comment Editor</b></p>\n"
-"This edit window shows you the comments of the currently displayed message."
-"<p>\n"
-"<p>The comments normally contain information about where the message is found "
-"in the source\n"
-"code and status information about this message (fuzzy, c-format).\n"
-"Hints from other translators are also sometimes contained in comments.</p>\n"
-"<p>You can hide the comment editor by deactivating\n"
-"<b>Options->Show Comments</b>.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>注释编辑器</b></p>\n"
-"该编辑窗口向您显示当前消息的注释。"
-"<p>\n"
-"<p>这些注释通常包含当前消息在源码中的位置信息，\n"
-"以及该消息的状态信息(fuzzy、c-format)。\n"
-"其他翻译人员的建议有时也包含在注释中。</p>\n"
-"<p>您可以通过取消<b>“选项->显示注释”</b>\n"
-"来隐藏注释编辑器。</p></qt>"
+"_: title of page in preferences dialog\n"
+"Save"
+msgstr "保存"
 
-#: kbabel/contextview.cpp:63
-msgid ""
-"<qt>"
-"<p><b>PO Context</b></p>"
-"<p>This window shows the context of the current message in the PO file. "
-"Normally it shows four messages in front of the current message and four after "
-"it.</p>"
-"<p>You can hide the tools window by deactivating <b>Options->Show Tools</b>.</p>"
-"</qt></qt>"
-msgstr ""
-"<qt>"
-"<p><b>PO 上下文</b></p>"
-"<p>该窗口显示当前消息在 PO 文件中的上下文。通常，它显示当前消息的前面四条和后面四条。</p>"
-"<p>您可以取消<b>“选项->显示工具”</b>来隐藏工具窗口。</p></qt></qt>"
+#: commonui/projectpref.cpp:78 kbabel/kbabelview.cpp:1597
+msgid "Options for File Saving"
+msgstr "文件保存的选项"
 
-#: kbabel/contextview.cpp:99
-msgid "current entry"
-msgstr "当前的项目"
+#: commonui/projectpref.cpp:82
+msgid ""
+"_: title of page in preferences dialog\n"
+"Spelling"
+msgstr "拼写"
 
-#: kbabel/contextview.cpp:125 kbabel/kbabel.cpp:721 kbabel/kbabelview.cpp:419
-msgid "untranslated"
-msgstr "未翻译"
+#: commonui/projectpref.cpp:84
+msgid "Options for Spell Checking"
+msgstr "拼写检查选项"
 
-#: kbabel/contextview.cpp:140
+#: commonui/projectpref.cpp:89
 msgid ""
-"Plural %1: %2\n"
-msgstr ""
-"复数 %1：%2\n"
+"_: title of page in preferences dialog\n"
+"Source"
+msgstr "来源"
 
-#: kbabel/errorlistview.cpp:62
-msgid ""
-"<qt>"
-"<p><b>Error List</b></p>"
-"<p>This window shows the list of errors found by validator tools so you can "
-"know why the current message has been marked with an error.</p></qt>"
-msgstr ""
+#: commonui/projectpref.cpp:91
+msgid "Options for Showing Source Context"
+msgstr "显示源文件上下文的选项"
 
-#: kbabel/kbabelpref.cpp:57
+#: commonui/projectpref.cpp:96
 msgid ""
 "_: title of page in preferences dialog\n"
-"Edit"
-msgstr "编辑"
+"Miscellaneous"
+msgstr "其它"
 
-#: kbabel/kbabelpref.cpp:59
-msgid "Options for Editing"
-msgstr "编辑的选项"
+#: commonui/projectpref.cpp:98
+msgid "Miscellaneous Settings"
+msgstr "其它设置"
 
-#: kbabel/kbabelpref.cpp:70
+#: commonui/projectpref.cpp:101
 msgid ""
 "_: title of page in preferences dialog\n"
-"Search"
-msgstr "搜索"
-
-#: kbabel/kbabelpref.cpp:72
-msgid "Options for Searching Similar Translations"
-msgstr "搜索相似翻译的选项"
+"Folders"
+msgstr "文件夹"
 
-#: kbabel/kbabelpref.cpp:87
-msgid "Options for Showing Differences"
-msgstr "显示差别的选项"
+#: commonui/projectpref.cpp:103
+msgid "Paths to Message Catalogs & Catalog Templates"
+msgstr "到消息目录和目录模板的路径"
 
-#: kbabel/kbabelpref.cpp:90
+#: commonui/projectpref.cpp:106
 msgid ""
-"_: name of page in preferences dialog icon list\n"
-"Fonts"
-msgstr "字体"
+"_: title of page in preferences dialog\n"
+"Folder Commands"
+msgstr "文件夹命令"
 
-#: kbabel/kbabelpref.cpp:92
+#: commonui/projectpref.cpp:108
+msgid "User-Defined Commands for Folder Items"
+msgstr "用户定义的用于文件夹项目的命令"
+
+#: commonui/projectpref.cpp:113
 msgid ""
 "_: title of page in preferences dialog\n"
-"Font Settings"
-msgstr "字体设置"
+"File Commands"
+msgstr "文件命令"
 
-#: kbabel/kbabelpref.cpp:95
+#: commonui/projectpref.cpp:115
+msgid "User-Defined Commands for File Items"
+msgstr "用户定义的用于文件项目的命令"
+
+#: commonui/projectpref.cpp:120
 msgid ""
-"_: name of page in preferences dialog icon list\n"
-"Colors"
-msgstr "颜色"
+"_: title of page in preferences dialog\n"
+"Catalog Manager"
+msgstr "目录管理器"
 
-#: kbabel/kbabelpref.cpp:97
+#: commonui/projectpref.cpp:122
+msgid "Catalog Manager View Settings"
+msgstr "目录管理器查看设置"
+
+#: commonui/projectpref.cpp:125 kbabel/kbabelpref.cpp:85
 msgid ""
 "_: title of page in preferences dialog\n"
-"Color Settings"
-msgstr "颜色设置"
+"Diff"
+msgstr "Diff"
 
-#: kbabel/kbcataloglistview.cpp:44
-msgid "Id"
-msgstr ""
+#: commonui/projectpref.cpp:127
+msgid "Searching for Differences"
+msgstr "正在搜索差异"
 
-#: kbabel/kbcataloglistview.cpp:45
-msgid "Original String"
-msgstr "原始字符串"
+#: commonui/roughtransdlg.cpp:69
+msgid ""
+"_: Caption of dialog\n"
+"Rough Translation"
+msgstr "粗略翻译"
 
-#. i18n: translators: Dock window caption
-#: kbabel/kbabelview.cpp:456 kbabel/kbcataloglistview.cpp:46
-msgid "Translated String"
-msgstr "已翻译的字符串"
+#: commonui/roughtransdlg.cpp:82 kbabeldict/kbabeldictview.cpp:111
+msgid "S&top"
+msgstr "停止(&T)"
 
-#: kbabel/main.cpp:537
-msgid "Go to entry with msgid <msgid>"
-msgstr "转到带有 msgid <msgid> 的项目"
+#: catalogmanager/libcvs/cvsdialog.cpp:157
+#: catalogmanager/libsvn/svndialog.cpp:152 commonui/roughtransdlg.cpp:83
+msgid "C&ancel"
+msgstr "取消(&A)"
 
-#: kbabel/main.cpp:538 kbabeldict/main.cpp:105
-msgid "Disable splashscreen at startup"
-msgstr "在启动时不显示欢迎屏幕"
+#: commonui/roughtransdlg.cpp:96
+msgid "What to Translate"
+msgstr "要翻译的项目"
 
-#: kbabel/main.cpp:540
-msgid "Files to open"
-msgstr "要打开的文件"
+#: commonui/roughtransdlg.cpp:102
+msgid "U&ntranslated entries"
+msgstr "未翻译的项目(&N)"
 
-#: kbabel/main.cpp:547
-msgid "KBabel"
-msgstr "KBabel"
+#: commonui/roughtransdlg.cpp:103
+msgid "&Fuzzy entries"
+msgstr "模糊项目(&F)"
 
-#: kbabel/main.cpp:548
-msgid "An advanced PO file editor"
-msgstr "一个高级 PO 文件编辑器"
+#: commonui/roughtransdlg.cpp:104
+msgid "T&ranslated entries"
+msgstr "已翻译的项目(&R)"
 
-#: kbabel/main.cpp:555
+#: commonui/roughtransdlg.cpp:108
 msgid ""
-"Wrote the dictionary plugin for searching in a database and some other code."
-msgstr "编写了用于在数据库搜索的字典以及一些其它代码。"
-
-#: kbabel/main.cpp:560
-msgid "Bug fixes, KFilePlugin for PO files, CVS support, mailing files"
-msgstr "错误修正，用于 PO 文件的 KFilePlugin，CVS 支持，邮寄文件"
+"<qt>"
+"<p><b>What entries to translate</b></p>"
+"<p>Choose here, for which entries of the file KBabel tries to find a "
+"translation. Changed entries are always marked as fuzzy, no matter which option "
+"you choose.</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>要翻译的项目</b></p>"
+"<p>在此处选择 KBabel 要为文件中的哪些项目查找翻译。不管您选择哪个选项，改变的项目总是标记为 fuzzy(模糊翻译)。</p></qt>"
 
-#: kbabel/main.cpp:562
-msgid "Translation List View"
-msgstr "翻译列表视图"
+#: commonui/roughtransdlg.cpp:113
+msgid "How to Translate"
+msgstr "如何翻译"
 
-#: kbabel/main.cpp:574
-msgid "Implemented XML validation/highlighting plus other small fixes."
-msgstr "实现了 XML 校验/语法加亮以及其它一些小修正。"
+#: commonui/roughtransdlg.cpp:118
+msgid "&Use dictionary settings"
+msgstr "使用字典设置(&U)"
 
-#: kbabel/main.cpp:583
-msgid "String distance algorithm implementation"
-msgstr ""
+#: commonui/roughtransdlg.cpp:121
+msgid "Fu&zzy translation (slow)"
+msgstr "允许模糊翻译(很慢)(&Z)"
 
-#: kbabel/main.cpp:585
-#, fuzzy
-msgid "Error list for current entry, regexp data tool"
-msgstr "当前的项目"
+#: commonui/roughtransdlg.cpp:123
+msgid "&Single word translation"
+msgstr "允许单个字词翻译(&S)"
 
-#: kbabel/main.cpp:587
-msgid "Word-by-word string difference algorithm implementation"
+#: commonui/roughtransdlg.cpp:126
+msgid ""
+"<qt>"
+"<p><b>How messages get translated</b></p>"
+"<p>Here you can define if a message can only get translated completely, if "
+"similar messages are acceptable or if KBabel is supposed to try translating the "
+"single words of a message if no translation of the complete message or similar "
+"message was found.</p></qt>"
 msgstr ""
+"<qt>"
+"<p><b>如何翻译消息</b></p>"
+"<p>此处您可以定义：消息是否仅可以被完全翻译；是否可接受相似的消息；如果没有找到翻译完整的消息或相似的消息，KBabel "
+"是否应该试图翻译某条消息中的单个单词。</p></qt>"
 
-#: kbabel/headereditor.cpp:60
-msgid "&Apply Settings"
-msgstr "应用设置(&A)"
+#: commonui/roughtransdlg.cpp:136
+msgid "&Mark changed entries as fuzzy"
+msgstr "把改变的项目标记为模糊项(&M)"
 
-#: kbabel/headereditor.cpp:61
+#: commonui/roughtransdlg.cpp:139
 msgid ""
 "<qt>"
-"<p>This button updates the header using the current settings. The resulting "
-"header is the one that would be written into the PO file on saving.</p></qt>"
+"<p><b>Mark changed entries as fuzzy</b></p>"
+"<p>When a translation for a message is found, the entry will be marked <b>"
+"fuzzy</b> by default. This is because the translation is just guessed by KBabel "
+"and you should always check the results carefully. Deactivate this option only "
+"if you know what you are doing.</p></qt>"
 msgstr ""
+"<qt>"
+"<p><b>把改变的项目标记为模糊翻译</b></p>"
+"<p>当找到一条消息的翻译时，该项目将会被默认标记为<b>“模糊翻译”</b>。这是因为译文仅仅是 KBabel "
+"的猜测，您应该总是仔细检查结果。只有您知道您正在做什么时才取消该选项。</p></qt>"
 
-#: kbabel/headereditor.cpp:65
-msgid "&Reset"
-msgstr "重置(&R)"
+#: commonui/roughtransdlg.cpp:150
+msgid "Initialize &TDE-specific entries"
+msgstr "初始化 TDE 特有的项目(&K)"
 
-#: kbabel/headereditor.cpp:66
-msgid "<qt><p>This button will revert all changes made so far.</p></qt>"
+#: commonui/roughtransdlg.cpp:153
+msgid ""
+"<qt>"
+"<p><b>Initialize TDE-specific entries</b></p>"
+"<p>Initialize \"Comment=\" and \"Name=\" entries if a translation is not found. "
+"Also, \"NAME OF TRANSLATORS\" and \"EMAIL OF TRANSLATORS\" is filled with "
+"identity settings.</p></qt>"
 msgstr ""
+"<qt>"
+"<p><b>初始化 TDE 特有的项目</b></p>"
+"<p>如果没有找到翻译，初始化“Comment=”和“Name=”项目。此外，使用身份设置来填充“NAME OF TRANSLATORS”和“EMAIL OF "
+"TRANSLATORS”。</p></qt>"
 
-#: kbabel/headereditor.cpp:111
-#, c-format
-msgid "Header Editor for %1"
-msgstr "%1 的文件头编辑器"
+#: commonui/roughtransdlg.cpp:158
+msgid "Dictionaries"
+msgstr "字典"
 
-#: kbabel/headereditor.cpp:136
+#: commonui/roughtransdlg.cpp:177
 msgid ""
 "<qt>"
-"<p>This is not a valid header.</p>\n"
-"<p>Please edit the header before updating!</p></qt>"
+"<p><b>Dictionaries</b></p>"
+"<p>Choose here, which dictionaries have to be used for finding a translation. "
+"If you select more than one dictionary, they are used in the same order as they "
+"are displayed in the list.</p>"
+"<p>The <b>Configure</b> button allows you to temporarily configure selected "
+"dictionary. The original settings will be restored after closing the dialog.</p>"
+"</qt>"
 msgstr ""
 "<qt>"
-"<p>这不是有效的文件头。</p>\n"
-"<p>请在更新前修改文件头！</p></qt>"
+"<p><b>字典</b></p>"
+"<p>在此处选择哪些字典会被用来查找翻译。如果您选择了多个字典，则按它们在列表中显示的顺序来使用它们。</p></qt> "
+"<p><b>配置</b> 按钮允许你暂时配置选中的字典。最初的设置将在关闭对话框之后恢复。</p></qt>"
 
-#: kbabel/headereditor.cpp:172
+#: commonui/roughtransdlg.cpp:186
+msgid "Messages:"
+msgstr "消息："
+
+#: catalogmanager/multiroughtransdlg.cpp:129 commonui/roughtransdlg.cpp:671
+msgid ""
+"Result of the translation:\n"
+"Edited entries: %1\n"
+"Exact translations: %2 (%3%)\n"
+"Approximate translations: %4 (%5%)\n"
+"Nothing found: %6 (%7%)"
+msgstr ""
+"翻译结果：\n"
+"已编辑项目：%1\n"
+"确切翻译：%2 (%3%)\n"
+"大致翻译：%4 (%5%)\n"
+"什么都没找到：%6 (%7%)"
+
+#: catalogmanager/multiroughtransdlg.cpp:143 commonui/roughtransdlg.cpp:685
+msgid "Rough Translation Statistics"
+msgstr "粗略翻译统计"
+
+#: commonui/roughtransdlg.cpp:744
 msgid ""
 "<qt>"
-"<p>This is not a valid header.</p>\n"
-"<p>Please edit the header before updating.</p></qt>"
+"<p>When a translation for a message is found, the entry will be marked <b>"
+"fuzzy</b> by default. This is because the translation is just guessed by KBabel "
+"and you should always check the results carefully. Deactivate this option only "
+"if you know what you are doing.</p></qt>"
 msgstr ""
 "<qt>"
-"<p>这不是有效的文件头。</p>\n"
-"<p>请在更新前修改文件头！</p></qt>"
+"<p>当找到一条消息的翻译时，该项目将会被默认标记为<b>“模糊翻译”</b>。这是因为译文仅仅是 KBabel "
+"的猜测，您应该总是仔细检查结果。只有在您知道您正在做什么时才取消该选项。</p></qt>"
+
+#: commonui/projectwizard.cpp:78
+msgid "Basic Project Information"
+msgstr "基本工程信息"
+
+#: commonui/projectwizard.cpp:83
+msgid "Translation Files"
+msgstr "翻译文件"
+
+#: commonui/projectwizard.cpp:140
+msgid ""
+"The file '%1' already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+"文件“%1”已经存在。\n"
+"您要覆盖它吗？"
+
+#: commonui/projectwizard.cpp:141
+msgid "File Exists"
+msgstr "文件已存在"
+
+#: addons/tdefile-plugins/tdefile_po.cpp:50
+msgid "Catalog Information"
+msgstr "目录信息"
+
+#: addons/tdefile-plugins/tdefile_po.cpp:53
+msgid "Total Messages"
+msgstr "总计消息"
+
+#: addons/tdefile-plugins/tdefile_po.cpp:54
+msgid "Fuzzy Messages"
+msgstr "模糊消息"
+
+#: addons/tdefile-plugins/tdefile_po.cpp:55
+msgid "Untranslated Messages"
+msgstr "未翻译消息"
+
+#: addons/tdefile-plugins/tdefile_po.cpp:56
+#: catalogmanager/catalogmanagerview.cpp:96
+msgid "Last Translator"
+msgstr "最后翻译者"
+
+#: addons/tdefile-plugins/tdefile_po.cpp:57
+msgid "Language Team"
+msgstr "语言小组"
+
+#: addons/tdefile-plugins/tdefile_po.cpp:58
+msgid "Revision"
+msgstr "版本"
+
+#: _translatorinfo.cpp:1 kbabeldict/main.cpp:121
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "开源软件国际化之简体中文组"
+
+#: _translatorinfo.cpp:3 kbabeldict/main.cpp:122
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "i18n@lists.linux.net.cn"
+
+#: datatools/punctuation/main.cc:58
+msgid ""
+"_: what check found errors\n"
+"punctuation"
+msgstr "标点符号"
+
+#: datatools/whitespace/main.cc:60
+msgid ""
+"_: which check found errors\n"
+"whitespace only translation"
+msgstr "空白的译文"
+
+#: datatools/equations/main.cc:58
+msgid ""
+"_: what check found errors\n"
+"equations"
+msgstr "等式"
+
+#: datatools/not-translated/main.cc:60
+#, fuzzy
+msgid ""
+"_: which check found errors\n"
+"English text in translation"
+msgstr "译文中含有英文"
+
+#: datatools/xml/main.cc:60
+msgid ""
+"_: what check found errors\n"
+"XML tags"
+msgstr "XML 标签"
+
+#: datatools/accelerators/main.cc:58
+msgid ""
+"_: what check found errors\n"
+"accelerator"
+msgstr "快捷键"
+
+#: datatools/length/main.cc:61 datatools/regexp/main.cc:55
+msgid ""
+"_: which check found errors\n"
+"translation has inconsistent length"
+msgstr "译文长度不一致"
+
+#: datatools/regexp/main.cc:58
+msgid "Error loading data (%1)"
+msgstr ""
+
+#: datatools/regexp/main.cc:118
+msgid "File not found"
+msgstr "文件未找到"
+
+#: datatools/regexp/main.cc:123
+msgid "The file is not a XML"
+msgstr ""
+
+#: datatools/regexp/main.cc:147
+msgid "Expected tag 'item'"
+msgstr ""
+
+#: datatools/regexp/main.cc:153
+msgid "First child of 'item' is not a node"
+msgstr ""
+
+#: datatools/regexp/main.cc:159
+msgid "Expected tag 'name'"
+msgstr ""
+
+#: datatools/regexp/main.cc:167
+msgid "Expected tag 'exp'"
+msgstr ""
+
+#: datatools/pluralforms/main.cc:59
+msgid ""
+"_: what check found errors\n"
+"plural forms"
+msgstr "复数形式"
+
+#: datatools/context/main.cc:58
+msgid ""
+"_: what check found errors\n"
+"context info"
+msgstr "上下文信息"
+
+#: datatools/arguments/main.cc:57
+msgid ""
+"_: what check found errors\n"
+"arguments"
+msgstr "参数"
 
 #: kbabel/kbabelview.cpp:185
 msgid ""
@@ -2884,6 +1486,10 @@ msgstr "翻译字符串(msgstr)(&L)："
 msgid "fuzzy"
 msgstr "模糊翻译"
 
+#: kbabel/contextview.cpp:125 kbabel/kbabel.cpp:721 kbabel/kbabelview.cpp:419
+msgid "untranslated"
+msgstr "未翻译"
+
 #: kbabel/kbabel.cpp:725 kbabel/kbabelview.cpp:428
 msgid "faulty"
 msgstr "错误"
@@ -2917,6 +1523,11 @@ msgstr ""
 "<p></qt>"
 
 #. i18n: translators: Dock window caption
+#: kbabel/kbabelview.cpp:456 kbabel/kbcataloglistview.cpp:46
+msgid "Translated String"
+msgstr "已翻译的字符串"
+
+#. i18n: translators: Dock window caption
 #: kbabel/kbabelview.cpp:466
 msgid ""
 "_: the search (noun)\n"
@@ -2993,6 +1604,18 @@ msgid ""
 "There was an error while reading the file header. Please check the header."
 msgstr "在读取文件头时出错。请检查文件头。"
 
+#: catalogmanager/multiroughtransdlg.cpp:84
+#: catalogmanager/multiroughtransdlg.cpp:96 kbabel/kbabelview.cpp:1182
+#: kbabel/kbabelview.cpp:1304 kbabel/kbabelview2.cpp:724
+msgid ""
+"Error while trying to read file:\n"
+" %1\n"
+"Maybe it is not a valid PO file."
+msgstr ""
+"在试图读取文件时出错：\n"
+" %1\n"
+"也许它不是一个有效的 PO 文件。"
+
 #: kbabel/kbabelview.cpp:1189 kbabel/kbabelview.cpp:1311
 #, fuzzy
 msgid ""
@@ -3051,6 +1674,17 @@ msgstr ""
 "导入的插件无法处理这种类型的文件：\n"
 "%1"
 
+#: catalogmanager/catalogmanagerview.cpp:448
+#: catalogmanager/catalogmanagerview.cpp:483 kbabel/kbabelview.cpp:1233
+#: kbabel/kbabelview.cpp:1349 kbabel/kbabelview2.cpp:757
+#, c-format
+msgid ""
+"Error while trying to open file:\n"
+" %1"
+msgstr ""
+"试图打开文件时出错：\n"
+" %1 "
+
 #: kbabel/kbabelview.cpp:1262
 msgid ""
 "All changes will be lost if the file is reverted to its last saved state."
@@ -3120,6 +1754,15 @@ msgstr ""
 "%1\n"
 "您要保存到另一个文件或者取消吗？"
 
+#: catalogmanager/catalogmanagerview.cpp:519 kbabel/kbabelview.cpp:1451
+msgid "The file %1 already exists. Do you want to overwrite it?"
+msgstr "文件 %1 已经存在。您要覆盖该文件吗？"
+
+#: catalogmanager/catalogmanagerview.cpp:520 kbabel/kbabelview.cpp:1452
+#: kbabel/kbabelview.cpp:1521
+msgid "&Overwrite"
+msgstr "覆盖(&O)"
+
 #: kbabel/kbabelview.cpp:1482
 msgid ""
 "You have specified a folder:\n"
@@ -3161,6 +1804,12 @@ msgstr ""
 "\n"
 "“msgfmt --statistics”的输出：\n"
 
+#: catalogmanager/catalogmanagerview.cpp:845
+#: catalogmanager/catalogmanagerview.cpp:934 kbabel/kbabelview.cpp:1649
+#, fuzzy
+msgid "You can use gettext tools only for checking PO files."
+msgstr "你只可以用 gettext 工具来检查 GNU 的 PO 文件。"
+
 #: kbabel/kbabelview.cpp:1658
 #, fuzzy
 msgid ""
@@ -3321,7 +1970,8 @@ msgid "Spellcheck"
 msgstr "拼写检查"
 
 #: kbabel/kbabelview.cpp:3949
-msgid "KBabel cannot start spell checker. Please verify your TDE installation."
+#, fuzzy
+msgid "KBabel cannot start spell checker. Please check your TDE installation."
 msgstr "KBabel 无法启动拼写检查器。请检查您的 TDE 安装。"
 
 #: kbabel/kbabelview.cpp:3974
@@ -3395,15 +2045,47 @@ msgstr ""
 msgid "The spell checker program seems to have crashed."
 msgstr "Ispell 似乎已崩溃。"
 
-#: kbabel/spelldlg.cpp:44
+#: catalogmanager/catalogmanager.cpp:940
+#: catalogmanager/catalogmanager.cpp:1024 kbabel/kbabelview.cpp:4433
+#: kbabeldict/kbabeldictview.cpp:239
+msgid "Searching"
+msgstr "正在搜索"
+
+#: kbabel/charselectview.cpp:64 kbabel/kbcharselect.cpp:52
+msgid "Table:"
+msgstr "字符表："
+
+#: kbabel/charselectview.cpp:84
 msgid ""
-"_: Caption of dialog\n"
-"Spelling"
-msgstr "拼写"
+"<qt>"
+"<p><b>Character Selector</b></p>"
+"<p>This tool allows to insert special characters using double click.</p></qt>"
+msgstr "<qt><p><b>字符选择器</b></p><p>这个工具能让您使用鼠标双击插入特殊字符。</p></qt>"
 
-#: kbabel/spelldlg.cpp:47
-msgid "&Spell Check"
-msgstr "拼写检查(&S)"
+#: kbabel/contextview.cpp:63
+msgid ""
+"<qt>"
+"<p><b>PO Context</b></p>"
+"<p>This window shows the context of the current message in the PO file. "
+"Normally it shows four messages in front of the current message and four after "
+"it.</p>"
+"<p>You can hide the tools window by deactivating <b>Options->Show Tools</b>.</p>"
+"</qt></qt>"
+msgstr ""
+"<qt>"
+"<p><b>PO 上下文</b></p>"
+"<p>该窗口显示当前消息在 PO 文件中的上下文。通常，它显示当前消息的前面四条和后面四条。</p>"
+"<p>您可以取消<b>“选项->显示工具”</b>来隐藏工具窗口。</p></qt></qt>"
+
+#: kbabel/contextview.cpp:99
+msgid "current entry"
+msgstr "当前的项目"
+
+#: kbabel/contextview.cpp:140
+msgid ""
+"Plural %1: %2\n"
+msgstr ""
+"复数 %1：%2\n"
 
 #: kbabel/hidingmsgedit.cpp:76
 msgid "Context inserted by KBabel, do not translate:"
@@ -3414,6 +2096,171 @@ msgstr ""
 msgid "Plural %1"
 msgstr "复数 %1"
 
+#: kbabel/kbabelpref.cpp:57
+msgid ""
+"_: title of page in preferences dialog\n"
+"Edit"
+msgstr "编辑"
+
+#: kbabel/kbabelpref.cpp:59
+msgid "Options for Editing"
+msgstr "编辑的选项"
+
+#: kbabel/kbabelpref.cpp:70
+msgid ""
+"_: title of page in preferences dialog\n"
+"Search"
+msgstr "搜索"
+
+#: kbabel/kbabelpref.cpp:72
+msgid "Options for Searching Similar Translations"
+msgstr "搜索相似翻译的选项"
+
+#: kbabel/kbabelpref.cpp:87
+msgid "Options for Showing Differences"
+msgstr "显示差别的选项"
+
+#: kbabel/kbabelpref.cpp:90
+msgid ""
+"_: name of page in preferences dialog icon list\n"
+"Fonts"
+msgstr "字体"
+
+#: kbabel/kbabelpref.cpp:92
+msgid ""
+"_: title of page in preferences dialog\n"
+"Font Settings"
+msgstr "字体设置"
+
+#: kbabel/kbabelpref.cpp:95
+msgid ""
+"_: name of page in preferences dialog icon list\n"
+"Colors"
+msgstr "颜色"
+
+#: kbabel/kbabelpref.cpp:97
+msgid ""
+"_: title of page in preferences dialog\n"
+"Color Settings"
+msgstr "颜色设置"
+
+#: kbabel/kbcataloglistview.cpp:44
+msgid "Id"
+msgstr ""
+
+#: kbabel/kbcataloglistview.cpp:45
+msgid "Original String"
+msgstr "原始字符串"
+
+#: kbabel/kbabelview2.cpp:538
+#, c-format
+msgid ""
+"An error occurred while trying to get the list of messages for this file from "
+"the database:\n"
+"%1"
+msgstr ""
+"在试图为该文件从数据库中获取消息列表时出现错误：\n"
+"%1"
+
+#: kbabel/kbabelview2.cpp:624
+msgid "No difference found"
+msgstr "没有找到差异"
+
+#: kbabel/kbabelview2.cpp:628
+msgid "Difference found"
+msgstr "找到差异"
+
+#: kbabel/kbabelview2.cpp:636
+msgid "No corresponding message found."
+msgstr "没有找到相应的消息。"
+
+#: kbabel/kbabelview2.cpp:641
+msgid "No corresponding message found"
+msgstr "没有找到相应的消息"
+
+#: kbabel/kbabelview2.cpp:696
+msgid "Select File to Diff With"
+msgstr "选择要用来做 Diff 的文件"
+
+#: kbabel/kbabelview2.cpp:710
+msgid "loading file for diff"
+msgstr "正在载入要做 Diff 的文件"
+
+#: kbabel/kbabelview2.cpp:801
+msgid ""
+"The search string has not been found yet.\n"
+"However, the string might be found in the files being searched at the moment.\n"
+"Please try later."
+msgstr ""
+"还没有找到搜索字符串。\n"
+"不过字符串也许能够在被搜索的文件中找到。\n"
+"请稍后再试。"
+
+#: kbabel/kbabelview2.cpp:810
+msgid "Do not show in this find/replace session again"
+msgstr "在本次查找/替换会话中不再显示"
+
+#: kbabel/kbabelview2.cpp:825
+msgid "Enter new package for the current file:"
+msgstr "输入当前文件的新软件包："
+
+#: kbabel/kbabelview2.cpp:1021
+msgid ""
+"Total words: %1\n"
+"\n"
+"Words in untranslated messages: %2\n"
+"\n"
+"Words in fuzzy messages: %3"
+msgstr ""
+
+#: kbabel/kbabelview2.cpp:1024
+msgid "Word Count"
+msgstr "单词统计"
+
+#. i18n: file ./kbabel/headerwidget.ui line 24
+#: kbabel/commentview.cpp:78 rc.cpp:265
+#, no-c-format
+msgid "&Comment:"
+msgstr "注释(&C)："
+
+#: kbabel/commentview.cpp:88
+msgid ""
+"<qt>"
+"<p><b>Comment Editor</b></p>\n"
+"This edit window shows you the comments of the currently displayed message."
+"<p>\n"
+"<p>The comments normally contain information about where the message is found "
+"in the source\n"
+"code and status information about this message (fuzzy, c-format).\n"
+"Hints from other translators are also sometimes contained in comments.</p>\n"
+"<p>You can hide the comment editor by deactivating\n"
+"<b>Options->Show Comments</b>.</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>注释编辑器</b></p>\n"
+"该编辑窗口向您显示当前消息的注释。"
+"<p>\n"
+"<p>这些注释通常包含当前消息在源码中的位置信息，\n"
+"以及该消息的状态信息(fuzzy、c-format)。\n"
+"其他翻译人员的建议有时也包含在注释中。</p>\n"
+"<p>您可以通过取消<b>“选项->显示注释”</b>\n"
+"来隐藏注释编辑器。</p></qt>"
+
+#: catalogmanager/catalogmanager.cpp:129 kbabel/kbabel.cpp:132
+#: kbabel/kbabel.cpp:150 kbabel/kbabel.cpp:1754
+#, c-format
+msgid ""
+"Cannot open project file\n"
+"%1"
+msgstr ""
+"无法打开工程文件\n"
+"%1"
+
+#: catalogmanager/catalogmanager.cpp:130 kbabel/kbabel.cpp:133
+#: kbabel/kbabel.cpp:151 kbabel/kbabel.cpp:1755
+msgid "Project File Error"
+msgstr "工程文件出错"
+
 #: kbabel/kbabel.cpp:330
 msgid ""
 "You have not run KBabel before. To allow KBabel to work correctly you must "
@@ -3510,6 +2357,38 @@ msgstr "第一项(&F)"
 msgid "&Last Entry"
 msgstr "最后一项(&L)"
 
+#: catalogmanager/catalogmanager.cpp:299 kbabel/kbabel.cpp:528
+msgid "P&revious Fuzzy or Untranslated"
+msgstr "上一个模糊或未翻译项(&R)"
+
+#: catalogmanager/catalogmanager.cpp:296 kbabel/kbabel.cpp:531
+msgid "N&ext Fuzzy or Untranslated"
+msgstr "下一个模糊或未翻译项(&E)"
+
+#: catalogmanager/catalogmanager.cpp:293 kbabel/kbabel.cpp:534
+msgid "Pre&vious Fuzzy"
+msgstr "上一个模糊项(&V)"
+
+#: catalogmanager/catalogmanager.cpp:290 kbabel/kbabel.cpp:537
+msgid "Ne&xt Fuzzy"
+msgstr "下一个模糊项(&X)"
+
+#: catalogmanager/catalogmanager.cpp:287 kbabel/kbabel.cpp:540
+msgid "Prev&ious Untranslated"
+msgstr "上一个未翻译项(&I)"
+
+#: catalogmanager/catalogmanager.cpp:284 kbabel/kbabel.cpp:543
+msgid "Nex&t Untranslated"
+msgstr "下一个未翻译项(&T)"
+
+#: catalogmanager/catalogmanager.cpp:306 kbabel/kbabel.cpp:546
+msgid "Previo&us Error"
+msgstr "上一个错误(&U)"
+
+#: catalogmanager/catalogmanager.cpp:303 kbabel/kbabel.cpp:549
+msgid "Next Err&or"
+msgstr "下一个错误(&O)"
+
 #: kbabel/kbabel.cpp:552
 msgid "&Back in History"
 msgstr "在历史中返回(&B)"
@@ -3538,6 +2417,18 @@ msgstr "配置字典(&F)"
 msgid "About Dictionary"
 msgstr "关于字典"
 
+#: catalogmanager/catalogmanager.cpp:331 kbabel/kbabel.cpp:594
+msgid "&New..."
+msgstr "新建(&N)..."
+
+#: catalogmanager/catalogmanager.cpp:339 kbabel/kbabel.cpp:602
+msgid "C&lose"
+msgstr "关闭(&L)"
+
+#: catalogmanager/catalogmanager.cpp:345 kbabel/kbabel.cpp:607
+msgid "&Configure..."
+msgstr "配置(&C)..."
+
 #: kbabel/kbabel.cpp:614
 msgid "&Spell Check..."
 msgstr "拼写检查(&S)..."
@@ -3566,6 +2457,11 @@ msgstr "检查选中的文本(&K)..."
 msgid "&Diffmode"
 msgstr "比较模式(&D)"
 
+#: catalogmanager/libcvs/cvsdialog.cpp:358
+#: catalogmanager/libsvn/svndialog.cpp:337 kbabel/kbabel.cpp:642
+msgid "&Show Diff"
+msgstr "显示差别(&S)"
+
 #: kbabel/kbabel.cpp:645
 msgid "S&how Original Text"
 msgstr "显示原始文本(&H)"
@@ -3590,6 +2486,10 @@ msgstr "切换编辑模式"
 msgid "&Word Count"
 msgstr "单词统计(&W)"
 
+#: catalogmanager/catalogmanager.cpp:243 kbabel/kbabel.cpp:674
+msgid "&Stop Searching"
+msgstr "停止搜索(&S)"
+
 #: kbabel/kbabel.cpp:678
 msgid "&Gettext Info"
 msgstr "&Gettext 信息"
@@ -3619,7 +2519,7 @@ msgid "Untranslated: 0"
 msgstr "未翻译：0"
 
 #. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 75
-#: kbabel/kbabel.cpp:713 rc.cpp:803
+#: kbabel/kbabel.cpp:713 rc.cpp:924
 #, no-c-format
 msgid "Status: "
 msgstr "状态："
@@ -3649,6 +2549,10 @@ msgstr ""
 "<p><b>状态栏</b></p>\n"
 "<p>状态栏显示打开文件的某些信息，如条目总数和模糊翻译以及未翻译消息的数目。它还显示索引和当前显示项的状态。</p></qt>"
 
+#: catalogmanager/catalogmanager.cpp:399 kbabel/kbabel.cpp:765
+msgid "&Validation"
+msgstr "校验(&V)"
+
 #: kbabel/kbabel.cpp:767
 msgid "Perform &All Checks"
 msgstr "执行所有的检查(&A)"
@@ -3719,224 +2623,186 @@ msgid ""
 "Spellcheck Done"
 msgstr "拼写检查完毕"
 
-#: kbabel/kbabelview2.cpp:538
-#, c-format
+#: kbabel/errorlistview.cpp:62
 msgid ""
-"An error occurred while trying to get the list of messages for this file from "
-"the database:\n"
-"%1"
+"<qt>"
+"<p><b>Error List</b></p>"
+"<p>This window shows the list of errors found by validator tools so you can "
+"know why the current message has been marked with an error.</p></qt>"
 msgstr ""
-"在试图为该文件从数据库中获取消息列表时出现错误：\n"
-"%1"
 
-#: kbabel/kbabelview2.cpp:624
-msgid "No difference found"
-msgstr "没有找到差异"
+#: kbabel/gotodialog.cpp:41 kbabel/gotodialog.cpp:43
+msgid "Go to Entry"
+msgstr "转到项目"
 
-#: kbabel/kbabelview2.cpp:628
-msgid "Difference found"
-msgstr "找到差异"
+#: kbabel/headereditor.cpp:60
+msgid "&Apply Settings"
+msgstr "应用设置(&A)"
 
-#: kbabel/kbabelview2.cpp:636
-msgid "No corresponding message found."
-msgstr "没有找到相应的消息。"
+#: kbabel/headereditor.cpp:61
+msgid ""
+"<qt>"
+"<p>This button updates the header using the current settings. The resulting "
+"header is the one that would be written into the PO file on saving.</p></qt>"
+msgstr ""
 
-#: kbabel/kbabelview2.cpp:641
-msgid "No corresponding message found"
-msgstr "没有找到相应的消息"
+#: kbabel/headereditor.cpp:65
+msgid "&Reset"
+msgstr "重置(&R)"
 
-#: kbabel/kbabelview2.cpp:696
-msgid "Select File to Diff With"
-msgstr "选择要用来做 Diff 的文件"
+#: kbabel/headereditor.cpp:66
+msgid "<qt><p>This button will revert all changes made so far.</p></qt>"
+msgstr ""
 
-#: kbabel/kbabelview2.cpp:710
-msgid "loading file for diff"
-msgstr "正在载入要做 Diff 的文件"
+#: kbabel/headereditor.cpp:111
+#, c-format
+msgid "Header Editor for %1"
+msgstr "%1 的文件头编辑器"
 
-#: kbabel/kbabelview2.cpp:801
+#: kbabel/headereditor.cpp:136
 msgid ""
-"The search string has not been found yet.\n"
-"However, the string might be found in the files being searched at the moment.\n"
-"Please try later."
+"<qt>"
+"<p>This is not a valid header.</p>\n"
+"<p>Please edit the header before updating!</p></qt>"
 msgstr ""
-"还没有找到搜索字符串。\n"
-"不过字符串也许能够在被搜索的文件中找到。\n"
-"请稍后再试。"
-
-#: kbabel/kbabelview2.cpp:810
-msgid "Do not show in this find/replace session again"
-msgstr "在本次查找/替换会话中不再显示"
-
-#: kbabel/kbabelview2.cpp:825
-msgid "Enter new package for the current file:"
-msgstr "输入当前文件的新软件包："
+"<qt>"
+"<p>这不是有效的文件头。</p>\n"
+"<p>请在更新前修改文件头！</p></qt>"
 
-#: kbabel/kbabelview2.cpp:1021
+#: kbabel/headereditor.cpp:172
 msgid ""
-"Total words: %1\n"
-"\n"
-"Words in untranslated messages: %2\n"
-"\n"
-"Words in fuzzy messages: %3"
+"<qt>"
+"<p>This is not a valid header.</p>\n"
+"<p>Please edit the header before updating.</p></qt>"
 msgstr ""
+"<qt>"
+"<p>这不是有效的文件头。</p>\n"
+"<p>请在更新前修改文件头！</p></qt>"
 
-#: kbabel/kbabelview2.cpp:1024
-msgid "Word Count"
-msgstr "单词统计"
-
-#: kbabel/charselectview.cpp:64 kbabel/kbcharselect.cpp:52
-msgid "Table:"
-msgstr "字符表："
-
-#: kbabel/charselectview.cpp:84
+#: kbabel/spelldlg.cpp:44
 msgid ""
-"<qt>"
-"<p><b>Character Selector</b></p>"
-"<p>This tool allows to insert special characters using double click.</p></qt>"
-msgstr "<qt><p><b>字符选择器</b></p><p>这个工具能让您使用鼠标双击插入特殊字符。</p></qt>"
+"_: Caption of dialog\n"
+"Spelling"
+msgstr "拼写"
 
-#: kbabel/gotodialog.cpp:41 kbabel/gotodialog.cpp:43
-msgid "Go to Entry"
-msgstr "转到项目"
+#: kbabel/spelldlg.cpp:47
+msgid "&Spell Check"
+msgstr "拼写检查(&S)"
 
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 11
-#: rc.cpp:6 rc.cpp:331
-#, no-c-format
-msgid "&Go"
-msgstr "转到(&G)"
+#: kbabel/main.cpp:537
+msgid "Go to entry with msgid <msgid>"
+msgstr "转到带有 msgid <msgid> 的项目"
 
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 30
-#: rc.cpp:9
-#, no-c-format
-msgid "&Markings"
-msgstr "标记(&M)"
+#: kbabel/main.cpp:538 kbabeldict/main.cpp:105
+msgid "Disable splashscreen at startup"
+msgstr "在启动时不显示欢迎屏幕"
 
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 43
-#: rc.cpp:12 rc.cpp:334
-#, no-c-format
-msgid "&Project"
-msgstr "工程(&P)"
+#: catalogmanager/main.cpp:178 kbabel/main.cpp:539
+msgid "File to load configuration from"
+msgstr "要从中载入配置的文件"
 
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 60
-#: rc.cpp:18 rc.cpp:36 rc.cpp:42
-#, no-c-format
-msgid "CVS"
-msgstr "CVS"
+#: kbabel/main.cpp:540
+msgid "Files to open"
+msgstr "要打开的文件"
 
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 122
-#: rc.cpp:30 rc.cpp:358
-#, no-c-format
-msgid "Main"
-msgstr "主要"
+#: kbabel/main.cpp:547
+msgid "KBabel"
+msgstr "KBabel"
 
-#. i18n: file ./catalogmanager/catalogmanagerui.rc line 128
-#: rc.cpp:33 rc.cpp:361
-#, no-c-format
-msgid "Navigationbar"
-msgstr "导航栏"
+#: kbabel/main.cpp:548
+msgid "An advanced PO file editor"
+msgstr "一个高级 PO 文件编辑器"
 
-#. i18n: file ./catalogmanager/validateprogresswidget.ui line 38
-#: kbabeldict/kbabeldictbox.cpp:208 rc.cpp:48
-#, no-c-format
-msgid "Current:"
-msgstr "目前："
+#: catalogmanager/main.cpp:188 kbabel/main.cpp:549
+#, fuzzy
+msgid "(c) 1999,2000,2001,2002,2003,2004,2005,2006 The KBabel developers"
+msgstr "(c) 1999,2000,2001,2002,2003,2004,2005 KBabel 开发者"
 
-#. i18n: file ./catalogmanager/validateprogresswidget.ui line 59
-#: rc.cpp:51
-#, no-c-format
-msgid "Overall:"
-msgstr "全部："
+#: catalogmanager/main.cpp:190 kbabel/main.cpp:551 kbabeldict/main.cpp:118
+msgid "Original author"
+msgstr "最初作者"
 
-#. i18n: file ./catalogmanager/validateprogresswidget.ui line 80
-#: rc.cpp:54
-#, no-c-format
-msgid "Current file:"
-msgstr "当前文件："
+#: catalogmanager/main.cpp:202 kbabel/main.cpp:553
+msgid "Wrote diff algorithm, fixed KSpell and gave a lot of useful hints."
+msgstr "编写了 diff 算法、修正了 KSpell 并提供了大量有用提示。"
 
-#. i18n: file ./catalogmanager/validateprogresswidget.ui line 88
-#: rc.cpp:57
-#, no-c-format
-msgid "Validation:"
-msgstr "校验："
+#: kbabel/main.cpp:555
+msgid ""
+"Wrote the dictionary plugin for searching in a database and some other code."
+msgstr "编写了用于在数据库搜索的字典以及一些其它代码。"
 
-#. i18n: file ./catalogmanager/validateprogresswidget.ui line 96
-#: rc.cpp:60 rc.cpp:143 rc.cpp:740
-#, no-c-format
-msgid "New Item"
-msgstr "新条目"
+#: catalogmanager/main.cpp:191 kbabel/main.cpp:558
+#, fuzzy
+msgid "Current maintainer, porting to KDE3/Qt3."
+msgstr "当前的维护者，移植到 TDE3/Qt3。"
 
-#. i18n: file ./catalogmanager/markpatternwidget.ui line 24
-#: rc.cpp:63
-#, no-c-format
-msgid "To be set dynamically:"
-msgstr "将被动态设置："
+#: kbabel/main.cpp:560
+msgid "Bug fixes, KFilePlugin for PO files, CVS support, mailing files"
+msgstr "错误修正，用于 PO 文件的 KFilePlugin，CVS 支持，邮寄文件"
 
-#. i18n: file ./catalogmanager/markpatternwidget.ui line 62
-#: rc.cpp:72
-#, no-c-format
-msgid "&Include templates"
-msgstr "包括模板(&I)"
+#: kbabel/main.cpp:562
+msgid "Translation List View"
+msgstr "翻译列表视图"
 
-#. i18n: file ./catalogmanager/markpatternwidget.ui line 70
-#: rc.cpp:75
-#, no-c-format
-msgid "Use &wildcards"
-msgstr "使用通配符(&W)"
+#: catalogmanager/main.cpp:193 kbabel/main.cpp:564 kbabeldict/main.cpp:119
+msgid "Current maintainer"
+msgstr "现在的维护者"
 
-#. i18n: file ./catalogmanager/validationoptions.ui line 32
-#: rc.cpp:84
-#, no-c-format
-msgid "Mark invalid as &fuzzy"
-msgstr "无效条目标记为模糊项(&F)"
+#: catalogmanager/main.cpp:195 kbabel/main.cpp:566
+msgid ""
+"Wrote documentation and sent many bug reports and suggestions for improvements."
+msgstr "编写文档并发送许多错误报告以及改进建议。"
 
-#. i18n: file ./catalogmanager/validationoptions.ui line 39
-#: rc.cpp:87
-#, no-c-format
+#: catalogmanager/main.cpp:198 kbabel/main.cpp:569
 msgid ""
-"<qt>"
-"<p><b>Mark invalid as fuzzy</b>"
-"<p>\n"
-"<p>If you select this option, all items,\n"
-"which identifies the tool as invalid, will be\n"
-"marked as fuzzy and the resulting file\n"
-"will be saved.</p></qt>"
+"Gave many suggestions for the GUI and the behavior of KBabel. He also "
+"contributed the beautiful splash screen."
+msgstr "提供了许多关于 GUI 以及 KBabel 行为的建议。他还提供了这个美观的欢迎屏幕。"
+
+#: catalogmanager/main.cpp:204 kbabel/main.cpp:572
+#, fuzzy
+msgid ""
+"Helped keep KBabel up to date with the KDE API and gave a lot of other help."
+msgstr "帮助保持 KBabel 与 TDE API 的同步更新，并且给予许多其它帮助。"
+
+#: kbabel/main.cpp:574
+msgid "Implemented XML validation/highlighting plus other small fixes."
+msgstr "实现了 XML 校验/语法加亮以及其它一些小修正。"
+
+#: catalogmanager/main.cpp:206 kbabel/main.cpp:576
+msgid "Various validation plugins."
+msgstr "多种检验插件。"
+
+#: catalogmanager/main.cpp:209 kbabel/main.cpp:579
+msgid "Sponsored development of KBabel for a while."
+msgstr "为 KBabel 的开发提供了一段时间的赞助。"
+
+#: catalogmanager/main.cpp:214 kbabel/main.cpp:581
+#, fuzzy
+msgid "KBabel contains code from TQt"
+msgstr "KBabel 包含来自 Qt 的代码"
+
+#: kbabel/main.cpp:583
+msgid "String distance algorithm implementation"
 msgstr ""
-"<qt>"
-"<p><b>无效条目标记为模糊项</b>"
-"<p>\n"
-"<p>如果您选中此选项，所有被标识为无效的条目\n"
-"都将被标记为模糊项，结果文件将被保存。</p></qt>"
 
-#. i18n: file ./catalogmanager/validationoptions.ui line 47
-#: rc.cpp:94
-#, no-c-format
-msgid "&Do not validate fuzzy"
-msgstr "不校验模糊项(&D)"
+#: kbabel/main.cpp:585
+#, fuzzy
+msgid "Error list for current entry, regexp data tool"
+msgstr "当前的项目"
 
-#. i18n: file ./catalogmanager/validationoptions.ui line 52
-#: rc.cpp:97
-#, no-c-format
-msgid ""
-"<qt>"
-"<p><b>Do not validate fuzzy</b>"
-"<p>\n"
-"<p>If you select this option, all items\n"
-"marked as fuzzy will not be validated at all.</p></qt>"
+#: kbabel/main.cpp:587
+msgid "Word-by-word string difference algorithm implementation"
 msgstr ""
-"<qt>"
-"<p><b>不校验模糊项</b>"
-"<p>\n"
-"<p>如果您选中此选项，所有标记为模糊项的条目\n"
-"将完全不进行校验。</p></qt>"
 
 #. i18n: file ./commonui/diffpreferences.ui line 25
-#: rc.cpp:102
+#: rc.cpp:3
 #, no-c-format
 msgid "Diff Source"
 msgstr "比较的来源"
 
 #. i18n: file ./commonui/diffpreferences.ui line 41
-#: rc.cpp:105
+#: rc.cpp:6
 #, fuzzy, no-c-format
 msgid ""
 "<qt>"
@@ -3964,31 +2830,31 @@ msgstr ""
 "<p>您可以临时使用另一个文件中的消息来做比较，方法是在 KBabel 的主窗口中选择 <i>工具->比较->用文件作比较</i>。</p></qt>"
 
 #. i18n: file ./commonui/diffpreferences.ui line 52
-#: rc.cpp:121
+#: rc.cpp:22
 #, no-c-format
 msgid "Use &file"
 msgstr "使用文件(&F)"
 
 #. i18n: file ./commonui/diffpreferences.ui line 60
-#: rc.cpp:124
+#: rc.cpp:25
 #, no-c-format
 msgid "Use messages from &translation database"
 msgstr "使用翻译数据库中的消息(&T)"
 
 #. i18n: file ./commonui/diffpreferences.ui line 68
-#: rc.cpp:127
+#: rc.cpp:28
 #, no-c-format
 msgid "Use &msgstr from the same file"
 msgstr "使用同一文件中的译文(&M)"
 
 #. i18n: file ./commonui/diffpreferences.ui line 86
-#: rc.cpp:130
+#: rc.cpp:31
 #, no-c-format
 msgid "Base folder for diff files:"
 msgstr "比较文件的基准文件夹："
 
 #. i18n: file ./commonui/diffpreferences.ui line 104
-#: rc.cpp:133
+#: rc.cpp:34
 #, no-c-format
 msgid ""
 "<qt><q><b>Base folder for diff files</b></q>\n"
@@ -4005,20 +2871,8 @@ msgstr ""
 "可以自动地打开正确的文件来进行比较。</p>"
 "<p>注意，如果使用数据库中的消息作比较，该选项将不起作用。</p></qt>"
 
-#. i18n: file ./commonui/tdelisteditor.ui line 151
-#: rc.cpp:152
-#, no-c-format
-msgid "Up"
-msgstr "向上"
-
-#. i18n: file ./commonui/tdelisteditor.ui line 162
-#: rc.cpp:155
-#, no-c-format
-msgid "Down"
-msgstr "向下"
-
 #. i18n: file ./commonui/projectwizardwidget.ui line 38
-#: rc.cpp:158
+#: rc.cpp:44
 #, no-c-format
 msgid ""
 "<font size=\"+1\">Welcome to Project Wizard!</font>\n"
@@ -4038,7 +2892,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 66
-#: rc.cpp:174 rc.cpp:251
+#: rc.cpp:60 rc.cpp:137
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -4050,13 +2904,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 74
-#: rc.cpp:181
+#: rc.cpp:67
 #, no-c-format
 msgid "&Language:"
 msgstr "语言(&L)："
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 86
-#: rc.cpp:184 rc.cpp:206
+#: rc.cpp:70 rc.cpp:92
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -4070,13 +2924,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 97
-#: rc.cpp:193
+#: rc.cpp:79
 #, no-c-format
 msgid "Project &name:"
 msgstr "工程名称(&N)："
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 110
-#: rc.cpp:196 rc.cpp:238
+#: rc.cpp:82 rc.cpp:124
 #, no-c-format
 msgid ""
 "<qt>"
@@ -4092,13 +2946,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 135
-#: rc.cpp:215
+#: rc.cpp:101
 #, no-c-format
 msgid "Project &type:"
 msgstr "工程类型(&T)："
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 158
-#: rc.cpp:218 rc.cpp:270
+#: rc.cpp:104 rc.cpp:156
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -4111,7 +2965,7 @@ msgid ""
 "</p>\n"
 "<p>Currently known types:\n"
 "<ul>\n"
-"<li><b>TDE</b>: K Desktop Environment Internalization project</li>\n"
+"<li><b>TDE</b>: Trinity Desktop Environment Internalization project</li>\n"
 "<li><b>GNOME</b>: GNOME Translation project</li>\n"
 "<li><b>Translation Robot</b>: Translation Project Robot</li>\n"
 "<li><b>Other</b>: Other kind of project. No tuning will be\n"
@@ -4122,37 +2976,37 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 184
-#: rc.cpp:248
+#: rc.cpp:134
 #, no-c-format
 msgid "Configuration &file name:"
 msgstr "配置文件名(&F)："
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 200
-#: rc.cpp:258
+#: rc.cpp:144
 #, no-c-format
 msgid "TDE"
 msgstr "TDE"
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 205
-#: rc.cpp:261
+#: rc.cpp:147
 #, no-c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 210
-#: rc.cpp:264
+#: rc.cpp:150
 #, no-c-format
 msgid "Translation Project Robot"
 msgstr "翻译项目机器人"
 
 #. i18n: file ./commonui/projectwizardwidget.ui line 215
-#: rc.cpp:267
+#: rc.cpp:153
 #, no-c-format
 msgid "Other"
 msgstr "其它"
 
 #. i18n: file ./commonui/projectwizardwidget2.ui line 18
-#: rc.cpp:290
+#: rc.cpp:176
 #, no-c-format
 msgid ""
 "<qt>"
@@ -4167,7 +3021,7 @@ msgstr ""
 "这些文件夹中的文件和子文件夹将会被合并为一个文件树。</p></qt>"
 
 #. i18n: file ./commonui/projectwizardwidget2.ui line 44
-#: rc.cpp:295
+#: rc.cpp:181
 #, no-c-format
 msgid ""
 "<font size=\"+1\">The Translation Files</font>\n"
@@ -4189,151 +3043,125 @@ msgid ""
 "will not work."
 msgstr ""
 
-#. i18n: file ./kbabel/fontpreferences.ui line 25
-#: rc.cpp:319
+#. i18n: file ./commonui/tdelisteditor.ui line 94
+#: rc.cpp:205 rc.cpp:861 rc.cpp:1246
 #, no-c-format
-msgid "Font for Messages"
-msgstr "消息字体"
+msgid "New Item"
+msgstr "新条目"
 
-#. i18n: file ./kbabel/fontpreferences.ui line 36
-#: rc.cpp:322
+#. i18n: file ./commonui/tdelisteditor.ui line 151
+#: rc.cpp:214
 #, no-c-format
-msgid "&Show only fixed font"
-msgstr "只显示固定字体(&S)"
+msgid "Up"
+msgstr "向上"
 
-#. i18n: file ./kbabel/kbabelui.rc line 58
-#: rc.cpp:340
+#. i18n: file ./commonui/tdelisteditor.ui line 162
+#: rc.cpp:217
 #, no-c-format
-msgid "&Spelling"
-msgstr "拼写(&S)"
+msgid "Down"
+msgstr "向下"
 
-#. i18n: file ./kbabel/kbabelui.rc line 68
-#: rc.cpp:343
+#. i18n: file ./kbabel/spelldlgwidget.ui line 24
+#: rc.cpp:220
 #, no-c-format
-msgid "D&iff"
-msgstr "D&iff"
+msgid "Choose What You Want to Spell Check"
+msgstr "选择您要做拼写检查的部份"
 
-#. i18n: file ./kbabel/kbabelui.rc line 82
-#: rc.cpp:346
+#. i18n: file ./kbabel/spelldlgwidget.ui line 30
+#: rc.cpp:223 rc.cpp:235
 #, no-c-format
-msgid "&Dictionaries"
-msgstr "字典(&D)"
+msgid "Spell check only the current message."
+msgstr "仅对当前的消息进行拼写检查。"
 
-#. i18n: file ./kbabel/colorpreferences.ui line 41
-#: rc.cpp:364
+#. i18n: file ./kbabel/spelldlgwidget.ui line 41
+#: rc.cpp:226
 #, no-c-format
-msgid "&Background color:"
-msgstr "背景颜色(&B)："
+msgid "A&ll messages"
+msgstr "所有消息(&L)"
 
-#. i18n: file ./kbabel/colorpreferences.ui line 52
-#: rc.cpp:367
+#. i18n: file ./kbabel/spelldlgwidget.ui line 44
+#: rc.cpp:229
 #, no-c-format
-msgid "Color for &quoted characters:"
-msgstr "带引号的字符颜色(&Q)："
+msgid "Spell check all translated messages of this file."
+msgstr "检查本文件中所有已翻译消息的拼写"
 
-#. i18n: file ./kbabel/colorpreferences.ui line 63
-#: rc.cpp:370
+#. i18n: file ./kbabel/spelldlgwidget.ui line 52
+#: rc.cpp:232
 #, no-c-format
-msgid "Color for &syntax errors:"
-msgstr "语法错误的颜色(&S)："
+msgid "C&urrent message only"
+msgstr "当前消息(&U)"
 
-#. i18n: file ./kbabel/colorpreferences.ui line 82
-#: rc.cpp:373
+#. i18n: file ./kbabel/spelldlgwidget.ui line 66
+#: rc.cpp:238
 #, no-c-format
-msgid "Color for s&pellcheck errors:"
-msgstr "语法错误的颜色(&P)："
+msgid "Fro&m beginning of current message to end of file"
+msgstr "从文件开头至结尾(&M)"
 
-#. i18n: file ./kbabel/colorpreferences.ui line 97
-#: rc.cpp:376
+#. i18n: file ./kbabel/spelldlgwidget.ui line 74
+#: rc.cpp:241
 #, no-c-format
-msgid ""
-"<qt>Here you can setup a color to display identified <b>mispelled</b> "
-"words and\n"
-"phrases.</qt>"
-msgstr ""
+msgid "&From beginning of file to cursor position"
+msgstr "从文件开头至光标处(&F)"
 
-#. i18n: file ./kbabel/colorpreferences.ui line 105
-#: rc.cpp:380
+#. i18n: file ./kbabel/spelldlgwidget.ui line 77
+#: rc.cpp:244
 #, no-c-format
-msgid "Color for &keyboard accelerators:"
-msgstr "加速键颜色(&K)："
+msgid ""
+"Spell check all text from the beginning of the file to the current cursor "
+"position."
+msgstr "检查从文件开头到当前的光标位置全部文本的拼写。"
 
-#. i18n: file ./kbabel/colorpreferences.ui line 132
-#: rc.cpp:383
+#. i18n: file ./kbabel/spelldlgwidget.ui line 85
+#: rc.cpp:247
 #, no-c-format
-msgid "Color for c-for&mat characters:"
-msgstr "C-格式字符的颜色(&M)："
+msgid "F&rom cursor position to end of file"
+msgstr "从光标处至文件结尾(&R)"
 
-#. i18n: file ./kbabel/colorpreferences.ui line 151
-#: rc.cpp:386
+#. i18n: file ./kbabel/spelldlgwidget.ui line 88
+#: rc.cpp:250
 #, no-c-format
-msgid "Color for &tags:"
-msgstr "标签颜色(&T)："
+msgid ""
+"Spell check all text from the current cursor position to the end of the file."
+msgstr "检查从当前的光标位置到文件结尾全部文本的拼写。"
 
-#. i18n: file ./kbabel/searchpreferences.ui line 39
-#: rc.cpp:389
+#. i18n: file ./kbabel/spelldlgwidget.ui line 96
+#: rc.cpp:253
 #, no-c-format
-msgid "Au&tomatically start search"
-msgstr "自动开始搜索(&T)"
+msgid "S&elected text only"
+msgstr "选中的文本(&E)"
 
-#. i18n: file ./kbabel/searchpreferences.ui line 49
-#: rc.cpp:392
+#. i18n: file ./kbabel/spelldlgwidget.ui line 99
+#: rc.cpp:256
 #, no-c-format
-msgid ""
-"<qt>"
-"<p><b>Automatically start search</b></p>\n"
-"<p>If this is activated, the search is automatically started \n"
-"whenever you switch to another entry in the editor. You can \n"
-"choose where to search with the combo box <b>Default Dictionary</b>.\n"
-"</p>"
-"<p>You can also start searching manually by choosing an entry in \n"
-"the popup menu that appears either when clicking \n"
-"<b>Dictionaries->Find...</b> or keeping the dictionary button \n"
-"in the toolbar pressed for a while.</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>自动开始搜索</b></p>"
-"<p>如果该选项被激活，无论何时您在编辑器中切换到另一个条目，搜索都会自动开始。您可以使用组合框<b>默认字典</b>来选择要搜索的地方。</p>"
-"<p>您还可以手工开始搜索，方法是，点击<b>字典->查找...</b>，或者持续按住工具栏上的字典按钮，然后在弹出的菜单中选择一个项目。</p></qt>"
+msgid "Spell check only the selected text."
+msgstr "只检查选中的文本。"
 
-#. i18n: file ./kbabel/searchpreferences.ui line 65
-#: rc.cpp:402
+#. i18n: file ./kbabel/spelldlgwidget.ui line 109
+#: rc.cpp:259
 #, no-c-format
-msgid "D&efault dictionary:"
-msgstr "默认字典(&E)："
+msgid "U&se this selection as default"
+msgstr "把该选择定为默认(&S)"
 
-#. i18n: file ./kbabel/searchpreferences.ui line 82
-#: rc.cpp:405
+#. i18n: file ./kbabel/spelldlgwidget.ui line 112
+#: rc.cpp:262
 #, no-c-format
-msgid ""
-"<qt>"
-"<p><b>Default Dictionary</b></p>\n"
-"<p>Choose here where to search as default. \n"
-"This setting is used when searching is started automatically \n"
-"or when pressing the dictionary button in the toolbar.</p>\n"
-"<p>You can configure the different dictionaries by selecting \n"
-"the desired dictionary from <b>Settings->Configure Dictionary</b>.\n"
-"</p></qt>"
-msgstr ""
-"<qt>"
-"<p><b>默认字典</b></p>\n"
-"<p>在此处选择默认搜索的地方。当搜索是自动开始时或是在工具栏中按字典按钮时，该设置会被使用。</p>"
-"<p>您可以通过从<b>设置->配置字典</b>中选择希望使用的字典来配置不同的字典。</p></qt>"
+msgid "Check this, to store the current selection as default selection."
+msgstr "选择该选项,当前的选择将会被定为默认选择。"
 
 #. i18n: file ./kbabel/headerwidget.ui line 43
-#: rc.cpp:417
+#: rc.cpp:268
 #, no-c-format
 msgid "&Header:"
 msgstr "文件头(&H)："
 
 #. i18n: file ./kbabel/editorpreferences.ui line 54
-#: rc.cpp:423
+#: rc.cpp:274
 #, no-c-format
 msgid "A&utomatically unset fuzzy status"
 msgstr "自动取消模糊项目状态(&U)"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 60
-#: rc.cpp:426
+#: rc.cpp:277
 #, fuzzy, no-c-format
 msgid ""
 "<qt>"
@@ -4349,13 +3177,13 @@ msgstr ""
 "取消(这意味着字符串<i>, fuzzy</i> 已从项目的注释中删除)。</p></qt>"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 68
-#: rc.cpp:432
+#: rc.cpp:283
 #, no-c-format
 msgid "Use cle&ver editing"
 msgstr "使用智能编辑(&V)"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 79
-#: rc.cpp:435
+#: rc.cpp:286
 #, fuzzy, no-c-format
 msgid ""
 "<qt>"
@@ -4376,13 +3204,13 @@ msgstr ""
 "<p>注意，这只不过是一种协助功能，而且它仍可能生成语法不正确的文本。</p></qt>"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 89
-#: rc.cpp:446
+#: rc.cpp:297
 #, no-c-format
 msgid "Automatic Checks"
 msgstr "自动检查"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 97
-#: rc.cpp:449
+#: rc.cpp:300
 #, fuzzy, no-c-format
 msgid ""
 "<qt>"
@@ -4399,55 +3227,55 @@ msgstr ""
 "会改变翻译文本的颜色。如果没有激活任何一项，您会在状态栏中看到一条消息。</p></qt>"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 113
-#: rc.cpp:457
+#: rc.cpp:308
 #, no-c-format
 msgid "&Beep on error"
 msgstr "错误时响铃(&B)"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 121
-#: rc.cpp:460
+#: rc.cpp:311
 #, no-c-format
 msgid "Change te&xt color on error"
 msgstr "错误时改变文本颜色(&X)"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 150
-#: rc.cpp:463
+#: rc.cpp:314
 #, no-c-format
 msgid "A&ppearance"
 msgstr "外观(&P)"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 175
-#: rc.cpp:466
+#: rc.cpp:317
 #, no-c-format
 msgid "H&ighlight syntax"
 msgstr "语法加亮(&I)"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 183
-#: rc.cpp:469
+#: rc.cpp:320
 #, no-c-format
 msgid "Highlight backgrou&nd"
 msgstr "突出显示背景(&N)"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 191
-#: rc.cpp:472
+#: rc.cpp:323
 #, no-c-format
 msgid "Mark &whitespaces with points"
 msgstr "以点(.)来标记空格(&W)"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 199
-#: rc.cpp:475
+#: rc.cpp:326
 #, no-c-format
 msgid "&Show surrounding quotes"
 msgstr "显示前后引号(&S)"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 209
-#: rc.cpp:478
+#: rc.cpp:329
 #, no-c-format
 msgid "Status LEDs"
 msgstr "状态 LED"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 213
-#: rc.cpp:481
+#: rc.cpp:332
 #, no-c-format
 msgid ""
 "<qt>"
@@ -4460,551 +3288,342 @@ msgstr ""
 "<p>在此处选择您要在何处显示状态 LED 以及要使用的颜色。</p></qt>"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 224
-#: rc.cpp:485
+#: rc.cpp:336
 #, no-c-format
 msgid "Display in stat&usbar"
 msgstr "在状态栏中显示(&U)"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 232
-#: rc.cpp:488
+#: rc.cpp:339
 #, no-c-format
 msgid "Display in edi&tor"
 msgstr "在编辑器中显示(&T)"
 
 #. i18n: file ./kbabel/editorpreferences.ui line 260
-#: rc.cpp:491 rc.cpp:512
+#: rc.cpp:342 rc.cpp:363
 #, no-c-format
 msgid "Colo&r:"
 msgstr "颜色(&R)："
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 36
-#: rc.cpp:497
+#: rc.cpp:348
 #, no-c-format
 msgid "Added Characters"
 msgstr "添加的字符"
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 44
-#: rc.cpp:500
+#: rc.cpp:351
 #, no-c-format
 msgid "Ho&w to display:"
 msgstr "如何显示(&W)："
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 55
-#: rc.cpp:503
+#: rc.cpp:354
 #, no-c-format
 msgid "Co&lor:"
 msgstr "颜色(&L)："
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 66
-#: rc.cpp:506
+#: rc.cpp:357
 #, no-c-format
 msgid "Removed Characters"
 msgstr "删除的字符"
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 74
-#: rc.cpp:509
+#: rc.cpp:360
 #, no-c-format
 msgid "How &to display:"
 msgstr "如何显示(&T)："
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 94
-#: rc.cpp:515 rc.cpp:521
+#: rc.cpp:366 rc.cpp:372
 #, no-c-format
 msgid "Highlighted"
 msgstr "高亮显示的"
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 99
-#: rc.cpp:518
+#: rc.cpp:369
 #, no-c-format
 msgid "Underlined"
 msgstr "带下划线的"
 
 #. i18n: file ./kbabel/editordiffpreferences.ui line 129
-#: rc.cpp:524
+#: rc.cpp:375
 #, no-c-format
 msgid "Stroked Out"
 msgstr "划掉"
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 24
-#: rc.cpp:527
+#. i18n: file ./kbabel/colorpreferences.ui line 41
+#: rc.cpp:378
 #, no-c-format
-msgid "Choose What You Want to Spell Check"
-msgstr "选择您要做拼写检查的部份"
+msgid "&Background color:"
+msgstr "背景颜色(&B)："
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 30
-#: rc.cpp:530 rc.cpp:542
+#. i18n: file ./kbabel/colorpreferences.ui line 52
+#: rc.cpp:381
 #, no-c-format
-msgid "Spell check only the current message."
-msgstr "仅对当前的消息进行拼写检查。"
+msgid "Color for &quoted characters:"
+msgstr "带引号的字符颜色(&Q)："
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 41
-#: rc.cpp:533
+#. i18n: file ./kbabel/colorpreferences.ui line 63
+#: rc.cpp:384
 #, no-c-format
-msgid "A&ll messages"
-msgstr "所有消息(&L)"
+msgid "Color for &syntax errors:"
+msgstr "语法错误的颜色(&S)："
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 44
-#: rc.cpp:536
+#. i18n: file ./kbabel/colorpreferences.ui line 82
+#: rc.cpp:387
 #, no-c-format
-msgid "Spell check all translated messages of this file."
-msgstr "检查本文件中所有已翻译消息的拼写"
+msgid "Color for s&pellcheck errors:"
+msgstr "语法错误的颜色(&P)："
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 52
-#: rc.cpp:539
+#. i18n: file ./kbabel/colorpreferences.ui line 97
+#: rc.cpp:390
 #, no-c-format
-msgid "C&urrent message only"
-msgstr "当前消息(&U)"
+msgid ""
+"<qt>Here you can setup a color to display identified <b>mispelled</b> "
+"words and\n"
+"phrases.</qt>"
+msgstr ""
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 66
-#: rc.cpp:545
+#. i18n: file ./kbabel/colorpreferences.ui line 105
+#: rc.cpp:394
 #, no-c-format
-msgid "Fro&m beginning of current message to end of file"
-msgstr "从文件开头至结尾(&M)"
+msgid "Color for &keyboard accelerators:"
+msgstr "加速键颜色(&K)："
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 74
-#: rc.cpp:548
+#. i18n: file ./kbabel/colorpreferences.ui line 132
+#: rc.cpp:397
 #, no-c-format
-msgid "&From beginning of file to cursor position"
-msgstr "从文件开头至光标处(&F)"
+msgid "Color for c-for&mat characters:"
+msgstr "C-格式字符的颜色(&M)："
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 77
-#: rc.cpp:551
+#. i18n: file ./kbabel/colorpreferences.ui line 151
+#: rc.cpp:400
 #, no-c-format
-msgid ""
-"Spell check all text from the beginning of the file to the current cursor "
-"position."
-msgstr "检查从文件开头到当前的光标位置全部文本的拼写。"
+msgid "Color for &tags:"
+msgstr "标签颜色(&T)："
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 85
-#: rc.cpp:554
+#. i18n: file ./kbabel/kbabelui.rc line 29
+#: rc.cpp:409 rc.cpp:1171
 #, no-c-format
-msgid "F&rom cursor position to end of file"
-msgstr "从光标处至文件结尾(&R)"
+msgid "&Go"
+msgstr "转到(&G)"
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 88
-#: rc.cpp:557
+#. i18n: file ./kbabel/kbabelui.rc line 50
+#: rc.cpp:412 rc.cpp:1177
+#, no-c-format
+msgid "&Project"
+msgstr "工程(&P)"
+
+#. i18n: file ./kbabel/kbabelui.rc line 58
+#: rc.cpp:418
+#, no-c-format
+msgid "&Spelling"
+msgstr "拼写(&S)"
+
+#. i18n: file ./kbabel/kbabelui.rc line 68
+#: rc.cpp:421
+#, no-c-format
+msgid "D&iff"
+msgstr "D&iff"
+
+#. i18n: file ./kbabel/kbabelui.rc line 82
+#: rc.cpp:424
+#, no-c-format
+msgid "&Dictionaries"
+msgstr "字典(&D)"
+
+#. i18n: file ./kbabel/kbabelui.rc line 100
+#: rc.cpp:436 rc.cpp:1195
+#, no-c-format
+msgid "Main"
+msgstr "主要"
+
+#. i18n: file ./kbabel/kbabelui.rc line 113
+#: rc.cpp:439 rc.cpp:1198
+#, no-c-format
+msgid "Navigationbar"
+msgstr "导航栏"
+
+#. i18n: file ./kbabel/searchpreferences.ui line 39
+#: rc.cpp:442
+#, no-c-format
+msgid "Au&tomatically start search"
+msgstr "自动开始搜索(&T)"
+
+#. i18n: file ./kbabel/searchpreferences.ui line 49
+#: rc.cpp:445
 #, no-c-format
 msgid ""
-"Spell check all text from the current cursor position to the end of the file."
-msgstr "检查从当前的光标位置到文件结尾全部文本的拼写。"
+"<qt>"
+"<p><b>Automatically start search</b></p>\n"
+"<p>If this is activated, the search is automatically started \n"
+"whenever you switch to another entry in the editor. You can \n"
+"choose where to search with the combo box <b>Default Dictionary</b>.\n"
+"</p>"
+"<p>You can also start searching manually by choosing an entry in \n"
+"the popup menu that appears either when clicking \n"
+"<b>Dictionaries->Find...</b> or keeping the dictionary button \n"
+"in the toolbar pressed for a while.</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>自动开始搜索</b></p>"
+"<p>如果该选项被激活，无论何时您在编辑器中切换到另一个条目，搜索都会自动开始。您可以使用组合框<b>默认字典</b>来选择要搜索的地方。</p>"
+"<p>您还可以手工开始搜索，方法是，点击<b>字典->查找...</b>，或者持续按住工具栏上的字典按钮，然后在弹出的菜单中选择一个项目。</p></qt>"
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 96
-#: rc.cpp:560
+#. i18n: file ./kbabel/searchpreferences.ui line 65
+#: rc.cpp:455
 #, no-c-format
-msgid "S&elected text only"
-msgstr "选中的文本(&E)"
+msgid "D&efault dictionary:"
+msgstr "默认字典(&E)："
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 99
-#: rc.cpp:563
+#. i18n: file ./kbabel/searchpreferences.ui line 82
+#: rc.cpp:458
 #, no-c-format
-msgid "Spell check only the selected text."
-msgstr "只检查选中的文本。"
+msgid ""
+"<qt>"
+"<p><b>Default Dictionary</b></p>\n"
+"<p>Choose here where to search as default. \n"
+"This setting is used when searching is started automatically \n"
+"or when pressing the dictionary button in the toolbar.</p>\n"
+"<p>You can configure the different dictionaries by selecting \n"
+"the desired dictionary from <b>Settings->Configure Dictionary</b>.\n"
+"</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>默认字典</b></p>\n"
+"<p>在此处选择默认搜索的地方。当搜索是自动开始时或是在工具栏中按字典按钮时，该设置会被使用。</p>"
+"<p>您可以通过从<b>设置->配置字典</b>中选择希望使用的字典来配置不同的字典。</p></qt>"
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 109
-#: rc.cpp:566
+#. i18n: file ./kbabel/fontpreferences.ui line 25
+#: rc.cpp:467
 #, no-c-format
-msgid "U&se this selection as default"
-msgstr "把该选择定为默认(&S)"
+msgid "Font for Messages"
+msgstr "消息字体"
 
-#. i18n: file ./kbabel/spelldlgwidget.ui line 112
-#: rc.cpp:569
+#. i18n: file ./kbabel/fontpreferences.ui line 36
+#: rc.cpp:470
 #, no-c-format
-msgid "Check this, to store the current selection as default selection."
-msgstr "选择该选项,当前的选择将会被定为默认选择。"
+msgid "&Show only fixed font"
+msgstr "只显示固定字体(&S)"
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 30
-#: rc.cpp:572 rc.cpp:602
+#: rc.cpp:473 rc.cpp:503
 #, no-c-format
 msgid "&Path to Compendium File"
 msgstr "到概要字典文件的路径(&P)"
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 85
-#: rc.cpp:578 rc.cpp:611
+#: rc.cpp:479 rc.cpp:512
 #, no-c-format
 msgid "Onl&y whole words"
 msgstr "只查找整词(&Y)"
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 93
-#: rc.cpp:581 rc.cpp:614
+#: rc.cpp:482 rc.cpp:515
 #, no-c-format
 msgid "Case sensiti&ve"
 msgstr "区分大小写(&V)"
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 103
-#: rc.cpp:584 rc.cpp:617
+#: rc.cpp:485 rc.cpp:518
 #, no-c-format
 msgid "A text matches if:"
 msgstr "认为文本匹配，如果："
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 125
-#: rc.cpp:587 rc.cpp:620
+#: rc.cpp:488 rc.cpp:521
 #, no-c-format
 msgid "E&qual to searched text"
 msgstr "和搜索的文本相同(&Q)"
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 133
-#: rc.cpp:590 rc.cpp:623
+#: rc.cpp:491 rc.cpp:524
 #, no-c-format
 msgid "Contains a &word of searched text"
 msgstr "包含搜索文本中的一个词(&W)"
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 141
-#: rc.cpp:593 rc.cpp:626
+#: rc.cpp:494 rc.cpp:527
 #, fuzzy, no-c-format
 msgid "Co&ntained in searched text"
 msgstr "包含在搜索文本中(&N)"
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 149
-#: rc.cpp:596 rc.cpp:629
+#: rc.cpp:497 rc.cpp:530
 #, fuzzy, no-c-format
 msgid "&Similar to searched text"
 msgstr "类似搜索的文本(&S)"
 
 #. i18n: file ./kbabeldict/modules/tmx/pwidget.ui line 157
-#: rc.cpp:599 rc.cpp:632
+#: rc.cpp:500 rc.cpp:533
 #, fuzzy, no-c-format
 msgid "Contains searched te&xt"
 msgstr "包含搜索的文本(&X)"
 
 #. i18n: file ./kbabeldict/modules/pocompendium/pwidget.ui line 102
-#: rc.cpp:608
+#: rc.cpp:509
 #, no-c-format
 msgid "Ignore &fuzzy strings"
 msgstr "忽略模糊翻译的字串(&F)"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 28
-#: rc.cpp:635
-#, no-c-format
-msgid "General"
-msgstr "常规"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 39
-#: rc.cpp:638 rc.cpp:956 rc.cpp:1161
-#, no-c-format
-msgid "Database"
-msgstr "数据库"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 50
-#: rc.cpp:641
-#, no-c-format
-msgid "DB folder:"
-msgstr "数据库文件夹："
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 63
-#: rc.cpp:644
-#, no-c-format
-msgid "Automatic update in kbabel"
-msgstr "自动在 KBabel 中更新"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 73
-#: rc.cpp:647
-#, no-c-format
-msgid "New Entries"
-msgstr "新条目"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 84
-#: kbabeldict/kbabeldictbox.cpp:1268 rc.cpp:650
-#, no-c-format
-msgid "Author:"
-msgstr "作者："
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 92
-#: rc.cpp:653
-#, no-c-format
-msgid "From kbabel"
-msgstr "来自 KBabel"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 126
-#: rc.cpp:656
-#, no-c-format
-msgid "Algorithm"
-msgstr "算法"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 137
-#: rc.cpp:659
-#, no-c-format
-msgid "Minimum score:"
-msgstr "最低分："
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 176
-#: rc.cpp:662
-#, no-c-format
-msgid "Algorithms to Use"
-msgstr "要使用的算法"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 187
-#: rc.cpp:665 rc.cpp:668 rc.cpp:686 rc.cpp:689 rc.cpp:692 rc.cpp:695
-#: rc.cpp:698
-#, no-c-format
-msgid "Score:"
-msgstr "分数："
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 213
-#: rc.cpp:671
-#, no-c-format
-msgid "Fuzzy sentence archive"
-msgstr "模糊句子存档"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 221
-#: rc.cpp:674
-#, no-c-format
-msgid "Glossary"
-msgstr "词汇表"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 229
-#: rc.cpp:677
-#, no-c-format
-msgid "Exact "
-msgstr "原样"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 252
-#: rc.cpp:680
-#, no-c-format
-msgid "Sentence by sentence"
-msgstr "逐句"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 260
-#: rc.cpp:683
-#, no-c-format
-msgid "Alphanumeric"
-msgstr "文字和数字"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 313
-#: rc.cpp:701
-#, no-c-format
-msgid "Word by word"
-msgstr "逐词"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 321
-#: rc.cpp:704
-#, no-c-format
-msgid "Dynamic dictionary"
-msgstr "动态字典"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 336
-#: rc.cpp:707
-#, no-c-format
-msgid "Preferred number of results:"
-msgstr "想要的结果数目："
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 356
-#: rc.cpp:710
-#, no-c-format
-msgid "Output"
-msgstr "输出"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 367
-#: rc.cpp:713
-#, no-c-format
-msgid "Output Processing"
-msgstr "输出处理"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 395
-#: rc.cpp:716
-#, no-c-format
-msgid "First capital letter match"
-msgstr "匹配大写首字母"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 403
-#: rc.cpp:719
-#, no-c-format
-msgid "All capital letter match"
-msgstr "匹配所有大写字母"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 411
-#: rc.cpp:722
-#, no-c-format
-msgid "Accelerator symbol (&&)"
-msgstr "快捷键标识(&&)"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 419
-#: rc.cpp:725
-#, no-c-format
-msgid "Try to use same letter"
-msgstr "尝试使用相同字母"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 429
-#: rc.cpp:728
-#, no-c-format
-msgid "Custom Rules"
-msgstr "自定义规则"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 440
-#: rc.cpp:731
-#, no-c-format
-msgid "Original string regexp:"
-msgstr "原文正则表达式："
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 451
-#: rc.cpp:734
-#, no-c-format
-msgid "Enabled"
-msgstr "已启用"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 462
-#: rc.cpp:737
-#, no-c-format
-msgid "Description"
-msgstr "说明"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 527
-#: rc.cpp:749
-#, no-c-format
-msgid "Replace string:"
-msgstr "替换字符串："
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 545
-#: rc.cpp:752
-#, no-c-format
-msgid "Translated regexp(search):"
-msgstr "译文正则表达式(查找)："
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 583
-#: rc.cpp:761
-#, no-c-format
-msgid "Check language"
-msgstr "检查语言"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 599
-#: rc.cpp:764
-#, no-c-format
-msgid "Use current filters"
-msgstr "使用当前过滤器"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 615
-#: rc.cpp:767
-#, no-c-format
-msgid "Set date to today"
-msgstr "日期设置为今天"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 624
-#: rc.cpp:770
-#, no-c-format
-msgid "Sources"
-msgstr "来源"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 651
-#: rc.cpp:779
-#, no-c-format
-msgid "Scan Now"
-msgstr "立即扫描"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 684
-#: rc.cpp:785
-#, no-c-format
-msgid "Scan All"
-msgstr "扫描全部"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 701
-#: rc.cpp:788
-#, no-c-format
-msgid "Filters"
-msgstr "过滤器"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 16
-#: rc.cpp:791
-#, no-c-format
-msgid "Edit Source"
-msgstr "编辑来源"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 60
-#: rc.cpp:800
-#, no-c-format
-msgid "Additional Informations"
-msgstr "附加信息"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 133
-#: rc.cpp:806
-#, no-c-format
-msgid "Project name:"
-msgstr "工程名称："
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 149
-#: rc.cpp:809
-#, no-c-format
-msgid "Project keywords:"
-msgstr "工程关键字："
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 158
-#: rc.cpp:812
-#, no-c-format
-msgid "General Info"
-msgstr "常规信息"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 172
-#: rc.cpp:815
-#, no-c-format
-msgid "Single File"
-msgstr "单个文件"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 177
-#: rc.cpp:818
-#, no-c-format
-msgid "Single Folder"
-msgstr "单个文件夹"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 182
-#: rc.cpp:821
-#, no-c-format
-msgid "Recursive Folder"
-msgstr "递归子文件夹"
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 194
-#: rc.cpp:824
-#, no-c-format
-msgid "Source name:"
-msgstr "来源名称："
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 207
-#: rc.cpp:827
-#, no-c-format
-msgid "Type:"
-msgstr "类型："
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 215
-#: rc.cpp:830
-#, no-c-format
-msgid "Setup Filter..."
-msgstr "设置过滤器..."
-
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 223
-#: rc.cpp:833
+#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 39
+#: rc.cpp:536
 #, no-c-format
-msgid "Location:"
-msgstr "位置："
+msgid "&Path to auxiliary file:"
+msgstr "到辅助文件的路径(&P)："
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 231
-#: rc.cpp:836
+#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 61
+#: rc.cpp:539
 #, no-c-format
-msgid "Use filter"
-msgstr "使用过滤器"
+msgid "&Ignore fuzzy entries"
+msgstr "忽略模糊翻译项目(&I)"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 17
-#: rc.cpp:839
-#, no-c-format
-msgid "DBSEPrefWidget"
-msgstr "DBSEPrefWidget"
+#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 78
+#: rc.cpp:542
+#, fuzzy, no-c-format
+msgid ""
+"<qt>"
+"<p>\n"
+"The following variables will be replaced in the path if available:\n"
+"<ul>\n"
+"<li><b>@PACKAGE@</b>: the name of the currently translated application or "
+"package</li>\n"
+"<li><b>@LANG@</b>: the language code</li>\n"
+"<li><b>@DIR<em>n</em>@</b>: where n is a positive integer. This expands to the "
+"nth folder counted from the filename</li>\n"
+"</ul></p></qt>"
+msgstr ""
+"<qt>"
+"<p>\n"
+"如果可能，以下的变量将被在路径中替换：\n"
+"<ul>\n"
+"<li><b>@PACKAGE@</b>：当前翻译的应用程序或软件包的名称</li>\n"
+"<li><b>@LANG@</b>：语言代码</li>\n"
+"<li><b>@DIR<em>n</em>@</b>：这里的 n 是正整数。它会展开成从文件名起的第 n 个文件夹</li>\n"
+"</ul></p></qt>"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 41
-#: rc.cpp:842 rc.cpp:1010 rc.cpp:1047 rc.cpp:1215
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 38
+#: rc.cpp:551 rc.cpp:719 rc.cpp:963 rc.cpp:1131
 #, no-c-format
 msgid "Generic"
 msgstr "常规"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 58
-#: rc.cpp:845 rc.cpp:1050
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 55
+#: rc.cpp:554 rc.cpp:966
 #, no-c-format
 msgid "Search Mode"
 msgstr "搜索模式"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 75
-#: rc.cpp:848 rc.cpp:1053
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 72
+#: rc.cpp:557 rc.cpp:969
 #, no-c-format
 msgid "Search in whole database (slow)"
 msgstr "在整个数据库中搜索(很慢)"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 80
-#: rc.cpp:851 rc.cpp:1056
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 77
+#: rc.cpp:560 rc.cpp:972
 #, no-c-format
 msgid ""
 "<qml>Scroll the whole database and return everything that matches \n"
@@ -5015,14 +3634,14 @@ msgstr ""
 "按照<strong>“常规”</strong>和<strong>“匹配”</strong>标签中\n"
 "定义的规则，返回所有匹配的项目"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 88
-#: rc.cpp:856 rc.cpp:1061
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 85
+#: rc.cpp:565 rc.cpp:977
 #, no-c-format
 msgid "Search in list of \"good keys\" (best)"
 msgstr "在“优选关键字”列表中搜索(最佳)"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 95
-#: rc.cpp:859 rc.cpp:1064
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 92
+#: rc.cpp:568 rc.cpp:980
 #, no-c-format
 msgid ""
 "<qml>Search in a list of <em>good keys</em> (see <strong>Good keys</strong> "
@@ -5035,42 +3654,42 @@ msgstr ""
 "“优选关键字”</strong>标签)。\n"
 "这是搜索的最佳方法，因为<em>“优选关键字”</em>列表很可能含有所有和您的查询匹配的关键字，不过,它比整个数据库要小。"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 103
-#: rc.cpp:863 rc.cpp:1068
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 100
+#: rc.cpp:572 rc.cpp:984
 #, no-c-format
 msgid "Return the list of \"good keys\" (fast)"
 msgstr "返回“优选关键字”列表(快)"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 106
-#: rc.cpp:866 rc.cpp:1071
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 103
+#: rc.cpp:575 rc.cpp:987
 #, no-c-format
 msgid ""
 "<qml>Returns the whole <em>good keys</em> list. Rules defined in <strong>"
 "Search</strong> tab are ignored."
 msgstr "<qml>返回整个<em>“优选关键字”</em>列表。忽略在<strong>“搜索”</strong>标签中定义的规则。"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 116
-#: rc.cpp:869 rc.cpp:1074
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 113
+#: rc.cpp:578 rc.cpp:990
 #, no-c-format
 msgid "Case sensitive"
 msgstr "区分大小写"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 119
-#: rc.cpp:872 rc.cpp:1077
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 116
+#: rc.cpp:581 rc.cpp:993
 #, no-c-format
 msgid ""
 "<qml>If it is checked the search will be case sensitive. It is ignored if you "
 "use <em>Return the list of \"good keys\"</em> search mode."
 msgstr "<qml>如它被选，搜索将区分大小写。如果您使用<em>返回“优选关键字”列表</em>搜索模式，这将被忽略。"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 127
-#: rc.cpp:875 rc.cpp:1080
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 124
+#: rc.cpp:584 rc.cpp:996
 #, no-c-format
 msgid "Normalize white space"
 msgstr "使空格标准化"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 134
-#: rc.cpp:878 rc.cpp:1083
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 131
+#: rc.cpp:587 rc.cpp:999
 #, no-c-format
 msgid ""
 "Remove white spaces at the beginning and at the end of the phrase.\n"
@@ -5080,104 +3699,104 @@ msgstr ""
 "删除词组开头和结尾处的空格。\n"
 "它还将一组空格字符替换为一个空格字符。"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 142
-#: rc.cpp:882 rc.cpp:1087
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 139
+#: rc.cpp:591 rc.cpp:1003
 #, no-c-format
 msgid "Remove context comment"
 msgstr "删除上下文注释"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 148
-#: rc.cpp:885 rc.cpp:1090
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 145
+#: rc.cpp:594 rc.cpp:1006
 #, no-c-format
 msgid "Remove, if exists, the _:comment"
 msgstr "如果存在，删除“_：注释”"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 170
-#: rc.cpp:888 rc.cpp:1093
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 167
+#: rc.cpp:597 rc.cpp:1009
 #, no-c-format
 msgid "Character to be ignored:"
 msgstr "要忽略的字符："
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 212
-#: rc.cpp:891 rc.cpp:1096
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 209
+#: rc.cpp:600 rc.cpp:1012
 #, no-c-format
 msgid "Search"
 msgstr "搜索"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 229
-#: rc.cpp:894 rc.cpp:1099
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 226
+#: rc.cpp:603 rc.cpp:1015
 #, no-c-format
 msgid "Matching Method"
 msgstr "匹配方法"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 280
-#: rc.cpp:897 rc.cpp:1102
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 277
+#: rc.cpp:606 rc.cpp:1018
 #, no-c-format
 msgid "Query is contained"
 msgstr "查询被包含"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 283
-#: rc.cpp:900 rc.cpp:1105
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 280
+#: rc.cpp:609 rc.cpp:1021
 #, no-c-format
 msgid "Match if query is contained in database string"
 msgstr "如果查询包含在数据库字符串中则匹配"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 291
-#: rc.cpp:903 rc.cpp:1108
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 288
+#: rc.cpp:612 rc.cpp:1024
 #, no-c-format
 msgid "Query contains"
 msgstr "查询包含"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 294
-#: rc.cpp:906 rc.cpp:1111
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 291
+#: rc.cpp:615 rc.cpp:1027
 #, no-c-format
 msgid "Match if query contains the database string"
 msgstr "如果查询包含数据库字符串则匹配"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 302
-#: rc.cpp:909 rc.cpp:1114
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 299
+#: rc.cpp:618 rc.cpp:1030
 #, no-c-format
 msgid "Normal text"
 msgstr "普通文本"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 308
-#: rc.cpp:912 rc.cpp:1117
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 305
+#: rc.cpp:621 rc.cpp:1033
 #, no-c-format
 msgid "Consider the search string as normal text."
 msgstr "将搜索字串视为普通文本"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 316
-#: rc.cpp:915 rc.cpp:1120
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 313
+#: rc.cpp:624 rc.cpp:1036
 #, no-c-format
 msgid "Equal"
 msgstr "相等"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 325
-#: rc.cpp:918 rc.cpp:1123
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 322
+#: rc.cpp:627 rc.cpp:1039
 #, no-c-format
 msgid "Match if query and database string are equal"
 msgstr "如果查询和数据库字符串相等则匹配"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 350
-#: rc.cpp:921 rc.cpp:1126
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 347
+#: rc.cpp:630 rc.cpp:1042
 #, no-c-format
 msgid "Regular expression"
 msgstr "正则表达式"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 353
-#: rc.cpp:924 rc.cpp:1129
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 350
+#: rc.cpp:633 rc.cpp:1045
 #, no-c-format
 msgid "Consider the search string as a regular expression"
 msgstr "将搜索字串视为正则表达式"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 363
-#: rc.cpp:927 rc.cpp:1132
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 360
+#: rc.cpp:636 rc.cpp:1048
 #, no-c-format
 msgid "Word Substitution"
 msgstr "字词替代"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 368
-#: rc.cpp:930 rc.cpp:1135
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 365
+#: rc.cpp:639 rc.cpp:1051
 #, no-c-format
 msgid ""
 "<qml>If you use one or two <em>word substitution</em> "
@@ -5198,70 +3817,76 @@ msgstr ""
 "如果您要搜索<em>“My name is Andrea”</em>，并且您已激活了<em>“单个词替代”</em>，您将还会找到<em>"
 "“My name is Joe”</em> 或者<em>“Your name is Andrea”之类的匹配</em>。"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 402
-#: rc.cpp:935 rc.cpp:1140
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 399
+#: rc.cpp:644 rc.cpp:1056
 #, no-c-format
 msgid "Use one word substitution"
 msgstr "使用单个词替代"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 433
-#: rc.cpp:938 rc.cpp:944 rc.cpp:1143 rc.cpp:1149
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 430
+#: rc.cpp:647 rc.cpp:653 rc.cpp:1059 rc.cpp:1065
 #, no-c-format
 msgid "Max number of words in the query:"
 msgstr "查询中的最多词数："
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 458
-#: rc.cpp:941 rc.cpp:1146
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 455
+#: rc.cpp:650 rc.cpp:1062
 #, no-c-format
 msgid "Use two word substitution"
 msgstr "使用两个词替代"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 491
-#: rc.cpp:947 rc.cpp:1152
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 488
+#: rc.cpp:656 rc.cpp:1068
 #, no-c-format
 msgid "[A-Za-z0-9_%"
 msgstr "[A-Za-z0-9_%"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 509
-#: rc.cpp:950 rc.cpp:1155
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 506
+#: rc.cpp:659 rc.cpp:1071
 #, no-c-format
 msgid "]"
 msgstr "]"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 519
-#: rc.cpp:953 rc.cpp:1158
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 516
+#: rc.cpp:662 rc.cpp:1074
 #, no-c-format
 msgid "Local characters for regular expressions:"
 msgstr "用于正则表达式的局部字符："
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 573
-#: rc.cpp:959 rc.cpp:1164
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 553
+#: rc.cpp:665 rc.cpp:759 rc.cpp:1077
+#, no-c-format
+msgid "Database"
+msgstr "数据库"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 570
+#: rc.cpp:668 rc.cpp:1080
 #, no-c-format
 msgid "Database folder:"
 msgstr "数据库文件夹："
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 589
-#: rc.cpp:962 rc.cpp:1167
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 586
+#: rc.cpp:671 rc.cpp:1083
 #, no-c-format
 msgid "Auto add entry to database"
 msgstr "自动将项目添加到数据库中"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 595
-#: rc.cpp:965 rc.cpp:1170
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 592
+#: rc.cpp:674 rc.cpp:1086
 #, no-c-format
 msgid ""
 "Automatically add an entry to the database if a new translation is notified by "
 "someone (may be kbabel)"
 msgstr "如果某人(可能是 KBabel)通知了一个新翻译，则自动在数据库中添加一项"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 617
-#: rc.cpp:968 rc.cpp:1173
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 614
+#: rc.cpp:677 rc.cpp:1089
 #, no-c-format
 msgid "Auto added entry author:"
 msgstr "自动添加项目作者："
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 625
-#: rc.cpp:971 rc.cpp:1176
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 622
+#: rc.cpp:680 rc.cpp:1092
 #, no-c-format
 msgid ""
 "<qml>Put here the name and email address that you want to use as <em>"
@@ -5272,74 +3897,80 @@ msgstr ""
 "<qml>当您在数据库中自动添加项目时(如当您使用 KBabel 来修改翻译时)，在这里放置您想用来填充<em>“最后翻译者”</em>的名称和电子邮件地址。"
 "<p>"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 635
-#: rc.cpp:974
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 632
+#: rc.cpp:683
 #, no-c-format
-msgid "Scan Single PO File"
-msgstr "扫描单个 PO 文件"
+msgid "Scan Single PO File..."
+msgstr "扫描单个 PO 文件..."
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 643
-#: rc.cpp:977
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 640
+#: rc.cpp:686
 #, no-c-format
-msgid "Scan Folder"
-msgstr "扫描文件夹"
+msgid "Scan Folder..."
+msgstr "扫描文件夹..."
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 651
-#: rc.cpp:980
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 648
+#: rc.cpp:689
 #, no-c-format
-msgid "Scan Folder && Subfolders"
-msgstr "扫描文件夹和所有子文件夹"
+msgid "Scan Folder && Subfolders..."
+msgstr "扫描文件夹和所有子文件夹..."
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 673
-#: rc.cpp:983 rc.cpp:1188
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 670
+#: rc.cpp:692 rc.cpp:1104
 #, no-c-format
 msgid "Scanning file:"
 msgstr "正在扫描文件："
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 681
-#: rc.cpp:986 rc.cpp:1191
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 678
+#: rc.cpp:695 rc.cpp:1107
 #, no-c-format
 msgid "Entries added:"
 msgstr "新添项目："
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 722
-#: rc.cpp:989 rc.cpp:1194
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 719
+#: rc.cpp:698 rc.cpp:1110
 #, no-c-format
 msgid "Total progress:"
 msgstr "总进度："
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 730
-#: rc.cpp:992 rc.cpp:1197
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 727
+#: rc.cpp:701 rc.cpp:1113
 #, no-c-format
 msgid "Processing file:"
 msgstr "正在处理文件："
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 766
-#: rc.cpp:995 rc.cpp:1200
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 763
+#: rc.cpp:704 rc.cpp:1116
 #, no-c-format
 msgid "Loading file:"
 msgstr "正在载入文件："
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 779
-#: rc.cpp:998 rc.cpp:1203
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 776
+#: rc.cpp:707 rc.cpp:1119
 #, no-c-format
 msgid "Export..."
 msgstr "导出..."
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 798
-#: rc.cpp:1004 rc.cpp:1209
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 787
+#: catalogmanager/catalogmanagerview.cpp:795 rc.cpp:710 rc.cpp:1122
+#, no-c-format
+msgid "Statistics"
+msgstr "统计"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 795
+#: rc.cpp:713 rc.cpp:1125
 #, no-c-format
 msgid "Repeated Strings"
 msgstr "重复的字符串"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 808
-#: rc.cpp:1007 rc.cpp:1212
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 805
+#: rc.cpp:716 rc.cpp:1128
 #, no-c-format
 msgid "Good Keys"
 msgstr "优选关键字"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 832
-#: rc.cpp:1013 rc.cpp:1218
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 829
+#: rc.cpp:722 rc.cpp:1134
 #, no-c-format
 msgid ""
 "<qml>Here you can define how to fill the <em>good keys list</em>."
@@ -5365,226 +3996,515 @@ msgstr ""
 "<p>\n"
 "最后，您可以设置列表项目的最大数量。"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 849
-#: rc.cpp:1020 rc.cpp:1225
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 846
+#: rc.cpp:729 rc.cpp:1141
 #, no-c-format
 msgid "Minimum number of words of the key also in the query (%):"
 msgstr "在查询中的最少关键字词数(%)："
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 874
-#: rc.cpp:1023 rc.cpp:1029 rc.cpp:1228 rc.cpp:1234
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 871
+#: rc.cpp:732 rc.cpp:738 rc.cpp:1144 rc.cpp:1150
 #, no-c-format
 msgid "%"
 msgstr "%"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 888
-#: rc.cpp:1026 rc.cpp:1231
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 885
+#: rc.cpp:735 rc.cpp:1147
 #, no-c-format
 msgid "Minimum number of query words in the key (%):"
 msgstr "在关键字中的最少查询词数(%)："
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 921
-#: rc.cpp:1032 rc.cpp:1237
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 918
+#: rc.cpp:741 rc.cpp:1153
 #, no-c-format
 msgid "Max list length:"
 msgstr "最大列表长度："
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 945
-#: rc.cpp:1035 rc.cpp:1240
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 942
+#: rc.cpp:744 rc.cpp:1156
 #, no-c-format
 msgid "Frequent Words"
 msgstr "高频度字词"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 962
-#: rc.cpp:1038 rc.cpp:1243
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 959
+#: rc.cpp:747 rc.cpp:1159
 #, no-c-format
 msgid "Discard words more frequent than:"
 msgstr "去掉超过这个出现次数的字词："
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 970
-#: rc.cpp:1041 rc.cpp:1246
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 967
+#: rc.cpp:750 rc.cpp:1162
 #, no-c-format
 msgid "/10000"
 msgstr "/10000"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 987
-#: rc.cpp:1044 rc.cpp:1249
+#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 984
+#: rc.cpp:753 rc.cpp:1165
 #, no-c-format
 msgid "Frequent words are considered as in every key"
 msgstr "高频度字词被认为是包含在每个关键字中"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 632
-#: rc.cpp:1179
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 28
+#: rc.cpp:756
 #, no-c-format
-msgid "Scan Single PO File..."
-msgstr "扫描单个 PO 文件..."
+msgid "General"
+msgstr "常规"
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 640
-#: rc.cpp:1182
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 50
+#: rc.cpp:762
 #, no-c-format
-msgid "Scan Folder..."
-msgstr "扫描文件夹..."
+msgid "DB folder:"
+msgstr "数据库文件夹："
 
-#. i18n: file ./kbabeldict/modules/dbsearchengine/dbseprefwidget.ui line 648
-#: rc.cpp:1185
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 63
+#: rc.cpp:765
 #, no-c-format
-msgid "Scan Folder && Subfolders..."
-msgstr "扫描文件夹和所有子文件夹..."
+msgid "Automatic update in kbabel"
+msgstr "自动在 KBabel 中更新"
 
-#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 39
-#: rc.cpp:1252
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 73
+#: rc.cpp:768
 #, no-c-format
-msgid "&Path to auxiliary file:"
-msgstr "到辅助文件的路径(&P)："
+msgid "New Entries"
+msgstr "新条目"
 
-#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 61
-#: rc.cpp:1255
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 84
+#: kbabeldict/kbabeldictbox.cpp:1268 rc.cpp:771
 #, no-c-format
-msgid "&Ignore fuzzy entries"
-msgstr "忽略模糊翻译项目(&I)"
+msgid "Author:"
+msgstr "作者："
 
-#. i18n: file ./kbabeldict/modules/poauxiliary/pwidget.ui line 78
-#: rc.cpp:1258
-#, fuzzy, no-c-format
-msgid ""
-"<qt>"
-"<p>\n"
-"The following variables will be replaced in the path if available:\n"
-"<ul>\n"
-"<li><b>@PACKAGE@</b>: the name of the currently translated application or "
-"package</li>\n"
-"<li><b>@LANG@</b>: the language code</li>\n"
-"<li><b>@DIR<em>n</em>@</b>: where n is a positive integer. This expands to the "
-"nth folder counted from the filename</li>\n"
-"</ul></p></qt>"
-msgstr ""
-"<qt>"
-"<p>\n"
-"如果可能，以下的变量将被在路径中替换：\n"
-"<ul>\n"
-"<li><b>@PACKAGE@</b>：当前翻译的应用程序或软件包的名称</li>\n"
-"<li><b>@LANG@</b>：语言代码</li>\n"
-"<li><b>@DIR<em>n</em>@</b>：这里的 n 是正整数。它会展开成从文件名起的第 n 个文件夹</li>\n"
-"</ul></p></qt>"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 92
+#: rc.cpp:774
+#, no-c-format
+msgid "From kbabel"
+msgstr "来自 KBabel"
 
-#: kbabeldict/kbabeldictbox.cpp:201
-msgid "Total:"
-msgstr "总计："
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 126
+#: rc.cpp:777
+#, no-c-format
+msgid "Algorithm"
+msgstr "算法"
 
-#: kbabeldict/kbabeldictbox.cpp:216
-msgid "Found in:"
-msgstr "所在文件："
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 137
+#: rc.cpp:780
+#, no-c-format
+msgid "Minimum score:"
+msgstr "最低分："
 
-#: kbabeldict/kbabeldictbox.cpp:224
-msgid "Translator:"
-msgstr "翻译人员："
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 176
+#: rc.cpp:783
+#, no-c-format
+msgid "Algorithms to Use"
+msgstr "要使用的算法"
 
-#: kbabeldict/kbabeldictbox.cpp:236
-msgid "Date:"
-msgstr "日期："
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 187
+#: rc.cpp:786 rc.cpp:789 rc.cpp:807 rc.cpp:810 rc.cpp:813 rc.cpp:816
+#: rc.cpp:819
+#, no-c-format
+msgid "Score:"
+msgstr "分数："
 
-#: kbabeldict/kbabeldictbox.cpp:244
-msgid "&More"
-msgstr "更多(&M)"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 213
+#: rc.cpp:792
+#, no-c-format
+msgid "Fuzzy sentence archive"
+msgstr "模糊句子存档"
 
-#: kbabeldict/kbabeldictbox.cpp:287
-msgid "Score"
-msgstr "分数"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 221
+#: rc.cpp:795
+#, no-c-format
+msgid "Glossary"
+msgstr "词汇表"
 
-#: kbabeldict/kbabeldictbox.cpp:288
-msgid "Original"
-msgstr "原始"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 229
+#: rc.cpp:798
+#, no-c-format
+msgid "Exact "
+msgstr "原样"
 
-#: kbabeldict/kbabeldictbox.cpp:289
-msgid "Translation"
-msgstr "翻译"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 252
+#: rc.cpp:801
+#, no-c-format
+msgid "Sentence by sentence"
+msgstr "逐句"
 
-#: kbabeldict/kbabeldictbox.cpp:290
-msgid "Location"
-msgstr "位置"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 260
+#: rc.cpp:804
+#, no-c-format
+msgid "Alphanumeric"
+msgstr "文字和数字"
 
-#: kbabeldict/kbabeldictbox.cpp:313
-msgid "< &Previous"
-msgstr "< 上一个(&P)"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 313
+#: rc.cpp:822
+#, no-c-format
+msgid "Word by word"
+msgstr "逐词"
 
-#: kbabeldict/kbabeldictbox.cpp:318
-msgid "&Next >"
-msgstr "下一个(&N) >"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 321
+#: rc.cpp:825
+#, no-c-format
+msgid "Dynamic dictionary"
+msgstr "动态字典"
 
-#: kbabeldict/kbabeldictbox.cpp:957 kbabeldict/kbabeldictbox.cpp:1015
-#: kbabeldict/kbabeldictbox.cpp:1027 kbabeldict/kbabeldictbox.cpp:1128
-#: kbabeldict/kbabeldictbox.cpp:1190 kbabeldict/kbabeldictbox.cpp:1449
-msgid "Edit File"
-msgstr "编辑文件"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 336
+#: rc.cpp:828
+#, no-c-format
+msgid "Preferred number of results:"
+msgstr "想要的结果数目："
 
-#: kbabeldict/kbabeldictbox.cpp:1010 kbabeldict/kbabeldictbox.cpp:1185
-#, c-format
-msgid "Edit File %1"
-msgstr "编辑文件 %1"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 356
+#: rc.cpp:831
+#, no-c-format
+msgid "Output"
+msgstr "输出"
 
-#: kbabeldict/kbabeldictbox.cpp:1257
-#, c-format
-msgid "Send bugs to %1"
-msgstr "把错误发送到 %1"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 367
+#: rc.cpp:834
+#, no-c-format
+msgid "Output Processing"
+msgstr "输出处理"
 
-#: kbabeldict/kbabeldictbox.cpp:1270
-msgid "Authors:"
-msgstr "作者："
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 395
+#: rc.cpp:837
+#, no-c-format
+msgid "First capital letter match"
+msgstr "匹配大写首字母"
 
-#: kbabeldict/kbabeldictbox.cpp:1286
-msgid "Thanks to:"
-msgstr "感谢："
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 403
+#: rc.cpp:840
+#, no-c-format
+msgid "All capital letter match"
+msgstr "匹配所有大写字母"
 
-#: kbabeldict/kbabeldictbox.cpp:1302
-msgid "No information available."
-msgstr "无可用信息。"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 411
+#: rc.cpp:843
+#, no-c-format
+msgid "Accelerator symbol (&&)"
+msgstr "快捷键标识(&&)"
 
-#: kbabeldict/kbabeldictbox.cpp:1505
-#, c-format
-msgid "Configure Dictionary %1"
-msgstr "配置字典 %1"
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 419
+#: rc.cpp:846
+#, no-c-format
+msgid "Try to use same letter"
+msgstr "尝试使用相同字母"
 
-#: kbabeldict/kbabeldictbox.cpp:1698
-#, c-format
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 429
+#: rc.cpp:849
+#, no-c-format
+msgid "Custom Rules"
+msgstr "自定义规则"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 440
+#: rc.cpp:852
+#, no-c-format
+msgid "Original string regexp:"
+msgstr "原文正则表达式："
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 451
+#: rc.cpp:855
+#, no-c-format
+msgid "Enabled"
+msgstr "已启用"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 462
+#: rc.cpp:858
+#, no-c-format
+msgid "Description"
+msgstr "说明"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 527
+#: rc.cpp:870
+#, no-c-format
+msgid "Replace string:"
+msgstr "替换字符串："
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 545
+#: rc.cpp:873
+#, no-c-format
+msgid "Translated regexp(search):"
+msgstr "译文正则表达式(查找)："
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 583
+#: rc.cpp:882
+#, no-c-format
+msgid "Check language"
+msgstr "检查语言"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 599
+#: rc.cpp:885
+#, no-c-format
+msgid "Use current filters"
+msgstr "使用当前过滤器"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 615
+#: rc.cpp:888
+#, no-c-format
+msgid "Set date to today"
+msgstr "日期设置为今天"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 624
+#: rc.cpp:891
+#, no-c-format
+msgid "Sources"
+msgstr "来源"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 651
+#: rc.cpp:900
+#, no-c-format
+msgid "Scan Now"
+msgstr "立即扫描"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 684
+#: rc.cpp:906
+#, no-c-format
+msgid "Scan All"
+msgstr "扫描全部"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbse2.ui line 701
+#: rc.cpp:909
+#, no-c-format
+msgid "Filters"
+msgstr "过滤器"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 16
+#: rc.cpp:912
+#, no-c-format
+msgid "Edit Source"
+msgstr "编辑来源"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 60
+#: rc.cpp:921
+#, no-c-format
+msgid "Additional Informations"
+msgstr "附加信息"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 133
+#: rc.cpp:927
+#, no-c-format
+msgid "Project name:"
+msgstr "工程名称："
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 149
+#: rc.cpp:930
+#, no-c-format
+msgid "Project keywords:"
+msgstr "工程关键字："
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 158
+#: rc.cpp:933
+#, no-c-format
+msgid "General Info"
+msgstr "常规信息"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 172
+#: rc.cpp:936
+#, no-c-format
+msgid "Single File"
+msgstr "单个文件"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 177
+#: rc.cpp:939
+#, no-c-format
+msgid "Single Folder"
+msgstr "单个文件夹"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 182
+#: rc.cpp:942
+#, no-c-format
+msgid "Recursive Folder"
+msgstr "递归子文件夹"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 194
+#: rc.cpp:945
+#, no-c-format
+msgid "Source name:"
+msgstr "来源名称："
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 207
+#: rc.cpp:948
+#, no-c-format
+msgid "Type:"
+msgstr "类型："
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 215
+#: rc.cpp:951
+#, no-c-format
+msgid "Setup Filter..."
+msgstr "设置过滤器..."
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 223
+#: rc.cpp:954
+#, no-c-format
+msgid "Location:"
+msgstr "位置："
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/sourcedialog.ui line 231
+#: rc.cpp:957
+#, no-c-format
+msgid "Use filter"
+msgstr "使用过滤器"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 17
+#: rc.cpp:960
+#, no-c-format
+msgid "DBSEPrefWidget"
+msgstr "DBSEPrefWidget"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 635
+#: rc.cpp:1095
+#, no-c-format
+msgid "Scan Single PO File"
+msgstr "扫描单个 PO 文件"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 643
+#: rc.cpp:1098
+#, no-c-format
+msgid "Scan Folder"
+msgstr "扫描文件夹"
+
+#. i18n: file ./kbabeldict/modules/dbsearchengine2/dbseprefwidget.ui line 651
+#: rc.cpp:1101
+#, no-c-format
+msgid "Scan Folder && Subfolders"
+msgstr "扫描文件夹和所有子文件夹"
+
+#. i18n: file ./catalogmanager/catalogmanagerui.rc line 30
+#: rc.cpp:1174
+#, no-c-format
+msgid "&Markings"
+msgstr "标记(&M)"
+
+#. i18n: file ./catalogmanager/catalogmanagerui.rc line 60
+#: rc.cpp:1183 rc.cpp:1201 rc.cpp:1207
+#, no-c-format
+msgid "CVS"
+msgstr "CVS"
+
+#. i18n: file ./catalogmanager/catalogmanagerui.rc line 78
+#: catalogmanager/future.cpp:4 rc.cpp:1186 rc.cpp:1204 rc.cpp:1210
+#, no-c-format
+msgid "SVN"
+msgstr "SVN"
+
+#. i18n: file ./catalogmanager/markpatternwidget.ui line 24
+#: rc.cpp:1213
+#, no-c-format
+msgid "To be set dynamically:"
+msgstr "将被动态设置："
+
+#. i18n: file ./catalogmanager/markpatternwidget.ui line 62
+#: rc.cpp:1222
+#, no-c-format
+msgid "&Include templates"
+msgstr "包括模板(&I)"
+
+#. i18n: file ./catalogmanager/markpatternwidget.ui line 70
+#: rc.cpp:1225
+#, no-c-format
+msgid "Use &wildcards"
+msgstr "使用通配符(&W)"
+
+#. i18n: file ./catalogmanager/validateprogresswidget.ui line 38
+#: kbabeldict/kbabeldictbox.cpp:208 rc.cpp:1234
+#, no-c-format
+msgid "Current:"
+msgstr "目前："
+
+#. i18n: file ./catalogmanager/validateprogresswidget.ui line 59
+#: rc.cpp:1237
+#, no-c-format
+msgid "Overall:"
+msgstr "全部："
+
+#. i18n: file ./catalogmanager/validateprogresswidget.ui line 80
+#: rc.cpp:1240
+#, no-c-format
+msgid "Current file:"
+msgstr "当前文件："
+
+#. i18n: file ./catalogmanager/validateprogresswidget.ui line 88
+#: rc.cpp:1243
+#, no-c-format
+msgid "Validation:"
+msgstr "校验："
+
+#. i18n: file ./catalogmanager/validationoptions.ui line 32
+#: rc.cpp:1249
+#, no-c-format
+msgid "Mark invalid as &fuzzy"
+msgstr "无效条目标记为模糊项(&F)"
+
+#. i18n: file ./catalogmanager/validationoptions.ui line 39
+#: rc.cpp:1252
+#, no-c-format
 msgid ""
-"There was an error starting KBabel:\n"
-"%1"
+"<qt>"
+"<p><b>Mark invalid as fuzzy</b>"
+"<p>\n"
+"<p>If you select this option, all items,\n"
+"which identifies the tool as invalid, will be\n"
+"marked as fuzzy and the resulting file\n"
+"will be saved.</p></qt>"
 msgstr ""
-"在启动 KBabel 时出错：\n"
-"%1"
+"<qt>"
+"<p><b>无效条目标记为模糊项</b>"
+"<p>\n"
+"<p>如果您选中此选项，所有被标识为无效的条目\n"
+"都将被标记为模糊项，结果文件将被保存。</p></qt>"
 
-#: kbabeldict/kbabeldictbox.cpp:1712
-msgid "There was an error using DCOP."
-msgstr "在使用 DCOP 时出错。"
+#. i18n: file ./catalogmanager/validationoptions.ui line 47
+#: rc.cpp:1259
+#, no-c-format
+msgid "&Do not validate fuzzy"
+msgstr "不校验模糊项(&D)"
 
-#: kbabeldict/kbabeldictbox.cpp:1738
+#. i18n: file ./catalogmanager/validationoptions.ui line 52
+#: rc.cpp:1262
+#, no-c-format
 msgid ""
-"The \"Translation Database\" module\n"
-"appears not to be installed on your system."
+"<qt>"
+"<p><b>Do not validate fuzzy</b>"
+"<p>\n"
+"<p>If you select this option, all items\n"
+"marked as fuzzy will not be validated at all.</p></qt>"
 msgstr ""
-"“翻译数据库”模块似乎\n"
-"在您的系统上没有安装。"
+"<qt>"
+"<p><b>不校验模糊项</b>"
+"<p>\n"
+"<p>如果您选中此选项，所有标记为模糊项的条目\n"
+"将完全不进行校验。</p></qt>"
 
-#: kbabeldict/main.cpp:114
-msgid "KBabel - Dictionary"
-msgstr "KBabel - 字典"
+#: kbabeldict/aboutmoduledlg.cpp:42
+msgid "Report Bug..."
+msgstr "报告错误..."
 
-#: kbabeldict/main.cpp:115
-msgid "A dictionary for translators"
-msgstr "给翻译人员使用的字典"
+#: kbabeldict/kbabeldictview.cpp:83
+msgid "Search in module:"
+msgstr "搜索模块："
 
-#: kbabeldict/main.cpp:116
-msgid "(c) 2000,2001,2002,2003 The KBabeldict developers"
-msgstr "(c) 2000,2001,2002,2003 KBabeldict 开发者"
+#: kbabeldict/kbabeldictview.cpp:106
+msgid "&Start Search"
+msgstr "开始搜索(&S)"
+
+#: kbabeldict/kbabeldictview.cpp:108
+msgid "Sea&rch in translations"
+msgstr "在翻译中搜索(&R)"
+
+#: kbabeldict/kbabeldictview.cpp:125
+msgid "Settings:"
+msgstr "设置："
 
 #: kbabeldict/modules/tmx/pc_factory.cpp:95
 #: kbabeldict/modules/tmx/tmxcompendium.cpp:175
 msgid "TMX Compendium"
 msgstr "TMX 概要字典"
 
-#: kbabeldict/modules/tmx/pc_factory.cpp:97
-msgid "A module for searching in a TMX file"
-msgstr "用于在 TMX 文件中搜索的模块"
+#: kbabeldict/modules/pocompendium/compendiumdata.cpp:79
+#: kbabeldict/modules/pocompendium/pocompendium.cpp:1195
+#: kbabeldict/modules/tmx/tmxcompendium.cpp:957
+msgid "Loading PO compendium"
+msgstr "正在载入 PO 概要字典"
 
 #: kbabeldict/modules/tmx/preferenceswidget.cpp:88
 msgid ""
@@ -5623,12 +4543,6 @@ msgid ""
 "<p>Configure here which file is to be used for searching.</p></qt>"
 msgstr "<qt><p><b>位置</b></p><p>在这里配置要进行搜索的文件。</p></qt>"
 
-#: kbabeldict/modules/pocompendium/compendiumdata.cpp:79
-#: kbabeldict/modules/pocompendium/pocompendium.cpp:1195
-#: kbabeldict/modules/tmx/tmxcompendium.cpp:957
-msgid "Loading PO compendium"
-msgstr "正在载入 PO 概要字典"
-
 #: kbabeldict/modules/tmx/tmxcompendiumdata.cpp:80
 msgid "Loading TMX compendium"
 msgstr "正在载入 TMX 概要字典"
@@ -5665,14 +4579,23 @@ msgstr "正在建立索引"
 msgid "Empty database."
 msgstr "空数据库。"
 
+#: kbabeldict/modules/tmx/pc_factory.cpp:97
+msgid "A module for searching in a TMX file"
+msgstr "用于在 TMX 文件中搜索的模块"
+
 #: kbabeldict/modules/pocompendium/pc_factory.cpp:95
 #: kbabeldict/modules/pocompendium/pocompendium.cpp:184
 msgid "PO Compendium"
 msgstr "PO 概要字典"
 
-#: kbabeldict/modules/pocompendium/pc_factory.cpp:97
-msgid "A module for searching in a PO file"
-msgstr "用于在 PO 文件中搜索的模块"
+#: kbabeldict/modules/pocompendium/compendiumdata.cpp:93
+#, c-format
+msgid ""
+"Error while trying to read file for PO Compendium module:\n"
+"%1"
+msgstr ""
+"在试图为 PO 概要字典模块读取文件时出错：\n"
+"%1"
 
 #: kbabeldict/modules/pocompendium/preferenceswidget.cpp:88
 msgid ""
@@ -5686,15 +4609,36 @@ msgstr ""
 "<p><b>参数</b></p>"
 "<p>此处您可以微调在 PO 文件中的搜索。譬如，您是否想执行区分大小写的搜索，或者您是否要忽略模糊翻译的消息。</p></qt>"
 
-#: kbabeldict/modules/pocompendium/compendiumdata.cpp:93
+#: kbabeldict/modules/pocompendium/pc_factory.cpp:97
+msgid "A module for searching in a PO file"
+msgstr "用于在 PO 文件中搜索的模块"
+
+#: kbabeldict/modules/poauxiliary/pa_factory.cpp:95
+#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:147
+msgid "PO Auxiliary"
+msgstr "PO 辅助字典"
+
+#: kbabeldict/modules/poauxiliary/pa_factory.cpp:97
+msgid "A simple module for exact searching in a PO file"
+msgstr "一个用来在 PO 文件里进行确切搜索的简单模块"
+
+#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:426
+msgid "Loading PO auxiliary"
+msgstr "正在载入 PO 助手"
+
+#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:438
 #, c-format
 msgid ""
-"Error while trying to read file for PO Compendium module:\n"
+"Error while trying to open file for PO Auxiliary module:\n"
 "%1"
 msgstr ""
-"在试图为 PO 概要字典模块读取文件时出错：\n"
+"在试图为 PO 辅助字典模块打开文件时出错：\n"
 "%1"
 
+#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:450
+msgid "Building index"
+msgstr "正在建立索引"
+
 #: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:1412
 #: kbabeldict/modules/dbsearchengine/dbse_factory.cpp:67
 #: kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp:68
@@ -5706,70 +4650,9 @@ msgstr "翻译数据库"
 msgid "A fast translation search engine based on databases"
 msgstr "一个基于数据库的快速翻译搜索引擎"
 
-#: kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp:72
-msgid "Copyright 2000-2003 by Andrea Rizzi"
-msgstr "版权所有 2000-2003 作者 Andrea Rizzi"
-
-#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:182
-msgid "CHUNK BY CHUNK"
-msgstr "逐块翻译"
-
-#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:183
-msgid ""
-"<h3>Chunk by chunk</h3>CHANGE THIS TEXT!!!!This translation isobtained "
-"translating the  sentences and using afuzzy sentence translation database."
-"<br> <b>Do not rely on it</b>. Translations may be fuzzy."
-"<br>"
-msgstr ""
-"<h3>逐块翻译</h3>CHANGE THIS TEXT!!!!这个翻译是使用模糊句子翻译数据库按句进行翻译完成的。"
-"<br> <b>别依赖它</b>，这种翻译可能很含混。"
-"<br>"
-
-#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:374
-#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:386
-msgid "DYNAMIC DICT:"
-msgstr "动态字典："
-
-#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:375
-#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:387
-msgid ""
-"<h3>Dynamic Dictionary</h3>This is a dynamic dictionary created looking for "
-"correlation of original and translated words."
-"<br> <b>Do not rely on it</b>. Translations may be fuzzy."
-"<br>"
-msgstr ""
-"<h3>动态词字典</h3>这是为查找原文单词和译文单词相关性而创建的动态字典。"
-"<br> <b>别依赖它</b>，这种翻译可能很含混。"
-"<br>"
-
-#: kbabeldict/modules/dbsearchengine2/database.cpp:142
-msgid "Create Database"
-msgstr "创建数据库"
-
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:258
-#: kbabeldict/modules/dbsearchengine2/database.cpp:142
-msgid "Create"
-msgstr "创建"
-
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:127
-#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:258
-#: kbabeldict/modules/dbsearchengine2/database.cpp:142
-msgid "Do Not Create"
-msgstr ""
-
-#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:562
-#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:614
-msgid ""
-"The name you chose is already used.\n"
-"Please change the source name."
-msgstr ""
-"您所选的名称已经被使用。\n"
-"请改变来源名称。"
-
-#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:563
-#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:615
-msgid "Name is Not Unique"
-msgstr "名称不唯一"
+#: kbabeldict/modules/dbsearchengine/dbse_factory.cpp:71
+msgid "Copyright 2000-2001 by Andrea Rizzi"
+msgstr "版权 2000-2001 作者 Andrea Rizzi"
 
 #: kbabeldict/modules/dbsearchengine/preferenceswidget.cpp:102
 #, c-format
@@ -5781,10 +4664,6 @@ msgstr "正在扫描文件：%1"
 msgid "Entries added: %1"
 msgstr "新添项目：%1"
 
-#: kbabeldict/modules/dbsearchengine/dbse_factory.cpp:71
-msgid "Copyright 2000-2001 by Andrea Rizzi"
-msgstr "版权 2000-2001 作者 Andrea Rizzi"
-
 #: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:84
 msgid "No error"
 msgstr "无错误"
@@ -5803,6 +4682,12 @@ msgstr ""
 msgid "Create Folder"
 msgstr "创建文件夹"
 
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:127
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:258
+#: kbabeldict/modules/dbsearchengine2/database.cpp:142
+msgid "Do Not Create"
+msgstr ""
+
 #: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:146
 #, c-format
 msgid "It was not possible to create folder %1"
@@ -5812,7 +4697,7 @@ msgstr "无法创建文件夹 %1"
 #, fuzzy
 msgid ""
 "<p>There are backup database files from previous versions of KBabel. However, "
-"another version of KBabel (probably from TDE 3.1.1 or 3.1.2) created a new "
+"another version of KBabel (probably from KDE 3.1.1 or 3.1.2) created a new "
 "database. As a result, your KBabel installation contains two versions of "
 "database files. Unfortunatelly, the old and new version can not be merged. You "
 "need to choose one of them."
@@ -5848,6 +4733,11 @@ msgstr ""
 "没有找到数据库文件。\n"
 "您要现在创建吗 ?"
 
+#: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:258
+#: kbabeldict/modules/dbsearchengine2/database.cpp:142
+msgid "Create"
+msgstr "创建"
+
 #: kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp:408
 msgid "Cannot open the database"
 msgstr "无法打开数据库"
@@ -5926,51 +4816,59 @@ msgstr "正在搜索字词"
 msgid "Process output"
 msgstr "进程输出"
 
-#: kbabeldict/modules/poauxiliary/pa_factory.cpp:95
-#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:147
-msgid "PO Auxiliary"
-msgstr "PO 辅助字典"
-
-#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:426
-msgid "Loading PO auxiliary"
-msgstr "正在载入 PO 助手"
+#: kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp:72
+msgid "Copyright 2000-2003 by Andrea Rizzi"
+msgstr "版权所有 2000-2003 作者 Andrea Rizzi"
 
-#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:438
-#, c-format
+#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:562
+#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:614
 msgid ""
-"Error while trying to open file for PO Auxiliary module:\n"
-"%1"
+"The name you chose is already used.\n"
+"Please change the source name."
 msgstr ""
-"在试图为 PO 辅助字典模块打开文件时出错：\n"
-"%1"
-
-#: kbabeldict/modules/poauxiliary/poauxiliary.cpp:450
-msgid "Building index"
-msgstr "正在建立索引"
+"您所选的名称已经被使用。\n"
+"请改变来源名称。"
 
-#: kbabeldict/modules/poauxiliary/pa_factory.cpp:97
-msgid "A simple module for exact searching in a PO file"
-msgstr "一个用来在 PO 文件里进行确切搜索的简单模块"
+#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:563
+#: kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp:615
+msgid "Name is Not Unique"
+msgstr "名称不唯一"
 
-#: kbabeldict/kbabeldictview.cpp:83
-msgid "Search in module:"
-msgstr "搜索模块："
+#: kbabeldict/modules/dbsearchengine2/database.cpp:142
+msgid "Create Database"
+msgstr "创建数据库"
 
-#: kbabeldict/kbabeldictview.cpp:106
-msgid "&Start Search"
-msgstr "开始搜索(&S)"
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:182
+msgid "CHUNK BY CHUNK"
+msgstr "逐块翻译"
 
-#: kbabeldict/kbabeldictview.cpp:108
-msgid "Sea&rch in translations"
-msgstr "在翻译中搜索(&R)"
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:183
+msgid ""
+"<h3>Chunk by chunk</h3>CHANGE THIS TEXT!!!!This translation isobtained "
+"translating the  sentences and using afuzzy sentence translation database."
+"<br> <b>Do not rely on it</b>. Translations may be fuzzy."
+"<br>"
+msgstr ""
+"<h3>逐块翻译</h3>CHANGE THIS TEXT!!!!这个翻译是使用模糊句子翻译数据库按句进行翻译完成的。"
+"<br> <b>别依赖它</b>，这种翻译可能很含混。"
+"<br>"
 
-#: kbabeldict/kbabeldictview.cpp:125
-msgid "Settings:"
-msgstr "设置："
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:374
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:386
+msgid "DYNAMIC DICT:"
+msgstr "动态字典："
 
-#: kbabeldict/aboutmoduledlg.cpp:42
-msgid "Report Bug..."
-msgstr "报告错误..."
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:375
+#: kbabeldict/modules/dbsearchengine2/algorithms.cpp:387
+msgid ""
+"<h3>Dynamic Dictionary</h3>This is a dynamic dictionary created looking for "
+"correlation of original and translated words."
+"<br> <b>Do not rely on it</b>. Translations may be fuzzy."
+"<br>"
+msgstr ""
+"<h3>动态词字典</h3>这是为查找原文单词和译文单词相关性而创建的动态字典。"
+"<br> <b>别依赖它</b>，这种翻译可能很含混。"
+"<br>"
 
 #: kbabeldict/kbabeldict.cpp:45
 msgid "KBabelDict"
@@ -5988,6 +4886,104 @@ msgstr "隐藏设置(&I)"
 msgid "Show Sett&ings"
 msgstr "显示设置(&I)"
 
+#: kbabeldict/kbabeldictbox.cpp:201
+msgid "Total:"
+msgstr "总计："
+
+#: kbabeldict/kbabeldictbox.cpp:216
+msgid "Found in:"
+msgstr "所在文件："
+
+#: kbabeldict/kbabeldictbox.cpp:224
+msgid "Translator:"
+msgstr "翻译人员："
+
+#: kbabeldict/kbabeldictbox.cpp:236
+msgid "Date:"
+msgstr "日期："
+
+#: kbabeldict/kbabeldictbox.cpp:244
+msgid "&More"
+msgstr "更多(&M)"
+
+#: kbabeldict/kbabeldictbox.cpp:287
+msgid "Score"
+msgstr "分数"
+
+#: kbabeldict/kbabeldictbox.cpp:288
+msgid "Original"
+msgstr "原始"
+
+#: kbabeldict/kbabeldictbox.cpp:289
+msgid "Translation"
+msgstr "翻译"
+
+#: kbabeldict/kbabeldictbox.cpp:290
+msgid "Location"
+msgstr "位置"
+
+#: kbabeldict/kbabeldictbox.cpp:313
+msgid "< &Previous"
+msgstr "< 上一个(&P)"
+
+#: kbabeldict/kbabeldictbox.cpp:318
+msgid "&Next >"
+msgstr "下一个(&N) >"
+
+#: kbabeldict/kbabeldictbox.cpp:957 kbabeldict/kbabeldictbox.cpp:1015
+#: kbabeldict/kbabeldictbox.cpp:1027 kbabeldict/kbabeldictbox.cpp:1128
+#: kbabeldict/kbabeldictbox.cpp:1190 kbabeldict/kbabeldictbox.cpp:1449
+msgid "Edit File"
+msgstr "编辑文件"
+
+#: kbabeldict/kbabeldictbox.cpp:1010 kbabeldict/kbabeldictbox.cpp:1185
+#, c-format
+msgid "Edit File %1"
+msgstr "编辑文件 %1"
+
+#: kbabeldict/kbabeldictbox.cpp:1257
+#, c-format
+msgid "Send bugs to %1"
+msgstr "把错误发送到 %1"
+
+#: kbabeldict/kbabeldictbox.cpp:1270
+msgid "Authors:"
+msgstr "作者："
+
+#: kbabeldict/kbabeldictbox.cpp:1286
+msgid "Thanks to:"
+msgstr "感谢："
+
+#: kbabeldict/kbabeldictbox.cpp:1302
+msgid "No information available."
+msgstr "无可用信息。"
+
+#: kbabeldict/kbabeldictbox.cpp:1505
+#, c-format
+msgid "Configure Dictionary %1"
+msgstr "配置字典 %1"
+
+#: kbabeldict/kbabeldictbox.cpp:1698
+#, c-format
+msgid ""
+"There was an error starting KBabel:\n"
+"%1"
+msgstr ""
+"在启动 KBabel 时出错：\n"
+"%1"
+
+#: kbabeldict/kbabeldictbox.cpp:1712
+msgid "There was an error using DCOP."
+msgstr "在使用 DCOP 时出错。"
+
+#: kbabeldict/kbabeldictbox.cpp:1738
+msgid ""
+"The \"Translation Database\" module\n"
+"appears not to be installed on your system."
+msgstr ""
+"“翻译数据库”模块似乎\n"
+"在您的系统上没有安装。"
+
 #: kbabeldict/dictchooser.cpp:59
 msgid ""
 "_: dictionary to not use\n"
@@ -6012,6 +5008,1016 @@ msgstr "下移(&D)"
 msgid "Con&figure..."
 msgstr "配置(&F)..."
 
+#: kbabeldict/main.cpp:114
+msgid "KBabel - Dictionary"
+msgstr "KBabel - 字典"
+
+#: kbabeldict/main.cpp:115
+msgid "A dictionary for translators"
+msgstr "给翻译人员使用的字典"
+
+#: kbabeldict/main.cpp:116
+msgid "(c) 2000,2001,2002,2003 The KBabeldict developers"
+msgstr "(c) 2000,2001,2002,2003 KBabeldict 开发者"
+
+#: common/catalog.cpp:592
+msgid ""
+"Free Software Foundation Copyright does not contain any year. It will not be "
+"updated."
+msgstr "自由软件基金会版权没包括年份。它将不会被更新。"
+
+#: common/catalog.cpp:1237
+msgid "validating file"
+msgstr "正在校验文件"
+
+#: common/catalog.cpp:1276
+msgid "applying tool"
+msgstr "正在应用工具"
+
+#: common/catalog.cpp:3128
+msgid "searching matching message"
+msgstr "正在搜索匹配消息"
+
+#: common/catalog.cpp:3217
+msgid "preparing messages for diff"
+msgstr "正在为 diff 准备消息"
+
+#: common/kbproject.cpp:53
+msgid "unnamed"
+msgstr "未命名"
+
+#: common/kbmailer.cpp:106
+#, fuzzy, c-format
+msgid "Error while trying to download file %1."
+msgstr "在试图打开文件 %1 时出错。"
+
+#: common/kbmailer.cpp:145
+msgid "Enter the name of the archive without file extension"
+msgstr "输入不带文件扩展名的归档名称"
+
+#: common/kbmailer.cpp:178
+msgid "Error while trying to create archive file."
+msgstr "在试图创建归档文件时出错。"
+
+#: common/kbmailer.cpp:193
+#, c-format
+msgid "Error while trying to read file %1."
+msgstr "在试图读取文件 %1 时出错。"
+
+#: common/kbmailer.cpp:208
+#, fuzzy
+msgid "Error while trying to copy file %1 into archive."
+msgstr "在试图打开文件 %1 时出错。"
+
+#: filters/gettext/gettextexport.cpp:74
+msgid "saving file"
+msgstr "正在保存文件"
+
+#: filters/gettext/gettextimport.cpp:83
+msgid "loading file"
+msgstr "正在载入文件"
+
+#: catalogmanager/validateprogress.cpp:56
+msgid ""
+"_: Caption of dialog\n"
+"Validation"
+msgstr "检验"
+
+#: catalogmanager/catalogmanager.cpp:222
+#: catalogmanager/validateprogress.cpp:72
+msgid "&Open"
+msgstr "打开(&O)"
+
+#: catalogmanager/validateprogress.cpp:73
+msgid "&Ignore"
+msgstr "忽略(&I)"
+
+#: catalogmanager/catalogmanagerview.cpp:2999
+#: catalogmanager/validateprogress.cpp:98
+#, fuzzy
+msgid ""
+"Cannot instantiate a validation tool.\n"
+"Please check your installation."
+msgstr ""
+"无法创建检验工具实例。\n"
+"请检查 TDE 的安装。"
+
+#: catalogmanager/catalogmanagerview.cpp:3000
+#: catalogmanager/validateprogress.cpp:99
+msgid "Validation Tool Error"
+msgstr "检验工具错误"
+
+#: catalogmanager/validateprogress.cpp:186
+msgid ""
+"Validation done.\n"
+"\n"
+"Checked files: %1\n"
+"Number of errors: %2\n"
+"Number of ignored errors: %3"
+msgstr ""
+"检验完成。\n"
+"\n"
+"检验了 %1 个文件\n"
+"检查到 %2 个错误\n"
+"忽略了 %3 个错误"
+
+#: catalogmanager/validateprogress.cpp:190
+msgid "Validation Done"
+msgstr "校验完成"
+
+#: catalogmanager/multiroughtransdlg.cpp:56
+msgid "Files:"
+msgstr "文件："
+
+#: catalogmanager/catalogmanagerview.cpp:94 catalogmanager/future.cpp:5
+msgid "CVS/SVN Status"
+msgstr "CVS/SVN 状态"
+
+#: catalogmanager/future.cpp:8
+msgid "Resolved"
+msgstr "已解决"
+
+#: catalogmanager/future.cpp:9
+msgid "Resolved for Marked"
+msgstr "已标记已解决"
+
+#: catalogmanager/future.cpp:10
+msgid "Revert"
+msgstr "还原"
+
+#: catalogmanager/future.cpp:11
+msgid "Revert for Marked"
+msgstr "已标记为还原"
+
+#: catalogmanager/future.cpp:12
+msgid "Cleanup"
+msgstr "清理"
+
+#: catalogmanager/future.cpp:13
+msgid "Cleanup for Marked"
+msgstr "已标记为清理"
+
+#: catalogmanager/future.cpp:16
+msgid "No repository"
+msgstr "没有仓库"
+
+#: catalogmanager/catmanlistitem.cpp:80
+msgid "Message Catalogs"
+msgstr "消息目录"
+
+#: catalogmanager/catmanlistitem.cpp:450 catalogmanager/catmanlistitem.cpp:637
+msgid "No version control"
+msgstr "无版本控制"
+
+#: catalogmanager/libcvs/cvshandler.cpp:88
+msgid "No CVS repository"
+msgstr "无 CVS 仓库"
+
+#: catalogmanager/libcvs/cvshandler.cpp:91
+msgid "Not in CVS"
+msgstr "不在 CVS 中"
+
+#: catalogmanager/libcvs/cvshandler.cpp:94
+#: catalogmanager/libsvn/svnhandler.cpp:96
+msgid "Locally added"
+msgstr "已在本地添加"
+
+#: catalogmanager/libcvs/cvshandler.cpp:97
+#: catalogmanager/libsvn/svnhandler.cpp:99
+msgid "Locally removed"
+msgstr "已在本地删除"
+
+#: catalogmanager/libcvs/cvshandler.cpp:100
+#: catalogmanager/libsvn/svnhandler.cpp:102
+msgid "Locally modified"
+msgstr "已在本地修改"
+
+#: catalogmanager/libcvs/cvshandler.cpp:103
+#: catalogmanager/libsvn/svnhandler.cpp:105
+msgid "Up-to-date"
+msgstr "已更新"
+
+#: catalogmanager/libcvs/cvshandler.cpp:106
+#: catalogmanager/libsvn/svnhandler.cpp:108
+msgid "Conflict"
+msgstr "冲突"
+
+#: catalogmanager/libcvs/cvshandler.cpp:109
+#: catalogmanager/libsvn/svnhandler.cpp:113
+msgid "Unknown"
+msgstr "未知"
+
+#: catalogmanager/libcvs/cvshandler.cpp:189
+#: catalogmanager/libcvs/cvshandler.cpp:228
+msgid ""
+"This is not a valid CVS repository. The CVS commands cannot be executed."
+msgstr "这不是一个有效的 CVS 仓库。无法执行CVS命名。"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:311
+#: catalogmanager/libcvs/cvshandler.cpp:375
+#: catalogmanager/libsvn/svndialog.cpp:290
+#: catalogmanager/libsvn/svnhandler.cpp:483
+msgid "[ Starting command ]"
+msgstr "[ 开始命令 ]"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:68
+msgid "CVS Dialog"
+msgstr "CVS 对话框"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:77
+#: catalogmanager/libsvn/svndialog.cpp:74
+msgid "Update the following files:"
+msgstr "更新以下文件："
+
+#: catalogmanager/libcvs/cvsdialog.cpp:80
+#: catalogmanager/libsvn/svndialog.cpp:77
+msgid "Commit the following files:"
+msgstr "交付以下文件："
+
+#: catalogmanager/libcvs/cvsdialog.cpp:83
+msgid "Get status for the following files:"
+msgstr "获取以下文件的状态："
+
+#: catalogmanager/libcvs/cvsdialog.cpp:86
+#: catalogmanager/libsvn/svndialog.cpp:86
+msgid "Get diff for the following files:"
+msgstr "获取以下文件的 diff："
+
+#: catalogmanager/libcvs/cvsdialog.cpp:100
+#: catalogmanager/libsvn/svndialog.cpp:103
+msgid "&Old messages:"
+msgstr "以前的消息(&O)"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:108
+#: catalogmanager/libsvn/svndialog.cpp:111
+msgid "&Log message:"
+msgstr "日志消息(&L)"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:114
+msgid "E&ncoding:"
+msgstr "编码(&N)："
+
+#: catalogmanager/libcvs/cvsdialog.cpp:121
+msgid ""
+"_: Descriptive encoding name\n"
+"Recommended ( %1 )"
+msgstr "推荐(%1)"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:122
+msgid ""
+"_: Descriptive encoding name\n"
+"Locale ( %1 )"
+msgstr "语系(%1)"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:133
+#: catalogmanager/libsvn/svndialog.cpp:124
+msgid "Auto&matically add files if necessary"
+msgstr "必要时自动添加文件(&M)"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:144
+#: catalogmanager/libsvn/svndialog.cpp:135
+msgid "&Commit"
+msgstr "提交(&C)："
+
+#: catalogmanager/libcvs/cvsdialog.cpp:147
+#: catalogmanager/libsvn/svndialog.cpp:139
+msgid "&Get Status"
+msgstr "获取状态(&G)"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:150
+#: catalogmanager/libsvn/svndialog.cpp:142
+msgid "&Get Diff"
+msgstr "获取 Diff(&G)"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:165
+#: catalogmanager/libsvn/svndialog.cpp:160
+msgid "Command output:"
+msgstr "命令输出："
+
+#: catalogmanager/libcvs/cvsdialog.cpp:237
+#: catalogmanager/libsvn/svndialog.cpp:233
+msgid "The commit log message is empty. Do you want to continue?"
+msgstr "提交日志消息为空。您是否想要继续？"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:247
+#, c-format
+msgid "Cannot find encoding: %1"
+msgstr "找不到编码：%1"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:253
+msgid ""
+"The commit log message cannot be encoded in the selected encoding: %1.\n"
+"Do you want to continue?"
+msgstr ""
+"提交日志消息无法表示为选中编码：%1\n"
+"您是否想要继续？"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:268
+#: catalogmanager/libsvn/svndialog.cpp:247
+msgid "Cannot open temporary file for writing. Aborting."
+msgstr "无法打开临时文件写入。中止。"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:280
+#: catalogmanager/libsvn/svndialog.cpp:259
+msgid "Cannot write to temporary file. Aborting."
+msgstr "无法写入临时文件。中止。"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:322
+#: catalogmanager/libsvn/svndialog.cpp:301
+msgid "The process could not be started."
+msgstr "无法启动进程。"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:351
+#: catalogmanager/libsvn/svndialog.cpp:330
+msgid "[ Exited with status %1 ]"
+msgstr "[ %1 状态下退出]"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:353
+#: catalogmanager/libsvn/svndialog.cpp:332
+msgid "[ Finished ]"
+msgstr "[ 完成 ]"
+
+#: catalogmanager/libcvs/cvsdialog.cpp:401
+msgid ""
+"_: Descriptive encoding name\n"
+"Last choice ( %1 )"
+msgstr "上次选择(%1)"
+
+#: catalogmanager/catalogmanagerview.cpp:89
+msgid "Name"
+msgstr "名称"
+
+#: catalogmanager/catalogmanagerview.cpp:90
+msgid "M"
+msgstr "M"
+
+#: catalogmanager/catalogmanagerview.cpp:91
+msgid "Fuzzy"
+msgstr "模糊翻译"
+
+#: catalogmanager/catalogmanagerview.cpp:92
+msgid "Untranslated"
+msgstr "未翻译"
+
+#: catalogmanager/catalogmanagerview.cpp:93
+msgid "Total"
+msgstr "总计"
+
+#: catalogmanager/catalogmanagerview.cpp:95
+msgid "Last Revision"
+msgstr "最后修订"
+
+#: catalogmanager/catalogmanagerview.cpp:178
+#: catalogmanager/catalogmanagerview.cpp:2447
+#: catalogmanager/catalogmanagerview.cpp:2458
+msgid "Log Window"
+msgstr "日志窗口"
+
+#: catalogmanager/catalogmanagerview.cpp:180
+msgid "C&lear"
+msgstr "清除(&L)"
+
+#: catalogmanager/catalogmanagerview.cpp:183
+msgid ""
+"<qt>"
+"<p><b>Log window</b></p>\n"
+"<p>In this window the output of the executed commands are shown.</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>日志窗口</b></p>\n"
+"<p>该窗口显示执行命令的输出结果。</p></qt>"
+
+#: catalogmanager/catalogmanagerview.cpp:194
+msgid ""
+"<qt>"
+"<p><b>Catalog Manager</b></p>\n"
+"<p>The Catalog Manager merges two folders into one tree and displays all\n"
+"PO and POT files in these folders. This way you can easily see if a\n"
+"template has been added or removed. Also some information about the files\n"
+"is displayed.</p>"
+"<p>For more information see section <b>The Catalog Manager</b> "
+"in the online help.</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>目录管理器</b></p>\n"
+"<p>目录管理器将两个目录合并成一个文件树，然后显示这些文件夹中的所有\n"
+"PO 和 POT 文件。这样，您对新近添加或删除的模板文件就会一目了然。\n"
+"此外还显示一些关于文件的信息。\n"
+"</p>"
+"<p>详情请参阅在线帮助中的<b>“目录管理器”</b>。</p></qt>"
+
+#: catalogmanager/catalogmanagerview.cpp:473
+msgid ""
+"Error while trying to read file:\n"
+" %1\n"
+"Maybe it is not a valid file with list of markings."
+msgstr ""
+"在试图读取文件时出错：\n"
+" %1\n"
+"也许它不是带有标记列表的有效文件。"
+
+#: catalogmanager/catalogmanagerview.cpp:571
+msgid ""
+"An error occurred while trying to write to file:\n"
+"%1\n"
+msgstr ""
+"在试图写入文件时出错：\n"
+"%1\n"
+
+#: catalogmanager/catalogmanagerview.cpp:580
+msgid ""
+"An error occurred while trying to upload the file:\n"
+"%1\n"
+msgstr ""
+"在试图上传文件时出错：\n"
+"%1\n"
+
+#: catalogmanager/catalogmanagerview.cpp:664
+#: catalogmanager/catalogmanagerview.cpp:691
+msgid ""
+"The Catalog Manager is still updating information about the files.\n"
+"If you continue, it will try to update all necessary files, however this can "
+"take a long time and may lead to wrong results. Please wait until all files are "
+"updated."
+msgstr ""
+"目录管理器仍在更新关于这些文件的信息。\n"
+"如果您继续，它会试图更新所有必要的文件，然而这项操作会花很长一段时间，且可能会导致错误的结果。在所有文件都被更新前请耐心等待。"
+
+#: catalogmanager/catalogmanagerview.cpp:769
+msgid ""
+"Statistics for all:\n"
+msgstr ""
+"全部的统计：\n"
+
+#: catalogmanager/catalogmanagerview.cpp:771
+msgid ""
+"Statistics for %1:\n"
+msgstr ""
+"%1 的统计：\n"
+
+#: catalogmanager/catalogmanagerview.cpp:773
+msgid ""
+"Number of packages: %1\n"
+msgstr ""
+"软件包数量：%1\n"
+
+#: catalogmanager/catalogmanagerview.cpp:776
+msgid ""
+"Complete translated: %1 % (%2)\n"
+msgstr ""
+"全部翻译完毕：%1 % (%2)\n"
+
+#: catalogmanager/catalogmanagerview.cpp:779
+msgid ""
+"Only template available: %1 % (%2)\n"
+msgstr ""
+"只有模板的：%1 % (%2)\n"
+
+#: catalogmanager/catalogmanagerview.cpp:781
+msgid ""
+"Only PO file available: %1 % (%2)\n"
+msgstr ""
+"只有 PO 文件的：%1 % (%2)\n"
+
+#: catalogmanager/catalogmanagerview.cpp:783
+msgid ""
+"Number of messages: %1\n"
+msgstr ""
+"消息数量：%1\n"
+
+#: catalogmanager/catalogmanagerview.cpp:787
+msgid ""
+"Translated: %1 % (%2)\n"
+msgstr ""
+"已翻译：%1 % (%2)\n"
+
+#: catalogmanager/catalogmanagerview.cpp:790
+msgid ""
+"Fuzzy: %1 % (%2)\n"
+msgstr ""
+"模糊翻译：%1 % (%2)\n"
+
+#: catalogmanager/catalogmanagerview.cpp:793
+msgid ""
+"Untranslated: %1 % (%2)\n"
+msgstr ""
+"未翻译：%1 % (%2)\n"
+
+#: catalogmanager/catalogmanagerview.cpp:820
+msgid ""
+"The file is syntactically correct.\n"
+"Output of \"msgfmt --statistics\":"
+msgstr ""
+"该文件在语法上是正确的。\n"
+"“msgfmt --statistics”的输出："
+
+#: catalogmanager/catalogmanagerview.cpp:825
+msgid ""
+"The file has syntax errors.\n"
+"Output of \"msgfmt --statistics\":"
+msgstr ""
+"该文件有语法错误。\n"
+"“msgfmt --statistics”的输出："
+
+#: catalogmanager/catalogmanagerview.cpp:830
+msgid ""
+"The file has header syntax error.\n"
+"Output of \"msgfmt --statistics\":"
+msgstr ""
+"该文件的文件头有语法错误。\n"
+"“msgfmt --statistics”的输出："
+
+#: catalogmanager/catalogmanagerview.cpp:835
+msgid "An error occurred while processing \"msgfmt --statistics\""
+msgstr "当执行“msgfmt --statistics”的时候出现错误"
+
+#: catalogmanager/catalogmanagerview.cpp:840
+#: catalogmanager/catalogmanagerview.cpp:929
+#, fuzzy
+msgid ""
+"Cannot execute msgfmt. Please make sure that you have msgfmt in your PATH."
+msgstr "无法执行 msgfmt。请确定您的 PATH 中有 msgfmt 命令。"
+
+#: catalogmanager/catalogmanagerview.cpp:868
+msgid ""
+"All files in folder %1 are syntactically correct.\n"
+"Output of \"msgfmt --statistics\":\n"
+msgstr ""
+"%1 文件夹里的文件在语法上都是正确的。\n"
+"“msgfmt --statistics”的输出：\n"
+
+#: catalogmanager/catalogmanagerview.cpp:873
+msgid ""
+"All files in the base folder are syntactically correct.\n"
+"Output of \"msgfmt --statistics\":\n"
+msgstr ""
+"基准文件夹中的文件在语法上都是正确的。\n"
+"“msgfmt --statistics”的输出：\n"
+
+#: catalogmanager/catalogmanagerview.cpp:884
+msgid ""
+"At least one file in folder %1 has syntax errors.\n"
+"Output of \"msgfmt --statistics\":\n"
+msgstr ""
+"文件夹 %1 中至少一个文件有语法错误。\n"
+"“msgfmt --statistics”的输出：\n"
+
+#: catalogmanager/catalogmanagerview.cpp:889
+msgid ""
+"At least one file in the base folder has syntax errors.\n"
+"Output of \"msgfmt --statistics\":\n"
+msgstr ""
+"基准文件夹中至少一个文件有语法错误。\n"
+"“msgfmt --statistics”的输出：\n"
+
+#: catalogmanager/catalogmanagerview.cpp:900
+msgid ""
+"At least one file in folder %1 has header syntax errors.\n"
+"Output of \"msgfmt --statistics\":\n"
+msgstr ""
+"文件夹 %1 中至少一个文件头部有语法错误。\n"
+"“msgfmt --statistics”的输出：\n"
+
+#: catalogmanager/catalogmanagerview.cpp:905
+msgid ""
+"At least one file in the base folder has header syntax errors.\n"
+"Output of \"msgfmt --statistics\":\n"
+msgstr ""
+"基准文件夹中至少一个文件头部有语法错误。\n"
+"“msgfmt --statistics”的输出：\n"
+
+#: catalogmanager/catalogmanagerview.cpp:916
+#, c-format
+msgid ""
+"An error occurred while processing \"msgfmt --statistics *.po\" in folder %1"
+msgstr "在文件夹 %1 中执行“msgfmt --statistics *.po”的时候出现错误"
+
+#: catalogmanager/catalogmanagerview.cpp:921
+msgid ""
+"An error occurred while processing \"msgfmt --statistics *.po\" in the base "
+"folder"
+msgstr "在基准文件夹中执行“msgfmt --statistics *.po”的时候出现错误"
+
+#: catalogmanager/catalogmanagerview.cpp:1502
+msgid "Do you really want to delete the file %1?"
+msgstr "您真的要删除文件 %1 吗？"
+
+#: catalogmanager/catalogmanagerview.cpp:1507
+msgid "Was not able to delete the file %1!"
+msgstr "无法删除文件 %1 !"
+
+#: catalogmanager/catalogmanagerview.cpp:1766
+msgid ""
+"You have not specified a valid folder for the base folder of the PO files:\n"
+"%1\n"
+"Please check your settings in the project settings dialog."
+msgstr ""
+"您没有为 PO 文件指定一个有效的基准文件夹：\n"
+"%1\n"
+"请检查您在工程设置对话框中的设置。"
+
+#: catalogmanager/catalogmanagerview.cpp:1783
+msgid ""
+"You have not specified a valid folder for the base folder of the PO template "
+"files:\n"
+"%1\n"
+"Please check your settings in the project settings dialog."
+msgstr ""
+"您没有为 PO 模板文件指定一个有效的基准文件夹：\n"
+"%1\n"
+"请检查您在工程设置对话框中的设置。"
+
+#: catalogmanager/catalogmanagerview.cpp:1824
+msgid "Reading file information"
+msgstr "正在读取文件信息"
+
+#: catalogmanager/catalogmanagerview.cpp:3008
+msgid "Validation Options"
+msgstr "检验选项"
+
+#: catalogmanager/markpatterndialog.cpp:113
+msgid "Ma&rk files which match the following pattern:"
+msgstr "标记符合下面式样的文件(&R)："
+
+#: catalogmanager/markpatterndialog.cpp:114
+msgid "&Mark Files"
+msgstr "标记文件(&M)"
+
+#: catalogmanager/markpatterndialog.cpp:116
+msgid "Unma&rk files which match the following pattern:"
+msgstr "取消符合下面式样的文件的标记(&R)："
+
+#: catalogmanager/markpatterndialog.cpp:117
+msgid "Un&mark Files"
+msgstr "取消标记文件(&M)"
+
+#: catalogmanager/findinfilesdialog.cpp:50
+msgid "File Options"
+msgstr "文件选项"
+
+#: catalogmanager/findinfilesdialog.cpp:53
+msgid "&In all files"
+msgstr "在所有文件中(&I)"
+
+#: catalogmanager/findinfilesdialog.cpp:54
+msgid "&Marked files"
+msgstr "标记的文件(&M)"
+
+#: catalogmanager/findinfilesdialog.cpp:55
+msgid "In &templates"
+msgstr "在模板中(&T)"
+
+#: catalogmanager/findinfilesdialog.cpp:56
+msgid "Ask before ne&xt file"
+msgstr "在下一个文件前询问(&X)"
+
+#: catalogmanager/findinfilesdialog.cpp:57
+msgid "Save &without asking"
+msgstr "保存时不询问(&W)"
+
+#: catalogmanager/findinfilesdialog.cpp:59
+msgid ""
+"<qt>"
+"<p><b>File Options</b></p>"
+"<p>Here you can finetune where to find:"
+"<ul>"
+"<li><b>In all files</b>: search in all files, otherwise searched is the "
+"selected file or files in the selected folder</li>"
+"<li><b>Ask before next file</b>: show a dialog asking to proceed to the next "
+"file</li></ul></qt>"
+msgstr ""
+"<qt>"
+"<p><b>文件选项</b></p>"
+"<p>此处您可以微调要在哪里查找："
+"<ul>"
+"<li><b>在所有文件中</b>：搜索所有文件，否则将会在选中文件夹中的选定文件中搜索</li>"
+"<li><b>在下一个文件前询问</b>显示一个对话框，向您询问是否要在下一个文件中继续</li></ul></qt>"
+
+#: catalogmanager/libsvn/svnhandler.cpp:90
+msgid "No SVN repository"
+msgstr "无 SVN 仓库"
+
+#: catalogmanager/libsvn/svnhandler.cpp:93
+msgid "Not in SVN"
+msgstr "不在 SVN 中"
+
+#: catalogmanager/libsvn/svnhandler.cpp:111
+msgid "Error in Working Copy"
+msgstr "工作副本出错"
+
+#: catalogmanager/libsvn/svnhandler.cpp:288
+msgid ""
+"This is not a valid SVN repository. The SVN commands cannot be executed."
+msgstr "这不是一个有效的 SVN 仓库。无法执行 SVN 命令。"
+
+#: catalogmanager/libsvn/svndialog.cpp:65
+msgid "SVN Dialog"
+msgstr "SVN 对话框"
+
+#: catalogmanager/libsvn/svndialog.cpp:80
+msgid "Get remote status for the following files:"
+msgstr "获取以下文件的远程状态："
+
+#: catalogmanager/libsvn/svndialog.cpp:83
+msgid "Get local status for the following files:"
+msgstr "获取以下文件的本地状态："
+
+#: catalogmanager/libsvn/svndialog.cpp:89
+msgid "Get information for the following files:"
+msgstr "获取以下文件的信息："
+
+#: catalogmanager/libsvn/svndialog.cpp:145
+msgid "&Get Information"
+msgstr "获得信息(&G)"
+
+#: catalogmanager/catalogmanager.cpp:225
+msgid "&Open Template"
+msgstr "打开模板(&O)"
+
+#: catalogmanager/catalogmanager.cpp:228
+msgid "Open in &New Window"
+msgstr "在新窗口中打开(&N)"
+
+#: catalogmanager/catalogmanager.cpp:237
+msgid "Fi&nd in Files..."
+msgstr "在文件中查找(&N)..."
+
+#: catalogmanager/catalogmanager.cpp:240
+msgid "Re&place in Files..."
+msgstr "在文件中替换(&P)..."
+
+#: catalogmanager/catalogmanager.cpp:251
+msgid "&Toggle Marking"
+msgstr "切换标记(&T)"
+
+#: catalogmanager/catalogmanager.cpp:254
+msgid "Remove Marking"
+msgstr "删除标记"
+
+#: catalogmanager/catalogmanager.cpp:257
+msgid "Toggle All Markings"
+msgstr "切换所有标记"
+
+#: catalogmanager/catalogmanager.cpp:260
+msgid "Remove All Markings"
+msgstr "删除所有标记"
+
+#: catalogmanager/catalogmanager.cpp:263
+msgid "Mark Modified Files"
+msgstr "标记修改的文件"
+
+#: catalogmanager/catalogmanager.cpp:267
+msgid "&Load Markings..."
+msgstr "载入标记(&L)..."
+
+#: catalogmanager/catalogmanager.cpp:270
+msgid "&Save Markings..."
+msgstr "保存标记(&S)..."
+
+#: catalogmanager/catalogmanager.cpp:273
+msgid "&Mark Files..."
+msgstr "标记文件(&M)..."
+
+#: catalogmanager/catalogmanager.cpp:275
+msgid "&Unmark Files..."
+msgstr "取消标记文件(&N)..."
+
+#: catalogmanager/catalogmanager.cpp:309
+msgid "Next Te&mplate Only"
+msgstr "仅下一个模板(&M)"
+
+#: catalogmanager/catalogmanager.cpp:312
+msgid "Previous Temp&late Only"
+msgstr "仅上一个模板(&L)"
+
+#: catalogmanager/catalogmanager.cpp:315
+msgid "Next Tran&slation Exists"
+msgstr "下一个翻译存在(&S)"
+
+#: catalogmanager/catalogmanager.cpp:318
+msgid "Previous Transl&ation Exists"
+msgstr "上一个翻译存在(&A)"
+
+#: catalogmanager/catalogmanager.cpp:322
+msgid "Previous Marke&d"
+msgstr "上一个标记项目(&D)"
+
+#: catalogmanager/catalogmanager.cpp:325
+msgid "Next &Marked"
+msgstr "下一个标记项目(&M)"
+
+#: catalogmanager/catalogmanager.cpp:350
+msgid "&Statistics"
+msgstr "统计(&S)"
+
+#: catalogmanager/catalogmanager.cpp:353
+msgid "S&tatistics in Marked"
+msgstr "已标记项目的统计(&T)"
+
+#: catalogmanager/catalogmanager.cpp:356
+msgid "Check S&yntax"
+msgstr "检查语法(&Y)"
+
+#: catalogmanager/catalogmanager.cpp:359
+msgid "S&pell Check"
+msgstr "拼写检查(&P)"
+
+#: catalogmanager/catalogmanager.cpp:362
+msgid "Spell Check in &Marked"
+msgstr "在已标记项目中检查拼写(&M)"
+
+#: catalogmanager/catalogmanager.cpp:365
+msgid "&Rough Translation"
+msgstr "粗略翻译(&R)"
+
+#: catalogmanager/catalogmanager.cpp:368
+msgid "Rough Translation in M&arked"
+msgstr "已标记项目中的粗略翻译(&A)"
+
+#: catalogmanager/catalogmanager.cpp:371
+msgid "Mai&l"
+msgstr "邮寄(&L)"
+
+#: catalogmanager/catalogmanager.cpp:374
+msgid "Mail Mar&ked"
+msgstr "邮寄已标记项目(&K)"
+
+#: catalogmanager/catalogmanager.cpp:378
+msgid "&Pack"
+msgstr "打包(&P)"
+
+#: catalogmanager/catalogmanager.cpp:380
+msgid "Pack &Marked"
+msgstr "打包已标记项目(&M)"
+
+#: catalogmanager/catalogmanager.cpp:412
+msgid "V&alidation Marked"
+msgstr "校验已标记的(&A)"
+
+#: catalogmanager/catalogmanager.cpp:425 catalogmanager/catalogmanager.cpp:451
+msgid "Update"
+msgstr "更新"
+
+#: catalogmanager/catalogmanager.cpp:427 catalogmanager/catalogmanager.cpp:453
+msgid "Update Marked"
+msgstr "更新已标记的文件"
+
+#: catalogmanager/catalogmanager.cpp:429 catalogmanager/catalogmanager.cpp:455
+msgid "Commit"
+msgstr "提交"
+
+#: catalogmanager/catalogmanager.cpp:431 catalogmanager/catalogmanager.cpp:457
+msgid "Commit Marked"
+msgstr "提交已标记的文件"
+
+#: catalogmanager/catalogmanager.cpp:433
+msgid "Status"
+msgstr "状态"
+
+#: catalogmanager/catalogmanager.cpp:435
+msgid "Status for Marked"
+msgstr "已标记文件的状态"
+
+#: catalogmanager/catalogmanager.cpp:437 catalogmanager/catalogmanager.cpp:467
+msgid "Show Diff"
+msgstr "显示 Diff"
+
+#: catalogmanager/catalogmanager.cpp:459
+msgid "Status (Local)"
+msgstr "状态(本地)"
+
+#: catalogmanager/catalogmanager.cpp:461
+msgid "Status (Local) for Marked"
+msgstr "已标记的状态(本地)"
+
+#: catalogmanager/catalogmanager.cpp:463
+msgid "Status (Remote)"
+msgstr "状态(远程)"
+
+#: catalogmanager/catalogmanager.cpp:465
+msgid "Status (Remote) for Marked"
+msgstr "已标记的状态(远程)"
+
+#: catalogmanager/catalogmanager.cpp:469
+msgid "Show Information"
+msgstr "显示信息"
+
+#: catalogmanager/catalogmanager.cpp:471
+msgid "Show Information for Marked"
+msgstr "显示已标记的信息"
+
+#: catalogmanager/catalogmanager.cpp:488 catalogmanager/catalogmanager.cpp:503
+msgid "Update Templates"
+msgstr "更新模板"
+
+#: catalogmanager/catalogmanager.cpp:490 catalogmanager/catalogmanager.cpp:505
+msgid "Update Marked Templates"
+msgstr "更新已标记的模板"
+
+#: catalogmanager/catalogmanager.cpp:492 catalogmanager/catalogmanager.cpp:507
+msgid "Commit Templates"
+msgstr "提交模板"
+
+#: catalogmanager/catalogmanager.cpp:494 catalogmanager/catalogmanager.cpp:509
+msgid "Commit Marked Templates"
+msgstr "提交标记的模板"
+
+#: catalogmanager/catalogmanager.cpp:525 catalogmanager/catalogmanager.cpp:529
+msgid "Commands"
+msgstr "命令"
+
+#: catalogmanager/catalogmanager.cpp:558
+msgid ""
+"<qt>"
+"<p><b>Statusbar</b></p>\n"
+"<p>The statusbar displays information about progress of the current find or "
+"replace operation. The first number in <b>Found:</b> "
+"displays the number of files with an occurrence of the searched text not yet "
+"shown in the KBabel window. The second shows the total number of files "
+"containing the searched text found so far.</p></qt>"
+msgstr ""
+"<qt>"
+"<p><b>状态栏</b></p>\n"
+"<p>状态栏显示当前的查找替换操作的进度信息。<b>“找到：”</b>中的第一个数字显示包含搜索文本的但还没有在 KBabel "
+"窗口中打开的文件数量。第二个数字显示到目前为止找到的包含搜索文本的文件总数。</p></qt>"
+
+#: catalogmanager/catalogmanager.cpp:663 catalogmanager/catalogmanager.cpp:696
+#: catalogmanager/catalogmanager.cpp:727 catalogmanager/catalogmanager.cpp:757
+#: catalogmanager/catalogmanager.cpp:787 catalogmanager/catalogmanager.cpp:807
+#: catalogmanager/catalogmanager.cpp:827
+#, fuzzy
+msgid ""
+"Cannot send a message to KBabel.\n"
+"Please check your TDE installation."
+msgstr ""
+"无法向 KBabel 发送消息。\n"
+"请检查 TDE 的安装。"
+
+#: catalogmanager/catalogmanager.cpp:858
+msgid ""
+"Unable to use TDELauncher to start KBabel.\n"
+"You should check the installation of TDE.\n"
+"Please start KBabel manually."
+msgstr ""
+"无法使用 TDELauncher 来启动 KBabel。\n"
+"您应该检查 TDE 的安装。\n"
+"请手工启动 KBabel。"
+
+#: catalogmanager/catalogmanager.cpp:893
+msgid "Found: 0/0"
+msgstr "找到：0/0"
+
+#: catalogmanager/catalogmanager.cpp:915
+msgid "Found: %1/%2"
+msgstr "找到：%1/%2"
+
+#: catalogmanager/catalogmanager.cpp:986
+#: catalogmanager/catalogmanager.cpp:1073
+msgid "DCOP communication with KBabel failed."
+msgstr "与 KBabel 的 DCOP 通讯失败。"
+
+#: catalogmanager/catalogmanager.cpp:986
+#: catalogmanager/catalogmanager.cpp:1073
+msgid "DCOP Communication Error"
+msgstr "DCOP 通讯错误"
+
+#: catalogmanager/catalogmanager.cpp:1001
+#: catalogmanager/catalogmanager.cpp:1087
+msgid "KBabel cannot be started."
+msgstr "KBabel 无法被启动。"
+
+#: catalogmanager/catalogmanager.cpp:1001
+#: catalogmanager/catalogmanager.cpp:1087
+msgid "Cannot Start KBabel"
+msgstr "无法启动 KBabel"
+
+#: catalogmanager/catalogmanager.cpp:1008
+#: catalogmanager/catalogmanager.cpp:1094
+msgid "Search string not found!"
+msgstr "找不到搜索字串！"
+
+#: catalogmanager/catalogmanager.cpp:1235
+#, c-format
+msgid "Cannot open project file %1"
+msgstr "无法打开工程文件 %1"
+
+#: catalogmanager/main.cpp:186
+msgid "KBabel - Catalog Manager"
+msgstr "KBabel - 目录管理器"
+
+#: catalogmanager/main.cpp:187
+#, fuzzy
+msgid "An advanced catalog manager for KBabel"
+msgstr "一个用于 PO 文件编辑器 KBabel 的高级目录管理器"
+
+#: catalogmanager/main.cpp:211
+msgid "Support for making diffs and some minor improvements."
+msgstr "支持制作差异和某些改进。"
+
+#: catalogmanager/main.cpp:216
+msgid "KBabel contains code from GNU gettext"
+msgstr "KBabel 包含来自 GNU gettext 的代码"
+
 #~ msgid ""
 #~ "\n"
 #~ "There was also an error while reading the header.\n"
diff --git a/tde-i18n-zh_CN/messages/tdesdk/kbugbuster.po b/tde-i18n-zh_CN/messages/tdesdk/kbugbuster.po
index e6c323e1b3f..6299b05541d 100644
--- a/tde-i18n-zh_CN/messages/tdesdk/kbugbuster.po
+++ b/tde-i18n-zh_CN/messages/tdesdk/kbugbuster.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kbugbuster\n"
-"POT-Creation-Date: 2008-07-08 01:21+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2003-01-14 10:44-0500\n"
 "Last-Translator: Xiong Jiang <jxiong@offtopic.org>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -326,16 +327,16 @@ msgstr "已装入臭虫 %1"
 msgid "My Bugs"
 msgstr ""
 
-#: backend/bugserver.cpp:289
+#: backend/bugserver.cpp:290
 msgid "Mail generated by KBugBuster"
 msgstr "用 KBugBuster 生成的邮件"
 
-#: backend/bugserver.cpp:321
+#: backend/bugserver.cpp:322
 #, c-format
 msgid "Control command: %1"
 msgstr "控制命令：%1"
 
-#: backend/bugserver.cpp:323
+#: backend/bugserver.cpp:324
 #, c-format
 msgid "Mail to %1"
 msgstr "发送给 %1"
@@ -345,7 +346,8 @@ msgid "Retrieving My Bugs list..."
 msgstr ""
 
 #: backend/kbbprefs.cpp:137
-msgid "Bug Fixed in CVS"
+#, fuzzy
+msgid "Bug Fixed in GIT"
 msgstr "臭虫在 CVS 中已修正"
 
 #: backend/kbbprefs.cpp:140
@@ -357,7 +359,8 @@ msgid "Packaging Bug"
 msgstr "包装错误"
 
 #: backend/kbbprefs.cpp:149
-msgid "Feature Implemented in CVS"
+#, fuzzy
+msgid "Feature Implemented in GIT"
 msgstr "在 CVS 中已经实现的特性"
 
 #: backend/kbbprefs.cpp:152
@@ -835,15 +838,18 @@ msgid "&Recipient:"
 msgstr "收件人(&R)："
 
 #: gui/msginputdialog.cpp:63
-msgid "Normal (bugs.kde.org & Maintainer & kde-bugs-dist)"
+#, fuzzy
+msgid "Normal (bugs.trinitydesktop.org & Maintainer & tde-bugs-dist)"
 msgstr "普通 (bugs.kde.org、维护者和 kde-bugs-dist)"
 
 #: gui/msginputdialog.cpp:64
-msgid "Maintonly (bugs.kde.org & Maintainer)"
+#, fuzzy
+msgid "Maintonly (bugs.trinitydesktop.org & Maintainer)"
 msgstr "维护者 (bugs.kde.org 和维护者)"
 
 #: gui/msginputdialog.cpp:65
-msgid "Quiet (bugs.kde.org only)"
+#, fuzzy
+msgid "Quiet (bugs.trinitydesktop.org only)"
 msgstr "安静 (仅 bugs.kde.org)"
 
 #: gui/msginputdialog.cpp:77
diff --git a/tde-i18n-zh_CN/messages/tdesdk/kompare.po b/tde-i18n-zh_CN/messages/tdesdk/kompare.po
index f317e4c3887..88f0a682c06 100644
--- a/tde-i18n-zh_CN/messages/tdesdk/kompare.po
+++ b/tde-i18n-zh_CN/messages/tdesdk/kompare.po
@@ -7,15 +7,467 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kompare\n"
-"POT-Creation-Date: 2007-12-20 01:16+0100\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-12-10 11:24+0800\n"
 "Last-Translator: Levin Du <zsdjw@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "开源软件国际化简体中文组(http://i18n.linux.net.cn)"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "i18n-translation@lists.linux.net.cn"
+
+#: komparenavtreepart/komparenavtreepart.cpp:61
+msgid "Source Folder"
+msgstr "源文件夹"
+
+#: komparenavtreepart/komparenavtreepart.cpp:66
+msgid "Destination Folder"
+msgstr "目标文件夹"
+
+#: komparenavtreepart/komparenavtreepart.cpp:71
+msgid "Source File"
+msgstr "源文件"
+
+#: komparenavtreepart/komparenavtreepart.cpp:72
+msgid "Destination File"
+msgstr "目标文件"
+
+#: komparenavtreepart/komparenavtreepart.cpp:78
+msgid "Source Line"
+msgstr "源文件行"
+
+#: komparenavtreepart/komparenavtreepart.cpp:79
+msgid "Destination Line"
+msgstr "目标文件行"
+
+#: komparenavtreepart/komparenavtreepart.cpp:80
+msgid "Difference"
+msgstr "差异"
+
+#: komparenavtreepart/komparenavtreepart.cpp:426
+#, c-format
+msgid ""
+"_n: Applied: Changes made to %n line undone\n"
+"Applied: Changes made to  %n lines undone"
+msgstr "应用结果：未完成 %n 行的修改"
+
+#: komparenavtreepart/komparenavtreepart.cpp:429
+#, c-format
+msgid ""
+"_n: Changed %n line\n"
+"Changed %n lines"
+msgstr "修改了 %n 行"
+
+#: komparenavtreepart/komparenavtreepart.cpp:434
+#, c-format
+msgid ""
+"_n: Applied: Insertion of %n line undone\n"
+"Applied: Insertion of %n lines undone"
+msgstr "应用结果：未完成 %n 行的插入"
+
+#: komparenavtreepart/komparenavtreepart.cpp:437
+#, c-format
+msgid ""
+"_n: Inserted %n line\n"
+"Inserted %n lines"
+msgstr "插入了 %n 行"
+
+#: komparenavtreepart/komparenavtreepart.cpp:442
+#, c-format
+msgid ""
+"_n: Applied: Deletion of %n line undone\n"
+"Applied: Deletion of %n lines undone"
+msgstr "应用结果：未完成 %n 行的删除"
+
+#: komparenavtreepart/komparenavtreepart.cpp:445
+#, c-format
+msgid ""
+"_n: Deleted %n line\n"
+"Deleted %n lines"
+msgstr "删除了 %n 行"
+
+#: komparenavtreepart/komparenavtreepart.cpp:531
+#: komparepart/kompare_part.cpp:651
+msgid "Unknown"
+msgstr "未知"
+
+#: komparenavtreepart/komparenavtreepart.cpp:694
+msgid "KompareNavTreePart"
+msgstr "KompareNavTreePart"
+
+#: libdiff2/komparemodellist.cpp:61
+msgid "&Apply Difference"
+msgstr "应用差异(&A)"
+
+#: libdiff2/komparemodellist.cpp:64
+msgid "Un&apply Difference"
+msgstr "不应用差异(&A)"
+
+#: libdiff2/komparemodellist.cpp:67
+msgid "App&ly All"
+msgstr "全部应用(&L)"
+
+#: libdiff2/komparemodellist.cpp:70
+msgid "&Unapply All"
+msgstr "全部不应用(&U)"
+
+#: libdiff2/komparemodellist.cpp:73
+msgid "P&revious File"
+msgstr "上一个文件(&R)"
+
+#: libdiff2/komparemodellist.cpp:76
+msgid "N&ext File"
+msgstr "下一个文件(&E)"
+
+#: libdiff2/komparemodellist.cpp:79
+msgid "&Previous Difference"
+msgstr "上一处差异(&P)"
+
+#: libdiff2/komparemodellist.cpp:82
+msgid "&Next Difference"
+msgstr "下一处差异(&N)"
+
+#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262
+msgid ""
+"<qt>No models or no differences, this file: <b>%1</b>"
+", is not a valid diff file.</qt>"
+msgstr "<qt>没有模型(model)或比较结果，此文件：<b>%1</b>不是合法的 diff 文件。</qt>"
+
+#: libdiff2/komparemodellist.cpp:246
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>"
+msgstr "<qt>应用 diff 结果<b>%1</b>到文件<b>%2</b>时出现问题。</qt>"
+
+#: libdiff2/komparemodellist.cpp:271
+msgid ""
+"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>"
+".</qt>"
+msgstr "<qt>应用 diff 结果<b>%1</b>到文件夹<b>%2</b>时出现问题。</qt>"
+
+#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
+msgid "Could not open a temporary file."
+msgstr "无法打开临时文件。"
+
+#: libdiff2/komparemodellist.cpp:350
+msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
+msgstr "<qt>无法写入临时文件<b>%1</b>，将删除该文件。</qt>"
+
+#: libdiff2/komparemodellist.cpp:368
+msgid ""
+"<qt>Could not create destination directory <b>%1</b>.\n"
+"The file has not been saved.</qt>"
+msgstr ""
+"<qt>无法创建目标目录 <b>%1</b>。\n"
+"文件未保存。</qt>"
+
+#: libdiff2/komparemodellist.cpp:383
+msgid ""
+"<qt>Could not upload the temporary file to the destination location <b>%1</b>"
+". The temporary file is still available under: <b>%2</b>"
+". You can manually copy it to the right place.</qt>"
+msgstr "<qt>无法上传临时文件到目标位置<b>%1</b>。在<b>%2</b>下的临时文件仍然可用，可以手工复制到正确的地方。</qt>"
+
+#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
+msgid "Could not parse diff output."
+msgstr "无法分析 diff 输出。"
+
+#: libdiff2/komparemodellist.cpp:451
+msgid "The files are identical."
+msgstr "文件是相同的。"
+
+#: libdiff2/komparemodellist.cpp:613
+msgid "Could not write to the temporary file."
+msgstr "无法写入临时文件。"
+
+#: kompare_shell.cpp:77
+msgid "Could not find our KompareViewPart."
+msgstr "找不到部件 KompareViewPart。"
+
+#: kompare_shell.cpp:106
+msgid "Could not load our KompareViewPart."
+msgstr "无法加载部件 KompareViewPart。"
+
+#: kompare_shell.cpp:114
+msgid "Could not find our KompareNavigationPart."
+msgstr "找不到部件 KompareNavigationPart。"
+
+#: kompare_shell.cpp:138
+msgid "Could not load our KompareNavigationPart."
+msgstr "无法加载部件 KompareNavigationPart。"
+
+#: kompare_shell.cpp:233
+msgid "&Open Diff..."
+msgstr "打开 diff 文件(&O)..."
+
+#: kompare_shell.cpp:234
+msgid "&Compare Files..."
+msgstr "比较文件(&C)..."
+
+#: kompare_shell.cpp:237
+msgid "&Blend URL with Diff..."
+msgstr "合并 diff 到 URL(&B)..."
+
+#: kompare_shell.cpp:246
+msgid "Show T&ext View"
+msgstr "显示文本视图(&E)"
+
+#: kompare_shell.cpp:248
+msgid "Hide T&ext View"
+msgstr "隐藏文本视图(&E)"
+
+#: kompare_shell.cpp:257
+msgid " 0 of 0 differences "
+msgstr "无差异"
+
+#: kompare_shell.cpp:258
+msgid " 0 of 0 files "
+msgstr "无文件"
+
+#: kompare_shell.cpp:273
+msgid ""
+"_n:  %1 of %n file \n"
+" %1 of %n files "
+msgstr " 第 %1 / %n 个文件"
+
+#: kompare_shell.cpp:275
+#, c-format
+msgid ""
+"_n:  %n file \n"
+" %n files "
+msgstr " %n 个文件 "
+
+#: kompare_shell.cpp:278
+msgid ""
+"_n:  %1 of %n difference, %2 applied \n"
+" %1 of %n differences, %2 applied "
+msgstr " 第 %1 / %n 个差异，己应用 %2 个"
+
+#: kompare_shell.cpp:281
+#, c-format
+msgid ""
+"_n:  %n difference \n"
+" %n differences "
+msgstr " %n 个差异 "
+
+#: kompare_shell.cpp:369
+msgid "Blend File/Folder with diff Output"
+msgstr "合并 diff 输出到文件/文件夹"
+
+#: kompare_shell.cpp:370
+msgid "File/Folder"
+msgstr "文件/文件夹"
+
+#: kompare_shell.cpp:371
+msgid "Diff Output"
+msgstr "Diff 输出"
+
+#: kompare_shell.cpp:373
+msgid "Blend"
+msgstr "合并"
+
+#: kompare_shell.cpp:373
+msgid "Blend this file or folder with the diff output"
+msgstr "合并 diff 输出到此文件或文件夹"
+
+#: kompare_shell.cpp:373
+msgid ""
+"If you have entered a file or folder name and a file that contains diff output "
+"in the fields in this dialog then this button will be enabled and pressing it "
+"will open kompare's main view where the output of the entered file or files "
+"from the folder are mixed with the diff output so you can then apply the "
+"difference(s) to a file or to the files. "
+msgstr ""
+"如果您在此对话框中输入了文件或文件夹名称，以及包含 diff 输出的文件，则此按钮可以使用。单击此按钮后，将打开 kompare "
+"的主视图，输入的文件或文件夹中的文件将会与 diff 输出混合，这样您就可以将差异应用到文件了。"
+
+#: kompare_shell.cpp:398 main.cpp:185
+msgid "Compare Files or Folders"
+msgstr "比较文件或文件夹"
+
+#: kompare_shell.cpp:399 main.cpp:186
+msgid "Source"
+msgstr "源文件"
+
+#: kompare_shell.cpp:400 main.cpp:187
+msgid "Destination"
+msgstr "目标文件"
+
+#: kompare_shell.cpp:402 main.cpp:189
+msgid "Compare"
+msgstr "比较"
+
+#: kompare_shell.cpp:402
+msgid "Compare these files or folders"
+msgstr "比较这些文件或文件夹"
+
+#: kompare_shell.cpp:402 main.cpp:189
+msgid ""
+"If you have entered 2 filenames or 2 folders in the fields in this dialog then "
+"this button will be enabled and pressing it will start a comparison of the "
+"entered files or folders. "
+msgstr ""
+"在对话框的字段中输入了两个文件名或文件夹名，此按钮才可用，\n"
+"按下它，将开始比较所输入的文件或文件夹。"
+
+#: kompare_shell.cpp:439
+msgid "Text View"
+msgstr "文本视图"
+
+#: kompareurldialog.cpp:41
+msgid "Here you can enter the files you want to compare."
+msgstr "您可以在此输入您想要比较的文件。"
+
+#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
+msgid "Diff"
+msgstr "Diff"
+
+#: kompareurldialog.cpp:47
+msgid "Here you can change the options for comparing the files."
+msgstr "您可以在此更改要比较文件的选项。"
+
+#: kompareurldialog.cpp:53
+msgid "Here you can change the options for the view."
+msgstr "您可以在此更改视图选项。"
+
+#. i18n: file komparepart/komparepartui.rc line 13
+#: rc.cpp:15
+#, no-c-format
+msgid "&Difference"
+msgstr "差异(&D)"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 41
+#: rc.cpp:21
+#, no-c-format
+msgid "Run Diff In"
+msgstr "运行 diff 在"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 84
+#: rc.cpp:24
+#, no-c-format
+msgid "Command Line"
+msgstr "命令行"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 108
+#: rc.cpp:27
+#, no-c-format
+msgid "cd dir && diff -udHprNa -- source destination"
+msgstr "cd 目录 && diff -udHprNa -- 源 目标"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 135
+#: rc.cpp:33
+#, no-c-format
+msgid "Look for smaller changes"
+msgstr "查找较小的改动"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 146
+#: rc.cpp:36
+#, no-c-format
+msgid "Optimize for large files"
+msgstr "优化大文件"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 157
+#: rc.cpp:39
+#, no-c-format
+msgid "Ignore changes in case"
+msgstr "忽略大小写的变化"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 165
+#: rc.cpp:42
+#, no-c-format
+msgid "Expand tabs to spaces"
+msgstr "将制表符扩展成空格"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 173
+#: rc.cpp:45
+#, no-c-format
+msgid "Ignore added or removed empty lines"
+msgstr "忽略新增或删除的空行"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 181
+#: rc.cpp:48
+#, no-c-format
+msgid "Ignore changes in whitespace"
+msgstr "忽略空白的变化"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 189
+#: rc.cpp:51
+#, no-c-format
+msgid "Show function names"
+msgstr "显示函数名称"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 200
+#: rc.cpp:54
+#, no-c-format
+msgid "Compare folders recursively"
+msgstr "递归比较文件夹"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 211
+#: rc.cpp:57
+#, no-c-format
+msgid "Treat new files as empty"
+msgstr "新文件作为空文件处理"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 227
+#: rc.cpp:60
+#, no-c-format
+msgid "Format"
+msgstr "格式"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 244
+#: komparepart/kompare_part.cpp:638 libdialogpages/diffpage.cpp:238 rc.cpp:63
+#, no-c-format
+msgid "Context"
+msgstr "上下文"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 252
+#: komparepart/kompare_part.cpp:644 libdialogpages/diffpage.cpp:239 rc.cpp:66
+#, no-c-format
+msgid "Ed"
+msgstr "Ed"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 260
+#: komparepart/kompare_part.cpp:647 libdialogpages/diffpage.cpp:241 rc.cpp:69
+#, no-c-format
+msgid "Normal"
+msgstr "正常"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 268
+#: komparepart/kompare_part.cpp:641 libdialogpages/diffpage.cpp:242 rc.cpp:72
+#, no-c-format
+msgid "RCS"
+msgstr "RCS"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 276
+#: komparepart/kompare_part.cpp:635 libdialogpages/diffpage.cpp:244 rc.cpp:75
+#, no-c-format
+msgid "Unified"
+msgstr "统一"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 287
+#: rc.cpp:78
+#, no-c-format
+msgid "Side-by-side"
+msgstr "并排"
+
+#. i18n: file komparepart/komparesaveoptionsbase.ui line 312
+#: libdialogpages/diffpage.cpp:251 rc.cpp:81
+#, no-c-format
+msgid "Number of context lines:"
+msgstr "上下文行数："
+
 #: komparepart/kompareprefdlg.cpp:33
 msgid "Preferences"
 msgstr "首选项"
@@ -24,10 +476,6 @@ msgstr "首选项"
 msgid "View Settings"
 msgstr "查看设置"
 
-#: komparepart/kompareprefdlg.cpp:43 kompareurldialog.cpp:47
-msgid "Diff"
-msgstr "Diff"
-
 #: komparepart/kompareprefdlg.cpp:43
 msgid "Diff Settings"
 msgstr "Diff 设置"
@@ -129,41 +577,6 @@ msgstr ""
 msgid "Save Changes?"
 msgstr "保存修改？"
 
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 276
-#: komparepart/kompare_part.cpp:635 libdialogpages/diffpage.cpp:244 rc.cpp:75
-#, no-c-format
-msgid "Unified"
-msgstr "统一"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 244
-#: komparepart/kompare_part.cpp:638 libdialogpages/diffpage.cpp:238 rc.cpp:63
-#, no-c-format
-msgid "Context"
-msgstr "上下文"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 268
-#: komparepart/kompare_part.cpp:641 libdialogpages/diffpage.cpp:242 rc.cpp:72
-#, no-c-format
-msgid "RCS"
-msgstr "RCS"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 252
-#: komparepart/kompare_part.cpp:644 libdialogpages/diffpage.cpp:239 rc.cpp:66
-#, no-c-format
-msgid "Ed"
-msgstr "Ed"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 260
-#: komparepart/kompare_part.cpp:647 libdialogpages/diffpage.cpp:241 rc.cpp:69
-#, no-c-format
-msgid "Normal"
-msgstr "正常"
-
-#: komparenavtreepart/komparenavtreepart.cpp:531
-#: komparepart/kompare_part.cpp:651
-msgid "Unknown"
-msgstr "未知"
-
 #: komparepart/kompare_part.cpp:667
 msgid ""
 "No diff file, or no 2 files have been diffed. Therefore no stats are available."
@@ -218,6 +631,14 @@ msgstr ""
 "相同个数：%5\n"
 "差异个数：%6"
 
+#: libdialogpages/filespage.cpp:53
+msgid "Encoding"
+msgstr "编码"
+
+#: libdialogpages/filespage.cpp:64
+msgid "&Files"
+msgstr "文件(&F)"
+
 #: libdialogpages/viewpage.cpp:51
 msgid "Colors"
 msgstr "颜色"
@@ -301,12 +722,6 @@ msgstr "选择 diff 产生结果的格式。统一(unified)是种经常使用的
 msgid "Lines of Context"
 msgstr "上下文行数"
 
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 312
-#: libdialogpages/diffpage.cpp:251 rc.cpp:81
-#, no-c-format
-msgid "Number of context lines:"
-msgstr "上下文行数："
-
 #: libdialogpages/diffpage.cpp:253
 msgid ""
 "The number of context lines is normally 2 or 3. This makes the diff readable "
@@ -461,26 +876,6 @@ msgstr "任何在弹出的对话框中点击选择的文件将会放入此按钮
 msgid "&Exclude"
 msgstr "排除(&E)"
 
-#: libdialogpages/filespage.cpp:53
-msgid "Encoding"
-msgstr "编码"
-
-#: libdialogpages/filespage.cpp:64
-msgid "&Files"
-msgstr "文件(&F)"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "开源软件国际化简体中文组(http://i18n.linux.net.cn)"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "i18n-translation@lists.linux.net.cn"
-
 #: main.cpp:33
 msgid ""
 "A program to view the differences between files and optionally generate a diff"
@@ -543,400 +938,6 @@ msgstr "许多好建议"
 msgid "Cervisia diff viewer"
 msgstr "Cervisia diff 查看器"
 
-#: kompare_shell.cpp:397 main.cpp:185
-msgid "Compare Files or Folders"
-msgstr "比较文件或文件夹"
-
-#: kompare_shell.cpp:398 main.cpp:186
-msgid "Source"
-msgstr "源文件"
-
-#: kompare_shell.cpp:399 main.cpp:187
-msgid "Destination"
-msgstr "目标文件"
-
-#: kompare_shell.cpp:401 main.cpp:189
-msgid "Compare"
-msgstr "比较"
-
 #: main.cpp:189
 msgid "Compare these files or folder"
 msgstr "比较这些文件或文件夹"
-
-#: kompare_shell.cpp:401 main.cpp:189
-msgid ""
-"If you have entered 2 filenames or 2 folders in the fields in this dialog then "
-"this button will be enabled and pressing it will start a comparison of the "
-"entered files or folders. "
-msgstr ""
-"在对话框的字段中输入了两个文件名或文件夹名，此按钮才可用，\n"
-"按下它，将开始比较所输入的文件或文件夹。"
-
-#: kompareurldialog.cpp:41
-msgid "Here you can enter the files you want to compare."
-msgstr "您可以在此输入您想要比较的文件。"
-
-#: kompareurldialog.cpp:47
-msgid "Here you can change the options for comparing the files."
-msgstr "您可以在此更改要比较文件的选项。"
-
-#: kompareurldialog.cpp:53
-msgid "Here you can change the options for the view."
-msgstr "您可以在此更改视图选项。"
-
-#: komparenavtreepart/komparenavtreepart.cpp:61
-msgid "Source Folder"
-msgstr "源文件夹"
-
-#: komparenavtreepart/komparenavtreepart.cpp:66
-msgid "Destination Folder"
-msgstr "目标文件夹"
-
-#: komparenavtreepart/komparenavtreepart.cpp:71
-msgid "Source File"
-msgstr "源文件"
-
-#: komparenavtreepart/komparenavtreepart.cpp:72
-msgid "Destination File"
-msgstr "目标文件"
-
-#: komparenavtreepart/komparenavtreepart.cpp:78
-msgid "Source Line"
-msgstr "源文件行"
-
-#: komparenavtreepart/komparenavtreepart.cpp:79
-msgid "Destination Line"
-msgstr "目标文件行"
-
-#: komparenavtreepart/komparenavtreepart.cpp:80
-msgid "Difference"
-msgstr "差异"
-
-#: komparenavtreepart/komparenavtreepart.cpp:426
-#, c-format
-msgid ""
-"_n: Applied: Changes made to %n line undone\n"
-"Applied: Changes made to  %n lines undone"
-msgstr "应用结果：未完成 %n 行的修改"
-
-#: komparenavtreepart/komparenavtreepart.cpp:429
-#, c-format
-msgid ""
-"_n: Changed %n line\n"
-"Changed %n lines"
-msgstr "修改了 %n 行"
-
-#: komparenavtreepart/komparenavtreepart.cpp:434
-#, c-format
-msgid ""
-"_n: Applied: Insertion of %n line undone\n"
-"Applied: Insertion of %n lines undone"
-msgstr "应用结果：未完成 %n 行的插入"
-
-#: komparenavtreepart/komparenavtreepart.cpp:437
-#, c-format
-msgid ""
-"_n: Inserted %n line\n"
-"Inserted %n lines"
-msgstr "插入了 %n 行"
-
-#: komparenavtreepart/komparenavtreepart.cpp:442
-#, c-format
-msgid ""
-"_n: Applied: Deletion of %n line undone\n"
-"Applied: Deletion of %n lines undone"
-msgstr "应用结果：未完成 %n 行的删除"
-
-#: komparenavtreepart/komparenavtreepart.cpp:445
-#, c-format
-msgid ""
-"_n: Deleted %n line\n"
-"Deleted %n lines"
-msgstr "删除了 %n 行"
-
-#: komparenavtreepart/komparenavtreepart.cpp:694
-msgid "KompareNavTreePart"
-msgstr "KompareNavTreePart"
-
-#. i18n: file komparepart/komparepartui.rc line 13
-#: rc.cpp:15
-#, no-c-format
-msgid "&Difference"
-msgstr "差异(&D)"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 41
-#: rc.cpp:21
-#, no-c-format
-msgid "Run Diff In"
-msgstr "运行 diff 在"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 84
-#: rc.cpp:24
-#, no-c-format
-msgid "Command Line"
-msgstr "命令行"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 108
-#: rc.cpp:27
-#, no-c-format
-msgid "cd dir && diff -udHprNa -- source destination"
-msgstr "cd 目录 && diff -udHprNa -- 源 目标"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 135
-#: rc.cpp:33
-#, no-c-format
-msgid "Look for smaller changes"
-msgstr "查找较小的改动"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 146
-#: rc.cpp:36
-#, no-c-format
-msgid "Optimize for large files"
-msgstr "优化大文件"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 157
-#: rc.cpp:39
-#, no-c-format
-msgid "Ignore changes in case"
-msgstr "忽略大小写的变化"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 165
-#: rc.cpp:42
-#, no-c-format
-msgid "Expand tabs to spaces"
-msgstr "将制表符扩展成空格"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 173
-#: rc.cpp:45
-#, no-c-format
-msgid "Ignore added or removed empty lines"
-msgstr "忽略新增或删除的空行"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 181
-#: rc.cpp:48
-#, no-c-format
-msgid "Ignore changes in whitespace"
-msgstr "忽略空白的变化"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 189
-#: rc.cpp:51
-#, no-c-format
-msgid "Show function names"
-msgstr "显示函数名称"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 200
-#: rc.cpp:54
-#, no-c-format
-msgid "Compare folders recursively"
-msgstr "递归比较文件夹"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 211
-#: rc.cpp:57
-#, no-c-format
-msgid "Treat new files as empty"
-msgstr "新文件作为空文件处理"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 227
-#: rc.cpp:60
-#, no-c-format
-msgid "Format"
-msgstr "格式"
-
-#. i18n: file komparepart/komparesaveoptionsbase.ui line 287
-#: rc.cpp:78
-#, no-c-format
-msgid "Side-by-side"
-msgstr "并排"
-
-#: kompare_shell.cpp:77
-msgid "Could not find our KompareViewPart."
-msgstr "找不到部件 KompareViewPart。"
-
-#: kompare_shell.cpp:106
-msgid "Could not load our KompareViewPart."
-msgstr "无法加载部件 KompareViewPart。"
-
-#: kompare_shell.cpp:114
-msgid "Could not find our KompareNavigationPart."
-msgstr "找不到部件 KompareNavigationPart。"
-
-#: kompare_shell.cpp:138
-msgid "Could not load our KompareNavigationPart."
-msgstr "无法加载部件 KompareNavigationPart。"
-
-#: kompare_shell.cpp:232
-msgid "&Open Diff..."
-msgstr "打开 diff 文件(&O)..."
-
-#: kompare_shell.cpp:233
-msgid "&Compare Files..."
-msgstr "比较文件(&C)..."
-
-#: kompare_shell.cpp:236
-msgid "&Blend URL with Diff..."
-msgstr "合并 diff 到 URL(&B)..."
-
-#: kompare_shell.cpp:245
-msgid "Show T&ext View"
-msgstr "显示文本视图(&E)"
-
-#: kompare_shell.cpp:247
-msgid "Hide T&ext View"
-msgstr "隐藏文本视图(&E)"
-
-#: kompare_shell.cpp:256
-msgid " 0 of 0 differences "
-msgstr "无差异"
-
-#: kompare_shell.cpp:257
-msgid " 0 of 0 files "
-msgstr "无文件"
-
-#: kompare_shell.cpp:272
-msgid ""
-"_n:  %1 of %n file \n"
-" %1 of %n files "
-msgstr " 第 %1 / %n 个文件"
-
-#: kompare_shell.cpp:274
-#, c-format
-msgid ""
-"_n:  %n file \n"
-" %n files "
-msgstr " %n 个文件 "
-
-#: kompare_shell.cpp:277
-msgid ""
-"_n:  %1 of %n difference, %2 applied \n"
-" %1 of %n differences, %2 applied "
-msgstr " 第 %1 / %n 个差异，己应用 %2 个"
-
-#: kompare_shell.cpp:280
-#, c-format
-msgid ""
-"_n:  %n difference \n"
-" %n differences "
-msgstr " %n 个差异 "
-
-#: kompare_shell.cpp:368
-msgid "Blend File/Folder with diff Output"
-msgstr "合并 diff 输出到文件/文件夹"
-
-#: kompare_shell.cpp:369
-msgid "File/Folder"
-msgstr "文件/文件夹"
-
-#: kompare_shell.cpp:370
-msgid "Diff Output"
-msgstr "Diff 输出"
-
-#: kompare_shell.cpp:372
-msgid "Blend"
-msgstr "合并"
-
-#: kompare_shell.cpp:372
-msgid "Blend this file or folder with the diff output"
-msgstr "合并 diff 输出到此文件或文件夹"
-
-#: kompare_shell.cpp:372
-msgid ""
-"If you have entered a file or folder name and a file that contains diff output "
-"in the fields in this dialog then this button will be enabled and pressing it "
-"will open kompare's main view where the output of the entered file or files "
-"from the folder are mixed with the diff output so you can then apply the "
-"difference(s) to a file or to the files. "
-msgstr ""
-"如果您在此对话框中输入了文件或文件夹名称，以及包含 diff 输出的文件，则此按钮可以使用。单击此按钮后，将打开 kompare "
-"的主视图，输入的文件或文件夹中的文件将会与 diff 输出混合，这样您就可以将差异应用到文件了。"
-
-#: kompare_shell.cpp:401
-msgid "Compare these files or folders"
-msgstr "比较这些文件或文件夹"
-
-#: kompare_shell.cpp:439
-msgid "Text View"
-msgstr "文本视图"
-
-#: libdiff2/komparemodellist.cpp:61
-msgid "&Apply Difference"
-msgstr "应用差异(&A)"
-
-#: libdiff2/komparemodellist.cpp:64
-msgid "Un&apply Difference"
-msgstr "不应用差异(&A)"
-
-#: libdiff2/komparemodellist.cpp:67
-msgid "App&ly All"
-msgstr "全部应用(&L)"
-
-#: libdiff2/komparemodellist.cpp:70
-msgid "&Unapply All"
-msgstr "全部不应用(&U)"
-
-#: libdiff2/komparemodellist.cpp:73
-msgid "P&revious File"
-msgstr "上一个文件(&R)"
-
-#: libdiff2/komparemodellist.cpp:76
-msgid "N&ext File"
-msgstr "下一个文件(&E)"
-
-#: libdiff2/komparemodellist.cpp:79
-msgid "&Previous Difference"
-msgstr "上一处差异(&P)"
-
-#: libdiff2/komparemodellist.cpp:82
-msgid "&Next Difference"
-msgstr "下一处差异(&N)"
-
-#: libdiff2/komparemodellist.cpp:238 libdiff2/komparemodellist.cpp:262
-msgid ""
-"<qt>No models or no differences, this file: <b>%1</b>"
-", is not a valid diff file.</qt>"
-msgstr "<qt>没有模型(model)或比较结果，此文件：<b>%1</b>不是合法的 diff 文件。</qt>"
-
-#: libdiff2/komparemodellist.cpp:246
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>"
-msgstr "<qt>应用 diff 结果<b>%1</b>到文件<b>%2</b>时出现问题。</qt>"
-
-#: libdiff2/komparemodellist.cpp:271
-msgid ""
-"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>"
-".</qt>"
-msgstr "<qt>应用 diff 结果<b>%1</b>到文件夹<b>%2</b>时出现问题。</qt>"
-
-#: libdiff2/komparemodellist.cpp:299 libdiff2/komparemodellist.cpp:582
-msgid "Could not open a temporary file."
-msgstr "无法打开临时文件。"
-
-#: libdiff2/komparemodellist.cpp:350
-msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
-msgstr "<qt>无法写入临时文件<b>%1</b>，将删除该文件。</qt>"
-
-#: libdiff2/komparemodellist.cpp:368
-msgid ""
-"<qt>Could not create destination directory <b>%1</b>.\n"
-"The file has not been saved.</qt>"
-msgstr ""
-"<qt>无法创建目标目录 <b>%1</b>。\n"
-"文件未保存。</qt>"
-
-#: libdiff2/komparemodellist.cpp:383
-msgid ""
-"<qt>Could not upload the temporary file to the destination location <b>%1</b>"
-". The temporary file is still available under: <b>%2</b>"
-". You can manually copy it to the right place.</qt>"
-msgstr "<qt>无法上传临时文件到目标位置<b>%1</b>。在<b>%2</b>下的临时文件仍然可用，可以手工复制到正确的地方。</qt>"
-
-#: libdiff2/komparemodellist.cpp:435 libdiff2/komparemodellist.cpp:548
-msgid "Could not parse diff output."
-msgstr "无法分析 diff 输出。"
-
-#: libdiff2/komparemodellist.cpp:451
-msgid "The files are identical."
-msgstr "文件是相同的。"
-
-#: libdiff2/komparemodellist.cpp:613
-msgid "Could not write to the temporary file."
-msgstr "无法写入临时文件。"
diff --git a/tde-i18n-zh_CN/messages/tdesdk/kres_bugzilla.po b/tde-i18n-zh_CN/messages/tdesdk/kres_bugzilla.po
index b942bd43892..ab902224bc7 100644
--- a/tde-i18n-zh_CN/messages/tdesdk/kres_bugzilla.po
+++ b/tde-i18n-zh_CN/messages/tdesdk/kres_bugzilla.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kres_bugzilla\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-02-04 02:36+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdesdk/kstartperf.po b/tde-i18n-zh_CN/messages/tdesdk/kstartperf.po
index 64a62ec2d5e..1c9939ef656 100644
--- a/tde-i18n-zh_CN/messages/tdesdk/kstartperf.po
+++ b/tde-i18n-zh_CN/messages/tdesdk/kstartperf.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kstartperf\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2001-08-13 16:40GMT+08\n"
 "Last-Translator: Mai Hao Hui <mhh@126.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdesdk/kuiviewer.po b/tde-i18n-zh_CN/messages/tdesdk/kuiviewer.po
index 9cb8cdc1ea2..f5cc9ce7f0b 100644
--- a/tde-i18n-zh_CN/messages/tdesdk/kuiviewer.po
+++ b/tde-i18n-zh_CN/messages/tdesdk/kuiviewer.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kuiviewer\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-03-22 10:03+0800\n"
 "Last-Translator: Hu Gang <hugangmail@eastday.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdesdk/spy.po b/tde-i18n-zh_CN/messages/tdesdk/spy.po
index 36be3cc36bb..1bb39ba42c6 100644
--- a/tde-i18n-zh_CN/messages/tdesdk/spy.po
+++ b/tde-i18n-zh_CN/messages/tdesdk/spy.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: spy\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-02-12 21:40+0800\n"
 "Last-Translator: HuGang <hugangmail@eastday.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -26,14 +27,6 @@ msgstr "类型"
 msgid "Member Name"
 msgstr "成员名"
 
-#: classinfoview.cpp:30 navview.cpp:28 propsview.cpp:53
-msgid "Name"
-msgstr "名字"
-
-#: classinfoview.cpp:31 propsview.cpp:54
-msgid "Value"
-msgstr "值"
-
 #: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -46,10 +39,6 @@ msgid ""
 "Your emails"
 msgstr "mhh@126.comhugangmail@eastday.com"
 
-#: main.cpp:25 main.cpp:38
-msgid "Spy"
-msgstr "间谍"
-
 #: spy.cpp:67
 msgid "Signals && Slots"
 msgstr "信号和插口"
@@ -62,6 +51,14 @@ msgstr "接收者"
 msgid "Class Info"
 msgstr "类信息"
 
+#: classinfoview.cpp:30 navview.cpp:28 propsview.cpp:53
+msgid "Name"
+msgstr "名字"
+
+#: classinfoview.cpp:31 propsview.cpp:54
+msgid "Value"
+msgstr "值"
+
 #: propsview.cpp:56
 msgid "Access"
 msgstr "访问"
@@ -74,6 +71,10 @@ msgstr "可设计的"
 msgid "Type Flags"
 msgstr "类型标志"
 
+#: main.cpp:25 main.cpp:38
+msgid "Spy"
+msgstr "间谍"
+
 #: sigslotview.cpp:30
 msgid "Signals/Slots"
 msgstr "信号/插口"
diff --git a/tde-i18n-zh_CN/messages/tdesdk/tdefile_cpp.po b/tde-i18n-zh_CN/messages/tdesdk/tdefile_cpp.po
index 7c0080a981b..cafe8a9a7e4 100644
--- a/tde-i18n-zh_CN/messages/tdesdk/tdefile_cpp.po
+++ b/tde-i18n-zh_CN/messages/tdesdk/tdefile_cpp.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_cpp\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2002-10-29 12:50+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdesdk/tdefile_diff.po b/tde-i18n-zh_CN/messages/tdesdk/tdefile_diff.po
index 51fd75601bd..bd5dc930229 100644
--- a/tde-i18n-zh_CN/messages/tdesdk/tdefile_diff.po
+++ b/tde-i18n-zh_CN/messages/tdesdk/tdefile_diff.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_diff\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2004-04-17 16:58+0800\n"
 "Last-Translator: Levin Du <zsdjw@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdesdk/tdefile_po.po b/tde-i18n-zh_CN/messages/tdesdk/tdefile_po.po
index ae0378eb40f..a64ac722ce9 100644
--- a/tde-i18n-zh_CN/messages/tdesdk/tdefile_po.po
+++ b/tde-i18n-zh_CN/messages/tdesdk/tdefile_po.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_po\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2002-10-29 12:52+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdesdk/tdefile_ts.po b/tde-i18n-zh_CN/messages/tdesdk/tdefile_ts.po
index 259ecb9cc08..d0064dd3f43 100644
--- a/tde-i18n-zh_CN/messages/tdesdk/tdefile_ts.po
+++ b/tde-i18n-zh_CN/messages/tdesdk/tdefile_ts.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdefile_ts\n"
-"POT-Creation-Date: 2005-05-18 21:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2003-01-14 14:42-0500\n"
 "Last-Translator: Xiong Jiang <jxiong@offtopic.org>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdesdk/tdeio_svn.po b/tde-i18n-zh_CN/messages/tdesdk/tdeio_svn.po
index 91566a9039a..330c01e61e5 100644
--- a/tde-i18n-zh_CN/messages/tdesdk/tdeio_svn.po
+++ b/tde-i18n-zh_CN/messages/tdesdk/tdeio_svn.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_svn\n"
-"POT-Creation-Date: 2006-02-18 03:52+0100\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-02-04 02:36+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdesdk/umbrello.po b/tde-i18n-zh_CN/messages/tdesdk/umbrello.po
index d018b7be50a..c8e9bee471a 100644
--- a/tde-i18n-zh_CN/messages/tdesdk/umbrello.po
+++ b/tde-i18n-zh_CN/messages/tdesdk/umbrello.po
@@ -3,15 +3,1025 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: umbrello\n"
-"POT-Creation-Date: 2008-07-08 01:21+0200\n"
+"POT-Creation-Date: 2014-09-29 00:48-0500\n"
 "PO-Revision-Date: 2005-12-10 11:21+0800\n"
 "Last-Translator: Levin Du <zsdjw@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 36
+#: dialogs/activitydialog.cpp:90 dialogs/assocgenpage.cpp:56
+#: dialogs/assocrolepage.cpp:76 dialogs/assocrolepage.cpp:77
+#: dialogs/classgenpage.cpp:193 dialogs/classgenpage.cpp:293
+#: dialogs/classgenpage.cpp:356 dialogs/classifierlistpage.cpp:106
+#: dialogs/notedialog.cpp:29 dialogs/parmpropdlg.cpp:100
+#: dialogs/statedialog.cpp:104 docwindow.cpp:33 rc.cpp:30 rc.cpp:150
+#: rc.cpp:207 rc.cpp:445 rc.cpp:492
+#, no-c-format
+msgid "Documentation"
+msgstr "文档"
+
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "TDE 简体中文翻译组"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "i18n-translation@lists.linux.net.cn"
+
+#: aligntoolbar.cpp:40
+msgid "Align Left"
+msgstr "左对齐"
+
+#: aligntoolbar.cpp:41
+msgid "Align Right"
+msgstr "右对齐"
+
+#: aligntoolbar.cpp:42
+msgid "Align Top"
+msgstr "上对齐"
+
+#: aligntoolbar.cpp:43
+msgid "Align Bottom"
+msgstr "下对齐"
+
+#: aligntoolbar.cpp:44
+#, fuzzy
+msgid "AlignQt::Vertical Middle"
+msgstr "垂直居中对齐"
+
+#: aligntoolbar.cpp:45
+#, fuzzy
+msgid "AlignQt::Horizontal Middle"
+msgstr "水平居中对齐"
+
+#: aligntoolbar.cpp:46
+#, fuzzy
+msgid "AlignQt::Vertical Distribute"
+msgstr "垂直分散对齐"
+
+#: aligntoolbar.cpp:47
+#, fuzzy
+msgid "AlignQt::Horizontal Distribute"
+msgstr "水平分散对齐"
+
+#: aligntoolbar.cpp:383
+msgid ""
+"For alignment you have to select at least 2 objects like classes or actors. You "
+"can not align associations."
+msgstr "要进行对齐，您必须至少选择两个像类或主角这样的对象。您不能对齐关联。"
+
+#: tips.txt:3
+msgid ""
+"<p>Welcome to Umbrello.</p>\n"
+"<p>UML diagrams let you design and document object oriented software.  <a "
+"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
+"using UML.</p>\n"
+msgstr ""
+"<p>欢迎使用 Umbrello。</p>\n"
+"<p>UML 图表可帮助您设计面向对象的软件，并为您组织文档。<a href=\"help:/umbrello\">Umbrello 手册</a> "
+"中很好的介绍了 UML 的使用。</p>\n"
+
+#: tips.txt:9
+msgid ""
+"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
+"code generation, externalizable folders, ability to change interfaces into "
+"classes, and more.</p>\n"
+msgstr ""
+"<p>欢迎使用 Umbrello 1.5。此版本中的新增内容包括关联类、Ruby 代码生成、外部化文件夹、将接口转变为类，等等。</p>\n"
+
+#: tips.txt:14
+msgid ""
+"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
+"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
+"Settings.</p>\n"
+msgstr ""
+"<p>标签式图表和外部化文件夹无法同时使用。如果您需要外部文件夹，必须在常规设置中取消“使用标签式图表”。</p>\n"
+
+#: tips.txt:19
+msgid ""
+"<p>Most diagram items can not be resized, they will resize themselves to fit to "
+"their contents.\n"
+"Boxes, notes and sequence diagram messages can be resized, just click and drag "
+"on the red square.</p>\n"
+msgstr ""
+"<p>大多数的图表项目都可以改变大小，以便与内容适应。方框、注解和序列图信息可以改变大小，只需在红色正方形上点击和拖动。</p>\n"
+
+#: tips.txt:25
+msgid ""
+"<p>If you want to add an already existing class to a diagram just drag its "
+"entry from the tree view.</p>\n"
+msgstr ""
+"<p>如果想添加一个已经存在的类到图表，\n"
+"从树状视图中拖动相应条目即可。</p>\n"
+
+#: tips.txt:30
+msgid ""
+"<p>Umbrello's refactoring agent lets you move operations between a class and "
+"its derived and base \n"
+"classes.\n"
+"Right click a class to open the refactoring agent.</p>\n"
+msgstr ""
+"<p>Umbrello 的重构代理使得存在可以在类和它的派生或基类间移动。在类上点击右键可以打开重构代理。</p>\n"
+
+#: tips.txt:37
+msgid ""
+"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
+"Double click one for\n"
+"the Properties dialogue.</p>\n"
+msgstr ""
+"<p>序列图对象可以有一个析构器方框，并绘制成主角。\n"
+"双击可以打开属性对话框。</p>\n"
+
+#: tips.txt:43
+msgid ""
+"<p>Sequence diagram messages can act as constructors.  Click on the object box "
+"(rather than the vertical line) to make it a constructor.</p>\n"
+msgstr ""
+
+#: tips.txt:48
+msgid ""
+"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
+"again to create an automessage.</p>\n"
+msgstr ""
+
+#: tips.txt:53
+msgid ""
+"<p>If on loading a foreign file nothing is displayed in the list view, try "
+"saving the model under a different name,\n"
+"closing, and reloading the saved file.  Usually the list view is then properly "
+"populated.\n"
+"</p>\n"
+msgstr ""
+
+#: tips.txt:60
+msgid ""
+"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
+"pasted into KWord\n"
+"and other applications.</p>\n"
+msgstr ""
+"<p>剪切和复制会将图象以 PNG 格式保存在剪贴板中，\n"
+"在 KWord 或其它应用程序中可以直接粘贴。</p>\n"
+
+#: tips.txt:66
+msgid ""
+"<p>Associations do not have to be in straight lines, double clicking on one "
+"will create a movable point.</p>\n"
+msgstr ""
+"<p>关联无需一定是直线，双击其中一条，可以创建一个可移动的点。</p>\n"
+
+#: tips.txt:71
+msgid ""
+"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
+msgstr ""
+"<p>在 Umbrello 配置对话框可以打开自动保存功能。</p>\n"
+
+#: tips.txt:76
+msgid ""
+"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
+"Either add it to the bugs database with Report Bug from the Help menu\n"
+"or send it to the uml-devel mailing list.</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
+".</li>\n"
+"</ul>\n"
+msgstr ""
+"<p>您有 Umbrello 没有提供的功能的需要？请让我们知道。\n"
+"可以使用帮助菜单的错误报告工具增加，\n"
+"或发送到 uml-devel 邮件列表。</p>\n"
+"<ul>\n"
+"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
+"</li>\n"
+"</ul>\n"
+
+#: tips.txt:86
+msgid ""
+"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
+msgstr ""
+"<p>按删除键或退格键删除全部选中的对象。</p>\n"
+
+#: tips.txt:91
+msgid ""
+"<p>If you've found a bug in Umbrello, please let us know. \n"
+"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
+msgstr ""
+"<p>如果您发现了 Umbrello 的错误，请让我们知道。\n"
+"您可以用帮助菜单里报告错误工具提交。</p>\n"
+
+#: tips.txt:97
+msgid ""
+"<p>Pressing the Escape key sets the current tool to the select tool.\n"
+"Backspace jumps to the previously used tool.</p>\n"
+msgstr ""
+"<p>按 ESC 键将所选的工具设定为当前工具。\n"
+"按退格键跳至先前使用的工具。</p>\n"
+
+#: tips.txt:103
+msgid ""
+"<p>You can select all objects by pressing Ctrl-A.</p>\n"
+msgstr ""
+"<p>按 Ctrl-A 选择所有对象。</p>\n"
+
+#: tips.txt:108
+msgid ""
+"<p>You can create and setup a new class using the New Class Wizard in the Code "
+"menu.</p>\n"
+msgstr ""
+"<p>使用代码菜单中的新建类向导可以创建和设置一个新类。</p>\n"
+
+#: umllistview.cpp:348
+msgid "Externalize Folder"
+msgstr "外部化文件夹"
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umllistview.cpp:384
+#: umlviewimageexportermodel.cpp:158
+#, c-format
+msgid "There was a problem saving file: %1"
+msgstr "保存文件出错：%1"
+
+#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
+#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
+#: umllistview.cpp:385
+msgid "Save Error"
+msgstr "保存出错"
+
+#: umllistview.cpp:416
+msgid "Enter Model Name"
+msgstr "输入模型名称"
+
+#: umllistview.cpp:417
+msgid "Enter the new name of the model:"
+msgstr "输入模型的新名称："
+
+#: umllistview.cpp:1007
+msgid "Views"
+msgstr "视图"
+
+#: umllistview.cpp:1906
+msgid ""
+"The name you entered was invalid.\n"
+"Creation process has been canceled."
+msgstr ""
+"所输入的名称无效。\n"
+"创建进程已被取消。"
+
+#: umllistview.cpp:1907 umllistviewitem.cpp:479
+msgid "Name Not Valid"
+msgstr "名称无效"
+
+#: umldoc.cpp:1067 umllistview.cpp:1916
+msgid ""
+"The name you entered was not unique.\n"
+"Is this what you wanted?"
+msgstr ""
+"所输入的名称不唯一。\n"
+"您就要这样吗？"
+
+#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1917
+#: umllistview.cpp:1924 umllistview.cpp:2161
+msgid "Name Not Unique"
+msgstr "名称不唯一"
+
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Use Name"
+msgstr "使用名称"
+
+#: umldoc.cpp:1068 umllistview.cpp:1917
+msgid "Enter New Name"
+msgstr "输入新名称"
+
+#: umllistview.cpp:1923 umllistview.cpp:2160
+msgid ""
+"The name you entered was not unique!\n"
+"Creation process has been canceled."
+msgstr ""
+"所输入的名称无效！\n"
+"创建进程已被取消。"
+
+#: umllistview.cpp:2118 umllistview.cpp:2135 umllistview.cpp:2150
+msgid "Creation canceled"
+msgstr "创建已取消"
+
+#: umllistview.cpp:2338
+msgid "Loading listview..."
+msgstr "正在装入列表视图..."
+
+#: umllistview.cpp:2670
+msgid "The folder must be emptied before it can be deleted."
+msgstr "文件夹清空后才能删除。"
+
+#: umllistview.cpp:2671
+msgid "Folder Not Empty"
+msgstr "文件夹不空"
+
+#: codegenerator.cpp:473
+msgid ""
+"Cannot open file %1 for writing. Please make sure the folder exists and you "
+"have permissions to write to it."
+msgstr "无法写文件 %1。请确认文件夹存在且有写的权限。"
+
+#: codegenerator.cpp:473
+msgid "Cannot Open File"
+msgstr "无法打开文件"
+
+#: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
+msgid ""
+"Cannot create the folder:\n"
+msgstr ""
+"无法创建文件夹：\n"
+
+#: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
+msgid ""
+"\n"
+"Please check the access rights"
+msgstr ""
+"\n"
+"请检查访问权限"
+
+#: codegenerator.cpp:533 codegenerators/simplecodegenerator.cpp:130
+msgid "Cannot Create Folder"
+msgstr "无法创建文件夹"
+
+#: umlview.cpp:297 umlview.cpp:357
+msgid "Diagram: %2 Page %1"
+msgstr "图：%2  页：%1"
+
+#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
+msgid "Enter State Name"
+msgstr "输入状态名称"
+
+#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
+msgid "Enter the name of the new state:"
+msgstr "输入新状态的名称："
+
+#: toolbarstateother.cpp:148 umlview.cpp:2511
+msgid "new state"
+msgstr "新状态"
+
+#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
+msgid "Enter Activity Name"
+msgstr "输入活动名称"
+
+#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
+#: toolbarstateother.cpp:144 umlview.cpp:2546
+msgid "Enter the name of the new activity:"
+msgstr "输入新活动的名称："
+
+#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
+#: umlview.cpp:2547
+msgid "new activity"
+msgstr "新活动"
+
+#: umlview.cpp:2578
+msgid "Enter Diagram Name"
+msgstr "输入图表名称"
+
+#: umlview.cpp:2579
+msgid "Enter the new name of the diagram:"
+msgstr "输入图表的新名称："
+
+#: umlview.cpp:2736
+msgid ""
+"You are about to delete the entire diagram.\n"
+"Are you sure?"
+msgstr ""
+"将要删除整个图表。\n"
+"您确认吗？"
+
+#: umlview.cpp:2738
+msgid "Delete Diagram?"
+msgstr "删除图表？"
+
+#: operation.cpp:185
+msgid "new_parameter"
+msgstr "新参数"
+
+#: listpopupmenu.cpp:695 stereotype.cpp:76
+msgid "Stereotype"
+msgstr "构造型"
+
+#: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
+#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+msgid "Enter name:"
+msgstr "输入名称："
+
+#: codeimport/classimport.cpp:34
+msgid "Importing file: %1 Progress: %2/%3"
+msgstr "导入文件：%1 进度：%2/%3"
+
+#: codeimport/classimport.cpp:39 uml.cpp:376 uml.cpp:483 uml.cpp:660
+#: uml.cpp:688 uml.cpp:712 uml.cpp:722 uml.cpp:753 uml.cpp:758 uml.cpp:783
+#: uml.cpp:793 uml.cpp:814 uml.cpp:819 uml.cpp:832 uml.cpp:839 uml.cpp:853
+#: uml.cpp:874 uml.cpp:887 umlviewimageexporter.cpp:52
+#: umlviewimageexporterall.cpp:73
+msgid "Ready."
+msgstr "就绪。"
+
+#: codeimport/import_utils.cpp:181
+msgid "Is the scope %1 a namespace or a class?"
+msgstr "范围 %1 是命名空间还是类？"
+
+#: codeimport/import_utils.cpp:182
+msgid "C++ Import Requests Your Help"
+msgstr "C++ 导入需要您的帮助"
+
+#: codeimport/import_utils.cpp:183
+msgid "Namespace"
+msgstr "命名空间"
+
+#. i18n: file dialogs/codegenerationwizardbase.ui line 249
+#: codeimport/import_utils.cpp:183 dialogs/diagramprintpage.cpp:91
+#: dialogs/diagramprintpage.cpp:198 dialogs/settingsdlg.cpp:210
+#: listpopupmenu.cpp:609 rc.cpp:360 worktoolbar.cpp:262
+#, no-c-format
+msgid "Class"
+msgstr "类"
+
+#: codeimport/kdevcppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "内部错误"
+
+#: codeimport/kdevcppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "在“%1”之前发生语法错误"
+
+#: codeimport/kdevcppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "在“%1”之前发生分析错误"
+
+#: codeimport/kdevcppparser/parser.cpp:138
+msgid "<eof>"
+msgstr "<文件结尾>"
+
+#: codeimport/kdevcppparser/parser.cpp:323
+#: codeimport/kdevcppparser/parser.cpp:2679
+#: codeimport/kdevcppparser/parser.cpp:2878
+#: codeimport/kdevcppparser/parser.cpp:2884
+msgid "expression expected"
+msgstr "此处需要表达式"
+
+#: codeimport/kdevcppparser/parser.cpp:598
+msgid "Declaration syntax error"
+msgstr "声明语法错误"
+
+#: codeimport/kdevcppparser/parser.cpp:643
+#: codeimport/kdevcppparser/parser.cpp:2770
+#: codeimport/kdevcppparser/parser.cpp:3224
+msgid "} expected"
+msgstr "此处需要 }"
+
+#: codeimport/kdevcppparser/parser.cpp:684
+msgid "namespace expected"
+msgstr "此处需要 namespace"
+
+#: codeimport/kdevcppparser/parser.cpp:688
+msgid "{ expected"
+msgstr "此处需要 {"
+
+#: codeimport/kdevcppparser/parser.cpp:761
+#: codeimport/kdevcppparser/parser.cpp:2965
+msgid "Namespace name expected"
+msgstr "此处需要 namespace 名称"
+
+#: codeimport/kdevcppparser/parser.cpp:869
+msgid "Need a type specifier to declare"
+msgstr "声明中需要指定类型"
+
+#: codeimport/kdevcppparser/parser.cpp:938
+msgid "expected a declaration"
+msgstr "此处需要一个声明"
+
+#: codeimport/kdevcppparser/parser.cpp:1212
+#: codeimport/kdevcppparser/parser.cpp:2178
+msgid "Constant expression expected"
+msgstr "此处需要常量表达式"
+
+#: codeimport/kdevcppparser/parser.cpp:1281
+#: codeimport/kdevcppparser/parser.cpp:1378
+msgid "')' expected"
+msgstr "此处需要‘)’"
+
+#: codeimport/kdevcppparser/parser.cpp:1451
+#: codeimport/kdevcppparser/parser.cpp:1914
+#: codeimport/kdevcppparser/parser.cpp:2392
+msgid "} missing"
+msgstr "缺少 }"
+
+#: codeimport/kdevcppparser/parser.cpp:2074
+msgid "Member initializers expected"
+msgstr "此处需要成员初始值"
+
+#: codeimport/kdevcppparser/parser.cpp:2235
+msgid "Base class specifier expected"
+msgstr "此处需要指定基类"
+
+#: codeimport/kdevcppparser/parser.cpp:2260
+msgid "Initializer clause expected"
+msgstr "此处需要初始化语句"
+
+#: codeimport/kdevcppparser/parser.cpp:2303
+msgid "Identifier expected"
+msgstr "此处需要标识符"
+
+#: codeimport/kdevcppparser/parser.cpp:2337
+msgid "Type id expected"
+msgstr "此处需要类型标识"
+
+#: codeimport/kdevcppparser/parser.cpp:2374
+msgid "Class name expected"
+msgstr "此处需要类名"
+
+#: codeimport/kdevcppparser/parser.cpp:2641
+#: codeimport/kdevcppparser/parser.cpp:2795
+#: codeimport/kdevcppparser/parser.cpp:2835
+#: codeimport/kdevcppparser/parser.cpp:3282
+msgid "condition expected"
+msgstr "此处需要条件"
+
+#: codeimport/kdevcppparser/parser.cpp:2648
+#: codeimport/kdevcppparser/parser.cpp:2670
+#: codeimport/kdevcppparser/parser.cpp:2802
+#: codeimport/kdevcppparser/parser.cpp:2813
+msgid "statement expected"
+msgstr "此处需要语句"
+
+#: codeimport/kdevcppparser/parser.cpp:2705
+msgid "for initialization expected"
+msgstr "此处需要 for 循环初始化"
+
+#: codeimport/kdevcppparser/parser.cpp:3273
+msgid "catch expected"
+msgstr "此处需要 catch"
+
+#: uml.cpp:179
+msgid "&Export model to DocBook"
+msgstr ""
+
+#: uml.cpp:182
+msgid "&Export model to XHTML"
+msgstr ""
+
+#: uml.cpp:186
+msgid "&New Class Wizard..."
+msgstr "新建类向导(&N)..."
+
+#: uml.cpp:188
+msgid "&Add Default Datatypes for Active Language"
+msgstr "为当前激活的语言添加默认数据类型(&A)"
+
+#: uml.cpp:193
+msgid "&Code Generation Wizard..."
+msgstr "代码生成向导(&C)..."
+
+#: uml.cpp:195
+msgid "&Generate All Code"
+msgstr "生成全部代码(&G)"
+
+#: uml.cpp:198
+msgid "&Import Classes..."
+msgstr "导入类(&I)..."
+
+#: uml.cpp:201
+msgid "Creates a new document"
+msgstr "创建新文档"
+
+#: uml.cpp:202
+msgid "Opens an existing document"
+msgstr "打开现存文档"
+
+#: uml.cpp:203
+msgid "Opens a recently used file"
+msgstr "打开最近使用的文件"
+
+#: uml.cpp:204
+msgid "Saves the document"
+msgstr "保存文档"
+
+#: uml.cpp:205
+msgid "Saves the document as..."
+msgstr "文档另保存为..."
+
+#: uml.cpp:206
+msgid "Closes the document"
+msgstr "关闭文档"
+
+#: uml.cpp:207
+msgid "Prints out the document"
+msgstr "打印文档"
+
+#: uml.cpp:208
+msgid "Quits the application"
+msgstr "退出应用程序"
+
+#: uml.cpp:209
+msgid "Exports the model to the docbook format"
+msgstr ""
+
+#: uml.cpp:210
+msgid "Exports the model to the XHTML format"
+msgstr ""
+
+#: uml.cpp:211
+msgid "Cuts the selected section and puts it to the clipboard"
+msgstr "剪切所选部分并放到剪贴板"
+
+#: uml.cpp:212
+msgid "Copies the selected section to the clipboard"
+msgstr "复制所选部分并放到剪贴板"
+
+#: uml.cpp:213
+msgid "Pastes the contents of the clipboard"
+msgstr "粘贴剪贴板内容"
+
+#: uml.cpp:214
+msgid "Set the default program preferences"
+msgstr "设置默认程序首选项"
+
+#: uml.cpp:216
+msgid "Delete &Selected"
+msgstr "删除所选(&S)"
+
+#: uml.cpp:224
+msgid "&Class Diagram..."
+msgstr "类图(&C)..."
+
+#: uml.cpp:228
+msgid "&Autolayout..."
+msgstr "自动布局(&A)..."
+
+#: uml.cpp:231
+msgid "&Sequence Diagram..."
+msgstr "序列图(&S)..."
+
+#: uml.cpp:234
+msgid "C&ollaboration Diagram..."
+msgstr "协作图(&O)..."
+
+#: uml.cpp:237
+msgid "&Use Case Diagram..."
+msgstr "用例图(&U)..."
+
+#: uml.cpp:240
+msgid "S&tate Diagram..."
+msgstr "状态图(&T)..."
+
+#: uml.cpp:243
+msgid "&Activity Diagram..."
+msgstr "活动图(&A)..."
+
+#: uml.cpp:246
+msgid "Co&mponent Diagram..."
+msgstr "组件图(&M)..."
+
+#: uml.cpp:250
+msgid "&Deployment Diagram..."
+msgstr "部署图(&D)..."
+
+#: uml.cpp:254
+msgid "&Entity Relationship Diagram..."
+msgstr "实体关系图(&E)..."
+
+#: uml.cpp:258
+msgid "&Clear Diagram"
+msgstr "清除图表(&C)"
+
+#: uml.cpp:260
+msgid "&Snap to Grid"
+msgstr "吸附到网格(&S)"
+
+#: uml.cpp:262
+msgid "S&how Grid"
+msgstr "显示网格(&H)"
+
+#: uml.cpp:265
+msgid "&Hide Grid"
+msgstr "隐藏网格(&H)"
+
+#: uml.cpp:269
+msgid "&Export as Picture..."
+msgstr "导出为图片(&E)..."
+
+#: uml.cpp:271
+msgid "Export &All Diagrams as Pictures..."
+msgstr "将全部图表导出为图片(&A)..."
+
+#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
+#: uml.cpp:273
+msgid "&Properties"
+msgstr "属性(&P)"
+
+#: uml.cpp:286
+msgid "&Zoom Slider"
+msgstr "缩放滑动条(&Z)"
+
+#: uml.cpp:289
+#, c-format
+msgid "Z&oom to 100%"
+msgstr "缩放到 100%(&O)"
+
+#: uml.cpp:295
+msgid "&Move Tab Left"
+msgstr "标签左移(&M)"
+
+#: uml.cpp:296
+msgid "&Move Tab Right"
+msgstr "标签右移(&M)"
+
+#: uml.cpp:308
+msgid "Select Diagram on Left"
+msgstr "选择左侧的图表"
+
+#: uml.cpp:309
+msgid "Select Diagram on Right"
+msgstr "选择右侧的图表"
+
+#: uml.cpp:327
+msgid "&Windows"
+msgstr "窗口(&W)"
+
+#: uml.cpp:347
+#, c-format
+msgid " &33%"
+msgstr " &33%"
+
+#: uml.cpp:348
+#, c-format
+msgid " &50%"
+msgstr " &50%"
+
+#: uml.cpp:349
+#, c-format
+msgid " &75%"
+msgstr " &75%"
+
+#: uml.cpp:350
+#, c-format
+msgid "&100%"
+msgstr "&100%"
+
+#: uml.cpp:351
+#, c-format
+msgid "1&50%"
+msgstr "1&50%"
+
+#: uml.cpp:352
+#, c-format
+msgid "&200%"
+msgstr "&200%"
+
+#: uml.cpp:353
+#, c-format
+msgid "3&00%"
+msgstr "3&00%"
+
+#: uml.cpp:394
+msgid "Diagram Toolbar"
+msgstr "图表工具栏"
+
+#: uml.cpp:398
+msgid "Alignment Toolbar"
+msgstr "对齐工具栏"
+
+#: listpopupmenu.cpp:615 uml.cpp:420
+msgid "Class Diagram..."
+msgstr "类图..."
+
+#: listpopupmenu.cpp:618 uml.cpp:421
+msgid "Sequence Diagram..."
+msgstr "序列图..."
+
+#: listpopupmenu.cpp:619 uml.cpp:422
+msgid "Collaboration Diagram..."
+msgstr "协作图..."
+
+#: listpopupmenu.cpp:551 uml.cpp:423
+msgid "Use Case Diagram..."
+msgstr "用例图..."
+
+#: listpopupmenu.cpp:616 uml.cpp:424
+msgid "State Diagram..."
+msgstr "状态图..."
+
+#: listpopupmenu.cpp:617 uml.cpp:425
+msgid "Activity Diagram..."
+msgstr "活动图..."
+
+#: listpopupmenu.cpp:521 uml.cpp:426
+msgid "Component Diagram..."
+msgstr "组件图..."
+
+#: listpopupmenu.cpp:528 uml.cpp:427
+msgid "Deployment Diagram..."
+msgstr "部署图..."
+
+#: listpopupmenu.cpp:541 uml.cpp:428
+msgid "Entity Relationship Diagram..."
+msgstr "实体关系图..."
+
+#: uml.cpp:458
+msgid "&Tree View"
+msgstr "树形视图(&T)"
+
+#: uml.cpp:467
+msgid "&Documentation"
+msgstr "文档(&D)"
+
+#: uml.cpp:479 uml.cpp:664 uml.cpp:692
+msgid "Opening file..."
+msgstr "正在打开文件..."
+
+#: uml.cpp:650
+msgid "Creating new document..."
+msgstr "正在创建新文档..."
+
+#: uml.cpp:673
+msgid ""
+"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|All Supported Files (*.xmi, *.xmi.tgz, "
+"*.xmi.tar.bz2, *.mdl)\n"
+"*.xmi|Uncompressed XMI Files (*.xmi)\n"
+"*.xmi.tgz|Gzip Compressed XMI Files (*.xmi.tgz)\n"
+"*.xmi.tar.bz2|Bzip2 Compressed XMI Files (*.xmi.tar.bz2)\n"
+"*.mdl|Rose model files"
+msgstr ""
+"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|支持的全部文件(*.xmi, *.xmi.tgz, *.xmi.tar.bz2, "
+"*.mdl)\n"
+"*.xmi|未压缩的 XMI 文件(*.xmi)\n"
+"*.xmi.tgz|Gzip 压缩的 XMI 文件(*.xmi.tgz)\n"
+"*.xmi.tar.bz2|Bzip2 压缩的 XMI 文件(*.xmi.tar.bz2)\n"
+"*.mdl|Rose 模型文件"
+
+#: uml.cpp:677
+msgid "Open File"
+msgstr "打开文件"
+
+#: uml.cpp:716
+msgid "Saving file..."
+msgstr "正在保存文件..."
+
+#: uml.cpp:727
+msgid "Saving file with a new filename..."
+msgstr "正在用新文件名保存文件..."
+
+#: uml.cpp:732
+msgid ""
+"*.xmi|XMI File\n"
+"*.xmi.tgz|Gzip Compressed XMI File\n"
+"*.xmi.tar.bz2|Bzip2 Compressed XMI File\n"
+"*|All Files"
+msgstr ""
+"*.xmi|XMI 文件\n"
+"*.xmi.tgz|Gzip 压缩的 XMI 文件\n"
+"*.xmi.tar.bz2|Bzip2 压缩的 XMI 文件\n"
+"*|全部文件"
+
+#: uml.cpp:740
+msgid ""
+"The file %1 exists.\n"
+"Do you wish to overwrite it?"
+msgstr ""
+"文件 %1 已存在。\n"
+"要覆盖吗？"
+
+#: uml.cpp:740
+msgid "Overwrite"
+msgstr "覆盖"
+
+#: uml.cpp:764
+msgid "Closing file..."
+msgstr "正在关闭文件..."
+
+#: uml.cpp:772
+msgid "Printing..."
+msgstr "正在打印..."
+
+#: uml.cpp:779
+#, c-format
+msgid "Print %1"
+msgstr "打印 %1"
+
+#: uml.cpp:787
+msgid "Exiting..."
+msgstr "正在退出..."
+
+#: uml.cpp:823
+msgid "Cutting selection..."
+msgstr "正在剪切所选项..."
+
+#: uml.cpp:836
+msgid "Copying selection to clipboard..."
+msgstr "正在复制所选项到剪贴板..."
+
+#: uml.cpp:844
+msgid "Inserting clipboard contents..."
+msgstr "正在插入剪贴板内容..."
+
+#: uml.cpp:849
+msgid ""
+"Umbrello could not paste the clipboard contents.  The objects in the clipboard "
+"may be of the wrong type to be pasted here."
+msgstr "Umbrello 无法粘贴剪贴板内容。剪贴板中的对象的类型可能不正确。"
+
+#: clipboard/umlclipboard.cpp:691 uml.cpp:851
+msgid "Paste Error"
+msgstr "粘贴出错"
+
+#: uml.cpp:863
+msgid "Toggling toolbar..."
+msgstr "正在切换工具栏..."
+
+#: uml.cpp:878
+msgid "Toggle the statusbar..."
+msgstr "切换状态栏..."
+
+#: uml.cpp:1186
+msgid "Cannot view code until you generate some first."
+msgstr "生成代码后才能查看。"
+
+#: uml.cpp:1186 uml.cpp:1189
+msgid "Cannot View Code"
+msgstr "无法查看代码"
+
+#: uml.cpp:1189
+msgid "Cannot view code from simple code writer."
+msgstr "无法查看简单代码书写器中的代码"
+
+#: uml.cpp:1387
+msgid "*.idl|IDL Files (*.idl)"
+msgstr "*.idl|IDL 文件(*.idl)"
+
+#: uml.cpp:1389
+msgid "*.py|Python Files (*.py)"
+msgstr "*.py|Python 文件(*.py)"
+
+#: uml.cpp:1391
+msgid "*.java|Java Files (*.java)"
+msgstr "*.java|Java 文件(*.java)"
+
+#: uml.cpp:1393
+#, fuzzy
+msgid "*.pas|Pascal Files (*.pas)"
+msgstr "*.java|Java 文件(*.java)"
+
+#: uml.cpp:1395
+msgid "*.ads *.ada|Ada Files (*.ads *.ada)"
+msgstr "*.ads *.ada|Ada 文件(*.ads *.ada)"
+
+#: uml.cpp:1397
+msgid "*.h *.hh *.hpp *.hxx *.H|Header Files (*.h *.hh *.hpp *.hxx *.H)"
+msgstr "*.h *.hh *.hpp *.hxx *.H|头文件(*.h *.hh *.hpp *.hxx *.H)"
+
+#: uml.cpp:1399
+msgid "All Files"
+msgstr "全部文件"
+
+#: uml.cpp:1401
+msgid "Select Code to Import"
+msgstr "选择要导入的代码"
+
+#: enumliteral.cpp:65 floatingtextwidget.cpp:111 object_factory.cpp:153
+#: umldoc.cpp:976 umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
+msgid "Name"
+msgstr "名称"
+
+#: classifier.cpp:294 classifier.cpp:522 entity.cpp:78 enum.cpp:76
+#: object_factory.cpp:158 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "That is an invalid name."
+msgstr "名称无效。"
+
+#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
+#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
+#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
+msgid "Invalid Name"
+msgstr "无效名称"
+
+#: object_factory.cpp:164
+msgid ""
+"This is a reserved keyword for the language of the configured code generator."
+msgstr "这是配置的代码生成器语言所用的保留关键字。"
+
+#: object_factory.cpp:165
+msgid "Reserved Keyword"
+msgstr "保留的关键字"
+
+#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
+#: umldoc.cpp:1043 umldoc.cpp:1073
+msgid "That name is already being used."
+msgstr "名称已被使用。"
+
+#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:170
+#: umldoc.cpp:998 umldoc.cpp:1025 umldoc.cpp:1043 umldoc.cpp:1073
+msgid "Not a Unique Name"
+msgstr "名称不唯一"
+
 #: worktoolbar.cpp:245
 msgid "Object"
 msgstr "对象"
@@ -81,14 +1091,6 @@ msgstr "组装"
 msgid "Use Case"
 msgstr "用例"
 
-#. i18n: file dialogs/codegenerationwizardbase.ui line 249
-#: codeimport/import_utils.cpp:183 dialogs/diagramprintpage.cpp:91
-#: dialogs/diagramprintpage.cpp:198 dialogs/settingsdlg.cpp:210
-#: listpopupmenu.cpp:609 rc.cpp:360 worktoolbar.cpp:262
-#, no-c-format
-msgid "Class"
-msgstr "类"
-
 #: listpopupmenu.cpp:1030 worktoolbar.cpp:263
 msgid "Initial State"
 msgstr "初始状态"
@@ -201,381 +1203,375 @@ msgstr "未定义"
 msgid "Select"
 msgstr "选择"
 
-#: umlwidgetcontroller.cpp:128
-msgid ""
-"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
-"Right button click to cancel move."
-msgstr ""
+#: model_utils.cpp:266 umlcanvasobject.cpp:147
+msgid "new_association"
+msgstr "新关联"
 
-#: umlwidgetcontroller.cpp:379
-msgid ""
-"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
-"Right button click to cancel resize."
-msgstr ""
+#: umlcanvasobject.cpp:150
+msgid "new_attribute"
+msgstr "新属性"
 
-#: dialogs/activitydialog.cpp:70
-msgid "Initial activity"
-msgstr "初始活动"
+#: umlcanvasobject.cpp:153
+msgid "new_template"
+msgstr "新模板"
 
-#: dialogs/activitydialog.cpp:70
-msgid "End activity"
-msgstr "终止活动"
+#: umlcanvasobject.cpp:156
+msgid "new_operation"
+msgstr "新操作"
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 118
-#: dialogs/activitydialog.cpp:73 dialogs/assocpropdlg.cpp:87
-#: dialogs/classpropdlg.cpp:69 dialogs/classpropdlg.cpp:170
-#: dialogs/classpropdlg.cpp:232 dialogs/settingsdlg.cpp:99
-#: dialogs/statedialog.cpp:88 dialogs/umlviewdialog.cpp:70 rc.cpp:45
-#: rc.cpp:225
-#, no-c-format
-msgid "General"
-msgstr "常规"
+#: umlcanvasobject.cpp:159
+msgid "new_literal"
+msgstr "新常量"
 
-#: dialogs/activitydialog.cpp:73 dialogs/statedialog.cpp:88
-#: dialogs/umlattributedialog.cpp:55 dialogs/umlentityattributedialog.cpp:56
-#: dialogs/umloperationdialog.cpp:64 dialogs/umltemplatedialog.cpp:48
-msgid "General Properties"
-msgstr "常规属性"
+#: umlcanvasobject.cpp:162
+msgid "new_field"
+msgstr "新字段"
 
-#: dialogs/activitydialog.cpp:82
-msgid "Activity type:"
-msgstr "活动类型："
+#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
+msgid "Exporting all views..."
+msgstr "导出全部视图..."
 
-#: dialogs/activitydialog.cpp:87
-msgid "Activity name:"
-msgstr "活动名称："
+#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
+#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
+msgid "Some errors happened when exporting the images:"
+msgstr "导出图像时发生了错误："
 
-#. i18n: file codegenerators/cppcodegenerationformbase.ui line 36
-#: dialogs/activitydialog.cpp:90 dialogs/assocgenpage.cpp:56
-#: dialogs/assocrolepage.cpp:76 dialogs/assocrolepage.cpp:77
-#: dialogs/classgenpage.cpp:193 dialogs/classgenpage.cpp:293
-#: dialogs/classgenpage.cpp:356 dialogs/classifierlistpage.cpp:106
-#: dialogs/notedialog.cpp:29 dialogs/parmpropdlg.cpp:100
-#: dialogs/statedialog.cpp:104 docwindow.cpp:33 rc.cpp:30 rc.cpp:150
-#: rc.cpp:207 rc.cpp:445 rc.cpp:492
-#, no-c-format
-msgid "Documentation"
-msgstr "文档"
+#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
+#, fuzzy
+msgid "Umbrello UML Modeller autonomous code generator"
+msgstr "UML 建模工具作者"
 
-#: dialogs/activitydialog.cpp:108 dialogs/assocpropdlg.cpp:109
-#: dialogs/classpropdlg.cpp:243 dialogs/settingsdlg.cpp:306
-#: dialogs/statedialog.cpp:124 dialogs/umlviewdialog.cpp:107
-msgid "Font Settings"
-msgstr "字体设置"
+#: docgenerators/main.cpp:47
+#, fuzzy
+msgid "File to transform"
+msgstr "要打开的文件"
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125 dialogs/settingsdlg.cpp:49
-#: dialogs/statedialog.cpp:130 dialogs/umlviewdialog.cpp:100
-#: dialogs/umlwidgetcolorpage.cpp:53 listpopupmenu.cpp:739
-#: listpopupmenu.cpp:750
-msgid "Color"
-msgstr "颜色"
+#: docgenerators/main.cpp:48
+msgid "The XSLT file to use"
+msgstr ""
 
-#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
-#: dialogs/classpropdlg.cpp:125
-msgid "Widget Colors"
-msgstr "组件颜色"
+#: docgenerators/main.cpp:64
+#, fuzzy
+msgid ""
+"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
+"Authors"
+msgstr "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML 建模工具作者"
 
-#: dialogs/overwritedialogue.cpp:27
-msgid "Destination File Already Exists"
-msgstr "目标文件已存在"
+#: docgenerators/main.cpp:67 main.cpp:98
+msgid "Umbrello UML Modeller Authors"
+msgstr "UML 建模工具作者"
 
-#: dialogs/overwritedialogue.cpp:31
+#: umlviewimageexporter.cpp:46
+msgid "Exporting view..."
+msgstr "正在导出视图..."
+
+#: umlviewimageexporter.cpp:50
 msgid ""
-"The file %1 already exists in %2.\n"
-"\n"
-"Umbrello can overwrite the file, generate a similar\n"
-"file name or not generate this file."
+"An error happened when exporting the image:\n"
 msgstr ""
-"文件 %1 已存在于 %2 中。\n"
-"\n"
-"Umbrello 可以覆盖文件、生成名称近似的文件或不生成文件。"
 
-#: dialogs/overwritedialogue.cpp:34
-msgid "&Apply to all remaining files"
-msgstr "应用到剩下的所有文件(&A)"
+#: umlviewimageexporter.cpp:66
+msgid ""
+"The selected file %1 exists.\n"
+"Do you want to overwrite it?"
+msgstr ""
+"所选的文件 %1 已存在。\n"
+"您要覆盖吗？"
+
+#: umlviewimageexporter.cpp:67
+msgid "File Already Exists"
+msgstr "文件已经存在"
 
 #: dialogs/overwritedialogue.cpp:38 umlviewimageexporter.cpp:67
 msgid "&Overwrite"
 msgstr "覆盖文件(&O)"
 
-#: dialogs/overwritedialogue.cpp:39
-msgid "&Generate Similar File Name"
-msgstr "生成名称近似的文件(&G)"
+#: clipboard/umlclipboard.cpp:687
+msgid ""
+"At least one of the items in the clipboard could not be pasted because an item "
+"of the same name already exists.  Any other items have been pasted."
+msgstr "因为有同名项目存在，剪贴板至少有一个项目无法粘贴，其它则粘贴成功。"
 
-#: dialogs/overwritedialogue.cpp:40
-msgid "&Do Not Generate File"
-msgstr "不生成文件(&D)"
+#: umldoc.cpp:82 umldoc.cpp:1518
+msgid "UML Model"
+msgstr "UML 模型"
 
-#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
-msgid "Activities"
-msgstr "活动"
+#: umldoc.cpp:106
+msgid "Logical View"
+msgstr "逻辑视图"
 
-#: dialogs/activitypage.cpp:72
-msgid "New Activity..."
-msgstr "新建活动..."
+#: umldoc.cpp:107
+msgid "Use Case View"
+msgstr "用例视图"
 
-#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
-msgid "Rename"
-msgstr "重命名"
+#: umldoc.cpp:108
+msgid "Component View"
+msgstr "组件视图"
 
-#: dialogs/activitypage.cpp:134
-msgid "New Activity"
-msgstr "新建活动"
+#: umldoc.cpp:109
+msgid "Deployment View"
+msgstr "部署视图"
 
-#: activitywidget.cpp:163 dialogs/activitypage.cpp:134 statewidget.cpp:176
-#: toolbarstateother.cpp:144 umlview.cpp:2546
-msgid "Enter the name of the new activity:"
-msgstr "输入新活动的名称："
+#: umldoc.cpp:110
+msgid "Entity Relationship Model"
+msgstr "实体关系模型"
 
-#: dialogs/activitypage.cpp:135 statewidget.cpp:176 toolbarstateother.cpp:144
-#: umlview.cpp:2547
-msgid "new activity"
-msgstr "新活动"
+#: umldoc.cpp:117 umldoc.cpp:293
+msgid "Datatypes"
+msgstr "数据类型"
 
-#: dialogs/activitypage.cpp:153
-msgid "Rename Activity"
-msgstr "重命名活动"
+#: umldoc.cpp:229
+msgid ""
+"The current file has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"当前文件已修改。\n"
+"要保存吗？"
 
-#: dialogs/activitypage.cpp:153
-msgid "Enter the new name of the activity:"
-msgstr "输入活动的新名称："
+#: umldoc.cpp:355
+msgid "The file %1 does not exist."
+msgstr "文件 %1 不存在。"
 
-#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
-#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
-#, no-c-format
-msgid "Code Generation Options"
-msgstr "代码生成选项"
+#: folder.cpp:289 folder.cpp:293 umldoc.cpp:355 umldoc.cpp:380 umldoc.cpp:422
+#: umldoc.cpp:434 umldoc.cpp:448 umldoc.cpp:461 umldoc.cpp:472 umldoc.cpp:488
+msgid "Load Error"
+msgstr "加载出错"
 
-#: dialogs/codegenerationwizard.cpp:70
-msgid "&Generate"
-msgstr "生成(&G)"
+#: umldoc.cpp:380
+msgid "The file %1 seems to be corrupted."
+msgstr "文件 %1 似乎已损坏。"
 
-#: dialogs/codegenerationwizard.cpp:120
-msgid "Finish"
-msgstr "完成"
+#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
+#, c-format
+msgid "There was no XMI file found in the compressed file %1."
+msgstr "压缩文件 %1 中未找到 XMI 文件。"
 
-#: dialogs/codegenerationwizard.cpp:132
-msgid "Code Generated"
-msgstr "代码已生成"
+#: umldoc.cpp:448
+#, c-format
+msgid "There was a problem loading the extracted file: %1"
+msgstr "加载提取出的文件出错：%1"
 
-#: dialogs/codegenerationwizard.cpp:134
-msgid "Not Generated"
-msgstr "未生成"
+#: umldoc.cpp:472 umldoc.cpp:488
+#, c-format
+msgid "There was a problem loading file: %1"
+msgstr "加载文件出错：%1"
 
-#: dialogs/codegenerationwizard.cpp:141
-msgid "Not Yet Generated"
-msgstr "尚未生成"
+#: umldoc.cpp:641
+#, c-format
+msgid "There was a problem uploading file: %1"
+msgstr "上载文件出错：%1"
 
-#: dialogs/codegenerationwizard.cpp:162
-msgid "The folder %1 does not exist. Do you want to create it now?"
-msgstr "文件夹 %1 不存在。要现在创建吗？"
+#: umldoc.cpp:934
+msgid "use case diagram"
+msgstr "用例图"
 
-#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
-msgid "Output Folder Does Not Exist"
-msgstr "输出文件夹不存在"
+#: umldoc.cpp:936
+msgid "class diagram"
+msgstr "类图"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Create Folder"
-msgstr "创建文件夹"
+#: umldoc.cpp:938
+msgid "sequence diagram"
+msgstr "序列图"
 
-#: dialogs/codegenerationwizard.cpp:163
-msgid "Do Not Create"
-msgstr "不创建"
+#: umldoc.cpp:940
+msgid "collaboration diagram"
+msgstr "协作图"
 
-#: dialogs/codegenerationwizard.cpp:168
-msgid ""
-"The folder could not be created.\n"
-"Please make sure you have write access to its parent folder or select another, "
-"valid, folder."
-msgstr ""
-"无法创建文件夹。\n"
-"请确保对其父文件夹有写权限，或者另选一个有效的文件夹。"
+#: umldoc.cpp:942
+msgid "state diagram"
+msgstr "状态图"
 
-#: dialogs/codegenerationwizard.cpp:169
-msgid "Error Creating Folder"
-msgstr "创建文件夹出错"
+#: umldoc.cpp:944
+msgid "activity diagram"
+msgstr "活动图"
 
-#: dialogs/codegenerationwizard.cpp:176
-msgid "Please select a valid folder."
-msgstr "请选择一个有效的文件夹。"
+#: umldoc.cpp:946
+msgid "component diagram"
+msgstr "组件图"
 
-#: dialogs/codegenerationwizard.cpp:184
-msgid ""
-"The output folder exists, but it is not writable.\n"
-"Please set the appropriate permissions or choose another folder."
-msgstr ""
-"输出文件夹已存在，但不可写。\n"
-"请设置正确的权限或另选一个文件夹。"
+#: umldoc.cpp:948
+msgid "deployment diagram"
+msgstr "部署图"
 
-#: dialogs/codegenerationwizard.cpp:185
-msgid "Error Writing to Output Folder"
-msgstr "写入输出文件夹时出错"
+#: umldoc.cpp:950
+msgid "entity relationship diagram"
+msgstr "实体关系图"
 
-#: dialogs/codegenerationwizard.cpp:191
-msgid "%1 does not seem to be a folder. Please choose a valid folder."
-msgstr "%1 不像是文件夹。请选择一个有效的文件夹。"
+#: umldoc.cpp:984 umldoc.cpp:1017
+msgid "That is an invalid name for a diagram."
+msgstr "图名无效。"
 
-#: dialogs/codegenerationwizard.cpp:192
-msgid "Please Choose Valid Folder"
-msgstr "请选择有效的文件夹"
+#: umldoc.cpp:998 umldoc.cpp:1025
+msgid "A diagram is already using that name."
+msgstr "图名已被使用。"
 
-#: dialogs/statedialog.cpp:85
-msgid "Initial state"
-msgstr "初始状态"
+#: umldoc.cpp:1099
+msgid "Are you sure you want to delete diagram %1?"
+msgstr "确认要删除图 %1 吗？"
 
-#: dialogs/statedialog.cpp:85
-msgid "End state"
-msgstr "终止状态"
+#: umldoc.cpp:1099
+msgid "Delete Diagram"
+msgstr "删除图"
 
-#: dialogs/statedialog.cpp:96
-msgid "State type:"
-msgstr "状态类型："
+#: umldoc.cpp:1573
+msgid "Setting up the document..."
+msgstr "正在建立文档..."
 
-#: dialogs/statedialog.cpp:101
-msgid "State name:"
-msgstr "状态名称："
+#: umldoc.cpp:1600
+msgid "Resolving object references..."
+msgstr "正在解决对象引用..."
 
-#: dialogs/statedialog.cpp:130
-msgid "Widget Color"
-msgstr "组件颜色"
+#: umldoc.cpp:1638
+msgid "Loading UML elements..."
+msgstr "正在载入 UML 元素...."
 
-#: dialogs/assocpropdlg.cpp:87 dialogs/classpropdlg.cpp:69
-#: dialogs/classpropdlg.cpp:170 dialogs/classpropdlg.cpp:232
-#: dialogs/settingsdlg.cpp:99 dialogs/umlviewdialog.cpp:70
-msgid "General Settings"
-msgstr "常规设置"
+#: umldoc.cpp:1811
+msgid "Loading diagrams..."
+msgstr "正在载入图..."
 
-#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
-msgid "Display"
-msgstr "显示"
+#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
+msgid "kde-uml-Diagram"
+msgstr "kde-uml-Diagram"
 
-#: dialogs/umlviewdialog.cpp:93
-msgid "Classes Display Options"
-msgstr "类显示选项"
+#: umldoc.cpp:2104
+#, c-format
+msgid "/autosave%1"
+msgstr "/自动保存 %1"
 
-#: dialogs/umlviewdialog.cpp:100
-msgid "Diagram Colors"
-msgstr "图表颜色"
+#: classifier.cpp:201
+msgid ""
+"An operation with the same name and signature already exists. You can not add "
+"it again."
+msgstr "有同样名称和签名的操作已经存在，不能再次添加。"
 
-#: dialogs/umlviewdialog.cpp:164
-msgid "The name you have entered is invalid."
-msgstr "所输入的名称无效。"
+#: refactoring/refactoringassistant.cpp:289
+msgid "Add Base Class"
+msgstr "添加基类"
 
-#: classifier.cpp:294 classifier.cpp:522 dialogs/umlviewdialog.cpp:165
-#: entity.cpp:78 enum.cpp:76 object_factory.cpp:159 umldoc.cpp:984
-#: umldoc.cpp:1017 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "Invalid Name"
-msgstr "无效名称"
+#: refactoring/refactoringassistant.cpp:290
+msgid "Add Derived Class"
+msgstr "添加派生类"
 
-#: dialogs/umlviewdialog.cpp:170
-msgid "The name you have entered is not unique."
-msgstr "所输入的名称不唯一。"
+#: refactoring/refactoringassistant.cpp:292
+#: refactoring/refactoringassistant.cpp:299
+#: refactoring/refactoringassistant.cpp:313
+msgid "Add Operation"
+msgstr "添加操作"
 
-#: dialogs/umlviewdialog.cpp:171 umldoc.cpp:1068 umllistview.cpp:1918
-#: umllistview.cpp:1925 umllistview.cpp:2162
-msgid "Name Not Unique"
-msgstr "名称不唯一"
+#: refactoring/refactoringassistant.cpp:293
+#: refactoring/refactoringassistant.cpp:317
+msgid "Add Attribute"
+msgstr "添加属性"
 
-#. i18n: file dialogs/codeviewerdialogbase.ui line 21
-#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
-#, no-c-format
-msgid "Code Viewer"
-msgstr "代码查看器"
+#: refactoring/refactoringassistant.cpp:297
+msgid "Add Base Interface"
+msgstr "添加基接口"
+
+#: refactoring/refactoringassistant.cpp:298
+msgid "Add Derived Interface"
+msgstr "添加派生接口"
+
+#: refactoring/refactoringassistant.cpp:355
+#: refactoring/refactoringassistant.cpp:511
+msgid "Base Classifiers"
+msgstr "基分类器"
+
+#: refactoring/refactoringassistant.cpp:397
+#: refactoring/refactoringassistant.cpp:530
+msgid "Derived Classifiers"
+msgstr "派生分类器"
 
 #: dialogs/classifierlistpage.cpp:38 dialogs/classpropdlg.cpp:179
 #: listpopupmenu.cpp:670 refactoring/refactoringassistant.cpp:482
 msgid "Attributes"
 msgstr "属性"
 
-#: dialogs/classifierlistpage.cpp:39
-msgid "N&ew Attribute..."
-msgstr "新建属性(&E)..."
-
 #: dialogs/classifierlistpage.cpp:41 dialogs/classpropdlg.cpp:187
 #: listpopupmenu.cpp:674 refactoring/refactoringassistant.cpp:499
 msgid "Operations"
 msgstr "操作"
 
-#: dialogs/classifierlistpage.cpp:42
-msgid "N&ew Operation..."
-msgstr "新建操作(&E)..."
-
-#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
-msgid "Templates"
-msgstr "模板"
-
-#: dialogs/classifierlistpage.cpp:45
-msgid "N&ew Template..."
-msgstr "新建模板(&E)..."
+#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
+msgid ""
+"An operation with that signature already exists in %1.\n"
+msgstr ""
+"具有同样签名的操作已经存在于 %1。\n"
 
-#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
-msgid "Enum Literals"
-msgstr "枚举常量"
+#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
+msgid "Choose a different name or parameter list."
+msgstr "选择不同的名称或参数列表。"
 
-#: dialogs/classifierlistpage.cpp:48
-msgid "N&ew Enum Literal..."
-msgstr "新建枚举常量(&E)..."
+#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
+#: refactoring/refactoringassistant.cpp:656
+msgid "Operation Name Invalid"
+msgstr "操作名称无效"
 
-#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes"
-msgstr "实体属性"
+#: folder.cpp:289
+msgid "The folderfile %1 does not exist."
+msgstr "文件夹文件 %1 不存在。"
 
-#: dialogs/classifierlistpage.cpp:51
-msgid "N&ew Entity Attribute..."
-msgstr "新建实体属性(&E)..."
+#: folder.cpp:293
+msgid "The folderfile %1 cannot be opened."
+msgstr "文件夹文件 %1 无法打开。"
 
-#: dialogs/classifierlistpage.cpp:101 dialogs/umloperationdialog.cpp:143
-#: uml.cpp:273
-msgid "&Properties"
-msgstr "属性(&P)"
+#: dialogs/assocpropdlg.cpp:39
+msgid "Association Properties"
+msgstr "关联属性"
 
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
-#: dialogs/umlroledialog.cpp:25 rc.cpp:483
+#. i18n: file codegenerators/cppcodegenerationformbase.ui line 118
+#: dialogs/activitydialog.cpp:73 dialogs/assocpropdlg.cpp:87
+#: dialogs/classpropdlg.cpp:69 dialogs/classpropdlg.cpp:170
+#: dialogs/classpropdlg.cpp:232 dialogs/settingsdlg.cpp:99
+#: dialogs/statedialog.cpp:88 dialogs/umlviewdialog.cpp:70 rc.cpp:45
+#: rc.cpp:225
 #, no-c-format
-msgid "Role Properties"
-msgstr "角色属性"
-
-#: dialogs/classpropdlg.cpp:118
-msgid "Display Options"
-msgstr "显示选项"
-
-#: dialogs/classpropdlg.cpp:179
-msgid "Attribute Settings"
-msgstr "属性设置"
+msgid "General"
+msgstr "常规"
 
-#: dialogs/classpropdlg.cpp:187
-msgid "Operation Settings"
-msgstr "操作设置"
+#: dialogs/assocpropdlg.cpp:87 dialogs/classpropdlg.cpp:69
+#: dialogs/classpropdlg.cpp:170 dialogs/classpropdlg.cpp:232
+#: dialogs/settingsdlg.cpp:99 dialogs/umlviewdialog.cpp:70
+msgid "General Settings"
+msgstr "常规设置"
 
-#: dialogs/classpropdlg.cpp:195
-msgid "Templates Settings"
-msgstr "模板设置"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Roles"
+msgstr "角色"
 
-#: dialogs/classpropdlg.cpp:202
-msgid "Enum Literals Settings"
-msgstr "枚举常量设置"
+#: dialogs/assocpropdlg.cpp:94
+msgid "Role Settings"
+msgstr "角色设置"
 
-#: dialogs/classpropdlg.cpp:209
-msgid "Entity Attributes Settings"
-msgstr "实体属性设置"
+#: dialogs/activitydialog.cpp:108 dialogs/assocpropdlg.cpp:109
+#: dialogs/classpropdlg.cpp:243 dialogs/settingsdlg.cpp:306
+#: dialogs/statedialog.cpp:124 dialogs/umlviewdialog.cpp:107
+msgid "Font Settings"
+msgstr "字体设置"
 
-#: dialogs/classpropdlg.cpp:216
-msgid "Contents Settings"
-msgstr "内容设置"
+#: dialogs/assocpropdlg.cpp:112
+msgid "Association font"
+msgstr "关联字体"
 
-#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
-msgid "Associations"
-msgstr "关联"
+#: dialogs/defaultcodegenpolicypage.cpp:36
+msgid "<p align=\"center\">No Options Available.</p>"
+msgstr "<p align=\"center\">无可用选项。</p>"
 
-#: dialogs/classpropdlg.cpp:222
-msgid "Class Associations"
-msgstr "类关联"
+#. i18n: file dialogs/codeviewerdialogbase.ui line 21
+#: dialogs/codeviewerdialog.cpp:119 dialogs/settingsdlg.cpp:301 rc.cpp:366
+#, no-c-format
+msgid "Code Viewer"
+msgstr "代码查看器"
 
 #: dialogs/umloperationdialog.cpp:50
 msgid "Operation Properties"
 msgstr "操作属性"
 
+#: dialogs/activitydialog.cpp:73 dialogs/statedialog.cpp:88
+#: dialogs/umlattributedialog.cpp:55 dialogs/umlentityattributedialog.cpp:56
+#: dialogs/umloperationdialog.cpp:64 dialogs/umltemplatedialog.cpp:48
+msgid "General Properties"
+msgstr "常规属性"
+
 #: dialogs/parmpropdlg.cpp:70 dialogs/umlattributedialog.cpp:68
 #: dialogs/umlentityattributedialog.cpp:69 dialogs/umloperationdialog.cpp:74
 #: dialogs/umltemplatedialog.cpp:61
@@ -664,36 +1660,15 @@ msgstr "所选择的参数名称已经在此操作中使用。"
 msgid "You have entered an invalid operation name."
 msgstr "所输入的操作名称无效。"
 
-#: dialogs/umloperationdialog.cpp:457 dialogs/umloperationdialog.cpp:469
-#: refactoring/refactoringassistant.cpp:656
-msgid "Operation Name Invalid"
-msgstr "操作名称无效"
-
-#: dialogs/umloperationdialog.cpp:466 refactoring/refactoringassistant.cpp:653
-msgid ""
-"An operation with that signature already exists in %1.\n"
-msgstr ""
-"具有同样签名的操作已经存在于 %1。\n"
-
-#: dialogs/umloperationdialog.cpp:468 refactoring/refactoringassistant.cpp:655
-msgid "Choose a different name or parameter list."
-msgstr "选择不同的名称或参数列表。"
-
-#: dialogs/classwizard.cpp:33 model_utils.cpp:242
-msgid "new_class"
-msgstr "新类"
-
-#: dialogs/classwizard.cpp:54
-msgid "New Class"
-msgstr "新类"
-
-#: dialogs/classwizard.cpp:59
-msgid "Class Attributes"
-msgstr "类属性"
+#. i18n: file dialogs/diagrampropertiespage.ui line 61
+#: dialogs/assocgenpage.cpp:67 rc.cpp:408
+#, no-c-format
+msgid "Name:"
+msgstr "名称："
 
-#: dialogs/classwizard.cpp:63
-msgid "Class Operations"
-msgstr "类操作"
+#: dialogs/assocgenpage.cpp:80
+msgid "Type:"
+msgstr "类型："
 
 #: dialogs/parmpropdlg.cpp:35
 msgid "Parameter Properties"
@@ -713,31 +1688,6 @@ msgid ""
 "is a parameter for reading and writing."
 msgstr "“in”为只读参数，“out”为只写参数，“inout”为可读写参数。"
 
-#: dialogs/umlattributedialog.cpp:42
-msgid "Attribute Properties"
-msgstr "属性特性"
-
-#: dialogs/umlattributedialog.cpp:91
-msgid "&Public"
-msgstr "公有(&P)"
-
-#: dialogs/umlattributedialog.cpp:155
-msgid "You have entered an invalid attribute name."
-msgstr "所属入的属性名称无效。"
-
-#: dialogs/umlattributedialog.cpp:156
-msgid "Attribute Name Invalid"
-msgstr "属性名称无效"
-
-#: dialogs/umlattributedialog.cpp:163
-msgid ""
-"The attribute name you have chosen is already being used in this operation."
-msgstr "所选择的属性名称已经在此操作中使用。"
-
-#: dialogs/umlattributedialog.cpp:164
-msgid "Attribute Name Not Unique"
-msgstr "属性名称不唯一"
-
 #: dialogs/classgenpage.cpp:50
 msgid "Class &name:"
 msgstr "类名(&N)："
@@ -866,284 +1816,6 @@ msgstr ""
 msgid "Name is Not Unique"
 msgstr "名称不唯一"
 
-#: dialogs/umlentityattributedialog.cpp:43
-msgid "Entity Attribute Properties"
-msgstr "实体属性特性"
-
-#: dialogs/umlentityattributedialog.cpp:73
-msgid "&Default value:"
-msgstr "默认值(&D)："
-
-#: dialogs/umlentityattributedialog.cpp:81
-msgid "Length/Values:"
-msgstr "长度/值："
-
-#: dialogs/umlentityattributedialog.cpp:84
-msgid "&Auto increment"
-msgstr "自动增加(&A)"
-
-#: dialogs/umlentityattributedialog.cpp:88
-msgid "Allow &null"
-msgstr "允许空(&N)"
-
-#: dialogs/umlentityattributedialog.cpp:92
-msgid "Attributes:"
-msgstr "属性："
-
-#: dialogs/umlentityattributedialog.cpp:108
-msgid "Indexing"
-msgstr "索引"
-
-#: dialogs/umlentityattributedialog.cpp:112
-msgid "&None"
-msgstr "无(&N)"
-
-#: dialogs/umlentityattributedialog.cpp:115
-msgid "&Primary"
-msgstr "主键(&P)"
-
-#: dialogs/umlentityattributedialog.cpp:118
-msgid "&Index"
-msgstr "索引(&I)"
-
-#: dialogs/umlentityattributedialog.cpp:121
-msgid "&Unique"
-msgstr "唯一(&U)"
-
-#: dialogs/umlentityattributedialog.cpp:184
-msgid "You have entered an invalid entity attribute name."
-msgstr "您所输入的实体属性名称无效。"
-
-#: dialogs/umlentityattributedialog.cpp:185
-msgid "Entity Attribute Name Invalid"
-msgstr "实体属性名称无效"
-
-#: dialogs/umlentityattributedialog.cpp:192
-msgid ""
-"The entity attribute name you have chosen is already being used in this "
-"operation."
-msgstr "所选择的实体属性名称已经在此操作中使用。"
-
-#: dialogs/umlentityattributedialog.cpp:193
-msgid "Entity Attribute Name Not Unique"
-msgstr "实体属性名称不唯一"
-
-#: dialogs/diagramprintpage.cpp:35
-msgid "&Diagrams"
-msgstr "图表(&D)"
-
-#: dialogs/diagramprintpage.cpp:40
-msgid "Filter"
-msgstr "过滤器"
-
-#: dialogs/diagramprintpage.cpp:48
-msgid "&Current diagram"
-msgstr "当前图表(&C)"
-
-#: dialogs/diagramprintpage.cpp:53
-msgid "&All diagrams"
-msgstr "全部图表(&A)"
-
-#: dialogs/diagramprintpage.cpp:57
-msgid "&Select diagrams"
-msgstr "选择图表(&S)"
-
-#: dialogs/diagramprintpage.cpp:61
-msgid "&Type of diagram"
-msgstr "图表类型(&T)"
-
-#: dialogs/diagramprintpage.cpp:65
-msgid "Selection"
-msgstr "选中内容"
-
-#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
-msgid "Collaboration"
-msgstr "协作图"
-
-#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
-msgid "Sequence"
-msgstr "序列"
-
-#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
-msgid "Deployment"
-msgstr "部署"
-
-#: dialogs/diagramprintpage.cpp:111 umldoc.cpp:1918
-msgid "kde-uml-Diagram"
-msgstr "kde-uml-Diagram"
-
-#: dialogs/diagramprintpage.cpp:135
-msgid "No diagrams selected."
-msgstr "没有选择图表。"
-
-#: dialogs/assocrolepage.cpp:50
-msgid "Role A Properties"
-msgstr "角色 A 属性"
-
-#: dialogs/assocrolepage.cpp:51
-msgid "Role B Properties"
-msgstr "角色 B 属性"
-
-#: dialogs/assocrolepage.cpp:68
-msgid "Role A Visibility"
-msgstr "角色 A 可见性"
-
-#: dialogs/assocrolepage.cpp:69
-msgid "Role B Visibility"
-msgstr "角色 B 可见性"
-
-#: dialogs/assocrolepage.cpp:70
-msgid "Role A Changeability"
-msgstr "角色 A 可变性"
-
-#: dialogs/assocrolepage.cpp:71
-msgid "Role B Changeability"
-msgstr "角色 B 可变性"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
-#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
-#, no-c-format
-msgid "Rolename:"
-msgstr "角色名称："
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
-#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
-#, no-c-format
-msgid "Multiplicity:"
-msgstr "多重性："
-
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 129
-#: dialogs/assocrolepage.cpp:106 dialogs/assocrolepage.cpp:166
-#: dialogs/settingsdlg.cpp:259 dialogs/settingsdlg.cpp:267 rc.cpp:120
-#: rc.cpp:138 rc.cpp:177 rc.cpp:195 rc.cpp:510
-#, no-c-format
-msgid "Public"
-msgstr "公有"
-
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 134
-#: dialogs/assocrolepage.cpp:109 dialogs/assocrolepage.cpp:169
-#: dialogs/settingsdlg.cpp:260 dialogs/settingsdlg.cpp:268 rc.cpp:123
-#: rc.cpp:141 rc.cpp:180 rc.cpp:198 rc.cpp:513
-#, no-c-format
-msgid "Private"
-msgstr "私有"
-
-#. i18n: file codegenerators/javacodegenerationformbase.ui line 139
-#: dialogs/assocrolepage.cpp:112 dialogs/assocrolepage.cpp:172
-#: dialogs/settingsdlg.cpp:261 dialogs/settingsdlg.cpp:269 rc.cpp:126
-#: rc.cpp:144 rc.cpp:183 rc.cpp:201 rc.cpp:516
-#, no-c-format
-msgid "Protected"
-msgstr "保护"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
-#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
-#, no-c-format
-msgid "Implementation"
-msgstr "实现"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
-#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
-#, no-c-format
-msgid "Changeable"
-msgstr "可变性"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
-#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
-#, no-c-format
-msgid "Frozen"
-msgstr "冻结"
-
-#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
-#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
-#, no-c-format
-msgid "Add only"
-msgstr "只添加"
-
-#: dialogs/umlwidgetcolorpage.cpp:58
-msgid "&Line:"
-msgstr "线条(&L)："
-
-#: dialogs/umlwidgetcolorpage.cpp:68
-msgid "&Fill:"
-msgstr "填充(&F)："
-
-#: dialogs/umlwidgetcolorpage.cpp:75
-msgid "D&efault"
-msgstr "默认(&E)"
-
-#: dialogs/umlwidgetcolorpage.cpp:78
-msgid "&Use fill"
-msgstr "使用填充(&U)"
-
-#: dialogs/umltemplatedialog.cpp:36
-msgid "Template Properties"
-msgstr "模板属性"
-
-#: dialogs/umltemplatedialog.cpp:128
-msgid "You have entered an invalid template name."
-msgstr "所输入的模板名称无效。"
-
-#: dialogs/umltemplatedialog.cpp:129
-msgid "Template Name Invalid"
-msgstr "模板名称无效"
-
-#: dialogs/umltemplatedialog.cpp:138
-msgid ""
-"The template parameter name you have chosen is already being used in this "
-"operation."
-msgstr "所选择的模板参数名称已经在此操作中使用。"
-
-#: dialogs/umltemplatedialog.cpp:139
-msgid "Template Name Not Unique"
-msgstr "模板名称不唯一"
-
-#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
-#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
-#, no-c-format
-msgid "The format that the images will be exported to"
-msgstr ""
-
-#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
-msgid "Select Operation"
-msgstr "选择操作"
-
-#: dialogs/selectopdlg.cpp:43
-msgid "Sequence number:"
-msgstr "序列号："
-
-#: dialogs/selectopdlg.cpp:46
-msgid "Class operation:"
-msgstr "类操作："
-
-#: dialogs/selectopdlg.cpp:54
-msgid "Custom operation:"
-msgstr "自定义操作："
-
-#: dialogs/notedialog.cpp:25
-msgid "Note Documentation"
-msgstr "注解文档"
-
-#: dialogs/pkgcontentspage.cpp:29
-msgid "Contained Items"
-msgstr "包含项目"
-
-#: dialogs/assocpropdlg.cpp:39
-msgid "Association Properties"
-msgstr "关联属性"
-
-#: dialogs/assocpropdlg.cpp:94
-msgid "Roles"
-msgstr "角色"
-
-#: dialogs/assocpropdlg.cpp:94
-msgid "Role Settings"
-msgstr "角色设置"
-
-#: dialogs/assocpropdlg.cpp:112
-msgid "Association font"
-msgstr "关联字体"
-
 #: dialogs/settingsdlg.cpp:30
 msgid "Umbrello Setup"
 msgstr "Umbrello 设置"
@@ -1156,6 +1828,14 @@ msgstr "用户界面"
 msgid "User Interface Settings"
 msgstr "用户界面设置"
 
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125 dialogs/settingsdlg.cpp:49
+#: dialogs/statedialog.cpp:130 dialogs/umlviewdialog.cpp:100
+#: dialogs/umlwidgetcolorpage.cpp:53 listpopupmenu.cpp:739
+#: listpopupmenu.cpp:750
+msgid "Color"
+msgstr "颜色"
+
 #: dialogs/settingsdlg.cpp:54
 msgid "Line color:"
 msgstr "线条颜色："
@@ -1331,6 +2011,30 @@ msgstr "默认属性范围："
 msgid "Default operation scope:"
 msgstr "默认操作范围："
 
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 129
+#: dialogs/assocrolepage.cpp:106 dialogs/assocrolepage.cpp:166
+#: dialogs/settingsdlg.cpp:259 dialogs/settingsdlg.cpp:267 rc.cpp:120
+#: rc.cpp:138 rc.cpp:177 rc.cpp:195 rc.cpp:510
+#, no-c-format
+msgid "Public"
+msgstr "公有"
+
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 134
+#: dialogs/assocrolepage.cpp:109 dialogs/assocrolepage.cpp:169
+#: dialogs/settingsdlg.cpp:260 dialogs/settingsdlg.cpp:268 rc.cpp:123
+#: rc.cpp:141 rc.cpp:180 rc.cpp:198 rc.cpp:513
+#, no-c-format
+msgid "Private"
+msgstr "私有"
+
+#. i18n: file codegenerators/javacodegenerationformbase.ui line 139
+#: dialogs/assocrolepage.cpp:112 dialogs/assocrolepage.cpp:172
+#: dialogs/settingsdlg.cpp:261 dialogs/settingsdlg.cpp:269 rc.cpp:126
+#: rc.cpp:144 rc.cpp:183 rc.cpp:201 rc.cpp:516
+#, no-c-format
+msgid "Protected"
+msgstr "保护"
+
 #: dialogs/settingsdlg.cpp:294
 msgid "Code Generation"
 msgstr "代码生成"
@@ -1343,1259 +2047,616 @@ msgstr "代码生成设置"
 msgid "Code Viewer Settings"
 msgstr "代码查看器设置"
 
-#: dialogs/defaultcodegenpolicypage.cpp:36
-msgid "<p align=\"center\">No Options Available.</p>"
-msgstr "<p align=\"center\">无可用选项。</p>"
-
-#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
-#: listpopupmenu.cpp:699
-msgid "Show"
-msgstr "显示"
-
-#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
-msgid "Operatio&ns"
-msgstr "操作(&N)"
-
-#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
-msgid "&Visibility"
-msgstr "可见性(&V)"
+#: dialogs/assocpage.cpp:25 dialogs/classpropdlg.cpp:222
+msgid "Associations"
+msgstr "关联"
 
-#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
-msgid "O&peration signature"
-msgstr "操作签名(&P)"
+#: dialogs/pkgcontentspage.cpp:29
+msgid "Contained Items"
+msgstr "包含项目"
 
-#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
-msgid "Pac&kage"
-msgstr "包(&K)"
+#: dialogs/activitydialog.cpp:114 dialogs/classpropdlg.cpp:75
+#: dialogs/classpropdlg.cpp:125
+msgid "Widget Colors"
+msgstr "组件颜色"
 
-#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
-msgid "Att&ributes"
-msgstr "属性(&R)"
+#: dialogs/classpropdlg.cpp:118 dialogs/umlviewdialog.cpp:93
+msgid "Display"
+msgstr "显示"
 
-#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
-msgid "Stereot&ype"
-msgstr "构造型(&Y)"
+#: dialogs/classpropdlg.cpp:118
+msgid "Display Options"
+msgstr "显示选项"
 
-#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
-msgid "Attr&ibute signature"
-msgstr "属性签名(&I)"
+#: dialogs/classpropdlg.cpp:179
+msgid "Attribute Settings"
+msgstr "属性设置"
 
-#: dialogs/classoptionspage.cpp:108
-msgid "Draw as circle"
-msgstr "绘制成圆"
+#: dialogs/classpropdlg.cpp:187
+msgid "Operation Settings"
+msgstr "操作设置"
 
-#. i18n: file dialogs/diagrampropertiespage.ui line 61
-#: dialogs/assocgenpage.cpp:67 rc.cpp:408
-#, no-c-format
-msgid "Name:"
-msgstr "名称："
+#: dialogs/classifierlistpage.cpp:44 dialogs/classpropdlg.cpp:195
+msgid "Templates"
+msgstr "模板"
 
-#: dialogs/assocgenpage.cpp:80
-msgid "Type:"
-msgstr "类型："
+#: dialogs/classpropdlg.cpp:195
+msgid "Templates Settings"
+msgstr "模板设置"
 
-#: umllistview.cpp:348
-msgid "Externalize Folder"
-msgstr "外部化文件夹"
+#: dialogs/classifierlistpage.cpp:47 dialogs/classpropdlg.cpp:202
+msgid "Enum Literals"
+msgstr "枚举常量"
 
-#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
-#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umllistview.cpp:384
-#: umlviewimageexportermodel.cpp:158
-#, c-format
-msgid "There was a problem saving file: %1"
-msgstr "保存文件出错：%1"
+#: dialogs/classpropdlg.cpp:202
+msgid "Enum Literals Settings"
+msgstr "枚举常量设置"
 
-#: docgenerators/docbookgenerator.cpp:99 umldoc.cpp:556 umldoc.cpp:565
-#: umldoc.cpp:585 umldoc.cpp:620 umldoc.cpp:633 umldoc.cpp:641
-#: umllistview.cpp:385
-msgid "Save Error"
-msgstr "保存出错"
+#: dialogs/classifierlistpage.cpp:50 dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes"
+msgstr "实体属性"
 
-#: umllistview.cpp:416
-msgid "Enter Model Name"
-msgstr "输入模型名称"
+#: dialogs/classpropdlg.cpp:209
+msgid "Entity Attributes Settings"
+msgstr "实体属性设置"
 
-#: umllistview.cpp:417
-msgid "Enter the new name of the model:"
-msgstr "输入模型的新名称："
+#: dialogs/classpropdlg.cpp:216
+msgid "Contents Settings"
+msgstr "内容设置"
 
-#: umllistview.cpp:1007
-msgid "Views"
-msgstr "视图"
+#: dialogs/classpropdlg.cpp:222
+msgid "Class Associations"
+msgstr "类关联"
 
-#: umllistview.cpp:1907
-msgid ""
-"The name you entered was invalid.\n"
-"Creation process has been canceled."
-msgstr ""
-"所输入的名称无效。\n"
-"创建进程已被取消。"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 36
+#: dialogs/umlroledialog.cpp:25 rc.cpp:483
+#, no-c-format
+msgid "Role Properties"
+msgstr "角色属性"
 
-#: umllistview.cpp:1908 umllistviewitem.cpp:479
-msgid "Name Not Valid"
-msgstr "名称无效"
+#: dialogs/umlentityattributedialog.cpp:43
+msgid "Entity Attribute Properties"
+msgstr "实体属性特性"
 
-#: umldoc.cpp:1067 umllistview.cpp:1917
-msgid ""
-"The name you entered was not unique.\n"
-"Is this what you wanted?"
-msgstr ""
-"所输入的名称不唯一。\n"
-"您就要这样吗？"
+#: dialogs/umlentityattributedialog.cpp:73
+msgid "&Default value:"
+msgstr "默认值(&D)："
 
-#: umldoc.cpp:1068 umllistview.cpp:1918
-msgid "Use Name"
-msgstr "使用名称"
+#: dialogs/umlentityattributedialog.cpp:81
+msgid "Length/Values:"
+msgstr "长度/值："
 
-#: umldoc.cpp:1068 umllistview.cpp:1918
-msgid "Enter New Name"
-msgstr "输入新名称"
+#: dialogs/umlentityattributedialog.cpp:84
+msgid "&Auto increment"
+msgstr "自动增加(&A)"
 
-#: umllistview.cpp:1924 umllistview.cpp:2161
-msgid ""
-"The name you entered was not unique!\n"
-"Creation process has been canceled."
-msgstr ""
-"所输入的名称无效！\n"
-"创建进程已被取消。"
+#: dialogs/umlentityattributedialog.cpp:88
+msgid "Allow &null"
+msgstr "允许空(&N)"
 
-#: umllistview.cpp:2119 umllistview.cpp:2136 umllistview.cpp:2151
-msgid "Creation canceled"
-msgstr "创建已取消"
+#: dialogs/umlentityattributedialog.cpp:92
+msgid "Attributes:"
+msgstr "属性："
 
-#: umllistview.cpp:2339
-msgid "Loading listview..."
-msgstr "正在装入列表视图..."
+#: dialogs/umlentityattributedialog.cpp:108
+msgid "Indexing"
+msgstr "索引"
 
-#: umllistview.cpp:2671
-msgid "The folder must be emptied before it can be deleted."
-msgstr "文件夹清空后才能删除。"
+#: dialogs/umlentityattributedialog.cpp:112
+msgid "&None"
+msgstr "无(&N)"
 
-#: umllistview.cpp:2672
-msgid "Folder Not Empty"
-msgstr "文件夹不空"
+#: dialogs/umlentityattributedialog.cpp:115
+msgid "&Primary"
+msgstr "主键(&P)"
 
-#: enumliteral.cpp:65 floatingtextwidget.cpp:111 object_factory.cpp:153
-#: umldoc.cpp:976 umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
-msgid "Name"
-msgstr "名称"
+#: dialogs/umlentityattributedialog.cpp:118
+msgid "&Index"
+msgstr "索引(&I)"
 
-#: floatingtextwidget.cpp:112
-msgid "Enter operation name:"
-msgstr "输入操作名称："
+#: dialogs/umlentityattributedialog.cpp:121
+msgid "&Unique"
+msgstr "唯一(&U)"
 
-#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
-msgid "Enter role name:"
-msgstr "输入角色名称："
+#: dialogs/umlentityattributedialog.cpp:184
+msgid "You have entered an invalid entity attribute name."
+msgstr "您所输入的实体属性名称无效。"
 
-#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
-msgid "Enter multiplicity:"
-msgstr "输入多重性："
+#: dialogs/umlentityattributedialog.cpp:185
+msgid "Entity Attribute Name Invalid"
+msgstr "实体属性名称无效"
 
-#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
-msgid "Enter association name:"
-msgstr "输入关联名称："
+#: dialogs/umlentityattributedialog.cpp:192
+msgid ""
+"The entity attribute name you have chosen is already being used in this "
+"operation."
+msgstr "所选择的实体属性名称已经在此操作中使用。"
 
-#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
-msgid "Enter new text:"
-msgstr "输入新文本："
+#: dialogs/umlentityattributedialog.cpp:193
+msgid "Entity Attribute Name Not Unique"
+msgstr "实体属性名称不唯一"
 
-#: floatingtextwidget.cpp:175
-msgid "ERROR"
-msgstr "错误"
+#: dialogs/umlwidgetcolorpage.cpp:58
+msgid "&Line:"
+msgstr "线条(&L)："
 
-#: floatingtextwidget.cpp:264
-msgid "Change Text"
-msgstr "更改文本"
+#: dialogs/umlwidgetcolorpage.cpp:68
+msgid "&Fill:"
+msgstr "填充(&F)："
 
-#: codegenerator.cpp:473
-msgid ""
-"Cannot open file %1 for writing. Please make sure the folder exists and you "
-"have permissions to write to it."
-msgstr "无法写文件 %1。请确认文件夹存在且有写的权限。"
+#: dialogs/umlwidgetcolorpage.cpp:75
+msgid "D&efault"
+msgstr "默认(&E)"
 
-#: codegenerator.cpp:473
-msgid "Cannot Open File"
-msgstr "无法打开文件"
+#: dialogs/umlwidgetcolorpage.cpp:78
+msgid "&Use fill"
+msgstr "使用填充(&U)"
 
-#: codegenerator.cpp:531 codegenerators/simplecodegenerator.cpp:128
-msgid ""
-"Cannot create the folder:\n"
-msgstr ""
-"无法创建文件夹：\n"
+#: dialogs/overwritedialogue.cpp:27
+msgid "Destination File Already Exists"
+msgstr "目标文件已存在"
 
-#: codegenerator.cpp:532 codegenerators/simplecodegenerator.cpp:129
+#: dialogs/overwritedialogue.cpp:31
 msgid ""
+"The file %1 already exists in %2.\n"
 "\n"
-"Please check the access rights"
+"Umbrello can overwrite the file, generate a similar\n"
+"file name or not generate this file."
 msgstr ""
+"文件 %1 已存在于 %2 中。\n"
 "\n"
-"请检查访问权限"
-
-#: codegenerator.cpp:533 codegenerators/simplecodegenerator.cpp:130
-msgid "Cannot Create Folder"
-msgstr "无法创建文件夹"
-
-#: umlviewimageexporter.cpp:46
-msgid "Exporting view..."
-msgstr "正在导出视图..."
-
-#: umlviewimageexporter.cpp:50
-msgid ""
-"An error happened when exporting the image:\n"
-msgstr ""
-
-#: codeimport/classimport.cpp:39 uml.cpp:376 uml.cpp:483 uml.cpp:660
-#: uml.cpp:688 uml.cpp:712 uml.cpp:722 uml.cpp:753 uml.cpp:758 uml.cpp:783
-#: uml.cpp:793 uml.cpp:814 uml.cpp:819 uml.cpp:832 uml.cpp:839 uml.cpp:853
-#: uml.cpp:874 uml.cpp:887 umlviewimageexporter.cpp:52
-#: umlviewimageexporterall.cpp:73
-msgid "Ready."
-msgstr "就绪。"
-
-#: umlviewimageexporter.cpp:66
-msgid ""
-"The selected file %1 exists.\n"
-"Do you want to overwrite it?"
-msgstr ""
-"所选的文件 %1 已存在。\n"
-"您要覆盖吗？"
-
-#: umlviewimageexporter.cpp:67
-msgid "File Already Exists"
-msgstr "文件已经存在"
-
-#: aligntoolbar.cpp:40
-msgid "Align Left"
-msgstr "左对齐"
-
-#: aligntoolbar.cpp:41
-msgid "Align Right"
-msgstr "右对齐"
-
-#: aligntoolbar.cpp:42
-msgid "Align Top"
-msgstr "上对齐"
-
-#: aligntoolbar.cpp:43
-msgid "Align Bottom"
-msgstr "下对齐"
-
-#: aligntoolbar.cpp:44
-msgid "Align Vertical Middle"
-msgstr "垂直居中对齐"
-
-#: aligntoolbar.cpp:45
-msgid "Align Horizontal Middle"
-msgstr "水平居中对齐"
-
-#: aligntoolbar.cpp:46
-msgid "Align Vertical Distribute"
-msgstr "垂直分散对齐"
-
-#: aligntoolbar.cpp:47
-msgid "Align Horizontal Distribute"
-msgstr "水平分散对齐"
-
-#: aligntoolbar.cpp:383
-msgid ""
-"For alignment you have to select at least 2 objects like classes or actors. You "
-"can not align associations."
-msgstr "要进行对齐，您必须至少选择两个像类或主角这样的对象。您不能对齐关联。"
-
-#: enumliteral.cpp:65 object_factory.cpp:153 stereotype.cpp:76 umldoc.cpp:976
-#: umldoc.cpp:1012 umldoc.cpp:1033 umldoc.cpp:1059
-msgid "Enter name:"
-msgstr "输入名称："
-
-#: classifier.cpp:294 classifier.cpp:522 entity.cpp:78 enum.cpp:76
-#: object_factory.cpp:158 umldoc.cpp:1037 umldoc.cpp:1063
-msgid "That is an invalid name."
-msgstr "名称无效。"
-
-#: object_factory.cpp:164
-msgid ""
-"This is a reserved keyword for the language of the configured code generator."
-msgstr "这是配置的代码生成器语言所用的保留关键字。"
-
-#: object_factory.cpp:165
-msgid "Reserved Keyword"
-msgstr "保留的关键字"
-
-#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:169
-#: umldoc.cpp:1043 umldoc.cpp:1073
-msgid "That name is already being used."
-msgstr "名称已被使用。"
-
-#: classifier.cpp:296 classifier.cpp:524 entity.cpp:80 object_factory.cpp:170
-#: umldoc.cpp:998 umldoc.cpp:1025 umldoc.cpp:1043 umldoc.cpp:1073
-msgid "Not a Unique Name"
-msgstr "名称不唯一"
-
-#: umlviewimageexportermodel.cpp:126
-#, c-format
-msgid "Can not create directory: %1"
-msgstr "无法创建目录：%1"
-
-#: umlviewimageexportermodel.cpp:145
-msgid "Can not save an empty diagram"
-msgstr "无法保存一个空图"
-
-#: umlviewimageexportermodel.cpp:151
-#, c-format
-msgid "A problem occured while saving diagram in %1"
-msgstr "在 %1 中保存图时发生了错误"
-
-#: model_utils.cpp:244
-msgid "new_actor"
-msgstr "新主角"
-
-#: model_utils.cpp:246
-msgid "new_usecase"
-msgstr "新用例"
-
-#: model_utils.cpp:248
-msgid "new_package"
-msgstr "新包"
-
-#: model_utils.cpp:250
-msgid "new_component"
-msgstr "新组件"
-
-#: model_utils.cpp:252
-msgid "new_node"
-msgstr "新结点"
-
-#: model_utils.cpp:254
-msgid "new_artifact"
-msgstr "新工件"
-
-#: model_utils.cpp:256
-msgid "new_interface"
-msgstr "新接口"
-
-#: model_utils.cpp:258
-msgid "new_datatype"
-msgstr "新数据类型"
-
-#: model_utils.cpp:260
-msgid "new_enum"
-msgstr "新枚举"
-
-#: model_utils.cpp:262
-msgid "new_entity"
-msgstr "新实体"
-
-#: model_utils.cpp:264
-#, fuzzy
-msgid "new_folder"
-msgstr "新结点"
-
-#: model_utils.cpp:266 umlcanvasobject.cpp:147
-msgid "new_association"
-msgstr "新关联"
-
-#: model_utils.cpp:268
-msgid "new_object"
-msgstr "新对象"
-
-#: model_utils.cpp:559
-msgid "Empty"
-msgstr "空"
-
-#: model_utils.cpp:559
-msgid "Malformed argument"
-msgstr "参数格式不对"
-
-#: model_utils.cpp:560
-msgid "Unknown argument type"
-msgstr "未知的参数类型"
-
-#: model_utils.cpp:560
-msgid "Illegal method name"
-msgstr "非法函数名"
-
-#: model_utils.cpp:561
-msgid "Unknown return type"
-msgstr "未知的返回类型"
-
-#: model_utils.cpp:561
-msgid "Unspecified error"
-msgstr "未指定的错误"
-
-#: codeimport/classimport.cpp:34
-msgid "Importing file: %1 Progress: %2/%3"
-msgstr "导入文件：%1 进度：%2/%3"
-
-#: codeimport/import_utils.cpp:181
-msgid "Is the scope %1 a namespace or a class?"
-msgstr "范围 %1 是命名空间还是类？"
-
-#: codeimport/import_utils.cpp:182
-msgid "C++ Import Requests Your Help"
-msgstr "C++ 导入需要您的帮助"
-
-#: codeimport/import_utils.cpp:183
-msgid "Namespace"
-msgstr "命名空间"
-
-#: codeimport/kdevcppparser/parser.cpp:138
-msgid "<eof>"
-msgstr "<文件结尾>"
-
-#: codeimport/kdevcppparser/parser.cpp:323
-#: codeimport/kdevcppparser/parser.cpp:2679
-#: codeimport/kdevcppparser/parser.cpp:2878
-#: codeimport/kdevcppparser/parser.cpp:2884
-msgid "expression expected"
-msgstr "此处需要表达式"
-
-#: codeimport/kdevcppparser/parser.cpp:598
-msgid "Declaration syntax error"
-msgstr "声明语法错误"
-
-#: codeimport/kdevcppparser/parser.cpp:643
-#: codeimport/kdevcppparser/parser.cpp:2770
-#: codeimport/kdevcppparser/parser.cpp:3224
-msgid "} expected"
-msgstr "此处需要 }"
-
-#: codeimport/kdevcppparser/parser.cpp:684
-msgid "namespace expected"
-msgstr "此处需要 namespace"
+"Umbrello 可以覆盖文件、生成名称近似的文件或不生成文件。"
 
-#: codeimport/kdevcppparser/parser.cpp:688
-msgid "{ expected"
-msgstr "此处需要 {"
+#: dialogs/overwritedialogue.cpp:34
+msgid "&Apply to all remaining files"
+msgstr "应用到剩下的所有文件(&A)"
 
-#: codeimport/kdevcppparser/parser.cpp:761
-#: codeimport/kdevcppparser/parser.cpp:2965
-msgid "Namespace name expected"
-msgstr "此处需要 namespace 名称"
+#: dialogs/overwritedialogue.cpp:39
+msgid "&Generate Similar File Name"
+msgstr "生成名称近似的文件(&G)"
 
-#: codeimport/kdevcppparser/parser.cpp:869
-msgid "Need a type specifier to declare"
-msgstr "声明中需要指定类型"
+#: dialogs/overwritedialogue.cpp:40
+msgid "&Do Not Generate File"
+msgstr "不生成文件(&D)"
 
-#: codeimport/kdevcppparser/parser.cpp:938
-msgid "expected a declaration"
-msgstr "此处需要一个声明"
+#: dialogs/statedialog.cpp:85
+msgid "Initial state"
+msgstr "初始状态"
 
-#: codeimport/kdevcppparser/parser.cpp:1212
-#: codeimport/kdevcppparser/parser.cpp:2178
-msgid "Constant expression expected"
-msgstr "此处需要常量表达式"
+#: dialogs/statedialog.cpp:85
+msgid "End state"
+msgstr "终止状态"
 
-#: codeimport/kdevcppparser/parser.cpp:1281
-#: codeimport/kdevcppparser/parser.cpp:1378
-msgid "')' expected"
-msgstr "此处需要‘)’"
+#: dialogs/statedialog.cpp:96
+msgid "State type:"
+msgstr "状态类型："
 
-#: codeimport/kdevcppparser/parser.cpp:1451
-#: codeimport/kdevcppparser/parser.cpp:1914
-#: codeimport/kdevcppparser/parser.cpp:2392
-msgid "} missing"
-msgstr "缺少 }"
+#: dialogs/statedialog.cpp:101
+msgid "State name:"
+msgstr "状态名称："
 
-#: codeimport/kdevcppparser/parser.cpp:2074
-msgid "Member initializers expected"
-msgstr "此处需要成员初始值"
+#: dialogs/statedialog.cpp:130
+msgid "Widget Color"
+msgstr "组件颜色"
 
-#: codeimport/kdevcppparser/parser.cpp:2235
-msgid "Base class specifier expected"
-msgstr "此处需要指定基类"
+#: dialogs/activitypage.cpp:38 dialogs/statedialog.cpp:137
+msgid "Activities"
+msgstr "活动"
 
-#: codeimport/kdevcppparser/parser.cpp:2260
-msgid "Initializer clause expected"
-msgstr "此处需要初始化语句"
+#: dialogs/classifierlistpage.cpp:39
+msgid "N&ew Attribute..."
+msgstr "新建属性(&E)..."
 
-#: codeimport/kdevcppparser/parser.cpp:2303
-msgid "Identifier expected"
-msgstr "此处需要标识符"
+#: dialogs/classifierlistpage.cpp:42
+msgid "N&ew Operation..."
+msgstr "新建操作(&E)..."
 
-#: codeimport/kdevcppparser/parser.cpp:2337
-msgid "Type id expected"
-msgstr "此处需要类型标识"
+#: dialogs/classifierlistpage.cpp:45
+msgid "N&ew Template..."
+msgstr "新建模板(&E)..."
 
-#: codeimport/kdevcppparser/parser.cpp:2374
-msgid "Class name expected"
-msgstr "此处需要类名"
+#: dialogs/classifierlistpage.cpp:48
+msgid "N&ew Enum Literal..."
+msgstr "新建枚举常量(&E)..."
 
-#: codeimport/kdevcppparser/parser.cpp:2641
-#: codeimport/kdevcppparser/parser.cpp:2795
-#: codeimport/kdevcppparser/parser.cpp:2835
-#: codeimport/kdevcppparser/parser.cpp:3282
-msgid "condition expected"
-msgstr "此处需要条件"
+#: dialogs/classifierlistpage.cpp:51
+msgid "N&ew Entity Attribute..."
+msgstr "新建实体属性(&E)..."
 
-#: codeimport/kdevcppparser/parser.cpp:2648
-#: codeimport/kdevcppparser/parser.cpp:2670
-#: codeimport/kdevcppparser/parser.cpp:2802
-#: codeimport/kdevcppparser/parser.cpp:2813
-msgid "statement expected"
-msgstr "此处需要语句"
+#: dialogs/classwizard.cpp:33 model_utils.cpp:242
+msgid "new_class"
+msgstr "新类"
 
-#: codeimport/kdevcppparser/parser.cpp:2705
-msgid "for initialization expected"
-msgstr "此处需要 for 循环初始化"
+#: dialogs/classwizard.cpp:54
+msgid "New Class"
+msgstr "新类"
 
-#: codeimport/kdevcppparser/parser.cpp:3273
-msgid "catch expected"
-msgstr "此处需要 catch"
+#: dialogs/classwizard.cpp:59
+msgid "Class Attributes"
+msgstr "类属性"
 
-#: codeimport/kdevcppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "内部错误"
+#: dialogs/classwizard.cpp:63
+msgid "Class Operations"
+msgstr "类操作"
 
-#: codeimport/kdevcppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "在“%1”之前发生语法错误"
+#: dialogs/activitypage.cpp:72
+msgid "New Activity..."
+msgstr "新建活动..."
 
-#: codeimport/kdevcppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "在“%1”之前发生分析错误"
+#: dialogs/activitypage.cpp:75 floatingtextwidget.cpp:178
+msgid "Rename"
+msgstr "重命名"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "TDE 简体中文翻译组"
+#: dialogs/activitypage.cpp:134
+msgid "New Activity"
+msgstr "新建活动"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "i18n-translation@lists.linux.net.cn"
+#: dialogs/activitypage.cpp:153
+msgid "Rename Activity"
+msgstr "重命名活动"
 
-#: main.cpp:32 main.cpp:93
-msgid "Umbrello UML Modeller"
-msgstr "Umbrello UML 建模工具"
+#: dialogs/activitypage.cpp:153
+msgid "Enter the new name of the activity:"
+msgstr "输入活动的新名称："
 
-#: main.cpp:40
-msgid "File to open"
-msgstr "要打开的文件"
+#: dialogs/diagramprintpage.cpp:35
+msgid "&Diagrams"
+msgstr "图表(&D)"
 
-#: main.cpp:41
-msgid "export diagrams to extension and exit"
-msgstr "将图表导出为扩展并退出"
+#: dialogs/diagramprintpage.cpp:40
+msgid "Filter"
+msgstr "过滤器"
 
-#: main.cpp:42
-msgid "the local directory to save the exported diagrams in"
-msgstr ""
+#: dialogs/diagramprintpage.cpp:48
+msgid "&Current diagram"
+msgstr "当前图表(&C)"
 
-#: main.cpp:42
-msgid "the directory of the file"
-msgstr ""
+#: dialogs/diagramprintpage.cpp:53
+msgid "&All diagrams"
+msgstr "全部图表(&A)"
 
-#: main.cpp:43
-msgid ""
-"keep the tree structure used to store the views in the document in the target "
-"directory"
-msgstr ""
+#: dialogs/diagramprintpage.cpp:57
+msgid "&Select diagrams"
+msgstr "选择图表(&S)"
 
-#: main.cpp:95
-msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
-msgstr "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML 建模工具作者"
+#: dialogs/diagramprintpage.cpp:61
+msgid "&Type of diagram"
+msgstr "图表类型(&T)"
 
-#: docgenerators/main.cpp:67 main.cpp:98
-msgid "Umbrello UML Modeller Authors"
-msgstr "UML 建模工具作者"
+#: dialogs/diagramprintpage.cpp:65
+msgid "Selection"
+msgstr "选中内容"
 
-#: docgenerators/main.cpp:41 docgenerators/main.cpp:62
-#, fuzzy
-msgid "Umbrello UML Modeller autonomous code generator"
-msgstr "UML 建模工具作者"
+#: dialogs/diagramprintpage.cpp:93 dialogs/diagramprintpage.cpp:204
+msgid "Collaboration"
+msgstr "协作图"
 
-#: docgenerators/main.cpp:47
-#, fuzzy
-msgid "File to transform"
-msgstr "要打开的文件"
+#: dialogs/diagramprintpage.cpp:94 dialogs/diagramprintpage.cpp:200
+msgid "Sequence"
+msgstr "序列"
 
-#: docgenerators/main.cpp:48
-msgid "The XSLT file to use"
-msgstr ""
+#: dialogs/diagramprintpage.cpp:98 dialogs/diagramprintpage.cpp:212
+msgid "Deployment"
+msgstr "部署"
 
-#: docgenerators/main.cpp:64
-#, fuzzy
-msgid ""
-"(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller "
-"Authors"
-msgstr "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML 建模工具作者"
+#: dialogs/diagramprintpage.cpp:135
+msgid "No diagrams selected."
+msgstr "没有选择图表。"
 
-#: docgenerators/docbookgenerator.cpp:70 umlviewimageexporterall.cpp:58
-msgid "Exporting all views..."
-msgstr "导出全部视图..."
+#: dialogs/assocrolepage.cpp:50
+msgid "Role A Properties"
+msgstr "角色 A 属性"
 
-#: docgenerators/docbookgenerator.cpp:77 docgenerators/docbookgenerator.cpp:83
-#: umlviewimageexporterall.cpp:64 umlviewimageexporterall.cpp:70
-msgid "Some errors happened when exporting the images:"
-msgstr "导出图像时发生了错误："
+#: dialogs/assocrolepage.cpp:51
+msgid "Role B Properties"
+msgstr "角色 B 属性"
 
-#: association.cpp:84
-msgid "Generalization"
-msgstr "泛化"
+#: dialogs/assocrolepage.cpp:68
+msgid "Role A Visibility"
+msgstr "角色 A 可见性"
 
-#: association.cpp:88
-msgid "Self Association"
-msgstr "自身关联"
+#: dialogs/assocrolepage.cpp:69
+msgid "Role B Visibility"
+msgstr "角色 B 可见性"
 
-#: association.cpp:89
-msgid "Collaboration Message"
-msgstr "协作消息"
+#: dialogs/assocrolepage.cpp:70
+msgid "Role A Changeability"
+msgstr "角色 A 可变性"
 
-#: association.cpp:90
-msgid "Sequence Message"
-msgstr "序列消息"
+#: dialogs/assocrolepage.cpp:71
+msgid "Role B Changeability"
+msgstr "角色 B 可变性"
 
-#: association.cpp:91
-msgid "Collaboration Self Message"
-msgstr "协作自身消息"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 59
+#: dialogs/assocrolepage.cpp:93 dialogs/assocrolepage.cpp:152 rc.cpp:486
+#, no-c-format
+msgid "Rolename:"
+msgstr "角色名称："
 
-#: association.cpp:92
-msgid "Sequence Self Message"
-msgstr "序列自身消息"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 77
+#: dialogs/assocrolepage.cpp:99 dialogs/assocrolepage.cpp:158 rc.cpp:489
+#, no-c-format
+msgid "Multiplicity:"
+msgstr "多重性："
 
-#: association.cpp:95
-msgid "Realization"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 194
+#: dialogs/assocrolepage.cpp:115 dialogs/assocrolepage.cpp:175 rc.cpp:519
+#, no-c-format
+msgid "Implementation"
 msgstr "实现"
 
-#: association.cpp:96
-msgid "Uni Association"
-msgstr "单向关联"
-
-#: umldoc.cpp:82 umldoc.cpp:1518
-msgid "UML Model"
-msgstr "UML 模型"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 141
+#: dialogs/assocrolepage.cpp:132 dialogs/assocrolepage.cpp:192 rc.cpp:504
+#, no-c-format
+msgid "Changeable"
+msgstr "可变性"
 
-#: umldoc.cpp:106
-msgid "Logical View"
-msgstr "逻辑视图"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 133
+#: dialogs/assocrolepage.cpp:135 dialogs/assocrolepage.cpp:195 rc.cpp:501
+#, no-c-format
+msgid "Frozen"
+msgstr "冻结"
 
-#: umldoc.cpp:107
-msgid "Use Case View"
-msgstr "用例视图"
+#. i18n: file dialogs/umlrolepropertiesbase.ui line 125
+#: dialogs/assocrolepage.cpp:138 dialogs/assocrolepage.cpp:198 rc.cpp:498
+#, no-c-format
+msgid "Add only"
+msgstr "只添加"
 
-#: umldoc.cpp:108
-msgid "Component View"
-msgstr "组件视图"
+#: dialogs/umlattributedialog.cpp:42
+msgid "Attribute Properties"
+msgstr "属性特性"
 
-#: umldoc.cpp:109
-msgid "Deployment View"
-msgstr "部署视图"
+#: dialogs/umlattributedialog.cpp:91
+msgid "&Public"
+msgstr "公有(&P)"
 
-#: umldoc.cpp:110
-msgid "Entity Relationship Model"
-msgstr "实体关系模型"
+#: dialogs/umlattributedialog.cpp:155
+msgid "You have entered an invalid attribute name."
+msgstr "所属入的属性名称无效。"
 
-#: umldoc.cpp:117 umldoc.cpp:293
-msgid "Datatypes"
-msgstr "数据类型"
+#: dialogs/umlattributedialog.cpp:156
+msgid "Attribute Name Invalid"
+msgstr "属性名称无效"
 
-#: umldoc.cpp:229
+#: dialogs/umlattributedialog.cpp:163
 msgid ""
-"The current file has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"当前文件已修改。\n"
-"要保存吗？"
-
-#: umldoc.cpp:355
-msgid "The file %1 does not exist."
-msgstr "文件 %1 不存在。"
-
-#: folder.cpp:289 folder.cpp:293 umldoc.cpp:355 umldoc.cpp:380 umldoc.cpp:422
-#: umldoc.cpp:434 umldoc.cpp:448 umldoc.cpp:461 umldoc.cpp:472 umldoc.cpp:488
-msgid "Load Error"
-msgstr "加载出错"
-
-#: umldoc.cpp:380
-msgid "The file %1 seems to be corrupted."
-msgstr "文件 %1 似乎已损坏。"
-
-#: umldoc.cpp:422 umldoc.cpp:434 umldoc.cpp:461
-#, c-format
-msgid "There was no XMI file found in the compressed file %1."
-msgstr "压缩文件 %1 中未找到 XMI 文件。"
+"The attribute name you have chosen is already being used in this operation."
+msgstr "所选择的属性名称已经在此操作中使用。"
 
-#: umldoc.cpp:448
-#, c-format
-msgid "There was a problem loading the extracted file: %1"
-msgstr "加载提取出的文件出错：%1"
+#: dialogs/umlattributedialog.cpp:164
+msgid "Attribute Name Not Unique"
+msgstr "属性名称不唯一"
 
-#: umldoc.cpp:472 umldoc.cpp:488
-#, c-format
-msgid "There was a problem loading file: %1"
-msgstr "加载文件出错：%1"
+#: dialogs/classoptionspage.cpp:59 dialogs/classoptionspage.cpp:120
+#: listpopupmenu.cpp:699
+msgid "Show"
+msgstr "显示"
 
-#: umldoc.cpp:641
-#, c-format
-msgid "There was a problem uploading file: %1"
-msgstr "上载文件出错：%1"
+#: dialogs/classoptionspage.cpp:66 dialogs/classoptionspage.cpp:126
+msgid "Operatio&ns"
+msgstr "操作(&N)"
 
-#: umldoc.cpp:934
-msgid "use case diagram"
-msgstr "用例图"
+#: dialogs/classoptionspage.cpp:70 dialogs/classoptionspage.cpp:143
+msgid "&Visibility"
+msgstr "可见性(&V)"
 
-#: umldoc.cpp:936
-msgid "class diagram"
-msgstr "类图"
+#: dialogs/classoptionspage.cpp:79 dialogs/classoptionspage.cpp:130
+msgid "O&peration signature"
+msgstr "操作签名(&P)"
 
-#: umldoc.cpp:938
-msgid "sequence diagram"
-msgstr "序列图"
+#: dialogs/classoptionspage.cpp:83 dialogs/classoptionspage.cpp:147
+msgid "Pac&kage"
+msgstr "包(&K)"
 
-#: umldoc.cpp:940
-msgid "collaboration diagram"
-msgstr "协作图"
+#: dialogs/classoptionspage.cpp:90 dialogs/classoptionspage.cpp:135
+msgid "Att&ributes"
+msgstr "属性(&R)"
 
-#: umldoc.cpp:942
-msgid "state diagram"
-msgstr "状态图"
+#: dialogs/classoptionspage.cpp:94 dialogs/classoptionspage.cpp:151
+msgid "Stereot&ype"
+msgstr "构造型(&Y)"
 
-#: umldoc.cpp:944
-msgid "activity diagram"
-msgstr "活动图"
+#: dialogs/classoptionspage.cpp:98 dialogs/classoptionspage.cpp:139
+msgid "Attr&ibute signature"
+msgstr "属性签名(&I)"
 
-#: umldoc.cpp:946
-msgid "component diagram"
-msgstr "组件图"
+#: dialogs/classoptionspage.cpp:108
+msgid "Draw as circle"
+msgstr "绘制成圆"
 
-#: umldoc.cpp:948
-msgid "deployment diagram"
-msgstr "部署图"
+#: dialogs/umlviewdialog.cpp:93
+msgid "Classes Display Options"
+msgstr "类显示选项"
 
-#: umldoc.cpp:950
-msgid "entity relationship diagram"
-msgstr "实体关系图"
+#: dialogs/umlviewdialog.cpp:100
+msgid "Diagram Colors"
+msgstr "图表颜色"
 
-#: umldoc.cpp:984 umldoc.cpp:1017
-msgid "That is an invalid name for a diagram."
-msgstr "图名无效。"
+#: dialogs/umlviewdialog.cpp:164
+msgid "The name you have entered is invalid."
+msgstr "所输入的名称无效。"
 
-#: umldoc.cpp:998 umldoc.cpp:1025
-msgid "A diagram is already using that name."
-msgstr "图名已被使用。"
+#: dialogs/umlviewdialog.cpp:170
+msgid "The name you have entered is not unique."
+msgstr "所输入的名称不唯一。"
 
-#: umldoc.cpp:1099
-msgid "Are you sure you want to delete diagram %1?"
-msgstr "确认要删除图 %1 吗？"
+#. i18n: file dialogs/codegenerationoptionsbase.ui line 24
+#: dialogs/codegenerationwizard.cpp:54 rc.cpp:222
+#, no-c-format
+msgid "Code Generation Options"
+msgstr "代码生成选项"
 
-#: umldoc.cpp:1099
-msgid "Delete Diagram"
-msgstr "删除图"
+#: dialogs/codegenerationwizard.cpp:70
+msgid "&Generate"
+msgstr "生成(&G)"
 
-#: umldoc.cpp:1573
-msgid "Setting up the document..."
-msgstr "正在建立文档..."
+#: dialogs/codegenerationwizard.cpp:120
+msgid "Finish"
+msgstr "完成"
 
-#: umldoc.cpp:1600
-msgid "Resolving object references..."
-msgstr "正在解决对象引用..."
+#: dialogs/codegenerationwizard.cpp:132
+msgid "Code Generated"
+msgstr "代码已生成"
 
-#: umldoc.cpp:1638
-msgid "Loading UML elements..."
-msgstr "正在载入 UML 元素...."
+#: dialogs/codegenerationwizard.cpp:134
+msgid "Not Generated"
+msgstr "未生成"
 
-#: umldoc.cpp:1811
-msgid "Loading diagrams..."
-msgstr "正在载入图..."
+#: dialogs/codegenerationwizard.cpp:141
+msgid "Not Yet Generated"
+msgstr "尚未生成"
 
-#: umldoc.cpp:2104
-#, c-format
-msgid "/autosave%1"
-msgstr "/自动保存 %1"
+#: dialogs/codegenerationwizard.cpp:162
+msgid "The folder %1 does not exist. Do you want to create it now?"
+msgstr "文件夹 %1 不存在。要现在创建吗？"
 
-#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
-msgid "Rename canceled"
-msgstr "重命名被取消"
+#: dialogs/codegenerationwizard.cpp:163 dialogs/codegenerationwizard.cpp:177
+msgid "Output Folder Does Not Exist"
+msgstr "输出文件夹不存在"
 
-#: umllistviewitem.cpp:468
-msgid "Renaming an item of listview type %1 is not yet implemented."
-msgstr "重命名列表视图类型 %1 尚未实现。"
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Create Folder"
+msgstr "创建文件夹"
 
-#: umllistviewitem.cpp:469
-msgid "Function Not Implemented"
-msgstr "功能未实现"
+#: dialogs/codegenerationwizard.cpp:163
+msgid "Do Not Create"
+msgstr "不创建"
 
-#: umllistviewitem.cpp:478
+#: dialogs/codegenerationwizard.cpp:168
 msgid ""
-"The name you entered was invalid.\n"
-"Renaming process has been canceled."
-msgstr ""
-"所属入的名称无效。\n"
-"重命名过程已被取消。"
-
-#: codegenerators/cppcodegenerationform.cpp:36
-msgid "General Options"
-msgstr "常规选项"
-
-#: codegenerators/cppcodegenerationform.cpp:38
-msgid "Package is a namespace"
-msgstr "包是一个名字空间"
-
-#: codegenerators/cppcodegenerationform.cpp:41
-msgid "Virtual destructors"
-msgstr "虚拟析构器"
-
-#: codegenerators/cppcodegenerationform.cpp:44
-msgid "Generate empty constructors"
-msgstr "生成空构造器"
-
-#: codegenerators/cppcodegenerationform.cpp:47
-msgid "Generate accessor methods"
-msgstr "生成访问器方法"
-
-#: codegenerators/cppcodegenerationform.cpp:50
-msgid "Operations are inline"
-msgstr "方法为内联"
-
-#: codegenerators/cppcodegenerationform.cpp:53
-msgid "Accessors are inline"
-msgstr "访问器为内联"
-
-#: codegenerators/cppcodegenerationform.cpp:57
-msgid "Accessors are public"
-msgstr "访问器为公开"
-
-#: umlcanvasobject.cpp:150
-msgid "new_attribute"
-msgstr "新属性"
-
-#: umlcanvasobject.cpp:153
-msgid "new_template"
-msgstr "新模板"
-
-#: umlcanvasobject.cpp:156
-msgid "new_operation"
-msgstr "新操作"
-
-#: umlcanvasobject.cpp:159
-msgid "new_literal"
-msgstr "新常量"
-
-#: umlcanvasobject.cpp:162
-msgid "new_field"
-msgstr "新字段"
-
-#: uml.cpp:179
-msgid "&Export model to DocBook"
-msgstr ""
-
-#: uml.cpp:182
-msgid "&Export model to XHTML"
+"The folder could not be created.\n"
+"Please make sure you have write access to its parent folder or select another, "
+"valid, folder."
 msgstr ""
+"无法创建文件夹。\n"
+"请确保对其父文件夹有写权限，或者另选一个有效的文件夹。"
 
-#: uml.cpp:186
-msgid "&New Class Wizard..."
-msgstr "新建类向导(&N)..."
-
-#: uml.cpp:188
-msgid "&Add Default Datatypes for Active Language"
-msgstr "为当前激活的语言添加默认数据类型(&A)"
-
-#: uml.cpp:193
-msgid "&Code Generation Wizard..."
-msgstr "代码生成向导(&C)..."
-
-#: uml.cpp:195
-msgid "&Generate All Code"
-msgstr "生成全部代码(&G)"
-
-#: uml.cpp:198
-msgid "&Import Classes..."
-msgstr "导入类(&I)..."
-
-#: uml.cpp:201
-msgid "Creates a new document"
-msgstr "创建新文档"
-
-#: uml.cpp:202
-msgid "Opens an existing document"
-msgstr "打开现存文档"
-
-#: uml.cpp:203
-msgid "Opens a recently used file"
-msgstr "打开最近使用的文件"
-
-#: uml.cpp:204
-msgid "Saves the document"
-msgstr "保存文档"
-
-#: uml.cpp:205
-msgid "Saves the document as..."
-msgstr "文档另保存为..."
-
-#: uml.cpp:206
-msgid "Closes the document"
-msgstr "关闭文档"
-
-#: uml.cpp:207
-msgid "Prints out the document"
-msgstr "打印文档"
-
-#: uml.cpp:208
-msgid "Quits the application"
-msgstr "退出应用程序"
+#: dialogs/codegenerationwizard.cpp:169
+msgid "Error Creating Folder"
+msgstr "创建文件夹出错"
 
-#: uml.cpp:209
-msgid "Exports the model to the docbook format"
-msgstr ""
+#: dialogs/codegenerationwizard.cpp:176
+msgid "Please select a valid folder."
+msgstr "请选择一个有效的文件夹。"
 
-#: uml.cpp:210
-msgid "Exports the model to the XHTML format"
+#: dialogs/codegenerationwizard.cpp:184
+msgid ""
+"The output folder exists, but it is not writable.\n"
+"Please set the appropriate permissions or choose another folder."
 msgstr ""
+"输出文件夹已存在，但不可写。\n"
+"请设置正确的权限或另选一个文件夹。"
 
-#: uml.cpp:211
-msgid "Cuts the selected section and puts it to the clipboard"
-msgstr "剪切所选部分并放到剪贴板"
-
-#: uml.cpp:212
-msgid "Copies the selected section to the clipboard"
-msgstr "复制所选部分并放到剪贴板"
-
-#: uml.cpp:213
-msgid "Pastes the contents of the clipboard"
-msgstr "粘贴剪贴板内容"
-
-#: uml.cpp:214
-msgid "Set the default program preferences"
-msgstr "设置默认程序首选项"
-
-#: uml.cpp:216
-msgid "Delete &Selected"
-msgstr "删除所选(&S)"
-
-#: uml.cpp:224
-msgid "&Class Diagram..."
-msgstr "类图(&C)..."
-
-#: uml.cpp:228
-msgid "&Autolayout..."
-msgstr "自动布局(&A)..."
-
-#: uml.cpp:231
-msgid "&Sequence Diagram..."
-msgstr "序列图(&S)..."
-
-#: uml.cpp:234
-msgid "C&ollaboration Diagram..."
-msgstr "协作图(&O)..."
-
-#: uml.cpp:237
-msgid "&Use Case Diagram..."
-msgstr "用例图(&U)..."
-
-#: uml.cpp:240
-msgid "S&tate Diagram..."
-msgstr "状态图(&T)..."
-
-#: uml.cpp:243
-msgid "&Activity Diagram..."
-msgstr "活动图(&A)..."
-
-#: uml.cpp:246
-msgid "Co&mponent Diagram..."
-msgstr "组件图(&M)..."
-
-#: uml.cpp:250
-msgid "&Deployment Diagram..."
-msgstr "部署图(&D)..."
-
-#: uml.cpp:254
-msgid "&Entity Relationship Diagram..."
-msgstr "实体关系图(&E)..."
-
-#: uml.cpp:258
-msgid "&Clear Diagram"
-msgstr "清除图表(&C)"
-
-#: uml.cpp:260
-msgid "&Snap to Grid"
-msgstr "吸附到网格(&S)"
-
-#: uml.cpp:262
-msgid "S&how Grid"
-msgstr "显示网格(&H)"
-
-#: uml.cpp:265
-msgid "&Hide Grid"
-msgstr "隐藏网格(&H)"
-
-#: uml.cpp:269
-msgid "&Export as Picture..."
-msgstr "导出为图片(&E)..."
-
-#: uml.cpp:271
-msgid "Export &All Diagrams as Pictures..."
-msgstr "将全部图表导出为图片(&A)..."
-
-#: uml.cpp:286
-msgid "&Zoom Slider"
-msgstr "缩放滑动条(&Z)"
-
-#: uml.cpp:289
-#, c-format
-msgid "Z&oom to 100%"
-msgstr "缩放到 100%(&O)"
-
-#: uml.cpp:295
-msgid "&Move Tab Left"
-msgstr "标签左移(&M)"
-
-#: uml.cpp:296
-msgid "&Move Tab Right"
-msgstr "标签右移(&M)"
-
-#: uml.cpp:308
-msgid "Select Diagram on Left"
-msgstr "选择左侧的图表"
-
-#: uml.cpp:309
-msgid "Select Diagram on Right"
-msgstr "选择右侧的图表"
-
-#: uml.cpp:327
-msgid "&Windows"
-msgstr "窗口(&W)"
-
-#: uml.cpp:347
-#, c-format
-msgid " &33%"
-msgstr " &33%"
-
-#: uml.cpp:348
-#, c-format
-msgid " &50%"
-msgstr " &50%"
-
-#: uml.cpp:349
-#, c-format
-msgid " &75%"
-msgstr " &75%"
-
-#: uml.cpp:350
-#, c-format
-msgid "&100%"
-msgstr "&100%"
-
-#: uml.cpp:351
-#, c-format
-msgid "1&50%"
-msgstr "1&50%"
-
-#: uml.cpp:352
-#, c-format
-msgid "&200%"
-msgstr "&200%"
+#: dialogs/codegenerationwizard.cpp:185
+msgid "Error Writing to Output Folder"
+msgstr "写入输出文件夹时出错"
 
-#: uml.cpp:353
-#, c-format
-msgid "3&00%"
-msgstr "3&00%"
+#: dialogs/codegenerationwizard.cpp:191
+msgid "%1 does not seem to be a folder. Please choose a valid folder."
+msgstr "%1 不像是文件夹。请选择一个有效的文件夹。"
 
-#: uml.cpp:394
-msgid "Diagram Toolbar"
-msgstr "图表工具栏"
+#: dialogs/codegenerationwizard.cpp:192
+msgid "Please Choose Valid Folder"
+msgstr "请选择有效的文件夹"
 
-#: uml.cpp:398
-msgid "Alignment Toolbar"
-msgstr "对齐工具栏"
+#: dialogs/selectopdlg.cpp:30 dialogs/selectopdlg.cpp:35
+msgid "Select Operation"
+msgstr "选择操作"
 
-#: listpopupmenu.cpp:615 uml.cpp:420
-msgid "Class Diagram..."
-msgstr "类图..."
+#: dialogs/selectopdlg.cpp:43
+msgid "Sequence number:"
+msgstr "序列号："
 
-#: listpopupmenu.cpp:618 uml.cpp:421
-msgid "Sequence Diagram..."
-msgstr "序列图..."
+#: dialogs/selectopdlg.cpp:46
+msgid "Class operation:"
+msgstr "类操作："
 
-#: listpopupmenu.cpp:619 uml.cpp:422
-msgid "Collaboration Diagram..."
-msgstr "协作图..."
+#: dialogs/selectopdlg.cpp:54
+msgid "Custom operation:"
+msgstr "自定义操作："
 
-#: listpopupmenu.cpp:551 uml.cpp:423
-msgid "Use Case Diagram..."
-msgstr "用例图..."
+#: dialogs/umltemplatedialog.cpp:36
+msgid "Template Properties"
+msgstr "模板属性"
 
-#: listpopupmenu.cpp:616 uml.cpp:424
-msgid "State Diagram..."
-msgstr "状态图..."
+#: dialogs/umltemplatedialog.cpp:128
+msgid "You have entered an invalid template name."
+msgstr "所输入的模板名称无效。"
 
-#: listpopupmenu.cpp:617 uml.cpp:425
-msgid "Activity Diagram..."
-msgstr "活动图..."
+#: dialogs/umltemplatedialog.cpp:129
+msgid "Template Name Invalid"
+msgstr "模板名称无效"
 
-#: listpopupmenu.cpp:521 uml.cpp:426
-msgid "Component Diagram..."
-msgstr "组件图..."
+#: dialogs/umltemplatedialog.cpp:138
+msgid ""
+"The template parameter name you have chosen is already being used in this "
+"operation."
+msgstr "所选择的模板参数名称已经在此操作中使用。"
 
-#: listpopupmenu.cpp:528 uml.cpp:427
-msgid "Deployment Diagram..."
-msgstr "部署图..."
+#: dialogs/umltemplatedialog.cpp:139
+msgid "Template Name Not Unique"
+msgstr "模板名称不唯一"
 
-#: listpopupmenu.cpp:541 uml.cpp:428
-msgid "Entity Relationship Diagram..."
-msgstr "实体关系图..."
+#: dialogs/notedialog.cpp:25
+msgid "Note Documentation"
+msgstr "注解文档"
 
-#: uml.cpp:458
-msgid "&Tree View"
-msgstr "树形视图(&T)"
+#: dialogs/activitydialog.cpp:70
+msgid "Initial activity"
+msgstr "初始活动"
 
-#: uml.cpp:467
-msgid "&Documentation"
-msgstr "文档(&D)"
+#: dialogs/activitydialog.cpp:70
+msgid "End activity"
+msgstr "终止活动"
 
-#: uml.cpp:479 uml.cpp:664 uml.cpp:692
-msgid "Opening file..."
-msgstr "正在打开文件..."
+#: dialogs/activitydialog.cpp:82
+msgid "Activity type:"
+msgstr "活动类型："
 
-#: uml.cpp:650
-msgid "Creating new document..."
-msgstr "正在创建新文档..."
+#: dialogs/activitydialog.cpp:87
+msgid "Activity name:"
+msgstr "活动名称："
 
-#: uml.cpp:673
-msgid ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|All Supported Files (*.xmi, *.xmi.tgz, "
-"*.xmi.tar.bz2, *.mdl)\n"
-"*.xmi|Uncompressed XMI Files (*.xmi)\n"
-"*.xmi.tgz|Gzip Compressed XMI Files (*.xmi.tgz)\n"
-"*.xmi.tar.bz2|Bzip2 Compressed XMI Files (*.xmi.tar.bz2)\n"
-"*.mdl|Rose model files"
+#. i18n: file dialogs/exportallviewsdialogbase.ui line 90
+#: dialogs/exportallviewsdialog.cpp:51 rc.cpp:463
+#, no-c-format
+msgid "The format that the images will be exported to"
 msgstr ""
-"*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|支持的全部文件(*.xmi, *.xmi.tgz, *.xmi.tar.bz2, "
-"*.mdl)\n"
-"*.xmi|未压缩的 XMI 文件(*.xmi)\n"
-"*.xmi.tgz|Gzip 压缩的 XMI 文件(*.xmi.tgz)\n"
-"*.xmi.tar.bz2|Bzip2 压缩的 XMI 文件(*.xmi.tar.bz2)\n"
-"*.mdl|Rose 模型文件"
 
-#: uml.cpp:677
-msgid "Open File"
-msgstr "打开文件"
-
-#: uml.cpp:716
-msgid "Saving file..."
-msgstr "正在保存文件..."
+#: objectwidget.cpp:90
+msgid "Rename Object"
+msgstr "重命名对象"
 
-#: uml.cpp:727
-msgid "Saving file with a new filename..."
-msgstr "正在用新文件名保存文件..."
+#: objectwidget.cpp:91
+msgid "Enter object name:"
+msgstr "输入对象名称："
 
-#: uml.cpp:732
+#: umlwidgetcontroller.cpp:128
 msgid ""
-"*.xmi|XMI File\n"
-"*.xmi.tgz|Gzip Compressed XMI File\n"
-"*.xmi.tar.bz2|Bzip2 Compressed XMI File\n"
-"*|All Files"
+"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
+"Right button click to cancel move."
 msgstr ""
-"*.xmi|XMI 文件\n"
-"*.xmi.tgz|Gzip 压缩的 XMI 文件\n"
-"*.xmi.tar.bz2|Bzip2 压缩的 XMI 文件\n"
-"*|全部文件"
 
-#: uml.cpp:740
+#: umlwidgetcontroller.cpp:379
 msgid ""
-"The file %1 exists.\n"
-"Do you wish to overwrite it?"
+"Hold shift or ctrl to move in X axis. Hold shift and control to move in Y axis. "
+"Right button click to cancel resize."
 msgstr ""
-"文件 %1 已存在。\n"
-"要覆盖吗？"
-
-#: uml.cpp:740
-msgid "Overwrite"
-msgstr "覆盖"
-
-#: uml.cpp:764
-msgid "Closing file..."
-msgstr "正在关闭文件..."
-
-#: uml.cpp:772
-msgid "Printing..."
-msgstr "正在打印..."
 
-#: uml.cpp:779
+#: umlviewimageexportermodel.cpp:126
 #, c-format
-msgid "Print %1"
-msgstr "打印 %1"
-
-#: uml.cpp:787
-msgid "Exiting..."
-msgstr "正在退出..."
-
-#: uml.cpp:823
-msgid "Cutting selection..."
-msgstr "正在剪切所选项..."
-
-#: uml.cpp:836
-msgid "Copying selection to clipboard..."
-msgstr "正在复制所选项到剪贴板..."
-
-#: uml.cpp:844
-msgid "Inserting clipboard contents..."
-msgstr "正在插入剪贴板内容..."
-
-#: uml.cpp:849
-msgid ""
-"Umbrello could not paste the clipboard contents.  The objects in the clipboard "
-"may be of the wrong type to be pasted here."
-msgstr "Umbrello 无法粘贴剪贴板内容。剪贴板中的对象的类型可能不正确。"
-
-#: clipboard/umlclipboard.cpp:691 uml.cpp:851
-msgid "Paste Error"
-msgstr "粘贴出错"
-
-#: uml.cpp:863
-msgid "Toggling toolbar..."
-msgstr "正在切换工具栏..."
-
-#: uml.cpp:878
-msgid "Toggle the statusbar..."
-msgstr "切换状态栏..."
-
-#: uml.cpp:1186
-msgid "Cannot view code until you generate some first."
-msgstr "生成代码后才能查看。"
-
-#: uml.cpp:1186 uml.cpp:1189
-msgid "Cannot View Code"
-msgstr "无法查看代码"
-
-#: uml.cpp:1189
-msgid "Cannot view code from simple code writer."
-msgstr "无法查看简单代码书写器中的代码"
-
-#: uml.cpp:1387
-msgid "*.idl|IDL Files (*.idl)"
-msgstr "*.idl|IDL 文件(*.idl)"
-
-#: uml.cpp:1389
-msgid "*.py|Python Files (*.py)"
-msgstr "*.py|Python 文件(*.py)"
-
-#: uml.cpp:1391
-msgid "*.java|Java Files (*.java)"
-msgstr "*.java|Java 文件(*.java)"
-
-#: uml.cpp:1393
-#, fuzzy
-msgid "*.pas|Pascal Files (*.pas)"
-msgstr "*.java|Java 文件(*.java)"
-
-#: uml.cpp:1395
-msgid "*.ads *.ada|Ada Files (*.ads *.ada)"
-msgstr "*.ads *.ada|Ada 文件(*.ads *.ada)"
-
-#: uml.cpp:1397
-msgid "*.h *.hh *.hpp *.hxx *.H|Header Files (*.h *.hh *.hpp *.hxx *.H)"
-msgstr "*.h *.hh *.hpp *.hxx *.H|头文件(*.h *.hh *.hpp *.hxx *.H)"
+msgid "Can not create directory: %1"
+msgstr "无法创建目录：%1"
 
-#: uml.cpp:1399
-msgid "All Files"
-msgstr "全部文件"
+#: umlviewimageexportermodel.cpp:145
+msgid "Can not save an empty diagram"
+msgstr "无法保存一个空图"
 
-#: uml.cpp:1401
-msgid "Select Code to Import"
-msgstr "选择要导入的代码"
+#: umlviewimageexportermodel.cpp:151
+#, c-format
+msgid "A problem occured while saving diagram in %1"
+msgstr "在 %1 中保存图时发生了错误"
 
 #. i18n: file umbrelloui.rc line 5
 #: rc.cpp:6
@@ -3306,300 +3367,73 @@ msgstr "角色可变性"
 msgid "Role Visibility"
 msgstr "角色可见性"
 
-#: folder.cpp:289
-msgid "The folderfile %1 does not exist."
-msgstr "文件夹文件 %1 不存在。"
-
-#: folder.cpp:293
-msgid "The folderfile %1 cannot be opened."
-msgstr "文件夹文件 %1 无法打开。"
-
-#: classifier.cpp:201
-msgid ""
-"An operation with the same name and signature already exists. You can not add "
-"it again."
-msgstr "有同样名称和签名的操作已经存在，不能再次添加。"
-
-#: activitywidget.cpp:163 toolbarstateother.cpp:143 umlview.cpp:2545
-msgid "Enter Activity Name"
-msgstr "输入活动名称"
-
-#: statewidget.cpp:165 toolbarstateother.cpp:147 umlview.cpp:2509
-msgid "Enter State Name"
-msgstr "输入状态名称"
-
-#: statewidget.cpp:165 toolbarstateother.cpp:148 umlview.cpp:2510
-msgid "Enter the name of the new state:"
-msgstr "输入新状态的名称："
-
-#: toolbarstateother.cpp:148 umlview.cpp:2511
-msgid "new state"
-msgstr "新状态"
-
-#: listpopupmenu.cpp:695 stereotype.cpp:76
-msgid "Stereotype"
-msgstr "构造型"
-
-#: associationwidget.cpp:2328
-msgid "Multiplicity"
-msgstr "多重性"
-
-#: associationwidget.cpp:2346
-msgid "Association Name"
-msgstr "关联名称"
-
-#: associationwidget.cpp:2366
-msgid "Role Name"
-msgstr "角色名称"
-
-#: umlview.cpp:297 umlview.cpp:357
-msgid "Diagram: %2 Page %1"
-msgstr "图：%2  页：%1"
-
-#: umlview.cpp:2578
-msgid "Enter Diagram Name"
-msgstr "输入图表名称"
-
-#: umlview.cpp:2579
-msgid "Enter the new name of the diagram:"
-msgstr "输入图表的新名称："
-
-#: umlview.cpp:2736
-msgid ""
-"You are about to delete the entire diagram.\n"
-"Are you sure?"
-msgstr ""
-"将要删除整个图表。\n"
-"您确认吗？"
-
-#: umlview.cpp:2738
-msgid "Delete Diagram?"
-msgstr "删除图表？"
-
-#: objectwidget.cpp:90
-msgid "Rename Object"
-msgstr "重命名对象"
-
-#: objectwidget.cpp:91
-msgid "Enter object name:"
-msgstr "输入对象名称："
-
-#: clipboard/umlclipboard.cpp:687
-msgid ""
-"At least one of the items in the clipboard could not be pasted because an item "
-"of the same name already exists.  Any other items have been pasted."
-msgstr "因为有同名项目存在，剪贴板至少有一个项目无法粘贴，其它则粘贴成功。"
-
-#: refactoring/refactoringassistant.cpp:289
-msgid "Add Base Class"
-msgstr "添加基类"
-
-#: refactoring/refactoringassistant.cpp:290
-msgid "Add Derived Class"
-msgstr "添加派生类"
-
-#: refactoring/refactoringassistant.cpp:292
-#: refactoring/refactoringassistant.cpp:299
-#: refactoring/refactoringassistant.cpp:313
-msgid "Add Operation"
-msgstr "添加操作"
-
-#: refactoring/refactoringassistant.cpp:293
-#: refactoring/refactoringassistant.cpp:317
-msgid "Add Attribute"
-msgstr "添加属性"
-
-#: refactoring/refactoringassistant.cpp:297
-msgid "Add Base Interface"
-msgstr "添加基接口"
-
-#: refactoring/refactoringassistant.cpp:298
-msgid "Add Derived Interface"
-msgstr "添加派生接口"
-
-#: refactoring/refactoringassistant.cpp:355
-#: refactoring/refactoringassistant.cpp:511
-msgid "Base Classifiers"
-msgstr "基分类器"
-
-#: refactoring/refactoringassistant.cpp:397
-#: refactoring/refactoringassistant.cpp:530
-msgid "Derived Classifiers"
-msgstr "派生分类器"
-
-#: tips.cpp:3
-msgid ""
-"<p>Welcome to Umbrello.</p>\n"
-"<p>UML diagrams let you design and document object oriented software.  <a "
-"href=\"help:/umbrello\">The Umbrello Handbook</a> is a good introduction to "
-"using UML.</p>\n"
-msgstr ""
-"<p>欢迎使用 Umbrello。</p>\n"
-"<p>UML 图表可帮助您设计面向对象的软件，并为您组织文档。<a href=\"help:/umbrello\">Umbrello 手册</a> "
-"中很好的介绍了 UML 的使用。</p>\n"
-
-#: tips.cpp:9
-msgid ""
-"<p>Welcome to Umbrello 1.5.  New in this version are association classes, Ruby "
-"code generation, externalizable folders, ability to change interfaces into "
-"classes, and more.</p>\n"
-msgstr ""
-"<p>欢迎使用 Umbrello 1.5。此版本中的新增内容包括关联类、Ruby 代码生成、外部化文件夹、将接口转变为类，等等。</p>\n"
-
-#: tips.cpp:14
-msgid ""
-"<p>Tabbed Diagrams and Externalized Folders are mutually exclusive. If you need "
-"External Folders then deselect &quot;Use tabbed diagrams&quot; in the General "
-"Settings.</p>\n"
-msgstr ""
-"<p>标签式图表和外部化文件夹无法同时使用。如果您需要外部文件夹，必须在常规设置中取消“使用标签式图表”。</p>\n"
-
-#: tips.cpp:19
-msgid ""
-"<p>Most diagram items can not be resized, they will resize themselves to fit to "
-"their contents.\n"
-"Boxes, notes and sequence diagram messages can be resized, just click and drag "
-"on the red square.</p>\n"
-msgstr ""
-"<p>大多数的图表项目都可以改变大小，以便与内容适应。方框、注解和序列图信息可以改变大小，只需在红色正方形上点击和拖动。</p>\n"
-
-#: tips.cpp:25
-msgid ""
-"<p>If you want to add an already existing class to a diagram just drag its "
-"entry from the tree view.</p>\n"
-msgstr ""
-"<p>如果想添加一个已经存在的类到图表，\n"
-"从树状视图中拖动相应条目即可。</p>\n"
-
-#: tips.cpp:30
-msgid ""
-"<p>Umbrello's refactoring agent lets you move operations between a class and "
-"its derived and base \n"
-"classes.\n"
-"Right click a class to open the refactoring agent.</p>\n"
-msgstr ""
-"<p>Umbrello 的重构代理使得存在可以在类和它的派生或基类间移动。在类上点击右键可以打开重构代理。</p>\n"
-
-#: tips.cpp:37
-msgid ""
-"<p>Sequence diagram objects can have a destructor box and be drawn as actors.  "
-"Double click one for\n"
-"the Properties dialogue.</p>\n"
-msgstr ""
-"<p>序列图对象可以有一个析构器方框，并绘制成主角。\n"
-"双击可以打开属性对话框。</p>\n"
+#: association.cpp:84
+msgid "Generalization"
+msgstr "泛化"
 
-#: tips.cpp:43
-msgid ""
-"<p>Sequence diagram messages can act as constructors.  Click on the object box "
-"(rather than the vertical line) to make it a constructor.</p>\n"
-msgstr ""
+#: association.cpp:88
+msgid "Self Association"
+msgstr "自身关联"
 
-#: tips.cpp:48
-msgid ""
-"<p>Sequence diagrams support messages to self.  Click on the same vertical line "
-"again to create an automessage.</p>\n"
-msgstr ""
+#: association.cpp:89
+msgid "Collaboration Message"
+msgstr "协作消息"
 
-#: tips.cpp:53
-msgid ""
-"<p>If on loading a foreign file nothing is displayed in the list view, try "
-"saving the model under a different name,\n"
-"closing, and reloading the saved file.  Usually the list view is then properly "
-"populated.\n"
-"</p>\n"
-msgstr ""
+#: association.cpp:90
+msgid "Sequence Message"
+msgstr "序列消息"
 
-#: tips.cpp:60
-msgid ""
-"<p>Cut and Copy will also export the image to a PNG clipboard which can be "
-"pasted into KWord\n"
-"and other applications.</p>\n"
-msgstr ""
-"<p>剪切和复制会将图象以 PNG 格式保存在剪贴板中，\n"
-"在 KWord 或其它应用程序中可以直接粘贴。</p>\n"
+#: association.cpp:91
+msgid "Collaboration Self Message"
+msgstr "协作自身消息"
 
-#: tips.cpp:66
-msgid ""
-"<p>Associations do not have to be in straight lines, double clicking on one "
-"will create a movable point.</p>\n"
-msgstr ""
-"<p>关联无需一定是直线，双击其中一条，可以创建一个可移动的点。</p>\n"
+#: association.cpp:92
+msgid "Sequence Self Message"
+msgstr "序列自身消息"
 
-#: tips.cpp:71
-msgid ""
-"<p>You can turn on autosaving in the Configure Umbrello dialog.</p>\n"
-msgstr ""
-"<p>在 Umbrello 配置对话框可以打开自动保存功能。</p>\n"
+#: association.cpp:95
+msgid "Realization"
+msgstr "实现"
 
-#: tips.cpp:76
-msgid ""
-"<p>Is a feature missing that you need in Umbrello? Please let us know. \n"
-"Either add it to the bugs database with Report Bug from the Help menu\n"
-"or send it to the uml-devel mailing list.</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-".</li>\n"
-"</ul>\n"
-msgstr ""
-"<p>您有 Umbrello 没有提供的功能的需要？请让我们知道。\n"
-"可以使用帮助菜单的错误报告工具增加，\n"
-"或发送到 uml-devel 邮件列表。</p>\n"
-"<ul>\n"
-"<li><a href=\"http://uml.sf.net/contact.php\">http://uml.sf.net/contact.php</a>"
-"</li>\n"
-"</ul>\n"
+#: association.cpp:96
+msgid "Uni Association"
+msgstr "单向关联"
 
-#: tips.cpp:86
-msgid ""
-"<p>You can delete all selected objects by pressing Del or Backspace.</p>\n"
-msgstr ""
-"<p>按删除键或退格键删除全部选中的对象。</p>\n"
+#: statewidget.cpp:176
+msgid "Enter Activity"
+msgstr "输入活动"
 
-#: tips.cpp:91
-msgid ""
-"<p>If you've found a bug in Umbrello, please let us know. \n"
-"You can submit bugs with the Report Bug tool in the Help menu.</p>\n"
-msgstr ""
-"<p>如果您发现了 Umbrello 的错误，请让我们知道。\n"
-"您可以用帮助菜单里报告错误工具提交。</p>\n"
+#: codegenerators/cppcodegenerationform.cpp:36
+msgid "General Options"
+msgstr "常规选项"
 
-#: tips.cpp:97
-msgid ""
-"<p>Pressing the Escape key sets the current tool to the select tool.\n"
-"Backspace jumps to the previously used tool.</p>\n"
-msgstr ""
-"<p>按 ESC 键将所选的工具设定为当前工具。\n"
-"按退格键跳至先前使用的工具。</p>\n"
+#: codegenerators/cppcodegenerationform.cpp:38
+msgid "Package is a namespace"
+msgstr "包是一个名字空间"
 
-#: tips.cpp:103
-msgid ""
-"<p>You can select all objects by pressing Ctrl-A.</p>\n"
-msgstr ""
-"<p>按 Ctrl-A 选择所有对象。</p>\n"
+#: codegenerators/cppcodegenerationform.cpp:41
+msgid "Virtual destructors"
+msgstr "虚拟析构器"
 
-#: tips.cpp:108
-msgid ""
-"<p>You can create and setup a new class using the New Class Wizard in the Code "
-"menu.</p>\n"
-msgstr ""
-"<p>使用代码菜单中的新建类向导可以创建和设置一个新类。</p>\n"
+#: codegenerators/cppcodegenerationform.cpp:44
+msgid "Generate empty constructors"
+msgstr "生成空构造器"
 
-#: statewidget.cpp:176
-msgid "Enter Activity"
-msgstr "输入活动"
+#: codegenerators/cppcodegenerationform.cpp:47
+msgid "Generate accessor methods"
+msgstr "生成访问器方法"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Incorrect use of associations."
-msgstr "关联的用法不正确。"
+#: codegenerators/cppcodegenerationform.cpp:50
+msgid "Operations are inline"
+msgstr "方法为内联"
 
-#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
-msgid "Association Error"
-msgstr "关联出错"
+#: codegenerators/cppcodegenerationform.cpp:53
+msgid "Accessors are inline"
+msgstr "访问器为内联"
 
-#: operation.cpp:185
-msgid "new_parameter"
-msgstr "新参数"
+#: codegenerators/cppcodegenerationform.cpp:57
+msgid "Accessors are public"
+msgstr "访问器为公开"
 
 #: listpopupmenu.cpp:231 listpopupmenu.cpp:486
 msgid "Change Font..."
@@ -3666,11 +3500,13 @@ msgid "Change State Name..."
 msgstr "更改状态名称..."
 
 #: listpopupmenu.cpp:376
-msgid "Flip Horizontal"
+#, fuzzy
+msgid "FlipQt::Horizontal"
 msgstr "水平翻转"
 
 #: listpopupmenu.cpp:378
-msgid "Flip Vertical"
+#, fuzzy
+msgid "FlipQt::Vertical"
 msgstr "垂直翻转"
 
 #: listpopupmenu.cpp:388
@@ -3894,6 +3730,177 @@ msgstr "吸附到网格"
 msgid "Show Grid"
 msgstr "显示网格"
 
+#: umllistviewitem.cpp:372 umllistviewitem.cpp:406 umllistviewitem.cpp:434
+msgid "Rename canceled"
+msgstr "重命名被取消"
+
+#: umllistviewitem.cpp:468
+msgid "Renaming an item of listview type %1 is not yet implemented."
+msgstr "重命名列表视图类型 %1 尚未实现。"
+
+#: umllistviewitem.cpp:469
+msgid "Function Not Implemented"
+msgstr "功能未实现"
+
+#: umllistviewitem.cpp:478
+msgid ""
+"The name you entered was invalid.\n"
+"Renaming process has been canceled."
+msgstr ""
+"所属入的名称无效。\n"
+"重命名过程已被取消。"
+
+#: floatingtextwidget.cpp:112
+msgid "Enter operation name:"
+msgstr "输入操作名称："
+
+#: associationwidget.cpp:2367 floatingtextwidget.cpp:162
+msgid "Enter role name:"
+msgstr "输入角色名称："
+
+#: associationwidget.cpp:2329 floatingtextwidget.cpp:164
+msgid "Enter multiplicity:"
+msgstr "输入多重性："
+
+#: associationwidget.cpp:2347 floatingtextwidget.cpp:171
+msgid "Enter association name:"
+msgstr "输入关联名称："
+
+#: floatingtextwidget.cpp:173 floatingtextwidget.cpp:264
+msgid "Enter new text:"
+msgstr "输入新文本："
+
+#: floatingtextwidget.cpp:175
+msgid "ERROR"
+msgstr "错误"
+
+#: floatingtextwidget.cpp:264
+msgid "Change Text"
+msgstr "更改文本"
+
+#: associationwidget.cpp:2328
+msgid "Multiplicity"
+msgstr "多重性"
+
+#: associationwidget.cpp:2346
+msgid "Association Name"
+msgstr "关联名称"
+
+#: associationwidget.cpp:2366
+msgid "Role Name"
+msgstr "角色名称"
+
+#: main.cpp:32 main.cpp:93
+msgid "Umbrello UML Modeller"
+msgstr "Umbrello UML 建模工具"
+
+#: main.cpp:40
+msgid "File to open"
+msgstr "要打开的文件"
+
+#: main.cpp:41
+msgid "export diagrams to extension and exit"
+msgstr "将图表导出为扩展并退出"
+
+#: main.cpp:42
+msgid "the local directory to save the exported diagrams in"
+msgstr ""
+
+#: main.cpp:42
+msgid "the directory of the file"
+msgstr ""
+
+#: main.cpp:43
+msgid ""
+"keep the tree structure used to store the views in the document in the target "
+"directory"
+msgstr ""
+
+#: main.cpp:95
+msgid "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"
+msgstr "(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML 建模工具作者"
+
+#: model_utils.cpp:244
+msgid "new_actor"
+msgstr "新主角"
+
+#: model_utils.cpp:246
+msgid "new_usecase"
+msgstr "新用例"
+
+#: model_utils.cpp:248
+msgid "new_package"
+msgstr "新包"
+
+#: model_utils.cpp:250
+msgid "new_component"
+msgstr "新组件"
+
+#: model_utils.cpp:252
+msgid "new_node"
+msgstr "新结点"
+
+#: model_utils.cpp:254
+msgid "new_artifact"
+msgstr "新工件"
+
+#: model_utils.cpp:256
+msgid "new_interface"
+msgstr "新接口"
+
+#: model_utils.cpp:258
+msgid "new_datatype"
+msgstr "新数据类型"
+
+#: model_utils.cpp:260
+msgid "new_enum"
+msgstr "新枚举"
+
+#: model_utils.cpp:262
+msgid "new_entity"
+msgstr "新实体"
+
+#: model_utils.cpp:264
+#, fuzzy
+msgid "new_folder"
+msgstr "新结点"
+
+#: model_utils.cpp:268
+msgid "new_object"
+msgstr "新对象"
+
+#: model_utils.cpp:559
+msgid "Empty"
+msgstr "空"
+
+#: model_utils.cpp:559
+msgid "Malformed argument"
+msgstr "参数格式不对"
+
+#: model_utils.cpp:560
+msgid "Unknown argument type"
+msgstr "未知的参数类型"
+
+#: model_utils.cpp:560
+msgid "Illegal method name"
+msgstr "非法函数名"
+
+#: model_utils.cpp:561
+msgid "Unknown return type"
+msgstr "未知的返回类型"
+
+#: model_utils.cpp:561
+msgid "Unspecified error"
+msgstr "未指定的错误"
+
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Incorrect use of associations."
+msgstr "关联的用法不正确。"
+
+#: toolbarstateassociation.cpp:119 toolbarstateassociation.cpp:175
+msgid "Association Error"
+msgstr "关联出错"
+
 #~ msgid "new_stereotype"
 #~ msgstr "新构造型"
 
diff --git a/tde-i18n-zh_CN/messages/tdetoys/amor.po b/tde-i18n-zh_CN/messages/tdetoys/amor.po
index db8735a231a..293be6d75d4 100644
--- a/tde-i18n-zh_CN/messages/tdetoys/amor.po
+++ b/tde-i18n-zh_CN/messages/tdetoys/amor.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: amor\n"
-"POT-Creation-Date: 2005-11-30 03:24+0100\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2002-11-01 17:57-0500\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -95,7 +96,8 @@ msgid ""
 msgstr "你退出时没有关闭的 TDE 程序，将会在你重新登录时自动运行。"
 
 #: tips.cpp:53
-msgid "The TDE file manager is also a web browser and an FTP client."
+#, fuzzy
+msgid "The KDE file manager is also a web browser and an FTP client."
 msgstr "TDE 文件管理器还是一个万维网浏览器和一个 FTP 客户端。"
 
 #: tips.cpp:56
diff --git a/tde-i18n-zh_CN/messages/tdetoys/kfifteenapplet.po b/tde-i18n-zh_CN/messages/tdetoys/kfifteenapplet.po
index 7768052d056..3a0b5739653 100644
--- a/tde-i18n-zh_CN/messages/tdetoys/kfifteenapplet.po
+++ b/tde-i18n-zh_CN/messages/tdetoys/kfifteenapplet.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kfifteenapplet\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2002-11-01 18:01-0500\n"
 "Last-Translator: Mai Hao Hui <mhh@126.com>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,11 +28,11 @@ msgid ""
 "Your emails"
 msgstr "mhh@126.com"
 
-#: fifteenapplet.cpp:77
+#: fifteenapplet.cpp:78
 msgid "KFifteenApplet"
 msgstr "KFifteenApplet"
 
-#: fifteenapplet.cpp:78
+#: fifteenapplet.cpp:79
 msgid ""
 "Fifteen pieces applet.\n"
 "\n"
@@ -45,15 +46,15 @@ msgstr ""
 "排列。\n"
 "从右击鼠标所弹出的菜单中选择“打乱方块”来开始游戏。"
 
-#: fifteenapplet.cpp:94
+#: fifteenapplet.cpp:96
 msgid "R&andomize Pieces"
 msgstr "打乱方块(&A)"
 
-#: fifteenapplet.cpp:95
+#: fifteenapplet.cpp:97
 msgid "&Reset Pieces"
 msgstr "复位方块(&R)"
 
-#: fifteenapplet.cpp:221
+#: fifteenapplet.cpp:223
 msgid ""
 "Congratulations!\n"
 "You win the game!"
@@ -61,6 +62,6 @@ msgstr ""
 "恭喜！\n"
 "你赢了！"
 
-#: fifteenapplet.cpp:221
+#: fifteenapplet.cpp:223
 msgid "Fifteen Pieces"
 msgstr "十五块"
diff --git a/tde-i18n-zh_CN/messages/tdetoys/kmoon.po b/tde-i18n-zh_CN/messages/tdetoys/kmoon.po
index c38e0214065..d4cf3cc8c48 100644
--- a/tde-i18n-zh_CN/messages/tdetoys/kmoon.po
+++ b/tde-i18n-zh_CN/messages/tdetoys/kmoon.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmoon\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2004-06-27 19:06+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdetoys/kodo.po b/tde-i18n-zh_CN/messages/tdetoys/kodo.po
index c2e15b1414c..5428eb0e5d1 100644
--- a/tde-i18n-zh_CN/messages/tdetoys/kodo.po
+++ b/tde-i18n-zh_CN/messages/tdetoys/kodo.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kodo\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2002-11-12 22:57-0500\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,7 +29,8 @@ msgid "A mouse odometer"
 msgstr "一个鼠标里程表"
 
 #: main.cpp:77
-msgid "TDE 2 porting and some code cleanups"
+#, fuzzy
+msgid "KDE 2 porting and some code cleanups"
 msgstr "移植到 TDE2 和代码整理"
 
 #: kodometer.cpp:33
diff --git a/tde-i18n-zh_CN/messages/tdetoys/kteatime.po b/tde-i18n-zh_CN/messages/tdetoys/kteatime.po
index 0f605ef851f..ba257d4d231 100644
--- a/tde-i18n-zh_CN/messages/tdetoys/kteatime.po
+++ b/tde-i18n-zh_CN/messages/tdetoys/kteatime.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kteatime\n"
-"POT-Creation-Date: 2006-04-20 04:01+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2004-01-05 11:59+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -56,99 +57,99 @@ msgstr "配置(&C)..."
 msgid "&Anonymous..."
 msgstr "无名(&A)..."
 
-#: toplevel.cpp:297
+#: toplevel.cpp:317
 msgid "The %1 is now ready!"
 msgstr "%1 沏好了！"
 
-#: toplevel.cpp:308 toplevel.cpp:345 toplevel.cpp:461
+#: toplevel.cpp:328 toplevel.cpp:365 toplevel.cpp:481
 msgid "The Tea Cooker"
 msgstr "煮茶器"
 
-#: toplevel.cpp:325
+#: toplevel.cpp:345
 msgid "%1 left for %2"
 msgstr "%2 还要等 %1"
 
-#: toplevel.cpp:425
+#: toplevel.cpp:445
 msgid "There is no tea to begin steeping."
 msgstr "没有要沏的茶。"
 
-#: toplevel.cpp:425
+#: toplevel.cpp:445
 msgid "No Tea"
 msgstr "没有茶"
 
-#: toplevel.cpp:470
+#: toplevel.cpp:490
 msgid "Anonymous Tea"
 msgstr "无名茶"
 
-#: toplevel.cpp:484 toplevel.cpp:729
+#: toplevel.cpp:504 toplevel.cpp:749
 msgid "Tea time:"
 msgstr "饮茶时间："
 
-#: toplevel.cpp:500
+#: toplevel.cpp:520
 msgid "tea"
 msgstr "茶"
 
-#: toplevel.cpp:575
+#: toplevel.cpp:595
 msgid "New Tea"
 msgstr "新茶"
 
-#: toplevel.cpp:653
+#: toplevel.cpp:673
 msgid "Configure Tea Cooker"
 msgstr "配置煮茶器"
 
-#: toplevel.cpp:665
+#: toplevel.cpp:685
 msgid "Tea List"
 msgstr "茶列表"
 
-#: toplevel.cpp:669
+#: toplevel.cpp:689
 msgid "Name"
 msgstr "名称"
 
-#: toplevel.cpp:671
+#: toplevel.cpp:691
 msgid "Time"
 msgstr "时间"
 
-#: toplevel.cpp:681
+#: toplevel.cpp:701
 msgid "New"
 msgstr "新添"
 
-#: toplevel.cpp:695
+#: toplevel.cpp:715
 msgid "Up"
 msgstr "向上"
 
-#: toplevel.cpp:702
+#: toplevel.cpp:722
 msgid "Down"
 msgstr "向下"
 
-#: toplevel.cpp:712
+#: toplevel.cpp:732
 msgid "Tea Properties"
 msgstr "茶属性"
 
-#: toplevel.cpp:723
+#: toplevel.cpp:743
 msgid "Name:"
 msgstr "名称："
 
-#: toplevel.cpp:734
+#: toplevel.cpp:754
 msgid "Action"
 msgstr "动作"
 
-#: toplevel.cpp:739
+#: toplevel.cpp:759
 msgid "Configure Events..."
 msgstr "配置事件..."
 
-#: toplevel.cpp:744
+#: toplevel.cpp:764
 msgid "Event"
 msgstr "事件"
 
-#: toplevel.cpp:745
+#: toplevel.cpp:765
 msgid "Popup"
 msgstr "弹出"
 
-#: toplevel.cpp:755
+#: toplevel.cpp:775
 msgid "Enter command here; '%t' will be replaced with name of steeping tea"
 msgstr "在此输入命令。“%t”将被替换为正在泡的茶"
 
-#: toplevel.cpp:760
+#: toplevel.cpp:780
 msgid "Visualize progress in icon tray"
 msgstr "在图标托盘中用图像显示进度"
 
diff --git a/tde-i18n-zh_CN/messages/tdetoys/ktux.po b/tde-i18n-zh_CN/messages/tdetoys/ktux.po
index 6cd2a935466..1076169e5c0 100644
--- a/tde-i18n-zh_CN/messages/tdetoys/ktux.po
+++ b/tde-i18n-zh_CN/messages/tdetoys/ktux.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ktux\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2002-11-01 18:20-0500\n"
 "Last-Translator: Mai Hao Hui <mhh@126.com>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdetoys/kweather.po b/tde-i18n-zh_CN/messages/tdetoys/kweather.po
index 6aed94c2499..b21dc21ffd3 100644
--- a/tde-i18n-zh_CN/messages/tdetoys/kweather.po
+++ b/tde-i18n-zh_CN/messages/tdetoys/kweather.po
@@ -9,10 +9,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kweather\n"
-"POT-Creation-Date: 2008-07-29 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2005-01-09 22:26+0800\n"
 "Last-Translator: Sarah Smith <sarahs@redhat.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -182,7 +183,7 @@ msgid ""
 "Your emails"
 msgstr "i18n-translation@lists.linux.net.cn"
 
-#: dockwidget.cpp:105 weatherlib.cpp:177
+#: dockwidget.cpp:105 weatherlib.cpp:180
 msgid "The network is currently offline..."
 msgstr "网络离线..."
 
@@ -345,299 +346,299 @@ msgstr "KWeather DCOP 服务"
 msgid "Developer"
 msgstr "开发者"
 
-#: metar_parser.cpp:163
+#: metar_parser.cpp:165
 #, c-format
 msgid ""
 "_n: 1 meter\n"
 "%n meters"
 msgstr "%n 米"
 
-#: metar_parser.cpp:168
+#: metar_parser.cpp:170
 #, c-format
 msgid ""
 "_n: 1 foot\n"
 "%n feet"
 msgstr "%n 英尺"
 
-#: metar_parser.cpp:173
+#: metar_parser.cpp:175
 #, c-format
 msgid "Few clouds at %1"
 msgstr "%1少云"
 
-#: metar_parser.cpp:178
+#: metar_parser.cpp:180
 #, c-format
 msgid "Scattered clouds at %1"
 msgstr "%1有稀疏云团"
 
-#: metar_parser.cpp:183
+#: metar_parser.cpp:185
 #, c-format
 msgid "Broken clouds at %1"
 msgstr "%1有断续云团"
 
-#: metar_parser.cpp:188
+#: metar_parser.cpp:190
 #, c-format
 msgid "Overcast clouds at %1"
 msgstr "%1阴云密布"
 
-#: metar_parser.cpp:193
+#: metar_parser.cpp:195
 msgid "Clear skies"
 msgstr "晴天"
 
-#: metar_parser.cpp:219
+#: metar_parser.cpp:221
 msgid "Heavy"
 msgstr "阴沉"
 
-#: metar_parser.cpp:224
+#: metar_parser.cpp:226
 msgid "Light"
 msgstr "轻爽"
 
-#: metar_parser.cpp:230
+#: metar_parser.cpp:232
 msgid "Shallow"
 msgstr "微弱"
 
-#: metar_parser.cpp:232
+#: metar_parser.cpp:234
 msgid "Partial"
 msgstr "部份"
 
-#: metar_parser.cpp:234
+#: metar_parser.cpp:236
 msgid "Patches"
 msgstr "零星"
 
-#: metar_parser.cpp:236
+#: metar_parser.cpp:238
 msgid "Low Drifting"
 msgstr "轻飘"
 
-#: metar_parser.cpp:238
+#: metar_parser.cpp:240
 msgid "Blowing"
 msgstr "劲风"
 
-#: metar_parser.cpp:241
+#: metar_parser.cpp:243
 msgid "Showers"
 msgstr "小雨"
 
-#: metar_parser.cpp:246
+#: metar_parser.cpp:248
 msgid "Thunder Storm"
 msgstr "雷雨"
 
-#: metar_parser.cpp:251
+#: metar_parser.cpp:253
 msgid "Freezing"
 msgstr "冰冻"
 
-#: metar_parser.cpp:257
+#: metar_parser.cpp:259
 msgid "Drizzle"
 msgstr "毛毛雨"
 
-#: metar_parser.cpp:262
+#: metar_parser.cpp:264
 msgid "Rain"
 msgstr "雨"
 
-#: metar_parser.cpp:267
+#: metar_parser.cpp:269
 msgid "Snow"
 msgstr "雪"
 
-#: metar_parser.cpp:272
+#: metar_parser.cpp:274
 msgid "Snow Grains"
 msgstr "雪粒"
 
-#: metar_parser.cpp:277
+#: metar_parser.cpp:279
 msgid "Ice Crystals"
 msgstr "冰晶"
 
-#: metar_parser.cpp:282
+#: metar_parser.cpp:284
 msgid "Ice Pellets"
 msgstr "冰粒"
 
-#: metar_parser.cpp:287
+#: metar_parser.cpp:289
 msgid "Hail"
 msgstr "冰雹"
 
-#: metar_parser.cpp:292
+#: metar_parser.cpp:294
 msgid "Small Hail Pellets"
 msgstr "小冰雹粒"
 
-#: metar_parser.cpp:297
+#: metar_parser.cpp:299
 msgid "Unknown Precipitation"
 msgstr "未知沉降物"
 
-#: metar_parser.cpp:302
+#: metar_parser.cpp:304
 msgid "Mist"
 msgstr "轻雾"
 
-#: metar_parser.cpp:311
+#: metar_parser.cpp:313
 msgid "Fog"
 msgstr "浓雾"
 
-#: metar_parser.cpp:319
+#: metar_parser.cpp:321
 msgid "Smoke"
 msgstr "烟雾"
 
-#: metar_parser.cpp:321
+#: metar_parser.cpp:323
 msgid "Volcanic Ash"
 msgstr "火山灰"
 
-#: metar_parser.cpp:323
+#: metar_parser.cpp:325
 msgid "Widespread Dust"
 msgstr "灰尘弥漫"
 
-#: metar_parser.cpp:325
+#: metar_parser.cpp:327
 msgid "Sand"
 msgstr "砂砾"
 
-#: metar_parser.cpp:327
+#: metar_parser.cpp:329
 msgid "Haze"
 msgstr "薄雾"
 
-#: metar_parser.cpp:329
+#: metar_parser.cpp:331
 msgid "Spray"
 msgstr "喷雾"
 
-#: metar_parser.cpp:331
+#: metar_parser.cpp:333
 msgid "Dust/Sand Swirls"
 msgstr "沙尘漩"
 
-#: metar_parser.cpp:333
+#: metar_parser.cpp:335
 msgid "Sudden Winds"
 msgstr "阵风"
 
-#: metar_parser.cpp:337
+#: metar_parser.cpp:339
 msgid "Tornado"
 msgstr "龙卷风"
 
-#: metar_parser.cpp:339
+#: metar_parser.cpp:341
 msgid "Funnel Cloud"
 msgstr "漏斗云"
 
-#: metar_parser.cpp:342
+#: metar_parser.cpp:344
 msgid "Sand Storm"
 msgstr "沙暴"
 
-#: metar_parser.cpp:344
+#: metar_parser.cpp:346
 msgid "Dust Storm"
 msgstr "尘暴"
 
-#: metar_parser.cpp:346
+#: metar_parser.cpp:348
 msgid ""
 "_: %1 is the intensity, %2 is the descriptor and %3 is the phenomena\n"
 "%1 %2 %3"
 msgstr "%1 %2 %3"
 
-#: metar_parser.cpp:438 metar_parser.cpp:807
+#: metar_parser.cpp:440 metar_parser.cpp:809
 msgid "°C"
 msgstr "℃"
 
-#: metar_parser.cpp:446 metar_parser.cpp:813
+#: metar_parser.cpp:448 metar_parser.cpp:815
 msgid "°F"
 msgstr "°F"
 
-#: metar_parser.cpp:544
+#: metar_parser.cpp:546
 msgid "km"
 msgstr "公里"
 
-#: metar_parser.cpp:549
+#: metar_parser.cpp:551
 msgid "m"
 msgstr "米"
 
-#: metar_parser.cpp:575
+#: metar_parser.cpp:577
 msgid " hPa"
 msgstr " 百帕"
 
-#: metar_parser.cpp:584
+#: metar_parser.cpp:586
 msgid "\" Hg"
 msgstr "\" 汞柱"
 
-#: metar_parser.cpp:599 metar_parser.cpp:615 metar_parser.cpp:616
+#: metar_parser.cpp:601 metar_parser.cpp:617 metar_parser.cpp:618
 msgid "N"
 msgstr "北"
 
-#: metar_parser.cpp:600
+#: metar_parser.cpp:602
 msgid "NNE"
 msgstr "北偏东北"
 
-#: metar_parser.cpp:601
+#: metar_parser.cpp:603
 msgid "NE"
 msgstr "东北"
 
-#: metar_parser.cpp:602
+#: metar_parser.cpp:604
 msgid "ENE"
 msgstr "东偏东北"
 
-#: metar_parser.cpp:603
+#: metar_parser.cpp:605
 msgid "E"
 msgstr "东"
 
-#: metar_parser.cpp:604
+#: metar_parser.cpp:606
 msgid "ESE"
 msgstr "东偏东南"
 
-#: metar_parser.cpp:605
+#: metar_parser.cpp:607
 msgid "SE"
 msgstr "东南"
 
-#: metar_parser.cpp:606
+#: metar_parser.cpp:608
 msgid "SSE"
 msgstr "南偏东南"
 
-#: metar_parser.cpp:607
+#: metar_parser.cpp:609
 msgid "S"
 msgstr "南"
 
-#: metar_parser.cpp:608
+#: metar_parser.cpp:610
 msgid "SSW"
 msgstr "南偏西南"
 
-#: metar_parser.cpp:609
+#: metar_parser.cpp:611
 msgid "SW"
 msgstr "西南"
 
-#: metar_parser.cpp:610
+#: metar_parser.cpp:612
 msgid "WSW"
 msgstr "西偏西南"
 
-#: metar_parser.cpp:611
+#: metar_parser.cpp:613
 msgid "W"
 msgstr "西"
 
-#: metar_parser.cpp:612
+#: metar_parser.cpp:614
 msgid "WNW"
 msgstr "西偏西北"
 
-#: metar_parser.cpp:613
+#: metar_parser.cpp:615
 msgid "NW"
 msgstr "西北"
 
-#: metar_parser.cpp:614
+#: metar_parser.cpp:616
 msgid "NNW"
 msgstr "北偏西北"
 
-#: metar_parser.cpp:662
+#: metar_parser.cpp:664
 #, c-format
 msgid ""
 "_n: 1 km/h\n"
 "%n km/h"
 msgstr "%n km/h"
 
-#: metar_parser.cpp:682
+#: metar_parser.cpp:684
 #, c-format
 msgid ""
 "_n: 1 MPH\n"
 "%n MPH"
 msgstr "%n MPH"
 
-#: metar_parser.cpp:690
+#: metar_parser.cpp:692
 #, c-format
 msgid ""
 "_n: Wind gusts up to 1 km/h\n"
 "Wind gusts up to %n km/h"
 msgstr "风速 %n km/h"
 
-#: metar_parser.cpp:695
+#: metar_parser.cpp:697
 #, c-format
 msgid ""
 "_n: Wind gusts up to 1 MPH\n"
 "Wind gusts up to %n MPH"
 msgstr "风速 %n MPH"
 
-#: metar_parser.cpp:824 metar_parser.cpp:825 stationdatabase.cpp:84
+#: metar_parser.cpp:826 metar_parser.cpp:827 stationdatabase.cpp:84
 #: stationdatabase.cpp:106 stationdatabase.cpp:128 stationdatabase.cpp:150
 #: weatherservice.cpp:288 weatherservice.cpp:289 weatherservice.cpp:291
 msgid "Unknown Station"
@@ -673,27 +674,27 @@ msgstr "来自 %1 的最新数据"
 msgid "Sidebar Weather Report"
 msgstr "气象报告侧边栏"
 
-#: weatherlib.cpp:146 weatherlib.cpp:155 weatherlib.cpp:168
+#: weatherlib.cpp:149 weatherlib.cpp:158 weatherlib.cpp:171
 msgid "KWeather Error!"
 msgstr "KWeather 错误！"
 
-#: weatherlib.cpp:147
+#: weatherlib.cpp:150
 msgid "The temp file %1 was empty."
 msgstr "临时文件 %1 是空的。"
 
-#: weatherlib.cpp:156
+#: weatherlib.cpp:159
 #, c-format
 msgid "Could not read the temp file %1."
 msgstr "无法读取临时文件 %1。"
 
-#: weatherlib.cpp:169
+#: weatherlib.cpp:172
 msgid "The requested station does not exist."
 msgstr "请求的气象站不存在。"
 
-#: weatherlib.cpp:178
+#: weatherlib.cpp:181
 msgid "Please update later."
 msgstr "请稍后再更新。"
 
-#: weatherlib.cpp:225
+#: weatherlib.cpp:228
 msgid "Retrieving weather data..."
 msgstr "正在获取天气数据..."
diff --git a/tde-i18n-zh_CN/messages/tdetoys/kworldclock.po b/tde-i18n-zh_CN/messages/tdetoys/kworldclock.po
index 3ea63d796d3..2b6ed3d2334 100644
--- a/tde-i18n-zh_CN/messages/tdetoys/kworldclock.po
+++ b/tde-i18n-zh_CN/messages/tdetoys/kworldclock.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kworldclock\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2003-11-22 01:43+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@126.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -87,67 +88,67 @@ msgstr "要写入文件的名称"
 msgid "The size of the map to dump"
 msgstr "要转存地图的大小"
 
-#: mapwidget.cpp:88
+#: mapwidget.cpp:91
 msgid "Add &Red"
 msgstr "添加红旗(&R)"
 
-#: mapwidget.cpp:91
+#: mapwidget.cpp:94
 msgid "Add &Green"
 msgstr "添加绿旗(&G)"
 
-#: mapwidget.cpp:94
+#: mapwidget.cpp:97
 msgid "Add &Blue"
 msgstr "添加蓝旗(&B)"
 
-#: mapwidget.cpp:96
+#: mapwidget.cpp:99
 msgid "Add &Custom..."
 msgstr "添加自定义的(&C)..."
 
-#: mapwidget.cpp:99
+#: mapwidget.cpp:102
 msgid "&Remove Flag"
 msgstr "删除旗帜(&R)"
 
-#: mapwidget.cpp:100
+#: mapwidget.cpp:103
 msgid "&Remove All Flags"
 msgstr "删除全部旗帜(&R)"
 
-#: mapwidget.cpp:114 zoneclock.cpp:70
+#: mapwidget.cpp:117 zoneclock.cpp:73
 msgid "&Add..."
 msgstr "添加(&A)..."
 
-#: mapwidget.cpp:117
+#: mapwidget.cpp:120
 msgid "&Flags"
 msgstr "旗帜(&F)"
 
-#: mapwidget.cpp:120
+#: mapwidget.cpp:123
 msgid "&Clocks"
 msgstr "时钟(&C)"
 
-#: mapwidget.cpp:123
+#: mapwidget.cpp:126
 msgid "&Map Theme"
 msgstr "地图主题(&M)"
 
-#: mapwidget.cpp:124
+#: mapwidget.cpp:127
 msgid "Show &Daylight"
 msgstr "显示日光(&D)"
 
-#: mapwidget.cpp:125
+#: mapwidget.cpp:128
 msgid "Show &Cities"
 msgstr "显示城市(&C)"
 
-#: mapwidget.cpp:126
+#: mapwidget.cpp:129
 msgid "Show F&lags"
 msgstr "显示旗帜(&L)"
 
-#: mapwidget.cpp:131
+#: mapwidget.cpp:134
 msgid "&Save Settings"
 msgstr "保存设置(&S)"
 
-#: mapwidget.cpp:265
+#: mapwidget.cpp:268
 msgid "Do you really want to remove all flags?"
 msgstr "您真的要删除全部旗帜吗？"
 
-#: zoneclock.cpp:69
+#: zoneclock.cpp:72
 msgid "&Edit..."
 msgstr "编辑(&E)..."
 
diff --git a/tde-i18n-zh_CN/messages/tdeutils/ark.po b/tde-i18n-zh_CN/messages/tdeutils/ark.po
index 7dd2e464d9d..13c05040428 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/ark.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/ark.po
@@ -12,10 +12,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2007-11-07 01:15+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-08-04 03:45+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,35 +34,50 @@ msgid ""
 msgstr "i18n-translation@lists.linux.net.cn"
 
 #: ace.cpp:104 ace.cpp:170 ar.cpp:102 ar.cpp:121 ar.cpp:165 ar.cpp:222
-#: ar.cpp:255 compressedfile.cpp:202 compressedfile.cpp:313 lha.cpp:156
-#: lha.cpp:226 lha.cpp:267 lha.cpp:297 rar.cpp:133 rar.cpp:208 rar.cpp:265
-#: rar.cpp:301 sevenzip.cpp:112 sevenzip.cpp:151 sevenzip.cpp:191
-#: sevenzip.cpp:239 tar.cpp:272 tar.cpp:560 tar.cpp:639 tar.cpp:683
-#: zip.cpp:105 zip.cpp:177 zip.cpp:236 zip.cpp:272 zoo.cpp:122 zoo.cpp:189
-#: zoo.cpp:248 zoo.cpp:279
+#: ar.cpp:255 arj.cpp:134 arj.cpp:202 arj.cpp:258 arj.cpp:294 arj.cpp:322
+#: compressedfile.cpp:214 compressedfile.cpp:325 lha.cpp:158 lha.cpp:228
+#: lha.cpp:269 lha.cpp:299 rar.cpp:162 rar.cpp:246 rar.cpp:303 rar.cpp:339
+#: rar.cpp:367 sevenzip.cpp:114 sevenzip.cpp:162 sevenzip.cpp:207
+#: sevenzip.cpp:261 sevenzip.cpp:417 tar.cpp:284 tar.cpp:575 tar.cpp:654
+#: tar.cpp:698 tar.cpp:820 zip.cpp:106 zip.cpp:184 zip.cpp:243 zip.cpp:280
+#: zip.cpp:308 zoo.cpp:122 zoo.cpp:189 zoo.cpp:248 zoo.cpp:279
 msgid "Could not start a subprocess."
 msgstr "无法启动子进程。"
 
-#: arch.cpp:132
-msgid "The deletion operation failed."
-msgstr "删除操作失败。"
-
-#: arch.cpp:161
+#: arch.cpp:113 arch.cpp:188 arch.cpp:413
 msgid "The password was incorrect. "
 msgstr "密码不正确。"
 
-#: arch.cpp:162
+#: arch.cpp:114
+#, fuzzy
+msgid "You must enter a password to open the file:"
+msgstr "您必须输入密码才能解压缩文件："
+
+#: arch.cpp:159
+msgid "The deletion operation failed."
+msgstr "删除操作失败。"
+
+#: arch.cpp:189 arch.cpp:414
 msgid "You must enter a password to extract the file:"
 msgstr "您必须输入密码才能解压缩文件："
 
-#: arch.cpp:180
+#: arch.cpp:207
 msgid "The extraction operation failed."
 msgstr "解压缩操作失败。"
 
-#: arch.cpp:218
+#: arch.cpp:245
 msgid "The addition operation failed."
 msgstr "添加操作失败。"
 
+#: arch.cpp:400
+msgid "Not implemented."
+msgstr ""
+
+#: arch.cpp:432
+#, fuzzy
+msgid "The test operation failed."
+msgstr "删除操作失败。"
+
 #: archiveformatdlg.cpp:33
 msgid "Choose Archive Format"
 msgstr "选择存档文件格式"
@@ -86,20 +102,27 @@ msgstr ""
 "Ark 检测到了格式：%1\n"
 "如果此格式不正确，请选择适当的格式。"
 
-#: archiveformatinfo.cpp:70
+#: archiveformatinfo.cpp:75
 msgid "Compressed File"
 msgstr "压缩文件"
 
-#: archiveformatinfo.cpp:114
+#: archiveformatinfo.cpp:121
 msgid ""
 "All Valid Archives\n"
 msgstr ""
 "全部存档文件\n"
 
-#: archiveformatinfo.cpp:115
+#: archiveformatinfo.cpp:122
 msgid "All Files"
 msgstr "全部文件"
 
+#: arj.cpp:82 rar.cpp:192 sevenzip.cpp:128 zip.cpp:121
+msgid ""
+"Warning!\n"
+"Using KGpg for encryption is more secure.\n"
+"Cancel this dialog or enter password for %1 archiver:"
+msgstr ""
+
 #: ark_part.cpp:47
 msgid "ark"
 msgstr "ark"
@@ -142,27 +165,31 @@ msgstr "打开方式(&O)..."
 msgid "Edit &With..."
 msgstr "编辑方式(&W)..."
 
-#: ark_part.cpp:144
+#: ark_part.cpp:142
+msgid "&Test integrity"
+msgstr ""
+
+#: ark_part.cpp:147
 msgid "&Unselect All"
 msgstr "全部不选(&U)"
 
-#: ark_part.cpp:146
+#: ark_part.cpp:149
 msgid "&Invert Selection"
 msgstr "反向选择(&I)"
 
-#: ark_part.cpp:152
+#: ark_part.cpp:155
 msgid "Configure &Ark..."
 msgstr "配置 &Ark..."
 
-#: ark_part.cpp:156
+#: ark_part.cpp:159
 msgid "Show Search Bar"
 msgstr "显示搜索栏"
 
-#: ark_part.cpp:157
+#: ark_part.cpp:160
 msgid "Hide Search Bar"
 msgstr "隐藏搜索栏"
 
-#: ark_part.cpp:296
+#: ark_part.cpp:302
 msgid ""
 "The archive \"%1\" has been modified.\n"
 "Do you want to save it?"
@@ -170,19 +197,19 @@ msgstr ""
 "存档文件“%1”已修改。\n"
 "您想要保存吗？"
 
-#: ark_part.cpp:298
+#: ark_part.cpp:304
 msgid "Save Archive?"
 msgstr "保存存档文件吗？"
 
-#: ark_part.cpp:323
+#: ark_part.cpp:329
 msgid "Downloading %1..."
 msgstr "正在下载 %1..."
 
-#: ark_part.cpp:415
+#: ark_part.cpp:421
 msgid "Total: 0 files"
 msgstr "总计：0 个文件"
 
-#: ark_part.cpp:420 arkwidget.cpp:1808
+#: ark_part.cpp:426 arkwidget.cpp:1839
 msgid "0 files selected"
 msgstr "选中了 0 个文件"
 
@@ -211,21 +238,21 @@ msgstr ""
 msgid "Run Nevertheless"
 msgstr "仍然运行"
 
-#: arkwidget.cpp:132
+#: arkwidget.cpp:133
 msgid "&Search:"
 msgstr "搜索(&S)："
 
-#: arkwidget.cpp:198
+#: arkwidget.cpp:201
 msgid ""
 "_n: %n file  %1\n"
 "%n files  %1"
 msgstr "%n 个文件  %1"
 
-#: arkwidget.cpp:273
+#: arkwidget.cpp:276
 msgid "Save Archive As"
 msgstr "存档文件另存为"
 
-#: arkwidget.cpp:278
+#: arkwidget.cpp:281
 msgid ""
 "Please save your archive in the same format as the original.\n"
 "Hint: Use one of the suggested extensions."
@@ -233,21 +260,21 @@ msgstr ""
 "请将您的存档文件保存为原来的格式。\n"
 "提示：使用建议的扩展名之一。"
 
-#: arkwidget.cpp:296
+#: arkwidget.cpp:299
 msgid "Saving..."
 msgstr "正在保存..."
 
-#: arkwidget.cpp:431
+#: arkwidget.cpp:434
 #, c-format
 msgid "Could not create the folder %1"
 msgstr "无法创建文件夹 %1"
 
-#: arkwidget.cpp:467
+#: arkwidget.cpp:470
 #, c-format
 msgid "An error occurred while opening the archive %1."
 msgstr "打开存档文件 %1 时出错。"
 
-#: arkwidget.cpp:498 arkwidget.cpp:1378
+#: arkwidget.cpp:501 arkwidget.cpp:1390
 msgid ""
 "The following files will not be extracted\n"
 "because they already exist:"
@@ -255,52 +282,52 @@ msgstr ""
 "下列文件将不会被解压缩，原因是这些文件已经\n"
 "存在："
 
-#: arkwidget.cpp:513
+#: arkwidget.cpp:516
 msgid "Not enough free disc space to extract the archive."
 msgstr "没有足够的剩余磁盘空间来解压缩存档文件。"
 
-#: arkwidget.cpp:529
+#: arkwidget.cpp:532
 msgid "An error occurred while extracting the archive."
 msgstr "解压缩存档文件时出错。"
 
-#: arkwidget.cpp:669
+#: arkwidget.cpp:676
 msgid "An error occurred while adding the files to the archive."
 msgstr "将文件添加到存档文件时出错。"
 
-#: arkwidget.cpp:708
+#: arkwidget.cpp:715
 msgid "The archive %1 does not exist."
 msgstr "存档文件 %1 不存在。"
 
-#: arkwidget.cpp:714
+#: arkwidget.cpp:721
 msgid "You do not have permission to access that archive."
 msgstr "您没有权限访问该存档文件。"
 
-#: arkwidget.cpp:795
+#: arkwidget.cpp:805
 msgid "Archive already exists. Do you wish to overwrite it?"
 msgstr "存档文件已经存在。您要覆盖它吗？"
 
-#: arkwidget.cpp:796
+#: arkwidget.cpp:806
 msgid "Archive Already Exists"
 msgstr "存档文件已经存在"
 
-#: arkwidget.cpp:796
+#: arkwidget.cpp:806
 msgid "Overwrite"
 msgstr "覆盖"
 
-#: arkwidget.cpp:796
+#: arkwidget.cpp:806
 msgid "Do Not Overwrite"
 msgstr "不覆盖"
 
-#: arkwidget.cpp:816
+#: arkwidget.cpp:826
 #, c-format
 msgid "You do not have permission to write to the directory %1"
 msgstr "您没有权限写入目录 %1"
 
-#: arkwidget.cpp:829 arkwidget.cpp:979
+#: arkwidget.cpp:839 arkwidget.cpp:989
 msgid "Create New Archive"
 msgstr "创建新存档文件"
 
-#: arkwidget.cpp:976
+#: arkwidget.cpp:986
 msgid ""
 "You are currently working with a simple compressed file.\n"
 "Would you like to make it into an archive so that it can contain multiple "
@@ -311,131 +338,140 @@ msgstr ""
 "您想把它转化为存档文件以包含多个文件吗？\n"
 "如果是这样，您必须为新建的存档文件选择文件名。"
 
-#: arkwidget.cpp:976
+#: arkwidget.cpp:986
 msgid "Make Into Archive"
 msgstr "制作进存档文件"
 
-#: arkwidget.cpp:976
+#: arkwidget.cpp:986
 msgid "Do Not Make"
 msgstr "不制作"
 
-#: arkwidget.cpp:991 arkwidget.cpp:2064
+#: arkwidget.cpp:1001 arkwidget.cpp:2095
 msgid "Creating archive..."
 msgstr "正在创建存档文件..."
 
-#: arkwidget.cpp:1094
+#: arkwidget.cpp:1104
 msgid "Select Files to Add"
 msgstr "选择要添加的文件"
 
-#: arkwidget.cpp:1133
+#: arkwidget.cpp:1143
 msgid "Adding files..."
 msgstr "正在添加文件..."
 
-#: arkwidget.cpp:1152
+#: arkwidget.cpp:1162
 msgid "Select Folder to Add"
 msgstr "选择要添加的文件夹"
 
-#: arkwidget.cpp:1157
+#: arkwidget.cpp:1167
 msgid "Adding folder..."
 msgstr "正在添加文件夹..."
 
-#: arkwidget.cpp:1249
+#: arkwidget.cpp:1261
 msgid "Do you really want to delete the selected items?"
 msgstr "您确定要删除选中的项目吗？"
 
-#: arkwidget.cpp:1270
+#: arkwidget.cpp:1282
 msgid "Removing..."
 msgstr "正在删除..."
 
-#: arkwidget.cpp:1317
+#: arkwidget.cpp:1329
 msgid "Open with:"
 msgstr "打开方式："
 
-#: arkwidget.cpp:1432
+#: arkwidget.cpp:1444
 msgid "The archive to extract from no longer exists."
 msgstr "要解压缩的文件已不存在。"
 
-#: arkwidget.cpp:1514 arkwidget.cpp:1541 arkwidget.cpp:1575 mainwindow.cpp:399
+#: arkwidget.cpp:1526 arkwidget.cpp:1553 arkwidget.cpp:1587 mainwindow.cpp:399
 msgid "Extracting..."
 msgstr "正在解压缩..."
 
-#: arkwidget.cpp:1603
+#: arkwidget.cpp:1615
 msgid "Edit with:"
 msgstr "编辑方式："
 
-#: arkwidget.cpp:1614
+#: arkwidget.cpp:1626
 msgid "Trouble editing the file..."
 msgstr "编辑文件时出错..."
 
-#: arkwidget.cpp:1654
+#: arkwidget.cpp:1666
 msgid "Readding edited file..."
 msgstr "正在重新添加编辑的文件..."
 
-#: arkwidget.cpp:1673
+#: arkwidget.cpp:1685
 msgid "Extracting file to view"
 msgstr "正在解压缩要查看的文件"
 
-#: arkwidget.cpp:1691
+#: arkwidget.cpp:1694
+#, fuzzy
+msgid "Testing..."
+msgstr "正在删除..."
+
+#: arkwidget.cpp:1705
+msgid "Test successful."
+msgstr ""
+
+#: arkwidget.cpp:1722
 msgid ""
 "The internal viewer is not able to display this file. Would you like to view it "
 "using an external program?"
 msgstr "内部查看器无法显示此文件。您是否想要使用外部程序查看？"
 
-#: arkwidget.cpp:1692
+#: arkwidget.cpp:1723
 msgid "View Externally"
 msgstr "在外部查看"
 
-#: arkwidget.cpp:1692
+#: arkwidget.cpp:1723
 msgid "Do Not View"
 msgstr "不查看"
 
-#: arkwidget.cpp:1812
+#: arkwidget.cpp:1843
 msgid "%1 files selected  %2"
 msgstr "%1 个选中的文件  %2"
 
-#: arkwidget.cpp:1818
+#: arkwidget.cpp:1849
 #, c-format
 msgid "1 file selected  %2"
 msgstr "1 个选中的文件  %2"
 
-#: arkwidget.cpp:1891
+#: arkwidget.cpp:1922
 msgid ""
 "Do you wish to add this to the current archive or open it as a new archive?"
 msgstr "您想把它添加到当前存档文件还是作为新存档文件来打开它？"
 
-#: arkwidget.cpp:1893
+#: arkwidget.cpp:1924
 msgid "&Add"
 msgstr "添加(&A)"
 
-#: arkwidget.cpp:1893
+#: arkwidget.cpp:1924
 msgid "&Open"
 msgstr "打开(&O)"
 
-#: arkwidget.cpp:1948
+#: arkwidget.cpp:1979
 msgid ""
 "There is no archive currently open. Do you wish to create one now for these "
 "files?"
 msgstr "当前没有已打开的存档文件。您想为这些文件创建一个存档文件吗？"
 
-#: arkwidget.cpp:1949
+#: arkwidget.cpp:1980
 msgid ""
 "There is no archive currently open. Do you wish to create one now for this "
 "file?"
 msgstr "当前没有已打开的存档文件。您想为该文件创建一个存档文件吗？"
 
-#: arkwidget.cpp:1950
+#: arkwidget.cpp:1981
 msgid "Create Archive"
 msgstr "创建压缩文件"
 
-#: arkwidget.cpp:1950 extractiondialog.cpp:149
+#: arkwidget.cpp:1981 extractiondialog.cpp:149
 msgid "Do Not Create"
 msgstr "不创建"
 
-#: arkwidget.cpp:2033 arkwidget.cpp:2146
+#: arkwidget.cpp:2064 arkwidget.cpp:2178
 msgid "Unknown archive format or corrupted archive"
 msgstr "未知格式或已损坏的存档文件"
 
-#: arkwidget.cpp:2040 arkwidget.cpp:2152
+#: arkwidget.cpp:2071 arkwidget.cpp:2184
 msgid ""
 "The utility %1 is not in your PATH.\n"
 "Please install it or contact your system administrator."
@@ -443,48 +479,48 @@ msgstr ""
 "工具程序 %1 不在您的路径中。\n"
 "请安装该程序或联系您的系统管理员。"
 
-#: arkwidget.cpp:2101
+#: arkwidget.cpp:2133
 msgid "An error occurred while trying to create the archive."
 msgstr "试图创建存档文件时出错。"
 
-#: arkwidget.cpp:2165
+#: arkwidget.cpp:2197
 msgid "Opening the archive..."
 msgstr "正在打开存档文件..."
 
-#: arkwidget.cpp:2189
+#: arkwidget.cpp:2222
 msgid ""
 "This archive is read-only. If you want to save it under a new name, go to the "
 "File menu and select Save As."
 msgstr "该存档文件具有只读属性。如果您要以新文件名保存它，请在“文件”菜单中选择“另存为”。"
 
-#: arkwidget.cpp:2207
+#: arkwidget.cpp:2240
 #, c-format
 msgid "An error occurred while trying to open the archive %1"
 msgstr "试图打开存档文件 %1 时出错..."
 
 #. i18n: file general.ui line 16
-#: arkwidget.cpp:2242 rc.cpp:60
+#: arkwidget.cpp:2275 rc.cpp:63
 #, no-c-format
 msgid "General"
 msgstr "常规"
 
-#: arkwidget.cpp:2242
+#: arkwidget.cpp:2275
 msgid "General Settings"
 msgstr "常规设置"
 
-#: arkwidget.cpp:2243
+#: arkwidget.cpp:2276
 msgid "Addition"
 msgstr "添加文件"
 
-#: arkwidget.cpp:2243
+#: arkwidget.cpp:2276
 msgid "File Addition Settings"
 msgstr "文件添加设置"
 
-#: arkwidget.cpp:2244
+#: arkwidget.cpp:2277
 msgid "Extraction"
 msgstr "解压缩"
 
-#: arkwidget.cpp:2244
+#: arkwidget.cpp:2277
 msgid "Extraction Settings"
 msgstr "解压缩设置"
 
@@ -598,8 +634,8 @@ msgstr "仅用较新的文件替换旧文件(&O)"
 msgid "Keep entries &generic (Lha)"
 msgstr "保持项目的类别属性(&G) (Lha)"
 
-#. i18n: file addition.ui line 32
-#: common_texts.cpp:27 rc.cpp:33
+#. i18n: file addition.ui line 41
+#: common_texts.cpp:27 rc.cpp:36
 #, no-c-format
 msgid "Force &MS-DOS short filenames (Zip)"
 msgstr "强制使用 MS-DOS 短文件名(&M) (Zip)"
@@ -608,32 +644,32 @@ msgstr "强制使用 MS-DOS 短文件名(&M) (Zip)"
 msgid "Translate LF to DOS &CRLF (Zip)"
 msgstr "将换行符 LF 转换成 DOS &CRLF (Zip)"
 
-#. i18n: file addition.ui line 56
-#: common_texts.cpp:29 rc.cpp:42
+#. i18n: file addition.ui line 65
+#: common_texts.cpp:29 rc.cpp:45
 #, no-c-format
 msgid "&Recursively add subfolders (Zip, Rar)"
 msgstr "递归添加所有子文件夹(&R) (Zip, Rar)"
 
-#. i18n: file addition.ui line 48
-#: common_texts.cpp:30 rc.cpp:39
+#. i18n: file addition.ui line 57
+#: common_texts.cpp:30 rc.cpp:42
 #, no-c-format
 msgid "&Store symlinks as links (Zip, Rar)"
 msgstr "保存符号链接为链接(&S) (Zip, Rar)"
 
 #. i18n: file extraction.ui line 24
-#: common_texts.cpp:31 rc.cpp:45
+#: common_texts.cpp:31 rc.cpp:48
 #, no-c-format
 msgid "O&verwrite files (Zip, Tar, Zoo, Rar)"
 msgstr "覆盖文件(&V) (Zip, Tar, Zoo, Rar)"
 
 #. i18n: file extraction.ui line 32
-#: common_texts.cpp:32 rc.cpp:48
+#: common_texts.cpp:32 rc.cpp:51
 #, no-c-format
 msgid "&Preserve permissions (Tar)"
 msgstr "保留文件权限(&P) (Tar)"
 
 #. i18n: file extraction.ui line 40
-#: common_texts.cpp:33 rc.cpp:51
+#: common_texts.cpp:33 rc.cpp:54
 #, no-c-format
 msgid "&Ignore folder names (Zip)"
 msgstr "忽略文件夹名(&I) (Zip)"
@@ -662,7 +698,7 @@ msgstr ""
 msgid "Simple Compressed Archive"
 msgstr "简单压缩的存档文件"
 
-#: compressedfile.cpp:328 tar.cpp:176 tar.cpp:192
+#: compressedfile.cpp:340 tar.cpp:176 tar.cpp:192
 msgid "Trouble writing to the archive..."
 msgstr "保存到存档文件时出错..."
 
@@ -695,8 +731,8 @@ msgstr "解压缩全部文件"
 msgid "Destination folder: "
 msgstr "目的文件夹："
 
-#. i18n: file ark.kcfg line 82
-#: extractiondialog.cpp:122 rc.cpp:135
+#. i18n: file ark.kcfg line 87
+#: extractiondialog.cpp:122 rc.cpp:144
 #, no-c-format
 msgid "Open destination folder after extraction"
 msgstr "解压缩后打开目的文件夹"
@@ -845,50 +881,56 @@ msgstr "正在压缩..."
 msgid "Please Wait"
 msgstr "请稍候"
 
-#. i18n: file ark_part.rc line 16
+#. i18n: file ark_part.rc line 18
 #: rc.cpp:9 rc.cpp:21
 #, no-c-format
 msgid "&Action"
 msgstr "动作(&A)"
 
-#. i18n: file addition.ui line 24
+#. i18n: file addition.ui line 25
 #: rc.cpp:30
 #, no-c-format
+msgid "Ask for &password when create archive if possible"
+msgstr ""
+
+#. i18n: file addition.ui line 33
+#: rc.cpp:33
+#, no-c-format
 msgid "Replace old files only &with newer files"
 msgstr "仅用较新的文件替换旧文件(&W)"
 
-#. i18n: file addition.ui line 40
-#: rc.cpp:36
+#. i18n: file addition.ui line 49
+#: rc.cpp:39
 #, no-c-format
 msgid "Translate &LF to DOS CRLF (Zip)"
 msgstr "将换行符 &LF 转换成 DOS CRLF (Zip)"
 
 #. i18n: file extraction.ui line 48
-#: rc.cpp:54
+#: rc.cpp:57
 #, no-c-format
 msgid "Convert file names to &lowercase (Zip, Rar)"
 msgstr "将文件名转换为小写(&L) (Zip, Rar)"
 
 #. i18n: file extraction.ui line 56
-#: rc.cpp:57
+#: rc.cpp:60
 #, no-c-format
 msgid "Convert file names to &uppercase (Rar)"
 msgstr "将文件名转换为大写(&U) (Rar)"
 
 #. i18n: file general.ui line 27
-#: rc.cpp:63
+#: rc.cpp:66
 #, no-c-format
 msgid "&Use integrated viewer"
 msgstr "使用集成的查看器(&U)"
 
 #. i18n: file general.ui line 35
-#: rc.cpp:66
+#: rc.cpp:69
 #, no-c-format
 msgid "&Enable Konqueror integration"
 msgstr "启用 Konqueror 集成(&E)"
 
 #. i18n: file general.ui line 68
-#: rc.cpp:69
+#: rc.cpp:72
 #, no-c-format
 msgid ""
 "<font size=\"-1\"><i>Konqueror integration is only available if you install the "
@@ -898,19 +940,19 @@ msgstr ""
 "</font>"
 
 #. i18n: file ark.kcfg line 9
-#: rc.cpp:72
+#: rc.cpp:75
 #, no-c-format
 msgid "Last folders used for extraction"
 msgstr "上次使用的解压缩文件夹"
 
 #. i18n: file ark.kcfg line 12
-#: rc.cpp:75
+#: rc.cpp:78
 #, no-c-format
 msgid "Replace old files only with newer files"
 msgstr "仅用较新的文件替换旧文件"
 
 #. i18n: file ark.kcfg line 13
-#: rc.cpp:78
+#: rc.cpp:81
 #, no-c-format
 msgid ""
 "If this option is enabled and you add filenames that already exist in an "
@@ -918,27 +960,33 @@ msgid ""
 msgstr "如果启用了此选项，而您想要添加的文件在存档文件中已有同名文件，则只会在要添加的文件较新时才会发生替换。"
 
 #. i18n: file ark.kcfg line 17
-#: rc.cpp:81
+#: rc.cpp:84
 #, no-c-format
 msgid "Overwrite files (Zip, Tar, Zoo, Rar)"
 msgstr "覆盖文件 (Zip, Tar, Zoo, Rar)"
 
 #. i18n: file ark.kcfg line 18
-#: rc.cpp:84
+#: rc.cpp:87
 #, no-c-format
 msgid ""
 "Overwrite any files that have matching names on disk with the one from the "
 "archive"
 msgstr "将磁盘上匹配名称的任何文件覆盖为存档文件中的文件"
 
-#. i18n: file ark.kcfg line 24
-#: rc.cpp:87
+#. i18n: file ark.kcfg line 22
+#: rc.cpp:90 rc.cpp:93
+#, no-c-format
+msgid "Ask for password when create archive if possible"
+msgstr ""
+
+#. i18n: file ark.kcfg line 29
+#: rc.cpp:96
 #, no-c-format
 msgid "Preserve permissions"
 msgstr "保留文件权限"
 
-#. i18n: file ark.kcfg line 25
-#: rc.cpp:90
+#. i18n: file ark.kcfg line 30
+#: rc.cpp:99
 #, no-c-format
 msgid ""
 "Save the user, group, and permission settings on files. Use with care, as this "
@@ -946,76 +994,76 @@ msgid ""
 "your computer"
 msgstr "保存文件的用户、群组和权限设置。请小心使用，因为这可能导致解压缩出的文件不属于您计算机上的任何用户"
 
-#. i18n: file ark.kcfg line 31
-#: rc.cpp:93
+#. i18n: file ark.kcfg line 36
+#: rc.cpp:102
 #, no-c-format
 msgid "Force MS-DOS short filenames (Zip)"
 msgstr "强制使用 MS-DOS 短文件名 (Zip)"
 
-#. i18n: file ark.kcfg line 32
-#: rc.cpp:96
+#. i18n: file ark.kcfg line 37
+#: rc.cpp:105
 #, no-c-format
 msgid "Force names of files in Zip archives to the DOS 8.3 format"
 msgstr "强制 Zip 存档文件中的文件名为 DOS 8.3 格式"
 
-#. i18n: file ark.kcfg line 36
-#: rc.cpp:99
+#. i18n: file ark.kcfg line 41
+#: rc.cpp:108
 #, no-c-format
 msgid "Translate LF to DOS CRLF"
 msgstr "将换行符 LF 转换成 DOS CRLF"
 
-#. i18n: file ark.kcfg line 40
-#: rc.cpp:102
+#. i18n: file ark.kcfg line 45
+#: rc.cpp:111
 #, no-c-format
 msgid "Ignore folder names (Zip)"
 msgstr "忽略文件夹名 (Zip)"
 
-#. i18n: file ark.kcfg line 41
-#: rc.cpp:105
+#. i18n: file ark.kcfg line 46
+#: rc.cpp:114
 #, no-c-format
 msgid ""
 "Extract all the files into the extraction folder, ignoring any folder structure "
 "in the archive."
 msgstr "将全部文件解压缩到解压文件夹，而忽略存档文件中的文件夹结构。"
 
-#. i18n: file ark.kcfg line 47
-#: rc.cpp:108
+#. i18n: file ark.kcfg line 52
+#: rc.cpp:117
 #, no-c-format
 msgid "Store symlinks as links (Zip, Rar)"
 msgstr "保存符号链接为链接 (Zip, Rar)"
 
-#. i18n: file ark.kcfg line 51
-#: rc.cpp:111
+#. i18n: file ark.kcfg line 56
+#: rc.cpp:120
 #, no-c-format
 msgid "Recursively add subfolders (Zip, Rar)"
 msgstr "递归添加所有子文件夹 (Zip, Rar)"
 
-#. i18n: file ark.kcfg line 55
-#: rc.cpp:114
+#. i18n: file ark.kcfg line 60
+#: rc.cpp:123
 #, no-c-format
 msgid "Convert filenames to lowercase (Zip, Rar)"
 msgstr "将文件名转换为小写 (Zip, Rar)"
 
-#. i18n: file ark.kcfg line 59
-#: rc.cpp:117
+#. i18n: file ark.kcfg line 64
+#: rc.cpp:126
 #, no-c-format
 msgid "Convert filenames to uppercase"
 msgstr "将文件名转换为大写"
 
-#. i18n: file ark.kcfg line 65
-#: rc.cpp:120
+#. i18n: file ark.kcfg line 70
+#: rc.cpp:129
 #, no-c-format
 msgid "Show search bar"
 msgstr "显示搜索栏"
 
-#. i18n: file ark.kcfg line 69
-#: rc.cpp:123
+#. i18n: file ark.kcfg line 74
+#: rc.cpp:132
 #, no-c-format
 msgid "Enable Konqueror integration"
 msgstr "启用 Konqueror 集成"
 
-#. i18n: file ark.kcfg line 70
-#: rc.cpp:126
+#. i18n: file ark.kcfg line 75
+#: rc.cpp:135
 #, no-c-format
 msgid ""
 "Enables integration with Konqueror's context menus, letting you easily archive "
@@ -1023,20 +1071,20 @@ msgid ""
 "package installed."
 msgstr "启用与 Konqueror 快捷菜单的集成，以便让您轻松对文档进行存档。此选项仅当您安装了 tdeaddons 包时才生效。"
 
-#. i18n: file ark.kcfg line 74
-#: rc.cpp:129
+#. i18n: file ark.kcfg line 79
+#: rc.cpp:138
 #, no-c-format
 msgid "Use integrated viewer"
 msgstr "使用集成查看器"
 
-#. i18n: file ark.kcfg line 78
-#: rc.cpp:132
+#. i18n: file ark.kcfg line 83
+#: rc.cpp:141
 #, no-c-format
 msgid "Tar Command"
 msgstr "Tar 命令"
 
-#. i18n: file ark.kcfg line 86
-#: rc.cpp:138
+#. i18n: file ark.kcfg line 91
+#: rc.cpp:147
 #, no-c-format
 msgid "Enable experimental support for loading ACE files"
 msgstr "启用装入 ACE 文件的试验性支持"
@@ -1053,11 +1101,11 @@ msgstr ""
 "重置搜索\n"
 "重置搜索栏，这样就会显示全部存档项。"
 
-#: tar.cpp:405
+#: tar.cpp:420
 msgid "Unable to fork a decompressor"
 msgstr "无法启动一个解压缩器"
 
-#: tar.cpp:432
+#: tar.cpp:447
 msgid "Trouble writing to the tempfile..."
 msgstr "写入临时文件时出错..."
 
diff --git a/tde-i18n-zh_CN/messages/tdeutils/irkick.po b/tde-i18n-zh_CN/messages/tdeutils/irkick.po
index a25ee18373d..abe0eb3d8a3 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/irkick.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/irkick.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: irkick\n"
-"POT-Creation-Date: 2005-07-24 01:36+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2003-12-20 22:50+0800\n"
 "Last-Translator: iceco <rainflymoon@163.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeutils/kcalc.po b/tde-i18n-zh_CN/messages/tdeutils/kcalc.po
index f49e486294e..e5498c6f365 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/kcalc.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/kcalc.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2008-07-08 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-08-04 03:48+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -366,51 +367,52 @@ msgstr "清除数据存储"
 msgid "&Constants"
 msgstr "常数(&C)"
 
-#: kcalc.cpp:1768
+#: kcalc.cpp:1767
 msgid "Last stat item erased"
 msgstr "已清除上一次统计数据"
 
-#: kcalc.cpp:1779
+#: kcalc.cpp:1778
 msgid "Stat mem cleared"
 msgstr "已清除统计记忆"
 
 #. i18n: file general.ui line 16
-#: kcalc.cpp:1825 rc.cpp:78
+#: kcalc.cpp:1824 rc.cpp:78
 #, no-c-format
 msgid "General"
 msgstr "常规"
 
-#: kcalc.cpp:1825
+#: kcalc.cpp:1824
 msgid "General Settings"
 msgstr "常规设置"
 
-#: kcalc.cpp:1833
+#: kcalc.cpp:1832
 msgid "Select Display Font"
 msgstr "选择显示字体"
 
-#: kcalc.cpp:1839
+#: kcalc.cpp:1838
 msgid "Colors"
 msgstr "颜色"
 
-#: kcalc.cpp:1839
+#: kcalc.cpp:1838
 msgid "Button & Display Colors"
 msgstr "按钮和显示颜色"
 
 #. i18n: file constants.ui line 16
-#: kcalc.cpp:1876 rc.cpp:36
+#: kcalc.cpp:1875 rc.cpp:36
 #, no-c-format
 msgid "Constants"
 msgstr "常数"
 
-#: kcalc.cpp:2273
+#: kcalc.cpp:2272
 msgid "KCalc"
 msgstr "KCalc"
 
-#: kcalc.cpp:2275
+#: kcalc.cpp:2274
+#, fuzzy
 msgid ""
 "(c) 2003-2005, Klaus Niederkrüger\n"
 "(c) 1996-2000, Bernd Johannes Wuebben\n"
-"(c) 2000-2005, The TDE Team"
+"(c) 2000-2005, The KDE Team"
 msgstr ""
 "(c) 2003-2005，Klaus Niederkrüger\n"
 "(c) 1996-2000，Bernd Johannes Wuebben\n"
diff --git a/tde-i18n-zh_CN/messages/tdeutils/kcharselect.po b/tde-i18n-zh_CN/messages/tdeutils/kcharselect.po
index 8a4a8b394b8..6978c65d6ff 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/kcharselect.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/kcharselect.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcharselect\n"
-"POT-Creation-Date: 2004-12-21 01:21+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-01-09 22:04+0800\n"
 "Last-Translator: Li Zongliang <li-zongliang@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeutils/kcharselectapplet.po b/tde-i18n-zh_CN/messages/tdeutils/kcharselectapplet.po
index 2e0be53639f..f95546ea932 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/kcharselectapplet.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/kcharselectapplet.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcharselectapplet\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2003-01-14 15:05-0500\n"
 "Last-Translator: Mai Hao Hui <mhh@126.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeutils/kcmkvaio.po b/tde-i18n-zh_CN/messages/tdeutils/kcmkvaio.po
index 192a8cd162d..e331fe02549 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/kcmkvaio.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/kcmkvaio.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmkvaio\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2003-12-20 22:36+0800\n"
 "Last-Translator: iceco <rainflymoon@163.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeutils/kcmlaptop.po b/tde-i18n-zh_CN/messages/tdeutils/kcmlaptop.po
index 12b5cab5b81..519382e98c6 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/kcmlaptop.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/kcmlaptop.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2006-10-14 02:36+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-01-15 21:53+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -591,35 +592,24 @@ msgstr "设置助手应用程序"
 msgid "This button can be used to enable the ACPI helper application"
 msgstr "此按钮可用于启用 ACPI 助手应用程序"
 
-#: acpi.cpp:169 apm.cpp:191
-msgid ""
-"The %1 application does not seem to have the same size or checksum as when it "
-"was compiled we do NOT recommend you proceed with making it setuid-root without "
-"further investigation"
-msgstr "%1 应用程序好像与编译时的大小和校验和不同，我们不推荐您不进行过多的调查而将其设成 root 用户级"
-
-#: acpi.cpp:172 acpi.cpp:182 acpi.cpp:194 apm.cpp:174 apm.cpp:194 apm.cpp:204
-#: apm.cpp:216 sony.cpp:115 sony.cpp:127
-msgid "KLaptopDaemon"
-msgstr "KLaptopDaemon"
-
 #: acpi.cpp:172 apm.cpp:194
-msgid "Run Nevertheless"
-msgstr "仍然运行"
-
-#: acpi.cpp:180 apm.cpp:202
 msgid ""
 "You will need to supply a root password to allow the privileges of the "
 "klaptop_acpi_helper to change."
 msgstr "要更改 klaptop_acpi_helper 的权限，您需要提供 root 的密码。"
 
-#: acpi.cpp:193
+#: acpi.cpp:174 acpi.cpp:186 apm.cpp:174 apm.cpp:196 apm.cpp:208 sony.cpp:115
+#: sony.cpp:127
+msgid "KLaptopDaemon"
+msgstr "KLaptopDaemon"
+
+#: acpi.cpp:185
 msgid ""
 "The ACPI helper cannot be enabled because tdesu cannot be found.  Please make "
 "sure that it is installed correctly."
 msgstr "无法启用 ACPI 助手，原因是找不到 tdesu。请确定该程序已经正确安装了。"
 
-#: acpi.cpp:276
+#: acpi.cpp:268
 msgid ""
 "<h1>ACPI Setup</h1>This module allows you to configure ACPI for your system"
 msgstr "<h1>ACPI 设置</h1>此模块让您设置系统里的 ACPI 功能"
@@ -911,13 +901,13 @@ msgid ""
 "is installed correctly."
 msgstr "无法启用 %1，因为找不到 tdesu。请确定该程序已经正确安装。"
 
-#: apm.cpp:215
+#: apm.cpp:207
 msgid ""
 "The Software Suspend helper cannot be enabled because tdesu cannot be found.  "
 "Please make sure that it is installed correctly."
 msgstr "无法启用软件挂起助手应用程序，因为找不到 tdesu。请确定该程序已经正确安装。"
 
-#: apm.cpp:279
+#: apm.cpp:271
 msgid ""
 "<h1>APM Setup</h1>This module allows you to configure APM for your system"
 msgstr "<h1>APM 设置</h1>此模块让您设置系统里的 APM 功能"
@@ -934,5 +924,11 @@ msgid ""
 "Your emails"
 msgstr "i18n-translation@lists.linux.net.cn"
 
+#~ msgid "The %1 application does not seem to have the same size or checksum as when it was compiled we do NOT recommend you proceed with making it setuid-root without further investigation"
+#~ msgstr "%1 应用程序好像与编译时的大小和校验和不同，我们不推荐您不进行过多的调查而将其设成 root 用户级"
+
+#~ msgid "Run Nevertheless"
+#~ msgstr "仍然运行"
+
 #~ msgid "When this amount of battery is left the actions enabled below will be triggered"
 #~ msgstr "电量达到给定范围后，将会触发下面指定的动作"
diff --git a/tde-i18n-zh_CN/messages/tdeutils/kcmtdewallet.po b/tde-i18n-zh_CN/messages/tdeutils/kcmtdewallet.po
index ea2bbb64440..581758271cd 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/kcmtdewallet.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/kcmtdewallet.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmwallet 3.2\n"
-"POT-Creation-Date: 2006-08-23 02:35+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2003-11-11 13:08+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -54,8 +55,9 @@ msgid "Always Deny"
 msgstr "总是拒绝"
 
 #: konfigurator.cpp:299
+#, fuzzy
 msgid ""
-"This configuration module allows you to configure the TDE wallet system."
+"This configuration module allows you to configure the KDE wallet system."
 msgstr "此配置模块允许您配置 TDE 钱包系统。"
 
 #. i18n: file walletconfigwidget.ui line 31
diff --git a/tde-i18n-zh_CN/messages/tdeutils/kcmthinkpad.po b/tde-i18n-zh_CN/messages/tdeutils/kcmthinkpad.po
index 4c792487b4a..47be61f947b 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/kcmthinkpad.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/kcmthinkpad.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmthinkpad\n"
-"POT-Creation-Date: 2005-09-30 02:48+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-08-04 03:52+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeutils/kdf.po b/tde-i18n-zh_CN/messages/tdeutils/kdf.po
index bcbf48f76b0..eb5398e68c9 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/kdf.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/kdf.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kdf\n"
-"POT-Creation-Date: 2004-12-29 14:54+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-01-09 12:57+0800\n"
 "Last-Translator: Li Zongliang <li-zongliang@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -27,7 +28,7 @@ msgid ""
 "Your emails"
 msgstr "li-zongliang@21cn.com"
 
-#: disklist.cpp:267
+#: disklist.cpp:268
 #, c-format
 msgid "could not execute [%s]"
 msgstr "无法执行 [%s]"
@@ -53,10 +54,6 @@ msgid ""
 "on all hardware architectures and/or operating systems."
 msgstr "<h3>硬件信息</h3><br> 所有的信息模块返回关于您的计算机硬件或操作系统一方面的信息。不同硬件体系结构和操作系统上的模块并不相同。"
 
-#: tdeconftest.cpp:44
-msgid "A test application"
-msgstr "一个测试程序"
-
 #: kdf.cpp:33
 msgid "TDE free disk space utility"
 msgstr "TDE 剩余磁盘空间工具"
@@ -235,3 +232,7 @@ msgstr "常规设置"
 #: optiondialog.cpp:38
 msgid "Mount Commands"
 msgstr "挂载命令"
+
+#: tdeconftest.cpp:44
+msgid "A test application"
+msgstr "一个测试程序"
diff --git a/tde-i18n-zh_CN/messages/tdeutils/kedit.po b/tde-i18n-zh_CN/messages/tdeutils/kedit.po
index 5163c9bf374..2c81938ce8d 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/kedit.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/kedit.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2008-07-08 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-01-09 12:57+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeutils/kfloppy.po b/tde-i18n-zh_CN/messages/tdeutils/kfloppy.po
index 1f5be2965cf..16744eb6b5f 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/kfloppy.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/kfloppy.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kfloppy\n"
-"POT-Creation-Date: 2007-06-02 02:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-08-04 04:02+0800\n"
 "Last-Translator: Wang Jian <lark@linux.ustc.edu.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -46,7 +47,8 @@ msgid "Add BSD support"
 msgstr "增加 BSD 支持"
 
 #: main.cpp:57
-msgid "Make KFloppy work again for TDE 3.4"
+#, fuzzy
+msgid "Make KFloppy work again for KDE 3.4"
 msgstr "使 KFloppy 仍可在 TDE 3.4 下运行"
 
 #: format.cpp:269
diff --git a/tde-i18n-zh_CN/messages/tdeutils/kgpg.po b/tde-i18n-zh_CN/messages/tdeutils/kgpg.po
index ede99d948f7..bb6eecdb6f2 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/kgpg.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/kgpg.po
@@ -6,15 +6,183 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kgpg\n"
-"POT-Creation-Date: 2008-07-11 01:32+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-08-04 04:22+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
+#: kgpgeditor.cpp:143
+msgid "&Encrypt File..."
+msgstr "加密文件(&E)..."
+
+#: kgpgeditor.cpp:144
+msgid "&Decrypt File..."
+msgstr "解密文件(&D)..."
+
+#: kgpg.cpp:787 kgpgeditor.cpp:145
+msgid "&Open Key Manager"
+msgstr "打开密钥管理器(&O)"
+
+#: kgpgeditor.cpp:149
+msgid "&Generate Signature..."
+msgstr "生成签名(&G)..."
+
+#: kgpgeditor.cpp:150
+msgid "&Verify Signature..."
+msgstr "核对签名(&V)..."
+
+#: kgpgeditor.cpp:151
+msgid "&Check MD5 Sum..."
+msgstr "检查 MD5 校验和(&C)..."
+
+#: kgpgeditor.cpp:220 kgpgeditor.cpp:230 kgpgeditor.cpp:467 kgpgeditor.cpp:481
+#: kgpgeditor.cpp:513
+msgid "*|All Files"
+msgstr "*|所有文件"
+
+#: kgpgeditor.cpp:220
+msgid "Open File to Encode"
+msgstr "打开要编码的文件"
+
+#: kgpgeditor.cpp:230
+msgid "Open File to Decode"
+msgstr "打开要解码的文件"
+
+#: kgpgeditor.cpp:244
+msgid "Decrypt File To"
+msgstr "将文件解密到"
+
+#: kgpgeditor.cpp:250 listkeys.cpp:1519
+msgid "Save File"
+msgstr "保存文件"
+
+#. i18n: file conf_misc.ui line 198
+#: kgpgeditor.cpp:252 rc.cpp:203
+#, no-c-format
+msgid "Editor"
+msgstr "编辑器"
+
+#: kgpg.cpp:197 kgpg.cpp:409 kgpgeditor.cpp:268 kgpglibrary.cpp:95
+msgid "File Already Exists"
+msgstr "文件已经存在"
+
+#: kgpgeditor.cpp:317
+msgid ""
+"The document could not been saved, as the selected encoding cannot encode every "
+"unicode character in it."
+msgstr "文档无法保存，因为所选编码无法完全表示文档中的字符。"
+
+#: kgpgeditor.cpp:325 kgpgeditor.cpp:352
+msgid ""
+"The document could not be saved, please check your permissions and disk space."
+msgstr "文档无法保存，请检查您的权限和磁盘空间。"
+
+#: kgpgeditor.cpp:379 kgpgeditor.cpp:388
+msgid "Overwrite existing file %1?"
+msgstr "要覆盖已有的文件 %1 吗？"
+
+#: kgpgeditor.cpp:380 kgpgeditor.cpp:389
+msgid "Overwrite"
+msgstr "覆盖"
+
+#: kgpgeditor.cpp:467 kgpgeditor.cpp:513
+msgid "Open File to Verify"
+msgstr "打开要核对的文件"
+
+#: kgpgeditor.cpp:481
+msgid "Open File to Sign"
+msgstr "打开要签名的文件"
+
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "TDE 简体中文翻译组"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "i18n-translation@lists.linux.net.cn"
+
+#: tips.txt:3
+msgid ""
+"<p>If you want to decrypt a text file, simply drag and drop it into the editor "
+"window. Kgpg will do the rest. Even remote files can be dropped.</p>\n"
+"<p>Drag a public key into the editor window and kgpg will automatically import "
+"it if you want.</p>\n"
+msgstr ""
+"<p>如果您要解密文本文件，只要简单地将它拖放到编辑器窗口，Kgpg 会自动完成剩下的工作。即使是远程的文件也可以拖放。</p>\n"
+"<p>如果您需要，也可以拖放一个公开密钥到编辑器窗口，kgpg 将自动为您导入它。</p>\n"
+
+#: tips.txt:9
+msgid ""
+"<p>The easiest way to encrypt a file: simply right click on the file, and you "
+"have an encrypt option in the contextual menu.\n"
+"This works in <strong>konqueror</strong> or on your Desktop!</p>\n"
+msgstr ""
+"<p>加密一个文件最简单的办法：用鼠标右键点击该文件，然后您可以环境菜单中选择加密选项。\n"
+"在 <strong>Konqueror</strong> 里和您的桌面上都能这样做！</p>\n"
+
+#: tips.txt:15
+msgid ""
+"<p>If you want to encrypt a message for several persons, just select several "
+"encryption keys by pressing the \"Ctrl\" key.</p>\n"
+msgstr ""
+"<p>如果您要为多个人加密信件，只要按住“Ctrl”键用鼠标选中多个密钥即可。</p>\n"
+
+#: tips.txt:20
+msgid ""
+"<p><strong>You don't know anything about encryption?</strong>"
+"<br>\n"
+"No problem, simply create yourself a key pair in the key management window. "
+"Then, export your public key & mail it to your friends."
+"<br>\n"
+"Ask them to do the same & import their public keys. Finally, to send an "
+"encrypted message, type it in the Kgpg editor, then click \"encrypt\". Choose \n"
+"your friend key and click \"encrypt\" again. The message will be encrypted, "
+"ready to be sent by email.</p>\n"
+msgstr ""
+"<p><strong>您一点关于加密的知识也没有？</strong>"
+"<br>\n"
+"没问题，只要简单地在密钥管理窗口中给您自己创建一对密钥，然后将您的公钥发送给您的朋友们即可。"
+"<br>\n"
+"让他们也照这样做，并导入他们的公钥。最后，对要发送加密的信件，只要在 Kgpg 编辑器里输入它，然后点击“加密”即可。\n"
+"选择您朋友的公钥，再次点击“加密”。该信件将会被加密，然后就能用电子邮件发送了。</p>\n"
+
+#: tips.txt:28
+msgid ""
+"<p>To perform an operation on a key, open the key management window & right "
+"click on the key. A popup menu with all available options will appear.</p>\n"
+msgstr ""
+"<p>要对一个密钥进行操作，请打开密钥管理窗口，并用鼠标右键点击该密钥，一个弹出菜单将显示所有可供选择的操作选项。</p>\n"
+
+#: tips.txt:33
+msgid ""
+"<p>Decrypt a file with a single mouse click on it. You will then be prompted "
+"for password & that's all!</p>\n"
+msgstr ""
+"<p>用鼠标单击就可解密一个文件。您将只需要被询问口令，就这么简单！</p>\n"
+
+#: tips.txt:38
+msgid ""
+"<p>If you only want to open the key manager, type \"kgpg -k\" in the command "
+"line prompt.</p>\n"
+msgstr ""
+"<p>如果您只要打开密钥管理器，在命令行输入“kgpg -k”即可。</p>\n"
+
+#: tips.txt:43
+msgid ""
+"<p>Typing \"kgpg -s filename\" will decrypt the file filename and open it in "
+"Kgpg's editor.</p>\n"
+msgstr ""
+"<p>输入“kgpg -s filename”命令将解密文件 filename 并用 Kgpg 编辑器打开它。</p>\n"
+
 #: kgpg.cpp:83
 msgid "&Decrypt && Save File"
 msgstr "解密并保存文件(&D)"
@@ -66,10 +234,6 @@ msgstr "Gzip"
 msgid "Bzip2"
 msgstr "Bzip2"
 
-#: kgpg.cpp:197 kgpg.cpp:409 kgpgeditor.cpp:268 kgpglibrary.cpp:95
-msgid "File Already Exists"
-msgstr "文件已经存在"
-
 #: kgpg.cpp:209
 msgid "Processing folder compression and encryption"
 msgstr "正在进行文件夹压缩和加密"
@@ -184,10 +348,6 @@ msgstr "签名/校验剪贴板(&S)"
 msgid "&Open Editor"
 msgstr "打开编辑器(&O)"
 
-#: kgpg.cpp:787 kgpgeditor.cpp:145
-msgid "&Open Key Manager"
-msgstr "打开密钥管理器(&O)"
-
 #: kgpg.cpp:789 listkeys.cpp:575
 msgid "&Key Server Dialog"
 msgstr "密钥服务器对话框(&K)"
@@ -228,6 +388,240 @@ msgstr "无法校验文件夹。"
 msgid "Encrypted following text:"
 msgstr "已加密下列文字："
 
+#: kgpgoptions.cpp:69 kgpgoptions.cpp:76 kgpgoptions.cpp:428
+#: kgpgoptions.cpp:584 kgpgoptions.cpp:590
+msgid "(Default)"
+msgstr "(默认)"
+
+#. i18n: file conf_encryption.ui line 17
+#: kgpgoptions.cpp:101 rc.cpp:41
+#, no-c-format
+msgid "Encryption"
+msgstr "加密"
+
+#: kgpgoptions.cpp:102
+msgid "Decryption"
+msgstr "解密"
+
+#: kgpgoptions.cpp:104
+msgid "GnuPG Settings"
+msgstr "GnuPG 设置"
+
+#: kgpgoptions.cpp:105
+msgid "Key Servers"
+msgstr "密钥服务器"
+
+#: kgpgoptions.cpp:106
+msgid "Misc"
+msgstr "杂项"
+
+#: kgpgoptions.cpp:188
+msgid "New GnuPG Home Location"
+msgstr ""
+
+#: kgpgoptions.cpp:196
+msgid ""
+"No configuration file was found in the selected location.\n"
+"Do you want to create it now ?\n"
+"\n"
+"Without configuration file, neither KGpg nor Gnupg will work properly."
+msgstr ""
+
+#: kgpgoptions.cpp:196
+msgid "No Configuration File Found"
+msgstr ""
+
+#: kgpgoptions.cpp:196
+msgid "Create"
+msgstr "创建"
+
+#: kgpgoptions.cpp:196
+msgid "Ignore"
+msgstr "忽略"
+
+#: kgpgoptions.cpp:204
+msgid ""
+"Cannot create configuration file. Please check if destination media is mounted "
+"and if you have write access"
+msgstr ""
+
+#: kgpgoptions.cpp:456
+msgid "Sign File"
+msgstr "签名文件"
+
+#: kgpgoptions.cpp:473
+msgid "Decrypt File"
+msgstr "解密文件"
+
+#: kgpgoptions.cpp:572
+msgid "Add New Key Server"
+msgstr "添加新的密钥服务器"
+
+#: kgpgoptions.cpp:572
+msgid "Server URL:"
+msgstr "服务器 URL："
+
+#: keyservers.cpp:55
+msgid "Key Server"
+msgstr "密钥服务器"
+
+#: keyservers.cpp:163 keyservers.cpp:409
+msgid "You must enter a search string."
+msgstr "您必须输入一个查找字符串。"
+
+#: keyservers.cpp:169 listkeys.cpp:544
+msgid "Import Key From Keyserver"
+msgstr "从密钥服务器导入密钥"
+
+#. i18n: file keyserver.ui line 97
+#: keyservers.cpp:171 rc.cpp:446
+#, no-c-format
+msgid "&Import"
+msgstr "导入(&I)"
+
+#: keyservers.cpp:178
+msgid "Connecting to the server..."
+msgstr "正在连接到服务器..."
+
+#: keyservers.cpp:233
+msgid "You must choose a key."
+msgstr "您必须选择一个密钥。"
+
+#: keyservers.cpp:265
+msgid "Found %1 matching keys"
+msgstr "找到了 %1 个匹配的密钥"
+
+#: keyservers.cpp:374 keyservers.cpp:442
+msgid "<b>Connecting to the server...</b>"
+msgstr "<b>正在连接到服务器...</b>"
+
+#: keyservers.cpp:375 keyservers.cpp:443
+msgid "&Abort"
+msgstr "中止(&A)"
+
+#: keyservers.cpp:496 kgpginterface.cpp:1408
+#, c-format
+msgid ""
+"_n: <qt>%n key processed."
+"<br></qt>\n"
+"<qt>%n keys processed."
+"<br></qt>"
+msgstr ""
+
+#: keyservers.cpp:498 kgpginterface.cpp:1410
+#, c-format
+msgid ""
+"_n: <qt>One key unchanged."
+"<br></qt>\n"
+"<qt>%n keys unchanged."
+"<br></qt>"
+msgstr ""
+
+#: keyservers.cpp:500 kgpginterface.cpp:1412
+#, c-format
+msgid ""
+"_n: <qt>One signature imported."
+"<br></qt>\n"
+"<qt>%n signatures imported."
+"<br></qt>"
+msgstr ""
+
+#: keyservers.cpp:502 kgpginterface.cpp:1414
+#, c-format
+msgid ""
+"_n: <qt>One key without ID."
+"<br></qt>\n"
+"<qt>%n keys without ID."
+"<br></qt>"
+msgstr ""
+
+#: keyservers.cpp:504 kgpginterface.cpp:1416
+#, c-format
+msgid ""
+"_n: <qt>One RSA key imported."
+"<br></qt>\n"
+"<qt>%n RSA keys imported."
+"<br></qt>"
+msgstr ""
+
+#: keyservers.cpp:506 kgpginterface.cpp:1418
+#, c-format
+msgid ""
+"_n: <qt>One user ID imported."
+"<br></qt>\n"
+"<qt>%n user IDs imported."
+"<br></qt>"
+msgstr ""
+
+#: keyservers.cpp:508 kgpginterface.cpp:1420
+#, c-format
+msgid ""
+"_n: <qt>One subkey imported."
+"<br></qt>\n"
+"<qt>%n subkeys imported."
+"<br></qt>"
+msgstr ""
+
+#: keyservers.cpp:510 kgpginterface.cpp:1422
+#, c-format
+msgid ""
+"_n: <qt>One revocation certificate imported."
+"<br></qt>\n"
+"<qt>%n revocation certificates imported."
+"<br></qt>"
+msgstr ""
+
+#: keyservers.cpp:512 kgpginterface.cpp:1425
+#, c-format
+msgid ""
+"_n: <qt>One secret key processed."
+"<br></qt>\n"
+"<qt>%n secret keys processed."
+"<br></qt>"
+msgstr ""
+
+#: keyservers.cpp:514 kgpginterface.cpp:1429
+#, c-format
+msgid ""
+"_n: <qt><b>One secret key imported.</b>"
+"<br></qt>\n"
+"<qt><b>%n secret keys imported.</b>"
+"<br></qt>"
+msgstr ""
+
+#: keyservers.cpp:516 kgpginterface.cpp:1431
+#, c-format
+msgid ""
+"_n: <qt>One secret key unchanged."
+"<br></qt>\n"
+"<qt>%n secret keys unchanged."
+"<br></qt>"
+msgstr ""
+
+#: keyservers.cpp:518 kgpginterface.cpp:1433
+#, c-format
+msgid ""
+"_n: <qt>One secret key not imported."
+"<br></qt>\n"
+"<qt>%n secret keys not imported."
+"<br></qt>"
+msgstr ""
+
+#: keyservers.cpp:520 kgpginterface.cpp:1435
+#, c-format
+msgid ""
+"_n: <qt><b>One key imported:</b>"
+"<br></qt>\n"
+"<qt><b>%n keys imported:</b>"
+"<br></qt>"
+msgstr ""
+
+#: keyservers.cpp:522 kgpginterface.cpp:1441
+msgid ""
+"No key imported... \n"
+"Check detailed log for more infos"
+msgstr ""
+
 #: listkeys.cpp:217
 msgid "Private Key List"
 msgstr "私钥列表"
@@ -315,10 +709,6 @@ msgstr "导入密钥(&I)..."
 msgid "Set as De&fault Key"
 msgstr "设置为默认密钥(&F)"
 
-#: keyservers.cpp:169 listkeys.cpp:544
-msgid "Import Key From Keyserver"
-msgstr "从密钥服务器导入密钥"
-
 #: listkeys.cpp:545
 msgid "Import &Missing Signatures From Keyserver"
 msgstr "从密钥服务器导入缺少的签名(&M)"
@@ -611,10 +1001,6 @@ msgstr ""
 msgid "Public Key Export"
 msgstr "公开密钥导出"
 
-#: kgpgeditor.cpp:250 listkeys.cpp:1519
-msgid "Save File"
-msgstr "保存文件"
-
 #: listkeys.cpp:1556
 msgid ""
 "Your public key \"%1\" was successfully exported\n"
@@ -940,132 +1326,111 @@ msgstr "极端"
 msgid "?"
 msgstr "？"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "TDE 简体中文翻译组"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "i18n-translation@lists.linux.net.cn"
+#: detailedconsole.cpp:43
+msgid "Details"
+msgstr "细节"
 
-#: main.cpp:30
-msgid ""
-"Kgpg - simple gui for gpg\n"
-"\n"
-"Kgpg was designed to make gpg very easy to use.\n"
-"I tried to make it as secure as possible.\n"
-"Hope you enjoy it."
-msgstr ""
-"Kgpg - 简单的 gpg GUI\n"
-"\n"
-"Kgpg 的设计目的是让 gpg 使用起来很简单。\n"
-"我已尝试将它做得尽量安全。\n"
-"希望您喜欢它。"
+#: detailedconsole.cpp:55
+msgid "Info"
+msgstr "信息"
 
-#: main.cpp:36
-msgid "Encrypt file"
-msgstr "加密文件"
+#: keygener.cpp:37
+msgid "Key Generation"
+msgstr "密钥生成"
 
-#: main.cpp:37
-msgid "Open key manager"
-msgstr "打开密钥管理器"
+#: keygener.cpp:40
+msgid "Expert Mode"
+msgstr "专家模式"
 
-#: main.cpp:38
-msgid "Show encrypted file"
-msgstr "显示加密的文件"
+#: keygener.cpp:45
+msgid "Generate Key Pair"
+msgstr "生成密钥对"
 
-#: main.cpp:39
-msgid "Sign file"
-msgstr "签名文件"
+#. i18n: file keyproperties.ui line 297
+#: keygener.cpp:47 rc.cpp:401 rc.cpp:582
+#, no-c-format
+msgid "Name:"
+msgstr "姓名："
 
-#: main.cpp:40
-msgid "Verify signature"
-msgstr "核对签名"
+#. i18n: file adduid.ui line 50
+#: keygener.cpp:50 rc.cpp:27 rc.cpp:386 rc.cpp:585
+#, no-c-format
+msgid "Email:"
+msgstr "电子邮件："
 
-#: main.cpp:41
-msgid "Shred file"
-msgstr "粉碎文件"
+#. i18n: file adduid.ui line 58
+#: keygener.cpp:53 rc.cpp:30
+#, no-c-format
+msgid "Comment (optional):"
+msgstr "备注(可选的)："
 
-#: main.cpp:42
-msgid "File to open"
-msgstr "要打开的文件"
+#: keygener.cpp:62
+msgid "Never"
+msgstr "从不"
 
-#: main.cpp:50
-msgid "KGpg"
-msgstr "KGpg"
+#: keygener.cpp:63
+msgid "Days"
+msgstr "天"
 
-#: kgpgview.cpp:97
-msgid ""
-"<qt><b>Remote file dropped</b>."
-"<br>The remote file will now be copied to a temporary file to process requested "
-"operation. This temporary file will be deleted after operation.</qt>"
-msgstr ""
+#: keygener.cpp:64
+msgid "Weeks"
+msgstr "星期"
 
-#: kgpgview.cpp:100
-msgid "Could not download file."
-msgstr "无法下载文件。"
+#: keygener.cpp:65
+msgid "Months"
+msgstr "月"
 
-#: kgpglibrary.cpp:225 kgpgview.cpp:130
-msgid ""
-"<p>The file <b>%1</b> is a public key."
-"<br>Do you want to import it ?</p>"
-msgstr "<p>文件 <b>%1</b> 是一个公开密钥。<br>您要导入它吗？</p>"
+#: keygener.cpp:66
+msgid "Years"
+msgstr "年"
 
-#: kgpgview.cpp:143
-msgid ""
-"This file is a private key.\n"
-"Please use kgpg key management to import it."
-msgstr ""
-"这个文件是一个私钥。\n"
-"请使用 Kgpg 密钥管理器导入它。"
+#: keygener.cpp:70
+msgid "Key size:"
+msgstr "密钥大小："
 
-#: kgpglibrary.cpp:240 kgpgview.cpp:165 kgpgview.cpp:361
-msgid "Decryption failed."
-msgstr "解密失败"
+#. i18n: file keyproperties.ui line 245
+#: keygener.cpp:79 rc.cpp:389
+#, no-c-format
+msgid "Algorithm:"
+msgstr "算法："
 
-#: kgpgview.cpp:179
-msgid "Unable to read file."
-msgstr "无法读取文件。"
+#: keygener.cpp:94
+msgid "You must give a name."
+msgstr "您必须指定姓名。"
 
-#: kgpgview.cpp:211
-msgid "S&ign/Verify"
-msgstr "签名/核对(&I)"
+#: keygener.cpp:100
+msgid "You are about to create a key with no email address"
+msgstr "您即将创建没有电子邮件地址的密钥"
 
-#: kgpgview.cpp:212
-msgid "En&crypt"
-msgstr "加密(&C)"
+#: keygener.cpp:103
+msgid "Email address not valid"
+msgstr "无效的电子邮件地址"
 
-#: kgpgview.cpp:213
-msgid "&Decrypt"
-msgstr "解密(&D)"
+#. i18n: file keyproperties.ui line 24
+#: keyinfowidget.cpp:46 rc.cpp:351
+#, no-c-format
+msgid "Key Properties"
+msgstr "密钥属性"
 
-#: kgpgview.cpp:231
-msgid "untitled"
-msgstr "未命名"
+#: keyinfowidget.cpp:257 keyinfowidget.cpp:266
+msgid "none"
+msgstr "无"
 
-#: kgpginterface.cpp:829 kgpgview.cpp:241
-msgid ""
-"<qt><b>Missing signature:</b>"
-"<br>Key id: %1"
-"<br>"
-"<br>Do you want to import this key from a keyserver?</qt>"
-msgstr ""
+#: keyinfowidget.cpp:355
+msgid "Choose New Expiration"
+msgstr "选择新过期"
 
-#: kgpgview.cpp:242
-msgid "Missing Key"
-msgstr "丢失密钥"
+#: keyinfowidget.cpp:433
+msgid "Passphrase for the key was changed"
+msgstr "密钥的密码句已更改。"
 
-#: kgpgview.cpp:295
-msgid "Signing not possible: bad passphrase or missing key"
-msgstr "无法签名：无效的密码句或者缺少密钥"
+#: keyinfowidget.cpp:453
+msgid "Could not change expiration"
+msgstr "无法更改过期"
 
-#: kgpgview.cpp:388
-msgid "Encryption failed."
-msgstr "加密失败。"
+#: keyinfowidget.cpp:453
+msgid "Bad passphrase"
+msgstr "错误的密码句"
 
 #: popuppublic.cpp:91
 msgid "Select Public Key"
@@ -1174,458 +1539,6 @@ msgid ""
 "command line option, like: '--armor'"
 msgstr "<b>自定义选项</b>：只推荐有经验的用户使用。它让您输入 gpg 命令行选项，比如：‘--armor’"
 
-#: kgpgoptions.cpp:69 kgpgoptions.cpp:76 kgpgoptions.cpp:428
-#: kgpgoptions.cpp:584 kgpgoptions.cpp:590
-msgid "(Default)"
-msgstr "(默认)"
-
-#. i18n: file conf_encryption.ui line 17
-#: kgpgoptions.cpp:101 rc.cpp:41
-#, no-c-format
-msgid "Encryption"
-msgstr "加密"
-
-#: kgpgoptions.cpp:102
-msgid "Decryption"
-msgstr "解密"
-
-#: kgpgoptions.cpp:104
-msgid "GnuPG Settings"
-msgstr "GnuPG 设置"
-
-#: kgpgoptions.cpp:105
-msgid "Key Servers"
-msgstr "密钥服务器"
-
-#: kgpgoptions.cpp:106
-msgid "Misc"
-msgstr "杂项"
-
-#: kgpgoptions.cpp:188
-msgid "New GnuPG Home Location"
-msgstr ""
-
-#: kgpgoptions.cpp:196
-msgid ""
-"No configuration file was found in the selected location.\n"
-"Do you want to create it now ?\n"
-"\n"
-"Without configuration file, neither KGpg nor Gnupg will work properly."
-msgstr ""
-
-#: kgpgoptions.cpp:196
-msgid "No Configuration File Found"
-msgstr ""
-
-#: kgpgoptions.cpp:196
-msgid "Create"
-msgstr "创建"
-
-#: kgpgoptions.cpp:196
-msgid "Ignore"
-msgstr "忽略"
-
-#: kgpgoptions.cpp:204
-msgid ""
-"Cannot create configuration file. Please check if destination media is mounted "
-"and if you have write access"
-msgstr ""
-
-#: kgpgoptions.cpp:456
-msgid "Sign File"
-msgstr "签名文件"
-
-#: kgpgoptions.cpp:473
-msgid "Decrypt File"
-msgstr "解密文件"
-
-#: kgpgoptions.cpp:572
-msgid "Add New Key Server"
-msgstr "添加新的密钥服务器"
-
-#: kgpgoptions.cpp:572
-msgid "Server URL:"
-msgstr "服务器 URL："
-
-#: kgpglibrary.cpp:82
-msgid "You have not chosen an encryption key."
-msgstr "您还没有选择一个加密密钥。"
-
-#: kgpglibrary.cpp:107
-msgid ""
-"<b>%1 Files left.</b>\n"
-"Encrypting </b>%2"
-msgstr ""
-
-#: kgpglibrary.cpp:108
-#, c-format
-msgid "<b>Encrypting </b>%2"
-msgstr "<b>加密 </b>%2"
-
-#: kgpglibrary.cpp:125
-msgid "Processing encryption (%1)"
-msgstr "正在进行加密(%1)"
-
-#: kgpglibrary.cpp:143
-#, c-format
-msgid ""
-"_n: Shredding %n file\n"
-"Shredding %n files"
-msgstr "粉碎 %n 个文件"
-
-#: kgpglibrary.cpp:157
-msgid "KGpg Error"
-msgstr "KGpg 错误"
-
-#: kgpglibrary.cpp:157
-msgid "Process halted, not all files were shredded."
-msgstr "进程已停止，并非所有的文件都已粉碎。"
-
-#: kgpglibrary.cpp:175
-msgid "<b>Process halted</b>.<br>Not all files were encrypted."
-msgstr "<b>进程已停止</b>。<br>并非所有的文件都已粉碎。"
-
-#: kgpglibrary.cpp:195
-#, c-format
-msgid "Decrypting %1"
-msgstr "正在解密 %1"
-
-#: kgpglibrary.cpp:197
-msgid "Processing decryption"
-msgstr "正在进行解密"
-
-#: kgpglibrary.cpp:236
-#, fuzzy
-msgid ""
-"<p>The file <b>%1</b> is a private key block. Please use KGpg key manager to "
-"import it.</p>"
-msgstr ""
-"这个文件是一个私钥！\n"
-"请使用 Kgpg 密钥管理器导入它。"
-
-#: kgpginterface.cpp:87
-msgid " or "
-msgstr " 或者 "
-
-#: kgpginterface.cpp:144
-msgid "Enter passphrase for your file (symmetrical encryption):"
-msgstr "为您的文件输入密码句(对称加密)："
-
-#: kgpginterface.cpp:215 kgpginterface.cpp:392 kgpginterface.cpp:500
-#: kgpginterface.cpp:739 kgpginterface.cpp:1273
-msgid "[No user id found]"
-msgstr "[未找到用户 ID]"
-
-#: kgpginterface.cpp:220 kgpginterface.cpp:396
-msgid "<b>No user id found</b>. Trying all secret keys.<br>"
-msgstr "<b>未找到用户 ID</b>。正在尝试所有私钥。<br>"
-
-#: kgpginterface.cpp:222 kgpginterface.cpp:398 kgpginterface.cpp:504
-msgid "<b>Bad passphrase</b>. You have %1 tries left.<br>"
-msgstr "<b>无效的密码句</b>。您还剩下 %1 次重试机会。<br>"
-
-#: kgpginterface.cpp:224 kgpginterface.cpp:399 kgpginterface.cpp:505
-#: kgpginterface.cpp:744
-msgid "Enter passphrase for <b>%1</b>"
-msgstr "请输入 <b>%1</b> 的密码句"
-
-#: kgpginterface.cpp:302
-msgid "Enter passphrase (symmetrical encryption)"
-msgstr "输入密码句(对称加密)"
-
-#: kgpginterface.cpp:353
-msgid "Bad MDC detected. The encrypted text has been manipulated."
-msgstr ""
-
-#: kgpginterface.cpp:574 kgpginterface.cpp:603 kgpginterface.cpp:799
-#: kgpginterface.cpp:825
-msgid "No signature found."
-msgstr "未找到签名。"
-
-#: kgpginterface.cpp:591 kgpginterface.cpp:802
-#, fuzzy
-msgid "<qt>Good signature from:<br><b>%1</b><br>Key ID: %2</qt>"
-msgstr ""
-"来自 %1 的有效签名\n"
-"密钥 ID：%2"
-
-#: kgpginterface.cpp:595
-#, fuzzy
-msgid ""
-"<qt><b>Bad signature</b> from:"
-"<br>%1"
-"<br>Key ID: %2"
-"<br>"
-"<br><b>Text is corrupted.</b></qt>"
-msgstr ""
-"来自 %1 的无效签名\n"
-"密钥 ID：%2\n"
-"\n"
-"该文件已损坏！"
-
-#: kgpginterface.cpp:605 kgpginterface.cpp:815
-msgid "The signature is valid, but the key is untrusted"
-msgstr ""
-
-#: kgpginterface.cpp:607 kgpginterface.cpp:817
-msgid "The signature is valid, and the key is ultimately trusted"
-msgstr ""
-
-#: kgpginterface.cpp:614
-msgid "MD5 Checksum"
-msgstr "MD5 校验和"
-
-#: kgpginterface.cpp:616
-msgid "Compare MD5 with Clipboard"
-msgstr "和剪贴板比较 MD5"
-
-#: kgpginterface.cpp:631
-msgid "MD5 sum for <b>%1</b> is:"
-msgstr "<b>%1</b> 的 MD5 校验和是："
-
-#: kgpginterface.cpp:648
-msgid "<b>Unknown status</b>"
-msgstr "<b>未知状态</b>"
-
-#: kgpginterface.cpp:676
-msgid "<b>Correct checksum</b>, file is ok."
-msgstr "<b>校验和正确</b>，文件是好的。"
-
-#: kgpginterface.cpp:681
-msgid "Clipboard content is not a MD5 sum."
-msgstr "剪贴板内容不是 MD5 校验和。"
-
-#: kgpginterface.cpp:683
-msgid "<b>Wrong checksum, FILE CORRUPTED</b>"
-msgstr "<b>错误的校验和，文件已损坏</b>"
-
-#: kgpginterface.cpp:718
-msgid "The signature file %1 was successfully created."
-msgstr "签名文件 %1 已成功创建。"
-
-#: kgpginterface.cpp:720
-msgid "Bad passphrase, signature was not created."
-msgstr "无效的密码句，未创建签名。"
-
-#: kgpginterface.cpp:743
-msgid "<b>Bad passphrase</b>. you have %1 tries left.<br>"
-msgstr "<b>无效的密码句</b>。您还剩下 %1 次重试机会。<br>"
-
-#: kgpginterface.cpp:806
-#, fuzzy
-msgid ""
-"<qt><b>BAD signature</b> from:"
-"<br> %1"
-"<br>Key id: %2"
-"<br>"
-"<br><b>The file is corrupted!</b></qt>"
-msgstr ""
-"来自 %1 的无效签名\n"
-"密钥 ID：%2\n"
-"\n"
-"该文件已损坏！"
-
-#: kgpginterface.cpp:910
-#, fuzzy
-msgid "<qt>%1 Enter passphrase for <b>%2</b>:</qt>"
-msgstr "请输入 <b>%1</b> 的密码句"
-
-#: kgpginterface.cpp:928
-#, fuzzy
-msgid "<b>Bad passphrase</b>. Try again.</br>"
-msgstr "无效的密码句，请重试。"
-
-#: kgpginterface.cpp:949
-msgid ""
-"<qt>Signing key <b>%1</b> with key <b>%2</b> failed."
-"<br>Do you want to try signing the key in console mode?</qt>"
-msgstr ""
-
-#: kgpginterface.cpp:981
-msgid ""
-"This key has more than one user ID.\n"
-"Edit the key manually to delete signature."
-msgstr ""
-"这个密钥含有多个用户 ID。\n"
-"请手工编辑该密钥来删除签名。"
-
-#: kgpginterface.cpp:1115 kgpginterface.cpp:1519 kgpginterface.cpp:1642
-#: kgpginterface.cpp:1717 kgpginterface.cpp:1803
-#, fuzzy
-msgid "<qt>Enter passphrase for <b>%1</b>:</qt>"
-msgstr "请输入 <b>%1</b> 的密码句："
-
-#: kgpginterface.cpp:1158
-msgid ""
-"<qt><b>Changing expiration failed.</b>"
-"<br>Do you want to try changing the key expiration in console mode?</qt>"
-msgstr ""
-
-#: kgpginterface.cpp:1268
-msgid "<b>Bad passphrase</b>. Try again<br>"
-msgstr "<b>无效的密码句</b>。请重试<br>"
-
-#: kgpginterface.cpp:1278
-#, fuzzy
-msgid "<qt>%1 Enter passphrase for <b>%2</b></qt>"
-msgstr "请输入 <b>%1</b> 的密码句"
-
-#: kgpginterface.cpp:1293
-msgid ""
-"<qt>Enter new passphrase for <b>%1</b>"
-"<br>If you forget this passphrase, all your encrypted files and messages will "
-"be lost !"
-"<br></qt>"
-msgstr ""
-
-#: keyservers.cpp:496 kgpginterface.cpp:1408
-#, c-format
-msgid ""
-"_n: <qt>%n key processed."
-"<br></qt>\n"
-"<qt>%n keys processed."
-"<br></qt>"
-msgstr ""
-
-#: keyservers.cpp:498 kgpginterface.cpp:1410
-#, c-format
-msgid ""
-"_n: <qt>One key unchanged."
-"<br></qt>\n"
-"<qt>%n keys unchanged."
-"<br></qt>"
-msgstr ""
-
-#: keyservers.cpp:500 kgpginterface.cpp:1412
-#, c-format
-msgid ""
-"_n: <qt>One signature imported."
-"<br></qt>\n"
-"<qt>%n signatures imported."
-"<br></qt>"
-msgstr ""
-
-#: keyservers.cpp:502 kgpginterface.cpp:1414
-#, c-format
-msgid ""
-"_n: <qt>One key without ID."
-"<br></qt>\n"
-"<qt>%n keys without ID."
-"<br></qt>"
-msgstr ""
-
-#: keyservers.cpp:504 kgpginterface.cpp:1416
-#, c-format
-msgid ""
-"_n: <qt>One RSA key imported."
-"<br></qt>\n"
-"<qt>%n RSA keys imported."
-"<br></qt>"
-msgstr ""
-
-#: keyservers.cpp:506 kgpginterface.cpp:1418
-#, c-format
-msgid ""
-"_n: <qt>One user ID imported."
-"<br></qt>\n"
-"<qt>%n user IDs imported."
-"<br></qt>"
-msgstr ""
-
-#: keyservers.cpp:508 kgpginterface.cpp:1420
-#, c-format
-msgid ""
-"_n: <qt>One subkey imported."
-"<br></qt>\n"
-"<qt>%n subkeys imported."
-"<br></qt>"
-msgstr ""
-
-#: keyservers.cpp:510 kgpginterface.cpp:1422
-#, c-format
-msgid ""
-"_n: <qt>One revocation certificate imported."
-"<br></qt>\n"
-"<qt>%n revocation certificates imported."
-"<br></qt>"
-msgstr ""
-
-#: keyservers.cpp:512 kgpginterface.cpp:1425
-#, c-format
-msgid ""
-"_n: <qt>One secret key processed."
-"<br></qt>\n"
-"<qt>%n secret keys processed."
-"<br></qt>"
-msgstr ""
-
-#: keyservers.cpp:514 kgpginterface.cpp:1429
-#, c-format
-msgid ""
-"_n: <qt><b>One secret key imported.</b>"
-"<br></qt>\n"
-"<qt><b>%n secret keys imported.</b>"
-"<br></qt>"
-msgstr ""
-
-#: keyservers.cpp:516 kgpginterface.cpp:1431
-#, c-format
-msgid ""
-"_n: <qt>One secret key unchanged."
-"<br></qt>\n"
-"<qt>%n secret keys unchanged."
-"<br></qt>"
-msgstr ""
-
-#: keyservers.cpp:518 kgpginterface.cpp:1433
-#, c-format
-msgid ""
-"_n: <qt>One secret key not imported."
-"<br></qt>\n"
-"<qt>%n secret keys not imported."
-"<br></qt>"
-msgstr ""
-
-#: keyservers.cpp:520 kgpginterface.cpp:1435
-#, c-format
-msgid ""
-"_n: <qt><b>One key imported:</b>"
-"<br></qt>\n"
-"<qt><b>%n keys imported:</b>"
-"<br></qt>"
-msgstr ""
-
-#: kgpginterface.cpp:1437
-msgid ""
-"<qt>"
-"<br><b>You have imported a secret key.</b> "
-"<br>Please note that imported secret keys are not trusted by default."
-"<br>To fully use this secret key for signing and encryption, you must edit the "
-"key (double click on it) and set its trust to Full or Ultimate.</qt>"
-msgstr ""
-
-#: keyservers.cpp:522 kgpginterface.cpp:1441
-msgid ""
-"No key imported... \n"
-"Check detailed log for more infos"
-msgstr ""
-
-#: kgpginterface.cpp:1704
-msgid "This image is very large. Use it anyway?"
-msgstr ""
-
-#: kgpginterface.cpp:1704
-msgid "Use Anyway"
-msgstr ""
-
-#: kgpginterface.cpp:1704
-msgid "Do Not Use"
-msgstr ""
-
-#: kgpginterface.cpp:1768
-msgid "Creation of the revocation certificate failed..."
-msgstr ""
-
 #. i18n: file kgpg.rc line 16
 #: rc.cpp:6
 #, no-c-format
@@ -1656,18 +1569,6 @@ msgstr "组(&G)"
 msgid "Name (minimum 5 characters):"
 msgstr ""
 
-#. i18n: file adduid.ui line 50
-#: keygener.cpp:50 rc.cpp:27 rc.cpp:386 rc.cpp:585
-#, no-c-format
-msgid "Email:"
-msgstr "电子邮件："
-
-#. i18n: file adduid.ui line 58
-#: keygener.cpp:53 rc.cpp:30
-#, no-c-format
-msgid "Comment (optional):"
-msgstr "备注(可选的)："
-
 #. i18n: file conf_decryption.ui line 55
 #: rc.cpp:33
 #, no-c-format
@@ -2000,12 +1901,6 @@ msgstr ""
 msgid "Key Manager"
 msgstr "密钥管理器"
 
-#. i18n: file conf_misc.ui line 198
-#: kgpgeditor.cpp:252 rc.cpp:203
-#, no-c-format
-msgid "Editor"
-msgstr "编辑器"
-
 #. i18n: file conf_misc.ui line 235
 #: rc.cpp:206
 #, fuzzy, no-c-format
@@ -2223,12 +2118,6 @@ msgstr "剪贴板"
 msgid "File:"
 msgstr "文件："
 
-#. i18n: file keyproperties.ui line 24
-#: keyinfowidget.cpp:46 rc.cpp:351
-#, no-c-format
-msgid "Key Properties"
-msgstr "密钥属性"
-
 #. i18n: file keyproperties.ui line 79
 #: rc.cpp:354
 #, no-c-format
@@ -2295,12 +2184,6 @@ msgstr "密钥 ID："
 msgid "Owner trust:"
 msgstr "所有者信任："
 
-#. i18n: file keyproperties.ui line 245
-#: keygener.cpp:79 rc.cpp:389
-#, no-c-format
-msgid "Algorithm:"
-msgstr "算法："
-
 #. i18n: file keyproperties.ui line 275
 #: rc.cpp:395
 #, no-c-format
@@ -2313,12 +2196,6 @@ msgstr "信任："
 msgid "Comment:"
 msgstr "注释："
 
-#. i18n: file keyproperties.ui line 297
-#: keygener.cpp:47 rc.cpp:401 rc.cpp:582
-#, no-c-format
-msgid "Name:"
-msgstr "姓名："
-
 #. i18n: file keyproperties.ui line 316
 #: rc.cpp:404 rc.cpp:579
 #, no-c-format
@@ -2410,12 +2287,6 @@ msgstr ""
 msgid "&Search"
 msgstr "搜索(&S)"
 
-#. i18n: file keyserver.ui line 97
-#: keyservers.cpp:171 rc.cpp:446
-#, no-c-format
-msgid "&Import"
-msgstr "导入(&I)"
-
 #. i18n: file keyserver.ui line 159
 #: rc.cpp:449 rc.cpp:474
 #, no-c-format
@@ -2610,7 +2481,7 @@ msgid "Step Three: Ready to Create your Key Pair"
 msgstr "第三步：即将创建您的密钥对"
 
 #. i18n: file kgpgwizard.ui line 291
-#: rc.cpp:553 rc.cpp:705
+#: rc.cpp:553
 #, no-c-format
 msgid "Start KGpg automatically at TDE startup."
 msgstr ""
@@ -2846,6 +2717,12 @@ msgstr "在密钥管理器中显示创建值。"
 msgid "Use the mouse selection instead of the clipboard."
 msgstr "使用鼠标而不是剪贴板进行选择。"
 
+#. i18n: file kgpg.kcfg line 118
+#: rc.cpp:705
+#, fuzzy, no-c-format
+msgid "Start KGpg automatically at KDE startup."
+msgstr "登录是自动启动 KGpg"
+
 #. i18n: file kgpg.kcfg line 122
 #: rc.cpp:708
 #, no-c-format
@@ -2920,246 +2797,376 @@ msgstr "不信任密钥所使用的颜色。"
 msgid "Use HTTP proxy when available."
 msgstr "可用时使用 HTTP 代理。"
 
-#: keygener.cpp:37
-msgid "Key Generation"
-msgstr "密钥生成"
+#: kgpginterface.cpp:87
+msgid " or "
+msgstr " 或者 "
 
-#: keygener.cpp:40
-msgid "Expert Mode"
-msgstr "专家模式"
+#: kgpginterface.cpp:144
+msgid "Enter passphrase for your file (symmetrical encryption):"
+msgstr "为您的文件输入密码句(对称加密)："
 
-#: keygener.cpp:45
-msgid "Generate Key Pair"
-msgstr "生成密钥对"
+#: kgpginterface.cpp:215 kgpginterface.cpp:392 kgpginterface.cpp:500
+#: kgpginterface.cpp:739 kgpginterface.cpp:1273
+msgid "[No user id found]"
+msgstr "[未找到用户 ID]"
 
-#: keygener.cpp:62
-msgid "Never"
-msgstr "从不"
+#: kgpginterface.cpp:220 kgpginterface.cpp:396
+msgid "<b>No user id found</b>. Trying all secret keys.<br>"
+msgstr "<b>未找到用户 ID</b>。正在尝试所有私钥。<br>"
 
-#: keygener.cpp:63
-msgid "Days"
-msgstr "天"
+#: kgpginterface.cpp:222 kgpginterface.cpp:398 kgpginterface.cpp:504
+msgid "<b>Bad passphrase</b>. You have %1 tries left.<br>"
+msgstr "<b>无效的密码句</b>。您还剩下 %1 次重试机会。<br>"
 
-#: keygener.cpp:64
-msgid "Weeks"
-msgstr "星期"
+#: kgpginterface.cpp:224 kgpginterface.cpp:399 kgpginterface.cpp:505
+#: kgpginterface.cpp:744
+msgid "Enter passphrase for <b>%1</b>"
+msgstr "请输入 <b>%1</b> 的密码句"
 
-#: keygener.cpp:65
-msgid "Months"
-msgstr "月"
+#: kgpginterface.cpp:302
+msgid "Enter passphrase (symmetrical encryption)"
+msgstr "输入密码句(对称加密)"
 
-#: keygener.cpp:66
-msgid "Years"
-msgstr "年"
+#: kgpginterface.cpp:353
+msgid "Bad MDC detected. The encrypted text has been manipulated."
+msgstr ""
 
-#: keygener.cpp:70
-msgid "Key size:"
-msgstr "密钥大小："
+#: kgpginterface.cpp:574 kgpginterface.cpp:603 kgpginterface.cpp:799
+#: kgpginterface.cpp:825
+msgid "No signature found."
+msgstr "未找到签名。"
 
-#: keygener.cpp:94
-msgid "You must give a name."
-msgstr "您必须指定姓名。"
+#: kgpginterface.cpp:591 kgpginterface.cpp:802
+#, fuzzy
+msgid "<qt>Good signature from:<br><b>%1</b><br>Key ID: %2</qt>"
+msgstr ""
+"来自 %1 的有效签名\n"
+"密钥 ID：%2"
 
-#: keygener.cpp:100
-msgid "You are about to create a key with no email address"
-msgstr "您即将创建没有电子邮件地址的密钥"
+#: kgpginterface.cpp:595
+#, fuzzy
+msgid ""
+"<qt><b>Bad signature</b> from:"
+"<br>%1"
+"<br>Key ID: %2"
+"<br>"
+"<br><b>Text is corrupted.</b></qt>"
+msgstr ""
+"来自 %1 的无效签名\n"
+"密钥 ID：%2\n"
+"\n"
+"该文件已损坏！"
 
-#: keygener.cpp:103
-msgid "Email address not valid"
-msgstr "无效的电子邮件地址"
+#: kgpginterface.cpp:605 kgpginterface.cpp:815
+msgid "The signature is valid, but the key is untrusted"
+msgstr ""
 
-#: detailedconsole.cpp:43
-msgid "Details"
-msgstr "细节"
+#: kgpginterface.cpp:607 kgpginterface.cpp:817
+msgid "The signature is valid, and the key is ultimately trusted"
+msgstr ""
 
-#: detailedconsole.cpp:55
-msgid "Info"
-msgstr "信息"
+#: kgpginterface.cpp:614
+msgid "MD5 Checksum"
+msgstr "MD5 校验和"
 
-#: keyinfowidget.cpp:257 keyinfowidget.cpp:266
-msgid "none"
-msgstr "无"
+#: kgpginterface.cpp:616
+msgid "Compare MD5 with Clipboard"
+msgstr "和剪贴板比较 MD5"
 
-#: keyinfowidget.cpp:355
-msgid "Choose New Expiration"
-msgstr "选择新过期"
+#: kgpginterface.cpp:631
+msgid "MD5 sum for <b>%1</b> is:"
+msgstr "<b>%1</b> 的 MD5 校验和是："
 
-#: keyinfowidget.cpp:433
-msgid "Passphrase for the key was changed"
-msgstr "密钥的密码句已更改。"
+#: kgpginterface.cpp:648
+msgid "<b>Unknown status</b>"
+msgstr "<b>未知状态</b>"
 
-#: keyinfowidget.cpp:453
-msgid "Could not change expiration"
-msgstr "无法更改过期"
+#: kgpginterface.cpp:676
+msgid "<b>Correct checksum</b>, file is ok."
+msgstr "<b>校验和正确</b>，文件是好的。"
 
-#: keyinfowidget.cpp:453
-msgid "Bad passphrase"
-msgstr "错误的密码句"
+#: kgpginterface.cpp:681
+msgid "Clipboard content is not a MD5 sum."
+msgstr "剪贴板内容不是 MD5 校验和。"
+
+#: kgpginterface.cpp:683
+msgid "<b>Wrong checksum, FILE CORRUPTED</b>"
+msgstr "<b>错误的校验和，文件已损坏</b>"
+
+#: kgpginterface.cpp:718
+msgid "The signature file %1 was successfully created."
+msgstr "签名文件 %1 已成功创建。"
+
+#: kgpginterface.cpp:720
+msgid "Bad passphrase, signature was not created."
+msgstr "无效的密码句，未创建签名。"
 
-#: tips.cpp:3
+#: kgpginterface.cpp:743
+msgid "<b>Bad passphrase</b>. you have %1 tries left.<br>"
+msgstr "<b>无效的密码句</b>。您还剩下 %1 次重试机会。<br>"
+
+#: kgpginterface.cpp:806
+#, fuzzy
 msgid ""
-"<p>If you want to decrypt a text file, simply drag and drop it into the editor "
-"window. Kgpg will do the rest. Even remote files can be dropped.</p>\n"
-"<p>Drag a public key into the editor window and kgpg will automatically import "
-"it if you want.</p>\n"
+"<qt><b>BAD signature</b> from:"
+"<br> %1"
+"<br>Key id: %2"
+"<br>"
+"<br><b>The file is corrupted!</b></qt>"
 msgstr ""
-"<p>如果您要解密文本文件，只要简单地将它拖放到编辑器窗口，Kgpg 会自动完成剩下的工作。即使是远程的文件也可以拖放。</p>\n"
-"<p>如果您需要，也可以拖放一个公开密钥到编辑器窗口，kgpg 将自动为您导入它。</p>\n"
+"来自 %1 的无效签名\n"
+"密钥 ID：%2\n"
+"\n"
+"该文件已损坏！"
 
-#: tips.cpp:9
+#: kgpginterface.cpp:829 kgpgview.cpp:241
 msgid ""
-"<p>The easiest way to encrypt a file: simply right click on the file, and you "
-"have an encrypt option in the contextual menu.\n"
-"This works in <strong>konqueror</strong> or on your Desktop!</p>\n"
+"<qt><b>Missing signature:</b>"
+"<br>Key id: %1"
+"<br>"
+"<br>Do you want to import this key from a keyserver?</qt>"
 msgstr ""
-"<p>加密一个文件最简单的办法：用鼠标右键点击该文件，然后您可以环境菜单中选择加密选项。\n"
-"在 <strong>Konqueror</strong> 里和您的桌面上都能这样做！</p>\n"
 
-#: tips.cpp:15
+#: kgpginterface.cpp:910
+#, fuzzy
+msgid "<qt>%1 Enter passphrase for <b>%2</b>:</qt>"
+msgstr "请输入 <b>%1</b> 的密码句"
+
+#: kgpginterface.cpp:928
+#, fuzzy
+msgid "<b>Bad passphrase</b>. Try again.</br>"
+msgstr "无效的密码句，请重试。"
+
+#: kgpginterface.cpp:949
 msgid ""
-"<p>If you want to encrypt a message for several persons, just select several "
-"encryption keys by pressing the \"Ctrl\" key.</p>\n"
+"<qt>Signing key <b>%1</b> with key <b>%2</b> failed."
+"<br>Do you want to try signing the key in console mode?</qt>"
 msgstr ""
-"<p>如果您要为多个人加密信件，只要按住“Ctrl”键用鼠标选中多个密钥即可。</p>\n"
 
-#: tips.cpp:20
+#: kgpginterface.cpp:981
 msgid ""
-"<p><strong>You don't know anything about encryption?</strong>"
-"<br>\n"
-"No problem, simply create yourself a key pair in the key management window. "
-"Then, export your public key & mail it to your friends."
-"<br>\n"
-"Ask them to do the same & import their public keys. Finally, to send an "
-"encrypted message, type it in the Kgpg editor, then click \"encrypt\". Choose \n"
-"your friend key and click \"encrypt\" again. The message will be encrypted, "
-"ready to be sent by email.</p>\n"
+"This key has more than one user ID.\n"
+"Edit the key manually to delete signature."
 msgstr ""
-"<p><strong>您一点关于加密的知识也没有？</strong>"
-"<br>\n"
-"没问题，只要简单地在密钥管理窗口中给您自己创建一对密钥，然后将您的公钥发送给您的朋友们即可。"
-"<br>\n"
-"让他们也照这样做，并导入他们的公钥。最后，对要发送加密的信件，只要在 Kgpg 编辑器里输入它，然后点击“加密”即可。\n"
-"选择您朋友的公钥，再次点击“加密”。该信件将会被加密，然后就能用电子邮件发送了。</p>\n"
+"这个密钥含有多个用户 ID。\n"
+"请手工编辑该密钥来删除签名。"
+
+#: kgpginterface.cpp:1115 kgpginterface.cpp:1519 kgpginterface.cpp:1642
+#: kgpginterface.cpp:1717 kgpginterface.cpp:1803
+#, fuzzy
+msgid "<qt>Enter passphrase for <b>%1</b>:</qt>"
+msgstr "请输入 <b>%1</b> 的密码句："
 
-#: tips.cpp:28
+#: kgpginterface.cpp:1158
 msgid ""
-"<p>To perform an operation on a key, open the key management window & right "
-"click on the key. A popup menu with all available options will appear.</p>\n"
+"<qt><b>Changing expiration failed.</b>"
+"<br>Do you want to try changing the key expiration in console mode?</qt>"
 msgstr ""
-"<p>要对一个密钥进行操作，请打开密钥管理窗口，并用鼠标右键点击该密钥，一个弹出菜单将显示所有可供选择的操作选项。</p>\n"
 
-#: tips.cpp:33
+#: kgpginterface.cpp:1268
+msgid "<b>Bad passphrase</b>. Try again<br>"
+msgstr "<b>无效的密码句</b>。请重试<br>"
+
+#: kgpginterface.cpp:1278
+#, fuzzy
+msgid "<qt>%1 Enter passphrase for <b>%2</b></qt>"
+msgstr "请输入 <b>%1</b> 的密码句"
+
+#: kgpginterface.cpp:1293
 msgid ""
-"<p>Decrypt a file with a single mouse click on it. You will then be prompted "
-"for password & that's all!</p>\n"
+"<qt>Enter new passphrase for <b>%1</b>"
+"<br>If you forget this passphrase, all your encrypted files and messages will "
+"be lost !"
+"<br></qt>"
 msgstr ""
-"<p>用鼠标单击就可解密一个文件。您将只需要被询问口令，就这么简单！</p>\n"
 
-#: tips.cpp:38
+#: kgpginterface.cpp:1437
 msgid ""
-"<p>If you only want to open the key manager, type \"kgpg -k\" in the command "
-"line prompt.</p>\n"
+"<qt>"
+"<br><b>You have imported a secret key.</b> "
+"<br>Please note that imported secret keys are not trusted by default."
+"<br>To fully use this secret key for signing and encryption, you must edit the "
+"key (double click on it) and set its trust to Full or Ultimate.</qt>"
+msgstr ""
+
+#: kgpginterface.cpp:1704
+msgid "This image is very large. Use it anyway?"
 msgstr ""
-"<p>如果您只要打开密钥管理器，在命令行输入“kgpg -k”即可。</p>\n"
 
-#: tips.cpp:43
+#: kgpginterface.cpp:1704
+msgid "Use Anyway"
+msgstr ""
+
+#: kgpginterface.cpp:1704
+msgid "Do Not Use"
+msgstr ""
+
+#: kgpginterface.cpp:1768
+msgid "Creation of the revocation certificate failed..."
+msgstr ""
+
+#: main.cpp:30
 msgid ""
-"<p>Typing \"kgpg -s filename\" will decrypt the file filename and open it in "
-"Kgpg's editor.</p>\n"
+"Kgpg - simple gui for gpg\n"
+"\n"
+"Kgpg was designed to make gpg very easy to use.\n"
+"I tried to make it as secure as possible.\n"
+"Hope you enjoy it."
 msgstr ""
-"<p>输入“kgpg -s filename”命令将解密文件 filename 并用 Kgpg 编辑器打开它。</p>\n"
+"Kgpg - 简单的 gpg GUI\n"
+"\n"
+"Kgpg 的设计目的是让 gpg 使用起来很简单。\n"
+"我已尝试将它做得尽量安全。\n"
+"希望您喜欢它。"
 
-#: kgpgeditor.cpp:143
-msgid "&Encrypt File..."
-msgstr "加密文件(&E)..."
+#: main.cpp:36
+msgid "Encrypt file"
+msgstr "加密文件"
 
-#: kgpgeditor.cpp:144
-msgid "&Decrypt File..."
-msgstr "解密文件(&D)..."
+#: main.cpp:37
+msgid "Open key manager"
+msgstr "打开密钥管理器"
 
-#: kgpgeditor.cpp:149
-msgid "&Generate Signature..."
-msgstr "生成签名(&G)..."
+#: main.cpp:38
+msgid "Show encrypted file"
+msgstr "显示加密的文件"
 
-#: kgpgeditor.cpp:150
-msgid "&Verify Signature..."
-msgstr "核对签名(&V)..."
+#: main.cpp:39
+msgid "Sign file"
+msgstr "签名文件"
 
-#: kgpgeditor.cpp:151
-msgid "&Check MD5 Sum..."
-msgstr "检查 MD5 校验和(&C)..."
+#: main.cpp:40
+msgid "Verify signature"
+msgstr "核对签名"
 
-#: kgpgeditor.cpp:220 kgpgeditor.cpp:230 kgpgeditor.cpp:467 kgpgeditor.cpp:481
-#: kgpgeditor.cpp:513
-msgid "*|All Files"
-msgstr "*|所有文件"
+#: main.cpp:41
+msgid "Shred file"
+msgstr "粉碎文件"
 
-#: kgpgeditor.cpp:220
-msgid "Open File to Encode"
-msgstr "打开要编码的文件"
+#: main.cpp:42
+msgid "File to open"
+msgstr "要打开的文件"
 
-#: kgpgeditor.cpp:230
-msgid "Open File to Decode"
-msgstr "打开要解码的文件"
+#: main.cpp:50
+msgid "KGpg"
+msgstr "KGpg"
 
-#: kgpgeditor.cpp:244
-msgid "Decrypt File To"
-msgstr "将文件解密到"
+#: kgpglibrary.cpp:82
+msgid "You have not chosen an encryption key."
+msgstr "您还没有选择一个加密密钥。"
 
-#: kgpgeditor.cpp:317
+#: kgpglibrary.cpp:107
 msgid ""
-"The document could not been saved, as the selected encoding cannot encode every "
-"unicode character in it."
-msgstr "文档无法保存，因为所选编码无法完全表示文档中的字符。"
+"<b>%1 Files left.</b>\n"
+"Encrypting </b>%2"
+msgstr ""
 
-#: kgpgeditor.cpp:325 kgpgeditor.cpp:352
+#: kgpglibrary.cpp:108
+#, c-format
+msgid "<b>Encrypting </b>%2"
+msgstr "<b>加密 </b>%2"
+
+#: kgpglibrary.cpp:125
+msgid "Processing encryption (%1)"
+msgstr "正在进行加密(%1)"
+
+#: kgpglibrary.cpp:143
+#, c-format
 msgid ""
-"The document could not be saved, please check your permissions and disk space."
-msgstr "文档无法保存，请检查您的权限和磁盘空间。"
+"_n: Shredding %n file\n"
+"Shredding %n files"
+msgstr "粉碎 %n 个文件"
 
-#: kgpgeditor.cpp:379 kgpgeditor.cpp:388
-msgid "Overwrite existing file %1?"
-msgstr "要覆盖已有的文件 %1 吗？"
+#: kgpglibrary.cpp:157
+msgid "KGpg Error"
+msgstr "KGpg 错误"
 
-#: kgpgeditor.cpp:380 kgpgeditor.cpp:389
-msgid "Overwrite"
-msgstr "覆盖"
+#: kgpglibrary.cpp:157
+msgid "Process halted, not all files were shredded."
+msgstr "进程已停止，并非所有的文件都已粉碎。"
 
-#: kgpgeditor.cpp:467 kgpgeditor.cpp:513
-msgid "Open File to Verify"
-msgstr "打开要核对的文件"
+#: kgpglibrary.cpp:175
+msgid "<b>Process halted</b>.<br>Not all files were encrypted."
+msgstr "<b>进程已停止</b>。<br>并非所有的文件都已粉碎。"
 
-#: kgpgeditor.cpp:481
-msgid "Open File to Sign"
-msgstr "打开要签名的文件"
+#: kgpglibrary.cpp:195
+#, c-format
+msgid "Decrypting %1"
+msgstr "正在解密 %1"
 
-#: keyservers.cpp:55
-msgid "Key Server"
-msgstr "密钥服务器"
+#: kgpglibrary.cpp:197
+msgid "Processing decryption"
+msgstr "正在进行解密"
 
-#: keyservers.cpp:163 keyservers.cpp:409
-msgid "You must enter a search string."
-msgstr "您必须输入一个查找字符串。"
+#: kgpglibrary.cpp:225 kgpgview.cpp:130
+msgid ""
+"<p>The file <b>%1</b> is a public key."
+"<br>Do you want to import it ?</p>"
+msgstr "<p>文件 <b>%1</b> 是一个公开密钥。<br>您要导入它吗？</p>"
 
-#: keyservers.cpp:178
-msgid "Connecting to the server..."
-msgstr "正在连接到服务器..."
+#: kgpglibrary.cpp:236
+#, fuzzy
+msgid ""
+"<p>The file <b>%1</b> is a private key block. Please use KGpg key manager to "
+"import it.</p>"
+msgstr ""
+"这个文件是一个私钥！\n"
+"请使用 Kgpg 密钥管理器导入它。"
 
-#: keyservers.cpp:233
-msgid "You must choose a key."
-msgstr "您必须选择一个密钥。"
+#: kgpglibrary.cpp:240 kgpgview.cpp:165 kgpgview.cpp:361
+msgid "Decryption failed."
+msgstr "解密失败"
 
-#: keyservers.cpp:265
-msgid "Found %1 matching keys"
-msgstr "找到了 %1 个匹配的密钥"
+#: kgpgview.cpp:97
+msgid ""
+"<qt><b>Remote file dropped</b>."
+"<br>The remote file will now be copied to a temporary file to process requested "
+"operation. This temporary file will be deleted after operation.</qt>"
+msgstr ""
 
-#: keyservers.cpp:374 keyservers.cpp:442
-msgid "<b>Connecting to the server...</b>"
-msgstr "<b>正在连接到服务器...</b>"
+#: kgpgview.cpp:100
+msgid "Could not download file."
+msgstr "无法下载文件。"
 
-#: keyservers.cpp:375 keyservers.cpp:443
-msgid "&Abort"
-msgstr "中止(&A)"
+#: kgpgview.cpp:143
+msgid ""
+"This file is a private key.\n"
+"Please use kgpg key management to import it."
+msgstr ""
+"这个文件是一个私钥。\n"
+"请使用 Kgpg 密钥管理器导入它。"
+
+#: kgpgview.cpp:179
+msgid "Unable to read file."
+msgstr "无法读取文件。"
+
+#: kgpgview.cpp:211
+msgid "S&ign/Verify"
+msgstr "签名/核对(&I)"
+
+#: kgpgview.cpp:212
+msgid "En&crypt"
+msgstr "加密(&C)"
+
+#: kgpgview.cpp:213
+msgid "&Decrypt"
+msgstr "解密(&D)"
+
+#: kgpgview.cpp:231
+msgid "untitled"
+msgstr "未命名"
+
+#: kgpgview.cpp:242
+msgid "Missing Key"
+msgstr "丢失密钥"
+
+#: kgpgview.cpp:295
+msgid "Signing not possible: bad passphrase or missing key"
+msgstr "无法签名：无效的密码句或者缺少密钥"
+
+#: kgpgview.cpp:388
+msgid "Encryption failed."
+msgstr "加密失败。"
 
 #~ msgid "&Unicode (utf-8) Encoding"
 #~ msgstr "Unicode(UTF-8) 编码(&U)"
diff --git a/tde-i18n-zh_CN/messages/tdeutils/khexedit.po b/tde-i18n-zh_CN/messages/tdeutils/khexedit.po
index 988101c78fc..492eacc2ca6 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/khexedit.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/khexedit.po
@@ -7,10 +7,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: khexedit\n"
-"POT-Creation-Date: 2006-04-17 03:54+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-07-20 10:00+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -58,18 +59,111 @@ msgstr "转换域(&F)"
 msgid "Searc&hbar"
 msgstr "查找栏(&H)"
 
-#: chartabledialog.cc:37
-msgid "Character Table"
-msgstr "字符表"
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "TDE 中文翻译组"
 
-#: chartabledialog.cc:49 dialog.cc:1402 fileinfodialog.cc:106
-msgid "Decimal"
-msgstr "十进制"
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "i18n-translation@lists.linux.net.cn"
+
+#: hexbuffer.cc:1925 hexbuffer.cc:4832
+msgid "Page %1 of %2"
+msgstr "第 %1 页共 %2 页"
+
+#: hexbuffer.cc:2852
+msgid "to"
+msgstr "到"
+
+#: hexbuffer.cc:4853 hexbuffer.cc:4858
+msgid "Next"
+msgstr "下一个"
+
+#: hexbuffer.cc:4863 hexbuffer.cc:4868
+msgid "Previous"
+msgstr "前一个"
+
+#: hexbuffer.cc:4886
+msgid "Generated by khexedit"
+msgstr "khexedit 生成的"
+
+#: stringdialog.cc:38 stringdialog.cc:201
+msgid "Extract Strings"
+msgstr "提取字符串"
+
+#: stringdialog.cc:57
+msgid "&Minimum length:"
+msgstr "最小长度(&M)："
+
+#: stringdialog.cc:66
+msgid "&Filter:"
+msgstr "过滤器(&F)："
+
+#: stringdialog.cc:71
+msgid "&Use"
+msgstr "使用(&U)"
+
+#: stringdialog.cc:80
+msgid "&Ignore case"
+msgstr "忽略大小写(&I)"
+
+#: stringdialog.cc:84
+msgid "Show offset as &decimal"
+msgstr "显示十进制偏移量(&D)"
+
+#: hexviewwidget.cc:1102 stringdialog.cc:95
+msgid "Offset"
+msgstr "偏移"
+
+#: stringdialog.cc:96
+msgid "String"
+msgstr "字符串"
+
+#: stringdialog.cc:106
+msgid "Number of strings:"
+msgstr "字符串数目："
+
+#: stringdialog.cc:114
+msgid "Displayed:"
+msgstr "已显示："
+
+#: stringdialog.cc:197
+msgid ""
+"The filter expression you have specified is illegal. You must specify a valid "
+"regular expression.\n"
+"Continue without filter?"
+msgstr ""
+"您规定的过滤器表达式是非法的。您必须规定一个有效的正则表达式。\n"
+"无过滤器而继续？"
+
+#: fileinfodialog.cc:160 stringdialog.cc:254
+msgid "Warning: Document has been modified since last update"
+msgstr "警告：当前的文档上次更新后已经被修改"
+
+#: fileinfodialog.cc:73
+msgid "Statistics"
+msgstr "统计"
+
+#: fileinfodialog.cc:89
+msgid "File name: "
+msgstr "文件名："
+
+#: fileinfodialog.cc:93
+msgid "Size [bytes]: "
+msgstr "大小 [字节]："
 
 #: chartabledialog.cc:50 dialog.cc:1401 fileinfodialog.cc:105
 msgid "Hexadecimal"
 msgstr "十六进制"
 
+#: chartabledialog.cc:49 dialog.cc:1402 fileinfodialog.cc:106
+msgid "Decimal"
+msgstr "十进制"
+
 #: chartabledialog.cc:51 dialog.cc:1403 fileinfodialog.cc:107
 msgid "Octal"
 msgstr "八进制"
@@ -82,9 +176,13 @@ msgstr "二进制"
 msgid "Text"
 msgstr "文本"
 
-#: chartabledialog.cc:70
-msgid "Insert this number of characters:"
-msgstr "插入指定数量的字符："
+#: fileinfodialog.cc:110
+msgid "Occurrence"
+msgstr "发生"
+
+#: fileinfodialog.cc:111
+msgid "Percent"
+msgstr "百分比"
 
 #: parts/kpart/khepartfactory.cpp:30
 msgid "KHexEdit2Part"
@@ -162,42 +260,525 @@ msgstr "字符列(&C)"
 msgid "&Both Columns"
 msgstr "两列(&B)"
 
-#: searchbar.cc:63 toplevel.cc:862
-msgid "Hex"
-msgstr "十六"
+#: hextoolwidget.cc:44
+msgid "Signed 8 bit:"
+msgstr "有符号 8 位："
 
-#: searchbar.cc:63 toplevel.cc:866
-msgid "Dec"
-msgstr "十"
+#: hextoolwidget.cc:44
+msgid "Unsigned 8 bit:"
+msgstr "无符号 8 位："
 
-#: searchbar.cc:63 toplevel.cc:870
-msgid "Oct"
-msgstr "八"
+#: hextoolwidget.cc:45
+msgid "Signed 16 bit:"
+msgstr "有符号 16 位："
 
-#: searchbar.cc:63 toplevel.cc:874
-msgid "Bin"
-msgstr "二"
+#: hextoolwidget.cc:45
+msgid "Unsigned 16 bit:"
+msgstr "无符号 16 位："
 
-#: searchbar.cc:64 toplevel.cc:878
-msgid "Txt"
-msgstr "文本"
+#: hextoolwidget.cc:50
+msgid "Signed 32 bit:"
+msgstr "有符号 32 位："
 
-#: dialog.cc:178 hexeditorwidget.cc:1515 hexeditorwidget.cc:1529
-#: hexeditorwidget.cc:1597 searchbar.cc:73
-msgid "Find"
-msgstr "查找"
+#: hextoolwidget.cc:50
+msgid "Unsigned 32 bit:"
+msgstr "无符号 32 位："
 
-#: searchbar.cc:79
-msgid "Backwards"
-msgstr "向后"
+#: hextoolwidget.cc:51
+msgid "32 bit float:"
+msgstr "32 位浮点数："
 
-#: searchbar.cc:80
-msgid "Ignore case"
-msgstr "忽略大小写"
+#: hextoolwidget.cc:51
+msgid "64 bit float:"
+msgstr "64 位浮点数："
 
-#: hexmanagerwidget.cc:136
-msgid "Conversion"
-msgstr "转换"
+#: converterdialog.cc:81 hextoolwidget.cc:56
+msgid "Hexadecimal:"
+msgstr "十六进制："
+
+#: converterdialog.cc:85 hextoolwidget.cc:56
+msgid "Octal:"
+msgstr "八进制："
+
+#: converterdialog.cc:87 hextoolwidget.cc:57
+msgid "Binary:"
+msgstr "二进制："
+
+#: converterdialog.cc:89 hextoolwidget.cc:57
+msgid "Text:"
+msgstr "文本："
+
+#: hextoolwidget.cc:96
+msgid "Show little endian decoding"
+msgstr "显示低位字节打头的译码"
+
+#: hextoolwidget.cc:110
+msgid "Show unsigned as hexadecimal"
+msgstr "无符号数显示为十六进制"
+
+#: hextoolwidget.cc:122
+msgid "Stream length:"
+msgstr "流长度："
+
+#: hextoolwidget.cc:127
+msgid "Fixed 8 Bit"
+msgstr "固定 8 位"
+
+#: hextoolwidget.cc:132
+msgid "Bit Window"
+msgstr "位窗口"
+
+#: hextoolwidget.cc:132
+msgid "Bits Window"
+msgstr "位窗口"
+
+#: optiondialog.cc:105
+msgid "Layout"
+msgstr "布局"
+
+#: optiondialog.cc:105
+msgid "Data Layout in Editor"
+msgstr "编辑器的数据布局"
+
+#: optiondialog.cc:113
+msgid "Hexadecimal Mode"
+msgstr "十六进制模式"
+
+#: optiondialog.cc:114
+msgid "Decimal Mode"
+msgstr "十进制模式"
+
+#: optiondialog.cc:115
+msgid "Octal Mode"
+msgstr "八进制模式"
+
+#: optiondialog.cc:116
+msgid "Binary Mode"
+msgstr "二进制模式"
+
+#: optiondialog.cc:117
+msgid "Text Only Mode"
+msgstr "纯文本模式"
+
+#: optiondialog.cc:146
+msgid "Default l&ine size [bytes]:"
+msgstr "默认行大小[字节](&I)："
+
+#: optiondialog.cc:150
+msgid "Colu&mn size [bytes]:"
+msgstr "列大小[字节](&M)："
+
+#: optiondialog.cc:158
+msgid "Line size is &fixed (use scrollbar when required)"
+msgstr "列大小固定(需要的时候使用滚动条)(&F)"
+
+#: optiondialog.cc:164
+msgid "Loc&k column at end of line (when column size>1)"
+msgstr "在行尾锁定列(列大小>1时)(&K)"
+
+#: exportdialog.cc:330 optiondialog.cc:175 optiondialog.cc:438
+#: printdialogpage.cc:124 printdialogpage.cc:130
+msgid "None"
+msgstr "无"
+
+#: optiondialog.cc:176
+msgid "Vertical Only"
+msgstr "仅垂直"
+
+#: optiondialog.cc:177
+msgid "Horizontal Only"
+msgstr "仅水平"
+
+#: optiondialog.cc:178
+msgid "Both Directions"
+msgstr "双向"
+
+#: optiondialog.cc:185
+msgid "&Gridlines between text:"
+msgstr "文本间的网格线(&G)："
+
+#: optiondialog.cc:203
+msgid "&Left separator width [pixels]:"
+msgstr "左分隔符宽度[像素](&L)："
+
+#: optiondialog.cc:207
+msgid "&Right separator width [pixels]:"
+msgstr "右分隔符宽度[像素](&R)："
+
+#: optiondialog.cc:223
+msgid "&Separator margin width [pixels]:"
+msgstr "分隔符边距宽度[像素](&S)："
+
+#: optiondialog.cc:227
+msgid "&Edge margin width [pixels]:"
+msgstr "边界距离宽度[像素](&E)："
+
+#: optiondialog.cc:231
+msgid "Column separation is e&qual to one character"
+msgstr "列分隔符与一个字符相等(&Q)"
+
+#: optiondialog.cc:244
+msgid "Column separa&tion [pixels]:"
+msgstr "列分隔[像素](&T)："
+
+#: optiondialog.cc:257
+msgid "Cursor"
+msgstr "光标"
+
+#: optiondialog.cc:258
+msgid "Cursor Behavior (only valid for editor)"
+msgstr "光标行为(仅对编辑器)"
+
+#: optiondialog.cc:262
+msgid "Blinking"
+msgstr "闪烁"
+
+#: optiondialog.cc:266 optiondialog.cc:267
+msgid "Do not b&link"
+msgstr "不闪烁(&L)"
+
+#: optiondialog.cc:274
+msgid "&Blink interval [ms]:"
+msgstr "闪烁间隔[毫秒](&B)："
+
+#: optiondialog.cc:284
+msgid "Shape"
+msgstr "形状"
+
+#: optiondialog.cc:288
+msgid "Always &use block (rectangular) cursor"
+msgstr "一直使用块(矩形)光标(&U)"
+
+#: optiondialog.cc:294
+msgid "Use &thick cursor in insert mode"
+msgstr "插入模式使用块光标(&T)"
+
+#: optiondialog.cc:299
+msgid "Cursor Behavior When Editor Loses Focus"
+msgstr "编辑器失去焦点后的光标行为"
+
+#: optiondialog.cc:304
+msgid "&Stop blinking (if blinking is enabled)"
+msgstr "停止闪烁(如果闪烁有效)(&S)"
+
+#: optiondialog.cc:306
+msgid "H&ide"
+msgstr "隐藏(&I)"
+
+#: optiondialog.cc:307
+msgid "Do &nothing"
+msgstr "无动作(&N)"
+
+#: optiondialog.cc:323
+msgid "Colors"
+msgstr "颜色"
+
+#: optiondialog.cc:324
+msgid "Editor Colors (system selection color is always used)"
+msgstr "编辑器颜色(总是使用系统选择区的颜色)"
+
+#: optiondialog.cc:329
+msgid "&Use system colors (as chosen in Control Center)"
+msgstr "使用系统颜色(按控制中心的选择)(&U)"
+
+#: optiondialog.cc:342
+msgid "First, Third ... Line Background"
+msgstr "奇数行背景"
+
+#: optiondialog.cc:343
+msgid "Second, Fourth ... Line Background"
+msgstr "偶数行背景"
+
+#: optiondialog.cc:344
+msgid "Offset Background"
+msgstr "偏移量背景"
+
+#: optiondialog.cc:345
+msgid "Inactive Background"
+msgstr "非活动背景"
+
+#: optiondialog.cc:346
+msgid "Even Column Text"
+msgstr "偶数列文本"
+
+#: optiondialog.cc:347
+msgid "Odd Column Text"
+msgstr "奇数列文本"
+
+#: optiondialog.cc:348
+msgid "Non Printable Text"
+msgstr "不可打印的文本"
+
+#: optiondialog.cc:349
+msgid "Offset Text"
+msgstr "偏移量文本"
+
+#: optiondialog.cc:350
+msgid "Secondary Text"
+msgstr "次要文本"
+
+#: optiondialog.cc:351
+msgid "Marked Background"
+msgstr "标记的背景"
+
+#: optiondialog.cc:352
+msgid "Marked Text"
+msgstr "标记的文本"
+
+#: optiondialog.cc:353
+msgid "Cursor Background"
+msgstr "光标背景"
+
+#: optiondialog.cc:354
+msgid "Cursor Text (block shape)"
+msgstr "光标文本 (块形状)"
+
+#: optiondialog.cc:355
+msgid "Bookmark Background"
+msgstr "书签背景"
+
+#: optiondialog.cc:356
+msgid "Bookmark Text"
+msgstr "书签文本"
+
+#: optiondialog.cc:357
+msgid "Separator"
+msgstr "分隔符"
+
+#: optiondialog.cc:358
+msgid "Grid Lines"
+msgstr "网格线"
+
+#: optiondialog.cc:376
+msgid "Font Selection (editor can only use a fixed font)"
+msgstr "字体选择(编辑器仅可使用固定宽度字体)"
+
+#: optiondialog.cc:381
+msgid "&Use system font (as chosen in Control Center)"
+msgstr "使用系统字体 (按控制中心的选择)(&U)"
+
+#: optiondialog.cc:398
+msgid "KHexEdit editor font"
+msgstr "KHexEdit 编辑器字体"
+
+#: optiondialog.cc:414
+msgid "&Map non printable characters to:"
+msgstr "绘制不可打印的字符为(&M)："
+
+#: optiondialog.cc:428
+msgid "File Management"
+msgstr "文件管理"
+
+#: optiondialog.cc:439
+msgid "Most Recent Document"
+msgstr "最近文档"
+
+#: optiondialog.cc:440
+msgid "All Recent Documents"
+msgstr "全部最近文档"
+
+#: optiondialog.cc:446
+msgid "Open doc&uments on startup:"
+msgstr "启动时打开文档(&U)："
+
+#: optiondialog.cc:452
+msgid "&Jump to previous cursor position on startup"
+msgstr "启动时转到上次光标位置(&J)"
+
+#: optiondialog.cc:466
+msgid "Open document with &write protection enabled"
+msgstr "打开文档时启用写保护(&W)"
+
+#: optiondialog.cc:472
+msgid "&Keep cursor position after reloading document"
+msgstr "重新载入文件后保持光标位置(&K)"
+
+#: optiondialog.cc:478
+msgid "&Make a backup when saving document"
+msgstr "保存文档时做备份(&M)"
+
+#: optiondialog.cc:488
+msgid "Don't &save \"Recent\" document list on exit"
+msgstr "在退出时不保存“最近文档”列表(&S)"
+
+#: optiondialog.cc:492
+msgid ""
+"Clicking this check box makes KHexEdit forget his recent document list when the "
+"program is closed.\n"
+"Note: it will not erase any document of the recent document list created by "
+"TDE."
+msgstr ""
+
+#: optiondialog.cc:499
+msgid "Cl&ear \"Recent\" Document List"
+msgstr "清除“最近文档”列表(&E)"
+
+#: optiondialog.cc:503
+msgid ""
+"Clicking this button makes KHexEdit forget his recent document list.\n"
+"Note: it will not erase any document of the recent document list created by "
+"TDE."
+msgstr ""
+
+#: optiondialog.cc:520
+msgid "Various Properties"
+msgstr "其它属性"
+
+#: optiondialog.cc:526
+msgid "Auto&matic copy to clipboard when selection is ready"
+msgstr "选择就绪后自动复制到剪贴板(&M)"
+
+#: optiondialog.cc:532
+msgid "&Editor starts in \"insert\" mode"
+msgstr "以“插入”模式启动编辑器(&E)"
+
+#: optiondialog.cc:538
+msgid "Confirm &wrapping (to beginning or end) during search"
+msgstr "寻找期间确认回绕(到开始或者结束)(&W)"
+
+#: optiondialog.cc:544
+msgid "Cursor jumps to &nearest byte when moved"
+msgstr "移动时光标跳转到最近的字节(&N)"
+
+#: optiondialog.cc:550
+msgid "Sounds"
+msgstr "声音"
+
+#: optiondialog.cc:553
+msgid "Make sound on data &input (eg. typing) failure"
+msgstr "数据输入错误时发出声音(&I)"
+
+#: optiondialog.cc:557
+msgid "Make sound on &fatal failure"
+msgstr "致命错误时发出声音(&F)"
+
+#: optiondialog.cc:562
+msgid "Bookmark Visibility"
+msgstr "书签可见性"
+
+#: optiondialog.cc:565
+msgid "Use visible bookmarks in the offset column"
+msgstr "在偏移列使用可见书签"
+
+#: optiondialog.cc:569
+msgid "Use visible bookmarks in the editor fields"
+msgstr "编辑字段使用可见书签"
+
+#: optiondialog.cc:574
+msgid "Confirm when number of printed pages will e&xceed limit"
+msgstr "打印页数超出限制时要求确认(&X)"
+
+#: optiondialog.cc:594
+msgid "&Threshold [pages]:"
+msgstr "阀值[页数](&T)："
+
+#: optiondialog.cc:611
+msgid "&Undo limit:"
+msgstr "撤消限制(&U)："
+
+#: hexerror.cc:32
+msgid "No data"
+msgstr "无数据"
+
+#: hexerror.cc:33
+msgid "Insufficient memory"
+msgstr "内存不足"
+
+#: hexerror.cc:34
+msgid "List is full"
+msgstr "列表已满"
+
+#: hexerror.cc:35
+msgid "Read operation failed"
+msgstr "读操作失败"
+
+#: hexerror.cc:36
+msgid "Write operation failed"
+msgstr "写操作失败"
+
+#: hexerror.cc:37
+msgid "Empty argument"
+msgstr "空的参数"
+
+#: hexerror.cc:38
+msgid "Illegal argument"
+msgstr "无效参数"
+
+#: hexerror.cc:39
+msgid "Null pointer argument"
+msgstr "空指针参数"
+
+#: hexerror.cc:40
+msgid "Wrap buffer"
+msgstr "缓存回绕"
+
+#: hexerror.cc:41
+msgid "No match"
+msgstr "不匹配"
+
+#: hexerror.cc:42
+msgid "No data is selected"
+msgstr "没有选择数据"
+
+#: hexerror.cc:43
+msgid "Empty document"
+msgstr "空文档"
+
+#: hexerror.cc:44
+msgid "No active document"
+msgstr "无激活的文档"
+
+#: hexerror.cc:45
+msgid "No data is marked"
+msgstr "没有标记数据"
+
+#: hexerror.cc:46
+msgid "Document is write protected"
+msgstr "文档写保护"
+
+#: hexerror.cc:47
+msgid "Document is resize protected"
+msgstr "文档禁止调整大小"
+
+#: hexerror.cc:48
+msgid "Operation was stopped"
+msgstr "操作被停止"
+
+#: hexerror.cc:49
+msgid "Illegal mode"
+msgstr "非法模式"
+
+#: hexerror.cc:50
+msgid "Program is busy, try again later"
+msgstr "程序忙，请稍后重试"
+
+#: hexerror.cc:51
+msgid "Value is not within valid range"
+msgstr "值不在有效范围内"
+
+#: hexerror.cc:52
+msgid "Operation was aborted"
+msgstr "操作被中止"
+
+#: hexerror.cc:53
+msgid "File could not be opened for writing"
+msgstr "文件不能打开进行写入"
+
+#: hexerror.cc:54
+msgid "File could not be opened for reading"
+msgstr "文件不能打开进行读取"
+
+#: hexerror.cc:60
+msgid "Unknown error"
+msgstr "未知错误"
+
+#: chartabledialog.cc:37
+msgid "Character Table"
+msgstr "字符表"
+
+#: chartabledialog.cc:70
+msgid "Insert this number of characters:"
+msgstr "插入指定数量的字符："
 
 #: main.cc:34
 msgid "TDE hex editor"
@@ -251,396 +832,331 @@ msgstr ""
 "Edward Livingston-Blade, sbcs@bigfoot.com, 给我非常好的\n"
 "故障报告，协助剔除了一些恶劣的错误。\n"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "TDE 中文翻译组"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "i18n-translation@lists.linux.net.cn"
-
-#: stringdialog.cc:38 stringdialog.cc:201
-msgid "Extract Strings"
-msgstr "提取字符串"
-
-#: stringdialog.cc:57
-msgid "&Minimum length:"
-msgstr "最小长度(&M)："
-
-#: stringdialog.cc:66
-msgid "&Filter:"
-msgstr "过滤器(&F)："
-
-#: stringdialog.cc:71
-msgid "&Use"
-msgstr "使用(&U)"
-
-#: stringdialog.cc:80
-msgid "&Ignore case"
-msgstr "忽略大小写(&I)"
-
-#: stringdialog.cc:84
-msgid "Show offset as &decimal"
-msgstr "显示十进制偏移量(&D)"
-
-#: hexviewwidget.cc:1102 stringdialog.cc:95
-msgid "Offset"
-msgstr "偏移"
-
-#: stringdialog.cc:96
-msgid "String"
-msgstr "字符串"
-
-#: stringdialog.cc:106
-msgid "Number of strings:"
-msgstr "字符串数目："
-
-#: stringdialog.cc:114
-msgid "Displayed:"
-msgstr "已显示："
-
-#: stringdialog.cc:197
-msgid ""
-"The filter expression you have specified is illegal. You must specify a valid "
-"regular expression.\n"
-"Continue without filter?"
-msgstr ""
-"您规定的过滤器表达式是非法的。您必须规定一个有效的正则表达式。\n"
-"无过滤器而继续？"
-
-#: fileinfodialog.cc:160 stringdialog.cc:254
-msgid "Warning: Document has been modified since last update"
-msgstr "警告：当前的文档上次更新后已经被修改"
-
-#: statusbarprogress.cc:268
-msgid "%1... %2 of %3"
-msgstr "%3 的 %1... %2"
-
-#: statusbarprogress.cc:272
-msgid "%1... %2%"
-msgstr "%1... %2%"
+#: printdialogpage.cc:38
+msgid "Page Layout"
+msgstr "页面布局"
 
-#: dialog.cc:44
-msgid "Goto Offset"
-msgstr "转到偏移量"
+#: printdialogpage.cc:59
+msgid "Margins [millimeter]"
+msgstr "边距[毫米]"
 
-#: dialog.cc:60
-msgid "O&ffset:"
-msgstr "偏移量(&F)："
+#: printdialogpage.cc:72
+msgid "&Top:"
+msgstr "上(&T)："
 
-#: dialog.cc:73 dialog.cc:223 dialog.cc:564 dialog.cc:810
-msgid "&From cursor"
-msgstr "从光标(&F)"
+#: printdialogpage.cc:73
+msgid "&Bottom:"
+msgstr "下(&B)："
 
-#: dialog.cc:75 dialog.cc:225 dialog.cc:566 dialog.cc:812
-msgid "&Backwards"
-msgstr "后退(&B)"
+#: printdialogpage.cc:74
+msgid "&Left:"
+msgstr "左(&L)："
 
-#: dialog.cc:77 dialog.cc:816
-msgid "&Stay visible"
-msgstr "保持可见(&S)"
+#: printdialogpage.cc:75
+msgid "&Right:"
+msgstr "右(&R)："
 
-#: dialog.cc:194
-msgid "Fo&rmat:"
-msgstr "格式(&R)："
+#: printdialogpage.cc:102
+msgid "Draw h&eader above text"
+msgstr "文本上方绘制页眉(&E)"
 
-#: dialog.cc:209 dialog.cc:520
-msgid "F&ind:"
-msgstr "查找(&I)："
+#: printdialogpage.cc:118
+msgid "Left:"
+msgstr "左："
 
-#: dialog.cc:227 dialog.cc:568 dialog.cc:814
-msgid "&In selection"
-msgstr "在选中内容中(&I)"
+#: printdialogpage.cc:119
+msgid "Center:"
+msgstr "中："
 
-#: dialog.cc:229
-msgid "&Use navigator"
-msgstr "使用导航(&U)"
+#: printdialogpage.cc:120
+msgid "Right:"
+msgstr "右："
 
-#: dialog.cc:231 dialog.cc:572
-msgid "Ignore c&ase"
-msgstr "忽略大小写(&A)"
+#: printdialogpage.cc:121
+msgid "Border:"
+msgstr "边框："
 
-#: dialog.cc:348
-msgid "Find (Navigator)"
-msgstr "查找 (导航)"
+#: printdialogpage.cc:125
+msgid "Date & Time"
+msgstr "日期和时间"
 
-#: dialog.cc:349
-msgid "New &Key"
-msgstr "新关键字(&K)"
+#: exportdialog.cc:333 printdialogpage.cc:126
+msgid "Page Number"
+msgstr "页号"
 
-#: dialog.cc:350
-msgid "&Next"
-msgstr "下一个(&N)"
+#: exportdialog.cc:332 printdialogpage.cc:127
+msgid "Filename"
+msgstr "文件名"
 
-#: dialog.cc:362
-msgid "Searching for:"
-msgstr "搜索："
+#: printdialogpage.cc:131
+msgid "Single Line"
+msgstr "单线"
 
-#: dialog.cc:485 dialog.cc:681 hexeditorwidget.cc:1768 hexeditorwidget.cc:1775
-msgid "Find & Replace"
-msgstr "查找并替换"
+#: printdialogpage.cc:132
+msgid "Rectangle"
+msgstr "矩形"
 
-#: dialog.cc:504
-msgid "Fo&rmat (find):"
-msgstr "查找格式(&R)："
+#: printdialogpage.cc:164
+msgid "Draw &footer below text"
+msgstr "文本下方绘制页脚(&F)"
 
-#: dialog.cc:533
-msgid "For&mat (replace):"
-msgstr "替换格式(&M)："
+#: searchbar.cc:63 toplevel.cc:862
+msgid "Hex"
+msgstr "十六"
 
-#: dialog.cc:550
-msgid "Rep&lace:"
-msgstr "替换(&L)："
+#: searchbar.cc:63 toplevel.cc:866
+msgid "Dec"
+msgstr "十"
 
-#: dialog.cc:570
-msgid "&Prompt"
-msgstr "提示(&P)"
+#: searchbar.cc:63 toplevel.cc:870
+msgid "Oct"
+msgstr "八"
 
-#: dialog.cc:657
-msgid "Source and target values can not be equal."
-msgstr "源和目标值不能是相等的。"
+#: searchbar.cc:63 toplevel.cc:874
+msgid "Bin"
+msgstr "二"
 
-#: dialog.cc:682
-#, fuzzy
-msgid "Replace &All"
-msgstr "替换(&L)："
+#: searchbar.cc:64 toplevel.cc:878
+msgid "Txt"
+msgstr "文本"
 
-#: dialog.cc:683
-#, fuzzy
-msgid "Do Not Replace"
-msgstr "查找并替换"
+#: dialog.cc:178 hexeditorwidget.cc:1515 hexeditorwidget.cc:1529
+#: hexeditorwidget.cc:1597 searchbar.cc:73
+msgid "Find"
+msgstr "查找"
 
-#: dialog.cc:691
-msgid "Replace marked data at cursor position?"
-msgstr "替换光标位置标记的数据？"
+#: searchbar.cc:79
+msgid "Backwards"
+msgstr "向后"
 
-#: dialog.cc:761
-msgid "Binary Filter"
-msgstr "二进制过滤"
+#: searchbar.cc:80
+msgid "Ignore case"
+msgstr "忽略大小写"
 
-#: dialog.cc:780
-msgid "O&peration:"
-msgstr "操作(&P)："
+#: conversion.cc:48
+msgid ""
+"_: Default encoding\n"
+"Default"
+msgstr "默认"
 
-#: dialog.cc:855
-msgid "Fo&rmat (operand):"
-msgstr "格式(操作数)(&R)："
+#: conversion.cc:49
+msgid "EBCDIC"
+msgstr "EBCDIC"
 
-#: dialog.cc:871
-msgid "O&perand:"
-msgstr "操作数(&P)："
+#: conversion.cc:50
+msgid "US-ASCII (7 bit)"
+msgstr "US-ASCII (7 位)"
 
-#: dialog.cc:891
-msgid "Swap rule"
-msgstr "交换规则"
+#: conversion.cc:51
+msgid "Unknown"
+msgstr "未知"
 
-#: dialog.cc:903
-msgid "&Reset"
-msgstr "重置(&R)"
+#: exportdialog.cc:35 exportdialog.cc:493 exportdialog.cc:537
+#: exportdialog.cc:566 exportdialog.cc:634
+msgid "Export Document"
+msgstr "导出文档"
 
-#: dialog.cc:929
-msgid "&Group size [bytes]"
-msgstr "组大小(&G)[字节]"
+#: exportdialog.cc:40
+msgid "Destination"
+msgstr "目标"
 
-#: dialog.cc:941
-msgid "S&hift size [bits]"
-msgstr "移位大小(&H)[位]"
+#: exportdialog.cc:158
+msgid "Plain Text"
+msgstr "纯文本"
 
-#: dialog.cc:985
-msgid "Shift size is zero."
-msgstr "移位大小是零。"
+#: exportdialog.cc:159
+msgid "HTML Tables"
+msgstr "HTML 表格"
 
-#: dialog.cc:994
-msgid "Swap rule does not define any swapping."
-msgstr "交换规则不定义任何交换。"
+#: exportdialog.cc:160
+msgid "Rich Text (RTF)"
+msgstr "多文本(RTF)"
 
-#: dialog.cc:1070
-msgid "Insert Pattern"
-msgstr "插入模板"
+#: exportdialog.cc:161
+msgid "C Array"
+msgstr "C 数组"
 
-#: dialog.cc:1089
-msgid "&Size:"
-msgstr "大小(&S)："
+#: exportdialog.cc:169
+msgid "&Format:"
+msgstr "格式(&F)："
 
-#: dialog.cc:1102
-msgid "Fo&rmat (pattern):"
-msgstr "格式(模板)(&R)："
+#: exportdialog.cc:177
+msgid "&Destination:"
+msgstr "目标(&D)："
 
-#: dialog.cc:1118
-msgid "&Pattern:"
-msgstr "模板(&P)："
+#: exportdialog.cc:181
+msgid "(Package folder)"
+msgstr "(软件包文件夹)"
 
-#: dialog.cc:1127
-msgid "&Offset:"
-msgstr "偏移量(&O)："
+#: exportdialog.cc:191
+msgid "Choose..."
+msgstr "选择..."
 
-#: dialog.cc:1142
-msgid "R&epeat pattern"
-msgstr "重复模板(&E)"
+#: exportdialog.cc:202
+msgid "Export Range"
+msgstr "导出范围"
 
-#: dialog.cc:1144
-msgid "&Insert on cursor position"
-msgstr "在光标位置插入(&I)"
+#: exportdialog.cc:210
+msgid "&Everything"
+msgstr "所有内容(&E)"
 
-#: dialog.cc:1284
-msgid "Your request can not be processed."
-msgstr "您的请求无法被处理。"
+#: exportdialog.cc:215
+msgid "&Selection"
+msgstr "选择区域(&S)"
 
-#: dialog.cc:1288
-msgid "Examine argument(s) and try again."
-msgstr "请检查参数然后重试。"
+#: exportdialog.cc:220
+msgid "&Range"
+msgstr "范围(&R)"
 
-#: dialog.cc:1294
-msgid "Invalid argument(s)"
-msgstr "无效参数"
+#: exportdialog.cc:229
+msgid "&From offset:"
+msgstr "从偏移量(&F)："
 
-#: dialog.cc:1303
-msgid "You must specify a destination file."
-msgstr "必须指定目标文件。"
+#: exportdialog.cc:235
+msgid "&To offset:"
+msgstr "到偏移量(&T)："
 
-#: dialog.cc:1313
-msgid "You have specified an existing folder."
-msgstr "您指定的是一个存在的文件夹。"
+#: exportdialog.cc:280 exportdialog.cc:374
+msgid "No options for this format."
+msgstr "此格式没有选项。"
 
-#: dialog.cc:1320
-msgid "You do not have write permission to this file."
-msgstr "您没有写入这个文件的权限。"
+#: exportdialog.cc:296
+msgid "HTML Options (one table per page)"
+msgstr "HTML 选项(每页一个表格)"
 
-#: dialog.cc:1325
-msgid ""
-"You have specified an existing file.\n"
-"Overwrite current file?"
-msgstr ""
-"您指定了一个已有的文件。\n"
-"覆盖当前的文件吗？"
+#: exportdialog.cc:317
+msgid "&Lines per table:"
+msgstr "每个表格的行数(&L)："
 
-#: dialog.cc:1328 hexeditorwidget.cc:990
-msgid "Overwrite"
-msgstr ""
+#: exportdialog.cc:325
+msgid "Filename &prefix (in package):"
+msgstr "软件包文件名前缀(&P)："
 
-#: dialog.cc:1405
-msgid "Regular Text"
-msgstr "常规文本"
+#: exportdialog.cc:331
+msgid "Filename with Path"
+msgstr "带路径的文件名"
 
-#: dialog.cc:1416
-msgid "operand AND data"
-msgstr "操作数 AND 数据"
+#: exportdialog.cc:339
+msgid "Header &above text:"
+msgstr "文本上方的页眉(&A)："
 
-#: dialog.cc:1417
-msgid "operand OR data"
-msgstr "操作数 OR 数据"
+#: exportdialog.cc:347
+msgid "&Footer below text:"
+msgstr "文本下方的页脚(&F)："
 
-#: dialog.cc:1418
-msgid "operand XOR data"
-msgstr "操作数 XOR 数据"
+#: exportdialog.cc:351
+msgid "Link \"index.html\" to &table of contents file"
+msgstr "将“index.html”链接到目录文件(&T)"
 
-#: dialog.cc:1419
-msgid "INVERT data"
-msgstr "INVERT 数据"
+#: exportdialog.cc:355
+msgid "&Include navigator bar"
+msgstr "包括导航栏(&I)"
 
-#: dialog.cc:1420
-msgid "REVERSE data"
-msgstr "REVERSE 数据"
+#: exportdialog.cc:359
+msgid "&Use black and white only"
+msgstr "只使用黑白色(&U)"
 
-#: dialog.cc:1421
-msgid "ROTATE data"
-msgstr "ROTATE 数据"
+#: exportdialog.cc:388
+msgid "C Array Options"
+msgstr "C 数组选项"
 
-#: dialog.cc:1422
-msgid "SHIFT data"
-msgstr "SHIFT 数据"
+#: exportdialog.cc:402
+msgid "Array name:"
+msgstr "数组名："
 
-#: dialog.cc:1423
-msgid "Swap Individual Bits"
-msgstr "交换单独位"
+#: exportdialog.cc:407
+msgid "char"
+msgstr "char"
 
-#: hextoolwidget.cc:44
-msgid "Signed 8 bit:"
-msgstr "有符号 8 位："
+#: exportdialog.cc:408
+msgid "unsigned char"
+msgstr "unsigned char"
 
-#: hextoolwidget.cc:44
-msgid "Unsigned 8 bit:"
-msgstr "无符号 8 位："
+#: exportdialog.cc:409
+msgid "short"
+msgstr "short"
 
-#: hextoolwidget.cc:45
-msgid "Signed 16 bit:"
-msgstr "有符号 16 位："
+#: exportdialog.cc:410
+msgid "unsigned short"
+msgstr "unsigned short"
 
-#: hextoolwidget.cc:45
-msgid "Unsigned 16 bit:"
-msgstr "无符号 16 位："
+#: exportdialog.cc:411
+msgid "int"
+msgstr "int"
 
-#: hextoolwidget.cc:50
-msgid "Signed 32 bit:"
-msgstr "有符号 32 位："
+#: exportdialog.cc:412
+msgid "unsigned int"
+msgstr "unsigned int"
 
-#: hextoolwidget.cc:50
-msgid "Unsigned 32 bit:"
-msgstr "无符号 32 位："
+#: exportdialog.cc:413
+msgid "float"
+msgstr "float"
 
-#: hextoolwidget.cc:51
-msgid "32 bit float:"
-msgstr "32 位浮点数："
+#: exportdialog.cc:414
+msgid "double"
+msgstr "double"
 
-#: hextoolwidget.cc:51
-msgid "64 bit float:"
-msgstr "64 位浮点数："
+#: exportdialog.cc:419
+msgid "Element type:"
+msgstr "元素类型："
 
-#: converterdialog.cc:81 hextoolwidget.cc:56
-msgid "Hexadecimal:"
-msgstr "十六进制："
+#: exportdialog.cc:427
+msgid "Elements per line:"
+msgstr "每列元素数："
 
-#: converterdialog.cc:85 hextoolwidget.cc:56
-msgid "Octal:"
-msgstr "八进制："
+#: exportdialog.cc:431
+msgid "Print unsigned values as hexadecimal"
+msgstr "无符号值用十六进制打印"
 
-#: converterdialog.cc:87 hextoolwidget.cc:57
-msgid "Binary:"
-msgstr "二进制："
+#: exportdialog.cc:535
+msgid "The filename prefix can not contain empty letters or punctuation marks."
+msgstr "文件名前缀不能含有空字母或标点符号。"
 
-#: converterdialog.cc:89 hextoolwidget.cc:57
-msgid "Text:"
-msgstr "文本："
+#: exportdialog.cc:561
+msgid "This format is not yet supported."
+msgstr "尚未支持此格式。"
 
-#: hextoolwidget.cc:96
-msgid "Show little endian decoding"
-msgstr "显示低位字节打头的译码"
+#: exportdialog.cc:638
+msgid "You must specify a destination."
+msgstr "您必须指定目的。"
 
-#: hextoolwidget.cc:110
-msgid "Show unsigned as hexadecimal"
-msgstr "无符号数显示为十六进制"
+#: exportdialog.cc:650
+msgid "Unable to create a new folder"
+msgstr "不能创建新文件夹"
 
-#: hextoolwidget.cc:122
-msgid "Stream length:"
-msgstr "流长度："
+#: exportdialog.cc:661
+msgid "You have specified an existing file"
+msgstr "您指定的是一个存在的文件"
 
-#: hextoolwidget.cc:127
-msgid "Fixed 8 Bit"
-msgstr "固定 8 位"
+#: exportdialog.cc:669
+msgid "You do not have write permission to this folder."
+msgstr "您没有写入此文件夹的权限。"
 
-#: hextoolwidget.cc:132
-msgid "Bit Window"
-msgstr "位窗口"
+#: exportdialog.cc:679
+msgid ""
+"You have specified an existing folder.\n"
+"If you continue, any existing file in the range \"%1\" to \"%2\" can be lost.\n"
+"Continue?"
+msgstr ""
+"您指定了一个已有的文件夹。\n"
+"如果您继续，在范围“%1”到“%2”中的任何文件都将丢失。\n"
+"要继续吗？"
 
-#: hextoolwidget.cc:132
-msgid "Bits Window"
-msgstr "位窗口"
+#: hexviewwidget.cc:1128
+msgid "Remove Bookmark"
+msgstr "删除书签"
 
-#: converterdialog.cc:71
-msgid "Converter"
-msgstr "转换器"
+#: hexviewwidget.cc:1158
+msgid "Replace Bookmark"
+msgstr "替换书签"
 
-#: converterdialog.cc:72
-msgid "&On Cursor"
-msgstr "在光标上(&O)"
+#: statusbarprogress.cc:268
+msgid "%1... %2 of %3"
+msgstr "%3 的 %1... %2"
 
-#: converterdialog.cc:83
-msgid "Decimal:"
-msgstr "十进制："
+#: statusbarprogress.cc:272
+msgid "%1... %2%"
+msgstr "%1... %2%"
 
 #: toplevel.cc:133
 msgid "&Insert..."
@@ -884,119 +1400,251 @@ msgstr "编码：%1"
 msgid "Selection:"
 msgstr "选择："
 
-#: hexerror.cc:32
-msgid "No data"
-msgstr "无数据"
+#: converterdialog.cc:71
+msgid "Converter"
+msgstr "转换器"
 
-#: hexerror.cc:33
-msgid "Insufficient memory"
-msgstr "内存不足"
+#: converterdialog.cc:72
+msgid "&On Cursor"
+msgstr "在光标上(&O)"
 
-#: hexerror.cc:34
-msgid "List is full"
-msgstr "列表已满"
+#: converterdialog.cc:83
+msgid "Decimal:"
+msgstr "十进制："
 
-#: hexerror.cc:35
-msgid "Read operation failed"
-msgstr "读操作失败"
+#: dialog.cc:44
+msgid "Goto Offset"
+msgstr "转到偏移量"
 
-#: hexerror.cc:36
-msgid "Write operation failed"
-msgstr "写操作失败"
+#: dialog.cc:60
+msgid "O&ffset:"
+msgstr "偏移量(&F)："
 
-#: hexerror.cc:37
-msgid "Empty argument"
-msgstr "空的参数"
+#: dialog.cc:73 dialog.cc:223 dialog.cc:564 dialog.cc:810
+msgid "&From cursor"
+msgstr "从光标(&F)"
 
-#: hexerror.cc:38
-msgid "Illegal argument"
-msgstr "无效参数"
+#: dialog.cc:75 dialog.cc:225 dialog.cc:566 dialog.cc:812
+msgid "&Backwards"
+msgstr "后退(&B)"
 
-#: hexerror.cc:39
-msgid "Null pointer argument"
-msgstr "空指针参数"
+#: dialog.cc:77 dialog.cc:816
+msgid "&Stay visible"
+msgstr "保持可见(&S)"
 
-#: hexerror.cc:40
-msgid "Wrap buffer"
-msgstr "缓存回绕"
+#: dialog.cc:194
+msgid "Fo&rmat:"
+msgstr "格式(&R)："
 
-#: hexerror.cc:41
-msgid "No match"
-msgstr "不匹配"
+#: dialog.cc:209 dialog.cc:520
+msgid "F&ind:"
+msgstr "查找(&I)："
 
-#: hexerror.cc:42
-msgid "No data is selected"
-msgstr "没有选择数据"
+#: dialog.cc:227 dialog.cc:568 dialog.cc:814
+msgid "&In selection"
+msgstr "在选中内容中(&I)"
 
-#: hexerror.cc:43
-msgid "Empty document"
-msgstr "空文档"
+#: dialog.cc:229
+msgid "&Use navigator"
+msgstr "使用导航(&U)"
 
-#: hexerror.cc:44
-msgid "No active document"
-msgstr "无激活的文档"
+#: dialog.cc:231 dialog.cc:572
+msgid "Ignore c&ase"
+msgstr "忽略大小写(&A)"
 
-#: hexerror.cc:45
-msgid "No data is marked"
-msgstr "没有标记数据"
+#: dialog.cc:348
+msgid "Find (Navigator)"
+msgstr "查找 (导航)"
 
-#: hexerror.cc:46
-msgid "Document is write protected"
-msgstr "文档写保护"
+#: dialog.cc:349
+msgid "New &Key"
+msgstr "新关键字(&K)"
 
-#: hexerror.cc:47
-msgid "Document is resize protected"
-msgstr "文档禁止调整大小"
+#: dialog.cc:350
+msgid "&Next"
+msgstr "下一个(&N)"
 
-#: hexerror.cc:48
-msgid "Operation was stopped"
-msgstr "操作被停止"
+#: dialog.cc:362
+msgid "Searching for:"
+msgstr "搜索："
 
-#: hexerror.cc:49
-msgid "Illegal mode"
-msgstr "非法模式"
+#: dialog.cc:485 dialog.cc:681 hexeditorwidget.cc:1768 hexeditorwidget.cc:1775
+msgid "Find & Replace"
+msgstr "查找并替换"
 
-#: hexerror.cc:50
-msgid "Program is busy, try again later"
-msgstr "程序忙，请稍后重试"
+#: dialog.cc:504
+msgid "Fo&rmat (find):"
+msgstr "查找格式(&R)："
 
-#: hexerror.cc:51
-msgid "Value is not within valid range"
-msgstr "值不在有效范围内"
+#: dialog.cc:533
+msgid "For&mat (replace):"
+msgstr "替换格式(&M)："
 
-#: hexerror.cc:52
-msgid "Operation was aborted"
-msgstr "操作被中止"
+#: dialog.cc:550
+msgid "Rep&lace:"
+msgstr "替换(&L)："
 
-#: hexerror.cc:53
-msgid "File could not be opened for writing"
-msgstr "文件不能打开进行写入"
+#: dialog.cc:570
+msgid "&Prompt"
+msgstr "提示(&P)"
 
-#: hexerror.cc:54
-msgid "File could not be opened for reading"
-msgstr "文件不能打开进行读取"
+#: dialog.cc:657
+msgid "Source and target values can not be equal."
+msgstr "源和目标值不能是相等的。"
 
-#: hexerror.cc:60
-msgid "Unknown error"
-msgstr "未知错误"
+#: dialog.cc:682
+#, fuzzy
+msgid "Replace &All"
+msgstr "替换(&L)："
 
-#: conversion.cc:48
+#: dialog.cc:683
+#, fuzzy
+msgid "Do Not Replace"
+msgstr "查找并替换"
+
+#: dialog.cc:691
+msgid "Replace marked data at cursor position?"
+msgstr "替换光标位置标记的数据？"
+
+#: dialog.cc:761
+msgid "Binary Filter"
+msgstr "二进制过滤"
+
+#: dialog.cc:780
+msgid "O&peration:"
+msgstr "操作(&P)："
+
+#: dialog.cc:855
+msgid "Fo&rmat (operand):"
+msgstr "格式(操作数)(&R)："
+
+#: dialog.cc:871
+msgid "O&perand:"
+msgstr "操作数(&P)："
+
+#: dialog.cc:891
+msgid "Swap rule"
+msgstr "交换规则"
+
+#: dialog.cc:903
+msgid "&Reset"
+msgstr "重置(&R)"
+
+#: dialog.cc:929
+msgid "&Group size [bytes]"
+msgstr "组大小(&G)[字节]"
+
+#: dialog.cc:941
+msgid "S&hift size [bits]"
+msgstr "移位大小(&H)[位]"
+
+#: dialog.cc:985
+msgid "Shift size is zero."
+msgstr "移位大小是零。"
+
+#: dialog.cc:994
+msgid "Swap rule does not define any swapping."
+msgstr "交换规则不定义任何交换。"
+
+#: dialog.cc:1070
+msgid "Insert Pattern"
+msgstr "插入模板"
+
+#: dialog.cc:1089
+msgid "&Size:"
+msgstr "大小(&S)："
+
+#: dialog.cc:1102
+msgid "Fo&rmat (pattern):"
+msgstr "格式(模板)(&R)："
+
+#: dialog.cc:1118
+msgid "&Pattern:"
+msgstr "模板(&P)："
+
+#: dialog.cc:1127
+msgid "&Offset:"
+msgstr "偏移量(&O)："
+
+#: dialog.cc:1142
+msgid "R&epeat pattern"
+msgstr "重复模板(&E)"
+
+#: dialog.cc:1144
+msgid "&Insert on cursor position"
+msgstr "在光标位置插入(&I)"
+
+#: dialog.cc:1284
+msgid "Your request can not be processed."
+msgstr "您的请求无法被处理。"
+
+#: dialog.cc:1288
+msgid "Examine argument(s) and try again."
+msgstr "请检查参数然后重试。"
+
+#: dialog.cc:1294
+msgid "Invalid argument(s)"
+msgstr "无效参数"
+
+#: dialog.cc:1303
+msgid "You must specify a destination file."
+msgstr "必须指定目标文件。"
+
+#: dialog.cc:1313
+msgid "You have specified an existing folder."
+msgstr "您指定的是一个存在的文件夹。"
+
+#: dialog.cc:1320
+msgid "You do not have write permission to this file."
+msgstr "您没有写入这个文件的权限。"
+
+#: dialog.cc:1325
 msgid ""
-"_: Default encoding\n"
-"Default"
-msgstr "默认"
+"You have specified an existing file.\n"
+"Overwrite current file?"
+msgstr ""
+"您指定了一个已有的文件。\n"
+"覆盖当前的文件吗？"
 
-#: conversion.cc:49
-msgid "EBCDIC"
-msgstr "EBCDIC"
+#: dialog.cc:1328 hexeditorwidget.cc:990
+msgid "Overwrite"
+msgstr ""
 
-#: conversion.cc:50
-msgid "US-ASCII (7 bit)"
-msgstr "US-ASCII (7 位)"
+#: dialog.cc:1405
+msgid "Regular Text"
+msgstr "常规文本"
 
-#: conversion.cc:51
-msgid "Unknown"
-msgstr "未知"
+#: dialog.cc:1416
+msgid "operand AND data"
+msgstr "操作数 AND 数据"
+
+#: dialog.cc:1417
+msgid "operand OR data"
+msgstr "操作数 OR 数据"
+
+#: dialog.cc:1418
+msgid "operand XOR data"
+msgstr "操作数 XOR 数据"
+
+#: dialog.cc:1419
+msgid "INVERT data"
+msgstr "INVERT 数据"
+
+#: dialog.cc:1420
+msgid "REVERSE data"
+msgstr "REVERSE 数据"
+
+#: dialog.cc:1421
+msgid "ROTATE data"
+msgstr "ROTATE 数据"
+
+#: dialog.cc:1422
+msgid "SHIFT data"
+msgstr "SHIFT 数据"
+
+#: dialog.cc:1423
+msgid "Swap Individual Bits"
+msgstr "交换单独位"
 
 #: hexeditorwidget.cc:583
 #, c-format
@@ -1393,656 +2041,9 @@ msgid ""
 msgstr ""
 "不能完成操作。\n"
 
-#: exportdialog.cc:35 exportdialog.cc:493 exportdialog.cc:537
-#: exportdialog.cc:566 exportdialog.cc:634
-msgid "Export Document"
-msgstr "导出文档"
-
-#: exportdialog.cc:40
-msgid "Destination"
-msgstr "目标"
-
-#: exportdialog.cc:158
-msgid "Plain Text"
-msgstr "纯文本"
-
-#: exportdialog.cc:159
-msgid "HTML Tables"
-msgstr "HTML 表格"
-
-#: exportdialog.cc:160
-msgid "Rich Text (RTF)"
-msgstr "多文本(RTF)"
-
-#: exportdialog.cc:161
-msgid "C Array"
-msgstr "C 数组"
-
-#: exportdialog.cc:169
-msgid "&Format:"
-msgstr "格式(&F)："
-
-#: exportdialog.cc:177
-msgid "&Destination:"
-msgstr "目标(&D)："
-
-#: exportdialog.cc:181
-msgid "(Package folder)"
-msgstr "(软件包文件夹)"
-
-#: exportdialog.cc:191
-msgid "Choose..."
-msgstr "选择..."
-
-#: exportdialog.cc:202
-msgid "Export Range"
-msgstr "导出范围"
-
-#: exportdialog.cc:210
-msgid "&Everything"
-msgstr "所有内容(&E)"
-
-#: exportdialog.cc:215
-msgid "&Selection"
-msgstr "选择区域(&S)"
-
-#: exportdialog.cc:220
-msgid "&Range"
-msgstr "范围(&R)"
-
-#: exportdialog.cc:229
-msgid "&From offset:"
-msgstr "从偏移量(&F)："
-
-#: exportdialog.cc:235
-msgid "&To offset:"
-msgstr "到偏移量(&T)："
-
-#: exportdialog.cc:280 exportdialog.cc:374
-msgid "No options for this format."
-msgstr "此格式没有选项。"
-
-#: exportdialog.cc:296
-msgid "HTML Options (one table per page)"
-msgstr "HTML 选项(每页一个表格)"
-
-#: exportdialog.cc:317
-msgid "&Lines per table:"
-msgstr "每个表格的行数(&L)："
-
-#: exportdialog.cc:325
-msgid "Filename &prefix (in package):"
-msgstr "软件包文件名前缀(&P)："
-
-#: exportdialog.cc:330 optiondialog.cc:175 optiondialog.cc:438
-#: printdialogpage.cc:124 printdialogpage.cc:130
-msgid "None"
-msgstr "无"
-
-#: exportdialog.cc:331
-msgid "Filename with Path"
-msgstr "带路径的文件名"
-
-#: exportdialog.cc:332 printdialogpage.cc:127
-msgid "Filename"
-msgstr "文件名"
-
-#: exportdialog.cc:333 printdialogpage.cc:126
-msgid "Page Number"
-msgstr "页号"
-
-#: exportdialog.cc:339
-msgid "Header &above text:"
-msgstr "文本上方的页眉(&A)："
-
-#: exportdialog.cc:347
-msgid "&Footer below text:"
-msgstr "文本下方的页脚(&F)："
-
-#: exportdialog.cc:351
-msgid "Link \"index.html\" to &table of contents file"
-msgstr "将“index.html”链接到目录文件(&T)"
-
-#: exportdialog.cc:355
-msgid "&Include navigator bar"
-msgstr "包括导航栏(&I)"
-
-#: exportdialog.cc:359
-msgid "&Use black and white only"
-msgstr "只使用黑白色(&U)"
-
-#: exportdialog.cc:388
-msgid "C Array Options"
-msgstr "C 数组选项"
-
-#: exportdialog.cc:402
-msgid "Array name:"
-msgstr "数组名："
-
-#: exportdialog.cc:407
-msgid "char"
-msgstr "char"
-
-#: exportdialog.cc:408
-msgid "unsigned char"
-msgstr "unsigned char"
-
-#: exportdialog.cc:409
-msgid "short"
-msgstr "short"
-
-#: exportdialog.cc:410
-msgid "unsigned short"
-msgstr "unsigned short"
-
-#: exportdialog.cc:411
-msgid "int"
-msgstr "int"
-
-#: exportdialog.cc:412
-msgid "unsigned int"
-msgstr "unsigned int"
-
-#: exportdialog.cc:413
-msgid "float"
-msgstr "float"
-
-#: exportdialog.cc:414
-msgid "double"
-msgstr "double"
-
-#: exportdialog.cc:419
-msgid "Element type:"
-msgstr "元素类型："
-
-#: exportdialog.cc:427
-msgid "Elements per line:"
-msgstr "每列元素数："
-
-#: exportdialog.cc:431
-msgid "Print unsigned values as hexadecimal"
-msgstr "无符号值用十六进制打印"
-
-#: exportdialog.cc:535
-msgid "The filename prefix can not contain empty letters or punctuation marks."
-msgstr "文件名前缀不能含有空字母或标点符号。"
-
-#: exportdialog.cc:561
-msgid "This format is not yet supported."
-msgstr "尚未支持此格式。"
-
-#: exportdialog.cc:638
-msgid "You must specify a destination."
-msgstr "您必须指定目的。"
-
-#: exportdialog.cc:650
-msgid "Unable to create a new folder"
-msgstr "不能创建新文件夹"
-
-#: exportdialog.cc:661
-msgid "You have specified an existing file"
-msgstr "您指定的是一个存在的文件"
-
-#: exportdialog.cc:669
-msgid "You do not have write permission to this folder."
-msgstr "您没有写入此文件夹的权限。"
-
-#: exportdialog.cc:679
-msgid ""
-"You have specified an existing folder.\n"
-"If you continue, any existing file in the range \"%1\" to \"%2\" can be lost.\n"
-"Continue?"
-msgstr ""
-"您指定了一个已有的文件夹。\n"
-"如果您继续，在范围“%1”到“%2”中的任何文件都将丢失。\n"
-"要继续吗？"
-
-#: hexviewwidget.cc:1128
-msgid "Remove Bookmark"
-msgstr "删除书签"
-
-#: hexviewwidget.cc:1158
-msgid "Replace Bookmark"
-msgstr "替换书签"
-
-#: hexbuffer.cc:1925 hexbuffer.cc:4832
-msgid "Page %1 of %2"
-msgstr "第 %1 页共 %2 页"
-
-#: hexbuffer.cc:2852
-msgid "to"
-msgstr "到"
-
-#: hexbuffer.cc:4853 hexbuffer.cc:4858
-msgid "Next"
-msgstr "下一个"
-
-#: hexbuffer.cc:4863 hexbuffer.cc:4868
-msgid "Previous"
-msgstr "前一个"
-
-#: hexbuffer.cc:4886
-msgid "Generated by khexedit"
-msgstr "khexedit 生成的"
-
-#: printdialogpage.cc:38
-msgid "Page Layout"
-msgstr "页面布局"
-
-#: printdialogpage.cc:59
-msgid "Margins [millimeter]"
-msgstr "边距[毫米]"
-
-#: printdialogpage.cc:72
-msgid "&Top:"
-msgstr "上(&T)："
-
-#: printdialogpage.cc:73
-msgid "&Bottom:"
-msgstr "下(&B)："
-
-#: printdialogpage.cc:74
-msgid "&Left:"
-msgstr "左(&L)："
-
-#: printdialogpage.cc:75
-msgid "&Right:"
-msgstr "右(&R)："
-
-#: printdialogpage.cc:102
-msgid "Draw h&eader above text"
-msgstr "文本上方绘制页眉(&E)"
-
-#: printdialogpage.cc:118
-msgid "Left:"
-msgstr "左："
-
-#: printdialogpage.cc:119
-msgid "Center:"
-msgstr "中："
-
-#: printdialogpage.cc:120
-msgid "Right:"
-msgstr "右："
-
-#: printdialogpage.cc:121
-msgid "Border:"
-msgstr "边框："
-
-#: printdialogpage.cc:125
-msgid "Date & Time"
-msgstr "日期和时间"
-
-#: printdialogpage.cc:131
-msgid "Single Line"
-msgstr "单线"
-
-#: printdialogpage.cc:132
-msgid "Rectangle"
-msgstr "矩形"
-
-#: printdialogpage.cc:164
-msgid "Draw &footer below text"
-msgstr "文本下方绘制页脚(&F)"
-
-#: fileinfodialog.cc:73
-msgid "Statistics"
-msgstr "统计"
-
-#: fileinfodialog.cc:89
-msgid "File name: "
-msgstr "文件名："
-
-#: fileinfodialog.cc:93
-msgid "Size [bytes]: "
-msgstr "大小 [字节]："
-
-#: fileinfodialog.cc:110
-msgid "Occurrence"
-msgstr "发生"
-
-#: fileinfodialog.cc:111
-msgid "Percent"
-msgstr "百分比"
-
-#: optiondialog.cc:105
-msgid "Layout"
-msgstr "布局"
-
-#: optiondialog.cc:105
-msgid "Data Layout in Editor"
-msgstr "编辑器的数据布局"
-
-#: optiondialog.cc:113
-msgid "Hexadecimal Mode"
-msgstr "十六进制模式"
-
-#: optiondialog.cc:114
-msgid "Decimal Mode"
-msgstr "十进制模式"
-
-#: optiondialog.cc:115
-msgid "Octal Mode"
-msgstr "八进制模式"
-
-#: optiondialog.cc:116
-msgid "Binary Mode"
-msgstr "二进制模式"
-
-#: optiondialog.cc:117
-msgid "Text Only Mode"
-msgstr "纯文本模式"
-
-#: optiondialog.cc:146
-msgid "Default l&ine size [bytes]:"
-msgstr "默认行大小[字节](&I)："
-
-#: optiondialog.cc:150
-msgid "Colu&mn size [bytes]:"
-msgstr "列大小[字节](&M)："
-
-#: optiondialog.cc:158
-msgid "Line size is &fixed (use scrollbar when required)"
-msgstr "列大小固定(需要的时候使用滚动条)(&F)"
-
-#: optiondialog.cc:164
-msgid "Loc&k column at end of line (when column size>1)"
-msgstr "在行尾锁定列(列大小>1时)(&K)"
-
-#: optiondialog.cc:176
-msgid "Vertical Only"
-msgstr "仅垂直"
-
-#: optiondialog.cc:177
-msgid "Horizontal Only"
-msgstr "仅水平"
-
-#: optiondialog.cc:178
-msgid "Both Directions"
-msgstr "双向"
-
-#: optiondialog.cc:185
-msgid "&Gridlines between text:"
-msgstr "文本间的网格线(&G)："
-
-#: optiondialog.cc:203
-msgid "&Left separator width [pixels]:"
-msgstr "左分隔符宽度[像素](&L)："
-
-#: optiondialog.cc:207
-msgid "&Right separator width [pixels]:"
-msgstr "右分隔符宽度[像素](&R)："
-
-#: optiondialog.cc:223
-msgid "&Separator margin width [pixels]:"
-msgstr "分隔符边距宽度[像素](&S)："
-
-#: optiondialog.cc:227
-msgid "&Edge margin width [pixels]:"
-msgstr "边界距离宽度[像素](&E)："
-
-#: optiondialog.cc:231
-msgid "Column separation is e&qual to one character"
-msgstr "列分隔符与一个字符相等(&Q)"
-
-#: optiondialog.cc:244
-msgid "Column separa&tion [pixels]:"
-msgstr "列分隔[像素](&T)："
-
-#: optiondialog.cc:257
-msgid "Cursor"
-msgstr "光标"
-
-#: optiondialog.cc:258
-msgid "Cursor Behavior (only valid for editor)"
-msgstr "光标行为(仅对编辑器)"
-
-#: optiondialog.cc:262
-msgid "Blinking"
-msgstr "闪烁"
-
-#: optiondialog.cc:266 optiondialog.cc:267
-msgid "Do not b&link"
-msgstr "不闪烁(&L)"
-
-#: optiondialog.cc:274
-msgid "&Blink interval [ms]:"
-msgstr "闪烁间隔[毫秒](&B)："
-
-#: optiondialog.cc:284
-msgid "Shape"
-msgstr "形状"
-
-#: optiondialog.cc:288
-msgid "Always &use block (rectangular) cursor"
-msgstr "一直使用块(矩形)光标(&U)"
-
-#: optiondialog.cc:294
-msgid "Use &thick cursor in insert mode"
-msgstr "插入模式使用块光标(&T)"
-
-#: optiondialog.cc:299
-msgid "Cursor Behavior When Editor Loses Focus"
-msgstr "编辑器失去焦点后的光标行为"
-
-#: optiondialog.cc:304
-msgid "&Stop blinking (if blinking is enabled)"
-msgstr "停止闪烁(如果闪烁有效)(&S)"
-
-#: optiondialog.cc:306
-msgid "H&ide"
-msgstr "隐藏(&I)"
-
-#: optiondialog.cc:307
-msgid "Do &nothing"
-msgstr "无动作(&N)"
-
-#: optiondialog.cc:323
-msgid "Colors"
-msgstr "颜色"
-
-#: optiondialog.cc:324
-msgid "Editor Colors (system selection color is always used)"
-msgstr "编辑器颜色(总是使用系统选择区的颜色)"
-
-#: optiondialog.cc:329
-msgid "&Use system colors (as chosen in Control Center)"
-msgstr "使用系统颜色(按控制中心的选择)(&U)"
-
-#: optiondialog.cc:342
-msgid "First, Third ... Line Background"
-msgstr "奇数行背景"
-
-#: optiondialog.cc:343
-msgid "Second, Fourth ... Line Background"
-msgstr "偶数行背景"
-
-#: optiondialog.cc:344
-msgid "Offset Background"
-msgstr "偏移量背景"
-
-#: optiondialog.cc:345
-msgid "Inactive Background"
-msgstr "非活动背景"
-
-#: optiondialog.cc:346
-msgid "Even Column Text"
-msgstr "偶数列文本"
-
-#: optiondialog.cc:347
-msgid "Odd Column Text"
-msgstr "奇数列文本"
-
-#: optiondialog.cc:348
-msgid "Non Printable Text"
-msgstr "不可打印的文本"
-
-#: optiondialog.cc:349
-msgid "Offset Text"
-msgstr "偏移量文本"
-
-#: optiondialog.cc:350
-msgid "Secondary Text"
-msgstr "次要文本"
-
-#: optiondialog.cc:351
-msgid "Marked Background"
-msgstr "标记的背景"
-
-#: optiondialog.cc:352
-msgid "Marked Text"
-msgstr "标记的文本"
-
-#: optiondialog.cc:353
-msgid "Cursor Background"
-msgstr "光标背景"
-
-#: optiondialog.cc:354
-msgid "Cursor Text (block shape)"
-msgstr "光标文本 (块形状)"
-
-#: optiondialog.cc:355
-msgid "Bookmark Background"
-msgstr "书签背景"
-
-#: optiondialog.cc:356
-msgid "Bookmark Text"
-msgstr "书签文本"
-
-#: optiondialog.cc:357
-msgid "Separator"
-msgstr "分隔符"
-
-#: optiondialog.cc:358
-msgid "Grid Lines"
-msgstr "网格线"
-
-#: optiondialog.cc:376
-msgid "Font Selection (editor can only use a fixed font)"
-msgstr "字体选择(编辑器仅可使用固定宽度字体)"
-
-#: optiondialog.cc:381
-msgid "&Use system font (as chosen in Control Center)"
-msgstr "使用系统字体 (按控制中心的选择)(&U)"
-
-#: optiondialog.cc:398
-msgid "KHexEdit editor font"
-msgstr "KHexEdit 编辑器字体"
-
-#: optiondialog.cc:414
-msgid "&Map non printable characters to:"
-msgstr "绘制不可打印的字符为(&M)："
-
-#: optiondialog.cc:428
-msgid "File Management"
-msgstr "文件管理"
-
-#: optiondialog.cc:439
-msgid "Most Recent Document"
-msgstr "最近文档"
-
-#: optiondialog.cc:440
-msgid "All Recent Documents"
-msgstr "全部最近文档"
-
-#: optiondialog.cc:446
-msgid "Open doc&uments on startup:"
-msgstr "启动时打开文档(&U)："
-
-#: optiondialog.cc:452
-msgid "&Jump to previous cursor position on startup"
-msgstr "启动时转到上次光标位置(&J)"
-
-#: optiondialog.cc:466
-msgid "Open document with &write protection enabled"
-msgstr "打开文档时启用写保护(&W)"
-
-#: optiondialog.cc:472
-msgid "&Keep cursor position after reloading document"
-msgstr "重新载入文件后保持光标位置(&K)"
-
-#: optiondialog.cc:478
-msgid "&Make a backup when saving document"
-msgstr "保存文档时做备份(&M)"
-
-#: optiondialog.cc:488
-msgid "Don't &save \"Recent\" document list on exit"
-msgstr "在退出时不保存“最近文档”列表(&S)"
-
-#: optiondialog.cc:492
-msgid ""
-"Clicking this check box makes KHexEdit forget his recent document list when the "
-"program is closed.\n"
-"Note: it will not erase any document of the recent document list created by "
-"TDE."
-msgstr ""
-
-#: optiondialog.cc:499
-msgid "Cl&ear \"Recent\" Document List"
-msgstr "清除“最近文档”列表(&E)"
-
-#: optiondialog.cc:503
-msgid ""
-"Clicking this button makes KHexEdit forget his recent document list.\n"
-"Note: it will not erase any document of the recent document list created by "
-"TDE."
-msgstr ""
-
-#: optiondialog.cc:520
-msgid "Various Properties"
-msgstr "其它属性"
-
-#: optiondialog.cc:526
-msgid "Auto&matic copy to clipboard when selection is ready"
-msgstr "选择就绪后自动复制到剪贴板(&M)"
-
-#: optiondialog.cc:532
-msgid "&Editor starts in \"insert\" mode"
-msgstr "以“插入”模式启动编辑器(&E)"
-
-#: optiondialog.cc:538
-msgid "Confirm &wrapping (to beginning or end) during search"
-msgstr "寻找期间确认回绕(到开始或者结束)(&W)"
-
-#: optiondialog.cc:544
-msgid "Cursor jumps to &nearest byte when moved"
-msgstr "移动时光标跳转到最近的字节(&N)"
-
-#: optiondialog.cc:550
-msgid "Sounds"
-msgstr "声音"
-
-#: optiondialog.cc:553
-msgid "Make sound on data &input (eg. typing) failure"
-msgstr "数据输入错误时发出声音(&I)"
-
-#: optiondialog.cc:557
-msgid "Make sound on &fatal failure"
-msgstr "致命错误时发出声音(&F)"
-
-#: optiondialog.cc:562
-msgid "Bookmark Visibility"
-msgstr "书签可见性"
-
-#: optiondialog.cc:565
-msgid "Use visible bookmarks in the offset column"
-msgstr "在偏移列使用可见书签"
-
-#: optiondialog.cc:569
-msgid "Use visible bookmarks in the editor fields"
-msgstr "编辑字段使用可见书签"
-
-#: optiondialog.cc:574
-msgid "Confirm when number of printed pages will e&xceed limit"
-msgstr "打印页数超出限制时要求确认(&X)"
-
-#: optiondialog.cc:594
-msgid "&Threshold [pages]:"
-msgstr "阀值[页数](&T)："
-
-#: optiondialog.cc:611
-msgid "&Undo limit:"
-msgstr "撤消限制(&U)："
+#: hexmanagerwidget.cc:136
+msgid "Conversion"
+msgstr "转换"
 
 #~ msgid "&All"
 #~ msgstr "全部(&A)"
diff --git a/tde-i18n-zh_CN/messages/tdeutils/khexedit2part.po b/tde-i18n-zh_CN/messages/tdeutils/khexedit2part.po
index 2d6e51c82c0..7472b5e7e4a 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/khexedit2part.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/khexedit2part.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: khexedit2part\n"
-"POT-Creation-Date: 2005-01-17 01:37+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-08-04 04:09+0800\n"
 "Last-Translator: HuGang <hugangmail@eastday.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeutils/kjots.po b/tde-i18n-zh_CN/messages/tdeutils/kjots.po
index 69480e712a4..bd7a171a0dd 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/kjots.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/kjots.po
@@ -8,10 +8,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kjots\n"
-"POT-Creation-Date: 2007-05-02 02:16+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-08-04 04:36+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeutils/klaptopdaemon.po b/tde-i18n-zh_CN/messages/tdeutils/klaptopdaemon.po
index 8949bbd345b..3cb9d71434b 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/klaptopdaemon.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/klaptopdaemon.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klaptopdaemon\n"
-"POT-Creation-Date: 2008-02-03 01:21+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-08-04 04:08+0800\n"
 "Last-Translator: Li Zongliang <li-zongliang@21cn.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -344,18 +345,10 @@ msgstr "CPU 降速..."
 msgid "Standby..."
 msgstr "待机..."
 
-#: daemondock.cpp:109
-msgid "&Lock && Suspend..."
-msgstr "锁定并挂起(&L)..."
-
 #: daemondock.cpp:110
 msgid "&Suspend..."
 msgstr "挂起(&S)..."
 
-#: daemondock.cpp:111
-msgid "&Lock && Hibernate..."
-msgstr "锁定并休眠(&L)..."
-
 #: daemondock.cpp:112
 msgid "&Hibernate..."
 msgstr "休眠(&H)..."
@@ -542,5 +535,11 @@ msgid ""
 "Your emails"
 msgstr "li-zongliang@21cn.com"
 
+#~ msgid "&Lock && Suspend..."
+#~ msgstr "锁定并挂起(&L)..."
+
+#~ msgid "&Lock && Hibernate..."
+#~ msgstr "锁定并休眠(&L)..."
+
 #~ msgid " "
 #~ msgstr " "
diff --git a/tde-i18n-zh_CN/messages/tdeutils/kmilo_delli8k.po b/tde-i18n-zh_CN/messages/tdeutils/kmilo_delli8k.po
index 9e63651a017..a9c69bbdb1f 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/kmilo_delli8k.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/kmilo_delli8k.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmilo_delli8k\n"
-"POT-Creation-Date: 2004-11-24 01:19+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-08-04 04:24+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeutils/kmilo_generic.po b/tde-i18n-zh_CN/messages/tdeutils/kmilo_generic.po
index 2c9e8f46d81..f6d9494d0d3 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/kmilo_generic.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/kmilo_generic.po
@@ -5,30 +5,31 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmilo_generic\n"
-"POT-Creation-Date: 2008-02-07 01:30+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-07-12 09:51+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: generic_monitor.cpp:126 generic_monitor.cpp:166 generic_monitor.cpp:260
+#: generic_monitor.cpp:143 generic_monitor.cpp:183 generic_monitor.cpp:277
 msgid "Starting KMix..."
 msgstr "正在启动 KMix..."
 
-#: generic_monitor.cpp:139 generic_monitor.cpp:184 generic_monitor.cpp:282
+#: generic_monitor.cpp:156 generic_monitor.cpp:201 generic_monitor.cpp:299
 msgid "It seems that KMix is not running."
 msgstr "似乎 KMix 并未运行。"
 
-#: generic_monitor.cpp:226
+#: generic_monitor.cpp:243
 msgid "Volume"
 msgstr "音量"
 
-#: generic_monitor.cpp:299
+#: generic_monitor.cpp:316
 msgid "Mute on"
 msgstr "静音开"
 
-#: generic_monitor.cpp:301
+#: generic_monitor.cpp:318
 msgid "Mute off"
 msgstr "静音关"
diff --git a/tde-i18n-zh_CN/messages/tdeutils/kmilo_kvaio.po b/tde-i18n-zh_CN/messages/tdeutils/kmilo_kvaio.po
index 44947041cec..3de287c5d3a 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/kmilo_kvaio.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/kmilo_kvaio.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmilo_kvaio\n"
-"POT-Creation-Date: 2005-07-08 01:34+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-07-12 09:51+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeutils/kmilo_powerbook.po b/tde-i18n-zh_CN/messages/tdeutils/kmilo_powerbook.po
index cc1e28dcd08..3eca86718e3 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/kmilo_powerbook.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/kmilo_powerbook.po
@@ -1,10 +1,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmilo_powerbook\n"
-"POT-Creation-Date: 2005-11-30 03:22+0100\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-07-12 09:51+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeutils/kmilo_thinkpad.po b/tde-i18n-zh_CN/messages/tdeutils/kmilo_thinkpad.po
index cdc3af70493..6716446f6a7 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/kmilo_thinkpad.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/kmilo_thinkpad.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmilo_thinkpad\n"
-"POT-Creation-Date: 2005-06-14 01:28+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-08-04 04:29+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeutils/kmilod.po b/tde-i18n-zh_CN/messages/tdeutils/kmilod.po
index 42b64a31ccc..29e302a3435 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/kmilod.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/kmilod.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmilod\n"
-"POT-Creation-Date: 2005-09-29 02:39+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-07-12 09:51+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeutils/kregexpeditor.po b/tde-i18n-zh_CN/messages/tdeutils/kregexpeditor.po
index 0a3fe7de451..4e600787e83 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/kregexpeditor.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/kregexpeditor.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2005-08-18 04:29+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-01-16 03:04+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -180,11 +181,13 @@ msgid "The Carriage Return Character (\\r)"
 msgstr "回车字符(\\r)"
 
 #: charselector.cpp:68
-msgid "The Horizontal Tab Character (\\t)"
+#, fuzzy
+msgid "TheQt::Horizontal Tab Character (\\t)"
 msgstr "水平制表字符(\\t)"
 
 #: charselector.cpp:69
-msgid "The Vertical Tab Character (\\v)"
+#, fuzzy
+msgid "TheQt::Vertical Tab Character (\\v)"
 msgstr "垂直制表字符(\\v)"
 
 #: compoundwidget.cpp:46
@@ -360,7 +363,7 @@ msgstr "清除正则表达式"
 msgid ""
 "This is the regular expression in ASCII syntax. You are likely only to be "
 "interested in this if you are a programmer, and need to develop a regular "
-"expression using QRegExp."
+"expression using TQRegExp."
 "<p>You may develop your regular expression both by using the graphical editor, "
 "and by typing the regular expression in this line edit."
 msgstr ""
@@ -386,20 +389,20 @@ msgid "Editor for Regular Expressions"
 msgstr "正则表达式编辑器"
 
 #: predefined-regexps.cpp:1
-msgid "anything"
-msgstr "任意"
+msgid "spaces"
+msgstr "空格"
 
 #: predefined-regexps.cpp:2
-msgid "This regular expression matches anything."
-msgstr "此正则表达式匹配所有内容。"
+msgid "Matches an arbitrary amount of whitespace."
+msgstr ""
 
 #: predefined-regexps.cpp:3
-msgid "spaces"
-msgstr "空格"
+msgid "anything"
+msgstr "任意"
 
 #: predefined-regexps.cpp:4
-msgid "Matches an arbitrary amount of whitespace."
-msgstr ""
+msgid "This regular expression matches anything."
+msgstr "此正则表达式匹配所有内容。"
 
 #: regexpbuttons.cpp:66
 msgid "Selection tool"
diff --git a/tde-i18n-zh_CN/messages/tdeutils/ksim.po b/tde-i18n-zh_CN/messages/tdeutils/ksim.po
index e9fc638f440..bc44f465322 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/ksim.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/ksim.po
@@ -6,68 +6,16 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ksim\n"
-"POT-Creation-Date: 2007-05-28 02:15+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-08-04 04:06+0800\n"
 "Last-Translator: Li Zongliang <li-zongliang@21cn.com>\n"
 "Language-Team: Simplified Chinese <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: monitorprefs.cpp:35
-msgid "Monitor"
-msgstr "监视器"
-
-#: monitorprefs.cpp:36
-msgid "Description"
-msgstr "描述"
-
-#: monitorprefs.cpp:37
-msgid "LMB Command"
-msgstr "LMB 命令"
-
-#: library/chart.cpp:120 themeprefs.cpp:96
-msgid "None"
-msgstr "无标题"
-
-#: library/pluginloader.cpp:93
-msgid ""
-"KSim was unable to load the plugin %1 due to the X-KSIM-LIBRARY property being "
-"empty in the plugins desktop file"
-msgstr "KSim不能加载插件%1，因为插件的桌面文件中X-KSIM-LIBRARY属性为空"
-
-#: library/pluginloader.cpp:99
-msgid ""
-"KSim was unable to load the plugin %1 due to not being able to find the plugin, "
-"check that the plugin is installed and is in your $TDEDIR/lib path"
-msgstr "KSim不能加载插件%1，因为找不到插件。请检查插件是否已安装在$TDEDIR/lib目录中"
-
-#: library/pluginloader.cpp:105
-msgid ""
-"<qt>An error occurred while trying \n"
-"to load the plugin '%1'. \n"
-"This could be caused by the following:"
-"<ul>\n"
-"<li>The plugin doesn't have the %2 macro</li>\n"
-"<li>The plugin has been damaged or has some unresolved symbols</li>\n"
-"</ul> \n"
-"Last error message that occurred: \n"
-"%3</qt>"
-msgstr ""
-"<qt>试图加载插件“%1”时出错。 \n"
-"这可能由下列原因引起："
-"<ul>\n"
-"<li>插件没有宏 %2</li>\n"
-"<li>插件已损坏或包含了无法解释的符号</li>\n"
-"</ul>\n"
-"最后发生错误的信息：\n"
-"%3</qt>"
-
-#: library/pluginloader.cpp:315
-msgid "Unable to get last error message"
-msgstr "不能获取最后错误信息"
-
 #: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -80,113 +28,13 @@ msgid ""
 "Your emails"
 msgstr "li-zongliang@21cn.com"
 
-#: ksimsysinfo.cpp:197
-msgid "Current system time"
-msgstr "系统当前时间"
-
-#: ksimsysinfo.cpp:211
-msgid "Current system date"
-msgstr "系统当前日期"
-
-#: ksimsysinfo.cpp:227
-msgid "System uptime"
-msgstr "系统运行时间"
-
-#: ksimsysinfo.cpp:308
-msgid "Uptime display disabled"
-msgstr "运行时间显示关闭"
-
-#: ksimsysinfo.cpp:316
-msgid "Memory display disabled"
-msgstr "内存显示关闭"
-
-#: ksimsysinfo.cpp:324
-msgid "Swap display disabled"
-msgstr "交换区显示关闭"
-
-#: ksimpref.cpp:50 ksimpref.cpp:158
-msgid "Plugins"
-msgstr "插件"
-
-#: ksimpref.cpp:55
-msgid "Monitors"
-msgstr "监视器"
-
-#: ksimpref.cpp:56
-msgid "Monitors Installed"
-msgstr "已安装监视器"
-
-#: ksimpref.cpp:60 monitors/net/netdialog.cpp:123
-msgid "General"
-msgstr "常规"
-
-#: ksimpref.cpp:61
-msgid "General Options"
-msgstr "常规选项"
-
-#: ksimpref.cpp:66
-msgid "Clock"
-msgstr "时钟"
-
-#: ksimpref.cpp:67
-msgid "Clock Options"
-msgstr "时钟选项"
-
-#: ksimpref.cpp:72
-msgid "Uptime"
-msgstr "运行时间"
-
-#: ksimpref.cpp:73
-msgid "Uptime Options"
-msgstr "运行时间选项"
-
-#: ksimpref.cpp:78
-msgid "Memory"
-msgstr "内存"
-
-#: ksimpref.cpp:79
-msgid "Memory Options"
-msgstr "内存选项"
-
-#: ksimpref.cpp:84
-msgid "Swap"
-msgstr "交换区"
-
-#: ksimpref.cpp:85
-msgid "Swap Options"
-msgstr "交换区选项"
-
-#: ksimpref.cpp:89
-msgid "Themes"
-msgstr "主题"
-
-#: ksimpref.cpp:90
-msgid "Theme Selector"
-msgstr "主题选择器"
-
-#: ksimpref.cpp:124
-msgid ""
-"Failed to remove %1's config page due to the plugin not being loaded or the "
-"config page has not been created"
-msgstr "删除%1的配置页面时出错，因为插件没有加载或者配置页面没有创建。"
-
-#: ksimpref.cpp:149
-msgid ""
-"Failed to add %1's config page due to the plugin not being loaded or the config "
-"page has not been created"
-msgstr "添加%1的配置页面失败，因为插件没有加载或者配置页面没有创建。"
-
-#: ksimpref.cpp:159
-msgid "%1 Options"
-msgstr "%1选项"
-
-#: monitors/cpu/ksimcpu.cpp:100
-msgid "KSim CPU Plugin"
-msgstr "KSim CPU插件"
+#: monitors/disk/ksimdisk.cpp:96
+msgid "KSim Disk Plugin"
+msgstr "KSim 磁盘插件"
 
-#: monitors/cpu/ksimcpu.cpp:101
-msgid "A cpu monitor plugin for KSim"
-msgstr "KSim CPU监视器插件"
+#: monitors/disk/ksimdisk.cpp:97
+msgid "A disk monitor plugin for KSim"
+msgstr "KSim 的磁盘监视器插件"
 
 #: monitors/cpu/ksimcpu.cpp:104 monitors/disk/ksimdisk.cpp:100
 #: monitors/filesystem/ksimfsystem.cpp:74 monitors/i8k/ksimi8k.cpp:69
@@ -195,103 +43,99 @@ msgstr "KSim CPU监视器插件"
 msgid "Author"
 msgstr "作者"
 
-#: monitors/cpu/ksimcpu.cpp:204
-msgid "%1%"
-msgstr "%1%"
-
-#: monitors/cpu/ksimcpu.cpp:371
-msgid "Available CPUs"
-msgstr "可用CPU"
-
-#: monitors/cpu/ksimcpu.cpp:372
-msgid "Chart Format"
-msgstr "图表格式"
+#: monitors/disk/ksimdisk.cpp:171 monitors/disk/ksimdisk.cpp:194
+#: monitors/disk/ksimdisk.cpp:529 monitors/disk/ksimdisk.cpp:539
+msgid "All Disks"
+msgstr "所有磁盘"
 
-#: monitors/cpu/ksimcpu.cpp:388 monitors/lm_sensors/sensorsconfig.cpp:80
-#: monitors/net/netconfig.cpp:72
-msgid "Modify..."
-msgstr "修改..."
+#: monitors/disk/ksimdisk.cpp:218 monitors/net/ksimnet.cpp:397
+#: monitors/net/ksimnet.cpp:405
+msgid "in: %1k"
+msgstr "入：%1k"
 
-#: monitors/cpu/ksimcpu.cpp:395
-msgid "Chart Legend"
-msgstr "图表图例"
+#: monitors/disk/ksimdisk.cpp:220 monitors/net/ksimnet.cpp:398
+#: monitors/net/ksimnet.cpp:406
+msgid "out: %1k"
+msgstr "出：%1k"
 
-#: monitors/cpu/ksimcpu.cpp:404
-msgid "%T - Total CPU time (sys + user + nice)"
-msgstr "%T - 全部CPU时间(系统 + 用户 + nice)"
+#: monitors/disk/ksimdisk.cpp:224
+msgid "%1k"
+msgstr "%1k"
 
-#: monitors/cpu/ksimcpu.cpp:407
-msgid "%t - Total CPU time (sys + user)"
-msgstr "%t - 全部CPU时间(系统 + 用户)"
+#: monitors/disk/ksimdisk.cpp:482
+msgid "Disks"
+msgstr "磁盘"
 
-#: monitors/cpu/ksimcpu.cpp:410
-#, c-format
-msgid "%s - Total sys time"
-msgstr "%s - 全部系统时间"
+#: monitors/disk/ksimdisk.cpp:493 monitors/net/netconfig.cpp:67
+msgid "Add..."
+msgstr "添加..."
 
-#: monitors/cpu/ksimcpu.cpp:413
-#, c-format
-msgid "%u - Total user time"
-msgstr "%u - 全部用户时间"
+#: monitors/disk/ksimdisk.cpp:503
+msgid "Disk Styles"
+msgstr "磁盘类型"
 
-#: monitors/cpu/ksimcpu.cpp:416
-#, c-format
-msgid "%n - Total nice time"
-msgstr "%n - 全部nice时间"
+#: monitors/disk/ksimdisk.cpp:507
+msgid "Display the read and write data as one"
+msgstr "将读和写的数据显示为一个数"
 
-#: monitors/cpu/ksimcpu.cpp:423
-#, c-format
-msgid "cpu %1"
-msgstr "CPU：%1"
+#: monitors/disk/ksimdisk.cpp:509
+msgid ""
+"Display the read and write data\n"
+"separately as in/out data"
+msgstr "将读和写的数据分开显示为入/出数据"
 
-#: monitors/cpu/ksimcpu.cpp:504
-msgid "Modify CPU Format"
-msgstr "修改 CPU 格式"
+#: monitors/disk/ksimdisk.cpp:553
+msgid "Add Disk Device"
+msgstr "添加磁盘设备"
 
-#: monitors/cpu/ksimcpu.cpp:504
-msgid "Chart format:"
-msgstr "图表格式："
+#: monitors/disk/ksimdisk.cpp:553
+msgid "Disk name:"
+msgstr "磁盘名称："
 
-#: monitors/i8k/ksimi8k.cpp:65
-msgid "KSim I8K Plugin"
-msgstr "KSim I8K插件"
+#: monitors/mail/ksimmail.cpp:61
+msgid "KSim Mail Plugin"
+msgstr "KSim邮件插件"
 
-#: monitors/i8k/ksimi8k.cpp:66
-msgid "Dell I8K Hardware Monitor plugin"
-msgstr "Dell I8K 硬件监视器插件"
+#: monitors/mail/ksimmail.cpp:62
+msgid "A mail monitor plugin for KSim"
+msgstr "KSim的邮件监视插件"
 
-#: monitors/i8k/ksimi8k.cpp:198
-msgid "Right fan: %1 RPM"
-msgstr "右侧风扇：%1 转/分"
+#: monitors/snmp/proberesultdialog.cpp:33
+msgid "Results of scanning host %1:"
+msgstr "扫描主机 %1 的结果："
 
-#: monitors/i8k/ksimi8k.cpp:200
-msgid "Right fan: Off"
-msgstr "右侧风扇：关"
+#: monitors/snmp/configpage.cpp:159
+#, c-format
+msgid ""
+"_n: This host has the following monitor associated. Do you really want to "
+"delete this host entry?\n"
+"This host has the following %n monitors associated. Do you really want to "
+"delete this host entry?"
+msgstr "此主机有与其关联的以下 %n 个监视器。您真的想要删除此主机项吗？"
 
-#: monitors/i8k/ksimi8k.cpp:203
-msgid "Left fan: %1 RPM"
-msgstr "左侧风扇：%1 转/分"
+#: monitors/snmp/configpage.cpp:162
+msgid "Delete Host Entry"
+msgstr "删除主机项"
 
-#: monitors/i8k/ksimi8k.cpp:205
-msgid "Left fan: Off"
-msgstr "左侧风扇：关"
+#: monitors/snmp/monitordialog.cpp:92
+msgid "Please enter a name for this monitor"
+msgstr "请输入此监视器的名称"
 
-#: monitors/i8k/ksimi8k.cpp:207
-msgid "CPU temp: %1°%2"
-msgstr "CPU 温度：%1°%2"
+#: monitors/snmp/monitordialog.cpp:95
+msgid "Please enter a valid name for the object identifier"
+msgstr "请输入对象标识符的有效名称"
 
-#: monitors/i8k/ksimi8k.cpp:214
-msgid "Show temperature in Fahrenheit"
-msgstr "以华氏显示温度"
+#: monitors/snmp/probedialog.cpp:42
+msgid "SNMP Host Probe"
+msgstr "SNMP 主机探测"
 
-#: monitors/filesystem/fsystemconfig.cpp:73 monitors/i8k/ksimi8k.cpp:216
-#: monitors/lm_sensors/sensorsconfig.cpp:88
-msgid "Update interval:"
-msgstr "更新间隔："
+#: monitors/snmp/probedialog.cpp:45
+msgid "Probing for common object identifiers..."
+msgstr "正在探测公共对象标识符..."
 
-#: monitors/i8k/ksimi8k.cpp:219
-msgid " sec"
-msgstr " 秒"
+#: monitors/snmp/browsedialog.cpp:35
+msgid "&Stop"
+msgstr "停止(&S)"
 
 #: monitors/net/ksimnet.cpp:90
 msgid "KSim Net Plugin"
@@ -305,16 +149,6 @@ msgstr "KSim 的网络插件"
 msgid "FreeBSD ports"
 msgstr "FreeBSD 移植"
 
-#: monitors/disk/ksimdisk.cpp:218 monitors/net/ksimnet.cpp:397
-#: monitors/net/ksimnet.cpp:405
-msgid "in: %1k"
-msgstr "入：%1k"
-
-#: monitors/disk/ksimdisk.cpp:220 monitors/net/ksimnet.cpp:398
-#: monitors/net/ksimnet.cpp:406
-msgid "out: %1k"
-msgstr "出：%1k"
-
 #: monitors/net/ksimnet.cpp:409
 msgid "offline"
 msgstr "未连线"
@@ -347,9 +181,10 @@ msgstr "时间"
 msgid "Commands"
 msgstr "命令"
 
-#: monitors/disk/ksimdisk.cpp:493 monitors/net/netconfig.cpp:67
-msgid "Add..."
-msgstr "添加..."
+#: monitors/cpu/ksimcpu.cpp:388 monitors/lm_sensors/sensorsconfig.cpp:80
+#: monitors/net/netconfig.cpp:72
+msgid "Modify..."
+msgstr "修改..."
 
 #: monitors/net/netconfig.cpp:146 monitors/net/netconfig.cpp:151
 msgid "&Add Net Device"
@@ -405,6 +240,10 @@ msgstr "mm - 联机时间分钟数"
 msgid "ss - Total seconds online"
 msgstr "ss - 联机时间秒数"
 
+#: ksimpref.cpp:61 monitors/net/netdialog.cpp:123
+msgid "General"
+msgstr "常规"
+
 #: monitors/net/netdialog.cpp:131
 msgid "Enable connect/disconnect"
 msgstr "允许连接/断开连接"
@@ -417,94 +256,6 @@ msgstr "连接命令："
 msgid "Disconnect command:"
 msgstr "断开连接命令："
 
-#: monitors/disk/ksimdisk.cpp:96
-msgid "KSim Disk Plugin"
-msgstr "KSim 磁盘插件"
-
-#: monitors/disk/ksimdisk.cpp:97
-msgid "A disk monitor plugin for KSim"
-msgstr "KSim 的磁盘监视器插件"
-
-#: monitors/disk/ksimdisk.cpp:171 monitors/disk/ksimdisk.cpp:194
-#: monitors/disk/ksimdisk.cpp:529 monitors/disk/ksimdisk.cpp:539
-msgid "All Disks"
-msgstr "所有磁盘"
-
-#: monitors/disk/ksimdisk.cpp:224
-msgid "%1k"
-msgstr "%1k"
-
-#: monitors/disk/ksimdisk.cpp:482
-msgid "Disks"
-msgstr "磁盘"
-
-#: monitors/disk/ksimdisk.cpp:503
-msgid "Disk Styles"
-msgstr "磁盘类型"
-
-#: monitors/disk/ksimdisk.cpp:507
-msgid "Display the read and write data as one"
-msgstr "将读和写的数据显示为一个数"
-
-#: monitors/disk/ksimdisk.cpp:509
-msgid ""
-"Display the read and write data\n"
-"separately as in/out data"
-msgstr "将读和写的数据分开显示为入/出数据"
-
-#: monitors/disk/ksimdisk.cpp:553
-msgid "Add Disk Device"
-msgstr "添加磁盘设备"
-
-#: monitors/disk/ksimdisk.cpp:553
-msgid "Disk name:"
-msgstr "磁盘名称："
-
-#: monitors/mail/ksimmail.cpp:61
-msgid "KSim Mail Plugin"
-msgstr "KSim邮件插件"
-
-#: monitors/mail/ksimmail.cpp:62
-msgid "A mail monitor plugin for KSim"
-msgstr "KSim的邮件监视插件"
-
-#: monitors/snmp/proberesultdialog.cpp:33
-msgid "Results of scanning host %1:"
-msgstr "扫描主机 %1 的结果："
-
-#: monitors/snmp/probedialog.cpp:42
-msgid "SNMP Host Probe"
-msgstr "SNMP 主机探测"
-
-#: monitors/snmp/probedialog.cpp:45
-msgid "Probing for common object identifiers..."
-msgstr "正在探测公共对象标识符..."
-
-#: monitors/snmp/monitordialog.cpp:92
-msgid "Please enter a name for this monitor"
-msgstr "请输入此监视器的名称"
-
-#: monitors/snmp/monitordialog.cpp:95
-msgid "Please enter a valid name for the object identifier"
-msgstr "请输入对象标识符的有效名称"
-
-#: monitors/snmp/configpage.cpp:159
-#, c-format
-msgid ""
-"_n: This host has the following monitor associated. Do you really want to "
-"delete this host entry?\n"
-"This host has the following %n monitors associated. Do you really want to "
-"delete this host entry?"
-msgstr "此主机有与其关联的以下 %n 个监视器。您真的想要删除此主机项吗？"
-
-#: monitors/snmp/configpage.cpp:162
-msgid "Delete Host Entry"
-msgstr "删除主机项"
-
-#: monitors/snmp/browsedialog.cpp:35
-msgid "&Stop"
-msgstr "停止(&S)"
-
 #: monitors/lm_sensors/sensorsconfig.cpp:62
 msgid "No."
 msgstr "编号"
@@ -525,6 +276,11 @@ msgstr "值"
 msgid "Display Fahrenheit"
 msgstr "显示华氏温度"
 
+#: monitors/filesystem/fsystemconfig.cpp:73 monitors/i8k/ksimi8k.cpp:216
+#: monitors/lm_sensors/sensorsconfig.cpp:88
+msgid "Update interval:"
+msgstr "更新间隔："
+
 #: monitors/filesystem/fsystemconfig.cpp:84
 #: monitors/lm_sensors/sensorsconfig.cpp:97
 msgid "seconds"
@@ -571,6 +327,126 @@ msgid ""
 "V"
 msgstr "付"
 
+#: monitors/cpu/ksimcpu.cpp:100
+msgid "KSim CPU Plugin"
+msgstr "KSim CPU插件"
+
+#: monitors/cpu/ksimcpu.cpp:101
+msgid "A cpu monitor plugin for KSim"
+msgstr "KSim CPU监视器插件"
+
+#: monitors/cpu/ksimcpu.cpp:204
+msgid "%1%"
+msgstr "%1%"
+
+#: monitors/cpu/ksimcpu.cpp:371
+msgid "Available CPUs"
+msgstr "可用CPU"
+
+#: monitors/cpu/ksimcpu.cpp:372
+msgid "Chart Format"
+msgstr "图表格式"
+
+#: monitors/cpu/ksimcpu.cpp:395
+msgid "Chart Legend"
+msgstr "图表图例"
+
+#: monitors/cpu/ksimcpu.cpp:404
+msgid "%T - Total CPU time (sys + user + nice)"
+msgstr "%T - 全部CPU时间(系统 + 用户 + nice)"
+
+#: monitors/cpu/ksimcpu.cpp:407
+msgid "%t - Total CPU time (sys + user)"
+msgstr "%t - 全部CPU时间(系统 + 用户)"
+
+#: monitors/cpu/ksimcpu.cpp:410
+#, c-format
+msgid "%s - Total sys time"
+msgstr "%s - 全部系统时间"
+
+#: monitors/cpu/ksimcpu.cpp:413
+#, c-format
+msgid "%u - Total user time"
+msgstr "%u - 全部用户时间"
+
+#: monitors/cpu/ksimcpu.cpp:416
+#, c-format
+msgid "%n - Total nice time"
+msgstr "%n - 全部nice时间"
+
+#: monitors/cpu/ksimcpu.cpp:423
+#, c-format
+msgid "cpu %1"
+msgstr "CPU：%1"
+
+#: monitors/cpu/ksimcpu.cpp:504
+msgid "Modify CPU Format"
+msgstr "修改 CPU 格式"
+
+#: monitors/cpu/ksimcpu.cpp:504
+msgid "Chart format:"
+msgstr "图表格式："
+
+#: monitors/i8k/ksimi8k.cpp:65
+msgid "KSim I8K Plugin"
+msgstr "KSim I8K插件"
+
+#: monitors/i8k/ksimi8k.cpp:66
+msgid "Dell I8K Hardware Monitor plugin"
+msgstr "Dell I8K 硬件监视器插件"
+
+#: monitors/i8k/ksimi8k.cpp:198
+msgid "Right fan: %1 RPM"
+msgstr "右侧风扇：%1 转/分"
+
+#: monitors/i8k/ksimi8k.cpp:200
+msgid "Right fan: Off"
+msgstr "右侧风扇：关"
+
+#: monitors/i8k/ksimi8k.cpp:203
+msgid "Left fan: %1 RPM"
+msgstr "左侧风扇：%1 转/分"
+
+#: monitors/i8k/ksimi8k.cpp:205
+msgid "Left fan: Off"
+msgstr "左侧风扇：关"
+
+#: monitors/i8k/ksimi8k.cpp:207
+msgid "CPU temp: %1°%2"
+msgstr "CPU 温度：%1°%2"
+
+#: monitors/i8k/ksimi8k.cpp:214
+msgid "Show temperature in Fahrenheit"
+msgstr "以华氏显示温度"
+
+#: monitors/i8k/ksimi8k.cpp:219
+msgid " sec"
+msgstr " 秒"
+
+#: monitors/filesystem/filesystemwidget.cpp:187
+msgid "<qt>The following errors occurred:<ul>"
+msgstr "<qt>发生下面错误：<ul>"
+
+#: monitors/filesystem/filesystemwidget.cpp:219
+msgid "&Mount Device"
+msgstr "挂载设备(&M)"
+
+#: monitors/filesystem/filesystemwidget.cpp:220
+msgid "&Unmount Device"
+msgstr "卸载设备(&U)"
+
+#: monitors/filesystem/ksimfsystem.cpp:70
+msgid "KSim FileSystem Plugin"
+msgstr "KSim 文件系统插件"
+
+#: monitors/filesystem/ksimfsystem.cpp:71
+msgid "A filesystem plugin for KSim"
+msgstr "KSim 的文件系统插件"
+
+#: monitors/filesystem/ksimfsystem.cpp:76
+msgid "Some Fixes"
+msgstr "一些修补"
+
 #: monitors/filesystem/fsystemconfig.cpp:56
 msgid "Mounted Partition"
 msgstr "已挂载分区"
@@ -601,29 +477,113 @@ msgstr "该选项缩短显示挂载点名称的文字，例如：挂载点/home/
 msgid "0 means no update"
 msgstr "0 表示不更新"
 
-#: monitors/filesystem/ksimfsystem.cpp:70
-msgid "KSim FileSystem Plugin"
-msgstr "KSim 文件系统插件"
+#: ksim.cpp:59
+msgid "KSim"
+msgstr "KSim"
 
-#: monitors/filesystem/ksimfsystem.cpp:71
-msgid "A filesystem plugin for KSim"
-msgstr "KSim 的文件系统插件"
+#: ksim.cpp:60
+msgid "A plugin based system monitor for TDE"
+msgstr "TDE 中基于插件的系统监视器"
 
-#: monitors/filesystem/ksimfsystem.cpp:76
-msgid "Some Fixes"
-msgstr "一些修补"
+#: ksim.cpp:61
+msgid ""
+"(C) 2001-2003 Robbie Ward\n"
+"(C) 2005 Reuben Sutton"
+msgstr ""
+"(C) 2001-2003 Robbie Ward\n"
+"(C) 2005 Reuben Sutton"
 
-#: monitors/filesystem/filesystemwidget.cpp:187
-msgid "<qt>The following errors occurred:<ul>"
-msgstr "<qt>发生下面错误：<ul>"
+#: ksim.cpp:62
+msgid "Maintainer"
+msgstr "维护者"
 
-#: monitors/filesystem/filesystemwidget.cpp:219
-msgid "&Mount Device"
-msgstr "挂载设备(&M)"
+#: ksim.cpp:63
+msgid "Original Author"
+msgstr "原作者"
 
-#: monitors/filesystem/filesystemwidget.cpp:220
-msgid "&Unmount Device"
-msgstr "卸载设备(&U)"
+#: ksim.cpp:65
+msgid "Developer"
+msgstr "开发人员"
+
+#: ksim.cpp:67
+msgid "Some FreeBSD ports"
+msgstr "部分 FreeBSD 移植包"
+
+#: ksim.cpp:69
+msgid "Testing, Bug fixing and some help"
+msgstr "测试，改错和帮助"
+
+#: ksimpref.cpp:51 ksimpref.cpp:159
+msgid "Plugins"
+msgstr "插件"
+
+#: ksimpref.cpp:56
+msgid "Monitors"
+msgstr "监视器"
+
+#: ksimpref.cpp:57
+msgid "Monitors Installed"
+msgstr "已安装监视器"
+
+#: ksimpref.cpp:62
+msgid "General Options"
+msgstr "常规选项"
+
+#: ksimpref.cpp:67
+msgid "Clock"
+msgstr "时钟"
+
+#: ksimpref.cpp:68
+msgid "Clock Options"
+msgstr "时钟选项"
+
+#: ksimpref.cpp:73
+msgid "Uptime"
+msgstr "运行时间"
+
+#: ksimpref.cpp:74
+msgid "Uptime Options"
+msgstr "运行时间选项"
+
+#: ksimpref.cpp:79
+msgid "Memory"
+msgstr "内存"
+
+#: ksimpref.cpp:80
+msgid "Memory Options"
+msgstr "内存选项"
+
+#: ksimpref.cpp:85
+msgid "Swap"
+msgstr "交换区"
+
+#: ksimpref.cpp:86
+msgid "Swap Options"
+msgstr "交换区选项"
+
+#: ksimpref.cpp:90
+msgid "Themes"
+msgstr "主题"
+
+#: ksimpref.cpp:91
+msgid "Theme Selector"
+msgstr "主题选择器"
+
+#: ksimpref.cpp:125
+msgid ""
+"Failed to remove %1's config page due to the plugin not being loaded or the "
+"config page has not been created"
+msgstr "删除%1的配置页面时出错，因为插件没有加载或者配置页面没有创建。"
+
+#: ksimpref.cpp:150
+msgid ""
+"Failed to add %1's config page due to the plugin not being loaded or the config "
+"page has not been created"
+msgstr "添加%1的配置页面失败，因为插件没有加载或者配置页面没有创建。"
+
+#: ksimpref.cpp:160
+msgid "%1 Options"
+msgstr "%1选项"
 
 #: themeprefs.cpp:68
 msgid ""
@@ -639,6 +599,10 @@ msgstr "在 KSim 主题文件夹中打开 Konqueror"
 msgid "Author:"
 msgstr "作者："
 
+#: library/chart.cpp:120 themeprefs.cpp:96
+msgid "None"
+msgstr "无标题"
+
 #: themeprefs.cpp:100
 msgid "Theme"
 msgstr "主题"
@@ -675,51 +639,78 @@ msgstr "未指定"
 msgid "None specified"
 msgstr "未指定"
 
-#: ksimview.cpp:119
-msgid "Unknown"
-msgstr "未知"
+#: monitorprefs.cpp:35
+msgid "Monitor"
+msgstr "监视器"
 
-#: ksimview.cpp:198
-msgid ""
-"There was an error while trying to create the local folders. This could be "
-"caused by permission problems."
-msgstr "试图创建本地文件夹时出错。这可能是权限问题引起的。"
+#: monitorprefs.cpp:36
+msgid "Description"
+msgstr "描述"
 
-#: ksim.cpp:58
-msgid "KSim"
-msgstr "KSim"
+#: monitorprefs.cpp:37
+msgid "LMB Command"
+msgstr "LMB 命令"
 
-#: ksim.cpp:59
-msgid "A plugin based system monitor for TDE"
-msgstr "TDE 中基于插件的系统监视器"
+#: ksimsysinfo.cpp:197
+msgid "Current system time"
+msgstr "系统当前时间"
 
-#: ksim.cpp:60
-msgid ""
-"(C) 2001-2003 Robbie Ward\n"
-"(C) 2005 Reuben Sutton"
-msgstr ""
-"(C) 2001-2003 Robbie Ward\n"
-"(C) 2005 Reuben Sutton"
+#: ksimsysinfo.cpp:211
+msgid "Current system date"
+msgstr "系统当前日期"
 
-#: ksim.cpp:61
-msgid "Maintainer"
-msgstr "维护者"
+#: ksimsysinfo.cpp:227
+msgid "System uptime"
+msgstr "系统运行时间"
 
-#: ksim.cpp:62
-msgid "Original Author"
-msgstr "原作者"
+#: ksimsysinfo.cpp:308
+msgid "Uptime display disabled"
+msgstr "运行时间显示关闭"
 
-#: ksim.cpp:64
-msgid "Developer"
-msgstr "开发人员"
+#: ksimsysinfo.cpp:316
+msgid "Memory display disabled"
+msgstr "内存显示关闭"
 
-#: ksim.cpp:66
-msgid "Some FreeBSD ports"
-msgstr "部分 FreeBSD 移植包"
+#: ksimsysinfo.cpp:324
+msgid "Swap display disabled"
+msgstr "交换区显示关闭"
 
-#: ksim.cpp:68
-msgid "Testing, Bug fixing and some help"
-msgstr "测试，改错和帮助"
+#: library/pluginloader.cpp:93
+msgid ""
+"KSim was unable to load the plugin %1 due to the X-KSIM-LIBRARY property being "
+"empty in the plugins desktop file"
+msgstr "KSim不能加载插件%1，因为插件的桌面文件中X-KSIM-LIBRARY属性为空"
+
+#: library/pluginloader.cpp:99
+msgid ""
+"KSim was unable to load the plugin %1 due to not being able to find the plugin, "
+"check that the plugin is installed and is in your $TDEDIR/lib path"
+msgstr "KSim不能加载插件%1，因为找不到插件。请检查插件是否已安装在$TDEDIR/lib目录中"
+
+#: library/pluginloader.cpp:105
+msgid ""
+"<qt>An error occurred while trying \n"
+"to load the plugin '%1'. \n"
+"This could be caused by the following:"
+"<ul>\n"
+"<li>The plugin doesn't have the %2 macro</li>\n"
+"<li>The plugin has been damaged or has some unresolved symbols</li>\n"
+"</ul> \n"
+"Last error message that occurred: \n"
+"%3</qt>"
+msgstr ""
+"<qt>试图加载插件“%1”时出错。 \n"
+"这可能由下列原因引起："
+"<ul>\n"
+"<li>插件没有宏 %2</li>\n"
+"<li>插件已损坏或包含了无法解释的符号</li>\n"
+"</ul>\n"
+"最后发生错误的信息：\n"
+"%3</qt>"
+
+#: library/pluginloader.cpp:315
+msgid "Unable to get last error message"
+msgstr "不能获取最后错误信息"
 
 #: generalprefs.cpp:50
 msgid "Graph Size"
@@ -903,3 +894,13 @@ msgstr "%f - 空闲交换区总量"
 #, c-format
 msgid "%u - Total used swap"
 msgstr "%u - 已用交换区总量"
+
+#: ksimview.cpp:119
+msgid "Unknown"
+msgstr "未知"
+
+#: ksimview.cpp:198
+msgid ""
+"There was an error while trying to create the local folders. This could be "
+"caused by permission problems."
+msgstr "试图创建本地文件夹时出错。这可能是权限问题引起的。"
diff --git a/tde-i18n-zh_CN/messages/tdeutils/ktimer.po b/tde-i18n-zh_CN/messages/tdeutils/ktimer.po
index 8f28d833246..d2c96b652f6 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/ktimer.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/ktimer.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ktimer\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2001-09-14 21:47+0800\n"
 "Last-Translator: Qi Liang <cavendish@eyou.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -53,7 +54,7 @@ msgid "Delay [s]"
 msgstr "延迟 [秒]"
 
 #. i18n: file prefwidget.ui line 53
-#: rc.cpp:12 rc.cpp:42
+#: rc.cpp:12 rc.cpp:45
 #, no-c-format
 msgid "State"
 msgstr "状态"
@@ -70,56 +71,56 @@ msgstr "命令"
 msgid "&New"
 msgstr "新建(&N)"
 
-#. i18n: file prefwidget.ui line 124
-#: rc.cpp:24
+#. i18n: file prefwidget.ui line 132
+#: rc.cpp:27
 #, no-c-format
 msgid "Settings"
 msgstr "设置"
 
-#. i18n: file prefwidget.ui line 141
-#: rc.cpp:27
+#. i18n: file prefwidget.ui line 149
+#: rc.cpp:30
 #, no-c-format
 msgid "&Loop"
 msgstr "循环(&L)"
 
-#. i18n: file prefwidget.ui line 149
-#: rc.cpp:30
+#. i18n: file prefwidget.ui line 157
+#: rc.cpp:33
 #, no-c-format
 msgid "Delay:"
 msgstr "延迟："
 
-#. i18n: file prefwidget.ui line 165
-#: rc.cpp:33
+#. i18n: file prefwidget.ui line 173
+#: rc.cpp:36
 #, no-c-format
 msgid "Start only &one instance"
 msgstr "仅运行一个实例(&O)"
 
-#. i18n: file prefwidget.ui line 173
-#: rc.cpp:36
+#. i18n: file prefwidget.ui line 181
+#: rc.cpp:39
 #, no-c-format
 msgid "seconds"
 msgstr "秒"
 
-#. i18n: file prefwidget.ui line 203
-#: rc.cpp:39
+#. i18n: file prefwidget.ui line 211
+#: rc.cpp:42
 #, no-c-format
 msgid "Command line:"
 msgstr "命令行："
 
-#. i18n: file prefwidget.ui line 246
-#: rc.cpp:45
+#. i18n: file prefwidget.ui line 254
+#: rc.cpp:48
 #, no-c-format
 msgid "||"
 msgstr "||"
 
-#. i18n: file prefwidget.ui line 254
-#: rc.cpp:48
+#. i18n: file prefwidget.ui line 262
+#: rc.cpp:51
 #, no-c-format
 msgid ">"
 msgstr ">"
 
-#. i18n: file prefwidget.ui line 262
-#: rc.cpp:51
+#. i18n: file prefwidget.ui line 270
+#: rc.cpp:54
 #, no-c-format
 msgid "="
 msgstr "="
diff --git a/tde-i18n-zh_CN/messages/tdeutils/superkaramba.po b/tde-i18n-zh_CN/messages/tdeutils/superkaramba.po
index 4f4ff1e88b5..bc189a7cba4 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/superkaramba.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/superkaramba.po
@@ -4,10 +4,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: superkaramba\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-10-20 08:22+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeutils/tdelirc.po b/tde-i18n-zh_CN/messages/tdeutils/tdelirc.po
index c8243203ebd..5d036c485bc 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/tdelirc.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/tdelirc.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdelirc\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2003-11-26 07:40+0000\n"
 "Last-Translator: iceco <rainflymoon@163.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeutils/tdessh.po b/tde-i18n-zh_CN/messages/tdeutils/tdessh.po
index 9be1923d97e..f68e0e2280b 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/tdessh.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/tdessh.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdessh\n"
-"POT-Creation-Date: 2004-10-12 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2004-01-09 12:54+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.marsec.net>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/tde-i18n-zh_CN/messages/tdeutils/tdewalletmanager.po b/tde-i18n-zh_CN/messages/tdeutils/tdewalletmanager.po
index e4108cc88ae..b9d6c851978 100644
--- a/tde-i18n-zh_CN/messages/tdeutils/tdewalletmanager.po
+++ b/tde-i18n-zh_CN/messages/tdeutils/tdewalletmanager.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdewalletmanager 3.2\n"
-"POT-Creation-Date: 2008-07-08 01:20+0200\n"
+"POT-Creation-Date: 2014-09-29 00:49-0500\n"
 "PO-Revision-Date: 2005-08-04 04:05+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -55,6 +56,94 @@ msgstr "试图删除原始文件夹时发生了意外错误，但文件夹已经
 msgid "That wallet file already exists.  You cannot overwrite wallets."
 msgstr "钱包文件已经存在。您不能覆盖钱包。"
 
+#: kwmapeditor.cpp:43
+msgid "Key"
+msgstr "键"
+
+#: kwmapeditor.cpp:44
+msgid "Value"
+msgstr "值"
+
+#: kwmapeditor.cpp:121
+msgid "&New Entry"
+msgstr "新建项(&N)"
+
+#: main.cpp:45
+msgid "Show window on startup"
+msgstr "启动时显示窗口"
+
+#: main.cpp:46
+msgid "For use by tdewalletd only"
+msgstr "仅由 tdewalletd 使用"
+
+#: main.cpp:47
+msgid "A wallet name"
+msgstr "钱包名称"
+
+#: main.cpp:51 main.cpp:70
+msgid "TDE Wallet Manager"
+msgstr "TDE 钱包管理器"
+
+#: main.cpp:52
+msgid "TDE Wallet Management Tool"
+msgstr "TDE 钱包管理工具"
+
+#: main.cpp:54
+msgid "(c) 2003,2004 George Staikos"
+msgstr "(c) 2003,2004 George Staikos"
+
+#: main.cpp:57
+msgid "Primary author and maintainer"
+msgstr "主要的作者和维护者"
+
+#: main.cpp:58
+msgid "Developer"
+msgstr "开发者"
+
+#. i18n: file kbetterthankdialogbase.ui line 60
+#: rc.cpp:18
+#, no-c-format
+msgid "&Replace"
+msgstr "替换(&R)"
+
+#. i18n: file kbetterthankdialogbase.ui line 71
+#: rc.cpp:21
+#, no-c-format
+msgid "Replace &All"
+msgstr "全部替换(&A)"
+
+#. i18n: file kbetterthankdialogbase.ui line 79
+#: rc.cpp:24
+#, no-c-format
+msgid "&Skip"
+msgstr "跳过(&S)"
+
+#. i18n: file kbetterthankdialogbase.ui line 87
+#: rc.cpp:27
+#, no-c-format
+msgid "Skip A&ll"
+msgstr "全部跳过(&L)"
+
+#. i18n: file walletwidget.ui line 237
+#: rc.cpp:36
+#, no-c-format
+msgid "Hide &Contents"
+msgstr "隐藏目录(&C)"
+
+#. i18n: file walletwidget.ui line 269
+#: rc.cpp:39
+#, no-c-format
+msgid ""
+"This is a binary data entry.  It cannot be editted as its format is unknown and "
+"application specific."
+msgstr "这是二进制项。无法进行编辑，原因是格式未知，也没有指定应用程序。"
+
+#. i18n: file walletwidget.ui line 398
+#: rc.cpp:42
+#, no-c-format
+msgid "Show &Contents"
+msgstr "显示目录(&C)"
+
 #: tdewalleteditor.cpp:81
 msgid "&Show values"
 msgstr "显示值(&S)"
@@ -303,91 +392,3 @@ msgstr "请选择只包含英文字母的名称："
 #: tdewalletpopup.cpp:60
 msgid "Disconnec&t"
 msgstr "断开(&T)"
-
-#: kwmapeditor.cpp:43
-msgid "Key"
-msgstr "键"
-
-#: kwmapeditor.cpp:44
-msgid "Value"
-msgstr "值"
-
-#: kwmapeditor.cpp:121
-msgid "&New Entry"
-msgstr "新建项(&N)"
-
-#: main.cpp:45
-msgid "Show window on startup"
-msgstr "启动时显示窗口"
-
-#: main.cpp:46
-msgid "For use by tdewalletd only"
-msgstr "仅由 tdewalletd 使用"
-
-#: main.cpp:47
-msgid "A wallet name"
-msgstr "钱包名称"
-
-#: main.cpp:51 main.cpp:70
-msgid "TDE Wallet Manager"
-msgstr "TDE 钱包管理器"
-
-#: main.cpp:52
-msgid "TDE Wallet Management Tool"
-msgstr "TDE 钱包管理工具"
-
-#: main.cpp:54
-msgid "(c) 2003,2004 George Staikos"
-msgstr "(c) 2003,2004 George Staikos"
-
-#: main.cpp:57
-msgid "Primary author and maintainer"
-msgstr "主要的作者和维护者"
-
-#: main.cpp:58
-msgid "Developer"
-msgstr "开发者"
-
-#. i18n: file kbetterthankdialogbase.ui line 60
-#: rc.cpp:18
-#, no-c-format
-msgid "&Replace"
-msgstr "替换(&R)"
-
-#. i18n: file kbetterthankdialogbase.ui line 71
-#: rc.cpp:21
-#, no-c-format
-msgid "Replace &All"
-msgstr "全部替换(&A)"
-
-#. i18n: file kbetterthankdialogbase.ui line 79
-#: rc.cpp:24
-#, no-c-format
-msgid "&Skip"
-msgstr "跳过(&S)"
-
-#. i18n: file kbetterthankdialogbase.ui line 87
-#: rc.cpp:27
-#, no-c-format
-msgid "Skip A&ll"
-msgstr "全部跳过(&L)"
-
-#. i18n: file walletwidget.ui line 237
-#: rc.cpp:36
-#, no-c-format
-msgid "Hide &Contents"
-msgstr "隐藏目录(&C)"
-
-#. i18n: file walletwidget.ui line 269
-#: rc.cpp:39
-#, no-c-format
-msgid ""
-"This is a binary data entry.  It cannot be editted as its format is unknown and "
-"application specific."
-msgstr "这是二进制项。无法进行编辑，原因是格式未知，也没有指定应用程序。"
-
-#. i18n: file walletwidget.ui line 398
-#: rc.cpp:42
-#, no-c-format
-msgid "Show &Contents"
-msgstr "显示目录(&C)"
diff --git a/tde-i18n-zh_CN/messages/tdevelop/tdevelop.po b/tde-i18n-zh_CN/messages/tdevelop/tdevelop.po
index 94a77c43919..b6065514f0d 100644
--- a/tde-i18n-zh_CN/messages/tdevelop/tdevelop.po
+++ b/tde-i18n-zh_CN/messages/tdevelop/tdevelop.po
@@ -8,870 +8,329 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdevelop\n"
-"POT-Creation-Date: 2008-08-01 01:17+0200\n"
+"POT-Creation-Date: 2014-09-29 00:51-0500\n"
 "PO-Revision-Date: 2007-10-06 21:38+0000\n"
 "Last-Translator: 杜比 <dbhrscom@163.com>\n"
 "Language-Team:  <zh@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#. i18n: file ./languages/cpp/app_templates/kxt/appui.rc line 4
-#: rc.cpp:6 rc.cpp:12 rc.cpp:45 rc.cpp:60 rc.cpp:78
-#, no-c-format
-msgid "&Move"
-msgstr "移动(&M)"
-
-#. i18n: file ./languages/cpp/app_templates/kapp/appui.rc line 4
-#: rc.cpp:9 rc.cpp:21 rc.cpp:39 rc.cpp:75 rc.cpp:81
+#. i18n: file ./languages/cpp/app_templates/khello2/appui.rc line 4
+#: rc.cpp:6 rc.cpp:51 rc.cpp:57 rc.cpp:75 rc.cpp:84
 #, no-c-format
 msgid "C&ustom"
 msgstr "自定义(&U)"
 
+#. i18n: file ./languages/cpp/app_templates/kde4app/kde4appui.rc line 4
+#: rc.cpp:33 rc.cpp:45 rc.cpp:48 rc.cpp:54 rc.cpp:72
+#, no-c-format
+msgid "&Move"
+msgstr "移动(&M)"
+
 #. i18n: file ./languages/cpp/debugger/kdevdebugger.rc line 5
-#: rc.cpp:69 rc.cpp:84 rc.cpp:147 rc.cpp:234
+#: rc.cpp:66 rc.cpp:78 rc.cpp:90 rc.cpp:144
 #, no-c-format
 msgid "&Debug"
 msgstr "调试(&D)"
 
 #. i18n: file ./languages/cpp/debugger/kdevdebugger.rc line 29
-#: rc.cpp:72 rc.cpp:87 rc.cpp:174
+#: rc.cpp:69 rc.cpp:81 rc.cpp:171
 #, no-c-format
 msgid "Debugger Toolbar"
 msgstr "调试工具栏"
 
-#. i18n: file ./src/kdevassistantui.rc line 55
-#: rc.cpp:102 rc.cpp:141 rc.cpp:207 rc.cpp:246 rc.cpp:279
-#, no-c-format
-msgid "&Project"
-msgstr "工程(&P)"
-
-#. i18n: file ./src/kdevassistantui.rc line 68
-#: rc.cpp:105 rc.cpp:144
+#. i18n: file ./parts/filelist/kdevfilelist.rc line 8
+#: rc.cpp:102
 #, no-c-format
-msgid "Bu&ild"
-msgstr "构建(&I)"
+msgid "View Sessions"
+msgstr "查看会话"
 
-#. i18n: file ./src/kdevassistantui.rc line 106
-#: kdevdesigner/designer/mainwindowactions.cpp:937
-#: src/simplemainwindow.cpp:703 rc.cpp:114 rc.cpp:156 rc.cpp:258 rc.cpp:291
-#, no-c-format
-msgid "&Window"
-msgstr "窗口(&W)"
+#. i18n: file ./parts/filelist/kdevfilelist.rc line 18
+#: rc.cpp:105 rc.cpp:174
+#, fuzzy, no-c-format
+msgid "View Sessions Toolbar"
+msgstr "文件工具栏"
 
-#. i18n: file ./src/kdevassistantui.rc line 143
-#: rc.cpp:123 rc.cpp:165
+#. i18n: file ./parts/tools/kdevpart_tools.rc line 11
+#: rc.cpp:111 rc.cpp:249 rc.cpp:282
 #, no-c-format
-msgid "Build Toolbar"
-msgstr "构建工具栏"
+msgid "Tools Toolbar"
+msgstr "工具工具栏"
 
-#. i18n: file ./src/kdevassistantui.rc line 150
-#: rc.cpp:126 rc.cpp:168 rc.cpp:228
+#. i18n: file ./parts/classview/kdevclassview.rc line 14
+#: rc.cpp:117 rc.cpp:165 rc.cpp:210
 #, no-c-format
 msgid "Browser Toolbar"
 msgstr "浏览器工具栏"
 
-#. i18n: file ./src/kdevassistantui.rc line 159
-#: rc.cpp:129 rc.cpp:171
-#, no-c-format
-msgid "Extra Toolbar"
-msgstr "额外工具栏"
-
-#. i18n: file ./src/tdevelopui.rc line 187
-#: rc.cpp:177 rc.cpp:216
+#. i18n: file ./parts/astyle/kdevpart_astyle.rc line 12
+#: rc.cpp:120
 #, fuzzy, no-c-format
-msgid "View Sessions Toolbar"
+msgid "Astyle Toolbar"
 msgstr "文件工具栏"
 
-#. i18n: file ./vcs/subversion/kdevpart_subversion.rc line 5
-#: rc.cpp:183 rc.cpp:189 rc.cpp:195
+#. i18n: file ./parts/scripting/kdevscripting.rc line 4
+#: rc.cpp:123
 #, no-c-format
-msgid "&Version Control"
-msgstr "版本控制(&V)"
+msgid "S&cripts"
+msgstr "脚本(&C)"
 
-#. i18n: file ./vcs/subversion/kdevpart_subversion.rc line 8
-#: rc.cpp:186
+#. i18n: file ./parts/distpart/kdevpart_distpart.rc line 4
+#: rc.cpp:126 rc.cpp:138 rc.cpp:186 rc.cpp:222 rc.cpp:258
 #, no-c-format
-msgid "&Subversion"
-msgstr "&Subversion"
-
-#. i18n: file ./vcs/cvsservice/kdevcvsservicepart.rc line 9
-#: rc.cpp:192
-#, no-c-format
-msgid "&CVS Service"
-msgstr "CVS 服务(&C)"
+msgid "&Project"
+msgstr "工程(&P)"
 
-#. i18n: file ./vcs/perforce/kdevperforcepart.rc line 9
-#: rc.cpp:198
+#. i18n: file ./src/tdevelopui.rc line 73
+#: rc.cpp:141 rc.cpp:189
 #, no-c-format
-msgid "&Perforce"
-msgstr "&Perforce"
+msgid "Bu&ild"
+msgstr "构建(&I)"
 
-#. i18n: file ./parts/tools/kdevpart_tools.rc line 11
-#: rc.cpp:204 rc.cpp:270 rc.cpp:306
+#. i18n: file ./src/tdevelopui.rc line 118
+#: kdevdesigner/designer/mainwindowactions.cpp:937
+#: src/simplemainwindow.cpp:714 rc.cpp:153 rc.cpp:198 rc.cpp:234 rc.cpp:270
 #, no-c-format
-msgid "Tools Toolbar"
-msgstr "工具工具栏"
+msgid "&Window"
+msgstr "窗口(&W)"
 
-#. i18n: file ./parts/filelist/kdevfilelist.rc line 8
-#: rc.cpp:213
+#. i18n: file ./src/tdevelopui.rc line 157
+#: rc.cpp:162 rc.cpp:207
 #, no-c-format
-msgid "View Sessions"
-msgstr "查看会话"
-
-#. i18n: file ./parts/astyle/kdevpart_astyle.rc line 12
-#: rc.cpp:219
-#, fuzzy, no-c-format
-msgid "Astyle Toolbar"
-msgstr "文件工具栏"
+msgid "Build Toolbar"
+msgstr "构建工具栏"
 
-#. i18n: file ./parts/scripting/kdevscripting.rc line 4
-#: rc.cpp:237
+#. i18n: file ./src/tdevelopui.rc line 172
+#: rc.cpp:168 rc.cpp:213
 #, no-c-format
-msgid "S&cripts"
-msgstr "脚本(&C)"
+msgid "Extra Toolbar"
+msgstr "额外工具栏"
 
-#. i18n: file ./kdevdesigner/designer/kdevdesigner_part_sh.rc line 55
+#. i18n: file ./kdevdesigner/designer/kdevdesigner_part.rc line 47
 #: kdevdesigner/designer/mainwindow.cpp:3734
 #: kdevdesigner/designer/mainwindowactions.cpp:409
-#: kdevdesigner/designer/multilineeditorimpl.cpp:130 rc.cpp:252 rc.cpp:285
+#: kdevdesigner/designer/multilineeditorimpl.cpp:130 rc.cpp:228 rc.cpp:264
 #, no-c-format
 msgid "&Layout"
 msgstr "布局(&L)"
 
-#. i18n: file ./kdevdesigner/designer/kdevdesigner_part_sh.rc line 81
-#: rc.cpp:261 rc.cpp:294
+#. i18n: file ./kdevdesigner/designer/kdevdesigner_part.rc line 73
+#: rc.cpp:237 rc.cpp:273
 #, no-c-format
 msgid "File Toolbar"
 msgstr "文件工具栏"
 
-#. i18n: file ./kdevdesigner/designer/kdevdesigner_part_sh.rc line 87
-#: rc.cpp:264 rc.cpp:297
+#. i18n: file ./kdevdesigner/designer/kdevdesigner_part.rc line 79
+#: rc.cpp:240 rc.cpp:276
 #, no-c-format
 msgid "Edit Toolbar"
 msgstr "编辑工具栏"
 
-#. i18n: file ./kdevdesigner/designer/kdevdesigner_part_sh.rc line 96
-#: rc.cpp:267 rc.cpp:303
+#. i18n: file ./kdevdesigner/designer/kdevdesigner_part.rc line 101
+#: rc.cpp:246 rc.cpp:279
 #, no-c-format
 msgid "Layout Toolbar"
 msgstr "布局工具栏"
 
-#. i18n: file ./languages/ada/configproblemreporter.ui line 24
-#: rc.cpp:309 rc.cpp:1875 rc.cpp:2083
-#, no-c-format
-msgid "&Enable background parsing"
-msgstr "启用后台分析(&E)"
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 16
-#: rc.cpp:312
-#, no-c-format
-msgid "Add Class"
-msgstr "添加类"
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 30
-#: rc.cpp:315
-#, no-c-format
-msgid "&Implements"
-msgstr "实现(&I)"
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 38
-#: rc.cpp:318
-#, no-c-format
-msgid "&Class"
-msgstr "类(&C)"
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 72
-#: rc.cpp:321
-#, no-c-format
-msgid "&Abstract"
-msgstr "抽象(&A)"
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 80
-#: rc.cpp:324
-#, no-c-format
-msgid "&Interface"
-msgstr "接口(&I)"
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 88
-#: buildtools/autotools/addprefixdlg.cpp:29
-#: buildtools/lib/widgets/addenvvardlg.cpp:36 rc.cpp:327 rc.cpp:426
-#: rc.cpp:2465 rc.cpp:3767 rc.cpp:4555 rc.cpp:6179 rc.cpp:6242 rc.cpp:6554
-#: rc.cpp:8269
-#, no-c-format
-msgid "&Name:"
-msgstr "名称(&N)："
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 117
-#: rc.cpp:330
-#, no-c-format
-msgid "&Public"
-msgstr "公有(&P)"
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 128
-#: rc.cpp:333
-#, no-c-format
-msgid "P&rotected"
-msgstr "保护(&R)"
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 136
-#: rc.cpp:336
-#, no-c-format
-msgid "Pri&vate"
-msgstr "私有(&V)"
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 146
-#: rc.cpp:339
-#, no-c-format
-msgid "&Final"
-msgstr "最终(&F)"
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 170
-#: rc.cpp:342
-#, no-c-format
-msgid "&Extends:"
-msgstr "扩展(&E)："
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 189
-#: lib/widgets/propeditor/pfontbutton.cpp:43
-#: lib/widgets/propeditor/ppixmapedit.cpp:54 rc.cpp:345 rc.cpp:1175
-#: rc.cpp:1733 rc.cpp:1827 rc.cpp:1836 rc.cpp:1842 rc.cpp:4992 rc.cpp:5028
-#: rc.cpp:5920 rc.cpp:6413 rc.cpp:6416 rc.cpp:6476 rc.cpp:6494 rc.cpp:6509
-#: rc.cpp:6617 rc.cpp:6623 rc.cpp:6629 rc.cpp:7195 rc.cpp:7447 rc.cpp:7519
-#: rc.cpp:7721 rc.cpp:7736 rc.cpp:8106 rc.cpp:8112 rc.cpp:8326 rc.cpp:8470
-#: rc.cpp:8527
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 202
-#: rc.cpp:348
-#, no-c-format
-msgid "&Source path:"
-msgstr "源代码路径(&S)："
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 227
-#: rc.cpp:354
-#, no-c-format
-msgid "&Create default constructor"
-msgstr "创建默认的构造函数(&C)"
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 238
-#: rc.cpp:357
-#, no-c-format
-msgid "Create &main method"
-msgstr "创建主方法 &main"
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 248
-#: rc.cpp:360
-#, no-c-format
-msgid "&Documentation"
-msgstr "文档(&D)"
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 260
-#: rc.cpp:363 rc.cpp:3381
-#, no-c-format
-msgid "&License:"
-msgstr "许可协议(&L)："
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 269
-#: rc.cpp:366
-#, no-c-format
-msgid "LGPL"
-msgstr "LGPL"
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 274
-#: rc.cpp:369
-#, no-c-format
-msgid "GPL"
-msgstr "GPL"
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 279
-#: rc.cpp:372
-#, no-c-format
-msgid "QPL"
-msgstr "QPL"
-
-#. i18n: file ./languages/ada/addclassdlg.ui line 345
-#: languages/ruby/debugger/variablewidget.cpp:62
-#: lib/widgets/propeditor/qeditlistbox.cpp:121 rc.cpp:378 rc.cpp:445
-#: rc.cpp:1637 rc.cpp:1663 rc.cpp:1670 rc.cpp:1890 rc.cpp:3761 rc.cpp:5914
-#: rc.cpp:5989 rc.cpp:6044 rc.cpp:6362 rc.cpp:6527 rc.cpp:8034 rc.cpp:8545
-#: rc.cpp:8858
-#, no-c-format
-msgid "&Add"
-msgstr "添加(&A)"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 16
-#: rc.cpp:384 rc.cpp:1709
-#, no-c-format
-msgid "New Class"
-msgstr "新建类"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 34
-#: rc.cpp:387
+#. i18n: file ./vcs/subversion/kdevpart_subversion.rc line 5
+#: rc.cpp:288 rc.cpp:294 rc.cpp:300
 #, no-c-format
-msgid "Class &Information"
-msgstr "类信息(&I)"
+msgid "&Version Control"
+msgstr "版本控制(&V)"
 
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 73
-#: rc.cpp:390
+#. i18n: file ./vcs/subversion/kdevpart_subversion.rc line 8
+#: rc.cpp:291
 #, no-c-format
-msgid "Docu&mentation:"
-msgstr "文档(&M)："
+msgid "&Subversion"
+msgstr "&Subversion"
 
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 87
-#: rc.cpp:393
+#. i18n: file ./vcs/perforce/kdevperforcepart.rc line 9
+#: rc.cpp:297
 #, no-c-format
-msgid ""
-"Insert a short description for your new class\n"
-"here for documentation purposes. This can be used\n"
-"to create API documentation in HTML format with\n"
-"doxygen or similar tools."
-msgstr ""
-"为建立文档考虑，请在这里为您的新类插入一段\n"
-"简短的说明，以后可以用 doxygen 或其它类似工具\n"
-"建立 HTML 格式的 API 文档。"
+msgid "&Perforce"
+msgstr "&Perforce"
 
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 97
-#: rc.cpp:399
+#. i18n: file ./vcs/cvsservice/kdevcvsservicepart.rc line 9
+#: rc.cpp:303
 #, no-c-format
-msgid "File Names"
-msgstr "文件名"
+msgid "&CVS Service"
+msgstr "CVS 服务(&C)"
 
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 108
-#: rc.cpp:402
+#. i18n: file ./editors/editor-chooser/editchooser.ui line 24
+#: rc.cpp:309
 #, no-c-format
-msgid "&Header:"
-msgstr "头文件(&H)："
+msgid "&Embedded Editor"
+msgstr "内嵌编辑器(&E)"
 
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 122
-#: rc.cpp:405
+#. i18n: file ./editors/editor-chooser/editchooser.ui line 41
+#: rc.cpp:312
 #, no-c-format
 msgid ""
-"Insert your header file name here.\n"
-"It is automatically inserted while\n"
-"you select the classname, but you can\n"
-"still edit it afterwards."
-msgstr ""
-"在这儿输入您的头文件名。\n"
-"在您选择类名时，它会自动\n"
-"被插入，但以后您仍然可以\n"
-"编辑它。"
+"<i>Note:</i> Changing the preferred editor will not affect\n"
+"already open files."
+msgstr "<i>注意：</i> 改变首选的编辑器将不会影响已经打开的文件。"
 
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 130
-#: rc.cpp:411
+#. i18n: file ./editors/editor-chooser/editchooser.ui line 51
+#: rc.cpp:316
 #, no-c-format
-msgid "Im&plementation:"
-msgstr "实现(&P)："
+msgid "On External Changes"
+msgstr "外部更改时"
 
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 144
-#: rc.cpp:414
+#. i18n: file ./editors/editor-chooser/editchooser.ui line 57
+#: rc.cpp:319
 #, no-c-format
 msgid ""
-"Insert your implementation filename here.\n"
-"It is automatically inserted while\n"
-"you select the classname, but you can\n"
-"still edit it afterwards."
+"<p><b>Action to take when an open file is changed on disk</b></p>\n"
+"<p><b>Do nothing</b> - The file will be marked as externally changed and the "
+"user will be asked to verify any attempt to overwrite it </p>\n"
+"<p><b>Alert the user</b> - A dialog will alert the user that a file has changed "
+"and offer the user to reload the file</p>\n"
+"<p><b>Automatically reload</b> - Any files that are not modified in memory are "
+"reloaded, and an alert is shown for any conflicts</p>"
 msgstr ""
-"在此插入您的实现文件名。\n"
-"在您选择类名时，它会自动\n"
-"被插入，但以后您仍然可以\n"
-"编辑它。"
 
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 152
-#: rc.cpp:420
+#. i18n: file ./editors/editor-chooser/editchooser.ui line 68
+#: rc.cpp:325
 #, fuzzy, no-c-format
-msgid "Create only header"
-msgstr "创建元素"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 162
-#: kdevdesigner/designer/hierarchyview.cpp:191
-#: parts/classview/classtreebase.cpp:51 rc.cpp:423
-#, no-c-format
-msgid "Class"
-msgstr "类"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 194
-#: rc.cpp:429
-#, no-c-format
-msgid ""
-"Insert your new classname here.\n"
-"You can also define template classes by specifying\n"
-"template <params> classname"
-msgstr ""
-"在这里插入您的新类名。\n"
-"您也可以使用template <参数> 类名\n"
-"来定义模板类。"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 210
-#: rc.cpp:434
-#, no-c-format
-msgid "Name&space:"
-msgstr "命名空间(&S)："
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 223
-#: rc.cpp:437
-#, no-c-format
-msgid ""
-"Insert a name of the namespace here.\n"
-"You can define nested namespaces by specifying\n"
-"Namespace1::Namespace2::...::NamespaceN"
-msgstr ""
-"在这里插入命名空间的名字。\n"
-"您可以使用Namespace1::Namespace2::...::NamespaceN\n"
-"来定义嵌套的命名空间。"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 233
-#: rc.cpp:442
-#, no-c-format
-msgid "Inheritance"
-msgstr "继承"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 302
-#: lib/widgets/propeditor/qeditlistbox.cpp:137 rc.cpp:451 rc.cpp:1887
-#: rc.cpp:3677 rc.cpp:3920 rc.cpp:4744 rc.cpp:6308 rc.cpp:6638 rc.cpp:6689
-#, no-c-format
-msgid "Move &Up"
-msgstr "上移(&U)"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 330
-#: lib/widgets/propeditor/qeditlistbox.cpp:141 rc.cpp:454 rc.cpp:1884
-#: rc.cpp:3680 rc.cpp:3923 rc.cpp:4747 rc.cpp:6311 rc.cpp:6641 rc.cpp:6692
-#, no-c-format
-msgid "Move &Down"
-msgstr "下移(&D)"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 349
-#: rc.cpp:457 rc.cpp:1721
-#, no-c-format
-msgid "&Base class:"
-msgstr "基类(&B)："
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 358
-#: rc.cpp:460
-#, no-c-format
-msgid "Baseclass Name"
-msgstr "基类名称"
+msgid "&Do nothing"
+msgstr "不运行"
 
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 369
-#: rc.cpp:463
-#, no-c-format
-msgid "Inheritance Type"
-msgstr "继承类型"
+#. i18n: file ./editors/editor-chooser/editchooser.ui line 82
+#: rc.cpp:328
+#, fuzzy, no-c-format
+msgid "&Alert the user"
+msgstr "更换用户"
 
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 416
-#: rc.cpp:466
+#. i18n: file ./editors/editor-chooser/editchooser.ui line 90
+#: rc.cpp:331
 #, no-c-format
-msgid ""
-"Insert the base class which your new class will be derived from. If you have "
-"checked 'Generate QWidget child class' the new class will be derived from "
-"QWidget. If no base class is named, the new class will not have a parent class. "
-"You can also use template classes here (like BaseClass<int, int>)"
+msgid "Automatically reload the file &if safe, alert the user if not"
 msgstr ""
-"指明您的新类要从那一个基类派生。如果您选择了“生成 QWidget 的子类”，新类就从 QWidge "
-"t派生。如果没有指定基类，则新类就没有父类。在此您也可以使用模板类(比如 BaseClass<int, int>)。"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 458
-#: languages/ruby/debugger/variablewidget.cpp:834
-#: parts/classview/classtreebase.cpp:154
-#: src/profileengine/editor/profileeditor.cpp:139 rc.cpp:469 rc.cpp:7745
-#, no-c-format
-msgid "Global"
-msgstr "全局"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 463
-#: rc.cpp:472 rc.cpp:7748
-#, no-c-format
-msgid "Local"
-msgstr "局部"
 
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 489
-#: rc.cpp:475
-#, no-c-format
-msgid "Virtual"
-msgstr "虚"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 500
-#: rc.cpp:478
-#, no-c-format
-msgid "Public"
-msgstr "公有"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 514
-#: rc.cpp:481
-#, no-c-format
-msgid "Protected"
-msgstr "保护"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 525
-#: rc.cpp:484
-#, no-c-format
-msgid "Private"
-msgstr "私有"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 548
-#: rc.cpp:490
-#, no-c-format
-msgid "Use file t&emplates"
-msgstr "使用文件模板(&E)"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 559
-#: rc.cpp:493
-#, no-c-format
-msgid "Generate QOb&ject child class"
-msgstr "生成 QObject 的子类(&J)"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 567
-#: rc.cpp:496
-#, no-c-format
-msgid "Generate Q&Widget child class"
-msgstr "生成 QWidget 的子类(&W)"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 575
-#: rc.cpp:499
-#, no-c-format
-msgid "Generate G&TK+ class"
-msgstr "生成 GTK+ 类(&T)"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 583
-#: rc.cpp:502
-#, no-c-format
-msgid "Use Objective-C"
-msgstr "使用面向对象的 Objective-C"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 595
-#: rc.cpp:505
-#, no-c-format
-msgid "Ad&vanced Information"
-msgstr "高级信息(&V)"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 610
-#: rc.cpp:508
-#, no-c-format
-msgid "Constr&uctors"
-msgstr "构造函数(&U)"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 619
-#: rc.cpp:511
-#, no-c-format
-msgid "Base Class Constructors"
-msgstr "基类构造函数"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 668
-#: rc.cpp:514
-#, no-c-format
-msgid "C&reate Constructor >>"
-msgstr "创建构造函数(&R) >>"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 690
-#: rc.cpp:517
-#, no-c-format
-msgid "C&lear Selection"
-msgstr "清除选择(&L)"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 721
-#: rc.cpp:520
+#. i18n: file ./languages/kjssupport/subclassingdlgbase.ui line 16
+#: languages/kjssupport/kjssupport_part.cpp:429 rc.cpp:334
 #, no-c-format
-msgid "&Header"
-msgstr "头文件(&H)"
+msgid "Implement Slots"
+msgstr "实现槽"
 
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 756
-#: rc.cpp:523
+#. i18n: file ./languages/kjssupport/subclassingdlgbase.ui line 38
+#: rc.cpp:340 rc.cpp:896
 #, no-c-format
-msgid "&Source"
-msgstr "源文件(&S)"
+msgid "Re&format source"
+msgstr "重新排版源代码(&F)"
 
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 794
-#: rc.cpp:526
+#. i18n: file ./languages/kjssupport/subclassingdlgbase.ui line 54
+#: rc.cpp:343 rc.cpp:899
 #, no-c-format
-msgid "Methods Ov&erriding"
-msgstr "方法重载(&E)"
+msgid "Reformat source by &default"
+msgstr "默认重新排版源代码(&D)"
 
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 803
-#: languages/cpp/cppnewclassdlg.cpp:872 languages/cpp/cppnewclassdlg.cpp:875
-#: languages/cpp/cppnewclassdlg.cpp:1031 languages/cpp/cppnewclassdlg.cpp:1034
-#: rc.cpp:529
+#. i18n: file ./languages/kjssupport/subclassingdlgbase.ui line 60
+#: parts/classview/classtreebase.cpp:81 rc.cpp:346 rc.cpp:881
 #, no-c-format
-msgid "Methods"
+msgid "Method"
 msgstr "方法"
 
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 814
-#: rc.cpp:532
-#, no-c-format
-msgid "Extend Functionality"
-msgstr "扩展功能"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 849
-#: rc.cpp:535
-#, no-c-format
-msgid "&Access Control"
-msgstr "访问控制(&A)"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 858
-#: rc.cpp:538
-#, no-c-format
-msgid "Methods & Attributes"
-msgstr "方法和属性"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 869
-#: rc.cpp:541
-#, no-c-format
-msgid "Implied Modifier"
-msgstr "隐式修饰符"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 880
-#: rc.cpp:544
-#, no-c-format
-msgid "New Modifier"
-msgstr "新建修饰符"
-
-#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 923
-#: rc.cpp:547
-#, no-c-format
-msgid "&Generation Options"
-msgstr "代码生成选项(&G)"
-
-#. i18n: file ./languages/cpp/creategettersetter.ui line 44
-#: rc.cpp:556
-#, no-c-format
-msgid "&inline"
-msgstr "内联(&I)"
-
-#. i18n: file ./languages/cpp/creategettersetter.ui line 50
-#: rc.cpp:559
-#, no-c-format
-msgid "create an inline get method"
-msgstr "创建内联 get 方法"
-
-#. i18n: file ./languages/cpp/creategettersetter.ui line 53
-#: rc.cpp:562
-#, no-c-format
-msgid ""
-"If this is checked the get method will be created inline; otherwise, it will "
-"not."
-msgstr ""
-
-#. i18n: file ./languages/cpp/creategettersetter.ui line 61
-#: rc.cpp:565
-#, no-c-format
-msgid "&get method"
-msgstr "get 方法(&G)"
-
-#. i18n: file ./languages/cpp/creategettersetter.ui line 67
-#: rc.cpp:568
-#, no-c-format
-msgid "create get method"
-msgstr "创建 get 方法"
-
-#. i18n: file ./languages/cpp/creategettersetter.ui line 70
-#: rc.cpp:571
-#, no-c-format
-msgid "If this is checked a getter method will be created."
-msgstr ""
-
-#. i18n: file ./languages/cpp/creategettersetter.ui line 78
-#: rc.cpp:574
-#, no-c-format
-msgid "&set method"
-msgstr "set 方法(&S)"
-
-#. i18n: file ./languages/cpp/creategettersetter.ui line 84
-#: rc.cpp:577
-#, no-c-format
-msgid "create set method"
-msgstr "创建 set 方法"
-
-#. i18n: file ./languages/cpp/creategettersetter.ui line 87
-#: rc.cpp:580
-#, no-c-format
-msgid "If this is checked a set method will be created"
-msgstr ""
-
-#. i18n: file ./languages/cpp/creategettersetter.ui line 95
-#: rc.cpp:583
+#. i18n: file ./languages/kjssupport/subclassingdlgbase.ui line 71
+#: rc.cpp:349 rc.cpp:884 rc.cpp:914 rc.cpp:1296 rc.cpp:4316 rc.cpp:4822
+#: rc.cpp:5472
 #, no-c-format
-msgid "name of the get method"
-msgstr "get 方法的名称"
-
-#. i18n: file ./languages/cpp/creategettersetter.ui line 98
-#: rc.cpp:586
-#, no-c-format
-msgid "The name of the created get method"
-msgstr "所创建的 get 方法的名称"
-
-#. i18n: file ./languages/cpp/creategettersetter.ui line 106
-#: rc.cpp:589
-#, no-c-format
-msgid "name of the set method"
-msgstr "set 方法的名称"
-
-#. i18n: file ./languages/cpp/creategettersetter.ui line 109
-#: rc.cpp:592
-#, no-c-format
-msgid "The name of the created set method"
-msgstr "所创建的 set 方法的名称"
-
-#. i18n: file ./languages/cpp/creategettersetter.ui line 117
-#: rc.cpp:595
-#, no-c-format
-msgid "i&nline"
-msgstr "内联(&N)"
-
-#. i18n: file ./languages/cpp/creategettersetter.ui line 123
-#: rc.cpp:598
-#, no-c-format
-msgid "create an inline set method"
-msgstr "创建内联的 set 方法"
-
-#. i18n: file ./languages/cpp/creategettersetter.ui line 126
-#: rc.cpp:601
-#, no-c-format
-msgid ""
-"If this is checked the set method will be created inline; otherwise, it will "
-"not."
-msgstr ""
-
-#. i18n: file ./languages/cpp/createpcsdialogbase.ui line 16
-#: rc.cpp:610
-#, no-c-format
-msgid "New Persistant Class Store"
-msgstr "新建持久类存储"
-
-#. i18n: file ./languages/cpp/createpcsdialogbase.ui line 23
-#: rc.cpp:613
-#, fuzzy, no-c-format
-msgid "Select importer"
-msgstr "选择目录"
-
-#. i18n: file ./languages/cpp/createpcsdialogbase.ui line 55
-#: rc.cpp:616
-#, fuzzy, no-c-format
-msgid "Select directory"
-msgstr "选择目录"
-
-#. i18n: file ./languages/cpp/createpcsdialogbase.ui line 63
-#: rc.cpp:619
-#, fuzzy, no-c-format
-msgid "Describe database contents"
-msgstr "可写的类型常量"
-
-#. i18n: file ./languages/cpp/createpcsdialogbase.ui line 74
-#: rc.cpp:622
-#, fuzzy, no-c-format
-msgid "Filename:"
-msgstr "文件名："
-
-#. i18n: file ./languages/cpp/createpcsdialogbase.ui line 106
-#: rc.cpp:625
-#, no-c-format
-msgid "Creating..."
-msgstr "正在创建..."
+msgid "Access"
+msgstr "访问"
 
-#. i18n: file ./languages/cpp/configproblemreporter.ui line 24
-#: languages/cpp/cppsupportpart.cpp:585 rc.cpp:628
+#. i18n: file ./languages/kjssupport/subclassingdlgbase.ui line 82
+#: rc.cpp:352 rc.cpp:887 rc.cpp:5469
 #, no-c-format
-msgid "Problem Reporter"
-msgstr "问题报告者"
+msgid "Specifier"
+msgstr "修饰符"
 
-#. i18n: file ./languages/cpp/configproblemreporter.ui line 28
-#: rc.cpp:631
+#. i18n: file ./languages/kjssupport/subclassingdlgbase.ui line 93
+#: rc.cpp:355 rc.cpp:890 rc.cpp:920 rc.cpp:5466
 #, no-c-format
-msgid ""
-"If enabled, the C++ parser will report any syntax errors it detects. \n"
-"They will be displayed in the 'Problems' output view and as markers in the "
-"editor."
-msgstr ""
-
-#. i18n: file ./languages/cpp/configproblemreporter.ui line 39
-#: rc.cpp:635
-#, fuzzy, no-c-format
-msgid "&Use Problem Reporter"
-msgstr "问题报告者"
+msgid "Return Type"
+msgstr "返回类型"
 
-#. i18n: file ./languages/cpp/configproblemreporter.ui line 52
-#: rc.cpp:638
+#. i18n: file ./languages/kjssupport/subclassingdlgbase.ui line 104
+#: kdevdesigner/designer/outputwindow.cpp:83
+#: languages/cpp/debugger/gdbbreakpointwidget.cpp:218
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:230
+#: parts/partexplorer/partexplorerform.cpp:117 rc.cpp:358 rc.cpp:893
+#: rc.cpp:1302 rc.cpp:2556 rc.cpp:4945 rc.cpp:5475
 #, no-c-format
-msgid "Parsing"
-msgstr "分析"
+msgid "Type"
+msgstr "类型"
 
-#. i18n: file ./languages/cpp/configproblemreporter.ui line 57
-#: rc.cpp:641
+#. i18n: file ./languages/kjssupport/subclassingdlgbase.ui line 122
+#: rc.cpp:361 rc.cpp:872
 #, no-c-format
-msgid ""
-"If enabled, the C++ parser will run on the active file after the stated "
-"timeout, after there has been any changes to the text.\n"
-"\n"
-"If disabled, the parser will typically only run when the file is saved."
-msgstr ""
-
-#. i18n: file ./languages/cpp/configproblemreporter.ui line 76
-#: rc.cpp:646
-#, fuzzy, no-c-format
-msgid "Enable &background parsing"
-msgstr "启用后台分析(&E)"
+msgid "&Specialize following slots:"
+msgstr "专用下列槽(&S)："
 
-#. i18n: file ./languages/cpp/configproblemreporter.ui line 92
-#: rc.cpp:649 rc.cpp:676 rc.cpp:737 rc.cpp:1878
+#. i18n: file ./languages/kjssupport/subclassingdlgbase.ui line 146
+#: rc.cpp:364 rc.cpp:878
 #, no-c-format
-msgid "msec"
-msgstr "毫秒"
+msgid "F&ile name:"
+msgstr "文件名(&I)："
 
-#. i18n: file ./languages/cpp/configproblemreporter.ui line 133
-#: rc.cpp:652
+#. i18n: file ./languages/kjssupport/subclassingdlgbase.ui line 165
+#: rc.cpp:367 rc.cpp:875 rc.cpp:1819
 #, no-c-format
-msgid "Special &Headers"
-msgstr "特殊头文件(&H)"
+msgid "C&lass name:"
+msgstr "类名(&L)："
 
-#. i18n: file ./languages/cpp/configproblemreporter.ui line 136
-#: rc.cpp:655
+#. i18n: file ./languages/kjssupport/subclassingdlgbase.ui line 183
+#: rc.cpp:370 rc.cpp:902 rc.cpp:5776
 #, no-c-format
-msgid ""
-"Often a macro that the C++ parser must understand in order to correctly parse a "
-"piece of code is defined somewhere in some far off header file that the parser "
-"doesn't look at. This textbox can be used to define those macros locally so "
-"that the C++ parser to understand them."
-msgstr ""
+msgid "C&reate"
+msgstr "创建(&R)"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 16
-#: rc.cpp:658
+#: rc.cpp:376
 #, no-c-format
 msgid "C++ Options"
 msgstr "C++ 选项"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 31
-#: rc.cpp:661
+#: rc.cpp:379
 #, no-c-format
 msgid "&Code Completion"
 msgstr "代码补全(&C)"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 50
-#: rc.cpp:664
+#: rc.cpp:382
 #, no-c-format
 msgid "Code Completion Options"
 msgstr "代码补全选项"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 69
-#: rc.cpp:667
+#: rc.cpp:385
 #, no-c-format
 msgid "A&utomatic code completion:"
 msgstr "自动代码补全(&U)："
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 75
-#: rc.cpp:670
+#: rc.cpp:388
 #, no-c-format
 msgid "Offer options to complete what you are typing."
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 116
-#: rc.cpp:673
+#: rc.cpp:391
 #, no-c-format
 msgid "How long after a key press to offer suggestions"
 msgstr ""
 
+#. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 132
+#: rc.cpp:394 rc.cpp:455 rc.cpp:1230 rc.cpp:1870
+#, no-c-format
+msgid "msec"
+msgstr "毫秒"
+
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 143
-#: rc.cpp:679
+#: rc.cpp:397
 #, fuzzy, no-c-format
 msgid ""
 "List &global items when\n"
@@ -879,7 +338,7 @@ msgid ""
 msgstr "代码自动补全时显示全局对象成员列表(&G)"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 152
-#: rc.cpp:683 rc.cpp:692
+#: rc.cpp:401 rc.cpp:410
 #, no-c-format
 msgid ""
 "When this is checked, members of all \n"
@@ -897,13 +356,13 @@ msgstr ""
 "这导致补全列表变得臃肿并造成延时"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 169
-#: rc.cpp:701
+#: rc.cpp:419
 #, fuzzy, no-c-format
 msgid "&Do complete member-type-evaluation"
 msgstr "计算完整的布尔值"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 176
-#: rc.cpp:704 rc.cpp:711
+#: rc.cpp:422 rc.cpp:429
 #, no-c-format
 msgid ""
 "Completely evaluate member-types of \n"
@@ -914,13 +373,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 191
-#: rc.cpp:718
+#: rc.cpp:436
 #, fuzzy, no-c-format
 msgid "Do complete argument-type-e&valuation"
 msgstr "计算完整的布尔值"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 196
-#: rc.cpp:721 rc.cpp:726
+#: rc.cpp:439 rc.cpp:444
 #, no-c-format
 msgid ""
 "Completely evaluate the function-argument-types \n"
@@ -929,19 +388,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 211
-#: rc.cpp:731
+#: rc.cpp:449
 #, no-c-format
 msgid "Argument Hint Options"
 msgstr "参数提示选项"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 222
-#: rc.cpp:734
+#: rc.cpp:452
 #, no-c-format
 msgid "Auto&matic arguments hint:"
 msgstr "自动提示参数(&M)："
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 290
-#: rc.cpp:740
+#: rc.cpp:458
 #, fuzzy, no-c-format
 msgid ""
 "Show comment with\n"
@@ -949,19 +408,19 @@ msgid ""
 msgstr "显示提示参数的注释"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 313
-#: rc.cpp:744
+#: rc.cpp:462
 #, no-c-format
 msgid "Incremental Parsing"
 msgstr "代码分析附加选项"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 324
-#: rc.cpp:747
+#: rc.cpp:465
 #, no-c-format
 msgid "Do not process included headers"
 msgstr "不处理包含的的头文件"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 336
-#: rc.cpp:750
+#: rc.cpp:468
 #, no-c-format
 msgid ""
 "Preprocess and parse included \n"
@@ -969,7 +428,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 341
-#: rc.cpp:754
+#: rc.cpp:472
 #, no-c-format
 msgid ""
 "Parse preprocessed headers that are not part of this project \n"
@@ -978,7 +437,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 350
-#: rc.cpp:759
+#: rc.cpp:477
 #, no-c-format
 msgid ""
 "Preprocess included headers\n"
@@ -986,24 +445,24 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 357
-#: rc.cpp:763
+#: rc.cpp:481
 #, no-c-format
 msgid ""
 "Try to locate all included files and preprocess them. \n"
-"This makes macros and imported namespaces work correctly, and allows KDevelop\n"
+"This makes macros and imported namespaces work correctly, and allows TDevelop\n"
 "to know what code-items are visible from within which file.\n"
 "Note: Parsing may become very slow when this is enabled\n"
 "(It will become faster after some time)."
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 367
-#: rc.cpp:770
+#: rc.cpp:488
 #, no-c-format
 msgid "Code Completion Databases"
 msgstr "代码补全数据库"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 370
-#: rc.cpp:773
+#: rc.cpp:491
 #, no-c-format
 msgid ""
 "<b>Code Completion Databases</b> are used to store the parsed headers for "
@@ -1012,39 +471,39 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 379
-#: kdevdesigner/designer/widgetfactory.cpp:775 rc.cpp:776 rc.cpp:2688
-#: rc.cpp:8031
+#: kdevdesigner/designer/widgetfactory.cpp:775 rc.cpp:494 rc.cpp:5194
+#: rc.cpp:6546
 #, no-c-format
 msgid "Column 1"
 msgstr "列 1"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 428
-#: rc.cpp:779 rc.cpp:3273 rc.cpp:3282 rc.cpp:3291 rc.cpp:3947 rc.cpp:4480
-#: rc.cpp:4615 rc.cpp:6314 rc.cpp:6647 rc.cpp:6677 rc.cpp:8584
+#: rc.cpp:497 rc.cpp:2445 rc.cpp:2685 rc.cpp:2844 rc.cpp:2853 rc.cpp:2862
+#: rc.cpp:2889 rc.cpp:5794 rc.cpp:8432 rc.cpp:8642 rc.cpp:8672
 #, no-c-format
 msgid "&Add..."
 msgstr "添加(&A)..."
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 431
-#: rc.cpp:782
+#: rc.cpp:500
 #, no-c-format
 msgid "Click to start the Code Completion database creation wizard."
 msgstr "单击可访问代码补全数据库创建向导。"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 470
-#: rc.cpp:788
+#: rc.cpp:506
 #, no-c-format
 msgid "Misc"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 489
-#: rc.cpp:791
+#: rc.cpp:509
 #, no-c-format
 msgid "Advanced include-path resolution using make(e&xperimental)"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 496
-#: rc.cpp:794
+#: rc.cpp:512
 #, no-c-format
 msgid ""
 "Try to resolve the include-path by getting the command that would be used \n"
@@ -1059,38 +518,38 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 504
-#: rc.cpp:801
+#: rc.cpp:519
 #, fuzzy, no-c-format
 msgid "Show t&ype evaluation in status bar"
 msgstr "在标签栏上显示关闭按钮"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 512
-#: rc.cpp:804
+#: rc.cpp:522
 #, fuzzy, no-c-format
 msgid "src;"
 msgstr "结构"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 516
-#: rc.cpp:807
+#: rc.cpp:525
 #, no-c-format
 msgid ""
-"A semicolon-seperated list of include-paths to be used while searching for "
+"A semicolon-separated list of include-paths to be used while searching for "
 "headers. \n"
 "Paths not starting with '/' will be interpreted as relative to the "
 "project-folder."
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 524
-#: rc.cpp:811
+#: rc.cpp:529
 #, no-c-format
 msgid "std=_GLIBCXX_STD"
 msgstr "std=_GLIBCXX_STD"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 530
-#: rc.cpp:814
+#: rc.cpp:532
 #, no-c-format
 msgid ""
-"This line may contain a semicolon-seperated list of namespace-aliases and "
+"This line may contain a semicolon-separated list of namespace-aliases and "
 "namespace-imports. \n"
 "example: \"std<<_GLIBCXX_STD;NewNamespaceName=OldNamespaceName; << "
 "SomeGloballyImportedNamespace\" (without paratheses). \n"
@@ -1100,99 +559,105 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 538
-#: rc.cpp:820
+#: rc.cpp:538
 #, no-c-format
 msgid "Custom include paths:"
 msgstr "自定义 include 路径："
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 546
-#: rc.cpp:823
+#: rc.cpp:541
 #, no-c-format
 msgid "Namespace alias list:"
 msgstr "名称空间别名列表："
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 575
-#: rc.cpp:826
+#: rc.cpp:544
 #, no-c-format
 msgid "&Navigation"
 msgstr "导航(&N)"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 586
-#: rc.cpp:829
+#: rc.cpp:547
 #, no-c-format
 msgid "Header/Source split (Highly Experimental)"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 597
-#: rc.cpp:832
+#: rc.cpp:550
 #, no-c-format
 msgid "Enable split of Header/So&urce files"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 600
-#: rc.cpp:835 rc.cpp:838
+#: rc.cpp:553 rc.cpp:556
 #, no-c-format
 msgid "Check to have header and source appear in the same page."
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 622
-#: rc.cpp:841
+#: rc.cpp:559
 #, fuzzy, no-c-format
 msgid "Automatic S&ynchronize"
 msgstr "自动同步"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 626
-#: rc.cpp:844 rc.cpp:848
+#: rc.cpp:562 rc.cpp:566
 #, no-c-format
 msgid ""
 "Check to have the source file scroll as you \n"
 "navigate the header and vice versa"
 msgstr ""
 
+#. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 643
+#: rc.cpp:570
+#, fuzzy, no-c-format
+msgid "Qt::Orientation"
+msgstr "描述"
+
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 649
-#: rc.cpp:855
+#: rc.cpp:573
 #, no-c-format
 msgid "Select which Qt version your project is using."
 msgstr "选择您的工程所使用的 Qt 版本。"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 660
-#: kdevdesigner/designer/formwindow.cpp:361 rc.cpp:858
+#: kdevdesigner/designer/formwindow.cpp:361 rc.cpp:576
 #, no-c-format
 msgid "&Vertical"
 msgstr "垂直(&V)"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 666
-#: rc.cpp:861
+#: rc.cpp:579
 #, no-c-format
 msgid "Select this if your project is using Qt version 3.x."
 msgstr "如果您的工程正使用 Qt 3.x，请选择此项。"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 674
-#: rc.cpp:864
+#: rc.cpp:582
 #, no-c-format
 msgid "Hori&zontal"
 msgstr "水平(&Z)"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 677
-#: rc.cpp:867
+#: rc.cpp:585
 #, no-c-format
 msgid "Select this if your project is using Qt version 4.x."
 msgstr "如果您的工程正使用 Qt 4.x，请选择此项。"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 706
-#: rc.cpp:870
+#: rc.cpp:588
 #, no-c-format
 msgid "Context Menu"
 msgstr "环境菜单"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 717
-#: rc.cpp:873
+#: rc.cpp:591
 #, fuzzy, no-c-format
 msgid "Switch Header/Implementation &matches current function"
 msgstr "切换到与当前函数匹配的头/实现"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 726
-#: rc.cpp:876 rc.cpp:882
+#: rc.cpp:594 rc.cpp:600
 #, no-c-format
 msgid ""
 "Check to have the <b>Switch Header/Implementation</b> \n"
@@ -1201,13 +666,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 740
-#: rc.cpp:888
+#: rc.cpp:606
 #, fuzzy, no-c-format
 msgid "Show Go To &Declaration/Definition submenus"
 msgstr "显示转到定义/定义子菜单"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 747
-#: rc.cpp:891 rc.cpp:898
+#: rc.cpp:609 rc.cpp:616
 #, no-c-format
 msgid ""
 "Check to show two additional submenus \n"
@@ -1218,13 +683,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 762
-#: rc.cpp:905
+#: rc.cpp:623
 #, fuzzy, no-c-format
 msgid "Show type evaluation &based navigation menus"
 msgstr "显示转到定义/定义子菜单"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 767
-#: rc.cpp:908 rc.cpp:913
+#: rc.cpp:626 rc.cpp:631
 #, no-c-format
 msgid ""
 "Menus appear on the right mouse click context menu, \n"
@@ -1233,19 +698,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 784
-#: rc.cpp:918
+#: rc.cpp:636
 #, no-c-format
 msgid "Class Wi&zard"
 msgstr "类向导(&Z)"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 803
-#: rc.cpp:921
+#: rc.cpp:639
 #, fuzzy, no-c-format
 msgid "Filename options"
 msgstr "过滤选项"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 806
-#: rc.cpp:924
+#: rc.cpp:642
 #, no-c-format
 msgid ""
 "These are the suffixes used by the Class Wizard when creating new classes."
@@ -1253,37 +718,37 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 827
-#: rc.cpp:927
+#: rc.cpp:645
 #, no-c-format
 msgid "&Interface suffix:"
 msgstr "接口后缀(&I)："
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 838
-#: rc.cpp:930
+#: rc.cpp:648
 #, no-c-format
 msgid "I&mplementation suffix:"
 msgstr "实现后缀(&M)："
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 870
-#: rc.cpp:933
+#: rc.cpp:651
 #, no-c-format
 msgid "&Qt Options"
 msgstr "Qt 选项(&Q)"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 881
-#: rc.cpp:936
+#: rc.cpp:654
 #, no-c-format
 msgid "Enable Qt opt&ions"
 msgstr "启用 Qt 选项(&I)"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 892
-#: rc.cpp:939
+#: rc.cpp:657
 #, no-c-format
 msgid "Qt Version, Directory and QMake Binary"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 900
-#: rc.cpp:942
+#: rc.cpp:660
 #, no-c-format
 msgid ""
 "Select which Qt version your project is using and where that Qt version is "
@@ -1293,13 +758,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 919
-#: rc.cpp:947
+#: rc.cpp:665
 #, no-c-format
 msgid "Qt 3"
 msgstr "Qt 3.x"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 925
-#: rc.cpp:950
+#: rc.cpp:668
 #, no-c-format
 msgid ""
 "Use Qt version 3 (When this is changed the project needs to be closed and "
@@ -1307,7 +772,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 928
-#: rc.cpp:953
+#: rc.cpp:671
 #, no-c-format
 msgid ""
 "Select this if your project is using Qt version 3.x."
@@ -1315,13 +780,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 936
-#: rc.cpp:956
+#: rc.cpp:674
 #, no-c-format
 msgid "Qt 4"
 msgstr "Qt 4.x"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 939
-#: rc.cpp:959
+#: rc.cpp:677
 #, no-c-format
 msgid ""
 "Use Qt version 4 (When this is changed the project needs to be closed and "
@@ -1329,7 +794,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 942
-#: rc.cpp:962
+#: rc.cpp:680
 #, no-c-format
 msgid ""
 "Select this if your project is using Qt version 4.x."
@@ -1337,19 +802,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 950
-#: rc.cpp:965
+#: rc.cpp:683
 #, no-c-format
 msgid "(After changing the project needs to be re-opened)"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 988
-#: rc.cpp:968
+#: rc.cpp:686
 #, no-c-format
 msgid "Qt3 Directory:"
 msgstr "Qt3 目录："
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 991
-#: rc.cpp:971
+#: rc.cpp:689
 #, no-c-format
 msgid ""
 "This setting is only needed for Qt3 programs, for Qt4 just make sure the QMake "
@@ -1357,7 +822,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 999
-#: rc.cpp:974
+#: rc.cpp:692
 #, no-c-format
 msgid ""
 "The Qt directory, will be red if it is not a valid Qt directory. This setting "
@@ -1365,7 +830,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1002
-#: rc.cpp:977
+#: rc.cpp:695
 #, no-c-format
 msgid ""
 "Choose the directory that Qt was installed to. If this is shown in red the "
@@ -1373,43 +838,43 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1020
-#: rc.cpp:980
+#: rc.cpp:698
 #, fuzzy, no-c-format
 msgid "QMake Binary:"
 msgstr "QMake 管理器"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1028
-#: rc.cpp:983
+#: rc.cpp:701
 #, no-c-format
 msgid "The full path to the QMake executable to be used"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1043
-#: rc.cpp:986
+#: rc.cpp:704
 #, fuzzy, no-c-format
 msgid "Qt include syntax"
 msgstr "扩展语法"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1049
-#: rc.cpp:989
+#: rc.cpp:707
 #, fuzzy, no-c-format
 msgid "Select which include style your project is using."
 msgstr "选择您的工程所使用的 Qt 版本。"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1060
-#: rc.cpp:992
+#: rc.cpp:710
 #, no-c-format
 msgid "Qt &3 style (#include <qwidget.h>)"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1063
-#: rc.cpp:995
+#: rc.cpp:713
 #, fuzzy, no-c-format
 msgid "Alt+3"
 msgstr "Alt+1"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1069
-#: rc.cpp:998
+#: rc.cpp:716
 #, fuzzy, no-c-format
 msgid ""
 "Select this if your project is using include style as known from Qt version "
@@ -1417,19 +882,19 @@ msgid ""
 msgstr "如果您的工程正使用 Qt 3.x，请选择此项。"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1077
-#: rc.cpp:1001
+#: rc.cpp:719
 #, no-c-format
 msgid "Qt &4 style (#include <QWidget>)"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1080
-#: rc.cpp:1004
+#: rc.cpp:722
 #, fuzzy, no-c-format
 msgid "Alt+4"
 msgstr "Alt+1"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1083
-#: rc.cpp:1007
+#: rc.cpp:725
 #, fuzzy, no-c-format
 msgid ""
 "Select this if your project is using include style as known from Qt version "
@@ -1437,153 +902,153 @@ msgid ""
 msgstr "如果您的工程正使用 Qt 4.x，请选择此项。"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1096
-#: rc.cpp:1010
+#: rc.cpp:728
 #, fuzzy, no-c-format
 msgid "UI Designer Integration"
 msgstr "<qt><h3>UI 设计师集成</h3></qt>"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1113
-#: rc.cpp:1013 rc.cpp:2339
-#, no-c-format
-msgid "&Use KDevelop's embedded designer"
+#: rc.cpp:731 rc.cpp:4102
+#, fuzzy, no-c-format
+msgid "&Use TDevelop's embedded designer"
 msgstr "使用嵌入的 KDevelop 设计师(&U)"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1116
-#: rc.cpp:1016 rc.cpp:2342
-#, no-c-format
-msgid "Start KDevelop own designer embedded within KDevelop"
+#: rc.cpp:734
+#, fuzzy, no-c-format
+msgid "Start TDevelop's own designer embedded within TDevelop"
 msgstr "在 KDevelop 中启动 KDevelop 自带的设计师"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1119
-#: rc.cpp:1019 rc.cpp:2345
+#: rc.cpp:737 rc.cpp:4108
 #, no-c-format
 msgid ""
-"KDevelop comes with its own UI designer that can either be embedded or be run "
+"TDevelop comes with its own UI designer that can either be embedded or be run "
 "as a separate program. Check this button if you wish to integrate the UI "
-"designer into KDevelop."
+"designer into TDevelop."
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1127
-#: rc.cpp:1022
+#: rc.cpp:740
 #, fuzzy, no-c-format
-msgid "Run &KDevelop's designer as a separate application"
+msgid "Run &TDevelop's designer as a separate application"
 msgstr "将 KDevelop 的设计器运行为单独的应用程序(&D)"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1130
-#: rc.cpp:1025 rc.cpp:2351
-#, no-c-format
-msgid "Start KDevelop own designer externally"
+#: rc.cpp:743
+#, fuzzy, no-c-format
+msgid "Start TDevelop's own designer externally"
 msgstr "在外部启动 KDevelop 自带的设计师"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1133
-#: rc.cpp:1028 rc.cpp:2354
+#: rc.cpp:746 rc.cpp:4117
 #, no-c-format
 msgid ""
-"KDevelop comes with its own UI designer that can either be embedded or be run "
-"as a separate program. Check this button if you wish to run KDevelop's UI "
+"TDevelop comes with its own UI designer that can either be embedded or be run "
+"as a separate program. Check this button if you wish to run TDevelop's UI "
 "designer as a separate program."
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1141
-#: rc.cpp:1031
+#: rc.cpp:749
 #, fuzzy, no-c-format
 msgid "Run Qt &Designer"
 msgstr "运行 Qt 设计师(&G)"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1144
-#: rc.cpp:1034 rc.cpp:2360
+#: rc.cpp:752 rc.cpp:4123
 #, no-c-format
 msgid "Use Qt Designer externally"
 msgstr "使用外部的 Qt 设计师"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1147
-#: rc.cpp:1037 rc.cpp:2363
+#: rc.cpp:755 rc.cpp:4126
 #, no-c-format
 msgid ""
-"Check this button if you wish to use Qt Designer rather than KDevelop's "
+"Check this button if you wish to use Qt Designer rather than TDevelop's "
 "integrated designer."
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1163
-#: rc.cpp:1040
+#: rc.cpp:758
 #, fuzzy, no-c-format
 msgid "Designer Binary:"
 msgstr "KDevDesignerPart"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1174
-#: rc.cpp:1043
+#: rc.cpp:761
 #, no-c-format
 msgid "The full path to the Designer executable to be used"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1192
-#: rc.cpp:1046
+#: rc.cpp:764
 #, no-c-format
 msgid "Extra Plugin Paths for Qt4 Designer:"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1203
-#: rc.cpp:1049
+#: rc.cpp:767
 #, no-c-format
 msgid "Change Plugin Paths"
 msgstr "改变 Plugin 路径"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1234
-#: rc.cpp:1052
+#: rc.cpp:770
 #, fuzzy, no-c-format
 msgid "&Accessors"
 msgstr "访问(&S)："
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1245
-#: rc.cpp:1055
+#: rc.cpp:773
 #, no-c-format
 msgid "E&xample for Member Variable of Type String"
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1264
-#: rc.cpp:1058
+#: rc.cpp:776
 #, no-c-format
 msgid "Variable name:"
 msgstr "变量名："
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1272
-#: rc.cpp:1061
+#: rc.cpp:779
 #, no-c-format
 msgid "m_x"
 msgstr "m_x"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1299
-#: rc.cpp:1064
+#: rc.cpp:782
 #, no-c-format
 msgid "int x() const;"
 msgstr "int x() const;"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1310
-#: rc.cpp:1067
+#: rc.cpp:785
 #, no-c-format
 msgid "void setX(const string& theValue);"
 msgstr "void setX(const string& theValue);"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1321
-#: rc.cpp:1070
+#: rc.cpp:788
 #, no-c-format
 msgid "Get method:"
 msgstr "Get 方法："
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1329
-#: rc.cpp:1073
+#: rc.cpp:791
 #, no-c-format
 msgid "Set method:"
 msgstr "Set 方法："
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1339
-#: rc.cpp:1076 rc.cpp:6152 rc.cpp:8173
+#: rc.cpp:794 rc.cpp:6284 rc.cpp:8555
 #, no-c-format
 msgid "Settings"
 msgstr "设置"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1344
-#: rc.cpp:1079 rc.cpp:1084 rc.cpp:1089 rc.cpp:1094 rc.cpp:1105 rc.cpp:1110
+#: rc.cpp:797 rc.cpp:802 rc.cpp:807 rc.cpp:812 rc.cpp:823 rc.cpp:828
 #, no-c-format
 msgid ""
 "Will show as \"Create Accessor Methods\" in the\n"
@@ -1592,392 +1057,840 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1375
-#: rc.cpp:1099
+#: rc.cpp:817
 #, no-c-format
 msgid "Prefix for <b>get</b> methods:"
 msgstr "<b>get</b> 方法的前缀："
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1383
-#: parts/ctags2/ctagskinds.cpp:175 rc.cpp:1102
+#: parts/ctags2/ctagskinds.cpp:175 rc.cpp:820
 #, no-c-format
 msgid "set"
 msgstr "set"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1401
-#: rc.cpp:1115
+#: rc.cpp:833
 #, no-c-format
 msgid "Prefix for <b>set</b> methods:"
 msgstr "<b>set</b> 方法的前缀："
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1409
-#: rc.cpp:1118
+#: rc.cpp:836
 #, no-c-format
 msgid "m_"
 msgstr "m_"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1417
-#: rc.cpp:1121
+#: rc.cpp:839
 #, no-c-format
 msgid "Member <b>variable</b> prefix to remove:"
 msgstr "要删除的成员<b>变量</b>前缀："
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1425
-#: rc.cpp:1124
+#: rc.cpp:842
 #, no-c-format
 msgid "theValue"
 msgstr "theValue"
 
 #. i18n: file ./languages/cpp/ccconfigwidgetbase.ui line 1450
-#: rc.cpp:1127
+#: rc.cpp:845
 #, no-c-format
 msgid "<b>Parametername</b> in set method:"
 msgstr "set 方法中的 <b>Parametername</b>："
 
+#. i18n: file ./languages/cpp/createpcsdialogbase.ui line 16
+#: rc.cpp:848
+#, no-c-format
+msgid "New Persistant Class Store"
+msgstr "新建持久类存储"
+
+#. i18n: file ./languages/cpp/createpcsdialogbase.ui line 23
+#: rc.cpp:851
+#, fuzzy, no-c-format
+msgid "Select importer"
+msgstr "选择目录"
+
+#. i18n: file ./languages/cpp/createpcsdialogbase.ui line 55
+#: rc.cpp:854
+#, fuzzy, no-c-format
+msgid "Select directory"
+msgstr "选择目录"
+
+#. i18n: file ./languages/cpp/createpcsdialogbase.ui line 63
+#: rc.cpp:857
+#, fuzzy, no-c-format
+msgid "Describe database contents"
+msgstr "可写的类型常量"
+
+#. i18n: file ./languages/cpp/createpcsdialogbase.ui line 74
+#: rc.cpp:860
+#, fuzzy, no-c-format
+msgid "Filename:"
+msgstr "文件名："
+
+#. i18n: file ./languages/cpp/createpcsdialogbase.ui line 106
+#: rc.cpp:863
+#, no-c-format
+msgid "Creating..."
+msgstr "正在创建..."
+
+#. i18n: file ./languages/cpp/subclassingdlgbase.ui line 16
+#: rc.cpp:866
+#, no-c-format
+msgid "Create Subclass"
+msgstr "创建子类"
+
+#. i18n: file ./languages/cpp/subclassingdlgbase.ui line 27
+#: rc.cpp:869
+#, no-c-format
+msgid "Subclass Properties"
+msgstr "子类属性"
+
 #. i18n: file ./languages/cpp/addmethoddialogbase.ui line 16
-#: rc.cpp:1130
+#: rc.cpp:908
 #, no-c-format
 msgid "Add Method"
 msgstr "添加方法"
 
 #. i18n: file ./languages/cpp/addmethoddialogbase.ui line 28
-#: rc.cpp:1133
+#: rc.cpp:911
 #, no-c-format
 msgid "Inline"
 msgstr "内联"
 
-#. i18n: file ./languages/cpp/addmethoddialogbase.ui line 39
-#: rc.cpp:1136 rc.cpp:1187 rc.cpp:1244 rc.cpp:2125 rc.cpp:7887 rc.cpp:8698
-#: rc.cpp:8834
-#, no-c-format
-msgid "Access"
-msgstr "访问"
-
 #. i18n: file ./languages/cpp/addmethoddialogbase.ui line 50
-#: rc.cpp:1139 rc.cpp:1190
+#: rc.cpp:917 rc.cpp:1299
 #, no-c-format
 msgid "Storage"
 msgstr "存储"
 
-#. i18n: file ./languages/cpp/addmethoddialogbase.ui line 61
-#: rc.cpp:1142 rc.cpp:1250 rc.cpp:2131 rc.cpp:8692
-#, no-c-format
-msgid "Return Type"
-msgstr "返回类型"
-
 #. i18n: file ./languages/cpp/addmethoddialogbase.ui line 72
-#: rc.cpp:1145 rc.cpp:1196
+#: rc.cpp:923 rc.cpp:1305
 #, no-c-format
 msgid "Declarator"
 msgstr "声明"
 
 #. i18n: file ./languages/cpp/addmethoddialogbase.ui line 121
-#: rc.cpp:1148
+#: rc.cpp:926
 #, no-c-format
 msgid "&Add Method"
 msgstr "添加方法(&A)"
 
 #. i18n: file ./languages/cpp/addmethoddialogbase.ui line 129
-#: rc.cpp:1151
+#: rc.cpp:929
 #, no-c-format
 msgid "&Delete Method"
 msgstr "删除方法(&D)"
 
 #. i18n: file ./languages/cpp/addmethoddialogbase.ui line 139
-#: rc.cpp:1154
+#: rc.cpp:932
 #, no-c-format
 msgid "Method Properties"
 msgstr "方法属性"
 
 #. i18n: file ./languages/cpp/addmethoddialogbase.ui line 158
-#: rc.cpp:1157
+#: rc.cpp:935
 #, no-c-format
 msgid "Return t&ype:"
 msgstr "返回类型(&Y)："
 
 #. i18n: file ./languages/cpp/addmethoddialogbase.ui line 182
-#: rc.cpp:1160 rc.cpp:1211
+#: rc.cpp:938 rc.cpp:1320
 #, no-c-format
 msgid "D&eclarator:"
 msgstr "声明(&E)："
 
 #. i18n: file ./languages/cpp/addmethoddialogbase.ui line 208
-#: rc.cpp:1163 rc.cpp:1214
+#: rc.cpp:941 rc.cpp:1323
 #, no-c-format
 msgid "S&torage:"
 msgstr "存储(&T)："
 
 #. i18n: file ./languages/cpp/addmethoddialogbase.ui line 219
-#: rc.cpp:1166
+#: rc.cpp:944
 #, no-c-format
 msgid "&Inline"
 msgstr "内联(&I)"
 
 #. i18n: file ./languages/cpp/addmethoddialogbase.ui line 227
-#: rc.cpp:1169 rc.cpp:1217
+#: rc.cpp:947 rc.cpp:1326
 #, no-c-format
 msgid "Acce&ss:"
 msgstr "访问(&S)："
 
 #. i18n: file ./languages/cpp/addmethoddialogbase.ui line 247
-#: rc.cpp:1172
+#: rc.cpp:950
 #, no-c-format
 msgid "I&mplementation File"
 msgstr "实现文件(&M)"
 
-#. i18n: file ./languages/cpp/addattributedialogbase.ui line 16
-#: rc.cpp:1184
-#, no-c-format
-msgid "Add Attribute"
-msgstr "添加属性"
-
-#. i18n: file ./languages/cpp/addattributedialogbase.ui line 50
-#: kdevdesigner/designer/outputwindow.cpp:83
-#: languages/cpp/debugger/gdbbreakpointwidget.cpp:218
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:230
-#: parts/partexplorer/partexplorerform.cpp:117 rc.cpp:1193 rc.cpp:1253
-#: rc.cpp:2134 rc.cpp:4513 rc.cpp:8010 rc.cpp:8701
-#, no-c-format
-msgid "Type"
-msgstr "类型"
-
-#. i18n: file ./languages/cpp/addattributedialogbase.ui line 110
-#: rc.cpp:1199
-#, no-c-format
-msgid "&Add Attribute"
-msgstr "添加属性(&A)"
-
-#. i18n: file ./languages/cpp/addattributedialogbase.ui line 118
-#: rc.cpp:1202
-#, no-c-format
-msgid "&Delete Attribute"
-msgstr "删除属性(&D)"
-
-#. i18n: file ./languages/cpp/addattributedialogbase.ui line 128
-#: rc.cpp:1205
-#, no-c-format
-msgid "Attribute Properties"
-msgstr "属性特性"
-
-#. i18n: file ./languages/cpp/addattributedialogbase.ui line 147
-#: rc.cpp:1208 rc.cpp:8025
-#, no-c-format
-msgid "T&ype:"
-msgstr "类型(&Y)："
-
-#. i18n: file ./languages/cpp/subclassingdlgbase.ui line 16
-#: rc.cpp:1226
-#, no-c-format
-msgid "Create Subclass"
-msgstr "创建子类"
-
-#. i18n: file ./languages/cpp/subclassingdlgbase.ui line 27
-#: rc.cpp:1229
-#, no-c-format
-msgid "Subclass Properties"
-msgstr "子类属性"
-
-#. i18n: file ./languages/cpp/subclassingdlgbase.ui line 38
-#: rc.cpp:1232 rc.cpp:2137
-#, no-c-format
-msgid "&Specialize following slots:"
-msgstr "专用下列槽(&S)："
-
-#. i18n: file ./languages/cpp/subclassingdlgbase.ui line 62
-#: rc.cpp:1235 rc.cpp:1700 rc.cpp:2143
-#, no-c-format
-msgid "C&lass name:"
-msgstr "类名(&L)："
-
-#. i18n: file ./languages/cpp/subclassingdlgbase.ui line 81
-#: rc.cpp:1238 rc.cpp:2140
-#, no-c-format
-msgid "F&ile name:"
-msgstr "文件名(&I)："
-
-#. i18n: file ./languages/cpp/subclassingdlgbase.ui line 95
-#: parts/classview/classtreebase.cpp:81 rc.cpp:1241 rc.cpp:2122
-#, no-c-format
-msgid "Method"
-msgstr "方法"
-
-#. i18n: file ./languages/cpp/subclassingdlgbase.ui line 117
-#: rc.cpp:1247 rc.cpp:2128 rc.cpp:8695
-#, no-c-format
-msgid "Specifier"
-msgstr "修饰符"
-
-#. i18n: file ./languages/cpp/subclassingdlgbase.ui line 157
-#: rc.cpp:1256 rc.cpp:2116
-#, no-c-format
-msgid "Re&format source"
-msgstr "重新排版源代码(&F)"
-
-#. i18n: file ./languages/cpp/subclassingdlgbase.ui line 173
-#: rc.cpp:1259 rc.cpp:2119
-#, no-c-format
-msgid "Reformat source by &default"
-msgstr "默认重新排版源代码(&D)"
-
-#. i18n: file ./languages/cpp/subclassingdlgbase.ui line 183
-#: rc.cpp:1262 rc.cpp:2146 rc.cpp:7243
+#. i18n: file ./languages/cpp/addmethoddialogbase.ui line 277
+#: lib/widgets/propeditor/pfontbutton.cpp:43
+#: lib/widgets/propeditor/ppixmapedit.cpp:54 rc.cpp:953 rc.cpp:1990
+#: rc.cpp:2078 rc.cpp:2087 rc.cpp:2093 rc.cpp:2138 rc.cpp:4397 rc.cpp:4517
+#: rc.cpp:4656 rc.cpp:4671 rc.cpp:5065 rc.cpp:5071 rc.cpp:5266 rc.cpp:5323
+#: rc.cpp:6085 rc.cpp:6157 rc.cpp:6389 rc.cpp:7444 rc.cpp:8249 rc.cpp:8252
+#: rc.cpp:8312 rc.cpp:8330 rc.cpp:8345 rc.cpp:8612 rc.cpp:8618 rc.cpp:8624
+#: rc.cpp:8849
 #, no-c-format
-msgid "C&reate"
-msgstr "创建(&R)"
+msgid "..."
+msgstr "..."
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 27
-#: rc.cpp:1268
+#: rc.cpp:962
 #, no-c-format
 msgid "Class &Templates"
 msgstr "类模板(&T)"
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 36
-#: rc.cpp:1271
+#: rc.cpp:965
 #, no-c-format
 msgid "Cpp Header"
 msgstr "Cpp 头文件"
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 41
-#: rc.cpp:1274
+#: rc.cpp:968
 #, no-c-format
 msgid "Cpp Source"
 msgstr "Cpp 源文件"
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 46
-#: rc.cpp:1277
+#: rc.cpp:971
 #, no-c-format
 msgid "Objective-C Header"
 msgstr "Objective-C 头文件"
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 51
-#: rc.cpp:1280
+#: rc.cpp:974
 #, no-c-format
 msgid "Objective-C Source"
 msgstr "Objective-C 源文件"
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 56
-#: rc.cpp:1283
+#: rc.cpp:977
 #, no-c-format
 msgid "GTK C Header"
 msgstr "GTK C 头文件"
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 61
-#: rc.cpp:1286
+#: rc.cpp:980
 #, no-c-format
 msgid "GTK C Source"
 msgstr "GTK C 源文件"
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 88
-#: rc.cpp:1289
+#: rc.cpp:983
 #, no-c-format
 msgid "Names"
 msgstr "名称"
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 99
-#: rc.cpp:1292
+#: rc.cpp:986
 #, no-c-format
 msgid "#ifndef - #&define names:"
 msgstr "#ifndef - #&define names:"
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 110
-#: rc.cpp:1295
+#: rc.cpp:989
 #, no-c-format
 msgid "&File names:"
 msgstr "文件名(&F)："
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 119
-#: rc.cpp:1298 rc.cpp:1307 rc.cpp:1319
+#: rc.cpp:992 rc.cpp:1001 rc.cpp:1013
 #, no-c-format
 msgid "Lowercase"
 msgstr "小写"
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 124
-#: rc.cpp:1301 rc.cpp:1310 rc.cpp:1322
+#: rc.cpp:995 rc.cpp:1004 rc.cpp:1016
 #, no-c-format
 msgid "Uppercase"
 msgstr "大写"
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 129
-#: rc.cpp:1304 rc.cpp:1313 rc.cpp:1325
+#: rc.cpp:998 rc.cpp:1007 rc.cpp:1019
 #, no-c-format
 msgid "Same as Class Names"
 msgstr "和类名相同"
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 154
-#: rc.cpp:1316
+#: rc.cpp:1010
 #, no-c-format
 msgid "Same as File Names"
 msgstr "和文件名相同"
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 189
-#: rc.cpp:1328
+#: rc.cpp:1022
 #, no-c-format
 msgid "&Superclass file names:"
 msgstr "超类文件名(&S)："
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 202
-#: rc.cpp:1331
+#: rc.cpp:1025
 #, no-c-format
 msgid "Class Documentation"
 msgstr "类文档"
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 213
-#: rc.cpp:1334
+#: rc.cpp:1028
 #, no-c-format
 msgid "Include &author name in class documentation"
 msgstr "在类文档中包含作者姓名(&A)"
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 221
-#: rc.cpp:1337
+#: rc.cpp:1031
 #, no-c-format
 msgid "Generate &empty documentation strings"
 msgstr "生成空的文档字串(&E)"
 
 #. i18n: file ./languages/cpp/classgeneratorconfigbase.ui line 231
-#: rc.cpp:1340
+#: rc.cpp:1034
 #, no-c-format
 msgid "&Reformat source before creating files"
 msgstr "生成文件之前重新排版源代码(&R)"
 
-#. i18n: file ./languages/cpp/app_templates/kxt/prefs-base.ui line 24
-#: rc.cpp:1343 rc.cpp:1391 rc.cpp:1427 rc.cpp:1981
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 16
+#: rc.cpp:1037 rc.cpp:1966
 #, no-c-format
-msgid "Background color:"
-msgstr "背景色："
+msgid "New Class"
+msgstr "新建类"
 
-#. i18n: file ./languages/cpp/app_templates/kxt/prefs-base.ui line 40
-#: rc.cpp:1346 rc.cpp:1394 rc.cpp:1430 rc.cpp:1984
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 34
+#: rc.cpp:1040
 #, no-c-format
-msgid "Project age:"
-msgstr "工程年龄："
+msgid "Class &Information"
+msgstr "类信息(&I)"
 
-#. i18n: file ./languages/cpp/app_templates/kxt/prefs-base.ui line 48
-#: rc.cpp:1349 rc.cpp:1397 rc.cpp:1433 rc.cpp:1987
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 73
+#: rc.cpp:1043
 #, no-c-format
-msgid "Foreground color:"
-msgstr "前景色："
+msgid "Docu&mentation:"
+msgstr "文档(&M)："
 
-#. i18n: file ./languages/cpp/app_templates/kxt/appview_base.ui line 16
-#: rc.cpp:1352 rc.cpp:1436
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 87
+#: rc.cpp:1046
 #, no-c-format
-msgid "%{APPNAMELC}_base"
-msgstr "%{APPNAMELC}_base"
+msgid ""
+"Insert a short description for your new class\n"
+"here for documentation purposes. This can be used\n"
+"to create API documentation in HTML format with\n"
+"doxygen or similar tools."
+msgstr ""
+"为建立文档考虑，请在这里为您的新类插入一段\n"
+"简短的说明，以后可以用 doxygen 或其它类似工具\n"
+"建立 HTML 格式的 API 文档。"
 
-#. i18n: file ./languages/cpp/app_templates/kxt/appview_base.ui line 27
-#: rc.cpp:1355 rc.cpp:1403 rc.cpp:1439 rc.cpp:1993
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 97
+#: rc.cpp:1052
 #, no-c-format
-msgid "hello, world"
-msgstr "hello, world"
+msgid "File Names"
+msgstr "文件名"
 
-#. i18n: file ./languages/cpp/app_templates/khello2/widgetbase.ui line 27
-#: rc.cpp:1358
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 108
+#: rc.cpp:1055
 #, no-c-format
-msgid "Click Me!"
-msgstr "Click Me!"
+msgid "&Header:"
+msgstr "头文件(&H)："
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 122
+#: rc.cpp:1058
+#, no-c-format
+msgid ""
+"Insert your header file name here.\n"
+"It is automatically inserted while\n"
+"you select the classname, but you can\n"
+"still edit it afterwards."
+msgstr ""
+"在这儿输入您的头文件名。\n"
+"在您选择类名时，它会自动\n"
+"被插入，但以后您仍然可以\n"
+"编辑它。"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 130
+#: rc.cpp:1064
+#, no-c-format
+msgid "Im&plementation:"
+msgstr "实现(&P)："
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 144
+#: rc.cpp:1067
+#, no-c-format
+msgid ""
+"Insert your implementation filename here.\n"
+"It is automatically inserted while\n"
+"you select the classname, but you can\n"
+"still edit it afterwards."
+msgstr ""
+"在此插入您的实现文件名。\n"
+"在您选择类名时，它会自动\n"
+"被插入，但以后您仍然可以\n"
+"编辑它。"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 152
+#: rc.cpp:1073
+#, fuzzy, no-c-format
+msgid "Create only header"
+msgstr "创建元素"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 162
+#: kdevdesigner/designer/hierarchyview.cpp:191
+#: parts/classview/classtreebase.cpp:51 rc.cpp:1076
+#, no-c-format
+msgid "Class"
+msgstr "类"
 
-#. i18n: file ./languages/cpp/app_templates/kdevpart2/globalconfigbase.ui line 16
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 181
+#: buildtools/autotools/addprefixdlg.cpp:29
+#: buildtools/lib/widgets/addenvvardlg.cpp:36 rc.cpp:1079 rc.cpp:2120
+#: rc.cpp:2427 rc.cpp:3128 rc.cpp:4223 rc.cpp:5182 rc.cpp:8582 rc.cpp:8768
+#: rc.cpp:8810
+#, no-c-format
+msgid "&Name:"
+msgstr "名称(&N)："
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 194
+#: rc.cpp:1082
+#, no-c-format
+msgid ""
+"Insert your new classname here.\n"
+"You can also define template classes by specifying\n"
+"template <params> classname"
+msgstr ""
+"在这里插入您的新类名。\n"
+"您也可以使用template <参数> 类名\n"
+"来定义模板类。"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 210
+#: rc.cpp:1087
+#, no-c-format
+msgid "Name&space:"
+msgstr "命名空间(&S)："
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 223
+#: rc.cpp:1090
+#, no-c-format
+msgid ""
+"Insert a name of the namespace here.\n"
+"You can define nested namespaces by specifying\n"
+"Namespace1::Namespace2::...::NamespaceN"
+msgstr ""
+"在这里插入命名空间的名字。\n"
+"您可以使用Namespace1::Namespace2::...::NamespaceN\n"
+"来定义嵌套的命名空间。"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 233
+#: rc.cpp:1095
+#, no-c-format
+msgid "Inheritance"
+msgstr "继承"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 252
+#: languages/ruby/debugger/variablewidget.cpp:62
+#: lib/widgets/propeditor/qeditlistbox.cpp:121 rc.cpp:1098 rc.cpp:1638
+#: rc.cpp:1649 rc.cpp:1671 rc.cpp:1882 rc.cpp:2171 rc.cpp:3122 rc.cpp:4340
+#: rc.cpp:5197 rc.cpp:5392 rc.cpp:7120 rc.cpp:7150 rc.cpp:7438 rc.cpp:8198
+#: rc.cpp:8822
+#, no-c-format
+msgid "&Add"
+msgstr "添加(&A)"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 302
+#: lib/widgets/propeditor/qeditlistbox.cpp:137 rc.cpp:1104 rc.cpp:1879
+#: rc.cpp:2348 rc.cpp:2757 rc.cpp:3631 rc.cpp:8426 rc.cpp:8633 rc.cpp:8684
+#, no-c-format
+msgid "Move &Up"
+msgstr "上移(&U)"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 330
+#: lib/widgets/propeditor/qeditlistbox.cpp:141 rc.cpp:1107 rc.cpp:1876
+#: rc.cpp:2351 rc.cpp:2760 rc.cpp:3634 rc.cpp:8429 rc.cpp:8636 rc.cpp:8687
+#, no-c-format
+msgid "Move &Down"
+msgstr "下移(&D)"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 349
+#: rc.cpp:1110 rc.cpp:1978
+#, no-c-format
+msgid "&Base class:"
+msgstr "基类(&B)："
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 358
+#: rc.cpp:1113
+#, no-c-format
+msgid "Baseclass Name"
+msgstr "基类名称"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 369
+#: rc.cpp:1116
+#, no-c-format
+msgid "Inheritance Type"
+msgstr "继承类型"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 416
+#: rc.cpp:1119
+#, no-c-format
+msgid ""
+"Insert the base class which your new class will be derived from. If you have "
+"checked 'Generate QWidget child class' the new class will be derived from "
+"QWidget. If no base class is named, the new class will not have a parent class. "
+"You can also use template classes here (like BaseClass<int, int>)"
+msgstr ""
+"指明您的新类要从那一个基类派生。如果您选择了“生成 QWidget 的子类”，新类就从 QWidge "
+"t派生。如果没有指定基类，则新类就没有父类。在此您也可以使用模板类(比如 BaseClass<int, int>)。"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 458
+#: languages/ruby/debugger/variablewidget.cpp:834
+#: parts/classview/classtreebase.cpp:154
+#: src/profileengine/editor/profileeditor.cpp:139 rc.cpp:1122 rc.cpp:4680
+#, no-c-format
+msgid "Global"
+msgstr "全局"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 463
+#: rc.cpp:1125 rc.cpp:4683
+#, no-c-format
+msgid "Local"
+msgstr "局部"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 489
+#: rc.cpp:1128
+#, no-c-format
+msgid "Virtual"
+msgstr "虚"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 500
+#: rc.cpp:1131
+#, no-c-format
+msgid "Public"
+msgstr "公有"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 514
+#: rc.cpp:1134
+#, no-c-format
+msgid "Protected"
+msgstr "保护"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 525
+#: rc.cpp:1137
+#, no-c-format
+msgid "Private"
+msgstr "私有"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 548
+#: rc.cpp:1143
+#, no-c-format
+msgid "Use file t&emplates"
+msgstr "使用文件模板(&E)"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 559
+#: rc.cpp:1146
+#, no-c-format
+msgid "Generate QOb&ject child class"
+msgstr "生成 QObject 的子类(&J)"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 567
+#: rc.cpp:1149
+#, no-c-format
+msgid "Generate Q&Widget child class"
+msgstr "生成 QWidget 的子类(&W)"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 575
+#: rc.cpp:1152
+#, no-c-format
+msgid "Generate G&TK+ class"
+msgstr "生成 GTK+ 类(&T)"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 583
+#: rc.cpp:1155
+#, no-c-format
+msgid "Use Objective-C"
+msgstr "使用面向对象的 Objective-C"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 595
+#: rc.cpp:1158
+#, no-c-format
+msgid "Ad&vanced Information"
+msgstr "高级信息(&V)"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 610
+#: rc.cpp:1161
+#, no-c-format
+msgid "Constr&uctors"
+msgstr "构造函数(&U)"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 619
+#: rc.cpp:1164
+#, no-c-format
+msgid "Base Class Constructors"
+msgstr "基类构造函数"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 668
+#: rc.cpp:1167
+#, no-c-format
+msgid "C&reate Constructor >>"
+msgstr "创建构造函数(&R) >>"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 690
+#: rc.cpp:1170
+#, no-c-format
+msgid "C&lear Selection"
+msgstr "清除选择(&L)"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 721
+#: rc.cpp:1173
+#, no-c-format
+msgid "&Header"
+msgstr "头文件(&H)"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 756
+#: rc.cpp:1176
+#, no-c-format
+msgid "&Source"
+msgstr "源文件(&S)"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 794
+#: rc.cpp:1179
+#, no-c-format
+msgid "Methods Ov&erriding"
+msgstr "方法重载(&E)"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 803
+#: languages/cpp/cppnewclassdlg.cpp:851 languages/cpp/cppnewclassdlg.cpp:854
+#: languages/cpp/cppnewclassdlg.cpp:1010 languages/cpp/cppnewclassdlg.cpp:1013
+#: rc.cpp:1182
+#, no-c-format
+msgid "Methods"
+msgstr "方法"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 814
+#: rc.cpp:1185
+#, no-c-format
+msgid "Extend Functionality"
+msgstr "扩展功能"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 849
+#: rc.cpp:1188
+#, no-c-format
+msgid "&Access Control"
+msgstr "访问控制(&A)"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 858
+#: rc.cpp:1191
+#, no-c-format
+msgid "Methods & Attributes"
+msgstr "方法和属性"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 869
+#: rc.cpp:1194
+#, no-c-format
+msgid "Implied Modifier"
+msgstr "隐式修饰符"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 880
+#: rc.cpp:1197
+#, no-c-format
+msgid "New Modifier"
+msgstr "新建修饰符"
+
+#. i18n: file ./languages/cpp/cppnewclassdlgbase.ui line 923
+#: rc.cpp:1200
+#, no-c-format
+msgid "&Generation Options"
+msgstr "代码生成选项(&G)"
+
+#. i18n: file ./languages/cpp/configproblemreporter.ui line 24
+#: languages/cpp/cppsupportpart.cpp:585 rc.cpp:1209
+#, no-c-format
+msgid "Problem Reporter"
+msgstr "问题报告者"
+
+#. i18n: file ./languages/cpp/configproblemreporter.ui line 28
+#: rc.cpp:1212
+#, no-c-format
+msgid ""
+"If enabled, the C++ parser will report any syntax errors it detects. \n"
+"They will be displayed in the 'Problems' output view and as markers in the "
+"editor."
+msgstr ""
+
+#. i18n: file ./languages/cpp/configproblemreporter.ui line 39
+#: rc.cpp:1216
+#, fuzzy, no-c-format
+msgid "&Use Problem Reporter"
+msgstr "问题报告者"
+
+#. i18n: file ./languages/cpp/configproblemreporter.ui line 52
+#: rc.cpp:1219
+#, no-c-format
+msgid "Parsing"
+msgstr "分析"
+
+#. i18n: file ./languages/cpp/configproblemreporter.ui line 57
+#: rc.cpp:1222
+#, no-c-format
+msgid ""
+"If enabled, the C++ parser will run on the active file after the stated "
+"timeout, after there has been any changes to the text.\n"
+"\n"
+"If disabled, the parser will typically only run when the file is saved."
+msgstr ""
+
+#. i18n: file ./languages/cpp/configproblemreporter.ui line 76
+#: rc.cpp:1227
+#, fuzzy, no-c-format
+msgid "Enable &background parsing"
+msgstr "启用后台分析(&E)"
+
+#. i18n: file ./languages/cpp/configproblemreporter.ui line 133
+#: rc.cpp:1233
+#, no-c-format
+msgid "Special &Headers"
+msgstr "特殊头文件(&H)"
+
+#. i18n: file ./languages/cpp/configproblemreporter.ui line 136
+#: rc.cpp:1236
+#, no-c-format
+msgid ""
+"Often a macro that the C++ parser must understand in order to correctly parse a "
+"piece of code is defined somewhere in a non-standard header file that the "
+"parser does not look at. This textbox can be used to define those macros "
+"locally so that the C++ parser can understand them."
+msgstr ""
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 44
+#: rc.cpp:1239
+#, no-c-format
+msgid "&inline"
+msgstr "内联(&I)"
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 50
+#: rc.cpp:1242
+#, no-c-format
+msgid "create an inline get method"
+msgstr "创建内联 get 方法"
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 53
+#: rc.cpp:1245
+#, no-c-format
+msgid ""
+"If this is checked the get method will be created inline; otherwise, it will "
+"not."
+msgstr ""
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 61
+#: rc.cpp:1248
+#, no-c-format
+msgid "&get method"
+msgstr "get 方法(&G)"
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 67
+#: rc.cpp:1251
+#, no-c-format
+msgid "create get method"
+msgstr "创建 get 方法"
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 70
+#: rc.cpp:1254
+#, no-c-format
+msgid "If this is checked a getter method will be created."
+msgstr ""
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 78
+#: rc.cpp:1257
+#, no-c-format
+msgid "&set method"
+msgstr "set 方法(&S)"
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 84
+#: rc.cpp:1260
+#, no-c-format
+msgid "create set method"
+msgstr "创建 set 方法"
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 87
+#: rc.cpp:1263
+#, no-c-format
+msgid "If this is checked a set method will be created"
+msgstr ""
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 95
+#: rc.cpp:1266
+#, no-c-format
+msgid "name of the get method"
+msgstr "get 方法的名称"
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 98
+#: rc.cpp:1269
+#, no-c-format
+msgid "The name of the created get method"
+msgstr "所创建的 get 方法的名称"
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 106
+#: rc.cpp:1272
+#, no-c-format
+msgid "name of the set method"
+msgstr "set 方法的名称"
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 109
+#: rc.cpp:1275
+#, no-c-format
+msgid "The name of the created set method"
+msgstr "所创建的 set 方法的名称"
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 117
+#: rc.cpp:1278
+#, no-c-format
+msgid "i&nline"
+msgstr "内联(&N)"
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 123
+#: rc.cpp:1281
+#, no-c-format
+msgid "create an inline set method"
+msgstr "创建内联的 set 方法"
+
+#. i18n: file ./languages/cpp/creategettersetter.ui line 126
+#: rc.cpp:1284
+#, no-c-format
+msgid ""
+"If this is checked the set method will be created inline; otherwise, it will "
+"not."
+msgstr ""
+
+#. i18n: file ./languages/cpp/addattributedialogbase.ui line 16
+#: rc.cpp:1293
+#, no-c-format
+msgid "Add Attribute"
+msgstr "添加属性"
+
+#. i18n: file ./languages/cpp/addattributedialogbase.ui line 110
+#: rc.cpp:1308
+#, no-c-format
+msgid "&Add Attribute"
+msgstr "添加属性(&A)"
+
+#. i18n: file ./languages/cpp/addattributedialogbase.ui line 118
+#: rc.cpp:1311
+#, no-c-format
+msgid "&Delete Attribute"
+msgstr "删除属性(&D)"
+
+#. i18n: file ./languages/cpp/addattributedialogbase.ui line 128
+#: rc.cpp:1314
+#, no-c-format
+msgid "Attribute Properties"
+msgstr "属性特性"
+
+#. i18n: file ./languages/cpp/addattributedialogbase.ui line 147
+#: rc.cpp:1317 rc.cpp:4960
+#, no-c-format
+msgid "T&ype:"
+msgstr "类型(&Y)："
+
+#. i18n: file ./languages/cpp/app_templates/kdevpart2/projectconfigbase.ui line 16
 #: languages/cpp/app_templates/kapp/main.cpp:23
-#: languages/cpp/app_templates/kateplugin2/plugin_app.h:49
-#: languages/cpp/app_templates/tdeconfig35/main.cpp:22
+#: languages/cpp/app_templates/kateplugin2/plugin_app.h:51
 #: languages/cpp/app_templates/kdedcop/main.cpp:22
 #: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:61
 #: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:62
@@ -1988,74 +1901,111 @@ msgstr "Click Me!"
 #: languages/cpp/app_templates/kmake/app.cpp:21
 #: languages/cpp/app_templates/kofficepart/kopart_aboutdata.h:17
 #: languages/cpp/app_templates/kpartapp/main.cpp:21
-#: languages/cpp/app_templates/kscons_tdemdi/main.cpp:24
 #: languages/cpp/app_templates/kscons_kxt/main.cpp:22
+#: languages/cpp/app_templates/kscons_tdemdi/main.cpp:24
+#: languages/cpp/app_templates/kxt/main.cpp:22
+#: languages/cpp/app_templates/tdeconfig35/main.cpp:22
 #: languages/cpp/app_templates/tdescreensaver/tdescreensaver.cpp:18
-#: languages/cpp/app_templates/kxt/main.cpp:22 rc.cpp:1361 rc.cpp:1364
-#: rc.cpp:1385 rc.cpp:1388 rc.cpp:1409 rc.cpp:1418
+#: rc.cpp:1335 rc.cpp:1338 rc.cpp:1341 rc.cpp:1359 rc.cpp:1368 rc.cpp:1371
 #, no-c-format
 msgid "%{APPNAME}"
 msgstr "%{APPNAME}"
 
+#. i18n: file ./languages/cpp/app_templates/opieapp/examplebase.ui line 32
+#: rc.cpp:1344 rc.cpp:1362
+#, no-c-format
+msgid ""
+"<p>This is just an <i>%{APPNAMELC}</i>; it does not do anything interesting at "
+"all."
+msgstr "<p>这仅仅是 <i>%{APPNAMELC}</i>；它不做任何事情。"
+
+#. i18n: file ./languages/cpp/app_templates/khello2/widgetbase.ui line 27
+#: rc.cpp:1350
+#, no-c-format
+msgid "Click Me!"
+msgstr "Click Me!"
+
 #. i18n: file ./languages/cpp/app_templates/kmake/mainview.ui line 32
 #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:108
-#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:32 rc.cpp:1367
+#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:32 rc.cpp:1353
 #, no-c-format
 msgid "Output"
 msgstr "输出"
 
 #. i18n: file ./languages/cpp/app_templates/kmake/mainview.ui line 59
-#: rc.cpp:1370
+#: rc.cpp:1356
 #, no-c-format
 msgid "Hello"
 msgstr "Hello"
 
+#. i18n: file ./languages/cpp/app_templates/kscons_tdemdi/prefs.ui line 24
+#: rc.cpp:1374
+#, no-c-format
+msgid "Show close buttons on the right of tabs"
+msgstr "在标签右侧显示关闭按钮"
+
 #. i18n: file ./languages/cpp/app_templates/tdescreensaver/tdescreensaverui.ui line 18
-#: rc.cpp:1373
+#: rc.cpp:1377
 #, no-c-format
 msgid "Screen Saver Config"
 msgstr "屏幕保护配置"
 
 #. i18n: file ./languages/cpp/app_templates/tdescreensaver/tdescreensaverui.ui line 41
-#: rc.cpp:1376
+#: rc.cpp:1380
 #, no-c-format
 msgid "Set some setting"
 msgstr "设置一些选项"
 
-#. i18n: file ./languages/cpp/app_templates/kscons_kxt/appview_base.ui line 18
-#: rc.cpp:1400
+#. i18n: file ./languages/cpp/app_templates/kxt/appview_base.ui line 16
+#: rc.cpp:1389 rc.cpp:1404
 #, no-c-format
-msgid "%{APPNAME}_base"
-msgstr "%{APPNAME}_base"
+msgid "%{APPNAMELC}_base"
+msgstr "%{APPNAMELC}_base"
 
-#. i18n: file ./languages/cpp/app_templates/kscons_tdemdi/prefs.ui line 24
-#: rc.cpp:1406
+#. i18n: file ./languages/cpp/app_templates/kxt/appview_base.ui line 27
+#: rc.cpp:1392 rc.cpp:1407 rc.cpp:1422 rc.cpp:1789
 #, no-c-format
-msgid "Show close buttons on the right of tabs"
-msgstr "在标签右侧显示关闭按钮"
+msgid "hello, world"
+msgstr "hello, world"
 
-#. i18n: file ./languages/cpp/app_templates/qtopiaapp/examplebase.ui line 32
-#: rc.cpp:1412 rc.cpp:1421
+#. i18n: file ./languages/cpp/app_templates/kxt/prefs-base.ui line 24
+#: rc.cpp:1395 rc.cpp:1410 rc.cpp:1425 rc.cpp:1792
 #, no-c-format
-msgid ""
-"<p>This is just an <i>%{APPNAMELC}</i>; it does not do anything interesting at "
-"all."
-msgstr "<p>这仅仅是 <i>%{APPNAMELC}</i>；它不做任何事情。"
+msgid "Background color:"
+msgstr "背景色："
+
+#. i18n: file ./languages/cpp/app_templates/kxt/prefs-base.ui line 40
+#: rc.cpp:1398 rc.cpp:1413 rc.cpp:1428 rc.cpp:1795
+#, no-c-format
+msgid "Project age:"
+msgstr "工程年龄："
+
+#. i18n: file ./languages/cpp/app_templates/kxt/prefs-base.ui line 48
+#: rc.cpp:1401 rc.cpp:1416 rc.cpp:1431 rc.cpp:1798
+#, no-c-format
+msgid "Foreground color:"
+msgstr "前景色："
+
+#. i18n: file ./languages/cpp/app_templates/kscons_kxt/appview_base.ui line 18
+#: rc.cpp:1419
+#, no-c-format
+msgid "%{APPNAME}_base"
+msgstr "%{APPNAME}_base"
 
 #. i18n: file ./languages/cpp/debugger/debuggertracingdialogbase.ui line 16
-#: rc.cpp:1442
+#: rc.cpp:1434
 #, no-c-format
 msgid "Tracing Configuration"
 msgstr "跟踪配置"
 
 #. i18n: file ./languages/cpp/debugger/debuggertracingdialogbase.ui line 27
-#: rc.cpp:1445
+#: rc.cpp:1437
 #, no-c-format
 msgid "Enable tracing"
 msgstr "启用跟踪"
 
 #. i18n: file ./languages/cpp/debugger/debuggertracingdialogbase.ui line 31
-#: rc.cpp:1448
+#: rc.cpp:1440
 #, no-c-format
 msgid ""
 "<b>Enable tracing</b>\n"
@@ -2065,13 +2015,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggertracingdialogbase.ui line 50
-#: rc.cpp:1455
+#: rc.cpp:1447
 #, no-c-format
 msgid "Custom format string"
 msgstr "自定义格式字符串"
 
 #. i18n: file ./languages/cpp/debugger/debuggertracingdialogbase.ui line 92
-#: rc.cpp:1461
+#: rc.cpp:1453
 #, no-c-format
 msgid ""
 "<b>Custom format string</b>\n"
@@ -2083,19 +2033,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggertracingdialogbase.ui line 114
-#: rc.cpp:1467
+#: rc.cpp:1459
 #, no-c-format
 msgid "Expressions to print:"
 msgstr "要打印的表达式："
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 16
-#: rc.cpp:1470
+#: rc.cpp:1462
 #, no-c-format
 msgid "Debugger Configuration"
 msgstr "调试器配置"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 34
-#: rc.cpp:1473
+#: rc.cpp:1465
 #, no-c-format
 msgid ""
 "Debug arguments can be set on the Run Options page\n"
@@ -2103,19 +2053,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 50
-#: rc.cpp:1477
+#: rc.cpp:1469
 #, no-c-format
 msgid "Debugger executable:"
 msgstr "调试器程序："
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 61
-#: rc.cpp:1480
+#: rc.cpp:1472
 #, fuzzy, no-c-format
 msgid "Gdb executable"
 msgstr "htdig 可执行文件(&G)："
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 64
-#: rc.cpp:1483
+#: rc.cpp:1475
 #, no-c-format
 msgid ""
 "To run \"gdb\" binary from $PATH, leave this field empty. To run custom gdb, "
@@ -2125,19 +2075,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 80
-#: rc.cpp:1486
+#: rc.cpp:1478
 #, no-c-format
 msgid "Debugging &shell:"
 msgstr "调试器外壳(&S)："
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 86
-#: rc.cpp:1489 rc.cpp:1495
+#: rc.cpp:1481 rc.cpp:1487
 #, fuzzy, no-c-format
 msgid "Run gdb in a special shell (mainly for automake projects)"
 msgstr "在特殊的 shell 中运行 gdb"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 89
-#: rc.cpp:1492
+#: rc.cpp:1484
 #, no-c-format
 msgid ""
 "If you want gdb to be executed by a special shell or tool insert it here. The "
@@ -2146,7 +2096,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 100
-#: rc.cpp:1498
+#: rc.cpp:1490
 #, no-c-format
 msgid ""
 "If you want gdb to be executed by a special shell or tool insert it here. The "
@@ -2155,13 +2105,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 127
-#: rc.cpp:1504
+#: rc.cpp:1496
 #, no-c-format
 msgid "Display &demangled names"
 msgstr "显示解码后的方法名(&D)"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 132
-#: rc.cpp:1507
+#: rc.cpp:1499
 #, no-c-format
 msgid ""
 "When displaying the disassembled code you\n"
@@ -2172,13 +2122,13 @@ msgstr ""
 "然而未编码的方法名要容易阅读得多。"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 140
-#: rc.cpp:1512
+#: rc.cpp:1504
 #, no-c-format
 msgid "Try settings &breakpoints on library loading"
 msgstr "尝试当载入库的时候设置断点(&B)"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 149
-#: rc.cpp:1515
+#: rc.cpp:1507
 #, fuzzy, no-c-format
 msgid ""
 "If GDB has not seen a library that will be loaded via\n"
@@ -2198,19 +2148,19 @@ msgstr ""
 "如果您不是用“dlopen”加载库，请不要选择这项。"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 157
-#: rc.cpp:1524
+#: rc.cpp:1516
 #, no-c-format
 msgid "Enable separate terminal for application &IO"
 msgstr "为应用程序输入输出启用单独的终端(&I)"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 160
-#: rc.cpp:1527
+#: rc.cpp:1519
 #, fuzzy, no-c-format
 msgid "Alt+I"
 msgstr "Alt+1"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 166
-#: rc.cpp:1530
+#: rc.cpp:1522
 #, no-c-format
 msgid ""
 "This allows you to enter terminal input when your\n"
@@ -2223,27 +2173,27 @@ msgstr ""
 "请选中此选项，反之请不要选中它。"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 174
-#: rc.cpp:1536
+#: rc.cpp:1528
 #, no-c-format
 msgid "E&nable floating toolbar"
 msgstr "启用浮动工具栏(&N)"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 177
-#: rc.cpp:1539 rc.cpp:2369
+#: rc.cpp:1531 rc.cpp:4132
 #, fuzzy, no-c-format
 msgid "Alt+N"
 msgstr "Alt+1"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 185
-#: rc.cpp:1542
-#, no-c-format
+#: rc.cpp:1534
+#, fuzzy, no-c-format
 msgid ""
 "Use the floating toolbar. This toolbar always stays\n"
-"on top of all windows so that if the app covers KDevelop\n"
+"on top of all windows so that if the app covers TDevelop\n"
 "you have control of the app through the small toolbar. It\n"
 "can also be docked into the panel.\n"
 "\n"
-"This toolbar is in addition to the toolbar in KDevelop."
+"This toolbar is in addition to the toolbar in TDevelop."
 msgstr ""
 "使用可以浮动的工具栏。这种工具栏通常呆在\n"
 "所有的窗口的顶部，因此如果一个应用程序覆盖\n"
@@ -2253,25 +2203,25 @@ msgstr ""
 "这个工具栏是 KDevelop 工具栏之外的一个补充。"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 193
-#: rc.cpp:1550
+#: rc.cpp:1542
 #, no-c-format
 msgid "Display static &members"
 msgstr "显示静态成员(&M)"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 196
-#: rc.cpp:1553
+#: rc.cpp:1545
 #, fuzzy, no-c-format
 msgid "Alt+M"
 msgstr "Alt+1"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 204
-#: rc.cpp:1556
-#, no-c-format
+#: rc.cpp:1548
+#, fuzzy, no-c-format
 msgid ""
 "Displaying static members makes GDB slower in\n"
-"producing data within TDE and Qt.\n"
+"producing data within TDE and TQt.\n"
 "It may change the \"signature\" of the data\n"
-"which QString and friends rely on,\n"
+"which TQString and friends rely on,\n"
 "but if you need to debug into these values then\n"
 "check this option."
 msgstr ""
@@ -2283,55 +2233,55 @@ msgstr ""
 "请选中这个选项。"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 222
-#: rc.cpp:1564
+#: rc.cpp:1556
 #, no-c-format
 msgid "Global Output Radix"
 msgstr "全局输出数制"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 233
-#: rc.cpp:1567
+#: rc.cpp:1559
 #, no-c-format
 msgid "Oct&al"
 msgstr "八进制(&A)"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 241
-#: rc.cpp:1570
+#: rc.cpp:1562
 #, no-c-format
 msgid "He&xadecimal"
 msgstr "十六进制(&X)"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 249
-#: languages/cpp/debugger/variablewidget.cpp:278 rc.cpp:1573
+#: languages/cpp/debugger/variablewidget.cpp:278 rc.cpp:1565
 #, no-c-format
 msgid "Decimal"
 msgstr "十进制"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 259
-#: rc.cpp:1576
+#: rc.cpp:1568
 #, fuzzy, no-c-format
 msgid "Start Debugger With"
 msgstr "在调试器中运行"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 270
-#: rc.cpp:1579
+#: rc.cpp:1571
 #, fuzzy, no-c-format
 msgid "Framestack"
 msgstr "堆栈框架"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 278
-#: languages/cpp/debugger/debuggerpart.cpp:159 rc.cpp:1582
+#: languages/cpp/debugger/debuggerpart.cpp:159 rc.cpp:1574
 #, fuzzy, no-c-format
 msgid "GDB Output"
 msgstr "GDB 输出"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 292
-#: rc.cpp:1585
+#: rc.cpp:1577
 #, no-c-format
 msgid "Remote Debugging"
 msgstr "远程调试"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 298
-#: rc.cpp:1588
+#: rc.cpp:1580
 #, no-c-format
 msgid ""
 "This script is intended for the actual commands needed to connect to a remotely "
@@ -2346,19 +2296,19 @@ msgstr ""
 "\tcontinue\t[optional] 调试运行到第一个断点。"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 317
-#: rc.cpp:1594
+#: rc.cpp:1586
 #, no-c-format
 msgid "R&un shell script:"
 msgstr "运行 shell 脚本(&U)："
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 332
-#: rc.cpp:1597
+#: rc.cpp:1589
 #, no-c-format
 msgid "Script to connect with remote application"
 msgstr "连接远程应用程序的脚本"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 339
-#: rc.cpp:1600
+#: rc.cpp:1592
 #, fuzzy, no-c-format
 msgid ""
 "This script is sourced by gdb after the two preceding scripts have been "
@@ -2375,13 +2325,13 @@ msgstr ""
 "\tcontinue\t[optional] 调试运行到第一个断点。"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 347
-#: rc.cpp:1607
+#: rc.cpp:1599
 #, no-c-format
 msgid "Script to start remote application"
 msgstr "启动远程应用程序的脚本"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 356
-#: rc.cpp:1610
+#: rc.cpp:1602
 #, fuzzy, no-c-format
 msgid ""
 "This shell script is run after the Config gdb script has been sourced by gdb.\n"
@@ -2402,53 +2352,79 @@ msgstr ""
 "2b)在目标平台上运行\"应用程序\"。"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 364
-#: rc.cpp:1619
+#: rc.cpp:1611
 #, no-c-format
 msgid "Run &gdb script:"
 msgstr "运行 gdb 脚本(&G)："
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 376
-#: rc.cpp:1622
+#: rc.cpp:1614
 #, no-c-format
 msgid "&Config gdb script:"
 msgstr "配置 gdb 脚本(&C)："
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 387
-#: rc.cpp:1625
+#: rc.cpp:1617
 #, no-c-format
 msgid "Gdb configure script"
 msgstr "Gdb 配置脚本"
 
 #. i18n: file ./languages/cpp/debugger/debuggerconfigwidgetbase.ui line 390
-#: rc.cpp:1628
+#: rc.cpp:1620
 #, no-c-format
 msgid "This script is sourced by gdb when the debugging starts."
 msgstr ""
 
+#. i18n: file ./languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui line 32
+#: rc.cpp:1623
+#, no-c-format
+msgid "*.h;*.H;*.hh;*.hxx;*.hpp;*.tlh"
+msgstr "*.h;*.H;*.hh;*.hxx;*.hpp;*.tlh"
+
+#. i18n: file ./languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui line 40
+#: rc.cpp:1626
+#, fuzzy, no-c-format
+msgid "Filename pattern:"
+msgstr "示例模板"
+
+#. i18n: file ./languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui line 48
+#: rc.cpp:1629
+#, no-c-format
+msgid "&Recursive"
+msgstr "递归(&R)"
+
 #. i18n: file ./languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui line 57
-#: rc.cpp:1631 rc.cpp:1657
+#: rc.cpp:1632 rc.cpp:1665
 #, fuzzy, no-c-format
 msgid "Scope:"
 msgstr "评分"
 
 #. i18n: file ./languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui line 73
-#: rc.cpp:1634
+#: rc.cpp:1635
 #, no-c-format
 msgid ""
-"Select the Qt configuration to create a Code Completion database for. If you "
-"don't know what this option does, just go with the default."
+"Select the Qt configuration for which to create a Code Completion database. If "
+"you do not know what this option does, accept the default."
 msgstr ""
 
 #. i18n: file ./languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui line 105
-#: rc.cpp:1640
+#: rc.cpp:1641
 #, no-c-format
 msgid ""
 "Qt3 include directories:\n"
 "Only the selected entry will be used"
 msgstr ""
 
+#. i18n: file ./languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui line 25
+#: rc.cpp:1645
+#, no-c-format
+msgid ""
+"Qt4 include directories:\n"
+"Only the selected entry will be used"
+msgstr ""
+
 #. i18n: file ./languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui line 25
-#: rc.cpp:1644
+#: rc.cpp:1652
 #, no-c-format
 msgid ""
 "TDE include directories:\n"
@@ -2456,19 +2432,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui line 31
-#: rc.cpp:1648
+#: rc.cpp:1656
 #, no-c-format
 msgid "TDE Libs Headers"
 msgstr "TDE 库头文件"
 
 #. i18n: file ./languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui line 36
-#: rc.cpp:1651
+#: rc.cpp:1659
 #, no-c-format
 msgid "All TDE Headers"
 msgstr "所有 TDE 头文件"
 
 #. i18n: file ./languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui line 46
-#: rc.cpp:1654
+#: rc.cpp:1662
 #, no-c-format
 msgid ""
 "Decide if you want to restrict the Code Completion database to only the base "
@@ -2476,372 +2452,87 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui line 65
-#: rc.cpp:1660
+#: rc.cpp:1668
 #, no-c-format
 msgid ""
-"If none of the directories KDevelop found is what you want,you can enter a "
+"If none of the directories TDevelop found is what you want,you can enter a "
 "directory of your choice here"
 msgstr ""
 
-#. i18n: file ./languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui line 25
-#: rc.cpp:1666
-#, no-c-format
-msgid ""
-"Qt4 include directories:\n"
-"Only the selected entry will be used"
-msgstr ""
-
-#. i18n: file ./languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui line 32
-#: rc.cpp:1673
-#, no-c-format
-msgid "*.h;*.H;*.hh;*.hxx;*.hpp;*.tlh"
-msgstr "*.h;*.H;*.hh;*.hxx;*.hpp;*.tlh"
-
-#. i18n: file ./languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui line 40
-#: rc.cpp:1676
-#, fuzzy, no-c-format
-msgid "Filename pattern:"
-msgstr "示例模板"
-
-#. i18n: file ./languages/cpp/pcsimporter/customimporter/settingsdialogbase.ui line 48
-#: rc.cpp:1679
-#, no-c-format
-msgid "&Recursive"
-msgstr "递归(&R)"
-
-#. i18n: file ./languages/lib/designer_integration/implementationwidgetbase.ui line 16
-#: rc.cpp:1682
-#, no-c-format
-msgid "Create or Select Implementation Class"
-msgstr "创建或选择实现类"
-
-#. i18n: file ./languages/lib/designer_integration/implementationwidgetbase.ui line 100
-#: rc.cpp:1691
-#, no-c-format
-msgid "Create &new class"
-msgstr "创建新类(&N)"
-
-#. i18n: file ./languages/lib/designer_integration/implementationwidgetbase.ui line 109
-#: rc.cpp:1694
-#, no-c-format
-msgid "Class Name"
-msgstr "类名"
-
-#. i18n: file ./languages/lib/designer_integration/implementationwidgetbase.ui line 167
-#: rc.cpp:1703
-#, no-c-format
-msgid "Use &existing class"
-msgstr "使用已有类(&E)"
-
-#. i18n: file ./languages/lib/designer_integration/implementationwidgetbase.ui line 183
-#: buildtools/script/scriptnewfiledlg.cpp:38
-#: parts/filecreate/filecreate_newfile.cpp:46 rc.cpp:1706 rc.cpp:1730
-#: rc.cpp:6176 rc.cpp:6239
-#, no-c-format
-msgid "&File name:"
-msgstr "文件名(&F)："
-
-#. i18n: file ./languages/php/phpnewclassdlgbase.ui line 27
-#: parts/quickopen/quickopenclassdialog.cpp:41 rc.cpp:1712 rc.cpp:8191
-#, no-c-format
-msgid "Class &name:"
-msgstr "类名(&N)："
-
-#. i18n: file ./languages/php/phpnewclassdlgbase.ui line 95
-#: rc.cpp:1724
-#, no-c-format
-msgid "Class &template:"
-msgstr "类模板(&T)："
-
-#. i18n: file ./languages/php/phpnewclassdlgbase.ui line 106
-#: parts/filecreate/filecreate_newfile.cpp:41 parts/grepview/grepdlg.cpp:132
-#: rc.cpp:1727 rc.cpp:3519
-#, no-c-format
-msgid "&Directory:"
-msgstr "目录(&D)："
-
-#. i18n: file ./languages/php/phpnewclassdlgbase.ui line 163
-#: rc.cpp:1736
-#, no-c-format
-msgid ""
-"<?php\n"
-"if (!defined(\"FILENAME\")){\n"
-"define(\"FILENAME\",0);\n"
-"/*\n"
-"* @author AUTHOR\n"
-"*/\n"
-"\n"
-"class CLASSNAME extends BASECLASS {\n"
-"  //constructor\n"
-"  function CLASSNAME(){\n"
-"   BASECLASS::BASECLASS();\n"
-"  }\n"
-" }\n"
-"}\n"
-"?>"
-msgstr ""
-"<?php\n"
-"if (!defined(\"FILENAME\")){\n"
-"define(\"FILENAME\",0);\n"
-"/*\n"
-"* @author 作者名\n"
-"*/\n"
-"\n"
-"class CLASSNAME extends BASECLASS {\n"
-"  //构造函数\n"
-"  function CLASSNAME(){\n"
-"   BASECLASS::BASECLASS();\n"
-"  }\n"
-" }\n"
-"}\n"
-"?>"
-
-#. i18n: file ./languages/php/phpinfodlg.ui line 16
-#: rc.cpp:1753
-#, no-c-format
-msgid "PHP Information"
-msgstr "PHP 信息"
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 16
-#: rc.cpp:1759
-#, no-c-format
-msgid "PHP Options"
-msgstr "PHP 选项"
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 31
-#: rc.cpp:1762
-#, no-c-format
-msgid "Genera&l"
-msgstr "常规(&L)"
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 42
-#: rc.cpp:1765
-#, no-c-format
-msgid "&Startup"
-msgstr "启动(&S)"
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 53
-#: rc.cpp:1768
-#, no-c-format
-msgid "Use current file in editor"
-msgstr "使用编辑器里的当前文件"
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 67
-#: rc.cpp:1771
-#, no-c-format
-msgid "Use &this file as default:"
-msgstr "默认使用这个文件(&T)："
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 85
-#: rc.cpp:1774
-#, no-c-format
-msgid "Code Help"
-msgstr "编码帮助"
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 96
-#: rc.cpp:1777
-#, no-c-format
-msgid "&Enable code completion"
-msgstr "启用代码补全(&E)"
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 104
-#: rc.cpp:1780
-#, no-c-format
-msgid "Enable code &hinting"
-msgstr "启用代码提示(&H)"
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 114
-#: rc.cpp:1783
-#, no-c-format
-msgid "Parser"
-msgstr "分析器"
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 125
-#: rc.cpp:1786
-#, no-c-format
-msgid "PHP &include path:"
-msgstr "PHP 包含路径(&I)："
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 141
-#: rc.cpp:1789
-#, no-c-format
-msgid "Ena&ble realtime parser"
-msgstr "启用实时分析器(&B)"
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 189
-#: rc.cpp:1792
-#, no-c-format
-msgid "In&vocation"
-msgstr "调用(&V)"
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 200
-#: rc.cpp:1795
-#, no-c-format
-msgid "Please select how KDevelop should execute your scripts."
-msgstr "请选择 KDevelop 应该如何执行您的脚本。"
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 208
-#: rc.cpp:1798
-#, no-c-format
-msgid "Invocation Mode"
-msgstr "调用模式"
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 222
-#: rc.cpp:1801
-#, no-c-format
-msgid "Ca&lling the PHP interpreter directly"
-msgstr "直接调用 PHP 解释器(&L)"
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 231
-#: rc.cpp:1804
-#, no-c-format
-msgid ""
-"<font size=\"+1\">The php executable is called directly. Ideal for developers "
-"who want to develop terminal or graphical applications in PHP. \n"
-"You need a correctly installed php cgi version.</font>"
-msgstr ""
-"<font size=\"+1\">直接调用 PHP 可执行程序，这对用 PHP 开发终端或图形程序的开发者最为理想。\n"
-"您需要一个安装正确的 PHP CGI 版本。</font>"
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 246
-#: rc.cpp:1808
-#, no-c-format
-msgid "Using an &existing webserver (local or remote)"
-msgstr "使用已有的 Web 服务器(本地或远程)(&E)"
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 255
-#: rc.cpp:1811
-#, no-c-format
-msgid ""
-"<font size=\"+1\">Uses an existing webserver. The pages are previewed in \n"
-"the internal web browser. Please make sure that the webserver was compiled with "
-"PHP support.</font>"
-msgstr ""
-"<font size=\"+1\">使用一个外部的 Web 服务器。输出的网页将用内部的 Web 浏览器显示。请确保该 Web 服务器编译的时候加入了 PHP "
-"支持。</font>"
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 289
-#: rc.cpp:1815
-#, no-c-format
-msgid "&Webserver"
-msgstr "Web 服务器(&W)"
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 300
-#: rc.cpp:1818
-#, no-c-format
-msgid "Pro&ject root URL on webserver:"
-msgstr "工程在 Web 服务器上的根 URL(&J)："
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 335
-#: rc.cpp:1821
-#, no-c-format
-msgid "&Shell"
-msgstr "Shell(&S)"
-
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 346
-#: rc.cpp:1824
+#. i18n: file ./languages/perl/perlconfigwidgetbase.ui line 16
+#: parts/doxygen/messages.cpp:218 rc.cpp:1674
 #, no-c-format
-msgid "PHP &executable:"
-msgstr "PHP 可执行文件(&E)："
+msgid "Perl"
+msgstr "Perl"
 
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 400
-#: rc.cpp:1833
+#. i18n: file ./languages/perl/perlconfigwidgetbase.ui line 28
+#: rc.cpp:1677
 #, no-c-format
-msgid "PHP &Ini File:"
-msgstr "PHP Ini 文件(&I)："
+msgid "Perl &interpreter:"
+msgstr "Perl 解释器(&I)："
 
-#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 449
-#: rc.cpp:1839
+#. i18n: file ./languages/perl/perlconfigwidgetbase.ui line 80
+#: rc.cpp:1680 rc.cpp:1834 rc.cpp:1858
 #, no-c-format
-msgid "Load &Zend extension:"
-msgstr "加载 Zend 扩展(&Z)："
+msgid "&Execute programs in a terminal"
+msgstr "在终端里执行程序(&E)"
 
 #. i18n: file ./languages/sql/sqlconfigwidget.ui line 22
-#: rc.cpp:1845 rc.cpp:5662
+#: rc.cpp:1683 rc.cpp:7798
 #, no-c-format
 msgid "Plugin"
 msgstr "插件"
 
 #. i18n: file ./languages/sql/sqlconfigwidget.ui line 30
-#: rc.cpp:1848
+#: rc.cpp:1686
 #, no-c-format
 msgid "Database Name"
 msgstr "数据库名称"
 
 #. i18n: file ./languages/sql/sqlconfigwidget.ui line 38
-#: rc.cpp:1851
+#: rc.cpp:1689
 #, no-c-format
 msgid "Host"
 msgstr "主机"
 
 #. i18n: file ./languages/sql/sqlconfigwidget.ui line 46
-#: rc.cpp:1854
+#: rc.cpp:1692
 #, no-c-format
 msgid "Port"
 msgstr "端口"
 
 #. i18n: file ./languages/sql/sqlconfigwidget.ui line 54
-#: rc.cpp:1857
+#: rc.cpp:1695
 #, no-c-format
 msgid "Username"
 msgstr "用户名"
 
 #. i18n: file ./languages/sql/sqlconfigwidget.ui line 62
-#: rc.cpp:1860
+#: rc.cpp:1698
 #, no-c-format
 msgid "Password"
 msgstr "密码"
 
 #. i18n: file ./languages/sql/sqlconfigwidget.ui line 86
-#: rc.cpp:1863
+#: rc.cpp:1701
 #, no-c-format
 msgid "<i>Warning:</i> password will be saved with weak encryption."
 msgstr "<i>警告</i>：密码将以简单加密保存。"
 
 #. i18n: file ./languages/sql/sqlconfigwidget.ui line 127
-#: rc.cpp:1869
+#: rc.cpp:1707
 #, no-c-format
 msgid "&Test"
 msgstr "测试(&T)"
 
-#. i18n: file ./languages/java/configproblemreporter.ui line 27
-#: rc.cpp:1872
-#, no-c-format
-msgid "&Parsing"
-msgstr "分析(&P)"
-
-#. i18n: file ./languages/java/configproblemreporter.ui line 100
-#: rc.cpp:1881
-#, no-c-format
-msgid "&Special Headers"
-msgstr "特殊头文件(&S)"
-
-#. i18n: file ./languages/perl/perlconfigwidgetbase.ui line 16
-#: parts/doxygen/messages.cpp:218 rc.cpp:1896
-#, no-c-format
-msgid "Perl"
-msgstr "Perl"
-
-#. i18n: file ./languages/perl/perlconfigwidgetbase.ui line 28
-#: rc.cpp:1899
-#, no-c-format
-msgid "Perl &interpreter:"
-msgstr "Perl 解释器(&I)："
-
-#. i18n: file ./languages/perl/perlconfigwidgetbase.ui line 80
-#: rc.cpp:1902 rc.cpp:2002 rc.cpp:2092
-#, no-c-format
-msgid "&Execute programs in a terminal"
-msgstr "在终端里执行程序(&E)"
-
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 50
-#: rc.cpp:1905
+#: rc.cpp:1710
 #, no-c-format
 msgid "Ru&by shell:"
 msgstr "Ru&by 脚本："
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 57
-#: rc.cpp:1908
+#: rc.cpp:1713
 #, no-c-format
 msgid ""
 "This is the path (or just name, if in $PATH) to the Ruby shell. Defaults to "
@@ -2850,25 +2541,25 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 78
-#: rc.cpp:1912
+#: rc.cpp:1717
 #, no-c-format
 msgid "Program &arguments:"
 msgstr "程序参数(&A)："
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 84
-#: rc.cpp:1915
+#: rc.cpp:1720
 #, fuzzy, no-c-format
 msgid "These are the arguments passed to the Ruby interpreter"
 msgstr "主程序的命令行参数"
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 100
-#: rc.cpp:1918
+#: rc.cpp:1723
 #, no-c-format
 msgid "&Ruby interpreter:"
 msgstr "Ruby 解释器(&R)："
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 106
-#: rc.cpp:1921
+#: rc.cpp:1726
 #, no-c-format
 msgid ""
 "This is the path (or just name, if in $PATH) to the Ruby interpreter. Defaults "
@@ -2876,19 +2567,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 122
-#: rc.cpp:1924
+#: rc.cpp:1729
 #, no-c-format
 msgid "&Main program:"
 msgstr "主程序(&M)："
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 128
-#: rc.cpp:1927
+#: rc.cpp:1732
 #, no-c-format
 msgid "This is the name of the main program source file"
 msgstr "这是主程序源文件的名称"
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 141
-#: rc.cpp:1930 rc.cpp:5509 rc.cpp:6338
+#: rc.cpp:1735 rc.cpp:7645 rc.cpp:8456
 #, fuzzy, no-c-format
 msgid "Working Directory:"
 msgstr "目录："
@@ -2899,56 +2590,56 @@ msgstr "目录："
 #: languages/php/phpsupportpart.cpp:94
 #: languages/ruby/debugger/dbgtoolbar.cpp:300
 #: languages/ruby/rubysupport_part.cpp:54 languages/sql/sqlsupport_part.cpp:44
-#: rc.cpp:1933
+#: rc.cpp:1738
 #, no-c-format
 msgid "Run"
 msgstr "运行"
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 192
-#: rc.cpp:1936
+#: rc.cpp:1741
 #, no-c-format
 msgid "Main pr&ogram"
 msgstr "主程序(&O)"
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 200
-#: rc.cpp:1939
+#: rc.cpp:1744
 #, fuzzy, no-c-format
 msgid "Selected wi&ndow"
 msgstr "选中窗口(&S)"
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 210
-#: rc.cpp:1942
+#: rc.cpp:1747
 #, fuzzy, no-c-format
 msgid "R&un applications in terminal"
 msgstr "在终端中运行应用程序(&T)"
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 213
-#: rc.cpp:1945
+#: rc.cpp:1750
 #, no-c-format
 msgid ""
 "Check this if you want your applications to be opened in terminal window."
 msgstr ""
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 221
-#: rc.cpp:1948
+#: rc.cpp:1753
 #, fuzzy, no-c-format
 msgid "Enable &debugger floating toolbar"
 msgstr "允许调试器工具栏浮动(&F)"
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 224
-#: rc.cpp:1951
+#: rc.cpp:1756
 #, no-c-format
 msgid "Check this if you want to control the debugger via a floating toolbar."
 msgstr ""
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 232
-#: rc.cpp:1954
+#: rc.cpp:1759
 #, no-c-format
 msgid "Show &constants in the debugger"
 msgstr "在调试器中显示常量(&C)"
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 235
-#: rc.cpp:1957
+#: rc.cpp:1762
 #, no-c-format
 msgid ""
 "Check this if you want the debugger to show constants (with many constants this "
@@ -2956,103 +2647,196 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 243
-#: rc.cpp:1960
+#: rc.cpp:1765
 #, no-c-format
 msgid "Trace &into Ruby libraries"
 msgstr "跟踪到 Ruby 库(&I)"
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 246
-#: rc.cpp:1963
+#: rc.cpp:1768
 #, no-c-format
 msgid "Trace through the Ruby code installed under sitedir in the debugger"
 msgstr ""
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 262
-#: rc.cpp:1966
+#: rc.cpp:1771
 #, no-c-format
 msgid "Character Coding"
 msgstr "字符编码"
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 273
-#: rc.cpp:1969
+#: rc.cpp:1774
 #, no-c-format
 msgid "ASCII"
 msgstr "ASCII"
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 284
-#: rc.cpp:1972
+#: rc.cpp:1777
 #, no-c-format
 msgid "EUC"
 msgstr "EUC"
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 295
-#: rc.cpp:1975
+#: rc.cpp:1780
 #, no-c-format
 msgid "S&JIS"
 msgstr "S&JIS"
 
 #. i18n: file ./languages/ruby/rubyconfigwidgetbase.ui line 306
-#: rc.cpp:1978
+#: rc.cpp:1783
 #, no-c-format
 msgid "UTF-&8"
 msgstr "UTF-&8"
 
 #. i18n: file ./languages/ruby/app_templates/kxt/appview_base.ui line 16
-#: rc.cpp:1990
+#: rc.cpp:1786
 #, no-c-format
 msgid "%{APPNAMESC}_base"
 msgstr "%{APPNAMESC}_base"
 
+#. i18n: file ./languages/lib/designer_integration/implementationwidgetbase.ui line 16
+#: rc.cpp:1801
+#, no-c-format
+msgid "Create or Select Implementation Class"
+msgstr "创建或选择实现类"
+
+#. i18n: file ./languages/lib/designer_integration/implementationwidgetbase.ui line 100
+#: rc.cpp:1810
+#, no-c-format
+msgid "Create &new class"
+msgstr "创建新类(&N)"
+
+#. i18n: file ./languages/lib/designer_integration/implementationwidgetbase.ui line 109
+#: rc.cpp:1813
+#, no-c-format
+msgid "Class Name"
+msgstr "类名"
+
+#. i18n: file ./languages/lib/designer_integration/implementationwidgetbase.ui line 167
+#: rc.cpp:1822
+#, no-c-format
+msgid "Use &existing class"
+msgstr "使用已有类(&E)"
+
+#. i18n: file ./languages/lib/designer_integration/implementationwidgetbase.ui line 183
+#: buildtools/script/scriptnewfiledlg.cpp:38
+#: parts/filecreate/filecreate_newfile.cpp:46 rc.cpp:1825 rc.cpp:1987
+#: rc.cpp:8579 rc.cpp:8765
+#, no-c-format
+msgid "&File name:"
+msgstr "文件名(&F)："
+
+#. i18n: file ./languages/python/pythonconfigwidgetbase.ui line 16
+#: languages/python/pythonsupportpart.cpp:111 rc.cpp:1828
+#, no-c-format
+msgid "Python"
+msgstr "Python"
+
+#. i18n: file ./languages/python/pythonconfigwidgetbase.ui line 27
+#: rc.cpp:1831
+#, no-c-format
+msgid "Python &interpreter:"
+msgstr "Python 解释器(&I)："
+
+#. i18n: file ./languages/python/app_templates/pyqt/documentdetails.ui line 16
+#: rc.cpp:1837
+#, no-c-format
+msgid "Document Details"
+msgstr "文档细节"
+
+#. i18n: file ./languages/python/app_templates/pyqt/documentdetails.ui line 35
+#: rc.cpp:1840
+#, no-c-format
+msgid "Enter details about this document below."
+msgstr "在下面输入关于此文档的细节。"
+
+#. i18n: file ./languages/python/app_templates/pyqt/documentdetails.ui line 46
+#: parts/snippet/snippet_part.cpp:88 vcs/subversion/svn_blamewidget.cpp:38
+#: vcs/subversion/svn_logviewwidget.cpp:53 rc.cpp:1843
+#, no-c-format
+msgid "Author"
+msgstr "作者"
+
+#. i18n: file ./languages/python/app_templates/pyqt/documentdetails.ui line 57
+#: rc.cpp:1846 rc.cpp:2586 rc.cpp:2604 rc.cpp:7996
+#, no-c-format
+msgid "Name:"
+msgstr "名称："
+
+#. i18n: file ./languages/python/app_templates/pyqt/documentdetails.ui line 72
+#: rc.cpp:1849
+#, no-c-format
+msgid "Company"
+msgstr "公司"
+
 #. i18n: file ./languages/csharp/csharpconfigwidgetbase.ui line 16
-#: rc.cpp:1996
+#: rc.cpp:1852
 #, no-c-format
 msgid "CSharp"
 msgstr ""
 
 #. i18n: file ./languages/csharp/csharpconfigwidgetbase.ui line 28
-#: rc.cpp:1999
+#: rc.cpp:1855
 #, fuzzy, no-c-format
 msgid "CSharp &interpreter:"
 msgstr "Perl 解释器(&I)："
 
+#. i18n: file ./languages/pascal/configproblemreporter.ui line 24
+#: rc.cpp:1861 rc.cpp:1867 rc.cpp:2102
+#, no-c-format
+msgid "&Enable background parsing"
+msgstr "启用后台分析(&E)"
+
+#. i18n: file ./languages/java/configproblemreporter.ui line 27
+#: rc.cpp:1864
+#, no-c-format
+msgid "&Parsing"
+msgstr "分析(&P)"
+
+#. i18n: file ./languages/java/configproblemreporter.ui line 100
+#: rc.cpp:1873
+#, no-c-format
+msgid "&Special Headers"
+msgstr "特殊头文件(&S)"
+
 #. i18n: file ./languages/fortran/ftnchekconfigwidgetbase.ui line 16
-#: rc.cpp:2005
+#: rc.cpp:1888
 #, no-c-format
 msgid "Ftnchek Options"
 msgstr "Ftnchek 选项"
 
 #. i18n: file ./languages/fortran/ftnchekconfigwidgetbase.ui line 37
-#: rc.cpp:2008
+#: rc.cpp:1891
 #, no-c-format
 msgid "&1"
 msgstr "&1"
 
 #. i18n: file ./languages/fortran/ftnchekconfigwidgetbase.ui line 48
-#: rc.cpp:2011
+#: rc.cpp:1894
 #, no-c-format
 msgid "&External subprograms without definition"
 msgstr "未定义的外部子程序(&E)"
 
 #. i18n: file ./languages/fortran/ftnchekconfigwidgetbase.ui line 56
-#: rc.cpp:2014
+#: rc.cpp:1897
 #, no-c-format
 msgid "&Divisions"
 msgstr ""
 
 #. i18n: file ./languages/fortran/ftnchekconfigwidgetbase.ui line 64
-#: rc.cpp:2017
+#: rc.cpp:1900
 #, no-c-format
 msgid "&Identifiers without explicit type"
 msgstr "未明确说明类型的标识符(&I)"
 
 #. i18n: file ./languages/fortran/ftnchekconfigwidgetbase.ui line 72
-#: rc.cpp:2020
+#: rc.cpp:1903
 #, no-c-format
 msgid "&Assume functions have no side effects"
 msgstr "假定函数没有副作用(&A)"
 
 #. i18n: file ./languages/fortran/ftnchekconfigwidgetbase.ui line 97
-#: rc.cpp:2023
+#: rc.cpp:1906
 #, no-c-format
 msgid "Ar&guments:"
 msgstr "参数(&G)："
@@ -3061,1869 +2845,1469 @@ msgstr "参数(&G)："
 #: parts/snippet/snippet_widget.cpp:142 parts/snippet/snippet_widget.cpp:144
 #: parts/snippet/snippet_widget.cpp:253 parts/snippet/snippet_widget.cpp:447
 #: parts/snippet/snippet_widget.cpp:454 parts/snippet/snippet_widget.cpp:961
-#: parts/snippet/snippetitem.h:54 rc.cpp:2026 rc.cpp:2032 rc.cpp:2050
-#: rc.cpp:2056 rc.cpp:2065 rc.cpp:2077
+#: parts/snippet/snippetitem.h:54 rc.cpp:1909 rc.cpp:1915 rc.cpp:1933
+#: rc.cpp:1939 rc.cpp:1948 rc.cpp:1960
 #, no-c-format
 msgid "All"
 msgstr "全部"
 
 #. i18n: file ./languages/fortran/ftnchekconfigwidgetbase.ui line 119
-#: rc.cpp:2029 rc.cpp:2035 rc.cpp:2044 rc.cpp:2059 rc.cpp:2068 rc.cpp:2080
+#: rc.cpp:1912 rc.cpp:1918 rc.cpp:1927 rc.cpp:1942 rc.cpp:1951 rc.cpp:1963
 #, no-c-format
 msgid "Only the following:"
 msgstr "只有下列："
 
 #. i18n: file ./languages/fortran/ftnchekconfigwidgetbase.ui line 243
-#: rc.cpp:2038
+#: rc.cpp:1921
 #, no-c-format
 msgid "Common &blocks:"
 msgstr "共用块(&B)："
 
 #. i18n: file ./languages/fortran/ftnchekconfigwidgetbase.ui line 256
-#: rc.cpp:2041
+#: rc.cpp:1924
 #, no-c-format
 msgid "&2"
 msgstr "&2"
 
 #. i18n: file ./languages/fortran/ftnchekconfigwidgetbase.ui line 278
-#: rc.cpp:2047
+#: rc.cpp:1930
 #, no-c-format
 msgid "&Truncation and roundoff errors:"
 msgstr "截断和舍入误差(&T)："
 
 #. i18n: file ./languages/fortran/ftnchekconfigwidgetbase.ui line 297
-#: rc.cpp:2053
+#: rc.cpp:1936
 #, no-c-format
 msgid "&Use of variables:"
 msgstr "变量的使用(&U)："
 
 #. i18n: file ./languages/fortran/ftnchekconfigwidgetbase.ui line 406
-#: rc.cpp:2062
+#: rc.cpp:1945
 #, no-c-format
 msgid "&3"
 msgstr "&3"
 
 #. i18n: file ./languages/fortran/ftnchekconfigwidgetbase.ui line 513
-#: rc.cpp:2071
+#: rc.cpp:1954
 #, no-c-format
 msgid "Fortran 77 language &extensions:"
 msgstr "Fortran 77 语言扩展(&E)："
 
 #. i18n: file ./languages/fortran/ftnchekconfigwidgetbase.ui line 524
-#: rc.cpp:2074
+#: rc.cpp:1957
 #, no-c-format
 msgid "Other &portability warnings:"
 msgstr "其它可移植性方面的警告(&P)："
 
-#. i18n: file ./languages/python/pythonconfigwidgetbase.ui line 16
-#: languages/python/pythonsupportpart.cpp:111 rc.cpp:2086
-#, no-c-format
-msgid "Python"
-msgstr "Python"
-
-#. i18n: file ./languages/python/pythonconfigwidgetbase.ui line 27
-#: rc.cpp:2089
-#, no-c-format
-msgid "Python &interpreter:"
-msgstr "Python 解释器(&I)："
-
-#. i18n: file ./languages/python/app_templates/pyqt/documentdetails.ui line 16
-#: rc.cpp:2095
-#, no-c-format
-msgid "Document Details"
-msgstr "文档细节"
-
-#. i18n: file ./languages/python/app_templates/pyqt/documentdetails.ui line 35
-#: rc.cpp:2098
-#, no-c-format
-msgid "Enter details about this document below."
-msgstr "在下面输入关于此文档的细节。"
-
-#. i18n: file ./languages/python/app_templates/pyqt/documentdetails.ui line 46
-#: parts/snippet/snippet_part.cpp:88 vcs/subversion/svn_blamewidget.cpp:38
-#: vcs/subversion/svn_logviewwidget.cpp:53 rc.cpp:2101
-#, no-c-format
-msgid "Author"
-msgstr "作者"
-
-#. i18n: file ./languages/python/app_templates/pyqt/documentdetails.ui line 57
-#: rc.cpp:2104 rc.cpp:4495 rc.cpp:4543 rc.cpp:5860
-#, no-c-format
-msgid "Name:"
-msgstr "名称："
-
-#. i18n: file ./languages/python/app_templates/pyqt/documentdetails.ui line 72
-#: rc.cpp:2107
-#, no-c-format
-msgid "Company"
-msgstr "公司"
-
-#. i18n: file ./languages/kjssupport/subclassingdlgbase.ui line 16
-#: languages/kjssupport/kjssupport_part.cpp:429 rc.cpp:2110
-#, no-c-format
-msgid "Implement Slots"
-msgstr "实现槽"
-
-#. i18n: file ./src/mimewarningdialog.ui line 24
-#: rc.cpp:2152
-#, no-c-format
-msgid "Could Not Open File"
-msgstr "无法打开文件"
-
-#. i18n: file ./src/mimewarningdialog.ui line 43
-#: rc.cpp:2155
+#. i18n: file ./languages/php/phpnewclassdlgbase.ui line 27
+#: parts/quickopen/quickopenclassdialog.cpp:41 rc.cpp:1969 rc.cpp:6302
 #, no-c-format
-msgid "KDevelop could not open"
-msgstr "KDevelop 无法打开"
+msgid "Class &name:"
+msgstr "类名(&N)："
 
-#. i18n: file ./src/mimewarningdialog.ui line 59
-#: rc.cpp:2158
+#. i18n: file ./languages/php/phpnewclassdlgbase.ui line 95
+#: rc.cpp:1981
 #, no-c-format
-msgid "Some URL"
-msgstr ""
+msgid "Class &template:"
+msgstr "类模板(&T)："
 
-#. i18n: file ./src/mimewarningdialog.ui line 75
-#: rc.cpp:2161
+#. i18n: file ./languages/php/phpnewclassdlgbase.ui line 106
+#: parts/filecreate/filecreate_newfile.cpp:41 parts/grepview/grepdlg.cpp:132
+#: rc.cpp:1984 rc.cpp:3021
 #, no-c-format
-msgid "<qt>No suitable viewer was found for the <b>%1</b> mimetype.</qt>"
-msgstr ""
+msgid "&Directory:"
+msgstr "目录(&D)："
 
-#. i18n: file ./src/mimewarningdialog.ui line 100
-#: rc.cpp:2164
+#. i18n: file ./languages/php/phpnewclassdlgbase.ui line 163
+#: rc.cpp:1993
 #, no-c-format
-msgid "What Do You Want to Do?"
+msgid ""
+"<?php\n"
+"if (!defined(\"FILENAME\")){\n"
+"define(\"FILENAME\",0);\n"
+"/*\n"
+"* @author AUTHOR\n"
+"*/\n"
+"\n"
+"class CLASSNAME extends BASECLASS {\n"
+"  //constructor\n"
+"  function CLASSNAME(){\n"
+"   BASECLASS::BASECLASS();\n"
+"  }\n"
+" }\n"
+"}\n"
+"?>"
 msgstr ""
+"<?php\n"
+"if (!defined(\"FILENAME\")){\n"
+"define(\"FILENAME\",0);\n"
+"/*\n"
+"* @author 作者名\n"
+"*/\n"
+"\n"
+"class CLASSNAME extends BASECLASS {\n"
+"  //构造函数\n"
+"  function CLASSNAME(){\n"
+"   BASECLASS::BASECLASS();\n"
+"  }\n"
+" }\n"
+"}\n"
+"?>"
 
-#. i18n: file ./src/mimewarningdialog.ui line 111
-#: rc.cpp:2167
-#, no-c-format
-msgid "Let TDE find a suitable program"
-msgstr "让 TDE 找到合适的程序"
-
-#. i18n: file ./src/mimewarningdialog.ui line 122
-#: rc.cpp:2170
-#, no-c-format
-msgid "Open it in KDevelop as plain text"
-msgstr "总是在 KDevelop 中打开为纯文本"
-
-#. i18n: file ./src/mimewarningdialog.ui line 158
-#: rc.cpp:2173
-#, no-c-format
-msgid "Always open this mimetype as text"
-msgstr "总是将此 MIME 类型打开为文本"
-
-#. i18n: file ./src/generalinfowidgetbase.ui line 16
-#: rc.cpp:2182
-#, no-c-format
-msgid "General Settings"
-msgstr "常规设置"
-
-#. i18n: file ./src/generalinfowidgetbase.ui line 25
-#: rc.cpp:2185
-#, no-c-format
-msgid "Absolute Path"
-msgstr "绝对路径"
-
-#. i18n: file ./src/generalinfowidgetbase.ui line 30
-#: rc.cpp:2188
-#, no-c-format
-msgid "Relative to Project File"
-msgstr "相对于工程文件"
-
-#. i18n: file ./src/generalinfowidgetbase.ui line 59
-#: parts/filecreate/addglobaldlg.cpp:103 rc.cpp:2191 rc.cpp:2246 rc.cpp:3644
-#, no-c-format
-msgid "Description:"
-msgstr "描述："
-
-#. i18n: file ./src/generalinfowidgetbase.ui line 67
-#: rc.cpp:2194
-#, no-c-format
-msgid "Project directory:"
-msgstr "工程目录："
-
-#. i18n: file ./src/generalinfowidgetbase.ui line 75
-#: rc.cpp:2197 rc.cpp:3605
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 16
+#: rc.cpp:2010
 #, no-c-format
-msgid "Author:"
-msgstr "作者："
+msgid "PHP Options"
+msgstr "PHP 选项"
 
-#. i18n: file ./src/generalinfowidgetbase.ui line 83
-#: rc.cpp:2200 rc.cpp:3608
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 31
+#: rc.cpp:2013
 #, no-c-format
-msgid "Email:"
-msgstr "电子邮件："
+msgid "Genera&l"
+msgstr "常规(&L)"
 
-#. i18n: file ./src/generalinfowidgetbase.ui line 91
-#: rc.cpp:2203 rc.cpp:3611
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 42
+#: rc.cpp:2016
 #, no-c-format
-msgid "Version:"
-msgstr "版本："
+msgid "&Startup"
+msgstr "启动(&S)"
 
-#. i18n: file ./src/generalinfowidgetbase.ui line 115
-#: rc.cpp:2206
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 53
+#: rc.cpp:2019
 #, no-c-format
-msgid ""
-"Project Version\n"
-"You may need to run automake & friends to update\n"
-"the version in all files after changing this."
-msgstr ""
+msgid "Use current file in editor"
+msgstr "使用编辑器里的当前文件"
 
-#. i18n: file ./src/generalinfowidgetbase.ui line 124
-#: rc.cpp:2211
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 67
+#: rc.cpp:2022
 #, no-c-format
-msgid ""
-"Used in templates as $EMAIL$\n"
-"Placed in the AUTHORS file"
-msgstr ""
+msgid "Use &this file as default:"
+msgstr "默认使用这个文件(&T)："
 
-#. i18n: file ./src/generalinfowidgetbase.ui line 133
-#: rc.cpp:2215
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 85
+#: rc.cpp:2025
 #, no-c-format
-msgid ""
-"Used in templates as $AUTHOR$\n"
-"Placed in the AUTHORS file"
-msgstr ""
+msgid "Code Help"
+msgstr "编码帮助"
 
-#. i18n: file ./src/generalinfowidgetbase.ui line 177
-#: rc.cpp:2219
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 96
+#: rc.cpp:2028
 #, no-c-format
-msgid "Where the project starts."
-msgstr ""
+msgid "&Enable code completion"
+msgstr "启用代码补全(&E)"
 
-#. i18n: file ./src/generalinfowidgetbase.ui line 189
-#: rc.cpp:2222
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 104
+#: rc.cpp:2031
 #, no-c-format
-msgid "Please select a project directory"
-msgstr "请选择一个工程目录"
+msgid "Enable code &hinting"
+msgstr "启用代码提示(&H)"
 
-#. i18n: file ./src/generalinfowidgetbase.ui line 197
-#: rc.cpp:2225
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 114
+#: rc.cpp:2034
 #, no-c-format
-msgid "Default encoding:"
-msgstr "默认编码："
+msgid "Parser"
+msgstr "分析器"
 
-#. i18n: file ./src/generalinfowidgetbase.ui line 205
-#: rc.cpp:2228
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 125
+#: rc.cpp:2037
 #, no-c-format
-msgid "Default encoding used when opening text files"
-msgstr "默认编码用于打开文本文件"
-
-#. i18n: file ./src/generalinfowidgetbase.ui line 213
-#: rc.cpp:2231
-#, fuzzy, no-c-format
-msgid "Text that stays in the project file."
-msgstr "无法写入工程文件。"
-
-#. i18n: file ./src/pluginselectdialogbase.ui line 16
-#: rc.cpp:2234
-#, fuzzy, no-c-format
-msgid "Plugin Selection"
-msgstr "插件动作(&P)"
-
-#. i18n: file ./src/pluginselectdialogbase.ui line 27
-#: rc.cpp:2237
-#, fuzzy, no-c-format
-msgid "Plugins:"
-msgstr "插件"
+msgid "PHP &include path:"
+msgstr "PHP 包含路径(&I)："
 
-#. i18n: file ./src/pluginselectdialogbase.ui line 51
-#: rc.cpp:2240
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 141
+#: rc.cpp:2040
 #, no-c-format
-msgid "Make this the default for this profile:"
-msgstr ""
-
-#. i18n: file ./src/pluginselectdialogbase.ui line 59
-#: rc.cpp:2243
-#, fuzzy, no-c-format
-msgid "Save &as Default"
-msgstr "设为默认"
+msgid "Ena&ble realtime parser"
+msgstr "启用实时分析器(&B)"
 
-#. i18n: file ./src/pluginselectdialogbase.ui line 137
-#: rc.cpp:2249 rc.cpp:2697 rc.cpp:4549 rc.cpp:5431 rc.cpp:5902
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 189
+#: rc.cpp:2043
 #, no-c-format
-msgid "O&K"
-msgstr ""
+msgid "In&vocation"
+msgstr "调用(&V)"
 
-#. i18n: file ./src/settingswidget.ui line 16
-#: rc.cpp:2255
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 200
+#: rc.cpp:2046
 #, fuzzy, no-c-format
-msgid "Form2"
-msgstr "界面表单"
+msgid "Please select how TDevelop should execute your scripts."
+msgstr "请选择 KDevelop 应该如何执行您的脚本。"
 
-#. i18n: file ./src/settingswidget.ui line 30
-#: rc.cpp:2258
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 208
+#: rc.cpp:2049
 #, no-c-format
-msgid "Lo&ad last project on startup"
-msgstr "启动时载入上次的工程(&A)"
+msgid "Invocation Mode"
+msgstr "调用模式"
 
-#. i18n: file ./src/settingswidget.ui line 33
-#: rc.cpp:2261
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 222
+#: rc.cpp:2052
 #, no-c-format
-msgid ""
-"Check this if you want KDevelop to load the last opened project on startup"
-msgstr ""
+msgid "Ca&lling the PHP interpreter directly"
+msgstr "直接调用 PHP 解释器(&L)"
 
-#. i18n: file ./src/settingswidget.ui line 36
-#: rc.cpp:2264
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 231
+#: rc.cpp:2055
 #, no-c-format
 msgid ""
-"Mark this checkbox if you want to continue to work with the last project you "
-"worked on. This will cause KDevelop to automatically load this project on "
-"start-up. It will usually be shown in the state you left work so you can "
-"readily proceed."
+"<font size=\"+1\">The php executable is called directly. Ideal for developers "
+"who want to develop terminal or graphical applications in PHP. \n"
+"You need a correctly installed php cgi version.</font>"
 msgstr ""
+"<font size=\"+1\">直接调用 PHP 可执行程序，这对用 PHP 开发终端或图形程序的开发者最为理想。\n"
+"您需要一个安装正确的 PHP CGI 版本。</font>"
 
-#. i18n: file ./src/settingswidget.ui line 44
-#: rc.cpp:2267
-#, no-c-format
-msgid "<qt><h3>Project Settings</h3></qt>"
-msgstr "<qt><h3>工程设置</h3></qt>"
-
-#. i18n: file ./src/settingswidget.ui line 55
-#: rc.cpp:2270
-#, fuzzy, no-c-format
-msgid "Line wrappin&g"
-msgstr "自动换行(&W)"
-
-#. i18n: file ./src/settingswidget.ui line 58
-#: rc.cpp:2273
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 246
+#: rc.cpp:2059
 #, no-c-format
-msgid ""
-"By default, KDevelop will wrap long lines around in the Messages Output View "
-"window"
-msgstr ""
+msgid "Using an &existing webserver (local or remote)"
+msgstr "使用已有的 Web 服务器(本地或远程)(&E)"
 
-#. i18n: file ./src/settingswidget.ui line 61
-#: rc.cpp:2276
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 255
+#: rc.cpp:2062
 #, no-c-format
 msgid ""
-"By default, KDevelop will wrap long lines around in the Messages Output View "
-"window so that valuable information will not be easily overlooked. In some "
-"cases this will clutter long message lists. Remove the checkbox mark if you do "
-"not want the lines wrap around."
+"<font size=\"+1\">Uses an existing webserver. The pages are previewed in \n"
+"the internal web browser. Please make sure that the webserver was compiled with "
+"PHP support.</font>"
 msgstr ""
+"<font size=\"+1\">使用一个外部的 Web 服务器。输出的网页将用内部的 Web 浏览器显示。请确保该 Web 服务器编译的时候加入了 PHP "
+"支持。</font>"
 
-#. i18n: file ./src/settingswidget.ui line 77
-#: rc.cpp:2279
-#, no-c-format
-msgid "&Compiler output:"
-msgstr "编译器输出(&C)："
-
-#. i18n: file ./src/settingswidget.ui line 86
-#: rc.cpp:2282
-#, no-c-format
-msgid "Very Short"
-msgstr "很短"
-
-#. i18n: file ./src/settingswidget.ui line 91
-#: rc.cpp:2285
-#, no-c-format
-msgid "Short"
-msgstr "短"
-
-#. i18n: file ./src/settingswidget.ui line 96
-#: rc.cpp:2288
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 289
+#: rc.cpp:2066
 #, no-c-format
-msgid "Long"
-msgstr "长"
+msgid "&Webserver"
+msgstr "Web 服务器(&W)"
 
-#. i18n: file ./src/settingswidget.ui line 111
-#: rc.cpp:2291
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 300
+#: rc.cpp:2069
 #, no-c-format
-msgid "Choose what sort of output you want from the build process"
-msgstr ""
+msgid "Pro&ject root URL on webserver:"
+msgstr "工程在 Web 服务器上的根 URL(&J)："
 
-#. i18n: file ./src/settingswidget.ui line 117
-#: rc.cpp:2294
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 335
+#: rc.cpp:2072
 #, no-c-format
-msgid ""
-"KDevelop preprocesses the messages the Messages Output View window receives "
-"during the build processes in order to filter superfluous information. You can "
-"control the level of detail KDevelop will display using the dropdown box in "
-"this field. \n"
-"<b>Very Short</b>  Displays only warnings, errors, and the filenames which are "
-"compiled. \n"
-"<b>Short</b>  Suppresses all compiler flags and formats the output to be more "
-"readable. \n"
-"<b>Full</b>  Displays all output messages unmodified."
-msgstr ""
+msgid "&Shell"
+msgstr "Shell(&S)"
 
-#. i18n: file ./src/settingswidget.ui line 127
-#: rc.cpp:2300
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 346
+#: rc.cpp:2075
 #, no-c-format
-msgid "<qt><h3>Output View Settings</h3></qt>"
-msgstr "<qt><h3>输出视图设置</h3></qt>"
+msgid "PHP &executable:"
+msgstr "PHP 可执行文件(&E)："
 
-#. i18n: file ./src/settingswidget.ui line 149
-#: rc.cpp:2303
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 400
+#: rc.cpp:2084
 #, no-c-format
-msgid "Default pro&jects directory:"
-msgstr "默认工程目录(&J)："
-
-#. i18n: file ./src/settingswidget.ui line 163
-#: rc.cpp:2306
-#, fuzzy, no-c-format
-msgid "Set the directory where you want your projects in."
-msgstr "选择您的工程所使用的 Qt 版本。"
+msgid "PHP &Ini File:"
+msgstr "PHP Ini 文件(&I)："
 
-#. i18n: file ./src/settingswidget.ui line 166
-#: rc.cpp:2309
+#. i18n: file ./languages/php/phpconfigwidgetbase.ui line 449
+#: rc.cpp:2090
 #, no-c-format
-msgid ""
-"By default, KDevelop uses a common parent directory for all new projects. Enter "
-"the absolute path of this common directory in the box or select it from your "
-"directory structure. KDevelop will place the any new project here as a "
-"subdirectory."
-msgstr ""
+msgid "Load &Zend extension:"
+msgstr "加载 Zend 扩展(&Z)："
 
-#. i18n: file ./src/settingswidget.ui line 209
-#: rc.cpp:2312
+#. i18n: file ./languages/php/phpinfodlg.ui line 16
+#: rc.cpp:2096
 #, no-c-format
-msgid "Window &font:"
-msgstr "窗口字体(&F)："
+msgid "PHP Information"
+msgstr "PHP 信息"
 
-#. i18n: file ./src/settingswidget.ui line 261
-#: rc.cpp:2315
+#. i18n: file ./languages/ada/addclassdlg.ui line 16
+#: rc.cpp:2105
 #, no-c-format
-msgid "Use &TDE setting"
-msgstr "使用 TDE 设置(&K)"
+msgid "Add Class"
+msgstr "添加类"
 
-#. i18n: file ./src/settingswidget.ui line 267
-#: rc.cpp:2318
+#. i18n: file ./languages/ada/addclassdlg.ui line 30
+#: rc.cpp:2108
 #, no-c-format
-msgid "Use the terminal as set in KControl"
-msgstr "使用 KControl 中设定的终端"
+msgid "&Implements"
+msgstr "实现(&I)"
 
-#. i18n: file ./src/settingswidget.ui line 270
-#: rc.cpp:2321
+#. i18n: file ./languages/ada/addclassdlg.ui line 38
+#: rc.cpp:2111
 #, no-c-format
-msgid ""
-"If checked, KDevelop will use the default terminal as set in KControl in TDE "
-"components, Component Chooser."
-msgstr ""
+msgid "&Class"
+msgstr "类(&C)"
 
-#. i18n: file ./src/settingswidget.ui line 294
-#: rc.cpp:2324
+#. i18n: file ./languages/ada/addclassdlg.ui line 72
+#: rc.cpp:2114
 #, no-c-format
-msgid "&Other:"
-msgstr "其它(&O)："
+msgid "&Abstract"
+msgstr "抽象(&A)"
 
-#. i18n: file ./src/settingswidget.ui line 297
-#: rc.cpp:2327
+#. i18n: file ./languages/ada/addclassdlg.ui line 80
+#: rc.cpp:2117
 #, no-c-format
-msgid "Set a different terminal than the TDE default one"
-msgstr ""
+msgid "&Interface"
+msgstr "接口(&I)"
 
-#. i18n: file ./src/settingswidget.ui line 300
-#: rc.cpp:2330
+#. i18n: file ./languages/ada/addclassdlg.ui line 117
+#: rc.cpp:2123
 #, no-c-format
-msgid "Choose some other terminal different from the default one."
-msgstr ""
+msgid "&Public"
+msgstr "公有(&P)"
 
-#. i18n: file ./src/settingswidget.ui line 320
-#: rc.cpp:2333
+#. i18n: file ./languages/ada/addclassdlg.ui line 128
+#: rc.cpp:2126
 #, no-c-format
-msgid "<qt><h3>Terminal Emulation</h3></qt>"
-msgstr "<qt><h3>终端模拟器</h3></qt>"
+msgid "P&rotected"
+msgstr "保护(&R)"
 
-#. i18n: file ./src/settingswidget.ui line 365
-#: rc.cpp:2336
+#. i18n: file ./languages/ada/addclassdlg.ui line 136
+#: rc.cpp:2129
 #, no-c-format
-msgid ""
-"<qt>"
-"<h3>UI Designer Integration</h3>This will only be used when no project is "
-"opened. For the project specific setting see Project Options/C++ Specific and "
-"open the Qt tab.</qt>"
-msgstr ""
+msgid "Pri&vate"
+msgstr "私有(&V)"
 
-#. i18n: file ./src/settingswidget.ui line 410
-#: rc.cpp:2348
+#. i18n: file ./languages/ada/addclassdlg.ui line 146
+#: rc.cpp:2132
 #, no-c-format
-msgid "Run KDevelop's &designer as a separate application"
-msgstr "将 KDevelop 的设计器运行为单独的应用程序(&D)"
-
-#. i18n: file ./src/settingswidget.ui line 424
-#: rc.cpp:2357
-#, fuzzy, no-c-format
-msgid "Run &Qt Designer"
-msgstr "运行 Qt 设计师(&G)"
+msgid "&Final"
+msgstr "最终(&F)"
 
-#. i18n: file ./src/settingswidget.ui line 440
-#: rc.cpp:2366
+#. i18n: file ./languages/ada/addclassdlg.ui line 170
+#: rc.cpp:2135
 #, no-c-format
-msgid "Directory &navigation messages"
-msgstr "目录导航消息(&N)"
+msgid "&Extends:"
+msgstr "扩展(&E)："
 
-#. i18n: file ./src/settingswidget.ui line 446
-#: rc.cpp:2372
+#. i18n: file ./languages/ada/addclassdlg.ui line 202
+#: rc.cpp:2141
 #, no-c-format
-msgid "Check this if you want to know what directory make is in"
-msgstr ""
+msgid "&Source path:"
+msgstr "源代码路径(&S)："
 
-#. i18n: file ./src/settingswidget.ui line 449
-#: rc.cpp:2375
+#. i18n: file ./languages/ada/addclassdlg.ui line 227
+#: rc.cpp:2147
 #, no-c-format
-msgid ""
-"The make tool usually will display messages like “Entering directory”, or "
-"“Leaving directory” when it switches the directories it currently works in. As "
-"this clutters the messages list in the Messages Output View window, KDevelop "
-"suppresses those messages by default. Mark the checkbox if you want to protocol "
-"which directories make worked in."
-msgstr ""
-
-#. i18n: file ./src/settingswidget.ui line 497
-#: rc.cpp:2378
-#, fuzzy, no-c-format
-msgid "Force english compiler output"
-msgstr "完整的编译器输出"
+msgid "&Create default constructor"
+msgstr "创建默认的构造函数(&C)"
 
-#. i18n: file ./src/settingswidget.ui line 505
-#: rc.cpp:2381
+#. i18n: file ./languages/ada/addclassdlg.ui line 238
+#: rc.cpp:2150
 #, no-c-format
-msgid "Use kde language and disable \"jump-to-source\" functionality"
-msgstr ""
+msgid "Create &main method"
+msgstr "创建主方法 &main"
 
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 16
-#: rc.cpp:2384
+#. i18n: file ./languages/ada/addclassdlg.ui line 248
+#: rc.cpp:2153
 #, no-c-format
-msgid "Profile Editor for The KDevelop Platform"
-msgstr "KDevelop 平台配置文件编辑器"
+msgid "&Documentation"
+msgstr "文档(&D)"
 
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 63
-#: src/profileengine/editor/profileeditor.cpp:237 rc.cpp:2387 rc.cpp:2462
+#. i18n: file ./languages/ada/addclassdlg.ui line 260
+#: rc.cpp:2156 rc.cpp:3778
 #, no-c-format
-msgid "Add Profile"
-msgstr "添加配置文件"
+msgid "&License:"
+msgstr "许可协议(&L)："
 
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 86
-#: buildtools/qmake/projectconfigurationdlg.cpp:1794
-#: kdevdesigner/designer/hierarchyview.cpp:190
-#: lib/widgets/propeditor/propertyeditor.cpp:172
-#: parts/fileview/filegroupswidget.cpp:169 rc.cpp:2390 rc.cpp:2438 rc.cpp:2453
-#: rc.cpp:4486 rc.cpp:5085 rc.cpp:5106 rc.cpp:5241 rc.cpp:5839 rc.cpp:6668
+#. i18n: file ./languages/ada/addclassdlg.ui line 269
+#: rc.cpp:2159
 #, no-c-format
-msgid "Name"
-msgstr "名称"
+msgid "LGPL"
+msgstr "LGPL"
 
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 97
-#: parts/filecreate/addglobaldlg.cpp:63 src/languageselectwidget.cpp:83
-#: rc.cpp:2393 rc.cpp:3674 rc.cpp:3698 rc.cpp:3941
+#. i18n: file ./languages/ada/addclassdlg.ui line 274
+#: rc.cpp:2162
 #, no-c-format
-msgid "Description"
-msgstr "描述"
+msgid "GPL"
+msgstr "GPL"
 
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 132
-#: src/profileengine/editor/profileeditor.cpp:255
-#: src/profileengine/editor/profileeditor.cpp:267 rc.cpp:2396
+#. i18n: file ./languages/ada/addclassdlg.ui line 279
+#: rc.cpp:2165
 #, no-c-format
-msgid "Remove Profile"
-msgstr "删除配置文件"
+msgid "QPL"
+msgstr "QPL"
 
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 212
-#: rc.cpp:2408
+#. i18n: file ./parts/valgrind/dialog_widget.ui line 24
+#: buildtools/autotools/addicondlg.cpp:45
+#: parts/outputviews/appoutputviewpart.cpp:51 rc.cpp:2177 rc.cpp:8531
 #, no-c-format
-msgid "Derived properties:"
-msgstr "派生属性："
+msgid "Application"
+msgstr "应用程序"
 
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 241
-#: rc.cpp:2411
+#. i18n: file ./parts/valgrind/dialog_widget.ui line 40
+#: rc.cpp:2180 rc.cpp:2799
 #, no-c-format
-msgid "Own properties:"
-msgstr "自有属性："
+msgid "&Parameters:"
+msgstr "参数(&P)："
 
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 258
-#: rc.cpp:2414
+#. i18n: file ./parts/valgrind/dialog_widget.ui line 51
+#: rc.cpp:2183 rc.cpp:2808
 #, no-c-format
-msgid "Lists of Explicitly Enabled && Disabled Plugins"
-msgstr ""
+msgid "&Executable:"
+msgstr "可执行文件(&E)："
 
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 283
-#: rc.cpp:2417
+#. i18n: file ./parts/valgrind/dialog_widget.ui line 87
+#: rc.cpp:2186 rc.cpp:2204
 #, no-c-format
-msgid "Enabled:"
-msgstr "已启用："
+msgid "Valgrind"
+msgstr "Valgrind"
 
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 289
-#: rc.cpp:2420 rc.cpp:2426
+#. i18n: file ./parts/valgrind/dialog_widget.ui line 98
+#: rc.cpp:2189
 #, no-c-format
-msgid "Plugin Name"
-msgstr "插件名称"
+msgid "Memory &leak check"
+msgstr "内存泄露检查(&L)"
 
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 323
-#: rc.cpp:2423
+#. i18n: file ./parts/valgrind/dialog_widget.ui line 137
+#: rc.cpp:2192
 #, no-c-format
-msgid "Disabled:"
-msgstr "已禁用："
+msgid "&Show still reachable blocks"
+msgstr "显示仍然可用的内存块(&S)"
 
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 349
-#: rc.cpp:2429 rc.cpp:2432 rc.cpp:6188 rc.cpp:6251
+#. i18n: file ./parts/valgrind/dialog_widget.ui line 147
+#: rc.cpp:2195 rc.cpp:2213
 #, no-c-format
-msgid "<-"
-msgstr "<-"
+msgid "&Trace children"
+msgstr "跟踪子类(&T)"
 
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 430
-#: rc.cpp:2435
+#. i18n: file ./parts/valgrind/dialog_widget.ui line 166
+#: rc.cpp:2198 rc.cpp:2207
 #, no-c-format
-msgid "Available plugins:"
-msgstr "可用的插件："
+msgid "Additional p&arameters:"
+msgstr "其它参数(&A)："
 
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 447
-#: rc.cpp:2441 rc.cpp:2456
+#. i18n: file ./parts/valgrind/dialog_widget.ui line 187
+#: rc.cpp:2201 rc.cpp:2210 rc.cpp:8570
 #, no-c-format
-msgid "Generic Name"
-msgstr "通用名"
+msgid "E&xecutable:"
+msgstr "可执行文件(&X)："
 
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 489
-#: rc.cpp:2444 rc.cpp:2447 rc.cpp:6191 rc.cpp:6254
+#. i18n: file ./parts/valgrind/dialog_widget.ui line 284
+#: rc.cpp:2216
 #, no-c-format
-msgid "->"
-msgstr "->"
+msgid "KCachegrind"
+msgstr "KCachegrind"
 
-#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 507
-#: rc.cpp:2450
-#, no-c-format
-msgid "List of Plugins to Be Loaded"
-msgstr "列出已装入的插件"
+#. i18n: file ./parts/valgrind/dialog_widget.ui line 300
+#: rc.cpp:2219
+#, fuzzy, no-c-format
+msgid "Exe&cutable:"
+msgstr "可执行文件："
 
-#. i18n: file ./src/profileengine/editor/addprofilewidget.ui line 73
-#: rc.cpp:2468
+#. i18n: file ./parts/replace/replacedlg.ui line 30
+#: rc.cpp:2222
 #, no-c-format
-msgid "&Generic name:"
-msgstr "通用名称(&G)："
+msgid "Project Wide String Replacement"
+msgstr "对整个项目进行字符串替换"
 
-#. i18n: file ./src/profileengine/editor/addprofilewidget.ui line 105
-#: rc.cpp:2471 rc.cpp:3462 rc.cpp:3965
+#. i18n: file ./parts/replace/replacedlg.ui line 52
+#: parts/grepview/grepdlg.cpp:127 rc.cpp:2228 rc.cpp:3155
 #, no-c-format
-msgid "&Description:"
-msgstr "描述(&D)："
+msgid "C&ase sensitive"
+msgstr "区分大小写(&A)"
 
-#. i18n: file ./vcs/clearcase/integrator/ccintegratordlgbase.ui line 24
-#: rc.cpp:2474 rc.cpp:3126
+#. i18n: file ./parts/replace/replacedlg.ui line 80
+#: rc.cpp:2231
 #, no-c-format
-msgid "No options available for this VCS."
-msgstr "此 CVS 无此选项。"
+msgid "All s&ubstrings"
+msgstr "所有子串(&U)"
 
-#. i18n: file ./vcs/subversion/subversionprojectwidget.ui line 16
-#: rc.cpp:2477
-#, no-c-format
-msgid "New Subversion Project"
-msgstr "新 Subversion 工程"
+#. i18n: file ./parts/replace/replacedlg.ui line 91
+#: rc.cpp:2234
+#, fuzzy, no-c-format
+msgid "Whole words onl&y"
+msgstr "整词匹配(&W)"
 
-#. i18n: file ./vcs/subversion/subversionprojectwidget.ui line 35
-#: rc.cpp:2480
+#. i18n: file ./parts/replace/replacedlg.ui line 107
+#: rc.cpp:2237
 #, no-c-format
-msgid "&Import address:"
-msgstr "导入地址(&I)："
+msgid "Regular e&xpression:"
+msgstr "正则表达式(&X)："
 
-#. i18n: file ./vcs/subversion/subversionprojectwidget.ui line 53
-#: rc.cpp:2483
+#. i18n: file ./parts/replace/replacedlg.ui line 110
+#: rc.cpp:2240
 #, no-c-format
-msgid "Create &Standard Directories (tags/trunk/branches/)?"
-msgstr "要创建标准目录(标签/主体/分支)吗(&S)？"
+msgid "Use regexp to specify target"
+msgstr "用正则表达式指定目标"
 
-#. i18n: file ./vcs/subversion/svn_logviewoptiondlgbase.ui line 16
-#: vcs/subversion/subversion_core.cpp:300 rc.cpp:2492
+#. i18n: file ./parts/replace/replacedlg.ui line 121
+#: rc.cpp:2243
 #, fuzzy, no-c-format
-msgid "Subversion Log View"
-msgstr "Subversion"
+msgid "E&dit"
+msgstr "编辑器"
 
-#. i18n: file ./vcs/subversion/svn_logviewoptiondlgbase.ui line 35
-#: rc.cpp:2498
+#. i18n: file ./parts/replace/replacedlg.ui line 124
+#: rc.cpp:2246
 #, no-c-format
-msgid "Do not show logs before branching point"
-msgstr ""
-
-#. i18n: file ./vcs/subversion/svn_logviewoptiondlgbase.ui line 46
-#: rc.cpp:2501
-#, fuzzy, no-c-format
-msgid "End Revision"
-msgstr "版本"
-
-#. i18n: file ./vcs/subversion/svn_logviewoptiondlgbase.ui line 57
-#: rc.cpp:2504 rc.cpp:2516
-#, fuzzy, no-c-format
-msgid "&By Revision Number"
-msgstr "版本(&R)："
+msgid "Opens the regexp editor. Only enabled if installed."
+msgstr "打开正则表达式编辑器。只有安装后才能启用。"
 
-#. i18n: file ./vcs/subversion/svn_logviewoptiondlgbase.ui line 65
-#: rc.cpp:2507 rc.cpp:2519
+#. i18n: file ./parts/replace/replacedlg.ui line 139
+#: rc.cpp:2249
 #, no-c-format
-msgid "B&y Revision Specifier"
-msgstr ""
-
-#. i18n: file ./vcs/subversion/svn_logviewoptiondlgbase.ui line 88
-#: rc.cpp:2510 rc.cpp:2700 rc.cpp:4507
-#, fuzzy, no-c-format
-msgid "C&ancel"
-msgstr "变更日志(&H)："
-
-#. i18n: file ./vcs/subversion/svn_logviewoptiondlgbase.ui line 96
-#: rc.cpp:2513
-#, fuzzy, no-c-format
-msgid "Start Revision"
-msgstr "版本"
-
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 16
-#: rc.cpp:2522
-#, fuzzy, no-c-format
-msgid "Subversion Merge"
-msgstr "Subversion 消息"
-
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 27
-#: rc.cpp:2525 rc.cpp:2718
-#, fuzzy, no-c-format
-msgid "Destination"
-msgstr "描述"
-
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 38
-#: rc.cpp:2528
-#, fuzzy, no-c-format
-msgid "Destination working path"
-msgstr "描述"
-
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 53
-#: rc.cpp:2531
-#, fuzzy, no-c-format
-msgid "Source 1"
-msgstr "源文件"
-
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 80
-#: rc.cpp:2534 rc.cpp:2561
-#, fuzzy, no-c-format
-msgid "Number:"
-msgstr "名称："
+msgid "Enter the regexp here"
+msgstr "在此输入正则表达式"
 
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 91
-#: rc.cpp:2537 rc.cpp:2564
+#. i18n: file ./parts/replace/replacedlg.ui line 149
+#: rc.cpp:2252
 #, no-c-format
-msgid "Keyword:"
-msgstr ""
+msgid "Target Files in Project"
+msgstr "工程中的目标文件"
 
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 97
-#: rc.cpp:2540 rc.cpp:2570 rc.cpp:2652 rc.cpp:2736
+#. i18n: file ./parts/replace/replacedlg.ui line 160
+#: rc.cpp:2255
 #, no-c-format
-msgid "HEAD"
-msgstr "头"
+msgid "A&ll files"
+msgstr "所有文件(&L)"
 
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 102
-#: rc.cpp:2543 rc.cpp:2573 rc.cpp:2739
+#. i18n: file ./parts/replace/replacedlg.ui line 166
+#: rc.cpp:2258
 #, no-c-format
-msgid "BASE"
-msgstr ""
+msgid "All files in the project will be considered."
+msgstr "将考虑工程中的所有文件。"
 
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 107
-#: rc.cpp:2546 rc.cpp:2576
+#. i18n: file ./parts/replace/replacedlg.ui line 174
+#: rc.cpp:2261
 #, no-c-format
-msgid "COMMITTED"
-msgstr ""
+msgid "&Open files only"
+msgstr "只有打开的文件(&O)"
 
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 112
-#: rc.cpp:2549 rc.cpp:2579
+#. i18n: file ./parts/replace/replacedlg.ui line 177
+#: rc.cpp:2264
 #, no-c-format
-msgid "PREV"
-msgstr ""
-
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 143
-#: rc.cpp:2552 rc.cpp:2582
-#, fuzzy, no-c-format
-msgid "Source URL or working path:"
-msgstr "源代码路径(&S)："
-
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 151
-#: rc.cpp:2555 rc.cpp:2567
-#, fuzzy, no-c-format
-msgid "Specify revision as"
-msgstr "更改函数名称"
-
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 161
-#: rc.cpp:2558
-#, fuzzy, no-c-format
-msgid "Source 2"
-msgstr "源文件"
-
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 302
-#: rc.cpp:2591
-#, fuzzy, no-c-format
-msgid "--force (Force to delete locally modified or unversioned items.)"
-msgstr "强制删除(删除本地已修改/没有版本的文件)"
-
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 310
-#: rc.cpp:2594
-#, fuzzy, no-c-format
-msgid "--non-recursive"
-msgstr "递归(&R)"
+msgid "Only open project files will be considered."
+msgstr "只考虑已打开的工程文件。"
 
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 318
-#: rc.cpp:2597
+#. i18n: file ./parts/replace/replacedlg.ui line 185
+#: rc.cpp:2267
 #, no-c-format
-msgid "--ignore-ancestry"
-msgstr ""
+msgid "Files under &path:"
+msgstr "如下路径中的文件(&P)："
 
-#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 335
-#: rc.cpp:2600
+#. i18n: file ./parts/replace/replacedlg.ui line 188
+#: rc.cpp:2270
 #, no-c-format
-msgid ""
-"--dry-run (Only receive full result notification\n"
-"                without actually modifying working copy)"
-msgstr ""
-
-#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 16
-#: rc.cpp:2604
-#, fuzzy, no-c-format
-msgid "Subversion Switch"
-msgstr "Subversion"
+msgid "Only project files in this dir and its subdirs will be considered."
+msgstr "只考虑此目录及其子目录下的文件。"
 
-#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 27
-#: rc.cpp:2607
+#. i18n: file ./parts/replace/replacedlg.ui line 219
+#: rc.cpp:2273
 #, no-c-format
-msgid "Non-recursive. (Switch its immediate children only)"
-msgstr ""
-
-#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 108
-#: rc.cpp:2616
-#, fuzzy, no-c-format
-msgid "Current Repository URL"
-msgstr "CVS 仓库(&R)："
-
-#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 124
-#: rc.cpp:2619
-#, fuzzy, no-c-format
-msgid "Working copy to switch"
-msgstr "目录："
-
-#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 140
-#: rc.cpp:2622
-#, fuzzy, no-c-format
-msgid "Working Mode"
-msgstr "目录："
-
-#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 151
-#: rc.cpp:2625
-#, fuzzy, no-c-format
-msgid "svn switch"
-msgstr "递归开关"
-
-#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 159
-#: rc.cpp:2628
-#, fuzzy, no-c-format
-msgid "svn switch --relocation"
-msgstr "恢复位置(&T)"
-
-#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 169
-#: rc.cpp:2631
-#, fuzzy, no-c-format
-msgid "New destination URL"
-msgstr "目的："
+msgid "Expression is invalid."
+msgstr "表达式无效。"
 
-#. i18n: file ./vcs/subversion/subversiondiff.ui line 16
-#: rc.cpp:2634
+#. i18n: file ./parts/replace/replacedlg.ui line 244
+#: rc.cpp:2276
 #, fuzzy, no-c-format
-msgid "Subversion Diff"
-msgstr "Subversion"
-
-#. i18n: file ./vcs/subversion/svn_co.ui line 24
-#: rc.cpp:2640
-#, no-c-format
-msgid "Subversion Module Checkout"
-msgstr "Subversion 模块提取"
+msgid "Fi&nd"
+msgstr "查找"
 
-#. i18n: file ./vcs/subversion/svn_co.ui line 43
-#: rc.cpp:2643
+#. i18n: file ./parts/replace/replacedlg.ui line 250
+#: rc.cpp:2279
 #, no-c-format
-msgid "Server Settings"
-msgstr "服务器设置"
+msgid "Start looking for possible replacement targets."
+msgstr "开始查找可能替换的目标"
 
-#. i18n: file ./vcs/subversion/svn_co.ui line 62
-#: rc.cpp:2646
+#. i18n: file ./parts/replace/replacedlg.ui line 268
+#: rc.cpp:2285
 #, no-c-format
-msgid "Checkout &from:"
-msgstr "提取来源(&F)："
+msgid "Strings"
+msgstr "字符串"
 
-#. i18n: file ./vcs/subversion/svn_co.ui line 96
-#: rc.cpp:2649
+#. i18n: file ./parts/replace/replacedlg.ui line 279
+#: rc.cpp:2288
 #, no-c-format
-msgid "&Revision:"
-msgstr "版本(&R)："
+msgid "&Text to find:"
+msgstr "要查找的文本(&T)："
 
-#. i18n: file ./vcs/subversion/svn_co.ui line 131
-#: rc.cpp:2655
+#. i18n: file ./parts/replace/replacedlg.ui line 290
+#: rc.cpp:2291
 #, no-c-format
-msgid "This Project has Standard &Trunk/Branches/Tags/Directories"
-msgstr "此工程含有标准主体/分支/标签/目录(&T)"
+msgid "Target string"
+msgstr "目标字符串"
 
-#. i18n: file ./vcs/subversion/svn_co.ui line 186
-#: rc.cpp:2664
+#. i18n: file ./parts/replace/replacedlg.ui line 298
+#: rc.cpp:2294
 #, no-c-format
-msgid "Local Directory"
-msgstr "本地目录"
+msgid "&Replacement text:"
+msgstr "替换文本(&R)："
 
-#. i18n: file ./vcs/subversion/svn_co.ui line 205
-#: rc.cpp:2667
+#. i18n: file ./parts/replace/replacedlg.ui line 309
+#: rc.cpp:2297
 #, no-c-format
-msgid "C&heckout in:"
-msgstr "提取位置(&H)："
+msgid "The replacement string"
+msgstr "替换字符串"
 
-#. i18n: file ./vcs/subversion/svn_co.ui line 239
-#: rc.cpp:2670
+#. i18n: file ./parts/vcsmanager/vcsmanagerprojectconfigbase.ui line 27
+#: rc.cpp:2300
 #, no-c-format
-msgid "&Name of the newly created directory:"
-msgstr "新创建的目录名称(&N)："
+msgid "Version control system to use for this project:"
+msgstr "此工程所使用的版本控制系统："
 
-#. i18n: file ./vcs/subversion/commitdlgbase.ui line 16
-#: rc.cpp:2679
+#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 24
+#: rc.cpp:2303
 #, no-c-format
-msgid "Log Message"
-msgstr "日志消息"
+msgid "Code Tooltip"
+msgstr "代码提示"
 
-#. i18n: file ./vcs/subversion/commitdlgbase.ui line 81
-#: rc.cpp:2685 rc.cpp:5434
+#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 27
+#: rc.cpp:2306
 #, no-c-format
-msgid "Ca&ncel"
+msgid ""
+"If checked, a tooltip will be shown when the mouse is over the bookmark, "
+"containing the text in the area surrounding it. "
+"<p> How many surrounding lines to include is decided by the value in the "
+"context box."
 msgstr ""
 
-#. i18n: file ./vcs/subversion/svn_commitdlgbase.ui line 36
-#: kdevdesigner/designer/iconvieweditorimpl.cpp:63
-#: kdevdesigner/designer/listboxeditorimpl.cpp:89
-#: kdevdesigner/designer/widgetfactory.cpp:740
-#: kdevdesigner/designer/widgetfactory.cpp:767
-#: kdevdesigner/designer/widgetfactory.cpp:776 rc.cpp:2691 rc.cpp:5304
+#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 38
+#: rc.cpp:2309
 #, no-c-format
-msgid "New Item"
-msgstr "新建项目"
+msgid "Show code &tooltip"
+msgstr "显示代码提示(&T)"
 
-#. i18n: file ./vcs/subversion/svn_commitdlgbase.ui line 71
-#: rc.cpp:2694
+#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 63
+#: rc.cpp:2312
 #, no-c-format
-msgid "Keep Locks"
-msgstr ""
-
-#. i18n: file ./vcs/subversion/svn_commitdlgbase.ui line 108
-#: rc.cpp:2703
-#, fuzzy, no-c-format
-msgid "Recursive"
-msgstr "递归(&R)"
+msgid "&Lines of context:"
+msgstr "上下文所在行(&L)："
 
-#. i18n: file ./vcs/subversion/svnssltrustpromptbase.ui line 16
-#: rc.cpp:2706
+#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 115
+#: rc.cpp:2315
 #, no-c-format
-msgid "SSL Certificate Trust"
-msgstr ""
-
-#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 16
-#: rc.cpp:2709
-#, fuzzy, no-c-format
-msgid "Subversion Copy"
-msgstr "Subversion"
+msgid "Show Bookmarked Codeline in Bookmark Panel"
+msgstr "在书签面板显示做过书签的代码行"
 
-#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 84
-#: rc.cpp:2721
+#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 118
+#: rc.cpp:2318
 #, no-c-format
-msgid "Specify either the full repository URL or local working path"
+msgid ""
+"This decides if the bookmark panel should show the content of the bookmarked "
+"line in addition to the line number."
+"<p>This can be made optional depending on the start of the line, typically used "
+"for only showing lines containing a comment."
 msgstr ""
 
-#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 94
-#: rc.cpp:2724
-#, fuzzy, no-c-format
-msgid "Requested Local Path"
-msgstr "真实路径"
-
-#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 102
-#: rc.cpp:2727
-#, fuzzy, no-c-format
-msgid "Source Revision"
-msgstr "版本"
-
-#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 129
-#: rc.cpp:2730
-#, fuzzy, no-c-format
-msgid "Specify by number:"
-msgstr "修饰符(&P)："
-
-#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 137
-#: rc.cpp:2733
-#, fuzzy, no-c-format
-msgid "Specify by keyword:"
-msgstr "修饰符(&P)："
+#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 129
+#: rc.cpp:2321
+#, no-c-format
+msgid "&Never"
+msgstr "从不(&N)"
 
-#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 153
-#: rc.cpp:2742
+#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 151
+#: rc.cpp:2324
 #, no-c-format
-msgid "WORKING"
-msgstr ""
+msgid "&Only lines beginning with the following string:"
+msgstr "仅以以下字符串开头的行(&O)："
 
-#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 178
-#: kdevdesigner/designer/mainwindowactions.cpp:206 rc.cpp:2745
+#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 189
+#: rc.cpp:2327
 #, no-c-format
-msgid "Source"
-msgstr "源文件"
+msgid "&Always"
+msgstr "总是(&A)"
 
-#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 197
-#: rc.cpp:2748
+#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 192
+#: rc.cpp:2330
 #, no-c-format
-msgid "Specify by the repository URL of this item"
-msgstr ""
+msgid "Always show the bookmarked line in addition to the line number"
+msgstr "始终显示除行号外的标记过的行"
 
-#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 205
-#: rc.cpp:2751
+#. i18n: file ./parts/documentation/find_documentationbase.ui line 25
+#: parts/documentation/documentation_part.cpp:247 rc.cpp:2333
 #, no-c-format
-msgid "Specify by local path of this item"
-msgstr ""
+msgid "Find Documentation"
+msgstr "查找文档"
 
-#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 55
-#: rc.cpp:2754
-#, fuzzy, no-c-format
-msgid "&Do not do anything"
-msgstr "什么也不做"
+#. i18n: file ./parts/documentation/find_documentationbase.ui line 36
+#: rc.cpp:2336
+#, no-c-format
+msgid "Search term:"
+msgstr "搜索项："
 
-#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 65
-#: rc.cpp:2757 rc.cpp:2764
+#. i18n: file ./parts/documentation/find_documentationbase.ui line 44
+#: parts/documentation/docconfiglistview.cpp:32
+#: parts/documentation/documentation_widget.cpp:62
+#: parts/documentation/docutils.cpp:90 parts/doxygen/messages.cpp:276
+#: rc.cpp:2339
 #, no-c-format
-msgid ""
-"Adds subversion menus to project.\n"
-"\n"
-"NOTE: Unless you import the project\n"
-"out of tdevelop, you will not be able\n"
-"to perform any subversion operations."
-msgstr ""
+msgid "Search"
+msgstr "搜索"
 
-#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 80
-#: rc.cpp:2771
+#. i18n: file ./parts/documentation/find_documentation_optionsbase.ui line 16
+#: rc.cpp:2345
 #, no-c-format
-msgid ""
-"&Create a project tree and import new project into trunk, then checkout from "
-"the repository"
-msgstr ""
+msgid "Find Documentation Options"
+msgstr "查找文档选项"
 
-#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 87
-#: rc.cpp:2774 rc.cpp:2781
+#. i18n: file ./parts/documentation/find_documentation_optionsbase.ui line 109
+#: rc.cpp:2354
 #, no-c-format
-msgid ""
-"Creates project, imports it into the subversion\n"
-"repository and checks it out as a working copy.\n"
-"\n"
-"NOTE: The repository has to exist.\n"
-"eg. been created with 'svnadmin'"
-msgstr ""
+msgid "Go to first match"
+msgstr "转到第一个匹配"
 
-#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 103
-#: rc.cpp:2788
+#. i18n: file ./parts/documentation/find_documentation_optionsbase.ui line 182
+#: rc.cpp:2363
 #, no-c-format
 msgid ""
-"Example for the url (if /home/user/subversion is the subversion repository):\n"
-"file:///home/user/subversion/mynewproject"
+"You can enable and disable search\n"
+"sources and change their priority here."
 msgstr ""
 
-#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 122
-#: rc.cpp:2792
+#. i18n: file ./parts/documentation/docprojectconfigwidgetbase.ui line 41
+#: parts/documentation/interfaces/kdevdocumentationplugin.cpp:688 rc.cpp:2367
 #, no-c-format
-msgid "Repository:"
-msgstr "仓库："
+msgid "Project API Documentation"
+msgstr "工程 API 文档"
 
-#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 135
-#: rc.cpp:2795
+#. i18n: file ./parts/documentation/docprojectconfigwidgetbase.ui line 60
+#: rc.cpp:2370
 #, no-c-format
-msgid ""
-"Subversion repository location.\n"
-"The repository has to exist -\n"
-"eg. been created with 'svnadmin'"
-msgstr ""
+msgid "Ca&talog location:"
+msgstr "编目位置(&T)："
 
-#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 144
-#: rc.cpp:2800
+#. i18n: file ./parts/documentation/docprojectconfigwidgetbase.ui line 85
+#: rc.cpp:2373
 #, no-c-format
-msgid ""
-"Subversion repository location. This should include the subdirectory for the "
-"project in the repository. The project subdirectory and further subdirectories "
-"will be created. \n"
-"\n"
-"So for example if you give http://localhost/svn/projectname the following "
-"directories will be created and the project imported into the trunk "
-"subdirectory:\n"
-"http://localhost/svn/projectname\n"
-"http://localhost/svn/projectname/tags\n"
-"http://localhost/svn/projectname/branches\n"
-"http://localhost/svn/projectname/trunk"
-msgstr ""
+msgid "C&ollection type:"
+msgstr "集合类型(&O)："
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 17
-#: rc.cpp:2809
+#. i18n: file ./parts/documentation/docprojectconfigwidgetbase.ui line 103
+#: parts/documentation/interfaces/kdevdocumentationplugin.cpp:689 rc.cpp:2376
 #, no-c-format
-msgid "This form allows you to create a CVS repository for your new project"
-msgstr "此表格让您能为新的工程创建一个 CVS 仓库"
+msgid "Project User Manual"
+msgstr "工程用户手册"
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 34
-#: rc.cpp:2812
+#. i18n: file ./parts/documentation/docprojectconfigwidgetbase.ui line 114
+#: rc.cpp:2379 rc.cpp:2391 rc.cpp:2430 rc.cpp:2982
 #, no-c-format
-msgid "Release &tag:"
-msgstr "发行版标签(&T)："
+msgid "&Location:"
+msgstr "位置(&L)："
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 45
-#: rc.cpp:2815
+#. i18n: file ./parts/documentation/editcatalogdlgbase.ui line 19
+#: rc.cpp:2382 rc.cpp:2409
 #, no-c-format
-msgid "Enter the name of the repository"
-msgstr "输入仓库名"
+msgid "Documentation Catalog Properties"
+msgstr "文档编目属性"
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 49
-#: rc.cpp:2818
+#. i18n: file ./parts/documentation/editcatalogdlgbase.ui line 141
+#: parts/fileview/addfilegroupdlg.cpp:26 rc.cpp:2394 rc.cpp:2418
 #, no-c-format
-msgid ""
-"CVS Repository name goes here.\n"
-"Most of the thime you'll just reuse the project name"
-msgstr ""
-"这里填写 CVS 仓库名。\n"
-"通常您只需直接使用工程名称"
+msgid "&Title:"
+msgstr "标题(&T)："
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 57
-#: rc.cpp:2822 rc.cpp:3078
+#. i18n: file ./parts/documentation/selecttopicbase.ui line 16
+#: rc.cpp:2397
 #, no-c-format
-msgid "vendor"
-msgstr "制作者"
+msgid "Choose Topic"
+msgstr "选择主题"
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 60
-#: rc.cpp:2825
+#. i18n: file ./parts/documentation/selecttopicbase.ui line 94
+#: rc.cpp:2406
 #, no-c-format
-msgid "Enter the vendor name"
-msgstr "输入制作者名称"
+msgid "Choose a topic for <b>%1</b>:"
+msgstr "选择 <b>%1</b> 的主题："
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 68
-#: rc.cpp:2828
+#. i18n: file ./parts/documentation/addcatalogdlgbase.ui line 43
+#: rc.cpp:2412
 #, no-c-format
-msgid "&Message:"
-msgstr "消息(&M)："
+msgid "Type:"
+msgstr "类型："
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 79
-#: rc.cpp:2831 rc.cpp:2943 rc.cpp:3123
+#. i18n: file ./parts/documentation/addcatalogdlgbase.ui line 73
+#: rc.cpp:2415
 #, no-c-format
-msgid "&Module:"
-msgstr "模块(&M)："
+msgid "Locatio&n:"
+msgstr "位置(&N)："
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 90
-#: rc.cpp:2834 rc.cpp:3090
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 16
+#: parts/documentation/bookmarkview.cpp:49
+#: parts/documentation/documentation_part.cpp:87
+#: parts/documentation/documentation_part.cpp:97
+#: parts/documentation/documentation_part.cpp:105
+#: parts/documentation/docutils.cpp:79 rc.cpp:2439
 #, no-c-format
-msgid "&Vendor tag:"
-msgstr "制作者标签(&V)："
+msgid "Documentation"
+msgstr "文档"
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 101
-#: rc.cpp:2837
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 34
+#: rc.cpp:2442
 #, no-c-format
-msgid "new project"
-msgstr "新建工程"
+msgid "&Documentation Collections"
+msgstr "文档收藏(&D)"
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 104
-#: rc.cpp:2840
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 82
+#: rc.cpp:2448 rc.cpp:3973 rc.cpp:8435 rc.cpp:8645 rc.cpp:8675
 #, no-c-format
-msgid "Repository creation message"
-msgstr "仓库创建消息"
+msgid "&Edit..."
+msgstr "编辑(&E)..."
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 112
-#: rc.cpp:2843 rc.cpp:3105
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 119
+#: rc.cpp:2454
 #, no-c-format
-msgid "start"
-msgstr "开始"
+msgid "Full Text &Search"
+msgstr "全文本搜索(&S)"
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 115
-#: rc.cpp:2846
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 155
+#: rc.cpp:2457
 #, no-c-format
-msgid "Tag that will be associated with initial state"
-msgstr "和初始状态相关联的标签"
+msgid "htse&arch executable:"
+msgstr "htsearch 可执行文件(&A)："
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 129
-#: rc.cpp:2849
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 207
+#: rc.cpp:2460
 #, no-c-format
-msgid "&Server path:"
-msgstr "服务器路径(&S)："
+msgid "htdi&g executable:"
+msgstr "htdig 可执行文件(&G)："
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 140
-#: rc.cpp:2852
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 226
+#: rc.cpp:2463
 #, no-c-format
-msgid "Enter your CVS Root location"
-msgstr "输入您的 CVS 根路径"
+msgid "Database di&rectory:"
+msgstr "数据库目录(&R)："
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 144
-#: rc.cpp:2855
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 237
+#: rc.cpp:2466
 #, no-c-format
-msgid ""
-"CVS Root location goes here, for example:"
-"<ul>\n"
-"<li>/home/cvsroot or</li>"
-"<li>:pserver:me@localhost:/home/cvs</li></ul>"
-msgstr ""
-"这里填写 CVS 根路径。\n"
-"例如 <tt>/home/cvsroot</tt> 或者 <tt>:pserver:me@localhost:/home/cvs</tt>"
+msgid "ht&merge executable:"
+msgstr "htmerge 可执行文件(&M)："
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 158
-#: rc.cpp:2859
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 252
+#: rc.cpp:2469
 #, no-c-format
-msgid "CVS_&RSH:"
-msgstr "CVS_&RSH："
+msgid "O&ther"
+msgstr "其它(&T)"
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 172
-#: rc.cpp:2862
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 280
+#: rc.cpp:2472
 #, no-c-format
-msgid "ssh"
-msgstr "ssh"
+msgid "Editor Context Menu Items"
+msgstr "编辑器环境菜单项"
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 184
-#: rc.cpp:2865
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 291
+#: rc.cpp:2475
 #, no-c-format
-msgid "Init &root"
-msgstr "初始化根路径(&R)"
+msgid "&Find in documentation"
+msgstr "在文档中查找(&F)"
 
-#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 187
-#: rc.cpp:2868
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 299
+#: rc.cpp:2478
 #, no-c-format
-msgid "Check if you defined a new CVS Root"
-msgstr "如果您指定了新的 CVS 根路径请选中此项"
+msgid "&Look in documentation index"
+msgstr "在文档索引中查找(&L)"
 
-#. i18n: file ./vcs/cvsservice/commitdialogbase.ui line 16
-#: rc.cpp:2871
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 307
+#: rc.cpp:2481
 #, no-c-format
-msgid "Commit to Repository"
-msgstr "提交到仓库"
+msgid "S&earch in documentation"
+msgstr "在文档中搜索(&E)"
 
-#. i18n: file ./vcs/cvsservice/commitdialogbase.ui line 30
-#: rc.cpp:2874
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 315
+#: rc.cpp:2484
 #, no-c-format
-msgid "&Message"
-msgstr "消息(&M)"
+msgid "Goto &infopage"
+msgstr "转至信息页(&I)"
 
-#. i18n: file ./vcs/cvsservice/commitdialogbase.ui line 56
-#: rc.cpp:2877
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 323
+#: rc.cpp:2487
 #, no-c-format
-msgid "&Add to changelog:"
-msgstr "添加到变更日志(&A)："
-
-#. i18n: file ./vcs/cvsservice/commitdialogbase.ui line 67
-#: rc.cpp:2880
-#, fuzzy, no-c-format
-msgid "Change log filename path (relative to project directory)"
-msgstr "改变日志文件路径(相对于工程目录)"
+msgid "Goto &manpage"
+msgstr "转至手册页(&M)"
 
-#. i18n: file ./vcs/cvsservice/commitdialogbase.ui line 70
-#: rc.cpp:2883
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 333
+#: rc.cpp:2490
 #, fuzzy, no-c-format
-msgid ""
-"<b>Changelog filename path</b>"
-"<br/>Insert here the Changelog filename you wish to use so that the message is "
-"appended"
-msgstr "<b>Changelog文件名路径</b><br/>在这里输入您希望插入消息的Changelog文件名"
+msgid "Use TDevelop &Assistant to browse documentation"
+msgstr "使用 KDevelop 助手浏览文档(&A)"
 
-#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 16
-#: rc.cpp:2892
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 341
+#: rc.cpp:2493
 #, no-c-format
-msgid "Update/Revert to Release/Branch/Date"
-msgstr "更新/返转到发行版/分支/日期"
+msgid "Fonts && Sizes"
+msgstr "字体和大小"
 
-#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 38
-#: rc.cpp:2895
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 360
+#: rc.cpp:2496
 #, no-c-format
-msgid "Revision"
-msgstr "版本"
+msgid "Sta&ndard font:"
+msgstr "标准字体(&N)："
 
-#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 52
-#: rc.cpp:2898
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 389
+#: rc.cpp:2499
 #, no-c-format
-msgid "&Most recent from current branch"
-msgstr "当前分支的最新版本(&M)"
+msgid "Fi&xed font:"
+msgstr "等宽字体(&X)："
 
-#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 71
-#: rc.cpp:2901
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 408
+#: rc.cpp:2502
 #, no-c-format
-msgid "An arbitrary &revision/tag/branch:"
-msgstr "任意的版本/标签/分支(&R)："
+msgid "&Zoom factor:"
+msgstr "缩放因子(&Z)："
 
-#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 85
-#: rc.cpp:2904
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 417
+#: rc.cpp:2505
 #, no-c-format
-msgid "Type your release name here (leave empty for HEAD)"
-msgstr "在这里输入您的发布名称(使用 HEAD 则留空)"
-
-#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 88
-#: rc.cpp:2907
-#, fuzzy, no-c-format
-msgid ""
-"Fill the field with the release or branch name (e.g. <i>"
-"make_it_cool, tdevelop_alpha5, ...</i>)"
-msgstr "输入发布名称(例如　<i>make_it_cool，tdevelop_alpha5，...</i>)"
+msgid "20"
+msgstr "20"
 
-#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 106
-#: rc.cpp:2910
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 422
+#: rc.cpp:2508
 #, no-c-format
-msgid "An arbitrary &date:"
-msgstr "任意的日期(&D)："
+msgid "40"
+msgstr "40"
 
-#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 117
-#: rc.cpp:2913
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 427
+#: rc.cpp:2511
 #, no-c-format
-msgid "FIll the field with a date (e.g. <i>20030204</i>)"
-msgstr "输入日期(例如 <i>20030204</i>)"
+msgid "60"
+msgstr "60"
 
-#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 129
-#: rc.cpp:2916
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 432
+#: rc.cpp:2514
 #, no-c-format
-msgid "Additional Options"
-msgstr "附加选项"
+msgid "80"
+msgstr "80"
 
-#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 140
-#: rc.cpp:2919
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 437
+#: rc.cpp:2517
 #, no-c-format
-msgid "&Enforce even if the file has been locally modified (revert)"
-msgstr "强迫文件一致如果在本地被修改(恢复)(&E)"
+msgid "90"
+msgstr "90"
 
-#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 24
-#: rc.cpp:2928
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 442
+#: rc.cpp:2520
 #, no-c-format
-msgid "CVS Server Configuration"
-msgstr "CVS 服务器配置"
+msgid "95"
+msgstr "95"
 
-#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 46
-#: rc.cpp:2934
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 447
+#: rc.cpp:2523
 #, no-c-format
-msgid "&Local destination directory:"
-msgstr "本地目标目录(&L)："
+msgid "100"
+msgstr "100"
 
-#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 86
-#: rc.cpp:2937
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 452
+#: rc.cpp:2526
 #, no-c-format
-msgid "&Server path (e.g. :pserver:marios@cvs.kde.org:/home/kde):"
-msgstr "服务器路径(例如 :pserver:marios@cvs.kde.org:/home/kde)(&S)："
+msgid "105"
+msgstr "105"
 
-#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 101
-#: rc.cpp:2940
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 457
+#: rc.cpp:2529
 #, no-c-format
-msgid "Select Module"
-msgstr "选择模块"
+msgid "110"
+msgstr "110"
 
-#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 156
-#: rc.cpp:2946
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 462
+#: rc.cpp:2532
 #, no-c-format
-msgid "&Tag/branch:"
-msgstr "标签/分支(&T)："
+msgid "120"
+msgstr "120"
 
-#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 195
-#: rc.cpp:2949
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 467
+#: rc.cpp:2535
 #, no-c-format
-msgid "&Prune directories"
-msgstr "剪除子目录(&P)"
+msgid "140"
+msgstr "140"
 
-#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 201
-#: rc.cpp:2952
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 472
+#: rc.cpp:2538
 #, no-c-format
-msgid "Creates subdirs if needed"
-msgstr "若有必要则建立子目录"
+msgid "160"
+msgstr "160"
 
-#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 207
-#: rc.cpp:2955
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 477
+#: rc.cpp:2541
 #, no-c-format
-msgid "Module"
-msgstr "模块"
+msgid "180"
+msgstr "180"
 
-#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 218
-#: rc.cpp:2958
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 482
+#: rc.cpp:2544
 #, no-c-format
-msgid "Real Path"
-msgstr "真实路径"
+msgid "200"
+msgstr "200"
 
-#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 277
-#: rc.cpp:2961
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 487
+#: rc.cpp:2547
 #, no-c-format
-msgid "&Fetch Modules List"
-msgstr "获取模块列表(&F)"
+msgid "250"
+msgstr "250"
 
-#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 283
-#: rc.cpp:2964
+#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 492
+#: rc.cpp:2550
 #, no-c-format
-msgid "Fetch modules list from server"
-msgstr "从服务器获取模块列表"
+msgid "300"
+msgstr "300"
 
-#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 286
-#: rc.cpp:2967
+#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 28
+#: rc.cpp:2553
 #, no-c-format
-msgid "Click to fetch modules list from server you specified"
-msgstr "单击从服务器获取您指定的模块列表"
+msgid "Tag"
+msgstr "标记"
 
-#. i18n: file ./vcs/cvsservice/editorsdialogbase.ui line 16
-#: rc.cpp:2970 rc.cpp:6137
+#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 69
+#: rc.cpp:2562
 #, no-c-format
-msgid "Editors"
-msgstr "编辑器"
+msgid ""
+"Result view for a tag lookup. Click a line to go to the corresponding place in "
+"the code."
+msgstr ""
 
-#. i18n: file ./vcs/cvsservice/tagdialogbase.ui line 16
-#: rc.cpp:2976
+#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 85
+#: languages/cpp/problemreporter.cpp:141 languages/php/phperrorview.cpp:132
+#: rc.cpp:2565
 #, no-c-format
-msgid "Tag Files on CVS Repository"
-msgstr "对 CVS 仓库中的文件加标签"
+msgid "Lookup:"
+msgstr "查阅："
 
-#. i18n: file ./vcs/cvsservice/tagdialogbase.ui line 38
-#: rc.cpp:2979
+#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 93
+#: rc.cpp:2568
 #, no-c-format
-msgid "Tag/Branch &name:"
-msgstr "标签/分支名称(&N)："
+msgid ""
+"Type the identifier you want to lookup. "
+"<p> The identifier will populate and display a reducing list as you type."
+msgstr ""
 
-#. i18n: file ./vcs/cvsservice/tagdialogbase.ui line 56
-#: rc.cpp:2982
+#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 101
+#: rc.cpp:2571
 #, no-c-format
-msgid "Tag as &branch"
-msgstr "标记为分支(&B)"
+msgid "Hits:"
+msgstr "次数："
 
-#. i18n: file ./vcs/cvsservice/tagdialogbase.ui line 64
-#: rc.cpp:2985
+#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 126
+#: rc.cpp:2574
 #, no-c-format
-msgid "&Force"
-msgstr "强制(&F)"
+msgid "Date:"
+msgstr "日期："
 
-#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 16
-#: rc.cpp:2994
+#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 137
+#: rc.cpp:2577
 #, no-c-format
-msgid "Choose Revisions to Diff"
-msgstr "选择要比较的版本"
+msgid "Regenerate"
+msgstr "重新生成"
 
-#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 30
-#: rc.cpp:2997
+#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 140
+#: rc.cpp:2580
 #, no-c-format
-msgid "Build Difference Between"
-msgstr "构建如下版本间的差异"
+msgid ""
+"Press to regenerate CTags database."
+"<p>This will take some time on a large project."
+msgstr ""
 
-#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 49
-#: rc.cpp:3000
-#, no-c-format
-msgid "Local copy and an arbitrary &revision:"
-msgstr "本地文件和任一版本(&R)："
+#. i18n: file ./parts/ctags2/ctags2_createtagfilebase.ui line 16
+#: rc.cpp:2583
+#, fuzzy, no-c-format
+msgid "Create new tags file"
+msgstr "创建新文件"
 
-#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 67
-#: rc.cpp:3003
+#. i18n: file ./parts/ctags2/ctags2_createtagfilebase.ui line 40
+#: rc.cpp:2589
 #, no-c-format
-msgid "&Two arbitrary revisions/tags:"
-msgstr "两个任意的版本/标签(&T)："
+msgid "Target tags file path:"
+msgstr ""
 
-#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 91
-#: rc.cpp:3006
-#, no-c-format
-msgid "Revision A:"
-msgstr "版本 A："
+#. i18n: file ./parts/ctags2/ctags2_createtagfilebase.ui line 53
+#: rc.cpp:2592
+#, fuzzy, no-c-format
+msgid "Directory to tag:"
+msgstr "目录："
 
-#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 105
-#: rc.cpp:3009
-#, no-c-format
-msgid "Second revision to compare (leave empty to diff against HEAD)"
-msgstr "要比较的第二个修订(与HEAD比较保持为空)"
+#. i18n: file ./parts/ctags2/ctags2_createtagfilebase.ui line 91
+#: rc.cpp:2595
+#, fuzzy, no-c-format
+msgid "&Create"
+msgstr "创建(&R)"
 
-#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 116
-#: rc.cpp:3012
-#, no-c-format
-msgid "First revision to compare"
-msgstr "要比较的第一个修订"
+#. i18n: file ./parts/ctags2/ctags2_createtagfilebase.ui line 99
+#: rc.cpp:2598 rc.cpp:6452 rc.cpp:6558
+#, fuzzy, no-c-format
+msgid "C&ancel"
+msgstr "变更日志(&H)："
 
-#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 132
-#: rc.cpp:3015
-#, no-c-format
-msgid "Revision B:"
-msgstr "版本 B："
+#. i18n: file ./parts/ctags2/ctags2_selecttagfilebase.ui line 16
+#: rc.cpp:2601
+#, fuzzy, no-c-format
+msgid "Add tags file"
+msgstr "添加已有的文件"
 
-#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 142
-#: rc.cpp:3018
-#, no-c-format
-msgid "Local cop&y and HEAD"
-msgstr "本地副本和 HEAD(&Y)"
+#. i18n: file ./parts/ctags2/ctags2_selecttagfilebase.ui line 40
+#: rc.cpp:2607
+#, fuzzy, no-c-format
+msgid "Tags file:"
+msgstr "标记文件"
 
-#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 150
-#: rc.cpp:3021
+#. i18n: file ./parts/ctags2/ctags2_selecttagfilebase.ui line 78
+#: rc.cpp:2610 rc.cpp:4214 rc.cpp:6555 rc.cpp:7543 rc.cpp:7567
 #, no-c-format
-msgid "Local copy a&nd BASE"
-msgstr "本地副本和 BASE(&N)"
+msgid "O&K"
+msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 16
-#: rc.cpp:3030
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 28
+#: rc.cpp:2616 rc.cpp:5626
 #, no-c-format
-msgid "CVS Options"
-msgstr "CVS 选项"
+msgid "Ge&neral"
+msgstr "常规(&N)"
 
-#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 27
-#: rc.cpp:3033
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 47
+#: rc.cpp:2619
 #, no-c-format
-msgid "Common Settings"
-msgstr "公用选项"
+msgid "Editor Context Menu"
+msgstr "编辑器环境菜单"
 
-#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 46
-#: rc.cpp:3036
-#, no-c-format
-msgid "&Remote shell (CVS_RSH environment variable):"
-msgstr "远程 shell (CVS_RSH 环境变量)(&R)："
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 58
+#: rc.cpp:2622
+#, fuzzy, no-c-format
+msgid "Show \"&Go To Declaration\""
+msgstr "显示“转到声明”"
 
-#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 57
-#: rc.cpp:3039
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 61
+#: rc.cpp:2625
 #, no-c-format
-msgid "sets the CVS_RSH variable"
-msgstr "设置 CVS_RSH 变量"
-
-#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 60
-#: rc.cpp:3042
-#, fuzzy, no-c-format
 msgid ""
-"Set this option to \"ssh\" to use ssh as remote shell for CVS. Note that you "
-"need password-less login (see the ssh documentation for how to generate a "
-"public/private key pair) otherwise CVS will just hang forever."
+"If checked, an option to go directly to the matching tag declaration will be "
+"shown. If more than one match, all matches will be shown in the main ctags "
+"result view."
 msgstr ""
-"将这个选项设为“ssh”可以使用 ssh 作为 CVS 的远程 shell。注意您需要设置无需输入口令的登录方式(关于如何生成公用/私有密钥对，请参见 ssh "
-"HOWTO 文档)，不然 CVS 将无法进行。"
 
-#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 68
-#: rc.cpp:3045
-#, no-c-format
-msgid "CVS server &location:"
-msgstr "CVS 服务器位置(&L)："
-
-#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 86
-#: rc.cpp:3048
-#, no-c-format
-msgid "When Updating"
-msgstr "更新时"
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 69
+#: rc.cpp:2628
+#, fuzzy, no-c-format
+msgid "Show \"Go To &Definition\""
+msgstr "显示“转到定义”"
 
-#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 97
-#: rc.cpp:3051
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 72
+#: rc.cpp:2631
 #, no-c-format
-msgid "Create &new directories (if any)"
-msgstr "创建新的子目录(如果存在)(&N)"
+msgid ""
+"If checked, an option to go directly to the matching tag definition will be "
+"shown. If more than one match, all matches will be shown in the main ctags "
+"result view."
+msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 105
-#: rc.cpp:3054
-#, no-c-format
-msgid "&Prune empty directories"
-msgstr "去除空目录(&P)"
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 80
+#: rc.cpp:2634
+#, fuzzy, no-c-format
+msgid "Show \"CT&ags Lookup\""
+msgstr "显示“CTags 查阅”"
 
-#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 113
-#: rc.cpp:3057
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 83
+#: rc.cpp:2637
 #, no-c-format
-msgid "&Update subdirectories too"
-msgstr "更新子目录(&U)"
+msgid ""
+"If checked, an option to do a full lookup of all macthing tags is shown in the "
+"context menu. The results will be shown in the main ctags results view."
+msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 123
-#: rc.cpp:3060
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 112
+#: rc.cpp:2643
 #, no-c-format
-msgid "When Committing/Removing"
-msgstr "提交/删除时"
+msgid "When more than one hit, go directl&y to the first"
+msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 134
-#: rc.cpp:3063
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 115
+#: rc.cpp:2646
 #, no-c-format
-msgid "&Be recursive"
-msgstr "递归(&B)"
+msgid ""
+"If more than one hit was produced from an attempt to find an exact match, go to "
+"the first match in the list. Note: the <i>Go To Next Match</i> "
+"shortcut can be used to step between the matches."
+msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 144
-#: rc.cpp:3066
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 123
+#: rc.cpp:2649
 #, no-c-format
-msgid "When Creating Diffs"
-msgstr "创建差异文件时"
+msgid "&Use custom tagfile generation arguments"
+msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 176
-#: rc.cpp:3069
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 126
+#: rc.cpp:2652
 #, no-c-format
-msgid "Use these e&xtra options:"
-msgstr "使用额外选项(&X)："
+msgid ""
+"The default arguments should be fine, but if needed a custom generation "
+"arguments string can be used."
+msgstr ""
 
-#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 209
-#: rc.cpp:3072
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 140
+#: rc.cpp:2655
 #, no-c-format
-msgid "Con&text lines:"
-msgstr "上下文行数(&T)："
+msgid ""
+"Enter custom arguments to ctags database creation here. Note: do not set a "
+"custom tags file filename here, do that below instead."
+msgstr ""
 
-#. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 27
-#: rc.cpp:3075
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 158
+#: rc.cpp:2658
 #, no-c-format
-msgid "Create module in the repository"
-msgstr "在仓库中创建模块"
+msgid "Paths"
+msgstr "路径"
 
-#. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 57
-#: rc.cpp:3081
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 161
+#: rc.cpp:2661 rc.cpp:2667
 #, no-c-format
-msgid "&Init Local Repository..."
-msgstr "初始化本地仓库(&I)..."
+msgid ""
+"Enter the path to the exuberant ctags binary. If empty, <i>ctags</i> "
+"will be executed via $PATH. Note that it is sometimes installed as <i>"
+"exuberant-ctags</i>."
+msgstr ""
 
-#. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 90
-#: rc.cpp:3084
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 172
+#: rc.cpp:2664
 #, no-c-format
-msgid "Login to &Repository..."
-msgstr "登录仓库(&R)..."
+msgid "Path to ctags binary:"
+msgstr "ctags 二进制路径："
 
-#. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 154
-#: rc.cpp:3087
-#, no-c-format
-msgid "Mo&dule:"
-msgstr "模块(&D)："
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 209
+#: rc.cpp:2670
+#, fuzzy, no-c-format
+msgid "Mana&ge tag files"
+msgstr "生成标记文件"
 
-#. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 198
-#: rc.cpp:3093
-#, no-c-format
-msgid "Re&lease tag:"
-msgstr "发行版标签(&L)："
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 228
+#: rc.cpp:2673
+#, fuzzy, no-c-format
+msgid "Path to project tag file:"
+msgstr "工程类型(&P)："
 
-#. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 220
-#: rc.cpp:3096 rc.cpp:6182 rc.cpp:6245 rc.cpp:8194
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 236
+#: rc.cpp:2676
 #, no-c-format
-msgid "Co&mment:"
-msgstr "注释(&M)："
+msgid ""
+"Enter the full path of the project tagfile. If empty, the file will be called "
+"<i>tags</i> and reside in the root of the project."
+msgstr ""
 
-#. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 242
-#: rc.cpp:3099 rc.cpp:3117
-#, no-c-format
-msgid "&Repository:"
-msgstr "仓库(&R)："
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 246
+#: rc.cpp:2679
+#, fuzzy, no-c-format
+msgid "Other tag files:"
+msgstr "其它文件"
 
-#. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 256
-#: rc.cpp:3102
-#, no-c-format
-msgid "First Import"
-msgstr "首次导入"
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 262
+#: rc.cpp:2682
+#, fuzzy, no-c-format
+msgid "&Create..."
+msgstr "正在创建..."
 
-#. i18n: file ./vcs/cvsservice/integrator/initdlg.ui line 16
-#: rc.cpp:3108
-#, no-c-format
-msgid "Choose Repository Location"
-msgstr "选择仓库位置"
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 278
+#: rc.cpp:2688
+#, fuzzy, no-c-format
+msgid "Remo&ve"
+msgstr "删除(&M)"
 
-#. i18n: file ./vcs/cvsservice/integrator/initdlg.ui line 35
-#: rc.cpp:3111
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 303
+#: buildtools/qmake/projectconfigurationdlg.cpp:1794
+#: kdevdesigner/designer/hierarchyview.cpp:190
+#: lib/widgets/propeditor/propertyeditor.cpp:172
+#: parts/fileview/filegroupswidget.cpp:169 rc.cpp:2691 rc.cpp:4238 rc.cpp:4286
+#: rc.cpp:4301 rc.cpp:7207 rc.cpp:7228 rc.cpp:7294 rc.cpp:7975 rc.cpp:8663
 #, no-c-format
-msgid "&Repository location:"
-msgstr "仓库位置(&R)："
+msgid "Name"
+msgstr "名称"
 
-#. i18n: file ./vcs/cvsservice/integrator/fetcherdlgbase.ui line 51
-#: rc.cpp:3114
-#, no-c-format
-msgid "&Branch tag:"
-msgstr "分支标签(&B)："
+#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 314
+#: rc.cpp:2694
+#, fuzzy, no-c-format
+msgid "Tags file"
+msgstr "标记文件"
 
-#. i18n: file ./vcs/cvsservice/integrator/fetcherdlgbase.ui line 97
-#: rc.cpp:3120
+#. i18n: file ./parts/filelist/projectviewconfigbase.ui line 16
+#: parts/filelist/filelist_widget.cpp:228
+#: parts/filelist/projectviewpart.cpp:79 parts/filelist/projectviewpart.cpp:80
+#: parts/filelist/projectviewpart.cpp:251
+#: parts/filelist/projectviewpart.cpp:265
+#: parts/filelist/projectviewpart.cpp:270 rc.cpp:2697
 #, no-c-format
-msgid "Fetch &List"
-msgstr "获取列表(&L)"
+msgid "File List"
+msgstr "文件列表"
 
-#. i18n: file ./parts/partexplorer/partexplorerformbase.ui line 24
-#: rc.cpp:3129
-#, no-c-format
-msgid "PartExplorer"
-msgstr "PartExplorer"
+#. i18n: file ./parts/filelist/projectviewconfigbase.ui line 27
+#: rc.cpp:2700
+#, fuzzy, no-c-format
+msgid "Display toolbar in toolview (note: change needs a restart)"
+msgstr "在工具视图中显示工具栏(注意：更改需要重新启动)(&Y)"
 
-#. i18n: file ./parts/partexplorer/partexplorerformbase.ui line 27
-#: rc.cpp:3132
+#. i18n: file ./parts/filelist/projectviewconfigbase.ui line 33
+#: rc.cpp:2703 rc.cpp:2706
 #, no-c-format
 msgid ""
-"This is a front-end to TDE's TDETrader: search your TDE documentation for more "
-"information about TDE services and TDETrader"
-msgstr "这是TDE的TDETrader的前端：在TDE文档中搜索有关TDE服务和TDETrader的信息"
-
-#. i18n: file ./parts/partexplorer/partexplorerformbase.ui line 46
-#: rc.cpp:3135
-#, no-c-format
-msgid "TDE service &type:"
-msgstr "TDE 服务类型(&T)："
+"Uncheck this if you want the toolbar together with all other toolbars. You can "
+"disable it then"
+msgstr ""
 
-#. i18n: file ./parts/partexplorer/partexplorerformbase.ui line 79
-#: rc.cpp:3138
-#, no-c-format
-msgid "&Additional constraints:"
-msgstr "附加限制(&A)："
+#. i18n: file ./parts/filelist/projectviewconfigbase.ui line 44
+#: rc.cpp:2709
+#, fuzzy, no-c-format
+msgid "Only save project files in a session"
+msgstr "只在视图中保存工程文件"
 
-#. i18n: file ./parts/partexplorer/partexplorerformbase.ui line 104
-#: rc.cpp:3141
+#. i18n: file ./parts/filelist/projectviewconfigbase.ui line 50
+#: rc.cpp:2712 rc.cpp:2715
 #, no-c-format
-msgid ""
-"<b>Constraints</b>Refine your query by writing additional constraints such as "
-"<i>([X-KDevelop-Scope]='Global')</i>)."
-msgstr "<b>限制</b>通过加入新的限制条件重新定义您的查询，例如<i>(［X-KDevelop-Scope］＝'Global')</i>)。"
+msgid "Check this if you want to ignore files that are not part of the project"
+msgstr ""
 
-#. i18n: file ./parts/partexplorer/partexplorerformbase.ui line 120
-#: rc.cpp:3144
+#. i18n: file ./parts/filelist/projectviewconfigbase.ui line 61
+#: rc.cpp:2718
 #, no-c-format
-msgid "&Results"
-msgstr "结果(&R)"
+msgid "Close all open files before opening a session"
+msgstr ""
 
-#. i18n: file ./parts/replace/replacedlg.ui line 30
-#: rc.cpp:3147
+#. i18n: file ./parts/filelist/projectviewconfigbase.ui line 67
+#: rc.cpp:2721 rc.cpp:2724
 #, no-c-format
-msgid "Project Wide String Replacement"
-msgstr "对整个项目进行字符串替换"
+msgid ""
+"Check this if you want the currently open files closed before opening a session"
+msgstr ""
 
-#. i18n: file ./parts/replace/replacedlg.ui line 52
-#: parts/grepview/grepdlg.cpp:127 rc.cpp:3153 rc.cpp:4790
+#. i18n: file ./parts/filelist/projectviewprojectconfigbase.ui line 16
+#: rc.cpp:2727
 #, no-c-format
-msgid "C&ase sensitive"
-msgstr "区分大小写(&A)"
+msgid "Projectviews"
+msgstr "工程视图"
 
-#. i18n: file ./parts/replace/replacedlg.ui line 80
-#: rc.cpp:3156
-#, no-c-format
-msgid "All s&ubstrings"
-msgstr "所有子串(&U)"
+#. i18n: file ./parts/filelist/projectviewprojectconfigbase.ui line 35
+#: rc.cpp:2730
+#, fuzzy, no-c-format
+msgid "Open this session after project load:"
+msgstr "工程装入后打开此视图："
 
-#. i18n: file ./parts/replace/replacedlg.ui line 91
-#: rc.cpp:3159
+#. i18n: file ./parts/filelist/projectviewprojectconfigbase.ui line 51
+#: rc.cpp:2733
 #, fuzzy, no-c-format
-msgid "Whole words onl&y"
-msgstr "整词匹配(&W)"
+msgid "select a session"
+msgstr "选择访问"
 
-#. i18n: file ./parts/replace/replacedlg.ui line 107
-#: rc.cpp:3162
+#. i18n: file ./parts/fileview/filegroupsconfigwidgetbase.ui line 16
+#: parts/fileview/filegroupspart.cpp:46 rc.cpp:2736
 #, no-c-format
-msgid "Regular e&xpression:"
-msgstr "正则表达式(&X)："
+msgid "File Group View"
+msgstr "文件分组视图"
 
-#. i18n: file ./parts/replace/replacedlg.ui line 110
-#: rc.cpp:3165
+#. i18n: file ./parts/fileview/filegroupsconfigwidgetbase.ui line 38
+#: rc.cpp:2739
 #, no-c-format
-msgid "Use regexp to specify target"
-msgstr "用正则表达式指定目标"
-
-#. i18n: file ./parts/replace/replacedlg.ui line 121
-#: rc.cpp:3168
-#, fuzzy, no-c-format
-msgid "E&dit"
-msgstr "编辑器"
+msgid "&Groups in the file view and their corresponding patterns:"
+msgstr "文件视图里的分组和它们相应的模板(&G)："
 
-#. i18n: file ./parts/replace/replacedlg.ui line 124
-#: rc.cpp:3171
+#. i18n: file ./parts/fileview/filegroupsconfigwidgetbase.ui line 47
+#: rc.cpp:2742 rc.cpp:3979
 #, no-c-format
-msgid "Opens the regexp editor. Only enabled if installed."
-msgstr "打开正则表达式编辑器。只有安装后才能启用。"
+msgid "Group"
+msgstr "组"
 
-#. i18n: file ./parts/replace/replacedlg.ui line 139
-#: rc.cpp:3174
+#. i18n: file ./parts/fileview/filegroupsconfigwidgetbase.ui line 58
+#: rc.cpp:2745
 #, no-c-format
-msgid "Enter the regexp here"
-msgstr "在此输入正则表达式"
+msgid "Pattern"
+msgstr "模板"
 
-#. i18n: file ./parts/replace/replacedlg.ui line 149
-#: rc.cpp:3177
+#. i18n: file ./parts/fileview/filegroupsconfigwidgetbase.ui line 112
+#: rc.cpp:2748
 #, no-c-format
-msgid "Target Files in Project"
-msgstr "工程中的目标文件"
+msgid "&Add Group..."
+msgstr "添加组(&A)..."
 
-#. i18n: file ./parts/replace/replacedlg.ui line 160
-#: rc.cpp:3180
+#. i18n: file ./parts/fileview/filegroupsconfigwidgetbase.ui line 120
+#: rc.cpp:2751
 #, no-c-format
-msgid "A&ll files"
-msgstr "所有文件(&L)"
+msgid "&Edit Group..."
+msgstr "编辑组(&E)..."
 
-#. i18n: file ./parts/replace/replacedlg.ui line 166
-#: rc.cpp:3183
+#. i18n: file ./parts/fileview/filegroupsconfigwidgetbase.ui line 128
+#: rc.cpp:2754
 #, no-c-format
-msgid "All files in the project will be considered."
-msgstr "将考虑工程中的所有文件。"
+msgid "De&lete Group"
+msgstr "删除组(&L)"
 
-#. i18n: file ./parts/replace/replacedlg.ui line 174
-#: rc.cpp:3186
+#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 16
+#: rc.cpp:2763
 #, no-c-format
-msgid "&Open files only"
-msgstr "只有打开的文件(&O)"
+msgid "Colors for VCS Visual Feedback"
+msgstr "版本控制可视化反馈信息的颜色"
 
-#. i18n: file ./parts/replace/replacedlg.ui line 177
-#: rc.cpp:3189
+#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 27
+#: rc.cpp:2766
 #, no-c-format
-msgid "Only open project files will be considered."
-msgstr "只考虑已打开的工程文件。"
+msgid "Colors to Use for Version Control Feedback"
+msgstr "用于显示版本控制返回的颜色"
 
-#. i18n: file ./parts/replace/replacedlg.ui line 185
-#: rc.cpp:3192
+#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 46
+#: rc.cpp:2769
 #, no-c-format
-msgid "Files under &path:"
-msgstr "如下路径中的文件(&P)："
+msgid "&Updated:"
+msgstr "已更新(&U)："
 
-#. i18n: file ./parts/replace/replacedlg.ui line 188
-#: rc.cpp:3195
+#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 65
+#: rc.cpp:2772
 #, no-c-format
-msgid "Only project files in this dir and its subdirs will be considered."
-msgstr "只考虑此目录及其子目录下的文件。"
+msgid "&Modified:"
+msgstr "已改变(&M)："
 
-#. i18n: file ./parts/replace/replacedlg.ui line 219
-#: rc.cpp:3198
+#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 84
+#: rc.cpp:2775
 #, no-c-format
-msgid "Expression is invalid."
-msgstr "表达式无效。"
-
-#. i18n: file ./parts/replace/replacedlg.ui line 244
-#: rc.cpp:3201
-#, fuzzy, no-c-format
-msgid "Fi&nd"
-msgstr "查找"
+msgid "Co&nflict:"
+msgstr "冲突(&N)："
 
-#. i18n: file ./parts/replace/replacedlg.ui line 250
-#: rc.cpp:3204
+#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 103
+#: rc.cpp:2778
 #, no-c-format
-msgid "Start looking for possible replacement targets."
-msgstr "开始查找可能替换的目标"
+msgid "&Added:"
+msgstr "已添加(&A)："
 
-#. i18n: file ./parts/replace/replacedlg.ui line 268
-#: rc.cpp:3210
+#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 122
+#: rc.cpp:2781
 #, no-c-format
-msgid "Strings"
-msgstr "字符串"
+msgid "&Sticky:"
+msgstr "粘滞标签(&S)："
 
-#. i18n: file ./parts/replace/replacedlg.ui line 279
-#: rc.cpp:3213
+#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 141
+#: rc.cpp:2784
 #, no-c-format
-msgid "&Text to find:"
-msgstr "要查找的文本(&T)："
+msgid "&Needs checkout:"
+msgstr "需要提取(&N)："
 
-#. i18n: file ./parts/replace/replacedlg.ui line 290
-#: rc.cpp:3216
+#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 160
+#: rc.cpp:2787
 #, no-c-format
-msgid "Target string"
-msgstr "目标字符串"
+msgid "&Needs patch:"
+msgstr "需要补丁(&N)："
 
-#. i18n: file ./parts/replace/replacedlg.ui line 298
-#: rc.cpp:3219
+#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 179
+#: rc.cpp:2790
 #, no-c-format
-msgid "&Replacement text:"
-msgstr "替换文本(&R)："
+msgid "Un&known:"
+msgstr "未知(&K)："
 
-#. i18n: file ./parts/replace/replacedlg.ui line 309
-#: rc.cpp:3222
+#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 198
+#: rc.cpp:2793
 #, no-c-format
-msgid "The replacement string"
-msgstr "替换字符串"
+msgid "&Default:"
+msgstr "默认(&D)："
 
 #. i18n: file ./parts/tools/addtooldlg.ui line 16
-#: rc.cpp:3225
+#: rc.cpp:2796
 #, no-c-format
 msgid "Add Tool"
 msgstr "添加工具"
 
-#. i18n: file ./parts/tools/addtooldlg.ui line 27
-#: rc.cpp:3228 rc.cpp:4859
-#, no-c-format
-msgid "&Parameters:"
-msgstr "参数(&P)："
-
 #. i18n: file ./parts/tools/addtooldlg.ui line 38
-#: rc.cpp:3231
+#: rc.cpp:2802
 #, no-c-format
 msgid "C&apture output"
 msgstr "捕获输出(&A)"
 
 #. i18n: file ./parts/tools/addtooldlg.ui line 41
-#: rc.cpp:3234
+#: rc.cpp:2805
 #, no-c-format
 msgid ""
 "If this is checked, the output of the application will be shown in the "
 "application output view; otherwise, all output will be ignored."
 msgstr ""
 
-#. i18n: file ./parts/tools/addtooldlg.ui line 49
-#: rc.cpp:3237 rc.cpp:4862
-#, no-c-format
-msgid "&Executable:"
-msgstr "可执行文件(&E)："
-
 #. i18n: file ./parts/tools/addtooldlg.ui line 74
-#: rc.cpp:3240
+#: rc.cpp:2811
 #, no-c-format
 msgid "&Menu text:"
 msgstr "菜单文本(&M)："
 
 #. i18n: file ./parts/tools/addtooldlg.ui line 94
-#: rc.cpp:3243
+#: rc.cpp:2814
 #, no-c-format
 msgid ""
 "<p>The following placeholders can be used:</p>\n"
@@ -4943,843 +4327,382 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/tools/addtooldlg.ui line 102
-#: rc.cpp:3255
+#: rc.cpp:2826
 #, no-c-format
 msgid "The text that appears in the Tools-Menu"
 msgstr "出现在工具菜单中的文本"
 
 #. i18n: file ./parts/tools/addtooldlg.ui line 159
-#: rc.cpp:3264
+#: rc.cpp:2835
 #, no-c-format
 msgid "The path and name of the application to execute"
 msgstr "要执行的应用程序路径和名称"
 
 #. i18n: file ./parts/tools/toolsconfigwidgetbase.ui line 16
-#: parts/tools/tools_part.cpp:49 rc.cpp:3267
+#: parts/tools/tools_part.cpp:51 rc.cpp:2838
 #, no-c-format
 msgid "External Tools"
 msgstr "外部工具"
 
 #. i18n: file ./parts/tools/toolsconfigwidgetbase.ui line 37
-#: rc.cpp:3270
+#: rc.cpp:2841
 #, no-c-format
 msgid "&Tools Menu"
 msgstr "工具菜单(&T)"
 
 #. i18n: file ./parts/tools/toolsconfigwidgetbase.ui line 141
-#: rc.cpp:3279
+#: rc.cpp:2850
 #, no-c-format
 msgid "&File Context Menu"
 msgstr "文件环境菜单(&F)"
 
 #. i18n: file ./parts/tools/toolsconfigwidgetbase.ui line 245
-#: rc.cpp:3288
+#: rc.cpp:2859
 #, no-c-format
 msgid "&Directory Context Menu"
 msgstr "目录环境菜单(&D)"
 
-#. i18n: file ./parts/quickopen/quickopenfunctionchooseformbase.ui line 86
-#: rc.cpp:3303 rc.cpp:6551
-#, no-c-format
-msgid "File name:"
-msgstr "文件名："
-
-#. i18n: file ./parts/quickopen/quickopenfunctionchooseformbase.ui line 142
-#: rc.cpp:3306
-#, no-c-format
-msgid "Function arguments list:"
-msgstr "函数参数列表："
-
-#. i18n: file ./parts/quickopen/quickopenbase.ui line 16
-#: rc.cpp:3309
-#, no-c-format
-msgid "Quick Open"
-msgstr "快速打开"
-
-#. i18n: file ./parts/quickopen/quickopenbase.ui line 30
-#: rc.cpp:3312
-#, no-c-format
-msgid "[NAME]"
-msgstr "[名称]"
-
-#. i18n: file ./parts/quickopen/quickopenbase.ui line 41
-#: rc.cpp:3315
-#, no-c-format
-msgid "[ITEM LIST]"
-msgstr "[项目列表]"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 37
-#: rc.cpp:3324
-#, no-c-format
-msgid "Prepare for Release"
-msgstr "准备发布版本"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 79
-#: rc.cpp:3327
-#, no-c-format
-msgid "<H2>Project Packaging & Publishing</H2>"
-msgstr "<H2>工程打包和发布</H2>"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 135
-#: rc.cpp:3330
-#, fuzzy, no-c-format
-msgid "Source &Distribution"
-msgstr "源代码发布(&S)"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 151
-#: rc.cpp:3333
-#, no-c-format
-msgid "&Use custom options"
-msgstr "使用自定义选项(&U)"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 154
-#: rc.cpp:3336
-#, no-c-format
-msgid "Default is: %n-%v.tar.gz"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 173
-#: rc.cpp:3339
-#, no-c-format
-msgid "Source Options"
-msgstr "源代码选项"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 184
-#: rc.cpp:3342
-#, no-c-format
-msgid "Use &bzip2 instead of gzip"
-msgstr "使用 bzip2 代替 gzip(&B)"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 203
-#: rc.cpp:3345
-#, no-c-format
-msgid ""
-"<b>Archive name format: </b>"
-"<br> %n - File name "
-"<br> %v - File version "
-"<br> %d - Date of archive"
-msgstr "<b>归档文件名格式：</b><br>%n － 文件名<br>%v － 文件版本<br>%d － 归档日期"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 214
-#: rc.cpp:3348
-#, no-c-format
-msgid "%n-%v"
-msgstr "%n-%v"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 217
-#: rc.cpp:3351
-#, fuzzy, no-c-format
-msgid "Enter the filename using the format options. "
-msgstr "输入仓库名"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 254
-#: rc.cpp:3354
-#, fuzzy, no-c-format
-msgid "&Add Files"
-msgstr "添加文件"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 270
-#: rc.cpp:3357
-#, fuzzy, no-c-format
-msgid "&Create Source Archive"
-msgstr "创建源代码归档(&A)"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 286
-#: rc.cpp:3360 rc.cpp:3483
-#, no-c-format
-msgid "R&eset"
-msgstr "重置(&E)"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 296
-#: parts/quickopen/quickopenfiledialog.cpp:42
-#: parts/quickopen/quickopenfiledialog.cpp:57 rc.cpp:3363
-#, no-c-format
-msgid "File &list:"
-msgstr "文件列表(&L)："
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 309
-#: rc.cpp:3366
-#, fuzzy, no-c-format
-msgid "Package &Information"
-msgstr "打包信息(&P)"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 349
-#: rc.cpp:3369
-#, no-c-format
-msgid "Ve&ndor:"
-msgstr "制作者(&N)："
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 381
-#: rc.cpp:3372
-#, fuzzy, no-c-format
-msgid "Application name"
-msgstr "应用程序名称(&N)："
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 402
-#: rc.cpp:3375
-#, no-c-format
-msgid "&Application name:"
-msgstr "应用程序名称(&A)："
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 413
-#: rc.cpp:3378
-#, no-c-format
-msgid "S&ummary:"
-msgstr "摘要(&U)："
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 435
-#: rc.cpp:3384
-#, no-c-format
-msgid "R&elease:"
-msgstr "发布版本号(&E)："
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 446
-#: rc.cpp:3387
-#, no-c-format
-msgid "&Version:"
-msgstr "版本(&V)："
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 493
-#: rc.cpp:3390
-#, no-c-format
-msgid ""
-"Version of the file package.\n"
-"Menu item: Project/Project Options/General/Version\n"
-"changes project compiled version number"
-msgstr ""
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 501
-#: rc.cpp:3395
-#, no-c-format
-msgid "&Group:"
-msgstr "组(&G)："
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 512
-#: rc.cpp:3398
-#, no-c-format
-msgid "Pac&kager:"
-msgstr "打包者(&K)："
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 538
-#: rc.cpp:3401
-#, no-c-format
-msgid "Advanced Package Op&tions"
-msgstr "高级打包选项(&T)"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 549
-#: rc.cpp:3404
-#, fuzzy, no-c-format
-msgid "&Create development package"
-msgstr "创建开发包"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 557
-#: rc.cpp:3407
-#, no-c-format
-msgid "Create documentation package"
-msgstr "创建文档包"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 565
-#: rc.cpp:3410
-#, no-c-format
-msgid "Include application icon"
-msgstr "包含应用程序图标"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 573
-#: rc.cpp:3413
-#, no-c-format
-msgid ""
-"Architecture target:<BR><b>(Note: You must have a compiler that supports this "
-"target)</b>"
-msgstr "目标平台：<BR><b>(注意：您必须有一个支持此目标平台的编译器。)</b>"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 579
-#: rc.cpp:3416
-#, no-c-format
-msgid "i386"
-msgstr "i386"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 584
-#: rc.cpp:3419
-#, no-c-format
-msgid "i586"
-msgstr "i586"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 589
-#: rc.cpp:3422
-#, no-c-format
-msgid "i686"
-msgstr "i686"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 594
-#: rc.cpp:3425
-#, no-c-format
-msgid "AMD K6"
-msgstr "AMD K6"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 599
-#: rc.cpp:3428
-#, no-c-format
-msgid "AMD K7"
-msgstr "AMD K7"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 604
-#: rc.cpp:3431
-#, no-c-format
-msgid "PPC"
-msgstr "PowerPC"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 609
-#: rc.cpp:3434
-#, no-c-format
-msgid "PPC G3"
-msgstr "PowerPC G3"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 614
-#: rc.cpp:3437
-#, no-c-format
-msgid "PPC Altevec"
-msgstr "PowerPC Altevec"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 619
-#: rc.cpp:3440
+#. i18n: file ./parts/abbrev/abbrevconfigwidgetbase.ui line 16
+#: rc.cpp:2868
 #, no-c-format
-msgid "Dec Alpha (AXP)"
-msgstr "Dec Alpha (AXP)"
+msgid "Code Templates"
+msgstr "代码模板"
 
-#. i18n: file ./parts/distpart/distpart_ui.ui line 624
-#: rc.cpp:3443
+#. i18n: file ./parts/abbrev/abbrevconfigwidgetbase.ui line 27
+#: rc.cpp:2871
 #, no-c-format
-msgid "Sparc"
-msgstr "Sparc"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 669
-#: rc.cpp:3446
-#, fuzzy, no-c-format
-msgid ""
-"&Build Source \n"
-"Package"
-msgstr "构建源代码包"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 678
-#: rc.cpp:3450
-#, fuzzy, no-c-format
-msgid ""
-"Build Binar&y \n"
-"Package"
-msgstr "构建二进制包"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 687
-#: rc.cpp:3454
-#, fuzzy, no-c-format
-msgid ""
-"E&xport \n"
-"Build Files"
-msgstr "导出构建文件"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 696
-#: rc.cpp:3458
-#, fuzzy, no-c-format
-msgid ""
-"I&mport \n"
-"Build Files"
-msgstr "导入构建文件"
+msgid "Co&de:"
+msgstr "代码(&D)："
 
-#. i18n: file ./parts/distpart/distpart_ui.ui line 777
-#: rc.cpp:3465
+#. i18n: file ./parts/abbrev/abbrevconfigwidgetbase.ui line 43
+#: rc.cpp:2874
 #, no-c-format
-msgid "C&hangelog:"
-msgstr "变更日志(&H)："
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 807
-#: rc.cpp:3468
-#, fuzzy, no-c-format
-msgid "Pr&oject Publishing"
-msgstr "工程发布(&R)"
+msgid "&Enable automatic word completion"
+msgstr "启用自动单词补全(&E)"
 
-#. i18n: file ./parts/distpart/distpart_ui.ui line 826
-#: rc.cpp:3471
+#. i18n: file ./parts/abbrev/abbrevconfigwidgetbase.ui line 65
+#: rc.cpp:2880 rc.cpp:7588
 #, no-c-format
-msgid "Local Options"
-msgstr "本地选项"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 848
-#: rc.cpp:3474
-#, fuzzy, no-c-format
-msgid "Ge&nerate HTML information page"
-msgstr "生成 HTML 信息页面(&H)"
+msgid "Template"
+msgstr "模板"
 
-#. i18n: file ./parts/distpart/distpart_ui.ui line 856
-#: rc.cpp:3477
+#. i18n: file ./parts/abbrev/abbrevconfigwidgetbase.ui line 76
+#: parts/filecreate/addglobaldlg.cpp:63 src/languageselectwidget.cpp:83
+#: rc.cpp:2883 rc.cpp:3628 rc.cpp:3652 rc.cpp:4241
 #, no-c-format
-msgid "&User information generated by RPM"
-msgstr "使用 RPM 生成的信息(&U)"
+msgid "Description"
+msgstr "描述"
 
-#. i18n: file ./parts/distpart/distpart_ui.ui line 911
-#: rc.cpp:3480
+#. i18n: file ./parts/abbrev/abbrevconfigwidgetbase.ui line 87
+#: rc.cpp:2886
 #, no-c-format
-msgid "&Generate"
-msgstr "生成(&G)"
+msgid "Suffixes"
+msgstr "后缀"
 
-#. i18n: file ./parts/distpart/distpart_ui.ui line 939
-#: rc.cpp:3486
+#. i18n: file ./parts/abbrev/abbrevconfigwidgetbase.ui line 119
+#: rc.cpp:2892
 #, no-c-format
-msgid "Re&mote Options"
-msgstr "远程选项(&M)"
+msgid "&Templates:"
+msgstr "模板(&T)："
 
-#. i18n: file ./parts/distpart/distpart_ui.ui line 980
-#: rc.cpp:3489
+#. i18n: file ./parts/abbrev/addtemplatedlgbase.ui line 16
+#: rc.cpp:2895
 #, no-c-format
-msgid "File su&bmission list:"
-msgstr "文件提交列表(&B)："
+msgid "Add Code Template"
+msgstr "添加代码模板"
 
-#. i18n: file ./parts/distpart/distpart_ui.ui line 1016
-#: rc.cpp:3492
+#. i18n: file ./parts/abbrev/addtemplatedlgbase.ui line 85
+#: parts/grepview/grepdlg.cpp:105 rc.cpp:2904
 #, no-c-format
-msgid "+"
-msgstr "+"
+msgid "&Template:"
+msgstr "模板(&T)："
 
-#. i18n: file ./parts/distpart/distpart_ui.ui line 1032
-#: rc.cpp:3495
+#. i18n: file ./parts/abbrev/addtemplatedlgbase.ui line 96
+#: rc.cpp:2907 rc.cpp:3859 rc.cpp:4229
 #, no-c-format
-msgid "-"
-msgstr "-"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 1053
-#: rc.cpp:3498
-#, fuzzy, no-c-format
-msgid "Upload to &custom FTP site"
-msgstr "上传到自定义 FTP 站点"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 1061
-#: rc.cpp:3501
-#, fuzzy, no-c-format
-msgid "Upload files to ftp.&kde.org"
-msgstr "将文件上传到 ftp.kde.org"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 1086
-#: rc.cpp:3504
-#, fuzzy, no-c-format
-msgid "Sub&mit"
-msgstr "提交"
+msgid "&Description:"
+msgstr "描述(&D)："
 
-#. i18n: file ./parts/distpart/distpart_ui.ui line 1094
-#: rc.cpp:3507
+#. i18n: file ./parts/abbrev/addtemplatedlgbase.ui line 139
+#: rc.cpp:2910
 #, no-c-format
-msgid "ftp://username:password@ftp.server.com/path/"
-msgstr "ftp://username:password@ftp.server.com/path/"
+msgid "&Suffixes:"
+msgstr "后缀(&S)："
 
-#. i18n: file ./parts/distpart/distpart_ui.ui line 1102
-#: rc.cpp:3510
+#. i18n: file ./parts/quickopen/quickopenfunctionchooseformbase.ui line 86
+#: rc.cpp:2919 rc.cpp:8807
 #, no-c-format
-msgid "Reset"
-msgstr "重置"
-
-#. i18n: file ./parts/distpart/distpart_ui.ui line 1110
-#: rc.cpp:3513
-#, fuzzy, no-c-format
-msgid "Upload to &apps.kde.com"
-msgstr "上传到 apps.kde.com"
+msgid "File name:"
+msgstr "文件名："
 
-#. i18n: file ./parts/appwizard/importdlgbase.ui line 16
-#: rc.cpp:3516
+#. i18n: file ./parts/quickopen/quickopenfunctionchooseformbase.ui line 142
+#: rc.cpp:2922
 #, no-c-format
-msgid "Import Existing Project"
-msgstr "导入已有的工程"
+msgid "Function arguments list:"
+msgstr "函数参数列表："
 
-#. i18n: file ./parts/appwizard/importdlgbase.ui line 65
-#: rc.cpp:3522
+#. i18n: file ./parts/quickopen/quickopenbase.ui line 16
+#: rc.cpp:2925
 #, no-c-format
-msgid "Fetch &Module"
-msgstr "获取模块(&M)"
+msgid "Quick Open"
+msgstr "快速打开"
 
-#. i18n: file ./parts/appwizard/importdlgbase.ui line 79
-#: rc.cpp:3525
+#. i18n: file ./parts/quickopen/quickopenbase.ui line 30
+#: rc.cpp:2928
 #, no-c-format
-msgid "&Fetch from:"
-msgstr "获取来源(&F)："
+msgid "[NAME]"
+msgstr "[名称]"
 
-#. i18n: file ./parts/appwizard/importdlgbase.ui line 90
-#: rc.cpp:3528
+#. i18n: file ./parts/quickopen/quickopenbase.ui line 41
+#: rc.cpp:2931
 #, no-c-format
-msgid "Project &name:"
-msgstr "工程名称(&N)："
+msgid "[ITEM LIST]"
+msgstr "[项目列表]"
 
-#. i18n: file ./parts/appwizard/importdlgbase.ui line 176
-#: rc.cpp:3537
+#. i18n: file ./parts/appwizard/filepropspagebase.ui line 24
+#: rc.cpp:2940
 #, no-c-format
-msgid "&Project type:"
-msgstr "工程类型(&P)："
+msgid "Customize"
+msgstr "自定义"
 
-#. i18n: file ./parts/appwizard/importdlgbase.ui line 223
-#: rc.cpp:3540
+#. i18n: file ./parts/appwizard/filepropspagebase.ui line 35
+#: parts/quickopen/quickopenclassdialog.cpp:82 rc.cpp:2943 rc.cpp:7480
 #, no-c-format
-msgid "&Email:"
-msgstr "电子邮件(&E)："
+msgid "Class name:"
+msgstr "类名："
 
-#. i18n: file ./parts/appwizard/importdlgbase.ui line 246
-#: rc.cpp:3543 rc.cpp:3550
+#. i18n: file ./parts/appwizard/filepropspagebase.ui line 48
+#: rc.cpp:2946
 #, no-c-format
-msgid ""
-"If there exists a file AUTHOR in the\n"
-"directory, and it has email addresses\n"
-"formated as XXXX <.....> the XXXX\n"
-"will be the author, everything between \n"
-"<....> is the email address."
-msgstr ""
+msgid "Base class:"
+msgstr "基类："
 
-#. i18n: file ./parts/appwizard/importdlgbase.ui line 291
-#: rc.cpp:3557
+#. i18n: file ./parts/appwizard/filepropspagebase.ui line 66
+#: rc.cpp:2949
 #, no-c-format
-msgid "&Author:"
-msgstr "作者(&A)："
+msgid "Implementation file:"
+msgstr "实现文件："
 
-#. i18n: file ./parts/appwizard/importdlgbase.ui line 305
-#: rc.cpp:3560
+#. i18n: file ./parts/appwizard/filepropspagebase.ui line 74
+#: rc.cpp:2952
 #, no-c-format
-msgid "Generate build system infrastructure"
-msgstr "生成构建系统架构"
+msgid "Header file:"
+msgstr "头文件："
 
-#. i18n: file ./parts/appwizard/vcs_form.ui line 16
-#: rc.cpp:3563
+#. i18n: file ./parts/appwizard/filepropspagebase.ui line 89
+#: rc.cpp:2955
 #, no-c-format
-msgid "Vcs Form"
-msgstr "版本控制表"
+msgid "Classes:"
+msgstr "类："
 
-#. i18n: file ./parts/appwizard/vcs_form.ui line 40
-#: rc.cpp:3566
+#. i18n: file ./parts/appwizard/filepropspagebase.ui line 97
+#: parts/filecreate/addglobaldlg.cpp:103 rc.cpp:2958 rc.cpp:4156 rc.cpp:4211
 #, no-c-format
-msgid "&Version control system:"
-msgstr "版本控制系统(&V)："
+msgid "Description:"
+msgstr "描述："
 
 #. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 16
-#: rc.cpp:3569
+#: rc.cpp:2961
 #, no-c-format
 msgid "Create New Project"
 msgstr "创建新工程"
 
 #. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 23
-#: languages/cpp/app_templates/tdeconfig35/app.cpp:77
 #: languages/cpp/app_templates/kde4app/kapp4.cpp:84
-#: languages/cpp/app_templates/kscons_tdemdi/appkmdi.cpp:322
 #: languages/cpp/app_templates/kscons_kxt/app.cpp:142
+#: languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp:322
 #: languages/cpp/app_templates/kxt/app.cpp:137
+#: languages/cpp/app_templates/tdeconfig35/app.cpp:77
 #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:580
 #: languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp:50
-#: src/kdevideextension.cpp:57 src/projectmanager.cpp:152 rc.cpp:3572
-#: rc.cpp:7264
+#: src/kdevideextension.cpp:57 src/projectmanager.cpp:152 rc.cpp:2964
+#: rc.cpp:5608
 #, no-c-format
 msgid "General"
 msgstr "常规"
 
 #. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 38
-#: rc.cpp:3575
+#: rc.cpp:2967
 #, no-c-format
 msgid "&All Projects"
 msgstr "全部工程(&A)"
 
 #. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 94
-#: rc.cpp:3578
+#: rc.cpp:2970
 #, no-c-format
 msgid "&Show all project templates"
 msgstr "显示全部工程模板(&S)"
 
 #. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 107
-#: rc.cpp:3581
+#: rc.cpp:2973
 #, no-c-format
 msgid "&Favorites"
 msgstr "收藏夹(&F)"
 
 #. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 193
-#: rc.cpp:3587
+#: rc.cpp:2979
 #, no-c-format
 msgid "Application &name:"
 msgstr "应用程序名称(&N)："
 
-#. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 204
-#: rc.cpp:3590 rc.cpp:4558 rc.cpp:4579 rc.cpp:4603
-#, no-c-format
-msgid "&Location:"
-msgstr "位置(&L)："
-
 #. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 215
-#: rc.cpp:3593
+#: rc.cpp:2985
 #, no-c-format
 msgid "Final location:"
 msgstr "最终位置："
 
 #. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 267
-#: rc.cpp:3596
+#: rc.cpp:2988
 #, no-c-format
 msgid "TextLabel4"
 msgstr "TextLabel4"
 
 #. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 321
-#: src/projectmanager.cpp:148 rc.cpp:3599
+#: src/projectmanager.cpp:148 rc.cpp:2991
 #, no-c-format
 msgid "Project Options"
 msgstr "工程选项"
 
 #. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 340
-#: rc.cpp:3602
+#: rc.cpp:2994
 #, no-c-format
 msgid "General Options"
 msgstr "生成选项"
 
+#. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 359
+#: rc.cpp:2997 rc.cpp:4162
+#, no-c-format
+msgid "Author:"
+msgstr "作者："
+
+#. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 370
+#: rc.cpp:3000 rc.cpp:4165
+#, no-c-format
+msgid "Email:"
+msgstr "电子邮件："
+
+#. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 381
+#: rc.cpp:3003 rc.cpp:4168
+#, no-c-format
+msgid "Version:"
+msgstr "版本："
+
 #. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 444
-#: rc.cpp:3614
+#: rc.cpp:3006
 #, no-c-format
 msgid "0.1"
 msgstr "0.1"
 
 #. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 452
-#: rc.cpp:3617
+#: rc.cpp:3009
 #, no-c-format
 msgid "License:"
 msgstr "许可协议："
 
 #. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 461
 #: kdevdesigner/designer/mainwindowactions.cpp:586
-#: parts/appwizard/appwizarddlg.cpp:575 rc.cpp:3620
+#: parts/appwizard/appwizarddlg.cpp:575 rc.cpp:3012
 #, no-c-format
 msgid "Custom"
 msgstr "自定义"
 
 #. i18n: file ./parts/appwizard/appwizarddlgbase.ui line 501
-#: rc.cpp:3623
+#: rc.cpp:3015
 #, no-c-format
 msgid "Custom Options"
 msgstr "自定义选项"
 
-#. i18n: file ./parts/appwizard/filepropspagebase.ui line 24
-#: rc.cpp:3626
-#, no-c-format
-msgid "Customize"
-msgstr "自定义"
-
-#. i18n: file ./parts/appwizard/filepropspagebase.ui line 35
-#: parts/quickopen/quickopenclassdialog.cpp:82 rc.cpp:3629 rc.cpp:5301
-#, no-c-format
-msgid "Class name:"
-msgstr "类名："
-
-#. i18n: file ./parts/appwizard/filepropspagebase.ui line 48
-#: rc.cpp:3632
-#, no-c-format
-msgid "Base class:"
-msgstr "基类："
-
-#. i18n: file ./parts/appwizard/filepropspagebase.ui line 66
-#: rc.cpp:3635
-#, no-c-format
-msgid "Implementation file:"
-msgstr "实现文件："
-
-#. i18n: file ./parts/appwizard/filepropspagebase.ui line 74
-#: rc.cpp:3638
-#, no-c-format
-msgid "Header file:"
-msgstr "头文件："
-
-#. i18n: file ./parts/appwizard/filepropspagebase.ui line 89
-#: rc.cpp:3641
-#, no-c-format
-msgid "Classes:"
-msgstr "类："
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 16
-#: rc.cpp:3647
-#, no-c-format
-msgid "New File Wizard Options"
-msgstr "新建文件向导选项"
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 34
-#: rc.cpp:3650
-#, fuzzy, no-c-format
-msgid "Pro&ject Types"
-msgstr "工程类型(&P)"
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 45
-#: rc.cpp:3653
-#, no-c-format
-msgid "Re&move Type"
-msgstr "删除类型(&M)"
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 53
-#: rc.cpp:3656
-#, fuzzy, no-c-format
-msgid "Edit T&ype..."
-msgstr "编辑类型(&E)..."
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 61
-#: rc.cpp:3659
-#, no-c-format
-msgid "New &Subtype..."
-msgstr "新建子类型(&S)..."
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 69
-#: rc.cpp:3662
-#, no-c-format
-msgid "&New Type..."
-msgstr "新建类型(&N)..."
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 75
-#: parts/filecreate/addglobaldlg.cpp:59 rc.cpp:3665 rc.cpp:3689
-#, no-c-format
-msgid "Type Extension"
-msgstr "类型扩展"
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 86
-#: parts/filecreate/addglobaldlg.cpp:60 rc.cpp:3668 rc.cpp:3692
-#, no-c-format
-msgid "Type Name"
-msgstr "类型名称"
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 97
-#: parts/filecreate/addglobaldlg.cpp:62 rc.cpp:3671 rc.cpp:3695
-#, no-c-format
-msgid "Icon"
-msgstr "图标"
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 205
-#: rc.cpp:3683
-#, fuzzy, no-c-format
-msgid "Ed&it Template"
-msgstr "编辑模板(&L)"
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 215
-#: rc.cpp:3686
-#, no-c-format
-msgid "Used &Global Types"
-msgstr "已使用的全局类型(&G)"
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 301
-#: rc.cpp:3701
-#, no-c-format
-msgid "Copy to Pro&ject Types"
-msgstr "复制到工程类型(&J)"
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 311
-#: rc.cpp:3704
-#, fuzzy, no-c-format
-msgid "Proje&ct Templates"
-msgstr "工程模板(&T)"
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 320
-#: rc.cpp:3707
-#, no-c-format
-msgid "Template Name"
-msgstr "模板名称"
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 347
-#: rc.cpp:3710
-#, no-c-format
-msgid "C&hange Content..."
-msgstr "更改内容(&H)..."
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 355
-#: rc.cpp:3713
-#, no-c-format
-msgid "&New Template..."
-msgstr "新建模板(&N)..."
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 371
-#: rc.cpp:3716
-#, no-c-format
-msgid "Re&move Template"
-msgstr "删除模板(&M)"
-
-#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 396
-#: rc.cpp:3719
-#, no-c-format
-msgid "&Edit Template"
-msgstr "编辑模板(&E)"
-
-#. i18n: file ./parts/filecreate/fctemplateeditbase.ui line 16
-#: rc.cpp:3722
+#. i18n: file ./parts/appwizard/importdlgbase.ui line 16
+#: rc.cpp:3018
 #, no-c-format
-msgid "File Template"
-msgstr "文件模板"
+msgid "Import Existing Project"
+msgstr "导入已有的工程"
 
-#. i18n: file ./parts/filecreate/fctemplateeditbase.ui line 41
-#: rc.cpp:3725 rc.cpp:7228
+#. i18n: file ./parts/appwizard/importdlgbase.ui line 65
+#: rc.cpp:3024
 #, no-c-format
-msgid "Template &name:"
-msgstr "模板名称(&N)："
+msgid "Fetch &Module"
+msgstr "获取模块(&M)"
 
-#. i18n: file ./parts/filecreate/fctemplateeditbase.ui line 78
-#: rc.cpp:3728 rc.cpp:3749
+#. i18n: file ./parts/appwizard/importdlgbase.ui line 79
+#: rc.cpp:3027
 #, no-c-format
-msgid "Set template content from &file:"
-msgstr "根据文件设定模板内容(&F)："
+msgid "&Fetch from:"
+msgstr "获取来源(&F)："
 
-#. i18n: file ./parts/filecreate/fctypeeditbase.ui line 16
-#: rc.cpp:3737
+#. i18n: file ./parts/appwizard/importdlgbase.ui line 90
+#: rc.cpp:3030
 #, no-c-format
-msgid "File Type"
-msgstr "文件类型"
+msgid "Project &name:"
+msgstr "工程名称(&N)："
 
-#. i18n: file ./parts/filecreate/fctypeeditbase.ui line 44
-#: rc.cpp:3740
+#. i18n: file ./parts/appwizard/importdlgbase.ui line 176
+#: rc.cpp:3039
 #, no-c-format
-msgid "Type &extension:"
-msgstr "类型扩展(&E)："
+msgid "&Project type:"
+msgstr "工程类型(&P)："
 
-#. i18n: file ./parts/filecreate/fctypeeditbase.ui line 76
-#: rc.cpp:3743
+#. i18n: file ./parts/appwizard/importdlgbase.ui line 223
+#: rc.cpp:3042
 #, no-c-format
-msgid "Type &name:"
-msgstr "类型名称(&N)："
+msgid "&Email:"
+msgstr "电子邮件(&E)："
 
-#. i18n: file ./parts/filecreate/fctypeeditbase.ui line 108
-#: rc.cpp:3746
+#. i18n: file ./parts/appwizard/importdlgbase.ui line 246
+#: rc.cpp:3045 rc.cpp:3052
 #, no-c-format
-msgid "Type &description:"
-msgstr "类型描述(&D)："
+msgid ""
+"If there exists a file AUTHOR in the\n"
+"directory, and it has email addresses\n"
+"formated as XXXX <.....> the XXXX\n"
+"will be the author, everything between \n"
+"<....> is the email address."
+msgstr ""
 
-#. i18n: file ./parts/snippet/snippetdlg.ui line 16
-#: rc.cpp:3758
+#. i18n: file ./parts/appwizard/importdlgbase.ui line 291
+#: rc.cpp:3059
 #, no-c-format
-msgid "Add Snippet"
-msgstr "添加片断"
+msgid "&Author:"
+msgstr "作者(&A)："
 
-#. i18n: file ./parts/snippet/snippetdlg.ui line 117
-#: rc.cpp:3770
+#. i18n: file ./parts/appwizard/importdlgbase.ui line 305
+#: rc.cpp:3062
 #, no-c-format
-msgid "&Snippet:"
-msgstr "片断(&S)："
+msgid "Generate build system infrastructure"
+msgstr "生成构建系统架构"
 
-#. i18n: file ./parts/snippet/snippetdlg.ui line 131
-#: rc.cpp:3773
+#. i18n: file ./parts/appwizard/vcs_form.ui line 16
+#: rc.cpp:3065
 #, no-c-format
-msgid "Group:"
-msgstr "组："
+msgid "Vcs Form"
+msgstr "版本控制表"
 
-#. i18n: file ./parts/snippet/snippetdlg.ui line 145
-#: rc.cpp:3776
+#. i18n: file ./parts/appwizard/vcs_form.ui line 40
+#: rc.cpp:3068
 #, no-c-format
-msgid "Click here to get to know how to use variables in a snippet"
-msgstr "单击此处可获得如何在片断中使用变量的指示"
+msgid "&Version control system:"
+msgstr "版本控制系统(&V)："
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 16
-#: rc.cpp:3779
+#: rc.cpp:3071
 #, no-c-format
 msgid "Snippet Settings"
 msgstr "片断设置"
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 27
-#: rc.cpp:3782
+#: rc.cpp:3074
 #, no-c-format
 msgid "Tooltips"
 msgstr "工具提示"
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 38
-#: rc.cpp:3785
+#: rc.cpp:3077
 #, no-c-format
 msgid "Show snippet's text in &tooltip"
 msgstr "在工具提示中显示片断的文本(&T)"
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 44
-#: rc.cpp:3788
+#: rc.cpp:3080
 #, no-c-format
 msgid ""
 "Decides if a tooltip should be shown containing text from the bookmarked line"
@@ -5787,37 +4710,37 @@ msgstr "决定工具提示是否包含标记行的文本"
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 71
 #: languages/cpp/debugger/debuggerpart.cpp:120
-#: languages/ruby/debugger/debuggerpart.cpp:105 rc.cpp:3791
+#: languages/ruby/debugger/debuggerpart.cpp:105 rc.cpp:3083
 #, no-c-format
 msgid "Variables"
 msgstr "变量"
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 82
-#: rc.cpp:3794
+#: rc.cpp:3086
 #, no-c-format
 msgid "Input Method for Variables"
 msgstr "变量的输入方法"
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 93
-#: rc.cpp:3797
+#: rc.cpp:3089
 #, no-c-format
 msgid "Single dialog for each variable within a snippet"
 msgstr ""
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 102
-#: rc.cpp:3800
+#: rc.cpp:3092
 #, no-c-format
 msgid "An input dialog will be displayed for every variable within a snippet"
 msgstr ""
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 110
-#: rc.cpp:3803
+#: rc.cpp:3095
 #, no-c-format
 msgid "One dialog for all variables within a snippet"
 msgstr ""
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 119
-#: rc.cpp:3806
+#: rc.cpp:3098
 #, no-c-format
 msgid ""
 "A single dialog will be displayed where you can enter the values for all "
@@ -5825,25 +4748,25 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 137
-#: rc.cpp:3809
+#: rc.cpp:3101
 #, no-c-format
 msgid "Delimiter:"
 msgstr "分隔符："
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 183
-#: rc.cpp:3812
+#: rc.cpp:3104
 #, no-c-format
 msgid "Automatically Open Groups"
 msgstr "自动打开组"
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 194
-#: rc.cpp:3815
+#: rc.cpp:3107
 #, no-c-format
 msgid "The group's language is the project's primary language"
 msgstr ""
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 200
-#: rc.cpp:3818
+#: rc.cpp:3110
 #, no-c-format
 msgid ""
 "<qt>If the group's language is the same as the project's primary language, the "
@@ -5851,13 +4774,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 208
-#: rc.cpp:3821
+#: rc.cpp:3113
 #, no-c-format
 msgid "The group's language is supported by the project"
 msgstr ""
 
 #. i18n: file ./parts/snippet/snippetsettingsbase.ui line 217
-#: rc.cpp:3824
+#: rc.cpp:3116
 #, no-c-format
 msgid ""
 "<qt>Groups having a language which is supported by the current project will be "
@@ -5866,279 +4789,132 @@ msgid ""
 "language.</qt>"
 msgstr ""
 
-#. i18n: file ./parts/filelist/projectviewconfigbase.ui line 16
-#: parts/filelist/filelist_widget.cpp:228
-#: parts/filelist/projectviewpart.cpp:79 parts/filelist/projectviewpart.cpp:80
-#: parts/filelist/projectviewpart.cpp:251
-#: parts/filelist/projectviewpart.cpp:265
-#: parts/filelist/projectviewpart.cpp:270 rc.cpp:3827
-#, no-c-format
-msgid "File List"
-msgstr "文件列表"
-
-#. i18n: file ./parts/filelist/projectviewconfigbase.ui line 27
-#: rc.cpp:3830
-#, fuzzy, no-c-format
-msgid "Display toolbar in toolview (note: change needs a restart)"
-msgstr "在工具视图中显示工具栏(注意：更改需要重新启动)(&Y)"
-
-#. i18n: file ./parts/filelist/projectviewconfigbase.ui line 33
-#: rc.cpp:3833 rc.cpp:3836
+#. i18n: file ./parts/snippet/snippetdlg.ui line 16
+#: rc.cpp:3119
 #, no-c-format
-msgid ""
-"Uncheck this if you want the toolbar together with all other toolbars. You can "
-"disable it then"
-msgstr ""
-
-#. i18n: file ./parts/filelist/projectviewconfigbase.ui line 44
-#: rc.cpp:3839
-#, fuzzy, no-c-format
-msgid "Only save project files in a session"
-msgstr "只在视图中保存工程文件"
+msgid "Add Snippet"
+msgstr "添加片断"
 
-#. i18n: file ./parts/filelist/projectviewconfigbase.ui line 50
-#: rc.cpp:3842 rc.cpp:3845
+#. i18n: file ./parts/snippet/snippetdlg.ui line 117
+#: rc.cpp:3131
 #, no-c-format
-msgid "Check this if you want to ignore files that are not part of the project"
-msgstr ""
+msgid "&Snippet:"
+msgstr "片断(&S)："
 
-#. i18n: file ./parts/filelist/projectviewconfigbase.ui line 61
-#: rc.cpp:3848
+#. i18n: file ./parts/snippet/snippetdlg.ui line 131
+#: rc.cpp:3134
 #, no-c-format
-msgid "Close all open files before opening a session"
-msgstr ""
+msgid "Group:"
+msgstr "组："
 
-#. i18n: file ./parts/filelist/projectviewconfigbase.ui line 67
-#: rc.cpp:3851 rc.cpp:3854
+#. i18n: file ./parts/snippet/snippetdlg.ui line 145
+#: rc.cpp:3137
 #, no-c-format
-msgid ""
-"Check this if you want the currently open files closed before opening a session"
-msgstr ""
+msgid "Click here to get to know how to use variables in a snippet"
+msgstr "单击此处可获得如何在片断中使用变量的指示"
 
-#. i18n: file ./parts/filelist/projectviewprojectconfigbase.ui line 16
-#: rc.cpp:3857
+#. i18n: file ./parts/outputviews/filterdlg.ui line 16
+#: rc.cpp:3140
 #, no-c-format
-msgid "Projectviews"
-msgstr "工程视图"
-
-#. i18n: file ./parts/filelist/projectviewprojectconfigbase.ui line 35
-#: rc.cpp:3860
-#, fuzzy, no-c-format
-msgid "Open this session after project load:"
-msgstr "工程装入后打开此视图："
+msgid "Output Filter Settings"
+msgstr "输出过滤设置"
 
-#. i18n: file ./parts/filelist/projectviewprojectconfigbase.ui line 51
-#: rc.cpp:3863
+#. i18n: file ./parts/outputviews/filterdlg.ui line 94
+#: rc.cpp:3149
 #, fuzzy, no-c-format
-msgid "select a session"
-msgstr "选择访问"
-
-#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 16
-#: rc.cpp:3866
-#, no-c-format
-msgid "Colors for VCS Visual Feedback"
-msgstr "版本控制可视化反馈信息的颜色"
-
-#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 27
-#: rc.cpp:3869
-#, no-c-format
-msgid "Colors to Use for Version Control Feedback"
-msgstr "用于显示版本控制返回的颜色"
-
-#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 46
-#: rc.cpp:3872
-#, no-c-format
-msgid "&Updated:"
-msgstr "已更新(&U)："
-
-#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 65
-#: rc.cpp:3875
-#, no-c-format
-msgid "&Modified:"
-msgstr "已改变(&M)："
-
-#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 84
-#: rc.cpp:3878
-#, no-c-format
-msgid "Co&nflict:"
-msgstr "冲突(&N)："
-
-#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 103
-#: rc.cpp:3881
-#, no-c-format
-msgid "&Added:"
-msgstr "已添加(&A)："
-
-#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 122
-#: rc.cpp:3884
-#, no-c-format
-msgid "&Sticky:"
-msgstr "粘滞标签(&S)："
-
-#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 141
-#: rc.cpp:3887
-#, no-c-format
-msgid "&Needs checkout:"
-msgstr "需要提取(&N)："
-
-#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 160
-#: rc.cpp:3890
-#, no-c-format
-msgid "&Needs patch:"
-msgstr "需要补丁(&N)："
-
-#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 179
-#: rc.cpp:3893
-#, no-c-format
-msgid "Un&known:"
-msgstr "未知(&K)："
-
-#. i18n: file ./parts/fileview/vcscolorsconfigwidgetbase.ui line 198
-#: rc.cpp:3896
-#, no-c-format
-msgid "&Default:"
-msgstr "默认(&D)："
-
-#. i18n: file ./parts/fileview/filegroupsconfigwidgetbase.ui line 16
-#: parts/fileview/filegroupspart.cpp:46 rc.cpp:3899
-#, no-c-format
-msgid "File Group View"
-msgstr "文件分组视图"
-
-#. i18n: file ./parts/fileview/filegroupsconfigwidgetbase.ui line 38
-#: rc.cpp:3902
-#, no-c-format
-msgid "&Groups in the file view and their corresponding patterns:"
-msgstr "文件视图里的分组和它们相应的模板(&G)："
-
-#. i18n: file ./parts/fileview/filegroupsconfigwidgetbase.ui line 47
-#: rc.cpp:3905 rc.cpp:4402
-#, no-c-format
-msgid "Group"
-msgstr "组"
-
-#. i18n: file ./parts/fileview/filegroupsconfigwidgetbase.ui line 58
-#: rc.cpp:3908
-#, no-c-format
-msgid "Pattern"
-msgstr "模板"
-
-#. i18n: file ./parts/fileview/filegroupsconfigwidgetbase.ui line 112
-#: rc.cpp:3911
-#, no-c-format
-msgid "&Add Group..."
-msgstr "添加组(&A)..."
-
-#. i18n: file ./parts/fileview/filegroupsconfigwidgetbase.ui line 120
-#: rc.cpp:3914
-#, no-c-format
-msgid "&Edit Group..."
-msgstr "编辑组(&E)..."
-
-#. i18n: file ./parts/fileview/filegroupsconfigwidgetbase.ui line 128
-#: rc.cpp:3917
-#, no-c-format
-msgid "De&lete Group"
-msgstr "删除组(&L)"
-
-#. i18n: file ./parts/abbrev/abbrevconfigwidgetbase.ui line 16
-#: rc.cpp:3926
-#, no-c-format
-msgid "Code Templates"
-msgstr "代码模板"
-
-#. i18n: file ./parts/abbrev/abbrevconfigwidgetbase.ui line 27
-#: rc.cpp:3929
-#, no-c-format
-msgid "Co&de:"
-msgstr "代码(&D)："
+msgid "Filter"
+msgstr "已过滤"
 
-#. i18n: file ./parts/abbrev/abbrevconfigwidgetbase.ui line 43
-#: rc.cpp:3932
+#. i18n: file ./parts/outputviews/filterdlg.ui line 111
+#: rc.cpp:3152
 #, no-c-format
-msgid "&Enable automatic word completion"
-msgstr "启用自动单词补全(&E)"
+msgid "Only show lines matching:"
+msgstr ""
 
-#. i18n: file ./parts/abbrev/abbrevconfigwidgetbase.ui line 65
-#: rc.cpp:3938 rc.cpp:5452
-#, no-c-format
-msgid "Template"
-msgstr "模板"
+#. i18n: file ./parts/outputviews/filterdlg.ui line 135
+#: rc.cpp:3158
+#, fuzzy, no-c-format
+msgid "Re&gular expression"
+msgstr "正则表达式(&X)："
 
-#. i18n: file ./parts/abbrev/abbrevconfigwidgetbase.ui line 87
-#: rc.cpp:3944
+#. i18n: file ./parts/partexplorer/partexplorerformbase.ui line 24
+#: rc.cpp:3161
 #, no-c-format
-msgid "Suffixes"
-msgstr "后缀"
+msgid "PartExplorer"
+msgstr "PartExplorer"
 
-#. i18n: file ./parts/abbrev/abbrevconfigwidgetbase.ui line 119
-#: rc.cpp:3950
+#. i18n: file ./parts/partexplorer/partexplorerformbase.ui line 27
+#: rc.cpp:3164
 #, no-c-format
-msgid "&Templates:"
-msgstr "模板(&T)："
+msgid ""
+"This is a front-end to TDE's TDETrader: search your TDE documentation for more "
+"information about TDE services and TDETrader"
+msgstr "这是TDE的TDETrader的前端：在TDE文档中搜索有关TDE服务和TDETrader的信息"
 
-#. i18n: file ./parts/abbrev/addtemplatedlgbase.ui line 16
-#: rc.cpp:3953
+#. i18n: file ./parts/partexplorer/partexplorerformbase.ui line 46
+#: rc.cpp:3167
 #, no-c-format
-msgid "Add Code Template"
-msgstr "添加代码模板"
+msgid "TDE service &type:"
+msgstr "TDE 服务类型(&T)："
 
-#. i18n: file ./parts/abbrev/addtemplatedlgbase.ui line 85
-#: parts/grepview/grepdlg.cpp:105 rc.cpp:3962
+#. i18n: file ./parts/partexplorer/partexplorerformbase.ui line 79
+#: rc.cpp:3170
 #, no-c-format
-msgid "&Template:"
-msgstr "模板(&T)："
+msgid "&Additional constraints:"
+msgstr "附加限制(&A)："
 
-#. i18n: file ./parts/abbrev/addtemplatedlgbase.ui line 139
-#: rc.cpp:3968
-#, no-c-format
-msgid "&Suffixes:"
-msgstr "后缀(&S)："
+#. i18n: file ./parts/partexplorer/partexplorerformbase.ui line 104
+#: rc.cpp:3173
+#, fuzzy, no-c-format
+msgid ""
+"<b>Constraints</b>Refine your query by writing additional constraints such as "
+"<i>([X-TDevelop-Scope]='Global')</i>)."
+msgstr "<b>限制</b>通过加入新的限制条件重新定义您的查询，例如<i>(［X-KDevelop-Scope］＝'Global')</i>)。"
 
-#. i18n: file ./parts/vcsmanager/vcsmanagerprojectconfigbase.ui line 27
-#: rc.cpp:3971
+#. i18n: file ./parts/partexplorer/partexplorerformbase.ui line 120
+#: rc.cpp:3176
 #, no-c-format
-msgid "Version control system to use for this project:"
-msgstr "此工程所使用的版本控制系统："
+msgid "&Results"
+msgstr "结果(&R)"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 24
-#: rc.cpp:3974
+#: rc.cpp:3179
 #, no-c-format
 msgid "Artistic Style Configuration"
 msgstr "艺术风格配置"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 47
-#: rc.cpp:3977 rc.cpp:6368
+#: rc.cpp:3182 rc.cpp:8204
 #, no-c-format
 msgid "&General"
 msgstr "常规(&G)"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 78
-#: rc.cpp:3980
+#: rc.cpp:3185
 #, no-c-format
 msgid "&Style"
 msgstr "风格(&S)"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 89
-#: rc.cpp:3983
+#: rc.cpp:3188
 #, no-c-format
 msgid "&User defined"
 msgstr "用户定义的(&U)"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 98
-#: rc.cpp:3986
+#: rc.cpp:3191
 #, no-c-format
 msgid "Select options from other tabs."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 106
-#: rc.cpp:3989
+#: rc.cpp:3194
 #, no-c-format
 msgid "&ANSI"
 msgstr "&ANSI 标准"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 118
-#: rc.cpp:3992
+#: rc.cpp:3197
 #, no-c-format
 msgid ""
 "ANSI style formatting/indenting.\n"
@@ -6151,13 +4927,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 126
-#: rc.cpp:4001
+#: rc.cpp:3206
 #, no-c-format
 msgid "&Kernighan && Ritchie"
 msgstr "&Kernighan 和 Ritchie"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 138
-#: rc.cpp:4004
+#: rc.cpp:3209
 #, no-c-format
 msgid ""
 "Kernighan & Ritchie style formatting/indenting.\n"
@@ -6169,13 +4945,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 146
-#: rc.cpp:4013
+#: rc.cpp:3218
 #, fuzzy, no-c-format
 msgid "Linu&x"
 msgstr "Linux"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 158
-#: rc.cpp:4016
+#: rc.cpp:3221
 #, no-c-format
 msgid ""
 "Linux mode (8 spaces per indent, break definition-block brackets but attach "
@@ -6189,13 +4965,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 166
-#: rc.cpp:4025
+#: rc.cpp:3230
 #, no-c-format
 msgid "G&NU"
 msgstr "G&NU"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 179
-#: rc.cpp:4028
+#: rc.cpp:3233
 #, no-c-format
 msgid ""
 "GNU style formatting/indenting.\n"
@@ -6209,13 +4985,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 187
-#: rc.cpp:4038
+#: rc.cpp:3243
 #, no-c-format
 msgid "&JAVA"
 msgstr "&JAVA"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 198
-#: rc.cpp:4041
+#: rc.cpp:3246
 #, no-c-format
 msgid ""
 "Java mode, with standard java style formatting/indenting.\n"
@@ -6227,27 +5003,27 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 206
-#: rc.cpp:4049
+#: rc.cpp:3254
 #, fuzzy, no-c-format
 msgid "Use Global &Options"
 msgstr "Haskell 选项"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 213
-#: rc.cpp:4052
+#: rc.cpp:3257
 #, no-c-format
 msgid ""
 "Use the global defaults. See the menu:\n"
-"Settings/Configure Kdevelop/Formatting."
+"Settings/Configure TDevelop/Formatting."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 231
-#: rc.cpp:4056
+#: rc.cpp:3261
 #, fuzzy, no-c-format
 msgid "Files to format"
 msgstr "要载入的文件"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 259
-#: rc.cpp:4059
+#: rc.cpp:3264
 #, no-c-format
 msgid ""
 "*.c *.h\n"
@@ -6263,71 +5039,71 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 268
-#: rc.cpp:4071 rc.cpp:4077
+#: rc.cpp:3276 rc.cpp:3282
 #, no-c-format
 msgid ""
-"Set the file extensions for what the\n"
+"Set the extensions of files that the\n"
 "formatter will try to reformat. Use a\n"
-"space seperated list. eg. *.cpp *.hpp\n"
+"space separated list, e.g. *.cpp *.hpp.\n"
 "Can use * on its own for any file."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 286
-#: rc.cpp:4083
+#: rc.cpp:3288
 #, fuzzy, no-c-format
 msgid "Tab && Bra&ckets"
 msgstr "方括号"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 303
-#: rc.cpp:4086
+#: rc.cpp:3291
 #, no-c-format
 msgid "&Filling"
 msgstr "填充(&F)"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 317
-#: rc.cpp:4089
+#: rc.cpp:3294
 #, fuzzy, no-c-format
 msgid "Fill empt&y lines"
 msgstr "文件模板"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 320
-#: rc.cpp:4092
+#: rc.cpp:3297
 #, no-c-format
 msgid "Fill empty lines with the white space of their previous lines."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 336
-#: rc.cpp:4095
+#: rc.cpp:3300
 #, fuzzy, no-c-format
 msgid "U&se tabs"
 msgstr "用制表符(&T)"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 356
-#: rc.cpp:4098
+#: rc.cpp:3303
 #, fuzzy, no-c-format
 msgid "Number of spaces to use per indent."
 msgstr "每行的枚举数目"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 367
-#: rc.cpp:4101
+#: rc.cpp:3306
 #, no-c-format
 msgid "Con&vert tabs"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 370
-#: rc.cpp:4104
+#: rc.cpp:3309
 #, no-c-format
 msgid "Convert tabs to spaces."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 398
-#: rc.cpp:4107
+#: rc.cpp:3312
 #, fuzzy, no-c-format
 msgid "&Use spaces:"
 msgstr "用空格填充(&P)："
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 416
-#: rc.cpp:4110
+#: rc.cpp:3315
 #, no-c-format
 msgid ""
 "Number of spaces that will be converted to a tab.\n"
@@ -6335,55 +5111,55 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 427
-#: rc.cpp:4114
+#: rc.cpp:3319
 #, fuzzy, no-c-format
 msgid "F&orce tabs"
 msgstr "强制重新编辑"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 430
-#: rc.cpp:4117
+#: rc.cpp:3322
 #, no-c-format
 msgid "Force tabs to be used in areas Astyle would prefer to use spaces."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 465
-#: rc.cpp:4120
+#: rc.cpp:3325
 #, no-c-format
 msgid "Brackets"
 msgstr "方括号"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 487
-#: rc.cpp:4123
+#: rc.cpp:3328
 #, fuzzy, no-c-format
 msgid "&No Change"
 msgstr "文件已更改"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 493
-#: rc.cpp:4126
+#: rc.cpp:3331
 #, fuzzy, no-c-format
 msgid "The brackets will not be changed."
 msgstr "这个项目无法删除"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 501
-#: rc.cpp:4129
+#: rc.cpp:3334
 #, no-c-format
 msgid "&Break"
 msgstr "断开(&B)"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 507
-#: rc.cpp:4132
+#: rc.cpp:3337
 #, no-c-format
 msgid "Break brackets from pre-block code (i.e. ANSI C/C++ style)."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 515
-#: rc.cpp:4135
+#: rc.cpp:3340
 #, no-c-format
 msgid "&Attach"
 msgstr "粘连(&A)"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 519
-#: rc.cpp:4138
+#: rc.cpp:3343
 #, no-c-format
 msgid ""
 "Attach brackets to pre-block code (i.e. Java/K&R style).\n"
@@ -6391,13 +5167,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 527
-#: rc.cpp:4142
+#: rc.cpp:3347
 #, fuzzy, no-c-format
 msgid "Linu&x style"
 msgstr "Linux 风格(&N)"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 531
-#: rc.cpp:4145
+#: rc.cpp:3350
 #, no-c-format
 msgid ""
 "Break brackets from class/function declarations, \n"
@@ -6405,13 +5181,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 544
-#: rc.cpp:4149
+#: rc.cpp:3354
 #, fuzzy, no-c-format
 msgid "Brea&k closing headers"
 msgstr "预编译头文件"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 548
-#: rc.cpp:4152
+#: rc.cpp:3357
 #, no-c-format
 msgid ""
 "Break brackets before closing headers (e.g. 'else', 'catch', ...)\n"
@@ -6419,19 +5195,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 560
-#: rc.cpp:4156
+#: rc.cpp:3361
 #, no-c-format
 msgid "&Indentation"
 msgstr "缩进(&I)"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 577
-#: rc.cpp:4159
+#: rc.cpp:3364
 #, no-c-format
 msgid "Contin&uation"
 msgstr "连续(&U)"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 592
-#: rc.cpp:4162 rc.cpp:4169
+#: rc.cpp:3367 rc.cpp:3374
 #, no-c-format
 msgid ""
 "Indent a maximal # spaces in a continuous statement,\n"
@@ -6439,19 +5215,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 600
-#: rc.cpp:4166
+#: rc.cpp:3371
 #, no-c-format
 msgid "Maximum in statement:"
 msgstr "语句里最多使用个数："
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 612
-#: rc.cpp:4173
+#: rc.cpp:3378
 #, no-c-format
 msgid "Minimum in conditional:"
 msgstr "条件里至少使用个数"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 616
-#: rc.cpp:4176 rc.cpp:4183
+#: rc.cpp:3381 rc.cpp:3388
 #, no-c-format
 msgid ""
 "Indent a minimal # spaces in a continuous conditional\n"
@@ -6459,25 +5235,25 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 624
-#: rc.cpp:4180
+#: rc.cpp:3385
 #, no-c-format
 msgid "Twice current"
 msgstr "双倍于当前"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 650
-#: rc.cpp:4187
+#: rc.cpp:3392
 #, no-c-format
 msgid "Indented &Entities"
 msgstr "缩进的实体(&E)"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 661
-#: rc.cpp:4190
+#: rc.cpp:3395
 #, fuzzy, no-c-format
 msgid "&Switches"
 msgstr "切换到"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 665
-#: rc.cpp:4193
+#: rc.cpp:3398
 #, no-c-format
 msgid ""
 "Indent 'switch' blocks, so that the inner 'case XXX:'\n"
@@ -6485,13 +5261,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 673
-#: rc.cpp:4197
+#: rc.cpp:3402
 #, fuzzy, no-c-format
 msgid "&Case statements"
 msgstr "创建元素"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 677
-#: rc.cpp:4200
+#: rc.cpp:3405
 #, no-c-format
 msgid ""
 "Indent case blocks from the 'case XXX:' headers.\n"
@@ -6499,13 +5275,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 685
-#: rc.cpp:4204
+#: rc.cpp:3409
 #, fuzzy, no-c-format
 msgid "Cla&sses"
 msgstr "类"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 690
-#: rc.cpp:4207
+#: rc.cpp:3412
 #, no-c-format
 msgid ""
 "Indent 'class' blocks, so that the inner 'public:',\n"
@@ -6514,37 +5290,37 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 698
-#: rc.cpp:4212
+#: rc.cpp:3417
 #, fuzzy, no-c-format
 msgid "&Brackets"
 msgstr "方括号"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 701
-#: rc.cpp:4215
+#: rc.cpp:3420
 #, no-c-format
 msgid "Add extra indentation to '{' and '}' block brackets."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 709
-#: rc.cpp:4218
+#: rc.cpp:3423
 #, fuzzy, no-c-format
 msgid "&Namespaces"
 msgstr "命名空间(&S)："
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 712
-#: rc.cpp:4221
+#: rc.cpp:3426
 #, no-c-format
 msgid "Indent the contents of namespace blocks."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 720
-#: rc.cpp:4224
+#: rc.cpp:3429
 #, fuzzy, no-c-format
 msgid "L&abels"
 msgstr "Label4"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 728
-#: rc.cpp:4227
+#: rc.cpp:3432
 #, no-c-format
 msgid ""
 "Indent labels so that they appear one indent less than\n"
@@ -6553,49 +5329,49 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 736
-#: rc.cpp:4232
+#: rc.cpp:3437
 #, fuzzy, no-c-format
 msgid "Bloc&ks"
 msgstr "程序块"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 739
-#: rc.cpp:4235
+#: rc.cpp:3440
 #, no-c-format
 msgid "Add extra indentation entire blocks (including brackets)."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 750
-#: rc.cpp:4238
+#: rc.cpp:3443
 #, fuzzy, no-c-format
 msgid "#Prepr&ocessors"
 msgstr "预处理器"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 753
-#: rc.cpp:4241
+#: rc.cpp:3446
 #, no-c-format
 msgid "Indent multi-line #define statements."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 765
-#: rc.cpp:4244
+#: rc.cpp:3449
 #, fuzzy, no-c-format
 msgid "For&matting"
 msgstr "格式化"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 782
-#: rc.cpp:4247
+#: rc.cpp:3452
 #, fuzzy, no-c-format
 msgid "Blocks"
 msgstr "程序块"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 793
-#: rc.cpp:4250
+#: rc.cpp:3455
 #, fuzzy, no-c-format
 msgid "&Break blocks"
 msgstr "断点(&B)"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 805
-#: rc.cpp:4253
+#: rc.cpp:3458
 #, no-c-format
 msgid ""
 "Insert empty lines around unrelated blocks, labels, classes,...\n"
@@ -6610,13 +5386,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 813
-#: rc.cpp:4265
+#: rc.cpp:3470
 #, no-c-format
 msgid "Break bl&ocks all"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 827
-#: rc.cpp:4268
+#: rc.cpp:3473
 #, no-c-format
 msgid ""
 "Like --break-blocks, except also insert empty lines \n"
@@ -6633,67 +5409,67 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 835
-#: rc.cpp:4282
+#: rc.cpp:3487
 #, no-c-format
 msgid "Break i&f-else"
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 838
-#: rc.cpp:4285
+#: rc.cpp:3490
 #, no-c-format
 msgid "Break 'else if()' statements into two different lines."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 854
-#: rc.cpp:4288
+#: rc.cpp:3493
 #, no-c-format
 msgid "Padding"
 msgstr "填充"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 865
-#: rc.cpp:4291
+#: rc.cpp:3496
 #, fuzzy, no-c-format
 msgid "Add spa&ces inside parentheses"
 msgstr "在括号两边加空格(&P)"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 868
-#: rc.cpp:4294
+#: rc.cpp:3499
 #, no-c-format
 msgid "Insert space padding around parenthesis on the inside only."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 876
-#: rc.cpp:4297
+#: rc.cpp:3502
 #, fuzzy, no-c-format
 msgid "A&dd spaces outside parentheses"
 msgstr "在括号两边加空格(&P)"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 879
-#: rc.cpp:4300
+#: rc.cpp:3505
 #, no-c-format
 msgid "Insert space padding around parenthesis on the outside only."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 887
-#: rc.cpp:4303
+#: rc.cpp:3508
 #, fuzzy, no-c-format
 msgid "Remove &unnecessary spaces around parentheses"
 msgstr "在括号两边加空格(&P)"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 890
-#: rc.cpp:4306
+#: rc.cpp:3511
 #, no-c-format
 msgid "Remove unnecessary space padding around parenthesis."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 898
-#: rc.cpp:4309
+#: rc.cpp:3514
 #, fuzzy, no-c-format
 msgid "&Add spaces around operators"
 msgstr "在运算符两边加空格(&R)"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 903
-#: rc.cpp:4312
+#: rc.cpp:3517
 #, no-c-format
 msgid ""
 "Insert space padding around operators.\n"
@@ -6702,3770 +5478,3592 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 919
-#: rc.cpp:4317
+#: rc.cpp:3522
 #, no-c-format
 msgid "One Liners"
 msgstr "单行语句"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 930
-#: rc.cpp:4320
+#: rc.cpp:3525
 #, fuzzy, no-c-format
 msgid "&Keep one-line statements"
 msgstr "保留单行语句(&S)"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 934
-#: rc.cpp:4323
+#: rc.cpp:3528
 #, no-c-format
 msgid ""
-"Don't break lines containing multiple statements into\n"
+"Do not break lines containing multiple statements into\n"
 "multiple single-statement lines."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 942
-#: rc.cpp:4327
+#: rc.cpp:3532
 #, fuzzy, no-c-format
 msgid "Keep o&ne-line blocks"
 msgstr "保留单行块(&L)"
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 945
-#: rc.cpp:4330
+#: rc.cpp:3535
 #, no-c-format
-msgid "Don't break blocks residing completely on one line."
+msgid "Do not break blocks residing completely on one line."
 msgstr ""
 
 #. i18n: file ./parts/astyle/astyleconfig.ui line 966
-#: rc.cpp:4333
+#: rc.cpp:3538
 #, no-c-format
 msgid "Example"
 msgstr "例子"
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 16
-#: rc.cpp:4336
-#, no-c-format
-msgid "Test Regular Expression"
-msgstr "测试正则表达式"
+#. i18n: file ./parts/uimode/uichooser.ui line 16
+#: rc.cpp:3541
+#, fuzzy, no-c-format
+msgid "UIChooser"
+msgstr "用户"
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 30
-#: rc.cpp:4339
+#. i18n: file ./parts/uimode/uichooser.ui line 38
+#: rc.cpp:3544
 #, no-c-format
-msgid "&Regular expression:"
-msgstr "正则表达式(&R)："
+msgid "Use Tabs"
+msgstr "使用制表符"
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 41
-#: rc.cpp:4342
+#. i18n: file ./parts/uimode/uichooser.ui line 41
+#: rc.cpp:3547
 #, no-c-format
-msgid "&Test string:"
-msgstr "测试字符串(&T)："
+msgid ""
+"Some prefer not to have a tab bar and switch between documents using other "
+"means. Kate is one example of this."
+msgstr ""
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 52
-#: rc.cpp:4345
-#, no-c-format
-msgid "Enter a string which will be matched against the regular expression"
-msgstr "输入要和正则表达式匹配的字符串"
+#. i18n: file ./parts/uimode/uichooser.ui line 52
+#: rc.cpp:3550
+#, fuzzy, no-c-format
+msgid "Al&ways"
+msgstr "总是"
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 87
-#: rc.cpp:4348
+#. i18n: file ./parts/uimode/uichooser.ui line 63
+#: rc.cpp:3553
+#, fuzzy, no-c-format
+msgid "Ne&ver"
+msgstr "从不"
+
+#. i18n: file ./parts/uimode/uichooser.ui line 76
+#: rc.cpp:3556
 #, no-c-format
-msgid "&Insert Quoted"
-msgstr "加引号插入(&I)"
+msgid "Use Close on Hover"
+msgstr ""
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 93
-#: rc.cpp:4351
+#. i18n: file ./parts/uimode/uichooser.ui line 79
+#: rc.cpp:3559
 #, no-c-format
 msgid ""
-"Inserts the regular expression into the currently opened source code file. "
-"Escapes any special characters like backslash."
-msgstr "在当前打开的源代码文件中插入正则表达式。任何比如反斜杠这样的特殊字符都使用换码序列。"
+"The document tab can optionally be used to close the document, by clicking on "
+"the tab icon."
+msgstr ""
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 124
-#: rc.cpp:4357
+#. i18n: file ./parts/uimode/uichooser.ui line 101
+#: kdevdesigner/designer/editfunctionsimpl.cpp:218
+#: kdevdesigner/designer/formfile.cpp:330
+#: kdevdesigner/designer/formfile.cpp:657
+#: kdevdesigner/designer/mainwindow.cpp:2517
+#: kdevdesigner/designer/mainwindow.cpp:2847
+#: kdevdesigner/designer/mainwindowactions.cpp:1129
+#: kdevdesigner/designer/sourcefile.cpp:224
+#: kdevdesigner/designer/sourcefile.cpp:269
+#: kdevdesigner/designer/variabledialogimpl.cpp:105 rc.cpp:3565
 #, no-c-format
-msgid "Closes the dialog"
-msgstr "关闭对话框"
+msgid "&Yes"
+msgstr "是(&Y)"
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 134
-#: rc.cpp:4360
+#. i18n: file ./parts/uimode/uichooser.ui line 121
+#: rc.cpp:3568
 #, no-c-format
-msgid ""
-"enter a regular expression, for example <tt>KD.*</tt>"
-", which matches all strings beginning with \"KD\""
-msgstr "输入一个正则表达式。例如 <tt>KD.*</tt>，它能匹配所有以“KD”开头的字符串"
+msgid "Toolview Tab Layout"
+msgstr ""
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 150
-#: rc.cpp:4363
+#. i18n: file ./parts/uimode/uichooser.ui line 124
+#: rc.cpp:3571
 #, no-c-format
-msgid "Regular Expression T&ype"
-msgstr "正则表达式类型(&Y)"
+msgid ""
+"Three different modes for the IDEAl toolview tabs. \"Text and icons\" is the "
+"most informative, but takes a lot of space. Those with a smaller screen will "
+"typically want \"Icons\"."
+msgstr ""
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 161
-#: rc.cpp:4366
+#. i18n: file ./parts/uimode/uichooser.ui line 135
+#: rc.cpp:3574
 #, no-c-format
-msgid "&Basic POSIX syntax (used by grep)"
-msgstr "基本的 POSIX 语法(grep 使用它)(&B)"
+msgid "Icons"
+msgstr "图标"
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 167
-#: rc.cpp:4369 rc.cpp:4375
+#. i18n: file ./parts/uimode/uichooser.ui line 143
+#: rc.cpp:3577
+#, fuzzy, no-c-format
+msgid "Te&xt"
+msgstr "文本"
+
+#. i18n: file ./parts/uimode/uichooser.ui line 154
+#: rc.cpp:3580
 #, no-c-format
-msgid "A description of this syntax can be found in the grep manpage"
-msgstr "这个语法的说明可以在 grep 的手册中找到。"
+msgid "Text and icons"
+msgstr "文本和图标"
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 175
-#: rc.cpp:4372
+#. i18n: file ./parts/uimode/uichooser.ui line 164
+#: rc.cpp:3583
 #, no-c-format
-msgid "E&xtended POSIX syntax (used by egrep)"
-msgstr "扩展的 POSIX 语法(egrep 使用它)(&X)"
+msgid "Tabbed Browsing"
+msgstr "标签式浏览"
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 186
-#: rc.cpp:4378
+#. i18n: file ./parts/uimode/uichooser.ui line 167
+#: rc.cpp:3586
 #, no-c-format
-msgid "&QRegExp syntax"
-msgstr "&QRegExp 语法"
+msgid "Some extra options for the document tabbar."
+msgstr ""
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 189
-#: rc.cpp:4381
+#. i18n: file ./parts/uimode/uichooser.ui line 178
+#: rc.cpp:3589
 #, no-c-format
-msgid ""
-"A description of this syntax can be found in the documentation of the QRegExp "
-"class"
-msgstr "这个语法的说明可以在 QRegExp 类的文档中找到。"
+msgid "Open &new tab after current tab"
+msgstr "在当前标签后打开新标签(&N)"
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 197
-#: rc.cpp:4384
+#. i18n: file ./parts/uimode/uichooser.ui line 186
+#: rc.cpp:3592
+#, fuzzy, no-c-format
+msgid "&Show icons on document tabs"
+msgstr "在文档标签上显示图标"
+
+#. i18n: file ./parts/uimode/uichooser.ui line 194
+#: rc.cpp:3595
+#, fuzzy, no-c-format
+msgid "Show close &button in tab bar"
+msgstr "在标签栏上显示关闭按钮"
+
+#. i18n: file ./parts/uimode/uichooser.ui line 214
+#: rc.cpp:3598
+#, fuzzy, no-c-format
+msgid "Note: Changes will take effect after TDevelop is restarted"
+msgstr "注意：更改将会在 KDevelop 重新启动后生效"
+
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 16
+#: rc.cpp:3601
 #, no-c-format
-msgid "QRegExp syntax (&minimal)"
-msgstr "QRegExp 语法(最小匹配)(&M)"
+msgid "New File Wizard Options"
+msgstr "新建文件向导选项"
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 200
-#: rc.cpp:4387
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 34
+#: rc.cpp:3604
+#, fuzzy, no-c-format
+msgid "Pro&ject Types"
+msgstr "工程类型(&P)"
+
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 45
+#: rc.cpp:3607
 #, no-c-format
-msgid ""
-"Matches a QRegExp non-greedy. Please read the QRegExp::setMinimal documentation "
-"for more details."
-msgstr "用非贪婪方式匹配一个 QRegExp 正则表达式。详细信息请阅读 QRegExp::setMinimal 的文档。"
+msgid "Re&move Type"
+msgstr "删除类型(&M)"
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 208
-#: rc.cpp:4390
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 53
+#: rc.cpp:3610
+#, fuzzy, no-c-format
+msgid "Edit T&ype..."
+msgstr "编辑类型(&E)..."
+
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 61
+#: rc.cpp:3613
 #, no-c-format
-msgid "&KRegExp syntax"
-msgstr "&KRegExp 语法"
+msgid "New &Subtype..."
+msgstr "新建子类型(&S)..."
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 211
-#: rc.cpp:4393
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 69
+#: rc.cpp:3616
 #, no-c-format
-msgid "A description of this syntax can be found in the TDE API documentation."
-msgstr "这个语法的说明可以在 TDE API 文档中找到。"
+msgid "&New Type..."
+msgstr "新建类型(&N)..."
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 221
-#: rc.cpp:4396 rc.cpp:4618 rc.cpp:6317 rc.cpp:6650 rc.cpp:6680
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 75
+#: parts/filecreate/addglobaldlg.cpp:59 rc.cpp:3619 rc.cpp:3643
 #, no-c-format
-msgid "&Edit..."
-msgstr "编辑(&E)..."
+msgid "Type Extension"
+msgstr "类型扩展"
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 240
-#: rc.cpp:4399
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 86
+#: parts/filecreate/addglobaldlg.cpp:60 rc.cpp:3622 rc.cpp:3646
 #, no-c-format
-msgid "Matched subgroups:"
-msgstr "匹配的子字符串组："
+msgid "Type Name"
+msgstr "类型名称"
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 257
-#: buildtools/qmake/projectconfigurationdlg.cpp:1796
-#: kdevdesigner/designer/propertyeditor.cpp:2923
-#: languages/cpp/debugger/variablewidget.cpp:223
-#: languages/ruby/debugger/variablewidget.cpp:146
-#: lib/widgets/propeditor/propertyeditor.cpp:173
-#: parts/partexplorer/partexplorerform.cpp:118 rc.cpp:4405 rc.cpp:5067
-#: rc.cpp:5133 rc.cpp:5244 rc.cpp:5845 rc.cpp:6260
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 97
+#: parts/filecreate/addglobaldlg.cpp:62 rc.cpp:3625 rc.cpp:3649
 #, no-c-format
-msgid "Value"
-msgstr "值"
+msgid "Icon"
+msgstr "图标"
 
-#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 284
-#: rc.cpp:4408
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 205
+#: rc.cpp:3637
 #, fuzzy, no-c-format
-msgid ""
-"Shows which groups were matched. See the corresponding documentation for how "
-"groups are matched."
-msgstr "显示哪些分组被匹配。关于如何匹配分组请参见相应的文档。"
+msgid "Ed&it Template"
+msgstr "编辑模板(&L)"
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 28
-#: rc.cpp:4411 rc.cpp:7282
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 215
+#: rc.cpp:3640
 #, no-c-format
-msgid "Ge&neral"
-msgstr "常规(&N)"
+msgid "Used &Global Types"
+msgstr "已使用的全局类型(&G)"
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 47
-#: rc.cpp:4414
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 301
+#: rc.cpp:3655
 #, no-c-format
-msgid "Editor Context Menu"
-msgstr "编辑器环境菜单"
+msgid "Copy to Pro&ject Types"
+msgstr "复制到工程类型(&J)"
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 58
-#: rc.cpp:4417
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 311
+#: rc.cpp:3658
 #, fuzzy, no-c-format
-msgid "Show \"&Go To Declaration\""
-msgstr "显示“转到声明”"
+msgid "Proje&ct Templates"
+msgstr "工程模板(&T)"
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 61
-#: rc.cpp:4420
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 320
+#: rc.cpp:3661
 #, no-c-format
-msgid ""
-"If checked, an option to go directly to the matching tag declaration will be "
-"shown. If more than one match, all matches will be shown in the main ctags "
-"result view."
-msgstr ""
-
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 69
-#: rc.cpp:4423
-#, fuzzy, no-c-format
-msgid "Show \"Go To &Definition\""
-msgstr "显示“转到定义”"
+msgid "Template Name"
+msgstr "模板名称"
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 72
-#: rc.cpp:4426
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 347
+#: rc.cpp:3664
 #, no-c-format
-msgid ""
-"If checked, an option to go directly to the matching tag definition will be "
-"shown. If more than one match, all matches will be shown in the main ctags "
-"result view."
-msgstr ""
+msgid "C&hange Content..."
+msgstr "更改内容(&H)..."
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 80
-#: rc.cpp:4429
-#, fuzzy, no-c-format
-msgid "Show \"CT&ags Lookup\""
-msgstr "显示“CTags 查阅”"
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 355
+#: rc.cpp:3667
+#, no-c-format
+msgid "&New Template..."
+msgstr "新建模板(&N)..."
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 83
-#: rc.cpp:4432
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 371
+#: rc.cpp:3670
 #, no-c-format
-msgid ""
-"If checked, an option to do a full lookup of all macthing tags is shown in the "
-"context menu. The results will be shown in the main ctags results view."
-msgstr ""
+msgid "Re&move Template"
+msgstr "删除模板(&M)"
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 112
-#: rc.cpp:4438
+#. i18n: file ./parts/filecreate/fcconfigwidgetbase.ui line 396
+#: rc.cpp:3673
 #, no-c-format
-msgid "When more than one hit, go directl&y to the first"
-msgstr ""
+msgid "&Edit Template"
+msgstr "编辑模板(&E)"
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 115
-#: rc.cpp:4441
+#. i18n: file ./parts/filecreate/fctypeeditbase.ui line 16
+#: rc.cpp:3676
 #, no-c-format
-msgid ""
-"If more than one hit was produced from an attempt to find an exact match, go to "
-"the first match in the list. Note: the <i>Go To Next Match</i> "
-"shortcut can be used to step between the matches."
-msgstr ""
+msgid "File Type"
+msgstr "文件类型"
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 123
-#: rc.cpp:4444
+#. i18n: file ./parts/filecreate/fctypeeditbase.ui line 44
+#: rc.cpp:3679
 #, no-c-format
-msgid "&Use custom tagfile generation arguments"
-msgstr ""
+msgid "Type &extension:"
+msgstr "类型扩展(&E)："
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 126
-#: rc.cpp:4447
+#. i18n: file ./parts/filecreate/fctypeeditbase.ui line 76
+#: rc.cpp:3682
 #, no-c-format
-msgid ""
-"The default arguments should be fine, but if needed a custom generation "
-"arguments string can be used."
-msgstr ""
+msgid "Type &name:"
+msgstr "类型名称(&N)："
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 140
-#: rc.cpp:4450
+#. i18n: file ./parts/filecreate/fctypeeditbase.ui line 108
+#: rc.cpp:3685
 #, no-c-format
-msgid ""
-"Enter custom arguments to ctags database creation here. Note: do not set a "
-"custom tags file filename here, do that below instead."
-msgstr ""
+msgid "Type &description:"
+msgstr "类型描述(&D)："
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 158
-#: rc.cpp:4453
+#. i18n: file ./parts/filecreate/fctypeeditbase.ui line 162
+#: rc.cpp:3688 rc.cpp:3703
 #, no-c-format
-msgid "Paths"
-msgstr "路径"
+msgid "Set template content from &file:"
+msgstr "根据文件设定模板内容(&F)："
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 161
-#: rc.cpp:4456 rc.cpp:4462
+#. i18n: file ./parts/filecreate/fctemplateeditbase.ui line 16
+#: rc.cpp:3697
 #, no-c-format
-msgid ""
-"Enter the path to the exuberant ctags binary. If empty, <i>ctags</i> "
-"will be executed via $PATH. Note that it is sometimes installed as <i>"
-"exuberant-ctags</i>."
-msgstr ""
+msgid "File Template"
+msgstr "文件模板"
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 172
-#: rc.cpp:4459
+#. i18n: file ./parts/filecreate/fctemplateeditbase.ui line 41
+#: rc.cpp:3700 rc.cpp:5761
 #, no-c-format
-msgid "Path to ctags binary:"
-msgstr "ctags 二进制路径："
+msgid "Template &name:"
+msgstr "模板名称(&N)："
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 209
-#: rc.cpp:4465
-#, fuzzy, no-c-format
-msgid "Mana&ge tag files"
-msgstr "生成标记文件"
+#. i18n: file ./parts/scripting/scriptingglobalconfigbase.ui line 16
+#: parts/scripting/scriptingpart.cpp:57 rc.cpp:3712
+#, no-c-format
+msgid "Scripting"
+msgstr "脚本"
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 228
-#: rc.cpp:4468
-#, fuzzy, no-c-format
-msgid "Path to project tag file:"
-msgstr "工程类型(&P)："
+#. i18n: file ./parts/scripting/scriptingglobalconfigbase.ui line 27
+#: rc.cpp:3715
+#, no-c-format
+msgid "Search Custom Directories for Scripts"
+msgstr "搜索自定义目录中的脚本"
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 236
-#: rc.cpp:4471
+#. i18n: file ./parts/scripting/scriptingglobalconfigbase.ui line 41
+#: rc.cpp:3718
 #, no-c-format
 msgid ""
-"Enter the full path of the project tagfile. If empty, the file will be called "
-"<i>tags</i> and reside in the root of the project."
+"<b>NOTE</b> These are directories to search in that are found in your TDE "
+"resource directories.  So if you add the string \"kate/scripts\" to the list "
+"then KScript will look in \"$TDEDIRS/data/kate/scripts\" for scripts.  This "
+"will allow you to get scripts in your home directory as well as system wide "
+"ones."
 msgstr ""
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 246
-#: rc.cpp:4474
-#, fuzzy, no-c-format
-msgid "Other tag files:"
-msgstr "其它文件"
-
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 262
-#: rc.cpp:4477
-#, fuzzy, no-c-format
-msgid "&Create..."
-msgstr "正在创建..."
+#. i18n: file ./parts/distpart/distpart_ui.ui line 37
+#: rc.cpp:3721
+#, no-c-format
+msgid "Prepare for Release"
+msgstr "准备发布版本"
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 278
-#: rc.cpp:4483
-#, fuzzy, no-c-format
-msgid "Remo&ve"
-msgstr "删除(&M)"
+#. i18n: file ./parts/distpart/distpart_ui.ui line 79
+#: rc.cpp:3724
+#, no-c-format
+msgid "<H2>Project Packaging & Publishing</H2>"
+msgstr "<H2>工程打包和发布</H2>"
 
-#. i18n: file ./parts/ctags2/ctags2_settingswidgetbase.ui line 314
-#: rc.cpp:4489
+#. i18n: file ./parts/distpart/distpart_ui.ui line 135
+#: rc.cpp:3727
 #, fuzzy, no-c-format
-msgid "Tags file"
-msgstr "标记文件"
+msgid "Source &Distribution"
+msgstr "源代码发布(&S)"
 
-#. i18n: file ./parts/ctags2/ctags2_createtagfilebase.ui line 16
-#: rc.cpp:4492
-#, fuzzy, no-c-format
-msgid "Create new tags file"
-msgstr "创建新文件"
+#. i18n: file ./parts/distpart/distpart_ui.ui line 151
+#: rc.cpp:3730
+#, no-c-format
+msgid "&Use custom options"
+msgstr "使用自定义选项(&U)"
 
-#. i18n: file ./parts/ctags2/ctags2_createtagfilebase.ui line 40
-#: rc.cpp:4498
+#. i18n: file ./parts/distpart/distpart_ui.ui line 154
+#: rc.cpp:3733
 #, no-c-format
-msgid "Target tags file path:"
+msgid "Default is: %n-%v.tar.gz"
 msgstr ""
 
-#. i18n: file ./parts/ctags2/ctags2_createtagfilebase.ui line 53
-#: rc.cpp:4501
-#, fuzzy, no-c-format
-msgid "Directory to tag:"
-msgstr "目录："
-
-#. i18n: file ./parts/ctags2/ctags2_createtagfilebase.ui line 91
-#: rc.cpp:4504
-#, fuzzy, no-c-format
-msgid "&Create"
-msgstr "创建(&R)"
+#. i18n: file ./parts/distpart/distpart_ui.ui line 173
+#: rc.cpp:3736
+#, no-c-format
+msgid "Source Options"
+msgstr "源代码选项"
 
-#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 28
-#: rc.cpp:4510
+#. i18n: file ./parts/distpart/distpart_ui.ui line 184
+#: rc.cpp:3739
 #, no-c-format
-msgid "Tag"
-msgstr "标记"
+msgid "Use &bzip2 instead of gzip"
+msgstr "使用 bzip2 代替 gzip(&B)"
 
-#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 69
-#: rc.cpp:4519
+#. i18n: file ./parts/distpart/distpart_ui.ui line 203
+#: rc.cpp:3742
 #, no-c-format
 msgid ""
-"Result view for a tag lookup. Click a line to go to the corresponding place in "
-"the code."
-msgstr ""
+"<b>Archive name format: </b>"
+"<br> %n - File name "
+"<br> %v - File version "
+"<br> %d - Date of archive"
+msgstr "<b>归档文件名格式：</b><br>%n － 文件名<br>%v － 文件版本<br>%d － 归档日期"
 
-#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 85
-#: languages/cpp/problemreporter.cpp:141 languages/php/phperrorview.cpp:132
-#: rc.cpp:4522
+#. i18n: file ./parts/distpart/distpart_ui.ui line 214
+#: rc.cpp:3745
 #, no-c-format
-msgid "Lookup:"
-msgstr "查阅："
+msgid "%n-%v"
+msgstr "%n-%v"
 
-#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 93
-#: rc.cpp:4525
-#, no-c-format
-msgid ""
-"Type the identifier you want to lookup. "
-"<p> The identifier will populate and display a reducing list as you type."
-msgstr ""
+#. i18n: file ./parts/distpart/distpart_ui.ui line 217
+#: rc.cpp:3748
+#, fuzzy, no-c-format
+msgid "Enter the filename using the format options. "
+msgstr "输入仓库名"
 
-#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 101
-#: rc.cpp:4528
-#, no-c-format
-msgid "Hits:"
-msgstr "次数："
+#. i18n: file ./parts/distpart/distpart_ui.ui line 254
+#: rc.cpp:3751
+#, fuzzy, no-c-format
+msgid "&Add Files"
+msgstr "添加文件"
 
-#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 126
-#: rc.cpp:4531
-#, no-c-format
-msgid "Date:"
-msgstr "日期："
+#. i18n: file ./parts/distpart/distpart_ui.ui line 270
+#: rc.cpp:3754
+#, fuzzy, no-c-format
+msgid "&Create Source Archive"
+msgstr "创建源代码归档(&A)"
 
-#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 137
-#: rc.cpp:4534
+#. i18n: file ./parts/distpart/distpart_ui.ui line 286
+#: rc.cpp:3757 rc.cpp:3880
 #, no-c-format
-msgid "Regenerate"
-msgstr "重新生成"
+msgid "R&eset"
+msgstr "重置(&E)"
 
-#. i18n: file ./parts/ctags2/ctags2_widgetbase.ui line 140
-#: rc.cpp:4537
+#. i18n: file ./parts/distpart/distpart_ui.ui line 296
+#: parts/quickopen/quickopenfiledialog.cpp:42
+#: parts/quickopen/quickopenfiledialog.cpp:57 rc.cpp:3760
 #, no-c-format
-msgid ""
-"Press to regenerate CTags database."
-"<p>This will take some time on a large project."
-msgstr ""
+msgid "File &list:"
+msgstr "文件列表(&L)："
 
-#. i18n: file ./parts/ctags2/ctags2_selecttagfilebase.ui line 16
-#: rc.cpp:4540
+#. i18n: file ./parts/distpart/distpart_ui.ui line 309
+#: rc.cpp:3763
 #, fuzzy, no-c-format
-msgid "Add tags file"
-msgstr "添加已有的文件"
+msgid "Package &Information"
+msgstr "打包信息(&P)"
 
-#. i18n: file ./parts/ctags2/ctags2_selecttagfilebase.ui line 40
-#: rc.cpp:4546
+#. i18n: file ./parts/distpart/distpart_ui.ui line 349
+#: rc.cpp:3766
+#, no-c-format
+msgid "Ve&ndor:"
+msgstr "制作者(&N)："
+
+#. i18n: file ./parts/distpart/distpart_ui.ui line 381
+#: rc.cpp:3769
 #, fuzzy, no-c-format
-msgid "Tags file:"
-msgstr "标记文件"
+msgid "Application name"
+msgstr "应用程序名称(&N)："
 
-#. i18n: file ./parts/documentation/docprojectconfigwidgetbase.ui line 41
-#: parts/documentation/interfaces/kdevdocumentationplugin.cpp:688 rc.cpp:4567
+#. i18n: file ./parts/distpart/distpart_ui.ui line 402
+#: rc.cpp:3772
 #, no-c-format
-msgid "Project API Documentation"
-msgstr "工程 API 文档"
+msgid "&Application name:"
+msgstr "应用程序名称(&A)："
 
-#. i18n: file ./parts/documentation/docprojectconfigwidgetbase.ui line 60
-#: rc.cpp:4570
+#. i18n: file ./parts/distpart/distpart_ui.ui line 413
+#: rc.cpp:3775
 #, no-c-format
-msgid "Ca&talog location:"
-msgstr "编目位置(&T)："
+msgid "S&ummary:"
+msgstr "摘要(&U)："
 
-#. i18n: file ./parts/documentation/docprojectconfigwidgetbase.ui line 85
-#: rc.cpp:4573
+#. i18n: file ./parts/distpart/distpart_ui.ui line 435
+#: rc.cpp:3781
 #, no-c-format
-msgid "C&ollection type:"
-msgstr "集合类型(&O)："
+msgid "R&elease:"
+msgstr "发布版本号(&E)："
 
-#. i18n: file ./parts/documentation/docprojectconfigwidgetbase.ui line 103
-#: parts/documentation/interfaces/kdevdocumentationplugin.cpp:689 rc.cpp:4576
+#. i18n: file ./parts/distpart/distpart_ui.ui line 446
+#: rc.cpp:3784
 #, no-c-format
-msgid "Project User Manual"
-msgstr "工程用户手册"
+msgid "&Version:"
+msgstr "版本(&V)："
 
-#. i18n: file ./parts/documentation/selecttopicbase.ui line 16
-#: rc.cpp:4582
+#. i18n: file ./parts/distpart/distpart_ui.ui line 493
+#: rc.cpp:3787
 #, no-c-format
-msgid "Choose Topic"
-msgstr "选择主题"
+msgid ""
+"Version of the file package.\n"
+"Menu item: Project/Project Options/General/Version\n"
+"changes project compiled version number"
+msgstr ""
 
-#. i18n: file ./parts/documentation/selecttopicbase.ui line 94
-#: rc.cpp:4591
+#. i18n: file ./parts/distpart/distpart_ui.ui line 501
+#: rc.cpp:3792
 #, no-c-format
-msgid "Choose a topic for <b>%1</b>:"
-msgstr "选择 <b>%1</b> 的主题："
+msgid "&Group:"
+msgstr "组(&G)："
 
-#. i18n: file ./parts/documentation/editcatalogdlgbase.ui line 19
-#: rc.cpp:4594 rc.cpp:4723
+#. i18n: file ./parts/distpart/distpart_ui.ui line 512
+#: rc.cpp:3795
 #, no-c-format
-msgid "Documentation Catalog Properties"
-msgstr "文档编目属性"
+msgid "Pac&kager:"
+msgstr "打包者(&K)："
 
-#. i18n: file ./parts/documentation/editcatalogdlgbase.ui line 141
-#: parts/fileview/addfilegroupdlg.cpp:26 rc.cpp:4606 rc.cpp:4732
+#. i18n: file ./parts/distpart/distpart_ui.ui line 538
+#: rc.cpp:3798
 #, no-c-format
-msgid "&Title:"
-msgstr "标题(&T)："
+msgid "Advanced Package Op&tions"
+msgstr "高级打包选项(&T)"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 16
-#: parts/documentation/bookmarkview.cpp:49
-#: parts/documentation/documentation_part.cpp:87
-#: parts/documentation/documentation_part.cpp:97
-#: parts/documentation/documentation_part.cpp:105
-#: parts/documentation/docutils.cpp:79 rc.cpp:4609
-#, no-c-format
-msgid "Documentation"
-msgstr "文档"
+#. i18n: file ./parts/distpart/distpart_ui.ui line 549
+#: rc.cpp:3801
+#, fuzzy, no-c-format
+msgid "&Create development package"
+msgstr "创建开发包"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 34
-#: rc.cpp:4612
+#. i18n: file ./parts/distpart/distpart_ui.ui line 557
+#: rc.cpp:3804
 #, no-c-format
-msgid "&Documentation Collections"
-msgstr "文档收藏(&D)"
+msgid "Create documentation package"
+msgstr "创建文档包"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 119
-#: rc.cpp:4624
+#. i18n: file ./parts/distpart/distpart_ui.ui line 565
+#: rc.cpp:3807
 #, no-c-format
-msgid "Full Text &Search"
-msgstr "全文本搜索(&S)"
+msgid "Include application icon"
+msgstr "包含应用程序图标"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 155
-#: rc.cpp:4627
+#. i18n: file ./parts/distpart/distpart_ui.ui line 573
+#: rc.cpp:3810
 #, no-c-format
-msgid "htse&arch executable:"
-msgstr "htsearch 可执行文件(&A)："
+msgid ""
+"Architecture target:<BR><b>(Note: You must have a compiler that supports this "
+"target)</b>"
+msgstr "目标平台：<BR><b>(注意：您必须有一个支持此目标平台的编译器。)</b>"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 207
-#: rc.cpp:4630
+#. i18n: file ./parts/distpart/distpart_ui.ui line 579
+#: rc.cpp:3813
 #, no-c-format
-msgid "htdi&g executable:"
-msgstr "htdig 可执行文件(&G)："
+msgid "i386"
+msgstr "i386"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 226
-#: rc.cpp:4633
+#. i18n: file ./parts/distpart/distpart_ui.ui line 584
+#: rc.cpp:3816
 #, no-c-format
-msgid "Database di&rectory:"
-msgstr "数据库目录(&R)："
+msgid "i586"
+msgstr "i586"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 237
-#: rc.cpp:4636
+#. i18n: file ./parts/distpart/distpart_ui.ui line 589
+#: rc.cpp:3819
 #, no-c-format
-msgid "ht&merge executable:"
-msgstr "htmerge 可执行文件(&M)："
+msgid "i686"
+msgstr "i686"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 252
-#: rc.cpp:4639
+#. i18n: file ./parts/distpart/distpart_ui.ui line 594
+#: rc.cpp:3822
 #, no-c-format
-msgid "O&ther"
-msgstr "其它(&T)"
+msgid "AMD K6"
+msgstr "AMD K6"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 280
-#: rc.cpp:4642
+#. i18n: file ./parts/distpart/distpart_ui.ui line 599
+#: rc.cpp:3825
 #, no-c-format
-msgid "Editor Context Menu Items"
-msgstr "编辑器环境菜单项"
+msgid "AMD K7"
+msgstr "AMD K7"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 291
-#: rc.cpp:4645
+#. i18n: file ./parts/distpart/distpart_ui.ui line 604
+#: rc.cpp:3828
 #, no-c-format
-msgid "&Find in documentation"
-msgstr "在文档中查找(&F)"
+msgid "PPC"
+msgstr "PowerPC"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 299
-#: rc.cpp:4648
+#. i18n: file ./parts/distpart/distpart_ui.ui line 609
+#: rc.cpp:3831
 #, no-c-format
-msgid "&Look in documentation index"
-msgstr "在文档索引中查找(&L)"
+msgid "PPC G3"
+msgstr "PowerPC G3"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 307
-#: rc.cpp:4651
+#. i18n: file ./parts/distpart/distpart_ui.ui line 614
+#: rc.cpp:3834
 #, no-c-format
-msgid "S&earch in documentation"
-msgstr "在文档中搜索(&E)"
+msgid "PPC Altevec"
+msgstr "PowerPC Altevec"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 315
-#: rc.cpp:4654
+#. i18n: file ./parts/distpart/distpart_ui.ui line 619
+#: rc.cpp:3837
 #, no-c-format
-msgid "Goto &infopage"
-msgstr "转至信息页(&I)"
+msgid "Dec Alpha (AXP)"
+msgstr "Dec Alpha (AXP)"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 323
-#: rc.cpp:4657
+#. i18n: file ./parts/distpart/distpart_ui.ui line 624
+#: rc.cpp:3840
 #, no-c-format
-msgid "Goto &manpage"
-msgstr "转至手册页(&M)"
+msgid "Sparc"
+msgstr "Sparc"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 333
-#: rc.cpp:4660
+#. i18n: file ./parts/distpart/distpart_ui.ui line 669
+#: rc.cpp:3843
+#, fuzzy, no-c-format
+msgid ""
+"&Build Source \n"
+"Package"
+msgstr "构建源代码包"
+
+#. i18n: file ./parts/distpart/distpart_ui.ui line 678
+#: rc.cpp:3847
+#, fuzzy, no-c-format
+msgid ""
+"Build Binar&y \n"
+"Package"
+msgstr "构建二进制包"
+
+#. i18n: file ./parts/distpart/distpart_ui.ui line 687
+#: rc.cpp:3851
+#, fuzzy, no-c-format
+msgid ""
+"E&xport \n"
+"Build Files"
+msgstr "导出构建文件"
+
+#. i18n: file ./parts/distpart/distpart_ui.ui line 696
+#: rc.cpp:3855
+#, fuzzy, no-c-format
+msgid ""
+"I&mport \n"
+"Build Files"
+msgstr "导入构建文件"
+
+#. i18n: file ./parts/distpart/distpart_ui.ui line 777
+#: rc.cpp:3862
 #, no-c-format
-msgid "Use KDevelop &Assistant to browse documentation"
-msgstr "使用 KDevelop 助手浏览文档(&A)"
+msgid "C&hangelog:"
+msgstr "变更日志(&H)："
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 341
-#: rc.cpp:4663
+#. i18n: file ./parts/distpart/distpart_ui.ui line 807
+#: rc.cpp:3865
+#, fuzzy, no-c-format
+msgid "Pr&oject Publishing"
+msgstr "工程发布(&R)"
+
+#. i18n: file ./parts/distpart/distpart_ui.ui line 826
+#: rc.cpp:3868
 #, no-c-format
-msgid "Fonts && Sizes"
-msgstr "字体和大小"
+msgid "Local Options"
+msgstr "本地选项"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 360
-#: rc.cpp:4666
+#. i18n: file ./parts/distpart/distpart_ui.ui line 848
+#: rc.cpp:3871
+#, fuzzy, no-c-format
+msgid "Ge&nerate HTML information page"
+msgstr "生成 HTML 信息页面(&H)"
+
+#. i18n: file ./parts/distpart/distpart_ui.ui line 856
+#: rc.cpp:3874
 #, no-c-format
-msgid "Sta&ndard font:"
-msgstr "标准字体(&N)："
+msgid "&User information generated by RPM"
+msgstr "使用 RPM 生成的信息(&U)"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 389
-#: rc.cpp:4669
+#. i18n: file ./parts/distpart/distpart_ui.ui line 911
+#: rc.cpp:3877
 #, no-c-format
-msgid "Fi&xed font:"
-msgstr "等宽字体(&X)："
+msgid "&Generate"
+msgstr "生成(&G)"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 408
-#: rc.cpp:4672
+#. i18n: file ./parts/distpart/distpart_ui.ui line 939
+#: rc.cpp:3883
 #, no-c-format
-msgid "&Zoom factor:"
-msgstr "缩放因子(&Z)："
+msgid "Re&mote Options"
+msgstr "远程选项(&M)"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 417
-#: rc.cpp:4675
+#. i18n: file ./parts/distpart/distpart_ui.ui line 980
+#: rc.cpp:3886
 #, no-c-format
-msgid "20"
-msgstr "20"
+msgid "File su&bmission list:"
+msgstr "文件提交列表(&B)："
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 422
-#: rc.cpp:4678
+#. i18n: file ./parts/distpart/distpart_ui.ui line 1016
+#: rc.cpp:3889
 #, no-c-format
-msgid "40"
-msgstr "40"
+msgid "+"
+msgstr "+"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 427
-#: rc.cpp:4681
+#. i18n: file ./parts/distpart/distpart_ui.ui line 1032
+#: rc.cpp:3892
 #, no-c-format
-msgid "60"
-msgstr "60"
+msgid "-"
+msgstr "-"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 432
-#: rc.cpp:4684
+#. i18n: file ./parts/distpart/distpart_ui.ui line 1053
+#: rc.cpp:3895
+#, fuzzy, no-c-format
+msgid "Upload to &custom FTP site"
+msgstr "上传到自定义 FTP 站点"
+
+#. i18n: file ./parts/distpart/distpart_ui.ui line 1061
+#: rc.cpp:3898
+#, fuzzy, no-c-format
+msgid "Upload files to ftp.&kde.org"
+msgstr "将文件上传到 ftp.kde.org"
+
+#. i18n: file ./parts/distpart/distpart_ui.ui line 1086
+#: rc.cpp:3901
+#, fuzzy, no-c-format
+msgid "Sub&mit"
+msgstr "提交"
+
+#. i18n: file ./parts/distpart/distpart_ui.ui line 1094
+#: rc.cpp:3904
 #, no-c-format
-msgid "80"
-msgstr "80"
+msgid "ftp://username:password@ftp.server.com/path/"
+msgstr "ftp://username:password@ftp.server.com/path/"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 437
-#: rc.cpp:4687
+#. i18n: file ./parts/distpart/distpart_ui.ui line 1102
+#: rc.cpp:3907
 #, no-c-format
-msgid "90"
-msgstr "90"
+msgid "Reset"
+msgstr "重置"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 442
-#: rc.cpp:4690
+#. i18n: file ./parts/distpart/distpart_ui.ui line 1110
+#: rc.cpp:3910
+#, fuzzy, no-c-format
+msgid "Upload to &apps.kde.com"
+msgstr "上传到 apps.kde.com"
+
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 16
+#: rc.cpp:3913
 #, no-c-format
-msgid "95"
-msgstr "95"
+msgid "Test Regular Expression"
+msgstr "测试正则表达式"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 447
-#: rc.cpp:4693
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 30
+#: rc.cpp:3916
 #, no-c-format
-msgid "100"
-msgstr "100"
+msgid "&Regular expression:"
+msgstr "正则表达式(&R)："
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 452
-#: rc.cpp:4696
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 41
+#: rc.cpp:3919
 #, no-c-format
-msgid "105"
-msgstr "105"
+msgid "&Test string:"
+msgstr "测试字符串(&T)："
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 457
-#: rc.cpp:4699
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 52
+#: rc.cpp:3922
 #, no-c-format
-msgid "110"
-msgstr "110"
+msgid "Enter a string which will be matched against the regular expression"
+msgstr "输入要和正则表达式匹配的字符串"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 462
-#: rc.cpp:4702
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 87
+#: rc.cpp:3925
 #, no-c-format
-msgid "120"
-msgstr "120"
+msgid "&Insert Quoted"
+msgstr "加引号插入(&I)"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 467
-#: rc.cpp:4705
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 93
+#: rc.cpp:3928
 #, no-c-format
-msgid "140"
-msgstr "140"
+msgid ""
+"Inserts the regular expression into the currently opened source code file. "
+"Escapes any special characters like backslash."
+msgstr "在当前打开的源代码文件中插入正则表达式。任何比如反斜杠这样的特殊字符都使用换码序列。"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 472
-#: rc.cpp:4708
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 124
+#: rc.cpp:3934
 #, no-c-format
-msgid "160"
-msgstr "160"
+msgid "Closes the dialog"
+msgstr "关闭对话框"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 477
-#: rc.cpp:4711
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 134
+#: rc.cpp:3937
 #, no-c-format
-msgid "180"
-msgstr "180"
+msgid ""
+"enter a regular expression, for example <tt>KD.*</tt>"
+", which matches all strings beginning with \"KD\""
+msgstr "输入一个正则表达式。例如 <tt>KD.*</tt>，它能匹配所有以“KD”开头的字符串"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 482
-#: rc.cpp:4714
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 150
+#: rc.cpp:3940
 #, no-c-format
-msgid "200"
-msgstr "200"
+msgid "Regular Expression T&ype"
+msgstr "正则表达式类型(&Y)"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 487
-#: rc.cpp:4717
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 161
+#: rc.cpp:3943
 #, no-c-format
-msgid "250"
-msgstr "250"
+msgid "&Basic POSIX syntax (used by grep)"
+msgstr "基本的 POSIX 语法(grep 使用它)(&B)"
 
-#. i18n: file ./parts/documentation/docglobalconfigwidgetbase.ui line 492
-#: rc.cpp:4720
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 167
+#: rc.cpp:3946 rc.cpp:3952
 #, no-c-format
-msgid "300"
-msgstr "300"
+msgid "A description of this syntax can be found in the grep manpage"
+msgstr "这个语法的说明可以在 grep 的手册中找到。"
 
-#. i18n: file ./parts/documentation/addcatalogdlgbase.ui line 43
-#: rc.cpp:4726
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 175
+#: rc.cpp:3949
 #, no-c-format
-msgid "Type:"
-msgstr "类型："
+msgid "E&xtended POSIX syntax (used by egrep)"
+msgstr "扩展的 POSIX 语法(egrep 使用它)(&X)"
 
-#. i18n: file ./parts/documentation/addcatalogdlgbase.ui line 73
-#: rc.cpp:4729
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 186
+#: rc.cpp:3955
 #, no-c-format
-msgid "Locatio&n:"
-msgstr "位置(&N)："
+msgid "&QRegExp syntax"
+msgstr "&QRegExp 语法"
 
-#. i18n: file ./parts/documentation/find_documentation_optionsbase.ui line 16
-#: rc.cpp:4741
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 189
+#: rc.cpp:3958
 #, no-c-format
-msgid "Find Documentation Options"
-msgstr "查找文档选项"
+msgid ""
+"A description of this syntax can be found in the documentation of the QRegExp "
+"class"
+msgstr "这个语法的说明可以在 QRegExp 类的文档中找到。"
 
-#. i18n: file ./parts/documentation/find_documentation_optionsbase.ui line 109
-#: rc.cpp:4750
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 197
+#: rc.cpp:3961
 #, no-c-format
-msgid "Go to first match"
-msgstr "转到第一个匹配"
+msgid "QRegExp syntax (&minimal)"
+msgstr "QRegExp 语法(最小匹配)(&M)"
 
-#. i18n: file ./parts/documentation/find_documentation_optionsbase.ui line 182
-#: rc.cpp:4759
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 200
+#: rc.cpp:3964
 #, no-c-format
 msgid ""
-"You can enable and disable search\n"
-"sources and change their priority here."
-msgstr ""
+"Matches a QRegExp non-greedy. Please read the QRegExp::setMinimal documentation "
+"for more details."
+msgstr "用非贪婪方式匹配一个 QRegExp 正则表达式。详细信息请阅读 QRegExp::setMinimal 的文档。"
 
-#. i18n: file ./parts/documentation/find_documentationbase.ui line 25
-#: parts/documentation/documentation_part.cpp:247 rc.cpp:4763
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 208
+#: rc.cpp:3967
 #, no-c-format
-msgid "Find Documentation"
-msgstr "查找文档"
+msgid "&KRegExp syntax"
+msgstr "&KRegExp 语法"
 
-#. i18n: file ./parts/documentation/find_documentationbase.ui line 36
-#: rc.cpp:4766
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 211
+#: rc.cpp:3970
 #, no-c-format
-msgid "Search term:"
-msgstr "搜索项："
+msgid "A description of this syntax can be found in the TDE API documentation."
+msgstr "这个语法的说明可以在 TDE API 文档中找到。"
 
-#. i18n: file ./parts/documentation/find_documentationbase.ui line 44
-#: parts/documentation/docconfiglistview.cpp:32
-#: parts/documentation/documentation_widget.cpp:62
-#: parts/documentation/docutils.cpp:90 parts/doxygen/messages.cpp:276
-#: rc.cpp:4769
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 240
+#: rc.cpp:3976
 #, no-c-format
-msgid "Search"
-msgstr "搜索"
+msgid "Matched subgroups:"
+msgstr "匹配的子字符串组："
 
-#. i18n: file ./parts/outputviews/filterdlg.ui line 16
-#: rc.cpp:4775
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 257
+#: buildtools/qmake/projectconfigurationdlg.cpp:1796
+#: kdevdesigner/designer/propertyeditor.cpp:2923
+#: languages/cpp/debugger/variablewidget.cpp:223
+#: languages/ruby/debugger/variablewidget.cpp:146
+#: lib/widgets/propeditor/propertyeditor.cpp:173
+#: parts/partexplorer/partexplorerform.cpp:118 rc.cpp:3982 rc.cpp:7297
+#: rc.cpp:7321 rc.cpp:7429 rc.cpp:7981 rc.cpp:8786
 #, no-c-format
-msgid "Output Filter Settings"
-msgstr "输出过滤设置"
+msgid "Value"
+msgstr "值"
 
-#. i18n: file ./parts/outputviews/filterdlg.ui line 94
-#: rc.cpp:4784
+#. i18n: file ./parts/regexptest/regexptestdlgbase.ui line 284
+#: rc.cpp:3985
 #, fuzzy, no-c-format
-msgid "Filter"
-msgstr "已过滤"
+msgid ""
+"Shows which groups were matched. See the corresponding documentation for how "
+"groups are matched."
+msgstr "显示哪些分组被匹配。关于如何匹配分组请参见相应的文档。"
 
-#. i18n: file ./parts/outputviews/filterdlg.ui line 111
-#: rc.cpp:4787
+#. i18n: file ./src/mimewarningdialog.ui line 24
+#: rc.cpp:3988
 #, no-c-format
-msgid "Only show lines matching:"
-msgstr ""
+msgid "Could Not Open File"
+msgstr "无法打开文件"
 
-#. i18n: file ./parts/outputviews/filterdlg.ui line 135
-#: rc.cpp:4793
+#. i18n: file ./src/mimewarningdialog.ui line 43
+#: rc.cpp:3991
 #, fuzzy, no-c-format
-msgid "Re&gular expression"
-msgstr "正则表达式(&X)："
+msgid "TDevelop could not open"
+msgstr "KDevelop 无法打开"
 
-#. i18n: file ./parts/uimode/uichooser.ui line 16
-#: rc.cpp:4796
-#, fuzzy, no-c-format
-msgid "UIChooser"
-msgstr "用户"
+#. i18n: file ./src/mimewarningdialog.ui line 59
+#: rc.cpp:3994
+#, no-c-format
+msgid "Some URL"
+msgstr ""
 
-#. i18n: file ./parts/uimode/uichooser.ui line 38
-#: rc.cpp:4799
+#. i18n: file ./src/mimewarningdialog.ui line 75
+#: rc.cpp:3997
 #, no-c-format
-msgid "Use Tabs"
-msgstr "使用制表符"
+msgid "<qt>No suitable viewer was found for the <b>%1</b> mimetype.</qt>"
+msgstr ""
 
-#. i18n: file ./parts/uimode/uichooser.ui line 41
-#: rc.cpp:4802
+#. i18n: file ./src/mimewarningdialog.ui line 100
+#: rc.cpp:4000
 #, no-c-format
-msgid ""
-"Some prefer not to have a tab bar and switch between documents using other "
-"means. Kate is one example of this."
+msgid "What Do You Want to Do?"
 msgstr ""
 
-#. i18n: file ./parts/uimode/uichooser.ui line 52
-#: rc.cpp:4805
+#. i18n: file ./src/mimewarningdialog.ui line 111
+#: rc.cpp:4003
+#, no-c-format
+msgid "Let TDE find a suitable program"
+msgstr "让 TDE 找到合适的程序"
+
+#. i18n: file ./src/mimewarningdialog.ui line 122
+#: rc.cpp:4006
 #, fuzzy, no-c-format
-msgid "Al&ways"
-msgstr "总是"
+msgid "Open it in TDevelop as plain text"
+msgstr "总是在 KDevelop 中打开为纯文本"
 
-#. i18n: file ./parts/uimode/uichooser.ui line 63
-#: rc.cpp:4808
+#. i18n: file ./src/mimewarningdialog.ui line 158
+#: rc.cpp:4009
+#, no-c-format
+msgid "Always open this mimetype as text"
+msgstr "总是将此 MIME 类型打开为文本"
+
+#. i18n: file ./src/settingswidget.ui line 16
+#: rc.cpp:4018
 #, fuzzy, no-c-format
-msgid "Ne&ver"
-msgstr "从不"
+msgid "Form2"
+msgstr "界面表单"
 
-#. i18n: file ./parts/uimode/uichooser.ui line 76
-#: rc.cpp:4811
+#. i18n: file ./src/settingswidget.ui line 30
+#: rc.cpp:4021
 #, no-c-format
-msgid "Use Close on Hover"
+msgid "Lo&ad last project on startup"
+msgstr "启动时载入上次的工程(&A)"
+
+#. i18n: file ./src/settingswidget.ui line 33
+#: rc.cpp:4024
+#, no-c-format
+msgid ""
+"Check this if you want TDevelop to load the last opened project on startup"
 msgstr ""
 
-#. i18n: file ./parts/uimode/uichooser.ui line 79
-#: rc.cpp:4814
+#. i18n: file ./src/settingswidget.ui line 36
+#: rc.cpp:4027
 #, no-c-format
 msgid ""
-"The document tab can optionally be used to close the document, by clicking on "
-"the tab icon."
+"Mark this checkbox if you want to continue to work with the last project you "
+"worked on. This will cause TDevelop to automatically load this project on "
+"start-up. It will usually be shown in the state you left work so you can "
+"readily proceed."
 msgstr ""
 
-#. i18n: file ./parts/uimode/uichooser.ui line 101
-#: kdevdesigner/designer/editfunctionsimpl.cpp:218
-#: kdevdesigner/designer/formfile.cpp:330
-#: kdevdesigner/designer/formfile.cpp:657
-#: kdevdesigner/designer/mainwindow.cpp:2517
-#: kdevdesigner/designer/mainwindow.cpp:2847
-#: kdevdesigner/designer/mainwindowactions.cpp:1129
-#: kdevdesigner/designer/sourcefile.cpp:224
-#: kdevdesigner/designer/sourcefile.cpp:269
-#: kdevdesigner/designer/variabledialogimpl.cpp:105 rc.cpp:4820
+#. i18n: file ./src/settingswidget.ui line 44
+#: rc.cpp:4030
 #, no-c-format
-msgid "&Yes"
-msgstr "是(&Y)"
+msgid "<qt><h3>Project Settings</h3></qt>"
+msgstr "<qt><h3>工程设置</h3></qt>"
 
-#. i18n: file ./parts/uimode/uichooser.ui line 121
-#: rc.cpp:4823
+#. i18n: file ./src/settingswidget.ui line 55
+#: rc.cpp:4033
+#, fuzzy, no-c-format
+msgid "Line wrappin&g"
+msgstr "自动换行(&W)"
+
+#. i18n: file ./src/settingswidget.ui line 58
+#: rc.cpp:4036
 #, no-c-format
-msgid "Toolview Tab Layout"
+msgid ""
+"By default, TDevelop will wrap long lines around in the Messages Output View "
+"window"
 msgstr ""
 
-#. i18n: file ./parts/uimode/uichooser.ui line 124
-#: rc.cpp:4826
+#. i18n: file ./src/settingswidget.ui line 61
+#: rc.cpp:4039
 #, no-c-format
 msgid ""
-"Three different modes for the IDEAl toolview tabs. \"Text and icons\" is the "
-"most informative, but takes a lot of space. Those with a smaller screen will "
-"typically want \"Icons\"."
+"By default, TDevelop will wrap long lines around in the Messages Output View "
+"window so that valuable information will not be easily overlooked. In some "
+"cases this will clutter long message lists. Remove the checkbox mark if you do "
+"not want the lines wrap around."
 msgstr ""
 
-#. i18n: file ./parts/uimode/uichooser.ui line 135
-#: rc.cpp:4829
+#. i18n: file ./src/settingswidget.ui line 77
+#: rc.cpp:4042
 #, no-c-format
-msgid "Icons"
-msgstr "图标"
+msgid "&Compiler output:"
+msgstr "编译器输出(&C)："
 
-#. i18n: file ./parts/uimode/uichooser.ui line 143
-#: rc.cpp:4832
-#, fuzzy, no-c-format
-msgid "Te&xt"
-msgstr "文本"
+#. i18n: file ./src/settingswidget.ui line 86
+#: rc.cpp:4045
+#, no-c-format
+msgid "Very Short"
+msgstr "很短"
 
-#. i18n: file ./parts/uimode/uichooser.ui line 154
-#: rc.cpp:4835
+#. i18n: file ./src/settingswidget.ui line 91
+#: rc.cpp:4048
 #, no-c-format
-msgid "Text and icons"
-msgstr "文本和图标"
+msgid "Short"
+msgstr "短"
 
-#. i18n: file ./parts/uimode/uichooser.ui line 164
-#: rc.cpp:4838
+#. i18n: file ./src/settingswidget.ui line 96
+#: rc.cpp:4051
 #, no-c-format
-msgid "Tabbed Browsing"
-msgstr "标签式浏览"
+msgid "Long"
+msgstr "长"
 
-#. i18n: file ./parts/uimode/uichooser.ui line 167
-#: rc.cpp:4841
+#. i18n: file ./src/settingswidget.ui line 111
+#: rc.cpp:4054
 #, no-c-format
-msgid "Some extra options for the document tabbar."
+msgid "Choose what sort of output you want from the build process"
 msgstr ""
 
-#. i18n: file ./parts/uimode/uichooser.ui line 178
-#: rc.cpp:4844
+#. i18n: file ./src/settingswidget.ui line 117
+#: rc.cpp:4057
 #, no-c-format
-msgid "Open &new tab after current tab"
-msgstr "在当前标签后打开新标签(&N)"
-
-#. i18n: file ./parts/uimode/uichooser.ui line 186
-#: rc.cpp:4847
-#, fuzzy, no-c-format
-msgid "&Show icons on document tabs"
-msgstr "在文档标签上显示图标"
-
-#. i18n: file ./parts/uimode/uichooser.ui line 194
-#: rc.cpp:4850
-#, fuzzy, no-c-format
-msgid "Show close &button in tab bar"
-msgstr "在标签栏上显示关闭按钮"
+msgid ""
+"TDevelop preprocesses the messages the Messages Output View window receives "
+"during the build processes in order to filter superfluous information. You can "
+"control the level of detail TDevelop will display using the dropdown box in "
+"this field. \n"
+"<b>Very Short</b>  Displays only warnings, errors, and the filenames which are "
+"compiled. \n"
+"<b>Short</b>  Suppresses all compiler flags and formats the output to be more "
+"readable. \n"
+"<b>Full</b>  Displays all output messages unmodified."
+msgstr ""
 
-#. i18n: file ./parts/uimode/uichooser.ui line 214
-#: rc.cpp:4853
+#. i18n: file ./src/settingswidget.ui line 127
+#: rc.cpp:4063
 #, no-c-format
-msgid "Note: Changes will take effect after KDevelop is restarted"
-msgstr "注意：更改将会在 KDevelop 重新启动后生效"
+msgid "<qt><h3>Output View Settings</h3></qt>"
+msgstr "<qt><h3>输出视图设置</h3></qt>"
 
-#. i18n: file ./parts/valgrind/dialog_widget.ui line 24
-#: buildtools/autotools/addicondlg.cpp:45
-#: parts/outputviews/appoutputviewpart.cpp:51 rc.cpp:4856 rc.cpp:6128
+#. i18n: file ./src/settingswidget.ui line 149
+#: rc.cpp:4066
 #, no-c-format
-msgid "Application"
-msgstr "应用程序"
+msgid "Default pro&jects directory:"
+msgstr "默认工程目录(&J)："
 
-#. i18n: file ./parts/valgrind/dialog_widget.ui line 87
-#: rc.cpp:4865 rc.cpp:4883
+#. i18n: file ./src/settingswidget.ui line 163
+#: rc.cpp:4069
+#, fuzzy, no-c-format
+msgid "Set the directory where you want your projects in."
+msgstr "选择您的工程所使用的 Qt 版本。"
+
+#. i18n: file ./src/settingswidget.ui line 166
+#: rc.cpp:4072
 #, no-c-format
-msgid "Valgrind"
-msgstr "Valgrind"
+msgid ""
+"By default, TDevelop uses a common parent directory for all new projects. Enter "
+"the absolute path of this common directory in the box or select it from your "
+"directory structure. TDevelop will place the any new project here as a "
+"subdirectory."
+msgstr ""
 
-#. i18n: file ./parts/valgrind/dialog_widget.ui line 98
-#: rc.cpp:4868
+#. i18n: file ./src/settingswidget.ui line 209
+#: rc.cpp:4075
 #, no-c-format
-msgid "Memory &leak check"
-msgstr "内存泄露检查(&L)"
+msgid "Window &font:"
+msgstr "窗口字体(&F)："
 
-#. i18n: file ./parts/valgrind/dialog_widget.ui line 137
-#: rc.cpp:4871
+#. i18n: file ./src/settingswidget.ui line 261
+#: rc.cpp:4078
 #, no-c-format
-msgid "&Show still reachable blocks"
-msgstr "显示仍然可用的内存块(&S)"
+msgid "Use &TDE setting"
+msgstr "使用 TDE 设置(&K)"
 
-#. i18n: file ./parts/valgrind/dialog_widget.ui line 147
-#: rc.cpp:4874 rc.cpp:4892
+#. i18n: file ./src/settingswidget.ui line 267
+#: rc.cpp:4081
 #, no-c-format
-msgid "&Trace children"
-msgstr "跟踪子类(&T)"
+msgid "Use the terminal as set in KControl"
+msgstr "使用 KControl 中设定的终端"
 
-#. i18n: file ./parts/valgrind/dialog_widget.ui line 166
-#: rc.cpp:4877 rc.cpp:4886
+#. i18n: file ./src/settingswidget.ui line 270
+#: rc.cpp:4084
 #, no-c-format
-msgid "Additional p&arameters:"
-msgstr "其它参数(&A)："
+msgid ""
+"If checked, TDevelop will use the default terminal as set in KControl in TDE "
+"components, Component Chooser."
+msgstr ""
 
-#. i18n: file ./parts/valgrind/dialog_widget.ui line 187
-#: rc.cpp:4880 rc.cpp:4889 rc.cpp:6167
+#. i18n: file ./src/settingswidget.ui line 294
+#: rc.cpp:4087
 #, no-c-format
-msgid "E&xecutable:"
-msgstr "可执行文件(&X)："
+msgid "&Other:"
+msgstr "其它(&O)："
 
-#. i18n: file ./parts/valgrind/dialog_widget.ui line 284
-#: rc.cpp:4895
+#. i18n: file ./src/settingswidget.ui line 297
+#: rc.cpp:4090
 #, no-c-format
-msgid "KCachegrind"
-msgstr "KCachegrind"
+msgid "Set a different terminal than the TDE default one"
+msgstr ""
 
-#. i18n: file ./parts/valgrind/dialog_widget.ui line 300
-#: rc.cpp:4898
-#, fuzzy, no-c-format
-msgid "Exe&cutable:"
-msgstr "可执行文件："
+#. i18n: file ./src/settingswidget.ui line 300
+#: rc.cpp:4093
+#, no-c-format
+msgid "Choose some other terminal different from the default one."
+msgstr ""
 
-#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 24
-#: rc.cpp:4901
+#. i18n: file ./src/settingswidget.ui line 320
+#: rc.cpp:4096
 #, no-c-format
-msgid "Code Tooltip"
-msgstr "代码提示"
+msgid "<qt><h3>Terminal Emulation</h3></qt>"
+msgstr "<qt><h3>终端模拟器</h3></qt>"
 
-#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 27
-#: rc.cpp:4904
+#. i18n: file ./src/settingswidget.ui line 365
+#: rc.cpp:4099
 #, no-c-format
 msgid ""
-"If checked, a tooltip will be shown when the mouse is over the bookmark, "
-"containing the text in the area surrounding it. "
-"<p> How many surrounding lines to include is decided by the value in the "
-"context box."
+"<qt>"
+"<h3>UI Designer Integration</h3>This will only be used when no project is "
+"opened. For the project specific setting see Project Options/C++ Specific and "
+"open the Qt tab.</qt>"
 msgstr ""
 
-#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 38
-#: rc.cpp:4907
-#, no-c-format
-msgid "Show code &tooltip"
-msgstr "显示代码提示(&T)"
+#. i18n: file ./src/settingswidget.ui line 399
+#: rc.cpp:4105
+#, fuzzy, no-c-format
+msgid "Start TDevelop own designer embedded within TDevelop"
+msgstr "在 KDevelop 中启动 KDevelop 自带的设计师"
 
-#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 63
-#: rc.cpp:4910
+#. i18n: file ./src/settingswidget.ui line 410
+#: rc.cpp:4111
+#, fuzzy, no-c-format
+msgid "Run TDevelop's &designer as a separate application"
+msgstr "将 KDevelop 的设计器运行为单独的应用程序(&D)"
+
+#. i18n: file ./src/settingswidget.ui line 413
+#: rc.cpp:4114
+#, fuzzy, no-c-format
+msgid "Start TDevelop own designer externally"
+msgstr "在外部启动 KDevelop 自带的设计师"
+
+#. i18n: file ./src/settingswidget.ui line 424
+#: rc.cpp:4120
+#, fuzzy, no-c-format
+msgid "Run &Qt Designer"
+msgstr "运行 Qt 设计师(&G)"
+
+#. i18n: file ./src/settingswidget.ui line 440
+#: rc.cpp:4129
 #, no-c-format
-msgid "&Lines of context:"
-msgstr "上下文所在行(&L)："
+msgid "Directory &navigation messages"
+msgstr "目录导航消息(&N)"
 
-#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 115
-#: rc.cpp:4913
+#. i18n: file ./src/settingswidget.ui line 446
+#: rc.cpp:4135
 #, no-c-format
-msgid "Show Bookmarked Codeline in Bookmark Panel"
-msgstr "在书签面板显示做过书签的代码行"
+msgid "Check this if you want to know what directory make is in"
+msgstr ""
 
-#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 118
-#: rc.cpp:4916
+#. i18n: file ./src/settingswidget.ui line 449
+#: rc.cpp:4138
 #, no-c-format
 msgid ""
-"This decides if the bookmark panel should show the content of the bookmarked "
-"line in addition to the line number."
-"<p>This can be made optional depending on the start of the line, typically used "
-"for only showing lines containing a comment."
+"The make tool usually will display messages like “Entering directory”, or "
+"“Leaving directory” when it switches the directories it currently works in. As "
+"this clutters the messages list in the Messages Output View window, TDevelop "
+"suppresses those messages by default. Mark the checkbox if you want to protocol "
+"which directories make worked in."
 msgstr ""
 
-#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 129
-#: rc.cpp:4919
-#, no-c-format
-msgid "&Never"
-msgstr "从不(&N)"
+#. i18n: file ./src/settingswidget.ui line 497
+#: rc.cpp:4141
+#, fuzzy, no-c-format
+msgid "Force English compiler output"
+msgstr "完整的编译器输出"
 
-#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 151
-#: rc.cpp:4922
+#. i18n: file ./src/settingswidget.ui line 505
+#: rc.cpp:4144
 #, no-c-format
-msgid "&Only lines beginning with the following string:"
-msgstr "仅以以下字符串开头的行(&O)："
+msgid "Use kde language and disable \"jump-to-source\" functionality"
+msgstr ""
 
-#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 189
-#: rc.cpp:4925
+#. i18n: file ./src/generalinfowidgetbase.ui line 16
+#: rc.cpp:4147
 #, no-c-format
-msgid "&Always"
-msgstr "总是(&A)"
+msgid "General Settings"
+msgstr "常规设置"
 
-#. i18n: file ./parts/bookmarks/bookmarks_settings_base.ui line 192
-#: rc.cpp:4928
+#. i18n: file ./src/generalinfowidgetbase.ui line 25
+#: rc.cpp:4150
 #, no-c-format
-msgid "Always show the bookmarked line in addition to the line number"
-msgstr "始终显示除行号外的标记过的行"
+msgid "Absolute Path"
+msgstr "绝对路径"
 
-#. i18n: file ./parts/scripting/scriptingglobalconfigbase.ui line 16
-#: parts/scripting/scriptingpart.cpp:57 rc.cpp:4931
+#. i18n: file ./src/generalinfowidgetbase.ui line 30
+#: rc.cpp:4153
 #, no-c-format
-msgid "Scripting"
-msgstr "脚本"
+msgid "Relative to Project File"
+msgstr "相对于工程文件"
 
-#. i18n: file ./parts/scripting/scriptingglobalconfigbase.ui line 27
-#: rc.cpp:4934
+#. i18n: file ./src/generalinfowidgetbase.ui line 67
+#: rc.cpp:4159
 #, no-c-format
-msgid "Search Custom Directories for Scripts"
-msgstr "搜索自定义目录中的脚本"
+msgid "Project directory:"
+msgstr "工程目录："
 
-#. i18n: file ./parts/scripting/scriptingglobalconfigbase.ui line 41
-#: rc.cpp:4937
+#. i18n: file ./src/generalinfowidgetbase.ui line 115
+#: rc.cpp:4171
 #, no-c-format
 msgid ""
-"<b>NOTE</b> These are directories to search in that are found in your TDE "
-"resource directories.  So if you add the string \"kate/scripts\" to the list "
-"then KScript will look in \"$TDEDIRS/data/kate/scripts\" for scripts.  This "
-"will allow you to get scripts in your home directory as well as system wide "
-"ones."
+"Project Version\n"
+"You may need to run automake & friends to update\n"
+"the version in all files after changing this."
 msgstr ""
 
-#. i18n: file ./editors/editor-chooser/editchooser.ui line 24
-#: rc.cpp:4940
-#, no-c-format
-msgid "&Embedded Editor"
-msgstr "内嵌编辑器(&E)"
-
-#. i18n: file ./editors/editor-chooser/editchooser.ui line 41
-#: rc.cpp:4943
+#. i18n: file ./src/generalinfowidgetbase.ui line 124
+#: rc.cpp:4176
 #, no-c-format
 msgid ""
-"<i>Note:</i> Changing the preferred editor will not affect\n"
-"already open files."
-msgstr "<i>注意：</i> 改变首选的编辑器将不会影响已经打开的文件。"
-
-#. i18n: file ./editors/editor-chooser/editchooser.ui line 51
-#: rc.cpp:4947
-#, no-c-format
-msgid "On External Changes"
-msgstr "外部更改时"
+"Used in templates as $EMAIL$\n"
+"Placed in the AUTHORS file"
+msgstr ""
 
-#. i18n: file ./editors/editor-chooser/editchooser.ui line 57
-#: rc.cpp:4950
+#. i18n: file ./src/generalinfowidgetbase.ui line 133
+#: rc.cpp:4180
 #, no-c-format
 msgid ""
-"<p><b>Action to take when an open file is changed on disk</b></p>\n"
-"<p><b>Do nothing</b> - The file will be marked as externally changed and the "
-"user will be asked to verify any attempt to overwrite it </p>\n"
-"<p><b>Alert the user</b> - A dialog will alert the user that a file has changed "
-"and offer the user to reload the file</p>\n"
-"<p><b>Automatically reload</b> - Any files that are not modified in memory are "
-"reloaded, and an alert is shown for any conflicts</p>"
+"Used in templates as $AUTHOR$\n"
+"Placed in the AUTHORS file"
 msgstr ""
 
-#. i18n: file ./editors/editor-chooser/editchooser.ui line 68
-#: rc.cpp:4956
-#, fuzzy, no-c-format
-msgid "&Do nothing"
-msgstr "不运行"
-
-#. i18n: file ./editors/editor-chooser/editchooser.ui line 82
-#: rc.cpp:4959
-#, fuzzy, no-c-format
-msgid "&Alert the user"
-msgstr "更换用户"
-
-#. i18n: file ./editors/editor-chooser/editchooser.ui line 90
-#: rc.cpp:4962
+#. i18n: file ./src/generalinfowidgetbase.ui line 177
+#: rc.cpp:4184
 #, no-c-format
-msgid "Automatically reload the file &if safe, alert the user if not"
+msgid "Where the project starts."
 msgstr ""
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 38
-#: rc.cpp:4965
+#. i18n: file ./src/generalinfowidgetbase.ui line 189
+#: rc.cpp:4187
 #, no-c-format
-msgid "Graphic Filter"
-msgstr "图形过滤器"
+msgid "Please select a project directory"
+msgstr "请选择一个工程目录"
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 50
-#: rc.cpp:4968
+#. i18n: file ./src/generalinfowidgetbase.ui line 197
+#: rc.cpp:4190
 #, no-c-format
-msgid "Normal mode"
-msgstr "普通模式"
+msgid "Default encoding:"
+msgstr "默认编码："
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 58
-#: rc.cpp:4971
+#. i18n: file ./src/generalinfowidgetbase.ui line 205
+#: rc.cpp:4193
 #, no-c-format
-msgid "TV mode"
-msgstr "TV 模式"
+msgid "Default encoding used when opening text files"
+msgstr "默认编码用于打开文本文件"
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 66
-#: rc.cpp:4974
-#, no-c-format
-msgid "2xSaI"
-msgstr ""
+#. i18n: file ./src/generalinfowidgetbase.ui line 213
+#: rc.cpp:4196
+#, fuzzy, no-c-format
+msgid "Text that stays in the project file."
+msgstr "无法写入工程文件。"
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 74
-#: rc.cpp:4977
-#, no-c-format
-msgid "Super 2xSal"
-msgstr ""
+#. i18n: file ./src/pluginselectdialogbase.ui line 16
+#: rc.cpp:4199
+#, fuzzy, no-c-format
+msgid "Plugin Selection"
+msgstr "插件动作(&P)"
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 82
-#: rc.cpp:4980
+#. i18n: file ./src/pluginselectdialogbase.ui line 27
+#: rc.cpp:4202
+#, fuzzy, no-c-format
+msgid "Plugins:"
+msgstr "插件"
+
+#. i18n: file ./src/pluginselectdialogbase.ui line 51
+#: rc.cpp:4205
 #, no-c-format
-msgid "Super Eagle"
+msgid "Make this the default for this profile:"
 msgstr ""
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 92
-#: rc.cpp:4983
-#, no-c-format
-msgid "GBA binary:"
-msgstr "GBA 执行文件："
+#. i18n: file ./src/pluginselectdialogbase.ui line 59
+#: rc.cpp:4208
+#, fuzzy, no-c-format
+msgid "Save &as Default"
+msgstr "设为默认"
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 105
-#: rc.cpp:4986
+#. i18n: file ./src/profileengine/editor/addprofilewidget.ui line 16
+#: src/profileengine/editor/profileeditor.cpp:237 rc.cpp:4220 rc.cpp:4235
 #, no-c-format
-msgid "Additional parameters:"
-msgstr "其它参数："
+msgid "Add Profile"
+msgstr "添加配置文件"
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 113
-#: rc.cpp:4989
+#. i18n: file ./src/profileengine/editor/addprofilewidget.ui line 73
+#: rc.cpp:4226
 #, no-c-format
-msgid "VisualBoy Advance (emulator):"
-msgstr "VisualBoy Advance (仿真器)："
+msgid "&Generic name:"
+msgstr "通用名称(&G)："
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 157
-#: rc.cpp:4995
-#, no-c-format
-msgid "Scaling"
-msgstr "放大"
+#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 16
+#: rc.cpp:4232
+#, fuzzy, no-c-format
+msgid "Profile Editor for The TDevelop Platform"
+msgstr "KDevelop 平台配置文件编辑器"
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 169
-#: rc.cpp:4998
+#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 132
+#: src/profileengine/editor/profileeditor.cpp:255
+#: src/profileengine/editor/profileeditor.cpp:267 rc.cpp:4244
 #, no-c-format
-msgid "1x"
-msgstr "1x"
+msgid "Remove Profile"
+msgstr "删除配置文件"
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 177
-#: rc.cpp:5001
+#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 212
+#: rc.cpp:4256
 #, no-c-format
-msgid "2x"
-msgstr "2x"
+msgid "Derived properties:"
+msgstr "派生属性："
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 185
-#: rc.cpp:5004
+#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 241
+#: rc.cpp:4259
 #, no-c-format
-msgid "3x"
-msgstr "3x"
+msgid "Own properties:"
+msgstr "自有属性："
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 193
-#: rc.cpp:5007
+#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 258
+#: rc.cpp:4262
 #, no-c-format
-msgid "4x"
-msgstr "4x"
+msgid "Lists of Explicitly Enabled && Disabled Plugins"
+msgstr ""
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 203
-#: rc.cpp:5010
+#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 283
+#: rc.cpp:4265
 #, no-c-format
-msgid "Full screen"
-msgstr "全屏"
+msgid "Enabled:"
+msgstr "已启用："
 
-#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 211
-#: rc.cpp:5013
+#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 289
+#: rc.cpp:4268 rc.cpp:4274
 #, no-c-format
-msgid "Start in external terminal"
-msgstr "在外部终端里启动"
+msgid "Plugin Name"
+msgstr "插件名称"
 
-#. i18n: file ./buildtools/ada/adaproject_optionsdlgbase.ui line 19
-#: buildtools/ada/adaproject_part.cpp:375
-#: buildtools/ada/adaproject_part.cpp:406 rc.cpp:5016
+#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 323
+#: rc.cpp:4271
 #, no-c-format
-msgid "Ada Compiler"
-msgstr "Ada 编译器"
+msgid "Disabled:"
+msgstr "已禁用："
 
-#. i18n: file ./buildtools/ada/adaproject_optionsdlgbase.ui line 64
-#: rc.cpp:5019
+#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 349
+#: rc.cpp:4277 rc.cpp:4280 rc.cpp:8591 rc.cpp:8777
 #, no-c-format
-msgid "Configuration:"
-msgstr "配置："
+msgid "<-"
+msgstr "<-"
 
-#. i18n: file ./buildtools/ada/adaproject_optionsdlgbase.ui line 170
-#: rc.cpp:5031
+#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 430
+#: rc.cpp:4283
 #, no-c-format
-msgid "Compiler &options:"
-msgstr "编译器选项(&O)："
+msgid "Available plugins:"
+msgstr "可用的插件："
 
-#. i18n: file ./buildtools/ada/adaproject_optionsdlgbase.ui line 189
-#: rc.cpp:5034
+#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 447
+#: rc.cpp:4289 rc.cpp:4304
 #, no-c-format
-msgid "Ada &compiler:"
-msgstr "Ada 编译器(&C)："
+msgid "Generic Name"
+msgstr "通用名"
 
-#. i18n: file ./buildtools/ada/adaproject_optionsdlgbase.ui line 223
-#: rc.cpp:5037 rc.cpp:5929
+#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 489
+#: rc.cpp:4292 rc.cpp:4295 rc.cpp:8594 rc.cpp:8780
 #, no-c-format
-msgid "Compiler co&mmand:"
-msgstr "编译器命令(&M)："
+msgid "->"
+msgstr "->"
 
-#. i18n: file ./buildtools/ada/adaproject_optionsdlgbase.ui line 304
-#: rc.cpp:5040 rc.cpp:5935
+#. i18n: file ./src/profileengine/editor/profileeditorbase.ui line 507
+#: rc.cpp:4298
 #, no-c-format
-msgid "Main &source file:"
-msgstr "主源文件(&S)："
+msgid "List of Plugins to Be Loaded"
+msgstr "列出已装入的插件"
 
-#. i18n: file ./buildtools/ada/adaproject_optionsdlgbase.ui line 349
-#: rc.cpp:5043
+#. i18n: file ./kdevdesigner/designer/variabledialog.ui line 41
+#: kdevdesigner/designer/hierarchyview.cpp:1201
+#: kdevdesigner/designer/variabledialogimpl.cpp:103
+#: kdevdesigner/designer/variabledialogimpl.cpp:122 rc.cpp:4310
 #, no-c-format
-msgid "Load Default Compiler Options"
-msgstr "载入默认的编译器选项"
+msgid "Edit Variables"
+msgstr "编辑变量"
 
-#. i18n: file ./buildtools/ant/antoptionswidget.ui line 22
-#: rc.cpp:5046
+#. i18n: file ./kdevdesigner/designer/variabledialog.ui line 56
+#: languages/bash/bashsupport_part.cpp:283
+#: languages/cpp/debugger/variablewidget.cpp:222
+#: languages/kjssupport/kjssupport_part.cpp:384
+#: languages/kjssupport/kjssupport_part.cpp:411
+#: languages/ruby/debugger/variablewidget.cpp:145
+#: parts/classview/classtreebase.cpp:69 rc.cpp:4313 rc.cpp:7318
 #, no-c-format
-msgid "Quiet"
-msgstr "安静"
+msgid "Variable"
+msgstr "变量"
 
-#. i18n: file ./buildtools/ant/antoptionswidget.ui line 27
-#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:38 rc.cpp:5049
+#. i18n: file ./kdevdesigner/designer/variabledialog.ui line 105
+#: rc.cpp:4322
 #, no-c-format
-msgid "Verbose"
-msgstr "详细"
+msgid "Variable Properties"
+msgstr "变量属性"
 
-#. i18n: file ./buildtools/ant/antoptionswidget.ui line 32
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:356
-#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:410 rc.cpp:5052
-#: rc.cpp:5521
+#. i18n: file ./kdevdesigner/designer/variabledialog.ui line 122
+#: rc.cpp:4325
 #, no-c-format
-msgid "Debug"
-msgstr "调试"
+msgid "Acc&ess:"
+msgstr "访问(&E)："
 
-#. i18n: file ./buildtools/ant/antoptionswidget.ui line 78
-#: rc.cpp:5055
+#. i18n: file ./kdevdesigner/designer/variabledialog.ui line 133
+#: rc.cpp:4328
 #, no-c-format
-msgid "&Build file:"
-msgstr "构建文件(&B)："
+msgid "&Variable:"
+msgstr "变量(&V)："
 
-#. i18n: file ./buildtools/ant/antoptionswidget.ui line 89
-#: rc.cpp:5058
+#. i18n: file ./kdevdesigner/designer/variabledialog.ui line 147
+#: kdevdesigner/designer/hierarchyview.cpp:762
+#: kdevdesigner/designer/hierarchyview.cpp:843
+#: kdevdesigner/designer/hierarchyview.cpp:852 rc.cpp:4331 rc.cpp:4840
+#: rc.cpp:5557
 #, no-c-format
-msgid "&Verbosity:"
-msgstr "详细程度(&V)："
+msgid "public"
+msgstr "public"
 
-#. i18n: file ./buildtools/ant/antoptionswidget.ui line 100
-#: rc.cpp:5061 rc.cpp:6263
+#. i18n: file ./kdevdesigner/designer/variabledialog.ui line 152
+#: kdevdesigner/designer/customwidgeteditorimpl.cpp:560
+#: kdevdesigner/designer/hierarchyview.cpp:760
+#: kdevdesigner/designer/hierarchyview.cpp:841
+#: kdevdesigner/designer/hierarchyview.cpp:850 rc.cpp:4334 rc.cpp:4843
+#: rc.cpp:5560
 #, no-c-format
-msgid "&Properties:"
-msgstr "属性(&P)："
+msgid "protected"
+msgstr "protected"
 
-#. i18n: file ./buildtools/ant/antoptionswidget.ui line 112
-#: kdevdesigner/designer/propertyeditor.cpp:2922
-#: parts/partexplorer/partexplorerform.cpp:116 rc.cpp:5064 rc.cpp:6257
-#: rc.cpp:8007
+#. i18n: file ./kdevdesigner/designer/variabledialog.ui line 157
+#: kdevdesigner/designer/hierarchyview.cpp:758
+#: kdevdesigner/designer/hierarchyview.cpp:839
+#: kdevdesigner/designer/hierarchyview.cpp:848 rc.cpp:4337 rc.cpp:5563
 #, no-c-format
-msgid "Property"
-msgstr "属性"
+msgid "private"
+msgstr "private"
 
-#. i18n: file ./buildtools/ant/classpathwidget.ui line 24
-#: rc.cpp:5070
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 41
+#: rc.cpp:4349
 #, no-c-format
-msgid "Class&path"
-msgstr "Class&path"
+msgid "Edit Listbox"
+msgstr "编辑列表框"
 
-#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 16
-#: rc.cpp:5073 rc.cpp:5100
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 47
+#: rc.cpp:4352
 #, no-c-format
-msgid "Viewer"
-msgstr "查看器"
+msgid ""
+"<b>Edit Listbox</b>"
+"<p>Add, edit or delete items in the listbox.</p>"
+"<p>Click the <b>New Item</b>-button to create a new listbox entry, then enter "
+"text and choose a pixmap.</p>"
+"<p>Select an item from the list and click the <b>Delete Item</b>"
+"-button to remove the item from the list.</p>"
+msgstr ""
 
-#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 59
-#: rc.cpp:5076 rc.cpp:5118
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 115
+#: rc.cpp:4361 rc.cpp:4532 rc.cpp:4981 rc.cpp:5044 rc.cpp:5080 rc.cpp:5218
+#: rc.cpp:5593 rc.cpp:5731 rc.cpp:6025 rc.cpp:6226 rc.cpp:6353
 #, no-c-format
-msgid "Add All From Directory"
-msgstr "从目录添加全部"
+msgid "Close the dialog and apply all the changes."
+msgstr "关闭对话框并应用全部更改。"
 
-#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 73
-#: rc.cpp:5079 rc.cpp:5121
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 129
+#: rc.cpp:4367 rc.cpp:4538 rc.cpp:4987 rc.cpp:5224 rc.cpp:6232
 #, no-c-format
-msgid "Choose File to Add..."
-msgstr "选择要添加的文件..."
+msgid "Apply all changes."
+msgstr "应用全部更改。"
 
-#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 137
-#: rc.cpp:5082 rc.cpp:5103
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 143
+#: rc.cpp:4373 rc.cpp:4544 rc.cpp:4993 rc.cpp:5050 rc.cpp:5086 rc.cpp:5230
+#: rc.cpp:5374 rc.cpp:5599 rc.cpp:5737 rc.cpp:6031 rc.cpp:6238 rc.cpp:6359
 #, no-c-format
-msgid "Parse Tree"
-msgstr "分析树"
+msgid "Close the dialog and discard any changes."
+msgstr "关闭对话框并丢弃全部更改。"
 
-#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 157
-#: rc.cpp:5088 rc.cpp:5109
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 153
+#: kdevdesigner/designer/actiondnd.cpp:399 rc.cpp:4376 rc.cpp:4427
 #, no-c-format
-msgid "Value 1"
-msgstr "值 1"
+msgid "Delete Item"
+msgstr "删除项目"
 
-#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 168
-#: rc.cpp:5091 rc.cpp:5112
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 156
+#: rc.cpp:4379 rc.cpp:6103
 #, no-c-format
-msgid "Value 2"
-msgstr "值 2"
+msgid "The list of items."
+msgstr "项目列表。"
 
-#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 179
-#: rc.cpp:5094
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 164
+#: rc.cpp:4382 rc.cpp:4493
 #, no-c-format
-msgid "Value 3"
-msgstr "值 3"
+msgid "&Item Properties"
+msgstr "项目属性(&I)"
 
-#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 199
-#: rc.cpp:5097 rc.cpp:5115
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 181
+#: rc.cpp:4385 rc.cpp:4505 rc.cpp:6145
 #, no-c-format
-msgid "Source to Be Written Back"
-msgstr ""
+msgid "&Pixmap:"
+msgstr "像素图(&P)："
 
-#. i18n: file ./buildtools/lib/widgets/environmentdisplaydialogbase.ui line 16
-#: rc.cpp:5124
-#, fuzzy, no-c-format
-msgid "Environment"
-msgstr "环境变量(&N)："
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 192
+#: rc.cpp:4388 rc.cpp:4508 rc.cpp:5257 rc.cpp:5314 rc.cpp:6076 rc.cpp:6148
+#, no-c-format
+msgid "Label4"
+msgstr "Label4"
 
-#. i18n: file ./buildtools/lib/widgets/environmentdisplaydialogbase.ui line 27
-#: rc.cpp:5127
-#, fuzzy, no-c-format
-msgid "Current Environment"
-msgstr "当前文档"
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 212
+#: rc.cpp:4391 rc.cpp:4511 rc.cpp:5260 rc.cpp:5317 rc.cpp:6079 rc.cpp:6151
+#, no-c-format
+msgid "Delete Pixmap"
+msgstr "删除像素图"
 
-#. i18n: file ./buildtools/lib/widgets/environmentdisplaydialogbase.ui line 36
-#: languages/bash/bashsupport_part.cpp:283
-#: languages/cpp/debugger/variablewidget.cpp:222
-#: languages/kjssupport/kjssupport_part.cpp:384
-#: languages/kjssupport/kjssupport_part.cpp:411
-#: languages/ruby/debugger/variablewidget.cpp:145
-#: parts/classview/classtreebase.cpp:69 rc.cpp:5130 rc.cpp:8831
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 215
+#: rc.cpp:4394 rc.cpp:4514
 #, no-c-format
-msgid "Variable"
-msgstr "变量"
+msgid "Delete the selected item's pixmap."
+msgstr "删除选中项目的像素图。"
 
-#. i18n: file ./buildtools/lib/widgets/subclassesdlgbase.ui line 16
-#: rc.cpp:5139
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 232
+#: rc.cpp:4400 rc.cpp:4520 rc.cpp:4659 rc.cpp:5269 rc.cpp:5326 rc.cpp:6088
+#: rc.cpp:6160
 #, no-c-format
-msgid "Related Subclasses"
-msgstr "相关子类"
+msgid "Select a Pixmap"
+msgstr "选择像素图"
 
-#. i18n: file ./buildtools/lib/widgets/subclassesdlgbase.ui line 30
-#: rc.cpp:5142
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 235
+#: rc.cpp:4403
 #, no-c-format
-msgid "&Add Relation"
-msgstr "添加关系(&A)"
+msgid "Choose a pixmap file for the selected item."
+msgstr "为选中的项目选择像素图文件。"
 
-#. i18n: file ./buildtools/lib/widgets/subclassesdlgbase.ui line 41
-#: rc.cpp:5145
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 243
+#: rc.cpp:4406 rc.cpp:4496 rc.cpp:6058 rc.cpp:6166
 #, no-c-format
-msgid "&Remove Relation"
-msgstr "删除关系(&R)"
+msgid "&Text:"
+msgstr "文本(&T)："
 
-#. i18n: file ./buildtools/lib/widgets/subclassesdlgbase.ui line 96
-#: rc.cpp:5148
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 260
+#: rc.cpp:4409 rc.cpp:4499 rc.cpp:6061
 #, no-c-format
-msgid "Related subclass &location:"
-msgstr "相关子类位置(&L)："
+msgid "Change text"
+msgstr "更改文本"
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 16
-#: buildtools/autotools/autoprojectpart.cpp:225
-#: buildtools/custommakefiles/customprojectpart.cpp:200
-#: buildtools/pascal/pascalproject_part.cpp:403
-#: buildtools/qmake/trollprojectpart.cpp:273
-#: embedded/visualboyadvance/visualboyadvance_part.cpp:71 rc.cpp:5157
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 263
+#: rc.cpp:4412
 #, no-c-format
-msgid "Run Options"
-msgstr "运行选项"
+msgid "Change the selected item's text."
+msgstr "更改选中项目的文本。"
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 35
-#: rc.cpp:5160
-#, fuzzy, no-c-format
-msgid "Main Program"
-msgstr "主程序(&O)"
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 273
+#: rc.cpp:4415 rc.cpp:4475 rc.cpp:6094
+#, no-c-format
+msgid "&New Item"
+msgstr "新建项目(&N)"
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 52
-#: rc.cpp:5163
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 276
+#: rc.cpp:4418 rc.cpp:4478 rc.cpp:6097
 #, no-c-format
-msgid "Note: These options override target specific settings."
-msgstr ""
+msgid "Add an item"
+msgstr "添加项目"
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 58
-#: rc.cpp:5166
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 279
+#: rc.cpp:4421
 #, no-c-format
-msgid ""
-"For Automake and QMake type projects, the proper way to set these options are "
-"per target in the <b>Automake Manager</b> and <b>QMake Manager</b>"
-", respectively."
+msgid "<b>Add a new item.</b><p>New items are appended to the list.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 66
-#: rc.cpp:5169
-#, fuzzy, no-c-format
-msgid "The command line arguments passed to the main program when run"
-msgstr "主程序的命令行参数"
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 287
+#: rc.cpp:4424 rc.cpp:4484 rc.cpp:6043
+#, no-c-format
+msgid "&Delete Item"
+msgstr "删除项目(&D)"
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 74
-#: rc.cpp:5172
-#, fuzzy, no-c-format
-msgid "Run Arg&uments:"
-msgstr "参数(&G)："
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 293
+#: rc.cpp:4430
+#, no-c-format
+msgid "Delete the selected item"
+msgstr "删除选中的项目"
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 85
-#: rc.cpp:5175
-#, fuzzy, no-c-format
-msgid "Executa&ble:"
-msgstr "可执行文件："
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 324
+#: rc.cpp:4433 rc.cpp:5236 rc.cpp:5290 rc.cpp:6115 rc.cpp:6211
+#, no-c-format
+msgid "Move up"
+msgstr "上移"
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 96
-#: rc.cpp:5178
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 327
+#: rc.cpp:4436
 #, fuzzy, no-c-format
-msgid "Full path to the executable"
-msgstr "剔除可执行文件中的符号信息"
+msgid "Moves the selected item up."
+msgstr "去掉所有选中的文件。"
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 104
-#: rc.cpp:5181
-#, fuzzy, no-c-format
-msgid "Debug Ar&guments:"
-msgstr "参数(&G)："
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 341
+#: rc.cpp:4439 rc.cpp:5242 rc.cpp:5296 rc.cpp:6121 rc.cpp:6196
+#, no-c-format
+msgid "Move down"
+msgstr "下移"
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 115
-#: rc.cpp:5184
+#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 344
+#: rc.cpp:4442
 #, fuzzy, no-c-format
-msgid "The command line arguments passed to the main program when debugged"
-msgstr "主程序的命令行参数"
+msgid "Move the selected item down."
+msgstr "去掉所有选中的文件。"
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 123
-#: rc.cpp:5187
-#, fuzzy, no-c-format
-msgid "Working &Directory:"
-msgstr "目录(&D)："
+#. i18n: file ./kdevdesigner/designer/connectiondialog.ui line 41
+#: rc.cpp:4445
+#, no-c-format
+msgid "View & Edit Connections"
+msgstr "查看并编辑连接"
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 134
-#: rc.cpp:5190
+#. i18n: file ./kdevdesigner/designer/connectiondialog.ui line 58
+#: parts/filecreate/filecreate_part.cpp:81 rc.cpp:4448
 #, no-c-format
-msgid "Sets the current working directory for the launched process"
-msgstr ""
+msgid "&New"
+msgstr "新建(&N)"
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 163
-#: rc.cpp:5196
-#, fuzzy, no-c-format
-msgid "Automaticall&y compile before execution"
-msgstr "执行之前自动进行编译(&P)"
+#. i18n: file ./kdevdesigner/designer/connectiondialog.ui line 74
+#: rc.cpp:4451
+#, no-c-format
+msgid "&Connections:"
+msgstr "连接(&C)："
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 166
-#: rc.cpp:5199
-#, fuzzy, no-c-format
-msgid ""
-"If the program is not up-to-date with the source code, compile it before "
-"starting its execution"
-msgstr "如果程序与源代码不同步，在运行前先编译它"
+#. i18n: file ./kdevdesigner/designer/connectiondialog.ui line 129
+#: rc.cpp:4463
+#, no-c-format
+msgid "&Edit Slots..."
+msgstr "编辑槽(&E)..."
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 174
-#: rc.cpp:5202
-#, fuzzy, no-c-format
-msgid "&Automatically install before execution"
-msgstr "执行之前自动进行编译(&P)"
+#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 41
+#: rc.cpp:4466
+#, no-c-format
+msgid "Edit Iconview"
+msgstr "编辑图标视图"
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 185
-#: rc.cpp:5205
+#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 47
+#: rc.cpp:4469
 #, no-c-format
-msgid "Use &tdesu when installing"
+msgid ""
+"<b>Edit Iconview</b>"
+"<p>Add, edit or delete items in the icon view.</p>"
+"<p>Click the <b>New Item</b>-button to create a new item, then enter text and "
+"choose a pixmap.</p>"
+"<p>Select an item from the view and click the <b>Delete Item</b>"
+"-button to remove the item from the iconview.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 196
-#: rc.cpp:5208
-#, fuzzy, no-c-format
-msgid "Start in e&xternal terminal"
-msgstr "在外部终端里启动"
-
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 199
-#: rc.cpp:5211
-#, fuzzy, no-c-format
-msgid "Start the main program in an external terminal"
-msgstr "在外部终端里(如 konsole)启动主程序。"
-
-#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 209
-#: rc.cpp:5214 rc.cpp:5268 rc.cpp:5998 rc.cpp:6053 rc.cpp:6464
+#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 78
+#: rc.cpp:4472
 #, no-c-format
-msgid "Environment &Variables"
-msgstr "环境变量(&V)"
+msgid "All items in the iconview."
+msgstr "图标视图中的全部项目。"
 
-#. i18n: file ./buildtools/lib/widgets/removesubprojectdlgbase.ui line 16
-#: rc.cpp:5217
+#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 106
+#: rc.cpp:4481
 #, no-c-format
-msgid "[REMOVE SUBPROJECT]"
-msgstr "[删除子工程]"
+msgid "Create a new item for the iconview."
+msgstr "在图标视图中创建新项目。"
 
-#. i18n: file ./buildtools/lib/widgets/removesubprojectdlgbase.ui line 42
-#: rc.cpp:5220
+#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 117
+#: rc.cpp:4487 rc.cpp:6046
 #, no-c-format
-msgid "&Information"
-msgstr "信息(&I)"
+msgid "Delete item"
+msgstr "删除项目"
 
-#. i18n: file ./buildtools/lib/widgets/removesubprojectdlgbase.ui line 53
-#: rc.cpp:5223 rc.cpp:6587 rc.cpp:6791
+#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 120
+#: rc.cpp:4490
 #, no-c-format
-msgid "[REMOVE QUESTION]"
-msgstr "[删除的问题]"
+msgid "Delete the selected item."
+msgstr "删除选中的项目。"
 
-#. i18n: file ./buildtools/lib/widgets/removesubprojectdlgbase.ui line 61
-#: rc.cpp:5226 rc.cpp:6590 rc.cpp:6794
+#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 192
+#: rc.cpp:4502
 #, no-c-format
-msgid "Also &remove it from disk"
-msgstr "同时也从磁盘上删除文件(&R)"
+msgid "Change the text for the selected item."
+msgstr "更改选中项目的文本。"
 
-#. i18n: file ./buildtools/lib/widgets/removesubprojectdlgbase.ui line 75
-#: rc.cpp:5229
+#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 268
+#: rc.cpp:4523
 #, no-c-format
-msgid "<b>Note:</b> You will not be able to undo this operation."
-msgstr "<b>注意：</b>您将不能撤消此操作。"
+msgid "Select a pixmap file for the current item."
+msgstr "为当前项目选择像素图。"
 
-#. i18n: file ./buildtools/lib/widgets/environmentvariableswidgetbase.ui line 16
-#: rc.cpp:5238
+#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 41
+#: rc.cpp:4547
 #, no-c-format
-msgid "Environment Variables"
-msgstr "环境变量"
+msgid "Font Properties"
+msgstr "字体属性"
 
-#. i18n: file ./buildtools/lib/widgets/environmentvariableswidgetbase.ui line 111
-#: rc.cpp:5253
+#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 73
+#: kdevdesigner/designer/propertyeditor.cpp:1278 rc.cpp:4550
 #, no-c-format
-msgid "A&dd / Copy"
-msgstr "添加/复制(&D)"
-
-#. i18n: file ./buildtools/lib/widgets/environmentvariableswidgetbase.ui line 136
-#: rc.cpp:5256
-#, fuzzy, no-c-format
-msgid "E&nvironment"
-msgstr "环境变量(&N)："
+msgid "default"
+msgstr "默认"
 
-#. i18n: file ./buildtools/lib/widgets/makeoptionswidgetbase.ui line 16
-#: buildtools/autotools/autoprojectpart.cpp:226
-#: buildtools/qmake/trollprojectpart.cpp:276 rc.cpp:5259 rc.cpp:5971
-#: rc.cpp:6014
+#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 85
+#: rc.cpp:4553
 #, no-c-format
-msgid "Make Options"
-msgstr "Make 选项"
+msgid "&Font:"
+msgstr "字体(&F)："
 
-#. i18n: file ./buildtools/lib/widgets/makeoptionswidgetbase.ui line 27
-#: rc.cpp:5262
+#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 96
+#: rc.cpp:4556
 #, no-c-format
-msgid "&Abort on first error"
-msgstr "遇到第一个错误就中止(&A)"
+msgid "Rel. &size:"
+msgstr "相对大小(&S)："
 
-#. i18n: file ./buildtools/lib/widgets/makeoptionswidgetbase.ui line 35
-#: rc.cpp:5265
+#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 124
+#: rc.cpp:4559
 #, no-c-format
-msgid "Onl&y display commands without actually executing them"
-msgstr "只显示要执行的命令但并不实际执行(&Y)"
+msgid "C&olor:"
+msgstr "颜色(&O)："
 
-#. i18n: file ./buildtools/lib/widgets/makeoptionswidgetbase.ui line 51
-#: rc.cpp:5271
+#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 133
+#: rc.cpp:4562
 #, no-c-format
-msgid "&Name of make executable:"
-msgstr "make 执行文件的名称(&N)："
+msgid "0"
+msgstr "0"
 
-#. i18n: file ./buildtools/lib/widgets/makeoptionswidgetbase.ui line 92
-#: rc.cpp:5274
+#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 138
+#: rc.cpp:4565
 #, no-c-format
-msgid "Num&ber of jobs to run simultaneously:"
-msgstr "同时执行的任务个数(&B)："
+msgid "-4"
+msgstr "-4"
 
-#. i18n: file ./buildtools/lib/widgets/makeoptionswidgetbase.ui line 137
-#: rc.cpp:5277
+#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 143
+#: rc.cpp:4568
 #, no-c-format
-msgid "Run more than one &job at a time"
-msgstr "同时运行多个任务(&J)"
+msgid "-3"
+msgstr "-3"
 
-#. i18n: file ./buildtools/lib/widgets/makeoptionswidgetbase.ui line 145
-#: rc.cpp:5280
+#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 148
+#: rc.cpp:4571
 #, no-c-format
-msgid "Make priority:"
-msgstr "Make 优先级："
+msgid "-2"
+msgstr "-2"
 
-#. i18n: file ./buildtools/qmake/newwidgetdlgbase.ui line 24
-#: rc.cpp:5283
+#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 153
+#: rc.cpp:4574
 #, no-c-format
-msgid "New Widget"
-msgstr "新建部件"
+msgid "-1"
+msgstr "-1"
 
-#. i18n: file ./buildtools/qmake/newwidgetdlgbase.ui line 43
-#: rc.cpp:5289
+#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 158
+#: rc.cpp:4577
 #, no-c-format
-msgid "Widget Properties"
-msgstr "部件属性"
+msgid "+1"
+msgstr "+1"
 
-#. i18n: file ./buildtools/qmake/newwidgetdlgbase.ui line 54
-#: rc.cpp:5292
+#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 163
+#: rc.cpp:4580
 #, no-c-format
-msgid "Subclassing"
-msgstr "子类"
+msgid "+2"
+msgstr "+2"
 
-#. i18n: file ./buildtools/qmake/newwidgetdlgbase.ui line 73
-#: rc.cpp:5295
+#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 168
+#: rc.cpp:4583
 #, no-c-format
-msgid "Caption:"
-msgstr "标题："
+msgid "+3"
+msgstr "+3"
 
-#. i18n: file ./buildtools/qmake/newwidgetdlgbase.ui line 86
-#: rc.cpp:5298
+#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 173
+#: rc.cpp:4586
 #, no-c-format
-msgid "Subclass name:"
-msgstr "子类名："
-
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 16
-#: rc.cpp:5310
-#, fuzzy, no-c-format
-msgid "QMake Manager Options"
-msgstr "QMake 管理器"
+msgid "+4"
+msgstr "+4"
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 29
-#: rc.cpp:5313
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 41
+#: rc.cpp:4595
 #, no-c-format
-msgid ""
-"- Also look into C++/Qt to define the QMake, Qt and Designer paths.\n"
-"- Environment variables that should be resolved during parsing can be set on "
-"the Make Options page.\n"
-"- For changes on this page to take effect the project needs to be reloaded."
-msgstr ""
-
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 45
-#: rc.cpp:5318
-#, fuzzy, no-c-format
-msgid "QMake Project File:"
-msgstr "工程文件(&P)："
+msgid "Edit Custom Widgets"
+msgstr "编辑自定义部件"
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 57
-#: rc.cpp:5321
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 47
+#: rc.cpp:4598
 #, no-c-format
 msgid ""
-"This is the top level qmake project file, from which the project manager will "
-"be populated.\n"
-"Leave this empty to automatically search for a .pro file in the project "
-"directory."
+"<b>Edit Custom Widgets</b>"
+"<p>Add or delete custom widgets from <i>Qt Designer</i>"
+"'s database, and edit the properties of existing widgets.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 70
-#: rc.cpp:5325
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 64
+#: rc.cpp:4601
 #, no-c-format
-msgid "Behaviour on Subproject Change"
+msgid "The list of all custom widgets known to Qt Designer."
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 81
-#: rc.cpp:5328
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 72
+#: rc.cpp:4604
 #, no-c-format
-msgid ""
-"The following settings determine what the project configuration dialog should "
-"do when another subproject is selected while the dialog is still open."
-msgstr ""
-
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 92
-#: rc.cpp:5331
-#, fuzzy, no-c-format
-msgid "&Always Save"
-msgstr "总是(&A)"
+msgid "&New Widget"
+msgstr "新建部件(&N)"
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 95
-#: rc.cpp:5334
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 75
+#: rc.cpp:4607
 #, no-c-format
-msgid "Always save the configuration when changing the project."
-msgstr ""
+msgid "Add new custom widget."
+msgstr "添加新的自定义部件。"
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 98
-#: rc.cpp:5337
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 78
+#: rc.cpp:4610
 #, no-c-format
 msgid ""
-"Always save the project configuration when selecting a another sub project."
+"<b>Create an empty custom widget and add it to the list.</b>"
+"<p>New custom widgets have a default name and header file, which must both be "
+"changed to appropriate values.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 106
-#: rc.cpp:5340
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 86
+#: rc.cpp:4613
 #, no-c-format
-msgid "&Never Save (!Warning: This can lead to loss of setting changes)"
-msgstr ""
+msgid "&Delete Widget"
+msgstr "删除部件(&D)"
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 109
-#: rc.cpp:5343
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 89
+#: rc.cpp:4616
 #, no-c-format
-msgid "Never save the configuration when changing the project."
-msgstr ""
+msgid "Delete custom widget"
+msgstr "删除自定义部件"
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 112
-#: rc.cpp:5346
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 92
+#: rc.cpp:4619
 #, no-c-format
 msgid ""
-"Never save the project configuration when selecting a another sub project."
-msgstr ""
-
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 120
-#: rc.cpp:5349
-#, no-c-format
-msgid "As&k"
+"<b>Delete the selected custom widget.</b>"
+"<p>You can only delete widgets that are not used in any open form.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 126
-#: rc.cpp:5352
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 148
+#: rc.cpp:4628
 #, no-c-format
-msgid ""
-"Ask wether the configuration should be saved when switching the project."
-msgstr ""
+msgid "Closes the Dialog."
+msgstr "关闭对话框。"
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 129
-#: rc.cpp:5355
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 175
+#: rc.cpp:4631
 #, no-c-format
-msgid ""
-"Always ask wether the configuration should be saved when selecting another "
-"subproject.."
-msgstr ""
+msgid "&Load Descriptions..."
+msgstr "装入描述(&L)..."
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 147
-#: rc.cpp:5358
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 178
+#: rc.cpp:4634
 #, no-c-format
-msgid "Repla&ce File Paths with matching Variables when adding files"
-msgstr ""
+msgid "Loads widget description file"
+msgstr "装入部件描述文件"
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 153
-#: rc.cpp:5361
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 182
+#: rc.cpp:4637
 #, no-c-format
 msgid ""
-"This replaces the relative paths of added files with existing custom variables "
-"if the value assigned to it is the same as the path."
+"<b>Load Descriptions</b>"
+"<p>Loads a file which contains descriptions of custom widgets, so that these "
+"custom widgets can be used in the Qt Designer.</p>\n"
+"<p>Since it is a lot of work to type in all the information for custom widgets, "
+"you should consider using the tqtcreatecw tool which is in "
+"$QTDIR/tools/designer/tools/tqtcreatecw. Using tqtcreatecw you can create "
+"custom widget description files for your custom widgets without the need to "
+"type in all the information manually. For more information about the README "
+"file in the tqtcreatecw directory</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 161
-#: rc.cpp:5364
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 190
+#: rc.cpp:4641
 #, no-c-format
-msgid "Show variables in filenames in the QMake projectmanager view."
-msgstr ""
+msgid "&Save Descriptions..."
+msgstr "保存描述(&S)..."
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 169
-#: rc.cpp:5367
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 193
+#: rc.cpp:4644
 #, no-c-format
-msgid ""
-"Display only filenames in the QMake Manager (Project reload is needed after "
-"changing this setting)"
-msgstr ""
+msgid "Saves widget description file"
+msgstr "保存部件描述文件"
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 178
-#: rc.cpp:5370
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 196
+#: rc.cpp:4647
 #, no-c-format
 msgid ""
-"Do not use the QMake Default Options\n"
-"This disables the reading of any .qmake.cache files or mkspecs."
+"<b>Save Descriptions</b>"
+"<p>Saves all the descriptions of the shown custom widgets to a file which can "
+"then be used to import the custom widgets elsewhere."
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 186
-#: rc.cpp:5374
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 204
+#: rc.cpp:4650
 #, no-c-format
-msgid "Show parse error in message box"
+msgid "Change the properties of the selected custom widget."
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 16
-#: rc.cpp:5377
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 211
+#: rc.cpp:4653
 #, no-c-format
-msgid "Create Scope"
-msgstr "创建范围"
-
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 35
-#: rc.cpp:5380
-#, fuzzy, no-c-format
-msgid "Scopetype:"
-msgstr "纸张类型"
-
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 41
-#: rc.cpp:5383
-#, fuzzy, no-c-format
-msgid "Simple Scope"
-msgstr "删除范围"
-
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 46
-#: rc.cpp:5386
-#, fuzzy, no-c-format
-msgid "Function Scope"
-msgstr "函数"
-
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 51
-#: rc.cpp:5389
-#, fuzzy, no-c-format
-msgid "Include File"
-msgstr "转到头文件：%1"
+msgid "De&finition"
+msgstr "定义(&F)"
 
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 58
-#: rc.cpp:5392
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 262
+#: rc.cpp:4662
 #, no-c-format
-msgid "Choose between the different types of new scopes"
+msgid ""
+"<b>Select a pixmap file.</b>"
+"<p>The pixmap will be used to represent the widget in forms.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 85
-#: buildtools/qmake/trollprojectwidget.cpp:1061 rc.cpp:5395
-#, fuzzy, no-c-format
-msgid "Scope Settings"
-msgstr "片断设置"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 286
+#: rc.cpp:4665
+#, no-c-format
+msgid "Enter filename"
+msgstr "输入文件名"
 
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 111
-#: rc.cpp:5398
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 289
+#: rc.cpp:4668
 #, no-c-format
-msgid "Specify the new scope name"
+msgid ""
+"<b>Change the header file's name for the selected custom widget.</b>"
+"<p>The header file will be included by forms using the widget.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 119
-#: rc.cpp:5401
-#, fuzzy, no-c-format
-msgid "Scopename:"
-msgstr "类型名称："
-
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 148
-#: rc.cpp:5404
-#, fuzzy, no-c-format
-msgid "Function:"
-msgstr "函数(&U)："
-
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 154
-#: rc.cpp:5407
-#, fuzzy, no-c-format
-msgid "Specify the function name"
-msgstr "更改函数名称"
-
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 162
-#: rc.cpp:5410
-#, fuzzy, no-c-format
-msgid "Arguments:"
-msgstr "参数(&G)："
-
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 168
-#: rc.cpp:5413
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 306
+#: rc.cpp:4674
 #, no-c-format
-msgid "Specify the list of function arguments, delimited by a comma"
-msgstr ""
+msgid "Choose headerfile"
+msgstr "选择头文件"
 
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 197
-#: rc.cpp:5416
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 309
+#: rc.cpp:4677
 #, no-c-format
-msgid "*.pri"
+msgid "Look for the header file using a file dialog."
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 203
-#: rc.cpp:5419
-#, fuzzy, no-c-format
-msgid "Choose the .pri file to include"
-msgstr "选择要检查的溃核文件..."
-
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 211
-#: rc.cpp:5422
-#, fuzzy, no-c-format
-msgid "Include File:"
-msgstr "转到头文件：%1"
-
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 222
-#: rc.cpp:5425
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 327
+#: rc.cpp:4686
 #, no-c-format
-msgid "&use !include instead of include"
-msgstr ""
+msgid "Select access"
+msgstr "选择访问"
 
-#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 225
-#: rc.cpp:5428
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 330
+#: rc.cpp:4689
 #, no-c-format
-msgid "Use !include instead of include for the function scope"
+msgid ""
+"<b>Change how the include file will be included.</b>"
+"<p>Global include files will be included using &lt;&gt;-brackets, while local "
+"files will included using quotation marks.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 25
-#: rc.cpp:5437
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 340
+#: rc.cpp:4692
 #, no-c-format
-msgid "QMake Subproject Configuration"
-msgstr "QMake 子工程设置"
+msgid "Change classname"
+msgstr "更改类名"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 90
-#: kdevdesigner/designer/multilineeditorimpl.cpp:101 rc.cpp:5449
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 343
+#: rc.cpp:4695
 #, no-c-format
-msgid "Basics"
-msgstr "基本"
+msgid ""
+"<b>Enter the classname for the selected custom widget.</b>"
+"<p>A class of that name must be defined in the header file.</p>"
+msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 112
-#: rc.cpp:5455
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 351
+#: rc.cpp:4698
 #, no-c-format
-msgid "Librar&y"
-msgstr "库(&Y)"
+msgid "Heade&rfile:"
+msgstr "头文件(&R)："
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 115
-#: rc.cpp:5458
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 362
+#: rc.cpp:4701
 #, no-c-format
-msgid "Create a library"
-msgstr "创建一个库"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 123
-#: rc.cpp:5461
-#, fuzzy, no-c-format
-msgid "&Subdirectories"
-msgstr "子目录(&U)"
+msgid "Cl&ass:"
+msgstr "类(&A)："
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 126
-#: rc.cpp:5464
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 373
+#: rc.cpp:4704 rc.cpp:5278 rc.cpp:5311
 #, no-c-format
-msgid "This project holds subdirectories"
-msgstr "这个工程含有子目录"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 137
-#: rc.cpp:5467
-#, fuzzy, no-c-format
-msgid "Ordered"
-msgstr "首选"
+msgid "Pixmap:"
+msgstr "像素图："
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 140
-#: rc.cpp:5470
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 381
+#: rc.cpp:4707
 #, no-c-format
-msgid "Build the subprojects in the order they are listed in the .pro file"
-msgstr ""
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 168
-#: rc.cpp:5473
-#, fuzzy, no-c-format
-msgid "A&pplication"
-msgstr "应用程序"
+msgid "Si&ze hint:"
+msgstr "大小提示(&Z)："
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 171
-#: rc.cpp:5476
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 392
+#: rc.cpp:4710
 #, no-c-format
-msgid "Create an application"
-msgstr "创建一个应用程序"
+msgid "Size p&olicy:"
+msgstr "大小策略(&O)："
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 181
-#: rc.cpp:5479
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 401
+#: lib/widgets/propeditor/propertymachinefactory.cpp:147 rc.cpp:4713
+#: rc.cpp:4749
 #, no-c-format
-msgid "Target"
-msgstr "目标"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 192
-#: rc.cpp:5482
-#, fuzzy, no-c-format
-msgid "Path:"
-msgstr "路径(&P)："
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 203
-#: rc.cpp:5485
-#, fuzzy, no-c-format
-msgid "Output file:"
-msgstr "输出文件(&F)："
+msgid "Fixed"
+msgstr "固定"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 226
-#: rc.cpp:5488
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 406
+#: lib/widgets/propeditor/propertymachinefactory.cpp:148 rc.cpp:4716
+#: rc.cpp:4752
 #, no-c-format
-msgid "Target Installation"
-msgstr "目标安装"
+msgid "Minimum"
+msgstr "最小"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 242
-#: rc.cpp:5491
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 411
+#: lib/widgets/propeditor/propertymachinefactory.cpp:149 rc.cpp:4719
+#: rc.cpp:4755
 #, no-c-format
-msgid "I&nstall"
-msgstr "安装(&N)"
+msgid "Maximum"
+msgstr "最大"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 250
-#: rc.cpp:5494
-#, fuzzy, no-c-format
-msgid "Installation path:"
-msgstr "安装路径(&I)："
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 416
+#: lib/widgets/propeditor/propertymachinefactory.cpp:150 rc.cpp:4722
+#: rc.cpp:4758
+#, no-c-format
+msgid "Preferred"
+msgstr "首选"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 263
-#: rc.cpp:5497
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 421
+#: rc.cpp:4725 rc.cpp:4761
 #, fuzzy, no-c-format
-msgid "Makefile"
-msgstr "&Makefile"
+msgid "MinimumExpanding"
+msgstr "展开目录"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 284
-#: rc.cpp:5500
-#, fuzzy, no-c-format
-msgid "Arguments"
-msgstr "参数(&G)"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 426
+#: lib/widgets/propeditor/propertymachinefactory.cpp:151 rc.cpp:4728
+#: rc.cpp:4764
+#, no-c-format
+msgid "Expanding"
+msgstr "展开"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 295
-#: rc.cpp:5503
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 433
+#: rc.cpp:4731
 #, fuzzy, no-c-format
-msgid "Run arguments:"
-msgstr "参数(&G)："
+msgid "Vertical Sizepolicy"
+msgstr "服务类型(&T)"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 313
-#: rc.cpp:5506
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 436
+#: rc.cpp:4734
 #, fuzzy, no-c-format
-msgid "Debug Arguments:"
-msgstr "参数(&G)："
+msgid "Choose theQt::Vertical size policy"
+msgstr "服务类型(&T)"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 366
-#: rc.cpp:5515
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 453
+#: rc.cpp:4737
 #, no-c-format
-msgid "Build Mode"
-msgstr "构建方式"
+msgid "Size hint width"
+msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 372
-#: rc.cpp:5518 rc.cpp:5530
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 456
+#: rc.cpp:4740 rc.cpp:4746
 #, no-c-format
-msgid "Set project to be built in release mode"
-msgstr "设置工程编译为发行版本"
+msgid ""
+"<b>Set the size hint for the selected widget.</b>"
+"<p>The size hint provides the recommended size for the widget. Enter a sizehint "
+"of -1/-1 if no size is recommended.</p>"
+msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 394
-#: rc.cpp:5524
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 473
+#: rc.cpp:4743
 #, no-c-format
-msgid "Set project to be built in debug mode"
-msgstr "设置工程编译为调试版本"
+msgid "Size hint height"
+msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 402
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:355
-#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:409 rc.cpp:5527
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 514
+#: rc.cpp:4767
 #, no-c-format
-msgid "Release"
-msgstr "发布版本号"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 416
-#: rc.cpp:5533
-#, fuzzy, no-c-format
-msgid "Debug && Release"
-msgstr "发行版(&R)"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 422
-#: rc.cpp:5536
-#, fuzzy, no-c-format
-msgid "Set project to be built in debug_and_release mode"
-msgstr "设置工程编译为发行版本"
+msgid "Horizontal Sizepolicy"
+msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 440
-#: rc.cpp:5539
-#, fuzzy, no-c-format
-msgid "Enable warnings"
-msgstr "打开警告(&W)"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 517
+#: rc.cpp:4770
+#, no-c-format
+msgid "Choose the horizontal size policy for the widget"
+msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 443
-#: rc.cpp:5542
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 542
+#: rc.cpp:4773
 #, no-c-format
-msgid "Show compiler warnings"
-msgstr "显示编译器警告"
+msgid "Con&tainer widget"
+msgstr "容器部件(&T)"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 454
-#: rc.cpp:5545
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 545
+#: rc.cpp:4776
 #, no-c-format
-msgid "Build All"
-msgstr "全部构建"
+msgid "Container Widget"
+msgstr "容器部件"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 457
-#: rc.cpp:5548
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 549
+#: rc.cpp:4779
 #, no-c-format
-msgid "Builds Debug and Release version if Debug&Release is configured"
+msgid ""
+"<p><b>Container Widget</b></p>\n"
+"<p>If this custom widget is able to contain other widgets (children), check "
+"this checkbox.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 469
-#: rc.cpp:5551
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 559
+#: rc.cpp:4783
 #, no-c-format
-msgid "Requirements"
-msgstr "需要"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 480
-#: rc.cpp:5554 rc.cpp:5617
-#, fuzzy, no-c-format
-msgid "OpenGL"
-msgstr "Open&GL"
+msgid "Si&gnals"
+msgstr "信号(&N)"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 483
-#: rc.cpp:5557
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 576
+#: rc.cpp:4786
 #, no-c-format
-msgid "Requires the OpenGL (or Mesa) headers/libraries"
-msgstr "需要 OpenGL(或 Mesa)头文件和库"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 491
-#: rc.cpp:5560
-#, fuzzy, no-c-format
-msgid "STL"
-msgstr "&STL"
+msgid "The list of all the Q_SIGNALS that the selected widget can emit."
+msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 499
-#: parts/valgrind/valgrind_widget.cpp:96 rc.cpp:5563
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 615
+#: rc.cpp:4789
 #, no-c-format
-msgid "Thread"
-msgstr "线程"
+msgid "N&ew Signal"
+msgstr "新建信号(&E)"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 502
-#: rc.cpp:5566
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 621
+#: rc.cpp:4792
 #, no-c-format
-msgid "Requires support for multi-threaded application or library."
-msgstr "需要对多线程程序的支持或库。"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 510
-#: rc.cpp:5569
-#, fuzzy, no-c-format
-msgid "Qt"
-msgstr "&Qt"
+msgid "Add new signal"
+msgstr "添加新信号"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 513
-#: rc.cpp:5572
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 624
+#: rc.cpp:4795
 #, no-c-format
-msgid "Requires the Qt header files/library"
-msgstr "需要 Qt 头文件和库"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 521
-#: rc.cpp:5575
-#, fuzzy, no-c-format
-msgid "X11"
-msgstr "X&11"
+msgid ""
+"<b>Add a new signal for the current custom widget.</b>"
+"<p>An argument list should be provided in the signal's name, and the name must "
+"be unique.</p>"
+msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 524
-#: rc.cpp:5578 rc.cpp:5668
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 632
+#: rc.cpp:4798
 #, no-c-format
-msgid "Support required for X11 application or library"
-msgstr "需要对 X11 程序的支持或库"
+msgid "Dele&te Signal"
+msgstr "删除信号(&T)"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 532
-#: rc.cpp:5581
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 638
+#: rc.cpp:4801
 #, no-c-format
-msgid "Precompiled headers"
-msgstr "预编译头文件"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 540
-#: rc.cpp:5584
-#, fuzzy, no-c-format
-msgid "RTTI"
-msgstr "RTT&I"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 548
-#: rc.cpp:5587
-#, fuzzy, no-c-format
-msgid "Windows"
-msgstr "窗口"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 556
-#: rc.cpp:5590
-#, fuzzy, no-c-format
-msgid "Custom Configuration"
-msgstr "构建配置"
+msgid "Delete signal"
+msgstr "删除信号"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 564
-#: rc.cpp:5593
-#, fuzzy, no-c-format
-msgid "Exceptions "
-msgstr "例外(&X)"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 641
+#: rc.cpp:4804
+#, no-c-format
+msgid ""
+"<b>Delete the signal.</b>"
+"<p>All connections using this signal will also be deleted.</p>"
+msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 580
-#: rc.cpp:5596
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 665
+#: rc.cpp:4807
 #, no-c-format
-msgid "Console"
-msgstr "控制台"
+msgid "S&ignal:"
+msgstr "信号(&I)："
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 586
-#: rc.cpp:5599
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 676
+#: rc.cpp:4810
 #, no-c-format
-msgid "Check to build a win32 console app"
+msgid "Change signal name"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 599
-#: rc.cpp:5602
-#, fuzzy, no-c-format
-msgid "Qt4 Libraries"
-msgstr "库"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 610
-#: rc.cpp:5605
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 679
+#: rc.cpp:4813 rc.cpp:4834
 #, no-c-format
-msgid "Gui"
+msgid ""
+"<b>Change the name of the selected slot.</b>"
+"<p>An argument list should be provided in the signal's name, and the name must "
+"be unique.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 621
-#: parts/doxygen/messages.cpp:202 rc.cpp:5608
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 691
+#: rc.cpp:4816
 #, no-c-format
-msgid "XML"
-msgstr "XML"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 629
-#: rc.cpp:5611
-#, fuzzy, no-c-format
-msgid "Network"
-msgstr "新建"
+msgid "S&lots"
+msgstr "槽(&L)"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 637
-#: src/profileengine/editor/profileeditor.cpp:137 rc.cpp:5614
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 706
+#: kdevdesigner/designer/connectiontable.cpp:41
+#: parts/classview/classtreebase.cpp:75 rc.cpp:4819
 #, no-c-format
-msgid "Core"
-msgstr "核心"
+msgid "Slot"
+msgstr "槽"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 656
-#: rc.cpp:5620
-#, fuzzy, no-c-format
-msgid "QtUiTools"
-msgstr "工具"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 736
+#: rc.cpp:4825
+#, no-c-format
+msgid "The list of all the custom widget's slots."
+msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 664
-#: languages/sql/sqlsupport_part.cpp:59 rc.cpp:5623
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 744
+#: rc.cpp:4828
 #, no-c-format
-msgid "SQL"
-msgstr "SQL"
+msgid "Sl&ot:"
+msgstr "槽(&O)："
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 672
-#: rc.cpp:5626
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 755
+#: rc.cpp:4831
 #, no-c-format
-msgid "SVG"
-msgstr ""
+msgid "Change slot name"
+msgstr "更改槽名称"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 680
-#: rc.cpp:5629
-#, fuzzy, no-c-format
-msgid "QtTest"
-msgstr "测试(&T)"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 766
+#: rc.cpp:4837 rc.cpp:5554
+#, no-c-format
+msgid "&Access:"
+msgstr "访问(&A)："
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 688
-#: rc.cpp:5632
-#, fuzzy, no-c-format
-msgid "Qt3 Support"
-msgstr "C++ 支持"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 787
+#: rc.cpp:4846
+#, no-c-format
+msgid "Change slot access"
+msgstr "更改槽访问"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 696
-#: rc.cpp:5635
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 790
+#: rc.cpp:4849
 #, no-c-format
-msgid "QDBus (Qt4.2)"
+msgid ""
+"<b>Change the slot's access policy.</b>"
+"<p>You can only connect to the widget's public Q_SLOTS.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 704
-#: rc.cpp:5638
-#, fuzzy, no-c-format
-msgid "QtAssistant"
-msgstr "KDevelop 助手"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 829
+#: rc.cpp:4852
+#, no-c-format
+msgid "N&ew Slot"
+msgstr "新建槽(&E)"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 712
-#: rc.cpp:5641
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 835
+#: rc.cpp:4855
 #, no-c-format
-msgid "QtScript (Qt4.3)"
-msgstr ""
+msgid "Add new slot"
+msgstr "添加新槽"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 720
-#: rc.cpp:5644
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 838
+#: rc.cpp:4858
 #, no-c-format
-msgid "QtWebKit (Qt4.4)"
+msgid ""
+"<b>Add a new slot to the current custom widget.</b>"
+"<p>An argument list should be provided in the signal's name, and the name must "
+"be unique.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 728
-#: rc.cpp:5647
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 846
+#: rc.cpp:4861
 #, no-c-format
-msgid "QtXmlPatterns (Qt4.4)"
-msgstr ""
+msgid "Dele&te Slot"
+msgstr "删除槽(&T)"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 736
-#: rc.cpp:5650
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 852
+#: rc.cpp:4864
 #, no-c-format
-msgid "Phonon (Qt4.4)"
-msgstr ""
+msgid "Delete slot"
+msgstr "删除槽"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 744
-#: rc.cpp:5653
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 855
+#: rc.cpp:4867
 #, no-c-format
-msgid "QtHelp (Qt4.4)"
+msgid ""
+"<b>Delete the slot.</b>"
+"<p>All connections using this slot will also be deleted.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 754
-#: rc.cpp:5656
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 867
+#: rc.cpp:4870
 #, no-c-format
-msgid "Library Options"
-msgstr "库选项"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 776
-#: rc.cpp:5659
-#, fuzzy, no-c-format
-msgid "Build as static library"
-msgstr "静态库(&A)"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 801
-#: rc.cpp:5665
-#, fuzzy, no-c-format
-msgid "Make libtool archive"
-msgstr "制作 libtool 存档(&K)"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 839
-#: rc.cpp:5671
-#, fuzzy, no-c-format
-msgid "Build as shared library"
-msgstr "共享库(&H)"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 850
-#: rc.cpp:5674
-#, fuzzy, no-c-format
-msgid "Designer Plugin"
-msgstr "禁用插件"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 869
-#: rc.cpp:5677
-#, fuzzy, no-c-format
-msgid "Library version:"
-msgstr "库版本(&Y)："
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 910
-#: rc.cpp:5680
-#, fuzzy, no-c-format
-msgid "Includes"
-msgstr "包含(&I)"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 932
-#: rc.cpp:5683 rc.cpp:5704 rc.cpp:5725 rc.cpp:5743 rc.cpp:5752 rc.cpp:5764
-#: rc.cpp:5782 rc.cpp:5791 rc.cpp:5854
-#, fuzzy, no-c-format
-msgid "Move Up"
-msgstr "上移(&U)"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 940
-#: rc.cpp:5686 rc.cpp:5707 rc.cpp:5728 rc.cpp:5746 rc.cpp:5755 rc.cpp:5767
-#: rc.cpp:5785 rc.cpp:5794 rc.cpp:5857
-#, fuzzy, no-c-format
-msgid "Move Down"
-msgstr "下移(&N)"
+msgid "&Properties"
+msgstr "属性(&P)"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 965
-#: rc.cpp:5689
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 915
+#: rc.cpp:4873
 #, no-c-format
-msgid "Directories Outside Project"
-msgstr "工程外的目录"
+msgid "N&ew Property"
+msgstr "新建属性(&E)"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 984
-#: rc.cpp:5692
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 921
+#: rc.cpp:4876
 #, no-c-format
-msgid "Directories Inside Project"
-msgstr "工程内的目录"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1013
-#: rc.cpp:5695 rc.cpp:5716 rc.cpp:5734 rc.cpp:5773
-#, fuzzy, no-c-format
-msgid "Add..."
-msgstr "添加(&A)..."
+msgid "Add new property"
+msgstr "添加新属性"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1074
-#: rc.cpp:5710
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 924
+#: rc.cpp:4879
 #, no-c-format
-msgid "Libraries"
-msgstr "库"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1091
-#: rc.cpp:5713
-#, fuzzy, no-c-format
-msgid "External Library Dirs"
-msgstr "外部库"
+msgid ""
+"<b>Add a new property to the current custom widget.</b>"
+"<p>The properties must be implemented in the class using Qt's property "
+"system.</p>"
+msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1187
-#: rc.cpp:5731
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 932
+#: rc.cpp:4882
 #, no-c-format
-msgid "External Libraries"
-msgstr "外部库"
+msgid "Dele&te Property"
+msgstr "删除属性(&T)"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1283
-#: rc.cpp:5749
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 938
+#: rc.cpp:4885
 #, no-c-format
-msgid "Link Convenience Libraries Inside Project"
-msgstr "连接工程之内的库"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1351
-#: rc.cpp:5758
-#, fuzzy, no-c-format
-msgid "Dependencies"
-msgstr "依赖关系(&D)"
+msgid "Delete property"
+msgstr "删除属性"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1368
-#: rc.cpp:5761
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 941
+#: rc.cpp:4888
 #, no-c-format
-msgid "Targets in Project"
-msgstr "工程内的目标"
+msgid "Deletes the selected property."
+msgstr "删除选中属性。"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1443
-#: rc.cpp:5770
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 949
+#: rc.cpp:4891
 #, no-c-format
-msgid "Miscellaneous Targets"
-msgstr "杂项目标"
+msgid "String"
+msgstr "String"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1539
-#: rc.cpp:5788
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 954
+#: rc.cpp:4894
 #, no-c-format
-msgid "Order in Which Sub Projects Are Built"
-msgstr "构建子工程的顺序"
+msgid "CString"
+msgstr "CString"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1610
-#: buildtools/custommakefiles/customprojectpart.cpp:203 rc.cpp:5797
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 959
+#: rc.cpp:4897
 #, no-c-format
-msgid "Build Options"
-msgstr "编译选项"
+msgid "StringList"
+msgstr "StringList"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1629
-#: rc.cpp:5800
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 964
+#: rc.cpp:4900
 #, no-c-format
-msgid "Compiler Options"
-msgstr "编译器选项"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1656
-#: rc.cpp:5803
-#, fuzzy, no-c-format
-msgid "Debug flags:"
-msgstr "调试版标志(&D)："
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1667
-#: rc.cpp:5806
-#, fuzzy, no-c-format
-msgid "Release flags:"
-msgstr "发行版编译选项(&R)："
+msgid "Bool"
+msgstr "Bool"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1678
-#: rc.cpp:5809
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 969
+#: rc.cpp:4903
 #, no-c-format
-msgid "Defines:"
-msgstr "定义："
+msgid "Int"
+msgstr "Int"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1717
-#: rc.cpp:5812
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 974
+#: rc.cpp:4906
 #, no-c-format
-msgid "Intermediate File Directories"
-msgstr "中间文件目录"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1736
-#: rc.cpp:5815
-#, fuzzy, no-c-format
-msgid "MOC files:"
-msgstr "MOC 文件(&M)："
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1747
-#: rc.cpp:5818
-#, fuzzy, no-c-format
-msgid "UI files:"
-msgstr "UI 文件(&U)："
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1758
-#: rc.cpp:5821
-#, fuzzy, no-c-format
-msgid "Object files:"
-msgstr "目标文件(&J)："
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1772
-#: rc.cpp:5824
-#, fuzzy, no-c-format
-msgid "RCC files:"
-msgstr "MOC 文件(&M)："
+msgid "UInt"
+msgstr "UInt"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1817
-#: rc.cpp:5827
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 984
+#: rc.cpp:4912
 #, no-c-format
-msgid "Corba"
-msgstr "Corba"
-
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1831
-#: rc.cpp:5830
-#, fuzzy, no-c-format
-msgid "Compiler options:"
-msgstr "编译器选项(&T)："
+msgid "Color"
+msgstr "颜色"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1852
-#: rc.cpp:5833
-#, fuzzy, no-c-format
-msgid "IDL compiler:"
-msgstr "IDL 编译器(&I)："
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 989
+#: rc.cpp:4915
+#, no-c-format
+msgid "Rect"
+msgstr "矩形"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1884
-#: rc.cpp:5836
-#, fuzzy, no-c-format
-msgid "Custom Variables"
-msgstr "自定义变量(&V)"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 994
+#: rc.cpp:4918
+#, no-c-format
+msgid "Point"
+msgstr "点"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1912
-#: rc.cpp:5842 rc.cpp:5863
-#, fuzzy, no-c-format
-msgid "Operator"
-msgstr "操作"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 999
+#: languages/cpp/app_templates/tdefileplugin/tdefile_plugin.cpp:32 rc.cpp:4921
+#, no-c-format
+msgid "Size"
+msgstr "大小"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1974
-#: kdevdesigner/designer/mainwindowactions.cpp:629
-#: kdevdesigner/designer/mainwindowactions.cpp:644 rc.cpp:5848
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1004
+#: rc.cpp:4924
 #, no-c-format
-msgid "New"
-msgstr "新建"
+msgid "Pixmap"
+msgstr "像素图"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 2082
-#: rc.cpp:5866
-#, fuzzy, no-c-format
-msgid "+="
-msgstr "+"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1009
+#: rc.cpp:4927
+#, no-c-format
+msgid "Palette"
+msgstr "调色板"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 2087
-#: rc.cpp:5869
-#, fuzzy, no-c-format
-msgid "-="
-msgstr "-"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1014
+#: rc.cpp:4930
+#, no-c-format
+msgid "Cursor"
+msgstr "光标"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 2092
-#: rc.cpp:5872
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1019
+#: rc.cpp:4933
 #, no-c-format
-msgid "="
+msgid "SizePolicy"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 2097
-#: rc.cpp:5875
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1026
+#: rc.cpp:4936
 #, no-c-format
-msgid "*="
-msgstr ""
+msgid "Select property type"
+msgstr "选择属性类型"
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 2102
-#: rc.cpp:5878
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1029
+#: rc.cpp:4939
 #, no-c-format
-msgid "~="
+msgid ""
+"<b>Select the type of the property.</b>"
+"<p>The property must be implemented in the class using Qt's property system.</p>"
+"<p>You can use integer types to support enumeration properties in the property "
+"editor.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 2163
-#: rc.cpp:5881
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1035
+#: kdevdesigner/designer/propertyeditor.cpp:2922
+#: parts/partexplorer/partexplorerform.cpp:116 rc.cpp:4942 rc.cpp:7426
+#: rc.cpp:8783
 #, no-c-format
-msgid "Value:"
-msgstr "值："
+msgid "Property"
+msgstr "属性"
 
-#. i18n: file ./buildtools/qmake/choosesubprojectdlgbase.ui line 16
-#: rc.cpp:5884
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1065
+#: rc.cpp:4948
 #, no-c-format
-msgid "Select Subproject"
-msgstr "选择子工程"
+msgid ""
+"<b>The list of the current widget's properties.</b>"
+"<p>The properties of the custom widget can be changed in the property "
+"editor.</p>"
+msgstr ""
 
-#. i18n: file ./buildtools/qmake/choosesubprojectdlgbase.ui line 92
-#: rc.cpp:5893 rc.cpp:5899
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1073
+#: rc.cpp:4951
 #, no-c-format
-msgid "Subprojects"
-msgstr "子工程"
+msgid "Change property name"
+msgstr "改变属性名称"
 
-#. i18n: file ./buildtools/qmake/disablesubprojectdlgbase.ui line 16
-#: rc.cpp:5896
-#, fuzzy, no-c-format
-msgid "Select Subprojects to disable"
-msgstr "选择子工程"
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1076
+#: rc.cpp:4954
+#, no-c-format
+msgid ""
+"<b>Enter a name for the property.</b>"
+"<p>The properties must be implemented in the class using Qt's property "
+"system.</p>"
+msgstr ""
 
-#. i18n: file ./buildtools/pascal/pascalproject_optionsdlgbase.ui line 19
-#: buildtools/pascal/pascalproject_part.cpp:398
-#: buildtools/pascal/pascalproject_part.cpp:434 rc.cpp:5908
+#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1084
+#: rc.cpp:4957
 #, no-c-format
-msgid "Pascal Compiler"
-msgstr "Pascal 编译器"
+msgid "P&roperty name:"
+msgstr "属性名(&R)："
 
-#. i18n: file ./buildtools/pascal/pascalproject_optionsdlgbase.ui line 46
-#: rc.cpp:5911
+#. i18n: file ./kdevdesigner/designer/wizardeditor.ui line 41
+#: rc.cpp:4963
 #, no-c-format
-msgid "Con&figuration:"
-msgstr "配置(&F)："
+msgid "Wizard Page Editor"
+msgstr "向导页面编辑器"
 
-#. i18n: file ./buildtools/pascal/pascalproject_optionsdlgbase.ui line 155
-#: rc.cpp:5923
+#. i18n: file ./kdevdesigner/designer/wizardeditor.ui line 86
+#: rc.cpp:4966
 #, no-c-format
-msgid "Compiler op&tions:"
-msgstr "编译器选项(&T)："
+msgid "Wizard pages:"
+msgstr "向导页面："
 
-#. i18n: file ./buildtools/pascal/pascalproject_optionsdlgbase.ui line 174
-#: rc.cpp:5926
+#. i18n: file ./kdevdesigner/designer/wizardeditor.ui line 115
+#: rc.cpp:4969
 #, no-c-format
-msgid "&Pascal compiler:"
-msgstr "Pascal 编译器(&P)："
+msgid "A&dd"
+msgstr "添加(&D)"
 
-#. i18n: file ./buildtools/pascal/pascalproject_optionsdlgbase.ui line 301
-#: rc.cpp:5932
+#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 47
+#: rc.cpp:4996
 #, no-c-format
-msgid "Load &Default Compiler Options"
-msgstr "载入默认编译器选项(&D)"
+msgid "Edit Palette"
+msgstr "编辑调色板"
 
-#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 16
-#: rc.cpp:5938
+#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 70
+#: rc.cpp:4999
 #, no-c-format
-msgid "Custom Build Options"
-msgstr "自定义构建选项"
+msgid "Build Palette"
+msgstr "构建调色板"
 
-#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 27
-#: rc.cpp:5941
+#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 111
+#: rc.cpp:5002
 #, no-c-format
-msgid "Build Tool"
-msgstr "构建工具"
+msgid "&3-D effects:"
+msgstr "立体效果(&3)："
 
-#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 38
-#: rc.cpp:5944
+#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 137
+#: rc.cpp:5005 rc.cpp:5014 rc.cpp:5695 rc.cpp:5971 rc.cpp:6013
 #, no-c-format
-msgid "&Make"
-msgstr "&Make"
+msgid "Choose a color"
+msgstr "选择颜色"
 
-#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 49
-#: rc.cpp:5947
-#, fuzzy, no-c-format
-msgid "A&nt"
-msgstr "&Ant"
+#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 140
+#: rc.cpp:5008
+#, no-c-format
+msgid "Choose the effect-color for the generated palette."
+msgstr ""
 
-#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 57
-#: rc.cpp:5950
-#, fuzzy, no-c-format
-msgid "Other"
-msgstr "其它"
+#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 169
+#: rc.cpp:5011
+#, no-c-format
+msgid "Back&ground:"
+msgstr "背景(&G)："
 
-#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 63
-#: rc.cpp:5953
+#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 198
+#: rc.cpp:5017
 #, no-c-format
-msgid "other custom build tool, e.g. script"
+msgid "Choose the background color for the generated palette."
 msgstr ""
 
-#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 66
-#: rc.cpp:5956
+#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 223
+#: rc.cpp:5020
 #, no-c-format
-msgid ""
-"There are myriads of buildtools out there that are not ant or make. If you use "
-"one of them (or have your own scripts), select this option."
+msgid "&Tune Palette..."
 msgstr ""
 
-#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 93
-#: rc.cpp:5959
-#, fuzzy, no-c-format
-msgid "Run &the build tool in the following directory:"
-msgstr "在如下目录里运行编译工具(&D)："
-
-#. i18n: file ./buildtools/custommakefiles/selectnewfilesdialogbase.ui line 24
-#: rc.cpp:5962
-#, fuzzy, no-c-format
-msgid "Files to add to the Project:"
-msgstr "为此工程加载的插件"
-
-#. i18n: file ./buildtools/custommakefiles/selectnewfilesdialogbase.ui line 38
-#: rc.cpp:5965
-#, fuzzy, no-c-format
-msgid "Select the files to add to the project"
-msgstr "将选中文件加入到工程"
-
-#. i18n: file ./buildtools/custommakefiles/selectnewfilesdialogbase.ui line 41
-#: rc.cpp:5968
+#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 239
+#: rc.cpp:5023
 #, no-c-format
-msgid ""
-"Select the files and directories that should be added to the list of project "
-"files. All other files and directories will be put into the blacklist."
-msgstr ""
+msgid "Preview"
+msgstr "预览"
 
-#. i18n: file ./buildtools/custommakefiles/customotherconfigwidgetbase.ui line 45
-#: rc.cpp:5974
-#, fuzzy, no-c-format
-msgid "Add&itional options:"
-msgstr "附加选项"
+#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 270
+#: rc.cpp:5026 rc.cpp:5896
+#, no-c-format
+msgid "Select &palette:"
+msgstr "选择调色板(&P)："
 
-#. i18n: file ./buildtools/custommakefiles/customotherconfigwidgetbase.ui line 61
-#: rc.cpp:5977
-#, fuzzy, no-c-format
-msgid "Name of build &script"
-msgstr "文件名"
+#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 279
+#: rc.cpp:5029 rc.cpp:5899
+#, no-c-format
+msgid "Active Palette"
+msgstr "激活的调色板"
 
-#. i18n: file ./buildtools/custommakefiles/customotherconfigwidgetbase.ui line 72
-#: rc.cpp:5980
-#, fuzzy, no-c-format
-msgid "Default &target:"
-msgstr "默认 make 目标(&T)："
+#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 284
+#: rc.cpp:5032 rc.cpp:5902
+#, no-c-format
+msgid "Inactive Palette"
+msgstr "非激活调色板"
 
-#. i18n: file ./buildtools/custommakefiles/customotherconfigwidgetbase.ui line 93
-#: rc.cpp:5983
-#, fuzzy, no-c-format
-msgid "Run with priority:"
-msgstr "与仓库同步"
+#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 289
+#: rc.cpp:5035 rc.cpp:5905
+#, no-c-format
+msgid "Disabled Palette"
+msgstr "禁用的调色板"
 
-#. i18n: file ./buildtools/custommakefiles/customotherconfigwidgetbase.ui line 161
-#: rc.cpp:5986 rc.cpp:6041
+#. i18n: file ./kdevdesigner/designer/projectsettings.ui line 41
+#: rc.cpp:5053
 #, no-c-format
-msgid "E&nvironment:"
-msgstr "环境变量(&N)："
+msgid "Project Settings"
+msgstr "工程设置"
 
-#. i18n: file ./buildtools/custommakefiles/customotherconfigwidgetbase.ui line 210
-#: rc.cpp:5995 rc.cpp:6050
+#. i18n: file ./kdevdesigner/designer/projectsettings.ui line 76
+#: rc.cpp:5059
 #, no-c-format
-msgid "Re&move"
-msgstr "删除(&M)"
+msgid "&Project file:"
+msgstr "工程文件(&P)："
 
-#. i18n: file ./buildtools/custommakefiles/custommanagerwidgetbase.ui line 16
-#: rc.cpp:6001
-#, fuzzy, no-c-format
-msgid "Custom Manager Options"
-msgstr "自定义选项"
+#. i18n: file ./kdevdesigner/designer/projectsettings.ui line 87
+#: rc.cpp:5062
+#, no-c-format
+msgid "&Language:"
+msgstr "语言(&L)："
 
-#. i18n: file ./buildtools/custommakefiles/custommanagerwidgetbase.ui line 35
-#: rc.cpp:6004
-#, fuzzy, no-c-format
-msgid "Filetypes used in Project"
-msgstr "工程中的目标文件"
+#. i18n: file ./kdevdesigner/designer/projectsettings.ui line 111
+#: rc.cpp:5068
+#, no-c-format
+msgid "&Database file:"
+msgstr "数据库文件(&D)："
 
-#. i18n: file ./buildtools/custommakefiles/custommanagerwidgetbase.ui line 41
-#: rc.cpp:6007
+#. i18n: file ./kdevdesigner/designer/gotolinedialog.ui line 46
+#: kdevdesigner/designer/mainwindowactions.cpp:289 rc.cpp:5089
 #, no-c-format
-msgid ""
-"Add filetypes to be used in Projects, can be full filenames or shell wildcards"
-msgstr ""
+msgid "Goto Line"
+msgstr "转到行"
 
-#. i18n: file ./buildtools/custommakefiles/custommanagerwidgetbase.ui line 45
-#: rc.cpp:6010
+#. i18n: file ./kdevdesigner/designer/gotolinedialog.ui line 63
+#: rc.cpp:5092
 #, no-c-format
-msgid ""
-"Each entry contains a filetype used in the project in the form of a filename or "
-"a filename wildcard (using shell wildcards). \n"
-"This will be used when adding/removing files in directories and re-populating "
-"the project"
-msgstr ""
+msgid "&Line:"
+msgstr "行(&L)："
 
-#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 27
-#: rc.cpp:6017
+#. i18n: file ./kdevdesigner/designer/gotolinedialog.ui line 116
+#: rc.cpp:5095
 #, no-c-format
-msgid "A&bort on first error"
-msgstr "遇到第一个错误时中止(&A)"
+msgid "&Goto"
+msgstr "转到(&G)"
 
-#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 35
-#: rc.cpp:6020
+#. i18n: file ./kdevdesigner/designer/startdialog.ui line 49
+#: rc.cpp:5101
 #, no-c-format
-msgid "Only di&splay commands without actually executing them"
-msgstr "只显示要执行的命令但并不实际执行(&S)"
+msgid "Qt Designer - New/Open"
+msgstr "Qt 设计师 - 新建/打开"
 
-#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 61
-#: rc.cpp:6023
+#. i18n: file ./kdevdesigner/designer/startdialog.ui line 73
+#: rc.cpp:5104
 #, no-c-format
-msgid "A&dditional make options:"
-msgstr "附加 make 选项(&D)："
+msgid "&New File/Project"
+msgstr "新建文件/工程(&N)"
 
-#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 77
-#: rc.cpp:6026
+#. i18n: file ./kdevdesigner/designer/startdialog.ui line 106
+#: rc.cpp:5107
 #, no-c-format
-msgid "Name of make e&xecutable:"
-msgstr "make 执行文件的名称(&X)："
+msgid "&Open File/Project"
+msgstr "打开文件/工程(&O)"
 
-#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 88
-#: rc.cpp:6029
+#. i18n: file ./kdevdesigner/designer/startdialog.ui line 125
+#: rc.cpp:5110
 #, no-c-format
-msgid "Default make &target:"
-msgstr "默认 make 目标(&T)："
+msgid "&Recently Opened"
+msgstr "最近打开的文件(&R)"
 
-#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 109
-#: rc.cpp:6032
+#. i18n: file ./kdevdesigner/designer/startdialog.ui line 178
+#: rc.cpp:5113
 #, no-c-format
-msgid "Run multiple jobs"
-msgstr ""
+msgid "&Do not show this dialog in the future"
+msgstr "以后不再显示此对话框(&D)"
 
-#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 120
-#: rc.cpp:6035
+#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 41
+#: rc.cpp:5125
 #, no-c-format
-msgid "Number of simultaneous &jobs:"
-msgstr "同时执行的任务个数(&J)："
+msgid "Replace Text"
+msgstr "替换文本"
 
-#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 180
-#: rc.cpp:6038
+#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 72
+#: rc.cpp:5128
 #, no-c-format
-msgid "Make &priority:"
-msgstr "Make 优先级(&P)："
+msgid "R&eplace:"
+msgstr "替换(&E)："
 
-#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 286
-#: rc.cpp:6047
+#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 83
+#: rc.cpp:5131
 #, no-c-format
-msgid "Co&py"
-msgstr "复制(&P)"
+msgid "&Find:"
+msgstr "查找(&F)："
 
-#. i18n: file ./buildtools/script/scriptoptionswidgetbase.ui line 16
-#: buildtools/script/scriptprojectpart.cpp:75 rc.cpp:6056
+#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 159
+#: rc.cpp:5134
 #, no-c-format
-msgid "Script Project Options"
-msgstr "脚本工程选项"
+msgid "&Replace"
+msgstr "替换(&R)"
 
-#. i18n: file ./buildtools/script/scriptoptionswidgetbase.ui line 27
-#: rc.cpp:6059
+#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 170
+#: rc.cpp:5137
 #, no-c-format
-msgid "&Include files into the project with the following patterns:"
-msgstr "将如下样式的文件名包含到工程中(&I)："
+msgid "Replace &All"
+msgstr "全部替换(&A)"
 
-#. i18n: file ./buildtools/script/scriptoptionswidgetbase.ui line 90
-#: rc.cpp:6062
+#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 205
+#: rc.cpp:5146 rc.cpp:5833
 #, no-c-format
-msgid "&Exclude the following patterns:"
-msgstr "排除如下样式的文件名(&E)："
+msgid "&Whole words only"
+msgstr "整词匹配(&W)"
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 24
-#: rc.cpp:6065
+#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 213
+#: rc.cpp:5149 rc.cpp:5836
 #, no-c-format
-msgid "ImportExistingDlgBase"
-msgstr "ImportExistingDlgBase"
+msgid "Case &sensitive"
+msgstr "区分大小写(&S)"
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 109
-#: rc.cpp:6074 rc.cpp:6569 rc.cpp:6749 rc.cpp:6800
+#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 221
+#: rc.cpp:5152 rc.cpp:5839
 #, no-c-format
-msgid "Subproject Information"
-msgstr "子工程信息"
+msgid "Start at &beginning"
+msgstr "从头开始(&B)"
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 143
-#: rc.cpp:6077 rc.cpp:6578 rc.cpp:6758 rc.cpp:6806
+#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 231
+#: rc.cpp:5155 rc.cpp:5821
 #, no-c-format
-msgid "Directory:"
-msgstr "目录："
+msgid "Direction"
+msgstr "方向"
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 163
-#: rc.cpp:6080 rc.cpp:6212 rc.cpp:6581 rc.cpp:6761 rc.cpp:6809
+#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 248
+#: rc.cpp:5158 rc.cpp:5824
 #, no-c-format
-msgid "Target:"
-msgstr "目标："
+msgid "Forwar&d"
+msgstr "向下(&D)"
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 192
-#: rc.cpp:6083
+#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 259
+#: rc.cpp:5161 rc.cpp:5827
 #, no-c-format
-msgid "[DIRECTORY]"
-msgstr "[目录]"
+msgid "Bac&kward"
+msgstr "向上(&K)"
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 200
-#: rc.cpp:6086 rc.cpp:6215
+#. i18n: file ./kdevdesigner/designer/dbconnection.ui line 41
+#: rc.cpp:5164
 #, no-c-format
-msgid "[TARGET]"
-msgstr "[目标]"
+msgid "Edit Database Connection"
+msgstr "编辑数据库连接"
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 260
-#: rc.cpp:6089
+#. i18n: file ./kdevdesigner/designer/dbconnection.ui line 58
+#: rc.cpp:5167
 #, no-c-format
-msgid "A&dd All"
-msgstr "全部添加(&D)"
+msgid "&Database name:"
+msgstr "数据库名称(&D)："
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 263
-#: rc.cpp:6092
+#. i18n: file ./kdevdesigner/designer/dbconnection.ui line 69
+#: rc.cpp:5170
 #, no-c-format
-msgid "Import by creating symbolic links (recommended)"
-msgstr "通过创建符号链接来导入(推荐)"
+msgid "&Username:"
+msgstr "用户名(&U)："
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 271
-#: rc.cpp:6095
+#. i18n: file ./kdevdesigner/designer/dbconnection.ui line 80
+#: rc.cpp:5173
 #, no-c-format
-msgid "&Add Selected"
-msgstr "添加所选(&A)"
+msgid "&Password:"
+msgstr "密码(&P)："
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 274
-#: rc.cpp:6098
+#. i18n: file ./kdevdesigner/designer/dbconnection.ui line 91
+#: rc.cpp:5176
 #, no-c-format
-msgid "Import by copying (not recommended)"
-msgstr "通过复制来导入(不推荐)"
+msgid "D&river:"
+msgstr "驱动程序(&R)："
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 313
-#: rc.cpp:6101
+#. i18n: file ./kdevdesigner/designer/dbconnection.ui line 110
+#: rc.cpp:5179
 #, no-c-format
-msgid "&Source Directory"
-msgstr "源代码目录(&S)"
+msgid "&Hostname:"
+msgstr "主机名(&H)："
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 364
-#: rc.cpp:6104
+#. i18n: file ./kdevdesigner/designer/dbconnection.ui line 151
+#: rc.cpp:5185
 #, no-c-format
-msgid "R&emove All"
-msgstr "全部移除(&E)"
+msgid "P&ort:"
+msgstr "端口(&O)："
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 367
-#: rc.cpp:6107
+#. i18n: file ./kdevdesigner/designer/listeditor.ui line 96
+#: rc.cpp:5203
 #, no-c-format
-msgid "Removes all added files."
-msgstr "移除添加的所有文件。"
+msgid "Re&name"
+msgstr "重命名(&N)"
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 375
-#: rc.cpp:6110
+#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 41
+#: rc.cpp:5209
 #, no-c-format
-msgid "&Remove Selected"
-msgstr "移除所选(&R)"
+msgid "Edit Table"
+msgstr "编辑表"
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 378
-#: rc.cpp:6113
+#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 168
+#: rc.cpp:5233 rc.cpp:6139
 #, no-c-format
-msgid "Removes the selected files."
-msgstr "移除所有选中的文件。"
+msgid "Co&lumns"
+msgstr "列(&L)"
 
-#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 417
-#: rc.cpp:6116
+#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 233
+#: rc.cpp:5239 rc.cpp:5293
 #, no-c-format
-msgid "Add &Following"
-msgstr "添加下列(&F)"
+msgid ""
+"<b>Move the selected item up.</b>"
+"<p>The top-most column will be the first column of the list.</p>"
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 16
-#: rc.cpp:6119
+#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 250
+#: rc.cpp:5245 rc.cpp:5299
 #, no-c-format
-msgid "Add New Application .desktop File"
-msgstr "添加新应用程序 .desktop 文件"
+msgid ""
+"<b>Move the selected item down.</b>"
+"<p>The top-most column will be the first column of the list.</p>"
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 30
-#: rc.cpp:6122
+#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 258
+#: rc.cpp:5248 rc.cpp:6187
 #, no-c-format
-msgid "&Application File"
-msgstr "应用程序文件(&A)"
+msgid "&Delete Column"
+msgstr "删除列(&D)"
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 41
-#: rc.cpp:6125
+#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 266
+#: rc.cpp:5251 rc.cpp:6202
 #, no-c-format
-msgid "Start in t&erminal"
-msgstr "在终端里启动(&E)"
+msgid "&New Column"
+msgstr "新建列(&N)"
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 122
-#: rc.cpp:6131
+#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 288
+#: rc.cpp:5254
 #, no-c-format
-msgid "Games"
-msgstr "游戏"
+msgid "Table:"
+msgstr "表："
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 127
-#: rc.cpp:6134
+#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 333
+#: rc.cpp:5263 rc.cpp:5320 rc.cpp:6082
 #, no-c-format
-msgid "Development"
-msgstr "开发"
+msgid ""
+"<b>Delete the selected item's pixmap.</b>"
+"<p>The pixmap in the current column of the selected item will be deleted.</p>"
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 137
-#: rc.cpp:6140
+#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 353
+#: rc.cpp:5272 rc.cpp:5329 rc.cpp:6091
 #, no-c-format
-msgid "Graphics"
-msgstr "图形"
+msgid ""
+"<b>Select a pixmap file for the item.</b>"
+"<p>The pixmap will be changed in the current column of the selected item.</p>"
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 142
-#: rc.cpp:6143
+#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 363
+#: rc.cpp:5275 rc.cpp:5308
 #, no-c-format
-msgid "Internet"
-msgstr "Internet"
+msgid "&Label:"
+msgstr "标签(&L)："
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 147
-#: rc.cpp:6146
+#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 385
+#: rc.cpp:5281
 #, no-c-format
-msgid "Multimedia"
-msgstr "多媒体"
+msgid "&Field:"
+msgstr "字段(&F)："
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 152
-#: rc.cpp:6149
+#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 409
+#: rc.cpp:5284
 #, no-c-format
-msgid "Office"
-msgstr "办公"
+msgid "<no table>"
+msgstr "<无表>"
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 162
-#: rc.cpp:6155
+#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 421
+#: rc.cpp:5287
 #, no-c-format
-msgid "System"
-msgstr "系统"
+msgid "&Rows"
+msgstr "行(&R)"
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 167
-#: rc.cpp:6158
+#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 511
+#: rc.cpp:5302
 #, no-c-format
-msgid "Toys"
-msgstr "玩具"
+msgid "&New Row"
+msgstr "新建行(&N)"
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 172
-#: rc.cpp:6161
+#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 519
+#: rc.cpp:5305
 #, no-c-format
-msgid "Utilities"
-msgstr "实用工具"
+msgid "&Delete Row"
+msgstr "删除行(&D)"
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 177
-#: rc.cpp:6164
+#. i18n: file ./kdevdesigner/designer/about.ui line 41
+#: rc.cpp:5332
 #, no-c-format
-msgid "WordProcessing"
-msgstr "文字处理"
+msgid "Qt Designer"
+msgstr "Qt 设计师"
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 211
-#: rc.cpp:6170 rc.cpp:6233
+#. i18n: file ./kdevdesigner/designer/about.ui line 80
+#: rc.cpp:5335
 #, no-c-format
-msgid "&Icon:"
-msgstr "图标(&I)："
+msgid "Version 3.2"
+msgstr "版本 3.2"
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 229
-#: rc.cpp:6173
+#. i18n: file ./kdevdesigner/designer/about.ui line 93
+#: rc.cpp:5338
 #, no-c-format
-msgid "&Section:"
-msgstr "节(&S)："
+msgid "Copyright (C) 2000-2003 Trolltech AS. All Rights Reserved."
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 316
-#: rc.cpp:6185
+#. i18n: file ./kdevdesigner/designer/about.ui line 114
+#: rc.cpp:5341
 #, no-c-format
-msgid "Mime &Types"
-msgstr "MIME 类型(&T)"
+msgid ""
+"<p>Qt Commercial Edition license holders: This program is licensed to you under "
+"the terms of the Qt Commercial License Agreement. For details, see the file "
+"LICENSE that came with this software distribution.</p>"
+"<p></p>"
+"<p>Qt Free Edition users: This program is licensed to you under the terms of "
+"the GNU General Public License Version 2. For details, see the file LICENSE.GPL "
+"that came with this software distribution.</p>"
+"<p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE "
+"WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p>"
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 22
-#: buildtools/autotools/choosetargetdialog.cpp:62 rc.cpp:6200
+#. i18n: file ./kdevdesigner/designer/dbconnectioneditor.ui line 41
+#: rc.cpp:5347
 #, no-c-format
-msgid "Automake Manager - Choose Target"
-msgstr "Automake 管理器 - 选择目标"
+msgid "Connect"
+msgstr "连接"
 
-#. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 59
-#: rc.cpp:6203
+#. i18n: file ./kdevdesigner/designer/dbconnectioneditor.ui line 94
+#: rc.cpp:5356
 #, no-c-format
-msgid "Add new files to m&y active target"
-msgstr "将新文件添加到我当前的目标(&Y)"
+msgid "Connection Details"
+msgstr "连接细节"
 
-#. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 70
-#: rc.cpp:6206
+#. i18n: file ./kdevdesigner/designer/dbconnections.ui line 41
+#: rc.cpp:5359
 #, no-c-format
-msgid "Choose &another target"
-msgstr "选择另一个目标(&A)"
+msgid "Edit Database Connections"
+msgstr "编辑数据库连接"
 
-#. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 83
-#: rc.cpp:6209
+#. i18n: file ./kdevdesigner/designer/dbconnections.ui line 61
+#: rc.cpp:5362
 #, no-c-format
-msgid "Choose &Target"
-msgstr "选择目标(&T)"
+msgid "&New Connection"
+msgstr "新建连接(&N)"
 
-#. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 140
-#: rc.cpp:6218
+#. i18n: file ./kdevdesigner/designer/dbconnections.ui line 74
+#: rc.cpp:5365
 #, no-c-format
-msgid "&New Files"
-msgstr "新建文件(&N)"
+msgid "&Delete Connection"
+msgstr "删除连接(&D)"
 
-#. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 159
-#: rc.cpp:6221
+#. i18n: file ./kdevdesigner/designer/dbconnections.ui line 157
+#: kdevdesigner/designer/dbconnectionsimpl.cpp:128
+#: kdevdesigner/designer/project.cpp:148
+#: kdevdesigner/designer/propertyeditor.cpp:2004
+#: kdevdesigner/designer/propertyeditor.cpp:2022 rc.cpp:5377
 #, no-c-format
-msgid ""
-"<qt><b>Note:</b> If you cancel, your files will be created but will <b>not</b> "
-"be added to the project.</qt>"
-msgstr "<b>注意：</b>如果您取消的话，您的文件将被创建，<b>但是不会</b>被添加到工程中。"
+msgid "Connection"
+msgstr "连接"
 
-#. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 172
-#: rc.cpp:6224
+#. i18n: file ./kdevdesigner/designer/dbconnections.ui line 227
+#: rc.cpp:5380
 #, no-c-format
-msgid "Do &not ask me again and use always my active target"
-msgstr "以后不再询问，总是使用我的活动目标(&N)"
+msgid "Connec&t"
+msgstr "连接(&T)"
 
-#. i18n: file ./buildtools/autotools/addservicedlgbase.ui line 16
-#: rc.cpp:6227
+#. i18n: file ./kdevdesigner/designer/configtoolboxdialog.ui line 41
+#: kdevdesigner/designer/mainwindowactions.cpp:605 rc.cpp:5383
 #, no-c-format
-msgid "Add New Service"
-msgstr "添加新服务"
+msgid "Configure Toolbox"
+msgstr "配置工具箱"
 
-#. i18n: file ./buildtools/autotools/addservicedlgbase.ui line 31
-#: rc.cpp:6230
+#. i18n: file ./kdevdesigner/designer/configtoolboxdialog.ui line 132
+#: rc.cpp:5395
 #, no-c-format
-msgid "&Service File"
-msgstr "服务文件(&S)"
+msgid "Available Tools"
+msgstr "可用工具"
 
-#. i18n: file ./buildtools/autotools/addservicedlgbase.ui line 139
-#: rc.cpp:6236
+#. i18n: file ./kdevdesigner/designer/configtoolboxdialog.ui line 175
+#: rc.cpp:5401
 #, no-c-format
-msgid "&Library:"
-msgstr "库(&L)："
+msgid "Common Widgets Page"
+msgstr "公共部件页面"
 
-#. i18n: file ./buildtools/autotools/addservicedlgbase.ui line 209
-#: rc.cpp:6248
+#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 47
+#: rc.cpp:5404
 #, no-c-format
-msgid "Service &Types"
-msgstr "服务类型(&T)"
+msgid "Preview Window"
+msgstr "上一个窗口"
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 16
-#: rc.cpp:6272
+#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 92
+#: rc.cpp:5407
 #, no-c-format
-msgid "Target Options"
-msgstr "目标选项"
+msgid "ButtonGroup"
+msgstr "按钮组"
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 34
-#: rc.cpp:6275
-#, fuzzy, no-c-format
-msgid "Fl&ags"
-msgstr "标志"
+#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 109
+#: rc.cpp:5410
+#, no-c-format
+msgid "RadioButton1"
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 49
-#: rc.cpp:6278 rc.cpp:6431
+#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 120
+#: rc.cpp:5413
 #, no-c-format
-msgid "Li&nker flags (LDFLAGS):"
-msgstr "连接器选项 (LDFLAGS)(&N)："
+msgid "RadioButton2"
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 71
-#: rc.cpp:6281
-#, fuzzy, no-c-format
-msgid "&Do not link against shared libraries (-all-static)"
-msgstr "不连接共享库 (-all-static)"
+#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 128
+#: rc.cpp:5416
+#, no-c-format
+msgid "RadioButton3"
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 79
-#: rc.cpp:6284
+#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 138
+#: rc.cpp:5419
 #, fuzzy, no-c-format
-msgid "Do not &assign version numbers to libraries (-avoid-version)"
-msgstr "不给库指定版本号码 (-avoid-version)"
+msgid "ButtonGroup2"
+msgstr "编译分组"
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 87
-#: rc.cpp:6287
-#, fuzzy, no-c-format
-msgid "Create a library that can &be dynamically loaded (-module)"
-msgstr "创建可被动态载入的库 (-module)"
+#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 155
+#: rc.cpp:5422
+#, no-c-format
+msgid "CheckBox1"
+msgstr "复选框1"
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 95
-#: rc.cpp:6290
-#, fuzzy, no-c-format
-msgid "Library does not depend on external symbols (-no-&undefined)"
-msgstr "不依赖外部符号的库 (-no-undefined)"
+#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 166
+#: rc.cpp:5425
+#, no-c-format
+msgid "CheckBox2"
+msgstr "复选框2"
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 118
-#: rc.cpp:6293
+#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 200
+#: rc.cpp:5428
 #, no-c-format
-msgid "O&ther:"
-msgstr "其它(&T)："
+msgid "LineEdit"
+msgstr "行编辑"
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 181
-#: rc.cpp:6296
-#, fuzzy, no-c-format
-msgid "E&xplicit dependencies (DEPENDENCIES):"
-msgstr "明确的依赖关系(DEPENDENCIES)(&E)："
+#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 206
+#: rc.cpp:5431
+#, no-c-format
+msgid "ComboBox"
+msgstr "复选框"
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 228
-#: rc.cpp:6299
-#, fuzzy, no-c-format
-msgid "Li&braries"
-msgstr "库"
+#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 237
+#: rc.cpp:5434
+#, no-c-format
+msgid "PushButton"
+msgstr "按钮"
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 243
-#: rc.cpp:6302
-#, fuzzy, no-c-format
-msgid "Lin&k convenience libraries inside project (LIBADD):"
-msgstr "连接工程之内的库 (LIBADD)(&S)："
+#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 274
+#: rc.cpp:5437
+#, no-c-format
+msgid ""
+"<p>\n"
+"<a href=\"http://www.trolltech.com/\">http://www.trolltech.com</a>\n"
+"</p>\n"
+"<p>\n"
+"<a href=\"http://www.kde.org/\">http://www.kde.org</a>\n"
+"</p>"
+msgstr ""
+"<p>\n"
+"<a href=\"http://www.trolltech.com/\">http://www.trolltech.com</a>\n"
+"</p>\n"
+"<p>\n"
+"<a href=\"http://www.kde.org/\">http://www.kde.org</a>\n"
+"</p>"
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 294
-#: rc.cpp:6305
+#. i18n: file ./kdevdesigner/designer/actioneditor.ui line 41
+#: rc.cpp:5445
 #, no-c-format
-msgid "Link libraries ou&tside project (LIBADD):"
-msgstr "连接工程之外的库 (LIBADD)(&T)："
+msgid "Edit Actions"
+msgstr "编辑动作"
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 439
-#: rc.cpp:6323
-#, fuzzy, no-c-format
-msgid "Mo&ve Up"
-msgstr "上移(&U)"
+#. i18n: file ./kdevdesigner/designer/actioneditor.ui line 83
+#: rc.cpp:5448
+#, no-c-format
+msgid "Create new Action"
+msgstr "创建新动作"
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 447
-#: rc.cpp:6326 rc.cpp:6659
+#. i18n: file ./kdevdesigner/designer/actioneditor.ui line 100
+#: rc.cpp:5451
 #, no-c-format
-msgid "Move Dow&n"
-msgstr "下移(&N)"
+msgid "Delete current Action"
+msgstr "删除当前动作"
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 476
-#: rc.cpp:6329
+#. i18n: file ./kdevdesigner/designer/actioneditor.ui line 117
+#: rc.cpp:5454
 #, no-c-format
-msgid "Ar&guments"
-msgstr "参数(&G)"
+msgid "Connect current Action"
+msgstr "连接当前动作"
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 487
-#: rc.cpp:6332
-#, fuzzy, no-c-format
-msgid "Program Arguments (only valid for executable targets)"
-msgstr "运行参数(只对运行的平台有效)(&R)："
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 41
+#: kdevdesigner/designer/editfunctionsimpl.cpp:216 rc.cpp:5457
+#, no-c-format
+msgid "Edit Functions"
+msgstr "编辑函数"
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 507
-#: rc.cpp:6335
-#, fuzzy, no-c-format
-msgid "&Run arguments:"
-msgstr "参数(&G)："
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 47
+#: rc.cpp:5460
+#, no-c-format
+msgid ""
+"<b>Edit Functions</b>"
+"<p>Add, edit or delete the current form's slots or functions.</p>"
+"<p>Click the <b>Add Function</b>-button to create a new function; enter a name, "
+"choose an access mode and specify if it should be a slot or normal function.</p>"
+"<p>Select an entry from the list and click the <b>Delete Function</b>"
+"-button to remove a function; in case of a slot all connections using this slot "
+"will also be removed.</p>"
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 535
-#: rc.cpp:6341
-#, fuzzy, no-c-format
-msgid "&Debug arguments:"
-msgstr "调试版标志(&D)："
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 62
+#: parts/classview/classtreebase.cpp:79 rc.cpp:5463
+#, no-c-format
+msgid "Function"
+msgstr "函数"
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 16
-#: buildtools/autotools/autoprojectpart.cpp:224 rc.cpp:6350
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 117
+#: rc.cpp:5478
 #, no-c-format
-msgid "Configure Options"
-msgstr "配置选项"
+msgid "In Use"
+msgstr "使用中"
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 46
-#: rc.cpp:6353
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 150
+#: rc.cpp:5481
 #, fuzzy, no-c-format
-msgid "&Configuration:"
-msgstr "配置："
+msgid ""
+"<b>This form's functions.</b>"
+"<p>Select the function you want to change or delete.</p>"
+msgstr "<b>函数选择器</b><p>选择一个函数，转至它的定义或者声明位置。"
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 68
-#: rc.cpp:6356
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 172
+#: rc.cpp:5484
 #, fuzzy, no-c-format
-msgid "Different build profiles"
-msgstr "和保存的文件的差异"
+msgid "Only d&isplay slots"
+msgstr "只显示槽(&L)"
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 71
-#: rc.cpp:6359
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 175
+#: rc.cpp:5487
 #, fuzzy, no-c-format
-msgid "profiles"
-msgstr "打开文件"
+msgid "Change displaying mode for functions"
+msgstr "制作内联函数"
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 152
-#: rc.cpp:6371 rc.cpp:6374
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 179
+#: rc.cpp:5490
 #, no-c-format
-msgid "Options to pass to configure. eg. --prefix=<install dir>"
+msgid ""
+"<b>Check this button if only the slots should be displayed</b>"
+"<p>Otherwise all functions, i.e. normal C++ functions and slots are "
+"displayed.</p>\n"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 163
-#: rc.cpp:6377
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 204
+#: rc.cpp:5494
 #, no-c-format
-msgid "&Build directory (must be different for every different configuration):"
-msgstr "构建目录(所有的配置中不能重复)(&B)："
+msgid "&New Function"
+msgstr "新建函数(&N)"
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 191
-#: rc.cpp:6380
-#, fuzzy, no-c-format
-msgid "Top source &directory:"
-msgstr "顶层源代码目录(&T)："
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 207
+#: rc.cpp:5497
+#, no-c-format
+msgid "Add new function"
+msgstr "添加新函数"
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 214
-#: rc.cpp:6383 rc.cpp:6398
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 210
+#: rc.cpp:5500
 #, no-c-format
 msgid ""
-"The build process will place the object\n"
-"files and binary in this directory. \n"
-"\n"
-"If the name does not have a leading /\n"
-"then it is relative to the project directory.\n"
-"(in the General page)\n"
-"\n"
-"The build process also checks here for \n"
-"a Makefile and a configure script.\n"
-"\n"
-"If you have imported a project and you were \n"
-"building in the project directory, you \n"
-"probably want this to be blank."
+"<b>Add a new function.</b>"
+"<p>New functions have a default name and public access.</p>"
 msgstr ""
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 297
-#: rc.cpp:6419 rc.cpp:6425
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 218
+#: rc.cpp:5503
 #, no-c-format
-msgid ""
-"Where to start looking for the src files.\n"
-"If the name does not have a leading /\n"
-"then it is relative to the project directory.\n"
-"(in the General page)"
-msgstr ""
+msgid "&Delete Function"
+msgstr "删除函数(&D)："
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 335
-#: rc.cpp:6434 rc.cpp:6438 rc.cpp:6442
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 221
+#: rc.cpp:5506
 #, no-c-format
-msgid ""
-"Linker flags, e.g. -L<lib dir> if you have libraries in a\n"
-"nonstandard directory <lib dir>"
-msgstr ""
-"连接开关，例如 -L<库目录> 如果使用非标准\n"
-"库目录中的库 <库目录>"
+msgid "Delete function"
+msgstr "删除函数"
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 374
-#: rc.cpp:6446 rc.cpp:6450 rc.cpp:6457
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 224
+#: rc.cpp:5509
 #, no-c-format
 msgid ""
-"C/C++ preprocessor flags, e.g. -I<include dir> if you have\n"
-"headers in a nonstandard directory <include dir>"
+"<b>Delete the selected function.</b>"
+"<p>All connections using this function are also removed.</p>"
 msgstr ""
-"C/C++预处理开关，例如 -I<头文件目录>　如果您使用非标准\n"
-"头文件目录中的头文件 <头文件目录>"
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 403
-#: rc.cpp:6454
-#, no-c-format
-msgid "C/C++ &preprocessor flags (CPPFLAGS):"
-msgstr "C/C++ 预处理器标志(CPPFLAGS)(&P)："
-
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 418
-#: rc.cpp:6461
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 242
+#: rc.cpp:5512
 #, no-c-format
-msgid "Configure argu&ments:"
-msgstr "配置参数(&M)："
+msgid "Function Properties"
+msgstr "函数属性"
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 452
-#: rc.cpp:6467
-#, no-c-format
-msgid "C"
-msgstr "C"
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 284
+#: rc.cpp:5515
+#, fuzzy, no-c-format
+msgid "&Function:"
+msgstr "函数(&U)："
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 463
-#: rc.cpp:6470
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 306
+#: rc.cpp:5518
 #, no-c-format
-msgid "C com&piler:"
-msgstr "C 编译器(&P)："
+msgid "Change function name"
+msgstr "更改函数名称"
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 496
-#: rc.cpp:6473
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 309
+#: rc.cpp:5521
 #, no-c-format
-msgid "Compiler f&lags (CFLAGS):"
-msgstr "编译器标志(CFLAGS)(&L)："
+msgid ""
+"<b>Change the name of the selected function.</b>"
+"<p>The name should include the argument list and must be syntactically "
+"correct.</p>"
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 551
-#: rc.cpp:6479
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 317
+#: rc.cpp:5524
 #, no-c-format
-msgid "Compiler co&mmand (CC):"
-msgstr "编译器命令(CC)(&M)："
+msgid "&Return type:"
+msgstr "返回类型(&R)："
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 586
-#: rc.cpp:6482
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 339
+#: rc.cpp:5527
 #, no-c-format
-msgid "C++"
-msgstr "C++"
+msgid "Change the return type of the function"
+msgstr "更改函数的返回类型"
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 597
-#: rc.cpp:6485
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 342
+#: rc.cpp:5530
 #, no-c-format
-msgid "C++ com&piler:"
-msgstr "C++ 编译器(&P)："
+msgid ""
+"<b>Change the return type of the selected function.</b>"
+"<p>Specifiy here the datatype which should be returned by the function.</p>"
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 630
-#: rc.cpp:6488
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 380
+#: rc.cpp:5533
 #, no-c-format
-msgid "Compiler co&mmand (CXX):"
-msgstr "编译器命令(CXX)(&M)："
+msgid "S&pecifier:"
+msgstr "修饰符(&P)："
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 663
-#: rc.cpp:6491
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 392
+#: rc.cpp:5536
 #, fuzzy, no-c-format
-msgid "Compiler flags (C&XXFLAGS):"
-msgstr "编译器标志(CXXFLAGS)(&L)："
+msgid "non virtual"
+msgstr "虚"
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 720
-#: rc.cpp:6497
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 397
+#: rc.cpp:5539
 #, fuzzy, no-c-format
-msgid "F&ortran"
-msgstr "Fortran"
+msgid "virtual"
+msgstr "虚"
 
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 731
-#: rc.cpp:6500
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 402
+#: rc.cpp:5542
 #, fuzzy, no-c-format
-msgid "Fortra&n compiler:"
-msgstr "Fortran 编译器(&P)："
-
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 764
-#: rc.cpp:6503
-#, no-c-format
-msgid "Compiler co&mmand (F77):"
-msgstr "编译器命令(F77)(&M)："
-
-#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 797
-#: rc.cpp:6506
-#, no-c-format
-msgid "Compiler f&lags (FFLAGS):"
-msgstr "编译器标志(FFLAGS)(&L)："
-
-#. i18n: file ./buildtools/autotools/addsubprojectdlgbase.ui line 36
-#: rc.cpp:6512
-#, no-c-format
-msgid "Add New Subproject"
-msgstr "添加新的子工程"
-
-#. i18n: file ./buildtools/autotools/addsubprojectdlgbase.ui line 47
-#: rc.cpp:6515
-#, no-c-format
-msgid "Subproject"
-msgstr "子工程"
-
-#. i18n: file ./buildtools/autotools/addsubprojectdlgbase.ui line 87
-#: rc.cpp:6518
-#, no-c-format
-msgid "Subproject &name:"
-msgstr "子工程名称(&N)："
-
-#. i18n: file ./buildtools/autotools/managecustomcommandsbase.ui line 44
-#: rc.cpp:6533
-#, no-c-format
-msgid "Menu Text"
-msgstr "菜单文本"
+msgid "pure virtual"
+msgstr "虚"
 
-#. i18n: file ./buildtools/autotools/managecustomcommandsbase.ui line 52
-#: rc.cpp:6536
-#, no-c-format
-msgid "Command"
-msgstr "命令"
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 407
+#: rc.cpp:5545
+#, fuzzy, no-c-format
+msgid "static"
+msgstr "开始"
 
-#. i18n: file ./buildtools/autotools/managecustomcommandsbase.ui line 60
-#: rc.cpp:6539
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 422
+#: rc.cpp:5548 rc.cpp:5566
 #, no-c-format
-msgid "Command Type"
-msgstr "命令类型"
+msgid "Change function access"
+msgstr "更该函数访问"
 
-#. i18n: file ./buildtools/autotools/addicondlgbase.ui line 16
-#: rc.cpp:6542
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 425
+#: rc.cpp:5551 rc.cpp:5569
 #, no-c-format
-msgid "Add New Icon"
-msgstr "添加新图标"
+msgid ""
+"<b>Change the access policy of the function</b>"
+"<p>All functions are created virtual and should be reimplemented in "
+"subclasses.</p>"
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/addicondlgbase.ui line 35
-#: rc.cpp:6545 rc.cpp:8798
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 481
+#: rc.cpp:5572 rc.cpp:8801
 #, no-c-format
 msgid "&Type:"
 msgstr "类型(&T)："
 
-#. i18n: file ./buildtools/autotools/addicondlgbase.ui line 53
-#: rc.cpp:6548
-#, no-c-format
-msgid "&Size:"
-msgstr "大小(&S)："
-
-#. i18n: file ./buildtools/autotools/addicondlgbase.ui line 178
-#: rc.cpp:6563
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 493
+#: parts/ctags2/ctagskinds.cpp:52 rc.cpp:5575
 #, no-c-format
-msgid "unknown"
-msgstr "未知"
+msgid "slot"
+msgstr "slot"
 
-#. i18n: file ./buildtools/autotools/removetargetdlgbase.ui line 16
-#: rc.cpp:6566
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 498
+#: parts/ctags2/ctagskinds.cpp:37 parts/ctags2/ctagskinds.cpp:44
+#: parts/ctags2/ctagskinds.cpp:62 parts/ctags2/ctagskinds.cpp:95
+#: parts/ctags2/ctagskinds.cpp:121 parts/ctags2/ctagskinds.cpp:133
+#: parts/ctags2/ctagskinds.cpp:147 parts/ctags2/ctagskinds.cpp:154
+#: parts/ctags2/ctagskinds.cpp:167 parts/ctags2/ctagskinds.cpp:174
+#: parts/ctags2/ctagskinds.cpp:181 parts/ctags2/ctagskinds.cpp:187
+#: parts/ctags2/ctagskinds.cpp:200 rc.cpp:5578
 #, no-c-format
-msgid "Remove Target From [SUBPROJECT]"
-msgstr "从 [子工程] 删除目标"
+msgid "function"
+msgstr "function"
 
-#. i18n: file ./buildtools/autotools/removetargetdlgbase.ui line 46
-#: rc.cpp:6572 rc.cpp:6752
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 505
+#: rc.cpp:5581
 #, no-c-format
-msgid "[TARGET DIRECTORY]"
-msgstr "[目标目录]"
+msgid "Change function type"
+msgstr "更改函数类型"
 
-#. i18n: file ./buildtools/autotools/removetargetdlgbase.ui line 54
-#: rc.cpp:6575 rc.cpp:6755 rc.cpp:6803
+#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 508
+#: rc.cpp:5584
 #, no-c-format
-msgid "[TARGET NAME]"
-msgstr "[目标名称]"
+msgid ""
+"<b>Change the type of the function.</b>"
+"<p>The type specifies if the function is either a slot or a normal C++ "
+"function.</p>"
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/removetargetdlgbase.ui line 116
-#: rc.cpp:6584
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 41
+#: kdevdesigner/designer/mainwindowactions.cpp:220 rc.cpp:5602
 #, no-c-format
-msgid "&Target Information"
-msgstr "目标信息(&T)"
+msgid "Preferences"
+msgstr "首选项"
 
-#. i18n: file ./buildtools/autotools/removetargetdlgbase.ui line 149
-#: rc.cpp:6593
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 47
+#: rc.cpp:5605
 #, no-c-format
 msgid ""
-"<b>Note:</b> You will not be able to undo this operation. Please check your "
-"Makefile.am afterwards."
-msgstr "<b>注意：</b>您将无法再撤消此操作。并且随后请检查您的 Makefile.am。"
-
-#. i18n: file ./buildtools/autotools/removetargetdlgbase.ui line 159
-#: rc.cpp:6596
-#, no-c-format
-msgid "&Dependencies to Other Subprojects"
-msgstr "对其它子工程的依赖性(&D)"
+"<b>Preferences</b>"
+"<p>Change the preferences of Qt Designer. There is always one tab with general "
+"preferences. There may be additional tabs, depending on which plugins are "
+"installed.</p>"
+msgstr "<b>首选项</b><p>更改 Qt 设计师的首选项。常规首选项标签是必有的，而其它额外的标签取决于安装了何种插件。</p>"
 
-#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 16
-#: rc.cpp:6608
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 79
+#: rc.cpp:5611
 #, no-c-format
-msgid "Subproject Options"
-msgstr "子工程选项"
+msgid "File Saving"
+msgstr "文件保存"
 
-#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 31
-#: rc.cpp:6611
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 90
+#: rc.cpp:5614
 #, no-c-format
-msgid "Co&mpiler"
-msgstr "编译器(&M)"
+msgid "Enable auto sa&ve"
+msgstr "启用自动保存(&V)"
 
-#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 46
-#: rc.cpp:6614
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 109
+#: rc.cpp:5617
 #, no-c-format
-msgid "Compiler flags for C compiler (CFLA&GS):"
-msgstr "C 编译器的编译标志(CFLAGS)(&G)："
+msgid "Auto save &interval:"
+msgstr "自动保存间隔(&I)："
 
-#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 129
-#: rc.cpp:6620
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 136
+#: rc.cpp:5620
 #, no-c-format
-msgid "Compiler flags for C++ compiler (C&XXFLAGS):"
-msgstr "C++ 编译器的编译标志 (C&XXFLAGS)："
+msgid "Plu&gin Paths"
+msgstr "插件路径(&G)"
 
-#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 204
-#: rc.cpp:6626
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 166
+#: rc.cpp:5623 rc.cpp:5644
 #, no-c-format
-msgid "Compiler flags for Fortran compiler (&FFLAGS):"
-msgstr "Fortran 编译器的编译标志 (&FFLAGS)："
+msgid ""
+"A splash screen is displayed when starting Qt Designer if this option is "
+"checked."
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 277
-#: rc.cpp:6632
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 191
+#: rc.cpp:5629
 #, no-c-format
-msgid "&Includes"
-msgstr "包含(&I)"
+msgid "Restore last &workspace on startup"
+msgstr "启动时恢复上次的工作区(&W)"
 
-#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 296
-#: rc.cpp:6635
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 197
+#: rc.cpp:5632
 #, no-c-format
-msgid "Automatically &generate metasources"
-msgstr "自动生成 metasources(&G)"
+msgid "Restore last workspace"
+msgstr "恢复上次的工作区"
 
-#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 379
-#: rc.cpp:6644
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 200
+#: rc.cpp:5635
 #, no-c-format
-msgid "Directories in&side project:"
-msgstr "工程内的目录(&S)："
+msgid ""
+"The current workspace settings will be restored the next time you start Qt "
+"Designer if this option is checked."
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 471
-#: rc.cpp:6656
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 208
+#: rc.cpp:5638
 #, no-c-format
-msgid "Move U&p"
-msgstr "上移(&P)"
+msgid "Show &splash screen on startup"
+msgstr "启动时显示飞溅屏幕(&S)"
 
-#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 510
-#: rc.cpp:6662
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 214
+#: rc.cpp:5641
 #, no-c-format
-msgid "Directories ou&tside project:"
-msgstr "工程外的目录(&T)："
+msgid "Show Splashscreen"
+msgstr "显示飞溅屏幕"
 
-#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 546
-#: rc.cpp:6665
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 225
+#: rc.cpp:5647
 #, no-c-format
-msgid "&Prefixes"
-msgstr "前缀(&P)"
+msgid "Show start &dialog"
+msgstr "显示启动对话框(&D)"
 
-#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 566
-#: buildtools/custommakefiles/selectnewfilesdialog.cpp:28 rc.cpp:6671
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 236
+#: rc.cpp:5650
 #, no-c-format
-msgid "Path"
-msgstr "路径"
+msgid "Disable data&base auto-edit in preview"
+msgstr "禁用预览中的数据库自动编辑(&B)"
 
-#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 594
-#: rc.cpp:6674
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 247
+#: rc.cpp:5653
 #, no-c-format
-msgid "C&ustom prefixes:"
-msgstr "自定义前缀(&U)："
+msgid "Show toolbutton lab&els"
+msgstr "显示工具按钮标签(&E)"
 
-#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 678
-#: rc.cpp:6686
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 250
+#: rc.cpp:5656
 #, no-c-format
-msgid "&Build Order"
-msgstr "构建顺序(&B)"
+msgid "Text Labels"
+msgstr "文本标签"
 
-#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 775
-#: rc.cpp:6695
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 253
+#: rc.cpp:5659
 #, no-c-format
-msgid "O&rder in which sub projects are built:"
-msgstr "编译子工程的顺序(&R)："
+msgid "Text labels will be used in the toolbars if this is checked."
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 16
-#: rc.cpp:6704
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 263
+#: rc.cpp:5662
 #, no-c-format
-msgid "Add New Target"
-msgstr "添加新目标"
+msgid "G&rid"
+msgstr "网格(&R)"
 
-#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 30
-#: rc.cpp:6707
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 286
+#: rc.cpp:5665
 #, no-c-format
-msgid "&Target"
-msgstr "目标(&T)"
+msgid "Sn&ap to grid"
+msgstr "吸附到网格(&A)"
 
-#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 45
-#: rc.cpp:6710
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 292
+#: rc.cpp:5668
 #, no-c-format
-msgid "&Primary:"
-msgstr "主体(&P)："
+msgid "Snap to the grid"
+msgstr "吸附到网格"
 
-#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 68
-#: rc.cpp:6713
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 295
+#: rc.cpp:5671
 #, no-c-format
-msgid "Pre&fix:"
-msgstr "前缀(&F)："
+msgid ""
+"<b>Customize the grid-settings for all forms.</b>"
+"<p>When <b>Snap to Grid</b> is checked, the widgets snap to the grid using the "
+"the X/Y resolution.</p>"
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 91
-#: parts/quickopen/quickopenfiledialog.cpp:41
-#: parts/quickopen/quickopenfiledialog.cpp:56 rc.cpp:6716
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 326
+#: rc.cpp:5674 rc.cpp:5680
 #, no-c-format
-msgid "File &name:"
-msgstr "文件名(&N)："
+msgid "Grid resolution"
+msgstr "网格分辨率"
 
-#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 127
-#: rc.cpp:6719
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 329
+#: rc.cpp:5677 rc.cpp:5683
 #, no-c-format
-msgid "[CANONICALIZED NAME]"
-msgstr "[规范化名称]"
+msgid ""
+"<b>Customize the grid-settings for all forms.</b>"
+"<p>When <b>Show Grid</b> is checked, a grid is shown on all forms using the X/Y "
+"resolution.</p>"
+msgstr ""
 
-#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 170
-#: rc.cpp:6722
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 357
+#: rc.cpp:5686
 #, no-c-format
-msgid "Linker Flags (&LDFLAGS)"
-msgstr "连接标志 (&LDFLAGS)"
+msgid "Grid-&X:"
+msgstr "横向(&X)："
 
-#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 181
-#: rc.cpp:6725
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 368
+#: rc.cpp:5689
 #, no-c-format
-msgid "Do not link against shared libraries (-all-static)"
-msgstr "不连接共享库 (-all-static)"
+msgid "Grid-&Y:"
+msgstr "纵向(&Y)："
 
-#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 189
-#: rc.cpp:6728
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 383
+#: rc.cpp:5692
 #, no-c-format
-msgid "Do not assign version numbers to libraries (-avoid-version)"
-msgstr "不给库指定版本号码 (-avoid-version)"
+msgid "Backgro&und"
+msgstr "背景(&U)"
 
-#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 197
-#: rc.cpp:6731
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 420
+#: rc.cpp:5698
 #, no-c-format
-msgid "Create a library that can be dynamically loaded (-module)"
-msgstr "创建可被动态载入的库 (-module)"
+msgid "Select a color in the color dialog."
+msgstr "在颜色对话框中选择一种颜色。"
 
-#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 205
-#: rc.cpp:6734
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 431
+#: rc.cpp:5701
 #, no-c-format
-msgid "Library does not depend on external symbols (-no-undefined)"
-msgstr "不依赖外部符号的库 (-no-undefined)"
+msgid "Co&lor"
+msgstr "颜色(&L)"
 
-#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 228
-#: rc.cpp:6737
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 434
+#: rc.cpp:5704
 #, no-c-format
-msgid "Ot&her:"
-msgstr "其它(&H)："
+msgid "Use a background color"
+msgstr "使用背景色"
 
-#. i18n: file ./buildtools/autotools/addfiledlgbase.ui line 36
-#: rc.cpp:6746
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 437
+#: rc.cpp:5707
 #, no-c-format
-msgid "Add New Created File to Target"
-msgstr "将新建的文件加入到目标"
+msgid "Use a background color."
+msgstr "使用背景色。"
 
-#. i18n: file ./buildtools/autotools/addfiledlgbase.ui line 135
-#: rc.cpp:6764
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 445
+#: rc.cpp:5710
 #, no-c-format
-msgid "File Information"
-msgstr "文件信息"
+msgid "&Pixmap"
+msgstr "像素图(&P)"
 
-#. i18n: file ./buildtools/autotools/addfiledlgbase.ui line 173
-#: buildtools/script/scriptnewfiledlg.cpp:46 rc.cpp:6767
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 451
+#: rc.cpp:5713
 #, no-c-format
-msgid "&Use file template"
-msgstr "使用文件模板(&U)"
+msgid "Use a background pixmap"
+msgstr "使用后台像素图"
 
-#. i18n: file ./buildtools/autotools/addfiledlgbase.ui line 202
-#: rc.cpp:6770
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 454
+#: rc.cpp:5716
 #, no-c-format
-msgid "New file &name (with extension):"
-msgstr "新文件名(和扩展名)(&N)："
+msgid "Use a background pixmap."
+msgstr "使用后台像素图。"
 
-#. i18n: file ./buildtools/autotools/removefiledlgbase.ui line 16
-#: rc.cpp:6779
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 476
+#: rc.cpp:5719 rc.cpp:5962
 #, no-c-format
-msgid "Remove File From This Target"
-msgstr "从此目标中删除文件"
+msgid "Select a pixmap"
+msgstr "选择像素图"
 
-#. i18n: file ./buildtools/autotools/removefiledlgbase.ui line 79
-#: rc.cpp:6788
+#. i18n: file ./kdevdesigner/designer/preferences.ui line 479
+#: rc.cpp:5722
 #, no-c-format
-msgid "&File Information"
-msgstr "文件信息(&F)"
+msgid "Choose a pixmap file."
+msgstr "选择像素图文件。"
 
-#. i18n: file ./buildtools/autotools/removefiledlgbase.ui line 120
-#: rc.cpp:6797
+#. i18n: file ./kdevdesigner/designer/multilineeditor.ui line 41
+#: rc.cpp:5740
 #, no-c-format
-msgid "<b>Note:</b> You will not be able to undelete the file."
-msgstr "<b>注意：</b>您将无法再恢复这个文件。"
+msgid "Edit Text"
+msgstr "编辑文本"
 
-#. i18n: file ./buildtools/autotools/removefiledlgbase.ui line 215
-#: rc.cpp:6812
+#. i18n: file ./kdevdesigner/designer/multilineeditor.ui line 44
+#: rc.cpp:5743
 #, no-c-format
-msgid "[DIRECTORY NAME]"
-msgstr "[目录名]"
+msgid ""
+"<b>Multiline Edit</b>"
+"<p>This is a simple richtext editor. To improve its usability it provides "
+"toolbar items for the most common html tags: by clicking on a toolbar item, the "
+"corresponding tag will be written to the editor, where you can insert your "
+"text. If you have already written some text and want to format it, hilight it "
+"and click on the desired button.  To improve visualization this editor also "
+"supports a simple html-syntax-highlighting scheme."
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/wizardeditor.ui line 41
-#: rc.cpp:6815
+#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 41
+#: kdevdesigner/designer/mainwindowactions.cpp:739
+#: kdevdesigner/designer/mainwindowactions.cpp:1451
+#: kdevdesigner/designer/mainwindowactions.cpp:1472 rc.cpp:5758
 #, no-c-format
-msgid "Wizard Page Editor"
-msgstr "向导页面编辑器"
+msgid "Create Template"
+msgstr "创建模板"
 
-#. i18n: file ./kdevdesigner/designer/wizardeditor.ui line 86
-#: rc.cpp:6818
+#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 72
+#: rc.cpp:5764
 #, no-c-format
-msgid "Wizard pages:"
-msgstr "向导页面："
+msgid "Name of the new template"
+msgstr "新模板的名称"
 
-#. i18n: file ./kdevdesigner/designer/wizardeditor.ui line 115
-#: rc.cpp:6821
+#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 75
+#: rc.cpp:5767
 #, no-c-format
-msgid "A&dd"
-msgstr "添加(&D)"
+msgid "Enter the name of the new template"
+msgstr "输入新模板的名称"
 
-#. i18n: file ./kdevdesigner/designer/wizardeditor.ui line 225
-#: rc.cpp:6833 rc.cpp:7072 rc.cpp:7210 rc.cpp:7387 rc.cpp:7588 rc.cpp:7651
-#: rc.cpp:8121 rc.cpp:8242 rc.cpp:8290 rc.cpp:8422 rc.cpp:8819
+#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 83
+#: rc.cpp:5770
 #, no-c-format
-msgid "Close the dialog and apply all the changes."
-msgstr "关闭对话框并应用全部更改。"
+msgid "Class of the new template"
+msgstr "新模板的类"
 
-#. i18n: file ./kdevdesigner/designer/wizardeditor.ui line 239
-#: rc.cpp:6839 rc.cpp:7216 rc.cpp:7594 rc.cpp:8296 rc.cpp:8428
+#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 86
+#: rc.cpp:5773
 #, no-c-format
-msgid "Apply all changes."
-msgstr "应用全部更改。"
+msgid ""
+"Enter the name of the class which should be used as the template's base class"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/wizardeditor.ui line 253
-#: rc.cpp:6845 rc.cpp:7078 rc.cpp:7222 rc.cpp:7393 rc.cpp:7600 rc.cpp:7657
-#: rc.cpp:8127 rc.cpp:8248 rc.cpp:8302 rc.cpp:8434 rc.cpp:8674 rc.cpp:8825
+#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 131
+#: rc.cpp:5779
 #, no-c-format
-msgid "Close the dialog and discard any changes."
-msgstr "关闭对话框并丢弃全部更改。"
+msgid "Creates the new template"
+msgstr "创建新模板"
 
-#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 47
-#: rc.cpp:6848
+#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 142
+#: rc.cpp:5785
 #, no-c-format
-msgid "Preview Window"
-msgstr "上一个窗口"
+msgid "Closes the Dialog"
+msgstr "关闭对话框"
 
-#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 92
-#: rc.cpp:6851
+#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 152
+#: rc.cpp:5788
 #, no-c-format
-msgid "ButtonGroup"
-msgstr "按钮组"
+msgid "&Baseclass for template:"
+msgstr "模板的基类(&B)："
 
-#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 109
-#: rc.cpp:6854
+#. i18n: file ./kdevdesigner/designer/pixmapcollectioneditor.ui line 41
+#: rc.cpp:5791
 #, no-c-format
-msgid "RadioButton1"
-msgstr ""
+msgid "Manage Image Collection"
+msgstr "管理图像收藏"
 
-#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 120
-#: rc.cpp:6857
+#. i18n: file ./kdevdesigner/designer/pixmapcollectioneditor.ui line 135
+#: rc.cpp:5806
 #, no-c-format
-msgid "RadioButton2"
-msgstr ""
+msgid "C&lose"
+msgstr "关闭(&L)"
 
-#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 128
-#: rc.cpp:6860
+#. i18n: file ./kdevdesigner/designer/finddialog.ui line 41
+#: rc.cpp:5809
 #, no-c-format
-msgid "RadioButton3"
-msgstr ""
-
-#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 138
-#: rc.cpp:6863
-#, fuzzy, no-c-format
-msgid "ButtonGroup2"
-msgstr "编译分组"
+msgid "Find Text"
+msgstr "查找文本"
 
-#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 155
-#: rc.cpp:6866
+#. i18n: file ./kdevdesigner/designer/finddialog.ui line 72
+#: rc.cpp:5812
 #, no-c-format
-msgid "CheckBox1"
-msgstr "复选框1"
+msgid "F&ind:"
+msgstr "查找(&I)："
 
-#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 166
-#: rc.cpp:6869
+#. i18n: file ./kdevdesigner/designer/finddialog.ui line 132
+#: rc.cpp:5815
 #, no-c-format
-msgid "CheckBox2"
-msgstr "复选框2"
+msgid "&Find"
+msgstr "查找(&F)"
 
-#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 200
-#: rc.cpp:6872
+#. i18n: file ./kdevdesigner/designer/pixmapfunction.ui line 41
+#: rc.cpp:5842
 #, no-c-format
-msgid "LineEdit"
-msgstr "行编辑"
+msgid "Choose Pixmap"
+msgstr "选择像素图"
 
-#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 206
-#: rc.cpp:6875
+#. i18n: file ./kdevdesigner/designer/pixmapfunction.ui line 61
+#: rc.cpp:5845
 #, no-c-format
-msgid "ComboBox"
-msgstr "复选框"
+msgid "&Enter arguments for loading the pixmap:"
+msgstr "输入装入像素图的参数(&E)："
 
-#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 237
-#: rc.cpp:6878
+#. i18n: file ./kdevdesigner/designer/pixmapfunction.ui line 349
+#: rc.cpp:5848
 #, no-c-format
-msgid "PushButton"
-msgstr "按钮"
+msgid "QPixmap("
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/previewwidget.ui line 274
-#: rc.cpp:6881
+#. i18n: file ./kdevdesigner/designer/pixmapfunction.ui line 865
+#: rc.cpp:5851
 #, no-c-format
-msgid ""
-"<p>\n"
-"<a href=\"http://www.trolltech.com/\">http://www.trolltech.com</a>\n"
-"</p>\n"
-"<p>\n"
-"<a href=\"http://www.kde.org/\">http://www.kde.org</a>\n"
-"</p>"
-msgstr ""
-"<p>\n"
-"<a href=\"http://www.trolltech.com/\">http://www.trolltech.com</a>\n"
-"</p>\n"
-"<p>\n"
-"<a href=\"http://www.kde.org/\">http://www.kde.org</a>\n"
-"</p>"
+msgid ")"
+msgstr ")"
 
 #. i18n: file ./kdevdesigner/designer/newform.ui line 41
 #: buildtools/script/scriptnewfiledlg.cpp:36
-#: kdevdesigner/designer/mainwindowactions.cpp:659 rc.cpp:6889
+#: kdevdesigner/designer/mainwindowactions.cpp:659 rc.cpp:5863
 #, no-c-format
 msgid "New File"
 msgstr "新建文件"
 
 #. i18n: file ./kdevdesigner/designer/newform.ui line 47
-#: rc.cpp:6892
+#: rc.cpp:5866
 #, no-c-format
 msgid ""
 "<b>New Form</b>"
@@ -10474,61 +9072,37 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/newform.ui line 115
-#: rc.cpp:6901
+#: rc.cpp:5875
 #, no-c-format
 msgid "Create a new form using the selected template."
 msgstr "使用选中模板创建新表单。"
 
 #. i18n: file ./kdevdesigner/designer/newform.ui line 129
-#: rc.cpp:6907
+#: rc.cpp:5881
 #, no-c-format
 msgid "Close the dialog without creating a new form."
 msgstr "关闭对话框而不创建新表单。"
 
 #. i18n: file ./kdevdesigner/designer/newform.ui line 151
-#: rc.cpp:6910
+#: rc.cpp:5884
 #, no-c-format
 msgid "Displays a list of the available templates."
 msgstr "显示可用的模板列表。"
 
 #. i18n: file ./kdevdesigner/designer/newform.ui line 159
-#: rc.cpp:6913
+#: rc.cpp:5887
 #, no-c-format
 msgid "&Insert into:"
 msgstr "插入到(&I)："
 
-#. i18n: file ./kdevdesigner/designer/connectiondialog.ui line 41
-#: rc.cpp:6916
-#, no-c-format
-msgid "View & Edit Connections"
-msgstr "查看并编辑连接"
-
-#. i18n: file ./kdevdesigner/designer/connectiondialog.ui line 58
-#: parts/filecreate/filecreate_part.cpp:81 rc.cpp:6919
-#, no-c-format
-msgid "&New"
-msgstr "新建(&N)"
-
-#. i18n: file ./kdevdesigner/designer/connectiondialog.ui line 74
-#: rc.cpp:6922
-#, no-c-format
-msgid "&Connections:"
-msgstr "连接(&C)："
-
-#. i18n: file ./kdevdesigner/designer/connectiondialog.ui line 129
-#: rc.cpp:6934
-#, no-c-format
-msgid "&Edit Slots..."
-msgstr "编辑槽(&E)..."
-
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 44
-#: rc.cpp:6937
+#: rc.cpp:5890
 #, no-c-format
 msgid "Tune Palette"
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 50
-#: rc.cpp:6940
+#: rc.cpp:5893
 #, no-c-format
 msgid ""
 "<b>Edit Palette</b>"
@@ -10539,129 +9113,105 @@ msgid ""
 "section.</p>"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 87
-#: rc.cpp:6943 rc.cpp:7633
-#, no-c-format
-msgid "Select &palette:"
-msgstr "选择调色板(&P)："
-
-#. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 96
-#: rc.cpp:6946 rc.cpp:7636
-#, no-c-format
-msgid "Active Palette"
-msgstr "激活的调色板"
-
-#. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 101
-#: rc.cpp:6949 rc.cpp:7639
-#, no-c-format
-msgid "Inactive Palette"
-msgstr "非激活调色板"
-
-#. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 106
-#: rc.cpp:6952 rc.cpp:7642
-#, no-c-format
-msgid "Disabled Palette"
-msgstr "禁用的调色板"
-
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 126
-#: rc.cpp:6955
+#: rc.cpp:5908
 #, no-c-format
 msgid "Auto"
 msgstr "自动"
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 143
-#: rc.cpp:6958
+#: rc.cpp:5911
 #, no-c-format
 msgid "Build the &inactive palette from the active palette"
 msgstr "从活动调色板构建非活动调色板(&I)"
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 154
-#: rc.cpp:6961
+#: rc.cpp:5914
 #, no-c-format
 msgid "Build the &disabled palette from the active palette"
 msgstr "从活动调色板构建禁用的调色板(&D)"
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 167
-#: rc.cpp:6964
+#: rc.cpp:5917
 #, no-c-format
 msgid "Central Color Roles"
 msgstr "中心颜色角色"
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 182
-#: rc.cpp:6967
+#: rc.cpp:5920
 #, no-c-format
 msgid "Background"
 msgstr "背景"
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 187
-#: rc.cpp:6970
+#: rc.cpp:5923
 #, no-c-format
 msgid "Foreground"
 msgstr "前景"
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 192
-#: rc.cpp:6973
+#: rc.cpp:5926
 #, no-c-format
 msgid "Button"
 msgstr "按钮"
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 197
-#: rc.cpp:6976
+#: rc.cpp:5929
 #, no-c-format
 msgid "Base"
 msgstr "基色"
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 202
 #: kdevdesigner/designer/mainwindow.cpp:1735
-#: kdevdesigner/designer/mainwindow.cpp:2638 rc.cpp:6979
+#: kdevdesigner/designer/mainwindow.cpp:2638 rc.cpp:5932
 #, no-c-format
 msgid "Text"
 msgstr "文本"
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 207
-#: rc.cpp:6982
+#: rc.cpp:5935
 #, no-c-format
 msgid "BrightText"
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 212
-#: rc.cpp:6985
+#: rc.cpp:5938
 #, no-c-format
 msgid "ButtonText"
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 217
-#: rc.cpp:6988
+#: rc.cpp:5941
 #, no-c-format
 msgid "Highlight"
 msgstr "加亮"
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 222
-#: rc.cpp:6991
+#: rc.cpp:5944
 #, no-c-format
 msgid "HighlightText"
 msgstr "加亮文本"
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 227
-#: rc.cpp:6994
+#: rc.cpp:5947
 #, no-c-format
 msgid "Link"
 msgstr "链接"
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 232
-#: rc.cpp:6997
+#: rc.cpp:5950
 #, no-c-format
 msgid "LinkVisited"
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 239
-#: rc.cpp:7000
+#: rc.cpp:5953
 #, no-c-format
 msgid "Choose the central color role"
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 242
-#: rc.cpp:7003
+#: rc.cpp:5956
 #, no-c-format
 msgid ""
 "<b>Select a color role.</b>"
@@ -10684,103 +9234,91 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 287
-#: rc.cpp:7006
+#: rc.cpp:5959
 #, no-c-format
 msgid "Choose pi&xmap:"
 msgstr "选择像素图(&X)："
 
-#. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 310
-#: rc.cpp:7009 rc.cpp:7375
-#, no-c-format
-msgid "Select a pixmap"
-msgstr "选择像素图"
-
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 313
-#: rc.cpp:7012
+#: rc.cpp:5965
 #, no-c-format
 msgid "Choose a pixmap file for the selected central color role."
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 333
-#: rc.cpp:7015
+#: rc.cpp:5968
 #, no-c-format
 msgid "&Select color:"
 msgstr "选择颜色(&S)："
 
-#. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 356
-#: rc.cpp:7018 rc.cpp:7060 rc.cpp:7351 rc.cpp:7612 rc.cpp:7621
-#, no-c-format
-msgid "Choose a color"
-msgstr "选择颜色"
-
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 359
-#: rc.cpp:7021
+#: rc.cpp:5974
 #, no-c-format
 msgid "Choose a color for the selected central color role."
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 371
-#: rc.cpp:7024
+#: rc.cpp:5977
 #, no-c-format
 msgid "3-D Shadow Effects"
 msgstr "立体阴影效果"
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 402
-#: rc.cpp:7027
+#: rc.cpp:5980
 #, no-c-format
 msgid "Build &from button color:"
 msgstr "从按钮颜色生成(&F)："
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 408
-#: rc.cpp:7030
+#: rc.cpp:5983
 #, no-c-format
 msgid "Generate shadings"
 msgstr "生成阴影"
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 411
-#: rc.cpp:7033
+#: rc.cpp:5986
 #, no-c-format
 msgid "Check to let 3D-effect colors be calculated from the button-color."
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 417
-#: rc.cpp:7036
+#: rc.cpp:5989
 #, no-c-format
 msgid "Light"
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 422
-#: rc.cpp:7039
+#: rc.cpp:5992
 #, no-c-format
 msgid "Midlight"
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 427
-#: rc.cpp:7042
+#: rc.cpp:5995
 #, no-c-format
 msgid "Mid"
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 432
-#: rc.cpp:7045
+#: rc.cpp:5998
 #, no-c-format
 msgid "Dark"
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 437
-#: rc.cpp:7048
+#: rc.cpp:6001
 #, no-c-format
 msgid "Shadow"
 msgstr "阴影"
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 444
-#: rc.cpp:7051
+#: rc.cpp:6004
 #, no-c-format
 msgid "Choose 3D-effect color role"
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 447
-#: rc.cpp:7054
+#: rc.cpp:6007
 #, no-c-format
 msgid ""
 "<b>Select a color effect role.</b>"
@@ -10794,2523 +9332,4003 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 500
-#: rc.cpp:7057
+#: rc.cpp:6010
 #, no-c-format
 msgid "Select co&lor:"
 msgstr "选择颜色(&L)："
 
 #. i18n: file ./kdevdesigner/designer/paletteeditoradvanced.ui line 526
-#: rc.cpp:7063
+#: rc.cpp:6016
 #, no-c-format
 msgid "Choose a color for the selected effect color role."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 41
-#: rc.cpp:7081
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 41
+#: rc.cpp:6034
 #, no-c-format
-msgid "Replace Text"
-msgstr "替换文本"
+msgid "Edit Listview"
+msgstr "编辑列表视图"
 
-#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 72
-#: rc.cpp:7084
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 47
+#: rc.cpp:6037
 #, no-c-format
-msgid "R&eplace:"
-msgstr "替换(&E)："
+msgid ""
+"<b>Edit Listview</b>"
+"<p>Use the controls on the <b>Items</b>-tab to add, edit or delete items in the "
+"listview. Change the column configuration of the listview using the controls on "
+"the <b>Columns</b>-tab.</p>Click the <b>New Item</b>"
+"-button to create a new item, then enter text and add a pixmap.</p>"
+"<p>Select an item from the list and click the <b>Delete Item</b>"
+"-button to remove the item from the list.</p>"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 83
-#: rc.cpp:7087
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 68
+#: kdevdesigner/designer/listvieweditorimpl.cpp:631 rc.cpp:6040
 #, no-c-format
-msgid "&Find:"
-msgstr "查找(&F)："
+msgid "&Items"
+msgstr "项目(&I)"
 
-#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 159
-#: rc.cpp:7090
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 91
+#: rc.cpp:6049
 #, no-c-format
-msgid "&Replace"
-msgstr "替换(&R)"
+msgid "<b>Deletes the selected item.</b><p>Any sub-items are also deleted.</p>"
+msgstr "<b>删除选中项目。</b><p>任何子项目也将被删除。</p>"
 
-#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 170
-#: rc.cpp:7093
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 107
+#: rc.cpp:6052
 #, no-c-format
-msgid "Replace &All"
-msgstr "全部替换(&A)"
+msgid "Item Properties"
+msgstr "项目属性"
 
-#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 205
-#: rc.cpp:7102 rc.cpp:8070
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 124
+#: rc.cpp:6055
 #, no-c-format
-msgid "&Whole words only"
-msgstr "整词匹配(&W)"
+msgid "Pi&xmap:"
+msgstr "像素图(&X)："
 
-#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 213
-#: rc.cpp:7105 rc.cpp:8073
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 155
+#: rc.cpp:6064
 #, no-c-format
-msgid "Case &sensitive"
-msgstr "区分大小写(&S)"
+msgid ""
+"<b>Change the text of the item.</b>"
+"<p>The text will be changed in the current column of the selected item.</p>"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 221
-#: rc.cpp:7108 rc.cpp:8076
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 163
+#: rc.cpp:6067
 #, no-c-format
-msgid "Start at &beginning"
-msgstr "从头开始(&B)"
+msgid "Change column"
+msgstr "更改列"
 
-#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 231
-#: rc.cpp:7111 rc.cpp:8058
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 166
+#: rc.cpp:6070
 #, no-c-format
-msgid "Direction"
-msgstr "方向"
+msgid ""
+"<b>Select the current column.</b>"
+"<p>The item's text and pixmap will be changed for the current column</p>"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 248
-#: rc.cpp:7114 rc.cpp:8061
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 174
+#: rc.cpp:6073
 #, no-c-format
-msgid "Forwar&d"
-msgstr "向下(&D)"
+msgid "Colu&mn:"
+msgstr "列(&M)："
 
-#. i18n: file ./kdevdesigner/designer/replacedialog.ui line 259
-#: rc.cpp:7117 rc.cpp:8064
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 260
+#: rc.cpp:6100
 #, no-c-format
-msgid "Bac&kward"
-msgstr "向上(&K)"
+msgid ""
+"<b>Adds a new item to the list.</b>"
+"<p>The item will be inserted at the top of the list and can be moved using the "
+"up- and down-buttons.</p>"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/actioneditor.ui line 41
-#: rc.cpp:7120
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 276
+#: rc.cpp:6106
 #, no-c-format
-msgid "Edit Actions"
-msgstr "编辑动作"
+msgid "New &Subitem"
+msgstr "新建子项目(&S)"
 
-#. i18n: file ./kdevdesigner/designer/actioneditor.ui line 83
-#: rc.cpp:7123
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 279
+#: rc.cpp:6109
 #, no-c-format
-msgid "Create new Action"
-msgstr "创建新动作"
+msgid "Add a subitem"
+msgstr "添加子项目"
 
-#. i18n: file ./kdevdesigner/designer/actioneditor.ui line 100
-#: rc.cpp:7126
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 282
+#: rc.cpp:6112
 #, no-c-format
-msgid "Delete current Action"
-msgstr "删除当前动作"
+msgid ""
+"<b>Create a new sub-item for the selected item.</b>"
+"<p>New sub-items are inserted at the top of the list of sub-items, and new "
+"levels are created automatically.</p>"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/actioneditor.ui line 117
-#: rc.cpp:7129
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 316
+#: rc.cpp:6118
 #, no-c-format
-msgid "Connect current Action"
-msgstr "连接当前动作"
+msgid ""
+"<b>Move the selected item up.</b>"
+"<p>The item will be moved within its level in the hierarchy.</p>"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/dbconnectioneditor.ui line 41
-#: rc.cpp:7132
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 333
+#: rc.cpp:6124
 #, no-c-format
-msgid "Connect"
-msgstr "连接"
+msgid ""
+"<b>Move the selected item down.</b>"
+"<p>The item will be moved within its level in the hierarchy.</p>"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/dbconnectioneditor.ui line 94
-#: rc.cpp:7141
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 347
+#: rc.cpp:6127
 #, no-c-format
-msgid "Connection Details"
-msgstr "连接细节"
+msgid "Move left"
+msgstr "左移"
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 41
-#: rc.cpp:7144
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 350
+#: rc.cpp:6130
 #, no-c-format
-msgid "Edit Iconview"
-msgstr "编辑图标视图"
+msgid ""
+"<b>Move the selected item one level up.</b>"
+"<p>This will also change the level of the item's sub-items.</p>"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 47
-#: rc.cpp:7147
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 364
+#: rc.cpp:6133
+#, no-c-format
+msgid "Move right"
+msgstr "右移"
+
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 367
+#: rc.cpp:6136
 #, no-c-format
 msgid ""
-"<b>Edit Iconview</b>"
-"<p>Add, edit or delete items in the icon view.</p>"
-"<p>Click the <b>New Item</b>-button to create a new item, then enter text and "
-"choose a pixmap.</p>"
-"<p>Select an item from the view and click the <b>Delete Item</b>"
-"-button to remove the item from the iconview.</p>"
+"<b>Move the selected item one level down.</b>"
+"<p>This will also change the level of the item's sub-items.</p>"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 78
-#: rc.cpp:7150
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 394
+#: rc.cpp:6142
 #, no-c-format
-msgid "All items in the iconview."
-msgstr "图标视图中的全部项目。"
+msgid "Column Properties"
+msgstr "列属性"
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 100
-#: rc.cpp:7153 rc.cpp:7456 rc.cpp:8344
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 445
+#: rc.cpp:6154
 #, no-c-format
-msgid "&New Item"
-msgstr "新建项目(&N)"
+msgid "Delete the pixmap of the selected column."
+msgstr "删除选中列的像素图。"
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 103
-#: rc.cpp:7156 rc.cpp:7459 rc.cpp:8347
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 465
+#: rc.cpp:6163
 #, no-c-format
-msgid "Add an item"
-msgstr "添加项目"
+msgid ""
+"<b>Select a pixmap file for the selected column.</b>"
+"<p>The pixmap will be displayed in the header of the listview.</p>"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 106
-#: rc.cpp:7159
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 490
+#: rc.cpp:6169
 #, no-c-format
-msgid "Create a new item for the iconview."
-msgstr "在图标视图中创建新项目。"
+msgid "Enter column text"
+msgstr "输入列文本"
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 114
-#: rc.cpp:7162 rc.cpp:7405 rc.cpp:8353
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 493
+#: rc.cpp:6172
 #, no-c-format
-msgid "&Delete Item"
-msgstr "删除项目(&D)"
+msgid ""
+"<b>Enter the text for the selected column.</b>"
+"<p>The text will be displayed in the header of the listview.</p>"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 117
-#: rc.cpp:7165 rc.cpp:7408
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 501
+#: rc.cpp:6175
 #, no-c-format
-msgid "Delete item"
-msgstr "删除项目"
+msgid "Clicka&ble"
+msgstr "可单击(&B)"
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 120
-#: rc.cpp:7168
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 504
+#: rc.cpp:6178
 #, no-c-format
-msgid "Delete the selected item."
-msgstr "删除选中的项目。"
+msgid ""
+"If this option is checked, the selected column will react to mouse clicks on "
+"the header."
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 155
-#: rc.cpp:7171 rc.cpp:8311
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 512
+#: rc.cpp:6181
 #, no-c-format
-msgid "&Item Properties"
-msgstr "项目属性(&I)"
+msgid "Re&sizable"
+msgstr "可更改大小(&S)"
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 172
-#: rc.cpp:7174 rc.cpp:7420 rc.cpp:7528 rc.cpp:8335
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 515
+#: rc.cpp:6184
 #, no-c-format
-msgid "&Text:"
-msgstr "文本(&T)："
+msgid "The column's width will be resizable if this option is checked."
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 189
-#: rc.cpp:7177 rc.cpp:7423 rc.cpp:8338
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 528
+#: rc.cpp:6190
 #, no-c-format
-msgid "Change text"
-msgstr "更改文本"
+msgid "Delete column"
+msgstr "删除列"
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 192
-#: rc.cpp:7180
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 531
+#: rc.cpp:6193
 #, no-c-format
-msgid "Change the text for the selected item."
-msgstr "更改选中项目的文本。"
+msgid "Deletes the selected Column."
+msgstr "删除选中列。"
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 200
-#: rc.cpp:7183 rc.cpp:7507 rc.cpp:8314
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 548
+#: rc.cpp:6199
 #, no-c-format
-msgid "&Pixmap:"
-msgstr "像素图(&P)："
+msgid ""
+"<b>Move the selected item down.</b>"
+"<p>The top-most column will be the first column in the list.</p>"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 225
-#: rc.cpp:7186 rc.cpp:7438 rc.cpp:7510 rc.cpp:8317 rc.cpp:8461 rc.cpp:8518
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 559
+#: rc.cpp:6205
 #, no-c-format
-msgid "Label4"
-msgstr "Label4"
+msgid "Add a Column"
+msgstr "添加列"
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 245
-#: rc.cpp:7189 rc.cpp:7441 rc.cpp:7513 rc.cpp:8320 rc.cpp:8464 rc.cpp:8521
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 562
+#: rc.cpp:6208
 #, no-c-format
-msgid "Delete Pixmap"
-msgstr "删除像素图"
+msgid ""
+"<b>Create a new column.</b>"
+"<p>New columns are appended at the end of (right of) the list and may be moved "
+"using the up- and down-buttons.</p>"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 248
-#: rc.cpp:7192 rc.cpp:8323
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 579
+#: rc.cpp:6214
 #, no-c-format
-msgid "Delete the selected item's pixmap."
-msgstr "删除选中项目的像素图。"
+msgid ""
+"<b>Move the selected item up.</b>"
+"<p>The top-most column will be the first column in the list.</p>"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 265
-#: rc.cpp:7198 rc.cpp:7450 rc.cpp:7522 rc.cpp:7724 rc.cpp:8329 rc.cpp:8473
-#: rc.cpp:8530
+#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 587
+#: rc.cpp:6217
 #, no-c-format
-msgid "Select a Pixmap"
-msgstr "选择像素图"
+msgid "The list of columns."
+msgstr "列列表。"
 
-#. i18n: file ./kdevdesigner/designer/iconvieweditor.ui line 268
-#: rc.cpp:7201
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 41
+#: kdevdesigner/designer/mainwindowactions.cpp:213 rc.cpp:6241
 #, no-c-format
-msgid "Select a pixmap file for the current item."
-msgstr "为当前项目选择像素图。"
+msgid "Form Settings"
+msgstr "表单设置"
 
-#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 41
-#: kdevdesigner/designer/mainwindowactions.cpp:739
-#: kdevdesigner/designer/mainwindowactions.cpp:1451
-#: kdevdesigner/designer/mainwindowactions.cpp:1472 rc.cpp:7225
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 47
+#: rc.cpp:6244
 #, no-c-format
-msgid "Create Template"
-msgstr "创建模板"
+msgid ""
+"<b>Form Settings</b>"
+"<p>Change settings for the form. Settings like <b>Comment</b> and <b>Author</b> "
+"are for your own use and are not required.</p>"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 72
-#: rc.cpp:7231
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 64
+#: rc.cpp:6247
 #, no-c-format
-msgid "Name of the new template"
-msgstr "新模板的名称"
+msgid "Pixmaps"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 75
-#: rc.cpp:7234
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 81
+#: rc.cpp:6250
 #, no-c-format
-msgid "Enter the name of the new template"
-msgstr "输入新模板的名称"
+msgid "Save in&line"
+msgstr "嵌入保存(&L)"
 
-#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 83
-#: rc.cpp:7237
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 87
+#: rc.cpp:6253
 #, no-c-format
-msgid "Class of the new template"
-msgstr "新模板的类"
+msgid "Save pixmaps in the .ui files"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 86
-#: rc.cpp:7240
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 90
+#: rc.cpp:6256
 #, no-c-format
 msgid ""
-"Enter the name of the class which should be used as the template's base class"
+"<b>Save Inline</b>"
+"<p>Saves the pixmaps as binary data in the .ui files. Pixmaps saved like this "
+"are not shared between forms. We recommend using Project image files instead."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 131
-#: rc.cpp:7246
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 98
+#: rc.cpp:6259
 #, no-c-format
-msgid "Creates the new template"
-msgstr "创建新模板"
+msgid "Project &image file"
+msgstr "工程图像文件(&I)"
 
-#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 142
-#: rc.cpp:7252
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 101
+#: rc.cpp:6262
 #, no-c-format
-msgid "Closes the Dialog"
-msgstr "关闭对话框"
+msgid "Use the Project's Image file for pixmaps"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/createtemplate.ui line 152
-#: rc.cpp:7255
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 105
+#: rc.cpp:6265
 #, no-c-format
-msgid "&Baseclass for template:"
-msgstr "模板的基类(&B)："
+msgid ""
+"<b>Use the Project's Image file for pixmaps</b>\n"
+"<p>Each project may have a collection of pixmaps. If you use a project, we "
+"recommend that you use this option since it shares the images and is the "
+"fastest and most efficient way to use pixmaps in your forms.</p>"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 41
-#: kdevdesigner/designer/mainwindowactions.cpp:220 rc.cpp:7258
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 116
+#: rc.cpp:6269
 #, no-c-format
-msgid "Preferences"
-msgstr "首选项"
+msgid ""
+"Specify Pixmap-Loader function (only the function's name, no parentheses.)"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 47
-#: rc.cpp:7261
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 119
+#: rc.cpp:6272
 #, no-c-format
 msgid ""
-"<b>Preferences</b>"
-"<p>Change the preferences of Qt Designer. There is always one tab with general "
-"preferences. There may be additional tabs, depending on which plugins are "
-"installed.</p>"
-msgstr "<b>首选项</b><p>更改 Qt 设计师的首选项。常规首选项标签是必有的，而其它额外的标签取决于安装了何种插件。</p>"
+"<b>Specify Pixmap-Loader function</b>"
+"<p>Specify the function which should be used for loading a pixmap in the "
+"generated code. <em>Only enter the function's name, without parentheses.</em>"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 79
-#: rc.cpp:7267
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 127
+#: rc.cpp:6275
 #, no-c-format
-msgid "File Saving"
-msgstr "文件保存"
+msgid "Use &function:"
+msgstr "使用函数(&F)："
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 90
-#: rc.cpp:7270
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 130
+#: rc.cpp:6278
 #, no-c-format
-msgid "Enable auto sa&ve"
-msgstr "启用自动保存(&V)"
+msgid "Use the given function for pixmaps"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 109
-#: rc.cpp:7273
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 133
+#: rc.cpp:6281
 #, no-c-format
-msgid "Auto save &interval:"
-msgstr "自动保存间隔(&I)："
+msgid ""
+"<b>Use a given function for pixmaps</b>"
+"<p>If you choose this option you must define a function in the line edit at the "
+"right which will be used in the generated code for loading pixmaps. When "
+"choosing a pixmap in <i>Qt Designer</i> you will be asked to specify the "
+"arguments which will be passed to the function in the generated code."
+"<p> This approach makes it possible to use your own icon-loader function for "
+"loading pixmaps.  <i>Qt Designer</i> cannot preview the correct image if you "
+"use your own function."
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 136
-#: rc.cpp:7276
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 166
+#: rc.cpp:6287
 #, no-c-format
-msgid "Plu&gin Paths"
-msgstr "插件路径(&G)"
+msgid "Change class name"
+msgstr "更改类名"
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 166
-#: rc.cpp:7279 rc.cpp:7300
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 169
+#: rc.cpp:6290
 #, no-c-format
 msgid ""
-"A splash screen is displayed when starting Qt Designer if this option is "
-"checked."
+"<b>Enter the name of the class that will be created.</b>"
+"<p><em>classname.h</em> and <em>classname.cpp</em> will be generated as C++ "
+"output when it is compiled by uic.</p>"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 191
-#: rc.cpp:7285
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 177
+#: rc.cpp:6293
 #, no-c-format
-msgid "Restore last &workspace on startup"
-msgstr "启动时恢复上次的工作区(&W)"
+msgid "A&uthor:"
+msgstr "作者(&U)："
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 197
-#: rc.cpp:7288
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 188
+#: rc.cpp:6296
 #, no-c-format
-msgid "Restore last workspace"
-msgstr "恢复上次的工作区"
+msgid "Enter your name"
+msgstr "输入您的姓名"
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 200
-#: rc.cpp:7291
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 191
+#: rc.cpp:6299
 #, no-c-format
-msgid ""
-"The current workspace settings will be restored the next time you start Qt "
-"Designer if this option is checked."
-msgstr ""
+msgid "Enter your name."
+msgstr "输入您的姓名。"
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 208
-#: rc.cpp:7294
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 210
+#: rc.cpp:6305 rc.cpp:7038 rc.cpp:8585 rc.cpp:8771
 #, no-c-format
-msgid "Show &splash screen on startup"
-msgstr "启动时显示飞溅屏幕(&S)"
+msgid "Co&mment:"
+msgstr "注释(&M)："
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 214
-#: rc.cpp:7297
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 221
+#: rc.cpp:6308
 #, no-c-format
-msgid "Show Splashscreen"
-msgstr "显示飞溅屏幕"
+msgid "Enter a comment about the form."
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 225
-#: rc.cpp:7303
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 242
+#: rc.cpp:6311
 #, no-c-format
-msgid "Show start &dialog"
-msgstr "显示启动对话框(&D)"
+msgid "La&youts"
+msgstr "布局(&Y)"
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 236
-#: rc.cpp:7306
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 278
+#: rc.cpp:6314
 #, no-c-format
-msgid "Disable data&base auto-edit in preview"
-msgstr "禁用预览中的数据库自动编辑(&B)"
+msgid "D&efault spacing:"
+msgstr "默认间距(&E)："
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 247
-#: rc.cpp:7309
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 289
+#: rc.cpp:6317
 #, no-c-format
-msgid "Show toolbutton lab&els"
-msgstr "显示工具按钮标签(&E)"
+msgid "Use func&tions:"
+msgstr "使用函数(&T)："
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 250
-#: rc.cpp:7312
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 292
+#: rc.cpp:6320
 #, no-c-format
-msgid "Text Labels"
-msgstr "文本标签"
+msgid "Use functions to get the margin and spacing"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 253
-#: rc.cpp:7315
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 295
+#: rc.cpp:6323
 #, no-c-format
-msgid "Text labels will be used in the toolbars if this is checked."
+msgid ""
+"<b>Use a given function for margin and/or spacing</b>"
+"<p>If you choose this option you must define functions in the line edit below "
+"which will be used in the generated code for getting the margin and spacing "
+"value. <i>Qt Designer</i> cannot preview the correct margin or spacing if you "
+"use your own function. Instead, the default values will be used for preview."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 263
-#: rc.cpp:7318
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 322
+#: rc.cpp:6326
 #, no-c-format
-msgid "G&rid"
-msgstr "网格(&R)"
+msgid "Default mar&gin:"
+msgstr "默认边距(&G)："
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 286
-#: rc.cpp:7321
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 336
+#: rc.cpp:6329
 #, no-c-format
-msgid "Sn&ap to grid"
-msgstr "吸附到网格(&A)"
+msgid "S&pacing:"
+msgstr "间距(&P)："
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 292
-#: rc.cpp:7324
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 358
+#: rc.cpp:6332
 #, no-c-format
-msgid "Snap to the grid"
-msgstr "吸附到网格"
+msgid "Ma&rgin:"
+msgstr "边距(&R)："
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 295
-#: rc.cpp:7327
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 383
+#: rc.cpp:6335
+#, no-c-format
+msgid "Specify spacing function (only the function's name, no parentheses.)"
+msgstr ""
+
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 386
+#: rc.cpp:6338
 #, no-c-format
 msgid ""
-"<b>Customize the grid-settings for all forms.</b>"
-"<p>When <b>Snap to Grid</b> is checked, the widgets snap to the grid using the "
-"the X/Y resolution.</p>"
+"<b>Specify spacing function</b>"
+"<p>Specify the function which should be used for getting the spacing in the "
+"generated code. <em>Only enter the function's name, without parentheses.</em>"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 326
-#: rc.cpp:7330 rc.cpp:7336
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 405
+#: rc.cpp:6341
 #, no-c-format
-msgid "Grid resolution"
-msgstr "网格分辨率"
+msgid "Specify margin function (only the function's name, no parentheses.)"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 329
-#: rc.cpp:7333 rc.cpp:7339
+#. i18n: file ./kdevdesigner/designer/formsettings.ui line 408
+#: rc.cpp:6344
 #, no-c-format
 msgid ""
-"<b>Customize the grid-settings for all forms.</b>"
-"<p>When <b>Show Grid</b> is checked, a grid is shown on all forms using the X/Y "
-"resolution.</p>"
+"<b>Specify margin function</b>"
+"<p>Specify the function which should be used for getting the margin in the "
+"generated code. <em>Only enter the function's name, without parentheses.</em>"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 357
-#: rc.cpp:7342
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 38
+#: rc.cpp:6362
 #, no-c-format
-msgid "Grid-&X:"
-msgstr "横向(&X)："
+msgid "Graphic Filter"
+msgstr "图形过滤器"
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 368
-#: rc.cpp:7345
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 50
+#: rc.cpp:6365
 #, no-c-format
-msgid "Grid-&Y:"
-msgstr "纵向(&Y)："
+msgid "Normal mode"
+msgstr "普通模式"
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 383
-#: rc.cpp:7348
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 58
+#: rc.cpp:6368
 #, no-c-format
-msgid "Backgro&und"
-msgstr "背景(&U)"
+msgid "TV mode"
+msgstr "TV 模式"
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 420
-#: rc.cpp:7354
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 66
+#: rc.cpp:6371
 #, no-c-format
-msgid "Select a color in the color dialog."
-msgstr "在颜色对话框中选择一种颜色。"
+msgid "2xSaI"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 431
-#: rc.cpp:7357
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 74
+#: rc.cpp:6374
 #, no-c-format
-msgid "Co&lor"
-msgstr "颜色(&L)"
+msgid "Super 2xSal"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 434
-#: rc.cpp:7360
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 82
+#: rc.cpp:6377
 #, no-c-format
-msgid "Use a background color"
-msgstr "使用背景色"
+msgid "Super Eagle"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 437
-#: rc.cpp:7363
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 92
+#: rc.cpp:6380
 #, no-c-format
-msgid "Use a background color."
-msgstr "使用背景色。"
+msgid "GBA binary:"
+msgstr "GBA 执行文件："
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 445
-#: rc.cpp:7366
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 105
+#: rc.cpp:6383
 #, no-c-format
-msgid "&Pixmap"
-msgstr "像素图(&P)"
+msgid "Additional parameters:"
+msgstr "其它参数："
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 451
-#: rc.cpp:7369
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 113
+#: rc.cpp:6386
 #, no-c-format
-msgid "Use a background pixmap"
-msgstr "使用后台像素图"
+msgid "VisualBoy Advance (emulator):"
+msgstr "VisualBoy Advance (仿真器)："
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 454
-#: rc.cpp:7372
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 157
+#: rc.cpp:6392
 #, no-c-format
-msgid "Use a background pixmap."
-msgstr "使用后台像素图。"
+msgid "Scaling"
+msgstr "放大"
 
-#. i18n: file ./kdevdesigner/designer/preferences.ui line 479
-#: rc.cpp:7378
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 169
+#: rc.cpp:6395
 #, no-c-format
-msgid "Choose a pixmap file."
-msgstr "选择像素图文件。"
+msgid "1x"
+msgstr "1x"
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 41
-#: rc.cpp:7396
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 177
+#: rc.cpp:6398
 #, no-c-format
-msgid "Edit Listview"
-msgstr "编辑列表视图"
+msgid "2x"
+msgstr "2x"
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 47
-#: rc.cpp:7399
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 185
+#: rc.cpp:6401
 #, no-c-format
-msgid ""
-"<b>Edit Listview</b>"
-"<p>Use the controls on the <b>Items</b>-tab to add, edit or delete items in the "
-"listview. Change the column configuration of the listview using the controls on "
-"the <b>Columns</b>-tab.</p>Click the <b>New Item</b>"
-"-button to create a new item, then enter text and add a pixmap.</p>"
-"<p>Select an item from the list and click the <b>Delete Item</b>"
-"-button to remove the item from the list.</p>"
-msgstr ""
+msgid "3x"
+msgstr "3x"
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 68
-#: kdevdesigner/designer/listvieweditorimpl.cpp:631 rc.cpp:7402
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 193
+#: rc.cpp:6404
 #, no-c-format
-msgid "&Items"
-msgstr "项目(&I)"
+msgid "4x"
+msgstr "4x"
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 91
-#: rc.cpp:7411
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 203
+#: rc.cpp:6407
 #, no-c-format
-msgid "<b>Deletes the selected item.</b><p>Any sub-items are also deleted.</p>"
-msgstr "<b>删除选中项目。</b><p>任何子项目也将被删除。</p>"
+msgid "Full screen"
+msgstr "全屏"
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 107
-#: rc.cpp:7414
+#. i18n: file ./embedded/visualboyadvance/vbaconfigwidgetbase.ui line 211
+#: rc.cpp:6410
 #, no-c-format
-msgid "Item Properties"
-msgstr "项目属性"
+msgid "Start in external terminal"
+msgstr "在外部终端里启动"
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 124
-#: rc.cpp:7417
+#. i18n: file ./vcs/clearcase/integrator/ccintegratordlgbase.ui line 24
+#: rc.cpp:6413 rc.cpp:6748
 #, no-c-format
-msgid "Pi&xmap:"
-msgstr "像素图(&X)："
+msgid "No options available for this VCS."
+msgstr "此 CVS 无此选项。"
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 155
-#: rc.cpp:7426
+#. i18n: file ./vcs/subversion/svnssltrustpromptbase.ui line 16
+#: rc.cpp:6416
 #, no-c-format
-msgid ""
-"<b>Change the text of the item.</b>"
-"<p>The text will be changed in the current column of the selected item.</p>"
+msgid "SSL Certificate Trust"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 163
-#: rc.cpp:7429
+#. i18n: file ./vcs/subversion/subversiondiff.ui line 16
+#: rc.cpp:6419
+#, fuzzy, no-c-format
+msgid "Subversion Diff"
+msgstr "Subversion"
+
+#. i18n: file ./vcs/subversion/commitdlgbase.ui line 16
+#: rc.cpp:6425
 #, no-c-format
-msgid "Change column"
-msgstr "更改列"
+msgid "Log Message"
+msgstr "日志消息"
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 166
-#: rc.cpp:7432
+#. i18n: file ./vcs/subversion/commitdlgbase.ui line 81
+#: rc.cpp:6431 rc.cpp:7546
 #, no-c-format
-msgid ""
-"<b>Select the current column.</b>"
-"<p>The item's text and pixmap will be changed for the current column</p>"
+msgid "Ca&ncel"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 174
-#: rc.cpp:7435
-#, no-c-format
-msgid "Colu&mn:"
-msgstr "列(&M)："
+#. i18n: file ./vcs/subversion/svn_logviewoptiondlgbase.ui line 16
+#: vcs/subversion/subversion_core.cpp:300 rc.cpp:6434
+#, fuzzy, no-c-format
+msgid "Subversion Log View"
+msgstr "Subversion"
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 222
-#: rc.cpp:7444 rc.cpp:8467 rc.cpp:8524
+#. i18n: file ./vcs/subversion/svn_logviewoptiondlgbase.ui line 35
+#: rc.cpp:6440
 #, no-c-format
-msgid ""
-"<b>Delete the selected item's pixmap.</b>"
-"<p>The pixmap in the current column of the selected item will be deleted.</p>"
+msgid "Do not show logs before branching point"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 242
-#: rc.cpp:7453 rc.cpp:8476 rc.cpp:8533
+#. i18n: file ./vcs/subversion/svn_logviewoptiondlgbase.ui line 46
+#: rc.cpp:6443
+#, fuzzy, no-c-format
+msgid "End Revision"
+msgstr "版本"
+
+#. i18n: file ./vcs/subversion/svn_logviewoptiondlgbase.ui line 57
+#: rc.cpp:6446 rc.cpp:6458
+#, fuzzy, no-c-format
+msgid "&By Revision Number"
+msgstr "版本(&R)："
+
+#. i18n: file ./vcs/subversion/svn_logviewoptiondlgbase.ui line 65
+#: rc.cpp:6449 rc.cpp:6461
 #, no-c-format
-msgid ""
-"<b>Select a pixmap file for the item.</b>"
-"<p>The pixmap will be changed in the current column of the selected item.</p>"
+msgid "B&y Revision Specifier"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 260
-#: rc.cpp:7462
+#. i18n: file ./vcs/subversion/svn_logviewoptiondlgbase.ui line 96
+#: rc.cpp:6455
+#, fuzzy, no-c-format
+msgid "Start Revision"
+msgstr "版本"
+
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 16
+#: rc.cpp:6464
+#, fuzzy, no-c-format
+msgid "Subversion Merge"
+msgstr "Subversion 消息"
+
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 27
+#: rc.cpp:6467 rc.cpp:6573
+#, fuzzy, no-c-format
+msgid "Destination"
+msgstr "描述"
+
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 38
+#: rc.cpp:6470
+#, fuzzy, no-c-format
+msgid "Destination working path"
+msgstr "描述"
+
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 53
+#: rc.cpp:6473
+#, fuzzy, no-c-format
+msgid "Source 1"
+msgstr "源文件"
+
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 80
+#: rc.cpp:6476 rc.cpp:6503
+#, fuzzy, no-c-format
+msgid "Number:"
+msgstr "名称："
+
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 91
+#: rc.cpp:6479 rc.cpp:6506
 #, no-c-format
-msgid ""
-"<b>Adds a new item to the list.</b>"
-"<p>The item will be inserted at the top of the list and can be moved using the "
-"up- and down-buttons.</p>"
+msgid "Keyword:"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 268
-#: rc.cpp:7465 rc.cpp:8308
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 97
+#: rc.cpp:6482 rc.cpp:6512 rc.cpp:6591 rc.cpp:6621
 #, no-c-format
-msgid "The list of items."
-msgstr "项目列表。"
+msgid "HEAD"
+msgstr "头"
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 276
-#: rc.cpp:7468
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 102
+#: rc.cpp:6485 rc.cpp:6515 rc.cpp:6594
 #, no-c-format
-msgid "New &Subitem"
-msgstr "新建子项目(&S)"
+msgid "BASE"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 279
-#: rc.cpp:7471
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 107
+#: rc.cpp:6488 rc.cpp:6518
 #, no-c-format
-msgid "Add a subitem"
-msgstr "添加子项目"
+msgid "COMMITTED"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 282
-#: rc.cpp:7474
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 112
+#: rc.cpp:6491 rc.cpp:6521
 #, no-c-format
-msgid ""
-"<b>Create a new sub-item for the selected item.</b>"
-"<p>New sub-items are inserted at the top of the list of sub-items, and new "
-"levels are created automatically.</p>"
+msgid "PREV"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 313
-#: rc.cpp:7477 rc.cpp:7573 rc.cpp:8362 rc.cpp:8440 rc.cpp:8494
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 143
+#: rc.cpp:6494 rc.cpp:6524
+#, fuzzy, no-c-format
+msgid "Source URL or working path:"
+msgstr "源代码路径(&S)："
+
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 151
+#: rc.cpp:6497 rc.cpp:6509
+#, fuzzy, no-c-format
+msgid "Specify revision as"
+msgstr "更改函数名称"
+
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 161
+#: rc.cpp:6500
+#, fuzzy, no-c-format
+msgid "Source 2"
+msgstr "源文件"
+
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 302
+#: rc.cpp:6533
+#, fuzzy, no-c-format
+msgid "--force (Force to delete locally modified or unversioned items.)"
+msgstr "强制删除(删除本地已修改/没有版本的文件)"
+
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 310
+#: rc.cpp:6536
+#, fuzzy, no-c-format
+msgid "--non-recursive"
+msgstr "递归(&R)"
+
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 318
+#: rc.cpp:6539
 #, no-c-format
-msgid "Move up"
-msgstr "上移"
+msgid "--ignore-ancestry"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 316
-#: rc.cpp:7480
+#. i18n: file ./vcs/subversion/svn_mergeoptiondlgbase.ui line 335
+#: rc.cpp:6542
 #, no-c-format
 msgid ""
-"<b>Move the selected item up.</b>"
-"<p>The item will be moved within its level in the hierarchy.</p>"
+"--dry-run (Only receive full result notification\n"
+"                without actually modifying working copy)"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 330
-#: rc.cpp:7483 rc.cpp:7558 rc.cpp:8368 rc.cpp:8446 rc.cpp:8500
+#. i18n: file ./vcs/subversion/svn_commitdlgbase.ui line 36
+#: kdevdesigner/designer/iconvieweditorimpl.cpp:63
+#: kdevdesigner/designer/listboxeditorimpl.cpp:89
+#: kdevdesigner/designer/widgetfactory.cpp:740
+#: kdevdesigner/designer/widgetfactory.cpp:767
+#: kdevdesigner/designer/widgetfactory.cpp:776 rc.cpp:6549 rc.cpp:7483
 #, no-c-format
-msgid "Move down"
-msgstr "下移"
+msgid "New Item"
+msgstr "新建项目"
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 333
-#: rc.cpp:7486
+#. i18n: file ./vcs/subversion/svn_commitdlgbase.ui line 71
+#: rc.cpp:6552
 #, no-c-format
-msgid ""
-"<b>Move the selected item down.</b>"
-"<p>The item will be moved within its level in the hierarchy.</p>"
+msgid "Keep Locks"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 347
-#: rc.cpp:7489
+#. i18n: file ./vcs/subversion/svn_commitdlgbase.ui line 108
+#: rc.cpp:6561
+#, fuzzy, no-c-format
+msgid "Recursive"
+msgstr "递归(&R)"
+
+#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 16
+#: rc.cpp:6564
+#, fuzzy, no-c-format
+msgid "Subversion Copy"
+msgstr "Subversion"
+
+#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 84
+#: rc.cpp:6576
 #, no-c-format
-msgid "Move left"
-msgstr "左移"
+msgid "Specify either the full repository URL or local working path"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 350
-#: rc.cpp:7492
+#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 94
+#: rc.cpp:6579
+#, fuzzy, no-c-format
+msgid "Requested Local Path"
+msgstr "真实路径"
+
+#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 102
+#: rc.cpp:6582
+#, fuzzy, no-c-format
+msgid "Source Revision"
+msgstr "版本"
+
+#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 129
+#: rc.cpp:6585
+#, fuzzy, no-c-format
+msgid "Specify by number:"
+msgstr "修饰符(&P)："
+
+#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 137
+#: rc.cpp:6588
+#, fuzzy, no-c-format
+msgid "Specify by keyword:"
+msgstr "修饰符(&P)："
+
+#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 153
+#: rc.cpp:6597
 #, no-c-format
-msgid ""
-"<b>Move the selected item one level up.</b>"
-"<p>This will also change the level of the item's sub-items.</p>"
+msgid "WORKING"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 364
-#: rc.cpp:7495
+#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 178
+#: kdevdesigner/designer/mainwindowactions.cpp:206 rc.cpp:6600
 #, no-c-format
-msgid "Move right"
-msgstr "右移"
+msgid "Source"
+msgstr "源文件"
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 367
-#: rc.cpp:7498
+#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 197
+#: rc.cpp:6603
 #, no-c-format
-msgid ""
-"<b>Move the selected item one level down.</b>"
-"<p>This will also change the level of the item's sub-items.</p>"
+msgid "Specify by the repository URL of this item"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 377
-#: rc.cpp:7501 rc.cpp:8437
+#. i18n: file ./vcs/subversion/svn_copydlgwidget.ui line 205
+#: rc.cpp:6606
 #, no-c-format
-msgid "Co&lumns"
-msgstr "列(&L)"
+msgid "Specify by local path of this item"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 394
-#: rc.cpp:7504
+#. i18n: file ./vcs/subversion/svn_co.ui line 24
+#: rc.cpp:6609
 #, no-c-format
-msgid "Column Properties"
-msgstr "列属性"
+msgid "Subversion Module Checkout"
+msgstr "Subversion 模块提取"
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 445
-#: rc.cpp:7516
+#. i18n: file ./vcs/subversion/svn_co.ui line 43
+#: rc.cpp:6612
 #, no-c-format
-msgid "Delete the pixmap of the selected column."
-msgstr "删除选中列的像素图。"
+msgid "Server Settings"
+msgstr "服务器设置"
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 465
-#: rc.cpp:7525
+#. i18n: file ./vcs/subversion/svn_co.ui line 62
+#: rc.cpp:6615
 #, no-c-format
-msgid ""
-"<b>Select a pixmap file for the selected column.</b>"
-"<p>The pixmap will be displayed in the header of the listview.</p>"
+msgid "Checkout &from:"
+msgstr "提取来源(&F)："
+
+#. i18n: file ./vcs/subversion/svn_co.ui line 96
+#: rc.cpp:6618
+#, no-c-format
+msgid "&Revision:"
+msgstr "版本(&R)："
+
+#. i18n: file ./vcs/subversion/svn_co.ui line 131
+#: rc.cpp:6624
+#, no-c-format
+msgid "This Project has Standard &Trunk/Branches/Tags/Directories"
+msgstr "此工程含有标准主体/分支/标签/目录(&T)"
+
+#. i18n: file ./vcs/subversion/svn_co.ui line 186
+#: rc.cpp:6633
+#, no-c-format
+msgid "Local Directory"
+msgstr "本地目录"
+
+#. i18n: file ./vcs/subversion/svn_co.ui line 205
+#: rc.cpp:6636
+#, no-c-format
+msgid "C&heckout in:"
+msgstr "提取位置(&H)："
+
+#. i18n: file ./vcs/subversion/svn_co.ui line 239
+#: rc.cpp:6639
+#, no-c-format
+msgid "&Name of the newly created directory:"
+msgstr "新创建的目录名称(&N)："
+
+#. i18n: file ./vcs/subversion/subversionprojectwidget.ui line 16
+#: rc.cpp:6648
+#, no-c-format
+msgid "New Subversion Project"
+msgstr "新 Subversion 工程"
+
+#. i18n: file ./vcs/subversion/subversionprojectwidget.ui line 35
+#: rc.cpp:6651
+#, no-c-format
+msgid "&Import address:"
+msgstr "导入地址(&I)："
+
+#. i18n: file ./vcs/subversion/subversionprojectwidget.ui line 53
+#: rc.cpp:6654
+#, no-c-format
+msgid "Create &Standard Directories (tags/trunk/branches/)?"
+msgstr "要创建标准目录(标签/主体/分支)吗(&S)？"
+
+#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 16
+#: rc.cpp:6663
+#, fuzzy, no-c-format
+msgid "Subversion Switch"
+msgstr "Subversion"
+
+#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 27
+#: rc.cpp:6666
+#, no-c-format
+msgid "Non-recursive. (Switch its immediate children only)"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 490
-#: rc.cpp:7531
+#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 108
+#: rc.cpp:6675
+#, fuzzy, no-c-format
+msgid "Current Repository URL"
+msgstr "CVS 仓库(&R)："
+
+#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 124
+#: rc.cpp:6678
+#, fuzzy, no-c-format
+msgid "Working copy to switch"
+msgstr "目录："
+
+#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 140
+#: rc.cpp:6681
+#, fuzzy, no-c-format
+msgid "Working Mode"
+msgstr "目录："
+
+#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 151
+#: rc.cpp:6684
+#, fuzzy, no-c-format
+msgid "svn switch"
+msgstr "递归开关"
+
+#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 159
+#: rc.cpp:6687
+#, fuzzy, no-c-format
+msgid "svn switch --relocation"
+msgstr "恢复位置(&T)"
+
+#. i18n: file ./vcs/subversion/svn_switchdlgbase.ui line 169
+#: rc.cpp:6690
+#, fuzzy, no-c-format
+msgid "New destination URL"
+msgstr "目的："
+
+#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 55
+#: rc.cpp:6693
+#, fuzzy, no-c-format
+msgid "&Do not do anything"
+msgstr "什么也不做"
+
+#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 65
+#: rc.cpp:6696 rc.cpp:6703
 #, no-c-format
-msgid "Enter column text"
-msgstr "输入列文本"
+msgid ""
+"Adds subversion menus to project.\n"
+"\n"
+"NOTE: Unless you import the project\n"
+"out of tdevelop, you will not be able\n"
+"to perform any subversion operations."
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 493
-#: rc.cpp:7534
+#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 80
+#: rc.cpp:6710
 #, no-c-format
 msgid ""
-"<b>Enter the text for the selected column.</b>"
-"<p>The text will be displayed in the header of the listview.</p>"
+"&Create a project tree and import new project into trunk, then checkout from "
+"the repository"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 501
-#: rc.cpp:7537
+#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 87
+#: rc.cpp:6713 rc.cpp:6720
 #, no-c-format
-msgid "Clicka&ble"
-msgstr "可单击(&B)"
+msgid ""
+"Creates project, imports it into the subversion\n"
+"repository and checks it out as a working copy.\n"
+"\n"
+"NOTE: The repository has to exist.\n"
+"e.g. has been created with 'svnadmin'"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 504
-#: rc.cpp:7540
+#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 103
+#: rc.cpp:6727
 #, no-c-format
 msgid ""
-"If this option is checked, the selected column will react to mouse clicks on "
-"the header."
+"Example for the url (if /home/user/subversion is the subversion repository):\n"
+"file:///home/user/subversion/mynewproject"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 512
-#: rc.cpp:7543
+#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 122
+#: rc.cpp:6731
 #, no-c-format
-msgid "Re&sizable"
-msgstr "可更改大小(&S)"
+msgid "Repository:"
+msgstr "仓库："
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 515
-#: rc.cpp:7546
+#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 135
+#: rc.cpp:6734
 #, no-c-format
-msgid "The column's width will be resizable if this option is checked."
+msgid ""
+"Subversion repository location.\n"
+"The repository has to exist -\n"
+"e.g. has been created with 'svnadmin'"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 525
-#: rc.cpp:7549 rc.cpp:8452
+#. i18n: file ./vcs/subversion/integrator/svnintegratordlgbase.ui line 144
+#: rc.cpp:6739
 #, no-c-format
-msgid "&Delete Column"
-msgstr "删除列(&D)"
+msgid ""
+"Subversion repository location. This should include the subdirectory for the "
+"project in the repository. The project subdirectory and further subdirectories "
+"will be created. \n"
+"\n"
+"So for example if you give http://localhost/svn/projectname the following "
+"directories will be created and the project imported into the trunk "
+"subdirectory:\n"
+"http://localhost/svn/projectname\n"
+"http://localhost/svn/projectname/tags\n"
+"http://localhost/svn/projectname/branches\n"
+"http://localhost/svn/projectname/trunk"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 528
-#: rc.cpp:7552
+#. i18n: file ./vcs/cvsservice/editorsdialogbase.ui line 16
+#: rc.cpp:6751 rc.cpp:8540
 #, no-c-format
-msgid "Delete column"
-msgstr "删除列"
+msgid "Editors"
+msgstr "编辑器"
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 531
-#: rc.cpp:7555
+#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 16
+#: rc.cpp:6757
 #, no-c-format
-msgid "Deletes the selected Column."
-msgstr "删除选中列。"
+msgid "Choose Revisions to Diff"
+msgstr "选择要比较的版本"
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 548
-#: rc.cpp:7561
+#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 30
+#: rc.cpp:6760
 #, no-c-format
-msgid ""
-"<b>Move the selected item down.</b>"
-"<p>The top-most column will be the first column in the list.</p>"
-msgstr ""
+msgid "Build Difference Between"
+msgstr "构建如下版本间的差异"
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 556
-#: rc.cpp:7564 rc.cpp:8455
+#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 49
+#: rc.cpp:6763
 #, no-c-format
-msgid "&New Column"
-msgstr "新建列(&N)"
+msgid "Local copy and an arbitrary &revision:"
+msgstr "本地文件和任一版本(&R)："
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 559
-#: rc.cpp:7567
+#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 67
+#: rc.cpp:6766
 #, no-c-format
-msgid "Add a Column"
-msgstr "添加列"
+msgid "&Two arbitrary revisions/tags:"
+msgstr "两个任意的版本/标签(&T)："
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 562
-#: rc.cpp:7570
+#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 91
+#: rc.cpp:6769
 #, no-c-format
-msgid ""
-"<b>Create a new column.</b>"
-"<p>New columns are appended at the end of (right of) the list and may be moved "
-"using the up- and down-buttons.</p>"
-msgstr ""
+msgid "Revision A:"
+msgstr "版本 A："
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 579
-#: rc.cpp:7576
+#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 105
+#: rc.cpp:6772
+#, no-c-format
+msgid "Second revision to compare (leave empty to diff against HEAD)"
+msgstr "要比较的第二个修订(与HEAD比较保持为空)"
+
+#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 116
+#: rc.cpp:6775
+#, no-c-format
+msgid "First revision to compare"
+msgstr "要比较的第一个修订"
+
+#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 132
+#: rc.cpp:6778
+#, no-c-format
+msgid "Revision B:"
+msgstr "版本 B："
+
+#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 142
+#: rc.cpp:6781
+#, no-c-format
+msgid "Local cop&y and HEAD"
+msgstr "本地副本和 HEAD(&Y)"
+
+#. i18n: file ./vcs/cvsservice/diffdialogbase.ui line 150
+#: rc.cpp:6784
+#, no-c-format
+msgid "Local copy a&nd BASE"
+msgstr "本地副本和 BASE(&N)"
+
+#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 16
+#: rc.cpp:6793
+#, no-c-format
+msgid "CVS Options"
+msgstr "CVS 选项"
+
+#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 27
+#: rc.cpp:6796
+#, no-c-format
+msgid "Common Settings"
+msgstr "公用选项"
+
+#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 46
+#: rc.cpp:6799
+#, no-c-format
+msgid "&Remote shell (CVS_RSH environment variable):"
+msgstr "远程 shell (CVS_RSH 环境变量)(&R)："
+
+#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 57
+#: rc.cpp:6802
 #, no-c-format
+msgid "sets the CVS_RSH variable"
+msgstr "设置 CVS_RSH 变量"
+
+#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 60
+#: rc.cpp:6805
+#, fuzzy, no-c-format
 msgid ""
-"<b>Move the selected item up.</b>"
-"<p>The top-most column will be the first column in the list.</p>"
+"Set this option to \"ssh\" to use ssh as remote shell for CVS. Note that you "
+"need password-less login (see the ssh documentation for how to generate a "
+"public/private key pair) otherwise CVS will just hang forever."
 msgstr ""
+"将这个选项设为“ssh”可以使用 ssh 作为 CVS 的远程 shell。注意您需要设置无需输入口令的登录方式(关于如何生成公用/私有密钥对，请参见 ssh "
+"HOWTO 文档)，不然 CVS 将无法进行。"
 
-#. i18n: file ./kdevdesigner/designer/listvieweditor.ui line 587
-#: rc.cpp:7579
+#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 68
+#: rc.cpp:6808
 #, no-c-format
-msgid "The list of columns."
-msgstr "列列表。"
+msgid "CVS server &location:"
+msgstr "CVS 服务器位置(&L)："
 
-#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 47
-#: rc.cpp:7603
+#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 86
+#: rc.cpp:6811
 #, no-c-format
-msgid "Edit Palette"
-msgstr "编辑调色板"
+msgid "When Updating"
+msgstr "更新时"
 
-#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 70
-#: rc.cpp:7606
+#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 97
+#: rc.cpp:6814
 #, no-c-format
-msgid "Build Palette"
-msgstr "构建调色板"
+msgid "Create &new directories (if any)"
+msgstr "创建新的子目录(如果存在)(&N)"
 
-#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 111
-#: rc.cpp:7609
+#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 105
+#: rc.cpp:6817
 #, no-c-format
-msgid "&3-D effects:"
-msgstr "立体效果(&3)："
+msgid "&Prune empty directories"
+msgstr "去除空目录(&P)"
 
-#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 140
-#: rc.cpp:7615
+#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 113
+#: rc.cpp:6820
 #, no-c-format
-msgid "Choose the effect-color for the generated palette."
-msgstr ""
+msgid "&Update subdirectories too"
+msgstr "更新子目录(&U)"
 
-#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 169
-#: rc.cpp:7618
+#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 123
+#: rc.cpp:6823
 #, no-c-format
-msgid "Back&ground:"
-msgstr "背景(&G)："
+msgid "When Committing/Removing"
+msgstr "提交/删除时"
 
-#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 198
-#: rc.cpp:7624
+#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 134
+#: rc.cpp:6826
 #, no-c-format
-msgid "Choose the background color for the generated palette."
-msgstr ""
+msgid "&Be recursive"
+msgstr "递归(&B)"
 
-#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 223
-#: rc.cpp:7627
+#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 144
+#: rc.cpp:6829
 #, no-c-format
-msgid "&Tune Palette..."
-msgstr ""
+msgid "When Creating Diffs"
+msgstr "创建差异文件时"
 
-#. i18n: file ./kdevdesigner/designer/paletteeditor.ui line 239
-#: rc.cpp:7630
+#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 176
+#: rc.cpp:6832
 #, no-c-format
-msgid "Preview"
-msgstr "预览"
+msgid "Use these e&xtra options:"
+msgstr "使用额外选项(&X)："
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 41
-#: rc.cpp:7660
+#. i18n: file ./vcs/cvsservice/cvsoptionswidgetbase.ui line 209
+#: rc.cpp:6835
 #, no-c-format
-msgid "Edit Custom Widgets"
-msgstr "编辑自定义部件"
+msgid "Con&text lines:"
+msgstr "上下文行数(&T)："
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 47
-#: rc.cpp:7663
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 17
+#: rc.cpp:6838
+#, no-c-format
+msgid "This form allows you to create a CVS repository for your new project"
+msgstr "此表格让您能为新的工程创建一个 CVS 仓库"
+
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 34
+#: rc.cpp:6841
+#, no-c-format
+msgid "Release &tag:"
+msgstr "发行版标签(&T)："
+
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 45
+#: rc.cpp:6844
+#, no-c-format
+msgid "Enter the name of the repository"
+msgstr "输入仓库名"
+
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 49
+#: rc.cpp:6847
 #, no-c-format
 msgid ""
-"<b>Edit Custom Widgets</b>"
-"<p>Add or delete custom widgets from <i>Qt Designer</i>"
-"'s database, and edit the properties of existing widgets.</p>"
+"CVS Repository name goes here.\n"
+"Most of the thime you'll just reuse the project name"
 msgstr ""
+"这里填写 CVS 仓库名。\n"
+"通常您只需直接使用工程名称"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 64
-#: rc.cpp:7666
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 57
+#: rc.cpp:6851 rc.cpp:7020
 #, no-c-format
-msgid "The list of all custom widgets known to Qt Designer."
-msgstr ""
+msgid "vendor"
+msgstr "制作者"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 72
-#: rc.cpp:7669
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 60
+#: rc.cpp:6854
 #, no-c-format
-msgid "&New Widget"
-msgstr "新建部件(&N)"
+msgid "Enter the vendor name"
+msgstr "输入制作者名称"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 75
-#: rc.cpp:7672
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 68
+#: rc.cpp:6857
 #, no-c-format
-msgid "Add new custom widget."
-msgstr "添加新的自定义部件。"
+msgid "&Message:"
+msgstr "消息(&M)："
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 78
-#: rc.cpp:7675
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 79
+#: rc.cpp:6860 rc.cpp:6954 rc.cpp:7059
+#, no-c-format
+msgid "&Module:"
+msgstr "模块(&M)："
+
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 90
+#: rc.cpp:6863 rc.cpp:7032
+#, no-c-format
+msgid "&Vendor tag:"
+msgstr "制作者标签(&V)："
+
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 101
+#: rc.cpp:6866
+#, no-c-format
+msgid "new project"
+msgstr "新建工程"
+
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 104
+#: rc.cpp:6869
+#, no-c-format
+msgid "Repository creation message"
+msgstr "仓库创建消息"
+
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 112
+#: rc.cpp:6872 rc.cpp:7047
+#, no-c-format
+msgid "start"
+msgstr "开始"
+
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 115
+#: rc.cpp:6875
+#, no-c-format
+msgid "Tag that will be associated with initial state"
+msgstr "和初始状态相关联的标签"
+
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 129
+#: rc.cpp:6878
+#, no-c-format
+msgid "&Server path:"
+msgstr "服务器路径(&S)："
+
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 140
+#: rc.cpp:6881
+#, no-c-format
+msgid "Enter your CVS Root location"
+msgstr "输入您的 CVS 根路径"
+
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 144
+#: rc.cpp:6884
 #, no-c-format
 msgid ""
-"<b>Create an empty custom widget and add it to the list.</b>"
-"<p>New custom widgets have a default name and header file, which must both be "
-"changed to appropriate values.</p>"
+"CVS Root location goes here, for example:"
+"<ul>\n"
+"<li>/home/cvsroot or</li>"
+"<li>:pserver:me@localhost:/home/cvs</li></ul>"
 msgstr ""
+"这里填写 CVS 根路径。\n"
+"例如 <tt>/home/cvsroot</tt> 或者 <tt>:pserver:me@localhost:/home/cvs</tt>"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 86
-#: rc.cpp:7678
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 158
+#: rc.cpp:6888
 #, no-c-format
-msgid "&Delete Widget"
-msgstr "删除部件(&D)"
+msgid "CVS_&RSH:"
+msgstr "CVS_&RSH："
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 89
-#: rc.cpp:7681
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 172
+#: rc.cpp:6891
 #, no-c-format
-msgid "Delete custom widget"
-msgstr "删除自定义部件"
+msgid "ssh"
+msgstr "ssh"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 92
-#: rc.cpp:7684
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 184
+#: rc.cpp:6894
 #, no-c-format
+msgid "Init &root"
+msgstr "初始化根路径(&R)"
+
+#. i18n: file ./vcs/cvsservice/cvsformbase.ui line 187
+#: rc.cpp:6897
+#, no-c-format
+msgid "Check if you defined a new CVS Root"
+msgstr "如果您指定了新的 CVS 根路径请选中此项"
+
+#. i18n: file ./vcs/cvsservice/tagdialogbase.ui line 16
+#: rc.cpp:6900
+#, no-c-format
+msgid "Tag Files on CVS Repository"
+msgstr "对 CVS 仓库中的文件加标签"
+
+#. i18n: file ./vcs/cvsservice/tagdialogbase.ui line 38
+#: rc.cpp:6903
+#, no-c-format
+msgid "Tag/Branch &name:"
+msgstr "标签/分支名称(&N)："
+
+#. i18n: file ./vcs/cvsservice/tagdialogbase.ui line 56
+#: rc.cpp:6906
+#, no-c-format
+msgid "Tag as &branch"
+msgstr "标记为分支(&B)"
+
+#. i18n: file ./vcs/cvsservice/tagdialogbase.ui line 64
+#: rc.cpp:6909
+#, no-c-format
+msgid "&Force"
+msgstr "强制(&F)"
+
+#. i18n: file ./vcs/cvsservice/commitdialogbase.ui line 16
+#: rc.cpp:6918
+#, no-c-format
+msgid "Commit to Repository"
+msgstr "提交到仓库"
+
+#. i18n: file ./vcs/cvsservice/commitdialogbase.ui line 30
+#: rc.cpp:6921
+#, no-c-format
+msgid "&Message"
+msgstr "消息(&M)"
+
+#. i18n: file ./vcs/cvsservice/commitdialogbase.ui line 56
+#: rc.cpp:6924
+#, no-c-format
+msgid "&Add to changelog:"
+msgstr "添加到变更日志(&A)："
+
+#. i18n: file ./vcs/cvsservice/commitdialogbase.ui line 67
+#: rc.cpp:6927
+#, fuzzy, no-c-format
+msgid "Change log filename path (relative to project directory)"
+msgstr "改变日志文件路径(相对于工程目录)"
+
+#. i18n: file ./vcs/cvsservice/commitdialogbase.ui line 70
+#: rc.cpp:6930
+#, fuzzy, no-c-format
 msgid ""
-"<b>Delete the selected custom widget.</b>"
-"<p>You can only delete widgets that are not used in any open form.</p>"
-msgstr ""
+"<b>Changelog filename path</b>"
+"<br/>Insert here the Changelog filename you wish to use so that the message is "
+"appended"
+msgstr "<b>Changelog文件名路径</b><br/>在这里输入您希望插入消息的Changelog文件名"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 148
-#: rc.cpp:7693
+#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 24
+#: rc.cpp:6939
 #, no-c-format
-msgid "Closes the Dialog."
-msgstr "关闭对话框。"
+msgid "CVS Server Configuration"
+msgstr "CVS 服务器配置"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 175
-#: rc.cpp:7696
+#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 46
+#: rc.cpp:6945
 #, no-c-format
-msgid "&Load Descriptions..."
-msgstr "装入描述(&L)..."
+msgid "&Local destination directory:"
+msgstr "本地目标目录(&L)："
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 178
-#: rc.cpp:7699
+#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 86
+#: rc.cpp:6948
 #, no-c-format
-msgid "Loads widget description file"
-msgstr "装入部件描述文件"
+msgid "&Server path (e.g. :pserver:marios@cvs.kde.org:/home/kde):"
+msgstr "服务器路径(例如 :pserver:marios@cvs.kde.org:/home/kde)(&S)："
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 182
-#: rc.cpp:7702
+#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 101
+#: rc.cpp:6951
 #, no-c-format
+msgid "Select Module"
+msgstr "选择模块"
+
+#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 156
+#: rc.cpp:6957
+#, no-c-format
+msgid "&Tag/branch:"
+msgstr "标签/分支(&T)："
+
+#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 195
+#: rc.cpp:6960
+#, no-c-format
+msgid "&Prune directories"
+msgstr "剪除子目录(&P)"
+
+#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 201
+#: rc.cpp:6963
+#, no-c-format
+msgid "Creates subdirs if needed"
+msgstr "若有必要则建立子目录"
+
+#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 207
+#: rc.cpp:6966
+#, no-c-format
+msgid "Module"
+msgstr "模块"
+
+#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 218
+#: rc.cpp:6969
+#, no-c-format
+msgid "Real Path"
+msgstr "真实路径"
+
+#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 277
+#: rc.cpp:6972
+#, no-c-format
+msgid "&Fetch Modules List"
+msgstr "获取模块列表(&F)"
+
+#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 283
+#: rc.cpp:6975
+#, no-c-format
+msgid "Fetch modules list from server"
+msgstr "从服务器获取模块列表"
+
+#. i18n: file ./vcs/cvsservice/checkoutdialogbase.ui line 286
+#: rc.cpp:6978
+#, no-c-format
+msgid "Click to fetch modules list from server you specified"
+msgstr "单击从服务器获取您指定的模块列表"
+
+#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 16
+#: rc.cpp:6981
+#, no-c-format
+msgid "Update/Revert to Release/Branch/Date"
+msgstr "更新/返转到发行版/分支/日期"
+
+#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 38
+#: rc.cpp:6984
+#, no-c-format
+msgid "Revision"
+msgstr "版本"
+
+#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 52
+#: rc.cpp:6987
+#, no-c-format
+msgid "&Most recent from current branch"
+msgstr "当前分支的最新版本(&M)"
+
+#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 71
+#: rc.cpp:6990
+#, no-c-format
+msgid "An arbitrary &revision/tag/branch:"
+msgstr "任意的版本/标签/分支(&R)："
+
+#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 85
+#: rc.cpp:6993
+#, no-c-format
+msgid "Type your release name here (leave empty for HEAD)"
+msgstr "在这里输入您的发布名称(使用 HEAD 则留空)"
+
+#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 88
+#: rc.cpp:6996
+#, fuzzy, no-c-format
 msgid ""
-"<b>Load Descriptions</b>"
-"<p>Loads a file which contains descriptions of custom widgets, so that these "
-"custom widgets can be used in the Qt Designer.</p>\n"
-"<p>Since it is a lot of work to type in all the information for custom widgets, "
-"you should consider using the tqtcreatecw tool which is in "
-"$QTDIR/tools/designer/tools/tqtcreatecw. Using tqtcreatecw you can create custom "
-"widget description files for your custom widgets without the need to type in "
-"all the information manually. For more information about the README file in the "
-"tqtcreatecw directory</p>"
-msgstr ""
+"Fill the field with the release or branch name (e.g. <i>"
+"make_it_cool, tdevelop_alpha5, ...</i>)"
+msgstr "输入发布名称(例如　<i>make_it_cool，tdevelop_alpha5，...</i>)"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 190
-#: rc.cpp:7706
+#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 106
+#: rc.cpp:6999
 #, no-c-format
-msgid "&Save Descriptions..."
-msgstr "保存描述(&S)..."
+msgid "An arbitrary &date:"
+msgstr "任意的日期(&D)："
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 193
-#: rc.cpp:7709
+#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 117
+#: rc.cpp:7002
 #, no-c-format
-msgid "Saves widget description file"
-msgstr "保存部件描述文件"
+msgid "FIll the field with a date (e.g. <i>20030204</i>)"
+msgstr "输入日期(例如 <i>20030204</i>)"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 196
-#: rc.cpp:7712
+#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 129
+#: rc.cpp:7005
+#, no-c-format
+msgid "Additional Options"
+msgstr "附加选项"
+
+#. i18n: file ./vcs/cvsservice/releaseinputdialogbase.ui line 140
+#: rc.cpp:7008
+#, no-c-format
+msgid "&Enforce even if the file has been locally modified (revert)"
+msgstr "强迫文件一致如果在本地被修改(恢复)(&E)"
+
+#. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 27
+#: rc.cpp:7017
+#, no-c-format
+msgid "Create module in the repository"
+msgstr "在仓库中创建模块"
+
+#. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 57
+#: rc.cpp:7023
+#, no-c-format
+msgid "&Init Local Repository..."
+msgstr "初始化本地仓库(&I)..."
+
+#. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 90
+#: rc.cpp:7026
+#, no-c-format
+msgid "Login to &Repository..."
+msgstr "登录仓库(&R)..."
+
+#. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 154
+#: rc.cpp:7029
+#, no-c-format
+msgid "Mo&dule:"
+msgstr "模块(&D)："
+
+#. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 198
+#: rc.cpp:7035
+#, no-c-format
+msgid "Re&lease tag:"
+msgstr "发行版标签(&L)："
+
+#. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 242
+#: rc.cpp:7041 rc.cpp:7053
+#, no-c-format
+msgid "&Repository:"
+msgstr "仓库(&R)："
+
+#. i18n: file ./vcs/cvsservice/integrator/integratordlgbase.ui line 256
+#: rc.cpp:7044
+#, no-c-format
+msgid "First Import"
+msgstr "首次导入"
+
+#. i18n: file ./vcs/cvsservice/integrator/fetcherdlgbase.ui line 51
+#: rc.cpp:7050
+#, no-c-format
+msgid "&Branch tag:"
+msgstr "分支标签(&B)："
+
+#. i18n: file ./vcs/cvsservice/integrator/fetcherdlgbase.ui line 97
+#: rc.cpp:7056
+#, no-c-format
+msgid "Fetch &List"
+msgstr "获取列表(&L)"
+
+#. i18n: file ./vcs/cvsservice/integrator/initdlg.ui line 16
+#: rc.cpp:7062
+#, no-c-format
+msgid "Choose Repository Location"
+msgstr "选择仓库位置"
+
+#. i18n: file ./vcs/cvsservice/integrator/initdlg.ui line 35
+#: rc.cpp:7065
+#, no-c-format
+msgid "&Repository location:"
+msgstr "仓库位置(&R)："
+
+#. i18n: file ./buildtools/script/scriptoptionswidgetbase.ui line 16
+#: buildtools/script/scriptprojectpart.cpp:75 rc.cpp:7068
+#, no-c-format
+msgid "Script Project Options"
+msgstr "脚本工程选项"
+
+#. i18n: file ./buildtools/script/scriptoptionswidgetbase.ui line 27
+#: rc.cpp:7071
+#, no-c-format
+msgid "&Include files into the project with the following patterns:"
+msgstr "将如下样式的文件名包含到工程中(&I)："
+
+#. i18n: file ./buildtools/script/scriptoptionswidgetbase.ui line 90
+#: rc.cpp:7074
+#, no-c-format
+msgid "&Exclude the following patterns:"
+msgstr "排除如下样式的文件名(&E)："
+
+#. i18n: file ./buildtools/custommakefiles/custommanagerwidgetbase.ui line 16
+#: rc.cpp:7077
+#, fuzzy, no-c-format
+msgid "Custom Manager Options"
+msgstr "自定义选项"
+
+#. i18n: file ./buildtools/custommakefiles/custommanagerwidgetbase.ui line 35
+#: rc.cpp:7080
+#, fuzzy, no-c-format
+msgid "Filetypes used in Project"
+msgstr "工程中的目标文件"
+
+#. i18n: file ./buildtools/custommakefiles/custommanagerwidgetbase.ui line 41
+#: rc.cpp:7083
 #, no-c-format
 msgid ""
-"<b>Save Descriptions</b>"
-"<p>Saves all the descriptions of the shown custom widgets to a file which can "
-"then be used to import the custom widgets elsewhere."
+"Add filetypes to be used in Projects, can be full filenames or shell wildcards"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 204
-#: rc.cpp:7715
+#. i18n: file ./buildtools/custommakefiles/custommanagerwidgetbase.ui line 45
+#: rc.cpp:7086
 #, no-c-format
-msgid "Change the properties of the selected custom widget."
+msgid ""
+"Each entry contains a filetype used in the project in the form of a filename or "
+"a filename wildcard (using shell wildcards). \n"
+"This will be used when adding/removing files in directories and re-populating "
+"the project"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 211
-#: rc.cpp:7718
+#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 16
+#: buildtools/autotools/autoprojectpart.cpp:234
+#: buildtools/qmake/trollprojectpart.cpp:276 rc.cpp:7090 rc.cpp:7132
+#: rc.cpp:7246
 #, no-c-format
-msgid "De&finition"
-msgstr "定义(&F)"
+msgid "Make Options"
+msgstr "Make 选项"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 262
-#: rc.cpp:7727
+#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 27
+#: rc.cpp:7093
 #, no-c-format
-msgid ""
-"<b>Select a pixmap file.</b>"
-"<p>The pixmap will be used to represent the widget in forms.</p>"
-msgstr ""
+msgid "A&bort on first error"
+msgstr "遇到第一个错误时中止(&A)"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 286
-#: rc.cpp:7730
+#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 35
+#: rc.cpp:7096
 #, no-c-format
-msgid "Enter filename"
-msgstr "输入文件名"
+msgid "Only di&splay commands without actually executing them"
+msgstr "只显示要执行的命令但并不实际执行(&S)"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 289
-#: rc.cpp:7733
+#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 61
+#: rc.cpp:7099
 #, no-c-format
-msgid ""
-"<b>Change the header file's name for the selected custom widget.</b>"
-"<p>The header file will be included by forms using the widget.</p>"
+msgid "A&dditional make options:"
+msgstr "附加 make 选项(&D)："
+
+#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 77
+#: rc.cpp:7102
+#, no-c-format
+msgid "Name of make e&xecutable:"
+msgstr "make 执行文件的名称(&X)："
+
+#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 88
+#: rc.cpp:7105
+#, no-c-format
+msgid "Default make &target:"
+msgstr "默认 make 目标(&T)："
+
+#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 109
+#: rc.cpp:7108
+#, no-c-format
+msgid "Run multiple jobs"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 306
-#: rc.cpp:7739
+#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 120
+#: rc.cpp:7111
 #, no-c-format
-msgid "Choose headerfile"
-msgstr "选择头文件"
+msgid "Number of simultaneous &jobs:"
+msgstr "同时执行的任务个数(&J)："
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 309
-#: rc.cpp:7742
+#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 180
+#: rc.cpp:7114
 #, no-c-format
-msgid "Look for the header file using a file dialog."
+msgid "Make &priority:"
+msgstr "Make 优先级(&P)："
+
+#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 248
+#: rc.cpp:7117 rc.cpp:7147
+#, no-c-format
+msgid "E&nvironment:"
+msgstr "环境变量(&N)："
+
+#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 286
+#: rc.cpp:7123
+#, no-c-format
+msgid "Co&py"
+msgstr "复制(&P)"
+
+#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 297
+#: rc.cpp:7126 rc.cpp:7156
+#, no-c-format
+msgid "Re&move"
+msgstr "删除(&M)"
+
+#. i18n: file ./buildtools/custommakefiles/custommakeconfigwidgetbase.ui line 318
+#: rc.cpp:7129 rc.cpp:7159 rc.cpp:7255 rc.cpp:7402 rc.cpp:8300
+#, no-c-format
+msgid "Environment &Variables"
+msgstr "环境变量(&V)"
+
+#. i18n: file ./buildtools/custommakefiles/customotherconfigwidgetbase.ui line 45
+#: rc.cpp:7135
+#, fuzzy, no-c-format
+msgid "Add&itional options:"
+msgstr "附加选项"
+
+#. i18n: file ./buildtools/custommakefiles/customotherconfigwidgetbase.ui line 61
+#: rc.cpp:7138
+#, fuzzy, no-c-format
+msgid "Name of build &script"
+msgstr "文件名"
+
+#. i18n: file ./buildtools/custommakefiles/customotherconfigwidgetbase.ui line 72
+#: rc.cpp:7141
+#, fuzzy, no-c-format
+msgid "Default &target:"
+msgstr "默认 make 目标(&T)："
+
+#. i18n: file ./buildtools/custommakefiles/customotherconfigwidgetbase.ui line 93
+#: rc.cpp:7144
+#, fuzzy, no-c-format
+msgid "Run with priority:"
+msgstr "与仓库同步"
+
+#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 16
+#: rc.cpp:7162
+#, no-c-format
+msgid "Custom Build Options"
+msgstr "自定义构建选项"
+
+#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 27
+#: rc.cpp:7165
+#, no-c-format
+msgid "Build Tool"
+msgstr "构建工具"
+
+#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 38
+#: rc.cpp:7168
+#, no-c-format
+msgid "&Make"
+msgstr "&Make"
+
+#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 49
+#: rc.cpp:7171
+#, fuzzy, no-c-format
+msgid "A&nt"
+msgstr "&Ant"
+
+#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 57
+#: rc.cpp:7174
+#, fuzzy, no-c-format
+msgid "Other"
+msgstr "其它"
+
+#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 63
+#: rc.cpp:7177
+#, no-c-format
+msgid "other custom build tool, e.g. script"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 327
-#: rc.cpp:7751
+#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 66
+#: rc.cpp:7180
 #, no-c-format
-msgid "Select access"
-msgstr "选择访问"
+msgid ""
+"There are myriads of buildtools out there that are not ant or make. If you use "
+"one of them (or have your own scripts), select this option."
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 330
-#: rc.cpp:7754
+#. i18n: file ./buildtools/custommakefiles/custombuildoptionswidgetbase.ui line 93
+#: rc.cpp:7183
+#, fuzzy, no-c-format
+msgid "Run &the build tool in the following directory:"
+msgstr "在如下目录里运行编译工具(&D)："
+
+#. i18n: file ./buildtools/custommakefiles/selectnewfilesdialogbase.ui line 24
+#: rc.cpp:7186
+#, fuzzy, no-c-format
+msgid "Files to add to the Project:"
+msgstr "为此工程加载的插件"
+
+#. i18n: file ./buildtools/custommakefiles/selectnewfilesdialogbase.ui line 38
+#: rc.cpp:7189
+#, fuzzy, no-c-format
+msgid "Select the files to add to the project"
+msgstr "将选中文件加入到工程"
+
+#. i18n: file ./buildtools/custommakefiles/selectnewfilesdialogbase.ui line 41
+#: rc.cpp:7192
 #, no-c-format
 msgid ""
-"<b>Change how the include file will be included.</b>"
-"<p>Global include files will be included using &lt;&gt;-brackets, while local "
-"files will included using quotation marks.</p>"
+"Select the files and directories that should be added to the list of project "
+"files. All other files and directories will be put into the blacklist."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 340
-#: rc.cpp:7757
+#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 16
+#: rc.cpp:7195 rc.cpp:7222
 #, no-c-format
-msgid "Change classname"
-msgstr "更改类名"
+msgid "Viewer"
+msgstr "查看器"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 343
-#: rc.cpp:7760
+#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 59
+#: rc.cpp:7198 rc.cpp:7240
 #, no-c-format
-msgid ""
-"<b>Enter the classname for the selected custom widget.</b>"
-"<p>A class of that name must be defined in the header file.</p>"
+msgid "Add All From Directory"
+msgstr "从目录添加全部"
+
+#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 73
+#: rc.cpp:7201 rc.cpp:7243
+#, no-c-format
+msgid "Choose File to Add..."
+msgstr "选择要添加的文件..."
+
+#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 137
+#: rc.cpp:7204 rc.cpp:7225
+#, no-c-format
+msgid "Parse Tree"
+msgstr "分析树"
+
+#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 157
+#: rc.cpp:7210 rc.cpp:7231
+#, no-c-format
+msgid "Value 1"
+msgstr "值 1"
+
+#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 168
+#: rc.cpp:7213 rc.cpp:7234
+#, no-c-format
+msgid "Value 2"
+msgstr "值 2"
+
+#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 179
+#: rc.cpp:7216
+#, no-c-format
+msgid "Value 3"
+msgstr "值 3"
+
+#. i18n: file ./buildtools/lib/parsers/qmake/tests/viewerbase.ui line 199
+#: rc.cpp:7219 rc.cpp:7237
+#, no-c-format
+msgid "Source to Be Written Back"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 351
-#: rc.cpp:7763
+#. i18n: file ./buildtools/lib/widgets/makeoptionswidgetbase.ui line 27
+#: rc.cpp:7249
 #, no-c-format
-msgid "Heade&rfile:"
-msgstr "头文件(&R)："
+msgid "&Abort on first error"
+msgstr "遇到第一个错误就中止(&A)"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 362
-#: rc.cpp:7766
+#. i18n: file ./buildtools/lib/widgets/makeoptionswidgetbase.ui line 35
+#: rc.cpp:7252
 #, no-c-format
-msgid "Cl&ass:"
-msgstr "类(&A)："
+msgid "Onl&y display commands without actually executing them"
+msgstr "只显示要执行的命令但并不实际执行(&Y)"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 373
-#: rc.cpp:7769 rc.cpp:8482 rc.cpp:8515
+#. i18n: file ./buildtools/lib/widgets/makeoptionswidgetbase.ui line 51
+#: rc.cpp:7258
 #, no-c-format
-msgid "Pixmap:"
-msgstr "像素图："
+msgid "&Name of make executable:"
+msgstr "make 执行文件的名称(&N)："
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 381
-#: rc.cpp:7772
+#. i18n: file ./buildtools/lib/widgets/makeoptionswidgetbase.ui line 92
+#: rc.cpp:7261
 #, no-c-format
-msgid "Si&ze hint:"
-msgstr "大小提示(&Z)："
+msgid "Num&ber of jobs to run simultaneously:"
+msgstr "同时执行的任务个数(&B)："
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 392
-#: rc.cpp:7775
+#. i18n: file ./buildtools/lib/widgets/makeoptionswidgetbase.ui line 137
+#: rc.cpp:7264
 #, no-c-format
-msgid "Size p&olicy:"
-msgstr "大小策略(&O)："
+msgid "Run more than one &job at a time"
+msgstr "同时运行多个任务(&J)"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 401
-#: lib/widgets/propeditor/propertymachinefactory.cpp:147 rc.cpp:7778
-#: rc.cpp:7814
+#. i18n: file ./buildtools/lib/widgets/makeoptionswidgetbase.ui line 145
+#: rc.cpp:7267
 #, no-c-format
-msgid "Fixed"
-msgstr "固定"
+msgid "Make priority:"
+msgstr "Make 优先级："
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 406
-#: lib/widgets/propeditor/propertymachinefactory.cpp:148 rc.cpp:7781
-#: rc.cpp:7817
+#. i18n: file ./buildtools/lib/widgets/removesubprojectdlgbase.ui line 16
+#: rc.cpp:7270
 #, no-c-format
-msgid "Minimum"
-msgstr "最小"
+msgid "[REMOVE SUBPROJECT]"
+msgstr "[删除子工程]"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 411
-#: lib/widgets/propeditor/propertymachinefactory.cpp:149 rc.cpp:7784
-#: rc.cpp:7820
+#. i18n: file ./buildtools/lib/widgets/removesubprojectdlgbase.ui line 42
+#: rc.cpp:7273
 #, no-c-format
-msgid "Maximum"
-msgstr "最大"
+msgid "&Information"
+msgstr "信息(&I)"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 416
-#: lib/widgets/propeditor/propertymachinefactory.cpp:150 rc.cpp:7787
-#: rc.cpp:7823
+#. i18n: file ./buildtools/lib/widgets/removesubprojectdlgbase.ui line 53
+#: rc.cpp:7276 rc.cpp:8108 rc.cpp:8483
 #, no-c-format
-msgid "Preferred"
-msgstr "首选"
+msgid "[REMOVE QUESTION]"
+msgstr "[删除的问题]"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 421
-#: rc.cpp:7790 rc.cpp:7826
-#, fuzzy, no-c-format
-msgid "MinimumExpanding"
-msgstr "展开目录"
+#. i18n: file ./buildtools/lib/widgets/removesubprojectdlgbase.ui line 61
+#: rc.cpp:7279 rc.cpp:8111 rc.cpp:8486
+#, no-c-format
+msgid "Also &remove it from disk"
+msgstr "同时也从磁盘上删除文件(&R)"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 426
-#: lib/widgets/propeditor/propertymachinefactory.cpp:151 rc.cpp:7793
-#: rc.cpp:7829
+#. i18n: file ./buildtools/lib/widgets/removesubprojectdlgbase.ui line 75
+#: rc.cpp:7282
 #, no-c-format
-msgid "Expanding"
-msgstr "展开"
+msgid "<b>Note:</b> You will not be able to undo this operation."
+msgstr "<b>注意：</b>您将不能撤消此操作。"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 433
-#: rc.cpp:7796
+#. i18n: file ./buildtools/lib/widgets/environmentvariableswidgetbase.ui line 16
+#: rc.cpp:7291
+#, no-c-format
+msgid "Environment Variables"
+msgstr "环境变量"
+
+#. i18n: file ./buildtools/lib/widgets/environmentvariableswidgetbase.ui line 111
+#: rc.cpp:7306
+#, no-c-format
+msgid "A&dd / Copy"
+msgstr "添加/复制(&D)"
+
+#. i18n: file ./buildtools/lib/widgets/environmentvariableswidgetbase.ui line 136
+#: rc.cpp:7309
 #, fuzzy, no-c-format
-msgid "Vertical Sizepolicy"
-msgstr "服务类型(&T)"
+msgid "E&nvironment"
+msgstr "环境变量(&N)："
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 436
-#: rc.cpp:7799
+#. i18n: file ./buildtools/lib/widgets/environmentdisplaydialogbase.ui line 16
+#: rc.cpp:7312
+#, fuzzy, no-c-format
+msgid "Environment"
+msgstr "环境变量(&N)："
+
+#. i18n: file ./buildtools/lib/widgets/environmentdisplaydialogbase.ui line 27
+#: rc.cpp:7315
+#, fuzzy, no-c-format
+msgid "Current Environment"
+msgstr "当前文档"
+
+#. i18n: file ./buildtools/lib/widgets/subclassesdlgbase.ui line 16
+#: rc.cpp:7327
 #, no-c-format
-msgid "Choose the Vertical size policy"
-msgstr ""
+msgid "Related Subclasses"
+msgstr "相关子类"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 453
-#: rc.cpp:7802
+#. i18n: file ./buildtools/lib/widgets/subclassesdlgbase.ui line 30
+#: rc.cpp:7330
 #, no-c-format
-msgid "Size hint width"
+msgid "&Add Relation"
+msgstr "添加关系(&A)"
+
+#. i18n: file ./buildtools/lib/widgets/subclassesdlgbase.ui line 41
+#: rc.cpp:7333
+#, no-c-format
+msgid "&Remove Relation"
+msgstr "删除关系(&R)"
+
+#. i18n: file ./buildtools/lib/widgets/subclassesdlgbase.ui line 96
+#: rc.cpp:7336
+#, no-c-format
+msgid "Related subclass &location:"
+msgstr "相关子类位置(&L)："
+
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 16
+#: buildtools/autotools/autoprojectpart.cpp:233
+#: buildtools/custommakefiles/customprojectpart.cpp:200
+#: buildtools/pascal/pascalproject_part.cpp:403
+#: buildtools/qmake/trollprojectpart.cpp:273
+#: embedded/visualboyadvance/visualboyadvance_part.cpp:71 rc.cpp:7345
+#, no-c-format
+msgid "Run Options"
+msgstr "运行选项"
+
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 35
+#: rc.cpp:7348
+#, fuzzy, no-c-format
+msgid "Main Program"
+msgstr "主程序(&O)"
+
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 52
+#: rc.cpp:7351
+#, no-c-format
+msgid "Note: These options override target specific settings."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 456
-#: rc.cpp:7805 rc.cpp:7811
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 58
+#: rc.cpp:7354
 #, no-c-format
 msgid ""
-"<b>Set the size hint for the selected widget.</b>"
-"<p>The size hint provides the recommended size for the widget. Enter a sizehint "
-"of -1/-1 if no size is recommended.</p>"
+"For Automake and QMake type projects, the proper way to set these options are "
+"per target in the <b>Automake Manager</b> and <b>QMake Manager</b>"
+", respectively."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 473
-#: rc.cpp:7808
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 66
+#: rc.cpp:7357
+#, fuzzy, no-c-format
+msgid "The command line arguments passed to the main program when run"
+msgstr "主程序的命令行参数"
+
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 74
+#: rc.cpp:7360
+#, fuzzy, no-c-format
+msgid "Run Arg&uments:"
+msgstr "参数(&G)："
+
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 85
+#: rc.cpp:7363
+#, fuzzy, no-c-format
+msgid "Executa&ble:"
+msgstr "可执行文件："
+
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 96
+#: rc.cpp:7366
+#, fuzzy, no-c-format
+msgid "Full path to the executable"
+msgstr "剔除可执行文件中的符号信息"
+
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 104
+#: rc.cpp:7369
+#, fuzzy, no-c-format
+msgid "Debug Ar&guments:"
+msgstr "参数(&G)："
+
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 115
+#: rc.cpp:7372
+#, fuzzy, no-c-format
+msgid "The command line arguments passed to the main program when debugged"
+msgstr "主程序的命令行参数"
+
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 123
+#: rc.cpp:7375
+#, fuzzy, no-c-format
+msgid "Working &Directory:"
+msgstr "目录(&D)："
+
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 134
+#: rc.cpp:7378
 #, no-c-format
-msgid "Size hint height"
+msgid "Sets the current working directory for the launched process"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 514
-#: rc.cpp:7832
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 163
+#: rc.cpp:7384
+#, fuzzy, no-c-format
+msgid "Automaticall&y compile before execution"
+msgstr "执行之前自动进行编译(&P)"
+
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 166
+#: rc.cpp:7387
+#, fuzzy, no-c-format
+msgid ""
+"If the program is not up-to-date with the source code, compile it before "
+"starting its execution"
+msgstr "如果程序与源代码不同步，在运行前先编译它"
+
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 174
+#: rc.cpp:7390
+#, fuzzy, no-c-format
+msgid "&Automatically install before execution"
+msgstr "执行之前自动进行编译(&P)"
+
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 185
+#: rc.cpp:7393
 #, no-c-format
-msgid "Horizontal Sizepolicy"
+msgid "Use &tdesu when installing"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 517
-#: rc.cpp:7835
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 196
+#: rc.cpp:7396
+#, fuzzy, no-c-format
+msgid "Start in e&xternal terminal"
+msgstr "在外部终端里启动"
+
+#. i18n: file ./buildtools/lib/widgets/runoptionswidgetbase.ui line 199
+#: rc.cpp:7399
+#, fuzzy, no-c-format
+msgid "Start the main program in an external terminal"
+msgstr "在外部终端里(如 konsole)启动主程序。"
+
+#. i18n: file ./buildtools/ant/classpathwidget.ui line 24
+#: rc.cpp:7405
 #, no-c-format
-msgid "Choose the horizontal size policy for the widget"
-msgstr ""
+msgid "Class&path"
+msgstr "Class&path"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 542
-#: rc.cpp:7838
+#. i18n: file ./buildtools/ant/antoptionswidget.ui line 22
+#: rc.cpp:7408
 #, no-c-format
-msgid "Con&tainer widget"
-msgstr "容器部件(&T)"
+msgid "Quiet"
+msgstr "安静"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 545
-#: rc.cpp:7841
+#. i18n: file ./buildtools/ant/antoptionswidget.ui line 27
+#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:38 rc.cpp:7411
 #, no-c-format
-msgid "Container Widget"
-msgstr "容器部件"
+msgid "Verbose"
+msgstr "详细"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 549
-#: rc.cpp:7844
+#. i18n: file ./buildtools/ant/antoptionswidget.ui line 32
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:356
+#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:410 rc.cpp:7414
+#: rc.cpp:7657
 #, no-c-format
-msgid ""
-"<p><b>Container Widget</b></p>\n"
-"<p>If this custom widget is able to contain other widgets (children), check "
-"this checkbox.</p>"
-msgstr ""
+msgid "Debug"
+msgstr "调试"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 559
-#: rc.cpp:7848
+#. i18n: file ./buildtools/ant/antoptionswidget.ui line 78
+#: rc.cpp:7417
 #, no-c-format
-msgid "Si&gnals"
-msgstr "信号(&N)"
+msgid "&Build file:"
+msgstr "构建文件(&B)："
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 576
-#: rc.cpp:7851
+#. i18n: file ./buildtools/ant/antoptionswidget.ui line 89
+#: rc.cpp:7420
 #, no-c-format
-msgid "The list of all the signals that the selected widget can emit."
-msgstr ""
+msgid "&Verbosity:"
+msgstr "详细程度(&V)："
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 615
-#: rc.cpp:7854
+#. i18n: file ./buildtools/ant/antoptionswidget.ui line 100
+#: rc.cpp:7423 rc.cpp:8789
 #, no-c-format
-msgid "N&ew Signal"
-msgstr "新建信号(&E)"
+msgid "&Properties:"
+msgstr "属性(&P)："
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 621
-#: rc.cpp:7857
+#. i18n: file ./buildtools/pascal/pascalproject_optionsdlgbase.ui line 19
+#: buildtools/pascal/pascalproject_part.cpp:398
+#: buildtools/pascal/pascalproject_part.cpp:434 rc.cpp:7432
 #, no-c-format
-msgid "Add new signal"
-msgstr "添加新信号"
+msgid "Pascal Compiler"
+msgstr "Pascal 编译器"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 624
-#: rc.cpp:7860
+#. i18n: file ./buildtools/pascal/pascalproject_optionsdlgbase.ui line 46
+#: rc.cpp:7435
 #, no-c-format
-msgid ""
-"<b>Add a new signal for the current custom widget.</b>"
-"<p>An argument list should be provided in the signal's name, and the name must "
-"be unique.</p>"
-msgstr ""
+msgid "Con&figuration:"
+msgstr "配置(&F)："
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 632
-#: rc.cpp:7863
+#. i18n: file ./buildtools/pascal/pascalproject_optionsdlgbase.ui line 155
+#: rc.cpp:7447
 #, no-c-format
-msgid "Dele&te Signal"
-msgstr "删除信号(&T)"
+msgid "Compiler op&tions:"
+msgstr "编译器选项(&T)："
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 638
-#: rc.cpp:7866
+#. i18n: file ./buildtools/pascal/pascalproject_optionsdlgbase.ui line 174
+#: rc.cpp:7450
 #, no-c-format
-msgid "Delete signal"
-msgstr "删除信号"
+msgid "&Pascal compiler:"
+msgstr "Pascal 编译器(&P)："
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 641
-#: rc.cpp:7869
+#. i18n: file ./buildtools/pascal/pascalproject_optionsdlgbase.ui line 208
+#: rc.cpp:7453 rc.cpp:8858
 #, no-c-format
-msgid ""
-"<b>Delete the signal.</b>"
-"<p>All connections using this signal will also be deleted.</p>"
-msgstr ""
+msgid "Compiler co&mmand:"
+msgstr "编译器命令(&M)："
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 665
-#: rc.cpp:7872
+#. i18n: file ./buildtools/pascal/pascalproject_optionsdlgbase.ui line 301
+#: rc.cpp:7456
 #, no-c-format
-msgid "S&ignal:"
-msgstr "信号(&I)："
+msgid "Load &Default Compiler Options"
+msgstr "载入默认编译器选项(&D)"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 676
-#: rc.cpp:7875
+#. i18n: file ./buildtools/pascal/pascalproject_optionsdlgbase.ui line 331
+#: rc.cpp:7459 rc.cpp:8861
 #, no-c-format
-msgid "Change signal name"
+msgid "Main &source file:"
+msgstr "主源文件(&S)："
+
+#. i18n: file ./buildtools/qmake/newwidgetdlgbase.ui line 24
+#: rc.cpp:7462
+#, no-c-format
+msgid "New Widget"
+msgstr "新建部件"
+
+#. i18n: file ./buildtools/qmake/newwidgetdlgbase.ui line 43
+#: rc.cpp:7468
+#, no-c-format
+msgid "Widget Properties"
+msgstr "部件属性"
+
+#. i18n: file ./buildtools/qmake/newwidgetdlgbase.ui line 54
+#: rc.cpp:7471
+#, no-c-format
+msgid "Subclassing"
+msgstr "子类"
+
+#. i18n: file ./buildtools/qmake/newwidgetdlgbase.ui line 73
+#: rc.cpp:7474
+#, no-c-format
+msgid "Caption:"
+msgstr "标题："
+
+#. i18n: file ./buildtools/qmake/newwidgetdlgbase.ui line 86
+#: rc.cpp:7477
+#, no-c-format
+msgid "Subclass name:"
+msgstr "子类名："
+
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 16
+#: rc.cpp:7489
+#, no-c-format
+msgid "Create Scope"
+msgstr "创建范围"
+
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 35
+#: rc.cpp:7492
+#, fuzzy, no-c-format
+msgid "Scopetype:"
+msgstr "纸张类型"
+
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 41
+#: rc.cpp:7495
+#, fuzzy, no-c-format
+msgid "Simple Scope"
+msgstr "删除范围"
+
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 46
+#: rc.cpp:7498
+#, fuzzy, no-c-format
+msgid "Function Scope"
+msgstr "函数"
+
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 51
+#: rc.cpp:7501
+#, fuzzy, no-c-format
+msgid "Include File"
+msgstr "转到头文件：%1"
+
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 58
+#: rc.cpp:7504
+#, no-c-format
+msgid "Choose between the different types of new scopes"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 679
-#: rc.cpp:7878 rc.cpp:7899
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 85
+#: buildtools/qmake/trollprojectwidget.cpp:1061 rc.cpp:7507
+#, fuzzy, no-c-format
+msgid "Scope Settings"
+msgstr "片断设置"
+
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 111
+#: rc.cpp:7510
 #, no-c-format
-msgid ""
-"<b>Change the name of the selected slot.</b>"
-"<p>An argument list should be provided in the signal's name, and the name must "
-"be unique.</p>"
+msgid "Specify the new scope name"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 691
-#: rc.cpp:7881
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 119
+#: rc.cpp:7513
+#, fuzzy, no-c-format
+msgid "Scopename:"
+msgstr "类型名称："
+
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 148
+#: rc.cpp:7516
+#, fuzzy, no-c-format
+msgid "Function:"
+msgstr "函数(&U)："
+
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 154
+#: rc.cpp:7519
+#, fuzzy, no-c-format
+msgid "Specify the function name"
+msgstr "更改函数名称"
+
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 162
+#: rc.cpp:7522
+#, fuzzy, no-c-format
+msgid "Arguments:"
+msgstr "参数(&G)："
+
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 168
+#: rc.cpp:7525
 #, no-c-format
-msgid "S&lots"
-msgstr "槽(&L)"
+msgid "Specify the list of function arguments, delimited by a comma"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 706
-#: kdevdesigner/designer/connectiontable.cpp:41
-#: parts/classview/classtreebase.cpp:75 rc.cpp:7884
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 197
+#: rc.cpp:7528
 #, no-c-format
-msgid "Slot"
-msgstr "槽"
+msgid "*.pri"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 736
-#: rc.cpp:7890
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 203
+#: rc.cpp:7531
+#, fuzzy, no-c-format
+msgid "Choose the .pri file to include"
+msgstr "选择要检查的溃核文件..."
+
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 211
+#: rc.cpp:7534
+#, fuzzy, no-c-format
+msgid "Include File:"
+msgstr "转到头文件：%1"
+
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 222
+#: rc.cpp:7537
 #, no-c-format
-msgid "The list of all the custom widget's slots."
+msgid "&use !include instead of include"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 744
-#: rc.cpp:7893
+#. i18n: file ./buildtools/qmake/createscopedlgbase.ui line 225
+#: rc.cpp:7540
 #, no-c-format
-msgid "Sl&ot:"
-msgstr "槽(&O)："
+msgid "Use !include instead of include for the function scope"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 755
-#: rc.cpp:7896
+#. i18n: file ./buildtools/qmake/choosesubprojectdlgbase.ui line 16
+#: rc.cpp:7549
 #, no-c-format
-msgid "Change slot name"
-msgstr "更改槽名称"
+msgid "Select Subproject"
+msgstr "选择子工程"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 766
-#: rc.cpp:7902 rc.cpp:8780
+#. i18n: file ./buildtools/qmake/choosesubprojectdlgbase.ui line 92
+#: rc.cpp:7558 rc.cpp:7564
 #, no-c-format
-msgid "&Access:"
-msgstr "访问(&A)："
+msgid "Subprojects"
+msgstr "子工程"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 775
-#: kdevdesigner/designer/hierarchyview.cpp:762
-#: kdevdesigner/designer/hierarchyview.cpp:843
-#: kdevdesigner/designer/hierarchyview.cpp:852 rc.cpp:7905 rc.cpp:8783
-#: rc.cpp:8849
+#. i18n: file ./buildtools/qmake/disablesubprojectdlgbase.ui line 16
+#: rc.cpp:7561
+#, fuzzy, no-c-format
+msgid "Select Subprojects to disable"
+msgstr "选择子工程"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 25
+#: rc.cpp:7573
 #, no-c-format
-msgid "public"
-msgstr "public"
+msgid "QMake Subproject Configuration"
+msgstr "QMake 子工程设置"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 780
-#: kdevdesigner/designer/customwidgeteditorimpl.cpp:560
-#: kdevdesigner/designer/hierarchyview.cpp:760
-#: kdevdesigner/designer/hierarchyview.cpp:841
-#: kdevdesigner/designer/hierarchyview.cpp:850 rc.cpp:7908 rc.cpp:8786
-#: rc.cpp:8852
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 90
+#: kdevdesigner/designer/multilineeditorimpl.cpp:101 rc.cpp:7585
 #, no-c-format
-msgid "protected"
-msgstr "protected"
+msgid "Basics"
+msgstr "基本"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 787
-#: rc.cpp:7911
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 112
+#: rc.cpp:7591
 #, no-c-format
-msgid "Change slot access"
-msgstr "更改槽访问"
+msgid "Librar&y"
+msgstr "库(&Y)"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 790
-#: rc.cpp:7914
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 115
+#: rc.cpp:7594
 #, no-c-format
-msgid ""
-"<b>Change the slot's access policy.</b>"
-"<p>You can only connect to the widget's public slots.</p>"
+msgid "Create a library"
+msgstr "创建一个库"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 123
+#: rc.cpp:7597
+#, fuzzy, no-c-format
+msgid "&Subdirectories"
+msgstr "子目录(&U)"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 126
+#: rc.cpp:7600
+#, no-c-format
+msgid "This project holds subdirectories"
+msgstr "这个工程含有子目录"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 137
+#: rc.cpp:7603
+#, fuzzy, no-c-format
+msgid "Ordered"
+msgstr "首选"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 140
+#: rc.cpp:7606
+#, no-c-format
+msgid "Build the subprojects in the order they are listed in the .pro file"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 829
-#: rc.cpp:7917
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 168
+#: rc.cpp:7609
+#, fuzzy, no-c-format
+msgid "A&pplication"
+msgstr "应用程序"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 171
+#: rc.cpp:7612
 #, no-c-format
-msgid "N&ew Slot"
-msgstr "新建槽(&E)"
+msgid "Create an application"
+msgstr "创建一个应用程序"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 835
-#: rc.cpp:7920
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 181
+#: rc.cpp:7615
 #, no-c-format
-msgid "Add new slot"
-msgstr "添加新槽"
+msgid "Target"
+msgstr "目标"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 838
-#: rc.cpp:7923
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 192
+#: rc.cpp:7618
+#, fuzzy, no-c-format
+msgid "Path:"
+msgstr "路径(&P)："
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 203
+#: rc.cpp:7621
+#, fuzzy, no-c-format
+msgid "Output file:"
+msgstr "输出文件(&F)："
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 226
+#: rc.cpp:7624
 #, no-c-format
-msgid ""
-"<b>Add a new slot to the current custom widget.</b>"
-"<p>An argument list should be provided in the signal's name, and the name must "
-"be unique.</p>"
-msgstr ""
+msgid "Target Installation"
+msgstr "目标安装"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 846
-#: rc.cpp:7926
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 242
+#: rc.cpp:7627
 #, no-c-format
-msgid "Dele&te Slot"
-msgstr "删除槽(&T)"
+msgid "I&nstall"
+msgstr "安装(&N)"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 852
-#: rc.cpp:7929
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 250
+#: rc.cpp:7630
+#, fuzzy, no-c-format
+msgid "Installation path:"
+msgstr "安装路径(&I)："
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 263
+#: rc.cpp:7633
+#, fuzzy, no-c-format
+msgid "Makefile"
+msgstr "&Makefile"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 284
+#: rc.cpp:7636
+#, fuzzy, no-c-format
+msgid "Arguments"
+msgstr "参数(&G)"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 295
+#: rc.cpp:7639
+#, fuzzy, no-c-format
+msgid "Run arguments:"
+msgstr "参数(&G)："
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 313
+#: rc.cpp:7642
+#, fuzzy, no-c-format
+msgid "Debug Arguments:"
+msgstr "参数(&G)："
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 366
+#: rc.cpp:7651
 #, no-c-format
-msgid "Delete slot"
-msgstr "删除槽"
+msgid "Build Mode"
+msgstr "构建方式"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 855
-#: rc.cpp:7932
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 372
+#: rc.cpp:7654 rc.cpp:7666
 #, no-c-format
-msgid ""
-"<b>Delete the slot.</b>"
-"<p>All connections using this slot will also be deleted.</p>"
-msgstr ""
+msgid "Set project to be built in release mode"
+msgstr "设置工程编译为发行版本"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 867
-#: rc.cpp:7935
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 394
+#: rc.cpp:7660
 #, no-c-format
-msgid "&Properties"
-msgstr "属性(&P)"
+msgid "Set project to be built in debug mode"
+msgstr "设置工程编译为调试版本"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 915
-#: rc.cpp:7938
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 402
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:355
+#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:409 rc.cpp:7663
 #, no-c-format
-msgid "N&ew Property"
-msgstr "新建属性(&E)"
+msgid "Release"
+msgstr "发布版本号"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 921
-#: rc.cpp:7941
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 416
+#: rc.cpp:7669
+#, fuzzy, no-c-format
+msgid "Debug && Release"
+msgstr "发行版(&R)"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 422
+#: rc.cpp:7672
+#, fuzzy, no-c-format
+msgid "Set project to be built in debug_and_release mode"
+msgstr "设置工程编译为发行版本"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 440
+#: rc.cpp:7675
+#, fuzzy, no-c-format
+msgid "Enable warnings"
+msgstr "打开警告(&W)"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 443
+#: rc.cpp:7678
 #, no-c-format
-msgid "Add new property"
-msgstr "添加新属性"
+msgid "Show compiler warnings"
+msgstr "显示编译器警告"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 924
-#: rc.cpp:7944
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 454
+#: rc.cpp:7681
 #, no-c-format
-msgid ""
-"<b>Add a new property to the current custom widget.</b>"
-"<p>The properties must be implemented in the class using Qt's property "
-"system.</p>"
+msgid "Build All"
+msgstr "全部构建"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 457
+#: rc.cpp:7684
+#, no-c-format
+msgid "Builds Debug and Release version if Debug&Release is configured"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 932
-#: rc.cpp:7947
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 469
+#: rc.cpp:7687
 #, no-c-format
-msgid "Dele&te Property"
-msgstr "删除属性(&T)"
+msgid "Requirements"
+msgstr "需要"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 938
-#: rc.cpp:7950
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 480
+#: rc.cpp:7690 rc.cpp:7753
+#, fuzzy, no-c-format
+msgid "OpenGL"
+msgstr "Open&GL"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 483
+#: rc.cpp:7693
 #, no-c-format
-msgid "Delete property"
-msgstr "删除属性"
+msgid "Requires the OpenGL (or Mesa) headers/libraries"
+msgstr "需要 OpenGL(或 Mesa)头文件和库"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 941
-#: rc.cpp:7953
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 491
+#: rc.cpp:7696
+#, fuzzy, no-c-format
+msgid "STL"
+msgstr "&STL"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 499
+#: parts/valgrind/valgrind_widget.cpp:96 rc.cpp:7699
 #, no-c-format
-msgid "Deletes the selected property."
-msgstr "删除选中属性。"
+msgid "Thread"
+msgstr "线程"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 949
-#: rc.cpp:7956
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 502
+#: rc.cpp:7702
 #, no-c-format
-msgid "String"
-msgstr "String"
+msgid "Requires support for multi-threaded application or library."
+msgstr "需要对多线程程序的支持或库。"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 954
-#: rc.cpp:7959
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 510
+#: rc.cpp:7705
+#, fuzzy, no-c-format
+msgid "Qt"
+msgstr "&Qt"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 513
+#: rc.cpp:7708
 #, no-c-format
-msgid "CString"
-msgstr "CString"
+msgid "Requires the Qt header files/library"
+msgstr "需要 Qt 头文件和库"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 959
-#: rc.cpp:7962
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 521
+#: rc.cpp:7711
+#, fuzzy, no-c-format
+msgid "X11"
+msgstr "X&11"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 524
+#: rc.cpp:7714 rc.cpp:7804
 #, no-c-format
-msgid "StringList"
-msgstr "StringList"
+msgid "Support required for X11 application or library"
+msgstr "需要对 X11 程序的支持或库"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 964
-#: rc.cpp:7965
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 532
+#: rc.cpp:7717
 #, no-c-format
-msgid "Bool"
-msgstr "Bool"
+msgid "Precompiled headers"
+msgstr "预编译头文件"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 969
-#: rc.cpp:7968
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 540
+#: rc.cpp:7720
+#, fuzzy, no-c-format
+msgid "RTTI"
+msgstr "RTT&I"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 548
+#: rc.cpp:7723
+#, fuzzy, no-c-format
+msgid "Windows"
+msgstr "窗口"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 556
+#: rc.cpp:7726
+#, fuzzy, no-c-format
+msgid "Custom Configuration"
+msgstr "构建配置"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 564
+#: rc.cpp:7729
+#, fuzzy, no-c-format
+msgid "Exceptions "
+msgstr "例外(&X)"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 580
+#: rc.cpp:7732
 #, no-c-format
-msgid "Int"
-msgstr "Int"
+msgid "Console"
+msgstr "控制台"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 974
-#: rc.cpp:7971
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 586
+#: rc.cpp:7735
 #, no-c-format
-msgid "UInt"
-msgstr "UInt"
+msgid "Check to build a win32 console app"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 984
-#: rc.cpp:7977
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 599
+#: rc.cpp:7738
+#, fuzzy, no-c-format
+msgid "Qt4 Libraries"
+msgstr "库"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 610
+#: rc.cpp:7741
 #, no-c-format
-msgid "Color"
-msgstr "颜色"
+msgid "Gui"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 989
-#: rc.cpp:7980
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 621
+#: parts/doxygen/messages.cpp:202 rc.cpp:7744
 #, no-c-format
-msgid "Rect"
-msgstr "矩形"
+msgid "XML"
+msgstr "XML"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 994
-#: rc.cpp:7983
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 629
+#: rc.cpp:7747
+#, fuzzy, no-c-format
+msgid "Network"
+msgstr "新建"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 637
+#: src/profileengine/editor/profileeditor.cpp:137 rc.cpp:7750
 #, no-c-format
-msgid "Point"
-msgstr "点"
+msgid "Core"
+msgstr "核心"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 999
-#: languages/cpp/app_templates/tdefileplugin/tdefile_plugin.cpp:32 rc.cpp:7986
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 656
+#: rc.cpp:7756
+#, fuzzy, no-c-format
+msgid "QtUiTools"
+msgstr "工具"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 664
+#: languages/sql/sqlsupport_part.cpp:59 rc.cpp:7759
 #, no-c-format
-msgid "Size"
-msgstr "大小"
+msgid "SQL"
+msgstr "SQL"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1004
-#: rc.cpp:7989
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 672
+#: rc.cpp:7762
 #, no-c-format
-msgid "Pixmap"
-msgstr "像素图"
+msgid "SVG"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1009
-#: rc.cpp:7992
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 680
+#: rc.cpp:7765
+#, fuzzy, no-c-format
+msgid "QtTest"
+msgstr "测试(&T)"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 688
+#: rc.cpp:7768
+#, fuzzy, no-c-format
+msgid "Qt3 Support"
+msgstr "C++ 支持"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 696
+#: rc.cpp:7771
 #, no-c-format
-msgid "Palette"
-msgstr "调色板"
+msgid "QDBus (Qt4.2)"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1014
-#: rc.cpp:7995
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 704
+#: rc.cpp:7774
+#, fuzzy, no-c-format
+msgid "QtAssistant"
+msgstr "KDevelop 助手"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 712
+#: rc.cpp:7777
 #, no-c-format
-msgid "Cursor"
-msgstr "光标"
+msgid "QtScript (Qt4.3)"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1019
-#: rc.cpp:7998
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 720
+#: rc.cpp:7780
 #, no-c-format
-msgid "SizePolicy"
+msgid "QtWebKit (Qt4.4)"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1026
-#: rc.cpp:8001
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 728
+#: rc.cpp:7783
 #, no-c-format
-msgid "Select property type"
-msgstr "选择属性类型"
+msgid "QtXmlPatterns (Qt4.4)"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1029
-#: rc.cpp:8004
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 736
+#: rc.cpp:7786
 #, no-c-format
-msgid ""
-"<b>Select the type of the property.</b>"
-"<p>The property must be implemented in the class using Qt's property system.</p>"
-"<p>You can use integer types to support enumeration properties in the property "
-"editor.</p>"
+msgid "Phonon (Qt4.4)"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1065
-#: rc.cpp:8013
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 744
+#: rc.cpp:7789
 #, no-c-format
-msgid ""
-"<b>The list of the current widget's properties.</b>"
-"<p>The properties of the custom widget can be changed in the property "
-"editor.</p>"
+msgid "QtHelp (Qt4.4)"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1073
-#: rc.cpp:8016
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 754
+#: rc.cpp:7792
 #, no-c-format
-msgid "Change property name"
-msgstr "改变属性名称"
+msgid "Library Options"
+msgstr "库选项"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1076
-#: rc.cpp:8019
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 776
+#: rc.cpp:7795
+#, fuzzy, no-c-format
+msgid "Build as static library"
+msgstr "静态库(&A)"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 801
+#: rc.cpp:7801
+#, fuzzy, no-c-format
+msgid "Make libtool archive"
+msgstr "制作 libtool 存档(&K)"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 839
+#: rc.cpp:7807
+#, fuzzy, no-c-format
+msgid "Build as shared library"
+msgstr "共享库(&H)"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 850
+#: rc.cpp:7810
+#, fuzzy, no-c-format
+msgid "Designer Plugin"
+msgstr "禁用插件"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 869
+#: rc.cpp:7813
+#, fuzzy, no-c-format
+msgid "Library version:"
+msgstr "库版本(&Y)："
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 910
+#: rc.cpp:7816
+#, fuzzy, no-c-format
+msgid "Includes"
+msgstr "包含(&I)"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 932
+#: rc.cpp:7819 rc.cpp:7840 rc.cpp:7861 rc.cpp:7879 rc.cpp:7888 rc.cpp:7900
+#: rc.cpp:7918 rc.cpp:7927 rc.cpp:7990
+#, fuzzy, no-c-format
+msgid "Move Up"
+msgstr "上移(&U)"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 940
+#: rc.cpp:7822 rc.cpp:7843 rc.cpp:7864 rc.cpp:7882 rc.cpp:7891 rc.cpp:7903
+#: rc.cpp:7921 rc.cpp:7930 rc.cpp:7993
+#, fuzzy, no-c-format
+msgid "Move Down"
+msgstr "下移(&N)"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 965
+#: rc.cpp:7825
 #, no-c-format
-msgid ""
-"<b>Enter a name for the property.</b>"
-"<p>The properties must be implemented in the class using Qt's property "
-"system.</p>"
-msgstr ""
+msgid "Directories Outside Project"
+msgstr "工程外的目录"
 
-#. i18n: file ./kdevdesigner/designer/customwidgeteditor.ui line 1084
-#: rc.cpp:8022
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 984
+#: rc.cpp:7828
 #, no-c-format
-msgid "P&roperty name:"
-msgstr "属性名(&R)："
+msgid "Directories Inside Project"
+msgstr "工程内的目录"
 
-#. i18n: file ./kdevdesigner/designer/listeditor.ui line 96
-#: rc.cpp:8040
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1013
+#: rc.cpp:7831 rc.cpp:7852 rc.cpp:7870 rc.cpp:7909
+#, fuzzy, no-c-format
+msgid "Add..."
+msgstr "添加(&A)..."
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1074
+#: rc.cpp:7846
 #, no-c-format
-msgid "Re&name"
-msgstr "重命名(&N)"
+msgid "Libraries"
+msgstr "库"
 
-#. i18n: file ./kdevdesigner/designer/finddialog.ui line 41
-#: rc.cpp:8046
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1091
+#: rc.cpp:7849
+#, fuzzy, no-c-format
+msgid "External Library Dirs"
+msgstr "外部库"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1187
+#: rc.cpp:7867
 #, no-c-format
-msgid "Find Text"
-msgstr "查找文本"
+msgid "External Libraries"
+msgstr "外部库"
 
-#. i18n: file ./kdevdesigner/designer/finddialog.ui line 72
-#: rc.cpp:8049
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1283
+#: rc.cpp:7885
 #, no-c-format
-msgid "F&ind:"
-msgstr "查找(&I)："
+msgid "Link Convenience Libraries Inside Project"
+msgstr "连接工程之内的库"
 
-#. i18n: file ./kdevdesigner/designer/finddialog.ui line 132
-#: rc.cpp:8052
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1351
+#: rc.cpp:7894
+#, fuzzy, no-c-format
+msgid "Dependencies"
+msgstr "依赖关系(&D)"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1368
+#: rc.cpp:7897
 #, no-c-format
-msgid "&Find"
-msgstr "查找(&F)"
+msgid "Targets in Project"
+msgstr "工程内的目标"
 
-#. i18n: file ./kdevdesigner/designer/about.ui line 41
-#: kdevdesigner/designer/formfile.cpp:654
-#: kdevdesigner/designer/sourcefile.cpp:266 rc.cpp:8079
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1443
+#: rc.cpp:7906
 #, no-c-format
-msgid "Qt Designer"
-msgstr "Qt 设计师"
+msgid "Miscellaneous Targets"
+msgstr "杂项目标"
 
-#. i18n: file ./kdevdesigner/designer/about.ui line 80
-#: rc.cpp:8082
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1539
+#: rc.cpp:7924
 #, no-c-format
-msgid "Version 3.2"
-msgstr "版本 3.2"
+msgid "Order in Which Sub Projects Are Built"
+msgstr "构建子工程的顺序"
 
-#. i18n: file ./kdevdesigner/designer/about.ui line 93
-#: rc.cpp:8085
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1610
+#: buildtools/custommakefiles/customprojectpart.cpp:203 rc.cpp:7933
 #, no-c-format
-msgid "Copyright (C) 2000-2003 Trolltech AS. All Rights Reserved."
-msgstr ""
+msgid "Build Options"
+msgstr "编译选项"
 
-#. i18n: file ./kdevdesigner/designer/about.ui line 114
-#: rc.cpp:8088
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1629
+#: rc.cpp:7936
 #, no-c-format
-msgid ""
-"<p>Qt Commercial Edition license holders: This program is licensed to you under "
-"the terms of the Qt Commercial License Agreement. For details, see the file "
-"LICENSE that came with this software distribution.</p>"
-"<p></p>"
-"<p>Qt Free Edition users: This program is licensed to you under the terms of "
-"the GNU General Public License Version 2. For details, see the file LICENSE.GPL "
-"that came with this software distribution.</p>"
-"<p>The program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE "
-"WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.</p>"
-msgstr ""
+msgid "Compiler Options"
+msgstr "编译器选项"
 
-#. i18n: file ./kdevdesigner/designer/projectsettings.ui line 41
-#: rc.cpp:8094
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1656
+#: rc.cpp:7939
+#, fuzzy, no-c-format
+msgid "Debug flags:"
+msgstr "调试版标志(&D)："
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1667
+#: rc.cpp:7942
+#, fuzzy, no-c-format
+msgid "Release flags:"
+msgstr "发行版编译选项(&R)："
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1678
+#: rc.cpp:7945
 #, no-c-format
-msgid "Project Settings"
-msgstr "工程设置"
+msgid "Defines:"
+msgstr "定义："
 
-#. i18n: file ./kdevdesigner/designer/projectsettings.ui line 76
-#: rc.cpp:8100
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1717
+#: rc.cpp:7948
 #, no-c-format
-msgid "&Project file:"
-msgstr "工程文件(&P)："
+msgid "Intermediate File Directories"
+msgstr "中间文件目录"
 
-#. i18n: file ./kdevdesigner/designer/projectsettings.ui line 87
-#: rc.cpp:8103
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1736
+#: rc.cpp:7951
+#, fuzzy, no-c-format
+msgid "MOC files:"
+msgstr "MOC 文件(&M)："
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1747
+#: rc.cpp:7954
+#, fuzzy, no-c-format
+msgid "UI files:"
+msgstr "UI 文件(&U)："
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1758
+#: rc.cpp:7957
+#, fuzzy, no-c-format
+msgid "Object files:"
+msgstr "目标文件(&J)："
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1772
+#: rc.cpp:7960
+#, fuzzy, no-c-format
+msgid "RCC files:"
+msgstr "MOC 文件(&M)："
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1817
+#: rc.cpp:7963
 #, no-c-format
-msgid "&Language:"
-msgstr "语言(&L)："
+msgid "Corba"
+msgstr "Corba"
 
-#. i18n: file ./kdevdesigner/designer/projectsettings.ui line 111
-#: rc.cpp:8109
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1831
+#: rc.cpp:7966
+#, fuzzy, no-c-format
+msgid "Compiler options:"
+msgstr "编译器选项(&T)："
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1852
+#: rc.cpp:7969
+#, fuzzy, no-c-format
+msgid "IDL compiler:"
+msgstr "IDL 编译器(&I)："
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1884
+#: rc.cpp:7972
+#, fuzzy, no-c-format
+msgid "Custom Variables"
+msgstr "自定义变量(&V)"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1912
+#: rc.cpp:7978 rc.cpp:7999
+#, fuzzy, no-c-format
+msgid "Operator"
+msgstr "操作"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 1974
+#: kdevdesigner/designer/mainwindowactions.cpp:629
+#: kdevdesigner/designer/mainwindowactions.cpp:644 rc.cpp:7984
 #, no-c-format
-msgid "&Database file:"
-msgstr "数据库文件(&D)："
+msgid "New"
+msgstr "新建"
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 41
-#: kdevdesigner/designer/mainwindowactions.cpp:213 rc.cpp:8130
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 2082
+#: rc.cpp:8002
+#, fuzzy, no-c-format
+msgid "+="
+msgstr "+"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 2087
+#: rc.cpp:8005
+#, fuzzy, no-c-format
+msgid "-="
+msgstr "-"
+
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 2092
+#: rc.cpp:8008
 #, no-c-format
-msgid "Form Settings"
-msgstr "表单设置"
+msgid "="
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 47
-#: rc.cpp:8133
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 2097
+#: rc.cpp:8011
 #, no-c-format
-msgid ""
-"<b>Form Settings</b>"
-"<p>Change settings for the form. Settings like <b>Comment</b> and <b>Author</b> "
-"are for your own use and are not required.</p>"
+msgid "*="
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 64
-#: rc.cpp:8136
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 2102
+#: rc.cpp:8014
 #, no-c-format
-msgid "Pixmaps"
+msgid "~="
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 81
-#: rc.cpp:8139
+#. i18n: file ./buildtools/qmake/projectconfigurationdlgbase.ui line 2163
+#: rc.cpp:8017
 #, no-c-format
-msgid "Save in&line"
-msgstr "嵌入保存(&L)"
+msgid "Value:"
+msgstr "值："
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 87
-#: rc.cpp:8142
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 16
+#: rc.cpp:8020
+#, fuzzy, no-c-format
+msgid "QMake Manager Options"
+msgstr "QMake 管理器"
+
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 29
+#: rc.cpp:8023
 #, no-c-format
-msgid "Save pixmaps in the .ui files"
+msgid ""
+"- Also look into C++/Qt to define the QMake, Qt and Designer paths.\n"
+"- Environment variables that should be resolved during parsing can be set on "
+"the Make Options page.\n"
+"- For changes on this page to take effect the project needs to be reloaded."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 90
-#: rc.cpp:8145
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 45
+#: rc.cpp:8028
+#, fuzzy, no-c-format
+msgid "QMake Project File:"
+msgstr "工程文件(&P)："
+
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 57
+#: rc.cpp:8031
 #, no-c-format
 msgid ""
-"<b>Save Inline</b>"
-"<p>Saves the pixmaps as binary data in the .ui files. Pixmaps saved like this "
-"are not shared between forms. We recommend using Project image files instead."
+"This is the top level qmake project file, from which the project manager will "
+"be populated.\n"
+"Leave this empty to automatically search for a .pro file in the project "
+"directory."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 98
-#: rc.cpp:8148
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 70
+#: rc.cpp:8035
 #, no-c-format
-msgid "Project &image file"
-msgstr "工程图像文件(&I)"
+msgid "Behaviour on Subproject Change"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 101
-#: rc.cpp:8151
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 81
+#: rc.cpp:8038
 #, no-c-format
-msgid "Use the Project's Image file for pixmaps"
+msgid ""
+"The following settings determine what the project configuration dialog should "
+"do when another subproject is selected while the dialog is still open."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 105
-#: rc.cpp:8154
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 92
+#: rc.cpp:8041
+#, fuzzy, no-c-format
+msgid "&Always Save"
+msgstr "总是(&A)"
+
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 95
+#: rc.cpp:8044
 #, no-c-format
-msgid ""
-"<b>Use the Project's Image file for pixmaps</b>\n"
-"<p>Each project may have a collection of pixmaps. If you use a project, we "
-"recommend that you use this option since it shares the images and is the "
-"fastest and most efficient way to use pixmaps in your forms.</p>"
+msgid "Always save the configuration when changing the project."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 116
-#: rc.cpp:8158
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 98
+#: rc.cpp:8047
 #, no-c-format
 msgid ""
-"Specify Pixmap-Loader function (only the function's name, no parentheses.)"
+"Always save the project configuration when selecting a another sub project."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 119
-#: rc.cpp:8161
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 106
+#: rc.cpp:8050
+#, no-c-format
+msgid "&Never Save (Warning: This can lead to loss of setting changes)"
+msgstr ""
+
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 109
+#: rc.cpp:8053
+#, no-c-format
+msgid "Never save the configuration when changing the project."
+msgstr ""
+
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 112
+#: rc.cpp:8056
 #, no-c-format
 msgid ""
-"<b>Specify Pixmap-Loader function</b>"
-"<p>Specify the function which should be used for loading a pixmap in the "
-"generated code. <em>Only enter the function's name, without parentheses.</em>"
+"Never save the project configuration when selecting a another sub project."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 127
-#: rc.cpp:8164
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 120
+#: rc.cpp:8059
 #, no-c-format
-msgid "Use &function:"
-msgstr "使用函数(&F)："
+msgid "As&k"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 130
-#: rc.cpp:8167
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 126
+#: rc.cpp:8062
 #, no-c-format
-msgid "Use the given function for pixmaps"
+msgid ""
+"Ask whether the configuration should be saved when switching the project."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 133
-#: rc.cpp:8170
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 129
+#: rc.cpp:8065
 #, no-c-format
 msgid ""
-"<b>Use a given function for pixmaps</b>"
-"<p>If you choose this option you must define a function in the line edit at the "
-"right which will be used in the generated code for loading pixmaps. When "
-"choosing a pixmap in <i>Qt Designer</i> you will be asked to specify the "
-"arguments which will be passed to the function in the generated code."
-"<p> This approach makes it possible to use your own icon-loader function for "
-"loading pixmaps.  <i>Qt Designer</i> cannot preview the correct image if you "
-"use your own function."
+"Always ask whether the configuration should be saved when selecting another "
+"subproject."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 166
-#: rc.cpp:8176
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 147
+#: rc.cpp:8068
 #, no-c-format
-msgid "Change class name"
-msgstr "更改类名"
+msgid "Repla&ce File Paths with matching Variables when adding files"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 169
-#: rc.cpp:8179
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 153
+#: rc.cpp:8071
 #, no-c-format
 msgid ""
-"<b>Enter the name of the class that will be created.</b>"
-"<p><em>classname.h</em> and <em>classname.cpp</em> will be generated as C++ "
-"output when it is compiled by uic.</p>"
+"This replaces the relative paths of added files with existing custom variables "
+"if the value assigned to it is the same as the path."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 177
-#: rc.cpp:8182
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 161
+#: rc.cpp:8074
 #, no-c-format
-msgid "A&uthor:"
-msgstr "作者(&U)："
+msgid "Show variables in filenames in the QMake projectmanager view."
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 188
-#: rc.cpp:8185
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 169
+#: rc.cpp:8077
 #, no-c-format
-msgid "Enter your name"
-msgstr "输入您的姓名"
+msgid ""
+"Display only filenames in the QMake Manager (Project reload is needed after "
+"changing this setting)"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 191
-#: rc.cpp:8188
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 178
+#: rc.cpp:8080
 #, no-c-format
-msgid "Enter your name."
-msgstr "输入您的姓名。"
+msgid ""
+"Do not use the QMake Default Options\n"
+"This disables the reading of any .qmake.cache files or mkspecs."
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 221
-#: rc.cpp:8197
+#. i18n: file ./buildtools/qmake/qmakeoptionswidgetbase.ui line 186
+#: rc.cpp:8084
 #, no-c-format
-msgid "Enter a comment about the form."
+msgid "Show parse error in message box"
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 242
-#: rc.cpp:8200
+#. i18n: file ./buildtools/autotools/removetargetdlgbase.ui line 16
+#: rc.cpp:8087
 #, no-c-format
-msgid "La&youts"
-msgstr "布局(&Y)"
+msgid "Remove Target From [SUBPROJECT]"
+msgstr "从 [子工程] 删除目标"
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 278
-#: rc.cpp:8203
+#. i18n: file ./buildtools/autotools/removetargetdlgbase.ui line 27
+#: rc.cpp:8090 rc.cpp:8156 rc.cpp:8492 rc.cpp:8708
 #, no-c-format
-msgid "D&efault spacing:"
-msgstr "默认间距(&E)："
+msgid "Subproject Information"
+msgstr "子工程信息"
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 289
-#: rc.cpp:8206
+#. i18n: file ./buildtools/autotools/removetargetdlgbase.ui line 46
+#: rc.cpp:8093 rc.cpp:8159
 #, no-c-format
-msgid "Use func&tions:"
-msgstr "使用函数(&T)："
+msgid "[TARGET DIRECTORY]"
+msgstr "[目标目录]"
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 292
-#: rc.cpp:8209
+#. i18n: file ./buildtools/autotools/removetargetdlgbase.ui line 54
+#: rc.cpp:8096 rc.cpp:8162 rc.cpp:8495
 #, no-c-format
-msgid "Use functions to get the margin and spacing"
-msgstr ""
+msgid "[TARGET NAME]"
+msgstr "[目标名称]"
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 295
-#: rc.cpp:8212
+#. i18n: file ./buildtools/autotools/removetargetdlgbase.ui line 74
+#: rc.cpp:8099 rc.cpp:8165 rc.cpp:8498 rc.cpp:8711
+#, no-c-format
+msgid "Directory:"
+msgstr "目录："
+
+#. i18n: file ./buildtools/autotools/removetargetdlgbase.ui line 94
+#: rc.cpp:8102 rc.cpp:8138 rc.cpp:8168 rc.cpp:8501 rc.cpp:8714
+#, no-c-format
+msgid "Target:"
+msgstr "目标："
+
+#. i18n: file ./buildtools/autotools/removetargetdlgbase.ui line 116
+#: rc.cpp:8105
+#, no-c-format
+msgid "&Target Information"
+msgstr "目标信息(&T)"
+
+#. i18n: file ./buildtools/autotools/removetargetdlgbase.ui line 149
+#: rc.cpp:8114
 #, no-c-format
 msgid ""
-"<b>Use a given function for margin and/or spacing</b>"
-"<p>If you choose this option you must define functions in the line edit below "
-"which will be used in the generated code for getting the margin and spacing "
-"value. <i>Qt Designer</i> cannot preview the correct margin or spacing if you "
-"use your own function. Instead, the default values will be used for preview."
-msgstr ""
+"<b>Note:</b> You will not be able to undo this operation. Please check your "
+"Makefile.am afterwards."
+msgstr "<b>注意：</b>您将无法再撤消此操作。并且随后请检查您的 Makefile.am。"
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 322
-#: rc.cpp:8215
+#. i18n: file ./buildtools/autotools/removetargetdlgbase.ui line 159
+#: rc.cpp:8117
 #, no-c-format
-msgid "Default mar&gin:"
-msgstr "默认边距(&G)："
+msgid "&Dependencies to Other Subprojects"
+msgstr "对其它子工程的依赖性(&D)"
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 336
-#: rc.cpp:8218
+#. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 22
+#: buildtools/autotools/choosetargetdialog.cpp:62 rc.cpp:8126
 #, no-c-format
-msgid "S&pacing:"
-msgstr "间距(&P)："
+msgid "Automake Manager - Choose Target"
+msgstr "Automake 管理器 - 选择目标"
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 358
-#: rc.cpp:8221
+#. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 59
+#: rc.cpp:8129
 #, no-c-format
-msgid "Ma&rgin:"
-msgstr "边距(&R)："
+msgid "Add new files to m&y active target"
+msgstr "将新文件添加到我当前的目标(&Y)"
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 383
-#: rc.cpp:8224
+#. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 70
+#: rc.cpp:8132
 #, no-c-format
-msgid "Specify spacing function (only the function's name, no parentheses.)"
-msgstr ""
+msgid "Choose &another target"
+msgstr "选择另一个目标(&A)"
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 386
-#: rc.cpp:8227
+#. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 83
+#: rc.cpp:8135
 #, no-c-format
-msgid ""
-"<b>Specify spacing function</b>"
-"<p>Specify the function which should be used for getting the spacing in the "
-"generated code. <em>Only enter the function's name, without parentheses.</em>"
-msgstr ""
+msgid "Choose &Target"
+msgstr "选择目标(&T)"
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 405
-#: rc.cpp:8230
+#. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 130
+#: rc.cpp:8141 rc.cpp:8720
 #, no-c-format
-msgid "Specify margin function (only the function's name, no parentheses.)"
-msgstr ""
+msgid "[TARGET]"
+msgstr "[目标]"
 
-#. i18n: file ./kdevdesigner/designer/formsettings.ui line 408
-#: rc.cpp:8233
+#. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 140
+#: rc.cpp:8144
+#, no-c-format
+msgid "&New Files"
+msgstr "新建文件(&N)"
+
+#. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 159
+#: rc.cpp:8147
 #, no-c-format
 msgid ""
-"<b>Specify margin function</b>"
-"<p>Specify the function which should be used for getting the margin in the "
-"generated code. <em>Only enter the function's name, without parentheses.</em>"
-msgstr ""
+"<qt><b>Note:</b> If you cancel, your files will be created but will <b>not</b> "
+"be added to the project.</qt>"
+msgstr "<b>注意：</b>如果您取消的话，您的文件将被创建，<b>但是不会</b>被添加到工程中。"
 
-#. i18n: file ./kdevdesigner/designer/dbconnection.ui line 41
-#: rc.cpp:8251
+#. i18n: file ./buildtools/autotools/choosetargetdlgbase.ui line 172
+#: rc.cpp:8150
 #, no-c-format
-msgid "Edit Database Connection"
-msgstr "编辑数据库连接"
+msgid "Do &not ask me again and use always my active target"
+msgstr "以后不再询问，总是使用我的活动目标(&N)"
 
-#. i18n: file ./kdevdesigner/designer/dbconnection.ui line 58
-#: rc.cpp:8254
+#. i18n: file ./buildtools/autotools/addfiledlgbase.ui line 36
+#: rc.cpp:8153
 #, no-c-format
-msgid "&Database name:"
-msgstr "数据库名称(&D)："
+msgid "Add New Created File to Target"
+msgstr "将新建的文件加入到目标"
 
-#. i18n: file ./kdevdesigner/designer/dbconnection.ui line 69
-#: rc.cpp:8257
+#. i18n: file ./buildtools/autotools/addfiledlgbase.ui line 135
+#: rc.cpp:8171
 #, no-c-format
-msgid "&Username:"
-msgstr "用户名(&U)："
+msgid "File Information"
+msgstr "文件信息"
 
-#. i18n: file ./kdevdesigner/designer/dbconnection.ui line 80
-#: rc.cpp:8260
+#. i18n: file ./buildtools/autotools/addfiledlgbase.ui line 173
+#: buildtools/script/scriptnewfiledlg.cpp:46 rc.cpp:8174
 #, no-c-format
-msgid "&Password:"
-msgstr "密码(&P)："
+msgid "&Use file template"
+msgstr "使用文件模板(&U)"
 
-#. i18n: file ./kdevdesigner/designer/dbconnection.ui line 91
-#: rc.cpp:8263
+#. i18n: file ./buildtools/autotools/addfiledlgbase.ui line 202
+#: rc.cpp:8177
 #, no-c-format
-msgid "D&river:"
-msgstr "驱动程序(&R)："
+msgid "New file &name (with extension):"
+msgstr "新文件名(和扩展名)(&N)："
 
-#. i18n: file ./kdevdesigner/designer/dbconnection.ui line 110
-#: rc.cpp:8266
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 16
+#: buildtools/autotools/autoprojectpart.cpp:232 rc.cpp:8186
 #, no-c-format
-msgid "&Hostname:"
-msgstr "主机名(&H)："
+msgid "Configure Options"
+msgstr "配置选项"
 
-#. i18n: file ./kdevdesigner/designer/dbconnection.ui line 151
-#: rc.cpp:8272
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 46
+#: rc.cpp:8189
+#, fuzzy, no-c-format
+msgid "&Configuration:"
+msgstr "配置："
+
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 68
+#: rc.cpp:8192
+#, fuzzy, no-c-format
+msgid "Different build profiles"
+msgstr "和保存的文件的差异"
+
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 71
+#: rc.cpp:8195
+#, fuzzy, no-c-format
+msgid "profiles"
+msgstr "打开文件"
+
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 152
+#: rc.cpp:8207 rc.cpp:8210
 #, no-c-format
-msgid "P&ort:"
-msgstr "端口(&O)："
+msgid "Options to pass to configure, e.g. --prefix=<install dir>"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 41
-#: rc.cpp:8278
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 163
+#: rc.cpp:8213
 #, no-c-format
-msgid "Edit Listbox"
-msgstr "编辑列表框"
+msgid "&Build directory (must be different for every different configuration):"
+msgstr "构建目录(所有的配置中不能重复)(&B)："
 
-#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 47
-#: rc.cpp:8281
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 191
+#: rc.cpp:8216
+#, fuzzy, no-c-format
+msgid "Top source &directory:"
+msgstr "顶层源代码目录(&T)："
+
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 214
+#: rc.cpp:8219 rc.cpp:8234
 #, no-c-format
 msgid ""
-"<b>Edit Listbox</b>"
-"<p>Add, edit or delete items in the listbox.</p>"
-"<p>Click the <b>New Item</b>-button to create a new listbox entry, then enter "
-"text and choose a pixmap.</p>"
-"<p>Select an item from the list and click the <b>Delete Item</b>"
-"-button to remove the item from the list.</p>"
+"The build process will place the object\n"
+"files and binary in this directory. \n"
+"\n"
+"If the name does not have a leading /\n"
+"then it is relative to the project directory.\n"
+"(in the General page)\n"
+"\n"
+"The build process also checks here for \n"
+"a Makefile and a configure script.\n"
+"\n"
+"If you have imported a project and you were \n"
+"building in the project directory, you \n"
+"probably want this to be blank."
 msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 153
-#: kdevdesigner/designer/actiondnd.cpp:399 rc.cpp:8305 rc.cpp:8356
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 297
+#: rc.cpp:8255 rc.cpp:8261
 #, no-c-format
-msgid "Delete Item"
-msgstr "删除项目"
+msgid ""
+"Where to start looking for the src files.\n"
+"If the name does not have a leading /\n"
+"then it is relative to the project directory.\n"
+"(in the General page)"
+msgstr ""
 
-#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 235
-#: rc.cpp:8332
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 328
+#: rc.cpp:8267 rc.cpp:8396
 #, no-c-format
-msgid "Choose a pixmap file for the selected item."
-msgstr "为选中的项目选择像素图文件。"
+msgid "Li&nker flags (LDFLAGS):"
+msgstr "连接器选项 (LDFLAGS)(&N)："
 
-#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 263
-#: rc.cpp:8341
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 335
+#: rc.cpp:8270 rc.cpp:8274 rc.cpp:8278
 #, no-c-format
-msgid "Change the selected item's text."
-msgstr "更改选中项目的文本。"
+msgid ""
+"Linker flags, e.g. -L<lib dir> if you have libraries in a\n"
+"nonstandard directory <lib dir>"
+msgstr ""
+"连接开关，例如 -L<库目录> 如果使用非标准\n"
+"库目录中的库 <库目录>"
 
-#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 279
-#: rc.cpp:8350
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 374
+#: rc.cpp:8282 rc.cpp:8286 rc.cpp:8293
 #, no-c-format
-msgid "<b>Add a new item.</b><p>New items are appended to the list.</p>"
+msgid ""
+"C/C++ preprocessor flags, e.g. -I<include dir> if you have\n"
+"headers in a nonstandard directory <include dir>"
 msgstr ""
+"C/C++预处理开关，例如 -I<头文件目录>　如果您使用非标准\n"
+"头文件目录中的头文件 <头文件目录>"
 
-#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 293
-#: rc.cpp:8359
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 403
+#: rc.cpp:8290
 #, no-c-format
-msgid "Delete the selected item"
-msgstr "删除选中的项目"
+msgid "C/C++ &preprocessor flags (CPPFLAGS):"
+msgstr "C/C++ 预处理器标志(CPPFLAGS)(&P)："
 
-#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 327
-#: rc.cpp:8365
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 418
+#: rc.cpp:8297
+#, no-c-format
+msgid "Configure argu&ments:"
+msgstr "配置参数(&M)："
+
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 452
+#: rc.cpp:8303
+#, no-c-format
+msgid "C"
+msgstr "C"
+
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 463
+#: rc.cpp:8306
+#, no-c-format
+msgid "C com&piler:"
+msgstr "C 编译器(&P)："
+
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 496
+#: rc.cpp:8309
+#, no-c-format
+msgid "Compiler f&lags (CFLAGS):"
+msgstr "编译器标志(CFLAGS)(&L)："
+
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 551
+#: rc.cpp:8315
+#, no-c-format
+msgid "Compiler co&mmand (CC):"
+msgstr "编译器命令(CC)(&M)："
+
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 586
+#: rc.cpp:8318
+#, no-c-format
+msgid "C++"
+msgstr "C++"
+
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 597
+#: rc.cpp:8321
+#, no-c-format
+msgid "C++ com&piler:"
+msgstr "C++ 编译器(&P)："
+
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 630
+#: rc.cpp:8324
+#, no-c-format
+msgid "Compiler co&mmand (CXX):"
+msgstr "编译器命令(CXX)(&M)："
+
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 663
+#: rc.cpp:8327
 #, fuzzy, no-c-format
-msgid "Moves the selected item up."
-msgstr "去掉所有选中的文件。"
+msgid "Compiler flags (C&XXFLAGS):"
+msgstr "编译器标志(CXXFLAGS)(&L)："
 
-#. i18n: file ./kdevdesigner/designer/listboxeditor.ui line 344
-#: rc.cpp:8371
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 720
+#: rc.cpp:8333
 #, fuzzy, no-c-format
-msgid "Move the selected item down."
-msgstr "去掉所有选中的文件。"
+msgid "F&ortran"
+msgstr "Fortran"
 
-#. i18n: file ./kdevdesigner/designer/multilineeditor.ui line 41
-#: rc.cpp:8374
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 731
+#: rc.cpp:8336
+#, fuzzy, no-c-format
+msgid "Fortra&n compiler:"
+msgstr "Fortran 编译器(&P)："
+
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 764
+#: rc.cpp:8339
 #, no-c-format
-msgid "Edit Text"
-msgstr "编辑文本"
+msgid "Compiler co&mmand (F77):"
+msgstr "编译器命令(F77)(&M)："
 
-#. i18n: file ./kdevdesigner/designer/multilineeditor.ui line 44
-#: rc.cpp:8377
+#. i18n: file ./buildtools/autotools/configureoptionswidgetbase.ui line 797
+#: rc.cpp:8342
 #, no-c-format
-msgid ""
-"<b>Multiline Edit</b>"
-"<p>This is a simple richtext editor. To improve its usability it provides "
-"toolbar items for the most common html tags: by clicking on a toolbar item, the "
-"corresponding tag will be written to the editor, where you can insert your "
-"text. If you have already written some text and want to format it, hilight it "
-"and click on the desired button.  To improve visualization this editor also "
-"supports a simple html-syntax-highlighting scheme."
-msgstr ""
+msgid "Compiler f&lags (FFLAGS):"
+msgstr "编译器标志(FFLAGS)(&L)："
 
-#. i18n: file ./kdevdesigner/designer/pixmapfunction.ui line 41
-#: rc.cpp:8392
+#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 16
+#: rc.cpp:8348
 #, no-c-format
-msgid "Choose Pixmap"
-msgstr "选择像素图"
+msgid "Add New Target"
+msgstr "添加新目标"
 
-#. i18n: file ./kdevdesigner/designer/pixmapfunction.ui line 61
-#: rc.cpp:8395
+#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 30
+#: rc.cpp:8351
 #, no-c-format
-msgid "&Enter arguments for loading the pixmap:"
-msgstr "输入装入像素图的参数(&E)："
+msgid "&Target"
+msgstr "目标(&T)"
 
-#. i18n: file ./kdevdesigner/designer/pixmapfunction.ui line 349
-#: rc.cpp:8398
+#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 45
+#: rc.cpp:8354
 #, no-c-format
-msgid "QPixmap("
-msgstr ""
+msgid "&Primary:"
+msgstr "主体(&P)："
 
-#. i18n: file ./kdevdesigner/designer/pixmapfunction.ui line 865
-#: rc.cpp:8401
+#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 68
+#: rc.cpp:8357
 #, no-c-format
-msgid ")"
-msgstr ")"
+msgid "Pre&fix:"
+msgstr "前缀(&F)："
 
-#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 41
-#: rc.cpp:8413
+#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 91
+#: parts/quickopen/quickopenfiledialog.cpp:41
+#: parts/quickopen/quickopenfiledialog.cpp:56 rc.cpp:8360
 #, no-c-format
-msgid "Edit Table"
-msgstr "编辑表"
+msgid "File &name:"
+msgstr "文件名(&N)："
 
-#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 233
-#: rc.cpp:8443 rc.cpp:8497
+#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 127
+#: rc.cpp:8363
 #, no-c-format
-msgid ""
-"<b>Move the selected item up.</b>"
-"<p>The top-most column will be the first column of the list.</p>"
-msgstr ""
+msgid "[CANONICALIZED NAME]"
+msgstr "[规范化名称]"
 
-#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 250
-#: rc.cpp:8449 rc.cpp:8503
+#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 170
+#: rc.cpp:8366
 #, no-c-format
-msgid ""
-"<b>Move the selected item down.</b>"
-"<p>The top-most column will be the first column of the list.</p>"
-msgstr ""
+msgid "Linker Flags (&LDFLAGS)"
+msgstr "连接标志 (&LDFLAGS)"
 
-#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 288
-#: rc.cpp:8458
+#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 181
+#: rc.cpp:8369
 #, no-c-format
-msgid "Table:"
-msgstr "表："
+msgid "Do not link against shared libraries (-all-static)"
+msgstr "不连接共享库 (-all-static)"
 
-#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 363
-#: rc.cpp:8479 rc.cpp:8512
+#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 189
+#: rc.cpp:8372
 #, no-c-format
-msgid "&Label:"
-msgstr "标签(&L)："
+msgid "Do not assign version numbers to libraries (-avoid-version)"
+msgstr "不给库指定版本号码 (-avoid-version)"
 
-#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 385
-#: rc.cpp:8485
+#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 197
+#: rc.cpp:8375
 #, no-c-format
-msgid "&Field:"
-msgstr "字段(&F)："
+msgid "Create a library that can be dynamically loaded (-module)"
+msgstr "创建可被动态载入的库 (-module)"
 
-#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 409
-#: rc.cpp:8488
+#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 205
+#: rc.cpp:8378
 #, no-c-format
-msgid "<no table>"
-msgstr "<无表>"
+msgid "Library does not depend on external symbols (-no-undefined)"
+msgstr "不依赖外部符号的库 (-no-undefined)"
 
-#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 421
-#: rc.cpp:8491
+#. i18n: file ./buildtools/autotools/addtargetdlgbase.ui line 228
+#: rc.cpp:8381
 #, no-c-format
-msgid "&Rows"
-msgstr "行(&R)"
+msgid "Ot&her:"
+msgstr "其它(&H)："
 
-#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 511
-#: rc.cpp:8506
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 16
+#: rc.cpp:8390
 #, no-c-format
-msgid "&New Row"
-msgstr "新建行(&N)"
+msgid "Target Options"
+msgstr "目标选项"
 
-#. i18n: file ./kdevdesigner/designer/tableeditor.ui line 519
-#: rc.cpp:8509
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 34
+#: rc.cpp:8393
+#, fuzzy, no-c-format
+msgid "Fl&ags"
+msgstr "标志"
+
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 71
+#: rc.cpp:8399
+#, fuzzy, no-c-format
+msgid "&Do not link against shared libraries (-all-static)"
+msgstr "不连接共享库 (-all-static)"
+
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 79
+#: rc.cpp:8402
+#, fuzzy, no-c-format
+msgid "Do not &assign version numbers to libraries (-avoid-version)"
+msgstr "不给库指定版本号码 (-avoid-version)"
+
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 87
+#: rc.cpp:8405
+#, fuzzy, no-c-format
+msgid "Create a library that can &be dynamically loaded (-module)"
+msgstr "创建可被动态载入的库 (-module)"
+
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 95
+#: rc.cpp:8408
+#, fuzzy, no-c-format
+msgid "Library does not depend on external symbols (-no-&undefined)"
+msgstr "不依赖外部符号的库 (-no-undefined)"
+
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 118
+#: rc.cpp:8411
 #, no-c-format
-msgid "&Delete Row"
-msgstr "删除行(&D)"
+msgid "O&ther:"
+msgstr "其它(&T)："
 
-#. i18n: file ./kdevdesigner/designer/configtoolboxdialog.ui line 41
-#: kdevdesigner/designer/mainwindowactions.cpp:605 rc.cpp:8536
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 181
+#: rc.cpp:8414
+#, fuzzy, no-c-format
+msgid "E&xplicit dependencies (DEPENDENCIES):"
+msgstr "明确的依赖关系(DEPENDENCIES)(&E)："
+
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 228
+#: rc.cpp:8417
+#, fuzzy, no-c-format
+msgid "Li&braries"
+msgstr "库"
+
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 243
+#: rc.cpp:8420
+#, fuzzy, no-c-format
+msgid "Lin&k convenience libraries inside project (LIBADD):"
+msgstr "连接工程之内的库 (LIBADD)(&S)："
+
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 294
+#: rc.cpp:8423
 #, no-c-format
-msgid "Configure Toolbox"
-msgstr "配置工具箱"
+msgid "Link libraries ou&tside project (LIBADD):"
+msgstr "连接工程之外的库 (LIBADD)(&T)："
 
-#. i18n: file ./kdevdesigner/designer/configtoolboxdialog.ui line 132
-#: rc.cpp:8548
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 439
+#: rc.cpp:8441
+#, fuzzy, no-c-format
+msgid "Mo&ve Up"
+msgstr "上移(&U)"
+
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 447
+#: rc.cpp:8444 rc.cpp:8654
 #, no-c-format
-msgid "Available Tools"
-msgstr "可用工具"
+msgid "Move Dow&n"
+msgstr "下移(&N)"
 
-#. i18n: file ./kdevdesigner/designer/configtoolboxdialog.ui line 175
-#: rc.cpp:8554
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 476
+#: rc.cpp:8447
 #, no-c-format
-msgid "Common Widgets Page"
-msgstr "公共部件页面"
+msgid "Ar&guments"
+msgstr "参数(&G)"
 
-#. i18n: file ./kdevdesigner/designer/startdialog.ui line 49
-#: rc.cpp:8557
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 487
+#: rc.cpp:8450
+#, fuzzy, no-c-format
+msgid "Program Arguments (only valid for executable targets)"
+msgstr "运行参数(只对运行的平台有效)(&R)："
+
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 507
+#: rc.cpp:8453
+#, fuzzy, no-c-format
+msgid "&Run arguments:"
+msgstr "参数(&G)："
+
+#. i18n: file ./buildtools/autotools/targetoptionsdlgbase.ui line 535
+#: rc.cpp:8459
+#, fuzzy, no-c-format
+msgid "&Debug arguments:"
+msgstr "调试版标志(&D)："
+
+#. i18n: file ./buildtools/autotools/removefiledlgbase.ui line 16
+#: rc.cpp:8471
 #, no-c-format
-msgid "Qt Designer - New/Open"
-msgstr "Qt 设计师 - 新建/打开"
+msgid "Remove File From This Target"
+msgstr "从此目标中删除文件"
 
-#. i18n: file ./kdevdesigner/designer/startdialog.ui line 73
-#: rc.cpp:8560
+#. i18n: file ./buildtools/autotools/removefiledlgbase.ui line 79
+#: rc.cpp:8480
 #, no-c-format
-msgid "&New File/Project"
-msgstr "新建文件/工程(&N)"
+msgid "&File Information"
+msgstr "文件信息(&F)"
 
-#. i18n: file ./kdevdesigner/designer/startdialog.ui line 106
-#: rc.cpp:8563
+#. i18n: file ./buildtools/autotools/removefiledlgbase.ui line 120
+#: rc.cpp:8489
 #, no-c-format
-msgid "&Open File/Project"
-msgstr "打开文件/工程(&O)"
+msgid "<b>Note:</b> You will not be able to undelete the file."
+msgstr "<b>注意：</b>您将无法再恢复这个文件。"
 
-#. i18n: file ./kdevdesigner/designer/startdialog.ui line 125
-#: rc.cpp:8566
+#. i18n: file ./buildtools/autotools/removefiledlgbase.ui line 215
+#: rc.cpp:8504
 #, no-c-format
-msgid "&Recently Opened"
-msgstr "最近打开的文件(&R)"
+msgid "[DIRECTORY NAME]"
+msgstr "[目录名]"
 
-#. i18n: file ./kdevdesigner/designer/startdialog.ui line 178
-#: rc.cpp:8569
+#. i18n: file ./buildtools/autotools/addsubprojectdlgbase.ui line 36
+#: rc.cpp:8507
 #, no-c-format
-msgid "&Do not show this dialog in the future"
-msgstr "以后不再显示此对话框(&D)"
+msgid "Add New Subproject"
+msgstr "添加新的子工程"
 
-#. i18n: file ./kdevdesigner/designer/pixmapcollectioneditor.ui line 41
-#: rc.cpp:8581
+#. i18n: file ./buildtools/autotools/addsubprojectdlgbase.ui line 47
+#: rc.cpp:8510
 #, no-c-format
-msgid "Manage Image Collection"
-msgstr "管理图像收藏"
+msgid "Subproject"
+msgstr "子工程"
 
-#. i18n: file ./kdevdesigner/designer/pixmapcollectioneditor.ui line 135
-#: rc.cpp:8596
+#. i18n: file ./buildtools/autotools/addsubprojectdlgbase.ui line 87
+#: rc.cpp:8513
 #, no-c-format
-msgid "C&lose"
-msgstr "关闭(&L)"
+msgid "Subproject &name:"
+msgstr "子工程名称(&N)："
 
-#. i18n: file ./kdevdesigner/designer/gotolinedialog.ui line 46
-#: kdevdesigner/designer/mainwindowactions.cpp:289 rc.cpp:8599
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 16
+#: rc.cpp:8522
 #, no-c-format
-msgid "Goto Line"
-msgstr "转到行"
+msgid "Add New Application .desktop File"
+msgstr "添加新应用程序 .desktop 文件"
 
-#. i18n: file ./kdevdesigner/designer/gotolinedialog.ui line 63
-#: rc.cpp:8602
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 30
+#: rc.cpp:8525
 #, no-c-format
-msgid "&Line:"
-msgstr "行(&L)："
+msgid "&Application File"
+msgstr "应用程序文件(&A)"
 
-#. i18n: file ./kdevdesigner/designer/gotolinedialog.ui line 116
-#: rc.cpp:8605
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 41
+#: rc.cpp:8528
 #, no-c-format
-msgid "&Goto"
-msgstr "转到(&G)"
+msgid "Start in t&erminal"
+msgstr "在终端里启动(&E)"
 
-#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 41
-#: rc.cpp:8611
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 122
+#: rc.cpp:8534
 #, no-c-format
-msgid "Font Properties"
-msgstr "字体属性"
+msgid "Games"
+msgstr "游戏"
 
-#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 73
-#: kdevdesigner/designer/propertyeditor.cpp:1278 rc.cpp:8614
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 127
+#: rc.cpp:8537
 #, no-c-format
-msgid "default"
-msgstr "默认"
+msgid "Development"
+msgstr "开发"
 
-#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 85
-#: rc.cpp:8617
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 137
+#: rc.cpp:8543
 #, no-c-format
-msgid "&Font:"
-msgstr "字体(&F)："
+msgid "Graphics"
+msgstr "图形"
 
-#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 96
-#: rc.cpp:8620
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 142
+#: rc.cpp:8546
 #, no-c-format
-msgid "Rel. &size:"
-msgstr "相对大小(&S)："
+msgid "Internet"
+msgstr "Internet"
 
-#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 124
-#: rc.cpp:8623
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 147
+#: rc.cpp:8549
 #, no-c-format
-msgid "C&olor:"
-msgstr "颜色(&O)："
+msgid "Multimedia"
+msgstr "多媒体"
 
-#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 133
-#: rc.cpp:8626
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 152
+#: rc.cpp:8552
 #, no-c-format
-msgid "0"
-msgstr "0"
+msgid "Office"
+msgstr "办公"
 
-#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 138
-#: rc.cpp:8629
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 162
+#: rc.cpp:8558
 #, no-c-format
-msgid "-4"
-msgstr "-4"
+msgid "System"
+msgstr "系统"
 
-#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 143
-#: rc.cpp:8632
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 167
+#: rc.cpp:8561
 #, no-c-format
-msgid "-3"
-msgstr "-3"
+msgid "Toys"
+msgstr "玩具"
 
-#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 148
-#: rc.cpp:8635
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 172
+#: rc.cpp:8564
 #, no-c-format
-msgid "-2"
-msgstr "-2"
+msgid "Utilities"
+msgstr "实用工具"
 
-#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 153
-#: rc.cpp:8638
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 177
+#: rc.cpp:8567
 #, no-c-format
-msgid "-1"
-msgstr "-1"
+msgid "WordProcessing"
+msgstr "文字处理"
 
-#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 158
-#: rc.cpp:8641
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 211
+#: rc.cpp:8573 rc.cpp:8759
 #, no-c-format
-msgid "+1"
-msgstr "+1"
+msgid "&Icon:"
+msgstr "图标(&I)："
 
-#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 163
-#: rc.cpp:8644
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 229
+#: rc.cpp:8576
 #, no-c-format
-msgid "+2"
-msgstr "+2"
+msgid "&Section:"
+msgstr "节(&S)："
 
-#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 168
-#: rc.cpp:8647
+#. i18n: file ./buildtools/autotools/addapplicationdlgbase.ui line 316
+#: rc.cpp:8588
 #, no-c-format
-msgid "+3"
-msgstr "+3"
+msgid "Mime &Types"
+msgstr "MIME 类型(&T)"
 
-#. i18n: file ./kdevdesigner/designer/richtextfontdialog.ui line 173
-#: rc.cpp:8650
+#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 16
+#: rc.cpp:8603
 #, no-c-format
-msgid "+4"
-msgstr "+4"
+msgid "Subproject Options"
+msgstr "子工程选项"
 
-#. i18n: file ./kdevdesigner/designer/dbconnections.ui line 41
-#: rc.cpp:8659
+#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 31
+#: rc.cpp:8606
 #, no-c-format
-msgid "Edit Database Connections"
-msgstr "编辑数据库连接"
+msgid "Co&mpiler"
+msgstr "编译器(&M)"
 
-#. i18n: file ./kdevdesigner/designer/dbconnections.ui line 61
-#: rc.cpp:8662
+#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 46
+#: rc.cpp:8609
 #, no-c-format
-msgid "&New Connection"
-msgstr "新建连接(&N)"
+msgid "Compiler flags for C compiler (CFLA&GS):"
+msgstr "C 编译器的编译标志(CFLAGS)(&G)："
 
-#. i18n: file ./kdevdesigner/designer/dbconnections.ui line 74
-#: rc.cpp:8665
+#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 129
+#: rc.cpp:8615
 #, no-c-format
-msgid "&Delete Connection"
-msgstr "删除连接(&D)"
+msgid "Compiler flags for C++ compiler (C&XXFLAGS):"
+msgstr "C++ 编译器的编译标志 (C&XXFLAGS)："
 
-#. i18n: file ./kdevdesigner/designer/dbconnections.ui line 157
-#: kdevdesigner/designer/dbconnectionsimpl.cpp:128
-#: kdevdesigner/designer/project.cpp:148
-#: kdevdesigner/designer/propertyeditor.cpp:2004
-#: kdevdesigner/designer/propertyeditor.cpp:2022 rc.cpp:8677
+#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 204
+#: rc.cpp:8621
 #, no-c-format
-msgid "Connection"
-msgstr "连接"
+msgid "Compiler flags for Fortran compiler (&FFLAGS):"
+msgstr "Fortran 编译器的编译标志 (&FFLAGS)："
 
-#. i18n: file ./kdevdesigner/designer/dbconnections.ui line 227
-#: rc.cpp:8680
+#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 277
+#: rc.cpp:8627
 #, no-c-format
-msgid "Connec&t"
-msgstr "连接(&T)"
+msgid "&Includes"
+msgstr "包含(&I)"
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 41
-#: kdevdesigner/designer/editfunctionsimpl.cpp:216 rc.cpp:8683
+#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 296
+#: rc.cpp:8630
 #, no-c-format
-msgid "Edit Functions"
-msgstr "编辑函数"
+msgid "Automatically &generate metasources"
+msgstr "自动生成 metasources(&G)"
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 47
-#: rc.cpp:8686
+#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 379
+#: rc.cpp:8639
 #, no-c-format
-msgid ""
-"<b>Edit Functions</b>"
-"<p>Add, edit or delete the current form's slots or functions.</p>"
-"<p>Click the <b>Add Function</b>-button to create a new function; enter a name, "
-"choose an access mode and specify if it should be a slot or normal function.</p>"
-"<p>Select an entry from the list and click the <b>Delete Function</b>"
-"-button to remove a function; in case of a slot all connections using this slot "
-"will also be removed.</p>"
-msgstr ""
+msgid "Directories in&side project:"
+msgstr "工程内的目录(&S)："
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 62
-#: parts/classview/classtreebase.cpp:79 rc.cpp:8689
+#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 471
+#: rc.cpp:8651
 #, no-c-format
-msgid "Function"
-msgstr "函数"
+msgid "Move U&p"
+msgstr "上移(&P)"
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 117
-#: rc.cpp:8704
+#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 510
+#: rc.cpp:8657
 #, no-c-format
-msgid "In Use"
-msgstr "使用中"
+msgid "Directories ou&tside project:"
+msgstr "工程外的目录(&T)："
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 150
-#: rc.cpp:8707
-#, fuzzy, no-c-format
-msgid ""
-"<b>This form's functions.</b>"
-"<p>Select the function you want to change or delete.</p>"
-msgstr "<b>函数选择器</b><p>选择一个函数，转至它的定义或者声明位置。"
+#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 546
+#: rc.cpp:8660
+#, no-c-format
+msgid "&Prefixes"
+msgstr "前缀(&P)"
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 172
-#: rc.cpp:8710
-#, fuzzy, no-c-format
-msgid "Only d&isplay slots"
-msgstr "只显示槽(&L)"
+#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 566
+#: buildtools/custommakefiles/selectnewfilesdialog.cpp:28 rc.cpp:8666
+#, no-c-format
+msgid "Path"
+msgstr "路径"
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 175
-#: rc.cpp:8713
-#, fuzzy, no-c-format
-msgid "Change displaying mode for functions"
-msgstr "制作内联函数"
+#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 594
+#: rc.cpp:8669
+#, no-c-format
+msgid "C&ustom prefixes:"
+msgstr "自定义前缀(&U)："
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 179
-#: rc.cpp:8716
+#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 678
+#: rc.cpp:8681
 #, no-c-format
-msgid ""
-"<b>Check this button if only the slots should be displayed</b>"
-"<p>Otherwise all functions, i.e. normal C++ functions and slots are "
-"displayed.</p>\n"
-msgstr ""
+msgid "&Build Order"
+msgstr "构建顺序(&B)"
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 204
-#: rc.cpp:8720
+#. i18n: file ./buildtools/autotools/subprojectoptionsdlgbase.ui line 775
+#: rc.cpp:8690
 #, no-c-format
-msgid "&New Function"
-msgstr "新建函数(&N)"
+msgid "O&rder in which sub projects are built:"
+msgstr "编译子工程的顺序(&R)："
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 207
+#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 24
+#: rc.cpp:8699
+#, no-c-format
+msgid "ImportExistingDlgBase"
+msgstr "ImportExistingDlgBase"
+
+#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 192
+#: rc.cpp:8717
+#, no-c-format
+msgid "[DIRECTORY]"
+msgstr "[目录]"
+
+#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 260
 #: rc.cpp:8723
 #, no-c-format
-msgid "Add new function"
-msgstr "添加新函数"
+msgid "A&dd All"
+msgstr "全部添加(&D)"
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 210
+#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 263
 #: rc.cpp:8726
 #, no-c-format
-msgid ""
-"<b>Add a new function.</b>"
-"<p>New functions have a default name and public access.</p>"
-msgstr ""
+msgid "Import by creating symbolic links (recommended)"
+msgstr "通过创建符号链接来导入(推荐)"
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 218
+#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 271
 #: rc.cpp:8729
 #, no-c-format
-msgid "&Delete Function"
-msgstr "删除函数(&D)："
+msgid "&Add Selected"
+msgstr "添加所选(&A)"
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 221
+#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 274
 #: rc.cpp:8732
 #, no-c-format
-msgid "Delete function"
-msgstr "删除函数"
+msgid "Import by copying (not recommended)"
+msgstr "通过复制来导入(不推荐)"
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 224
+#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 313
 #: rc.cpp:8735
 #, no-c-format
-msgid ""
-"<b>Delete the selected function.</b>"
-"<p>All connections using this function are also removed.</p>"
-msgstr ""
+msgid "&Source Directory"
+msgstr "源代码目录(&S)"
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 242
+#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 364
 #: rc.cpp:8738
 #, no-c-format
-msgid "Function Properties"
-msgstr "函数属性"
+msgid "R&emove All"
+msgstr "全部移除(&E)"
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 284
+#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 367
 #: rc.cpp:8741
-#, fuzzy, no-c-format
-msgid "&Function:"
-msgstr "函数(&U)："
+#, no-c-format
+msgid "Removes all added files."
+msgstr "移除添加的所有文件。"
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 306
+#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 375
 #: rc.cpp:8744
 #, no-c-format
-msgid "Change function name"
-msgstr "更改函数名称"
+msgid "&Remove Selected"
+msgstr "移除所选(&R)"
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 309
+#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 378
 #: rc.cpp:8747
 #, no-c-format
-msgid ""
-"<b>Change the name of the selected function.</b>"
-"<p>The name should include the argument list and must be syntactically "
-"correct.</p>"
-msgstr ""
+msgid "Removes the selected files."
+msgstr "移除所有选中的文件。"
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 317
+#. i18n: file ./buildtools/autotools/addexistingdlgbase.ui line 417
 #: rc.cpp:8750
 #, no-c-format
-msgid "&Return type:"
-msgstr "返回类型(&R)："
+msgid "Add &Following"
+msgstr "添加下列(&F)"
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 339
+#. i18n: file ./buildtools/autotools/addservicedlgbase.ui line 16
 #: rc.cpp:8753
 #, no-c-format
-msgid "Change the return type of the function"
-msgstr "更改函数的返回类型"
+msgid "Add New Service"
+msgstr "添加新服务"
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 342
+#. i18n: file ./buildtools/autotools/addservicedlgbase.ui line 31
 #: rc.cpp:8756
 #, no-c-format
-msgid ""
-"<b>Change the return type of the selected function.</b>"
-"<p>Specifiy here the datatype which should be returned by the function.</p>"
-msgstr ""
-
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 380
-#: rc.cpp:8759
-#, no-c-format
-msgid "S&pecifier:"
-msgstr "修饰符(&P)："
+msgid "&Service File"
+msgstr "服务文件(&S)"
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 392
+#. i18n: file ./buildtools/autotools/addservicedlgbase.ui line 139
 #: rc.cpp:8762
-#, fuzzy, no-c-format
-msgid "non virtual"
-msgstr "虚"
-
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 397
-#: rc.cpp:8765
-#, fuzzy, no-c-format
-msgid "virtual"
-msgstr "虚"
-
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 402
-#: rc.cpp:8768
-#, fuzzy, no-c-format
-msgid "pure virtual"
-msgstr "虚"
-
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 407
-#: rc.cpp:8771
-#, fuzzy, no-c-format
-msgid "static"
-msgstr "开始"
+#, no-c-format
+msgid "&Library:"
+msgstr "库(&L)："
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 422
-#: rc.cpp:8774 rc.cpp:8792
+#. i18n: file ./buildtools/autotools/addservicedlgbase.ui line 209
+#: rc.cpp:8774
 #, no-c-format
-msgid "Change function access"
-msgstr "更该函数访问"
+msgid "Service &Types"
+msgstr "服务类型(&T)"
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 425
-#: rc.cpp:8777 rc.cpp:8795
+#. i18n: file ./buildtools/autotools/addicondlgbase.ui line 16
+#: rc.cpp:8798
 #, no-c-format
-msgid ""
-"<b>Change the access policy of the function</b>"
-"<p>All functions are created virtual and should be reimplemented in "
-"subclasses.</p>"
-msgstr ""
+msgid "Add New Icon"
+msgstr "添加新图标"
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 455
-#: kdevdesigner/designer/hierarchyview.cpp:758
-#: kdevdesigner/designer/hierarchyview.cpp:839
-#: kdevdesigner/designer/hierarchyview.cpp:848 rc.cpp:8789 rc.cpp:8855
+#. i18n: file ./buildtools/autotools/addicondlgbase.ui line 53
+#: rc.cpp:8804
 #, no-c-format
-msgid "private"
-msgstr "private"
+msgid "&Size:"
+msgstr "大小(&S)："
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 493
-#: parts/ctags2/ctagskinds.cpp:52 rc.cpp:8801
+#. i18n: file ./buildtools/autotools/addicondlgbase.ui line 178
+#: rc.cpp:8819
 #, no-c-format
-msgid "slot"
-msgstr "slot"
+msgid "unknown"
+msgstr "未知"
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 498
-#: parts/ctags2/ctagskinds.cpp:37 parts/ctags2/ctagskinds.cpp:44
-#: parts/ctags2/ctagskinds.cpp:62 parts/ctags2/ctagskinds.cpp:95
-#: parts/ctags2/ctagskinds.cpp:121 parts/ctags2/ctagskinds.cpp:133
-#: parts/ctags2/ctagskinds.cpp:147 parts/ctags2/ctagskinds.cpp:154
-#: parts/ctags2/ctagskinds.cpp:167 parts/ctags2/ctagskinds.cpp:174
-#: parts/ctags2/ctagskinds.cpp:181 parts/ctags2/ctagskinds.cpp:187
-#: parts/ctags2/ctagskinds.cpp:200 rc.cpp:8804
+#. i18n: file ./buildtools/autotools/managecustomcommandsbase.ui line 44
+#: rc.cpp:8828
 #, no-c-format
-msgid "function"
-msgstr "function"
+msgid "Menu Text"
+msgstr "菜单文本"
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 505
-#: rc.cpp:8807
+#. i18n: file ./buildtools/autotools/managecustomcommandsbase.ui line 52
+#: rc.cpp:8831
 #, no-c-format
-msgid "Change function type"
-msgstr "更改函数类型"
+msgid "Command"
+msgstr "命令"
 
-#. i18n: file ./kdevdesigner/designer/editfunctions.ui line 508
-#: rc.cpp:8810
+#. i18n: file ./buildtools/autotools/managecustomcommandsbase.ui line 60
+#: rc.cpp:8834
 #, no-c-format
-msgid ""
-"<b>Change the type of the function.</b>"
-"<p>The type specifies if the function is either a slot or a normal C++ "
-"function.</p>"
-msgstr ""
+msgid "Command Type"
+msgstr "命令类型"
 
-#. i18n: file ./kdevdesigner/designer/variabledialog.ui line 41
-#: kdevdesigner/designer/hierarchyview.cpp:1201
-#: kdevdesigner/designer/variabledialogimpl.cpp:103
-#: kdevdesigner/designer/variabledialogimpl.cpp:122 rc.cpp:8828
+#. i18n: file ./buildtools/ada/adaproject_optionsdlgbase.ui line 19
+#: buildtools/ada/adaproject_part.cpp:375
+#: buildtools/ada/adaproject_part.cpp:406 rc.cpp:8837
 #, no-c-format
-msgid "Edit Variables"
-msgstr "编辑变量"
+msgid "Ada Compiler"
+msgstr "Ada 编译器"
 
-#. i18n: file ./kdevdesigner/designer/variabledialog.ui line 105
+#. i18n: file ./buildtools/ada/adaproject_optionsdlgbase.ui line 64
 #: rc.cpp:8840
 #, no-c-format
-msgid "Variable Properties"
-msgstr "变量属性"
+msgid "Configuration:"
+msgstr "配置："
 
-#. i18n: file ./kdevdesigner/designer/variabledialog.ui line 122
-#: rc.cpp:8843
+#. i18n: file ./buildtools/ada/adaproject_optionsdlgbase.ui line 170
+#: rc.cpp:8852
 #, no-c-format
-msgid "Acc&ess:"
-msgstr "访问(&E)："
+msgid "Compiler &options:"
+msgstr "编译器选项(&O)："
 
-#. i18n: file ./kdevdesigner/designer/variabledialog.ui line 133
-#: rc.cpp:8846
+#. i18n: file ./buildtools/ada/adaproject_optionsdlgbase.ui line 189
+#: rc.cpp:8855
 #, no-c-format
-msgid "&Variable:"
-msgstr "变量(&V)："
+msgid "Ada &compiler:"
+msgstr "Ada 编译器(&C)："
+
+#. i18n: file ./buildtools/ada/adaproject_optionsdlgbase.ui line 349
+#: rc.cpp:8864
+#, no-c-format
+msgid "Load Default Compiler Options"
+msgstr "载入默认的编译器选项"
 
 #: _translatorinfo.cpp:1
 msgid ""
@@ -13325,6 +13343,37 @@ msgid ""
 msgstr ""
 "cavendish@eyou.com, lark@linux.net.cn, leesongchen@263.net, jxiong@offtopic.org"
 
+#: editors/editor-chooser/editorchooser_part.cpp:35
+msgid "Editor"
+msgstr "编辑器"
+
+#: languages/cpp/subclassingdlg.cpp:190
+#: languages/kjssupport/subclassingdlg.cpp:187
+msgid "Create Subclass of "
+msgstr "创建子类，其父类为"
+
+#: languages/bash/bashsupport_part.cpp:46
+#: languages/cpp/app_templates/kdevlang/kdevlang_part.cpp:31
+#: languages/kjssupport/kjssupport_part.cpp:72
+#: languages/php/phpsupportpart.cpp:91 languages/ruby/rubysupport_part.cpp:51
+#: languages/sql/sqlsupport_part.cpp:43
+msgid "&Run"
+msgstr "运行(&R)"
+
+#: languages/kjssupport/kjssupport_part.cpp:73
+msgid "Test the active script."
+msgstr ""
+
+#: languages/kjssupport/kjssupport_part.cpp:90
+#, fuzzy
+msgid "KJS Console"
+msgstr "Konsole"
+
+#: languages/kjssupport/kjssupport_part.cpp:90
+#, fuzzy
+msgid "KJS Embed Console"
+msgstr "内嵌终端窗口"
+
 #: languages/ada/adasupportpart.cpp:62 languages/cpp/cppsupportpart.cpp:586
 #: languages/java/javasupportpart.cpp:151
 #: languages/kjssupport/kjssupport_part.cpp:94
@@ -13339,58 +13388,10 @@ msgstr "问题"
 msgid "Problem reporter"
 msgstr "问题报告者"
 
-#: languages/ada/adasupportpart.cpp:63
-#: languages/pascal/pascalsupport_part.cpp:73
-msgid ""
-"<b>Problem reporter</b>"
-"<p>This window shows various \"problems\" in your project. It displays errors "
-"reported by a language parser."
-msgstr "<b>问题报告</b><p>这个窗口显示您项目中的多种\"问题\"。它显示语言预处理器报告的错误。"
-
-#: languages/ada/adasupportpart.cpp:128 languages/cpp/cppsupportpart.cpp:1465
-#: languages/csharp/csharpsupportpart.cpp:264
-#: languages/java/javasupportpart.cpp:511
-#: languages/perl/perlsupportpart.cpp:264 languages/php/phpsupportpart.cpp:427
-msgid "Updating..."
-msgstr "正在更新..."
-
-#: languages/ada/adasupportpart.cpp:155 languages/cpp/cppsupportpart.cpp:1620
-#: languages/csharp/csharpsupportpart.cpp:293
-#: languages/java/javasupportpart.cpp:614
-#: languages/perl/perlsupportpart.cpp:293 languages/php/phpsupportpart.cpp:479
-msgid "Done"
-msgstr "完成"
-
-#: languages/ada/problemreporter.cpp:84
-msgid ""
-"<b>Problem reporter</b>"
-"<p>This window shows errors reported by a language parser."
-msgstr "<b>问题报告</b><p>这个窗口显示语言预处理器报告的错误。"
-
-#: languages/ada/problemreporter.cpp:86 languages/cpp/problemreporter.cpp:109
-#: languages/cpp/problemreporter.cpp:110 languages/java/problemreporter.cpp:91
-#: languages/pascal/problemreporter.cpp:80 languages/php/phperrorview.cpp:101
-#: languages/php/phperrorview.cpp:102
-msgid "Level"
-msgstr "级别"
-
-#: languages/ada/problemreporter.cpp:87 languages/cpp/problemreporter.cpp:221
-#: languages/java/problemreporter.cpp:95
-#: languages/pascal/problemreporter.cpp:81 languages/php/phperrorview.cpp:186
-msgid "Problem"
-msgstr "问题"
-
-#: kdevdesigner/designer/outputwindow.cpp:85
-#: languages/ada/problemreporter.cpp:89 languages/cpp/problemreporter.cpp:219
-#: languages/java/problemreporter.cpp:93
-#: languages/pascal/problemreporter.cpp:83 languages/php/phperrorview.cpp:184
-#: vcs/subversion/svn_blamewidget.cpp:35
-msgid "Line"
-msgstr "行"
-
-#: languages/ada/problemreporter.cpp:256
-msgid "Ada Parsing"
-msgstr "Ada 分析"
+#: languages/bash/bashsupport_part.cpp:48
+#: languages/ruby/rubysupport_part.cpp:55
+msgid "<b>Run</b><p>Starts an application."
+msgstr "<b>运行</b><p>运行一个应用程序。"
 
 #: languages/cpp/ccconfigwidget.cpp:233
 #, fuzzy
@@ -13403,14 +13404,88 @@ msgid "Delete Database"
 msgstr "删除数据库"
 
 #: languages/cpp/ccconfigwidget.cpp:574
-msgid "Edit Qt4 Designer Plugin Paths"
-msgstr ""
+#, fuzzy
+msgid "Edit TQt4 Designer Plugin Paths"
+msgstr "禁用插件"
 
 #: languages/cpp/ccconfigwidget.cpp:577
 #, fuzzy
 msgid "Plugin Paths"
 msgstr "插件路径(&G)"
 
+#: languages/cpp/kdevdriver.cpp:178
+#, fuzzy
+msgid "%1. Message: %2"
+msgstr "消息(&M)："
+
+#: languages/cpp/simpletype.cpp:24
+#, fuzzy
+msgid "typeless"
+msgstr "样式(&S)"
+
+#: languages/cpp/simpletype.cpp:25
+msgid "boolean value, 1 byte, ( \"true\" or \"false\" )"
+msgstr ""
+
+#: languages/cpp/simpletype.cpp:26
+msgid "signed/unsigned character, 1 byte"
+msgstr ""
+
+#: languages/cpp/simpletype.cpp:27
+msgid "signed character, 1 byte, ranged -128 to 127"
+msgstr ""
+
+#: languages/cpp/simpletype.cpp:28
+msgid "unsigned character, 1 byte, ranged 0 to 255"
+msgstr ""
+
+#: languages/cpp/simpletype.cpp:29
+msgid "wide character, 2 bytes, ranged 0 to 65.535"
+msgstr ""
+
+#: languages/cpp/simpletype.cpp:30
+msgid "signed integer, 4 bytes, ranged -2.147.483.648 to 2.147.483.647"
+msgstr ""
+
+#: languages/cpp/simpletype.cpp:31
+msgid "unsigned integer, 4 bytes, ranged 0 to 4.294.967.295"
+msgstr ""
+
+#: languages/cpp/simpletype.cpp:32
+msgid "short integer, 2 bytes, ranged -32.768 to 32.768"
+msgstr ""
+
+#: languages/cpp/simpletype.cpp:33
+msgid "unsigned short integer, 2 bytes, ranged 0 to 65.535"
+msgstr ""
+
+#: languages/cpp/simpletype.cpp:34
+msgid "floating point value, 4 bytes, ranged ca. -3,4E+38 to 3,4E+38"
+msgstr ""
+
+#: languages/cpp/simpletype.cpp:35
+msgid "double floating point value, 8 bytes, ranged ca. -1,8E+308 to 1,8E+308"
+msgstr ""
+
+#: languages/cpp/simpletype.cpp:36
+msgid ""
+"double long floating point value, 10 bytes, ranged ca. -3,4E+4932 to 3,4E+4932"
+msgstr ""
+
+#: languages/cpp/simpletype.cpp:37
+msgid "unsigned integer, byte-count dependent on operating-system"
+msgstr ""
+
+#: languages/cpp/cppimplementationwidget.cpp:76
+#: languages/cpp/cppnewclassdlg.cpp:1840
+msgid "Cannot write to implementation file"
+msgstr "无法写入实现文件"
+
+#: languages/cpp/cppimplementationwidget.cpp:86
+#: languages/cpp/cppnewclassdlg.cpp:2064
+msgid "Cannot write to header file"
+msgstr "无法写入头文件"
+
 #: languages/cpp/includepathresolver.cpp:251
 msgid ""
 "tried include-path-resolution while another resolution-process was still "
@@ -13437,7 +13512,7 @@ msgstr ""
 
 #: languages/cpp/includepathresolver.cpp:385
 #, fuzzy
-msgid "Couldn't start the make-process"
+msgid "Could not start the make-process"
 msgstr "无法写入工程文件。"
 
 #: languages/cpp/includepathresolver.cpp:390
@@ -13488,161 +13563,214 @@ msgstr ""
 msgid "Folder: \"%1\"  Command: \"%2\" Output: \"%3\""
 msgstr ""
 
-#: languages/cpp/cppimplementationwidget.cpp:76
-#: languages/cpp/cppnewclassdlg.cpp:1861
-msgid "Cannot write to implementation file"
-msgstr "无法写入实现文件"
+#: languages/cpp/cppcodecompletion.cpp:359
+#, fuzzy
+msgid "Jump to %1 %2"
+msgstr "%1 的类型是 %2"
 
-#: languages/cpp/cppimplementationwidget.cpp:86
-#: languages/cpp/cppnewclassdlg.cpp:2085
-msgid "Cannot write to header file"
-msgstr "无法写入头文件"
+#: languages/cpp/cppcodecompletion.cpp:437
+msgid "Jump to declaration of %1(...)"
+msgstr ""
 
-#: languages/cpp/subclassingdlg.cpp:190
-#: languages/kjssupport/subclassingdlg.cpp:187
-msgid "Create Subclass of "
-msgstr "创建子类，其父类为"
+#: languages/cpp/cppcodecompletion.cpp:438
+msgid "Jump to definition of %1(...)"
+msgstr ""
 
-#: languages/cpp/kdevdriver.cpp:178
-#, fuzzy
-msgid "%1. Message: %2"
-msgstr "消息(&M)："
+#: languages/cpp/cppcodecompletion.cpp:440
+#: languages/cpp/cppcodecompletion.cpp:1539
+#: languages/cpp/cppcodecompletion.cpp:1571
+#, fuzzy, c-format
+msgid "Jump to %1"
+msgstr "跳到光标位置"
 
-#: languages/cpp/cppnewclassdlg.cpp:96
-msgid "Use as Private"
-msgstr "私有的"
+#: languages/cpp/cppcodecompletion.cpp:444
+#: languages/cpp/cppcodecompletion.cpp:593
+msgid " is unresolved"
+msgstr ""
 
-#: languages/cpp/cppnewclassdlg.cpp:98
-msgid "Use as Protected"
-msgstr "受保护的"
+#: languages/cpp/cppcodecompletion.cpp:446
+#: languages/cpp/cppcodecompletion.cpp:595
+msgid "  (builtin "
+msgstr ""
 
-#: languages/cpp/cppnewclassdlg.cpp:100
-msgid "Use as Public"
-msgstr "公有的"
+#: languages/cpp/cppcodecompletion.cpp:539
+#, fuzzy
+msgid "Show %1 %2"
+msgstr "显示 %1"
 
-#: languages/cpp/cppnewclassdlg.cpp:103
-msgid "Unset"
-msgstr "无设置"
+#: languages/cpp/cppcodecompletion.cpp:586
+#, c-format
+msgid "Show %1"
+msgstr "显示 %1"
 
-#: languages/cpp/cppnewclassdlg.cpp:107
-msgid "Extend Base Class Functionality"
-msgstr "扩充基类功能"
+#: languages/cpp/cppcodecompletion.cpp:647
+msgid "#include \"%1\" ( defines %2 )"
+msgstr ""
 
-#: languages/cpp/cppnewclassdlg.cpp:109
-msgid "Replace Base Class Method"
-msgstr "替换基类的方法"
+#: languages/cpp/cppcodecompletion.cpp:682
+#: languages/cpp/cppcodecompletion.cpp:795
+#, fuzzy, c-format
+msgid "Comment on %1"
+msgstr "注释(&M)："
 
-#: languages/cpp/cppnewclassdlg.cpp:367
-msgid ""
-"Objective C does not support multiple inheritance.\n"
-"Only the first base class in the list will be taken into account."
+#: languages/cpp/cppcodecompletion.cpp:698
+msgid "Specialized from \"%1\""
 msgstr ""
-"Objective C不支持多重继承。\n"
-"只有列表中的第一个基类有效。"
 
-#: languages/cpp/cppnewclassdlg.cpp:407
-msgid ""
-"Multiple inheritance requires QObject derivative to be first and unique in base "
-"class list."
-msgstr "多重继承需要QObject在基类列表中是第一个和唯一的。"
+#: languages/cpp/cppcodecompletion.cpp:707
+#, fuzzy
+msgid "Template-param \"%1\""
+msgstr "模板名称"
 
-#: languages/cpp/cppnewclassdlg.cpp:873 languages/cpp/cppnewclassdlg.cpp:876
-#: languages/cpp/cppnewclassdlg.cpp:1032 languages/cpp/cppnewclassdlg.cpp:1035
-msgid "Slots (Qt-specific)"
-msgstr "槽(Qt 特定的)"
+#: languages/cpp/cppcodecompletion.cpp:719
+#, fuzzy
+msgid "Return-type \"%1\""
+msgstr "返回类型(&Y)："
 
-#: languages/cpp/cppnewclassdlg.cpp:877 languages/cpp/cppnewclassdlg.cpp:1036
-msgid "Attributes"
-msgstr "特征"
+#: languages/cpp/cppcodecompletion.cpp:727
+#, fuzzy
+msgid "Argument-types"
+msgstr "参数(&G)"
 
-#: languages/cpp/cppnewclassdlg.cpp:979 languages/cpp/cppnewclassdlg.cpp:1235
-msgid "replace"
-msgstr "替换"
+#: languages/cpp/cppcodecompletion.cpp:737
+#, fuzzy
+msgid "Argument \"%1\""
+msgstr "参数(&G)"
 
-#: languages/cpp/cppnewclassdlg.cpp:979 languages/cpp/cppnewclassdlg.cpp:1229
-#: languages/cpp/cppnewclassdlg.cpp:1550
-msgid "extend"
-msgstr "扩展"
+#: languages/cpp/cppcodecompletion.cpp:749
+#, fuzzy
+msgid "Trace"
+msgstr "真"
 
-#: languages/cpp/cppnewclassdlg.cpp:1348
-msgid "You must enter a classname."
-msgstr "您必须输入类名。"
+#: languages/cpp/cppcodecompletion.cpp:756
+#, fuzzy
+msgid "%1 -> %2"
+msgstr "%2 中的 %1"
 
-#: languages/cpp/cppnewclassdlg.cpp:1355
-msgid "You must enter a name for the header file."
-msgstr "您必须输入头文件的名字。"
+#: languages/cpp/cppcodecompletion.cpp:763
+#: vcs/subversion/svn_logviewwidget.cpp:54
+#, fuzzy
+msgid "Comment"
+msgstr "注释(&M)："
 
-#: languages/cpp/cppnewclassdlg.cpp:1361
-msgid "You must enter a name for the implementation file."
-msgstr "您必须输入实现文件的名字。"
+#: languages/cpp/cppcodecompletion.cpp:782
+#, fuzzy
+msgid "Base-class \"%1\""
+msgstr "基类："
 
-#: languages/cpp/cppnewclassdlg.cpp:1368
-msgid ""
-"Generated files will always be added to the active directory, so you must not "
-"give an explicit subdirectory."
-msgstr "生成的文件将总会放到当前激活的目录里，因此您不能指定子目录。"
+#: languages/cpp/cppcodecompletion.cpp:788
+msgid "Nested in \"%1\""
+msgstr ""
 
-#: languages/cpp/cppnewclassdlg.cpp:1395
-msgid ""
-"KDevelop is not able to add classes to existing header or implementation files."
-msgstr "KDevelop 还不能把类添加到已经存在的头文件或者实现文件中。"
+#: languages/cpp/cppcodecompletion.cpp:957
+#, fuzzy
+msgid "Jump to declaration under cursor"
+msgstr "跳到光标位置"
 
-#: languages/cpp/simpletype.cpp:24
+#: languages/cpp/cppcodecompletion.cpp:961
 #, fuzzy
-msgid "typeless"
-msgstr "样式(&S)"
+msgid "Jump to definition under cursor"
+msgstr "跳到光标位置"
 
-#: languages/cpp/simpletype.cpp:25
-msgid "boolean value, 1 byte, ( \"true\" or \"false\" )"
+#: languages/cpp/cppcodecompletion.cpp:1535
+#: languages/cpp/cppcodecompletion.cpp:1537
+msgid "Navigate by Macro \"%1\""
 msgstr ""
 
-#: languages/cpp/simpletype.cpp:26
-msgid "signed/unsigned character, 1 byte"
+#: languages/cpp/cppcodecompletion.cpp:1541
+#, fuzzy
+msgid "Body"
+msgstr "粗体"
+
+#: languages/cpp/cppcodecompletion.cpp:1567
+#: languages/cpp/cppcodecompletion.cpp:1569
+#, c-format
+msgid "Goto Include File: %1"
+msgstr "转到头文件：%1"
+
+#: languages/cpp/cppcodecompletion.cpp:1583
+msgid ""
+"This include-file could not be located regularly, and was selected from the "
+"project file list."
 msgstr ""
 
-#: languages/cpp/simpletype.cpp:27
-msgid "signed character, 1 byte, ranged -128 to 127"
+#: languages/cpp/cppcodecompletion.cpp:1588
+#: languages/cpp/cppcodecompletion.cpp:1590
+#, fuzzy
+msgid "Not Found: \"%1\""
+msgstr "没有源文件：%1"
+
+#: languages/cpp/cppcodecompletion.cpp:1612
+#: languages/cpp/cppcodecompletion.cpp:1614
+msgid "Navigate by \"%1\""
 msgstr ""
 
-#: languages/cpp/simpletype.cpp:28
-msgid "unsigned character, 1 byte, ranged 0 to 255"
+#: languages/cpp/cppcodecompletion.cpp:1616
+msgid ""
+"<b>Navigation</b>"
+"<p>Provides a menu to navigate to positions of items that are involved in this "
+"expression"
 msgstr ""
 
-#: languages/cpp/simpletype.cpp:29
-msgid "wide character, 2 bytes, ranged 0 to 65.535"
+#: languages/cpp/cppcodecompletion.cpp:1632
+#: languages/cpp/cppcodecompletion.cpp:1634
+msgid "Navigate Class-View by \"%1\""
 msgstr ""
 
-#: languages/cpp/simpletype.cpp:30
-msgid "signed interger, 4 bytes, ranged -2.147.483.648 to 2.147.483.647"
+#: languages/cpp/cppcodecompletion.cpp:1636
+msgid ""
+"<b>Navigation</b>"
+"<p>Provides a menu to show involved items in the class-view "
 msgstr ""
 
-#: languages/cpp/simpletype.cpp:31
-msgid "unsigned integer, 4 bytes, ranged 0 to 4.294.967.295"
+#: languages/cpp/cppcodecompletion.cpp:1706
+#, fuzzy
+msgid "Type of \"%1\" is \"%2\""
+msgstr "%1 的类型是 %2"
+
+#: languages/cpp/cppcodecompletion.cpp:1708
+#, fuzzy
+msgid "Comment on variable \"%1\": \"%2\""
+msgstr "注释(&M)："
+
+#: languages/cpp/cppcodecompletion.cpp:1711
+#, fuzzy
+msgid "Comment on \"%1\": \"%2\""
+msgstr "注释(&M)："
+
+#: languages/cpp/cppcodecompletion.cpp:1714
+msgid "\"%1\" has no comment"
 msgstr ""
 
-#: languages/cpp/simpletype.cpp:32
-msgid "short integer, 2 bytes, ranged -32.768 to 32.768"
+#: languages/cpp/cppcodecompletion.cpp:1719
+msgid "Type of \"%1\" is unresolved, name: \"%2\""
 msgstr ""
 
-#: languages/cpp/simpletype.cpp:33
-msgid "unsigned short integer, 2 bytes, ranged 0 to 65.535"
+#: languages/cpp/cppcodecompletion.cpp:1721
+msgid "\"%1\" is of builtin type \"%2\", a %3"
 msgstr ""
 
-#: languages/cpp/simpletype.cpp:34
-msgid "floating point value, 4 bytes, ranged ca. -3,4E+38 to 3.4E+38"
+#: languages/cpp/cppcodecompletion.cpp:1726
+msgid ""
+"Type of \"%1\" could not be evaluated: tried to evaluate expression as \"%2\""
 msgstr ""
 
-#: languages/cpp/simpletype.cpp:35
-msgid "double floating point value, 8 bytes, ranged ca. -1.8E+308 to 1.8E+308"
+#: languages/cpp/cppcodecompletion.cpp:4264
+#, fuzzy
+msgid "Type of \"%1\" is \"%2\", %3"
+msgstr "%1 的类型是 %2"
+
+#: languages/cpp/cppcodecompletion.cpp:4430
+msgid " (resolved) "
 msgstr ""
 
-#: languages/cpp/simpletype.cpp:36
-msgid ""
-"double long floating point value, 10 bytes, ranged ca. -3.4E+4932 to 3.4E+4932"
+#: languages/cpp/cppcodecompletion.cpp:4438
+#: languages/cpp/cppcodecompletion.cpp:4447
+msgid " (unresolved) "
 msgstr ""
 
-#: languages/cpp/simpletype.cpp:37
-msgid "unsigned integer, byte-count depending on operating-system"
+#: languages/cpp/cppcodecompletion.cpp:4442
+msgid " (builtin type) "
 msgstr ""
 
 #: languages/cpp/cppsupportpart.cpp:254
@@ -13800,8 +13928,22 @@ msgstr ""
 msgid "Please select a class."
 msgstr "请选择一个类。"
 
+#: languages/ada/adasupportpart.cpp:128 languages/cpp/cppsupportpart.cpp:1465
+#: languages/csharp/csharpsupportpart.cpp:264
+#: languages/java/javasupportpart.cpp:492
+#: languages/perl/perlsupportpart.cpp:264 languages/php/phpsupportpart.cpp:427
+msgid "Updating..."
+msgstr "正在更新..."
+
+#: languages/ada/adasupportpart.cpp:155 languages/cpp/cppsupportpart.cpp:1620
+#: languages/csharp/csharpsupportpart.cpp:293
+#: languages/java/javasupportpart.cpp:591
+#: languages/perl/perlsupportpart.cpp:293 languages/php/phpsupportpart.cpp:479
+msgid "Done"
+msgstr "完成"
+
 #: languages/cpp/cppsupportpart.cpp:1961
-#: languages/java/javasupportpart.cpp:736
+#: languages/java/javasupportpart.cpp:713
 #, fuzzy
 msgid ""
 "Persistent class store will be disabled: you have a wrong version of pcs "
@@ -13815,216 +13957,6 @@ msgstr ""
 msgid "File %1 already exists"
 msgstr "文件 %1 已经存在"
 
-#: languages/cpp/cppcodecompletion.cpp:359
-#, fuzzy
-msgid "Jump to %1 %2"
-msgstr "%1 的类型是 %2"
-
-#: languages/cpp/cppcodecompletion.cpp:437
-msgid "Jump to declaration of %1(...)"
-msgstr ""
-
-#: languages/cpp/cppcodecompletion.cpp:438
-msgid "Jump to definition of %1(...)"
-msgstr ""
-
-#: languages/cpp/cppcodecompletion.cpp:440
-#: languages/cpp/cppcodecompletion.cpp:1539
-#: languages/cpp/cppcodecompletion.cpp:1571
-#, fuzzy, c-format
-msgid "Jump to %1"
-msgstr "跳到光标位置"
-
-#: languages/cpp/cppcodecompletion.cpp:444
-#: languages/cpp/cppcodecompletion.cpp:593
-msgid " is unresolved"
-msgstr ""
-
-#: languages/cpp/cppcodecompletion.cpp:446
-#: languages/cpp/cppcodecompletion.cpp:595
-msgid "  (builtin "
-msgstr ""
-
-#: languages/cpp/cppcodecompletion.cpp:539
-#, fuzzy
-msgid "Show %1 %2"
-msgstr "显示 %1"
-
-#: languages/cpp/cppcodecompletion.cpp:586
-#, c-format
-msgid "Show %1"
-msgstr "显示 %1"
-
-#: languages/cpp/cppcodecompletion.cpp:647
-msgid "#include \"%1\" ( defines %2 )"
-msgstr ""
-
-#: languages/cpp/cppcodecompletion.cpp:682
-#: languages/cpp/cppcodecompletion.cpp:795
-#, fuzzy, c-format
-msgid "Comment on %1"
-msgstr "注释(&M)："
-
-#: languages/cpp/cppcodecompletion.cpp:698
-msgid "Specialized from \"%1\""
-msgstr ""
-
-#: languages/cpp/cppcodecompletion.cpp:707
-#, fuzzy
-msgid "Template-param \"%1\""
-msgstr "模板名称"
-
-#: languages/cpp/cppcodecompletion.cpp:719
-#, fuzzy
-msgid "Return-type \"%1\""
-msgstr "返回类型(&Y)："
-
-#: languages/cpp/cppcodecompletion.cpp:727
-#, fuzzy
-msgid "Argument-types"
-msgstr "参数(&G)"
-
-#: languages/cpp/cppcodecompletion.cpp:737
-#, fuzzy
-msgid "Argument \"%1\""
-msgstr "参数(&G)"
-
-#: languages/cpp/cppcodecompletion.cpp:749
-#, fuzzy
-msgid "Trace"
-msgstr "真"
-
-#: languages/cpp/cppcodecompletion.cpp:756
-#, fuzzy
-msgid "%1 -> %2"
-msgstr "%2 中的 %1"
-
-#: languages/cpp/cppcodecompletion.cpp:763
-#: vcs/subversion/svn_logviewwidget.cpp:54
-#, fuzzy
-msgid "Comment"
-msgstr "注释(&M)："
-
-#: languages/cpp/cppcodecompletion.cpp:782
-#, fuzzy
-msgid "Base-class \"%1\""
-msgstr "基类："
-
-#: languages/cpp/cppcodecompletion.cpp:788
-msgid "Nested in \"%1\""
-msgstr ""
-
-#: languages/cpp/cppcodecompletion.cpp:957
-#, fuzzy
-msgid "Jump to declaration under cursor"
-msgstr "跳到光标位置"
-
-#: languages/cpp/cppcodecompletion.cpp:961
-#, fuzzy
-msgid "Jump to definition under cursor"
-msgstr "跳到光标位置"
-
-#: languages/cpp/cppcodecompletion.cpp:1535
-#: languages/cpp/cppcodecompletion.cpp:1537
-msgid "Navigate by Macro \"%1\""
-msgstr ""
-
-#: languages/cpp/cppcodecompletion.cpp:1541
-#, fuzzy
-msgid "Body"
-msgstr "粗体"
-
-#: languages/cpp/cppcodecompletion.cpp:1567
-#: languages/cpp/cppcodecompletion.cpp:1569
-#, c-format
-msgid "Goto Include File: %1"
-msgstr "转到头文件：%1"
-
-#: languages/cpp/cppcodecompletion.cpp:1583
-msgid ""
-"This include-file could not be located regularly, and was selected from the "
-"project file list."
-msgstr ""
-
-#: languages/cpp/cppcodecompletion.cpp:1588
-#: languages/cpp/cppcodecompletion.cpp:1590
-#, fuzzy
-msgid "Not Found: \"%1\""
-msgstr "没有源文件：%1"
-
-#: languages/cpp/cppcodecompletion.cpp:1612
-#: languages/cpp/cppcodecompletion.cpp:1614
-msgid "Navigate by \"%1\""
-msgstr ""
-
-#: languages/cpp/cppcodecompletion.cpp:1616
-msgid ""
-"<b>Navigation</b>"
-"<p>Provides a menu to navigate to positions of items that are involved in this "
-"expression"
-msgstr ""
-
-#: languages/cpp/cppcodecompletion.cpp:1632
-#: languages/cpp/cppcodecompletion.cpp:1634
-msgid "Navigate Class-View by \"%1\""
-msgstr ""
-
-#: languages/cpp/cppcodecompletion.cpp:1636
-msgid ""
-"<b>Navigation</b>"
-"<p>Provides a menu to show involved items in the class-view "
-msgstr ""
-
-#: languages/cpp/cppcodecompletion.cpp:1706
-#, fuzzy
-msgid "Type of \"%1\" is \"%2\""
-msgstr "%1 的类型是 %2"
-
-#: languages/cpp/cppcodecompletion.cpp:1708
-#, fuzzy
-msgid "Comment on variable \"%1\": \"%2\""
-msgstr "注释(&M)："
-
-#: languages/cpp/cppcodecompletion.cpp:1711
-#, fuzzy
-msgid "Comment on \"%1\": \"%2\""
-msgstr "注释(&M)："
-
-#: languages/cpp/cppcodecompletion.cpp:1714
-msgid "\"%1\" has no comment"
-msgstr ""
-
-#: languages/cpp/cppcodecompletion.cpp:1719
-msgid "Type of \"%1\" is unresolved, name: \"%2\""
-msgstr ""
-
-#: languages/cpp/cppcodecompletion.cpp:1721
-msgid "\"%1\" is of builtin type \"%2\", a %3"
-msgstr ""
-
-#: languages/cpp/cppcodecompletion.cpp:1726
-msgid ""
-"Type of \"%1\" could not be evaluated! Tried to evaluate expression as \"%2\""
-msgstr ""
-
-#: languages/cpp/cppcodecompletion.cpp:4264
-#, fuzzy
-msgid "Type of \"%1\" is \"%2\", %3"
-msgstr "%1 的类型是 %2"
-
-#: languages/cpp/cppcodecompletion.cpp:4430
-msgid " (resolved) "
-msgstr ""
-
-#: languages/cpp/cppcodecompletion.cpp:4438
-#: languages/cpp/cppcodecompletion.cpp:4447
-msgid " (unresolved) "
-msgstr ""
-
-#: languages/cpp/cppcodecompletion.cpp:4442
-msgid " (builtin type) "
-msgstr ""
-
 #: languages/cpp/problemreporter.cpp:91 languages/java/problemreporter.cpp:84
 #: languages/php/phperrorview.cpp:86
 msgid ""
@@ -14042,6 +13974,13 @@ msgstr ""
 "<br><tt>//TODO: my todo</tt>"
 "<br><tt>//FIXME fix this</tt>"
 
+#: languages/ada/problemreporter.cpp:86 languages/cpp/problemreporter.cpp:109
+#: languages/cpp/problemreporter.cpp:110 languages/java/problemreporter.cpp:91
+#: languages/pascal/problemreporter.cpp:80 languages/php/phperrorview.cpp:101
+#: languages/php/phperrorview.cpp:102
+msgid "Level"
+msgstr "级别"
+
 #: languages/cpp/problemreporter.cpp:130 languages/php/phperrorview.cpp:120
 msgid "Current"
 msgstr "当前"
@@ -14056,7 +13995,7 @@ msgid "Warnings"
 msgstr "警告/错误"
 
 #: languages/cpp/problemreporter.cpp:133 languages/cpp/problemreporter.cpp:191
-#: languages/cpp/problemreporter.cpp:319 languages/cpp/problemreporter.cpp:417
+#: languages/cpp/problemreporter.cpp:323 languages/cpp/problemreporter.cpp:421
 #: languages/php/phperrorview.cpp:122 languages/php/phperrorview.cpp:160
 #: languages/php/phperrorview.cpp:274 languages/php/phperrorview.cpp:390
 #, fuzzy
@@ -14064,7 +14003,7 @@ msgid "Fixme"
 msgstr "字段"
 
 #: languages/cpp/problemreporter.cpp:134 languages/cpp/problemreporter.cpp:192
-#: languages/cpp/problemreporter.cpp:320 languages/cpp/problemreporter.cpp:415
+#: languages/cpp/problemreporter.cpp:324 languages/cpp/problemreporter.cpp:419
 #: languages/php/phperrorview.cpp:123 languages/php/phperrorview.cpp:161
 #: languages/php/phperrorview.cpp:275 languages/php/phperrorview.cpp:387
 msgid "Todo"
@@ -14079,268 +14018,106 @@ msgstr "已过滤"
 msgid "Filtered: %1"
 msgstr "已过滤：%1"
 
-#: languages/cpp/problemreporter.cpp:220 languages/java/problemreporter.cpp:94
+#: kdevdesigner/designer/outputwindow.cpp:85
+#: languages/ada/problemreporter.cpp:89 languages/cpp/problemreporter.cpp:223
+#: languages/java/problemreporter.cpp:93
+#: languages/pascal/problemreporter.cpp:83 languages/php/phperrorview.cpp:184
+#: vcs/subversion/svn_blamewidget.cpp:35
+msgid "Line"
+msgstr "行"
+
+#: languages/cpp/problemreporter.cpp:224 languages/java/problemreporter.cpp:94
 #: languages/php/phperrorview.cpp:185
 msgid "Column"
 msgstr "列"
 
-#: languages/cpp/app_templates/kapp/main.cpp:11
-#: languages/cpp/app_templates/tdeconfig35/main.cpp:10
-#: languages/cpp/app_templates/kmake/app.cpp:8
-#: languages/cpp/app_templates/kscons_kxt/main.cpp:10
-#: languages/cpp/app_templates/kxt/main.cpp:10
-msgid "A TDE Application"
-msgstr "一个 TDE 应用程序"
-
-#: languages/cpp/app_templates/kapp/main.cpp:17
-#: languages/cpp/app_templates/tdeconfig35/main.cpp:16
-#: languages/cpp/app_templates/kmake/app.cpp:14
-#: languages/cpp/app_templates/kpartapp/main.cpp:15
-#: languages/cpp/app_templates/kscons_tdemdi/main.cpp:18
-#: languages/cpp/app_templates/kscons_kxt/main.cpp:16
-#: languages/cpp/app_templates/kxt/main.cpp:16
-msgid "Document to open"
-msgstr "要打开的文档"
-
-#: languages/cpp/app_templates/tdeconfig35/appview.cpp:36
-#: languages/cpp/app_templates/kscons_kxt/appview.cpp:36
-#: languages/cpp/app_templates/kxt/appview.cpp:36
-msgid "This project is %1 days old"
-msgstr ""
-
-#: languages/cpp/app_templates/tdeconfig35/appview.cpp:37
-#: languages/cpp/app_templates/kde4app/kapp4view.cpp:39
-#: languages/cpp/app_templates/kscons_kxt/appview.cpp:37
-#: languages/cpp/app_templates/kxt/appview.cpp:37
-msgid "Settings changed"
-msgstr "设置已更改"
-
-#: languages/cpp/app_templates/tdeconfig35/app.cpp:56
-#: languages/cpp/app_templates/kde4app/kapp4.cpp:56
-#: languages/cpp/app_templates/kscons_kxt/app.cpp:79
-#: languages/cpp/app_templates/kxt/app.cpp:74
-msgid "Swi&tch Colors"
-msgstr "切换颜色(&T)"
-
-#: languages/cpp/app_templates/kapp/appview.cpp:62
-msgid "Could not find a suitable HTML component"
-msgstr "无法找到合适的 HTML 组件"
-
-#: languages/cpp/app_templates/kapp/pref.cpp:11
-msgid "%{APPNAME} Preferences"
-msgstr "%{APPNAME} 首选项"
-
-#: languages/cpp/app_templates/kapp/pref.cpp:18
-msgid "First Page"
-msgstr "第一页"
-
-#: languages/cpp/app_templates/kapp/pref.cpp:18
-msgid "Page One Options"
-msgstr "第一页选项"
-
-#: languages/cpp/app_templates/kapp/pref.cpp:21
-msgid "Second Page"
-msgstr "第二页"
-
-#: languages/cpp/app_templates/kapp/pref.cpp:21
-msgid "Page Two Options"
-msgstr "第二页选项"
-
-#: languages/cpp/app_templates/kapp/pref.cpp:31
-#: languages/cpp/app_templates/kapp/pref.cpp:40
-msgid "Add something here"
-msgstr "在此添加点东西"
-
-#: languages/cpp/app_templates/kapp/app.cpp:102
-msgid "Cus&tom Menuitem"
-msgstr "自定义菜单项(&T)"
-
-#: languages/cpp/app_templates/kapp/app.cpp:179
-msgid "Open Location"
-msgstr "打开位置"
-
-#: languages/cpp/app_templates/kde4app/main.cpp:10
-#, fuzzy
-msgid "A TDE 4 Application"
-msgstr "一个 TDE 应用程序"
-
-#: languages/cpp/app_templates/dcopservice/main.cpp:12
-#: languages/cpp/app_templates/kdedcop/main.cpp:10
-#: languages/cpp/app_templates/khello/main.cpp:10
-#: languages/cpp/app_templates/khello2/main.cpp:10
-#: languages/cpp/app_templates/kpartapp/main.cpp:9
-msgid "A TDE KPart Application"
-msgstr "一个 TDE KPart 应用程序"
-
-#: languages/cpp/app_templates/kateplugin/plugin_app.cpp:57
-#: languages/cpp/app_templates/kateplugin2/plugin_app.cpp:61
-msgid "Insert Hello World"
-msgstr "插入 Hello 示例"
-
-#: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:41
-#: languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp:41
-msgid "WHAT DOES THIS PART DO?"
-msgstr "这个模块做些什么？"
-
-#: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:94
-#: languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp:94
-msgid "&Do Something..."
-msgstr "做点事(&D)..."
-
-#: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:96
-#: languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp:96
-msgid "Do something"
-msgstr "做点事"
-
-#: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:97
-#: languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp:97
-msgid "<b>Do something</b><p>Describe here what does this action do."
-msgstr ""
-
-#: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:180
-#: languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp:180
-msgid "This action does nothing."
-msgstr ""
-
-#: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:180
-#: languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp:180
-msgid "%{APPNAME} Plugin"
-msgstr "%{APPNAME} 插件"
-
-#: languages/cpp/app_templates/kmake/mainviewimp.cpp:17
-msgid "Hello there."
-msgstr ""
-
-#: languages/cpp/app_templates/kpartapp/app_part.cpp:185
-msgid "%{APPNAME}Part"
-msgstr "%{APPNAME}Part"
-
-#: languages/cpp/app_templates/kpartapp/app.cpp:55
-#: languages/cpp/app_templates/kscons_tdemdi/appkmdiView.cpp:46
-#: languages/cpp/app_templates/kscons_tdemdi/appkmdiView.cpp:53
-msgid "Could not find our part."
-msgstr "无法找到需要的组件。"
-
-#: languages/cpp/app_templates/tdeioslave/slave.cpp:51
-#: vcs/subversion/svn_tdeio.cpp:249
-msgid "Looking for %1..."
-msgstr "正在查找 %1..."
-
-#: languages/cpp/app_templates/dcopservice/main.cpp:24
-msgid "TDE"
-msgstr "TDE"
-
-#: languages/cpp/app_templates/dcopservice/main.cpp:27
-msgid "Developer"
-msgstr "开发者"
-
-#: languages/cpp/app_templates/kpartplugin/plugin_app.cpp:16
-msgid "&Plugin Action"
-msgstr "插件动作(&P)"
-
-#: languages/cpp/app_templates/kpartplugin/plugin_app.cpp:32
-msgid "Cannot Translate Source"
-msgstr "无法翻译源代码"
-
-#: languages/cpp/app_templates/kpartplugin/plugin_app.cpp:33
-msgid "You cannot translate anything except web pages with this plugin."
-msgstr "用这个插件您不能翻译网页之外的其它东西。"
-
-#: languages/cpp/app_templates/kpartplugin/plugin_app.cpp:53
-msgid "The URL you entered is not valid, please correct it and try again"
-msgstr "您输入的 URL 是无效的，请更正后重试"
-
-#: languages/cpp/app_templates/tdecmodule/module.cpp:62
-msgid "Helpful information about the %{APPNAMELC} module."
-msgstr "关于 %{APPNAMELC} 模块的帮助信息。"
-
-#: languages/bash/bashsupport_part.cpp:46
-#: languages/cpp/app_templates/kdevlang/kdevlang_part.cpp:31
-#: languages/kjssupport/kjssupport_part.cpp:72
-#: languages/php/phpsupportpart.cpp:91 languages/ruby/rubysupport_part.cpp:51
-#: languages/sql/sqlsupport_part.cpp:43
-msgid "&Run"
-msgstr "运行(&R)"
-
-#: languages/cpp/app_templates/kicker/applet.cpp:33
-msgid "This is an about box"
-msgstr "这是关于对话框"
+#: languages/ada/problemreporter.cpp:87 languages/cpp/problemreporter.cpp:225
+#: languages/java/problemreporter.cpp:95
+#: languages/pascal/problemreporter.cpp:81 languages/php/phperrorview.cpp:186
+msgid "Problem"
+msgstr "问题"
 
-#: languages/cpp/app_templates/kicker/applet.cpp:39
-msgid "This is a help box"
-msgstr "这是帮助对话框"
+#: languages/cpp/cppnewclassdlg.cpp:81
+msgid "Use as Private"
+msgstr "私有的"
 
-#: languages/cpp/app_templates/kicker/applet.cpp:45
-msgid "This is a preferences box"
-msgstr "这是首选项对话框"
+#: languages/cpp/cppnewclassdlg.cpp:83
+msgid "Use as Protected"
+msgstr "受保护的"
 
-#: languages/cpp/app_templates/tdefileplugin/tdefile_plugin.cpp:26
-msgid "%{APPNAME} Information"
-msgstr "%{APPNAME} 信息"
+#: languages/cpp/cppnewclassdlg.cpp:85
+msgid "Use as Public"
+msgstr "公有的"
 
-#: languages/cpp/app_templates/tdefileplugin/tdefile_plugin.cpp:31
-msgid "Items"
-msgstr "项目"
+#: languages/cpp/cppnewclassdlg.cpp:88
+msgid "Unset"
+msgstr "无设置"
 
-#: languages/cpp/app_templates/kscons_tdemdi/appkmdi.cpp:130
-#: languages/cpp/app_templates/kscons_kxt/app.cpp:72
-msgid "This shows useful tips on the use of this application."
-msgstr ""
+#: languages/cpp/cppnewclassdlg.cpp:92
+msgid "Extend Base Class Functionality"
+msgstr "扩充基类功能"
 
-#: languages/cpp/app_templates/kscons_tdemdi/appkmdi.cpp:84
-msgid "Terminal"
-msgstr "终端"
+#: languages/cpp/cppnewclassdlg.cpp:94
+msgid "Replace Base Class Method"
+msgstr "替换基类的方法"
 
-#: languages/cpp/app_templates/kscons_tdemdi/main.cpp:12
-msgid "A simple tdemdi app"
+#: languages/cpp/cppnewclassdlg.cpp:346
+msgid ""
+"Objective C does not support multiple inheritance.\n"
+"Only the first base class in the list will be taken into account."
 msgstr ""
+"Objective C不支持多重继承。\n"
+"只有列表中的第一个基类有效。"
 
-#: languages/cpp/app_templates/kscons_tdemdi/app_part.cpp:56
-msgid "%{APPNAMELC}Part"
-msgstr "%{APPNAMELC}Part"
-
-#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:50
-msgid "Play"
-msgstr "播放"
+#: languages/cpp/cppnewclassdlg.cpp:386
+#, fuzzy
+msgid ""
+"Multiple inheritance requires TQObject derivative to be first and unique in "
+"base class list."
+msgstr "多重继承需要QObject在基类列表中是第一个和唯一的。"
 
-#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:56
-#: lib/widgets/kdevhtmlpart.cpp:64 lib/widgets/kdevhtmlpart.cpp:68
-#: src/partcontroller.cpp:171 src/partcontroller.cpp:173
-msgid "Forward"
-msgstr "向前"
+#: languages/cpp/cppnewclassdlg.cpp:852 languages/cpp/cppnewclassdlg.cpp:855
+#: languages/cpp/cppnewclassdlg.cpp:1011 languages/cpp/cppnewclassdlg.cpp:1014
+#, fuzzy
+msgid "Slots (TQt-specific)"
+msgstr "槽(Qt 特定的)"
 
-#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:63
-msgid "Playlist"
-msgstr "播放列表"
+#: languages/cpp/cppnewclassdlg.cpp:856 languages/cpp/cppnewclassdlg.cpp:1015
+msgid "Attributes"
+msgstr "特征"
 
-#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:69
-msgid "Change loop style"
-msgstr "改变循环类型"
+#: languages/cpp/cppnewclassdlg.cpp:958 languages/cpp/cppnewclassdlg.cpp:1214
+msgid "replace"
+msgstr "替换"
 
-#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:98
-#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:206
-msgid "No File Loaded"
-msgstr "未载入文件"
+#: languages/cpp/cppnewclassdlg.cpp:958 languages/cpp/cppnewclassdlg.cpp:1208
+#: languages/cpp/cppnewclassdlg.cpp:1529
+msgid "extend"
+msgstr "扩展"
 
-#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:251
-msgid "No looping"
-msgstr "没有循环"
+#: languages/cpp/cppnewclassdlg.cpp:1327
+msgid "You must enter a classname."
+msgstr "您必须输入类名。"
 
-#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:255
-msgid "Song looping"
-msgstr "歌曲循环"
+#: languages/cpp/cppnewclassdlg.cpp:1334
+msgid "You must enter a name for the header file."
+msgstr "您必须输入头文件的名字。"
 
-#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:259
-msgid "Playlist looping"
-msgstr "播放列表循环"
+#: languages/cpp/cppnewclassdlg.cpp:1340
+msgid "You must enter a name for the implementation file."
+msgstr "您必须输入实现文件的名字。"
 
-#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:263
-msgid "Random play"
-msgstr "随即播放"
+#: languages/cpp/cppnewclassdlg.cpp:1347
+msgid ""
+"Generated files will always be added to the active directory, so you must not "
+"give an explicit subdirectory."
+msgstr "生成的文件将总会放到当前激活的目录里，因此您不能指定子目录。"
 
-#: languages/cpp/app_templates/kofficepart/main.cpp:17
-msgid "File to open"
-msgstr "要打开的文件"
+#: languages/cpp/cppnewclassdlg.cpp:1374
+#, fuzzy
+msgid ""
+"TDevelop is not able to add classes to existing header or implementation files."
+msgstr "KDevelop 还不能把类添加到已经存在的头文件或者实现文件中。"
 
 #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:110
 msgid "Only check the code for syntax errors, do not produce object code"
@@ -14737,8 +14514,9 @@ msgid "<qt>Warn if a requested optimization pass is disabled</qt>"
 msgstr "<qt>如果所要求的优化工序被禁用则给出警告。</qt>"
 
 #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:481
-msgid "<qt>Don't warn if there is a division by zero</qt>"
-msgstr ""
+#, fuzzy
+msgid "<qt>Do not warn if there is a division by zero</qt>"
+msgstr "<qt>已声明的变量未被使用则给出警告</qt>"
 
 #: languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp:486
 msgid ""
@@ -14906,38 +14684,264 @@ msgstr "GNU C++ 编译器选项"
 msgid "GNU Fortran 77 Compiler Options"
 msgstr "GNU Fortran 77 编译器选项"
 
-#: languages/cpp/debugger/breakpoint.cpp:265
-#: languages/ruby/debugger/breakpoint.cpp:122
-msgid "Disabled"
-msgstr "禁用的"
+#: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:41
+#: languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp:41
+msgid "WHAT DOES THIS PART DO?"
+msgstr "这个模块做些什么？"
 
-#: languages/cpp/debugger/breakpoint.cpp:270
-#: languages/ruby/debugger/breakpoint.cpp:127
-msgid "Pending (add)"
-msgstr "待添加"
+#: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:94
+#: languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp:94
+msgid "&Do Something..."
+msgstr "做点事(&D)..."
 
-#: languages/cpp/debugger/breakpoint.cpp:272
-#: languages/ruby/debugger/breakpoint.cpp:129
-msgid "Pending (clear)"
-msgstr "待清除"
+#: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:96
+#: languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp:96
+msgid "Do something"
+msgstr "做点事"
 
-#: languages/cpp/debugger/breakpoint.cpp:274
-#: languages/ruby/debugger/breakpoint.cpp:131
-msgid "Pending (modify)"
-msgstr "待修改"
+#: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:97
+#: languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp:97
+msgid "<b>Do something</b><p>Describe here what does this action do."
+msgstr ""
 
-#: languages/cpp/debugger/breakpoint.cpp:278
-#: languages/ruby/debugger/breakpoint.cpp:135
-msgid "Active"
-msgstr "激活"
+#: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:180
+#: languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp:180
+msgid "This action does nothing."
+msgstr ""
 
-#: languages/cpp/debugger/breakpoint.cpp:421
-#: languages/cpp/debugger/gdbbreakpointwidget.cpp:227
+#: languages/cpp/app_templates/kdevpart/kdevpart_part.cpp:180
+#: languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp:180
+msgid "%{APPNAME} Plugin"
+msgstr "%{APPNAME} 插件"
+
+#: languages/cpp/app_templates/dcopservice/main.cpp:12
+#: languages/cpp/app_templates/kdedcop/main.cpp:10
+#: languages/cpp/app_templates/khello/main.cpp:10
+#: languages/cpp/app_templates/khello2/main.cpp:10
+#: languages/cpp/app_templates/kpartapp/main.cpp:9
+msgid "A TDE KPart Application"
+msgstr "一个 TDE KPart 应用程序"
+
+#: languages/cpp/app_templates/kmake/mainviewimp.cpp:17
+msgid "Hello there."
+msgstr ""
+
+#: languages/cpp/app_templates/kapp/main.cpp:11
+#: languages/cpp/app_templates/kmake/app.cpp:8
+#: languages/cpp/app_templates/kscons_kxt/main.cpp:10
+#: languages/cpp/app_templates/kxt/main.cpp:10
+#: languages/cpp/app_templates/tdeconfig35/main.cpp:10
+msgid "A TDE Application"
+msgstr "一个 TDE 应用程序"
+
+#: languages/cpp/app_templates/kapp/main.cpp:17
+#: languages/cpp/app_templates/kmake/app.cpp:14
+#: languages/cpp/app_templates/kpartapp/main.cpp:15
+#: languages/cpp/app_templates/kscons_kxt/main.cpp:16
+#: languages/cpp/app_templates/kscons_tdemdi/main.cpp:18
+#: languages/cpp/app_templates/kxt/main.cpp:16
+#: languages/cpp/app_templates/tdeconfig35/main.cpp:16
+msgid "Document to open"
+msgstr "要打开的文档"
+
+#: languages/cpp/app_templates/kpartapp/app.cpp:55
+#: languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp:46
+#: languages/cpp/app_templates/kscons_tdemdi/apptdemdiView.cpp:53
+msgid "Could not find our part."
+msgstr "无法找到需要的组件。"
+
+#: languages/cpp/app_templates/kpartapp/app_part.cpp:185
+msgid "%{APPNAME}Part"
+msgstr "%{APPNAME}Part"
+
+#: languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp:84
+msgid "Terminal"
+msgstr "终端"
+
+#: languages/cpp/app_templates/kscons_kxt/app.cpp:72
+#: languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp:130
+msgid "This shows useful tips on the use of this application."
+msgstr ""
+
+#: languages/cpp/app_templates/kscons_tdemdi/app_part.cpp:56
+msgid "%{APPNAMELC}Part"
+msgstr "%{APPNAMELC}Part"
+
+#: languages/cpp/app_templates/kscons_tdemdi/main.cpp:12
+msgid "A simple tdemdi app"
+msgstr ""
+
+#: languages/cpp/app_templates/kde4app/kapp4view.cpp:39
+#: languages/cpp/app_templates/kscons_kxt/appview.cpp:37
+#: languages/cpp/app_templates/kxt/appview.cpp:37
+#: languages/cpp/app_templates/tdeconfig35/appview.cpp:37
+msgid "Settings changed"
+msgstr "设置已更改"
+
+#: languages/cpp/app_templates/kde4app/kapp4.cpp:56
+#: languages/cpp/app_templates/kscons_kxt/app.cpp:79
+#: languages/cpp/app_templates/kxt/app.cpp:74
+#: languages/cpp/app_templates/tdeconfig35/app.cpp:56
+msgid "Swi&tch Colors"
+msgstr "切换颜色(&T)"
+
+#: languages/cpp/app_templates/kde4app/main.cpp:10
 #, fuzzy
-msgid ""
-"_: Code breakpoint\n"
-"Code"
-msgstr "切换断点"
+msgid "A KDE 4 Application"
+msgstr "一个 TDE 应用程序"
+
+#: languages/cpp/app_templates/kicker/applet.cpp:33
+msgid "This is an about box"
+msgstr "这是关于对话框"
+
+#: languages/cpp/app_templates/kicker/applet.cpp:39
+msgid "This is a help box"
+msgstr "这是帮助对话框"
+
+#: languages/cpp/app_templates/kicker/applet.cpp:45
+msgid "This is a preferences box"
+msgstr "这是首选项对话框"
+
+#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:50
+msgid "Play"
+msgstr "播放"
+
+#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:56
+#: lib/widgets/kdevhtmlpart.cpp:64 lib/widgets/kdevhtmlpart.cpp:68
+#: src/partcontroller.cpp:171 src/partcontroller.cpp:173
+msgid "Forward"
+msgstr "向前"
+
+#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:63
+msgid "Playlist"
+msgstr "播放列表"
+
+#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:69
+msgid "Change loop style"
+msgstr "改变循环类型"
+
+#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:98
+#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:206
+msgid "No File Loaded"
+msgstr "未载入文件"
+
+#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:251
+msgid "No looping"
+msgstr "没有循环"
+
+#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:255
+msgid "Song looping"
+msgstr "歌曲循环"
+
+#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:259
+msgid "Playlist looping"
+msgstr "播放列表循环"
+
+#: languages/cpp/app_templates/noatunui/plugin_impl.cpp:263
+msgid "Random play"
+msgstr "随即播放"
+
+#: languages/cpp/app_templates/kpartplugin/plugin_app.cpp:16
+msgid "&Plugin Action"
+msgstr "插件动作(&P)"
+
+#: languages/cpp/app_templates/kpartplugin/plugin_app.cpp:32
+msgid "Cannot Translate Source"
+msgstr "无法翻译源代码"
+
+#: languages/cpp/app_templates/kpartplugin/plugin_app.cpp:33
+msgid "You cannot translate anything except web pages with this plugin."
+msgstr "用这个插件您不能翻译网页之外的其它东西。"
+
+#: languages/cpp/app_templates/kpartplugin/plugin_app.cpp:53
+msgid "The URL you entered is not valid, please correct it and try again"
+msgstr "您输入的 URL 是无效的，请更正后重试"
+
+#: languages/cpp/app_templates/kateplugin/plugin_app.cpp:57
+#: languages/cpp/app_templates/kateplugin2/plugin_app.cpp:61
+msgid "Insert Hello World"
+msgstr "插入 Hello 示例"
+
+#: languages/cpp/app_templates/tdefileplugin/tdefile_plugin.cpp:26
+msgid "%{APPNAME} Information"
+msgstr "%{APPNAME} 信息"
+
+#: languages/cpp/app_templates/tdefileplugin/tdefile_plugin.cpp:31
+msgid "Items"
+msgstr "项目"
+
+#: languages/cpp/app_templates/dcopservice/main.cpp:24
+msgid "TDE"
+msgstr "TDE"
+
+#: languages/cpp/app_templates/dcopservice/main.cpp:27
+msgid "Developer"
+msgstr "开发者"
+
+#: languages/cpp/app_templates/kscons_kxt/appview.cpp:36
+#: languages/cpp/app_templates/kxt/appview.cpp:36
+#: languages/cpp/app_templates/tdeconfig35/appview.cpp:36
+msgid "This project is %1 days old"
+msgstr ""
+
+#: languages/cpp/app_templates/kapp/pref.cpp:11
+msgid "%{APPNAME} Preferences"
+msgstr "%{APPNAME} 首选项"
+
+#: languages/cpp/app_templates/kapp/pref.cpp:18
+msgid "First Page"
+msgstr "第一页"
+
+#: languages/cpp/app_templates/kapp/pref.cpp:18
+msgid "Page One Options"
+msgstr "第一页选项"
+
+#: languages/cpp/app_templates/kapp/pref.cpp:21
+msgid "Second Page"
+msgstr "第二页"
+
+#: languages/cpp/app_templates/kapp/pref.cpp:21
+msgid "Page Two Options"
+msgstr "第二页选项"
+
+#: languages/cpp/app_templates/kapp/pref.cpp:31
+#: languages/cpp/app_templates/kapp/pref.cpp:40
+msgid "Add something here"
+msgstr "在此添加点东西"
+
+#: languages/cpp/app_templates/kapp/appview.cpp:62
+msgid "Could not find a suitable HTML component"
+msgstr "无法找到合适的 HTML 组件"
+
+#: languages/cpp/app_templates/kapp/app.cpp:102
+msgid "Cus&tom Menuitem"
+msgstr "自定义菜单项(&T)"
+
+#: languages/cpp/app_templates/kapp/app.cpp:179
+msgid "Open Location"
+msgstr "打开位置"
+
+#: languages/cpp/app_templates/tdeioslave/slave.cpp:51
+#: vcs/subversion/svn_tdeio.cpp:249
+msgid "Looking for %1..."
+msgstr "正在查找 %1..."
+
+#: languages/cpp/app_templates/tdecmodule/module.cpp:62
+msgid "Helpful information about the %{APPNAMELC} module."
+msgstr "关于 %{APPNAMELC} 模块的帮助信息。"
+
+#: languages/cpp/app_templates/kofficepart/main.cpp:17
+msgid "File to open"
+msgstr "要打开的文件"
+
+#: languages/cpp/debugger/stty.cpp:332 languages/ruby/debugger/stty.cpp:316
+msgid "tdevelop: Debug application console"
+msgstr "tdevelop：调试程序控制台"
+
+#: languages/cpp/debugger/framestackwidget.cpp:561
+#, fuzzy, c-format
+msgid "Thread %1"
+msgstr "线程"
 
 #: languages/cpp/debugger/debuggerpart.cpp:106
 #: languages/ruby/debugger/debuggerpart.cpp:110
@@ -15298,7 +15302,8 @@ msgid ""
 msgstr "<b>切换断点</b><p>在编辑器中切换当前断点。"
 
 #: languages/cpp/debugger/debuggerpart.cpp:399
-msgid "Debug in &KDevelop"
+#, fuzzy
+msgid "Debug in &TDevelop"
 msgstr "在 KDevelop 中调试(&K)"
 
 #: languages/cpp/debugger/debuggerpart.cpp:513
@@ -15467,314 +15472,6 @@ msgstr ""
 "\n"
 "在调试器里重新开始运行此程序"
 
-#: languages/cpp/debugger/dbgtoolbar.cpp:112
-#: languages/cpp/debugger/dbgtoolbar.cpp:245
-#: languages/ruby/debugger/dbgtoolbar.cpp:118
-#: languages/ruby/debugger/dbgtoolbar.cpp:244
-msgid "Debug Toolbar"
-msgstr "调试工具栏"
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:113
-#: languages/ruby/debugger/dbgtoolbar.cpp:119
-msgid "Dock to Panel"
-msgstr "停靠到面板"
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:115
-#: languages/ruby/debugger/dbgtoolbar.cpp:121
-msgid "Dock to Panel && Iconify KDevelop"
-msgstr "停靠到面板上并且将 KDevelop 缩为图标"
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:225
-msgid "KDevelop debugger: Click to execute one line of code (\"step\")"
-msgstr "KDevelop 调试器：点击可执行一行代码(“单步”)"
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:246
-#: languages/ruby/debugger/dbgtoolbar.cpp:245
-msgid "Activate"
-msgstr "激活"
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:247
-#: languages/ruby/debugger/dbgtoolbar.cpp:246
-msgid "Activate (KDevelop gets focus)"
-msgstr "激活(KDevelop 获得焦点)"
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:307
-#: languages/ruby/debugger/dbgtoolbar.cpp:304
-msgid "Step Out"
-msgstr "跳出函数"
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:308
-#: languages/ruby/debugger/dbgtoolbar.cpp:305
-msgid "Run to Cursor"
-msgstr "运行到光标处"
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:325
-#: languages/ruby/debugger/dbgtoolbar.cpp:318
-msgid "Continue with application execution, may start the application"
-msgstr "继续执行应用程序，或者启动这个应用程序"
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:326
-#: languages/ruby/debugger/dbgtoolbar.cpp:319
-msgid "Interrupt the application execution"
-msgstr "中断应用程序的运行"
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:327
-msgid "Execute one line of code, but run through functions"
-msgstr "执行一行代码，但不进入函数调用"
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:328
-msgid "Execute one assembler instruction, but run through functions"
-msgstr "执行一行汇编指令，但不进入函数调用"
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:329
-msgid "Execute one line of code, stepping into functions if appropriate"
-msgstr "执行一行代码，如果遇到函数调用则进入函数"
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:330
-msgid ""
-"Execute one assembler instruction, stepping into functions if appropriate"
-msgstr "执行一行汇编指令，如果遇到函数调用则进入函数"
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:331
-#: languages/ruby/debugger/dbgtoolbar.cpp:322
-msgid "Execute to end of current stack frame"
-msgstr "执行到当前堆栈结构结束为止"
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:332
-#: languages/cpp/debugger/dbgtoolbar.cpp:344
-#: languages/ruby/debugger/dbgtoolbar.cpp:323
-#: languages/ruby/debugger/dbgtoolbar.cpp:334
-msgid "Continues execution until the cursor position is reached."
-msgstr "继续运行程序到光标所在的行。"
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:333
-msgid "Memory, dissemble, registers, library viewers"
-msgstr "内存、反汇编、寄存器、库查看器"
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:334
-#: languages/ruby/debugger/dbgtoolbar.cpp:324
-msgid "Set focus on KDevelop"
-msgstr "把焦点放到 KDevelop 上"
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:335
-#: languages/ruby/debugger/dbgtoolbar.cpp:325
-msgid "Set focus on window that had focus when KDevelop got focus"
-msgstr "把焦点放到 KDeveop 获得焦点前拥有焦点的窗口"
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:337
-#: languages/ruby/debugger/dbgtoolbar.cpp:327
-msgid "Continue with application execution. May start the application."
-msgstr "继续执行应用程序，或者启动这个应用程序。"
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:338
-#: languages/ruby/debugger/dbgtoolbar.cpp:328
-msgid "Interrupt the application execution."
-msgstr "中断应用程序的运行。"
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:339
-msgid "Execute one line of code, but run through functions."
-msgstr "执行一行代码，但不进入函数调用。"
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:340
-msgid "Execute one assembler instruction, but run through functions."
-msgstr "执行一行汇编指令，但不进入函数调用。"
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:341
-msgid "Execute one line of code, stepping into functions if appropriate."
-msgstr "执行一行代码，如果可能则进入函数。"
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:342
-msgid ""
-"Execute one assembler instruction, stepping into functions if appropriate."
-msgstr "执行一行汇编指令，如果可能则进入函数。"
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:343
-#: languages/ruby/debugger/dbgtoolbar.cpp:333
-msgid "Execute to end of current stack frame."
-msgstr "执行到当前堆栈结构结束为止。"
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:345
-msgid "Memory, dissemble, registers, library viewers."
-msgstr "内存、反汇编、寄存器、库视图。"
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:346
-#: languages/ruby/debugger/dbgtoolbar.cpp:335
-msgid "Set focus on KDevelop."
-msgstr "把焦点放到 KDevelop 上。"
-
-#: languages/cpp/debugger/dbgtoolbar.cpp:347
-#: languages/ruby/debugger/dbgtoolbar.cpp:336
-msgid "Set focus on window that had focus when KDevelop got focus."
-msgstr "把焦点放到 KDeveop 获得焦点前拥有焦点的窗口"
-
-#: languages/cpp/debugger/gdbcontroller.cpp:296
-#, c-format
-msgid ""
-"<b>Gdb command sent when debugger is not running</b>"
-"<br>The command was:"
-"<br> %1"
-msgstr ""
-
-#: languages/cpp/debugger/dbgpsdlg.cpp:176
-#: languages/cpp/debugger/gdbcontroller.cpp:298
-#: languages/cpp/debugger/variablewidget.cpp:766
-#, fuzzy
-msgid "Internal error"
-msgstr "内部错误"
-
-#: languages/cpp/debugger/gdbcontroller.cpp:391
-msgid "<b>Invalid debugger command</b><br>"
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:393
-msgid "Invalid debugger command"
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:484
-msgid ""
-"<b>Invalid gdb reply</b>"
-"<p>The 'stopped' packet does not include the 'reason' field'."
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:486
-msgid "The gdb reply is: bla-bla-bla"
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:487
-#: languages/cpp/debugger/gdbcontroller.cpp:722
-msgid "Invalid gdb reply"
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:502
-#, fuzzy, c-format
-msgid "Exited on signal %1"
-msgstr "添加新信号"
-
-#: languages/cpp/debugger/gdbcontroller.cpp:556
-msgid "Program received signal %1 (%2)"
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:558
-#, fuzzy
-msgid "Received signal"
-msgstr "删除信号"
-
-#: languages/cpp/debugger/gdbcontroller.cpp:649
-msgid ""
-"gdb message:\n"
-msgstr ""
-"gdb 消息：\n"
-
-#: languages/cpp/debugger/gdbcontroller.cpp:691
-msgid "No such file or directory."
-msgstr "没有这个文件或目录。"
-
-#: languages/cpp/debugger/gdbcontroller.cpp:715
-msgid ""
-"Invalid gdb reply\n"
-"Command was: %1\n"
-"Response is: %2\n"
-"Invalid response kind: \"%3\""
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:846
-msgid ""
-"<b>Could not start debugger.</b>"
-"<p>Could not run '%1'. Make sure that the path name is specified correctly."
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:850
-msgid "Could not start debugger"
-msgstr "无法启动调试器"
-
-#: languages/cpp/debugger/gdbcontroller.cpp:1046
-#: languages/ruby/debugger/rdbcontroller.cpp:836
-msgid "Debugger stopped"
-msgstr "调试器已停止"
-
-#: languages/cpp/debugger/gdbcontroller.cpp:1111
-msgid ""
-"GDB cannot use the tty* or pty* devices.\n"
-"Check the settings on /dev/tty* and /dev/pty*\n"
-"As root you may need to \"chmod ug+rw\" tty* and pty* devices and/or add the "
-"user to the tty group using \"usermod -G tty username\"."
-msgstr ""
-"gdb 无法使用tty* 或 pty* 设备。\n"
-"请检查 /dev/tty* 和 /dev/pty* 的设置\n"
-"\n"
-"您也许需要作为超级用户对 tty* 和 pty* 设备使用“chmod ug+rw”命令并且/或者使用“usermod -G tty "
-"username”命令将用户添加到 tty 组中。"
-
-#: languages/cpp/debugger/gdbcontroller.cpp:1157
-msgid ""
-"<b>Application does not exist</b>"
-"<p>The application you're trying to debug,"
-"<br>    %1\n"
-"<br>does not exist. Check that you've specified the right application in the "
-"debugger configuration."
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:1163
-#, fuzzy
-msgid "Application does not exist"
-msgstr "这个扩展名的文件模板不存在。"
-
-#: languages/cpp/debugger/gdbcontroller.cpp:1175
-msgid ""
-"<b>Could not run application '%1'.</b>"
-"<p>The application does not have the executable bit set. Try rebuilding the "
-"project, or change permissions manually."
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:1180
-msgid "Could not run application"
-msgstr "无法运行应用程序"
-
-#: languages/cpp/debugger/gdbcontroller.cpp:1355
-#: languages/cpp/debugger/gdbcontroller.cpp:1725
-#: languages/ruby/debugger/rdbcontroller.cpp:1286
-msgid "Process exited"
-msgstr "进程已退出"
-
-#: languages/cpp/debugger/gdbcontroller.cpp:1362
-msgid "<b>Debugger error</b><p>Debugger reported the following error:<p><tt>"
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:1365
-#: languages/cpp/debugger/variablewidget.cpp:901
-#, fuzzy
-msgid "Debugger error"
-msgstr "调试器视图"
-
-#: languages/cpp/debugger/gdbcontroller.cpp:1590
-msgid ""
-"_: <b>Internal debugger error</b>\n"
-"<p>The debugger component encountered internal error while processing reply "
-"from gdb. Please submit a bug report."
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:1592
-msgid ""
-"The exception is: %1\n"
-"The MI response is: %2"
-msgstr ""
-
-#: languages/cpp/debugger/gdbcontroller.cpp:1594
-#, fuzzy
-msgid "Internal debugger error"
-msgstr "内部错误"
-
-#: languages/cpp/debugger/dbgpsdlg.cpp:173
-msgid ""
-"<b>Could not parse output from the <tt>ps</tt> command!</b>"
-"<p>The following line could not be parsed:<b><tt>%1</tt>"
-msgstr ""
-
-#: languages/cpp/debugger/framestackwidget.cpp:539
-#, fuzzy, c-format
-msgid "Thread %1"
-msgstr "线程"
-
 #: languages/cpp/debugger/gdbbreakpointwidget.cpp:180
 #: languages/ruby/debugger/rdbbreakpointwidget.cpp:158
 msgid " temporary"
@@ -15792,7 +15489,7 @@ msgstr "状态"
 #: kdevdesigner/designer/outputwindow.cpp:86
 #: languages/cpp/debugger/gdbbreakpointwidget.cpp:220
 #: languages/ruby/debugger/rdbbreakpointwidget.cpp:232
-#: parts/fileview/filegroupswidget.cpp:311
+#: parts/fileview/filegroupswidget.cpp:312
 msgid "Location"
 msgstr "位置"
 
@@ -15812,6 +15509,14 @@ msgstr "次数"
 msgid "Tracing"
 msgstr "跟踪"
 
+#: languages/cpp/debugger/breakpoint.cpp:421
+#: languages/cpp/debugger/gdbbreakpointwidget.cpp:227
+#, fuzzy
+msgid ""
+"_: Code breakpoint\n"
+"Code"
+msgstr "切换断点"
+
 #: languages/cpp/debugger/gdbbreakpointwidget.cpp:229
 msgid ""
 "_: Data breakpoint\n"
@@ -15872,29 +15577,55 @@ msgstr ""
 msgid "Enable"
 msgstr "启用"
 
-#: languages/cpp/debugger/gdboutputwidget.cpp:57
-msgid "&GDB cmd:"
-msgstr "GDB 命令(&G)："
+#: languages/cpp/debugger/memviewdlg.cpp:94
+#, fuzzy
+msgid "Start"
+msgstr "起始地址(&S)："
 
-#: languages/cpp/debugger/gdboutputwidget.cpp:73
-msgid "Pause execution of the app to enter gdb commands"
-msgstr "暂停程序运行来输入 gdb 命令"
+#: languages/cpp/debugger/memviewdlg.cpp:100
+#, fuzzy
+msgid "Amount"
+msgstr "自动"
 
-#: languages/cpp/debugger/gdboutputwidget.cpp:326
-msgid "Show Internal Commands"
-msgstr ""
+#: languages/cpp/debugger/memviewdlg.cpp:139
+#, fuzzy
+msgid "Memory view"
+msgstr "内存查看："
 
-#: languages/cpp/debugger/gdboutputwidget.cpp:334
-msgid ""
-"Controls if commands issued internally by KDevelop will be shown or not."
-"<br>This option will affect only future commands, it won't add or remove "
-"already issued commands from the view."
-msgstr ""
+#: languages/cpp/debugger/memviewdlg.cpp:346
+#, fuzzy
+msgid "Change memory range"
+msgstr "改变属性名称"
 
-#: languages/cpp/debugger/gdboutputwidget.cpp:339
+#: languages/cpp/debugger/memviewdlg.cpp:355
 #, fuzzy
-msgid "Copy All"
-msgstr "全部关闭"
+msgid "Close this view"
+msgstr "关闭其它文件"
+
+#: languages/cpp/debugger/breakpoint.cpp:265
+#: languages/ruby/debugger/breakpoint.cpp:122
+msgid "Disabled"
+msgstr "禁用的"
+
+#: languages/cpp/debugger/breakpoint.cpp:270
+#: languages/ruby/debugger/breakpoint.cpp:127
+msgid "Pending (add)"
+msgstr "待添加"
+
+#: languages/cpp/debugger/breakpoint.cpp:272
+#: languages/ruby/debugger/breakpoint.cpp:129
+msgid "Pending (clear)"
+msgstr "待清除"
+
+#: languages/cpp/debugger/breakpoint.cpp:274
+#: languages/ruby/debugger/breakpoint.cpp:131
+msgid "Pending (modify)"
+msgstr "待修改"
+
+#: languages/cpp/debugger/breakpoint.cpp:278
+#: languages/ruby/debugger/breakpoint.cpp:135
+msgid "Active"
+msgstr "激活"
 
 #: languages/cpp/debugger/variablewidget.cpp:84
 #: languages/ruby/debugger/debuggerpart.cpp:95
@@ -16005,231 +15736,377 @@ msgstr "全部重新计算"
 msgid "Locals"
 msgstr "局部"
 
+#: languages/cpp/debugger/dbgpsdlg.cpp:176
+#: languages/cpp/debugger/gdbcontroller.cpp:298
+#: languages/cpp/debugger/variablewidget.cpp:766
+#, fuzzy
+msgid "Internal error"
+msgstr "内部错误"
+
 #: languages/cpp/debugger/variablewidget.cpp:900
 msgid "<b>Debugger error</b><br>"
 msgstr ""
 
+#: languages/cpp/debugger/gdbcontroller.cpp:1365
+#: languages/cpp/debugger/variablewidget.cpp:901
+#, fuzzy
+msgid "Debugger error"
+msgstr "调试器视图"
+
 #: languages/cpp/debugger/variablewidget.cpp:1984
 #: languages/ruby/debugger/variablewidget.cpp:909
 msgid "Watch"
 msgstr "观察"
 
-#: languages/cpp/debugger/memviewdlg.cpp:94
-#, fuzzy
-msgid "Start"
-msgstr "起始地址(&S)："
+#: languages/cpp/debugger/dbgpsdlg.cpp:173
+msgid ""
+"<b>Could not parse output from the <tt>ps</tt> command.</b>"
+"<p>The following line could not be parsed:<b><tt>%1</tt>"
+msgstr ""
 
-#: languages/cpp/debugger/memviewdlg.cpp:100
-#, fuzzy
-msgid "Amount"
-msgstr "自动"
+#: languages/cpp/debugger/gdbcontroller.cpp:296
+#, c-format
+msgid ""
+"<b>Gdb command sent when debugger is not running</b>"
+"<br>The command was:"
+"<br> %1"
+msgstr ""
 
-#: languages/cpp/debugger/memviewdlg.cpp:139
-#, fuzzy
-msgid "Memory view"
-msgstr "内存查看："
+#: languages/cpp/debugger/gdbcontroller.cpp:391
+msgid "<b>Invalid debugger command</b><br>"
+msgstr ""
 
-#: languages/cpp/debugger/memviewdlg.cpp:346
-#, fuzzy
-msgid "Change memory range"
-msgstr "改变属性名称"
+#: languages/cpp/debugger/gdbcontroller.cpp:393
+msgid "Invalid debugger command"
+msgstr ""
 
-#: languages/cpp/debugger/memviewdlg.cpp:355
+#: languages/cpp/debugger/gdbcontroller.cpp:484
+msgid ""
+"<b>Invalid gdb reply</b>"
+"<p>The 'stopped' packet does not include the 'reason' field'."
+msgstr ""
+
+#: languages/cpp/debugger/gdbcontroller.cpp:486
+msgid "The gdb reply is: bla-bla-bla"
+msgstr ""
+
+#: languages/cpp/debugger/gdbcontroller.cpp:487
+#: languages/cpp/debugger/gdbcontroller.cpp:722
+msgid "Invalid gdb reply"
+msgstr ""
+
+#: languages/cpp/debugger/gdbcontroller.cpp:502
+#, fuzzy, c-format
+msgid "Exited on signal %1"
+msgstr "添加新信号"
+
+#: languages/cpp/debugger/gdbcontroller.cpp:556
+msgid "Program received signal %1 (%2)"
+msgstr ""
+
+#: languages/cpp/debugger/gdbcontroller.cpp:558
 #, fuzzy
-msgid "Close this view"
-msgstr "关闭其它文件"
+msgid "Received signal"
+msgstr "删除信号"
 
-#: languages/cpp/debugger/stty.cpp:333 languages/ruby/debugger/stty.cpp:317
-msgid "tdevelop: Debug application console"
-msgstr "tdevelop：调试程序控制台"
+#: languages/cpp/debugger/gdbcontroller.cpp:649
+msgid ""
+"gdb message:\n"
+msgstr ""
+"gdb 消息：\n"
 
-#: languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp:115
+#: languages/cpp/debugger/gdbcontroller.cpp:691
+msgid "No such file or directory."
+msgstr "没有这个文件或目录。"
+
+#: languages/cpp/debugger/gdbcontroller.cpp:715
 msgid ""
-"This doesn't appear to be a valid Qt3 include directory.\n"
-"Please select a different directory."
+"Invalid gdb reply\n"
+"Command was: %1\n"
+"Response is: %2\n"
+"Invalid response kind: \"%3\""
 msgstr ""
 
-#: languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp:92
-#: languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp:107
-#: languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp:115
-#, fuzzy
-msgid "Invalid Directory"
-msgstr "本地目录"
+#: languages/cpp/debugger/gdbcontroller.cpp:846
+msgid ""
+"<b>Could not start debugger.</b>"
+"<p>Could not run '%1'. Make sure that the path name is specified correctly."
+msgstr ""
 
-#: languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp:92
+#: languages/cpp/debugger/gdbcontroller.cpp:850
+msgid "Could not start debugger"
+msgstr "无法启动调试器"
+
+#: languages/cpp/debugger/gdbcontroller.cpp:1046
+#: languages/ruby/debugger/rdbcontroller.cpp:836
+msgid "Debugger stopped"
+msgstr "调试器已停止"
+
+#: languages/cpp/debugger/gdbcontroller.cpp:1111
 msgid ""
-"This doesn't appear to be a valid TDE include directory.\n"
-"Please select a different directory."
+"GDB cannot use the tty* or pty* devices.\n"
+"Check the settings on /dev/tty* and /dev/pty*\n"
+"As root you may need to \"chmod ug+rw\" tty* and pty* devices and/or add the "
+"user to the tty group using \"usermod -G tty username\"."
+msgstr ""
+"gdb 无法使用tty* 或 pty* 设备。\n"
+"请检查 /dev/tty* 和 /dev/pty* 的设置\n"
+"\n"
+"您也许需要作为超级用户对 tty* 和 pty* 设备使用“chmod ug+rw”命令并且/或者使用“usermod -G tty "
+"username”命令将用户添加到 tty 组中。"
+
+#: languages/cpp/debugger/gdbcontroller.cpp:1157
+msgid ""
+"<b>Application does not exist</b>"
+"<p>The application you are trying to debug,"
+"<br>    %1\n"
+"<br>does not exist. Check that you have specified the right application in the "
+"debugger configuration."
 msgstr ""
 
-#: languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp:107
+#: languages/cpp/debugger/gdbcontroller.cpp:1163
+#, fuzzy
+msgid "Application does not exist"
+msgstr "这个扩展名的文件模板不存在。"
+
+#: languages/cpp/debugger/gdbcontroller.cpp:1175
 msgid ""
-"This doesn't appear to be a valid Qt4 include directory.\n"
-"Please select a different directory."
+"<b>Could not run application '%1'.</b>"
+"<p>The application does not have the executable bit set. Try rebuilding the "
+"project, or change permissions manually."
 msgstr ""
 
-#: languages/cpp/pcsimporter/customimporter/settingsdialog.cpp:44
-msgid "Directories to Parse"
-msgstr "要分析的目录"
+#: languages/cpp/debugger/gdbcontroller.cpp:1180
+msgid "Could not run application"
+msgstr "无法运行应用程序"
 
-#: languages/lib/designer_integration/implementationwidget.cpp:80
-#, c-format
-msgid "Create or Select Implementation Class for: %1"
+#: languages/cpp/debugger/gdbcontroller.cpp:1355
+#: languages/cpp/debugger/gdbcontroller.cpp:1725
+#: languages/ruby/debugger/rdbcontroller.cpp:1286
+msgid "Process exited"
+msgstr "进程已退出"
+
+#: languages/cpp/debugger/gdbcontroller.cpp:1362
+msgid "<b>Debugger error</b><p>Debugger reported the following error:<p><tt>"
 msgstr ""
 
-#: languages/lib/designer_integration/implementationwidget.cpp:82
-msgid "Namespaces &amp;&amp; Classes"
-msgstr "命名空间和类"
+#: languages/cpp/debugger/gdbcontroller.cpp:1590
+msgid ""
+"_: <b>Internal debugger error</b>\n"
+"<p>The debugger component encountered an internal error while processing a "
+"reply from gdb. Please submit a bug report."
+msgstr ""
 
-#: languages/lib/designer_integration/implementationwidget.cpp:126
-msgid "Class was created but not found in class store."
+#: languages/cpp/debugger/gdbcontroller.cpp:1592
+msgid ""
+"The exception is: %1\n"
+"The MI response is: %2"
 msgstr ""
 
-#: languages/lib/designer_integration/qtdesignerintegration.cpp:63
-#, fuzzy, c-format
-msgid "Cannot find implementation class for form: %1"
-msgstr "无法写入工程文件。"
+#: languages/cpp/debugger/gdbcontroller.cpp:1594
+#, fuzzy
+msgid "Internal debugger error"
+msgstr "内部错误"
 
-#: languages/lib/debugger/debugger.cpp:198
-msgid "Breakpoint"
-msgstr "断点"
+#: languages/cpp/debugger/dbgtoolbar.cpp:112
+#: languages/cpp/debugger/dbgtoolbar.cpp:245
+#: languages/ruby/debugger/dbgtoolbar.cpp:118
+#: languages/ruby/debugger/dbgtoolbar.cpp:244
+msgid "Debug Toolbar"
+msgstr "调试工具栏"
 
-#: languages/php/phperrorview.cpp:375
-msgid "Undefined function"
-msgstr "未定义的函数"
+#: languages/cpp/debugger/dbgtoolbar.cpp:113
+#: languages/ruby/debugger/dbgtoolbar.cpp:119
+msgid "Dock to Panel"
+msgstr "停靠到面板"
 
-#: languages/php/phperrorview.cpp:378
-msgid "Parse Error"
-msgstr "分析错误"
+#: languages/cpp/debugger/dbgtoolbar.cpp:115
+#: languages/ruby/debugger/dbgtoolbar.cpp:121
+#, fuzzy
+msgid "Dock to Panel && Iconify TDevelop"
+msgstr "停靠到面板上并且将 KDevelop 缩为图标"
 
-#: languages/php/phpsupportpart.cpp:95
-msgid "<b>Run</b><p>Executes script on a terminal or a webserver."
-msgstr "<b>运行</b><p>在终端或web服务器上运行脚本。"
+#: languages/cpp/debugger/dbgtoolbar.cpp:225
+#, fuzzy
+msgid "TDevelop debugger: Click to execute one line of code (\"step\")"
+msgstr "KDevelop 调试器：点击可执行一行代码(“单步”)"
 
-#: languages/php/phpsupportpart.cpp:97
-msgid "&New Class..."
-msgstr "新建类(&N)..."
+#: languages/cpp/debugger/dbgtoolbar.cpp:246
+#: languages/ruby/debugger/dbgtoolbar.cpp:245
+msgid "Activate"
+msgstr "激活"
 
-#: languages/php/phpsupportpart.cpp:100
-msgid "New class"
-msgstr "新建类"
+#: languages/cpp/debugger/dbgtoolbar.cpp:247
+#: languages/ruby/debugger/dbgtoolbar.cpp:246
+#, fuzzy
+msgid "Activate (TDevelop gets focus)"
+msgstr "激活(KDevelop 获得焦点)"
 
-#: languages/php/phpsupportpart.cpp:101
-msgid "<b>New class</b><p>Runs New Class wizard."
-msgstr "<b>新建类</b><p>运行新建类的向导。"
+#: languages/cpp/debugger/dbgtoolbar.cpp:307
+#: languages/ruby/debugger/dbgtoolbar.cpp:304
+msgid "Step Out"
+msgstr "跳出函数"
 
-#: languages/php/phpsupportpart.cpp:106
-msgid ""
-"<b>PHP problems</b>"
-"<p>This view shows PHP parser warnings, errors, and fatal errors."
-msgstr "<b>PHP错误</b><p>本视图显示PHP预处理警告，错误和严重错误。"
+#: languages/cpp/debugger/dbgtoolbar.cpp:308
+#: languages/ruby/debugger/dbgtoolbar.cpp:305
+msgid "Run to Cursor"
+msgstr "运行到光标处"
 
-#: languages/php/phpsupportpart.cpp:118 languages/php/phpsupportpart.cpp:333
-msgid "PHP"
-msgstr "PHP"
+#: languages/cpp/debugger/dbgtoolbar.cpp:325
+#: languages/ruby/debugger/dbgtoolbar.cpp:318
+msgid "Continue with application execution, may start the application"
+msgstr "继续执行应用程序，或者启动这个应用程序"
 
-#: languages/php/phpsupportpart.cpp:211
-msgid "PHP Specific"
-msgstr "PHP 特定设置"
+#: languages/cpp/debugger/dbgtoolbar.cpp:326
+#: languages/ruby/debugger/dbgtoolbar.cpp:319
+msgid "Interrupt the application execution"
+msgstr "中断应用程序的运行"
 
-#: languages/php/phpsupportpart.cpp:211 languages/php/phpsupportpart.cpp:243
-msgid "PHP Settings"
-msgstr "PHP 设置"
+#: languages/cpp/debugger/dbgtoolbar.cpp:327
+msgid "Execute one line of code, but run through functions"
+msgstr "执行一行代码，但不进入函数调用"
 
-#: languages/php/phpsupportpart.cpp:238
+#: languages/cpp/debugger/dbgtoolbar.cpp:328
+msgid "Execute one assembler instruction, but run through functions"
+msgstr "执行一行汇编指令，但不进入函数调用"
+
+#: languages/cpp/debugger/dbgtoolbar.cpp:329
+msgid "Execute one line of code, stepping into functions if appropriate"
+msgstr "执行一行代码，如果遇到函数调用则进入函数"
+
+#: languages/cpp/debugger/dbgtoolbar.cpp:330
 msgid ""
-"There is no configuration for executing a PHP file.\n"
-"Please set the correct values in the next dialog."
-msgstr ""
-"没有执行 PHP 文件需要的配置。\n"
-"请在下一个对话框里设置正确的值。"
+"Execute one assembler instruction, stepping into functions if appropriate"
+msgstr "执行一行汇编指令，如果遇到函数调用则进入函数"
 
-#: languages/php/phpsupportpart.cpp:239
-msgid "Customize PHP Mode"
-msgstr "自定义 PHP 模式"
+#: languages/cpp/debugger/dbgtoolbar.cpp:331
+#: languages/ruby/debugger/dbgtoolbar.cpp:322
+msgid "Execute to end of current stack frame"
+msgstr "执行到当前堆栈结构结束为止"
 
-#: languages/php/phpcodecompletion.cpp:709
-msgid "Type of %1 is %2"
-msgstr "%1 的类型是 %2"
+#: languages/cpp/debugger/dbgtoolbar.cpp:332
+#: languages/cpp/debugger/dbgtoolbar.cpp:344
+#: languages/ruby/debugger/dbgtoolbar.cpp:323
+#: languages/ruby/debugger/dbgtoolbar.cpp:334
+msgid "Continues execution until the cursor position is reached."
+msgstr "继续运行程序到光标所在的行。"
 
-#: languages/sql/sqlactions.cpp:83
-msgid "<no database server>"
-msgstr "<无数据库服务器>"
+#: languages/cpp/debugger/dbgtoolbar.cpp:333
+msgid "Memory, dissemble, registers, library viewers"
+msgstr "内存、反汇编、寄存器、库查看器"
 
-#: languages/sql/sqlactions.cpp:91
-msgid "<error - no connection %1>"
-msgstr "<错误－没有连接 %1>"
+#: languages/cpp/debugger/dbgtoolbar.cpp:334
+#: languages/ruby/debugger/dbgtoolbar.cpp:324
+#, fuzzy
+msgid "Set focus on TDevelop"
+msgstr "把焦点放到 KDevelop 上"
 
-#: languages/sql/sqlsupport_part.cpp:45
-msgid "<b>Run</b><p>Executes a SQL script."
-msgstr "<b>运行</b><p>运行SQL脚本。"
+#: languages/cpp/debugger/dbgtoolbar.cpp:335
+#: languages/ruby/debugger/dbgtoolbar.cpp:325
+#, fuzzy
+msgid "Set focus on window that had focus when TDevelop got focus"
+msgstr "把焦点放到 KDeveop 获得焦点前拥有焦点的窗口"
 
-#: languages/sql/sqlsupport_part.cpp:47
-msgid "&Database Connections"
-msgstr "数据库连接(&D)"
+#: languages/cpp/debugger/dbgtoolbar.cpp:337
+#: languages/ruby/debugger/dbgtoolbar.cpp:327
+msgid "Continue with application execution. May start the application."
+msgstr "继续执行应用程序，或者启动这个应用程序。"
 
-#: languages/sql/sqlsupport_part.cpp:59
-msgid "Output of SQL commands"
-msgstr "SQL 命令的输出"
+#: languages/cpp/debugger/dbgtoolbar.cpp:338
+#: languages/ruby/debugger/dbgtoolbar.cpp:328
+msgid "Interrupt the application execution."
+msgstr "中断应用程序的运行。"
 
-#: languages/sql/sqlsupport_part.cpp:60
+#: languages/cpp/debugger/dbgtoolbar.cpp:339
+msgid "Execute one line of code, but run through functions."
+msgstr "执行一行代码，但不进入函数调用。"
+
+#: languages/cpp/debugger/dbgtoolbar.cpp:340
+msgid "Execute one assembler instruction, but run through functions."
+msgstr "执行一行汇编指令，但不进入函数调用。"
+
+#: languages/cpp/debugger/dbgtoolbar.cpp:341
+msgid "Execute one line of code, stepping into functions if appropriate."
+msgstr "执行一行代码，如果可能则进入函数。"
+
+#: languages/cpp/debugger/dbgtoolbar.cpp:342
 msgid ""
-"<b>Output of SQL commands</b>"
-"<p>This window shows the output of SQL commands being executed. It can display "
-"results of SQL \"select\" commands in a table."
-msgstr "<b>SQL命令输出</b><p>该窗口显示被执行的SQL命令。它能在一个表中显示\"select\"命令的结果。"
+"Execute one assembler instruction, stepping into functions if appropriate."
+msgstr "执行一行汇编指令，如果可能则进入函数。"
 
-#: languages/sql/sqlsupport_part.cpp:135
-msgid "Specify Your Database Connections"
-msgstr "指定您的数据库连接"
+#: languages/cpp/debugger/dbgtoolbar.cpp:343
+#: languages/ruby/debugger/dbgtoolbar.cpp:333
+msgid "Execute to end of current stack frame."
+msgstr "执行到当前堆栈结构结束为止。"
 
-#: languages/sql/sqlsupport_part.cpp:167
-msgid "Please select a valid database connection."
-msgstr "请选择一个有效的数据库连接。"
+#: languages/cpp/debugger/dbgtoolbar.cpp:345
+msgid "Memory, dissemble, registers, library viewers."
+msgstr "内存、反汇编、寄存器、库视图。"
 
-#: languages/sql/sqloutputwidget.cpp:81
-#, c-format
-msgid "No such connection: %1"
-msgstr "无此连接：%1"
+#: languages/cpp/debugger/dbgtoolbar.cpp:346
+#: languages/ruby/debugger/dbgtoolbar.cpp:335
+#, fuzzy
+msgid "Set focus on TDevelop."
+msgstr "把焦点放到 KDevelop 上。"
 
-#: languages/sql/sqloutputwidget.cpp:104
-#, c-format
-msgid "Query successful, number of rows affected: %1"
-msgstr "查询成功，影响行数：%1"
+#: languages/cpp/debugger/dbgtoolbar.cpp:347
+#: languages/ruby/debugger/dbgtoolbar.cpp:336
+#, fuzzy
+msgid "Set focus on window that had focus when TDevelop got focus."
+msgstr "把焦点放到 KDeveop 获得焦点前拥有焦点的窗口"
 
-#: languages/sql/sqloutputwidget.cpp:111 languages/sql/sqloutputwidget.cpp:118
-msgid "An error occurred:"
-msgstr "遇到错误："
+#: languages/cpp/debugger/gdboutputwidget.cpp:57
+msgid "&GDB cmd:"
+msgstr "GDB 命令(&G)："
 
-#: languages/sql/sqloutputwidget.cpp:119
-msgid "Driver"
-msgstr "驱动程序"
+#: languages/cpp/debugger/gdboutputwidget.cpp:73
+msgid "Pause execution of the app to enter gdb commands"
+msgstr "暂停程序运行来输入 gdb 命令"
 
-#: kdevdesigner/designer/hierarchyview.cpp:376
-#: languages/sql/sqloutputwidget.cpp:121
-msgid "Database"
-msgstr "数据库"
+#: languages/cpp/debugger/gdboutputwidget.cpp:326
+msgid "Show Internal Commands"
+msgstr ""
 
-#: languages/bash/bashsupport_part.cpp:48
-#: languages/ruby/rubysupport_part.cpp:55
-msgid "<b>Run</b><p>Starts an application."
-msgstr "<b>运行</b><p>运行一个应用程序。"
+#: languages/cpp/debugger/gdboutputwidget.cpp:334
+msgid ""
+"Controls if commands issued internally by KDevelop will be shown or not."
+"<br>This option will affect only future commands, it will not add or remove "
+"already issued commands from the view."
+msgstr ""
 
-#: languages/java/javasupportpart.cpp:164
-msgid "<b>New Class</b>Generates a new class.<p>"
-msgstr "<b>新建类</b><p>创建一个新类。"
+#: languages/cpp/debugger/gdboutputwidget.cpp:339
+#, fuzzy
+msgid "Copy All"
+msgstr "全部关闭"
 
-#: languages/java/javasupportpart.cpp:736
-msgid "Java Support"
-msgstr "Java 支持"
+#: languages/cpp/pcsimporter/customimporter/settingsdialog.cpp:44
+msgid "Directories to Parse"
+msgstr "要分析的目录"
 
-#: languages/java/javasupportpart.cpp:736
-msgid "Keep Them"
-msgstr "保留"
+#: languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp:115
+msgid ""
+"This does not appear to be a valid TQt3 include directory.\n"
+"Please select a different directory."
+msgstr ""
 
-#: languages/java/problemreporter.cpp:238
-msgid "Java Parsing"
-msgstr "Java 分析"
+#: languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp:107
+#: languages/cpp/pcsimporter/qtimporter/settingsdialog.cpp:115
+#: languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp:92
+#, fuzzy
+msgid "Invalid Directory"
+msgstr "本地目录"
+
+#: languages/cpp/pcsimporter/qt4importer/settingsdialog.cpp:107
+msgid ""
+"This does not appear to be a valid TQt4 include directory.\n"
+"Please select a different directory."
+msgstr ""
+
+#: languages/cpp/pcsimporter/tdelibsimporter/settingsdialog.cpp:92
+msgid ""
+"This does not appear to be a valid TDE include directory.\n"
+"Please select a different directory."
+msgstr ""
 
 #: buildtools/qmake/trollprojectpart.cpp:143
 #: languages/csharp/csharpsupportpart.cpp:65
@@ -16314,6 +16191,64 @@ msgstr "只存在 funtions 和 faq 目录。"
 msgid "Error in perldoc"
 msgstr "perldoc 报告错误"
 
+#: languages/sql/sqlsupport_part.cpp:45
+msgid "<b>Run</b><p>Executes a SQL script."
+msgstr "<b>运行</b><p>运行SQL脚本。"
+
+#: languages/sql/sqlsupport_part.cpp:47
+msgid "&Database Connections"
+msgstr "数据库连接(&D)"
+
+#: languages/sql/sqlsupport_part.cpp:59
+msgid "Output of SQL commands"
+msgstr "SQL 命令的输出"
+
+#: languages/sql/sqlsupport_part.cpp:60
+msgid ""
+"<b>Output of SQL commands</b>"
+"<p>This window shows the output of SQL commands being executed. It can display "
+"results of SQL \"select\" commands in a table."
+msgstr "<b>SQL命令输出</b><p>该窗口显示被执行的SQL命令。它能在一个表中显示\"select\"命令的结果。"
+
+#: languages/sql/sqlsupport_part.cpp:135
+msgid "Specify Your Database Connections"
+msgstr "指定您的数据库连接"
+
+#: languages/sql/sqlsupport_part.cpp:167
+msgid "Please select a valid database connection."
+msgstr "请选择一个有效的数据库连接。"
+
+#: languages/sql/sqlactions.cpp:81
+msgid "<no database server>"
+msgstr "<无数据库服务器>"
+
+#: languages/sql/sqlactions.cpp:89
+msgid "<error - no connection %1>"
+msgstr "<错误－没有连接 %1>"
+
+#: languages/sql/sqloutputwidget.cpp:81
+#, c-format
+msgid "No such connection: %1"
+msgstr "无此连接：%1"
+
+#: languages/sql/sqloutputwidget.cpp:104
+#, c-format
+msgid "Query successful, number of rows affected: %1"
+msgstr "查询成功，影响行数：%1"
+
+#: languages/sql/sqloutputwidget.cpp:111 languages/sql/sqloutputwidget.cpp:118
+msgid "An error occurred:"
+msgstr "遇到错误："
+
+#: languages/sql/sqloutputwidget.cpp:119
+msgid "Driver"
+msgstr "驱动程序"
+
+#: kdevdesigner/designer/hierarchyview.cpp:376
+#: languages/sql/sqloutputwidget.cpp:121
+msgid "Database"
+msgstr "数据库"
+
 #: languages/ruby/rubysupport_part.cpp:58
 #: languages/ruby/rubysupport_part.cpp:61
 #, fuzzy
@@ -16373,6 +16308,94 @@ msgstr "Ruby"
 msgid "Cannot write to file"
 msgstr "无法写入文件"
 
+#: languages/ruby/debugger/rdboutputwidget.cpp:60
+msgid "&RDB cmd:"
+msgstr "RDB 命令(&R)："
+
+#: languages/ruby/debugger/rdboutputwidget.cpp:76
+#, fuzzy
+msgid "Pause execution of the app to enter rdb commands"
+msgstr "暂停程序运行来输入 gdb 命令"
+
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:182
+msgid "Add empty breakpoint"
+msgstr "添加空断点"
+
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:182
+msgid " <Alt+A>"
+msgstr " <Alt+A>"
+
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:183
+#, fuzzy
+msgid ""
+"<b>Add empty breakpoint</b>"
+"<p>Shows a popup menu that allows you to choose the type of breakpoint, then "
+"adds a breakpoint of the selected type to the breakpoints list."
+msgstr "<b>添加空断点</b><p>显示一个弹出菜单来选择断点类型。然后在断点列表中增加一个选定类型的断点。"
+
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:188
+msgid "Delete selected breakpoint"
+msgstr "删除选中的断点"
+
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:188
+msgid " <Delete>"
+msgstr " <删除>"
+
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:189
+msgid ""
+"<b>Delete selected breakpoint</b>"
+"<p>Deletes the selected breakpoint in the breakpoints list."
+msgstr "<b>删除选择的断点</b><p>从断点列表中删除选择的断点。"
+
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:193
+msgid "Edit selected breakpoint"
+msgstr "编辑选择的断点"
+
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:193
+msgid " <Return>"
+msgstr " <返回>"
+
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:194
+msgid ""
+"<b>Edit selected breakpoint</b>"
+"<p>Allows to edit location, condition and ignore count properties of the "
+"selected breakpoint in the breakpoints list."
+msgstr "<b>编辑选择的断点</b><p>修改在断点列表中选择的断点的位置，条件和忽略计数属性。"
+
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:198
+msgid "Remove all breakpoints"
+msgstr "删除所有断点"
+
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:199
+msgid "<b>Remove all breakpoints</b><p>Removes all breakpoints in the project."
+msgstr "<b>删除所有断点</b><p>删除工程中的所有断点。"
+
+#: languages/ruby/debugger/breakpoint.h:129
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:209
+msgid "File:line"
+msgstr "文件:行"
+
+#: languages/cpp/debugger/breakpoint.h:285
+#: languages/ruby/debugger/breakpoint.h:155
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:210
+msgid "Watchpoint"
+msgstr "观察点"
+
+#: languages/ruby/debugger/breakpoint.h:178
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:211
+#, fuzzy
+msgid "Catchpoint"
+msgstr "观察点"
+
+#: languages/ruby/debugger/breakpoint.h:201
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:212
+msgid "Method()"
+msgstr "方法"
+
+#: languages/ruby/debugger/rdbbreakpointwidget.cpp:237
+msgid "Show"
+msgstr "显示"
+
 #: languages/ruby/debugger/debuggerpart.cpp:97
 #, fuzzy
 msgid ""
@@ -16488,9 +16511,51 @@ msgstr "<b>切换断点</b><p>在变量／察看列表中增加一个表达式�
 msgid "Restart"
 msgstr "重新开始"
 
+#: languages/ruby/debugger/variablewidget.cpp:56
+msgid "E&xpression to watch:"
+msgstr "要观察的表达式(&X)："
+
+#: languages/ruby/debugger/variablewidget.cpp:195
+#, fuzzy
+msgid "Remove Watch Expression"
+msgstr "删除观察变量"
+
+#: languages/ruby/debugger/variablewidget.cpp:198
+msgid "Copy to Clipboard"
+msgstr "复制到剪切板"
+
+#: languages/ruby/debugger/rdbcontroller.cpp:349
+#, fuzzy
+msgid ""
+"rdb message:\n"
+msgstr ""
+"gdb 消息：\n"
+
+#: languages/ruby/debugger/rdbcontroller.cpp:397
+#: languages/ruby/debugger/rdbcontroller.cpp:399
+#: languages/ruby/debugger/rdbcontroller.cpp:461
+#: languages/ruby/debugger/rdbcontroller.cpp:508
+#, c-format
+msgid "No source: %1"
+msgstr "没有源文件：%1"
+
+#: languages/ruby/debugger/rdbcontroller.cpp:706
+#, fuzzy
+msgid ""
+"The ruby debugger cannot use the tty* or pty* devices.\n"
+"Check the settings on /dev/tty* and /dev/pty*\n"
+"As root you may need to \"chmod ug+rw\" tty* and pty* devices and/or add the "
+"user to the tty group using \"usermod -G tty username\"."
+msgstr ""
+"gdb 无法使用tty* 或 pty* 设备。\n"
+"请检查 /dev/tty* 和 /dev/pty* 的设置\n"
+"\n"
+"您也许需要作为超级用户对 tty* 和 pty* 设备使用“chmod ug+rw”命令并且/或者使用“usermod -G tty "
+"username”命令将用户添加到 tty 组中。"
+
 #: languages/ruby/debugger/dbgtoolbar.cpp:224
 #, fuzzy
-msgid "KDevelop ruby debugger: Click to execute one line of code (\"step\")"
+msgid "TDevelop ruby debugger: Click to execute one line of code (\"step\")"
 msgstr "KDevelop 调试器：点击可执行一行代码(“单步”)"
 
 #: languages/ruby/debugger/dbgtoolbar.cpp:302
@@ -16521,135 +16586,98 @@ msgstr "执行一行代码，但不进入函数调用。"
 msgid "Execute one line of code, stepping into methods if appropriate."
 msgstr "执行一行代码，如果可能则进入函数。"
 
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:182
-msgid "Add empty breakpoint"
-msgstr "添加空断点"
-
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:182
-msgid " <Alt+A>"
-msgstr " <Alt+A>"
-
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:183
-#, fuzzy
-msgid ""
-"<b>Add empty breakpoint</b>"
-"<p>Shows a popup menu that allows you to choose the type of breakpoint, then "
-"adds a breakpoint of the selected type to the breakpoints list."
-msgstr "<b>添加空断点</b><p>显示一个弹出菜单来选择断点类型。然后在断点列表中增加一个选定类型的断点。"
-
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:188
-msgid "Delete selected breakpoint"
-msgstr "删除选中的断点"
-
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:188
-msgid " <Delete>"
-msgstr " <删除>"
+#: languages/lib/designer_integration/qtdesignerintegration.cpp:63
+#, fuzzy, c-format
+msgid "Cannot find implementation class for form: %1"
+msgstr "无法写入工程文件。"
 
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:189
-msgid ""
-"<b>Delete selected breakpoint</b>"
-"<p>Deletes the selected breakpoint in the breakpoints list."
-msgstr "<b>删除选择的断点</b><p>从断点列表中删除选择的断点。"
+#: languages/lib/designer_integration/implementationwidget.cpp:80
+#, c-format
+msgid "Create or Select Implementation Class for: %1"
+msgstr ""
 
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:193
-msgid "Edit selected breakpoint"
-msgstr "编辑选择的断点"
+#: languages/lib/designer_integration/implementationwidget.cpp:82
+msgid "Namespaces &amp;&amp; Classes"
+msgstr "命名空间和类"
 
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:193
-msgid " <Return>"
-msgstr " <返回>"
+#: languages/lib/designer_integration/implementationwidget.cpp:126
+msgid "Class was created but not found in class store."
+msgstr ""
 
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:194
-msgid ""
-"<b>Edit selected breakpoint</b>"
-"<p>Allows to edit location, condition and ignore count properties of the "
-"selected breakpoint in the breakpoints list."
-msgstr "<b>编辑选择的断点</b><p>修改在断点列表中选择的断点的位置，条件和忽略计数属性。"
+#: languages/lib/debugger/debugger.cpp:198
+msgid "Breakpoint"
+msgstr "断点"
 
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:198
-msgid "Remove all breakpoints"
-msgstr "删除所有断点"
+#: buildtools/ada/adaproject_part.cpp:59
+#: buildtools/autotools/autoprojectpart.cpp:216
+#: buildtools/custommakefiles/customprojectpart.cpp:140
+#: buildtools/pascal/pascalproject_part.cpp:68
+#: embedded/visualboyadvance/visualboyadvance_part.cpp:33
+#: languages/python/pythonsupportpart.cpp:63
+msgid "Execute Program"
+msgstr "执行程序"
 
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:199
-msgid "<b>Remove all breakpoints</b><p>Removes all breakpoints in the project."
-msgstr "<b>删除所有断点</b><p>删除工程中的所有断点。"
+#: buildtools/autotools/autoprojectpart.cpp:219
+#: buildtools/custommakefiles/customprojectpart.cpp:143
+#: buildtools/pascal/pascalproject_part.cpp:71
+#: languages/python/pythonsupportpart.cpp:66
+msgid "Execute program"
+msgstr "执行程序"
 
-#: languages/ruby/debugger/breakpoint.h:129
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:209
-msgid "File:line"
-msgstr "文件:行"
+#: languages/python/pythonsupportpart.cpp:67
+msgid "<b>Execute program</b><p>Runs the Python program."
+msgstr "<b>执行程序</b><p>运行 Python 程序。"
 
-#: languages/cpp/debugger/breakpoint.h:284
-#: languages/ruby/debugger/breakpoint.h:155
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:210
-msgid "Watchpoint"
-msgstr "观察点"
+#: languages/python/pythonsupportpart.cpp:72
+msgid "Execute string"
+msgstr "执行字符串"
 
-#: languages/ruby/debugger/breakpoint.h:178
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:211
-#, fuzzy
-msgid "Catchpoint"
-msgstr "观察点"
+#: languages/python/pythonsupportpart.cpp:73
+msgid "<b>Execute String</b><p>Executes a string as Python code."
+msgstr "<b>执行字符串</b><p>把字符串作为 Python 代码执行。"
 
-#: languages/ruby/debugger/breakpoint.h:201
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:212
-msgid "Method()"
-msgstr "方法"
+#: languages/python/pythonsupportpart.cpp:75
+msgid "Start Python Interpreter"
+msgstr "启动 Python 解释器"
 
-#: languages/ruby/debugger/rdbbreakpointwidget.cpp:237
-msgid "Show"
-msgstr "显示"
+#: languages/python/pythonsupportpart.cpp:78
+msgid "Start Python interpreter"
+msgstr "启动 Python 解释器"
 
-#: languages/ruby/debugger/rdboutputwidget.cpp:60
-msgid "&RDB cmd:"
-msgstr "RDB 命令(&R)："
+#: languages/python/pythonsupportpart.cpp:79
+msgid ""
+"<b>Start python interpreter</b>"
+"<p>Starts the Python interpreter without a program"
+msgstr "<b>启动 Python 解释器</b><p>启动 Python 解释器但不加载程序。"
 
-#: languages/ruby/debugger/rdboutputwidget.cpp:76
-#, fuzzy
-msgid "Pause execution of the app to enter rdb commands"
-msgstr "暂停程序运行来输入 gdb 命令"
+#: languages/python/pythonsupportpart.cpp:81
+msgid "Python Documentation..."
+msgstr "Python 文档..."
 
-#: languages/ruby/debugger/variablewidget.cpp:56
-msgid "E&xpression to watch:"
-msgstr "要观察的表达式(&X)："
+#: languages/python/pythonsupportpart.cpp:84
+msgid "Python documentation"
+msgstr "Python 文档"
 
-#: languages/ruby/debugger/variablewidget.cpp:195
-#, fuzzy
-msgid "Remove Watch Expression"
-msgstr "删除观察变量"
+#: languages/python/pythonsupportpart.cpp:85
+msgid "<b>Python documentation</b><p>Shows a Python documentation page."
+msgstr "<b>Python 文档</b><p>显示 Python 文档页。"
 
-#: languages/ruby/debugger/variablewidget.cpp:198
-msgid "Copy to Clipboard"
-msgstr "复制到剪切板"
+#: languages/python/pythonsupportpart.cpp:364
+msgid "Show Python Documentation"
+msgstr "显示 Python 文档"
 
-#: languages/ruby/debugger/rdbcontroller.cpp:349
-#, fuzzy
-msgid ""
-"rdb message:\n"
-msgstr ""
-"gdb 消息：\n"
+#: languages/python/pythonsupportpart.cpp:364
+msgid "Show Python documentation on keyword:"
+msgstr "显示此关键字的 Python 文档："
 
-#: languages/ruby/debugger/rdbcontroller.cpp:397
-#: languages/ruby/debugger/rdbcontroller.cpp:399
-#: languages/ruby/debugger/rdbcontroller.cpp:461
-#: languages/ruby/debugger/rdbcontroller.cpp:508
-#, c-format
-msgid "No source: %1"
-msgstr "没有源文件：%1"
+#: languages/python/pydoc.cpp:71
+msgid "Error in pydoc"
+msgstr "pydoc 报告错误"
 
-#: languages/ruby/debugger/rdbcontroller.cpp:706
+#: languages/csharp/csharpdoc.cpp:91
 #, fuzzy
-msgid ""
-"The ruby debugger cannot use the tty* or pty* devices.\n"
-"Check the settings on /dev/tty* and /dev/pty*\n"
-"As root you may need to \"chmod ug+rw\" tty* and pty* devices and/or add the "
-"user to the tty group using \"usermod -G tty username\"."
-msgstr ""
-"gdb 无法使用tty* 或 pty* 设备。\n"
-"请检查 /dev/tty* 和 /dev/pty* 的设置\n"
-"\n"
-"您也许需要作为超级用户对 tty* 和 pty* 设备使用“chmod ug+rw”命令并且/或者使用“usermod -G tty "
-"username”命令将用户添加到 tty 组中。"
+msgid "Error in csharpdoc"
+msgstr "pydoc 报告错误"
 
 #: languages/csharp/csharpsupportpart.cpp:68
 #, fuzzy
@@ -16696,168 +16724,305 @@ msgstr "显示 Perl 文档"
 msgid "Show CSharp documentation for function:"
 msgstr "显示此 Perl 函数的文档："
 
-#: languages/csharp/csharpdoc.cpp:91
-#, fuzzy
-msgid "Error in csharpdoc"
-msgstr "pydoc 报告错误"
-
-#: languages/fortran/fortransupportpart.cpp:67
-msgid "&Ftnchek"
-msgstr "&Ftnchek"
+#: languages/pascal/pascalsupport_part.cpp:72
+msgid "problem reporter"
+msgstr "问题报告者"
 
-#: languages/fortran/fortransupportpart.cpp:70
-msgid "Run ftnchek"
-msgstr "运行 Ftnchek"
+#: languages/ada/adasupportpart.cpp:63
+#: languages/pascal/pascalsupport_part.cpp:73
+msgid ""
+"<b>Problem reporter</b>"
+"<p>This window shows various \"problems\" in your project. It displays errors "
+"reported by a language parser."
+msgstr "<b>问题报告</b><p>这个窗口显示您项目中的多种\"问题\"。它显示语言预处理器报告的错误。"
 
-#: languages/fortran/fortransupportpart.cpp:71
+#: languages/pascal/pascalsupport_part.cpp:182
+#, c-format
 msgid ""
-"<b>Run ftnchek</b>"
-"<p>Runs <b>ftnchek</b> to check fortran programs for semantic errors. Configure "
-"ftnchek options in project settings dialog, <b>Ftnchek</b> tab."
-msgstr ""
-"<b>运行 ftnchek</b>"
-"<p>运行 <b>ftnchek</b>来检查fortran程序的语义错误。在项目设置对话框<b>Ftnchek</b>标签配置ftnchek选项。"
+"_n: Found 1 problem\n"
+"Found %n problems"
+msgstr "发现 %n 个问题"
 
-#: languages/fortran/fortransupportpart.cpp:85
-msgid "There is currently a job running."
-msgstr "当前已经有一个进程在运行。"
+#: languages/pascal/pascalsupport_part.cpp:194
+#, c-format
+msgid "Parsing file: %1"
+msgstr "正在分析文件：%1"
 
-#: languages/fortran/fortransupportpart.cpp:160
-msgid "Ftnchek"
-msgstr "Ftnchek"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:32
+msgid "Map File"
+msgstr "映射文件"
 
-#: languages/fortran/ftnchekconfigwidget.cpp:93
-msgid "Warn about inconsistent use of arguments that use arrays"
-msgstr "对使用数组的不一致的参数给出警告"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:36
+msgid "Segments"
+msgstr "段信息"
 
-#: languages/fortran/ftnchekconfigwidget.cpp:94
-msgid ""
-"Warn about dummy arguments of a data type different from the actual arguments"
-msgstr "对形参和实参的数据类型不同给出警告"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:38
+msgid "Publics"
+msgstr "公开符号"
 
-#: languages/fortran/ftnchekconfigwidget.cpp:96
-msgid ""
-"Warn if the invocation assumes a different data type for the return type, "
-"different from the actual return type"
-msgstr "如果调用子程序时期待的返回数据类型和函数的实际返回类型不同则给出警告"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:40
+msgid "Detailed"
+msgstr "详细信息"
 
-#: languages/fortran/ftnchekconfigwidget.cpp:98
-msgid "Warn about invoking a subprogram with an incorrect number of arguments"
-msgstr "如果调用子程序的参数个数不正确则给出警告"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:45
+msgid "Default dynamic loader:"
+msgstr "默认动态装载器："
 
-#: languages/fortran/ftnchekconfigwidget.cpp:104
-msgid ""
-"Corresponding arrays in each declaration of a block must agree in size and "
-"number of dimensions"
-msgstr "每个声明块相对应的数组的尺寸和维数必须是一致的"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:50
+msgid "Reserved address space:"
+msgstr "保留的地址空间："
 
-#: languages/fortran/ftnchekconfigwidget.cpp:106
-msgid "The comparison of two blocks is done variable-by-variable"
-msgstr "逐个变量比较两个声明块"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:87
+msgid "Include search path (delimited by \":\"):"
+msgstr "头文件查找路径(用“:”分隔)："
 
-#: languages/fortran/ftnchekconfigwidget.cpp:107
-msgid ""
-"Warn if different declarations of the same block are not equal in total length"
-msgstr "如果同一个块的不同声明的总长度不同则给出警告"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:89
+msgid "Resource search path (delimited by \":\"):"
+msgstr "资源文件查找路径(用“:”分隔)："
 
-#: languages/fortran/ftnchekconfigwidget.cpp:108
-msgid ""
-"In each declaration of a block, corresponding memory locations must agree in "
-"data type"
-msgstr "在块的每个声明里，相应的内存位置必须和数据类型一致"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:91
+#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:105
+msgid "Unit search path (delimited by \":\"):"
+msgstr "单元搜索路径(以“:”分隔)："
 
-#: languages/fortran/ftnchekconfigwidget.cpp:115
-msgid "Use of the result of integer division as an exponent"
-msgstr "把整数除法的结果用作指数"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:93
+msgid "Object search path (delimited by \":\"):"
+msgstr "OBJ 文件查找路径(用“:”分隔)："
 
-#: languages/fortran/ftnchekconfigwidget.cpp:116
-msgid "Conversion of an expression involving an integer division to real"
-msgstr "将涉及到整数除法的表达式转换为实数运算"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:122
+msgid "Executable output directory:"
+msgstr "执行文件输出目录："
 
-#: languages/fortran/ftnchekconfigwidget.cpp:117
-msgid "Division in an integer constant expression that yields a result of zero"
-msgstr "结果为零的整数常量表达式里的除法"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:124
+msgid "Unit output directory:"
+msgstr "单元输出目录："
 
-#: languages/fortran/ftnchekconfigwidget.cpp:123
-msgid ""
-"A scalar dummy argument is actually the same as another and is (or may be) "
-"modified"
-msgstr "一个标量形参实际上和另一个是一样的，而且可能已被修改"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:126
+msgid "Package directory:"
+msgstr "打包目录："
 
-#: languages/fortran/ftnchekconfigwidget.cpp:125
-msgid ""
-"A dummy argument which is an array or array element is the same array as "
-"another and is modified"
-msgstr "一个数组或者数组元素形参和另一个是一样的，而且已被修改"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:128
+msgid "Package source code directory:"
+msgstr "打包源代码目录："
 
-#: languages/fortran/ftnchekconfigwidget.cpp:127
-msgid ""
-"A scalar dummy argument is the same as a common variable in the subprogram, and "
-"either is modified"
-msgstr "一个标量形参和子程序里的一个公用变量是一样的，而且有一个已被修改"
+#: buildtools/autotools/autosubprojectview.cpp:220
+#: buildtools/autotools/autosubprojectview.cpp:221
+#: buildtools/qmake/trollprojectwidget.cpp:996
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:157
+#: parts/doxygen/messages.cpp:61
+msgid "Build"
+msgstr "构建"
 
-#: languages/fortran/ftnchekconfigwidget.cpp:134
-msgid "ACCEPT and TYPE I/O statements"
-msgstr "ACCEPT 和 TYPE I/O 语句"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:159
+msgid "Build all units"
+msgstr "构建全部单元"
 
-#: languages/fortran/ftnchekconfigwidget.cpp:135
-msgid ""
-"Expressions defining array bounds that contain array elements or function "
-"references"
-msgstr "定义数组范围、且包含数组元素或函数引用的表达式"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:161
+msgid "Make modified units"
+msgstr "编译修改过的单元"
 
-#: languages/fortran/ftnchekconfigwidget.cpp:137
-msgid "Assignment statements involving arrays"
-msgstr "涉及数组的赋值语句"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:163
+msgid "Quiet compile"
+msgstr "安静编译"
 
-#: languages/fortran/ftnchekconfigwidget.cpp:143
-msgid "Backslash characters in strings"
-msgstr "字符串里的反斜线字符"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:165
+msgid "Disable implicit package compilation"
+msgstr "禁用隐含的打包编译"
 
-#: languages/fortran/ftnchekconfigwidget.cpp:144
-msgid "COMMON block variables not in descending order of storage sizes"
-msgstr "COMMON 公用块里的变量没有按存储尺寸递减的顺序声明"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:170
+#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:484
+msgid "Conditional defines (delimited by \":\"):"
+msgstr "条件定义(用“:”分隔)："
 
-#: languages/fortran/ftnchekconfigwidget.cpp:145
-msgid "Hollerith constants"
-msgstr "Hollerith 常数"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:173
+msgid "Unit aliases in form unit=alias (delimited by \":\"):"
+msgstr "单元别名，形式为 unit=alias (用“:”分隔)："
 
-#: languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp:243
-msgid "PGHPF Compiler Options"
-msgstr "PGHPF 编译器选项"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:178
+#: parts/doxygen/messages.cpp:92 parts/outputviews/makeviewpart.cpp:52
+msgid "Messages"
+msgstr "消息"
 
-#: languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp:243
-msgid "PGF77 Compiler Options"
-msgstr "PGF77 编译器选项"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:180
+msgid "Output hint messages"
+msgstr "输出提示消息"
 
-#: languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp:255
-msgid "HPF"
-msgstr "HPF"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:182
+msgid "Output warning messages"
+msgstr "输出警告消息"
 
-#: languages/pascal/pascalsupport_part.cpp:72
-msgid "problem reporter"
-msgstr "问题报告者"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:186
+msgid "Packages"
+msgstr "软件包"
 
-#: languages/pascal/pascalsupport_part.cpp:182
-#, c-format
-msgid ""
-"_n: Found 1 problem\n"
-"Found %n problems"
-msgstr "发现 %n 个问题"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:187
+msgid "Build with packages (delimited by \":\"):"
+msgstr "构建用软件包(用“:”分隔)："
 
-#: languages/pascal/pascalsupport_part.cpp:194
-#, c-format
-msgid "Parsing file: %1"
-msgstr "正在分析文件：%1"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:223
+msgid "Code Alignment && Stack Frames"
+msgstr "代码对齐和堆栈框架"
 
-#: languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp:44
-msgid "Free Pascal Compiler Options"
-msgstr "Pascal 编译器选项"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:224
+msgid "Default (-$A8)"
+msgstr "默认 (-$A8)"
 
-#: languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp:48
-#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:213
-msgid "Language"
-msgstr "语言"
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:227
+msgid "Never align"
+msgstr "不对齐"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:229
+msgid "On word boundaries"
+msgstr "整字边界"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:231
+msgid "On double word boundaries"
+msgstr "双字边界"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:233
+msgid "On quad word boundaries"
+msgstr "四字边界"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:235
+msgid "Generate stack frames"
+msgstr "生成堆栈框架"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:239
+msgid "Enumeration Size"
+msgstr "枚举大小"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:240
+msgid "Default (-$Z1)"
+msgstr "默认 (-$Z1)"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:243
+msgid "Unsigned byte (256 values)"
+msgstr "无符号字节(256 个值)"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:245
+msgid "Unsigned word (64K values)"
+msgstr "无符号整字(64k 个值)"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:247
+msgid "Unsigned double word (4096M values)"
+msgstr "无符号双字(4096M 个值)"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:251
+#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:464
+msgid "Compile Time Checks"
+msgstr "编译时检查"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:253
+msgid "Assertions"
+msgstr "断言"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:255
+msgid "Complete boolean evaluation"
+msgstr "计算完整的布尔值"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:257
+msgid "Extended syntax"
+msgstr "扩展语法"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:259
+msgid "Long strings"
+msgstr "长字符串"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:261
+msgid "Open string parameters"
+msgstr "不封闭的字符串参数"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:263
+msgid "Type-checked pointers"
+msgstr "指针类型检查"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:265
+msgid "Var-string checking"
+msgstr "变长字符串检查"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:267
+msgid "Writable typed constants"
+msgstr "可写的类型常量"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:271
+#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:472
+msgid "Run Time Checks"
+msgstr "运行时检查"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:273
+msgid "Runtime type information"
+msgstr "运行时类型信息"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:275
+msgid "Imported data references"
+msgstr "导入的数据参照"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:277
+#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:478
+msgid "Input/Output checking"
+msgstr "输入/输出检查"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:279
+msgid "Overflow checking"
+msgstr "溢出检查"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:281
+#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:474
+msgid "Range checking"
+msgstr "范围检查"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:320
+msgid "Enable optimizations"
+msgstr "启用优化"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:327
+#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:338
+msgid "Debugging"
+msgstr "调试"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:329
+msgid "Debug information"
+msgstr "调试信息"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:331
+msgid "Local symbol information"
+msgstr "局部符号信息"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:333
+msgid "Debug information for GDB"
+msgstr "GDB 调试信息"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:335
+msgid "Namespace debug info"
+msgstr "名字空间调试信息"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:337
+msgid "Write symbol info in an .rsm file"
+msgstr "输出符号信息到 .rsm 文件"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:341
+msgid "Symbol Reference Information"
+msgstr "符号参照信息"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:342
+msgid "Default (-$YD)"
+msgstr "默认 (-$YD)"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:345
+msgid "No information"
+msgstr "无信息"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:347
+msgid "Definition information"
+msgstr "定义信息"
+
+#: languages/pascal/compiler/dccoptions/optiontabs.cpp:349
+msgid "Full reference information"
+msgstr "完整的参照信息"
+
+#: languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp:46
+msgid "Delphi Compiler Options"
+msgstr "Delphi 编译器选项"
 
 #: languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp:53
 #: languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp:51
@@ -16874,19 +17039,11 @@ msgstr "位置 2"
 msgid "Debug && Optimization"
 msgstr "调试和优化"
 
-#: languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp:63
-msgid "Assembler"
-msgstr "汇编器"
-
 #: languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp:65
 #: languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp:66
 msgid "Linker"
 msgstr "连接器"
 
-#: languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp:69
-msgid "Feedback"
-msgstr "反馈"
-
 #: languages/pascal/compiler/fpcoptions/optiontabs.cpp:34
 msgid "Format errors like GCC does"
 msgstr "象 GCC 那样格式化错误"
@@ -16955,11 +17112,6 @@ msgstr "显示过程和函数的名称"
 msgid "Show all procedure declarations if an overloaded function error occurs"
 msgstr "当一个函数重载发生错误时显示所有的过程定义"
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:91
-#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:105
-msgid "Unit search path (delimited by \":\"):"
-msgstr "单元搜索路径(以“:”分隔)："
-
 #: languages/pascal/compiler/fpcoptions/optiontabs.cpp:107
 msgid "Include file search path (delimited by \":\"):"
 msgstr "包含文件搜索路径(以“:”分隔)："
@@ -17036,6 +17188,11 @@ msgstr "支持 C++ 风格的内联"
 msgid "Support C style macros"
 msgstr "支持 C 风格的宏"
 
+#: languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp:48
+#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:213
+msgid "Language"
+msgstr "语言"
+
 #: languages/pascal/compiler/fpcoptions/optiontabs.cpp:215
 msgid "Support the label and goto commands"
 msgstr "支持标号和跳转语句"
@@ -17142,11 +17299,6 @@ msgstr "使用 coff"
 msgid "Use pecoff"
 msgstr "使用 pecoff"
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:327
-#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:338
-msgid "Debugging"
-msgstr "调试"
-
 #: languages/pascal/compiler/fpcoptions/optiontabs.cpp:340
 msgid "Generate information for GDB"
 msgstr "为 GDB 生成调试信息"
@@ -17223,11 +17375,6 @@ msgstr "使用寄存器变量"
 msgid "Uncertain optimizations"
 msgstr "不确定的优化"
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:251
-#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:464
-msgid "Compile Time Checks"
-msgstr "编译时检查"
-
 #: languages/pascal/compiler/fpcoptions/optiontabs.cpp:466
 msgid "Include assert statements in compiled code"
 msgstr "在编译生成的代码中插入断言语句"
@@ -17236,34 +17383,14 @@ msgstr "在编译生成的代码中插入断言语句"
 msgid "Do not check the unit name for being the same as the file name"
 msgstr "不检查单元名称和文件名是否相同"
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:271
-#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:472
-msgid "Run Time Checks"
-msgstr "运行时检查"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:281
-#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:474
-msgid "Range checking"
-msgstr "范围检查"
-
 #: languages/pascal/compiler/fpcoptions/optiontabs.cpp:476
 msgid "Stack checking"
 msgstr "堆栈检查"
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:277
-#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:478
-msgid "Input/Output checking"
-msgstr "输入/输出检查"
-
 #: languages/pascal/compiler/fpcoptions/optiontabs.cpp:480
 msgid "Integer overflow checking"
 msgstr "整数溢出检查"
 
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:170
-#: languages/pascal/compiler/fpcoptions/optiontabs.cpp:484
-msgid "Conditional defines (delimited by \":\"):"
-msgstr "条件定义(用“:”分隔)："
-
 #: languages/pascal/compiler/fpcoptions/optiontabs.cpp:487
 msgid "Undefine conditional defines (delimited by \":\"):"
 msgstr "不定义条件定义(用“:”分隔)："
@@ -17392,3313 +17519,270 @@ msgstr "SunOS/Solaris"
 msgid "BeOS"
 msgstr "BeOS"
 
-#: languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp:46
-msgid "Delphi Compiler Options"
-msgstr "Delphi 编译器选项"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:32
-msgid "Map File"
-msgstr "映射文件"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:36
-msgid "Segments"
-msgstr "段信息"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:38
-msgid "Publics"
-msgstr "公开符号"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:40
-msgid "Detailed"
-msgstr "详细信息"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:45
-msgid "Default dynamic loader:"
-msgstr "默认动态装载器："
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:50
-msgid "Reserved address space:"
-msgstr "保留的地址空间："
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:87
-msgid "Include search path (delimited by \":\"):"
-msgstr "头文件查找路径(用“:”分隔)："
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:89
-msgid "Resource search path (delimited by \":\"):"
-msgstr "资源文件查找路径(用“:”分隔)："
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:93
-msgid "Object search path (delimited by \":\"):"
-msgstr "OBJ 文件查找路径(用“:”分隔)："
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:122
-msgid "Executable output directory:"
-msgstr "执行文件输出目录："
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:124
-msgid "Unit output directory:"
-msgstr "单元输出目录："
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:126
-msgid "Package directory:"
-msgstr "打包目录："
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:128
-msgid "Package source code directory:"
-msgstr "打包源代码目录："
-
-#: buildtools/autotools/autosubprojectview.cpp:220
-#: buildtools/autotools/autosubprojectview.cpp:221
-#: buildtools/qmake/trollprojectwidget.cpp:996
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:157
-#: parts/doxygen/messages.cpp:61
-msgid "Build"
-msgstr "构建"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:159
-msgid "Build all units"
-msgstr "构建全部单元"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:161
-msgid "Make modified units"
-msgstr "编译修改过的单元"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:163
-msgid "Quiet compile"
-msgstr "安静编译"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:165
-msgid "Disable implicit package compilation"
-msgstr "禁用隐含的打包编译"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:173
-msgid "Unit aliases in form unit=alias (delimited by \":\"):"
-msgstr "单元别名，形式为 unit=alias (用“:”分隔)："
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:178
-#: parts/doxygen/messages.cpp:92 parts/outputviews/makeviewpart.cpp:52
-msgid "Messages"
-msgstr "消息"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:180
-msgid "Output hint messages"
-msgstr "输出提示消息"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:182
-msgid "Output warning messages"
-msgstr "输出警告消息"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:186
-msgid "Packages"
-msgstr "软件包"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:187
-msgid "Build with packages (delimited by \":\"):"
-msgstr "构建用软件包(用“:”分隔)："
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:223
-msgid "Code Alignment && Stack Frames"
-msgstr "代码对齐和堆栈框架"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:224
-msgid "Default (-$A8)"
-msgstr "默认 (-$A8)"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:227
-msgid "Never align"
-msgstr "不对齐"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:229
-msgid "On word boundaries"
-msgstr "整字边界"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:231
-msgid "On double word boundaries"
-msgstr "双字边界"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:233
-msgid "On quad word boundaries"
-msgstr "四字边界"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:235
-msgid "Generate stack frames"
-msgstr "生成堆栈框架"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:239
-msgid "Enumeration Size"
-msgstr "枚举大小"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:240
-msgid "Default (-$Z1)"
-msgstr "默认 (-$Z1)"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:243
-msgid "Unsigned byte (256 values)"
-msgstr "无符号字节(256 个值)"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:245
-msgid "Unsigned word (64K values)"
-msgstr "无符号整字(64k 个值)"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:247
-msgid "Unsigned double word (4096M values)"
-msgstr "无符号双字(4096M 个值)"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:253
-msgid "Assertions"
-msgstr "断言"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:255
-msgid "Complete boolean evaluation"
-msgstr "计算完整的布尔值"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:257
-msgid "Extended syntax"
-msgstr "扩展语法"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:259
-msgid "Long strings"
-msgstr "长字符串"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:261
-msgid "Open string parameters"
-msgstr "不封闭的字符串参数"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:263
-msgid "Type-checked pointers"
-msgstr "指针类型检查"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:265
-msgid "Var-string checking"
-msgstr "变长字符串检查"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:267
-msgid "Writable typed constants"
-msgstr "可写的类型常量"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:273
-msgid "Runtime type information"
-msgstr "运行时类型信息"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:275
-msgid "Imported data references"
-msgstr "导入的数据参照"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:279
-msgid "Overflow checking"
-msgstr "溢出检查"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:320
-msgid "Enable optimizations"
-msgstr "启用优化"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:329
-msgid "Debug information"
-msgstr "调试信息"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:331
-msgid "Local symbol information"
-msgstr "局部符号信息"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:333
-msgid "Debug information for GDB"
-msgstr "GDB 调试信息"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:335
-msgid "Namespace debug info"
-msgstr "名字空间调试信息"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:337
-msgid "Write symbol info in an .rsm file"
-msgstr "输出符号信息到 .rsm 文件"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:341
-msgid "Symbol Reference Information"
-msgstr "符号参照信息"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:342
-msgid "Default (-$YD)"
-msgstr "默认 (-$YD)"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:345
-msgid "No information"
-msgstr "无信息"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:347
-msgid "Definition information"
-msgstr "定义信息"
-
-#: languages/pascal/compiler/dccoptions/optiontabs.cpp:349
-msgid "Full reference information"
-msgstr "完整的参照信息"
-
-#: buildtools/ada/adaproject_part.cpp:59
-#: buildtools/autotools/autoprojectpart.cpp:208
-#: buildtools/custommakefiles/customprojectpart.cpp:140
-#: buildtools/pascal/pascalproject_part.cpp:68
-#: embedded/visualboyadvance/visualboyadvance_part.cpp:33
-#: languages/python/pythonsupportpart.cpp:63
-msgid "Execute Program"
-msgstr "执行程序"
-
-#: buildtools/autotools/autoprojectpart.cpp:211
-#: buildtools/custommakefiles/customprojectpart.cpp:143
-#: buildtools/pascal/pascalproject_part.cpp:71
-#: languages/python/pythonsupportpart.cpp:66
-msgid "Execute program"
-msgstr "执行程序"
-
-#: languages/python/pythonsupportpart.cpp:67
-msgid "<b>Execute program</b><p>Runs the Python program."
-msgstr "<b>执行程序</b><p>运行 Python 程序。"
-
-#: languages/python/pythonsupportpart.cpp:72
-msgid "Execute string"
-msgstr "执行字符串"
-
-#: languages/python/pythonsupportpart.cpp:73
-msgid "<b>Execute String</b><p>Executes a string as Python code."
-msgstr "<b>执行字符串</b><p>把字符串作为 Python 代码执行。"
-
-#: languages/python/pythonsupportpart.cpp:75
-msgid "Start Python Interpreter"
-msgstr "启动 Python 解释器"
-
-#: languages/python/pythonsupportpart.cpp:78
-msgid "Start Python interpreter"
-msgstr "启动 Python 解释器"
-
-#: languages/python/pythonsupportpart.cpp:79
-msgid ""
-"<b>Start python interpreter</b>"
-"<p>Starts the Python interpreter without a program"
-msgstr "<b>启动 Python 解释器</b><p>启动 Python 解释器但不加载程序。"
-
-#: languages/python/pythonsupportpart.cpp:81
-msgid "Python Documentation..."
-msgstr "Python 文档..."
-
-#: languages/python/pythonsupportpart.cpp:84
-msgid "Python documentation"
-msgstr "Python 文档"
-
-#: languages/python/pythonsupportpart.cpp:85
-msgid "<b>Python documentation</b><p>Shows a Python documentation page."
-msgstr "<b>Python 文档</b><p>显示 Python 文档页。"
-
-#: languages/python/pythonsupportpart.cpp:364
-msgid "Show Python Documentation"
-msgstr "显示 Python 文档"
-
-#: languages/python/pythonsupportpart.cpp:364
-msgid "Show Python documentation on keyword:"
-msgstr "显示此关键字的 Python 文档："
-
-#: languages/python/pydoc.cpp:71
-msgid "Error in pydoc"
-msgstr "pydoc 报告错误"
-
-#: languages/kjssupport/kjssupport_part.cpp:73
-msgid "Test the active script."
-msgstr ""
-
-#: languages/kjssupport/kjssupport_part.cpp:90
-#, fuzzy
-msgid "KJS Console"
-msgstr "Konsole"
-
-#: languages/kjssupport/kjssupport_part.cpp:90
-#, fuzzy
-msgid "KJS Embed Console"
-msgstr "内嵌终端窗口"
-
-#: lib/util/tdescriptactionmanager.cpp:98
-msgid "Unable to get KScript Runner for type \"%1\"."
-msgstr ""
-
-#: lib/util/tdescriptactionmanager.cpp:98
-#, fuzzy
-msgid "KScript Error"
-msgstr "脚本"
-
-#: lib/util/execcommand.cpp:52
-msgid "Could not invoke \"%1\". Please make sure it is installed correctly"
-msgstr "无法调用“%1”。请确保它已经正确安装。"
-
-#: lib/util/execcommand.cpp:53
-msgid "Error Invoking Command"
-msgstr "执行命令时发生错误"
-
-#: lib/util/execcommand.cpp:59
-msgid "Command running..."
-msgstr "命令正在运行..."
-
-#: lib/util/execcommand.cpp:60
-msgid "Please wait until the \"%1\" command finishes."
-msgstr "请等待直到“%1”命令结束运行。"
-
-#: lib/cppparser/parser.cpp:140
-msgid "<eof>"
-msgstr "<文件结尾>"
-
-#: lib/cppparser/parser.cpp:321 lib/cppparser/parser.cpp:2699
-#: lib/cppparser/parser.cpp:2923 lib/cppparser/parser.cpp:2929
-msgid "expression expected"
-msgstr "此处需要表达式"
-
-#: lib/cppparser/parser.cpp:583
-msgid "Declaration syntax error"
-msgstr "声明语法错误"
-
-#: lib/cppparser/parser.cpp:630 lib/cppparser/parser.cpp:2817
-#: lib/cppparser/parser.cpp:3290
-msgid "} expected"
-msgstr "此处需要 }"
-
-#: lib/cppparser/parser.cpp:671
-msgid "namespace expected"
-msgstr "此处需要 namespace"
-
-#: lib/cppparser/parser.cpp:675
-msgid "{ expected"
-msgstr "此处需要 {"
-
-#: lib/cppparser/parser.cpp:748 lib/cppparser/parser.cpp:3010
-msgid "Namespace name expected"
-msgstr "此处需要 namespace 名称"
-
-#: lib/cppparser/parser.cpp:852
-msgid "Need a type specifier to declare"
-msgstr "声明中需要指定类型"
-
-#: lib/cppparser/parser.cpp:934
-msgid "expected a declaration"
-msgstr "此处需要一个声明"
-
-#: lib/cppparser/parser.cpp:1208 lib/cppparser/parser.cpp:2190
-msgid "Constant expression expected"
-msgstr "此处需要常量表达式"
-
-#: lib/cppparser/parser.cpp:1277 lib/cppparser/parser.cpp:1374
-msgid "')' expected"
-msgstr "此处需要“)”"
-
-#: lib/cppparser/parser.cpp:1436 lib/cppparser/parser.cpp:1966
-#: lib/cppparser/parser.cpp:2398
-msgid "} missing"
-msgstr "缺少 }"
-
-#: lib/cppparser/parser.cpp:2088
-msgid "Member initializers expected"
-msgstr "此处需要成员初始值"
-
-#: lib/cppparser/parser.cpp:2249
-msgid "Base class specifier expected"
-msgstr "此处需要指定基类"
-
-#: lib/cppparser/parser.cpp:2272
-msgid "Initializer clause expected"
-msgstr "此处需要初始化语句"
-
-#: lib/cppparser/parser.cpp:2313
-msgid "Identifier expected"
-msgstr "此处需要标识符"
-
-#: lib/cppparser/parser.cpp:2343
-msgid "Type id expected"
-msgstr "此处需要类型标识"
-
-#: lib/cppparser/parser.cpp:2380
-msgid "Class name expected"
-msgstr "此处需要类名"
-
-#: lib/cppparser/parser.cpp:2662 lib/cppparser/parser.cpp:2842
-#: lib/cppparser/parser.cpp:2880 lib/cppparser/parser.cpp:3352
-msgid "condition expected"
-msgstr "此处需要条件"
-
-#: lib/cppparser/parser.cpp:2669 lib/cppparser/parser.cpp:2690
-#: lib/cppparser/parser.cpp:2849 lib/cppparser/parser.cpp:2859
-msgid "statement expected"
-msgstr "此处需要语句"
-
-#: lib/cppparser/parser.cpp:2725
-msgid "for initialization expected"
-msgstr "此处需要 for 循环初始化"
-
-#: lib/cppparser/parser.cpp:3341
-msgid "catch expected"
-msgstr "此处需要 catch"
-
-#: lib/cppparser/errors.cpp:23
-msgid "Internal Error"
-msgstr "内部错误"
-
-#: lib/cppparser/errors.cpp:24
-msgid "Syntax Error before '%1'"
-msgstr "在“%1”之前语法错误"
-
-#: lib/cppparser/errors.cpp:25
-msgid "Parse Error before '%1'"
-msgstr "在“%1”之前发生分析错误"
-
-#: lib/cppparser/driver.cpp:386
-#, fuzzy, c-format
-msgid "Could not find include file %1"
-msgstr "无法找到插件"
-
-#: lib/widgets/processwidget.cpp:230 parts/outputviews/makeitem.cpp:131
-msgid "*** Exited with status: %1 ***"
-msgstr "*** 退出状态：%1 ***"
-
-#: lib/widgets/processwidget.cpp:233
-msgid "*** Exited normally ***"
-msgstr "*** 正常退出 ***"
-
-#: lib/widgets/processwidget.cpp:239
-#, fuzzy
-msgid "*** Process aborted. Segmentation fault ***"
-msgstr "*** 进程中止 ***"
-
-#: lib/widgets/processwidget.cpp:243
-msgid "*** Process aborted ***"
-msgstr "*** 进程中止 ***"
-
-#: lib/widgets/resizablecombo.cpp:63
-msgid "Drag this to resize the combobox."
-msgstr "拖动此处改变组合框的大小。"
-
-#: lib/widgets/flagboxes.cpp:98
-msgid "Flags"
-msgstr "标志"
-
-#: lib/widgets/kdevhtmlpart.cpp:37
-msgid "<b>Reload</b><p>Reloads the current document."
-msgstr "<b>重新载入</b><p>重新载入当前文档。"
-
-#: lib/widgets/kdevhtmlpart.cpp:40
-msgid "<b>Stop</b><p>Stops the loading of current document."
-msgstr "<b>停止</b><p>停止载入当前文档。"
-
-#: lib/widgets/kdevhtmlpart.cpp:41
-msgid "Duplicate Tab"
-msgstr "复制标签"
-
-#: lib/widgets/kdevhtmlpart.cpp:43
-msgid "<b>Duplicate window</b><p>Opens current document in a new window."
-msgstr "<b>复制窗口</b><p>在新的窗口中打开当前文档。"
-
-#: lib/widgets/kdevhtmlpart.cpp:57
-msgid ""
-"<b>Back</b>"
-"<p>Moves backwards one step in the <b>documentation</b> browsing history."
-msgstr "<b>后退</b><p>在<b>文档</b>浏览历史中往回退一步。"
-
-#: lib/widgets/kdevhtmlpart.cpp:69
-msgid ""
-"<b>Forward</b>"
-"<p>Moves forward one step in the <b>documentation</b> browsing history."
-msgstr "<b>前进</b><p>在<b>文档</b>浏览历史中往前进一步。"
-
-#: lib/widgets/kdevhtmlpart.cpp:99 parts/documentation/docutils.cpp:81
-msgid "Open in New Tab"
-msgstr "在新标签中打开"
-
-#: lib/widgets/kdevhtmlpart.cpp:100
-msgid "<b>Open in new window</b><p>Opens current link in a new window."
-msgstr "<b>在新窗口中打开</b><p>在新窗口中打开当前链接。"
-
-#: lib/widgets/kdevtabwidget.cpp:38
-msgid "Close &Others"
-msgstr "关闭其它的(&O)"
-
-#: lib/widgets/ksavealldialog.cpp:53 lib/widgets/ksavealldialog.cpp:144
-msgid "Save Modified Files?"
-msgstr "保存已修改的文件吗？"
-
-#: lib/widgets/ksavealldialog.cpp:58 lib/widgets/ksavealldialog.cpp:151
-msgid "The following files have been modified. Save them?"
-msgstr "下列文件已被修改，要保存它们吗？"
-
-#: lib/widgets/ksavealldialog.cpp:65
-msgid "Save &Selected"
-msgstr "保存所选(&S)"
-
-#: lib/widgets/ksavealldialog.cpp:65
-msgid "Saves all selected files"
-msgstr "保存所选中的全部文件"
-
-#: lib/widgets/ksavealldialog.cpp:66 lib/widgets/ksavealldialog.cpp:157
-msgid "Save &None"
-msgstr "不保存(&N)"
-
-#: lib/widgets/ksavealldialog.cpp:68 lib/widgets/ksavealldialog.cpp:159
-msgid "Lose all modifications"
-msgstr "放弃所有修改"
-
-#: lib/widgets/ksavealldialog.cpp:69 lib/widgets/ksavealldialog.cpp:160
-msgid "Cancels the action"
-msgstr "取消操作"
-
-#: lib/widgets/ksavealldialog.cpp:156
-msgid "Save &All"
-msgstr "全部保存(&A)"
-
-#: lib/widgets/ksavealldialog.cpp:156
-msgid "Saves all modified files"
-msgstr "保存所有修改过的文件"
-
-#: lib/widgets/propeditor/pstringlistedit.cpp:85
-msgid "Ok"
-msgstr "确定"
-
-#: kdevdesigner/designer/propertyeditor.cpp:1505
-#: kdevdesigner/designer/propertyeditor.cpp:1523
-#: kdevdesigner/designer/propertyeditor.cpp:1602
-#: kdevdesigner/designer/propertyeditor.cpp:1613
-#: lib/widgets/propeditor/propertymachinefactory.cpp:131
-#: lib/widgets/propeditor/propertymachinefactory.cpp:138
-msgid "x"
-msgstr "x"
-
-#: kdevdesigner/designer/propertyeditor.cpp:1507
-#: kdevdesigner/designer/propertyeditor.cpp:1528
-#: kdevdesigner/designer/propertyeditor.cpp:1604
-#: kdevdesigner/designer/propertyeditor.cpp:1615
-#: lib/widgets/propeditor/propertymachinefactory.cpp:132
-#: lib/widgets/propeditor/propertymachinefactory.cpp:139
-msgid "y"
-msgstr "y"
-
-#: lib/widgets/propeditor/propertymachinefactory.cpp:152
-#, fuzzy
-msgid "Minimum Expanding"
-msgstr "展开目录"
-
-#: lib/widgets/propeditor/propertymachinefactory.cpp:153
-#, fuzzy
-msgid "Ignored"
-msgstr "忽略次数"
-
-#: kdevdesigner/designer/propertyeditor.cpp:2171
-#: kdevdesigner/designer/propertyeditor.cpp:2189
-#: kdevdesigner/designer/propertyeditor.cpp:2239
-#: lib/widgets/propeditor/propertymachinefactory.cpp:156
-#, fuzzy
-msgid "hSizeType"
-msgstr "文件类型"
-
-#: lib/widgets/propeditor/propertymachinefactory.cpp:156
-msgid "Horizontal Size Type"
-msgstr ""
-
-#: kdevdesigner/designer/propertyeditor.cpp:2174
-#: kdevdesigner/designer/propertyeditor.cpp:2191
-#: kdevdesigner/designer/propertyeditor.cpp:2241
-#: lib/widgets/propeditor/propertymachinefactory.cpp:157
-#, fuzzy
-msgid "vSizeType"
-msgstr "文件类型"
-
-#: lib/widgets/propeditor/propertymachinefactory.cpp:157
-#, fuzzy
-msgid "Vertical Size Type"
-msgstr "服务类型(&T)"
-
-#: lib/widgets/propeditor/propertymachinefactory.cpp:158
-msgid "hStretch"
-msgstr ""
-
-#: lib/widgets/propeditor/propertymachinefactory.cpp:158
-msgid "Horizontal Stretch"
-msgstr ""
-
-#: lib/widgets/propeditor/propertymachinefactory.cpp:159
-msgid "vStretch"
-msgstr ""
-
-#: lib/widgets/propeditor/propertymachinefactory.cpp:159
-msgid "Vertical Stretch"
-msgstr ""
-
-#: kdevdesigner/designer/propertyeditor.cpp:2380
-#: lib/widgets/propeditor/propertymachinefactory.cpp:165
-msgid "Arrow"
-msgstr ""
-
-#: lib/widgets/propeditor/propertymachinefactory.cpp:166
-msgid "Up Arrow"
-msgstr ""
-
-#: kdevdesigner/designer/propertyeditor.cpp:2382
-#: lib/widgets/propeditor/propertymachinefactory.cpp:167
-#, fuzzy
-msgid "Cross"
-msgstr "类"
-
-#: kdevdesigner/designer/propertyeditor.cpp:2383
-#: lib/widgets/propeditor/propertymachinefactory.cpp:168
-#, fuzzy
-msgid "Waiting"
-msgstr "正在创建"
-
-#: kdevdesigner/designer/propertyeditor.cpp:2384
-#: lib/widgets/propeditor/propertymachinefactory.cpp:169
-#, fuzzy
-msgid "iBeam"
-msgstr "文件名"
-
-#: kdevdesigner/designer/propertyeditor.cpp:2385
-#: lib/widgets/propeditor/propertymachinefactory.cpp:170
-#, fuzzy
-msgid "Size Vertical"
-msgstr "垂直平铺(&E)"
-
-#: kdevdesigner/designer/propertyeditor.cpp:2386
-#: lib/widgets/propeditor/propertymachinefactory.cpp:171
-#, fuzzy
-msgid "Size Horizontal"
-msgstr "水平展开(&H)"
-
-#: kdevdesigner/designer/propertyeditor.cpp:2387
-#: lib/widgets/propeditor/propertymachinefactory.cpp:172
-msgid "Size Slash"
-msgstr ""
-
-#: kdevdesigner/designer/propertyeditor.cpp:2388
-#: lib/widgets/propeditor/propertymachinefactory.cpp:173
-#, fuzzy
-msgid "Size Backslash"
-msgstr "结尾的反斜杠转义符错"
-
-#: kdevdesigner/designer/propertyeditor.cpp:2389
-#: lib/widgets/propeditor/propertymachinefactory.cpp:174
-#, fuzzy
-msgid "Size All"
-msgstr "全部保存(&A)"
-
-#: kdevdesigner/designer/propertyeditor.cpp:2392
-#: lib/widgets/propeditor/propertymachinefactory.cpp:175
-#, fuzzy
-msgid "Blank"
-msgstr "清理"
-
-#: kdevdesigner/designer/propertyeditor.cpp:2393
-#: lib/widgets/propeditor/propertymachinefactory.cpp:176
-msgid "Split Vertical"
-msgstr "垂直拆分"
-
-#: kdevdesigner/designer/propertyeditor.cpp:2394
-#: lib/widgets/propeditor/propertymachinefactory.cpp:177
-msgid "Split Horizontal"
-msgstr "水平拆分"
-
-#: kdevdesigner/designer/propertyeditor.cpp:2395
-#: lib/widgets/propeditor/propertymachinefactory.cpp:178
-#, fuzzy
-msgid "Pointing Hand"
-msgstr "待添加"
-
-#: kdevdesigner/designer/propertyeditor.cpp:2396
-#: lib/widgets/propeditor/propertymachinefactory.cpp:179
-msgid "Forbidden"
-msgstr ""
-
-#: lib/widgets/propeditor/propertymachinefactory.cpp:180
-#, fuzzy
-msgid "What's this"
-msgstr "这是什么？"
-
-#: lib/widgets/propeditor/pcheckbox.cpp:69
-msgid "true"
-msgstr "true"
-
-#: lib/widgets/propeditor/pcheckbox.cpp:69
-msgid "false"
-msgstr "false"
-
-#: lib/widgets/propeditor/pfontbutton.cpp:62
-msgid " Bold"
-msgstr "粗体"
-
-#: lib/widgets/propeditor/pfontbutton.cpp:63
-msgid " Italic"
-msgstr "斜体"
-
-#: src/mainwindowshare.cpp:112
-msgid "&Stop"
-msgstr "停止(&S)"
-
-#: src/mainwindowshare.cpp:116
-msgid ""
-"<b>Stop</b>"
-"<p>Stops all running processes (like building process, grep command, etc.). "
-"When placed onto a toolbar provides a popup menu to choose a process to stop."
-msgstr "<b>停止</b><p>停止所有运行的进程(比如编译进程、grep 命令等)。如果放在工具栏上，它提供一个弹出菜单选择要停止的进程。"
-
-#: src/mainwindowshare.cpp:130
-msgid "Lets you switch the menubar on/off."
-msgstr "让您显示和隐藏菜单栏。"
-
-#: src/mainwindowshare.cpp:136
-msgid "Lets you configure shortcut keys."
-msgstr "让您配置快捷键。"
-
-#: src/mainwindowshare.cpp:142
-msgid "Lets you configure toolbars."
-msgstr "让您配置工具栏。"
-
-#: src/mainwindowshare.cpp:148
-msgid "Lets you configure system notifications."
-msgstr "让您配置系统通知。"
-
-#: src/mainwindowshare.cpp:152 src/mainwindowshare.cpp:153
-#: src/mainwindowshare.cpp:298
-msgid "Configure KDevelop"
-msgstr "配置 KDevelop"
-
-#: src/mainwindowshare.cpp:153
-msgid "Lets you customize KDevelop."
-msgstr "让您自定义 KDevelop。"
-
-#: src/mainwindowshare.cpp:157
-msgid "Show statusbar"
-msgstr "显示状态栏"
-
-#: src/mainwindowshare.cpp:158
-msgid "<b>Show statusbar</b><p>Hides or shows the statusbar."
-msgstr "<b>显示状态栏</b><p>隐藏或显示状态栏。"
-
-#: src/mainwindowshare.cpp:160
-msgid "&Next Window"
-msgstr "下一个窗口(&N)"
-
-#: src/mainwindowshare.cpp:161
-msgid "Next window"
-msgstr "下一个窗口"
-
-#: src/mainwindowshare.cpp:162
-msgid "<b>Next window</b><p>Switches to the next window."
-msgstr "<b>下一个窗口</b><p>切换到下一个窗口。"
-
-#: src/mainwindowshare.cpp:164
-msgid "&Previous Window"
-msgstr "上一个窗口(&P)"
-
-#: src/mainwindowshare.cpp:165
-msgid "Previous window"
-msgstr "上一个窗口"
-
-#: src/mainwindowshare.cpp:166
-msgid "<b>Previous window</b><p>Switches to the previous window."
-msgstr "<b>上一个窗口</b><p>切换到上一个窗口。"
-
-#: src/mainwindowshare.cpp:168
-msgid "&Last Accessed Window"
-msgstr "上次访问的窗口(&L)"
-
-#: src/mainwindowshare.cpp:169
-msgid "Last accessed window"
-msgstr "上次访问的窗口"
-
-#: src/mainwindowshare.cpp:170
-msgid ""
-"<b>Last accessed window</b>"
-"<p>Switches to the last viewed window (Hold the Alt key pressed and walk on by "
-"repeating the Up key)."
-msgstr "<b>上次访问的窗口</b><p>切换到上次查看的窗口(按住 Alt 键，用上箭头轮流切换)。"
-
-#: src/mainwindowshare.cpp:172
-msgid "&First Accessed Window"
-msgstr "首次访问的窗口(&F)"
-
-#: src/mainwindowshare.cpp:173
-msgid "First accessed window"
-msgstr "首次访问的窗口"
-
-#: src/mainwindowshare.cpp:174
-msgid ""
-"<b>First accessed window</b>"
-"<p>Switches to the first accessed window (Hold the Alt key pressed and walk on "
-"by repeating the Down key)."
-msgstr "<b>首次访问的窗口</b><p>切换到首次访问的窗口(按住 Alt 键，用下箭头轮流切换)。"
-
-#: src/mainwindowshare.cpp:176
-#, fuzzy
-msgid "Configure Plugins..."
-msgstr "核心插件"
-
-#: src/mainwindowshare.cpp:178
-msgid "Configure &Editor..."
-msgstr "配置编辑器(&E)..."
-
-#: src/mainwindowshare.cpp:179
-msgid "Configure editor settings"
-msgstr "配置编辑器设置"
-
-#: src/mainwindowshare.cpp:180
-msgid "<b>Configure editor</b><p>Opens editor configuration dialog."
-msgstr "<b>配置编辑器</b><p>打开编辑器配置对话框。"
-
-#: src/mainwindowshare.cpp:442
-msgid "<b>Show menubar</b><p>Lets you switch the menubar on/off."
-msgstr "<b>显示菜单栏</b><p>让您显示和隐藏菜单栏。"
-
-#: src/main.cpp:25 src/main_assistant.cpp:25
-msgid "Profile to load"
-msgstr "要打开的配置文件"
-
-#: src/main_assistant.cpp:32
-#, fuzzy
-msgid ""
-"The KDevelop Integrated Development Environment:\n"
-"assistant and documentation viewer"
-msgstr "KDevelop 集成开发环境。"
-
-#: src/main_assistant.cpp:33
-msgid "KDevelop Assistant"
-msgstr "KDevelop 助手"
-
-#: src/main.cpp:35 src/main_assistant.cpp:35
-#, fuzzy
-msgid "(c) 1999-2007, The KDevelop developers"
-msgstr "(C) 1999-2005，KDevelop 开发者"
-
-#: src/main.cpp:36 src/main_assistant.cpp:36
-msgid ""
-"Release coordinator, Overall improvements, Pascal support, C++ support, New "
-"File and Documentation parts"
-msgstr "版本发布管理、整体改进、Pascal 支持、C++ 支持、新建文件和文档部件"
-
-#: src/main.cpp:37 src/main_assistant.cpp:37
-msgid "Release coordinator, API documentation, Doxygen and autoproject patches"
-msgstr "版本发布管理、API 文档、Doxygen 和 autoproject 补丁"
-
-#: src/main.cpp:39 src/main_assistant.cpp:38
-msgid "Initial idea, basic architecture, much initial source code"
-msgstr "初始构思，基本结构，很多初始源代码"
-
-#: src/main.cpp:40 src/main_assistant.cpp:39
-msgid "KTabBar, bugfixes"
-msgstr "KTabBar、错误修正"
-
-#: src/main.cpp:41 src/main_assistant.cpp:40
-msgid "Java & Objective C support"
-msgstr "Java 和 Objective C 支持"
-
-#: src/main.cpp:42 src/main.cpp:43 src/main_assistant.cpp:41
-msgid "Debugger frontend"
-msgstr "调试器前端"
-
-#: src/main.cpp:44 src/main_assistant.cpp:42
-msgid "PHP support, context menu stuff"
-msgstr "PHP 的支持，环境菜单等"
-
-#: src/main.cpp:45 src/main_assistant.cpp:43
-msgid "TDE application templates"
-msgstr "TDE 应用程序模板"
-
-#: src/main.cpp:46 src/main_assistant.cpp:44
-msgid "Dist part, bash support, application templates"
-msgstr "Dist 部分、bash 支持、应用程序模板"
-
-#: src/main.cpp:47 src/main_assistant.cpp:45
-msgid "Several components, htdig indexing"
-msgstr "一些组件，htdig 索引"
-
-#: src/main.cpp:48 src/main_assistant.cpp:46
-#, fuzzy
-msgid "Help with Automake manager and persistent class store"
-msgstr "协助 Automake 管理器和持久类存储"
-
-#: src/main.cpp:50 src/main_assistant.cpp:47
-msgid "Ported to Qt 3, patches, valgrind, diff and perforce support"
-msgstr "移植到 Qt 3、修补、valgrind、diff 和 perforce 支持"
-
-#: src/main.cpp:51 src/main_assistant.cpp:48
-msgid ""
-"QEditor component, code completion, Abbrev component, C++ support, Java support"
-msgstr "QEditor 组件、代码补全、Abbrev 组件、C++ 支持、Java 支持"
-
-#: src/main.cpp:52 src/main_assistant.cpp:49
-msgid "Help with KParts infrastructure"
-msgstr "协助 KParts 基础结构"
-
-#: src/main.cpp:53 src/main_assistant.cpp:50
-msgid "Ada support"
-msgstr "Ada 支持"
-
-#: src/main.cpp:55 src/main_assistant.cpp:51
-msgid "QMake projectmanager"
-msgstr "QMake 工程管理器"
-
-#: src/main.cpp:56 src/main_assistant.cpp:52
-msgid "MDI modes, QEditor, bugfixes"
-msgstr "MDI 模式、QEditor、问题修补"
-
-#: src/main.cpp:57 src/main_assistant.cpp:53
-msgid "PartExplorer, redesign of CvsPart, patches, bugs(fixes)"
-msgstr "PartExplorer、重新设计 CvsPart、补丁、问题修补"
-
-#: src/main.cpp:58 src/main_assistant.cpp:54
-msgid ""
-"Replace, Bookmarks, FileList and CTags2 plugins. Overall improvements and "
-"patches"
-msgstr ""
-
-#: src/main.cpp:59 src/main_assistant.cpp:55
-msgid "Filecreate part and other bits and patches"
-msgstr "Filecreate 组件和其它，以及补丁"
-
-#: src/main.cpp:60 src/main_assistant.cpp:56
-msgid "ClearCase support"
-msgstr "ClearCase 支持"
-
-#: src/main.cpp:61 src/main_assistant.cpp:57
-msgid "Ruby support"
-msgstr "Ruby 支持"
-
-#: src/main.cpp:63 src/main_assistant.cpp:59
-msgid "Kate editor component"
-msgstr "Kate 编辑器组件"
-
-#: src/main.cpp:64 src/main_assistant.cpp:60
-msgid "HTML documentation component"
-msgstr "HTML 文档组件"
-
-#: src/main.cpp:65 src/main_assistant.cpp:61
-msgid "Fortran documentation"
-msgstr "Fortran 文档"
-
-#: src/main.cpp:66 src/main_assistant.cpp:62
-msgid "Python documentation utility"
-msgstr "Python 文档工具"
-
-#: src/main.cpp:67 src/main_assistant.cpp:63
-msgid "Doxygen wizard"
-msgstr "Doxygen 向导"
-
-#: src/main.cpp:68 src/main.cpp:69 src/main_assistant.cpp:64
-#: src/main_assistant.cpp:65
-msgid "Fileselector component"
-msgstr "文件选择器组件"
-
-#: src/main.cpp:70 src/main_assistant.cpp:66
-msgid "Designer code"
-msgstr "Designer 代码"
-
-#: src/main.cpp:71 src/main_assistant.cpp:67
-#, fuzzy
-msgid "C++ code completion, persistent class store"
-msgstr "C++ 代码补全，持久类存储"
-
-#: src/main.cpp:72 src/main.cpp:73 src/main.cpp:76 src/main_assistant.cpp:68
-#: src/main_assistant.cpp:69 src/main_assistant.cpp:72
-msgid "Patches"
-msgstr "修补"
-
-#: src/main.cpp:74 src/main_assistant.cpp:70
-msgid "Help with Perl support"
-msgstr "协助 Perl 支持"
-
-#: src/main.cpp:75 src/main_assistant.cpp:71
-msgid "Documentation index view"
-msgstr "文档索引视图"
-
-#: src/main.cpp:77 src/main_assistant.cpp:73
-msgid ""
-"Documentation Finder,  qmake projectmanager patches, usability improvements, "
-"bugfixes ... "
-msgstr ""
-
-#: src/main.cpp:78 src/main_assistant.cpp:74
-msgid "QMake project manager patches"
-msgstr "QMake 工程管理器补丁"
-
-#: src/main.cpp:79 src/main_assistant.cpp:75
-msgid "Cleanup and bugfixes for qEditor, AutoMake and much other stuff"
-msgstr ""
-
-#: src/main.cpp:102 src/main_assistant.cpp:100
-msgid "Loading Settings"
-msgstr "正在载入设置"
-
-#: src/main.cpp:113 src/main_assistant.cpp:105
-msgid "Starting GUI"
-msgstr "正在启动界面"
-
-#: src/partcontroller.cpp:130
-msgid "Open file"
-msgstr "打开文件"
-
-#: src/partcontroller.cpp:131
-msgid ""
-"<b>Open file</b>"
-"<p>Opens an existing file without adding it to the project.</p>"
-msgstr "<b>打开文件</b><p>添加一个现有的文件到当前选中的工程中。</p>"
-
-#: src/partcontroller.cpp:134
-msgid "Opens recently opened file."
-msgstr "打开最近使用的文件"
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:98 src/partcontroller.cpp:137
-msgid "Save Al&l"
-msgstr "全部保存(&L)"
-
-#: src/partcontroller.cpp:138
-msgid "Save all modified files"
-msgstr "保存所有修改的文件"
-
-#: src/partcontroller.cpp:139
-msgid "<b>Save all</b><p>Saves all modified files."
-msgstr "<b>全部保存</b><p>保存所有修改的文件。"
-
-#: src/partcontroller.cpp:142
-msgid "Rever&t All"
-msgstr "全部返转(&T)"
-
-#: src/partcontroller.cpp:143
-msgid "Revert all changes"
-msgstr "返转所有修改"
-
-#: src/partcontroller.cpp:144
-#, fuzzy
-msgid ""
-"<b>Revert all</b>"
-"<p>Reverts all changes in opened files. Prompts to save changes so the "
-"reversion can be canceled for each modified file."
-msgstr "<b>全部返转</b><p>返转打开的文件中的所有改动。将对每个改动的文件单独询问是否要保存改动，从而能不进行返转。"
-
-#: src/partcontroller.cpp:148
-msgid "Close current file"
-msgstr "关闭当前文件"
-
-#: src/partcontroller.cpp:149
-msgid "Closes current file."
-msgstr "关闭当前的文件。"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:919 src/partcontroller.cpp:152
-msgid "Close All"
-msgstr "全部关闭"
-
-#: src/partcontroller.cpp:153
-msgid "Close all files"
-msgstr "关闭所有文件"
-
-#: src/partcontroller.cpp:154
-msgid "<b>Close all</b><p>Close all opened files."
-msgstr "<b>全部关闭</b><p>关闭所有文件。"
-
-#: src/partcontroller.cpp:157 src/simplemainwindow.cpp:611
-msgid "Close All Others"
-msgstr "关闭其它文件"
-
-#: src/partcontroller.cpp:158
-msgid "Close other files"
-msgstr "关闭其它文件"
-
-#: src/partcontroller.cpp:159
-msgid "<b>Close all others</b><p>Close all opened files except current."
-msgstr "<b>关闭其它文件</b><p>关闭当前文件外的所有其它文件。"
-
-#: src/partcontroller.cpp:167
-#, fuzzy
-msgid "<b>Back</b><p>Moves backwards one step in the navigation history."
-msgstr "<b>后退</b><p>在浏览历史中向后退一步。"
-
-#: src/partcontroller.cpp:174
-#, fuzzy
-msgid "<b>Forward</b><p>Moves forward one step in the navigation history."
-msgstr "<b>前进</b><p>在浏览历史中向前进一步。"
-
-#: src/partcontroller.cpp:178 src/partcontroller.cpp:180
-msgid "Goto Last Edit Position"
-msgstr ""
-
-#: src/partcontroller.cpp:181
-msgid ""
-"<b>Goto Last Edit Position</b>"
-"<p>Open the last edited file and position cursor at the point of edit"
-msgstr ""
-
-#: src/partcontroller.cpp:1008
-msgid ""
-"The file \"%1\" is modified in memory. Are you sure you want to reload it? "
-"(Local changes will be lost.)"
-msgstr ""
-
-#: src/partcontroller.cpp:1009
-msgid "File is Modified"
-msgstr "文件已修改"
-
-#: buildtools/qmake/trollprojectwidget.cpp:2462 src/partcontroller.cpp:1009
-#: src/partcontroller.cpp:1502
-msgid "Do Not Reload"
-msgstr "不重新装入"
-
-#: src/partcontroller.cpp:1123
-msgid ""
-"The file \"%1\" is modified on disk.\n"
-"\n"
-"Are you sure you want to overwrite it? (External changes will be lost.)"
-msgstr ""
-
-#: src/partcontroller.cpp:1124
-msgid "File Externally Modified"
-msgstr "文件在外部修改"
-
-#: parts/filelist/projectviewpart.cpp:494 src/partcontroller.cpp:1124
-msgid "Overwrite"
-msgstr "覆盖"
-
-#: src/partcontroller.cpp:1124
-msgid "Do Not Overwrite"
-msgstr "不覆盖"
-
-#: src/partcontroller.cpp:1483
-msgid ""
-"Conflict: The file \"%1\" has changed on disk while being modified in memory.\n"
-"\n"
-"You should investigate before saving to make sure you are not losing data."
-msgstr ""
-
-#: src/partcontroller.cpp:1485
-msgid "Conflict"
-msgstr "冲突"
-
-#: src/partcontroller.cpp:1492
-msgid ""
-"Warning: The file \"%1\" has been deleted on disk.\n"
-"\n"
-"If this was not your intention, make sure to save this file now."
-msgstr ""
-
-#: src/partcontroller.cpp:1494
-msgid "File Deleted"
-msgstr "文件已删除"
+#: languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp:44
+msgid "Free Pascal Compiler Options"
+msgstr "Pascal 编译器选项"
 
-#: src/partcontroller.cpp:1501
-#, fuzzy
-msgid ""
-"The file \"%1\" has changed on disk.\n"
-"\n"
-"Do you want to reload it?"
-msgstr ""
-"错误列表已经改变。\n"
-"您要保存您的修改吗？"
+#: languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp:63
+msgid "Assembler"
+msgstr "汇编器"
 
-#: src/partcontroller.cpp:1502
-msgid "File Changed"
-msgstr "文件已更改"
+#: languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp:69
+msgid "Feedback"
+msgstr "反馈"
 
-#: src/partcontroller.cpp:1801 src/partcontroller.cpp:1822
-#, fuzzy
-msgid "unnamed"
-msgstr "用户名"
+#: languages/java/javasupportpart.cpp:164
+msgid "<b>New Class</b>Generates a new class.<p>"
+msgstr "<b>新建类</b><p>创建一个新类。"
 
-#: src/main.cpp:26
-msgid "Files to load"
-msgstr "要载入的文件"
+#: languages/java/javasupportpart.cpp:713
+msgid "Java Support"
+msgstr "Java 支持"
 
-#: src/main.cpp:32
-msgid "The KDevelop Integrated Development Environment"
-msgstr "KDevelop 集成开发环境"
+#: languages/java/javasupportpart.cpp:713
+msgid "Keep Them"
+msgstr "保留"
 
-#: src/main.cpp:33
-msgid "KDevelop"
-msgstr "KDevelop"
+#: languages/java/problemreporter.cpp:238
+msgid "Java Parsing"
+msgstr "Java 分析"
 
-#: src/main.cpp:38
-msgid "Advanced C++ code completion, C++ support, overall improvements"
-msgstr ""
+#: languages/fortran/ftnchekconfigwidget.cpp:93
+msgid "Warn about inconsistent use of arguments that use arrays"
+msgstr "对使用数组的不一致的参数给出警告"
 
-#: src/main.cpp:49
+#: languages/fortran/ftnchekconfigwidget.cpp:94
 msgid ""
-"Automake manager patches, Astyle plugin update, plugin patches and improvements"
-msgstr ""
-
-#: src/main.cpp:54
-#, fuzzy
-msgid "QMake projectmanager, Qt4 Support"
-msgstr "QMake 工程管理器"
-
-#: src/main.cpp:80
-msgid "SnippetPart, debugger and usability patches"
-msgstr ""
-
-#: src/main.cpp:81
-msgid "Artwork for the Ruby language"
-msgstr ""
+"Warn about dummy arguments of a data type different from the actual arguments"
+msgstr "对形参和实参的数据类型不同给出警告"
 
-#: src/simplemainwindow.cpp:98
-#, fuzzy
+#: languages/fortran/ftnchekconfigwidget.cpp:96
 msgid ""
-"Unable to find plugins, KDevelop will not work properly.\n"
-"Please make sure that KDevelop is installed in your TDE directory; otherwise, "
-"you have to add KDevelop's installation path to the environment variable "
-"TDEDIRS and run tdebuildsycoca. Restart KDevelop afterwards.\n"
-"Example for BASH users:\n"
-"export TDEDIRS=/path/to/tdevelop:$TDEDIRS && tdebuildsycoca"
-msgstr ""
-"无法找到插件，KDevelop 将不能正常工作！\n"
-"请确保 KDevelop 安装在您的 TDE 目录下，不然您需要把 KDevelop 的安装路径添加到环境变量 TDEDIRS 里，并运行 "
-"tdebuildsycoca，然后重新运行 KDevelop。\n"
-"例如 Bash 用户需要运行：\n"
-"export TDEDIRS=/path/to/tdevelop:$TDEDIRS && tdebuildsycoca"
-
-#: src/simplemainwindow.cpp:105
-msgid "Could Not Find Plugins"
-msgstr "无法找到插件"
-
-#: src/simplemainwindow.cpp:411
-msgid "Raise &Editor"
-msgstr "升起编辑器(&E)"
-
-#: src/simplemainwindow.cpp:413
-msgid "Raise editor"
-msgstr "升起编辑器"
-
-#: src/simplemainwindow.cpp:414
-msgid "<b>Raise editor</b><p>Focuses the editor."
-msgstr "<b>升起编辑器</b><p>将焦点移至编辑器。"
-
-#: src/simplemainwindow.cpp:416
-#, fuzzy
-msgid "Lower All Docks"
-msgstr "工具停靠区(&D)"
-
-#: src/simplemainwindow.cpp:419
-msgid "Switch to next TabWidget"
-msgstr ""
-
-#: src/simplemainwindow.cpp:422 src/simplemainwindow.cpp:430
-msgid "Split &Horizontal"
-msgstr "水平拆分(&H)"
-
-#: src/simplemainwindow.cpp:426 src/simplemainwindow.cpp:434
-msgid "Split &Vertical"
-msgstr "垂直拆分(&V)"
-
-#: src/simplemainwindow.cpp:438
-#, fuzzy
-msgid "Split &Horizontal and Open"
-msgstr "水平拆分(&H)"
-
-#: src/simplemainwindow.cpp:442
-#, fuzzy
-msgid "Split &Vertical and Open"
-msgstr "垂直拆分(&V)"
-
-#: src/simplemainwindow.cpp:446
-msgid "Switch Left Dock"
-msgstr "切换左边停靠区"
-
-#: src/simplemainwindow.cpp:449
-msgid "Switch Right Dock"
-msgstr "切换右边停靠区"
-
-#: src/simplemainwindow.cpp:452
-msgid "Switch Bottom Dock"
-msgstr "切换底部停靠区"
-
-#: src/simplemainwindow.cpp:621
-msgid "Duplicate"
-msgstr "复制"
-
-#: src/editorproxy.cpp:48
-msgid "Show Context Menu"
-msgstr "显示环境菜单"
+"Warn if the invocation assumes a different data type for the return type, "
+"different from the actual return type"
+msgstr "如果调用子程序时期待的返回数据类型和函数的实际返回类型不同则给出警告"
 
-#: src/projectsession.cpp:81
-msgid ""
-"The file %1 does not contain valid XML.\n"
-"The loading of the session failed."
-msgstr ""
-"文件 %1 中不包含有效的XML。\n"
-"会话载入失败。"
+#: languages/fortran/ftnchekconfigwidget.cpp:98
+msgid "Warn about invoking a subprogram with an incorrect number of arguments"
+msgstr "如果调用子程序的参数个数不正确则给出警告"
 
-#: src/projectsession.cpp:94
+#: languages/fortran/ftnchekconfigwidget.cpp:104
 msgid ""
-"The file %1 does not contain a valid KDevelop project session "
-"('KDevPrjSession').\n"
-msgstr ""
-"文件 %1中不包含有效的 KDevelop 工程会话(“KDevPrjSession”)。\n"
-
-#: src/projectsession.cpp:95
-msgid "The document type seems to be: '%1'."
-msgstr "这个文档类型似乎是：“%1”。"
-
-#: src/generalinfowidget.cpp:58
-#, fuzzy
-msgid "Use global editor settings"
-msgstr "配置编辑器设置"
-
-#: src/generalinfowidget.cpp:95
-#, fuzzy
-msgid "Could not open %1 for reading."
-msgstr "无法打开文件进行写入。"
+"Corresponding arrays in each declaration of a block must agree in size and "
+"number of dimensions"
+msgstr "每个声明块相对应的数组的尺寸和维数必须是一致的"
 
-#: src/generalinfowidget.cpp:155
-#, fuzzy
-msgid "Could not open %1 for writing."
-msgstr "无法打开文件进行写入。"
+#: languages/fortran/ftnchekconfigwidget.cpp:106
+msgid "The comparison of two blocks is done variable-by-variable"
+msgstr "逐个变量比较两个声明块"
 
-#: src/generalinfowidget.cpp:186
+#: languages/fortran/ftnchekconfigwidget.cpp:107
 msgid ""
-"Could not find configure.in.in, configure.in or configure.ac to update the "
-"project version."
-msgstr ""
-
-#: src/generalinfowidget.cpp:215
-msgid "Please enter a path."
-msgstr "请输入一个路径。"
-
-#: src/generalinfowidget.cpp:220
-msgid "'%1' is not an absolute path."
-msgstr "“%1”不是一个绝对路径。"
-
-#: src/generalinfowidget.cpp:226
-msgid "'%1' is not a relative path."
-msgstr "“%1”不是一个相对路径。"
-
-#: src/generalinfowidget.cpp:234
-msgid "'%1' does not exist."
-msgstr "“%1”不存在。"
-
-#: src/generalinfowidget.cpp:238
-msgid "'%1' is not a directory."
-msgstr "“%1”不是一个目录。"
-
-#: src/generalinfowidget.cpp:264 src/generalinfowidget.cpp:267
-msgid "'%1' is a valid project directory."
-msgstr "“%1”不是一个有效的工程目录。"
-
-#: src/plugincontroller.cpp:150
-#, c-format
-msgid "Loading: %1"
-msgstr "装入：%1"
+"Warn if different declarations of the same block are not equal in total length"
+msgstr "如果同一个块的不同声明的总长度不同则给出警告"
 
-#: src/plugincontroller.cpp:219
+#: languages/fortran/ftnchekconfigwidget.cpp:108
 msgid ""
-"<b>Could not load plugin</b>"
-"<br>Plugin %1 could not be loaded"
-"<br>Library loader error: %2"
-msgstr ""
+"In each declaration of a block, corresponding memory locations must agree in "
+"data type"
+msgstr "在块的每个声明里，相应的内存位置必须和数据类型一致"
 
-#: src/plugincontroller.cpp:223
-#, fuzzy
-msgid "Could not load plugin"
-msgstr "无法找到插件"
+#: languages/fortran/ftnchekconfigwidget.cpp:115
+msgid "Use of the result of integer division as an exponent"
+msgstr "把整数除法的结果用作指数"
 
-#: src/statusbar.cpp:101
-msgid " Line: %1 Col: %2 "
-msgstr " 行：%1 列：%2 "
+#: languages/fortran/ftnchekconfigwidget.cpp:116
+msgid "Conversion of an expression involving an integer division to real"
+msgstr "将涉及到整数除法的表达式转换为实数运算"
 
-#: src/languageselectwidget.cpp:65
-msgid "Additional Language Support"
-msgstr "额外语言支持"
+#: languages/fortran/ftnchekconfigwidget.cpp:117
+msgid "Division in an integer constant expression that yields a result of zero"
+msgstr "结果为零的整数常量表达式里的除法"
 
-#: src/languageselectwidget.cpp:115
+#: languages/fortran/ftnchekconfigwidget.cpp:123
 msgid ""
-"Primary language is '%1'. Please select additional languages the project might "
-"contain."
-msgstr "主要语言是“%1”，请选择工程可能含有的其它语言。"
-
-#: src/projectmanager.cpp:96
-msgid "&Open Project..."
-msgstr "打开工程(&O)..."
-
-#: src/projectmanager.cpp:99
-msgid "Open project"
-msgstr "打开工程"
-
-#: src/projectmanager.cpp:100
-msgid "<b>Open project</b><p>Opens a KDevelop3 or KDevelop2 project."
-msgstr "<b>打开工程</b><p>打开一个 KDevelop3 或者 KDevelop2 工程。"
-
-#: src/projectmanager.cpp:103
-msgid "Open &Recent Project"
-msgstr "打开最近的工程(&R)"
-
-#: src/projectmanager.cpp:106
-msgid "Open recent project"
-msgstr "打开一个最近的工程"
-
-#: src/projectmanager.cpp:107
-msgid "<b>Open recent project</b><p>Opens recently opened project."
-msgstr "<b>打开最近的工程</b><p>打开最近使用过的工程。"
-
-#: src/projectmanager.cpp:111
-msgid "C&lose Project"
-msgstr "关闭工程(&L)"
-
-#: src/projectmanager.cpp:115
-msgid "Close project"
-msgstr "关闭工程"
-
-#: src/projectmanager.cpp:116
-msgid "<b>Close project</b><p>Closes the current project."
-msgstr "<b>关闭工程</b><p>关闭当前工程。"
-
-#: src/projectmanager.cpp:118
-msgid "Project &Options"
-msgstr "工程选项(&O)"
-
-#: src/projectmanager.cpp:121
-msgid "Project options"
-msgstr "工程选项"
-
-#: src/projectmanager.cpp:122
-msgid "<b>Project options</b><p>Lets you customize project options."
-msgstr "<b>工程选项</b><p>您可以自定义工程的选项。"
+"A scalar dummy argument is actually the same as another and is (or may be) "
+"modified"
+msgstr "一个标量形参实际上和另一个是一样的，而且可能已被修改"
 
-#: src/projectmanager.cpp:133
+#: languages/fortran/ftnchekconfigwidget.cpp:125
 msgid ""
-"*.tdevelop|KDevelop 3 Project Files\n"
-"*.kdevprj|KDevelop 2 Project Files"
-msgstr ""
-"*.tdevelop|KDevelop 3 工程文件\n"
-"*.kdevprj|KDevelop 2 工程文件"
-
-#: kdevdesigner/designer/mainwindow.cpp:3085 src/projectmanager.cpp:135
-msgid "Open Project"
-msgstr "打开工程"
-
-#: src/projectmanager.cpp:224
-#, fuzzy
-msgid "Are you sure you want to reopen the current project?"
-msgstr "打开一个最近的工程"
-
-#: src/projectmanager.cpp:224
-msgid "Reopen"
-msgstr "重新打开"
-
-#: src/projectmanager.cpp:224
-msgid "Do Not Reopen"
-msgstr "不重新打开"
-
-#: src/projectmanager.cpp:278
-msgid "Changing plugin profile..."
-msgstr "正在更该插件配置文件..."
-
-#: src/projectmanager.cpp:281
-msgid "Loading project plugins..."
-msgstr "正在工程插件..."
-
-#: src/projectmanager.cpp:290
-msgid "error during restoring of the KDevelop session !"
-msgstr "恢复 KDevelop 会话时发生错误！"
-
-#: src/projectmanager.cpp:306
-msgid "Project loaded."
-msgstr "工程已装入。"
-
-#: src/projectmanager.cpp:358 src/projectmanager.cpp:366
-#, c-format
-msgid "Could not read project file: %1"
-msgstr "无法读取工程文件：“%1”"
+"A dummy argument which is an array or array element is the same array as "
+"another and is modified"
+msgstr "一个数组或者数组元素形参和另一个是一样的，而且已被修改"
 
-#: parts/appwizard/appwizarddlg.cpp:1016 parts/appwizard/importdlg.cpp:152
-#: src/projectmanager.cpp:375
+#: languages/fortran/ftnchekconfigwidget.cpp:127
 msgid ""
-"This is not a valid project file.\n"
-"XML error in line %1, column %2:\n"
-"%3"
-msgstr ""
-"这不是一个有效的工程文件。\n"
-"%1 行 %2 列 XML 格式错误：\n"
-"%3"
-
-#: src/projectmanager.cpp:385
-msgid "This is not a valid project file."
-msgstr "这不是一个有效的工程文件。"
-
-#: src/projectmanager.cpp:406 src/projectmanager.cpp:417
-msgid "Could not write the project file."
-msgstr "无法写入工程文件。"
-
-#: src/projectmanager.cpp:488
-msgid "No project management plugin %1 found."
-msgstr "未找到工程管理插件 %1。"
-
-#: src/projectmanager.cpp:498
-#, c-format
-msgid "Could not create project management plugin %1."
-msgstr "无法创建工程管理插件 %1。"
-
-#: src/projectmanager.cpp:544
-msgid "No language plugin for %1 found."
-msgstr "未找到 %1 的语言插件。"
-
-#: src/projectmanager.cpp:558
-#, c-format
-msgid "Could not create language plugin for %1."
-msgstr "无法创建 %1 的语言插件。"
-
-#: src/projectmanager.cpp:617
-msgid "Invalid URL."
-msgstr "无效的 URL"
-
-#: src/projectmanager.cpp:623
-msgid "You do not have 'kdevprj2tdevelop' installed."
-msgstr "您没有安装“kdevprj2tdevelop”。"
-
-#: src/splashscreen.cpp:77
-#, c-format
-msgid "Version %1"
-msgstr "版本 %1"
-
-#: src/newui/ddockwindow.cpp:88
-#, fuzzy
-msgid "Move to left dock"
-msgstr "左移"
-
-#: src/newui/ddockwindow.cpp:89
-#, fuzzy
-msgid "Move to right dock"
-msgstr "右移"
-
-#: src/newui/ddockwindow.cpp:90
-msgid "Move to bottom dock"
-msgstr ""
-
-#: src/newui/button.cpp:58
-#, fuzzy
-msgid "Assign Accelerator..."
-msgstr "检查快捷键"
-
-#: src/newui/button.cpp:60
-#, fuzzy
-msgid "Clear Accelerator"
-msgstr "检查快捷键"
-
-#: src/newui/button.cpp:318
-#, fuzzy
-msgid "Change Button Number"
-msgstr "更改函数名称"
-
-#: src/newui/button.cpp:318
-msgid "New accelerator number:"
-msgstr ""
-
-#: src/profileengine/editor/main.cpp:33
-msgid "KDevelop Profile Editor"
-msgstr "KDevelop 配置文件编辑器"
-
-#: src/profileengine/editor/main.cpp:34
-msgid "(c) 2004, The KDevelop Developers"
-msgstr "(C) 2004，KDevelop 开发者"
-
-#: parts/doxygen/messages.cpp:29
-#: src/profileengine/editor/profileeditor.cpp:141
-msgid "Project"
-msgstr "工程"
-
-#: src/profileengine/editor/profileeditor.cpp:201
-msgid "Core Plugins"
-msgstr "核心插件"
-
-#: src/profileengine/editor/profileeditor.cpp:203
-msgid "Global Plugins"
-msgstr "全局插件"
-
-#: src/profileengine/editor/profileeditor.cpp:205
-msgid "Project Plugins"
-msgstr "工程插件"
+"A scalar dummy argument is the same as a common variable in the subprogram, and "
+"either is modified"
+msgstr "一个标量形参和子程序里的一个公用变量是一样的，而且有一个已被修改"
 
-#: src/profileengine/editor/profileeditor.cpp:254
-msgid "Remove selected profile and all its subprofiles?"
-msgstr ""
+#: languages/fortran/ftnchekconfigwidget.cpp:134
+msgid "ACCEPT and TYPE I/O statements"
+msgstr "ACCEPT 和 TYPE I/O 语句"
 
-#: src/profileengine/editor/profileeditor.cpp:267
+#: languages/fortran/ftnchekconfigwidget.cpp:135
 msgid ""
-"Cannot remove this profile because it is not a local (user-created) profile."
-msgstr ""
-
-#: src/profileengine/editor/profileeditor.cpp:329
-msgid "This plugin is already contained in the list of disabled plugins."
-msgstr ""
-
-#: src/profileengine/editor/profileeditor.cpp:330
-msgid "Enable Plugin"
-msgstr "启用插件"
-
-#: src/profileengine/editor/profileeditor.cpp:375
-msgid "This plugin is already contained in the list of enabled plugins."
-msgstr ""
-
-#: src/profileengine/editor/profileeditor.cpp:376
-msgid "Disable Plugin"
-msgstr "禁用插件"
-
-#: vcs/clearcase/clearcasepart.cpp:89 vcs/perforce/perforcepart.cpp:97
-#, c-format
-msgid "Actions for %1"
-msgstr "对 %1 的动作"
-
-#: vcs/clearcase/clearcasepart.cpp:90
-msgid "Checkin"
-msgstr "提交"
-
-#: vcs/clearcase/clearcasepart.cpp:92
-msgid "Checkout"
-msgstr "提取"
-
-#: vcs/clearcase/clearcasepart.cpp:94
-msgid "Uncheckout"
-msgstr "反提取"
-
-#: vcs/clearcase/clearcasepart.cpp:97
-msgid "Create Element"
-msgstr "创建元素"
-
-#: vcs/clearcase/clearcasepart.cpp:99
-msgid "Remove Element"
-msgstr "删除元素"
-
-#: vcs/clearcase/clearcasepart.cpp:102
-#, fuzzy
-msgid "History"
-msgstr "目录"
-
-#: parts/diff/diffpart.cpp:52 vcs/clearcase/clearcasepart.cpp:105
-msgid "Diff"
-msgstr "比较"
-
-#: vcs/clearcase/clearcasepart.cpp:109
-#, fuzzy
-msgid "List Checkouts"
-msgstr "提取"
-
-#: vcs/clearcase/clearcasepart.cpp:112
-msgid "Clearcase"
-msgstr "Clearcase"
-
-#: vcs/clearcase/clearcasepart.cpp:320
-#, fuzzy
-msgid "Clearcase output errors during diff."
-msgstr "Clearcase 在比较时输出错误。"
-
-#: vcs/clearcase/clearcasepart.cpp:320 vcs/clearcase/clearcasepart.cpp:326
-#: vcs/cvsservice/cvspartimpl.cpp:941 vcs/cvsservice/cvspartimpl.cpp:949
-#: vcs/perforce/perforcepart.cpp:258 vcs/perforce/perforcepart.cpp:264
-msgid "Errors During Diff"
-msgstr "比较时出错"
-
-#: vcs/clearcase/clearcasepart.cpp:325
-msgid "Clearcase outputted errors during diff. Do you still want to continue?"
-msgstr "Clearcase 在比较时输出错误。您仍然要继续吗？"
-
-#: vcs/clearcase/clearcasepart.cpp:332 vcs/cvsservice/cvspartimpl.cpp:957
-#: vcs/perforce/perforcepart.cpp:270
-msgid "There is no difference to the repository."
-msgstr "和仓库没有任何差别。"
-
-#: vcs/clearcase/clearcasepart.cpp:332 vcs/cvsservice/cvspartimpl.cpp:958
-msgid "No Difference Found"
-msgstr "未发现差别"
-
-#: vcs/clearcase/commentdlg.cpp:26
-msgid "Clearcase Comment"
-msgstr "Clearcase 注解"
-
-#: vcs/clearcase/commentdlg.cpp:30
-msgid "Enter log message:"
-msgstr "输入日志信息："
-
-#: vcs/clearcase/commentdlg.cpp:41
-#, fuzzy
-msgid "Reserve"
-msgstr "远程 pserver"
-
-#: vcs/subversion/subversion_part.cpp:86
-msgid "Subversion Output"
-msgstr "Subversion 输出"
-
-#: vcs/subversion/subversion_part.cpp:87
-#: vcs/subversion/subversion_part.cpp:261
-msgid "Subversion"
-msgstr "Subversion"
-
-#: vcs/subversion/subversion_part.cpp:87
-msgid "Subversion messages"
-msgstr "Subversion 消息"
-
-#: vcs/subversion/subversion_part.cpp:88
-msgid "<b>Subversion</b><p>Subversion operations window."
-msgstr "<b>Subversion</b><p>Subversion 操作窗口。"
-
-#: vcs/subversion/subversion_part.cpp:101
-#, fuzzy
-msgid "&Commit to Repository..."
-msgstr "提交到仓库(&C)"
-
-#: vcs/cvsservice/cvspart.cpp:148 vcs/subversion/subversion_part.cpp:102
-msgid "Commit file(s)"
-msgstr "提交文件"
-
-#: vcs/cvsservice/cvspart.cpp:149 vcs/cvsservice/cvspart.cpp:324
-#: vcs/subversion/subversion_part.cpp:103
-#: vcs/subversion/subversion_part.cpp:223
-msgid "<b>Commit file(s)</b><p>Commits file to repository if modified."
-msgstr "<b>提交文件</b><p>将修改过的文件提交到仓库。"
-
-#: vcs/cvsservice/cvspart.cpp:166 vcs/subversion/subversion_part.cpp:110
-msgid "&Add to Repository"
-msgstr "添加到仓库(&A)"
-
-#: vcs/cvsservice/cvspart.cpp:168 vcs/subversion/subversion_part.cpp:111
-msgid "Add file to repository"
-msgstr "将文件添加到仓库"
-
-#: vcs/subversion/subversion_part.cpp:112
-#: vcs/subversion/subversion_part.cpp:225
-msgid "<b>Add file to repository</b><p>Adds file to repository."
-msgstr "<b>添加文件到仓库</b><p>向仓库中添加文件。"
-
-#: vcs/subversion/subversion_part.cpp:114
-#, fuzzy
-msgid "Show logs..."
-msgstr "槽(&L)..."
-
-#: vcs/subversion/subversion_part.cpp:115
-#, fuzzy
-msgid "Blame..."
-msgstr "文件&F)..."
-
-#: vcs/cvsservice/cvspart.cpp:191 vcs/subversion/subversion_part.cpp:117
-msgid "&Remove From Repository"
-msgstr "从仓库中删除(&R)"
-
-#: vcs/cvsservice/cvspart.cpp:193 vcs/perforce/perforcepart.cpp:83
-#: vcs/subversion/subversion_part.cpp:118
-msgid "Remove from repository"
-msgstr "从仓库中删除"
-
-#: vcs/cvsservice/cvspart.cpp:194 vcs/cvsservice/cvspart.cpp:346
-#: vcs/subversion/subversion_part.cpp:119
-#: vcs/subversion/subversion_part.cpp:227
-msgid "<b>Remove from repository</b><p>Removes file(s) from repository."
-msgstr "<b>从仓库中删除</b><p>从仓库中删除文件。"
-
-#: vcs/subversion/subversion_part.cpp:122
-msgid "Update"
-msgstr "更新"
-
-#: vcs/subversion/subversion_part.cpp:123
-#: vcs/subversion/subversion_part.cpp:241
-msgid "<b>Update</b><p>Updates file(s) from repository."
-msgstr "<b>更新</b><p>从仓库中更新文件。"
-
-#: vcs/subversion/subversion_part.cpp:125
-#, fuzzy
-msgid "&Diff to BASE"
-msgstr "和保存的文件的差异"
-
-#: vcs/subversion/subversion_part.cpp:126
-#, fuzzy
-msgid "Diff to BASE"
-msgstr "和保存的文件的差异"
-
-#: vcs/subversion/subversion_part.cpp:127
-msgid "<b>Diff to disk</b><p>Diff current file to the BASE checked out copy."
-msgstr ""
-
-#: vcs/subversion/subversion_part.cpp:129
-msgid "&Diff to HEAD"
-msgstr ""
-
-#: vcs/subversion/subversion_part.cpp:130
-msgid "Diff to HEAD"
-msgstr ""
+"Expressions defining array bounds that contain array elements or function "
+"references"
+msgstr "定义数组范围、且包含数组元素或函数引用的表达式"
 
-#: vcs/subversion/subversion_part.cpp:131
-msgid "<b>Diff HEAD</b><p>Diff the current file to HEAD in svn."
-msgstr ""
+#: languages/fortran/ftnchekconfigwidget.cpp:137
+msgid "Assignment statements involving arrays"
+msgstr "涉及数组的赋值语句"
 
-#: vcs/subversion/subversion_part.cpp:134
-#, fuzzy
-msgid "&Revert"
-msgstr "返转"
+#: languages/fortran/ftnchekconfigwidget.cpp:143
+msgid "Backslash characters in strings"
+msgstr "字符串里的反斜线字符"
 
-#: vcs/perforce/perforcepart.cpp:61 vcs/perforce/perforcepart.cpp:63
-#: vcs/perforce/perforcepart.cpp:102 vcs/perforce/perforcepart.cpp:156
-#: vcs/subversion/subversion_part.cpp:135
-msgid "Revert"
-msgstr "返转"
+#: languages/fortran/ftnchekconfigwidget.cpp:144
+msgid "COMMON block variables not in descending order of storage sizes"
+msgstr "COMMON 公用块里的变量没有按存储尺寸递减的顺序声明"
 
-#: vcs/subversion/subversion_part.cpp:136
-#: vcs/subversion/subversion_part.cpp:243
-#, fuzzy
-msgid "<b>Revert</b><p>Undo local changes."
-msgstr "返转所有修改"
+#: languages/fortran/ftnchekconfigwidget.cpp:145
+msgid "Hollerith constants"
+msgstr "Hollerith 常数"
 
-#: vcs/subversion/subversion_part.cpp:149
-#, fuzzy
-msgid "Re&solve Conflicting State"
-msgstr "<b>删除范围</b><p>删除当前选中的范围。"
+#: languages/fortran/fortransupportpart.cpp:67
+msgid "&Ftnchek"
+msgstr "&Ftnchek"
 
-#: vcs/subversion/subversion_part.cpp:151
-msgid "Resolve the conflicting state of a file after a merge"
-msgstr ""
+#: languages/fortran/fortransupportpart.cpp:70
+msgid "Run ftnchek"
+msgstr "运行 Ftnchek"
 
-#: vcs/subversion/subversion_part.cpp:152
+#: languages/fortran/fortransupportpart.cpp:71
 msgid ""
-"<b>Resolve the conflicting state</b>"
-"<p>Remove the conflict state that can be set on a file after a merge failed."
-msgstr ""
-
-#: vcs/subversion/subversion_part.cpp:153
-msgid "Switch this working copy to URL.."
-msgstr ""
-
-#: vcs/subversion/subversion_part.cpp:156
-msgid "Copy this working copy to URL.."
-msgstr ""
-
-#: vcs/subversion/subversion_part.cpp:158
-#, fuzzy
-msgid "Merge difference to working copy"
-msgstr "和仓库没有任何差别。"
-
-#: vcs/subversion/subversion_part.cpp:229
-msgid "<b>Show logs..</b><p>View Logs"
-msgstr ""
-
-#: vcs/subversion/subversion_part.cpp:231
-msgid "<b>Blame 0:HEAD </b><p>Show Annotate"
-msgstr ""
-
-#: vcs/subversion/subversion_part.cpp:235
-msgid "<b>Diff</b><p>Diff file to local disk."
-msgstr ""
-
-#: vcs/subversion/subversion_part.cpp:238
-#, fuzzy
-msgid "<b>Diff</b><p>Diff file to repository."
-msgstr "<b>添加到仓库中</b><p>添加文件到仓库中。"
-
-#: vcs/subversion/subversion_part.cpp:245
-#, fuzzy
-msgid "<b>Resolve</b><p>Resolve conflicting state."
-msgstr "<b>删除范围</b><p>删除当前选中的范围。"
-
-#: vcs/subversion/subversion_part.cpp:247
-msgid "<b>Switch</b><p>Switch working tree."
-msgstr ""
-
-#: vcs/subversion/subversion_part.cpp:249
-msgid "<b>Copy</b><p>Copy from/between path/URLs"
-msgstr ""
-
-#: vcs/subversion/subversion_part.cpp:251
-msgid "<b>Merge</b><p>Merge difference to working copy"
-msgstr ""
-
-#: vcs/subversion/subversion_part.cpp:304
-#: vcs/subversion/subversion_part.cpp:345
-msgid "Please select only one item for subversion switch"
-msgstr ""
-
-#: vcs/subversion/subversion_part.cpp:327
-#, fuzzy
-msgid "The destination URL is invalid"
-msgstr "表达式无效。"
-
-#: vcs/subversion/subversion_part.cpp:337
-msgid "Fail to conduct subversion switch. No action was selected"
-msgstr ""
-
-#: vcs/subversion/subversion_part.cpp:380
-msgid "Please select only one item for subversion merge"
-msgstr ""
-
-#: vcs/subversion/subversion_part.cpp:462
-msgid "Please select only one item for subversion log"
-msgstr ""
-
-#: vcs/subversion/subversion_part.cpp:481
-msgid "Please select only one item to see annotate"
-msgstr ""
-
-#: vcs/subversion/subversion_part.cpp:486
-#, fuzzy
-msgid "Select file to see blame"
-msgstr "选择子工程"
-
-#: vcs/subversion/subversion_part.cpp:504
-#: vcs/subversion/subversion_part.cpp:514
-#, fuzzy
-msgid "Select file or directory to see diff"
-msgstr "选择子工程"
-
-#: vcs/subversion/subversion_fileinfo.cpp:160
-msgid "Subversion File/Directory Status"
-msgstr ""
-
-#: vcs/subversion/svn_fileselectdlg_commit.cpp:41
-#, fuzzy
-msgid "Select Files to Commit"
-msgstr "要载入的文件"
-
-#: vcs/subversion/svn_fileselectdlg_commit.cpp:43
-#, fuzzy
-msgid "select"
-msgstr "选择(&S)"
-
-#: vcs/subversion/svn_fileselectdlg_commit.cpp:44
-#, fuzzy
-msgid "status"
-msgstr "状态"
-
-#: vcs/subversion/svn_fileselectdlg_commit.cpp:45
-msgid "URL to commit"
-msgstr ""
-
-#: vcs/subversion/svn_fileselectdlg_commit.cpp:119
-msgid "No added/modified/deleted file(s) to commit"
-msgstr ""
-
-#: vcs/subversion/kdevsvnd_widgets.cpp:27
-msgid "Accept Permanently"
+"<b>Run ftnchek</b>"
+"<p>Runs <b>ftnchek</b> to check fortran programs for semantic errors. Configure "
+"ftnchek options in project settings dialog, <b>Ftnchek</b> tab."
 msgstr ""
+"<b>运行 ftnchek</b>"
+"<p>运行 <b>ftnchek</b>来检查fortran程序的语义错误。在项目设置对话框<b>Ftnchek</b>标签配置ftnchek选项。"
 
-#: vcs/subversion/kdevsvnd_widgets.cpp:28
-#, fuzzy
-msgid "Accept Temporarily"
-msgstr " 临时"
-
-#: vcs/subversion/kdevsvnd_widgets.cpp:29
-#, fuzzy
-msgid "Reject"
-msgstr "矩形"
+#: languages/fortran/fortransupportpart.cpp:85
+msgid "There is currently a job running."
+msgstr "当前已经有一个进程在运行。"
 
-#: vcs/subversion/kdevsvnd_widgets.cpp:40
-#, fuzzy
-msgid "Hostname"
-msgstr "主机名(&H)："
+#: languages/fortran/fortransupportpart.cpp:160
+msgid "Ftnchek"
+msgstr "Ftnchek"
 
-#: vcs/subversion/kdevsvnd_widgets.cpp:41
-msgid "FingerPrint"
-msgstr ""
+#: languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp:243
+msgid "PGHPF Compiler Options"
+msgstr "PGHPF 编译器选项"
 
-#: vcs/subversion/kdevsvnd_widgets.cpp:42
-msgid "Valid From"
-msgstr ""
+#: languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp:243
+msgid "PGF77 Compiler Options"
+msgstr "PGF77 编译器选项"
 
-#: vcs/subversion/kdevsvnd_widgets.cpp:43
-msgid "Valid Until"
-msgstr ""
+#: languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp:255
+msgid "HPF"
+msgstr "HPF"
 
-#: vcs/subversion/kdevsvnd_widgets.cpp:44
-#, fuzzy
-msgid "Issuer"
-msgstr "用户"
+#: languages/php/phperrorview.cpp:375
+msgid "Undefined function"
+msgstr "未定义的函数"
 
-#: vcs/subversion/kdevsvnd_widgets.cpp:45
-#, fuzzy
-msgid "Cert"
-msgstr "返转"
+#: languages/php/phperrorview.cpp:378
+msgid "Parse Error"
+msgstr "分析错误"
 
-#: vcs/subversion/svn_tdeio.cpp:226
-#, c-format
-msgid "Username and Password for %1."
-msgstr ""
+#: languages/php/phpcodecompletion.cpp:709
+msgid "Type of %1 is %2"
+msgstr "%1 的类型是 %2"
 
-#: vcs/subversion/svn_tdeio.cpp:1385
-#, fuzzy
-msgid "Nothing to commit."
-msgstr "“%1”中未装入任何内容"
+#: languages/php/phpsupportpart.cpp:95
+msgid "<b>Run</b><p>Executes script on a terminal or a webserver."
+msgstr "<b>运行</b><p>在终端或web服务器上运行脚本。"
 
-#: vcs/subversion/svn_tdeio.cpp:1387
-#, fuzzy, c-format
-msgid "Committed revision %1."
-msgstr "注释(&M)："
+#: languages/php/phpsupportpart.cpp:97
+msgid "&New Class..."
+msgstr "新建类(&N)..."
 
-#: vcs/subversion/svn_tdeio.cpp:1587
-#, fuzzy, c-format
-msgid "Copied Revision %1"
-msgstr "注释(&M)："
+#: languages/php/phpsupportpart.cpp:100
+msgid "New class"
+msgstr "新建类"
 
-#: vcs/subversion/svn_tdeio.cpp:1590
-#, fuzzy
-msgid "Copied"
-msgstr "编译器(&M)"
+#: languages/php/phpsupportpart.cpp:101
+msgid "<b>New class</b><p>Runs New Class wizard."
+msgstr "<b>新建类</b><p>运行新建类的向导。"
 
-#: vcs/subversion/svn_tdeio.cpp:1698
+#: languages/php/phpsupportpart.cpp:106
 msgid ""
-"This certificate from server could not be trusted automatically. Will you trust "
-"this certificate? "
-msgstr ""
-
-#: vcs/subversion/svn_tdeio.cpp:1903
-#, fuzzy, c-format
-msgid "A (bin) %1"
-msgstr "在 %1 中显示"
-
-#: vcs/subversion/svn_tdeio.cpp:1905 vcs/subversion/svn_tdeio.cpp:1938
-#, fuzzy, c-format
-msgid "A %1"
-msgstr "添加 %1"
-
-#: vcs/subversion/svn_tdeio.cpp:1908
-msgid "Copied %1 "
-msgstr ""
+"<b>PHP problems</b>"
+"<p>This view shows PHP parser warnings, errors, and fatal errors."
+msgstr "<b>PHP错误</b><p>本视图显示PHP预处理警告，错误和严重错误。"
 
-#: vcs/subversion/svn_tdeio.cpp:1912 vcs/subversion/svn_tdeio.cpp:1934
-#, fuzzy, c-format
-msgid "D %1"
-msgstr "硬件 %1"
+#: languages/php/phpsupportpart.cpp:118 languages/php/phpsupportpart.cpp:333
+msgid "PHP"
+msgstr "PHP"
 
-#: vcs/subversion/svn_tdeio.cpp:1915
-#, fuzzy, c-format
-msgid "Restored %1."
-msgstr "恢复(&R)"
+#: languages/php/phpsupportpart.cpp:211
+msgid "PHP Specific"
+msgstr "PHP 特定设置"
 
-#: vcs/subversion/svn_tdeio.cpp:1918
-#, fuzzy, c-format
-msgid "Reverted %1."
-msgstr "删除(&M)"
+#: languages/php/phpsupportpart.cpp:211 languages/php/phpsupportpart.cpp:243
+msgid "PHP Settings"
+msgstr "PHP 设置"
 
-#: vcs/subversion/svn_tdeio.cpp:1921
+#: languages/php/phpsupportpart.cpp:238
 msgid ""
-"Failed to revert %1.\n"
-"Try updating instead."
-msgstr ""
-
-#: vcs/subversion/svn_tdeio.cpp:1924
-#, fuzzy, c-format
-msgid "Resolved conflicted state of %1."
-msgstr "<b>删除范围</b><p>删除当前选中的范围。"
-
-#: vcs/subversion/svn_tdeio.cpp:1928
-#, c-format
-msgid "Skipped missing target %1."
-msgstr ""
-
-#: vcs/subversion/svn_tdeio.cpp:1930
-#, c-format
-msgid "Skipped  %1."
-msgstr ""
-
-#: vcs/subversion/svn_tdeio.cpp:1983
-#, c-format
-msgid "Exported external at revision %1."
-msgstr ""
-
-#: vcs/subversion/svn_tdeio.cpp:1985
-#, fuzzy, c-format
-msgid "Exported revision %1."
-msgstr "展开缩写"
-
-#: vcs/subversion/svn_tdeio.cpp:1988
-#, c-format
-msgid "Checked out external at revision %1."
-msgstr ""
-
-#: vcs/subversion/svn_tdeio.cpp:1990
-#, c-format
-msgid "Checked out revision %1."
-msgstr ""
-
-#: vcs/subversion/svn_tdeio.cpp:1994
-#, c-format
-msgid "Updated external to revision %1."
-msgstr ""
-
-#: vcs/subversion/svn_tdeio.cpp:1996
-#, c-format
-msgid "Updated to revision %1."
-msgstr ""
-
-#: vcs/subversion/svn_tdeio.cpp:1999
-#, fuzzy, c-format
-msgid "External at revision %1."
-msgstr "外部库"
-
-#: vcs/subversion/svn_tdeio.cpp:2001
-#, fuzzy, c-format
-msgid "At revision %1."
-msgstr "版本 %1"
-
-#: vcs/subversion/svn_tdeio.cpp:2007
-#, fuzzy
-msgid "External export complete."
-msgstr "外部工具"
-
-#: vcs/subversion/svn_tdeio.cpp:2009
-msgid "Export complete."
-msgstr ""
-
-#: vcs/subversion/svn_tdeio.cpp:2012
-#, fuzzy
-msgid "External checkout complete."
-msgstr "启用代码补全(&E)"
-
-#: vcs/subversion/svn_tdeio.cpp:2014
-#, fuzzy
-msgid "Checkout complete."
-msgstr "提取来源(&F)："
-
-#: vcs/subversion/svn_tdeio.cpp:2017
-#, fuzzy
-msgid "External update complete."
-msgstr "启用代码补全(&E)"
-
-#: vcs/subversion/svn_tdeio.cpp:2019
-#, fuzzy
-msgid "Update complete."
-msgstr "更新选中的项目"
-
-#: vcs/subversion/svn_tdeio.cpp:2029
-#, fuzzy, c-format
-msgid "Fetching external item into %1."
-msgstr "在外部终端里启动"
-
-#: vcs/subversion/svn_tdeio.cpp:2033
-#, c-format
-msgid "Status against revision: %1."
-msgstr ""
-
-#: vcs/subversion/svn_tdeio.cpp:2036
-#, c-format
-msgid "Performing status on external item at %1."
-msgstr ""
-
-#: vcs/subversion/svn_tdeio.cpp:2039
-#, fuzzy, c-format
-msgid "Sending %1"
-msgstr "装入：%1"
-
-#: vcs/subversion/svn_tdeio.cpp:2043
-#, fuzzy, c-format
-msgid "Adding (bin) %1."
-msgstr "添加文件：%1"
-
-#: vcs/subversion/svn_tdeio.cpp:2045
-#, fuzzy, c-format
-msgid "Adding %1."
-msgstr "添加 %1"
-
-#: vcs/subversion/svn_tdeio.cpp:2049
-#, c-format
-msgid "Deleting %1."
-msgstr ""
-
-#: vcs/subversion/svn_tdeio.cpp:2052
-#, fuzzy, c-format
-msgid "Replacing %1."
-msgstr "正在读取文件“%1”..."
-
-#: vcs/subversion/svn_tdeio.cpp:2057
-msgid "Transmitting file data "
-msgstr ""
-
-#: vcs/subversion/svn_tdeio.cpp:2065
-#, c-format
-msgid "Blame %1."
-msgstr ""
-
-#: vcs/subversion/kdevsvnd.cpp:52
-#, fuzzy
-msgid "Enter Commit Log Message:"
-msgstr "输入日志信息："
-
-#: vcs/subversion/kdevsvnd.cpp:74
-#, fuzzy
-msgid "Open SSL certificate file"
-msgstr "打开源文件(&O)"
-
-#: vcs/subversion/subversion_core.cpp:146
-#, fuzzy
-msgid "Subversion Update"
-msgstr "Subversion 消息"
-
-#: vcs/subversion/subversion_core.cpp:222
-msgid "the local disk checked out copy."
-msgstr ""
-
-#: vcs/subversion/subversion_core.cpp:224
-#, fuzzy
-msgid "the current svn HEAD version."
-msgstr "补全当前表达式"
-
-#: vcs/subversion/subversion_core.cpp:226
-#, fuzzy, c-format
-msgid "No differences between the file and %1"
-msgstr "%1 和 %2 的差别"
-
-#: vcs/subversion/subversion_core.cpp:226
-#, fuzzy
-msgid "No difference"
-msgstr "构建差异"
-
-#: vcs/subversion/subversion_core.cpp:266
-#: vcs/subversion/subversion_core.cpp:268
-#, fuzzy
-msgid "Commit to remote repository"
-msgstr "提交到仓库"
-
-#: vcs/subversion/subversion_core.cpp:268
-msgid "From working copy"
+"There is no configuration for executing a PHP file.\n"
+"Please set the correct values in the next dialog."
 msgstr ""
+"没有执行 PHP 文件需要的配置。\n"
+"请在下一个对话框里设置正确的值。"
 
-#: vcs/subversion/subversion_core.cpp:320
-#, fuzzy
-msgid "Subversion Blame"
-msgstr "Subversion 消息"
-
-#: vcs/subversion/subversion_core.cpp:509
-#: vcs/subversion/subversion_core.cpp:538
-#: vcs/subversion/subversion_core.cpp:598
-#: vcs/subversion/subversion_core.cpp:668
-msgid ""
-"If you just have installed new version of KDevelop, and if the error message "
-"was unknown protocol kdevsvn+*, try to restart TDE"
-msgstr ""
+#: languages/php/phpsupportpart.cpp:239
+msgid "Customize PHP Mode"
+msgstr "自定义 PHP 模式"
 
-#: vcs/subversion/subversion_core.cpp:703
+#: languages/ada/problemreporter.cpp:84
 msgid ""
-"You don't have kompare installed. We recommend you to install kompare to view "
-"difference graphically"
-msgstr ""
-
-#: vcs/subversion/subversion_core.cpp:715
-#, fuzzy
-msgid "No subversion differences"
-msgstr "构建差异"
-
-#: vcs/subversion/svn_blamewidget.cpp:36
-#: vcs/subversion/svn_logviewwidget.cpp:51
-#, fuzzy
-msgid "Rev"
-msgstr "红"
-
-#: parts/documentation/searchview.cpp:75 vcs/cvsservice/editorsdialog.cpp:88
-#: vcs/cvsservice/editorsdialog.cpp:101 vcs/subversion/svn_blamewidget.cpp:37
-#: vcs/subversion/svn_logviewwidget.cpp:52
-msgid "Date"
-msgstr "日期"
-
-#: vcs/subversion/svn_logviewwidget.cpp:131
-#, fuzzy
-msgid "Blame this revision"
-msgstr "版本"
-
-#: vcs/subversion/svn_logviewwidget.cpp:132
-#, fuzzy
-msgid "Difference to previous revision"
-msgstr "不同版本间的差异(&D)"
-
-#: vcs/subversion/svn_logviewwidget.cpp:138
-#: vcs/subversion/svn_logviewwidget.cpp:181
-msgid "No revision was clicked"
-msgstr ""
-
-#: vcs/subversion/svn_logviewwidget.cpp:138
-#: vcs/subversion/svn_logviewwidget.cpp:181
-#, fuzzy
-msgid "error"
-msgstr "错误"
+"<b>Problem reporter</b>"
+"<p>This window shows errors reported by a language parser."
+msgstr "<b>问题报告</b><p>这个窗口显示语言预处理器报告的错误。"
 
-#: vcs/subversion/svn_blamewidget.cpp:39
-#, fuzzy
-msgid "Content"
-msgstr "连接"
+#: languages/ada/problemreporter.cpp:256
+msgid "Ada Parsing"
+msgstr "Ada 分析"
 
-#: vcs/subversion/svn_blamewidget.cpp:91
-#, fuzzy
-msgid "Select one file to view annotation"
-msgstr "选择子工程"
+#: parts/openwith/openwithpart.cpp:48
+msgid "Open as UTF-8"
+msgstr "按 UTF-8 编码打开"
 
-#: vcs/subversion/svn_blamewidget.cpp:95
+#: parts/openwith/openwithpart.cpp:52
 #, fuzzy
-msgid "files"
+msgid "Open As"
 msgstr "打开文件"
 
-#: vcs/subversion/svn_blamewidget.cpp:129
-msgid "Select file from list to view annotation"
-msgstr ""
-
-#: vcs/subversion/subversion_widget.cpp:38
-#, fuzzy
-msgid "Notification"
-msgstr "无优化"
-
-#: vcs/subversion/subversion_widget.cpp:63
-#, fuzzy
-msgid "Log History"
-msgstr "目录"
-
-#: vcs/subversion/subversion_widget.cpp:72
-#, fuzzy
-msgid "Blame"
-msgstr "文件&F)..."
-
-#: vcs/subversion/subversion_widget.cpp:121
-#, fuzzy
-msgid "Subversion Job Progress"
-msgstr "Subversion 消息"
-
-#: vcs/subversion/integrator/svnintegratordlg.cpp:73
-#, fuzzy
-msgid "Fail to create project directories on repository"
-msgstr "工程目录的文件树视图"
-
-#: vcs/subversion/integrator/svnintegratordlg.cpp:84
-#, fuzzy
-msgid "Fail to import into repository."
-msgstr "提交到仓库"
-
-#: vcs/subversion/integrator/svnintegratordlg.cpp:106
-#, fuzzy
-msgid "Fail to checkout from repository."
-msgstr "从仓库中删除"
-
-#: vcs/cvsservice/cvslogpage.cpp:116 vcs/cvsservice/editorsdialog.cpp:64
-#, c-format
-msgid "Log failed with exitStatus == %1"
-msgstr "日志失败，状态 %1"
-
-#: vcs/cvsservice/cvslogpage.cpp:116 vcs/cvsservice/editorsdialog.cpp:64
-msgid "Log Failed"
-msgstr "日志失败"
-
-#: vcs/cvsservice/editorsdialog.cpp:87 vcs/cvsservice/editorsdialog.cpp:100
-msgid "User"
-msgstr "用户"
-
-#: vcs/cvsservice/editorsdialog.cpp:109
-msgid "No files from your query are marked as being edited."
-msgstr ""
-
-#: vcs/cvsservice/cvslogdialog.cpp:36
-msgid "CVS Log & Diff Dialog"
-msgstr "CVS 日志和差别对话框"
-
-#: vcs/cvsservice/cvslogdialog.cpp:42
-msgid "Log From CVS"
-msgstr "从 CVS 提取日志"
-
-#: vcs/cvsservice/cvslogdialog.cpp:82
-msgid "Diff between %1 and %2"
-msgstr "%1 和 %2 的差别"
-
-#: vcs/cvsservice/cvsoptions.cpp:286
-msgid "Error while guessing repository location."
-msgstr ""
-
-#: vcs/cvsservice/cvspartimpl.cpp:127
-msgid ""
-"Open a project first.\n"
-"Operation will be aborted."
-msgstr ""
-"请先打开一个工程。\n"
-"操作将中止。"
-
-#: vcs/cvsservice/cvspartimpl.cpp:134
-msgid ""
-"Another CVS operation is executing: do you want to cancel it \n"
-"and start this new one?"
-msgstr "另一个 CVS 操作正在进行：您是否要取消它，开始新的操作？"
-
-#: vcs/cvsservice/cvspartimpl.cpp:136
-#, fuzzy
-msgid "CVS: Operation Already Pending "
-msgstr "CVS：操作已在进行 "
-
-#: vcs/cvsservice/cvspartimpl.cpp:151
-#, fuzzy
-msgid "None of the file(s) you selected seem to be valid for repository."
-msgstr "您选择的文件没有哪个在仓库中是有效的。"
-
-#: vcs/cvsservice/cvspartimpl.cpp:370
-msgid "Unable to checkout"
-msgstr "无法提取文件"
-
-#: vcs/cvsservice/cvspartimpl.cpp:519
-#, fuzzy
-msgid "Do you really want to unedit the selected files?"
-msgstr "您真要删除子工程 %1 及所有目标和文件吗？"
-
-#: vcs/cvsservice/cvspartimpl.cpp:520
-#, fuzzy
-msgid "CVS - Unedit Files"
-msgstr "UI 文件(&U)："
-
-#: vcs/cvsservice/cvspartimpl.cpp:521
-#, fuzzy
-msgid "Unedit"
-msgstr "无设置"
-
-#: vcs/cvsservice/cvspartimpl.cpp:522
-msgid "Do Not Unedit"
-msgstr ""
-
-#: vcs/cvsservice/cvspartimpl.cpp:653
-#, fuzzy
-msgid "Sorry, cannot diff."
-msgstr "抱歉，无法比较差别！"
-
-#: vcs/cvsservice/cvsdiffpage.cpp:68 vcs/cvsservice/cvsdiffpage.cpp:101
-#: vcs/cvsservice/cvspartimpl.cpp:654
-msgid "Error During Diff"
-msgstr "比较时出错"
-
-#: vcs/cvsservice/cvspartimpl.cpp:674
-msgid "Creating Tag/Branch for files ..."
-msgstr "正在为文件创建标签/分支..."
-
-#: vcs/cvsservice/cvspartimpl.cpp:698
-#, fuzzy
-msgid "Removing Tag from files ..."
-msgstr "正在为文件删除标签/分支..."
-
-#: vcs/cvsservice/cvspartimpl.cpp:791
-#: vcs/cvsservice/integrator/integratordlg.cpp:101
-msgid ""
-"Unable to find the Cervisia KPart. \n"
-"Cervisia Integration will not be available. Please check your\n"
-"Cervisia installation and re-try. Reason was:\n"
-msgstr ""
-"无法找到 Cervisia KPart 组件。\n"
-"Cervisia 集成功能将无法使用，请检查您的 Cervisia 安装，\n"
-"然后重试。原因是：\n"
-
-#: vcs/cvsservice/cvspartimpl.cpp:839
-#, fuzzy
-msgid "Do you want the files to be added to CVS repository too?"
-msgstr "您是否要将它们添加到 CVS 仓库中？"
-
-#: vcs/cvsservice/cvspartimpl.cpp:840
-msgid "CVS - New Files Added to Project"
-msgstr "CVS - 新文件已添加到工程中"
-
-#: vcs/cvsservice/cvspartimpl.cpp:842
-msgid "Do Not Add"
-msgstr "不添加"
-
-#: vcs/cvsservice/cvspartimpl.cpp:843
-msgid "askWhenAddingNewFiles"
-msgstr "添加新文件时询问"
-
-#: vcs/cvsservice/cvspartimpl.cpp:865
-#, fuzzy
-msgid ""
-"Do you want them to be removed from CVS repository too?\n"
-"Warning: They will be removed from disk too."
-msgstr ""
-"您想要将它们从 CVS 仓库中删除吗？\n"
-"警告：它们也将从硬盘上删除！"
-
-#: vcs/cvsservice/cvspartimpl.cpp:866
-msgid "CVS - Files Removed From Project"
-msgstr "CVS - 文件已从工程中删除"
-
-#: vcs/cvsservice/cvspartimpl.cpp:868
-msgid "askWhenRemovingFiles"
-msgstr "删除文件时询问"
-
-#: vcs/cvsservice/cvspartimpl.cpp:934
-msgid "Operation aborted (process killed)."
-msgstr "操作已中止(进程被杀死)。"
-
-#: vcs/cvsservice/cvspartimpl.cpp:935
-msgid "CVS Diff"
-msgstr "CVS 比较"
-
-#: vcs/cvsservice/cvspartimpl.cpp:940
-msgid "CVS outputted errors during diff."
-msgstr "CVS 在比较时输出错误。"
-
-#: vcs/cvsservice/cvspartimpl.cpp:948
-#, fuzzy
-msgid "CVS output errors during diff. Do you still want to continue?"
-msgstr "CVS 在比较时输出错误。您仍然要继续吗？"
-
-#: vcs/cvsservice/cvslogpage.cpp:180
-#, fuzzy
-msgid "invalid link clicked"
-msgstr " (无效)"
-
-#: parts/diff/diffwidget.cpp:76 vcs/cvsservice/diffwidget.cpp:73
-#, c-format
-msgid "Show in %1"
-msgstr "在 %1 中显示"
-
-#: parts/diff/diffwidget.cpp:83 vcs/cvsservice/diffwidget.cpp:80
-msgid "&Save As..."
-msgstr "另存为(&S)..."
-
-#: parts/diff/diffwidget.cpp:88 vcs/cvsservice/diffwidget.cpp:85
-msgid "Highlight Syntax"
-msgstr "加亮文法"
-
-#: parts/diff/diffwidget.cpp:112 vcs/cvsservice/diffwidget.cpp:106
-msgid "Unable to open file."
-msgstr "无法打开文件。"
-
-#: parts/diff/diffwidget.cpp:112 vcs/cvsservice/diffwidget.cpp:106
-msgid "Diff Frontend"
-msgstr "比较前端"
-
-#: parts/diff/diffwidget.cpp:324 vcs/cvsservice/diffwidget.cpp:315
-msgid "Display &Raw Output"
-msgstr "显示原始输出(&R)"
-
-#: vcs/cvsservice/annotatedialog.cpp:27
-msgid "CVS Annotate Dialog"
-msgstr "CVS 批注对话框"
-
-#: vcs/cvsservice/annotatedialog.cpp:33 vcs/cvsservice/annotatedialog.cpp:60
-msgid "Annotate"
-msgstr "批注"
-
-#: vcs/cvsservice/cvspart.cpp:133
-msgid ""
-"<b>CVS</b>"
-"<p>Concurrent Versions System operations window. Shows output of Cervisia CVS "
-"Service."
-msgstr "<b>CVS</b><p>并行版本控制系统操作窗口，显示 Cervisia CVS 服务的输出。"
-
-#: vcs/cvsservice/cvspart.cpp:134
-#, fuzzy
-msgid "CvsService Output"
-msgstr "CVS 服务"
-
-#: vcs/cvsservice/cvspart.cpp:135 vcs/cvsservice/cvspart.cpp:279
-#: vcs/cvsservice/cvspart.cpp:365
-msgid "CvsService"
-msgstr "CVS 服务"
-
-#: vcs/cvsservice/cvspart.cpp:135
-msgid "cvs output"
-msgstr "CVS 输出"
-
-#: vcs/cvsservice/cvspart.cpp:146
-msgid "&Commit to Repository"
-msgstr "提交到仓库(&C)"
-
-#: vcs/cvsservice/cvspart.cpp:151
-msgid "&Difference Between Revisions"
-msgstr "不同版本间的差异(&D)"
-
-#: vcs/cvsservice/cvspart.cpp:153
-msgid "Build difference"
-msgstr "构建差异"
-
-#: vcs/cvsservice/cvspart.cpp:154 vcs/cvsservice/cvspart.cpp:329
-msgid "<b>Build difference</b><p>Builds difference between releases."
-msgstr "<b>构建差异</b><p>构建不同版本之间的差异。"
-
-#: vcs/cvsservice/cvspart.cpp:156
-msgid "Generate &Log"
-msgstr "生成日志(&L)"
-
-#: vcs/cvsservice/cvspart.cpp:158
-msgid "Generate log"
-msgstr "生成日志"
-
-#: vcs/cvsservice/cvspart.cpp:159 vcs/cvsservice/cvspart.cpp:331
-msgid "<b>Generate log</b><p>Produces log for this file."
-msgstr "<b>生成日志</b><p>生成此文件的日志。"
-
-#: vcs/cvsservice/cvspart.cpp:161
-msgid "&Annotate"
-msgstr "批注(&A)"
-
-#: vcs/cvsservice/cvspart.cpp:163
-msgid "Generate annotations"
-msgstr "生成批注"
-
-#: vcs/cvsservice/cvspart.cpp:164
-#, fuzzy
-msgid "<b>Annotate</b><p>Produces annotations for this file."
-msgstr "<b>生成日志</b><p>生成此文件的日志。"
-
-#: vcs/cvsservice/cvspart.cpp:169 vcs/cvsservice/cvspart.cpp:342
-msgid "<b>Add to repository</b><p>Adds file to repository."
-msgstr "<b>添加到仓库中</b><p>添加文件到仓库中。"
-
-#: vcs/cvsservice/cvspart.cpp:171
-msgid "&Edit Files"
-msgstr "编辑文件(&E)"
-
-#: vcs/cvsservice/cvspart.cpp:173
-msgid "Mark as being edited"
-msgstr ""
-
-#: vcs/cvsservice/cvspart.cpp:174
-msgid "<b>Mark as being edited</b><p>Mark the files as being edited."
-msgstr ""
-
-#: vcs/cvsservice/cvspart.cpp:176
-#, fuzzy
-msgid "&Unedit Files"
-msgstr "UI 文件(&U)："
-
-#: vcs/cvsservice/cvspart.cpp:178
-#, fuzzy
-msgid "Remove editing mark from files"
-msgstr "正在为文件删除标签/分支..."
-
-#: vcs/cvsservice/cvspart.cpp:179 vcs/cvsservice/cvspart.cpp:340
-#, fuzzy
-msgid "<b>Remove editing mark</b><p>Remove the editing mark from the files."
-msgstr "<b>删除粘滞标志</b><p>删除文件上的粘滞标志。"
-
-#: vcs/cvsservice/cvspart.cpp:181
-msgid "&Show Editors"
-msgstr "显示编辑器(&S)"
-
-#: vcs/cvsservice/cvspart.cpp:183
-#, fuzzy
-msgid "Show editors"
-msgstr "显示方法"
-
-#: vcs/cvsservice/cvspart.cpp:184 vcs/cvsservice/cvspart.cpp:336
-#, fuzzy
-msgid "<b>Show editors</b><p>Shows the list of users who are editing files."
-msgstr "<b>全部关闭</b><p>关闭所有文件。"
-
-#: vcs/cvsservice/cvspart.cpp:186
-msgid "Add to Repository as &Binary"
-msgstr "作为二进制文件添加到仓库中(&B)"
-
-#: vcs/cvsservice/cvspart.cpp:188
-msgid "Add file to repository as binary"
-msgstr "作为二进制文件添加到仓库中"
-
-#: vcs/cvsservice/cvspart.cpp:189 vcs/cvsservice/cvspart.cpp:344
-msgid ""
-"<b>Add to repository as binary</b>"
-"<p>Adds file to repository as binary (-kb option)."
-msgstr "<b>作为二进制文件添加到仓库中</b><p>作为二进制文件添加到仓库中(-kb 选项)。"
-
-#: vcs/cvsservice/cvspart.cpp:196
-msgid "&Update/Revert to Another Release"
-msgstr "更新/返转为另一个版本(&U)"
-
-#: vcs/cvsservice/cvspart.cpp:198
-msgid "Update/revert"
-msgstr "更新/返转"
-
-#: vcs/cvsservice/cvspart.cpp:199 vcs/cvsservice/cvspart.cpp:354
-msgid ""
-"<b>Update/revert to another release</b>"
-"<p>Updates/reverts file(s) to another release."
-msgstr "<b>更新/返转为另一个版本</b><p>将文件更新/返转为另一个版本。"
-
-#: vcs/cvsservice/cvspart.cpp:201
-msgid "R&emove Sticky Flag"
-msgstr "删除粘滞标志(&E)"
-
-#: vcs/cvsservice/cvspart.cpp:203
-msgid "Remove sticky flag"
-msgstr "删除粘滞标志"
-
-#: vcs/cvsservice/cvspart.cpp:204 vcs/cvsservice/cvspart.cpp:356
-msgid "<b>Remove sticky flag</b><p>Removes sticky flag from file(s)."
-msgstr "<b>删除粘滞标志</b><p>删除文件上的粘滞标志。"
-
-#: vcs/cvsservice/cvspart.cpp:206
-msgid "Make &Tag/Branch"
-msgstr "制作标签/分支(&T)"
-
-#: vcs/cvsservice/cvspart.cpp:208
-msgid "Make tag/branch"
-msgstr "加标签/分支"
-
-#: vcs/cvsservice/cvspart.cpp:209 vcs/cvsservice/cvspart.cpp:350
-msgid "<b>Make tag/branch</b><p>Tags/branches selected file(s)."
-msgstr "<b>加标签/分支</b><p>对所选择的文件加标签/分支。"
-
-#: vcs/cvsservice/cvspart.cpp:211
-#, fuzzy
-msgid "&Delete Tag"
-msgstr "删除页面"
-
-#: vcs/cvsservice/cvspart.cpp:213
-#, fuzzy
-msgid "Delete tag"
-msgstr "删除页面"
-
-#: vcs/cvsservice/cvspart.cpp:214 vcs/cvsservice/cvspart.cpp:352
-#, fuzzy
-msgid "<b>Delete tag</b><p>Delete tag from selected file(s)."
-msgstr "<b>删除标签/分支</b><p>对所选择的文件删除标签/分支。"
-
-#: vcs/cvsservice/cvspart.cpp:216
-msgid "&Ignore in CVS Operations"
-msgstr "在 CVS 操作中忽略(&I)"
-
-#: vcs/cvsservice/cvspart.cpp:218
-msgid "Ignore in CVS operations"
-msgstr "在 CVS 操作中忽略"
-
-#: vcs/cvsservice/cvspart.cpp:219 vcs/cvsservice/cvspart.cpp:360
-msgid ""
-"<b>Ignore in CVS operations</b>"
-"<p>Ignore file(s) by adding it to .cvsignore file."
-msgstr "<b>在 CVS 操作中忽略</b><p>将文件名放入 .cvsignore 文件，CVS 操作将忽略它们。"
-
-#: vcs/cvsservice/cvspart.cpp:221
-msgid "Do &Not Ignore in CVS Operations"
-msgstr "不在 CVS 操作中忽略(&N)"
-
-#: vcs/cvsservice/cvspart.cpp:223
-msgid "Do not ignore in CVS operations"
-msgstr "不在 CVS 操作中忽略"
-
-#: vcs/cvsservice/cvspart.cpp:224 vcs/cvsservice/cvspart.cpp:362
-msgid ""
-"<b>Do not ignore in CVS operations</b>"
-"<p>Do not ignore file(s) by removing\n"
-"it from .cvsignore file."
-msgstr "<b>不在 CVS 操作中忽略</b><p>将文件名从 .cvsignore 文件中删除，CVS 操作将不再忽略它们。"
-
-#: vcs/cvsservice/cvspart.cpp:226
-msgid "&Log to Server"
-msgstr "登录到服务器(&L)"
-
-#: vcs/cvsservice/cvspart.cpp:228
-msgid "Login to server"
-msgstr "登录到服务器"
-
-#: vcs/cvsservice/cvspart.cpp:229
-msgid "<b>Login to server</b><p>Logs in to the CVS server."
-msgstr "<b>登录到服务器</b><p>登录到 CVS 服务器。"
-
-#: vcs/cvsservice/cvspart.cpp:231
-msgid "L&ogout From Server"
-msgstr "退出服务器(&O)"
-
-#: vcs/cvsservice/cvspart.cpp:233
-msgid "Logout from server"
-msgstr "退出服务器"
-
-#: vcs/cvsservice/cvspart.cpp:234
-msgid "<b>Logout from server</b><p>Logs out from the CVS server."
-msgstr "<b>退出服务器</b><p>从 CVS 服务器退出。"
-
-#: vcs/cvsservice/cvspart.cpp:333
-#, fuzzy
-msgid "<b>Generate Annotate</b><p>Produces annotation output for this file."
-msgstr "<b>生成日志</b><p>生成此文件的日志。"
-
-#: vcs/cvsservice/cvspart.cpp:338
-msgid "<b>Mark as beeing edited</b><p>Mark the files as beeing edited."
-msgstr ""
-
-#: vcs/cvsservice/annotatepage.cpp:109
-#, fuzzy, c-format
-msgid "Annotate failed with exitStatus == %1"
-msgstr "日志失败，状态 %1"
-
-#: vcs/cvsservice/annotatepage.cpp:109
-#, fuzzy
-msgid "Annotate Failed"
-msgstr "日志失败"
-
-#: vcs/cvsservice/annotatepage.cpp:211
-#, fuzzy
-msgid "The selected revision does not exist."
-msgstr "这个扩展名的文件模板不存在。"
-
-#: vcs/cvsservice/cvsdiffpage.cpp:68
-msgid "Error: passed revisions are empty!"
-msgstr "错误：给出的版本号为空！"
-
-#: vcs/cvsservice/cvsdiffpage.cpp:101
-#, fuzzy
-msgid "An error occurred during diffing."
-msgstr "作比较时发生错误。"
-
-#: vcs/cvsservice/checkoutdialog.cpp:73
-msgid "CVS Checkout"
-msgstr "CVS 提取"
-
-#: vcs/cvsservice/checkoutdialog.cpp:263
-#, fuzzy
-msgid "Please, choose a valid working directory"
-msgstr "请选择一个工程目录"
-
-#: vcs/cvsservice/checkoutdialog.cpp:265
-msgid "Please, choose a CVS server."
-msgstr ""
-
-#: vcs/cvsservice/checkoutdialog.cpp:267
-msgid "Please, fill the CVS module field."
-msgstr ""
-
-#: vcs/cvsservice/commitdlg.cpp:67
-msgid ""
-"You are committing your changes without any comment. This is not a good "
-"practice. Continue anyway?"
-msgstr "您提交变更时没有给出任何注解。这不是一个好做法。您仍然要继续吗？"
-
-#: vcs/cvsservice/commitdlg.cpp:68
-msgid "CVS Commit Warning"
-msgstr "CVS 提交警告"
-
-#: vcs/cvsservice/commitdlg.cpp:70
-msgid "askWhenCommittingEmptyLogs"
-msgstr "无注解提交时询问"
-
-#: vcs/cvsservice/cvsprocesswidget.cpp:145
-#, fuzzy, c-format
-msgid "Started job: %1"
-msgstr "已开始的任务："
-
-#: vcs/cvsservice/cvsprocesswidget.cpp:167
-msgid "*** Job canceled by user request ***"
-msgstr "*** 任务已按用户请求取消 ***"
-
-#: vcs/cvsservice/cvsprocesswidget.cpp:189
-#, c-format
-msgid "Job finished with exitCode == %1"
-msgstr "任务完成，状态为 %1"
-
-#: vcs/cvsservice/cvsprocesswidget.cpp:193
-msgid "Done CVS command ..."
-msgstr "CVS 命令完成..."
-
-#: vcs/cvsservice/integrator/integratordlg.cpp:62
-#: vcs/cvsservice/integrator/integratordlg.cpp:82
-#: vcs/cvsservice/integrator/integratordlg.cpp:84
-#: vcs/cvsservice/integrator/integratordlg.cpp:129
-#: vcs/cvsservice/integrator/integratordlg.cpp:131
-#, fuzzy
-msgid "Init CVS Repository"
-msgstr "CVS 仓库(&R)："
-
-#: vcs/cvsservice/integrator/integratordlg.cpp:82
-msgid ""
-"cvs init did not exit normally. Please check if cvs is installed and works "
-"correctly."
-msgstr ""
-
-#: vcs/cvsservice/integrator/integratordlg.cpp:84
-msgid ""
-"cvs init exited with status %1. Please check if the cvs location is correct."
-msgstr ""
-
-#: vcs/cvsservice/integrator/integratordlg.cpp:129
-msgid ""
-"cvs import did not exit normally. Please check if cvs is installed and works "
-"correctly."
-msgstr ""
-
-#: vcs/cvsservice/integrator/integratordlg.cpp:131
-msgid ""
-"cvs import exited with status %1. Please check if the cvs location is correct."
-msgstr ""
-
-#: vcs/perforce/perforcepart.cpp:60 vcs/perforce/perforcepart.cpp:101
-msgid "<b>Edit</b><p>Opens file(s) in a client workspace for edit."
-msgstr "<b>编辑</b><p>在客户工作区打开文件进行编辑。"
-
-#: vcs/perforce/perforcepart.cpp:64 vcs/perforce/perforcepart.cpp:104
-msgid "<b>Revert</b><p>Discards changes made to open files."
-msgstr "<b>返转</b><p>放弃对打开的文件所作的修改。"
-
-#: vcs/perforce/perforcepart.cpp:65 vcs/perforce/perforcepart.cpp:67
-#: vcs/perforce/perforcepart.cpp:105
-msgid "Submit"
-msgstr "提交"
-
-#: vcs/perforce/perforcepart.cpp:68 vcs/perforce/perforcepart.cpp:107
-msgid "<b>Submit</b><p>Sends changes made to open files to the depot."
-msgstr "<b>提交</b><p>将打开的文件所作的修改发送给仓库。"
-
-#: vcs/perforce/perforcepart.cpp:69 vcs/perforce/perforcepart.cpp:71
-#: vcs/perforce/perforcepart.cpp:108
-msgid "Sync"
-msgstr "同步"
-
-#: vcs/perforce/perforcepart.cpp:72 vcs/perforce/perforcepart.cpp:110
-msgid "<b>Sync</b><p>Copies files from the depot into the workspace."
-msgstr "<b>同步</b><p>从仓库复制文件到工作区。"
-
-#: vcs/perforce/perforcepart.cpp:73 vcs/perforce/perforcepart.cpp:112
-msgid "Diff Against Repository"
-msgstr "和仓库作比较"
-
-#: vcs/perforce/perforcepart.cpp:75
-msgid "Diff against repository"
-msgstr "和仓库作比较"
-
-#: vcs/perforce/perforcepart.cpp:76 vcs/perforce/perforcepart.cpp:114
-msgid ""
-"<b>Diff against repository</b>"
-"<p>Compares a client workspace file to a revision in the depot."
-msgstr "<b>和仓库作比较</b><p>对客户工作区的文件和仓库里的某一版本作比较。"
-
-#: vcs/perforce/perforcepart.cpp:77 vcs/perforce/perforcepart.cpp:115
-msgid "Add to Repository"
-msgstr "添加到仓库"
-
-#: vcs/perforce/perforcepart.cpp:79
-msgid "Add to repository"
-msgstr "添加到仓库"
-
-#: vcs/perforce/perforcepart.cpp:80 vcs/perforce/perforcepart.cpp:117
-msgid ""
-"<b>Add to repository</b>"
-"<p>Open file(s) in a client workspace for addition to the depot."
-msgstr "<b>添加到仓库</b><p>在客户工作区打开文件，添加到仓库。"
-
-#: vcs/perforce/perforcepart.cpp:81 vcs/perforce/perforcepart.cpp:118
-msgid "Remove From Repository"
-msgstr "从仓库中删除"
-
-#: vcs/perforce/perforcepart.cpp:84 vcs/perforce/perforcepart.cpp:120
-msgid ""
-"<b>Remove from repository</b>"
-"<p>Open file(s) in a client workspace for deletion from the depot."
-msgstr "<b>从仓库中删除</b><p>在客户工作区打开文件，从仓库中删除。"
-
-#: vcs/perforce/perforcepart.cpp:121
-msgid "Perforce"
-msgstr "Perforce"
-
-#: vcs/perforce/perforcepart.cpp:132
-msgid "Cannot handle directories, please select single files"
-msgstr "无法处理目录，请选择单个文件"
-
-#: vcs/perforce/perforcepart.cpp:155
-msgid "Do you really want to revert the file %1 and lose all your changes?"
-msgstr "您真要将文件 %1 返转并丢失您所有的改变吗？"
-
-#: vcs/perforce/perforcepart.cpp:156
-#, fuzzy
-msgid "Do Not Revert"
-msgstr "返转"
-
-#: vcs/perforce/perforcepart.cpp:168
-msgid "Submitting of subdirectories is not supported"
-msgstr "不支持提交子目录。"
-
-#: vcs/perforce/perforcepart.cpp:258
-#, fuzzy
-msgid "P4 output errors during diff."
-msgstr "P4 在作比较时输出错误。"
-
-#: vcs/perforce/perforcepart.cpp:263
-#, fuzzy
-msgid "P4 output errors during diff. Do you still want to continue?"
-msgstr "P4 在作比较时输出错误。您仍然要继续吗？"
-
-#: vcs/perforce/perforcepart.cpp:270
-msgid "No Differences Found"
-msgstr "未发现差别"
-
-#: vcs/perforce/commitdlg.cpp:32
-msgid "Perforce Submit"
-msgstr "Perforce 提交"
-
-#: vcs/perforce/commitdlg.cpp:42
-msgid "&Enter description:"
-msgstr "输入描述(&E)："
-
-#: vcs/perforce/commitdlg.cpp:54
-msgid "C&lient:"
-msgstr "客户(&L)："
-
-#: vcs/perforce/commitdlg.cpp:58
-msgid "&User:"
-msgstr "用户(&U)："
-
-#: vcs/perforce/commitdlg.cpp:62
-msgid "&File(s):"
-msgstr "文件(&F)："
-
-#: vcs/perforce/commitdlg.cpp:147
-msgid "Please enter the P4 client name."
-msgstr "请输入 P4 客户名。"
-
-#: vcs/perforce/commitdlg.cpp:151
-msgid "Please enter the P4 user."
-msgstr "请输入 P4 用户。"
-
-#: vcs/perforce/commitdlg.cpp:155
-#, fuzzy
-msgid "The changelist does not contain any files."
-msgstr "变更列表未包括任何文件。"
-
-#: parts/diff/diffwidget.cpp:93 parts/diff/diffwidget.cpp:326
-#: parts/outputviews/appoutputwidget.cpp:271
-#, fuzzy
-msgid "Hide view"
-msgstr "新建视图"
-
-#: parts/diff/diffpart.cpp:53
-#, fuzzy
-msgid "Diff Output"
-msgstr "GDB 输出"
-
-#: parts/diff/diffpart.cpp:54
-#, fuzzy
-msgid ""
-"<b>Difference viewer</b>"
-"<p>Shows output of the diff format. Can utilize every installed component that "
-"is able to show diff output. For example if you have Kompare installed, "
-"Difference Viewer can use its graphical diff view."
-msgstr ""
-"<b>差异查看器</b>"
-"<p>按格式显示输出的差别。它能使用任何显示差别输出的组件。例如，如果您安装了 Kompare，差异查看器能用它显示图形化的差异视图。"
-
-#: parts/diff/diffpart.cpp:57
-msgid "Output of the diff command"
-msgstr "比较命令的输出"
-
-#: parts/diff/diffpart.cpp:60
-msgid "Difference Viewer..."
-msgstr "差异查看器..."
-
-#: parts/diff/diffpart.cpp:63
-msgid "Difference viewer"
-msgstr "差异查看器"
-
-#: parts/diff/diffpart.cpp:64
-msgid "<b>Difference viewer</b><p>Shows the contents of a patch file."
-msgstr "<b>差异查看器</b><p>显示补丁文件的内容。"
-
-#: parts/diff/diffpart.cpp:123
-#, fuzzy
-msgid "Difference to Disk File"
-msgstr "和保存的文件的差异"
-
-#: parts/diff/diffpart.cpp:125
-#, fuzzy
-msgid ""
-"<b>Difference to disk file</b>"
-"<p>Shows the difference between the file contents in this editor and the file "
-"contents on disk."
-msgstr "<b>和保存的文件的差异</b><p>显示编辑器里的文件内容和磁盘上保存的文件内容之间的差异。"
-
-#: parts/diff/diffpart.cpp:168
-msgid "Could not invoke the \"diff\" command."
-msgstr "无法运行“diff”命令。"
-
-#: parts/diff/diffpart.cpp:181
-msgid "DiffPart: No differences found."
-msgstr "比较组件：未发现差异。"
-
-#: parts/diff/diffpart.cpp:185
-msgid ""
-"Diff command failed (%1):\n"
-msgstr ""
-"比较命令失败(%1)：\n"
-
-#: parts/diff/diffpart.cpp:240
-msgid "Please Select Patch File"
-msgstr "请选择补丁文件"
-
-#: parts/diff/diffdlg.cpp:20
-msgid "Difference Viewer"
-msgstr "差异查看器"
-
-#: parts/partexplorer/partexplorerform.cpp:49
-msgid "Name: %1 | Type: %2 | Value: %3"
-msgstr "名称：%1 | 类型：%2 | 值：%3"
-
-#: parts/partexplorer/partexplorerform.cpp:112
-msgid "Part Explorer - A Services Lister"
-msgstr "组件浏览器 - 服务列表"
-
-#: parts/partexplorer/partexplorerform.cpp:122
-msgid ""
-"<b>Matching services</b>"
-"<p>Results (if any) are shown grouped by matching service name."
-msgstr "<b>匹配服务</b><p>输出结果(若存在)按匹配的服务名称分组显示。"
-
-#: kdevdesigner/designer/mainwindowactions.cpp:310
-#: parts/partexplorer/partexplorerform.cpp:129
-msgid "&Search"
-msgstr "搜索(&S)"
-
-#: parts/partexplorer/partexplorerform.cpp:181
-msgid "Unknown error."
-msgstr "未知错误。"
-
-#: parts/partexplorer/partexplorerform.cpp:194
-#, fuzzy
-msgid "No service found matching the criteria."
-msgstr "未找到和规则相匹配的服务！"
-
-#: parts/partexplorer/partexplorer_plugin.cpp:43
-msgid "&Part Explorer"
-msgstr "组件浏览器(&P)"
-
-#: parts/partexplorer/partexplorer_plugin.cpp:45
-msgid "TDETrader query execution"
-msgstr "TDETrader 查询执行"
-
-#: parts/partexplorer/partexplorer_plugin.cpp:46
-msgid ""
-"<b>Part explorer</b>"
-"<p>Shows a dialog for TDETrader query execution. Search your TDE documentation "
-"for more information about TDE services and TDETrader."
-msgstr ""
-"<b>组件浏览器</b>"
-"<p>显示一个执行 TDETrader 查询的对话框。关于 TDE 服务和 TDETrader 的更多信息请您在 TDE 文档中查找。"
-
-#: parts/replace/replace_part.cpp:43
-msgid ""
-"<b>Replace</b>"
-"<p>This window shows a preview of a string replace operation. Uncheck a line to "
-"exclude that replacement. Uncheck a file to exclude the whole file from the "
-"operation. Clicking on a line in the list will automatically open the "
-"corresponding source file and set the cursor to the line with the match."
-msgstr ""
-"<b>替换</b>"
-"<p>此窗口显示字符串替换操作的预览。不选中某行可以不执行该替换。不选中某文件可以对整个文件都不作替换。点击某行将自动打开相应的源代码文件，并将光标置于匹配的行"
-"上。"
-
-#: parts/replace/replace_part.cpp:52 parts/replace/replace_part.cpp:57
-msgid "Project wide string replacement"
-msgstr "工程范围的字符串替换"
-
-#: parts/replace/replace_part.cpp:55
-msgid "Find-Select-Replace..."
-msgstr "查找-选择-替换..."
-
-#: parts/replace/replace_part.cpp:58
-msgid ""
-"<b>Find-Select-Replace</b>"
-"<p>Opens the project wide string replacement dialog. There you can enter a "
-"string or a regular expression which is then searched for within all files in "
-"the locations you specify. Matches will be displayed in the <b>Replace</b> "
-"window, you can replace them with the specified string, exclude them from "
-"replace operation or cancel the whole replace."
-msgstr ""
-"<b>查找-选择-替换</b>打开工程范围字符串替换对话框。您可以输入字符串或者正则表达式，然后在您指定位置的所有文件中进行查找。匹配结果将在<b>替换</b>"
-"窗口中显示，您可以用指定的字符串替换它们，不进行某些替换操作，或者完全取消替换操作。"
-
-#: parts/replace/replace_part.cpp:102
-#, fuzzy, c-format
-msgid "Replace Project Wide: %1"
-msgstr "相对于工程文件"
-
-#: parts/replace/replace_part.cpp:104
+#: parts/openwith/openwithpart.cpp:53
 #, fuzzy
 msgid ""
-"<b>Replace Project Wide</b>"
-"<p>Opens the find in files dialog and sets the pattern to the text under the "
-"cursor."
-msgstr "<b>Grep</b><p>在文件对话框里打开查找功能，并将光标下的文本作为查找模板。"
-
-#: parts/tools/toolsconfigwidget.cpp:130
-msgid "An entry with this title exists already."
-msgstr "这个标题的项目已经存在。"
-
-#: parts/tools/toolsconfigwidget.cpp:170
-msgid "Add to Tools Menu"
-msgstr "添加到工具菜单"
-
-#: parts/tools/toolsconfigwidget.cpp:197
-msgid "Add to File Context Menus"
-msgstr "添加到文件环境菜单"
-
-#: parts/tools/toolsconfigwidget.cpp:225
-msgid "Add to Directory Context Menus"
-msgstr "添加到目录环境菜单"
-
-#: parts/tools/toolsconfig.cpp:40
-msgid "&Applications:"
-msgstr "应用程序(&A)："
-
-#: parts/tools/toolsconfig.cpp:63
-msgid "&Tools menu:"
-msgstr "工具菜单(&T)："
-
-#: parts/tools/kapplicationtree.cpp:137
-msgid "Known Applications"
-msgstr "已知应用程序"
-
-#: parts/tools/tools_part.cpp:48
-msgid "Tools Menu"
-msgstr "工具菜单"
-
-#: parts/quickopen/quickopenclassdialog.cpp:42
-msgid "Class &list:"
-msgstr "类列表(&L)："
-
-#: parts/quickopen/quickopenclassdialog.cpp:81
-#, fuzzy, c-format
-msgid "Select The Location of Class %1"
-msgstr "选择连接工具"
-
-#: parts/quickopen/quickopen_part.cpp:58
-msgid "Quick Open File..."
-msgstr "快速打开文件..."
-
-#: parts/quickopen/quickopen_part.cpp:61
-msgid "Quick open file in project"
-msgstr "快速打开工程中的文件"
-
-#: parts/quickopen/quickopen_part.cpp:62
-msgid ""
-"<b>Quick open</b>"
-"<p>Provides a file name input form with completion listbox to quickly open file "
-"in a project."
-msgstr "<b>快速打开</b><p>提供一个具有补全功能的文件名输入表格，以便快速打开工程中的文件。"
-
-#: parts/quickopen/quickopen_part.cpp:64
-msgid "Quick Open Class..."
-msgstr "快速打开类..."
+"<b>Open As</b>"
+"<p>Lists all encodings that can be used to open the selected file."
+msgstr "<b>打开方式</b><p>列出能用来打开所选择文件的所有应用程序。"
 
-#: parts/quickopen/quickopen_part.cpp:67
-msgid "Find class in project"
-msgstr "在工程中查找类"
+#: parts/openwith/openwithpart.cpp:82
+msgid "Open With"
+msgstr "打开方式"
 
-#: parts/quickopen/quickopen_part.cpp:68
+#: parts/openwith/openwithpart.cpp:83
 msgid ""
-"<b>Find class</b>"
-"<p>Provides a class name input form with completion listbox to quickly open a "
-"file where the class is defined."
-msgstr "<b>类查找</b><p>提供一个具有补全功能的类名输入表格，以便快速打开定义该类的文件。"
-
-#: parts/quickopen/quickopen_part.cpp:70
-msgid "Quick Open Method..."
-msgstr "快速打开方法..."
-
-#: parts/quickopen/quickopen_part.cpp:71
-msgid "Quick open function in project"
-msgstr "快速打开工程中的函数"
-
-#: parts/quickopen/quickopen_part.cpp:73
-msgid "Switch To..."
-msgstr "切换到..."
+"<b>Open With</b>"
+"<p>Lists all applications that can be used to open the selected file."
+msgstr "<b>打开方式</b><p>列出能用来打开所选择文件的所有应用程序。"
 
-#: parts/quickopen/quickopen_part.cpp:74
-msgid "Switch to"
-msgstr "切换到"
+#: parts/openwith/openwithpart.cpp:88
+msgid "Open With..."
+msgstr "打开方式..."
 
-#: parts/quickopen/quickopen_part.cpp:75
+#: parts/openwith/openwithpart.cpp:89
 msgid ""
-"<b>Switch to</b>"
-"<p>Prompts to enter the name of previously opened file to switch to."
-msgstr "<b>切换到</b><p>询问并切换到以前打开的文件。"
-
-#: parts/quickopen/quickopenfunctionchooseform.cpp:34
-#, c-format
-msgid "Select One Argument or File of Function %1"
-msgstr ""
-
-#: parts/quickopen/quickopenfunctiondialog.cpp:45
-msgid "Function &name:"
-msgstr "函数名称(&N)："
-
-#: parts/quickopen/quickopenfunctiondialog.cpp:46
-msgid "Function &list:"
-msgstr "函数列表(&L)："
-
-#: parts/quickopen/quickopenfunctiondialog.cpp:136
-msgid "Error: cannot find matching name function."
-msgstr ""
+"<b>Open With...</b>"
+"<p>Provides a dialog to choose the application to open the selected file."
+msgstr "<b>打开方式......</b><p>提供一个对话框选择用来打开所选择文件的应用程序。"
 
 #: parts/grepview/grepviewwidget.cpp:137 parts/grepview/grepviewwidget.cpp:460
 msgid "Search Results"
@@ -20874,103 +17958,414 @@ msgstr "您可以从组合框中选择一个模板样板并编辑它。样板中
 msgid "Please enter a search pattern"
 msgstr "请输入一个搜索模板"
 
-#: parts/doxygen/input.cpp:223 parts/doxygen/input.cpp:366
-msgid "Browse to a file"
-msgstr "浏览一个文件"
-
-#: parts/doxygen/input.cpp:223 parts/doxygen/input.cpp:372
-msgid "Browse to a folder"
-msgstr "浏览一个文件夹"
+#: parts/valgrind/valgrind_part.cpp:49
+#, fuzzy
+msgid "Valgrind Output"
+msgstr "打开 Valgrind 输出"
 
-#: parts/doxygen/input.cpp:341
-msgid "Add item"
-msgstr "添加项目"
+#: parts/valgrind/valgrind_part.cpp:51
+#, fuzzy
+msgid ""
+"<b>Valgrind</b>"
+"<p>Shows the output of the valgrind. Valgrind detects"
+"<br>use of uninitialized memory"
+"<br>reading/writing memory after it has been free'd"
+"<br>reading/writing off the end of malloc'd blocks"
+"<br>reading/writing inappropriate areas on the stack"
+"<br>memory leaks -- where pointers to malloc'd blocks are lost forever"
+"<br>passing of uninitialised and/or unaddressable memory to system calls"
+"<br>mismatched use of malloc/new/new [] vs free/delete/delete []"
+"<br>some abuses of the POSIX pthread API."
+msgstr ""
+"<b>Valgrind</b>"
+"<p>显示 Valgrind 的输出。Valgrind 能检测"
+"<br>使用未初始化的内存"
+"<br>在内存释放后进行读/写"
+"<br>读写超越 malloc 分配的内存块"
+"<br>读写堆栈中不适当的区域"
+"<br>内存泄露 - malloc 分配的指针永远丢失的问题"
+"<br>传递未初始化和/或不可访问的内存给系统调用"
+"<br>对 malloc/new/new [] 和 free/delete/delete [] 的使用不配对"
+"<br>一些对 POSIX pthread API 的不当使用。"
 
-#: parts/doxygen/input.cpp:346
-msgid "Delete selected item"
-msgstr "删除选中的项目"
+#: parts/valgrind/valgrind_part.cpp:61
+msgid "&Valgrind Memory Leak Check"
+msgstr "Valgrind 内存泄露检查(&V)"
 
-#: parts/doxygen/input.cpp:351
-msgid "Update selected item"
-msgstr "更新选中的项目"
+#: parts/valgrind/valgrind_part.cpp:63 parts/valgrind/valgrind_part.cpp:71
+msgid "Valgrind memory leak check"
+msgstr "Valgrind 内存泄露检查"
 
-#: parts/doxygen/doxygenconfigwidget.cpp:258 parts/doxygen/doxygenpart.cpp:205
-msgid "Cannot write Doxyfile."
-msgstr "无法写入 Doxyfile。"
+#: parts/valgrind/valgrind_part.cpp:64
+msgid ""
+"<b>Valgrind memory leak check</b>"
+"<p>Runs Valgrind - a tool to help you find memory-management problems in your "
+"programs."
+msgstr "<b>Valgrind 内存泄露检查</b><p>运行 Valgrind - 一个帮助您发现程序中内存管理问题的工具。"
 
-#: parts/doxygen/doxygenpart.cpp:61
-msgid "Build API Documentation"
-msgstr "构建 API 文档"
+#: parts/valgrind/valgrind_part.cpp:66
+#, fuzzy
+msgid "P&rofile with KCachegrind"
+msgstr "要打开的配置文件"
 
-#: parts/doxygen/doxygenpart.cpp:64
-msgid "Build API documentation"
-msgstr "构建 API 文档"
+#: parts/valgrind/valgrind_part.cpp:68
+#, fuzzy
+msgid "Profile with KCachegrind"
+msgstr "要打开的配置文件"
 
-#: parts/doxygen/doxygenpart.cpp:65
+#: parts/valgrind/valgrind_part.cpp:69
 msgid ""
-"<b>Build API documentation</b>"
-"<p>Runs doxygen on a project Doxyfile to generate API documentation. If the "
-"search engine is enabled in Doxyfile, this also runs doxytag to create it."
+"<b>Profile with KCachegrind</b>"
+"<p>Runs your program in calltree and then displays profiler information in "
+"KCachegrind."
 msgstr ""
-"<b>构建 API 文档</b>"
-"<p>用工程的 Doxyfile 文件运行 doxygen，生成 API 文档。如果 Doxyfile 文件启用搜索引擎，则将运行 doxytag 创建它。"
 
-#: parts/doxygen/doxygenpart.cpp:68
-msgid "Clean API Documentation"
-msgstr "清除 API 文档"
+#: parts/valgrind/valgrind_part.cpp:90
+msgid "Open Valgrind Output"
+msgstr "打开 Valgrind 输出"
 
-#: parts/doxygen/doxygenpart.cpp:71
-msgid "Clean API documentation"
-msgstr "清除 API 文档"
+#: parts/valgrind/valgrind_part.cpp:96
+#, c-format
+msgid "Could not open valgrind output: %1"
+msgstr "无法打开 Valgrind 输出：%1"
 
-#: parts/doxygen/doxygenpart.cpp:72
+#: parts/valgrind/valgrind_part.cpp:217
+msgid "There is already an instance of valgrind running."
+msgstr "当前已经有一个 valgrind 进程在运行。"
+
+#: parts/valgrind/valgrind_dialog.cpp:20
+msgid "Valgrind Memory Check"
+msgstr "Valgrind 内存检查"
+
+#: parts/valgrind/valgrind_dialog.cpp:80
+#: parts/valgrind/valgrind_dialog.cpp:140
 msgid ""
-"<b>Clean API documentation</b>"
-"<p>Removes all generated by doxygen files."
-msgstr "<b>清除 API 文档</b><p>删除所有doxygen 生成的文件。"
+"Could not find valgrind in your $PATH. Please make sure it is installed "
+"properly."
+msgstr "在您的 $PATH 中无法找到 valgrind，请确保它已经正确安装。"
 
-#: parts/doxygen/doxygenpart.cpp:77
-msgid "Doxygen"
-msgstr "Doxygen"
+#: parts/valgrind/valgrind_dialog.cpp:82
+#: parts/valgrind/valgrind_dialog.cpp:142
+msgid "Valgrind Not Found"
+msgstr "未找到 Valgrind"
 
-#: parts/doxygen/doxygenpart.cpp:81
-msgid "Document Current Function"
-msgstr "给当前函数编文档"
+#: parts/valgrind/valgrind_dialog.cpp:185
+#, fuzzy
+msgid ""
+"Could not find tdecachegrind in your $PATH. Please make sure it is installed "
+"properly."
+msgstr "在您的 $PATH 中无法找到 valgrind，请确保它已经正确安装。"
 
-#: parts/doxygen/doxygenpart.cpp:82
+#: parts/valgrind/valgrind_dialog.cpp:187
 #, fuzzy
-msgid "Create a documentation template above a function"
-msgstr "显示 Perl 函数的文档页"
+msgid "KCachegrind Not Found"
+msgstr "未找到 Valgrind"
 
-#: parts/doxygen/doxygenpart.cpp:83
+#: parts/valgrind/valgrind_widget.cpp:95
+msgid "No."
+msgstr "编号"
+
+#: kdevdesigner/designer/outputwindow.cpp:84
+#: parts/valgrind/valgrind_widget.cpp:97
+msgid "Message"
+msgstr "消息"
+
+#: parts/valgrind/valgrind_widget.cpp:104
+msgid "&Open Valgrind Output..."
+msgstr "打开 Valgrind 输出(&O)..."
+
+#: parts/valgrind/valgrind_widget.cpp:106
+msgid "Expand All Items"
+msgstr "展开所有项目"
+
+#: parts/valgrind/valgrind_widget.cpp:107
+msgid "Collapse All Items"
+msgstr "折叠所有项目"
+
+#: parts/konsole/konsoleviewpart.cpp:38
 msgid ""
-"<b>Document Current Function</b>"
-"<p>Creates a documentation template according to a function's signature above a "
-"function definition/declaration."
+"<b>Konsole</b>"
+"<p>This window contains an embedded konsole window. It will try to follow you "
+"when you navigate in the source directories"
+msgstr "<b>Konsole</b><p>这个窗口包含一个内嵌的 konsole 终端窗口，您浏览源文件目录时它将跟随您的目录。"
+
+#: parts/konsole/konsoleviewpart.cpp:44 parts/konsole/konsoleviewpart.cpp:49
+msgid "Konsole"
+msgstr "Konsole"
+
+#: parts/konsole/konsoleviewpart.cpp:49
+msgid "Embedded console window"
+msgstr "内嵌终端窗口"
+
+#: parts/replace/replace_part.cpp:43
+msgid ""
+"<b>Replace</b>"
+"<p>This window shows a preview of a string replace operation. Uncheck a line to "
+"exclude that replacement. Uncheck a file to exclude the whole file from the "
+"operation. Clicking on a line in the list will automatically open the "
+"corresponding source file and set the cursor to the line with the match."
 msgstr ""
+"<b>替换</b>"
+"<p>此窗口显示字符串替换操作的预览。不选中某行可以不执行该替换。不选中某文件可以对整个文件都不作替换。点击某行将自动打开相应的源代码文件，并将光标置于匹配的行"
+"上。"
 
-#: parts/doxygen/doxygenpart.cpp:87
-msgid "Preview Doxygen Output"
+#: parts/replace/replace_part.cpp:52 parts/replace/replace_part.cpp:57
+msgid "Project wide string replacement"
+msgstr "工程范围的字符串替换"
+
+#: parts/replace/replace_part.cpp:55
+msgid "Find-Select-Replace..."
+msgstr "查找-选择-替换..."
+
+#: parts/replace/replace_part.cpp:58
+msgid ""
+"<b>Find-Select-Replace</b>"
+"<p>Opens the project wide string replacement dialog. There you can enter a "
+"string or a regular expression which is then searched for within all files in "
+"the locations you specify. Matches will be displayed in the <b>Replace</b> "
+"window, you can replace them with the specified string, exclude them from "
+"replace operation or cancel the whole replace."
 msgstr ""
+"<b>查找-选择-替换</b>打开工程范围字符串替换对话框。您可以输入字符串或者正则表达式，然后在您指定位置的所有文件中进行查找。匹配结果将在<b>替换</b>"
+"窗口中显示，您可以用指定的字符串替换它们，不进行某些替换操作，或者完全取消替换操作。"
 
-#: parts/doxygen/doxygenpart.cpp:88
-msgid "Show a preview of the Doxygen output of this file"
+#: parts/replace/replace_part.cpp:102
+#, fuzzy, c-format
+msgid "Replace Project Wide: %1"
+msgstr "相对于工程文件"
+
+#: parts/replace/replace_part.cpp:104
+#, fuzzy
+msgid ""
+"<b>Replace Project Wide</b>"
+"<p>Opens the find in files dialog and sets the pattern to the text under the "
+"cursor."
+msgstr "<b>Grep</b><p>在文件对话框里打开查找功能，并将光标下的文本作为查找模板。"
+
+#: parts/fileselector/fileselector_widget.cpp:188
+msgid "Current Document Directory"
+msgstr "当前文档目录"
+
+#: parts/fileselector/fileselector_widget.cpp:217
+msgid ""
+"<p>Here you can enter a path for a directory to display."
+"<p>To go to a directory previously entered, press the arrow on the right and "
+"choose one. "
+"<p>The entry has directory completion. Right-click to choose how completion "
+"should behave."
 msgstr ""
+"<p>在此您可以输入要显示的目录路径。"
+"<p>点击右侧的箭头，可以选择以前输入的目录。"
+"<p>此输入具有目录补全功能，右键单击可以选择如何进行补全。"
 
-#: parts/doxygen/doxygenpart.cpp:89
+#: parts/fileselector/fileselector_widget.cpp:223
 msgid ""
-"<b>Preview Doxygen output</b>"
-"<p>Runs Doxygen over the current file and shows the created index.html."
+"<p>Here you can enter a name filter to limit which files are displayed."
+"<p>To clear the filter, toggle off the filter button to the left."
+"<p>To reapply the last filter used, toggle on the filter button."
+msgstr "<p>在此您可以输入名字过滤器，限制要显示的文件。<p>关闭左侧的过滤器按钮可以清除过滤器。<p>启用过滤器按钮可以再次应用上次的过滤器。"
+
+#: parts/fileselector/fileselector_widget.cpp:228
+#: parts/fileview/partwidget.cpp:75
+msgid ""
+"<p>This button clears the name filter when toggled off, or reapplies the last "
+"filter used when toggled on."
+msgstr "<p>关闭这个按钮可以清除名字过滤器，启用它可以再次应用上次的过滤器。"
+
+#: parts/fileselector/fileselector_widget.cpp:355
+#: parts/fileview/partwidget.cpp:104
+msgid "Apply last filter (\"%1\")"
+msgstr "应用上次的过滤器(“%1”)"
+
+#: parts/fileselector/fileselector_widget.cpp:366
+#: parts/fileview/partwidget.cpp:109 parts/outputviews/appoutputwidget.cpp:265
+msgid "Clear filter"
+msgstr "清除过滤器"
+
+#: parts/fileselector/fileselector_widget.cpp:588
+msgid "Toolbar"
+msgstr "工具栏"
+
+#: parts/fileselector/fileselector_widget.cpp:590
+msgid "A&vailable actions:"
+msgstr "可用的动作(&V)："
+
+#: parts/fileselector/fileselector_widget.cpp:591
+msgid "S&elected actions:"
+msgstr "所选择的动作(&E)："
+
+#: parts/fileselector/fileselector_widget.cpp:599
+msgid "Auto Synchronization"
+msgstr "自动同步"
+
+#: parts/fileselector/fileselector_widget.cpp:600
+msgid "When a docu&ment becomes active"
+msgstr "当文档激活时(&M)"
+
+#: parts/fileselector/fileselector_widget.cpp:601
+msgid "When a document is o&pened"
+msgstr "当文档打开时(&P)"
+
+#: parts/fileselector/fileselector_widget.cpp:602
+msgid "When the file selector becomes visible"
+msgstr "当文件选择器出现时"
+
+#: parts/fileselector/fileselector_widget.cpp:610
+msgid "Remember &locations:"
+msgstr "记住位置(&L)："
+
+#: parts/fileselector/fileselector_widget.cpp:617
+msgid "Remember &filters:"
+msgstr "记住过滤器(&L)："
+
+#: parts/fileselector/fileselector_widget.cpp:624
+msgid "Session"
+msgstr "会话"
+
+#: parts/fileselector/fileselector_widget.cpp:625
+msgid "Restore loca&tion"
+msgstr "恢复位置(&T)"
+
+#: parts/fileselector/fileselector_widget.cpp:626
+msgid "Restore last f&ilter"
+msgstr "恢复上次的过滤器(&I)"
+
+#: parts/fileselector/fileselector_widget.cpp:646
+msgid ""
+"<p>Decides how many locations to keep in the history of the location combo box"
+msgstr "<p>确定在位置组合框历史中保留多少位置项目"
+
+#: parts/fileselector/fileselector_widget.cpp:653
+msgid ""
+"<p>Decides how many filters to keep in the history of the filter combo box"
+msgstr "<p>确定在过滤器组合框历史中保留多少过滤器"
+
+#: parts/fileselector/fileselector_widget.cpp:660
+msgid ""
+"<p>These options allow you to have the File Selector automatically change "
+"location to the directory of the active document on certain events."
+"<p>Auto synchronization is <em>lazy</em>, meaning it will not take effect until "
+"the file selector is visible."
+"<p>None of these are enabled by default, but you can always sync the location "
+"by pressing the sync button in the toolbar."
 msgstr ""
+"<p>这些选项能在特定事件发生时将文件选择器自动改变到激活的文档所在的目录。"
+"<p>自动同步具有<em>惰性</em>，就是说它只有在文件选择器成为可见时才会起作用。"
+"<p>这些功能默认都未被启用，但您随时可以点击工具栏上的同步按钮进行同步。"
 
-#: parts/doxygen/doxygenpart.cpp:370
-msgid "Another process is still running. Please wait until it's finished."
+#: parts/fileselector/fileselector_widget.cpp:671
+msgid ""
+"<p>If this option is enabled (default), the location will be restored when you "
+"start KDev."
+"<p><strong>Note</strong> that if the session is handled by the TDE session "
+"manager, the location is always restored."
 msgstr ""
+"<p>如果启用此选项(默认)，当您启动 KDevelop 时目录位置将自动恢复。"
+"<p><strong>注意</strong>如果会话时由 TDE 会话管理器处理的，目录位置将总是被恢复。"
 
-#: parts/doxygen/doxygenpart.cpp:451
+#: parts/fileselector/fileselector_widget.cpp:676
+msgid ""
+"<p>If this option is enabled (default), the current filter will be restored "
+"when you start KDev."
+"<p><strong>Note</strong> that if the session is handled by the TDE session "
+"manager, the filter is always restored."
+"<p><strong>Note</strong> that some of the autosync settings may override the "
+"restored location if on."
+msgstr ""
+"<p>如果启用此选项(默认)，当您启动 KDevelop 时当前过滤器将自动恢复。"
+"<p><strong>注意</strong>如果会话时由 TDE 会话管理器处理的，当前过滤器将总是被恢复。"
+"<p><strong>Note</strong>有些自动同步设置如果启用的话会取代恢复的目录位置。"
+
+#: parts/fileselector/fileselector_part.cpp:50
+#: parts/fileselector/fileselector_part.cpp:52
+#: parts/fileselector/fileselector_part.cpp:85
+msgid "File Selector"
+msgstr "文件选择器"
+
+#: parts/fileselector/fileselector_part.cpp:52
+msgid "File selector"
+msgstr "文件选择器"
+
+#: parts/fileselector/fileselector_part.cpp:53
+msgid ""
+"<b>File selector</b>"
+"<p>This file selector lists directory contents and provides some file "
+"management functions."
+msgstr "<b>文件选择器</b><p>文件选择器列出目录内容并提供一些文件管理功能。"
+
+#: buildtools/script/scriptprojectpart.cpp:53
+#: parts/fileselector/fileselector_part.cpp:57
+msgid "New File..."
+msgstr "新建文件..."
+
+#: parts/filecreate/filecreate_part.cpp:184
+#: parts/fileselector/fileselector_part.cpp:99
+msgid "Cannot create file. Check whether the directory and filename are valid."
+msgstr ""
+
+#: parts/fileselector/tdeactionselector.cpp:70
+msgid "&Available:"
+msgstr "可用的(&A)："
+
+#: parts/fileselector/tdeactionselector.cpp:85
+msgid "&Selected:"
+msgstr "所选择的(&S)："
+
+#: parts/vcsmanager/vcsmanagerpart.cpp:60
+msgid "Version Control"
+msgstr "版本控制"
+
+#: parts/vcsmanager/vcsmanagerprojectconfig.cpp:49
+msgid ""
+"_: No Version Control System\n"
+"None"
+msgstr "无"
+
+#: parts/bookmarks/bookmarks_widget.cpp:270
+msgid ", line "
+msgstr ", 行 "
+
+#: parts/bookmarks/bookmarks_widget.cpp:273
+msgid "Remove This Bookmark"
+msgstr "删除这个书签"
+
+#: parts/bookmarks/bookmarks_widget.cpp:277
+msgid ", All"
+msgstr ", 所有的"
+
+#: parts/bookmarks/bookmarks_widget.cpp:278
+msgid "Remove These Bookmarks"
+msgstr "删除这些书签"
+
+#: parts/bookmarks/bookmarks_widget.cpp:283
 #, fuzzy
-msgid "Cannot create temporary file '%1'"
-msgstr "无法创建标记文件"
+msgid "Collapse All"
+msgstr "折叠所有项目"
+
+#: parts/bookmarks/bookmarks_widget.cpp:284
+#, fuzzy
+msgid "Expand All"
+msgstr "展开所有项目"
+
+#: parts/bookmarks/bookmarks_part.cpp:59
+msgid ""
+"<b>Bookmarks</b>"
+"<p>The bookmark viewer shows all the source bookmarks in the project."
+msgstr "<b>书签</b><p>书签浏览器显示工程中的所有源代码书签。"
+
+#: parts/bookmarks/bookmarks_part.cpp:62
+msgid "Source bookmarks"
+msgstr "源代码书签"
+
+#: parts/bookmarks/bookmarks_part.cpp:558
+#, fuzzy
+msgid "Could not find file"
+msgstr "无法找到插件"
+
+#: parts/doxygen/messages.cpp:29
+#: src/profileengine/editor/profileeditor.cpp:141
+msgid "Project"
+msgstr "工程"
 
 #: parts/doxygen/messages.cpp:30
 msgid "Project name"
@@ -21736,928 +19131,559 @@ msgstr "到 doxysearch 执行文件的绝对路径"
 msgid "Paths to external documentation"
 msgstr "到外部文档的路径"
 
-#: parts/konsole/konsoleviewpart.cpp:38
-msgid ""
-"<b>Konsole</b>"
-"<p>This window contains an embedded konsole window. It will try to follow you "
-"when you navigate in the source directories"
-msgstr "<b>Konsole</b><p>这个窗口包含一个内嵌的 konsole 终端窗口，您浏览源文件目录时它将跟随您的目录。"
-
-#: parts/konsole/konsoleviewpart.cpp:44 parts/konsole/konsoleviewpart.cpp:49
-msgid "Konsole"
-msgstr "Konsole"
-
-#: parts/konsole/konsoleviewpart.cpp:49
-msgid "Embedded console window"
-msgstr "内嵌终端窗口"
-
-#: parts/distpart/distpart_widget.cpp:134
-msgid "Building Package"
-msgstr "构建包"
-
-#: parts/distpart/distpart_widget.cpp:145
-#, c-format
-msgid "Adding file: %1"
-msgstr "添加文件：%1"
+#: parts/doxygen/input.cpp:223 parts/doxygen/input.cpp:366
+msgid "Browse to a file"
+msgstr "浏览一个文件"
 
-#: parts/distpart/distpart_widget.cpp:152
-#, c-format
-msgid "Archive made at: %1"
-msgstr ""
+#: parts/doxygen/input.cpp:223 parts/doxygen/input.cpp:372
+msgid "Browse to a folder"
+msgstr "浏览一个文件夹"
 
-#: parts/distpart/distpart_widget.cpp:152
-msgid "Archive Done"
-msgstr "存档完成"
+#: parts/doxygen/input.cpp:341
+msgid "Add item"
+msgstr "添加项目"
 
-#: parts/distpart/distpart_widget.cpp:595
-#, fuzzy, c-format
-msgid "Remove %1"
-msgstr "删除(&M)"
+#: parts/doxygen/input.cpp:346
+msgid "Delete selected item"
+msgstr "删除选中的项目"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1796
-#: buildtools/qmake/trollprojectwidget.cpp:1937
-#: parts/distpart/distpart_widget.cpp:595
-msgid "Remove File"
-msgstr "删除文件"
+#: parts/doxygen/input.cpp:351
+msgid "Update selected item"
+msgstr "更新选中的项目"
 
-#: parts/distpart/distpart_part.cpp:48
-msgid "Distribution && Publishing"
-msgstr "分发和发布"
+#: parts/doxygen/doxygenpart.cpp:61
+msgid "Build API Documentation"
+msgstr "构建 API 文档"
 
-#: parts/distpart/distpart_part.cpp:52
-msgid "Make source and binary distribution"
-msgstr "制做源代码和执行码发行版"
+#: parts/doxygen/doxygenpart.cpp:64
+msgid "Build API documentation"
+msgstr "构建 API 文档"
 
-#: parts/distpart/distpart_part.cpp:53
+#: parts/doxygen/doxygenpart.cpp:65
 msgid ""
-"<b>Project distribution & publishing</b>"
-"<p>Helps users package and publish their software."
-msgstr "<b>工程分发和发行</b><p>协助用户打包和发行他们的软件。"
+"<b>Build API documentation</b>"
+"<p>Runs doxygen on a project Doxyfile to generate API documentation. If the "
+"search engine is enabled in Doxyfile, this also runs doxytag to create it."
+msgstr ""
+"<b>构建 API 文档</b>"
+"<p>用工程的 Doxyfile 文件运行 doxygen，生成 API 文档。如果 Doxyfile 文件启用搜索引擎，则将运行 doxytag 创建它。"
 
-#: parts/distpart/distpart_part.cpp:56
-msgid "Distribution & Publishing"
-msgstr "分发和发布"
+#: parts/doxygen/doxygenpart.cpp:68
+msgid "Clean API Documentation"
+msgstr "清除 API 文档"
 
-#: parts/distpart/specsupport.cpp:92 parts/distpart/specsupport.cpp:191
-msgid "You need to create a source archive first."
-msgstr "您需要先创建一个源代码压缩文件。"
+#: parts/doxygen/doxygenpart.cpp:71
+msgid "Clean API documentation"
+msgstr "清除 API 文档"
 
-#: parts/appwizard/filepropspage.cpp:69
-msgid "Header/Implementation file:"
-msgstr "头文件/实现文件："
+#: parts/doxygen/doxygenpart.cpp:72
+msgid ""
+"<b>Clean API documentation</b>"
+"<p>Removes all generated by doxygen files."
+msgstr "<b>清除 API 文档</b><p>删除所有doxygen 生成的文件。"
 
-#: parts/appwizard/appwizarddlg.cpp:108
-msgid "&Add to Favorites"
-msgstr "添加到收藏夹(&A)"
+#: parts/doxygen/doxygenpart.cpp:77
+msgid "Doxygen"
+msgstr "Doxygen"
 
-#: parts/appwizard/appwizarddlg.cpp:111
-msgid "&Remove Favorite"
-msgstr "删除收藏夹(&R)"
+#: parts/doxygen/doxygenpart.cpp:81
+msgid "Document Current Function"
+msgstr "给当前函数编文档"
 
-#: parts/appwizard/appwizarddlg.cpp:288
-msgid "Choose projects directory"
-msgstr "选择工程目录"
+#: parts/doxygen/doxygenpart.cpp:82
+#, fuzzy
+msgid "Create a documentation template above a function"
+msgstr "显示 Perl 函数的文档页"
 
-#: parts/appwizard/appwizarddlg.cpp:338
+#: parts/doxygen/doxygenpart.cpp:83
 msgid ""
-"_: no version control system\n"
-"None"
-msgstr "无"
+"<b>Document Current Function</b>"
+"<p>Creates a documentation template according to a function's signature above a "
+"function definition/declaration."
+msgstr ""
 
-#: parts/appwizard/appwizarddlg.cpp:387
-msgid "Version Control System"
-msgstr "版本控制系统"
+#: parts/doxygen/doxygenpart.cpp:87
+msgid "Preview Doxygen Output"
+msgstr ""
 
-#: parts/appwizard/appwizarddlg.cpp:458
-msgid ""
-"The directory you have chosen as the location for the project already exists."
-msgstr "您为工程指定的目录已经存在。"
+#: parts/doxygen/doxygenpart.cpp:88
+msgid "Show a preview of the Doxygen output of this file"
+msgstr ""
 
-#: parts/appwizard/appwizarddlg.cpp:467
-#, fuzzy
+#: parts/doxygen/doxygenpart.cpp:89
 msgid ""
-"The directory you have chosen as the location for the project is not writeable."
-msgstr "您为工程指定的目录已经存在。"
-
-#: parts/appwizard/appwizarddlg.cpp:489
-#, fuzzy
-msgid "The template %1 cannot be opened."
-msgstr "这个项目无法删除"
+"<b>Preview Doxygen output</b>"
+"<p>Runs Doxygen over the current file and shows the created index.html."
+msgstr ""
 
-#: parts/appwizard/appwizarddlg.cpp:648
-#, fuzzy
-msgid "The directory %1 cannot be created."
-msgstr "这个项目无法删除"
+#: parts/doxygen/doxygenconfigwidget.cpp:258 parts/doxygen/doxygenpart.cpp:205
+msgid "Cannot write Doxyfile."
+msgstr "无法写入 Doxyfile。"
 
-#: parts/appwizard/appwizarddlg.cpp:667
-#, fuzzy
-msgid "The archive %1 cannot be opened."
-msgstr "这个项目无法删除"
+#: parts/doxygen/doxygenpart.cpp:370
+msgid "Another process is still running. Please wait until it's finished."
+msgstr ""
 
-#: parts/appwizard/appwizarddlg.cpp:685 parts/appwizard/appwizarddlg.cpp:827
+#: parts/doxygen/doxygenpart.cpp:451
 #, fuzzy
-msgid "The file %1 cannot be created."
-msgstr "这个项目无法删除"
-
-#: parts/appwizard/appwizarddlg.cpp:693
-msgid ""
-"The directory above the chosen location does not exist and cannot be created."
-msgstr "指定位置的目录不存在，而且无法创建。"
+msgid "Cannot create temporary file '%1'"
+msgstr "无法创建标记文件"
 
-#: parts/appwizard/appwizarddlg.cpp:896
-msgid "Template for .%1 Files"
-msgstr "%1 文件的模板"
+#: kdevdesigner/designer/mainwindowactions.cpp:987
+#: parts/documentation/find_documentation.cpp:178
+#: parts/documentation/find_documentation_options.cpp:163
+msgid "Manual"
+msgstr "手册"
 
-#: parts/appwizard/appwizarddlg.cpp:922
-#, fuzzy
-msgid "Set default project location to: %1?"
-msgstr "默认工程目录设置为："
+#: parts/documentation/find_documentation_options.cpp:168
+msgid "Info"
+msgstr ""
 
-#: kdevdesigner/designer/mainwindow.cpp:1336
-#: parts/appwizard/appwizarddlg.cpp:923
-msgid "New Project"
-msgstr "新建工程"
+#: parts/documentation/find_documentation_options.cpp:178
+msgid "Google"
+msgstr "Google"
 
-#: parts/appwizard/appwizarddlg.cpp:923
-#, fuzzy
-msgid "Set"
-msgstr "set"
+#: parts/documentation/docconfiglistview.cpp:30
+msgid "TOC"
+msgstr "目录"
 
-#: parts/appwizard/appwizarddlg.cpp:923
-#, fuzzy
-msgid "Do Not Set"
-msgstr "简洁的编译器输出"
+#: kdevdesigner/designer/mainwindow.cpp:1759
+#: kdevdesigner/designer/mainwindow.cpp:2665
+#: parts/documentation/bookmarkview.cpp:118
+#: parts/documentation/docconfiglistview.cpp:33
+#: parts/documentation/searchview.cpp:74 parts/documentation/searchview.cpp:99
+msgid "Title"
+msgstr "标题"
 
-#: parts/appwizard/appwizarddlg.cpp:949
-msgid ""
-"_: invalid location\n"
-" (invalid)"
-msgstr " (无效)"
+#: kdevdesigner/designer/hierarchyview.cpp:1050
+#: kdevdesigner/designer/hierarchyview.cpp:1055
+#: kdevdesigner/designer/mainwindow.cpp:1680
+#: parts/documentation/bookmarkview.cpp:126
+#: parts/snippet/snippet_widget.cpp:557 parts/snippet/snippet_widget.cpp:559
+msgid "Edit..."
+msgstr "编辑..."
 
-#: parts/appwizard/appwizarddlg.cpp:951
-#, fuzzy
-msgid " (dir/file already exists)"
-msgstr " (目录/文件已经存在)"
+#: parts/documentation/bookmarkview.cpp:198
+msgid "Edit Bookmark"
+msgstr "编辑书签"
 
-#: parts/appwizard/appwizardpart.cpp:45
-msgid "&New Project..."
-msgstr "新建工程(&N)..."
+#: parts/documentation/bookmarkview.cpp:222
+msgid "Current Document"
+msgstr "当前文档"
 
-#: parts/appwizard/appwizardpart.cpp:48
-msgid "Generate a new project from a template"
-msgstr "从模板生成新的工程"
+#: parts/documentation/bookmarkview.cpp:223
+msgid "Custom..."
+msgstr "自定义..."
 
-#: parts/appwizard/appwizardpart.cpp:49
-msgid ""
-"<b>New project</b>"
-"<p>This starts KDevelop's application wizard. It helps you to generate a "
-"skeleton for your application from a set of templates."
-msgstr "<b>新建工程</b><p>它启动 KDevelop 的应用程序向导。它能帮助您从模板为您的应用程序建立一个基本框架。"
+#: parts/documentation/bookmarkview.cpp:241
+msgid "Add Bookmark"
+msgstr "添加书签"
 
-#: parts/appwizard/appwizardpart.cpp:54
-msgid "&Import Existing Project..."
-msgstr "导入已有的工程(&I)..."
+#: parts/documentation/documentation_widget.cpp:59
+msgid "Finder"
+msgstr "Finder"
 
-#: parts/appwizard/appwizardpart.cpp:57
-msgid "Import existing project"
-msgstr "导入已有的工程"
+#: parts/documentation/searchview.cpp:58
+msgid "Wor&ds to search:"
+msgstr "要搜索的词(&D)："
 
-#: parts/appwizard/appwizardpart.cpp:58
-msgid ""
-"<b>Import existing project</b>"
-"<p>Creates a project file for a given directory."
-msgstr "<b>导入已有的工程给</b><p>为给定的目录创建一个工程文件。"
+#: parts/documentation/searchview.cpp:63
+msgid "Se&arch"
+msgstr "搜索(&A)"
 
-#: parts/appwizard/importdlg.cpp:61
-msgid "Choose directory to import"
-msgstr "选择要导入的目录"
+#: parts/documentation/searchview.cpp:69
+msgid "and"
+msgstr "和"
 
-#: parts/appwizard/importdlg.cpp:111
-msgid "You have to choose a directory."
-msgstr "您必须指定一个目录。"
+#: parts/documentation/searchview.cpp:70
+msgid "or"
+msgstr "或"
 
-#: parts/appwizard/importdlg.cpp:117
-msgid "You have to choose a project name."
-msgstr "您必须指定一个工程名称。"
+#: parts/documentation/searchview.cpp:71
+msgid "&Method:"
+msgstr "方法(&M)："
 
-#: parts/appwizard/importdlg.cpp:123
-msgid "Your application name should only contain letters and numbers."
-msgstr "您的应用程序名只能包含字母和数字。"
+#: parts/documentation/searchview.cpp:73
+msgid "Score"
+msgstr "评分"
 
-#: parts/appwizard/importdlg.cpp:139
-msgid "Cannot open project template."
-msgstr "无法打开工程模板。"
+#: parts/documentation/searchview.cpp:75 vcs/cvsservice/editorsdialog.cpp:88
+#: vcs/cvsservice/editorsdialog.cpp:101 vcs/subversion/svn_blamewidget.cpp:37
+#: vcs/subversion/svn_logviewwidget.cpp:52
+msgid "Date"
+msgstr "日期"
 
-#: parts/appwizard/importdlg.cpp:193
-msgid "Cannot write the project file."
-msgstr "无法写入工程文件。"
+#: parts/documentation/searchview.cpp:76
+msgid "S&ort by:"
+msgstr "排序依据(&O)："
 
-#: parts/appwizard/importdlg.cpp:553
-msgid "Generate build system infrastrucure"
-msgstr ""
+#: parts/documentation/searchview.cpp:84
+msgid "Search &results:"
+msgstr "搜索结果(&R)："
 
-#: parts/appwizard/importdlg.cpp:567
-msgid ""
-"Project infrastrucure already exists in target directory.\n"
-"Generate new project infrastructure and overwrite old?"
-msgstr ""
+#: parts/documentation/searchview.cpp:89
+msgid "Update Config"
+msgstr "更新配置"
 
-#: parts/appwizard/importdlg.cpp:567
-#, fuzzy
-msgid "Generate"
-msgstr "生成(&G)"
+#: parts/documentation/searchview.cpp:90
+msgid "Update Index"
+msgstr "更新索引"
 
-#: parts/appwizard/importdlg.cpp:567
+#: parts/documentation/searchview.cpp:98
 #, fuzzy
-msgid "Do Not Generate"
-msgstr "生成(&G)"
-
-#: parts/filecreate/fcconfigwidget.cpp:51
-msgid "Global Types"
-msgstr "全局类型"
-
-#: parts/filecreate/fcconfigwidget.cpp:62
-msgid "Project templates in "
-msgstr "工程模板位于"
+msgid "Relevance"
+msgstr "发布版本号"
 
-#: parts/filecreate/fcconfigwidget.cpp:652
-msgid ""
-"Requested template does not exist yet.\n"
-"It will be opened immediately after accepting the configuration dialog."
+#: parts/documentation/searchview.cpp:148
+msgid "Full text search has to be set up before usage."
 msgstr ""
-"所请求的模板尚不存在。\n"
-"它将在配置对话框被接受后立即打开。"
 
-#: parts/filecreate/fcconfigwidget.cpp:677
-#: parts/filecreate/fcconfigwidget.cpp:700
+#: parts/documentation/searchview.cpp:151
 msgid ""
-"Template for the selected file type does not exist yet.\n"
-"It will be opened immediately after accepting the configuration dialog."
+"Now the full text search database will be created.\n"
+"Wait for database creation to finish and then repeat search."
 msgstr ""
-"所选择的文件类型的模板尚不存在。\n"
-"它将在配置对话框被接受后立即打开。"
 
-#: parts/filecreate/fcconfigwidget.cpp:679
-#: parts/filecreate/fcconfigwidget.cpp:702
+#: parts/documentation/searchview.cpp:158
 msgid ""
-"Template for the selected file type has been changed.\n"
-"It will be opened immediately after accepting the configuration dialog."
+"Cannot find the htsearch executable.\n"
+"It is part of the ht://Dig package that is used by TDevelop to perform full "
+"text search. Please install ht://Dig and use Documentation page in Configure "
+"TDevelop dialog to set the htsearch location."
 msgstr ""
-"所选择的文件类型的模板已被改变。\n"
-"它将在配置对话框被接受后立即打开。"
 
-#: parts/filecreate/filecreate_widget2.cpp:48
-msgid "Use this to create new files within your project."
-msgstr "可用它在您的工程里创建新文件。"
-
-#: parts/filecreate/filecreate_widget3.cpp:36
-msgid "File Create"
-msgstr "文件创建"
+#: parts/documentation/searchview.cpp:174
+#, fuzzy
+msgid "Cannot find the htdig configuration file."
+msgstr "不读取默认配置文件"
 
-#: parts/filecreate/filecreate_widget3.cpp:44
-msgid ""
-"<b>New file</b>"
-"<p>This part makes the creation of new files easier. Select a type in the list "
-"to create a file. The list of project file types can be configured in project "
-"settings dialog, <b>New File Wizard</b> tab. Globally available file types are "
-"listed and can be configured in KDevelop settings dialog, <b>New File Wizard</b> "
-"tab."
-msgstr ""
-"<b>新建文件</b>"
-"<p>它使创建新文件更加容易。请从列表中选择要创建的文件类型。工程文件类型列表可以在工程设置对话框的<b>新建文件向导</b>"
-"中进行配置。全局可用的文件类型在 KDevelop 设置对话框的<b>新建文件向导</b>中列出，并可进行配置。"
+#: parts/documentation/searchview.cpp:207
+#, fuzzy
+msgid "Cannot start the htsearch executable."
+msgstr "无法运行 htsearch 可执行文件！"
 
-#: parts/filecreate/filecreate_part.cpp:75
-#: parts/filecreate/filecreate_part.cpp:76
-msgid "File Templates"
-msgstr "文件模板"
+#: parts/documentation/documentation_part.cpp:88
+msgid "Project Documentation"
+msgstr "工程文档"
 
-#: parts/filecreate/filecreate_part.cpp:82
+#: parts/documentation/documentation_part.cpp:99
+#, fuzzy
 msgid ""
-"<b>New file</b>"
-"<p>Creates a new file. Also adds it the project if the <b>Add to project</b> "
-"checkbox is turned on."
-msgstr "<b>新建文件</b><p>创建新的文件，如果<b>添加到工程</b>选项被选中，则将它添加到工程中。"
-
-#: buildtools/script/scriptprojectpart.cpp:57
-#: parts/filecreate/filecreate_part.cpp:83
-msgid "Create a new file"
-msgstr "创建新文件"
-
-#: parts/filecreate/filecreate_part.cpp:184
-#: parts/fileselector/fileselector_part.cpp:99
-msgid "Cannot create file. Check whether the directory and filename are valid."
+"<b>Documentation browser</b>"
+"<p>The documentation browser gives access to various documentation sources (TQt "
+"DCF, Doxygen, KDoc, KDevelopTOC and DevHelp documentation) and the TDevelop "
+"manuals. It also provides documentation index and full text search "
+"capabilities."
 msgstr ""
+"<b>文档树</b>"
+"<p>文档树使您能够访问各种文档来源 (Qt DCF、Doxygen、KDoc、KDevelopTOC 和 DevHelp 文档)，它也可以提供文档索引。"
 
-#: parts/filecreate/addglobaldlg.cpp:61
-msgid "Template Location"
-msgstr "模板位置"
-
-#: parts/filecreate/addglobaldlg.cpp:92
-msgid "Select Global File Types"
-msgstr "选择全局文件类型"
-
-#: parts/filecreate/addglobaldlg.cpp:94
-msgid "F1"
-msgstr "F1"
-
-#: parts/filecreate/addglobaldlg.cpp:99
-msgid "Type extension:"
-msgstr "类型扩展："
-
-#: parts/filecreate/addglobaldlg.cpp:100
-msgid "Type name:"
-msgstr "类型名称："
+#: parts/documentation/documentation_part.cpp:106
+msgid "Documentation browser"
+msgstr "文档浏览器"
 
-#: parts/filecreate/addglobaldlg.cpp:101
-msgid "Template location:"
-msgstr "模板位置："
+#: parts/documentation/documentation_part.cpp:193
+msgid "Documentation Settings"
+msgstr "文档设置"
 
-#: parts/filecreate/addglobaldlg.cpp:102
-msgid "Icon:"
-msgstr "图标："
+#: parts/documentation/documentation_part.cpp:212
+msgid "&Search in Documentation..."
+msgstr "在文档中搜索(&S)..."
 
-#: parts/filecreate/filecreate_newfile.cpp:33
-msgid ""
-"_: New file dialog (title)\n"
-"New File"
-msgstr "新建文件"
+#: parts/documentation/documentation_part.cpp:215
+msgid "Full text search in the documentation"
+msgstr "在文档里进行全文搜索"
 
-#: parts/filecreate/filecreate_newfile.cpp:38
+#: parts/documentation/documentation_part.cpp:216
 #, fuzzy
-msgid "<b>New File Creation</b>"
-msgstr "<b>新文件创建</b>"
-
-#: parts/filecreate/filecreate_newfile.cpp:56
 msgid ""
-"_: Add to project (on checkbox)\n"
-"&Add to project"
-msgstr "添加到工程中(&A)"
-
-#: parts/filecreate/filecreate_newfile.cpp:155
-#, fuzzy
-msgid "A file with this name already exists"
-msgstr "这个名字的文件已经存在。"
-
-#: parts/filecreate/filecreate_newfile.cpp:155
-msgid "File Exists"
-msgstr "文件已存在"
-
-#: parts/snippet/snippet_part.cpp:47 parts/snippet/snippet_part.cpp:52
-#: parts/snippet/snippet_part.cpp:100 parts/snippet/snippet_widget.cpp:564
-msgid "Code Snippets"
-msgstr "代码片断"
-
-#: parts/snippet/snippet_part.cpp:50
-msgid "<b>Code Snippet</b><p>This is a list of available snippets."
+"<b>Search in documentation</b>"
+"<p>Opens the Search in documentation tab. It allows a search term to be entered "
+"which will be searched for in the documentation. For this to work, a full text "
+"index must be created first, which can be done in the configuration dialog of "
+"the documentation plugin."
 msgstr ""
+"<b>全文搜索</b>"
+"<p>在文档对话框中打开搜索，您可以输入术语在文档里进行查找。要使它正常工作，您必须先在文档树的配置对话框里创建全文索引。"
 
-#: parts/snippet/snippet_part.cpp:52
-msgid "Insert a code snippet"
-msgstr "插入代码片断"
-
-#: parts/snippet/snippet_part.cpp:76
-#, fuzzy
-msgid "Show Snippet Tree"
-msgstr "代码片断"
-
-#: parts/snippet/snippet_part.cpp:84
-msgid "SnippetPart"
-msgstr "SnippetPart"
-
-#: parts/snippet/snippet_part.cpp:85
-msgid "SnippetPart for KDevelop"
-msgstr "SnippetPart for KDevelop"
-
-#: parts/snippet/snippet_part.cpp:87
-msgid "(c) 2003"
-msgstr "(c) 2003"
-
-#: parts/snippet/snippet_widget.cpp:141
-msgid "Add Group"
-msgstr "添加组"
-
-#: buildtools/autotools/addtranslationdlg.cpp:42
-#: parts/snippet/snippet_widget.cpp:145 parts/snippet/snippet_widget.cpp:256
-#: parts/snippet/snippet_widget.cpp:535
-msgid "Language:"
-msgstr "语言："
-
-#: parts/snippet/snippet_widget.cpp:168
+#: parts/documentation/documentation_part.cpp:223
 #, fuzzy
-msgid "Do you really want to remove this group and all its snippets?"
-msgstr "您真要将文件 %1 返转并丢失您所有的改变吗？"
+msgid "&Look in Documentation Index..."
+msgstr "文档索引"
 
-#: parts/snippet/snippet_widget.cpp:206
+#: parts/documentation/documentation_part.cpp:226
 #, fuzzy
-msgid "Edit Snippet"
-msgstr "添加项目"
+msgid "Look in the documentation index"
+msgstr "文档索引"
 
-#: parts/snippet/snippet_widget.cpp:252
-msgid "Edit Group"
-msgstr "编辑组"
+#: parts/documentation/documentation_part.cpp:227
+#: parts/documentation/documentation_part.cpp:479
+msgid ""
+"<b>Look in documentation index</b>"
+"<p>Opens the documentation index tab. It allows a term to be entered which will "
+"be looked for in the documentation index."
+msgstr ""
 
-#: parts/snippet/snippet_widget.cpp:554
-msgid "Add Item..."
-msgstr "添加项目..."
+#: parts/documentation/documentation_part.cpp:232
+msgid "Man Page..."
+msgstr "手册页..."
 
-#: parts/snippet/snippet_widget.cpp:555 parts/snippet/snippet_widget.cpp:566
-msgid "Add Group..."
-msgstr "添加组..."
+#: parts/documentation/documentation_part.cpp:235
+msgid "Show a manpage"
+msgstr "显示手册页..."
 
-#: kdevdesigner/designer/hierarchyview.cpp:1050
-#: kdevdesigner/designer/hierarchyview.cpp:1055
-#: kdevdesigner/designer/mainwindow.cpp:1680
-#: parts/documentation/bookmarkview.cpp:126
-#: parts/snippet/snippet_widget.cpp:557 parts/snippet/snippet_widget.cpp:559
-msgid "Edit..."
-msgstr "编辑..."
+#: parts/documentation/documentation_part.cpp:236
+msgid "<b>Show a manpage</b><p>Opens a man page using embedded viewer."
+msgstr "<b>显示手册页</b><p>用内嵌的浏览器打开手册页。"
 
-#: parts/snippet/snippet_widget.cpp:600
-#, fuzzy
-msgid "Please enter the value for <b>%1</b>:"
-msgstr "请输入 P4 用户。"
+#: parts/documentation/documentation_part.cpp:238
+msgid "Info Page..."
+msgstr "信息页..."
 
-#: parts/snippet/snippet_widget.cpp:672 parts/snippet/snippet_widget.cpp:801
+#: parts/documentation/documentation_part.cpp:241
 #, fuzzy
-msgid "Enter Values for Variables"
-msgstr "外部变量"
+msgid "Show an infopage"
+msgstr "显示手册页..."
 
-#: parts/snippet/snippet_widget.cpp:686
+#: parts/documentation/documentation_part.cpp:242
 #, fuzzy
-msgid "Enter the replacement values for these variables:"
-msgstr "输入新文件的名称："
-
-#: parts/snippet/snippet_widget.cpp:712 parts/snippet/snippet_widget.cpp:830
-msgid ""
-"Enable this to save the value entered to the right as the default value for "
-"this variable"
-msgstr ""
-
-#: parts/snippet/snippet_widget.cpp:713 parts/snippet/snippet_widget.cpp:831
-msgid ""
-"If you enable this option, the value entered to the right will be saved. If you "
-"use the same variable later, even in another snippet, the value entered to the "
-"right will be the default value for that variable."
-msgstr ""
+msgid "<b>Show an infopage</b><p>Opens an info page using embedded viewer."
+msgstr "<b>显示手册页</b><p>用内嵌的浏览器打开手册页。"
 
-#: parts/snippet/snippet_widget.cpp:814
+#: parts/documentation/documentation_part.cpp:244
 #, fuzzy
-msgid "Enter the replacement values for %1:"
-msgstr "输入新文件的名称："
-
-#: parts/snippet/snippet_widget.cpp:820
-msgid "Make value &default"
-msgstr "置为默认值(&D)"
+msgid "Find Documentation..."
+msgstr "查找文档"
 
-#: parts/filelist/projectviewpart.cpp:260
+#: parts/documentation/documentation_part.cpp:248
+#: parts/documentation/documentation_part.cpp:470
 msgid ""
-"<b>View Session Toolbar</b>"
-"<p>This allows to create and work with view sessions. A view session is a set "
-"of open documents.</p>"
+"<b>Find documentation</b>"
+"<p>Opens the documentation finder tab and searches all possible sources of "
+"documentation like table of contents, index, man and info databases, Google, "
+"etc."
 msgstr ""
 
-#: parts/filelist/projectviewpart.cpp:266
+#: parts/documentation/documentation_part.cpp:318
 #, fuzzy
-msgid "<b>File List</b><p>This is the list of opened files.</p>"
-msgstr "<b>全部关闭</b><p>关闭所有文件。"
+msgid "Show Manual Page"
+msgstr "显示手册页..."
 
-#: parts/filelist/projectviewpart.cpp:270
-msgid "Open files"
-msgstr "打开文件"
+#: parts/documentation/documentation_part.cpp:318
+msgid "Show manpage on:"
+msgstr "显示手册页："
 
-#: parts/filelist/projectviewpart.cpp:278
+#: parts/documentation/documentation_part.cpp:342
 #, fuzzy
-msgid "Open Session..."
-msgstr "打开方式..."
+msgid "Show Info Page"
+msgstr "显示手册页..."
 
-#: parts/filelist/projectviewpart.cpp:282
+#: parts/documentation/documentation_part.cpp:342
 #, fuzzy
-msgid "Open Session"
-msgstr "会话"
+msgid "Show infopage on:"
+msgstr "显示手册页："
 
-#: parts/filelist/projectviewpart.cpp:284
-#, fuzzy
-msgid "Save Session"
-msgstr "会话"
+#: parts/documentation/documentation_part.cpp:468
+#, fuzzy, c-format
+msgid "Find Documentation: %1"
+msgstr "在文档中搜索：%1"
 
-#: parts/filelist/projectviewpart.cpp:286
-#, fuzzy
-msgid "New Session..."
-msgstr "新建类..."
+#: parts/documentation/documentation_part.cpp:477
+#, fuzzy, c-format
+msgid "Look in Documentation Index: %1"
+msgstr "文档索引"
 
-#: parts/filelist/projectviewpart.cpp:288
-#: parts/filelist/projectviewpart.cpp:292
-#: parts/filelist/projectviewpart.cpp:294
-#: parts/filelist/projectviewpart.cpp:296
-#, fuzzy
-msgid "Delete Session"
-msgstr "删除动作"
+#: parts/documentation/documentation_part.cpp:485
+#, c-format
+msgid "Search in Documentation: %1"
+msgstr "在文档中搜索：%1"
 
-#: parts/filelist/projectviewpart.cpp:487
+#: parts/documentation/documentation_part.cpp:487
 #, fuzzy
-msgid "Save View Session As"
-msgstr "子工程选项"
+msgid ""
+"<b>Search in documentation</b>"
+"<p>Searches for a term under the cursor in the documentation. For this to work, "
+"a full text index must be created first, which can be done in the configuration "
+"dialog of the documentation plugin."
+msgstr "<b>在文档中搜索</b><p>在文档中搜索当前光标下的术语。要使它正常工作，您必须先在文档树的配置对话框里创建全文索引。"
 
-#: parts/filelist/projectviewpart.cpp:487
-#, fuzzy
-msgid "Enter the name of the session:"
-msgstr "在这里输入项目名。"
+#: parts/documentation/documentation_part.cpp:494
+#, c-format
+msgid "Goto Manpage: %1"
+msgstr "转至手册页：%1"
 
-#: parts/filelist/projectviewpart.cpp:494
-#, fuzzy
+#: parts/documentation/documentation_part.cpp:496
 msgid ""
-"<qt>A view session named <b>%1</b> already exists."
-"<br>Do you want to overwrite it?</qt>"
-msgstr "子目录 %1 已经存在。您要把它作为子工程添加吗？"
-
-#: parts/filelist/filelist_widget.cpp:95
-#, fuzzy
-msgid "This file has unsaved changes."
-msgstr "这个文件在目标中已经存在。"
+"<b>Goto manpage</b>"
+"<p>Tries to open a man page for the term under the cursor."
+msgstr "<b>转至手册页</b><p>它将试图打开当前光标下的术语的手册页。"
 
-#: parts/filelist/filelist_widget.cpp:98
-msgid "This file has changed on disk since it was last saved."
-msgstr ""
+#: parts/documentation/documentation_part.cpp:499
+#, fuzzy, c-format
+msgid "Goto Infopage: %1"
+msgstr "转至手册页：%1"
 
-#: parts/filelist/filelist_widget.cpp:101
+#: parts/documentation/documentation_part.cpp:501
 #, fuzzy
-msgid "Conflict: this file has changed on disk and has unsaved changes."
-msgstr "这个文件在目标中已经存在。"
-
-#: parts/filelist/filelist_widget.cpp:229
-msgid "Close Selected"
-msgstr "关闭选中文件"
-
-#: parts/filelist/filelist_widget.cpp:230
-msgid "Save Selected"
-msgstr "保存选中文件"
-
-#: parts/filelist/filelist_widget.cpp:231
-msgid "Reload Selected"
-msgstr "刷新选中文件"
-
-#: parts/fileview/filetreewidget.cpp:206 parts/fileview/fileviewpart.cpp:68
-#: parts/fileview/fileviewpart.cpp:81 parts/fileview/partwidget.cpp:48
-#: parts/fileview/partwidget.cpp:49
-msgid "File Tree"
-msgstr "文件树"
-
-#: parts/fileview/partwidget.cpp:51
 msgid ""
-"<b>File tree</b>"
-"<p>The file viewer shows all files of the project in a tree layout."
-msgstr "<b>文件树</b><p>文件视图按照树状布局显示工程中的所有文件。"
+"<b>Goto infopage</b>"
+"<p>Tries to open an info page for the term under the cursor."
+msgstr "<b>转至手册页</b><p>它将试图打开当前光标下的术语的手册页。"
 
-#: parts/fileview/partwidget.cpp:70
-msgid ""
-"<p>Here you can enter a name filter to limit which files are <b>"
-"not displayed</b>."
-"<p>To clear the filter, toggle off the filter button to the left."
-"<p>To reapply the last filter used, toggle on the filter button."
+#: parts/documentation/docutils.cpp:80
+msgid "Open in Current Tab"
 msgstr ""
-"<p>此处您可以输入名字过滤器来选择哪些文件<b>不被显示</b>。"
-"<p>切换左侧的过滤器按钮可以清除过滤器。"
-"<p>启用过滤器按钮可以再次应用上次的过滤器。"
-
-#: parts/fileselector/fileselector_widget.cpp:228
-#: parts/fileview/partwidget.cpp:75
-msgid ""
-"<p>This button clears the name filter when toggled off, or reapplies the last "
-"filter used when toggled on."
-msgstr "<p>关闭这个按钮可以清除名字过滤器，启用它可以再次应用上次的过滤器。"
 
-#: parts/fileselector/fileselector_widget.cpp:355
-#: parts/fileview/partwidget.cpp:104
-msgid "Apply last filter (\"%1\")"
-msgstr "应用上次的过滤器(“%1”)"
-
-#: parts/fileselector/fileselector_widget.cpp:366
-#: parts/fileview/partwidget.cpp:109 parts/outputviews/appoutputwidget.cpp:265
-msgid "Clear filter"
-msgstr "清除过滤器"
-
-#: parts/fileview/filegroupswidget.cpp:181
-#: parts/fileview/filetreeviewwidgetimpl.cpp:40
-msgid "Show Non Project Files"
-msgstr "显示非工程文件"
-
-#: parts/fileview/filegroupswidget.cpp:183
-#: parts/fileview/filetreeviewwidgetimpl.cpp:42
-msgid "Hide Non Project Files"
-msgstr "显示非工程文件"
-
-#: parts/fileview/filegroupswidget.cpp:184
-#: parts/fileview/filetreeviewwidgetimpl.cpp:43
-msgid ""
-"<b>Show non project files</b>"
-"<p>Shows files that do not belong to a project in a file tree."
-msgstr "<b>显示非工程文件</b><p>在文件树中显示不属于工程内的文件。"
-
-#: parts/fileview/filetreeviewwidgetimpl.cpp:99
-msgid "Reload Tree"
-msgstr "重建文件树"
-
-#: parts/fileview/filetreeviewwidgetimpl.cpp:100
-msgid "<b>Reload tree</b><p>Reloads the project files tree."
-msgstr "<b>重建文件树</b><p>重新建立工程文件树。"
-
-#: parts/fileview/vcsfiletreewidgetimpl.cpp:206
-msgid "Show VCS Fields"
-msgstr "显示版本控制字段"
-
-#: parts/fileview/vcsfiletreewidgetimpl.cpp:208
-msgid "Hide VCS Fields"
-msgstr "隐藏版本控制字段"
-
-#: parts/fileview/vcsfiletreewidgetimpl.cpp:209
-msgid ""
-"<b>Show VCS fields</b>"
-"<p>Shows <b>Revision</b> and <b>Timestamp</b> for each file contained in VCS "
-"repository."
-msgstr "<b>显示版本控制字段</b><p>对每个处于版本控制仓库的文件显示<b>版本</b>和<b>时间</b>。"
-
-#: parts/fileview/vcsfiletreewidgetimpl.cpp:213
-msgid "Sync with Repository"
-msgstr "与仓库同步"
-
-#: parts/fileview/vcsfiletreewidgetimpl.cpp:215
-msgid ""
-"<b>Sync with repository</b>"
-"<p>Synchronize file status with remote repository."
-msgstr "<b>与仓库同步</b><p>与远程仓库同步文件状态。"
-
-#: parts/fileview/fileviewpart.cpp:81
-msgid "File tree view in the project directory"
-msgstr "工程目录的文件树视图"
-
-#: parts/fileview/filegroupspart.cpp:48
-msgid ""
-"<b>File group view</b>"
-"<p>The file group viewer shows all files of the project, in groups which can be "
-"configured in project settings dialog, <b>File Groups</b> tab."
-msgstr "<b>文件分组视图</b><p>文件分组视图按照工程设置对话框的<b>文件分组</b>页所配置的分组方式显示工程的所有文件。"
-
-#: parts/fileview/filegroupspart.cpp:51 parts/fileview/filegroupspart.cpp:54
-#: parts/fileview/filegroupswidget.cpp:227
-#: parts/fileview/filegroupswidget.cpp:261
-msgid "File Groups"
-msgstr "文件分组"
-
-#: parts/fileview/filegroupspart.cpp:51
-msgid "File groups in the project directory"
-msgstr "工程目录的文件分组"
-
-#: parts/fileview/filegroupsconfigwidget.cpp:75
-msgid "Add File Group"
-msgstr "添加文件分组"
-
-#: parts/fileview/filegroupsconfigwidget.cpp:88
-msgid "Edit File Group"
-msgstr "编辑文件分组"
-
-#: buildtools/qmake/qmakescopeitem.cpp:84
-#: parts/fileview/filegroupswidget.cpp:42
-msgid "Sources"
-msgstr "源文件"
-
-#: buildtools/qmake/qmakescopeitem.cpp:120
-#: parts/fileview/filegroupswidget.cpp:43
-msgid "Translations"
-msgstr "翻译"
-
-#: parts/fileview/filegroupswidget.cpp:44 parts/uimode/uichooser_part.cpp:27
-msgid "User Interface"
-msgstr "用户界面"
-
-#: parts/fileview/filegroupswidget.cpp:45
-msgid "Others"
-msgstr "其它"
-
-#: parts/fileview/filegroupswidget.cpp:186
-msgid "Display Location Column"
-msgstr "显示位置列"
+#: lib/widgets/kdevhtmlpart.cpp:99 parts/documentation/docutils.cpp:81
+msgid "Open in New Tab"
+msgstr "在新标签中打开"
 
-#: parts/fileview/filegroupswidget.cpp:188
-msgid ""
-"<b>Display the Location Column</b>"
-"<p>Displays a column with the location of the files."
+#: parts/documentation/docutils.cpp:85
+msgid "Bookmark This Location"
 msgstr ""
 
-#: parts/fileview/filegroupswidget.cpp:229
-msgid "Customize..."
-msgstr "自定义..."
-
-#: parts/fileview/filegroupswidget.cpp:230
-msgid ""
-"<b>Customize</b>"
-"<p>Opens <b>Customize File Groups</b> dialog where the groups can be managed."
-msgstr "<b>自定义</b><p>打开<b>自定义文件分组</b>对话框，可以管理分组。"
-
-#: parts/fileview/filegroupswidget.cpp:258
-msgid "Customize File Groups"
-msgstr "自定义文件分组"
-
-#: parts/abbrev/abbrevpart.cpp:80
-msgid "Expand Text"
-msgstr "展开文本"
-
-#: parts/abbrev/abbrevpart.cpp:83
-msgid "Expand current word"
-msgstr "展开当前单词"
-
-#: parts/abbrev/abbrevpart.cpp:84
-msgid ""
-"<b>Expand current word</b>"
-"<p>Current word can be completed using the list of similar words in source "
-"files."
-msgstr "<b>展开当前单词</b><p>当前单词可以用源代码文件中的相似单词列表进行补全。"
-
-#: parts/abbrev/abbrevpart.cpp:86
-msgid "Expand Abbreviation"
-msgstr "展开缩写"
-
-#: parts/abbrev/abbrevpart.cpp:89
-msgid "Expand abbreviation"
-msgstr "展开缩写"
+#: parts/documentation/indexview.cpp:48
+msgid "&Look for:"
+msgstr "查找(&L)："
 
-#: parts/abbrev/abbrevpart.cpp:90
+#: parts/documentation/plugins/chm/docchmplugin.cpp:75
 #, fuzzy
-msgid ""
-"<b>Expand abbreviation</b>"
-"<p>Enable and configure abbreviations in <b>KDevelop Settings</b>, <b>"
-"Abbreviations</b> tab."
-msgstr "<b>展开缩写</b><p>启用和配置<b>KDevelop 设置</b>、<b>缩写</b>页中的缩写项目。"
-
-#: parts/abbrev/abbrevpart.cpp:244
-msgid "Abbreviations"
-msgstr "缩写"
-
-#: parts/vcsmanager/vcsmanagerpart.cpp:60
-msgid "Version Control"
-msgstr "版本控制"
+msgid "CHM Documentation Collection"
+msgstr "Qt 文档集"
 
-#: parts/vcsmanager/vcsmanagerprojectconfig.cpp:49
-msgid ""
-"_: No Version Control System\n"
-"None"
-msgstr "无"
+#: parts/documentation/plugins/custom/doccustomplugin.cpp:55
+#, fuzzy
+msgid "Custom Documentation Collection"
+msgstr "Qt 文档集"
 
-#: parts/astyle/astyle_part.cpp:53
-msgid "&Reformat Source"
-msgstr "重新排版源代码(&R)"
+#: parts/documentation/plugins/doxygen/docdoxygenplugin.cpp:126
+msgid "Doxygen Documentation Collection"
+msgstr "Doxygen 文档集"
 
-#: parts/astyle/astyle_part.cpp:55
-msgid "Reformat source"
-msgstr "重新排版源代码"
+#: parts/documentation/plugins/doxygen/docdoxygenplugin.cpp:453
+msgid "%1 Class Reference"
+msgstr ""
 
-#: parts/astyle/astyle_part.cpp:56
-msgid ""
-"<b>Reformat source</b>"
-"<p>Source reformatting functionality using <b>astyle</b> "
-"library. Also available in <b>New Class</b> and <b>Subclassing</b> wizards."
+#: parts/documentation/plugins/doxygen/docdoxygenplugin.cpp:470
+msgid "%1::%2%3 Member Reference"
 msgstr ""
-"<b>重新排版源代码</b>"
-"<p>重新排版源代码功能使用<b>astyle</b>代码库，它也存在于<b>新建类</b>和<b>子类划分</b>向导中。"
 
-#: parts/astyle/astyle_part.cpp:59 parts/astyle/astyle_part.cpp:61
-#: parts/astyle/astyle_part.cpp:410
+#: parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp:80
 #, fuzzy
-msgid "Format files"
-msgstr "脚注文件"
+msgid "TDevelopTOC Documentation Collection"
+msgstr "KDevelopTOC 文档集"
 
-#: parts/astyle/astyle_part.cpp:62
+#: parts/documentation/plugins/qt/docqtplugin.cpp:195
 #, fuzzy
-msgid ""
-"<b>Fomat files</b>"
-"<p>Formatting functionality using <b>astyle</b> library. Also available in <b>"
-"New Class</b> and <b>Subclassing</b> wizards."
-msgstr ""
-"<b>重新排版源代码</b>"
-"<p>重新排版源代码功能使用<b>astyle</b>代码库，它也存在于<b>新建类</b>和<b>子类划分</b>向导中。"
-
-#: parts/astyle/astyle_part.cpp:67 parts/astyle/astyle_part.cpp:68
-msgid "Formatting"
-msgstr "格式化"
+msgid "TQt Documentation Collection"
+msgstr "Qt 文档集"
 
-#: parts/astyle/astyle_part.cpp:402
+#: parts/documentation/plugins/devhelp/docdevhelpplugin.cpp:120
 #, fuzzy
-msgid "Format selection"
-msgstr "格式化"
-
-#: parts/astyle/astyle_part.cpp:403
-msgid "<b>Format</b><p>Formats the current selection, if possible"
-msgstr ""
+msgid "Devhelp Documentation Collection"
+msgstr "DevHelp 文档集"
 
-#: parts/astyle/astyle_part.cpp:411
+#: parts/documentation/plugins/djvu/docdjvuplugin.cpp:30
 #, fuzzy
-msgid "<b>Format files</b><p>Formats selected files if possible"
-msgstr "<b>提交文件</b><p>将修改过的文件提交到仓库。"
-
-#: parts/astyle/astyle_part.cpp:523
-#, c-format
-msgid "Not able to write %1"
-msgstr ""
-
-#: parts/astyle/astyle_part.cpp:528
-#, c-format
-msgid "Not able to read %1"
-msgstr ""
+msgid "Djvu documentation plugin"
+msgstr "Qt 文档集"
 
-#: parts/astyle/astyle_part.cpp:534
+#: parts/documentation/plugins/djvu/docdjvuplugin.cpp:52
 #, fuzzy
-msgid "Processed %1 files ending with extensions %2"
-msgstr "新文件名(和扩展名)(&N)："
+msgid "Djvu Documentation Collection"
+msgstr "KDoc 文档集"
 
-#: parts/regexptest/regexptestdlg.cpp:84
-msgid "Error compiling the regular expression."
-msgstr "正则表达式编译错误。"
+#: parts/documentation/plugins/pdb/docpdbplugin.cpp:30
+#, fuzzy
+msgid "PalmDoc documentation plugin"
+msgstr "Qt 文档集"
 
-#: parts/regexptest/regexptestdlg.cpp:89
-#: parts/regexptest/regexptestdlg.cpp:111
-#: parts/regexptest/regexptestdlg.cpp:187
-msgid "No match"
-msgstr "无匹配"
+#: parts/documentation/plugins/pdb/docpdbplugin.cpp:52
+#, fuzzy
+msgid "PalmDoc Documentation Collection"
+msgstr "KDoc 文档集"
 
-#: parts/regexptest/regexptestdlg.cpp:92
-#: parts/regexptest/regexptestdlg.cpp:114
-#: parts/regexptest/regexptestdlg.cpp:191
-msgid "Successfully matched"
-msgstr "匹配成功"
+#: parts/documentation/plugins/pdf/docpdfplugin.cpp:30
+#, fuzzy
+msgid "PDF documentation plugin"
+msgstr "Qt 文档集"
 
-#: parts/regexptest/regexptestdlg.cpp:107
-msgid "Compile error, your regexp is invalid"
-msgstr "编译错误。您的正则表达式是无效的"
+#: parts/documentation/plugins/pdf/docpdfplugin.cpp:52
+#, fuzzy
+msgid "PDF Documentation Collection"
+msgstr "KDoc 文档集"
 
-#: parts/regexptest/regexptestdlg.cpp:134
-msgid "Repetition operators must not appear as first character"
-msgstr "重复操作符不能作为第一个字符"
+#: parts/documentation/tools/htdig/htdigindex.cpp:43
+msgid "Generating Search Index"
+msgstr "生成搜索索引"
 
-#: parts/regexptest/regexptestdlg.cpp:137
-msgid "Invalid use of back reference operator"
-msgstr "无效的后向引用操作符"
+#: parts/documentation/tools/htdig/htdigindex.cpp:63
+msgid "Scanning for files"
+msgstr "正在扫描文件"
 
-#: parts/regexptest/regexptestdlg.cpp:140
-msgid "Unmatched brace interval operators"
-msgstr "不匹配的大括号区间操作符"
+#: parts/documentation/tools/htdig/htdigindex.cpp:73
+msgid "Extracting search terms"
+msgstr "正在提取搜索项目"
 
-#: parts/regexptest/regexptestdlg.cpp:143
-msgid "Unmatched bracket list operators"
-msgstr "不匹配的方括号列表操作符"
+#: parts/documentation/tools/htdig/htdigindex.cpp:82
+msgid "Generating index..."
+msgstr "正在生成索引..."
 
-#: parts/regexptest/regexptestdlg.cpp:146
-msgid "Invalid use of range operator"
-msgstr "无效的范围操作符"
+#: parts/documentation/tools/htdig/htdigindex.cpp:125
+#, c-format
+msgid "Files processed: %1"
+msgstr "已处理的文件：%1"
 
-#: parts/regexptest/regexptestdlg.cpp:149
-msgid "Unknown character class"
-msgstr "未知的字符类别"
+#: parts/documentation/tools/htdig/htdigindex.cpp:350
+msgid "Running htdig failed"
+msgstr "运行 htdig 失败"
 
-#: parts/regexptest/regexptestdlg.cpp:152
-msgid "Invalid collating element"
-msgstr "无效的并列字元"
+#: parts/documentation/tools/htdig/htdigindex.cpp:411
+msgid "Running htmerge failed"
+msgstr "运行 htmerge 失败"
 
-#: parts/regexptest/regexptestdlg.cpp:155
-msgid "Unmatched parenthesis group operators"
-msgstr "不匹配的小括号分组操作符"
+#: parts/documentation/tools/htdig/htdigindex.cpp:448
+#, fuzzy
+msgid "Update user's htdig configuration file only"
+msgstr "编译器配置文件："
 
-#: parts/regexptest/regexptestdlg.cpp:158
-msgid "Invalid back reference to subexpression"
-msgstr "无效的子表达式后向引用"
+#: parts/documentation/tools/htdig/htdigindex.cpp:449
+#, fuzzy
+msgid "-c and generate index"
+msgstr "正在生成索引..."
 
-#: parts/regexptest/regexptestdlg.cpp:161
-msgid "Trailing backslash"
-msgstr "结尾的反斜杠转义符错"
+#: parts/documentation/tools/htdig/htdigindex.cpp:453
+msgid "TDevelop ht://Dig Indexer"
+msgstr ""
 
-#: parts/regexptest/regexptestdlg.cpp:164
-msgid "Invalid use of pattern operators"
-msgstr "无效的模板操作符"
+#: parts/documentation/tools/htdig/htdigindex.cpp:454
+#, fuzzy
+msgid "TDE Index generator for documentation files."
+msgstr "TDE 帮助文件索引生成器"
 
-#: parts/regexptest/regexptestdlg.cpp:168
-msgid "Regular expression too large"
-msgstr "正则表达式太长"
+#: parts/documentation/tools/htdig/htdigindex.cpp:470
+#, fuzzy
+msgid "Configuration file updated."
+msgstr "编译器配置文件："
 
-#: parts/regexptest/regexptestdlg.cpp:172
-msgid "Unknown error"
-msgstr "未知错误"
+#: parts/documentation/tools/htdig/htdigindex.cpp:472
+#, fuzzy
+msgid "Configuration file update failed."
+msgstr "编译器配置文件："
 
-#: parts/regexptest/regexptestpart.cpp:35
-msgid "Debug Regular Expression..."
-msgstr "调试正则表达式..."
+#: parts/documentation/protocols/chm/kchmpart.cpp:62
+msgid "KChm"
+msgstr "KChm"
 
-#: parts/regexptest/regexptestpart.cpp:38
-msgid "Debug regular expression"
-msgstr "调试正则表达式"
+#: parts/ctags2/ctags2_widget.cpp:107
+#, fuzzy, c-format
+msgid "Hits: %1"
+msgstr "次数"
 
-#: parts/regexptest/regexptestpart.cpp:39
-msgid ""
-"<b>Debug regular expression</b>"
-"<p>Allows to enter a regular expression and validate it. It is possible to "
-"check syntax of basic POSIX, extended POSIX regular expressions and also syntax "
-"allowed by QRegExp and KRegExp classes."
-msgstr ""
-"<b>调试正则表达式</b>"
-"<p>允许输入一个正则表达式并校验它。它可以检查基本 POSIX、扩展 POSIX 正则表达式、和 QRegExp、KRegExp 使用的语法。"
+#: parts/ctags2/ctags2_widget.cpp:155
+#, fuzzy
+msgid "No CTags database found"
+msgstr "没有找到标记"
 
 #: parts/ctags2/ctags2_part.cpp:80
 msgid ""
@@ -22719,16 +19745,6 @@ msgstr "转至 ctags 定义：%1"
 msgid "CTags - Lookup: %1"
 msgstr "分组：%1"
 
-#: parts/ctags2/ctags2_widget.cpp:107
-#, fuzzy, c-format
-msgid "Hits: %1"
-msgstr "次数"
-
-#: parts/ctags2/ctags2_widget.cpp:155
-#, fuzzy
-msgid "No CTags database found"
-msgstr "没有找到标记"
-
 #: parts/ctags2/ctagskinds.cpp:29
 msgid "define"
 msgstr "定义"
@@ -22882,549 +19898,684 @@ msgstr "过程"
 msgid "mixin"
 msgstr ""
 
-#: parts/documentation/documentation_part.cpp:88
-msgid "Project Documentation"
-msgstr "工程文档"
-
-#: parts/documentation/documentation_part.cpp:99
-#, fuzzy
+#: parts/filelist/projectviewpart.cpp:260
 msgid ""
-"<b>Documentation browser</b>"
-"<p>The documentation browser gives access to various documentation sources (Qt "
-"DCF, Doxygen, KDoc, KDevelopTOC and DevHelp documentation) and the KDevelop "
-"manuals. It also provides documentation index and full text search "
-"capabilities."
+"<b>View Session Toolbar</b>"
+"<p>This allows to create and work with view sessions. A view session is a set "
+"of open documents.</p>"
 msgstr ""
-"<b>文档树</b>"
-"<p>文档树使您能够访问各种文档来源 (Qt DCF、Doxygen、KDoc、KDevelopTOC 和 DevHelp 文档)，它也可以提供文档索引。"
-
-#: parts/documentation/documentation_part.cpp:106
-msgid "Documentation browser"
-msgstr "文档浏览器"
 
-#: parts/documentation/documentation_part.cpp:193
-msgid "Documentation Settings"
-msgstr "文档设置"
+#: parts/filelist/projectviewpart.cpp:266
+#, fuzzy
+msgid "<b>File List</b><p>This is the list of opened files.</p>"
+msgstr "<b>全部关闭</b><p>关闭所有文件。"
 
-#: parts/documentation/documentation_part.cpp:212
-msgid "&Search in Documentation..."
-msgstr "在文档中搜索(&S)..."
+#: parts/filelist/projectviewpart.cpp:270
+msgid "Open files"
+msgstr "打开文件"
 
-#: parts/documentation/documentation_part.cpp:215
-msgid "Full text search in the documentation"
-msgstr "在文档里进行全文搜索"
+#: parts/filelist/projectviewpart.cpp:278
+#, fuzzy
+msgid "Open Session..."
+msgstr "打开方式..."
 
-#: parts/documentation/documentation_part.cpp:216
+#: parts/filelist/projectviewpart.cpp:282
 #, fuzzy
-msgid ""
-"<b>Search in documentation</b>"
-"<p>Opens the Search in documentation tab. It allows a search term to be entered "
-"which will be searched for in the documentation. For this to work, a full text "
-"index must be created first, which can be done in the configuration dialog of "
-"the documentation plugin."
-msgstr ""
-"<b>全文搜索</b>"
-"<p>在文档对话框中打开搜索，您可以输入术语在文档里进行查找。要使它正常工作，您必须先在文档树的配置对话框里创建全文索引。"
+msgid "Open Session"
+msgstr "会话"
 
-#: parts/documentation/documentation_part.cpp:223
+#: parts/filelist/projectviewpart.cpp:284
 #, fuzzy
-msgid "&Look in Documentation Index..."
-msgstr "文档索引"
+msgid "Save Session"
+msgstr "会话"
 
-#: parts/documentation/documentation_part.cpp:226
+#: parts/filelist/projectviewpart.cpp:286
 #, fuzzy
-msgid "Look in the documentation index"
-msgstr "文档索引"
+msgid "New Session..."
+msgstr "新建类..."
 
-#: parts/documentation/documentation_part.cpp:227
-#: parts/documentation/documentation_part.cpp:479
-msgid ""
-"<b>Look in documentation index</b>"
-"<p>Opens the documentation index tab. It allows a term to be entered which will "
-"be looked for in the documentation index."
-msgstr ""
+#: parts/filelist/projectviewpart.cpp:288
+#: parts/filelist/projectviewpart.cpp:292
+#: parts/filelist/projectviewpart.cpp:294
+#: parts/filelist/projectviewpart.cpp:296
+#, fuzzy
+msgid "Delete Session"
+msgstr "删除动作"
 
-#: parts/documentation/documentation_part.cpp:232
-msgid "Man Page..."
-msgstr "手册页..."
+#: parts/filelist/projectviewpart.cpp:487
+#, fuzzy
+msgid "Save View Session As"
+msgstr "子工程选项"
 
-#: parts/documentation/documentation_part.cpp:235
-msgid "Show a manpage"
-msgstr "显示手册页..."
+#: parts/filelist/projectviewpart.cpp:487
+#, fuzzy
+msgid "Enter the name of the session:"
+msgstr "在这里输入项目名。"
 
-#: parts/documentation/documentation_part.cpp:236
-msgid "<b>Show a manpage</b><p>Opens a man page using embedded viewer."
-msgstr "<b>显示手册页</b><p>用内嵌的浏览器打开手册页。"
+#: parts/filelist/projectviewpart.cpp:494
+#, fuzzy
+msgid ""
+"<qt>A view session named <b>%1</b> already exists."
+"<br>Do you want to overwrite it?</qt>"
+msgstr "子目录 %1 已经存在。您要把它作为子工程添加吗？"
 
-#: parts/documentation/documentation_part.cpp:238
-msgid "Info Page..."
-msgstr "信息页..."
+#: parts/filelist/projectviewpart.cpp:494 src/partcontroller.cpp:1124
+msgid "Overwrite"
+msgstr "覆盖"
 
-#: parts/documentation/documentation_part.cpp:241
+#: parts/filelist/filelist_widget.cpp:95
 #, fuzzy
-msgid "Show an infopage"
-msgstr "显示手册页..."
+msgid "This file has unsaved changes."
+msgstr "这个文件在目标中已经存在。"
 
-#: parts/documentation/documentation_part.cpp:242
-#, fuzzy
-msgid "<b>Show an infopage</b><p>Opens an info page using embedded viewer."
-msgstr "<b>显示手册页</b><p>用内嵌的浏览器打开手册页。"
+#: parts/filelist/filelist_widget.cpp:98
+msgid "This file has changed on disk since it was last saved."
+msgstr ""
 
-#: parts/documentation/documentation_part.cpp:244
+#: parts/filelist/filelist_widget.cpp:101
 #, fuzzy
-msgid "Find Documentation..."
-msgstr "查找文档"
+msgid "Conflict: this file has changed on disk and has unsaved changes."
+msgstr "这个文件在目标中已经存在。"
 
-#: parts/documentation/documentation_part.cpp:248
-#: parts/documentation/documentation_part.cpp:470
+#: parts/filelist/filelist_widget.cpp:229
+msgid "Close Selected"
+msgstr "关闭选中文件"
+
+#: parts/filelist/filelist_widget.cpp:230
+msgid "Save Selected"
+msgstr "保存选中文件"
+
+#: parts/filelist/filelist_widget.cpp:231
+msgid "Reload Selected"
+msgstr "刷新选中文件"
+
+#: parts/fileview/filetreewidget.cpp:207 parts/fileview/fileviewpart.cpp:68
+#: parts/fileview/fileviewpart.cpp:81 parts/fileview/partwidget.cpp:48
+#: parts/fileview/partwidget.cpp:49
+msgid "File Tree"
+msgstr "文件树"
+
+#: parts/fileview/partwidget.cpp:51
 msgid ""
-"<b>Find documentation</b>"
-"<p>Opens the documentation finder tab and searches all possible sources of "
-"documentation like table of contents, index, man and info databases, Google, "
-"etc."
+"<b>File tree</b>"
+"<p>The file viewer shows all files of the project in a tree layout."
+msgstr "<b>文件树</b><p>文件视图按照树状布局显示工程中的所有文件。"
+
+#: parts/fileview/partwidget.cpp:70
+msgid ""
+"<p>Here you can enter a name filter to limit which files are <b>"
+"not displayed</b>."
+"<p>To clear the filter, toggle off the filter button to the left."
+"<p>To reapply the last filter used, toggle on the filter button."
 msgstr ""
+"<p>此处您可以输入名字过滤器来选择哪些文件<b>不被显示</b>。"
+"<p>切换左侧的过滤器按钮可以清除过滤器。"
+"<p>启用过滤器按钮可以再次应用上次的过滤器。"
 
-#: parts/documentation/documentation_part.cpp:318
-#, fuzzy
-msgid "Show Manual Page"
-msgstr "显示手册页..."
+#: parts/fileview/fileviewpart.cpp:81
+msgid "File tree view in the project directory"
+msgstr "工程目录的文件树视图"
 
-#: parts/documentation/documentation_part.cpp:318
-msgid "Show manpage on:"
-msgstr "显示手册页："
+#: parts/fileview/filegroupsconfigwidget.cpp:75
+msgid "Add File Group"
+msgstr "添加文件分组"
 
-#: parts/documentation/documentation_part.cpp:342
-#, fuzzy
-msgid "Show Info Page"
-msgstr "显示手册页..."
+#: parts/fileview/filegroupsconfigwidget.cpp:88
+msgid "Edit File Group"
+msgstr "编辑文件分组"
 
-#: parts/documentation/documentation_part.cpp:342
-#, fuzzy
-msgid "Show infopage on:"
-msgstr "显示手册页："
+#: parts/fileview/filegroupspart.cpp:48
+msgid ""
+"<b>File group view</b>"
+"<p>The file group viewer shows all files of the project, in groups which can be "
+"configured in project settings dialog, <b>File Groups</b> tab."
+msgstr "<b>文件分组视图</b><p>文件分组视图按照工程设置对话框的<b>文件分组</b>页所配置的分组方式显示工程的所有文件。"
 
-#: parts/documentation/documentation_part.cpp:468
-#, fuzzy, c-format
-msgid "Find Documentation: %1"
-msgstr "在文档中搜索：%1"
+#: parts/fileview/filegroupspart.cpp:51 parts/fileview/filegroupspart.cpp:54
+#: parts/fileview/filegroupswidget.cpp:228
+#: parts/fileview/filegroupswidget.cpp:262
+msgid "File Groups"
+msgstr "文件分组"
 
-#: parts/documentation/documentation_part.cpp:477
-#, fuzzy, c-format
-msgid "Look in Documentation Index: %1"
-msgstr "文档索引"
+#: parts/fileview/filegroupspart.cpp:51
+msgid "File groups in the project directory"
+msgstr "工程目录的文件分组"
 
-#: parts/documentation/documentation_part.cpp:485
-#, c-format
-msgid "Search in Documentation: %1"
-msgstr "在文档中搜索：%1"
+#: buildtools/qmake/qmakescopeitem.cpp:85
+#: parts/fileview/filegroupswidget.cpp:42
+msgid "Sources"
+msgstr "源文件"
 
-#: parts/documentation/documentation_part.cpp:487
-#, fuzzy
-msgid ""
-"<b>Search in documentation</b>"
-"<p>Searches for a term under the cursor in the documentation. For this to work, "
-"a full text index must be created first, which can be done in the configuration "
-"dialog of the documentation plugin."
-msgstr "<b>在文档中搜索</b><p>在文档中搜索当前光标下的术语。要使它正常工作，您必须先在文档树的配置对话框里创建全文索引。"
+#: buildtools/qmake/qmakescopeitem.cpp:121
+#: parts/fileview/filegroupswidget.cpp:43
+msgid "Translations"
+msgstr "翻译"
 
-#: parts/documentation/documentation_part.cpp:494
-#, c-format
-msgid "Goto Manpage: %1"
-msgstr "转至手册页：%1"
+#: parts/fileview/filegroupswidget.cpp:44 parts/uimode/uichooser_part.cpp:27
+msgid "User Interface"
+msgstr "用户界面"
 
-#: parts/documentation/documentation_part.cpp:496
-msgid ""
-"<b>Goto manpage</b>"
-"<p>Tries to open a man page for the term under the cursor."
-msgstr "<b>转至手册页</b><p>它将试图打开当前光标下的术语的手册页。"
+#: parts/fileview/filegroupswidget.cpp:45
+msgid "Others"
+msgstr "其它"
 
-#: parts/documentation/documentation_part.cpp:499
-#, fuzzy, c-format
-msgid "Goto Infopage: %1"
-msgstr "转至手册页：%1"
+#: parts/fileview/filegroupswidget.cpp:181
+#: parts/fileview/filetreeviewwidgetimpl.cpp:40
+msgid "Show Non Project Files"
+msgstr "显示非工程文件"
 
-#: parts/documentation/documentation_part.cpp:501
-#, fuzzy
+#: parts/fileview/filegroupswidget.cpp:183
+#: parts/fileview/filetreeviewwidgetimpl.cpp:42
+msgid "Hide Non Project Files"
+msgstr "显示非工程文件"
+
+#: parts/fileview/filegroupswidget.cpp:184
+#: parts/fileview/filetreeviewwidgetimpl.cpp:43
 msgid ""
-"<b>Goto infopage</b>"
-"<p>Tries to open an info page for the term under the cursor."
-msgstr "<b>转至手册页</b><p>它将试图打开当前光标下的术语的手册页。"
+"<b>Show non project files</b>"
+"<p>Shows files that do not belong to a project in a file tree."
+msgstr "<b>显示非工程文件</b><p>在文件树中显示不属于工程内的文件。"
 
-#: parts/documentation/docutils.cpp:80
-msgid "Open in Current Tab"
-msgstr ""
+#: parts/fileview/filegroupswidget.cpp:186
+msgid "Display Location Column"
+msgstr "显示位置列"
 
-#: parts/documentation/docutils.cpp:85
-msgid "Bookmark This Location"
+#: parts/fileview/filegroupswidget.cpp:188
+msgid ""
+"<b>Display the Location Column</b>"
+"<p>Displays a column with the location of the files."
 msgstr ""
 
-#: parts/documentation/docconfiglistview.cpp:30
-msgid "TOC"
-msgstr "目录"
+#: parts/fileview/filegroupswidget.cpp:230
+msgid "Customize..."
+msgstr "自定义..."
 
-#: kdevdesigner/designer/mainwindow.cpp:1759
-#: kdevdesigner/designer/mainwindow.cpp:2665
-#: parts/documentation/bookmarkview.cpp:118
-#: parts/documentation/docconfiglistview.cpp:33
-#: parts/documentation/searchview.cpp:74 parts/documentation/searchview.cpp:99
-msgid "Title"
-msgstr "标题"
+#: parts/fileview/filegroupswidget.cpp:231
+msgid ""
+"<b>Customize</b>"
+"<p>Opens <b>Customize File Groups</b> dialog where the groups can be managed."
+msgstr "<b>自定义</b><p>打开<b>自定义文件分组</b>对话框，可以管理分组。"
 
-#: kdevdesigner/designer/mainwindowactions.cpp:987
-#: parts/documentation/find_documentation.cpp:178
-#: parts/documentation/find_documentation_options.cpp:163
-msgid "Manual"
-msgstr "手册"
+#: parts/fileview/filegroupswidget.cpp:259
+msgid "Customize File Groups"
+msgstr "自定义文件分组"
 
-#: parts/documentation/bookmarkview.cpp:198
-msgid "Edit Bookmark"
-msgstr "编辑书签"
+#: parts/fileview/vcsfiletreewidgetimpl.cpp:206
+msgid "Show VCS Fields"
+msgstr "显示版本控制字段"
 
-#: parts/documentation/bookmarkview.cpp:222
-msgid "Current Document"
-msgstr "当前文档"
+#: parts/fileview/vcsfiletreewidgetimpl.cpp:208
+msgid "Hide VCS Fields"
+msgstr "隐藏版本控制字段"
 
-#: parts/documentation/bookmarkview.cpp:223
-msgid "Custom..."
-msgstr "自定义..."
+#: parts/fileview/vcsfiletreewidgetimpl.cpp:209
+msgid ""
+"<b>Show VCS fields</b>"
+"<p>Shows <b>Revision</b> and <b>Timestamp</b> for each file contained in VCS "
+"repository."
+msgstr "<b>显示版本控制字段</b><p>对每个处于版本控制仓库的文件显示<b>版本</b>和<b>时间</b>。"
 
-#: parts/documentation/bookmarkview.cpp:241
-msgid "Add Bookmark"
-msgstr "添加书签"
+#: parts/fileview/vcsfiletreewidgetimpl.cpp:213
+msgid "Sync with Repository"
+msgstr "与仓库同步"
 
-#: parts/documentation/find_documentation_options.cpp:168
-msgid "Info"
-msgstr ""
+#: parts/fileview/vcsfiletreewidgetimpl.cpp:215
+msgid ""
+"<b>Sync with repository</b>"
+"<p>Synchronize file status with remote repository."
+msgstr "<b>与仓库同步</b><p>与远程仓库同步文件状态。"
 
-#: parts/documentation/find_documentation_options.cpp:178
-msgid "Google"
-msgstr "Google"
+#: parts/fileview/filetreeviewwidgetimpl.cpp:99
+msgid "Reload Tree"
+msgstr "重建文件树"
 
-#: parts/documentation/documentation_widget.cpp:59
-msgid "Finder"
-msgstr "Finder"
+#: parts/fileview/filetreeviewwidgetimpl.cpp:100
+msgid "<b>Reload tree</b><p>Reloads the project files tree."
+msgstr "<b>重建文件树</b><p>重新建立工程文件树。"
 
-#: parts/documentation/searchview.cpp:58
-msgid "Wor&ds to search:"
-msgstr "要搜索的词(&D)："
+#: parts/tools/toolsconfigwidget.cpp:130
+msgid "An entry with this title exists already."
+msgstr "这个标题的项目已经存在。"
 
-#: parts/documentation/searchview.cpp:63
-msgid "Se&arch"
-msgstr "搜索(&A)"
+#: parts/tools/toolsconfigwidget.cpp:170
+msgid "Add to Tools Menu"
+msgstr "添加到工具菜单"
 
-#: parts/documentation/searchview.cpp:69
-msgid "and"
-msgstr "和"
+#: parts/tools/toolsconfigwidget.cpp:197
+msgid "Add to File Context Menus"
+msgstr "添加到文件环境菜单"
 
-#: parts/documentation/searchview.cpp:70
-msgid "or"
-msgstr "或"
+#: parts/tools/toolsconfigwidget.cpp:225
+msgid "Add to Directory Context Menus"
+msgstr "添加到目录环境菜单"
 
-#: parts/documentation/searchview.cpp:71
-msgid "&Method:"
-msgstr "方法(&M)："
+#: parts/tools/kapplicationtree.cpp:137
+msgid "Known Applications"
+msgstr "已知应用程序"
 
-#: parts/documentation/searchview.cpp:73
-msgid "Score"
-msgstr "评分"
+#: parts/tools/toolsconfig.cpp:40
+msgid "&Applications:"
+msgstr "应用程序(&A)："
 
-#: parts/documentation/searchview.cpp:76
-msgid "S&ort by:"
-msgstr "排序依据(&O)："
+#: parts/tools/toolsconfig.cpp:63
+msgid "&Tools menu:"
+msgstr "工具菜单(&T)："
 
-#: parts/documentation/searchview.cpp:84
-msgid "Search &results:"
-msgstr "搜索结果(&R)："
+#: parts/tools/tools_part.cpp:50
+msgid "Tools Menu"
+msgstr "工具菜单"
 
-#: parts/documentation/searchview.cpp:89
-msgid "Update Config"
-msgstr "更新配置"
+#: parts/abbrev/abbrevpart.cpp:80
+msgid "Expand Text"
+msgstr "展开文本"
 
-#: parts/documentation/searchview.cpp:90
-msgid "Update Index"
-msgstr "更新索引"
+#: parts/abbrev/abbrevpart.cpp:83
+msgid "Expand current word"
+msgstr "展开当前单词"
 
-#: parts/documentation/searchview.cpp:98
+#: parts/abbrev/abbrevpart.cpp:84
+msgid ""
+"<b>Expand current word</b>"
+"<p>Current word can be completed using the list of similar words in source "
+"files."
+msgstr "<b>展开当前单词</b><p>当前单词可以用源代码文件中的相似单词列表进行补全。"
+
+#: parts/abbrev/abbrevpart.cpp:86
+msgid "Expand Abbreviation"
+msgstr "展开缩写"
+
+#: parts/abbrev/abbrevpart.cpp:89
+msgid "Expand abbreviation"
+msgstr "展开缩写"
+
+#: parts/abbrev/abbrevpart.cpp:90
 #, fuzzy
-msgid "Relevance"
-msgstr "发布版本号"
+msgid ""
+"<b>Expand abbreviation</b>"
+"<p>Enable and configure abbreviations in <b>TDevelop Settings</b>, <b>"
+"Abbreviations</b> tab."
+msgstr "<b>展开缩写</b><p>启用和配置<b>KDevelop 设置</b>、<b>缩写</b>页中的缩写项目。"
 
-#: parts/documentation/searchview.cpp:148
-msgid "Full text search has to be set up before usage."
+#: parts/abbrev/abbrevpart.cpp:244
+msgid "Abbreviations"
+msgstr "缩写"
+
+#: parts/quickopen/quickopenfunctiondialog.cpp:45
+msgid "Function &name:"
+msgstr "函数名称(&N)："
+
+#: parts/quickopen/quickopenfunctiondialog.cpp:46
+msgid "Function &list:"
+msgstr "函数列表(&L)："
+
+#: parts/quickopen/quickopenfunctiondialog.cpp:136
+msgid "Error: cannot find matching name function."
 msgstr ""
 
-#: parts/documentation/searchview.cpp:151
+#: parts/quickopen/quickopen_part.cpp:58
+msgid "Quick Open File..."
+msgstr "快速打开文件..."
+
+#: parts/quickopen/quickopen_part.cpp:61
+msgid "Quick open file in project"
+msgstr "快速打开工程中的文件"
+
+#: parts/quickopen/quickopen_part.cpp:62
 msgid ""
-"Now the full text search database will be created.\n"
-"Wait for database creation to finish and then repeat search."
-msgstr ""
+"<b>Quick open</b>"
+"<p>Provides a file name input form with completion listbox to quickly open file "
+"in a project."
+msgstr "<b>快速打开</b><p>提供一个具有补全功能的文件名输入表格，以便快速打开工程中的文件。"
 
-#: parts/documentation/searchview.cpp:158
+#: parts/quickopen/quickopen_part.cpp:64
+msgid "Quick Open Class..."
+msgstr "快速打开类..."
+
+#: parts/quickopen/quickopen_part.cpp:67
+msgid "Find class in project"
+msgstr "在工程中查找类"
+
+#: parts/quickopen/quickopen_part.cpp:68
 msgid ""
-"Cannot find the htsearch executable.\n"
-"It is part of the ht://Dig package that is used by KDevelop to perform full "
-"text search. Please install ht://Dig and use Documentation page in Configure "
-"KDevelop dialog to set the htsearch location."
+"<b>Find class</b>"
+"<p>Provides a class name input form with completion listbox to quickly open a "
+"file where the class is defined."
+msgstr "<b>类查找</b><p>提供一个具有补全功能的类名输入表格，以便快速打开定义该类的文件。"
+
+#: parts/quickopen/quickopen_part.cpp:70
+msgid "Quick Open Method..."
+msgstr "快速打开方法..."
+
+#: parts/quickopen/quickopen_part.cpp:71
+msgid "Quick open function in project"
+msgstr "快速打开工程中的函数"
+
+#: parts/quickopen/quickopen_part.cpp:73
+msgid "Switch To..."
+msgstr "切换到..."
+
+#: parts/quickopen/quickopen_part.cpp:74
+msgid "Switch to"
+msgstr "切换到"
+
+#: parts/quickopen/quickopen_part.cpp:75
+msgid ""
+"<b>Switch to</b>"
+"<p>Prompts to enter the name of previously opened file to switch to."
+msgstr "<b>切换到</b><p>询问并切换到以前打开的文件。"
+
+#: parts/quickopen/quickopenfunctionchooseform.cpp:34
+#, c-format
+msgid "Select One Argument or File of Function %1"
 msgstr ""
 
-#: parts/documentation/searchview.cpp:174
-#, fuzzy
-msgid "Cannot find the htdig configuration file."
-msgstr "不读取默认配置文件"
+#: parts/quickopen/quickopenclassdialog.cpp:42
+msgid "Class &list:"
+msgstr "类列表(&L)："
 
-#: parts/documentation/searchview.cpp:207
-#, fuzzy
-msgid "Cannot start the htsearch executable."
-msgstr "无法运行 htsearch 可执行文件！"
+#: parts/quickopen/quickopenclassdialog.cpp:81
+#, fuzzy, c-format
+msgid "Select The Location of Class %1"
+msgstr "选择连接工具"
 
-#: parts/documentation/indexview.cpp:48
-msgid "&Look for:"
-msgstr "查找(&L)："
+#: parts/texttools/texttoolspart.cpp:61 parts/texttools/texttoolspart.cpp:64
+#: parts/texttools/texttoolswidget.cpp:157
+msgid "Text Structure"
+msgstr "文本结构"
 
-#: parts/documentation/tools/htdig/htdigindex.cpp:43
-msgid "Generating Search Index"
-msgstr "生成搜索索引"
+#: parts/texttools/texttoolspart.cpp:62
+msgid "<b>Text Structure</b><p>This browser shows the structure of the text."
+msgstr "<b>文本结构</b><p>这个浏览器显示您的文本的结构。"
 
-#: parts/documentation/tools/htdig/htdigindex.cpp:63
-msgid "Scanning for files"
-msgstr "正在扫描文件"
+#: parts/texttools/texttoolspart.cpp:64
+msgid "Text structure"
+msgstr "文本结构"
 
-#: parts/documentation/tools/htdig/htdigindex.cpp:73
-msgid "Extracting search terms"
-msgstr "正在提取搜索项目"
+#: parts/appwizard/importdlg.cpp:61
+msgid "Choose directory to import"
+msgstr "选择要导入的目录"
 
-#: parts/documentation/tools/htdig/htdigindex.cpp:82
-msgid "Generating index..."
-msgstr "正在生成索引..."
+#: parts/appwizard/importdlg.cpp:111
+msgid "You have to choose a directory."
+msgstr "您必须指定一个目录。"
 
-#: parts/documentation/tools/htdig/htdigindex.cpp:125
-#, c-format
-msgid "Files processed: %1"
-msgstr "已处理的文件：%1"
+#: parts/appwizard/importdlg.cpp:117
+msgid "You have to choose a project name."
+msgstr "您必须指定一个工程名称。"
 
-#: parts/documentation/tools/htdig/htdigindex.cpp:350
-msgid "Running htdig failed"
-msgstr "运行 htdig 失败"
+#: parts/appwizard/importdlg.cpp:123
+msgid "Your application name should only contain letters and numbers."
+msgstr "您的应用程序名只能包含字母和数字。"
 
-#: parts/documentation/tools/htdig/htdigindex.cpp:411
-msgid "Running htmerge failed"
-msgstr "运行 htmerge 失败"
+#: parts/appwizard/importdlg.cpp:139
+msgid "Cannot open project template."
+msgstr "无法打开工程模板。"
 
-#: parts/documentation/tools/htdig/htdigindex.cpp:448
-#, fuzzy
-msgid "Update user's htdig configuration file only"
-msgstr "编译器配置文件："
+#: parts/appwizard/appwizarddlg.cpp:1016 parts/appwizard/importdlg.cpp:152
+#: src/projectmanager.cpp:375
+msgid ""
+"This is not a valid project file.\n"
+"XML error in line %1, column %2:\n"
+"%3"
+msgstr ""
+"这不是一个有效的工程文件。\n"
+"%1 行 %2 列 XML 格式错误：\n"
+"%3"
 
-#: parts/documentation/tools/htdig/htdigindex.cpp:449
-#, fuzzy
-msgid "-c and generate index"
-msgstr "正在生成索引..."
+#: parts/appwizard/importdlg.cpp:193
+msgid "Cannot write the project file."
+msgstr "无法写入工程文件。"
 
-#: parts/documentation/tools/htdig/htdigindex.cpp:453
-msgid "KDevelop ht://Dig Indexer"
+#: parts/appwizard/importdlg.cpp:553
+msgid "Generate build system infrastrucure"
 msgstr ""
 
-#: parts/documentation/tools/htdig/htdigindex.cpp:454
-#, fuzzy
-msgid "TDE Index generator for documentation files."
-msgstr "TDE 帮助文件索引生成器"
+#: parts/appwizard/importdlg.cpp:567
+msgid ""
+"Project infrastrucure already exists in target directory.\n"
+"Generate new project infrastructure and overwrite old?"
+msgstr ""
 
-#: parts/documentation/tools/htdig/htdigindex.cpp:470
+#: parts/appwizard/importdlg.cpp:567
 #, fuzzy
-msgid "Configuration file updated."
-msgstr "编译器配置文件："
+msgid "Generate"
+msgstr "生成(&G)"
 
-#: parts/documentation/tools/htdig/htdigindex.cpp:472
+#: parts/appwizard/importdlg.cpp:567
 #, fuzzy
-msgid "Configuration file update failed."
-msgstr "编译器配置文件："
+msgid "Do Not Generate"
+msgstr "生成(&G)"
 
-#: parts/documentation/plugins/qt/docqtplugin.cpp:195
-msgid "Qt Documentation Collection"
-msgstr "Qt 文档集"
+#: parts/appwizard/appwizarddlg.cpp:108
+msgid "&Add to Favorites"
+msgstr "添加到收藏夹(&A)"
 
-#: parts/documentation/plugins/chm/docchmplugin.cpp:75
-#, fuzzy
-msgid "CHM Documentation Collection"
-msgstr "Qt 文档集"
+#: parts/appwizard/appwizarddlg.cpp:111
+msgid "&Remove Favorite"
+msgstr "删除收藏夹(&R)"
 
-#: parts/documentation/plugins/pdb/docpdbplugin.cpp:30
-#, fuzzy
-msgid "PalmDoc documentation plugin"
-msgstr "Qt 文档集"
+#: parts/appwizard/appwizarddlg.cpp:288
+msgid "Choose projects directory"
+msgstr "选择工程目录"
 
-#: parts/documentation/plugins/pdb/docpdbplugin.cpp:52
+#: parts/appwizard/appwizarddlg.cpp:338
+msgid ""
+"_: no version control system\n"
+"None"
+msgstr "无"
+
+#: parts/appwizard/appwizarddlg.cpp:387
+msgid "Version Control System"
+msgstr "版本控制系统"
+
+#: parts/appwizard/appwizarddlg.cpp:458
+msgid ""
+"The directory you have chosen as the location for the project already exists."
+msgstr "您为工程指定的目录已经存在。"
+
+#: parts/appwizard/appwizarddlg.cpp:467
 #, fuzzy
-msgid "PalmDoc Documentation Collection"
-msgstr "KDoc 文档集"
+msgid ""
+"The directory you have chosen as the location for the project is not writeable."
+msgstr "您为工程指定的目录已经存在。"
 
-#: parts/documentation/plugins/pdf/docpdfplugin.cpp:30
+#: parts/appwizard/appwizarddlg.cpp:489
 #, fuzzy
-msgid "PDF documentation plugin"
-msgstr "Qt 文档集"
+msgid "The template %1 cannot be opened."
+msgstr "这个项目无法删除"
 
-#: parts/documentation/plugins/pdf/docpdfplugin.cpp:52
+#: parts/appwizard/appwizarddlg.cpp:648
 #, fuzzy
-msgid "PDF Documentation Collection"
-msgstr "KDoc 文档集"
+msgid "The directory %1 cannot be created."
+msgstr "这个项目无法删除"
 
-#: parts/documentation/plugins/djvu/docdjvuplugin.cpp:30
+#: parts/appwizard/appwizarddlg.cpp:667
 #, fuzzy
-msgid "Djvu documentation plugin"
-msgstr "Qt 文档集"
+msgid "The archive %1 cannot be opened."
+msgstr "这个项目无法删除"
 
-#: parts/documentation/plugins/djvu/docdjvuplugin.cpp:52
+#: parts/appwizard/appwizarddlg.cpp:685 parts/appwizard/appwizarddlg.cpp:827
 #, fuzzy
-msgid "Djvu Documentation Collection"
-msgstr "KDoc 文档集"
+msgid "The file %1 cannot be created."
+msgstr "这个项目无法删除"
 
-#: parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp:80
-msgid "KDevelopTOC Documentation Collection"
-msgstr "KDevelopTOC 文档集"
+#: parts/appwizard/appwizarddlg.cpp:693
+msgid ""
+"The directory above the chosen location does not exist and cannot be created."
+msgstr "指定位置的目录不存在，而且无法创建。"
 
-#: parts/documentation/plugins/devhelp/docdevhelpplugin.cpp:120
-#, fuzzy
-msgid "Devhelp Documentation Collection"
-msgstr "DevHelp 文档集"
+#: parts/appwizard/appwizarddlg.cpp:896
+msgid "Template for .%1 Files"
+msgstr "%1 文件的模板"
 
-#: parts/documentation/plugins/doxygen/docdoxygenplugin.cpp:126
-msgid "Doxygen Documentation Collection"
-msgstr "Doxygen 文档集"
+#: parts/appwizard/appwizarddlg.cpp:922
+#, fuzzy
+msgid "Set default project location to: %1?"
+msgstr "默认工程目录设置为："
 
-#: parts/documentation/plugins/doxygen/docdoxygenplugin.cpp:453
-msgid "%1 Class Reference"
-msgstr ""
+#: kdevdesigner/designer/mainwindow.cpp:1336
+#: parts/appwizard/appwizarddlg.cpp:923
+msgid "New Project"
+msgstr "新建工程"
 
-#: parts/documentation/plugins/doxygen/docdoxygenplugin.cpp:470
-msgid "%1::%2%3 Member Reference"
-msgstr ""
+#: parts/appwizard/appwizarddlg.cpp:923
+#, fuzzy
+msgid "Set"
+msgstr "set"
 
-#: parts/documentation/plugins/custom/doccustomplugin.cpp:55
+#: parts/appwizard/appwizarddlg.cpp:923
 #, fuzzy
-msgid "Custom Documentation Collection"
-msgstr "Qt 文档集"
+msgid "Do Not Set"
+msgstr "简洁的编译器输出"
 
-#: parts/documentation/protocols/chm/kchmpart.cpp:62
-msgid "KChm"
-msgstr "KChm"
+#: parts/appwizard/appwizarddlg.cpp:949
+msgid ""
+"_: invalid location\n"
+" (invalid)"
+msgstr " (无效)"
 
-#: parts/filter/shellfilterdlg.cpp:122 parts/filter/shellinsertdlg.cpp:119
-#, c-format
-msgid "Process exited with status %1"
-msgstr "进程退出，状态 %1"
+#: parts/appwizard/appwizarddlg.cpp:951
+#, fuzzy
+msgid " (dir/file already exists)"
+msgstr " (目录/文件已经存在)"
 
-#: parts/filter/filterpart.cpp:40
-msgid "Execute Command..."
-msgstr "执行命令..."
+#: parts/appwizard/filepropspage.cpp:69
+msgid "Header/Implementation file:"
+msgstr "头文件/实现文件："
 
-#: parts/filter/filterpart.cpp:43
-msgid "Execute shell command"
-msgstr "执行 shell 命令"
+#: parts/appwizard/appwizardpart.cpp:45
+msgid "&New Project..."
+msgstr "新建工程(&N)..."
 
-#: parts/filter/filterpart.cpp:44
-#, fuzzy
+#: parts/appwizard/appwizardpart.cpp:48
+msgid "Generate a new project from a template"
+msgstr "从模板生成新的工程"
+
+#: parts/appwizard/appwizardpart.cpp:49
 msgid ""
-"<b>Execute shell command</b>"
-"<p>Executes a shell command and outputs its result into the current document."
-msgstr "<b>执行 shell 命令</b><p>执行一条 shell 命令，将它的结果输出到当前文档中。"
+"<b>New project</b>"
+"<p>This starts KDevelop's application wizard. It helps you to generate a "
+"skeleton for your application from a set of templates."
+msgstr "<b>新建工程</b><p>它启动 KDevelop 的应用程序向导。它能帮助您从模板为您的应用程序建立一个基本框架。"
 
-#: parts/filter/filterpart.cpp:46
-msgid "Filter Selection Through Command..."
-msgstr "用命令过滤选择区..."
+#: parts/appwizard/appwizardpart.cpp:54
+msgid "&Import Existing Project..."
+msgstr "导入已有的工程(&I)..."
 
-#: parts/filter/filterpart.cpp:49
-#, fuzzy
-msgid "Filter selection through a shell command"
-msgstr "用 shell 命令过滤选择区"
+#: parts/appwizard/appwizardpart.cpp:57
+msgid "Import existing project"
+msgstr "导入已有的工程"
 
-#: parts/filter/filterpart.cpp:50
-#, fuzzy
+#: parts/appwizard/appwizardpart.cpp:58
 msgid ""
-"<b>Filter selection through shell command</b>"
-"<p>Filters selection through a shell command and outputs its result into the "
-"current document."
-msgstr "<b>用 shell 命令过滤选择区</b><p>将选择区内容使用一条 shell 命令进行过滤，结果输出到当前文档中。"
+"<b>Import existing project</b>"
+"<p>Creates a project file for a given directory."
+msgstr "<b>导入已有的工程给</b><p>为给定的目录创建一个工程文件。"
 
-#: parts/filter/filterpart.cpp:96
-msgid "Execute Command"
-msgstr "执行命令"
+#: parts/snippet/snippet_part.cpp:47 parts/snippet/snippet_part.cpp:52
+#: parts/snippet/snippet_part.cpp:100 parts/snippet/snippet_widget.cpp:564
+msgid "Code Snippets"
+msgstr "代码片断"
 
-#: parts/filter/filterpart.cpp:142
-msgid "Filter Selection Through Command"
-msgstr "用命令过滤选择区"
+#: parts/snippet/snippet_part.cpp:50
+msgid "<b>Code Snippet</b><p>This is a list of available snippets."
+msgstr ""
 
-#: parts/outputviews/appoutputviewpart.cpp:45
-msgid "Application Output"
-msgstr "应用程序输出"
+#: parts/snippet/snippet_part.cpp:52
+msgid "Insert a code snippet"
+msgstr "插入代码片断"
 
-#: parts/outputviews/appoutputviewpart.cpp:46
-msgid ""
-"<b>Application output</b>"
-"<p>The stdout/stderr output window is a replacement for terminal-based "
-"application communication. Running terminal applications use this instead of a "
-"terminal window."
-msgstr "<b>应用程序输出</b><p>标准/错误输出窗口是基于终端的应用程序通信的替代品。在这里而不是终端窗口运行终端应用程序。"
+#: parts/snippet/snippet_part.cpp:76
+#, fuzzy
+msgid "Show Snippet Tree"
+msgstr "代码片断"
 
-#: parts/outputviews/appoutputviewpart.cpp:51
-msgid "Output of the executed user program"
-msgstr "所执行的用户程序的输出"
+#: parts/snippet/snippet_part.cpp:84
+msgid "SnippetPart"
+msgstr "SnippetPart"
 
-#: parts/outputviews/appoutputviewpart.cpp:108
-msgid "Press Enter to continue!"
-msgstr "按回车继续！"
+#: parts/snippet/snippet_part.cpp:85
+#, fuzzy
+msgid "SnippetPart for TDevelop"
+msgstr "SnippetPart for KDevelop"
 
-#: parts/outputviews/makeviewpart.cpp:44
-#: parts/outputviews/outputviewsfactory.cpp:14
-msgid "Messages Output"
-msgstr "消息输出"
+#: parts/snippet/snippet_part.cpp:87
+msgid "(c) 2003"
+msgstr "(c) 2003"
 
-#: parts/outputviews/appoutputwidget.cpp:82
-#, c-format
-msgid "Assertion failed: %1"
-msgstr "断言失败：%1"
+#: parts/snippet/snippet_widget.cpp:141
+msgid "Add Group"
+msgstr "添加组"
 
-#: parts/outputviews/appoutputwidget.cpp:254
+#: buildtools/autotools/addtranslationdlg.cpp:42
+#: parts/snippet/snippet_widget.cpp:145 parts/snippet/snippet_widget.cpp:256
+#: parts/snippet/snippet_widget.cpp:535
+msgid "Language:"
+msgstr "语言："
+
+#: parts/snippet/snippet_widget.cpp:168
 #, fuzzy
-msgid "Clear output"
-msgstr "编译器输出(&C)："
+msgid "Do you really want to remove this group and all its snippets?"
+msgstr "您真要将文件 %1 返转并丢失您所有的改变吗？"
 
-#: parts/outputviews/appoutputwidget.cpp:257
+#: parts/snippet/snippet_widget.cpp:206
 #, fuzzy
-msgid "Copy selected lines"
-msgstr "更新选中的项目"
+msgid "Edit Snippet"
+msgstr "添加项目"
 
-#: parts/outputviews/appoutputwidget.cpp:260
+#: parts/snippet/snippet_widget.cpp:252
+msgid "Edit Group"
+msgstr "编辑组"
+
+#: parts/snippet/snippet_widget.cpp:554
+msgid "Add Item..."
+msgstr "添加项目..."
+
+#: parts/snippet/snippet_widget.cpp:555 parts/snippet/snippet_widget.cpp:566
+msgid "Add Group..."
+msgstr "添加组..."
+
+#: parts/snippet/snippet_widget.cpp:600
 #, fuzzy
-msgid "Save unfiltered"
-msgstr "保存选中文件"
+msgid "Please enter the value for <b>%1</b>:"
+msgstr "请输入 P4 用户。"
 
-#: parts/outputviews/appoutputwidget.cpp:261
+#: parts/snippet/snippet_widget.cpp:672 parts/snippet/snippet_widget.cpp:801
 #, fuzzy
-msgid "Save filtered output"
-msgstr "编译输出(&C)"
+msgid "Enter Values for Variables"
+msgstr "外部变量"
 
-#: parts/outputviews/appoutputwidget.cpp:268
+#: parts/snippet/snippet_widget.cpp:686
 #, fuzzy
-msgid "Edit filter"
-msgstr "编辑文件(&E)"
+msgid "Enter the replacement values for these variables:"
+msgstr "输入新文件的名称："
 
-#: parts/outputviews/makeitem.cpp:128
-msgid "*** Compilation aborted ***"
-msgstr "*** 编译中止 ***"
+#: parts/snippet/snippet_widget.cpp:712 parts/snippet/snippet_widget.cpp:830
+msgid ""
+"Enable this to save the value entered to the right as the default value for "
+"this variable"
+msgstr ""
 
-#: parts/outputviews/makeitem.cpp:133
-msgid "*** Success ***"
-msgstr "*** 成功 ***"
+#: parts/snippet/snippet_widget.cpp:713 parts/snippet/snippet_widget.cpp:831
+msgid ""
+"If you enable this option, the value entered to the right will be saved. If you "
+"use the same variable later, even in another snippet, the value entered to the "
+"right will be the default value for that variable."
+msgstr ""
 
-#: parts/outputviews/makeitem.cpp:146
-#, c-format
-msgid "Entering directory %1"
-msgstr "进入目录 %1"
+#: parts/snippet/snippet_widget.cpp:814
+#, fuzzy
+msgid "Enter the replacement values for %1:"
+msgstr "输入新文件的名称："
 
-#: parts/outputviews/makeitem.cpp:153
-#, c-format
-msgid "Leaving directory %1"
-msgstr "退出目录 %1"
+#: parts/snippet/snippet_widget.cpp:820
+msgid "Make value &default"
+msgstr "置为默认值(&D)"
+
+#: parts/outputviews/makeviewpart.cpp:44
+#: parts/outputviews/outputviewsfactory.cpp:14
+msgid "Messages Output"
+msgstr "消息输出"
 
 #: parts/outputviews/makeviewpart.cpp:45
 msgid ""
@@ -23470,6 +20621,42 @@ msgid ""
 "<p>Switches to the file and line where the previous error was reported from."
 msgstr "<b>上一个错误</b><p>切换到引起上一个错误的文件和行。"
 
+#: parts/outputviews/appoutputwidget.cpp:82
+#, c-format
+msgid "Assertion failed: %1"
+msgstr "断言失败：%1"
+
+#: parts/outputviews/appoutputwidget.cpp:254
+#, fuzzy
+msgid "Clear output"
+msgstr "编译器输出(&C)："
+
+#: parts/outputviews/appoutputwidget.cpp:257
+#, fuzzy
+msgid "Copy selected lines"
+msgstr "更新选中的项目"
+
+#: parts/outputviews/appoutputwidget.cpp:260
+#, fuzzy
+msgid "Save unfiltered"
+msgstr "保存选中文件"
+
+#: parts/outputviews/appoutputwidget.cpp:261
+#, fuzzy
+msgid "Save filtered output"
+msgstr "编译输出(&C)"
+
+#: parts/outputviews/appoutputwidget.cpp:268
+#, fuzzy
+msgid "Edit filter"
+msgstr "编辑文件(&E)"
+
+#: parts/diff/diffwidget.cpp:93 parts/diff/diffwidget.cpp:326
+#: parts/outputviews/appoutputwidget.cpp:271
+#, fuzzy
+msgid "Hide view"
+msgstr "新建视图"
+
 #: parts/outputviews/makeactionfilter.cpp:75
 #: parts/outputviews/makeactionfilter.cpp:76
 #: parts/outputviews/makeactionfilter.cpp:77
@@ -23507,115 +20694,208 @@ msgstr "正在创建"
 msgid "installing"
 msgstr "正在安装"
 
-#: parts/outputviews/makewidget.cpp:573
+#: parts/outputviews/makeitem.cpp:124
+msgid "*** Compilation aborted ***"
+msgstr "*** 编译中止 ***"
+
+#: lib/widgets/processwidget.cpp:230 parts/outputviews/makeitem.cpp:127
+msgid "*** Exited with status: %1 ***"
+msgstr "*** 退出状态：%1 ***"
+
+#: parts/outputviews/makeitem.cpp:129
+msgid "*** Success ***"
+msgstr "*** 成功 ***"
+
+#: parts/outputviews/makeitem.cpp:142
+#, c-format
+msgid "Entering directory %1"
+msgstr "进入目录 %1"
+
+#: parts/outputviews/makeitem.cpp:149
+#, c-format
+msgid "Leaving directory %1"
+msgstr "退出目录 %1"
+
+#: parts/outputviews/appoutputviewpart.cpp:45
+msgid "Application Output"
+msgstr "应用程序输出"
+
+#: parts/outputviews/appoutputviewpart.cpp:46
+msgid ""
+"<b>Application output</b>"
+"<p>The stdout/stderr output window is a replacement for terminal-based "
+"application communication. Running terminal applications use this instead of a "
+"terminal window."
+msgstr "<b>应用程序输出</b><p>标准/错误输出窗口是基于终端的应用程序通信的替代品。在这里而不是终端窗口运行终端应用程序。"
+
+#: parts/outputviews/appoutputviewpart.cpp:51
+msgid "Output of the executed user program"
+msgstr "所执行的用户程序的输出"
+
+#: parts/outputviews/appoutputviewpart.cpp:108
+msgid "Press Enter to continue!"
+msgstr "按回车继续！"
+
+#: parts/outputviews/makewidget.cpp:569
 msgid "The process has finished with errors"
 msgstr "进程出错结束"
 
-#: parts/outputviews/makewidget.cpp:578
+#: parts/outputviews/makewidget.cpp:574
 msgid "The process has finished successfully"
 msgstr "进程成功结束"
 
-#: parts/outputviews/makewidget.cpp:705
+#: parts/outputviews/makewidget.cpp:701
 msgid "Line Wrapping"
 msgstr "文本换行"
 
-#: parts/outputviews/makewidget.cpp:707
+#: parts/outputviews/makewidget.cpp:703
 msgid ""
 "<b>Line wrapping</b>"
 "<p>Enables or disables wrapping of command lines displayed."
 msgstr "<b>文本换行</b><p>启用或禁用命令行显示的文本换行。"
 
-#: parts/outputviews/makewidget.cpp:710
+#: parts/outputviews/makewidget.cpp:706
 msgid "Very Short Compiler Output"
 msgstr "非常简洁的编译器输出"
 
-#: parts/outputviews/makewidget.cpp:711
+#: parts/outputviews/makewidget.cpp:707
 msgid ""
 "<b>Very short compiler output</b>"
 "<p>Displays only warnings, errors and the file names which are compiled."
 msgstr "<b>非常简洁的编译器输出</b><p>只显示警告、错误和编译的文件名。"
 
-#: parts/outputviews/makewidget.cpp:713
+#: parts/outputviews/makewidget.cpp:709
 msgid "Short Compiler Output"
 msgstr "简洁的编译器输出"
 
-#: parts/outputviews/makewidget.cpp:714
+#: parts/outputviews/makewidget.cpp:710
 msgid ""
 "<b>Short compiler output</b>"
 "<p>Suppresses all the compiler flags and formats to something readable."
 msgstr "<b>简洁的编译器输出</b><p>不显示所有的编译器选项，并使用容易阅读的格式。"
 
-#: parts/outputviews/makewidget.cpp:716
+#: parts/outputviews/makewidget.cpp:712
 msgid "Full Compiler Output"
 msgstr "完整的编译器输出"
 
-#: parts/outputviews/makewidget.cpp:717
+#: parts/outputviews/makewidget.cpp:713
 msgid "<b>Full compiler output</b><p>Displays unmodified compiler output."
 msgstr "<b>完整的编译器输出</b><p>显示未经修改的完整编译器输出。"
 
-#: parts/outputviews/makewidget.cpp:721
+#: parts/outputviews/makewidget.cpp:717
 msgid "Show Directory Navigation Messages"
 msgstr "显示目录切换消息"
 
-#: parts/outputviews/makewidget.cpp:722
+#: parts/outputviews/makewidget.cpp:718
 msgid ""
 "<b>Show directory navigation messages</b>"
 "<p>Shows <b>cd</b> commands that are executed while building."
 msgstr "<b>显示目录切换消息</b><p>显示编译时执行的 <b>cd</b> 命令。"
 
-#: parts/texttools/texttoolspart.cpp:61 parts/texttools/texttoolspart.cpp:64
-#: parts/texttools/texttoolswidget.cpp:157
-msgid "Text Structure"
-msgstr "文本结构"
+#: parts/classview/viewcombos.cpp:121
+msgid "(Global Namespace)"
+msgstr "(全局名字空间)"
 
-#: parts/texttools/texttoolspart.cpp:62
-msgid "<b>Text Structure</b><p>This browser shows the structure of the text."
-msgstr "<b>文本结构</b><p>这个浏览器显示您的文本的结构。"
+#: parts/classview/classtoolwidget.cpp:37
+msgid "Class Tool"
+msgstr "类工具"
 
-#: parts/texttools/texttoolspart.cpp:64
-msgid "Text structure"
-msgstr "文本结构"
+#: parts/classview/classviewwidget.cpp:69
+msgid "Group by Directories"
+msgstr "按目录分组"
 
-#: parts/openwith/openwithpart.cpp:48
-msgid "Open as UTF-8"
-msgstr "按 UTF-8 编码打开"
+#: parts/classview/classviewwidget.cpp:69
+msgid "Plain List"
+msgstr "简单列表"
 
-#: parts/openwith/openwithpart.cpp:52
-#, fuzzy
-msgid "Open As"
-msgstr "打开文件"
+#: parts/classview/classviewwidget.cpp:69
+msgid "Java Like Mode"
+msgstr "类 Java 方式"
 
-#: parts/openwith/openwithpart.cpp:53
-#, fuzzy
+#: parts/classview/classviewwidget.cpp:70
+msgid "View Mode"
+msgstr "查看模式"
+
+#: parts/classview/classviewwidget.cpp:72
 msgid ""
-"<b>Open As</b>"
-"<p>Lists all encodings that can be used to open the selected file."
-msgstr "<b>打开方式</b><p>列出能用来打开所选择文件的所有应用程序。"
+"<b>View mode</b>"
+"<p>Class browser items can be grouped by directories, listed in a plain or java "
+"like view."
+msgstr "<b>查看模式</b><p>类浏览器显示的项目可以按目录分组、简单列表或者显示为类似 Java 的视图。"
 
-#: parts/openwith/openwithpart.cpp:82
-msgid "Open With"
-msgstr "打开方式"
+#: parts/classview/classviewwidget.cpp:76
+msgid "<b>New class</b><p>Calls the <b>New Class</b> wizard."
+msgstr "<b>新建类</b><p>启动<b>新建类</b>向导。"
 
-#: parts/openwith/openwithpart.cpp:83
+#: parts/classview/classviewwidget.cpp:78
+#, fuzzy
+msgid "Create get/set Methods"
+msgstr "创建主方法 &main"
+
+#: parts/classview/classtreebase.cpp:55 parts/classview/classviewwidget.cpp:81
+msgid "Add Method..."
+msgstr "添加方法..."
+
+#: parts/classview/classviewwidget.cpp:83
+msgid "<b>Add method</b><p>Calls the <b>New Method</b> wizard."
+msgstr "<b>添加方法</b><p>启动<b>新建方法</b>向导。"
+
+#: parts/classview/classtreebase.cpp:57 parts/classview/classviewwidget.cpp:84
+msgid "Add Attribute..."
+msgstr "添加属性..."
+
+#: parts/classview/classviewwidget.cpp:86
+msgid "<b>Add attribute</b><p>Calls the <b>New Attribute</b> wizard."
+msgstr "<b>添加属性</b><p>启动<b>新建属性</b>向导。"
+
+#: parts/classview/classviewwidget.cpp:88
+msgid "Open Declaration"
+msgstr "打开声明"
+
+#: parts/classview/classviewwidget.cpp:90
 msgid ""
-"<b>Open With</b>"
-"<p>Lists all applications that can be used to open the selected file."
-msgstr "<b>打开方式</b><p>列出能用来打开所选择文件的所有应用程序。"
+"<b>Open declaration</b>"
+"<p>Opens a file where the selected item is declared and jumps to the "
+"declaration line."
+msgstr "<b>打开声明</b><p>打开声明所选择的项目的文件，并转至声明所在的行。"
 
-#: parts/openwith/openwithpart.cpp:88
-msgid "Open With..."
-msgstr "打开方式..."
+#: parts/classview/classviewwidget.cpp:91
+msgid "Open Implementation"
+msgstr "打开实现"
 
-#: parts/openwith/openwithpart.cpp:89
+#: parts/classview/classviewwidget.cpp:93
 msgid ""
-"<b>Open With...</b>"
-"<p>Provides a dialog to choose the application to open the selected file."
-msgstr "<b>打开方式......</b><p>提供一个对话框选择用来打开所选择文件的应用程序。"
+"<b>Open implementation</b>"
+"<p>Opens a file where the selected item is defined (implemented) and jumps to "
+"the definition line."
+msgstr "<b>打开实现</b><p>打开定义(实现)所选择的项目的文件，并转至定义所在的行。"
 
-#: parts/classview/hierarchydlg.cpp:52
+#: parts/classview/classviewwidget.cpp:95
 #, fuzzy
-msgid "Refresh"
-msgstr "Lex 源文件"
+msgid "Follow Editor"
+msgstr "显示编辑器(&S)"
+
+#: parts/classview/navigator.cpp:113
+msgid "Sync ClassView"
+msgstr ""
+
+#: parts/classview/navigator.cpp:116
+#, fuzzy
+msgid "Jump to next function"
+msgstr "跳至下一个匹配的项目"
+
+#: parts/classview/navigator.cpp:120
+msgid "Jump to previous function"
+msgstr ""
+
+#: parts/classview/digraphview.cpp:228
+#, fuzzy
+msgid ""
+"You do not have 'dot' installed.\n"
+"It can be downloaded from www.graphviz.org."
+msgstr ""
+"您没有安装“dot”。\n"
+"它能在 www.graphviz.org 下载。"
 
 #: parts/classview/classtooldlg.cpp:45
 msgid "Show parents"
@@ -23703,19 +20983,6 @@ msgstr "类工具"
 msgid "%1 of Class %2"
 msgstr "类 %2 的 %1"
 
-#: parts/classview/navigator.cpp:113
-msgid "Sync ClassView"
-msgstr ""
-
-#: parts/classview/navigator.cpp:116
-#, fuzzy
-msgid "Jump to next function"
-msgstr "跳至下一个匹配的项目"
-
-#: parts/classview/navigator.cpp:120
-msgid "Jump to previous function"
-msgstr ""
-
 #: parts/classview/classviewpart.cpp:159
 msgid "Class Browser"
 msgstr "类浏览器"
@@ -23774,85 +21041,6 @@ msgid ""
 "not display classes outside inheritance hierarchy."
 msgstr "<b>继承图谱</b><p>显示工程中的类之间的继承关系。注意，它不显示继承体系之外的类。"
 
-#: parts/classview/classviewwidget.cpp:69
-msgid "Group by Directories"
-msgstr "按目录分组"
-
-#: parts/classview/classviewwidget.cpp:69
-msgid "Plain List"
-msgstr "简单列表"
-
-#: parts/classview/classviewwidget.cpp:69
-msgid "Java Like Mode"
-msgstr "类 Java 方式"
-
-#: parts/classview/classviewwidget.cpp:70
-msgid "View Mode"
-msgstr "查看模式"
-
-#: parts/classview/classviewwidget.cpp:72
-msgid ""
-"<b>View mode</b>"
-"<p>Class browser items can be grouped by directories, listed in a plain or java "
-"like view."
-msgstr "<b>查看模式</b><p>类浏览器显示的项目可以按目录分组、简单列表或者显示为类似 Java 的视图。"
-
-#: parts/classview/classviewwidget.cpp:76
-msgid "<b>New class</b><p>Calls the <b>New Class</b> wizard."
-msgstr "<b>新建类</b><p>启动<b>新建类</b>向导。"
-
-#: parts/classview/classviewwidget.cpp:78
-#, fuzzy
-msgid "Create get/set Methods"
-msgstr "创建主方法 &main"
-
-#: parts/classview/classtreebase.cpp:55 parts/classview/classviewwidget.cpp:81
-msgid "Add Method..."
-msgstr "添加方法..."
-
-#: parts/classview/classviewwidget.cpp:83
-msgid "<b>Add method</b><p>Calls the <b>New Method</b> wizard."
-msgstr "<b>添加方法</b><p>启动<b>新建方法</b>向导。"
-
-#: parts/classview/classtreebase.cpp:57 parts/classview/classviewwidget.cpp:84
-msgid "Add Attribute..."
-msgstr "添加属性..."
-
-#: parts/classview/classviewwidget.cpp:86
-msgid "<b>Add attribute</b><p>Calls the <b>New Attribute</b> wizard."
-msgstr "<b>添加属性</b><p>启动<b>新建属性</b>向导。"
-
-#: parts/classview/classviewwidget.cpp:88
-msgid "Open Declaration"
-msgstr "打开声明"
-
-#: parts/classview/classviewwidget.cpp:90
-msgid ""
-"<b>Open declaration</b>"
-"<p>Opens a file where the selected item is declared and jumps to the "
-"declaration line."
-msgstr "<b>打开声明</b><p>打开声明所选择的项目的文件，并转至声明所在的行。"
-
-#: parts/classview/classviewwidget.cpp:91
-msgid "Open Implementation"
-msgstr "打开实现"
-
-#: parts/classview/classviewwidget.cpp:93
-msgid ""
-"<b>Open implementation</b>"
-"<p>Opens a file where the selected item is defined (implemented) and jumps to "
-"the definition line."
-msgstr "<b>打开实现</b><p>打开定义(实现)所选择的项目的文件，并转至定义所在的行。"
-
-#: parts/classview/classviewwidget.cpp:95
-#, fuzzy
-msgid "Follow Editor"
-msgstr "显示编辑器(&S)"
-
-#: parts/classview/classtoolwidget.cpp:37
-msgid "Class Tool"
-msgstr "类工具"
-
 #: parts/classview/classtreebase.cpp:59
 msgid "Parent Classes..."
 msgstr "父类..."
@@ -23878,3050 +21066,2727 @@ msgstr "属性"
 msgid "Signal"
 msgstr "信号"
 
-#: parts/classview/viewcombos.cpp:121
-msgid "(Global Namespace)"
-msgstr "(全局名字空间)"
-
-#: parts/classview/digraphview.cpp:228
+#: parts/classview/hierarchydlg.cpp:52
 #, fuzzy
+msgid "Refresh"
+msgstr "Lex 源文件"
+
+#: parts/partexplorer/partexplorerform.cpp:49
+msgid "Name: %1 | Type: %2 | Value: %3"
+msgstr "名称：%1 | 类型：%2 | 值：%3"
+
+#: parts/partexplorer/partexplorerform.cpp:112
+msgid "Part Explorer - A Services Lister"
+msgstr "组件浏览器 - 服务列表"
+
+#: parts/partexplorer/partexplorerform.cpp:122
 msgid ""
-"You do not have 'dot' installed.\n"
-"It can be downloaded from www.graphviz.org."
-msgstr ""
-"您没有安装“dot”。\n"
-"它能在 www.graphviz.org 下载。"
+"<b>Matching services</b>"
+"<p>Results (if any) are shown grouped by matching service name."
+msgstr "<b>匹配服务</b><p>输出结果(若存在)按匹配的服务名称分组显示。"
 
-#: parts/fileselector/tdeactionselector.cpp:70
-msgid "&Available:"
-msgstr "可用的(&A)："
+#: kdevdesigner/designer/mainwindowactions.cpp:310
+#: parts/partexplorer/partexplorerform.cpp:129
+msgid "&Search"
+msgstr "搜索(&S)"
 
-#: parts/fileselector/tdeactionselector.cpp:85
-msgid "&Selected:"
-msgstr "所选择的(&S)："
+#: parts/partexplorer/partexplorerform.cpp:181
+msgid "Unknown error."
+msgstr "未知错误。"
 
-#: parts/fileselector/fileselector_part.cpp:50
-#: parts/fileselector/fileselector_part.cpp:52
-#: parts/fileselector/fileselector_part.cpp:85
-msgid "File Selector"
-msgstr "文件选择器"
+#: parts/partexplorer/partexplorerform.cpp:194
+#, fuzzy
+msgid "No service found matching the criteria."
+msgstr "未找到和规则相匹配的服务！"
 
-#: parts/fileselector/fileselector_part.cpp:52
-msgid "File selector"
-msgstr "文件选择器"
+#: parts/partexplorer/partexplorer_plugin.cpp:43
+msgid "&Part Explorer"
+msgstr "组件浏览器(&P)"
 
-#: parts/fileselector/fileselector_part.cpp:53
+#: parts/partexplorer/partexplorer_plugin.cpp:45
+msgid "TDETrader query execution"
+msgstr "TDETrader 查询执行"
+
+#: parts/partexplorer/partexplorer_plugin.cpp:46
 msgid ""
-"<b>File selector</b>"
-"<p>This file selector lists directory contents and provides some file "
-"management functions."
-msgstr "<b>文件选择器</b><p>文件选择器列出目录内容并提供一些文件管理功能。"
+"<b>Part explorer</b>"
+"<p>Shows a dialog for TDETrader query execution. Search your TDE documentation "
+"for more information about TDE services and TDETrader."
+msgstr ""
+"<b>组件浏览器</b>"
+"<p>显示一个执行 TDETrader 查询的对话框。关于 TDE 服务和 TDETrader 的更多信息请您在 TDE 文档中查找。"
 
-#: buildtools/script/scriptprojectpart.cpp:53
-#: parts/fileselector/fileselector_part.cpp:57
-msgid "New File..."
-msgstr "新建文件..."
+#: parts/astyle/astyle_part.cpp:53
+msgid "&Reformat Source"
+msgstr "重新排版源代码(&R)"
 
-#: parts/fileselector/fileselector_widget.cpp:188
-msgid "Current Document Directory"
-msgstr "当前文档目录"
+#: parts/astyle/astyle_part.cpp:55
+msgid "Reformat source"
+msgstr "重新排版源代码"
 
-#: parts/fileselector/fileselector_widget.cpp:217
+#: parts/astyle/astyle_part.cpp:56
 msgid ""
-"<p>Here you can enter a path for a directory to display."
-"<p>To go to a directory previously entered, press the arrow on the right and "
-"choose one. "
-"<p>The entry has directory completion. Right-click to choose how completion "
-"should behave."
+"<b>Reformat source</b>"
+"<p>Source reformatting functionality using <b>astyle</b> "
+"library. Also available in <b>New Class</b> and <b>Subclassing</b> wizards."
 msgstr ""
-"<p>在此您可以输入要显示的目录路径。"
-"<p>点击右侧的箭头，可以选择以前输入的目录。"
-"<p>此输入具有目录补全功能，右键单击可以选择如何进行补全。"
+"<b>重新排版源代码</b>"
+"<p>重新排版源代码功能使用<b>astyle</b>代码库，它也存在于<b>新建类</b>和<b>子类划分</b>向导中。"
 
-#: parts/fileselector/fileselector_widget.cpp:223
+#: parts/astyle/astyle_part.cpp:59 parts/astyle/astyle_part.cpp:61
+#: parts/astyle/astyle_part.cpp:410
+#, fuzzy
+msgid "Format files"
+msgstr "脚注文件"
+
+#: parts/astyle/astyle_part.cpp:62
+#, fuzzy
 msgid ""
-"<p>Here you can enter a name filter to limit which files are displayed."
-"<p>To clear the filter, toggle off the filter button to the left."
-"<p>To reapply the last filter used, toggle on the filter button."
-msgstr "<p>在此您可以输入名字过滤器，限制要显示的文件。<p>关闭左侧的过滤器按钮可以清除过滤器。<p>启用过滤器按钮可以再次应用上次的过滤器。"
+"<b>Fomat files</b>"
+"<p>Formatting functionality using <b>astyle</b> library. Also available in <b>"
+"New Class</b> and <b>Subclassing</b> wizards."
+msgstr ""
+"<b>重新排版源代码</b>"
+"<p>重新排版源代码功能使用<b>astyle</b>代码库，它也存在于<b>新建类</b>和<b>子类划分</b>向导中。"
 
-#: parts/fileselector/fileselector_widget.cpp:588
-msgid "Toolbar"
-msgstr "工具栏"
+#: parts/astyle/astyle_part.cpp:67 parts/astyle/astyle_part.cpp:68
+msgid "Formatting"
+msgstr "格式化"
 
-#: parts/fileselector/fileselector_widget.cpp:590
-msgid "A&vailable actions:"
-msgstr "可用的动作(&V)："
+#: parts/astyle/astyle_part.cpp:402
+#, fuzzy
+msgid "Format selection"
+msgstr "格式化"
 
-#: parts/fileselector/fileselector_widget.cpp:591
-msgid "S&elected actions:"
-msgstr "所选择的动作(&E)："
+#: parts/astyle/astyle_part.cpp:403
+msgid "<b>Format</b><p>Formats the current selection, if possible"
+msgstr ""
 
-#: parts/fileselector/fileselector_widget.cpp:599
-msgid "Auto Synchronization"
-msgstr "自动同步"
+#: parts/astyle/astyle_part.cpp:411
+#, fuzzy
+msgid "<b>Format files</b><p>Formats selected files if possible"
+msgstr "<b>提交文件</b><p>将修改过的文件提交到仓库。"
 
-#: parts/fileselector/fileselector_widget.cpp:600
-msgid "When a docu&ment becomes active"
-msgstr "当文档激活时(&M)"
+#: parts/astyle/astyle_part.cpp:523
+#, c-format
+msgid "Not able to write %1"
+msgstr ""
 
-#: parts/fileselector/fileselector_widget.cpp:601
-msgid "When a document is o&pened"
-msgstr "当文档打开时(&P)"
+#: parts/astyle/astyle_part.cpp:528
+#, c-format
+msgid "Not able to read %1"
+msgstr ""
 
-#: parts/fileselector/fileselector_widget.cpp:602
-msgid "When the file selector becomes visible"
-msgstr "当文件选择器出现时"
+#: parts/astyle/astyle_part.cpp:534
+#, fuzzy
+msgid "Processed %1 files ending with extensions %2"
+msgstr "新文件名(和扩展名)(&N)："
 
-#: parts/fileselector/fileselector_widget.cpp:610
-msgid "Remember &locations:"
-msgstr "记住位置(&L)："
+#: parts/filter/filterpart.cpp:40
+msgid "Execute Command..."
+msgstr "执行命令..."
 
-#: parts/fileselector/fileselector_widget.cpp:617
-msgid "Remember &filters:"
-msgstr "记住过滤器(&L)："
+#: parts/filter/filterpart.cpp:43
+msgid "Execute shell command"
+msgstr "执行 shell 命令"
 
-#: parts/fileselector/fileselector_widget.cpp:624
-msgid "Session"
-msgstr "会话"
+#: parts/filter/filterpart.cpp:44
+#, fuzzy
+msgid ""
+"<b>Execute shell command</b>"
+"<p>Executes a shell command and outputs its result into the current document."
+msgstr "<b>执行 shell 命令</b><p>执行一条 shell 命令，将它的结果输出到当前文档中。"
 
-#: parts/fileselector/fileselector_widget.cpp:625
-msgid "Restore loca&tion"
-msgstr "恢复位置(&T)"
+#: parts/filter/filterpart.cpp:46
+msgid "Filter Selection Through Command..."
+msgstr "用命令过滤选择区..."
 
-#: parts/fileselector/fileselector_widget.cpp:626
-msgid "Restore last f&ilter"
-msgstr "恢复上次的过滤器(&I)"
+#: parts/filter/filterpart.cpp:49
+#, fuzzy
+msgid "Filter selection through a shell command"
+msgstr "用 shell 命令过滤选择区"
 
-#: parts/fileselector/fileselector_widget.cpp:646
+#: parts/filter/filterpart.cpp:50
+#, fuzzy
 msgid ""
-"<p>Decides how many locations to keep in the history of the location combo box"
-msgstr "<p>确定在位置组合框历史中保留多少位置项目"
+"<b>Filter selection through shell command</b>"
+"<p>Filters selection through a shell command and outputs its result into the "
+"current document."
+msgstr "<b>用 shell 命令过滤选择区</b><p>将选择区内容使用一条 shell 命令进行过滤，结果输出到当前文档中。"
 
-#: parts/fileselector/fileselector_widget.cpp:653
+#: parts/filter/filterpart.cpp:96
+msgid "Execute Command"
+msgstr "执行命令"
+
+#: parts/filter/filterpart.cpp:142
+msgid "Filter Selection Through Command"
+msgstr "用命令过滤选择区"
+
+#: parts/filter/shellfilterdlg.cpp:122 parts/filter/shellinsertdlg.cpp:119
+#, c-format
+msgid "Process exited with status %1"
+msgstr "进程退出，状态 %1"
+
+#: parts/filecreate/filecreate_widget2.cpp:48
+msgid "Use this to create new files within your project."
+msgstr "可用它在您的工程里创建新文件。"
+
+#: parts/filecreate/addglobaldlg.cpp:61
+msgid "Template Location"
+msgstr "模板位置"
+
+#: parts/filecreate/addglobaldlg.cpp:92
+msgid "Select Global File Types"
+msgstr "选择全局文件类型"
+
+#: parts/filecreate/addglobaldlg.cpp:94
+msgid "F1"
+msgstr "F1"
+
+#: parts/filecreate/addglobaldlg.cpp:99
+msgid "Type extension:"
+msgstr "类型扩展："
+
+#: parts/filecreate/addglobaldlg.cpp:100
+msgid "Type name:"
+msgstr "类型名称："
+
+#: parts/filecreate/addglobaldlg.cpp:101
+msgid "Template location:"
+msgstr "模板位置："
+
+#: parts/filecreate/addglobaldlg.cpp:102
+msgid "Icon:"
+msgstr "图标："
+
+#: parts/filecreate/filecreate_part.cpp:75
+#: parts/filecreate/filecreate_part.cpp:76
+msgid "File Templates"
+msgstr "文件模板"
+
+#: parts/filecreate/filecreate_part.cpp:82
 msgid ""
-"<p>Decides how many filters to keep in the history of the filter combo box"
-msgstr "<p>确定在过滤器组合框历史中保留多少过滤器"
+"<b>New file</b>"
+"<p>Creates a new file. Also adds it the project if the <b>Add to project</b> "
+"checkbox is turned on."
+msgstr "<b>新建文件</b><p>创建新的文件，如果<b>添加到工程</b>选项被选中，则将它添加到工程中。"
 
-#: parts/fileselector/fileselector_widget.cpp:660
+#: buildtools/script/scriptprojectpart.cpp:57
+#: parts/filecreate/filecreate_part.cpp:83
+msgid "Create a new file"
+msgstr "创建新文件"
+
+#: parts/filecreate/fcconfigwidget.cpp:51
+msgid "Global Types"
+msgstr "全局类型"
+
+#: parts/filecreate/fcconfigwidget.cpp:62
+msgid "Project templates in "
+msgstr "工程模板位于"
+
+#: parts/filecreate/fcconfigwidget.cpp:652
 msgid ""
-"<p>These options allow you to have the File Selector automatically change "
-"location to the directory of the active document on certain events."
-"<p>Auto synchronization is <em>lazy</em>, meaning it will not take effect until "
-"the file selector is visible."
-"<p>None of these are enabled by default, but you can always sync the location "
-"by pressing the sync button in the toolbar."
+"Requested template does not exist yet.\n"
+"It will be opened immediately after accepting the configuration dialog."
 msgstr ""
-"<p>这些选项能在特定事件发生时将文件选择器自动改变到激活的文档所在的目录。"
-"<p>自动同步具有<em>惰性</em>，就是说它只有在文件选择器成为可见时才会起作用。"
-"<p>这些功能默认都未被启用，但您随时可以点击工具栏上的同步按钮进行同步。"
+"所请求的模板尚不存在。\n"
+"它将在配置对话框被接受后立即打开。"
 
-#: parts/fileselector/fileselector_widget.cpp:671
+#: parts/filecreate/fcconfigwidget.cpp:677
+#: parts/filecreate/fcconfigwidget.cpp:700
 msgid ""
-"<p>If this option is enabled (default), the location will be restored when you "
-"start KDev."
-"<p><strong>Note</strong> that if the session is handled by the TDE session "
-"manager, the location is always restored."
+"Template for the selected file type does not exist yet.\n"
+"It will be opened immediately after accepting the configuration dialog."
 msgstr ""
-"<p>如果启用此选项(默认)，当您启动 KDevelop 时目录位置将自动恢复。"
-"<p><strong>注意</strong>如果会话时由 TDE 会话管理器处理的，目录位置将总是被恢复。"
+"所选择的文件类型的模板尚不存在。\n"
+"它将在配置对话框被接受后立即打开。"
 
-#: parts/fileselector/fileselector_widget.cpp:676
+#: parts/filecreate/fcconfigwidget.cpp:679
+#: parts/filecreate/fcconfigwidget.cpp:702
 msgid ""
-"<p>If this option is enabled (default), the current filter will be restored "
-"when you start KDev."
-"<p><strong>Note</strong> that if the session is handled by the TDE session "
-"manager, the filter is always restored."
-"<p><strong>Note</strong> that some of the autosync settings may override the "
-"restored location if on."
+"Template for the selected file type has been changed.\n"
+"It will be opened immediately after accepting the configuration dialog."
 msgstr ""
-"<p>如果启用此选项(默认)，当您启动 KDevelop 时当前过滤器将自动恢复。"
-"<p><strong>注意</strong>如果会话时由 TDE 会话管理器处理的，当前过滤器将总是被恢复。"
-"<p><strong>Note</strong>有些自动同步设置如果启用的话会取代恢复的目录位置。"
-
-#: parts/valgrind/valgrind_dialog.cpp:20
-msgid "Valgrind Memory Check"
-msgstr "Valgrind 内存检查"
+"所选择的文件类型的模板已被改变。\n"
+"它将在配置对话框被接受后立即打开。"
 
-#: parts/valgrind/valgrind_dialog.cpp:80
-#: parts/valgrind/valgrind_dialog.cpp:140
+#: parts/filecreate/filecreate_newfile.cpp:33
 msgid ""
-"Could not find valgrind in your $PATH. Please make sure it is installed "
-"properly."
-msgstr "在您的 $PATH 中无法找到 valgrind，请确保它已经正确安装。"
-
-#: parts/valgrind/valgrind_dialog.cpp:82
-#: parts/valgrind/valgrind_dialog.cpp:142
-msgid "Valgrind Not Found"
-msgstr "未找到 Valgrind"
+"_: New file dialog (title)\n"
+"New File"
+msgstr "新建文件"
 
-#: parts/valgrind/valgrind_dialog.cpp:185
+#: parts/filecreate/filecreate_newfile.cpp:38
 #, fuzzy
+msgid "<b>New File Creation</b>"
+msgstr "<b>新文件创建</b>"
+
+#: parts/filecreate/filecreate_newfile.cpp:56
 msgid ""
-"Could not find tdecachegrind in your $PATH. Please make sure it is installed "
-"properly."
-msgstr "在您的 $PATH 中无法找到 valgrind，请确保它已经正确安装。"
+"_: Add to project (on checkbox)\n"
+"&Add to project"
+msgstr "添加到工程中(&A)"
 
-#: parts/valgrind/valgrind_dialog.cpp:187
+#: parts/filecreate/filecreate_newfile.cpp:155
 #, fuzzy
-msgid "KCachegrind Not Found"
-msgstr "未找到 Valgrind"
+msgid "A file with this name already exists"
+msgstr "这个名字的文件已经存在。"
 
-#: parts/valgrind/valgrind_part.cpp:49
-#, fuzzy
-msgid "Valgrind Output"
-msgstr "打开 Valgrind 输出"
+#: parts/filecreate/filecreate_newfile.cpp:155
+msgid "File Exists"
+msgstr "文件已存在"
 
-#: parts/valgrind/valgrind_part.cpp:51
+#: parts/filecreate/filecreate_widget3.cpp:36
+msgid "File Create"
+msgstr "文件创建"
+
+#: parts/filecreate/filecreate_widget3.cpp:44
 #, fuzzy
 msgid ""
-"<b>Valgrind</b>"
-"<p>Shows the output of the valgrind. Valgrind detects"
-"<br>use of uninitialized memory"
-"<br>reading/writing memory after it has been free'd"
-"<br>reading/writing off the end of malloc'd blocks"
-"<br>reading/writing inappropriate areas on the stack"
-"<br>memory leaks -- where pointers to malloc'd blocks are lost forever"
-"<br>passing of uninitialised and/or unaddressable memory to system calls"
-"<br>mismatched use of malloc/new/new [] vs free/delete/delete []"
-"<br>some abuses of the POSIX pthread API."
+"<b>New file</b>"
+"<p>This part makes the creation of new files easier. Select a type in the list "
+"to create a file. The list of project file types can be configured in project "
+"settings dialog, <b>New File Wizard</b> tab. Globally available file types are "
+"listed and can be configured in TDevelop settings dialog, <b>New File Wizard</b> "
+"tab."
 msgstr ""
-"<b>Valgrind</b>"
-"<p>显示 Valgrind 的输出。Valgrind 能检测"
-"<br>使用未初始化的内存"
-"<br>在内存释放后进行读/写"
-"<br>读写超越 malloc 分配的内存块"
-"<br>读写堆栈中不适当的区域"
-"<br>内存泄露 - malloc 分配的指针永远丢失的问题"
-"<br>传递未初始化和/或不可访问的内存给系统调用"
-"<br>对 malloc/new/new [] 和 free/delete/delete [] 的使用不配对"
-"<br>一些对 POSIX pthread API 的不当使用。"
+"<b>新建文件</b>"
+"<p>它使创建新文件更加容易。请从列表中选择要创建的文件类型。工程文件类型列表可以在工程设置对话框的<b>新建文件向导</b>"
+"中进行配置。全局可用的文件类型在 KDevelop 设置对话框的<b>新建文件向导</b>中列出，并可进行配置。"
 
-#: parts/valgrind/valgrind_part.cpp:61
-msgid "&Valgrind Memory Leak Check"
-msgstr "Valgrind 内存泄露检查(&V)"
+#: parts/distpart/distpart_part.cpp:48
+msgid "Distribution && Publishing"
+msgstr "分发和发布"
 
-#: parts/valgrind/valgrind_part.cpp:63 parts/valgrind/valgrind_part.cpp:71
-msgid "Valgrind memory leak check"
-msgstr "Valgrind 内存泄露检查"
+#: parts/distpart/distpart_part.cpp:52
+msgid "Make source and binary distribution"
+msgstr "制做源代码和执行码发行版"
 
-#: parts/valgrind/valgrind_part.cpp:64
+#: parts/distpart/distpart_part.cpp:53
 msgid ""
-"<b>Valgrind memory leak check</b>"
-"<p>Runs Valgrind - a tool to help you find memory-management problems in your "
-"programs."
-msgstr "<b>Valgrind 内存泄露检查</b><p>运行 Valgrind - 一个帮助您发现程序中内存管理问题的工具。"
+"<b>Project distribution & publishing</b>"
+"<p>Helps users package and publish their software."
+msgstr "<b>工程分发和发行</b><p>协助用户打包和发行他们的软件。"
 
-#: parts/valgrind/valgrind_part.cpp:66
-#, fuzzy
-msgid "P&rofile with KCachegrind"
-msgstr "要打开的配置文件"
+#: parts/distpart/distpart_part.cpp:56
+msgid "Distribution & Publishing"
+msgstr "分发和发布"
 
-#: parts/valgrind/valgrind_part.cpp:68
-#, fuzzy
-msgid "Profile with KCachegrind"
-msgstr "要打开的配置文件"
+#: parts/distpart/specsupport.cpp:78 parts/distpart/specsupport.cpp:177
+msgid "You need to create a source archive first."
+msgstr "您需要先创建一个源代码压缩文件。"
 
-#: parts/valgrind/valgrind_part.cpp:69
-msgid ""
-"<b>Profile with KCachegrind</b>"
-"<p>Runs your program in calltree and then displays profiler information in "
-"KCachegrind."
-msgstr ""
+#: parts/distpart/distpart_widget.cpp:134
+msgid "Building Package"
+msgstr "构建包"
 
-#: parts/valgrind/valgrind_part.cpp:90
-msgid "Open Valgrind Output"
-msgstr "打开 Valgrind 输出"
+#: parts/distpart/distpart_widget.cpp:145
+#, c-format
+msgid "Adding file: %1"
+msgstr "添加文件：%1"
 
-#: parts/valgrind/valgrind_part.cpp:96
+#: parts/distpart/distpart_widget.cpp:152
 #, c-format
-msgid "Could not open valgrind output: %1"
-msgstr "无法打开 Valgrind 输出：%1"
+msgid "Archive made at: %1"
+msgstr ""
 
-#: parts/valgrind/valgrind_part.cpp:217
-msgid "There is already an instance of valgrind running."
-msgstr "当前已经有一个 valgrind 进程在运行。"
+#: parts/distpart/distpart_widget.cpp:152
+msgid "Archive Done"
+msgstr "存档完成"
 
-#: parts/valgrind/valgrind_widget.cpp:95
-msgid "No."
-msgstr "编号"
+#: parts/distpart/distpart_widget.cpp:595
+#, fuzzy, c-format
+msgid "Remove %1"
+msgstr "删除(&M)"
 
-#: kdevdesigner/designer/outputwindow.cpp:84
-#: parts/valgrind/valgrind_widget.cpp:97
-msgid "Message"
-msgstr "消息"
+#: buildtools/qmake/trollprojectwidget.cpp:1796
+#: buildtools/qmake/trollprojectwidget.cpp:1937
+#: parts/distpart/distpart_widget.cpp:595
+msgid "Remove File"
+msgstr "删除文件"
 
-#: parts/valgrind/valgrind_widget.cpp:104
-msgid "&Open Valgrind Output..."
-msgstr "打开 Valgrind 输出(&O)..."
+#: parts/diff/diffdlg.cpp:20
+msgid "Difference Viewer"
+msgstr "差异查看器"
 
-#: parts/valgrind/valgrind_widget.cpp:106
-msgid "Expand All Items"
-msgstr "展开所有项目"
+#: parts/diff/diffwidget.cpp:76 vcs/cvsservice/diffwidget.cpp:73
+#, c-format
+msgid "Show in %1"
+msgstr "在 %1 中显示"
 
-#: parts/valgrind/valgrind_widget.cpp:107
-msgid "Collapse All Items"
-msgstr "折叠所有项目"
+#: parts/diff/diffwidget.cpp:83 vcs/cvsservice/diffwidget.cpp:80
+msgid "&Save As..."
+msgstr "另存为(&S)..."
 
-#: parts/bookmarks/bookmarks_widget.cpp:270
-msgid ", line "
-msgstr ", 行 "
+#: parts/diff/diffwidget.cpp:88 vcs/cvsservice/diffwidget.cpp:85
+msgid "Highlight Syntax"
+msgstr "加亮文法"
 
-#: parts/bookmarks/bookmarks_widget.cpp:273
-msgid "Remove This Bookmark"
-msgstr "删除这个书签"
+#: parts/diff/diffwidget.cpp:112 vcs/cvsservice/diffwidget.cpp:106
+msgid "Unable to open file."
+msgstr "无法打开文件。"
 
-#: parts/bookmarks/bookmarks_widget.cpp:277
-msgid ", All"
-msgstr ", 所有的"
+#: parts/diff/diffwidget.cpp:112 vcs/cvsservice/diffwidget.cpp:106
+msgid "Diff Frontend"
+msgstr "比较前端"
 
-#: parts/bookmarks/bookmarks_widget.cpp:278
-msgid "Remove These Bookmarks"
-msgstr "删除这些书签"
+#: parts/diff/diffwidget.cpp:324 vcs/cvsservice/diffwidget.cpp:315
+msgid "Display &Raw Output"
+msgstr "显示原始输出(&R)"
 
-#: parts/bookmarks/bookmarks_widget.cpp:283
-#, fuzzy
-msgid "Collapse All"
-msgstr "折叠所有项目"
+#: parts/diff/diffpart.cpp:52 vcs/clearcase/clearcasepart.cpp:105
+msgid "Diff"
+msgstr "比较"
 
-#: parts/bookmarks/bookmarks_widget.cpp:284
+#: parts/diff/diffpart.cpp:53
 #, fuzzy
-msgid "Expand All"
-msgstr "展开所有项目"
+msgid "Diff Output"
+msgstr "GDB 输出"
 
-#: parts/bookmarks/bookmarks_part.cpp:59
+#: parts/diff/diffpart.cpp:54
+#, fuzzy
 msgid ""
-"<b>Bookmarks</b>"
-"<p>The bookmark viewer shows all the source bookmarks in the project."
-msgstr "<b>书签</b><p>书签浏览器显示工程中的所有源代码书签。"
+"<b>Difference viewer</b>"
+"<p>Shows output of the diff format. Can utilize every installed component that "
+"is able to show diff output. For example if you have Kompare installed, "
+"Difference Viewer can use its graphical diff view."
+msgstr ""
+"<b>差异查看器</b>"
+"<p>按格式显示输出的差别。它能使用任何显示差别输出的组件。例如，如果您安装了 Kompare，差异查看器能用它显示图形化的差异视图。"
 
-#: parts/bookmarks/bookmarks_part.cpp:62
-msgid "Source bookmarks"
-msgstr "源代码书签"
+#: parts/diff/diffpart.cpp:57
+msgid "Output of the diff command"
+msgstr "比较命令的输出"
 
-#: parts/bookmarks/bookmarks_part.cpp:558
-#, fuzzy
-msgid "Could not find file"
-msgstr "无法找到插件"
+#: parts/diff/diffpart.cpp:60
+msgid "Difference Viewer..."
+msgstr "差异查看器..."
 
-#: editors/editor-chooser/editorchooser_part.cpp:35
-msgid "Editor"
-msgstr "编辑器"
+#: parts/diff/diffpart.cpp:63
+msgid "Difference viewer"
+msgstr "差异查看器"
 
-#: buildtools/ada/adaproject_part.cpp:56 buildtools/ant/antprojectpart.cpp:55
-#: buildtools/autotools/autoprojectpart.cpp:103
-#: buildtools/custommakefiles/customprojectpart.cpp:83
-#: buildtools/pascal/pascalproject_part.cpp:62
-#: buildtools/qmake/trollprojectpart.cpp:103
-msgid "&Build Project"
-msgstr "构建工程(&B)"
+#: parts/diff/diffpart.cpp:64
+msgid "<b>Difference viewer</b><p>Shows the contents of a patch file."
+msgstr "<b>差异查看器</b><p>显示补丁文件的内容。"
 
-#: buildtools/ada/adaproject_part.cpp:341
-msgid ""
-"Could not find ada compiler.\n"
-"Check if your compiler settings are correct."
-msgstr ""
-"无法找到 ada 编译器。\n"
-"请检查您的编译器设置是否正确。"
+#: parts/diff/diffpart.cpp:123
+#, fuzzy
+msgid "Difference to Disk File"
+msgstr "和保存的文件的差异"
 
-#: buildtools/ada/adaproject_part.cpp:422
+#: parts/diff/diffpart.cpp:125
 #, fuzzy
 msgid ""
-"There was an error loading the module %1.\n"
-"The diagnostics are:\n"
-"%2"
-msgstr ""
-"加载模块 %1 时发生错误。\n"
-"诊断信息为：\n"
-"%2"
+"<b>Difference to disk file</b>"
+"<p>Shows the difference between the file contents in this editor and the file "
+"contents on disk."
+msgstr "<b>和保存的文件的差异</b><p>显示编辑器里的文件内容和磁盘上保存的文件内容之间的差异。"
 
-#: buildtools/ant/antprojectpart.cpp:58
-#: buildtools/autotools/autoprojectpart.cpp:106
-#: buildtools/custommakefiles/customprojectpart.cpp:86
-#: buildtools/pascal/pascalproject_part.cpp:65
-#: buildtools/qmake/trollprojectpart.cpp:106
-#: buildtools/qmake/trollprojectwidget.cpp:124
-msgid "Build project"
-msgstr "构建工程"
+#: parts/diff/diffpart.cpp:168
+msgid "Could not invoke the \"diff\" command."
+msgstr "无法运行“diff”命令。"
 
-#: buildtools/ant/antprojectpart.cpp:59
+#: parts/diff/diffpart.cpp:181
+msgid "DiffPart: No differences found."
+msgstr "比较组件：未发现差异。"
+
+#: parts/diff/diffpart.cpp:185
 msgid ""
-"<b>Build project</b>"
-"<p>Executes <b>ant dist</b> command to build the project."
-msgstr "<b>构建工程</b><p>执行 <b>ant dist</b> 命令来构建工程。"
+"Diff command failed (%1):\n"
+msgstr ""
+"比较命令失败(%1)：\n"
 
-#: buildtools/ant/antprojectpart.cpp:61
-#: buildtools/custommakefiles/customprojectpart.cpp:147
-msgid "Build &Target"
-msgstr "构建目标(&T)"
+#: parts/diff/diffpart.cpp:240
+msgid "Please Select Patch File"
+msgstr "请选择补丁文件"
 
-#: buildtools/ant/antprojectpart.cpp:63
-#: buildtools/custommakefiles/customprojectpart.cpp:150
-msgid "Build target"
-msgstr "构建目标"
+#: parts/regexptest/regexptestdlg.cpp:85
+#: parts/regexptest/regexptestdlg.cpp:103
+#: parts/regexptest/regexptestdlg.cpp:179
+msgid "No match"
+msgstr "无匹配"
 
-#: buildtools/ant/antprojectpart.cpp:64
-msgid ""
-"<b>Build target</b>"
-"<p>Executes <b>ant target_name</b> command to build the specified target."
-msgstr "<b>构建目标</b><p>执行 <b>ant target_name</b> 命令来构建指定的目标。"
+#: parts/regexptest/regexptestdlg.cpp:88
+#: parts/regexptest/regexptestdlg.cpp:106
+#: parts/regexptest/regexptestdlg.cpp:183
+msgid "Successfully matched"
+msgstr "匹配成功"
 
-#: buildtools/ant/antprojectpart.cpp:467
-msgid "Ant Options"
-msgstr "Ant 选项"
+#: parts/regexptest/regexptestdlg.cpp:99
+msgid "Compile error, your regexp is invalid"
+msgstr "编译错误。您的正则表达式是无效的"
 
-#: buildtools/ant/antprojectpart.cpp:502
-msgid "Classpath"
-msgstr "Classpath"
+#: parts/regexptest/regexptestdlg.cpp:126
+msgid "Repetition operators must not appear as first character"
+msgstr "重复操作符不能作为第一个字符"
 
-#: buildtools/ant/antprojectpart.cpp:565
-msgid "Remove %1 From Project"
-msgstr "从工程中删除 %1"
+#: parts/regexptest/regexptestdlg.cpp:129
+msgid "Invalid use of back reference operator"
+msgstr "无效的后向引用操作符"
 
-#: buildtools/ant/antprojectpart.cpp:567
-msgid "<b>Remove from project</b><p>Removes current file from the project."
-msgstr "<b>从工程中删除</b><p>从工程中删除当前文件。"
+#: parts/regexptest/regexptestdlg.cpp:132
+msgid "Unmatched brace interval operators"
+msgstr "不匹配的大括号区间操作符"
 
-#: buildtools/ant/antprojectpart.cpp:571
-msgid "Add %1 to Project"
-msgstr "添加 %1 到工程中"
+#: parts/regexptest/regexptestdlg.cpp:135
+msgid "Unmatched bracket list operators"
+msgstr "不匹配的方括号列表操作符"
 
-#: buildtools/ant/antprojectpart.cpp:573
-msgid "<b>Add to project</b><p>Adds current file from the project."
-msgstr "<b>添加到工程</b><p>添加当前文件到工程中。"
+#: parts/regexptest/regexptestdlg.cpp:138
+msgid "Invalid use of range operator"
+msgstr "无效的范围操作符"
 
-#: buildtools/lib/widgets/addfilesdialog.cpp:35
-#: buildtools/lib/widgets/addfilesdialog.cpp:54
-msgid "Copy File(s)"
-msgstr "复制文件"
+#: parts/regexptest/regexptestdlg.cpp:141
+msgid "Unknown character class"
+msgstr "未知的字符类别"
 
-#: buildtools/lib/widgets/addfilesdialog.cpp:36
-#: buildtools/lib/widgets/addfilesdialog.cpp:55
-msgid "Create Symbolic Link(s)"
-msgstr "创建符号链接"
+#: parts/regexptest/regexptestdlg.cpp:144
+msgid "Invalid collating element"
+msgstr "无效的并列字元"
 
-#: buildtools/lib/widgets/addfilesdialog.cpp:37
-#: buildtools/lib/widgets/addfilesdialog.cpp:56
-msgid "Add Relative Path(s)"
-msgstr "添加相对路径"
+#: parts/regexptest/regexptestdlg.cpp:147
+msgid "Unmatched parenthesis group operators"
+msgstr "不匹配的小括号分组操作符"
 
-#: buildtools/lib/widgets/addenvvardlg.cpp:34
-msgid "Add Environment Variable"
-msgstr "添加环境变量"
+#: parts/regexptest/regexptestdlg.cpp:150
+msgid "Invalid back reference to subexpression"
+msgstr "无效的子表达式后向引用"
 
-#: buildtools/lib/widgets/addenvvardlg.cpp:42
-msgid "&Value:"
-msgstr "值(&V)："
+#: parts/regexptest/regexptestdlg.cpp:153
+msgid "Trailing backslash"
+msgstr "结尾的反斜杠转义符错"
 
-#: buildtools/qmake/trollprojectpart.cpp:82
-#: buildtools/qmake/trollprojectpart.cpp:89
-#: buildtools/qmake/trollprojectpart.cpp:279
-msgid "QMake Manager"
-msgstr "QMake 管理器"
+#: parts/regexptest/regexptestdlg.cpp:156
+msgid "Invalid use of pattern operators"
+msgstr "无效的模板操作符"
 
-#: buildtools/qmake/trollprojectpart.cpp:83
-msgid ""
-"<b>QMake manager</b>"
-"<p>The QMake manager project tree consists of two parts. The 'overview' in the "
-"upper half shows the subprojects, each one having a .pro file. The 'details' "
-"view in the lower half shows the list of files for the active subproject "
-"selected in the overview."
-msgstr ""
-"<b>QMake 管理器</b>"
-"<p>QMake 工程树包括两部分，上半部分的“概要”显示子工程，每个子工程有一个 Makefile.am "
-"文件。下半部分的“细节”视图显示概述列表中当前选中的子工程中的文件列表。"
+#: parts/regexptest/regexptestdlg.cpp:160
+msgid "Regular expression too large"
+msgstr "正则表达式太长"
 
-#: buildtools/qmake/trollprojectpart.cpp:89
-msgid "QMake manager"
-msgstr "QMake 管理器"
+#: parts/regexptest/regexptestdlg.cpp:164
+msgid "Unknown error"
+msgstr "未知错误"
 
-#: buildtools/autotools/autoprojectpart.cpp:122
-#: buildtools/custommakefiles/customprojectpart.cpp:99
-#: buildtools/qmake/trollprojectpart.cpp:94
-msgid "Compile &File"
-msgstr "编译文件(&F)"
+#: parts/regexptest/regexptestpart.cpp:35
+msgid "Debug Regular Expression..."
+msgstr "调试正则表达式..."
 
-#: buildtools/autotools/autoprojectpart.cpp:125
-#: buildtools/custommakefiles/customprojectpart.cpp:102
-#: buildtools/qmake/trollprojectpart.cpp:97
-#: buildtools/qmake/trollprojectwidget.cpp:230
-msgid "Compile file"
-msgstr "编译文件"
+#: parts/regexptest/regexptestpart.cpp:38
+msgid "Debug regular expression"
+msgstr "调试正则表达式"
 
-#: buildtools/autotools/autoprojectpart.cpp:126
-#: buildtools/qmake/trollprojectpart.cpp:98
-#: buildtools/qmake/trollprojectwidget.cpp:231
+#: parts/regexptest/regexptestpart.cpp:39
+#, fuzzy
 msgid ""
-"<b>Compile file</b>"
-"<p>Runs <b>make filename.o</b> command from the directory where 'filename' is "
-"the name of currently opened file."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
+"<b>Debug regular expression</b>"
+"<p>Allows to enter a regular expression and validate it. It is possible to "
+"check syntax of basic POSIX, extended POSIX regular expressions and also syntax "
+"allowed by TQRegExp and KRegExp classes."
 msgstr ""
-"<b>编译文件</b>"
-"<p>在当前打开的文件“filename”所在的目录运行 <b>make filename.o</b> 命令。"
-"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
+"<b>调试正则表达式</b>"
+"<p>允许输入一个正则表达式并校验它。它可以检查基本 POSIX、扩展 POSIX 正则表达式、和 QRegExp、KRegExp 使用的语法。"
 
-#: buildtools/autotools/autoprojectpart.cpp:107
-#: buildtools/qmake/trollprojectpart.cpp:107
-#: buildtools/qmake/trollprojectwidget.cpp:125
-msgid ""
-"<b>Build project</b>"
-"<p>Runs <b>make</b> from the project directory."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
-msgstr ""
-"<b>构建工程</b>"
-"<p>在工程目录中运行 <b>make</b> 命令。"
-"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
+#: src/projectmanager.cpp:96
+msgid "&Open Project..."
+msgstr "打开工程(&O)..."
 
-#: buildtools/qmake/trollprojectpart.cpp:111
-msgid "&Rebuild Project"
-msgstr "重新编译工程(&R)"
+#: src/projectmanager.cpp:99
+msgid "Open project"
+msgstr "打开工程"
 
-#: buildtools/qmake/trollprojectpart.cpp:114
-#: buildtools/qmake/trollprojectwidget.cpp:133
-msgid "Rebuild project"
-msgstr "重新编译工程"
+#: src/projectmanager.cpp:100
+msgid "<b>Open project</b><p>Opens a KDevelop3 or KDevelop2 project."
+msgstr "<b>打开工程</b><p>打开一个 KDevelop3 或者 KDevelop2 工程。"
 
-#: buildtools/qmake/trollprojectpart.cpp:115
-#: buildtools/qmake/trollprojectwidget.cpp:134
-#: buildtools/qmake/trollprojectwidget.cpp:1014
-msgid ""
-"<b>Rebuild project</b>"
-"<p>Runs <b>make clean</b> and then <b>make</b> from the project directory."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
-msgstr ""
-"<b>重新编译工程</b>"
-"<p>在工程目录中运行 <b>make clean</b> 命令，然后运行 <b>make</b> 命令。"
-"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
+#: src/projectmanager.cpp:103
+msgid "Open &Recent Project"
+msgstr "打开最近的工程(&R)"
 
-#: buildtools/qmake/trollprojectpart.cpp:119
-#, fuzzy
-msgid "&Install Project"
-msgstr "安装对象"
+#: src/projectmanager.cpp:106
+msgid "Open recent project"
+msgstr "打开一个最近的工程"
 
-#: buildtools/qmake/trollprojectpart.cpp:122
-#, fuzzy
-msgid "Install project"
-msgstr "安装对象"
+#: src/projectmanager.cpp:107
+msgid "<b>Open recent project</b><p>Opens recently opened project."
+msgstr "<b>打开最近的工程</b><p>打开最近使用过的工程。"
 
-#: buildtools/qmake/trollprojectpart.cpp:123
-#, fuzzy
-msgid ""
-"<b>Install project</b>"
-"<p>Runs <b>make install</b> from the project directory."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
-msgstr ""
-"<b>安装</b>"
-"<p>在工程目录中执行 <b>make install</b> 命令。"
-"<br>环境变量和编译参数可以在工程设置的<b>编译选项</b>页中指定。"
+#: src/projectmanager.cpp:111
+msgid "C&lose Project"
+msgstr "关闭工程(&L)"
 
-#: buildtools/autotools/autoprojectpart.cpp:166
-#: buildtools/custommakefiles/customprojectpart.cpp:132
-#: buildtools/qmake/trollprojectpart.cpp:127
-msgid "&Clean Project"
-msgstr "清理工程(&C)"
+#: src/projectmanager.cpp:115
+msgid "Close project"
+msgstr "关闭工程"
 
-#: buildtools/autotools/autoprojectpart.cpp:169
-#: buildtools/custommakefiles/customprojectpart.cpp:135
-#: buildtools/qmake/trollprojectpart.cpp:130
-msgid "Clean project"
-msgstr "清理工程"
+#: src/projectmanager.cpp:116
+msgid "<b>Close project</b><p>Closes the current project."
+msgstr "<b>关闭工程</b><p>关闭当前工程。"
 
-#: buildtools/autotools/autoprojectpart.cpp:170
-#: buildtools/qmake/trollprojectpart.cpp:131
-msgid ""
-"<b>Clean project</b>"
-"<p>Runs <b>make clean</b> command from the project directory."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
-msgstr ""
-"<b>清理工程</b>"
-"<p>在工程目录中运行 <b>make clean</b> 命令。"
-"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
+#: src/projectmanager.cpp:118
+msgid "Project &Options"
+msgstr "工程选项(&O)"
 
-#: buildtools/qmake/trollprojectpart.cpp:135
-#, fuzzy
-msgid "&Dist-Clean Project"
-msgstr "清理工程(&C)"
+#: src/projectmanager.cpp:121
+msgid "Project options"
+msgstr "工程选项"
 
-#: buildtools/qmake/trollprojectpart.cpp:138
-#, fuzzy
-msgid "Dist-Clean project"
-msgstr "清理工程"
+#: src/projectmanager.cpp:122
+msgid "<b>Project options</b><p>Lets you customize project options."
+msgstr "<b>工程选项</b><p>您可以自定义工程的选项。"
 
-#: buildtools/qmake/trollprojectpart.cpp:139
-#, fuzzy
+#: src/projectmanager.cpp:133
 msgid ""
-"<b>Dist-Clean project</b>"
-"<p>Runs <b>make distclean</b> command from the project directory."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
+"*.tdevelop|KDevelop 3 Project Files\n"
+"*.kdevprj|KDevelop 2 Project Files"
 msgstr ""
-"<b>清理工程</b>"
-"<p>在工程目录中运行 <b>make clean</b> 命令。"
-"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
+"*.tdevelop|KDevelop 3 工程文件\n"
+"*.kdevprj|KDevelop 2 工程文件"
 
-#: buildtools/qmake/trollprojectpart.cpp:146
-#: buildtools/qmake/trollprojectwidget.cpp:143
-msgid "Execute main program"
-msgstr "执行主程序"
+#: kdevdesigner/designer/mainwindow.cpp:3085 src/projectmanager.cpp:135
+msgid "Open Project"
+msgstr "打开工程"
 
-#: buildtools/qmake/trollprojectpart.cpp:147
+#: src/projectmanager.cpp:224
 #, fuzzy
-msgid ""
-"<b>Execute program</b>"
-"<p>Executes the currently selected subproject if its an application or the "
-"program specified in project settings, <b>Run Options</b> tab."
-msgstr "<b>执行主程序</b><p>执行在工程设置的<b>运行选项</b>页中指定的主程序"
-
-#: buildtools/qmake/trollprojectpart.cpp:149
-msgid "&Build Subproject"
-msgstr "构建子工程(&B)"
-
-#: buildtools/qmake/trollprojectpart.cpp:152
-#: buildtools/qmake/trollprojectwidget.cpp:240
-msgid "Build subproject"
-msgstr "构建子工程"
-
-#: buildtools/qmake/trollprojectpart.cpp:153
-#: buildtools/qmake/trollprojectwidget.cpp:241
-msgid ""
-"<b>Build subproject</b>"
-"<p>Runs <b>make</b> from the current subproject directory. Current subproject "
-"is a subproject selected in <b>QMake manager</b> 'overview' window."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
-msgstr ""
-"<b>构建子工程</b>"
-"<p>在当前子工程目录中运行 <b>make</b> 命令。当前子工程是在 <b>QMake 管理器</b>的“概要”窗口中选中的子工程。"
-"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
-
-#: buildtools/qmake/trollprojectpart.cpp:158
-msgid "&Rebuild Subproject"
-msgstr "重新构建子工程(&R)"
+msgid "Are you sure you want to reopen the current project?"
+msgstr "打开一个最近的工程"
 
-#: buildtools/qmake/trollprojectpart.cpp:161
-#: buildtools/qmake/trollprojectwidget.cpp:250
-msgid "Rebuild subproject"
-msgstr "重新构建子工程"
+#: src/projectmanager.cpp:224
+msgid "Reopen"
+msgstr "重新打开"
 
-#: buildtools/qmake/trollprojectpart.cpp:162
-#: buildtools/qmake/trollprojectwidget.cpp:251
-msgid ""
-"<b>Rebuild subproject</b>"
-"<p>Runs <b>make clean</b> and then <b>make</b> from the current subproject "
-"directory. Current subproject is a subproject selected in <b>QMake manager</b> "
-"'overview' window."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
-msgstr ""
-"<b>重新构建子工程</b>"
-"<p>在当前子工程目录中运行 <b>make</b> 命令，然后运行 <b>make</b> 命令。当前子工程是在 <b>QMake 管理器</b>"
-"的“概要”窗口中选中的子工程。"
-"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
+#: src/projectmanager.cpp:224
+msgid "Do Not Reopen"
+msgstr "不重新打开"
 
-#: buildtools/qmake/trollprojectpart.cpp:167
-#, fuzzy
-msgid "&Install Subproject"
-msgstr "安装对象"
+#: src/projectmanager.cpp:278
+msgid "Changing plugin profile..."
+msgstr "正在更该插件配置文件..."
 
-#: buildtools/qmake/trollprojectpart.cpp:170
-#, fuzzy
-msgid "Install subproject"
-msgstr "安装对象"
+#: src/projectmanager.cpp:281
+msgid "Loading project plugins..."
+msgstr "正在工程插件..."
 
-#: buildtools/qmake/trollprojectpart.cpp:171
+#: src/projectmanager.cpp:290
 #, fuzzy
-msgid ""
-"<b>Install subproject</b>"
-"<p>Runs <b>make install</b> from the current subproject directory. Current "
-"subproject is a subproject selected in <b>QMake manager</b> 'overview' window."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
-msgstr ""
-"<b>构建子工程</b>"
-"<p>在当前子工程目录中运行 <b>make</b> 命令。当前子工程是在 <b>QMake 管理器</b>的“概要”窗口中选中的子工程。"
-"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
-
-#: buildtools/qmake/trollprojectpart.cpp:176
-msgid "&Clean Subproject"
-msgstr "清理子工程(&C)"
+msgid "error during restoring of the TDevelop session !"
+msgstr "恢复 KDevelop 会话时发生错误！"
 
-#: buildtools/qmake/trollprojectpart.cpp:179
-msgid "Clean subproject"
-msgstr "清理子工程"
+#: src/projectmanager.cpp:306
+msgid "Project loaded."
+msgstr "工程已装入。"
 
-#: buildtools/qmake/trollprojectpart.cpp:180
-msgid ""
-"<b>Clean subproject</b>"
-"<p>Runs <b>make clean</b> from the current subproject directory. Current "
-"subproject is a subproject selected in <b>QMake manager</b> 'overview' window."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
-msgstr ""
-"<b>清理子工程</b>"
-"<p>在当前子工程目录中运行 <b>make clean</b> 命令。当前子工程是在 <b>QMake 管理器</b>的“概要”窗口中选中的子工程。"
-"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
+#: src/projectmanager.cpp:358 src/projectmanager.cpp:366
+#, c-format
+msgid "Could not read project file: %1"
+msgstr "无法读取工程文件：“%1”"
 
-#: buildtools/qmake/trollprojectpart.cpp:185
-#, fuzzy
-msgid "&Dist-Clean Subproject"
-msgstr "清理子工程(&C)"
+#: src/projectmanager.cpp:385
+msgid "This is not a valid project file."
+msgstr "这不是一个有效的工程文件。"
 
-#: buildtools/qmake/trollprojectpart.cpp:188
-#, fuzzy
-msgid "Dist-Clean subproject"
-msgstr "清理子工程"
+#: src/projectmanager.cpp:406 src/projectmanager.cpp:417
+msgid "Could not write the project file."
+msgstr "无法写入工程文件。"
 
-#: buildtools/qmake/trollprojectpart.cpp:189
-#, fuzzy
-msgid ""
-"<b>Dist-Clean subproject</b>"
-"<p>Runs <b>make distclean</b> from the current subproject directory. Current "
-"subproject is a subproject selected in <b>QMake manager</b> 'overview' window."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
-msgstr ""
-"<b>清理子工程</b>"
-"<p>在当前子工程目录中运行 <b>make clean</b> 命令。当前子工程是在 <b>QMake 管理器</b>的“概要”窗口中选中的子工程。"
-"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
+#: src/projectmanager.cpp:488
+msgid "No project management plugin %1 found."
+msgstr "未找到工程管理插件 %1。"
 
-#: buildtools/qmake/trollprojectpart.cpp:194
-msgid "Execute Subproject"
-msgstr "执行子工程"
+#: src/projectmanager.cpp:498
+#, c-format
+msgid "Could not create project management plugin %1."
+msgstr "无法创建工程管理插件 %1。"
 
-#: buildtools/qmake/trollprojectpart.cpp:197
-#: buildtools/qmake/trollprojectwidget.cpp:261
-msgid "Execute subproject"
-msgstr "执行子工程"
+#: src/projectmanager.cpp:544
+msgid "No language plugin for %1 found."
+msgstr "未找到 %1 的语言插件。"
 
-#: buildtools/qmake/trollprojectpart.cpp:198
-#: buildtools/qmake/trollprojectwidget.cpp:262
-msgid ""
-"<b>Execute subproject</b>"
-"<p>Executes the target program for the currently selected subproject. This "
-"action is allowed only if a type of the subproject is 'application'. The type "
-"of the subproject can be defined in <b>Subproject Settings</b> "
-"dialog (open it from the subproject context menu)."
-msgstr ""
-"<b>执行子工程</b>"
-"<p>运行当前子工程的目标程序。只有当子工程的类型为“应用程序”时才允许这个动作。子工程的类型可以在<b>子工程设置</b>"
-"对话框中定义，该对话框能在子工程环境菜单中打开。"
+#: src/projectmanager.cpp:558
+#, c-format
+msgid "Could not create language plugin for %1."
+msgstr "无法创建 %1 的语言插件。"
 
-#: buildtools/qmake/trollprojectpart.cpp:291
-#, fuzzy
-msgid "Loading Project..."
-msgstr "正在工程插件..."
+#: src/projectmanager.cpp:617
+msgid "Invalid URL."
+msgstr "无效的 URL"
 
-#: buildtools/qmake/trollprojectpart.cpp:299
-#, fuzzy
-msgid "Choose Qt3 directory"
-msgstr "选择工程目录"
+#: src/projectmanager.cpp:623
+msgid "You do not have 'kdevprj2tdevelop' installed."
+msgstr "您没有安装“kdevprj2tdevelop”。"
 
-#: buildtools/qmake/trollprojectpart.cpp:300
-msgid ""
-"Choose the Qt3 directory to use. This directory needs to have an include "
-"directory containing qt.h."
-msgstr ""
+#: src/statusbar.cpp:101
+msgid " Line: %1 Col: %2 "
+msgstr " 行：%1 列：%2 "
 
-#: buildtools/qmake/trollprojectpart.cpp:312
+#: src/projectsession.cpp:81
 msgid ""
-"The directory you gave is not a proper Qt directory, the project might not work "
-"properly without one.\n"
-"Please make sure you give a directory that contains a bin with the qmake binary "
-"in it and for Qt3 project also contains an include directory with qt.h in it.\n"
-"Do you want to try setting a Qt directory again?"
+"The file %1 does not contain valid XML.\n"
+"The loading of the session failed."
 msgstr ""
+"文件 %1 中不包含有效的XML。\n"
+"会话载入失败。"
 
-#: buildtools/qmake/trollprojectpart.cpp:318
+#: src/projectsession.cpp:94
 #, fuzzy
-msgid "Wrong Qt directory given"
-msgstr "去除空目录(&P)"
-
-#: buildtools/qmake/trollprojectpart.cpp:333
 msgid ""
-"You didn't specify a Qt directory, the project might not work properly without "
-"one.\n"
-"Do you want to try setting a Qt directory again?"
+"The file %1 does not contain a valid TDevelop project session "
+"('KDevPrjSession').\n"
 msgstr ""
+"文件 %1中不包含有效的 KDevelop 工程会话(“KDevPrjSession”)。\n"
 
-#: buildtools/qmake/trollprojectpart.cpp:336
-#, fuzzy
-msgid "No Qt directory given"
-msgstr "下一个目录"
+#: src/projectsession.cpp:95
+msgid "The document type seems to be: '%1'."
+msgstr "这个文档类型似乎是：“%1”。"
 
-#: buildtools/qmake/trollprojectpart.cpp:351
-#, fuzzy
-msgid "Choose QMake executable"
-msgstr "htsearch 可执行文件(&A)："
+#: src/plugincontroller.cpp:150
+#, c-format
+msgid "Loading: %1"
+msgstr "装入：%1"
 
-#: buildtools/qmake/trollprojectpart.cpp:352
+#: src/plugincontroller.cpp:219
 msgid ""
-"Choose the QMake binary to use. QMake is used to generate Makefiles from the "
-"project files."
+"<b>Could not load plugin</b>"
+"<br>Plugin %1 could not be loaded"
+"<br>Library loader error: %2"
 msgstr ""
 
-#: buildtools/qmake/trollprojectpart.cpp:363
-msgid ""
-"The binary you gave is not executable, the project might not work properly.\n"
-"Please make sure you give a qmake binary that is executable.\n"
-"Do you want to try setting the QMake binary again?"
-msgstr ""
+#: src/plugincontroller.cpp:223
+#, fuzzy
+msgid "Could not load plugin"
+msgstr "无法找到插件"
 
-#: buildtools/qmake/trollprojectpart.cpp:367
-msgid "Wrong QMake binary given"
-msgstr ""
+#: src/main.cpp:25 src/main_assistant.cpp:25
+msgid "Profile to load"
+msgstr "要打开的配置文件"
 
-#: buildtools/qmake/trollprojectpart.cpp:382
+#: src/main_assistant.cpp:32
+#, fuzzy
 msgid ""
-"You didn't specify a QMake binary, the project might not work properly without "
-"one.\n"
-"Do you want to try setting a QMake binary again?"
-msgstr ""
-
-#: buildtools/qmake/trollprojectpart.cpp:385
-msgid "No QMake binary given"
-msgstr ""
+"The TDevelop Integrated Development Environment:\n"
+"assistant and documentation viewer"
+msgstr "KDevelop 集成开发环境。"
 
-#: buildtools/qmake/projectconfigurationdlg.cpp:140
+#: src/main_assistant.cpp:33
 #, fuzzy
-msgid "Save the current subprojects configuration?"
-msgstr "QMake 子工程设置"
+msgid "TDevelop Assistant"
+msgstr "KDevelop 助手"
 
-#: buildtools/qmake/projectconfigurationdlg.cpp:141
+#: src/main.cpp:35 src/main_assistant.cpp:35
 #, fuzzy
-msgid "Save Configuration?"
-msgstr "CVS 服务器配置"
-
-#: buildtools/qmake/projectconfigurationdlg.cpp:1380
-msgid "Add include directory:"
-msgstr "添加头文件目录："
+msgid "(c) 1999-2007, The KDevelop developers"
+msgstr "(C) 1999-2005，KDevelop 开发者"
 
-#: buildtools/qmake/projectconfigurationdlg.cpp:1463
-msgid "Add Library: Either choose the .a/.so file or give -l<libname>"
-msgstr ""
+#: src/main.cpp:36 src/main_assistant.cpp:36
+msgid ""
+"Release coordinator, Overall improvements, Pascal support, C++ support, New "
+"File and Documentation parts"
+msgstr "版本发布管理、整体改进、Pascal 支持、C++ 支持、新建文件和文档部件"
 
-#: buildtools/autotools/targetoptionsdlg.cpp:297
-#: buildtools/qmake/projectconfigurationdlg.cpp:1465
-#, fuzzy
-msgid "Shared Library (*.so)"
-msgstr "共享库(&H)"
+#: src/main.cpp:37 src/main_assistant.cpp:37
+msgid "Release coordinator, API documentation, Doxygen and autoproject patches"
+msgstr "版本发布管理、API 文档、Doxygen 和 autoproject 补丁"
 
-#: buildtools/autotools/targetoptionsdlg.cpp:297
-#: buildtools/qmake/projectconfigurationdlg.cpp:1465
-#, fuzzy
-msgid "Static Library (*.a)"
-msgstr "静态库(&A)"
+#: src/main.cpp:39 src/main_assistant.cpp:38
+msgid "Initial idea, basic architecture, much initial source code"
+msgstr "初始构思，基本结构，很多初始源代码"
 
-#: buildtools/qmake/projectconfigurationdlg.cpp:1547
-msgid "Add library directory:"
-msgstr "添加库目录："
+#: src/main.cpp:40 src/main_assistant.cpp:39
+msgid "KTabBar, bugfixes"
+msgstr "KTabBar、错误修正"
 
-#: buildtools/qmake/projectconfigurationdlg.cpp:1575
-msgid "Change include directory:"
-msgstr "改变头文件目录："
+#: src/main.cpp:41 src/main_assistant.cpp:40
+msgid "Java & Objective C support"
+msgstr "Java 和 Objective C 支持"
 
-#: buildtools/qmake/projectconfigurationdlg.cpp:1604
-#, fuzzy
-msgid "Change Library:"
-msgstr "选择库"
+#: src/main.cpp:42 src/main.cpp:43 src/main_assistant.cpp:41
+msgid "Debugger frontend"
+msgstr "调试器前端"
 
-#: buildtools/qmake/projectconfigurationdlg.cpp:1660
-msgid "Change library directory:"
-msgstr "改变库目录："
+#: src/main.cpp:44 src/main_assistant.cpp:42
+msgid "PHP support, context menu stuff"
+msgstr "PHP 的支持，环境菜单等"
 
-#: buildtools/qmake/projectconfigurationdlg.cpp:1687
-msgid "Add target:"
-msgstr "添加目标："
+#: src/main.cpp:45 src/main_assistant.cpp:43
+msgid "TDE application templates"
+msgstr "TDE 应用程序模板"
 
-#: buildtools/qmake/projectconfigurationdlg.cpp:1708
-msgid "Change target:"
-msgstr "改变目标："
+#: src/main.cpp:46 src/main_assistant.cpp:44
+msgid "Dist part, bash support, application templates"
+msgstr "Dist 部分、bash 支持、应用程序模板"
 
-#: buildtools/qmake/scope.cpp:161
-#, fuzzy, c-format
-msgid "Couldn't parse project file: %1"
-msgstr "无法读取工程文件：“%1”"
+#: src/main.cpp:47 src/main_assistant.cpp:45
+msgid "Several components, htdig indexing"
+msgstr "一些组件，htdig 索引"
 
-#: buildtools/qmake/scope.cpp:162
+#: src/main.cpp:48 src/main_assistant.cpp:46
 #, fuzzy
-msgid "Couldn't parse project file"
-msgstr "无法读取工程文件：“%1”"
-
-#: buildtools/qmake/scope.cpp:201
-#, fuzzy, c-format
-msgid "Couldn't write project file: %1"
-msgstr "无法读取工程文件：“%1”"
+msgid "Help with Automake manager and persistent class store"
+msgstr "协助 Automake 管理器和持久类存储"
 
-#: buildtools/qmake/scope.cpp:202
+#: src/main.cpp:50 src/main_assistant.cpp:47
 #, fuzzy
-msgid "Couldn't write project file"
-msgstr "无法写入工程文件。"
-
-#: buildtools/qmake/qmakescopeitem.cpp:88
-msgid "Headers"
-msgstr "头文件"
-
-#: buildtools/qmake/qmakescopeitem.cpp:92
-msgid "Forms"
-msgstr "界面表单"
+msgid "Ported to TQt 3, patches, valgrind, diff and perforce support"
+msgstr "移植到 Qt 3、修补、valgrind、diff 和 perforce 支持"
 
-#: buildtools/qmake/qmakescopeitem.cpp:96
-msgid "Corba IDLs"
-msgstr "Corba IDL 文件"
+#: src/main.cpp:51 src/main_assistant.cpp:48
+#, fuzzy
+msgid ""
+"TQEditor component, code completion, Abbrev component, C++ support, Java "
+"support"
+msgstr "QEditor 组件、代码补全、Abbrev 组件、C++ 支持、Java 支持"
 
-#: buildtools/qmake/qmakescopeitem.cpp:100
-msgid "Lexsources"
-msgstr "Lex 源文件"
+#: src/main.cpp:52 src/main_assistant.cpp:49
+msgid "Help with KParts infrastructure"
+msgstr "协助 KParts 基础结构"
 
-#: buildtools/qmake/qmakescopeitem.cpp:104
-msgid "Yaccsources"
-msgstr "Yacc 源文件"
+#: src/main.cpp:53 src/main_assistant.cpp:50
+msgid "Ada support"
+msgstr "Ada 支持"
 
-#: buildtools/qmake/qmakescopeitem.cpp:108
-msgid "Images"
-msgstr "图片"
+#: src/main.cpp:55 src/main_assistant.cpp:51
+#, fuzzy
+msgid "TQMake projectmanager"
+msgstr "QMake 工程管理器"
 
-#: buildtools/qmake/qmakescopeitem.cpp:112
+#: src/main.cpp:56 src/main_assistant.cpp:52
 #, fuzzy
-msgid "Resources"
-msgstr "Lex 源文件"
+msgid "MDI modes, TQEditor, bugfixes"
+msgstr "MDI 模式、QEditor、问题修补"
 
-#: buildtools/qmake/qmakescopeitem.cpp:116
-msgid "Distfiles"
-msgstr ""
+#: src/main.cpp:57 src/main_assistant.cpp:53
+msgid "PartExplorer, redesign of CvsPart, patches, bugs(fixes)"
+msgstr "PartExplorer、重新设计 CvsPart、补丁、问题修补"
 
-#: buildtools/qmake/qmakescopeitem.cpp:124
-msgid "Installs"
-msgstr "安装"
+#: src/main.cpp:58 src/main_assistant.cpp:54
+msgid ""
+"Replace, Bookmarks, FileList and CTags2 plugins. Overall improvements and "
+"patches"
+msgstr ""
 
-#: buildtools/qmake/qmakescopeitem.cpp:128
-msgid "Install object"
-msgstr "安装对象"
+#: src/main.cpp:59 src/main_assistant.cpp:55
+msgid "Filecreate part and other bits and patches"
+msgstr "Filecreate 组件和其它，以及补丁"
 
-#: buildtools/qmake/qmakescopeitem.cpp:133
-msgid "Source Files"
-msgstr "源文件"
+#: src/main.cpp:60 src/main_assistant.cpp:56
+msgid "ClearCase support"
+msgstr "ClearCase 支持"
 
-#: buildtools/qmake/trollprojectwidget.cpp:107
-msgid "Add subproject"
-msgstr "添加子工程"
+#: src/main.cpp:61 src/main_assistant.cpp:57
+msgid "Ruby support"
+msgstr "Ruby 支持"
 
-#: buildtools/qmake/trollprojectwidget.cpp:108
-#: buildtools/qmake/trollprojectwidget.cpp:1026
-msgid ""
-"<b>Add subproject</b>"
-"<p>Creates a <i>new</i> or adds an <i>existing</i> subproject to a currently "
-"selected subproject. This action is allowed only if a type of the subproject is "
-"'subdirectories'. The type of the subproject can be defined in <b>"
-"Subproject Settings</b> dialog (open it from the subproject context menu)."
-msgstr ""
-"<b>添加子工程</b>"
-"<p>在当前选择的子工程中创建<i>新的</i>或者添加一个<i>现有的</i>子工程。只有当子工程的类型为“子目录”时才允许这个动作。子工程的类型可以在<b>"
-"子工程设置</b>对话框中定义，该对话框能在子工程环境菜单中打开。"
+#: src/main.cpp:63 src/main_assistant.cpp:59
+msgid "Kate editor component"
+msgstr "Kate 编辑器组件"
 
-#: buildtools/qmake/trollprojectwidget.cpp:116
-msgid "Create scope"
-msgstr "创建范围"
+#: src/main.cpp:64 src/main_assistant.cpp:60
+msgid "HTML documentation component"
+msgstr "HTML 文档组件"
 
-#: buildtools/qmake/trollprojectwidget.cpp:117
-msgid ""
-"<b>Create scope</b>"
-"<p>Creates QMake scope in the project file in case the subproject is selected "
-"or creates nested scope in case the scope is selected."
-msgstr "<b>创建范围</b><p>如果选中的是子工程，则在工程文件中创建 QMake 范围，或者如果选中的是一个范围，则创建嵌套的范围。"
+#: src/main.cpp:65 src/main_assistant.cpp:61
+msgid "Fortran documentation"
+msgstr "Fortran 文档"
 
-#: buildtools/qmake/trollprojectwidget.cpp:144
-msgid ""
-"<b>Execute main program</b>"
-"<p>Executes the main program specified in project settings, <b>Run Options</b> "
-"tab."
-msgstr "<b>执行主程序</b><p>执行在工程设置的<b>运行选项</b>页中指定的主程序。"
+#: src/main.cpp:66 src/main_assistant.cpp:62
+msgid "Python documentation utility"
+msgstr "Python 文档工具"
 
-#: buildtools/qmake/trollprojectwidget.cpp:153
-msgid "Subproject settings"
-msgstr "子工程选项"
+#: src/main.cpp:67 src/main_assistant.cpp:63
+msgid "Doxygen wizard"
+msgstr "Doxygen 向导"
 
-#: buildtools/qmake/trollprojectwidget.cpp:154
-msgid ""
-"<b>Subproject settings</b>"
-"<p>Opens <b>QMake Subproject Configuration</b> dialog for the currently "
-"selected subproject. It provides settings for:"
-"<br>subproject type and configuration,"
-"<br>include and library paths,"
-"<br>lists of dependencies and external libraries,"
-"<br>build order,"
-"<br>intermediate files locations,"
-"<br>compiler options."
-msgstr ""
-"<b>子工程选项</b>"
-"<p>为当前选中的子工程打开 <b>QMake 子工程配置</b>对话框。它提供如下设置："
-"<br>子工程类型和配置；"
-"<br>头文件和库路径；"
-"<br>依赖关系和外部库列表；"
-"<br>编译顺序；"
-"<br>中间文件位置；"
-"<br>编译器选项。"
+#: src/main.cpp:68 src/main.cpp:69 src/main_assistant.cpp:64
+#: src/main_assistant.cpp:65
+msgid "Fileselector component"
+msgstr "文件选择器组件"
 
-#: buildtools/qmake/trollprojectwidget.cpp:204
-msgid "Create new file"
-msgstr "创建新文件"
+#: src/main.cpp:70 src/main_assistant.cpp:66
+msgid "Designer code"
+msgstr "Designer 代码"
 
-#: buildtools/qmake/trollprojectwidget.cpp:205
-#: buildtools/qmake/trollprojectwidget.cpp:1579
-msgid ""
-"<b>Create new file</b>"
-"<p>Creates a new file and adds it to a currently selected group."
-msgstr "<b>创建新文件</b><p>创建新文件并将它添加到当前选中的分组中。"
+#: src/main.cpp:71 src/main_assistant.cpp:67
+#, fuzzy
+msgid "C++ code completion, persistent class store"
+msgstr "C++ 代码补全，持久类存储"
 
-#: buildtools/qmake/trollprojectwidget.cpp:212
-msgid "Add existing files"
-msgstr "添加已有的文件"
+#: src/main.cpp:72 src/main.cpp:73 src/main.cpp:76 src/main_assistant.cpp:68
+#: src/main_assistant.cpp:69 src/main_assistant.cpp:72
+msgid "Patches"
+msgstr "修补"
 
-#: buildtools/qmake/trollprojectwidget.cpp:213
-#: buildtools/qmake/trollprojectwidget.cpp:1581
-msgid ""
-"<b>Add existing files</b>"
-"<p>Adds existing files to a currently selected group. It is possible to copy "
-"files to a current subproject directory, create symbolic links or add them with "
-"the relative path."
-msgstr "<b>添加已有的文件</b><p>在当前选中的分组中添加已有的文件。可以复制文件到当前子工程目录中、创建符号链接或者通过相对路径添加它们。"
+#: src/main.cpp:74 src/main_assistant.cpp:70
+msgid "Help with Perl support"
+msgstr "协助 Perl 支持"
 
-#: buildtools/qmake/trollprojectwidget.cpp:222
-msgid "Remove file"
-msgstr "删除文件"
+#: src/main.cpp:75 src/main_assistant.cpp:71
+msgid "Documentation index view"
+msgstr "文档索引视图"
 
-#: buildtools/qmake/trollprojectwidget.cpp:223
+#: src/main.cpp:77 src/main_assistant.cpp:73
 msgid ""
-"<b>Remove file</b>"
-"<p>Removes file from a current group. Does not remove file from disk."
-msgstr "<b>删除文件</b><p>从当前分组中删除文件。它并不从磁盘上删除它。"
+"Documentation Finder,  qmake projectmanager patches, usability improvements, "
+"bugfixes ... "
+msgstr ""
 
-#: buildtools/qmake/trollprojectwidget.cpp:276
+#: src/main.cpp:78 src/main_assistant.cpp:74
 #, fuzzy
-msgid "Exclude file"
-msgstr "排除在此外(&E)："
+msgid "TQMake project manager patches"
+msgstr "QMake 工程管理器补丁"
 
-#: buildtools/qmake/trollprojectwidget.cpp:277
-msgid "<b>Exclude file</b><p>Exclude the selected file from this scope."
+#: src/main.cpp:79 src/main_assistant.cpp:75
+msgid "Cleanup and bugfixes for qEditor, AutoMake and much other stuff"
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:1121
-#: buildtools/qmake/trollprojectwidget.cpp:678
-#: buildtools/qmake/trollprojectwidget.cpp:2060
-msgid "Your application is currently running. Do you want to restart it?"
-msgstr "您的应用程序当前正在运行，您要重新开始运行它吗？"
-
-#: buildtools/autotools/autoprojectpart.cpp:1121
-#: buildtools/qmake/trollprojectwidget.cpp:678
-#: buildtools/qmake/trollprojectwidget.cpp:2060
-msgid "Application Already Running"
-msgstr "应用程序已在运行"
+#: src/main.cpp:102 src/main_assistant.cpp:100
+msgid "Loading Settings"
+msgstr "正在载入设置"
 
-#: buildtools/autotools/autoprojectpart.cpp:1121
-#: buildtools/qmake/trollprojectwidget.cpp:678
-#: buildtools/qmake/trollprojectwidget.cpp:2060
-msgid "&Restart Application"
-msgstr "重新启动应用程序(&R)"
+#: src/main.cpp:113 src/main_assistant.cpp:105
+msgid "Starting GUI"
+msgstr "正在启动界面"
 
-#: buildtools/autotools/autoprojectpart.cpp:1121
-#: buildtools/qmake/trollprojectwidget.cpp:678
-#: buildtools/qmake/trollprojectwidget.cpp:2060
-msgid "Do &Nothing"
-msgstr "不运行(&N)"
+#: src/splashscreen.cpp:77
+#, c-format
+msgid "Version %1"
+msgstr "版本 %1"
 
-#: buildtools/qmake/trollprojectwidget.cpp:850
+#: src/generalinfowidget.cpp:58
 #, fuzzy
-msgid "Add Subproject"
-msgstr "添加子工程"
+msgid "Use global editor settings"
+msgstr "配置编辑器设置"
 
-#: buildtools/qmake/trollprojectwidget.cpp:850
+#: src/generalinfowidget.cpp:95
 #, fuzzy
-msgid "Please enter a name for the subproject: "
-msgstr "请输入子目录的名称："
+msgid "Could not open %1 for reading."
+msgstr "无法打开文件进行写入。"
 
-#: buildtools/qmake/trollprojectwidget.cpp:877
-msgid ""
-"Failed to create subdirectory. Do you have write permission in the project "
-"folder?"
-msgstr "子目录创建失败。您对工程文件夹有写入权限吗？"
+#: src/generalinfowidget.cpp:155
+#, fuzzy
+msgid "Could not open %1 for writing."
+msgstr "无法打开文件进行写入。"
 
-#: buildtools/qmake/trollprojectwidget.cpp:933
+#: src/generalinfowidget.cpp:186
 msgid ""
-"Couldn't create subproject. This means that either the project you wanted to "
-"add a subproject isn't parsed correctly or it's not a subdirs-project."
+"Could not find configure.in.in, configure.in or configure.ac to update the "
+"project version."
 msgstr ""
 
-#: buildtools/qmake/trollprojectwidget.cpp:935
-#, fuzzy
-msgid "Subproject creation failed"
-msgstr "子工程信息"
+#: src/generalinfowidget.cpp:215
+msgid "Please enter a path."
+msgstr "请输入一个路径。"
 
-#: buildtools/qmake/trollprojectwidget.cpp:952
-#, fuzzy
-msgid "Delete the file/directory of the subproject from disk?"
-msgstr "选择您的工程所使用的 Qt 版本。"
+#: src/generalinfowidget.cpp:220
+msgid "'%1' is not an absolute path."
+msgstr "“%1”不是一个绝对路径。"
 
-#: buildtools/qmake/trollprojectwidget.cpp:952
-#, fuzzy
-msgid "Delete subdir?"
-msgstr "删除信号"
+#: src/generalinfowidget.cpp:226
+msgid "'%1' is not a relative path."
+msgstr "“%1”不是一个相对路径。"
 
-#: buildtools/qmake/trollprojectwidget.cpp:956
-msgid ""
-"Couldn't delete subproject.\n"
-"This is an internal error, please write a bugreport to bugs.kde.org and include "
-"the output of tdevelop when runfrom a shell."
-msgstr ""
+#: src/generalinfowidget.cpp:234
+msgid "'%1' does not exist."
+msgstr "“%1”不存在。"
 
-#: buildtools/qmake/trollprojectwidget.cpp:958
-#, fuzzy
-msgid "Subproject Deletion failed"
-msgstr "子工程选项"
+#: src/generalinfowidget.cpp:238
+msgid "'%1' is not a directory."
+msgstr "“%1”不是一个目录。"
 
-#: buildtools/qmake/trollprojectwidget.cpp:977
-#, c-format
-msgid "Subproject %1"
-msgstr "子工程 %1"
+#: src/generalinfowidget.cpp:264 src/generalinfowidget.cpp:267
+msgid "'%1' is a valid project directory."
+msgstr "“%1”不是一个有效的工程目录。"
 
-#: buildtools/qmake/trollprojectwidget.cpp:997
-msgid ""
-"<b>Build</b>"
-"<p>Runs <b>make</b> from the selected subproject directory."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
-msgstr ""
-"<b>构建</b>"
-"<p>在所选中的子工程目录中运行 <b>make</b> 命令。"
-"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
+#: src/editorproxy.cpp:48
+msgid "Show Context Menu"
+msgstr "显示环境菜单"
 
-#: buildtools/autotools/autoprojectpart.cpp:147
-#: buildtools/autotools/autoprojectpart.cpp:150
-#: buildtools/autotools/autosubprojectview.cpp:248
-#: buildtools/custommakefiles/customprojectpart.cpp:107
-#: buildtools/custommakefiles/customprojectpart.cpp:110
-#: buildtools/qmake/trollprojectwidget.cpp:1000
-msgid "Install"
-msgstr "安装"
+#: src/simplemainwindow.cpp:99
+msgid "TDevelop &Programming Handbook"
+msgstr ""
 
-#: buildtools/qmake/trollprojectwidget.cpp:1001
+#: src/simplemainwindow.cpp:109
 #, fuzzy
 msgid ""
-"<b>Install</b>"
-"<p>Runs <b>make install</b> from the selected subproject directory."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
+"Unable to find plugins, TDevelop will not work properly.\n"
+"Please make sure that TDevelop is installed in your TDE directory; otherwise, "
+"you have to add TDevelop's installation path to the environment variable "
+"TDEDIRS and run tdebuildsycoca. Restart TDevelop afterwards.\n"
+"Example for BASH users:\n"
+"export TDEDIRS=/path/to/tdevelop:$TDEDIRS && tdebuildsycoca"
 msgstr ""
-"<b>构建</b>"
-"<p>在所选中的子工程目录中运行 <b>make</b> 命令。"
-"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
+"无法找到插件，KDevelop 将不能正常工作！\n"
+"请确保 KDevelop 安装在您的 TDE 目录下，不然您需要把 KDevelop 的安装路径添加到环境变量 TDEDIRS 里，并运行 "
+"tdebuildsycoca，然后重新运行 KDevelop。\n"
+"例如 Bash 用户需要运行：\n"
+"export TDEDIRS=/path/to/tdevelop:$TDEDIRS && tdebuildsycoca"
 
-#: buildtools/autotools/autosubprojectview.cpp:241
-#: buildtools/qmake/trollprojectwidget.cpp:1004
-msgid "Clean"
-msgstr "清理"
+#: src/simplemainwindow.cpp:116
+msgid "Could Not Find Plugins"
+msgstr "无法找到插件"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1005
-#, fuzzy
-msgid ""
-"<b>Clean project</b>"
-"<p>Runs <b>make clean</b> command from the project directory."
-"<br> Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
-msgstr ""
-"<b>清理工程</b>"
-"<p>在工程目录中运行 <b>make clean</b> 命令。"
-"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
+#: src/simplemainwindow.cpp:422
+msgid "Raise &Editor"
+msgstr "升起编辑器(&E)"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1008
-#, fuzzy
-msgid "Dist-Clean"
-msgstr "清理为发行版"
+#: src/simplemainwindow.cpp:424
+msgid "Raise editor"
+msgstr "升起编辑器"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1009
-#, fuzzy
-msgid ""
-"<b>Dist-Clean project</b>"
-"<p>Runs <b>make distclean</b> command from the project directory."
-"<br> Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
-msgstr ""
-"<b>清理工程</b>"
-"<p>在工程目录中运行 <b>make clean</b> 命令。"
-"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
+#: src/simplemainwindow.cpp:425
+msgid "<b>Raise editor</b><p>Focuses the editor."
+msgstr "<b>升起编辑器</b><p>将焦点移至编辑器。"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1013
+#: src/simplemainwindow.cpp:427
 #, fuzzy
-msgid "Rebuild"
-msgstr "构建"
+msgid "Lower All Docks"
+msgstr "工具停靠区(&D)"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1017
-#: buildtools/qmake/trollprojectwidget.cpp:2186
-msgid "Run qmake"
-msgstr "运行 qmake"
+#: src/simplemainwindow.cpp:430
+msgid "Switch to next TabWidget"
+msgstr ""
 
-#: buildtools/qmake/trollprojectwidget.cpp:1018
-msgid ""
-"<b>Run qmake</b>"
-"<p>Runs <b>qmake</b> from the selected subproject directory. This creates or "
-"regenerates Makefile."
-msgstr "<b>运行 qmake</b><p>在当前选中的子工程目录中运行 <b>qmake</b> 命令。它将创建或者重新创建 Makefile。"
+#: src/simplemainwindow.cpp:433 src/simplemainwindow.cpp:441
+msgid "Split &Horizontal"
+msgstr "水平拆分(&H)"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1019
-#, fuzzy
-msgid "Run qmake recursively"
-msgstr "递归(&B)"
+#: src/simplemainwindow.cpp:437 src/simplemainwindow.cpp:445
+msgid "Split &Vertical"
+msgstr "垂直拆分(&V)"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1020
+#: src/simplemainwindow.cpp:449
 #, fuzzy
-msgid ""
-"<b>Run qmake recursively</b>"
-"<p>Runs <b>qmake</b> from the selectedsubproject directory and recurses into "
-"all subproject directories. This creates or regenerates Makefile."
-msgstr "<b>运行 qmake</b><p>在当前选中的子工程目录中运行 <b>qmake</b> 命令。它将创建或者重新创建 Makefile。"
+msgid "Split &Horizontal and Open"
+msgstr "水平拆分(&H)"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1025
-#: buildtools/qmake/trollprojectwidget.cpp:1050
-msgid "Add Subproject..."
-msgstr "添加子工程..."
+#: src/simplemainwindow.cpp:453
+#, fuzzy
+msgid "Split &Vertical and Open"
+msgstr "垂直拆分(&V)"
 
-#: buildtools/autotools/autosubprojectview.cpp:189
-#: buildtools/qmake/trollprojectwidget.cpp:1031
-msgid "Remove Subproject..."
-msgstr "删除子工程..."
+#: src/simplemainwindow.cpp:457
+msgid "Switch Left Dock"
+msgstr "切换左边停靠区"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1032
-msgid ""
-"<b>Remove subproject</b>"
-"<p>Removes currently selected subproject. Does not delete any file from disk. "
-"Deleted subproject can be later added by calling 'Add Subproject' action."
-msgstr "<b>删除子工程</b><p>删除当前选中的子工程。它并不删除磁盘上的任何文件。被删除的子工程以后还可以用“添加子工程”动作再次添加。"
+#: src/simplemainwindow.cpp:460
+msgid "Switch Right Dock"
+msgstr "切换右边停靠区"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1035
-#: buildtools/qmake/trollprojectwidget.cpp:1045
-msgid "Create Scope..."
-msgstr "创建范围..."
+#: src/simplemainwindow.cpp:463
+msgid "Switch Bottom Dock"
+msgstr "切换底部停靠区"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1036
-msgid ""
-"<b>Create scope</b>"
-"<p>Creates QMake scope in the project file of the currently selected "
-"subproject."
-msgstr "<b>创建范围</b><p>在当前选中的子工程的工程文件中创建 QMake 范围。"
+#: src/partcontroller.cpp:157 src/simplemainwindow.cpp:622
+msgid "Close All Others"
+msgstr "关闭其它文件"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1038
-msgid "Subproject Settings"
-msgstr "子工程选项"
+#: src/simplemainwindow.cpp:632
+msgid "Duplicate"
+msgstr "复制"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1039
-msgid ""
-"<b>Subproject settings</b>"
-"<p>Opens <b>QMake Subproject Configuration</b> dialog. It provides settings "
-"for:"
-"<br>subproject type and configuration,"
-"<br>include and library paths,"
-"<br>lists of dependencies and external libraries,"
-"<br>build order,"
-"<br>intermediate files locations,"
-"<br>compiler options."
-msgstr ""
-"<b>子工程选项</b>"
-"<p>打开 <b>QMake 子工程配置</b>对话框。它提供如下设置："
-"<br>子工程类型和配置；"
-"<br>头文件和库路径；"
-"<br>依赖关系和外部库列表；"
-"<br>编译顺序；"
-"<br>中间文件位置；"
-"<br>编译器选项。"
+#: src/mainwindowshare.cpp:112
+msgid "&Stop"
+msgstr "停止(&S)"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1046
+#: src/mainwindowshare.cpp:116
 msgid ""
-"<b>Create Scope</b>"
-"<p>Creates QMake scope in the currently selected scope."
-msgstr "<b>创建范围</b><p>在当前所选中的范围中创建 QMake 范围。"
+"<b>Stop</b>"
+"<p>Stops all running processes (like building process, grep command, etc.). "
+"When placed onto a toolbar provides a popup menu to choose a process to stop."
+msgstr "<b>停止</b><p>停止所有运行的进程(比如编译进程、grep 命令等)。如果放在工具栏上，它提供一个弹出菜单选择要停止的进程。"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1047
-msgid "Remove Scope"
-msgstr "删除范围"
+#: src/mainwindowshare.cpp:130
+msgid "Lets you switch the menubar on/off."
+msgstr "让您显示和隐藏菜单栏。"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1048
-msgid "<b>Remove Scope</b><p>Removes currently selected scope."
-msgstr "<b>删除范围</b><p>删除当前选中的范围。"
+#: src/mainwindowshare.cpp:136
+msgid "Lets you configure shortcut keys."
+msgstr "让您配置快捷键。"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1051
-#, fuzzy
-msgid ""
-"<b>Add subproject</b>"
-"<p>Creates a <i>new</i> or adds an <i>existing</i> subproject to the currently "
-"selected scope. This action is allowed only if a type of the subproject is "
-"'subdirectories'. The type of the subproject can be defined in <b>"
-"Subproject Settings</b> dialog (open it from the subproject context menu)."
-msgstr ""
-"<b>添加子工程</b>"
-"<p>在当前选择的子工程中创建<i>新的</i>或者添加一个<i>现有的</i>子工程。只有当子工程的类型为“子目录”时才允许这个动作。子工程的类型可以在<b>"
-"子工程设置</b>对话框中定义，该对话框能在子工程环境菜单中打开。"
+#: src/mainwindowshare.cpp:142
+msgid "Lets you configure toolbars."
+msgstr "让您配置工具栏。"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1056
-#, fuzzy
-msgid "Disable Subproject..."
-msgstr "添加子工程..."
+#: src/mainwindowshare.cpp:148
+msgid "Lets you configure system notifications."
+msgstr "让您配置系统通知。"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1057
+#: src/mainwindowshare.cpp:152 src/mainwindowshare.cpp:153
+#: src/mainwindowshare.cpp:298
 #, fuzzy
-msgid ""
-"<b>Disable subproject</b>"
-"<p>Disables the currently selected subproject when this scope is active. Does "
-"not delete the directory from disk. Deleted subproject can be later added by "
-"calling 'Add Subproject' action."
-msgstr "<b>删除子工程</b><p>删除当前选中的子工程。它并不删除磁盘上的任何文件。被删除的子工程以后还可以用“添加子工程”动作再次添加。"
+msgid "Configure TDevelop"
+msgstr "配置 KDevelop"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1062
+#: src/mainwindowshare.cpp:153
 #, fuzzy
-msgid ""
-"<b>Scope settings</b>"
-"<p>Opens <b>QMake Subproject Configuration</b> dialog. It provides settings "
-"for:"
-"<br>subproject type and configuration,"
-"<br>include and library paths,"
-"<br>lists of dependencies and external libraries,"
-"<br>build order,"
-"<br>intermediate files locations,"
-"<br>compiler options."
-msgstr ""
-"<b>子工程选项</b>"
-"<p>打开 <b>QMake 子工程配置</b>对话框。它提供如下设置："
-"<br>子工程类型和配置；"
-"<br>头文件和库路径；"
-"<br>依赖关系和外部库列表；"
-"<br>编译顺序；"
-"<br>中间文件位置；"
-"<br>编译器选项。"
+msgid "Lets you customize TDevelop."
+msgstr "让您自定义 KDevelop。"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1191
-msgid ""
-"You didn't select a subproject to add the file to or selected a subproject that "
-"has subdirs."
-msgstr ""
+#: src/mainwindowshare.cpp:157
+msgid "Show statusbar"
+msgstr "显示状态栏"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1191
-#, fuzzy
-msgid "File adding aborted"
-msgstr "文件已更改"
+#: src/mainwindowshare.cpp:158
+msgid "<b>Show statusbar</b><p>Hides or shows the statusbar."
+msgstr "<b>显示状态栏</b><p>隐藏或显示状态栏。"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1262
-msgid "All Files"
-msgstr "所有文件"
+#: src/mainwindowshare.cpp:160
+msgid "&Next Window"
+msgstr "下一个窗口(&N)"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1376
-msgid "Insert New Filepattern"
-msgstr "插入新文件模板"
+#: src/mainwindowshare.cpp:161
+msgid "Next window"
+msgstr "下一个窗口"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1377
-msgid ""
-"Please enter a filepattern relative the current subproject (example "
-"docs/*.html):"
-msgstr "请输入相对于当前子工程的文件模板(例如 docs/*.html)："
+#: src/mainwindowshare.cpp:162
+msgid "<b>Next window</b><p>Switches to the next window."
+msgstr "<b>下一个窗口</b><p>切换到下一个窗口。"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1392
-msgid "Insert New Install Object"
-msgstr "插入新安装对象"
+#: src/mainwindowshare.cpp:164
+msgid "&Previous Window"
+msgstr "上一个窗口(&P)"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1393
-msgid "Please enter a name for the new object:"
-msgstr "请输入新对象的名称："
+#: src/mainwindowshare.cpp:165
+msgid "Previous window"
+msgstr "上一个窗口"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1546
-msgid "Add Install Object..."
-msgstr "添加安装对象..."
+#: src/mainwindowshare.cpp:166
+msgid "<b>Previous window</b><p>Switches to the previous window."
+msgstr "<b>上一个窗口</b><p>切换到上一个窗口。"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1547
-msgid ""
-"<b>Add install object</b>"
-"<p>Creates QMake install object. It is possible to define a list of files to "
-"install and installation locations for each object. Warning! Install objects "
-"without path specified will not be saved to a project file."
-msgstr ""
-"<b>添加安装对象</b>"
-"<p>创建 QMake 安装对象。它可以定义每个安装对象要安装的文件列表和安装位置。警告！未指定路径的安装对象将不会被保存在工程文件中。"
+#: src/mainwindowshare.cpp:168
+msgid "&Last Accessed Window"
+msgstr "上次访问的窗口(&L)"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1553
-msgid "Install Path..."
-msgstr "安装路径..."
+#: src/mainwindowshare.cpp:169
+msgid "Last accessed window"
+msgstr "上次访问的窗口"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1554
+#: src/mainwindowshare.cpp:170
 msgid ""
-"<b>Install path</b>"
-"<p>Allows to choose the installation path for the current install object."
-msgstr "<b>安装路径</b><p>允许选择当前安装对象的安装路径。"
+"<b>Last accessed window</b>"
+"<p>Switches to the last viewed window (Hold the Alt key pressed and walk on by "
+"repeating the Up key)."
+msgstr "<b>上次访问的窗口</b><p>切换到上次查看的窗口(按住 Alt 键，用上箭头轮流切换)。"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1555
-msgid "Add Pattern of Files to Install..."
-msgstr "添加要安装的文件模板..."
+#: src/mainwindowshare.cpp:172
+msgid "&First Accessed Window"
+msgstr "首次访问的窗口(&F)"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1556
-msgid ""
-"<b>Add pattern of files to install</b>"
-"<p>Defines the pattern to match files which will be installed. It is possible "
-"to use wildcards and relative paths like <i>docs/*</i>."
-msgstr "<b>添加要安装的文件模板</b><p>定义和要安装的文件相匹配的文件模板，可以使用通配符和相对路径，比如 <i>docs/*</i>。"
+#: src/mainwindowshare.cpp:173
+msgid "First accessed window"
+msgstr "首次访问的窗口"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1558
-#, fuzzy
-msgid "Remove Install Object"
-msgstr "添加安装对象"
+#: src/mainwindowshare.cpp:174
+msgid ""
+"<b>First accessed window</b>"
+"<p>Switches to the first accessed window (Hold the Alt key pressed and walk on "
+"by repeating the Down key)."
+msgstr "<b>首次访问的窗口</b><p>切换到首次访问的窗口(按住 Alt 键，用下箭头轮流切换)。"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1559
+#: src/mainwindowshare.cpp:176
 #, fuzzy
-msgid ""
-"<b>Remove install object</b>"
-"<p>Removes the install object the current group."
-msgstr "<b>删除所有断点</b><p>删除工程中的所有断点。"
+msgid "Configure Plugins..."
+msgstr "核心插件"
 
-#: buildtools/autotools/autodetailsview.cpp:189
-#: buildtools/autotools/autodetailsview.cpp:190
-#: buildtools/qmake/trollprojectwidget.cpp:1563
-#: buildtools/qmake/trollprojectwidget.cpp:1578
-msgid "Create New File..."
-msgstr "创建新文件..."
+#: src/mainwindowshare.cpp:178
+msgid "Configure &Editor..."
+msgstr "配置编辑器(&E)..."
 
-#: buildtools/qmake/trollprojectwidget.cpp:1564
-msgid ""
-"<b>Create new file</b>"
-"<p>Creates a new translation file and adds it to a currently selected "
-"TRANSLATIONS group."
-msgstr "<b>创建新文件</b><p>创建新的翻译文件并把它添加到当前选中的 TRANSLATIONS 分组中。"
+#: src/mainwindowshare.cpp:179
+msgid "Configure editor settings"
+msgstr "配置编辑器设置"
 
-#: buildtools/autotools/autodetailsview.cpp:198
-#: buildtools/autotools/autodetailsview.cpp:199
-#: buildtools/qmake/trollprojectwidget.cpp:1565
-#: buildtools/qmake/trollprojectwidget.cpp:1580
-msgid "Add Existing Files..."
-msgstr "添加已有的文件..."
+#: src/mainwindowshare.cpp:180
+msgid "<b>Configure editor</b><p>Opens editor configuration dialog."
+msgstr "<b>配置编辑器</b><p>打开编辑器配置对话框。"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1566
-msgid ""
-"<b>Add existing files</b>"
-"<p>Adds existing translation (*.ts) files to a currently selected TRANSLATIONS "
-"group. It is possible to copy files to a current subproject directory, create "
-"symbolic links or add them with the relative path."
-msgstr ""
-"<b>添加已有的文件</b>"
-"<p>添加已有的翻译文件 (*.ts) 到当前选中的 TRANSLATIONS 分组中。可以复制文件到当前子工程目录中、创建符号链接或者通过相对路径添加它们。"
+#: src/mainwindowshare.cpp:442
+msgid "<b>Show menubar</b><p>Lets you switch the menubar on/off."
+msgstr "<b>显示菜单栏</b><p>让您显示和隐藏菜单栏。"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1569
-msgid "Update Translation Files"
-msgstr "更新翻译文件"
+#: src/partcontroller.cpp:130
+msgid "Open file"
+msgstr "打开文件"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1570
+#: src/partcontroller.cpp:131
 msgid ""
-"<b>Update Translation Files</b>"
-"<p>Runs <b>lupdate</b> command from the current subproject directory. It "
-"collects translatable messages and saves them into translation files."
-msgstr "<b>更新翻译文件</b><p>在当前子工程目录中运行 <b>lupdate</b> 命令。它收集可翻译的消息并保存到翻译文件中。"
+"<b>Open file</b>"
+"<p>Opens an existing file without adding it to the project.</p>"
+msgstr "<b>打开文件</b><p>添加一个现有的文件到当前选中的工程中。</p>"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1572
-msgid "Release Binary Translations"
-msgstr "发布翻译结果"
+#: src/partcontroller.cpp:134
+msgid "Opens recently opened file."
+msgstr "打开最近使用的文件"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1573
-msgid ""
-"<b>Release Binary Translations</b>"
-"<p>Runs <b>lrelease</b> command from the current subproject directory. It "
-"creates binary translation files that are ready to be loaded at program "
-"execution."
-msgstr ""
-"<b>发布翻译结果</b>"
-"<p>在当前子工程目录中运行 <b>lrelease</b> 命令。它创建二进制的翻译文件，可在程序运行时直接加载。"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:98 src/partcontroller.cpp:137
+msgid "Save Al&l"
+msgstr "全部保存(&L)"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1590
-msgid "Choose Install Path"
-msgstr "选择安装路径"
+#: src/partcontroller.cpp:138
+msgid "Save all modified files"
+msgstr "保存所有修改的文件"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1590
-msgid "Enter a path (example /usr/local/share/... ):"
-msgstr "输入一个路径(例如 /usr/local/share/... )："
+#: src/partcontroller.cpp:139
+msgid "<b>Save all</b><p>Saves all modified files."
+msgstr "<b>全部保存</b><p>保存所有修改的文件。"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1604
-msgid "Add Pattern of Files to Install"
-msgstr "添加要安装的文件模板"
+#: src/partcontroller.cpp:142
+msgid "Rever&t All"
+msgstr "全部返转(&T)"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1605
-#: buildtools/qmake/trollprojectwidget.cpp:1906
-msgid ""
-"Enter a pattern relative to the current subproject (example docs/*.html):"
-msgstr "输入相对于当前子工程的模板(例如 docs/*.html)："
+#: src/partcontroller.cpp:143
+msgid "Revert all changes"
+msgstr "返转所有修改"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1725
-msgid "Add Install Object"
-msgstr "添加安装对象"
+#: src/partcontroller.cpp:144
+#, fuzzy
+msgid ""
+"<b>Revert all</b>"
+"<p>Reverts all changes in opened files. Prompts to save changes so the "
+"reversion can be canceled for each modified file."
+msgstr "<b>全部返转</b><p>返转打开的文件中的所有改动。将对每个改动的文件单独询问是否要保存改动，从而能不进行返转。"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1726
-msgid "Enter a name for the new object:"
-msgstr "输入新对象的名称："
+#: src/partcontroller.cpp:148
+msgid "Close current file"
+msgstr "关闭当前文件"
 
-#: buildtools/autotools/autodetailsview.cpp:557
-#: buildtools/qmake/trollprojectwidget.cpp:1760
-#, c-format
-msgid "File: %1"
-msgstr "文件：%1"
+#: src/partcontroller.cpp:149
+msgid "Closes current file."
+msgstr "关闭当前的文件。"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1762
-#, c-format
-msgid "Pattern: %1"
-msgstr "模板：%1"
+#: kdevdesigner/designer/mainwindowactions.cpp:919 src/partcontroller.cpp:152
+msgid "Close All"
+msgstr "全部关闭"
 
-#: buildtools/autotools/autodetailsview.cpp:580
-#: buildtools/qmake/trollprojectwidget.cpp:1775
-msgid "Edit ui-Subclass..."
-msgstr "编辑用户界面子类..."
+#: src/partcontroller.cpp:153
+msgid "Close all files"
+msgstr "关闭所有文件"
 
-#: buildtools/autotools/autodetailsview.cpp:581
-#: buildtools/qmake/trollprojectwidget.cpp:1776
-msgid ""
-"<b>Edit ui-subclass</b>"
-"<p>Launches <b>Subclassing</b> wizard and prompts to implement missing in "
-"childclass slots and functions."
-msgstr "<b>编辑用户界面子类</b><p>启动<b>子类</b>向导，询问尚缺少的子类信号槽和函数实现。"
+#: src/partcontroller.cpp:154
+msgid "<b>Close all</b><p>Close all opened files."
+msgstr "<b>全部关闭</b><p>关闭所有文件。"
 
-#: buildtools/autotools/autodetailsview.cpp:565
-#: buildtools/qmake/trollprojectwidget.cpp:1781
-msgid "Subclassing Wizard..."
-msgstr "子类向导..."
+#: src/partcontroller.cpp:158
+msgid "Close other files"
+msgstr "关闭其它文件"
 
-#: buildtools/autotools/autodetailsview.cpp:566
-#: buildtools/qmake/trollprojectwidget.cpp:1782
-msgid ""
-"<b>Subclass widget</b>"
-"<p>Launches <b>Subclassing</b> wizard. It allows to create a subclass from the "
-"class defined in .ui file. There is also possibility to implement slots and "
-"functions defined in the base class."
-msgstr "<b>子类部件</b><p>启动<b>子类</b>向导。它允许从 .ui 文件中定义的类创建子类。也可以实现基类中定义的信号槽和函数。"
+#: src/partcontroller.cpp:159
+msgid "<b>Close all others</b><p>Close all opened files except current."
+msgstr "<b>关闭其它文件</b><p>关闭当前文件外的所有其它文件。"
 
-#: buildtools/autotools/autodetailsview.cpp:586
-#: buildtools/qmake/trollprojectwidget.cpp:1787
-msgid "Open ui.h File"
-msgstr "打开 ui.h 文件"
+#: src/partcontroller.cpp:167
+#, fuzzy
+msgid "<b>Back</b><p>Moves backwards one step in the navigation history."
+msgstr "<b>后退</b><p>在浏览历史中向后退一步。"
 
-#: buildtools/autotools/autodetailsview.cpp:587
-#: buildtools/qmake/trollprojectwidget.cpp:1788
+#: src/partcontroller.cpp:174
 #, fuzzy
-msgid ""
-"<b>Open ui.h file</b>"
-"<p>Opens .ui.h file associated with the selected .ui."
-msgstr "<b>打开 ui.h 文件</b><p>打开和所选的 .ui 文件相关联的 ui.h 文件。"
+msgid "<b>Forward</b><p>Moves forward one step in the navigation history."
+msgstr "<b>前进</b><p>在浏览历史中向前进一步。"
 
-#: buildtools/autotools/autodetailsview.cpp:574
-#: buildtools/qmake/trollprojectwidget.cpp:1790
-msgid "List of Subclasses..."
-msgstr "子类列表..."
+#: src/partcontroller.cpp:178 src/partcontroller.cpp:180
+msgid "Goto Last Edit Position"
+msgstr ""
 
-#: buildtools/autotools/autodetailsview.cpp:575
-#: buildtools/qmake/trollprojectwidget.cpp:1791
+#: src/partcontroller.cpp:181
 msgid ""
-"<b>List of subclasses</b>"
-"<p>Shows subclasses list editor. There is possibility to add or remove "
-"subclasses from the list."
-msgstr "<b>子类列表</b><p>显示子类列表编辑器，可以在列表中添加或删除子类。"
+"<b>Goto Last Edit Position</b>"
+"<p>Open the last edited file and position cursor at the point of edit"
+msgstr ""
 
-#: buildtools/qmake/trollprojectwidget.cpp:1797
-#, fuzzy
+#: src/partcontroller.cpp:1008
 msgid ""
-"<b>Remove file</b>"
-"<p>Removes file from a current group. For sources also removes the subclassing "
-"information."
-msgstr "<b>删除文件</b><p>从当前分组中删除文件。它并不从磁盘上删除它。"
+"The file \"%1\" is modified in memory. Are you sure you want to reload it? "
+"(Local changes will be lost.)"
+msgstr ""
 
-#: buildtools/qmake/trollprojectwidget.cpp:1798
-#, fuzzy
-msgid "Exclude File"
-msgstr "排除在此外(&E)："
+#: src/partcontroller.cpp:1009
+msgid "File is Modified"
+msgstr "文件已修改"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1799
+#: buildtools/qmake/trollprojectwidget.cpp:2462 src/partcontroller.cpp:1009
+#: src/partcontroller.cpp:1502
+msgid "Do Not Reload"
+msgstr "不重新装入"
+
+#: src/partcontroller.cpp:1123
 msgid ""
-"<b>Exclude File</b>"
-"<p>Excludes the file from this Scope. Does not touch subclassing information"
+"The file \"%1\" is modified on disk.\n"
+"\n"
+"Are you sure you want to overwrite it? (External changes will be lost.)"
 msgstr ""
 
-#: buildtools/qmake/trollprojectwidget.cpp:1803
-#: buildtools/qmake/trollprojectwidget.cpp:1905
-msgid "Edit Pattern"
-msgstr "编辑模板"
-
-#: buildtools/qmake/trollprojectwidget.cpp:1804
-msgid "<b>Edit pattern</b><p>Allows to edit install files pattern."
-msgstr "<b>编辑模板</b><p>可以编辑安装文件模板。"
+#: src/partcontroller.cpp:1124
+msgid "File Externally Modified"
+msgstr "文件在外部修改"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1805
-msgid "Remove Pattern"
-msgstr "删除模板"
+#: src/partcontroller.cpp:1124
+msgid "Do Not Overwrite"
+msgstr "不覆盖"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1806
+#: src/partcontroller.cpp:1483
 msgid ""
-"<b>Remove pattern</b>"
-"<p>Removes install files pattern from the current install object."
-msgstr "<b>删除模板</b><p>从当前安装对象中删除安装文件模板。"
+"Conflict: The file \"%1\" has changed on disk while being modified in memory.\n"
+"\n"
+"You should investigate before saving to make sure you are not losing data."
+msgstr ""
 
-#: buildtools/qmake/trollprojectwidget.cpp:1817
-#, fuzzy
-msgid "Build File"
-msgstr "构建文件(&B)："
+#: src/partcontroller.cpp:1485
+msgid "Conflict"
+msgstr "冲突"
 
-#: buildtools/qmake/trollprojectwidget.cpp:1818
-#, fuzzy
-msgid "<b>Build File</b><p>Builds the object file for this source file."
-msgstr "<b>重建文件树</b><p>重新建立工程文件树。"
+#: src/partcontroller.cpp:1492
+msgid ""
+"Warning: The file \"%1\" has been deleted on disk.\n"
+"\n"
+"If this was not your intention, make sure to save this file now."
+msgstr ""
 
-#: buildtools/qmake/trollprojectwidget.cpp:1934
+#: src/partcontroller.cpp:1494
+msgid "File Deleted"
+msgstr "文件已删除"
+
+#: src/partcontroller.cpp:1501
 #, fuzzy
 msgid ""
-"Do you want to delete the file <strong>%1</strong> from the project and your "
-"disk?"
-msgstr "打开一个最近的工程"
+"The file \"%1\" has changed on disk.\n"
+"\n"
+"Do you want to reload it?"
+msgstr ""
+"错误列表已经改变。\n"
+"您要保存您的修改吗？"
 
-#: buildtools/qmake/trollprojectwidget.cpp:2052
+#: src/partcontroller.cpp:1502
+msgid "File Changed"
+msgstr "文件已更改"
+
+#: src/partcontroller.cpp:1801 src/partcontroller.cpp:1822
 #, fuzzy
+msgid "unnamed"
+msgstr "用户名"
+
+#: src/languageselectwidget.cpp:65
+msgid "Additional Language Support"
+msgstr "额外语言支持"
+
+#: src/languageselectwidget.cpp:115
 msgid ""
-"Please specify the executable name in the project options dialog or select an "
-"application subproject in the QMake Manager."
-msgstr "请先在工程对话框中指定可执行文件的名称。"
+"Primary language is '%1'. Please select additional languages the project might "
+"contain."
+msgstr "主要语言是“%1”，请选择工程可能含有的其它语言。"
 
-#: buildtools/qmake/trollprojectwidget.cpp:2053
-#, fuzzy
-msgid "No Executable Found"
-msgstr "未指定可执行文件"
+#: src/main.cpp:26
+msgid "Files to load"
+msgstr "要载入的文件"
 
-#: buildtools/qmake/trollprojectwidget.cpp:2186
-msgid "There is no Makefile in this directory. Run qmake first?"
-msgstr "这个目录里没有 Makefile，要先运行 qmake 吗？"
+#: src/main.cpp:32
+#, fuzzy
+msgid "The TDevelop Integrated Development Environment"
+msgstr "KDevelop 集成开发环境"
 
-#: buildtools/autotools/autoprojectpart.cpp:646
-#: buildtools/autotools/autoprojectpart.cpp:657
-#: buildtools/autotools/configureoptionswidget.cpp:239
-#: buildtools/qmake/trollprojectwidget.cpp:2186
+#: src/main.cpp:33
 #, fuzzy
-msgid "Do Not Run"
-msgstr "不运行(&N)"
+msgid "TDevelop"
+msgstr "KDevelop"
 
-#: buildtools/qmake/trollprojectwidget.cpp:2276
-msgid ""
-"Couldn't delete Function Scope.\n"
-"This is an internal error, please write a bugreport to bugs.kde.org and include "
-"the output of tdevelop when run from a shell."
+#: src/main.cpp:38
+msgid "Advanced C++ code completion, C++ support, overall improvements"
 msgstr ""
 
-#: buildtools/qmake/trollprojectwidget.cpp:2276
-#, fuzzy
-msgid "Function Scope Deletion failed"
-msgstr "函数"
-
-#: buildtools/qmake/trollprojectwidget.cpp:2284
+#: src/main.cpp:49
 msgid ""
-"Couldn't delete Include Scope.\n"
-"This is an internal error, please write a bugreport to bugs.kde.org and include "
-"the output of tdevelop when run from a shell."
+"Automake manager patches, Astyle plugin update, plugin patches and improvements"
 msgstr ""
 
-#: buildtools/qmake/trollprojectwidget.cpp:2284
+#: src/main.cpp:54
 #, fuzzy
-msgid "Include Scope Deletion failed"
-msgstr "包含应用程序图标"
+msgid "TQMake projectmanager, TQt4 Support"
+msgstr "QMake 工程管理器"
 
-#: buildtools/qmake/trollprojectwidget.cpp:2296
-msgid ""
-"Couldn't delete Scope.\n"
-"This is an internal error, please write a bugreport to bugs.kde.org and include "
-"the output of tdevelop when run from a shell."
+#: src/main.cpp:80
+msgid "SnippetPart, debugger and usability patches"
 msgstr ""
 
-#: buildtools/qmake/trollprojectwidget.cpp:2296
-msgid "Scope Deletion failed"
+#: src/main.cpp:81
+msgid "Artwork for the Ruby language"
 msgstr ""
 
-#: buildtools/qmake/trollprojectwidget.cpp:2462
-msgid ""
-"The project file \"%1\" has changed on disk\n"
-"(Or you have \"%2\" opened in the editor, which also triggers a reload when you "
-"change something in the QMake Manager).\n"
-"\n"
-"Do you want to reload the it?"
-msgstr ""
+#: src/profileengine/editor/profileeditor.cpp:201
+msgid "Core Plugins"
+msgstr "核心插件"
 
-#: buildtools/qmake/trollprojectwidget.cpp:2462
-#, fuzzy
-msgid "Project File Changed"
-msgstr "文件已更改"
+#: src/profileengine/editor/profileeditor.cpp:203
+msgid "Global Plugins"
+msgstr "全局插件"
 
-#: buildtools/qmake/createscopedlg.cpp:33
-msgid "Choose existing .pri file or give a new filename for creation"
+#: src/profileengine/editor/profileeditor.cpp:205
+msgid "Project Plugins"
+msgstr "工程插件"
+
+#: src/profileengine/editor/profileeditor.cpp:254
+msgid "Remove selected profile and all its subprofiles?"
 msgstr ""
 
-#: buildtools/qmake/createscopedlg.cpp:91
+#: src/profileengine/editor/profileeditor.cpp:267
 msgid ""
-"You did not specify all needed information. The scope will not be created."
-"<br>Do you want to abort the scope creation?"
+"Cannot remove this profile because it is not a local (user-created) profile."
 msgstr ""
 
-#: buildtools/qmake/createscopedlg.cpp:93
-#, fuzzy
-msgid "Missing information"
-msgstr "定义信息"
-
-#: buildtools/pascal/pascalproject_part.cpp:66
-msgid ""
-"<b>Build project</b>"
-"<p>Runs the compiler on a main source file of the project. The compiler and the "
-"main source file can be set in project settings, <b>Pascal Compiler</b> tab."
+#: src/profileengine/editor/profileeditor.cpp:329
+msgid "This plugin is already contained in the list of disabled plugins."
 msgstr ""
-"<b>构建工程</b>"
-"<p>对工程的主要源代码文件运行编译器。编译器和主源代码文件可以在工程设置的 <b>Pascal 编译器</b>页中指定。"
 
-#: buildtools/pascal/pascalproject_part.cpp:72
-msgid ""
-"<b>Execute program</b>"
-"<p>Executes the main program specified in project settings, <b>Run options</b> "
-"tab. If nothing is set, the binary file with the same name as the main source "
-"file name is executed."
-msgstr "<b>执行程序</b><p>执行工程设置的<b>运行选项</b>页中指定的主程序。如果未指定，和主源代码文件具有相同名字的执行文件将被执行。"
+#: src/profileengine/editor/profileeditor.cpp:330
+msgid "Enable Plugin"
+msgstr "启用插件"
 
-#: buildtools/pascal/pascalproject_part.cpp:341
-msgid ""
-"Could not find pascal compiler.\n"
-"Check if your compiler settings are correct."
+#: src/profileengine/editor/profileeditor.cpp:375
+msgid "This plugin is already contained in the list of enabled plugins."
 msgstr ""
-"无法找到 Pascal 编译器。\n"
-"请检查您的编译器设置是否正确。"
 
-#: buildtools/autotools/configureoptionswidget.cpp:398
-#: buildtools/pascal/pascalproject_part.cpp:450
-msgid ""
-"There was an error loading the module %1.\n"
-"The diagnostics is:\n"
-"%2"
-msgstr ""
-"加载模块 %1 时发生错误。\n"
-"诊断信息为：\n"
-"%2"
+#: src/profileengine/editor/profileeditor.cpp:376
+msgid "Disable Plugin"
+msgstr "禁用插件"
 
-#: buildtools/custommakefiles/selectnewfilesdialog.cpp:24
+#: src/profileengine/editor/main.cpp:33
 #, fuzzy
-msgid "Add newly created files to project"
-msgstr "将选中文件加入到工程"
+msgid "TDevelop Profile Editor"
+msgstr "KDevelop 配置文件编辑器"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:79
-#: buildtools/custommakefiles/customprojectpart.cpp:80
+#: src/profileengine/editor/main.cpp:34
+msgid "(c) 2004, The KDevelop Developers"
+msgstr "(C) 2004，KDevelop 开发者"
+
+#: src/newui/ddockwindow.cpp:88
 #, fuzzy
-msgid "Re-Populate Project"
-msgstr "重新编译工程(&R)"
+msgid "Move to left dock"
+msgstr "左移"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:81
-msgid ""
-"<b>Re-Populate Project</b>"
-"<p>Re-Populate's the project, searches through the project directory and adds "
-"all files that match one of the wildcards set in the custom manager options to "
-"the project filelist."
-msgstr ""
+#: src/newui/ddockwindow.cpp:89
+#, fuzzy
+msgid "Move to right dock"
+msgstr "右移"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:87
-msgid ""
-"<b>Build project</b>"
-"<p>Runs <b>make</b> from the project directory."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Build Options</b> tab."
+#: src/newui/ddockwindow.cpp:90
+msgid "Move to bottom dock"
 msgstr ""
-"<b>构建工程</b>"
-"<p>在工程目录中运行 <b>make</b> 命令。"
-"<br>环境变量和 make 的参数可以在工程设置的<b>构建选项</b>页中指定。"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:91
+#: src/newui/button.cpp:58
 #, fuzzy
-msgid "&Build Active Directory"
-msgstr "Make 活动目录"
+msgid "Assign Accelerator..."
+msgstr "检查快捷键"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:94
+#: src/newui/button.cpp:60
 #, fuzzy
-msgid "Build active directory"
-msgstr "构建活动目标"
+msgid "Clear Accelerator"
+msgstr "检查快捷键"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:95
+#: src/newui/button.cpp:318
 #, fuzzy
-msgid ""
-"<b>Build active directory</b>"
-"<p>Constructs a series of make commands to build the active directory. "
-"Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
-msgstr ""
-"<b>编译活动目标</b>"
-"<p>构造一系列编译命令，编译活动的目标，并编译所依赖的目标。"
-"<br>环境变量和编译参数可以在工程设置的<b>编译选项</b>页中指定。"
+msgid "Change Button Number"
+msgstr "更改函数名称"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:103
-msgid ""
-"<b>Compile file</b>"
-"<p>Runs <b>make filename.o</b> command from the directory where 'filename' is "
-"the name of currently opened file."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Build Options</b> tab."
+#: src/newui/button.cpp:318
+msgid "New accelerator number:"
 msgstr ""
-"<b>编译文件</b>"
-"<p>在当前打开的文件“'filename”所在的目录中运行 <b>make filename.o</b> 命令。"
-"<br>环境变量和编译参数可以在工程设置的<b>构建选项</b>页中指定。"
 
-#: buildtools/autotools/autoprojectpart.cpp:151
-#: buildtools/custommakefiles/customprojectpart.cpp:111
-msgid ""
-"<b>Install</b>"
-"<p>Runs <b>make install</b> command from the project directory."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
-msgstr ""
-"<b>安装</b>"
-"<p>在工程目录中执行 <b>make install</b> 命令。"
-"<br>环境变量和编译参数可以在工程设置的<b>编译选项</b>页中指定。"
+#: kdevdesigner/designer/mainwindowactions.cpp:797
+#: kdevdesigner/designer/mainwindowactions.cpp:798
+#: kdevdesigner/designer/newformimpl.cpp:364
+#: kdevdesigner/designer/startdialogimpl.cpp:67
+#: kdevdesigner/designer/workspace.cpp:159
+msgid "<No Project>"
+msgstr "<无工程>"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:115
-#, fuzzy
-msgid "Install Active Directory"
-msgstr "Make 活动目录"
+#: kdevdesigner/designer/workspace.cpp:598
+msgid "&Open Source File"
+msgstr "打开源文件(&O)"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:118
-#, fuzzy
-msgid "Install active directory"
-msgstr "Make 活动目录"
+#: kdevdesigner/designer/workspace.cpp:601
+msgid "&Remove Source File From Project"
+msgstr "从工程中删除源文件(&R)"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:119
+#: kdevdesigner/designer/workspace.cpp:604
+msgid "&Open Form"
+msgstr "打开表单(&O)"
+
+#: kdevdesigner/designer/workspace.cpp:607
+#: kdevdesigner/designer/workspace.cpp:617
+msgid "&Remove Form From Project"
+msgstr "从工程中删除表单(&R)"
+
+#: kdevdesigner/designer/workspace.cpp:610
+msgid "&Open Form Source"
+msgstr "打开表单源代码(&O)"
+
+#: kdevdesigner/designer/workspace.cpp:614
+msgid "&Remove Source File From Form"
+msgstr "从表单中删除源文件(&R)"
+
+#: kdevdesigner/designer/workspace.cpp:623
+msgid "&Open Source"
+msgstr "打开源文件(&O)"
+
+#: kdevdesigner/designer/resource.cpp:1787
+msgid "Loading File"
+msgstr "装入文件"
+
+#: kdevdesigner/designer/resource.cpp:1788
 #, fuzzy
 msgid ""
-"<b>Install active directory</b>"
-"<p>Runs <b>make install</b> command from the active directory."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
-msgstr ""
-"<b>安装</b>"
-"<p>在工程目录中执行 <b>make install</b> 命令。"
-"<br>环境变量和编译参数可以在工程设置的<b>编译选项</b>页中指定。"
+"Error loading %1.\n"
+"The widget %2 could not be created."
+msgstr "这个项目无法删除"
 
-#: buildtools/autotools/autoprojectpart.cpp:156
-#: buildtools/autotools/autosubprojectview.cpp:254
-#: buildtools/custommakefiles/customprojectpart.cpp:123
-msgid "Install (as root user)"
-msgstr "安装(用 root 身份)"
+#: kdevdesigner/designer/formfile.cpp:297
+#: kdevdesigner/designer/hierarchyview.cpp:1105
+#: kdevdesigner/designer/hierarchyview.cpp:1109
+#: kdevdesigner/designer/hierarchyview.cpp:1221
+#: kdevdesigner/designer/sourcefile.cpp:141
+#, c-format
+msgid "Edit %1"
+msgstr "编辑 %1"
 
-#: buildtools/autotools/autoprojectpart.cpp:159
-#: buildtools/custommakefiles/customprojectpart.cpp:126
-msgid "Install as root user"
-msgstr "用 root 身份安装"
+#: kdevdesigner/designer/sourcefile.cpp:222
+msgid "Save Code"
+msgstr "保存代码"
 
-#: buildtools/autotools/autoprojectpart.cpp:160
-#: buildtools/custommakefiles/customprojectpart.cpp:127
-msgid ""
-"<b>Install</b>"
-"<p>Runs <b>make install</b> command from the project directory with root "
-"privileges."
-"<br>It is executed via tdesu command."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
-msgstr ""
-"<b>安装</b>"
-"<p>在工程目录中用 root 权限执行 <b>make install</b> 命令。"
-"<br>它是通过 tdesu 命令来执行的。"
-"<br>环境变量和编译参数可以在工程设置的<b>编译选项</b>页中指定。"
+#: kdevdesigner/designer/mainwindow.cpp:2516
+#: kdevdesigner/designer/mainwindowactions.cpp:1128
+#: kdevdesigner/designer/sourcefile.cpp:223
+msgid "Save changes to '%1'?"
+msgstr "将更改保存到“%1”吗？"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:136
+#: kdevdesigner/designer/editfunctionsimpl.cpp:218
+#: kdevdesigner/designer/formfile.cpp:330
+#: kdevdesigner/designer/formfile.cpp:657
+#: kdevdesigner/designer/mainwindow.cpp:2517
+#: kdevdesigner/designer/mainwindow.cpp:2847
+#: kdevdesigner/designer/mainwindowactions.cpp:1129
+#: kdevdesigner/designer/sourcefile.cpp:224
+#: kdevdesigner/designer/sourcefile.cpp:269
+#: kdevdesigner/designer/variabledialogimpl.cpp:105
+msgid "&No"
+msgstr "否(&N)"
+
+#: kdevdesigner/designer/formfile.cpp:654
+#: kdevdesigner/designer/sourcefile.cpp:266
+#, fuzzy
+msgid "TQt Designer"
+msgstr "Qt 设计师"
+
+#: kdevdesigner/designer/formfile.cpp:655
+#: kdevdesigner/designer/sourcefile.cpp:267
+#, fuzzy
 msgid ""
-"<b>Clean project</b>"
-"<p>Runs <b>make clean</b> command from the project directory."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Build Options</b> tab."
+"File '%1' has been changed outside TQt Designer.\n"
+"Do you want to reload it?"
 msgstr ""
-"<b>清理工程</b>"
-"<p>在工程目录中运行 <b>make clean</b> 命令。"
-"<br>环境变量和编译参数可以在工程设置的<b>构建选项</b>页中指定。"
+"错误列表已经改变。\n"
+"您要保存您的修改吗？"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:144
-msgid ""
-"<b>Execute program</b>"
-"<p>Executes the main program specified in project settings, <b>Run Options</b> "
-"tab. If it is not specified then the active target is used to determine the "
-"application to run."
-msgstr "<b>执行程序</b><p>执行工程设置的<b>运行选项</b>页中指定的主程序。如果未指定，则使用激活的目标确定要运行的应用程序。"
+#: kdevdesigner/designer/formfile.cpp:855
+#: kdevdesigner/designer/sourcefile.cpp:280
+#, fuzzy
+msgid "Invalid Filename"
+msgstr "文件名"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:151
+#: kdevdesigner/designer/sourcefile.cpp:281
 msgid ""
-"<b>Build target</b>"
-"<p>Runs <b>make targetname</b> from the project directory (targetname is the "
-"name of the target selected)."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Build Options</b> tab."
+"The project already contains a source file with \n"
+"filename '%1'. Please choose a new filename."
 msgstr ""
-"<b>构建目标</b>"
-"<p>在工程目录中运行 <b>make targetname</b> 命令(targetname 是所选择的目标名称)。"
-"<br>环境变量和编译参数可以在工程设置的<b>构建选项</b>页中指定。"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:158
-msgid "Make &Environment"
-msgstr "Make 环境(&E)"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:100
+#: kdevdesigner/designer/mainwindowactions.cpp:740
+msgid "Create &Template..."
+msgstr "创建模板(&T)..."
 
-#: buildtools/custommakefiles/customprojectpart.cpp:160
-msgid "Make environment"
-msgstr "Make 环境"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:116
+#: kdevdesigner/designer/mainwindowactions.cpp:186
+msgid "Chec&k Accelerators"
+msgstr "检查快捷键(&K)"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:161
-msgid ""
-"<b>Make Environment</b>"
-"<p> Choose the set of environment variables to be passed on to make."
-"<br>Environment variables can be specified in the project settings dialog, <b>"
-"Build Options</b> tab."
-msgstr "<b>Make 环境</b><p>选择传递给 make 的环境变量集合。<br>环境变量可以在工程设置的<b>构建选项</b>页中指定。"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:118
+#: kdevdesigner/designer/mainwindowactions.cpp:193
+msgid "S&lots..."
+msgstr "槽(&L)..."
 
-#: buildtools/custommakefiles/customprojectpart.cpp:196
-#, fuzzy
-msgid "Custom Manager"
-msgstr "Automake 管理器"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:120
+#: kdevdesigner/designer/mainwindowactions.cpp:200
+msgid "Co&nnections..."
+msgstr "连接(&N)..."
 
-#: buildtools/custommakefiles/customprojectpart.cpp:208
-msgid "&Build"
-msgstr "构建(&B)"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:122
+#: kdevdesigner/designer/mainwindowactions.cpp:214
+msgid "&Form Settings..."
+msgstr "表单设置(&F)..."
 
-#: buildtools/custommakefiles/customprojectpart.cpp:212
-msgid "&Other"
-msgstr "其它(&O)"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:125
+#: kdevdesigner/designer/mainwindowactions.cpp:808
+msgid "&Add File..."
+msgstr "添加文件(&A)..."
 
-#: buildtools/custommakefiles/customprojectpart.cpp:215
-msgid "Ma&ke"
-msgstr "Make(&K)"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:127
+#: kdevdesigner/designer/mainwindowactions.cpp:819
+msgid "&Image Collection..."
+msgstr "图像收藏(&I)..."
 
-#: buildtools/custommakefiles/customprojectpart.cpp:243
-msgid "Make Active Directory"
-msgstr "Make 活动目录"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:129
+#: kdevdesigner/designer/mainwindowactions.cpp:829
+msgid "&Database Connections..."
+msgstr "数据库连接(&D)..."
 
-#: buildtools/custommakefiles/customprojectpart.cpp:245
-msgid ""
-"<b>Make active directory</b>"
-"<p>Chooses this directory as the destination for new files created using "
-"wizards like the <i>New Class</i> wizard."
-msgstr "<b>Make 活动目录</b><p>选择此目录作为 <i>新建类</i> 之类的向导创建新文件的目录。"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:131
+msgid "&Designer Project Settings..."
+msgstr "设计师工程设置(&D)..."
 
-#: buildtools/custommakefiles/customprojectpart.cpp:259
-#, fuzzy
-msgid "Remove from blacklist"
-msgstr "从仓库中删除"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:135
+#: kdevdesigner/designer/mainwindowactions.cpp:432
+msgid "&Pointer"
+msgstr "指针(&P)"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:261
-msgid ""
-"<b>Remove from blacklist</b>"
-"<p>Removes the given file or directory from the blacklist if its already in it."
-"<br>The blacklist contains files and directories that should be ignored even if "
-"they match a project filetype pattern"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:138
+#: kdevdesigner/designer/mainwindowactions.cpp:440
+msgid "&Connect Signal/Slots"
 msgstr ""
 
-#: buildtools/custommakefiles/customprojectpart.cpp:269
-#, fuzzy
-msgid "Add to blacklist"
-msgstr "添加空断点"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:140
+#: kdevdesigner/designer/mainwindowactions.cpp:448
+msgid "Tab &Order"
+msgstr "Tab 顺序(&O)"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:271
-msgid ""
-"<b>Add to blacklist</b>"
-"<p>Adds the given file or directory to the blacklist."
-"<br>The blacklist contains files and directories that should be ignored even if "
-"they match a project filetype pattern"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:142
+#: kdevdesigner/designer/mainwindowactions.cpp:455
+msgid "Set &Buddy"
 msgstr ""
 
-#: buildtools/custommakefiles/customprojectpart.cpp:319
-#, fuzzy
-msgid "Add Selected File/Dir(s) to Project"
-msgstr "将选中文件加入到工程"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:144
+#: kdevdesigner/designer/mainwindowactions.cpp:605
+msgid "Configure Toolbox..."
+msgstr "配置工具箱..."
 
-#: buildtools/custommakefiles/customprojectpart.cpp:321
-#, fuzzy
-msgid ""
-"<b>Add to project</b>"
-"<p>Adds selected file/dir(s) to the list of files in project. Note that the "
-"files should be manually added to corresponding makefile or build.xml."
-msgstr "<b>添加到工程</b><p>添加当前文件到工程的文件列表中。注意该文件需要手工添加到相应的 makefile 或 build.xml 中。"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:145
+#: kdevdesigner/designer/mainwindowactions.cpp:490
+msgid "Edit &Custom Widgets..."
+msgstr "编辑自定义部件(&C)..."
 
-#: buildtools/custommakefiles/customprojectpart.cpp:325
-#, fuzzy
-msgid "Add Selected Dir(s) to Project (recursive)"
-msgstr "将选中文件加入到工程"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:147
+#: kdevdesigner/designer/mainwindowactions.cpp:327
+msgid "Adjust &Size"
+msgstr ""
 
-#: buildtools/custommakefiles/customprojectpart.cpp:327
+#: kdevdesigner/designer/kdevdesigner_part.cpp:149
+#: kdevdesigner/designer/mainwindowactions.cpp:334
 #, fuzzy
-msgid ""
-"<b>Add to project</b>"
-"<p>Recursively adds selected dir(s) to the list of files in project. Note that "
-"the files should be manually added to corresponding makefile or build.xml."
-msgstr "<b>添加到工程</b><p>添加当前文件到工程的文件列表中。注意该文件需要手工添加到相应的 makefile 或 build.xml 中。"
+msgid "Lay Out &Horizontally"
+msgstr "水平展开(&H)"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:334
+#: kdevdesigner/designer/kdevdesigner_part.cpp:151
+#: kdevdesigner/designer/mainwindowactions.cpp:341
 #, fuzzy
-msgid "Remove Selected File/Dir(s) From Project"
-msgstr "从工程中删除选中文件"
+msgid "Lay Out &Vertically"
+msgstr "垂直展开(&V)"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:336
+#: kdevdesigner/designer/kdevdesigner_part.cpp:153
 #, fuzzy
-msgid ""
-"<b>Remove from project</b>"
-"<p>Removes selected file/dir(s) from the list of files in project. Note that "
-"the files should be manually excluded from corresponding makefile or build.xml."
-msgstr ""
-"<b>从工程中删除</b>"
-"<p>从工程的文件列表中删除当前文件。注意该文件需要从相应的 makefile 或 build.xml 中手工剔除。"
+msgid "Lay Out in &Grid"
+msgstr "垂直展开(&V)"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:341
+#: kdevdesigner/designer/kdevdesigner_part.cpp:155
+#: kdevdesigner/designer/mainwindowactions.cpp:355
 #, fuzzy
-msgid "Remove Selected Dir(s) From Project (recursive)"
-msgstr "从工程中删除选中文件"
+msgid "Lay OutQt::Horizontally (in S&plitter)"
+msgstr "水平展开(&H)"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:343
+#: kdevdesigner/designer/kdevdesigner_part.cpp:157
+#: kdevdesigner/designer/mainwindowactions.cpp:362
 #, fuzzy
-msgid ""
-"<b>Remove from project</b>"
-"<p>Recursively removes selected dir(s) from the list of files in project. Note "
-"that the files should be manually excluded from corresponding makefile or "
-"build.xml."
-msgstr ""
-"<b>从工程中删除</b>"
-"<p>从工程的文件列表中删除当前文件。注意该文件需要从相应的 makefile 或 build.xml 中手工剔除。"
+msgid "Lay OutQt::Vertically (in Sp&litter)"
+msgstr "垂直展开(&V)"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:461
-msgid ""
-"This project does not contain any files yet.\n"
-"Populate it with all C/C++/Java files below the project directory?"
-msgstr ""
-"这个工程还没有任何文件。\n"
-"要添加工程目录下的所有 C/C++/Java 文件吗？"
+#: kdevdesigner/designer/formwindow.cpp:971
+#: kdevdesigner/designer/formwindow.cpp:1076
+#: kdevdesigner/designer/kdevdesigner_part.cpp:159
+#: kdevdesigner/designer/mainwindowactions.cpp:369
+msgid "&Break Layout"
+msgstr "打乱布局(&B)"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:463
-#, fuzzy
-msgid "Populate"
-msgstr "模板"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:161
+msgid "Add Spacer"
+msgstr "添加分隔符"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:463
-msgid "Do Not Populate"
-msgstr ""
+#: kdevdesigner/designer/kdevdesigner_part.cpp:164
+#: kdevdesigner/designer/mainwindowactions.cpp:857
+msgid "Preview &Form"
+msgstr "预览表单(&F)"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:1139
-msgid "Object Files"
-msgstr "对象文件"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:166
+msgid "Ne&xt Form"
+msgstr "下一个表单(&X)"
 
-#: buildtools/custommakefiles/customprojectpart.cpp:1140
-msgid "Other Files"
-msgstr "其它文件"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:168
+msgid "Pre&vious Form"
+msgstr "上一个表单(&V)"
 
-#: buildtools/custommakefiles/custommanagerwidget.cpp:43
-msgid ""
-"_: blacklisted files and directories are not considered part of the project, "
-"even if they fit one of the wildcard patterns in the project file list\n"
-"Blacklisted files/dirs"
-msgstr ""
+#: kdevdesigner/designer/kdevdesigner_part.cpp:172
+msgid "Configure &KDevDesigner..."
+msgstr "配置 &KDevDesigner..."
 
-#: buildtools/autotools/addfiledlg.cpp:72
-#: buildtools/script/scriptnewfiledlg.cpp:80
-msgid "Please enter the file name without '/' and so on."
-msgstr "请不要在文件名里包含“/”这样的字符。"
+#: kdevdesigner/designer/kdevdesigner_part.cpp:277
+msgid "KDevDesignerPart"
+msgstr "KDevDesignerPart"
 
-#: buildtools/script/scriptnewfiledlg.cpp:90
-msgid "A file with this name already exists."
-msgstr "这个名字的文件已经存在。"
+#: kdevdesigner/designer/hierarchyview.cpp:630
+#: kdevdesigner/designer/hierarchyview.cpp:637
+#: kdevdesigner/designer/mainwindow.cpp:1805
+#: kdevdesigner/designer/mainwindow.cpp:1824
+#: kdevdesigner/designer/mainwindow.cpp:1844
+#: kdevdesigner/designer/mainwindow.cpp:1884
+#: kdevdesigner/designer/mainwindow.cpp:1945
+#: kdevdesigner/designer/wizardeditorimpl.cpp:133
+#, c-format
+msgid "Add Page to %1"
+msgstr "向 %1 添加页面"
 
-#: buildtools/script/scriptnewfiledlg.cpp:99
-msgid "A file template for this extension does not exist."
-msgstr "这个扩展名的文件模板不存在。"
+#: kdevdesigner/designer/hierarchyview.cpp:656
+#: kdevdesigner/designer/hierarchyview.cpp:667
+#: kdevdesigner/designer/mainwindow.cpp:1813
+#: kdevdesigner/designer/mainwindow.cpp:1832
+#: kdevdesigner/designer/mainwindow.cpp:1851
+#: kdevdesigner/designer/mainwindow.cpp:1894
+#: kdevdesigner/designer/mainwindow.cpp:1953
+#: kdevdesigner/designer/wizardeditorimpl.cpp:151
+msgid "Delete Page %1 of %2"
+msgstr ""
 
-#: buildtools/script/scriptnewfiledlg.cpp:111
-msgid "Could not create the new file."
-msgstr "无法创建新文件。"
+#: kdevdesigner/designer/hierarchyview.cpp:753
+msgid "Class Variables"
+msgstr "类变量"
 
-#: buildtools/script/scriptprojectpart.cpp:56
-msgid "<b>New file</b><p>Creates a new file."
-msgstr "<b>新建文件</b><p>创建新文件。"
+#: kdevdesigner/designer/hierarchyview.cpp:835
+msgid "Functions"
+msgstr "函数"
 
-#: buildtools/script/scriptprojectpart.cpp:59
+#: kdevdesigner/designer/hierarchyview.cpp:846
+#: kdevdesigner/designer/mainwindowactions.cpp:192
 #, fuzzy
-msgid "Rescan Project"
-msgstr "清理工程(&C)"
+msgid "Slots"
+msgstr "槽"
 
-#: buildtools/autotools/managecustomcommand.cpp:46
-msgid ""
-"_: this is a list of items in the combobox\n"
-"Make target,Make target (as root),Make command,Make command (as "
-"root),Command,Command (as root)"
-msgstr ""
+#: kdevdesigner/designer/hierarchyview.cpp:1052
+msgid "New..."
+msgstr "新建..."
 
-#: buildtools/autotools/addexistingfilesdlg.cpp:75
-#: buildtools/autotools/addfiledlg.cpp:51
-#: buildtools/autotools/autodetailsview.cpp:315
-#: buildtools/autotools/autodetailsview.cpp:337
-#: buildtools/autotools/autodetailsview.cpp:419
-#: buildtools/autotools/autodetailsview.cpp:498
-#: buildtools/autotools/removefiledlg.cpp:74
-#: buildtools/autotools/removetargetdlg.cpp:52
-msgid "%1 in %2"
-msgstr "%2 中的 %1"
+#: kdevdesigner/designer/hierarchyview.cpp:1061
+msgid "Goto Implementation"
+msgstr "转到实现"
 
-#: buildtools/autotools/addexistingfilesdlg.cpp:88
-#, fuzzy
-msgid "Drag one or more files from the left view and drop it here."
-msgstr "请从上面拖放一个或多个文件到这里！"
+#: kdevdesigner/designer/editfunctionsimpl.cpp:150
+#: kdevdesigner/designer/hierarchyview.cpp:1144
+msgid "Remove Function"
+msgstr "删除函数"
 
-#: buildtools/autotools/addexistingfilesdlg.cpp:203
-msgid ""
-"The following file(s) already exist(s) in the target!\n"
-"Press Continue to import only the new files.\n"
-"Press Cancel to abort the complete import."
-msgstr ""
-"下列文件已经存在于目标中！\n"
-"请按继续来只导入新的文件。\n"
-"请按取消来中止整个导入过程。"
+#: kdevdesigner/designer/hierarchyview.cpp:1151
+msgid "Remove Variable"
+msgstr "删除变量"
 
-#: buildtools/autotools/addexistingfilesdlg.cpp:235
-#, c-format
-msgid "Importing... %p%"
-msgstr "正在导入…… %p%"
+#: kdevdesigner/designer/hierarchyview.cpp:1202
+msgid "This variable has already been declared."
+msgstr "此变量已经声明过。"
 
-#: buildtools/autotools/addexistingfilesdlg.cpp:261
+#: kdevdesigner/designer/hierarchyview.cpp:1230
+msgid "Add Variable"
+msgstr "添加变量"
+
+#: kdevdesigner/designer/hierarchyview.cpp:1247
+msgid "Objects"
+msgstr "对象"
+
+#: kdevdesigner/designer/hierarchyview.cpp:1248
 msgid ""
-"The following file(s) are not in the Subproject directory.\n"
-"Press Link to add the files by creating symbolic links.\n"
-"Press Copy to copy the files into the directory."
+"List of all widgets and objects of the current form in hierarchical order"
 msgstr ""
-"下列文件不在子工程的目录中。\n"
-"请按链接来通过创建符号链接来添加文件。\n"
-"请按拷贝来将文件拷贝到目录中。"
 
-#: buildtools/autotools/addexistingfilesdlg.cpp:264
-msgid "Link (recommended)"
-msgstr "链接(推荐)"
+#: kdevdesigner/designer/hierarchyview.cpp:1249
+msgid "Members"
+msgstr "成员"
 
-#: buildtools/autotools/addexistingfilesdlg.cpp:264
-msgid "Copy (not recommended)"
-msgstr "拷贝(不推荐)"
+#: kdevdesigner/designer/hierarchyview.cpp:1250
+msgid "List of all members of the current form"
+msgstr "列出当前表单中的全部成员"
 
-#: buildtools/autotools/subprojectoptionsdlg.cpp:48
-msgid "Subproject Options for '%1'"
-msgstr "“%1”的子工程选项"
+#: kdevdesigner/designer/hierarchyview.cpp:1269
+msgid "Class Declarations"
+msgstr "类声明"
 
-#: buildtools/autotools/subprojectoptionsdlg.cpp:305
-msgid ""
-"Add Include directory: Choose directory, give -Idirectory or use a variable "
-"with -I$(FOOBAR)"
+#: kdevdesigner/designer/hierarchyview.cpp:1270
+msgid "List of all classes and its declarations of the current source file"
 msgstr ""
 
-#: buildtools/autotools/subprojectoptionsdlg.cpp:331
-#, fuzzy
-msgid "Edit Include Directory"
-msgstr "编辑头文件目录："
+#: kdevdesigner/designer/iconvieweditorimpl.cpp:132
+#: kdevdesigner/designer/listboxeditorimpl.cpp:164
+msgid "Edit the Items of '%1'"
+msgstr "编辑“%1”的项目"
 
-#: buildtools/autotools/subprojectoptionsdlg.cpp:331
-msgid "Edit include directory:"
-msgstr "编辑头文件目录："
+#: kdevdesigner/designer/popupmenueditor.cpp:303
+msgid "new item"
+msgstr "新建项目"
 
-#: buildtools/autotools/subprojectoptionsdlg.cpp:360
-msgid "Edit Prefix"
-msgstr "编辑前缀"
+#: kdevdesigner/designer/menubareditor.cpp:158
+#: kdevdesigner/designer/popupmenueditor.cpp:304
+msgid "new separator"
+msgstr "新建分隔符"
 
-#: buildtools/autotools/autolistviewitems.cpp:134
-#, fuzzy
-msgid "Edit Substitution"
-msgstr "函数"
+#: kdevdesigner/designer/popupmenueditor.cpp:438
+msgid "Cut Item"
+msgstr "剪切项目"
 
-#: buildtools/autotools/autolistviewitems.cpp:134
-#, fuzzy
-msgid "Substitution:"
-msgstr "描述："
+#: kdevdesigner/designer/popupmenueditor.cpp:466
+msgid "Paste Item"
+msgstr "粘贴项目"
 
-#: buildtools/autotools/addexistingdirectoriesdlg.cpp:60
-#, fuzzy
+#: kdevdesigner/designer/popupmenueditor.cpp:508
+msgid "Set Icon"
+msgstr "设定图标"
+
+#: kdevdesigner/designer/popupmenueditor.cpp:631
+msgid "Add Item"
+msgstr "添加项目"
+
+#: kdevdesigner/designer/popupmenueditor.cpp:641
+msgid "Remove Item"
+msgstr "删除项目"
+
+#: kdevdesigner/designer/popupmenueditor.cpp:769
+#: kdevdesigner/designer/popupmenueditor.cpp:1428
+msgid "Rename Item"
+msgstr "重命名项目"
+
+#: kdevdesigner/designer/popupmenueditor.cpp:1233
+msgid "Drop Item"
+msgstr "删除项目"
+
+#: kdevdesigner/designer/popupmenueditor.cpp:1287
+msgid "Remove Icon"
+msgstr "删除图标"
+
+#: kdevdesigner/designer/popupmenueditor.cpp:1308
+msgid "Move Item Up"
+msgstr "项目上移"
+
+#: kdevdesigner/designer/popupmenueditor.cpp:1332
+msgid "Move Item Down"
+msgstr "项目下移"
+
+#: kdevdesigner/designer/command.cpp:528 kdevdesigner/designer/command.cpp:540
+msgid "Set 'name' Property"
+msgstr "设定“name”属性"
+
+#: kdevdesigner/designer/command.cpp:529
 msgid ""
-"Drag one or more directories with an existing Makefile.am from the left view "
-"and drop it here."
-msgstr "请从上面拖拉一个或多个已含有 Makefile.am 的目录放到这里！"
+"The name of a widget must be unique.\n"
+"'%1' is already used in form '%2',\n"
+"so the name has been reverted to '%3'."
+msgstr ""
 
-#: buildtools/autotools/removefiledlg.cpp:65
+#: kdevdesigner/designer/command.cpp:541
 msgid ""
-"The file %1 is still used by the following targets:\n"
-"%2\n"
-"Remove it from all of them?"
+"The name of a widget must not be null.\n"
+"The name has been reverted to '%1'."
 msgstr ""
-"文件 %1 仍在被下列目标使用：\n"
-"%2\n"
-"将它从所有目标中去掉吗？"
 
-#: buildtools/autotools/removefiledlg.cpp:70
-msgid "Do you really want to remove <b>%1</b>?"
-msgstr "您真的要删除 <b>%1</b> 吗？"
+#: kdevdesigner/designer/menubareditor.cpp:157
+msgid "new menu"
+msgstr "新建菜单"
 
-#: buildtools/autotools/removetargetdlg.cpp:48
-msgid ""
-"Do you really want to remove <b>%1</b>"
-"<br>with <b>all files</b> that are attached to it"
-"<br>and <b>all dependencies</b>?"
-msgstr "您真的要删除 <b>%1</b> 及其<br>附带的<b>所有文件</b><br>和<b>所有依赖信息</b>吗？"
+#: kdevdesigner/designer/menubareditor.cpp:190
+#: kdevdesigner/designer/menubareditor.cpp:194
+#: kdevdesigner/designer/menubareditor.cpp:1012
+msgid "Add Menu"
+msgstr "添加菜单"
 
-#: buildtools/autotools/removetargetdlg.cpp:111
-msgid ""
-"_: no dependency\n"
-"<none>"
-msgstr "<无>"
+#: kdevdesigner/designer/menubareditor.cpp:242
+msgid "separator"
+msgstr "分隔符"
 
-#: buildtools/autotools/removetargetdlg.cpp:117
-#, c-format
-msgid "Removing Target... %p%"
-msgstr "正在删除目标...%p%"
+#: kdevdesigner/designer/menubareditor.cpp:381
+msgid "Cut Menu"
+msgstr "剪切菜单"
 
-#: buildtools/autotools/configureoptionswidget.cpp:239
-msgid "Re-run configure for %1 now?"
-msgstr "现在重新运行 %1 的 configure 吗？"
+#: kdevdesigner/designer/menubareditor.cpp:404
+msgid "Paste Menu"
+msgstr "粘贴菜单"
 
-#: buildtools/autotools/configureoptionswidget.cpp:239
-#, fuzzy
-msgid "Rerun"
-msgstr "运行"
+#: kdevdesigner/designer/menubareditor.cpp:496
+msgid "Delete Menu"
+msgstr "删除菜单"
 
-#: buildtools/autotools/addprefixdlg.cpp:27
-msgid "Add Prefix"
-msgstr "添加前缀"
+#: kdevdesigner/designer/menubareditor.cpp:1009
+msgid "Item Dragged"
+msgstr ""
 
-#: buildtools/autotools/addprefixdlg.cpp:35
-msgid "&Path:"
-msgstr "路径(&P)："
+#: kdevdesigner/designer/menubareditor.cpp:1048
+msgid "Move Menu Left"
+msgstr "菜单左移"
 
-#: buildtools/autotools/autodetailsview.cpp:285
-#: buildtools/autotools/targetoptionsdlg.cpp:40
-msgid "Target Options for '%1'"
-msgstr "“%1”的目标选项"
+#: kdevdesigner/designer/menubareditor.cpp:1070
+msgid "Move Menu Right"
+msgstr "菜单右移"
 
-#: buildtools/autotools/targetoptionsdlg.cpp:47
-msgid "Link convenience libraries inside project (LDADD)"
-msgstr "连接工程内的代码库 (LDADD)"
+#: kdevdesigner/designer/menubareditor.cpp:1101
+#: kdevdesigner/designer/menubareditor.cpp:1106
+msgid "Rename Menu"
+msgstr "重命名菜单"
 
-#: buildtools/autotools/targetoptionsdlg.cpp:48
-msgid "Link libraries outside project (LDADD)"
-msgstr "连接工程外的代码库 (LDADD)"
+#: kdevdesigner/designer/formwindow.cpp:840
+#: kdevdesigner/designer/formwindow.cpp:1329
+#: kdevdesigner/designer/formwindow.cpp:1341
+#: kdevdesigner/designer/sizehandle.cpp:216
+msgid "%1/%2"
+msgstr "%1/%2"
 
-#: buildtools/autotools/targetoptionsdlg.cpp:295
-msgid ""
-"Add Library: Choose the .a/.so file, give -l<libname> "
-"or use a variable with $(FOOBAR)"
-msgstr ""
+#: kdevdesigner/designer/sizehandle.cpp:235
+msgid "Resize"
+msgstr "更改大小"
 
-#: buildtools/autotools/targetoptionsdlg.cpp:337
+#: kdevdesigner/designer/widgetfactory.cpp:277
 #, fuzzy
-msgid "Edit External Library"
-msgstr "编辑外部库："
+msgid "Move Tab Page"
+msgstr "删除目标"
 
-#: buildtools/autotools/targetoptionsdlg.cpp:337
-msgid "Edit external library:"
-msgstr "编辑外部库："
+#: kdevdesigner/designer/widgetfactory.cpp:814
+#, fuzzy
+msgid "Tab 1"
+msgstr "制表符宽度"
 
-#: buildtools/autotools/kimporticonview.cpp:66
-msgid "Or just use the buttons."
-msgstr ""
+#: kdevdesigner/designer/widgetfactory.cpp:817
+#, fuzzy
+msgid "Tab 2"
+msgstr "制表符宽度"
 
-#: buildtools/autotools/addsubprojectdlg.cpp:58
-msgid "You have to give the subproject a name."
-msgstr "您需要给子工程指定一个名字。"
+#: kdevdesigner/designer/widgetfactory.cpp:960
+#, fuzzy
+msgid "Page 1"
+msgstr "目标：%1"
 
-#: buildtools/autotools/addsubprojectdlg.cpp:65
-msgid "A subproject with this name already exists."
-msgstr "一个同名的子工程已经存在。"
+#: kdevdesigner/designer/widgetfactory.cpp:963
+#, fuzzy
+msgid "Page 2"
+msgstr "软件包"
 
-#: buildtools/autotools/addsubprojectdlg.cpp:75
-msgid ""
-"There is no config.status in the project root directory. Run 'Configure' first"
-msgstr "工程的根目录中没有config.status 文件，请先运行 configure。"
+#: kdevdesigner/designer/outputwindow.cpp:80
+msgid "Warnings/Errors"
+msgstr "警告/错误"
 
-#: buildtools/autotools/addsubprojectdlg.cpp:85
-msgid "A file named %1 already exists."
-msgstr "一个名为 %1 的文件已经存在。"
+#: kdevdesigner/designer/tableeditorimpl.cpp:346
+msgid "Edit the Rows and Columns of '%1' "
+msgstr ""
 
-#: buildtools/autotools/addsubprojectdlg.cpp:90
-msgid ""
-"A subdirectory %1 already exists. Do you wish to add it as a subproject?"
-msgstr "子目录 %1 已经存在。您要把它作为子工程添加吗？"
+#: kdevdesigner/designer/wizardeditorimpl.cpp:83
+msgid "Edit Wizard Pages"
+msgstr "编辑向导页面"
 
-#: buildtools/autotools/addsubprojectdlg.cpp:97
-#, c-format
-msgid "Could not create subdirectory %1."
-msgstr "无法创建子目录 %1。"
+#: kdevdesigner/designer/wizardeditorimpl.cpp:172
+#: kdevdesigner/designer/wizardeditorimpl.cpp:192
+msgid "Swap Pages %1 and %2 of %3"
+msgstr ""
 
-#: buildtools/autotools/addsubprojectdlg.cpp:103
-#, c-format
-msgid "Could not access the subdirectory %1."
-msgstr "无法访问子目录 %1。"
+#: kdevdesigner/designer/mainwindow.cpp:1971
+#: kdevdesigner/designer/wizardeditorimpl.cpp:220
+msgid "Rename page %1 of %2"
+msgstr ""
 
-#: buildtools/autotools/addsubprojectdlg.cpp:151
-#, fuzzy, c-format
-msgid "Could not create Makefile.am in subdirectory %1."
-msgstr "无法在子目录 %1 里创建文件 Makefile.am"
+#: kdevdesigner/designer/wizardeditorimpl.cpp:251
+msgid "Move Page %1 to %2 in %3"
+msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:82
-#: buildtools/autotools/autoprojectpart.cpp:89
-#: buildtools/autotools/autosubprojectview.cpp:438
-msgid "Automake Manager"
-msgstr "Automake 管理器"
+#: kdevdesigner/designer/propertyeditor.cpp:422
+msgid "Reset the property to its default value"
+msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:83
-msgid ""
-"<b>Automake manager</b>"
-"<p>The project tree consists of two parts. The 'overview' in the upper half "
-"shows the subprojects, each one having a Makefile.am. The 'details' view in the "
-"lower half shows the targets and files for the subproject selected in the "
-"overview."
+#: kdevdesigner/designer/propertyeditor.cpp:423
+msgid "Click this button to reset the property to its default value"
 msgstr ""
-"<b>Automake 管理器</b>"
-"<p>工程树包括两部分，上半部分的“概要”显示子工程，每个子工程有一个 Makefile.am "
-"文件。下半部分的“细节”视图显示概述列表中选中的子工程的目标和文件。"
 
-#: buildtools/autotools/autoprojectpart.cpp:89
-msgid "Automake manager"
-msgstr "Automake 管理器"
+#: kdevdesigner/designer/propertyeditor.cpp:1090
+#: kdevdesigner/designer/propertyeditor.cpp:1151
+msgid "False"
+msgstr "假"
 
-#: buildtools/autotools/autoprojectpart.cpp:92
-msgid "Add Translation..."
-msgstr "添加翻译..."
+#: kdevdesigner/designer/propertyeditor.cpp:1091
+#: kdevdesigner/designer/propertyeditor.cpp:1149
+msgid "True"
+msgstr "真"
 
-#: buildtools/autotools/autoprojectpart.cpp:95
-msgid "Add translation"
-msgstr "添加翻译"
+#: kdevdesigner/designer/propertyeditor.cpp:1505
+#: kdevdesigner/designer/propertyeditor.cpp:1523
+#: kdevdesigner/designer/propertyeditor.cpp:1602
+#: kdevdesigner/designer/propertyeditor.cpp:1613
+#: lib/widgets/propeditor/propertymachinefactory.cpp:131
+#: lib/widgets/propeditor/propertymachinefactory.cpp:138
+msgid "x"
+msgstr "x"
 
-#: buildtools/autotools/autoprojectpart.cpp:96
-msgid "<b>Add translation</b><p>Creates .po file for the selected language."
-msgstr "<b>添加翻译</b><p>为所选择的语种创建 .po 文件。"
+#: kdevdesigner/designer/propertyeditor.cpp:1507
+#: kdevdesigner/designer/propertyeditor.cpp:1528
+#: kdevdesigner/designer/propertyeditor.cpp:1604
+#: kdevdesigner/designer/propertyeditor.cpp:1615
+#: lib/widgets/propeditor/propertymachinefactory.cpp:132
+#: lib/widgets/propeditor/propertymachinefactory.cpp:139
+msgid "y"
+msgstr "y"
 
-#: buildtools/autotools/autoprojectpart.cpp:112
-msgid "Build &Active Target"
-msgstr "构建活动目标(&A)"
+#: kdevdesigner/designer/propertyeditor.cpp:1511
+#: kdevdesigner/designer/propertyeditor.cpp:1533
+#: kdevdesigner/designer/propertyeditor.cpp:1606
+#: kdevdesigner/designer/propertyeditor.cpp:1620
+msgid "width"
+msgstr "宽度"
 
-#: buildtools/autotools/autoprojectpart.cpp:115
-msgid "Build active target"
-msgstr "构建活动目标"
+#: kdevdesigner/designer/propertyeditor.cpp:1513
+#: kdevdesigner/designer/propertyeditor.cpp:1538
+#: kdevdesigner/designer/propertyeditor.cpp:1608
+#: kdevdesigner/designer/propertyeditor.cpp:1622
+msgid "height"
+msgstr "高度"
 
-#: buildtools/autotools/autoprojectpart.cpp:116
-msgid ""
-"<b>Build active target</b>"
-"<p>Constructs a series of make commands to build an active target. Also builds "
-"dependent targets."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
-msgstr ""
-"<b>编译活动目标</b>"
-"<p>构造一系列编译命令，编译活动的目标，并编译所依赖的目标。"
-"<br>环境变量和编译参数可以在工程设置的<b>编译选项</b>页中指定。"
+#: kdevdesigner/designer/propertyeditor.cpp:1757
+#: kdevdesigner/designer/propertyeditor.cpp:1770
+#: kdevdesigner/designer/propertyeditor.cpp:1820
+msgid "Red"
+msgstr "红"
 
-#: buildtools/autotools/autoprojectpart.cpp:131
-msgid "Run Configure"
-msgstr "运行 Configure"
+#: kdevdesigner/designer/propertyeditor.cpp:1759
+#: kdevdesigner/designer/propertyeditor.cpp:1772
+#: kdevdesigner/designer/propertyeditor.cpp:1822
+msgid "Green"
+msgstr "绿"
 
-#: buildtools/autotools/autoprojectpart.cpp:134
-#: buildtools/autotools/autoprojectpart.cpp:657
-msgid "Run configure"
-msgstr "运行 Configure"
+#: kdevdesigner/designer/propertyeditor.cpp:1761
+#: kdevdesigner/designer/propertyeditor.cpp:1774
+#: kdevdesigner/designer/propertyeditor.cpp:1824
+msgid "Blue"
+msgstr "蓝"
 
-#: buildtools/autotools/autoprojectpart.cpp:135
-msgid ""
-"<b>Run configure</b>"
-"<p>Executes <b>configure</b> with flags, arguments and environment variables "
-"specified in the project settings dialog, <b>Configure Options</b> tab."
+#: kdevdesigner/designer/propertyeditor.cpp:1879
+#: kdevdesigner/designer/propertyeditor.cpp:1898
+#: kdevdesigner/designer/propertyeditor.cpp:1963
+msgid "Family"
 msgstr ""
-"<b>运行 configure</b>"
-"<p>用工程设置的<b>配置选项</b>页中指定的标志、参数和环境变量执行 <b>configure</b>。"
 
-#: buildtools/autotools/autoprojectpart.cpp:140
-#: buildtools/autotools/autoprojectpart.cpp:143
-msgid "Run automake && friends"
-msgstr "运行 automake 工具集"
+#: kdevdesigner/designer/propertyeditor.cpp:1881
+#: kdevdesigner/designer/propertyeditor.cpp:1901
+#: kdevdesigner/designer/propertyeditor.cpp:1965
+#, fuzzy
+msgid "Point Size"
+msgstr "端口"
 
-#: buildtools/autotools/autoprojectpart.cpp:144
-msgid ""
-"<b>Run automake && friends</b>"
-"<p>Executes"
-"<br><b>make -f Makefile.cvs</b>"
-"<br><b>./configure</b>"
-"<br>commands from the project directory."
-msgstr ""
-"<b>运行 automake 工具集</b>"
-"<p>在工程目录中执行下列命令："
-"<br><b>make -f Makefile.cvs</b>"
-"<br><b>./configure</b>"
+#: kdevdesigner/designer/multilineeditorimpl.cpp:109
+#: kdevdesigner/designer/propertyeditor.cpp:1883
+#: kdevdesigner/designer/propertyeditor.cpp:1903
+#: kdevdesigner/designer/propertyeditor.cpp:1967
+msgid "Bold"
+msgstr "粗体"
 
-#: buildtools/autotools/autoprojectpart.cpp:175
-msgid "&Distclean"
-msgstr "清理为发行版(&D)"
+#: kdevdesigner/designer/multilineeditorimpl.cpp:115
+#: kdevdesigner/designer/propertyeditor.cpp:1887
+#: kdevdesigner/designer/propertyeditor.cpp:1907
+#: kdevdesigner/designer/propertyeditor.cpp:1971
+msgid "Underline"
+msgstr "下划线"
 
-#: buildtools/autotools/autoprojectpart.cpp:178
-msgid "Distclean"
-msgstr "清理为发行版"
+#: kdevdesigner/designer/propertyeditor.cpp:1889
+#: kdevdesigner/designer/propertyeditor.cpp:1909
+#: kdevdesigner/designer/propertyeditor.cpp:1973
+msgid "Strikeout"
+msgstr "删除线"
 
-#: buildtools/autotools/autoprojectpart.cpp:179
-msgid ""
-"<b>Distclean</b>"
-"<p>Runs <b>make distclean</b> command from the project directory."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
-msgstr ""
-"<b>清理为发行版</b>"
-"<p>在工程目录中执行 <b>make distclean</b> 命令。"
-"<br>环境变量和编译参数可以在工程设置的<b>编译选项</b>页中指定。"
+#: kdevdesigner/designer/propertyeditor.cpp:2006
+#: kdevdesigner/designer/propertyeditor.cpp:2040
+msgid "Table"
+msgstr "表"
 
-#: buildtools/autotools/autoprojectpart.cpp:184
-msgid "Make Messages && Merge"
-msgstr "生成并合并消息"
+#: kdevdesigner/designer/propertyeditor.cpp:2009
+#: kdevdesigner/designer/propertyeditor.cpp:2063
+msgid "Field"
+msgstr "字段"
 
-#: buildtools/autotools/autoprojectpart.cpp:187
-msgid "Make messages && merge"
-msgstr "生成并合并消息"
+#: kdevdesigner/designer/propertyeditor.cpp:2171
+#: kdevdesigner/designer/propertyeditor.cpp:2189
+#: kdevdesigner/designer/propertyeditor.cpp:2239
+#: lib/widgets/propeditor/propertymachinefactory.cpp:156
+#, fuzzy
+msgid "hSizeType"
+msgstr "文件类型"
 
-#: buildtools/autotools/autoprojectpart.cpp:188
-msgid ""
-"<b>Make messages && merge</b>"
-"<p>Runs <b>make package-messages</b> command from the project directory."
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab."
+#: kdevdesigner/designer/propertyeditor.cpp:2174
+#: kdevdesigner/designer/propertyeditor.cpp:2191
+#: kdevdesigner/designer/propertyeditor.cpp:2241
+#: lib/widgets/propeditor/propertymachinefactory.cpp:157
+#, fuzzy
+msgid "vSizeType"
+msgstr "文件类型"
+
+#: kdevdesigner/designer/propertyeditor.cpp:2177
+#: kdevdesigner/designer/propertyeditor.cpp:2193
+#: kdevdesigner/designer/propertyeditor.cpp:2243
+msgid "horizontalStretch"
 msgstr ""
-"<b>生成并合并消息</b>"
-"<p>在工程目录中执行 <b>make package-messages</b> 命令。"
-"<br>环境变量和编译参数可以在工程设置的<b>编译选项</b>页中指定。"
 
-#: buildtools/autotools/autoprojectpart.cpp:196
-msgid "Build Configuration"
-msgstr "构建配置"
+#: kdevdesigner/designer/propertyeditor.cpp:2179
+#: kdevdesigner/designer/propertyeditor.cpp:2195
+#: kdevdesigner/designer/propertyeditor.cpp:2245
+msgid "verticalStretch"
+msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:198
-msgid "Build configuration menu"
-msgstr "构建配置菜单"
+#: kdevdesigner/designer/propertyeditor.cpp:2226
+msgid "%1/%2/%3/%4"
+msgstr "%1/%2/%3/%4"
 
-#: buildtools/autotools/autoprojectpart.cpp:199
-msgid ""
-"<b>Build configuration menu</b>"
-"<p>Allows to switch between project build configurations."
-"<br>Build configuration is a set of build and top source directory settings, "
-"configure flags and arguments, compiler flags, etc."
-"<br>Modify build configurations in project settings dialog, <b>"
-"Configure Options</b> tab."
+#: kdevdesigner/designer/propertyeditor.cpp:2380
+#: lib/widgets/propeditor/propertymachinefactory.cpp:165
+msgid "Arrow"
 msgstr ""
-"<b>编译配置菜单</b>"
-"<p>可以在工程编译配置之间切换。"
-"<br>编译配置是编译和顶层源代码目录设置、配置标志和参数、编译选项等的集合。"
-"<br>请在工程设置的<b>配置选项</b>页中改变编译配置。"
 
-#: buildtools/autotools/autoprojectpart.cpp:212
+#: kdevdesigner/designer/propertyeditor.cpp:2381
+msgid "Up-Arrow"
+msgstr ""
+
+#: kdevdesigner/designer/propertyeditor.cpp:2382
+#: lib/widgets/propeditor/propertymachinefactory.cpp:167
 #, fuzzy
-msgid ""
-"<b>Execute program</b>"
-"<p>Executes the currently active target or the main program specified in "
-"project settings, <b>Run Options</b> tab."
-msgstr "<b>执行主程序</b><p>执行在工程设置的<b>运行选项</b>页中指定的主程序"
+msgid "Cross"
+msgstr "类"
 
-#: buildtools/autotools/autoprojectpart.cpp:299
-msgid ""
-"No active target specified, running the application will\n"
-"not work until you make a target active in the Automake Manager\n"
-"on the right side or use the Main Program options under\n"
-"Project -> Project Options -> Run Options"
-msgstr ""
+#: kdevdesigner/designer/propertyeditor.cpp:2383
+#: lib/widgets/propeditor/propertymachinefactory.cpp:168
+#, fuzzy
+msgid "Waiting"
+msgstr "正在创建"
 
-#: buildtools/autotools/autoprojectpart.cpp:302
+#: kdevdesigner/designer/propertyeditor.cpp:2384
+#: lib/widgets/propeditor/propertymachinefactory.cpp:169
 #, fuzzy
-msgid "No active target specified"
-msgstr "未发现活动目标"
+msgid "iBeam"
+msgstr "文件名"
 
-#: buildtools/autotools/autoprojectpart.cpp:407
-#: buildtools/autotools/autoprojectpart.cpp:1166
-msgid ""
-"There's no active target!\n"
-"Unable to determine the main program"
-msgstr ""
+#: kdevdesigner/designer/propertyeditor.cpp:2385
+#: lib/widgets/propeditor/propertymachinefactory.cpp:170
+#, fuzzy
+msgid "SizeQt::Vertical"
+msgstr "垂直平铺(&E)"
 
-#: buildtools/autotools/autoprojectpart.cpp:408
-#: buildtools/autotools/autoprojectpart.cpp:1167
+#: kdevdesigner/designer/propertyeditor.cpp:2386
+#: lib/widgets/propeditor/propertymachinefactory.cpp:171
 #, fuzzy
-msgid "No active target found"
-msgstr "未发现活动目标"
+msgid "SizeQt::Horizontal"
+msgstr "水平展开(&H)"
 
-#: buildtools/autotools/autoprojectpart.cpp:414
-#: buildtools/autotools/autoprojectpart.cpp:1171
-msgid ""
-"Active target \"%1\" isn't binary ( %2 ) !\n"
-"Unable to determine the main program. If you want this\n"
-"to be the active target, set a main program under\n"
-"Project -> Project Options -> Run Options"
+#: kdevdesigner/designer/propertyeditor.cpp:2387
+#: lib/widgets/propeditor/propertymachinefactory.cpp:172
+msgid "Size Slash"
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:417
-#: buildtools/autotools/autoprojectpart.cpp:1174
-msgid "Active target is not a library"
-msgstr ""
+#: kdevdesigner/designer/propertyeditor.cpp:2388
+#: lib/widgets/propeditor/propertymachinefactory.cpp:173
+#, fuzzy
+msgid "Size Backslash"
+msgstr "结尾的反斜杠转义符错"
 
-#: buildtools/autotools/autoprojectpart.cpp:545
+#: kdevdesigner/designer/propertyeditor.cpp:2389
+#: lib/widgets/propeditor/propertymachinefactory.cpp:174
 #, fuzzy
-msgid ""
-"The directory you selected is not the active directory.\n"
-"You should 'activate' the target you're currently working on in Automake "
-"Manager.\n"
-"Just right-click a target and choose 'Make Target Active'."
-msgstr ""
-"您指定的目录不是活动的目录！\n"
-"您应该用 Automake 管理器“激活”您当前正在工作的目标。\n"
-"只需用鼠标右键点击目标，并选择“激活目标”即可。"
+msgid "Size All"
+msgstr "全部保存(&A)"
 
-#: buildtools/autotools/autoprojectpart.cpp:548
-msgid "No Active Target Found"
-msgstr "未发现活动目标"
+#: kdevdesigner/designer/propertyeditor.cpp:2392
+#: lib/widgets/propeditor/propertymachinefactory.cpp:175
+#, fuzzy
+msgid "Blank"
+msgstr "清理"
 
-#: buildtools/autotools/autoprojectpart.cpp:644
+#: kdevdesigner/designer/propertyeditor.cpp:2393
+#: lib/widgets/propeditor/propertymachinefactory.cpp:176
 #, fuzzy
-msgid ""
-"%1\n"
-"There is no Makefile in this directory\n"
-"and no configure script for this project.\n"
-"Run automake & friends and configure first?"
-msgstr ""
-"这个目录里没有 Makefile，也没有此工程的配置脚本。\n"
-"要先运行 automake 工具集进行配置吗？"
+msgid "SplitQt::Vertical"
+msgstr "垂直拆分"
 
-#: buildtools/autotools/autoprojectpart.cpp:646
-msgid "Run Them"
-msgstr "运行"
+#: kdevdesigner/designer/propertyeditor.cpp:2394
+#: lib/widgets/propeditor/propertymachinefactory.cpp:177
+#, fuzzy
+msgid "SplitQt::Horizontal"
+msgstr "水平拆分"
 
-#: buildtools/autotools/autoprojectpart.cpp:657
+#: kdevdesigner/designer/propertyeditor.cpp:2395
+#: lib/widgets/propeditor/propertymachinefactory.cpp:178
 #, fuzzy
-msgid ""
-"%1\n"
-"There is no Makefile in this directory. Run 'configure' first?"
-msgstr "这个目录里没有 Makefile，要先运行 configure 吗？"
+msgid "Pointing Hand"
+msgstr "待添加"
 
-#: buildtools/autotools/autoprojectpart.cpp:795
-msgid ""
-"Found a circular dependecy in the project, between this target and %1.\n"
-"Can't build this project until this is resolved"
+#: kdevdesigner/designer/propertyeditor.cpp:2396
+#: lib/widgets/propeditor/propertymachinefactory.cpp:179
+msgid "Forbidden"
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:795
-msgid "Circular Dependecy found"
+#: kdevdesigner/designer/propertyeditor.cpp:3489
+#: kdevdesigner/designer/propertyeditor.cpp:3503
+msgid "Set '%1' of '%2'"
 msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:895
-msgid "Can only compile files in directories which belong to the project."
-msgstr "只能编译这个目录里属于此工程的文件。"
+#: kdevdesigner/designer/propertyeditor.cpp:3631
+msgid "Sort &Categorized"
+msgstr ""
 
-#: buildtools/autotools/autoprojectpart.cpp:1010
-msgid ""
-"There is neither a Makefile.cvs file nor an autogen.sh script in the project "
-"directory."
-msgstr "这个工程目录里既没有 Makefile.cvs 或者 autogen.sh 脚本。"
+#: kdevdesigner/designer/propertyeditor.cpp:3632
+msgid "Sort &Alphabetically"
+msgstr "按字母顺序排列(&A)"
 
-#: buildtools/autotools/choosetargetdialog.cpp:265
-#, fuzzy
+#: kdevdesigner/designer/propertyeditor.cpp:3772
+msgid "Reset '%1' of '%2'"
+msgstr ""
+
+#: kdevdesigner/designer/propertyeditor.cpp:3879
 msgid ""
-"The file %1 already exists in the chosen target.\n"
-"The file will be created but will not be added to the target.\n"
-"Rename the file and select 'Add Existing Files' from the Automake Manager."
+"<p><b>TQWidget::%1</b></p>"
+"<p>There is no documentation available for this property.</p>"
 msgstr ""
-"文件 %1 在所选择的目标中已经存在！\n"
-"该文件将被创建，但是不添加到目标中。\n"
-"请重新命名文件，然后从 Automake 管理器中选择“添加已有的文件”。"
 
-#: buildtools/autotools/choosetargetdialog.cpp:267
-msgid "Error While Adding Files"
-msgstr "添加文件出错"
+#: kdevdesigner/designer/propertyeditor.cpp:4031
+#, fuzzy
+msgid "New Signal Handler"
+msgstr "信号"
 
-#: buildtools/autotools/addtargetdlg.cpp:40
-#: buildtools/autotools/autoprojectwidget.cpp:61
-msgid "Program"
-msgstr "程序"
+#: kdevdesigner/designer/propertyeditor.cpp:4032
+#, fuzzy
+msgid "Delete Signal Handler"
+msgstr "信号"
 
-#: buildtools/autotools/addtargetdlg.cpp:41
-#: buildtools/autotools/autoprojectwidget.cpp:63
-msgid "Library"
-msgstr "库"
+#: kdevdesigner/designer/propertyeditor.cpp:4053
+msgid "Remove Connection"
+msgstr "删除连接"
 
-#: buildtools/autotools/addtargetdlg.cpp:42
-#: buildtools/autotools/autoprojectwidget.cpp:65
-msgid "Libtool Library"
-msgstr "Libtool 库"
+#: kdevdesigner/designer/mainwindow.cpp:2600
+#: kdevdesigner/designer/propertyeditor.cpp:4086
+msgid "Add Connection"
+msgstr "添加连接"
 
-#: buildtools/autotools/addtargetdlg.cpp:43
-#: buildtools/autotools/autoprojectwidget.cpp:67
-msgid "Script"
-msgstr "脚本"
+#: kdevdesigner/designer/editfunctionsimpl.cpp:195
+#: kdevdesigner/designer/propertyeditor.cpp:4104
+msgid "Add Function"
+msgstr "添加函数"
 
-#: buildtools/autotools/addtargetdlg.cpp:44
-#: buildtools/autotools/autoprojectwidget.cpp:69
-msgid "Header"
-msgstr "头文件"
+#: kdevdesigner/designer/propertyeditor.cpp:4145
+#: kdevdesigner/designer/propertyeditor.cpp:4184
+#: kdevdesigner/designer/propertyeditor.cpp:4310
+msgid "Property Editor"
+msgstr "属性编辑器"
 
-#: buildtools/autotools/autoprojectwidget.cpp:71
-msgid "Data"
-msgstr "数据"
+#: kdevdesigner/designer/propertyeditor.cpp:4149
+msgid "P&roperties"
+msgstr "属性(&R)"
 
-#: buildtools/autotools/addtargetdlg.cpp:46
-#: buildtools/autotools/autoprojectwidget.cpp:73
-msgid "Java"
-msgstr "Java"
+#: kdevdesigner/designer/propertyeditor.cpp:4151
+#, fuzzy
+msgid "Signa&l Handlers"
+msgstr "特殊头文件(&H)"
 
-#: buildtools/autotools/autoprojectwidget.cpp:633
-msgid "Documentation data"
-msgstr "文档数据"
+#: kdevdesigner/designer/propertyeditor.cpp:4193
+msgid "Property Editor (%1)"
+msgstr "属性编辑器(%1)"
 
-#: buildtools/autotools/autoprojectwidget.cpp:635
-msgid "TDE Icon data"
-msgstr "TDE 图标数据"
+#: kdevdesigner/designer/mainwindow.cpp:3710
+#: kdevdesigner/designer/propertyeditor.cpp:4319
+#, fuzzy
+msgid "Signal Handlers"
+msgstr "特殊头文件(&H)"
 
-#: buildtools/autotools/autoprojectwidget.cpp:637
-msgid "%1 (%2 in %3)"
-msgstr "%1 (%3 中的 %2)"
+#: kdevdesigner/designer/actioneditorimpl.cpp:57
+#: kdevdesigner/designer/actionlistview.cpp:90
+msgid "New &Action"
+msgstr "新建动作(&A)"
 
-#: buildtools/autotools/autodetailsview.cpp:179
-#: buildtools/autotools/autosubprojectview.cpp:175
-msgid "Options..."
-msgstr "选项..."
+#: kdevdesigner/designer/actioneditorimpl.cpp:58
+#: kdevdesigner/designer/actionlistview.cpp:91
+msgid "New Action &Group"
+msgstr "新建动作组(&G)"
 
-#: buildtools/autotools/autosubprojectview.cpp:177
-#, fuzzy
-msgid ""
-"<qt><b>Options</b>"
-"<p>Shows subproject options dialog that provides settings for compiler, include "
-"paths, prefixes and build order.</qt>"
-msgstr "<b>选项</b><p>显示子工程选项对话框，它提供编译器设置、头文件路径、前缀和编译顺序设置。"
+#: kdevdesigner/designer/actioneditorimpl.cpp:59
+#: kdevdesigner/designer/actionlistview.cpp:92
+msgid "New &Dropdown Action Group"
+msgstr ""
 
-#: buildtools/autotools/autosubprojectview.cpp:182
-#: buildtools/autotools/autosubprojectview.cpp:183
-#, fuzzy
-msgid "Add new subproject..."
-msgstr "添加子工程..."
+#: kdevdesigner/designer/actionlistview.cpp:95
+msgid "&Connect Action..."
+msgstr "连接动作(&C)..."
 
-#: buildtools/autotools/autosubprojectview.cpp:185
-#, fuzzy
-msgid ""
-"<qt><b>Add new subproject</b>"
-"<p>Creates a new subproject in currently selected subproject.</qt>"
-msgstr "<b>添加子工程</b><p>在当前选中的子工程中添加新的子工程。"
+#: kdevdesigner/designer/actionlistview.cpp:97
+msgid "Delete Action"
+msgstr "删除动作"
 
-#: buildtools/autotools/autosubprojectview.cpp:191
-#, fuzzy
-msgid ""
-"<qt><b>Remove subproject</b>"
-"<p>Removes the subproject. Asks if the subproject should be also removed from "
-"disk. Only subprojects which do not hold other subprojects can be removed.</qt>"
-msgstr "<b>删除子工程</b><p>删除子工程，并询问是否从磁盘上删除子工程。只有不包含其它子工程的子工程才能被删除。"
+#: kdevdesigner/designer/multilineeditorimpl.cpp:99
+msgid "&Styles"
+msgstr "样式(&S)"
 
-#: buildtools/autotools/autosubprojectview.cpp:194
-msgid "Add Existing Subprojects..."
-msgstr "添加已有的子工程"
+#: kdevdesigner/designer/multilineeditorimpl.cpp:121
+msgid "Typewriter"
+msgstr ""
 
-#: buildtools/autotools/autosubprojectview.cpp:196
+#: kdevdesigner/designer/multilineeditorimpl.cpp:134
 #, fuzzy
-msgid ""
-"<qt><b>Add existing subprojects</b>"
-"<p>Imports existing subprojects containing Makefile.am.</qt>"
-msgstr "<b>添加已有的子工程</b><p>导入已有的含有 Makefile.am 文件的子工程。"
+msgid "Break"
+msgstr "断开(&B)"
 
-#: buildtools/autotools/autosubprojectview.cpp:199
-#: buildtools/autotools/autosubprojectview.cpp:200
-msgid "Add Target..."
-msgstr "添加目标..."
+#: kdevdesigner/designer/multilineeditorimpl.cpp:139
+msgid "Paragraph"
+msgstr "段落"
 
-#: buildtools/autotools/autosubprojectview.cpp:202
-#, fuzzy
-msgid ""
-"<qt><b>Add target</b>"
-"<p>Adds a new target to the currently selected subproject. Target can be a "
-"binary program, library, script, also a collection of data or header files.</qt>"
-msgstr "<b>添加目标</b><p>在当前选择的子工程中添加新的目标。目标可以是可执行程序、库、脚本，或者一组数据或头文件。"
+#: kdevdesigner/designer/multilineeditorimpl.cpp:147
+msgid "Align left"
+msgstr "左对齐"
 
-#: buildtools/autotools/autosubprojectview.cpp:208
-#: buildtools/autotools/autosubprojectview.cpp:209
-msgid "Add Service..."
-msgstr "添加服务..."
+#: kdevdesigner/designer/multilineeditorimpl.cpp:153
+msgid "Align center"
+msgstr "居中对齐"
 
-#: buildtools/autotools/autosubprojectview.cpp:211
+#: kdevdesigner/designer/multilineeditorimpl.cpp:159
+msgid "Align right"
+msgstr "右对齐"
+
+#: kdevdesigner/designer/multilineeditorimpl.cpp:165
+msgid "Blockquote"
+msgstr ""
+
+#: kdevdesigner/designer/multilineeditorimpl.cpp:173
+msgid "&Font"
+msgstr "字体(&F)"
+
+#: kdevdesigner/designer/multilineeditorimpl.cpp:185
+msgid "Fontsize +1"
+msgstr ""
+
+#: kdevdesigner/designer/multilineeditorimpl.cpp:190
+msgid "Fontsize -1"
+msgstr ""
+
+#: kdevdesigner/designer/multilineeditorimpl.cpp:195
 #, fuzzy
-msgid ""
-"<qt><b>Add service</b>"
-"<p>Creates a .desktop file describing the service.</qt>"
-msgstr "<b>添加服务</b><p>创建描述该服务的 .desktop 文件。"
+msgid "Headline 1"
+msgstr "头文件"
 
-#: buildtools/autotools/autosubprojectview.cpp:214
-#: buildtools/autotools/autosubprojectview.cpp:215
-msgid "Add Application..."
-msgstr "添加程序..."
+#: kdevdesigner/designer/multilineeditorimpl.cpp:200
+#, fuzzy
+msgid "Headline 2"
+msgstr "头文件"
 
-#: buildtools/autotools/autosubprojectview.cpp:217
+#: kdevdesigner/designer/multilineeditorimpl.cpp:205
 #, fuzzy
-msgid "<qt><b>Add application</b><p>Creates an application .desktop file.</qt>"
-msgstr "<b>添加应用程序</b><p>创建应用程序的 .desktop 文件。"
+msgid "Headline 3"
+msgstr "头文件"
 
-#: buildtools/autotools/autosubprojectview.cpp:223
+#: kdevdesigner/designer/multilineeditorimpl.cpp:211
+msgid "O&ptions"
+msgstr "选项(&P)"
+
+#: kdevdesigner/designer/multilineeditorimpl.cpp:217
+msgid "Word Wrapping"
+msgstr "文本换行"
+
+#: kdevdesigner/designer/multilineeditorimpl.cpp:279
+msgid "Set the Text of '%1'"
+msgstr "设定“%1”的文本"
+
+#: kdevdesigner/designer/multilineeditorimpl.cpp:285
+msgid "Set 'wordWrap' of '%2'"
+msgstr "设定 %2 的“wordWrap”"
+
+#: kdevdesigner/designer/mainwindow.cpp:155
+#: kdevdesigner/designer/startdialogimpl.cpp:170
 #, fuzzy
+msgid "TQt User-Interface Files (*.ui)"
+msgstr "主要用户界面模式(&U)"
+
+#: kdevdesigner/designer/mainwindow.cpp:205
 msgid ""
-"<qt><b>Build</b>"
-"<p>Runs <b>make</b> from the directory of the selected subproject."
-"<br> Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab.</qt>"
+"Ready - This is the non-commercial version of TQt - For commercial evaluations, "
+"use the help menu to register with Trolltech."
 msgstr ""
-"<b>编译</b>"
-"<p>在所选择的子工程目录中运行 <b>make</b> 命令。"
-"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
 
-#: buildtools/autotools/autosubprojectview.cpp:229
-msgid "Force Reedit"
-msgstr "强制重新编辑"
+#: kdevdesigner/designer/mainwindow.cpp:224
+#: kdevdesigner/designer/mainwindowactions.cpp:376
+msgid "Layout"
+msgstr "布局"
 
-#: buildtools/autotools/autosubprojectview.cpp:231
-#, fuzzy
-msgid ""
-"<qt><b>Force Reedit</b>"
-"<p>Runs <b>make force-reedit</b> from the directory of the selected subproject."
-"<br>This recreates makefile (tip: and solves most of .moc related problems)"
-"<br>Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab.</qt>"
+#: kdevdesigner/designer/mainwindow.cpp:361
+#: kdevdesigner/designer/mainwindow.cpp:3747
+msgid "Property Editor/Signal Handlers"
 msgstr ""
-"<b>强制重新编辑</b>"
-"<p>在所选择的子工程目录中运行 <b>make force-reedit</b> 命令。"
-"<br>这将重新创建 makefile (提示：并解决一些和 .moc 有关的问题)。"
-"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
 
-#: buildtools/autotools/autosubprojectview.cpp:243
-#, fuzzy
+#: kdevdesigner/designer/mainwindow.cpp:363
 msgid ""
-"<qt><b>Clean</b>"
-"<p>Runs <b>make clean</b> from the directory of the selected subproject."
-"<br> Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab.</qt>"
+"<b>The Property Editor</b>"
+"<p>You can change the appearance and behavior of the selected widget in the "
+"property editor.</p>"
+"<p>You can set properties for components and forms at design time and see the "
+"immediately see the effects of the changes. Each property has its own editor "
+"which (depending on the property) can be used to enter new values, open a "
+"special dialog, or to select values from a predefined list. Click <b>F1</b> "
+"to get detailed help for the selected property.</p>"
+"<p>You can resize the columns of the editor by dragging the separators in the "
+"list's header.</p>"
+"<p><b>Signal Handlers</b></p>"
+"<p>In the Signal Handlers tab you can define connections between the signals "
+"emitted by widgets and the slots in the form. (These connections can also be "
+"made using the connection tool.)"
 msgstr ""
-"<b>清理</b>"
-"<p>在所选择的子工程目录中运行 <b>make clean</b> 命令。"
-"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
 
-#: buildtools/autotools/autosubprojectview.cpp:250
-#, fuzzy
+#: kdevdesigner/designer/mainwindow.cpp:390
+msgid "Output Window"
+msgstr "输出窗口"
+
+#: kdevdesigner/designer/mainwindow.cpp:404
+msgid "Object Explorer"
+msgstr "对象资源管理器"
+
+#: kdevdesigner/designer/mainwindow.cpp:407
 msgid ""
-"<qt><b>Install</b>"
-"<p>Runs <b>make install</b> from the directory of the selected subproject."
-"<br> Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab.</qt>"
+"<b>The Object Explorer</b>"
+"<p>The Object Explorer provides an overview of the relationships between the "
+"widgets in a form. You can use the clipboard functions using a context menu for "
+"each item in the view. It is also useful for selecting widgets in forms that "
+"have complex layouts.</p>"
+"<p>The columns can be resized by dragging the separator in the list's "
+"header.</p>"
+"<p>The second tab shows all the form's slots, class variables, includes, "
+"etc.</p>"
 msgstr ""
-"<b>安装</b>"
-"<p>在所选择的子工程目录中运行 <b>make install</b> 命令。"
-"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
 
-#: buildtools/autotools/autosubprojectview.cpp:256
-#, fuzzy
-msgid ""
-"<qt><b>Install as root user</b>"
-"<p>Runs <b>make install</b> command from the directory of the selected "
-"subproject with root privileges."
-"<br> It is executed via tdesu command."
-"<br> Environment variables and make arguments can be specified in the project "
-"settings dialog, <b>Make Options</b> tab.</qt>"
+#: kdevdesigner/designer/mainwindow.cpp:424
+msgid "Start typing the buffer you want to switch to here (ALT+B)"
 msgstr ""
-"<b>用 root 身份安装</b>"
-"<p>用 root 身份在所选择的子工程目录中运行 <b>make install</b> 命令。"
-"<br>它是通过 tdesu 命令来执行的。"
-"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
 
-#: buildtools/autotools/autosubprojectview.cpp:263
-msgid "Expand Subtree"
-msgstr "展开子树"
+#: kdevdesigner/designer/mainwindow.cpp:433
+msgid "Project Overview"
+msgstr "工程概览"
 
-#: buildtools/autotools/autosubprojectview.cpp:265
-msgid "Collapse Subtree"
-msgstr "折叠子树"
+#: kdevdesigner/designer/mainwindow.cpp:434
+msgid ""
+"<b>The Project Overview Window</b>"
+"<p>The Project Overview Window displays all the current project, including "
+"forms and source files.</p>"
+"<p>Use the search field to rapidly switch between files.</p>"
+msgstr ""
 
-#: buildtools/autotools/autosubprojectview.cpp:268
-msgid "Manage Custom Commands..."
-msgstr "管理自定义命令..."
+#: kdevdesigner/designer/mainwindow.cpp:451
+msgid "Action Editor"
+msgstr "动作编辑器"
 
-#: buildtools/autotools/autosubprojectview.cpp:270
+#: kdevdesigner/designer/mainwindow.cpp:452
 msgid ""
-"<qt><b>Manage custom commands</b>"
-"<p>Allows to create, edit and delete custom build commands which appears in the "
-"subproject context menu."
-"<br></qt>"
+"<b>The Action Editor</b>"
+"<p>The Action Editor is used to add actions and action groups to a form, and to "
+"connect actions to slots. Actions and action groups can be dragged into menus "
+"and into toolbars, and may feature keyboard shortcuts and tooltips. If actions "
+"have pixmaps these are displayed on toolbar buttons and besides their names in "
+"menus.</p>"
 msgstr ""
 
-#: buildtools/autotools/autosubprojectview.cpp:283
-#, c-format
-msgid "Subproject: %1"
-msgstr "子工程：%1"
+#: kdevdesigner/designer/mainwindow.cpp:472
+msgid "Toolbox"
+msgstr "工具箱"
 
-#: buildtools/autotools/autosubprojectview.cpp:353
-msgid "Add New Subproject to '%1'"
-msgstr "添加新的子工程到“%1”"
+#: kdevdesigner/designer/mainwindow.cpp:1281
+msgid ""
+"<b>The Form Window</b>"
+"<p>Use the various tools to add widgets or to change the layout and behavior of "
+"the components in the form. Select one or multiple widgets to move them or lay "
+"them out. If a single widget is chosen it can be resized using the resize "
+"handles.</p>"
+"<p>Changes in the <b>Property Editor</b> are visible at design time, and you "
+"can preview the form in different styles.</p>"
+"<p>You can change the grid resolution, or turn the grid off in the <b>"
+"Preferences</b> dialog in the <b>Edit</b> menu."
+"<p>You can have several forms open, and all open forms are listed in the <b>"
+"Form List</b>."
+msgstr ""
 
-#: buildtools/autotools/autosubprojectview.cpp:365
-msgid "Add Existing Subproject to '%1'"
-msgstr "添加已有的子工程到“%1”"
+#: kdevdesigner/designer/mainwindow.cpp:1336
+msgid "Cannot create an invalid project."
+msgstr "无法创建无效工程。"
 
-#: buildtools/autotools/autosubprojectview.cpp:380
-msgid "Add New Target to '%1'"
-msgstr "添加新目标到“%1”"
+#: kdevdesigner/designer/mainwindow.cpp:1487
+#, c-format
+msgid "&Undo: %1"
+msgstr "撤消(&U)：%1"
 
-#: buildtools/autotools/autosubprojectview.cpp:395
-msgid "Add New Service to '%1'"
-msgstr "添加新服务到“%1”"
+#: kdevdesigner/designer/mainwindow.cpp:1489
+#: kdevdesigner/designer/mainwindowactions.cpp:127
+msgid "&Undo: Not Available"
+msgstr "撤消(&U)：不可用"
 
-#: buildtools/autotools/autosubprojectview.cpp:410
-msgid "Add New Application to '%1'"
-msgstr "添加新应用程序到“%1”"
+#: kdevdesigner/designer/mainwindow.cpp:1491
+#, c-format
+msgid "&Redo: %1"
+msgstr "重做(&R)：%1"
 
-#: buildtools/autotools/autosubprojectview.cpp:438
-msgid "This item cannot be removed"
-msgstr "这个项目无法删除"
+#: kdevdesigner/designer/mainwindow.cpp:1493
+#: kdevdesigner/designer/mainwindowactions.cpp:133
+msgid "&Redo: Not Available"
+msgstr "重做(&R)：不可用"
 
-#: buildtools/autotools/autosubprojectview.cpp:451
-msgid "There is no subproject %1 in SUBDIRS"
-msgstr "在 SUBDIRS 中没有子工程 %1"
+#: kdevdesigner/designer/mainwindow.cpp:1580
+msgid "Choose Pixmap..."
+msgstr "选择像素图..."
 
-#: buildtools/autotools/autosubprojectview.cpp:456
-#, c-format
-msgid "Remove Subproject %1"
-msgstr "删除子工程 %1"
+#: kdevdesigner/designer/mainwindow.cpp:1584
+msgid "Edit Text..."
+msgstr "编辑文本..."
 
-#: buildtools/autotools/autosubprojectview.cpp:457
-msgid "Do you really want to remove subproject %1 with all targets and files?"
-msgstr "您真要删除子工程 %1 及所有目标和文件吗？"
+#: kdevdesigner/designer/mainwindow.cpp:1588
+msgid "Edit Title..."
+msgstr "编辑标题..."
 
-#: buildtools/autotools/autosubprojectview.cpp:1020
-msgid "Manage Custom Commands"
-msgstr ""
+#: kdevdesigner/designer/mainwindow.cpp:1592
+#: kdevdesigner/designer/mainwindow.cpp:1702
+msgid "Edit Page Title..."
+msgstr "编辑页面标题..."
 
-#: buildtools/autotools/autodetailsview.cpp:182
-#, fuzzy
-msgid ""
-"<b>Options</b>"
-"<p>Target options dialog that provides settings for linker flags and lists of "
-"dependencies and external libraries that are used when compiling the target."
-msgstr "<b>选项</b><p>目标选项对话框可以提供连接器选项、依赖关系和外部库列表等设置。"
+#: kdevdesigner/designer/mainwindow.cpp:1623
+#: kdevdesigner/designer/mainwindow.cpp:1637
+#: kdevdesigner/designer/mainwindow.cpp:1646
+#: kdevdesigner/designer/mainwindow.cpp:1661
+#: kdevdesigner/designer/mainwindow.cpp:1695
+#: kdevdesigner/designer/mainwindow.cpp:2469
+msgid "Delete Page"
+msgstr "删除页面"
 
-#: buildtools/autotools/autodetailsview.cpp:193
-msgid ""
-"<b>Create new file</b>"
-"<p>Creates a new file and adds it to a currently selected target."
-msgstr "<b>创建新文件</b><p>创建新文件并把它添加到当前选中的目标中。"
+#: kdevdesigner/designer/mainwindow.cpp:1626
+#: kdevdesigner/designer/mainwindow.cpp:1640
+#: kdevdesigner/designer/mainwindow.cpp:1649
+#: kdevdesigner/designer/mainwindow.cpp:1664
+#: kdevdesigner/designer/mainwindow.cpp:1699
+#: kdevdesigner/designer/mainwindow.cpp:2468
+msgid "Add Page"
+msgstr "添加页面"
 
-#: buildtools/autotools/autodetailsview.cpp:202
-msgid ""
-"<b>Add existing files</b>"
-"<p>Adds existing file to a currently selected target. Header files will not be "
-"included in SOURCES list of a target. They will be added to noinst_HEADERS "
-"instead."
-msgstr ""
-"<b>添加已有的文件</b>"
-"<p>添加已有的文件到当前选中的目标中。头文件将不被包含在目标的 SOURCES 列表中，而是被添加到 noinst_HEADERS。"
+#: kdevdesigner/designer/mainwindow.cpp:1632
+msgid "Previous Page"
+msgstr "上一页"
 
-#: buildtools/autotools/autodetailsview.cpp:210
-msgid "Add Icon..."
-msgstr "添加图标..."
+#: kdevdesigner/designer/mainwindow.cpp:1634
+msgid "Next Page"
+msgstr "下一页"
 
-#: buildtools/autotools/autodetailsview.cpp:212
-msgid "<b>Add icon</b><p>Adds an icon to a TDEICON target."
-msgstr "<b>添加图标</b><p>添加一个图标到 TDEICON 目标。"
+#: kdevdesigner/designer/mainwindow.cpp:1667
+msgid "Rename Current Page..."
+msgstr "重命名当前页..."
 
-#: buildtools/autotools/autodetailsview.cpp:214
-#, fuzzy
-msgid "Build Target"
-msgstr "构建目标(&T)"
+#: kdevdesigner/designer/mainwindow.cpp:1705
+msgid "Edit Pages..."
+msgstr "编辑页面..."
 
-#: buildtools/autotools/autodetailsview.cpp:215
-msgid "Build Target..."
-msgstr "构建目标..."
+#: kdevdesigner/designer/mainwindow.cpp:1711
+msgid "Add Menu Item"
+msgstr "添加菜单项"
 
-#: buildtools/autotools/autodetailsview.cpp:218
-msgid ""
-"<b>Build target</b>"
-"<p>Constructs a series of make commands to build the selected target. Also "
-"builds dependent targets."
-msgstr "<b>构建目标</b><p>构造一系列 make 命令构建所选中的目标，并构建依赖目标。"
+#: kdevdesigner/designer/mainwindow.cpp:1713
+msgid "Add Toolbar"
+msgstr "添加工具栏"
 
-#: buildtools/autotools/autodetailsview.cpp:224
-#: buildtools/autotools/autodetailsview.cpp:225
-msgid "Execute Target..."
-msgstr "执行目标..."
+#: kdevdesigner/designer/mainwindow.cpp:1735
+#: kdevdesigner/designer/mainwindow.cpp:2638
+msgid "New text"
+msgstr "新建文本"
 
-#: buildtools/autotools/autodetailsview.cpp:228
-#, fuzzy
-msgid ""
-"<b>Execute target</b>"
-"<p>Executes the target and tries to build in case it is not built."
-msgstr "<b>执行目标</b><p>执行应用程序目标。"
+#: kdevdesigner/designer/mainwindow.cpp:1740
+#: kdevdesigner/designer/mainwindow.cpp:2643
+msgid "Set 'wordwrap' of '%1'"
+msgstr "设定“%1”的“wordwrap”"
 
-#: buildtools/autotools/autodetailsview.cpp:233
-msgid "Make Target Active"
-msgstr "激活目标"
+#: kdevdesigner/designer/mainwindow.cpp:1749
+#: kdevdesigner/designer/mainwindow.cpp:2652
+msgid "Set the 'text' of '%1'"
+msgstr "设定“%1”的“text”"
 
-#: buildtools/autotools/autodetailsview.cpp:236
-#, fuzzy
-msgid ""
-"<b>Make target active</b>"
-"<p>Marks the currently selected target as 'active'. New files and classes by "
-"default go to an active target. Using the <b>Build Active Target</b> "
-"menu command builds it."
-msgstr "<b>激活目标</b><p>将当前选中的目标标记为“活动”。新文件和类默认将添加到活动目标。<b>编译活动目标</b>菜单命令可以编译它。"
+#: kdevdesigner/designer/mainwindow.cpp:1759
+#: kdevdesigner/designer/mainwindow.cpp:2665
+msgid "New title"
+msgstr "新建标题"
 
-#: buildtools/autotools/autodetailsview.cpp:247
-msgid ""
-"<b>Remove</b>"
-"<p>Shows a list of targets dependent on the selected target or file and asks "
-"for removal. Also asks if the target or file should be removed from disk."
-msgstr "<b>删除</b><p>显示依赖于当前选中的目标或文件的目标列表，询问是否进行删除，并询问是否应该将目标或文件从磁盘上删除。"
+#: kdevdesigner/designer/mainwindow.cpp:1762
+#: kdevdesigner/designer/mainwindow.cpp:2667
+msgid "Set the 'title' of '%2'"
+msgstr "设定“%2”的“title”"
 
-#: buildtools/autotools/autodetailsview.cpp:319
-msgid "Add New File to '%1'"
-msgstr "添加新文件到“%1”"
+#: kdevdesigner/designer/mainwindow.cpp:1772
+#: kdevdesigner/designer/mainwindow.cpp:1909
+#: kdevdesigner/designer/mainwindow.cpp:1968
+msgid "Page Title"
+msgstr "页面标题"
 
-#: buildtools/autotools/autodetailsview.cpp:341
-msgid "Add Existing Files to '%1'"
-msgstr "添加已有的文件到“%1”"
+#: kdevdesigner/designer/mainwindow.cpp:1772
+#: kdevdesigner/designer/mainwindow.cpp:1909
+#: kdevdesigner/designer/mainwindow.cpp:1968
+msgid "New page title"
+msgstr "新建页面标题"
 
-#: buildtools/autotools/autodetailsview.cpp:423
-msgid "Remove File From '%1'"
-msgstr "从“%1”中删除文件"
+#: kdevdesigner/designer/mainwindow.cpp:1775
+msgid "Set the 'pageTitle' of '%2'"
+msgstr "设定“%2”的“pageTitle”"
 
-#: buildtools/autotools/autodetailsview.cpp:450
-msgid "Remove Target From '%1'"
-msgstr "从“%1”中删除目标"
+#: kdevdesigner/designer/mainwindow.cpp:1788
+msgid "Set the 'pixmap' of '%2'"
+msgstr "设定“%2”的“pixmap”"
 
-#: buildtools/autotools/autodetailsview.cpp:502
-#, c-format
-msgid "Target: %1"
-msgstr "目标：%1"
+#: kdevdesigner/designer/mainwindow.cpp:1859
+msgid "Raise next page of '%2'"
+msgstr ""
 
-#: buildtools/autotools/addtranslationdlg.cpp:37
-msgid "Add Translation"
-msgstr "添加翻译"
+#: kdevdesigner/designer/mainwindow.cpp:1869
+msgid "Raise previous page of '%2'"
+msgstr ""
 
-#: buildtools/autotools/addtranslationdlg.cpp:79
-msgid "Your sourcecode is already translated to all supported languages."
-msgstr "您的源代码已经被翻译为所有支持的语言。"
+#: kdevdesigner/designer/mainwindow.cpp:1916
+msgid "Rename Page %1 to %2"
+msgstr "将页面 %1 重命名为 %2"
 
-#: buildtools/autotools/addtranslationdlg.cpp:97
-msgid "A translation file for the language %1 exists already."
-msgstr "一个翻译为 %1 语言的文件已经存在。"
+#: kdevdesigner/designer/mainwindow.cpp:1983
+msgid "Add Toolbar to '%1'"
+msgstr "将工具栏添加到“%1”"
 
-#: buildtools/autotools/addicondlg.cpp:46
-msgid "Action"
-msgstr "动作"
+#: kdevdesigner/designer/mainwindow.cpp:1989
+msgid "Add Menu to '%1'"
+msgstr "将菜单添加到“%1”"
 
-#: buildtools/autotools/addicondlg.cpp:47
-msgid "Device"
-msgstr "设备"
+#: kdevdesigner/designer/mainwindow.cpp:2515
+#: kdevdesigner/designer/mainwindowactions.cpp:1127
+msgid "Save Project Settings"
+msgstr "保存工程设置"
 
-#: buildtools/autotools/addicondlg.cpp:48
-msgid "File System"
-msgstr "文件系统"
+#: kdevdesigner/designer/mainwindow.cpp:2613
+msgid "Edit %1..."
+msgstr "编辑 %1..."
 
-#: buildtools/autotools/addicondlg.cpp:49
-msgid "MIME Type"
-msgstr "MIME 类型"
+#: kdevdesigner/designer/mainwindow.cpp:2709
+msgid "Insert a %1 (custom widget)"
+msgstr "插入%1(自定义部件)"
 
-#: buildtools/autotools/addapplicationdlg.cpp:120
-#: buildtools/autotools/addservicedlg.cpp:160
-msgid "You have to enter a file name."
-msgstr "您需要输入一个文件名。"
+#: kdevdesigner/designer/mainwindow.cpp:2710
+msgid ""
+"<b>%1 (custom widget)</b>"
+"<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> "
+"menu to add and change custom widgets. You can add properties as well as "
+"signals and slots to integrate them into TQt Designer, and provide a pixmap "
+"which will be used to represent the widget on the form.</p>"
+msgstr ""
 
-#: buildtools/autotools/addapplicationdlg.cpp:127
-msgid "You have to enter the file name of an executable program."
-msgstr "您需要输入可执行程序的文件名。"
+#: kdevdesigner/designer/mainwindow.cpp:2844
+msgid "Restoring Last Session"
+msgstr "恢复上次会话"
 
-#: buildtools/autotools/addapplicationdlg.cpp:134
-msgid "You have to enter an application name."
-msgstr "您需要输入应用程序名。"
+#: kdevdesigner/designer/mainwindow.cpp:2845
+msgid ""
+"TQt Designer found some temporary saved files, which were\n"
+"written when TQt Designer crashed last time. Do you want to\n"
+"load these files?"
+msgstr ""
 
-#: buildtools/autotools/addapplicationdlg.cpp:141
-#: buildtools/autotools/addservicedlg.cpp:174
-msgid "A file with this name exists already."
-msgstr "这个名字的文件已经存在。"
+#: kdevdesigner/designer/mainwindow.cpp:2909
+msgid "There is no help available for this dialog at the moment."
+msgstr ""
 
-#: buildtools/autotools/addapplicationdlg.cpp:146
-#: buildtools/autotools/addservicedlg.cpp:179
-msgid "Could not open file for writing."
-msgstr "无法打开文件进行写入。"
+#: kdevdesigner/designer/mainwindow.cpp:2968
+#: kdevdesigner/designer/mainwindowactions.cpp:1762
+#: kdevdesigner/designer/mainwindowactions.cpp:1785
+msgid "Edit Source"
+msgstr "编辑源代码"
 
-#: buildtools/autotools/fileselectorwidget.cpp:65
-msgid "Short View"
-msgstr "简短视图"
+#: kdevdesigner/designer/mainwindow.cpp:2969
+#: kdevdesigner/designer/mainwindowactions.cpp:1763
+#: kdevdesigner/designer/mainwindowactions.cpp:1786
+msgid ""
+"There is no plugin for editing %1 code installed.\n"
+"Note: Plugins are not available in static TQt configurations."
+msgstr ""
 
-#: buildtools/autotools/fileselectorwidget.cpp:84
-msgid "Home directory"
-msgstr "主目录"
+#: kdevdesigner/designer/mainwindow.cpp:3069
+msgid "Open File"
+msgstr "打开文件"
 
-#: buildtools/autotools/fileselectorwidget.cpp:87
-msgid "Up one level"
-msgstr "上一级"
+#: kdevdesigner/designer/mainwindow.cpp:3070
+#: kdevdesigner/designer/mainwindow.cpp:3086
+msgid "Could not open '%1'. File does not exist."
+msgstr "无法打开“%1”。文件不存在。"
 
-#: buildtools/autotools/fileselectorwidget.cpp:90
-msgid "Previous directory"
-msgstr "前一个"
+#: kdevdesigner/designer/mainwindow.cpp:3735
+#: kdevdesigner/designer/mainwindowactions.cpp:855
+msgid "&Preview"
+msgstr "预览(&P)"
 
-#: buildtools/autotools/fileselectorwidget.cpp:93
-msgid "Next directory"
-msgstr "下一个目录"
+#: kdevdesigner/designer/project.cpp:149
+msgid ""
+"Could not connect to the database.\n"
+"Press 'OK' to continue or 'Cancel' to specify different\n"
+"connection information.\n"
+msgstr ""
 
-#: buildtools/autotools/addservicedlg.cpp:139
-#, fuzzy
-msgid "Enter Value"
-msgstr "外部的"
+#: kdevdesigner/designer/connectiontable.cpp:38
+msgid "Sender"
+msgstr "发送器"
 
-#: buildtools/autotools/addservicedlg.cpp:139
-msgid "Property %1:"
-msgstr "属性 %1："
+#: kdevdesigner/designer/connectiontable.cpp:40
+msgid "Receiver"
+msgstr "接收器"
 
-#: buildtools/autotools/addservicedlg.cpp:167
-msgid "You have to enter a service name."
-msgstr "您需要输入一个服务名。"
+#: kdevdesigner/designer/newformimpl.cpp:160
+msgid "Load Template"
+msgstr "装入模板"
 
-#: buildtools/autotools/addfiledlg.cpp:80
-msgid "This file is already in the target."
-msgstr "这个文件在目标中已经存在。"
+#: kdevdesigner/designer/newformimpl.cpp:161
+msgid "Could not load form description from template '%1'"
+msgstr ""
 
-#: buildtools/autotools/addfiledlg.cpp:91
-#: buildtools/autotools/addfiledlg.cpp:103
-#, fuzzy
-msgid ""
-"<b>A file with this name already exists.</b>"
-"<br>"
-"<br>Please use the \"Add existing file\" dialog."
-msgstr "<b>一个同名的文件已经存在！</b><br><br>请使用“添加已有的文件”对话框！"
+#: kdevdesigner/designer/newformimpl.cpp:252
+msgid "%1 Project"
+msgstr "%1 工程"
 
-#: buildtools/autotools/addtargetdlg.cpp:45
-msgid "Data File"
-msgstr "数据文件"
+#: kdevdesigner/designer/newformimpl.cpp:260
+msgid "Dialog"
+msgstr "对话框"
 
-#: buildtools/autotools/addtargetdlg.cpp:145
-#, fuzzy
-msgid "You have to give the target a name"
-msgstr "您需要给目标指定名字！"
+#: kdevdesigner/designer/newformimpl.cpp:267
+msgid "Wizard"
+msgstr "向导"
 
-#: buildtools/autotools/addtargetdlg.cpp:151
-#, fuzzy
-msgid "Libraries must have a lib prefix."
-msgstr "库必须用 lib 作前缀！"
+#: kdevdesigner/designer/newformimpl.cpp:272
+msgid "Widget"
+msgstr "部件"
 
-#: buildtools/autotools/addtargetdlg.cpp:156
-#, fuzzy
-msgid "Libtool libraries must have a lib prefix."
-msgstr "Libtool 库必须用 lib 作前缀！"
+#: kdevdesigner/designer/newformimpl.cpp:277
+msgid "Main Window"
+msgstr "主窗口"
 
-#: buildtools/autotools/addtargetdlg.cpp:161
-#, fuzzy
-msgid "Libtool libraries must have a .la suffix."
-msgstr "Libtool 库必须用 .la 作后缀！"
+#: kdevdesigner/designer/projectsettingsimpl.cpp:96
+msgid ""
+"*.db|Database Files\n"
+"*|All Files"
+msgstr ""
+"*.db|数据库文件\n"
+"*|全部文件"
 
-#: buildtools/autotools/addtargetdlg.cpp:179
-#, fuzzy
-msgid "A target with this name already exists."
-msgstr "同名的目标已经存在！"
+#: kdevdesigner/designer/projectsettingsimpl.cpp:104
+msgid ""
+"*.pro|Project Files\n"
+"*|All Files"
+msgstr ""
+"*.pro|工程文件\n"
+"*|全部文件"
 
-#: kdevdesigner/designer/iconvieweditorimpl.cpp:132
-#: kdevdesigner/designer/listboxeditorimpl.cpp:164
-msgid "Edit the Items of '%1'"
-msgstr "编辑“%1”的项目"
+#: kdevdesigner/designer/actioneditorimpl.cpp:52
+msgid "Actions"
+msgstr "动作"
 
 #: kdevdesigner/designer/formfile.cpp:195
 #: kdevdesigner/designer/formfile.cpp:218
@@ -26939,7 +23804,8 @@ msgstr "“%1”已保存。"
 #: kdevdesigner/designer/formfile.cpp:264
 #: kdevdesigner/designer/formfile.cpp:862
 #: kdevdesigner/designer/mainwindowactions.cpp:1212
-msgid "*.ui|Qt User-Interface Files"
+#, fuzzy
+msgid "*.ui|TQt User-Interface Files"
 msgstr "*.ui|Qt 用户界面文件"
 
 #: kdevdesigner/designer/formfile.cpp:265
@@ -26961,15 +23827,6 @@ msgstr "文件已经存在"
 msgid "The file already exists. Do you wish to overwrite it?"
 msgstr "文件已经存在。您想要覆盖吗？"
 
-#: kdevdesigner/designer/formfile.cpp:297
-#: kdevdesigner/designer/hierarchyview.cpp:1105
-#: kdevdesigner/designer/hierarchyview.cpp:1109
-#: kdevdesigner/designer/hierarchyview.cpp:1221
-#: kdevdesigner/designer/sourcefile.cpp:141
-#, c-format
-msgid "Edit %1"
-msgstr "编辑 %1"
-
 #: kdevdesigner/designer/formfile.cpp:328
 #: kdevdesigner/designer/formwindow.cpp:1841
 msgid "Save Form"
@@ -26979,18 +23836,6 @@ msgstr "保存表单"
 msgid "Save changes to form '%1'?"
 msgstr "将更改保存到表单“%1”吗？"
 
-#: kdevdesigner/designer/editfunctionsimpl.cpp:218
-#: kdevdesigner/designer/formfile.cpp:330
-#: kdevdesigner/designer/formfile.cpp:657
-#: kdevdesigner/designer/mainwindow.cpp:2517
-#: kdevdesigner/designer/mainwindow.cpp:2847
-#: kdevdesigner/designer/mainwindowactions.cpp:1129
-#: kdevdesigner/designer/sourcefile.cpp:224
-#: kdevdesigner/designer/sourcefile.cpp:269
-#: kdevdesigner/designer/variabledialogimpl.cpp:105
-msgid "&No"
-msgstr "否(&N)"
-
 #: kdevdesigner/designer/formfile.cpp:440
 #, fuzzy
 msgid "Using ui.h File"
@@ -27022,312 +23867,314 @@ msgstr "打开 ui.h 文件"
 msgid "Do you want to create an new \"ui.h\" file?"
 msgstr "无法创建新文件。"
 
-#: kdevdesigner/designer/formfile.cpp:655
-#: kdevdesigner/designer/sourcefile.cpp:267
-#, fuzzy
-msgid ""
-"File '%1' has been changed outside Qt Designer.\n"
-"Do you want to reload it?"
-msgstr ""
-"错误列表已经改变。\n"
-"您要保存您的修改吗？"
-
-#: kdevdesigner/designer/formfile.cpp:855
-#: kdevdesigner/designer/sourcefile.cpp:280
-#, fuzzy
-msgid "Invalid Filename"
-msgstr "文件名"
-
 #: kdevdesigner/designer/formfile.cpp:856
 msgid ""
 "The project already contains a form with a\n"
 "filename of '%1'. Please choose a new filename."
 msgstr ""
 
-#: kdevdesigner/designer/propertyeditor.cpp:422
-msgid "Reset the property to its default value"
+#: kdevdesigner/designer/variabledialogimpl.cpp:104
+msgid ""
+"One variable has been declared twice.\n"
+"Remove this variable?"
 msgstr ""
 
-#: kdevdesigner/designer/propertyeditor.cpp:423
-msgid "Click this button to reset the property to its default value"
+#: kdevdesigner/designer/customwidgeteditorimpl.cpp:222
+msgid "Adding Custom Widget"
+msgstr "添加自定义部件"
+
+#: kdevdesigner/designer/customwidgeteditorimpl.cpp:223
+msgid ""
+"Custom widget names must be unique.\n"
+"A custom widget called '%1' already exists, so it is not possible to add "
+"another widget with this name."
 msgstr ""
 
-#: kdevdesigner/designer/propertyeditor.cpp:1090
-#: kdevdesigner/designer/propertyeditor.cpp:1151
-msgid "False"
-msgstr "假"
+#: kdevdesigner/designer/customwidgeteditorimpl.cpp:272
+msgid "Removing Custom Widget"
+msgstr "删除自定义部件"
 
-#: kdevdesigner/designer/propertyeditor.cpp:1091
-#: kdevdesigner/designer/propertyeditor.cpp:1149
-msgid "True"
-msgstr "真"
+#: kdevdesigner/designer/customwidgeteditorimpl.cpp:273
+msgid "The custom widget '%1' is in use, so it cannot be removed."
+msgstr "自定义部件“%1”正在使用中，所以无法删除。"
 
-#: kdevdesigner/designer/propertyeditor.cpp:1511
-#: kdevdesigner/designer/propertyeditor.cpp:1533
-#: kdevdesigner/designer/propertyeditor.cpp:1606
-#: kdevdesigner/designer/propertyeditor.cpp:1620
-msgid "width"
-msgstr "宽度"
+#: kdevdesigner/designer/customwidgeteditorimpl.cpp:379
+msgid "*.h *.h++ *.hxx *.hh|Header Files"
+msgstr "*.h *.h++ *.hxx *.hh|头文件"
 
-#: kdevdesigner/designer/propertyeditor.cpp:1513
-#: kdevdesigner/designer/propertyeditor.cpp:1538
-#: kdevdesigner/designer/propertyeditor.cpp:1608
-#: kdevdesigner/designer/propertyeditor.cpp:1622
-msgid "height"
-msgstr "高度"
+#: kdevdesigner/designer/customwidgeteditorimpl.cpp:397
+msgid "Renaming Custom Widget"
+msgstr "重命名自定义部件"
 
-#: kdevdesigner/designer/propertyeditor.cpp:1757
-#: kdevdesigner/designer/propertyeditor.cpp:1770
-#: kdevdesigner/designer/propertyeditor.cpp:1820
-msgid "Red"
-msgstr "红"
+#: kdevdesigner/designer/customwidgeteditorimpl.cpp:398
+msgid ""
+"Custom widget names must be unique.\n"
+"A custom widget called '%1' already exists, so it is not possible to rename "
+"this widget with this name."
+msgstr ""
 
-#: kdevdesigner/designer/propertyeditor.cpp:1759
-#: kdevdesigner/designer/propertyeditor.cpp:1772
-#: kdevdesigner/designer/propertyeditor.cpp:1822
-msgid "Green"
-msgstr "绿"
+#: kdevdesigner/designer/customwidgeteditorimpl.cpp:684
+#: kdevdesigner/designer/customwidgeteditorimpl.cpp:752
+msgid ""
+"*.cw|Custom-Widget Description\n"
+"*|All Files"
+msgstr ""
+"*.cw|自定义部件描述\n"
+"*|全部文件"
 
-#: kdevdesigner/designer/propertyeditor.cpp:1761
-#: kdevdesigner/designer/propertyeditor.cpp:1774
-#: kdevdesigner/designer/propertyeditor.cpp:1824
-msgid "Blue"
-msgstr "蓝"
+#: kdevdesigner/designer/actiondnd.cpp:349
+#: kdevdesigner/designer/actiondnd.cpp:402
+msgid "Delete Toolbar"
+msgstr "删除工具栏"
 
-#: kdevdesigner/designer/propertyeditor.cpp:1879
-#: kdevdesigner/designer/propertyeditor.cpp:1898
-#: kdevdesigner/designer/propertyeditor.cpp:1963
-msgid "Family"
-msgstr ""
+#: kdevdesigner/designer/actiondnd.cpp:352
+#: kdevdesigner/designer/actiondnd.cpp:432
+msgid "Delete Toolbar '%1'"
+msgstr "删除工具栏“%1”"
 
-#: kdevdesigner/designer/propertyeditor.cpp:1881
-#: kdevdesigner/designer/propertyeditor.cpp:1901
-#: kdevdesigner/designer/propertyeditor.cpp:1965
-#, fuzzy
-msgid "Point Size"
-msgstr "端口"
+#: kdevdesigner/designer/actiondnd.cpp:397
+msgid "Delete Separator"
+msgstr "删除分隔符"
 
-#: kdevdesigner/designer/multilineeditorimpl.cpp:109
-#: kdevdesigner/designer/propertyeditor.cpp:1883
-#: kdevdesigner/designer/propertyeditor.cpp:1903
-#: kdevdesigner/designer/propertyeditor.cpp:1967
-msgid "Bold"
-msgstr "粗体"
+#: kdevdesigner/designer/actiondnd.cpp:400
+msgid "Insert Separator"
+msgstr "插入分隔符"
 
-#: kdevdesigner/designer/multilineeditorimpl.cpp:115
-#: kdevdesigner/designer/propertyeditor.cpp:1887
-#: kdevdesigner/designer/propertyeditor.cpp:1907
-#: kdevdesigner/designer/propertyeditor.cpp:1971
-msgid "Underline"
-msgstr "下划线"
+#: kdevdesigner/designer/actiondnd.cpp:411
+#: kdevdesigner/designer/actiondnd.cpp:466
+#: kdevdesigner/designer/actiondnd.cpp:489
+msgid "Delete Action '%1' From Toolbar '%2'"
+msgstr "将动作“%1”从工具栏“%2”删除"
 
-#: kdevdesigner/designer/propertyeditor.cpp:1889
-#: kdevdesigner/designer/propertyeditor.cpp:1909
-#: kdevdesigner/designer/propertyeditor.cpp:1973
-msgid "Strikeout"
-msgstr "删除线"
+#: kdevdesigner/designer/actiondnd.cpp:426
+msgid "Add Separator to Toolbar '%1'"
+msgstr "向工具栏“%1”添加分隔符"
 
-#: kdevdesigner/designer/propertyeditor.cpp:2006
-#: kdevdesigner/designer/propertyeditor.cpp:2040
-msgid "Table"
-msgstr "表"
+#: kdevdesigner/designer/actiondnd.cpp:506
+#: kdevdesigner/designer/actiondnd.cpp:573
+msgid "Add Action '%1' to Toolbar '%2'"
+msgstr "将动作“%1”添加到工具栏“%2”"
 
-#: kdevdesigner/designer/propertyeditor.cpp:2009
-#: kdevdesigner/designer/propertyeditor.cpp:2063
-msgid "Field"
-msgstr "字段"
+#: kdevdesigner/designer/actiondnd.cpp:566
+msgid "Insert/Move Action"
+msgstr "插入/移动动作"
 
-#: kdevdesigner/designer/propertyeditor.cpp:2177
-#: kdevdesigner/designer/propertyeditor.cpp:2193
-#: kdevdesigner/designer/propertyeditor.cpp:2243
-msgid "horizontalStretch"
+#: kdevdesigner/designer/actiondnd.cpp:567
+msgid ""
+"Action '%1' has already been added to this toolbar.\n"
+"An Action may only occur once in a given toolbar."
 msgstr ""
 
-#: kdevdesigner/designer/propertyeditor.cpp:2179
-#: kdevdesigner/designer/propertyeditor.cpp:2195
-#: kdevdesigner/designer/propertyeditor.cpp:2245
-msgid "verticalStretch"
-msgstr ""
+#: kdevdesigner/designer/actiondnd.cpp:701
+msgid "Add Widget '%1' to Toolbar '%2'"
+msgstr "将部件“%1”添加到工具栏“%2”"
 
-#: kdevdesigner/designer/propertyeditor.cpp:2226
-msgid "%1/%2/%3/%4"
-msgstr "%1/%2/%3/%4"
+#: kdevdesigner/designer/formwindow.cpp:360
+msgid "&Horizontal"
+msgstr "水平(&H)"
 
-#: kdevdesigner/designer/propertyeditor.cpp:2381
-msgid "Up-Arrow"
+#: kdevdesigner/designer/formwindow.cpp:380
+#: kdevdesigner/designer/formwindow.cpp:507
+msgid ""
+"<b>A %1 (custom widget)</b> "
+"<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> "
+"menu to add and change custom widgets. You can add properties as well as "
+"signals and slots to integrate custom widgets into <i>TQt Designer</i>"
+", and provide a pixmap which will be used to represent the widget on the "
+"form.</p>"
 msgstr ""
 
-#: kdevdesigner/designer/propertyeditor.cpp:3489
-#: kdevdesigner/designer/propertyeditor.cpp:3503
-msgid "Set '%1' of '%2'"
-msgstr ""
+#: kdevdesigner/designer/formwindow.cpp:387
+#: kdevdesigner/designer/formwindow.cpp:514
+msgid "A %1 (custom widget)"
+msgstr "%1(自定义部件)"
 
-#: kdevdesigner/designer/propertyeditor.cpp:3631
-msgid "Sort &Categorized"
-msgstr ""
+#: kdevdesigner/designer/formwindow.cpp:458
+#, fuzzy
+msgid "Reparent Widgets"
+msgstr "删除方法(&D)"
 
-#: kdevdesigner/designer/propertyeditor.cpp:3632
-msgid "Sort &Alphabetically"
-msgstr "按字母顺序排列(&A)"
+#: kdevdesigner/designer/formwindow.cpp:466
+#: kdevdesigner/designer/formwindow.cpp:472
+#: kdevdesigner/designer/formwindow.cpp:482
+#, c-format
+msgid "Insert %1"
+msgstr "插入 %1"
 
-#: kdevdesigner/designer/propertyeditor.cpp:3772
-msgid "Reset '%1' of '%2'"
+#: kdevdesigner/designer/formwindow.cpp:663
+msgid "Set buddy for '%1' to..."
 msgstr ""
 
-#: kdevdesigner/designer/propertyeditor.cpp:3879
-msgid ""
-"<p><b>QWidget::%1</b></p>"
-"<p>There is no documentation available for this property.</p>"
-msgstr ""
+#: kdevdesigner/designer/formwindow.cpp:665
+msgid "Connect '%1' with..."
+msgstr "将“%1”连接到..."
 
-#: kdevdesigner/designer/propertyeditor.cpp:4031
-#, fuzzy
-msgid "New Signal Handler"
-msgstr "信号"
+#: kdevdesigner/designer/formwindow.cpp:687
+#: kdevdesigner/designer/formwindow.cpp:733
+msgid "Change Tab Order"
+msgstr "更改 Tab 顺序"
 
-#: kdevdesigner/designer/propertyeditor.cpp:4032
-#, fuzzy
-msgid "Delete Signal Handler"
-msgstr "信号"
+#: kdevdesigner/designer/formwindow.cpp:874
+msgid "Connect '%1' to '%2'"
+msgstr ""
 
-#: kdevdesigner/designer/propertyeditor.cpp:4053
-msgid "Remove Connection"
-msgstr "删除连接"
+#: kdevdesigner/designer/formwindow.cpp:902
+msgid "Set buddy '%1' to '%2'"
+msgstr ""
 
-#: kdevdesigner/designer/mainwindow.cpp:2600
-#: kdevdesigner/designer/propertyeditor.cpp:4086
-msgid "Add Connection"
-msgstr "添加连接"
+#: kdevdesigner/designer/formwindow.cpp:905
+msgid "Set buddy '%1' to ..."
+msgstr ""
 
-#: kdevdesigner/designer/editfunctionsimpl.cpp:195
-#: kdevdesigner/designer/propertyeditor.cpp:4104
-msgid "Add Function"
-msgstr "添加函数"
+#: kdevdesigner/designer/formwindow.cpp:963
+#: kdevdesigner/designer/formwindow.cpp:1068
+msgid "Inserting Widget"
+msgstr "插入部件"
 
-#: kdevdesigner/designer/propertyeditor.cpp:4145
-#: kdevdesigner/designer/propertyeditor.cpp:4184
-#: kdevdesigner/designer/propertyeditor.cpp:4310
-msgid "Property Editor"
-msgstr "属性编辑器"
+#: kdevdesigner/designer/formwindow.cpp:964
+#: kdevdesigner/designer/formwindow.cpp:1069
+msgid ""
+"You tried to insert a widget into the layout Container Widget '%1'.\n"
+"This is not possible. In order to insert the widget, the layout of '%1'\n"
+"must first be broken.\n"
+"Break the layout or cancel the operation?"
+msgstr ""
 
-#: kdevdesigner/designer/propertyeditor.cpp:4149
-msgid "P&roperties"
-msgstr "属性(&R)"
+#: kdevdesigner/designer/formwindow.cpp:1047
+#, c-format
+msgid "Set Buddy for %1"
+msgstr "设定的 %1 的好友"
 
-#: kdevdesigner/designer/propertyeditor.cpp:4151
+#: kdevdesigner/designer/formwindow.cpp:1313
+#: kdevdesigner/designer/formwindow.cpp:1351
 #, fuzzy
-msgid "Signa&l Handlers"
-msgstr "特殊头文件(&H)"
-
-#: kdevdesigner/designer/propertyeditor.cpp:4193
-msgid "Property Editor (%1)"
-msgstr "属性编辑器(%1)"
+msgid "Use Size Hint"
+msgstr "水平展开(&H)"
 
-#: kdevdesigner/designer/mainwindow.cpp:3710
-#: kdevdesigner/designer/propertyeditor.cpp:4319
+#: kdevdesigner/designer/formwindow.cpp:1513
+#: kdevdesigner/designer/formwindow.cpp:1525
+#: kdevdesigner/designer/formwindow.cpp:1533
+#: kdevdesigner/designer/mainwindowactions.cpp:326
 #, fuzzy
-msgid "Signal Handlers"
-msgstr "特殊头文件(&H)"
+msgid "Adjust Size"
+msgstr "自定义"
 
-#: kdevdesigner/designer/actioneditorimpl.cpp:52
-msgid "Actions"
-msgstr "动作"
+#: kdevdesigner/designer/formwindow.cpp:1743
+msgid "Click widgets to change the tab order..."
+msgstr ""
 
-#: kdevdesigner/designer/actioneditorimpl.cpp:57
-#: kdevdesigner/designer/actionlistview.cpp:90
-msgid "New &Action"
-msgstr "新建动作(&A)"
+#: kdevdesigner/designer/formwindow.cpp:1754
+msgid "Drag a line to create a connection..."
+msgstr ""
 
-#: kdevdesigner/designer/actioneditorimpl.cpp:58
-#: kdevdesigner/designer/actionlistview.cpp:91
-msgid "New Action &Group"
-msgstr "新建动作组(&G)"
+#: kdevdesigner/designer/formwindow.cpp:1756
+msgid "Drag a line to set a buddy..."
+msgstr ""
 
-#: kdevdesigner/designer/actioneditorimpl.cpp:59
-#: kdevdesigner/designer/actionlistview.cpp:92
-msgid "New &Dropdown Action Group"
+#: kdevdesigner/designer/formwindow.cpp:1762
+msgid "Click on the form to insert a %1..."
 msgstr ""
 
-#: kdevdesigner/designer/tableeditorimpl.cpp:346
-msgid "Edit the Rows and Columns of '%1' "
+#: kdevdesigner/designer/formwindow.cpp:1834
+msgid ""
+"The following custom widgets are used in '%1',\n"
+"but are not known to TQt Designer:\n"
 msgstr ""
 
-#: kdevdesigner/designer/mainwindowactions.cpp:797
-#: kdevdesigner/designer/mainwindowactions.cpp:798
-#: kdevdesigner/designer/newformimpl.cpp:364
-#: kdevdesigner/designer/startdialogimpl.cpp:67
-#: kdevdesigner/designer/workspace.cpp:159
-msgid "<No Project>"
-msgstr "<无工程>"
+#: kdevdesigner/designer/formwindow.cpp:1838
+msgid ""
+"If you save this form and generate code for it using uic, \n"
+"the generated code will not compile.\n"
+"Do you want to save this form now?"
+msgstr ""
 
-#: kdevdesigner/designer/startdialogimpl.cpp:169
-msgid "Designer Files (*.ui *.pro)"
-msgstr "设计师文件(*.ui *.pro)"
+#: kdevdesigner/designer/formwindow.cpp:1877
+msgid "Lower"
+msgstr "小写"
 
-#: kdevdesigner/designer/mainwindow.cpp:155
-#: kdevdesigner/designer/startdialogimpl.cpp:170
+#: kdevdesigner/designer/formwindow.cpp:1936
+#: kdevdesigner/designer/formwindow.cpp:1953
+#: kdevdesigner/designer/mainwindowactions.cpp:185
+msgid "Check Accelerators"
+msgstr "检查快捷键"
+
+#: kdevdesigner/designer/formwindow.cpp:1937
+msgid ""
+"_n: Accelerator '%1' is used once.\n"
+"Accelerator '%1' is used %n times."
+msgstr "加速键“%1”使用了 %n 次。"
+
+#: kdevdesigner/designer/formwindow.cpp:1939
+msgid "&Select"
+msgstr "选择(&S)"
+
+#: kdevdesigner/designer/formwindow.cpp:1954
+msgid "No accelerator is used more than once."
+msgstr "没有使用多次的加速键。"
+
+#: kdevdesigner/designer/formwindow.cpp:1964
 #, fuzzy
-msgid "Qt User-Interface Files (*.ui)"
-msgstr "主要用户界面模式(&U)"
+msgid "Raise"
+msgstr "发布版本号"
 
-#: kdevdesigner/designer/startdialogimpl.cpp:171
-msgid "QMAKE Project Files (*.pro)"
-msgstr ""
+#: kdevdesigner/designer/formwindow.cpp:2002
+#: kdevdesigner/designer/mainwindowactions.cpp:333
+#, fuzzy
+msgid "Lay OutQt::Horizontally"
+msgstr "水平展开(&H)"
 
-#: kdevdesigner/designer/startdialogimpl.cpp:177
-msgid "All Files (*)"
-msgstr "所有文件(*)"
+#: kdevdesigner/designer/formwindow.cpp:2012
+#: kdevdesigner/designer/mainwindowactions.cpp:340
+#, fuzzy
+msgid "Lay OutQt::Vertically"
+msgstr "垂直展开(&V)"
 
-#: kdevdesigner/designer/resource.cpp:1787
-msgid "Loading File"
-msgstr "装入文件"
+#: kdevdesigner/designer/formwindow.cpp:2022
+#, fuzzy
+msgid "Lay OutQt::Horizontally (in splitter)"
+msgstr "水平展开(&H)"
 
-#: kdevdesigner/designer/resource.cpp:1788
+#: kdevdesigner/designer/formwindow.cpp:2032
 #, fuzzy
-msgid ""
-"Error loading %1.\n"
-"The widget %2 could not be created."
-msgstr "这个项目无法删除"
+msgid "Lay OutQt::Vertically (in splitter)"
+msgstr "垂直展开(&V)"
 
-#: kdevdesigner/designer/widgetfactory.cpp:277
+#: kdevdesigner/designer/formwindow.cpp:2045
+#: kdevdesigner/designer/mainwindowactions.cpp:347
 #, fuzzy
-msgid "Move Tab Page"
-msgstr "删除目标"
+msgid "Lay Out in a Grid"
+msgstr "垂直展开(&V)"
 
-#: kdevdesigner/designer/widgetfactory.cpp:814
+#: kdevdesigner/designer/formwindow.cpp:2066
 #, fuzzy
-msgid "Tab 1"
-msgstr "制表符宽度"
+msgid "Lay Out ChildrenQt::Horizontally"
+msgstr "水平展开(&H)"
 
-#: kdevdesigner/designer/widgetfactory.cpp:817
+#: kdevdesigner/designer/formwindow.cpp:2087
 #, fuzzy
-msgid "Tab 2"
-msgstr "制表符宽度"
+msgid "Lay Out ChildrenQt::Vertically"
+msgstr "垂直展开(&V)"
 
-#: kdevdesigner/designer/widgetfactory.cpp:960
+#: kdevdesigner/designer/formwindow.cpp:2111
 #, fuzzy
-msgid "Page 1"
-msgstr "目标：%1"
+msgid "Lay Out Children in a Grid"
+msgstr "垂直展开(&V)"
 
-#: kdevdesigner/designer/widgetfactory.cpp:963
+#: kdevdesigner/designer/formwindow.cpp:2143
+#: kdevdesigner/designer/formwindow.cpp:2163
+#: kdevdesigner/designer/mainwindowactions.cpp:368
 #, fuzzy
-msgid "Page 2"
-msgstr "软件包"
+msgid "Break Layout"
+msgstr "断点(&B)"
 
-#: kdevdesigner/designer/mainwindow.cpp:1489
-#: kdevdesigner/designer/mainwindowactions.cpp:127
-msgid "&Undo: Not Available"
-msgstr "撤消(&U)：不可用"
+#: kdevdesigner/designer/formwindow.cpp:2223
+msgid "Edit connections..."
+msgstr "编辑连接..."
 
 #: kdevdesigner/designer/mainwindowactions.cpp:128
 msgid "Undoes the last action"
 msgstr "撤消上次操作"
 
-#: kdevdesigner/designer/mainwindow.cpp:1493
-#: kdevdesigner/designer/mainwindowactions.cpp:133
-msgid "&Redo: Not Available"
-msgstr "重做(&R)：不可用"
-
 #: kdevdesigner/designer/mainwindowactions.cpp:134
 #, fuzzy
 msgid "Redoes the last undone operation"
@@ -27390,32 +24237,10 @@ msgstr "推到最后(&B)"
 msgid "Lowers the selected widgets"
 msgstr "去掉所有选中的文件。"
 
-#: kdevdesigner/designer/formwindow.cpp:1936
-#: kdevdesigner/designer/formwindow.cpp:1953
-#: kdevdesigner/designer/mainwindowactions.cpp:185
-msgid "Check Accelerators"
-msgstr "检查快捷键"
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:116
-#: kdevdesigner/designer/mainwindowactions.cpp:186
-msgid "Chec&k Accelerators"
-msgstr "检查快捷键(&K)"
-
 #: kdevdesigner/designer/mainwindowactions.cpp:187
 msgid "Checks if the accelerators used in the form are unique"
 msgstr ""
 
-#: kdevdesigner/designer/hierarchyview.cpp:846
-#: kdevdesigner/designer/mainwindowactions.cpp:192
-#, fuzzy
-msgid "Slots"
-msgstr "槽"
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:118
-#: kdevdesigner/designer/mainwindowactions.cpp:193
-msgid "S&lots..."
-msgstr "槽(&L)..."
-
 #: kdevdesigner/designer/mainwindowactions.cpp:194
 msgid "Opens a dialog for editing slots"
 msgstr ""
@@ -27424,11 +24249,6 @@ msgstr ""
 msgid "Connections"
 msgstr "连接"
 
-#: kdevdesigner/designer/kdevdesigner_part.cpp:120
-#: kdevdesigner/designer/mainwindowactions.cpp:200
-msgid "Co&nnections..."
-msgstr "连接(&N)..."
-
 #: kdevdesigner/designer/mainwindowactions.cpp:201
 msgid "Opens a dialog for editing connections"
 msgstr ""
@@ -27441,11 +24261,6 @@ msgstr "源文件(&S)..."
 msgid "Opens an editor to edit the form's source code"
 msgstr ""
 
-#: kdevdesigner/designer/kdevdesigner_part.cpp:122
-#: kdevdesigner/designer/mainwindowactions.cpp:214
-msgid "&Form Settings..."
-msgstr "表单设置(&F)..."
-
 #: kdevdesigner/designer/mainwindowactions.cpp:215
 msgid "Opens a dialog to change the form's settings"
 msgstr ""
@@ -27481,62 +24296,19 @@ msgstr "转到行(&G)..."
 msgid "Incremental search (Alt+I)"
 msgstr ""
 
-#: kdevdesigner/designer/formwindow.cpp:1513
-#: kdevdesigner/designer/formwindow.cpp:1525
-#: kdevdesigner/designer/formwindow.cpp:1533
-#: kdevdesigner/designer/mainwindowactions.cpp:326
-#, fuzzy
-msgid "Adjust Size"
-msgstr "自定义"
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:147
-#: kdevdesigner/designer/mainwindowactions.cpp:327
-msgid "Adjust &Size"
-msgstr ""
-
 #: kdevdesigner/designer/mainwindowactions.cpp:328
 #, fuzzy
 msgid "Adjusts the size of the selected widget"
 msgstr "删除选中的项目"
 
-#: kdevdesigner/designer/formwindow.cpp:2002
-#: kdevdesigner/designer/mainwindowactions.cpp:333
-#, fuzzy
-msgid "Lay Out Horizontally"
-msgstr "水平展开(&H)"
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:149
-#: kdevdesigner/designer/mainwindowactions.cpp:334
-#, fuzzy
-msgid "Lay Out &Horizontally"
-msgstr "水平展开(&H)"
-
 #: kdevdesigner/designer/mainwindowactions.cpp:335
 msgid "Lays out the selected widgets horizontally"
 msgstr ""
 
-#: kdevdesigner/designer/formwindow.cpp:2012
-#: kdevdesigner/designer/mainwindowactions.cpp:340
-#, fuzzy
-msgid "Lay Out Vertically"
-msgstr "垂直展开(&V)"
-
-#: kdevdesigner/designer/kdevdesigner_part.cpp:151
-#: kdevdesigner/designer/mainwindowactions.cpp:341
-#, fuzzy
-msgid "Lay Out &Vertically"
-msgstr "垂直展开(&V)"
-
 #: kdevdesigner/designer/mainwindowactions.cpp:342
 msgid "Lays out the selected widgets vertically"
 msgstr ""
 
-#: kdevdesigner/designer/formwindow.cpp:2045
-#: kdevdesigner/designer/mainwindowactions.cpp:347
-#, fuzzy
-msgid "Lay Out in a Grid"
-msgstr "垂直展开(&V)"
-
 #: kdevdesigner/designer/mainwindowactions.cpp:348
 #, fuzzy
 msgid "Lay Out in a &Grid"
@@ -27548,56 +24320,27 @@ msgstr ""
 
 #: kdevdesigner/designer/mainwindowactions.cpp:354
 #, fuzzy
-msgid "Lay Out Horizontally (in Splitter)"
+msgid "Lay OutQt::Horizontally (in Splitter)"
 msgstr "水平展开(&H)"
 
-#: kdevdesigner/designer/kdevdesigner_part.cpp:155
-#: kdevdesigner/designer/mainwindowactions.cpp:355
-msgid "Lay Out Horizontally (in S&plitter)"
-msgstr ""
-
 #: kdevdesigner/designer/mainwindowactions.cpp:356
 msgid "Lays out the selected widgets horizontally in a splitter"
 msgstr ""
 
 #: kdevdesigner/designer/mainwindowactions.cpp:361
 #, fuzzy
-msgid "Lay Out Vertically (in Splitter)"
+msgid "Lay OutQt::Vertically (in Splitter)"
 msgstr "垂直展开(&V)"
 
-#: kdevdesigner/designer/kdevdesigner_part.cpp:157
-#: kdevdesigner/designer/mainwindowactions.cpp:362
-msgid "Lay Out Vertically (in Sp&litter)"
-msgstr ""
-
 #: kdevdesigner/designer/mainwindowactions.cpp:363
 msgid "Lays out the selected widgets vertically in a splitter"
 msgstr ""
 
-#: kdevdesigner/designer/formwindow.cpp:2143
-#: kdevdesigner/designer/formwindow.cpp:2163
-#: kdevdesigner/designer/mainwindowactions.cpp:368
-#, fuzzy
-msgid "Break Layout"
-msgstr "断点(&B)"
-
-#: kdevdesigner/designer/formwindow.cpp:971
-#: kdevdesigner/designer/formwindow.cpp:1076
-#: kdevdesigner/designer/kdevdesigner_part.cpp:159
-#: kdevdesigner/designer/mainwindowactions.cpp:369
-msgid "&Break Layout"
-msgstr "打乱布局(&B)"
-
 #: kdevdesigner/designer/mainwindowactions.cpp:370
 #, fuzzy
 msgid "Breaks the selected layout"
 msgstr "删除选中的项目"
 
-#: kdevdesigner/designer/mainwindow.cpp:224
-#: kdevdesigner/designer/mainwindowactions.cpp:376
-msgid "Layout"
-msgstr "布局"
-
 #: kdevdesigner/designer/mainwindowactions.cpp:379
 #, c-format
 msgid "Add %1"
@@ -27625,11 +24368,6 @@ msgstr "<b>布局工具栏</b>%1"
 msgid "Pointer"
 msgstr "指针"
 
-#: kdevdesigner/designer/kdevdesigner_part.cpp:135
-#: kdevdesigner/designer/mainwindowactions.cpp:432
-msgid "&Pointer"
-msgstr "指针(&P)"
-
 #: kdevdesigner/designer/mainwindowactions.cpp:435
 msgid "Selects the pointer tool"
 msgstr "选择指针工具"
@@ -27638,11 +24376,6 @@ msgstr "选择指针工具"
 msgid "Connect Signal/Slots"
 msgstr ""
 
-#: kdevdesigner/designer/kdevdesigner_part.cpp:138
-#: kdevdesigner/designer/mainwindowactions.cpp:440
-msgid "&Connect Signal/Slots"
-msgstr ""
-
 #: kdevdesigner/designer/mainwindowactions.cpp:444
 msgid "Selects the connection tool"
 msgstr "选择连接工具"
@@ -27651,11 +24384,6 @@ msgstr "选择连接工具"
 msgid "Tab Order"
 msgstr "Tab 顺序"
 
-#: kdevdesigner/designer/kdevdesigner_part.cpp:140
-#: kdevdesigner/designer/mainwindowactions.cpp:448
-msgid "Tab &Order"
-msgstr "Tab 顺序(&O)"
-
 #: kdevdesigner/designer/mainwindowactions.cpp:451
 msgid "Selects the tab order tool"
 msgstr ""
@@ -27664,11 +24392,6 @@ msgstr ""
 msgid "Set Buddy"
 msgstr ""
 
-#: kdevdesigner/designer/kdevdesigner_part.cpp:142
-#: kdevdesigner/designer/mainwindowactions.cpp:455
-msgid "Set &Buddy"
-msgstr ""
-
 #: kdevdesigner/designer/mainwindowactions.cpp:458
 msgid "Sets a buddy to a label"
 msgstr ""
@@ -27686,11 +24409,6 @@ msgstr "工具"
 msgid "Custom Widgets"
 msgstr "自定义部件"
 
-#: kdevdesigner/designer/kdevdesigner_part.cpp:145
-#: kdevdesigner/designer/mainwindowactions.cpp:490
-msgid "Edit &Custom Widgets..."
-msgstr "编辑自定义部件(&C)..."
-
 #: kdevdesigner/designer/mainwindowactions.cpp:491
 msgid "Opens a dialog to add and change custom widgets"
 msgstr "打开对话框以添加并更改自定义部件"
@@ -27737,11 +24455,6 @@ msgid ""
 "multiple widgets."
 msgstr ""
 
-#: kdevdesigner/designer/kdevdesigner_part.cpp:144
-#: kdevdesigner/designer/mainwindowactions.cpp:605
-msgid "Configure Toolbox..."
-msgstr "配置工具箱..."
-
 #: kdevdesigner/designer/mainwindowactions.cpp:606
 msgid "Opens a dialog to configure the common widgets page of the toolbox"
 msgstr ""
@@ -27820,11 +24533,6 @@ msgstr "全部保存(&V)"
 msgid "Saves all open documents"
 msgstr "保存全部文档"
 
-#: kdevdesigner/designer/kdevdesigner_part.cpp:100
-#: kdevdesigner/designer/mainwindowactions.cpp:740
-msgid "Create &Template..."
-msgstr "创建模板(&T)..."
-
 #: kdevdesigner/designer/mainwindowactions.cpp:741
 msgid "Creates a new template"
 msgstr "创建新模板"
@@ -27860,11 +24568,6 @@ msgstr "当前工程"
 msgid "Add File"
 msgstr "添加文件"
 
-#: kdevdesigner/designer/kdevdesigner_part.cpp:125
-#: kdevdesigner/designer/mainwindowactions.cpp:808
-msgid "&Add File..."
-msgstr "添加文件(&A)..."
-
 #: kdevdesigner/designer/mainwindowactions.cpp:810
 msgid "Adds a file to the current project"
 msgstr "将文件添加到当前工程中"
@@ -27873,11 +24576,6 @@ msgstr "将文件添加到当前工程中"
 msgid "Image Collection..."
 msgstr "图像库..."
 
-#: kdevdesigner/designer/kdevdesigner_part.cpp:127
-#: kdevdesigner/designer/mainwindowactions.cpp:819
-msgid "&Image Collection..."
-msgstr "图像收藏(&I)..."
-
 #: kdevdesigner/designer/mainwindowactions.cpp:820
 msgid "Opens a dialog for editing the current project's image collection"
 msgstr "打开编辑当前工程图像收藏的对话框"
@@ -27886,11 +24584,6 @@ msgstr "打开编辑当前工程图像收藏的对话框"
 msgid "Database Connections..."
 msgstr "数据库连接..."
 
-#: kdevdesigner/designer/kdevdesigner_part.cpp:129
-#: kdevdesigner/designer/mainwindowactions.cpp:829
-msgid "&Database Connections..."
-msgstr "数据库连接(&D)..."
-
 #: kdevdesigner/designer/mainwindowactions.cpp:830
 msgid "Opens a dialog for editing the current project's database connections"
 msgstr ""
@@ -27907,20 +24600,10 @@ msgstr "工程设置(&P)..."
 msgid "Opens a dialog to change the project's settings"
 msgstr "打开更改工程设置的对话框"
 
-#: kdevdesigner/designer/mainwindow.cpp:3735
-#: kdevdesigner/designer/mainwindowactions.cpp:855
-msgid "&Preview"
-msgstr "预览(&P)"
-
 #: kdevdesigner/designer/mainwindowactions.cpp:857
 msgid "Preview Form"
 msgstr "预览表单"
 
-#: kdevdesigner/designer/kdevdesigner_part.cpp:164
-#: kdevdesigner/designer/mainwindowactions.cpp:857
-msgid "Preview &Form"
-msgstr "预览表单(&F)"
-
 #: kdevdesigner/designer/mainwindowactions.cpp:860
 msgid "Opens a preview"
 msgstr "打开预览"
@@ -28059,31 +24742,38 @@ msgid "&Manual"
 msgstr "手册(&M)"
 
 #: kdevdesigner/designer/mainwindowactions.cpp:988
-msgid "Opens the Qt Designer manual"
+#, fuzzy
+msgid "Opens the TQt Designer manual"
 msgstr "打开 Qt 设计师手册"
 
 #: kdevdesigner/designer/mainwindowactions.cpp:993
-msgid "Displays information about Qt Designer"
+#, fuzzy
+msgid "Displays information about TQt Designer"
 msgstr "显示关于 Qt 设计师的信息"
 
 #: kdevdesigner/designer/mainwindowactions.cpp:997
-msgid "About Qt"
+#, fuzzy
+msgid "About TQt"
 msgstr "关于 Qt"
 
 #: kdevdesigner/designer/mainwindowactions.cpp:997
-msgid "About &Qt"
+#, fuzzy
+msgid "About &TQt"
 msgstr "关于 &Qt"
 
 #: kdevdesigner/designer/mainwindowactions.cpp:998
-msgid "Displays information about the Qt Toolkit"
+#, fuzzy
+msgid "Displays information about the TQt Toolkit"
 msgstr "显示关于 Qt 工具箱的信息"
 
 #: kdevdesigner/designer/mainwindowactions.cpp:1004
-msgid "Register Qt"
+#, fuzzy
+msgid "Register TQt"
 msgstr "注册 Qt"
 
 #: kdevdesigner/designer/mainwindowactions.cpp:1004
-msgid "&Register Qt..."
+#, fuzzy
+msgid "&Register TQt..."
 msgstr "注册 Qt(&R)..."
 
 #: kdevdesigner/designer/mainwindowactions.cpp:1005
@@ -28115,17 +24805,6 @@ msgstr "文件名"
 msgid "Enter the name of the new source file:"
 msgstr "输入新源文件的名称："
 
-#: kdevdesigner/designer/mainwindow.cpp:2515
-#: kdevdesigner/designer/mainwindowactions.cpp:1127
-msgid "Save Project Settings"
-msgstr "保存工程设置"
-
-#: kdevdesigner/designer/mainwindow.cpp:2516
-#: kdevdesigner/designer/mainwindowactions.cpp:1128
-#: kdevdesigner/designer/sourcefile.cpp:223
-msgid "Save changes to '%1'?"
-msgstr "将更改保存到“%1”吗？"
-
 #: kdevdesigner/designer/mainwindowactions.cpp:1169
 msgid "Selected project '%1'"
 msgstr "选中的工程“%1”"
@@ -28139,7 +24818,8 @@ msgid "*.ui *.pro|Designer Files"
 msgstr "*.ui *.pro|设计师文件"
 
 #: kdevdesigner/designer/mainwindowactions.cpp:1214
-msgid "*.pro|QMAKE Project Files"
+#, fuzzy
+msgid "*.pro|TQMAKE Project Files"
 msgstr "*.pro|QMAKE 工程文件"
 
 #: kdevdesigner/designer/mainwindowactions.cpp:1275
@@ -28212,20 +24892,6 @@ msgstr ""
 msgid "Edit the current form's connections..."
 msgstr "编辑当前表单的连接..."
 
-#: kdevdesigner/designer/mainwindow.cpp:2968
-#: kdevdesigner/designer/mainwindowactions.cpp:1762
-#: kdevdesigner/designer/mainwindowactions.cpp:1785
-msgid "Edit Source"
-msgstr "编辑源代码"
-
-#: kdevdesigner/designer/mainwindow.cpp:2969
-#: kdevdesigner/designer/mainwindowactions.cpp:1763
-#: kdevdesigner/designer/mainwindowactions.cpp:1786
-msgid ""
-"There is no plugin for editing %1 code installed.\n"
-"Note: Plugins are not available in static Qt configurations."
-msgstr ""
-
 #: kdevdesigner/designer/mainwindowactions.cpp:1841
 msgid "Edit the current form's settings..."
 msgstr "编辑当前表单的设置..."
@@ -28238,1014 +24904,4465 @@ msgstr "编辑首选项..."
 msgid "Edit custom widgets..."
 msgstr "编辑自定义部件..."
 
-#: kdevdesigner/designer/command.cpp:528 kdevdesigner/designer/command.cpp:540
-msgid "Set 'name' Property"
-msgstr "设定“name”属性"
+#: kdevdesigner/designer/startdialogimpl.cpp:169
+msgid "Designer Files (*.ui *.pro)"
+msgstr "设计师文件(*.ui *.pro)"
 
-#: kdevdesigner/designer/command.cpp:529
+#: kdevdesigner/designer/startdialogimpl.cpp:171
+msgid "QMAKE Project Files (*.pro)"
+msgstr ""
+
+#: kdevdesigner/designer/startdialogimpl.cpp:177
+msgid "All Files (*)"
+msgstr "所有文件(*)"
+
+#: kdevdesigner/designer/listvieweditorimpl.cpp:130
+msgid "Edit the Items and Columns of '%1'"
+msgstr "编辑“%1”的项目和列"
+
+#: kdevdesigner/designer/listvieweditorimpl.cpp:287
+msgid "New Column"
+msgstr "新建列"
+
+#: kdevdesigner/designer/listvieweditorimpl.cpp:399
+msgid "Item"
+msgstr "项目"
+
+#: kdevdesigner/designer/listvieweditorimpl.cpp:417
+msgid "Subitem"
+msgstr "子项目"
+
+#: kdevdesigner/designer/editfunctionsimpl.cpp:135
+msgid "Add/Remove functions of '%1'"
+msgstr "添加/删除“%1”的函数"
+
+#: kdevdesigner/designer/editfunctionsimpl.cpp:206
+msgid "Change Function Attributes"
+msgstr "更改函数属性"
+
+#: kdevdesigner/designer/editfunctionsimpl.cpp:217
 msgid ""
-"The name of a widget must be unique.\n"
-"'%1' is already used in form '%2',\n"
-"so the name has been reverted to '%3'."
+"Some syntactically incorrect functions have been defined.\n"
+"Remove these functions?"
 msgstr ""
 
-#: kdevdesigner/designer/command.cpp:541
+#: vcs/clearcase/clearcasepart.cpp:89 vcs/perforce/perforcepart.cpp:97
+#, c-format
+msgid "Actions for %1"
+msgstr "对 %1 的动作"
+
+#: vcs/clearcase/clearcasepart.cpp:90
+msgid "Checkin"
+msgstr "提交"
+
+#: vcs/clearcase/clearcasepart.cpp:92
+msgid "Checkout"
+msgstr "提取"
+
+#: vcs/clearcase/clearcasepart.cpp:94
+msgid "Uncheckout"
+msgstr "反提取"
+
+#: vcs/clearcase/clearcasepart.cpp:97
+msgid "Create Element"
+msgstr "创建元素"
+
+#: vcs/clearcase/clearcasepart.cpp:99
+msgid "Remove Element"
+msgstr "删除元素"
+
+#: vcs/clearcase/clearcasepart.cpp:102
+#, fuzzy
+msgid "History"
+msgstr "目录"
+
+#: vcs/clearcase/clearcasepart.cpp:109
+#, fuzzy
+msgid "List Checkouts"
+msgstr "提取"
+
+#: vcs/clearcase/clearcasepart.cpp:112
+msgid "Clearcase"
+msgstr "Clearcase"
+
+#: vcs/clearcase/clearcasepart.cpp:320
+#, fuzzy
+msgid "Clearcase output errors during diff."
+msgstr "Clearcase 在比较时输出错误。"
+
+#: vcs/clearcase/clearcasepart.cpp:320 vcs/clearcase/clearcasepart.cpp:326
+#: vcs/cvsservice/cvspartimpl.cpp:941 vcs/cvsservice/cvspartimpl.cpp:949
+#: vcs/perforce/perforcepart.cpp:258 vcs/perforce/perforcepart.cpp:264
+msgid "Errors During Diff"
+msgstr "比较时出错"
+
+#: vcs/clearcase/clearcasepart.cpp:325
+msgid "Clearcase outputted errors during diff. Do you still want to continue?"
+msgstr "Clearcase 在比较时输出错误。您仍然要继续吗？"
+
+#: vcs/clearcase/clearcasepart.cpp:332 vcs/cvsservice/cvspartimpl.cpp:957
+#: vcs/perforce/perforcepart.cpp:270
+msgid "There is no difference to the repository."
+msgstr "和仓库没有任何差别。"
+
+#: vcs/clearcase/clearcasepart.cpp:332 vcs/cvsservice/cvspartimpl.cpp:958
+msgid "No Difference Found"
+msgstr "未发现差别"
+
+#: vcs/clearcase/commentdlg.cpp:26
+msgid "Clearcase Comment"
+msgstr "Clearcase 注解"
+
+#: vcs/clearcase/commentdlg.cpp:30
+msgid "Enter log message:"
+msgstr "输入日志信息："
+
+#: vcs/clearcase/commentdlg.cpp:41
+#, fuzzy
+msgid "Reserve"
+msgstr "远程 pserver"
+
+#: vcs/subversion/kdevsvnd.cpp:52
+#, fuzzy
+msgid "Enter Commit Log Message:"
+msgstr "输入日志信息："
+
+#: vcs/subversion/kdevsvnd.cpp:74
+#, fuzzy
+msgid "Open SSL certificate file"
+msgstr "打开源文件(&O)"
+
+#: vcs/subversion/subversion_part.cpp:86
+msgid "Subversion Output"
+msgstr "Subversion 输出"
+
+#: vcs/subversion/subversion_part.cpp:87
+#: vcs/subversion/subversion_part.cpp:261
+msgid "Subversion"
+msgstr "Subversion"
+
+#: vcs/subversion/subversion_part.cpp:87
+msgid "Subversion messages"
+msgstr "Subversion 消息"
+
+#: vcs/subversion/subversion_part.cpp:88
+msgid "<b>Subversion</b><p>Subversion operations window."
+msgstr "<b>Subversion</b><p>Subversion 操作窗口。"
+
+#: vcs/subversion/subversion_part.cpp:101
+#, fuzzy
+msgid "&Commit to Repository..."
+msgstr "提交到仓库(&C)"
+
+#: vcs/cvsservice/cvspart.cpp:148 vcs/subversion/subversion_part.cpp:102
+msgid "Commit file(s)"
+msgstr "提交文件"
+
+#: vcs/cvsservice/cvspart.cpp:149 vcs/cvsservice/cvspart.cpp:324
+#: vcs/subversion/subversion_part.cpp:103
+#: vcs/subversion/subversion_part.cpp:223
+msgid "<b>Commit file(s)</b><p>Commits file to repository if modified."
+msgstr "<b>提交文件</b><p>将修改过的文件提交到仓库。"
+
+#: vcs/cvsservice/cvspart.cpp:166 vcs/subversion/subversion_part.cpp:110
+msgid "&Add to Repository"
+msgstr "添加到仓库(&A)"
+
+#: vcs/cvsservice/cvspart.cpp:168 vcs/subversion/subversion_part.cpp:111
+msgid "Add file to repository"
+msgstr "将文件添加到仓库"
+
+#: vcs/subversion/subversion_part.cpp:112
+#: vcs/subversion/subversion_part.cpp:225
+msgid "<b>Add file to repository</b><p>Adds file to repository."
+msgstr "<b>添加文件到仓库</b><p>向仓库中添加文件。"
+
+#: vcs/subversion/subversion_part.cpp:114
+#, fuzzy
+msgid "Show logs..."
+msgstr "槽(&L)..."
+
+#: vcs/subversion/subversion_part.cpp:115
+#, fuzzy
+msgid "Blame..."
+msgstr "文件&F)..."
+
+#: vcs/cvsservice/cvspart.cpp:191 vcs/subversion/subversion_part.cpp:117
+msgid "&Remove From Repository"
+msgstr "从仓库中删除(&R)"
+
+#: vcs/cvsservice/cvspart.cpp:193 vcs/perforce/perforcepart.cpp:83
+#: vcs/subversion/subversion_part.cpp:118
+msgid "Remove from repository"
+msgstr "从仓库中删除"
+
+#: vcs/cvsservice/cvspart.cpp:194 vcs/cvsservice/cvspart.cpp:346
+#: vcs/subversion/subversion_part.cpp:119
+#: vcs/subversion/subversion_part.cpp:227
+msgid "<b>Remove from repository</b><p>Removes file(s) from repository."
+msgstr "<b>从仓库中删除</b><p>从仓库中删除文件。"
+
+#: vcs/subversion/subversion_part.cpp:122
+msgid "Update"
+msgstr "更新"
+
+#: vcs/subversion/subversion_part.cpp:123
+#: vcs/subversion/subversion_part.cpp:241
+msgid "<b>Update</b><p>Updates file(s) from repository."
+msgstr "<b>更新</b><p>从仓库中更新文件。"
+
+#: vcs/subversion/subversion_part.cpp:125
+#, fuzzy
+msgid "&Diff to BASE"
+msgstr "和保存的文件的差异"
+
+#: vcs/subversion/subversion_part.cpp:126
+#, fuzzy
+msgid "Diff to BASE"
+msgstr "和保存的文件的差异"
+
+#: vcs/subversion/subversion_part.cpp:127
+msgid "<b>Diff to disk</b><p>Diff current file to the BASE checked out copy."
+msgstr ""
+
+#: vcs/subversion/subversion_part.cpp:129
+msgid "&Diff to HEAD"
+msgstr ""
+
+#: vcs/subversion/subversion_part.cpp:130
+msgid "Diff to HEAD"
+msgstr ""
+
+#: vcs/subversion/subversion_part.cpp:131
+msgid "<b>Diff HEAD</b><p>Diff the current file to HEAD in svn."
+msgstr ""
+
+#: vcs/subversion/subversion_part.cpp:134
+#, fuzzy
+msgid "&Revert"
+msgstr "返转"
+
+#: vcs/perforce/perforcepart.cpp:61 vcs/perforce/perforcepart.cpp:63
+#: vcs/perforce/perforcepart.cpp:102 vcs/perforce/perforcepart.cpp:156
+#: vcs/subversion/subversion_part.cpp:135
+msgid "Revert"
+msgstr "返转"
+
+#: vcs/subversion/subversion_part.cpp:136
+#: vcs/subversion/subversion_part.cpp:243
+#, fuzzy
+msgid "<b>Revert</b><p>Undo local changes."
+msgstr "返转所有修改"
+
+#: vcs/subversion/subversion_part.cpp:149
+#, fuzzy
+msgid "Re&solve Conflicting State"
+msgstr "<b>删除范围</b><p>删除当前选中的范围。"
+
+#: vcs/subversion/subversion_part.cpp:151
+msgid "Resolve the conflicting state of a file after a merge"
+msgstr ""
+
+#: vcs/subversion/subversion_part.cpp:152
 msgid ""
-"The name of a widget must not be null.\n"
-"The name has been reverted to '%1'."
+"<b>Resolve the conflicting state</b>"
+"<p>Remove the conflict state that can be set on a file after a merge failed."
 msgstr ""
 
-#: kdevdesigner/designer/newformimpl.cpp:160
-msgid "Load Template"
-msgstr "装入模板"
+#: vcs/subversion/subversion_part.cpp:153
+msgid "Switch this working copy to URL.."
+msgstr ""
 
-#: kdevdesigner/designer/newformimpl.cpp:161
-msgid "Could not load form description from template '%1'"
+#: vcs/subversion/subversion_part.cpp:156
+msgid "Copy this working copy to URL.."
 msgstr ""
 
-#: kdevdesigner/designer/newformimpl.cpp:252
-msgid "%1 Project"
-msgstr "%1 工程"
+#: vcs/subversion/subversion_part.cpp:158
+#, fuzzy
+msgid "Merge difference to working copy"
+msgstr "和仓库没有任何差别。"
 
-#: kdevdesigner/designer/newformimpl.cpp:260
-msgid "Dialog"
-msgstr "对话框"
+#: vcs/subversion/subversion_part.cpp:229
+msgid "<b>Show logs..</b><p>View Logs"
+msgstr ""
 
-#: kdevdesigner/designer/newformimpl.cpp:267
-msgid "Wizard"
-msgstr "向导"
+#: vcs/subversion/subversion_part.cpp:231
+msgid "<b>Blame 0:HEAD </b><p>Show Annotate"
+msgstr ""
 
-#: kdevdesigner/designer/newformimpl.cpp:272
-msgid "Widget"
-msgstr "部件"
+#: vcs/subversion/subversion_part.cpp:235
+msgid "<b>Diff</b><p>Diff file to local disk."
+msgstr ""
 
-#: kdevdesigner/designer/newformimpl.cpp:277
-msgid "Main Window"
-msgstr "主窗口"
+#: vcs/subversion/subversion_part.cpp:238
+#, fuzzy
+msgid "<b>Diff</b><p>Diff file to repository."
+msgstr "<b>添加到仓库中</b><p>添加文件到仓库中。"
 
-#: kdevdesigner/designer/project.cpp:149
+#: vcs/subversion/subversion_part.cpp:245
+#, fuzzy
+msgid "<b>Resolve</b><p>Resolve conflicting state."
+msgstr "<b>删除范围</b><p>删除当前选中的范围。"
+
+#: vcs/subversion/subversion_part.cpp:247
+msgid "<b>Switch</b><p>Switch working tree."
+msgstr ""
+
+#: vcs/subversion/subversion_part.cpp:249
+msgid "<b>Copy</b><p>Copy from/between path/URLs"
+msgstr ""
+
+#: vcs/subversion/subversion_part.cpp:251
+msgid "<b>Merge</b><p>Merge difference to working copy"
+msgstr ""
+
+#: vcs/subversion/subversion_part.cpp:304
+#: vcs/subversion/subversion_part.cpp:345
+msgid "Please select only one item for subversion switch"
+msgstr ""
+
+#: vcs/subversion/subversion_part.cpp:327
+#, fuzzy
+msgid "The destination URL is invalid"
+msgstr "表达式无效。"
+
+#: vcs/subversion/subversion_part.cpp:337
+msgid "Fail to conduct subversion switch. No action was selected"
+msgstr ""
+
+#: vcs/subversion/subversion_part.cpp:380
+msgid "Please select only one item for subversion merge"
+msgstr ""
+
+#: vcs/subversion/subversion_part.cpp:462
+msgid "Please select only one item for subversion log"
+msgstr ""
+
+#: vcs/subversion/subversion_part.cpp:481
+msgid "Please select only one item to see annotate"
+msgstr ""
+
+#: vcs/subversion/subversion_part.cpp:486
+#, fuzzy
+msgid "Select file to see blame"
+msgstr "选择子工程"
+
+#: vcs/subversion/subversion_part.cpp:504
+#: vcs/subversion/subversion_part.cpp:514
+#, fuzzy
+msgid "Select file or directory to see diff"
+msgstr "选择子工程"
+
+#: vcs/subversion/subversion_widget.cpp:38
+#, fuzzy
+msgid "Notification"
+msgstr "无优化"
+
+#: vcs/subversion/subversion_widget.cpp:63
+#, fuzzy
+msgid "Log History"
+msgstr "目录"
+
+#: vcs/subversion/subversion_widget.cpp:72
+#, fuzzy
+msgid "Blame"
+msgstr "文件&F)..."
+
+#: vcs/subversion/subversion_widget.cpp:121
+#, fuzzy
+msgid "Subversion Job Progress"
+msgstr "Subversion 消息"
+
+#: vcs/subversion/svn_tdeio.cpp:226
+#, c-format
+msgid "Username and Password for %1."
+msgstr ""
+
+#: vcs/subversion/svn_tdeio.cpp:1385
+#, fuzzy
+msgid "Nothing to commit."
+msgstr "“%1”中未装入任何内容"
+
+#: vcs/subversion/svn_tdeio.cpp:1387
+#, fuzzy, c-format
+msgid "Committed revision %1."
+msgstr "注释(&M)："
+
+#: vcs/subversion/svn_tdeio.cpp:1587
+#, fuzzy, c-format
+msgid "Copied Revision %1"
+msgstr "注释(&M)："
+
+#: vcs/subversion/svn_tdeio.cpp:1590
+#, fuzzy
+msgid "Copied"
+msgstr "编译器(&M)"
+
+#: vcs/subversion/svn_tdeio.cpp:1698
 msgid ""
-"Could not connect to the database.\n"
-"Press 'OK' to continue or 'Cancel' to specify different\n"
-"connection information.\n"
+"The certificate from the server could not be trusted automatically.  Do you "
+"want to trust this certificate? "
 msgstr ""
 
-#: kdevdesigner/designer/multilineeditorimpl.cpp:99
-msgid "&Styles"
-msgstr "样式(&S)"
+#: vcs/subversion/svn_tdeio.cpp:1903
+#, fuzzy, c-format
+msgid "A (bin) %1"
+msgstr "在 %1 中显示"
 
-#: kdevdesigner/designer/multilineeditorimpl.cpp:121
-msgid "Typewriter"
+#: vcs/subversion/svn_tdeio.cpp:1905 vcs/subversion/svn_tdeio.cpp:1938
+#, fuzzy, c-format
+msgid "A %1"
+msgstr "添加 %1"
+
+#: vcs/subversion/svn_tdeio.cpp:1908
+msgid "Copied %1 "
 msgstr ""
 
-#: kdevdesigner/designer/multilineeditorimpl.cpp:134
+#: vcs/subversion/svn_tdeio.cpp:1912 vcs/subversion/svn_tdeio.cpp:1934
+#, fuzzy, c-format
+msgid "D %1"
+msgstr "硬件 %1"
+
+#: vcs/subversion/svn_tdeio.cpp:1915
+#, fuzzy, c-format
+msgid "Restored %1."
+msgstr "恢复(&R)"
+
+#: vcs/subversion/svn_tdeio.cpp:1918
+#, fuzzy, c-format
+msgid "Reverted %1."
+msgstr "删除(&M)"
+
+#: vcs/subversion/svn_tdeio.cpp:1921
+msgid ""
+"Failed to revert %1.\n"
+"Try updating instead."
+msgstr ""
+
+#: vcs/subversion/svn_tdeio.cpp:1924
+#, fuzzy, c-format
+msgid "Resolved conflicted state of %1."
+msgstr "<b>删除范围</b><p>删除当前选中的范围。"
+
+#: vcs/subversion/svn_tdeio.cpp:1928
+#, c-format
+msgid "Skipped missing target %1."
+msgstr ""
+
+#: vcs/subversion/svn_tdeio.cpp:1930
+#, c-format
+msgid "Skipped  %1."
+msgstr ""
+
+#: vcs/subversion/svn_tdeio.cpp:1983
+#, c-format
+msgid "Exported external at revision %1."
+msgstr ""
+
+#: vcs/subversion/svn_tdeio.cpp:1985
+#, fuzzy, c-format
+msgid "Exported revision %1."
+msgstr "展开缩写"
+
+#: vcs/subversion/svn_tdeio.cpp:1988
+#, c-format
+msgid "Checked out external at revision %1."
+msgstr ""
+
+#: vcs/subversion/svn_tdeio.cpp:1990
+#, c-format
+msgid "Checked out revision %1."
+msgstr ""
+
+#: vcs/subversion/svn_tdeio.cpp:1994
+#, c-format
+msgid "Updated external to revision %1."
+msgstr ""
+
+#: vcs/subversion/svn_tdeio.cpp:1996
+#, c-format
+msgid "Updated to revision %1."
+msgstr ""
+
+#: vcs/subversion/svn_tdeio.cpp:1999
+#, fuzzy, c-format
+msgid "External at revision %1."
+msgstr "外部库"
+
+#: vcs/subversion/svn_tdeio.cpp:2001
+#, fuzzy, c-format
+msgid "At revision %1."
+msgstr "版本 %1"
+
+#: vcs/subversion/svn_tdeio.cpp:2007
 #, fuzzy
-msgid "Break"
-msgstr "断开(&B)"
+msgid "External export complete."
+msgstr "外部工具"
 
-#: kdevdesigner/designer/multilineeditorimpl.cpp:139
-msgid "Paragraph"
-msgstr "段落"
+#: vcs/subversion/svn_tdeio.cpp:2009
+msgid "Export complete."
+msgstr ""
 
-#: kdevdesigner/designer/multilineeditorimpl.cpp:147
-msgid "Align left"
-msgstr "左对齐"
+#: vcs/subversion/svn_tdeio.cpp:2012
+#, fuzzy
+msgid "External checkout complete."
+msgstr "启用代码补全(&E)"
 
-#: kdevdesigner/designer/multilineeditorimpl.cpp:153
-msgid "Align center"
-msgstr "居中对齐"
+#: vcs/subversion/svn_tdeio.cpp:2014
+#, fuzzy
+msgid "Checkout complete."
+msgstr "提取来源(&F)："
 
-#: kdevdesigner/designer/multilineeditorimpl.cpp:159
-msgid "Align right"
-msgstr "右对齐"
+#: vcs/subversion/svn_tdeio.cpp:2017
+#, fuzzy
+msgid "External update complete."
+msgstr "启用代码补全(&E)"
 
-#: kdevdesigner/designer/multilineeditorimpl.cpp:165
-msgid "Blockquote"
+#: vcs/subversion/svn_tdeio.cpp:2019
+#, fuzzy
+msgid "Update complete."
+msgstr "更新选中的项目"
+
+#: vcs/subversion/svn_tdeio.cpp:2029
+#, fuzzy, c-format
+msgid "Fetching external item into %1."
+msgstr "在外部终端里启动"
+
+#: vcs/subversion/svn_tdeio.cpp:2033
+#, c-format
+msgid "Status against revision: %1."
 msgstr ""
 
-#: kdevdesigner/designer/multilineeditorimpl.cpp:173
-msgid "&Font"
-msgstr "字体(&F)"
+#: vcs/subversion/svn_tdeio.cpp:2036
+#, c-format
+msgid "Performing status on external item at %1."
+msgstr ""
 
-#: kdevdesigner/designer/multilineeditorimpl.cpp:185
-msgid "Fontsize +1"
+#: vcs/subversion/svn_tdeio.cpp:2039
+#, fuzzy, c-format
+msgid "Sending %1"
+msgstr "装入：%1"
+
+#: vcs/subversion/svn_tdeio.cpp:2043
+#, fuzzy, c-format
+msgid "Adding (bin) %1."
+msgstr "添加文件：%1"
+
+#: vcs/subversion/svn_tdeio.cpp:2045
+#, fuzzy, c-format
+msgid "Adding %1."
+msgstr "添加 %1"
+
+#: vcs/subversion/svn_tdeio.cpp:2049
+#, c-format
+msgid "Deleting %1."
 msgstr ""
 
-#: kdevdesigner/designer/multilineeditorimpl.cpp:190
-msgid "Fontsize -1"
+#: vcs/subversion/svn_tdeio.cpp:2052
+#, fuzzy, c-format
+msgid "Replacing %1."
+msgstr "正在读取文件“%1”..."
+
+#: vcs/subversion/svn_tdeio.cpp:2057
+msgid "Transmitting file data "
 msgstr ""
 
-#: kdevdesigner/designer/multilineeditorimpl.cpp:195
+#: vcs/subversion/svn_tdeio.cpp:2065
+#, c-format
+msgid "Blame %1."
+msgstr ""
+
+#: vcs/subversion/kdevsvnd_widgets.cpp:27
+msgid "Accept Permanently"
+msgstr ""
+
+#: vcs/subversion/kdevsvnd_widgets.cpp:28
 #, fuzzy
-msgid "Headline 1"
-msgstr "头文件"
+msgid "Accept Temporarily"
+msgstr " 临时"
 
-#: kdevdesigner/designer/multilineeditorimpl.cpp:200
+#: vcs/subversion/kdevsvnd_widgets.cpp:29
 #, fuzzy
-msgid "Headline 2"
-msgstr "头文件"
+msgid "Reject"
+msgstr "矩形"
 
-#: kdevdesigner/designer/multilineeditorimpl.cpp:205
+#: vcs/subversion/kdevsvnd_widgets.cpp:40
 #, fuzzy
-msgid "Headline 3"
-msgstr "头文件"
+msgid "Hostname"
+msgstr "主机名(&H)："
 
-#: kdevdesigner/designer/multilineeditorimpl.cpp:211
-msgid "O&ptions"
-msgstr "选项(&P)"
+#: vcs/subversion/kdevsvnd_widgets.cpp:41
+msgid "FingerPrint"
+msgstr ""
 
-#: kdevdesigner/designer/multilineeditorimpl.cpp:217
-msgid "Word Wrapping"
-msgstr "文本换行"
+#: vcs/subversion/kdevsvnd_widgets.cpp:42
+msgid "Valid From"
+msgstr ""
 
-#: kdevdesigner/designer/multilineeditorimpl.cpp:279
-msgid "Set the Text of '%1'"
-msgstr "设定“%1”的文本"
+#: vcs/subversion/kdevsvnd_widgets.cpp:43
+msgid "Valid Until"
+msgstr ""
 
-#: kdevdesigner/designer/multilineeditorimpl.cpp:285
-msgid "Set 'wordWrap' of '%2'"
-msgstr "设定 %2 的“wordWrap”"
+#: vcs/subversion/kdevsvnd_widgets.cpp:44
+#, fuzzy
+msgid "Issuer"
+msgstr "用户"
 
-#: kdevdesigner/designer/kdevdesigner_part.cpp:131
-msgid "&Designer Project Settings..."
-msgstr "设计师工程设置(&D)..."
+#: vcs/subversion/kdevsvnd_widgets.cpp:45
+#, fuzzy
+msgid "Cert"
+msgstr "返转"
 
-#: kdevdesigner/designer/kdevdesigner_part.cpp:153
+#: vcs/subversion/subversion_fileinfo.cpp:160
+msgid "Subversion File/Directory Status"
+msgstr ""
+
+#: vcs/subversion/svn_blamewidget.cpp:36
+#: vcs/subversion/svn_logviewwidget.cpp:51
 #, fuzzy
-msgid "Lay Out in &Grid"
-msgstr "垂直展开(&V)"
+msgid "Rev"
+msgstr "红"
 
-#: kdevdesigner/designer/kdevdesigner_part.cpp:161
-msgid "Add Spacer"
-msgstr "添加分隔符"
+#: vcs/subversion/svn_blamewidget.cpp:39
+#, fuzzy
+msgid "Content"
+msgstr "连接"
 
-#: kdevdesigner/designer/kdevdesigner_part.cpp:166
-msgid "Ne&xt Form"
-msgstr "下一个表单(&X)"
+#: vcs/subversion/svn_blamewidget.cpp:91
+#, fuzzy
+msgid "Select one file to view annotation"
+msgstr "选择子工程"
 
-#: kdevdesigner/designer/kdevdesigner_part.cpp:168
-msgid "Pre&vious Form"
-msgstr "上一个表单(&V)"
+#: vcs/subversion/svn_blamewidget.cpp:95
+#, fuzzy
+msgid "files"
+msgstr "打开文件"
 
-#: kdevdesigner/designer/kdevdesigner_part.cpp:172
-msgid "Configure &KDevDesigner..."
-msgstr "配置 &KDevDesigner..."
+#: vcs/subversion/svn_blamewidget.cpp:129
+msgid "Select file from list to view annotation"
+msgstr ""
 
-#: kdevdesigner/designer/kdevdesigner_part.cpp:277
-msgid "KDevDesignerPart"
-msgstr "KDevDesignerPart"
+#: vcs/subversion/svn_logviewwidget.cpp:131
+#, fuzzy
+msgid "Blame this revision"
+msgstr "版本"
 
-#: kdevdesigner/designer/wizardeditorimpl.cpp:83
-msgid "Edit Wizard Pages"
-msgstr "编辑向导页面"
+#: vcs/subversion/svn_logviewwidget.cpp:132
+#, fuzzy
+msgid "Difference to previous revision"
+msgstr "不同版本间的差异(&D)"
 
-#: kdevdesigner/designer/hierarchyview.cpp:630
-#: kdevdesigner/designer/hierarchyview.cpp:637
-#: kdevdesigner/designer/mainwindow.cpp:1805
-#: kdevdesigner/designer/mainwindow.cpp:1824
-#: kdevdesigner/designer/mainwindow.cpp:1844
-#: kdevdesigner/designer/mainwindow.cpp:1884
-#: kdevdesigner/designer/mainwindow.cpp:1945
-#: kdevdesigner/designer/wizardeditorimpl.cpp:133
+#: vcs/subversion/svn_logviewwidget.cpp:138
+#: vcs/subversion/svn_logviewwidget.cpp:181
+msgid "No revision was clicked"
+msgstr ""
+
+#: vcs/subversion/svn_logviewwidget.cpp:138
+#: vcs/subversion/svn_logviewwidget.cpp:181
+#, fuzzy
+msgid "error"
+msgstr "错误"
+
+#: vcs/subversion/subversion_core.cpp:146
+#, fuzzy
+msgid "Subversion Update"
+msgstr "Subversion 消息"
+
+#: vcs/subversion/subversion_core.cpp:222
+msgid "the local disk checked out copy."
+msgstr ""
+
+#: vcs/subversion/subversion_core.cpp:224
+#, fuzzy
+msgid "the current svn HEAD version."
+msgstr "补全当前表达式"
+
+#: vcs/subversion/subversion_core.cpp:226
+#, fuzzy, c-format
+msgid "No differences between the file and %1"
+msgstr "%1 和 %2 的差别"
+
+#: vcs/subversion/subversion_core.cpp:226
+#, fuzzy
+msgid "No difference"
+msgstr "构建差异"
+
+#: vcs/subversion/subversion_core.cpp:266
+#: vcs/subversion/subversion_core.cpp:268
+#, fuzzy
+msgid "Commit to remote repository"
+msgstr "提交到仓库"
+
+#: vcs/subversion/subversion_core.cpp:268
+msgid "From working copy"
+msgstr ""
+
+#: vcs/subversion/subversion_core.cpp:320
+#, fuzzy
+msgid "Subversion Blame"
+msgstr "Subversion 消息"
+
+#: vcs/subversion/subversion_core.cpp:509
+#: vcs/subversion/subversion_core.cpp:538
+#: vcs/subversion/subversion_core.cpp:598
+#: vcs/subversion/subversion_core.cpp:668
+msgid ""
+"If you have just have installed a new version of TDevelop, and the error "
+"message was 'unknown protocol kdevsvn+*', try restarting TDE."
+msgstr ""
+
+#: vcs/subversion/subversion_core.cpp:703
+msgid ""
+"You do not have kompare installed. We recommend you install kompare to view "
+"differences graphically."
+msgstr ""
+
+#: vcs/subversion/subversion_core.cpp:715
+#, fuzzy
+msgid "No subversion differences"
+msgstr "构建差异"
+
+#: vcs/subversion/svn_fileselectdlg_commit.cpp:41
+#, fuzzy
+msgid "Select Files to Commit"
+msgstr "要载入的文件"
+
+#: vcs/subversion/svn_fileselectdlg_commit.cpp:43
+#, fuzzy
+msgid "select"
+msgstr "选择(&S)"
+
+#: vcs/subversion/svn_fileselectdlg_commit.cpp:44
+#, fuzzy
+msgid "status"
+msgstr "状态"
+
+#: vcs/subversion/svn_fileselectdlg_commit.cpp:45
+msgid "URL to commit"
+msgstr ""
+
+#: vcs/subversion/svn_fileselectdlg_commit.cpp:119
+msgid "No added/modified/deleted file(s) to commit"
+msgstr ""
+
+#: vcs/subversion/integrator/svnintegratordlg.cpp:73
+#, fuzzy
+msgid "Unable to create project directories on repository"
+msgstr "工程目录的文件树视图"
+
+#: vcs/subversion/integrator/svnintegratordlg.cpp:84
+#, fuzzy
+msgid "Unable to import into repository."
+msgstr "提交到仓库"
+
+#: vcs/subversion/integrator/svnintegratordlg.cpp:106
+#, fuzzy
+msgid "Unable to checkout from repository."
+msgstr "从仓库中删除"
+
+#: vcs/perforce/commitdlg.cpp:32
+msgid "Perforce Submit"
+msgstr "Perforce 提交"
+
+#: vcs/perforce/commitdlg.cpp:42
+msgid "&Enter description:"
+msgstr "输入描述(&E)："
+
+#: vcs/perforce/commitdlg.cpp:54
+msgid "C&lient:"
+msgstr "客户(&L)："
+
+#: vcs/perforce/commitdlg.cpp:58
+msgid "&User:"
+msgstr "用户(&U)："
+
+#: vcs/perforce/commitdlg.cpp:62
+msgid "&File(s):"
+msgstr "文件(&F)："
+
+#: vcs/perforce/commitdlg.cpp:147
+msgid "Please enter the P4 client name."
+msgstr "请输入 P4 客户名。"
+
+#: vcs/perforce/commitdlg.cpp:151
+msgid "Please enter the P4 user."
+msgstr "请输入 P4 用户。"
+
+#: vcs/perforce/commitdlg.cpp:155
+#, fuzzy
+msgid "The changelist does not contain any files."
+msgstr "变更列表未包括任何文件。"
+
+#: vcs/perforce/perforcepart.cpp:60 vcs/perforce/perforcepart.cpp:101
+msgid "<b>Edit</b><p>Opens file(s) in a client workspace for edit."
+msgstr "<b>编辑</b><p>在客户工作区打开文件进行编辑。"
+
+#: vcs/perforce/perforcepart.cpp:64 vcs/perforce/perforcepart.cpp:104
+msgid "<b>Revert</b><p>Discards changes made to open files."
+msgstr "<b>返转</b><p>放弃对打开的文件所作的修改。"
+
+#: vcs/perforce/perforcepart.cpp:65 vcs/perforce/perforcepart.cpp:67
+#: vcs/perforce/perforcepart.cpp:105
+msgid "Submit"
+msgstr "提交"
+
+#: vcs/perforce/perforcepart.cpp:68 vcs/perforce/perforcepart.cpp:107
+msgid "<b>Submit</b><p>Sends changes made to open files to the depot."
+msgstr "<b>提交</b><p>将打开的文件所作的修改发送给仓库。"
+
+#: vcs/perforce/perforcepart.cpp:69 vcs/perforce/perforcepart.cpp:71
+#: vcs/perforce/perforcepart.cpp:108
+msgid "Sync"
+msgstr "同步"
+
+#: vcs/perforce/perforcepart.cpp:72 vcs/perforce/perforcepart.cpp:110
+msgid "<b>Sync</b><p>Copies files from the depot into the workspace."
+msgstr "<b>同步</b><p>从仓库复制文件到工作区。"
+
+#: vcs/perforce/perforcepart.cpp:73 vcs/perforce/perforcepart.cpp:112
+msgid "Diff Against Repository"
+msgstr "和仓库作比较"
+
+#: vcs/perforce/perforcepart.cpp:75
+msgid "Diff against repository"
+msgstr "和仓库作比较"
+
+#: vcs/perforce/perforcepart.cpp:76 vcs/perforce/perforcepart.cpp:114
+msgid ""
+"<b>Diff against repository</b>"
+"<p>Compares a client workspace file to a revision in the depot."
+msgstr "<b>和仓库作比较</b><p>对客户工作区的文件和仓库里的某一版本作比较。"
+
+#: vcs/perforce/perforcepart.cpp:77 vcs/perforce/perforcepart.cpp:115
+msgid "Add to Repository"
+msgstr "添加到仓库"
+
+#: vcs/perforce/perforcepart.cpp:79
+msgid "Add to repository"
+msgstr "添加到仓库"
+
+#: vcs/perforce/perforcepart.cpp:80 vcs/perforce/perforcepart.cpp:117
+msgid ""
+"<b>Add to repository</b>"
+"<p>Open file(s) in a client workspace for addition to the depot."
+msgstr "<b>添加到仓库</b><p>在客户工作区打开文件，添加到仓库。"
+
+#: vcs/perforce/perforcepart.cpp:81 vcs/perforce/perforcepart.cpp:118
+msgid "Remove From Repository"
+msgstr "从仓库中删除"
+
+#: vcs/perforce/perforcepart.cpp:84 vcs/perforce/perforcepart.cpp:120
+msgid ""
+"<b>Remove from repository</b>"
+"<p>Open file(s) in a client workspace for deletion from the depot."
+msgstr "<b>从仓库中删除</b><p>在客户工作区打开文件，从仓库中删除。"
+
+#: vcs/perforce/perforcepart.cpp:121
+msgid "Perforce"
+msgstr "Perforce"
+
+#: vcs/perforce/perforcepart.cpp:132
+msgid "Cannot handle directories, please select single files"
+msgstr "无法处理目录，请选择单个文件"
+
+#: vcs/perforce/perforcepart.cpp:155
+msgid "Do you really want to revert the file %1 and lose all your changes?"
+msgstr "您真要将文件 %1 返转并丢失您所有的改变吗？"
+
+#: vcs/perforce/perforcepart.cpp:156
+#, fuzzy
+msgid "Do Not Revert"
+msgstr "返转"
+
+#: vcs/perforce/perforcepart.cpp:168
+msgid "Submitting of subdirectories is not supported"
+msgstr "不支持提交子目录。"
+
+#: vcs/perforce/perforcepart.cpp:258
+#, fuzzy
+msgid "P4 output errors during diff."
+msgstr "P4 在作比较时输出错误。"
+
+#: vcs/perforce/perforcepart.cpp:263
+#, fuzzy
+msgid "P4 output errors during diff. Do you still want to continue?"
+msgstr "P4 在作比较时输出错误。您仍然要继续吗？"
+
+#: vcs/perforce/perforcepart.cpp:270
+msgid "No Differences Found"
+msgstr "未发现差别"
+
+#: vcs/cvsservice/cvslogpage.cpp:116 vcs/cvsservice/editorsdialog.cpp:64
 #, c-format
-msgid "Add Page to %1"
-msgstr "向 %1 添加页面"
+msgid "Log failed with exitStatus == %1"
+msgstr "日志失败，状态 %1"
 
-#: kdevdesigner/designer/hierarchyview.cpp:656
-#: kdevdesigner/designer/hierarchyview.cpp:667
-#: kdevdesigner/designer/mainwindow.cpp:1813
-#: kdevdesigner/designer/mainwindow.cpp:1832
-#: kdevdesigner/designer/mainwindow.cpp:1851
-#: kdevdesigner/designer/mainwindow.cpp:1894
-#: kdevdesigner/designer/mainwindow.cpp:1953
-#: kdevdesigner/designer/wizardeditorimpl.cpp:151
-msgid "Delete Page %1 of %2"
+#: vcs/cvsservice/cvslogpage.cpp:116 vcs/cvsservice/editorsdialog.cpp:64
+msgid "Log Failed"
+msgstr "日志失败"
+
+#: vcs/cvsservice/editorsdialog.cpp:87 vcs/cvsservice/editorsdialog.cpp:100
+msgid "User"
+msgstr "用户"
+
+#: vcs/cvsservice/editorsdialog.cpp:109
+msgid "No files from your query are marked as being edited."
 msgstr ""
 
-#: kdevdesigner/designer/wizardeditorimpl.cpp:172
-#: kdevdesigner/designer/wizardeditorimpl.cpp:192
-msgid "Swap Pages %1 and %2 of %3"
+#: vcs/cvsservice/cvslogpage.cpp:180
+#, fuzzy
+msgid "invalid link clicked"
+msgstr " (无效)"
+
+#: vcs/cvsservice/commitdlg.cpp:67
+msgid ""
+"You are committing your changes without any comment. This is not a good "
+"practice. Continue anyway?"
+msgstr "您提交变更时没有给出任何注解。这不是一个好做法。您仍然要继续吗？"
+
+#: vcs/cvsservice/commitdlg.cpp:68
+msgid "CVS Commit Warning"
+msgstr "CVS 提交警告"
+
+#: vcs/cvsservice/commitdlg.cpp:70
+msgid "askWhenCommittingEmptyLogs"
+msgstr "无注解提交时询问"
+
+#: vcs/cvsservice/cvslogdialog.cpp:36
+msgid "CVS Log & Diff Dialog"
+msgstr "CVS 日志和差别对话框"
+
+#: vcs/cvsservice/cvslogdialog.cpp:42
+msgid "Log From CVS"
+msgstr "从 CVS 提取日志"
+
+#: vcs/cvsservice/cvslogdialog.cpp:82
+msgid "Diff between %1 and %2"
+msgstr "%1 和 %2 的差别"
+
+#: vcs/cvsservice/cvsdiffpage.cpp:68
+msgid "Error: passed revisions are empty!"
+msgstr "错误：给出的版本号为空！"
+
+#: vcs/cvsservice/cvsdiffpage.cpp:68 vcs/cvsservice/cvsdiffpage.cpp:101
+#: vcs/cvsservice/cvspartimpl.cpp:654
+msgid "Error During Diff"
+msgstr "比较时出错"
+
+#: vcs/cvsservice/cvsdiffpage.cpp:101
+#, fuzzy
+msgid "An error occurred during diffing."
+msgstr "作比较时发生错误。"
+
+#: vcs/cvsservice/cvsprocesswidget.cpp:145
+#, fuzzy, c-format
+msgid "Started job: %1"
+msgstr "已开始的任务："
+
+#: vcs/cvsservice/cvsprocesswidget.cpp:167
+msgid "*** Job canceled by user request ***"
+msgstr "*** 任务已按用户请求取消 ***"
+
+#: vcs/cvsservice/cvsprocesswidget.cpp:189
+#, c-format
+msgid "Job finished with exitCode == %1"
+msgstr "任务完成，状态为 %1"
+
+#: vcs/cvsservice/cvsprocesswidget.cpp:193
+msgid "Done CVS command ..."
+msgstr "CVS 命令完成..."
+
+#: vcs/cvsservice/annotatedialog.cpp:27
+msgid "CVS Annotate Dialog"
+msgstr "CVS 批注对话框"
+
+#: vcs/cvsservice/annotatedialog.cpp:33 vcs/cvsservice/annotatedialog.cpp:60
+msgid "Annotate"
+msgstr "批注"
+
+#: vcs/cvsservice/annotatepage.cpp:109
+#, fuzzy, c-format
+msgid "Annotate failed with exitStatus == %1"
+msgstr "日志失败，状态 %1"
+
+#: vcs/cvsservice/annotatepage.cpp:109
+#, fuzzy
+msgid "Annotate Failed"
+msgstr "日志失败"
+
+#: vcs/cvsservice/annotatepage.cpp:211
+#, fuzzy
+msgid "The selected revision does not exist."
+msgstr "这个扩展名的文件模板不存在。"
+
+#: vcs/cvsservice/cvspartimpl.cpp:127
+msgid ""
+"Open a project first.\n"
+"Operation will be aborted."
 msgstr ""
+"请先打开一个工程。\n"
+"操作将中止。"
 
-#: kdevdesigner/designer/mainwindow.cpp:1971
-#: kdevdesigner/designer/wizardeditorimpl.cpp:220
-msgid "Rename page %1 of %2"
+#: vcs/cvsservice/cvspartimpl.cpp:134
+msgid ""
+"Another CVS operation is executing: do you want to cancel it \n"
+"and start this new one?"
+msgstr "另一个 CVS 操作正在进行：您是否要取消它，开始新的操作？"
+
+#: vcs/cvsservice/cvspartimpl.cpp:136
+#, fuzzy
+msgid "CVS: Operation Already Pending "
+msgstr "CVS：操作已在进行 "
+
+#: vcs/cvsservice/cvspartimpl.cpp:151
+#, fuzzy
+msgid "None of the file(s) you selected seem to be valid for repository."
+msgstr "您选择的文件没有哪个在仓库中是有效的。"
+
+#: vcs/cvsservice/cvspartimpl.cpp:370
+msgid "Unable to checkout"
+msgstr "无法提取文件"
+
+#: vcs/cvsservice/cvspartimpl.cpp:519
+#, fuzzy
+msgid "Do you really want to unedit the selected files?"
+msgstr "您真要删除子工程 %1 及所有目标和文件吗？"
+
+#: vcs/cvsservice/cvspartimpl.cpp:520
+#, fuzzy
+msgid "CVS - Unedit Files"
+msgstr "UI 文件(&U)："
+
+#: vcs/cvsservice/cvspartimpl.cpp:521
+#, fuzzy
+msgid "Unedit"
+msgstr "无设置"
+
+#: vcs/cvsservice/cvspartimpl.cpp:522
+msgid "Do Not Unedit"
 msgstr ""
 
-#: kdevdesigner/designer/wizardeditorimpl.cpp:251
-msgid "Move Page %1 to %2 in %3"
+#: vcs/cvsservice/cvspartimpl.cpp:653
+#, fuzzy
+msgid "Sorry, cannot diff."
+msgstr "抱歉，无法比较差别！"
+
+#: vcs/cvsservice/cvspartimpl.cpp:674
+msgid "Creating Tag/Branch for files ..."
+msgstr "正在为文件创建标签/分支..."
+
+#: vcs/cvsservice/cvspartimpl.cpp:698
+#, fuzzy
+msgid "Removing Tag from files ..."
+msgstr "正在为文件删除标签/分支..."
+
+#: vcs/cvsservice/cvspartimpl.cpp:791
+#: vcs/cvsservice/integrator/integratordlg.cpp:101
+msgid ""
+"Unable to find the Cervisia KPart. \n"
+"Cervisia Integration will not be available. Please check your\n"
+"Cervisia installation and re-try. Reason was:\n"
 msgstr ""
+"无法找到 Cervisia KPart 组件。\n"
+"Cervisia 集成功能将无法使用，请检查您的 Cervisia 安装，\n"
+"然后重试。原因是：\n"
 
-#: kdevdesigner/designer/editfunctionsimpl.cpp:135
-msgid "Add/Remove functions of '%1'"
-msgstr "添加/删除“%1”的函数"
+#: vcs/cvsservice/cvspartimpl.cpp:839
+#, fuzzy
+msgid "Do you want the files to be added to CVS repository too?"
+msgstr "您是否要将它们添加到 CVS 仓库中？"
 
-#: kdevdesigner/designer/editfunctionsimpl.cpp:150
-#: kdevdesigner/designer/hierarchyview.cpp:1144
-msgid "Remove Function"
-msgstr "删除函数"
+#: vcs/cvsservice/cvspartimpl.cpp:840
+msgid "CVS - New Files Added to Project"
+msgstr "CVS - 新文件已添加到工程中"
 
-#: kdevdesigner/designer/editfunctionsimpl.cpp:206
-msgid "Change Function Attributes"
-msgstr "更改函数属性"
+#: vcs/cvsservice/cvspartimpl.cpp:842
+msgid "Do Not Add"
+msgstr "不添加"
 
-#: kdevdesigner/designer/editfunctionsimpl.cpp:217
+#: vcs/cvsservice/cvspartimpl.cpp:843
+msgid "askWhenAddingNewFiles"
+msgstr "添加新文件时询问"
+
+#: vcs/cvsservice/cvspartimpl.cpp:865
+#, fuzzy
 msgid ""
-"Some syntactically incorrect functions have been defined.\n"
-"Remove these functions?"
+"Do you want them to be removed from CVS repository too?\n"
+"Warning: They will be removed from disk too."
 msgstr ""
+"您想要将它们从 CVS 仓库中删除吗？\n"
+"警告：它们也将从硬盘上删除！"
 
-#: kdevdesigner/designer/formwindow.cpp:840
-#: kdevdesigner/designer/formwindow.cpp:1329
-#: kdevdesigner/designer/formwindow.cpp:1341
-#: kdevdesigner/designer/sizehandle.cpp:216
-msgid "%1/%2"
-msgstr "%1/%2"
+#: vcs/cvsservice/cvspartimpl.cpp:866
+msgid "CVS - Files Removed From Project"
+msgstr "CVS - 文件已从工程中删除"
 
-#: kdevdesigner/designer/sizehandle.cpp:235
-msgid "Resize"
-msgstr "更改大小"
+#: vcs/cvsservice/cvspartimpl.cpp:868
+msgid "askWhenRemovingFiles"
+msgstr "删除文件时询问"
 
-#: kdevdesigner/designer/actionlistview.cpp:95
-msgid "&Connect Action..."
-msgstr "连接动作(&C)..."
+#: vcs/cvsservice/cvspartimpl.cpp:934
+msgid "Operation aborted (process killed)."
+msgstr "操作已中止(进程被杀死)。"
 
-#: kdevdesigner/designer/actionlistview.cpp:97
-msgid "Delete Action"
-msgstr "删除动作"
+#: vcs/cvsservice/cvspartimpl.cpp:935
+msgid "CVS Diff"
+msgstr "CVS 比较"
 
-#: kdevdesigner/designer/workspace.cpp:598
-msgid "&Open Source File"
-msgstr "打开源文件(&O)"
+#: vcs/cvsservice/cvspartimpl.cpp:940
+msgid "CVS outputted errors during diff."
+msgstr "CVS 在比较时输出错误。"
 
-#: kdevdesigner/designer/workspace.cpp:601
-msgid "&Remove Source File From Project"
-msgstr "从工程中删除源文件(&R)"
+#: vcs/cvsservice/cvspartimpl.cpp:948
+#, fuzzy
+msgid "CVS output errors during diff. Do you still want to continue?"
+msgstr "CVS 在比较时输出错误。您仍然要继续吗？"
 
-#: kdevdesigner/designer/workspace.cpp:604
-msgid "&Open Form"
-msgstr "打开表单(&O)"
+#: vcs/cvsservice/cvsoptions.cpp:286
+msgid "Error while guessing repository location."
+msgstr ""
 
-#: kdevdesigner/designer/workspace.cpp:607
-#: kdevdesigner/designer/workspace.cpp:617
-msgid "&Remove Form From Project"
-msgstr "从工程中删除表单(&R)"
+#: vcs/cvsservice/checkoutdialog.cpp:73
+msgid "CVS Checkout"
+msgstr "CVS 提取"
 
-#: kdevdesigner/designer/workspace.cpp:610
-msgid "&Open Form Source"
-msgstr "打开表单源代码(&O)"
+#: vcs/cvsservice/checkoutdialog.cpp:263
+#, fuzzy
+msgid "Please, choose a valid working directory"
+msgstr "请选择一个工程目录"
 
-#: kdevdesigner/designer/workspace.cpp:614
-msgid "&Remove Source File From Form"
-msgstr "从表单中删除源文件(&R)"
+#: vcs/cvsservice/checkoutdialog.cpp:265
+msgid "Please, choose a CVS server."
+msgstr ""
 
-#: kdevdesigner/designer/workspace.cpp:623
-msgid "&Open Source"
-msgstr "打开源文件(&O)"
+#: vcs/cvsservice/checkoutdialog.cpp:267
+msgid "Please, fill the CVS module field."
+msgstr ""
 
-#: kdevdesigner/designer/variabledialogimpl.cpp:104
+#: vcs/cvsservice/cvspart.cpp:133
 msgid ""
-"One variable has been declared twice.\n"
-"Remove this variable?"
+"<b>CVS</b>"
+"<p>Concurrent Versions System operations window. Shows output of Cervisia CVS "
+"Service."
+msgstr "<b>CVS</b><p>并行版本控制系统操作窗口，显示 Cervisia CVS 服务的输出。"
+
+#: vcs/cvsservice/cvspart.cpp:134
+#, fuzzy
+msgid "CvsService Output"
+msgstr "CVS 服务"
+
+#: vcs/cvsservice/cvspart.cpp:135 vcs/cvsservice/cvspart.cpp:279
+#: vcs/cvsservice/cvspart.cpp:365
+msgid "CvsService"
+msgstr "CVS 服务"
+
+#: vcs/cvsservice/cvspart.cpp:135
+msgid "cvs output"
+msgstr "CVS 输出"
+
+#: vcs/cvsservice/cvspart.cpp:146
+msgid "&Commit to Repository"
+msgstr "提交到仓库(&C)"
+
+#: vcs/cvsservice/cvspart.cpp:151
+msgid "&Difference Between Revisions"
+msgstr "不同版本间的差异(&D)"
+
+#: vcs/cvsservice/cvspart.cpp:153
+msgid "Build difference"
+msgstr "构建差异"
+
+#: vcs/cvsservice/cvspart.cpp:154 vcs/cvsservice/cvspart.cpp:329
+msgid "<b>Build difference</b><p>Builds difference between releases."
+msgstr "<b>构建差异</b><p>构建不同版本之间的差异。"
+
+#: vcs/cvsservice/cvspart.cpp:156
+msgid "Generate &Log"
+msgstr "生成日志(&L)"
+
+#: vcs/cvsservice/cvspart.cpp:158
+msgid "Generate log"
+msgstr "生成日志"
+
+#: vcs/cvsservice/cvspart.cpp:159 vcs/cvsservice/cvspart.cpp:331
+msgid "<b>Generate log</b><p>Produces log for this file."
+msgstr "<b>生成日志</b><p>生成此文件的日志。"
+
+#: vcs/cvsservice/cvspart.cpp:161
+msgid "&Annotate"
+msgstr "批注(&A)"
+
+#: vcs/cvsservice/cvspart.cpp:163
+msgid "Generate annotations"
+msgstr "生成批注"
+
+#: vcs/cvsservice/cvspart.cpp:164
+#, fuzzy
+msgid "<b>Annotate</b><p>Produces annotations for this file."
+msgstr "<b>生成日志</b><p>生成此文件的日志。"
+
+#: vcs/cvsservice/cvspart.cpp:169 vcs/cvsservice/cvspart.cpp:342
+msgid "<b>Add to repository</b><p>Adds file to repository."
+msgstr "<b>添加到仓库中</b><p>添加文件到仓库中。"
+
+#: vcs/cvsservice/cvspart.cpp:171
+msgid "&Edit Files"
+msgstr "编辑文件(&E)"
+
+#: vcs/cvsservice/cvspart.cpp:173
+msgid "Mark as being edited"
 msgstr ""
 
-#: kdevdesigner/designer/outputwindow.cpp:80
-msgid "Warnings/Errors"
-msgstr "警告/错误"
+#: vcs/cvsservice/cvspart.cpp:174
+msgid "<b>Mark as being edited</b><p>Mark the files as being edited."
+msgstr ""
 
-#: kdevdesigner/designer/connectiontable.cpp:38
-msgid "Sender"
-msgstr "发送器"
+#: vcs/cvsservice/cvspart.cpp:176
+#, fuzzy
+msgid "&Unedit Files"
+msgstr "UI 文件(&U)："
 
-#: kdevdesigner/designer/connectiontable.cpp:40
-msgid "Receiver"
-msgstr "接收器"
+#: vcs/cvsservice/cvspart.cpp:178
+#, fuzzy
+msgid "Remove editing mark from files"
+msgstr "正在为文件删除标签/分支..."
 
-#: kdevdesigner/designer/actiondnd.cpp:349
-#: kdevdesigner/designer/actiondnd.cpp:402
-msgid "Delete Toolbar"
-msgstr "删除工具栏"
+#: vcs/cvsservice/cvspart.cpp:179 vcs/cvsservice/cvspart.cpp:340
+#, fuzzy
+msgid "<b>Remove editing mark</b><p>Remove the editing mark from the files."
+msgstr "<b>删除粘滞标志</b><p>删除文件上的粘滞标志。"
 
-#: kdevdesigner/designer/actiondnd.cpp:352
-#: kdevdesigner/designer/actiondnd.cpp:432
-msgid "Delete Toolbar '%1'"
-msgstr "删除工具栏“%1”"
+#: vcs/cvsservice/cvspart.cpp:181
+msgid "&Show Editors"
+msgstr "显示编辑器(&S)"
 
-#: kdevdesigner/designer/actiondnd.cpp:397
-msgid "Delete Separator"
-msgstr "删除分隔符"
+#: vcs/cvsservice/cvspart.cpp:183
+#, fuzzy
+msgid "Show editors"
+msgstr "显示方法"
 
-#: kdevdesigner/designer/actiondnd.cpp:400
-msgid "Insert Separator"
-msgstr "插入分隔符"
+#: vcs/cvsservice/cvspart.cpp:184 vcs/cvsservice/cvspart.cpp:336
+#, fuzzy
+msgid "<b>Show editors</b><p>Shows the list of users who are editing files."
+msgstr "<b>全部关闭</b><p>关闭所有文件。"
 
-#: kdevdesigner/designer/actiondnd.cpp:411
-#: kdevdesigner/designer/actiondnd.cpp:466
-#: kdevdesigner/designer/actiondnd.cpp:489
-msgid "Delete Action '%1' From Toolbar '%2'"
-msgstr "将动作“%1”从工具栏“%2”删除"
+#: vcs/cvsservice/cvspart.cpp:186
+msgid "Add to Repository as &Binary"
+msgstr "作为二进制文件添加到仓库中(&B)"
 
-#: kdevdesigner/designer/actiondnd.cpp:426
-msgid "Add Separator to Toolbar '%1'"
-msgstr "向工具栏“%1”添加分隔符"
+#: vcs/cvsservice/cvspart.cpp:188
+msgid "Add file to repository as binary"
+msgstr "作为二进制文件添加到仓库中"
 
-#: kdevdesigner/designer/actiondnd.cpp:506
-#: kdevdesigner/designer/actiondnd.cpp:573
-msgid "Add Action '%1' to Toolbar '%2'"
-msgstr "将动作“%1”添加到工具栏“%2”"
+#: vcs/cvsservice/cvspart.cpp:189 vcs/cvsservice/cvspart.cpp:344
+msgid ""
+"<b>Add to repository as binary</b>"
+"<p>Adds file to repository as binary (-kb option)."
+msgstr "<b>作为二进制文件添加到仓库中</b><p>作为二进制文件添加到仓库中(-kb 选项)。"
 
-#: kdevdesigner/designer/actiondnd.cpp:566
-msgid "Insert/Move Action"
-msgstr "插入/移动动作"
+#: vcs/cvsservice/cvspart.cpp:196
+msgid "&Update/Revert to Another Release"
+msgstr "更新/返转为另一个版本(&U)"
 
-#: kdevdesigner/designer/actiondnd.cpp:567
+#: vcs/cvsservice/cvspart.cpp:198
+msgid "Update/revert"
+msgstr "更新/返转"
+
+#: vcs/cvsservice/cvspart.cpp:199 vcs/cvsservice/cvspart.cpp:354
 msgid ""
-"Action '%1' has already been added to this toolbar.\n"
-"An Action may only occur once in a given toolbar."
+"<b>Update/revert to another release</b>"
+"<p>Updates/reverts file(s) to another release."
+msgstr "<b>更新/返转为另一个版本</b><p>将文件更新/返转为另一个版本。"
+
+#: vcs/cvsservice/cvspart.cpp:201
+msgid "R&emove Sticky Flag"
+msgstr "删除粘滞标志(&E)"
+
+#: vcs/cvsservice/cvspart.cpp:203
+msgid "Remove sticky flag"
+msgstr "删除粘滞标志"
+
+#: vcs/cvsservice/cvspart.cpp:204 vcs/cvsservice/cvspart.cpp:356
+msgid "<b>Remove sticky flag</b><p>Removes sticky flag from file(s)."
+msgstr "<b>删除粘滞标志</b><p>删除文件上的粘滞标志。"
+
+#: vcs/cvsservice/cvspart.cpp:206
+msgid "Make &Tag/Branch"
+msgstr "制作标签/分支(&T)"
+
+#: vcs/cvsservice/cvspart.cpp:208
+msgid "Make tag/branch"
+msgstr "加标签/分支"
+
+#: vcs/cvsservice/cvspart.cpp:209 vcs/cvsservice/cvspart.cpp:350
+msgid "<b>Make tag/branch</b><p>Tags/branches selected file(s)."
+msgstr "<b>加标签/分支</b><p>对所选择的文件加标签/分支。"
+
+#: vcs/cvsservice/cvspart.cpp:211
+#, fuzzy
+msgid "&Delete Tag"
+msgstr "删除页面"
+
+#: vcs/cvsservice/cvspart.cpp:213
+#, fuzzy
+msgid "Delete tag"
+msgstr "删除页面"
+
+#: vcs/cvsservice/cvspart.cpp:214 vcs/cvsservice/cvspart.cpp:352
+#, fuzzy
+msgid "<b>Delete tag</b><p>Delete tag from selected file(s)."
+msgstr "<b>删除标签/分支</b><p>对所选择的文件删除标签/分支。"
+
+#: vcs/cvsservice/cvspart.cpp:216
+msgid "&Ignore in CVS Operations"
+msgstr "在 CVS 操作中忽略(&I)"
+
+#: vcs/cvsservice/cvspart.cpp:218
+msgid "Ignore in CVS operations"
+msgstr "在 CVS 操作中忽略"
+
+#: vcs/cvsservice/cvspart.cpp:219 vcs/cvsservice/cvspart.cpp:360
+msgid ""
+"<b>Ignore in CVS operations</b>"
+"<p>Ignore file(s) by adding it to .cvsignore file."
+msgstr "<b>在 CVS 操作中忽略</b><p>将文件名放入 .cvsignore 文件，CVS 操作将忽略它们。"
+
+#: vcs/cvsservice/cvspart.cpp:221
+msgid "Do &Not Ignore in CVS Operations"
+msgstr "不在 CVS 操作中忽略(&N)"
+
+#: vcs/cvsservice/cvspart.cpp:223
+msgid "Do not ignore in CVS operations"
+msgstr "不在 CVS 操作中忽略"
+
+#: vcs/cvsservice/cvspart.cpp:224 vcs/cvsservice/cvspart.cpp:362
+msgid ""
+"<b>Do not ignore in CVS operations</b>"
+"<p>Do not ignore file(s) by removing\n"
+"it from .cvsignore file."
+msgstr "<b>不在 CVS 操作中忽略</b><p>将文件名从 .cvsignore 文件中删除，CVS 操作将不再忽略它们。"
+
+#: vcs/cvsservice/cvspart.cpp:226
+msgid "&Log to Server"
+msgstr "登录到服务器(&L)"
+
+#: vcs/cvsservice/cvspart.cpp:228
+msgid "Login to server"
+msgstr "登录到服务器"
+
+#: vcs/cvsservice/cvspart.cpp:229
+msgid "<b>Login to server</b><p>Logs in to the CVS server."
+msgstr "<b>登录到服务器</b><p>登录到 CVS 服务器。"
+
+#: vcs/cvsservice/cvspart.cpp:231
+msgid "L&ogout From Server"
+msgstr "退出服务器(&O)"
+
+#: vcs/cvsservice/cvspart.cpp:233
+msgid "Logout from server"
+msgstr "退出服务器"
+
+#: vcs/cvsservice/cvspart.cpp:234
+msgid "<b>Logout from server</b><p>Logs out from the CVS server."
+msgstr "<b>退出服务器</b><p>从 CVS 服务器退出。"
+
+#: vcs/cvsservice/cvspart.cpp:333
+#, fuzzy
+msgid "<b>Generate Annotate</b><p>Produces annotation output for this file."
+msgstr "<b>生成日志</b><p>生成此文件的日志。"
+
+#: vcs/cvsservice/cvspart.cpp:338
+msgid "<b>Mark as beeing edited</b><p>Mark the files as beeing edited."
 msgstr ""
 
-#: kdevdesigner/designer/actiondnd.cpp:699
-msgid "Add Widget '%1' to Toolbar '%2'"
-msgstr "将部件“%1”添加到工具栏“%2”"
+#: vcs/cvsservice/integrator/integratordlg.cpp:62
+#: vcs/cvsservice/integrator/integratordlg.cpp:82
+#: vcs/cvsservice/integrator/integratordlg.cpp:84
+#: vcs/cvsservice/integrator/integratordlg.cpp:129
+#: vcs/cvsservice/integrator/integratordlg.cpp:131
+#, fuzzy
+msgid "Init CVS Repository"
+msgstr "CVS 仓库(&R)："
 
-#: kdevdesigner/designer/hierarchyview.cpp:753
-msgid "Class Variables"
-msgstr "类变量"
+#: vcs/cvsservice/integrator/integratordlg.cpp:82
+msgid ""
+"cvs init did not exit normally. Please check if cvs is installed and works "
+"correctly."
+msgstr ""
 
-#: kdevdesigner/designer/hierarchyview.cpp:835
-msgid "Functions"
-msgstr "函数"
+#: vcs/cvsservice/integrator/integratordlg.cpp:84
+msgid ""
+"cvs init exited with status %1. Please check if the cvs location is correct."
+msgstr ""
 
-#: kdevdesigner/designer/hierarchyview.cpp:1052
-msgid "New..."
-msgstr "新建..."
+#: vcs/cvsservice/integrator/integratordlg.cpp:129
+msgid ""
+"cvs import did not exit normally. Please check if cvs is installed and works "
+"correctly."
+msgstr ""
 
-#: kdevdesigner/designer/hierarchyview.cpp:1061
-msgid "Goto Implementation"
-msgstr "转到实现"
+#: vcs/cvsservice/integrator/integratordlg.cpp:131
+msgid ""
+"cvs import exited with status %1. Please check if the cvs location is correct."
+msgstr ""
 
-#: kdevdesigner/designer/hierarchyview.cpp:1151
-msgid "Remove Variable"
-msgstr "删除变量"
+#: lib/cppparser/errors.cpp:23
+msgid "Internal Error"
+msgstr "内部错误"
 
-#: kdevdesigner/designer/hierarchyview.cpp:1202
-msgid "This variable has already been declared."
-msgstr "此变量已经声明过。"
+#: lib/cppparser/errors.cpp:24
+msgid "Syntax Error before '%1'"
+msgstr "在“%1”之前语法错误"
 
-#: kdevdesigner/designer/hierarchyview.cpp:1230
-msgid "Add Variable"
-msgstr "添加变量"
+#: lib/cppparser/errors.cpp:25
+msgid "Parse Error before '%1'"
+msgstr "在“%1”之前发生分析错误"
 
-#: kdevdesigner/designer/hierarchyview.cpp:1247
-msgid "Objects"
-msgstr "对象"
+#: lib/cppparser/driver.cpp:386
+#, fuzzy, c-format
+msgid "Could not find include file %1"
+msgstr "无法找到插件"
 
-#: kdevdesigner/designer/hierarchyview.cpp:1248
+#: lib/cppparser/parser.cpp:140
+msgid "<eof>"
+msgstr "<文件结尾>"
+
+#: lib/cppparser/parser.cpp:321 lib/cppparser/parser.cpp:2699
+#: lib/cppparser/parser.cpp:2923 lib/cppparser/parser.cpp:2929
+msgid "expression expected"
+msgstr "此处需要表达式"
+
+#: lib/cppparser/parser.cpp:583
+msgid "Declaration syntax error"
+msgstr "声明语法错误"
+
+#: lib/cppparser/parser.cpp:630 lib/cppparser/parser.cpp:2817
+#: lib/cppparser/parser.cpp:3290
+msgid "} expected"
+msgstr "此处需要 }"
+
+#: lib/cppparser/parser.cpp:671
+msgid "namespace expected"
+msgstr "此处需要 namespace"
+
+#: lib/cppparser/parser.cpp:675
+msgid "{ expected"
+msgstr "此处需要 {"
+
+#: lib/cppparser/parser.cpp:748 lib/cppparser/parser.cpp:3010
+msgid "Namespace name expected"
+msgstr "此处需要 namespace 名称"
+
+#: lib/cppparser/parser.cpp:852
+msgid "Need a type specifier to declare"
+msgstr "声明中需要指定类型"
+
+#: lib/cppparser/parser.cpp:934
+msgid "expected a declaration"
+msgstr "此处需要一个声明"
+
+#: lib/cppparser/parser.cpp:1208 lib/cppparser/parser.cpp:2190
+msgid "Constant expression expected"
+msgstr "此处需要常量表达式"
+
+#: lib/cppparser/parser.cpp:1277 lib/cppparser/parser.cpp:1374
+msgid "')' expected"
+msgstr "此处需要“)”"
+
+#: lib/cppparser/parser.cpp:1436 lib/cppparser/parser.cpp:1966
+#: lib/cppparser/parser.cpp:2398
+msgid "} missing"
+msgstr "缺少 }"
+
+#: lib/cppparser/parser.cpp:2088
+msgid "Member initializers expected"
+msgstr "此处需要成员初始值"
+
+#: lib/cppparser/parser.cpp:2249
+msgid "Base class specifier expected"
+msgstr "此处需要指定基类"
+
+#: lib/cppparser/parser.cpp:2272
+msgid "Initializer clause expected"
+msgstr "此处需要初始化语句"
+
+#: lib/cppparser/parser.cpp:2313
+msgid "Identifier expected"
+msgstr "此处需要标识符"
+
+#: lib/cppparser/parser.cpp:2343
+msgid "Type id expected"
+msgstr "此处需要类型标识"
+
+#: lib/cppparser/parser.cpp:2380
+msgid "Class name expected"
+msgstr "此处需要类名"
+
+#: lib/cppparser/parser.cpp:2662 lib/cppparser/parser.cpp:2842
+#: lib/cppparser/parser.cpp:2880 lib/cppparser/parser.cpp:3352
+msgid "condition expected"
+msgstr "此处需要条件"
+
+#: lib/cppparser/parser.cpp:2669 lib/cppparser/parser.cpp:2690
+#: lib/cppparser/parser.cpp:2849 lib/cppparser/parser.cpp:2859
+msgid "statement expected"
+msgstr "此处需要语句"
+
+#: lib/cppparser/parser.cpp:2725
+msgid "for initialization expected"
+msgstr "此处需要 for 循环初始化"
+
+#: lib/cppparser/parser.cpp:3341
+msgid "catch expected"
+msgstr "此处需要 catch"
+
+#: lib/util/execcommand.cpp:52
+msgid "Could not invoke \"%1\". Please make sure it is installed correctly"
+msgstr "无法调用“%1”。请确保它已经正确安装。"
+
+#: lib/util/execcommand.cpp:53
+msgid "Error Invoking Command"
+msgstr "执行命令时发生错误"
+
+#: lib/util/execcommand.cpp:59
+msgid "Command running..."
+msgstr "命令正在运行..."
+
+#: lib/util/execcommand.cpp:60
+msgid "Please wait until the \"%1\" command finishes."
+msgstr "请等待直到“%1”命令结束运行。"
+
+#: lib/util/tdescriptactionmanager.cpp:98
+msgid "Unable to get KScript Runner for type \"%1\"."
+msgstr ""
+
+#: lib/util/tdescriptactionmanager.cpp:98
+#, fuzzy
+msgid "KScript Error"
+msgstr "脚本"
+
+#: lib/widgets/kdevhtmlpart.cpp:37
+msgid "<b>Reload</b><p>Reloads the current document."
+msgstr "<b>重新载入</b><p>重新载入当前文档。"
+
+#: lib/widgets/kdevhtmlpart.cpp:40
+msgid "<b>Stop</b><p>Stops the loading of current document."
+msgstr "<b>停止</b><p>停止载入当前文档。"
+
+#: lib/widgets/kdevhtmlpart.cpp:41
+msgid "Duplicate Tab"
+msgstr "复制标签"
+
+#: lib/widgets/kdevhtmlpart.cpp:43
+msgid "<b>Duplicate window</b><p>Opens current document in a new window."
+msgstr "<b>复制窗口</b><p>在新的窗口中打开当前文档。"
+
+#: lib/widgets/kdevhtmlpart.cpp:57
 msgid ""
-"List of all widgets and objects of the current form in hierarchical order"
+"<b>Back</b>"
+"<p>Moves backwards one step in the <b>documentation</b> browsing history."
+msgstr "<b>后退</b><p>在<b>文档</b>浏览历史中往回退一步。"
+
+#: lib/widgets/kdevhtmlpart.cpp:69
+msgid ""
+"<b>Forward</b>"
+"<p>Moves forward one step in the <b>documentation</b> browsing history."
+msgstr "<b>前进</b><p>在<b>文档</b>浏览历史中往前进一步。"
+
+#: lib/widgets/kdevhtmlpart.cpp:100
+msgid "<b>Open in new window</b><p>Opens current link in a new window."
+msgstr "<b>在新窗口中打开</b><p>在新窗口中打开当前链接。"
+
+#: lib/widgets/flagboxes.cpp:98
+msgid "Flags"
+msgstr "标志"
+
+#: lib/widgets/kdevtabwidget.cpp:38
+msgid "Close &Others"
+msgstr "关闭其它的(&O)"
+
+#: lib/widgets/processwidget.cpp:233
+msgid "*** Exited normally ***"
+msgstr "*** 正常退出 ***"
+
+#: lib/widgets/processwidget.cpp:239
+#, fuzzy
+msgid "*** Process aborted. Segmentation fault ***"
+msgstr "*** 进程中止 ***"
+
+#: lib/widgets/processwidget.cpp:243
+msgid "*** Process aborted ***"
+msgstr "*** 进程中止 ***"
+
+#: lib/widgets/resizablecombo.cpp:63
+msgid "Drag this to resize the combobox."
+msgstr "拖动此处改变组合框的大小。"
+
+#: lib/widgets/ksavealldialog.cpp:53 lib/widgets/ksavealldialog.cpp:144
+msgid "Save Modified Files?"
+msgstr "保存已修改的文件吗？"
+
+#: lib/widgets/ksavealldialog.cpp:58 lib/widgets/ksavealldialog.cpp:151
+msgid "The following files have been modified. Save them?"
+msgstr "下列文件已被修改，要保存它们吗？"
+
+#: lib/widgets/ksavealldialog.cpp:65
+msgid "Save &Selected"
+msgstr "保存所选(&S)"
+
+#: lib/widgets/ksavealldialog.cpp:65
+msgid "Saves all selected files"
+msgstr "保存所选中的全部文件"
+
+#: lib/widgets/ksavealldialog.cpp:66 lib/widgets/ksavealldialog.cpp:157
+msgid "Save &None"
+msgstr "不保存(&N)"
+
+#: lib/widgets/ksavealldialog.cpp:68 lib/widgets/ksavealldialog.cpp:159
+msgid "Lose all modifications"
+msgstr "放弃所有修改"
+
+#: lib/widgets/ksavealldialog.cpp:69 lib/widgets/ksavealldialog.cpp:160
+msgid "Cancels the action"
+msgstr "取消操作"
+
+#: lib/widgets/ksavealldialog.cpp:156
+msgid "Save &All"
+msgstr "全部保存(&A)"
+
+#: lib/widgets/ksavealldialog.cpp:156
+msgid "Saves all modified files"
+msgstr "保存所有修改过的文件"
+
+#: lib/widgets/propeditor/pfontbutton.cpp:62
+msgid " Bold"
+msgstr "粗体"
+
+#: lib/widgets/propeditor/pfontbutton.cpp:63
+msgid " Italic"
+msgstr "斜体"
+
+#: lib/widgets/propeditor/pstringlistedit.cpp:85
+msgid "Ok"
+msgstr "确定"
+
+#: lib/widgets/propeditor/propertymachinefactory.cpp:152
+#, fuzzy
+msgid "Minimum Expanding"
+msgstr "展开目录"
+
+#: lib/widgets/propeditor/propertymachinefactory.cpp:153
+#, fuzzy
+msgid "Ignored"
+msgstr "忽略次数"
+
+#: lib/widgets/propeditor/propertymachinefactory.cpp:156
+msgid "Horizontal Size Type"
 msgstr ""
 
-#: kdevdesigner/designer/hierarchyview.cpp:1249
-msgid "Members"
-msgstr "成员"
+#: lib/widgets/propeditor/propertymachinefactory.cpp:157
+#, fuzzy
+msgid "Vertical Size Type"
+msgstr "服务类型(&T)"
 
-#: kdevdesigner/designer/hierarchyview.cpp:1250
-msgid "List of all members of the current form"
-msgstr "列出当前表单中的全部成员"
+#: lib/widgets/propeditor/propertymachinefactory.cpp:158
+msgid "hStretch"
+msgstr ""
 
-#: kdevdesigner/designer/hierarchyview.cpp:1269
-msgid "Class Declarations"
-msgstr "类声明"
+#: lib/widgets/propeditor/propertymachinefactory.cpp:158
+msgid "Horizontal Stretch"
+msgstr ""
 
-#: kdevdesigner/designer/hierarchyview.cpp:1270
-msgid "List of all classes and its declarations of the current source file"
+#: lib/widgets/propeditor/propertymachinefactory.cpp:159
+msgid "vStretch"
 msgstr ""
 
-#: kdevdesigner/designer/customwidgeteditorimpl.cpp:222
-msgid "Adding Custom Widget"
-msgstr "添加自定义部件"
+#: lib/widgets/propeditor/propertymachinefactory.cpp:159
+msgid "Vertical Stretch"
+msgstr ""
 
-#: kdevdesigner/designer/customwidgeteditorimpl.cpp:223
+#: lib/widgets/propeditor/propertymachinefactory.cpp:166
+msgid "Up Arrow"
+msgstr ""
+
+#: lib/widgets/propeditor/propertymachinefactory.cpp:180
+#, fuzzy
+msgid "What's this"
+msgstr "这是什么？"
+
+#: lib/widgets/propeditor/pcheckbox.cpp:69
+msgid "true"
+msgstr "true"
+
+#: lib/widgets/propeditor/pcheckbox.cpp:69
+msgid "false"
+msgstr "false"
+
+#: buildtools/script/scriptprojectpart.cpp:56
+msgid "<b>New file</b><p>Creates a new file."
+msgstr "<b>新建文件</b><p>创建新文件。"
+
+#: buildtools/script/scriptprojectpart.cpp:59
+#, fuzzy
+msgid "Rescan Project"
+msgstr "清理工程(&C)"
+
+#: buildtools/autotools/addfiledlg.cpp:72
+#: buildtools/script/scriptnewfiledlg.cpp:80
+msgid "Please enter the file name without '/' and so on."
+msgstr "请不要在文件名里包含“/”这样的字符。"
+
+#: buildtools/script/scriptnewfiledlg.cpp:90
+msgid "A file with this name already exists."
+msgstr "这个名字的文件已经存在。"
+
+#: buildtools/script/scriptnewfiledlg.cpp:99
+msgid "A file template for this extension does not exist."
+msgstr "这个扩展名的文件模板不存在。"
+
+#: buildtools/script/scriptnewfiledlg.cpp:111
+msgid "Could not create the new file."
+msgstr "无法创建新文件。"
+
+#: buildtools/custommakefiles/selectnewfilesdialog.cpp:24
+#, fuzzy
+msgid "Add newly created files to project"
+msgstr "将选中文件加入到工程"
+
+#: buildtools/custommakefiles/customprojectpart.cpp:79
+#: buildtools/custommakefiles/customprojectpart.cpp:80
+#, fuzzy
+msgid "Re-Populate Project"
+msgstr "重新编译工程(&R)"
+
+#: buildtools/custommakefiles/customprojectpart.cpp:81
 msgid ""
-"Custom widget names must be unique.\n"
-"A custom widget called '%1' already exists, so it is not possible to add "
-"another widget with this name."
+"<b>Re-Populate Project</b>"
+"<p>Re-Populates the project, searching through the project directory and adding "
+"all files that match one of the wildcards set in the custom manager options of "
+"the project filelist."
 msgstr ""
 
-#: kdevdesigner/designer/customwidgeteditorimpl.cpp:272
-msgid "Removing Custom Widget"
-msgstr "删除自定义部件"
+#: buildtools/ada/adaproject_part.cpp:56 buildtools/ant/antprojectpart.cpp:55
+#: buildtools/autotools/autoprojectpart.cpp:104
+#: buildtools/custommakefiles/customprojectpart.cpp:83
+#: buildtools/pascal/pascalproject_part.cpp:62
+#: buildtools/qmake/trollprojectpart.cpp:103
+msgid "&Build Project"
+msgstr "构建工程(&B)"
 
-#: kdevdesigner/designer/customwidgeteditorimpl.cpp:273
-msgid "The custom widget '%1' is in use, so it cannot be removed."
-msgstr "自定义部件“%1”正在使用中，所以无法删除。"
+#: buildtools/ant/antprojectpart.cpp:58
+#: buildtools/autotools/autoprojectpart.cpp:107
+#: buildtools/custommakefiles/customprojectpart.cpp:86
+#: buildtools/pascal/pascalproject_part.cpp:65
+#: buildtools/qmake/trollprojectpart.cpp:106
+#: buildtools/qmake/trollprojectwidget.cpp:124
+msgid "Build project"
+msgstr "构建工程"
 
-#: kdevdesigner/designer/customwidgeteditorimpl.cpp:379
-msgid "*.h *.h++ *.hxx *.hh|Header Files"
-msgstr "*.h *.h++ *.hxx *.hh|头文件"
+#: buildtools/custommakefiles/customprojectpart.cpp:87
+msgid ""
+"<b>Build project</b>"
+"<p>Runs <b>make</b> from the project directory."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Build Options</b> tab."
+msgstr ""
+"<b>构建工程</b>"
+"<p>在工程目录中运行 <b>make</b> 命令。"
+"<br>环境变量和 make 的参数可以在工程设置的<b>构建选项</b>页中指定。"
 
-#: kdevdesigner/designer/customwidgeteditorimpl.cpp:397
-msgid "Renaming Custom Widget"
-msgstr "重命名自定义部件"
+#: buildtools/custommakefiles/customprojectpart.cpp:91
+#, fuzzy
+msgid "&Build Active Directory"
+msgstr "Make 活动目录"
 
-#: kdevdesigner/designer/customwidgeteditorimpl.cpp:398
+#: buildtools/custommakefiles/customprojectpart.cpp:94
+#, fuzzy
+msgid "Build active directory"
+msgstr "构建活动目标"
+
+#: buildtools/custommakefiles/customprojectpart.cpp:95
+#, fuzzy
 msgid ""
-"Custom widget names must be unique.\n"
-"A custom widget called '%1' already exists, so it is not possible to rename "
-"this widget with this name."
+"<b>Build active directory</b>"
+"<p>Constructs a series of make commands to build the active directory. "
+"Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
 msgstr ""
+"<b>编译活动目标</b>"
+"<p>构造一系列编译命令，编译活动的目标，并编译所依赖的目标。"
+"<br>环境变量和编译参数可以在工程设置的<b>编译选项</b>页中指定。"
 
-#: kdevdesigner/designer/customwidgeteditorimpl.cpp:684
-#: kdevdesigner/designer/customwidgeteditorimpl.cpp:752
+#: buildtools/autotools/autoprojectpart.cpp:123
+#: buildtools/custommakefiles/customprojectpart.cpp:99
+#: buildtools/qmake/trollprojectpart.cpp:94
+msgid "Compile &File"
+msgstr "编译文件(&F)"
+
+#: buildtools/autotools/autoprojectpart.cpp:126
+#: buildtools/custommakefiles/customprojectpart.cpp:102
+#: buildtools/qmake/trollprojectpart.cpp:97
+#: buildtools/qmake/trollprojectwidget.cpp:230
+msgid "Compile file"
+msgstr "编译文件"
+
+#: buildtools/custommakefiles/customprojectpart.cpp:103
 msgid ""
-"*.cw|Custom-Widget Description\n"
-"*|All Files"
+"<b>Compile file</b>"
+"<p>Runs <b>make filename.o</b> command from the directory where 'filename' is "
+"the name of currently opened file."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Build Options</b> tab."
 msgstr ""
-"*.cw|自定义部件描述\n"
-"*|全部文件"
+"<b>编译文件</b>"
+"<p>在当前打开的文件“'filename”所在的目录中运行 <b>make filename.o</b> 命令。"
+"<br>环境变量和编译参数可以在工程设置的<b>构建选项</b>页中指定。"
 
-#: kdevdesigner/designer/menubareditor.cpp:157
-msgid "new menu"
-msgstr "新建菜单"
+#: buildtools/autotools/autoprojectpart.cpp:155
+#: buildtools/autotools/autoprojectpart.cpp:158
+#: buildtools/autotools/autosubprojectview.cpp:248
+#: buildtools/custommakefiles/customprojectpart.cpp:107
+#: buildtools/custommakefiles/customprojectpart.cpp:110
+#: buildtools/qmake/trollprojectwidget.cpp:1000
+msgid "Install"
+msgstr "安装"
 
-#: kdevdesigner/designer/menubareditor.cpp:158
-#: kdevdesigner/designer/popupmenueditor.cpp:304
-msgid "new separator"
-msgstr "新建分隔符"
+#: buildtools/autotools/autoprojectpart.cpp:159
+#: buildtools/custommakefiles/customprojectpart.cpp:111
+msgid ""
+"<b>Install</b>"
+"<p>Runs <b>make install</b> command from the project directory."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
+msgstr ""
+"<b>安装</b>"
+"<p>在工程目录中执行 <b>make install</b> 命令。"
+"<br>环境变量和编译参数可以在工程设置的<b>编译选项</b>页中指定。"
 
-#: kdevdesigner/designer/menubareditor.cpp:190
-#: kdevdesigner/designer/menubareditor.cpp:194
-#: kdevdesigner/designer/menubareditor.cpp:1012
-msgid "Add Menu"
-msgstr "添加菜单"
+#: buildtools/custommakefiles/customprojectpart.cpp:115
+#, fuzzy
+msgid "Install Active Directory"
+msgstr "Make 活动目录"
 
-#: kdevdesigner/designer/menubareditor.cpp:242
-msgid "separator"
-msgstr "分隔符"
+#: buildtools/custommakefiles/customprojectpart.cpp:118
+#, fuzzy
+msgid "Install active directory"
+msgstr "Make 活动目录"
 
-#: kdevdesigner/designer/menubareditor.cpp:381
-msgid "Cut Menu"
-msgstr "剪切菜单"
+#: buildtools/custommakefiles/customprojectpart.cpp:119
+#, fuzzy
+msgid ""
+"<b>Install active directory</b>"
+"<p>Runs <b>make install</b> command from the active directory."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
+msgstr ""
+"<b>安装</b>"
+"<p>在工程目录中执行 <b>make install</b> 命令。"
+"<br>环境变量和编译参数可以在工程设置的<b>编译选项</b>页中指定。"
 
-#: kdevdesigner/designer/menubareditor.cpp:404
-msgid "Paste Menu"
-msgstr "粘贴菜单"
+#: buildtools/autotools/autoprojectpart.cpp:164
+#: buildtools/autotools/autosubprojectview.cpp:254
+#: buildtools/custommakefiles/customprojectpart.cpp:123
+msgid "Install (as root user)"
+msgstr "安装(用 root 身份)"
 
-#: kdevdesigner/designer/menubareditor.cpp:496
-msgid "Delete Menu"
-msgstr "删除菜单"
+#: buildtools/autotools/autoprojectpart.cpp:167
+#: buildtools/custommakefiles/customprojectpart.cpp:126
+msgid "Install as root user"
+msgstr "用 root 身份安装"
 
-#: kdevdesigner/designer/menubareditor.cpp:1009
-msgid "Item Dragged"
+#: buildtools/autotools/autoprojectpart.cpp:168
+#: buildtools/custommakefiles/customprojectpart.cpp:127
+msgid ""
+"<b>Install</b>"
+"<p>Runs <b>make install</b> command from the project directory with root "
+"privileges."
+"<br>It is executed via tdesu command."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
 msgstr ""
+"<b>安装</b>"
+"<p>在工程目录中用 root 权限执行 <b>make install</b> 命令。"
+"<br>它是通过 tdesu 命令来执行的。"
+"<br>环境变量和编译参数可以在工程设置的<b>编译选项</b>页中指定。"
 
-#: kdevdesigner/designer/menubareditor.cpp:1048
-msgid "Move Menu Left"
-msgstr "菜单左移"
+#: buildtools/autotools/autoprojectpart.cpp:174
+#: buildtools/custommakefiles/customprojectpart.cpp:132
+#: buildtools/qmake/trollprojectpart.cpp:127
+msgid "&Clean Project"
+msgstr "清理工程(&C)"
 
-#: kdevdesigner/designer/menubareditor.cpp:1070
-msgid "Move Menu Right"
-msgstr "菜单右移"
+#: buildtools/autotools/autoprojectpart.cpp:177
+#: buildtools/custommakefiles/customprojectpart.cpp:135
+#: buildtools/qmake/trollprojectpart.cpp:130
+msgid "Clean project"
+msgstr "清理工程"
 
-#: kdevdesigner/designer/menubareditor.cpp:1101
-#: kdevdesigner/designer/menubareditor.cpp:1106
-msgid "Rename Menu"
-msgstr "重命名菜单"
+#: buildtools/custommakefiles/customprojectpart.cpp:136
+msgid ""
+"<b>Clean project</b>"
+"<p>Runs <b>make clean</b> command from the project directory."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Build Options</b> tab."
+msgstr ""
+"<b>清理工程</b>"
+"<p>在工程目录中运行 <b>make clean</b> 命令。"
+"<br>环境变量和编译参数可以在工程设置的<b>构建选项</b>页中指定。"
 
-#: kdevdesigner/designer/listvieweditorimpl.cpp:130
-msgid "Edit the Items and Columns of '%1'"
-msgstr "编辑“%1”的项目和列"
+#: buildtools/custommakefiles/customprojectpart.cpp:144
+msgid ""
+"<b>Execute program</b>"
+"<p>Executes the main program specified in project settings, <b>Run Options</b> "
+"tab. If it is not specified then the active target is used to determine the "
+"application to run."
+msgstr "<b>执行程序</b><p>执行工程设置的<b>运行选项</b>页中指定的主程序。如果未指定，则使用激活的目标确定要运行的应用程序。"
 
-#: kdevdesigner/designer/listvieweditorimpl.cpp:287
-msgid "New Column"
-msgstr "新建列"
+#: buildtools/ant/antprojectpart.cpp:61
+#: buildtools/custommakefiles/customprojectpart.cpp:147
+msgid "Build &Target"
+msgstr "构建目标(&T)"
 
-#: kdevdesigner/designer/listvieweditorimpl.cpp:399
-msgid "Item"
-msgstr "项目"
+#: buildtools/ant/antprojectpart.cpp:63
+#: buildtools/custommakefiles/customprojectpart.cpp:150
+msgid "Build target"
+msgstr "构建目标"
 
-#: kdevdesigner/designer/listvieweditorimpl.cpp:417
-msgid "Subitem"
-msgstr "子项目"
+#: buildtools/custommakefiles/customprojectpart.cpp:151
+msgid ""
+"<b>Build target</b>"
+"<p>Runs <b>make targetname</b> from the project directory (targetname is the "
+"name of the target selected)."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Build Options</b> tab."
+msgstr ""
+"<b>构建目标</b>"
+"<p>在工程目录中运行 <b>make targetname</b> 命令(targetname 是所选择的目标名称)。"
+"<br>环境变量和编译参数可以在工程设置的<b>构建选项</b>页中指定。"
 
-#: kdevdesigner/designer/sourcefile.cpp:222
-msgid "Save Code"
-msgstr "保存代码"
+#: buildtools/custommakefiles/customprojectpart.cpp:158
+msgid "Make &Environment"
+msgstr "Make 环境(&E)"
 
-#: kdevdesigner/designer/sourcefile.cpp:281
+#: buildtools/custommakefiles/customprojectpart.cpp:160
+msgid "Make environment"
+msgstr "Make 环境"
+
+#: buildtools/custommakefiles/customprojectpart.cpp:161
 msgid ""
-"The project already contains a source file with \n"
-"filename '%1'. Please choose a new filename."
+"<b>Make Environment</b>"
+"<p> Choose the set of environment variables to be passed on to make."
+"<br>Environment variables can be specified in the project settings dialog, <b>"
+"Build Options</b> tab."
+msgstr "<b>Make 环境</b><p>选择传递给 make 的环境变量集合。<br>环境变量可以在工程设置的<b>构建选项</b>页中指定。"
+
+#: buildtools/custommakefiles/customprojectpart.cpp:196
+#, fuzzy
+msgid "Custom Manager"
+msgstr "Automake 管理器"
+
+#: buildtools/custommakefiles/customprojectpart.cpp:208
+msgid "&Build"
+msgstr "构建(&B)"
+
+#: buildtools/custommakefiles/customprojectpart.cpp:212
+msgid "&Other"
+msgstr "其它(&O)"
+
+#: buildtools/custommakefiles/customprojectpart.cpp:215
+msgid "Ma&ke"
+msgstr "Make(&K)"
+
+#: buildtools/custommakefiles/customprojectpart.cpp:243
+msgid "Make Active Directory"
+msgstr "Make 活动目录"
+
+#: buildtools/custommakefiles/customprojectpart.cpp:245
+msgid ""
+"<b>Make active directory</b>"
+"<p>Chooses this directory as the destination for new files created using "
+"wizards like the <i>New Class</i> wizard."
+msgstr "<b>Make 活动目录</b><p>选择此目录作为 <i>新建类</i> 之类的向导创建新文件的目录。"
+
+#: buildtools/custommakefiles/customprojectpart.cpp:259
+#, fuzzy
+msgid "Remove from blacklist"
+msgstr "从仓库中删除"
+
+#: buildtools/custommakefiles/customprojectpart.cpp:261
+msgid ""
+"<b>Remove from blacklist</b>"
+"<p>Removes the given file or directory from the blacklist if it is already in "
+"it."
+"<br>The blacklist contains files and directories that should be ignored even if "
+"they match a project filetype pattern"
 msgstr ""
 
-#: kdevdesigner/designer/popupmenueditor.cpp:303
-msgid "new item"
-msgstr "新建项目"
+#: buildtools/custommakefiles/customprojectpart.cpp:269
+#, fuzzy
+msgid "Add to blacklist"
+msgstr "添加空断点"
 
-#: kdevdesigner/designer/popupmenueditor.cpp:438
-msgid "Cut Item"
-msgstr "剪切项目"
+#: buildtools/custommakefiles/customprojectpart.cpp:271
+msgid ""
+"<b>Add to blacklist</b>"
+"<p>Adds the given file or directory to the blacklist."
+"<br>The blacklist contains files and directories that should be ignored even if "
+"they match a project filetype pattern"
+msgstr ""
 
-#: kdevdesigner/designer/popupmenueditor.cpp:466
-msgid "Paste Item"
-msgstr "粘贴项目"
+#: buildtools/custommakefiles/customprojectpart.cpp:319
+#, fuzzy
+msgid "Add Selected File/Dir(s) to Project"
+msgstr "将选中文件加入到工程"
 
-#: kdevdesigner/designer/popupmenueditor.cpp:508
-msgid "Set Icon"
-msgstr "设定图标"
+#: buildtools/custommakefiles/customprojectpart.cpp:321
+#, fuzzy
+msgid ""
+"<b>Add to project</b>"
+"<p>Adds selected file/dir(s) to the list of files in the project. Note that the "
+"files should be manually added to the corresponding makefile or build.xml."
+msgstr "<b>添加到工程</b><p>添加当前文件到工程的文件列表中。注意该文件需要手工添加到相应的 makefile 或 build.xml 中。"
 
-#: kdevdesigner/designer/popupmenueditor.cpp:631
-msgid "Add Item"
-msgstr "添加项目"
+#: buildtools/custommakefiles/customprojectpart.cpp:325
+#, fuzzy
+msgid "Add Selected Dir(s) to Project (recursive)"
+msgstr "将选中文件加入到工程"
 
-#: kdevdesigner/designer/popupmenueditor.cpp:641
-msgid "Remove Item"
-msgstr "删除项目"
+#: buildtools/custommakefiles/customprojectpart.cpp:327
+#, fuzzy
+msgid ""
+"<b>Add to project</b>"
+"<p>Recursively adds selected dir(s) to the list of files in the project. Note "
+"that the files should be manually added to the corresponding makefile or "
+"build.xml."
+msgstr "<b>添加到工程</b><p>添加当前文件到工程的文件列表中。注意该文件需要手工添加到相应的 makefile 或 build.xml 中。"
 
-#: kdevdesigner/designer/popupmenueditor.cpp:769
-#: kdevdesigner/designer/popupmenueditor.cpp:1428
-msgid "Rename Item"
-msgstr "重命名项目"
+#: buildtools/custommakefiles/customprojectpart.cpp:334
+#, fuzzy
+msgid "Remove Selected File/Dir(s) From Project"
+msgstr "从工程中删除选中文件"
 
-#: kdevdesigner/designer/popupmenueditor.cpp:1233
-msgid "Drop Item"
-msgstr "删除项目"
+#: buildtools/custommakefiles/customprojectpart.cpp:336
+#, fuzzy
+msgid ""
+"<b>Remove from project</b>"
+"<p>Removes selected file/dir(s) from the list of files in the project. Note "
+"that the files should be manually excluded from the corresponding makefile or "
+"build.xml."
+msgstr ""
+"<b>从工程中删除</b>"
+"<p>从工程的文件列表中删除当前文件。注意该文件需要从相应的 makefile 或 build.xml 中手工剔除。"
 
-#: kdevdesigner/designer/popupmenueditor.cpp:1287
-msgid "Remove Icon"
-msgstr "删除图标"
+#: buildtools/custommakefiles/customprojectpart.cpp:341
+#, fuzzy
+msgid "Remove Selected Dir(s) From Project (recursive)"
+msgstr "从工程中删除选中文件"
 
-#: kdevdesigner/designer/popupmenueditor.cpp:1308
-msgid "Move Item Up"
-msgstr "项目上移"
+#: buildtools/custommakefiles/customprojectpart.cpp:343
+#, fuzzy
+msgid ""
+"<b>Remove from project</b>"
+"<p>Recursively removes selected dir(s) from the list of files in the project. "
+"Note that the files should be manually excluded from the corresponding makefile "
+"or build.xml."
+msgstr ""
+"<b>从工程中删除</b>"
+"<p>从工程的文件列表中删除当前文件。注意该文件需要从相应的 makefile 或 build.xml 中手工剔除。"
 
-#: kdevdesigner/designer/popupmenueditor.cpp:1332
-msgid "Move Item Down"
-msgstr "项目下移"
+#: buildtools/custommakefiles/customprojectpart.cpp:461
+msgid ""
+"This project does not contain any files yet.\n"
+"Populate it with all C/C++/Java files below the project directory?"
+msgstr ""
+"这个工程还没有任何文件。\n"
+"要添加工程目录下的所有 C/C++/Java 文件吗？"
 
-#: kdevdesigner/designer/mainwindow.cpp:205
+#: buildtools/custommakefiles/customprojectpart.cpp:463
+#, fuzzy
+msgid "Populate"
+msgstr "模板"
+
+#: buildtools/custommakefiles/customprojectpart.cpp:463
+msgid "Do Not Populate"
+msgstr ""
+
+#: buildtools/custommakefiles/customprojectpart.cpp:1161
+msgid "Object Files"
+msgstr "对象文件"
+
+#: buildtools/custommakefiles/customprojectpart.cpp:1162
+msgid "Other Files"
+msgstr "其它文件"
+
+#: buildtools/custommakefiles/custommanagerwidget.cpp:43
 msgid ""
-"Ready - This is the non-commercial version of Qt - For commercial evaluations, "
-"use the help menu to register with Trolltech."
+"_: blacklisted files and directories are not considered part of the project, "
+"even if they fit one of the wildcard patterns in the project file list\n"
+"Blacklisted files/dirs"
 msgstr ""
 
-#: kdevdesigner/designer/mainwindow.cpp:361
-#: kdevdesigner/designer/mainwindow.cpp:3747
-msgid "Property Editor/Signal Handlers"
+#: buildtools/lib/widgets/addenvvardlg.cpp:34
+msgid "Add Environment Variable"
+msgstr "添加环境变量"
+
+#: buildtools/lib/widgets/addenvvardlg.cpp:42
+msgid "&Value:"
+msgstr "值(&V)："
+
+#: buildtools/lib/widgets/addfilesdialog.cpp:35
+#: buildtools/lib/widgets/addfilesdialog.cpp:54
+msgid "Copy File(s)"
+msgstr "复制文件"
+
+#: buildtools/lib/widgets/addfilesdialog.cpp:36
+#: buildtools/lib/widgets/addfilesdialog.cpp:55
+msgid "Create Symbolic Link(s)"
+msgstr "创建符号链接"
+
+#: buildtools/lib/widgets/addfilesdialog.cpp:37
+#: buildtools/lib/widgets/addfilesdialog.cpp:56
+msgid "Add Relative Path(s)"
+msgstr "添加相对路径"
+
+#: buildtools/ant/antprojectpart.cpp:59
+msgid ""
+"<b>Build project</b>"
+"<p>Executes <b>ant dist</b> command to build the project."
+msgstr "<b>构建工程</b><p>执行 <b>ant dist</b> 命令来构建工程。"
+
+#: buildtools/ant/antprojectpart.cpp:64
+msgid ""
+"<b>Build target</b>"
+"<p>Executes <b>ant target_name</b> command to build the specified target."
+msgstr "<b>构建目标</b><p>执行 <b>ant target_name</b> 命令来构建指定的目标。"
+
+#: buildtools/ant/antprojectpart.cpp:467
+msgid "Ant Options"
+msgstr "Ant 选项"
+
+#: buildtools/ant/antprojectpart.cpp:502
+msgid "Classpath"
+msgstr "Classpath"
+
+#: buildtools/ant/antprojectpart.cpp:565
+msgid "Remove %1 From Project"
+msgstr "从工程中删除 %1"
+
+#: buildtools/ant/antprojectpart.cpp:567
+msgid "<b>Remove from project</b><p>Removes current file from the project."
+msgstr "<b>从工程中删除</b><p>从工程中删除当前文件。"
+
+#: buildtools/ant/antprojectpart.cpp:571
+msgid "Add %1 to Project"
+msgstr "添加 %1 到工程中"
+
+#: buildtools/ant/antprojectpart.cpp:573
+msgid "<b>Add to project</b><p>Adds current file from the project."
+msgstr "<b>添加到工程</b><p>添加当前文件到工程中。"
+
+#: buildtools/pascal/pascalproject_part.cpp:66
+msgid ""
+"<b>Build project</b>"
+"<p>Runs the compiler on a main source file of the project. The compiler and the "
+"main source file can be set in project settings, <b>Pascal Compiler</b> tab."
 msgstr ""
+"<b>构建工程</b>"
+"<p>对工程的主要源代码文件运行编译器。编译器和主源代码文件可以在工程设置的 <b>Pascal 编译器</b>页中指定。"
 
-#: kdevdesigner/designer/mainwindow.cpp:363
+#: buildtools/pascal/pascalproject_part.cpp:72
 msgid ""
-"<b>The Property Editor</b>"
-"<p>You can change the appearance and behavior of the selected widget in the "
-"property editor.</p>"
-"<p>You can set properties for components and forms at design time and see the "
-"immediately see the effects of the changes. Each property has its own editor "
-"which (depending on the property) can be used to enter new values, open a "
-"special dialog, or to select values from a predefined list. Click <b>F1</b> "
-"to get detailed help for the selected property.</p>"
-"<p>You can resize the columns of the editor by dragging the separators in the "
-"list's header.</p>"
-"<p><b>Signal Handlers</b></p>"
-"<p>In the Signal Handlers tab you can define connections between the signals "
-"emitted by widgets and the slots in the form. (These connections can also be "
-"made using the connection tool.)"
+"<b>Execute program</b>"
+"<p>Executes the main program specified in project settings, <b>Run options</b> "
+"tab. If nothing is set, the binary file with the same name as the main source "
+"file name is executed."
+msgstr "<b>执行程序</b><p>执行工程设置的<b>运行选项</b>页中指定的主程序。如果未指定，和主源代码文件具有相同名字的执行文件将被执行。"
+
+#: buildtools/pascal/pascalproject_part.cpp:341
+msgid ""
+"Could not find pascal compiler.\n"
+"Check if your compiler settings are correct."
 msgstr ""
+"无法找到 Pascal 编译器。\n"
+"请检查您的编译器设置是否正确。"
 
-#: kdevdesigner/designer/mainwindow.cpp:390
-msgid "Output Window"
-msgstr "输出窗口"
+#: buildtools/autotools/configureoptionswidget.cpp:398
+#: buildtools/pascal/pascalproject_part.cpp:450
+msgid ""
+"There was an error loading the module %1.\n"
+"The diagnostics is:\n"
+"%2"
+msgstr ""
+"加载模块 %1 时发生错误。\n"
+"诊断信息为：\n"
+"%2"
 
-#: kdevdesigner/designer/mainwindow.cpp:404
-msgid "Object Explorer"
-msgstr "对象资源管理器"
+#: buildtools/qmake/scope.cpp:161
+#, fuzzy, c-format
+msgid "Could not parse project file: %1"
+msgstr "无法读取工程文件：“%1”"
 
-#: kdevdesigner/designer/mainwindow.cpp:407
+#: buildtools/qmake/scope.cpp:162
+#, fuzzy
+msgid "Could not parse project file"
+msgstr "无法读取工程文件：“%1”"
+
+#: buildtools/qmake/scope.cpp:201
+#, fuzzy, c-format
+msgid "Could not write project file: %1"
+msgstr "无法读取工程文件：“%1”"
+
+#: buildtools/qmake/scope.cpp:202
+#, fuzzy
+msgid "Could not write project file"
+msgstr "无法写入工程文件。"
+
+#: buildtools/qmake/createscopedlg.cpp:33
+msgid "Choose existing .pri file or give a new filename for creation"
+msgstr ""
+
+#: buildtools/qmake/createscopedlg.cpp:91
 msgid ""
-"<b>The Object Explorer</b>"
-"<p>The Object Explorer provides an overview of the relationships between the "
-"widgets in a form. You can use the clipboard functions using a context menu for "
-"each item in the view. It is also useful for selecting widgets in forms that "
-"have complex layouts.</p>"
-"<p>The columns can be resized by dragging the separator in the list's "
-"header.</p>"
-"<p>The second tab shows all the form's slots, class variables, includes, "
-"etc.</p>"
+"You did not specify all needed information. The scope will not be created."
+"<br>Do you want to abort the scope creation?"
 msgstr ""
 
-#: kdevdesigner/designer/mainwindow.cpp:424
-msgid "Start typing the buffer you want to switch to here (ALT+B)"
+#: buildtools/qmake/createscopedlg.cpp:93
+#, fuzzy
+msgid "Missing information"
+msgstr "定义信息"
+
+#: buildtools/qmake/trollprojectwidget.cpp:107
+msgid "Add subproject"
+msgstr "添加子工程"
+
+#: buildtools/qmake/trollprojectwidget.cpp:108
+#: buildtools/qmake/trollprojectwidget.cpp:1026
+msgid ""
+"<b>Add subproject</b>"
+"<p>Creates a <i>new</i> or adds an <i>existing</i> subproject to a currently "
+"selected subproject. This action is allowed only if a type of the subproject is "
+"'subdirectories'. The type of the subproject can be defined in <b>"
+"Subproject Settings</b> dialog (open it from the subproject context menu)."
 msgstr ""
+"<b>添加子工程</b>"
+"<p>在当前选择的子工程中创建<i>新的</i>或者添加一个<i>现有的</i>子工程。只有当子工程的类型为“子目录”时才允许这个动作。子工程的类型可以在<b>"
+"子工程设置</b>对话框中定义，该对话框能在子工程环境菜单中打开。"
 
-#: kdevdesigner/designer/mainwindow.cpp:433
-msgid "Project Overview"
-msgstr "工程概览"
+#: buildtools/qmake/trollprojectwidget.cpp:116
+msgid "Create scope"
+msgstr "创建范围"
 
-#: kdevdesigner/designer/mainwindow.cpp:434
+#: buildtools/qmake/trollprojectwidget.cpp:117
+#, fuzzy
 msgid ""
-"<b>The Project Overview Window</b>"
-"<p>The Project Overview Window displays all the current project, including "
-"forms and source files.</p>"
-"<p>Use the search field to rapidly switch between files.</p>"
+"<b>Create scope</b>"
+"<p>Creates TQMake scope in the project file in case the subproject is selected "
+"or creates nested scope in case the scope is selected."
+msgstr "<b>创建范围</b><p>如果选中的是子工程，则在工程文件中创建 QMake 范围，或者如果选中的是一个范围，则创建嵌套的范围。"
+
+#: buildtools/autotools/autoprojectpart.cpp:108
+#: buildtools/qmake/trollprojectpart.cpp:107
+#: buildtools/qmake/trollprojectwidget.cpp:125
+msgid ""
+"<b>Build project</b>"
+"<p>Runs <b>make</b> from the project directory."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
 msgstr ""
+"<b>构建工程</b>"
+"<p>在工程目录中运行 <b>make</b> 命令。"
+"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
 
-#: kdevdesigner/designer/mainwindow.cpp:451
-msgid "Action Editor"
-msgstr "动作编辑器"
+#: buildtools/qmake/trollprojectpart.cpp:114
+#: buildtools/qmake/trollprojectwidget.cpp:133
+msgid "Rebuild project"
+msgstr "重新编译工程"
 
-#: kdevdesigner/designer/mainwindow.cpp:452
+#: buildtools/qmake/trollprojectpart.cpp:115
+#: buildtools/qmake/trollprojectwidget.cpp:134
+#: buildtools/qmake/trollprojectwidget.cpp:1014
 msgid ""
-"<b>The Action Editor</b>"
-"<p>The Action Editor is used to add actions and action groups to a form, and to "
-"connect actions to slots. Actions and action groups can be dragged into menus "
-"and into toolbars, and may feature keyboard shortcuts and tooltips. If actions "
-"have pixmaps these are displayed on toolbar buttons and besides their names in "
-"menus.</p>"
+"<b>Rebuild project</b>"
+"<p>Runs <b>make clean</b> and then <b>make</b> from the project directory."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
 msgstr ""
+"<b>重新编译工程</b>"
+"<p>在工程目录中运行 <b>make clean</b> 命令，然后运行 <b>make</b> 命令。"
+"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
 
-#: kdevdesigner/designer/mainwindow.cpp:472
-msgid "Toolbox"
-msgstr "工具箱"
+#: buildtools/qmake/trollprojectpart.cpp:146
+#: buildtools/qmake/trollprojectwidget.cpp:143
+msgid "Execute main program"
+msgstr "执行主程序"
 
-#: kdevdesigner/designer/mainwindow.cpp:1281
+#: buildtools/qmake/trollprojectwidget.cpp:144
 msgid ""
-"<b>The Form Window</b>"
-"<p>Use the various tools to add widgets or to change the layout and behavior of "
-"the components in the form. Select one or multiple widgets to move them or lay "
-"them out. If a single widget is chosen it can be resized using the resize "
-"handles.</p>"
-"<p>Changes in the <b>Property Editor</b> are visible at design time, and you "
-"can preview the form in different styles.</p>"
-"<p>You can change the grid resolution, or turn the grid off in the <b>"
-"Preferences</b> dialog in the <b>Edit</b> menu."
-"<p>You can have several forms open, and all open forms are listed in the <b>"
-"Form List</b>."
+"<b>Execute main program</b>"
+"<p>Executes the main program specified in project settings, <b>Run Options</b> "
+"tab."
+msgstr "<b>执行主程序</b><p>执行在工程设置的<b>运行选项</b>页中指定的主程序。"
+
+#: buildtools/qmake/trollprojectwidget.cpp:153
+msgid "Subproject settings"
+msgstr "子工程选项"
+
+#: buildtools/qmake/trollprojectwidget.cpp:154
+#, fuzzy
+msgid ""
+"<b>Subproject settings</b>"
+"<p>Opens <b>TQMake Subproject Configuration</b> dialog for the currently "
+"selected subproject. It provides settings for:"
+"<br>subproject type and configuration,"
+"<br>include and library paths,"
+"<br>lists of dependencies and external libraries,"
+"<br>build order,"
+"<br>intermediate files locations,"
+"<br>compiler options."
 msgstr ""
+"<b>子工程选项</b>"
+"<p>为当前选中的子工程打开 <b>QMake 子工程配置</b>对话框。它提供如下设置："
+"<br>子工程类型和配置；"
+"<br>头文件和库路径；"
+"<br>依赖关系和外部库列表；"
+"<br>编译顺序；"
+"<br>中间文件位置；"
+"<br>编译器选项。"
 
-#: kdevdesigner/designer/mainwindow.cpp:1336
-msgid "Cannot create an invalid project."
-msgstr "无法创建无效工程。"
+#: buildtools/qmake/trollprojectwidget.cpp:204
+msgid "Create new file"
+msgstr "创建新文件"
 
-#: kdevdesigner/designer/mainwindow.cpp:1487
+#: buildtools/qmake/trollprojectwidget.cpp:205
+#: buildtools/qmake/trollprojectwidget.cpp:1579
+msgid ""
+"<b>Create new file</b>"
+"<p>Creates a new file and adds it to a currently selected group."
+msgstr "<b>创建新文件</b><p>创建新文件并将它添加到当前选中的分组中。"
+
+#: buildtools/qmake/trollprojectwidget.cpp:212
+msgid "Add existing files"
+msgstr "添加已有的文件"
+
+#: buildtools/qmake/trollprojectwidget.cpp:213
+#: buildtools/qmake/trollprojectwidget.cpp:1581
+msgid ""
+"<b>Add existing files</b>"
+"<p>Adds existing files to a currently selected group. It is possible to copy "
+"files to a current subproject directory, create symbolic links or add them with "
+"the relative path."
+msgstr "<b>添加已有的文件</b><p>在当前选中的分组中添加已有的文件。可以复制文件到当前子工程目录中、创建符号链接或者通过相对路径添加它们。"
+
+#: buildtools/qmake/trollprojectwidget.cpp:222
+msgid "Remove file"
+msgstr "删除文件"
+
+#: buildtools/qmake/trollprojectwidget.cpp:223
+msgid ""
+"<b>Remove file</b>"
+"<p>Removes file from a current group. Does not remove file from disk."
+msgstr "<b>删除文件</b><p>从当前分组中删除文件。它并不从磁盘上删除它。"
+
+#: buildtools/autotools/autoprojectpart.cpp:127
+#: buildtools/qmake/trollprojectpart.cpp:98
+#: buildtools/qmake/trollprojectwidget.cpp:231
+msgid ""
+"<b>Compile file</b>"
+"<p>Runs <b>make filename.o</b> command from the directory where 'filename' is "
+"the name of currently opened file."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
+msgstr ""
+"<b>编译文件</b>"
+"<p>在当前打开的文件“filename”所在的目录运行 <b>make filename.o</b> 命令。"
+"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
+
+#: buildtools/qmake/trollprojectpart.cpp:152
+#: buildtools/qmake/trollprojectwidget.cpp:240
+msgid "Build subproject"
+msgstr "构建子工程"
+
+#: buildtools/qmake/trollprojectpart.cpp:153
+#: buildtools/qmake/trollprojectwidget.cpp:241
+#, fuzzy
+msgid ""
+"<b>Build subproject</b>"
+"<p>Runs <b>make</b> from the current subproject directory. Current subproject "
+"is a subproject selected in <b>TQMake manager</b> 'overview' window."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
+msgstr ""
+"<b>构建子工程</b>"
+"<p>在当前子工程目录中运行 <b>make</b> 命令。当前子工程是在 <b>QMake 管理器</b>的“概要”窗口中选中的子工程。"
+"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
+
+#: buildtools/qmake/trollprojectpart.cpp:161
+#: buildtools/qmake/trollprojectwidget.cpp:250
+msgid "Rebuild subproject"
+msgstr "重新构建子工程"
+
+#: buildtools/qmake/trollprojectpart.cpp:162
+#: buildtools/qmake/trollprojectwidget.cpp:251
+#, fuzzy
+msgid ""
+"<b>Rebuild subproject</b>"
+"<p>Runs <b>make clean</b> and then <b>make</b> from the current subproject "
+"directory. Current subproject is a subproject selected in <b>TQMake manager</b> "
+"'overview' window."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
+msgstr ""
+"<b>重新构建子工程</b>"
+"<p>在当前子工程目录中运行 <b>make</b> 命令，然后运行 <b>make</b> 命令。当前子工程是在 <b>QMake 管理器</b>"
+"的“概要”窗口中选中的子工程。"
+"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
+
+#: buildtools/qmake/trollprojectpart.cpp:197
+#: buildtools/qmake/trollprojectwidget.cpp:261
+msgid "Execute subproject"
+msgstr "执行子工程"
+
+#: buildtools/qmake/trollprojectpart.cpp:198
+#: buildtools/qmake/trollprojectwidget.cpp:262
+msgid ""
+"<b>Execute subproject</b>"
+"<p>Executes the target program for the currently selected subproject. This "
+"action is allowed only if a type of the subproject is 'application'. The type "
+"of the subproject can be defined in <b>Subproject Settings</b> "
+"dialog (open it from the subproject context menu)."
+msgstr ""
+"<b>执行子工程</b>"
+"<p>运行当前子工程的目标程序。只有当子工程的类型为“应用程序”时才允许这个动作。子工程的类型可以在<b>子工程设置</b>"
+"对话框中定义，该对话框能在子工程环境菜单中打开。"
+
+#: buildtools/qmake/trollprojectwidget.cpp:276
+#, fuzzy
+msgid "Exclude file"
+msgstr "排除在此外(&E)："
+
+#: buildtools/qmake/trollprojectwidget.cpp:277
+msgid "<b>Exclude file</b><p>Exclude the selected file from this scope."
+msgstr ""
+
+#: buildtools/autotools/autoprojectpart.cpp:1198
+#: buildtools/qmake/trollprojectwidget.cpp:678
+#: buildtools/qmake/trollprojectwidget.cpp:2060
+msgid "Your application is currently running. Do you want to restart it?"
+msgstr "您的应用程序当前正在运行，您要重新开始运行它吗？"
+
+#: buildtools/autotools/autoprojectpart.cpp:1198
+#: buildtools/qmake/trollprojectwidget.cpp:678
+#: buildtools/qmake/trollprojectwidget.cpp:2060
+msgid "Application Already Running"
+msgstr "应用程序已在运行"
+
+#: buildtools/autotools/autoprojectpart.cpp:1198
+#: buildtools/qmake/trollprojectwidget.cpp:678
+#: buildtools/qmake/trollprojectwidget.cpp:2060
+msgid "&Restart Application"
+msgstr "重新启动应用程序(&R)"
+
+#: buildtools/autotools/autoprojectpart.cpp:1198
+#: buildtools/qmake/trollprojectwidget.cpp:678
+#: buildtools/qmake/trollprojectwidget.cpp:2060
+msgid "Do &Nothing"
+msgstr "不运行(&N)"
+
+#: buildtools/qmake/trollprojectwidget.cpp:850
+#, fuzzy
+msgid "Add Subproject"
+msgstr "添加子工程"
+
+#: buildtools/qmake/trollprojectwidget.cpp:850
+#, fuzzy
+msgid "Please enter a name for the subproject: "
+msgstr "请输入子目录的名称："
+
+#: buildtools/qmake/trollprojectwidget.cpp:877
+msgid ""
+"Failed to create subdirectory. Do you have write permission in the project "
+"folder?"
+msgstr "子目录创建失败。您对工程文件夹有写入权限吗？"
+
+#: buildtools/qmake/trollprojectwidget.cpp:933
+msgid ""
+"Could not create subproject. This means that either the project you wanted to "
+"add a subproject to is not parsed correctly, or it is not a subdirs-project."
+msgstr ""
+
+#: buildtools/qmake/trollprojectwidget.cpp:935
+#, fuzzy
+msgid "Subproject creation failed"
+msgstr "子工程信息"
+
+#: buildtools/qmake/trollprojectwidget.cpp:952
+#, fuzzy
+msgid "Delete the file/directory of the subproject from disk?"
+msgstr "选择您的工程所使用的 Qt 版本。"
+
+#: buildtools/qmake/trollprojectwidget.cpp:952
+#, fuzzy
+msgid "Delete subdir?"
+msgstr "删除信号"
+
+#: buildtools/qmake/trollprojectwidget.cpp:956
+msgid ""
+"Could not delete subproject.\n"
+"This is an internal error, please write a bug report to bugs.kde.org and "
+"include the output of tdevelop when runfrom a shell."
+msgstr ""
+
+#: buildtools/qmake/trollprojectwidget.cpp:958
+#, fuzzy
+msgid "Subproject Deletion failed"
+msgstr "子工程选项"
+
+#: buildtools/qmake/trollprojectwidget.cpp:977
 #, c-format
-msgid "&Undo: %1"
-msgstr "撤消(&U)：%1"
+msgid "Subproject %1"
+msgstr "子工程 %1"
 
-#: kdevdesigner/designer/mainwindow.cpp:1491
+#: buildtools/qmake/trollprojectwidget.cpp:997
+msgid ""
+"<b>Build</b>"
+"<p>Runs <b>make</b> from the selected subproject directory."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
+msgstr ""
+"<b>构建</b>"
+"<p>在所选中的子工程目录中运行 <b>make</b> 命令。"
+"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1001
+#, fuzzy
+msgid ""
+"<b>Install</b>"
+"<p>Runs <b>make install</b> from the selected subproject directory."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
+msgstr ""
+"<b>构建</b>"
+"<p>在所选中的子工程目录中运行 <b>make</b> 命令。"
+"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
+
+#: buildtools/autotools/autosubprojectview.cpp:241
+#: buildtools/qmake/trollprojectwidget.cpp:1004
+msgid "Clean"
+msgstr "清理"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1005
+#, fuzzy
+msgid ""
+"<b>Clean project</b>"
+"<p>Runs <b>make clean</b> command from the project directory."
+"<br> Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
+msgstr ""
+"<b>清理工程</b>"
+"<p>在工程目录中运行 <b>make clean</b> 命令。"
+"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1008
+#, fuzzy
+msgid "Dist-Clean"
+msgstr "清理为发行版"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1009
+#, fuzzy
+msgid ""
+"<b>Dist-Clean project</b>"
+"<p>Runs <b>make distclean</b> command from the project directory."
+"<br> Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
+msgstr ""
+"<b>清理工程</b>"
+"<p>在工程目录中运行 <b>make clean</b> 命令。"
+"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1013
+#, fuzzy
+msgid "Rebuild"
+msgstr "构建"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1017
+#: buildtools/qmake/trollprojectwidget.cpp:2186
+msgid "Run qmake"
+msgstr "运行 qmake"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1018
+msgid ""
+"<b>Run qmake</b>"
+"<p>Runs <b>qmake</b> from the selected subproject directory. This creates or "
+"regenerates Makefile."
+msgstr "<b>运行 qmake</b><p>在当前选中的子工程目录中运行 <b>qmake</b> 命令。它将创建或者重新创建 Makefile。"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1019
+#, fuzzy
+msgid "Run qmake recursively"
+msgstr "递归(&B)"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1020
+#, fuzzy
+msgid ""
+"<b>Run qmake recursively</b>"
+"<p>Runs <b>qmake</b> from the selected subproject directory and recurses into "
+"all subproject directories. This creates or regenerates Makefile."
+msgstr "<b>运行 qmake</b><p>在当前选中的子工程目录中运行 <b>qmake</b> 命令。它将创建或者重新创建 Makefile。"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1025
+#: buildtools/qmake/trollprojectwidget.cpp:1050
+msgid "Add Subproject..."
+msgstr "添加子工程..."
+
+#: buildtools/autotools/autosubprojectview.cpp:189
+#: buildtools/qmake/trollprojectwidget.cpp:1031
+msgid "Remove Subproject..."
+msgstr "删除子工程..."
+
+#: buildtools/qmake/trollprojectwidget.cpp:1032
+msgid ""
+"<b>Remove subproject</b>"
+"<p>Removes currently selected subproject. Does not delete any file from disk. "
+"Deleted subproject can be later added by calling 'Add Subproject' action."
+msgstr "<b>删除子工程</b><p>删除当前选中的子工程。它并不删除磁盘上的任何文件。被删除的子工程以后还可以用“添加子工程”动作再次添加。"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1035
+#: buildtools/qmake/trollprojectwidget.cpp:1045
+msgid "Create Scope..."
+msgstr "创建范围..."
+
+#: buildtools/qmake/trollprojectwidget.cpp:1036
+#, fuzzy
+msgid ""
+"<b>Create scope</b>"
+"<p>Creates TQMake scope in the project file of the currently selected "
+"subproject."
+msgstr "<b>创建范围</b><p>在当前选中的子工程的工程文件中创建 QMake 范围。"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1038
+msgid "Subproject Settings"
+msgstr "子工程选项"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1039
+#, fuzzy
+msgid ""
+"<b>Subproject settings</b>"
+"<p>Opens <b>TQMake Subproject Configuration</b> dialog. It provides settings "
+"for:"
+"<br>subproject type and configuration,"
+"<br>include and library paths,"
+"<br>lists of dependencies and external libraries,"
+"<br>build order,"
+"<br>intermediate files locations,"
+"<br>compiler options."
+msgstr ""
+"<b>子工程选项</b>"
+"<p>打开 <b>QMake 子工程配置</b>对话框。它提供如下设置："
+"<br>子工程类型和配置；"
+"<br>头文件和库路径；"
+"<br>依赖关系和外部库列表；"
+"<br>编译顺序；"
+"<br>中间文件位置；"
+"<br>编译器选项。"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1046
+#, fuzzy
+msgid ""
+"<b>Create Scope</b>"
+"<p>Creates TQMake scope in the currently selected scope."
+msgstr "<b>创建范围</b><p>在当前所选中的范围中创建 QMake 范围。"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1047
+msgid "Remove Scope"
+msgstr "删除范围"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1048
+msgid "<b>Remove Scope</b><p>Removes currently selected scope."
+msgstr "<b>删除范围</b><p>删除当前选中的范围。"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1051
+#, fuzzy
+msgid ""
+"<b>Add subproject</b>"
+"<p>Creates a <i>new</i> or adds an <i>existing</i> subproject to the currently "
+"selected scope. This action is allowed only if the type of the subproject is "
+"'subdirectories'. The type of the subproject can be defined in the <b>"
+"Subproject Settings</b> dialog (open it from the subproject context menu)."
+msgstr ""
+"<b>添加子工程</b>"
+"<p>在当前选择的子工程中创建<i>新的</i>或者添加一个<i>现有的</i>子工程。只有当子工程的类型为“子目录”时才允许这个动作。子工程的类型可以在<b>"
+"子工程设置</b>对话框中定义，该对话框能在子工程环境菜单中打开。"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1056
+#, fuzzy
+msgid "Disable Subproject..."
+msgstr "添加子工程..."
+
+#: buildtools/qmake/trollprojectwidget.cpp:1057
+#, fuzzy
+msgid ""
+"<b>Disable subproject</b>"
+"<p>Disables the currently selected subproject when this scope is active. Does "
+"not delete the directory from disk. The deleted subproject can be later added "
+"by using the 'Add Subproject' action."
+msgstr "<b>删除子工程</b><p>删除当前选中的子工程。它并不删除磁盘上的任何文件。被删除的子工程以后还可以用“添加子工程”动作再次添加。"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1062
+#, fuzzy
+msgid ""
+"<b>Scope settings</b>"
+"<p>Opens <b>TQMake Subproject Configuration</b> dialog. It provides settings "
+"for:"
+"<br>subproject type and configuration,"
+"<br>include and library paths,"
+"<br>lists of dependencies and external libraries,"
+"<br>build order,"
+"<br>intermediate files locations,"
+"<br>compiler options."
+msgstr ""
+"<b>子工程选项</b>"
+"<p>打开 <b>QMake 子工程配置</b>对话框。它提供如下设置："
+"<br>子工程类型和配置；"
+"<br>头文件和库路径；"
+"<br>依赖关系和外部库列表；"
+"<br>编译顺序；"
+"<br>中间文件位置；"
+"<br>编译器选项。"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1191
+msgid ""
+"You did not select a subproject to add the file to, or select a subproject that "
+"has subdirs."
+msgstr ""
+
+#: buildtools/qmake/trollprojectwidget.cpp:1191
+#, fuzzy
+msgid "File adding aborted"
+msgstr "文件已更改"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1262
+msgid "All Files"
+msgstr "所有文件"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1376
+msgid "Insert New Filepattern"
+msgstr "插入新文件模板"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1377
+msgid ""
+"Please enter a filepattern relative the current subproject (example "
+"docs/*.html):"
+msgstr "请输入相对于当前子工程的文件模板(例如 docs/*.html)："
+
+#: buildtools/qmake/trollprojectwidget.cpp:1392
+msgid "Insert New Install Object"
+msgstr "插入新安装对象"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1393
+msgid "Please enter a name for the new object:"
+msgstr "请输入新对象的名称："
+
+#: buildtools/qmake/trollprojectwidget.cpp:1546
+msgid "Add Install Object..."
+msgstr "添加安装对象..."
+
+#: buildtools/qmake/trollprojectwidget.cpp:1547
+#, fuzzy
+msgid ""
+"<b>Add install object</b>"
+"<p>Creates TQMake install object. It is possible to define a list of files to "
+"install and installation locations for each object. Warning! Install objects "
+"without path specified will not be saved to a project file."
+msgstr ""
+"<b>添加安装对象</b>"
+"<p>创建 QMake 安装对象。它可以定义每个安装对象要安装的文件列表和安装位置。警告！未指定路径的安装对象将不会被保存在工程文件中。"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1553
+msgid "Install Path..."
+msgstr "安装路径..."
+
+#: buildtools/qmake/trollprojectwidget.cpp:1554
+msgid ""
+"<b>Install path</b>"
+"<p>Allows to choose the installation path for the current install object."
+msgstr "<b>安装路径</b><p>允许选择当前安装对象的安装路径。"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1555
+msgid "Add Pattern of Files to Install..."
+msgstr "添加要安装的文件模板..."
+
+#: buildtools/qmake/trollprojectwidget.cpp:1556
+msgid ""
+"<b>Add pattern of files to install</b>"
+"<p>Defines the pattern to match files which will be installed. It is possible "
+"to use wildcards and relative paths like <i>docs/*</i>."
+msgstr "<b>添加要安装的文件模板</b><p>定义和要安装的文件相匹配的文件模板，可以使用通配符和相对路径，比如 <i>docs/*</i>。"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1558
+#, fuzzy
+msgid "Remove Install Object"
+msgstr "添加安装对象"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1559
+#, fuzzy
+msgid ""
+"<b>Remove install object</b>"
+"<p>Removes the install object the current group."
+msgstr "<b>删除所有断点</b><p>删除工程中的所有断点。"
+
+#: buildtools/autotools/autodetailsview.cpp:189
+#: buildtools/autotools/autodetailsview.cpp:190
+#: buildtools/qmake/trollprojectwidget.cpp:1563
+#: buildtools/qmake/trollprojectwidget.cpp:1578
+msgid "Create New File..."
+msgstr "创建新文件..."
+
+#: buildtools/qmake/trollprojectwidget.cpp:1564
+msgid ""
+"<b>Create new file</b>"
+"<p>Creates a new translation file and adds it to a currently selected "
+"TRANSLATIONS group."
+msgstr "<b>创建新文件</b><p>创建新的翻译文件并把它添加到当前选中的 TRANSLATIONS 分组中。"
+
+#: buildtools/autotools/autodetailsview.cpp:198
+#: buildtools/autotools/autodetailsview.cpp:199
+#: buildtools/qmake/trollprojectwidget.cpp:1565
+#: buildtools/qmake/trollprojectwidget.cpp:1580
+msgid "Add Existing Files..."
+msgstr "添加已有的文件..."
+
+#: buildtools/qmake/trollprojectwidget.cpp:1566
+msgid ""
+"<b>Add existing files</b>"
+"<p>Adds existing translation (*.ts) files to a currently selected TRANSLATIONS "
+"group. It is possible to copy files to a current subproject directory, create "
+"symbolic links or add them with the relative path."
+msgstr ""
+"<b>添加已有的文件</b>"
+"<p>添加已有的翻译文件 (*.ts) 到当前选中的 TRANSLATIONS 分组中。可以复制文件到当前子工程目录中、创建符号链接或者通过相对路径添加它们。"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1569
+msgid "Update Translation Files"
+msgstr "更新翻译文件"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1570
+msgid ""
+"<b>Update Translation Files</b>"
+"<p>Runs <b>lupdate</b> command from the current subproject directory. It "
+"collects translatable messages and saves them into translation files."
+msgstr "<b>更新翻译文件</b><p>在当前子工程目录中运行 <b>lupdate</b> 命令。它收集可翻译的消息并保存到翻译文件中。"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1572
+msgid "Release Binary Translations"
+msgstr "发布翻译结果"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1573
+msgid ""
+"<b>Release Binary Translations</b>"
+"<p>Runs <b>lrelease</b> command from the current subproject directory. It "
+"creates binary translation files that are ready to be loaded at program "
+"execution."
+msgstr ""
+"<b>发布翻译结果</b>"
+"<p>在当前子工程目录中运行 <b>lrelease</b> 命令。它创建二进制的翻译文件，可在程序运行时直接加载。"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1590
+msgid "Choose Install Path"
+msgstr "选择安装路径"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1590
+msgid "Enter a path (example /usr/local/share/... ):"
+msgstr "输入一个路径(例如 /usr/local/share/... )："
+
+#: buildtools/qmake/trollprojectwidget.cpp:1604
+msgid "Add Pattern of Files to Install"
+msgstr "添加要安装的文件模板"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1605
+#: buildtools/qmake/trollprojectwidget.cpp:1906
+msgid ""
+"Enter a pattern relative to the current subproject (example docs/*.html):"
+msgstr "输入相对于当前子工程的模板(例如 docs/*.html)："
+
+#: buildtools/qmake/trollprojectwidget.cpp:1725
+msgid "Add Install Object"
+msgstr "添加安装对象"
+
+#: buildtools/qmake/trollprojectwidget.cpp:1726
+msgid "Enter a name for the new object:"
+msgstr "输入新对象的名称："
+
+#: buildtools/autotools/autodetailsview.cpp:557
+#: buildtools/qmake/trollprojectwidget.cpp:1760
 #, c-format
-msgid "&Redo: %1"
-msgstr "重做(&R)：%1"
+msgid "File: %1"
+msgstr "文件：%1"
 
-#: kdevdesigner/designer/mainwindow.cpp:1580
-msgid "Choose Pixmap..."
-msgstr "选择像素图..."
+#: buildtools/qmake/trollprojectwidget.cpp:1762
+#, c-format
+msgid "Pattern: %1"
+msgstr "模板：%1"
 
-#: kdevdesigner/designer/mainwindow.cpp:1584
-msgid "Edit Text..."
-msgstr "编辑文本..."
+#: buildtools/autotools/autodetailsview.cpp:580
+#: buildtools/qmake/trollprojectwidget.cpp:1775
+msgid "Edit ui-Subclass..."
+msgstr "编辑用户界面子类..."
 
-#: kdevdesigner/designer/mainwindow.cpp:1588
-msgid "Edit Title..."
-msgstr "编辑标题..."
+#: buildtools/autotools/autodetailsview.cpp:581
+#: buildtools/qmake/trollprojectwidget.cpp:1776
+msgid ""
+"<b>Edit ui-subclass</b>"
+"<p>Launches <b>Subclassing</b> wizard and prompts to implement missing in "
+"childclass slots and functions."
+msgstr "<b>编辑用户界面子类</b><p>启动<b>子类</b>向导，询问尚缺少的子类信号槽和函数实现。"
 
-#: kdevdesigner/designer/mainwindow.cpp:1592
-#: kdevdesigner/designer/mainwindow.cpp:1702
-msgid "Edit Page Title..."
-msgstr "编辑页面标题..."
+#: buildtools/autotools/autodetailsview.cpp:565
+#: buildtools/qmake/trollprojectwidget.cpp:1781
+msgid "Subclassing Wizard..."
+msgstr "子类向导..."
 
-#: kdevdesigner/designer/mainwindow.cpp:1623
-#: kdevdesigner/designer/mainwindow.cpp:1637
-#: kdevdesigner/designer/mainwindow.cpp:1646
-#: kdevdesigner/designer/mainwindow.cpp:1661
-#: kdevdesigner/designer/mainwindow.cpp:1695
-#: kdevdesigner/designer/mainwindow.cpp:2469
-msgid "Delete Page"
-msgstr "删除页面"
+#: buildtools/autotools/autodetailsview.cpp:566
+#: buildtools/qmake/trollprojectwidget.cpp:1782
+msgid ""
+"<b>Subclass widget</b>"
+"<p>Launches <b>Subclassing</b> wizard. It allows to create a subclass from the "
+"class defined in .ui file. There is also possibility to implement slots and "
+"functions defined in the base class."
+msgstr "<b>子类部件</b><p>启动<b>子类</b>向导。它允许从 .ui 文件中定义的类创建子类。也可以实现基类中定义的信号槽和函数。"
 
-#: kdevdesigner/designer/mainwindow.cpp:1626
-#: kdevdesigner/designer/mainwindow.cpp:1640
-#: kdevdesigner/designer/mainwindow.cpp:1649
-#: kdevdesigner/designer/mainwindow.cpp:1664
-#: kdevdesigner/designer/mainwindow.cpp:1699
-#: kdevdesigner/designer/mainwindow.cpp:2468
-msgid "Add Page"
-msgstr "添加页面"
+#: buildtools/autotools/autodetailsview.cpp:586
+#: buildtools/qmake/trollprojectwidget.cpp:1787
+msgid "Open ui.h File"
+msgstr "打开 ui.h 文件"
 
-#: kdevdesigner/designer/mainwindow.cpp:1632
-msgid "Previous Page"
-msgstr "上一页"
+#: buildtools/autotools/autodetailsview.cpp:587
+#: buildtools/qmake/trollprojectwidget.cpp:1788
+#, fuzzy
+msgid ""
+"<b>Open ui.h file</b>"
+"<p>Opens .ui.h file associated with the selected .ui."
+msgstr "<b>打开 ui.h 文件</b><p>打开和所选的 .ui 文件相关联的 ui.h 文件。"
 
-#: kdevdesigner/designer/mainwindow.cpp:1634
-msgid "Next Page"
-msgstr "下一页"
+#: buildtools/autotools/autodetailsview.cpp:574
+#: buildtools/qmake/trollprojectwidget.cpp:1790
+msgid "List of Subclasses..."
+msgstr "子类列表..."
 
-#: kdevdesigner/designer/mainwindow.cpp:1667
-msgid "Rename Current Page..."
-msgstr "重命名当前页..."
+#: buildtools/autotools/autodetailsview.cpp:575
+#: buildtools/qmake/trollprojectwidget.cpp:1791
+msgid ""
+"<b>List of subclasses</b>"
+"<p>Shows subclasses list editor. There is possibility to add or remove "
+"subclasses from the list."
+msgstr "<b>子类列表</b><p>显示子类列表编辑器，可以在列表中添加或删除子类。"
 
-#: kdevdesigner/designer/mainwindow.cpp:1705
-msgid "Edit Pages..."
-msgstr "编辑页面..."
+#: buildtools/qmake/trollprojectwidget.cpp:1797
+#, fuzzy
+msgid ""
+"<b>Remove file</b>"
+"<p>Removes file from a current group. For sources, this also removes the "
+"subclassing information."
+msgstr "<b>删除文件</b><p>从当前分组中删除文件。它并不从磁盘上删除它。"
 
-#: kdevdesigner/designer/mainwindow.cpp:1711
-msgid "Add Menu Item"
-msgstr "添加菜单项"
+#: buildtools/qmake/trollprojectwidget.cpp:1798
+#, fuzzy
+msgid "Exclude File"
+msgstr "排除在此外(&E)："
 
-#: kdevdesigner/designer/mainwindow.cpp:1713
-msgid "Add Toolbar"
-msgstr "添加工具栏"
+#: buildtools/qmake/trollprojectwidget.cpp:1799
+msgid ""
+"<b>Exclude File</b>"
+"<p>Excludes the file from this Scope. Does not touch subclassing information"
+msgstr ""
 
-#: kdevdesigner/designer/mainwindow.cpp:1735
-#: kdevdesigner/designer/mainwindow.cpp:2638
-msgid "New text"
-msgstr "新建文本"
+#: buildtools/qmake/trollprojectwidget.cpp:1803
+#: buildtools/qmake/trollprojectwidget.cpp:1905
+msgid "Edit Pattern"
+msgstr "编辑模板"
 
-#: kdevdesigner/designer/mainwindow.cpp:1740
-#: kdevdesigner/designer/mainwindow.cpp:2643
-msgid "Set 'wordwrap' of '%1'"
-msgstr "设定“%1”的“wordwrap”"
+#: buildtools/qmake/trollprojectwidget.cpp:1804
+msgid "<b>Edit pattern</b><p>Allows to edit install files pattern."
+msgstr "<b>编辑模板</b><p>可以编辑安装文件模板。"
 
-#: kdevdesigner/designer/mainwindow.cpp:1749
-#: kdevdesigner/designer/mainwindow.cpp:2652
-msgid "Set the 'text' of '%1'"
-msgstr "设定“%1”的“text”"
+#: buildtools/qmake/trollprojectwidget.cpp:1805
+msgid "Remove Pattern"
+msgstr "删除模板"
 
-#: kdevdesigner/designer/mainwindow.cpp:1759
-#: kdevdesigner/designer/mainwindow.cpp:2665
-msgid "New title"
-msgstr "新建标题"
+#: buildtools/qmake/trollprojectwidget.cpp:1806
+msgid ""
+"<b>Remove pattern</b>"
+"<p>Removes install files pattern from the current install object."
+msgstr "<b>删除模板</b><p>从当前安装对象中删除安装文件模板。"
 
-#: kdevdesigner/designer/mainwindow.cpp:1762
-#: kdevdesigner/designer/mainwindow.cpp:2667
-msgid "Set the 'title' of '%2'"
-msgstr "设定“%2”的“title”"
+#: buildtools/qmake/trollprojectwidget.cpp:1817
+#, fuzzy
+msgid "Build File"
+msgstr "构建文件(&B)："
 
-#: kdevdesigner/designer/mainwindow.cpp:1772
-#: kdevdesigner/designer/mainwindow.cpp:1909
-#: kdevdesigner/designer/mainwindow.cpp:1968
-msgid "Page Title"
-msgstr "页面标题"
+#: buildtools/qmake/trollprojectwidget.cpp:1818
+#, fuzzy
+msgid "<b>Build File</b><p>Builds the object file for this source file."
+msgstr "<b>重建文件树</b><p>重新建立工程文件树。"
 
-#: kdevdesigner/designer/mainwindow.cpp:1772
-#: kdevdesigner/designer/mainwindow.cpp:1909
-#: kdevdesigner/designer/mainwindow.cpp:1968
-msgid "New page title"
-msgstr "新建页面标题"
+#: buildtools/qmake/trollprojectwidget.cpp:1934
+#, fuzzy
+msgid ""
+"Do you want to delete the file <strong>%1</strong> from the project and your "
+"disk?"
+msgstr "打开一个最近的工程"
 
-#: kdevdesigner/designer/mainwindow.cpp:1775
-msgid "Set the 'pageTitle' of '%2'"
-msgstr "设定“%2”的“pageTitle”"
+#: buildtools/qmake/trollprojectwidget.cpp:2052
+#, fuzzy
+msgid ""
+"Please specify the executable name in the project options dialog or select an "
+"application subproject in the TQMake Manager."
+msgstr "请先在工程对话框中指定可执行文件的名称。"
 
-#: kdevdesigner/designer/mainwindow.cpp:1788
-msgid "Set the 'pixmap' of '%2'"
-msgstr "设定“%2”的“pixmap”"
+#: buildtools/qmake/trollprojectwidget.cpp:2053
+#, fuzzy
+msgid "No Executable Found"
+msgstr "未指定可执行文件"
 
-#: kdevdesigner/designer/mainwindow.cpp:1859
-msgid "Raise next page of '%2'"
+#: buildtools/qmake/trollprojectwidget.cpp:2186
+msgid "There is no Makefile in this directory. Run qmake first?"
+msgstr "这个目录里没有 Makefile，要先运行 qmake 吗？"
+
+#: buildtools/autotools/autoprojectpart.cpp:654
+#: buildtools/autotools/autoprojectpart.cpp:665
+#: buildtools/autotools/configureoptionswidget.cpp:239
+#: buildtools/qmake/trollprojectwidget.cpp:2186
+#, fuzzy
+msgid "Do Not Run"
+msgstr "不运行(&N)"
+
+#: buildtools/qmake/trollprojectwidget.cpp:2276
+msgid ""
+"Could not delete Function Scope.\n"
+"This is an internal error, please write a bug report to bugs.kde.org and "
+"include the output of tdevelop when run from a shell."
 msgstr ""
 
-#: kdevdesigner/designer/mainwindow.cpp:1869
-msgid "Raise previous page of '%2'"
+#: buildtools/qmake/trollprojectwidget.cpp:2276
+#, fuzzy
+msgid "Function Scope Deletion failed"
+msgstr "函数"
+
+#: buildtools/qmake/trollprojectwidget.cpp:2284
+msgid ""
+"Could not delete Include Scope.\n"
+"This is an internal error, please write a bug report to bugs.kde.org and "
+"include the output of tdevelop when run from a shell."
 msgstr ""
 
-#: kdevdesigner/designer/mainwindow.cpp:1916
-msgid "Rename Page %1 to %2"
-msgstr "将页面 %1 重命名为 %2"
+#: buildtools/qmake/trollprojectwidget.cpp:2284
+#, fuzzy
+msgid "Include Scope Deletion failed"
+msgstr "包含应用程序图标"
 
-#: kdevdesigner/designer/mainwindow.cpp:1983
-msgid "Add Toolbar to '%1'"
-msgstr "将工具栏添加到“%1”"
+#: buildtools/qmake/trollprojectwidget.cpp:2296
+msgid ""
+"Could not delete Scope.\n"
+"This is an internal error, please write a bug report to bugs.kde.org and "
+"include the output of tdevelop when run from a shell."
+msgstr ""
 
-#: kdevdesigner/designer/mainwindow.cpp:1989
-msgid "Add Menu to '%1'"
-msgstr "将菜单添加到“%1”"
+#: buildtools/qmake/trollprojectwidget.cpp:2296
+msgid "Scope Deletion failed"
+msgstr ""
 
-#: kdevdesigner/designer/mainwindow.cpp:2613
-msgid "Edit %1..."
-msgstr "编辑 %1..."
+#: buildtools/qmake/trollprojectwidget.cpp:2462
+msgid ""
+"The project file \"%1\" has changed on disk\n"
+"(Or you have \"%2\" opened in the editor, which also triggers a reload when you "
+"change something in the TQMake Manager).\n"
+"\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: kdevdesigner/designer/mainwindow.cpp:2709
-msgid "Insert a %1 (custom widget)"
-msgstr "插入%1(自定义部件)"
+#: buildtools/qmake/trollprojectwidget.cpp:2462
+#, fuzzy
+msgid "Project File Changed"
+msgstr "文件已更改"
 
-#: kdevdesigner/designer/mainwindow.cpp:2710
+#: buildtools/qmake/projectconfigurationdlg.cpp:140
+#, fuzzy
+msgid "Save the current subproject's configuration?"
+msgstr "QMake 子工程设置"
+
+#: buildtools/qmake/projectconfigurationdlg.cpp:141
+#, fuzzy
+msgid "Save Configuration?"
+msgstr "CVS 服务器配置"
+
+#: buildtools/qmake/projectconfigurationdlg.cpp:1380
+msgid "Add include directory:"
+msgstr "添加头文件目录："
+
+#: buildtools/qmake/projectconfigurationdlg.cpp:1463
+msgid "Add Library: Either choose the .a/.so file or give -l<libname>"
+msgstr ""
+
+#: buildtools/autotools/targetoptionsdlg.cpp:297
+#: buildtools/qmake/projectconfigurationdlg.cpp:1465
+#, fuzzy
+msgid "Shared Library (*.so)"
+msgstr "共享库(&H)"
+
+#: buildtools/autotools/targetoptionsdlg.cpp:297
+#: buildtools/qmake/projectconfigurationdlg.cpp:1465
+#, fuzzy
+msgid "Static Library (*.a)"
+msgstr "静态库(&A)"
+
+#: buildtools/qmake/projectconfigurationdlg.cpp:1547
+msgid "Add library directory:"
+msgstr "添加库目录："
+
+#: buildtools/qmake/projectconfigurationdlg.cpp:1575
+msgid "Change include directory:"
+msgstr "改变头文件目录："
+
+#: buildtools/qmake/projectconfigurationdlg.cpp:1604
+#, fuzzy
+msgid "Change Library:"
+msgstr "选择库"
+
+#: buildtools/qmake/projectconfigurationdlg.cpp:1660
+msgid "Change library directory:"
+msgstr "改变库目录："
+
+#: buildtools/qmake/projectconfigurationdlg.cpp:1687
+msgid "Add target:"
+msgstr "添加目标："
+
+#: buildtools/qmake/projectconfigurationdlg.cpp:1708
+msgid "Change target:"
+msgstr "改变目标："
+
+#: buildtools/qmake/qmakescopeitem.cpp:89
+msgid "Headers"
+msgstr "头文件"
+
+#: buildtools/qmake/qmakescopeitem.cpp:93
+msgid "Forms"
+msgstr "界面表单"
+
+#: buildtools/qmake/qmakescopeitem.cpp:97
+msgid "Corba IDLs"
+msgstr "Corba IDL 文件"
+
+#: buildtools/qmake/qmakescopeitem.cpp:101
+msgid "Lexsources"
+msgstr "Lex 源文件"
+
+#: buildtools/qmake/qmakescopeitem.cpp:105
+msgid "Yaccsources"
+msgstr "Yacc 源文件"
+
+#: buildtools/qmake/qmakescopeitem.cpp:109
+msgid "Images"
+msgstr "图片"
+
+#: buildtools/qmake/qmakescopeitem.cpp:113
+#, fuzzy
+msgid "Resources"
+msgstr "Lex 源文件"
+
+#: buildtools/qmake/qmakescopeitem.cpp:117
+msgid "Distfiles"
+msgstr ""
+
+#: buildtools/qmake/qmakescopeitem.cpp:125
+msgid "Installs"
+msgstr "安装"
+
+#: buildtools/qmake/qmakescopeitem.cpp:129
+msgid "Install object"
+msgstr "安装对象"
+
+#: buildtools/qmake/qmakescopeitem.cpp:134
+msgid "Source Files"
+msgstr "源文件"
+
+#: buildtools/qmake/trollprojectpart.cpp:82
+#: buildtools/qmake/trollprojectpart.cpp:89
+#: buildtools/qmake/trollprojectpart.cpp:279
+#, fuzzy
+msgid "TQMake Manager"
+msgstr "QMake 管理器"
+
+#: buildtools/qmake/trollprojectpart.cpp:83
+#, fuzzy
 msgid ""
-"<b>%1 (custom widget)</b>"
-"<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> "
-"menu to add and change custom widgets. You can add properties as well as "
-"signals and slots to integrate them into Qt Designer, and provide a pixmap "
-"which will be used to represent the widget on the form.</p>"
+"<b>TQMake manager</b>"
+"<p>The TQMake manager project tree consists of two parts. The 'overview' in the "
+"upper half shows the subprojects, each one having a .pro file. The 'details' "
+"view in the lower half shows the list of files for the active subproject "
+"selected in the overview."
 msgstr ""
+"<b>QMake 管理器</b>"
+"<p>QMake 工程树包括两部分，上半部分的“概要”显示子工程，每个子工程有一个 Makefile.am "
+"文件。下半部分的“细节”视图显示概述列表中当前选中的子工程中的文件列表。"
 
-#: kdevdesigner/designer/mainwindow.cpp:2844
-msgid "Restoring Last Session"
-msgstr "恢复上次会话"
+#: buildtools/qmake/trollprojectpart.cpp:89
+#, fuzzy
+msgid "TQMake manager"
+msgstr "QMake 管理器"
 
-#: kdevdesigner/designer/mainwindow.cpp:2845
+#: buildtools/qmake/trollprojectpart.cpp:111
+msgid "&Rebuild Project"
+msgstr "重新编译工程(&R)"
+
+#: buildtools/qmake/trollprojectpart.cpp:119
+#, fuzzy
+msgid "&Install Project"
+msgstr "安装对象"
+
+#: buildtools/qmake/trollprojectpart.cpp:122
+#, fuzzy
+msgid "Install project"
+msgstr "安装对象"
+
+#: buildtools/qmake/trollprojectpart.cpp:123
+#, fuzzy
 msgid ""
-"Qt Designer found some temporary saved files, which were\n"
-"written when Qt Designer crashed last time. Do you want to\n"
-"load these files?"
+"<b>Install project</b>"
+"<p>Runs <b>make install</b> from the project directory."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
 msgstr ""
+"<b>安装</b>"
+"<p>在工程目录中执行 <b>make install</b> 命令。"
+"<br>环境变量和编译参数可以在工程设置的<b>编译选项</b>页中指定。"
 
-#: kdevdesigner/designer/mainwindow.cpp:2909
-msgid "There is no help available for this dialog at the moment."
+#: buildtools/autotools/autoprojectpart.cpp:178
+#: buildtools/qmake/trollprojectpart.cpp:131
+msgid ""
+"<b>Clean project</b>"
+"<p>Runs <b>make clean</b> command from the project directory."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
 msgstr ""
+"<b>清理工程</b>"
+"<p>在工程目录中运行 <b>make clean</b> 命令。"
+"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
 
-#: kdevdesigner/designer/mainwindow.cpp:3069
-msgid "Open File"
-msgstr "打开文件"
+#: buildtools/qmake/trollprojectpart.cpp:135
+#, fuzzy
+msgid "&Dist-Clean Project"
+msgstr "清理工程(&C)"
 
-#: kdevdesigner/designer/mainwindow.cpp:3070
-#: kdevdesigner/designer/mainwindow.cpp:3086
-msgid "Could not open '%1'. File does not exist."
-msgstr "无法打开“%1”。文件不存在。"
+#: buildtools/qmake/trollprojectpart.cpp:138
+#, fuzzy
+msgid "Dist-Clean project"
+msgstr "清理工程"
 
-#: kdevdesigner/designer/formwindow.cpp:360
-msgid "&Horizontal"
-msgstr "水平(&H)"
+#: buildtools/qmake/trollprojectpart.cpp:139
+#, fuzzy
+msgid ""
+"<b>Dist-Clean project</b>"
+"<p>Runs <b>make distclean</b> command from the project directory."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
+msgstr ""
+"<b>清理工程</b>"
+"<p>在工程目录中运行 <b>make clean</b> 命令。"
+"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
 
-#: kdevdesigner/designer/formwindow.cpp:380
-#: kdevdesigner/designer/formwindow.cpp:507
+#: buildtools/qmake/trollprojectpart.cpp:147
+#, fuzzy
 msgid ""
-"<b>A %1 (custom widget)</b> "
-"<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> "
-"menu to add and change custom widgets. You can add properties as well as "
-"signals and slots to integrate custom widgets into <i>Qt Designer</i>"
-", and provide a pixmap which will be used to represent the widget on the "
-"form.</p>"
+"<b>Execute program</b>"
+"<p>Executes the currently selected subproject if it is an application or the "
+"program specified in project settings, <b>Run Options</b> tab."
+msgstr "<b>执行主程序</b><p>执行在工程设置的<b>运行选项</b>页中指定的主程序"
+
+#: buildtools/qmake/trollprojectpart.cpp:149
+msgid "&Build Subproject"
+msgstr "构建子工程(&B)"
+
+#: buildtools/qmake/trollprojectpart.cpp:158
+msgid "&Rebuild Subproject"
+msgstr "重新构建子工程(&R)"
+
+#: buildtools/qmake/trollprojectpart.cpp:167
+#, fuzzy
+msgid "&Install Subproject"
+msgstr "安装对象"
+
+#: buildtools/qmake/trollprojectpart.cpp:170
+#, fuzzy
+msgid "Install subproject"
+msgstr "安装对象"
+
+#: buildtools/qmake/trollprojectpart.cpp:171
+#, fuzzy
+msgid ""
+"<b>Install subproject</b>"
+"<p>Runs <b>make install</b> from the current subproject directory. The current "
+"subproject is the subproject selected in the <b>TQMake manager</b> "
+"'overview' window."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
 msgstr ""
+"<b>构建子工程</b>"
+"<p>在当前子工程目录中运行 <b>make</b> 命令。当前子工程是在 <b>QMake 管理器</b>的“概要”窗口中选中的子工程。"
+"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
 
-#: kdevdesigner/designer/formwindow.cpp:387
-#: kdevdesigner/designer/formwindow.cpp:514
-msgid "A %1 (custom widget)"
-msgstr "%1(自定义部件)"
+#: buildtools/qmake/trollprojectpart.cpp:176
+msgid "&Clean Subproject"
+msgstr "清理子工程(&C)"
 
-#: kdevdesigner/designer/formwindow.cpp:458
+#: buildtools/qmake/trollprojectpart.cpp:179
+msgid "Clean subproject"
+msgstr "清理子工程"
+
+#: buildtools/qmake/trollprojectpart.cpp:180
 #, fuzzy
-msgid "Reparent Widgets"
-msgstr "删除方法(&D)"
+msgid ""
+"<b>Clean subproject</b>"
+"<p>Runs <b>make clean</b> from the current subproject directory. The current "
+"subproject is the subproject selected in the <b>TQMake manager</b> "
+"'overview' window."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
+msgstr ""
+"<b>清理子工程</b>"
+"<p>在当前子工程目录中运行 <b>make clean</b> 命令。当前子工程是在 <b>QMake 管理器</b>的“概要”窗口中选中的子工程。"
+"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
 
-#: kdevdesigner/designer/formwindow.cpp:466
-#: kdevdesigner/designer/formwindow.cpp:472
-#: kdevdesigner/designer/formwindow.cpp:482
+#: buildtools/qmake/trollprojectpart.cpp:185
+#, fuzzy
+msgid "&Dist-Clean Subproject"
+msgstr "清理子工程(&C)"
+
+#: buildtools/qmake/trollprojectpart.cpp:188
+#, fuzzy
+msgid "Dist-Clean subproject"
+msgstr "清理子工程"
+
+#: buildtools/qmake/trollprojectpart.cpp:189
+#, fuzzy
+msgid ""
+"<b>Dist-Clean subproject</b>"
+"<p>Runs <b>make distclean</b> from the current subproject directory. The "
+"current subproject is the subproject selected in the <b>TQMake manager</b> "
+"'overview' window."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
+msgstr ""
+"<b>清理子工程</b>"
+"<p>在当前子工程目录中运行 <b>make clean</b> 命令。当前子工程是在 <b>QMake 管理器</b>的“概要”窗口中选中的子工程。"
+"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
+
+#: buildtools/qmake/trollprojectpart.cpp:194
+msgid "Execute Subproject"
+msgstr "执行子工程"
+
+#: buildtools/qmake/trollprojectpart.cpp:291
+#, fuzzy
+msgid "Loading Project..."
+msgstr "正在工程插件..."
+
+#: buildtools/qmake/trollprojectpart.cpp:299
+#, fuzzy
+msgid "Choose TQt3 directory"
+msgstr "选择工程目录"
+
+#: buildtools/qmake/trollprojectpart.cpp:300
+msgid ""
+"Choose the TQt3 directory to use. This directory needs to have an include "
+"directory containing tqt.h."
+msgstr ""
+
+#: buildtools/qmake/trollprojectpart.cpp:312
+msgid ""
+"The directory you gave is not a proper TQt directory, the project might not "
+"work properly without one.\n"
+"Please make sure you give a directory that contains a bin with the qmake binary "
+"in it and for TQt3 project also contains an include directory with tqt.h in "
+"it.\n"
+"Do you want to try setting a TQt directory again?"
+msgstr ""
+
+#: buildtools/qmake/trollprojectpart.cpp:318
+#, fuzzy
+msgid "Wrong TQt directory given"
+msgstr "去除空目录(&P)"
+
+#: buildtools/qmake/trollprojectpart.cpp:333
+msgid ""
+"You did not specify a TQt directory, and the project might not work properly "
+"without one.\n"
+"Do you want to try setting a TQt directory again?"
+msgstr ""
+
+#: buildtools/qmake/trollprojectpart.cpp:336
+#, fuzzy
+msgid "No TQt directory given"
+msgstr "下一个目录"
+
+#: buildtools/qmake/trollprojectpart.cpp:351
+#, fuzzy
+msgid "Choose TQMake executable"
+msgstr "htsearch 可执行文件(&A)："
+
+#: buildtools/qmake/trollprojectpart.cpp:352
+msgid ""
+"Choose the TQMake binary to use. TQMake is used to generate Makefiles from the "
+"project files."
+msgstr ""
+
+#: buildtools/qmake/trollprojectpart.cpp:363
+msgid ""
+"The binary you gave is not executable, the project might not work properly.\n"
+"Please make sure you give a qmake binary that is executable.\n"
+"Do you want to try setting the TQMake binary again?"
+msgstr ""
+
+#: buildtools/qmake/trollprojectpart.cpp:367
+#, fuzzy
+msgid "Wrong TQMake binary given"
+msgstr "去除空目录(&P)"
+
+#: buildtools/qmake/trollprojectpart.cpp:382
+msgid ""
+"You did not specify a TQMake binary, and the project might not work properly "
+"without one.\n"
+"Do you want to try setting a TQMake binary again?"
+msgstr ""
+
+#: buildtools/qmake/trollprojectpart.cpp:385
+#, fuzzy
+msgid "No TQMake binary given"
+msgstr "下一个目录"
+
+#: buildtools/autotools/choosetargetdialog.cpp:265
+#, fuzzy
+msgid ""
+"The file %1 already exists in the chosen target.\n"
+"The file will be created but will not be added to the target.\n"
+"Rename the file and select 'Add Existing Files' from the Automake Manager."
+msgstr ""
+"文件 %1 在所选择的目标中已经存在！\n"
+"该文件将被创建，但是不添加到目标中。\n"
+"请重新命名文件，然后从 Automake 管理器中选择“添加已有的文件”。"
+
+#: buildtools/autotools/choosetargetdialog.cpp:267
+msgid "Error While Adding Files"
+msgstr "添加文件出错"
+
+#: buildtools/autotools/addexistingfilesdlg.cpp:75
+#: buildtools/autotools/addfiledlg.cpp:51
+#: buildtools/autotools/autodetailsview.cpp:315
+#: buildtools/autotools/autodetailsview.cpp:337
+#: buildtools/autotools/autodetailsview.cpp:419
+#: buildtools/autotools/autodetailsview.cpp:498
+#: buildtools/autotools/removefiledlg.cpp:74
+#: buildtools/autotools/removetargetdlg.cpp:52
+msgid "%1 in %2"
+msgstr "%2 中的 %1"
+
+#: buildtools/autotools/addexistingfilesdlg.cpp:88
+#, fuzzy
+msgid "Drag one or more files from the left view and drop it here."
+msgstr "请从上面拖放一个或多个文件到这里！"
+
+#: buildtools/autotools/addexistingfilesdlg.cpp:203
+msgid ""
+"The following file(s) already exist(s) in the target!\n"
+"Press Continue to import only the new files.\n"
+"Press Cancel to abort the complete import."
+msgstr ""
+"下列文件已经存在于目标中！\n"
+"请按继续来只导入新的文件。\n"
+"请按取消来中止整个导入过程。"
+
+#: buildtools/autotools/addexistingfilesdlg.cpp:235
 #, c-format
-msgid "Insert %1"
-msgstr "插入 %1"
+msgid "Importing... %p%"
+msgstr "正在导入…… %p%"
 
-#: kdevdesigner/designer/formwindow.cpp:663
-msgid "Set buddy for '%1' to..."
+#: buildtools/autotools/addexistingfilesdlg.cpp:261
+msgid ""
+"The following file(s) are not in the Subproject directory.\n"
+"Press Link to add the files by creating symbolic links.\n"
+"Press Copy to copy the files into the directory."
 msgstr ""
+"下列文件不在子工程的目录中。\n"
+"请按链接来通过创建符号链接来添加文件。\n"
+"请按拷贝来将文件拷贝到目录中。"
 
-#: kdevdesigner/designer/formwindow.cpp:665
-msgid "Connect '%1' with..."
-msgstr "将“%1”连接到..."
+#: buildtools/autotools/addexistingfilesdlg.cpp:264
+msgid "Link (recommended)"
+msgstr "链接(推荐)"
 
-#: kdevdesigner/designer/formwindow.cpp:687
-#: kdevdesigner/designer/formwindow.cpp:733
-msgid "Change Tab Order"
-msgstr "更改 Tab 顺序"
+#: buildtools/autotools/addexistingfilesdlg.cpp:264
+msgid "Copy (not recommended)"
+msgstr "拷贝(不推荐)"
 
-#: kdevdesigner/designer/formwindow.cpp:874
-msgid "Connect '%1' to '%2'"
+#: buildtools/autotools/autodetailsview.cpp:285
+#: buildtools/autotools/targetoptionsdlg.cpp:40
+msgid "Target Options for '%1'"
+msgstr "“%1”的目标选项"
+
+#: buildtools/autotools/targetoptionsdlg.cpp:47
+msgid "Link convenience libraries inside project (LDADD)"
+msgstr "连接工程内的代码库 (LDADD)"
+
+#: buildtools/autotools/targetoptionsdlg.cpp:48
+msgid "Link libraries outside project (LDADD)"
+msgstr "连接工程外的代码库 (LDADD)"
+
+#: buildtools/autotools/targetoptionsdlg.cpp:295
+msgid ""
+"Add Library: Choose the .a/.so file, give -l<libname> "
+"or use a variable with $(FOOBAR)"
 msgstr ""
 
-#: kdevdesigner/designer/formwindow.cpp:902
-msgid "Set buddy '%1' to '%2'"
+#: buildtools/autotools/targetoptionsdlg.cpp:337
+#, fuzzy
+msgid "Edit External Library"
+msgstr "编辑外部库："
+
+#: buildtools/autotools/targetoptionsdlg.cpp:337
+msgid "Edit external library:"
+msgstr "编辑外部库："
+
+#: buildtools/autotools/addprefixdlg.cpp:27
+msgid "Add Prefix"
+msgstr "添加前缀"
+
+#: buildtools/autotools/addprefixdlg.cpp:35
+msgid "&Path:"
+msgstr "路径(&P)："
+
+#: buildtools/autotools/addservicedlg.cpp:139
+#, fuzzy
+msgid "Enter Value"
+msgstr "外部的"
+
+#: buildtools/autotools/addservicedlg.cpp:139
+msgid "Property %1:"
+msgstr "属性 %1："
+
+#: buildtools/autotools/addapplicationdlg.cpp:120
+#: buildtools/autotools/addservicedlg.cpp:160
+msgid "You have to enter a file name."
+msgstr "您需要输入一个文件名。"
+
+#: buildtools/autotools/addservicedlg.cpp:167
+msgid "You have to enter a service name."
+msgstr "您需要输入一个服务名。"
+
+#: buildtools/autotools/addapplicationdlg.cpp:141
+#: buildtools/autotools/addservicedlg.cpp:174
+msgid "A file with this name exists already."
+msgstr "这个名字的文件已经存在。"
+
+#: buildtools/autotools/addapplicationdlg.cpp:146
+#: buildtools/autotools/addservicedlg.cpp:179
+msgid "Could not open file for writing."
+msgstr "无法打开文件进行写入。"
+
+#: buildtools/autotools/removefiledlg.cpp:65
+msgid ""
+"The file %1 is still used by the following targets:\n"
+"%2\n"
+"Remove it from all of them?"
 msgstr ""
+"文件 %1 仍在被下列目标使用：\n"
+"%2\n"
+"将它从所有目标中去掉吗？"
 
-#: kdevdesigner/designer/formwindow.cpp:905
-msgid "Set buddy '%1' to ..."
+#: buildtools/autotools/removefiledlg.cpp:70
+msgid "Do you really want to remove <b>%1</b>?"
+msgstr "您真的要删除 <b>%1</b> 吗？"
+
+#: buildtools/autotools/kimporticonview.cpp:66
+msgid "Or just use the buttons."
 msgstr ""
 
-#: kdevdesigner/designer/formwindow.cpp:963
-#: kdevdesigner/designer/formwindow.cpp:1068
-msgid "Inserting Widget"
-msgstr "插入部件"
+#: buildtools/autotools/subprojectoptionsdlg.cpp:48
+msgid "Subproject Options for '%1'"
+msgstr "“%1”的子工程选项"
 
-#: kdevdesigner/designer/formwindow.cpp:964
-#: kdevdesigner/designer/formwindow.cpp:1069
+#: buildtools/autotools/subprojectoptionsdlg.cpp:305
 msgid ""
-"You tried to insert a widget into the layout Container Widget '%1'.\n"
-"This is not possible. In order to insert the widget, the layout of '%1'\n"
-"must first be broken.\n"
-"Break the layout or cancel the operation?"
+"Add Include directory: Choose directory, give -Idirectory or use a variable "
+"with -I$(FOOBAR)"
 msgstr ""
 
-#: kdevdesigner/designer/formwindow.cpp:1047
+#: buildtools/autotools/subprojectoptionsdlg.cpp:331
+#, fuzzy
+msgid "Edit Include Directory"
+msgstr "编辑头文件目录："
+
+#: buildtools/autotools/subprojectoptionsdlg.cpp:331
+msgid "Edit include directory:"
+msgstr "编辑头文件目录："
+
+#: buildtools/autotools/subprojectoptionsdlg.cpp:360
+msgid "Edit Prefix"
+msgstr "编辑前缀"
+
+#: buildtools/autotools/addfiledlg.cpp:80
+msgid "This file is already in the target."
+msgstr "这个文件在目标中已经存在。"
+
+#: buildtools/autotools/addfiledlg.cpp:91
+#: buildtools/autotools/addfiledlg.cpp:103
+#, fuzzy
+msgid ""
+"<b>A file with this name already exists.</b>"
+"<br>"
+"<br>Please use the \"Add existing file\" dialog."
+msgstr "<b>一个同名的文件已经存在！</b><br><br>请使用“添加已有的文件”对话框！"
+
+#: buildtools/autotools/addtranslationdlg.cpp:37
+msgid "Add Translation"
+msgstr "添加翻译"
+
+#: buildtools/autotools/addtranslationdlg.cpp:79
+msgid "Your sourcecode is already translated to all supported languages."
+msgstr "您的源代码已经被翻译为所有支持的语言。"
+
+#: buildtools/autotools/addtranslationdlg.cpp:97
+msgid "A translation file for the language %1 exists already."
+msgstr "一个翻译为 %1 语言的文件已经存在。"
+
+#: buildtools/autotools/autodetailsview.cpp:179
+#: buildtools/autotools/autosubprojectview.cpp:175
+msgid "Options..."
+msgstr "选项..."
+
+#: buildtools/autotools/autosubprojectview.cpp:177
+#, fuzzy
+msgid ""
+"<qt><b>Options</b>"
+"<p>Shows subproject options dialog that provides settings for compiler, include "
+"paths, prefixes and build order.</qt>"
+msgstr "<b>选项</b><p>显示子工程选项对话框，它提供编译器设置、头文件路径、前缀和编译顺序设置。"
+
+#: buildtools/autotools/autosubprojectview.cpp:182
+#: buildtools/autotools/autosubprojectview.cpp:183
+#, fuzzy
+msgid "Add new subproject..."
+msgstr "添加子工程..."
+
+#: buildtools/autotools/autosubprojectview.cpp:185
+#, fuzzy
+msgid ""
+"<qt><b>Add new subproject</b>"
+"<p>Creates a new subproject in currently selected subproject.</qt>"
+msgstr "<b>添加子工程</b><p>在当前选中的子工程中添加新的子工程。"
+
+#: buildtools/autotools/autosubprojectview.cpp:191
+#, fuzzy
+msgid ""
+"<qt><b>Remove subproject</b>"
+"<p>Removes the subproject. Asks if the subproject should be also removed from "
+"disk. Only subprojects which do not hold other subprojects can be removed.</qt>"
+msgstr "<b>删除子工程</b><p>删除子工程，并询问是否从磁盘上删除子工程。只有不包含其它子工程的子工程才能被删除。"
+
+#: buildtools/autotools/autosubprojectview.cpp:194
+msgid "Add Existing Subprojects..."
+msgstr "添加已有的子工程"
+
+#: buildtools/autotools/autosubprojectview.cpp:196
+#, fuzzy
+msgid ""
+"<qt><b>Add existing subprojects</b>"
+"<p>Imports existing subprojects containing Makefile.am.</qt>"
+msgstr "<b>添加已有的子工程</b><p>导入已有的含有 Makefile.am 文件的子工程。"
+
+#: buildtools/autotools/autosubprojectview.cpp:199
+#: buildtools/autotools/autosubprojectview.cpp:200
+msgid "Add Target..."
+msgstr "添加目标..."
+
+#: buildtools/autotools/autosubprojectview.cpp:202
+#, fuzzy
+msgid ""
+"<qt><b>Add target</b>"
+"<p>Adds a new target to the currently selected subproject. Target can be a "
+"binary program, library, script, also a collection of data or header files.</qt>"
+msgstr "<b>添加目标</b><p>在当前选择的子工程中添加新的目标。目标可以是可执行程序、库、脚本，或者一组数据或头文件。"
+
+#: buildtools/autotools/autosubprojectview.cpp:208
+#: buildtools/autotools/autosubprojectview.cpp:209
+msgid "Add Service..."
+msgstr "添加服务..."
+
+#: buildtools/autotools/autosubprojectview.cpp:211
+#, fuzzy
+msgid ""
+"<qt><b>Add service</b>"
+"<p>Creates a .desktop file describing the service.</qt>"
+msgstr "<b>添加服务</b><p>创建描述该服务的 .desktop 文件。"
+
+#: buildtools/autotools/autosubprojectview.cpp:214
+#: buildtools/autotools/autosubprojectview.cpp:215
+msgid "Add Application..."
+msgstr "添加程序..."
+
+#: buildtools/autotools/autosubprojectview.cpp:217
+#, fuzzy
+msgid "<qt><b>Add application</b><p>Creates an application .desktop file.</qt>"
+msgstr "<b>添加应用程序</b><p>创建应用程序的 .desktop 文件。"
+
+#: buildtools/autotools/autosubprojectview.cpp:223
+#, fuzzy
+msgid ""
+"<qt><b>Build</b>"
+"<p>Runs <b>make</b> from the directory of the selected subproject."
+"<br> Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab.</qt>"
+msgstr ""
+"<b>编译</b>"
+"<p>在所选择的子工程目录中运行 <b>make</b> 命令。"
+"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
+
+#: buildtools/autotools/autosubprojectview.cpp:229
+msgid "Force Reedit"
+msgstr "强制重新编辑"
+
+#: buildtools/autotools/autosubprojectview.cpp:231
+#, fuzzy
+msgid ""
+"<qt><b>Force Reedit</b>"
+"<p>Runs <b>make force-reedit</b> from the directory of the selected subproject."
+"<br>This recreates makefile (tip: and solves most of .moc related problems)"
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab.</qt>"
+msgstr ""
+"<b>强制重新编辑</b>"
+"<p>在所选择的子工程目录中运行 <b>make force-reedit</b> 命令。"
+"<br>这将重新创建 makefile (提示：并解决一些和 .moc 有关的问题)。"
+"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
+
+#: buildtools/autotools/autosubprojectview.cpp:243
+#, fuzzy
+msgid ""
+"<qt><b>Clean</b>"
+"<p>Runs <b>make clean</b> from the directory of the selected subproject."
+"<br> Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab.</qt>"
+msgstr ""
+"<b>清理</b>"
+"<p>在所选择的子工程目录中运行 <b>make clean</b> 命令。"
+"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
+
+#: buildtools/autotools/autosubprojectview.cpp:250
+#, fuzzy
+msgid ""
+"<qt><b>Install</b>"
+"<p>Runs <b>make install</b> from the directory of the selected subproject."
+"<br> Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab.</qt>"
+msgstr ""
+"<b>安装</b>"
+"<p>在所选择的子工程目录中运行 <b>make install</b> 命令。"
+"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
+
+#: buildtools/autotools/autosubprojectview.cpp:256
+#, fuzzy
+msgid ""
+"<qt><b>Install as root user</b>"
+"<p>Runs <b>make install</b> command from the directory of the selected "
+"subproject with root privileges."
+"<br> It is executed via tdesu command."
+"<br> Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab.</qt>"
+msgstr ""
+"<b>用 root 身份安装</b>"
+"<p>用 root 身份在所选择的子工程目录中运行 <b>make install</b> 命令。"
+"<br>它是通过 tdesu 命令来执行的。"
+"<br>环境变量和编译参数可以在工程设置对话框的<b>编译选项</b>页中指定。"
+
+#: buildtools/autotools/autosubprojectview.cpp:263
+msgid "Expand Subtree"
+msgstr "展开子树"
+
+#: buildtools/autotools/autosubprojectview.cpp:265
+msgid "Collapse Subtree"
+msgstr "折叠子树"
+
+#: buildtools/autotools/autosubprojectview.cpp:268
+msgid "Manage Custom Commands..."
+msgstr "管理自定义命令..."
+
+#: buildtools/autotools/autosubprojectview.cpp:270
+msgid ""
+"<qt><b>Manage custom commands</b>"
+"<p>Allows to create, edit and delete custom build commands which appears in the "
+"subproject context menu."
+"<br></qt>"
+msgstr ""
+
+#: buildtools/autotools/autosubprojectview.cpp:283
 #, c-format
-msgid "Set Buddy for %1"
-msgstr "设定的 %1 的好友"
+msgid "Subproject: %1"
+msgstr "子工程：%1"
 
-#: kdevdesigner/designer/formwindow.cpp:1313
-#: kdevdesigner/designer/formwindow.cpp:1351
+#: buildtools/autotools/autosubprojectview.cpp:353
+msgid "Add New Subproject to '%1'"
+msgstr "添加新的子工程到“%1”"
+
+#: buildtools/autotools/autosubprojectview.cpp:365
+msgid "Add Existing Subproject to '%1'"
+msgstr "添加已有的子工程到“%1”"
+
+#: buildtools/autotools/autosubprojectview.cpp:380
+msgid "Add New Target to '%1'"
+msgstr "添加新目标到“%1”"
+
+#: buildtools/autotools/autosubprojectview.cpp:395
+msgid "Add New Service to '%1'"
+msgstr "添加新服务到“%1”"
+
+#: buildtools/autotools/autosubprojectview.cpp:410
+msgid "Add New Application to '%1'"
+msgstr "添加新应用程序到“%1”"
+
+#: buildtools/autotools/autosubprojectview.cpp:438
+msgid "This item cannot be removed"
+msgstr "这个项目无法删除"
+
+#: buildtools/autotools/autoprojectpart.cpp:83
+#: buildtools/autotools/autoprojectpart.cpp:90
+#: buildtools/autotools/autosubprojectview.cpp:438
+msgid "Automake Manager"
+msgstr "Automake 管理器"
+
+#: buildtools/autotools/autosubprojectview.cpp:451
+msgid "There is no subproject %1 in SUBDIRS"
+msgstr "在 SUBDIRS 中没有子工程 %1"
+
+#: buildtools/autotools/autosubprojectview.cpp:456
+#, c-format
+msgid "Remove Subproject %1"
+msgstr "删除子工程 %1"
+
+#: buildtools/autotools/autosubprojectview.cpp:457
+msgid "Do you really want to remove subproject %1 with all targets and files?"
+msgstr "您真要删除子工程 %1 及所有目标和文件吗？"
+
+#: buildtools/autotools/autosubprojectview.cpp:1020
+msgid "Manage Custom Commands"
+msgstr ""
+
+#: buildtools/autotools/addtargetdlg.cpp:40
+#: buildtools/autotools/autoprojectwidget.cpp:61
+msgid "Program"
+msgstr "程序"
+
+#: buildtools/autotools/addtargetdlg.cpp:41
+#: buildtools/autotools/autoprojectwidget.cpp:63
+msgid "Library"
+msgstr "库"
+
+#: buildtools/autotools/addtargetdlg.cpp:42
+#: buildtools/autotools/autoprojectwidget.cpp:65
+msgid "Libtool Library"
+msgstr "Libtool 库"
+
+#: buildtools/autotools/addtargetdlg.cpp:43
+#: buildtools/autotools/autoprojectwidget.cpp:67
+msgid "Script"
+msgstr "脚本"
+
+#: buildtools/autotools/addtargetdlg.cpp:44
+#: buildtools/autotools/autoprojectwidget.cpp:69
+msgid "Header"
+msgstr "头文件"
+
+#: buildtools/autotools/autoprojectwidget.cpp:71
+msgid "Data"
+msgstr "数据"
+
+#: buildtools/autotools/addtargetdlg.cpp:46
+#: buildtools/autotools/autoprojectwidget.cpp:73
+msgid "Java"
+msgstr "Java"
+
+#: buildtools/autotools/autoprojectwidget.cpp:633
+msgid "Documentation data"
+msgstr "文档数据"
+
+#: buildtools/autotools/autoprojectwidget.cpp:635
 #, fuzzy
-msgid "Use Size Hint"
-msgstr "水平展开(&H)"
+msgid "KDE Icon data"
+msgstr "TDE 图标数据"
 
-#: kdevdesigner/designer/formwindow.cpp:1743
-msgid "Click widgets to change the tab order..."
+#: buildtools/autotools/autoprojectwidget.cpp:637
+msgid "%1 (%2 in %3)"
+msgstr "%1 (%3 中的 %2)"
+
+#: buildtools/autotools/addtargetdlg.cpp:45
+msgid "Data File"
+msgstr "数据文件"
+
+#: buildtools/autotools/addtargetdlg.cpp:145
+#, fuzzy
+msgid "You have to give the target a name"
+msgstr "您需要给目标指定名字！"
+
+#: buildtools/autotools/addtargetdlg.cpp:151
+#, fuzzy
+msgid "Libraries must have a lib prefix."
+msgstr "库必须用 lib 作前缀！"
+
+#: buildtools/autotools/addtargetdlg.cpp:156
+#, fuzzy
+msgid "Libtool libraries must have a lib prefix."
+msgstr "Libtool 库必须用 lib 作前缀！"
+
+#: buildtools/autotools/addtargetdlg.cpp:161
+#, fuzzy
+msgid "Libtool libraries must have a .la suffix."
+msgstr "Libtool 库必须用 .la 作后缀！"
+
+#: buildtools/autotools/addtargetdlg.cpp:179
+#, fuzzy
+msgid "A target with this name already exists."
+msgstr "同名的目标已经存在！"
+
+#: buildtools/autotools/addicondlg.cpp:46
+msgid "Action"
+msgstr "动作"
+
+#: buildtools/autotools/addicondlg.cpp:47
+msgid "Device"
+msgstr "设备"
+
+#: buildtools/autotools/addicondlg.cpp:48
+msgid "File System"
+msgstr "文件系统"
+
+#: buildtools/autotools/addicondlg.cpp:49
+msgid "MIME Type"
+msgstr "MIME 类型"
+
+#: buildtools/autotools/fileselectorwidget.cpp:65
+msgid "Short View"
+msgstr "简短视图"
+
+#: buildtools/autotools/fileselectorwidget.cpp:84
+msgid "Home directory"
+msgstr "主目录"
+
+#: buildtools/autotools/fileselectorwidget.cpp:87
+msgid "Up one level"
+msgstr "上一级"
+
+#: buildtools/autotools/fileselectorwidget.cpp:90
+msgid "Previous directory"
+msgstr "前一个"
+
+#: buildtools/autotools/fileselectorwidget.cpp:93
+msgid "Next directory"
+msgstr "下一个目录"
+
+#: buildtools/autotools/autolistviewitems.cpp:134
+#, fuzzy
+msgid "Edit Substitution"
+msgstr "函数"
+
+#: buildtools/autotools/autolistviewitems.cpp:134
+#, fuzzy
+msgid "Substitution:"
+msgstr "描述："
+
+#: buildtools/autotools/autoprojectpart.cpp:84
+msgid ""
+"<b>Automake manager</b>"
+"<p>The project tree consists of two parts. The 'overview' in the upper half "
+"shows the subprojects, each one having a Makefile.am. The 'details' view in the "
+"lower half shows the targets and files for the subproject selected in the "
+"overview."
 msgstr ""
+"<b>Automake 管理器</b>"
+"<p>工程树包括两部分，上半部分的“概要”显示子工程，每个子工程有一个 Makefile.am "
+"文件。下半部分的“细节”视图显示概述列表中选中的子工程的目标和文件。"
 
-#: kdevdesigner/designer/formwindow.cpp:1754
-msgid "Drag a line to create a connection..."
+#: buildtools/autotools/autoprojectpart.cpp:90
+msgid "Automake manager"
+msgstr "Automake 管理器"
+
+#: buildtools/autotools/autoprojectpart.cpp:93
+msgid "Add Translation..."
+msgstr "添加翻译..."
+
+#: buildtools/autotools/autoprojectpart.cpp:96
+msgid "Add translation"
+msgstr "添加翻译"
+
+#: buildtools/autotools/autoprojectpart.cpp:97
+msgid "<b>Add translation</b><p>Creates .po file for the selected language."
+msgstr "<b>添加翻译</b><p>为所选择的语种创建 .po 文件。"
+
+#: buildtools/autotools/autoprojectpart.cpp:113
+msgid "Build &Active Target"
+msgstr "构建活动目标(&A)"
+
+#: buildtools/autotools/autoprojectpart.cpp:116
+msgid "Build active target"
+msgstr "构建活动目标"
+
+#: buildtools/autotools/autoprojectpart.cpp:117
+msgid ""
+"<b>Build active target</b>"
+"<p>Constructs a series of make commands to build an active target. Also builds "
+"dependent targets."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
 msgstr ""
+"<b>编译活动目标</b>"
+"<p>构造一系列编译命令，编译活动的目标，并编译所依赖的目标。"
+"<br>环境变量和编译参数可以在工程设置的<b>编译选项</b>页中指定。"
 
-#: kdevdesigner/designer/formwindow.cpp:1756
-msgid "Drag a line to set a buddy..."
+#: buildtools/autotools/autoprojectpart.cpp:132
+msgid "Run Configure"
+msgstr "运行 Configure"
+
+#: buildtools/autotools/autoprojectpart.cpp:135
+#: buildtools/autotools/autoprojectpart.cpp:665
+msgid "Run configure"
+msgstr "运行 Configure"
+
+#: buildtools/autotools/autoprojectpart.cpp:136
+msgid ""
+"<b>Run configure</b>"
+"<p>Executes <b>configure</b> with flags, arguments and environment variables "
+"specified in the project settings dialog, <b>Configure Options</b> tab."
 msgstr ""
+"<b>运行 configure</b>"
+"<p>用工程设置的<b>配置选项</b>页中指定的标志、参数和环境变量执行 <b>configure</b>。"
 
-#: kdevdesigner/designer/formwindow.cpp:1762
-msgid "Click on the form to insert a %1..."
+#: buildtools/autotools/autoprojectpart.cpp:141
+#: buildtools/autotools/autoprojectpart.cpp:144
+msgid "Run automake && friends"
+msgstr "运行 automake 工具集"
+
+#: buildtools/autotools/autoprojectpart.cpp:145
+msgid ""
+"<b>Run automake && friends</b>"
+"<p>Executes"
+"<br><b>make -f Makefile.cvs</b>"
+"<br><b>./configure</b>"
+"<br>commands from the project directory."
 msgstr ""
+"<b>运行 automake 工具集</b>"
+"<p>在工程目录中执行下列命令："
+"<br><b>make -f Makefile.cvs</b>"
+"<br><b>./configure</b>"
 
-#: kdevdesigner/designer/formwindow.cpp:1834
+#: buildtools/autotools/autoprojectpart.cpp:148
+#: buildtools/autotools/autoprojectpart.cpp:151
+#, fuzzy
+msgid "Update admin module"
+msgstr "更新索引"
+
+#: buildtools/autotools/autoprojectpart.cpp:152
 msgid ""
-"The following custom widgets are used in '%1',\n"
-"but are not known to Qt Designer:\n"
+"<b>Update admin module</b>"
+"<p>Recreates the project admin directory using the version present on the local "
+"system."
 msgstr ""
 
-#: kdevdesigner/designer/formwindow.cpp:1838
+#: buildtools/autotools/autoprojectpart.cpp:183
+msgid "&Distclean"
+msgstr "清理为发行版(&D)"
+
+#: buildtools/autotools/autoprojectpart.cpp:186
+msgid "Distclean"
+msgstr "清理为发行版"
+
+#: buildtools/autotools/autoprojectpart.cpp:187
 msgid ""
-"If you save this form and generate code for it using uic, \n"
-"the generated code will not compile.\n"
-"Do you want to save this form now?"
+"<b>Distclean</b>"
+"<p>Runs <b>make distclean</b> command from the project directory."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
 msgstr ""
+"<b>清理为发行版</b>"
+"<p>在工程目录中执行 <b>make distclean</b> 命令。"
+"<br>环境变量和编译参数可以在工程设置的<b>编译选项</b>页中指定。"
 
-#: kdevdesigner/designer/formwindow.cpp:1877
-msgid "Lower"
-msgstr "小写"
+#: buildtools/autotools/autoprojectpart.cpp:192
+msgid "Make Messages && Merge"
+msgstr "生成并合并消息"
 
-#: kdevdesigner/designer/formwindow.cpp:1937
+#: buildtools/autotools/autoprojectpart.cpp:195
+msgid "Make messages && merge"
+msgstr "生成并合并消息"
+
+#: buildtools/autotools/autoprojectpart.cpp:196
 msgid ""
-"_n: Accelerator '%1' is used once.\n"
-"Accelerator '%1' is used %n times."
-msgstr "加速键“%1”使用了 %n 次。"
+"<b>Make messages && merge</b>"
+"<p>Runs <b>make package-messages</b> command from the project directory."
+"<br>Environment variables and make arguments can be specified in the project "
+"settings dialog, <b>Make Options</b> tab."
+msgstr ""
+"<b>生成并合并消息</b>"
+"<p>在工程目录中执行 <b>make package-messages</b> 命令。"
+"<br>环境变量和编译参数可以在工程设置的<b>编译选项</b>页中指定。"
 
-#: kdevdesigner/designer/formwindow.cpp:1939
-msgid "&Select"
-msgstr "选择(&S)"
+#: buildtools/autotools/autoprojectpart.cpp:204
+msgid "Build Configuration"
+msgstr "构建配置"
 
-#: kdevdesigner/designer/formwindow.cpp:1954
-msgid "No accelerator is used more than once."
-msgstr "没有使用多次的加速键。"
+#: buildtools/autotools/autoprojectpart.cpp:206
+msgid "Build configuration menu"
+msgstr "构建配置菜单"
 
-#: kdevdesigner/designer/formwindow.cpp:1964
+#: buildtools/autotools/autoprojectpart.cpp:207
+msgid ""
+"<b>Build configuration menu</b>"
+"<p>Allows to switch between project build configurations."
+"<br>Build configuration is a set of build and top source directory settings, "
+"configure flags and arguments, compiler flags, etc."
+"<br>Modify build configurations in project settings dialog, <b>"
+"Configure Options</b> tab."
+msgstr ""
+"<b>编译配置菜单</b>"
+"<p>可以在工程编译配置之间切换。"
+"<br>编译配置是编译和顶层源代码目录设置、配置标志和参数、编译选项等的集合。"
+"<br>请在工程设置的<b>配置选项</b>页中改变编译配置。"
+
+#: buildtools/autotools/autoprojectpart.cpp:220
 #, fuzzy
-msgid "Raise"
-msgstr "发布版本号"
+msgid ""
+"<b>Execute program</b>"
+"<p>Executes the currently active target or the main program specified in "
+"project settings, <b>Run Options</b> tab."
+msgstr "<b>执行主程序</b><p>执行在工程设置的<b>运行选项</b>页中指定的主程序"
 
-#: kdevdesigner/designer/formwindow.cpp:2022
+#: buildtools/autotools/autoprojectpart.cpp:307
+msgid ""
+"No active target specified, running the application will\n"
+"not work until you make a target active in the Automake Manager\n"
+"on the right side or use the Main Program options under\n"
+"Project -> Project Options -> Run Options"
+msgstr ""
+
+#: buildtools/autotools/autoprojectpart.cpp:310
 #, fuzzy
-msgid "Lay Out Horizontally (in splitter)"
-msgstr "水平展开(&H)"
+msgid "No active target specified"
+msgstr "未发现活动目标"
 
-#: kdevdesigner/designer/formwindow.cpp:2032
+#: buildtools/autotools/autoprojectpart.cpp:415
+msgid ""
+"There is no active target.\n"
+"Unable to determine the main program."
+msgstr ""
+
+#: buildtools/autotools/autoprojectpart.cpp:416
+#: buildtools/autotools/autoprojectpart.cpp:1244
 #, fuzzy
-msgid "Lay Out Vertically (in splitter)"
-msgstr "垂直展开(&V)"
+msgid "No active target found"
+msgstr "未发现活动目标"
 
-#: kdevdesigner/designer/formwindow.cpp:2066
+#: buildtools/autotools/autoprojectpart.cpp:422
+msgid ""
+"Active target \"%1\" is not binary ( %2 ).\n"
+"Unable to determine the main program.  If you want this\n"
+"to be the active target, set a main program under\n"
+"Project -> Project Options -> Run Options"
+msgstr ""
+
+#: buildtools/autotools/autoprojectpart.cpp:425
+#: buildtools/autotools/autoprojectpart.cpp:1251
+msgid "Active target is not a library"
+msgstr ""
+
+#: buildtools/autotools/autoprojectpart.cpp:553
 #, fuzzy
-msgid "Lay Out Children Horizontally"
-msgstr "水平展开(&H)"
+msgid ""
+"The directory you selected is not the active directory.\n"
+"You should 'activate' the target you're currently working on in Automake "
+"Manager.\n"
+"Just right-click a target and choose 'Make Target Active'."
+msgstr ""
+"您指定的目录不是活动的目录！\n"
+"您应该用 Automake 管理器“激活”您当前正在工作的目标。\n"
+"只需用鼠标右键点击目标，并选择“激活目标”即可。"
 
-#: kdevdesigner/designer/formwindow.cpp:2087
+#: buildtools/autotools/autoprojectpart.cpp:556
+msgid "No Active Target Found"
+msgstr "未发现活动目标"
+
+#: buildtools/autotools/autoprojectpart.cpp:652
 #, fuzzy
-msgid "Lay Out Children Vertically"
-msgstr "垂直展开(&V)"
+msgid ""
+"%1\n"
+"There is no Makefile in this directory\n"
+"and no configure script for this project.\n"
+"Run automake & friends and configure first?"
+msgstr ""
+"这个目录里没有 Makefile，也没有此工程的配置脚本。\n"
+"要先运行 automake 工具集进行配置吗？"
 
-#: kdevdesigner/designer/formwindow.cpp:2111
+#: buildtools/autotools/autoprojectpart.cpp:654
+msgid "Run Them"
+msgstr "运行"
+
+#: buildtools/autotools/autoprojectpart.cpp:665
 #, fuzzy
-msgid "Lay Out Children in a Grid"
-msgstr "垂直展开(&V)"
+msgid ""
+"%1\n"
+"There is no Makefile in this directory. Run 'configure' first?"
+msgstr "这个目录里没有 Makefile，要先运行 configure 吗？"
 
-#: kdevdesigner/designer/formwindow.cpp:2223
-msgid "Edit connections..."
-msgstr "编辑连接..."
+#: buildtools/autotools/autoprojectpart.cpp:803
+msgid ""
+"Found a circular dependency in the project, between this target and %1.\n"
+"Cannot build this project until this is resolved."
+msgstr ""
 
-#: kdevdesigner/designer/projectsettingsimpl.cpp:96
+#: buildtools/autotools/autoprojectpart.cpp:803
+msgid "Circular Dependency found"
+msgstr ""
+
+#: buildtools/autotools/autoprojectpart.cpp:903
+msgid "Can only compile files in directories which belong to the project."
+msgstr "只能编译这个目录里属于此工程的文件。"
+
+#: buildtools/autotools/autoprojectpart.cpp:1018
 msgid ""
-"*.db|Database Files\n"
-"*|All Files"
+"There is neither a Makefile.cvs file nor an autogen.sh script in the project "
+"directory."
+msgstr "这个工程目录里既没有 Makefile.cvs 或者 autogen.sh 脚本。"
+
+#: buildtools/autotools/autoprojectpart.cpp:1243
+msgid ""
+"There is no active target.\n"
+"Unable to determine the main program"
 msgstr ""
-"*.db|数据库文件\n"
-"*|全部文件"
 
-#: kdevdesigner/designer/projectsettingsimpl.cpp:104
+#: buildtools/autotools/autoprojectpart.cpp:1248
 msgid ""
-"*.pro|Project Files\n"
-"*|All Files"
+"Active target \"%1\" is not binary ( %2 ).\n"
+"Unable to determine the main program. If you want this\n"
+"to be the active target, set a main program under\n"
+"Project -> Project Options -> Run Options"
 msgstr ""
-"*.pro|工程文件\n"
-"*|全部文件"
+
+#: buildtools/autotools/addsubprojectdlg.cpp:58
+msgid "You have to give the subproject a name."
+msgstr "您需要给子工程指定一个名字。"
+
+#: buildtools/autotools/addsubprojectdlg.cpp:65
+msgid "A subproject with this name already exists."
+msgstr "一个同名的子工程已经存在。"
+
+#: buildtools/autotools/addsubprojectdlg.cpp:75
+msgid ""
+"There is no config.status in the project root directory. Run 'Configure' first"
+msgstr "工程的根目录中没有config.status 文件，请先运行 configure。"
+
+#: buildtools/autotools/addsubprojectdlg.cpp:85
+msgid "A file named %1 already exists."
+msgstr "一个名为 %1 的文件已经存在。"
+
+#: buildtools/autotools/addsubprojectdlg.cpp:90
+msgid ""
+"A subdirectory %1 already exists. Do you wish to add it as a subproject?"
+msgstr "子目录 %1 已经存在。您要把它作为子工程添加吗？"
+
+#: buildtools/autotools/addsubprojectdlg.cpp:97
+#, c-format
+msgid "Could not create subdirectory %1."
+msgstr "无法创建子目录 %1。"
+
+#: buildtools/autotools/addsubprojectdlg.cpp:103
+#, c-format
+msgid "Could not access the subdirectory %1."
+msgstr "无法访问子目录 %1。"
+
+#: buildtools/autotools/addsubprojectdlg.cpp:151
+#, fuzzy, c-format
+msgid "Could not create Makefile.am in subdirectory %1."
+msgstr "无法在子目录 %1 里创建文件 Makefile.am"
+
+#: buildtools/autotools/autodetailsview.cpp:182
+#, fuzzy
+msgid ""
+"<b>Options</b>"
+"<p>Target options dialog that provides settings for linker flags and lists of "
+"dependencies and external libraries that are used when compiling the target."
+msgstr "<b>选项</b><p>目标选项对话框可以提供连接器选项、依赖关系和外部库列表等设置。"
+
+#: buildtools/autotools/autodetailsview.cpp:193
+msgid ""
+"<b>Create new file</b>"
+"<p>Creates a new file and adds it to a currently selected target."
+msgstr "<b>创建新文件</b><p>创建新文件并把它添加到当前选中的目标中。"
+
+#: buildtools/autotools/autodetailsview.cpp:202
+msgid ""
+"<b>Add existing files</b>"
+"<p>Adds existing file to a currently selected target. Header files will not be "
+"included in SOURCES list of a target. They will be added to noinst_HEADERS "
+"instead."
+msgstr ""
+"<b>添加已有的文件</b>"
+"<p>添加已有的文件到当前选中的目标中。头文件将不被包含在目标的 SOURCES 列表中，而是被添加到 noinst_HEADERS。"
+
+#: buildtools/autotools/autodetailsview.cpp:210
+msgid "Add Icon..."
+msgstr "添加图标..."
+
+#: buildtools/autotools/autodetailsview.cpp:212
+#, fuzzy
+msgid "<b>Add icon</b><p>Adds an icon to a KDEICON target."
+msgstr "<b>添加图标</b><p>添加一个图标到 TDEICON 目标。"
+
+#: buildtools/autotools/autodetailsview.cpp:214
+#, fuzzy
+msgid "Build Target"
+msgstr "构建目标(&T)"
+
+#: buildtools/autotools/autodetailsview.cpp:215
+msgid "Build Target..."
+msgstr "构建目标..."
+
+#: buildtools/autotools/autodetailsview.cpp:218
+msgid ""
+"<b>Build target</b>"
+"<p>Constructs a series of make commands to build the selected target. Also "
+"builds dependent targets."
+msgstr "<b>构建目标</b><p>构造一系列 make 命令构建所选中的目标，并构建依赖目标。"
+
+#: buildtools/autotools/autodetailsview.cpp:224
+#: buildtools/autotools/autodetailsview.cpp:225
+msgid "Execute Target..."
+msgstr "执行目标..."
+
+#: buildtools/autotools/autodetailsview.cpp:228
+#, fuzzy
+msgid ""
+"<b>Execute target</b>"
+"<p>Executes the target and tries to build in case it is not built."
+msgstr "<b>执行目标</b><p>执行应用程序目标。"
+
+#: buildtools/autotools/autodetailsview.cpp:233
+msgid "Make Target Active"
+msgstr "激活目标"
+
+#: buildtools/autotools/autodetailsview.cpp:236
+#, fuzzy
+msgid ""
+"<b>Make target active</b>"
+"<p>Marks the currently selected target as 'active'. New files and classes by "
+"default go to an active target. Using the <b>Build Active Target</b> "
+"menu command builds it."
+msgstr "<b>激活目标</b><p>将当前选中的目标标记为“活动”。新文件和类默认将添加到活动目标。<b>编译活动目标</b>菜单命令可以编译它。"
+
+#: buildtools/autotools/autodetailsview.cpp:247
+msgid ""
+"<b>Remove</b>"
+"<p>Shows a list of targets dependent on the selected target or file and asks "
+"for removal. Also asks if the target or file should be removed from disk."
+msgstr "<b>删除</b><p>显示依赖于当前选中的目标或文件的目标列表，询问是否进行删除，并询问是否应该将目标或文件从磁盘上删除。"
+
+#: buildtools/autotools/autodetailsview.cpp:319
+msgid "Add New File to '%1'"
+msgstr "添加新文件到“%1”"
+
+#: buildtools/autotools/autodetailsview.cpp:341
+msgid "Add Existing Files to '%1'"
+msgstr "添加已有的文件到“%1”"
+
+#: buildtools/autotools/autodetailsview.cpp:423
+msgid "Remove File From '%1'"
+msgstr "从“%1”中删除文件"
+
+#: buildtools/autotools/autodetailsview.cpp:450
+msgid "Remove Target From '%1'"
+msgstr "从“%1”中删除目标"
+
+#: buildtools/autotools/autodetailsview.cpp:502
+#, c-format
+msgid "Target: %1"
+msgstr "目标：%1"
+
+#: buildtools/autotools/configureoptionswidget.cpp:239
+msgid "Re-run configure for %1 now?"
+msgstr "现在重新运行 %1 的 configure 吗？"
+
+#: buildtools/autotools/configureoptionswidget.cpp:239
+#, fuzzy
+msgid "Rerun"
+msgstr "运行"
+
+#: buildtools/autotools/addexistingdirectoriesdlg.cpp:60
+#, fuzzy
+msgid ""
+"Drag one or more directories with an existing Makefile.am from the left view "
+"and drop it here."
+msgstr "请从上面拖拉一个或多个已含有 Makefile.am 的目录放到这里！"
+
+#: buildtools/autotools/removetargetdlg.cpp:48
+msgid ""
+"Do you really want to remove <b>%1</b>"
+"<br>with <b>all files</b> that are attached to it"
+"<br>and <b>all dependencies</b>?"
+msgstr "您真的要删除 <b>%1</b> 及其<br>附带的<b>所有文件</b><br>和<b>所有依赖信息</b>吗？"
+
+#: buildtools/autotools/removetargetdlg.cpp:111
+msgid ""
+"_: no dependency\n"
+"<none>"
+msgstr "<无>"
+
+#: buildtools/autotools/removetargetdlg.cpp:117
+#, c-format
+msgid "Removing Target... %p%"
+msgstr "正在删除目标...%p%"
+
+#: buildtools/autotools/addapplicationdlg.cpp:127
+msgid "You have to enter the file name of an executable program."
+msgstr "您需要输入可执行程序的文件名。"
+
+#: buildtools/autotools/addapplicationdlg.cpp:134
+msgid "You have to enter an application name."
+msgstr "您需要输入应用程序名。"
+
+#: buildtools/autotools/managecustomcommand.cpp:46
+msgid ""
+"_: this is a list of items in the combobox\n"
+"Make target,Make target (as root),Make command,Make command (as "
+"root),Command,Command (as root)"
+msgstr ""
+
+#: buildtools/ada/adaproject_part.cpp:341
+msgid ""
+"Could not find ada compiler.\n"
+"Check if your compiler settings are correct."
+msgstr ""
+"无法找到 ada 编译器。\n"
+"请检查您的编译器设置是否正确。"
+
+#: buildtools/ada/adaproject_part.cpp:422
+#, fuzzy
+msgid ""
+"There was an error loading the module %1.\n"
+"The diagnostics are:\n"
+"%2"
+msgstr ""
+"加载模块 %1 时发生错误。\n"
+"诊断信息为：\n"
+"%2"
 
 #: languages/cpp/configproblemreporter.ui.h:95
 #: languages/java/configproblemreporter.ui.h:49
 msgid "delay: %1 msec"
 msgstr ""
 
-#: languages/cpp/app_templates/kateplugin2/plugin_app.h:50
+#: languages/cpp/app_templates/kateplugin2/plugin_app.h:52
 msgid "Configure KatePlugin%{APPNAME}"
 msgstr ""
 
@@ -29253,12 +29370,12 @@ msgstr ""
 msgid "%{APPNAME} KOffice Program"
 msgstr "%{APPNAME} KOffice 程序"
 
-#: languages/cpp/debugger/breakpoint.h:132
+#: languages/cpp/debugger/breakpoint.h:133
 #: languages/ruby/debugger/breakpoint.h:89
 msgid "Invalid"
 msgstr "无效"
 
-#: languages/cpp/debugger/breakpoint.h:308
+#: languages/cpp/debugger/breakpoint.h:309
 #, fuzzy
 msgid "Read Watchpoint"
 msgstr "观察点"
@@ -29272,11 +29389,6 @@ msgstr "连接成功"
 msgid "Unable to connect to database server"
 msgstr "<无数据库服务器>"
 
-#: vcs/perforce/perforcepart.h:32
-#, fuzzy
-msgid "Perforce is a version control system"
-msgstr "版本控制系统(&V)："
-
 #: parts/snippet/snippetdlg.ui.h:20
 msgid ""
 "To use variables in a snippet, you just have to enclose the variablename with "
@@ -29284,10 +29396,10 @@ msgid ""
 "this variable. \n"
 "Example snippet: This is a $VAR$\n"
 "When you use this snippet you will be prompted for a value for the variable "
-"$VAR$. Any occourences of $VAR$ will then be replaced with whatever you've "
+"$VAR$. Any occurrences of $VAR$ will then be replaced with whatever you have "
 "entered.\n"
 "If you need a single $-character in a snippet, which is not used to enclose a "
-"variable, type $$(two dollar characters) instead. They will automatically be "
+"variable, type $$ (two dollar characters) instead. They will automatically be "
 "replaced with a single $-character when you use the snippet.\n"
 "If you want to change the default delimiter to anything different, please use "
 "the settings dialog to do so."
@@ -29307,6 +29419,10 @@ msgstr "(类)"
 msgid "(Functions)"
 msgstr "(函数)"
 
+#: kdevdesigner/designer/pixmapcollectioneditor.ui.h:115
+msgid "Choose Image"
+msgstr "选择图像"
+
 #: kdevdesigner/designer/connectiondialog.ui.h:209
 #, fuzzy
 msgid "Add Signal/Slot Connection"
@@ -29332,9 +29448,13 @@ msgstr "删除连接"
 msgid "Edit Signal/Slot Connections"
 msgstr "编辑数据库连接"
 
-#: kdevdesigner/designer/pixmapcollectioneditor.ui.h:115
-msgid "Choose Image"
-msgstr "选择图像"
+#: vcs/perforce/perforcepart.h:33
+#, fuzzy
+msgid "Perforce is a version control system"
+msgstr "版本控制系统(&V)："
+
+#~ msgid "Error compiling the regular expression."
+#~ msgstr "正则表达式编译错误。"
 
 #, fuzzy
 #~ msgid "Alt+C"
diff --git a/tde-i18n-zh_CN/messages/tdewebdev/kimagemapeditor.po b/tde-i18n-zh_CN/messages/tdewebdev/kimagemapeditor.po
index e93899cb80d..60d35b43181 100644
--- a/tde-i18n-zh_CN/messages/tdewebdev/kimagemapeditor.po
+++ b/tde-i18n-zh_CN/messages/tdewebdev/kimagemapeditor.po
@@ -5,34 +5,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kimagemapeditor\n"
-"POT-Creation-Date: 2007-12-30 01:24+0100\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-07-13 18:07+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: kimearea.h:180 kimedialogs.cpp:432
-msgid "Rectangle"
-msgstr "矩形"
-
-#: kimearea.h:203 kimedialogs.cpp:433
-msgid "Circle"
-msgstr "圆形"
-
-#: kimearea.h:229 kimedialogs.cpp:434
-msgid "Polygon"
-msgstr "多边形"
-
-#: kimagemapeditor.cpp:106 kimagemapeditor.cpp:135 mapslistview.cpp:29
-msgid "Maps"
-msgstr "映射"
-
-#: kimagemapeditor.cpp:245 mapslistview.cpp:158
-msgid "unnamed"
-msgstr "未命名"
-
 #: _translatorinfo.cpp:1
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -45,65 +26,6 @@ msgid ""
 "Your emails"
 msgstr "mhh@ricetons.com"
 
-#: kimagemapeditor.cpp:259 main.cpp:28
-msgid "An HTML imagemap editor"
-msgstr "一个HTML图片映射编辑器"
-
-#: main.cpp:34
-msgid "Write HTML-Code to stdout on exit"
-msgstr "退出时将 HTML 写入 stdout"
-
-#: main.cpp:35
-msgid "File to open"
-msgstr "要打开的文件"
-
-#: kimagemapeditor.cpp:258 main.cpp:43
-msgid "KImageMapEditor"
-msgstr "KImageMapEditor"
-
-#: main.cpp:47
-msgid "For helping me with the Makefiles, and creating the Debian package"
-msgstr "帮助我制作 Makefiles 和创建 Debian 包"
-
-#: main.cpp:48
-msgid "For helping me fixing --enable-final mode"
-msgstr "帮助我修复 --enable-final 模式"
-
-#: main.cpp:49
-msgid "For the Spanish translation"
-msgstr "帮助我完成西班牙语翻译"
-
-#: main.cpp:50
-msgid "For the Dutch translation"
-msgstr "帮助我完成芬兰语翻译"
-
-#: main.cpp:51
-msgid "For the French translation"
-msgstr "帮助我完成法语翻译"
-
-#: arealistview.cpp:38 kimagemapeditor.cpp:105 kimagemapeditor.cpp:134
-msgid "Areas"
-msgstr "区域"
-
-#: arealistview.cpp:39 kimedialogs.cpp:840
-msgid "Preview"
-msgstr "预览"
-
-#: arealistview.cpp:47
-msgid ""
-"<h3>Area List</h3>The area list shows you all areas of the map."
-"<br>The left column shows the link associated with the area; the right column "
-"shows the part of the image that is covered by the area."
-"<br>The maximum size of the preview images can be configured."
-msgstr ""
-"<h3>区域列表</h3>区域列表显示映射的所有区域。"
-"<br>左边的列显示关联到这一区域的链接；右边的区域显示被区域覆盖部分的图片。"
-"<br>您可以配置预览图片的最大大小。"
-
-#: arealistview.cpp:51
-msgid "A list of all areas"
-msgstr "所有区域列表"
-
 #: kimecommands.cpp:33
 #, c-format
 msgid "Cut %1"
@@ -144,6 +66,202 @@ msgstr "从 %1 删除端点"
 msgid "Create %1"
 msgstr "创建 %1"
 
+#: kimagemapeditor.cpp:106 kimagemapeditor.cpp:135 mapslistview.cpp:29
+msgid "Maps"
+msgstr "映射"
+
+#: kimagemapeditor.cpp:245 mapslistview.cpp:158
+msgid "unnamed"
+msgstr "未命名"
+
+#: kimedialogs.cpp:81
+msgid "Top &X:"
+msgstr "顶 &X："
+
+#: kimedialogs.cpp:92
+msgid "Top &Y:"
+msgstr "顶 &Y："
+
+#: kimedialogs.cpp:103
+msgid "&Width:"
+msgstr "宽度(&W)："
+
+#: kimedialogs.cpp:114
+msgid "Hei&ght:"
+msgstr "高度(&G)："
+
+#: kimedialogs.cpp:142
+msgid "Center &X:"
+msgstr "中 &X："
+
+#: kimedialogs.cpp:154
+msgid "Center &Y:"
+msgstr "中 &Y："
+
+#: kimedialogs.cpp:166
+msgid "&Radius:"
+msgstr "半径(&R)："
+
+#: kimedialogs.cpp:289
+msgid "Top &X"
+msgstr "顶 &X"
+
+#: kimedialogs.cpp:300
+msgid "Top &Y"
+msgstr "顶 &Y"
+
+#: kimedialogs.cpp:336
+msgid "&HREF:"
+msgstr "&HREF："
+
+#: kimedialogs.cpp:340
+msgid "Alt. &Text:"
+msgstr "Alt 文字(&T)："
+
+#: kimedialogs.cpp:341
+msgid "Tar&get:"
+msgstr "目标(&G)："
+
+#: kimedialogs.cpp:342
+msgid "Tit&le:"
+msgstr "标题(&L)："
+
+#: kimedialogs.cpp:346
+msgid "Enable default map"
+msgstr "输入默认映射"
+
+#: kimedialogs.cpp:376
+msgid "OnClick:"
+msgstr "OnClick："
+
+#: kimedialogs.cpp:377
+msgid "OnDblClick:"
+msgstr "OnDblClick："
+
+#: kimedialogs.cpp:378
+msgid "OnMouseDown:"
+msgstr "OnMouseDown："
+
+#: kimedialogs.cpp:379
+msgid "OnMouseUp:"
+msgstr "OnMouseUp："
+
+#: kimedialogs.cpp:380
+msgid "OnMouseOver:"
+msgstr "OnMouseOver："
+
+#: kimedialogs.cpp:381
+msgid "OnMouseMove:"
+msgstr "OnMouseMove："
+
+#: kimedialogs.cpp:382
+msgid "OnMouseOut:"
+msgstr "OnMouseOut："
+
+#: kimedialogs.cpp:423
+msgid "Area Tag Editor"
+msgstr "区域标记编辑器"
+
+#: kimearea.h:180 kimedialogs.cpp:432
+msgid "Rectangle"
+msgstr "矩形"
+
+#: kimearea.h:203 kimedialogs.cpp:433
+msgid "Circle"
+msgstr "圆形"
+
+#: kimearea.h:229 kimedialogs.cpp:434
+msgid "Polygon"
+msgstr "多边形"
+
+#: kimedialogs.cpp:435
+msgid "Selection"
+msgstr "选区"
+
+#: kimedialogs.cpp:459
+msgid "&General"
+msgstr "常规(&G)"
+
+#: kimedialogs.cpp:466
+msgid "Coor&dinates"
+msgstr "坐标(&D)"
+
+#: kimedialogs.cpp:468
+msgid "&JavaScript"
+msgstr "&JavaScript"
+
+#: kimagemapeditor.cpp:1614 kimedialogs.cpp:509 kimeshell.cpp:162
+msgid "All Files"
+msgstr "全部文件"
+
+#: kimedialogs.cpp:509
+msgid "Choose File"
+msgstr "选择文件"
+
+#: kimedialogs.cpp:574
+msgid "Choose Map & Image to Edit"
+msgstr "选择要编辑的映射和图像"
+
+#: kimedialogs.cpp:585
+msgid "Select an image and/or a map that you want to edit"
+msgstr "选择您想编辑的图片或映射"
+
+#: kimedialogs.cpp:596
+msgid "&Maps"
+msgstr "映射(&M)"
+
+#: kimedialogs.cpp:608
+msgid "Image Preview"
+msgstr "图像预览"
+
+#: kimedialogs.cpp:631
+msgid "No maps found"
+msgstr "没有找到映射"
+
+#: kimedialogs.cpp:656
+msgid "No images found"
+msgstr "没有找到图像"
+
+#: kimedialogs.cpp:669
+msgid "&Images"
+msgstr "图像(&I)"
+
+#: kimedialogs.cpp:678
+msgid "Path"
+msgstr "路径"
+
+#: kimedialogs.cpp:753
+msgid "Preferences"
+msgstr "首选项"
+
+#: kimedialogs.cpp:762
+msgid "&Maximum image preview height:"
+msgstr "图像的最大预览高度(&M)："
+
+#: kimedialogs.cpp:775
+msgid "&Undo limit:"
+msgstr "撤消限制(&U)："
+
+#: kimedialogs.cpp:785
+msgid "&Redo limit:"
+msgstr "重做限制(&R)："
+
+#: kimedialogs.cpp:794
+msgid "&Start with last used document"
+msgstr "启动时打开上次使用的文档(&S)"
+
+#: arealistview.cpp:39 kimedialogs.cpp:840
+msgid "Preview"
+msgstr "预览"
+
+#: kimearea.cpp:49
+msgid "noname"
+msgstr "未命名"
+
+#: kimearea.cpp:1451
+msgid "Number of Areas"
+msgstr "区域数"
+
 #: imageslistview.cpp:57 kimagemapeditor.cpp:107 kimagemapeditor.cpp:136
 #: kimeshell.cpp:160
 msgid "Images"
@@ -153,37 +271,41 @@ msgstr "图片"
 msgid "Usemap"
 msgstr "使用映射"
 
-#: kimearea.cpp:49
-msgid "noname"
-msgstr "未命名"
+#: kimeshell.cpp:159
+msgid "Web Files"
+msgstr "Web 文件"
 
-#: kimearea.cpp:1451
-msgid "Number of Areas"
-msgstr "区域数"
+#: kimeshell.cpp:161
+msgid "HTML Files"
+msgstr "HTML 文件"
 
-#. i18n: file kimagemapeditorpartui.rc line 50
-#: rc.cpp:12
-#, no-c-format
-msgid "&Map"
-msgstr "映射(&M)"
+#: kimeshell.cpp:162
+msgid "PNG Images"
+msgstr "PNG 图像"
 
-#. i18n: file kimagemapeditorpartui.rc line 61
-#: kimagemapeditor.cpp:549 rc.cpp:15
-#, no-c-format
-msgid "&Image"
-msgstr "图像(&I)"
+#: kimeshell.cpp:162
+msgid "JPEG Images"
+msgstr "JPEG 图像"
 
-#. i18n: file kimagemapeditorpartui.rc line 77
-#: rc.cpp:21 rc.cpp:30
-#, no-c-format
-msgid "KImageMapEditor Main Toolbar"
-msgstr "KImageMapEditor 主工具栏"
+#: kimeshell.cpp:162
+msgid "GIF Images"
+msgstr "GIF 图像"
 
-#. i18n: file kimagemapeditorpartui.rc line 96
-#: rc.cpp:24
-#, no-c-format
-msgid "KImageMapEditor Draw Toolbar"
-msgstr "KImageMapEditor 画图工具栏"
+#: kimeshell.cpp:163
+msgid "Choose Picture to Open"
+msgstr "选择要打开的图片"
+
+#: arealistview.cpp:38 kimagemapeditor.cpp:105 kimagemapeditor.cpp:134
+msgid "Areas"
+msgstr "区域"
+
+#: kimagemapeditor.cpp:258 main.cpp:43
+msgid "KImageMapEditor"
+msgstr "KImageMapEditor"
+
+#: kimagemapeditor.cpp:259 main.cpp:28
+msgid "An HTML imagemap editor"
+msgstr "一个HTML图片映射编辑器"
 
 #: kimagemapeditor.cpp:436
 msgid ""
@@ -334,6 +456,12 @@ msgstr "预览(&P)"
 msgid "Show a preview"
 msgstr "显示预览"
 
+#. i18n: file kimagemapeditorpartui.rc line 61
+#: kimagemapeditor.cpp:549 rc.cpp:15
+#, no-c-format
+msgid "&Image"
+msgstr "图像(&I)"
+
 #: kimagemapeditor.cpp:551
 msgid "Add Image..."
 msgstr "添加图像..."
@@ -564,10 +692,6 @@ msgstr "HTML 文件"
 msgid "Text File"
 msgstr "文本文件"
 
-#: kimagemapeditor.cpp:1614 kimedialogs.cpp:509 kimeshell.cpp:162
-msgid "All Files"
-msgstr "全部文件"
-
 #: kimagemapeditor.cpp:1625
 msgid ""
 "<qt>The file <em>%1</em> already exists."
@@ -624,186 +748,63 @@ msgstr "输入 Usemap"
 msgid "Enter the usemap value:"
 msgstr "输入 usemap 的值："
 
-#: kimeshell.cpp:159
-msgid "Web Files"
-msgstr "Web 文件"
-
-#: kimeshell.cpp:161
-msgid "HTML Files"
-msgstr "HTML 文件"
-
-#: kimeshell.cpp:162
-msgid "PNG Images"
-msgstr "PNG 图像"
-
-#: kimeshell.cpp:162
-msgid "JPEG Images"
-msgstr "JPEG 图像"
-
-#: kimeshell.cpp:162
-msgid "GIF Images"
-msgstr "GIF 图像"
-
-#: kimeshell.cpp:163
-msgid "Choose Picture to Open"
-msgstr "选择要打开的图片"
-
-#: kimedialogs.cpp:81
-msgid "Top &X:"
-msgstr "顶 &X："
-
-#: kimedialogs.cpp:92
-msgid "Top &Y:"
-msgstr "顶 &Y："
-
-#: kimedialogs.cpp:103
-msgid "&Width:"
-msgstr "宽度(&W)："
-
-#: kimedialogs.cpp:114
-msgid "Hei&ght:"
-msgstr "高度(&G)："
-
-#: kimedialogs.cpp:142
-msgid "Center &X:"
-msgstr "中 &X："
-
-#: kimedialogs.cpp:154
-msgid "Center &Y:"
-msgstr "中 &Y："
-
-#: kimedialogs.cpp:166
-msgid "&Radius:"
-msgstr "半径(&R)："
-
-#: kimedialogs.cpp:289
-msgid "Top &X"
-msgstr "顶 &X"
-
-#: kimedialogs.cpp:300
-msgid "Top &Y"
-msgstr "顶 &Y"
-
-#: kimedialogs.cpp:336
-msgid "&HREF:"
-msgstr "&HREF："
-
-#: kimedialogs.cpp:340
-msgid "Alt. &Text:"
-msgstr "Alt 文字(&T)："
-
-#: kimedialogs.cpp:341
-msgid "Tar&get:"
-msgstr "目标(&G)："
-
-#: kimedialogs.cpp:342
-msgid "Tit&le:"
-msgstr "标题(&L)："
-
-#: kimedialogs.cpp:346
-msgid "Enable default map"
-msgstr "输入默认映射"
-
-#: kimedialogs.cpp:376
-msgid "OnClick:"
-msgstr "OnClick："
-
-#: kimedialogs.cpp:377
-msgid "OnDblClick:"
-msgstr "OnDblClick："
-
-#: kimedialogs.cpp:378
-msgid "OnMouseDown:"
-msgstr "OnMouseDown："
-
-#: kimedialogs.cpp:379
-msgid "OnMouseUp:"
-msgstr "OnMouseUp："
-
-#: kimedialogs.cpp:380
-msgid "OnMouseOver:"
-msgstr "OnMouseOver："
-
-#: kimedialogs.cpp:381
-msgid "OnMouseMove:"
-msgstr "OnMouseMove："
-
-#: kimedialogs.cpp:382
-msgid "OnMouseOut:"
-msgstr "OnMouseOut："
-
-#: kimedialogs.cpp:423
-msgid "Area Tag Editor"
-msgstr "区域标记编辑器"
-
-#: kimedialogs.cpp:435
-msgid "Selection"
-msgstr "选区"
-
-#: kimedialogs.cpp:459
-msgid "&General"
-msgstr "常规(&G)"
-
-#: kimedialogs.cpp:466
-msgid "Coor&dinates"
-msgstr "坐标(&D)"
-
-#: kimedialogs.cpp:468
-msgid "&JavaScript"
-msgstr "&JavaScript"
-
-#: kimedialogs.cpp:509
-msgid "Choose File"
-msgstr "选择文件"
-
-#: kimedialogs.cpp:574
-msgid "Choose Map & Image to Edit"
-msgstr "选择要编辑的映射和图像"
-
-#: kimedialogs.cpp:585
-msgid "Select an image and/or a map that you want to edit"
-msgstr "选择您想编辑的图片或映射"
-
-#: kimedialogs.cpp:596
-msgid "&Maps"
+#. i18n: file kimagemapeditorpartui.rc line 50
+#: rc.cpp:12
+#, no-c-format
+msgid "&Map"
 msgstr "映射(&M)"
 
-#: kimedialogs.cpp:608
-msgid "Image Preview"
-msgstr "图像预览"
+#. i18n: file kimagemapeditorpartui.rc line 77
+#: rc.cpp:21 rc.cpp:30
+#, no-c-format
+msgid "KImageMapEditor Main Toolbar"
+msgstr "KImageMapEditor 主工具栏"
 
-#: kimedialogs.cpp:631
-msgid "No maps found"
-msgstr "没有找到映射"
+#. i18n: file kimagemapeditorpartui.rc line 96
+#: rc.cpp:24
+#, no-c-format
+msgid "KImageMapEditor Draw Toolbar"
+msgstr "KImageMapEditor 画图工具栏"
 
-#: kimedialogs.cpp:656
-msgid "No images found"
-msgstr "没有找到图像"
+#: arealistview.cpp:47
+msgid ""
+"<h3>Area List</h3>The area list shows you all areas of the map."
+"<br>The left column shows the link associated with the area; the right column "
+"shows the part of the image that is covered by the area."
+"<br>The maximum size of the preview images can be configured."
+msgstr ""
+"<h3>区域列表</h3>区域列表显示映射的所有区域。"
+"<br>左边的列显示关联到这一区域的链接；右边的区域显示被区域覆盖部分的图片。"
+"<br>您可以配置预览图片的最大大小。"
 
-#: kimedialogs.cpp:669
-msgid "&Images"
-msgstr "图像(&I)"
+#: arealistview.cpp:51
+msgid "A list of all areas"
+msgstr "所有区域列表"
 
-#: kimedialogs.cpp:678
-msgid "Path"
-msgstr "路径"
+#: main.cpp:34
+msgid "Write HTML-Code to stdout on exit"
+msgstr "退出时将 HTML 写入 stdout"
 
-#: kimedialogs.cpp:753
-msgid "Preferences"
-msgstr "首选项"
+#: main.cpp:35
+msgid "File to open"
+msgstr "要打开的文件"
 
-#: kimedialogs.cpp:762
-msgid "&Maximum image preview height:"
-msgstr "图像的最大预览高度(&M)："
+#: main.cpp:47
+msgid "For helping me with the Makefiles, and creating the Debian package"
+msgstr "帮助我制作 Makefiles 和创建 Debian 包"
 
-#: kimedialogs.cpp:775
-msgid "&Undo limit:"
-msgstr "撤消限制(&U)："
+#: main.cpp:48
+msgid "For helping me fixing --enable-final mode"
+msgstr "帮助我修复 --enable-final 模式"
 
-#: kimedialogs.cpp:785
-msgid "&Redo limit:"
-msgstr "重做限制(&R)："
+#: main.cpp:49
+msgid "For the Spanish translation"
+msgstr "帮助我完成西班牙语翻译"
 
-#: kimedialogs.cpp:794
-msgid "&Start with last used document"
-msgstr "启动时打开上次使用的文档(&S)"
+#: main.cpp:50
+msgid "For the Dutch translation"
+msgstr "帮助我完成芬兰语翻译"
+
+#: main.cpp:51
+msgid "For the French translation"
+msgstr "帮助我完成法语翻译"
diff --git a/tde-i18n-zh_CN/messages/tdewebdev/klinkstatus.po b/tde-i18n-zh_CN/messages/tdewebdev/klinkstatus.po
index fb60144192f..c4497614dd0 100644
--- a/tde-i18n-zh_CN/messages/tdewebdev/klinkstatus.po
+++ b/tde-i18n-zh_CN/messages/tdewebdev/klinkstatus.po
@@ -5,205 +5,44 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: klinkstatus\n"
-"POT-Creation-Date: 2008-08-14 01:19+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-12-05 21:11+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: engine/searchmanager.cpp:505 ui/resultview.cpp:137
-msgid "Javascript not supported"
-msgstr "不支持 Javascript"
-
-#: ui/tablelinkstatus.cpp:91
-msgid "Status"
-msgstr "状态"
-
-#: ui/tablelinkstatus.cpp:96
-msgid "Label"
-msgstr "标签"
-
-#: ui/tablelinkstatus.cpp:100
-msgid "URL"
-msgstr "URL"
-
-#: ui/tablelinkstatus.cpp:277 ui/treeview.cpp:348
-msgid "All"
-msgstr "全部"
-
-#: ui/tablelinkstatus.cpp:286 ui/tablelinkstatus.cpp:291 ui/treeview.cpp:357
-#: ui/treeview.cpp:363
-msgid "Edit Referrer with Quanta"
-msgstr "用 Quanta 编辑引用页面"
-
-#: ui/tablelinkstatus.cpp:295 ui/treeview.cpp:367
-msgid "Open URL"
-msgstr "打开 URL"
-
-#: ui/tablelinkstatus.cpp:298 ui/treeview.cpp:370
-msgid "Open Referrer URL"
-msgstr "打开来源页面 URL"
-
-#: ui/tablelinkstatus.cpp:303 ui/treeview.cpp:375
-msgid "Copy URL"
-msgstr "复制 URL"
-
-#: ui/tablelinkstatus.cpp:306 ui/treeview.cpp:378
-msgid "Copy Referrer URL"
-msgstr "复制来源页面 URL"
-
-#: ui/tablelinkstatus.cpp:309 ui/treeview.cpp:381
-msgid "Copy Cell Text"
-msgstr "复制单元格文字"
-
-#: ui/tablelinkstatus.cpp:389 ui/treeview.cpp:295
-msgid "<qt>File <b>%1</b> cannot be opened. Might be a DCOP problem.</qt>"
-msgstr "<qt>不能打开文件 <b>%1</b>。可能是一个 DCOP 问题。</qt>"
-
-#: ui/tablelinkstatus.cpp:410 ui/tablelinkstatus.cpp:431 ui/treeview.cpp:316
-#: ui/treeview.cpp:337
-msgid "Invalid URL."
-msgstr "无效的 URL。"
-
-#: ui/tablelinkstatus.cpp:419 ui/treeview.cpp:325
-msgid "ROOT URL."
-msgstr "根 URL。"
-
-#: engine/linkchecker.cpp:128 ui/tablelinkstatus.cpp:590
-#: ui/tablelinkstatus.cpp:655
-msgid "Timeout"
-msgstr "超时"
-
-#: ui/tablelinkstatus.cpp:592
-msgid "not supported"
-msgstr "不支持"
-
-#: engine/linkstatus.cpp:138 engine/linkstatus.cpp:163
-#: engine/linkstatus.cpp:169 ui/tablelinkstatus.cpp:659
-msgid "Malformed"
-msgstr "格式错误"
-
-#: ui/tablelinkstatus.cpp:682 ui/tablelinkstatus.cpp:685
-#, c-format
-msgid "%1"
-msgstr "%1"
-
-#: ui/documentrootdialog.cpp:40
-msgid ""
-"As you are using a protocol different than HTTP, \n"
-"there is no way to guess where the document root is, \n"
-"in order to resolve relative URLs like the ones started with \"/\".\n"
-"\n"
-"Please specify one:"
-msgstr ""
-
-#: ui/sessionwidget.cpp:241 ui/sessionwidget.cpp:364 ui/sessionwidget.cpp:387
-#: ui/sessionwidget.cpp:545 ui/sessionwidget.cpp:629
-msgid "Checking..."
-msgstr "正在检查..."
+#: klinkstatus_part.cpp:51
+msgid "A Link Checker"
+msgstr "一个链接检查器"
 
-#: ui/sessionwidget.cpp:351
-msgid "Cowardly refusing to check an empty URL."
-msgstr "小心地拒绝检查一个空 URL。"
+#: klinkstatus_part.cpp:151
+msgid "Check"
+msgstr "检查"
 
-#: ui/sessionwidget.cpp:365 ui/sessionwidget.cpp:388 ui/sessionwidget.cpp:463
-msgid "Stopped"
-msgstr "已停止"
+#: klinkstatus_part.cpp:152
+msgid "Results"
+msgstr "结果"
 
-#. i18n: file ./ui/sessionwidgetbase.ui line 367
-#: rc.cpp:54 ui/sessionwidget.cpp:435
+#. i18n: file ./ui/settings/configidentificationdialogui.ui line 34
+#: klinkstatus_part.cpp:153 rc.cpp:165
 #, no-c-format
-msgid "Ready"
-msgstr "就绪"
-
-#: ui/sessionwidget.cpp:531 ui/sessionwidget.cpp:539
-msgid "Adding level..."
-msgstr "添加级别..."
-
-#: ui/sessionwidget.cpp:686
-msgid "Export Results as HTML"
-msgstr ""
-
-#: ui/tabwidgetsession.cpp:61
-msgid "Open new tab"
-msgstr ""
-
-#: ui/tabwidgetsession.cpp:69
-msgid "Close the current tab"
-msgstr ""
-
-#: ui/tabwidgetsession.cpp:123
-msgid "Session"
-msgstr "会话"
-
-#: ui/resultssearchbar.cpp:72
-#, fuzzy
-msgid "S&earch:"
-msgstr "搜索"
-
-#: ui/resultssearchbar.cpp:83
-#, fuzzy
-msgid "Status:"
-msgstr "状态"
-
-#: ui/resultssearchbar.cpp:93
-msgid "All Links"
-msgstr "全部链接"
-
-#: ui/resultssearchbar.cpp:94
-msgid "Good Links"
-msgstr "良好的链接"
-
-#: ui/resultssearchbar.cpp:95
-msgid "Broken Links"
-msgstr "断开的链接"
-
-#: ui/resultssearchbar.cpp:96
-msgid "Malformed Links"
-msgstr "畸形的链接"
-
-#: ui/resultssearchbar.cpp:97
-msgid "Undetermined Links"
-msgstr "未确定的链接"
-
-#: ui/resultssearchbar.cpp:100
-msgid "Clear filter"
-msgstr ""
-
-#: ui/resultssearchbar.cpp:101
-msgid "Enter the terms to filter the result link list"
-msgstr ""
-
-#: ui/resultssearchbar.cpp:102
-msgid "Choose what kind of link status to show in result list"
-msgstr ""
-
-#: klinkstatus.cpp:75
-msgid ""
-"Could not find the KLinkStatus part; did you configure with '--prefix=/$TDEDIR' "
-"and perform 'make install'?"
-msgstr ""
-"不能找到 KLinkStatus 部件；您用了带“--prefix=/$TDEDIR”的 configure 或执行了“make install”吗？"
-
-#: utils/xsl.cpp:165
-msgid "Message is null."
+msgid "Identification"
 msgstr ""
 
-#: utils/xsl.cpp:170
-msgid "The selected stylesheet is invalid."
+#: klinkstatus_part.cpp:154
+msgid "Configure the way KLinkstatus reports itself"
 msgstr ""
 
-#: utils/xsl.cpp:177
-msgid "Message could not be parsed. This is likely due to an encoding problem."
-msgstr ""
+#: klinkstatus_part.cpp:180 main.cpp:48
+msgid "KLinkStatus"
+msgstr "KLinkStatus"
 
-#: utils/xsl.cpp:182
-msgid ""
-"<div><b>KLinkStatus encountered the following error while parsing a message:</b>"
-"<br />%1</div>"
-msgstr ""
+#: klinkstatus_part.cpp:187
+msgid "KLinkStatus Part"
+msgstr "KLinkStatus Part"
 
 #: _translatorinfo.cpp:1
 msgid ""
@@ -217,56 +56,6 @@ msgid ""
 "Your emails"
 msgstr "mhh@ricetons.com"
 
-#: main.cpp:34
-msgid ""
-"A Link Checker.\n"
-"\n"
-"KLinkStatus belongs to the tdewebdev module from TDE."
-msgstr ""
-"一个连接检查器。\n"
-"\n"
-"KLinkStatus 属于 TDE 的 tdewebdev 模块。"
-
-#: main.cpp:40
-msgid "Document to open"
-msgstr "要打开的文档"
-
-#: klinkstatus_part.cpp:180 main.cpp:48
-msgid "KLinkStatus"
-msgstr "KLinkStatus"
-
-#: engine/linkstatus_impl.h:122
-msgid "ROOT"
-msgstr "根"
-
-#: engine/linkchecker.cpp:382
-msgid "No Content"
-msgstr "无内容"
-
-#: engine/linkchecker.cpp:612 engine/linkchecker.cpp:647
-msgid "Link destination not found."
-msgstr "连接目标未找到。"
-
-#: engine/linkstatus.cpp:104
-#, c-format
-msgid "Parent: %1"
-msgstr "父：%1"
-
-#: engine/linkstatus.cpp:108
-#, c-format
-msgid "URL: %1"
-msgstr "URL：%1"
-
-#: engine/linkstatus.cpp:109
-#, c-format
-msgid "Original URL: %1"
-msgstr "原始 URL：%1"
-
-#: engine/linkstatus.cpp:111
-#, c-format
-msgid "Node: %1"
-msgstr "结点：%1"
-
 #: actionmanager.cpp:90
 msgid "New Link Check"
 msgstr "新链接检查"
@@ -327,140 +116,264 @@ msgstr "搜索"
 msgid "St&op Search"
 msgstr "搜索"
 
+#: engine/linkstatus.cpp:104
+#, c-format
+msgid "Parent: %1"
+msgstr "父：%1"
+
+#: engine/linkstatus.cpp:108
+#, c-format
+msgid "URL: %1"
+msgstr "URL：%1"
+
+#: engine/linkstatus.cpp:109
+#, c-format
+msgid "Original URL: %1"
+msgstr "原始 URL：%1"
+
+#: engine/linkstatus.cpp:111
+#, c-format
+msgid "Node: %1"
+msgstr "结点：%1"
+
+#: engine/linkstatus.cpp:138 engine/linkstatus.cpp:163
+#: engine/linkstatus.cpp:169 ui/tablelinkstatus.cpp:659
+msgid "Malformed"
+msgstr "格式错误"
+
+#: engine/linkchecker.cpp:130 ui/tablelinkstatus.cpp:590
+#: ui/tablelinkstatus.cpp:655
+msgid "Timeout"
+msgstr "超时"
+
+#: engine/linkchecker.cpp:384
+msgid "No Content"
+msgstr "无内容"
+
+#: engine/linkchecker.cpp:614 engine/linkchecker.cpp:649
+msgid "Link destination not found."
+msgstr "连接目标未找到。"
+
+#: engine/linkstatus_impl.h:122
+msgid "ROOT"
+msgstr "根"
+
+#: engine/searchmanager.cpp:505 ui/resultview.cpp:137
+msgid "Javascript not supported"
+msgstr "不支持 Javascript"
+
+#: klinkstatus.cpp:75
+msgid ""
+"Could not find the KLinkStatus part; did you configure with '--prefix=/$TDEDIR' "
+"and perform 'make install'?"
+msgstr ""
+"不能找到 KLinkStatus 部件；您用了带“--prefix=/$TDEDIR”的 configure 或执行了“make install”吗？"
+
 #. i18n: file klinkstatus_part.rc line 32
-#: rc.cpp:12 rc.cpp:24 rc.cpp:192 rc.cpp:207
+#: rc.cpp:12 rc.cpp:24 rc.cpp:36 rc.cpp:102
 #, fuzzy, no-c-format
 msgid "S&earch"
 msgstr "搜索"
 
-#. i18n: file ./ui/sessionwidgetbase.ui line 36
-#: rc.cpp:30
+#. i18n: file ./cfg/klinkstatus.kcfg line 8
+#: rc.cpp:42
 #, no-c-format
-msgid "Search"
-msgstr "搜索"
+msgid "Maximum number of entries in the combo url."
+msgstr "组合框 URL 中最多项数。"
 
-#. i18n: file ./ui/sessionwidgetbase.ui line 110
-#: rc.cpp:33
+#. i18n: file ./cfg/klinkstatus.kcfg line 13
+#: rc.cpp:45
 #, no-c-format
-msgid "URL: "
-msgstr "URL："
+msgid "Maximum number of simultaneous connections."
+msgstr "并发连接的最多项数。"
 
-#. i18n: file ./ui/sessionwidgetbase.ui line 175
-#: rc.cpp:36
+#. i18n: file ./cfg/klinkstatus.kcfg line 18
+#: rc.cpp:48
 #, no-c-format
-msgid "Recursivel&y:"
-msgstr "递归(&Y)："
+msgid "Timeout on getting an URL."
+msgstr "获取 URL 时的超时。"
 
-#. i18n: file ./ui/sessionwidgetbase.ui line 181
-#: rc.cpp:39
+#. i18n: file ./cfg/klinkstatus.kcfg line 23
+#: rc.cpp:51
 #, no-c-format
-msgid "Check pages recursively"
-msgstr "递归检查页面"
+msgid "History of combo url."
+msgstr "组合框 URL 历史。"
 
-#. i18n: file ./ui/sessionwidgetbase.ui line 192
-#: rc.cpp:42 rc.cpp:93
+#. i18n: file ./cfg/klinkstatus.kcfg line 27
+#: rc.cpp:54
 #, no-c-format
-msgid "Unlimited"
-msgstr "无限制"
+msgid "Whether to do a recursive check."
+msgstr "是否执行递归检查。"
 
-#. i18n: file ./ui/sessionwidgetbase.ui line 215
-#: rc.cpp:45
+#. i18n: file ./cfg/klinkstatus.kcfg line 32
+#: rc.cpp:57
 #, no-c-format
-msgid "Do &not check parent folders"
-msgstr "不检查父文件夹(&N)"
+msgid "Maximum depth to check."
+msgstr "要检查的最大深度。"
 
-#. i18n: file ./ui/sessionwidgetbase.ui line 253
-#: rc.cpp:48
+#. i18n: file ./cfg/klinkstatus.kcfg line 37
+#: rc.cpp:60
 #, no-c-format
-msgid "Chec&k external links"
-msgstr "检查外部链接(&K)"
+msgid "Whether to check parent folders."
+msgstr "是否检查父文件夹。"
 
-#. i18n: file ./ui/sessionwidgetbase.ui line 291
-#: rc.cpp:51
+#. i18n: file ./cfg/klinkstatus.kcfg line 42
+#: rc.cpp:63
 #, no-c-format
-msgid "Do not check regular expression:"
-msgstr "不检查正则表达式："
+msgid "Whether to check external links."
+msgstr "是否检查外部链接。"
 
-#. i18n: file ./ui/sessionwidgetbase.ui line 457
-#: rc.cpp:57
+#. i18n: file ./cfg/klinkstatus.kcfg line 47
+#: rc.cpp:66
 #, no-c-format
-msgid "Elapsed time:"
-msgstr "已过时间："
+msgid "Whether to remeber the check settings like depth, and so on, on exit."
+msgstr "是否在退出时记住像深度等设置。"
 
-#. i18n: file ./ui/sessionwidgetbase.ui line 460
-#: rc.cpp:60 rc.cpp:63
+#. i18n: file ./cfg/klinkstatus.kcfg line 52
+#: rc.cpp:69
 #, no-c-format
-msgid "hh:mm:ss.zzz"
-msgstr "hh:mm:ss.zzz"
+msgid ""
+"Whether preview prefix in Quanta project is used to set the URL to check."
+msgstr "是否使用 Quanta 项目中的预览前缀来设置要检查的 URL。"
+
+#. i18n: file ./cfg/klinkstatus.kcfg line 57
+#: rc.cpp:72 rc.cpp:75
+#, no-c-format
+msgid "Whether to display a tree view or a flat view in the results view."
+msgstr "结果视图中是显示树形视图还是平面视图。"
+
+#. i18n: file ./cfg/klinkstatus.kcfg line 67
+#: rc.cpp:78
+#, no-c-format
+msgid ""
+"Whether to automatically adjust the width of the result columns (Not used)."
+msgstr "是否自动调整结果列的宽度(未使用)。"
+
+#. i18n: file ./cfg/klinkstatus.kcfg line 72
+#: rc.cpp:81
+#, no-c-format
+msgid ""
+"Whether the viewport of the result view should follow the last link checked."
+msgstr "结果视图是否应跟随上次检查的链接。"
+
+#. i18n: file ./cfg/klinkstatus.kcfg line 77
+#: rc.cpp:84
+#, no-c-format
+msgid ""
+"Whether the user can see if the markup is valid by showing a column with an "
+"icon indicator."
+msgstr ""
+
+#. i18n: file ./cfg/klinkstatus.kcfg line 82
+#: rc.cpp:87
+#, no-c-format
+msgid "Whether to send an User-Agent in HTTP requests."
+msgstr ""
+
+#. i18n: file ./cfg/klinkstatus.kcfg line 87
+#: rc.cpp:90
+#, no-c-format
+msgid "Defines the HTTP User-Agent to send."
+msgstr ""
+
+#. i18n: file ./ui/settings/configresultsdialog.ui line 35
+#: rc.cpp:111
+#, fuzzy, no-c-format
+msgid "Tree"
+msgstr "树型视图"
+
+#. i18n: file ./ui/settings/configresultsdialog.ui line 43
+#: rc.cpp:114
+#, fuzzy, no-c-format
+msgid "Flat"
+msgstr "平面视图"
+
+#. i18n: file ./ui/settings/configresultsdialog.ui line 53
+#: rc.cpp:117
+#, no-c-format
+msgid "Misc"
+msgstr ""
+
+#. i18n: file ./ui/settings/configresultsdialog.ui line 64
+#: rc.cpp:120
+#, fuzzy, no-c-format
+msgid "Follow Last Link Checked"
+msgstr "跟随上次检查的链接"
 
 #. i18n: file ./ui/settings/configsearchdialog.ui line 24
-#: rc.cpp:66
+#: rc.cpp:123
 #, no-c-format
 msgid "Network"
 msgstr "网络"
 
 #. i18n: file ./ui/settings/configsearchdialog.ui line 71
-#: rc.cpp:69
+#: rc.cpp:126
 #, no-c-format
 msgid "Timeout in seconds:"
 msgstr "超时秒数："
 
 #. i18n: file ./ui/settings/configsearchdialog.ui line 109
-#: rc.cpp:72
+#: rc.cpp:129
 #, no-c-format
 msgid "Number of simultaneous connections:"
 msgstr "并发连接数："
 
 #. i18n: file ./ui/settings/configsearchdialog.ui line 119
-#: rc.cpp:75
+#: rc.cpp:132
 #, no-c-format
 msgid "Input"
 msgstr "输入"
 
 #. i18n: file ./ui/settings/configsearchdialog.ui line 152
-#: rc.cpp:78
+#: rc.cpp:135
 #, no-c-format
 msgid "Check parent folders"
 msgstr "检查父文件夹"
 
 #. i18n: file ./ui/settings/configsearchdialog.ui line 171
-#: rc.cpp:81
+#: rc.cpp:138
 #, no-c-format
 msgid "Number of items in URL history:"
 msgstr "URL 历史中的项目数："
 
 #. i18n: file ./ui/settings/configsearchdialog.ui line 179
-#: rc.cpp:84
+#: rc.cpp:141
 #, no-c-format
 msgid "Check external links"
 msgstr "检查外部链接"
 
 #. i18n: file ./ui/settings/configsearchdialog.ui line 198
-#: rc.cpp:87
+#: rc.cpp:144
 #, no-c-format
 msgid "Recursive"
 msgstr "递归"
 
 #. i18n: file ./ui/settings/configsearchdialog.ui line 234
-#: rc.cpp:90
+#: rc.cpp:147
 #, no-c-format
 msgid "Depth:"
 msgstr "深度："
 
+#. i18n: file ./ui/settings/configsearchdialog.ui line 253
+#: rc.cpp:150 rc.cpp:189
+#, no-c-format
+msgid "Unlimited"
+msgstr "无限制"
+
 #. i18n: file ./ui/settings/configsearchdialog.ui line 276
-#: rc.cpp:96
+#: rc.cpp:153
 #, no-c-format
 msgid "Quanta"
 msgstr "Quanta"
 
 #. i18n: file ./ui/settings/configsearchdialog.ui line 287
-#: rc.cpp:99
+#: rc.cpp:156
 #, no-c-format
 msgid "Use preview prefix"
 msgstr "使用预览前缀"
 
 #. i18n: file ./ui/settings/configsearchdialog.ui line 293
-#: rc.cpp:102
+#: rc.cpp:159
 #, no-c-format
 msgid ""
 "Check this one if you want to use Quanta's project preview prefix in the URL to "
@@ -468,173 +381,261 @@ msgid ""
 msgstr "如果您想要在 URL 中使用 Quanta 的项目预览前缀进行检查，请选中此选项"
 
 #. i18n: file ./ui/settings/configsearchdialog.ui line 303
-#: rc.cpp:105
+#: rc.cpp:162
 #, no-c-format
 msgid "Remember settings when exit"
 msgstr "退出时记住设置"
 
-#. i18n: file ./ui/settings/configidentificationdialogui.ui line 34
-#: klinkstatus_part.cpp:153 rc.cpp:108
-#, no-c-format
-msgid "Identification"
-msgstr ""
-
 #. i18n: file ./ui/settings/configidentificationdialogui.ui line 57
-#: rc.cpp:111
+#: rc.cpp:168
 #, no-c-format
 msgid "User-Agent"
 msgstr ""
 
 #. i18n: file ./ui/settings/configidentificationdialogui.ui line 92
-#: rc.cpp:117
+#: rc.cpp:174
 #, no-c-format
 msgid "Send Identification"
 msgstr ""
 
-#. i18n: file ./ui/settings/configresultsdialog.ui line 35
-#: rc.cpp:123
-#, fuzzy, no-c-format
-msgid "Tree"
-msgstr "树型视图"
-
-#. i18n: file ./ui/settings/configresultsdialog.ui line 43
-#: rc.cpp:126
-#, fuzzy, no-c-format
-msgid "Flat"
-msgstr "平面视图"
-
-#. i18n: file ./ui/settings/configresultsdialog.ui line 53
-#: rc.cpp:129
+#. i18n: file ./ui/sessionwidgetbase.ui line 36
+#: rc.cpp:177
 #, no-c-format
-msgid "Misc"
-msgstr ""
-
-#. i18n: file ./ui/settings/configresultsdialog.ui line 64
-#: rc.cpp:132
-#, fuzzy, no-c-format
-msgid "Follow Last Link Checked"
-msgstr "跟随上次检查的链接"
+msgid "Search"
+msgstr "搜索"
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 8
-#: rc.cpp:135
+#. i18n: file ./ui/sessionwidgetbase.ui line 110
+#: rc.cpp:180
 #, no-c-format
-msgid "Maximum number of entries in the combo url."
-msgstr "组合框 URL 中最多项数。"
+msgid "URL: "
+msgstr "URL："
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 13
-#: rc.cpp:138
+#. i18n: file ./ui/sessionwidgetbase.ui line 175
+#: rc.cpp:183
 #, no-c-format
-msgid "Maximum number of simultaneous connections."
-msgstr "并发连接的最多项数。"
+msgid "Recursivel&y:"
+msgstr "递归(&Y)："
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 18
-#: rc.cpp:141
+#. i18n: file ./ui/sessionwidgetbase.ui line 181
+#: rc.cpp:186
 #, no-c-format
-msgid "Timeout on getting an URL."
-msgstr "获取 URL 时的超时。"
+msgid "Check pages recursively"
+msgstr "递归检查页面"
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 23
-#: rc.cpp:144
+#. i18n: file ./ui/sessionwidgetbase.ui line 215
+#: rc.cpp:192
 #, no-c-format
-msgid "History of combo url."
-msgstr "组合框 URL 历史。"
+msgid "Do &not check parent folders"
+msgstr "不检查父文件夹(&N)"
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 27
-#: rc.cpp:147
+#. i18n: file ./ui/sessionwidgetbase.ui line 253
+#: rc.cpp:195
 #, no-c-format
-msgid "Whether to do a recursive check."
-msgstr "是否执行递归检查。"
+msgid "Chec&k external links"
+msgstr "检查外部链接(&K)"
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 32
-#: rc.cpp:150
+#. i18n: file ./ui/sessionwidgetbase.ui line 291
+#: rc.cpp:198
 #, no-c-format
-msgid "Maximum depth to check."
-msgstr "要检查的最大深度。"
+msgid "Do not check regular expression:"
+msgstr "不检查正则表达式："
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 37
-#: rc.cpp:153
+#. i18n: file ./ui/sessionwidgetbase.ui line 367
+#: rc.cpp:201 ui/sessionwidget.cpp:435
 #, no-c-format
-msgid "Whether to check parent folders."
-msgstr "是否检查父文件夹。"
+msgid "Ready"
+msgstr "就绪"
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 42
-#: rc.cpp:156
+#. i18n: file ./ui/sessionwidgetbase.ui line 457
+#: rc.cpp:204
 #, no-c-format
-msgid "Whether to check external links."
-msgstr "是否检查外部链接。"
+msgid "Elapsed time:"
+msgstr "已过时间："
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 47
-#: rc.cpp:159
+#. i18n: file ./ui/sessionwidgetbase.ui line 460
+#: rc.cpp:207 rc.cpp:210
 #, no-c-format
-msgid "Whether to remeber the check settings like depth, and so on, on exit."
-msgstr "是否在退出时记住像深度等设置。"
+msgid "hh:mm:ss.zzz"
+msgstr "hh:mm:ss.zzz"
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 52
-#: rc.cpp:162
-#, no-c-format
-msgid ""
-"Whether preview prefix in Quanta project is used to set the URL to check."
-msgstr "是否使用 Quanta 项目中的预览前缀来设置要检查的 URL。"
+#: utils/xsl.cpp:165
+msgid "Message is null."
+msgstr ""
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 57
-#: rc.cpp:165 rc.cpp:168
-#, no-c-format
-msgid "Whether to display a tree view or a flat view in the results view."
-msgstr "结果视图中是显示树形视图还是平面视图。"
+#: utils/xsl.cpp:170
+msgid "The selected stylesheet is invalid."
+msgstr ""
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 67
-#: rc.cpp:171
-#, no-c-format
-msgid ""
-"Whether to automatically adjust the width of the result columns (Not used)."
-msgstr "是否自动调整结果列的宽度(未使用)。"
+#: utils/xsl.cpp:177
+msgid "Message could not be parsed. This is likely due to an encoding problem."
+msgstr ""
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 72
-#: rc.cpp:174
-#, no-c-format
+#: utils/xsl.cpp:182
 msgid ""
-"Whether the viewport of the result view should follow the last link checked."
-msgstr "结果视图是否应跟随上次检查的链接。"
+"<div><b>KLinkStatus encountered the following error while parsing a message:</b>"
+"<br />%1</div>"
+msgstr ""
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 77
-#: rc.cpp:177
-#, no-c-format
-msgid ""
-"Whether the user can see if the markup is valid by showing a column with an "
-"icon indicator."
+#: ui/tablelinkstatus.cpp:389 ui/treeview.cpp:295
+msgid "<qt>File <b>%1</b> cannot be opened. Might be a DCOP problem.</qt>"
+msgstr "<qt>不能打开文件 <b>%1</b>。可能是一个 DCOP 问题。</qt>"
+
+#: ui/tablelinkstatus.cpp:410 ui/tablelinkstatus.cpp:431 ui/treeview.cpp:316
+#: ui/treeview.cpp:337
+msgid "Invalid URL."
+msgstr "无效的 URL。"
+
+#: ui/tablelinkstatus.cpp:419 ui/treeview.cpp:325
+msgid "ROOT URL."
+msgstr "根 URL。"
+
+#: ui/tablelinkstatus.cpp:277 ui/treeview.cpp:348
+msgid "All"
+msgstr "全部"
+
+#: ui/tablelinkstatus.cpp:286 ui/tablelinkstatus.cpp:291 ui/treeview.cpp:357
+#: ui/treeview.cpp:363
+msgid "Edit Referrer with Quanta"
+msgstr "用 Quanta 编辑引用页面"
+
+#: ui/tablelinkstatus.cpp:295 ui/treeview.cpp:367
+msgid "Open URL"
+msgstr "打开 URL"
+
+#: ui/tablelinkstatus.cpp:298 ui/treeview.cpp:370
+msgid "Open Referrer URL"
+msgstr "打开来源页面 URL"
+
+#: ui/tablelinkstatus.cpp:303 ui/treeview.cpp:375
+msgid "Copy URL"
+msgstr "复制 URL"
+
+#: ui/tablelinkstatus.cpp:306 ui/treeview.cpp:378
+msgid "Copy Referrer URL"
+msgstr "复制来源页面 URL"
+
+#: ui/tablelinkstatus.cpp:309 ui/treeview.cpp:381
+msgid "Copy Cell Text"
+msgstr "复制单元格文字"
+
+#: ui/tabwidgetsession.cpp:61
+msgid "Open new tab"
 msgstr ""
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 82
-#: rc.cpp:180
-#, no-c-format
-msgid "Whether to send an User-Agent in HTTP requests."
+#: ui/tabwidgetsession.cpp:69
+msgid "Close the current tab"
 msgstr ""
 
-#. i18n: file ./cfg/klinkstatus.kcfg line 87
-#: rc.cpp:183
-#, no-c-format
-msgid "Defines the HTTP User-Agent to send."
+#: ui/tabwidgetsession.cpp:123
+msgid "Session"
+msgstr "会话"
+
+#: ui/resultssearchbar.cpp:72
+#, fuzzy
+msgid "S&earch:"
+msgstr "搜索"
+
+#: ui/resultssearchbar.cpp:83
+#, fuzzy
+msgid "Status:"
+msgstr "状态"
+
+#: ui/resultssearchbar.cpp:93
+msgid "All Links"
+msgstr "全部链接"
+
+#: ui/resultssearchbar.cpp:94
+msgid "Good Links"
+msgstr "良好的链接"
+
+#: ui/resultssearchbar.cpp:95
+msgid "Broken Links"
+msgstr "断开的链接"
+
+#: ui/resultssearchbar.cpp:96
+msgid "Malformed Links"
+msgstr "畸形的链接"
+
+#: ui/resultssearchbar.cpp:97
+msgid "Undetermined Links"
+msgstr "未确定的链接"
+
+#: ui/resultssearchbar.cpp:100
+msgid "Clear filter"
 msgstr ""
 
-#: klinkstatus_part.cpp:51
-msgid "A Link Checker"
-msgstr "一个链接检查器"
+#: ui/resultssearchbar.cpp:101
+msgid "Enter the terms to filter the result link list"
+msgstr ""
 
-#: klinkstatus_part.cpp:151
-msgid "Check"
-msgstr "检查"
+#: ui/resultssearchbar.cpp:102
+msgid "Choose what kind of link status to show in result list"
+msgstr ""
 
-#: klinkstatus_part.cpp:152
-msgid "Results"
-msgstr "结果"
+#: ui/sessionwidget.cpp:241 ui/sessionwidget.cpp:364 ui/sessionwidget.cpp:387
+#: ui/sessionwidget.cpp:545 ui/sessionwidget.cpp:629
+msgid "Checking..."
+msgstr "正在检查..."
 
-#: klinkstatus_part.cpp:154
-msgid "Configure the way KLinkstatus reports itself"
+#: ui/sessionwidget.cpp:351
+msgid "Cowardly refusing to check an empty URL."
+msgstr "小心地拒绝检查一个空 URL。"
+
+#: ui/sessionwidget.cpp:365 ui/sessionwidget.cpp:388 ui/sessionwidget.cpp:463
+msgid "Stopped"
+msgstr "已停止"
+
+#: ui/sessionwidget.cpp:531 ui/sessionwidget.cpp:539
+msgid "Adding level..."
+msgstr "添加级别..."
+
+#: ui/sessionwidget.cpp:686
+msgid "Export Results as HTML"
 msgstr ""
 
-#: klinkstatus_part.cpp:187
-msgid "KLinkStatus Part"
-msgstr "KLinkStatus Part"
+#: ui/tablelinkstatus.cpp:91
+msgid "Status"
+msgstr "状态"
+
+#: ui/tablelinkstatus.cpp:96
+msgid "Label"
+msgstr "标签"
+
+#: ui/tablelinkstatus.cpp:100
+msgid "URL"
+msgstr "URL"
+
+#: ui/tablelinkstatus.cpp:592
+msgid "not supported"
+msgstr "不支持"
+
+#: ui/tablelinkstatus.cpp:682 ui/tablelinkstatus.cpp:685
+#, c-format
+msgid "%1"
+msgstr "%1"
+
+#: ui/documentrootdialog.cpp:40
+msgid ""
+"As you are using a protocol different than HTTP, \n"
+"there is no way to guess where the document root is, \n"
+"in order to resolve relative URLs like the ones started with \"/\".\n"
+"\n"
+"Please specify one:"
+msgstr ""
+
+#: main.cpp:34
+msgid ""
+"A Link Checker.\n"
+"\n"
+"KLinkStatus belongs to the tdewebdev module from TDE."
+msgstr ""
+"一个连接检查器。\n"
+"\n"
+"KLinkStatus 属于 TDE 的 tdewebdev 模块。"
+
+#: main.cpp:40
+msgid "Document to open"
+msgstr "要打开的文档"
 
 #~ msgid "&Pause"
 #~ msgstr "暂停(&P)"
diff --git a/tde-i18n-zh_CN/messages/tdewebdev/kommander.po b/tde-i18n-zh_CN/messages/tdewebdev/kommander.po
index ccd2a456ec4..6be00f9ad99 100644
--- a/tde-i18n-zh_CN/messages/tdewebdev/kommander.po
+++ b/tde-i18n-zh_CN/messages/tdewebdev/kommander.po
@@ -3,93 +3,28 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kommander\n"
-"POT-Creation-Date: 2008-07-08 01:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-12-05 21:34+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: part/kommander_part.cpp:30
-#, fuzzy
-msgid ""
-"Executor Part is a component of the Kommander dialog system that executes .kmdr "
-"files inside a TDE KPart"
-msgstr "执行器是 Kommander 对话框系统的一个组件，可执行由参数或标准输入给出的 .kmdr 文件"
-
-#: part/kommander_part.cpp:54
-#, fuzzy
-msgid "Kommander Executor Part"
-msgstr "Kommander 执行器"
-
-#: part/kommander_part.cpp:56
-msgid "Part of the TDEWebDev module."
-msgstr ""
-
-#: editor/main.cpp:47 executor/main.cpp:61 part/kommander_part.cpp:58
-#, fuzzy
-msgid "Current maintainer"
-msgstr "复制当前行(&L)"
-
-#: editor/main.cpp:48 executor/main.cpp:62 part/kommander_part.cpp:59
-msgid "Previous maintainer"
-msgstr ""
-
-#: editor/main.cpp:49 executor/main.cpp:63 part/kommander_part.cpp:60
-msgid "Original author"
-msgstr ""
-
-#: pluginmanager/main.cpp:39
-msgid ""
-"kmdr-plugins is a component of the Kommander dialog system that manages "
-"installed plugins."
+#: working/plugintemplate/widget.cpp:43
+msgid "Call function1 with two arguments, second is optional."
 msgstr ""
 
-#: pluginmanager/main.cpp:46
-msgid "Register given library"
-msgstr "注册给定的库"
-
-#: pluginmanager/main.cpp:48
-msgid "Remove given library"
-msgstr "删除给定的库"
-
-#: pluginmanager/main.cpp:50
-msgid "Check all installed plugins and remove those missing"
+#: working/plugintemplate/widget.cpp:44
+msgid "Get a TQString as a result of function2."
 msgstr ""
 
-#: pluginmanager/main.cpp:52
-msgid "List all installed plugins"
-msgstr "列出已安装的全部插件"
-
-#: pluginmanager/main.cpp:59
-msgid "Kommander Plugin Manager"
-msgstr "Kommander 插件管理器"
-
-#: pluginmanager/main.cpp:80
-msgid "Error adding plugin '%1'"
-msgstr "添加插件“%1”出错"
-
-#: pluginmanager/main.cpp:85
-msgid "Error removing plugin '%1'"
-msgstr "删除插件“%1”出错"
-
-#: pluginmanager/mainwindow.cpp:37
-msgid "Refresh"
-msgstr "刷新"
-
-#: pluginmanager/mainwindow.cpp:72
-msgid "Add Kommander Plugin"
+#: working/plugintemplate/plugin.cpp:19
+#, fuzzy
+msgid "Kommander %{APPNAME} plugin."
 msgstr "添加 Kommander 插件"
 
-#: pluginmanager/mainwindow.cpp:80
-msgid "<qt>Unable to load Kommander plugin<br><b>%1</b></qt>"
-msgstr "<qt>无法装入 Kommander 插件<br><b>%1</b></qt>"
-
-#: pluginmanager/mainwindow.cpp:81
-msgid "Cannot add plugin"
-msgstr "无法添加插件"
-
 #: _translatorinfo.cpp:1 editor/main.cpp:50
 msgid ""
 "_: NAME OF TRANSLATORS\n"
@@ -102,1818 +37,2122 @@ msgid ""
 "Your emails"
 msgstr "fundawang@linux.net.cn"
 
-#. i18n: file ./editor/templates/Configuration_Dialog.ui line 31
-#: editor/iconvieweditorimpl.cpp:57 editor/listboxeditorimpl.cpp:61
-#: editor/widgetfactory.cpp:891 editor/widgetfactory.cpp:924
-#: editor/widgetfactory.cpp:935 editor/widgetfactory.cpp:1126
-#: editor/widgetfactory.cpp:1236 rc.cpp:1379
-#, no-c-format
-msgid "New Item"
-msgstr "新建项目"
+#: executor/instance.cpp:115
+#, fuzzy
+msgid "<qt>Unable to create dialog.</qt>"
+msgstr "<qt>无法从文件<br><b>%1</b><br>创建对话框</qt>"
 
-#: editor/iconvieweditorimpl.cpp:124 editor/listboxeditorimpl.cpp:134
-msgid "Edit Items of '%1'"
-msgstr "编辑“%1”的项目"
+#: executor/instance.cpp:187
+msgid "<qt>Kommander file<br><b>%1</b><br>does not exist.</qt>"
+msgstr "<qt>Kommander 文件<br><b>%1</b><br>不存在。</qt>"
 
-#: editor/formfile.cpp:121
+#: executor/instance.cpp:195
 msgid ""
-"Failed to save file '%1'.\n"
-"Do you want to use another file name?"
+"<qt>This file does not have a <b>.kmdr</b> extension. As a security precaution "
+"Kommander will only run Kommander scripts with a clear identity.</qt>"
 msgstr ""
 
-#: editor/formfile.cpp:122
-msgid "Try Another"
+#: executor/instance.cpp:197
+msgid "Wrong Extension"
 msgstr ""
 
-#: editor/formfile.cpp:122
-msgid "Do Not Try"
+#: executor/instance.cpp:214
+msgid ""
+"<qt>This dialog is running from your <i>/tmp</i> directory.  This may mean that "
+"it was run from a KMail attachment or from a webpage. "
+"<p>Any script contained in this dialog will have write access to all of your "
+"home directory; <b>running such dialogs may be dangerous: </b>"
+"<p>are you sure you want to continue?</qt>"
 msgstr ""
 
-#: editor/formfile.cpp:127
-msgid "'%1' saved."
-msgstr "“%1”已保存。"
-
-#: editor/formfile.cpp:141 editor/mainwindowactions.cpp:626
-msgid "*.kmdr|Kommander Files"
-msgstr "*.kmdr|Kommander 文件"
+#: executor/instance.cpp:218 executor/instance.cpp:223
+msgid "Run Nevertheless"
+msgstr ""
 
-#: editor/formfile.cpp:142
-msgid "Save Form '%1' As"
-msgstr "表单“%1”另存为"
+#: executor/instance.cpp:223
+msgid ""
+"<qt>The Kommander file <i>%1</i> does not have the <b>executable attribute</b> "
+"set and could possibly contain dangerous exploits."
+"<p>If you trust the scripting (viewable in kmdr-editor) in this program, make "
+"it executable to get rid of this warning."
+"<p>Are you sure you want to continue?</qt>"
+msgstr ""
 
-#: editor/formfile.cpp:154
-msgid "The file already exists. Do you wish to overwrite it?"
-msgstr "文件已经存在。您想要覆盖吗？"
+#: executor/register.cpp:66
+msgid "Return EOL-separated list of all values in the array."
+msgstr ""
 
-#: editor/formfile.cpp:155
-msgid "Overwrite File?"
-msgstr "覆盖文件吗？"
+#: executor/register.cpp:67
+msgid "Return EOL-separated list of all keys in the array."
+msgstr ""
 
-#: editor/formfile.cpp:155 editor/messagelog.cpp:128
-msgid "Overwrite"
-msgstr "覆盖"
+#: executor/register.cpp:68
+msgid "Remove all elements from the array."
+msgstr ""
 
-#: editor/formfile.cpp:184
-msgid "Dialog '%1' was modified.Do you want to save it?"
-msgstr "对话框“%1”已修改。您是否想要保存？"
+#: executor/register.cpp:69
+msgid "Return number of elements in the array."
+msgstr ""
 
-#: editor/formfile.cpp:185
-msgid "Save File?"
-msgstr "保存文件吗？"
+#: executor/register.cpp:70
+msgid "Return the value associated with given key."
+msgstr ""
 
-#: editor/formfile.cpp:244
-msgid "unnamed"
+#: executor/register.cpp:71
+msgid "Remove element with given key from the array."
 msgstr ""
 
-#: editor/propertyeditor.cpp:406
-msgid "Reset the property to its default value"
-msgstr "将属性重置为其默认值"
+#: executor/register.cpp:72
+msgid "Add element with given key and value to the array"
+msgstr ""
 
-#: editor/propertyeditor.cpp:407
-msgid "Click this button to reset the property to its default value"
-msgstr "单击此按钮可将属性重置为默认值"
+#: executor/register.cpp:73
+msgid ""
+"Add all elements in the string to the array. String should have <i>key>"
+"\\tvalue\\n</i> format."
+msgstr ""
 
-#. i18n: file ./editor/iconvieweditor.ui line 254
-#: editor/propertyeditor.cpp:595 rc.cpp:377 rc.cpp:446 rc.cpp:578 rc.cpp:674
-#: rc.cpp:746 rc.cpp:1016 rc.cpp:1181 rc.cpp:1238
-#, no-c-format
-msgid "..."
-msgstr "..."
+#: executor/register.cpp:75
+msgid ""
+"Return all elements in the array in <i>key>\\tvalue\\n</i> format."
+msgstr ""
 
-#: editor/propertyeditor.cpp:1071 editor/propertyeditor.cpp:1132
-msgid "False"
-msgstr "假"
+#: executor/register.cpp:77
+msgid ""
+"Create an integer indexed array - starting from 0 - from a string. Use the "
+"separator character to split the string."
+msgstr ""
 
-#: editor/propertyeditor.cpp:1072 editor/propertyeditor.cpp:1130
-msgid "True"
-msgstr "真"
+#: executor/register.cpp:78
+msgid ""
+"Create a string from an integer indexed array. Concatenate the elements with "
+"the separator character."
+msgstr ""
 
-#: editor/propertyeditor.cpp:1410 editor/propertyeditor.cpp:1428
-#: editor/propertyeditor.cpp:1507 editor/propertyeditor.cpp:1518
-msgid "x"
-msgstr "x"
+#: executor/register.cpp:79
+msgid ""
+"Remove the element specified by the key from an indexed array and reindex the "
+"array."
+msgstr ""
 
-#: editor/propertyeditor.cpp:1412 editor/propertyeditor.cpp:1433
-#: editor/propertyeditor.cpp:1509 editor/propertyeditor.cpp:1520
-msgid "y"
-msgstr "y"
+#: executor/register.cpp:82
+msgid "Return number of chars in the string."
+msgstr ""
 
-#: editor/propertyeditor.cpp:1416 editor/propertyeditor.cpp:1438
-#: editor/propertyeditor.cpp:1511 editor/propertyeditor.cpp:1525
-msgid "width"
-msgstr "宽度"
+#: executor/register.cpp:83
+msgid "Check if the string contains given substring."
+msgstr ""
 
-#: editor/propertyeditor.cpp:1418 editor/propertyeditor.cpp:1443
-#: editor/propertyeditor.cpp:1513 editor/propertyeditor.cpp:1527
-msgid "height"
-msgstr "高度"
+#: executor/register.cpp:84
+msgid "Return position of a substring in the string, or -1 if it isn't found."
+msgstr ""
 
-#: editor/propertyeditor.cpp:1647 editor/propertyeditor.cpp:1660
-#: editor/propertyeditor.cpp:1710
-msgid "Red"
-msgstr "红"
+#: executor/register.cpp:86
+msgid "Return first n chars of the string."
+msgstr ""
 
-#: editor/propertyeditor.cpp:1649 editor/propertyeditor.cpp:1662
-#: editor/propertyeditor.cpp:1712
-msgid "Green"
-msgstr "绿"
+#: executor/register.cpp:87
+msgid "Return last n chars of the string."
+msgstr ""
 
-#: editor/propertyeditor.cpp:1651 editor/propertyeditor.cpp:1664
-#: editor/propertyeditor.cpp:1714
-msgid "Blue"
-msgstr "蓝"
+#: executor/register.cpp:88
+msgid "Return substring of the string, starting from given position."
+msgstr ""
 
-#: editor/propertyeditor.cpp:1768 editor/propertyeditor.cpp:1787
-#: editor/propertyeditor.cpp:1852
-msgid "Family"
-msgstr "字体"
+#: executor/register.cpp:90
+msgid "Replace all occurencies of given substring."
+msgstr ""
 
-#: editor/propertyeditor.cpp:1770 editor/propertyeditor.cpp:1790
-#: editor/propertyeditor.cpp:1854
-msgid "Point Size"
-msgstr "磅值"
+#: executor/register.cpp:91
+msgid "Replace all occurencies of given substring with given replacement."
+msgstr ""
 
-#: editor/propertyeditor.cpp:1772 editor/propertyeditor.cpp:1792
-#: editor/propertyeditor.cpp:1856
-msgid "Bold"
-msgstr "粗体"
+#: executor/register.cpp:93
+msgid "Convert the string to uppercase."
+msgstr ""
 
-#: editor/propertyeditor.cpp:1776 editor/propertyeditor.cpp:1796
-#: editor/propertyeditor.cpp:1860
-msgid "Underline"
-msgstr "下划线"
+#: executor/register.cpp:94
+msgid "Convert the string to lowercase."
+msgstr ""
 
-#: editor/propertyeditor.cpp:1778 editor/propertyeditor.cpp:1798
-#: editor/propertyeditor.cpp:1862
-msgid "Strikeout"
-msgstr "删除线"
+#: executor/register.cpp:95
+msgid ""
+"Compare two strings. Return 0 if they are equal, -1 if the first one is lower, "
+"1 if the first one is higher"
+msgstr ""
 
-#: editor/propertyeditor.cpp:1892 editor/propertyeditor.cpp:1910
-msgid "Connection"
-msgstr "连接"
+#: executor/register.cpp:97
+msgid "Check if string is empty."
+msgstr ""
 
-#: editor/propertyeditor.cpp:1894 editor/propertyeditor.cpp:1928
-#: editor/widgetdatabase.cpp:223
-msgid "Table"
-msgstr "表格"
+#: executor/register.cpp:98
+msgid "Check if string is a valid number."
+msgstr ""
 
-#: editor/propertyeditor.cpp:1897 editor/propertyeditor.cpp:1951
-msgid "Field"
-msgstr "域"
+#: executor/register.cpp:101
+msgid "Return content of given file."
+msgstr ""
 
-#: editor/propertyeditor.cpp:2059 editor/propertyeditor.cpp:2077
-#: editor/propertyeditor.cpp:2127
-msgid "hSizeType"
-msgstr "hSizeType"
+#: executor/register.cpp:102
+msgid "Write given string to a file."
+msgstr ""
 
-#: editor/propertyeditor.cpp:2062 editor/propertyeditor.cpp:2079
-#: editor/propertyeditor.cpp:2129
-msgid "vSizeType"
-msgstr "vSizeType"
+#: executor/register.cpp:103
+msgid "Append given string to the end of a file."
+msgstr ""
 
-#: editor/propertyeditor.cpp:2065 editor/propertyeditor.cpp:2081
-#: editor/propertyeditor.cpp:2131
-msgid "horizontalStretch"
-msgstr "horizontalStretch"
+#: executor/main.cpp:45
+msgid ""
+"Executor is a component of the Kommander dialog system that executes .kmdr "
+"files given as arguments or via stdin"
+msgstr "执行器是 Kommander 对话框系统的一个组件，可执行由参数或标准输入给出的 .kmdr 文件"
 
-#: editor/propertyeditor.cpp:2067 editor/propertyeditor.cpp:2083
-#: editor/propertyeditor.cpp:2133
-msgid "verticalStretch"
-msgstr "verticalStretch"
+#: executor/main.cpp:50
+msgid "Read dialog from standard input"
+msgstr "无法从标准输入读取对话框"
 
-#: editor/propertyeditor.cpp:2254
-msgid "Arrow"
-msgstr "箭头"
+#: executor/main.cpp:51
+msgid "Use given catalog for translation"
+msgstr ""
 
-#: editor/propertyeditor.cpp:2258
-msgid "Up-Arrow"
-msgstr "上箭头"
+#: editor/main.cpp:37 executor/main.cpp:52
+msgid "Dialog to open"
+msgstr "要打开的对话框"
 
-#: editor/propertyeditor.cpp:2262
-msgid "Cross"
-msgstr "十字"
+#: executor/main.cpp:58
+msgid "Kommander Executor"
+msgstr "Kommander 执行器"
 
-#: editor/propertyeditor.cpp:2266
-msgid "Waiting"
-msgstr "等待"
+#: editor/main.cpp:47 executor/main.cpp:61 part/kommander_part.cpp:58
+#, fuzzy
+msgid "Current maintainer"
+msgstr "复制当前行(&L)"
 
-#: editor/propertyeditor.cpp:2270
-msgid "iBeam"
-msgstr "I 形"
+#: editor/main.cpp:48 executor/main.cpp:62 part/kommander_part.cpp:59
+msgid "Previous maintainer"
+msgstr ""
 
-#: editor/propertyeditor.cpp:2274
-msgid "Size Vertical"
-msgstr "垂直大小"
+#: editor/main.cpp:49 executor/main.cpp:63 part/kommander_part.cpp:60
+msgid "Original author"
+msgstr ""
 
-#: editor/propertyeditor.cpp:2278
-msgid "Size Horizontal"
-msgstr "水平大小"
+#: executor/main.cpp:87
+msgid ""
+"Error: no dialog given. Use --stdin option to read dialog from standard input.\n"
+msgstr ""
 
-#: editor/propertyeditor.cpp:2282
-msgid "Size Slash"
-msgstr "斜线大小"
+#: part/kommander_part.cpp:30
+#, fuzzy
+msgid ""
+"Executor Part is a component of the Kommander dialog system that executes .kmdr "
+"files inside a TDE KPart"
+msgstr "执行器是 Kommander 对话框系统的一个组件，可执行由参数或标准输入给出的 .kmdr 文件"
 
-#: editor/propertyeditor.cpp:2286
-msgid "Size Backslash"
-msgstr "反斜线大小"
+#: part/kommander_part.cpp:54
+#, fuzzy
+msgid "Kommander Executor Part"
+msgstr "Kommander 执行器"
 
-#: editor/propertyeditor.cpp:2290
-msgid "Size All"
-msgstr "四向大小"
+#: part/kommander_part.cpp:56
+msgid "Part of the KDEWebDev module."
+msgstr ""
 
-#: editor/propertyeditor.cpp:2294
-msgid "Blank"
-msgstr "空"
+#: pluginmanager/mainwindow.cpp:37
+msgid "Refresh"
+msgstr "刷新"
 
-#: editor/propertyeditor.cpp:2298
-msgid "Split Vertical"
-msgstr "垂直拆分"
+#: pluginmanager/mainwindow.cpp:72
+msgid "Add Kommander Plugin"
+msgstr "添加 Kommander 插件"
 
-#: editor/propertyeditor.cpp:2302
-msgid "Split Horizontal"
-msgstr "水平拆分"
+#: pluginmanager/mainwindow.cpp:80
+msgid "<qt>Unable to load Kommander plugin<br><b>%1</b></qt>"
+msgstr "<qt>无法装入 Kommander 插件<br><b>%1</b></qt>"
 
-#: editor/propertyeditor.cpp:2306
-msgid "Pointing Hand"
-msgstr ""
+#: pluginmanager/mainwindow.cpp:81
+msgid "Cannot add plugin"
+msgstr "无法添加插件"
 
-#: editor/propertyeditor.cpp:2310
-msgid "Forbidden"
+#: pluginmanager/main.cpp:39
+msgid ""
+"kmdr-plugins is a component of the Kommander dialog system that manages "
+"installed plugins."
 msgstr ""
 
-#: editor/propertyeditor.cpp:2402
-msgid "Property"
-msgstr "属性"
+#: pluginmanager/main.cpp:46
+msgid "Register given library"
+msgstr "注册给定的库"
 
-#: editor/propertyeditor.cpp:2403
-msgid "Value"
-msgstr "值"
+#: pluginmanager/main.cpp:48
+msgid "Remove given library"
+msgstr "删除给定的库"
 
-#: editor/propertyeditor.cpp:2885
-msgid "Set '%1' of '%2'"
+#: pluginmanager/main.cpp:50
+msgid "Check all installed plugins and remove those missing"
 msgstr ""
 
-#: editor/propertyeditor.cpp:3006
-msgid "Sort &Categorized"
-msgstr "按类别排序(&C)"
-
-#: editor/propertyeditor.cpp:3007
-msgid "Sort &Alphabetically"
-msgstr "按字母排序(&A)"
+#: pluginmanager/main.cpp:52
+msgid "List all installed plugins"
+msgstr "列出已安装的全部插件"
 
-#: editor/propertyeditor.cpp:3137
-msgid "Reset '%1' of '%2'"
-msgstr "重置“%2”的“%1”"
+#: pluginmanager/main.cpp:59
+msgid "Kommander Plugin Manager"
+msgstr "Kommander 插件管理器"
 
-#: editor/propertyeditor.cpp:3244
-msgid ""
-"<p><b>QWidget::%1</b></p>"
-"<p>There is no documentation available for this property.</p>"
-msgstr ""
+#: pluginmanager/main.cpp:80
+msgid "Error adding plugin '%1'"
+msgstr "添加插件“%1”出错"
 
-#: editor/propertyeditor.cpp:3395
-msgid "New Signal Handler"
-msgstr "新建信号处理器"
+#: pluginmanager/main.cpp:85
+msgid "Error removing plugin '%1'"
+msgstr "删除插件“%1”出错"
 
-#: editor/propertyeditor.cpp:3396
-msgid "Delete Signal Handler"
-msgstr "删除信号处理器"
+#. i18n: file ./editor/listboxeditor.ui line 35
+#: rc.cpp:3
+#, no-c-format
+msgid "Edit Listbox"
+msgstr "编辑列表框"
 
-#: editor/connectioneditorimpl.cpp:236 editor/propertyeditor.cpp:3430
-msgid "Remove Connection"
-msgstr "删除连接"
+#. i18n: file ./editor/listboxeditor.ui line 41
+#: rc.cpp:6
+#, no-c-format
+msgid ""
+"<b>Edit Listbox</b>"
+"<p>Add, edit or delete items in the listbox.</p>"
+"<p>Click the <b>New Item</b>-button to create a new listbox entry, then enter "
+"text and choose a pixmap.</p>"
+"<p>Select an item from the list and click the <b>Delete Item</b>"
+"-button to remove the item from the list.</p>"
+msgstr ""
 
-#: editor/connectioneditorimpl.cpp:246 editor/propertyeditor.cpp:3480
-msgid "Add Connection"
-msgstr "添加连接"
+#. i18n: file ./editor/listboxeditor.ui line 109
+#: rc.cpp:15 rc.cpp:165 rc.cpp:198 rc.cpp:261 rc.cpp:378 rc.cpp:695 rc.cpp:722
+#: rc.cpp:959 rc.cpp:1121 rc.cpp:1322 rc.cpp:1346
+#, no-c-format
+msgid "Close the dialog and apply all the changes."
+msgstr "关闭对话框并应用全部更改。"
 
-#: editor/mainwindow.cpp:243 editor/propertyeditor.cpp:3542
-#: editor/propertyeditor.cpp:3582
-msgid "Property Editor"
-msgstr "属性编辑器"
+#. i18n: file ./editor/listboxeditor.ui line 123
+#: rc.cpp:21 rc.cpp:171 rc.cpp:204 rc.cpp:384 rc.cpp:728 rc.cpp:1328
+#, no-c-format
+msgid "Apply all changes."
+msgstr "应用全部更改。"
 
-#: editor/propertyeditor.cpp:3547
-msgid "P&roperties"
-msgstr "属性(&R)"
+#. i18n: file ./editor/listboxeditor.ui line 137
+#: rc.cpp:27 rc.cpp:177 rc.cpp:210 rc.cpp:267 rc.cpp:390 rc.cpp:701 rc.cpp:734
+#: rc.cpp:968 rc.cpp:1127 rc.cpp:1334 rc.cpp:1352
+#, no-c-format
+msgid "Close the dialog and discard any changes."
+msgstr "关闭对话框并丢弃任何更改。"
 
-#: editor/propertyeditor.cpp:3550
-msgid "S&ignal Handlers"
-msgstr "信号处理器(&I)"
+#. i18n: file ./editor/listboxeditor.ui line 147
+#: editor/actiondnd.cpp:350 editor/actiondnd.cpp:737 editor/actiondnd.cpp:1024
+#: rc.cpp:30 rc.cpp:81
+#, no-c-format
+msgid "Delete Item"
+msgstr "删除项目"
 
-#: editor/propertyeditor.cpp:3591
-msgid "Property Editor (%1)"
-msgstr "属性编辑器(%1)"
+#. i18n: file ./editor/listboxeditor.ui line 150
+#: rc.cpp:33 rc.cpp:1199
+#, no-c-format
+msgid "The list of items."
+msgstr "项目列表。"
 
-#: editor/actioneditorimpl.cpp:43 editor/mainwindow.cpp:301
-msgid "Actions"
-msgstr "动作"
+#. i18n: file ./editor/listboxeditor.ui line 158
+#: rc.cpp:36 rc.cpp:126
+#, no-c-format
+msgid "&Item Properties"
+msgstr "项目属性(&I)"
 
-#: editor/actioneditorimpl.cpp:48 editor/actionlistview.cpp:90
-msgid "New &Action"
-msgstr "新建动作(&A)"
+#. i18n: file ./editor/listboxeditor.ui line 175
+#: rc.cpp:39 rc.cpp:138 rc.cpp:1241
+#, no-c-format
+msgid "&Pixmap:"
+msgstr "像素图(&P)："
 
-#: editor/actioneditorimpl.cpp:49 editor/actionlistview.cpp:91
-msgid "New Action &Group"
-msgstr "新建动作组(&G)"
+#. i18n: file ./editor/listboxeditor.ui line 186
+#: rc.cpp:42 rc.cpp:141 rc.cpp:417 rc.cpp:474 rc.cpp:1172 rc.cpp:1244
+#, fuzzy, no-c-format
+msgid "Label4"
+msgstr "表格"
 
-#: editor/actioneditorimpl.cpp:50 editor/actionlistview.cpp:92
-msgid "New &Dropdown Action Group"
-msgstr "新建下拉动作组(&D)"
+#. i18n: file ./editor/listboxeditor.ui line 206
+#: rc.cpp:45 rc.cpp:144 rc.cpp:420 rc.cpp:477 rc.cpp:1175 rc.cpp:1247
+#, no-c-format
+msgid "Delete Pixmap"
+msgstr "删除像素图"
 
-#: editor/messagelog.cpp:34
-msgid "Copy Current &Line"
-msgstr "复制当前行(&L)"
+#. i18n: file ./editor/listboxeditor.ui line 209
+#: rc.cpp:48 rc.cpp:147
+#, no-c-format
+msgid "Delete the selected item's pixmap."
+msgstr "删除选中项目的像素图。"
 
-#: editor/messagelog.cpp:35
-msgid "&Copy Content"
-msgstr "复制内容(&C)"
+#. i18n: file ./editor/listboxeditor.ui line 223
+#: editor/propertyeditor.cpp:595 rc.cpp:51 rc.cpp:150 rc.cpp:426 rc.cpp:483
+#: rc.cpp:659 rc.cpp:845 rc.cpp:1181 rc.cpp:1253
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: editor/messagelog.cpp:36
-msgid "&Save As..."
-msgstr "另存为(&S)..."
+#. i18n: file ./editor/listboxeditor.ui line 226
+#: rc.cpp:54 rc.cpp:153 rc.cpp:429 rc.cpp:486 rc.cpp:1184 rc.cpp:1256
+#, no-c-format
+msgid "Select a Pixmap"
+msgstr "选择像素图"
 
-#: editor/messagelog.cpp:122
-msgid ""
-"*.log|Log Files (*.log)\n"
-"*|All Files"
+#. i18n: file ./editor/listboxeditor.ui line 229
+#: rc.cpp:57
+#, no-c-format
+msgid "Choose a pixmap file for the selected item."
 msgstr ""
 
-#: editor/messagelog.cpp:122
-msgid "Save Log File"
-msgstr "保存日志文件"
+#. i18n: file ./editor/listboxeditor.ui line 237
+#: rc.cpp:60 rc.cpp:129 rc.cpp:710 rc.cpp:1154 rc.cpp:1262
+#, no-c-format
+msgid "&Text:"
+msgstr "文本(&T)："
 
-#: editor/messagelog.cpp:127
-msgid "<qt>File<br><b>%1</b><br>already exists. Overwrite it?</qt>"
-msgstr "<qt>文件<br><b>%1</b><br>已经存在。覆盖吗？</qt>"
+#. i18n: file ./editor/listboxeditor.ui line 254
+#: rc.cpp:63 rc.cpp:132 rc.cpp:1157
+#, no-c-format
+msgid "Change text"
+msgstr "更改文字"
 
-#: editor/messagelog.cpp:132
-msgid "<qt>Cannot save log file<br><b>%1</b></qt>"
-msgstr "<qt>无法保存日志文件<br><b>%1</b></qt>"
+#. i18n: file ./editor/listboxeditor.ui line 257
+#: rc.cpp:66
+#, no-c-format
+msgid "Change the selected item's text."
+msgstr ""
 
-#: editor/messagelog.cpp:146
-#, fuzzy
-msgid "Stdout"
-msgstr "删除线"
+#. i18n: file ./editor/listboxeditor.ui line 267
+#: rc.cpp:69 rc.cpp:108 rc.cpp:1190
+#, no-c-format
+msgid "&New Item"
+msgstr "新建项目(&N)"
 
-#: editor/messagelog.cpp:146
-msgid "Stderr"
-msgstr ""
+#. i18n: file ./editor/listboxeditor.ui line 270
+#: rc.cpp:72 rc.cpp:111 rc.cpp:1193
+#, no-c-format
+msgid "Add an item"
+msgstr "添加菜单项"
 
-#: editor/tableeditorimpl.cpp:55
-msgid "<no field>"
+#. i18n: file ./editor/listboxeditor.ui line 273
+#: rc.cpp:75
+#, no-c-format
+msgid "<b>Add a new item.</b><p>New items are appended to the list.</p>"
 msgstr ""
 
-#: editor/tableeditorimpl.cpp:315
-msgid "Edit Rows and Columns of '%1' "
-msgstr "编辑“%1”的行和列"
+#. i18n: file ./editor/listboxeditor.ui line 281
+#: rc.cpp:78 rc.cpp:117 rc.cpp:1139
+#, no-c-format
+msgid "&Delete Item"
+msgstr "删除项目(&D)"
 
-#: editor/widgetfactory.cpp:291 editor/widgetfactory.cpp:571
-msgid "Move Tab Page"
-msgstr "移动标签页"
+#. i18n: file ./editor/listboxeditor.ui line 287
+#: rc.cpp:84
+#, fuzzy, no-c-format
+msgid "Delete the selected item"
+msgstr "打乱选中的布局"
 
-#. i18n: file ./editor/listeditor.ui line 31
-#: editor/widgetfactory.cpp:934 editor/widgetfactory.cpp:1125
-#: editor/widgetfactory.cpp:1235 rc.cpp:890
+#. i18n: file ./editor/listboxeditor.ui line 318
+#: rc.cpp:87 rc.cpp:396 rc.cpp:450 rc.cpp:1211 rc.cpp:1307
 #, no-c-format
-msgid "Column 1"
-msgstr "列 1"
+msgid "Move up"
+msgstr ""
 
-#: editor/widgetfactory.cpp:967 editor/widgetfactory.cpp:1169
-msgid "Tab 1"
-msgstr "标签 1"
+#. i18n: file ./editor/listboxeditor.ui line 321
+#: rc.cpp:90
+#, fuzzy, no-c-format
+msgid "Moves the selected item up."
+msgstr "打乱选中的布局"
 
-#: editor/widgetfactory.cpp:970 editor/widgetfactory.cpp:1172
-msgid "Tab 2"
-msgstr "标签 2"
+#. i18n: file ./editor/listboxeditor.ui line 335
+#: rc.cpp:93 rc.cpp:402 rc.cpp:456 rc.cpp:1217 rc.cpp:1292
+#, no-c-format
+msgid "Move down"
+msgstr ""
 
-#: editor/widgetfactory.cpp:1156 editor/widgetfactory.cpp:1184
-#, fuzzy
-msgid "Page 1"
-msgstr "页面标题"
+#. i18n: file ./editor/listboxeditor.ui line 338
+#: rc.cpp:96
+#, no-c-format
+msgid "Move the selected item down."
+msgstr ""
 
-#: editor/widgetfactory.cpp:1157 editor/widgetfactory.cpp:1187
-#, fuzzy
-msgid "Page 2"
-msgstr "页面标题"
+#. i18n: file ./editor/iconvieweditor.ui line 35
+#: rc.cpp:99
+#, no-c-format
+msgid "Edit Iconview"
+msgstr "编辑图标视图"
 
-#: editor/mainwindow.cpp:893 editor/mainwindowactions.cpp:96
-msgid "&Undo: Not Available"
-msgstr "撤消：不可用(&U)"
+#. i18n: file ./editor/iconvieweditor.ui line 41
+#: rc.cpp:102
+#, no-c-format
+msgid ""
+"<b>Edit Iconview</b>"
+"<p>Add, edit or delete items in the icon view.</p>"
+"<p>Click the <b>New Item</b>-button to create a new item, then enter text and "
+"choose a pixmap.</p>"
+"<p>Select an item from the view and click the <b>Delete Item</b>"
+"-button to remove the item from the iconview.</p>"
+msgstr ""
 
-#: editor/mainwindowactions.cpp:97
-msgid "Undoes the last action"
+#. i18n: file ./editor/iconvieweditor.ui line 72
+#: rc.cpp:105
+#, no-c-format
+msgid "All items in the iconview."
 msgstr ""
 
-#: editor/mainwindow.cpp:897 editor/mainwindowactions.cpp:102
-msgid "&Redo: Not Available"
-msgstr "重做：不可用(&R)"
+#. i18n: file ./editor/iconvieweditor.ui line 100
+#: rc.cpp:114
+#, no-c-format
+msgid "Create a new item for the iconview."
+msgstr "为图标视图创建新项目。"
 
-#: editor/mainwindowactions.cpp:103
-msgid "Redoes the last undone operation"
-msgstr ""
+#. i18n: file ./editor/iconvieweditor.ui line 111
+#: rc.cpp:120 rc.cpp:1142
+#, no-c-format
+msgid "Delete item"
+msgstr "删除项目"
 
-#: editor/mainwindowactions.cpp:108
-msgid "Cuts the selected widgets and puts them on the clipboard"
-msgstr ""
+#. i18n: file ./editor/iconvieweditor.ui line 114
+#: rc.cpp:123
+#, no-c-format
+msgid "Delete the selected item."
+msgstr "删除选中的项目。"
 
-#: editor/mainwindowactions.cpp:113
-msgid "Copies the selected widgets to the clipboard"
+#. i18n: file ./editor/iconvieweditor.ui line 184
+#: rc.cpp:135
+#, no-c-format
+msgid "Change the text for the selected item."
 msgstr ""
 
-#: editor/mainwindowactions.cpp:118
-msgid "Pastes the clipboard's contents"
+#. i18n: file ./editor/iconvieweditor.ui line 260
+#: rc.cpp:156
+#, no-c-format
+msgid "Select a pixmap file for the current item."
 msgstr ""
 
-#: editor/mainwindowactions.cpp:124
-msgid "Deletes the selected widgets"
-msgstr ""
+#. i18n: file ./editor/wizardeditor.ui line 16
+#: rc.cpp:180
+#, no-c-format
+msgid "Wizard Page Editor"
+msgstr "向导页面编辑器"
 
-#: editor/mainwindowactions.cpp:129
-msgid "Selects all widgets"
-msgstr "选中全部部件"
+#. i18n: file ./editor/wizardeditor.ui line 61
+#: rc.cpp:183
+#, no-c-format
+msgid "Wizard pages:"
+msgstr "向导页面："
 
-#: editor/mainwindowactions.cpp:132
-msgid "Bring to Front"
-msgstr "提到最前"
+#. i18n: file ./editor/wizardeditor.ui line 90
+#: rc.cpp:186 rc.cpp:351
+#, no-c-format
+msgid "&Add"
+msgstr "添加(&A)"
 
-#: editor/mainwindowactions.cpp:134
-msgid "Raises the selected widgets"
+#. i18n: file ./editor/paletteeditor.ui line 43
+#: rc.cpp:213
+#, no-c-format
+msgid "Edit Palette"
+msgstr "编辑调色板"
+
+#. i18n: file ./editor/paletteeditor.ui line 68
+#: rc.cpp:216
+#, no-c-format
+msgid "Build Palette"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:137
-msgid "Send to Back"
-msgstr "推到最后"
+#. i18n: file ./editor/paletteeditor.ui line 111
+#: rc.cpp:219
+#, no-c-format
+msgid "&3D effects:"
+msgstr "立体效果(&3)："
 
-#: editor/mainwindowactions.cpp:139 editor/mainwindowactions.cpp:140
-msgid "Lowers the selected widgets"
+#. i18n: file ./editor/paletteeditor.ui line 139
+#: rc.cpp:222 rc.cpp:231 rc.cpp:557 rc.cpp:1067 rc.cpp:1109
+#, no-c-format
+msgid "Choose a color"
+msgstr "选择颜色"
+
+#. i18n: file ./editor/paletteeditor.ui line 142
+#: rc.cpp:225
+#, no-c-format
+msgid "Choose the effect-color for the generated palette."
 msgstr ""
 
-#: editor/mainwindowactions.cpp:143
-#, fuzzy
-msgid "Find in Form..."
-msgstr "打开表单(&O)..."
+#. i18n: file ./editor/paletteeditor.ui line 173
+#: rc.cpp:228
+#, no-c-format
+msgid "Back&ground:"
+msgstr "背景(&G)："
 
-#: editor/mainwindowactions.cpp:144
-msgid "Search for a text in the whole form."
+#. i18n: file ./editor/paletteeditor.ui line 204
+#: rc.cpp:234
+#, no-c-format
+msgid "Choose the background color for the generated palette."
 msgstr ""
 
-#: editor/formwindow.cpp:1848 editor/formwindow.cpp:1860
-#: editor/mainwindowactions.cpp:148
-msgid "Check Accelerators"
-msgstr "检查加速键"
+#. i18n: file ./editor/paletteeditor.ui line 229
+#: rc.cpp:237
+#, no-c-format
+msgid "&Tune Palette..."
+msgstr ""
 
-#: editor/mainwindowactions.cpp:150
-msgid "Checks if the accelerators used in the form are unique"
-msgstr "检查表单中所用的加速键是否唯一"
+#. i18n: file ./editor/paletteeditor.ui line 247
+#: rc.cpp:240
+#, no-c-format
+msgid "Preview"
+msgstr "预览"
 
-#: editor/mainwindowactions.cpp:154
-msgid "Connections"
-msgstr "连接"
+#. i18n: file ./editor/paletteeditor.ui line 278
+#: rc.cpp:243 rc.cpp:992
+#, no-c-format
+msgid "Select &palette:"
+msgstr "选择调色板(&P)："
 
-#: editor/mainwindowactions.cpp:157
-msgid "Opens a dialog for editing connections"
-msgstr "打开对话框以编辑连接"
+#. i18n: file ./editor/paletteeditor.ui line 287
+#: rc.cpp:246 rc.cpp:995
+#, no-c-format
+msgid "Active Palette"
+msgstr "活动调色板"
 
-#: editor/mainwindowactions.cpp:161
-msgid "Form Settings..."
-msgstr "表单设置..."
+#. i18n: file ./editor/paletteeditor.ui line 292
+#: rc.cpp:249 rc.cpp:998
+#, no-c-format
+msgid "Inactive Palette"
+msgstr "非活动调色板"
 
-#: editor/mainwindowactions.cpp:163
-msgid "Opens a dialog to change the form's settings"
-msgstr "打开对话框以更改表单设置"
+#. i18n: file ./editor/paletteeditor.ui line 297
+#: rc.cpp:252 rc.cpp:1001
+#, no-c-format
+msgid "Disabled Palette"
+msgstr "禁用的调色板"
 
-#: editor/mainwindowactions.cpp:169
-#, c-format
-msgid "<b>The Edit toolbar</b>%1"
-msgstr "<b>编辑工具栏</b>%1"
+#. i18n: file ./editor/choosewidget.ui line 16
+#: rc.cpp:270
+#, no-c-format
+msgid "Choose Widget"
+msgstr "选择部件"
 
-#: editor/formwindow.cpp:1443 editor/formwindow.cpp:1457
-#: editor/formwindow.cpp:1465 editor/mainwindowactions.cpp:200
-msgid "Adjust Size"
-msgstr "调整大小"
+#. i18n: file ./editor/choosewidget.ui line 118
+#: rc.cpp:279
+#, no-c-format
+msgid "Find:"
+msgstr "查找："
 
-#: editor/mainwindowactions.cpp:202
-msgid "Adjusts the size of the selected widget"
-msgstr ""
+#. i18n: file ./editor/templates/Tab_Dialog.ui line 37
+#: rc.cpp:282 rc.cpp:285 rc.cpp:327 rc.cpp:330
+#, no-c-format
+msgid "Tab"
+msgstr "Tab"
 
-#: editor/formwindow.cpp:1909 editor/mainwindowactions.cpp:206
-msgid "Lay Out Horizontally"
-msgstr "水平排布"
+#. i18n: file ./editor/templates/Tab_Dialog.ui line 71
+#: rc.cpp:291 rc.cpp:303 rc.cpp:321 rc.cpp:336
+#, no-c-format
+msgid "F1"
+msgstr "F1"
 
-#: editor/mainwindowactions.cpp:208
-msgid "Lays out the selected widgets horizontally"
-msgstr ""
+#. i18n: file ./editor/templates/Configuration_Dialog.ui line 31
+#: editor/iconvieweditorimpl.cpp:57 editor/listboxeditorimpl.cpp:61
+#: editor/widgetfactory.cpp:891 editor/widgetfactory.cpp:924
+#: editor/widgetfactory.cpp:935 editor/widgetfactory.cpp:1126
+#: editor/widgetfactory.cpp:1236 rc.cpp:324
+#, no-c-format
+msgid "New Item"
+msgstr "新建项目"
 
-#: editor/formwindow.cpp:1919 editor/mainwindowactions.cpp:212
-msgid "Lay Out Vertically"
-msgstr "垂直排布"
+#. i18n: file ./editor/listeditor.ui line 31
+#: editor/widgetfactory.cpp:934 editor/widgetfactory.cpp:1125
+#: editor/widgetfactory.cpp:1235 rc.cpp:348
+#, no-c-format
+msgid "Column 1"
+msgstr "列 1"
 
-#: editor/mainwindowactions.cpp:214
-msgid "Lays out the selected widgets vertically"
-msgstr ""
+#. i18n: file ./editor/listeditor.ui line 71
+#: rc.cpp:357
+#, no-c-format
+msgid "Re&name"
+msgstr "重命名(&N)"
 
-#: editor/formwindow.cpp:1954 editor/mainwindowactions.cpp:218
-msgid "Lay Out in a Grid"
-msgstr ""
+#. i18n: file ./editor/tableeditor.ui line 16
+#: rc.cpp:363
+#, no-c-format
+msgid "Edit Table"
+msgstr "编辑表"
 
-#: editor/mainwindowactions.cpp:220
-msgid "Lays out the selected widgets in a grid"
-msgstr ""
+#. i18n: file ./editor/tableeditor.ui line 34
+#: rc.cpp:366 rc.cpp:369
+#, no-c-format
+msgid "1"
+msgstr "1"
 
-#: editor/mainwindowactions.cpp:224
-#, fuzzy
-msgid "Lay Out Horizontally in Splitter"
-msgstr "水平排布"
+#. i18n: file ./editor/tableeditor.ui line 153
+#: rc.cpp:393 rc.cpp:1235
+#, no-c-format
+msgid "Co&lumns"
+msgstr "列(&L)"
 
-#: editor/mainwindowactions.cpp:227
-msgid "Lays out the selected widgets horizontally in a splitter"
+#. i18n: file ./editor/tableeditor.ui line 218
+#: rc.cpp:399 rc.cpp:453
+#, no-c-format
+msgid ""
+"<b>Move the selected item up.</b>"
+"<p>The top-most column will be the first column of the list.</p>"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:231
-#, fuzzy
-msgid "Lay Out Vertically in Splitter"
-msgstr "垂直排布"
-
-#: editor/mainwindowactions.cpp:234
-msgid "Lays out the selected widgets vertically in a splitter"
+#. i18n: file ./editor/tableeditor.ui line 235
+#: rc.cpp:405 rc.cpp:459
+#, no-c-format
+msgid ""
+"<b>Move the selected item down.</b>"
+"<p>The top-most column will be the first column of the list.</p>"
 msgstr ""
 
-#: editor/formwindow.cpp:2054 editor/formwindow.cpp:2073
-#: editor/mainwindowactions.cpp:238
-msgid "Break Layout"
-msgstr "打乱布局"
-
-#: editor/mainwindowactions.cpp:240
-msgid "Breaks the selected layout"
-msgstr "打乱选中的布局"
-
-#: editor/mainwindowactions.cpp:244 editor/widgetdatabase.cpp:356
-msgid "Spacer"
-msgstr ""
+#. i18n: file ./editor/tableeditor.ui line 243
+#: rc.cpp:408 rc.cpp:1283
+#, no-c-format
+msgid "&Delete Column"
+msgstr "删除列(&D)"
 
-#: editor/mainwindowactions.cpp:247
-msgid "Add "
-msgstr "添加"
+#. i18n: file ./editor/tableeditor.ui line 251
+#: rc.cpp:411 rc.cpp:1298
+#, no-c-format
+msgid "&New Column"
+msgstr "新建列(&N)"
 
-#: editor/mainwindowactions.cpp:248 editor/mainwindowactions.cpp:362
-#, c-format
-msgid "Insert a %1"
-msgstr "插入一个%1"
+#. i18n: file ./editor/tableeditor.ui line 273
+#: rc.cpp:414
+#, no-c-format
+msgid "Table:"
+msgstr "表："
 
-#: editor/mainwindowactions.cpp:249
+#. i18n: file ./editor/tableeditor.ui line 318
+#: rc.cpp:423 rc.cpp:480 rc.cpp:1178
+#, no-c-format
 msgid ""
-"<b>A %1</b>"
-"<p>%2</p>"
-"<p>Click to insert a single %3,or double click to keep the tool selected."
+"<b>Delete the selected item's pixmap.</b>"
+"<p>The pixmap in the current column of the selected item will be deleted.</p>"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:254
-#, c-format
-msgid "<b>The Layout toolbar</b>%1"
-msgstr "<b>布局工具栏</b>%1"
+#. i18n: file ./editor/tableeditor.ui line 338
+#: rc.cpp:432 rc.cpp:489 rc.cpp:1187
+#, no-c-format
+msgid ""
+"<b>Select a pixmap file for the item.</b>"
+"<p>The pixmap will be changed in the current column of the selected item.</p>"
+msgstr ""
 
-#: editor/mainwindowactions.cpp:267
-msgid "&Layout"
-msgstr "布局(&L)"
+#. i18n: file ./editor/tableeditor.ui line 348
+#: rc.cpp:435 rc.cpp:468
+#, no-c-format
+msgid "&Label:"
+msgstr "标签(&L)："
 
-#: editor/mainwindowactions.cpp:282
-msgid "Pointer"
-msgstr "指针"
+#. i18n: file ./editor/tableeditor.ui line 359
+#: rc.cpp:438 rc.cpp:471
+#, no-c-format
+msgid "Pixmap:"
+msgstr "像素图："
 
-#: editor/mainwindowactions.cpp:285
-msgid "Selects the pointer tool"
-msgstr "选择指针工具"
+#. i18n: file ./editor/tableeditor.ui line 370
+#: rc.cpp:441
+#, no-c-format
+msgid "&Field:"
+msgstr "域(&F)："
 
-#: editor/mainwindowactions.cpp:289
-msgid "Connect Signal/Slots"
+#. i18n: file ./editor/tableeditor.ui line 394
+#: rc.cpp:444
+#, no-c-format
+msgid "<no table>"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:292
-msgid "Selects the connection tool"
-msgstr "选择连接工具"
-
-#: editor/mainwindowactions.cpp:296
-msgid "Tab Order"
-msgstr "Tab 顺序"
+#. i18n: file ./editor/tableeditor.ui line 406
+#: rc.cpp:447
+#, no-c-format
+msgid "&Rows"
+msgstr "行(&R)"
 
-#: editor/mainwindowactions.cpp:299
-msgid "Selects the tab order tool"
-msgstr "选择 Tab 顺序工具"
+#. i18n: file ./editor/tableeditor.ui line 496
+#: rc.cpp:462
+#, no-c-format
+msgid "&New Row"
+msgstr "新建行(&N)"
 
-#: editor/mainwindowactions.cpp:305
-#, c-format
-msgid "<b>The Tools toolbar</b>%1"
-msgstr "<b>工具工具栏</b>%1"
+#. i18n: file ./editor/tableeditor.ui line 504
+#: rc.cpp:465
+#, no-c-format
+msgid "&Delete Row"
+msgstr "删除行(&D)"
 
-#: editor/mainwindowactions.cpp:307
-msgid "Tools"
-msgstr "工具"
+#. i18n: file ./editor/previewwidget.ui line 22
+#: rc.cpp:492
+#, no-c-format
+msgid "Preview Window"
+msgstr "预览窗口"
 
-#: editor/mainwindowactions.cpp:329
-msgid "<b>The %1</b>%2"
-msgstr "<b>%1</b>%2"
+#. i18n: file ./editor/previewwidget.ui line 67
+#: rc.cpp:495
+#, fuzzy, no-c-format
+msgid "ButtonGroup"
+msgstr "新建动作组(&G)"
 
-#: editor/mainwindowactions.cpp:330
-#, c-format
-msgid ""
-" Click on a button to insert a single widget, or double click to insert "
-"multiple %1."
+#. i18n: file ./editor/previewwidget.ui line 84
+#: rc.cpp:498
+#, no-c-format
+msgid "RadioButton1"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:334
-msgid "<b>The %1 Widgets</b>%2"
-msgstr "<b>%1 部件</b>%2"
+#. i18n: file ./editor/previewwidget.ui line 95
+#: rc.cpp:501
+#, no-c-format
+msgid "RadioButton2"
+msgstr ""
 
-#: editor/mainwindowactions.cpp:335
-msgid ""
-" Click on a button to insert a single %1 widget, or double click to insert "
-"multiple widgets."
+#. i18n: file ./editor/previewwidget.ui line 103
+#: rc.cpp:504
+#, no-c-format
+msgid "RadioButton3"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:364
-msgid "<b>A %1</b>"
-msgstr "<b>%1</b>"
+#. i18n: file ./editor/previewwidget.ui line 113
+#: rc.cpp:507
+#, fuzzy, no-c-format
+msgid "ButtonGroup2"
+msgstr "新建动作组(&G)"
 
-#: editor/mainwindowactions.cpp:367
-msgid "<p>Double click on this tool to keep it selected.</p>"
-msgstr ""
+#. i18n: file ./editor/previewwidget.ui line 130
+#: rc.cpp:510
+#, no-c-format
+msgid "CheckBox1"
+msgstr "复选框1"
 
-#: editor/mainwindowactions.cpp:398
-msgid "Editor"
-msgstr "编辑器"
+#. i18n: file ./editor/previewwidget.ui line 141
+#: rc.cpp:513
+#, no-c-format
+msgid "CheckBox2"
+msgstr "复选框2"
 
-#: editor/mainwindowactions.cpp:408
-#, c-format
-msgid "<b>The File toolbar</b>%1"
-msgstr "<b>文件工具栏<b>%1"
+#. i18n: file ./editor/previewwidget.ui line 175
+#: rc.cpp:516
+#, no-c-format
+msgid "LineEdit"
+msgstr "行编辑"
 
-#: editor/mainwindowactions.cpp:414
-msgid "Creates a new dialog"
-msgstr "创建新对话框"
+#. i18n: file ./editor/previewwidget.ui line 181
+#: rc.cpp:519
+#, no-c-format
+msgid "ComboBox"
+msgstr "组合框"
 
-#: editor/mainwindowactions.cpp:420
-msgid "Opens an existing dialog"
-msgstr "打开已有对话框"
+#. i18n: file ./editor/previewwidget.ui line 212
+#: rc.cpp:522
+#, no-c-format
+msgid "PushButton"
+msgstr "按钮"
 
-#: editor/mainwindowactions.cpp:426
-msgid "Opens recently open file"
-msgstr "最近打开的文件"
+#. i18n: file ./editor/previewwidget.ui line 249
+#: rc.cpp:525
+#, no-c-format
+msgid ""
+"<p>\n"
+"<a href=\"http://www.trolltech.com\"> http://www.trolltech.com </a>\n"
+"</p>\n"
+"<p>\n"
+"<a href=\"http://www.kde.org\"> http://www.kde.org </a>\n"
+"</p>"
+msgstr ""
 
-#: editor/mainwindowactions.cpp:431
-msgid "Closes the current dialog"
-msgstr "关闭当前对话框"
+#. i18n: file ./editor/actioneditor.ui line 19
+#: rc.cpp:533
+#, no-c-format
+msgid "Edit Actions"
+msgstr "编辑动作"
 
-#: editor/mainwindowactions.cpp:439
-msgid "Saves the current dialog"
-msgstr "保存当前对话框"
+#. i18n: file ./editor/actioneditor.ui line 61
+#: rc.cpp:536
+#, no-c-format
+msgid "Create new Action"
+msgstr "创建新动作"
 
-#: editor/mainwindowactions.cpp:446
-msgid "Saves the current dialog with a new filename"
-msgstr "用新文件名保存当前对话框"
+#. i18n: file ./editor/actioneditor.ui line 78
+#: rc.cpp:539
+#, no-c-format
+msgid "Delete current Action"
+msgstr "删除当前动作"
 
-#: editor/mainwindowactions.cpp:451
-msgid "Save All"
-msgstr "全部保存"
+#. i18n: file ./editor/actioneditor.ui line 95
+#: rc.cpp:542
+#, no-c-format
+msgid "Connect current Action"
+msgstr "连接当前动作"
 
-#: editor/mainwindowactions.cpp:453
-msgid "Saves all open dialogs"
-msgstr "保存全部打开的对话框"
+#. i18n: file ./editor/preferences.ui line 35
+#: rc.cpp:545
+#, no-c-format
+msgid "Preferences"
+msgstr "首选项"
 
-#: editor/mainwindowactions.cpp:461
-msgid "Quits the application and prompts to save any changed dialogs"
+#. i18n: file ./editor/preferences.ui line 41
+#: rc.cpp:548
+#, no-c-format
+msgid ""
+"<b>Preferences</b>"
+"<p>Change the preferences of Qt Designer. There is always one tab with general "
+"preferences. There may be additional tabs, depending on which plugins are "
+"installed.</p>"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:470
-msgid "&Run"
-msgstr "运行(&R)"
+#. i18n: file ./editor/preferences.ui line 62
+#: rc.cpp:551
+#, no-c-format
+msgid "General"
+msgstr "常规"
 
-#: editor/mainwindowactions.cpp:472
-msgid "Run Dialog"
-msgstr "运行对话框"
+#. i18n: file ./editor/preferences.ui line 79
+#: rc.cpp:554
+#, no-c-format
+msgid "Backgro&und"
+msgstr "背景(&U)"
 
-#: editor/mainwindowactions.cpp:474
-msgid "Executes dialog"
-msgstr "执行对话框"
+#. i18n: file ./editor/preferences.ui line 114
+#: rc.cpp:560
+#, no-c-format
+msgid "Select a color in the color dialog."
+msgstr "在颜色对话框中选择颜色。"
 
-#: editor/mainwindowactions.cpp:488
-msgid "Tile"
-msgstr "平铺"
+#. i18n: file ./editor/preferences.ui line 125
+#: rc.cpp:563
+#, no-c-format
+msgid "Co&lor"
+msgstr "颜色(&L)"
 
-#: editor/mainwindowactions.cpp:490
-msgid "Tiles the windows so that they are all visible"
-msgstr ""
+#. i18n: file ./editor/preferences.ui line 128
+#: rc.cpp:566
+#, no-c-format
+msgid "Use a background color"
+msgstr "使用背景颜色"
 
-#: editor/mainwindowactions.cpp:493 editor/mainwindowactions.cpp:498
-msgid "Cascade"
-msgstr "层叠"
+#. i18n: file ./editor/preferences.ui line 131
+#: rc.cpp:569
+#, no-c-format
+msgid "Use a background color."
+msgstr "使用背景颜色。"
 
-#: editor/mainwindowactions.cpp:495
-msgid "Cascades the windows so that all their title bars are visible"
-msgstr ""
+#. i18n: file ./editor/preferences.ui line 139
+#: rc.cpp:572
+#, no-c-format
+msgid "&Pixmap"
+msgstr "像素图(&P)"
 
-#: editor/mainwindowactions.cpp:500
-msgid "Closes the active window"
-msgstr "关闭当前窗口"
+#. i18n: file ./editor/preferences.ui line 145
+#: rc.cpp:575
+#, no-c-format
+msgid "Use a background pixmap"
+msgstr "使用背景像素图"
 
-#: editor/mainwindowactions.cpp:503
-msgid "Close All"
-msgstr "全部关闭"
+#. i18n: file ./editor/preferences.ui line 148
+#: rc.cpp:578
+#, no-c-format
+msgid "Use a background pixmap."
+msgstr "使用背景像素图。"
 
-#: editor/mainwindowactions.cpp:505
-msgid "Closes all form windows"
-msgstr "关闭全部表单窗口"
+#. i18n: file ./editor/preferences.ui line 168
+#: rc.cpp:581 rc.cpp:1058
+#, no-c-format
+msgid "Select a pixmap"
+msgstr "选择像素图"
 
-#: editor/mainwindowactions.cpp:508
-msgid "Next"
-msgstr "下一个"
+#. i18n: file ./editor/preferences.ui line 171
+#: rc.cpp:584
+#, no-c-format
+msgid "Choose a pixmap file."
+msgstr "选择像素图文件。"
 
-#: editor/mainwindowactions.cpp:510
-msgid "Activates the next window"
-msgstr "激活下一个窗口"
+#. i18n: file ./editor/preferences.ui line 181
+#: rc.cpp:587
+#, no-c-format
+msgid "Show &grid"
+msgstr "显示网格(&G)"
 
-#: editor/mainwindowactions.cpp:513
-msgid "Previous"
-msgstr "上一个"
+#. i18n: file ./editor/preferences.ui line 187
+#: rc.cpp:590
+#, no-c-format
+msgid "Show Grid"
+msgstr "显示网格"
 
-#: editor/mainwindowactions.cpp:515
-msgid "Activates the previous window"
-msgstr "激活上一个窗口"
+#. i18n: file ./editor/preferences.ui line 190
+#: rc.cpp:593
+#, no-c-format
+msgid ""
+"<b>Customize the grid appearance for all forms.</b>"
+"<p>When <b>Show Grid</b> is checked, all forms show a grid.</p>"
+msgstr ""
 
-#: editor/mainwindowactions.cpp:519
-msgid "&Window"
-msgstr "窗口(&W)"
+#. i18n: file ./editor/preferences.ui line 198
+#: rc.cpp:596
+#, no-c-format
+msgid "Gr&id"
+msgstr "网格(&I)"
 
-#: editor/mainwindowactions.cpp:531
-msgid "Vie&ws"
-msgstr "视图(&W)"
+#. i18n: file ./editor/preferences.ui line 218
+#: rc.cpp:599
+#, no-c-format
+msgid "Sn&ap to grid"
+msgstr "吸附到网格(&A)"
 
-#: editor/mainwindowactions.cpp:532
-msgid "Tool&bars"
-msgstr "工具栏(&B)"
+#. i18n: file ./editor/preferences.ui line 224
+#: rc.cpp:602
+#, no-c-format
+msgid "Snap to the grid"
+msgstr "吸附到网格"
 
-#: editor/mainwindowactions.cpp:568
-msgid "Opens a dialog to change shortcuts"
-msgstr "打开对话框以更改快捷键"
+#. i18n: file ./editor/preferences.ui line 227
+#: rc.cpp:605
+#, no-c-format
+msgid ""
+"<b>Customize the grid-settings for all forms.</b>"
+"<p>When <b>Snap to Grid</b> is checked, the widgets snap to the grid using the "
+"the X/Y resolution.</p>"
+msgstr ""
 
-#: editor/mainwindowactions.cpp:571
-#, fuzzy
-msgid "Configure &Plugins..."
-msgstr "配置插件(&P)..."
+#. i18n: file ./editor/preferences.ui line 258
+#: rc.cpp:608 rc.cpp:614
+#, no-c-format
+msgid "Grid resolution"
+msgstr ""
 
-#: editor/mainwindowactions.cpp:573
-msgid "Opens a dialog to configure plugins"
-msgstr "打开对话框以配置插件"
+#. i18n: file ./editor/preferences.ui line 261
+#: rc.cpp:611 rc.cpp:617
+#, no-c-format
+msgid ""
+"<b>Customize the grid-settings for all forms.</b>"
+"<p>When <b>Show Grid</b> is checked, a grid is shown on all forms using the X/Y "
+"resolution.</p>"
+msgstr ""
 
-#: editor/mainwindowactions.cpp:576
-#, fuzzy
-msgid "&Configure Editor..."
-msgstr "配置插件(&P)..."
+#. i18n: file ./editor/preferences.ui line 289
+#: rc.cpp:620
+#, no-c-format
+msgid "Grid-&X:"
+msgstr "&X 网格："
 
-#: editor/mainwindowactions.cpp:578
-msgid "Configure various aspects of this editor."
+#. i18n: file ./editor/preferences.ui line 300
+#: rc.cpp:623
+#, no-c-format
+msgid "Grid-&Y:"
 msgstr ""
 
-#: editor/mainwindowactions.cpp:582
-msgid "Opens a dialog to change preferences"
-msgstr "打开对话框以更改首选项"
+#. i18n: file ./editor/preferences.ui line 327
+#: rc.cpp:626 rc.cpp:647
+#, no-c-format
+msgid ""
+"A splash screen is displayed when starting Qt Designer if this option is "
+"checked."
+msgstr ""
 
-#: editor/mainwindowactions.cpp:598
-msgid "Create a new dialog..."
-msgstr "创建新对话框..."
+#. i18n: file ./editor/preferences.ui line 335
+#: rc.cpp:629
+#, no-c-format
+msgid "Ge&neral"
+msgstr "常规(&N)"
 
-#: editor/mainwindowactions.cpp:621
-msgid "Open a file..."
-msgstr "打开文件..."
+#. i18n: file ./editor/preferences.ui line 352
+#: rc.cpp:632
+#, no-c-format
+msgid "Restore last &workspace on startup"
+msgstr "启动时恢复上次的工作空间(&W)"
 
-#: editor/mainwindowactions.cpp:626
-msgid "Open Files"
-msgstr "打开文件"
+#. i18n: file ./editor/preferences.ui line 358
+#: rc.cpp:635
+#, no-c-format
+msgid "Restore last workspace"
+msgstr "恢复上个工作空间"
 
-#: editor/mainwindowactions.cpp:662
-msgid "Reading file '%1'..."
-msgstr "正在读取文件“%1”..."
+#. i18n: file ./editor/preferences.ui line 361
+#: rc.cpp:638
+#, no-c-format
+msgid ""
+"The current workspace settings will be restored the next time you start Qt "
+"Designer if this option is checked."
+msgstr ""
 
-#: editor/mainwindowactions.cpp:675
-msgid "Loaded file '%1'"
-msgstr "已装入文件“%1”"
+#. i18n: file ./editor/preferences.ui line 369
+#: rc.cpp:641
+#, no-c-format
+msgid "Show &splash screen on startup"
+msgstr ""
 
-#: editor/mainwindowactions.cpp:681 editor/mainwindowactions.cpp:682
-msgid "Could not load file '%1'"
-msgstr "无法装入文件“%1”"
+#. i18n: file ./editor/preferences.ui line 375
+#: rc.cpp:644
+#, no-c-format
+msgid "Show Splashscreen"
+msgstr "显示飞溅屏幕"
 
-#: editor/mainwindowactions.cpp:682
-msgid "Load File"
-msgstr "装入文件"
+#. i18n: file ./editor/preferences.ui line 386
+#: rc.cpp:650
+#, no-c-format
+msgid "Disable data&base auto-edit in preview"
+msgstr "在预览中禁用数据库自动编辑(&B)"
 
-#: editor/mainwindowactions.cpp:717
-msgid "Enter a filename..."
-msgstr "输入文件名..."
+#. i18n: file ./editor/preferences.ui line 397
+#: rc.cpp:653
+#, no-c-format
+msgid "&Documentation path:"
+msgstr "文档路径(&D)："
 
-#: editor/mainwindowactions.cpp:745
-msgid "Qt Designer is crashing. Attempting to save files..."
-msgstr "Qt 设计器已崩溃。正在试图保存文件..."
+#. i18n: file ./editor/preferences.ui line 422
+#: rc.cpp:656
+#, no-c-format
+msgid ""
+"<b>Enter the path to the documentation.</b>"
+"<p>You may provide an $environment variable as the first part of the "
+"pathname.</p>"
+msgstr ""
 
-#: editor/mainwindowactions.cpp:782 editor/mainwindowactions.cpp:845
-msgid "NewTemplate"
-msgstr "新模板"
+#. i18n: file ./editor/preferences.ui line 436
+#: rc.cpp:662
+#, no-c-format
+msgid "Select path"
+msgstr "选择路径"
 
-#: editor/mainwindowactions.cpp:794 editor/mainwindowactions.cpp:823
-msgid "Could not create the template"
-msgstr "无法创建模板"
+#. i18n: file ./editor/preferences.ui line 439
+#: rc.cpp:665
+#, no-c-format
+msgid "Look for the documentation path."
+msgstr "查找文档路径。"
 
-#. i18n: file ./editor/createtemplate.ui line 38
-#: editor/mainwindowactions.cpp:794 editor/mainwindowactions.cpp:823
-#: rc.cpp:407
+#. i18n: file ./editor/preferences.ui line 451
+#: rc.cpp:668
 #, no-c-format
-msgid "Create Template"
-msgstr "创建模板"
+msgid "&Toolbars"
+msgstr "工具栏(&T)"
 
-#: editor/mainwindowactions.cpp:897
-msgid ""
-"Cannot paste widgets. Designer could not find a container\n"
-"to paste into which does not contain a layout. Break the layout\n"
-"of the container you want to paste into and select this container\n"
-"and then paste again."
-msgstr ""
+#. i18n: file ./editor/preferences.ui line 468
+#: rc.cpp:671
+#, no-c-format
+msgid "Show &big icons"
+msgstr "显示大图标(&B)"
 
-#: editor/mainwindowactions.cpp:900
-msgid "Paste Error"
-msgstr "粘贴错误"
+#. i18n: file ./editor/preferences.ui line 471
+#: rc.cpp:674
+#, no-c-format
+msgid "Big Icons"
+msgstr "大图标"
 
-#: editor/formwindow.cpp:2135 editor/mainwindowactions.cpp:1063
-msgid "Edit connections..."
-msgstr "编辑连接..."
+#. i18n: file ./editor/preferences.ui line 474
+#: rc.cpp:677
+#, no-c-format
+msgid "Big icons will be used in the toolbars if this is checked."
+msgstr ""
 
-#: editor/mainwindowactions.cpp:1082
-msgid "Edit the current form's settings..."
-msgstr "编辑当前表单的设置..."
+#. i18n: file ./editor/preferences.ui line 482
+#: rc.cpp:680
+#, no-c-format
+msgid "Show text lab&els"
+msgstr "显示文本标签(&E)"
 
-#: editor/mainwindowactions.cpp:1090
-msgid "Edit preferences..."
-msgstr "编辑首选项..."
+#. i18n: file ./editor/preferences.ui line 485
+#: rc.cpp:683
+#, no-c-format
+msgid "Text Labels"
+msgstr "文本标签"
 
-#: editor/command.cpp:499 editor/command.cpp:511
-msgid "Set 'name' Property"
-msgstr "设置“name”属性"
+#. i18n: file ./editor/preferences.ui line 488
+#: rc.cpp:686
+#, no-c-format
+msgid "Text labels will be usin in the toolbars if this is checked."
+msgstr ""
 
-#: editor/command.cpp:500
-msgid ""
-"The name of a widget must be unique.\n"
-"'%1' is already used in form '%2',\n"
-"so the name has been reverted to '%3'."
+#. i18n: file ./editor/multilineeditor.ui line 38
+#: rc.cpp:704
+#, no-c-format
+msgid "Edit Multiline Edit"
 msgstr ""
 
-#: editor/command.cpp:512
+#. i18n: file ./editor/multilineeditor.ui line 46
+#: rc.cpp:707
+#, no-c-format
 msgid ""
-"The name of a widget must not be null.\n"
-"The name has been reverted to '%1'."
+"<b>Edit Multiline Edit</b>"
+"<p>Enter the text and click the <b>OK</b>-Button to apply the changes.</p>"
 msgstr ""
 
-#: editor/newformimpl.cpp:123
-msgid "Load Template"
-msgstr "装入模板"
-
-#: editor/newformimpl.cpp:124
-msgid "Could not load form description from template '%1'"
+#. i18n: file ./editor/multilineeditor.ui line 84
+#: rc.cpp:713
+#, no-c-format
+msgid "Enter your text here."
 msgstr ""
 
-#: editor/newformimpl.cpp:144
-msgid "Dialog"
-msgstr "对话框"
+#. i18n: file ./editor/functions.ui line 16
+#: rc.cpp:737
+#, no-c-format
+msgid "Function Browser"
+msgstr "功能浏览器"
 
-#: editor/newformimpl.cpp:150
-msgid "Wizard"
-msgstr "向导"
+#. i18n: file ./editor/functions.ui line 38
+#: rc.cpp:740
+#, no-c-format
+msgid "Description:"
+msgstr "描述："
 
-#: editor/multilineeditorimpl.cpp:56
-msgid "Set Text of '%1'"
-msgstr "设置“%1”的文字"
+#. i18n: file ./editor/functions.ui line 67
+#: rc.cpp:743
+#, no-c-format
+msgid "&Group:"
+msgstr "组(&G)："
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 198
-#: editor/mainwindow.cpp:1089 editor/mainwindow.cpp:1575
-#: editor/multilineeditorimpl.cpp:68 rc.cpp:143
+#. i18n: file ./editor/functions.ui line 97
+#: rc.cpp:746
 #, no-c-format
-msgid "Text"
-msgstr "文字"
+msgid "&Function:"
+msgstr "函数(&F)："
 
-#: editor/main.cpp:31
-msgid "Kommander is a graphical editor of scripted dialogs."
-msgstr "Kommander 是脚本对话框的图形化编辑器。"
+#. i18n: file ./editor/functions.ui line 129
+#: rc.cpp:749
+#, no-c-format
+msgid "&Parameters"
+msgstr "参数(&P)"
 
-#: editor/main.cpp:33
-msgid "Based on Qt Designer, (C) 2000 Trolltech AS."
-msgstr "基于 Qt 设计师，(C) 2000 Trolltech AS。"
+#. i18n: file ./editor/functions.ui line 140
+#: rc.cpp:752
+#, no-c-format
+msgid "Arg3"
+msgstr ""
 
-#: editor/main.cpp:37 executor/main.cpp:52
-msgid "Dialog to open"
-msgstr "要打开的对话框"
+#. i18n: file ./editor/functions.ui line 148
+#: rc.cpp:755
+#, no-c-format
+msgid "Arg5"
+msgstr ""
 
-#: editor/main.cpp:43
-msgid "Kommander"
-msgstr "Kommander"
+#. i18n: file ./editor/functions.ui line 190
+#: rc.cpp:758
+#, no-c-format
+msgid "Insert function"
+msgstr "插入函数"
 
-#: editor/main.cpp:46
-msgid "Project manager"
+#. i18n: file ./editor/functions.ui line 198
+#: rc.cpp:761
+#, no-c-format
+msgid "Arg4"
 msgstr ""
 
-#: editor/main.cpp:71
-msgid "Kommander Dialog Editor"
-msgstr "Kommander 对话框编辑器"
+#. i18n: file ./editor/functions.ui line 240
+#: rc.cpp:764 rc.cpp:770 rc.cpp:773 rc.cpp:779 rc.cpp:782 rc.cpp:785
+#, no-c-format
+msgid "Quote"
+msgstr ""
 
-#: editor/wizardeditorimpl.cpp:62
-msgid "Edit Wizard Pages"
-msgstr "编辑向导页面"
+#. i18n: file ./editor/functions.ui line 263
+#: rc.cpp:767
+#, no-c-format
+msgid "Arg1"
+msgstr ""
 
-#: editor/hierarchyview.cpp:519 editor/hierarchyview.cpp:525
-#: editor/mainwindow.cpp:1153 editor/mainwindow.cpp:1171
-#: editor/mainwindow.cpp:1206 editor/wizardeditorimpl.cpp:112
-#, c-format
-msgid "Add Page to %1"
-msgstr "向 %1 添加页面"
+#. i18n: file ./editor/functions.ui line 362
+#: rc.cpp:776
+#, no-c-format
+msgid "Widget:"
+msgstr "部件："
 
-#: editor/hierarchyview.cpp:541 editor/hierarchyview.cpp:551
-#: editor/mainwindow.cpp:1160 editor/mainwindow.cpp:1178
-#: editor/mainwindow.cpp:1213 editor/wizardeditorimpl.cpp:130
-msgid "Delete Page %1 of %2"
-msgstr "删除 %2 的第 %1 页"
+#. i18n: file ./editor/functions.ui line 502
+#: rc.cpp:788
+#, no-c-format
+msgid "Arg6"
+msgstr ""
 
-#: editor/wizardeditorimpl.cpp:151 editor/wizardeditorimpl.cpp:171
-msgid "Swap Pages %1 and %2 of %3"
-msgstr "交换 %3 的 %1 和 %2"
+#. i18n: file ./editor/functions.ui line 510
+#: rc.cpp:791
+#, no-c-format
+msgid "Arg2"
+msgstr ""
 
-#: editor/mainwindow.cpp:1114 editor/mainwindow.cpp:1227
-#: editor/wizardeditorimpl.cpp:200
-msgid "Page Title"
-msgstr "页面标题"
+#. i18n: file ./editor/functions.ui line 623
+#: rc.cpp:800
+#, no-c-format
+msgid "Clear edited text"
+msgstr "清除编辑的文本"
 
-#: editor/mainwindow.cpp:1114 editor/mainwindow.cpp:1227
-#: editor/wizardeditorimpl.cpp:200
-msgid "New page title:"
-msgstr "新建页面标题："
+#. i18n: file ./editor/functions.ui line 631
+#: rc.cpp:803
+#, no-c-format
+msgid "Inserted &text:"
+msgstr "插入的文本(&T)："
 
-#: editor/mainwindow.cpp:1229 editor/wizardeditorimpl.cpp:202
-msgid "Rename page %1 of %2"
-msgstr "重命名 %2 的第 %1 页"
+#. i18n: file ./editor/createtemplate.ui line 38
+#: editor/mainwindowactions.cpp:806 editor/mainwindowactions.cpp:835
+#: rc.cpp:806
+#, no-c-format
+msgid "Create Template"
+msgstr "创建模板"
 
-#: editor/sizehandle.cpp:230
-msgid "Resize"
-msgstr "更改大小"
+#. i18n: file ./editor/createtemplate.ui line 61
+#: rc.cpp:809
+#, no-c-format
+msgid "Template &name:"
+msgstr "模板名称(&N)："
 
-#: editor/actionlistview.cpp:95
-msgid "&Connect Action..."
-msgstr "连接动作(&C)..."
+#. i18n: file ./editor/createtemplate.ui line 76
+#: rc.cpp:812
+#, no-c-format
+msgid "Name of the new template"
+msgstr "新模板的名称"
 
-#: editor/actionlistview.cpp:97
-msgid "Delete Action"
-msgstr "删除动作"
+#. i18n: file ./editor/createtemplate.ui line 80
+#: rc.cpp:815
+#, no-c-format
+msgid "Enter the name of the new template"
+msgstr "输入新模板的名称"
 
-#: editor/workspace.cpp:226
-msgid "<No Project>"
-msgstr "<无项目>"
+#. i18n: file ./editor/createtemplate.ui line 91
+#: rc.cpp:818
+#, no-c-format
+msgid "Class of the new template"
+msgstr "新模板的类"
 
-#: editor/workspace.cpp:661
-msgid "&Open Source File..."
-msgstr "打开源文件(&O)..."
+#. i18n: file ./editor/createtemplate.ui line 95
+#: rc.cpp:821
+#, no-c-format
+msgid ""
+"Enter the name of the class which should be used as the template's base class"
+msgstr ""
 
-#: editor/workspace.cpp:664
-msgid "&Remove Source File From Project"
-msgstr "从项目中删除源文件(&R)"
+#. i18n: file ./editor/createtemplate.ui line 142
+#: rc.cpp:824
+#, no-c-format
+msgid "C&reate"
+msgstr "创建(&R)"
 
-#: editor/workspace.cpp:668
-msgid "&Open Form..."
-msgstr "打开表单(&O)..."
+#. i18n: file ./editor/createtemplate.ui line 150
+#: rc.cpp:827
+#, no-c-format
+msgid "Creates the new template"
+msgstr "创建新模板"
 
-#: editor/workspace.cpp:672 editor/workspace.cpp:682
-msgid "&Remove Form From Project"
-msgstr "从项目中删除表单(&R)"
+#. i18n: file ./editor/createtemplate.ui line 165
+#: rc.cpp:833
+#, no-c-format
+msgid "Closes the Dialog"
+msgstr "关闭对话框"
 
-#: editor/workspace.cpp:674 editor/workspace.cpp:684
-msgid "&Remove Form"
-msgstr "删除表单(&R)"
+#. i18n: file ./editor/createtemplate.ui line 178
+#: rc.cpp:836
+#, no-c-format
+msgid "&Baseclass for template:"
+msgstr "模板的基类(&B)："
 
-#: editor/workspace.cpp:678
-msgid "&Open Form Source..."
-msgstr "从源代码打开(&O)..."
+#. i18n: file ./editor/assoctexteditor.ui line 16
+#: rc.cpp:839
+#, no-c-format
+msgid "Edit Text"
+msgstr "编辑文本"
 
-#: editor/widgetdatabase.cpp:139
-msgid "Push Button"
-msgstr "按钮"
+#. i18n: file ./editor/assoctexteditor.ui line 35
+#: rc.cpp:842
+#, no-c-format
+msgid "&Widget:"
+msgstr "部件(&W)："
 
-#: editor/widgetdatabase.cpp:146
-msgid "Tool Button"
-msgstr "工具按钮"
+#. i18n: file ./editor/assoctexteditor.ui line 67
+#: rc.cpp:848
+#, no-c-format
+msgid "&Text for:"
+msgstr "文本(&T)："
 
-#: editor/widgetdatabase.cpp:153
-msgid "Radio Button"
-msgstr "单选钮"
+#. i18n: file ./editor/assoctexteditor.ui line 104
+#: rc.cpp:854
+#, no-c-format
+msgid "&Function..."
+msgstr "函数(&F)..."
 
-#: editor/widgetdatabase.cpp:160
-msgid "Check Box"
-msgstr "复选框"
+#. i18n: file ./editor/assoctexteditor.ui line 137
+#: rc.cpp:857
+#, no-c-format
+msgid "Wi&dget:"
+msgstr "部件(&D)："
 
-#: editor/widgetdatabase.cpp:167
-msgid "Group Box"
-msgstr "分组框"
+#. i18n: file ./editor/assoctexteditor.ui line 184
+#: rc.cpp:860
+#, no-c-format
+msgid "Fi&le..."
+msgstr "文件(&L)..."
 
-#: editor/widgetdatabase.cpp:175
-msgid "Button Group"
-msgstr "按钮组"
+#. i18n: file ./editor/pixmapfunction.ui line 38
+#: editor/pixmapchooser.cpp:964 rc.cpp:863
+#, no-c-format
+msgid "Choose Pixmap"
+msgstr "选择像素图"
 
-#: editor/widgetdatabase.cpp:183
-msgid "Frame"
-msgstr "框架"
+#. i18n: file ./editor/pixmapfunction.ui line 61
+#: rc.cpp:866
+#, no-c-format
+msgid "&Enter arguments for loading the pixmap:"
+msgstr "输入装入像素图的参数(&E)："
 
-#: editor/widgetdatabase.cpp:191
-#, fuzzy
-msgid "Tabwidget"
-msgstr "部件"
+#. i18n: file ./editor/pixmapfunction.ui line 109
+#: rc.cpp:869
+#, fuzzy, no-c-format
+msgid "TQPixmap("
+msgstr "像素图(&P)"
 
-#: editor/widgetdatabase.cpp:199 editor/widgetdatabase.cpp:531
-msgid "List Box"
+#. i18n: file ./editor/pixmapfunction.ui line 573
+#: rc.cpp:872
+#, no-c-format
+msgid ")"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:206
-msgid "List View"
-msgstr ""
+#. i18n: file ./editor/newform.ui line 35
+#: rc.cpp:884
+#, no-c-format
+msgid "New File"
+msgstr "新建文件"
 
-#: editor/widgetdatabase.cpp:214
-msgid "Icon View"
+#. i18n: file ./editor/newform.ui line 41
+#: rc.cpp:887
+#, no-c-format
+msgid ""
+"<b>New Form</b>"
+"<p>Select a template for the new form and click the <b>OK</b>"
+"-button to create it.</p>"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:233
-#, fuzzy
-msgid "Data Table"
-msgstr "数据库"
-
-#: editor/widgetdatabase.cpp:241
-#, fuzzy
-msgid "Line Edit"
-msgstr "动作编辑器"
-
-#: editor/widgetdatabase.cpp:248
-msgid "Spin Box"
+#. i18n: file ./editor/newform.ui line 109
+#: rc.cpp:896
+#, no-c-format
+msgid "Create a new form using the selected template."
 msgstr ""
 
-#: editor/widgetdatabase.cpp:255
-msgid "Date Edit"
+#. i18n: file ./editor/newform.ui line 123
+#: rc.cpp:902
+#, no-c-format
+msgid "Close the dialog without creating a new form."
 msgstr ""
 
-#: editor/widgetdatabase.cpp:263
-msgid "Time Edit"
+#. i18n: file ./editor/newform.ui line 145
+#: rc.cpp:905
+#, no-c-format
+msgid "Displays a list of the available templates."
 msgstr ""
 
-#: editor/widgetdatabase.cpp:271
-msgid "Date-Time Edit"
-msgstr ""
+#. i18n: file ./editor/connectioneditor.ui line 35
+#: rc.cpp:908
+#, no-c-format
+msgid "Edit Connections"
+msgstr "编辑连接"
 
-#: editor/widgetdatabase.cpp:279
-msgid "Multi Line Edit"
+#. i18n: file ./editor/connectioneditor.ui line 41
+#: rc.cpp:911
+#, no-c-format
+msgid ""
+"<b>Edit Connections</b>"
+"<p>Add and remove connections in the current form .</p>"
+"<p>Select a signal and a corresponding slot then press the <b>Connect</b>"
+"-button to create a connection.</p>"
+"<p>Select a connection from the list then press the <b>Disconnect</b>"
+"-button to delete the connection.</p>"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:286
-msgid "Rich Text Edit"
-msgstr ""
+#. i18n: file ./editor/connectioneditor.ui line 56
+#: rc.cpp:914
+#, no-c-format
+msgid "Sender"
+msgstr "发送者"
 
-#: editor/widgetdatabase.cpp:293
-msgid "Combo Box"
-msgstr ""
+#. i18n: file ./editor/connectioneditor.ui line 67
+#: rc.cpp:917
+#, no-c-format
+msgid "Signal"
+msgstr "信号"
 
-#: editor/widgetdatabase.cpp:300 editor/widgetdatabase.cpp:641
-msgid "Slider"
-msgstr ""
+#. i18n: file ./editor/connectioneditor.ui line 78
+#: rc.cpp:920
+#, no-c-format
+msgid "Receiver"
+msgstr "接受者"
 
-#: editor/widgetdatabase.cpp:307
-msgid "Scrollbar"
+#. i18n: file ./editor/connectioneditor.ui line 89
+#: rc.cpp:923
+#, no-c-format
+msgid "Slot"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:314
-#, fuzzy
-msgid "Dial"
-msgstr "对话框"
-
-#: editor/widgetdatabase.cpp:321
-#, fuzzy
-msgid "Label"
-msgstr "表格"
-
-#: editor/widgetdatabase.cpp:328
-msgid "LCD Number"
+#. i18n: file ./editor/connectioneditor.ui line 111
+#: rc.cpp:926
+#, no-c-format
+msgid "Displays the connections between the sender and the receiver."
 msgstr ""
 
-#: editor/widgetdatabase.cpp:335
-msgid "Progress Bar"
+#. i18n: file ./editor/connectioneditor.ui line 119
+#: rc.cpp:929
+#, no-c-format
+msgid ""
+"<b>A list of Q_SLOTS for the receiver.</b>"
+"<p>The Q_SLOTS that are displayed are only those which have arguments that "
+"correspond with the arguments of the signal that is currently selected in the "
+"Signal-list.</b>"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:342
-#, fuzzy
-msgid "Text View"
-msgstr "文字"
-
-#: editor/widgetdatabase.cpp:349 editor/widgetdatabase.cpp:524
-msgid "Text Browser"
+#. i18n: file ./editor/connectioneditor.ui line 127
+#: rc.cpp:932
+#, no-c-format
+msgid "Displays the list of Q_SIGNALS that the widget emits."
 msgstr ""
 
-#: editor/widgetdatabase.cpp:358
-msgid ""
-"The Spacer provides horizontal and vertical spacing to be able to manipulate "
-"the behaviour of layouts."
-msgstr ""
+#. i18n: file ./editor/connectioneditor.ui line 143
+#: rc.cpp:935
+#, no-c-format
+msgid "Si&gnals:"
+msgstr "信号(&G)："
 
-#: editor/widgetdatabase.cpp:494
-msgid "Text Label"
+#. i18n: file ./editor/connectioneditor.ui line 183
+#: rc.cpp:938
+#, no-c-format
+msgid "&Slots:"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:495
-msgid "The Text Label provides a widget to display static text."
-msgstr ""
+#. i18n: file ./editor/connectioneditor.ui line 217
+#: rc.cpp:941
+#, no-c-format
+msgid "&Disconnect"
+msgstr "断开连接(&D)"
 
-#: editor/widgetdatabase.cpp:502
-msgid "Pixmap Label"
+#. i18n: file ./editor/connectioneditor.ui line 220
+#: rc.cpp:944
+#, no-c-format
+msgid "Alt+D"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:503
-msgid "The Pixmap Label provides a widget to display pixmaps."
-msgstr ""
+#. i18n: file ./editor/connectioneditor.ui line 226
+#: rc.cpp:947
+#, no-c-format
+msgid "Remove the selected connection"
+msgstr "删除选中的连接"
 
-#: editor/widgetdatabase.cpp:510
-msgid "A line edit"
-msgstr ""
+#. i18n: file ./editor/connectioneditor.ui line 229
+#: rc.cpp:950
+#, no-c-format
+msgid "Remove the selected connection."
+msgstr "删除选中的连接。"
 
-#: editor/widgetdatabase.cpp:517
-msgid "A rich text edit"
+#. i18n: file ./editor/connectioneditor.ui line 257
+#: rc.cpp:956
+#, no-c-format
+msgid "Alt+O"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:538
-msgid "A combo box"
+#. i18n: file ./editor/connectioneditor.ui line 277
+#: rc.cpp:965
+#, no-c-format
+msgid "Alt+C"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:545
-#, fuzzy
-msgid "A tree widget"
-msgstr "%1(自定义部件)"
+#. i18n: file ./editor/connectioneditor.ui line 318
+#: rc.cpp:971
+#, no-c-format
+msgid "Connec&tions:"
+msgstr "连接(&T)："
 
-#: editor/widgetdatabase.cpp:552
-#, fuzzy
-msgid "A table widget"
-msgstr "%1(自定义部件)"
+#. i18n: file ./editor/connectioneditor.ui line 346
+#: rc.cpp:974
+#, no-c-format
+msgid "Co&nnect"
+msgstr "连接(&N)"
 
-#: editor/widgetdatabase.cpp:559
-msgid "A button that when clicked, execute a command"
+#. i18n: file ./editor/connectioneditor.ui line 349
+#: rc.cpp:977
+#, no-c-format
+msgid "Alt+N"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:566
-msgid "A button that closes the dialog it is in"
+#. i18n: file ./editor/connectioneditor.ui line 355
+#: rc.cpp:980
+#, no-c-format
+msgid "Create connection"
+msgstr "创建连接"
+
+#. i18n: file ./editor/connectioneditor.ui line 358
+#: rc.cpp:983
+#, no-c-format
+msgid "Create a connection between a signal and a slot."
 msgstr ""
 
-#: editor/widgetdatabase.cpp:573
-msgid "A listbox showing output of a script"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 38
+#: rc.cpp:986
+#, no-c-format
+msgid "Tune Palette"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:580
+#. i18n: file ./editor/paletteeditoradvanced.ui line 44
+#: rc.cpp:989
+#, no-c-format
 msgid ""
-"A widget made up of a line edit and push button, for selecting files and "
-"folders"
+"<b>Edit Palette</b>"
+"<p>Change the current widget or form's palette.</p>"
+"<p>Use a generated palette or select colors for each color group and each color "
+"role.</p>"
+"<p>The palette can be tested with different widget layouts in the preview "
+"section.</p>"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:587
-msgid "A check box"
-msgstr ""
+#. i18n: file ./editor/paletteeditoradvanced.ui line 122
+#: rc.cpp:1004
+#, no-c-format
+msgid "Auto"
+msgstr "自动"
 
-#: editor/widgetdatabase.cpp:594
-msgid "A radio button"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 139
+#: rc.cpp:1007
+#, no-c-format
+msgid "Build the inactive palette from the active palette."
 msgstr ""
 
-#: editor/widgetdatabase.cpp:601
-msgid "A widget for grouping buttons together"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 150
+#: rc.cpp:1010
+#, no-c-format
+msgid "Build the disabled palette from the active palette."
 msgstr ""
 
-#: editor/widgetdatabase.cpp:609
-msgid "A widget for grouping other widgets together"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 163
+#: rc.cpp:1013
+#, no-c-format
+msgid "Central Color &Roles"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:617
-msgid "A widget with tabs"
-msgstr ""
+#. i18n: file ./editor/paletteeditoradvanced.ui line 178
+#: rc.cpp:1016
+#, no-c-format
+msgid "Background"
+msgstr "背景"
 
-#: editor/widgetdatabase.cpp:634
-msgid "A spin box"
-msgstr ""
+#. i18n: file ./editor/paletteeditoradvanced.ui line 183
+#: rc.cpp:1019
+#, no-c-format
+msgid "Foreground"
+msgstr "前景"
 
-#: editor/widgetdatabase.cpp:648
-msgid "A small rich text editor"
-msgstr ""
+#. i18n: file ./editor/paletteeditoradvanced.ui line 188
+#: rc.cpp:1022
+#, no-c-format
+msgid "Button"
+msgstr "按钮"
 
-#: editor/widgetdatabase.cpp:655
-msgid "A status bar"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 193
+#: rc.cpp:1025
+#, no-c-format
+msgid "Base"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:662
-msgid "A progress bar"
-msgstr ""
+#. i18n: file ./editor/paletteeditoradvanced.ui line 198
+#: editor/mainwindow.cpp:1153 editor/mainwindow.cpp:1639
+#: editor/multilineeditorimpl.cpp:68 rc.cpp:1028
+#, no-c-format
+msgid "Text"
+msgstr "文字"
 
-#: editor/widgetdatabase.cpp:669
-msgid "A hidden script container"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 203
+#: rc.cpp:1031
+#, no-c-format
+msgid "BrightText"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:676
-msgid "A timer for running scripts periodically"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 208
+#: rc.cpp:1034
+#, no-c-format
+msgid "ButtonText"
 msgstr ""
 
-#: editor/widgetdatabase.cpp:683
-#, fuzzy
-msgid "A date selection widget"
-msgstr "%1(自定义部件)"
-
-#: editor/pixmapchooser.cpp:947
-#, fuzzy
-msgid "All Pixmaps"
-msgstr "删除页面"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 213
+#: rc.cpp:1037
+#, fuzzy, no-c-format
+msgid "Highlight"
+msgstr "高度"
 
-#: editor/pixmapchooser.cpp:950
-msgid ""
-"%1-Pixmaps (%2)\n"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 218
+#: rc.cpp:1040
+#, no-c-format
+msgid "HighlightText"
 msgstr ""
 
-#: editor/pixmapchooser.cpp:956
-msgid "All Files (*)"
-msgstr "全部文件(*)"
-
-#. i18n: file ./editor/pixmapfunction.ui line 38
-#: editor/pixmapchooser.cpp:964 rc.cpp:1097
+#. i18n: file ./editor/paletteeditoradvanced.ui line 223
+#: rc.cpp:1043
 #, no-c-format
-msgid "Choose Pixmap"
-msgstr "选择像素图"
-
-#: editor/actiondnd.cpp:294 editor/actiondnd.cpp:353
-msgid "Delete Toolbar"
-msgstr "删除工具栏"
-
-#: editor/actiondnd.cpp:297 editor/actiondnd.cpp:383
-msgid "Delete Toolbar '%1'"
-msgstr "删除工具栏“%1”"
-
-#: editor/actiondnd.cpp:348 editor/actiondnd.cpp:1020
-msgid "Delete Separator"
-msgstr "删除分隔符"
+msgid "Link"
+msgstr ""
 
-#. i18n: file ./editor/listboxeditor.ui line 147
-#: editor/actiondnd.cpp:350 editor/actiondnd.cpp:735 editor/actiondnd.cpp:1022
-#: rc.cpp:995 rc.cpp:1046
+#. i18n: file ./editor/paletteeditoradvanced.ui line 228
+#: rc.cpp:1046
 #, no-c-format
-msgid "Delete Item"
-msgstr "删除项目"
-
-#: editor/actiondnd.cpp:351 editor/actiondnd.cpp:1023
-msgid "Insert Separator"
-msgstr "插入分隔符"
-
-#: editor/actiondnd.cpp:362 editor/actiondnd.cpp:422 editor/actiondnd.cpp:445
-msgid "Delete Action '%1' From Toolbar '%2'"
-msgstr "从工具栏“%2”删除动作“%1”"
-
-#: editor/actiondnd.cpp:377
-msgid "Add Separator to Toolbar '%1'"
-msgstr "向工具栏“%1”添加分隔符"
-
-#: editor/actiondnd.cpp:464 editor/actiondnd.cpp:545
-msgid "Add Action '%1' to Toolbar '%2'"
-msgstr "向工具栏“%2”填加动作“%1”"
+msgid "LinkVisited"
+msgstr ""
 
-#: editor/actiondnd.cpp:538 editor/actiondnd.cpp:1157
-msgid "Insert/Move Action"
-msgstr "插入/移动动作"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 235
+#: rc.cpp:1049
+#, no-c-format
+msgid "Choose the central color role"
+msgstr ""
 
-#: editor/actiondnd.cpp:539
+#. i18n: file ./editor/paletteeditoradvanced.ui line 238
+#: rc.cpp:1052
+#, no-c-format
 msgid ""
-"Action '%1' has already been added to this toolbar.\n"
-"An Action may only occur once in a given toolbar."
+"<b>Select a color role.</b>"
+"<p>Available central color roles are: "
+"<ul> "
+"<li>Background - general background color.</li> "
+"<li>Foreground - general foreground color. </li> "
+"<li>Base - used as the background color for example, for text entry widgets; it "
+"is usually white or another light color. </li> "
+"<li>Text - the forground color used with Base. Usually this is the same as the "
+"Foreground, in which case it must provide good contrast both with the "
+"Background and with the Base. </li> "
+"<li>Button - general button background color; useful where buttons need a "
+"background different from Background, as in the Macintosh style. </li> "
+"<li>ButtonText - a foreground color used with the Button color. </li> "
+"<li>Highlight - a color used to indicate a selected or highlighted item. </li> "
+"<li>HighlightedText - a text color that contrasts to Highlight. </li> "
+"<li>BrightText - a text color that is very different from Foreground and "
+"contrasts well with, for example, black. </li> </ul> </p>"
 msgstr ""
 
-#: editor/actiondnd.cpp:671
-msgid "Add Widget '%1' to Toolbar '%2'"
-msgstr "向工具栏“%2”添加部件“%1”"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 285
+#: rc.cpp:1055
+#, no-c-format
+msgid "Choose pi&xmap:"
+msgstr "选择像素图(&X)："
 
-#: editor/actiondnd.cpp:736
-msgid "Rename Item..."
-msgstr "重命名项目..."
+#. i18n: file ./editor/paletteeditoradvanced.ui line 313
+#: rc.cpp:1061
+#, no-c-format
+msgid "Choose a pixmap file for the selected central color role."
+msgstr ""
 
-#: editor/actiondnd.cpp:740
-msgid "Delete Menu '%1'"
-msgstr "删除菜单“%1”"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 335
+#: rc.cpp:1064
+#, no-c-format
+msgid "&Select color:"
+msgstr "选择颜色(&S)："
 
-#: editor/actiondnd.cpp:753
-msgid "Rename Menu Item"
-msgstr "重命名菜单项"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 363
+#: rc.cpp:1070
+#, no-c-format
+msgid "Choose a color for the selected central color role."
+msgstr ""
 
-#: editor/actiondnd.cpp:753
-msgid "Menu text:"
-msgstr "菜单文字："
+#. i18n: file ./editor/paletteeditoradvanced.ui line 375
+#: rc.cpp:1073
+#, no-c-format
+msgid "3D Shadow &Effects"
+msgstr "立体阴影效果(&E)"
 
-#: editor/actiondnd.cpp:757
-msgid "Rename Menu '%1' to '%2'"
-msgstr "将菜单“%1”重命名为“%2”"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 406
+#: rc.cpp:1076
+#, no-c-format
+msgid "Build &from button color:"
+msgstr "从按钮颜色创建(&F)："
 
-#: editor/actiondnd.cpp:881
-msgid "Move Menu '%1'"
-msgstr "移动菜单“%1”"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 412
+#: rc.cpp:1079
+#, no-c-format
+msgid "Generate shadings"
+msgstr "生成阴影"
 
-#: editor/actiondnd.cpp:1030 editor/actiondnd.cpp:1069
-msgid "Delete Action '%1' From Popup Menu '%2'"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 415
+#: rc.cpp:1082
+#, no-c-format
+msgid "Check to let 3D-effect colors be calculated from the button-color."
 msgstr ""
 
-#: editor/actiondnd.cpp:1040
-msgid "Add Separator to Popup Menu '%1'"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 421
+#: rc.cpp:1085
+#, no-c-format
+msgid "Light"
 msgstr ""
 
-#: editor/actiondnd.cpp:1082 editor/actiondnd.cpp:1164
-msgid "Add Action '%1' to Popup Menu '%2'"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 426
+#: rc.cpp:1088
+#, no-c-format
+msgid "Midlight"
 msgstr ""
 
-#: editor/actiondnd.cpp:1158
-msgid ""
-"Action '%1' has already been added to this menu.\n"
-"An Action may only occur once in a given menu."
+#. i18n: file ./editor/paletteeditoradvanced.ui line 431
+#: rc.cpp:1091
+#, no-c-format
+msgid "Mid"
 msgstr ""
 
-#: editor/connectioneditorimpl.cpp:229
-msgid "Connect/Disconnect the signals and slots of '%1' and '%2'"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 436
+#: rc.cpp:1094
+#, no-c-format
+msgid "Dark"
 msgstr ""
 
-#: editor/connectioneditorimpl.cpp:237
-msgid "Remove Connections"
-msgstr "删除连接"
-
-#: editor/connectioneditorimpl.cpp:248
-msgid "Add Connections"
-msgstr "添加连接"
-
-#: editor/hierarchyview.cpp:100
-msgid "(Constructor)"
-msgstr "(构造器)"
-
-#: editor/hierarchyview.cpp:102
-msgid "(Destructor)"
-msgstr "(析构器)"
-
-#: editor/hierarchyview.cpp:190
-msgid "Name"
-msgstr "名称"
-
-#: editor/hierarchyview.cpp:191
-msgid "Class"
-msgstr "类"
-
-#: editor/hierarchyview.cpp:335
-msgid "Database"
-msgstr "数据库"
-
-#: editor/choosewidgetimpl.cpp:38 editor/hierarchyview.cpp:608
-#: editor/mainwindow.cpp:268
-msgid "Widgets"
-msgstr "部件"
-
-#: editor/assoctexteditorimpl.cpp:143
-#, fuzzy
-msgid "&Highlighting"
-msgstr "高度"
-
-#: editor/assoctexteditorimpl.cpp:187
-#, fuzzy
-msgid "Edit text"
-msgstr "编辑文本"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 441
+#: rc.cpp:1097
+#, no-c-format
+msgid "Shadow"
+msgstr "阴影"
 
-#: editor/assoctexteditorimpl.cpp:253
-msgid "Edit text - read only mode"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 448
+#: rc.cpp:1100
+#, no-c-format
+msgid "Choose 3D-effect color role"
 msgstr ""
 
-#: editor/assoctexteditorimpl.cpp:271
-#, fuzzy
-msgid "Set the 'text association' of '%1'"
-msgstr "设置“%1”的“text”"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 451
+#: rc.cpp:1103
+#, no-c-format
+msgid ""
+"<b>Select a color effect role.</b>"
+"<p>Available effect roles are: "
+"<ul> "
+"<li>Light - lighter than Button color. </li> "
+"<li>Midlight - between Button and Light. </li> "
+"<li>Mid - between Button and Dark. </li> "
+"<li>Dark - darker than Button. </li> "
+"<li>Shadow - a very dark color. </li> </ul>"
+msgstr ""
 
-#: editor/assoctexteditorimpl.cpp:281
-#, fuzzy
-msgid "Set the 'population text' of '%1'"
-msgstr "设置“%1”的“text”"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 506
+#: rc.cpp:1106
+#, no-c-format
+msgid "Select co&lor:"
+msgstr "选择颜色(&L)："
 
-#: editor/assoctexteditorimpl.cpp:430
-msgid "<qt>Cannot open file<br><b>%1</b></qt"
+#. i18n: file ./editor/paletteeditoradvanced.ui line 534
+#: rc.cpp:1112
+#, no-c-format
+msgid "Choose a color for the selected effect color role."
 msgstr ""
 
-#: editor/listvieweditorimpl.cpp:66
-msgid "Edit Items and Columns of '%1'"
-msgstr "编辑“%1”的项目和列"
+#. i18n: file ./editor/listvieweditor.ui line 35
+#: rc.cpp:1130
+#, no-c-format
+msgid "Edit Listview"
+msgstr "编辑列表视图"
 
-#: editor/listvieweditorimpl.cpp:225
-msgid "New Column"
-msgstr "新建列"
+#. i18n: file ./editor/listvieweditor.ui line 41
+#: rc.cpp:1133
+#, no-c-format
+msgid ""
+"<b>Edit Listview</b>"
+"<p>Use the controls on the <b>Items</b>-tab to add, edit or delete items in the "
+"listview. Change the column configuration of the listview using the controls on "
+"the <b>Columns</b>-tab.</p>Click the <b>New Item</b>"
+"-button to create a new item, then enter text and add a pixmap.</p>"
+"<p>Select an item from the list and click the <b>Delete Item</b>"
+"-button to remove the item from the list.</p>"
+msgstr ""
 
 #. i18n: file ./editor/listvieweditor.ui line 62
-#: editor/listvieweditorimpl.cpp:570 rc.cpp:629
+#: editor/listvieweditorimpl.cpp:570 rc.cpp:1136
 #, no-c-format
 msgid "&Items"
 msgstr "项目(&I)"
 
-#: editor/mainwindow.cpp:141
-msgid "Welcome to the Kommander Editor"
-msgstr "欢迎使用 Kommander 编辑器"
-
-#: editor/mainwindow.cpp:148
-msgid "Layout"
-msgstr "布局"
-
-#: editor/mainwindow.cpp:245
-msgid ""
-"<h2>The Property Editor</h2>"
-"<p>You can change the appearance and behavior of the selected widget in the "
-"property editor.</p>"
-"<p>You can set properties for components and forms at design time and see the "
-"immediately see the effects of the changes. Each property has its own editor "
-"which (depending on the property) can be used to enter new values, open a "
-"special dialog, or to select values from a predefined list. Click <b>F1</b> "
-"to get detailed help for the selected property.</p>"
-"<p>You can resize the columns of the editor by dragging the separators in the "
-"list's header.</p>"
-"<p><b>Signal Handlers</b></p>"
-"<p>In the Signal Handlers tab you can define connections between the signals "
-"emitted by widgets and the slots in the form. (These connections can also be "
-"made using the connection tool.)"
+#. i18n: file ./editor/listvieweditor.ui line 85
+#: rc.cpp:1145
+#, no-c-format
+msgid "<b>Deletes the selected item.</b><p>Any sub-items are also deleted.</p>"
 msgstr ""
 
-#: editor/mainwindow.cpp:271
-msgid "Object Explorer"
-msgstr "对象资源管理器"
+#. i18n: file ./editor/listvieweditor.ui line 99
+#: rc.cpp:1148
+#, no-c-format
+msgid "Item &Properties"
+msgstr "项目属性(&P)"
 
-#: editor/mainwindow.cpp:273
+#. i18n: file ./editor/listvieweditor.ui line 116
+#: rc.cpp:1151
+#, no-c-format
+msgid "Pi&xmap:"
+msgstr "像素图(&X)："
+
+#. i18n: file ./editor/listvieweditor.ui line 147
+#: rc.cpp:1160
+#, no-c-format
 msgid ""
-"<h2>The Object Explorer</h2>"
-"<p>The Object Explorer provides an overview of the relationships between the "
-"widgets in a form. You can use the clipboard functions using a context menu for "
-"each item in the view. It is also useful for selecting widgets in forms that "
-"have complex layouts.</p>"
-"<p>The columns can be resized by dragging the separator in the list's "
-"header.</p>"
-"<p>The second tab shows all the form's slots, class variables, includes, "
-"etc.</p>"
+"<b>Change the text of the item.</b>"
+"<p>The text will be changed in the current column of the selected item.</p>"
 msgstr ""
 
-#: editor/mainwindow.cpp:284 editor/mainwindow.cpp:293
-#, fuzzy
-msgid "Dialogs"
-msgstr "对话框"
-
-#: editor/mainwindow.cpp:287
-msgid "Start typing the buffer you want to switch to here (ALT+B)"
-msgstr ""
+#. i18n: file ./editor/listvieweditor.ui line 155
+#: rc.cpp:1163
+#, no-c-format
+msgid "Change column"
+msgstr "更改列"
 
-#: editor/mainwindow.cpp:294
+#. i18n: file ./editor/listvieweditor.ui line 158
+#: rc.cpp:1166
+#, no-c-format
 msgid ""
-"<h2>The File Overview Window</h2>"
-"<p>The File Overview Window displays all open dialogs.</p>"
+"<b>Select the current column.</b>"
+"<p>The item's text and pixmap will be changed for the current column</p>"
 msgstr ""
 
-#: editor/mainwindow.cpp:305
-msgid "Action Editor"
-msgstr "动作编辑器"
+#. i18n: file ./editor/listvieweditor.ui line 166
+#: rc.cpp:1169
+#, no-c-format
+msgid "Colu&mn:"
+msgstr "列(&M)："
 
-#: editor/mainwindow.cpp:306
+#. i18n: file ./editor/listvieweditor.ui line 252
+#: rc.cpp:1196
+#, no-c-format
 msgid ""
-"<b>The Action Editor</b>"
-"<p>The Action Editor is used to add actions and action groups to a form, and to "
-"connect actions to slots. Actions and action groups can be dragged into menus "
-"and into toolbars, and may feature keyboard shortcuts and tooltips. If actions "
-"have pixmaps these are displayed on toolbar buttons and beside their names in "
-"menus.</p>"
+"<b>Adds a new item to the list.</b>"
+"<p>The item will be inserted at the top of the list and can be moved using the "
+"up- and down-buttons.</p>"
 msgstr ""
 
-#: editor/mainwindow.cpp:316 editor/mainwindow.cpp:319
-msgid "Message Log"
-msgstr ""
+#. i18n: file ./editor/listvieweditor.ui line 268
+#: rc.cpp:1202
+#, no-c-format
+msgid "New &Subitem"
+msgstr "新建子项目(&S)"
 
-#: editor/mainwindow.cpp:395 editor/mainwindow.cpp:449
-#, fuzzy
-msgid "<qt>Cannot create backup file <i>%1</i>.</qt>"
-msgstr "<qt>无法保存日志文件<br><b>%1</b></qt>"
+#. i18n: file ./editor/listvieweditor.ui line 271
+#: rc.cpp:1205
+#, no-c-format
+msgid "Add a subitem"
+msgstr "添加子菜单"
 
-#: editor/mainwindow.cpp:406
-msgid "There is a dialog already running."
+#. i18n: file ./editor/listvieweditor.ui line 274
+#: rc.cpp:1208
+#, no-c-format
+msgid ""
+"<b>Create a new sub-item for the selected item.</b>"
+"<p>New sub-items are inserted at the top of the list of sub-items, and new "
+"levels are created automatically.</p>"
 msgstr ""
 
-#: editor/mainwindow.cpp:406
-msgid "Run"
-msgstr "运行"
-
-#: editor/mainwindow.cpp:439
-#, fuzzy
-msgid "<qt>Cannot create temporary file <i>%1</i>.</qt>"
-msgstr "<qt>无法保存日志文件<br><b>%1</b></qt>"
-
-#: editor/mainwindow.cpp:786
+#. i18n: file ./editor/listvieweditor.ui line 308
+#: rc.cpp:1214
+#, no-c-format
 msgid ""
-"<b>The Form Window</b>"
-"<p>Use the various tools to add widgets or to change the layout and behavior of "
-"the components in the form. Select one or multiple widgets to move them or lay "
-"them out. If a single widget is chosen it can be resized using the resize "
-"handles.</p>"
-"<p>Changes in the <b>Property Editor</b> are visible at design time, and you "
-"can preview the form in different styles.</p>"
-"<p>You can change the grid resolution, or turn the grid off in the <b>"
-"Preferences</b> dialog from the <b>Edit</b> menu."
-"<p>You can have several forms open, and all open forms are listed in the <b>"
-"Form List</b>."
+"<b>Move the selected item up.</b>"
+"<p>The item will be moved within its level in the hierarchy.</p>"
 msgstr ""
 
-#: editor/mainwindow.cpp:891
-#, c-format
-msgid "&Undo: %1"
-msgstr "撤消：%1(&U)"
-
-#: editor/mainwindow.cpp:895
-#, c-format
-msgid "&Redo: %1"
-msgstr "重做：%1(&R)"
-
-#: editor/mainwindow.cpp:974
-msgid "Choose Pixmap..."
-msgstr "选择像素图..."
-
-#: editor/mainwindow.cpp:978
-msgid "Edit Text..."
-msgstr "编辑文本..."
-
-#: editor/mainwindow.cpp:982
-msgid "Edit Title..."
-msgstr "编辑标题..."
-
-#: editor/mainwindow.cpp:986 editor/mainwindow.cpp:1064
-msgid "Edit Page Title..."
-msgstr "编辑页面标题..."
-
-#: editor/mainwindow.cpp:1002 editor/mainwindow.cpp:1047
-msgid "Edit Kommander Text..."
-msgstr "编辑 Kommander 文字..."
-
-#: editor/mainwindow.cpp:1011 editor/mainwindow.cpp:1021
-#: editor/mainwindow.cpp:1057 editor/mainwindow.cpp:1497
-msgid "Delete Page"
-msgstr "删除页面"
-
-#: editor/mainwindow.cpp:1014 editor/mainwindow.cpp:1024
-#: editor/mainwindow.cpp:1061 editor/mainwindow.cpp:1496
-msgid "Add Page"
-msgstr "添加页面"
-
-#: editor/mainwindow.cpp:1031
-msgid "Edit..."
-msgstr "编辑..."
-
-#: editor/mainwindow.cpp:1067
-msgid "Edit Pages..."
-msgstr "编辑页面..."
-
-#: editor/mainwindow.cpp:1073
-msgid "Add Menu Item"
-msgstr "添加菜单项"
-
-#: editor/mainwindow.cpp:1075
-msgid "Add Toolbar"
-msgstr "添加工具栏"
-
-#: editor/mainwindow.cpp:1089 editor/mainwindow.cpp:1575
-msgid "New text:"
-msgstr "新文字："
-
-#: editor/mainwindow.cpp:1092
-msgid "Set the 'text' of '%1'"
-msgstr "设置“%1”的“text”"
-
-#: editor/mainwindow.cpp:1102 editor/mainwindow.cpp:1591
-msgid "Title"
-msgstr "标题"
-
-#: editor/mainwindow.cpp:1102 editor/mainwindow.cpp:1591
-msgid "New title:"
-msgstr "新标题："
-
-#: editor/mainwindow.cpp:1104
-msgid "Set the 'title' of '%1'"
-msgstr "设置“%1”的“title”"
-
-#: editor/mainwindow.cpp:1116
-msgid "Set the 'pageTitle' of '%1'"
-msgstr "设置“%1”的“pageTitle”"
-
-#: editor/mainwindow.cpp:1128
-msgid "Set the 'pixmap' of '%1'"
-msgstr "设置“%1”的“pixmap”"
-
-#: editor/mainwindow.cpp:1239
-msgid "Add Toolbar to '%1'"
-msgstr "向“%1”添加工具栏"
-
-#: editor/mainwindow.cpp:1243
-msgid "Add Menu to '%1'"
-msgstr "向“%1”添加菜单"
-
-#: editor/mainwindow.cpp:1560
-msgid "Edit %1..."
-msgstr "编辑 %1..."
-
-#: editor/mainwindow.cpp:1578
-msgid "Set the 'text' of '%2'"
+#. i18n: file ./editor/listvieweditor.ui line 325
+#: rc.cpp:1220
+#, no-c-format
+msgid ""
+"<b>Move the selected item down.</b>"
+"<p>The item will be moved within its level in the hierarchy.</p>"
 msgstr ""
 
-#: editor/mainwindow.cpp:1593
-msgid "Set the 'title' of '%2'"
+#. i18n: file ./editor/listvieweditor.ui line 339
+#: rc.cpp:1223
+#, no-c-format
+msgid "Move left"
 msgstr ""
 
-#: editor/mainwindow.cpp:1681
+#. i18n: file ./editor/listvieweditor.ui line 342
+#: rc.cpp:1226
+#, no-c-format
 msgid ""
-"Kommander found some temporary saved files, which were\n"
-"written when Kommander crashed last time. Do you want to\n"
-"load these files?"
+"<b>Move the selected item one level up.</b>"
+"<p>This will also change the level of the item's sub-items.</p>"
 msgstr ""
 
-#: editor/mainwindow.cpp:1683
-msgid "Restoring Last Session"
-msgstr "恢复上次会话"
-
-#: editor/mainwindow.cpp:1683
-msgid "Load"
-msgstr "装入"
-
-#: editor/mainwindow.cpp:1683
-msgid "Do Not Load"
-msgstr "不装入"
-
-#: editor/mainwindow.cpp:1736
-msgid "There is no help available for this dialog at the moment."
-msgstr "此时没有此对话框可用的帮助。"
-
-#: editor/mainwindow.cpp:1750
-#, fuzzy
-msgid "<qt>Could not open file:<br><b>%1</b><br>File does not exist.</qt>"
-msgstr "<qt>Kommander 文件<br><b>%1</b><br>不存在。</qt>"
-
-#: editor/mainwindow.cpp:1751
-msgid "Open File"
-msgstr "打开文件"
-
-#: editor/formwindow.cpp:302
-msgid "&Horizontal"
-msgstr "水平(&H)"
-
-#: editor/formwindow.cpp:303
-msgid "&Vertical"
-msgstr "垂直(&V)"
+#. i18n: file ./editor/listvieweditor.ui line 356
+#: rc.cpp:1229
+#, fuzzy, no-c-format
+msgid "Move right"
+msgstr "高度"
 
-#: editor/formwindow.cpp:317 editor/formwindow.cpp:425
+#. i18n: file ./editor/listvieweditor.ui line 359
+#: rc.cpp:1232
+#, no-c-format
 msgid ""
-"<b>A %1 (custom widget)</b> "
-"<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> "
-"menu to add and change custom widgets. You can add properties as well as "
-"signals and slots to integrate custom widgets into <i>Qt Designer</i>"
-", and provide a pixmap which will be used to represent the widget on the "
-"form.</p>"
+"<b>Move the selected item one level down.</b>"
+"<p>This will also change the level of the item's sub-items.</p>"
 msgstr ""
 
-#: editor/formwindow.cpp:324 editor/formwindow.cpp:432
-msgid "A %1 (custom widget)"
-msgstr "%1(自定义部件)"
-
-#: editor/formwindow.cpp:331 editor/formwindow.cpp:439
-#, fuzzy
-msgid "<b>A %1</b><p>%2</p>"
-msgstr "<b>%1</b>"
+#. i18n: file ./editor/listvieweditor.ui line 386
+#: rc.cpp:1238
+#, no-c-format
+msgid "Column Properties"
+msgstr "列属性"
 
-#: editor/formwindow.cpp:384
-msgid "Reparent Widgets"
+#. i18n: file ./editor/listvieweditor.ui line 437
+#: rc.cpp:1250
+#, no-c-format
+msgid "Delete the pixmap of the selected column."
 msgstr ""
 
-#: editor/formwindow.cpp:390 editor/formwindow.cpp:396
-#: editor/formwindow.cpp:407
-#, c-format
-msgid "Insert %1"
-msgstr "插入 %1"
-
-#: editor/formwindow.cpp:597
-msgid "Connect '%1' with..."
+#. i18n: file ./editor/listvieweditor.ui line 457
+#: rc.cpp:1259
+#, no-c-format
+msgid ""
+"<b>Select a pixmap file for the selected column.</b>"
+"<p>The pixmap will be displayed in the header of the listview.</p>"
 msgstr ""
 
-#: editor/formwindow.cpp:620 editor/formwindow.cpp:676
-msgid "Change Tab Order"
-msgstr "更改 Tab 顺序"
-
-#: editor/formwindow.cpp:806
-msgid "Connect '%1' to '%2'"
-msgstr ""
+#. i18n: file ./editor/listvieweditor.ui line 482
+#: rc.cpp:1265
+#, no-c-format
+msgid "Enter column text"
+msgstr "输入列文本"
 
-#: editor/formwindow.cpp:868 editor/formwindow.cpp:957
+#. i18n: file ./editor/listvieweditor.ui line 485
+#: rc.cpp:1268
+#, no-c-format
 msgid ""
-"You tried to insert a widget into the layout Container Widget '%1'.\n"
-"This is not possible. In order to insert the widget, the layout of '%1'\n"
-"must first be broken.\n"
-"Break the layout or cancel the operation?"
+"<b>Enter the text for the selected column.</b>"
+"<p>The text will be displayed in the header of the listview.</p>"
 msgstr ""
 
-#: editor/formwindow.cpp:874 editor/formwindow.cpp:964
-msgid "Inserting Widget"
-msgstr "插入部件"
-
-#: editor/formwindow.cpp:875 editor/formwindow.cpp:965
-msgid "&Break Layout"
-msgstr "打乱布局(&B)"
+#. i18n: file ./editor/listvieweditor.ui line 493
+#: rc.cpp:1271
+#, no-c-format
+msgid "Clicka&ble"
+msgstr "可单击(&B)"
 
-#: editor/formwindow.cpp:1224 editor/formwindow.cpp:1267
-msgid "Use Size Hint"
+#. i18n: file ./editor/listvieweditor.ui line 496
+#: rc.cpp:1274
+#, no-c-format
+msgid ""
+"If this option is checked, the selected column will react to mouse clicks on "
+"the header."
 msgstr ""
 
-#: editor/formwindow.cpp:1661
-msgid "Click widgets to change the tab order..."
-msgstr ""
+#. i18n: file ./editor/listvieweditor.ui line 504
+#: rc.cpp:1277
+#, no-c-format
+msgid "Re&sizable"
+msgstr "可更改大小(&S)"
 
-#: editor/formwindow.cpp:1670
-msgid "Drag a line to create a connection..."
+#. i18n: file ./editor/listvieweditor.ui line 507
+#: rc.cpp:1280
+#, no-c-format
+msgid "The column's width will be resizeable if this option is checked."
 msgstr ""
 
-#: editor/formwindow.cpp:1676
-msgid "Click on the form to insert a %1..."
-msgstr ""
+#. i18n: file ./editor/listvieweditor.ui line 520
+#: rc.cpp:1286
+#, no-c-format
+msgid "Delete column"
+msgstr "删除列"
 
-#: editor/formwindow.cpp:1784
-msgid "Lower"
-msgstr ""
+#. i18n: file ./editor/listvieweditor.ui line 523
+#: rc.cpp:1289
+#, no-c-format
+msgid "Deletes the selected Column."
+msgstr "删除选中列。"
 
-#: editor/formwindow.cpp:1847
-msgid "Accelerator '%1' is used %2 times."
+#. i18n: file ./editor/listvieweditor.ui line 540
+#: rc.cpp:1295
+#, no-c-format
+msgid ""
+"<b>Move the selected item down.</b>"
+"<p>The top-most column will be the first column in the list.</p>"
 msgstr ""
 
-#: editor/formwindow.cpp:1848
-msgid "&Select"
-msgstr "选择(&S)"
+#. i18n: file ./editor/listvieweditor.ui line 551
+#: rc.cpp:1301
+#, no-c-format
+msgid "Add a Column"
+msgstr "添加列"
 
-#: editor/formwindow.cpp:1859
-msgid "No accelerator is used more than once."
+#. i18n: file ./editor/listvieweditor.ui line 554
+#: rc.cpp:1304
+#, no-c-format
+msgid ""
+"<b>Create a new column.</b>"
+"<p>New columns are appended at the end of (right of) the list and may be moved "
+"using the up- and down-buttons.</p>"
 msgstr ""
 
-#: editor/formwindow.cpp:1870
-msgid "Raise"
+#. i18n: file ./editor/listvieweditor.ui line 571
+#: rc.cpp:1310
+#, no-c-format
+msgid ""
+"<b>Move the selected item up.</b>"
+"<p>The top-most column will be the first column in the list.</p>"
 msgstr ""
 
-#: editor/formwindow.cpp:1930
-msgid "Lay Out Horizontally (in splitter)"
-msgstr ""
+#. i18n: file ./editor/listvieweditor.ui line 579
+#: rc.cpp:1313
+#, no-c-format
+msgid "The list of columns."
+msgstr "列列表。"
 
-#: editor/formwindow.cpp:1941
-msgid "Lay Out Vertically (in splitter)"
-msgstr ""
+#. i18n: file ./editor/formsettings.ui line 35
+#: rc.cpp:1337
+#, no-c-format
+msgid "Form Settings"
+msgstr "表单设置"
 
-#: editor/formwindow.cpp:1975
-msgid "Lay Out Children Horizontally"
+#. i18n: file ./editor/formsettings.ui line 41
+#: rc.cpp:1340
+#, no-c-format
+msgid ""
+"<b>Form Settings</b>"
+"<p>Change settings for the form. Settings like <b>Comment</b> and <b>Author</b> "
+"are for your own use and are not required.</p>"
 msgstr ""
 
-#: editor/formwindow.cpp:1996
-msgid "Lay Out Children Vertically"
-msgstr ""
+#. i18n: file ./editor/formsettings.ui line 122
+#: rc.cpp:1355
+#, no-c-format
+msgid "La&youts"
+msgstr "布局(&Y)"
 
-#: editor/formwindow.cpp:2020
-msgid "Lay Out Children in a Grid"
-msgstr ""
+#. i18n: file ./editor/formsettings.ui line 155
+#: rc.cpp:1358
+#, no-c-format
+msgid "Default mar&gin:"
+msgstr "默认边距(&G)："
 
-#: editor/functionsimpl.cpp:83 plugin/specialinformation.cpp:383
-msgid "Slots"
+#. i18n: file ./editor/formsettings.ui line 166
+#: rc.cpp:1361
+#, no-c-format
+msgid "D&efault spacing:"
+msgstr "默认间距(&E)："
+
+#. i18n: file ./editor/formsettings.ui line 202
+#: rc.cpp:1367
+#, no-c-format
+msgid "Enter a comment about the form."
 msgstr ""
 
-#: editor/functionsimpl.cpp:102
-#, fuzzy
-msgid "Functions"
-msgstr "函数(&F)："
+#. i18n: file ./editor/formsettings.ui line 227
+#: rc.cpp:1370
+#, no-c-format
+msgid "Co&mment:"
+msgstr "注释(&M)："
 
-#: editor/functionsimpl.cpp:198
-msgid ""
-"To learn more about the slot, look at the documentation of the base Qt/TDE "
-"class, most probably <i>%1</i>."
-msgstr ""
+#. i18n: file ./editor/formsettings.ui line 238
+#: rc.cpp:1373
+#, no-c-format
+msgid "&License:"
+msgstr "许可(&L)："
 
-#: editor/functionsimpl.cpp:202 editor/functionsimpl.cpp:225
-msgid ""
-"<qt>"
-"<h3>%1</h3>"
-"<p><b>Description:</b> %2\n"
-"<p><b>Syntax:</b> <i>%3</i>%4</qt>"
-msgstr ""
+#. i18n: file ./editor/formsettings.ui line 249
+#: rc.cpp:1376 rc.cpp:1388 rc.cpp:1394
+#, no-c-format
+msgid "Enter your name"
+msgstr "输入您的姓名"
 
-#: editor/functionsimpl.cpp:214
-msgid "<p>Parameters are not obligatory."
-msgstr ""
+#. i18n: file ./editor/formsettings.ui line 252
+#: rc.cpp:1379 rc.cpp:1391 rc.cpp:1397
+#, no-c-format
+msgid "Enter your name."
+msgstr "输入您的姓名。"
 
-#: editor/functionsimpl.cpp:217
-#, c-format
-msgid ""
-"_n: "
-"<p>Only first argument is obligatory.\n"
-"<p>Only first %n arguments are obligatory."
-msgstr ""
+#. i18n: file ./editor/formsettings.ui line 260
+#: rc.cpp:1382
+#, no-c-format
+msgid "&Version:"
+msgstr "版本(&V)："
+
+#. i18n: file ./editor/formsettings.ui line 271
+#: rc.cpp:1385
+#, no-c-format
+msgid "A&uthor:"
+msgstr "作者(&U)："
 
 #: plugin/specialinformation.cpp:286
 msgid "Inserts the item if it will not create a duplicate."
@@ -2125,49 +2364,68 @@ msgstr ""
 msgid "Returns true if the widget has focus."
 msgstr "输入新模板的名称"
 
+#: plugin/specialinformation.cpp:383
+#, fuzzy
+msgid "Gets the widget's background color."
+msgstr "使用背景颜色。"
+
+#: plugin/specialinformation.cpp:385
+msgid ""
+"Sets the widget's background color. Colors can be by name, like blue, or in hex "
+"like #0000ff for blue. Use the color dialog or a color picker if unsure."
+msgstr ""
+
 #: plugin/specialinformation.cpp:387
+msgid "See if widget has been modified."
+msgstr ""
+
+#: editor/functionsimpl.cpp:83 plugin/specialinformation.cpp:389
+msgid "Slots"
+msgstr ""
+
+#: plugin/specialinformation.cpp:393
 msgid ""
 "Returns current widget's content. This was required inside widget A to return "
 "widget A content when requested by widget B. The new method is to use @A.text "
 "inside B instead of just @A if you just want the unaltered text."
 msgstr ""
 
-#: plugin/specialinformation.cpp:389
+#: plugin/specialinformation.cpp:395
 msgid ""
 "Returns selected text or text of current item. This is deprecated for <i>"
 "@mywidget.selected</i>."
 msgstr ""
 
-#: plugin/specialinformation.cpp:391
+#: plugin/specialinformation.cpp:397
 msgid ""
 "Does nothing. This is useful if you request a CheckBox or RadioButton to return "
 "a value where a state, typically the unchecked state, has no value. The @null "
 "prevents an error indicating it is empty."
 msgstr ""
 
-#: plugin/specialinformation.cpp:393
+#: plugin/specialinformation.cpp:399
 msgid "Returns the pid (process ID) of the current process."
 msgstr ""
 
-#: plugin/specialinformation.cpp:395
+#: plugin/specialinformation.cpp:401
 msgid ""
 "Returns DCOP identifier of current process. This is shorthand for <i>"
 "kmdr-executor-@pid</i>."
 msgstr ""
 
-#: plugin/specialinformation.cpp:398
+#: plugin/specialinformation.cpp:404
 msgid "Returns the pid of the parent Kommander window."
 msgstr ""
 
-#: plugin/specialinformation.cpp:400
+#: plugin/specialinformation.cpp:406
 msgid "Writes <i>text</i> on stderr."
 msgstr ""
 
-#: plugin/specialinformation.cpp:402
+#: plugin/specialinformation.cpp:408
 msgid "Writes <i>text</i> on standard output."
 msgstr ""
 
-#: plugin/specialinformation.cpp:404
+#: plugin/specialinformation.cpp:410
 msgid ""
 "Executes a script block. Bash is used if no shell is given. It is primarily for "
 "use in non-button widgets where script actions are not expected. Full path is "
@@ -2176,21 +2434,21 @@ msgid ""
 "be used and will return a value to the main script, which may be unexpected.</i>"
 msgstr ""
 
-#: plugin/specialinformation.cpp:406
+#: plugin/specialinformation.cpp:412
 msgid ""
 "Returns value of an environment (shell) variable. Do not use <i>$</i> "
 "in the name. For example, <i>@env(PATH)</i>."
 msgstr ""
 
-#: plugin/specialinformation.cpp:408 plugin/specialinformation.cpp:410
+#: plugin/specialinformation.cpp:414 plugin/specialinformation.cpp:416
 msgid "Executes an external shell command."
 msgstr ""
 
-#: plugin/specialinformation.cpp:412
+#: plugin/specialinformation.cpp:418
 msgid "Parses an expression and returns computed value."
 msgstr ""
 
-#: plugin/specialinformation.cpp:414
+#: plugin/specialinformation.cpp:420
 msgid ""
 "Executes loop: values from <i>items</i> list (passed as EOL-separated string) "
 "are assigned to the variable. "
@@ -2204,7 +2462,7 @@ msgid ""
 "<br>end "
 msgstr ""
 
-#: plugin/specialinformation.cpp:416
+#: plugin/specialinformation.cpp:422
 msgid ""
 "Executes loop: variable is set to <i>start</i> and is increased by <i>step</i> "
 "each time loop is executed. Execution stops when variable becomes larger then "
@@ -2219,17 +2477,17 @@ msgid ""
 "<br>end</i>."
 msgstr ""
 
-#: plugin/specialinformation.cpp:418
+#: plugin/specialinformation.cpp:424
 msgid "Returns the value of a global variable."
 msgstr ""
 
-#: plugin/specialinformation.cpp:420
+#: plugin/specialinformation.cpp:426
 msgid ""
 "Translates the string into the current language. Texts in GUI would be "
 "automatically extracted for translation."
 msgstr ""
 
-#: plugin/specialinformation.cpp:422
+#: plugin/specialinformation.cpp:428
 msgid ""
 "Executes block if expression is true (non-zero number or non-empty string.) "
 "<p><b>Old</b>Close with <b>@endif</b></p>"
@@ -2243,28 +2501,28 @@ msgid ""
 "<br>endif</p>"
 msgstr ""
 
-#: plugin/specialinformation.cpp:424
+#: plugin/specialinformation.cpp:430
 msgid ""
 "Executes another Kommander dialog. Current dialog directory is used if no path "
 "is given. Arguments may be given as named arguments which will become global "
 "variables in the new dialog. For instance: <i>var=val</i>"
 msgstr ""
 
-#: plugin/specialinformation.cpp:426
+#: plugin/specialinformation.cpp:432
 msgid "Reads setting from configration file for this dialog."
 msgstr ""
 
-#: plugin/specialinformation.cpp:428
+#: plugin/specialinformation.cpp:434
 msgid ""
 "Sets the value of a global variable. Global variables exist for the life of the "
 "Kommander window."
 msgstr ""
 
-#: plugin/specialinformation.cpp:430
+#: plugin/specialinformation.cpp:436
 msgid "Stores setting in configuration file for this dialog."
 msgstr ""
 
-#: plugin/specialinformation.cpp:432
+#: plugin/specialinformation.cpp:438
 msgid ""
 "Begin of <b>switch</b> block. Following <b>case</b> values are compared to <i>"
 "expression</i>."
@@ -2273,2508 +2531,2427 @@ msgid ""
 "<br>@end"
 msgstr ""
 
-#: plugin/specialinformation.cpp:434
+#: plugin/specialinformation.cpp:440
 msgid "Executes an external DCOP call."
 msgstr ""
 
-#: plugin/specialinformation.cpp:436
+#: plugin/specialinformation.cpp:442
 msgid "Adds a comment to EOL that Kommander will not parse"
 msgstr ""
 
-#: plugin/specialinformation.cpp:438
+#: plugin/specialinformation.cpp:444
 msgid ""
 "Creates a new widget with the specified type and as the child of parent."
 msgstr ""
 
-#: plugin/specialinformation.cpp:440
+#: plugin/specialinformation.cpp:446
 msgid ""
 "Returns true if there is a widget with the passed name, false otherwise."
 msgstr ""
 
-#: plugin/specialinformation.cpp:442
+#: plugin/specialinformation.cpp:448
 msgid "Connects the signal of sender with the slot of the receiver"
 msgstr ""
 
-#: plugin/specialinformation.cpp:444
+#: plugin/specialinformation.cpp:450
 msgid "Disconnects the signal of sender from the slot of the receiver"
 msgstr ""
 
-#: plugin/specialinformation.cpp:447
+#: plugin/specialinformation.cpp:455
 msgid "Exits script execution and returns"
 msgstr ""
 
-#: plugin/specialinformation.cpp:449
+#: plugin/specialinformation.cpp:457
 msgid "Exits the current block of a while, for or foreach loop"
 msgstr ""
 
-#: plugin/specialinformation.cpp:451
+#: plugin/specialinformation.cpp:459
 msgid "Exit a step and return to the beginning of a loop"
 msgstr ""
 
-#: plugin/specialinformation.cpp:453
+#: plugin/specialinformation.cpp:461
 msgid ""
 "Return from a script, optionaly with a value from the script to the caller"
 msgstr ""
 
-#: plugin/specialinformation.cpp:457
+#: plugin/specialinformation.cpp:465
 msgid "Returns an EOL-separated list of all values in the array."
 msgstr ""
 
-#: plugin/specialinformation.cpp:459
+#: plugin/specialinformation.cpp:467
 msgid "Returns an EOL-separated list of all keys in the array."
 msgstr ""
 
-#: plugin/specialinformation.cpp:461
+#: plugin/specialinformation.cpp:469
 msgid "Removes all elements from the array."
 msgstr ""
 
-#: plugin/specialinformation.cpp:463
+#: plugin/specialinformation.cpp:471
 msgid "Returns the number of elements in the array."
 msgstr ""
 
-#: plugin/specialinformation.cpp:465
+#: plugin/specialinformation.cpp:473
 msgid "Returns the value associated with the given key."
 msgstr ""
 
-#: plugin/specialinformation.cpp:467
+#: plugin/specialinformation.cpp:475
 msgid "Removes element with the given key from the array."
 msgstr ""
 
-#: plugin/specialinformation.cpp:469
+#: plugin/specialinformation.cpp:477
 msgid "Adds element with the given key and value to the array"
 msgstr ""
 
-#: plugin/specialinformation.cpp:471
+#: plugin/specialinformation.cpp:479
 msgid ""
 "Adds all elements in the string to the array. String should have <i>"
 "key\\tvalue\\n</i> format."
 msgstr ""
 
-#: plugin/specialinformation.cpp:474
+#: plugin/specialinformation.cpp:482
 msgid ""
 "Returns all elements in the array in "
 "<pre>key\\tvalue\\n</pre> format."
 msgstr ""
 
-#: plugin/specialinformation.cpp:476
+#: plugin/specialinformation.cpp:484
 msgid ""
 "Create an integer indexed array - starting from 0 - from a string. Use the "
 "separator character to split the string. The separator's default value is "
 "'\\t'."
 msgstr ""
 
-#: plugin/specialinformation.cpp:478
+#: plugin/specialinformation.cpp:486
 msgid ""
 "Create a string from an integer indexed array. Concatenate the elements with "
 "the separator character. The separator's default value is '\\t'."
 msgstr ""
 
-#: plugin/specialinformation.cpp:480
+#: plugin/specialinformation.cpp:488
 msgid ""
 "Remove keyNum elements starting with keyStart from an indexed array and reindex "
 "the array. If keyNum is not specified, remove only the keyStart element."
 msgstr ""
 
-#: plugin/specialinformation.cpp:482
+#: plugin/specialinformation.cpp:490
 msgid ""
 "Insert the elements from string starting at key and reindex the array. Use the "
 "separator to separate the elements from the string. The separator's default "
 "value is '\\t'."
 msgstr ""
 
-#: plugin/specialinformation.cpp:487
+#: plugin/specialinformation.cpp:492
+msgid ""
+"Create a flipped copy of the array where the keys and values switch places. "
+"NOTE: If the values are not unique they will be overwritten as keys! Set the "
+"name of the array to copy to and go. Useful with combos and lists were you have "
+"an index, a key and a value for data purposes."
+msgstr ""
+
+#: plugin/specialinformation.cpp:496
+msgid ""
+"Create a 2D array with zero based integer keys. Rows seperated with returns or "
+"\\n and columns with tabs or \\t. You can then read and alter values with "
+"\"name[0][1]\"."
+"<br><b>NOTE: Watch keys!</b> The row and column keys when set to true will read "
+"respectively the first row and first column as headings. If for instance you "
+"set one where there is no column or row heading to read it will read data, and "
+"if the data is not unique you will have missing columns or rows as well as "
+"addressing not working."
+msgstr ""
+
+#: plugin/specialinformation.cpp:498
+msgid ""
+"Convert 2D array to string, optionaly with row and column headings. If written "
+"without values set it will default to no headings."
+msgstr ""
+
+#: plugin/specialinformation.cpp:500
+#, fuzzy
+msgid "Return the number of rows in the matrix"
+msgstr "输入新模板的名称"
+
+#: plugin/specialinformation.cpp:502
+#, fuzzy
+msgid "Return the number of columns in the matrix"
+msgstr "输入新模板的名称"
+
+#: plugin/specialinformation.cpp:504
+#, fuzzy
+msgid "Clear the entire matrix"
+msgstr "清除编辑的文本"
+
+#: plugin/specialinformation.cpp:506
+msgid ""
+"Convert row to array. Useful break out rows of data to work with. If you want "
+"to avoid spurious data Clear-First will wipe the array before filling it. If "
+"you choose indexed it will use a zero based index. Otherwise it will use the "
+"column keys."
+msgstr ""
+
+#: plugin/specialinformation.cpp:508
+msgid ""
+"Copy a column of a Matrix to an array and optionally clear array first to avoid "
+"spurious data in loops"
+msgstr ""
+
+#: plugin/specialinformation.cpp:510
+msgid "Copy a column of a Matrix to an indexed array"
+msgstr ""
+
+#: plugin/specialinformation.cpp:512
+msgid ""
+"Return the row keys from the matrix. Separator defaults to [tab] \"\\t\" if "
+"left empty"
+msgstr ""
+
+#: plugin/specialinformation.cpp:514
+msgid ""
+"Return the column keys from the matrix. Separator defaults to [tab] \"\\t\" if "
+"left empty"
+msgstr ""
+
+#: plugin/specialinformation.cpp:516
+msgid ""
+"Add a row to the matrix. Specifiy the row key and format the data as column key "
+"[tab] column value on each line using key\\tval\\nkey\\tval format"
+msgstr ""
+
+#: plugin/specialinformation.cpp:518
+msgid "Remove a row from the matrix by key name. Returns true if key is found."
+msgstr ""
+
+#: plugin/specialinformation.cpp:520
+msgid ""
+"Remove a column from the matrix by key name. Returns true if key is found."
+msgstr ""
+
+#: plugin/specialinformation.cpp:522
+msgid ""
+"Find the row key that matches a column value. Use this for unique key searches. "
+"Iteration may be omitted and the default is to return the first instance. In a "
+"loop it will return sequential finds until there are no more, in which case it "
+"returns null."
+msgstr ""
+
+#: plugin/specialinformation.cpp:526
 msgid "Returns number of chars in the string."
 msgstr ""
 
-#: plugin/specialinformation.cpp:489
+#: plugin/specialinformation.cpp:528
 msgid "Checks if the the string contains the given substring."
 msgstr ""
 
-#: plugin/specialinformation.cpp:491
+#: plugin/specialinformation.cpp:530
 msgid ""
 "Returns the position of a substring in the string, or -1 if it is not found."
 msgstr ""
 
-#: plugin/specialinformation.cpp:493
+#: plugin/specialinformation.cpp:532
 msgid ""
 "Returns the position of a substring in the string, or -1 if it is not found. "
 "String is searched backwards"
 msgstr ""
 
-#: plugin/specialinformation.cpp:495
+#: plugin/specialinformation.cpp:534
+#, fuzzy
+msgid "Returns the count of a given substring in the given string."
+msgstr "输入新模板的名称"
+
+#: plugin/specialinformation.cpp:536
 msgid "Returns the first <i>n</i> chars of the string."
 msgstr ""
 
-#: plugin/specialinformation.cpp:497
+#: plugin/specialinformation.cpp:538
 msgid "Returns the last <i>n</i> chars of the string."
 msgstr ""
 
-#: plugin/specialinformation.cpp:499
+#: plugin/specialinformation.cpp:540
 msgid "Returns <i>n</i> chars of the string, starting from <i>start</i>."
 msgstr ""
 
-#: plugin/specialinformation.cpp:501
+#: plugin/specialinformation.cpp:542
 msgid "Removes all occurrences of given substring."
 msgstr ""
 
-#: plugin/specialinformation.cpp:503
+#: plugin/specialinformation.cpp:544
 msgid ""
 "Replaces all occurrences of the given substring with the given replacement."
 msgstr ""
 
-#: plugin/specialinformation.cpp:505
+#: plugin/specialinformation.cpp:546
 msgid "Converts the string to uppercase."
 msgstr ""
 
-#: plugin/specialinformation.cpp:507
+#: plugin/specialinformation.cpp:548
 msgid "Converts the string to lowercase."
 msgstr ""
 
-#: plugin/specialinformation.cpp:509
+#: plugin/specialinformation.cpp:550
 msgid ""
 "Compares two strings. Returns 0 if they are equal, -1 if the first one is "
 "lower, 1 if the first one is higher"
 msgstr ""
 
-#: plugin/specialinformation.cpp:512
+#: plugin/specialinformation.cpp:553
 msgid "Checks if the string is empty."
 msgstr ""
 
-#: plugin/specialinformation.cpp:514
+#: plugin/specialinformation.cpp:555
 msgid "Checks if the string is a valid number."
 msgstr ""
 
-#: plugin/specialinformation.cpp:516
+#: plugin/specialinformation.cpp:557
 msgid "Returns given section of a string."
 msgstr ""
 
-#: plugin/specialinformation.cpp:518
+#: plugin/specialinformation.cpp:559
 msgid ""
 "Returns the given string with %1, %2, %3 replaced with <i>arg1</i>, <i>arg2</i>"
 ", <i>arg3</i> accordingly."
 msgstr ""
 
-#: plugin/specialinformation.cpp:520
+#: plugin/specialinformation.cpp:561
 msgid "Round a floating point number by x digits."
 msgstr ""
 
-#: plugin/specialinformation.cpp:523
+#: plugin/specialinformation.cpp:563
+msgid ""
+"Sort a string list. Only first paramter is required. Default separator is a "
+"newline."
+msgstr ""
+
+#: plugin/specialinformation.cpp:565
+msgid "Strips white space from beginning and end of string."
+msgstr ""
+
+#: plugin/specialinformation.cpp:567
+msgid ""
+"Pads the string to the total length indicated. if no pad character is given "
+"spaces will be used. Try this with 0 on integer sequences and read them with "
+"str_toint."
+msgstr ""
+
+#: plugin/specialinformation.cpp:569
+msgid ""
+"Pads the string to the total length indicated. if no pad character is given "
+"spaces will be used."
+msgstr ""
+
+#: plugin/specialinformation.cpp:572
 msgid "Convert a string to an integer. If not possible use the default value"
 msgstr ""
 
-#: plugin/specialinformation.cpp:525
+#: plugin/specialinformation.cpp:574
 msgid ""
 "Convert a string to a double precision floating point value. If not possible "
 "use the default value"
 msgstr ""
 
-#: plugin/specialinformation.cpp:529
+#: plugin/specialinformation.cpp:578
 msgid "Returns content of given file."
 msgstr ""
 
-#: plugin/specialinformation.cpp:531
+#: plugin/specialinformation.cpp:580
 msgid "Writes given string to a file."
 msgstr ""
 
-#: plugin/specialinformation.cpp:533
+#: plugin/specialinformation.cpp:582
 msgid "Appends given string to the end of a file."
 msgstr ""
 
-#: plugin/specialinformation.cpp:535
+#: plugin/specialinformation.cpp:584
 msgid "Checks to see if file exists."
 msgstr ""
 
-#: plugin/specialinformation.cpp:538
+#: plugin/specialinformation.cpp:587
 msgid ""
 "Shows color dialog. Returns color in #RRGGBB format. Defaults to the parameter, "
 "if specified."
 msgstr ""
 
-#: plugin/specialinformation.cpp:540
+#: plugin/specialinformation.cpp:589
 msgid "Shows text selection dialog. Returns entered text."
 msgstr ""
 
-#: plugin/specialinformation.cpp:542
+#: plugin/specialinformation.cpp:591
 msgid "Shows a dialog asking user for password and returns it."
 msgstr ""
 
-#: plugin/specialinformation.cpp:544
+#: plugin/specialinformation.cpp:593
 msgid "Shows value selection dialog. Returns entered value."
 msgstr ""
 
-#: plugin/specialinformation.cpp:546
+#: plugin/specialinformation.cpp:595
 msgid "Shows float value selection dialog. Returns entered value."
 msgstr ""
 
-#: plugin/specialinformation.cpp:548
+#: plugin/specialinformation.cpp:597
 msgid "Shows existing file selection dialog. Returns selected file."
 msgstr ""
 
-#: plugin/specialinformation.cpp:550
+#: plugin/specialinformation.cpp:599
 msgid "Shows save file selection dialog. Returns selected file."
 msgstr ""
 
-#: plugin/specialinformation.cpp:552
+#: plugin/specialinformation.cpp:601
 msgid "Shows directory selection dialog. Returns selected directory."
 msgstr ""
 
-#: plugin/specialinformation.cpp:554
+#: plugin/specialinformation.cpp:603
 msgid ""
 "Shows multiple files selection dialog. Returns EOL-separated list of selected "
 "files."
 msgstr ""
 
-#: plugin/specialinformation.cpp:558
-msgid "Shows an information dialog."
-msgstr "显示信息对话框。"
+#: plugin/specialinformation.cpp:607
+msgid ""
+"Shows an information dialog. Returns true when clicked so you can check for "
+"user response."
+msgstr ""
 
-#: plugin/specialinformation.cpp:560
-msgid "Shows an error dialog."
-msgstr "显示错误对话框。"
+#: plugin/specialinformation.cpp:609
+msgid ""
+"Shows an error dialog. Returns true when clicked so you can check for user "
+"response."
+msgstr ""
 
-#: plugin/specialinformation.cpp:562
+#: plugin/specialinformation.cpp:611
 msgid ""
 "Shows a warning dialog with up to three buttons. Returns number of selected "
 "button."
 msgstr ""
 
-#: plugin/specialinformation.cpp:564
+#: plugin/specialinformation.cpp:613
 msgid ""
 "Shows a question dialog with up to three buttons. Returns number of selected "
 "button."
 msgstr ""
 
-#. i18n: file ./editor/wizardeditor.ui line 16
-#: rc.cpp:3
-#, no-c-format
-msgid "Wizard Page Editor"
-msgstr "向导页面编辑器"
-
-#. i18n: file ./editor/wizardeditor.ui line 61
-#: rc.cpp:6
-#, no-c-format
-msgid "Wizard pages:"
-msgstr "向导页面："
+#: widget/kommanderwidget.cpp:119 widgets/scriptobject.cpp:99
+msgid "Invalid state for associated text."
+msgstr ""
 
-#. i18n: file ./editor/wizardeditor.ui line 90
-#: rc.cpp:9 rc.cpp:893
-#, no-c-format
-msgid "&Add"
-msgstr "添加(&A)"
+#: widget/kommanderwidget.cpp:134
+msgid ""
+"Line %1: %2.\n"
+msgstr ""
+"行 %1：%2\n"
 
-#. i18n: file ./editor/wizardeditor.ui line 200
-#: rc.cpp:21 rc.cpp:236 rc.cpp:392 rc.cpp:614 rc.cpp:815 rc.cpp:878 rc.cpp:914
-#: rc.cpp:980 rc.cpp:1082 rc.cpp:1133 rc.cpp:1310
-#, no-c-format
-msgid "Close the dialog and apply all the changes."
-msgstr "关闭对话框并应用全部更改。"
+#: widget/kommanderwidget.cpp:244
+msgid "Unknown special: '%1'."
+msgstr ""
 
-#. i18n: file ./editor/wizardeditor.ui line 214
-#: rc.cpp:27 rc.cpp:398 rc.cpp:821 rc.cpp:986 rc.cpp:1088 rc.cpp:1139
-#, no-c-format
-msgid "Apply all changes."
-msgstr "应用全部更改。"
+#: widget/kommanderwidget.cpp:274
+msgid "Unmatched parenthesis in DCOP call '%1'."
+msgstr ""
 
-#. i18n: file ./editor/wizardeditor.ui line 228
-#: rc.cpp:33 rc.cpp:242 rc.cpp:404 rc.cpp:620 rc.cpp:827 rc.cpp:884 rc.cpp:920
-#: rc.cpp:992 rc.cpp:1094 rc.cpp:1145 rc.cpp:1319
-#, no-c-format
-msgid "Close the dialog and discard any changes."
-msgstr "关闭对话框并丢弃任何更改。"
+#: widget/kommanderwidget.cpp:280
+msgid "Incorrect arguments in DCOP call '%1'."
+msgstr ""
 
-#. i18n: file ./editor/previewwidget.ui line 22
-#: rc.cpp:36
-#, no-c-format
-msgid "Preview Window"
-msgstr "预览窗口"
+#: widget/kommanderwidget.cpp:310
+#, fuzzy
+msgid "Tried to perform DCOP query, but failed."
+msgstr "试图执行 DCOP 查询，但失败了"
 
-#. i18n: file ./editor/previewwidget.ui line 67
-#: rc.cpp:39
-#, fuzzy, no-c-format
-msgid "ButtonGroup"
-msgstr "新建动作组(&G)"
+#: widget/kommanderwidget.cpp:341
+msgid "DCOP return type %1 is not yet implemented."
+msgstr "DCOP 返回类型 %1 尚未实现。"
 
-#. i18n: file ./editor/previewwidget.ui line 84
-#: rc.cpp:42
-#, no-c-format
-msgid "RadioButton1"
+#: widget/kommanderwidget.cpp:406
+msgid "Continue && Ignore Next Errors"
 msgstr ""
 
-#. i18n: file ./editor/previewwidget.ui line 95
-#: rc.cpp:45
-#, no-c-format
-msgid "RadioButton2"
+#: widget/kommanderwidget.cpp:408
+msgid "<qt>Error in widget <b>%1</b>:<p><i>%2</i></qt>"
 msgstr ""
 
-#. i18n: file ./editor/previewwidget.ui line 103
-#: rc.cpp:48
-#, no-c-format
-msgid "RadioButton3"
+#: widget/kommanderwidget.cpp:427
+msgid ""
+"Error in widget %1:\n"
+"  %2\n"
 msgstr ""
+"部件 %1 中出错：\n"
+"  %2\n"
 
-#. i18n: file ./editor/previewwidget.ui line 113
-#: rc.cpp:51
-#, fuzzy, no-c-format
-msgid "ButtonGroup2"
-msgstr "新建动作组(&G)"
-
-#. i18n: file ./editor/previewwidget.ui line 130
-#: rc.cpp:54
-#, no-c-format
-msgid "CheckBox1"
-msgstr "复选框1"
+#: widget/kommanderwidget.cpp:582
+msgid "Unmatched parenthesis after '%1'."
+msgstr ""
 
-#. i18n: file ./editor/previewwidget.ui line 141
-#: rc.cpp:57
-#, no-c-format
-msgid "CheckBox2"
-msgstr "复选框2"
+#: widget/kommanderwidget.cpp:591
+msgid "Unmatched quotes in argument of '%1'."
+msgstr ""
 
-#. i18n: file ./editor/previewwidget.ui line 175
-#: rc.cpp:60
-#, no-c-format
-msgid "LineEdit"
-msgstr "行编辑"
+#: widget/kommanderwidget.cpp:593
+msgid "Unknown function group: '%1'."
+msgstr ""
 
-#. i18n: file ./editor/previewwidget.ui line 181
-#: rc.cpp:63
-#, no-c-format
-msgid "ComboBox"
-msgstr "组合框"
+#: widget/kommanderwidget.cpp:595
+msgid "Unknown function: '%1' in group '%2'."
+msgstr ""
 
-#. i18n: file ./editor/previewwidget.ui line 212
-#: rc.cpp:66
-#, no-c-format
-msgid "PushButton"
-msgstr "按钮"
+#: widget/kommanderwidget.cpp:597
+msgid "Unknown widget function: '%1'."
+msgstr ""
 
-#. i18n: file ./editor/previewwidget.ui line 249
-#: rc.cpp:69
-#, no-c-format
+#: widget/kommanderwidget.cpp:599
 msgid ""
-"<p>\n"
-"<a href=\"http://www.trolltech.com\"> http://www.trolltech.com </a>\n"
-"</p>\n"
-"<p>\n"
-"<a href=\"http://www.kde.org\"> http://www.kde.org </a>\n"
-"</p>"
+"Not enough arguments for '%1' (%2 instead of %3)."
+"<p>Correct syntax is: %4"
 msgstr ""
 
-#. i18n: file ./editor/newform.ui line 35
-#: rc.cpp:77
-#, no-c-format
-msgid "New File"
-msgstr "新建文件"
+#: widget/kommanderwidget.cpp:604
+msgid "Too many arguments for '%1' (%2 instead of %3).<p>Correct syntax is: %4"
+msgstr ""
 
-#. i18n: file ./editor/newform.ui line 41
-#: rc.cpp:80
-#, no-c-format
-msgid ""
-"<b>New Form</b>"
-"<p>Select a template for the new form and click the <b>OK</b>"
-"-button to create it.</p>"
+#: widget/myprocess.cpp:94
+msgid "<qt>Failed to start shell process<br><b>%1</b></qt>"
+msgstr "<qt>启动 shell 进程失败<br><b>%1</b></qt>"
+
+#: widget/expression.cpp:199 widget/expression.cpp:208
+#, fuzzy
+msgid "error"
+msgstr "粘贴错误"
+
+#: widget/kommanderfunctions.cpp:120
+msgid "Unterminated @execBegin ... @execEnd block."
 msgstr ""
 
-#. i18n: file ./editor/newform.ui line 109
-#: rc.cpp:89
-#, no-c-format
-msgid "Create a new form using the selected template."
+#: widget/kommanderfunctions.cpp:138 widget/kommanderfunctions.cpp:164
+msgid "Unterminated @forEach ... @end block."
 msgstr ""
 
-#. i18n: file ./editor/newform.ui line 123
-#: rc.cpp:95
-#, no-c-format
-msgid "Close the dialog without creating a new form."
+#: widget/kommanderfunctions.cpp:201
+msgid "Unterminated @if ... @endif block."
 msgstr ""
 
-#. i18n: file ./editor/newform.ui line 145
-#: rc.cpp:98
-#, no-c-format
-msgid "Displays a list of the available templates."
+#: widget/kommanderfunctions.cpp:221
+msgid "Unterminated @switch ... @end block."
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 38
-#: rc.cpp:101
-#, no-c-format
-msgid "Tune Palette"
+#: widget/kommanderfunctions.cpp:320
+#, c-format
+msgid "Unknown widget: @%1."
+msgstr "未知部件：@%1。"
+
+#: widget/kommanderfunctions.cpp:338
+msgid "Infinite loop: @%1 called inside @%2."
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 44
-#: rc.cpp:104
-#, no-c-format
-msgid ""
-"<b>Edit Palette</b>"
-"<p>Change the current widget or form's palette.</p>"
-"<p>Use a generated palette or select colors for each color group and each color "
-"role.</p>"
-"<p>The palette can be tested with different widget layouts in the preview "
-"section.</p>"
+#: widget/kommanderfunctions.cpp:344
+msgid "Script for @%1 is empty."
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 81
-#: rc.cpp:107 rc.cpp:860
-#, no-c-format
-msgid "Select &palette:"
-msgstr "选择调色板(&P)："
+#: widget/parser.cpp:116
+msgid "Invalid character: '%1'"
+msgstr "无效字符：“%1”"
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 90
-#: rc.cpp:110 rc.cpp:863
-#, no-c-format
-msgid "Active Palette"
-msgstr "活动调色板"
+#: widget/parser.cpp:192
+msgid "Constant value expected"
+msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 95
-#: rc.cpp:113 rc.cpp:866
-#, no-c-format
-msgid "Inactive Palette"
-msgstr "非活动调色板"
+#: widget/parser.cpp:223
+#, fuzzy
+msgid "'%1' (%2) is not a widget"
+msgstr "“%1”不是部件"
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 100
-#: rc.cpp:116 rc.cpp:869
-#, no-c-format
-msgid "Disabled Palette"
-msgstr "禁用的调色板"
+#: widget/parser.cpp:235 widget/parser.cpp:520
+msgid "'%1' is not a function"
+msgstr "“%1”不是函数"
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 122
-#: rc.cpp:119
-#, no-c-format
-msgid "Auto"
-msgstr "自动"
+#: widget/parser.cpp:246
+msgid "Expected value"
+msgstr "期待值"
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 139
-#: rc.cpp:122
-#, no-c-format
-msgid "Build the inactive palette from the active palette."
+#: widget/parser.cpp:271 widget/parser.cpp:281
+msgid "Divide by zero"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 150
-#: rc.cpp:125
-#, no-c-format
-msgid "Build the disabled palette from the active palette."
+#: widget/parser.cpp:426 widget/parser.cpp:428 widget/parser.cpp:434
+msgid "in function '%1': %2"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 163
-#: rc.cpp:128
-#, no-c-format
-msgid "Central Color &Roles"
-msgstr ""
+#: widget/parser.cpp:426
+#, fuzzy
+msgid "too few parameters"
+msgstr "插入分隔符"
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 178
-#: rc.cpp:131
-#, no-c-format
-msgid "Background"
-msgstr "背景"
+#: widget/parser.cpp:428
+#, fuzzy
+msgid "too many parameters"
+msgstr "插入分隔符"
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 183
-#: rc.cpp:134
-#, no-c-format
-msgid "Foreground"
-msgstr "前景"
+#: widget/parser.cpp:474
+msgid "in widget function '%1.%2': %3"
+msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 188
-#: rc.cpp:137
-#, no-c-format
-msgid "Button"
-msgstr "按钮"
+#: widget/parser.cpp:517
+msgid "'%1' is not a widget"
+msgstr "“%1”不是部件"
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 193
-#: rc.cpp:140
-#, no-c-format
-msgid "Base"
+#: widget/parser.cpp:522
+msgid "Unexpected symbol after variable '%1'"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 203
-#: rc.cpp:146
-#, no-c-format
-msgid "BrightText"
+#: widget/parser.cpp:741
+msgid ""
+"Expected '%1'"
+"<br>"
+"<br>Possible cause of the error is having a variable with the same name as a "
+"widget"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 208
-#: rc.cpp:149
-#, no-c-format
-msgid "ButtonText"
-msgstr ""
+#: widget/parser.cpp:743
+msgid "Expected '%1'"
+msgstr "期待“%1”"
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 213
-#: rc.cpp:152
-#, fuzzy, no-c-format
-msgid "Highlight"
-msgstr "高度"
+#: widget/parser.cpp:757 widget/parser.cpp:770
+msgid "Expected variable"
+msgstr "期待变量"
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 218
-#: rc.cpp:155
-#, no-c-format
-msgid "HighlightText"
+#: editor/workspace.cpp:226
+msgid "<No Project>"
+msgstr "<无项目>"
+
+#: editor/workspace.cpp:661
+msgid "&Open Source File..."
+msgstr "打开源文件(&O)..."
+
+#: editor/workspace.cpp:664
+msgid "&Remove Source File From Project"
+msgstr "从项目中删除源文件(&R)"
+
+#: editor/workspace.cpp:668
+msgid "&Open Form..."
+msgstr "打开表单(&O)..."
+
+#: editor/workspace.cpp:672 editor/workspace.cpp:682
+msgid "&Remove Form From Project"
+msgstr "从项目中删除表单(&R)"
+
+#: editor/workspace.cpp:674 editor/workspace.cpp:684
+msgid "&Remove Form"
+msgstr "删除表单(&R)"
+
+#: editor/workspace.cpp:678
+msgid "&Open Form Source..."
+msgstr "从源代码打开(&O)..."
+
+#: editor/widgetdatabase.cpp:139
+msgid "Push Button"
+msgstr "按钮"
+
+#: editor/widgetdatabase.cpp:146
+msgid "Tool Button"
+msgstr "工具按钮"
+
+#: editor/widgetdatabase.cpp:153
+msgid "Radio Button"
+msgstr "单选钮"
+
+#: editor/widgetdatabase.cpp:160
+msgid "Check Box"
+msgstr "复选框"
+
+#: editor/widgetdatabase.cpp:167
+msgid "Group Box"
+msgstr "分组框"
+
+#: editor/widgetdatabase.cpp:175
+msgid "Button Group"
+msgstr "按钮组"
+
+#: editor/widgetdatabase.cpp:183
+msgid "Frame"
+msgstr "框架"
+
+#: editor/widgetdatabase.cpp:191
+#, fuzzy
+msgid "Tabwidget"
+msgstr "部件"
+
+#: editor/widgetdatabase.cpp:199 editor/widgetdatabase.cpp:531
+msgid "List Box"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 223
-#: rc.cpp:158
-#, no-c-format
-msgid "Link"
+#: editor/widgetdatabase.cpp:206
+msgid "List View"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 228
-#: rc.cpp:161
-#, no-c-format
-msgid "LinkVisited"
+#: editor/widgetdatabase.cpp:214
+msgid "Icon View"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 235
-#: rc.cpp:164
-#, no-c-format
-msgid "Choose the central color role"
+#: editor/propertyeditor.cpp:1894 editor/propertyeditor.cpp:1928
+#: editor/widgetdatabase.cpp:223
+msgid "Table"
+msgstr "表格"
+
+#: editor/widgetdatabase.cpp:233
+#, fuzzy
+msgid "Data Table"
+msgstr "数据库"
+
+#: editor/widgetdatabase.cpp:241
+#, fuzzy
+msgid "Line Edit"
+msgstr "动作编辑器"
+
+#: editor/widgetdatabase.cpp:248
+msgid "Spin Box"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 238
-#: rc.cpp:167
-#, no-c-format
-msgid ""
-"<b>Select a color role.</b>"
-"<p>Available central color roles are: "
-"<ul> "
-"<li>Background - general background color.</li> "
-"<li>Foreground - general foreground color. </li> "
-"<li>Base - used as the background color for example, for text entry widgets; it "
-"is usually white or another light color. </li> "
-"<li>Text - the forground color used with Base. Usually this is the same as the "
-"Foreground, in which case it must provide good contrast both with the "
-"Background and with the Base. </li> "
-"<li>Button - general button background color; useful where buttons need a "
-"background different from Background, as in the Macintosh style. </li> "
-"<li>ButtonText - a foreground color used with the Button color. </li> "
-"<li>Highlight - a color used to indicate a selected or highlighted item. </li> "
-"<li>HighlightedText - a text color that contrasts to Highlight. </li> "
-"<li>BrightText - a text color that is very different from Foreground and "
-"contrasts well with, for example, black. </li> </ul> </p>"
+#: editor/widgetdatabase.cpp:255
+msgid "Date Edit"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 285
-#: rc.cpp:170
-#, no-c-format
-msgid "Choose pi&xmap:"
-msgstr "选择像素图(&X)："
+#: editor/widgetdatabase.cpp:263
+msgid "Time Edit"
+msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 310
-#: rc.cpp:173 rc.cpp:500
-#, no-c-format
-msgid "Select a pixmap"
-msgstr "选择像素图"
+#: editor/widgetdatabase.cpp:271
+msgid "Date-Time Edit"
+msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 313
-#: rc.cpp:176
-#, no-c-format
-msgid "Choose a pixmap file for the selected central color role."
+#: editor/widgetdatabase.cpp:279
+msgid "Multi Line Edit"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 335
-#: rc.cpp:179
-#, no-c-format
-msgid "&Select color:"
-msgstr "选择颜色(&S)："
+#: editor/widgetdatabase.cpp:286
+msgid "Rich Text Edit"
+msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 360
-#: rc.cpp:182 rc.cpp:224 rc.cpp:476 rc.cpp:839 rc.cpp:848
-#, no-c-format
-msgid "Choose a color"
-msgstr "选择颜色"
+#: editor/widgetdatabase.cpp:293
+msgid "Combo Box"
+msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 363
-#: rc.cpp:185
-#, no-c-format
-msgid "Choose a color for the selected central color role."
+#: editor/widgetdatabase.cpp:300 editor/widgetdatabase.cpp:641
+msgid "Slider"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 375
-#: rc.cpp:188
-#, no-c-format
-msgid "3D Shadow &Effects"
-msgstr "立体阴影效果(&E)"
+#: editor/widgetdatabase.cpp:307
+msgid "Scrollbar"
+msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 406
-#: rc.cpp:191
-#, no-c-format
-msgid "Build &from button color:"
-msgstr "从按钮颜色创建(&F)："
+#: editor/widgetdatabase.cpp:314
+#, fuzzy
+msgid "Dial"
+msgstr "对话框"
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 412
-#: rc.cpp:194
-#, no-c-format
-msgid "Generate shadings"
-msgstr "生成阴影"
+#: editor/widgetdatabase.cpp:321
+#, fuzzy
+msgid "Label"
+msgstr "表格"
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 415
-#: rc.cpp:197
-#, no-c-format
-msgid "Check to let 3D-effect colors be calculated from the button-color."
+#: editor/widgetdatabase.cpp:328
+msgid "LCD Number"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 421
-#: rc.cpp:200
-#, no-c-format
-msgid "Light"
+#: editor/widgetdatabase.cpp:335
+msgid "Progress Bar"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 426
-#: rc.cpp:203
-#, no-c-format
-msgid "Midlight"
+#: editor/widgetdatabase.cpp:342
+#, fuzzy
+msgid "Text View"
+msgstr "文字"
+
+#: editor/widgetdatabase.cpp:349 editor/widgetdatabase.cpp:524
+msgid "Text Browser"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 431
-#: rc.cpp:206
-#, no-c-format
-msgid "Mid"
+#: editor/mainwindowactions.cpp:248 editor/widgetdatabase.cpp:356
+msgid "Spacer"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 436
-#: rc.cpp:209
-#, no-c-format
-msgid "Dark"
+#: editor/widgetdatabase.cpp:358
+msgid ""
+"The Spacer provides horizontal and vertical spacing to be able to manipulate "
+"the behaviour of layouts."
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 441
-#: rc.cpp:212
-#, no-c-format
-msgid "Shadow"
-msgstr "阴影"
+#: editor/widgetdatabase.cpp:494
+msgid "Text Label"
+msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 448
-#: rc.cpp:215
-#, no-c-format
-msgid "Choose 3D-effect color role"
+#: editor/widgetdatabase.cpp:495
+msgid "The Text Label provides a widget to display static text."
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 451
-#: rc.cpp:218
-#, no-c-format
-msgid ""
-"<b>Select a color effect role.</b>"
-"<p>Available effect roles are: "
-"<ul> "
-"<li>Light - lighter than Button color. </li> "
-"<li>Midlight - between Button and Light. </li> "
-"<li>Mid - between Button and Dark. </li> "
-"<li>Dark - darker than Button. </li> "
-"<li>Shadow - a very dark color. </li> </ul>"
+#: editor/widgetdatabase.cpp:502
+msgid "Pixmap Label"
 msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 506
-#: rc.cpp:221
-#, no-c-format
-msgid "Select co&lor:"
-msgstr "选择颜色(&L)："
+#: editor/widgetdatabase.cpp:503
+msgid "The Pixmap Label provides a widget to display pixmaps."
+msgstr ""
 
-#. i18n: file ./editor/paletteeditoradvanced.ui line 534
-#: rc.cpp:227
-#, no-c-format
-msgid "Choose a color for the selected effect color role."
+#: editor/widgetdatabase.cpp:510
+msgid "A line edit"
 msgstr ""
 
-#. i18n: file ./editor/functions.ui line 16
-#: rc.cpp:245
-#, no-c-format
-msgid "Function Browser"
-msgstr "功能浏览器"
+#: editor/widgetdatabase.cpp:517
+msgid "A rich text edit"
+msgstr ""
 
-#. i18n: file ./editor/functions.ui line 38
-#: rc.cpp:248
-#, no-c-format
-msgid "Description:"
-msgstr "描述："
+#: editor/widgetdatabase.cpp:538
+msgid "A combo box"
+msgstr ""
 
-#. i18n: file ./editor/functions.ui line 67
-#: rc.cpp:251
-#, no-c-format
-msgid "&Group:"
-msgstr "组(&G)："
+#: editor/widgetdatabase.cpp:545
+#, fuzzy
+msgid "A tree widget"
+msgstr "%1(自定义部件)"
 
-#. i18n: file ./editor/functions.ui line 97
-#: rc.cpp:254
-#, no-c-format
-msgid "&Function:"
-msgstr "函数(&F)："
+#: editor/widgetdatabase.cpp:552
+#, fuzzy
+msgid "A table widget"
+msgstr "%1(自定义部件)"
 
-#. i18n: file ./editor/functions.ui line 129
-#: rc.cpp:257
-#, no-c-format
-msgid "&Parameters"
-msgstr "参数(&P)"
+#: editor/widgetdatabase.cpp:559
+msgid "A button that when clicked, execute a command"
+msgstr ""
 
-#. i18n: file ./editor/functions.ui line 140
-#: rc.cpp:260
-#, no-c-format
-msgid "Arg3"
+#: editor/widgetdatabase.cpp:566
+msgid "A button that closes the dialog it is in"
 msgstr ""
 
-#. i18n: file ./editor/functions.ui line 148
-#: rc.cpp:263
-#, no-c-format
-msgid "Arg5"
+#: editor/widgetdatabase.cpp:573
+msgid "A listbox showing output of a script"
 msgstr ""
 
-#. i18n: file ./editor/functions.ui line 190
-#: rc.cpp:266
-#, no-c-format
-msgid "Insert function"
-msgstr "插入函数"
+#: editor/widgetdatabase.cpp:580
+msgid ""
+"A widget made up of a line edit and push button, for selecting files and "
+"folders"
+msgstr ""
 
-#. i18n: file ./editor/functions.ui line 198
-#: rc.cpp:269
-#, no-c-format
-msgid "Arg4"
+#: editor/widgetdatabase.cpp:587
+msgid "A check box"
 msgstr ""
 
-#. i18n: file ./editor/functions.ui line 240
-#: rc.cpp:272 rc.cpp:278 rc.cpp:281 rc.cpp:287 rc.cpp:290 rc.cpp:293
-#, no-c-format
-msgid "Quote"
+#: editor/widgetdatabase.cpp:594
+msgid "A radio button"
 msgstr ""
 
-#. i18n: file ./editor/functions.ui line 263
-#: rc.cpp:275
-#, no-c-format
-msgid "Arg1"
+#: editor/widgetdatabase.cpp:601
+msgid "A widget for grouping buttons together"
 msgstr ""
 
-#. i18n: file ./editor/functions.ui line 362
-#: rc.cpp:284
-#, no-c-format
-msgid "Widget:"
-msgstr "部件："
+#: editor/widgetdatabase.cpp:609
+msgid "A widget for grouping other widgets together"
+msgstr ""
 
-#. i18n: file ./editor/functions.ui line 502
-#: rc.cpp:296
-#, no-c-format
-msgid "Arg6"
+#: editor/widgetdatabase.cpp:617
+msgid "A widget with tabs"
 msgstr ""
 
-#. i18n: file ./editor/functions.ui line 510
-#: rc.cpp:299
-#, no-c-format
-msgid "Arg2"
+#: editor/widgetdatabase.cpp:634
+msgid "A spin box"
 msgstr ""
 
-#. i18n: file ./editor/functions.ui line 623
-#: rc.cpp:308
-#, no-c-format
-msgid "Clear edited text"
-msgstr "清除编辑的文本"
+#: editor/widgetdatabase.cpp:648
+msgid "A small rich text editor"
+msgstr ""
 
-#. i18n: file ./editor/functions.ui line 631
-#: rc.cpp:311
-#, no-c-format
-msgid "Inserted &text:"
-msgstr "插入的文本(&T)："
+#: editor/widgetdatabase.cpp:655
+msgid "A status bar"
+msgstr ""
 
-#. i18n: file ./editor/actioneditor.ui line 19
-#: rc.cpp:314
-#, no-c-format
-msgid "Edit Actions"
-msgstr "编辑动作"
+#: editor/widgetdatabase.cpp:662
+msgid "A progress bar"
+msgstr ""
 
-#. i18n: file ./editor/actioneditor.ui line 61
-#: rc.cpp:317
-#, no-c-format
-msgid "Create new Action"
-msgstr "创建新动作"
+#: editor/widgetdatabase.cpp:669
+msgid "A hidden script container"
+msgstr ""
 
-#. i18n: file ./editor/actioneditor.ui line 78
-#: rc.cpp:320
-#, no-c-format
-msgid "Delete current Action"
-msgstr "删除当前动作"
+#: editor/widgetdatabase.cpp:676
+msgid "A timer for running scripts periodically"
+msgstr ""
 
-#. i18n: file ./editor/actioneditor.ui line 95
-#: rc.cpp:323
-#, no-c-format
-msgid "Connect current Action"
-msgstr "连接当前动作"
+#: editor/widgetdatabase.cpp:683
+#, fuzzy
+msgid "A date selection widget"
+msgstr "%1(自定义部件)"
 
-#. i18n: file ./editor/iconvieweditor.ui line 35
-#: rc.cpp:326
-#, no-c-format
-msgid "Edit Iconview"
-msgstr "编辑图标视图"
+#: editor/pixmapchooser.cpp:947
+#, fuzzy
+msgid "All Pixmaps"
+msgstr "删除页面"
 
-#. i18n: file ./editor/iconvieweditor.ui line 41
-#: rc.cpp:329
-#, no-c-format
+#: editor/pixmapchooser.cpp:950
 msgid ""
-"<b>Edit Iconview</b>"
-"<p>Add, edit or delete items in the icon view.</p>"
-"<p>Click the <b>New Item</b>-button to create a new item, then enter text and "
-"choose a pixmap.</p>"
-"<p>Select an item from the view and click the <b>Delete Item</b>"
-"-button to remove the item from the iconview.</p>"
+"%1-Pixmaps (%2)\n"
 msgstr ""
 
-#. i18n: file ./editor/iconvieweditor.ui line 72
-#: rc.cpp:332
-#, no-c-format
-msgid "All items in the iconview."
-msgstr ""
+#: editor/pixmapchooser.cpp:956
+msgid "All Files (*)"
+msgstr "全部文件(*)"
 
-#. i18n: file ./editor/iconvieweditor.ui line 94
-#: rc.cpp:335 rc.cpp:683 rc.cpp:1034
-#, no-c-format
-msgid "&New Item"
-msgstr "新建项目(&N)"
+#: editor/choosewidgetimpl.cpp:38 editor/hierarchyview.cpp:608
+#: editor/mainwindow.cpp:268
+msgid "Widgets"
+msgstr "部件"
 
-#. i18n: file ./editor/iconvieweditor.ui line 97
-#: rc.cpp:338 rc.cpp:686 rc.cpp:1037
-#, no-c-format
-msgid "Add an item"
-msgstr "添加菜单项"
+#: editor/hierarchyview.cpp:100
+msgid "(Constructor)"
+msgstr "(构造器)"
 
-#. i18n: file ./editor/iconvieweditor.ui line 100
-#: rc.cpp:341
-#, no-c-format
-msgid "Create a new item for the iconview."
-msgstr "为图标视图创建新项目。"
+#: editor/hierarchyview.cpp:102
+msgid "(Destructor)"
+msgstr "(析构器)"
 
-#. i18n: file ./editor/iconvieweditor.ui line 108
-#: rc.cpp:344 rc.cpp:632 rc.cpp:1043
-#, no-c-format
-msgid "&Delete Item"
-msgstr "删除项目(&D)"
+#: editor/hierarchyview.cpp:190
+msgid "Name"
+msgstr "名称"
 
-#. i18n: file ./editor/iconvieweditor.ui line 111
-#: rc.cpp:347 rc.cpp:635
-#, no-c-format
-msgid "Delete item"
-msgstr "删除项目"
+#: editor/hierarchyview.cpp:191
+msgid "Class"
+msgstr "类"
 
-#. i18n: file ./editor/iconvieweditor.ui line 114
-#: rc.cpp:350
-#, no-c-format
-msgid "Delete the selected item."
-msgstr "删除选中的项目。"
+#: editor/hierarchyview.cpp:335
+msgid "Database"
+msgstr "数据库"
 
-#. i18n: file ./editor/iconvieweditor.ui line 147
-#: rc.cpp:353 rc.cpp:1001
-#, no-c-format
-msgid "&Item Properties"
-msgstr "项目属性(&I)"
+#: editor/hierarchyview.cpp:519 editor/hierarchyview.cpp:525
+#: editor/mainwindow.cpp:1217 editor/mainwindow.cpp:1235
+#: editor/mainwindow.cpp:1270 editor/wizardeditorimpl.cpp:112
+#, c-format
+msgid "Add Page to %1"
+msgstr "向 %1 添加页面"
 
-#. i18n: file ./editor/iconvieweditor.ui line 164
-#: rc.cpp:356 rc.cpp:647 rc.cpp:755 rc.cpp:1025 rc.cpp:1070
-#, no-c-format
-msgid "&Text:"
-msgstr "文本(&T)："
+#: editor/hierarchyview.cpp:541 editor/hierarchyview.cpp:551
+#: editor/mainwindow.cpp:1224 editor/mainwindow.cpp:1242
+#: editor/mainwindow.cpp:1277 editor/wizardeditorimpl.cpp:130
+msgid "Delete Page %1 of %2"
+msgstr "删除 %2 的第 %1 页"
 
-#. i18n: file ./editor/iconvieweditor.ui line 181
-#: rc.cpp:359 rc.cpp:650 rc.cpp:1028
-#, no-c-format
-msgid "Change text"
-msgstr "更改文字"
+#: editor/messagelog.cpp:34
+msgid "Copy Current &Line"
+msgstr "复制当前行(&L)"
 
-#. i18n: file ./editor/iconvieweditor.ui line 184
-#: rc.cpp:362
-#, no-c-format
-msgid "Change the text for the selected item."
+#: editor/messagelog.cpp:35
+msgid "&Copy Content"
+msgstr "复制内容(&C)"
+
+#: editor/messagelog.cpp:36
+msgid "&Save As..."
+msgstr "另存为(&S)..."
+
+#: editor/messagelog.cpp:122
+msgid ""
+"*.log|Log Files (*.log)\n"
+"*|All Files"
 msgstr ""
 
-#. i18n: file ./editor/iconvieweditor.ui line 192
-#: rc.cpp:365 rc.cpp:734 rc.cpp:1004
-#, no-c-format
-msgid "&Pixmap:"
-msgstr "像素图(&P)："
+#: editor/messagelog.cpp:122
+msgid "Save Log File"
+msgstr "保存日志文件"
 
-#. i18n: file ./editor/iconvieweditor.ui line 217
-#: rc.cpp:368 rc.cpp:665 rc.cpp:737 rc.cpp:1007 rc.cpp:1172 rc.cpp:1229
-#, fuzzy, no-c-format
-msgid "Label4"
-msgstr "表格"
+#: editor/messagelog.cpp:127
+msgid "<qt>File<br><b>%1</b><br>already exists. Overwrite it?</qt>"
+msgstr "<qt>文件<br><b>%1</b><br>已经存在。覆盖吗？</qt>"
 
-#. i18n: file ./editor/iconvieweditor.ui line 237
-#: rc.cpp:371 rc.cpp:668 rc.cpp:740 rc.cpp:1010 rc.cpp:1175 rc.cpp:1232
-#, no-c-format
-msgid "Delete Pixmap"
-msgstr "删除像素图"
+#: editor/formfile.cpp:155 editor/messagelog.cpp:128
+msgid "Overwrite"
+msgstr "覆盖"
 
-#. i18n: file ./editor/iconvieweditor.ui line 240
-#: rc.cpp:374 rc.cpp:1013
-#, no-c-format
-msgid "Delete the selected item's pixmap."
-msgstr "删除选中项目的像素图。"
+#: editor/messagelog.cpp:132
+msgid "<qt>Cannot save log file<br><b>%1</b></qt>"
+msgstr "<qt>无法保存日志文件<br><b>%1</b></qt>"
 
-#. i18n: file ./editor/iconvieweditor.ui line 257
-#: rc.cpp:380 rc.cpp:677 rc.cpp:749 rc.cpp:1019 rc.cpp:1184 rc.cpp:1241
-#, no-c-format
-msgid "Select a Pixmap"
-msgstr "选择像素图"
+#: editor/messagelog.cpp:146
+#, fuzzy
+msgid "Stdout"
+msgstr "删除线"
 
-#. i18n: file ./editor/iconvieweditor.ui line 260
-#: rc.cpp:383
-#, no-c-format
-msgid "Select a pixmap file for the current item."
+#: editor/messagelog.cpp:146
+msgid "Stderr"
 msgstr ""
 
-#. i18n: file ./editor/createtemplate.ui line 61
-#: rc.cpp:410
-#, no-c-format
-msgid "Template &name:"
-msgstr "模板名称(&N)："
-
-#. i18n: file ./editor/createtemplate.ui line 76
-#: rc.cpp:413
-#, no-c-format
-msgid "Name of the new template"
-msgstr "新模板的名称"
+#: editor/iconvieweditorimpl.cpp:124 editor/listboxeditorimpl.cpp:134
+msgid "Edit Items of '%1'"
+msgstr "编辑“%1”的项目"
 
-#. i18n: file ./editor/createtemplate.ui line 80
-#: rc.cpp:416
-#, no-c-format
-msgid "Enter the name of the new template"
-msgstr "输入新模板的名称"
+#: editor/command.cpp:499 editor/command.cpp:511
+msgid "Set 'name' Property"
+msgstr "设置“name”属性"
 
-#. i18n: file ./editor/createtemplate.ui line 91
-#: rc.cpp:419
-#, no-c-format
-msgid "Class of the new template"
-msgstr "新模板的类"
+#: editor/command.cpp:500
+msgid ""
+"The name of a widget must be unique.\n"
+"'%1' is already used in form '%2',\n"
+"so the name has been reverted to '%3'."
+msgstr ""
 
-#. i18n: file ./editor/createtemplate.ui line 95
-#: rc.cpp:422
-#, no-c-format
+#: editor/command.cpp:512
 msgid ""
-"Enter the name of the class which should be used as the template's base class"
+"The name of a widget must not be null.\n"
+"The name has been reverted to '%1'."
 msgstr ""
 
-#. i18n: file ./editor/createtemplate.ui line 142
-#: rc.cpp:425
-#, no-c-format
-msgid "C&reate"
-msgstr "创建(&R)"
+#: editor/sizehandle.cpp:230
+msgid "Resize"
+msgstr "更改大小"
 
-#. i18n: file ./editor/createtemplate.ui line 150
-#: rc.cpp:428
-#, no-c-format
-msgid "Creates the new template"
-msgstr "创建新模板"
+#: editor/widgetfactory.cpp:291 editor/widgetfactory.cpp:571
+msgid "Move Tab Page"
+msgstr "移动标签页"
 
-#. i18n: file ./editor/createtemplate.ui line 165
-#: rc.cpp:434
-#, no-c-format
-msgid "Closes the Dialog"
-msgstr "关闭对话框"
+#: editor/widgetfactory.cpp:967 editor/widgetfactory.cpp:1169
+msgid "Tab 1"
+msgstr "标签 1"
 
-#. i18n: file ./editor/createtemplate.ui line 178
-#: rc.cpp:437
-#, no-c-format
-msgid "&Baseclass for template:"
-msgstr "模板的基类(&B)："
+#: editor/widgetfactory.cpp:970 editor/widgetfactory.cpp:1172
+msgid "Tab 2"
+msgstr "标签 2"
 
-#. i18n: file ./editor/assoctexteditor.ui line 16
-#: rc.cpp:440
-#, no-c-format
-msgid "Edit Text"
-msgstr "编辑文本"
+#: editor/widgetfactory.cpp:1156 editor/widgetfactory.cpp:1184
+#, fuzzy
+msgid "Page 1"
+msgstr "页面标题"
 
-#. i18n: file ./editor/assoctexteditor.ui line 35
-#: rc.cpp:443
-#, no-c-format
-msgid "&Widget:"
-msgstr "部件(&W)："
+#: editor/widgetfactory.cpp:1157 editor/widgetfactory.cpp:1187
+#, fuzzy
+msgid "Page 2"
+msgstr "页面标题"
 
-#. i18n: file ./editor/assoctexteditor.ui line 67
-#: rc.cpp:449
-#, no-c-format
-msgid "&Text for:"
-msgstr "文本(&T)："
+#: editor/tableeditorimpl.cpp:55
+msgid "<no field>"
+msgstr ""
 
-#. i18n: file ./editor/assoctexteditor.ui line 104
-#: rc.cpp:455
-#, no-c-format
-msgid "&Function..."
-msgstr "函数(&F)..."
+#: editor/tableeditorimpl.cpp:315
+msgid "Edit Rows and Columns of '%1' "
+msgstr "编辑“%1”的行和列"
 
-#. i18n: file ./editor/assoctexteditor.ui line 137
-#: rc.cpp:458
-#, no-c-format
-msgid "Wi&dget:"
-msgstr "部件(&D)："
+#: editor/wizardeditorimpl.cpp:62
+msgid "Edit Wizard Pages"
+msgstr "编辑向导页面"
 
-#. i18n: file ./editor/assoctexteditor.ui line 184
-#: rc.cpp:461
-#, no-c-format
-msgid "Fi&le..."
-msgstr "文件(&L)..."
+#: editor/wizardeditorimpl.cpp:151 editor/wizardeditorimpl.cpp:171
+msgid "Swap Pages %1 and %2 of %3"
+msgstr "交换 %3 的 %1 和 %2"
 
-#. i18n: file ./editor/preferences.ui line 35
-#: rc.cpp:464
-#, no-c-format
-msgid "Preferences"
-msgstr "首选项"
+#: editor/mainwindow.cpp:1178 editor/mainwindow.cpp:1291
+#: editor/wizardeditorimpl.cpp:200
+msgid "Page Title"
+msgstr "页面标题"
 
-#. i18n: file ./editor/preferences.ui line 41
-#: rc.cpp:467
-#, no-c-format
-msgid ""
-"<b>Preferences</b>"
-"<p>Change the preferences of Qt Designer. There is always one tab with general "
-"preferences. There may be additional tabs, depending on which plugins are "
-"installed.</p>"
-msgstr ""
+#: editor/mainwindow.cpp:1178 editor/mainwindow.cpp:1291
+#: editor/wizardeditorimpl.cpp:200
+msgid "New page title:"
+msgstr "新建页面标题："
 
-#. i18n: file ./editor/preferences.ui line 62
-#: rc.cpp:470
-#, no-c-format
-msgid "General"
-msgstr "常规"
+#: editor/mainwindow.cpp:1293 editor/wizardeditorimpl.cpp:202
+msgid "Rename page %1 of %2"
+msgstr "重命名 %2 的第 %1 页"
 
-#. i18n: file ./editor/preferences.ui line 79
-#: rc.cpp:473
-#, no-c-format
-msgid "Backgro&und"
-msgstr "背景(&U)"
+#: editor/propertyeditor.cpp:406
+msgid "Reset the property to its default value"
+msgstr "将属性重置为其默认值"
 
-#. i18n: file ./editor/preferences.ui line 114
-#: rc.cpp:479
-#, no-c-format
-msgid "Select a color in the color dialog."
-msgstr "在颜色对话框中选择颜色。"
+#: editor/propertyeditor.cpp:407
+msgid "Click this button to reset the property to its default value"
+msgstr "单击此按钮可将属性重置为默认值"
 
-#. i18n: file ./editor/preferences.ui line 125
-#: rc.cpp:482
-#, no-c-format
-msgid "Co&lor"
-msgstr "颜色(&L)"
+#: editor/propertyeditor.cpp:1071 editor/propertyeditor.cpp:1132
+msgid "False"
+msgstr "假"
 
-#. i18n: file ./editor/preferences.ui line 128
-#: rc.cpp:485
-#, no-c-format
-msgid "Use a background color"
-msgstr "使用背景颜色"
+#: editor/propertyeditor.cpp:1072 editor/propertyeditor.cpp:1130
+msgid "True"
+msgstr "真"
 
-#. i18n: file ./editor/preferences.ui line 131
-#: rc.cpp:488
-#, no-c-format
-msgid "Use a background color."
-msgstr "使用背景颜色。"
+#: editor/propertyeditor.cpp:1410 editor/propertyeditor.cpp:1428
+#: editor/propertyeditor.cpp:1507 editor/propertyeditor.cpp:1518
+msgid "x"
+msgstr "x"
 
-#. i18n: file ./editor/preferences.ui line 139
-#: rc.cpp:491
-#, no-c-format
-msgid "&Pixmap"
-msgstr "像素图(&P)"
+#: editor/propertyeditor.cpp:1412 editor/propertyeditor.cpp:1433
+#: editor/propertyeditor.cpp:1509 editor/propertyeditor.cpp:1520
+msgid "y"
+msgstr "y"
 
-#. i18n: file ./editor/preferences.ui line 145
-#: rc.cpp:494
-#, no-c-format
-msgid "Use a background pixmap"
-msgstr "使用背景像素图"
+#: editor/propertyeditor.cpp:1416 editor/propertyeditor.cpp:1438
+#: editor/propertyeditor.cpp:1511 editor/propertyeditor.cpp:1525
+msgid "width"
+msgstr "宽度"
 
-#. i18n: file ./editor/preferences.ui line 148
-#: rc.cpp:497
-#, no-c-format
-msgid "Use a background pixmap."
-msgstr "使用背景像素图。"
+#: editor/propertyeditor.cpp:1418 editor/propertyeditor.cpp:1443
+#: editor/propertyeditor.cpp:1513 editor/propertyeditor.cpp:1527
+msgid "height"
+msgstr "高度"
 
-#. i18n: file ./editor/preferences.ui line 171
-#: rc.cpp:503
-#, no-c-format
-msgid "Choose a pixmap file."
-msgstr "选择像素图文件。"
+#: editor/propertyeditor.cpp:1647 editor/propertyeditor.cpp:1660
+#: editor/propertyeditor.cpp:1710
+msgid "Red"
+msgstr "红"
 
-#. i18n: file ./editor/preferences.ui line 181
-#: rc.cpp:506
-#, no-c-format
-msgid "Show &grid"
-msgstr "显示网格(&G)"
+#: editor/propertyeditor.cpp:1649 editor/propertyeditor.cpp:1662
+#: editor/propertyeditor.cpp:1712
+msgid "Green"
+msgstr "绿"
 
-#. i18n: file ./editor/preferences.ui line 187
-#: rc.cpp:509
-#, no-c-format
-msgid "Show Grid"
-msgstr "显示网格"
+#: editor/propertyeditor.cpp:1651 editor/propertyeditor.cpp:1664
+#: editor/propertyeditor.cpp:1714
+msgid "Blue"
+msgstr "蓝"
 
-#. i18n: file ./editor/preferences.ui line 190
-#: rc.cpp:512
-#, no-c-format
-msgid ""
-"<b>Customize the grid appearance for all forms.</b>"
-"<p>When <b>Show Grid</b> is checked, all forms show a grid.</p>"
-msgstr ""
+#: editor/propertyeditor.cpp:1768 editor/propertyeditor.cpp:1787
+#: editor/propertyeditor.cpp:1852
+msgid "Family"
+msgstr "字体"
 
-#. i18n: file ./editor/preferences.ui line 198
-#: rc.cpp:515
-#, no-c-format
-msgid "Gr&id"
-msgstr "网格(&I)"
+#: editor/propertyeditor.cpp:1770 editor/propertyeditor.cpp:1790
+#: editor/propertyeditor.cpp:1854
+msgid "Point Size"
+msgstr "磅值"
 
-#. i18n: file ./editor/preferences.ui line 218
-#: rc.cpp:518
-#, no-c-format
-msgid "Sn&ap to grid"
-msgstr "吸附到网格(&A)"
+#: editor/propertyeditor.cpp:1772 editor/propertyeditor.cpp:1792
+#: editor/propertyeditor.cpp:1856
+msgid "Bold"
+msgstr "粗体"
 
-#. i18n: file ./editor/preferences.ui line 224
-#: rc.cpp:521
-#, no-c-format
-msgid "Snap to the grid"
-msgstr "吸附到网格"
+#: editor/propertyeditor.cpp:1776 editor/propertyeditor.cpp:1796
+#: editor/propertyeditor.cpp:1860
+msgid "Underline"
+msgstr "下划线"
 
-#. i18n: file ./editor/preferences.ui line 227
-#: rc.cpp:524
-#, no-c-format
-msgid ""
-"<b>Customize the grid-settings for all forms.</b>"
-"<p>When <b>Snap to Grid</b> is checked, the widgets snap to the grid using the "
-"the X/Y resolution.</p>"
-msgstr ""
+#: editor/propertyeditor.cpp:1778 editor/propertyeditor.cpp:1798
+#: editor/propertyeditor.cpp:1862
+msgid "Strikeout"
+msgstr "删除线"
 
-#. i18n: file ./editor/preferences.ui line 258
-#: rc.cpp:527 rc.cpp:533
-#, no-c-format
-msgid "Grid resolution"
-msgstr ""
+#: editor/propertyeditor.cpp:1892 editor/propertyeditor.cpp:1910
+msgid "Connection"
+msgstr "连接"
 
-#. i18n: file ./editor/preferences.ui line 261
-#: rc.cpp:530 rc.cpp:536
-#, no-c-format
-msgid ""
-"<b>Customize the grid-settings for all forms.</b>"
-"<p>When <b>Show Grid</b> is checked, a grid is shown on all forms using the X/Y "
-"resolution.</p>"
-msgstr ""
+#: editor/propertyeditor.cpp:1897 editor/propertyeditor.cpp:1951
+msgid "Field"
+msgstr "域"
 
-#. i18n: file ./editor/preferences.ui line 289
-#: rc.cpp:539
-#, no-c-format
-msgid "Grid-&X:"
-msgstr "&X 网格："
+#: editor/propertyeditor.cpp:2059 editor/propertyeditor.cpp:2077
+#: editor/propertyeditor.cpp:2127
+msgid "hSizeType"
+msgstr "hSizeType"
 
-#. i18n: file ./editor/preferences.ui line 300
-#: rc.cpp:542
-#, no-c-format
-msgid "Grid-&Y:"
-msgstr ""
+#: editor/propertyeditor.cpp:2062 editor/propertyeditor.cpp:2079
+#: editor/propertyeditor.cpp:2129
+msgid "vSizeType"
+msgstr "vSizeType"
 
-#. i18n: file ./editor/preferences.ui line 327
-#: rc.cpp:545 rc.cpp:566
-#, no-c-format
-msgid ""
-"A splash screen is displayed when starting Qt Designer if this option is "
-"checked."
-msgstr ""
+#: editor/propertyeditor.cpp:2065 editor/propertyeditor.cpp:2081
+#: editor/propertyeditor.cpp:2131
+msgid "horizontalStretch"
+msgstr "horizontalStretch"
 
-#. i18n: file ./editor/preferences.ui line 335
-#: rc.cpp:548
-#, no-c-format
-msgid "Ge&neral"
-msgstr "常规(&N)"
+#: editor/propertyeditor.cpp:2067 editor/propertyeditor.cpp:2083
+#: editor/propertyeditor.cpp:2133
+msgid "verticalStretch"
+msgstr "verticalStretch"
 
-#. i18n: file ./editor/preferences.ui line 352
-#: rc.cpp:551
-#, no-c-format
-msgid "Restore last &workspace on startup"
-msgstr "启动时恢复上次的工作空间(&W)"
+#: editor/propertyeditor.cpp:2254
+msgid "Arrow"
+msgstr "箭头"
 
-#. i18n: file ./editor/preferences.ui line 358
-#: rc.cpp:554
-#, no-c-format
-msgid "Restore last workspace"
-msgstr "恢复上个工作空间"
+#: editor/propertyeditor.cpp:2258
+msgid "Up-Arrow"
+msgstr "上箭头"
 
-#. i18n: file ./editor/preferences.ui line 361
-#: rc.cpp:557
-#, no-c-format
-msgid ""
-"The current workspace settings will be restored the next time you start Qt "
-"Designer if this option is checked."
-msgstr ""
+#: editor/propertyeditor.cpp:2262
+msgid "Cross"
+msgstr "十字"
 
-#. i18n: file ./editor/preferences.ui line 369
-#: rc.cpp:560
-#, no-c-format
-msgid "Show &splash screen on startup"
-msgstr ""
+#: editor/propertyeditor.cpp:2266
+msgid "Waiting"
+msgstr "等待"
 
-#. i18n: file ./editor/preferences.ui line 375
-#: rc.cpp:563
-#, no-c-format
-msgid "Show Splashscreen"
-msgstr "显示飞溅屏幕"
+#: editor/propertyeditor.cpp:2270
+msgid "iBeam"
+msgstr "I 形"
 
-#. i18n: file ./editor/preferences.ui line 386
-#: rc.cpp:569
-#, no-c-format
-msgid "Disable data&base auto-edit in preview"
-msgstr "在预览中禁用数据库自动编辑(&B)"
+#: editor/propertyeditor.cpp:2274
+#, fuzzy
+msgid "SizeQt::Vertical"
+msgstr "垂直大小"
 
-#. i18n: file ./editor/preferences.ui line 397
-#: rc.cpp:572
-#, no-c-format
-msgid "&Documentation path:"
-msgstr "文档路径(&D)："
+#: editor/propertyeditor.cpp:2278
+#, fuzzy
+msgid "SizeQt::Horizontal"
+msgstr "水平大小"
 
-#. i18n: file ./editor/preferences.ui line 422
-#: rc.cpp:575
-#, no-c-format
-msgid ""
-"<b>Enter the path to the documentation.</b>"
-"<p>You may provide an $environment variable as the first part of the "
-"pathname.</p>"
-msgstr ""
+#: editor/propertyeditor.cpp:2282
+msgid "Size Slash"
+msgstr "斜线大小"
 
-#. i18n: file ./editor/preferences.ui line 436
-#: rc.cpp:581
-#, no-c-format
-msgid "Select path"
-msgstr "选择路径"
+#: editor/propertyeditor.cpp:2286
+msgid "Size Backslash"
+msgstr "反斜线大小"
 
-#. i18n: file ./editor/preferences.ui line 439
-#: rc.cpp:584
-#, no-c-format
-msgid "Look for the documentation path."
-msgstr "查找文档路径。"
+#: editor/propertyeditor.cpp:2290
+msgid "Size All"
+msgstr "四向大小"
 
-#. i18n: file ./editor/preferences.ui line 451
-#: rc.cpp:587
-#, no-c-format
-msgid "&Toolbars"
-msgstr "工具栏(&T)"
+#: editor/propertyeditor.cpp:2294
+msgid "Blank"
+msgstr "空"
 
-#. i18n: file ./editor/preferences.ui line 468
-#: rc.cpp:590
-#, no-c-format
-msgid "Show &big icons"
-msgstr "显示大图标(&B)"
+#: editor/propertyeditor.cpp:2298
+#, fuzzy
+msgid "SplitQt::Vertical"
+msgstr "垂直拆分"
 
-#. i18n: file ./editor/preferences.ui line 471
-#: rc.cpp:593
-#, no-c-format
-msgid "Big Icons"
-msgstr "大图标"
+#: editor/propertyeditor.cpp:2302
+#, fuzzy
+msgid "SplitQt::Horizontal"
+msgstr "水平拆分"
 
-#. i18n: file ./editor/preferences.ui line 474
-#: rc.cpp:596
-#, no-c-format
-msgid "Big icons will be used in the toolbars if this is checked."
+#: editor/propertyeditor.cpp:2306
+msgid "Pointing Hand"
 msgstr ""
 
-#. i18n: file ./editor/preferences.ui line 482
-#: rc.cpp:599
-#, no-c-format
-msgid "Show text lab&els"
-msgstr "显示文本标签(&E)"
-
-#. i18n: file ./editor/preferences.ui line 485
-#: rc.cpp:602
-#, no-c-format
-msgid "Text Labels"
-msgstr "文本标签"
-
-#. i18n: file ./editor/preferences.ui line 488
-#: rc.cpp:605
-#, no-c-format
-msgid "Text labels will be usin in the toolbars if this is checked."
+#: editor/propertyeditor.cpp:2310
+msgid "Forbidden"
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 35
-#: rc.cpp:623
-#, no-c-format
-msgid "Edit Listview"
-msgstr "编辑列表视图"
+#: editor/propertyeditor.cpp:2402
+msgid "Property"
+msgstr "属性"
 
-#. i18n: file ./editor/listvieweditor.ui line 41
-#: rc.cpp:626
-#, no-c-format
-msgid ""
-"<b>Edit Listview</b>"
-"<p>Use the controls on the <b>Items</b>-tab to add, edit or delete items in the "
-"listview. Change the column configuration of the listview using the controls on "
-"the <b>Columns</b>-tab.</p>Click the <b>New Item</b>"
-"-button to create a new item, then enter text and add a pixmap.</p>"
-"<p>Select an item from the list and click the <b>Delete Item</b>"
-"-button to remove the item from the list.</p>"
-msgstr ""
+#: editor/propertyeditor.cpp:2403
+msgid "Value"
+msgstr "值"
 
-#. i18n: file ./editor/listvieweditor.ui line 85
-#: rc.cpp:638
-#, no-c-format
-msgid "<b>Deletes the selected item.</b><p>Any sub-items are also deleted.</p>"
+#: editor/propertyeditor.cpp:2885
+msgid "Set '%1' of '%2'"
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 99
-#: rc.cpp:641
-#, no-c-format
-msgid "Item &Properties"
-msgstr "项目属性(&P)"
+#: editor/propertyeditor.cpp:3006
+msgid "Sort &Categorized"
+msgstr "按类别排序(&C)"
 
-#. i18n: file ./editor/listvieweditor.ui line 116
-#: rc.cpp:644
-#, no-c-format
-msgid "Pi&xmap:"
-msgstr "像素图(&X)："
+#: editor/propertyeditor.cpp:3007
+msgid "Sort &Alphabetically"
+msgstr "按字母排序(&A)"
 
-#. i18n: file ./editor/listvieweditor.ui line 147
-#: rc.cpp:653
-#, no-c-format
+#: editor/propertyeditor.cpp:3137
+msgid "Reset '%1' of '%2'"
+msgstr "重置“%2”的“%1”"
+
+#: editor/propertyeditor.cpp:3244
 msgid ""
-"<b>Change the text of the item.</b>"
-"<p>The text will be changed in the current column of the selected item.</p>"
+"<p><b>TQWidget::%1</b></p>"
+"<p>There is no documentation available for this property.</p>"
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 155
-#: rc.cpp:656
-#, no-c-format
-msgid "Change column"
-msgstr "更改列"
+#: editor/propertyeditor.cpp:3395
+msgid "New Signal Handler"
+msgstr "新建信号处理器"
 
-#. i18n: file ./editor/listvieweditor.ui line 158
-#: rc.cpp:659
-#, no-c-format
-msgid ""
-"<b>Select the current column.</b>"
-"<p>The item's text and pixmap will be changed for the current column</p>"
-msgstr ""
+#: editor/propertyeditor.cpp:3396
+msgid "Delete Signal Handler"
+msgstr "删除信号处理器"
 
-#. i18n: file ./editor/listvieweditor.ui line 166
-#: rc.cpp:662
-#, no-c-format
-msgid "Colu&mn:"
-msgstr "列(&M)："
+#: editor/connectioneditorimpl.cpp:236 editor/propertyeditor.cpp:3430
+msgid "Remove Connection"
+msgstr "删除连接"
 
-#. i18n: file ./editor/listvieweditor.ui line 214
-#: rc.cpp:671 rc.cpp:1178 rc.cpp:1235
-#, no-c-format
-msgid ""
-"<b>Delete the selected item's pixmap.</b>"
-"<p>The pixmap in the current column of the selected item will be deleted.</p>"
-msgstr ""
+#: editor/connectioneditorimpl.cpp:246 editor/propertyeditor.cpp:3480
+msgid "Add Connection"
+msgstr "添加连接"
 
-#. i18n: file ./editor/listvieweditor.ui line 234
-#: rc.cpp:680 rc.cpp:1187 rc.cpp:1244
-#, no-c-format
-msgid ""
-"<b>Select a pixmap file for the item.</b>"
-"<p>The pixmap will be changed in the current column of the selected item.</p>"
-msgstr ""
+#: editor/mainwindow.cpp:243 editor/propertyeditor.cpp:3542
+#: editor/propertyeditor.cpp:3582
+msgid "Property Editor"
+msgstr "属性编辑器"
 
-#. i18n: file ./editor/listvieweditor.ui line 252
-#: rc.cpp:689
-#, no-c-format
-msgid ""
-"<b>Adds a new item to the list.</b>"
-"<p>The item will be inserted at the top of the list and can be moved using the "
-"up- and down-buttons.</p>"
-msgstr ""
+#: editor/propertyeditor.cpp:3547
+msgid "P&roperties"
+msgstr "属性(&R)"
 
-#. i18n: file ./editor/listvieweditor.ui line 260
-#: rc.cpp:692 rc.cpp:998
-#, no-c-format
-msgid "The list of items."
-msgstr "项目列表。"
+#: editor/propertyeditor.cpp:3550
+msgid "S&ignal Handlers"
+msgstr "信号处理器(&I)"
 
-#. i18n: file ./editor/listvieweditor.ui line 268
-#: rc.cpp:695
-#, no-c-format
-msgid "New &Subitem"
-msgstr "新建子项目(&S)"
+#: editor/propertyeditor.cpp:3591
+msgid "Property Editor (%1)"
+msgstr "属性编辑器(%1)"
 
-#. i18n: file ./editor/listvieweditor.ui line 271
-#: rc.cpp:698
-#, no-c-format
-msgid "Add a subitem"
-msgstr "添加子菜单"
+#: editor/actioneditorimpl.cpp:47 editor/actionlistview.cpp:90
+msgid "New &Action"
+msgstr "新建动作(&A)"
 
-#. i18n: file ./editor/listvieweditor.ui line 274
-#: rc.cpp:701
-#, no-c-format
-msgid ""
-"<b>Create a new sub-item for the selected item.</b>"
-"<p>New sub-items are inserted at the top of the list of sub-items, and new "
-"levels are created automatically.</p>"
-msgstr ""
+#: editor/actioneditorimpl.cpp:48 editor/actionlistview.cpp:91
+msgid "New Action &Group"
+msgstr "新建动作组(&G)"
 
-#. i18n: file ./editor/listvieweditor.ui line 305
-#: rc.cpp:704 rc.cpp:800 rc.cpp:1052 rc.cpp:1151 rc.cpp:1205
-#, no-c-format
-msgid "Move up"
-msgstr ""
+#: editor/actioneditorimpl.cpp:49 editor/actionlistview.cpp:92
+msgid "New &Dropdown Action Group"
+msgstr "新建下拉动作组(&D)"
 
-#. i18n: file ./editor/listvieweditor.ui line 308
-#: rc.cpp:707
-#, no-c-format
-msgid ""
-"<b>Move the selected item up.</b>"
-"<p>The item will be moved within its level in the hierarchy.</p>"
-msgstr ""
+#: editor/actionlistview.cpp:95
+msgid "&Connect Action..."
+msgstr "连接动作(&C)..."
 
-#. i18n: file ./editor/listvieweditor.ui line 322
-#: rc.cpp:710 rc.cpp:785 rc.cpp:1058 rc.cpp:1157 rc.cpp:1211
-#, no-c-format
-msgid "Move down"
-msgstr ""
+#: editor/actionlistview.cpp:97
+msgid "Delete Action"
+msgstr "删除动作"
 
-#. i18n: file ./editor/listvieweditor.ui line 325
-#: rc.cpp:713
-#, no-c-format
-msgid ""
-"<b>Move the selected item down.</b>"
-"<p>The item will be moved within its level in the hierarchy.</p>"
-msgstr ""
+#: editor/multilineeditorimpl.cpp:56
+msgid "Set Text of '%1'"
+msgstr "设置“%1”的文字"
 
-#. i18n: file ./editor/listvieweditor.ui line 339
-#: rc.cpp:716
-#, no-c-format
-msgid "Move left"
-msgstr ""
+#: editor/mainwindow.cpp:141
+msgid "Welcome to the Kommander Editor"
+msgstr "欢迎使用 Kommander 编辑器"
 
-#. i18n: file ./editor/listvieweditor.ui line 342
-#: rc.cpp:719
-#, no-c-format
+#: editor/mainwindow.cpp:148
+msgid "Layout"
+msgstr "布局"
+
+#: editor/mainwindow.cpp:245
 msgid ""
-"<b>Move the selected item one level up.</b>"
-"<p>This will also change the level of the item's sub-items.</p>"
+"<h2>The Property Editor</h2>"
+"<p>You can change the appearance and behavior of the selected widget in the "
+"property editor.</p>"
+"<p>You can set properties for components and forms at design time and see the "
+"immediately see the effects of the changes. Each property has its own editor "
+"which (depending on the property) can be used to enter new values, open a "
+"special dialog, or to select values from a predefined list. Click <b>F1</b> "
+"to get detailed help for the selected property.</p>"
+"<p>You can resize the columns of the editor by dragging the separators in the "
+"list's header.</p>"
+"<p><b>Signal Handlers</b></p>"
+"<p>In the Signal Handlers tab you can define connections between the signals "
+"emitted by widgets and the slots in the form. (These connections can also be "
+"made using the connection tool.)"
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 356
-#: rc.cpp:722
-#, fuzzy, no-c-format
-msgid "Move right"
-msgstr "高度"
+#: editor/mainwindow.cpp:271
+msgid "Object Explorer"
+msgstr "对象资源管理器"
 
-#. i18n: file ./editor/listvieweditor.ui line 359
-#: rc.cpp:725
-#, no-c-format
+#: editor/mainwindow.cpp:273
 msgid ""
-"<b>Move the selected item one level down.</b>"
-"<p>This will also change the level of the item's sub-items.</p>"
+"<h2>The Object Explorer</h2>"
+"<p>The Object Explorer provides an overview of the relationships between the "
+"widgets in a form. You can use the clipboard functions using a context menu for "
+"each item in the view. It is also useful for selecting widgets in forms that "
+"have complex layouts.</p>"
+"<p>The columns can be resized by dragging the separator in the list's "
+"header.</p>"
+"<p>The second tab shows all the form's slots, class variables, includes, "
+"etc.</p>"
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 369
-#: rc.cpp:728 rc.cpp:1148
-#, no-c-format
-msgid "Co&lumns"
-msgstr "列(&L)"
-
-#. i18n: file ./editor/listvieweditor.ui line 386
-#: rc.cpp:731
-#, no-c-format
-msgid "Column Properties"
-msgstr "列属性"
+#: editor/mainwindow.cpp:284 editor/mainwindow.cpp:293
+#, fuzzy
+msgid "Dialogs"
+msgstr "对话框"
 
-#. i18n: file ./editor/listvieweditor.ui line 437
-#: rc.cpp:743
-#, no-c-format
-msgid "Delete the pixmap of the selected column."
+#: editor/mainwindow.cpp:287
+msgid "Start typing the buffer you want to switch to here (ALT+B)"
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 457
-#: rc.cpp:752
-#, no-c-format
+#: editor/mainwindow.cpp:294
 msgid ""
-"<b>Select a pixmap file for the selected column.</b>"
-"<p>The pixmap will be displayed in the header of the listview.</p>"
+"<h2>The File Overview Window</h2>"
+"<p>The File Overview Window displays all open dialogs.</p>"
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 482
-#: rc.cpp:758
-#, no-c-format
-msgid "Enter column text"
-msgstr "输入列文本"
+#: editor/actioneditorimpl.cpp:42 editor/mainwindow.cpp:301
+msgid "Actions"
+msgstr "动作"
 
-#. i18n: file ./editor/listvieweditor.ui line 485
-#: rc.cpp:761
-#, no-c-format
+#: editor/mainwindow.cpp:305
+msgid "Action Editor"
+msgstr "动作编辑器"
+
+#: editor/mainwindow.cpp:306
 msgid ""
-"<b>Enter the text for the selected column.</b>"
-"<p>The text will be displayed in the header of the listview.</p>"
+"<b>The Action Editor</b>"
+"<p>The Action Editor is used to add actions and action groups to a form, and to "
+"connect actions to slots. Actions and action groups can be dragged into menus "
+"and into toolbars, and may feature keyboard shortcuts and tooltips. If actions "
+"have pixmaps these are displayed on toolbar buttons and beside their names in "
+"menus.</p>"
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 493
-#: rc.cpp:764
-#, no-c-format
-msgid "Clicka&ble"
-msgstr "可单击(&B)"
-
-#. i18n: file ./editor/listvieweditor.ui line 496
-#: rc.cpp:767
-#, no-c-format
-msgid ""
-"If this option is checked, the selected column will react to mouse clicks on "
-"the header."
+#: editor/mainwindow.cpp:316 editor/mainwindow.cpp:319
+msgid "Message Log"
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 504
-#: rc.cpp:770
-#, no-c-format
-msgid "Re&sizable"
-msgstr "可更改大小(&S)"
+#: editor/mainwindow.cpp:395 editor/mainwindow.cpp:449
+#: editor/mainwindow.cpp:513
+#, fuzzy
+msgid "<qt>Cannot create backup file <i>%1</i>.</qt>"
+msgstr "<qt>无法保存日志文件<br><b>%1</b></qt>"
 
-#. i18n: file ./editor/listvieweditor.ui line 507
-#: rc.cpp:773
-#, no-c-format
-msgid "The column's width will be resizeable if this option is checked."
+#: editor/mainwindow.cpp:406 editor/mainwindow.cpp:470
+msgid "There is a dialog already running."
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 517
-#: rc.cpp:776 rc.cpp:1163
-#, no-c-format
-msgid "&Delete Column"
-msgstr "删除列(&D)"
-
-#. i18n: file ./editor/listvieweditor.ui line 520
-#: rc.cpp:779
-#, no-c-format
-msgid "Delete column"
-msgstr "删除列"
+#: editor/mainwindow.cpp:406 editor/mainwindow.cpp:470
+msgid "Run"
+msgstr "运行"
 
-#. i18n: file ./editor/listvieweditor.ui line 523
-#: rc.cpp:782
-#, no-c-format
-msgid "Deletes the selected Column."
-msgstr "删除选中列。"
+#: editor/mainwindow.cpp:439 editor/mainwindow.cpp:503
+#, fuzzy
+msgid "<qt>Cannot create temporary file <i>%1</i>.</qt>"
+msgstr "<qt>无法保存日志文件<br><b>%1</b></qt>"
 
-#. i18n: file ./editor/listvieweditor.ui line 540
-#: rc.cpp:788
-#, no-c-format
+#: editor/mainwindow.cpp:850
 msgid ""
-"<b>Move the selected item down.</b>"
-"<p>The top-most column will be the first column in the list.</p>"
+"<b>The Form Window</b>"
+"<p>Use the various tools to add widgets or to change the layout and behavior of "
+"the components in the form. Select one or multiple widgets to move them or lay "
+"them out. If a single widget is chosen it can be resized using the resize "
+"handles.</p>"
+"<p>Changes in the <b>Property Editor</b> are visible at design time, and you "
+"can preview the form in different styles.</p>"
+"<p>You can change the grid resolution, or turn the grid off in the <b>"
+"Preferences</b> dialog from the <b>Edit</b> menu."
+"<p>You can have several forms open, and all open forms are listed in the <b>"
+"Form List</b>."
 msgstr ""
 
-#. i18n: file ./editor/listvieweditor.ui line 548
-#: rc.cpp:791 rc.cpp:1166
-#, no-c-format
-msgid "&New Column"
-msgstr "新建列(&N)"
+#: editor/mainwindow.cpp:955
+#, c-format
+msgid "&Undo: %1"
+msgstr "撤消：%1(&U)"
 
-#. i18n: file ./editor/listvieweditor.ui line 551
-#: rc.cpp:794
-#, no-c-format
-msgid "Add a Column"
-msgstr "添加列"
+#: editor/mainwindow.cpp:957 editor/mainwindowactions.cpp:100
+msgid "&Undo: Not Available"
+msgstr "撤消：不可用(&U)"
 
-#. i18n: file ./editor/listvieweditor.ui line 554
-#: rc.cpp:797
-#, no-c-format
-msgid ""
-"<b>Create a new column.</b>"
-"<p>New columns are appended at the end of (right of) the list and may be moved "
-"using the up- and down-buttons.</p>"
-msgstr ""
+#: editor/mainwindow.cpp:959
+#, c-format
+msgid "&Redo: %1"
+msgstr "重做：%1(&R)"
 
-#. i18n: file ./editor/listvieweditor.ui line 571
-#: rc.cpp:803
-#, no-c-format
-msgid ""
-"<b>Move the selected item up.</b>"
-"<p>The top-most column will be the first column in the list.</p>"
-msgstr ""
+#: editor/mainwindow.cpp:961 editor/mainwindowactions.cpp:106
+msgid "&Redo: Not Available"
+msgstr "重做：不可用(&R)"
 
-#. i18n: file ./editor/listvieweditor.ui line 579
-#: rc.cpp:806
-#, no-c-format
-msgid "The list of columns."
-msgstr "列列表。"
+#: editor/mainwindow.cpp:1038
+msgid "Choose Pixmap..."
+msgstr "选择像素图..."
 
-#. i18n: file ./editor/paletteeditor.ui line 43
-#: rc.cpp:830
-#, no-c-format
-msgid "Edit Palette"
-msgstr "编辑调色板"
+#: editor/mainwindow.cpp:1042
+msgid "Edit Text..."
+msgstr "编辑文本..."
 
-#. i18n: file ./editor/paletteeditor.ui line 68
-#: rc.cpp:833
-#, no-c-format
-msgid "Build Palette"
-msgstr ""
+#: editor/mainwindow.cpp:1046
+msgid "Edit Title..."
+msgstr "编辑标题..."
 
-#. i18n: file ./editor/paletteeditor.ui line 111
-#: rc.cpp:836
-#, no-c-format
-msgid "&3D effects:"
-msgstr "立体效果(&3)："
+#: editor/mainwindow.cpp:1050 editor/mainwindow.cpp:1128
+msgid "Edit Page Title..."
+msgstr "编辑页面标题..."
 
-#. i18n: file ./editor/paletteeditor.ui line 142
-#: rc.cpp:842
-#, no-c-format
-msgid "Choose the effect-color for the generated palette."
-msgstr ""
+#: editor/mainwindow.cpp:1066 editor/mainwindow.cpp:1111
+msgid "Edit Kommander Text..."
+msgstr "编辑 Kommander 文字..."
 
-#. i18n: file ./editor/paletteeditor.ui line 173
-#: rc.cpp:845
-#, no-c-format
-msgid "Back&ground:"
-msgstr "背景(&G)："
+#: editor/mainwindow.cpp:1075 editor/mainwindow.cpp:1085
+#: editor/mainwindow.cpp:1121 editor/mainwindow.cpp:1561
+msgid "Delete Page"
+msgstr "删除页面"
 
-#. i18n: file ./editor/paletteeditor.ui line 204
-#: rc.cpp:851
-#, no-c-format
-msgid "Choose the background color for the generated palette."
-msgstr ""
+#: editor/mainwindow.cpp:1078 editor/mainwindow.cpp:1088
+#: editor/mainwindow.cpp:1125 editor/mainwindow.cpp:1560
+msgid "Add Page"
+msgstr "添加页面"
 
-#. i18n: file ./editor/paletteeditor.ui line 229
-#: rc.cpp:854
-#, no-c-format
-msgid "&Tune Palette..."
-msgstr ""
+#: editor/mainwindow.cpp:1095
+msgid "Edit..."
+msgstr "编辑..."
 
-#. i18n: file ./editor/paletteeditor.ui line 247
-#: rc.cpp:857
-#, no-c-format
-msgid "Preview"
-msgstr "预览"
+#: editor/mainwindow.cpp:1131
+msgid "Edit Pages..."
+msgstr "编辑页面..."
 
-#. i18n: file ./editor/listeditor.ui line 71
-#: rc.cpp:899
-#, no-c-format
-msgid "Re&name"
-msgstr "重命名(&N)"
+#: editor/mainwindow.cpp:1137
+msgid "Add Menu Item"
+msgstr "添加菜单项"
 
-#. i18n: file ./editor/formsettings.ui line 35
-#: rc.cpp:905
-#, no-c-format
-msgid "Form Settings"
-msgstr "表单设置"
+#: editor/mainwindow.cpp:1139
+msgid "Add Toolbar"
+msgstr "添加工具栏"
 
-#. i18n: file ./editor/formsettings.ui line 41
-#: rc.cpp:908
-#, no-c-format
-msgid ""
-"<b>Form Settings</b>"
-"<p>Change settings for the form. Settings like <b>Comment</b> and <b>Author</b> "
-"are for your own use and are not required.</p>"
-msgstr ""
+#: editor/mainwindow.cpp:1153 editor/mainwindow.cpp:1639
+msgid "New text:"
+msgstr "新文字："
 
-#. i18n: file ./editor/formsettings.ui line 122
-#: rc.cpp:923
-#, no-c-format
-msgid "La&youts"
-msgstr "布局(&Y)"
+#: editor/mainwindow.cpp:1156
+msgid "Set the 'text' of '%1'"
+msgstr "设置“%1”的“text”"
 
-#. i18n: file ./editor/formsettings.ui line 155
-#: rc.cpp:926
-#, no-c-format
-msgid "Default mar&gin:"
-msgstr "默认边距(&G)："
+#: editor/mainwindow.cpp:1166 editor/mainwindow.cpp:1655
+msgid "Title"
+msgstr "标题"
 
-#. i18n: file ./editor/formsettings.ui line 166
-#: rc.cpp:929
-#, no-c-format
-msgid "D&efault spacing:"
-msgstr "默认间距(&E)："
+#: editor/mainwindow.cpp:1166 editor/mainwindow.cpp:1655
+msgid "New title:"
+msgstr "新标题："
 
-#. i18n: file ./editor/formsettings.ui line 202
-#: rc.cpp:935
-#, no-c-format
-msgid "Enter a comment about the form."
-msgstr ""
+#: editor/mainwindow.cpp:1168
+msgid "Set the 'title' of '%1'"
+msgstr "设置“%1”的“title”"
 
-#. i18n: file ./editor/formsettings.ui line 227
-#: rc.cpp:938
-#, no-c-format
-msgid "Co&mment:"
-msgstr "注释(&M)："
+#: editor/mainwindow.cpp:1180
+msgid "Set the 'pageTitle' of '%1'"
+msgstr "设置“%1”的“pageTitle”"
 
-#. i18n: file ./editor/formsettings.ui line 238
-#: rc.cpp:941
-#, no-c-format
-msgid "&License:"
-msgstr "许可(&L)："
+#: editor/mainwindow.cpp:1192
+msgid "Set the 'pixmap' of '%1'"
+msgstr "设置“%1”的“pixmap”"
 
-#. i18n: file ./editor/formsettings.ui line 249
-#: rc.cpp:944 rc.cpp:956 rc.cpp:962
-#, no-c-format
-msgid "Enter your name"
-msgstr "输入您的姓名"
+#: editor/mainwindow.cpp:1303
+msgid "Add Toolbar to '%1'"
+msgstr "向“%1”添加工具栏"
 
-#. i18n: file ./editor/formsettings.ui line 252
-#: rc.cpp:947 rc.cpp:959 rc.cpp:965
-#, no-c-format
-msgid "Enter your name."
-msgstr "输入您的姓名。"
+#: editor/mainwindow.cpp:1307
+msgid "Add Menu to '%1'"
+msgstr "向“%1”添加菜单"
 
-#. i18n: file ./editor/formsettings.ui line 260
-#: rc.cpp:950
-#, no-c-format
-msgid "&Version:"
-msgstr "版本(&V)："
+#: editor/mainwindow.cpp:1624
+msgid "Edit %1..."
+msgstr "编辑 %1..."
 
-#. i18n: file ./editor/formsettings.ui line 271
-#: rc.cpp:953
-#, no-c-format
-msgid "A&uthor:"
-msgstr "作者(&U)："
+#: editor/mainwindow.cpp:1642
+msgid "Set the 'text' of '%2'"
+msgstr ""
 
-#. i18n: file ./editor/listboxeditor.ui line 35
-#: rc.cpp:968
-#, no-c-format
-msgid "Edit Listbox"
-msgstr "编辑列表框"
+#: editor/mainwindow.cpp:1657
+msgid "Set the 'title' of '%2'"
+msgstr ""
 
-#. i18n: file ./editor/listboxeditor.ui line 41
-#: rc.cpp:971
-#, no-c-format
+#: editor/mainwindow.cpp:1745
 msgid ""
-"<b>Edit Listbox</b>"
-"<p>Add, edit or delete items in the listbox.</p>"
-"<p>Click the <b>New Item</b>-button to create a new listbox entry, then enter "
-"text and choose a pixmap.</p>"
-"<p>Select an item from the list and click the <b>Delete Item</b>"
-"-button to remove the item from the list.</p>"
+"Kommander found some temporary saved files, which were\n"
+"written when Kommander crashed last time. Do you want to\n"
+"load these files?"
 msgstr ""
 
-#. i18n: file ./editor/listboxeditor.ui line 229
-#: rc.cpp:1022
-#, no-c-format
-msgid "Choose a pixmap file for the selected item."
-msgstr ""
+#: editor/mainwindow.cpp:1747
+msgid "Restoring Last Session"
+msgstr "恢复上次会话"
 
-#. i18n: file ./editor/listboxeditor.ui line 257
-#: rc.cpp:1031
-#, no-c-format
-msgid "Change the selected item's text."
-msgstr ""
+#: editor/mainwindow.cpp:1747
+msgid "Load"
+msgstr "装入"
 
-#. i18n: file ./editor/listboxeditor.ui line 273
-#: rc.cpp:1040
-#, no-c-format
-msgid "<b>Add a new item.</b><p>New items are appended to the list.</p>"
-msgstr ""
+#: editor/mainwindow.cpp:1747
+msgid "Do Not Load"
+msgstr "不装入"
 
-#. i18n: file ./editor/listboxeditor.ui line 287
-#: rc.cpp:1049
-#, fuzzy, no-c-format
-msgid "Delete the selected item"
-msgstr "打乱选中的布局"
+#: editor/mainwindow.cpp:1800
+msgid "There is no help available for this dialog at the moment."
+msgstr "此时没有此对话框可用的帮助。"
 
-#. i18n: file ./editor/listboxeditor.ui line 321
-#: rc.cpp:1055
-#, fuzzy, no-c-format
-msgid "Moves the selected item up."
-msgstr "打乱选中的布局"
+#: editor/mainwindow.cpp:1814
+#, fuzzy
+msgid "<qt>Could not open file:<br><b>%1</b><br>File does not exist.</qt>"
+msgstr "<qt>Kommander 文件<br><b>%1</b><br>不存在。</qt>"
 
-#. i18n: file ./editor/listboxeditor.ui line 338
-#: rc.cpp:1061
-#, no-c-format
-msgid "Move the selected item down."
+#: editor/mainwindow.cpp:1815
+msgid "Open File"
+msgstr "打开文件"
+
+#: editor/newformimpl.cpp:123
+msgid "Load Template"
+msgstr "装入模板"
+
+#: editor/newformimpl.cpp:124
+msgid "Could not load form description from template '%1'"
 msgstr ""
 
-#. i18n: file ./editor/multilineeditor.ui line 38
-#: rc.cpp:1064
-#, no-c-format
-msgid "Edit Multiline Edit"
+#: editor/newformimpl.cpp:144
+msgid "Dialog"
+msgstr "对话框"
+
+#: editor/newformimpl.cpp:150
+msgid "Wizard"
+msgstr "向导"
+
+#: editor/functionsimpl.cpp:102
+#, fuzzy
+msgid "Functions"
+msgstr "函数(&F)："
+
+#: editor/functionsimpl.cpp:198
+msgid ""
+"To learn more about the slot, look at the documentation of the base TQt/TDE "
+"class, most probably <i>%1</i>."
 msgstr ""
 
-#. i18n: file ./editor/multilineeditor.ui line 46
-#: rc.cpp:1067
-#, no-c-format
+#: editor/functionsimpl.cpp:202 editor/functionsimpl.cpp:225
 msgid ""
-"<b>Edit Multiline Edit</b>"
-"<p>Enter the text and click the <b>OK</b>-Button to apply the changes.</p>"
+"<qt>"
+"<h3>%1</h3>"
+"<p><b>Description:</b> %2\n"
+"<p><b>Syntax:</b> <i>%3</i>%4</qt>"
 msgstr ""
 
-#. i18n: file ./editor/multilineeditor.ui line 84
-#: rc.cpp:1073
-#, no-c-format
-msgid "Enter your text here."
+#: editor/functionsimpl.cpp:214
+msgid "<p>Parameters are not obligatory."
 msgstr ""
 
-#. i18n: file ./editor/pixmapfunction.ui line 61
-#: rc.cpp:1100
-#, no-c-format
-msgid "&Enter arguments for loading the pixmap:"
-msgstr "输入装入像素图的参数(&E)："
+#: editor/functionsimpl.cpp:217
+#, c-format
+msgid ""
+"_n: "
+"<p>Only first argument is obligatory.\n"
+"<p>Only first %n arguments are obligatory."
+msgstr ""
 
-#. i18n: file ./editor/pixmapfunction.ui line 109
-#: rc.cpp:1103
-#, no-c-format
-msgid "QPixmap("
+#: editor/formfile.cpp:121
+msgid ""
+"Failed to save file '%1'.\n"
+"Do you want to use another file name?"
 msgstr ""
 
-#. i18n: file ./editor/pixmapfunction.ui line 573
-#: rc.cpp:1106
-#, no-c-format
-msgid ")"
+#: editor/formfile.cpp:122
+msgid "Try Another"
 msgstr ""
 
-#. i18n: file ./editor/tableeditor.ui line 16
-#: rc.cpp:1118
-#, no-c-format
-msgid "Edit Table"
-msgstr "编辑表"
+#: editor/formfile.cpp:122
+msgid "Do Not Try"
+msgstr ""
 
-#. i18n: file ./editor/tableeditor.ui line 34
-#: rc.cpp:1121 rc.cpp:1124
-#, no-c-format
-msgid "1"
-msgstr "1"
+#: editor/formfile.cpp:127
+msgid "'%1' saved."
+msgstr "“%1”已保存。"
 
-#. i18n: file ./editor/tableeditor.ui line 218
-#: rc.cpp:1154 rc.cpp:1208
-#, no-c-format
-msgid ""
-"<b>Move the selected item up.</b>"
-"<p>The top-most column will be the first column of the list.</p>"
-msgstr ""
+#: editor/formfile.cpp:141 editor/mainwindowactions.cpp:638
+msgid "*.kmdr|Kommander Files"
+msgstr "*.kmdr|Kommander 文件"
 
-#. i18n: file ./editor/tableeditor.ui line 235
-#: rc.cpp:1160 rc.cpp:1214
-#, no-c-format
-msgid ""
-"<b>Move the selected item down.</b>"
-"<p>The top-most column will be the first column of the list.</p>"
-msgstr ""
+#: editor/formfile.cpp:142
+msgid "Save Form '%1' As"
+msgstr "表单“%1”另存为"
 
-#. i18n: file ./editor/tableeditor.ui line 273
-#: rc.cpp:1169
-#, no-c-format
-msgid "Table:"
-msgstr "表："
+#: editor/formfile.cpp:154
+msgid "The file already exists. Do you wish to overwrite it?"
+msgstr "文件已经存在。您想要覆盖吗？"
 
-#. i18n: file ./editor/tableeditor.ui line 348
-#: rc.cpp:1190 rc.cpp:1223
-#, no-c-format
-msgid "&Label:"
-msgstr "标签(&L)："
+#: editor/formfile.cpp:155
+msgid "Overwrite File?"
+msgstr "覆盖文件吗？"
 
-#. i18n: file ./editor/tableeditor.ui line 359
-#: rc.cpp:1193 rc.cpp:1226
-#, no-c-format
-msgid "Pixmap:"
-msgstr "像素图："
+#: editor/formfile.cpp:184
+msgid "Dialog '%1' was modified.Do you want to save it?"
+msgstr "对话框“%1”已修改。您是否想要保存？"
 
-#. i18n: file ./editor/tableeditor.ui line 370
-#: rc.cpp:1196
-#, no-c-format
-msgid "&Field:"
-msgstr "域(&F)："
+#: editor/formfile.cpp:185
+msgid "Save File?"
+msgstr "保存文件吗？"
 
-#. i18n: file ./editor/tableeditor.ui line 394
-#: rc.cpp:1199
-#, no-c-format
-msgid "<no table>"
+#: editor/formfile.cpp:244
+msgid "unnamed"
 msgstr ""
 
-#. i18n: file ./editor/tableeditor.ui line 406
-#: rc.cpp:1202
-#, no-c-format
-msgid "&Rows"
-msgstr "行(&R)"
+#: editor/actiondnd.cpp:294 editor/actiondnd.cpp:353
+msgid "Delete Toolbar"
+msgstr "删除工具栏"
 
-#. i18n: file ./editor/tableeditor.ui line 496
-#: rc.cpp:1217
-#, no-c-format
-msgid "&New Row"
-msgstr "新建行(&N)"
+#: editor/actiondnd.cpp:297 editor/actiondnd.cpp:383
+msgid "Delete Toolbar '%1'"
+msgstr "删除工具栏“%1”"
 
-#. i18n: file ./editor/tableeditor.ui line 504
-#: rc.cpp:1220
-#, no-c-format
-msgid "&Delete Row"
-msgstr "删除行(&D)"
+#: editor/actiondnd.cpp:348 editor/actiondnd.cpp:1022
+msgid "Delete Separator"
+msgstr "删除分隔符"
 
-#. i18n: file ./editor/choosewidget.ui line 16
-#: rc.cpp:1247
-#, no-c-format
-msgid "Choose Widget"
-msgstr "选择部件"
+#: editor/actiondnd.cpp:351 editor/actiondnd.cpp:1025
+msgid "Insert Separator"
+msgstr "插入分隔符"
 
-#. i18n: file ./editor/choosewidget.ui line 118
-#: rc.cpp:1256
-#, no-c-format
-msgid "Find:"
-msgstr "查找："
+#: editor/actiondnd.cpp:362 editor/actiondnd.cpp:422 editor/actiondnd.cpp:445
+msgid "Delete Action '%1' From Toolbar '%2'"
+msgstr "从工具栏“%2”删除动作“%1”"
 
-#. i18n: file ./editor/connectioneditor.ui line 35
-#: rc.cpp:1259
-#, no-c-format
-msgid "Edit Connections"
-msgstr "编辑连接"
+#: editor/actiondnd.cpp:377
+msgid "Add Separator to Toolbar '%1'"
+msgstr "向工具栏“%1”添加分隔符"
 
-#. i18n: file ./editor/connectioneditor.ui line 41
-#: rc.cpp:1262
-#, no-c-format
+#: editor/actiondnd.cpp:464 editor/actiondnd.cpp:545
+msgid "Add Action '%1' to Toolbar '%2'"
+msgstr "向工具栏“%2”填加动作“%1”"
+
+#: editor/actiondnd.cpp:538 editor/actiondnd.cpp:1159
+msgid "Insert/Move Action"
+msgstr "插入/移动动作"
+
+#: editor/actiondnd.cpp:539
 msgid ""
-"<b>Edit Connections</b>"
-"<p>Add and remove connections in the current form .</p>"
-"<p>Select a signal and a corresponding slot then press the <b>Connect</b>"
-"-button to create a connection.</p>"
-"<p>Select a connection from the list then press the <b>Disconnect</b>"
-"-button to delete the connection.</p>"
+"Action '%1' has already been added to this toolbar.\n"
+"An Action may only occur once in a given toolbar."
 msgstr ""
 
-#. i18n: file ./editor/connectioneditor.ui line 56
-#: rc.cpp:1265
-#, no-c-format
-msgid "Sender"
-msgstr "发送者"
+#: editor/actiondnd.cpp:673
+msgid "Add Widget '%1' to Toolbar '%2'"
+msgstr "向工具栏“%2”添加部件“%1”"
 
-#. i18n: file ./editor/connectioneditor.ui line 67
-#: rc.cpp:1268
-#, no-c-format
-msgid "Signal"
-msgstr "信号"
+#: editor/actiondnd.cpp:738
+msgid "Rename Item..."
+msgstr "重命名项目..."
 
-#. i18n: file ./editor/connectioneditor.ui line 78
-#: rc.cpp:1271
-#, no-c-format
-msgid "Receiver"
-msgstr "接受者"
+#: editor/actiondnd.cpp:742
+msgid "Delete Menu '%1'"
+msgstr "删除菜单“%1”"
 
-#. i18n: file ./editor/connectioneditor.ui line 89
-#: rc.cpp:1274
-#, no-c-format
-msgid "Slot"
+#: editor/actiondnd.cpp:755
+msgid "Rename Menu Item"
+msgstr "重命名菜单项"
+
+#: editor/actiondnd.cpp:755
+msgid "Menu text:"
+msgstr "菜单文字："
+
+#: editor/actiondnd.cpp:759
+msgid "Rename Menu '%1' to '%2'"
+msgstr "将菜单“%1”重命名为“%2”"
+
+#: editor/actiondnd.cpp:883
+msgid "Move Menu '%1'"
+msgstr "移动菜单“%1”"
+
+#: editor/actiondnd.cpp:1032 editor/actiondnd.cpp:1071
+msgid "Delete Action '%1' From Popup Menu '%2'"
 msgstr ""
 
-#. i18n: file ./editor/connectioneditor.ui line 111
-#: rc.cpp:1277
-#, no-c-format
-msgid "Displays the connections between the sender and the receiver."
+#: editor/actiondnd.cpp:1042
+msgid "Add Separator to Popup Menu '%1'"
 msgstr ""
 
-#. i18n: file ./editor/connectioneditor.ui line 119
-#: rc.cpp:1280
-#, no-c-format
-msgid ""
-"<b>A list of slots for the receiver.</b>"
-"<p>The slots that are displayed are only those which have arguments that "
-"correspond with the arguments of the signal that is currently selected in the "
-"Signal-list.</b>"
+#: editor/actiondnd.cpp:1084 editor/actiondnd.cpp:1166
+msgid "Add Action '%1' to Popup Menu '%2'"
 msgstr ""
 
-#. i18n: file ./editor/connectioneditor.ui line 127
-#: rc.cpp:1283
-#, no-c-format
-msgid "Displays the list of signals that the widget emits."
+#: editor/actiondnd.cpp:1160
+msgid ""
+"Action '%1' has already been added to this menu.\n"
+"An Action may only occur once in a given menu."
 msgstr ""
 
-#. i18n: file ./editor/connectioneditor.ui line 143
-#: rc.cpp:1286
-#, no-c-format
-msgid "Si&gnals:"
-msgstr "信号(&G)："
+#: editor/formwindow.cpp:302
+msgid "&Horizontal"
+msgstr "水平(&H)"
 
-#. i18n: file ./editor/connectioneditor.ui line 183
-#: rc.cpp:1289
-#, no-c-format
-msgid "&Slots:"
+#: editor/formwindow.cpp:303
+msgid "&Vertical"
+msgstr "垂直(&V)"
+
+#: editor/formwindow.cpp:317 editor/formwindow.cpp:425
+msgid ""
+"<b>A %1 (custom widget)</b> "
+"<p>Click <b>Edit Custom Widgets...</b> in the <b>Tools|Custom</b> "
+"menu to add and change custom widgets. You can add properties as well as "
+"signals and slots to integrate custom widgets into <i>TQt Designer</i>"
+", and provide a pixmap which will be used to represent the widget on the "
+"form.</p>"
 msgstr ""
 
-#. i18n: file ./editor/connectioneditor.ui line 217
-#: rc.cpp:1292
-#, no-c-format
-msgid "&Disconnect"
-msgstr "断开连接(&D)"
+#: editor/formwindow.cpp:324 editor/formwindow.cpp:432
+msgid "A %1 (custom widget)"
+msgstr "%1(自定义部件)"
 
-#. i18n: file ./editor/connectioneditor.ui line 220
-#: rc.cpp:1295
-#, no-c-format
-msgid "Alt+D"
+#: editor/formwindow.cpp:331 editor/formwindow.cpp:439
+#, fuzzy
+msgid "<b>A %1</b><p>%2</p>"
+msgstr "<b>%1</b>"
+
+#: editor/formwindow.cpp:384
+msgid "Reparent Widgets"
 msgstr ""
 
-#. i18n: file ./editor/connectioneditor.ui line 226
-#: rc.cpp:1298
-#, no-c-format
-msgid "Remove the selected connection"
-msgstr "删除选中的连接"
+#: editor/formwindow.cpp:390 editor/formwindow.cpp:396
+#: editor/formwindow.cpp:407
+#, c-format
+msgid "Insert %1"
+msgstr "插入 %1"
 
-#. i18n: file ./editor/connectioneditor.ui line 229
-#: rc.cpp:1301
-#, no-c-format
-msgid "Remove the selected connection."
-msgstr "删除选中的连接。"
+#: editor/formwindow.cpp:597
+msgid "Connect '%1' with..."
+msgstr ""
 
-#. i18n: file ./editor/connectioneditor.ui line 257
-#: rc.cpp:1307
-#, no-c-format
-msgid "Alt+O"
+#: editor/formwindow.cpp:620 editor/formwindow.cpp:676
+msgid "Change Tab Order"
+msgstr "更改 Tab 顺序"
+
+#: editor/formwindow.cpp:806
+msgid "Connect '%1' to '%2'"
 msgstr ""
 
-#. i18n: file ./editor/connectioneditor.ui line 277
-#: rc.cpp:1316
-#, no-c-format
-msgid "Alt+C"
+#: editor/formwindow.cpp:868 editor/formwindow.cpp:957
+msgid ""
+"You tried to insert a widget into the layout Container Widget '%1'.\n"
+"This is not possible. In order to insert the widget, the layout of '%1'\n"
+"must first be broken.\n"
+"Break the layout or cancel the operation?"
 msgstr ""
 
-#. i18n: file ./editor/connectioneditor.ui line 318
-#: rc.cpp:1322
-#, no-c-format
-msgid "Connec&tions:"
-msgstr "连接(&T)："
+#: editor/formwindow.cpp:874 editor/formwindow.cpp:964
+msgid "Inserting Widget"
+msgstr "插入部件"
 
-#. i18n: file ./editor/connectioneditor.ui line 346
-#: rc.cpp:1325
-#, no-c-format
-msgid "Co&nnect"
-msgstr "连接(&N)"
+#: editor/formwindow.cpp:875 editor/formwindow.cpp:965
+msgid "&Break Layout"
+msgstr "打乱布局(&B)"
 
-#. i18n: file ./editor/connectioneditor.ui line 349
-#: rc.cpp:1328
-#, no-c-format
-msgid "Alt+N"
+#: editor/formwindow.cpp:1224 editor/formwindow.cpp:1267
+msgid "Use Size Hint"
 msgstr ""
 
-#. i18n: file ./editor/connectioneditor.ui line 355
-#: rc.cpp:1331
-#, no-c-format
-msgid "Create connection"
-msgstr "创建连接"
+#: editor/formwindow.cpp:1443 editor/formwindow.cpp:1457
+#: editor/formwindow.cpp:1465 editor/mainwindowactions.cpp:204
+msgid "Adjust Size"
+msgstr "调整大小"
 
-#. i18n: file ./editor/connectioneditor.ui line 358
-#: rc.cpp:1334
-#, no-c-format
-msgid "Create a connection between a signal and a slot."
+#: editor/formwindow.cpp:1661
+msgid "Click widgets to change the tab order..."
 msgstr ""
 
-#. i18n: file ./editor/templates/Tab_Dialog.ui line 37
-#: rc.cpp:1337 rc.cpp:1340 rc.cpp:1382 rc.cpp:1385
-#, no-c-format
-msgid "Tab"
-msgstr "Tab"
-
-#. i18n: file ./editor/templates/Tab_Dialog.ui line 71
-#: rc.cpp:1346 rc.cpp:1364 rc.cpp:1370 rc.cpp:1391
-#, no-c-format
-msgid "F1"
-msgstr "F1"
+#: editor/formwindow.cpp:1670
+msgid "Drag a line to create a connection..."
+msgstr ""
 
-#: widget/parser.cpp:116
-msgid "Invalid character: '%1'"
-msgstr "无效字符：“%1”"
+#: editor/formwindow.cpp:1676
+msgid "Click on the form to insert a %1..."
+msgstr ""
 
-#: widget/parser.cpp:192
-msgid "Constant value expected"
+#: editor/formwindow.cpp:1784
+msgid "Lower"
 msgstr ""
 
-#: widget/parser.cpp:223
-#, fuzzy
-msgid "'%1' (%2) is not a widget"
-msgstr "“%1”不是部件"
+#: editor/formwindow.cpp:1847
+msgid "Accelerator '%1' is used %2 times."
+msgstr ""
 
-#: widget/parser.cpp:235 widget/parser.cpp:520
-msgid "'%1' is not a function"
-msgstr "“%1”不是函数"
+#: editor/formwindow.cpp:1848 editor/formwindow.cpp:1860
+#: editor/mainwindowactions.cpp:152
+msgid "Check Accelerators"
+msgstr "检查加速键"
 
-#: widget/parser.cpp:246
-msgid "Expected value"
-msgstr "期待值"
+#: editor/formwindow.cpp:1848
+msgid "&Select"
+msgstr "选择(&S)"
 
-#: widget/parser.cpp:271 widget/parser.cpp:281
-msgid "Divide by zero"
+#: editor/formwindow.cpp:1859
+msgid "No accelerator is used more than once."
 msgstr ""
 
-#: widget/parser.cpp:426 widget/parser.cpp:428 widget/parser.cpp:434
-msgid "in function '%1': %2"
+#: editor/formwindow.cpp:1870
+msgid "Raise"
 msgstr ""
 
-#: widget/parser.cpp:426
+#: editor/formwindow.cpp:1909 editor/mainwindowactions.cpp:210
 #, fuzzy
-msgid "too few parameters"
-msgstr "插入分隔符"
+msgid "Lay OutQt::Horizontally"
+msgstr "水平排布"
 
-#: widget/parser.cpp:428
+#: editor/formwindow.cpp:1919 editor/mainwindowactions.cpp:216
 #, fuzzy
-msgid "too many parameters"
-msgstr "插入分隔符"
+msgid "Lay OutQt::Vertically"
+msgstr "垂直排布"
 
-#: widget/parser.cpp:474
-msgid "in widget function '%1.%2': %3"
-msgstr ""
+#: editor/formwindow.cpp:1930
+#, fuzzy
+msgid "Lay OutQt::Horizontally (in splitter)"
+msgstr "水平排布"
 
-#: widget/parser.cpp:517
-msgid "'%1' is not a widget"
-msgstr "“%1”不是部件"
+#: editor/formwindow.cpp:1941
+#, fuzzy
+msgid "Lay OutQt::Vertically (in splitter)"
+msgstr "垂直排布"
 
-#: widget/parser.cpp:522
-msgid "Unexpected symbol after variable '%1'"
+#: editor/formwindow.cpp:1954 editor/mainwindowactions.cpp:222
+msgid "Lay Out in a Grid"
 msgstr ""
 
-#: widget/parser.cpp:741
-msgid ""
-"Expected '%1'"
-"<br>"
-"<br>Possible cause of the error is having a variable with the same name as a "
-"widget"
-msgstr ""
+#: editor/formwindow.cpp:1975
+#, fuzzy
+msgid "Lay Out ChildrenQt::Horizontally"
+msgstr "水平排布"
 
-#: widget/parser.cpp:743
-msgid "Expected '%1'"
-msgstr "期待“%1”"
+#: editor/formwindow.cpp:1996
+#, fuzzy
+msgid "Lay Out ChildrenQt::Vertically"
+msgstr "垂直排布"
 
-#: widget/parser.cpp:757 widget/parser.cpp:770
-msgid "Expected variable"
-msgstr "期待变量"
+#: editor/formwindow.cpp:2020
+msgid "Lay Out Children in a Grid"
+msgstr ""
 
-#: widget/myprocess.cpp:94
-msgid "<qt>Failed to start shell process<br><b>%1</b></qt>"
-msgstr "<qt>启动 shell 进程失败<br><b>%1</b></qt>"
+#: editor/formwindow.cpp:2054 editor/formwindow.cpp:2073
+#: editor/mainwindowactions.cpp:242
+msgid "Break Layout"
+msgstr "打乱布局"
 
-#: widget/expression.cpp:199 widget/expression.cpp:208
-#, fuzzy
-msgid "error"
-msgstr "粘贴错误"
+#: editor/formwindow.cpp:2135 editor/mainwindowactions.cpp:1075
+msgid "Edit connections..."
+msgstr "编辑连接..."
 
-#: widget/kommanderfunctions.cpp:120
-msgid "Unterminated @execBegin ... @execEnd block."
+#: editor/mainwindowactions.cpp:101
+msgid "Undoes the last action"
 msgstr ""
 
-#: widget/kommanderfunctions.cpp:138 widget/kommanderfunctions.cpp:164
-msgid "Unterminated @forEach ... @end block."
+#: editor/mainwindowactions.cpp:107
+msgid "Redoes the last undone operation"
 msgstr ""
 
-#: widget/kommanderfunctions.cpp:201
-msgid "Unterminated @if ... @endif block."
+#: editor/mainwindowactions.cpp:112
+msgid "Cuts the selected widgets and puts them on the clipboard"
 msgstr ""
 
-#: widget/kommanderfunctions.cpp:221
-msgid "Unterminated @switch ... @end block."
+#: editor/mainwindowactions.cpp:117
+msgid "Copies the selected widgets to the clipboard"
 msgstr ""
 
-#: widget/kommanderfunctions.cpp:320
-#, c-format
-msgid "Unknown widget: @%1."
-msgstr "未知部件：@%1。"
-
-#: widget/kommanderfunctions.cpp:338
-msgid "Infinite loop: @%1 called inside @%2."
+#: editor/mainwindowactions.cpp:122
+msgid "Pastes the clipboard's contents"
 msgstr ""
 
-#: widget/kommanderfunctions.cpp:344
-msgid "Script for @%1 is empty."
+#: editor/mainwindowactions.cpp:128
+msgid "Deletes the selected widgets"
 msgstr ""
 
-#: widget/kommanderwidget.cpp:119 widgets/scriptobject.cpp:99
-msgid "Invalid state for associated text."
-msgstr ""
+#: editor/mainwindowactions.cpp:133
+msgid "Selects all widgets"
+msgstr "选中全部部件"
 
-#: widget/kommanderwidget.cpp:134
-msgid ""
-"Line %1: %2.\n"
-msgstr ""
-"行 %1：%2\n"
+#: editor/mainwindowactions.cpp:136
+msgid "Bring to Front"
+msgstr "提到最前"
 
-#: widget/kommanderwidget.cpp:244
-msgid "Unknown special: '%1'."
+#: editor/mainwindowactions.cpp:138
+msgid "Raises the selected widgets"
 msgstr ""
 
-#: widget/kommanderwidget.cpp:274
-msgid "Unmatched parenthesis in DCOP call '%1'."
-msgstr ""
+#: editor/mainwindowactions.cpp:141
+msgid "Send to Back"
+msgstr "推到最后"
 
-#: widget/kommanderwidget.cpp:280
-msgid "Incorrect arguments in DCOP call '%1'."
+#: editor/mainwindowactions.cpp:143 editor/mainwindowactions.cpp:144
+msgid "Lowers the selected widgets"
 msgstr ""
 
-#: widget/kommanderwidget.cpp:310
+#: editor/mainwindowactions.cpp:147
 #, fuzzy
-msgid "Tried to perform DCOP query, but failed."
-msgstr "试图执行 DCOP 查询，但失败了"
-
-#: widget/kommanderwidget.cpp:341
-msgid "DCOP return type %1 is not yet implemented."
-msgstr "DCOP 返回类型 %1 尚未实现。"
+msgid "Find in Form..."
+msgstr "打开表单(&O)..."
 
-#: widget/kommanderwidget.cpp:406
-msgid "Continue && Ignore Next Errors"
+#: editor/mainwindowactions.cpp:148
+msgid "Search for a text in the whole form."
 msgstr ""
 
-#: widget/kommanderwidget.cpp:408
-msgid "<qt>Error in widget <b>%1</b>:<p><i>%2</i></qt>"
-msgstr ""
+#: editor/mainwindowactions.cpp:154
+msgid "Checks if the accelerators used in the form are unique"
+msgstr "检查表单中所用的加速键是否唯一"
 
-#: widget/kommanderwidget.cpp:427
-msgid ""
-"Error in widget %1:\n"
-"  %2\n"
+#: editor/mainwindowactions.cpp:158
+msgid "Connections"
+msgstr "连接"
+
+#: editor/mainwindowactions.cpp:161
+msgid "Opens a dialog for editing connections"
+msgstr "打开对话框以编辑连接"
+
+#: editor/mainwindowactions.cpp:165
+msgid "Form Settings..."
+msgstr "表单设置..."
+
+#: editor/mainwindowactions.cpp:167
+msgid "Opens a dialog to change the form's settings"
+msgstr "打开对话框以更改表单设置"
+
+#: editor/mainwindowactions.cpp:173
+#, c-format
+msgid "<b>The Edit toolbar</b>%1"
+msgstr "<b>编辑工具栏</b>%1"
+
+#: editor/mainwindowactions.cpp:206
+msgid "Adjusts the size of the selected widget"
 msgstr ""
-"部件 %1 中出错：\n"
-"  %2\n"
 
-#: widget/kommanderwidget.cpp:582
-msgid "Unmatched parenthesis after '%1'."
+#: editor/mainwindowactions.cpp:212
+msgid "Lays out the selected widgets horizontally"
 msgstr ""
 
-#: widget/kommanderwidget.cpp:591
-msgid "Unmatched quotes in argument of '%1'."
+#: editor/mainwindowactions.cpp:218
+msgid "Lays out the selected widgets vertically"
 msgstr ""
 
-#: widget/kommanderwidget.cpp:593
-msgid "Unknown function group: '%1'."
+#: editor/mainwindowactions.cpp:224
+msgid "Lays out the selected widgets in a grid"
 msgstr ""
 
-#: widget/kommanderwidget.cpp:595
-msgid "Unknown function: '%1' in group '%2'."
+#: editor/mainwindowactions.cpp:228
+#, fuzzy
+msgid "Lay OutQt::Horizontally in Splitter"
+msgstr "水平排布"
+
+#: editor/mainwindowactions.cpp:231
+msgid "Lays out the selected widgets horizontally in a splitter"
 msgstr ""
 
-#: widget/kommanderwidget.cpp:597
-msgid "Unknown widget function: '%1'."
+#: editor/mainwindowactions.cpp:235
+#, fuzzy
+msgid "Lay OutQt::Vertically in Splitter"
+msgstr "垂直排布"
+
+#: editor/mainwindowactions.cpp:238
+msgid "Lays out the selected widgets vertically in a splitter"
 msgstr ""
 
-#: widget/kommanderwidget.cpp:599
+#: editor/mainwindowactions.cpp:244
+msgid "Breaks the selected layout"
+msgstr "打乱选中的布局"
+
+#: editor/mainwindowactions.cpp:251
+msgid "Add "
+msgstr "添加"
+
+#: editor/mainwindowactions.cpp:252 editor/mainwindowactions.cpp:366
+#, c-format
+msgid "Insert a %1"
+msgstr "插入一个%1"
+
+#: editor/mainwindowactions.cpp:253
 msgid ""
-"Not enough arguments for '%1' (%2 instead of %3)."
-"<p>Correct syntax is: %4"
+"<b>A %1</b>"
+"<p>%2</p>"
+"<p>Click to insert a single %3,or double click to keep the tool selected."
 msgstr ""
 
-#: widget/kommanderwidget.cpp:604
-msgid "Too many arguments for '%1' (%2 instead of %3).<p>Correct syntax is: %4"
-msgstr ""
+#: editor/mainwindowactions.cpp:258
+#, c-format
+msgid "<b>The Layout toolbar</b>%1"
+msgstr "<b>布局工具栏</b>%1"
 
-#: executor/main.cpp:45
-msgid ""
-"Executor is a component of the Kommander dialog system that executes .kmdr "
-"files given as arguments or via stdin"
-msgstr "执行器是 Kommander 对话框系统的一个组件，可执行由参数或标准输入给出的 .kmdr 文件"
+#: editor/mainwindowactions.cpp:271
+msgid "&Layout"
+msgstr "布局(&L)"
 
-#: executor/main.cpp:50
-msgid "Read dialog from standard input"
-msgstr "无法从标准输入读取对话框"
+#: editor/mainwindowactions.cpp:286
+msgid "Pointer"
+msgstr "指针"
 
-#: executor/main.cpp:51
-msgid "Use given catalog for translation"
+#: editor/mainwindowactions.cpp:289
+msgid "Selects the pointer tool"
+msgstr "选择指针工具"
+
+#: editor/mainwindowactions.cpp:293
+msgid "Connect Signal/Slots"
 msgstr ""
 
-#: executor/main.cpp:58
-msgid "Kommander Executor"
-msgstr "Kommander 执行器"
+#: editor/mainwindowactions.cpp:296
+msgid "Selects the connection tool"
+msgstr "选择连接工具"
 
-#: executor/main.cpp:87
-msgid ""
-"Error: no dialog given. Use --stdin option to read dialog from standard input.\n"
-msgstr ""
+#: editor/mainwindowactions.cpp:300
+msgid "Tab Order"
+msgstr "Tab 顺序"
 
-#: executor/instance.cpp:115
-#, fuzzy
-msgid "<qt>Unable to create dialog.</qt>"
-msgstr "<qt>无法从文件<br><b>%1</b><br>创建对话框</qt>"
+#: editor/mainwindowactions.cpp:303
+msgid "Selects the tab order tool"
+msgstr "选择 Tab 顺序工具"
 
-#: executor/instance.cpp:187
-msgid "<qt>Kommander file<br><b>%1</b><br>does not exist.</qt>"
-msgstr "<qt>Kommander 文件<br><b>%1</b><br>不存在。</qt>"
+#: editor/mainwindowactions.cpp:309
+#, c-format
+msgid "<b>The Tools toolbar</b>%1"
+msgstr "<b>工具工具栏</b>%1"
 
-#: executor/instance.cpp:195
-msgid ""
-"<qt>This file does not have a <b>.kmdr</b> extension. As a security precaution "
-"Kommander will only run Kommander scripts with a clear identity.</qt>"
-msgstr ""
+#: editor/mainwindowactions.cpp:311
+msgid "Tools"
+msgstr "工具"
 
-#: executor/instance.cpp:197
-msgid "Wrong Extension"
-msgstr ""
+#: editor/mainwindowactions.cpp:333
+msgid "<b>The %1</b>%2"
+msgstr "<b>%1</b>%2"
 
-#: executor/instance.cpp:214
+#: editor/mainwindowactions.cpp:334
+#, c-format
 msgid ""
-"<qt>This dialog is running from your <i>/tmp</i> directory.  This may mean that "
-"it was run from a KMail attachment or from a webpage. "
-"<p>Any script contained in this dialog will have write access to all of your "
-"home directory; <b>running such dialogs may be dangerous: </b>"
-"<p>are you sure you want to continue?</qt>"
+" Click on a button to insert a single widget, or double click to insert "
+"multiple %1."
 msgstr ""
 
-#: executor/instance.cpp:218 executor/instance.cpp:223
-msgid "Run Nevertheless"
-msgstr ""
+#: editor/mainwindowactions.cpp:338
+msgid "<b>The %1 Widgets</b>%2"
+msgstr "<b>%1 部件</b>%2"
 
-#: executor/instance.cpp:223
+#: editor/mainwindowactions.cpp:339
 msgid ""
-"<qt>The Kommander file <i>%1</i> does not have the <b>executable attribute</b> "
-"set and could possibly contain dangerous exploits."
-"<p>If you trust the scripting (viewable in kmdr-editor) in this program, make "
-"it executable to get rid of this warning."
-"<p>Are you sure you want to continue?</qt>"
+" Click on a button to insert a single %1 widget, or double click to insert "
+"multiple widgets."
 msgstr ""
 
-#: executor/register.cpp:66
-msgid "Return EOL-separated list of all values in the array."
-msgstr ""
+#: editor/mainwindowactions.cpp:368
+msgid "<b>A %1</b>"
+msgstr "<b>%1</b>"
 
-#: executor/register.cpp:67
-msgid "Return EOL-separated list of all keys in the array."
+#: editor/mainwindowactions.cpp:371
+msgid "<p>Double click on this tool to keep it selected.</p>"
 msgstr ""
 
-#: executor/register.cpp:68
-msgid "Remove all elements from the array."
-msgstr ""
+#: editor/mainwindowactions.cpp:402
+msgid "Editor"
+msgstr "编辑器"
 
-#: executor/register.cpp:69
-msgid "Return number of elements in the array."
-msgstr ""
+#: editor/mainwindowactions.cpp:412
+#, c-format
+msgid "<b>The File toolbar</b>%1"
+msgstr "<b>文件工具栏<b>%1"
 
-#: executor/register.cpp:70
-msgid "Return the value associated with given key."
-msgstr ""
+#: editor/mainwindowactions.cpp:418
+msgid "Creates a new dialog"
+msgstr "创建新对话框"
 
-#: executor/register.cpp:71
-msgid "Remove element with given key from the array."
-msgstr ""
+#: editor/mainwindowactions.cpp:424
+msgid "Opens an existing dialog"
+msgstr "打开已有对话框"
 
-#: executor/register.cpp:72
-msgid "Add element with given key and value to the array"
-msgstr ""
+#: editor/mainwindowactions.cpp:430
+msgid "Opens recently open file"
+msgstr "最近打开的文件"
 
-#: executor/register.cpp:73
-msgid ""
-"Add all elements in the string to the array. String should have <i>key>"
-"\\tvalue\\n</i> format."
-msgstr ""
+#: editor/mainwindowactions.cpp:435
+msgid "Closes the current dialog"
+msgstr "关闭当前对话框"
 
-#: executor/register.cpp:75
-msgid ""
-"Return all elements in the array in <i>key>\\tvalue\\n</i> format."
-msgstr ""
+#: editor/mainwindowactions.cpp:443
+msgid "Saves the current dialog"
+msgstr "保存当前对话框"
 
-#: executor/register.cpp:77
-msgid ""
-"Create an integer indexed array - starting from 0 - from a string. Use the "
-"separator character to split the string."
-msgstr ""
+#: editor/mainwindowactions.cpp:450
+msgid "Saves the current dialog with a new filename"
+msgstr "用新文件名保存当前对话框"
 
-#: executor/register.cpp:78
-msgid ""
-"Create a string from an integer indexed array. Concatenate the elements with "
-"the separator character."
-msgstr ""
+#: editor/mainwindowactions.cpp:455
+msgid "Save All"
+msgstr "全部保存"
 
-#: executor/register.cpp:79
-msgid ""
-"Remove the element specified by the key from an indexed array and reindex the "
-"array."
-msgstr ""
+#: editor/mainwindowactions.cpp:457
+msgid "Saves all open dialogs"
+msgstr "保存全部打开的对话框"
 
-#: executor/register.cpp:82
-msgid "Return number of chars in the string."
+#: editor/mainwindowactions.cpp:465
+msgid "Quits the application and prompts to save any changed dialogs"
 msgstr ""
 
-#: executor/register.cpp:83
-msgid "Check if the string contains given substring."
-msgstr ""
+#: editor/mainwindowactions.cpp:474
+msgid "&Run"
+msgstr "运行(&R)"
 
-#: executor/register.cpp:84
-msgid "Return position of a substring in the string, or -1 if it isn't found."
-msgstr ""
+#: editor/mainwindowactions.cpp:476
+msgid "Run Dialog"
+msgstr "运行对话框"
 
-#: executor/register.cpp:86
-msgid "Return first n chars of the string."
-msgstr ""
+#: editor/mainwindowactions.cpp:478
+msgid "Executes dialog"
+msgstr "执行对话框"
 
-#: executor/register.cpp:87
-msgid "Return last n chars of the string."
-msgstr ""
+#: editor/mainwindowactions.cpp:485
+#, fuzzy
+msgid "Run Dialog K4"
+msgstr "运行对话框"
 
-#: executor/register.cpp:88
-msgid "Return substring of the string, starting from given position."
-msgstr ""
+#: editor/mainwindowactions.cpp:487
+#, fuzzy
+msgid "Executes dialog in KDE4"
+msgstr "执行对话框"
 
-#: executor/register.cpp:90
-msgid "Replace all occurencies of given substring."
-msgstr ""
+#: editor/mainwindowactions.cpp:500
+msgid "Tile"
+msgstr "平铺"
 
-#: executor/register.cpp:91
-msgid "Replace all occurencies of given substring with given replacement."
+#: editor/mainwindowactions.cpp:502
+msgid "Tiles the windows so that they are all visible"
 msgstr ""
 
-#: executor/register.cpp:93
-msgid "Convert the string to uppercase."
+#: editor/mainwindowactions.cpp:505 editor/mainwindowactions.cpp:510
+msgid "Cascade"
+msgstr "层叠"
+
+#: editor/mainwindowactions.cpp:507
+msgid "Cascades the windows so that all their title bars are visible"
 msgstr ""
 
-#: executor/register.cpp:94
-msgid "Convert the string to lowercase."
+#: editor/mainwindowactions.cpp:512
+msgid "Closes the active window"
+msgstr "关闭当前窗口"
+
+#: editor/mainwindowactions.cpp:515
+msgid "Close All"
+msgstr "全部关闭"
+
+#: editor/mainwindowactions.cpp:517
+msgid "Closes all form windows"
+msgstr "关闭全部表单窗口"
+
+#: editor/mainwindowactions.cpp:520
+msgid "Next"
+msgstr "下一个"
+
+#: editor/mainwindowactions.cpp:522
+msgid "Activates the next window"
+msgstr "激活下一个窗口"
+
+#: editor/mainwindowactions.cpp:525
+msgid "Previous"
+msgstr "上一个"
+
+#: editor/mainwindowactions.cpp:527
+msgid "Activates the previous window"
+msgstr "激活上一个窗口"
+
+#: editor/mainwindowactions.cpp:531
+msgid "&Window"
+msgstr "窗口(&W)"
+
+#: editor/mainwindowactions.cpp:543
+msgid "Vie&ws"
+msgstr "视图(&W)"
+
+#: editor/mainwindowactions.cpp:544
+msgid "Tool&bars"
+msgstr "工具栏(&B)"
+
+#: editor/mainwindowactions.cpp:580
+msgid "Opens a dialog to change shortcuts"
+msgstr "打开对话框以更改快捷键"
+
+#: editor/mainwindowactions.cpp:583
+#, fuzzy
+msgid "Configure &Plugins..."
+msgstr "配置插件(&P)..."
+
+#: editor/mainwindowactions.cpp:585
+msgid "Opens a dialog to configure plugins"
+msgstr "打开对话框以配置插件"
+
+#: editor/mainwindowactions.cpp:588
+#, fuzzy
+msgid "&Configure Editor..."
+msgstr "配置插件(&P)..."
+
+#: editor/mainwindowactions.cpp:590
+msgid "Configure various aspects of this editor."
 msgstr ""
 
-#: executor/register.cpp:95
+#: editor/mainwindowactions.cpp:594
+msgid "Opens a dialog to change preferences"
+msgstr "打开对话框以更改首选项"
+
+#: editor/mainwindowactions.cpp:610
+msgid "Create a new dialog..."
+msgstr "创建新对话框..."
+
+#: editor/mainwindowactions.cpp:633
+msgid "Open a file..."
+msgstr "打开文件..."
+
+#: editor/mainwindowactions.cpp:638
+msgid "Open Files"
+msgstr "打开文件"
+
+#: editor/mainwindowactions.cpp:674
+msgid "Reading file '%1'..."
+msgstr "正在读取文件“%1”..."
+
+#: editor/mainwindowactions.cpp:687
+msgid "Loaded file '%1'"
+msgstr "已装入文件“%1”"
+
+#: editor/mainwindowactions.cpp:693 editor/mainwindowactions.cpp:694
+msgid "Could not load file '%1'"
+msgstr "无法装入文件“%1”"
+
+#: editor/mainwindowactions.cpp:694
+msgid "Load File"
+msgstr "装入文件"
+
+#: editor/mainwindowactions.cpp:729
+msgid "Enter a filename..."
+msgstr "输入文件名..."
+
+#: editor/mainwindowactions.cpp:757
+#, fuzzy
+msgid "TQt Designer is crashing. Attempting to save files..."
+msgstr "Qt 设计器已崩溃。正在试图保存文件..."
+
+#: editor/mainwindowactions.cpp:794 editor/mainwindowactions.cpp:857
+msgid "NewTemplate"
+msgstr "新模板"
+
+#: editor/mainwindowactions.cpp:806 editor/mainwindowactions.cpp:835
+msgid "Could not create the template"
+msgstr "无法创建模板"
+
+#: editor/mainwindowactions.cpp:909
 msgid ""
-"Compare two strings. Return 0 if they are equal, -1 if the first one is lower, "
-"1 if the first one is higher"
+"Cannot paste widgets. Designer could not find a container\n"
+"to paste into which does not contain a layout. Break the layout\n"
+"of the container you want to paste into and select this container\n"
+"and then paste again."
 msgstr ""
 
-#: executor/register.cpp:97
-msgid "Check if string is empty."
-msgstr ""
+#: editor/mainwindowactions.cpp:912
+msgid "Paste Error"
+msgstr "粘贴错误"
 
-#: executor/register.cpp:98
-msgid "Check if string is a valid number."
-msgstr ""
+#: editor/mainwindowactions.cpp:1094
+msgid "Edit the current form's settings..."
+msgstr "编辑当前表单的设置..."
 
-#: executor/register.cpp:101
-msgid "Return content of given file."
-msgstr ""
+#: editor/mainwindowactions.cpp:1102
+msgid "Edit preferences..."
+msgstr "编辑首选项..."
 
-#: executor/register.cpp:102
-msgid "Write given string to a file."
+#: editor/connectioneditorimpl.cpp:229
+msgid "Connect/Disconnect the signals and slots of '%1' and '%2'"
 msgstr ""
 
-#: executor/register.cpp:103
-msgid "Append given string to the end of a file."
+#: editor/connectioneditorimpl.cpp:237
+msgid "Remove Connections"
+msgstr "删除连接"
+
+#: editor/connectioneditorimpl.cpp:248
+msgid "Add Connections"
+msgstr "添加连接"
+
+#: editor/listvieweditorimpl.cpp:66
+msgid "Edit Items and Columns of '%1'"
+msgstr "编辑“%1”的项目和列"
+
+#: editor/listvieweditorimpl.cpp:225
+msgid "New Column"
+msgstr "新建列"
+
+#: editor/assoctexteditorimpl.cpp:143
+#, fuzzy
+msgid "&Highlighting"
+msgstr "高度"
+
+#: editor/assoctexteditorimpl.cpp:187
+#, fuzzy
+msgid "Edit text"
+msgstr "编辑文本"
+
+#: editor/assoctexteditorimpl.cpp:253
+msgid "Edit text - read only mode"
 msgstr ""
 
-#: widgets/popupmenu.cpp:56
-msgid ""
-"Insert an item into the popup menu. The executeWidget's execute method will be "
-"run when this item is selected. Returns the id of the inserted item. Use -1 for "
-"index to insert to the end. The icon is optional."
+#: editor/assoctexteditorimpl.cpp:271
+#, fuzzy
+msgid "Set the 'text association' of '%1'"
+msgstr "设置“%1”的“text”"
+
+#: editor/assoctexteditorimpl.cpp:281
+#, fuzzy
+msgid "Set the 'population text' of '%1'"
+msgstr "设置“%1”的“text”"
+
+#: editor/assoctexteditorimpl.cpp:430
+msgid "<qt>Cannot open file<br><b>%1</b></qt"
 msgstr ""
 
-#: widgets/popupmenu.cpp:57
-msgid ""
-"Insert a separator item into the popup menu. Use -1 for index to insert to the "
-"end."
+#: editor/main.cpp:31
+msgid "Kommander is a graphical editor of scripted dialogs."
+msgstr "Kommander 是脚本对话框的图形化编辑器。"
+
+#: editor/main.cpp:33
+#, fuzzy
+msgid "Based on TQt Designer, (C) 2000 Trolltech AS."
+msgstr "基于 Qt 设计师，(C) 2000 Trolltech AS。"
+
+#: editor/main.cpp:43
+msgid "Kommander"
+msgstr "Kommander"
+
+#: editor/main.cpp:46
+msgid "Project manager"
 msgstr ""
 
-#: widgets/popupmenu.cpp:58
+#: editor/main.cpp:71
+msgid "Kommander Dialog Editor"
+msgstr "Kommander 对话框编辑器"
+
+#: widgets/fontdialog.cpp:49
 msgid ""
-"Change an item specified by id in the popup menu. The executeWidget's execute "
-"method will be run when this item is selected."
+"Sets the default font for the dialog, by specifying the family, the size and "
+"other style options."
 msgstr ""
 
-#: widgets/popupmenu.cpp:59
-msgid "Enable the item specified by id in the popup menu."
+#: widgets/fontdialog.cpp:51
+msgid "Returns the font family."
 msgstr ""
 
-#: widgets/popupmenu.cpp:60
-msgid "Check if the item specified by id is enabled."
-msgstr ""
+#: widgets/fontdialog.cpp:53
+#, fuzzy
+msgid "Returns the font size in point."
+msgstr "输入新模板的名称"
 
-#: widgets/popupmenu.cpp:61
-msgid "Make the item specified by id visible."
-msgstr ""
+#: widgets/fontdialog.cpp:55
+#, fuzzy
+msgid "Returns true, if the font is bold."
+msgstr "输入新模板的名称"
 
-#: widgets/popupmenu.cpp:62
-msgid "Apply checked status for the item specified by id."
-msgstr ""
+#: widgets/fontdialog.cpp:57
+#, fuzzy
+msgid "Returns true, if the font is italic."
+msgstr "输入新模板的名称"
 
-#: widgets/popupmenu.cpp:63
-msgid "Check if the item specified by id is visible."
+#: widgets/textedit.cpp:56
+msgid "Set widget modified status."
 msgstr ""
 
-#: widgets/popupmenu.cpp:64
-msgid "Verify if the item specified by id is checked."
+#: widgets/textedit.cpp:57
+msgid ""
+"Select a block of text using the paragraph number and character index of the "
+"line. You can use the cursorPositionChanged(int, int) signal to get this data "
+"in real time into a script."
 msgstr ""
 
-#: widgets/popupmenu.cpp:65
+#: widgets/textedit.cpp:58
 msgid ""
-"Insert submenu widget into the popup menu. Use -1 for index to insert to the "
-"end. The icon is optional."
+"Search for text from the cursor or a specified position. You can specifiy case "
+"sensitive search and forward or backward."
 msgstr ""
 
-#: widgets/timer.cpp:63
-msgid "Set the timer timeout interval in ms."
-msgstr ""
+#: widgets/textedit.cpp:60
+#, fuzzy
+msgid "Get the number of paragraphs in the widget."
+msgstr "输入新模板的名称"
 
-#: widgets/treewidget.cpp:64
-msgid "Add column at end with column header"
+#: widgets/textedit.cpp:61
+msgid "Get the total length of all text."
 msgstr ""
 
-#: widgets/treewidget.cpp:65
-msgid "Set sorting for a column"
+#: widgets/textedit.cpp:63
+msgid "Get the length of the paragraph."
 msgstr ""
 
-#: widgets/treewidget.cpp:68
-msgid "Get the column caption for column index"
+#: widgets/textedit.cpp:64
+#, fuzzy
+msgid "Get the number of lines in the paragraph."
+msgstr "输入新模板的名称"
+
+#: widgets/textedit.cpp:65
+msgid "Use to set superscript."
 msgstr ""
 
-#: widgets/treewidget.cpp:69
-msgid "Set the pixel width for column index - use 0 to hide"
+#: widgets/textedit.cpp:66
+msgid "Use to revert from superscript to normal script."
 msgstr ""
 
-#: widgets/treewidget.cpp:70
-msgid "Set to <i>left</i>, <i>right</i> or <i>center</i>, case insensitive "
+#: widgets/textbrowser.cpp:45 widgets/textbrowser.cpp:46
+msgid "Set notify click to intercept clicks and handle links"
 msgstr ""
 
 #: widgets/toolbox.cpp:39
@@ -4816,42 +4993,118 @@ msgid ""
 "Returns the index of the widget, -1 if the widget is not part of the toolbox."
 msgstr ""
 
-#: widgets/tabwidget.cpp:48
-msgid "Sets an icon on the specified tab. Index is zero based."
+#: widgets/execbutton.cpp:62
+msgid "For use only when button is togle type."
 msgstr ""
 
-#: widgets/closebutton.cpp:116
-msgid "Failed to start shell process."
-msgstr "启动 shell 进程失败。"
+#: widgets/execbutton.cpp:63
+msgid "Associate a Kommander PopupMenu with this ExecButton."
+msgstr ""
 
-#: widgets/combobox.cpp:50
-msgid "Make the ComboBox expose it's list without mousing around."
+#: widgets/execbutton.cpp:64
+msgid "Set the text on the ExecButton."
 msgstr ""
 
-#: widgets/fontdialog.cpp:49
-msgid ""
-"Sets the default font for the dialog, by specifying the family, the size and "
-"other style options."
+#: widgets/treewidget.cpp:67
+msgid "Add column at end with column header"
 msgstr ""
 
-#: widgets/fontdialog.cpp:51
-msgid "Returns the font family."
+#: widgets/treewidget.cpp:68
+msgid "Set sorting for a column"
 msgstr ""
 
-#: widgets/fontdialog.cpp:53
+#: widgets/treewidget.cpp:71
+msgid "Get the column caption for column index"
+msgstr ""
+
+#: widgets/treewidget.cpp:72
+msgid "Set the pixel width for column index - use 0 to hide"
+msgstr ""
+
+#: widgets/treewidget.cpp:73
+msgid "Set to <i>left</i>, <i>right</i> or <i>center</i>, case insensitive "
+msgstr ""
+
+#: widgets/treewidget.cpp:74
+msgid "Get the count of top level items."
+msgstr ""
+
+#: widgets/treewidget.cpp:75
+msgid "Expand or collapse a node."
+msgstr ""
+
+#: widgets/treewidget.cpp:76
+msgid "See if node is open or closed."
+msgstr ""
+
+#: widgets/dialog.cpp:56
 #, fuzzy
-msgid "Returns the font size in point."
+msgid "The name of the widget having focus"
 msgstr "输入新模板的名称"
 
-#: widgets/fontdialog.cpp:55
+#: widgets/dialog.cpp:57
+msgid ""
+"Set a wait cursor. CAUTION: if set more than once an equal number of calls to "
+"restore must be made to clear it."
+msgstr ""
+
+#: widgets/dialog.cpp:58
+msgid "Restore normal curser. NOTE: must be called as many times as wait was."
+msgstr ""
+
+#: widgets/buttongroup.cpp:51
 #, fuzzy
-msgid "Returns true, if the font is bold."
+msgid "Returns the ID of the selected button."
 msgstr "输入新模板的名称"
 
-#: widgets/fontdialog.cpp:57
+#: widgets/tabwidget.cpp:55
+msgid "Sets an icon on the specified tab. Index is zero based."
+msgstr ""
+
+#: widgets/tabwidget.cpp:56
+msgid "Returns the tab label at the given index. Index is zero based."
+msgstr ""
+
+#: widgets/tabwidget.cpp:57
+msgid ""
+"Returns true if tab at specified index is enabled, otherwise returns false."
+msgstr ""
+
+#: widgets/tabwidget.cpp:58
+msgid "Sets the tab at the given index to enabled or disabled."
+msgstr ""
+
+#: widgets/tabwidget.cpp:59
+msgid "Show or hide the tabs on the tab widget."
+msgstr ""
+
+#: widgets/tabwidget.cpp:60
 #, fuzzy
-msgid "Returns true, if the font is italic."
-msgstr "输入新模板的名称"
+msgid "Set the current page by name."
+msgstr "保存当前对话框"
+
+#: widgets/tabwidget.cpp:61
+#, fuzzy
+msgid "Sets the tab tab label."
+msgstr "选择 Tab 顺序工具"
+
+#: widgets/closebutton.cpp:116
+msgid "Failed to start shell process."
+msgstr "启动 shell 进程失败。"
+
+#: widgets/progressbar.cpp:46
+#, fuzzy
+msgid "Sets the ProgresBar color"
+msgstr "选择 Tab 顺序工具"
+
+#: widgets/progressbar.cpp:47
+#, fuzzy
+msgid "Sets the ProgresBar text color"
+msgstr "选择 Tab 顺序工具"
+
+#: widgets/timer.cpp:63
+msgid "Set the timer timeout interval in ms."
+msgstr ""
 
 #: widgets/aboutdialog.cpp:59
 msgid ""
@@ -4890,65 +5143,122 @@ msgstr ""
 msgid "Returns the set version string."
 msgstr "输入新模板的名称"
 
-#: widgets/table.cpp:56
+#: widgets/table.cpp:58
 msgid ""
 "Sets a column to sort ascending or descending. Optionally can sort with rows "
 "intact for database use."
 msgstr ""
 
-#: widgets/table.cpp:57
+#: widgets/table.cpp:59
 msgid "Scrolls the table so the cell indicated is visible."
 msgstr ""
 
-#: widgets/table.cpp:58
+#: widgets/table.cpp:60
 msgid ""
 "Select cells using the upper left and lower right cell addresses<br /><b>"
-"Not guaranteed to have TDE4 compatiblility</b>"
+"Not guaranteed to have KDE4 compatiblility</b>"
 msgstr ""
 
-#: widgets/table.cpp:59
+#: widgets/table.cpp:61
 msgid "Select the row with the zero based index."
 msgstr ""
 
-#: widgets/table.cpp:60
+#: widgets/table.cpp:62
 msgid ""
 "Select the column with the zero based index.<br /><b>"
-"Not guaranteed to have TDE4 compatiblility</b>"
+"Not guaranteed to have KDE4 compatiblility</b>"
 msgstr ""
 
-#: widgets/table.cpp:61
+#: widgets/table.cpp:63
 msgid ""
 "Set the column read only using zero based index.<br /><b>"
-"Not guaranteed to have TDE4 compatiblility</b>"
+"Not guaranteed to have KDE4 compatiblility</b>"
 msgstr ""
 
-#: widgets/table.cpp:62
+#: widgets/table.cpp:64
 msgid ""
 "Set the row read only using zero based index.<br /><b>"
-"Not guaranteed to have TDE4 compatiblility</b>"
+"Not guaranteed to have KDE4 compatiblility</b>"
 msgstr ""
 
-#: widgets/table.cpp:63
+#: widgets/table.cpp:65
 #, fuzzy
 msgid "Returns the number of rows of the table"
 msgstr "输入新模板的名称"
 
-#: widgets/textedit.cpp:47
-msgid "see if widget has been modified."
+#: widgets/table.cpp:66
+#, fuzzy
+msgid "Returns the text of the header for the column index"
+msgstr "输入新模板的名称"
+
+#: widgets/table.cpp:67
+#, fuzzy
+msgid "Returns the text of the header for the row index"
+msgstr "输入新模板的名称"
+
+#: widgets/lineedit.cpp:45
+#, fuzzy
+msgid "Clear widget modified status."
+msgstr "清除编辑的文本"
+
+#: widgets/popupmenu.cpp:56
+msgid ""
+"Insert an item into the popup menu. The executeWidget's execute method will be "
+"run when this item is selected. Returns the id of the inserted item. Use -1 for "
+"index to insert to the end. The icon is optional."
 msgstr ""
 
-#: working/plugintemplate/widget.cpp:43
-msgid "Call function1 with two arguments, second is optional."
+#: widgets/popupmenu.cpp:57
+msgid ""
+"Insert a separator item into the popup menu. Use -1 for index to insert to the "
+"end."
 msgstr ""
 
-#: working/plugintemplate/widget.cpp:44
-msgid "Get a QString as a result of function2."
+#: widgets/popupmenu.cpp:58
+msgid ""
+"Change an item specified by id in the popup menu. The executeWidget's execute "
+"method will be run when this item is selected."
 msgstr ""
 
-#: working/plugintemplate/plugin.cpp:19
-#, fuzzy
-msgid "Kommander %{APPNAME} plugin."
-msgstr "添加 Kommander 插件"
+#: widgets/popupmenu.cpp:59
+msgid "Enable the item specified by id in the popup menu."
+msgstr ""
+
+#: widgets/popupmenu.cpp:60
+msgid "Check if the item specified by id is enabled."
+msgstr ""
+
+#: widgets/popupmenu.cpp:61
+msgid "Make the item specified by id visible."
+msgstr ""
+
+#: widgets/popupmenu.cpp:62
+msgid "Apply checked status for the item specified by id."
+msgstr ""
+
+#: widgets/popupmenu.cpp:63
+msgid "Check if the item specified by id is visible."
+msgstr ""
+
+#: widgets/popupmenu.cpp:64
+msgid "Verify if the item specified by id is checked."
+msgstr ""
+
+#: widgets/popupmenu.cpp:65
+msgid ""
+"Insert submenu widget into the popup menu. Use -1 for index to insert to the "
+"end. The icon is optional."
+msgstr ""
+
+#: widgets/combobox.cpp:50
+msgid "Make the ComboBox expose it's list without mousing around."
+msgstr ""
+
+#~ msgid "Shows an information dialog."
+#~ msgstr "显示信息对话框。"
+
+#~ msgid "Shows an error dialog."
+#~ msgstr "显示错误对话框。"
 
 #~ msgid "Text to be inserted"
 #~ msgstr "要插入的文本"
diff --git a/tde-i18n-zh_CN/messages/tdewebdev/kxsldbg.po b/tde-i18n-zh_CN/messages/tdewebdev/kxsldbg.po
index 283d70f6c5c..bb51bec1d7a 100644
--- a/tde-i18n-zh_CN/messages/tdewebdev/kxsldbg.po
+++ b/tde-i18n-zh_CN/messages/tdewebdev/kxsldbg.po
@@ -5,10 +5,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kxsldbg\n"
-"POT-Creation-Date: 2008-07-08 01:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2004-08-01 23:35+0800\n"
 "Last-Translator: Mai Hao Hui <mhh@ricetons.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,736 +26,880 @@ msgid ""
 "Your emails"
 msgstr "mhh@ricetons.com"
 
-#: main.cpp:9
-msgid "A TDE KPart Application for xsldbg, an XSLT debugger"
+#: xsldbgmain.cpp:51
+#, fuzzy
+msgid "A TDE console application for xsldbg, an XSLT debugger"
 msgstr "xsldbg 是一个 XSLT 调试器，是一个 TDE KPart 程序"
 
-#: main.cpp:14 xsldbgmain.cpp:97
-msgid "XSL script to run"
+#: xsldbgmain.cpp:57
+msgid "Start a shell"
 msgstr ""
 
-#: main.cpp:15 xsldbgmain.cpp:98
-msgid "XML data to be transformed"
+#: xsldbgmain.cpp:58
+msgid "Path to change into before loading files"
 msgstr ""
 
-#: main.cpp:16
-msgid "File to save results to"
+#: xsldbgmain.cpp:59
+msgid "Add a parameter named <name> and value <value> to XSL environment"
 msgstr ""
 
-#: main.cpp:22
-msgid "KXSLDbg"
+#: xsldbgmain.cpp:60
+msgid "Use ISO 639 language code specified; for example en_US"
 msgstr ""
 
-#: kxsldbg.cpp:64
-msgid "Could not find our part."
-msgstr "不能找到所需部件。"
-
-#: kxsldbg.cpp:164
-msgid "File: %1  Line: %2  Col: %3"
-msgstr "文件：%1  行：%2  列：%3"
-
-#: kxsldbgpart/xsldbglocallistitem.cpp:32
-#: kxsldbgpart/xsldbglocalvariablesimpl.cpp:71
-#, fuzzy
-msgid "Local"
-msgstr "本地"
-
-#: kxsldbgpart/xsldbglocallistitem.cpp:34
-#: kxsldbgpart/xsldbglocalvariablesimpl.cpp:73
-#, fuzzy
-msgid "Global"
-msgstr "全局"
-
-#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:83
-#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:92
-#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:115
-#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:120
-#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:143
-#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:148
-#: kxsldbgpart/xsldbgdebugger.cpp:297 kxsldbgpart/xsldbgdebugger.cpp:317
-#: kxsldbgpart/xsldbgdebugger.cpp:335 kxsldbgpart/xsldbgdebugger.cpp:355
-#: kxsldbgpart/xsldbgdebugger.cpp:375 kxsldbgpart/xsldbgdebugger.cpp:394
-msgid "Operation Failed"
-msgstr "操作失败"
-
-#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:84
-#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:116
-#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:144
-msgid "A line number was provided without a file name."
-msgstr "提供了一个没有文件名的行号。"
-
-#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:93
-msgid "No details provided or an invalid line number was supplied."
-msgstr "没有提供详细信息或者提供了一个无效的行号。"
-
-#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:121
-msgid "No details provided or an invalid line or ID was supplied."
-msgstr "没有提供详细信息或者提供了一个无效的行号或ID。"
+#: xsldbgmain.cpp:60
+msgid "Save to a given file. See output command documentation"
+msgstr ""
 
-#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:149
-msgid "No details provided."
-msgstr "没有提供详细信息。"
+#: xsldbgmain.cpp:61
+msgid "Show the version of libxml and libxslt used"
+msgstr ""
 
-#: kxsldbgpart/xsldbginspector.cpp:68
-msgid "Xsldbg Inspector"
-msgstr "Xsldbg 监视"
+#: xsldbgmain.cpp:62
+msgid "Show logs of what is happening"
+msgstr ""
 
-#: kxsldbgpart/xsldbginspector.cpp:77
-msgid "Breakpoints"
-msgstr "断点"
+#: xsldbgmain.cpp:63
+msgid "Display the time used"
+msgstr "显示已用的时间"
 
-#: kxsldbgpart/xsldbginspector.cpp:83
-msgid "Variables"
+#: xsldbgmain.cpp:64
+msgid "Run the transformation 20 times"
 msgstr ""
 
-#: kxsldbgpart/xsldbginspector.cpp:89
-msgid "CallStack"
-msgstr "堆栈"
+#: xsldbgmain.cpp:66
+msgid "Dump the tree of the result instead"
+msgstr "以转储结果树代替"
 
-#: kxsldbgpart/xsldbginspector.cpp:95
-msgid "Templates"
-msgstr "模板"
+#: xsldbgmain.cpp:68
+msgid "Disable the DTD loading phase"
+msgstr "禁用DTD载入阶段"
 
-#: kxsldbgpart/xsldbginspector.cpp:101
-msgid "Sources"
-msgstr "源文件"
+#: xsldbgmain.cpp:69
+msgid "Disable the output of the result"
+msgstr "禁用输出结果"
 
-#: kxsldbgpart/xsldbginspector.cpp:107
-msgid "Entities"
-msgstr "实体"
+#: xsldbgmain.cpp:70
+msgid "Increase the maximum depth"
+msgstr ""
 
-#: kxsldbgpart/xsldbginspector.cpp:126
-msgid "Apply changes to xsldbg after restarting execution"
-msgstr "重新开始执行后应用更新"
+#: xsldbgmain.cpp:73
+msgid "The input document is(are) an HTML file(s)"
+msgstr "输入文档是 HTML 文件"
 
-#: kxsldbgpart/xsldbginspector.cpp:133
-msgid "&Refresh"
-msgstr "刷新(&R)"
+#: xsldbgmain.cpp:77
+msgid "The input document is SGML docbook"
+msgstr "输入文档是 SGML docbook"
 
-#: kxsldbgpart/xsldbginspector.cpp:134
-msgid "Refresh values in inspectors from xsldbg"
-msgstr "刷新xsldbg监视窗口中的数值"
+#: xsldbgmain.cpp:80
+msgid "Disable the fetching DTDs or entities over network"
+msgstr "禁止从网络中获取 DTD 或实体定义"
 
-#: kxsldbgpart/libxsldbg/files.cpp:192 kxsldbgpart/libxsldbg/files.cpp:215
-msgid ""
-"Error: Unable to open terminal %1.\n"
-msgstr ""
+#: xsldbgmain.cpp:83
+msgid "Use the catalogs from $SGML_CATALOG_FILES"
+msgstr "使用来自 $SGML_CATALOGS_FILES 的目录"
 
-#: kxsldbgpart/libxsldbg/files.cpp:195
-msgid ""
-"Error: Did not previously open terminal.\n"
+#: xsldbgmain.cpp:87
+msgid "Disable XInclude processing on document input"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/files.cpp:497
-msgid ""
-"Error: The file name \"%1\" is too long.\n"
-msgstr ""
+#: xsldbgmain.cpp:90
+msgid "Print profiling informations"
+msgstr "打印配置文件信息"
 
-#: kxsldbgpart/libxsldbg/files.cpp:521
-msgid ""
-"Error: Unable to change to directory %1.\n"
+#: xsldbgmain.cpp:91
+msgid "Do not run gdb compatability mode and print less information"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/files.cpp:524
-msgid ""
-"Changed to directory %1.\n"
+#: xsldbgmain.cpp:92
+msgid "Detect and use encodings in the stylesheet"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/files.cpp:552
-msgid ""
-"Setting XML Data file name to %1.\n"
+#: xsldbgmain.cpp:93
+msgid "Treat command line input as encoded in UTF-8"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/files.cpp:564
-msgid ""
-"Setting stylesheet file name to %1.\n"
+#: xsldbgmain.cpp:94
+msgid "Use HTML output when generating search reports"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/files.cpp:581
+#: xsldbgmain.cpp:95
 msgid ""
-"Setting stylesheet base path to %1.\n"
+"Print all error messages to stdout, normally error messages go to stderr"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/files.cpp:598
+#: xsldbgmain.cpp:96
 msgid ""
-"Missing file name.\n"
+"Disable the automatic restarting of execution when current processing pass is "
+"complete"
 msgstr ""
-"缺少文件名。\n"
 
-#: kxsldbgpart/libxsldbg/files.cpp:1108 kxsldbgpart/libxsldbg/files.cpp:1143
-msgid ""
-"Encoding of text failed.\n"
+#: main.cpp:14 xsldbgmain.cpp:97
+msgid "XSL script to run"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/files.cpp:1179
-#, c-format
-msgid "Unable to initialize encoding %1."
+#: main.cpp:15 xsldbgmain.cpp:98
+msgid "XML data to be transformed"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/files.cpp:1184
+#: xsldbgmain.cpp:124
 msgid ""
-"Invalid encoding %1.\n"
+"Using libxml %1, libxslt %2 and libexslt %3\n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/files.cpp:1245
+#: xsldbgmain.cpp:125
 msgid ""
-" ----- more ---- \n"
+"xsldbg was compiled against libxml %1, libxslt %2 and libexslt %3\n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:223
-#: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:318
-#: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:1031
-#: kxsldbgpart/libxsldbg/debugXSL.cpp:679
-#: kxsldbgpart/libxsldbg/debugXSL.cpp:713
-#: kxsldbgpart/libxsldbg/debugXSL.cpp:1237
-#: kxsldbgpart/libxsldbg/debugXSL.cpp:1340
-#: kxsldbgpart/libxsldbg/files.cpp:1353
-#: kxsldbgpart/libxsldbg/files_unix.cpp:61
-#: kxsldbgpart/libxsldbg/files_unix.cpp:153
-#: kxsldbgpart/libxsldbg/search.cpp:106 kxsldbgpart/libxsldbg/search.cpp:1191
-#: kxsldbgpart/libxsldbg/search.cpp:1254 kxsldbgpart/libxsldbg/search.cpp:1315
-#: kxsldbgpart/libxsldbg/search.cpp:1367 kxsldbgpart/libxsldbg/search.cpp:1415
-#: kxsldbgpart/libxsldbg/search.cpp:1469 kxsldbgpart/libxsldbg/search.cpp:1515
-#: kxsldbgpart/libxsldbg/variable_cmds.cpp:105
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:512 kxsldbgpart/libxsldbg/xsldbg.cpp:1061
+#: xsldbgmain.cpp:126
 msgid ""
-"Error: Out of memory.\n"
+"libxslt %1 was compiled against libxml %2\n"
 msgstr ""
-"错误：内存溢出。\n"
 
-#: kxsldbgpart/libxsldbg/files.cpp:1363
+#: xsldbgmain.cpp:127
 msgid ""
-"Error: Unable to convert %1 to local file name.\n"
+"libexslt %1 was compiled against libxml %2\n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/param_cmds.cpp:48
-msgid "Failed to add parameter"
-msgstr ""
+#: xsldbgmain.cpp:130
+msgid "Xsldbg"
+msgstr "Xsldbg"
 
-#: kxsldbgpart/libxsldbg/debugXSL.cpp:1888
-#: kxsldbgpart/libxsldbg/debugXSL.cpp:1901
-#: kxsldbgpart/libxsldbg/debugXSL.cpp:2061
-#: kxsldbgpart/libxsldbg/file_cmds.cpp:248
-#: kxsldbgpart/libxsldbg/file_cmds.cpp:265
-#: kxsldbgpart/libxsldbg/param_cmds.cpp:52
-#: kxsldbgpart/libxsldbg/param_cmds.cpp:71
-#: kxsldbgpart/libxsldbg/param_cmds.cpp:101
-#: kxsldbgpart/libxsldbg/param_cmds.cpp:115
-msgid ""
-"Error: Invalid arguments for the command %1.\n"
-msgstr ""
+#. i18n: file kxsldbg_shell.rc line 9
+#: rc.cpp:6 rc.cpp:18 rc.cpp:231
+#, no-c-format
+msgid "Debug"
+msgstr "调试"
 
-#: kxsldbgpart/libxsldbg/param_cmds.cpp:96
-msgid "Failed to delete parameter"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 31
+#: rc.cpp:27
+#, no-c-format
+msgid "KXsldbg Configuration"
+msgstr "KXsldbg 配置"
 
-#: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:375
-#: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:695
-#: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:821
-#: kxsldbgpart/libxsldbg/param_cmds.cpp:107
-msgid ""
-"Error: Unable to parse %1 as a line number.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 75
+#: rc.cpp:30
+#, no-c-format
+msgid "LibXSLT Parameters"
+msgstr "LibXSLT 参数"
 
-#: kxsldbgpart/libxsldbg/param_cmds.cpp:112
-msgid ""
-"Error: Unable to find parameter %1.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 108
+#: rc.cpp:33
+#, no-c-format
+msgid "Parameter value:"
+msgstr "参数数值："
 
-#: kxsldbgpart/libxsldbg/param_cmds.cpp:146
-msgid "Unable to print parameters"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 148
+#: rc.cpp:36
+#, no-c-format
+msgid "Parameter name:"
+msgstr "参数名称："
 
-#: kxsldbgpart/libxsldbg/option_cmds.cpp:73
-#: kxsldbgpart/libxsldbg/option_cmds.cpp:107
-msgid ""
-"Error: Unable to parse %1 as an option value.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 229
+#: rc.cpp:39
+#, no-c-format
+msgid "Prev"
+msgstr "前一个"
 
-#: kxsldbgpart/libxsldbg/option_cmds.cpp:110
-msgid ""
-"Error: Unknown option name %1.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 261
+#: kxsldbgpart/kxsldbg_part.cpp:140 rc.cpp:45
+#, no-c-format
+msgid "Next"
+msgstr "下一个"
 
-#: kxsldbgpart/libxsldbg/debugXSL.cpp:2012
-#: kxsldbgpart/libxsldbg/file_cmds.cpp:213
-#: kxsldbgpart/libxsldbg/file_cmds.cpp:269
-#: kxsldbgpart/libxsldbg/option_cmds.cpp:113
-#: kxsldbgpart/libxsldbg/option_cmds.cpp:116
-#: kxsldbgpart/libxsldbg/os_cmds.cpp:48
-msgid ""
-"Error: Missing arguments for the command %1.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 464
+#: rc.cpp:57
+#, no-c-format
+msgid "Output file:"
+msgstr "输出文件："
 
-#: kxsldbgpart/libxsldbg/option_cmds.cpp:146
-msgid ""
-"Option %1 = %2\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 488
+#: rc.cpp:60 rc.cpp:66 rc.cpp:72
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: kxsldbgpart/libxsldbg/option_cmds.cpp:157
-msgid ""
-"Option %1 = \"%2\"\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 512
+#: rc.cpp:63
+#, no-c-format
+msgid "XML data:"
+msgstr "XML 数据："
 
-#: kxsldbgpart/libxsldbg/option_cmds.cpp:159
-msgid ""
-"Option %1 = \"\"\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 560
+#: rc.cpp:69
+#, no-c-format
+msgid "XSL source:"
+msgstr "XSL源文件："
 
-#: kxsldbgpart/libxsldbg/option_cmds.cpp:230
-msgid ""
-"\tNo expression watches set.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 621
+#: rc.cpp:78
+#, no-c-format
+msgid "catalogs"
+msgstr "目录"
 
-#: kxsldbgpart/libxsldbg/option_cmds.cpp:237
-#, fuzzy
-msgid " WatchExpression %1 "
-msgstr "表达式："
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 624
+#: rc.cpp:81
+#, no-c-format
+msgid "use catalogs from $SGML_CATALOGS_FILES"
+msgstr "使用来自 $SGML_CATALOGS_FILES 的目录"
 
-#: kxsldbgpart/libxsldbg/option_cmds.cpp:263
-msgid ""
-"Error: Unable to add watch expression \"%1\". It already has been added or it "
-"cannot be watched.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 632
+#: rc.cpp:84
+#, no-c-format
+msgid "novalid"
+msgstr "无效"
 
-#: kxsldbgpart/libxsldbg/option_cmds.cpp:287
-msgid ""
-"Error: Unable to parse %1 as a watchID.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 635
+#: rc.cpp:87
+#, no-c-format
+msgid "skip the DTD loading phase"
+msgstr "跳过DTD载入阶段"
 
-#: kxsldbgpart/libxsldbg/option_cmds.cpp:292
-msgid ""
-"Error: Watch expression %1 does not exist.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 643
+#: rc.cpp:90
+#, no-c-format
+msgid "html"
+msgstr "html"
 
-#: kxsldbgpart/libxsldbg/options.cpp:296 kxsldbgpart/libxsldbg/options.cpp:326
-msgid ""
-"Error: Option %1 is not a valid boolean/integer option.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 646
+#: rc.cpp:93
+#, no-c-format
+msgid "the input document is(are) an HTML file(s)"
+msgstr "输入文件是 HTML 文件"
 
-#: kxsldbgpart/libxsldbg/options.cpp:368 kxsldbgpart/libxsldbg/options.cpp:399
-msgid ""
-"Error: Option %1 is not a valid string xsldbg option.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 654
+#: rc.cpp:96
+#, no-c-format
+msgid "docbook"
+msgstr "docbook"
 
-#: kxsldbgpart/libxsldbg/options.cpp:511
-msgid ""
-" Parameter %1 %2=\"%3\"\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 657
+#: rc.cpp:99
+#, no-c-format
+msgid "the input document is SGML docbook"
+msgstr "输入文件是SGML docbook"
 
-#: kxsldbgpart/libxsldbg/options.cpp:546
-msgid ""
-"\n"
-"No parameters present.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 665
+#: rc.cpp:102
+#, no-c-format
+msgid "debug"
+msgstr "调试"
 
-#: kxsldbgpart/libxsldbg/template_cmds.cpp:184
-#: kxsldbgpart/libxsldbg/variable_cmds.cpp:36
-msgid ""
-"Error: Stylesheet is not valid.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 668
+#: rc.cpp:105
+#, no-c-format
+msgid "dump the tree of the result instead"
+msgstr "以转储结果树代替"
 
-#: kxsldbgpart/libxsldbg/variable_cmds.cpp:99
-msgid ""
-"Error: Cannot change a variable that does not use the select attribute.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 676
+#: rc.cpp:108
+#, no-c-format
+msgid "noout"
+msgstr "无输出"
 
-#: kxsldbgpart/libxsldbg/variable_cmds.cpp:102
-msgid ""
-"Error: Variable %1 was not found.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 679
+#: rc.cpp:111
+#, no-c-format
+msgid "do not dump the result"
+msgstr "不转储结果"
 
-#: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:425
-#: kxsldbgpart/libxsldbg/search.cpp:484
-#: kxsldbgpart/libxsldbg/trace_cmds.cpp:68
-#: kxsldbgpart/libxsldbg/variable_cmds.cpp:111
-msgid ""
-"Error: Invalid arguments to command %1.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 687
+#: rc.cpp:114
+#, no-c-format
+msgid "profile"
+msgstr "配置文件"
 
-#: kxsldbgpart/libxsldbg/breakpoint.cpp:619
-msgid "disabled"
-msgstr "已禁用"
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 690
+#: rc.cpp:117
+#, no-c-format
+msgid "print profiling information"
+msgstr "输出配置文件信息"
 
-#: kxsldbgpart/libxsldbg/breakpoint.cpp:620
-msgid "enabled"
-msgstr "已启用"
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 698
+#: rc.cpp:120
+#, no-c-format
+msgid "timing"
+msgstr "时间"
 
-#: kxsldbgpart/libxsldbg/breakpoint.cpp:639
-msgid ""
-"Breakpoint %1 %2 for template: \"%3\" mode: \"%4\" in file \"%5\" at line %6"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 701
+#: rc.cpp:123
+#, no-c-format
+msgid "display the time used"
+msgstr "显示已用的时间"
 
-#: kxsldbgpart/libxsldbg/breakpoint.cpp:641
-msgid "Breakpoint %1 %2 for template: \"%3\" mode: \"%4\""
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 709
+#: rc.cpp:126
+#, no-c-format
+msgid "nonet"
+msgstr "无网络"
 
-#: kxsldbgpart/libxsldbg/help_unix.cpp:51
-#: kxsldbgpart/libxsldbg/help_unix.cpp:56
-#, fuzzy
-msgid "xsldbg version"
+#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 712
+#: rc.cpp:129
+#, no-c-format
+msgid "refuse to fetch DTDs or entities over network"
+msgstr "拒绝从网络中获取 DTD 或实体定义"
+
+#. i18n: file ./kxsldbgpart/xsldbgmsgdialog.ui line 26
+#: rc.cpp:132
+#, no-c-format
+msgid "qxsldbg Message"
 msgstr "qxsldbg 消息"
 
-#: kxsldbgpart/libxsldbg/help_unix.cpp:52
-#: kxsldbgpart/libxsldbg/help_unix.cpp:57
-msgid "Help document version"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgmsgdialog.ui line 71
+#: rc.cpp:135
+#, no-c-format
+msgid "TextLabel1"
+msgstr "TextLabel1"
 
-#: kxsldbgpart/libxsldbg/help_unix.cpp:53
-#: kxsldbgpart/libxsldbg/help_unix.cpp:58
-msgid "Help not found for command"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 17
+#: rc.cpp:141
+#, no-c-format
+msgid "Xsldbg Breakpoints"
+msgstr "Xsldbg 断点"
 
-#: kxsldbgpart/libxsldbg/help_unix.cpp:90
-msgid ""
-"Error: Unable to display help. Help files not found in %1 or xsldbg not found "
-"in path.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 26
+#: rc.cpp:144
+#, no-c-format
+msgid "ID"
+msgstr "ID"
 
-#: kxsldbgpart/libxsldbg/help_unix.cpp:92
-msgid ""
-"Error: Unable to find xsldbg or help files.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 37
+#: rc.cpp:147 rc.cpp:252 rc.cpp:303 rc.cpp:330
+#, no-c-format
+msgid "Name"
+msgstr "名称"
 
-#: kxsldbgpart/libxsldbg/help_unix.cpp:97
-msgid ""
-"Error: Unable to print help file.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 48
+#: rc.cpp:150 rc.cpp:333
+#, no-c-format
+msgid "Mode"
+msgstr "模式"
 
-#: kxsldbgpart/libxsldbg/help_unix.cpp:102
-msgid ""
-"Error: No path to documentation; aborting help.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 59
+#: rc.cpp:153
+#, no-c-format
+msgid "File Name"
+msgstr "文件名"
 
-#: kxsldbgpart/libxsldbg/trace_cmds.cpp:69
-msgid ""
-"Warning: Assuming normal speed.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 70
+#: rc.cpp:156 rc.cpp:339 rc.cpp:351
+#, no-c-format
+msgid "Line Number"
+msgstr "行号"
 
-#: kxsldbgpart/libxsldbg/debug.cpp:135
-msgid ""
-"Error: XSLT source and XML data are empty. Cannot enter the debugger.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 81
+#: kxsldbgpart/xsldbgbreakpointlistitem.cpp:38 rc.cpp:159
+#, no-c-format
+msgid "Enabled"
+msgstr "启用"
 
-#: kxsldbgpart/libxsldbg/files_unix.cpp:67
-msgid ""
-"Error: USER environment variable is not set.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 102
+#: rc.cpp:162
+#, no-c-format
+msgid "Click breakpoint in list to modify or delete it"
+msgstr "点击列表中的断点来修改或删除它"
 
-#: kxsldbgpart/libxsldbg/files_unix.cpp:199
-msgid ""
-"Error: The value of the option docspath or searchresultspath is empty. See help "
-"on setoption or options command for more information.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 138
+#: rc.cpp:165
+#, no-c-format
+msgid "ID:"
+msgstr "ID："
 
-#: kxsldbgpart/libxsldbg/file_cmds.cpp:71
-msgid "Entity %1 "
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 146
+#: rc.cpp:168
+#, no-c-format
+msgid "Line number:"
+msgstr "行号："
 
-#: kxsldbgpart/libxsldbg/file_cmds.cpp:78
-msgid ""
-"No external General Parsed entities present.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 154
+#: rc.cpp:171
+#, no-c-format
+msgid "You don't need to specify directory for file name"
+msgstr "您不需要指定文件名称的目录"
 
-#: kxsldbgpart/libxsldbg/file_cmds.cpp:80
-#, c-format
-msgid ""
-"_n: \tTotal of %n entity found.\n"
-"\tTotal of %n entities found."
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 162
+#: rc.cpp:174
+#, no-c-format
+msgid "Template name or match name to look for"
+msgstr "模板名称或要查找的匹配名称"
 
-#: kxsldbgpart/libxsldbg/file_cmds.cpp:121
-#: kxsldbgpart/libxsldbg/file_cmds.cpp:129
-msgid ""
-"SystemID \"%1\" was not found in current catalog.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 198
+#: rc.cpp:177 rc.cpp:180
+#, no-c-format
+msgid "Must be positive"
+msgstr "必须是正数"
 
-#: kxsldbgpart/libxsldbg/file_cmds.cpp:125
-msgid ""
-"SystemID \"%1\" maps to: \"%2\"\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 285
+#: rc.cpp:183
+#, no-c-format
+msgid "Mode:"
+msgstr "模式："
 
-#: kxsldbgpart/libxsldbg/file_cmds.cpp:168
-#: kxsldbgpart/libxsldbg/file_cmds.cpp:176
-msgid ""
-"PublicID \"%1\" was not found in current catalog.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 293
+#: rc.cpp:186
+#, no-c-format
+msgid "Name:"
+msgstr "名称："
 
-#: kxsldbgpart/libxsldbg/file_cmds.cpp:172
-msgid ""
-"PublicID \"%1\" maps to: \"%2\"\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 301
+#: rc.cpp:189
+#, no-c-format
+msgid "File name:"
+msgstr "文件名："
 
-#: kxsldbgpart/libxsldbg/template_cmds.cpp:135
-msgid ""
-" template: \"%1\" mode: \"%2\" in file \"%3\" at line %4\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 375
+#: rc.cpp:195
+#, no-c-format
+msgid "Delete breakpoint using ID"
+msgstr "用ID删除断点"
 
-#: kxsldbgpart/libxsldbg/template_cmds.cpp:226
-msgid ""
-"\tNo XSLT templates found.\n"
-msgstr ""
-"\t没有找到 XSLT 模板。\n"
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 386
+#: rc.cpp:201
+#, no-c-format
+msgid "Clear entered text"
+msgstr "清除已输入的文字"
 
-#: kxsldbgpart/libxsldbg/template_cmds.cpp:228
-#, c-format
-msgid ""
-"_n: \tTotal of %n XSLT template found\n"
-"\tTotal of %n XSLT templates found"
-msgstr "\t总共找到了 %n 个 XSLT 模板"
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 394
+#: rc.cpp:204
+#, no-c-format
+msgid "Add All"
+msgstr "全部添加"
 
-#: kxsldbgpart/libxsldbg/template_cmds.cpp:229
-#, fuzzy, c-format
-msgid ""
-"_n: \tTotal of %n XSLT template printed\n"
-"\tTotal of %n XSLT templates printed"
-msgstr "\t总共打印了 %n 个 XSLT 模板"
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 397
+#: rc.cpp:207
+#, no-c-format
+msgid "Add breakpoint on all templates found"
+msgstr "在所有找到的模板中添加断点"
 
-#: kxsldbgpart/libxsldbg/template_cmds.cpp:261
-#: kxsldbgpart/libxsldbg/template_cmds.cpp:290
-msgid ""
-" Stylesheet %1\n"
-msgstr ""
-" 样式表 %1\n"
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 408
+#: rc.cpp:213
+#, no-c-format
+msgid "Delete all breakpoints"
+msgstr "删除所有断点"
 
-#: kxsldbgpart/libxsldbg/template_cmds.cpp:325
-#, fuzzy, c-format
-msgid ""
-"_n: \tTotal of %n XSLT stylesheet found.\n"
-"\tTotal of %n XSLT stylesheets found."
-msgstr "\t总共找到了 %n 个 XSLT 模板"
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 416
+#: rc.cpp:216
+#, no-c-format
+msgid "Enable"
+msgstr "启用"
 
-#: kxsldbgpart/libxsldbg/template_cmds.cpp:328
-msgid ""
-"\tNo XSLT stylesheets found.\n"
-msgstr ""
-"\t没有找到 XSLT 样式表。\n"
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 419
+#: rc.cpp:219
+#, no-c-format
+msgid "Enable breakpoint using ID"
+msgstr "用ID启用断点"
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:270 kxsldbgpart/libxsldbg/xsldbg.cpp:298
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:320
-msgid ""
-"%1 took %2 ms to complete.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 430
+#: rc.cpp:225
+#, no-c-format
+msgid "Add breakpoint using file name with line number or a template name"
+msgstr "用带行号的文件名或模板名称添加断点"
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:361
-#, c-format
-msgid "XInclude processing %1."
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 488
+#: rc.cpp:228 rc.cpp:282 rc.cpp:297 rc.cpp:324 rc.cpp:357 rc.cpp:387
+#, no-c-format
+msgid "Refresh"
+msgstr "刷新"
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:399 kxsldbgpart/libxsldbg/xsldbg.cpp:446
-msgid ""
-"Error: Unable to write temporary results to %1.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 25
+#: rc.cpp:237
+#, no-c-format
+msgid "Xsldbg Local Variables"
+msgstr "Xsldbg 本地变量"
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:409
-#, c-format
-msgid ""
-"_n: Applying stylesheet %n time\n"
-"Applying stylesheet %n times"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 87
+#: rc.cpp:240 rc.cpp:312
+#, no-c-format
+msgid "Expression:"
+msgstr "表达式："
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:412
-msgid "Applying stylesheet"
-msgstr "应用样式表"
+#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 95
+#: rc.cpp:243 rc.cpp:315
+#, no-c-format
+msgid "Enter a valid XPath expression"
+msgstr "输入一个有效的XPath表达式"
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:473 kxsldbgpart/libxsldbg/xsldbg.cpp:491
-msgid "Saving result"
-msgstr "保存结果"
+#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 122
+#: kxsldbgpart/kxsldbg_part.cpp:95 rc.cpp:246 rc.cpp:318
+#, no-c-format
+msgid "Evaluate"
+msgstr "计算"
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:476
-msgid ""
-"Warning: Generating non-standard output XHTML.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 125
+#: rc.cpp:249 rc.cpp:321
+#, no-c-format
+msgid "Result of evaluation will appear in message window"
+msgstr "计算结果会显示在消息窗口中"
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:493
-msgid ""
-"Warning: Unsupported, non-standard output method %1.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 161
+#: rc.cpp:255
+#, no-c-format
+msgid "Template Context"
+msgstr "模板内容"
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:509
-msgid "Running stylesheet and saving result"
+#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 172
+#: rc.cpp:258
+#, no-c-format
+msgid "Type"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:516
-msgid ""
-"Error: Unable to save results of transformation to file %1.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 183
+#: rc.cpp:261 rc.cpp:288 rc.cpp:306
+#, no-c-format
+msgid "Source File"
+msgstr "源文件"
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:558 kxsldbgpart/libxsldbg/xsldbg.cpp:887
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:919 kxsldbgpart/libxsldbg/xsldbg.cpp:993
-msgid ""
-"Fatal error: Aborting debugger due to an unrecoverable error.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 194
+#: rc.cpp:264 rc.cpp:309
+#, no-c-format
+msgid "Source Line Number"
+msgstr "源文件行号"
 
-#: kxsldbgpart/kxsldbg_part.cpp:738 kxsldbgpart/libxsldbg/xsldbg.cpp:591
-msgid ""
-"Error: Too many file names supplied via command line.\n"
-msgstr ""
+#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 228
+#: rc.cpp:267
+#, fuzzy, no-c-format
+msgid "Variable expression:"
+msgstr "计算表达式"
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:683
-msgid ""
-"Warning: Too many libxslt parameters provided via the command line option "
-"--param.\n"
+#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 249
+#: rc.cpp:270
+#, fuzzy, no-c-format
+msgid "Variable type:"
+msgstr "文件名："
+
+#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 270
+#: rc.cpp:273
+#, fuzzy, no-c-format
+msgid "Set Expression"
+msgstr "表达式："
+
+#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 273
+#: rc.cpp:276
+#, no-c-format
+msgid "Set the selection for variable "
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:692
+#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 283
+#: rc.cpp:279
+#, fuzzy, no-c-format
+msgid "Variable name:"
+msgstr "文件名："
+
+#. i18n: file ./kxsldbgpart/xsldbgsources.ui line 17
+#: rc.cpp:285
+#, no-c-format
+msgid "Xsldbg Source Files"
+msgstr "Xsldbg 源文件"
+
+#. i18n: file ./kxsldbgpart/xsldbgsources.ui line 43
+#: rc.cpp:291
+#, no-c-format
+msgid "Parent File"
+msgstr "父文件"
+
+#. i18n: file ./kxsldbgpart/xsldbgsources.ui line 54
+#: rc.cpp:294
+#, no-c-format
+msgid "Parent Line Number"
+msgstr "父行号"
+
+#. i18n: file ./kxsldbgpart/xsldbgglobalvariables.ui line 25
+#: rc.cpp:300
+#, no-c-format
+msgid "Xsldbg Global Variables"
+msgstr "Xsldbg 全局变量"
+
+#. i18n: file ./kxsldbgpart/xsldbgtemplates.ui line 17
+#: rc.cpp:327
+#, no-c-format
+msgid "Xsldbg Templates"
+msgstr "Xsldbg 模板"
+
+#. i18n: file ./kxsldbgpart/xsldbgtemplates.ui line 54
+#: rc.cpp:336 rc.cpp:348
+#, no-c-format
+msgid "Source File Name"
+msgstr "源文件名"
+
+#. i18n: file ./kxsldbgpart/xsldbgcallstack.ui line 17
+#: rc.cpp:342
+#, no-c-format
+msgid "Xsldbg Callstack"
+msgstr "Xsldbg 堆栈"
+
+#. i18n: file ./kxsldbgpart/xsldbgcallstack.ui line 32
+#: rc.cpp:345
+#, no-c-format
+msgid "Frame# Template Name"
+msgstr "框架号 模板名称"
+
+#. i18n: file ./kxsldbgpart/xsldbgcallstack.ui line 75
+#: rc.cpp:354
+#, no-c-format
+msgid "Oldest Frame # is 0, Frame # has been added to the first column"
+msgstr "最早的框架号是 0，框架号已被添加到第一列"
+
+#. i18n: file ./kxsldbgpart/xsldbgwalkspeed.ui line 17
+#: rc.cpp:360
+#, no-c-format
+msgid "Configure xsldbg's Walk Speed"
+msgstr "配置 xsldbg 的遍历速度"
+
+#. i18n: file ./kxsldbgpart/xsldbgwalkspeed.ui line 51
+#: rc.cpp:363
+#, no-c-format
 msgid ""
-"Error: Argument \"%1\" to --param is not in the format <name>:<value>.\n"
+"Change the speed at which xsldbg walks through execution of the stylesheet."
+msgstr "更改 xsldbg 遍历样式表时的速度。"
+
+#. i18n: file ./kxsldbgpart/xsldbgwalkspeed.ui line 95
+#: rc.cpp:366
+#, no-c-format
+msgid "Slow"
+msgstr "慢"
+
+#. i18n: file ./kxsldbgpart/xsldbgwalkspeed.ui line 117
+#: rc.cpp:369
+#, no-c-format
+msgid "Fast"
+msgstr "快"
+
+#. i18n: file ./kxsldbgpart/xsldbgentities.ui line 25
+#: rc.cpp:378
+#, no-c-format
+msgid "Xsldbg Entities"
+msgstr "Xsldbg 实体"
+
+#. i18n: file ./kxsldbgpart/xsldbgentities.ui line 40
+#: rc.cpp:381
+#, no-c-format
+msgid "PublicID"
+msgstr "PublicID"
+
+#. i18n: file ./kxsldbgpart/xsldbgentities.ui line 51
+#: rc.cpp:384
+#, no-c-format
+msgid "SystemID"
+msgstr "SystemID"
+
+#: kxsldbg.cpp:67
+msgid "&XSLDbg Handbook"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:744
-#, fuzzy
+#: kxsldbg.cpp:76
+msgid "Could not find our part."
+msgstr "不能找到所需部件。"
+
+#: kxsldbg.cpp:176
+msgid "File: %1  Line: %2  Col: %3"
+msgstr "文件：%1  行：%2  列：%3"
+
+#: kxsldbgpart/xsldbgoutputview.cpp:61
+msgid "xsldbg Output"
+msgstr "xsldbg 输出"
+
+#: kxsldbgpart/xsldbgoutputview.cpp:62
 msgid ""
-"\n"
-"Starting stylesheet\n"
+"\t\txsldbg output capture ready\n"
 "\n"
 msgstr ""
-"\n"
-"开始样式表\n"
+"\t\txsldbg 输出捕获就绪\n"
 "\n"
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:755
-msgid ""
-"Error: No XSLT source file supplied.\n"
-msgstr ""
+#: kxsldbgpart/xsldbgoutputview.cpp:76
+msgid "Result of evaluation"
+msgstr "计算结果"
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:758
-msgid ""
-"Error: No XML data file supplied.\n"
-msgstr ""
+#: kxsldbgpart/xsldbgoutputview.cpp:93
+msgid "Request Failed "
+msgstr "请求失败 "
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:795
-msgid ""
-"\n"
-"Debugger never received control.\n"
-msgstr ""
+#: kxsldbgpart/xsldbginspector.cpp:68
+msgid "Xsldbg Inspector"
+msgstr "Xsldbg 监视"
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:800
-msgid ""
-"\n"
-"Finished stylesheet\n"
-"\n"
-msgstr ""
+#: kxsldbgpart/xsldbginspector.cpp:77
+msgid "Breakpoints"
+msgstr "断点"
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:857
-msgid ""
-"Going to the command shell; not all xsldbg commands will work as not all needed "
-"have been loaded.\n"
+#: kxsldbgpart/xsldbginspector.cpp:83
+msgid "Variables"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:914
-#, fuzzy, c-format
-msgid "Parsing stylesheet %1"
-msgstr "停止跟踪执行样式表"
+#: kxsldbgpart/xsldbginspector.cpp:89
+msgid "CallStack"
+msgstr "堆栈"
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:916
+#: kxsldbgpart/xsldbginspector.cpp:95
+msgid "Templates"
+msgstr "模板"
+
+#: kxsldbgpart/xsldbginspector.cpp:101
+msgid "Sources"
+msgstr "源文件"
+
+#: kxsldbgpart/xsldbginspector.cpp:107
+msgid "Entities"
+msgstr "实体"
+
+#: kxsldbgpart/xsldbginspector.cpp:126
+msgid "Apply changes to xsldbg after restarting execution"
+msgstr "重新开始执行后应用更新"
+
+#: kxsldbgpart/xsldbginspector.cpp:133
+msgid "&Refresh"
+msgstr "刷新(&R)"
+
+#: kxsldbgpart/xsldbginspector.cpp:134
+msgid "Refresh values in inspectors from xsldbg"
+msgstr "刷新xsldbg监视窗口中的数值"
+
+#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:83
+#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:92
+#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:115
+#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:120
+#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:143
+#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:148
+#: kxsldbgpart/xsldbgdebugger.cpp:297 kxsldbgpart/xsldbgdebugger.cpp:317
+#: kxsldbgpart/xsldbgdebugger.cpp:335 kxsldbgpart/xsldbgdebugger.cpp:355
+#: kxsldbgpart/xsldbgdebugger.cpp:375 kxsldbgpart/xsldbgdebugger.cpp:394
+msgid "Operation Failed"
+msgstr "操作失败"
+
+#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:84
+#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:116
+#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:144
+msgid "A line number was provided without a file name."
+msgstr "提供了一个没有文件名的行号。"
+
+#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:93
+msgid "No details provided or an invalid line number was supplied."
+msgstr "没有提供详细信息或者提供了一个无效的行号。"
+
+#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:121
+msgid "No details provided or an invalid line or ID was supplied."
+msgstr "没有提供详细信息或者提供了一个无效的行号或ID。"
+
+#: kxsldbgpart/xsldbgbreakpointsimpl.cpp:149
+msgid "No details provided."
+msgstr "没有提供详细信息。"
+
+#: kxsldbgpart/xsldbgconfigimpl.cpp:191
 msgid ""
-"Error: Cannot parse file %1.\n"
+"\t\"XSL source\" \n"
 msgstr ""
+"\t“XSL 源文件” \n"
 
-#: kxsldbgpart/libxsldbg/xsldbg.cpp:991 kxsldbgpart/libxsldbg/xsldbg.cpp:1035
+#: kxsldbgpart/xsldbgconfigimpl.cpp:193
 msgid ""
-"Error: Unable to parse file %1.\n"
+"\t\"XML data\" \n"
 msgstr ""
+"\t“XML 数据” \n"
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:140
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:243
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:383
+#: kxsldbgpart/xsldbgconfigimpl.cpp:195
 msgid ""
-"Error: XPath %1 results in an empty Node Set.\n"
+"\t\"Output file\" \n"
 msgstr ""
+"\t“输出文件” \n"
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:175
+#: kxsldbgpart/xsldbgconfigimpl.cpp:197
 msgid ""
-"Information: Temporarily setting document's encoding to UTF-8. Previously was "
-"%1.\n"
+"Missing values for \n"
 msgstr ""
+"缺少值 \n"
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:229
+#: kxsldbgpart/xsldbgconfigimpl.cpp:201
 msgid ""
-"Error: Unable to save temporary results to %1.\n"
+"Output file is the same as either XSL Source or XML Data file\n"
 msgstr ""
+"输出文件和XSL源文件或XML数据文件其中之一相同\n"
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:251
-msgid "NULL string value supplied."
+#: kxsldbgpart/xsldbgconfigimpl.cpp:220
+msgid ""
+"The following libxslt parameters are empty\n"
+"\t"
 msgstr ""
+"下列的 libxslt 参数是空的\n"
+"\t"
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:262
-msgid "Unable to convert XPath to string."
-msgstr ""
+#: kxsldbgpart/xsldbgconfigimpl.cpp:370
+msgid "Choose XSL Source to Debug"
+msgstr "选择要调试的 XSL 源文件"
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:358
-msgid ""
-"Warning: Unable to print expression. No stylesheet was properly loaded.\n"
-msgstr ""
+#: kxsldbgpart/xsldbgconfigimpl.cpp:382
+msgid "Choose XML Data to Debug"
+msgstr "选择要调试的 XML 数据文件"
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:418
-#, fuzzy
-msgid ""
-" Global %1\n"
-msgstr "全局"
+#: kxsldbgpart/xsldbgconfigimpl.cpp:393
+msgid "Choose Output File for XSL Transformation"
+msgstr "选择 XSL 转换的输出文件"
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:421
-#, fuzzy
-msgid " Global "
-msgstr "全局"
+#: kxsldbgpart/xsldbgconfigimpl.cpp:484
+msgid "Suspect Configuration"
+msgstr "不可信的配置"
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:424
+#: kxsldbgpart/xsldbgconfigimpl.cpp:488
+msgid "Incomplete or Invalid Configuration"
+msgstr "未完成或无效的配置"
+
+#: kxsldbgpart/libxsldbg/help_unix.cpp:51
+#: kxsldbgpart/libxsldbg/help_unix.cpp:56
 #, fuzzy
-msgid ""
-" Global = %1\n"
-msgstr "全局"
+msgid "xsldbg version"
+msgstr "qxsldbg 消息"
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:427
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:430
-msgid ""
-" Global = %1\n"
-"%2"
+#: kxsldbgpart/libxsldbg/help_unix.cpp:52
+#: kxsldbgpart/libxsldbg/help_unix.cpp:57
+msgid "Help document version"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:430
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:568
-msgid ""
-"Warning: No value assigned to variable.\n"
+#: kxsldbgpart/libxsldbg/help_unix.cpp:53
+#: kxsldbgpart/libxsldbg/help_unix.cpp:58
+msgid "Help not found for command"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:483
+#: kxsldbgpart/libxsldbg/help_unix.cpp:90
 msgid ""
-"Error: Debugger has no files loaded or libxslt has not reached a template.\n"
-"Try reloading files or taking more steps.\n"
+"Error: Unable to display help. Help files not found in %1 or xsldbg not found "
+"in path.\n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:520
+#: kxsldbgpart/libxsldbg/help_unix.cpp:92
 msgid ""
-"Error: Libxslt has not initialized variables yet; try stepping to a template.\n"
+"Error: Unable to find xsldbg or help files.\n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:556
-#, c-format
-msgid " Local %1"
-msgstr " 本地 %1"
-
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:559
-msgid " Local "
-msgstr " 本地 "
-
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:562
+#: kxsldbgpart/libxsldbg/help_unix.cpp:97
 msgid ""
-" Local = %1\n"
+"Error: Unable to print help file.\n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:565
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:568
+#: kxsldbgpart/libxsldbg/help_unix.cpp:102
 msgid ""
-" Local = %1\n"
-"%2"
+"Error: No path to documentation; aborting help.\n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:583
+#: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:223
+#: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:318
+#: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:1031
+#: kxsldbgpart/libxsldbg/debugXSL.cpp:679
+#: kxsldbgpart/libxsldbg/debugXSL.cpp:713
+#: kxsldbgpart/libxsldbg/debugXSL.cpp:1237
+#: kxsldbgpart/libxsldbg/debugXSL.cpp:1340
+#: kxsldbgpart/libxsldbg/files.cpp:1353
+#: kxsldbgpart/libxsldbg/files_unix.cpp:61
+#: kxsldbgpart/libxsldbg/files_unix.cpp:153
+#: kxsldbgpart/libxsldbg/search.cpp:106 kxsldbgpart/libxsldbg/search.cpp:1191
+#: kxsldbgpart/libxsldbg/search.cpp:1254 kxsldbgpart/libxsldbg/search.cpp:1315
+#: kxsldbgpart/libxsldbg/search.cpp:1367 kxsldbgpart/libxsldbg/search.cpp:1415
+#: kxsldbgpart/libxsldbg/search.cpp:1469 kxsldbgpart/libxsldbg/search.cpp:1515
+#: kxsldbgpart/libxsldbg/variable_cmds.cpp:105
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:512 kxsldbgpart/libxsldbg/xsldbg.cpp:1069
 msgid ""
-"Error: Libxslt has not initialized variables yet; try stepping past the "
-"xsl:param elements in the template.\n"
+"Error: Out of memory.\n"
 msgstr ""
+"错误：内存溢出。\n"
 
 #: kxsldbgpart/libxsldbg/search.cpp:407
 msgid ""
@@ -767,29 +912,17 @@ msgid ""
 "Information: Transformed %1 using %2 and saved to %3.\n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/search.cpp:723
-msgid ""
-"Error: XSLT template named \"%1\" was not found.\n"
-msgstr ""
-
-#: kxsldbgpart/libxsldbg/os_cmds.cpp:72
-msgid ""
-"Error: No command processor available for shell command \"%1\".\n"
-msgstr ""
-
-#: kxsldbgpart/libxsldbg/os_cmds.cpp:77
-msgid ""
-"Information: Starting shell command \"%1\".\n"
-msgstr ""
-
-#: kxsldbgpart/libxsldbg/os_cmds.cpp:92
+#: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:425
+#: kxsldbgpart/libxsldbg/search.cpp:484
+#: kxsldbgpart/libxsldbg/trace_cmds.cpp:68
+#: kxsldbgpart/libxsldbg/variable_cmds.cpp:111
 msgid ""
-"Information: Finished shell command.\n"
+"Error: Invalid arguments to command %1.\n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/os_cmds.cpp:96
+#: kxsldbgpart/libxsldbg/search.cpp:723
 msgid ""
-"Error: Unable to run command. System error %1.\n"
+"Error: XSLT template named \"%1\" was not found.\n"
 msgstr ""
 
 #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:97
@@ -986,6 +1119,19 @@ msgid ""
 "Load of data file deferred. Use the run command.\n"
 msgstr ""
 
+#: kxsldbgpart/libxsldbg/debugXSL.cpp:1888
+#: kxsldbgpart/libxsldbg/debugXSL.cpp:1901
+#: kxsldbgpart/libxsldbg/debugXSL.cpp:2061
+#: kxsldbgpart/libxsldbg/file_cmds.cpp:248
+#: kxsldbgpart/libxsldbg/file_cmds.cpp:265
+#: kxsldbgpart/libxsldbg/param_cmds.cpp:52
+#: kxsldbgpart/libxsldbg/param_cmds.cpp:71
+#: kxsldbgpart/libxsldbg/param_cmds.cpp:101
+#: kxsldbgpart/libxsldbg/param_cmds.cpp:115
+msgid ""
+"Error: Invalid arguments for the command %1.\n"
+msgstr ""
+
 #: kxsldbgpart/libxsldbg/debugXSL.cpp:1911
 #: kxsldbgpart/libxsldbg/debugXSL.cpp:1932
 #: kxsldbgpart/libxsldbg/debugXSL.cpp:1940
@@ -998,6 +1144,16 @@ msgid ""
 "Opening terminal %1.\n"
 msgstr ""
 
+#: kxsldbgpart/libxsldbg/debugXSL.cpp:2012
+#: kxsldbgpart/libxsldbg/file_cmds.cpp:213
+#: kxsldbgpart/libxsldbg/file_cmds.cpp:269
+#: kxsldbgpart/libxsldbg/option_cmds.cpp:113
+#: kxsldbgpart/libxsldbg/option_cmds.cpp:116
+#: kxsldbgpart/libxsldbg/os_cmds.cpp:48
+msgid ""
+"Error: Missing arguments for the command %1.\n"
+msgstr ""
+
 #: kxsldbgpart/libxsldbg/debugXSL.cpp:2016
 msgid ""
 "Warning: The %1 command is disabled\n"
@@ -1008,6 +1164,139 @@ msgid ""
 "Error: Unknown command %1. Try help.\n"
 msgstr ""
 
+#: kxsldbgpart/libxsldbg/utils.cpp:111
+msgid ""
+"Error: Unmatched quotes in input.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/option_cmds.cpp:73
+#: kxsldbgpart/libxsldbg/option_cmds.cpp:107
+msgid ""
+"Error: Unable to parse %1 as an option value.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/option_cmds.cpp:110
+msgid ""
+"Error: Unknown option name %1.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/option_cmds.cpp:146
+msgid ""
+"Option %1 = %2\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/option_cmds.cpp:157
+msgid ""
+"Option %1 = \"%2\"\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/option_cmds.cpp:159
+msgid ""
+"Option %1 = \"\"\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/option_cmds.cpp:230
+msgid ""
+"\tNo expression watches set.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/option_cmds.cpp:237
+#, fuzzy
+msgid " WatchExpression %1 "
+msgstr "表达式："
+
+#: kxsldbgpart/libxsldbg/option_cmds.cpp:263
+msgid ""
+"Error: Unable to add watch expression \"%1\". It already has been added or it "
+"cannot be watched.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/option_cmds.cpp:287
+msgid ""
+"Error: Unable to parse %1 as a watchID.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/option_cmds.cpp:292
+msgid ""
+"Error: Watch expression %1 does not exist.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/trace_cmds.cpp:69
+msgid ""
+"Warning: Assuming normal speed.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/files.cpp:192 kxsldbgpart/libxsldbg/files.cpp:215
+msgid ""
+"Error: Unable to open terminal %1.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/files.cpp:195
+msgid ""
+"Error: Did not previously open terminal.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/files.cpp:497
+msgid ""
+"Error: The file name \"%1\" is too long.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/files.cpp:521
+msgid ""
+"Error: Unable to change to directory %1.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/files.cpp:524
+msgid ""
+"Changed to directory %1.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/files.cpp:552
+msgid ""
+"Setting XML Data file name to %1.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/files.cpp:564
+msgid ""
+"Setting stylesheet file name to %1.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/files.cpp:581
+msgid ""
+"Setting stylesheet base path to %1.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/files.cpp:598
+msgid ""
+"Missing file name.\n"
+msgstr ""
+"缺少文件名。\n"
+
+#: kxsldbgpart/libxsldbg/files.cpp:1108 kxsldbgpart/libxsldbg/files.cpp:1143
+msgid ""
+"Encoding of text failed.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/files.cpp:1179
+#, c-format
+msgid "Unable to initialize encoding %1."
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/files.cpp:1184
+msgid ""
+"Invalid encoding %1.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/files.cpp:1245
+msgid ""
+" ----- more ---- \n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/files.cpp:1363
+msgid ""
+"Error: Unable to convert %1 to local file name.\n"
+msgstr ""
+
 #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:94
 #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:345
 msgid "Failed to add breakpoint."
@@ -1045,6 +1334,14 @@ msgid ""
 "Error: Unable to find a data file whose name contains %1.\n"
 msgstr ""
 
+#: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:375
+#: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:695
+#: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:821
+#: kxsldbgpart/libxsldbg/param_cmds.cpp:107
+msgid ""
+"Error: Unable to parse %1 as a line number.\n"
+msgstr ""
+
 #: kxsldbgpart/libxsldbg/breakpoint_cmds.cpp:419
 msgid "Error: Unable to find the added breakpoint."
 msgstr ""
@@ -1146,137 +1443,466 @@ msgid ""
 "re-created.\n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/utils.cpp:111
+#: kxsldbgpart/libxsldbg/file_cmds.cpp:71
+msgid "Entity %1 "
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/file_cmds.cpp:78
 msgid ""
-"Error: Unmatched quotes in input.\n"
+"No external General Parsed entities present.\n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/search_cmds.cpp:52
+#: kxsldbgpart/libxsldbg/file_cmds.cpp:80
+#, c-format
 msgid ""
-"Error: No path to documentation; aborting searching.\n"
+"_n: \tTotal of %n entity found.\n"
+"\tTotal of %n entities found."
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/search_cmds.cpp:54
+#: kxsldbgpart/libxsldbg/file_cmds.cpp:121
+#: kxsldbgpart/libxsldbg/file_cmds.cpp:129
 msgid ""
-"Error: Error in value of USE_DOCS_MACRO; look at Makefile.am.\n"
+"SystemID \"%1\" was not found in current catalog.\n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/search_cmds.cpp:56
+#: kxsldbgpart/libxsldbg/file_cmds.cpp:125
 msgid ""
-"Error: Required environment variable %1 not set to the directory of xsldbg "
-"documentation.\n"
+"SystemID \"%1\" maps to: \"%2\"\n"
 msgstr ""
 
-#: kxsldbgpart/libxsldbg/search_cmds.cpp:62
+#: kxsldbgpart/libxsldbg/file_cmds.cpp:168
+#: kxsldbgpart/libxsldbg/file_cmds.cpp:176
 msgid ""
-"Error: Stylesheet not valid, files not loaded yet?\n"
+"PublicID \"%1\" was not found in current catalog.\n"
 msgstr ""
 
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 81
-#: kxsldbgpart/xsldbgbreakpointlistitem.cpp:38 rc.cpp:213
-#, no-c-format
-msgid "Enabled"
-msgstr "启用"
+#: kxsldbgpart/libxsldbg/file_cmds.cpp:172
+msgid ""
+"PublicID \"%1\" maps to: \"%2\"\n"
+msgstr ""
 
-#: kxsldbgpart/xsldbgbreakpointlistitem.cpp:40
-msgid "Disabled"
-msgstr "禁用"
+#: kxsldbgpart/libxsldbg/param_cmds.cpp:48
+msgid "Failed to add parameter"
+msgstr ""
 
-#: kxsldbgpart/xsldbgconfigimpl.cpp:191
+#: kxsldbgpart/libxsldbg/param_cmds.cpp:96
+msgid "Failed to delete parameter"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/param_cmds.cpp:112
 msgid ""
-"\t\"XSL source\" \n"
+"Error: Unable to find parameter %1.\n"
 msgstr ""
-"\t“XSL 源文件” \n"
 
-#: kxsldbgpart/xsldbgconfigimpl.cpp:193
+#: kxsldbgpart/libxsldbg/param_cmds.cpp:146
+msgid "Unable to print parameters"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/os_cmds.cpp:72
 msgid ""
-"\t\"XML data\" \n"
+"Error: No command processor available for shell command \"%1\".\n"
 msgstr ""
-"\t“XML 数据” \n"
 
-#: kxsldbgpart/xsldbgconfigimpl.cpp:195
+#: kxsldbgpart/libxsldbg/os_cmds.cpp:77
 msgid ""
-"\t\"Output file\" \n"
+"Information: Starting shell command \"%1\".\n"
 msgstr ""
-"\t“输出文件” \n"
 
-#: kxsldbgpart/xsldbgconfigimpl.cpp:197
+#: kxsldbgpart/libxsldbg/os_cmds.cpp:92
 msgid ""
-"Missing values for \n"
+"Information: Finished shell command.\n"
 msgstr ""
-"缺少值 \n"
 
-#: kxsldbgpart/xsldbgconfigimpl.cpp:201
+#: kxsldbgpart/libxsldbg/os_cmds.cpp:96
 msgid ""
-"Output file is the same as either XSL Source or XML Data file\n"
+"Error: Unable to run command. System error %1.\n"
 msgstr ""
-"输出文件和XSL源文件或XML数据文件其中之一相同\n"
 
-#: kxsldbgpart/xsldbgconfigimpl.cpp:220
+#: kxsldbgpart/libxsldbg/breakpoint.cpp:619
+msgid "disabled"
+msgstr "已禁用"
+
+#: kxsldbgpart/libxsldbg/breakpoint.cpp:620
+msgid "enabled"
+msgstr "已启用"
+
+#: kxsldbgpart/libxsldbg/breakpoint.cpp:639
 msgid ""
-"The following libxslt parameters are empty\n"
-"\t"
+"Breakpoint %1 %2 for template: \"%3\" mode: \"%4\" in file \"%5\" at line %6"
 msgstr ""
-"下列的 libxslt 参数是空的\n"
-"\t"
 
-#: kxsldbgpart/xsldbgconfigimpl.cpp:370
-msgid "Choose XSL Source to Debug"
-msgstr "选择要调试的 XSL 源文件"
+#: kxsldbgpart/libxsldbg/breakpoint.cpp:641
+msgid "Breakpoint %1 %2 for template: \"%3\" mode: \"%4\""
+msgstr ""
 
-#: kxsldbgpart/xsldbgconfigimpl.cpp:382
-msgid "Choose XML Data to Debug"
-msgstr "选择要调试的 XML 数据文件"
+#: kxsldbgpart/libxsldbg/options.cpp:296 kxsldbgpart/libxsldbg/options.cpp:326
+msgid ""
+"Error: Option %1 is not a valid boolean/integer option.\n"
+msgstr ""
 
-#: kxsldbgpart/xsldbgconfigimpl.cpp:393
-msgid "Choose Output File for XSL Transformation"
-msgstr "选择 XSL 转换的输出文件"
+#: kxsldbgpart/libxsldbg/options.cpp:368 kxsldbgpart/libxsldbg/options.cpp:399
+msgid ""
+"Error: Option %1 is not a valid string xsldbg option.\n"
+msgstr ""
 
-#: kxsldbgpart/xsldbgconfigimpl.cpp:484
-msgid "Suspect Configuration"
-msgstr "不可信的配置"
+#: kxsldbgpart/libxsldbg/options.cpp:511
+msgid ""
+" Parameter %1 %2=\"%3\"\n"
+msgstr ""
 
-#: kxsldbgpart/xsldbgconfigimpl.cpp:488
-msgid "Incomplete or Invalid Configuration"
-msgstr "未完成或无效的配置"
+#: kxsldbgpart/libxsldbg/options.cpp:546
+msgid ""
+"\n"
+"No parameters present.\n"
+msgstr ""
 
-#: kxsldbgpart/xsldbgdebugger.cpp:298 kxsldbgpart/xsldbgdebugger.cpp:318
-#: kxsldbgpart/xsldbgdebugger.cpp:336 kxsldbgpart/xsldbgdebugger.cpp:356
-#: kxsldbgpart/xsldbgdebugger.cpp:376 kxsldbgpart/xsldbgdebugger.cpp:395
-msgid "Cannot set/edit breakpoints on the output file."
-msgstr "不能在输出文件上设置/编辑断点。"
+#: kxsldbgpart/libxsldbg/files_unix.cpp:67
+msgid ""
+"Error: USER environment variable is not set.\n"
+msgstr ""
 
-#: kxsldbgpart/xsldbgoutputview.cpp:71 kxsldbgpart/xsldbgoutputview.cpp:88
-msgid "xsldbg Output"
-msgstr "xsldbg 输出"
+#: kxsldbgpart/libxsldbg/files_unix.cpp:199
+msgid ""
+"Error: The value of the option docspath or searchresultspath is empty. See help "
+"on setoption or options command for more information.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:140
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:243
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:383
+msgid ""
+"Error: XPath %1 results in an empty Node Set.\n"
+msgstr ""
 
-#: kxsldbgpart/xsldbgoutputview.cpp:72 kxsldbgpart/xsldbgoutputview.cpp:89
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:175
+msgid ""
+"Information: Temporarily setting document's encoding to UTF-8. Previously was "
+"%1.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:229
+msgid ""
+"Error: Unable to save temporary results to %1.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:251
+msgid "NULL string value supplied."
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:262
+msgid "Unable to convert XPath to string."
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:358
+msgid ""
+"Warning: Unable to print expression. No stylesheet was properly loaded.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:418
+#, fuzzy
+msgid ""
+" Global %1\n"
+msgstr "全局"
+
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:421
+#, fuzzy
+msgid " Global "
+msgstr "全局"
+
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:424
+#, fuzzy
+msgid ""
+" Global = %1\n"
+msgstr "全局"
+
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:427
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:430
+msgid ""
+" Global = %1\n"
+"%2"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:430
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:568
+msgid ""
+"Warning: No value assigned to variable.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:483
+msgid ""
+"Error: Debugger has no files loaded or libxslt has not reached a template.\n"
+"Try reloading files or taking more steps.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:520
+msgid ""
+"Error: Libxslt has not initialized variables yet; try stepping to a template.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:556
+#, c-format
+msgid " Local %1"
+msgstr " 本地 %1"
+
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:559
+msgid " Local "
+msgstr " 本地 "
+
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:562
+msgid ""
+" Local = %1\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:565
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:568
+msgid ""
+" Local = %1\n"
+"%2"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/nodeview_cmds.cpp:583
+msgid ""
+"Error: Libxslt has not initialized variables yet; try stepping past the "
+"xsl:param elements in the template.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/template_cmds.cpp:135
+msgid ""
+" template: \"%1\" mode: \"%2\" in file \"%3\" at line %4\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/template_cmds.cpp:184
+#: kxsldbgpart/libxsldbg/variable_cmds.cpp:36
+msgid ""
+"Error: Stylesheet is not valid.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/template_cmds.cpp:226
+msgid ""
+"\tNo XSLT templates found.\n"
+msgstr ""
+"\t没有找到 XSLT 模板。\n"
+
+#: kxsldbgpart/libxsldbg/template_cmds.cpp:228
+#, c-format
+msgid ""
+"_n: \tTotal of %n XSLT template found\n"
+"\tTotal of %n XSLT templates found"
+msgstr "\t总共找到了 %n 个 XSLT 模板"
+
+#: kxsldbgpart/libxsldbg/template_cmds.cpp:229
+#, fuzzy, c-format
+msgid ""
+"_n: \tTotal of %n XSLT template printed\n"
+"\tTotal of %n XSLT templates printed"
+msgstr "\t总共打印了 %n 个 XSLT 模板"
+
+#: kxsldbgpart/libxsldbg/template_cmds.cpp:261
+#: kxsldbgpart/libxsldbg/template_cmds.cpp:290
+msgid ""
+" Stylesheet %1\n"
+msgstr ""
+" 样式表 %1\n"
+
+#: kxsldbgpart/libxsldbg/template_cmds.cpp:325
+#, fuzzy, c-format
+msgid ""
+"_n: \tTotal of %n XSLT stylesheet found.\n"
+"\tTotal of %n XSLT stylesheets found."
+msgstr "\t总共找到了 %n 个 XSLT 模板"
+
+#: kxsldbgpart/libxsldbg/template_cmds.cpp:328
+msgid ""
+"\tNo XSLT stylesheets found.\n"
+msgstr ""
+"\t没有找到 XSLT 样式表。\n"
+
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:270 kxsldbgpart/libxsldbg/xsldbg.cpp:298
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:320
+msgid ""
+"%1 took %2 ms to complete.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:361
+#, c-format
+msgid "XInclude processing %1."
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:399 kxsldbgpart/libxsldbg/xsldbg.cpp:446
+msgid ""
+"Error: Unable to write temporary results to %1.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:409
+#, c-format
+msgid ""
+"_n: Applying stylesheet %n time\n"
+"Applying stylesheet %n times"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:412
+msgid "Applying stylesheet"
+msgstr "应用样式表"
+
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:473 kxsldbgpart/libxsldbg/xsldbg.cpp:491
+msgid "Saving result"
+msgstr "保存结果"
+
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:476
+msgid ""
+"Warning: Generating non-standard output XHTML.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:493
+msgid ""
+"Warning: Unsupported, non-standard output method %1.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:509
+msgid "Running stylesheet and saving result"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:516
+msgid ""
+"Error: Unable to save results of transformation to file %1.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:558 kxsldbgpart/libxsldbg/xsldbg.cpp:887
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:919 kxsldbgpart/libxsldbg/xsldbg.cpp:997
+msgid ""
+"Fatal error: Aborting debugger due to an unrecoverable error.\n"
+msgstr ""
+
+#: kxsldbgpart/kxsldbg_part.cpp:738 kxsldbgpart/libxsldbg/xsldbg.cpp:591
+msgid ""
+"Error: Too many file names supplied via command line.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:683
+msgid ""
+"Warning: Too many libxslt parameters provided via the command line option "
+"--param.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:692
+msgid ""
+"Error: Argument \"%1\" to --param is not in the format <name>:<value>.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:744
+#, fuzzy
 msgid ""
-"\t\txsldbg output capture ready\n"
+"\n"
+"Starting stylesheet\n"
 "\n"
 msgstr ""
-"\t\txsldbg 输出捕获就绪\n"
+"\n"
+"开始样式表\n"
 "\n"
 
-#: kxsldbgpart/xsldbgoutputview.cpp:103
-msgid "Result of evaluation"
-msgstr "计算结果"
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:755
+msgid ""
+"Error: No XSLT source file supplied.\n"
+msgstr ""
 
-#: kxsldbgpart/xsldbgoutputview.cpp:120
-msgid "Request Failed "
-msgstr "请求失败 "
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:758
+msgid ""
+"Error: No XML data file supplied.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:795
+msgid ""
+"\n"
+"Debugger never received control.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:800
+msgid ""
+"\n"
+"Finished stylesheet\n"
+"\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:857
+msgid ""
+"Going to the command shell; not all xsldbg commands will work as not all needed "
+"have been loaded.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:914
+#, fuzzy, c-format
+msgid "Parsing stylesheet %1"
+msgstr "停止跟踪执行样式表"
+
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:916
+msgid ""
+"Error: Cannot parse file %1.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/xsldbg.cpp:995 kxsldbgpart/libxsldbg/xsldbg.cpp:1043
+msgid ""
+"Error: Unable to parse file %1.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/search_cmds.cpp:52
+msgid ""
+"Error: No path to documentation; aborting searching.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/search_cmds.cpp:54
+msgid ""
+"Error: Error in value of USE_DOCS_MACRO; look at Makefile.am.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/search_cmds.cpp:56
+msgid ""
+"Error: Required environment variable %1 not set to the directory of xsldbg "
+"documentation.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/search_cmds.cpp:62
+msgid ""
+"Error: Stylesheet not valid, files not loaded yet?\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/variable_cmds.cpp:99
+msgid ""
+"Error: Cannot change a variable that does not use the select attribute.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/variable_cmds.cpp:102
+msgid ""
+"Error: Variable %1 was not found.\n"
+msgstr ""
+
+#: kxsldbgpart/libxsldbg/debug.cpp:135
+msgid ""
+"Error: XSLT source and XML data are empty. Cannot enter the debugger.\n"
+msgstr ""
+
+#: kxsldbgpart/xsldbglocallistitem.cpp:32
+#: kxsldbgpart/xsldbglocalvariablesimpl.cpp:71
+#, fuzzy
+msgid "Local"
+msgstr "本地"
+
+#: kxsldbgpart/xsldbglocallistitem.cpp:34
+#: kxsldbgpart/xsldbglocalvariablesimpl.cpp:73
+#, fuzzy
+msgid "Global"
+msgstr "全局"
+
+#: kxsldbgpart/xsldbgdebugger.cpp:298 kxsldbgpart/xsldbgdebugger.cpp:318
+#: kxsldbgpart/xsldbgdebugger.cpp:336 kxsldbgpart/xsldbgdebugger.cpp:356
+#: kxsldbgpart/xsldbgdebugger.cpp:376 kxsldbgpart/xsldbgdebugger.cpp:395
+msgid "Cannot set/edit breakpoints on the output file."
+msgstr "不能在输出文件上设置/编辑断点。"
 
 #: kxsldbgpart/kxsldbg_part.cpp:87 kxsldbgpart/kxsldbg_part.cpp:634
 #: kxsldbgpart/kxsldbg_part.cpp:636
 msgid "Goto XPath"
 msgstr "转到 XPath"
 
-#. i18n: file ./kxsldbgpart/xsldbgglobalvariables.ui line 185
-#: kxsldbgpart/kxsldbg_part.cpp:95 rc.cpp:33 rc.cpp:339
-#, no-c-format
-msgid "Evaluate"
-msgstr "计算"
-
 #: kxsldbgpart/kxsldbg_part.cpp:109
 #, fuzzy
 msgid "Configure Editor..."
@@ -1298,12 +1924,6 @@ msgstr "运行"
 msgid "Step"
 msgstr "步进"
 
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 261
-#: kxsldbgpart/kxsldbg_part.cpp:140 rc.cpp:108
-#, no-c-format
-msgid "Next"
-msgstr "下一个"
-
 #: kxsldbgpart/kxsldbg_part.cpp:145
 msgid "Step Up"
 msgstr ""
@@ -1418,637 +2038,22 @@ msgstr ""
 "SystemID 或 PublicID 被解析到\n"
 ".%1"
 
-#. i18n: file kxsldbg_shell.rc line 9
-#: rc.cpp:6 rc.cpp:312 rc.cpp:381
-#, no-c-format
-msgid "Debug"
-msgstr "调试"
-
-#. i18n: file ./kxsldbgpart/xsldbgglobalvariables.ui line 25
-#: rc.cpp:15
-#, no-c-format
-msgid "Xsldbg Global Variables"
-msgstr "Xsldbg 全局变量"
-
-#. i18n: file ./kxsldbgpart/xsldbgglobalvariables.ui line 40
-#: rc.cpp:18 rc.cpp:63 rc.cpp:201 rc.cpp:345
-#, no-c-format
-msgid "Name"
-msgstr "名称"
-
-#. i18n: file ./kxsldbgpart/xsldbgglobalvariables.ui line 51
-#: rc.cpp:21 rc.cpp:78 rc.cpp:354
-#, no-c-format
-msgid "Source File"
-msgstr "源文件"
-
-#. i18n: file ./kxsldbgpart/xsldbgglobalvariables.ui line 62
-#: rc.cpp:24 rc.cpp:357
-#, no-c-format
-msgid "Source Line Number"
-msgstr "源文件行号"
-
-#. i18n: file ./kxsldbgpart/xsldbgglobalvariables.ui line 150
-#: rc.cpp:27 rc.cpp:333
-#, no-c-format
-msgid "Expression:"
-msgstr "表达式："
-
-#. i18n: file ./kxsldbgpart/xsldbgglobalvariables.ui line 158
-#: rc.cpp:30 rc.cpp:336
-#, no-c-format
-msgid "Enter a valid XPath expression"
-msgstr "输入一个有效的XPath表达式"
-
-#. i18n: file ./kxsldbgpart/xsldbgglobalvariables.ui line 188
-#: rc.cpp:36 rc.cpp:342
-#, no-c-format
-msgid "Result of evaluation will appear in message window"
-msgstr "计算结果会显示在消息窗口中"
-
-#. i18n: file ./kxsldbgpart/xsldbgglobalvariables.ui line 229
-#: rc.cpp:39 rc.cpp:57 rc.cpp:87 rc.cpp:282 rc.cpp:327 rc.cpp:375
-#, no-c-format
-msgid "Refresh"
-msgstr "刷新"
-
-#. i18n: file ./kxsldbgpart/xsldbgcallstack.ui line 17
-#: rc.cpp:42
-#, no-c-format
-msgid "Xsldbg Callstack"
-msgstr "Xsldbg 堆栈"
-
-#. i18n: file ./kxsldbgpart/xsldbgcallstack.ui line 32
-#: rc.cpp:45
-#, no-c-format
-msgid "Frame# Template Name"
-msgstr "框架号 模板名称"
-
-#. i18n: file ./kxsldbgpart/xsldbgcallstack.ui line 43
-#: rc.cpp:48 rc.cpp:69
-#, no-c-format
-msgid "Source File Name"
-msgstr "源文件名"
-
-#. i18n: file ./kxsldbgpart/xsldbgcallstack.ui line 54
-#: rc.cpp:51 rc.cpp:72 rc.cpp:210
-#, no-c-format
-msgid "Line Number"
-msgstr "行号"
-
-#. i18n: file ./kxsldbgpart/xsldbgcallstack.ui line 75
-#: rc.cpp:54
-#, no-c-format
-msgid "Oldest Frame # is 0, Frame # has been added to the first column"
-msgstr "最早的框架号是 0，框架号已被添加到第一列"
-
-#. i18n: file ./kxsldbgpart/xsldbgtemplates.ui line 17
-#: rc.cpp:60
-#, no-c-format
-msgid "Xsldbg Templates"
-msgstr "Xsldbg 模板"
-
-#. i18n: file ./kxsldbgpart/xsldbgtemplates.ui line 43
-#: rc.cpp:66 rc.cpp:204
-#, no-c-format
-msgid "Mode"
-msgstr "模式"
-
-#. i18n: file ./kxsldbgpart/xsldbgsources.ui line 17
-#: rc.cpp:75
-#, no-c-format
-msgid "Xsldbg Source Files"
-msgstr "Xsldbg 源文件"
-
-#. i18n: file ./kxsldbgpart/xsldbgsources.ui line 43
-#: rc.cpp:81
-#, no-c-format
-msgid "Parent File"
-msgstr "父文件"
-
-#. i18n: file ./kxsldbgpart/xsldbgsources.ui line 54
-#: rc.cpp:84
-#, no-c-format
-msgid "Parent Line Number"
-msgstr "父行号"
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 31
-#: rc.cpp:90
-#, no-c-format
-msgid "KXsldbg Configuration"
-msgstr "KXsldbg 配置"
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 75
-#: rc.cpp:93
-#, no-c-format
-msgid "LibXSLT Parameters"
-msgstr "LibXSLT 参数"
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 108
-#: rc.cpp:96
-#, no-c-format
-msgid "Parameter value:"
-msgstr "参数数值："
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 148
-#: rc.cpp:99
-#, no-c-format
-msgid "Parameter name:"
-msgstr "参数名称："
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 229
-#: rc.cpp:102
-#, no-c-format
-msgid "Prev"
-msgstr "前一个"
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 464
-#: rc.cpp:120
-#, no-c-format
-msgid "Output file:"
-msgstr "输出文件："
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 488
-#: rc.cpp:123 rc.cpp:129 rc.cpp:135
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 512
-#: rc.cpp:126
-#, no-c-format
-msgid "XML data:"
-msgstr "XML 数据："
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 560
-#: rc.cpp:132
-#, no-c-format
-msgid "XSL source:"
-msgstr "XSL源文件："
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 621
-#: rc.cpp:141
-#, no-c-format
-msgid "catalogs"
-msgstr "目录"
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 624
-#: rc.cpp:144
-#, no-c-format
-msgid "use catalogs from $SGML_CATALOGS_FILES"
-msgstr "使用来自 $SGML_CATALOGS_FILES 的目录"
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 632
-#: rc.cpp:147
-#, no-c-format
-msgid "novalid"
-msgstr "无效"
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 635
-#: rc.cpp:150
-#, no-c-format
-msgid "skip the DTD loading phase"
-msgstr "跳过DTD载入阶段"
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 643
-#: rc.cpp:153
-#, no-c-format
-msgid "html"
-msgstr "html"
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 646
-#: rc.cpp:156
-#, no-c-format
-msgid "the input document is(are) an HTML file(s)"
-msgstr "输入文件是 HTML 文件"
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 654
-#: rc.cpp:159
-#, no-c-format
-msgid "docbook"
-msgstr "docbook"
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 657
-#: rc.cpp:162
-#, no-c-format
-msgid "the input document is SGML docbook"
-msgstr "输入文件是SGML docbook"
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 665
-#: rc.cpp:165
-#, no-c-format
-msgid "debug"
-msgstr "调试"
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 668
-#: rc.cpp:168
-#, no-c-format
-msgid "dump the tree of the result instead"
-msgstr "以转储结果树代替"
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 676
-#: rc.cpp:171
-#, no-c-format
-msgid "noout"
-msgstr "无输出"
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 679
-#: rc.cpp:174
-#, no-c-format
-msgid "do not dump the result"
-msgstr "不转储结果"
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 687
-#: rc.cpp:177
-#, no-c-format
-msgid "profile"
-msgstr "配置文件"
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 690
-#: rc.cpp:180
-#, no-c-format
-msgid "print profiling information"
-msgstr "输出配置文件信息"
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 698
-#: rc.cpp:183
-#, no-c-format
-msgid "timing"
-msgstr "时间"
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 701
-#: rc.cpp:186
-#, no-c-format
-msgid "display the time used"
-msgstr "显示已用的时间"
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 709
-#: rc.cpp:189
-#, no-c-format
-msgid "nonet"
-msgstr "无网络"
-
-#. i18n: file ./kxsldbgpart/xsldbgconfig.ui line 712
-#: rc.cpp:192
-#, no-c-format
-msgid "refuse to fetch DTDs or entities over network"
-msgstr "拒绝从网络中获取 DTD 或实体定义"
-
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 17
-#: rc.cpp:195
-#, no-c-format
-msgid "Xsldbg Breakpoints"
-msgstr "Xsldbg 断点"
-
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 26
-#: rc.cpp:198
-#, no-c-format
-msgid "ID"
-msgstr "ID"
-
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 59
-#: rc.cpp:207
-#, no-c-format
-msgid "File Name"
-msgstr "文件名"
-
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 102
-#: rc.cpp:216
-#, no-c-format
-msgid "Click breakpoint in list to modify or delete it"
-msgstr "点击列表中的断点来修改或删除它"
-
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 138
-#: rc.cpp:219
-#, no-c-format
-msgid "ID:"
-msgstr "ID："
-
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 146
-#: rc.cpp:222
-#, no-c-format
-msgid "Line number:"
-msgstr "行号："
-
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 154
-#: rc.cpp:225
-#, no-c-format
-msgid "You don't need to specify directory for file name"
-msgstr "您不需要指定文件名称的目录"
-
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 162
-#: rc.cpp:228
-#, no-c-format
-msgid "Template name or match name to look for"
-msgstr "模板名称或要查找的匹配名称"
-
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 198
-#: rc.cpp:231 rc.cpp:234
-#, no-c-format
-msgid "Must be positive"
-msgstr "必须是正数"
-
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 285
-#: rc.cpp:237
-#, no-c-format
-msgid "Mode:"
-msgstr "模式："
-
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 293
-#: rc.cpp:240
-#, no-c-format
-msgid "Name:"
-msgstr "名称："
-
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 301
-#: rc.cpp:243
-#, no-c-format
-msgid "File name:"
-msgstr "文件名："
-
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 375
-#: rc.cpp:249
-#, no-c-format
-msgid "Delete breakpoint using ID"
-msgstr "用ID删除断点"
-
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 386
-#: rc.cpp:255
-#, no-c-format
-msgid "Clear entered text"
-msgstr "清除已输入的文字"
-
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 394
-#: rc.cpp:258
-#, no-c-format
-msgid "Add All"
-msgstr "全部添加"
-
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 397
-#: rc.cpp:261
-#, no-c-format
-msgid "Add breakpoint on all templates found"
-msgstr "在所有找到的模板中添加断点"
-
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 408
-#: rc.cpp:267
-#, no-c-format
-msgid "Delete all breakpoints"
-msgstr "删除所有断点"
-
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 416
-#: rc.cpp:270
-#, no-c-format
-msgid "Enable"
-msgstr "启用"
-
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 419
-#: rc.cpp:273
-#, no-c-format
-msgid "Enable breakpoint using ID"
-msgstr "用ID启用断点"
-
-#. i18n: file ./kxsldbgpart/xsldbgbreakpoints.ui line 430
-#: rc.cpp:279
-#, no-c-format
-msgid "Add breakpoint using file name with line number or a template name"
-msgstr "用带行号的文件名或模板名称添加断点"
-
-#. i18n: file ./kxsldbgpart/xsldbgwalkspeed.ui line 17
-#: rc.cpp:285
-#, no-c-format
-msgid "Configure xsldbg's Walk Speed"
-msgstr "配置 xsldbg 的遍历速度"
-
-#. i18n: file ./kxsldbgpart/xsldbgwalkspeed.ui line 51
-#: rc.cpp:288
-#, no-c-format
-msgid ""
-"Change the speed at which xsldbg walks through execution of the stylesheet."
-msgstr "更改 xsldbg 遍历样式表时的速度。"
-
-#. i18n: file ./kxsldbgpart/xsldbgwalkspeed.ui line 95
-#: rc.cpp:291
-#, no-c-format
-msgid "Slow"
-msgstr "慢"
-
-#. i18n: file ./kxsldbgpart/xsldbgwalkspeed.ui line 117
-#: rc.cpp:294
-#, no-c-format
-msgid "Fast"
-msgstr "快"
-
-#. i18n: file ./kxsldbgpart/xsldbgmsgdialog.ui line 26
-#: rc.cpp:303
-#, no-c-format
-msgid "qxsldbg Message"
-msgstr "qxsldbg 消息"
-
-#. i18n: file ./kxsldbgpart/xsldbgmsgdialog.ui line 71
-#: rc.cpp:306
-#, no-c-format
-msgid "TextLabel1"
-msgstr "TextLabel1"
-
-#. i18n: file ./kxsldbgpart/xsldbgentities.ui line 25
-#: rc.cpp:318
-#, no-c-format
-msgid "Xsldbg Entities"
-msgstr "Xsldbg 实体"
-
-#. i18n: file ./kxsldbgpart/xsldbgentities.ui line 40
-#: rc.cpp:321
-#, no-c-format
-msgid "PublicID"
-msgstr "PublicID"
-
-#. i18n: file ./kxsldbgpart/xsldbgentities.ui line 51
-#: rc.cpp:324
-#, no-c-format
-msgid "SystemID"
-msgstr "SystemID"
-
-#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 25
-#: rc.cpp:330
-#, no-c-format
-msgid "Xsldbg Local Variables"
-msgstr "Xsldbg 本地变量"
-
-#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 161
-#: rc.cpp:348
-#, no-c-format
-msgid "Template Context"
-msgstr "模板内容"
-
-#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 172
-#: rc.cpp:351
-#, no-c-format
-msgid "Type"
-msgstr ""
-
-#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 228
-#: rc.cpp:360
-#, fuzzy, no-c-format
-msgid "Variable expression:"
-msgstr "计算表达式"
-
-#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 249
-#: rc.cpp:363
-#, fuzzy, no-c-format
-msgid "Variable type:"
-msgstr "文件名："
-
-#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 270
-#: rc.cpp:366
-#, fuzzy, no-c-format
-msgid "Set Expression"
-msgstr "表达式："
-
-#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 273
-#: rc.cpp:369
-#, no-c-format
-msgid "Set the selection for variable "
-msgstr ""
-
-#. i18n: file ./kxsldbgpart/xsldbglocalvariables.ui line 283
-#: rc.cpp:372
-#, fuzzy, no-c-format
-msgid "Variable name:"
-msgstr "文件名："
+#: kxsldbgpart/xsldbgbreakpointlistitem.cpp:40
+msgid "Disabled"
+msgstr "禁用"
 
-#: xsldbgmain.cpp:51
-#, fuzzy
-msgid "A TDE console application for xsldbg, an XSLT debugger"
+#: main.cpp:9
+msgid "A TDE KPart Application for xsldbg, an XSLT debugger"
 msgstr "xsldbg 是一个 XSLT 调试器，是一个 TDE KPart 程序"
 
-#: xsldbgmain.cpp:57
-msgid "Start a shell"
-msgstr ""
-
-#: xsldbgmain.cpp:58
-msgid "Path to change into before loading files"
-msgstr ""
-
-#: xsldbgmain.cpp:59
-msgid "Add a parameter named <name> and value <value> to XSL environment"
-msgstr ""
-
-#: xsldbgmain.cpp:60
-msgid "Use ISO 639 language code specified; for example en_US"
-msgstr ""
-
-#: xsldbgmain.cpp:60
-msgid "Save to a given file. See output command documentation"
-msgstr ""
-
-#: xsldbgmain.cpp:61
-msgid "Show the version of libxml and libxslt used"
-msgstr ""
-
-#: xsldbgmain.cpp:62
-msgid "Show logs of what is happening"
-msgstr ""
-
-#: xsldbgmain.cpp:63
-msgid "Display the time used"
-msgstr "显示已用的时间"
-
-#: xsldbgmain.cpp:64
-msgid "Run the transformation 20 times"
-msgstr ""
-
-#: xsldbgmain.cpp:66
-msgid "Dump the tree of the result instead"
-msgstr "以转储结果树代替"
-
-#: xsldbgmain.cpp:68
-msgid "Disable the DTD loading phase"
-msgstr "禁用DTD载入阶段"
-
-#: xsldbgmain.cpp:69
-msgid "Disable the output of the result"
-msgstr "禁用输出结果"
-
-#: xsldbgmain.cpp:70
-msgid "Increase the maximum depth"
-msgstr ""
-
-#: xsldbgmain.cpp:73
-msgid "The input document is(are) an HTML file(s)"
-msgstr "输入文档是 HTML 文件"
-
-#: xsldbgmain.cpp:77
-msgid "The input document is SGML docbook"
-msgstr "输入文档是 SGML docbook"
-
-#: xsldbgmain.cpp:80
-msgid "Disable the fetching DTDs or entities over network"
-msgstr "禁止从网络中获取 DTD 或实体定义"
-
-#: xsldbgmain.cpp:83
-msgid "Use the catalogs from $SGML_CATALOG_FILES"
-msgstr "使用来自 $SGML_CATALOGS_FILES 的目录"
-
-#: xsldbgmain.cpp:87
-msgid "Disable XInclude processing on document input"
-msgstr ""
-
-#: xsldbgmain.cpp:90
-msgid "Print profiling informations"
-msgstr "打印配置文件信息"
-
-#: xsldbgmain.cpp:91
-msgid "Do not run gdb compatability mode and print less information"
-msgstr ""
-
-#: xsldbgmain.cpp:92
-msgid "Detect and use encodings in the stylesheet"
-msgstr ""
-
-#: xsldbgmain.cpp:93
-msgid "Treat command line input as encoded in UTF-8"
-msgstr ""
-
-#: xsldbgmain.cpp:94
-msgid "Use HTML output when generating search reports"
-msgstr ""
-
-#: xsldbgmain.cpp:95
-msgid ""
-"Print all error messages to stdout, normally error messages go to stderr"
-msgstr ""
-
-#: xsldbgmain.cpp:96
-msgid ""
-"Disable the automatic restarting of execution when current processing pass is "
-"complete"
-msgstr ""
-
-#: xsldbgmain.cpp:124
-msgid ""
-"Using libxml %1, libxslt %2 and libexslt %3\n"
-msgstr ""
-
-#: xsldbgmain.cpp:125
-msgid ""
-"xsldbg was compiled against libxml %1, libxslt %2 and libexslt %3\n"
-msgstr ""
-
-#: xsldbgmain.cpp:126
-msgid ""
-"libxslt %1 was compiled against libxml %2\n"
+#: main.cpp:16
+msgid "File to save results to"
 msgstr ""
 
-#: xsldbgmain.cpp:127
-msgid ""
-"libexslt %1 was compiled against libxml %2\n"
+#: main.cpp:22
+msgid "KXSLDbg"
 msgstr ""
 
-#: xsldbgmain.cpp:130
-msgid "Xsldbg"
-msgstr "Xsldbg"
-
 #~ msgid "KXsldbg"
 #~ msgstr "KXsldbg"
 
diff --git a/tde-i18n-zh_CN/messages/tdewebdev/quanta.po b/tde-i18n-zh_CN/messages/tdewebdev/quanta.po
index 317851e6584..6162386d992 100644
--- a/tde-i18n-zh_CN/messages/tdewebdev/quanta.po
+++ b/tde-i18n-zh_CN/messages/tdewebdev/quanta.po
@@ -7,508 +7,1102 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: quanta\n"
-"POT-Creation-Date: 2008-07-08 01:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-12-11 13:40+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. i18n: file ./dialogs/fourbuttonmessagebox.ui line 74
+#. i18n: file ./plugins/plugineditor.ui line 32
+#: plugins/quantaplugineditor.cpp:45 plugins/quantaplugininterface.cpp:260
+#: rc.cpp:3
+#, no-c-format
+msgid "Edit Plugins"
+msgstr "编辑插件"
+
+#. i18n: file ./plugins/plugineditor.ui line 49
 #: rc.cpp:6
 #, no-c-format
-msgid "Save &As..."
-msgstr "另存为(&A)..."
+msgid "Search paths:"
+msgstr "搜索路径："
 
-#. i18n: file ./dialogs/fourbuttonmessagebox.ui line 90
-#: rc.cpp:9
+#. i18n: file ./plugins/plugineditor.ui line 57
+#: rc.cpp:9 treeviews/basetreeview.cpp:617
 #, no-c-format
-msgid "&Do Not Save"
-msgstr "不保存(&D)"
+msgid "Plugins"
+msgstr "插件"
+
+#. i18n: file ./plugins/plugineditor.ui line 72
+#: ../lib/compatibility/knewstuff/downloaddialog.cpp:221
+#: ../lib/compatibility/knewstuff/downloaddialog.cpp:227
+#: ../lib/compatibility/knewstuff/downloaddialog.cpp:233
+#: ../lib/compatibility/knewstuff/providerdialog.cpp:65
+#: components/debugger/variableslistview.cpp:54 parts/kafka/domtreeview.cpp:34
+#: parts/kafka/htmldocumentproperties.cpp:88 parts/kafka/wkafkapart.cpp:75
+#: rc.cpp:12 rc.cpp:907 rc.cpp:2596 treeviews/doctreeview.cpp:50
+#: treeviews/structtreeview.cpp:84 treeviews/uploadtreeview.cpp:35
+#, no-c-format
+msgid "Name"
+msgstr "名称"
+
+#. i18n: file ./plugins/plugineditor.ui line 83
+#: rc.cpp:15
+#, no-c-format
+msgid "Valid"
+msgstr "合法"
+
+#. i18n: file ./plugins/plugineditor.ui line 94
+#: rc.cpp:18
+#, no-c-format
+msgid "Location"
+msgstr "位置"
+
+#. i18n: file ./plugins/plugineditor.ui line 105
+#: rc.cpp:21 rc.cpp:5141
+#, no-c-format
+msgid "File Name"
+msgstr "文件名"
+
+#. i18n: file ./plugins/plugineditor.ui line 116
+#: rc.cpp:24
+#, no-c-format
+msgid "Output Window"
+msgstr "输出窗口"
+
+#. i18n: file ./plugins/plugineditor.ui line 134
+#: rc.cpp:27 rc.cpp:39 rc.cpp:384
+#, no-c-format
+msgid "Add..."
+msgstr "添加..."
+
+#. i18n: file ./plugins/plugineditor.ui line 145
+#: rc.cpp:30
+#, no-c-format
+msgid "Configure..."
+msgstr "配置..."
+
+#. i18n: file ./plugins/plugineditor.ui line 178
+#: rc.cpp:36 rc.cpp:5363
+#, no-c-format
+msgid "Refresh"
+msgstr "刷新"
+
+#. i18n: file ./plugins/pluginconfig.ui line 33
+#: plugins/quantapluginconfig.cpp:40 rc.cpp:42
+#, no-c-format
+msgid "Configure Plugin"
+msgstr "配置插件"
+
+#. i18n: file ./plugins/pluginconfig.ui line 44
+#: rc.cpp:45
+#, no-c-format
+msgid "Validate plugin"
+msgstr "校验插件"
+
+#. i18n: file ./plugins/pluginconfig.ui line 86
+#: rc.cpp:48
+#, no-c-format
+msgid "Plugin Options"
+msgstr "插件选项"
+
+#. i18n: file ./plugins/pluginconfig.ui line 97
+#: ../lib/compatibility/knewstuff/uploaddialog.cpp:57 rc.cpp:51 rc.cpp:189
+#: rc.cpp:1086 rc.cpp:2780
+#, no-c-format
+msgid "Name:"
+msgstr "名称："
+
+#. i18n: file ./plugins/pluginconfig.ui line 105
+#: rc.cpp:54
+#, no-c-format
+msgid "The plugin name as it appears in the Plugins menu."
+msgstr "出现在插件菜单中的插件名称"
+
+#. i18n: file ./plugins/pluginconfig.ui line 141
+#: rc.cpp:57
+#, no-c-format
+msgid "Location:"
+msgstr "位置："
+
+#. i18n: file ./plugins/pluginconfig.ui line 149
+#: rc.cpp:60
+#, no-c-format
+msgid ""
+"The exact location of the plugin. If not set the global search paths setting is "
+"used."
+msgstr "插件的确切位置。如果没有设置的话，将会使用全局搜索路径设置。"
+
+#. i18n: file ./plugins/pluginconfig.ui line 157
+#: rc.cpp:63
+#, no-c-format
+msgid "The plugin executable or library name (with extension)."
+msgstr "插件可执行文件或库名(带扩展名)。"
+
+#. i18n: file ./plugins/pluginconfig.ui line 165
+#: rc.cpp:66 treeviews/basetreeview.cpp:1209 treeviews/projecttreeview.cpp:393
+#, no-c-format
+msgid "File name:"
+msgstr "文件名："
+
+#. i18n: file ./plugins/pluginconfig.ui line 186
+#: rc.cpp:69
+#, no-c-format
+msgid "Output window:"
+msgstr "输出窗口："
+
+#. i18n: file ./plugins/pluginconfig.ui line 200
+#: dialogs/filecombo.cpp:45 dialogs/filecombo.cpp:67
+#: dialogs/tagdialogs/tagimgdlgdata.cpp:34
+#: dialogs/tagdialogs/tagimgdlgdata.cpp:67 rc.cpp:72 rc.cpp:1758 rc.cpp:2680
+#: rc.cpp:2683 rc.cpp:2753 rc.cpp:2759 rc.cpp:2762 rc.cpp:2852
+#, no-c-format
+msgid "..."
+msgstr "..."
+
+#. i18n: file ./plugins/pluginconfig.ui line 208
+#: rc.cpp:75
+#, no-c-format
+msgid "&Read only part"
+msgstr "只读部分(&R)"
+
+#. i18n: file ./plugins/pluginconfig.ui line 216
+#: rc.cpp:78
+#, no-c-format
+msgid "Input:"
+msgstr "输入："
+
+#. i18n: file ./plugins/pluginconfig.ui line 222
+#: dialogs/actionconfigdialog.cpp:320 dialogs/tagdialogs/colorcombo.cpp:220
+#: rc.cpp:81 rc.cpp:943 rc.cpp:979 rc.cpp:991 rc.cpp:1009
+#, no-c-format
+msgid "None"
+msgstr "无"
+
+#. i18n: file ./plugins/pluginconfig.ui line 227
+#: messages/annotationoutput.cpp:42 rc.cpp:84
+#, no-c-format
+msgid "Current File"
+msgstr "当前文件"
+
+#. i18n: file ./plugins/pluginconfig.ui line 232
+#: rc.cpp:87
+#, no-c-format
+msgid "Current File Path"
+msgstr "当前文件路径"
+
+#. i18n: file ./plugins/pluginconfig.ui line 237
+#: rc.cpp:90
+#, no-c-format
+msgid "Project Folder"
+msgstr "工程文件夹"
+
+#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 16
+#: rc.cpp:93
+#, no-c-format
+msgid "Document Properties"
+msgstr "文档属性"
+
+#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 25
+#: rc.cpp:96
+#, no-c-format
+msgid "Column 1"
+msgstr "第 1 列"
+
+#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 36
+#: rc.cpp:99
+#, no-c-format
+msgid "New Item"
+msgstr "新建项"
+
+#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 79
+#: rc.cpp:102
+#, no-c-format
+msgid "Current DTD: "
+msgstr "当前 DTD："
+
+#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 95
+#: rc.cpp:105
+#, no-c-format
+msgid "Title: "
+msgstr "标题："
+
+#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 111
+#: rc.cpp:108
+#, no-c-format
+msgid "Link CSS stylesheet:"
+msgstr "链接的 CSS 样式表："
+
+#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 127
+#: rc.cpp:111
+#, no-c-format
+msgid "Meta items:"
+msgstr "Meta 项："
+
+#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 160
+#: rc.cpp:114
+#, no-c-format
+msgid "CSS rules:"
+msgstr "CSS 规则："
+
+#. i18n: file ./parts/kafka/kafkasyncoptionsui.ui line 24
+#: rc.cpp:138
+#, no-c-format
+msgid "Dual Views Mode Synchronization"
+msgstr "双视图模式同步"
+
+#. i18n: file ./parts/kafka/kafkasyncoptionsui.ui line 66
+#: rc.cpp:141 rc.cpp:150
+#, no-c-format
+msgid "ms"
+msgstr "毫秒"
+
+#. i18n: file ./parts/kafka/kafkasyncoptionsui.ui line 85
+#: rc.cpp:144
+#, no-c-format
+msgid "Refresh the VPL editor on click"
+msgstr "单击时刷新 VPL 编辑器"
+
+#. i18n: file ./parts/kafka/kafkasyncoptionsui.ui line 93
+#: rc.cpp:147
+#, no-c-format
+msgid "Refresh the VPL editor every:"
+msgstr "刷新 VPL 编辑器，每隔："
+
+#. i18n: file ./parts/kafka/kafkasyncoptionsui.ui line 153
+#: rc.cpp:153
+#, no-c-format
+msgid "Refresh the source editor on click"
+msgstr "单击时刷新源代码编辑器"
+
+#. i18n: file ./parts/kafka/kafkasyncoptionsui.ui line 161
+#: rc.cpp:156
+#, no-c-format
+msgid "Refresh the source editor every:"
+msgstr "刷新源代码编辑器，每隔："
+
+#. i18n: file ./parts/kafka/kafkasyncoptionsui.ui line 190
+#: rc.cpp:159
+#, no-c-format
+msgid "Show an icon where scripts are located"
+msgstr "在脚本的位置显示图标"
+
+#. i18n: file ./treeviews/quantapropertiespage.ui line 39
+#: rc.cpp:162
+#, no-c-format
+msgid "Quanta Properties"
+msgstr "Quanta 属性"
+
+#. i18n: file ./treeviews/quantapropertiespage.ui line 65
+#: rc.cpp:165
+#, no-c-format
+msgid "&Inherit type from parent (nothing)"
+msgstr "从父标签继承类型(无)(&I)"
+
+#. i18n: file ./treeviews/quantapropertiespage.ui line 73
+#: rc.cpp:168
+#, no-c-format
+msgid "&Type:"
+msgstr "类型(&T)："
+
+#. i18n: file ./treeviews/quantapropertiespage.ui line 117
+#: rc.cpp:171
+#, no-c-format
+msgid "Use &pre/post text"
+msgstr "使用前置/后置文本(&P)"
+
+#. i18n: file ./treeviews/quantapropertiespage.ui line 125
+#: rc.cpp:174
+#, no-c-format
+msgid "Pre-text:"
+msgstr "前置文本："
+
+#. i18n: file ./treeviews/quantapropertiespage.ui line 141
+#: rc.cpp:177
+#, no-c-format
+msgid "Post-text:"
+msgstr "后置文本："
+
+#. i18n: file ./treeviews/quantapropertiespage.ui line 189
+#: rc.cpp:180
+#, no-c-format
+msgid "Filtering &action:"
+msgstr "过滤动作(&A)："
+
+#. i18n: file ./treeviews/templatedirform.ui line 26
+#: rc.cpp:183
+#, no-c-format
+msgid "Create Template Folder"
+msgstr "创建模板文件夹"
+
+#. i18n: file ./treeviews/templatedirform.ui line 37
+#: rc.cpp:186 rc.cpp:1199
+#, no-c-format
+msgid "Type:"
+msgstr "类型："
+
+#. i18n: file ./treeviews/templatedirform.ui line 63
+#: rc.cpp:192
+#, no-c-format
+msgid "&Inherit parent attribute"
+msgstr "继承父标签属性(&I)"
+
+#. i18n: file ./treeviews/fileinfodlg.ui line 32
+#: rc.cpp:201
+#, no-c-format
+msgid "Number of lines:"
+msgstr "行数："
+
+#. i18n: file ./treeviews/fileinfodlg.ui line 40
+#: rc.cpp:204
+#, no-c-format
+msgid "Number of images included:"
+msgstr "所包含的图像数："
+
+#. i18n: file ./treeviews/fileinfodlg.ui line 48
+#: rc.cpp:207
+#, no-c-format
+msgid "Size of the included images:"
+msgstr "所包含图像的大小："
+
+#. i18n: file ./treeviews/fileinfodlg.ui line 56
+#: rc.cpp:210
+#, no-c-format
+msgid "Total file size:"
+msgstr "总计文件大小："
+
+#. i18n: file ./treeviews/fileinfodlg.ui line 72
+#: rc.cpp:213
+#, no-c-format
+msgid "Included images:"
+msgstr "所包含的图像："
+
+#. i18n: file ./treeviews/fileinfodlg.ui line 80
+#: rc.cpp:216 rc.cpp:3583 treeviews/basetreeview.cpp:512
+#, no-c-format
+msgid "Description:"
+msgstr "描述："
+
+#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 31
+#: parsers/dtd/dtdparser.cpp:110 rc.cpp:219
+#, no-c-format
+msgid "DTD - > DTEP Conversion"
+msgstr "DTD -> DTEP 转换"
+
+#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 55
+#: rc.cpp:222
+#, no-c-format
+msgid "Name: "
+msgstr "名称："
+
+#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 63
+#: rc.cpp:225 rc.cpp:2873
+#, no-c-format
+msgid "Nickname:"
+msgstr "昵称："
+
+#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 71
+#: rc.cpp:228
+#, no-c-format
+msgid "!DOCTYPE definition line:"
+msgstr "!DOCTYPE 定义行："
+
+#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 94
+#: rc.cpp:231
+#, no-c-format
+msgid "DTD URL:"
+msgstr "DTD URL："
+
+#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 102
+#: rc.cpp:234
+#, no-c-format
+msgid "Target directory name:"
+msgstr "目的目录名称："
+
+#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 110
+#: rc.cpp:237
+#, no-c-format
+msgid "Default extension:"
+msgstr "默认扩展名："
+
+#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 123
+#: rc.cpp:240
+#, no-c-format
+msgid "Case-sensitive tags and attributes"
+msgstr "标签和属性区分大小写"
+
+#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 134
+#: rc.cpp:243
+#, no-c-format
+msgid "&Fine-tune the DTEP after conversion"
+msgstr "转换后调整 DTEP(&F)"
 
 #. i18n: file ./dialogs/dirtydialog.ui line 39
-#: dialogs/dirtydlg.cpp:37 rc.cpp:15
+#: dialogs/dirtydlg.cpp:37 rc.cpp:246
 #, no-c-format
 msgid "File Changed"
 msgstr "文件已更改"
 
 #. i18n: file ./dialogs/dirtydialog.ui line 58
-#: rc.cpp:18
+#: rc.cpp:249
 #, no-c-format
 msgid "The file was changed outside of the Quanta editor."
 msgstr "文件在 Quanta 编辑器之外发生了更改。"
 
 #. i18n: file ./dialogs/dirtydialog.ui line 66
-#: rc.cpp:21
+#: rc.cpp:252
 #, no-c-format
 msgid " How Do You Want to Proceed?"
 msgstr "您想怎么处理？"
 
 #. i18n: file ./dialogs/dirtydialog.ui line 83
-#: rc.cpp:24
+#: rc.cpp:255
 #, no-c-format
 msgid "&Do not load the modified version from disk"
 msgstr "不从磁盘上装入修改的版本(&D)"
 
 #. i18n: file ./dialogs/dirtydialog.ui line 91
-#: rc.cpp:27
+#: rc.cpp:258
 #, no-c-format
 msgid "&Use the version from disk (will lose the current content)"
 msgstr "使用磁盘上的版本(将会丢失当前内容)(&U)"
 
 #. i18n: file ./dialogs/dirtydialog.ui line 107
-#: rc.cpp:30
+#: rc.cpp:261
 #, no-c-format
 msgid "(If you later save the document, you will lose what was on the disk.)"
 msgstr "(如果您稍后保存文档，您将会丢失磁盘上文件里现有的内容。)"
 
 #. i18n: file ./dialogs/dirtydialog.ui line 135
-#: rc.cpp:33
+#: rc.cpp:264
 #, no-c-format
 msgid "&Compare the two versions and load the result"
 msgstr "比较两个版本并装入结果(&C)"
 
 #. i18n: file ./dialogs/dirtydialog.ui line 141
-#: rc.cpp:36
+#: rc.cpp:267
 #, no-c-format
 msgid "Use Kompare if available. Otherwise this checkbox is disabled."
 msgstr "若可用则使用 Kompare。否则此复选框会被禁用。"
 
-#. i18n: file ./dialogs/tagdialogs/tagmail.ui line 27
-#: rc.cpp:39
+#. i18n: file ./dialogs/settings/filemaskss.ui line 52
+#: rc.cpp:270 rc.cpp:2713
 #, no-c-format
-msgid "Email address:"
-msgstr "电子邮件地址："
+msgid ""
+"New files will have the extension and highlighting according to this setting"
+msgstr "新文件会根据此设置获得扩展名和加亮显示"
 
-#. i18n: file ./dialogs/tagdialogs/tagmail.ui line 49
-#: dialogs/filecombo.cpp:45 dialogs/filecombo.cpp:67
-#: dialogs/tagdialogs/tagimgdlgdata.cpp:34
-#: dialogs/tagdialogs/tagimgdlgdata.cpp:67 rc.cpp:42 rc.cpp:2518 rc.cpp:2640
-#: rc.cpp:2901 rc.cpp:2907 rc.cpp:2910 rc.cpp:2988 rc.cpp:2991
+#. i18n: file ./dialogs/settings/filemaskss.ui line 66
+#: rc.cpp:273
 #, no-c-format
-msgid "..."
-msgstr "..."
+msgid "Mimetypes"
+msgstr "MIME 类型"
 
-#. i18n: file ./dialogs/tagdialogs/tagmail.ui line 67
-#: rc.cpp:45
+#. i18n: file ./dialogs/settings/filemaskss.ui line 93
+#: rc.cpp:276
 #, no-c-format
-msgid "Subject:"
-msgstr "主题："
+msgid "&Reset to Default"
+msgstr "重置为默认值(&R)"
 
-#. i18n: file ./dialogs/tagdialogs/tagmail.ui line 83
-#: rc.cpp:48 rc.cpp:1029 rc.cpp:1105 rc.cpp:1111 rc.cpp:1123 rc.cpp:1138
-#: rc.cpp:1683 rc.cpp:4143
+#. i18n: file ./dialogs/settings/filemaskss.ui line 101
+#: rc.cpp:279
 #, no-c-format
-msgid "Title:"
-msgstr "标题："
+msgid "Te&xts:"
+msgstr "文字(&X)："
 
-#. i18n: file ./dialogs/tagdialogs/tagmisc.ui line 31
-#: dialogs/tagdialogs/tagmiscdlg.cpp:23 rc.cpp:57
+#. i18n: file ./dialogs/settings/filemaskss.ui line 112
+#: rc.cpp:282
 #, no-c-format
-msgid "Misc. Tag"
-msgstr "杂类标签"
+msgid "&Markups:"
+msgstr "标记(&M)："
 
-#. i18n: file ./dialogs/tagdialogs/tagmisc.ui line 47
-#: rc.cpp:60
+#. i18n: file ./dialogs/settings/filemaskss.ui line 123
+#: rc.cpp:285
 #, no-c-format
-msgid "Element name:"
-msgstr "元素名称："
+msgid "&Images:"
+msgstr "图像(&I)："
 
-#. i18n: file ./dialogs/tagdialogs/tagmisc.ui line 55
-#: rc.cpp:63
+#. i18n: file ./dialogs/settings/filemaskss.ui line 156
+#: rc.cpp:288
 #, no-c-format
-msgid "&Add closing tag"
-msgstr "添加结尾标签(&A)"
+msgid "&Scripts:"
+msgstr "脚本(&S)："
 
-#. i18n: file ./dialogs/debuggeroptionss.ui line 44
-#: rc.cpp:66
+#. i18n: file ./dialogs/settings/filemaskss.ui line 197
+#: rc.cpp:291
 #, no-c-format
-msgid "Enable debugger"
-msgstr "启用调试程序"
+msgid "Default character &encoding:"
+msgstr "默认字符编码(&E)："
 
-#. i18n: file ./dialogs/debuggeroptionss.ui line 80
-#: rc.cpp:69
+#. i18n: file ./dialogs/settings/filemaskss.ui line 211
+#: rc.cpp:294 rc.cpp:2704
 #, no-c-format
-msgid "PHP3 listener"
-msgstr "PHP3 监听器"
+msgid "Default &DTD:"
+msgstr "默认 DTD(&D)："
 
-#. i18n: file ./dialogs/debuggeroptionss.ui line 88
-#: rc.cpp:72
+#. i18n: file ./dialogs/settings/filemaskss.ui line 239
+#: rc.cpp:297
 #, no-c-format
-msgid "PHP4 debugger"
-msgstr "PHP4 调试程序"
+msgid "Startup Options"
+msgstr "启动选项"
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 27
-#: rc.cpp:75
+#. i18n: file ./dialogs/settings/filemaskss.ui line 250
+#: rc.cpp:300
 #, no-c-format
-msgid "Configure Actions"
-msgstr "配置动作"
+msgid "L&oad last-opened files"
+msgstr "装入上次打开的文件(&O)"
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 56
-#: rc.cpp:78
+#. i18n: file ./dialogs/settings/filemaskss.ui line 258
+#: rc.cpp:303
 #, no-c-format
-msgid "&Delete Action"
-msgstr "删除动作(&D)"
+msgid "S&how splashscreen"
+msgstr "显示飞溅屏幕(&H)"
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 64
-#: rc.cpp:81
+#. i18n: file ./dialogs/settings/filemaskss.ui line 266
+#: rc.cpp:306
 #, no-c-format
-msgid "&New Action"
-msgstr "新建动作(&N)"
+msgid "&Load last-opened project"
+msgstr "装入上次打开的工程(&L)"
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 117
-#: rc.cpp:84
+#. i18n: file ./dialogs/settings/filemaskss.ui line 284
+#: rc.cpp:309
 #, no-c-format
-msgid "Toolbar & Action Tree"
-msgstr "工具栏和动作树"
+msgid "Create backups every"
+msgstr "创建备份，每隔"
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 123
-#: ../lib/compatibility/knewstuff/downloaddialog.cpp:221
-#: ../lib/compatibility/knewstuff/downloaddialog.cpp:227
-#: ../lib/compatibility/knewstuff/downloaddialog.cpp:233
-#: ../lib/compatibility/knewstuff/providerdialog.cpp:65
-#: components/debugger/variableslistview.cpp:54 parts/kafka/domtreeview.cpp:34
-#: parts/kafka/htmldocumentproperties.cpp:88 parts/kafka/wkafkapart.cpp:75
-#: rc.cpp:87 rc.cpp:2548 rc.cpp:2784 treeviews/doctreeview.cpp:50
-#: treeviews/structtreeview.cpp:84 treeviews/uploadtreeview.cpp:35
+#. i18n: file ./dialogs/settings/filemaskss.ui line 306
+#: rc.cpp:312
 #, no-c-format
-msgid "Name"
-msgstr "名称"
+msgid "minutes"
+msgstr "分钟"
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 134
-#: rc.cpp:90 rc.cpp:117
+#. i18n: file ./dialogs/settings/filemaskss.ui line 316
+#: rc.cpp:315
 #, no-c-format
-msgid "Shortcut"
-msgstr "快捷键"
+msgid "Show the DTD selection dialog when loading files with &unknown DTD"
+msgstr "装入 DTD 未知的文件时显示 DTD 选择对话框(&U)"
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 236
-#: rc.cpp:102
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 39
+#: rc.cpp:318
 #, no-c-format
-msgid "Action Properties"
-msgstr "动作属性"
+msgid "Reset window layout to the default on the next startup"
+msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 247
-#: rc.cpp:105 rc.cpp:611 rc.cpp:1502 rc.cpp:2778
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 47
+#: rc.cpp:321
 #, no-c-format
-msgid "&Add..."
-msgstr "添加(&A)..."
+msgid "Show hidden files in files tree"
+msgstr "在文件树中显示隐藏的文件"
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 280
-#: rc.cpp:111
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 55
+#: rc.cpp:324
 #, no-c-format
-msgid "Tool &tip:"
-msgstr "工具提示(&T)："
+msgid "Save tree status for local trees"
+msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 296
-#: rc.cpp:114
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 63
+#: rc.cpp:327
 #, no-c-format
-msgid "Te&xt:"
-msgstr "文字(&X)："
+msgid "Close Buttons on Tabs"
+msgstr "在标签上显示关闭按钮"
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 354
-#: rc.cpp:120
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 74
+#: rc.cpp:330
 #, no-c-format
-msgid "C&ustom"
-msgstr "自定义(&U)"
+msgid "&Always show"
+msgstr "总是显示(&A)"
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 365
-#: dialogs/actionconfigdialog.cpp:320 dialogs/tagdialogs/colorcombo.cpp:220
-#: rc.cpp:123 rc.cpp:159 rc.cpp:171 rc.cpp:189 rc.cpp:2527
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 85
+#: rc.cpp:333
 #, no-c-format
-msgid "None"
-msgstr "无"
+msgid "&Do not show"
+msgstr "不显示(&D)"
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 373
-#: rc.cpp:126 rc.cpp:2691 rc.cpp:2829
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 93
+#: rc.cpp:336
 #, no-c-format
-msgid "&None"
-msgstr "无(&N)"
+msgid "Show dela&yed"
+msgstr "延迟显示(&Y)"
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 391
-#: rc.cpp:129
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 103
+#: rc.cpp:339 rc.cpp:4789 src/quanta.cpp:5278 src/quanta_init.cpp:184
+#: src/viewmanager.cpp:564
 #, no-c-format
-msgid "Container toolbars:"
-msgstr "容器工具栏："
+msgid "Documentation"
+msgstr "文档"
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 397
-#: rc.cpp:132 src/quantadoc.cpp:84 src/quantadoc.cpp:369
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 114
+#: rc.cpp:342
 #, no-c-format
-msgid "Tag"
-msgstr "标签"
+msgid "New tab"
+msgstr "新建标签"
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 402
-#: rc.cpp:135 rc.cpp:3737
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 125
+#: rc.cpp:345 rc.cpp:363
 #, no-c-format
-msgid "Script"
-msgstr "脚本"
+msgid "Separate toolview"
+msgstr "分隔工具视图"
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 407
-#: rc.cpp:138 rc.cpp:427 rc.cpp:719
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 135
+#: rc.cpp:348
+#, no-c-format
+msgid "Toolview Tabs"
+msgstr "工具视图标签"
+
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 146
+#: rc.cpp:351
+#, no-c-format
+msgid "Icon and text"
+msgstr "图标和文字"
+
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 157
+#: rc.cpp:354 rc.cpp:811 rc.cpp:958
 #, no-c-format
 msgid "Text"
 msgstr "文字"
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 427
-#: rc.cpp:141
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 165
+#: rc.cpp:357 rc.cpp:5133
 #, no-c-format
-msgid "T&ype:"
-msgstr "类型(&Y)："
+msgid "Icon"
+msgstr "图标"
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 438
-#: rc.cpp:144
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 175
+#: rc.cpp:360 src/quanta.cpp:5264
 #, no-c-format
-msgid "Detailed Settings"
-msgstr "细节设置"
+msgid "Preview"
+msgstr "预览"
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 464
-#: rc.cpp:147
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 200
+#: rc.cpp:366
 #, no-c-format
-msgid "<tag> :"
-msgstr "<tag>："
+msgid "Editor area"
+msgstr "编辑器区域"
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 482
-#: rc.cpp:150
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 230
+#: rc.cpp:369
 #, no-c-format
-msgid "</tag> :"
-msgstr "</tag>："
+msgid "&Warning Messages"
+msgstr "警告消息(&W)"
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 493
-#: rc.cpp:153
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 241
+#: rc.cpp:372
 #, no-c-format
-msgid "Run \"Edit tag\" dialog if available"
-msgstr "若可用则运行“编辑标签”对话框"
+msgid "Warn about opening binar&y/unknown files"
+msgstr "打开二进制/未知文件时警告(&Y)"
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 544
-#: rc.cpp:156
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 249
+#: rc.cpp:375
 #, no-c-format
-msgid "&Input:"
-msgstr "输入(&I)："
+msgid "Warn when executing &actions associated with events"
+msgstr ""
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 558
-#: rc.cpp:162
+#. i18n: file ./dialogs/settings/previewoptionss.ui line 257
+#: rc.cpp:378
 #, no-c-format
-msgid "Current Document"
-msgstr "当前文档"
+msgid "Show all warning messages"
+msgstr "显示全部消息"
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 563
-#: rc.cpp:165
+#. i18n: file ./dialogs/settings/abbreviations.ui line 25
+#: rc.cpp:381 src/quanta.cpp:1253
 #, no-c-format
-msgid "Selected Text"
-msgstr "选中文本"
+msgid "Abbreviations"
+msgstr "缩写"
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 591
-#: rc.cpp:168
+#. i18n: file ./dialogs/settings/abbreviations.ui line 52
+#: rc.cpp:390
 #, no-c-format
-msgid "&Output:"
-msgstr "输出(&O)："
+msgid "&New..."
+msgstr "新建(&N)..."
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 605
-#: rc.cpp:174
+#. i18n: file ./dialogs/settings/abbreviations.ui line 68
+#: rc.cpp:393
 #, no-c-format
-msgid "Insert in Cursor Position"
-msgstr "在光标位置插入"
+msgid "&Group:"
+msgstr "组(&G)："
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 610
-#: rc.cpp:177
+#. i18n: file ./dialogs/settings/abbreviations.ui line 87
+#: rc.cpp:396
 #, no-c-format
-msgid "Replace Selection"
-msgstr "替换选中内容"
+msgid "&Valid for:"
+msgstr "校验(&V)："
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 615
-#: rc.cpp:180
+#. i18n: file ./dialogs/settings/abbreviations.ui line 117
+#: rc.cpp:399
 #, no-c-format
-msgid "Replace Current Document"
-msgstr "替换当前文档"
+msgid "Template"
+msgstr "模板"
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 620
-#: rc.cpp:183
+#. i18n: file ./dialogs/settings/abbreviations.ui line 128
+#: rc.cpp:402 treeviews/projecttreeview.cpp:109
 #, no-c-format
-msgid "Create New Document"
-msgstr "创建新文档"
+msgid "Description"
+msgstr "描述"
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 625
-#: rc.cpp:186
+#. i18n: file ./dialogs/settings/abbreviations.ui line 160
+#: rc.cpp:405 rc.cpp:925 rc.cpp:1737 rc.cpp:2590
 #, no-c-format
-msgid "Message Window"
-msgstr "消息窗口"
+msgid "&Add..."
+msgstr "添加(&A)..."
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 651
-#: rc.cpp:192
+#. i18n: file ./dialogs/settings/abbreviations.ui line 193
+#: rc.cpp:411 rc.cpp:1740 rc.cpp:2593
 #, no-c-format
-msgid "Insert in cursor position"
-msgstr "在光标位置插入"
+msgid "&Edit..."
+msgstr "编辑(&E)..."
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 656
-#: rc.cpp:195
+#. i18n: file ./dialogs/settings/abbreviations.ui line 207
+#: rc.cpp:414
 #, no-c-format
-msgid "Replace selection"
-msgstr "替换选中内容"
+msgid "Expands to:"
+msgstr "展开为："
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 661
-#: rc.cpp:198
+#. i18n: file ./dialogs/settings/abbreviations.ui line 226
+#: rc.cpp:417
 #, no-c-format
-msgid "Replace current document"
-msgstr "替换当前文档"
+msgid "&Templates:"
+msgstr "模板(&T)："
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 666
-#: rc.cpp:201
+#. i18n: file ./dialogs/settings/codetemplatedlgs.ui line 31
+#: dialogs/settings/abbreviation.cpp:167 rc.cpp:420
 #, no-c-format
-msgid "Create a new document"
-msgstr "创建新文档"
+msgid "Add Code Template"
+msgstr "添加代码模板"
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 671
-#: rc.cpp:204
+#. i18n: file ./dialogs/settings/codetemplatedlgs.ui line 42
+#: rc.cpp:423
 #, no-c-format
-msgid "Message window"
-msgstr "消息窗口"
+msgid "&Template:"
+msgstr "模板(&T)："
 
-#. i18n: file ./dialogs/actionconfigdialogs.ui line 702
-#: rc.cpp:207
+#. i18n: file ./dialogs/settings/codetemplatedlgs.ui line 53
+#: rc.cpp:426
 #, no-c-format
-msgid "&Error:"
-msgstr "错误(&E)："
+msgid "&Description:"
+msgstr "描述(&D)："
 
-#. i18n: file ./dialogs/donationdialog.ui line 33
-#: rc.cpp:210
+#. i18n: file ./dialogs/settings/styleoptionss.ui line 47
+#: rc.cpp:429
 #, no-c-format
-msgid "Support Quanta with Financial Donation"
-msgstr "用捐款来支持 Quanta"
+msgid "Attribute quotation:"
+msgstr "属性引用："
 
-#. i18n: file ./dialogs/donationdialog.ui line 76
-#: rc.cpp:216
-#, fuzzy, no-c-format
+#. i18n: file ./dialogs/settings/styleoptionss.ui line 53
+#: rc.cpp:432
+#, no-c-format
+msgid "Double Quotes"
+msgstr "双引号"
+
+#. i18n: file ./dialogs/settings/styleoptionss.ui line 58
+#: rc.cpp:435
+#, no-c-format
+msgid "Single Quotes"
+msgstr "单引号"
+
+#. i18n: file ./dialogs/settings/styleoptionss.ui line 70
+#: rc.cpp:438
+#, no-c-format
+msgid "Tag case:"
+msgstr "标签大小写："
+
+#. i18n: file ./dialogs/settings/styleoptionss.ui line 78
+#: rc.cpp:441
+#, no-c-format
+msgid "Attribute case:"
+msgstr "属性大小写："
+
+#. i18n: file ./dialogs/settings/styleoptionss.ui line 84
+#: rc.cpp:444 rc.cpp:456
+#, no-c-format
+msgid "Default Case"
+msgstr "默认大小写"
+
+#. i18n: file ./dialogs/settings/styleoptionss.ui line 89
+#: rc.cpp:447 rc.cpp:459
+#, no-c-format
+msgid "Lower Case"
+msgstr "小写"
+
+#. i18n: file ./dialogs/settings/styleoptionss.ui line 94
+#: rc.cpp:450 rc.cpp:462
+#, no-c-format
+msgid "Upper Case"
+msgstr "大写"
+
+#. i18n: file ./dialogs/settings/styleoptionss.ui line 106
+#: rc.cpp:453
+#, no-c-format
+msgid "Auto-close o&ptional tags"
+msgstr "自动关闭可选标签(&P)"
+
+#. i18n: file ./dialogs/settings/styleoptionss.ui line 134
+#: rc.cpp:465
+#, no-c-format
+msgid "Auto-close &non single and non optional tags"
+msgstr "自动关闭非单个和非可选的标签(&N)"
+
+#. i18n: file ./dialogs/settings/styleoptionss.ui line 159
+#: rc.cpp:468
+#, no-c-format
+msgid "&Update opening/closing tag automatically"
+msgstr "自动更新配对标签(&U)"
+
+#. i18n: file ./dialogs/settings/styleoptionss.ui line 175
+#: rc.cpp:471
+#, no-c-format
+msgid "Use &auto-completion"
+msgstr "使用自动补全(&A)"
+
+#. i18n: file ./dialogs/settings/styleoptionss.ui line 183
+#: rc.cpp:474
+#, no-c-format
+msgid "Automatic &replacement of the accented characters"
+msgstr "自动替换重音字符(&R)"
+
+#. i18n: file ./dialogs/settings/styleoptionss.ui line 187
+#: rc.cpp:477
+#, no-c-format
 msgid ""
-"<div align=\"center\">"
-"<h2>Your Contribution Can Make a Difference</h2></div>"
-"&nbsp;&nbsp;&nbsp;Quanta Plus would not be what it is today without sponsored "
-"developers. Andras Mantia has been full time since mid 2002 and Michal Rudolf "
-"came on part time in spring of 2004. Over the life of the project development "
-"has been largely sponsored by the efforts of the Project Manager, Eric Laffoon. "
-"In addition to his minimum 10-20 hour a week time commitment, his company, <a "
-"href=\"http://kittyhooch.com\" target=\"_blank\">Kitty Hooch</a> "
-"LLP has an ongoing financial commitment to keep Quanta in continuous "
-"development. Our sponsored developers are also a catalyst to our volunteer "
-"developers.\n"
-"<br>&nbsp;&nbsp;&nbsp;&nbsp;Kitty Hooch is a small company with no employees, 2 "
-"active partners and several contract workers. After test marketing in the fall "
-"of 2001 they began wholesale and retail to national and international markets "
-"in early 2002. Kitty Hooch controls all aspects of their product production and "
-"marketing. Quanta sponsorship is no small expense for a small start up company. "
-"In 2003 cash flow and a bout with typhoid fever left Eric in debt and unable to "
-"keep up payments to Andras without help from the community. Thankfully a number "
-"of people stepped up. We now have several large sponsors along with a number of "
-"generous contributors. This has enabled us to bring Michal on part time. Now we "
-"are looking to be able to move him to full time. The challenge for this project "
-"to assume a leading role as a \"killer desktop application\" is great.\n"
-"<div align=\"center\">"
-"<h3>Balancing open source ideals and fiscal\n"
-"reality</h3></div>\n"
-"&nbsp;&nbsp;&nbsp;&nbsp;We believe that the open source model\n"
-"is the future of software, but it is no guarantee of success. How many open "
-"source projects that we had high hopes for are unmaintained today? In early "
-"2002 many people thought that Quanta Plus was dead. One person, Eric Laffoon, "
-"was not about to let the dream die. Quanta is more than surviving now, but "
-"developing a best-in-class tool is no easy task. We believe the key is "
-"consistent momentum. Nothing ensures this better than programmers who can work "
-"without financial or time distractions. Why do you think OSS projects die?"
-"<br>&nbsp;&nbsp;&nbsp;&nbsp;As Quanta grows the project management demands are "
-"increasing and ironically impacting the revenue stream it requires to continue. "
-"The impact of our sponsored developers has been huge! We are looking to make "
-"Quanta grow even faster. Eric needs to be able to free even more time to bring "
-"several new and exciting ideas through coding to release. We have other "
-"expenses too, with conferences and keeping our systems up to date so we don't "
-"lose time fighting old hardware. <i>We want to make Quanta the best web tool "
-"anywhere!</i>. This will require a nucleus of active core developers. We hope "
-"professional developers and companies using Quanta will help us to reach our "
-"goals with sponsorship donations that will relieve financial stresses.\n"
-"<div align=\"center\">"
-"<h3>Could Quanta die without your support?</h3></div>"
-"&nbsp;&nbsp;&nbsp;&nbsp;We'd like to think not! But from February 2001 to June "
-"2002 there was very little activity and many months with no work done at all. "
-"This came about because of cash flow problems which led to the original "
-"developers leaving to do a commercial project. The fact remains that our most "
-"productive volunteer developers, as much as we think they're wonderful, go long "
-"periods where they just can't make time to code on the project. We estimate our "
-"active users number well over a million, yet we have only a few dozen people a "
-"year supporting the project. In fact 3-4 people account for over half of our "
-"current support. Clearly the actions of a few people make a huge difference, "
-"and yours can make a difference too.\n"
-"<br><div align=\"center\">"
-"<h3>Will you help make a difference?</h3></div>\n"
-"&nbsp;&nbsp;&nbsp;&nbsp;If you wish to donate through PayPal\n"
-"(online money transfer or credit card), visit our <a "
-"href=\"http://kdewebdev.org/donate.php\">donation page</a>.\n"
-"<br>&nbsp;&nbsp;&nbsp;&nbsp;If you are outside the PayPal area or wish to "
-"discuss corporate sponsorship contact the project manager:"
-"<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Eric Laffoon, <a "
-"href=\"mailto:sequitur@kde.org?subject=Quanta%20sponsorship%20inquiry\">"
-"sequitur@kde.org</a>"
+"If this option is turned on the accented characters, like <b>&#225;</b>"
+", will be automatically replaced  by their unicode style notation, for the "
+"above case with <b>&#038;#225;</b>."
+"<br>\n"
+"We suggest to leave this option off and use an unicode or locale encoding for "
+"your documents."
 msgstr ""
-"<div align=\"center\">"
-"<h2>您的一点贡献就能改变一切</h2></div>&nbsp;&nbsp;&nbsp;没有赞助开发者，就没有 Quanta Plus 的今天。Andras "
-"Mantia 自2002年中起成为全职开发者，Michal Rudolf 在2004年春成为兼职开发者。在工程开发的整个过程中，我们始终得益于工程经理 "
-"Eric Lanffon 的资助。除了他每周至少 10-20 小时的无私工作以外，他的公司<a href=\"http://kittyhooch.com\" "
-"target=\"_blank\">Kitty Hooch</a> LLP 持续资助了 Quanta "
-"的开发。对我们的志愿开发者来说，赞助开发者也是一种鼓励。\n"
-"<br>&nbsp;&nbsp;&nbsp;&nbsp;Kitty Hooch 仍然是一家小公司，没有正式雇员，只有 2 名任职股东和几个签约工人。在 "
-"2001 年秋天进行了市场尝试后，他们在 2002 年早期开始拓展他们的本地和国际的批零市场。Kitty Hooch "
-"全面负责他们的产品，从制造到销售。Quanta 的赞助对于一个刚刚起步的公司来说，实在不是一个小数目。2003年发生的一些事情，使得 Eric "
-"开始负债，因此无法继续向 Andras 支付报酬。感谢接下来的许多人。我们现在已经有几家较大的赞助商，也拥有许多天才的贡献者。这使得我们有力让 Michal "
-"以兼职方式工作。现在我们正在考虑是否可以将他转为全职开发者。此工程的挑战在于，我们是要做一个“杀手级的桌面应用程序”。\n"
-"<div align=\"center\">"
-"<h3>在开发源代码理想和财政现实之间取得平衡</h3></div>&nbsp;&nbsp;&nbsp;&nbsp;我们相信开放源代码模型是软件开发的未来之路，"
-"但是没有任何保证它能够最终取得成功。有多少开发源代码的工程，我们原来寄予很高期望，但现在已不再有人维护？您认为 TDE 中还缺少多少应用程序？在 2002 "
-"年初，曾有传言说 Quanta Plus 已没有希望。但却有一个人 - Eric Laffoon - 不想让希望破灭。Quanta "
-"现在已经不用考虑其延续性了，但是开发一个专业领域内领先的工具也并非易事。我们相信关键在于持续不断的动力和热情。经济或时间上没有其它牵挂的程序员对此才是最好的保证"
-"。开放源代码的工程怎么会死掉呢？"
-"<br>&nbsp;&nbsp;&nbsp;&nbsp;随着 Quanta "
-"的不断成长，工程管理的要求正在不断增加，甚至继续维持的资金也是捉襟见肘。赞助开发者的作用甚为巨大！我们正在试图让 Quanta 变得更好。Eric "
-"也需要在版本不断推出的时候规划好新的激动人心的特性。我们还有其他一些花费，比如适当更新我们的系统，以便不受旧硬件运行效率的制约。<i>"
-"我们想要将其发展成为最佳的 Web 工具！</i>。这需要更多活跃的核心开发者。我们希望使用 Quanta "
-"的专业开发者和公司能够帮助我们达到这一目的，而您所做的仅仅是给予我们力所能及的赞助。\n"
-"<div align=\"center\">"
-"<h3>没有您的支持 Quanta "
-"会死掉吗？</h3></div>&nbsp;&nbsp;&nbsp;&nbsp;当然不会！但是从2001年2月到2002年6月，我们基本没有什么活动，而且几乎根"
-"本没干什么活。其中的主要原因是资金问题，这使得原始开发者转而开发商业工程。这一事实一直持续到今天，我们最有创造力的志愿开发者，由于这样或者那样的原因，再也无法为"
-"工程编写一行代码。尽管我们可以大概估算出几乎有超过一亿的用户正在使用着我们的程序，但每年仍只有屈指可数的几个人对工程给予了实际支持。实际上，目前我们所得到的支持"
-"中，三四个人所做的贡献占据了一大半。既然几个人就可以让事情变得完全不同，您为何不加入呢？\n"
-"<br><div align=\"center\">"
-"<h3>您会帮助吗？</h3></div>&nbsp;&nbsp;&nbsp;&nbsp;如果您想要通过 PayPal "
-"捐助(在线汇款或信用卡)，请浏览我们的<a "
-"href=\"http://quanta.kdewebdev.org/main1.php?actfile=donate\">捐助页面</a>。"
-"<br>&nbsp;&nbsp;&nbsp;&nbsp;如果您所在区域没有 PayPal 服务，或者想要讨论社团资助，请联系我们的工程经理："
-"<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Eric Laffoon, <a "
-"href=\"mailto:sequitur@kde.org?subject=Quanta%20sponsorship%20inquiry\">"
-"sequitur@kde.org</a>"
 
-#. i18n: file ./dialogs/donationdialog.ui line 136
-#: rc.cpp:229
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 47
+#: rc.cpp:481
 #, no-c-format
-msgid ""
-"<a href=\"http://kdewebdev.org/donate.php\">Donate</a> through  PayPal now."
-msgstr "现在就通过 PayPal <a href=\"http://kdewebdev.org/donate.php\">进行捐助</a>。"
+msgid "Structure Tree Look && Feel"
+msgstr "结构树观感"
+
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 64
+#: rc.cpp:484
+#, no-c-format
+msgid "Use 0 to disable the automatic refresh of structure tree"
+msgstr "设为 0 将禁用结构树的自动刷新"
+
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 89
+#: rc.cpp:487
+#, no-c-format
+msgid "Instant update"
+msgstr "立即更新"
+
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 92
+#: rc.cpp:490 rc.cpp:511
+#, no-c-format
+msgid "Update the structure tree after every keystroke"
+msgstr "每次按键时更新结构树"
+
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 117
+#: rc.cpp:493
+#, no-c-format
+msgid "Show closing tags"
+msgstr "显示关闭标签"
+
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 125
+#: rc.cpp:496
+#, no-c-format
+msgid "Show empt&y nodes and groups"
+msgstr "显示空结点和组(&Y)"
+
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 136
+#: rc.cpp:499
+#, no-c-format
+msgid "Set to 0 in order to expand the whole tree"
+msgstr "(设为 0 则展开整棵树)"
+
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 144
+#: rc.cpp:502
+#, no-c-format
+msgid "Refresh frequency (in seconds):"
+msgstr "刷新频率(秒)："
+
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 152
+#: rc.cpp:505
+#, no-c-format
+msgid "Expand tree when reparse to level:"
+msgstr "重新分析时展开树的级别："
+
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 162
+#: rc.cpp:508
+#, no-c-format
+msgid "Clicks on Structure Tree Items"
+msgstr "单击结构树项目"
+
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 174
+#: dialogs/settings/parseroptions.cpp:37 dialogs/settings/parseroptions.cpp:55
+#: dialogs/settings/parseroptions.cpp:58 rc.cpp:514 rc.cpp:550
+#: treeviews/structtreeview.cpp:111 treeviews/structtreeview.cpp:486
+#: treeviews/structtreeview.cpp:488 treeviews/structtreeview.cpp:531
+#, no-c-format
+msgid "Select Tag Area"
+msgstr "选择标签区域"
+
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 179
+#: dialogs/settings/parseroptions.cpp:35 dialogs/settings/parseroptions.cpp:56
+#: rc.cpp:517 rc.cpp:553
+#, no-c-format
+msgid "Nothing"
+msgstr "无"
+
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 189
+#: dialogs/settings/parseroptions.cpp:53 rc.cpp:520 rc.cpp:544
+#, no-c-format
+msgid "Find Tag"
+msgstr "查找标签"
+
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 194
+#: dialogs/settings/parseroptions.cpp:34 dialogs/settings/parseroptions.cpp:43
+#: dialogs/settings/parseroptions.cpp:52 rc.cpp:523 rc.cpp:541
+#, no-c-format
+msgid "Find Tag & Open Tree"
+msgstr "查找标记并打开树"
+
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 206
+#: rc.cpp:526
+#, no-c-format
+msgid "Left button:"
+msgstr "左按钮："
+
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 212
+#: dialogs/settings/parseroptions.cpp:36 rc.cpp:529
+#, no-c-format
+msgid "Popup Menu"
+msgstr "弹出菜单"
+
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 224
+#: rc.cpp:532
+#, no-c-format
+msgid "Double click:"
+msgstr "双击："
+
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 232
+#: rc.cpp:535
+#, no-c-format
+msgid "Middle button:"
+msgstr "中键："
+
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 240
+#: rc.cpp:538
+#, no-c-format
+msgid "Right button:"
+msgstr "右键："
+
+#. i18n: file ./dialogs/settings/parseroptionsui.ui line 256
+#: dialogs/settings/parseroptions.cpp:54 rc.cpp:547
+#: treeviews/structtreeview.cpp:112 treeviews/structtreeview.cpp:534
+#, no-c-format
+msgid "Go to End of Tag"
+msgstr "转到标签结尾"
+
+#. i18n: file ./dialogs/debuggeroptionss.ui line 44
+#: rc.cpp:556
+#, no-c-format
+msgid "Enable debugger"
+msgstr "启用调试程序"
+
+#. i18n: file ./dialogs/debuggeroptionss.ui line 80
+#: rc.cpp:559
+#, no-c-format
+msgid "PHP3 listener"
+msgstr "PHP3 监听器"
+
+#. i18n: file ./dialogs/debuggeroptionss.ui line 88
+#: rc.cpp:562
+#, no-c-format
+msgid "PHP4 debugger"
+msgstr "PHP4 调试程序"
+
+#. i18n: file ./dialogs/fourbuttonmessagebox.ui line 74
+#: rc.cpp:568
+#, no-c-format
+msgid "Save &As..."
+msgstr "另存为(&A)..."
+
+#. i18n: file ./dialogs/fourbuttonmessagebox.ui line 90
+#: rc.cpp:571
+#, no-c-format
+msgid "&Do Not Save"
+msgstr "不保存(&D)"
+
+#. i18n: file ./dialogs/casewidget.ui line 30
+#: rc.cpp:577
+#, no-c-format
+msgid "Tag Case"
+msgstr "标签大小写"
+
+#. i18n: file ./dialogs/casewidget.ui line 41
+#: rc.cpp:580 rc.cpp:592
+#, no-c-format
+msgid "Upper case"
+msgstr "大写"
+
+#. i18n: file ./dialogs/casewidget.ui line 49
+#: rc.cpp:583 rc.cpp:595
+#, no-c-format
+msgid "Lower case"
+msgstr "小写"
+
+#. i18n: file ./dialogs/casewidget.ui line 57
+#: rc.cpp:586 rc.cpp:598
+#, no-c-format
+msgid "Unchanged"
+msgstr "不更改"
+
+#. i18n: file ./dialogs/casewidget.ui line 70
+#: rc.cpp:589
+#, no-c-format
+msgid "Attribute Case"
+msgstr "属性大小写"
+
+#. i18n: file ./dialogs/specialchardialogs.ui line 16
+#: rc.cpp:601 src/quanta_init.cpp:1067
+#, no-c-format
+msgid "Insert Special Character"
+msgstr "插入特殊字符"
+
+#. i18n: file ./dialogs/specialchardialogs.ui line 44
+#: rc.cpp:604
+#, no-c-format
+msgid "&Insert Code"
+msgstr "插入代码(&I)"
+
+#. i18n: file ./dialogs/specialchardialogs.ui line 64
+#: rc.cpp:607
+#, no-c-format
+msgid "Insert C&har"
+msgstr "插入字符(&H)"
+
+#. i18n: file ./dialogs/specialchardialogs.ui line 119
+#: rc.cpp:613
+#, no-c-format
+msgid "&Filter:"
+msgstr "过滤器(&F)："
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 25
-#: rc.cpp:232
+#: rc.cpp:616
 #, no-c-format
 msgid "Structure Group Editor"
 msgstr "结构组编辑器"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 36
-#: rc.cpp:235 rc.cpp:2643 rc.cpp:2751
+#: rc.cpp:619 rc.cpp:2855 rc.cpp:2876
 #, no-c-format
 msgid "&Name:"
 msgstr "名称(&N)："
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 47
-#: rc.cpp:238
+#: rc.cpp:622
 #, no-c-format
 msgid "The name of the group"
 msgstr "组名称"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 50
-#: rc.cpp:241
+#: rc.cpp:625
 #, no-c-format
 msgid ""
 "The user visible name of the group. It will be shown in the structure tree as a "
@@ -516,25 +1110,25 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 58
-#: rc.cpp:244
+#: rc.cpp:628
 #, no-c-format
 msgid "&Icon:"
 msgstr "图标(&I)："
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 103
-#: rc.cpp:247
+#: rc.cpp:631
 #, no-c-format
 msgid "Filen&ame definition:"
 msgstr "文件名定义(&A)："
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 109
-#: rc.cpp:250 rc.cpp:262
+#: rc.cpp:634 rc.cpp:646
 #, no-c-format
 msgid "Regular expression to get the filename"
 msgstr "获得文件名的正则表达式"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 112
-#: rc.cpp:253 rc.cpp:265
+#: rc.cpp:637 rc.cpp:649
 #, no-c-format
 msgid ""
 "Regular expression to get the filename. The expression is used to <b>remove</b> "
@@ -542,31 +1136,31 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 120
-#: rc.cpp:256
+#: rc.cpp:640
 #, no-c-format
 msgid "Contains a &filename"
 msgstr "包含文件名(&F)"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 123
-#: rc.cpp:259
+#: rc.cpp:643
 #, no-c-format
 msgid "True if the element's text contains a filename"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 145
-#: rc.cpp:268
+#: rc.cpp:652
 #, no-c-format
 msgid "&Tag:"
 msgstr "标签(&T)："
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 151
-#: rc.cpp:271
+#: rc.cpp:655
 #, no-c-format
 msgid "Elements identified by this entry will belong to this group"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 154
-#: rc.cpp:274 rc.cpp:295
+#: rc.cpp:658 rc.cpp:679
 #, no-c-format
 msgid ""
 "Defines which tags belong to this group. The format is <i>"
@@ -577,19 +1171,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 162
-#: rc.cpp:277
+#: rc.cpp:661
 #, no-c-format
 msgid "\"No\" na&me:"
 msgstr "“No”名称(&M)："
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 168
-#: rc.cpp:280 rc.cpp:286
+#: rc.cpp:664 rc.cpp:670
 #, no-c-format
 msgid "The name that appears when no element were found"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 171
-#: rc.cpp:283 rc.cpp:289
+#: rc.cpp:667 rc.cpp:673
 #, no-c-format
 msgid ""
 "The user visible name of the group. It will be shown in the structure tree as a "
@@ -598,44 +1192,44 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 193
-#: rc.cpp:292
+#: rc.cpp:676
 #, no-c-format
 msgid "Elements ideintified by this entry will belong to this group"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 221
-#: rc.cpp:298
+#: rc.cpp:682
 #, no-c-format
 msgid "Use elements as tags"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 224
-#: rc.cpp:301
+#: rc.cpp:685
 #, no-c-format
 msgid "Treat elements as new tags"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 227
-#: rc.cpp:304
+#: rc.cpp:688
 #, no-c-format
 msgid ""
 "Treat elements as new tags, so they will show up during tag autocompletion."
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 235
-#: rc.cpp:307
+#: rc.cpp:691
 #, no-c-format
 msgid "&Pseudo DTEP Specific Settings"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 246
-#: rc.cpp:310 rc.cpp:342
+#: rc.cpp:694 rc.cpp:726
 #, no-c-format
 msgid "Regular expression to find the type of the element"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 254
-#: rc.cpp:313 rc.cpp:345
+#: rc.cpp:697 rc.cpp:729
 #, no-c-format
 msgid ""
 "Regular expression to find the type of the element. The pattern is searched on "
@@ -658,19 +1252,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 262
-#: rc.cpp:321
+#: rc.cpp:705
 #, no-c-format
 msgid "&Usage expression:"
 msgstr "用法表达式(&U)："
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 268
-#: rc.cpp:324 rc.cpp:365
+#: rc.cpp:708 rc.cpp:749
 #, no-c-format
 msgid "Regular expression to find the usage of a group element"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 280
-#: rc.cpp:327 rc.cpp:368
+#: rc.cpp:711 rc.cpp:752
 #, no-c-format
 msgid ""
 "Regular expression to find the usage of a group element in the document."
@@ -698,25 +1292,25 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 288
-#: rc.cpp:339
+#: rc.cpp:723
 #, no-c-format
 msgid "Element t&ype expression:"
 msgstr "元素类型表达式(&Y)："
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 310
-#: rc.cpp:353
+#: rc.cpp:737
 #, no-c-format
 msgid "Definition e&xpression:"
 msgstr "定义表达式(&X)："
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 316
-#: rc.cpp:356 rc.cpp:496
+#: rc.cpp:740 rc.cpp:880
 #, no-c-format
 msgid "Regular expression to find what belong to this group"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 322
-#: rc.cpp:359 rc.cpp:499
+#: rc.cpp:743 rc.cpp:883
 #, no-c-format
 msgid ""
 "Regular expression used to find text areas in the document, which will belong "
@@ -732,19 +1326,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 350
-#: rc.cpp:380
+#: rc.cpp:764
 #, no-c-format
 msgid "Parent group:"
 msgstr "父组："
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 353
-#: rc.cpp:383 rc.cpp:389
+#: rc.cpp:767 rc.cpp:773
 #, no-c-format
 msgid "The name of the group that may be the parent of this"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 356
-#: rc.cpp:386 rc.cpp:392
+#: rc.cpp:770 rc.cpp:776
 #, no-c-format
 msgid ""
 "The name of the group that may be the parent of this. For example <b>classes</b> "
@@ -754,38 +1348,38 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 375
-#: rc.cpp:395
+#: rc.cpp:779
 #, no-c-format
 msgid "Searched tags:"
 msgstr "搜索标签："
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 378
-#: rc.cpp:398 rc.cpp:451
+#: rc.cpp:782 rc.cpp:835
 #, no-c-format
 msgid "Only tags of this type can be part of the group"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 386
-#: rc.cpp:401
+#: rc.cpp:785
 #, no-c-format
 msgid "Remove when autocompleting:"
 msgstr "自动补全时删除："
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 389
-#: rc.cpp:404 rc.cpp:424
+#: rc.cpp:788 rc.cpp:808
 #, no-c-format
 msgid ""
 "Regular expression used to remove unwanted strings from the completion text"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 397
-#: rc.cpp:407
+#: rc.cpp:791
 #, no-c-format
 msgid "Autocomplete after:"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 400
-#: rc.cpp:410 rc.cpp:417
+#: rc.cpp:794 rc.cpp:801
 #, no-c-format
 msgid ""
 "Regular expression to tell when to bring up the completion box with the "
@@ -793,7 +1387,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 404
-#: rc.cpp:413 rc.cpp:420
+#: rc.cpp:797 rc.cpp:804
 #, no-c-format
 msgid ""
 "Regular expression to tell when to bring up the completion box with the "
@@ -804,61 +1398,61 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 435
-#: rc.cpp:430
+#: rc.cpp:814
 #, no-c-format
 msgid "XmlTag"
 msgstr "XML 标签"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 440
-#: rc.cpp:433
+#: rc.cpp:817
 #, no-c-format
 msgid "XmlTagEnd"
 msgstr "XML 标签结束"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 445
-#: rc.cpp:436 rc.cpp:5086 rc.cpp:5142 rc.cpp:5158 rc.cpp:5179
+#: rc.cpp:820 rc.cpp:5113 rc.cpp:5201 rc.cpp:5227 rc.cpp:5328
 #, no-c-format
 msgid "Comment"
 msgstr "注释"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 450
-#: rc.cpp:439 rc.cpp:4418
+#: rc.cpp:823 rc.cpp:5028
 #, no-c-format
 msgid "CSS"
 msgstr "CSS"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 455
-#: rc.cpp:442
+#: rc.cpp:826
 #, no-c-format
 msgid "ScriptTag"
 msgstr "脚本标签"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 460
-#: rc.cpp:445
+#: rc.cpp:829
 #, no-c-format
 msgid "ScriptStructureBegin"
 msgstr "脚本结构开始"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 465
-#: rc.cpp:448
+#: rc.cpp:832
 #, no-c-format
 msgid "ScriptStructureEnd"
 msgstr "脚本结构结束"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 497
-#: rc.cpp:454
+#: rc.cpp:838
 #, no-c-format
 msgid "Parse file"
 msgstr "分析文件"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 500
-#: rc.cpp:457
+#: rc.cpp:841
 #, no-c-format
 msgid "Check if the filename that is in the elements text should be parsed"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 503
-#: rc.cpp:460
+#: rc.cpp:844
 #, no-c-format
 msgid ""
 "Check if the filename that is in the elements text should be parsed. This makes "
@@ -868,690 +1462,481 @@ msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 511
 #: components/debugger/backtracelistview.cpp:58
-#: components/debugger/variableslistview.cpp:57 rc.cpp:463
+#: components/debugger/variableslistview.cpp:57 rc.cpp:847
 #, no-c-format
 msgid "Type"
 msgstr "类型"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 522
-#: rc.cpp:466
+#: rc.cpp:850
 #, no-c-format
 msgid "Simple"
 msgstr "简单"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 525
-#: rc.cpp:469
+#: rc.cpp:853
 #, no-c-format
 msgid "This is a simple group, nothing special"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 533
-#: rc.cpp:472
+#: rc.cpp:856
 #, no-c-format
 msgid "Variable group"
 msgstr "变量组"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 536
-#: rc.cpp:475
+#: rc.cpp:859
 #, no-c-format
 msgid "The group's elements are variables"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 544
-#: rc.cpp:478
+#: rc.cpp:862
 #, no-c-format
 msgid "Function group"
 msgstr "函数组"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 547
-#: rc.cpp:481
+#: rc.cpp:865
 #, no-c-format
 msgid "The group's elements are functions"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 555
-#: rc.cpp:484
+#: rc.cpp:868
 #, no-c-format
 msgid "Class group"
 msgstr "类组"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 558
-#: rc.cpp:487
+#: rc.cpp:871
 #, no-c-format
 msgid "The group's elements are classes"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 566
-#: rc.cpp:490
+#: rc.cpp:874
 #, no-c-format
 msgid "Ob&ject group"
 msgstr "对象组(&J)"
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 569
-#: rc.cpp:493
+#: rc.cpp:877
 #, no-c-format
 msgid "The group's elements are objects"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 593
-#: rc.cpp:505
+#: rc.cpp:889
 #, no-c-format
 msgid "Minimal search mode"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepstructureeditdlgs.ui line 596
-#: rc.cpp:508
+#: rc.cpp:892
 #, no-c-format
 msgid ""
 "Enable to use the minimal style search for definition instead of the standard "
 "(greedy) matching"
 msgstr ""
 
-#. i18n: file ./dialogs/specialchardialogs.ui line 16
-#: rc.cpp:511 src/quanta_init.cpp:1079
-#, no-c-format
-msgid "Insert Special Character"
-msgstr "插入特殊字符"
-
-#. i18n: file ./dialogs/specialchardialogs.ui line 44
-#: rc.cpp:514
-#, no-c-format
-msgid "&Insert Code"
-msgstr "插入代码(&I)"
-
-#. i18n: file ./dialogs/specialchardialogs.ui line 64
-#: rc.cpp:517
-#, no-c-format
-msgid "Insert C&har"
-msgstr "插入字符(&H)"
-
-#. i18n: file ./dialogs/specialchardialogs.ui line 119
-#: rc.cpp:523
-#, no-c-format
-msgid "&Filter:"
-msgstr "过滤器(&F)："
-
-#. i18n: file ./dialogs/loadentitydlgs.ui line 27
-#: rc.cpp:526
-#, no-c-format
-msgid "Source DTD:"
-msgstr "源 DTD："
-
-#. i18n: file ./dialogs/loadentitydlgs.ui line 35
-#: rc.cpp:529
-#, no-c-format
-msgid "Target DTEP:"
-msgstr "目标 DTEP："
-
-#. i18n: file ./dialogs/loadentitydlgs.ui line 43
-#: rc.cpp:532 src/dtds.cpp:904
-#, no-c-format
-msgid "*.dtd|DTD Definitions"
-msgstr "*.dtd|DTD 定义"
-
-#. i18n: file ./dialogs/settings/styleoptionss.ui line 47
-#: rc.cpp:535
-#, no-c-format
-msgid "Attribute quotation:"
-msgstr "属性引用："
-
-#. i18n: file ./dialogs/settings/styleoptionss.ui line 53
-#: rc.cpp:538
-#, no-c-format
-msgid "Double Quotes"
-msgstr "双引号"
-
-#. i18n: file ./dialogs/settings/styleoptionss.ui line 58
-#: rc.cpp:541
-#, no-c-format
-msgid "Single Quotes"
-msgstr "单引号"
-
-#. i18n: file ./dialogs/settings/styleoptionss.ui line 70
-#: rc.cpp:544
-#, no-c-format
-msgid "Tag case:"
-msgstr "标签大小写："
-
-#. i18n: file ./dialogs/settings/styleoptionss.ui line 78
-#: rc.cpp:547
-#, no-c-format
-msgid "Attribute case:"
-msgstr "属性大小写："
-
-#. i18n: file ./dialogs/settings/styleoptionss.ui line 84
-#: rc.cpp:550 rc.cpp:562
-#, no-c-format
-msgid "Default Case"
-msgstr "默认大小写"
-
-#. i18n: file ./dialogs/settings/styleoptionss.ui line 89
-#: rc.cpp:553 rc.cpp:565
-#, no-c-format
-msgid "Lower Case"
-msgstr "小写"
-
-#. i18n: file ./dialogs/settings/styleoptionss.ui line 94
-#: rc.cpp:556 rc.cpp:568
-#, no-c-format
-msgid "Upper Case"
-msgstr "大写"
-
-#. i18n: file ./dialogs/settings/styleoptionss.ui line 106
-#: rc.cpp:559
-#, no-c-format
-msgid "Auto-close o&ptional tags"
-msgstr "自动关闭可选标签(&P)"
-
-#. i18n: file ./dialogs/settings/styleoptionss.ui line 134
-#: rc.cpp:571
-#, no-c-format
-msgid "Auto-close &non single and non optional tags"
-msgstr "自动关闭非单个和非可选的标签(&N)"
-
-#. i18n: file ./dialogs/settings/styleoptionss.ui line 159
-#: rc.cpp:574
-#, no-c-format
-msgid "&Update opening/closing tag automatically"
-msgstr "自动更新配对标签(&U)"
-
-#. i18n: file ./dialogs/settings/styleoptionss.ui line 175
-#: rc.cpp:577
-#, no-c-format
-msgid "Use &auto-completion"
-msgstr "使用自动补全(&A)"
-
-#. i18n: file ./dialogs/settings/styleoptionss.ui line 183
-#: rc.cpp:580
-#, no-c-format
-msgid "Automatic &replacement of the accented characters"
-msgstr "自动替换重音字符(&R)"
-
-#. i18n: file ./dialogs/settings/styleoptionss.ui line 187
-#: rc.cpp:583
-#, no-c-format
-msgid ""
-"If this option is turned on the accented characters, like <b>&#225;</b>"
-", will be automatically replaced  by their unicode style notation, for the "
-"above case with <b>&#038;#225;</b>."
-"<br>\n"
-"We suggest to leave this option off and use an unicode or locale encoding for "
-"your documents."
-msgstr ""
-
-#. i18n: file ./dialogs/settings/abbreviations.ui line 25
-#: rc.cpp:587 src/quanta.cpp:1253
-#, no-c-format
-msgid "Abbreviations"
-msgstr "缩写"
-
-#. i18n: file ./dialogs/settings/abbreviations.ui line 36
-#: rc.cpp:590 rc.cpp:2563 rc.cpp:2575
-#, no-c-format
-msgid "Add..."
-msgstr "添加..."
-
-#. i18n: file ./dialogs/settings/abbreviations.ui line 52
-#: rc.cpp:596
-#, no-c-format
-msgid "&New..."
-msgstr "新建(&N)..."
-
-#. i18n: file ./dialogs/settings/abbreviations.ui line 68
-#: rc.cpp:599
-#, no-c-format
-msgid "&Group:"
-msgstr "组(&G)："
-
-#. i18n: file ./dialogs/settings/abbreviations.ui line 87
-#: rc.cpp:602
-#, no-c-format
-msgid "&Valid for:"
-msgstr "校验(&V)："
-
-#. i18n: file ./dialogs/settings/abbreviations.ui line 117
-#: rc.cpp:605
-#, no-c-format
-msgid "Template"
-msgstr "模板"
-
-#. i18n: file ./dialogs/settings/abbreviations.ui line 128
-#: rc.cpp:608 treeviews/projecttreeview.cpp:109
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 27
+#: rc.cpp:895
 #, no-c-format
-msgid "Description"
-msgstr "描述"
+msgid "Configure Actions"
+msgstr "配置动作"
 
-#. i18n: file ./dialogs/settings/abbreviations.ui line 193
-#: rc.cpp:617 rc.cpp:1505 rc.cpp:2781
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 56
+#: rc.cpp:898
 #, no-c-format
-msgid "&Edit..."
-msgstr "编辑(&E)..."
+msgid "&Delete Action"
+msgstr "删除动作(&D)"
 
-#. i18n: file ./dialogs/settings/abbreviations.ui line 207
-#: rc.cpp:620
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 64
+#: rc.cpp:901
 #, no-c-format
-msgid "Expands to:"
-msgstr "展开为："
+msgid "&New Action"
+msgstr "新建动作(&N)"
 
-#. i18n: file ./dialogs/settings/abbreviations.ui line 226
-#: rc.cpp:623
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 117
+#: rc.cpp:904
 #, no-c-format
-msgid "&Templates:"
-msgstr "模板(&T)："
+msgid "Toolbar & Action Tree"
+msgstr "工具栏和动作树"
 
-#. i18n: file ./dialogs/settings/filemaskss.ui line 52
-#: rc.cpp:626 rc.cpp:3021
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 134
+#: rc.cpp:910 rc.cpp:937
 #, no-c-format
-msgid ""
-"New files will have the extension and highlighting according to this setting"
-msgstr "新文件会根据此设置获得扩展名和加亮显示"
+msgid "Shortcut"
+msgstr "快捷键"
 
-#. i18n: file ./dialogs/settings/filemaskss.ui line 66
-#: rc.cpp:629
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 236
+#: rc.cpp:922
 #, no-c-format
-msgid "Mimetypes"
-msgstr "MIME 类型"
+msgid "Action Properties"
+msgstr "动作属性"
 
-#. i18n: file ./dialogs/settings/filemaskss.ui line 93
-#: rc.cpp:632
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 280
+#: rc.cpp:931
 #, no-c-format
-msgid "&Reset to Default"
-msgstr "重置为默认值(&R)"
+msgid "Tool &tip:"
+msgstr "工具提示(&T)："
 
-#. i18n: file ./dialogs/settings/filemaskss.ui line 101
-#: rc.cpp:635
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 296
+#: rc.cpp:934
 #, no-c-format
-msgid "Te&xts:"
+msgid "Te&xt:"
 msgstr "文字(&X)："
 
-#. i18n: file ./dialogs/settings/filemaskss.ui line 112
-#: rc.cpp:638
-#, no-c-format
-msgid "&Markups:"
-msgstr "标记(&M)："
-
-#. i18n: file ./dialogs/settings/filemaskss.ui line 123
-#: rc.cpp:641
-#, no-c-format
-msgid "&Images:"
-msgstr "图像(&I)："
-
-#. i18n: file ./dialogs/settings/filemaskss.ui line 156
-#: rc.cpp:644
-#, no-c-format
-msgid "&Scripts:"
-msgstr "脚本(&S)："
-
-#. i18n: file ./dialogs/settings/filemaskss.ui line 197
-#: rc.cpp:647
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 354
+#: rc.cpp:940
 #, no-c-format
-msgid "Default character &encoding:"
-msgstr "默认字符编码(&E)："
+msgid "C&ustom"
+msgstr "自定义(&U)"
 
-#. i18n: file ./dialogs/settings/filemaskss.ui line 211
-#: rc.cpp:650 rc.cpp:3012
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 373
+#: rc.cpp:946 rc.cpp:2665 rc.cpp:2918
 #, no-c-format
-msgid "Default &DTD:"
-msgstr "默认 DTD(&D)："
+msgid "&None"
+msgstr "无(&N)"
 
-#. i18n: file ./dialogs/settings/filemaskss.ui line 239
-#: rc.cpp:653
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 391
+#: rc.cpp:949
 #, no-c-format
-msgid "Startup Options"
-msgstr "启动选项"
+msgid "Container toolbars:"
+msgstr "容器工具栏："
 
-#. i18n: file ./dialogs/settings/filemaskss.ui line 250
-#: rc.cpp:656
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 397
+#: rc.cpp:952 src/quantadoc.cpp:84 src/quantadoc.cpp:369
 #, no-c-format
-msgid "L&oad last-opened files"
-msgstr "装入上次打开的文件(&O)"
+msgid "Tag"
+msgstr "标签"
 
-#. i18n: file ./dialogs/settings/filemaskss.ui line 258
-#: rc.cpp:659
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 402
+#: rc.cpp:955 rc.cpp:3935
 #, no-c-format
-msgid "S&how splashscreen"
-msgstr "显示飞溅屏幕(&H)"
+msgid "Script"
+msgstr "脚本"
 
-#. i18n: file ./dialogs/settings/filemaskss.ui line 266
-#: rc.cpp:662
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 427
+#: rc.cpp:961
 #, no-c-format
-msgid "&Load last-opened project"
-msgstr "装入上次打开的工程(&L)"
+msgid "T&ype:"
+msgstr "类型(&Y)："
 
-#. i18n: file ./dialogs/settings/filemaskss.ui line 284
-#: rc.cpp:665
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 438
+#: rc.cpp:964
 #, no-c-format
-msgid "Create backups every"
-msgstr "创建备份，每隔"
+msgid "Detailed Settings"
+msgstr "细节设置"
 
-#. i18n: file ./dialogs/settings/filemaskss.ui line 306
-#: rc.cpp:668
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 464
+#: rc.cpp:967
 #, no-c-format
-msgid "minutes"
-msgstr "分钟"
+msgid "<tag> :"
+msgstr "<tag>："
 
-#. i18n: file ./dialogs/settings/filemaskss.ui line 316
-#: rc.cpp:671
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 482
+#: rc.cpp:970
 #, no-c-format
-msgid "Show the DTD selection dialog when loading files with &unknown DTD"
-msgstr "装入 DTD 未知的文件时显示 DTD 选择对话框(&U)"
+msgid "</tag> :"
+msgstr "</tag>："
 
-#. i18n: file ./dialogs/settings/codetemplatedlgs.ui line 31
-#: dialogs/settings/abbreviation.cpp:167 rc.cpp:674
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 493
+#: rc.cpp:973
 #, no-c-format
-msgid "Add Code Template"
-msgstr "添加代码模板"
+msgid "Run \"Edit tag\" dialog if available"
+msgstr "若可用则运行“编辑标签”对话框"
 
-#. i18n: file ./dialogs/settings/codetemplatedlgs.ui line 42
-#: rc.cpp:677
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 544
+#: rc.cpp:976
 #, no-c-format
-msgid "&Template:"
-msgstr "模板(&T)："
+msgid "&Input:"
+msgstr "输入(&I)："
 
-#. i18n: file ./dialogs/settings/codetemplatedlgs.ui line 53
-#: rc.cpp:680
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 558
+#: rc.cpp:982
 #, no-c-format
-msgid "&Description:"
-msgstr "描述(&D)："
+msgid "Current Document"
+msgstr "当前文档"
 
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 39
-#: rc.cpp:683
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 563
+#: rc.cpp:985
 #, no-c-format
-msgid "Reset window layout to the default on the next startup"
-msgstr ""
+msgid "Selected Text"
+msgstr "选中文本"
 
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 47
-#: rc.cpp:686
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 591
+#: rc.cpp:988
 #, no-c-format
-msgid "Show hidden files in files tree"
-msgstr "在文件树中显示隐藏的文件"
+msgid "&Output:"
+msgstr "输出(&O)："
 
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 55
-#: rc.cpp:689
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 605
+#: rc.cpp:994
 #, no-c-format
-msgid "Save tree status for local trees"
-msgstr ""
+msgid "Insert in Cursor Position"
+msgstr "在光标位置插入"
 
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 63
-#: rc.cpp:692
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 610
+#: rc.cpp:997
 #, no-c-format
-msgid "Close Buttons on Tabs"
-msgstr "在标签上显示关闭按钮"
+msgid "Replace Selection"
+msgstr "替换选中内容"
 
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 74
-#: rc.cpp:695
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 615
+#: rc.cpp:1000
 #, no-c-format
-msgid "&Always show"
-msgstr "总是显示(&A)"
+msgid "Replace Current Document"
+msgstr "替换当前文档"
 
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 85
-#: rc.cpp:698
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 620
+#: rc.cpp:1003
 #, no-c-format
-msgid "&Do not show"
-msgstr "不显示(&D)"
+msgid "Create New Document"
+msgstr "创建新文档"
 
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 93
-#: rc.cpp:701
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 625
+#: rc.cpp:1006
 #, no-c-format
-msgid "Show dela&yed"
-msgstr "延迟显示(&Y)"
+msgid "Message Window"
+msgstr "消息窗口"
 
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 103
-#: rc.cpp:704 rc.cpp:4916 src/quanta.cpp:5297 src/quanta_init.cpp:184
-#: src/viewmanager.cpp:564
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 651
+#: rc.cpp:1012
 #, no-c-format
-msgid "Documentation"
-msgstr "文档"
+msgid "Insert in cursor position"
+msgstr "在光标位置插入"
 
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 114
-#: rc.cpp:707
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 656
+#: rc.cpp:1015
 #, no-c-format
-msgid "New tab"
-msgstr "新建标签"
+msgid "Replace selection"
+msgstr "替换选中内容"
 
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 125
-#: rc.cpp:710 rc.cpp:728
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 661
+#: rc.cpp:1018
 #, no-c-format
-msgid "Separate toolview"
-msgstr "分隔工具视图"
+msgid "Replace current document"
+msgstr "替换当前文档"
 
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 135
-#: rc.cpp:713
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 666
+#: rc.cpp:1021
 #, no-c-format
-msgid "Toolview Tabs"
-msgstr "工具视图标签"
+msgid "Create a new document"
+msgstr "创建新文档"
 
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 146
-#: rc.cpp:716
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 671
+#: rc.cpp:1024
 #, no-c-format
-msgid "Icon and text"
-msgstr "图标和文字"
+msgid "Message window"
+msgstr "消息窗口"
 
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 165
-#: rc.cpp:722 rc.cpp:5171
+#. i18n: file ./dialogs/actionconfigdialogs.ui line 702
+#: rc.cpp:1027
 #, no-c-format
-msgid "Icon"
-msgstr "图标"
+msgid "&Error:"
+msgstr "错误(&E)："
 
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 175
-#: rc.cpp:725 src/quanta.cpp:5283
+#. i18n: file ./dialogs/loadentitydlgs.ui line 27
+#: rc.cpp:1030
 #, no-c-format
-msgid "Preview"
-msgstr "预览"
+msgid "Source DTD:"
+msgstr "源 DTD："
 
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 200
-#: rc.cpp:731
+#. i18n: file ./dialogs/loadentitydlgs.ui line 35
+#: rc.cpp:1033
 #, no-c-format
-msgid "Editor area"
-msgstr "编辑器区域"
+msgid "Target DTEP:"
+msgstr "目标 DTEP："
 
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 230
-#: rc.cpp:734
+#. i18n: file ./dialogs/loadentitydlgs.ui line 43
+#: rc.cpp:1036 src/dtds.cpp:904
 #, no-c-format
-msgid "&Warning Messages"
-msgstr "警告消息(&W)"
+msgid "*.dtd|DTD Definitions"
+msgstr "*.dtd|DTD 定义"
 
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 241
-#: rc.cpp:737
+#. i18n: file ./dialogs/donationdialog.ui line 33
+#: rc.cpp:1039
 #, no-c-format
-msgid "Warn about opening binar&y/unknown files"
-msgstr "打开二进制/未知文件时警告(&Y)"
+msgid "Support Quanta with Financial Donation"
+msgstr "用捐款来支持 Quanta"
 
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 249
-#: rc.cpp:740
-#, no-c-format
-msgid "Warn when executing &actions associated with events"
+#. i18n: file ./dialogs/donationdialog.ui line 76
+#: rc.cpp:1045
+#, fuzzy, no-c-format
+msgid ""
+"<div align=\"center\">"
+"<h2>Your Contribution Can Make a Difference</h2></div>"
+"&nbsp;&nbsp;&nbsp;Quanta Plus would not be what it is today without sponsored "
+"developers. Andras Mantia has been full time since mid 2002 and Michal Rudolf "
+"came on part time in spring of 2004. Over the life of the project development "
+"has been largely sponsored by the efforts of the Project Manager, Eric Laffoon. "
+"In addition to his minimum 10-20 hour a week time commitment, his company, <a "
+"href=\"http://kittyhooch.com\" target=\"_blank\">Kitty Hooch</a> "
+"LLP has an ongoing financial commitment to keep Quanta in continuous "
+"development. Our sponsored developers are also a catalyst to our volunteer "
+"developers.\n"
+"<br>&nbsp;&nbsp;&nbsp;&nbsp;Kitty Hooch is a small company with no employees, 2 "
+"active partners and several contract workers. After test marketing in the fall "
+"of 2001 they began wholesale and retail to national and international markets "
+"in early 2002. Kitty Hooch controls all aspects of their product production and "
+"marketing. Quanta sponsorship is no small expense for a small start up company. "
+"In 2003 cash flow and a bout with typhoid fever left Eric in debt and unable to "
+"keep up payments to Andras without help from the community. Thankfully a number "
+"of people stepped up. We now have several large sponsors along with a number of "
+"generous contributors. This has enabled us to bring Michal on part time. Now we "
+"are looking to be able to move him to full time. The challenge for this project "
+"to assume a leading role as a \"killer desktop application\" is great.\n"
+"<div align=\"center\">"
+"<h3>Balancing open source ideals and fiscal\n"
+"reality</h3></div>\n"
+"&nbsp;&nbsp;&nbsp;&nbsp;We believe that the open source model\n"
+"is the future of software, but it is no guarantee of success. How many open "
+"source projects that we had high hopes for are unmaintained today? In early "
+"2002 many people thought that Quanta Plus was dead. One person, Eric Laffoon, "
+"was not about to let the dream die. Quanta is more than surviving now, but "
+"developing a best-in-class tool is no easy task. We believe the key is "
+"consistent momentum. Nothing ensures this better than programmers who can work "
+"without financial or time distractions. Why do you think OSS projects die?"
+"<br>&nbsp;&nbsp;&nbsp;&nbsp;As Quanta grows the project management demands are "
+"increasing and ironically impacting the revenue stream it requires to continue. "
+"The impact of our sponsored developers has been huge! We are looking to make "
+"Quanta grow even faster. Eric needs to be able to free even more time to bring "
+"several new and exciting ideas through coding to release. We have other "
+"expenses too, with conferences and keeping our systems up to date so we don't "
+"lose time fighting old hardware. <i>We want to make Quanta the best web tool "
+"anywhere!</i>. This will require a nucleus of active core developers. We hope "
+"professional developers and companies using Quanta will help us to reach our "
+"goals with sponsorship donations that will relieve financial stresses.\n"
+"<div align=\"center\">"
+"<h3>Could Quanta die without your support?</h3></div>"
+"&nbsp;&nbsp;&nbsp;&nbsp;We'd like to think not! But from February 2001 to June "
+"2002 there was very little activity and many months with no work done at all. "
+"This came about because of cash flow problems which led to the original "
+"developers leaving to do a commercial project. The fact remains that our most "
+"productive volunteer developers, as much as we think they're wonderful, go long "
+"periods where they just can't make time to code on the project. We estimate our "
+"active users number well over a million, yet we have only a few dozen people a "
+"year supporting the project. In fact 3-4 people account for over half of our "
+"current support. Clearly the actions of a few people make a huge difference, "
+"and yours can make a difference too.\n"
+"<br><div align=\"center\">"
+"<h3>Will you help make a difference?</h3></div>\n"
+"&nbsp;&nbsp;&nbsp;&nbsp;If you wish to donate through PayPal\n"
+"(online money transfer or credit card), visit our <a "
+"href=\"http://kdewebdev.org/donate.php\">donation page</a>.\n"
+"<br>&nbsp;&nbsp;&nbsp;&nbsp;If you are outside the PayPal area or wish to "
+"discuss corporate sponsorship contact the project manager:"
+"<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Eric Laffoon, <a "
+"href=\"mailto:sequitur@kde.org?subject=Quanta%20sponsorship%20inquiry\">"
+"sequitur@kde.org</a>"
 msgstr ""
+"<div align=\"center\">"
+"<h2>您的一点贡献就能改变一切</h2></div>&nbsp;&nbsp;&nbsp;没有赞助开发者，就没有 Quanta Plus 的今天。Andras "
+"Mantia 自2002年中起成为全职开发者，Michal Rudolf 在2004年春成为兼职开发者。在工程开发的整个过程中，我们始终得益于工程经理 "
+"Eric Lanffon 的资助。除了他每周至少 10-20 小时的无私工作以外，他的公司<a href=\"http://kittyhooch.com\" "
+"target=\"_blank\">Kitty Hooch</a> LLP 持续资助了 Quanta "
+"的开发。对我们的志愿开发者来说，赞助开发者也是一种鼓励。\n"
+"<br>&nbsp;&nbsp;&nbsp;&nbsp;Kitty Hooch 仍然是一家小公司，没有正式雇员，只有 2 名任职股东和几个签约工人。在 "
+"2001 年秋天进行了市场尝试后，他们在 2002 年早期开始拓展他们的本地和国际的批零市场。Kitty Hooch "
+"全面负责他们的产品，从制造到销售。Quanta 的赞助对于一个刚刚起步的公司来说，实在不是一个小数目。2003年发生的一些事情，使得 Eric "
+"开始负债，因此无法继续向 Andras 支付报酬。感谢接下来的许多人。我们现在已经有几家较大的赞助商，也拥有许多天才的贡献者。这使得我们有力让 Michal "
+"以兼职方式工作。现在我们正在考虑是否可以将他转为全职开发者。此工程的挑战在于，我们是要做一个“杀手级的桌面应用程序”。\n"
+"<div align=\"center\">"
+"<h3>在开发源代码理想和财政现实之间取得平衡</h3></div>&nbsp;&nbsp;&nbsp;&nbsp;我们相信开放源代码模型是软件开发的未来之路，"
+"但是没有任何保证它能够最终取得成功。有多少开发源代码的工程，我们原来寄予很高期望，但现在已不再有人维护？您认为 TDE 中还缺少多少应用程序？在 2002 "
+"年初，曾有传言说 Quanta Plus 已没有希望。但却有一个人 - Eric Laffoon - 不想让希望破灭。Quanta "
+"现在已经不用考虑其延续性了，但是开发一个专业领域内领先的工具也并非易事。我们相信关键在于持续不断的动力和热情。经济或时间上没有其它牵挂的程序员对此才是最好的保证"
+"。开放源代码的工程怎么会死掉呢？"
+"<br>&nbsp;&nbsp;&nbsp;&nbsp;随着 Quanta "
+"的不断成长，工程管理的要求正在不断增加，甚至继续维持的资金也是捉襟见肘。赞助开发者的作用甚为巨大！我们正在试图让 Quanta 变得更好。Eric "
+"也需要在版本不断推出的时候规划好新的激动人心的特性。我们还有其他一些花费，比如适当更新我们的系统，以便不受旧硬件运行效率的制约。<i>"
+"我们想要将其发展成为最佳的 Web 工具！</i>。这需要更多活跃的核心开发者。我们希望使用 Quanta "
+"的专业开发者和公司能够帮助我们达到这一目的，而您所做的仅仅是给予我们力所能及的赞助。\n"
+"<div align=\"center\">"
+"<h3>没有您的支持 Quanta "
+"会死掉吗？</h3></div>&nbsp;&nbsp;&nbsp;&nbsp;当然不会！但是从2001年2月到2002年6月，我们基本没有什么活动，而且几乎根"
+"本没干什么活。其中的主要原因是资金问题，这使得原始开发者转而开发商业工程。这一事实一直持续到今天，我们最有创造力的志愿开发者，由于这样或者那样的原因，再也无法为"
+"工程编写一行代码。尽管我们可以大概估算出几乎有超过一亿的用户正在使用着我们的程序，但每年仍只有屈指可数的几个人对工程给予了实际支持。实际上，目前我们所得到的支持"
+"中，三四个人所做的贡献占据了一大半。既然几个人就可以让事情变得完全不同，您为何不加入呢？\n"
+"<br><div align=\"center\">"
+"<h3>您会帮助吗？</h3></div>&nbsp;&nbsp;&nbsp;&nbsp;如果您想要通过 PayPal "
+"捐助(在线汇款或信用卡)，请浏览我们的<a "
+"href=\"http://quanta.kdewebdev.org/main1.php?actfile=donate\">捐助页面</a>。"
+"<br>&nbsp;&nbsp;&nbsp;&nbsp;如果您所在区域没有 PayPal 服务，或者想要讨论社团资助，请联系我们的工程经理："
+"<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Eric Laffoon, <a "
+"href=\"mailto:sequitur@kde.org?subject=Quanta%20sponsorship%20inquiry\">"
+"sequitur@kde.org</a>"
 
-#. i18n: file ./dialogs/settings/previewoptionss.ui line 257
-#: rc.cpp:743
-#, no-c-format
-msgid "Show all warning messages"
-msgstr "显示全部消息"
-
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 47
-#: rc.cpp:746
-#, no-c-format
-msgid "Structure Tree Look && Feel"
-msgstr "结构树观感"
-
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 64
-#: rc.cpp:749
-#, no-c-format
-msgid "Use 0 to disable the automatic refresh of structure tree"
-msgstr "设为 0 将禁用结构树的自动刷新"
-
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 89
-#: rc.cpp:752
-#, no-c-format
-msgid "Instant update"
-msgstr "立即更新"
-
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 92
-#: rc.cpp:755 rc.cpp:776
-#, no-c-format
-msgid "Update the structure tree after every keystroke"
-msgstr "每次按键时更新结构树"
-
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 117
-#: rc.cpp:758
-#, no-c-format
-msgid "Show closing tags"
-msgstr "显示关闭标签"
-
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 125
-#: rc.cpp:761
-#, no-c-format
-msgid "Show empt&y nodes and groups"
-msgstr "显示空结点和组(&Y)"
-
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 136
-#: rc.cpp:764
-#, no-c-format
-msgid "Set to 0 in order to expand the whole tree"
-msgstr "(设为 0 则展开整棵树)"
-
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 144
-#: rc.cpp:767
-#, no-c-format
-msgid "Refresh frequency (in seconds):"
-msgstr "刷新频率(秒)："
-
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 152
-#: rc.cpp:770
-#, no-c-format
-msgid "Expand tree when reparse to level:"
-msgstr "重新分析时展开树的级别："
-
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 162
-#: rc.cpp:773
-#, no-c-format
-msgid "Clicks on Structure Tree Items"
-msgstr "单击结构树项目"
-
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 174
-#: dialogs/settings/parseroptions.cpp:37 dialogs/settings/parseroptions.cpp:55
-#: dialogs/settings/parseroptions.cpp:58 rc.cpp:779 rc.cpp:815
-#: treeviews/structtreeview.cpp:111 treeviews/structtreeview.cpp:486
-#: treeviews/structtreeview.cpp:488 treeviews/structtreeview.cpp:531
-#, no-c-format
-msgid "Select Tag Area"
-msgstr "选择标签区域"
-
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 179
-#: dialogs/settings/parseroptions.cpp:35 dialogs/settings/parseroptions.cpp:56
-#: rc.cpp:782 rc.cpp:818
-#, no-c-format
-msgid "Nothing"
-msgstr "无"
-
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 189
-#: dialogs/settings/parseroptions.cpp:53 rc.cpp:785 rc.cpp:809
-#, no-c-format
-msgid "Find Tag"
-msgstr "查找标签"
-
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 194
-#: dialogs/settings/parseroptions.cpp:34 dialogs/settings/parseroptions.cpp:43
-#: dialogs/settings/parseroptions.cpp:52 rc.cpp:788 rc.cpp:806
-#, no-c-format
-msgid "Find Tag & Open Tree"
-msgstr "查找标记并打开树"
-
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 206
-#: rc.cpp:791
-#, no-c-format
-msgid "Left button:"
-msgstr "左按钮："
-
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 212
-#: dialogs/settings/parseroptions.cpp:36 rc.cpp:794
-#, no-c-format
-msgid "Popup Menu"
-msgstr "弹出菜单"
-
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 224
-#: rc.cpp:797
-#, no-c-format
-msgid "Double click:"
-msgstr "双击："
-
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 232
-#: rc.cpp:800
-#, no-c-format
-msgid "Middle button:"
-msgstr "中键："
-
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 240
-#: rc.cpp:803
+#. i18n: file ./dialogs/donationdialog.ui line 136
+#: rc.cpp:1058
 #, no-c-format
-msgid "Right button:"
-msgstr "右键："
+msgid ""
+"<a href=\"http://kdewebdev.org/donate.php\">Donate</a> through  PayPal now."
+msgstr "现在就通过 PayPal <a href=\"http://kdewebdev.org/donate.php\">进行捐助</a>。"
 
-#. i18n: file ./dialogs/settings/parseroptionsui.ui line 256
-#: dialogs/settings/parseroptions.cpp:54 rc.cpp:812
-#: treeviews/structtreeview.cpp:112 treeviews/structtreeview.cpp:534
+#. i18n: file ./dialogs/dtdselectdialog.ui line 31
+#: rc.cpp:1061 src/document.cpp:2931 src/quanta.cpp:3053
 #, no-c-format
-msgid "Go to End of Tag"
-msgstr "转到标签结尾"
+msgid "DTD Selector"
+msgstr "DTD 选择器"
 
-#. i18n: file ./dialogs/casewidget.ui line 30
-#: rc.cpp:821
+#. i18n: file ./dialogs/dtdselectdialog.ui line 43
+#: rc.cpp:1064
 #, no-c-format
-msgid "Tag Case"
-msgstr "标签大小写"
+msgid ""
+"Dialog message:\n"
+"Dialog message2:"
+msgstr ""
+"对话框消息：\n"
+"对话框消息2："
 
-#. i18n: file ./dialogs/casewidget.ui line 41
-#: rc.cpp:824 rc.cpp:836
+#. i18n: file ./dialogs/dtdselectdialog.ui line 62
+#: rc.cpp:1068
 #, no-c-format
-msgid "Upper case"
-msgstr "大写"
+msgid "Current DTD:"
+msgstr "当前的 DTD："
 
-#. i18n: file ./dialogs/casewidget.ui line 49
-#: rc.cpp:827 rc.cpp:839
+#. i18n: file ./dialogs/dtdselectdialog.ui line 70
+#: rc.cpp:1071
 #, no-c-format
-msgid "Lower case"
-msgstr "小写"
+msgid "Select DTD:"
+msgstr "选中的 DTD："
 
-#. i18n: file ./dialogs/casewidget.ui line 57
-#: rc.cpp:830 rc.cpp:842
+#. i18n: file ./dialogs/dtdselectdialog.ui line 86
+#: rc.cpp:1074
 #, no-c-format
-msgid "Unchanged"
-msgstr "不更改"
+msgid "Conver&t the document to the selected DTD"
+msgstr "将文档转换为选中的 DTD(&T)"
 
-#. i18n: file ./dialogs/casewidget.ui line 70
-#: rc.cpp:833
+#. i18n: file ./dialogs/dtdselectdialog.ui line 94
+#: rc.cpp:1077
 #, no-c-format
-msgid "Attribute Case"
-msgstr "属性大小写"
+msgid "Do not show this dialog, use the closest matching DTD"
+msgstr "不显示此对话框，使用最符合的 DTD"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 25
-#: parsers/dtd/dtdparser.cpp:179 rc.cpp:845 src/quanta.cpp:3108
+#: parsers/dtd/dtdparser.cpp:179 rc.cpp:1080 src/quanta.cpp:3108
 #, no-c-format
 msgid "Configure DTEP"
 msgstr "配置 DTEP"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 40
-#: rc.cpp:848 rc.cpp:1968 rc.cpp:2141
+#: rc.cpp:1083 rc.cpp:1979 rc.cpp:2105
 #, no-c-format
 msgid "&General"
 msgstr "常规(&G)"
 
-#. i18n: file ./dialogs/dtepeditdlgs.ui line 59
-#: ../lib/compatibility/knewstuff/uploaddialog.cpp:57 rc.cpp:851 rc.cpp:2449
-#: rc.cpp:2497 rc.cpp:2928
-#, no-c-format
-msgid "Name:"
-msgstr "名称："
-
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 65
-#: rc.cpp:854 rc.cpp:869
+#: rc.cpp:1089 rc.cpp:1104
 #, no-c-format
 msgid "DTD definition string"
 msgstr "DTD 定义字符串"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 68
-#: rc.cpp:857 rc.cpp:872
+#: rc.cpp:1092 rc.cpp:1107
 #, no-c-format
 msgid ""
 "The real name of the DTEP. In case of XML DTEPs this should be the DTD "
@@ -1560,44 +1945,44 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 84
-#: rc.cpp:860
+#: rc.cpp:1095
 #, no-c-format
 msgid "Short name:"
 msgstr "短名称："
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 90
-#: rc.cpp:863 rc.cpp:875
+#: rc.cpp:1098 rc.cpp:1110
 #, no-c-format
 msgid "Beautified, user visible name"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 93
-#: rc.cpp:866 rc.cpp:878
+#: rc.cpp:1101 rc.cpp:1113
 #, no-c-format
 msgid ""
 "The user visible, beautified name. If not defined, the real name is used."
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 173
-#: rc.cpp:881
+#: rc.cpp:1116
 #, no-c-format
 msgid "Type Specific Settings"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 199
-#: rc.cpp:884
+#: rc.cpp:1119
 #, no-c-format
 msgid "URL:"
 msgstr "URL："
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 205
-#: rc.cpp:887 rc.cpp:903
+#: rc.cpp:1122 rc.cpp:1138
 #, no-c-format
 msgid "URL pointing to the DTD definiton file"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 208
-#: rc.cpp:890 rc.cpp:906
+#: rc.cpp:1125 rc.cpp:1141
 #, no-c-format
 msgid ""
 "URL pointing to the DTD definiton file, like "
@@ -1605,19 +1990,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 216
-#: rc.cpp:893
+#: rc.cpp:1128
 #, no-c-format
 msgid "DOCT&YPE string:"
 msgstr "DOCTYPE 字符串(&Y)："
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 222
-#: rc.cpp:896 rc.cpp:909
+#: rc.cpp:1131 rc.cpp:1144
 #, no-c-format
 msgid "The string that should appear in the !DOCTYPE tag"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 226
-#: rc.cpp:899 rc.cpp:912
+#: rc.cpp:1134 rc.cpp:1147
 #, no-c-format
 msgid ""
 "The string that should appear in the !DOCTYPE tag, like"
@@ -1628,19 +2013,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 274
-#: rc.cpp:916
+#: rc.cpp:1151
 #, no-c-format
 msgid "Top level"
 msgstr "顶级"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 277
-#: rc.cpp:919
+#: rc.cpp:1154
 #, no-c-format
 msgid "Check if the DTEP can act as a top level DTEP."
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 280
-#: rc.cpp:922
+#: rc.cpp:1157
 #, no-c-format
 msgid ""
 "Check if the DTEP can act as a top level DTEP. This means that the document can "
@@ -1650,19 +2035,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 292
-#: rc.cpp:925
+#: rc.cpp:1160
 #, no-c-format
 msgid "Toolbar folder:"
 msgstr "工具栏文件夹："
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 298
-#: rc.cpp:928 rc.cpp:934
+#: rc.cpp:1163 rc.cpp:1169
 #, no-c-format
 msgid "The name of the folder where the toolbars are stored"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 301
-#: rc.cpp:931 rc.cpp:937
+#: rc.cpp:1166 rc.cpp:1172
 #, no-c-format
 msgid ""
 "The name of the folder where the toolbars are stored. This is a relative name "
@@ -1671,19 +2056,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 320
-#: rc.cpp:940
+#: rc.cpp:1175
 #, no-c-format
 msgid "&Autoloaded toolbars:"
 msgstr "自动装入的工具栏(&A)："
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 326
-#: rc.cpp:943 rc.cpp:949
+#: rc.cpp:1178 rc.cpp:1184
 #, no-c-format
 msgid "Comma separated list of toolbars"
 msgstr "逗号分隔的工具栏列表"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 329
-#: rc.cpp:946 rc.cpp:952
+#: rc.cpp:1181 rc.cpp:1187
 #, no-c-format
 msgid ""
 "Comma separated list of toolbars from the toolbar folder that will be loaded "
@@ -1691,39 +2076,33 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 356
-#: rc.cpp:955
+#: rc.cpp:1190
 #, no-c-format
 msgid "Case sensitive"
 msgstr "区分大小写"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 362
-#: rc.cpp:958
+#: rc.cpp:1193
 #, no-c-format
 msgid "Check if the DTEP has case sensitive tags"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 365
-#: rc.cpp:961
+#: rc.cpp:1196
 #, no-c-format
 msgid ""
 "Indicates whether the DTEP has case sensitive tags. In case of XML this should "
 "be checked, but for example HTML variants are not case sensitive."
 msgstr ""
 
-#. i18n: file ./dialogs/dtepeditdlgs.ui line 381
-#: rc.cpp:964 rc.cpp:2446
-#, no-c-format
-msgid "Type:"
-msgstr "类型："
-
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 384
-#: rc.cpp:967 rc.cpp:989
+#: rc.cpp:1202 rc.cpp:1224
 #, no-c-format
 msgid "The family to where this DTEP belongs."
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 388
-#: rc.cpp:970 rc.cpp:992
+#: rc.cpp:1205 rc.cpp:1227
 #, no-c-format
 msgid ""
 "The family to where this DTEP belong. There are two families:"
@@ -1734,19 +2113,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 396
-#: rc.cpp:974
+#: rc.cpp:1209
 #, no-c-format
 msgid "Inherits:"
 msgstr "继承："
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 399
-#: rc.cpp:977 rc.cpp:999
+#: rc.cpp:1212 rc.cpp:1234
 #, no-c-format
 msgid "The DTEP name from where this DTEP inherits the tags."
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 402
-#: rc.cpp:980 rc.cpp:1002
+#: rc.cpp:1215 rc.cpp:1237
 #, no-c-format
 msgid ""
 "The real name of the DTEP (like "
@@ -1755,31 +2134,31 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 408
-#: rc.cpp:983
+#: rc.cpp:1218
 #, no-c-format
 msgid "XML Style"
 msgstr "XML 风格"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 413
-#: rc.cpp:986
+#: rc.cpp:1221
 #, no-c-format
 msgid "Pseudo Type"
 msgstr "Pseudo 类型"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 440
-#: rc.cpp:996
+#: rc.cpp:1231
 #, no-c-format
 msgid "Mimet&ypes:"
 msgstr "MIME 类型(&Y)："
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 473
-#: rc.cpp:1005
+#: rc.cpp:1240
 #, no-c-format
 msgid "Comma separated list of mimetypes"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 476
-#: rc.cpp:1008
+#: rc.cpp:1243
 #, no-c-format
 msgid ""
 "Comma separated list of mimetypes. Files of these types are treated as "
@@ -1787,52 +2166,59 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 484
-#: rc.cpp:1011
+#: rc.cpp:1246
 #, no-c-format
 msgid "The default extension of files belonging to this DTEP"
 msgstr "此 DTEP 所属的默认文件扩展名"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 492
-#: rc.cpp:1014
+#: rc.cpp:1249
 #, no-c-format
 msgid "E&xtension:"
 msgstr "扩展名(&X)："
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 522
-#: rc.cpp:1017
+#: rc.cpp:1252
 #, no-c-format
 msgid "P&ages"
 msgstr "分页(&A)"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 550
-#: rc.cpp:1020
+#: rc.cpp:1255
 #, no-c-format
 msgid "Enable the first extra page"
 msgstr "启用第一额外页面"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 553
-#: rc.cpp:1023
+#: rc.cpp:1258
 #, no-c-format
 msgid ""
 "Every tab edit dialog will have one more extra page aside of the main page"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 556
-#: rc.cpp:1026
+#: rc.cpp:1261
 #, no-c-format
 msgid ""
 "Every tab edit dialog will have one more extra page aside of the main page. You "
 "can configure what will be on this page in the below fields."
 msgstr ""
 
+#. i18n: file ./dialogs/dtepeditdlgs.ui line 567
+#: rc.cpp:1264 rc.cpp:1340 rc.cpp:1346 rc.cpp:1358 rc.cpp:1373 rc.cpp:1764
+#: rc.cpp:1890 rc.cpp:4118
+#, no-c-format
+msgid "Title:"
+msgstr "标题："
+
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 570
-#: rc.cpp:1032 rc.cpp:1076
+#: rc.cpp:1267 rc.cpp:1311
 #, no-c-format
 msgid "The title of the page"
 msgstr "页面标题"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 573
-#: rc.cpp:1035 rc.cpp:1079
+#: rc.cpp:1270 rc.cpp:1314
 #, no-c-format
 msgid ""
 "The title of the page, like <b>Core && i18n</b>. As you see, the ampersand must "
@@ -1840,19 +2226,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 584
-#: rc.cpp:1038 rc.cpp:1096 rc.cpp:1117 rc.cpp:1129 rc.cpp:1147
+#: rc.cpp:1273 rc.cpp:1331 rc.cpp:1352 rc.cpp:1364 rc.cpp:1382
 #, no-c-format
 msgid "Groups:"
 msgstr "组："
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 587
-#: rc.cpp:1041 rc.cpp:1082
+#: rc.cpp:1276 rc.cpp:1317
 #, no-c-format
 msgid "Comma separated list of the common attribute groups"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 595
-#: rc.cpp:1044 rc.cpp:1085
+#: rc.cpp:1279 rc.cpp:1320
 #, no-c-format
 msgid ""
 "Comma separated list of the common attribute groups. The attributes from the "
@@ -1873,64 +2259,64 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 606
-#: rc.cpp:1052
+#: rc.cpp:1287
 #, no-c-format
 msgid "Enable the second extra page"
 msgstr "启用第二额外页面"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 609
-#: rc.cpp:1055 rc.cpp:1061 rc.cpp:1067 rc.cpp:1073
+#: rc.cpp:1290 rc.cpp:1296 rc.cpp:1302 rc.cpp:1308
 #, no-c-format
 msgid "See the tooltip and \"What's This?\" information for the first checkbox"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 620
-#: rc.cpp:1058
+#: rc.cpp:1293
 #, no-c-format
 msgid "Enable the third extra page"
 msgstr "启用第三额外页面"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 634
-#: rc.cpp:1064
+#: rc.cpp:1299
 #, no-c-format
 msgid "Enable the fourth extra page"
 msgstr "启用第四额外页面"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 648
-#: rc.cpp:1070
+#: rc.cpp:1305
 #, no-c-format
 msgid "Enable the fifth extra page"
 msgstr "启用第五额外页面"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 695
-#: rc.cpp:1093 rc.cpp:1099 rc.cpp:1102 rc.cpp:1108 rc.cpp:1114 rc.cpp:1120
-#: rc.cpp:1126 rc.cpp:1132 rc.cpp:1135 rc.cpp:1141 rc.cpp:1144 rc.cpp:1150
-#: rc.cpp:1153 rc.cpp:1156 rc.cpp:1159 rc.cpp:1162
+#: rc.cpp:1328 rc.cpp:1334 rc.cpp:1337 rc.cpp:1343 rc.cpp:1349 rc.cpp:1355
+#: rc.cpp:1361 rc.cpp:1367 rc.cpp:1370 rc.cpp:1376 rc.cpp:1379 rc.cpp:1385
+#: rc.cpp:1388 rc.cpp:1391 rc.cpp:1394 rc.cpp:1397
 #, no-c-format
 msgid ""
 "See the tooltip and \"What's This?\" information for the first page fields"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 894
-#: rc.cpp:1165
+#: rc.cpp:1400
 #, no-c-format
 msgid "Parsing &Rules"
 msgstr "分析规则(&R)"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 905
-#: rc.cpp:1168
+#: rc.cpp:1403
 #, no-c-format
 msgid "Enable minus in words"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 908
-#: rc.cpp:1171
+#: rc.cpp:1406
 #, no-c-format
 msgid "Treat the minus sign as part of a word"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 911
-#: rc.cpp:1174
+#: rc.cpp:1409
 #, no-c-format
 msgid ""
 "If enabled <b>this-is-a-word</b> is treated like a word. Otherwise it is "
@@ -1938,19 +2324,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 919
-#: rc.cpp:1177
+#: rc.cpp:1412
 #, no-c-format
 msgid "Comments:"
 msgstr "注释："
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 925
-#: rc.cpp:1180 rc.cpp:1444
+#: rc.cpp:1415 rc.cpp:1679
 #, no-c-format
 msgid "Comma separated list of area borders for comments"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 929
-#: rc.cpp:1183 rc.cpp:1447
+#: rc.cpp:1418 rc.cpp:1682
 #, no-c-format
 msgid ""
 "Comma separated list of area borders for comments. <i>EOL</i> "
@@ -1960,25 +2346,25 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 945
-#: rc.cpp:1187
+#: rc.cpp:1422
 #, no-c-format
 msgid "Type Specific Rules"
 msgstr "类型特定的规则"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 971
-#: rc.cpp:1190
+#: rc.cpp:1425
 #, no-c-format
 msgid "XML style single tags"
 msgstr "XML 风格单标记"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 977
-#: rc.cpp:1193
+#: rc.cpp:1428
 #, no-c-format
 msgid "Check to use XML style single tags"
 msgstr "选中可使用 XML 风格的单个标记"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 980
-#: rc.cpp:1196
+#: rc.cpp:1431
 #, no-c-format
 msgid ""
 "Check to use XML style single tags (<b>&lt;single_tag /&gt;</b>"
@@ -1986,19 +2372,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 988
-#: rc.cpp:1199
+#: rc.cpp:1434
 #, no-c-format
 msgid "Use common rules"
 msgstr "使用公共规则"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 994
-#: rc.cpp:1202
+#: rc.cpp:1437
 #, no-c-format
 msgid "Append common parsing rules"
 msgstr "追加公共分析规则"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1002
-#: rc.cpp:1205
+#: rc.cpp:1440
 #, no-c-format
 msgid ""
 "Check it to append common parsing rules. These are:\n"
@@ -2010,19 +2396,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1010
-#: rc.cpp:1213
+#: rc.cpp:1448
 #, no-c-format
 msgid "Extended booleans"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1013
-#: rc.cpp:1216
+#: rc.cpp:1451
 #, no-c-format
 msgid "Check if the booleans are stored in extended form"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1021
-#: rc.cpp:1219
+#: rc.cpp:1454
 #, no-c-format
 msgid ""
 "Check if you want extended booleans in the language."
@@ -2039,32 +2425,32 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1040
-#: rc.cpp:1227 rc.cpp:1230
+#: rc.cpp:1462 rc.cpp:1465
 #, no-c-format
 msgid "The value of \"true\" in case of extended booleans"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1070
-#: rc.cpp:1233
+#: rc.cpp:1468
 #, no-c-format
 msgid "False:"
 msgstr "False："
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1084
-#: rc.cpp:1236
+#: rc.cpp:1471
 #, no-c-format
 msgid "True:"
 msgstr "True："
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1112
-#: rc.cpp:1239 rc.cpp:1250
+#: rc.cpp:1474 rc.cpp:1485
 #, no-c-format
 msgid ""
 "Comma separated list of the beginning and closing string for special areas"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1117
-#: rc.cpp:1242 rc.cpp:1253
+#: rc.cpp:1477 rc.cpp:1488
 #, no-c-format
 msgid ""
 "The beginning and closing string of special areas, separated by a comma."
@@ -2077,37 +2463,37 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1125
-#: rc.cpp:1247
+#: rc.cpp:1482
 #, no-c-format
 msgid "Special areas:"
 msgstr "特殊区域："
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1144
-#: rc.cpp:1258 rc.cpp:1264
+#: rc.cpp:1493 rc.cpp:1499
 #, no-c-format
 msgid "Comma-separated list of the names for the above-defined special areas"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1152
-#: rc.cpp:1261
+#: rc.cpp:1496
 #, no-c-format
 msgid "Special area names:"
 msgstr "特殊区域名称："
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1166
-#: rc.cpp:1267
+#: rc.cpp:1502
 #, no-c-format
 msgid "Special tags:"
 msgstr "特殊标签："
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1169
-#: rc.cpp:1270 rc.cpp:1277
+#: rc.cpp:1505 rc.cpp:1512
 #, no-c-format
 msgid "Specifies a tag that defines the start of a special area"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1173
-#: rc.cpp:1273 rc.cpp:1280
+#: rc.cpp:1508 rc.cpp:1515
 #, no-c-format
 msgid ""
 "Specifies a tag which defines the start of a special area in the form of <i>"
@@ -2118,19 +2504,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1206
-#: rc.cpp:1284
+#: rc.cpp:1519
 #, no-c-format
 msgid "Definition tags:"
 msgstr "定义标签："
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1212
-#: rc.cpp:1287 rc.cpp:1355
+#: rc.cpp:1522 rc.cpp:1590
 #, no-c-format
 msgid "Tags and attributes defining this DTEP"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1219
-#: rc.cpp:1290 rc.cpp:1358
+#: rc.cpp:1525 rc.cpp:1593
 #, no-c-format
 msgid ""
 "Comma separated list of tags that define this DTEP. The format used is <i>"
@@ -2149,19 +2535,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1227
-#: rc.cpp:1297
+#: rc.cpp:1532
 #, no-c-format
 msgid "Area borders:"
 msgstr "区域边框："
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1233
-#: rc.cpp:1300 rc.cpp:1365
+#: rc.cpp:1535 rc.cpp:1600
 #, no-c-format
 msgid "Comma separated list of the area borders"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1237
-#: rc.cpp:1303 rc.cpp:1368
+#: rc.cpp:1538 rc.cpp:1603
 #, no-c-format
 msgid ""
 "Comma separated list of the area borders encapsulating this pseudo DTEP. In the "
@@ -2171,19 +2557,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1245
-#: rc.cpp:1307
+#: rc.cpp:1542
 #, no-c-format
 msgid "Structure keywords:"
 msgstr "结构关键字："
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1251
-#: rc.cpp:1310 rc.cpp:1349
+#: rc.cpp:1545 rc.cpp:1584
 #, no-c-format
 msgid "Comma separated list of structure keywords"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1254
-#: rc.cpp:1313 rc.cpp:1352
+#: rc.cpp:1548 rc.cpp:1587
 #, no-c-format
 msgid ""
 "Comma separated list of structure keywords. The keywords used here are used to "
@@ -2192,19 +2578,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1262
-#: rc.cpp:1316
+#: rc.cpp:1551
 #, no-c-format
 msgid "Structure delimiting:"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1268
-#: rc.cpp:1319 rc.cpp:1429
+#: rc.cpp:1554 rc.cpp:1664
 #, no-c-format
 msgid "Regular expression that finds the beginning or end of a structure"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1271
-#: rc.cpp:1322 rc.cpp:1432
+#: rc.cpp:1557 rc.cpp:1667
 #, no-c-format
 msgid ""
 "Regular expression that finds the beginning or end of a structure. This is "
@@ -2213,38 +2599,38 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1279
-#: rc.cpp:1325
+#: rc.cpp:1560
 #, no-c-format
 msgid "Structure beginning:"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1285
-#: rc.cpp:1328 rc.cpp:1387
+#: rc.cpp:1563 rc.cpp:1622
 #, no-c-format
 msgid "A string specifying the beginning of a structure"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1288
-#: rc.cpp:1331 rc.cpp:1390
+#: rc.cpp:1566 rc.cpp:1625
 #, no-c-format
 msgid ""
 "A string specifying the beginning of a structure, like <b>{</b> in many cases."
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1296
-#: rc.cpp:1334
+#: rc.cpp:1569
 #, no-c-format
 msgid "Local scope keywords:"
 msgstr "本地范围关键字："
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1302
-#: rc.cpp:1337 rc.cpp:1343
+#: rc.cpp:1572 rc.cpp:1578
 #, no-c-format
 msgid "Comma separated list of the local scope defining keywords"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1305
-#: rc.cpp:1340 rc.cpp:1346
+#: rc.cpp:1575 rc.cpp:1581
 #, no-c-format
 msgid ""
 "Comma separated list of the local scope defining keywords. Other structure "
@@ -2255,38 +2641,38 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1362
-#: rc.cpp:1372 rc.cpp:1381
+#: rc.cpp:1607 rc.cpp:1616
 #, no-c-format
 msgid "A string specifying the end of a structure"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1365
-#: rc.cpp:1375 rc.cpp:1384
+#: rc.cpp:1610 rc.cpp:1619
 #, no-c-format
 msgid ""
 "A string specifying the end of a structure, like <b>}</b> in many cases."
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1373
-#: rc.cpp:1378
+#: rc.cpp:1613
 #, no-c-format
 msgid "Structure end:"
 msgstr "结构结束："
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1409
-#: rc.cpp:1393
+#: rc.cpp:1628
 #, no-c-format
 msgid "Complete class members after:"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1415
-#: rc.cpp:1396 rc.cpp:1417
+#: rc.cpp:1631 rc.cpp:1652
 #, no-c-format
 msgid "Regular expression to find out when to invoke member autocompletion"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1424
-#: rc.cpp:1399
+#: rc.cpp:1634
 #, no-c-format
 msgid ""
 "Regular expression to find out when to invoke member autocompletion. "
@@ -2306,13 +2692,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1440
-#: rc.cpp:1408
+#: rc.cpp:1643
 #, no-c-format
 msgid "Complete attributes after:"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1446
-#: rc.cpp:1411 rc.cpp:1414
+#: rc.cpp:1646 rc.cpp:1649
 #, no-c-format
 msgid ""
 "Autocomplete attributes after this character. See the information for the same "
@@ -2320,7 +2706,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1471
-#: rc.cpp:1420
+#: rc.cpp:1655
 #, no-c-format
 msgid ""
 "Regular expression to find out when to invoke member autocompletion. "
@@ -2340,19 +2726,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1495
-#: rc.cpp:1435
+#: rc.cpp:1670
 #, no-c-format
 msgid "Attribute separator:"
 msgstr "属性分隔符："
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1501
-#: rc.cpp:1438 rc.cpp:1484
+#: rc.cpp:1673 rc.cpp:1719
 #, no-c-format
 msgid "The character specifying the end of an attribute"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1504
-#: rc.cpp:1441 rc.cpp:1487
+#: rc.cpp:1676 rc.cpp:1722
 #, no-c-format
 msgid ""
 "The character specifying the end of an attribute. By default it is <b>\"</b> "
@@ -2360,19 +2746,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1524
-#: rc.cpp:1451
+#: rc.cpp:1686
 #, no-c-format
 msgid "Included DTEPs:"
 msgstr "包含的 DTEP："
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1530
-#: rc.cpp:1454 rc.cpp:1490
+#: rc.cpp:1689 rc.cpp:1725
 #, no-c-format
 msgid "Comma-separated list of DTEPs that can be present inside this DTEP"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1533
-#: rc.cpp:1457 rc.cpp:1493
+#: rc.cpp:1692 rc.cpp:1728
 #, no-c-format
 msgid ""
 "Comma-separated list of DTEPs that can be present inside this DTEP. The list "
@@ -2380,19 +2766,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1541
-#: rc.cpp:1460
+#: rc.cpp:1695
 #, no-c-format
 msgid "Autocomplete tags after:"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1547
-#: rc.cpp:1463 rc.cpp:1469
+#: rc.cpp:1698 rc.cpp:1704
 #, no-c-format
 msgid "The character after which the list of tags should be shown"
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1550
-#: rc.cpp:1466
+#: rc.cpp:1701
 #, no-c-format
 msgid ""
 "The autocompletion box is brought up automatically once this character is "
@@ -2404,7 +2790,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1561
-#: rc.cpp:1472
+#: rc.cpp:1707
 #, no-c-format
 msgid ""
 "The autocompletion box is brought up automatically once this character is "
@@ -2416,7 +2802,7 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1577
-#: rc.cpp:1475 rc.cpp:1481
+#: rc.cpp:1710 rc.cpp:1716
 #, no-c-format
 msgid ""
 "The character specifying the end of a tag. See the information for the "
@@ -2424,590 +2810,551 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1585
-#: rc.cpp:1478
+#: rc.cpp:1713
 #, no-c-format
 msgid "Tag separator:"
 msgstr "标签分隔符："
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1623
-#: rc.cpp:1496
+#: rc.cpp:1731
 #, no-c-format
 msgid "Structures"
 msgstr "结构"
 
 #. i18n: file ./dialogs/dtepeditdlgs.ui line 1634
-#: rc.cpp:1499
+#: rc.cpp:1734
 #, no-c-format
 msgid "Available groups:"
 msgstr "可用组："
 
-#. i18n: file ./dialogs/dtdselectdialog.ui line 31
-#: rc.cpp:1511 src/document.cpp:2931 src/quanta.cpp:3053
-#, no-c-format
-msgid "DTD Selector"
-msgstr "DTD 选择器"
-
-#. i18n: file ./dialogs/dtdselectdialog.ui line 43
-#: rc.cpp:1514
-#, no-c-format
-msgid ""
-"Dialog message:\n"
-"Dialog message2:"
-msgstr ""
-"对话框消息：\n"
-"对话框消息2："
-
-#. i18n: file ./dialogs/dtdselectdialog.ui line 62
-#: rc.cpp:1518
-#, no-c-format
-msgid "Current DTD:"
-msgstr "当前的 DTD："
-
-#. i18n: file ./dialogs/dtdselectdialog.ui line 70
-#: rc.cpp:1521
-#, no-c-format
-msgid "Select DTD:"
-msgstr "选中的 DTD："
-
-#. i18n: file ./dialogs/dtdselectdialog.ui line 86
-#: rc.cpp:1524
-#, no-c-format
-msgid "Conver&t the document to the selected DTD"
-msgstr "将文档转换为选中的 DTD(&T)"
-
-#. i18n: file ./dialogs/dtdselectdialog.ui line 94
-#: rc.cpp:1527
-#, no-c-format
-msgid "Do not show this dialog, use the closest matching DTD"
-msgstr "不显示此对话框，使用最符合的 DTD"
-
-#. i18n: file ./parts/kafka/kafkasyncoptionsui.ui line 24
-#: rc.cpp:1530
-#, no-c-format
-msgid "Dual Views Mode Synchronization"
-msgstr "双视图模式同步"
-
-#. i18n: file ./parts/kafka/kafkasyncoptionsui.ui line 66
-#: rc.cpp:1533 rc.cpp:1542
-#, no-c-format
-msgid "ms"
-msgstr "毫秒"
-
-#. i18n: file ./parts/kafka/kafkasyncoptionsui.ui line 85
-#: rc.cpp:1536
-#, no-c-format
-msgid "Refresh the VPL editor on click"
-msgstr "单击时刷新 VPL 编辑器"
-
-#. i18n: file ./parts/kafka/kafkasyncoptionsui.ui line 93
-#: rc.cpp:1539
-#, no-c-format
-msgid "Refresh the VPL editor every:"
-msgstr "刷新 VPL 编辑器，每隔："
-
-#. i18n: file ./parts/kafka/kafkasyncoptionsui.ui line 153
-#: rc.cpp:1545
-#, no-c-format
-msgid "Refresh the source editor on click"
-msgstr "单击时刷新源代码编辑器"
-
-#. i18n: file ./parts/kafka/kafkasyncoptionsui.ui line 161
-#: rc.cpp:1548
+#. i18n: file ./dialogs/tagdialogs/tagmisc.ui line 31
+#: dialogs/tagdialogs/tagmiscdlg.cpp:23 rc.cpp:1746
 #, no-c-format
-msgid "Refresh the source editor every:"
-msgstr "刷新源代码编辑器，每隔："
+msgid "Misc. Tag"
+msgstr "杂类标签"
 
-#. i18n: file ./parts/kafka/kafkasyncoptionsui.ui line 190
-#: rc.cpp:1551
+#. i18n: file ./dialogs/tagdialogs/tagmisc.ui line 47
+#: rc.cpp:1749
 #, no-c-format
-msgid "Show an icon where scripts are located"
-msgstr "在脚本的位置显示图标"
+msgid "Element name:"
+msgstr "元素名称："
 
-#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 16
-#: rc.cpp:1554
+#. i18n: file ./dialogs/tagdialogs/tagmisc.ui line 55
+#: rc.cpp:1752
 #, no-c-format
-msgid "Document Properties"
-msgstr "文档属性"
+msgid "&Add closing tag"
+msgstr "添加结尾标签(&A)"
 
-#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 25
-#: rc.cpp:1557
+#. i18n: file ./dialogs/tagdialogs/tagmail.ui line 27
+#: rc.cpp:1755
 #, no-c-format
-msgid "Column 1"
-msgstr "第 1 列"
+msgid "Email address:"
+msgstr "电子邮件地址："
 
-#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 36
-#: rc.cpp:1560
+#. i18n: file ./dialogs/tagdialogs/tagmail.ui line 67
+#: rc.cpp:1761
 #, no-c-format
-msgid "New Item"
-msgstr "新建项"
+msgid "Subject:"
+msgstr "主题："
 
-#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 79
-#: rc.cpp:1563
+#. i18n: file ./components/framewizard/framewizards.ui line 36
+#: rc.cpp:1773
 #, no-c-format
-msgid "Current DTD: "
-msgstr "当前 DTD："
+msgid "Frame Wizard"
+msgstr "框架向导"
 
-#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 95
-#: rc.cpp:1566
+#. i18n: file ./components/framewizard/framewizards.ui line 184
+#: rc.cpp:1785
 #, no-c-format
-msgid "Title: "
-msgstr "标题："
+msgid "Splitting"
+msgstr "拆分"
 
-#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 111
-#: rc.cpp:1569
+#. i18n: file ./components/framewizard/framewizards.ui line 244
+#: rc.cpp:1794
 #, no-c-format
-msgid "Link CSS stylesheet:"
-msgstr "链接的 CSS 样式表："
+msgid "Editing"
+msgstr "编辑"
 
-#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 127
-#: rc.cpp:1572
+#. i18n: file ./components/framewizard/framewizards.ui line 261
+#: rc.cpp:1797
 #, no-c-format
-msgid "Meta items:"
-msgstr "Meta 项："
+msgid "Edit Frame"
+msgstr "编辑框架"
 
-#. i18n: file ./parts/kafka/htmldocumentpropertiesui.ui line 160
-#: rc.cpp:1575
+#. i18n: file ./components/framewizard/framewizards.ui line 283
+#: rc.cpp:1803 rc.cpp:5180 rc.cpp:5294
 #, no-c-format
-msgid "CSS rules:"
-msgstr "CSS 规则："
+msgid "Reset"
+msgstr "重置"
 
 #. i18n: file ./components/framewizard/fmrceditors.ui line 36
-#: rc.cpp:1599
+#: rc.cpp:1806
 #, no-c-format
 msgid "Rows Columns Editor"
 msgstr "行列编辑器"
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 16
-#: rc.cpp:1608
+#: rc.cpp:1815
 #, no-c-format
 msgid "Frame Properties"
 msgstr "框架属性"
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 80
-#: rc.cpp:1617
+#: rc.cpp:1824
 #, no-c-format
 msgid "Common"
 msgstr "公共"
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 132
-#: rc.cpp:1629
+#: rc.cpp:1836
 #, no-c-format
 msgid "Margins"
 msgstr "边距"
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 177
-#: rc.cpp:1632
+#: rc.cpp:1839
 #, no-c-format
 msgid "From left:"
 msgstr "左起："
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 185
-#: rc.cpp:1635 rc.cpp:1641
+#: rc.cpp:1842 rc.cpp:1848
 #, no-c-format
 msgid "px"
 msgstr "px"
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 212
-#: rc.cpp:1638
+#: rc.cpp:1845
 #, no-c-format
 msgid "From top:"
 msgstr "上起："
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 237
-#: rc.cpp:1644
+#: rc.cpp:1851
 #, no-c-format
 msgid "Scrolling"
 msgstr "滚动"
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 262
-#: rc.cpp:1650
+#: rc.cpp:1857
 #, no-c-format
 msgid "Auto"
 msgstr "自动"
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 283
-#: rc.cpp:1656
+#: rc.cpp:1863
 #, no-c-format
 msgid "Resize"
 msgstr "缩放"
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 352
-#: rc.cpp:1665
+#: rc.cpp:1872
 #, no-c-format
 msgid "Frame source:"
 msgstr "框架源："
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 360
-#: rc.cpp:1668
+#: rc.cpp:1875
 #, no-c-format
 msgid "Frame name:"
 msgstr "框架名称："
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 400
-#: rc.cpp:1671
+#: rc.cpp:1878
 #, no-c-format
 msgid "Others"
 msgstr "其它"
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 425
-#: rc.cpp:1674
+#: rc.cpp:1881
 #, no-c-format
 msgid "Id:"
 msgstr "Id："
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 433
-#: rc.cpp:1677
+#: rc.cpp:1884
 #, no-c-format
 msgid "Class:"
 msgstr "类："
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 441
-#: dialogs/tagdialogs/tagquicklistdlgdata.cpp:41 rc.cpp:1680
+#: dialogs/tagdialogs/tagquicklistdlgdata.cpp:41 rc.cpp:1887
 #, no-c-format
 msgid "Style:"
 msgstr "样式："
 
 #. i18n: file ./components/framewizard/fmfpeditors.ui line 457
-#: rc.cpp:1686
+#: rc.cpp:1893
 #, no-c-format
 msgid "Long description:"
 msgstr "长描述："
 
-#. i18n: file ./components/framewizard/framewizards.ui line 36
-#: rc.cpp:1689
+#. i18n: file ./components/debugger/debuggervariablesets.ui line 16
+#: components/debugger/debuggermanager.cpp:267
+#: components/debugger/debuggermanager.cpp:270 rc.cpp:1896
 #, no-c-format
-msgid "Frame Wizard"
-msgstr "框架向导"
+msgid "Set Value of Variable"
+msgstr "设置变量值"
 
-#. i18n: file ./components/framewizard/framewizards.ui line 184
-#: rc.cpp:1701
+#. i18n: file ./components/debugger/debuggervariablesets.ui line 110
+#: rc.cpp:1905
 #, no-c-format
-msgid "Splitting"
-msgstr "拆分"
+msgid "Variable:"
+msgstr "变量："
 
-#. i18n: file ./components/framewizard/framewizards.ui line 244
-#: rc.cpp:1710
+#. i18n: file ./components/debugger/debuggervariablesets.ui line 126
+#: components/debugger/variableslistview.cpp:262 rc.cpp:1908
 #, no-c-format
-msgid "Editing"
-msgstr "编辑"
+msgid "New value:"
+msgstr "新值："
 
-#. i18n: file ./components/framewizard/framewizards.ui line 261
-#: rc.cpp:1713
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 16
+#: rc.cpp:1911 rc.cpp:1914 rc.cpp:1982 rc.cpp:2134
 #, no-c-format
-msgid "Edit Frame"
-msgstr "编辑框架"
+msgid "Directory Mapping"
+msgstr "目录映射"
 
-#. i18n: file ./components/framewizard/framewizards.ui line 283
-#: rc.cpp:1719 rc.cpp:5075 rc.cpp:5121
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 49
+#: rc.cpp:1917 rc.cpp:1988 rc.cpp:2140
 #, no-c-format
-msgid "Reset"
-msgstr "重置"
+msgid "Local basedir:"
+msgstr "本地基础目录："
 
-#. i18n: file ./components/csseditor/encodingselectors.ui line 16
-#: rc.cpp:1722
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 65
+#: rc.cpp:1920 rc.cpp:1985 rc.cpp:2137
 #, no-c-format
-msgid "Encoding Selector"
-msgstr "编码选择器"
+msgid "Server basedir:"
+msgstr "服务器基础目录："
 
-#. i18n: file ./components/csseditor/encodingselectors.ui line 43
-#: rc.cpp:1725
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 74
+#: rc.cpp:1923
 #, no-c-format
-msgid "Select encoding:"
-msgstr "选择编码："
+msgid ""
+"This is where the local part of path is specified. If a file is located on the "
+"computer running Quanta at \"/home/user/htdocs/project/file.php\" and that file "
+"is located on the server as \"/var/www/project/file.php\", local basedir should "
+"be \"/home/user/htdocs/\" and server basedir should be \"/var/www/\".\n"
+"The quanta will know that files starting with \"/home/user/project/\" on the "
+"local computer, will start with \"/var/www/\" on the remote computer."
+msgstr ""
 
-#. i18n: file ./components/csseditor/cssselectors.ui line 16
-#: rc.cpp:1734
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 83
+#: rc.cpp:1927
 #, no-c-format
-msgid "CSS Selector Dialog"
-msgstr "CSS 选择器对话框"
+msgid ""
+"This is where the server part of path is specified. If a file is located on the "
+"computer running Quanta at \"/home/user/htdocs/project/file.php\" and that file "
+"is located on the server as \"/var/www/project/file.php\", local basedir should "
+"be \"/home/user/htdocs/\" and server basedir should be \"/var/www/\".\n"
+"The quanta will know that files starting with \"/home/user/project/\" on the "
+"local computer, will start with \"/var/www/\" on the remote computer."
+msgstr ""
 
-#. i18n: file ./components/csseditor/cssselectors.ui line 41
-#: rc.cpp:1737
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 157
+#: rc.cpp:1937
 #, no-c-format
-msgid "Apply to file:"
-msgstr "应用到文件："
+msgid "Previous Mappings"
+msgstr "先前映射"
 
-#. i18n: file ./components/csseditor/cssselectors.ui line 106
-#: rc.cpp:1746
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 166
+#: rc.cpp:1940
 #, no-c-format
-msgid "Tags"
-msgstr "标签"
+msgid "Local Directory"
+msgstr "本地目录"
 
-#. i18n: file ./components/csseditor/cssselectors.ui line 150
-#: rc.cpp:1749 rc.cpp:1782 rc.cpp:1806 rc.cpp:1830
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 177
+#: rc.cpp:1943
 #, no-c-format
-msgid "Remove Selector"
-msgstr "删除选择器"
+msgid "Server Directory"
+msgstr "服务器目录"
 
-#. i18n: file ./components/csseditor/cssselectors.ui line 165
-#: rc.cpp:1752 rc.cpp:1785 rc.cpp:1809 rc.cpp:1836
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 202
+#: rc.cpp:1946
 #, no-c-format
-msgid "Selected"
-msgstr "已选"
+msgid "This is a list of previously used mappings. Click on one to use it"
+msgstr ""
 
-#. i18n: file ./components/csseditor/cssselectors.ui line 173
-#: dialogs/actionconfigdialog.cpp:80 dialogs/actionconfigdialog.cpp:191
-#: dialogs/actionconfigdialog.cpp:219 rc.cpp:1755 rc.cpp:1788 rc.cpp:1812
-#: rc.cpp:1833 rc.cpp:1917
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 212
+#: rc.cpp:1949
 #, no-c-format
-msgid "All"
-msgstr "全部"
+msgid "Sample"
+msgstr "示例"
 
-#. i18n: file ./components/csseditor/cssselectors.ui line 200
-#: rc.cpp:1758
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 231
+#: rc.cpp:1952
 #, no-c-format
-msgid "DTD Selection"
-msgstr "DTD 选择"
+msgid "Translates to:"
+msgstr "翻译为："
 
-#. i18n: file ./components/csseditor/cssselectors.ui line 235
-#: rc.cpp:1761 rc.cpp:1791 rc.cpp:1815 rc.cpp:1839
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 247
+#: rc.cpp:1955
 #, no-c-format
-msgid "Add Selector"
-msgstr "添加选择器"
+msgid "Original path:"
+msgstr "原始路径："
 
-#. i18n: file ./components/csseditor/cssselectors.ui line 281
-#: parts/kafka/htmldocumentproperties.cpp:97 parts/kafka/wkafkapart.cpp:68
-#: rc.cpp:1767 rc.cpp:1776 rc.cpp:1800 rc.cpp:1824
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 276
+#: rc.cpp:1958
 #, no-c-format
-msgid "Selector"
-msgstr "选择器"
+msgid "Indicates whether the translated path exists on disk or not"
+msgstr ""
 
-#. i18n: file ./components/csseditor/cssselectors.ui line 346
-#: rc.cpp:1773
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 279
+#: rc.cpp:1961
 #, no-c-format
-msgid "IDs"
-msgstr "IDs"
+msgid ""
+"This indicator tells you whether the translated path exists on local disk or "
+"not."
+msgstr ""
 
-#. i18n: file ./components/csseditor/cssselectors.ui line 540
-#: rc.cpp:1797
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 297
+#: rc.cpp:1964
 #, no-c-format
-msgid "Classes"
-msgstr "类"
+msgid ""
+"This field shows what the \"original path\" above will look like after "
+"translation."
+msgstr ""
 
-#. i18n: file ./components/csseditor/cssselectors.ui line 734
-#: rc.cpp:1821
+#. i18n: file ./components/debugger/pathmapperdialogs.ui line 315
+#: rc.cpp:1967
 #, no-c-format
-msgid "Pseudo"
-msgstr "Pseudo"
+msgid "This field shows the path currently needing to be translated."
+msgstr ""
 
-#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 24
-#: rc.cpp:1848
-#, no-c-format
-msgid "Font Family Chooser"
-msgstr "字体族选择器"
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 16
+#: rc.cpp:1970
+#, fuzzy, no-c-format
+msgid "Gubed Settings"
+msgstr "细节设置"
 
-#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 78
-#: rc.cpp:1851
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 78
+#: rc.cpp:1976 rc.cpp:2102 rc.cpp:2305
 #, no-c-format
-msgid "Available system font families:"
-msgstr "可用的系统字体族："
+msgid "Ca&ncel"
+msgstr "取消(&N)"
 
-#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 101
-#: rc.cpp:1854
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 189
+#: rc.cpp:1991 rc.cpp:2108
 #, no-c-format
-msgid "Generic family:"
-msgstr "常规族："
+msgid "Connection Settings"
+msgstr "连接设置"
 
-#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 107
-#: rc.cpp:1857
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 253
+#: rc.cpp:1994
 #, no-c-format
-msgid "cursive"
-msgstr "cursive"
+msgid "Use proxy"
+msgstr "用户代理服务器"
 
-#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 112
-#: rc.cpp:1860
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 269
+#: rc.cpp:1997
 #, no-c-format
-msgid "fantasy"
-msgstr "fantasy"
+msgid "Proxy host:"
+msgstr "代理主机："
 
-#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 117
-#: rc.cpp:1863
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 285
+#: rc.cpp:2000
 #, no-c-format
-msgid "monospace"
-msgstr "monospace"
+msgid "Proxy port:"
+msgstr "代理端口："
 
-#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 122
-#: rc.cpp:1866
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 301
+#: rc.cpp:2003 rc.cpp:2111
 #, no-c-format
-msgid "sans-serif"
-msgstr "sans-serif"
+msgid "Listen port:"
+msgstr "监听端口："
 
-#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 127
-#: rc.cpp:1869
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 311
+#: rc.cpp:2006
 #, no-c-format
-msgid "serif"
-msgstr "serif"
+msgid "Mode"
+msgstr "节点"
 
-#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 332
-#: rc.cpp:1872
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 322
+#: rc.cpp:2009 rc.cpp:2117 rc.cpp:2149
 #, no-c-format
-msgid "Selected font families:"
-msgstr "选中的字体族："
+msgid "See \"What's This?\" for available variables"
+msgstr ""
 
-#. i18n: file ./components/csseditor/csseditors.ui line 16
-#: rc.cpp:1881
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 336
+#: rc.cpp:2012 rc.cpp:2120
 #, no-c-format
-msgid "CSS Editor"
-msgstr "CSS 编辑器"
+msgid ""
+"%afn - Filename of the current script\n"
+"%afd - Absolute directory of the current script\n"
+"%afp - Absolute path (directory + filename) of the current script\n"
+"\n"
+"%rfpd - Directory of the current script relative to project root\n"
+"%rfpp - Path of the current script relative to project root\n"
+"\n"
+"%rfdd - Directory of the current script relative to document root\n"
+"%rfdp - Path of the current script relative to document root\n"
+"\n"
+"%apd - Project root\n"
+"%add - Document root of current script"
+msgstr ""
 
-#. i18n: file ./components/csseditor/csseditors.ui line 89
-#: rc.cpp:1890
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 347
+#: rc.cpp:2026
 #, no-c-format
-msgid "Use shorthand form"
-msgstr ""
+msgid "&Add include"
+msgstr "添加包含(&A)"
 
-#. i18n: file ./components/csseditor/csseditors.ui line 137
-#: rc.cpp:1893
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 355
+#: rc.cpp:2029
 #, no-c-format
-msgid "Visual"
-msgstr "可视化"
+msgid "Start session:"
+msgstr "开始会话："
 
-#. i18n: file ./components/csseditor/csseditors.ui line 175
-#: rc.cpp:1899
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 370
+#: rc.cpp:2032 rc.cpp:2172
 #, no-c-format
-msgid "Paged"
-msgstr "分页"
+msgid "Deb&ug Behavior"
+msgstr "调试行为(&U)"
 
-#. i18n: file ./components/csseditor/csseditors.ui line 210
-#: rc.cpp:1905
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 381
+#: rc.cpp:2035 rc.cpp:2175
 #, no-c-format
-msgid "Interactive"
-msgstr "交互"
+msgid "Error Handling"
+msgstr "错误处理"
 
-#. i18n: file ./components/csseditor/csseditors.ui line 245
-#: rc.cpp:1911
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 400
+#: rc.cpp:2038 rc.cpp:2178
 #, no-c-format
-msgid "Aural"
-msgstr ""
+msgid "User errors"
+msgstr "用户错误"
 
-#. i18n: file ./components/cvsservice/cvsupdatetodlgs.ui line 25
-#: rc.cpp:1926
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 408
+#: rc.cpp:2041 rc.cpp:2181
 #, no-c-format
-msgid "CVS Update"
-msgstr "CVS 更新"
+msgid "Break on:"
+msgstr "拆分点："
 
-#. i18n: file ./components/cvsservice/cvsupdatetodlgs.ui line 53
-#: rc.cpp:1929
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 427
+#: rc.cpp:2044 rc.cpp:2184
 #, no-c-format
-msgid "Update to &date ('yyyy-mm-dd'):"
-msgstr "更新到日期(“yyyy-mm-dd”)(&D)："
+msgid "User warnings"
+msgstr "用户警告"
 
-#. i18n: file ./components/cvsservice/cvsupdatetodlgs.ui line 61
-#: rc.cpp:1932
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 443
+#: rc.cpp:2047 rc.cpp:2187
 #, no-c-format
-msgid "Update to &tag/branch:"
-msgstr "更新到标记/分支(&T)："
+msgid "User notices"
+msgstr "用户通知"
 
-#. i18n: file ./components/cvsservice/cvscommitdlgs.ui line 25
-#: rc.cpp:1941
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 459
+#: rc.cpp:2050 rc.cpp:2190
 #, no-c-format
-msgid "CVS Commit "
-msgstr "CVS 提交"
+msgid "Notices"
+msgstr "通知"
 
-#. i18n: file ./components/cvsservice/cvscommitdlgs.ui line 41
-#: rc.cpp:1944
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 475
+#: rc.cpp:2053 rc.cpp:2193
 #, no-c-format
-msgid "Commit the following files:"
-msgstr "提交下列文件："
+msgid "W&arnings"
+msgstr "警告(&A)"
 
-#. i18n: file ./components/cvsservice/cvscommitdlgs.ui line 57
-#: rc.cpp:1947
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 502
+#: rc.cpp:2056 rc.cpp:2196
 #, no-c-format
-msgid "Older &messages:"
-msgstr "旧消息(&M)："
+msgid "Execution"
+msgstr "执行"
 
-#. i18n: file ./components/cvsservice/cvscommitdlgs.ui line 68
-#: rc.cpp:1950
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 526
+#: rc.cpp:2059
 #, no-c-format
-msgid "&Log message:"
-msgstr "日志消息(&L)："
+msgid "Fast"
+msgstr "快速"
 
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 16
-#: rc.cpp:1959
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 567
+#: rc.cpp:2062
 #, no-c-format
-msgid "DBGp Settings"
-msgstr "DBGp 设置"
+msgid "Slow"
+msgstr "慢速"
 
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 78
-#: rc.cpp:1965 rc.cpp:2138 rc.cpp:2335
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 576
+#: components/debugger/interfaces/debuggerclient.cpp:53 rc.cpp:2065
+#: rc.cpp:2199
 #, no-c-format
-msgid "Ca&ncel"
-msgstr "取消(&N)"
+msgid "Pause"
+msgstr "暂停"
 
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 117
-#: rc.cpp:1971 rc.cpp:2153
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 584
+#: components/debugger/interfaces/debuggerclient.cpp:79 rc.cpp:2068
 #, no-c-format
-msgid "Connection Settings"
-msgstr "连接设置"
+msgid "Trace"
+msgstr "跟踪"
 
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 136
-#: rc.cpp:1974 rc.cpp:2165
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 592
+#: components/debugger/interfaces/debuggerclient.cpp:84 rc.cpp:2071
+#: rc.cpp:2202
 #, no-c-format
-msgid "Listen port:"
-msgstr "监听端口："
+msgid "Run"
+msgstr "运行"
 
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 165
-#: rc.cpp:1977
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 607
+#: rc.cpp:2074 rc.cpp:2205
 #, no-c-format
-msgid "Request URL:"
-msgstr "请求 URL："
+msgid "Default mode:"
+msgstr "默认视图："
 
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 181
-#: rc.cpp:1980 rc.cpp:2012 rc.cpp:2171
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 618
+#: rc.cpp:2077
 #, no-c-format
-msgid "See \"What's This?\" for available variables"
+msgid "Run speed:"
 msgstr ""
 
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 195
-#: rc.cpp:1983 rc.cpp:2174
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 652
+#: rc.cpp:2083
 #, no-c-format
-msgid ""
-"%afn - Filename of the current script\n"
-"%afd - Absolute directory of the current script\n"
-"%afp - Absolute path (directory + filename) of the current script\n"
-"\n"
-"%rfpd - Directory of the current script relative to project root\n"
-"%rfpp - Path of the current script relative to project root\n"
-"\n"
-"%rfdd - Directory of the current script relative to document root\n"
-"%rfdp - Path of the current script relative to document root\n"
-"\n"
-"%apd - Project root\n"
-"%add - Document root of current script"
+msgid "<h4>Gubed PHP Debugger Plugin for Quanta +</h4>"
 msgstr ""
 
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 222
-#: rc.cpp:1997 rc.cpp:2144 rc.cpp:2273 rc.cpp:2276
+#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 692
+#: rc.cpp:2086
 #, no-c-format
-msgid "Directory Mapping"
-msgstr "目录映射"
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /></head>"
+"<body style=\"font-size:10pt;font-family:Bitstream Vera Sans\">\n"
+"<p><span style=\"font-weight:600\">About</span></p>\n"
+"<p>Gubed is a PHP debugger available for free through GPL. This plugin "
+"integrates Gubed with Quanta. </p>\n"
+"<p>In order to use this plugin for PHP debugging, you need to get the Quanta "
+"package from the Gubed project page, <a "
+"href=\"http://sourceforge.net/projects/gubed\">http://sourceforge.net/projects/g"
+"ubed</a>, at SourceForge </p>\n"
+"<p>For more info about Gubed, please visit the Gubed website at <a "
+"href=\"http://gubed.sf.net\">http://gubed.sf.net</a> </p>\n"
+"<p><span style=\"font-weight:600\">Technical Details</span></p>\n"
+"<p>This version of the debugger supports the %PROTOCOLVERSION% version of the "
+"Gubed protocol. </p>\n"
+"</body></html>"
+msgstr ""
 
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 254
-#: rc.cpp:2000 rc.cpp:2147 rc.cpp:2282
+#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 16
+#: rc.cpp:2096
 #, no-c-format
-msgid "Server basedir:"
-msgstr "服务器基础目录："
+msgid "DBGp Settings"
+msgstr "DBGp 设置"
 
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 305
-#: rc.cpp:2003 rc.cpp:2150 rc.cpp:2279
+#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 165
+#: rc.cpp:2114
 #, no-c-format
-msgid "Local basedir:"
-msgstr "本地基础目录："
+msgid "Request URL:"
+msgstr "请求 URL："
 
 #. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 321
-#: rc.cpp:2006
+#: rc.cpp:2143
 #, no-c-format
 msgid "Local project:"
 msgstr "本地工程："
 
 #. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 331
-#: rc.cpp:2009
+#: rc.cpp:2146
 #, fuzzy, no-c-format
 msgid "Profiling"
 msgstr "滚动"
 
 #. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 355
-#: rc.cpp:2015
+#: rc.cpp:2152
 #, no-c-format
 msgid ""
 "Path to the profiler output\n"
@@ -3016,19 +3363,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 371
-#: rc.cpp:2020
+#: rc.cpp:2157
 #, fuzzy, no-c-format
 msgid "Profiler output:"
 msgstr "配置文件名(&N)："
 
 #. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 387
-#: rc.cpp:2023
+#: rc.cpp:2160
 #, no-c-format
 msgid "Map profiler output:"
 msgstr ""
 
 #. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 409
-#: rc.cpp:2026
+#: rc.cpp:2163
 #, no-c-format
 msgid ""
 "If this checkbox is checked, the profiler output filename will be mapped using "
@@ -3036,101 +3383,27 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 425
-#: rc.cpp:2029
+#: rc.cpp:2166
 #, no-c-format
 msgid "Open automatically:"
 msgstr ""
 
 #. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 447
-#: rc.cpp:2032
+#: rc.cpp:2169
 #, no-c-format
 msgid ""
 "If this checkbox is checked, the profiler output will be opened automatically "
 "once the session ends."
 msgstr ""
 
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 459
-#: rc.cpp:2035 rc.cpp:2194
-#, no-c-format
-msgid "Deb&ug Behavior"
-msgstr "调试行为(&U)"
-
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 470
-#: rc.cpp:2038 rc.cpp:2197
-#, no-c-format
-msgid "Error Handling"
-msgstr "错误处理"
-
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 489
-#: rc.cpp:2041 rc.cpp:2200
-#, no-c-format
-msgid "User errors"
-msgstr "用户错误"
-
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 497
-#: rc.cpp:2044 rc.cpp:2203
-#, no-c-format
-msgid "Break on:"
-msgstr "拆分点："
-
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 516
-#: rc.cpp:2047 rc.cpp:2206
-#, no-c-format
-msgid "User warnings"
-msgstr "用户警告"
-
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 532
-#: rc.cpp:2050 rc.cpp:2209
-#, no-c-format
-msgid "User notices"
-msgstr "用户通知"
-
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 548
-#: rc.cpp:2053 rc.cpp:2212
-#, no-c-format
-msgid "Notices"
-msgstr "通知"
-
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 564
-#: rc.cpp:2056 rc.cpp:2215
-#, no-c-format
-msgid "W&arnings"
-msgstr "警告(&A)"
-
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 574
-#: rc.cpp:2059 rc.cpp:2218
-#, no-c-format
-msgid "Execution"
-msgstr "执行"
-
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 583
-#: components/debugger/interfaces/debuggerclient.cpp:53 rc.cpp:2062
-#: rc.cpp:2227
-#, no-c-format
-msgid "Pause"
-msgstr "暂停"
-
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 591
-#: components/debugger/interfaces/debuggerclient.cpp:84 rc.cpp:2065
-#: rc.cpp:2233
-#, no-c-format
-msgid "Run"
-msgstr "运行"
-
-#. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 606
-#: rc.cpp:2068 rc.cpp:2236
-#, no-c-format
-msgid "Default mode:"
-msgstr "默认视图："
-
 #. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 657
-#: rc.cpp:2074
+#: rc.cpp:2211
 #, no-c-format
 msgid "<h4>DBGp Plugin for Quanta +</h4>"
 msgstr ""
 
 #. i18n: file ./components/debugger/dbgp/dbgpsettingss.ui line 675
-#: rc.cpp:2077
+#: rc.cpp:2214
 #, no-c-format
 msgid ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /></head>"
@@ -3150,1453 +3423,1180 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./components/debugger/conditionalbreakpointdialogs.ui line 16
-#: rc.cpp:2087
+#: rc.cpp:2224
 #, no-c-format
 msgid "Add Conditional Breakpoint"
 msgstr "添加条件断点"
 
 #. i18n: file ./components/debugger/conditionalbreakpointdialogs.ui line 38
-#: rc.cpp:2090
+#: rc.cpp:2227
 #, no-c-format
 msgid "Expression:"
 msgstr "表达式："
 
 #. i18n: file ./components/debugger/conditionalbreakpointdialogs.ui line 110
-#: rc.cpp:2099
+#: rc.cpp:2236
 #, no-c-format
 msgid "Break When"
 msgstr "断点条件"
 
 #. i18n: file ./components/debugger/conditionalbreakpointdialogs.ui line 121
-#: rc.cpp:2102
+#: rc.cpp:2239
 #, no-c-format
 msgid "When expression is true"
 msgstr "当表达式为真时"
 
 #. i18n: file ./components/debugger/conditionalbreakpointdialogs.ui line 129
-#: rc.cpp:2105
+#: rc.cpp:2242
 #, no-c-format
 msgid "When expression changes"
 msgstr "当表达式更改时"
 
 #. i18n: file ./components/debugger/conditionalbreakpointdialogs.ui line 189
-#: rc.cpp:2108
+#: rc.cpp:2245
 #, no-c-format
 msgid "Lit when a finding a single equal sign in expression (common error)"
 msgstr ""
 
 #. i18n: file ./components/debugger/conditionalbreakpointdialogs.ui line 197
-#: rc.cpp:2111
+#: rc.cpp:2248
 #, fuzzy, no-c-format
 msgid "Only Break In"
 msgstr "拆分点"
 
 #. i18n: file ./components/debugger/conditionalbreakpointdialogs.ui line 216
-#: rc.cpp:2114 rc.cpp:2925
+#: rc.cpp:2251 rc.cpp:2777
 #, no-c-format
 msgid "File:"
 msgstr "文件："
 
 #. i18n: file ./components/debugger/conditionalbreakpointdialogs.ui line 235
-#: rc.cpp:2117
+#: rc.cpp:2254
 #, no-c-format
 msgid "Objects of class:"
 msgstr "类对象："
 
 #. i18n: file ./components/debugger/conditionalbreakpointdialogs.ui line 254
-#: rc.cpp:2120
+#: rc.cpp:2257
 #, no-c-format
 msgid "Function:"
 msgstr "函数："
 
 #. i18n: file ./components/debugger/conditionalbreakpointdialogs.ui line 275
-#: rc.cpp:2123 rc.cpp:2126 rc.cpp:2129 rc.cpp:2847
+#: rc.cpp:2260 rc.cpp:2263 rc.cpp:2266 rc.cpp:2810
 #, no-c-format
 msgid "x"
 msgstr "x"
 
-#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 16
-#: rc.cpp:2132
-#, fuzzy, no-c-format
-msgid "Gubed Settings"
-msgstr "细节设置"
-
-#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 253
-#: rc.cpp:2156
-#, no-c-format
-msgid "Use proxy"
-msgstr "用户代理服务器"
-
-#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 269
-#: rc.cpp:2159
-#, no-c-format
-msgid "Proxy host:"
-msgstr "代理主机："
-
-#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 285
-#: rc.cpp:2162
-#, no-c-format
-msgid "Proxy port:"
-msgstr "代理端口："
-
-#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 311
-#: rc.cpp:2168
-#, no-c-format
-msgid "Mode"
-msgstr "节点"
-
-#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 347
-#: rc.cpp:2188
-#, no-c-format
-msgid "&Add include"
-msgstr "添加包含(&A)"
-
-#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 355
-#: rc.cpp:2191
-#, no-c-format
-msgid "Start session:"
-msgstr "开始会话："
-
-#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 526
-#: rc.cpp:2221
-#, no-c-format
-msgid "Fast"
-msgstr "快速"
-
-#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 567
-#: rc.cpp:2224
-#, no-c-format
-msgid "Slow"
-msgstr "慢速"
-
-#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 584
-#: components/debugger/interfaces/debuggerclient.cpp:79 rc.cpp:2230
-#, no-c-format
-msgid "Trace"
-msgstr "跟踪"
-
-#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 618
-#: rc.cpp:2239
-#, no-c-format
-msgid "Run speed:"
-msgstr ""
-
-#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 652
-#: rc.cpp:2245
-#, no-c-format
-msgid "<h4>Gubed PHP Debugger Plugin for Quanta +</h4>"
-msgstr ""
-
-#. i18n: file ./components/debugger/gubed/gubedsettingss.ui line 692
-#: rc.cpp:2248
-#, no-c-format
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /></head>"
-"<body style=\"font-size:10pt;font-family:Bitstream Vera Sans\">\n"
-"<p><span style=\"font-weight:600\">About</span></p>\n"
-"<p>Gubed is a PHP debugger available for free through GPL. This plugin "
-"integrates Gubed with Quanta. </p>\n"
-"<p>In order to use this plugin for PHP debugging, you need to get the Quanta "
-"package from the Gubed project page, <a "
-"href=\"http://sourceforge.net/projects/gubed\">http://sourceforge.net/projects/g"
-"ubed</a>, at SourceForge </p>\n"
-"<p>For more info about Gubed, please visit the Gubed website at <a "
-"href=\"http://gubed.sf.net\">http://gubed.sf.net</a> </p>\n"
-"<p><span style=\"font-weight:600\">Technical Details</span></p>\n"
-"<p>This version of the debugger supports the %PROTOCOLVERSION% version of the "
-"Gubed protocol. </p>\n"
-"</body></html>"
-msgstr ""
-
-#. i18n: file ./components/debugger/debuggervariablesets.ui line 16
-#: components/debugger/debuggermanager.cpp:267
-#: components/debugger/debuggermanager.cpp:270 rc.cpp:2258
-#, no-c-format
-msgid "Set Value of Variable"
-msgstr "设置变量值"
-
-#. i18n: file ./components/debugger/debuggervariablesets.ui line 110
-#: rc.cpp:2267
-#, no-c-format
-msgid "Variable:"
-msgstr "变量："
-
-#. i18n: file ./components/debugger/debuggervariablesets.ui line 126
-#: components/debugger/variableslistview.cpp:262 rc.cpp:2270
-#, no-c-format
-msgid "New value:"
-msgstr "新值："
-
-#. i18n: file ./components/debugger/pathmapperdialogs.ui line 74
-#: rc.cpp:2285
-#, no-c-format
-msgid ""
-"This is where the local part of path is specified. If a file is located on the "
-"computer running Quanta at \"/home/user/htdocs/project/file.php\" and that file "
-"is located on the server as \"/var/www/project/file.php\", local basedir should "
-"be \"/home/user/htdocs/\" and server basedir should be \"/var/www/\".\n"
-"The quanta will know that files starting with \"/home/user/project/\" on the "
-"local computer, will start with \"/var/www/\" on the remote computer."
-msgstr ""
-
-#. i18n: file ./components/debugger/pathmapperdialogs.ui line 83
-#: rc.cpp:2289
-#, no-c-format
-msgid ""
-"This is where the server part of path is specified. If a file is located on the "
-"computer running Quanta at \"/home/user/htdocs/project/file.php\" and that file "
-"is located on the server as \"/var/www/project/file.php\", local basedir should "
-"be \"/home/user/htdocs/\" and server basedir should be \"/var/www/\".\n"
-"The quanta will know that files starting with \"/home/user/project/\" on the "
-"local computer, will start with \"/var/www/\" on the remote computer."
-msgstr ""
-
-#. i18n: file ./components/debugger/pathmapperdialogs.ui line 157
-#: rc.cpp:2299
-#, no-c-format
-msgid "Previous Mappings"
-msgstr "先前映射"
-
-#. i18n: file ./components/debugger/pathmapperdialogs.ui line 166
-#: rc.cpp:2302
-#, no-c-format
-msgid "Local Directory"
-msgstr "本地目录"
-
-#. i18n: file ./components/debugger/pathmapperdialogs.ui line 177
-#: rc.cpp:2305
-#, no-c-format
-msgid "Server Directory"
-msgstr "服务器目录"
-
-#. i18n: file ./components/debugger/pathmapperdialogs.ui line 202
-#: rc.cpp:2308
-#, no-c-format
-msgid "This is a list of previously used mappings. Click on one to use it"
-msgstr ""
-
-#. i18n: file ./components/debugger/pathmapperdialogs.ui line 212
-#: rc.cpp:2311
+#. i18n: file ./components/cvsservice/cvsupdatetodlgs.ui line 25
+#: rc.cpp:2269
 #, no-c-format
-msgid "Sample"
-msgstr "示例"
+msgid "CVS Update"
+msgstr "CVS 更新"
 
-#. i18n: file ./components/debugger/pathmapperdialogs.ui line 231
-#: rc.cpp:2314
+#. i18n: file ./components/cvsservice/cvsupdatetodlgs.ui line 53
+#: rc.cpp:2272
 #, no-c-format
-msgid "Translates to:"
-msgstr "翻译为："
+msgid "Update to &date ('yyyy-mm-dd'):"
+msgstr "更新到日期(“yyyy-mm-dd”)(&D)："
 
-#. i18n: file ./components/debugger/pathmapperdialogs.ui line 247
-#: rc.cpp:2317
+#. i18n: file ./components/cvsservice/cvsupdatetodlgs.ui line 61
+#: rc.cpp:2275
 #, no-c-format
-msgid "Original path:"
-msgstr "原始路径："
+msgid "Update to &tag/branch:"
+msgstr "更新到标记/分支(&T)："
 
-#. i18n: file ./components/debugger/pathmapperdialogs.ui line 276
-#: rc.cpp:2320
+#. i18n: file ./components/cvsservice/cvscommitdlgs.ui line 25
+#: rc.cpp:2284
 #, no-c-format
-msgid "Indicates whether the translated path exists on disk or not"
-msgstr ""
+msgid "CVS Commit "
+msgstr "CVS 提交"
 
-#. i18n: file ./components/debugger/pathmapperdialogs.ui line 279
-#: rc.cpp:2323
+#. i18n: file ./components/cvsservice/cvscommitdlgs.ui line 41
+#: rc.cpp:2287
 #, no-c-format
-msgid ""
-"This indicator tells you whether the translated path exists on local disk or "
-"not."
-msgstr ""
+msgid "Commit the following files:"
+msgstr "提交下列文件："
 
-#. i18n: file ./components/debugger/pathmapperdialogs.ui line 297
-#: rc.cpp:2326
+#. i18n: file ./components/cvsservice/cvscommitdlgs.ui line 57
+#: rc.cpp:2290
 #, no-c-format
-msgid ""
-"This field shows what the \"original path\" above will look like after "
-"translation."
-msgstr ""
+msgid "Older &messages:"
+msgstr "旧消息(&M)："
 
-#. i18n: file ./components/debugger/pathmapperdialogs.ui line 315
-#: rc.cpp:2329
+#. i18n: file ./components/cvsservice/cvscommitdlgs.ui line 68
+#: rc.cpp:2293
 #, no-c-format
-msgid "This field shows the path currently needing to be translated."
-msgstr ""
+msgid "&Log message:"
+msgstr "日志消息(&L)："
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 16
-#: rc.cpp:2332
+#: rc.cpp:2302
 #, no-c-format
 msgid "Table Editor"
 msgstr "表格编辑器"
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 75
-#: rc.cpp:2344
+#: rc.cpp:2314
 #, no-c-format
 msgid "F1"
 msgstr "F1"
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 90
-#: rc.cpp:2347
+#: rc.cpp:2317
 #, no-c-format
 msgid "&Main"
 msgstr "主要(&M)"
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 101
-#: rc.cpp:2350
+#: rc.cpp:2320
 #, no-c-format
 msgid "Ta&ble data:"
 msgstr "表格数据(&B)："
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 185
-#: rc.cpp:2353
+#: rc.cpp:2323
 #, no-c-format
 msgid "Co&lumns:"
 msgstr "列数(&L)："
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 201
-#: rc.cpp:2356
+#: rc.cpp:2326
 #, no-c-format
 msgid "Bod&y Properties"
 msgstr "Body 属性(&Y)"
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 209
-#: rc.cpp:2359
+#: rc.cpp:2329
 #, no-c-format
 msgid "&Table Properties"
 msgstr "表格属性(&T)"
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 225
-#: rc.cpp:2362
+#: rc.cpp:2332
 #, no-c-format
 msgid "C&aption:"
 msgstr "表题(&A)："
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 236
-#: rc.cpp:2365
+#: rc.cpp:2335
 #, no-c-format
 msgid "&Rows:"
 msgstr "行数(&R)："
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 260
-#: rc.cpp:2368
+#: rc.cpp:2338
 #, no-c-format
 msgid "Header"
 msgstr "表头"
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 339
-#: rc.cpp:2371
+#: rc.cpp:2341
 #, no-c-format
 msgid "Header &rows:"
 msgstr "表头行数(&R)："
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 358
-#: rc.cpp:2374
+#: rc.cpp:2344
 #, no-c-format
 msgid "Header co&lumns:"
 msgstr "表头列数(&L)："
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 369
-#: rc.cpp:2377
+#: rc.cpp:2347
 #, no-c-format
 msgid "Header &data:"
 msgstr "表头数据(&D)："
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 382
-#: rc.cpp:2380
+#: rc.cpp:2350
 #, no-c-format
 msgid "Insert ta&ble header"
 msgstr "插入表头(&B)"
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 410
-#: rc.cpp:2383
+#: rc.cpp:2353
 #, no-c-format
 msgid "&Header Properties"
 msgstr "表头属性(&H)"
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 420
-#: rc.cpp:2386
+#: rc.cpp:2356
 #, no-c-format
 msgid "Footer"
 msgstr "表尾"
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 485
-#: rc.cpp:2389
+#: rc.cpp:2359
 #, no-c-format
 msgid "Footer &rows:"
 msgstr "表尾行数(&R)："
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 504
-#: rc.cpp:2392
+#: rc.cpp:2362
 #, no-c-format
 msgid "Footer co&lumns:"
 msgstr "表尾列数(&L)："
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 515
-#: rc.cpp:2395
+#: rc.cpp:2365
 #, no-c-format
 msgid "Footer &data:"
 msgstr "表尾数据(&D)："
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 545
-#: rc.cpp:2398
+#: rc.cpp:2368
 #, no-c-format
 msgid "Insert ta&ble footer"
 msgstr "插入表尾(&B)"
 
 #. i18n: file ./components/tableeditor/tableeditors.ui line 573
-#: rc.cpp:2401
+#: rc.cpp:2371
 #, no-c-format
 msgid "&Footer Properties"
 msgstr "表尾属性(&F)"
 
-#. i18n: file ./treeviews/fileinfodlg.ui line 32
-#: rc.cpp:2404
+#. i18n: file ./components/csseditor/encodingselectors.ui line 16
+#: rc.cpp:2374
 #, no-c-format
-msgid "Number of lines:"
-msgstr "行数："
+msgid "Encoding Selector"
+msgstr "编码选择器"
 
-#. i18n: file ./treeviews/fileinfodlg.ui line 40
-#: rc.cpp:2407
+#. i18n: file ./components/csseditor/encodingselectors.ui line 43
+#: rc.cpp:2377
 #, no-c-format
-msgid "Number of images included:"
-msgstr "所包含的图像数："
+msgid "Select encoding:"
+msgstr "选择编码："
 
-#. i18n: file ./treeviews/fileinfodlg.ui line 48
-#: rc.cpp:2410
+#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 24
+#: rc.cpp:2386
 #, no-c-format
-msgid "Size of the included images:"
-msgstr "所包含图像的大小："
+msgid "Font Family Chooser"
+msgstr "字体族选择器"
 
-#. i18n: file ./treeviews/fileinfodlg.ui line 56
-#: rc.cpp:2413
+#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 78
+#: rc.cpp:2389
 #, no-c-format
-msgid "Total file size:"
-msgstr "总计文件大小："
+msgid "Available system font families:"
+msgstr "可用的系统字体族："
 
-#. i18n: file ./treeviews/fileinfodlg.ui line 72
-#: rc.cpp:2416
+#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 101
+#: rc.cpp:2392
 #, no-c-format
-msgid "Included images:"
-msgstr "所包含的图像："
+msgid "Generic family:"
+msgstr "常规族："
 
-#. i18n: file ./treeviews/fileinfodlg.ui line 80
-#: rc.cpp:2419 rc.cpp:3900 treeviews/basetreeview.cpp:512
+#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 107
+#: rc.cpp:2395
 #, no-c-format
-msgid "Description:"
-msgstr "描述："
+msgid "cursive"
+msgstr "cursive"
 
-#. i18n: file ./treeviews/quantapropertiespage.ui line 39
-#: rc.cpp:2422
+#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 112
+#: rc.cpp:2398
 #, no-c-format
-msgid "Quanta Properties"
-msgstr "Quanta 属性"
+msgid "fantasy"
+msgstr "fantasy"
 
-#. i18n: file ./treeviews/quantapropertiespage.ui line 65
-#: rc.cpp:2425
+#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 117
+#: rc.cpp:2401
 #, no-c-format
-msgid "&Inherit type from parent (nothing)"
-msgstr "从父标签继承类型(无)(&I)"
+msgid "monospace"
+msgstr "monospace"
 
-#. i18n: file ./treeviews/quantapropertiespage.ui line 73
-#: rc.cpp:2428
+#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 122
+#: rc.cpp:2404
 #, no-c-format
-msgid "&Type:"
-msgstr "类型(&T)："
+msgid "sans-serif"
+msgstr "sans-serif"
 
-#. i18n: file ./treeviews/quantapropertiespage.ui line 117
-#: rc.cpp:2431
+#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 127
+#: rc.cpp:2407
 #, no-c-format
-msgid "Use &pre/post text"
-msgstr "使用前置/后置文本(&P)"
+msgid "serif"
+msgstr "serif"
 
-#. i18n: file ./treeviews/quantapropertiespage.ui line 125
-#: rc.cpp:2434
+#. i18n: file ./components/csseditor/fontfamilychoosers.ui line 332
+#: rc.cpp:2410
 #, no-c-format
-msgid "Pre-text:"
-msgstr "前置文本："
+msgid "Selected font families:"
+msgstr "选中的字体族："
 
-#. i18n: file ./treeviews/quantapropertiespage.ui line 141
-#: rc.cpp:2437
+#. i18n: file ./components/csseditor/csseditors.ui line 16
+#: rc.cpp:2419
 #, no-c-format
-msgid "Post-text:"
-msgstr "后置文本："
+msgid "CSS Editor"
+msgstr "CSS 编辑器"
 
-#. i18n: file ./treeviews/quantapropertiespage.ui line 189
-#: rc.cpp:2440
+#. i18n: file ./components/csseditor/csseditors.ui line 89
+#: rc.cpp:2428
 #, no-c-format
-msgid "Filtering &action:"
-msgstr "过滤动作(&A)："
+msgid "Use shorthand form"
+msgstr ""
 
-#. i18n: file ./treeviews/templatedirform.ui line 26
-#: rc.cpp:2443
+#. i18n: file ./components/csseditor/csseditors.ui line 137
+#: rc.cpp:2431
 #, no-c-format
-msgid "Create Template Folder"
-msgstr "创建模板文件夹"
+msgid "Visual"
+msgstr "可视化"
 
-#. i18n: file ./treeviews/templatedirform.ui line 63
-#: rc.cpp:2452
+#. i18n: file ./components/csseditor/csseditors.ui line 175
+#: rc.cpp:2437
 #, no-c-format
-msgid "&Inherit parent attribute"
-msgstr "继承父标签属性(&I)"
+msgid "Paged"
+msgstr "分页"
 
-#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 31
-#: parsers/dtd/dtdparser.cpp:110 rc.cpp:2461
+#. i18n: file ./components/csseditor/csseditors.ui line 210
+#: rc.cpp:2443
 #, no-c-format
-msgid "DTD - > DTEP Conversion"
-msgstr "DTD -> DTEP 转换"
+msgid "Interactive"
+msgstr "交互"
 
-#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 55
-#: rc.cpp:2464
+#. i18n: file ./components/csseditor/csseditors.ui line 245
+#: rc.cpp:2449
 #, no-c-format
-msgid "Name: "
-msgstr "名称："
+msgid "Aural"
+msgstr ""
 
-#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 63
-#: rc.cpp:2467 rc.cpp:2661
+#. i18n: file ./components/csseditor/csseditors.ui line 280
+#: dialogs/actionconfigdialog.cpp:80 dialogs/actionconfigdialog.cpp:191
+#: dialogs/actionconfigdialog.cpp:219 rc.cpp:2455 rc.cpp:2485 rc.cpp:2518
+#: rc.cpp:2542 rc.cpp:2563
 #, no-c-format
-msgid "Nickname:"
-msgstr "昵称："
+msgid "All"
+msgstr "全部"
 
-#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 71
-#: rc.cpp:2470
+#. i18n: file ./components/csseditor/cssselectors.ui line 16
+#: rc.cpp:2464
 #, no-c-format
-msgid "!DOCTYPE definition line:"
-msgstr "!DOCTYPE 定义行："
+msgid "CSS Selector Dialog"
+msgstr "CSS 选择器对话框"
 
-#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 94
-#: rc.cpp:2473
+#. i18n: file ./components/csseditor/cssselectors.ui line 41
+#: rc.cpp:2467
 #, no-c-format
-msgid "DTD URL:"
-msgstr "DTD URL："
+msgid "Apply to file:"
+msgstr "应用到文件："
 
-#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 102
+#. i18n: file ./components/csseditor/cssselectors.ui line 106
 #: rc.cpp:2476
 #, no-c-format
-msgid "Target directory name:"
-msgstr "目的目录名称："
-
-#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 110
-#: rc.cpp:2479
-#, no-c-format
-msgid "Default extension:"
-msgstr "默认扩展名："
-
-#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 123
-#: rc.cpp:2482
-#, no-c-format
-msgid "Case-sensitive tags and attributes"
-msgstr "标签和属性区分大小写"
+msgid "Tags"
+msgstr "标签"
 
-#. i18n: file ./parsers/dtd/dtepcreationdlg.ui line 134
-#: rc.cpp:2485
+#. i18n: file ./components/csseditor/cssselectors.ui line 150
+#: rc.cpp:2479 rc.cpp:2512 rc.cpp:2536 rc.cpp:2560
 #, no-c-format
-msgid "&Fine-tune the DTEP after conversion"
-msgstr "转换后调整 DTEP(&F)"
+msgid "Remove Selector"
+msgstr "删除选择器"
 
-#. i18n: file ./plugins/pluginconfig.ui line 33
-#: plugins/quantapluginconfig.cpp:40 rc.cpp:2488
+#. i18n: file ./components/csseditor/cssselectors.ui line 165
+#: rc.cpp:2482 rc.cpp:2515 rc.cpp:2539 rc.cpp:2566
 #, no-c-format
-msgid "Configure Plugin"
-msgstr "配置插件"
+msgid "Selected"
+msgstr "已选"
 
-#. i18n: file ./plugins/pluginconfig.ui line 44
-#: rc.cpp:2491
+#. i18n: file ./components/csseditor/cssselectors.ui line 200
+#: rc.cpp:2488
 #, no-c-format
-msgid "Validate plugin"
-msgstr "校验插件"
+msgid "DTD Selection"
+msgstr "DTD 选择"
 
-#. i18n: file ./plugins/pluginconfig.ui line 86
-#: rc.cpp:2494
+#. i18n: file ./components/csseditor/cssselectors.ui line 235
+#: rc.cpp:2491 rc.cpp:2521 rc.cpp:2545 rc.cpp:2569
 #, no-c-format
-msgid "Plugin Options"
-msgstr "插件选项"
+msgid "Add Selector"
+msgstr "添加选择器"
 
-#. i18n: file ./plugins/pluginconfig.ui line 105
-#: rc.cpp:2500
+#. i18n: file ./components/csseditor/cssselectors.ui line 281
+#: parts/kafka/htmldocumentproperties.cpp:97 parts/kafka/wkafkapart.cpp:68
+#: rc.cpp:2497 rc.cpp:2506 rc.cpp:2530 rc.cpp:2554
 #, no-c-format
-msgid "The plugin name as it appears in the Plugins menu."
-msgstr "出现在插件菜单中的插件名称"
+msgid "Selector"
+msgstr "选择器"
 
-#. i18n: file ./plugins/pluginconfig.ui line 141
+#. i18n: file ./components/csseditor/cssselectors.ui line 346
 #: rc.cpp:2503
 #, no-c-format
-msgid "Location:"
-msgstr "位置："
-
-#. i18n: file ./plugins/pluginconfig.ui line 149
-#: rc.cpp:2506
-#, no-c-format
-msgid ""
-"The exact location of the plugin. If not set the global search paths setting is "
-"used."
-msgstr "插件的确切位置。如果没有设置的话，将会使用全局搜索路径设置。"
-
-#. i18n: file ./plugins/pluginconfig.ui line 157
-#: rc.cpp:2509
-#, no-c-format
-msgid "The plugin executable or library name (with extension)."
-msgstr "插件可执行文件或库名(带扩展名)。"
-
-#. i18n: file ./plugins/pluginconfig.ui line 165
-#: rc.cpp:2512 treeviews/basetreeview.cpp:1209
-#: treeviews/projecttreeview.cpp:393
-#, no-c-format
-msgid "File name:"
-msgstr "文件名："
-
-#. i18n: file ./plugins/pluginconfig.ui line 186
-#: rc.cpp:2515
-#, no-c-format
-msgid "Output window:"
-msgstr "输出窗口："
-
-#. i18n: file ./plugins/pluginconfig.ui line 208
-#: rc.cpp:2521
-#, no-c-format
-msgid "&Read only part"
-msgstr "只读部分(&R)"
-
-#. i18n: file ./plugins/pluginconfig.ui line 216
-#: rc.cpp:2524
-#, no-c-format
-msgid "Input:"
-msgstr "输入："
-
-#. i18n: file ./plugins/pluginconfig.ui line 227
-#: messages/annotationoutput.cpp:42 rc.cpp:2530
-#, no-c-format
-msgid "Current File"
-msgstr "当前文件"
-
-#. i18n: file ./plugins/pluginconfig.ui line 232
-#: rc.cpp:2533
-#, no-c-format
-msgid "Current File Path"
-msgstr "当前文件路径"
-
-#. i18n: file ./plugins/pluginconfig.ui line 237
-#: rc.cpp:2536
-#, no-c-format
-msgid "Project Folder"
-msgstr "工程文件夹"
-
-#. i18n: file ./plugins/plugineditor.ui line 32
-#: plugins/quantaplugineditor.cpp:45 plugins/quantaplugininterface.cpp:260
-#: rc.cpp:2539
-#, no-c-format
-msgid "Edit Plugins"
-msgstr "编辑插件"
-
-#. i18n: file ./plugins/plugineditor.ui line 49
-#: rc.cpp:2542
-#, no-c-format
-msgid "Search paths:"
-msgstr "搜索路径："
+msgid "IDs"
+msgstr "IDs"
 
-#. i18n: file ./plugins/plugineditor.ui line 57
-#: rc.cpp:2545 treeviews/basetreeview.cpp:617
+#. i18n: file ./components/csseditor/cssselectors.ui line 540
+#: rc.cpp:2527
 #, no-c-format
-msgid "Plugins"
-msgstr "插件"
+msgid "Classes"
+msgstr "类"
 
-#. i18n: file ./plugins/plugineditor.ui line 83
+#. i18n: file ./components/csseditor/cssselectors.ui line 734
 #: rc.cpp:2551
 #, no-c-format
-msgid "Valid"
-msgstr "合法"
-
-#. i18n: file ./plugins/plugineditor.ui line 94
-#: rc.cpp:2554
-#, no-c-format
-msgid "Location"
-msgstr "位置"
-
-#. i18n: file ./plugins/plugineditor.ui line 105
-#: rc.cpp:2557 rc.cpp:5200
-#, no-c-format
-msgid "File Name"
-msgstr "文件名"
-
-#. i18n: file ./plugins/plugineditor.ui line 116
-#: rc.cpp:2560
-#, no-c-format
-msgid "Output Window"
-msgstr "输出窗口"
-
-#. i18n: file ./plugins/plugineditor.ui line 145
-#: rc.cpp:2566
-#, no-c-format
-msgid "Configure..."
-msgstr "配置..."
-
-#. i18n: file ./plugins/plugineditor.ui line 178
-#: rc.cpp:2572 rc.cpp:5363
-#, no-c-format
-msgid "Refresh"
-msgstr "刷新"
+msgid "Pseudo"
+msgstr "Pseudo"
 
-#. i18n: file ./project/projectnewwebs.ui line 142
-#: project/projectnewweb.cpp:140 project/projectnewweb.cpp:147
-#: project/projectnewweb.cpp:157 project/projectnewweb.cpp:167 rc.cpp:2578
+#. i18n: file ./project/teammembersdlgs.ui line 24
+#: rc.cpp:2578
 #, no-c-format
-msgid "Start"
-msgstr "开始"
+msgid "&Mailing list:"
+msgstr "邮件列表(&M)："
 
-#. i18n: file ./project/projectnewwebs.ui line 192
+#. i18n: file ./project/teammembersdlgs.ui line 40
 #: rc.cpp:2581
 #, no-c-format
-msgid "wget's command line:"
-msgstr "wget 的命令行："
+msgid "You are:"
+msgstr "您是："
 
-#. i18n: file ./project/projectnewwebs.ui line 215
-#: rc.cpp:2584
+#. i18n: file ./project/teammembersdlgs.ui line 53
+#: project/teammembersdlg.cpp:247 rc.cpp:2584
 #, no-c-format
-msgid "HTTP"
-msgstr "HTTP"
+msgid "Please select your identity from the member list."
+msgstr "请从下面的成员列表中选择您的身份。"
 
-#. i18n: file ./project/projectnewwebs.ui line 220
+#. i18n: file ./project/teammembersdlgs.ui line 64
 #: rc.cpp:2587
 #, no-c-format
-msgid "FTP"
-msgstr "FTP"
-
-#. i18n: file ./project/projectnewwebs.ui line 237
-#: rc.cpp:2590
-#, no-c-format
-msgid "Protocol:"
-msgstr "协议："
-
-#. i18n: file ./project/projectnewwebs.ui line 250
-#: rc.cpp:2593
-#, no-c-format
-msgid "Site source:"
-msgstr "源站点："
-
-#. i18n: file ./project/uploadprofiledlgs.ui line 26
-#: project/uploadprofiles.cpp:90 rc.cpp:2596
-#, no-c-format
-msgid "Upload Profile"
-msgstr "上传配置文件"
+msgid "&Team Members"
+msgstr "团队成员(&T)"
 
-#. i18n: file ./project/uploadprofiledlgs.ui line 42
+#. i18n: file ./project/teammembersdlgs.ui line 100
 #: rc.cpp:2599
 #, no-c-format
-msgid "&Host:"
-msgstr "主机(&H)："
+msgid "Nickname"
+msgstr "昵称"
 
-#. i18n: file ./project/uploadprofiledlgs.ui line 53
+#. i18n: file ./project/teammembersdlgs.ui line 111
 #: rc.cpp:2602
 #, no-c-format
-msgid "&User:"
-msgstr "用户(&U)："
+msgid "Email"
+msgstr "电子邮件"
 
-#. i18n: file ./project/uploadprofiledlgs.ui line 64
+#. i18n: file ./project/teammembersdlgs.ui line 122
 #: rc.cpp:2605
 #, no-c-format
-msgid "Pa&th:"
-msgstr "路径(&T)："
+msgid "Role"
+msgstr "角色"
 
-#. i18n: file ./project/uploadprofiledlgs.ui line 75
-#: rc.cpp:2608 rc.cpp:2667
+#. i18n: file ./project/teammembersdlgs.ui line 133
+#: rc.cpp:2608
 #, no-c-format
-msgid "Profile &name:"
-msgstr "配置文件名(&N)："
+msgid "Task"
+msgstr "任务"
 
-#. i18n: file ./project/uploadprofiledlgs.ui line 86
+#. i18n: file ./project/teammembersdlgs.ui line 144
 #: rc.cpp:2611
 #, no-c-format
-msgid "Use as &default profile"
-msgstr "用为默认配置文件(&D)"
+msgid "Subproject"
+msgstr "子工程"
 
-#. i18n: file ./project/uploadprofiledlgs.ui line 107
-#: rc.cpp:2614
+#. i18n: file ./project/teammembersdlgs.ui line 187
+#: rc.cpp:2617
 #, no-c-format
-msgid "Pass&word:"
-msgstr "密码(&W)："
+msgid "Set to &Yourself"
+msgstr "设为您自己(&Y)"
 
-#. i18n: file ./project/uploadprofiledlgs.ui line 213
+#. i18n: file ./project/projectnewlocals.ui line 107
+#: rc.cpp:2620
+#, no-c-format
+msgid "Insert files from"
+msgstr "插入文件来自"
+
+#. i18n: file ./project/projectnewlocals.ui line 123
 #: rc.cpp:2623
 #, no-c-format
-msgid "Po&rt:"
-msgstr "端口(&R)："
+msgid "Included files:"
+msgstr "包含的文件："
 
-#. i18n: file ./project/uploadprofiledlgs.ui line 232
+#. i18n: file ./project/projectnewlocals.ui line 142
 #: rc.cpp:2626
 #, no-c-format
-msgid "&Store password on disc"
-msgstr "在磁盘中保存密码(&S)"
+msgid "Filters"
+msgstr "过滤器"
 
-#. i18n: file ./project/uploadprofiledlgs.ui line 238
+#. i18n: file ./project/projectnewlocals.ui line 159
 #: rc.cpp:2629
-#, fuzzy, no-c-format
-msgid "Keep the password in a file. DANGEROUS! Read the \"What's This?\" text."
-msgstr "在文件中保存密码。小心！请阅读这是什么文本。"
+#, no-c-format
+msgid "Insert files with the following &mask:"
+msgstr "用下列通配符插入文件(&M)："
 
-#. i18n: file ./project/uploadprofiledlgs.ui line 243
+#. i18n: file ./project/projectnewlocals.ui line 175
 #: rc.cpp:2632
 #, no-c-format
-msgid ""
-"<qt>If you check this box, the password will be saved in the local Quanta "
-"configuration file, so every time you start Quanta and load this project, the "
-"password will be loaded and you don't have to enter it. Altough the local "
-"configuration file is readable only by you and the password\n"
-"is obscured, saving the password in any file is a security risk. Use this "
-"option at your own risk."
-"<br>\n"
-"<i>Note:</i> due to the security concerns, the password is not present in the "
-"project file, and moving the project files to another computer or uploading the "
-"project to a server will not move/upload the password to the new place.</qt>"
-msgstr ""
+msgid "Insert onl&y markup, script and image files"
+msgstr "仅插入标记语言、脚本和图像文件(&Y)"
 
-#. i18n: file ./project/uploadprofiledlgs.ui line 264
-#: rc.cpp:2637
+#. i18n: file ./project/projectnewlocals.ui line 236
+#: rc.cpp:2635
 #, no-c-format
-msgid "&Protocol:"
-msgstr "协议(&P)："
+msgid "&Add Files..."
+msgstr "添加文件(&A)..."
 
-#. i18n: file ./project/membereditdlgs.ui line 52
-#: rc.cpp:2646
+#. i18n: file ./project/projectnewlocals.ui line 244
+#: rc.cpp:2638
 #, no-c-format
-msgid "E&dit Subprojects"
-msgstr "编辑子工程(&D)"
+msgid "A&dd Folder..."
+msgstr "添加文件夹(&D)..."
 
-#. i18n: file ./project/membereditdlgs.ui line 70
-#: rc.cpp:2649
+#. i18n: file ./project/projectnewlocals.ui line 252
+#: rc.cpp:2641
 #, no-c-format
-msgid "Tas&k:"
-msgstr "任务(&K)："
+msgid "&Clear List"
+msgstr "清除列表(&C)"
 
-#. i18n: file ./project/membereditdlgs.ui line 81
-#: rc.cpp:2652
+#. i18n: file ./project/rescanprjdir.ui line 39
+#: rc.cpp:2644
 #, no-c-format
-msgid "Subpro&ject:"
-msgstr "子工程(&J)："
+msgid "MyDialog"
+msgstr "MyDialog"
 
-#. i18n: file ./project/membereditdlgs.ui line 92
-#: rc.cpp:2655
+#. i18n: file ./project/rescanprjdir.ui line 58
+#: project/rescanprj.cpp:244 rc.cpp:2647
 #, no-c-format
-msgid "&Role:"
-msgstr "角色(&R)："
+msgid "Progress:"
+msgstr "进度："
 
-#. i18n: file ./project/membereditdlgs.ui line 103
-#: rc.cpp:2658
+#. i18n: file ./project/rescanprjdir.ui line 79
+#: rc.cpp:2650
 #, no-c-format
-msgid "&Email:"
-msgstr "电子邮件(&E)："
+msgid "<b>Add New Files in Project</b>"
+msgstr "<b>在工程中添加新文件</b>"
 
-#. i18n: file ./project/projectuploads.ui line 40
-#: rc.cpp:2664
+#. i18n: file ./project/rescanprjdir.ui line 138
+#: rc.cpp:2659
 #, no-c-format
-msgid "Upload Project Files"
-msgstr "上传工程文件"
+msgid "Co&llapse All"
+msgstr "全部折叠(&L)"
 
-#. i18n: file ./project/projectuploads.ui line 103
-#: rc.cpp:2670
+#. i18n: file ./project/rescanprjdir.ui line 163
+#: rc.cpp:2662 rc.cpp:2939
 #, no-c-format
-msgid "New..."
-msgstr "新建..."
+msgid "&All"
+msgstr "全部(&A)"
 
-#. i18n: file ./project/projectuploads.ui line 111
-#: rc.cpp:2673
+#. i18n: file ./project/rescanprjdir.ui line 179
+#: rc.cpp:2668 rc.cpp:2933
 #, no-c-format
-msgid "Edit..."
-msgstr "编辑..."
+msgid "E&xpand All"
+msgstr "全部展开(&X)"
 
-#. i18n: file ./project/projectuploads.ui line 137
-#: rc.cpp:2679
+#. i18n: file ./project/rescanprjdir.ui line 198
+#: rc.cpp:2674 rc.cpp:2915
 #, no-c-format
-msgid "&Proceed"
-msgstr "继续(&P)"
+msgid "&Invert"
+msgstr "反转(&I)"
 
-#. i18n: file ./project/projectuploads.ui line 187
-#: rc.cpp:2685
+#. i18n: file ./project/projectoptions.ui line 33
+#: rc.cpp:2677
 #, no-c-format
-msgid "&Keep passwords in memory"
-msgstr "在内存中保留密码(&K)"
+msgid "Project Options"
+msgstr "工程选项"
 
-#. i18n: file ./project/projectuploads.ui line 217
-#: rc.cpp:2688 rc.cpp:2838
+#. i18n: file ./project/projectoptions.ui line 188
+#: rc.cpp:2686
 #, no-c-format
-msgid "&Invert"
-msgstr "反转(&I)"
+msgid "Project &name:"
+msgstr "工程名称(&N)："
 
-#. i18n: file ./project/projectuploads.ui line 233
-#: rc.cpp:2694
+#. i18n: file ./project/projectoptions.ui line 199
+#: rc.cpp:2689
 #, no-c-format
-msgid "C&ollapse All"
-msgstr "全部折叠(&O)"
+msgid "&Templates folder:"
+msgstr "模板文件夹(&T)："
 
-#. i18n: file ./project/projectuploads.ui line 241
-#: rc.cpp:2697
+#. i18n: file ./project/projectoptions.ui line 216
+#: rc.cpp:2692
 #, no-c-format
-msgid "U&pdate All"
-msgstr "全部更新(&P)"
+msgid "T&oolbars folder:"
+msgstr "工具栏文件夹(&O)："
 
-#. i18n: file ./project/projectuploads.ui line 244
-#: rc.cpp:2700
+#. i18n: file ./project/projectoptions.ui line 235
+#: rc.cpp:2695
 #, no-c-format
-msgid "This will cause all files to appear already uploaded"
-msgstr "这将导致所有文件看上去都已上传"
+msgid "&Author:"
+msgstr "作者(&A)："
 
-#. i18n: file ./project/projectuploads.ui line 252
-#: rc.cpp:2703
+#. i18n: file ./project/projectoptions.ui line 254
+#: rc.cpp:2698
 #, no-c-format
-msgid "&Modified"
-msgstr "已修改(&M)"
+msgid "E&mail:"
+msgstr "电子邮件(&M)："
 
-#. i18n: file ./project/projectuploads.ui line 260
-#: rc.cpp:2706 rc.cpp:2832
+#. i18n: file ./project/projectoptions.ui line 273
+#: rc.cpp:2701 rc.cpp:2954
 #, no-c-format
-msgid "E&xpand All"
-msgstr "全部展开(&X)"
+msgid "Project Defaults"
+msgstr "工程默认值"
 
-#. i18n: file ./project/projectuploads.ui line 289
-#: rc.cpp:2709
+#. i18n: file ./project/projectoptions.ui line 295
+#: rc.cpp:2707
 #, no-c-format
-msgid "Selection:"
-msgstr "选中内容："
+msgid "Default &view:"
+msgstr "默认视图(&V)："
 
-#. i18n: file ./project/projectuploads.ui line 305
-#: rc.cpp:2712 rc.cpp:2826
+#. i18n: file ./project/projectoptions.ui line 312
+#: rc.cpp:2710
 #, no-c-format
-msgid "&All"
-msgstr "全部(&A)"
+msgid "Default &encoding:"
+msgstr "默认编码(&E)："
 
-#. i18n: file ./project/projectuploads.ui line 313
-#: rc.cpp:2715
+#. i18n: file ./project/projectoptions.ui line 343
+#: rc.cpp:2716
 #, no-c-format
-msgid "Mark the selected files as uploaded instead of uploading them"
-msgstr ""
+msgid "E&xclude from project:"
+msgstr "从工程中排除(&X)："
 
-#. i18n: file ./project/projectuploads.ui line 339
-#: rc.cpp:2718
+#. i18n: file ./project/projectoptions.ui line 354
+#: rc.cpp:2719
 #, no-c-format
-msgid "Current: [none]"
-msgstr "当前：[无]"
+msgid "Exclude &files listed in .cvsignore"
+msgstr "排除在 .cvsignore 中列出的文件(&F)"
 
-#. i18n: file ./project/projectuploads.ui line 358
-#: project/projectupload.cpp:235 rc.cpp:2721
+#. i18n: file ./project/projectoptions.ui line 358
+#: rc.cpp:2722
 #, no-c-format
-msgid "Total:"
-msgstr "总计："
+msgid ""
+"The files listed in <i>.cvsignore</i> files will not appear in the project "
+"tree, nor will be shown when you rescan the project folder or upload the "
+"project. Files matching the <i>.cvsignore</i> entries that were already present "
+"in the project will be removed from it, but they will not be removed from the "
+"disc."
+"<br>\n"
+"<b>NOTE:</b> This feature works only for local projects."
+msgstr ""
 
-#. i18n: file ./project/projectnewfinals.ui line 121
-#: rc.cpp:2724
+#. i18n: file ./project/projectoptions.ui line 374
+#: rc.cpp:2726
 #, no-c-format
-msgid "Prefix:"
-msgstr "前缀："
+msgid "Debugger"
+msgstr "调试器"
 
-#. i18n: file ./project/projectnewfinals.ui line 134
-#: rc.cpp:2727 rc.cpp:3009
+#. i18n: file ./project/projectoptions.ui line 385
+#: rc.cpp:2729
 #, no-c-format
-msgid "Project Defaults"
-msgstr "工程默认值"
+msgid "Debu&gger:"
+msgstr "调试器(&G)："
 
-#. i18n: file ./project/projectnewfinals.ui line 151
-#: rc.cpp:2730
+#. i18n: file ./project/projectoptions.ui line 420
+#: rc.cpp:2732
 #, no-c-format
-msgid "Default DTD:"
-msgstr "默认 DTD："
+msgid "Optio&ns"
+msgstr "选项(&N)"
 
-#. i18n: file ./project/projectnewfinals.ui line 170
-#: rc.cpp:2733
+#. i18n: file ./project/projectoptions.ui line 428
+#: rc.cpp:2735
 #, no-c-format
-msgid "Default encoding:"
-msgstr "默认编码："
+msgid "Remember &breakpoints across sessions"
+msgstr "在不同的会话中记住断点(&B)"
 
-#. i18n: file ./project/projectnewfinals.ui line 185
-#: rc.cpp:2736
+#. i18n: file ./project/projectoptions.ui line 436
+#: rc.cpp:2738
 #, no-c-format
-msgid "Insert &local templates"
-msgstr "插入本地模板(&L)"
+msgid "Remember watches across sessions"
+msgstr "在不同的会话中记住监视"
 
-#. i18n: file ./project/projectnewfinals.ui line 193
-#: rc.cpp:2739
+#. i18n: file ./project/projectoptions.ui line 449
+#: rc.cpp:2741
 #, no-c-format
-msgid "Insert &global templates"
-msgstr "插入全局模板(&G)"
+msgid "Use persistent boo&kmarks"
+msgstr "使用永久书签(&K)"
 
-#. i18n: file ./project/projectnewfinals.ui line 201
-#: rc.cpp:2742
+#. i18n: file ./project/projectoptions.ui line 465
+#: rc.cpp:2744
 #, no-c-format
-msgid "Use preview prefi&x"
-msgstr "使用预览前缀(&X)"
+msgid "&Use preview prefix:"
+msgstr "使用预览前缀(&U)："
 
-#. i18n: file ./project/projectnewfinals.ui line 209
-#: ../lib/compatibility/knewstuff/uploaddialog.cpp:62 rc.cpp:2745
+#. i18n: file ./project/projectnewgenerals.ui line 121
+#: rc.cpp:2747
 #, no-c-format
-msgid "Author:"
-msgstr "作者："
+msgid "Directory Settings"
+msgstr "目录设置"
 
-#. i18n: file ./project/projectnewfinals.ui line 264
-#: rc.cpp:2748
+#. i18n: file ./project/projectnewgenerals.ui line 137
+#: rc.cpp:2750
 #, no-c-format
-msgid "Email:"
-msgstr "电子邮件："
+msgid "Templates directory:"
+msgstr "模板目录："
 
-#. i18n: file ./project/subprojecteditdlgs.ui line 35
-#: rc.cpp:2754
+#. i18n: file ./project/projectnewgenerals.ui line 170
+#: rc.cpp:2756
 #, no-c-format
-msgid "The relative path of the subproject folder inside the project."
-msgstr ""
+msgid "Toolbars directory:"
+msgstr "工具栏目录："
 
-#. i18n: file ./project/subprojecteditdlgs.ui line 48
-#: rc.cpp:2757
+#. i18n: file ./project/projectnewgenerals.ui line 220
+#: rc.cpp:2765
 #, no-c-format
-msgid "&Location:"
-msgstr "位置(&L)："
+msgid "Main directory:"
+msgstr "主目录："
 
-#. i18n: file ./project/subprojecteditdlgs.ui line 59
-#: rc.cpp:2760
+#. i18n: file ./project/projectnewgenerals.ui line 240
+#: rc.cpp:2768
 #, no-c-format
-msgid "&Create new subproject"
-msgstr "创建新子工程(&C)"
+msgid "Project Sources"
+msgstr "工程源"
 
-#. i18n: file ./project/subprojecteditdlgs.ui line 62
-#: rc.cpp:2763
+#. i18n: file ./project/projectnewgenerals.ui line 257
+#: rc.cpp:2771
 #, no-c-format
-msgid ""
-"Check this if you want to create a new subproject with the above entered data."
-msgstr ""
+msgid "&Add local or remote files"
+msgstr "添加本地或远程文件(&A)"
 
-#. i18n: file ./project/teammembersdlgs.ui line 24
-#: rc.cpp:2766
+#. i18n: file ./project/projectnewgenerals.ui line 268
+#: rc.cpp:2774
 #, no-c-format
-msgid "&Mailing list:"
-msgstr "邮件列表(&M)："
+msgid "&Use wget to download files from a site"
+msgstr "使用 wget 从站点下载文件(&U)"
 
-#. i18n: file ./project/teammembersdlgs.ui line 40
-#: rc.cpp:2769
+#. i18n: file ./project/projectnewgenerals.ui line 297
+#: rc.cpp:2783
 #, no-c-format
-msgid "You are:"
-msgstr "您是："
+msgid "Server Settings"
+msgstr "服务器设置"
 
-#. i18n: file ./project/teammembersdlgs.ui line 53
-#: project/teammembersdlg.cpp:247 rc.cpp:2772
+#. i18n: file ./project/projectnewgenerals.ui line 308
+#: rc.cpp:2786
 #, no-c-format
-msgid "Please select your identity from the member list."
-msgstr "请从下面的成员列表中选择您的身份。"
+msgid "Protocol: "
+msgstr "协议："
 
-#. i18n: file ./project/teammembersdlgs.ui line 64
-#: rc.cpp:2775
+#. i18n: file ./project/projectnewgenerals.ui line 321
+#: rc.cpp:2789
 #, no-c-format
-msgid "&Team Members"
-msgstr "团队成员(&T)"
+msgid "Password:"
+msgstr "密码："
 
-#. i18n: file ./project/teammembersdlgs.ui line 100
-#: rc.cpp:2787
+#. i18n: file ./project/projectnewgenerals.ui line 343
+#: project/projectnewgeneral.cpp:65 project/projectnewgeneral.cpp:129
+#: project/projectnewgeneral.cpp:203 project/projectprivate.cpp:739
+#: rc.cpp:2792
 #, no-c-format
-msgid "Nickname"
-msgstr "昵称"
+msgid "Local"
+msgstr "本地"
 
-#. i18n: file ./project/teammembersdlgs.ui line 111
-#: rc.cpp:2790
+#. i18n: file ./project/projectnewgenerals.ui line 382
+#: rc.cpp:2795
 #, no-c-format
-msgid "Email"
-msgstr "电子邮件"
+msgid "Port:"
+msgstr "端口："
 
-#. i18n: file ./project/teammembersdlgs.ui line 122
-#: rc.cpp:2793
+#. i18n: file ./project/projectnewgenerals.ui line 398
+#: rc.cpp:2798
 #, no-c-format
-msgid "Role"
-msgstr "角色"
+msgid "Host:"
+msgstr "主机："
 
-#. i18n: file ./project/teammembersdlgs.ui line 133
-#: rc.cpp:2796
+#. i18n: file ./project/projectnewgenerals.ui line 409
+#: rc.cpp:2801
 #, no-c-format
-msgid "Task"
-msgstr "任务"
+msgid "User:"
+msgstr "用户："
 
-#. i18n: file ./project/teammembersdlgs.ui line 144
-#: rc.cpp:2799
+#. i18n: file ./project/uploadprofilespage.ui line 46
+#: rc.cpp:2804
 #, no-c-format
-msgid "Subproject"
-msgstr "子工程"
+msgid "Default profile:"
+msgstr "默认配置文件："
 
-#. i18n: file ./project/teammembersdlgs.ui line 187
-#: rc.cpp:2805
+#. i18n: file ./project/uploadprofilespage.ui line 62
+#: rc.cpp:2807
 #, no-c-format
-msgid "Set to &Yourself"
-msgstr "设为您自己(&Y)"
+msgid "Edit Profiles"
+msgstr "编辑配置文件"
 
-#. i18n: file ./project/rescanprjdir.ui line 39
-#: rc.cpp:2808
+#. i18n: file ./project/uploadprofilespage.ui line 86
+#: rc.cpp:2813
 #, no-c-format
-msgid "MyDialog"
-msgstr "MyDialog"
+msgid "Show a &treeview for each profile"
+msgstr "为每个配置文件显示树视图(&T)"
 
-#. i18n: file ./project/rescanprjdir.ui line 58
-#: project/rescanprj.cpp:244 rc.cpp:2811
+#. i18n: file ./project/projectnewwebs.ui line 142
+#: project/projectnewweb.cpp:140 project/projectnewweb.cpp:147
+#: project/projectnewweb.cpp:157 project/projectnewweb.cpp:167 rc.cpp:2816
 #, no-c-format
-msgid "Progress:"
-msgstr "进度："
+msgid "Start"
+msgstr "开始"
 
-#. i18n: file ./project/rescanprjdir.ui line 79
-#: rc.cpp:2814
+#. i18n: file ./project/projectnewwebs.ui line 192
+#: rc.cpp:2819
 #, no-c-format
-msgid "<b>Add New Files in Project</b>"
-msgstr "<b>在工程中添加新文件</b>"
+msgid "wget's command line:"
+msgstr "wget 的命令行："
 
-#. i18n: file ./project/rescanprjdir.ui line 138
-#: rc.cpp:2823
+#. i18n: file ./project/projectnewwebs.ui line 215
+#: rc.cpp:2822
 #, no-c-format
-msgid "Co&llapse All"
-msgstr "全部折叠(&L)"
+msgid "HTTP"
+msgstr "HTTP"
 
-#. i18n: file ./project/uploadprofilespage.ui line 46
-#: rc.cpp:2841
+#. i18n: file ./project/projectnewwebs.ui line 220
+#: rc.cpp:2825
 #, no-c-format
-msgid "Default profile:"
-msgstr "默认配置文件："
+msgid "FTP"
+msgstr "FTP"
 
-#. i18n: file ./project/uploadprofilespage.ui line 62
-#: rc.cpp:2844
+#. i18n: file ./project/projectnewwebs.ui line 237
+#: rc.cpp:2828
 #, no-c-format
-msgid "Edit Profiles"
-msgstr "编辑配置文件"
+msgid "Protocol:"
+msgstr "协议："
 
-#. i18n: file ./project/uploadprofilespage.ui line 86
-#: rc.cpp:2850
+#. i18n: file ./project/projectnewwebs.ui line 250
+#: rc.cpp:2831
 #, no-c-format
-msgid "Show a &treeview for each profile"
-msgstr "为每个配置文件显示树视图(&T)"
+msgid "Site source:"
+msgstr "源站点："
 
 #. i18n: file ./project/eventeditordlgs.ui line 49
-#: rc.cpp:2853
+#: rc.cpp:2834
 #, no-c-format
 msgid "Event:"
 msgstr "事件："
 
 #. i18n: file ./project/eventeditordlgs.ui line 78
-#: rc.cpp:2856
+#: rc.cpp:2837
 #, no-c-format
 msgid "Action:"
 msgstr "动作："
 
 #. i18n: file ./project/eventeditordlgs.ui line 107
-#: rc.cpp:2859
+#: rc.cpp:2840
 #, no-c-format
 msgid "Argument 1:"
 msgstr "参数 1："
 
 #. i18n: file ./project/eventeditordlgs.ui line 139
-#: rc.cpp:2862
+#: rc.cpp:2843
 #, no-c-format
 msgid "Argument 2:"
 msgstr "参数 2："
 
 #. i18n: file ./project/eventeditordlgs.ui line 171
-#: rc.cpp:2865
+#: rc.cpp:2846
 #, no-c-format
 msgid "Argument 3:"
 msgstr "参数 3："
 
 #. i18n: file ./project/eventeditordlgs.ui line 187
-#: rc.cpp:2868
+#: rc.cpp:2849
 #, no-c-format
 msgid "Argument 4:"
 msgstr "参数 4："
 
-#. i18n: file ./project/projectnewlocals.ui line 107
-#: rc.cpp:2871
+#. i18n: file ./project/membereditdlgs.ui line 52
+#: rc.cpp:2858
 #, no-c-format
-msgid "Insert files from"
-msgstr "插入文件来自"
+msgid "E&dit Subprojects"
+msgstr "编辑子工程(&D)"
 
-#. i18n: file ./project/projectnewlocals.ui line 123
-#: rc.cpp:2874
+#. i18n: file ./project/membereditdlgs.ui line 70
+#: rc.cpp:2861
 #, no-c-format
-msgid "Included files:"
-msgstr "包含的文件："
+msgid "Tas&k:"
+msgstr "任务(&K)："
 
-#. i18n: file ./project/projectnewlocals.ui line 142
-#: rc.cpp:2877
+#. i18n: file ./project/membereditdlgs.ui line 81
+#: rc.cpp:2864
 #, no-c-format
-msgid "Filters"
-msgstr "过滤器"
+msgid "Subpro&ject:"
+msgstr "子工程(&J)："
 
-#. i18n: file ./project/projectnewlocals.ui line 159
-#: rc.cpp:2880
+#. i18n: file ./project/membereditdlgs.ui line 92
+#: rc.cpp:2867
 #, no-c-format
-msgid "Insert files with the following &mask:"
-msgstr "用下列通配符插入文件(&M)："
+msgid "&Role:"
+msgstr "角色(&R)："
 
-#. i18n: file ./project/projectnewlocals.ui line 175
-#: rc.cpp:2883
+#. i18n: file ./project/membereditdlgs.ui line 103
+#: rc.cpp:2870
 #, no-c-format
-msgid "Insert onl&y markup, script and image files"
-msgstr "仅插入标记语言、脚本和图像文件(&Y)"
+msgid "&Email:"
+msgstr "电子邮件(&E)："
 
-#. i18n: file ./project/projectnewlocals.ui line 236
-#: rc.cpp:2886
+#. i18n: file ./project/subprojecteditdlgs.ui line 35
+#: rc.cpp:2879
 #, no-c-format
-msgid "&Add Files..."
-msgstr "添加文件(&A)..."
+msgid "The relative path of the subproject folder inside the project."
+msgstr ""
 
-#. i18n: file ./project/projectnewlocals.ui line 244
-#: rc.cpp:2889
+#. i18n: file ./project/subprojecteditdlgs.ui line 48
+#: rc.cpp:2882
 #, no-c-format
-msgid "A&dd Folder..."
-msgstr "添加文件夹(&D)..."
+msgid "&Location:"
+msgstr "位置(&L)："
 
-#. i18n: file ./project/projectnewlocals.ui line 252
-#: rc.cpp:2892
+#. i18n: file ./project/subprojecteditdlgs.ui line 59
+#: rc.cpp:2885
 #, no-c-format
-msgid "&Clear List"
-msgstr "清除列表(&C)"
+msgid "&Create new subproject"
+msgstr "创建新子工程(&C)"
 
-#. i18n: file ./project/projectnewgenerals.ui line 121
-#: rc.cpp:2895
+#. i18n: file ./project/subprojecteditdlgs.ui line 62
+#: rc.cpp:2888
 #, no-c-format
-msgid "Directory Settings"
-msgstr "目录设置"
+msgid ""
+"Check this if you want to create a new subproject with the above entered data."
+msgstr ""
 
-#. i18n: file ./project/projectnewgenerals.ui line 137
-#: rc.cpp:2898
+#. i18n: file ./project/projectuploads.ui line 40
+#: rc.cpp:2891
 #, no-c-format
-msgid "Templates directory:"
-msgstr "模板目录："
+msgid "Upload Project Files"
+msgstr "上传工程文件"
 
-#. i18n: file ./project/projectnewgenerals.ui line 170
-#: rc.cpp:2904
+#. i18n: file ./project/projectuploads.ui line 62
+#: rc.cpp:2894 rc.cpp:3023
 #, no-c-format
-msgid "Toolbars directory:"
-msgstr "工具栏目录："
+msgid "Profile &name:"
+msgstr "配置文件名(&N)："
 
-#. i18n: file ./project/projectnewgenerals.ui line 220
-#: rc.cpp:2913
+#. i18n: file ./project/projectuploads.ui line 103
+#: rc.cpp:2897
 #, no-c-format
-msgid "Main directory:"
-msgstr "主目录："
+msgid "New..."
+msgstr "新建..."
 
-#. i18n: file ./project/projectnewgenerals.ui line 240
-#: rc.cpp:2916
+#. i18n: file ./project/projectuploads.ui line 111
+#: rc.cpp:2900
 #, no-c-format
-msgid "Project Sources"
-msgstr "工程源"
+msgid "Edit..."
+msgstr "编辑..."
 
-#. i18n: file ./project/projectnewgenerals.ui line 257
-#: rc.cpp:2919
+#. i18n: file ./project/projectuploads.ui line 137
+#: rc.cpp:2906
 #, no-c-format
-msgid "&Add local or remote files"
-msgstr "添加本地或远程文件(&A)"
+msgid "&Proceed"
+msgstr "继续(&P)"
 
-#. i18n: file ./project/projectnewgenerals.ui line 268
-#: rc.cpp:2922
+#. i18n: file ./project/projectuploads.ui line 187
+#: rc.cpp:2912
 #, no-c-format
-msgid "&Use wget to download files from a site"
-msgstr "使用 wget 从站点下载文件(&U)"
+msgid "&Keep passwords in memory"
+msgstr "在内存中保留密码(&K)"
 
-#. i18n: file ./project/projectnewgenerals.ui line 297
-#: rc.cpp:2931
+#. i18n: file ./project/projectuploads.ui line 233
+#: rc.cpp:2921
 #, no-c-format
-msgid "Server Settings"
-msgstr "服务器设置"
+msgid "C&ollapse All"
+msgstr "全部折叠(&O)"
 
-#. i18n: file ./project/projectnewgenerals.ui line 308
-#: rc.cpp:2934
+#. i18n: file ./project/projectuploads.ui line 241
+#: rc.cpp:2924
 #, no-c-format
-msgid "Protocol: "
-msgstr "协议："
+msgid "U&pdate All"
+msgstr "全部更新(&P)"
 
-#. i18n: file ./project/projectnewgenerals.ui line 321
-#: rc.cpp:2937
+#. i18n: file ./project/projectuploads.ui line 244
+#: rc.cpp:2927
 #, no-c-format
-msgid "Password:"
-msgstr "密码："
+msgid "This will cause all files to appear already uploaded"
+msgstr "这将导致所有文件看上去都已上传"
 
-#. i18n: file ./project/projectnewgenerals.ui line 343
-#: project/projectnewgeneral.cpp:65 project/projectnewgeneral.cpp:129
-#: project/projectnewgeneral.cpp:203 project/projectprivate.cpp:739
-#: rc.cpp:2940
+#. i18n: file ./project/projectuploads.ui line 252
+#: rc.cpp:2930
 #, no-c-format
-msgid "Local"
-msgstr "本地"
+msgid "&Modified"
+msgstr "已修改(&M)"
 
-#. i18n: file ./project/projectnewgenerals.ui line 382
-#: rc.cpp:2943
+#. i18n: file ./project/projectuploads.ui line 289
+#: rc.cpp:2936
 #, no-c-format
-msgid "Port:"
-msgstr "端口："
+msgid "Selection:"
+msgstr "选中内容："
 
-#. i18n: file ./project/projectnewgenerals.ui line 398
-#: rc.cpp:2946
+#. i18n: file ./project/projectuploads.ui line 313
+#: rc.cpp:2942
 #, no-c-format
-msgid "Host:"
-msgstr "主机："
+msgid "Mark the selected files as uploaded instead of uploading them"
+msgstr ""
 
-#. i18n: file ./project/projectnewgenerals.ui line 409
-#: rc.cpp:2949
+#. i18n: file ./project/projectuploads.ui line 339
+#: rc.cpp:2945
 #, no-c-format
-msgid "User:"
-msgstr "用户："
+msgid "Current: [none]"
+msgstr "当前：[无]"
+
+#. i18n: file ./project/projectuploads.ui line 358
+#: project/projectupload.cpp:235 rc.cpp:2948
+#, no-c-format
+msgid "Total:"
+msgstr "总计："
+
+#. i18n: file ./project/projectnewfinals.ui line 121
+#: rc.cpp:2951
+#, no-c-format
+msgid "Prefix:"
+msgstr "前缀："
+
+#. i18n: file ./project/projectnewfinals.ui line 151
+#: rc.cpp:2957
+#, no-c-format
+msgid "Default DTD:"
+msgstr "默认 DTD："
+
+#. i18n: file ./project/projectnewfinals.ui line 170
+#: rc.cpp:2960
+#, no-c-format
+msgid "Default encoding:"
+msgstr "默认编码："
+
+#. i18n: file ./project/projectnewfinals.ui line 185
+#: rc.cpp:2963
+#, no-c-format
+msgid "Insert &local templates"
+msgstr "插入本地模板(&L)"
+
+#. i18n: file ./project/projectnewfinals.ui line 193
+#: rc.cpp:2966
+#, no-c-format
+msgid "Insert &global templates"
+msgstr "插入全局模板(&G)"
+
+#. i18n: file ./project/projectnewfinals.ui line 201
+#: rc.cpp:2969
+#, no-c-format
+msgid "Use preview prefi&x"
+msgstr "使用预览前缀(&X)"
+
+#. i18n: file ./project/projectnewfinals.ui line 209
+#: ../lib/compatibility/knewstuff/uploaddialog.cpp:62 rc.cpp:2972
+#, no-c-format
+msgid "Author:"
+msgstr "作者："
+
+#. i18n: file ./project/projectnewfinals.ui line 264
+#: rc.cpp:2975
+#, no-c-format
+msgid "Email:"
+msgstr "电子邮件："
 
 #. i18n: file ./project/eventconfigurationdlgs.ui line 24
-#: rc.cpp:2952
+#: rc.cpp:2978
 #, no-c-format
 msgid "Ena&ble the event actions"
 msgstr "启用事件动作(&B)"
 
 #. i18n: file ./project/eventconfigurationdlgs.ui line 35
-#: rc.cpp:2955
+#: rc.cpp:2981
 #, no-c-format
 msgid "Configure Events"
 msgstr "配置事件"
 
 #. i18n: file ./project/eventconfigurationdlgs.ui line 46
-#: rc.cpp:2958
+#: rc.cpp:2984
 #, no-c-format
 msgid "&Add"
 msgstr "添加(&A)"
 
 #. i18n: file ./project/eventconfigurationdlgs.ui line 77
-#: rc.cpp:2964
+#: rc.cpp:2990
 #, no-c-format
 msgid "Event"
 msgstr "事件"
 
 #. i18n: file ./project/eventconfigurationdlgs.ui line 88
-#: rc.cpp:2967
+#: rc.cpp:2993
 #, no-c-format
 msgid "Action"
 msgstr "动作"
 
 #. i18n: file ./project/eventconfigurationdlgs.ui line 99
-#: rc.cpp:2970
+#: rc.cpp:2996
 #, no-c-format
 msgid "Argument 1"
 msgstr "参数 1"
 
 #. i18n: file ./project/eventconfigurationdlgs.ui line 110
-#: rc.cpp:2973
+#: rc.cpp:2999
 #, no-c-format
 msgid "Argument 2"
 msgstr "参数 2"
 
 #. i18n: file ./project/eventconfigurationdlgs.ui line 121
-#: rc.cpp:2976
+#: rc.cpp:3002
 #, no-c-format
 msgid "Argument 3"
 msgstr "参数 3"
 
 #. i18n: file ./project/eventconfigurationdlgs.ui line 132
-#: rc.cpp:2979
+#: rc.cpp:3005
 #, no-c-format
 msgid "Argument 4"
 msgstr "参数 4"
 
-#. i18n: file ./project/projectoptions.ui line 33
-#: rc.cpp:2985
-#, no-c-format
-msgid "Project Options"
-msgstr "工程选项"
-
-#. i18n: file ./project/projectoptions.ui line 188
-#: rc.cpp:2994
+#. i18n: file ./project/uploadprofiledlgs.ui line 26
+#: project/uploadprofiles.cpp:90 rc.cpp:3011
 #, no-c-format
-msgid "Project &name:"
-msgstr "工程名称(&N)："
+msgid "Upload Profile"
+msgstr "上传配置文件"
 
-#. i18n: file ./project/projectoptions.ui line 199
-#: rc.cpp:2997
+#. i18n: file ./project/uploadprofiledlgs.ui line 42
+#: rc.cpp:3014
 #, no-c-format
-msgid "&Templates folder:"
-msgstr "模板文件夹(&T)："
+msgid "&Host:"
+msgstr "主机(&H)："
 
-#. i18n: file ./project/projectoptions.ui line 216
-#: rc.cpp:3000
+#. i18n: file ./project/uploadprofiledlgs.ui line 53
+#: rc.cpp:3017
 #, no-c-format
-msgid "T&oolbars folder:"
-msgstr "工具栏文件夹(&O)："
+msgid "&User:"
+msgstr "用户(&U)："
 
-#. i18n: file ./project/projectoptions.ui line 235
-#: rc.cpp:3003
+#. i18n: file ./project/uploadprofiledlgs.ui line 64
+#: rc.cpp:3020
 #, no-c-format
-msgid "&Author:"
-msgstr "作者(&A)："
+msgid "Pa&th:"
+msgstr "路径(&T)："
 
-#. i18n: file ./project/projectoptions.ui line 254
-#: rc.cpp:3006
+#. i18n: file ./project/uploadprofiledlgs.ui line 86
+#: rc.cpp:3026
 #, no-c-format
-msgid "E&mail:"
-msgstr "电子邮件(&M)："
+msgid "Use as &default profile"
+msgstr "用为默认配置文件(&D)"
 
-#. i18n: file ./project/projectoptions.ui line 295
-#: rc.cpp:3015
+#. i18n: file ./project/uploadprofiledlgs.ui line 107
+#: rc.cpp:3029
 #, no-c-format
-msgid "Default &view:"
-msgstr "默认视图(&V)："
+msgid "Pass&word:"
+msgstr "密码(&W)："
 
-#. i18n: file ./project/projectoptions.ui line 312
-#: rc.cpp:3018
+#. i18n: file ./project/uploadprofiledlgs.ui line 213
+#: rc.cpp:3038
 #, no-c-format
-msgid "Default &encoding:"
-msgstr "默认编码(&E)："
+msgid "Po&rt:"
+msgstr "端口(&R)："
 
-#. i18n: file ./project/projectoptions.ui line 343
-#: rc.cpp:3024
+#. i18n: file ./project/uploadprofiledlgs.ui line 232
+#: rc.cpp:3041
 #, no-c-format
-msgid "E&xclude from project:"
-msgstr "从工程中排除(&X)："
+msgid "&Store password on disc"
+msgstr "在磁盘中保存密码(&S)"
 
-#. i18n: file ./project/projectoptions.ui line 354
-#: rc.cpp:3027
-#, no-c-format
-msgid "Exclude &files listed in .cvsignore"
-msgstr "排除在 .cvsignore 中列出的文件(&F)"
+#. i18n: file ./project/uploadprofiledlgs.ui line 238
+#: rc.cpp:3044
+#, fuzzy, no-c-format
+msgid "Keep the password in a file. DANGEROUS! Read the \"What's This?\" text."
+msgstr "在文件中保存密码。小心！请阅读这是什么文本。"
 
-#. i18n: file ./project/projectoptions.ui line 358
-#: rc.cpp:3030
+#. i18n: file ./project/uploadprofiledlgs.ui line 243
+#: rc.cpp:3047
 #, no-c-format
 msgid ""
-"The files listed in <i>.cvsignore</i> files will not appear in the project "
-"tree, nor will be shown when you rescan the project folder or upload the "
-"project. Files matching the <i>.cvsignore</i> entries that were already present "
-"in the project will be removed from it, but they will not be removed from the "
-"disc."
+"<qt>If you check this box, the password will be saved in the local Quanta "
+"configuration file, so every time you start Quanta and load this project, the "
+"password will be loaded and you don't have to enter it. Altough the local "
+"configuration file is readable only by you and the password\n"
+"is obscured, saving the password in any file is a security risk. Use this "
+"option at your own risk."
 "<br>\n"
-"<b>NOTE:</b> This feature works only for local projects."
+"<i>Note:</i> due to the security concerns, the password is not present in the "
+"project file, and moving the project files to another computer or uploading the "
+"project to a server will not move/upload the password to the new place.</qt>"
 msgstr ""
 
-#. i18n: file ./project/projectoptions.ui line 374
-#: rc.cpp:3034
-#, no-c-format
-msgid "Debugger"
-msgstr "调试器"
-
-#. i18n: file ./project/projectoptions.ui line 385
-#: rc.cpp:3037
-#, no-c-format
-msgid "Debu&gger:"
-msgstr "调试器(&G)："
-
-#. i18n: file ./project/projectoptions.ui line 420
-#: rc.cpp:3040
-#, no-c-format
-msgid "Optio&ns"
-msgstr "选项(&N)"
-
-#. i18n: file ./project/projectoptions.ui line 428
-#: rc.cpp:3043
-#, no-c-format
-msgid "Remember &breakpoints across sessions"
-msgstr "在不同的会话中记住断点(&B)"
-
-#. i18n: file ./project/projectoptions.ui line 436
-#: rc.cpp:3046
-#, no-c-format
-msgid "Remember watches across sessions"
-msgstr "在不同的会话中记住监视"
-
-#. i18n: file ./project/projectoptions.ui line 449
-#: rc.cpp:3049
-#, no-c-format
-msgid "Use persistent boo&kmarks"
-msgstr "使用永久书签(&K)"
-
-#. i18n: file ./project/projectoptions.ui line 465
+#. i18n: file ./project/uploadprofiledlgs.ui line 264
 #: rc.cpp:3052
 #, no-c-format
-msgid "&Use preview prefix:"
-msgstr "使用预览前缀(&U)："
+msgid "&Protocol:"
+msgstr "协议(&P)："
 
 #. i18n: file ./data/config/quantaui.rc line 13
 #: rc.cpp:3058
@@ -4664,327 +4664,403 @@ msgstr "插件(&G)"
 msgid "T&ools"
 msgstr "工具(&O)"
 
-#. i18n: file ./data/config/quantaui.rc line 192
+#. i18n: file ./data/config/quantaui.rc line 189
 #: rc.cpp:3106
 #, no-c-format
 msgid "Editor Toolbar"
 msgstr "编辑器工具栏"
 
-#. i18n: file ./data/config/quantaui.rc line 200
+#. i18n: file ./data/config/quantaui.rc line 197
 #: rc.cpp:3109
 #, no-c-format
 msgid "Plugins Toolbar"
 msgstr "插件工具栏"
 
-#. i18n: file ./data/config/quantaui.rc line 207
+#. i18n: file ./data/config/quantaui.rc line 204
 #: rc.cpp:3112
 #, no-c-format
 msgid "Navigation Toolbar"
 msgstr "导航工具栏"
 
-#. i18n: file ./data/config/quantaui.rc line 230
+#. i18n: file ./data/config/quantaui.rc line 227
 #: rc.cpp:3115
 #, no-c-format
 msgid "&Debug"
 msgstr "调试(&D)"
 
-#. i18n: file ./data/config/quantaui.rc line 232
+#. i18n: file ./data/config/quantaui.rc line 229
 #: rc.cpp:3118
 #, no-c-format
 msgid "Session"
 msgstr "会话"
 
-#. i18n: file ./data/config/quantaui.rc line 237
+#. i18n: file ./data/config/quantaui.rc line 234
 #: rc.cpp:3121
 #, no-c-format
 msgid "&Execution"
 msgstr "执行(&E)"
 
-#. i18n: file ./data/config/quantaui.rc line 252
+#. i18n: file ./data/config/quantaui.rc line 249
 #: rc.cpp:3124
 #, no-c-format
 msgid "&Breakpoints"
 msgstr "断点(&B)"
 
-#. i18n: file ./data/config/quantaui.rc line 258
+#. i18n: file ./data/config/quantaui.rc line 255
 #: rc.cpp:3127
 #, no-c-format
 msgid "&Variables"
 msgstr "变量(&V)"
 
-#. i18n: file ./data/config/quantaui.rc line 263
+#. i18n: file ./data/config/quantaui.rc line 260
 #: rc.cpp:3130
 #, fuzzy, no-c-format
 msgid "&Profiler"
 msgstr "上传配置文件(&L)"
 
-#. i18n: file ./data/config/quantaui.rc line 268
+#. i18n: file ./data/config/quantaui.rc line 265
 #: rc.cpp:3133
 #, no-c-format
 msgid "Debugger Toolbar"
 msgstr "调试器工具栏"
 
-#. i18n: file ./data/config/quantaui.rc line 287
+#. i18n: file ./data/config/quantaui.rc line 284
 #: rc.cpp:3136
 #, no-c-format
 msgid "Project Toolbar"
 msgstr "工程工具栏"
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 16
+#. i18n: file ./scripts/meinproc.kmdr line 18
 #: rc.cpp:3139
 #, no-c-format
-msgid "Quanta Script Info Generator"
-msgstr "Quanta 脚本信息生成器"
-
-#. i18n: file ./scripts/scriptinfo.kmdr line 37
-#: rc.cpp:3142
-#, no-c-format
-msgid "Enter Info"
-msgstr "输入信息"
+msgid "Quanta+: meinproc"
+msgstr "Quanta+: meinproc"
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 61
-#: rc.cpp:3145
+#. i18n: file ./scripts/meinproc.kmdr line 54
+#: rc.cpp:3145 rc.cpp:3568
 #, no-c-format
-msgid "Please fill in all fields"
-msgstr "请填入全部域"
+msgid "&Process"
+msgstr "处理(&P)"
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 69
+#. i18n: file ./scripts/meinproc.kmdr line 146
 #: rc.cpp:3148
 #, no-c-format
-msgid "Script name:"
-msgstr "脚本名称："
+msgid "Current working folder &in Quanta"
+msgstr "Quanta 的当前工作文件夹(&I)"
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 90
-#: rc.cpp:3151
+#. i18n: file ./scripts/meinproc.kmdr line 206
+#: rc.cpp:3151 rc.cpp:3328
 #, no-c-format
-msgid "Enter the script name with the extension"
-msgstr "输入带扩展名的脚本名称"
+msgid "Other folder:"
+msgstr "其它文件夹："
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 98
+#. i18n: file ./scripts/meinproc.kmdr line 249
 #: rc.cpp:3154
 #, no-c-format
-msgid "About script:"
-msgstr "关于脚本："
+msgid "View in &Konqueror"
+msgstr "在 Konqueror 中查看(&K)"
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 111
+#. i18n: file ./scripts/tablewizard.kmdr line 18
 #: rc.cpp:3157
 #, no-c-format
-msgid "Formatting may be done with XHTML tags"
-msgstr "格式化可通过 XHTML 标签完成"
-
-#. i18n: file ./scripts/scriptinfo.kmdr line 119
-#: rc.cpp:3160
-#, no-c-format
-msgid "http://"
-msgstr "http://"
+msgid "Docbook Table Wizard"
+msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 127
+#. i18n: file ./scripts/tablewizard.kmdr line 63
 #: rc.cpp:3163
 #, no-c-format
-msgid "The location of your up-to-date file on the web"
+msgid ""
+"Click here to cancel the creation of the table. No action will be performed."
 msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 135
-#: rc.cpp:3166
-#, no-c-format
-msgid "Script author:"
-msgstr "脚本作者："
-
-#. i18n: file ./scripts/scriptinfo.kmdr line 143
+#. i18n: file ./scripts/tablewizard.kmdr line 98
 #: rc.cpp:3169
 #, no-c-format
-msgid "Script license:"
-msgstr "脚本许可："
+msgid "Press this button to create the table or informaltable."
+msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 159
+#. i18n: file ./scripts/tablewizard.kmdr line 125
 #: rc.cpp:3172
 #, no-c-format
-msgid "Select the directory to write the .info file to"
-msgstr "选择要写入 .info 文件的目录"
+msgid "Table Options"
+msgstr "表格选项"
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 165
-#: rc.cpp:3175
+#. i18n: file ./scripts/tablewizard.kmdr line 133
+#: rc.cpp:3175 rc.cpp:3187 rc.cpp:3199
 #, no-c-format
-msgid "GPL-2"
-msgstr "GPL2"
+msgid ""
+"Enter here the id of the table or informaltable. You can use the id to link or "
+"reference to the table or informaltable elsewhere in the document."
+msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 170
-#: ../lib/compatibility/knewstuff/uploaddialog.cpp:83 rc.cpp:3178
+#. i18n: file ./scripts/tablewizard.kmdr line 164
+#: rc.cpp:3178
 #, no-c-format
-msgid "LGPL"
-msgstr "LGPL"
+msgid "Number of columns:"
+msgstr "列数："
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 175
-#: ../lib/compatibility/knewstuff/uploaddialog.cpp:84 rc.cpp:3181
+#. i18n: file ./scripts/tablewizard.kmdr line 167
+#: rc.cpp:3181 rc.cpp:3217
 #, no-c-format
-msgid "BSD"
-msgstr "BSD"
+msgid ""
+"Select or enter in this spin box the number of columns that should be created "
+"by the wizard."
+msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 180
+#. i18n: file ./scripts/tablewizard.kmdr line 175
 #: rc.cpp:3184
+#, fuzzy, no-c-format
+msgid "Table id:"
+msgstr "表格数据(&D)："
+
+#. i18n: file ./scripts/tablewizard.kmdr line 189
+#: rc.cpp:3190
 #, no-c-format
-msgid "Public Domain"
-msgstr "公共域"
+msgid "&Add table header"
+msgstr "插入表头(&A)"
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 185
-#: rc.cpp:3187 rc.cpp:4838
+#. i18n: file ./scripts/tablewizard.kmdr line 203
+#: rc.cpp:3193
 #, no-c-format
-msgid "Other"
-msgstr "其它"
+msgid ""
+"Check this box to create a table header. The table header is the first row of "
+"the table, and has the same number of entries as the other rows."
+msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 200
-#: rc.cpp:3190
+#. i18n: file ./scripts/tablewizard.kmdr line 211
+#: rc.cpp:3196
+#, fuzzy, no-c-format
+msgid "table_id"
+msgstr "名称"
+
+#. i18n: file ./scripts/tablewizard.kmdr line 243
+#: rc.cpp:3202 rc.cpp:3208
 #, no-c-format
-msgid "If other include in about"
+msgid ""
+"Select or enter in this spin box the number of rows that should be created by "
+"the wizard. After using the wizard, you can add (or remove) more rows. To add "
+"more rows,  add the same number of <entry> tags per <row> "
+"tag as in the rest of the table."
 msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 208
-#: rc.cpp:3193
+#. i18n: file ./scripts/tablewizard.kmdr line 251
+#: rc.cpp:3205
 #, no-c-format
-msgid "Editor/Executor:"
-msgstr "编辑器/执行器："
+msgid "Number of rows:"
+msgstr "行数："
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 216
-#: rc.cpp:3196
+#. i18n: file ./scripts/tablewizard.kmdr line 265
+#: rc.cpp:3211
 #, no-c-format
-msgid "Author email:"
-msgstr "作者邮件："
+msgid "Table title:"
+msgstr "表格标题："
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 224
-#: rc.cpp:3199
+#. i18n: file ./scripts/tablewizard.kmdr line 268
+#: rc.cpp:3214 rc.cpp:3223
 #, no-c-format
-msgid "Web address:"
-msgstr "Web 地址："
+msgid ""
+"Enter here the title of the table. The title of the table will appear in the "
+"table of contents as well, under the \"List of Tables\", if you are using the "
+"KDE DocBook tools."
+msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 232
-#: rc.cpp:3202
+#. i18n: file ./scripts/tablewizard.kmdr line 300
+#: rc.cpp:3220
 #, no-c-format
-msgid "Version number:"
-msgstr "版本号："
+msgid "Table Title"
+msgstr "表格标题"
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 273
-#: rc.cpp:3205
+#. i18n: file ./scripts/tablewizard.kmdr line 320
+#: rc.cpp:3226
 #, no-c-format
-msgid "kmdr-editor"
-msgstr "kmdr-editor"
+msgid "Table Type"
+msgstr "表格类型"
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 278
-#: rc.cpp:3208
+#. i18n: file ./scripts/tablewizard.kmdr line 337
+#: rc.cpp:3229
 #, no-c-format
-msgid "kwrite"
-msgstr "kwrite"
+msgid "ta&ble"
+msgstr "ta&ble"
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 283
-#: rc.cpp:3211
+#. i18n: file ./scripts/tablewizard.kmdr line 358
+#: rc.cpp:3232
 #, no-c-format
-msgid "kate"
-msgstr "kate"
+msgid "Select this option to generate a formal table (table)."
+msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 288
-#: rc.cpp:3214
+#. i18n: file ./scripts/tablewizard.kmdr line 369
+#: rc.cpp:3235
 #, no-c-format
-msgid "tdevelop"
-msgstr "tdevelop"
+msgid "&informaltable"
+msgstr "&informaltable"
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 303
-#: rc.cpp:3217
+#. i18n: file ./scripts/tablewizard.kmdr line 389
+#: rc.cpp:3238
 #, no-c-format
-msgid "Optional: Editor other than Quanta to use for this script"
-msgstr "可选：此脚本使用 Quanta 以外的编辑器"
+msgid "Select this option to generate an informal table (informaltable)."
+msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 314
-#: rc.cpp:3220
+#. i18n: file ./scripts/tablewizard.kmdr line 409
+#: rc.cpp:3241
 #, no-c-format
-msgid "kmdr-executor -c quanta"
-msgstr "kmdr-executor -c quanta"
+msgid ""
+"<qt>\n"
+"Select the table type:\n"
+"<ul>\n"
+"<li><b>informaltable:</b> the most used table type in KDE docs. A informaltable "
+"does not contain title, table head or entry in the table of contents.</li>\n"
+"<li><b>table:</b> a complete and formal table type, including title, table head "
+"and entry in the table of contents.</li>\n"
+"</ul>\n"
+"</qt>"
+msgstr ""
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 319
-#: rc.cpp:3223
+#. i18n: file ./scripts/xmlval.kmdr line 18
+#: rc.cpp:3250
 #, no-c-format
-msgid "kmdr-executor"
-msgstr "kmdr-executor"
+msgid "Quanta+ XML Validator"
+msgstr "Quanta+ XML 校验器"
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 324
-#: rc.cpp:3226
+#. i18n: file ./scripts/xmlval.kmdr line 92
+#: rc.cpp:3253
 #, no-c-format
-msgid "perl"
-msgstr "perl"
+msgid "C&urrent file"
+msgstr "当前文件(&U)"
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 329
-#: rc.cpp:3229
+#. i18n: file ./scripts/xmlval.kmdr line 155
+#: rc.cpp:3256
 #, no-c-format
-msgid "php"
-msgstr "php"
+msgid "Other file:"
+msgstr "其它文件："
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 344
-#: rc.cpp:3232
+#. i18n: file ./scripts/xmlval.kmdr line 209
+#: rc.cpp:3259
 #, no-c-format
-msgid "Optional: External program executor"
-msgstr "可选：外部程序执行器"
+msgid "Validate against:"
+msgstr "校验标准："
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 352
-#: rc.cpp:3235 rc.cpp:3749
+#. i18n: file ./scripts/xmlval.kmdr line 232
+#: rc.cpp:3262
 #, no-c-format
-msgid "Script location:"
-msgstr "脚本位置："
+msgid "DTD (Internal)"
+msgstr "DTD (内部)"
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 360
-#: rc.cpp:3238
+#. i18n: file ./scripts/xmlval.kmdr line 237
+#: rc.cpp:3265
 #, no-c-format
-msgid "Write File"
-msgstr "写文件"
+msgid "DTD (External)"
+msgstr "DTD (外部)"
 
-#. i18n: file ./scripts/scriptinfo.kmdr line 431
-#: rc.cpp:3244
+#. i18n: file ./scripts/xmlval.kmdr line 242
+#: rc.cpp:3268
 #, no-c-format
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /></head>"
-"<body style=\"font-size:11pt;font-family:sans-serif\">\n"
-"<p style=\"margin-top:16px\"><span style=\"font-weight:600\">"
-"Quanta Plus Submitter Info Files</span></p>\n"
-"<p>The purpose of these files is to provide developers with proper credit, "
-"expose licensing information and give users thumbnail information about scripts "
-"and templates at a glance. We ask that you try to do several things here.</p>\n"
-"<ul type=\"disc\">"
-"<li>Fill in all the fields. They are all there for a reason.</li>\n"
-"<li>Contact the appropriate Quanta script and template maintainer or a member "
-"of our team when you have new releases so we can include them. As we plan to "
-"build a huge repository we have to rely on you here.</li></ul>\n"
-"<p>The additional information serves as a backup. Any time a user wants they "
-"can click the link to go to your site and get updates, docs or whatever they "
-"require. Thank you for helping us to make this a great feature</p>\n"
-"<p align=\"center\" style=\"margin-top:14px\"><span style=\"font-weight:600\">"
-"Contact Information</span></p>\n"
-"<p align=\"center\">Quanta Resource Maintainer - (none at this time)<br />"
-"Lead Developer - Andras Mantia <a "
-"href=\"mailto:amantia@kde.org?subject=ScriptInfo\">amantia@kde.org</a><br />"
-"Kommander - Michal Rudolf <a "
-"href=\"mailto:mrudolf@kdewebdev.org?subject=ScriptInfo\">"
-"mrudolf@kdewebdev.org</a><br />Project Lead - Eric Laffoon <a "
-"href=\"mailto:sequitur@kde.org?subject=ScriptInfo\">sequitur@kde.org</a></p>\n"
-"</body></html>\n"
+msgid "XML Schema"
+msgstr "XML 大纲"
+
+#. i18n: file ./scripts/xmlval.kmdr line 247
+#: rc.cpp:3271 rc.cpp:3277
+#, no-c-format
+msgid "RelaxNG Schema"
+msgstr "RelaxNG 大纲"
+
+#. i18n: file ./scripts/xmlval.kmdr line 291
+#: rc.cpp:3274
+#, no-c-format
+msgid "DTD"
+msgstr "DTD"
+
+#. i18n: file ./scripts/xmlval.kmdr line 293
+#: rc.cpp:3280
+#, no-c-format
+msgid "W3C XML Schema"
+msgstr "W3C XML 大纲"
+
+#. i18n: file ./scripts/xmlval.kmdr line 318
+#: rc.cpp:3283
+#, no-c-format
+msgid "Well-formed checking &only"
 msgstr ""
 
+#. i18n: file ./scripts/xmlval.kmdr line 374
+#: rc.cpp:3286
+#, no-c-format
+msgid "Definition URI:"
+msgstr "定义 URI："
+
+#. i18n: file ./scripts/xmlval.kmdr line 416
+#: rc.cpp:3289 rc.cpp:3319
+#, no-c-format
+msgid "&Validate"
+msgstr "校验(&V)"
+
+#. i18n: file ./scripts/xsltproc.kmdr line 18
+#: rc.cpp:3295
+#, no-c-format
+msgid "Quanta+: xsltproc"
+msgstr "Quanta+: xsltproc"
+
+#. i18n: file ./scripts/xsltproc.kmdr line 66
+#: rc.cpp:3298
+#, no-c-format
+msgid "&Translate"
+msgstr "翻译(&T)"
+
+#. i18n: file ./scripts/xsltproc.kmdr line 143
+#: rc.cpp:3304
+#, no-c-format
+msgid "Current file"
+msgstr "当前文件"
+
+#. i18n: file ./scripts/xsltproc.kmdr line 184
+#: rc.cpp:3307
+#, no-c-format
+msgid "File location:"
+msgstr "文件位置："
+
+#. i18n: file ./scripts/xsltproc.kmdr line 221
+#: rc.cpp:3310
+#, no-c-format
+msgid "Stylesheet location:"
+msgstr "样式表位置："
+
+#. i18n: file ./scripts/xsltproc.kmdr line 255
+#: rc.cpp:3313
+#, no-c-format
+msgid "Output file name:"
+msgstr "输出文件名："
+
+#. i18n: file ./scripts/checkxml.kmdr line 18
+#: rc.cpp:3316
+#, fuzzy, no-c-format
+msgid "Quanta+ KDE XML Validator"
+msgstr "Quanta+ TDE XML 校验程序"
+
+#. i18n: file ./scripts/checkxml.kmdr line 184
+#: rc.cpp:3325
+#, no-c-format
+msgid "C&urrent working folder"
+msgstr "当前工作文件夹(&U)"
+
 #. i18n: file ./scripts/tidy.kmdr line 16
-#: rc.cpp:3256
+#: rc.cpp:3331
 #, no-c-format
 msgid "Tidy by Kommander"
 msgstr "由 Kommander 处理"
 
 #. i18n: file ./scripts/tidy.kmdr line 37
-#: rc.cpp:3259
+#: rc.cpp:3334
 #, no-c-format
 msgid "General Options"
 msgstr "常规选项"
 
 #. i18n: file ./scripts/tidy.kmdr line 54
-#: rc.cpp:3262
+#: rc.cpp:3337
 #, no-c-format
 msgid "Non Tidy Option"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 78
-#: rc.cpp:3265
+#: rc.cpp:3340
 #, no-c-format
 msgid ""
 "Note:  This will not work well if you have multiple\n"
@@ -4992,253 +5068,253 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 86
-#: rc.cpp:3269
+#: rc.cpp:3344
 #, no-c-format
 msgid "Use DCOP to send active page from Quanta+ to tidy"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 116
-#: rc.cpp:3272
+#: rc.cpp:3347
 #, no-c-format
 msgid "Path to tidy (required):"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 137
-#: rc.cpp:3275
+#: rc.cpp:3350
 #, fuzzy, no-c-format
 msgid "Input from file instead of stdin:"
 msgstr "输出到文件而不是 stdout"
 
 #. i18n: file ./scripts/tidy.kmdr line 152
-#: rc.cpp:3278
+#: rc.cpp:3353
 #, fuzzy, no-c-format
 msgid "Write errors to file instead of stderr:"
 msgstr "输出到文件而不是 stdout"
 
 #. i18n: file ./scripts/tidy.kmdr line 167
-#: rc.cpp:3281
+#: rc.cpp:3356
 #, no-c-format
 msgid "Use configuration from file:"
 msgstr "使用文件中的配置："
 
 #. i18n: file ./scripts/tidy.kmdr line 182
-#: rc.cpp:3284
+#: rc.cpp:3359
 #, no-c-format
 msgid "Output to file instead of stdout:"
 msgstr "输出到文件而不是 stdout："
 
 #. i18n: file ./scripts/tidy.kmdr line 226
-#: rc.cpp:3287
+#: rc.cpp:3362
 #, no-c-format
 msgid "Modify original input files"
 msgstr "修改原始的输入文件"
 
 #. i18n: file ./scripts/tidy.kmdr line 251
-#: rc.cpp:3290
+#: rc.cpp:3365
 #, no-c-format
 msgid "/usr/bin"
 msgstr "/usr/bin"
 
 #. i18n: file ./scripts/tidy.kmdr line 266
-#: rc.cpp:3293
+#: rc.cpp:3368
 #, no-c-format
 msgid "Processing Directives"
 msgstr "处理指令"
 
 #. i18n: file ./scripts/tidy.kmdr line 297
-#: rc.cpp:3296
+#: rc.cpp:3371
 #, no-c-format
 msgid "Force XHTML to well-formed HTML"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 312
-#: rc.cpp:3299
+#: rc.cpp:3374
 #, no-c-format
 msgid "Convert HTML to well-formed XHTML"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 327
-#: rc.cpp:3302
+#: rc.cpp:3377
 #, no-c-format
 msgid "Replace FONT, NOBR and CENTER tags by CSS"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 342
-#: rc.cpp:3305
+#: rc.cpp:3380
 #, no-c-format
 msgid "Force tags to upper case"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 357
-#: rc.cpp:3308
+#: rc.cpp:3383
 #, no-c-format
 msgid "Specify the input is well-formed XML"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 372
-#: rc.cpp:3311
+#: rc.cpp:3386
 #, fuzzy, no-c-format
 msgid "Omit optional end tags"
 msgstr "自动关闭可选标签(&O)"
 
 #. i18n: file ./scripts/tidy.kmdr line 387
-#: rc.cpp:3314
+#: rc.cpp:3389
 #, no-c-format
 msgid "Do extra accessibility checks <level>:"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 411
-#: rc.cpp:3317
+#: rc.cpp:3392
 #, no-c-format
 msgid "Output numeric rather than named entities"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 426
-#: rc.cpp:3320
+#: rc.cpp:3395
 #, no-c-format
 msgid "Only show errors"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 451
-#: rc.cpp:3323
+#: rc.cpp:3398
 #, no-c-format
 msgid "Wrap text at column:"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 459
-#: rc.cpp:3326
+#: rc.cpp:3401
 #, no-c-format
 msgid "Convert HTML to well-formed XML"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 474
-#: rc.cpp:3329
+#: rc.cpp:3404
 #, no-c-format
 msgid "Indent element content"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 489
-#: rc.cpp:3332
+#: rc.cpp:3407
 #, no-c-format
 msgid "Strip out smart quotes and em dashes, etc."
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 504
-#: rc.cpp:3335
+#: rc.cpp:3410
 #, no-c-format
 msgid "Suppress nonessential output"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 523
-#: rc.cpp:3338
+#: rc.cpp:3413
 #, no-c-format
 msgid "Character Encodings"
 msgstr "字符编码"
 
 #. i18n: file ./scripts/tidy.kmdr line 557
-#: rc.cpp:3341
+#: rc.cpp:3416
 #, no-c-format
 msgid "(ibm858) use IBM-858 (CP850+Euro) for input, US-ASCII for output"
 msgstr "(ibm858) 使用 IBM-858 (CP850+Euro) 输入，US-ASCII 输出"
 
 #. i18n: file ./scripts/tidy.kmdr line 571
-#: rc.cpp:3344
+#: rc.cpp:3419
 #, no-c-format
 msgid "(raw) output values above 127 without conversion to entities"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 588
-#: rc.cpp:3347
+#: rc.cpp:3422
 #, no-c-format
 msgid "(utf16le) use UTF-16LE for both input and output"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 602
-#: rc.cpp:3350
+#: rc.cpp:3425
 #, no-c-format
 msgid "(latin1) use ISO-8859-1 for both input and output"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 616
-#: rc.cpp:3353
+#: rc.cpp:3428
 #, no-c-format
 msgid "(win1252) use Windows-1252 for input, US-ASCII for output"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 638
-#: rc.cpp:3356
+#: rc.cpp:3431
 #, no-c-format
 msgid "(shiftjis) use Shift_JIS for both input and output"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 652
-#: rc.cpp:3359
+#: rc.cpp:3434
 #, no-c-format
 msgid "(utf16be) use UTF-16BE for both input and output"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 666
-#: rc.cpp:3362
+#: rc.cpp:3437
 #, no-c-format
 msgid "(ascii) use US-ASCII for output, ISO-8859-1 for input"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 680
-#: rc.cpp:3365
+#: rc.cpp:3440
 #, no-c-format
 msgid "set the two-letter language code <lang> (for future use)"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 694
-#: rc.cpp:3368
+#: rc.cpp:3443
 #, no-c-format
 msgid "(utf16) use UTF-16 for both input and output"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 708
-#: rc.cpp:3371
+#: rc.cpp:3446
 #, no-c-format
 msgid "(big5) use Big5 for both input and output"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 722
-#: rc.cpp:3374
+#: rc.cpp:3449
 #, no-c-format
 msgid "(utf8) use UTF-8 for both input and output"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 736
-#: rc.cpp:3377
+#: rc.cpp:3452
 #, no-c-format
 msgid "(latin0) use US-ASCII for output, ISO-8859-1 for input"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 750
-#: rc.cpp:3380
+#: rc.cpp:3455
 #, no-c-format
 msgid "(mac) use MacRoman for input, US-ASCII for output"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 764
-#: rc.cpp:3383
+#: rc.cpp:3458
 #, no-c-format
 msgid "(iso2022) use ISO-2022 for both input and output"
 msgstr ""
 
 #. i18n: file ./scripts/tidy.kmdr line 778
-#: rc.cpp:3386
+#: rc.cpp:3461
 #, no-c-format
 msgid "Do not specify an encoding"
 msgstr "不指定编码"
 
 #. i18n: file ./scripts/tidy.kmdr line 799
-#: rc.cpp:3389
+#: rc.cpp:3464
 #, no-c-format
 msgid "About Tidy"
 msgstr "关于 Tidy"
 
 #. i18n: file ./scripts/tidy.kmdr line 924
-#: rc.cpp:3392
+#: rc.cpp:3467
 #, no-c-format
 msgid ""
 "HTML Tidy Configuration Settings\n"
@@ -5341,56 +5417,114 @@ msgid ""
 "accessibility-check\t\tInteger   \t0, 1, 2, ...\n"
 msgstr ""
 
-#. i18n: file ./scripts/tidy.kmdr line 938
-#: rc.cpp:3493 rc.cpp:3924
+#. i18n: file ./scripts/docbook_table.kmdr line 18
+#: rc.cpp:3574
 #, no-c-format
-msgid "&Process"
-msgstr "处理(&P)"
+msgid "Docbook Table"
+msgstr "Docbook 表格"
 
-#. i18n: file ./scripts/xsltproc.kmdr line 18
-#: rc.cpp:3499
+#. i18n: file ./scripts/docbook_table.kmdr line 41
+#: rc.cpp:3577
 #, no-c-format
-msgid "Quanta+: xsltproc"
-msgstr "Quanta+: xsltproc"
+msgid "DocBook Table"
+msgstr "DocBook 表格"
 
-#. i18n: file ./scripts/xsltproc.kmdr line 66
-#: rc.cpp:3502
+#. i18n: file ./scripts/docbook_table.kmdr line 88
+#: rc.cpp:3580
+#, fuzzy, no-c-format
+msgid "id:"
+msgstr "宽度："
+
+#. i18n: file ./scripts/docbook_table.kmdr line 124
+#: rc.cpp:3586
 #, no-c-format
-msgid "&Translate"
-msgstr "翻译(&T)"
+msgid "Columns"
+msgstr "列数"
 
-#. i18n: file ./scripts/xsltproc.kmdr line 143
-#: rc.cpp:3508
+#. i18n: file ./scripts/docbook_table.kmdr line 155
+#: rc.cpp:3589
 #, no-c-format
-msgid "Current file"
-msgstr "当前文件"
+msgid "Lines"
+msgstr "行数"
 
-#. i18n: file ./scripts/xsltproc.kmdr line 184
-#: rc.cpp:3511
+#. i18n: file ./scripts/docbook_table.kmdr line 182
+#: rc.cpp:3592
 #, no-c-format
-msgid "File location:"
-msgstr "文件位置："
+msgid "&Include title line"
+msgstr "包含标题行(&I)"
 
-#. i18n: file ./scripts/xsltproc.kmdr line 221
-#: rc.cpp:3514
+#. i18n: file ./scripts/gubed_install.kmdr line 18
+#: rc.cpp:3601
 #, no-c-format
-msgid "Stylesheet location:"
-msgstr "样式表位置："
+msgid "Gubed Installation v0.1"
+msgstr ""
 
-#. i18n: file ./scripts/xsltproc.kmdr line 255
-#: rc.cpp:3517
+#. i18n: file ./scripts/gubed_install.kmdr line 124
+#: rc.cpp:3607
 #, no-c-format
-msgid "Output file name:"
-msgstr "输出文件名："
+msgid "Target directory:"
+msgstr "目的目录："
+
+#. i18n: file ./scripts/gubed_install.kmdr line 132
+#: rc.cpp:3610
+#, no-c-format
+msgid "Archive name:"
+msgstr "存档名："
+
+#. i18n: file ./scripts/gubed_install.kmdr line 145
+#: rc.cpp:3613
+#, no-c-format
+msgid "Select the archive containing Gubed (tar.bz2 format)"
+msgstr ""
+
+#. i18n: file ./scripts/gubed_install.kmdr line 161
+#: rc.cpp:3616
+#, no-c-format
+msgid "The target directory (example /var/www)"
+msgstr "目的目录(例如 /var/www)："
+
+#. i18n: file ./scripts/gubed_install.kmdr line 179
+#: rc.cpp:3619
+#, no-c-format
+msgid "Run the server after installation has finished"
+msgstr ""
+
+#. i18n: file ./scripts/gubed_install.kmdr line 189
+#: rc.cpp:3622
+#, no-c-format
+msgid ""
+"If checked the server will be run in the background after the installation has "
+"finished"
+msgstr ""
+
+#. i18n: file ./scripts/gubed_install.kmdr line 205
+#: rc.cpp:3625
+#, no-c-format
+msgid "View installation log"
+msgstr "查看安装日志"
+
+#. i18n: file ./scripts/gubed_install.kmdr line 218
+#: rc.cpp:3628
+#, no-c-format
+msgid ""
+"Uncheck this if you do not want to see the installation log. The log may "
+"provide important information in case of installation failure."
+msgstr ""
+
+#. i18n: file ./scripts/gubed_install.kmdr line 234
+#: rc.cpp:3631
+#, no-c-format
+msgid "&Start Installation"
+msgstr "开始安装(&S)"
 
 #. i18n: file ./scripts/picturewizard.kmdr line 18
-#: rc.cpp:3520
+#: rc.cpp:3634
 #, no-c-format
 msgid "Docbook Image Wizard"
 msgstr "Docbook 图像向导"
 
 #. i18n: file ./scripts/picturewizard.kmdr line 87
-#: rc.cpp:3526
+#: rc.cpp:3640
 #, no-c-format
 msgid ""
 "Press this button to cancel the creation of the image markup. No action will be "
@@ -5398,19 +5532,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 103
-#: rc.cpp:3529
+#: rc.cpp:3643
 #, no-c-format
 msgid "O&K"
 msgstr "确定(&K)"
 
 #. i18n: file ./scripts/picturewizard.kmdr line 123
-#: rc.cpp:3532
+#: rc.cpp:3646
 #, no-c-format
 msgid "Press this button to create the image markup."
 msgstr "单击此按钮创建图像标记。"
 
 #. i18n: file ./scripts/picturewizard.kmdr line 144
-#: rc.cpp:3535
+#: rc.cpp:3649
 #, no-c-format
 msgid ""
 "<qt>\n"
@@ -5427,19 +5561,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 155
-#: rc.cpp:3545
+#: rc.cpp:3659
 #, no-c-format
 msgid "Wrapper Type"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 175
-#: rc.cpp:3548
+#: rc.cpp:3662
 #, no-c-format
 msgid "&screenshot"
 msgstr "&screenshot"
 
 #. i18n: file ./scripts/picturewizard.kmdr line 201
-#: rc.cpp:3551
+#: rc.cpp:3665
 #, no-c-format
 msgid ""
 "Select this option to create the necessary markup for a screenshot. The "
@@ -5449,13 +5583,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 209
-#: rc.cpp:3554
+#: rc.cpp:3668
 #, no-c-format
 msgid "&mediaobject"
 msgstr "&mediaobject"
 
 #. i18n: file ./scripts/picturewizard.kmdr line 226
-#: rc.cpp:3557
+#: rc.cpp:3671
 #, no-c-format
 msgid ""
 "Select this option to create the necessary markup for a image outside the "
@@ -5464,13 +5598,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 240
-#: rc.cpp:3560
+#: rc.cpp:3674
 #, no-c-format
 msgid "i&nlinemediaobject"
 msgstr "i&nlinemediaobject"
 
 #. i18n: file ./scripts/picturewizard.kmdr line 259
-#: rc.cpp:3563
+#: rc.cpp:3677
 #, no-c-format
 msgid ""
 "Select this option to create the necessary markup for a image inside the normal "
@@ -5480,187 +5614,187 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 269
-#: rc.cpp:3566
+#: rc.cpp:3680
 #, no-c-format
 msgid "Image Options"
 msgstr "图像选项"
 
 #. i18n: file ./scripts/picturewizard.kmdr line 306
-#: rc.cpp:3569
+#: rc.cpp:3683
 #, no-c-format
 msgid "BMP"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 311
-#: rc.cpp:3572
+#: rc.cpp:3686
 #, no-c-format
 msgid "CGM-BINARY"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 316
-#: rc.cpp:3575
+#: rc.cpp:3689
 #, no-c-format
 msgid "CGM-CHAR"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 321
-#: rc.cpp:3578
+#: rc.cpp:3692
 #, no-c-format
 msgid "CGM-CLEAR"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 326
-#: rc.cpp:3581
+#: rc.cpp:3695
 #, no-c-format
 msgid "DITROFF"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 331
-#: rc.cpp:3584
+#: rc.cpp:3698
 #, no-c-format
 msgid "DVI"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 336
-#: rc.cpp:3587
+#: rc.cpp:3701
 #, no-c-format
 msgid "EPS"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 341
-#: rc.cpp:3590
+#: rc.cpp:3704
 #, no-c-format
 msgid "EQN"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 346
-#: rc.cpp:3593
+#: rc.cpp:3707
 #, no-c-format
 msgid "FAX"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 351
-#: rc.cpp:3596
+#: rc.cpp:3710
 #, no-c-format
 msgid "GIF"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 356
-#: rc.cpp:3599
+#: rc.cpp:3713
 #, no-c-format
 msgid "GIF87a"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 361
-#: rc.cpp:3602
+#: rc.cpp:3716
 #, no-c-format
 msgid "GIF89a"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 366
-#: rc.cpp:3605
+#: rc.cpp:3719
 #, no-c-format
 msgid "IGES"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 371
-#: rc.cpp:3608
+#: rc.cpp:3722
 #, no-c-format
 msgid "JPEG"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 376
-#: rc.cpp:3611
+#: rc.cpp:3725
 #, no-c-format
 msgid "JPG"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 381
-#: rc.cpp:3614
+#: rc.cpp:3728
 #, no-c-format
 msgid "linespecific"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 386
-#: rc.cpp:3617
+#: rc.cpp:3731
 #, no-c-format
 msgid "PCX"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 391
-#: rc.cpp:3620
+#: rc.cpp:3734
 #, no-c-format
 msgid "PDF"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 396
-#: rc.cpp:3623
+#: rc.cpp:3737
 #, no-c-format
 msgid "PIC"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 401
-#: rc.cpp:3626
+#: rc.cpp:3740
 #, no-c-format
 msgid "PNG"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 406
-#: rc.cpp:3629
+#: rc.cpp:3743
 #, no-c-format
 msgid "PS"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 411
-#: rc.cpp:3632
+#: rc.cpp:3746
 #, no-c-format
 msgid "SGML"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 416
-#: rc.cpp:3635
+#: rc.cpp:3749
 #, no-c-format
 msgid "SVG"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 421
-#: rc.cpp:3638
+#: rc.cpp:3752
 #, no-c-format
 msgid "SWF"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 426
-#: rc.cpp:3641
+#: rc.cpp:3755
 #, no-c-format
 msgid "TBL"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 431
-#: rc.cpp:3644
+#: rc.cpp:3758
 #, no-c-format
 msgid "TEX"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 436
-#: rc.cpp:3647
+#: rc.cpp:3761
 #, no-c-format
 msgid "TIFF"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 441
-#: rc.cpp:3650
+#: rc.cpp:3764
 #, no-c-format
 msgid "WMF"
 msgstr "WMF"
 
 #. i18n: file ./scripts/picturewizard.kmdr line 446
-#: rc.cpp:3653
+#: rc.cpp:3767
 #, no-c-format
 msgid "WPG"
 msgstr "WPG"
 
 #. i18n: file ./scripts/picturewizard.kmdr line 461
-#: rc.cpp:3656 rc.cpp:3674
+#: rc.cpp:3770 rc.cpp:3788
 #, no-c-format
 msgid ""
 "Select the image format here.  The image format is usually reflects the file "
@@ -5669,13 +5803,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 469
-#: rc.cpp:3659
+#: rc.cpp:3773
 #, no-c-format
 msgid "Create caption, &using the image description text."
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 482
-#: rc.cpp:3662
+#: rc.cpp:3776
 #, no-c-format
 msgid ""
 "Check this box add caption text to the image. The caption text will appear "
@@ -5683,13 +5817,13 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 490
-#: rc.cpp:3665
+#: rc.cpp:3779
 #, no-c-format
 msgid "Image description."
 msgstr "图像描述。"
 
 #. i18n: file ./scripts/picturewizard.kmdr line 498
-#: rc.cpp:3668 rc.cpp:3692
+#: rc.cpp:3782 rc.cpp:3806
 #, no-c-format
 msgid ""
 "Enter the description of the image here. For instance, a screenshot of a "
@@ -5698,19 +5832,19 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 506
-#: rc.cpp:3671
+#: rc.cpp:3785
 #, no-c-format
 msgid "Image Type:"
 msgstr "图像类型："
 
 #. i18n: file ./scripts/picturewizard.kmdr line 517
-#: rc.cpp:3677
+#: rc.cpp:3791
 #, no-c-format
 msgid "Image file name:"
 msgstr "图像文件名："
 
 #. i18n: file ./scripts/picturewizard.kmdr line 520
-#: rc.cpp:3680 rc.cpp:3686
+#: rc.cpp:3794 rc.cpp:3800
 #, no-c-format
 msgid ""
 "Enter the file name of the image here, including the extension (.png, .jpg, "
@@ -5719,927 +5853,793 @@ msgid ""
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 528
-#: rc.cpp:3683
+#: rc.cpp:3797
 #, no-c-format
 msgid "image.png"
 msgstr ""
 
 #. i18n: file ./scripts/picturewizard.kmdr line 544
-#: rc.cpp:3689
+#: rc.cpp:3803
 #, no-c-format
 msgid "Image Description:"
 msgstr "图像描述："
 
-#. i18n: file ./scripts/gubed_install.kmdr line 18
-#: rc.cpp:3695
-#, no-c-format
-msgid "Gubed Installation v0.1"
-msgstr ""
-
-#. i18n: file ./scripts/gubed_install.kmdr line 124
-#: rc.cpp:3701
-#, no-c-format
-msgid "Target directory:"
-msgstr "目的目录："
-
-#. i18n: file ./scripts/gubed_install.kmdr line 132
-#: rc.cpp:3704
-#, no-c-format
-msgid "Archive name:"
-msgstr "存档名："
-
-#. i18n: file ./scripts/gubed_install.kmdr line 145
-#: rc.cpp:3707
-#, no-c-format
-msgid "Select the archive containing Gubed (tar.bz2 format)"
-msgstr ""
-
-#. i18n: file ./scripts/gubed_install.kmdr line 161
-#: rc.cpp:3710
-#, no-c-format
-msgid "The target directory (example /var/www)"
-msgstr "目的目录(例如 /var/www)："
-
-#. i18n: file ./scripts/gubed_install.kmdr line 179
-#: rc.cpp:3713
-#, no-c-format
-msgid "Run the server after installation has finished"
-msgstr ""
-
-#. i18n: file ./scripts/gubed_install.kmdr line 189
-#: rc.cpp:3716
+#. i18n: file ./scripts/scriptinfo.kmdr line 16
+#: rc.cpp:3809
 #, no-c-format
-msgid ""
-"If checked the server will be run in the background after the installation has "
-"finished"
-msgstr ""
+msgid "Quanta Script Info Generator"
+msgstr "Quanta 脚本信息生成器"
 
-#. i18n: file ./scripts/gubed_install.kmdr line 205
-#: rc.cpp:3719
+#. i18n: file ./scripts/scriptinfo.kmdr line 37
+#: rc.cpp:3812
 #, no-c-format
-msgid "View installation log"
-msgstr "查看安装日志"
+msgid "Enter Info"
+msgstr "输入信息"
 
-#. i18n: file ./scripts/gubed_install.kmdr line 218
-#: rc.cpp:3722
+#. i18n: file ./scripts/scriptinfo.kmdr line 61
+#: rc.cpp:3815
 #, no-c-format
-msgid ""
-"Uncheck this if you do not want to see the installation log. The log may "
-"provide important information in case of installation failure."
-msgstr ""
+msgid "Please fill in all fields"
+msgstr "请填入全部域"
 
-#. i18n: file ./scripts/gubed_install.kmdr line 234
-#: rc.cpp:3725
+#. i18n: file ./scripts/scriptinfo.kmdr line 69
+#: rc.cpp:3818
 #, no-c-format
-msgid "&Start Installation"
-msgstr "开始安装(&S)"
+msgid "Script name:"
+msgstr "脚本名称："
 
-#. i18n: file ./scripts/dwt.kmdr line 18
-#: rc.cpp:3728
+#. i18n: file ./scripts/scriptinfo.kmdr line 90
+#: rc.cpp:3821
 #, no-c-format
-msgid "dwt - Apply Dreamweaver Template"
-msgstr "dwt - 应用 Dreamweaver 模板"
+msgid "Enter the script name with the extension"
+msgstr "输入带扩展名的脚本名称"
 
-#. i18n: file ./scripts/dwt.kmdr line 77
-#: rc.cpp:3740
+#. i18n: file ./scripts/scriptinfo.kmdr line 98
+#: rc.cpp:3824
 #, no-c-format
-msgid "Full project path:"
-msgstr "工程的完整路径："
+msgid "About script:"
+msgstr "关于脚本："
 
-#. i18n: file ./scripts/dwt.kmdr line 85
-#: rc.cpp:3743
+#. i18n: file ./scripts/scriptinfo.kmdr line 111
+#: rc.cpp:3827
 #, no-c-format
-msgid "Show debug messages"
-msgstr "显示调试消息"
+msgid "Formatting may be done with XHTML tags"
+msgstr "格式化可通过 XHTML 标签完成"
 
-#. i18n: file ./scripts/dwt.kmdr line 93
-#: rc.cpp:3746
+#. i18n: file ./scripts/scriptinfo.kmdr line 119
+#: rc.cpp:3830
 #, no-c-format
-msgid "dwt.pl"
-msgstr "dwt.pl"
+msgid "http://"
+msgstr "http://"
 
-#. i18n: file ./scripts/dwt.kmdr line 160
-#: rc.cpp:3755
+#. i18n: file ./scripts/scriptinfo.kmdr line 127
+#: rc.cpp:3833
 #, no-c-format
-msgid ""
-"The dwt Script will apply actual Dreamweaver templates to all your project "
-"files. Just enter the FULL project path and specify where the script dwt.pl can "
-"be found."
+msgid "The location of your up-to-date file on the web"
 msgstr ""
 
-#. i18n: file ./scripts/checkxml.kmdr line 18
-#: rc.cpp:3758
-#, no-c-format
-msgid "Quanta+ TDE XML Validator"
-msgstr "Quanta+ TDE XML 校验程序"
-
-#. i18n: file ./scripts/checkxml.kmdr line 98
-#: rc.cpp:3761 rc.cpp:3975
-#, no-c-format
-msgid "&Validate"
-msgstr "校验(&V)"
-
-#. i18n: file ./scripts/checkxml.kmdr line 184
-#: rc.cpp:3767
-#, no-c-format
-msgid "C&urrent working folder"
-msgstr "当前工作文件夹(&U)"
-
-#. i18n: file ./scripts/checkxml.kmdr line 227
-#: rc.cpp:3770 rc.cpp:3930
-#, no-c-format
-msgid "Other folder:"
-msgstr "其它文件夹："
-
-#. i18n: file ./scripts/listwizard.kmdr line 18
-#: rc.cpp:3773
-#, no-c-format
-msgid "Docbook List Wizard"
-msgstr "Docbook 列表向导"
-
-#. i18n: file ./scripts/listwizard.kmdr line 87
-#: rc.cpp:3779
-#, no-c-format
-msgid ""
-"Press this button to cancel the creation of the list or procedure. No action "
-"will be performed."
-msgstr "按此按钮可取消列表或过程的创建。不会执行任何动作。"
-
-#. i18n: file ./scripts/listwizard.kmdr line 123
-#: rc.cpp:3785
+#. i18n: file ./scripts/scriptinfo.kmdr line 135
+#: rc.cpp:3836
 #, no-c-format
-msgid "Press this button to create the selected list or procedure."
-msgstr "按此按钮可创建选中的列表或过程。"
+msgid "Script author:"
+msgstr "脚本作者："
 
-#. i18n: file ./scripts/listwizard.kmdr line 133
-#: rc.cpp:3788
+#. i18n: file ./scripts/scriptinfo.kmdr line 143
+#: rc.cpp:3839
 #, no-c-format
-msgid "List Options"
-msgstr "列表选项"
+msgid "Script license:"
+msgstr "脚本许可："
 
-#. i18n: file ./scripts/listwizard.kmdr line 183
-#: rc.cpp:3791 rc.cpp:3797
+#. i18n: file ./scripts/scriptinfo.kmdr line 159
+#: rc.cpp:3842
 #, no-c-format
-msgid ""
-"Select or enter in this spin box the number of list entries or steps that "
-"should be created by the wizard. After using the wizard, you can add (or "
-"remove) more entries or steps manually."
-msgstr ""
-
-#. i18n: file ./scripts/listwizard.kmdr line 191
-#: rc.cpp:3794
-#, fuzzy, no-c-format
-msgid "Number of list items or steps:"
-msgstr "行数："
+msgid "Select the directory to write the .info file to"
+msgstr "选择要写入 .info 文件的目录"
 
-#. i18n: file ./scripts/listwizard.kmdr line 218
-#: rc.cpp:3800
+#. i18n: file ./scripts/scriptinfo.kmdr line 165
+#: rc.cpp:3845
 #, no-c-format
-msgid ""
-"<qt>\n"
-"Select the list type:\n"
-"<ul>\n"
-"<li><b>variablelist:</b> a list with two sections for each item: the term and "
-"the definition.</li>\n"
-"<li><b>itemizedlist:</b> a list  used when the order of the items is not "
-"important.</li>\n"
-"<li><b>orderedlist:</b> a list  used when the order of the items is important "
-"(for instance, a list of things in order of preference). Do not use orderedlist "
-"to describe the steps required to perform an action.</li>\n"
-"<li><b>procedure:</b> list of an sequence of ordered steps, describing to the "
-"reader how to perform a task. You can add substeps later.</li>\n"
-"</ul>\n"
-"</qt>"
-msgstr ""
+msgid "GPL-2"
+msgstr "GPL2"
 
-#. i18n: file ./scripts/listwizard.kmdr line 229
-#: rc.cpp:3811
+#. i18n: file ./scripts/scriptinfo.kmdr line 170
+#: ../lib/compatibility/knewstuff/uploaddialog.cpp:83 rc.cpp:3848
 #, no-c-format
-msgid "List Type"
-msgstr "列表类型"
+msgid "LGPL"
+msgstr "LGPL"
 
-#. i18n: file ./scripts/listwizard.kmdr line 249
-#: rc.cpp:3814
+#. i18n: file ./scripts/scriptinfo.kmdr line 175
+#: ../lib/compatibility/knewstuff/uploaddialog.cpp:84 rc.cpp:3851
 #, no-c-format
-msgid "&procedure"
-msgstr "&procedure"
+msgid "BSD"
+msgstr "BSD"
 
-#. i18n: file ./scripts/listwizard.kmdr line 285
-#: rc.cpp:3817
+#. i18n: file ./scripts/scriptinfo.kmdr line 180
+#: rc.cpp:3854
 #, no-c-format
-msgid ""
-"Select this option to create a procedure. A procedure is a sequence of ordered "
-"steps, describing to the reader how to perform a task. You can add nested "
-"substeps.\n"
-"\n"
-"Here is one example of a procedure:\n"
-"\n"
-"<procedure>\n"
-"\n"
-"<step><para>First step.</para></step>\n"
-"\n"
-"<step><para>Second step.</para>\n"
-"<substeps>\n"
-"<step><para>First substep of the second step.</para></step>\n"
-"</substeps>\n"
-"</step>\n"
-"\n"
-"</procedure>"
-msgstr ""
+msgid "Public Domain"
+msgstr "公共域"
 
-#. i18n: file ./scripts/listwizard.kmdr line 293
-#: rc.cpp:3834
+#. i18n: file ./scripts/scriptinfo.kmdr line 185
+#: rc.cpp:3857 rc.cpp:4576
 #, no-c-format
-msgid "itemi&zedlist"
-msgstr "itemi&zedlist"
+msgid "Other"
+msgstr "其它"
 
-#. i18n: file ./scripts/listwizard.kmdr line 326
-#: rc.cpp:3837
+#. i18n: file ./scripts/scriptinfo.kmdr line 200
+#: rc.cpp:3860
 #, no-c-format
-msgid ""
-"Select this option to create a itemizedlist. A itemizedlist is a list used when "
-"the order of the items is not important.\n"
-"\n"
-"Here is one example of a itemizedlist:\n"
-"\n"
-"<itemizedlist>\n"
-"\n"
-"<listitem><para>\n"
-"First item.\n"
-"</para></listitem>\n"
-"\n"
-"<listitem><para>\n"
-"Second item.\n"
-"</para></listitem>\n"
-"\n"
-"</itemizedlist>"
+msgid "If other include in about"
 msgstr ""
 
-#. i18n: file ./scripts/listwizard.kmdr line 340
-#: rc.cpp:3854
-#, no-c-format
-msgid "or&deredlist"
-msgstr "or&deredlist"
-
-#. i18n: file ./scripts/listwizard.kmdr line 376
-#: rc.cpp:3857
+#. i18n: file ./scripts/scriptinfo.kmdr line 208
+#: rc.cpp:3863
 #, no-c-format
-msgid ""
-"Select this option to create a orderedlist. A orderedlist is a list  used when "
-"the order of the items is important. A number will be associated with each "
-"entry, in order, starting from one.\n"
-"\n"
-"Here is one example of a orderedlist:\n"
-"\n"
-"<orderedlist>\n"
-"\n"
-"<listitem><para>\n"
-"First item.\n"
-"</para></listitem>\n"
-"\n"
-"<listitem><para>\n"
-"Second item.\n"
-"</para></listitem>\n"
-"\n"
-"</orderedlist>"
-msgstr ""
+msgid "Editor/Executor:"
+msgstr "编辑器/执行器："
 
-#. i18n: file ./scripts/listwizard.kmdr line 387
-#: rc.cpp:3874
+#. i18n: file ./scripts/scriptinfo.kmdr line 216
+#: rc.cpp:3866
 #, no-c-format
-msgid "&variablelist"
-msgstr "&variablelist"
+msgid "Author email:"
+msgstr "作者邮件："
 
-#. i18n: file ./scripts/listwizard.kmdr line 426
-#: rc.cpp:3877
+#. i18n: file ./scripts/scriptinfo.kmdr line 224
+#: rc.cpp:3869
 #, no-c-format
-msgid ""
-"Select this option to create a variablelist. A variablelist is a list with two "
-"sections for each item: the term (the tag used is <term>"
-") and the definition (the tag used is <listitem>). To mark each entry of the "
-"list, the <varlistentry> tag is used.\n"
-"\n"
-"Here is one example of a variablelist:\n"
-"\n"
-"<variablelist>\n"
-"\n"
-"<varlistentry>\n"
-"<term>Term text</term>\n"
-"<listitem><para>Definition text.</para></listitem>\n"
-"</varlistentry>\n"
-"\n"
-"</variablelist>"
-msgstr ""
+msgid "Web address:"
+msgstr "Web 地址："
 
-#. i18n: file ./scripts/docbook_table.kmdr line 18
-#: rc.cpp:3891
+#. i18n: file ./scripts/scriptinfo.kmdr line 232
+#: rc.cpp:3872
 #, no-c-format
-msgid "Docbook Table"
-msgstr "Docbook 表格"
+msgid "Version number:"
+msgstr "版本号："
 
-#. i18n: file ./scripts/docbook_table.kmdr line 41
-#: rc.cpp:3894
+#. i18n: file ./scripts/scriptinfo.kmdr line 273
+#: rc.cpp:3875
 #, no-c-format
-msgid "DocBook Table"
-msgstr "DocBook 表格"
-
-#. i18n: file ./scripts/docbook_table.kmdr line 88
-#: rc.cpp:3897
-#, fuzzy, no-c-format
-msgid "id:"
-msgstr "宽度："
+msgid "kmdr-editor"
+msgstr "kmdr-editor"
 
-#. i18n: file ./scripts/docbook_table.kmdr line 124
-#: rc.cpp:3903
+#. i18n: file ./scripts/scriptinfo.kmdr line 278
+#: rc.cpp:3878
 #, no-c-format
-msgid "Columns"
-msgstr "列数"
+msgid "kwrite"
+msgstr "kwrite"
 
-#. i18n: file ./scripts/docbook_table.kmdr line 155
-#: rc.cpp:3906
+#. i18n: file ./scripts/scriptinfo.kmdr line 283
+#: rc.cpp:3881
 #, no-c-format
-msgid "Lines"
-msgstr "行数"
+msgid "kate"
+msgstr "kate"
 
-#. i18n: file ./scripts/docbook_table.kmdr line 182
-#: rc.cpp:3909
+#. i18n: file ./scripts/scriptinfo.kmdr line 288
+#: rc.cpp:3884
 #, no-c-format
-msgid "&Include title line"
-msgstr "包含标题行(&I)"
+msgid "tdevelop"
+msgstr "tdevelop"
 
-#. i18n: file ./scripts/meinproc.kmdr line 18
-#: rc.cpp:3918
+#. i18n: file ./scripts/scriptinfo.kmdr line 303
+#: rc.cpp:3887
 #, no-c-format
-msgid "Quanta+: meinproc"
-msgstr "Quanta+: meinproc"
+msgid "Optional: Editor other than Quanta to use for this script"
+msgstr "可选：此脚本使用 Quanta 以外的编辑器"
 
-#. i18n: file ./scripts/meinproc.kmdr line 146
-#: rc.cpp:3927
+#. i18n: file ./scripts/scriptinfo.kmdr line 314
+#: rc.cpp:3890
 #, no-c-format
-msgid "Current working folder &in Quanta"
-msgstr "Quanta 的当前工作文件夹(&I)"
+msgid "kmdr-executor -c quanta"
+msgstr "kmdr-executor -c quanta"
 
-#. i18n: file ./scripts/meinproc.kmdr line 249
-#: rc.cpp:3933
+#. i18n: file ./scripts/scriptinfo.kmdr line 319
+#: rc.cpp:3893
 #, no-c-format
-msgid "View in &Konqueror"
-msgstr "在 Konqueror 中查看(&K)"
+msgid "kmdr-executor"
+msgstr "kmdr-executor"
 
-#. i18n: file ./scripts/xmlval.kmdr line 18
-#: rc.cpp:3936
+#. i18n: file ./scripts/scriptinfo.kmdr line 324
+#: rc.cpp:3896
 #, no-c-format
-msgid "Quanta+ XML Validator"
-msgstr "Quanta+ XML 校验器"
+msgid "perl"
+msgstr "perl"
 
-#. i18n: file ./scripts/xmlval.kmdr line 92
-#: rc.cpp:3939
+#. i18n: file ./scripts/scriptinfo.kmdr line 329
+#: rc.cpp:3899
 #, no-c-format
-msgid "C&urrent file"
-msgstr "当前文件(&U)"
+msgid "php"
+msgstr "php"
 
-#. i18n: file ./scripts/xmlval.kmdr line 155
-#: rc.cpp:3942
+#. i18n: file ./scripts/scriptinfo.kmdr line 344
+#: rc.cpp:3902
 #, no-c-format
-msgid "Other file:"
-msgstr "其它文件："
+msgid "Optional: External program executor"
+msgstr "可选：外部程序执行器"
 
-#. i18n: file ./scripts/xmlval.kmdr line 209
-#: rc.cpp:3945
+#. i18n: file ./scripts/scriptinfo.kmdr line 352
+#: rc.cpp:3905 rc.cpp:3947
 #, no-c-format
-msgid "Validate against:"
-msgstr "校验标准："
+msgid "Script location:"
+msgstr "脚本位置："
 
-#. i18n: file ./scripts/xmlval.kmdr line 232
-#: rc.cpp:3948
+#. i18n: file ./scripts/scriptinfo.kmdr line 360
+#: rc.cpp:3908
 #, no-c-format
-msgid "DTD (Internal)"
-msgstr "DTD (内部)"
+msgid "Write File"
+msgstr "写文件"
 
-#. i18n: file ./scripts/xmlval.kmdr line 237
-#: rc.cpp:3951
+#. i18n: file ./scripts/scriptinfo.kmdr line 431
+#: rc.cpp:3914
 #, no-c-format
-msgid "DTD (External)"
-msgstr "DTD (外部)"
+msgid ""
+"<html><head><meta name=\"qrichtext\" content=\"1\" /></head>"
+"<body style=\"font-size:11pt;font-family:sans-serif\">\n"
+"<p style=\"margin-top:16px\"><span style=\"font-weight:600\">"
+"Quanta Plus Submitter Info Files</span></p>\n"
+"<p>The purpose of these files is to provide developers with proper credit, "
+"expose licensing information and give users thumbnail information about scripts "
+"and templates at a glance. We ask that you try to do several things here.</p>\n"
+"<ul type=\"disc\">"
+"<li>Fill in all the fields. They are all there for a reason.</li>\n"
+"<li>Contact the appropriate Quanta script and template maintainer or a member "
+"of our team when you have new releases so we can include them. As we plan to "
+"build a huge repository we have to rely on you here.</li></ul>\n"
+"<p>The additional information serves as a backup. Any time a user wants they "
+"can click the link to go to your site and get updates, docs or whatever they "
+"require. Thank you for helping us to make this a great feature</p>\n"
+"<p align=\"center\" style=\"margin-top:14px\"><span style=\"font-weight:600\">"
+"Contact Information</span></p>\n"
+"<p align=\"center\">Quanta Resource Maintainer - (none at this time)<br />"
+"Lead Developer - Andras Mantia <a "
+"href=\"mailto:amantia@kde.org?subject=ScriptInfo\">amantia@kde.org</a><br />"
+"Kommander - Michal Rudolf <a "
+"href=\"mailto:mrudolf@kdewebdev.org?subject=ScriptInfo\">"
+"mrudolf@kdewebdev.org</a><br />Project Lead - Eric Laffoon <a "
+"href=\"mailto:sequitur@kde.org?subject=ScriptInfo\">sequitur@kde.org</a></p>\n"
+"</body></html>\n"
+msgstr ""
 
-#. i18n: file ./scripts/xmlval.kmdr line 242
-#: rc.cpp:3954
+#. i18n: file ./scripts/dwt.kmdr line 18
+#: rc.cpp:3926
 #, no-c-format
-msgid "XML Schema"
-msgstr "XML 大纲"
+msgid "dwt - Apply Dreamweaver Template"
+msgstr "dwt - 应用 Dreamweaver 模板"
 
-#. i18n: file ./scripts/xmlval.kmdr line 247
-#: rc.cpp:3957 rc.cpp:3963
+#. i18n: file ./scripts/dwt.kmdr line 77
+#: rc.cpp:3938
 #, no-c-format
-msgid "RelaxNG Schema"
-msgstr "RelaxNG 大纲"
+msgid "Full project path:"
+msgstr "工程的完整路径："
 
-#. i18n: file ./scripts/xmlval.kmdr line 291
-#: rc.cpp:3960
+#. i18n: file ./scripts/dwt.kmdr line 85
+#: rc.cpp:3941
 #, no-c-format
-msgid "DTD"
-msgstr "DTD"
+msgid "Show debug messages"
+msgstr "显示调试消息"
 
-#. i18n: file ./scripts/xmlval.kmdr line 293
-#: rc.cpp:3966
+#. i18n: file ./scripts/dwt.kmdr line 93
+#: rc.cpp:3944
 #, no-c-format
-msgid "W3C XML Schema"
-msgstr "W3C XML 大纲"
+msgid "dwt.pl"
+msgstr "dwt.pl"
 
-#. i18n: file ./scripts/xmlval.kmdr line 318
-#: rc.cpp:3969
+#. i18n: file ./scripts/dwt.kmdr line 160
+#: rc.cpp:3953
 #, no-c-format
-msgid "Well-formed checking &only"
+msgid ""
+"The dwt Script will apply actual Dreamweaver templates to all your project "
+"files. Just enter the FULL project path and specify where the script dwt.pl can "
+"be found."
 msgstr ""
 
-#. i18n: file ./scripts/xmlval.kmdr line 374
-#: rc.cpp:3972
-#, no-c-format
-msgid "Definition URI:"
-msgstr "定义 URI："
-
 #. i18n: file ./scripts/htmlquickstart.kmdr line 24
-#: rc.cpp:3981 rc.cpp:5076
+#: rc.cpp:3956 rc.cpp:5318
 #, no-c-format
 msgid "Quick Start"
 msgstr "快速启动"
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 76
-#: rc.cpp:3984
+#: rc.cpp:3959
 #, no-c-format
 msgid "Quanta Plus Kommander Quick Start"
 msgstr "Quanta Plus Kommander 快速启动"
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 194
-#: rc.cpp:3987
+#: rc.cpp:3962
 #, no-c-format
 msgid "DTD / Schema:"
 msgstr "DTD/大纲："
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 202
-#: rc.cpp:3990
+#: rc.cpp:3965
 #, no-c-format
 msgid "Body Area"
 msgstr "Body 区域"
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 253
-#: rc.cpp:3993
+#: rc.cpp:3968
 #, fuzzy, no-c-format
 msgid "&PHP footer include:"
 msgstr "PHP 页脚包含："
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 268
-#: rc.cpp:3996
+#: rc.cpp:3971
 #, no-c-format
 msgid "PHP header include:"
 msgstr "PHP 页眉包含："
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 285
-#: rc.cpp:3999
+#: rc.cpp:3974
 #, fuzzy, no-c-format
 msgid "Show &DTD"
 msgstr "显示 DTD"
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 302
-#: rc.cpp:4002
+#: rc.cpp:3977
 #, no-c-format
 msgid "HTML 4.01 Transitional"
 msgstr "HTML 4.01 Transitional"
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 307
-#: rc.cpp:4005
+#: rc.cpp:3980
 #, no-c-format
 msgid "HTML 4.01 Strict"
 msgstr "HTML 4.01 Strict"
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 312
-#: rc.cpp:4008
+#: rc.cpp:3983
 #, no-c-format
 msgid "HTML 4.01 Frameset"
 msgstr "HTML 4.01 Frameset"
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 317
-#: rc.cpp:4011
+#: rc.cpp:3986
 #, no-c-format
 msgid "XHTML 1.0 Transitional"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 322
-#: rc.cpp:4014
+#: rc.cpp:3989
 #, no-c-format
 msgid "XHTML 1.0 Strict"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 327
-#: rc.cpp:4017
+#: rc.cpp:3992
 #, no-c-format
 msgid "XHTML 1.0 Frameset"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 332
-#: rc.cpp:4020
+#: rc.cpp:3995
 #, fuzzy, no-c-format
 msgid "XHTML 1.0 Basic"
 msgstr "HTML 4.01 Strict"
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 337
-#: rc.cpp:4023
+#: rc.cpp:3998
 #, fuzzy, no-c-format
 msgid "XHTML 1.1"
 msgstr "XHTML 文件"
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 413
-#: rc.cpp:4026
+#: rc.cpp:4001
 #, fuzzy, no-c-format
 msgid "Head &area"
 msgstr "Head 区域"
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 441
-#: rc.cpp:4029
+#: rc.cpp:4004
 #, no-c-format
 msgid "CVS tag &in comment"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 481
-#: rc.cpp:4032
+#: rc.cpp:4007
 #, fuzzy, no-c-format
 msgid "&Meta author:"
 msgstr "元作者："
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 496
-#: rc.cpp:4035
+#: rc.cpp:4010
 #, no-c-format
 msgid "Meta character set:"
 msgstr "元字符集："
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 511
-#: rc.cpp:4038
+#: rc.cpp:4013
 #, fuzzy, no-c-format
 msgid "St&yle area"
 msgstr "样式区域"
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 556
-#: rc.cpp:4041
+#: rc.cpp:4016
 #, no-c-format
 msgid "iso-8859-1"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 561
-#: rc.cpp:4044
+#: rc.cpp:4019
 #, no-c-format
 msgid "iso-8859-2"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 566
-#: rc.cpp:4047
+#: rc.cpp:4022
 #, no-c-format
 msgid "iso-8859-3"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 571
-#: rc.cpp:4050
+#: rc.cpp:4025
 #, no-c-format
 msgid "iso-8859-4"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 576
-#: rc.cpp:4053
+#: rc.cpp:4028
 #, no-c-format
 msgid "iso-8859-5"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 581
-#: rc.cpp:4056
+#: rc.cpp:4031
 #, no-c-format
 msgid "iso-8859-6"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 586
-#: rc.cpp:4059
+#: rc.cpp:4034
 #, no-c-format
 msgid "iso-8859-7"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 591
-#: rc.cpp:4062
+#: rc.cpp:4037
 #, no-c-format
 msgid "iso-8859-8"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 596
-#: rc.cpp:4065
+#: rc.cpp:4040
 #, no-c-format
 msgid "iso-8859-8i"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 601
-#: rc.cpp:4068
+#: rc.cpp:4043
 #, no-c-format
 msgid "iso-8859-9"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 606
-#: rc.cpp:4071
+#: rc.cpp:4046
 #, no-c-format
 msgid "iso-8859-10"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 611
-#: rc.cpp:4074
+#: rc.cpp:4049
 #, no-c-format
 msgid "iso-8859-11"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 616
-#: rc.cpp:4077
+#: rc.cpp:4052
 #, no-c-format
 msgid "iso-8859-12"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 621
-#: rc.cpp:4080
+#: rc.cpp:4055
 #, no-c-format
 msgid "iso-8859-13"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 626
-#: rc.cpp:4083
+#: rc.cpp:4058
 #, no-c-format
 msgid "iso-8859-14"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 631
-#: rc.cpp:4086
+#: rc.cpp:4061
 #, no-c-format
 msgid "iso-8859-15"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 636
-#: rc.cpp:4089
+#: rc.cpp:4064
 #, no-c-format
 msgid "utf-8"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 641
-#: rc.cpp:4092
+#: rc.cpp:4067
 #, no-c-format
 msgid "utf-16"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 646
-#: rc.cpp:4095
+#: rc.cpp:4070
 #, no-c-format
 msgid "koi8-r"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 651
-#: rc.cpp:4098
+#: rc.cpp:4073
 #, no-c-format
 msgid "koi8-u"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 656
-#: rc.cpp:4101
+#: rc.cpp:4076
 #, no-c-format
 msgid "windows-1250"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 661
-#: rc.cpp:4104
+#: rc.cpp:4079
 #, no-c-format
 msgid "windows-1251"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 666
-#: rc.cpp:4107
+#: rc.cpp:4082
 #, no-c-format
 msgid "windows-1252"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 671
-#: rc.cpp:4110
+#: rc.cpp:4085
 #, no-c-format
 msgid "windows-1253"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 676
-#: rc.cpp:4113
+#: rc.cpp:4088
 #, no-c-format
 msgid "windows-1254"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 681
-#: rc.cpp:4116
+#: rc.cpp:4091
 #, no-c-format
 msgid "windows-1255"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 686
-#: rc.cpp:4119
+#: rc.cpp:4094
 #, no-c-format
 msgid "windows-1256"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 691
-#: rc.cpp:4122
+#: rc.cpp:4097
 #, no-c-format
 msgid "windows-1257"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 696
-#: rc.cpp:4125
+#: rc.cpp:4100
 #, no-c-format
 msgid "windows-1258"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 724
-#: rc.cpp:4128
+#: rc.cpp:4103
 #, no-c-format
 msgid "limit to 8, separate with commas"
 msgstr ""
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 732
-#: rc.cpp:4131
+#: rc.cpp:4106
 #, fuzzy, no-c-format
 msgid "&Base directory:"
 msgstr "基目录："
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 747
-#: rc.cpp:4134
+#: rc.cpp:4109
 #, fuzzy, no-c-format
 msgid "Meta &Quanta"
 msgstr "元 Quanta"
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 765
-#: rc.cpp:4137
+#: rc.cpp:4112
 #, fuzzy, no-c-format
 msgid "Meta &keywords:"
 msgstr "元关键字："
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 782
-#: rc.cpp:4140
+#: rc.cpp:4115
 #, fuzzy, no-c-format
 msgid "Li&nked style sheet:"
 msgstr "链接样式表："
 
 #. i18n: file ./scripts/htmlquickstart.kmdr line 831
-#: rc.cpp:4146
+#: rc.cpp:4121
 #, fuzzy, no-c-format
 msgid "&JavaScript area"
 msgstr "Javascript 区域"
 
-#. i18n: file ./scripts/tablewizard.kmdr line 18
-#: rc.cpp:4155
+#. i18n: file ./scripts/listwizard.kmdr line 18
+#: rc.cpp:4130
 #, no-c-format
-msgid "Docbook Table Wizard"
-msgstr ""
+msgid "Docbook List Wizard"
+msgstr "Docbook 列表向导"
 
-#. i18n: file ./scripts/tablewizard.kmdr line 63
-#: rc.cpp:4161
+#. i18n: file ./scripts/listwizard.kmdr line 87
+#: rc.cpp:4136
 #, no-c-format
 msgid ""
-"Click here to cancel the creation of the table. No action will be performed."
-msgstr ""
+"Press this button to cancel the creation of the list or procedure. No action "
+"will be performed."
+msgstr "按此按钮可取消列表或过程的创建。不会执行任何动作。"
 
-#. i18n: file ./scripts/tablewizard.kmdr line 98
-#: rc.cpp:4167
+#. i18n: file ./scripts/listwizard.kmdr line 123
+#: rc.cpp:4142
 #, no-c-format
-msgid "Press this button to create the table or informaltable."
-msgstr ""
+msgid "Press this button to create the selected list or procedure."
+msgstr "按此按钮可创建选中的列表或过程。"
 
-#. i18n: file ./scripts/tablewizard.kmdr line 125
-#: rc.cpp:4170
+#. i18n: file ./scripts/listwizard.kmdr line 133
+#: rc.cpp:4145
 #, no-c-format
-msgid "Table Options"
-msgstr "表格选项"
+msgid "List Options"
+msgstr "列表选项"
 
-#. i18n: file ./scripts/tablewizard.kmdr line 133
-#: rc.cpp:4173 rc.cpp:4185 rc.cpp:4197
+#. i18n: file ./scripts/listwizard.kmdr line 183
+#: rc.cpp:4148 rc.cpp:4154
 #, no-c-format
 msgid ""
-"Enter here the id of the table or informaltable. You can use the id to link or "
-"reference to the table or informaltable elsewhere in the document."
+"Select or enter in this spin box the number of list entries or steps that "
+"should be created by the wizard. After using the wizard, you can add (or "
+"remove) more entries or steps manually."
 msgstr ""
 
-#. i18n: file ./scripts/tablewizard.kmdr line 164
-#: rc.cpp:4176
-#, no-c-format
-msgid "Number of columns:"
-msgstr "列数："
+#. i18n: file ./scripts/listwizard.kmdr line 191
+#: rc.cpp:4151
+#, fuzzy, no-c-format
+msgid "Number of list items or steps:"
+msgstr "行数："
 
-#. i18n: file ./scripts/tablewizard.kmdr line 167
-#: rc.cpp:4179 rc.cpp:4215
+#. i18n: file ./scripts/listwizard.kmdr line 218
+#: rc.cpp:4157
 #, no-c-format
 msgid ""
-"Select or enter in this spin box the number of columns that should be created "
-"by the wizard."
+"<qt>\n"
+"Select the list type:\n"
+"<ul>\n"
+"<li><b>variablelist:</b> a list with two sections for each item: the term and "
+"the definition.</li>\n"
+"<li><b>itemizedlist:</b> a list  used when the order of the items is not "
+"important.</li>\n"
+"<li><b>orderedlist:</b> a list  used when the order of the items is important "
+"(for instance, a list of things in order of preference). Do not use orderedlist "
+"to describe the steps required to perform an action.</li>\n"
+"<li><b>procedure:</b> list of an sequence of ordered steps, describing to the "
+"reader how to perform a task. You can add substeps later.</li>\n"
+"</ul>\n"
+"</qt>"
 msgstr ""
 
-#. i18n: file ./scripts/tablewizard.kmdr line 175
-#: rc.cpp:4182
-#, fuzzy, no-c-format
-msgid "Table id:"
-msgstr "表格数据(&D)："
-
-#. i18n: file ./scripts/tablewizard.kmdr line 189
-#: rc.cpp:4188
+#. i18n: file ./scripts/listwizard.kmdr line 229
+#: rc.cpp:4168
 #, no-c-format
-msgid "&Add table header"
-msgstr "插入表头(&A)"
+msgid "List Type"
+msgstr "列表类型"
 
-#. i18n: file ./scripts/tablewizard.kmdr line 203
-#: rc.cpp:4191
+#. i18n: file ./scripts/listwizard.kmdr line 249
+#: rc.cpp:4171
 #, no-c-format
-msgid ""
-"Check this box to create a table header. The table header is the first row of "
-"the table, and has the same number of entries as the other rows."
-msgstr ""
-
-#. i18n: file ./scripts/tablewizard.kmdr line 211
-#: rc.cpp:4194
-#, fuzzy, no-c-format
-msgid "table_id"
-msgstr "名称"
+msgid "&procedure"
+msgstr "&procedure"
 
-#. i18n: file ./scripts/tablewizard.kmdr line 243
-#: rc.cpp:4200 rc.cpp:4206
+#. i18n: file ./scripts/listwizard.kmdr line 285
+#: rc.cpp:4174
 #, no-c-format
 msgid ""
-"Select or enter in this spin box the number of rows that should be created by "
-"the wizard. After using the wizard, you can add (or remove) more rows. To add "
-"more rows,  add the same number of <entry> tags per <row> "
-"tag as in the rest of the table."
+"Select this option to create a procedure. A procedure is a sequence of ordered "
+"steps, describing to the reader how to perform a task. You can add nested "
+"substeps.\n"
+"\n"
+"Here is one example of a procedure:\n"
+"\n"
+"<procedure>\n"
+"\n"
+"<step><para>First step.</para></step>\n"
+"\n"
+"<step><para>Second step.</para>\n"
+"<substeps>\n"
+"<step><para>First substep of the second step.</para></step>\n"
+"</substeps>\n"
+"</step>\n"
+"\n"
+"</procedure>"
 msgstr ""
 
-#. i18n: file ./scripts/tablewizard.kmdr line 251
-#: rc.cpp:4203
-#, no-c-format
-msgid "Number of rows:"
-msgstr "行数："
-
-#. i18n: file ./scripts/tablewizard.kmdr line 265
-#: rc.cpp:4209
+#. i18n: file ./scripts/listwizard.kmdr line 293
+#: rc.cpp:4191
 #, no-c-format
-msgid "Table title:"
-msgstr "表格标题："
+msgid "itemi&zedlist"
+msgstr "itemi&zedlist"
 
-#. i18n: file ./scripts/tablewizard.kmdr line 268
-#: rc.cpp:4212 rc.cpp:4221
+#. i18n: file ./scripts/listwizard.kmdr line 326
+#: rc.cpp:4194
 #, no-c-format
 msgid ""
-"Enter here the title of the table. The title of the table will appear in the "
-"table of contents as well, under the \"List of Tables\", if you are using the "
-"TDE DocBook tools."
+"Select this option to create a itemizedlist. A itemizedlist is a list used when "
+"the order of the items is not important.\n"
+"\n"
+"Here is one example of a itemizedlist:\n"
+"\n"
+"<itemizedlist>\n"
+"\n"
+"<listitem><para>\n"
+"First item.\n"
+"</para></listitem>\n"
+"\n"
+"<listitem><para>\n"
+"Second item.\n"
+"</para></listitem>\n"
+"\n"
+"</itemizedlist>"
 msgstr ""
 
-#. i18n: file ./scripts/tablewizard.kmdr line 300
-#: rc.cpp:4218
-#, no-c-format
-msgid "Table Title"
-msgstr "表格标题"
-
-#. i18n: file ./scripts/tablewizard.kmdr line 320
-#: rc.cpp:4224
-#, no-c-format
-msgid "Table Type"
-msgstr "表格类型"
-
-#. i18n: file ./scripts/tablewizard.kmdr line 337
-#: rc.cpp:4227
+#. i18n: file ./scripts/listwizard.kmdr line 340
+#: rc.cpp:4211
 #, no-c-format
-msgid "ta&ble"
-msgstr "ta&ble"
+msgid "or&deredlist"
+msgstr "or&deredlist"
 
-#. i18n: file ./scripts/tablewizard.kmdr line 358
-#: rc.cpp:4230
+#. i18n: file ./scripts/listwizard.kmdr line 376
+#: rc.cpp:4214
 #, no-c-format
-msgid "Select this option to generate a formal table (table)."
+msgid ""
+"Select this option to create a orderedlist. A orderedlist is a list  used when "
+"the order of the items is important. A number will be associated with each "
+"entry, in order, starting from one.\n"
+"\n"
+"Here is one example of a orderedlist:\n"
+"\n"
+"<orderedlist>\n"
+"\n"
+"<listitem><para>\n"
+"First item.\n"
+"</para></listitem>\n"
+"\n"
+"<listitem><para>\n"
+"Second item.\n"
+"</para></listitem>\n"
+"\n"
+"</orderedlist>"
 msgstr ""
 
-#. i18n: file ./scripts/tablewizard.kmdr line 369
-#: rc.cpp:4233
-#, no-c-format
-msgid "&informaltable"
-msgstr "&informaltable"
-
-#. i18n: file ./scripts/tablewizard.kmdr line 389
-#: rc.cpp:4236
+#. i18n: file ./scripts/listwizard.kmdr line 387
+#: rc.cpp:4231
 #, no-c-format
-msgid "Select this option to generate an informal table (informaltable)."
-msgstr ""
+msgid "&variablelist"
+msgstr "&variablelist"
 
-#. i18n: file ./scripts/tablewizard.kmdr line 409
-#: rc.cpp:4239
+#. i18n: file ./scripts/listwizard.kmdr line 426
+#: rc.cpp:4234
 #, no-c-format
 msgid ""
-"<qt>\n"
-"Select the table type:\n"
-"<ul>\n"
-"<li><b>informaltable:</b> the most used table type in TDE docs. A informaltable "
-"does not contain title, table head or entry in the table of contents.</li>\n"
-"<li><b>table:</b> a complete and formal table type, including title, table head "
-"and entry in the table of contents.</li>\n"
-"</ul>\n"
-"</qt>"
+"Select this option to create a variablelist. A variablelist is a list with two "
+"sections for each item: the term (the tag used is <term>"
+") and the definition (the tag used is <listitem>). To mark each entry of the "
+"list, the <varlistentry> tag is used.\n"
+"\n"
+"Here is one example of a variablelist:\n"
+"\n"
+"<variablelist>\n"
+"\n"
+"<varlistentry>\n"
+"<term>Term text</term>\n"
+"<listitem><para>Definition text.</para></listitem>\n"
+"</varlistentry>\n"
+"\n"
+"</variablelist>"
 msgstr ""
 
 #: rc.cpp:4246
@@ -7400,8 +7400,155 @@ msgstr "€ (&#8364;) 欧元符号"
 msgid "™ (&trade;) Trade Mark sign"
 msgstr "™ (&#8482;) 商标符号"
 
-#. i18n: file extrafiles line 38
-#: rc.cpp:4424 rc.cpp:4486
+#. i18n: file extrafiles line 42
+#: rc.cpp:4418
+#, fuzzy, no-c-format
+msgid "KDE DocBook Tables"
+msgstr "TDE DocBook 表格"
+
+#. i18n: file extrafiles line 103
+#: rc.cpp:4421
+#, fuzzy, no-c-format
+msgid "KDE DocBook Images"
+msgstr "TDE DocBook 图像"
+
+#. i18n: file extrafiles line 182
+#: rc.cpp:4424
+#, fuzzy, no-c-format
+msgid "KDE DocBook Lists"
+msgstr "TDE DocBook 列表"
+
+#. i18n: file extrafiles line 216
+#: rc.cpp:4427
+#, no-c-format
+msgid "Tools"
+msgstr "工具"
+
+#. i18n: file extrafiles line 224
+#: rc.cpp:4430
+#, fuzzy, no-c-format
+msgid "KDE DocBook Standard"
+msgstr "TDE DocBook 标准"
+
+#. i18n: file extrafiles line 343
+#: rc.cpp:4433
+#, fuzzy, no-c-format
+msgid "KDE DocBook Admonitions"
+msgstr "TDE DocBook 列表"
+
+#. i18n: file extrafiles line 363
+#: rc.cpp:4436
+#, no-c-format
+msgid "UI Elements"
+msgstr "界面元素"
+
+#. i18n: file extrafiles line 430
+#: rc.cpp:4439 rc.cpp:4460 rc.cpp:4511
+#, no-c-format
+msgid "tagxml"
+msgstr ""
+
+#. i18n: file extrafiles line 457
+#: rc.cpp:4442
+#, no-c-format
+msgid ""
+"<?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>\n"
+"<!DOCTYPE TAGS>\n"
+"<TAGS>\n"
+"\n"
+"</TAGS>\n"
+msgstr ""
+
+#. i18n: file extrafiles line 516
+#: rc.cpp:4450
+#, no-c-format
+msgid ""
+"<children>\n"
+"<child name=&quot;&quot; />\n"
+"</children>"
+msgstr ""
+
+#. i18n: file extrafiles line 521
+#: rc.cpp:4455
+#, no-c-format
+msgid ""
+"<stoppingtags>\n"
+"<stoppingtag name=&quot;&quot; />\n"
+"</stoppingtags>"
+msgstr ""
+
+#. i18n: file extrafiles line 577
+#: rc.cpp:4463
+#, no-c-format
+msgid ""
+"<chapter id=&quot;&quot;>\n"
+"<!--  -->\n"
+"\n"
+"<title></title>\n"
+"\n"
+"<para></para>\n"
+"\n"
+"\n"
+"\n"
+"<sect1>\n"
+"\n"
+"<title></title>\n"
+"\n"
+"<para></para>\n"
+"\n"
+"</sect1>\n"
+"\n"
+"\n"
+"\n"
+"</chapter>\n"
+msgstr ""
+
+#. i18n: file extrafiles line 595
+#: rc.cpp:4486 rc.cpp:4682 rc.cpp:4762 rc.cpp:4931
+#, no-c-format
+msgid ""
+"The <b>!-- --></b> element <i>comment</i> a text inside.\n"
+"   "
+msgstr ""
+"<b>!-- --></b> 元素可以<i>注释</i>内部的文本。\n"
+"   "
+
+#. i18n: file extrafiles line 630
+#: rc.cpp:4490
+#, no-c-format
+msgid ""
+"<figure id=&quot;&quot;>\n"
+"<title></title>\n"
+"<graphic fileref=&quot;&quot;/>\n"
+"</figure>\n"
+msgstr ""
+
+#. i18n: file extrafiles line 638
+#: rc.cpp:4497
+#, no-c-format
+msgid ""
+"<example role=&quot;codelisting&quot; id=&quot;&quot;>\n"
+"<title></title>\n"
+"<programlisting><![CDATA[\n"
+"\n"
+"]]></programlisting>\n"
+"</example>"
+msgstr ""
+
+#. i18n: file extrafiles line 677
+#: rc.cpp:4505
+#, no-c-format
+msgid "XML Tools"
+msgstr "XML 工具"
+
+#. i18n: file extrafiles line 685
+#: rc.cpp:4508
+#, no-c-format
+msgid "Docbook - UI"
+msgstr ""
+
+#. i18n: file extrafiles line 802
+#: rc.cpp:4517 rc.cpp:4822
 #, no-c-format
 msgid ""
 "The <b>FONT</b> element allows authors to suggest rudimentary <i>"
@@ -7411,8 +7558,8 @@ msgstr ""
 "<b>FONT</b> 元素允许作者建议<i>基本的字体大小的变动</i>。\n"
 "   "
 
-#. i18n: file extrafiles line 45
-#: rc.cpp:4428 rc.cpp:4490
+#. i18n: file extrafiles line 809
+#: rc.cpp:4521 rc.cpp:4826
 #, no-c-format
 msgid ""
 "This <b>SIZE=+1</b> element allows to <i>increase</i> font.\n"
@@ -7421,8 +7568,8 @@ msgstr ""
 "<b>SIZE=+1</b> 元素允许<i>增大</i>字体。\n"
 "   "
 
-#. i18n: file extrafiles line 51
-#: rc.cpp:4432 rc.cpp:4494
+#. i18n: file extrafiles line 815
+#: rc.cpp:4525 rc.cpp:4830
 #, no-c-format
 msgid ""
 "This <b>SIZE=-1</b> element allows to <i>decrease</i> font.\n"
@@ -7431,8 +7578,8 @@ msgstr ""
 "<b>SIZE=-1</b> 元素允许<i>减小</i>字体。\n"
 "   "
 
-#. i18n: file extrafiles line 57
-#: rc.cpp:4436 rc.cpp:4498 rc.cpp:4637 rc.cpp:4994
+#. i18n: file extrafiles line 821
+#: rc.cpp:4529 rc.cpp:4585 rc.cpp:4834 rc.cpp:4997
 #, no-c-format
 msgid ""
 "The <b>PRE</b> element allows to view <i>preformatted</i> text.\n"
@@ -7441,8 +7588,8 @@ msgstr ""
 "<b>PRE</b> 元素允许显示<i>预先格式化的</i>文字。\n"
 "   "
 
-#. i18n: file extrafiles line 64
-#: rc.cpp:4440 rc.cpp:4502 rc.cpp:4641
+#. i18n: file extrafiles line 828
+#: rc.cpp:4533 rc.cpp:4589 rc.cpp:4838
 #, no-c-format
 msgid ""
 "The <b>SUB</b> element is used for <i>subscripts</i>.\n"
@@ -7455,8 +7602,8 @@ msgstr ""
 "<br>- 公共属性\n"
 "   "
 
-#. i18n: file extrafiles line 71
-#: rc.cpp:4445 rc.cpp:4507 rc.cpp:4646
+#. i18n: file extrafiles line 835
+#: rc.cpp:4538 rc.cpp:4594 rc.cpp:4843
 #, no-c-format
 msgid ""
 "The <b>SUP</b> element is used for <i>superscripts</i>.\n"
@@ -7469,8 +7616,8 @@ msgstr ""
 "<br>- 公共属性\n"
 "   "
 
-#. i18n: file extrafiles line 79
-#: rc.cpp:4450 rc.cpp:4512 rc.cpp:4651
+#. i18n: file extrafiles line 843
+#: rc.cpp:4543 rc.cpp:4599 rc.cpp:4848
 #, no-c-format
 msgid ""
 "The <b>H1</b> element defines a <i>level-one heading</i>.\n"
@@ -7487,8 +7634,8 @@ msgstr ""
 "<br>- 公共属性\n"
 "   "
 
-#. i18n: file extrafiles line 87
-#: rc.cpp:4456 rc.cpp:4518 rc.cpp:4657
+#. i18n: file extrafiles line 851
+#: rc.cpp:4549 rc.cpp:4605 rc.cpp:4854
 #, no-c-format
 msgid ""
 "The <b>H2</b> element defines a <i>level-two heading</i>.\n"
@@ -7505,8 +7652,8 @@ msgstr ""
 "<br>- 公共属性\n"
 "   "
 
-#. i18n: file extrafiles line 95
-#: rc.cpp:4462 rc.cpp:4524 rc.cpp:4663
+#. i18n: file extrafiles line 859
+#: rc.cpp:4555 rc.cpp:4611 rc.cpp:4860
 #, no-c-format
 msgid ""
 "The <b>H3</b> element defines a <i>level-three heading</i>.\n"
@@ -7523,8 +7670,8 @@ msgstr ""
 "<br>- 公共属性\n"
 "   "
 
-#. i18n: file extrafiles line 103
-#: rc.cpp:4468 rc.cpp:4530 rc.cpp:4669
+#. i18n: file extrafiles line 867
+#: rc.cpp:4561 rc.cpp:4617 rc.cpp:4866
 #, no-c-format
 msgid ""
 "The <b>H4</b> element defines a <i>level-four heading</i>.\n"
@@ -7541,8 +7688,8 @@ msgstr ""
 "<br>- 公共属性\n"
 "   "
 
-#. i18n: file extrafiles line 111
-#: rc.cpp:4474 rc.cpp:4536 rc.cpp:4675
+#. i18n: file extrafiles line 875
+#: rc.cpp:4567 rc.cpp:4623 rc.cpp:4872
 #, no-c-format
 msgid ""
 "The <b>H5</b> element defines a <i>level-five heading</i>.\n"
@@ -7559,26 +7706,32 @@ msgstr ""
 "<br>- 公共属性\n"
 "   "
 
-#. i18n: file extrafiles line 117
-#: rc.cpp:4480 rc.cpp:4628
+#. i18n: file extrafiles line 884
+#: rc.cpp:4573
+#, fuzzy, no-c-format
+msgid "Debug"
+msgstr "PHP 调试"
+
+#. i18n: file extrafiles line 951
+#: rc.cpp:4579 rc.cpp:4810
 #, no-c-format
 msgid "Lists"
 msgstr "列表"
 
-#. i18n: file extrafiles line 261
-#: rc.cpp:4542 rc.cpp:4631
-#, no-c-format
-msgid "Tables"
-msgstr "表格"
-
-#. i18n: file extrafiles line 323
-#: rc.cpp:4545 rc.cpp:4634
+#. i18n: file extrafiles line 993
+#: rc.cpp:4582 rc.cpp:4813
 #, no-c-format
 msgid "Forms"
 msgstr "表单"
 
-#. i18n: file extrafiles line 385
-#: rc.cpp:4548 rc.cpp:4684 rc.cpp:4761
+#. i18n: file extrafiles line 1142
+#: rc.cpp:4629 rc.cpp:5160
+#, no-c-format
+msgid "Style"
+msgstr "样式"
+
+#. i18n: file extrafiles line 1167
+#: rc.cpp:4632 rc.cpp:4712 rc.cpp:4881
 #, no-c-format
 msgid ""
 "The <b>B</b> element suggests that text be rendered as <i>bold text</i>.\n"
@@ -7591,8 +7744,8 @@ msgstr ""
 "<br>- 公共属性\n"
 "   "
 
-#. i18n: file extrafiles line 392
-#: rc.cpp:4553 rc.cpp:4689 rc.cpp:4766
+#. i18n: file extrafiles line 1174
+#: rc.cpp:4637 rc.cpp:4717 rc.cpp:4886
 #, no-c-format
 msgid ""
 "The <b>I</b> element suggests that text be rendered as <i>italic text</i>.\n"
@@ -7605,8 +7758,8 @@ msgstr ""
 "<br>- 公共属性\n"
 "   "
 
-#. i18n: file extrafiles line 401
-#: rc.cpp:4558 rc.cpp:4694 rc.cpp:4771
+#. i18n: file extrafiles line 1183
+#: rc.cpp:4642 rc.cpp:4722 rc.cpp:4891
 #, no-c-format
 msgid ""
 "The <b>U</b> element, deprecated in HTML 4.0, suggests that text be rendered as "
@@ -7620,8 +7773,8 @@ msgstr ""
 "<br>- 公共属性\n"
 "   "
 
-#. i18n: file extrafiles line 408
-#: rc.cpp:4563 rc.cpp:4699 rc.cpp:4776
+#. i18n: file extrafiles line 1190
+#: rc.cpp:4647 rc.cpp:4727 rc.cpp:4896
 #, no-c-format
 msgid ""
 "The <b>BR</b> element forces a <i>break</i> in the current line of text.\n"
@@ -7638,8 +7791,8 @@ msgstr ""
 "<br>- 核心属性\n"
 "   "
 
-#. i18n: file extrafiles line 416
-#: rc.cpp:4569 rc.cpp:4705 rc.cpp:4782
+#. i18n: file extrafiles line 1198
+#: rc.cpp:4653 rc.cpp:4733 rc.cpp:4902
 #, no-c-format
 msgid ""
 "The <b>P</b> element defines a <i>paragraph</i>.\n"
@@ -7656,14 +7809,14 @@ msgstr ""
 "<br>- 公共属性\n"
 "   "
 
-#. i18n: file extrafiles line 419
-#: rc.cpp:4575 rc.cpp:4711 rc.cpp:4788
+#. i18n: file extrafiles line 1201
+#: rc.cpp:4659 rc.cpp:4739 rc.cpp:4908
 #, no-c-format
 msgid "&nbsp;"
 msgstr "&nbsp;"
 
-#. i18n: file extrafiles line 422
-#: rc.cpp:4578 rc.cpp:4714 rc.cpp:4791
+#. i18n: file extrafiles line 1204
+#: rc.cpp:4662 rc.cpp:4742 rc.cpp:4911
 #, no-c-format
 msgid ""
 "Inserting <b>nbsp</b>.\n"
@@ -7674,8 +7827,8 @@ msgstr ""
 "     不间断<i>空格</i>。\n"
 "   "
 
-#. i18n: file extrafiles line 429
-#: rc.cpp:4583 rc.cpp:4719 rc.cpp:4796
+#. i18n: file extrafiles line 1211
+#: rc.cpp:4667 rc.cpp:4747 rc.cpp:4916
 #, no-c-format
 msgid ""
 "The <b>A</b> element denotes an <i>anchor</i>--a hypertext link or the "
@@ -7688,8 +7841,8 @@ msgstr ""
 "     <b>HREF</b> 属性指定了到其它资源的超文本链接，如 <i>HTML</i> 文档或 <i>JPEG</i> 图像。\n"
 "   "
 
-#. i18n: file extrafiles line 435
-#: rc.cpp:4588 rc.cpp:4724 rc.cpp:4801 rc.cpp:5020
+#. i18n: file extrafiles line 1217
+#: rc.cpp:4672 rc.cpp:4752 rc.cpp:4921 rc.cpp:5017
 #, no-c-format
 msgid ""
 "The <b>IMG</b> element specifies an <i>inline</i> image.\n"
@@ -7700,8 +7853,8 @@ msgstr ""
 "     必需的 <b>SRC</b> 属性指定了图像的位置。\n"
 "   "
 
-#. i18n: file extrafiles line 441
-#: rc.cpp:4593 rc.cpp:4729 rc.cpp:4806
+#. i18n: file extrafiles line 1223
+#: rc.cpp:4677 rc.cpp:4757 rc.cpp:4926
 #, no-c-format
 msgid ""
 "The <b>HR</b> element defines a <i>horizontal rule</i> for visual browsers.\n"
@@ -7713,18 +7866,8 @@ msgstr ""
 "     由于此元素本身的形象很直观，所以可被用于结构上的分节符。\n"
 "   "
 
-#. i18n: file extrafiles line 447
-#: rc.cpp:4598 rc.cpp:4734 rc.cpp:4811 rc.cpp:4870
-#, no-c-format
-msgid ""
-"The <b>!-- --></b> element <i>comment</i> a text inside.\n"
-"   "
-msgstr ""
-"<b>!-- --></b> 元素可以<i>注释</i>内部的文本。\n"
-"   "
-
-#. i18n: file extrafiles line 454
-#: rc.cpp:4602 rc.cpp:4738 rc.cpp:4815
+#. i18n: file extrafiles line 1236
+#: rc.cpp:4686 rc.cpp:4766 rc.cpp:4935
 #, no-c-format
 msgid ""
 "The <b>DIV ALIGN</b>=<i>left</i>\n"
@@ -7736,8 +7879,8 @@ msgstr ""
 "     建议区域内容的水平对齐为<i>左对齐</i>。\n"
 "   "
 
-#. i18n: file extrafiles line 461
-#: rc.cpp:4607 rc.cpp:4743 rc.cpp:4820
+#. i18n: file extrafiles line 1243
+#: rc.cpp:4691 rc.cpp:4771 rc.cpp:4940
 #, no-c-format
 msgid ""
 "The <b>DIV ALIGN</b>=<i>center</i> or <b>CENTER</b>\n"
@@ -7749,8 +7892,8 @@ msgstr ""
 "     建议区域内容的水平对齐为<i>居中对齐</i>。\n"
 "   "
 
-#. i18n: file extrafiles line 468
-#: rc.cpp:4612 rc.cpp:4748 rc.cpp:4825
+#. i18n: file extrafiles line 1250
+#: rc.cpp:4696 rc.cpp:4776 rc.cpp:4945
 #, no-c-format
 msgid ""
 "The <b>DIV ALIGN</b>=<i>right</i>\n"
@@ -7762,8 +7905,8 @@ msgstr ""
 "     建议区域内容的水平对齐为<i>右对齐</i>。\n"
 "   "
 
-#. i18n: file extrafiles line 475
-#: rc.cpp:4617 rc.cpp:4753 rc.cpp:4830
+#. i18n: file extrafiles line 1257
+#: rc.cpp:4701 rc.cpp:4781 rc.cpp:4950
 #, no-c-format
 msgid ""
 "The <b>DIV ALIGN</b>=<i>justify</i>\n"
@@ -7775,205 +7918,74 @@ msgstr ""
 "     建议区域内容的水平对齐为<i>两端对齐</i>。\n"
 "   "
 
-#. i18n: file extrafiles line 481
-#: rc.cpp:4622 rc.cpp:4758 rc.cpp:4835
+#. i18n: file extrafiles line 1267
+#: rc.cpp:4706 rc.cpp:4786 rc.cpp:4955
 #, no-c-format
 msgid "Standard"
 msgstr "标准"
 
-#. i18n: file extrafiles line 518
-#: rc.cpp:4625
-#, no-c-format
-msgid "CFML"
-msgstr "CFML"
-
-#. i18n: file extrafiles line 787
-#: rc.cpp:4681 rc.cpp:5167
-#, no-c-format
-msgid "Style"
-msgstr "样式"
-
-#. i18n: file extrafiles line 1109
-#: rc.cpp:4841
-#, no-c-format
-msgid "Docbook - UI"
-msgstr ""
-
-#. i18n: file extrafiles line 1153
-#: rc.cpp:4844 rc.cpp:4892 rc.cpp:4937
-#, no-c-format
-msgid "tagxml"
-msgstr ""
-
-#. i18n: file extrafiles line 1203
-#: rc.cpp:4847
-#, no-c-format
-msgid ""
-"<chapter id=&quot;&quot;>\n"
-"<!--  -->\n"
-"\n"
-"<title></title>\n"
-"\n"
-"<para></para>\n"
-"\n"
-"\n"
-"\n"
-"<sect1>\n"
-"\n"
-"<title></title>\n"
-"\n"
-"<para></para>\n"
-"\n"
-"</sect1>\n"
-"\n"
-"\n"
-"\n"
-"</chapter>\n"
-msgstr ""
-
-#. i18n: file extrafiles line 1256
-#: rc.cpp:4874
-#, no-c-format
-msgid ""
-"<figure id=&quot;&quot;>\n"
-"<title></title>\n"
-"<graphic fileref=&quot;&quot;/>\n"
-"</figure>\n"
-msgstr ""
-
-#. i18n: file extrafiles line 1264
-#: rc.cpp:4881
-#, no-c-format
-msgid ""
-"<example role=&quot;codelisting&quot; id=&quot;&quot;>\n"
-"<title></title>\n"
-"<programlisting><![CDATA[\n"
-"\n"
-"]]></programlisting>\n"
-"</example>"
-msgstr ""
-
-#. i18n: file extrafiles line 1303
-#: rc.cpp:4889
-#, no-c-format
-msgid "XML Tools"
-msgstr "XML 工具"
-
-#. i18n: file extrafiles line 1404
-#: rc.cpp:4895
-#, no-c-format
-msgid "TDE DocBook Admonitions"
-msgstr ""
-
-#. i18n: file extrafiles line 1462
-#: rc.cpp:4898
-#, no-c-format
-msgid "TDE DocBook Tables"
-msgstr "TDE DocBook 表格"
-
-#. i18n: file extrafiles line 1523
-#: rc.cpp:4901
-#, no-c-format
-msgid "TDE DocBook Images"
-msgstr "TDE DocBook 图像"
-
-#. i18n: file extrafiles line 1602
-#: rc.cpp:4904
-#, no-c-format
-msgid "TDE DocBook Lists"
-msgstr "TDE DocBook 列表"
-
-#. i18n: file extrafiles line 1627
-#: rc.cpp:4907
-#, no-c-format
-msgid "TDE DocBook Standard"
-msgstr "TDE DocBook 标准"
-
-#. i18n: file extrafiles line 1703
-#: rc.cpp:4910
+#. i18n: file extrafiles line 1336
+#: rc.cpp:4709 rc.cpp:4878
 #, no-c-format
-msgid "UI Elements"
-msgstr "界面元素"
-
-#. i18n: file extrafiles line 1779
-#: rc.cpp:4913
-#, no-c-format
-msgid "Tools"
-msgstr "工具"
+msgid "Tables"
+msgstr "表格"
 
-#. i18n: file extrafiles line 1812
-#: dialogs/tagdialogs/tagdialog.cpp:192 rc.cpp:4919
+#. i18n: file extrafiles line 1511
+#: rc.cpp:4792
 #, no-c-format
-msgid "Main"
-msgstr "主要"
-
-#. i18n: file extrafiles line 1852
-#: rc.cpp:4922 rc.cpp:5283
-#, fuzzy, no-c-format
-msgid "complexType"
-msgstr "MIME 类型"
+msgid "Misc."
+msgstr "杂类"
 
-#. i18n: file extrafiles line 1926
-#: rc.cpp:4925
+#. i18n: file extrafiles line 1555
+#: rc.cpp:4795
 #, fuzzy, no-c-format
 msgid "Facets"
 msgstr "浮动："
 
-#. i18n: file extrafiles line 2000
-#: rc.cpp:4928 treeviews/tagattributetree.cpp:295
-#, no-c-format
-msgid "Attributes"
-msgstr "属性"
-
-#. i18n: file extrafiles line 2024
-#: rc.cpp:4931
-#, no-c-format
-msgid "Misc."
-msgstr "杂类"
+#. i18n: file extrafiles line 1629
+#: rc.cpp:4798 rc.cpp:5255
+#, fuzzy, no-c-format
+msgid "complexType"
+msgstr "MIME 类型"
 
-#. i18n: file extrafiles line 2068
-#: rc.cpp:4934 rc.cpp:5317
+#. i18n: file extrafiles line 1703
+#: rc.cpp:4801 rc.cpp:5267
 #, fuzzy, no-c-format
 msgid "simpleType"
 msgstr "MIME 类型"
 
-#. i18n: file extrafiles line 2125
-#: rc.cpp:4940
+#. i18n: file extrafiles line 1733
+#: rc.cpp:4804 treeviews/tagattributetree.cpp:295
 #, no-c-format
-msgid ""
-"<?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>\n"
-"<!DOCTYPE TAGS>\n"
-"<TAGS>\n"
-"\n"
-"</TAGS>\n"
-msgstr ""
+msgid "Attributes"
+msgstr "属性"
 
-#. i18n: file extrafiles line 2184
-#: rc.cpp:4948
+#. i18n: file extrafiles line 1757
+#: dialogs/tagdialogs/tagdialog.cpp:192 rc.cpp:4807
 #, no-c-format
-msgid ""
-"<children>\n"
-"<child name=&quot;&quot; />\n"
-"</children>"
-msgstr ""
+msgid "Main"
+msgstr "主要"
 
-#. i18n: file extrafiles line 2189
-#: rc.cpp:4953
+#. i18n: file extrafiles line 1908
+#: rc.cpp:4816
 #, no-c-format
-msgid ""
-"<stoppingtags>\n"
-"<stoppingtag name=&quot;&quot; />\n"
-"</stoppingtags>"
-msgstr ""
+msgid "CFML"
+msgstr "CFML"
 
-#. i18n: file extrafiles line 2195
+#. i18n: file extrafiles line 2214
 #: rc.cpp:4958
 #, fuzzy, no-c-format
 msgid "forms"
 msgstr "Form3"
 
-#. i18n: file extrafiles line 2231
-#: rc.cpp:4961
+#. i18n: file extrafiles line 2247
+#: rc.cpp:4961 rc.cpp:5030
+#, no-c-format
+msgid "table"
+msgstr "table"
+
+#. i18n: file extrafiles line 2269
+#: rc.cpp:4964
 #, fuzzy, no-c-format
 msgid ""
 "The <b>B</b> element suggests that text be rendered as <i>bold text</i>.\n"
@@ -7984,8 +7996,8 @@ msgstr ""
 "<br>- 公共属性\n"
 "   "
 
-#. i18n: file extrafiles line 2234
-#: rc.cpp:4965
+#. i18n: file extrafiles line 2272
+#: rc.cpp:4968
 #, fuzzy, no-c-format
 msgid ""
 "The <b>B</b> element suggests that text be rendered as <i>emphasized text</i>.\n"
@@ -7996,8 +8008,8 @@ msgstr ""
 "<br>- 公共属性\n"
 "   "
 
-#. i18n: file extrafiles line 2243
-#: rc.cpp:4969
+#. i18n: file extrafiles line 2281
+#: rc.cpp:4972
 #, fuzzy, no-c-format
 msgid ""
 "The <b>I</b> element suggests that text be rendered as <i>italic text</i>.\n"
@@ -8008,8 +8020,8 @@ msgstr ""
 "<br>- 公共属性\n"
 "   "
 
-#. i18n: file extrafiles line 2248
-#: rc.cpp:4973
+#. i18n: file extrafiles line 2286
+#: rc.cpp:4976
 #, fuzzy, no-c-format
 msgid ""
 "The <b>U</b> element suggests that text be rendered as <i>underlined text</i>.\n"
@@ -8020,8 +8032,8 @@ msgstr ""
 "<br>- 公共属性\n"
 "   "
 
-#. i18n: file extrafiles line 2251
-#: rc.cpp:4977
+#. i18n: file extrafiles line 2289
+#: rc.cpp:4980
 #, fuzzy, no-c-format
 msgid ""
 "The <b>small</b> element suggests that text be rendered as a <i>small font</i>"
@@ -8033,8 +8045,8 @@ msgstr ""
 "<br>- 公共属性\n"
 "   "
 
-#. i18n: file extrafiles line 2258
-#: rc.cpp:4981
+#. i18n: file extrafiles line 2296
+#: rc.cpp:4984
 #, fuzzy, no-c-format
 msgid ""
 "The <b>big</b> element suggests that text be rendered as a <i>big font</i>.\n"
@@ -8045,8 +8057,8 @@ msgstr ""
 "<br>- 公共属性\n"
 "   "
 
-#. i18n: file extrafiles line 2265
-#: rc.cpp:4985
+#. i18n: file extrafiles line 2303
+#: rc.cpp:4988
 #, fuzzy, no-c-format
 msgid ""
 "The <b>br</b> element forces a <i>break</i> in the current line of text.\n"
@@ -8055,8 +8067,8 @@ msgstr ""
 "<b>!-- --></b> 元素可以<i>注释</i>内部的文本。\n"
 "   "
 
-#. i18n: file extrafiles line 2275
-#: rc.cpp:4989
+#. i18n: file extrafiles line 2313
+#: rc.cpp:4992
 #, fuzzy, no-c-format
 msgid ""
 "The <b>P</b> element defines a <i>paragraph</i>.\n"
@@ -8071,32 +8083,20 @@ msgstr ""
 "<br>- 公共属性\n"
 "   "
 
-#. i18n: file extrafiles line 2287
-#: rc.cpp:4998
+#. i18n: file extrafiles line 2325
+#: rc.cpp:5001
 #, no-c-format
 msgid "text"
 msgstr "text"
 
-#. i18n: file extrafiles line 2333
-#: rc.cpp:5001
-#, no-c-format
-msgid "deck"
-msgstr "dec"
-
-#. i18n: file extrafiles line 2343
-#: rc.cpp:5004 rc.cpp:5216
-#, no-c-format
-msgid "table"
-msgstr "table"
-
-#. i18n: file extrafiles line 2362
-#: rc.cpp:5007
+#. i18n: file extrafiles line 2342
+#: rc.cpp:5004
 #, no-c-format
 msgid "misc."
 msgstr "misc."
 
-#. i18n: file extrafiles line 2379
-#: rc.cpp:5010
+#. i18n: file extrafiles line 2359
+#: rc.cpp:5007
 #, fuzzy, no-c-format
 msgid ""
 "The <b>anchor</b> element denotes an <i>anchor</i>-- a link to formatted text.\n"
@@ -8108,8 +8108,8 @@ msgstr ""
 "     <b>HREF</b> 属性指定了到其它资源的超文本链接，如 <i>HTML</i> 文档或 <i>JPEG</i> 图像。\n"
 "   "
 
-#. i18n: file extrafiles line 2383
-#: rc.cpp:5015
+#. i18n: file extrafiles line 2363
+#: rc.cpp:5012
 #, fuzzy, no-c-format
 msgid ""
 "The <b>a</b> element denotes an <i>anchor</i>--a hypertext link or the "
@@ -8122,857 +8122,857 @@ msgstr ""
 "     <b>HREF</b> 属性指定了到其它资源的超文本链接，如 <i>HTML</i> 文档或 <i>JPEG</i> 图像。\n"
 "   "
 
-#. i18n: file extrafiles line 2445
+#. i18n: file extrafiles line 2421
+#: rc.cpp:5022
+#, no-c-format
+msgid "deck"
+msgstr "dec"
+
+#. i18n: file extrafiles line 2464
 #: rc.cpp:5025
 #, fuzzy, no-c-format
 msgid "tasks"
 msgstr "列数："
 
-#. i18n: file extrafiles line 2460
-#: rc.cpp:5028
-#, fuzzy, no-c-format
-msgid "Debug"
-msgstr "PHP 调试"
-
-#: rc.cpp:5029 rc.cpp:5046
-msgid "Font..."
-msgstr "字体..."
-
-#: rc.cpp:5030 rc.cpp:5047
-msgid "Font Size+1"
-msgstr "字体大小+1"
-
-#: rc.cpp:5031 rc.cpp:5048
-msgid "Font Size-1"
-msgstr "字体大小-1"
-
-#: rc.cpp:5032 rc.cpp:5049 rc.cpp:5124
-msgid "Pre"
-msgstr "Pre"
-
-#: rc.cpp:5033 rc.cpp:5050 rc.cpp:5125
-msgid "Subscript"
-msgstr "下标"
-
-#: rc.cpp:5034 rc.cpp:5051 rc.cpp:5126
-msgid "Superscript"
-msgstr "上标"
-
-#: rc.cpp:5035 rc.cpp:5052 rc.cpp:5127
-msgid "Head 1 Level"
-msgstr ""
-
-#: rc.cpp:5036 rc.cpp:5053 rc.cpp:5128
-msgid "Head 2 Level"
-msgstr ""
-
-#: rc.cpp:5037 rc.cpp:5054 rc.cpp:5129
-msgid "Head 3 Level"
-msgstr ""
-
-#: rc.cpp:5038 rc.cpp:5055 rc.cpp:5130
-msgid "Head 4 Level"
-msgstr ""
-
-#: rc.cpp:5039 rc.cpp:5056 rc.cpp:5131
-msgid "Head 5 Level"
-msgstr ""
-
-#: rc.cpp:5040 rc.cpp:5093
-msgid "Unordered List"
-msgstr "无序列表"
-
-#: rc.cpp:5041 rc.cpp:5094
-msgid "Ordered List"
-msgstr "有序列表"
-
-#: rc.cpp:5042 rc.cpp:5095
-msgid "List Item"
-msgstr "列表项"
-
-#: rc.cpp:5043 rc.cpp:5096
-msgid "Definition List"
-msgstr "定义列表"
-
-#: rc.cpp:5044 rc.cpp:5097
-msgid "Definition Term"
-msgstr "定义术语"
-
-#: rc.cpp:5045 rc.cpp:5098
-msgid "Definition"
-msgstr "定义"
-
-#: rc.cpp:5057 rc.cpp:5099 rc.cpp:5192 utility/tagactionset.cpp:333
-msgid "Table"
-msgstr "表格"
-
-#: rc.cpp:5058 rc.cpp:5100
-msgid "Table Row (with dialog)"
-msgstr "表格行(带对话框)"
-
-#: rc.cpp:5059 rc.cpp:5101
-msgid "Table Body (with dialog)"
-msgstr "表格体(带对话框)"
-
-#: rc.cpp:5060 rc.cpp:5102
-msgid "Table Head (with dialog)"
-msgstr "表头(带对话框)"
-
-#: rc.cpp:5061 rc.cpp:5103
-msgid "Table Data (with dialog)"
-msgstr "表格数据(带对话框)"
-
-#: rc.cpp:5062 rc.cpp:5104
-msgid "Table Body"
-msgstr "表体"
-
-#: rc.cpp:5063 rc.cpp:5105
-msgid "Table Head"
-msgstr "表头"
-
-#: rc.cpp:5064 rc.cpp:5106
-msgid "Table Row"
-msgstr "表格行"
-
-#: rc.cpp:5065 rc.cpp:5107
-msgid "Table Data"
-msgstr "表格数据"
-
-#: rc.cpp:5066 rc.cpp:5108
-msgid "Caption"
-msgstr "标题"
-
-#: rc.cpp:5067 rc.cpp:5109
-msgid "Form"
-msgstr "表单"
-
-#: rc.cpp:5068 rc.cpp:5110
-msgid "Select"
-msgstr "选择"
-
-#: rc.cpp:5069 rc.cpp:5112
-msgid "Check Button"
-msgstr "复选框"
-
-#: rc.cpp:5070 rc.cpp:5113
-msgid "Radio Button"
-msgstr "单选钮"
-
-#: rc.cpp:5071 rc.cpp:5115
-msgid "Text Area"
-msgstr "文本区域"
-
-#: rc.cpp:5072 rc.cpp:5116
-msgid "Input Password"
-msgstr "输入密码"
-
-#: rc.cpp:5073 rc.cpp:5117
-msgid "Input Text"
-msgstr "输入文本"
-
-#: rc.cpp:5074 rc.cpp:5120
-msgid "Submit"
-msgstr "提交"
-
-#: rc.cpp:5077
-msgid "Bold"
-msgstr "粗体"
-
-#: rc.cpp:5079 rc.cpp:5135 rc.cpp:5151
-msgid "Underline"
-msgstr "下划线"
-
-#: rc.cpp:5080 rc.cpp:5136 rc.cpp:5152
-msgid "New Line"
-msgstr "新行"
-
-#: rc.cpp:5081 rc.cpp:5137 rc.cpp:5153
-msgid "Paragraph"
-msgstr "段落"
-
-#: rc.cpp:5082 rc.cpp:5138 rc.cpp:5154
-msgid "Non Breaking Space"
-msgstr "不间断空格"
-
-#: rc.cpp:5083 rc.cpp:5139 rc.cpp:5155 rc.cpp:5185
-msgid "Anchor..."
-msgstr "锚..."
-
-#: rc.cpp:5084 rc.cpp:5140 rc.cpp:5156
-msgid "Image..."
-msgstr "图像..."
-
-#: rc.cpp:5085 rc.cpp:5141 rc.cpp:5157
-msgid "Horizontal Line"
-msgstr "水平线"
-
-#: rc.cpp:5087 rc.cpp:5143
-msgid "Align Left"
-msgstr "左对齐"
-
-#: rc.cpp:5088 rc.cpp:5144
-msgid "Align Center"
-msgstr "居中对齐"
-
-#: rc.cpp:5089 rc.cpp:5145
-msgid "Align Right"
-msgstr "靠右对齐"
-
-#: rc.cpp:5090 rc.cpp:5146
-msgid "Align Justify"
-msgstr "两端对齐"
-
-#: rc.cpp:5091 rc.cpp:5164
-msgid "Time"
-msgstr "时间"
-
-#: rc.cpp:5111
-msgid "Option"
-msgstr "选项"
-
-#: rc.cpp:5114 rc.cpp:5170
-msgid "Button"
-msgstr "按钮"
-
-#: rc.cpp:5118
-msgid "Fieldset"
-msgstr "Fieldset"
-
-#: rc.cpp:5119
-msgid "Legend"
-msgstr "Legend"
-
-#: rc.cpp:5122 rc.cpp:5147 rc.cpp:5163
-msgid "Span"
-msgstr "Span"
-
-#: rc.cpp:5123
-msgid "Div"
-msgstr "Div"
-
-#: rc.cpp:5132 rc.cpp:5148
-msgid "Quick Start Dialog"
-msgstr "快速启动对话框"
-
-#: rc.cpp:5165 rc.cpp:5350
-msgid "Meta"
-msgstr "Meta"
-
-#: rc.cpp:5166
-msgid "Base"
-msgstr "Base"
-
-#: parts/kafka/wkafkapart.cpp:71 rc.cpp:5168
-msgid "Link"
-msgstr "链接"
-
-#: rc.cpp:5169
-msgid "Application Name"
-msgstr "应用程序名称"
-
-#: rc.cpp:5172
-msgid "Label"
-msgstr "标签"
-
-#: rc.cpp:5173
-msgid "Menu"
-msgstr "菜单"
-
-#: rc.cpp:5174
-msgid "menu item"
-msgstr "菜单项"
-
-#: rc.cpp:5175
-msgid "Sub menu"
-msgstr "子菜单"
-
-#: rc.cpp:5178 rc.cpp:5214 rc.cpp:5247 rc.cpp:5255
-msgid "para"
-msgstr "para"
-
-#: rc.cpp:5180 rc.cpp:5208
-#, fuzzy
-msgid "note"
-msgstr "none"
-
-#: rc.cpp:5181 rc.cpp:5249
-#, fuzzy
-msgid "sect1"
-msgstr "重新分析(&R)"
-
-#: rc.cpp:5182 rc.cpp:5250
-#, fuzzy
-msgid "sect2"
-msgstr "重新分析(&R)"
-
-#: rc.cpp:5183 rc.cpp:5251
-#, fuzzy
-msgid "sect3"
-msgstr "重新分析(&R)"
-
-#: rc.cpp:5184 rc.cpp:5252
-#, fuzzy
-msgid "sect4"
-msgstr "重新分析(&R)"
-
-#: rc.cpp:5186
-msgid "Web Link"
-msgstr "Web 链接"
-
-#: rc.cpp:5188
-#, fuzzy
-msgid "programlisting"
-msgstr "拆分"
-
-#: rc.cpp:5189
-msgid "List"
-msgstr "列表"
-
-#: rc.cpp:5190 rc.cpp:5324
-msgid "Items"
-msgstr "项目"
-
-#: rc.cpp:5191
-msgid "Emphasis"
-msgstr "强调"
-
-#: rc.cpp:5193
-#, fuzzy
-msgid "amp"
-msgstr "模板(&T):"
-
-#: rc.cpp:5194
-msgid "CDATA"
-msgstr ""
-
-#: rc.cpp:5195
-msgid "XML Validator"
-msgstr "XML 校验工具"
-
-#: rc.cpp:5196
-msgid "XSLT Processor"
-msgstr "XSLT 处理器"
-
-#: rc.cpp:5197
-msgid "Class Name"
-msgstr "类名称"
-
-#: rc.cpp:5198
-#, fuzzy
-msgid "Metod Name"
-msgstr "结点名称"
-
-#: components/debugger/backtracelistview.cpp:61
-#: components/debugger/debuggerbreakpointview.cpp:62 rc.cpp:5199
-msgid "Function"
-msgstr "函数"
-
-#: rc.cpp:5201
-msgid "Var Name"
-msgstr "变量名称"
-
-#: rc.cpp:5202
-msgid "Command Line"
-msgstr "命令行"
-
-#: rc.cpp:5203
-msgid "Parameter"
-msgstr "参数"
-
-#: rc.cpp:5204
-msgid "Prompt"
-msgstr "提示"
-
-#: rc.cpp:5205
-#, fuzzy
-msgid "warning"
-msgstr "警告 - "
-
-#: rc.cpp:5206
-#, fuzzy
-msgid "caution"
-msgstr "位置"
-
-#: rc.cpp:5207
-#, fuzzy
-msgid "important"
-msgstr "模板树视图"
-
-#: rc.cpp:5209
-msgid "tip"
-msgstr "tip"
-
-#: rc.cpp:5210
-#, fuzzy
-msgid "footnote"
-msgstr "none"
-
-#: rc.cpp:5211
-msgid "footnoteref"
-msgstr ""
-
-#: rc.cpp:5212
-#, fuzzy
-msgid "example"
-msgstr "模板(&T):"
-
-#: rc.cpp:5213
-#, fuzzy
-msgid "informalexample"
-msgstr "normal"
-
-#: rc.cpp:5215
+#: rc.cpp:5029
 msgid "Table Wizard"
 msgstr "表格向导"
 
-#: rc.cpp:5217 rc.cpp:5254
+#: rc.cpp:5031 rc.cpp:5070
 #, fuzzy
 msgid "title"
 msgstr "标题："
 
-#: rc.cpp:5218
+#: rc.cpp:5032
 #, fuzzy
 msgid "informaltable"
 msgstr "normal"
 
-#: rc.cpp:5219
+#: rc.cpp:5033
 #, fuzzy
 msgid "tgroup"
 msgstr "顶："
 
-#: rc.cpp:5220
+#: rc.cpp:5034
 #, fuzzy
 msgid "thead"
 msgstr "就绪"
 
-#: rc.cpp:5221
+#: rc.cpp:5035
 #, fuzzy
 msgid "tbody"
 msgstr "bold"
 
-#: rc.cpp:5222
+#: rc.cpp:5036
 msgid "row"
 msgstr ""
 
-#: rc.cpp:5223
+#: rc.cpp:5037
 #, fuzzy
 msgid "entry"
 msgstr "center"
 
-#: rc.cpp:5224
+#: rc.cpp:5038
 msgid "Image Wizard"
 msgstr "图像向导"
 
-#: rc.cpp:5225
+#: rc.cpp:5039
 #, fuzzy
 msgid "screenshot"
 msgstr "repeat"
 
-#: rc.cpp:5226
+#: rc.cpp:5040
 #, fuzzy
 msgid "screeninfo"
 msgstr "serif"
 
-#: rc.cpp:5227
+#: rc.cpp:5041
 #, fuzzy
 msgid "mediaobject"
 msgstr "主题："
 
-#: rc.cpp:5228
+#: rc.cpp:5042
 msgid "inlinemediaobject"
 msgstr ""
 
-#: rc.cpp:5229
+#: rc.cpp:5043
 #, fuzzy
 msgid "imageobject"
 msgstr "主题："
 
-#: rc.cpp:5230
+#: rc.cpp:5044
 msgid "imagedata"
 msgstr ""
 
-#: rc.cpp:5231
+#: rc.cpp:5045
 msgid "textobject"
 msgstr ""
 
-#: rc.cpp:5232
+#: rc.cpp:5046
 #, fuzzy
 msgid "phrase"
 msgstr "pre"
 
-#: rc.cpp:5233
+#: rc.cpp:5047
 #, fuzzy
 msgid "caption"
 msgstr "位置"
 
-#: rc.cpp:5234
+#: rc.cpp:5048
 msgid "List Wizard"
 msgstr "列表向导"
 
-#: rc.cpp:5235
+#: rc.cpp:5049
 #, fuzzy
 msgid "orderedlist"
 msgstr "无序的"
 
-#: rc.cpp:5236
+#: rc.cpp:5050
 #, fuzzy
 msgid "itemizedlist"
 msgstr "文件列表(&F)："
 
-#: rc.cpp:5237
+#: rc.cpp:5051
 #, fuzzy
 msgid "listitem"
 msgstr "list-item"
 
-#: rc.cpp:5238
+#: rc.cpp:5052
 #, fuzzy
 msgid "variablelist"
 msgstr "文件列表(&F)："
 
-#: rc.cpp:5239
+#: rc.cpp:5053
 #, fuzzy
 msgid "varlistentry"
 msgstr "内容"
 
-#: rc.cpp:5240
+#: rc.cpp:5054
 #, fuzzy
 msgid "term"
 msgstr "过滤器"
 
-#: rc.cpp:5241
+#: rc.cpp:5055
 #, fuzzy
 msgid "varlistitem"
 msgstr "list-item"
 
-#: rc.cpp:5242
+#: rc.cpp:5056
 #, fuzzy
 msgid "procedure"
 msgstr "工程名称："
 
-#: rc.cpp:5243
+#: rc.cpp:5057
 #, fuzzy
 msgid "step"
 msgstr "top"
 
-#: rc.cpp:5244
+#: rc.cpp:5058
 #, fuzzy
 msgid "substeps"
 msgstr "top"
 
-#: rc.cpp:5245
+#: rc.cpp:5059
 #, fuzzy
 msgid "simplelist"
 msgstr "文件列表(&F)："
 
-#: rc.cpp:5246
+#: rc.cpp:5060
 #, fuzzy
 msgid "member"
 msgstr "显示行号(&L)"
 
-#: rc.cpp:5248
+#: rc.cpp:5061 rc.cpp:5071 rc.cpp:5086 rc.cpp:5112
+msgid "para"
+msgstr "para"
+
+#: rc.cpp:5062
+msgid "meinproc"
+msgstr "meinproc"
+
+#: rc.cpp:5063
+msgid "checkXML"
+msgstr ""
+
+#: rc.cpp:5064
 #, fuzzy
 msgid "chapter"
 msgstr "center"
 
-#: rc.cpp:5253
+#: rc.cpp:5065 rc.cpp:5115
+#, fuzzy
+msgid "sect1"
+msgstr "重新分析(&R)"
+
+#: rc.cpp:5066 rc.cpp:5116
+#, fuzzy
+msgid "sect2"
+msgstr "重新分析(&R)"
+
+#: rc.cpp:5067 rc.cpp:5117
+#, fuzzy
+msgid "sect3"
+msgstr "重新分析(&R)"
+
+#: rc.cpp:5068 rc.cpp:5118
+#, fuzzy
+msgid "sect4"
+msgstr "重新分析(&R)"
+
+#: rc.cpp:5069
 #, fuzzy
 msgid "sect5"
 msgstr "重新分析(&R)"
 
-#: rc.cpp:5256
+#: rc.cpp:5072
 #, fuzzy
 msgid "anchor"
 msgstr "锚..."
 
-#: rc.cpp:5257
+#: rc.cpp:5073
 msgid "xref"
 msgstr ""
 
-#: rc.cpp:5258
+#: rc.cpp:5074
 #, fuzzy
 msgid "link"
 msgstr "blink"
 
-#: rc.cpp:5259
+#: rc.cpp:5075
 #, fuzzy
 msgid "ulink"
 msgstr "blink"
 
-#: rc.cpp:5260
+#: rc.cpp:5076
 #, fuzzy
 msgid "email"
 msgstr "电子邮件："
 
-#: rc.cpp:5261
+#: rc.cpp:5077
+#, fuzzy
+msgid "warning"
+msgstr "警告 - "
+
+#: rc.cpp:5078
+#, fuzzy
+msgid "caution"
+msgstr "位置"
+
+#: rc.cpp:5079
+#, fuzzy
+msgid "important"
+msgstr "模板树视图"
+
+#: rc.cpp:5080 rc.cpp:5114
+#, fuzzy
+msgid "note"
+msgstr "none"
+
+#: rc.cpp:5081
+msgid "tip"
+msgstr "tip"
+
+#: rc.cpp:5082
+#, fuzzy
+msgid "footnote"
+msgstr "none"
+
+#: rc.cpp:5083
+msgid "footnoteref"
+msgstr ""
+
+#: rc.cpp:5084
+#, fuzzy
+msgid "example"
+msgstr "模板(&T):"
+
+#: rc.cpp:5085
+#, fuzzy
+msgid "informalexample"
+msgstr "normal"
+
+#: rc.cpp:5087
 msgid "guilabel"
 msgstr ""
 
-#: rc.cpp:5262
+#: rc.cpp:5088
 #, fuzzy
 msgid "guibutton"
 msgstr "右键："
 
-#: rc.cpp:5263
+#: rc.cpp:5089
 #, fuzzy
 msgid "guiicon"
 msgstr "函数"
 
-#: rc.cpp:5264
+#: rc.cpp:5090
 #, fuzzy
 msgid "menuchoice"
 msgstr "circle"
 
-#: rc.cpp:5265
+#: rc.cpp:5091
 #, fuzzy
 msgid "shortcut"
 msgstr "快捷键"
 
-#: rc.cpp:5266
+#: rc.cpp:5092
 #, fuzzy
 msgid "guimenu"
 msgstr "参数"
 
-#: rc.cpp:5267
+#: rc.cpp:5093
 #, fuzzy
 msgid "guimenuitem"
 msgstr "参数"
 
-#: rc.cpp:5268
+#: rc.cpp:5094
 #, fuzzy
 msgid "guisubmenu"
 msgstr "参数"
 
-#: rc.cpp:5269
+#: rc.cpp:5095
 msgid "keycombo"
 msgstr ""
 
-#: rc.cpp:5270
+#: rc.cpp:5096
 msgid "keycap"
 msgstr ""
 
-#: rc.cpp:5271
+#: rc.cpp:5097
 #, fuzzy
 msgid "action"
 msgstr "动作"
 
-#: rc.cpp:5272
-msgid "meinproc"
-msgstr "meinproc"
+#: rc.cpp:5098
+#, fuzzy
+msgid "New Tag file"
+msgstr "大小"
 
-#: rc.cpp:5273
-msgid "checkXML"
+#: rc.cpp:5101 rc.cpp:5124
+msgid "Items"
+msgstr "项目"
+
+#: rc.cpp:5102
+msgid "Item"
+msgstr "项目"
+
+#: rc.cpp:5108
+msgid "Children"
 msgstr ""
 
-#: rc.cpp:5274
+#: rc.cpp:5109
 #, fuzzy
-msgid "annotation"
-msgstr "位置"
+msgid "Stoppingtags"
+msgstr "添加结尾标签(&A)"
 
-#: rc.cpp:5275
-msgid "appInfo"
-msgstr ""
+#: rc.cpp:5119 rc.cpp:5198 rc.cpp:5224 rc.cpp:5325
+msgid "Anchor..."
+msgstr "锚..."
 
-#: rc.cpp:5276
-msgid "documentation"
-msgstr "文档"
+#: rc.cpp:5120
+msgid "Web Link"
+msgstr "Web 链接"
 
-#: rc.cpp:5277
+#: rc.cpp:5122
 #, fuzzy
-msgid "schema"
-msgstr "XML 大纲"
+msgid "programlisting"
+msgstr "拆分"
 
-#: rc.cpp:5278
-#, fuzzy
-msgid "element"
-msgstr "选择"
+#: rc.cpp:5123
+msgid "List"
+msgstr "列表"
 
-#: rc.cpp:5279
-#, fuzzy
-msgid "import"
-msgstr "导入的"
+#: rc.cpp:5125
+msgid "Emphasis"
+msgstr "强调"
 
-#: rc.cpp:5280
-#, fuzzy
-msgid "include"
-msgstr "inline"
+#: rc.cpp:5126 rc.cpp:5207 rc.cpp:5308 utility/tagactionset.cpp:333
+msgid "Table"
+msgstr "表格"
 
-#: rc.cpp:5281
+#: rc.cpp:5127
 #, fuzzy
-msgid "notation"
-msgstr "位置"
+msgid "amp"
+msgstr "模板(&T):"
 
-#: rc.cpp:5282
-#, fuzzy
-msgid "redefine"
-msgstr "名称"
+#: rc.cpp:5128
+msgid "CDATA"
+msgstr ""
 
-#: rc.cpp:5284
-#, fuzzy
-msgid "complexContent"
-msgstr "模板树视图"
+#: rc.cpp:5129
+msgid "XML Validator"
+msgstr "XML 校验工具"
 
-#: rc.cpp:5285
-#, fuzzy
-msgid "simpleContent"
-msgstr "模板树视图"
+#: rc.cpp:5130
+msgid "XSLT Processor"
+msgstr "XSLT 处理器"
 
-#: rc.cpp:5286
-#, fuzzy
-msgid "all"
-msgstr "small"
+#: rc.cpp:5131
+msgid "Application Name"
+msgstr "应用程序名称"
 
-#: rc.cpp:5287
-#, fuzzy
-msgid "choice"
-msgstr "circle"
+#: rc.cpp:5132 rc.cpp:5173
+msgid "Button"
+msgstr "按钮"
+
+#: rc.cpp:5134
+msgid "Label"
+msgstr "标签"
 
-#: rc.cpp:5288 rc.cpp:5312
+#: rc.cpp:5135
+msgid "Menu"
+msgstr "菜单"
+
+#: rc.cpp:5136
+msgid "menu item"
+msgstr "菜单项"
+
+#: rc.cpp:5137
+msgid "Sub menu"
+msgstr "子菜单"
+
+#: rc.cpp:5138
+msgid "Class Name"
+msgstr "类名称"
+
+#: rc.cpp:5139
 #, fuzzy
-msgid "group"
-msgstr "顶："
+msgid "Metod Name"
+msgstr "结点名称"
+
+#: components/debugger/backtracelistview.cpp:61
+#: components/debugger/debuggerbreakpointview.cpp:62 rc.cpp:5140
+msgid "Function"
+msgstr "函数"
+
+#: rc.cpp:5142
+msgid "Var Name"
+msgstr "变量名称"
+
+#: rc.cpp:5143
+msgid "Command Line"
+msgstr "命令行"
+
+#: rc.cpp:5144
+msgid "Parameter"
+msgstr "参数"
+
+#: rc.cpp:5145
+msgid "Prompt"
+msgstr "提示"
+
+#: rc.cpp:5146 rc.cpp:5297
+msgid "Font..."
+msgstr "字体..."
+
+#: rc.cpp:5147 rc.cpp:5298
+msgid "Font Size+1"
+msgstr "字体大小+1"
+
+#: rc.cpp:5148 rc.cpp:5299
+msgid "Font Size-1"
+msgstr "字体大小-1"
+
+#: rc.cpp:5149 rc.cpp:5183 rc.cpp:5300
+msgid "Pre"
+msgstr "Pre"
+
+#: rc.cpp:5150 rc.cpp:5184 rc.cpp:5301
+msgid "Subscript"
+msgstr "下标"
+
+#: rc.cpp:5151 rc.cpp:5185 rc.cpp:5302
+msgid "Superscript"
+msgstr "上标"
+
+#: rc.cpp:5152 rc.cpp:5186 rc.cpp:5303
+msgid "Head 1 Level"
+msgstr ""
+
+#: rc.cpp:5153 rc.cpp:5187 rc.cpp:5304
+msgid "Head 2 Level"
+msgstr ""
+
+#: rc.cpp:5154 rc.cpp:5188 rc.cpp:5305
+msgid "Head 3 Level"
+msgstr ""
+
+#: rc.cpp:5155 rc.cpp:5189 rc.cpp:5306
+msgid "Head 4 Level"
+msgstr ""
+
+#: rc.cpp:5156 rc.cpp:5190 rc.cpp:5307
+msgid "Head 5 Level"
+msgstr ""
+
+#: rc.cpp:5157 rc.cpp:5295
+msgid "Time"
+msgstr "时间"
+
+#: rc.cpp:5158 rc.cpp:5359
+msgid "Meta"
+msgstr "Meta"
+
+#: rc.cpp:5159
+msgid "Base"
+msgstr "Base"
+
+#: parts/kafka/wkafkapart.cpp:71 rc.cpp:5161
+msgid "Link"
+msgstr "链接"
 
-#: rc.cpp:5289
+#: rc.cpp:5162 rc.cpp:5280
+msgid "Unordered List"
+msgstr "无序列表"
+
+#: rc.cpp:5163 rc.cpp:5281
+msgid "Ordered List"
+msgstr "有序列表"
+
+#: rc.cpp:5164 rc.cpp:5282
+msgid "List Item"
+msgstr "列表项"
+
+#: rc.cpp:5165 rc.cpp:5283
+msgid "Definition List"
+msgstr "定义列表"
+
+#: rc.cpp:5166 rc.cpp:5284
+msgid "Definition Term"
+msgstr "定义术语"
+
+#: rc.cpp:5167 rc.cpp:5285
+msgid "Definition"
+msgstr "定义"
+
+#: rc.cpp:5168 rc.cpp:5286
+msgid "Form"
+msgstr "表单"
+
+#: rc.cpp:5169 rc.cpp:5287
+msgid "Select"
+msgstr "选择"
+
+#: rc.cpp:5170
+msgid "Option"
+msgstr "选项"
+
+#: rc.cpp:5171 rc.cpp:5288
+msgid "Check Button"
+msgstr "复选框"
+
+#: rc.cpp:5172 rc.cpp:5289
+msgid "Radio Button"
+msgstr "单选钮"
+
+#: rc.cpp:5174 rc.cpp:5290
+msgid "Text Area"
+msgstr "文本区域"
+
+#: rc.cpp:5175 rc.cpp:5291
+msgid "Input Password"
+msgstr "输入密码"
+
+#: rc.cpp:5176 rc.cpp:5292
+msgid "Input Text"
+msgstr "输入文本"
+
+#: rc.cpp:5177
+msgid "Fieldset"
+msgstr "Fieldset"
+
+#: rc.cpp:5178
+msgid "Legend"
+msgstr "Legend"
+
+#: rc.cpp:5179 rc.cpp:5293
+msgid "Submit"
+msgstr "提交"
+
+#: rc.cpp:5181 rc.cpp:5206 rc.cpp:5232
+msgid "Span"
+msgstr "Span"
+
+#: rc.cpp:5182
+msgid "Div"
+msgstr "Div"
+
+#: rc.cpp:5191 rc.cpp:5217
+msgid "Quick Start Dialog"
+msgstr "快速启动对话框"
+
+#: rc.cpp:5194 rc.cpp:5220 rc.cpp:5321
+msgid "Underline"
+msgstr "下划线"
+
+#: rc.cpp:5195 rc.cpp:5221 rc.cpp:5322
+msgid "New Line"
+msgstr "新行"
+
+#: rc.cpp:5196 rc.cpp:5222 rc.cpp:5323
+msgid "Paragraph"
+msgstr "段落"
+
+#: rc.cpp:5197 rc.cpp:5223 rc.cpp:5324
+msgid "Non Breaking Space"
+msgstr "不间断空格"
+
+#: rc.cpp:5199 rc.cpp:5225 rc.cpp:5326
+msgid "Image..."
+msgstr "图像..."
+
+#: rc.cpp:5200 rc.cpp:5226 rc.cpp:5327
+msgid "Horizontal Line"
+msgstr "水平线"
+
+#: rc.cpp:5202 rc.cpp:5329
+msgid "Align Left"
+msgstr "左对齐"
+
+#: rc.cpp:5203 rc.cpp:5330
+msgid "Align Center"
+msgstr "居中对齐"
+
+#: rc.cpp:5204 rc.cpp:5331
+msgid "Align Right"
+msgstr "靠右对齐"
+
+#: rc.cpp:5205 rc.cpp:5332
+msgid "Align Justify"
+msgstr "两端对齐"
+
+#: rc.cpp:5208 rc.cpp:5309
+msgid "Table Row (with dialog)"
+msgstr "表格行(带对话框)"
+
+#: rc.cpp:5209 rc.cpp:5310
+msgid "Table Body (with dialog)"
+msgstr "表格体(带对话框)"
+
+#: rc.cpp:5210 rc.cpp:5311
+msgid "Table Head (with dialog)"
+msgstr "表头(带对话框)"
+
+#: rc.cpp:5211 rc.cpp:5312
+msgid "Table Data (with dialog)"
+msgstr "表格数据(带对话框)"
+
+#: rc.cpp:5212 rc.cpp:5313
+msgid "Table Body"
+msgstr "表体"
+
+#: rc.cpp:5213 rc.cpp:5314
+msgid "Table Head"
+msgstr "表头"
+
+#: rc.cpp:5214 rc.cpp:5315
+msgid "Table Row"
+msgstr "表格行"
+
+#: rc.cpp:5215 rc.cpp:5316
+msgid "Table Data"
+msgstr "表格数据"
+
+#: rc.cpp:5216 rc.cpp:5317
+msgid "Caption"
+msgstr "标题"
+
+#: rc.cpp:5233
 #, fuzzy
-msgid "sequence"
-msgstr "baseline"
+msgid "annotation"
+msgstr "位置"
+
+#: rc.cpp:5234
+msgid "appInfo"
+msgstr ""
 
-#: rc.cpp:5290 rc.cpp:5308
+#: rc.cpp:5235
+msgid "documentation"
+msgstr "文档"
+
+#: rc.cpp:5236
 #, fuzzy
-msgid "attribute"
-msgstr "标签属性(&A)"
+msgid "any"
+msgstr "fantasy"
 
-#: rc.cpp:5291 rc.cpp:5309
+#: rc.cpp:5237
 #, fuzzy
-msgid "attributeGroup"
-msgstr "标签属性(&A)"
+msgid "field"
+msgstr "fixed"
 
-#: rc.cpp:5292 rc.cpp:5307
+#: rc.cpp:5238 rc.cpp:5260
 #, fuzzy
-msgid "anyAttribute"
-msgstr "标签属性(&A)"
+msgid "group"
+msgstr "顶："
+
+#: rc.cpp:5239
+msgid "key"
+msgstr ""
 
-#: rc.cpp:5293 rc.cpp:5318
+#: rc.cpp:5240
+msgid "keyref"
+msgstr ""
+
+#: rc.cpp:5241
 #, fuzzy
-msgid "restriction"
-msgstr "位置："
+msgid "selector"
+msgstr "选择器："
 
-#: rc.cpp:5294
+#: rc.cpp:5242
 #, fuzzy
-msgid "extension"
-msgstr "默认编码："
+msgid "unique"
+msgstr "oblique"
 
-#: rc.cpp:5295
+#: rc.cpp:5243
 #, fuzzy
 msgid "enumeration"
 msgstr "插件选项"
 
-#: rc.cpp:5296
+#: rc.cpp:5244
 msgid "pattern"
 msgstr "模式"
 
-#: rc.cpp:5297
+#: rc.cpp:5245
 msgid "totalDigits"
 msgstr ""
 
-#: rc.cpp:5298
+#: rc.cpp:5246
 msgid "fractionDigits"
 msgstr ""
 
-#: rc.cpp:5299
+#: rc.cpp:5247
 #, fuzzy
 msgid "length"
 msgstr "[长度值]"
 
-#: rc.cpp:5300
+#: rc.cpp:5248
 #, fuzzy
 msgid "maxLength"
 msgstr "[长度值]"
 
-#: rc.cpp:5301
+#: rc.cpp:5249
 #, fuzzy
 msgid "minLength"
 msgstr "[长度值]"
 
-#: rc.cpp:5302
+#: rc.cpp:5250
 #, fuzzy
 msgid "maxInclusive"
 msgstr "cursive"
 
-#: rc.cpp:5303
+#: rc.cpp:5251
 #, fuzzy
 msgid "minInclusive"
 msgstr "cursive"
 
-#: rc.cpp:5304
+#: rc.cpp:5252
 #, fuzzy
 msgid "maxExclusive"
 msgstr "cursive"
 
-#: rc.cpp:5305
+#: rc.cpp:5253
 #, fuzzy
 msgid "minExclusive"
 msgstr "cursive"
 
-#: rc.cpp:5306
+#: rc.cpp:5254
 #, fuzzy
 msgid "whiteSpace"
 msgstr "空白："
 
-#: rc.cpp:5310
+#: rc.cpp:5256
 #, fuzzy
-msgid "any"
-msgstr "fantasy"
+msgid "complexContent"
+msgstr "模板树视图"
 
-#: rc.cpp:5311
+#: rc.cpp:5257
 #, fuzzy
-msgid "field"
-msgstr "fixed"
+msgid "simpleContent"
+msgstr "模板树视图"
 
-#: rc.cpp:5313
-msgid "key"
-msgstr ""
+#: rc.cpp:5258
+#, fuzzy
+msgid "all"
+msgstr "small"
 
-#: rc.cpp:5314
-msgid "keyref"
-msgstr ""
+#: rc.cpp:5259
+#, fuzzy
+msgid "choice"
+msgstr "circle"
 
-#: rc.cpp:5315
+#: rc.cpp:5261
 #, fuzzy
-msgid "selector"
-msgstr "选择器："
+msgid "sequence"
+msgstr "baseline"
 
-#: rc.cpp:5316
+#: rc.cpp:5262 rc.cpp:5272
 #, fuzzy
-msgid "unique"
-msgstr "oblique"
+msgid "attribute"
+msgstr "标签属性(&A)"
 
-#: rc.cpp:5319
+#: rc.cpp:5263 rc.cpp:5273
+#, fuzzy
+msgid "attributeGroup"
+msgstr "标签属性(&A)"
+
+#: rc.cpp:5264 rc.cpp:5271
+#, fuzzy
+msgid "anyAttribute"
+msgstr "标签属性(&A)"
+
+#: rc.cpp:5265 rc.cpp:5268
+#, fuzzy
+msgid "restriction"
+msgstr "位置："
+
+#: rc.cpp:5266
+#, fuzzy
+msgid "extension"
+msgstr "默认编码："
+
+#: rc.cpp:5269
 #, fuzzy
 msgid "list"
 msgstr "inset"
 
-#: rc.cpp:5320
+#: rc.cpp:5270
 #, fuzzy
 msgid "union"
 msgstr "函数"
 
-#: rc.cpp:5321
+#: rc.cpp:5274
 #, fuzzy
-msgid "New Tag file"
-msgstr "大小"
+msgid "schema"
+msgstr "XML 大纲"
 
-#: rc.cpp:5325
-msgid "Item"
-msgstr "项目"
+#: rc.cpp:5275
+#, fuzzy
+msgid "element"
+msgstr "选择"
 
-#: rc.cpp:5331
-msgid "Children"
-msgstr ""
+#: rc.cpp:5276
+#, fuzzy
+msgid "import"
+msgstr "导入的"
 
-#: rc.cpp:5332
+#: rc.cpp:5277
 #, fuzzy
-msgid "Stoppingtags"
-msgstr "添加结尾标签(&A)"
+msgid "include"
+msgstr "inline"
+
+#: rc.cpp:5278
+#, fuzzy
+msgid "notation"
+msgstr "位置"
+
+#: rc.cpp:5279
+#, fuzzy
+msgid "redefine"
+msgstr "名称"
+
+#: rc.cpp:5319
+msgid "Bold"
+msgstr "粗体"
 
 #: rc.cpp:5334
 #, fuzzy
@@ -8984,84 +8984,84 @@ msgid "Option Group (wml)"
 msgstr ""
 
 #: rc.cpp:5337
+msgid "Table (wml)"
+msgstr "表格(wml)"
+
+#: rc.cpp:5338
+msgid "Table Row (wml)"
+msgstr "表格行(wml)"
+
+#: rc.cpp:5339
+msgid "Table Data (wml)"
+msgstr "表格数据(wml)"
+
+#: rc.cpp:5340
 msgid "Bold (wml)"
 msgstr ""
 
-#: rc.cpp:5339
+#: rc.cpp:5342
 msgid "Italic (wml)"
 msgstr ""
 
-#: rc.cpp:5340
+#: rc.cpp:5343
 #, fuzzy
 msgid "Underline (wml)"
 msgstr "underline"
 
-#: rc.cpp:5341
+#: rc.cpp:5344
 msgid "Small (wml)"
 msgstr ""
 
-#: rc.cpp:5342
+#: rc.cpp:5345
 #, fuzzy
 msgid "Big (wml)"
 msgstr "上一个(wml)"
 
-#: rc.cpp:5344
+#: rc.cpp:5347
 msgid "Paragraph (wml)"
 msgstr ""
 
-#: rc.cpp:5346
-#, fuzzy
-msgid "Access (wml)"
-msgstr "上一个(wml)"
-
-#: rc.cpp:5347
-msgid "WML"
-msgstr "WML"
-
-#: rc.cpp:5348
-msgid "Card"
-msgstr "卡片"
-
 #: rc.cpp:5349
-msgid "Head"
-msgstr "标题"
-
-#: rc.cpp:5351
-msgid "Table (wml)"
-msgstr "表格(wml)"
-
-#: rc.cpp:5352
-msgid "Table Row (wml)"
-msgstr "表格行(wml)"
-
-#: rc.cpp:5353
-msgid "Table Data (wml)"
-msgstr "表格数据(wml)"
-
-#: rc.cpp:5354
 msgid "Anchor...(wml)"
 msgstr "锚...(wml)"
 
-#: rc.cpp:5355
+#: rc.cpp:5350
 msgid "A...(wml)"
 msgstr ""
 
-#: rc.cpp:5356
+#: rc.cpp:5351
 msgid "Image...(wml)"
 msgstr "图像...(wml)"
 
-#: rc.cpp:5357
+#: rc.cpp:5352
 msgid "Timer (wml)"
 msgstr "计时器(wml)"
 
-#: rc.cpp:5358
+#: rc.cpp:5353
 msgid "Set variable"
 msgstr "设定变量"
 
-#: rc.cpp:5359
+#: rc.cpp:5354
 msgid "Post Field"
 msgstr "投递域"
 
+#: rc.cpp:5355
+#, fuzzy
+msgid "Access (wml)"
+msgstr "上一个(wml)"
+
+#: rc.cpp:5356
+msgid "WML"
+msgstr "WML"
+
+#: rc.cpp:5357
+msgid "Card"
+msgstr "卡片"
+
+#: rc.cpp:5358
+msgid "Head"
+msgstr "标题"
+
 #: rc.cpp:5360
 msgid "Go (wml)"
 msgstr "转到(wml)"
@@ -9391,8 +9391,8 @@ msgstr ""
 
 #: tips.cpp:225
 msgid ""
-"<p>...that you can use KFileReplace to find and replace across your entire "
-"project? <b>Click on the KFileReplace button</b> and you can set extensive "
+"<p>...that you can use TDEFileReplace to find and replace across your entire "
+"project? <b>Click on the TDEFileReplace button</b> and you can set extensive "
 "configurations, use multi line values and wild cards, and even go to the files "
 "found in Quanta.\n"
 "</p>\n"
@@ -9522,6 +9522,888 @@ msgid ""
 "</p>\n"
 msgstr ""
 
+#: _translatorinfo.cpp:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "开源软件国际化之 TDE 简体中文组"
+
+#: _translatorinfo.cpp:3
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "i18n-translation@lists.linux.net.cn"
+
+#: utility/toolbartabwidget.cpp:45 utility/toolbartabwidget.cpp:188
+#: utility/toolbartabwidget.cpp:307
+msgid "Toolbar Menu"
+msgstr "工具栏菜单"
+
+#: utility/toolbartabwidget.cpp:46 utility/toolbartabwidget.cpp:309
+msgid "New Action..."
+msgstr "新建动作..."
+
+#: utility/toolbartabwidget.cpp:48 utility/toolbartabwidget.cpp:326
+msgid "New Toolbar..."
+msgstr "新建工具栏..."
+
+#: src/quanta.cpp:2663 utility/toolbartabwidget.cpp:49
+#: utility/toolbartabwidget.cpp:327
+msgid "Remove Toolbar"
+msgstr "删除工具栏"
+
+#: utility/toolbartabwidget.cpp:50 utility/toolbartabwidget.cpp:328
+msgid "Rename Toolbar..."
+msgstr "重命名工具栏..."
+
+#: utility/toolbartabwidget.cpp:51 utility/toolbartabwidget.cpp:331
+msgid "Configure Toolbars..."
+msgstr "配置工具栏..."
+
+#: utility/toolbartabwidget.cpp:234
+msgid "Icons Only"
+msgstr "只有图标"
+
+#: utility/toolbartabwidget.cpp:235
+msgid "Text Only"
+msgstr "只有文字"
+
+#: utility/toolbartabwidget.cpp:236
+msgid "Text Alongside Icons"
+msgstr "文本在图标旁"
+
+#: utility/toolbartabwidget.cpp:237
+msgid "Text Under Icons"
+msgstr "文本在图标下"
+
+#: utility/toolbartabwidget.cpp:320
+#, c-format
+msgid "Remove Action - %1"
+msgstr "删除动作 - %1"
+
+#: utility/toolbartabwidget.cpp:321
+#, c-format
+msgid "Edit Action - %1"
+msgstr "编辑动作 - %1"
+
+#: utility/toolbartabwidget.cpp:330
+msgid "Text Position"
+msgstr "文本位置"
+
+#: utility/toolbartabwidget.cpp:344
+#, fuzzy
+msgid "<qt>Are you sure you want to remove the <b>%1</b> action?</qt>"
+msgstr ""
+"您真的要从工程中删除\n"
+"%1\n"
+"吗？"
+
+#: utility/tagactionset.cpp:104
+msgid "Apply Source Indentation"
+msgstr ""
+
+#: utility/tagactionset.cpp:109
+#, fuzzy
+msgid "Copy DIV Area"
+msgstr "Body 区域"
+
+#: utility/tagactionset.cpp:114
+msgid "Cut DIV Area"
+msgstr ""
+
+#: utility/tagactionset.cpp:284 utility/tagactionset.cpp:301
+msgid "Table..."
+msgstr "表..."
+
+#: utility/tagactionset.cpp:285
+msgid "Insert..."
+msgstr "插入..."
+
+#: utility/tagactionset.cpp:286
+msgid "Remove..."
+msgstr "删除..."
+
+#: utility/tagactionset.cpp:307
+msgid "Row Above"
+msgstr "行上方"
+
+#: utility/tagactionset.cpp:313
+msgid "Row Below"
+msgstr "行下方"
+
+#: utility/tagactionset.cpp:319
+msgid "Column Left"
+msgstr "列左侧"
+
+#: utility/tagactionset.cpp:325
+msgid "Column Right"
+msgstr "列右侧"
+
+#: utility/tagactionset.cpp:339
+msgid "Row(s)"
+msgstr "行数"
+
+#: utility/tagactionset.cpp:345
+msgid "Column(s)"
+msgstr "列数"
+
+#: utility/tagactionset.cpp:351
+msgid "Cell(s)"
+msgstr "单元格"
+
+#: utility/tagactionset.cpp:357
+msgid "Cell(s) Content"
+msgstr "单元格内容"
+
+#: utility/tagactionset.cpp:365
+msgid "Merge Selected Cells"
+msgstr "合并选中单元格"
+
+#: utility/newstuff.cpp:53
+msgid ""
+"There was an error with the downloaded DTEP tarball file. Possible causes are "
+"damaged archive or invalid directory structure in the archive."
+msgstr ""
+
+#: utility/newstuff.cpp:53
+msgid "DTEP Installation Error"
+msgstr ""
+
+#: utility/newstuff.cpp:73
+#, fuzzy
+msgid "Do you want to load the newly downloaded toolbar?"
+msgstr ""
+"您真的要从磁盘中删除\n"
+"%1\n"
+"吗？"
+
+#: treeviews/projecttreeview.cpp:129 utility/newstuff.cpp:73
+msgid "Load Toolbar"
+msgstr "装入工具栏"
+
+#: src/dtds.cpp:960 utility/newstuff.cpp:73
+msgid "Load"
+msgstr "装入"
+
+#: utility/newstuff.cpp:79
+msgid ""
+"There was an error with the downloaded toolbar tarball file. Possible causes "
+"are damaged archive or invalid directory structure in the archive."
+msgstr ""
+
+#: utility/newstuff.cpp:79
+msgid "Toolbar Installation Error"
+msgstr "工具栏安装错误"
+
+#: utility/newstuff.cpp:100
+#, fuzzy
+msgid "Do you want to open the newly downloaded template?"
+msgstr ""
+"您真的要从磁盘中删除\n"
+"%1\n"
+"吗？"
+
+#: utility/newstuff.cpp:100
+msgid "Open Template"
+msgstr "打开模板"
+
+#: utility/newstuff.cpp:106
+msgid "There was an error with the downloaded template file."
+msgstr ""
+
+#: utility/newstuff.cpp:106
+msgid "Template Installation Error"
+msgstr "模板安装错误"
+
+#: utility/newstuff.cpp:124 utility/newstuff.cpp:141
+msgid ""
+"There was an error with the downloaded script tarball file. Possible causes are "
+"damaged archive or invalid directory structure in the archive."
+msgstr ""
+
+#: utility/newstuff.cpp:124
+msgid "Script Installation Error"
+msgstr "脚本安装错误"
+
+#: utility/newstuff.cpp:141
+msgid "Documentation Installation Error"
+msgstr "文档安装错误"
+
+#: utility/tagaction.cpp:464 utility/tagaction.cpp:718
+msgid ""
+"The \"%1\" script started.\n"
+msgstr ""
+"“%1”脚本已启动。\n"
+
+#: utility/tagaction.cpp:475 utility/tagaction.cpp:729
+msgid ""
+"<qt>There was an error running <b>%1</b>."
+"<br>Check that you have the <i>%2</i> executable installed and it is "
+"accessible.</qt>"
+msgstr ""
+
+#: utility/tagaction.cpp:475 utility/tagaction.cpp:729
+msgid "Script Not Found"
+msgstr "脚本未找到"
+
+#: utility/tagaction.cpp:790 utility/tagaction.cpp:850
+msgid ""
+"The \"%1\" script output:\n"
+msgstr ""
+"“%1”脚本输出：\n"
+
+#: utility/tagaction.cpp:973
+msgid "The \"%1\" script has exited."
+msgstr "“%1”已退出。"
+
+#: utility/tagaction.cpp:1011
+#, fuzzy
+msgid ""
+"<qt>The filtering action <b>%1</b> seems to be locked."
+"<br>Do you want to terminate it?</qt>"
+msgstr ""
+"已经存在名称为“%1”的工程视图。\n"
+"您要覆盖它吗？"
+
+#: utility/tagaction.cpp:1011
+msgid "Action Not Responding"
+msgstr "动作未响应"
+
+#: utility/tagaction.cpp:1011
+msgid "Terminate"
+msgstr "终止"
+
+#: utility/tagaction.cpp:1011
+msgid "Keep Running"
+msgstr "保持运行"
+
+#: src/quantaview.cpp:966 utility/tagaction.cpp:1123
+msgid "Cannot insert the tag: invalid location."
+msgstr ""
+
+#: utility/quantacommon.cpp:384
+#, fuzzy
+msgid ""
+"<qt>Cannot create folder"
+"<br><b>%1</b>."
+"<br>Check that you have write permission in the parent folder or that the "
+"connection to"
+"<br><b>%2</b>"
+"<br> is valid.</qt>"
+msgstr ""
+"无法创建目录\n"
+"“%1”。\n"
+"请检查您是否有父目录的写权限，或者到\n"
+"“%2”\n"
+"的连接是否有效！"
+
+#: utility/quantacommon.cpp:697
+msgid ""
+"The file type is not recognized.   Opening binary files may confuse Quanta.\n"
+" Are you sure you want to open this file?"
+msgstr ""
+
+#: utility/quantacommon.cpp:699
+msgid "Unknown Type"
+msgstr "未知类型"
+
+#: project/project.cpp:216 utility/quantacommon.cpp:699
+msgid "Do Not Open"
+msgstr "不打开"
+
+#: treeviews/basetreeview.cpp:1041 treeviews/templatestreeview.cpp:470
+#: utility/quantacommon.cpp:710
+#, fuzzy
+msgid ""
+"<qt>The file <b>%1</b> already exists."
+"<br>Do you want to overwrite it?</qt>"
+msgstr ""
+"已经存在名称为“%1”的工程视图。\n"
+"您要覆盖它吗？"
+
+#: ../lib/compatibility/knewstuff/knewstuffgeneric.cpp:135
+#: messages/messageoutput.cpp:162 project/projectprivate.cpp:920
+#: treeviews/basetreeview.cpp:1041 treeviews/templatestreeview.cpp:470
+#: utility/quantacommon.cpp:710
+msgid "Overwrite"
+msgstr "覆盖"
+
+#: utility/quantabookmarks.cpp:88
+msgid "Set &Bookmark"
+msgstr "设置书签(&B)"
+
+#: utility/quantabookmarks.cpp:91
+msgid "If a line has no bookmark then add one, otherwise remove it."
+msgstr ""
+
+#: utility/quantabookmarks.cpp:92
+msgid "Clear &Bookmark"
+msgstr "清除书签(&B)"
+
+#: utility/quantabookmarks.cpp:95
+msgid "Clear &All Bookmarks"
+msgstr "清除全部书签(&A)"
+
+#: utility/quantabookmarks.cpp:98
+msgid "Remove all bookmarks of the current document."
+msgstr "删除当前文档中的全部书签。"
+
+#: utility/quantabookmarks.cpp:101 utility/quantabookmarks.cpp:307
+msgid "Next Bookmark"
+msgstr "下一个书签"
+
+#: utility/quantabookmarks.cpp:104
+msgid "Go to the next bookmark."
+msgstr "转到下一个书签。"
+
+#: utility/quantabookmarks.cpp:107 utility/quantabookmarks.cpp:309
+msgid "Previous Bookmark"
+msgstr "上一个书签"
+
+#: utility/quantabookmarks.cpp:110
+msgid "Go to the previous bookmark."
+msgstr "转到上一个书签。"
+
+#: utility/quantabookmarks.cpp:222
+msgid "&Next: %1 - \"%2\""
+msgstr "下一个(&N)：%1 - “%2”"
+
+#: utility/quantabookmarks.cpp:229
+msgid "&Previous: %1 - \"%2\""
+msgstr "上一个(&P)：%1 - “%2”"
+
+#: utility/qpevents.cpp:42
+msgid "Before Document Save"
+msgstr "文档保存前"
+
+#: utility/qpevents.cpp:43
+msgid "After Document Save"
+msgstr "文档保存后"
+
+#: utility/qpevents.cpp:44
+msgid "After Document Open"
+msgstr "文档打开后"
+
+#: utility/qpevents.cpp:45
+msgid "Before Document Close"
+msgstr "文档关闭前"
+
+#: utility/qpevents.cpp:46
+msgid "After Document Close"
+msgstr "文档关闭后"
+
+#: utility/qpevents.cpp:47
+msgid "After Project Open"
+msgstr "工程打开后"
+
+#: utility/qpevents.cpp:48
+msgid "Before Project Close"
+msgstr "工程关闭前"
+
+#: utility/qpevents.cpp:49
+msgid "After Project Close"
+msgstr "工程关闭后"
+
+#: utility/qpevents.cpp:50
+msgid "Upload Requested"
+msgstr "请求上传"
+
+#: utility/qpevents.cpp:51
+msgid "Before Document Upload"
+msgstr "文档上传前"
+
+#: utility/qpevents.cpp:52
+msgid "After Document Upload"
+msgstr "文档上传后"
+
+#: utility/qpevents.cpp:53
+msgid "After Addition to Project"
+msgstr "添加到工程后"
+
+#: utility/qpevents.cpp:54
+msgid "After Removal From Project"
+msgstr "从工程中删除后"
+
+#: utility/qpevents.cpp:55
+msgid "After Commit to CVS"
+msgstr ""
+
+#: utility/qpevents.cpp:56
+msgid "After Update From CVS"
+msgstr ""
+
+#: utility/qpevents.cpp:57
+#, fuzzy
+msgid "After Moving File Inside Project"
+msgstr "正在将文件添加工程中..."
+
+#: utility/qpevents.cpp:58
+msgid "Quanta Start"
+msgstr "Quanta 启动"
+
+#: utility/qpevents.cpp:59
+msgid "Quanta Exit"
+msgstr "Quanta 退出"
+
+#: utility/qpevents.cpp:62
+msgid "Send Email"
+msgstr "发送电子邮件"
+
+#: utility/qpevents.cpp:63
+msgid "Log Event"
+msgstr "日志事件"
+
+#: utility/qpevents.cpp:64
+msgid "Script Action"
+msgstr "脚本动作"
+
+#: utility/qpevents.cpp:65
+msgid "Non-Script Action"
+msgstr "非脚本动作"
+
+#: utility/qpevents.cpp:88
+msgid ""
+"<qt>An internal action (<i>%1</i>) associated with an event (<i>%2</i>"
+") will be executed.  Do you want to allow the execution of this action?</qt>"
+msgstr ""
+
+#: utility/qpevents.cpp:88 utility/qpevents.cpp:92
+msgid "Event Triggered"
+msgstr ""
+
+#: utility/qpevents.cpp:88 utility/qpevents.cpp:92
+msgid "Execute"
+msgstr "执行"
+
+#: utility/qpevents.cpp:92
+msgid ""
+"<qt>An external action (<i>%1</i>) associated with an event (<i>%2</i>"
+") will be executed.  Do you want to allow the execution of this action?</qt>"
+msgstr ""
+
+#: utility/qpevents.cpp:104
+msgid "An upload was initiated"
+msgstr ""
+
+#: utility/qpevents.cpp:113
+msgid "About to upload a document"
+msgstr "即将上传文档"
+
+#: utility/qpevents.cpp:120
+msgid "Document uploaded"
+msgstr "文档已上传"
+
+#: utility/qpevents.cpp:127
+msgid "Document moved"
+msgstr "文档已移动"
+
+#: utility/qpevents.cpp:137
+msgid "Document saved"
+msgstr "文档已保存"
+
+#: utility/qpevents.cpp:143
+msgid "About to save a document"
+msgstr "即将保存文档"
+
+#: utility/qpevents.cpp:149
+msgid "Document opened"
+msgstr "文档已打开"
+
+#: utility/qpevents.cpp:155
+msgid "Document closed"
+msgstr "文档已关闭"
+
+#: utility/qpevents.cpp:161
+msgid "About to close a document"
+msgstr "即将关闭文档"
+
+#: utility/qpevents.cpp:167
+msgid "Project opened"
+msgstr "工程已打开"
+
+#: utility/qpevents.cpp:173
+msgid "Project closed"
+msgstr "工程已关闭"
+
+#: utility/qpevents.cpp:179
+msgid "About to close the project"
+msgstr "即将关闭工程"
+
+#: utility/qpevents.cpp:185
+msgid "Document added to project"
+msgstr "文档已添加到工程"
+
+#: utility/qpevents.cpp:191
+msgid "Document removed from project"
+msgstr "文档已从工程中删除"
+
+#: utility/qpevents.cpp:199
+msgid "Document committed"
+msgstr "文档已提交"
+
+#: utility/qpevents.cpp:205
+msgid "Document updated"
+msgstr "文档已更新"
+
+#: utility/qpevents.cpp:211
+msgid "Quanta has been started"
+msgstr "Quanta 已经启动"
+
+#: utility/qpevents.cpp:217
+msgid "Quanta is shutting down"
+msgstr "Quanta 已经关闭"
+
+#: utility/qpevents.cpp:224
+msgid "<qt>Unsupported event <b>%1</b>.</qt>"
+msgstr "<qt>不支持的事件 <b>%1</b>。</qt>"
+
+#: utility/qpevents.cpp:224
+#, fuzzy
+msgid "Event Handling Error"
+msgstr "工具栏目录："
+
+#: utility/qpevents.cpp:273
+msgid "Logging to remote files is not supported."
+msgstr ""
+
+#: utility/qpevents.cpp:282
+msgid "Logging to files inside a remote project is not supported."
+msgstr ""
+
+#: utility/qpevents.cpp:312
+msgid "<qt>Logging failed. Check that you have write access to <i>%1</i>."
+msgstr ""
+
+#: utility/qpevents.cpp:316
+#, fuzzy
+msgid "<qt>Unsupported internal event action : <b>%1</b>.</qt>"
+msgstr "不支持的插件类型"
+
+#: utility/qpevents.cpp:339
+msgid "<qt>The <b>%1</b> script action was not found on your system.</qt>"
+msgstr ""
+
+#: utility/qpevents.cpp:339
+msgid "Action Execution Error"
+msgstr ""
+
+#: utility/qpevents.cpp:341
+msgid "Unsupported external event action."
+msgstr "不支持的外部事件动作。"
+
+#: utility/qpevents.cpp:343
+msgid "Unknown event type."
+msgstr "未知的事件类型。"
+
+#: utility/quantanetaccess.cpp:185
+#, fuzzy
+msgid "<qt>Do you want to add <br><b>%1</b><br> to the project?</qt>"
+msgstr "<qt>您真的要将文件<br><b>%1</b><br>添加到工程中吗？</qt>"
+
+#: utility/quantanetaccess.cpp:185
+msgid "Add to Project"
+msgstr "添加到工程"
+
+#: components/cvsservice/cvsservice.cpp:333 src/quanta.cpp:526
+#: utility/quantanetaccess.cpp:185
+#, fuzzy
+msgid "Do Not Add"
+msgstr "不保存(&D)"
+
+#: treeviews/projecttreeview.cpp:428 utility/quantanetaccess.cpp:210
+#, fuzzy
+msgid ""
+"<qt>Do you really want to remove "
+"<br><b>%1</b>"
+"<br> from the project?</qt>"
+msgstr ""
+"您真的要从工程中删除\n"
+"%1\n"
+"吗？"
+
+#: treeviews/projecttreeview.cpp:428 utility/quantanetaccess.cpp:210
+msgid "Remove From Project"
+msgstr "从工程中删除"
+
+#: utility/quantanetaccess.cpp:233
+#, fuzzy
+msgid ""
+"<qt>Do you really want to delete "
+"<br><b>%1</b>"
+"<br> and remove it from the project?</qt>"
+msgstr ""
+"您真的要从工程中删除\n"
+"%1\n"
+"吗？"
+
+#: utility/quantanetaccess.cpp:233
+msgid "Delete & Remove From Project"
+msgstr "删除并从工程中删除"
+
+#: utility/quantanetaccess.cpp:246
+msgid "<qt>Do you really want to delete <br><b>%1</b>?</qt>"
+msgstr "<qt>您真的要删除文件<br><b>%1</b> 吗？</qt>"
+
+#: utility/quantanetaccess.cpp:246
+msgid "Delete File or Folder"
+msgstr "删除文件或文件夹"
+
+#: plugins/quantapluginconfig.cpp:45
+msgid "Message Area Tab"
+msgstr "消息区域标签"
+
+#: plugins/quantapluginconfig.cpp:46 plugins/quantaplugininterface.cpp:108
+#: plugins/quantaplugininterface.cpp:156
+msgid "Editor Tab"
+msgstr "编辑器标签"
+
+#: plugins/quantaplugin.cpp:354 plugins/quantaplugin.cpp:370
+#: plugins/quantapluginconfig.cpp:46 plugins/quantaplugininterface.cpp:106
+#: plugins/quantaplugininterface.cpp:157
+msgid "Separate Toolview"
+msgstr "分离工具视图"
+
+#: plugins/quantapluginconfig.cpp:68
+msgid ""
+"The plugin information you entered appears to be invalid. Are you sure you want "
+"to apply these settings?"
+msgstr "您输入的插件信息似乎无效。您确定要应用这些设置吗？"
+
+#: plugins/quantapluginconfig.cpp:68
+msgid "Invalid Plugin"
+msgstr "无效插件"
+
+#: plugins/quantapluginconfig.cpp:68
+msgid "Do Not Apply"
+msgstr "不应用"
+
+#: plugins/quantapluginconfig.cpp:80
+msgid "Select Plugin Folder"
+msgstr "选择插件文件夹"
+
+#: plugins/quantaplugininterface.cpp:44
+msgid "Configure &Plugins..."
+msgstr "配置插件(&P)..."
+
+#: plugins/quantaplugininterface.cpp:93
+msgid ""
+"<qt><b>%1</b> is a command line plugin. We have removed support for "
+"command-line plugins. However, the functionality has not been lost as script "
+"actions can still be used to run command-line tools. </qt>"
+msgstr ""
+
+#: plugins/quantaplugininterface.cpp:93
+msgid "Unsupported Plugin Type"
+msgstr "不支持的插件类型"
+
+#: plugins/quantaplugininterface.cpp:260
+#, fuzzy
+msgid ""
+"<qt>The following plugins seems to be invalid:<b>%1</b>."
+"<br>"
+"<br>Do you want to edit the plugins?</qt>"
+msgstr ""
+"文件 %1 不存在。\n"
+"您是否要将其从列表中删除？"
+
+#: plugins/quantaplugininterface.cpp:260
+msgid "Invalid Plugins"
+msgstr "无效的插件"
+
+#: plugins/quantaplugininterface.cpp:260
+msgid "Do Not Edit"
+msgstr "不编辑"
+
+#: plugins/quantaplugininterface.cpp:267
+msgid "All plugins validated successfully."
+msgstr "所有插件都成功校验。"
+
+#: plugins/quantaplugineditor.cpp:103
+msgid "Select Folder"
+msgstr "选择文件夹"
+
+#: plugins/quantaplugin.cpp:122
+msgid ""
+"<qt>The <b>%1</b> plugin could not be loaded."
+"<br>Possible reasons are:"
+"<br>    - <b>%2</b> is not installed;"
+"<br>    - the file <i>%3</i> is not installed or it is not reachable."
+msgstr ""
+
+#: parts/preview/whtmlpart.cpp:56
+msgid "View &Document Source"
+msgstr "查看文档源文件(&D)"
+
+#: parts/kafka/htmldocumentproperties.cpp:89
+msgid "Content"
+msgstr "内容"
+
+#: parts/kafka/htmldocumentproperties.cpp:98
+msgid "Rule"
+msgstr "规则"
+
+#: parts/kafka/htmldocumentproperties.cpp:340 parts/kafka/wkafkapart.cpp:78
+msgid "Sorry, VPL does not support this functionality yet."
+msgstr ""
+
+#: parts/kafka/domtreeview.cpp:35
+msgid "Value (limited to 20 char)"
+msgstr ""
+
+#: parts/kafka/domtreeview.cpp:36
+msgid "Length"
+msgstr "长度"
+
+#: parts/kafka/domtreeview.cpp:37 parts/kafka/wkafkapart.cpp:71
+msgid "ID"
+msgstr "ID"
+
+#: parts/kafka/domtreeview.cpp:146
+msgid "Debugging KafkaWidget DOM Tree "
+msgstr ""
+
+#: parts/kafka/wkafkapart.cpp:68
+msgid "Attribute"
+msgstr "属性"
+
+#: components/debugger/debuggerbreakpointview.cpp:61
+#: parts/kafka/wkafkapart.cpp:68
+msgid "Class"
+msgstr "类"
+
+#: parts/kafka/wkafkapart.cpp:69
+#, fuzzy
+msgid "Pseudo-class"
+msgstr "Pseudo"
+
+#: parts/kafka/wkafkapart.cpp:69
+msgid "CSS rules"
+msgstr "CSS 规则"
+
+#: parts/kafka/wkafkapart.cpp:69
+#, fuzzy
+msgid "Universal selector"
+msgstr "插入新的选择器"
+
+#: parts/kafka/wkafkapart.cpp:70
+msgid "Linked stylesheets"
+msgstr "链接样式表"
+
+#: parts/kafka/wkafkapart.cpp:70
+msgid "Embedded stylesheets"
+msgstr "嵌入样式表"
+
+#: parts/kafka/wkafkapart.cpp:70
+msgid "Inline style attribute"
+msgstr "内嵌样式属性"
+
+#: parts/kafka/wkafkapart.cpp:71
+msgid "Priority"
+msgstr "优先级"
+
+#: parts/kafka/wkafkapart.cpp:72
+msgid "Browser support"
+msgstr "浏览器支持"
+
+#: parts/kafka/wkafkapart.cpp:72
+msgid "Pseudo-element"
+msgstr "Pseudo 元素"
+
+#: parts/kafka/wkafkapart.cpp:72
+msgid "Imported"
+msgstr "导入的"
+
+#: parts/kafka/wkafkapart.cpp:73
+#, fuzzy
+msgid "Inheritance"
+msgstr "underline"
+
+#: parts/kafka/wkafkapart.cpp:73
+#, fuzzy
+msgid "Inherited"
+msgstr "反转(&N)"
+
+#: parts/kafka/wkafkapart.cpp:76
+msgid "Undo/Redo history"
+msgstr "撤消/重做历史"
+
+#: parts/kafka/wkafkapart.cpp:76
+msgid "CSS styles"
+msgstr "CSS 样式"
+
+#: parts/kafka/wkafkapart.cpp:79
+msgid "Merge cells"
+msgstr "合并单元格"
+
+#: parts/kafka/wkafkapart.cpp:80
+msgid "Split cells"
+msgstr "拆分单元格"
+
+#: parts/kafka/wkafkapart.cpp:81
+msgid "Edit CSS style of this Tag"
+msgstr "编辑此标签的 CSS 样式"
+
+#: parts/kafka/wkafkapart.cpp:82
+msgid "Ident all"
+msgstr "全部缩进"
+
+#: src/dtds.cpp:688
+msgid ""
+"<qt>The DTD tag file %1 is not valid."
+"<br> The error message is: <i>%2 in line %3, column %4.</i></qt>"
+msgstr ""
+
+#: src/dtds.cpp:689
+msgid "Invalid Tag File"
+msgstr "无效的标签文件"
+
+#: src/dtds.cpp:917 src/dtds.cpp:949
+msgid "<qt>Do you want to replace the existing <b>%1</b> DTD?</qt>"
+msgstr "<qt>您真的要替换已有的 <b>%1</b> DTD 吗？</qt>"
+
+#: src/dtds.cpp:917 src/dtds.cpp:949
+msgid "Do Not Replace"
+msgstr "不替换"
+
+#: src/dtds.cpp:927 src/dtds.cpp:971
+msgid "<qt>Use the newly loaded <b>%1</b> DTD for the current document?</qt>"
+msgstr ""
+
+#: src/dtds.cpp:927 src/dtds.cpp:971
+msgid "Change DTD"
+msgstr "更改 DTD"
+
+#: src/dtds.cpp:927 src/dtds.cpp:971
+msgid "Use"
+msgstr "使用"
+
+#: src/dtds.cpp:927 src/dtds.cpp:971
+msgid "Do Not Use"
+msgstr "不使用"
+
+#: src/dtds.cpp:956
+msgid ""
+"<qt>Cannot read the DTEP from <b>%1</b>. Check that the folder contains a valid "
+"DTEP (<i>description.rc and *.tag files</i>).</qt>"
+msgstr ""
+
+#: src/dtds.cpp:956
+msgid "Error Loading DTEP"
+msgstr "装入 DTEP 错误"
+
+#: src/dtds.cpp:960
+#, fuzzy
+msgid "<qt>Autoload the <b>%1</b> DTD in the future?</qt>"
+msgstr "不能打开文件 %1 进行写入。"
+
+#: src/dtds.cpp:960
+msgid "Do Not Load"
+msgstr "不装入"
+
+#: src/dtds.cpp:982
+msgid "Load DTD Entities Into DTEP"
+msgstr ""
+
 #: src/quanta.cpp:226
 msgid "Quanta data files were not found."
 msgstr "未找到 Quanta 数据文件。"
@@ -9562,12 +10444,6 @@ msgstr "保存文件"
 msgid "<qt>Do you want to add the<br><b>%1</b><br>file to project?</qt>"
 msgstr "<qt>您真的要将文件<br><b>%1</b><br>添加到工程中吗？</qt>"
 
-#: components/cvsservice/cvsservice.cpp:333 src/quanta.cpp:526
-#: utility/quantanetaccess.cpp:185
-#, fuzzy
-msgid "Do Not Add"
-msgstr "不保存(&D)"
-
 #: src/quanta.cpp:587
 #, c-format
 msgid ""
@@ -9649,7 +10525,7 @@ msgstr "行：%1 列：%2"
 msgid "Open File: %1"
 msgstr "打开文件：%1"
 
-#: src/quanta.cpp:1975 src/quanta_init.cpp:938
+#: src/quanta.cpp:1975 src/quanta_init.cpp:926
 msgid "Open File: none"
 msgstr "打开文件：无"
 
@@ -9689,7 +10565,7 @@ msgstr ""
 msgid "Toolbar Saving Error"
 msgstr "工具栏保存错误"
 
-#: src/quanta.cpp:2499 src/quanta.cpp:3322 src/quanta.cpp:3327
+#: src/quanta.cpp:2499 src/quanta.cpp:3303 src/quanta.cpp:3308
 msgid "Save Toolbar"
 msgstr "保存工具栏"
 
@@ -9718,11 +10594,6 @@ msgstr "输入工具栏名称："
 msgid "User_%1"
 msgstr "用户_%1"
 
-#: src/quanta.cpp:2663 utility/toolbartabwidget.cpp:49
-#: utility/toolbartabwidget.cpp:327
-msgid "Remove Toolbar"
-msgstr "删除工具栏"
-
 #: src/quanta.cpp:2699
 msgid "Send Toolbar"
 msgstr "发送工具栏"
@@ -9743,7 +10614,7 @@ msgstr ""
 "\n"
 "祝愉快。\n"
 
-#: src/quanta.cpp:2744 src/quanta.cpp:3618 treeviews/scripttreeview.cpp:279
+#: src/quanta.cpp:2744 src/quanta.cpp:3599 treeviews/scripttreeview.cpp:278
 #: treeviews/templatestreeview.cpp:991
 msgid "Content:"
 msgstr "内容："
@@ -9752,7 +10623,7 @@ msgstr "内容："
 msgid "Quanta Plus toolbar"
 msgstr "Quanta Plus 工具栏"
 
-#: src/quanta.cpp:2757 src/quanta.cpp:3632 treeviews/scripttreeview.cpp:293
+#: src/quanta.cpp:2757 src/quanta.cpp:3613 treeviews/scripttreeview.cpp:292
 #: treeviews/templatestreeview.cpp:1005
 msgid ""
 "No destination address was specified.\n"
@@ -9761,7 +10632,7 @@ msgstr ""
 "没有指定目的地址。\n"
 "发送被中止。"
 
-#: src/quanta.cpp:2757 src/quanta.cpp:3632 treeviews/scripttreeview.cpp:293
+#: src/quanta.cpp:2757 src/quanta.cpp:3613 treeviews/scripttreeview.cpp:292
 #: treeviews/templatestreeview.cpp:1005
 msgid "Error Sending Email"
 msgstr "发送邮件错误"
@@ -9782,7 +10653,7 @@ msgstr "更改当前 DTD。"
 msgid "Edit DTD"
 msgstr "编辑 DTD"
 
-#: src/quanta.cpp:3099 src/quanta.cpp:3562
+#: src/quanta.cpp:3099 src/quanta.cpp:3543
 msgid "Please select a DTD:"
 msgstr "请选择一个 DTD："
 
@@ -9796,32 +10667,32 @@ msgstr "描述"
 msgid "Load DTEP description from disk"
 msgstr "描述"
 
-#: src/quanta.cpp:3321
+#: src/quanta.cpp:3302
 #, fuzzy
 msgid ""
 "<qt>Toolbar <b>%1</b> is new and unsaved. Do you want to save it before it is "
 "removed?</qt>"
 msgstr "<qt>工具栏 <b>%1</b> 新建且尚未修改。您是否想要在删除前先保存？</qt>"
 
-#: src/quanta.cpp:3326
+#: src/quanta.cpp:3307
 msgid ""
 "<qt>The toolbar <b>%1</b> was modified. Do you want to save it before it is "
 "removed?</qt>"
 msgstr "<qt>工具栏 <b>%1</b> 已修改。您是否想要在删除前先保存？</qt>"
 
-#: src/quanta.cpp:3545
+#: src/quanta.cpp:3526
 msgid "Select DTEP Directory"
 msgstr "选择 DTEP 目录"
 
-#: src/quanta.cpp:3561
+#: src/quanta.cpp:3542
 msgid "Send DTD"
 msgstr "发送 DTD"
 
-#: src/quanta.cpp:3612
+#: src/quanta.cpp:3593
 msgid "Send DTEP in Email"
 msgstr "用电子邮件发送 DTEP"
 
-#: src/quanta.cpp:3614
+#: src/quanta.cpp:3595
 msgid ""
 "Hi,\n"
 " This is a Quanta Plus [http://quanta.kdewebdev.org] DTEP definition tarball.\n"
@@ -9833,35 +10704,35 @@ msgstr ""
 "\n"
 "祝愉快。\n"
 
-#: src/quanta.cpp:3627
+#: src/quanta.cpp:3608
 msgid "Quanta Plus DTD"
 msgstr "Quanta Plus DTD"
 
-#: src/quanta.cpp:3723
+#: src/quanta.cpp:3704
 msgid "Code formatting can only be done in the source view."
 msgstr ""
 
-#: src/quanta.cpp:3741
+#: src/quanta.cpp:3722
 msgid "The Document Properties Dialog is only for HTML and XHTML."
 msgstr "文档属性对话框只对 HTML 和 XHTML。"
 
-#: src/quanta.cpp:3858
+#: src/quanta.cpp:3839
 msgid "Do you want to review the upload?"
 msgstr "您想要检查上传吗？"
 
-#: src/quanta.cpp:3858
+#: src/quanta.cpp:3839
 msgid "Enable Quick Upload"
 msgstr "启用快速上传"
 
-#: src/quanta.cpp:3858
+#: src/quanta.cpp:3839
 msgid "Review"
 msgstr "检查"
 
-#: src/quanta.cpp:3858
+#: src/quanta.cpp:3839
 msgid "Do Not Review"
 msgstr "不检查"
 
-#: src/quanta.cpp:4081 src/quanta.cpp:4768 src/quanta.cpp:4803
+#: src/quanta.cpp:4062 src/quanta.cpp:4749 src/quanta.cpp:4784
 msgid ""
 "The file must be saved before external preview.\n"
 "Do you want to save and preview?"
@@ -9869,79 +10740,49 @@ msgstr ""
 "在进行外部预览之前，文件必须先保存。\n"
 "您要保存并预览吗？"
 
-#: src/quanta.cpp:4083 src/quanta.cpp:4770 src/quanta.cpp:4805
+#: src/quanta.cpp:4064 src/quanta.cpp:4751 src/quanta.cpp:4786
 msgid "Save Before Preview"
 msgstr "预览前保存"
 
-#: src/main.cpp:70 src/quanta.cpp:4106 treeviews/basetreeview.cpp:440
+#: src/main.cpp:70 src/quanta.cpp:4087 treeviews/basetreeview.cpp:440
 #: treeviews/templatestreeview.cpp:567
 msgid "Quanta"
 msgstr "Quanta"
 
-#: src/quanta.cpp:4330 src/quantadoc.cpp:320
+#: src/quanta.cpp:4311 src/quantadoc.cpp:320
 #, c-format
 msgid "Unknown tag: %1"
 msgstr "未知的标签：%1"
 
-#: src/quanta.cpp:4552
+#: src/quanta.cpp:4533
 msgid ""
 "The CSS Editor cannot be invoked here.\n"
 "Try to invoke it on a tag or on a style section."
 msgstr ""
 
-#: src/quanta.cpp:4561
+#: src/quanta.cpp:4542
 msgid "Email Link (mailto)"
 msgstr "电子邮件链接(mailto)"
 
-#: src/quanta.cpp:4623
+#: src/quanta.cpp:4604
 msgid "Generate List"
 msgstr "生成列表"
 
-#: src/quanta.cpp:4690
+#: src/quanta.cpp:4671
 msgid ""
 "The table structure is invalid. Most probably you forgot to close some tags."
 msgstr ""
 
 #: components/tableeditor/tableeditor.cpp:1168
 #: components/tableeditor/tableeditor.cpp:1189
-#: components/tableeditor/tableeditor.cpp:1204 src/quanta.cpp:4690
+#: components/tableeditor/tableeditor.cpp:1204 src/quanta.cpp:4671
 msgid "Cannot Read Table"
 msgstr "无法读取表格"
 
-#: src/quanta.cpp:5359
+#: src/quanta.cpp:5340
 msgid "Annotate Document"
 msgstr "批注文档"
 
-#: src/viewmanager.cpp:71
-msgid "Close &Other Tabs"
-msgstr "关闭其它标签(&O)"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2581
-#: src/viewmanager.cpp:72
-msgid "Close &All"
-msgstr "全部关闭(&A)"
-
-#: src/viewmanager.cpp:74
-msgid "&Upload File"
-msgstr "上传文件(&U)"
-
-#: src/viewmanager.cpp:75
-msgid "&Delete File"
-msgstr "删除文件(&D)"
-
-#: src/viewmanager.cpp:85
-msgid "&Switch To"
-msgstr "切换到(&S)"
-
-#: src/viewmanager.cpp:110 src/viewmanager.cpp:111
-#, c-format
-msgid "Untitled%1"
-msgstr "无标题%1"
-
-#: src/viewmanager.cpp:648
-msgid "CVS"
-msgstr "CVS"
-
 #: src/document.cpp:182
 msgid "Breakpoint"
 msgstr "断点"
@@ -9982,243 +10823,10 @@ msgid ""
 msgstr ""
 "“%1”用于“%2”。\n"
 
-#: src/main.cpp:42
-msgid "Quanta Plus Web Development Environment"
-msgstr "Quanta Plus Web 开发环境"
-
-#: src/main.cpp:46
-msgid ""
-"Our goal is to be nothing less than the best possible tool for\n"
-" working with tagging and scripting languages.\n"
-"\n"
-"Quanta Plus is not in any way affiliated with any commercial\n"
-" versions of Quanta. \n"
-"\n"
-"We hope you enjoy Quanta Plus.\n"
-"\n"
-msgstr ""
-"我们的目标是提供编写标签和脚本语言的最佳工具。\n"
-"\n"
-"Quanta Plus 与 Quanta 的任何商业版本毫无关系。\n"
-"\n"
-"我们希望您使用 Quanta Plus 愉快。\n"
-"\n"
-
-#: src/main.cpp:52
-#, fuzzy
-msgid "The Quanta+ developers"
-msgstr "(C) 2000-2005 - Quanta+ 开发者"
-
-#: src/main.cpp:56
-msgid "File to open"
-msgstr "要打开的文件"
-
-#: src/main.cpp:57
-msgid "Whether we start as a one-instance application"
-msgstr "我们是否以单实例应用程序启动"
-
-#: src/main.cpp:58
-msgid "Do not show the nice logo during startup"
-msgstr "启动时不显示漂亮的标志"
-
-#: src/main.cpp:59
-msgid "Reset the layout of the user interface to the default"
-msgstr ""
-
-#: src/main.cpp:79
-msgid "Project Lead - public liaison"
-msgstr "工程领导 - 公关"
-
-#: src/main.cpp:80
-msgid "Program Lead - bug squisher"
-msgstr "工程领导 - 错误修正"
-
-#: src/main.cpp:81 src/main.cpp:82
-msgid "Inactive - left for commercial version"
-msgstr "闲置 - 留给商业版本"
-
-#: src/main.cpp:85
-msgid "Various fixes, table editor maintainer"
-msgstr "各种修正，表格编辑器维护者"
-
-#: src/main.cpp:89
-msgid "Debugger interface and integration of the Gubed PHP debugger"
-msgstr "调试器界面和 Gubed PHP 调试器集成"
-
-#: src/main.cpp:93
-msgid "Debugger interface"
-msgstr "调试器界面"
-
-#: src/main.cpp:97
-msgid "XML - compliance, tools & DTEPs"
-msgstr ""
-
-#: src/main.cpp:101
-msgid "Template contributions"
-msgstr "模板贡献"
-
-#: src/main.cpp:105
-msgid "ColdFusion support"
-msgstr "ColdFusion 支持"
-
-#: src/main.cpp:109
-msgid "Initial debugger work - advanced test"
-msgstr ""
-
-#: src/main.cpp:113
-msgid "Coding and tag dialog definition documentation and more"
-msgstr "编码、标签对话框定义文档及其它"
-
-#: src/main.cpp:117
-msgid "Original plugin system, various fixes"
-msgstr ""
-
-#: src/main.cpp:121
-msgid ""
-"Original documentation, many cool parsing scripts to automate \n"
-"development"
-msgstr "原始文档，许多用于开发自动化的分析脚本"
-
-#: src/main.cpp:125
-msgid ""
-"Various fixes, foundational code for the old DTD parsing and other \n"
-"DTD related work"
-msgstr "各种修正，DTD 分析的基础性代码以及其它 DTD 相关的工作"
-
-#: src/main.cpp:129
-msgid "Tree based upload dialog"
-msgstr "树型上传对话框"
-
-#: src/main.cpp:133
-msgid "Addition and maintenance of DTDs"
-msgstr ""
-
-#: src/main.cpp:137
-msgid "Visual Page Layout part, new undo/redo system"
-msgstr ""
-
-#: src/main.cpp:145
-msgid "Frame wizard, CSS wizard"
-msgstr "框架向导，CSS 向导"
-
-#: src/main.cpp:149
-msgid "Crash recovery"
-msgstr "崩溃恢复"
-
-#: src/main.cpp:153
-msgid "Improvements to the treeview code; code review and cleanup"
-msgstr ""
-
-#: src/main.cpp:157
-msgid "Original CSS editor"
-msgstr "原始 CSS 编辑器"
-
-#: src/main.cpp:161
-msgid "Cool splash screen for many version releases of Quanta"
-msgstr "Quanta 许多版本的欢迎屏幕"
-
-#: src/main.cpp:165
-msgid "Danish translation"
-msgstr "丹麦语翻译"
-
-#: src/main.cpp:169
-msgid "Part of a code for the old PHP4 Debugger"
-msgstr "PHP4 调试程序代码的一部分"
-
-#: src/main.cpp:173
-msgid "XSLT tags"
-msgstr "XSLT 标签"
-
-#: src/main.cpp:177
-msgid "Splash screen and icon for 3.2"
-msgstr "3.2 的飞溅屏幕和图标"
-
 #: src/quantadoc.cpp:275
 msgid "Attributes of <%1>"
 msgstr "<%1> 的属性"
 
-#: src/dtds.cpp:688
-msgid ""
-"<qt>The DTD tag file %1 is not valid."
-"<br> The error message is: <i>%2 in line %3, column %4.</i></qt>"
-msgstr ""
-
-#: src/dtds.cpp:689
-msgid "Invalid Tag File"
-msgstr "无效的标签文件"
-
-#: src/dtds.cpp:917 src/dtds.cpp:949
-msgid "<qt>Do you want to replace the existing <b>%1</b> DTD?</qt>"
-msgstr "<qt>您真的要替换已有的 <b>%1</b> DTD 吗？</qt>"
-
-#: src/dtds.cpp:917 src/dtds.cpp:949
-msgid "Do Not Replace"
-msgstr "不替换"
-
-#: src/dtds.cpp:927 src/dtds.cpp:971
-msgid "<qt>Use the newly loaded <b>%1</b> DTD for the current document?</qt>"
-msgstr ""
-
-#: src/dtds.cpp:927 src/dtds.cpp:971
-msgid "Change DTD"
-msgstr "更改 DTD"
-
-#: src/dtds.cpp:927 src/dtds.cpp:971
-msgid "Use"
-msgstr "使用"
-
-#: src/dtds.cpp:927 src/dtds.cpp:971
-msgid "Do Not Use"
-msgstr "不使用"
-
-#: src/dtds.cpp:956
-msgid ""
-"<qt>Cannot read the DTEP from <b>%1</b>. Check that the folder contains a valid "
-"DTEP (<i>description.rc and *.tag files</i>).</qt>"
-msgstr ""
-
-#: src/dtds.cpp:956
-msgid "Error Loading DTEP"
-msgstr "装入 DTEP 错误"
-
-#: src/dtds.cpp:960
-#, fuzzy
-msgid "<qt>Autoload the <b>%1</b> DTD in the future?</qt>"
-msgstr "不能打开文件 %1 进行写入。"
-
-#: src/dtds.cpp:960 utility/newstuff.cpp:73
-msgid "Load"
-msgstr "装入"
-
-#: src/dtds.cpp:960
-msgid "Do Not Load"
-msgstr "不装入"
-
-#: src/dtds.cpp:982
-msgid "Load DTD Entities Into DTEP"
-msgstr ""
-
-#: src/quantaview.cpp:298 src/quantaview.cpp:304
-msgid "[modified]"
-msgstr "[已修改]"
-
-#: src/quantaview.cpp:398 src/quantaview.cpp:447
-#, c-format
-msgid "The VPL Mode does not support the current DTD, at the moment: %1"
-msgstr ""
-
-#: src/quantaview.cpp:966 utility/tagaction.cpp:1123
-msgid "Cannot insert the tag: invalid location."
-msgstr ""
-
-#: src/quantaview.cpp:1067
-msgid ""
-"The file \"%1\" has been modified.\n"
-"Do you want to save it?"
-msgstr ""
-"文件“%1”已经被修改。\n"
-"您要保存它吗?"
-
 #: src/quanta_init.cpp:185
 msgid "Attribute Editor"
 msgstr "属性编辑器"
@@ -10235,7 +10843,7 @@ msgstr "模板"
 msgid "Document Structure"
 msgstr "文档结构"
 
-#: src/quanta_init.cpp:189 treeviews/scripttreeview.cpp:66
+#: src/quanta_init.cpp:189 treeviews/scripttreeview.cpp:65
 msgid "Scripts"
 msgstr "脚本"
 
@@ -10320,230 +10928,218 @@ msgid "&Context Help..."
 msgstr "联机帮助(&C)..."
 
 #: src/quanta_init.cpp:789
-msgid "&Quanta Homepage"
-msgstr "Quanta 主页(&Q)"
-
-#: src/quanta_init.cpp:793
-msgid "&User Mailing List"
-msgstr "用户邮件列表(&U)"
-
-#: src/quanta_init.cpp:797
-msgid "Make &Donation"
-msgstr "捐助(&D)"
-
-#: src/quanta_init.cpp:801
 msgid "Tag &Attributes..."
 msgstr "标签属性(&A)..."
 
-#: src/quanta_init.cpp:805
+#: src/quanta_init.cpp:793
 msgid "&Change the DTD..."
 msgstr "更改 DTD(&C)..."
 
-#: src/quanta_init.cpp:809
+#: src/quanta_init.cpp:797
 msgid "&Edit DTD Settings..."
 msgstr "编辑 DTD 设置(&E)..."
 
-#: src/quanta_init.cpp:813
+#: src/quanta_init.cpp:801
 msgid "&Load && Convert DTD..."
 msgstr "装入并转换 DTD(&L)..."
 
-#: src/quanta_init.cpp:816
+#: src/quanta_init.cpp:804
 msgid "Load DTD E&ntities..."
 msgstr "装入 DTD 实体(&N)..."
 
-#: src/quanta_init.cpp:820
+#: src/quanta_init.cpp:808
 msgid "Load DTD &Package (DTEP)..."
 msgstr "装入 DTD 包(DTEP)(&P)..."
 
-#: src/quanta_init.cpp:824
+#: src/quanta_init.cpp:812
 msgid "Send DTD Package (DTEP) in E&mail..."
 msgstr "用电子邮件发送 DTD 包(DTEP)(&M)..."
 
-#: src/quanta_init.cpp:828
+#: src/quanta_init.cpp:816
 msgid "&Download DTD Package (DTEP)..."
 msgstr "下载 DTD 包(DTEP)(&D)..."
 
-#: src/quanta_init.cpp:831
+#: src/quanta_init.cpp:819
 msgid "&Upload DTD Package (DTEP)..."
 msgstr "上传 DTD 包(DTEP)(&U)..."
 
-#: src/quanta_init.cpp:839
+#: src/quanta_init.cpp:827
 msgid "&Document Properties"
 msgstr "文档属性(&D)"
 
-#: src/quanta_init.cpp:843
+#: src/quanta_init.cpp:831
 msgid "F&ormat XML Code"
 msgstr ""
 
-#: src/quanta_init.cpp:847
+#: src/quanta_init.cpp:835
 msgid "&Convert Tag && Attribute Case..."
 msgstr "转换标签和属性的大小写(&C)..."
 
-#: src/quanta_init.cpp:855
+#: src/quanta_init.cpp:843
 msgid "&Source Editor"
 msgstr "源代码编辑器(&S)"
 
-#: src/quanta_init.cpp:861
+#: src/quanta_init.cpp:849
 msgid "&VPL Editor"
 msgstr "VPL 编辑器(&V)"
 
-#: src/quanta_init.cpp:867
+#: src/quanta_init.cpp:855
 msgid "VPL && So&urce Editors"
 msgstr "VPL 和源代码编辑器(&U)"
 
-#: src/quanta_init.cpp:880
+#: src/quanta_init.cpp:868
 msgid "&Reload Preview"
 msgstr "重新装载预览(&R)"
 
-#: src/quanta_init.cpp:885
+#: src/quanta_init.cpp:873
 msgid "&Previous File"
 msgstr "上一个文件(&P)"
 
-#: src/quanta_init.cpp:889
+#: src/quanta_init.cpp:877
 msgid "&Next File"
 msgstr "下一个文件(&N)"
 
-#: src/quanta_init.cpp:896
+#: src/quanta_init.cpp:884
 msgid "Configure &Actions..."
 msgstr "配置动作(&A)..."
 
-#: src/quanta_init.cpp:904
+#: src/quanta_init.cpp:892
 msgid "Configure Pre&view..."
 msgstr "配置预览(&V)..."
 
-#: src/quanta_init.cpp:907
+#: src/quanta_init.cpp:895
 msgid "Load &Project Toolbar"
 msgstr "装入工程工具栏(&P)"
 
-#: src/quanta_init.cpp:911
+#: src/quanta_init.cpp:899
 msgid "Load &Global Toolbar..."
 msgstr "装入全局工具栏(&G)..."
 
-#: src/quanta_init.cpp:912
+#: src/quanta_init.cpp:900
 msgid "Load &Local Toolbar..."
 msgstr "装入本地工具栏(&L)..."
 
-#: src/quanta_init.cpp:913
+#: src/quanta_init.cpp:901
 msgid "Save as &Local Toolbar..."
 msgstr "另存为本地工具栏(&L)..."
 
-#: src/quanta_init.cpp:914
+#: src/quanta_init.cpp:902
 msgid "Save as &Project Toolbar..."
 msgstr "另存为工程工具栏(&P)..."
 
-#: src/quanta_init.cpp:915
+#: src/quanta_init.cpp:903
 msgid "&New User Toolbar..."
 msgstr "新建用户工具栏(&N)..."
 
-#: src/quanta_init.cpp:916
+#: src/quanta_init.cpp:904
 msgid "&Remove User Toolbar..."
 msgstr "删除用户工具栏(&R)..."
 
-#: src/quanta_init.cpp:917
+#: src/quanta_init.cpp:905
 msgid "Re&name User Toolbar..."
 msgstr "重命名用户工具栏(&N)..."
 
-#: src/quanta_init.cpp:918
+#: src/quanta_init.cpp:906
 msgid "Send Toolbar in E&mail..."
 msgstr "用电子邮件发送工具栏(&M)..."
 
-#: src/quanta_init.cpp:919
+#: src/quanta_init.cpp:907
 msgid "&Upload Toolbar..."
 msgstr "上传工具栏(&U)..."
 
-#: src/quanta_init.cpp:920
+#: src/quanta_init.cpp:908
 msgid "&Download Toolbar..."
 msgstr "下载工具栏(&D)..."
 
-#: src/quanta_init.cpp:922
+#: src/quanta_init.cpp:910
 msgid "Smart Tag Insertion"
 msgstr "智能插入标签"
 
-#: src/quanta_init.cpp:925
+#: src/quanta_init.cpp:913
 msgid "Show DTD Toolbar"
 msgstr "显示 DTD 工具栏"
 
-#: src/quanta_init.cpp:928
+#: src/quanta_init.cpp:916
 msgid "Hide DTD Toolbar"
 msgstr "隐藏 DTD 工具栏"
 
-#: src/quanta_init.cpp:930
+#: src/quanta_init.cpp:918
 msgid "Complete Text"
 msgstr "补全文本"
 
-#: src/quanta_init.cpp:932
+#: src/quanta_init.cpp:920
 msgid "Completion Hints"
 msgstr "补全提示"
 
-#: src/quanta_init.cpp:939
+#: src/quanta_init.cpp:927
 msgid "Upload..."
 msgstr "上传..."
 
-#: src/quanta_init.cpp:940
+#: src/quanta_init.cpp:928
 msgid "Delete File"
 msgstr "删除文件"
 
-#: src/quanta_init.cpp:942
+#: src/quanta_init.cpp:930
 msgid "Upload Opened Project Files..."
 msgstr "上传打开的工程文件..."
 
-#: src/quanta_init.cpp:1003
+#: src/quanta_init.cpp:991
 msgid "&Preview"
 msgstr "预览(&P)"
 
-#: src/quanta_init.cpp:1007
+#: src/quanta_init.cpp:995
 msgid "Preview Without Frames"
 msgstr "无框架预览"
 
-#: src/quanta_init.cpp:1012
+#: src/quanta_init.cpp:1000
 msgid "View with &Konqueror"
 msgstr "用 Konqueror 查看(&K)"
 
-#: src/quanta_init.cpp:1034
+#: src/quanta_init.cpp:1022
 msgid "View with L&ynx"
 msgstr "用 Lynx 查看(&Y)"
 
-#: src/quanta_init.cpp:1040
+#: src/quanta_init.cpp:1028
 msgid "Table Editor..."
 msgstr "表格编辑器..."
 
-#: src/quanta_init.cpp:1044
+#: src/quanta_init.cpp:1032
 msgid "Quick List..."
 msgstr "快速列表..."
 
-#: src/quanta_init.cpp:1048
+#: src/quanta_init.cpp:1036
 msgid "Color..."
 msgstr "颜色..."
 
-#: src/quanta_init.cpp:1053
+#: src/quanta_init.cpp:1041
 msgid "Email..."
 msgstr "电子邮件..."
 
-#: src/quanta_init.cpp:1057
+#: src/quanta_init.cpp:1045
 msgid "Misc. Tag..."
 msgstr "杂类标签..."
 
-#: src/quanta_init.cpp:1061
+#: src/quanta_init.cpp:1049
 msgid "Frame Wizard..."
 msgstr "框架向导..."
 
-#: src/quanta_init.cpp:1065
+#: src/quanta_init.cpp:1053
 msgid "Paste &HTML Quoted"
 msgstr "粘贴引用的 &HTML"
 
-#: src/quanta_init.cpp:1069
+#: src/quanta_init.cpp:1057
 msgid "Paste &URL Encoded"
 msgstr "粘贴编码的 &URL"
 
-#: src/quanta_init.cpp:1073
+#: src/quanta_init.cpp:1061
 msgid "Insert CSS..."
 msgstr "插入 CSS..."
 
-#: src/quanta_init.cpp:1174
+#: src/quanta_init.cpp:1162
 msgid "Restore File"
 msgstr "还原文件"
 
-#: src/quanta_init.cpp:1176
+#: src/quanta_init.cpp:1164
 msgid ""
 "<qt>A backup copy of a file was found:"
 "<br>"
@@ -10557,88 +11153,279 @@ msgid ""
 "<br></qt>"
 msgstr ""
 
-#: src/quanta_init.cpp:1186
+#: src/quanta_init.cpp:1174
 msgid "&Restore the file from backup"
 msgstr "从备份中还原文件(&R)"
 
-#: src/quanta_init.cpp:1187
+#: src/quanta_init.cpp:1175
 msgid "Do &not restore the file from backup"
 msgstr "不从备份中还原文件(&N)"
 
-#: src/quanta_init.cpp:1296
+#: src/quanta_init.cpp:1284
 msgid "Failed to query for running Quanta instances."
 msgstr ""
 
-#: src/quanta_init.cpp:1407
+#: src/quanta_init.cpp:1394
 msgid "various script based dialogs including the Quick Start dialog"
 msgstr ""
 
-#: src/quanta_init.cpp:1414
+#: src/quanta_init.cpp:1400
 msgid "HTML syntax checking"
 msgstr "HTML 语法检查"
 
-#: src/quanta_init.cpp:1421
+#: src/quanta_init.cpp:1406
 msgid "comparing of files by content"
 msgstr ""
 
-#: src/quanta_init.cpp:1426
+#: src/quanta_init.cpp:1411
 msgid "Control Center (tdebase)"
 msgstr ""
 
-#: src/quanta_init.cpp:1429 src/quanta_init.cpp:1436
+#: src/quanta_init.cpp:1413 src/quanta_init.cpp:1419
 msgid "preview browser configuration"
 msgstr ""
 
-#: src/quanta_init.cpp:1443
+#: src/quanta_init.cpp:1425
 msgid "search and replace in files"
 msgstr "在文件中搜索并替换"
 
-#: src/quanta_init.cpp:1450
+#: src/quanta_init.cpp:1431
 msgid "XSLT debugging"
 msgstr ""
 
-#: src/quanta_init.cpp:1458
+#: src/quanta_init.cpp:1438
 msgid "editing HTML image maps"
 msgstr ""
 
-#: src/quanta_init.cpp:1466
+#: src/quanta_init.cpp:1445
 msgid "link validity checking"
 msgstr ""
 
-#: src/quanta_init.cpp:1473
+#: src/quanta_init.cpp:1451
 msgid "CVS management plugin"
 msgstr "CVS 管理插件"
 
-#: src/quanta_init.cpp:1478
-msgid "<br><b>-    %1</b> [<i>%2</i>] - %3 will not be available;"
+#: src/quanta_init.cpp:1456
+msgid "<br><b>-    %1</b> [<i>%2</i>] will not be available;"
 msgstr ""
 
-#: src/quanta_init.cpp:1503
+#: src/quanta_init.cpp:1481
 msgid "integrated CVS management"
 msgstr ""
 
-#: src/quanta_init.cpp:1520
-msgid "Some applications required for full functionality are missing:<br>"
-msgstr ""
-
-#: src/quanta_init.cpp:1520
+#: src/quanta_init.cpp:1498
 msgid ""
+"Some applications required for full functionality are missing or installed "
+"incorrectly:"
 "<br>"
-"<br>You may download the applications from the specified locations.</qt>"
 msgstr ""
 
-#: src/quanta_init.cpp:1520
+#: src/quanta_init.cpp:1498
+msgid "<br><br>Please verify the package contents.</qt>"
+msgstr ""
+
+#: src/quanta_init.cpp:1498
 msgid "Missing Applications"
 msgstr "缺少应用程序"
 
-#: messages/messageitem.cpp:73 messages/messageitem.cpp:81
-msgid "File: "
-msgstr "文件："
+#: src/quantaview.cpp:298 src/quantaview.cpp:304
+msgid "[modified]"
+msgstr "[已修改]"
 
-#: messages/messageitem.cpp:76
-msgid ", "
+#: src/quantaview.cpp:398 src/quantaview.cpp:447
+#, c-format
+msgid "The VPL Mode does not support the current DTD, at the moment: %1"
 msgstr ""
 
+#: src/quantaview.cpp:1067
+msgid ""
+"The file \"%1\" has been modified.\n"
+"Do you want to save it?"
+msgstr ""
+"文件“%1”已经被修改。\n"
+"您要保存它吗?"
+
+#: src/viewmanager.cpp:71
+msgid "Close &Other Tabs"
+msgstr "关闭其它标签(&O)"
+
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2581
+#: src/viewmanager.cpp:72
+msgid "Close &All"
+msgstr "全部关闭(&A)"
+
+#: src/viewmanager.cpp:74
+msgid "&Upload File"
+msgstr "上传文件(&U)"
+
+#: src/viewmanager.cpp:75
+msgid "&Delete File"
+msgstr "删除文件(&D)"
+
+#: src/viewmanager.cpp:85
+msgid "&Switch To"
+msgstr "切换到(&S)"
+
+#: src/viewmanager.cpp:110 src/viewmanager.cpp:111
+#, c-format
+msgid "Untitled%1"
+msgstr "无标题%1"
+
+#: src/viewmanager.cpp:648
+msgid "CVS"
+msgstr "CVS"
+
+#: src/main.cpp:42
+msgid "Quanta Plus Web Development Environment"
+msgstr "Quanta Plus Web 开发环境"
+
+#: src/main.cpp:46
+msgid ""
+"Our goal is to be nothing less than the best possible tool for\n"
+" working with tagging and scripting languages.\n"
+"\n"
+"Quanta Plus is not in any way affiliated with any commercial\n"
+" versions of Quanta. \n"
+"\n"
+"We hope you enjoy Quanta Plus.\n"
+"\n"
+msgstr ""
+"我们的目标是提供编写标签和脚本语言的最佳工具。\n"
+"\n"
+"Quanta Plus 与 Quanta 的任何商业版本毫无关系。\n"
+"\n"
+"我们希望您使用 Quanta Plus 愉快。\n"
+"\n"
+
+#: src/main.cpp:52
+#, fuzzy
+msgid "The Quanta+ developers"
+msgstr "(C) 2000-2005 - Quanta+ 开发者"
+
+#: src/main.cpp:56
+msgid "File to open"
+msgstr "要打开的文件"
+
+#: src/main.cpp:57
+msgid "Whether we start as a one-instance application"
+msgstr "我们是否以单实例应用程序启动"
+
+#: src/main.cpp:58
+msgid "Do not show the nice logo during startup"
+msgstr "启动时不显示漂亮的标志"
+
+#: src/main.cpp:59
+msgid "Reset the layout of the user interface to the default"
+msgstr ""
+
+#: src/main.cpp:79
+msgid "Project Lead - public liaison"
+msgstr "工程领导 - 公关"
+
+#: src/main.cpp:80
+msgid "Program Lead - bug squisher"
+msgstr "工程领导 - 错误修正"
+
+#: src/main.cpp:81 src/main.cpp:82
+msgid "Inactive - left for commercial version"
+msgstr "闲置 - 留给商业版本"
+
+#: src/main.cpp:85
+msgid "Various fixes, table editor maintainer"
+msgstr "各种修正，表格编辑器维护者"
+
+#: src/main.cpp:89
+msgid "Debugger interface and integration of the Gubed PHP debugger"
+msgstr "调试器界面和 Gubed PHP 调试器集成"
+
+#: src/main.cpp:93
+msgid "Debugger interface"
+msgstr "调试器界面"
+
+#: src/main.cpp:97
+msgid "XML - compliance, tools & DTEPs"
+msgstr ""
+
+#: src/main.cpp:101
+msgid "Template contributions"
+msgstr "模板贡献"
+
+#: src/main.cpp:105
+msgid "ColdFusion support"
+msgstr "ColdFusion 支持"
+
+#: src/main.cpp:109
+msgid "Initial debugger work - advanced test"
+msgstr ""
+
+#: src/main.cpp:113
+msgid "Coding and tag dialog definition documentation and more"
+msgstr "编码、标签对话框定义文档及其它"
+
+#: src/main.cpp:117
+msgid "Original plugin system, various fixes"
+msgstr ""
+
+#: src/main.cpp:121
+msgid ""
+"Original documentation, many cool parsing scripts to automate \n"
+"development"
+msgstr "原始文档，许多用于开发自动化的分析脚本"
+
+#: src/main.cpp:125
+msgid ""
+"Various fixes, foundational code for the old DTD parsing and other \n"
+"DTD related work"
+msgstr "各种修正，DTD 分析的基础性代码以及其它 DTD 相关的工作"
+
+#: src/main.cpp:129
+msgid "Tree based upload dialog"
+msgstr "树型上传对话框"
+
+#: src/main.cpp:133
+msgid "Addition and maintenance of DTDs"
+msgstr ""
+
+#: src/main.cpp:137
+msgid "Visual Page Layout part, new undo/redo system"
+msgstr ""
+
+#: src/main.cpp:145
+msgid "Frame wizard, CSS wizard"
+msgstr "框架向导，CSS 向导"
+
+#: src/main.cpp:149
+msgid "Crash recovery"
+msgstr "崩溃恢复"
+
+#: src/main.cpp:153
+msgid "Improvements to the treeview code; code review and cleanup"
+msgstr ""
+
+#: src/main.cpp:157
+msgid "Original CSS editor"
+msgstr "原始 CSS 编辑器"
+
+#: src/main.cpp:161
+msgid "Cool splash screen for many version releases of Quanta"
+msgstr "Quanta 许多版本的欢迎屏幕"
+
+#: src/main.cpp:165
+msgid "Danish translation"
+msgstr "丹麦语翻译"
+
+#: src/main.cpp:169
+msgid "Part of a code for the old PHP4 Debugger"
+msgstr "PHP4 调试程序代码的一部分"
+
+#: src/main.cpp:173
+msgid "XSLT tags"
+msgstr "XSLT 标签"
+
+#: src/main.cpp:177
+msgid "Splash screen and icon for 3.2"
+msgstr "3.2 的飞溅屏幕和图标"
+
 #: messages/messageoutput.cpp:50
 msgid "&Save As..."
 msgstr "另存为(&S)..."
@@ -10659,17 +11446,18 @@ msgstr "保存日志文件"
 msgid "<qt>File<br><b>%1</b><br>already exists. Overwrite it?</qt>"
 msgstr "<qt>文件<br><b>%1</b><br>已存在。覆盖吗？"
 
-#: ../lib/compatibility/knewstuff/knewstuffgeneric.cpp:135
-#: messages/messageoutput.cpp:162 project/projectprivate.cpp:920
-#: treeviews/basetreeview.cpp:1041 treeviews/templatestreeview.cpp:470
-#: utility/quantacommon.cpp:710
-msgid "Overwrite"
-msgstr "覆盖"
-
 #: messages/messageoutput.cpp:167
 msgid "<qt>Cannot save log file<br><b>%1</b></qt>"
 msgstr "<qt>无法保存日志文件<br><b>%1</b></qt>"
 
+#: messages/messageitem.cpp:73 messages/messageitem.cpp:81
+msgid "File: "
+msgstr "文件："
+
+#: messages/messageitem.cpp:76
+msgid ", "
+msgstr ""
+
 #: messages/annotationoutput.cpp:51 messages/annotationoutput.cpp:104
 #: messages/annotationoutput.cpp:204
 msgid "For You"
@@ -10702,826 +11490,956 @@ msgstr ""
 msgid "New Annotations"
 msgstr "新建批注"
 
-#: dialogs/dirtydlg.cpp:44
-#, fuzzy
-msgid "<qt>The file <b>%1</b> was changed outside of the Quanta editor.</qt>"
-msgstr "文件在 Quanta 编辑器之外发生了更改。"
+#: treeviews/templatestreeview.cpp:73
+msgid "Insert as &Text"
+msgstr "作为文本插入(&T)"
 
-#: dialogs/tagdialogs/tagimgdlgdata.cpp:27
-msgid "Image source:"
-msgstr "图像源："
+#: treeviews/templatestreeview.cpp:74
+msgid "Insert &Link to File"
+msgstr "插入到文件的链接(&L)"
 
-#: dialogs/tagdialogs/tagimgdlgdata.cpp:46
-msgid "Width:"
-msgstr "宽度："
+#: treeviews/templatestreeview.cpp:75
+msgid "&New Document Based on This"
+msgstr "创建基于此模板的文档(&N)"
 
-#: dialogs/tagdialogs/tagimgdlgdata.cpp:58
-msgid "Height:"
-msgstr "高度："
+#: treeviews/templatestreeview.cpp:76
+msgid "&Extract Site Template To..."
+msgstr "将网站模板提取到(&E)..."
 
-#: dialogs/tagdialogs/tagimgdlgdata.cpp:74
-msgid "HSpace:"
-msgstr "水平空间："
+#: treeviews/templatestreeview.cpp:135 treeviews/templatestreeview.cpp:139
+msgid "Text Snippet"
+msgstr "文本片断"
 
-#: dialogs/tagdialogs/tagimgdlgdata.cpp:85
-msgid "VSpace:"
-msgstr "垂直空间："
+#: treeviews/templatestreeview.cpp:136 treeviews/templatestreeview.cpp:140
+msgid "Binary File"
+msgstr "二进制文件"
 
-#: dialogs/tagdialogs/tagimgdlgdata.cpp:93
-msgid "Alternate text:"
-msgstr "替代文本："
+#: treeviews/templatestreeview.cpp:137 treeviews/templatestreeview.cpp:141
+msgid "Document Template"
+msgstr "文档模板"
 
-#: dialogs/tagdialogs/tagimgdlgdata.cpp:103
-msgid "Border:"
-msgstr "边框："
+#: treeviews/templatestreeview.cpp:138 treeviews/templatestreeview.cpp:142
+msgid "Site Template"
+msgstr "网站模板"
 
-#: dialogs/tagdialogs/tagimgdlgdata.cpp:115
-msgid "Align:"
-msgstr "对齐："
+#: treeviews/filestreeview.cpp:87 treeviews/projecttreeview.cpp:128
+#: treeviews/servertreeview.cpp:103 treeviews/templatestreeview.cpp:147
+msgid "&Open"
+msgstr "打开(&O)"
 
-#: dialogs/tagdialogs/tagmaildlg.cpp:96
-msgid "Select Address"
-msgstr "选择地址"
+#: treeviews/templatestreeview.cpp:148 treeviews/templatestreeview.cpp:161
+msgid "Send in E&mail..."
+msgstr "用电子邮件发送(&M)..."
 
-#: dialogs/tagdialogs/tagmaildlg.cpp:104
-msgid "No addresses found."
-msgstr "未发现地址。"
+#: treeviews/templatestreeview.cpp:149 treeviews/templatestreeview.cpp:162
+msgid "&Upload Template..."
+msgstr "上传模板(&U)..."
 
-#: dialogs/tagdialogs/colorcombo.cpp:178 dialogs/tagdialogs/colorcombo.cpp:232
-msgid "Custom..."
-msgstr "自定义..."
+#: treeviews/filestreeview.cpp:91 treeviews/filestreeview.cpp:109
+#: treeviews/templatestreeview.cpp:150 treeviews/templatestreeview.cpp:164
+msgid "&Insert in Project..."
+msgstr "插入到工程中(&I)..."
 
-#: dialogs/tagdialogs/tagimgdlg.cpp:107
-msgid ""
-"|Image Files\n"
-"*|All Files"
-msgstr ""
-"|图像文件\n"
-"*|全部文件"
+#: treeviews/filestreeview.cpp:89 treeviews/projecttreeview.cpp:131
+#: treeviews/servertreeview.cpp:105 treeviews/templatestreeview.cpp:151
+msgid "Clos&e"
+msgstr "关闭(&E)"
 
-#: dialogs/tagdialogs/tagdialog.cpp:127 dialogs/tagdialogs/tagdialog.cpp:146
-#: dialogs/tagdialogs/tagdialog.cpp:345 dialogs/tagdialogs/tagdialog.cpp:427
-msgid "Unknown tag"
-msgstr "未知标签"
+#: treeviews/filestreeview.cpp:96 treeviews/filestreeview.cpp:116
+#: treeviews/projecttreeview.cpp:140 treeviews/projecttreeview.cpp:159
+#: treeviews/servertreeview.cpp:112 treeviews/servertreeview.cpp:122
+#: treeviews/templatestreeview.cpp:156 treeviews/templatestreeview.cpp:170
+msgid "&Properties"
+msgstr "属性(&P)"
 
-#: dialogs/tagdialogs/tagdialog.cpp:138
-msgid "Tag Properties: "
-msgstr "标签属性："
+#: treeviews/templatestreeview.cpp:160
+msgid "&New Folder..."
+msgstr "新建文件夹(&N)..."
 
-#: dialogs/tagdialogs/tagquicklistdlgdata.cpp:27
-msgid "Rows:"
-msgstr "行数："
+#: treeviews/templatestreeview.cpp:163 treeviews/templatestreeview.cpp:174
+msgid "&Download Template..."
+msgstr "下载模板(&D)..."
 
-#: dialogs/tagdialogs/tagquicklistdlgdata.cpp:55
-msgid "Ordered"
-msgstr "有序的"
+#: treeviews/templatestreeview.cpp:177
+msgid "Group"
+msgstr "组"
 
-#: dialogs/tagdialogs/tagquicklistdlgdata.cpp:61
-msgid "Unordered"
-msgstr "无序的"
+#: treeviews/templatestreeview.cpp:211
+msgid "Global Templates"
+msgstr "全局模板"
 
-#: dialogs/actionconfigdialog.cpp:151
-msgid "&Add New Toolbar"
-msgstr "添加新工具栏(&A)"
+#: treeviews/templatestreeview.cpp:215
+msgid "Local Templates"
+msgstr "本地模板"
 
-#: dialogs/actionconfigdialog.cpp:152
-msgid "&Remove Toolbar"
-msgstr "删除工具栏(&R)"
+#: treeviews/templatestreeview.cpp:218
+msgid "Project Templates"
+msgstr "工程模板"
 
-#: dialogs/actionconfigdialog.cpp:153
-msgid "&Edit Toolbar"
-msgstr "编辑工具栏(&E)"
+#: treeviews/templatestreeview.cpp:376
+msgid "Create New Template Folder"
+msgstr "创建新的模板文件夹"
 
-#: dialogs/actionconfigdialog.cpp:193
-msgid "Do you really want to remove the \"%1\" toolbar?"
-msgstr "您真的想要删除“%1”工具栏吗？"
+#: treeviews/templatestreeview.cpp:386 treeviews/templatestreeview.cpp:619
+msgid "&Inherit parent attribute (nothing)"
+msgstr "继承父属性(无)(&I)"
 
-#: dialogs/actionconfigdialog.cpp:269 dialogs/actionconfigdialog.cpp:782
-msgid "Do you want to save the changes made to this action?"
-msgstr "您是否想要保存对此动作的更改？"
+#: treeviews/templatestreeview.cpp:389 treeviews/templatestreeview.cpp:622
+msgid "&Inherit parent attribute (%1)"
+msgstr "继承父属性(%1)(&I)"
 
-#: dialogs/actionconfigdialog.cpp:765
+#: treeviews/templatestreeview.cpp:406
+#, fuzzy
 msgid ""
-"The '%1' key combination has already been allocated to the \"%2\" action.\n"
-"Please choose a unique key combination."
+"Error while creating the new folder.\n"
+"                    Maybe you do not have permission to write in the %1 folder."
 msgstr ""
+"创建新目录出错。\n"
+"您可能没有写入 %1 目录的权限。"
 
-#: dialogs/actionconfigdialog.cpp:769
-msgid "Conflicting Shortcuts"
-msgstr "快捷键冲突"
+#: treeviews/templatestreeview.cpp:458
+msgid "Save selection as template file:"
+msgstr "将选中内容另存为模板文件："
 
-#: dialogs/actionconfigdialog.cpp:841
+#: treeviews/templatestreeview.cpp:476
 #, fuzzy
 msgid ""
-"<qt>Removing the action removes all the references to it.\n"
-"Are you sure you want to remove the <b>%1</b> action?</qt>"
+"<qt>Could not write to file <b>%1</b>."
+"<br>Check if you have rights to write there or that your connection is "
+"working.</qt>"
 msgstr ""
-"删除动作将删除对它的全部引用。\n"
-"您确定要删除当前动作吗？"
-
-#: dialogs/actionconfigdialog.cpp:887
-msgid "Add Action to Toolbar"
-msgstr "在工具栏中添加动作"
+"无法写入文件：\n"
+"%1。\n"
+"请检查您是否有写入的权限或者连接是否正常。"
 
-#: dialogs/settings/abbreviation.cpp:95
-msgid "New Abbreviation Group"
-msgstr "新缩写组"
+#: treeviews/templatestreeview.cpp:565
+msgid "Quanta Template"
+msgstr "Quanta 模板"
 
-#: dialogs/settings/abbreviation.cpp:95
-msgid "Group name:"
-msgstr "组名称："
+#: treeviews/templatestreeview.cpp:876
+msgid ""
+"Do you really want to delete folder \n"
+"%1 ?\n"
+msgstr ""
+"您真的要删除文件夹\n"
+"%1 吗？\n"
 
-#: dialogs/settings/abbreviation.cpp:100
+#: treeviews/templatestreeview.cpp:878
+#, fuzzy
 msgid ""
-"<qt>There is already an abbreviation group called <b>%1</b>"
-". Choose an unique name for the new group.</qt>"
+"Do you really want to delete file \n"
+"%1 ?\n"
 msgstr ""
+"您真的要删除文件\n"
+"%1 吗？\n"
 
-#: dialogs/settings/abbreviation.cpp:100
-msgid "Group already exists"
+#: treeviews/templatestreeview.cpp:985
+msgid "Send template in email"
+msgstr "用电子邮件发送模板"
+
+#: treeviews/templatestreeview.cpp:987
+msgid ""
+"Hi,\n"
+" This is a Quanta Plus [http://quanta.kdewebdev.org] template tarball.\n"
+"\n"
+"Have fun.\n"
 msgstr ""
+"你好，\n"
+"这是一个 Quanta Plus [http://quanta.kdewebdev.org] 的模板包。\n"
+"\n"
+"祝愉快。\n"
 
-#: dialogs/settings/abbreviation.cpp:118
-msgid "Add DTEP"
-msgstr "添加 DTEP"
+#: treeviews/templatestreeview.cpp:1000
+msgid "Quanta Plus Template"
+msgstr "Quanta Plus 模板"
 
-#: dialogs/settings/abbreviation.cpp:119
-msgid "Select a DTEP:"
-msgstr "选择 DTEP："
+#: treeviews/templatestreeview.cpp:1031
+msgid "Target folder"
+msgstr "目的文件夹"
 
-#: dialogs/settings/abbreviation.cpp:145
-msgid "<qt>Select a DTEP from the list before using <b>Remove</b>.</qt>"
+#: treeviews/templatestreeview.cpp:1067
+msgid ""
+"You have extracted the site template to a folder which is not under your main "
+"project folder.\n"
+"Do you want to copy the folder into the main project folder?"
 msgstr ""
 
-#: dialogs/settings/abbreviation.cpp:145
-#, fuzzy
-msgid "No DTEP Selected"
-msgstr "选择"
+#: treeviews/templatestreeview.cpp:1067
+msgid "Copy Folder"
+msgstr "复制件夹"
 
-#: dialogs/settings/abbreviation.cpp:190
-#, fuzzy
-msgid "<qt>Do you really want to remove the <b>%1</b> template?</qt>"
+#: treeviews/templatestreeview.cpp:1067
+msgid "Do Not Copy"
+msgstr "不复制"
+
+#: treeviews/templatestreeview.cpp:1075
+msgid ""
+"<qt>Some error happened while extracting the <i>%1</i> site template file."
+"<br>Check that you have write permission for <i>%2</i> "
+"and that there is enough free space in your temporary folder.</qt>"
 msgstr ""
-"您真的要从工程中删除\n"
-"%1\n"
-"吗？"
 
-#: dialogs/settings/abbreviation.cpp:204
-msgid "Edit Code Template"
-msgstr "编辑代码模板"
+#: treeviews/basetreeview.cpp:630 treeviews/servertreeview.cpp:104
+msgid "Open &With..."
+msgstr "打开方式(&W)..."
 
-#: dialogs/settings/abbreviation.cpp:273
-#, fuzzy
-msgid ""
-"<qt>Cannot open the file <b>%1</b> for writing.\n"
-"Modified abbreviations will be lost when you quit Quanta.</qt>"
-msgstr "不能打开文件 %1 进行写入。"
+#: treeviews/filestreeview.cpp:93 treeviews/filestreeview.cpp:113
+#: treeviews/projecttreeview.cpp:135 treeviews/projecttreeview.cpp:153
+#: treeviews/servertreeview.cpp:110 treeviews/servertreeview.cpp:120
+msgid "Re&name"
+msgstr "重命名(&N)"
 
-#: components/framewizard/fmfpeditor.cpp:40 dialogs/filecombo.cpp:93
-msgid "*|All Files"
-msgstr "*|全部文件"
+#: treeviews/servertreeview.cpp:125
+msgid "Upload Tree"
+msgstr "上传树"
 
-#: dialogs/dtepeditdlg.cpp:63
-msgid "&Pages"
-msgstr "分页(&P)"
+#: treeviews/basetreeview.cpp:438
+msgid "Quanta File Info"
+msgstr "Quanta 文件信息"
 
-#: dialogs/dtepeditdlg.cpp:206
-#, fuzzy
-msgid ""
-"<qt>The file <b>%1</b> is not writable."
-"<br>Do you want to save the configuration to a different file?</qt>"
-msgstr "<qt>文件 <b>%1</b> 不存在。<br>您是否要将其从列表中删除？</qt>"
+#: treeviews/basetreeview.cpp:497
+#, c-format
+msgid "Number of lines: %1"
+msgstr "行数：%1"
 
-#: dialogs/dtepeditdlg.cpp:206
-msgid "Save to Different File"
-msgstr "保存到不同文件"
+#: treeviews/basetreeview.cpp:498
+#, c-format
+msgid "Number of images included: %1"
+msgstr "所含图像数目：%1"
 
-#: dialogs/dtepeditdlg.cpp:206
-msgid "Do Not Save"
-msgstr "不保存"
+#: treeviews/basetreeview.cpp:499
+msgid "Size of the included images: %1 bytes"
+msgstr "所含图像大小：%1 字节"
 
-#: dialogs/dtepeditdlg.cpp:208
-msgid "*.rc|DTEP Description"
-msgstr "*.rc|DTEP 描述"
+#: treeviews/basetreeview.cpp:500
+msgid "Total size with images: %1 bytes"
+msgstr "带图像的总大小：%1 字节"
 
-#: dialogs/dtepeditdlg.cpp:208
-msgid "Save Description As"
-msgstr "描述另存为"
+#: treeviews/basetreeview.cpp:505
+msgid "Image size: %1 x %2"
+msgstr "图像大小：%1 x %2"
 
-#: dialogs/dtepeditdlg.cpp:444
-msgid "Edit Structure Group"
-msgstr "编辑结构组"
+#: treeviews/basetreeview.cpp:627
+msgid "&Other..."
+msgstr "其它(&O)..."
 
-#: dialogs/dtepeditdlg.cpp:494
-msgid "Add Structure Group"
-msgstr "添加结构组"
+#: treeviews/basetreeview.cpp:628
+msgid "Open &With"
+msgstr "打开方式(&W)"
 
-#: dialogs/dtepeditdlg.cpp:539
-#, fuzzy
-msgid "<qt>Do you really want to delete the <b>%1</b> group?</qt>"
-msgstr ""
-"您真的要删除文件\n"
-"%1 吗？\n"
+#: treeviews/basetreeview.cpp:885 treeviews/structtreeview.cpp:832
+msgid "&Move Here"
+msgstr "移动至此(&M)"
 
-#: dialogs/dtepeditdlg.cpp:539
-msgid "Delete Group"
-msgstr "删除组"
+#: treeviews/basetreeview.cpp:887 treeviews/structtreeview.cpp:833
+msgid "&Copy Here"
+msgstr "复制至此(&C)"
 
-#: parts/kafka/domtreeview.cpp:35
-msgid "Value (limited to 20 char)"
-msgstr ""
+#: treeviews/basetreeview.cpp:889
+msgid "&Link Here"
+msgstr "链接至此(&L)"
 
-#: parts/kafka/domtreeview.cpp:36
-msgid "Length"
-msgstr "长度"
+#: treeviews/basetreeview.cpp:891 treeviews/structtreeview.cpp:835
+msgid "C&ancel"
+msgstr "取消(&A)"
 
-#: parts/kafka/domtreeview.cpp:37 parts/kafka/wkafkapart.cpp:71
-msgid "ID"
-msgstr "ID"
+#: treeviews/basetreeview.cpp:1135
+msgid "Create Site Template File"
+msgstr "创建网站模板文件"
 
-#: parts/kafka/domtreeview.cpp:146
-msgid "Debugging KafkaWidget DOM Tree "
+#: treeviews/basetreeview.cpp:1143
+msgid "Templates should be saved to the local or project template folder."
 msgstr ""
 
-#: parts/kafka/wkafkapart.cpp:68
-msgid "Attribute"
-msgstr "属性"
+#: treeviews/basetreeview.cpp:1151
+msgid "Currently you can create site templates only from local folders."
+msgstr ""
 
-#: components/debugger/debuggerbreakpointview.cpp:61
-#: parts/kafka/wkafkapart.cpp:68
-msgid "Class"
-msgstr "类"
+#: treeviews/basetreeview.cpp:1151
+msgid "Unsupported Feature"
+msgstr "不支持的特性"
 
-#: parts/kafka/wkafkapart.cpp:69
-#, fuzzy
-msgid "Pseudo-class"
-msgstr "Pseudo"
+#: treeviews/basetreeview.cpp:1187
+msgid ""
+"<qt>There was an error while creating the site template tarball."
+"<br>Check that you can read the files from <i>%1</i>"
+", you have write access to <i>%2</i> and that you have enough free space in "
+"your temporary folder.</qt>"
+msgstr ""
 
-#: parts/kafka/wkafkapart.cpp:69
-msgid "CSS rules"
-msgstr "CSS 规则"
+#: treeviews/basetreeview.cpp:1194 treeviews/projecttreeview.cpp:375
+msgid "Create New Folder"
+msgstr "创建新文件夹"
 
-#: parts/kafka/wkafkapart.cpp:69
+#: treeviews/basetreeview.cpp:1194 treeviews/projecttreeview.cpp:375
+msgid "Folder name:"
+msgstr "文件夹名称："
+
+#: treeviews/basetreeview.cpp:1209 treeviews/projecttreeview.cpp:393
+msgid "Create New File"
+msgstr "创建新文件夹"
+
+#: treeviews/basetreeview.cpp:1219 treeviews/projecttreeview.cpp:403
 #, fuzzy
-msgid "Universal selector"
-msgstr "插入新的选择器"
+msgid ""
+"<qt>Cannot create file, because a file named <b>%1</b> already exists.</qt>"
+msgstr "不能打开文件 %1 进行写入。"
 
-#: parts/kafka/wkafkapart.cpp:70
-msgid "Linked stylesheets"
-msgstr "链接样式表"
+#: treeviews/basetreeview.cpp:1219 treeviews/projecttreeview.cpp:403
+msgid "Error Creating File"
+msgstr "创建文件错误"
 
-#: parts/kafka/wkafkapart.cpp:70
-msgid "Embedded stylesheets"
-msgstr "嵌入样式表"
+#: treeviews/doctreeview.cpp:54
+msgid "Project Documentation"
+msgstr "工程文档"
 
-#: parts/kafka/wkafkapart.cpp:70
-msgid "Inline style attribute"
-msgstr "内嵌样式属性"
+#: treeviews/doctreeview.cpp:65
+msgid "&Download Documentation..."
+msgstr "下载文档(&D)..."
 
-#: parts/kafka/wkafkapart.cpp:71
-msgid "Priority"
-msgstr "优先级"
+#: treeviews/projecttreeview.cpp:62 treeviews/projecttreeview.cpp:65
+msgid "Document Base Folder"
+msgstr "文档基础文件夹"
 
-#: parts/kafka/wkafkapart.cpp:72
-msgid "Browser support"
-msgstr "浏览器支持"
+#: treeviews/projecttreeview.cpp:108
+msgid "Project Files"
+msgstr "工程文件"
 
-#: parts/kafka/wkafkapart.cpp:72
-msgid "Pseudo-element"
-msgstr "Pseudo 元素"
+#: treeviews/projecttreeview.cpp:121
+msgid "&When Modified"
+msgstr "修改时(&W)"
 
-#: parts/kafka/wkafkapart.cpp:72
-msgid "Imported"
-msgstr "导入的"
+#: treeviews/projecttreeview.cpp:122
+msgid "&Never"
+msgstr "从不(&N)"
 
-#: parts/kafka/wkafkapart.cpp:73
-#, fuzzy
-msgid "Inheritance"
-msgstr "underline"
+#: treeviews/projecttreeview.cpp:123
+msgid "&Confirm"
+msgstr "确认(&C)"
 
-#: parts/kafka/wkafkapart.cpp:73
-#, fuzzy
-msgid "Inherited"
-msgstr "反转(&N)"
+#: treeviews/filestreeview.cpp:88 treeviews/projecttreeview.cpp:130
+msgid "Insert &Tag"
+msgstr "插入标签(&T)"
 
-#: parts/kafka/wkafkapart.cpp:76
-msgid "Undo/Redo history"
-msgstr "撤消/重做历史"
+#: treeviews/projecttreeview.cpp:133
+msgid "&Upload File..."
+msgstr "上传文件(&U)..."
 
-#: parts/kafka/wkafkapart.cpp:76
-msgid "CSS styles"
-msgstr "CSS 样式"
+#: treeviews/projecttreeview.cpp:134
+msgid "&Quick File Upload"
+msgstr "快速文件上传(&Q)"
 
-#: parts/kafka/htmldocumentproperties.cpp:340 parts/kafka/wkafkapart.cpp:78
-msgid "Sorry, VPL does not support this functionality yet."
-msgstr ""
+#: treeviews/projecttreeview.cpp:136 treeviews/projecttreeview.cpp:154
+msgid "&Remove From Project"
+msgstr "从工程中删除(&R)"
 
-#: parts/kafka/wkafkapart.cpp:79
-msgid "Merge cells"
-msgstr "合并单元格"
+#: treeviews/projecttreeview.cpp:139 treeviews/projecttreeview.cpp:158
+#: treeviews/projecttreeview.cpp:169
+msgid "Upload &Status"
+msgstr "上传状态(&S)"
 
-#: parts/kafka/wkafkapart.cpp:80
-msgid "Split cells"
-msgstr "拆分单元格"
+#: treeviews/filestreeview.cpp:99 treeviews/projecttreeview.cpp:143
+msgid "F&older..."
+msgstr "文件夹(&O)..."
 
-#: parts/kafka/wkafkapart.cpp:81
-msgid "Edit CSS style of this Tag"
-msgstr "编辑此标签的 CSS 样式"
+#: treeviews/filestreeview.cpp:100 treeviews/projecttreeview.cpp:144
+msgid "&File..."
+msgstr "文件(&F)..."
 
-#: parts/kafka/wkafkapart.cpp:82
-msgid "Ident all"
-msgstr "全部缩进"
+#: treeviews/filestreeview.cpp:107 treeviews/projecttreeview.cpp:148
+#: treeviews/projecttreeview.cpp:162
+msgid "&Create New"
+msgstr "创建新工程(&C)"
 
-#: parts/kafka/htmldocumentproperties.cpp:89
-msgid "Content"
-msgstr "内容"
+#: treeviews/projecttreeview.cpp:150
+msgid "&Upload Folder..."
+msgstr "上传文件夹(&U)..."
 
-#: parts/kafka/htmldocumentproperties.cpp:98
-msgid "Rule"
-msgstr "规则"
+#: treeviews/projecttreeview.cpp:151
+msgid "&Quick Folder Upload"
+msgstr "快速文件夹上传(&Q)"
 
-#: parts/preview/whtmlpart.cpp:56
-msgid "View &Document Source"
-msgstr "查看文档源文件(&D)"
+#: treeviews/filestreeview.cpp:106 treeviews/projecttreeview.cpp:152
+msgid "Create Site &Template..."
+msgstr "创建网站模板(&T)..."
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "开源软件国际化之 TDE 简体中文组"
+#: treeviews/projecttreeview.cpp:157
+msgid "Document-&Base Folder"
+msgstr "基于文档的文件夹(&B)"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "i18n-translation@lists.linux.net.cn"
+#: project/projectprivate.cpp:137 treeviews/projecttreeview.cpp:164
+msgid "&Upload Project..."
+msgstr "上传工程(&U)..."
 
-#: components/framewizard/fmfpeditor.cpp:36
-msgid "*.html *.htm|HTML Files"
-msgstr "*.html *.htm|HTML 文件"
+#: treeviews/projecttreeview.cpp:165
+msgid "Re&scan Project Folder..."
+msgstr "重新扫描工程文件夹(&S)..."
 
-#: components/framewizard/fmfpeditor.cpp:37
-msgid "*.php|PHP Files"
-msgstr "*.php|PHP 文件"
+#: treeviews/projecttreeview.cpp:166
+msgid "Project &Properties"
+msgstr "工程属性(&P)"
 
-#: components/framewizard/fmfpeditor.cpp:38
-msgid "*.xml|XML Files"
-msgstr "*.xml|XML 文件"
+#: treeviews/projecttreeview.cpp:195 treeviews/projecttreeview.cpp:289
+msgid "[local disk]"
+msgstr "[本地磁盘]"
 
-#: components/framewizard/fmfpeditor.cpp:39
-msgid "*xhtml|XHTML Files"
-msgstr "*.xhtml|XHTML 文件"
+#: treeviews/projecttreeview.cpp:205 treeviews/projecttreeview.cpp:300
+msgid "No Project"
+msgstr "没有工程"
 
-#: components/framewizard/framewizard.cpp:28
-msgid "You must select an area."
-msgstr "您必须选择区域。"
+#: treeviews/filestreeview.cpp:299 treeviews/filestreeview.cpp:301
+#: treeviews/projecttreeview.cpp:653 treeviews/projecttreeview.cpp:655
+#: treeviews/projecttreeview.cpp:657
+msgid "C&VS"
+msgstr "C&VS"
 
-#: components/framewizard/framewizard.cpp:29
-msgid "Before editing a frame you must save the file."
+#: treeviews/structtreeview.cpp:90
+msgid "All Present DTEP"
 msgstr ""
 
-#: components/framewizard/framewizard.cpp:62
-msgid "Enter the desired number of rows:"
-msgstr "输入想要的行数："
+#: treeviews/structtreeview.cpp:104 treeviews/structtreeview.cpp:109
+#, fuzzy
+msgid "Show Groups For"
+msgstr "显示脚本树"
 
-#: components/framewizard/framewizard.cpp:67
-msgid "Enter the desired number of columns:"
-msgstr "输入想要的列数："
+#: treeviews/structtreeview.cpp:105 treeviews/structtreeview.cpp:122
+msgid "&Reparse"
+msgstr "重新分析(&R)"
 
-#: components/csseditor/styleeditor.cpp:44
-msgid "Open css dialog"
-msgstr "打开 css 对话框"
+#: treeviews/structtreeview.cpp:115
+msgid "Open Subtrees"
+msgstr "打开子树"
 
-#: components/csseditor/colorrequester.cpp:63
-msgid "Open color dialog"
-msgstr "打开颜色对话框"
+#: treeviews/structtreeview.cpp:116
+msgid "Close Subtrees"
+msgstr "关闭子树"
 
-#: components/csseditor/cssselector.cpp:49
-msgid "HTML Files"
-msgstr "HTML 文件"
+#: treeviews/structtreeview.cpp:123
+msgid "Follow Cursor"
+msgstr "跟随光标"
 
-#: components/csseditor/cssselector.cpp:49
-msgid "XHTML Files"
-msgstr "XHTML 文件"
+#: treeviews/structtreeview.cpp:487
+msgid "Find tag"
+msgstr "查找标签"
 
-#: components/csseditor/cssselector.cpp:49
-msgid "XML Files"
-msgstr "XML 文件"
+#: treeviews/structtreeview.cpp:504 treeviews/structtreeview.cpp:524
+msgid "Find Tag && Open Tree"
+msgstr "查找标签并且打开树"
 
-#: components/csseditor/fontfamilychooser.cpp:43
-msgid "The Quick Brown Fox Jumps Over The Lazy Dog"
-msgstr "明日复明日·万事成蹉跎"
+#: treeviews/structtreeview.cpp:521 treeviews/structtreeview.cpp:549
+msgid "nothing"
+msgstr "无"
 
-#: components/csseditor/fontfamilychooser.cpp:84
-msgid "These are the names of the available fonts on your system"
-msgstr ""
+#: treeviews/tagattributetree.cpp:227
+msgid "Attribute Name"
+msgstr "属性名称"
 
-#: components/csseditor/fontfamilychooser.cpp:85
-msgid "These are the names of the generic fonts "
-msgstr ""
+#: components/debugger/debuggerbreakpointview.cpp:64
+#: components/debugger/variableslistview.cpp:56
+#: treeviews/tagattributetree.cpp:228
+msgid "Value"
+msgstr "值"
 
-#: components/csseditor/fontfamilychooser.cpp:86
-msgid "These are the names of the generic fonts you have selected  "
-msgstr ""
+#: treeviews/tagattributetree.cpp:270
+msgid "Parent tags"
+msgstr "父标签"
 
-#: components/csseditor/fontfamilychooser.cpp:87
-msgid "Click this to add a font to your style sheet"
-msgstr ""
+#: treeviews/tagattributetree.cpp:289
+msgid "Namespace"
+msgstr "命名空间"
 
-#: components/csseditor/fontfamilychooser.cpp:88
-msgid "Click this to remove a font from your style sheet"
-msgstr ""
+#: treeviews/tagattributetree.cpp:290
+msgid "prefix"
+msgstr "前缀"
 
-#: components/csseditor/fontfamilychooser.cpp:89
-msgid "Click this to make the font more preferable than the preceeding one"
-msgstr ""
+#: treeviews/tagattributetree.cpp:464
+msgid "Node Name"
+msgstr "结点名称"
 
-#: components/csseditor/fontfamilychooser.cpp:90
-msgid "Click this to make the font less preferable than the following one"
-msgstr ""
+#: treeviews/tagattributetree.cpp:468
+msgid "Delete Tag"
+msgstr "删除标签"
 
-#: components/csseditor/stylesheetparser.cpp:22
-msgid "has not been closed"
-msgstr ""
+#: treeviews/tagattributetree.cpp:472
+msgid "Delete the current tag only."
+msgstr "只删除当前标签。"
 
-#: components/csseditor/stylesheetparser.cpp:23
-msgid "needs an opening parenthesis "
-msgstr ""
+#: treeviews/tagattributetree.cpp:478
+msgid "Delete the current tag and all its children."
+msgstr "删除当前标签及其子标签。"
 
-#: components/csseditor/stylesheetparser.cpp:85
-msgid "The comment"
-msgstr "注释"
+#: treeviews/tagattributetree.cpp:518
+msgid "Current tag: <b>%1</b>"
+msgstr "当前标签：<b>%1</b>"
 
-#: components/csseditor/stylesheetparser.cpp:133
-#: components/csseditor/stylesheetparser.cpp:141
-#: components/csseditor/stylesheetparser.cpp:147
-msgid "The selector"
-msgstr "选择器"
+#: treeviews/tagattributetree.cpp:522
+msgid "Current tag: <b>text</b>"
+msgstr "当前标签：<b>文字</b>"
 
-#: components/csseditor/colorslider.cpp:77
-msgid "Red"
-msgstr "红"
+#: treeviews/tagattributetree.cpp:524
+msgid "Current tag: <b>comment</b>"
+msgstr "当前标签：<b>注释</b>"
 
-#: components/csseditor/colorslider.cpp:77
-msgid "Green"
-msgstr "绿"
+#: treeviews/tagattributetree.cpp:526
+msgid "Current tag:"
+msgstr "当前标签："
 
-#: components/csseditor/colorslider.cpp:77
-msgid "Blue"
-msgstr "蓝"
+#: project/projectupload.cpp:762 treeviews/uploadtreeview.cpp:36
+msgid "Upload"
+msgstr "上传"
 
-#: components/csseditor/propertysetter.cpp:115
-msgid "More..."
-msgstr "更多..."
+#: components/debugger/variableslistview.cpp:58
+#: treeviews/uploadtreeview.cpp:37
+msgid "Size"
+msgstr "大小"
 
-#: components/csseditor/tlpeditors.cpp:70
-msgid ""
-"With this line edit you can insert the URI of the resource you want to reach"
+#: treeviews/uploadtreeview.cpp:38
+msgid "Date"
+msgstr "日期"
+
+#: treeviews/filestreeview.cpp:104 treeviews/filestreeview.cpp:121
+msgid "New Top &Folder..."
+msgstr "新建顶层文件夹(&F)..."
+
+#: treeviews/filestreeview.cpp:105 treeviews/filestreeview.cpp:228
+msgid "&Add Folder to Top"
+msgstr "增加文件夹到顶端(&A)"
+
+#: treeviews/filestreeview.cpp:112
+msgid "&Change Alias..."
+msgstr "更改别名(&C)..."
+
+#: treeviews/filestreeview.cpp:123
+msgid "Files Tree"
+msgstr "文件树"
+
+#: treeviews/filestreeview.cpp:153
+msgid "Root Folder"
+msgstr "根文件夹"
+
+#: treeviews/filestreeview.cpp:158
+msgid "Home Folder"
+msgstr "主文件夹"
+
+#: treeviews/filestreeview.cpp:216
+msgid "Remove From &Top"
+msgstr "从顶端删除(&T)"
+
+#: treeviews/filestreeview.cpp:258 treeviews/filestreeview.cpp:283
+msgid "Set Alias"
+msgstr "设定别名"
+
+#: treeviews/filestreeview.cpp:258 treeviews/filestreeview.cpp:283
+#: treeviews/filestreeview.cpp:319
+msgid "Alternative folder name:"
+msgstr "替代文件夹名称："
+
+#: treeviews/filestreeview.cpp:264 treeviews/filestreeview.cpp:290
+#: treeviews/filestreeview.cpp:327
+msgid "<qt><b>%1</b> is already a toplevel entry.</qt>"
 msgstr ""
 
-#: components/csseditor/tlpeditors.cpp:74
-msgid "Open the URI selector"
-msgstr "打开 URI 选择器"
+#: treeviews/filestreeview.cpp:277
+msgid "Choose Local or Remote Folder"
+msgstr "选择本地或远程文件夹"
 
-#: components/csseditor/tlpeditors.cpp:114
-msgid "Image Files"
-msgstr "图像文件"
+#: treeviews/filestreeview.cpp:319
+msgid "Change Alias"
+msgstr "更改别名"
 
-#: components/csseditor/tlpeditors.cpp:120
-msgid "Audio Files"
-msgstr "音频文件"
+#: treeviews/structtreetag.cpp:119
+msgid ""
+"Line %1: %2 is not a possible child of %3.\n"
+msgstr ""
 
-#: components/csseditor/tlpeditors.cpp:154
-msgid "With this line edit you can insert the name of the font you want to use"
+#: treeviews/structtreetag.cpp:132
+msgid "Line %1, column %2: Closing tag for %3 is missing."
 msgstr ""
 
-#: components/csseditor/tlpeditors.cpp:156
-msgid "Font family:"
-msgstr "字体族："
+#: treeviews/structtreetag.cpp:137
+msgid "Line %1, column %2: %3 is not part of %4."
+msgstr ""
 
-#: components/csseditor/tlpeditors.cpp:158
-msgid "Open font family chooser"
+#: treeviews/structtreetag.cpp:164
+msgid "Empty tag"
+msgstr "空标签"
+
+#: treeviews/structtreetag.cpp:185
+msgid "Line %1, column %2: Opening tag for %3 is missing."
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:50
-msgid "&Commit..."
-msgstr "提交(&C)..."
+#: treeviews/scripttreeview.cpp:72
+msgid "Global Scripts"
+msgstr "全局脚本"
 
-#: components/cvsservice/cvsservice.cpp:55
-msgid "Update &To"
-msgstr "更新至(&T)"
+#: treeviews/scripttreeview.cpp:78
+msgid "Local Scripts"
+msgstr "本地脚本"
 
-#: components/cvsservice/cvsservice.cpp:56
-msgid "&Tag/Date..."
-msgstr "标记/日期(&T)..."
+#: treeviews/scripttreeview.cpp:87
+msgid "&Description"
+msgstr "描述(&D)"
 
-#: components/cvsservice/cvsservice.cpp:58
-msgid "&HEAD"
-msgstr "&HEAD"
+#: treeviews/scripttreeview.cpp:88
+msgid "&Run Script"
+msgstr "运行脚本(&R)"
 
-#: components/cvsservice/cvsservice.cpp:60
-msgid "Re&vert"
-msgstr "还原(&V)"
+#: treeviews/scripttreeview.cpp:90
+msgid "&Edit Script"
+msgstr "编辑脚本(&E)"
 
-#: components/cvsservice/cvsservice.cpp:63
-msgid "&Add to Repository..."
-msgstr "添加到库中(&A)..."
+#: treeviews/scripttreeview.cpp:91
+msgid "Edit in &Quanta"
+msgstr "在 Quanta 中编辑(&Q)"
 
-#: components/cvsservice/cvsservice.cpp:65
-msgid "&Remove From Repository..."
-msgstr "从库中删除(&R)..."
+#: treeviews/scripttreeview.cpp:92
+msgid "Edi&t Description"
+msgstr "编辑描述(&T)"
 
-#: components/cvsservice/cvsservice.cpp:67
-msgid "&Ignore in CVS Operations"
-msgstr "在 CVS 操作中忽略(&I)"
+#: treeviews/scripttreeview.cpp:94
+msgid "&Assign Action"
+msgstr "指派动作(&A)"
 
-#: components/cvsservice/cvsservice.cpp:69
-msgid "Do &Not Ignore in CVS Operations"
-msgstr "在 CVS 操作中不忽略(&N)"
+#: treeviews/scripttreeview.cpp:95
+msgid "&Send in Email..."
+msgstr "用电子邮件发送(&S)..."
 
-#: components/cvsservice/cvsservice.cpp:73
-msgid "Show &Log Messages"
-msgstr "显示日志消息(&L)"
+#: treeviews/scripttreeview.cpp:96
+msgid "&Upload Script..."
+msgstr "上传脚本(&U)..."
 
-#: components/cvsservice/cvsservice.cpp:140
-msgid "Running CVS update..."
-msgstr "正在运行 CVS update..."
+#: treeviews/scripttreeview.cpp:99
+msgid "&Download Script..."
+msgstr "下载脚本(&D)..."
 
-#: components/cvsservice/cvsservice.cpp:179
-msgid "Updating to revision %1 ..."
-msgstr "正在更新到版本 %1..."
+#: treeviews/scripttreeview.cpp:272
+msgid "Send script in email"
+msgstr "用电子邮件发送脚本"
 
-#: components/cvsservice/cvsservice.cpp:183
-msgid "Updating to the version from %1 ..."
+#: treeviews/scripttreeview.cpp:274
+msgid ""
+"Hi,\n"
+" This is a Quanta Plus [http://quanta.kdewebdev.org] script tarball.\n"
+"\n"
+"Have fun.\n"
 msgstr ""
+"你好，\n"
+"这是一个 Quanta Plus [http://quanta.kdewebdev.org] 的脚本包。\n"
+"\n"
+"祝愉快。\n"
 
-#: components/cvsservice/cvsservice.cpp:221
-msgid "Updating to HEAD..."
-msgstr ""
+#: treeviews/scripttreeview.cpp:287
+msgid "Quanta Plus Script"
+msgstr "Quanta Plus 脚本"
 
-#: components/cvsservice/cvsservice.cpp:256
-msgid "Current"
-msgstr "当前"
+#: parsers/parsercommon.cpp:177
+msgid "%1 block"
+msgstr "%1 块"
 
-#: components/cvsservice/cvsservice.cpp:266
-msgid "Running CVS commit..."
+#: parsers/dtd/dtd.cpp:127 parsers/dtd/dtdparser.cpp:78
+#, fuzzy
+msgid "<qt>Cannot download the DTD from <b>%1</b>.</qt>"
+msgstr "不能打开文件 %1 进行写入。"
+
+#: components/debugger/debuggervariable.cpp:174 parsers/dtd/dtdparser.cpp:84
+msgid "Unknown"
+msgstr "未知"
+
+#: parsers/dtd/dtdparser.cpp:105
+#, fuzzy
+msgid ""
+"<qt>Error while parsing the DTD."
+"<br>The error message is:"
+"<br><i>%1</i></qt>"
 msgstr ""
+"重命名“%1”时发生错误。\n"
+"错误消息为：\n"
+"\n"
+"%2"
 
-#: components/cvsservice/cvsservice.cpp:301
-msgid "Reverting to the version from the repository..."
+#: parsers/dtd/dtdparser.cpp:157
+#, fuzzy
+msgid ""
+"<qt>Cannot create the "
+"<br><b>%1</b> file."
+"<br>Check that you have write permission in the parent folder.</qt>"
 msgstr ""
+"无法创建目录\n"
+"“%1”。\n"
+"请检查您是否有父目录的写权限，或者到\n"
+"“%2”\n"
+"的连接是否有效！"
 
-#: components/cvsservice/cvsservice.cpp:333
-msgid "Add the following files to repository?"
+#: parsers/dtd/dtdparser.cpp:169
+msgid "No elements were found in the DTD."
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:333
-msgid "CVS Add"
-msgstr "CVS 添加"
+#: dialogs/settings/abbreviation.cpp:95
+msgid "New Abbreviation Group"
+msgstr "新缩写组"
 
-#: components/cvsservice/cvsservice.cpp:336
-msgid "Adding file to the repository..."
-msgstr "正在将文件添加到库中..."
+#: dialogs/settings/abbreviation.cpp:95
+msgid "Group name:"
+msgstr "组名称："
 
-#: components/cvsservice/cvsservice.cpp:368
+#: dialogs/settings/abbreviation.cpp:100
 msgid ""
-"<qt>Remove the following files from the repository?"
-"<br>This will remove your <b>working copy</b> as well.</qt>"
+"<qt>There is already an abbreviation group called <b>%1</b>"
+". Choose an unique name for the new group.</qt>"
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:368
-msgid "CVS Remove"
-msgstr "CVS 删除"
+#: dialogs/settings/abbreviation.cpp:100
+msgid "Group already exists"
+msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:371
-msgid "Removing files from the repository..."
-msgstr "正在从库中删除文件..."
+#: dialogs/settings/abbreviation.cpp:118
+msgid "Add DTEP"
+msgstr "添加 DTEP"
 
-#: components/cvsservice/cvsservice.cpp:395
-msgid "Showing CVS log..."
-msgstr ""
+#: dialogs/settings/abbreviation.cpp:119
+msgid "Select a DTEP:"
+msgstr "选择 DTEP："
 
-#: components/cvsservice/cvsservice.cpp:433
-msgid "\"%1\" is already in the CVS ignore list."
+#: dialogs/settings/abbreviation.cpp:145
+msgid "<qt>Select a DTEP from the list before using <b>Remove</b>.</qt>"
 msgstr ""
 
-#: components/cvsservice/cvsservice.cpp:441
-msgid "\"%1\" added to the CVS ignore list."
-msgstr ""
+#: dialogs/settings/abbreviation.cpp:145
+#, fuzzy
+msgid "No DTEP Selected"
+msgstr "选择"
 
-#: components/cvsservice/cvsservice.cpp:480
-msgid "\"%1\" is not in the CVS ignore list."
+#: dialogs/settings/abbreviation.cpp:190
+#, fuzzy
+msgid "<qt>Do you really want to remove the <b>%1</b> template?</qt>"
 msgstr ""
+"您真的要从工程中删除\n"
+"%1\n"
+"吗？"
 
-#: components/cvsservice/cvsservice.cpp:489
-msgid "\"%1\" removed from the CVS ignore list."
-msgstr ""
+#: dialogs/settings/abbreviation.cpp:204
+msgid "Edit Code Template"
+msgstr "编辑代码模板"
 
-#: components/cvsservice/cvsservice.cpp:504
+#: dialogs/settings/abbreviation.cpp:273
+#, fuzzy
 msgid ""
-"<qt>The CVS command <b>%1</b> has failed. The error code was <i>%2</i>.</qt>"
-msgstr ""
+"<qt>Cannot open the file <b>%1</b> for writing.\n"
+"Modified abbreviations will be lost when you quit Quanta.</qt>"
+msgstr "不能打开文件 %1 进行写入。"
 
-#: components/cvsservice/cvsservice.cpp:504
-msgid "Command Failed"
-msgstr "命令失败"
+#: dialogs/dirtydlg.cpp:44
+#, fuzzy
+msgid "<qt>The file <b>%1</b> was changed outside of the Quanta editor.</qt>"
+msgstr "文件在 Quanta 编辑器之外发生了更改。"
 
-#: components/cvsservice/cvsservice.cpp:515
-msgid "CVS command finished."
-msgstr "CVS 命令完成。"
+#: dialogs/actionconfigdialog.cpp:151
+msgid "&Add New Toolbar"
+msgstr "添加新工具栏(&A)"
 
-#: components/cvsservice/cvsservice.cpp:532
-msgid ""
-"Error: \"%1\" is not part of the\n"
-"\"%2\" repository."
-msgstr ""
+#: dialogs/actionconfigdialog.cpp:152
+msgid "&Remove Toolbar"
+msgstr "删除工具栏(&R)"
 
-#: components/debugger/interfaces/debuggerclient.cpp:46
-msgid "The current debugger, %1, does not support the \"%2\" instruction."
-msgstr ""
+#: dialogs/actionconfigdialog.cpp:153
+msgid "&Edit Toolbar"
+msgstr "编辑工具栏(&E)"
 
-#: components/debugger/interfaces/debuggerclient.cpp:46
-#: components/debugger/interfaces/debuggerclient.cpp:144
-#: components/debugger/interfaces/debuggerclient.cpp:151
-#: components/debugger/interfaces/debuggerclient.cpp:157
-msgid "Unsupported Debugger Function"
-msgstr "不支持的调试器功能"
+#: dialogs/actionconfigdialog.cpp:193
+msgid "Do you really want to remove the \"%1\" toolbar?"
+msgstr "您真的想要删除“%1”工具栏吗？"
 
-#: components/debugger/interfaces/debuggerclient.cpp:59
-msgid "Send HTTP Request"
-msgstr ""
+#: dialogs/actionconfigdialog.cpp:269 dialogs/actionconfigdialog.cpp:782
+msgid "Do you want to save the changes made to this action?"
+msgstr "您是否想要保存对此动作的更改？"
 
-#: components/debugger/interfaces/debuggerclient.cpp:65
-msgid "Step Over"
+#: dialogs/actionconfigdialog.cpp:765
+msgid ""
+"The '%1' key combination has already been allocated to the \"%2\" action.\n"
+"Please choose a unique key combination."
 msgstr ""
 
-#: components/debugger/interfaces/debuggerclient.cpp:72
-msgid "Step Out"
+#: dialogs/actionconfigdialog.cpp:769
+msgid "Conflicting Shortcuts"
+msgstr "快捷键冲突"
+
+#: dialogs/actionconfigdialog.cpp:841
+#, fuzzy
+msgid ""
+"<qt>Removing the action removes all the references to it.\n"
+"Are you sure you want to remove the <b>%1</b> action?</qt>"
 msgstr ""
+"删除动作将删除对它的全部引用。\n"
+"您确定要删除当前动作吗？"
 
-#: components/debugger/interfaces/debuggerclient.cpp:89
-msgid "Skip"
-msgstr "跳过"
+#: dialogs/actionconfigdialog.cpp:887
+msgid "Add Action to Toolbar"
+msgstr "在工具栏中添加动作"
 
-#: components/debugger/interfaces/debuggerclient.cpp:94
+#: dialogs/dtepeditdlg.cpp:63
+msgid "&Pages"
+msgstr "分页(&P)"
+
+#: dialogs/dtepeditdlg.cpp:206
 #, fuzzy
-msgid "Step Into"
-msgstr "输入信息"
+msgid ""
+"<qt>The file <b>%1</b> is not writable."
+"<br>Do you want to save the configuration to a different file?</qt>"
+msgstr "<qt>文件 <b>%1</b> 不存在。<br>您是否要将其从列表中删除？</qt>"
 
-#: components/debugger/debuggermanager.cpp:251
-#: components/debugger/interfaces/debuggerclient.cpp:99
-msgid "Kill"
-msgstr "杀死"
+#: dialogs/dtepeditdlg.cpp:206
+msgid "Save to Different File"
+msgstr "保存到不同文件"
 
-#: components/debugger/debuggermanager.cpp:273
-#: components/debugger/interfaces/debuggerclient.cpp:106
-#, fuzzy
-msgid "Open Profiler Output"
-msgstr "打开工程"
+#: dialogs/dtepeditdlg.cpp:206
+msgid "Do Not Save"
+msgstr "不保存"
 
-#: components/debugger/interfaces/debuggerclient.cpp:118
-msgid "Set Breakpoint"
-msgstr "设置断点"
+#: dialogs/dtepeditdlg.cpp:208
+msgid "*.rc|DTEP Description"
+msgstr "*.rc|DTEP 描述"
 
-#: components/debugger/interfaces/debuggerclient.cpp:125
-msgid "Remove Breakpoint"
-msgstr "删除断点"
+#: dialogs/dtepeditdlg.cpp:208
+msgid "Save Description As"
+msgstr "描述另存为"
 
-#: components/debugger/interfaces/debuggerclient.cpp:132
-msgid "%1 does not have any specific settings."
-msgstr ""
+#: dialogs/dtepeditdlg.cpp:444
+msgid "Edit Structure Group"
+msgstr "编辑结构组"
 
-#: components/debugger/interfaces/debuggerclient.cpp:132
-msgid "Settings"
-msgstr "设置"
+#: dialogs/dtepeditdlg.cpp:494
+msgid "Add Structure Group"
+msgstr "添加结构组"
 
-#: components/debugger/interfaces/debuggerclient.cpp:144
-#: components/debugger/interfaces/debuggerclient.cpp:151
-msgid "%1 does not support watches."
+#: dialogs/dtepeditdlg.cpp:539
+#, fuzzy
+msgid "<qt>Do you really want to delete the <b>%1</b> group?</qt>"
 msgstr ""
+"您真的要删除文件\n"
+"%1 吗？\n"
 
-#: components/debugger/interfaces/debuggerclient.cpp:157
-msgid "%1 does not support setting the value of variables."
-msgstr ""
+#: dialogs/dtepeditdlg.cpp:539
+msgid "Delete Group"
+msgstr "删除组"
 
-#: components/debugger/dbgp/quantadebuggerdbgp.cpp:330
-msgid "Unrecognized package: '%1%2'"
-msgstr ""
+#: components/framewizard/fmfpeditor.cpp:40 dialogs/filecombo.cpp:93
+msgid "*|All Files"
+msgstr "*|全部文件"
 
-#: components/debugger/dbgp/quantadebuggerdbgp.cpp:342
-msgid "The debugger for %1 uses an unsupported protocol version (%2)"
+#: dialogs/tagdialogs/tagimgdlg.cpp:107
+msgid ""
+"|Image Files\n"
+"*|All Files"
 msgstr ""
+"|图像文件\n"
+"*|全部文件"
 
-#: components/debugger/dbgp/quantadebuggerdbgp.cpp:870
-#: components/debugger/dbgp/quantadebuggerdbgp.cpp:872
-msgid "Unable to open profiler output (%1)"
-msgstr ""
+#: dialogs/tagdialogs/tagimgdlgdata.cpp:27
+msgid "Image source:"
+msgstr "图像源："
 
-#: components/debugger/dbgp/quantadebuggerdbgp.cpp:870
-#, fuzzy
-msgid "Profiler File Error"
-msgstr "配置文件删除错误"
+#: dialogs/tagdialogs/tagimgdlgdata.cpp:46
+msgid "Width:"
+msgstr "宽度："
 
-#: components/debugger/dbgp/quantadebuggerdbgp.cpp:926
-#, fuzzy
-msgid "Unable to set value of variable."
-msgstr "设置变量值"
+#: dialogs/tagdialogs/tagimgdlgdata.cpp:58
+msgid "Height:"
+msgstr "高度："
 
-#: components/debugger/dbgp/dbgpnetwork.cpp:74
-#, fuzzy, c-format
-msgid "Listening on port %1"
-msgstr "监听端口："
+#: dialogs/tagdialogs/tagimgdlgdata.cpp:74
+msgid "HSpace:"
+msgstr "水平空间："
 
-#: components/debugger/dbgp/dbgpnetwork.cpp:81
-#, c-format
-msgid "Unable to listen on port %1"
-msgstr ""
+#: dialogs/tagdialogs/tagimgdlgdata.cpp:85
+msgid "VSpace:"
+msgstr "垂直空间："
 
-#: components/debugger/dbgp/dbgpnetwork.cpp:125
-msgid "Disconnected from remote host"
-msgstr ""
+#: dialogs/tagdialogs/tagimgdlgdata.cpp:93
+msgid "Alternate text:"
+msgstr "替代文本："
 
-#: components/debugger/gubed/quantadebuggergubed.cpp:465
-msgid "Syntax or parse error in %1)"
-msgstr ""
+#: dialogs/tagdialogs/tagimgdlgdata.cpp:103
+msgid "Border:"
+msgstr "边框："
 
-#: components/debugger/gubed/quantadebuggergubed.cpp:482
-msgid "Error occurred: Line %1, Code %2 (%3) in  %4"
-msgstr ""
+#: dialogs/tagdialogs/tagimgdlgdata.cpp:115
+msgid "Align:"
+msgstr "对齐："
 
-#: components/debugger/gubed/quantadebuggergubed.cpp:502
-msgid "Breakpoint reached"
-msgstr "到达了断点"
+#: dialogs/tagdialogs/tagdialog.cpp:127 dialogs/tagdialogs/tagdialog.cpp:146
+#: dialogs/tagdialogs/tagdialog.cpp:345 dialogs/tagdialogs/tagdialog.cpp:427
+msgid "Unknown tag"
+msgstr "未知标签"
 
-#: components/debugger/gubed/quantadebuggergubed.cpp:509
-msgid "Conditional breakpoint fulfilled"
-msgstr "满足了条件断点"
+#: dialogs/tagdialogs/tagdialog.cpp:138
+msgid "Tag Properties: "
+msgstr "标签属性："
 
-#: components/debugger/gubed/quantadebuggergubed.cpp:519
-#, c-format
-msgid "Established connection to %1"
-msgstr ""
+#: dialogs/tagdialogs/tagquicklistdlgdata.cpp:27
+msgid "Rows:"
+msgstr "行数："
 
-#: components/debugger/gubed/quantadebuggergubed.cpp:560
-msgid ""
-"The script being debugged does not communicate with the correct protocol "
-"version"
-msgstr ""
+#: dialogs/tagdialogs/tagquicklistdlgdata.cpp:55
+msgid "Ordered"
+msgstr "有序的"
 
-#: components/debugger/gubed/quantadebuggergubed.cpp:1136
-msgid "False"
-msgstr "False"
+#: dialogs/tagdialogs/tagquicklistdlgdata.cpp:61
+msgid "Unordered"
+msgstr "无序的"
 
-#: components/debugger/gubed/quantadebuggergubed.cpp:1136
-msgid "True"
-msgstr "True"
+#: dialogs/tagdialogs/colorcombo.cpp:178 dialogs/tagdialogs/colorcombo.cpp:232
+msgid "Custom..."
+msgstr "自定义..."
 
-#: components/debugger/gubed/quantadebuggergubed.cpp:1145
-#: components/debugger/gubed/quantadebuggergubed.cpp:1230
-msgid "<Undefined>"
-msgstr "<未定义>"
+#: dialogs/tagdialogs/tagmaildlg.cpp:96
+msgid "Select Address"
+msgstr "选择地址"
 
-#: components/debugger/gubed/quantadebuggergubed.cpp:1234
-msgid "<Error>"
-msgstr "<错误>"
+#: dialogs/tagdialogs/tagmaildlg.cpp:104
+msgid "No addresses found."
+msgstr "未发现地址。"
 
-#: components/debugger/gubed/quantadebuggergubed.cpp:1239
-msgid "<Unimplemented type>"
-msgstr ""
+#: components/framewizard/fmfpeditor.cpp:36
+msgid "*.html *.htm|HTML Files"
+msgstr "*.html *.htm|HTML 文件"
 
-#: components/debugger/debuggerbreakpointview.cpp:64
-#: components/debugger/variableslistview.cpp:56
-#: treeviews/tagattributetree.cpp:228
-msgid "Value"
-msgstr "值"
+#: components/framewizard/fmfpeditor.cpp:37
+msgid "*.php|PHP Files"
+msgstr "*.php|PHP 文件"
 
-#: components/debugger/variableslistview.cpp:58
-#: treeviews/uploadtreeview.cpp:37
-msgid "Size"
-msgstr "大小"
+#: components/framewizard/fmfpeditor.cpp:38
+msgid "*.xml|XML Files"
+msgstr "*.xml|XML 文件"
 
-#: components/debugger/variableslistview.cpp:66
-msgid "&Set Value"
-msgstr "设置值(&S)"
+#: components/framewizard/fmfpeditor.cpp:39
+msgid "*xhtml|XHTML Files"
+msgstr "*.xhtml|XHTML 文件"
 
-#: components/debugger/variableslistview.cpp:68
-#, fuzzy
-msgid "&Dump in Messages Log"
-msgstr "警告消息(&W)"
+#: components/framewizard/framewizard.cpp:28
+msgid "You must select an area."
+msgstr "您必须选择区域。"
 
-#: components/debugger/variableslistview.cpp:70
-msgid "&Copy to Clipboard"
-msgstr "复制到剪贴板(&C)"
+#: components/framewizard/framewizard.cpp:29
+msgid "Before editing a frame you must save the file."
+msgstr ""
 
-#: components/debugger/variableslistview.cpp:262
-msgid "Set Variable"
-msgstr "设置变量"
+#: components/framewizard/framewizard.cpp:62
+msgid "Enter the desired number of rows:"
+msgstr "输入想要的行数："
 
-#: components/debugger/variableslistview.cpp:277
-msgid ""
-"Contents of variable %1:\n"
-">>>\n"
-msgstr ""
+#: components/framewizard/framewizard.cpp:67
+msgid "Enter the desired number of columns:"
+msgstr "输入想要的列数："
+
+#: components/debugger/backtracelistview.cpp:60
+#: components/debugger/debuggerbreakpointview.cpp:63
+msgid "Line"
+msgstr "行"
+
+#: components/debugger/backtracelistview.cpp:87
+#, fuzzy
+msgid "Eval"
+msgstr "电子邮件"
 
 #: components/debugger/debuggermanager.cpp:111 project/projectprivate.cpp:1535
 msgid ""
@@ -11638,6 +12556,11 @@ msgid ""
 "being debugged, it will start in paused mode when started"
 msgstr ""
 
+#: components/debugger/debuggermanager.cpp:251
+#: components/debugger/interfaces/debuggerclient.cpp:99
+msgid "Kill"
+msgstr "杀死"
+
 #: components/debugger/debuggermanager.cpp:252
 msgid "Kills the currently running script"
 msgstr ""
@@ -11674,6 +12597,12 @@ msgstr ""
 msgid "Changes the value of a variable"
 msgstr "设置变量值"
 
+#: components/debugger/debuggermanager.cpp:273
+#: components/debugger/interfaces/debuggerclient.cpp:106
+#, fuzzy
+msgid "Open Profiler Output"
+msgstr "打开工程"
+
 #: components/debugger/debuggermanager.cpp:274
 msgid "Opens the profiler output file"
 msgstr ""
@@ -11690,6 +12619,63 @@ msgstr ""
 msgid "Unable to open file %1, check your basedirs and mappings."
 msgstr ""
 
+#: components/debugger/interfaces/debuggerclient.cpp:46
+msgid "The current debugger, %1, does not support the \"%2\" instruction."
+msgstr ""
+
+#: components/debugger/interfaces/debuggerclient.cpp:46
+#: components/debugger/interfaces/debuggerclient.cpp:144
+#: components/debugger/interfaces/debuggerclient.cpp:151
+#: components/debugger/interfaces/debuggerclient.cpp:157
+msgid "Unsupported Debugger Function"
+msgstr "不支持的调试器功能"
+
+#: components/debugger/interfaces/debuggerclient.cpp:59
+msgid "Send HTTP Request"
+msgstr ""
+
+#: components/debugger/interfaces/debuggerclient.cpp:65
+msgid "Step Over"
+msgstr ""
+
+#: components/debugger/interfaces/debuggerclient.cpp:72
+msgid "Step Out"
+msgstr ""
+
+#: components/debugger/interfaces/debuggerclient.cpp:89
+msgid "Skip"
+msgstr "跳过"
+
+#: components/debugger/interfaces/debuggerclient.cpp:94
+#, fuzzy
+msgid "Step Into"
+msgstr "输入信息"
+
+#: components/debugger/interfaces/debuggerclient.cpp:118
+msgid "Set Breakpoint"
+msgstr "设置断点"
+
+#: components/debugger/interfaces/debuggerclient.cpp:125
+msgid "Remove Breakpoint"
+msgstr "删除断点"
+
+#: components/debugger/interfaces/debuggerclient.cpp:132
+msgid "%1 does not have any specific settings."
+msgstr ""
+
+#: components/debugger/interfaces/debuggerclient.cpp:132
+msgid "Settings"
+msgstr "设置"
+
+#: components/debugger/interfaces/debuggerclient.cpp:144
+#: components/debugger/interfaces/debuggerclient.cpp:151
+msgid "%1 does not support watches."
+msgstr ""
+
+#: components/debugger/interfaces/debuggerclient.cpp:157
+msgid "%1 does not support setting the value of variables."
+msgstr ""
+
 #: components/debugger/debuggervariable.cpp:109
 msgid "Non scalar value"
 msgstr ""
@@ -11730,19 +12716,53 @@ msgstr "布尔值"
 msgid "Undefined"
 msgstr "未定义"
 
-#: components/debugger/debuggervariable.cpp:174 parsers/dtd/dtdparser.cpp:84
-msgid "Unknown"
-msgstr "未知"
+#: components/debugger/gubed/quantadebuggergubed.cpp:465
+msgid "Syntax or parse error in %1)"
+msgstr ""
 
-#: components/debugger/backtracelistview.cpp:60
-#: components/debugger/debuggerbreakpointview.cpp:63
-msgid "Line"
-msgstr "行"
+#: components/debugger/gubed/quantadebuggergubed.cpp:482
+msgid "Error occurred: Line %1, Code %2 (%3) in  %4"
+msgstr ""
 
-#: components/debugger/backtracelistview.cpp:87
-#, fuzzy
-msgid "Eval"
-msgstr "电子邮件"
+#: components/debugger/gubed/quantadebuggergubed.cpp:502
+msgid "Breakpoint reached"
+msgstr "到达了断点"
+
+#: components/debugger/gubed/quantadebuggergubed.cpp:509
+msgid "Conditional breakpoint fulfilled"
+msgstr "满足了条件断点"
+
+#: components/debugger/gubed/quantadebuggergubed.cpp:519
+#, c-format
+msgid "Established connection to %1"
+msgstr ""
+
+#: components/debugger/gubed/quantadebuggergubed.cpp:560
+msgid ""
+"The script being debugged does not communicate with the correct protocol "
+"version"
+msgstr ""
+
+#: components/debugger/gubed/quantadebuggergubed.cpp:1136
+msgid "False"
+msgstr "False"
+
+#: components/debugger/gubed/quantadebuggergubed.cpp:1136
+msgid "True"
+msgstr "True"
+
+#: components/debugger/gubed/quantadebuggergubed.cpp:1145
+#: components/debugger/gubed/quantadebuggergubed.cpp:1230
+msgid "<Undefined>"
+msgstr "<未定义>"
+
+#: components/debugger/gubed/quantadebuggergubed.cpp:1234
+msgid "<Error>"
+msgstr "<错误>"
+
+#: components/debugger/gubed/quantadebuggergubed.cpp:1239
+msgid "<Unimplemented type>"
+msgstr ""
 
 #: components/debugger/debuggerui.cpp:46
 msgid "Variables"
@@ -11800,1412 +12820,697 @@ msgstr "错误时"
 msgid "On breakpoint"
 msgstr "断点时"
 
-#: components/debugger/debuggerbreakpointview.cpp:59
-msgid "Expression"
-msgstr "表达式"
-
-#: components/tableeditor/tableeditor.cpp:55
-msgid "&Edit Cell Properties"
-msgstr "编辑单元格属性(&E)"
-
-#: components/tableeditor/tableeditor.cpp:56
-msgid "Edit &Row Properties"
-msgstr "编辑行属性(&R)"
-
-#: components/tableeditor/tableeditor.cpp:59
-msgid "Merge Cells"
-msgstr "合并单元格"
-
-#: components/tableeditor/tableeditor.cpp:60
-msgid "Break Merging"
-msgstr "拆分合并"
-
-#: components/tableeditor/tableeditor.cpp:63
-msgid "&Insert Row"
-msgstr "插入行(&I)"
-
-#: components/tableeditor/tableeditor.cpp:64
-msgid "Insert Co&lumn"
-msgstr "插入列(&L)"
-
-#: components/tableeditor/tableeditor.cpp:65
-msgid "Remove Row"
-msgstr "删除行"
-
-#: components/tableeditor/tableeditor.cpp:66
-msgid "Remove Column"
-msgstr "删除列"
-
-#: components/tableeditor/tableeditor.cpp:68
-msgid "Edit &Table Properties"
-msgstr "编辑表格属性(&T)"
-
-#: components/tableeditor/tableeditor.cpp:69
-msgid "Edit Child Table"
-msgstr "编辑子表格"
-
-#: components/tableeditor/tableeditor.cpp:207
-#, c-format
-msgid "Edit col: %1"
-msgstr "编辑列：%1"
-
-#: components/tableeditor/tableeditor.cpp:414
-#: components/tableeditor/tableeditor.cpp:454
-#: components/tableeditor/tableeditor.cpp:499
-#: components/tableeditor/tableeditor.cpp:1063
-msgid "Merged with (%1, %2)."
-msgstr "已与(%1，%2)合并。"
-
-#: components/tableeditor/tableeditor.cpp:1168
-#: components/tableeditor/tableeditor.cpp:1189
-msgid ""
-"Cannot edit the child table; you probably modified the cell containing the "
-"table manually."
+#: components/debugger/dbgp/quantadebuggerdbgp.cpp:330
+msgid "Unrecognized package: '%1%2'"
 msgstr ""
 
-#: components/tableeditor/tableeditor.cpp:1204
-msgid ""
-"Cannot find the closing tag of the child table; you have probably introduced "
-"unclosed tags in the table and have broken its consistency."
+#: components/debugger/dbgp/quantadebuggerdbgp.cpp:342
+msgid "The debugger for %1 uses an unsupported protocol version (%2)"
 msgstr ""
 
-#: treeviews/filestreeview.cpp:87 treeviews/projecttreeview.cpp:128
-#: treeviews/servertreeview.cpp:103 treeviews/templatestreeview.cpp:147
-msgid "&Open"
-msgstr "打开(&O)"
-
-#: treeviews/filestreeview.cpp:88 treeviews/projecttreeview.cpp:130
-msgid "Insert &Tag"
-msgstr "插入标签(&T)"
-
-#: treeviews/filestreeview.cpp:89 treeviews/projecttreeview.cpp:131
-#: treeviews/servertreeview.cpp:105 treeviews/templatestreeview.cpp:151
-msgid "Clos&e"
-msgstr "关闭(&E)"
-
-#: treeviews/filestreeview.cpp:91 treeviews/filestreeview.cpp:109
-#: treeviews/templatestreeview.cpp:150 treeviews/templatestreeview.cpp:164
-msgid "&Insert in Project..."
-msgstr "插入到工程中(&I)..."
-
-#: treeviews/filestreeview.cpp:93 treeviews/filestreeview.cpp:113
-#: treeviews/projecttreeview.cpp:135 treeviews/projecttreeview.cpp:153
-#: treeviews/servertreeview.cpp:110 treeviews/servertreeview.cpp:120
-msgid "Re&name"
-msgstr "重命名(&N)"
-
-#: treeviews/filestreeview.cpp:96 treeviews/filestreeview.cpp:116
-#: treeviews/projecttreeview.cpp:140 treeviews/projecttreeview.cpp:159
-#: treeviews/servertreeview.cpp:112 treeviews/servertreeview.cpp:122
-#: treeviews/templatestreeview.cpp:156 treeviews/templatestreeview.cpp:170
-msgid "&Properties"
-msgstr "属性(&P)"
-
-#: treeviews/filestreeview.cpp:99 treeviews/projecttreeview.cpp:143
-msgid "F&older..."
-msgstr "文件夹(&O)..."
-
-#: treeviews/filestreeview.cpp:100 treeviews/projecttreeview.cpp:144
-msgid "&File..."
-msgstr "文件(&F)..."
-
-#: treeviews/filestreeview.cpp:104 treeviews/filestreeview.cpp:121
-msgid "New Top &Folder..."
-msgstr "新建顶层文件夹(&F)..."
-
-#: treeviews/filestreeview.cpp:105 treeviews/filestreeview.cpp:228
-msgid "&Add Folder to Top"
-msgstr "增加文件夹到顶端(&A)"
-
-#: treeviews/filestreeview.cpp:106 treeviews/projecttreeview.cpp:152
-msgid "Create Site &Template..."
-msgstr "创建网站模板(&T)..."
-
-#: treeviews/filestreeview.cpp:107 treeviews/projecttreeview.cpp:148
-#: treeviews/projecttreeview.cpp:162
-msgid "&Create New"
-msgstr "创建新工程(&C)"
-
-#: treeviews/filestreeview.cpp:112
-msgid "&Change Alias..."
-msgstr "更改别名(&C)..."
-
-#: treeviews/filestreeview.cpp:123
-msgid "Files Tree"
-msgstr "文件树"
-
-#: treeviews/filestreeview.cpp:153
-msgid "Root Folder"
-msgstr "根文件夹"
-
-#: treeviews/filestreeview.cpp:158
-msgid "Home Folder"
-msgstr "主文件夹"
-
-#: treeviews/filestreeview.cpp:216
-msgid "Remove From &Top"
-msgstr "从顶端删除(&T)"
-
-#: treeviews/filestreeview.cpp:258 treeviews/filestreeview.cpp:283
-msgid "Set Alias"
-msgstr "设定别名"
-
-#: treeviews/filestreeview.cpp:258 treeviews/filestreeview.cpp:283
-#: treeviews/filestreeview.cpp:319
-msgid "Alternative folder name:"
-msgstr "替代文件夹名称："
-
-#: treeviews/filestreeview.cpp:264 treeviews/filestreeview.cpp:290
-#: treeviews/filestreeview.cpp:327
-msgid "<qt><b>%1</b> is already a toplevel entry.</qt>"
+#: components/debugger/dbgp/quantadebuggerdbgp.cpp:870
+#: components/debugger/dbgp/quantadebuggerdbgp.cpp:872
+msgid "Unable to open profiler output (%1)"
 msgstr ""
 
-#: treeviews/filestreeview.cpp:277
-msgid "Choose Local or Remote Folder"
-msgstr "选择本地或远程文件夹"
-
-#: treeviews/filestreeview.cpp:299 treeviews/filestreeview.cpp:301
-#: treeviews/projecttreeview.cpp:653 treeviews/projecttreeview.cpp:655
-#: treeviews/projecttreeview.cpp:657
-msgid "C&VS"
-msgstr "C&VS"
-
-#: treeviews/filestreeview.cpp:319
-msgid "Change Alias"
-msgstr "更改别名"
+#: components/debugger/dbgp/quantadebuggerdbgp.cpp:870
+#, fuzzy
+msgid "Profiler File Error"
+msgstr "配置文件删除错误"
 
-#: treeviews/structtreetag.cpp:119
-msgid ""
-"Line %1: %2 is not a possible child of %3.\n"
-msgstr ""
+#: components/debugger/dbgp/quantadebuggerdbgp.cpp:926
+#, fuzzy
+msgid "Unable to set value of variable."
+msgstr "设置变量值"
 
-#: treeviews/structtreetag.cpp:132
-msgid "Line %1, column %2: Closing tag for %3 is missing."
-msgstr ""
+#: components/debugger/dbgp/dbgpnetwork.cpp:74
+#, fuzzy, c-format
+msgid "Listening on port %1"
+msgstr "监听端口："
 
-#: treeviews/structtreetag.cpp:137
-msgid "Line %1, column %2: %3 is not part of %4."
+#: components/debugger/dbgp/dbgpnetwork.cpp:81
+#, c-format
+msgid "Unable to listen on port %1"
 msgstr ""
 
-#: treeviews/structtreetag.cpp:164
-msgid "Empty tag"
-msgstr "空标签"
-
-#: treeviews/structtreetag.cpp:185
-msgid "Line %1, column %2: Opening tag for %3 is missing."
+#: components/debugger/dbgp/dbgpnetwork.cpp:125
+msgid "Disconnected from remote host"
 msgstr ""
 
-#: treeviews/templatestreeview.cpp:73
-msgid "Insert as &Text"
-msgstr "作为文本插入(&T)"
-
-#: treeviews/templatestreeview.cpp:74
-msgid "Insert &Link to File"
-msgstr "插入到文件的链接(&L)"
-
-#: treeviews/templatestreeview.cpp:75
-msgid "&New Document Based on This"
-msgstr "创建基于此模板的文档(&N)"
-
-#: treeviews/templatestreeview.cpp:76
-msgid "&Extract Site Template To..."
-msgstr "将网站模板提取到(&E)..."
+#: components/debugger/debuggerbreakpointview.cpp:59
+msgid "Expression"
+msgstr "表达式"
 
-#: treeviews/templatestreeview.cpp:135 treeviews/templatestreeview.cpp:139
-msgid "Text Snippet"
-msgstr "文本片断"
+#: components/debugger/variableslistview.cpp:66
+msgid "&Set Value"
+msgstr "设置值(&S)"
 
-#: treeviews/templatestreeview.cpp:136 treeviews/templatestreeview.cpp:140
-msgid "Binary File"
-msgstr "二进制文件"
+#: components/debugger/variableslistview.cpp:68
+#, fuzzy
+msgid "&Dump in Messages Log"
+msgstr "警告消息(&W)"
 
-#: treeviews/templatestreeview.cpp:137 treeviews/templatestreeview.cpp:141
-msgid "Document Template"
-msgstr "文档模板"
+#: components/debugger/variableslistview.cpp:70
+msgid "&Copy to Clipboard"
+msgstr "复制到剪贴板(&C)"
 
-#: treeviews/templatestreeview.cpp:138 treeviews/templatestreeview.cpp:142
-msgid "Site Template"
-msgstr "网站模板"
+#: components/debugger/variableslistview.cpp:262
+msgid "Set Variable"
+msgstr "设置变量"
 
-#: treeviews/templatestreeview.cpp:148 treeviews/templatestreeview.cpp:161
-msgid "Send in E&mail..."
-msgstr "用电子邮件发送(&M)..."
+#: components/debugger/variableslistview.cpp:277
+msgid ""
+"Contents of variable %1:\n"
+">>>\n"
+msgstr ""
 
-#: treeviews/templatestreeview.cpp:149 treeviews/templatestreeview.cpp:162
-msgid "&Upload Template..."
-msgstr "上传模板(&U)..."
+#: components/cvsservice/cvsservice.cpp:50
+msgid "&Commit..."
+msgstr "提交(&C)..."
 
-#: treeviews/templatestreeview.cpp:160
-msgid "&New Folder..."
-msgstr "新建文件夹(&N)..."
+#: components/cvsservice/cvsservice.cpp:55
+msgid "Update &To"
+msgstr "更新至(&T)"
 
-#: treeviews/templatestreeview.cpp:163 treeviews/templatestreeview.cpp:174
-msgid "&Download Template..."
-msgstr "下载模板(&D)..."
+#: components/cvsservice/cvsservice.cpp:56
+msgid "&Tag/Date..."
+msgstr "标记/日期(&T)..."
 
-#: treeviews/templatestreeview.cpp:177
-msgid "Group"
-msgstr "组"
+#: components/cvsservice/cvsservice.cpp:58
+msgid "&HEAD"
+msgstr "&HEAD"
 
-#: treeviews/templatestreeview.cpp:211
-msgid "Global Templates"
-msgstr "全局模板"
+#: components/cvsservice/cvsservice.cpp:60
+msgid "Re&vert"
+msgstr "还原(&V)"
 
-#: treeviews/templatestreeview.cpp:215
-msgid "Local Templates"
-msgstr "本地模板"
+#: components/cvsservice/cvsservice.cpp:63
+msgid "&Add to Repository..."
+msgstr "添加到库中(&A)..."
 
-#: treeviews/templatestreeview.cpp:218
-msgid "Project Templates"
-msgstr "工程模板"
+#: components/cvsservice/cvsservice.cpp:65
+msgid "&Remove From Repository..."
+msgstr "从库中删除(&R)..."
 
-#: treeviews/templatestreeview.cpp:376
-msgid "Create New Template Folder"
-msgstr "创建新的模板文件夹"
+#: components/cvsservice/cvsservice.cpp:67
+msgid "&Ignore in CVS Operations"
+msgstr "在 CVS 操作中忽略(&I)"
 
-#: treeviews/templatestreeview.cpp:386 treeviews/templatestreeview.cpp:619
-msgid "&Inherit parent attribute (nothing)"
-msgstr "继承父属性(无)(&I)"
+#: components/cvsservice/cvsservice.cpp:69
+msgid "Do &Not Ignore in CVS Operations"
+msgstr "在 CVS 操作中不忽略(&N)"
 
-#: treeviews/templatestreeview.cpp:389 treeviews/templatestreeview.cpp:622
-msgid "&Inherit parent attribute (%1)"
-msgstr "继承父属性(%1)(&I)"
+#: components/cvsservice/cvsservice.cpp:73
+msgid "Show &Log Messages"
+msgstr "显示日志消息(&L)"
 
-#: treeviews/templatestreeview.cpp:406
-#, fuzzy
-msgid ""
-"Error while creating the new folder.\n"
-"                    Maybe you do not have permission to write in the %1 folder."
-msgstr ""
-"创建新目录出错。\n"
-"您可能没有写入 %1 目录的权限。"
+#: components/cvsservice/cvsservice.cpp:140
+msgid "Running CVS update..."
+msgstr "正在运行 CVS update..."
 
-#: treeviews/templatestreeview.cpp:458
-msgid "Save selection as template file:"
-msgstr "将选中内容另存为模板文件："
+#: components/cvsservice/cvsservice.cpp:179
+msgid "Updating to revision %1 ..."
+msgstr "正在更新到版本 %1..."
 
-#: treeviews/basetreeview.cpp:1041 treeviews/templatestreeview.cpp:470
-#: utility/quantacommon.cpp:710
-#, fuzzy
-msgid ""
-"<qt>The file <b>%1</b> already exists."
-"<br>Do you want to overwrite it?</qt>"
+#: components/cvsservice/cvsservice.cpp:183
+msgid "Updating to the version from %1 ..."
 msgstr ""
-"已经存在名称为“%1”的工程视图。\n"
-"您要覆盖它吗？"
 
-#: treeviews/templatestreeview.cpp:476
-#, fuzzy
-msgid ""
-"<qt>Could not write to file <b>%1</b>."
-"<br>Check if you have rights to write there or that your connection is "
-"working.</qt>"
+#: components/cvsservice/cvsservice.cpp:221
+msgid "Updating to HEAD..."
 msgstr ""
-"无法写入文件：\n"
-"%1。\n"
-"请检查您是否有写入的权限或者连接是否正常。"
 
-#: treeviews/templatestreeview.cpp:565
-msgid "Quanta Template"
-msgstr "Quanta 模板"
+#: components/cvsservice/cvsservice.cpp:256
+msgid "Current"
+msgstr "当前"
 
-#: treeviews/templatestreeview.cpp:876
-msgid ""
-"Do you really want to delete folder \n"
-"%1 ?\n"
+#: components/cvsservice/cvsservice.cpp:266
+msgid "Running CVS commit..."
 msgstr ""
-"您真的要删除文件夹\n"
-"%1 吗？\n"
 
-#: treeviews/templatestreeview.cpp:878
-#, fuzzy
-msgid ""
-"Do you really want to delete file \n"
-"%1 ?\n"
+#: components/cvsservice/cvsservice.cpp:301
+msgid "Reverting to the version from the repository..."
 msgstr ""
-"您真的要删除文件\n"
-"%1 吗？\n"
 
-#: treeviews/templatestreeview.cpp:985
-msgid "Send template in email"
-msgstr "用电子邮件发送模板"
-
-#: treeviews/templatestreeview.cpp:987
-msgid ""
-"Hi,\n"
-" This is a Quanta Plus [http://quanta.kdewebdev.org] template tarball.\n"
-"\n"
-"Have fun.\n"
+#: components/cvsservice/cvsservice.cpp:333
+msgid "Add the following files to repository?"
 msgstr ""
-"你好，\n"
-"这是一个 Quanta Plus [http://quanta.kdewebdev.org] 的模板包。\n"
-"\n"
-"祝愉快。\n"
 
-#: treeviews/templatestreeview.cpp:1000
-msgid "Quanta Plus Template"
-msgstr "Quanta Plus 模板"
+#: components/cvsservice/cvsservice.cpp:333
+msgid "CVS Add"
+msgstr "CVS 添加"
 
-#: treeviews/templatestreeview.cpp:1031
-msgid "Target folder"
-msgstr "目的文件夹"
+#: components/cvsservice/cvsservice.cpp:336
+msgid "Adding file to the repository..."
+msgstr "正在将文件添加到库中..."
 
-#: treeviews/templatestreeview.cpp:1067
+#: components/cvsservice/cvsservice.cpp:368
 msgid ""
-"You have extracted the site template to a folder which is not under your main "
-"project folder.\n"
-"Do you want to copy the folder into the main project folder?"
+"<qt>Remove the following files from the repository?"
+"<br>This will remove your <b>working copy</b> as well.</qt>"
 msgstr ""
 
-#: treeviews/templatestreeview.cpp:1067
-msgid "Copy Folder"
-msgstr "复制件夹"
+#: components/cvsservice/cvsservice.cpp:368
+msgid "CVS Remove"
+msgstr "CVS 删除"
 
-#: treeviews/templatestreeview.cpp:1067
-msgid "Do Not Copy"
-msgstr "不复制"
+#: components/cvsservice/cvsservice.cpp:371
+msgid "Removing files from the repository..."
+msgstr "正在从库中删除文件..."
 
-#: treeviews/templatestreeview.cpp:1075
-msgid ""
-"<qt>Some error happened while extracting the <i>%1</i> site template file."
-"<br>Check that you have write permission for <i>%2</i> "
-"and that there is enough free space in your temporary folder.</qt>"
+#: components/cvsservice/cvsservice.cpp:395
+msgid "Showing CVS log..."
 msgstr ""
 
-#: treeviews/basetreeview.cpp:630 treeviews/servertreeview.cpp:104
-msgid "Open &With..."
-msgstr "打开方式(&W)..."
-
-#: treeviews/servertreeview.cpp:125
-msgid "Upload Tree"
-msgstr "上传树"
-
-#: treeviews/scripttreeview.cpp:73
-msgid "Global Scripts"
-msgstr "全局脚本"
-
-#: treeviews/scripttreeview.cpp:79
-msgid "Local Scripts"
-msgstr "本地脚本"
-
-#: treeviews/scripttreeview.cpp:88
-msgid "&Description"
-msgstr "描述(&D)"
-
-#: treeviews/scripttreeview.cpp:89
-msgid "&Run Script"
-msgstr "运行脚本(&R)"
-
-#: treeviews/scripttreeview.cpp:91
-msgid "&Edit Script"
-msgstr "编辑脚本(&E)"
-
-#: treeviews/scripttreeview.cpp:92
-msgid "Edit in &Quanta"
-msgstr "在 Quanta 中编辑(&Q)"
-
-#: treeviews/scripttreeview.cpp:93
-msgid "Edi&t Description"
-msgstr "编辑描述(&T)"
-
-#: treeviews/scripttreeview.cpp:95
-msgid "&Assign Action"
-msgstr "指派动作(&A)"
-
-#: treeviews/scripttreeview.cpp:96
-msgid "&Send in Email..."
-msgstr "用电子邮件发送(&S)..."
-
-#: treeviews/scripttreeview.cpp:97
-msgid "&Upload Script..."
-msgstr "上传脚本(&U)..."
-
-#: treeviews/scripttreeview.cpp:100
-msgid "&Download Script..."
-msgstr "下载脚本(&D)..."
-
-#: treeviews/scripttreeview.cpp:273
-msgid "Send script in email"
-msgstr "用电子邮件发送脚本"
-
-#: treeviews/scripttreeview.cpp:275
-msgid ""
-"Hi,\n"
-" This is a Quanta Plus [http://quanta.kdewebdev.org] script tarball.\n"
-"\n"
-"Have fun.\n"
+#: components/cvsservice/cvsservice.cpp:433
+msgid "\"%1\" is already in the CVS ignore list."
 msgstr ""
-"你好，\n"
-"这是一个 Quanta Plus [http://quanta.kdewebdev.org] 的脚本包。\n"
-"\n"
-"祝愉快。\n"
 
-#: treeviews/scripttreeview.cpp:288
-msgid "Quanta Plus Script"
-msgstr "Quanta Plus 脚本"
-
-#: project/projectupload.cpp:762 treeviews/uploadtreeview.cpp:36
-msgid "Upload"
-msgstr "上传"
-
-#: treeviews/uploadtreeview.cpp:38
-msgid "Date"
-msgstr "日期"
-
-#: treeviews/basetreeview.cpp:438
-msgid "Quanta File Info"
-msgstr "Quanta 文件信息"
-
-#: treeviews/basetreeview.cpp:497
-#, c-format
-msgid "Number of lines: %1"
-msgstr "行数：%1"
-
-#: treeviews/basetreeview.cpp:498
-#, c-format
-msgid "Number of images included: %1"
-msgstr "所含图像数目：%1"
-
-#: treeviews/basetreeview.cpp:499
-msgid "Size of the included images: %1 bytes"
-msgstr "所含图像大小：%1 字节"
-
-#: treeviews/basetreeview.cpp:500
-msgid "Total size with images: %1 bytes"
-msgstr "带图像的总大小：%1 字节"
-
-#: treeviews/basetreeview.cpp:505
-msgid "Image size: %1 x %2"
-msgstr "图像大小：%1 x %2"
-
-#: treeviews/basetreeview.cpp:627
-msgid "&Other..."
-msgstr "其它(&O)..."
-
-#: treeviews/basetreeview.cpp:628
-msgid "Open &With"
-msgstr "打开方式(&W)"
-
-#: treeviews/basetreeview.cpp:885 treeviews/structtreeview.cpp:832
-msgid "&Move Here"
-msgstr "移动至此(&M)"
-
-#: treeviews/basetreeview.cpp:887 treeviews/structtreeview.cpp:833
-msgid "&Copy Here"
-msgstr "复制至此(&C)"
-
-#: treeviews/basetreeview.cpp:889
-msgid "&Link Here"
-msgstr "链接至此(&L)"
-
-#: treeviews/basetreeview.cpp:891 treeviews/structtreeview.cpp:835
-msgid "C&ancel"
-msgstr "取消(&A)"
-
-#: treeviews/basetreeview.cpp:1135
-msgid "Create Site Template File"
-msgstr "创建网站模板文件"
-
-#: treeviews/basetreeview.cpp:1143
-msgid "Templates should be saved to the local or project template folder."
+#: components/cvsservice/cvsservice.cpp:441
+msgid "\"%1\" added to the CVS ignore list."
 msgstr ""
 
-#: treeviews/basetreeview.cpp:1151
-msgid "Currently you can create site templates only from local folders."
+#: components/cvsservice/cvsservice.cpp:480
+msgid "\"%1\" is not in the CVS ignore list."
 msgstr ""
 
-#: treeviews/basetreeview.cpp:1151
-msgid "Unsupported Feature"
-msgstr "不支持的特性"
+#: components/cvsservice/cvsservice.cpp:489
+msgid "\"%1\" removed from the CVS ignore list."
+msgstr ""
 
-#: treeviews/basetreeview.cpp:1187
+#: components/cvsservice/cvsservice.cpp:504
 msgid ""
-"<qt>There was an error while creating the site template tarball."
-"<br>Check that you can read the files from <i>%1</i>"
-", you have write access to <i>%2</i> and that you have enough free space in "
-"your temporary folder.</qt>"
+"<qt>The CVS command <b>%1</b> has failed. The error code was <i>%2</i>.</qt>"
 msgstr ""
 
-#: treeviews/basetreeview.cpp:1194 treeviews/projecttreeview.cpp:375
-msgid "Create New Folder"
-msgstr "创建新文件夹"
-
-#: treeviews/basetreeview.cpp:1194 treeviews/projecttreeview.cpp:375
-msgid "Folder name:"
-msgstr "文件夹名称："
+#: components/cvsservice/cvsservice.cpp:504
+msgid "Command Failed"
+msgstr "命令失败"
 
-#: treeviews/basetreeview.cpp:1209 treeviews/projecttreeview.cpp:393
-msgid "Create New File"
-msgstr "创建新文件夹"
+#: components/cvsservice/cvsservice.cpp:515
+msgid "CVS command finished."
+msgstr "CVS 命令完成。"
 
-#: treeviews/basetreeview.cpp:1219 treeviews/projecttreeview.cpp:403
-#, fuzzy
+#: components/cvsservice/cvsservice.cpp:532
 msgid ""
-"<qt>Cannot create file, because a file named <b>%1</b> already exists.</qt>"
-msgstr "不能打开文件 %1 进行写入。"
-
-#: treeviews/basetreeview.cpp:1219 treeviews/projecttreeview.cpp:403
-msgid "Error Creating File"
-msgstr "创建文件错误"
-
-#: treeviews/doctreeview.cpp:54
-msgid "Project Documentation"
-msgstr "工程文档"
-
-#: treeviews/doctreeview.cpp:65
-msgid "&Download Documentation..."
-msgstr "下载文档(&D)..."
-
-#: treeviews/tagattributetree.cpp:227
-msgid "Attribute Name"
-msgstr "属性名称"
-
-#: treeviews/tagattributetree.cpp:270
-msgid "Parent tags"
-msgstr "父标签"
-
-#: treeviews/tagattributetree.cpp:289
-msgid "Namespace"
-msgstr "命名空间"
-
-#: treeviews/tagattributetree.cpp:290
-msgid "prefix"
-msgstr "前缀"
-
-#: treeviews/tagattributetree.cpp:464
-msgid "Node Name"
-msgstr "结点名称"
-
-#: treeviews/tagattributetree.cpp:468
-msgid "Delete Tag"
-msgstr "删除标签"
-
-#: treeviews/tagattributetree.cpp:472
-msgid "Delete the current tag only."
-msgstr "只删除当前标签。"
-
-#: treeviews/tagattributetree.cpp:478
-msgid "Delete the current tag and all its children."
-msgstr "删除当前标签及其子标签。"
-
-#: treeviews/tagattributetree.cpp:518
-msgid "Current tag: <b>%1</b>"
-msgstr "当前标签：<b>%1</b>"
-
-#: treeviews/tagattributetree.cpp:522
-msgid "Current tag: <b>text</b>"
-msgstr "当前标签：<b>文字</b>"
-
-#: treeviews/tagattributetree.cpp:524
-msgid "Current tag: <b>comment</b>"
-msgstr "当前标签：<b>注释</b>"
-
-#: treeviews/tagattributetree.cpp:526
-msgid "Current tag:"
-msgstr "当前标签："
-
-#: treeviews/structtreeview.cpp:90
-msgid "All Present DTEP"
+"Error: \"%1\" is not part of the\n"
+"\"%2\" repository."
 msgstr ""
 
-#: treeviews/structtreeview.cpp:104 treeviews/structtreeview.cpp:109
-#, fuzzy
-msgid "Show Groups For"
-msgstr "显示脚本树"
-
-#: treeviews/structtreeview.cpp:105 treeviews/structtreeview.cpp:122
-msgid "&Reparse"
-msgstr "重新分析(&R)"
-
-#: treeviews/structtreeview.cpp:115
-msgid "Open Subtrees"
-msgstr "打开子树"
-
-#: treeviews/structtreeview.cpp:116
-msgid "Close Subtrees"
-msgstr "关闭子树"
-
-#: treeviews/structtreeview.cpp:123
-msgid "Follow Cursor"
-msgstr "跟随光标"
-
-#: treeviews/structtreeview.cpp:487
-msgid "Find tag"
-msgstr "查找标签"
-
-#: treeviews/structtreeview.cpp:504 treeviews/structtreeview.cpp:524
-msgid "Find Tag && Open Tree"
-msgstr "查找标签并且打开树"
-
-#: treeviews/structtreeview.cpp:521 treeviews/structtreeview.cpp:549
-msgid "nothing"
-msgstr "无"
-
-#: treeviews/projecttreeview.cpp:62 treeviews/projecttreeview.cpp:65
-msgid "Document Base Folder"
-msgstr "文档基础文件夹"
-
-#: treeviews/projecttreeview.cpp:108
-msgid "Project Files"
-msgstr "工程文件"
-
-#: treeviews/projecttreeview.cpp:121
-msgid "&When Modified"
-msgstr "修改时(&W)"
-
-#: treeviews/projecttreeview.cpp:122
-msgid "&Never"
-msgstr "从不(&N)"
-
-#: treeviews/projecttreeview.cpp:123
-msgid "&Confirm"
-msgstr "确认(&C)"
-
-#: treeviews/projecttreeview.cpp:129 utility/newstuff.cpp:73
-msgid "Load Toolbar"
-msgstr "装入工具栏"
-
-#: treeviews/projecttreeview.cpp:133
-msgid "&Upload File..."
-msgstr "上传文件(&U)..."
+#: components/tableeditor/tableeditor.cpp:55
+msgid "&Edit Cell Properties"
+msgstr "编辑单元格属性(&E)"
 
-#: treeviews/projecttreeview.cpp:134
-msgid "&Quick File Upload"
-msgstr "快速文件上传(&Q)"
+#: components/tableeditor/tableeditor.cpp:56
+msgid "Edit &Row Properties"
+msgstr "编辑行属性(&R)"
 
-#: treeviews/projecttreeview.cpp:136 treeviews/projecttreeview.cpp:154
-msgid "&Remove From Project"
-msgstr "从工程中删除(&R)"
+#: components/tableeditor/tableeditor.cpp:59
+msgid "Merge Cells"
+msgstr "合并单元格"
 
-#: treeviews/projecttreeview.cpp:139 treeviews/projecttreeview.cpp:158
-#: treeviews/projecttreeview.cpp:169
-msgid "Upload &Status"
-msgstr "上传状态(&S)"
+#: components/tableeditor/tableeditor.cpp:60
+msgid "Break Merging"
+msgstr "拆分合并"
 
-#: treeviews/projecttreeview.cpp:150
-msgid "&Upload Folder..."
-msgstr "上传文件夹(&U)..."
+#: components/tableeditor/tableeditor.cpp:63
+msgid "&Insert Row"
+msgstr "插入行(&I)"
 
-#: treeviews/projecttreeview.cpp:151
-msgid "&Quick Folder Upload"
-msgstr "快速文件夹上传(&Q)"
+#: components/tableeditor/tableeditor.cpp:64
+msgid "Insert Co&lumn"
+msgstr "插入列(&L)"
 
-#: treeviews/projecttreeview.cpp:157
-msgid "Document-&Base Folder"
-msgstr "基于文档的文件夹(&B)"
+#: components/tableeditor/tableeditor.cpp:65
+msgid "Remove Row"
+msgstr "删除行"
 
-#: project/projectprivate.cpp:137 treeviews/projecttreeview.cpp:164
-msgid "&Upload Project..."
-msgstr "上传工程(&U)..."
+#: components/tableeditor/tableeditor.cpp:66
+msgid "Remove Column"
+msgstr "删除列"
 
-#: treeviews/projecttreeview.cpp:165
-msgid "Re&scan Project Folder..."
-msgstr "重新扫描工程文件夹(&S)..."
+#: components/tableeditor/tableeditor.cpp:68
+msgid "Edit &Table Properties"
+msgstr "编辑表格属性(&T)"
 
-#: treeviews/projecttreeview.cpp:166
-msgid "Project &Properties"
-msgstr "工程属性(&P)"
+#: components/tableeditor/tableeditor.cpp:69
+msgid "Edit Child Table"
+msgstr "编辑子表格"
 
-#: treeviews/projecttreeview.cpp:195 treeviews/projecttreeview.cpp:289
-msgid "[local disk]"
-msgstr "[本地磁盘]"
+#: components/tableeditor/tableeditor.cpp:207
+#, c-format
+msgid "Edit col: %1"
+msgstr "编辑列：%1"
 
-#: treeviews/projecttreeview.cpp:205 treeviews/projecttreeview.cpp:300
-msgid "No Project"
-msgstr "没有工程"
+#: components/tableeditor/tableeditor.cpp:414
+#: components/tableeditor/tableeditor.cpp:454
+#: components/tableeditor/tableeditor.cpp:499
+#: components/tableeditor/tableeditor.cpp:1063
+msgid "Merged with (%1, %2)."
+msgstr "已与(%1，%2)合并。"
 
-#: treeviews/projecttreeview.cpp:428 utility/quantanetaccess.cpp:210
-#, fuzzy
+#: components/tableeditor/tableeditor.cpp:1168
+#: components/tableeditor/tableeditor.cpp:1189
 msgid ""
-"<qt>Do you really want to remove "
-"<br><b>%1</b>"
-"<br> from the project?</qt>"
-msgstr ""
-"您真的要从工程中删除\n"
-"%1\n"
-"吗？"
-
-#: treeviews/projecttreeview.cpp:428 utility/quantanetaccess.cpp:210
-msgid "Remove From Project"
-msgstr "从工程中删除"
-
-#: utility/tagactionset.cpp:104
-msgid "Apply Source Indentation"
+"Cannot edit the child table; you probably modified the cell containing the "
+"table manually."
 msgstr ""
 
-#: utility/tagactionset.cpp:109
-#, fuzzy
-msgid "Copy DIV Area"
-msgstr "Body 区域"
-
-#: utility/tagactionset.cpp:114
-msgid "Cut DIV Area"
+#: components/tableeditor/tableeditor.cpp:1204
+msgid ""
+"Cannot find the closing tag of the child table; you have probably introduced "
+"unclosed tags in the table and have broken its consistency."
 msgstr ""
 
-#: utility/tagactionset.cpp:284 utility/tagactionset.cpp:301
-msgid "Table..."
-msgstr "表..."
-
-#: utility/tagactionset.cpp:285
-msgid "Insert..."
-msgstr "插入..."
-
-#: utility/tagactionset.cpp:286
-msgid "Remove..."
-msgstr "删除..."
-
-#: utility/tagactionset.cpp:307
-msgid "Row Above"
-msgstr "行上方"
-
-#: utility/tagactionset.cpp:313
-msgid "Row Below"
-msgstr "行下方"
-
-#: utility/tagactionset.cpp:319
-msgid "Column Left"
-msgstr "列左侧"
-
-#: utility/tagactionset.cpp:325
-msgid "Column Right"
-msgstr "列右侧"
+#: components/csseditor/styleeditor.cpp:44
+msgid "Open css dialog"
+msgstr "打开 css 对话框"
 
-#: utility/tagactionset.cpp:339
-msgid "Row(s)"
-msgstr "行数"
+#: components/csseditor/cssselector.cpp:49
+msgid "HTML Files"
+msgstr "HTML 文件"
 
-#: utility/tagactionset.cpp:345
-msgid "Column(s)"
-msgstr "列数"
+#: components/csseditor/cssselector.cpp:49
+msgid "XHTML Files"
+msgstr "XHTML 文件"
 
-#: utility/tagactionset.cpp:351
-msgid "Cell(s)"
-msgstr "单元格"
+#: components/csseditor/cssselector.cpp:49
+msgid "XML Files"
+msgstr "XML 文件"
 
-#: utility/tagactionset.cpp:357
-msgid "Cell(s) Content"
-msgstr "单元格内容"
+#: components/csseditor/propertysetter.cpp:115
+msgid "More..."
+msgstr "更多..."
 
-#: utility/tagactionset.cpp:365
-msgid "Merge Selected Cells"
-msgstr "合并选中单元格"
+#: components/csseditor/colorrequester.cpp:63
+msgid "Open color dialog"
+msgstr "打开颜色对话框"
 
-#: utility/tagaction.cpp:464 utility/tagaction.cpp:718
-msgid ""
-"The \"%1\" script started.\n"
+#: components/csseditor/stylesheetparser.cpp:22
+msgid "has not been closed"
 msgstr ""
-"“%1”脚本已启动。\n"
 
-#: utility/tagaction.cpp:475 utility/tagaction.cpp:729
-msgid ""
-"<qt>There was an error running <b>%1</b>."
-"<br>Check that you have the <i>%2</i> executable installed and it is "
-"accessible.</qt>"
+#: components/csseditor/stylesheetparser.cpp:23
+msgid "needs an opening parenthesis "
 msgstr ""
 
-#: utility/tagaction.cpp:475 utility/tagaction.cpp:729
-msgid "Script Not Found"
-msgstr "脚本未找到"
-
-#: utility/tagaction.cpp:790 utility/tagaction.cpp:850
-msgid ""
-"The \"%1\" script output:\n"
-msgstr ""
-"“%1”脚本输出：\n"
+#: components/csseditor/stylesheetparser.cpp:85
+msgid "The comment"
+msgstr "注释"
 
-#: utility/tagaction.cpp:973
-msgid "The \"%1\" script has exited."
-msgstr "“%1”已退出。"
+#: components/csseditor/stylesheetparser.cpp:133
+#: components/csseditor/stylesheetparser.cpp:141
+#: components/csseditor/stylesheetparser.cpp:147
+msgid "The selector"
+msgstr "选择器"
 
-#: utility/tagaction.cpp:1011
-#, fuzzy
+#: components/csseditor/tlpeditors.cpp:70
 msgid ""
-"<qt>The filtering action <b>%1</b> seems to be locked."
-"<br>Do you want to terminate it?</qt>"
+"With this line edit you can insert the URI of the resource you want to reach"
 msgstr ""
-"已经存在名称为“%1”的工程视图。\n"
-"您要覆盖它吗？"
 
-#: utility/tagaction.cpp:1011
-msgid "Action Not Responding"
-msgstr "动作未响应"
-
-#: utility/tagaction.cpp:1011
-msgid "Terminate"
-msgstr "终止"
+#: components/csseditor/tlpeditors.cpp:74
+msgid "Open the URI selector"
+msgstr "打开 URI 选择器"
 
-#: utility/tagaction.cpp:1011
-msgid "Keep Running"
-msgstr "保持运行"
+#: components/csseditor/tlpeditors.cpp:114
+msgid "Image Files"
+msgstr "图像文件"
 
-#: utility/quantacommon.cpp:384
-#, fuzzy
-msgid ""
-"<qt>Cannot create folder"
-"<br><b>%1</b>."
-"<br>Check that you have write permission in the parent folder or that the "
-"connection to"
-"<br><b>%2</b>"
-"<br> is valid.</qt>"
-msgstr ""
-"无法创建目录\n"
-"“%1”。\n"
-"请检查您是否有父目录的写权限，或者到\n"
-"“%2”\n"
-"的连接是否有效！"
+#: components/csseditor/tlpeditors.cpp:120
+msgid "Audio Files"
+msgstr "音频文件"
 
-#: utility/quantacommon.cpp:697
-msgid ""
-"The file type is not recognized.   Opening binary files may confuse Quanta.\n"
-" Are you sure you want to open this file?"
+#: components/csseditor/tlpeditors.cpp:154
+msgid "With this line edit you can insert the name of the font you want to use"
 msgstr ""
 
-#: utility/quantacommon.cpp:699
-msgid "Unknown Type"
-msgstr "未知类型"
-
-#: project/project.cpp:216 utility/quantacommon.cpp:699
-msgid "Do Not Open"
-msgstr "不打开"
-
-#: utility/quantabookmarks.cpp:88
-msgid "Set &Bookmark"
-msgstr "设置书签(&B)"
+#: components/csseditor/tlpeditors.cpp:156
+msgid "Font family:"
+msgstr "字体族："
 
-#: utility/quantabookmarks.cpp:91
-msgid "If a line has no bookmark then add one, otherwise remove it."
+#: components/csseditor/tlpeditors.cpp:158
+msgid "Open font family chooser"
 msgstr ""
 
-#: utility/quantabookmarks.cpp:92
-msgid "Clear &Bookmark"
-msgstr "清除书签(&B)"
-
-#: utility/quantabookmarks.cpp:95
-msgid "Clear &All Bookmarks"
-msgstr "清除全部书签(&A)"
-
-#: utility/quantabookmarks.cpp:98
-msgid "Remove all bookmarks of the current document."
-msgstr "删除当前文档中的全部书签。"
-
-#: utility/quantabookmarks.cpp:101 utility/quantabookmarks.cpp:307
-msgid "Next Bookmark"
-msgstr "下一个书签"
-
-#: utility/quantabookmarks.cpp:104
-msgid "Go to the next bookmark."
-msgstr "转到下一个书签。"
-
-#: utility/quantabookmarks.cpp:107 utility/quantabookmarks.cpp:309
-msgid "Previous Bookmark"
-msgstr "上一个书签"
-
-#: utility/quantabookmarks.cpp:110
-msgid "Go to the previous bookmark."
-msgstr "转到上一个书签。"
-
-#: utility/quantabookmarks.cpp:222
-msgid "&Next: %1 - \"%2\""
-msgstr "下一个(&N)：%1 - “%2”"
-
-#: utility/quantabookmarks.cpp:229
-msgid "&Previous: %1 - \"%2\""
-msgstr "上一个(&P)：%1 - “%2”"
-
-#: utility/toolbartabwidget.cpp:45 utility/toolbartabwidget.cpp:188
-#: utility/toolbartabwidget.cpp:307
-msgid "Toolbar Menu"
-msgstr "工具栏菜单"
-
-#: utility/toolbartabwidget.cpp:46 utility/toolbartabwidget.cpp:309
-msgid "New Action..."
-msgstr "新建动作..."
-
-#: utility/toolbartabwidget.cpp:48 utility/toolbartabwidget.cpp:326
-msgid "New Toolbar..."
-msgstr "新建工具栏..."
-
-#: utility/toolbartabwidget.cpp:50 utility/toolbartabwidget.cpp:328
-msgid "Rename Toolbar..."
-msgstr "重命名工具栏..."
-
-#: utility/toolbartabwidget.cpp:51 utility/toolbartabwidget.cpp:331
-msgid "Configure Toolbars..."
-msgstr "配置工具栏..."
-
-#: utility/toolbartabwidget.cpp:234
-msgid "Icons Only"
-msgstr "只有图标"
-
-#: utility/toolbartabwidget.cpp:235
-msgid "Text Only"
-msgstr "只有文字"
-
-#: utility/toolbartabwidget.cpp:236
-msgid "Text Alongside Icons"
-msgstr "文本在图标旁"
-
-#: utility/toolbartabwidget.cpp:237
-msgid "Text Under Icons"
-msgstr "文本在图标下"
-
-#: utility/toolbartabwidget.cpp:320
-#, c-format
-msgid "Remove Action - %1"
-msgstr "删除动作 - %1"
-
-#: utility/toolbartabwidget.cpp:321
-#, c-format
-msgid "Edit Action - %1"
-msgstr "编辑动作 - %1"
-
-#: utility/toolbartabwidget.cpp:330
-msgid "Text Position"
-msgstr "文本位置"
-
-#: utility/toolbartabwidget.cpp:344
-#, fuzzy
-msgid "<qt>Are you sure you want to remove the <b>%1</b> action?</qt>"
-msgstr ""
-"您真的要从工程中删除\n"
-"%1\n"
-"吗？"
+#: components/csseditor/fontfamilychooser.cpp:43
+msgid "The Quick Brown Fox Jumps Over The Lazy Dog"
+msgstr "明日复明日·万事成蹉跎"
 
-#: utility/newstuff.cpp:53
-msgid ""
-"There was an error with the downloaded DTEP tarball file. Possible causes are "
-"damaged archive or invalid directory structure in the archive."
+#: components/csseditor/fontfamilychooser.cpp:84
+msgid "These are the names of the available fonts on your system"
 msgstr ""
 
-#: utility/newstuff.cpp:53
-msgid "DTEP Installation Error"
+#: components/csseditor/fontfamilychooser.cpp:85
+msgid "These are the names of the generic fonts "
 msgstr ""
 
-#: utility/newstuff.cpp:73
-#, fuzzy
-msgid "Do you want to load the newly downloaded toolbar?"
+#: components/csseditor/fontfamilychooser.cpp:86
+msgid "These are the names of the generic fonts you have selected  "
 msgstr ""
-"您真的要从磁盘中删除\n"
-"%1\n"
-"吗？"
 
-#: utility/newstuff.cpp:79
-msgid ""
-"There was an error with the downloaded toolbar tarball file. Possible causes "
-"are damaged archive or invalid directory structure in the archive."
+#: components/csseditor/fontfamilychooser.cpp:87
+msgid "Click this to add a font to your style sheet"
 msgstr ""
 
-#: utility/newstuff.cpp:79
-msgid "Toolbar Installation Error"
-msgstr "工具栏安装错误"
-
-#: utility/newstuff.cpp:100
-#, fuzzy
-msgid "Do you want to open the newly downloaded template?"
+#: components/csseditor/fontfamilychooser.cpp:88
+msgid "Click this to remove a font from your style sheet"
 msgstr ""
-"您真的要从磁盘中删除\n"
-"%1\n"
-"吗？"
 
-#: utility/newstuff.cpp:100
-msgid "Open Template"
-msgstr "打开模板"
-
-#: utility/newstuff.cpp:106
-msgid "There was an error with the downloaded template file."
+#: components/csseditor/fontfamilychooser.cpp:89
+msgid "Click this to make the font more preferable than the preceeding one"
 msgstr ""
 
-#: utility/newstuff.cpp:106
-msgid "Template Installation Error"
-msgstr "模板安装错误"
-
-#: utility/newstuff.cpp:124 utility/newstuff.cpp:141
-msgid ""
-"There was an error with the downloaded script tarball file. Possible causes are "
-"damaged archive or invalid directory structure in the archive."
+#: components/csseditor/fontfamilychooser.cpp:90
+msgid "Click this to make the font less preferable than the following one"
 msgstr ""
 
-#: utility/newstuff.cpp:124
-msgid "Script Installation Error"
-msgstr "脚本安装错误"
-
-#: utility/newstuff.cpp:141
-msgid "Documentation Installation Error"
-msgstr "文档安装错误"
-
-#: utility/qpevents.cpp:42
-msgid "Before Document Save"
-msgstr "文档保存前"
-
-#: utility/qpevents.cpp:43
-msgid "After Document Save"
-msgstr "文档保存后"
-
-#: utility/qpevents.cpp:44
-msgid "After Document Open"
-msgstr "文档打开后"
-
-#: utility/qpevents.cpp:45
-msgid "Before Document Close"
-msgstr "文档关闭前"
-
-#: utility/qpevents.cpp:46
-msgid "After Document Close"
-msgstr "文档关闭后"
+#: components/csseditor/colorslider.cpp:77
+msgid "Red"
+msgstr "红"
 
-#: utility/qpevents.cpp:47
-msgid "After Project Open"
-msgstr "工程打开后"
+#: components/csseditor/colorslider.cpp:77
+msgid "Green"
+msgstr "绿"
 
-#: utility/qpevents.cpp:48
-msgid "Before Project Close"
-msgstr "工程关闭前"
+#: components/csseditor/colorslider.cpp:77
+msgid "Blue"
+msgstr "蓝"
 
-#: utility/qpevents.cpp:49
-msgid "After Project Close"
-msgstr "工程关闭后"
+#: project/membereditdlg.cpp:35 project/project.cpp:601
+msgid "Simple Member"
+msgstr "简单成员"
 
-#: utility/qpevents.cpp:50
-msgid "Upload Requested"
-msgstr "请求上传"
+#: project/membereditdlg.cpp:36 project/project.cpp:596
+msgid "Task Leader"
+msgstr "任务领导"
 
-#: utility/qpevents.cpp:51
-msgid "Before Document Upload"
-msgstr "文档上传前"
+#: project/membereditdlg.cpp:37 project/project.cpp:585
+msgid "Team Leader"
+msgstr "团队领导"
 
-#: utility/qpevents.cpp:52
-msgid "After Document Upload"
-msgstr "文档上传后"
+#: project/membereditdlg.cpp:38 project/project.cpp:591
+msgid "Subproject Leader"
+msgstr "子工程领导"
 
-#: utility/qpevents.cpp:53
-msgid "After Addition to Project"
-msgstr "添加到工程后"
+#: project/membereditdlg.cpp:85
+msgid "Edit Subprojects"
+msgstr "编辑子工程"
 
-#: utility/qpevents.cpp:54
-msgid "After Removal From Project"
-msgstr "从工程中删除后"
+#: project/membereditdlg.cpp:169
+msgid "Select Member"
+msgstr "选择成员"
 
-#: utility/qpevents.cpp:55
-msgid "After Commit to CVS"
+#: project/membereditdlg.cpp:179
+msgid "No entries found in the addressbook."
 msgstr ""
 
-#: utility/qpevents.cpp:56
-msgid "After Update From CVS"
-msgstr ""
+#: project/projectnewgeneral.cpp:97
+msgid "Select Project Folder"
+msgstr "选择工程文件夹"
 
-#: utility/qpevents.cpp:57
+#: project/projectnewgeneral.cpp:174 project/projectoptions.ui.h:28
+msgid "Select Project Template Folder"
+msgstr "选择工程模板文件夹"
+
+#: project/projectnewgeneral.cpp:180 project/projectnewgeneral.cpp:228
 #, fuzzy
-msgid "After Moving File Inside Project"
-msgstr "正在将文件添加工程中..."
+msgid ""
+"<qt>The project templates must be stored under the main project folder: "
+"<br>"
+"<br><b>%1</b></qt>"
+msgstr "<qt>您必须将工具栏保存到如下文件夹中：<br><br><b>%1</b></qt>"
 
-#: utility/qpevents.cpp:58
-msgid "Quanta Start"
-msgstr "Quanta 启动"
+#: project/projectnewgeneral.cpp:188 project/projectoptions.ui.h:40
+msgid "Select Project Toolbar & Actions Folder"
+msgstr "选择工程工具栏和动作文件夹"
 
-#: utility/qpevents.cpp:59
-msgid "Quanta Exit"
-msgstr "Quanta 退出"
+#: project/projectnewgeneral.cpp:194 project/projectnewgeneral.cpp:241
+#, fuzzy
+msgid ""
+"<qt>The project toolbars must be stored under the main project folder: "
+"<br>"
+"<br><b>%1</b></qt>"
+msgstr "<qt>您必须将工具栏保存到如下文件夹中：<br><br><b>%1</b></qt>"
 
-#: utility/qpevents.cpp:62
-msgid "Send Email"
-msgstr "发送电子邮件"
+#: project/eventconfigurationdlg.cpp:102
+msgid "New Event"
+msgstr "新事件"
 
-#: utility/qpevents.cpp:63
-msgid "Log Event"
-msgstr "日志事件"
+#: project/eventconfigurationdlg.cpp:121
+msgid "Edit Event"
+msgstr "编辑事件"
 
-#: utility/qpevents.cpp:64
-msgid "Script Action"
-msgstr "脚本动作"
+#: project/eventconfigurationdlg.cpp:144
+msgid ""
+"<qt>Are you sure that you want to remove the configuration of the <b>%1</b> "
+"event?</qt>"
+msgstr "<qt>您真的要删除 <b>%1</b> 事件的配置吗？</qt>"
 
-#: utility/qpevents.cpp:65
-msgid "Non-Script Action"
-msgstr "非脚本动作"
+#: project/eventconfigurationdlg.cpp:144
+msgid "Delete Event Configuration"
+msgstr "删除事件配置"
 
-#: utility/qpevents.cpp:88
-msgid ""
-"<qt>An internal action (<i>%1</i>) associated with an event (<i>%2</i>"
-") will be executed.  Do you want to allow the execution of this action?</qt>"
-msgstr ""
+#: project/projectprivate.cpp:74
+msgid "<b>Insert Files in Project</b>"
+msgstr "<b>插入文件到工程中</b>"
 
-#: utility/qpevents.cpp:88 utility/qpevents.cpp:92
-msgid "Event Triggered"
-msgstr ""
+#: project/projectprivate.cpp:85
+msgid "&New Project..."
+msgstr "新建工程(&N)..."
 
-#: utility/qpevents.cpp:88 utility/qpevents.cpp:92
-msgid "Execute"
-msgstr "执行"
+#: project/projectprivate.cpp:89
+msgid "&Open Project..."
+msgstr "打开工程(&O)..."
 
-#: utility/qpevents.cpp:92
-msgid ""
-"<qt>An external action (<i>%1</i>) associated with an event (<i>%2</i>"
-") will be executed.  Do you want to allow the execution of this action?</qt>"
-msgstr ""
+#: project/projectprivate.cpp:95
+msgid "Open Recent Project"
+msgstr "打开最近的工程"
 
-#: utility/qpevents.cpp:104
-msgid "An upload was initiated"
-msgstr ""
+#: project/projectprivate.cpp:97
+msgid "Open/Open recent project"
+msgstr "打开/打开最近的工程"
 
-#: utility/qpevents.cpp:113
-msgid "About to upload a document"
-msgstr "即将上传文档"
+#: project/projectprivate.cpp:100
+msgid "&Close Project"
+msgstr "关闭工程(&C)"
 
-#: utility/qpevents.cpp:120
-msgid "Document uploaded"
-msgstr "文档已上传"
+#: project/projectprivate.cpp:105
+msgid "Open Project &View..."
+msgstr "打开工程视图(&V)..."
 
-#: utility/qpevents.cpp:127
-msgid "Document moved"
-msgstr "文档已移动"
+#: project/projectprivate.cpp:109
+msgid "Open project view"
+msgstr "打开工程视图"
 
-#: utility/qpevents.cpp:137
-msgid "Document saved"
-msgstr "文档已保存"
+#: project/projectprivate.cpp:111
+msgid "&Save Project View"
+msgstr "保存工程视图(&S)"
 
-#: utility/qpevents.cpp:143
-msgid "About to save a document"
-msgstr "即将保存文档"
+#: project/projectprivate.cpp:114
+msgid "Save Project View &As..."
+msgstr "工程视图另存为(&A)..."
 
-#: utility/qpevents.cpp:149
-msgid "Document opened"
-msgstr "文档已打开"
+#: project/projectprivate.cpp:117
+msgid "&Delete Project View"
+msgstr "删除工程视图(&D)"
 
-#: utility/qpevents.cpp:155
-msgid "Document closed"
-msgstr "文档已关闭"
+#: project/projectprivate.cpp:121
+msgid "Close project view"
+msgstr "关闭工程视图"
 
-#: utility/qpevents.cpp:161
-msgid "About to close a document"
-msgstr "即将关闭文档"
+#: project/projectprivate.cpp:125
+msgid "&Insert Files..."
+msgstr "插入文件(&I)..."
 
-#: utility/qpevents.cpp:167
-msgid "Project opened"
-msgstr "工程已打开"
+#: project/projectprivate.cpp:129
+msgid "Inser&t Folder..."
+msgstr "插入文件夹(&T)..."
 
-#: utility/qpevents.cpp:173
-msgid "Project closed"
-msgstr "工程已关闭"
+#: project/projectprivate.cpp:133
+msgid "&Rescan Project Folder..."
+msgstr "重新扫描工程文件夹(&R)..."
 
-#: utility/qpevents.cpp:179
-msgid "About to close the project"
-msgstr "即将关闭工程"
+#: project/projectprivate.cpp:141
+msgid "&Project Properties"
+msgstr "工程属性(&P)"
 
-#: utility/qpevents.cpp:185
-msgid "Document added to project"
-msgstr "文档已添加到工程"
+#: project/projectprivate.cpp:146
+msgid "Save as Project Template..."
+msgstr "另存为工程模板..."
 
-#: utility/qpevents.cpp:191
-msgid "Document removed from project"
-msgstr "文档已从工程中删除"
+#: project/projectprivate.cpp:151
+msgid "Save Selection to Project Template File..."
+msgstr "将选中内容保存到工程模板文件..."
 
-#: utility/qpevents.cpp:199
-msgid "Document committed"
-msgstr "文档已提交"
+#: project/projectprivate.cpp:302
+msgid "Adding files to the project..."
+msgstr "正在将文件添加工程中..."
 
-#: utility/qpevents.cpp:205
-msgid "Document updated"
-msgstr "文档已更新"
+#: project/projectprivate.cpp:374
+msgid "Reading the project file..."
+msgstr "正在读取工程文件..."
 
-#: utility/qpevents.cpp:211
-msgid "Quanta has been started"
-msgstr "Quanta 已经启动"
+#: project/projectprivate.cpp:384
+msgid "Invalid project file."
+msgstr "无效的工程文件。"
 
-#: utility/qpevents.cpp:217
-msgid "Quanta is shutting down"
-msgstr "Quanta 已经关闭"
+#: project/projectprivate.cpp:906
+msgid "Save Project View As"
+msgstr "工程视图另存为"
 
-#: utility/qpevents.cpp:224
-msgid "<qt>Unsupported event <b>%1</b>.</qt>"
-msgstr "<qt>不支持的事件 <b>%1</b>。</qt>"
+#: project/projectprivate.cpp:907
+msgid "Enter the name of the view:"
+msgstr "输入视图的名称："
 
-#: utility/qpevents.cpp:224
+#: project/projectprivate.cpp:919
 #, fuzzy
-msgid "Event Handling Error"
-msgstr "工具栏目录："
-
-#: utility/qpevents.cpp:273
-msgid "Logging to remote files is not supported."
+msgid ""
+"<qt>A project view named <b>%1</b> already exists."
+"<br>Do you want to overwrite it?</qt>"
 msgstr ""
+"已经存在名称为“%1”的工程视图。\n"
+"您要覆盖它吗？"
 
-#: utility/qpevents.cpp:282
-msgid "Logging to files inside a remote project is not supported."
-msgstr ""
+#: project/projectprivate.cpp:1059
+msgid "<qt>Cannot open file <b>%1</b> for writing.</qt>"
+msgstr "<qt>不能打开文件 <b>%1</b> 进行写入。</qt>"
 
-#: utility/qpevents.cpp:312
-msgid "<qt>Logging failed. Check that you have write access to <i>%1</i>."
-msgstr ""
+#: project/projectprivate.cpp:1124
+msgid "New Project Wizard"
+msgstr "新建工程向导"
 
-#: utility/qpevents.cpp:316
-#, fuzzy
-msgid "<qt>Unsupported internal event action : <b>%1</b>.</qt>"
-msgstr "不支持的插件类型"
+#: project/projectprivate.cpp:1138
+msgid "<b>General Project Settings</b>"
+msgstr "<b>常规工程设置</b>"
 
-#: utility/qpevents.cpp:339
-msgid "<qt>The <b>%1</b> script action was not found on your system.</qt>"
-msgstr ""
+#: project/projectprivate.cpp:1140
+msgid "<b>More Project Settings</b>"
+msgstr "<b>更多工程设置</b>"
 
-#: utility/qpevents.cpp:339
-msgid "Action Execution Error"
+#: project/projectprivate.cpp:1218
+msgid ""
+"Saving of project failed. Do you want to continue with closing (might cause "
+"data loss)?"
 msgstr ""
 
-#: utility/qpevents.cpp:341
-msgid "Unsupported external event action."
-msgstr "不支持的外部事件动作。"
-
-#: utility/qpevents.cpp:343
-msgid "Unknown event type."
-msgstr "未知的事件类型。"
-
-#: utility/quantanetaccess.cpp:185
-#, fuzzy
-msgid "<qt>Do you want to add <br><b>%1</b><br> to the project?</qt>"
-msgstr "<qt>您真的要将文件<br><b>%1</b><br>添加到工程中吗？</qt>"
-
-#: utility/quantanetaccess.cpp:185
-msgid "Add to Project"
-msgstr "添加到工程"
+#: project/project.cpp:1268 project/projectprivate.cpp:1218
+msgid "Project Saving Error"
+msgstr "工程保存错误"
 
-#: utility/quantanetaccess.cpp:233
-#, fuzzy
+#: project/projectprivate.cpp:1242
 msgid ""
-"<qt>Do you really want to delete "
-"<br><b>%1</b>"
-"<br> and remove it from the project?</qt>"
+"|Project Files\n"
+"*|All Files"
 msgstr ""
-"您真的要从工程中删除\n"
-"%1\n"
-"吗？"
+"|工程文件\n"
+"*|全部文件"
 
-#: utility/quantanetaccess.cpp:233
-msgid "Delete & Remove From Project"
-msgstr "删除并从工程中删除"
+#: project/projectprivate.cpp:1243
+msgid "Open Project"
+msgstr "打开工程"
 
-#: utility/quantanetaccess.cpp:246
-msgid "<qt>Do you really want to delete <br><b>%1</b>?</qt>"
-msgstr "<qt>您真的要删除文件<br><b>%1</b> 吗？</qt>"
+#: project/projectprivate.cpp:1287
+#, c-format
+msgid "Wrote project file %1"
+msgstr "已写入工程文件 %1"
 
-#: utility/quantanetaccess.cpp:246
-msgid "Delete File or Folder"
-msgstr "删除文件或文件夹"
+#: project/projectprivate.cpp:1291
+msgid "<qt>Cannot open the file <b>%1</b> for writing.</qt>"
+msgstr "<qt>不能打开文件 <b>%1</b> 进行写入。</qt>"
 
-#: parsers/dtd/dtd.cpp:127 parsers/dtd/dtdparser.cpp:78
-#, fuzzy
-msgid "<qt>Cannot download the DTD from <b>%1</b>.</qt>"
-msgstr "不能打开文件 %1 进行写入。"
+#: project/projectprivate.cpp:1342
+msgid "<qt>Cannot open the file <b>%1</b> for reading.</qt>"
+msgstr "<qt>不能打开文件 <b>%1</b> 进行读取。</qt>"
 
-#: parsers/dtd/dtdparser.cpp:105
-#, fuzzy
-msgid ""
-"<qt>Error while parsing the DTD."
-"<br>The error message is:"
-"<br><i>%1</i></qt>"
-msgstr ""
-"重命名“%1”时发生错误。\n"
-"错误消息为：\n"
-"\n"
-"%2"
+#: project/projectprivate.cpp:1354
+msgid "<qt>Malformed URL: <b>%1</b></qt>"
+msgstr "<qt>格式不正确的 URL：<b>%1</b></qt>"
 
-#: parsers/dtd/dtdparser.cpp:157
-#, fuzzy
+#: project/projectprivate.cpp:1360
 msgid ""
-"<qt>Cannot create the "
-"<br><b>%1</b> file."
-"<br>Check that you have write permission in the parent folder.</qt>"
-msgstr ""
-"无法创建目录\n"
-"“%1”。\n"
-"请检查您是否有父目录的写权限，或者到\n"
-"“%2”\n"
-"的连接是否有效！"
-
-#: parsers/dtd/dtdparser.cpp:169
-msgid "No elements were found in the DTD."
+"<qt>The project"
+"<br><b>%1</b>"
+"<br> seems to be used by another Quanta instance."
+"<br>You may end up with data loss if you open the same project in two "
+"instances, modify and save them in both."
+"<br>"
+"<br>Do you want to proceed with open?</qt>"
 msgstr ""
 
-#: parsers/parsercommon.cpp:177
-msgid "%1 block"
-msgstr "%1 块"
+#: project/projectprivate.cpp:1419
+msgid "<qt>Cannot access the project file <b>%1</b>.</qt>"
+msgstr "<qt>无法访问工程文件 <b>%1</b>。</qt>"
 
-#: plugins/quantapluginconfig.cpp:45
-msgid "Message Area Tab"
-msgstr "消息区域标签"
+#: project/projectnewlocal.cpp:185 project/projectprivate.cpp:1430
+msgid "*"
+msgstr "*"
 
-#: plugins/quantapluginconfig.cpp:46 plugins/quantaplugininterface.cpp:108
-#: plugins/quantaplugininterface.cpp:156
-msgid "Editor Tab"
-msgstr "编辑器标签"
+#: project/projectnewlocal.cpp:185 project/projectprivate.cpp:1430
+msgid "Insert Files in Project"
+msgstr "插入文件到工程中"
 
-#: plugins/quantaplugin.cpp:354 plugins/quantaplugin.cpp:370
-#: plugins/quantapluginconfig.cpp:46 plugins/quantaplugininterface.cpp:106
-#: plugins/quantaplugininterface.cpp:157
-msgid "Separate Toolview"
-msgstr "分离工具视图"
+#: project/projectnewlocal.cpp:196 project/projectprivate.cpp:1440
+msgid "Files: Copy to Project"
+msgstr "文件：复制到工程中"
 
-#: plugins/quantapluginconfig.cpp:68
-msgid ""
-"The plugin information you entered appears to be invalid. Are you sure you want "
-"to apply these settings?"
-msgstr "您输入的插件信息似乎无效。您确定要应用这些设置吗？"
+#: project/projectnewlocal.cpp:244 project/projectprivate.cpp:1489
+msgid "Insert Folder in Project"
+msgstr "插入文件夹到工程中"
 
-#: plugins/quantapluginconfig.cpp:68
-msgid "Invalid Plugin"
-msgstr "无效插件"
+#: project/projectprivate.cpp:1642
+#, c-format
+msgid "Uploaded project file %1"
+msgstr "已上传工程文件 %1"
 
-#: plugins/quantapluginconfig.cpp:68
-msgid "Do Not Apply"
-msgstr "不应用"
+#: project/eventeditordlg.cpp:301
+msgid "Argument:"
+msgstr "参数："
 
-#: plugins/quantapluginconfig.cpp:80
-msgid "Select Plugin Folder"
-msgstr "选择插件文件夹"
+#: project/eventeditordlg.cpp:318
+msgid "Receiver:"
+msgstr "接收者："
 
-#: plugins/quantaplugininterface.cpp:44
-msgid "Configure &Plugins..."
-msgstr "配置插件(&P)..."
+#: project/eventeditordlg.cpp:337
+msgid "Log file:"
+msgstr "日志文件："
 
-#: plugins/quantaplugininterface.cpp:93
+#: project/eventeditordlg.cpp:339
 msgid ""
-"<qt><b>%1</b> is a command line plugin. We have removed support for "
-"command-line plugins. However, the functionality has not been lost as script "
-"actions can still be used to run command-line tools. </qt>"
+"A relative file to the project folder or a file outside of the project folder "
+"in which case the full path must be specified."
 msgstr ""
 
-#: plugins/quantaplugininterface.cpp:93
-msgid "Unsupported Plugin Type"
-msgstr "不支持的插件类型"
+#: project/eventeditordlg.cpp:341
+msgid "Detail:"
+msgstr "细节："
 
-#: plugins/quantaplugininterface.cpp:260
-#, fuzzy
-msgid ""
-"<qt>The following plugins seems to be invalid:<b>%1</b>."
-"<br>"
-"<br>Do you want to edit the plugins?</qt>"
-msgstr ""
-"文件 %1 不存在。\n"
-"您是否要将其从列表中删除？"
+#: project/eventeditordlg.cpp:344
+msgid "Full"
+msgstr "完整"
 
-#: plugins/quantaplugininterface.cpp:260
-msgid "Invalid Plugins"
-msgstr "无效的插件"
+#: project/eventeditordlg.cpp:345
+msgid "Minimal"
+msgstr "最小"
 
-#: plugins/quantaplugininterface.cpp:260
-msgid "Do Not Edit"
-msgstr "不编辑"
+#: project/eventeditordlg.cpp:347
+msgid "Behavior:"
+msgstr "行为："
 
-#: plugins/quantaplugininterface.cpp:267
-msgid "All plugins validated successfully."
-msgstr "所有插件都成功校验。"
+#: project/eventeditordlg.cpp:350
+msgid "Create New Log"
+msgstr "创建新日志"
 
-#: plugins/quantaplugineditor.cpp:103
-msgid "Select Folder"
-msgstr "选择文件夹"
+#: project/eventeditordlg.cpp:351
+msgid "Append to Existing Log"
+msgstr "追加到已有日志"
 
-#: plugins/quantaplugin.cpp:122
-msgid ""
-"<qt>The <b>%1</b> plugin could not be loaded."
-"<br>Possible reasons are:"
-"<br>    - <b>%2</b> is not installed;"
-"<br>    - the file <i>%3</i> is not installed or it is not reachable."
+#: project/eventeditordlg.cpp:356 project/eventeditordlg.cpp:384
+msgid "Action name:"
+msgstr "动作名称："
+
+#: project/eventeditordlg.cpp:375
+msgid "Blocking:"
 msgstr ""
 
 #: project/projectnewweb.cpp:132
@@ -13287,22 +13592,6 @@ msgstr "上传配置文件(&L)"
 msgid "Team Configuration"
 msgstr "团队配置"
 
-#: project/membereditdlg.cpp:37 project/project.cpp:585
-msgid "Team Leader"
-msgstr "团队领导"
-
-#: project/membereditdlg.cpp:38 project/project.cpp:591
-msgid "Subproject Leader"
-msgstr "子工程领导"
-
-#: project/membereditdlg.cpp:36 project/project.cpp:596
-msgid "Task Leader"
-msgstr "任务领导"
-
-#: project/membereditdlg.cpp:35 project/project.cpp:601
-msgid "Simple Member"
-msgstr "简单成员"
-
 #: project/project.cpp:607
 msgid "Event Configuration"
 msgstr "事件配置"
@@ -13321,21 +13610,13 @@ msgid ""
 "loss)?"
 msgstr ""
 
-#: project/project.cpp:1268 project/projectprivate.cpp:1218
-msgid "Project Saving Error"
-msgstr "工程保存错误"
-
-#: project/membereditdlg.cpp:85
-msgid "Edit Subprojects"
-msgstr "编辑子工程"
-
-#: project/membereditdlg.cpp:169
-msgid "Select Member"
-msgstr "选择成员"
+#: project/rescanprj.cpp:55
+msgid "Reading folder:"
+msgstr "读取文件夹："
 
-#: project/membereditdlg.cpp:179
-msgid "No entries found in the addressbook."
-msgstr ""
+#: project/rescanprj.cpp:229
+msgid "Building tree:"
+msgstr "建立树："
 
 #: project/projectupload.cpp:81
 msgid "Upload Profiles"
@@ -13465,513 +13746,179 @@ msgid ""
 "<qt>The <b>%1</b> nickname is already assigned to <b>%2 &lt;%3&gt;</b>.</qt>"
 msgstr "<qt><b>%1</b> 昵称已经指派给 <b>%2 &lt;%3&gt;</b>了。</qt>"
 
-#: project/projectprivate.cpp:74
-msgid "<b>Insert Files in Project</b>"
-msgstr "<b>插入文件到工程中</b>"
-
-#: project/projectprivate.cpp:85
-msgid "&New Project..."
-msgstr "新建工程(&N)..."
-
-#: project/projectprivate.cpp:89
-msgid "&Open Project..."
-msgstr "打开工程(&O)..."
-
-#: project/projectprivate.cpp:95
-msgid "Open Recent Project"
-msgstr "打开最近的工程"
-
-#: project/projectprivate.cpp:97
-msgid "Open/Open recent project"
-msgstr "打开/打开最近的工程"
-
-#: project/projectprivate.cpp:100
-msgid "&Close Project"
-msgstr "关闭工程(&C)"
-
-#: project/projectprivate.cpp:105
-msgid "Open Project &View..."
-msgstr "打开工程视图(&V)..."
-
-#: project/projectprivate.cpp:109
-msgid "Open project view"
-msgstr "打开工程视图"
+#: project/projectnewlocal.cpp:78
+#, c-format
+msgid "Insert files from %1."
+msgstr "插入来自 %1 的文件。"
 
-#: project/projectprivate.cpp:111
-msgid "&Save Project View"
-msgstr "保存工程视图(&S)"
+#: ../lib/ksavealldialog.cpp:53 ../lib/ksavealldialog.cpp:144
+msgid "Save Modified Files?"
+msgstr "保存修改后的文件吗？"
 
-#: project/projectprivate.cpp:114
-msgid "Save Project View &As..."
-msgstr "工程视图另存为(&A)..."
+#: ../lib/ksavealldialog.cpp:58 ../lib/ksavealldialog.cpp:151
+msgid "The following files have been modified. Save them?"
+msgstr "下列文件已被修改。保存吗？"
 
-#: project/projectprivate.cpp:117
-msgid "&Delete Project View"
-msgstr "删除工程视图(&D)"
+#: ../lib/ksavealldialog.cpp:65
+msgid "Save &Selected"
+msgstr "保存已选(&S)"
 
-#: project/projectprivate.cpp:121
-msgid "Close project view"
-msgstr "关闭工程视图"
+#: ../lib/ksavealldialog.cpp:65
+msgid "Saves all selected files"
+msgstr "保存选中的全部文件"
 
-#: project/projectprivate.cpp:125
-msgid "&Insert Files..."
-msgstr "插入文件(&I)..."
+#: ../lib/ksavealldialog.cpp:66 ../lib/ksavealldialog.cpp:157
+msgid "Save &None"
+msgstr "全部不存(&N)"
 
-#: project/projectprivate.cpp:129
-msgid "Inser&t Folder..."
-msgstr "插入文件夹(&T)..."
+#: ../lib/ksavealldialog.cpp:68 ../lib/ksavealldialog.cpp:159
+msgid "Lose all modifications"
+msgstr "丢弃全部修改"
 
-#: project/projectprivate.cpp:133
-msgid "&Rescan Project Folder..."
-msgstr "重新扫描工程文件夹(&R)..."
+#: ../lib/ksavealldialog.cpp:69 ../lib/ksavealldialog.cpp:160
+msgid "Cancels the action"
+msgstr "取消动作"
 
-#: project/projectprivate.cpp:141
-msgid "&Project Properties"
-msgstr "工程属性(&P)"
+#: ../lib/ksavealldialog.cpp:156
+msgid "Save &All"
+msgstr "全部保存(&A)"
 
-#: project/projectprivate.cpp:146
-msgid "Save as Project Template..."
-msgstr "另存为工程模板..."
+#: ../lib/ksavealldialog.cpp:156
+msgid "Saves all modified files"
+msgstr "保存已修改的全部文件"
 
-#: project/projectprivate.cpp:151
-msgid "Save Selection to Project Template File..."
-msgstr "将选中内容保存到工程模板文件..."
+#: ../lib/compatibility/knewstuff/provider.cpp:205
+msgid "Error parsing providers list."
+msgstr "分析提供者列表出错。"
 
-#: project/projectprivate.cpp:302
-msgid "Adding files to the project..."
-msgstr "正在将文件添加工程中..."
+#: ../lib/compatibility/knewstuff/knewstuff.cpp:38
+#, c-format
+msgid "Download New %1"
+msgstr "下载新的 %1"
 
-#: project/projectprivate.cpp:374
-msgid "Reading the project file..."
-msgstr "正在读取工程文件..."
+#: ../lib/compatibility/knewstuff/providerdialog.cpp:53
+msgid "Hot New Stuff Providers"
+msgstr "百宝箱提供者"
 
-#: project/projectprivate.cpp:384
-msgid "Invalid project file."
-msgstr "无效的工程文件。"
+#: ../lib/compatibility/knewstuff/providerdialog.cpp:61
+msgid "Please select one of the providers listed below:"
+msgstr "请从下面列出的提供者中选择一个："
 
-#: project/projectprivate.cpp:906
-msgid "Save Project View As"
-msgstr "工程视图另存为"
+#: ../lib/compatibility/knewstuff/providerdialog.cpp:88
+msgid "No provider selected."
+msgstr "没有选中提供者。"
 
-#: project/projectprivate.cpp:907
-msgid "Enter the name of the view:"
-msgstr "输入视图的名称："
+#: ../lib/compatibility/knewstuff/knewstuffgeneric.cpp:133
+msgid "The file '%1' already exists. Do you want to override it?"
+msgstr "名为“%1”的文件已经存在。您确定要覆盖它吗？"
 
-#: project/projectprivate.cpp:919
-#, fuzzy
+#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:83
 msgid ""
-"<qt>A project view named <b>%1</b> already exists."
-"<br>Do you want to overwrite it?</qt>"
+"There was an error with the downloaded resource tarball file. Possible causes "
+"are damaged archive or invalid directory structure in the archive."
 msgstr ""
-"已经存在名称为“%1”的工程视图。\n"
-"您要覆盖它吗？"
 
-#: project/projectprivate.cpp:1059
-msgid "<qt>Cannot open file <b>%1</b> for writing.</qt>"
-msgstr "<qt>不能打开文件 <b>%1</b> 进行写入。</qt>"
-
-#: project/projectprivate.cpp:1124
-msgid "New Project Wizard"
-msgstr "新建工程向导"
-
-#: project/projectprivate.cpp:1138
-msgid "<b>General Project Settings</b>"
-msgstr "<b>常规工程设置</b>"
+#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:83
+msgid "Resource Installation Error"
+msgstr "资源安装错误"
 
-#: project/projectprivate.cpp:1140
-msgid "<b>More Project Settings</b>"
-msgstr "<b>更多工程设置</b>"
+#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:94
+msgid "No keys were found."
+msgstr "未发现密钥。"
 
-#: project/projectprivate.cpp:1218
-msgid ""
-"Saving of project failed. Do you want to continue with closing (might cause "
-"data loss)?"
+#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:99
+msgid "The validation failed for unknown reason."
 msgstr ""
 
-#: project/projectprivate.cpp:1242
-msgid ""
-"|Project Files\n"
-"*|All Files"
+#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:106
+msgid "The MD5SUM check failed, the archive might be broken."
 msgstr ""
-"|工程文件\n"
-"*|全部文件"
 
-#: project/projectprivate.cpp:1243
-msgid "Open Project"
-msgstr "打开工程"
-
-#: project/projectprivate.cpp:1287
-#, c-format
-msgid "Wrote project file %1"
-msgstr "已写入工程文件 %1"
-
-#: project/projectprivate.cpp:1291
-msgid "<qt>Cannot open the file <b>%1</b> for writing.</qt>"
-msgstr "<qt>不能打开文件 <b>%1</b> 进行写入。</qt>"
+#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:111
+msgid "The signature is bad, the archive might be broken or altered."
+msgstr ""
 
-#: project/projectprivate.cpp:1342
-msgid "<qt>Cannot open the file <b>%1</b> for reading.</qt>"
-msgstr "<qt>不能打开文件 <b>%1</b> 进行读取。</qt>"
+#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:121
+msgid "The signature is valid, but untrusted."
+msgstr ""
 
-#: project/projectprivate.cpp:1354
-msgid "<qt>Malformed URL: <b>%1</b></qt>"
-msgstr "<qt>格式不正确的 URL：<b>%1</b></qt>"
+#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:127
+msgid "The signature is unknown."
+msgstr ""
 
-#: project/projectprivate.cpp:1360
+#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:131
 msgid ""
-"<qt>The project"
-"<br><b>%1</b>"
-"<br> seems to be used by another Quanta instance."
-"<br>You may end up with data loss if you open the same project in two "
-"instances, modify and save them in both."
-"<br>"
-"<br>Do you want to proceed with open?</qt>"
+"The resource was signed with key <i>0x%1</i>, belonging to <i>%2 &lt;%3&gt;</i>"
+"."
 msgstr ""
 
-#: project/projectprivate.cpp:1419
-msgid "<qt>Cannot access the project file <b>%1</b>.</qt>"
-msgstr "<qt>无法访问工程文件 <b>%1</b>。</qt>"
-
-#: project/projectnewlocal.cpp:185 project/projectprivate.cpp:1430
-msgid "*"
-msgstr "*"
-
-#: project/projectnewlocal.cpp:185 project/projectprivate.cpp:1430
-msgid "Insert Files in Project"
-msgstr "插入文件到工程中"
-
-#: project/projectnewlocal.cpp:196 project/projectprivate.cpp:1440
-msgid "Files: Copy to Project"
-msgstr "文件：复制到工程中"
-
-#: project/projectnewlocal.cpp:244 project/projectprivate.cpp:1489
-msgid "Insert Folder in Project"
-msgstr "插入文件夹到工程中"
-
-#: project/projectprivate.cpp:1642
-#, c-format
-msgid "Uploaded project file %1"
-msgstr "已上传工程文件 %1"
-
-#: project/rescanprj.cpp:55
-msgid "Reading folder:"
-msgstr "读取文件夹："
-
-#: project/rescanprj.cpp:229
-msgid "Building tree:"
-msgstr "建立树："
-
-#: project/eventeditordlg.cpp:301
-msgid "Argument:"
-msgstr "参数："
-
-#: project/eventeditordlg.cpp:318
-msgid "Receiver:"
-msgstr "接收者："
-
-#: project/eventeditordlg.cpp:337
-msgid "Log file:"
-msgstr "日志文件："
-
-#: project/eventeditordlg.cpp:339
+#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:137
 msgid ""
-"A relative file to the project folder or a file outside of the project folder "
-"in which case the full path must be specified."
+"<qt>There is a problem with the resource file you have downloaded. The errors "
+"are :<b>%1</b>"
+"<br>%2"
+"<br>"
+"<br>Installation of the resource is <b>not recommended</b>."
+"<br>"
+"<br>Do you want to proceed with the installation?</qt>"
 msgstr ""
 
-#: project/eventeditordlg.cpp:341
-msgid "Detail:"
-msgstr "细节："
-
-#: project/eventeditordlg.cpp:344
-msgid "Full"
-msgstr "完整"
-
-#: project/eventeditordlg.cpp:345
-msgid "Minimal"
-msgstr "最小"
-
-#: project/eventeditordlg.cpp:347
-msgid "Behavior:"
-msgstr "行为："
-
-#: project/eventeditordlg.cpp:350
-msgid "Create New Log"
-msgstr "创建新日志"
-
-#: project/eventeditordlg.cpp:351
-msgid "Append to Existing Log"
-msgstr "追加到已有日志"
-
-#: project/eventeditordlg.cpp:356 project/eventeditordlg.cpp:384
-msgid "Action name:"
-msgstr "动作名称："
-
-#: project/eventeditordlg.cpp:375
-msgid "Blocking:"
+#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:137
+msgid "Problematic Resource File"
 msgstr ""
 
-#: project/projectnewlocal.cpp:78
-#, c-format
-msgid "Insert files from %1."
-msgstr "插入来自 %1 的文件。"
-
-#: project/projectnewgeneral.cpp:97
-msgid "Select Project Folder"
-msgstr "选择工程文件夹"
-
-#: project/projectnewgeneral.cpp:174 project/projectoptions.ui.h:28
-msgid "Select Project Template Folder"
-msgstr "选择工程模板文件夹"
+#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:140
+msgid "<qt>%1<br><br>Press OK to install it.</qt>"
+msgstr "<qt>%1<br><br>单击确定可安装。</qt>"
 
-#: project/projectnewgeneral.cpp:180 project/projectnewgeneral.cpp:228
-#, fuzzy
-msgid ""
-"<qt>The project templates must be stored under the main project folder: "
-"<br>"
-"<br><b>%1</b></qt>"
-msgstr "<qt>您必须将工具栏保存到如下文件夹中：<br><br><b>%1</b></qt>"
+#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:140
+msgid "Valid Resource"
+msgstr "有效资源"
 
-#: project/projectnewgeneral.cpp:188 project/projectoptions.ui.h:40
-msgid "Select Project Toolbar & Actions Folder"
-msgstr "选择工程工具栏和动作文件夹"
+#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:190
+msgid "The signing failed for unknown reason."
+msgstr ""
 
-#: project/projectnewgeneral.cpp:194 project/projectnewgeneral.cpp:241
-#, fuzzy
+#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:195
 msgid ""
-"<qt>The project toolbars must be stored under the main project folder: "
-"<br>"
-"<br><b>%1</b></qt>"
-msgstr "<qt>您必须将工具栏保存到如下文件夹中：<br><br><b>%1</b></qt>"
-
-#: project/eventconfigurationdlg.cpp:102
-msgid "New Event"
-msgstr "新事件"
-
-#: project/eventconfigurationdlg.cpp:121
-msgid "Edit Event"
-msgstr "编辑事件"
+"There are no keys usable for signing or you did not entered the correct "
+"passphrase.\n"
+"Proceed without signing the resource?"
+msgstr ""
 
-#: project/eventconfigurationdlg.cpp:144
+#: ../lib/compatibility/knewstuff/security.cpp:63
 msgid ""
-"<qt>Are you sure that you want to remove the configuration of the <b>%1</b> "
-"event?</qt>"
-msgstr "<qt>您真的要删除 <b>%1</b> 事件的配置吗？</qt>"
-
-#: project/eventconfigurationdlg.cpp:144
-msgid "Delete Event Configuration"
-msgstr "删除事件配置"
-
-#: ../lib/compatibility/tdemdi/qextmdi/ktabbar.cpp:195
-msgid "Close this tab"
-msgstr "关闭此标签"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:139
-msgid "Tool &Views"
-msgstr "工具视图(&V)"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:142
-msgid "MDI Mode"
-msgstr "MDI 模式"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:144
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2598
-msgid "&Toplevel Mode"
-msgstr "顶级模式(&T)"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:144
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2599
-msgid "C&hildframe Mode"
-msgstr "子框架模式(&H)"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:144
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2600
-msgid "Ta&b Page Mode"
-msgstr "标签页模式(&B)"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:144
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2601
-msgid "I&DEAl Mode"
-msgstr "IDEAL 模式(&D)"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:154
-msgid "Tool &Docks"
-msgstr "工具停靠(&D)"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:155
-#, fuzzy
-msgid "Switch Top Dock"
-msgstr "切换到(&S)"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:157
-#, fuzzy
-msgid "Switch Left Dock"
-msgstr "切换到(&S)"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:159
-msgid "Switch Right Dock"
+"<qt>Cannot start <i>gpg</i> and retrieve the available keys. Make sure that <i>"
+"gpg</i> is installed, otherwise verification of downloaded resources will not "
+"be possible.</qt>"
 msgstr ""
 
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:161
-msgid "Switch Bottom Dock"
+#: ../lib/compatibility/knewstuff/security.cpp:177
+msgid ""
+"<qt>Enter passphrase for key <b>0x%1</b>, belonging to"
+"<br><i>%2&lt;%3&gt;</i>:</qt>"
 msgstr ""
 
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:164
-msgid "Previous Tool View"
-msgstr "上个工具视图"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:166
-msgid "Next Tool View"
-msgstr "下个工具视图"
-
-#: ../lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp:2884
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:260
-#, c-format
-msgid "Show %1"
-msgstr "显示 %1"
-
-#: ../lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp:2878
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:265
-#, c-format
-msgid "Hide %1"
-msgstr "隐藏 %1"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:983
-msgid "Window"
-msgstr "窗口"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:996
-msgid "Undock"
-msgstr "取消停靠"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:1001
-msgid "Maximize"
-msgstr "最大化"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:1003
-msgid "Minimize"
-msgstr "最小化"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:1006
-msgid "Dock"
-msgstr "停靠"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:1011
-msgid "Operations"
-msgstr "操作"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2590
-msgid "&Minimize All"
-msgstr "全部最小化(&M)"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2596
-msgid "&MDI Mode"
-msgstr "MDI 模式(&M)"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2623
-msgid "&Tile"
-msgstr "平铺(&T)"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2625
-msgid "Ca&scade Windows"
-msgstr "层叠窗口(&S)"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2626
-msgid "Cascade &Maximized"
-msgstr "最大化层叠(&M)"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2627
-msgid "Expand &Vertically"
-msgstr "垂直展开(&V)"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2628
-msgid "Expand &Horizontally"
-msgstr "水平展开(&H)"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2629
-msgid "Tile &Non-Overlapped"
-msgstr "非层叠平铺(&N)"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2630
-msgid "Tile Overla&pped"
-msgstr "覆盖平铺(&P)"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2631
-msgid "Tile V&ertically"
-msgstr "垂直平铺(&E)"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2637
-msgid "&Dock/Undock"
-msgstr "停靠/取消停靠(&D)"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp:71
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp:63
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp:88
-msgid "Unnamed"
-msgstr "未命名"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1237
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1259
-msgid "&Restore"
-msgstr "还原(&R)"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1238
-msgid "&Move"
-msgstr "移动(&M)"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1239
-msgid "R&esize"
-msgstr "缩放(&E)"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1240
-msgid "M&inimize"
-msgstr "最小化(&I)"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1241
-msgid "M&aximize"
-msgstr "最大化(&A)"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1261
-msgid "&Maximize"
-msgstr "最大化(&M)"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1263
-msgid "&Minimize"
-msgstr "最小化(&M)"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1265
-msgid "M&ove"
-msgstr "移动(&O)"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1267
-msgid "&Resize"
-msgstr "缩放(&R)"
-
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1270
-msgid "&Undock"
-msgstr "取消停靠(&U)"
-
-#: ../lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp:237
+#: ../lib/compatibility/knewstuff/security.cpp:257
 msgid ""
-"_: Freeze the window geometry\n"
-"Freeze"
-msgstr "冻结"
+"<qt>Cannot start <i>gpg</i> and check the validity of the file. Make sure that "
+"<i>gpg</i> is installed, otherwise verification of downloaded resources will "
+"not be possible.</qt>"
+msgstr ""
 
-#: ../lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp:244
-msgid ""
-"_: Dock this window\n"
-"Dock"
-msgstr "停靠"
+#: ../lib/compatibility/knewstuff/security.cpp:317
+msgid "Select Signing Key"
+msgstr "选择签名密钥"
 
-#: ../lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp:251
-msgid "Detach"
-msgstr "漂移"
+#: ../lib/compatibility/knewstuff/security.cpp:317
+msgid "Key used for signing:"
+msgstr ""
 
-#: ../lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp:215
+#: ../lib/compatibility/knewstuff/security.cpp:338
 msgid ""
-"_: Switch between overlap and side by side mode\n"
-"Overlap"
-msgstr "覆盖"
+"<qt>Cannot start <i>gpg</i> and sign the file. Make sure that <i>gpg</i> "
+"is installed, otherwise signing of the resources will not be possible.</qt>"
+msgstr ""
 
 #: ../lib/compatibility/knewstuff/uploaddialog.cpp:46
 msgid "Share Hot New Stuff"
@@ -14021,13 +13968,71 @@ msgstr ""
 msgid "Please put in a name."
 msgstr "请输入名称。"
 
-#: ../lib/compatibility/knewstuff/knewstuffgeneric.cpp:133
-msgid "The file '%1' already exists. Do you want to override it?"
-msgstr "名为“%1”的文件已经存在。您确定要覆盖它吗？"
+#: ../lib/compatibility/knewstuff/engine.cpp:211
+msgid "Successfully installed hot new stuff."
+msgstr "成功安装了百宝箱。"
 
-#: ../lib/compatibility/knewstuff/provider.cpp:205
-msgid "Error parsing providers list."
-msgstr "分析提供者列表出错。"
+#: ../lib/compatibility/knewstuff/engine.cpp:216
+msgid "Failed to install hot new stuff."
+msgstr "安装百宝箱失败。"
+
+#: ../lib/compatibility/knewstuff/engine.cpp:270
+msgid "Unable to create file to upload."
+msgstr "无法创建要上传的文件。"
+
+#: ../lib/compatibility/knewstuff/engine.cpp:285
+msgid ""
+"The files to be uploaded have been created at:\n"
+msgstr ""
+"要上传的文件已经创建于：\n"
+
+#: ../lib/compatibility/knewstuff/engine.cpp:286
+msgid ""
+"Data file: %1\n"
+msgstr ""
+"数据文件：%1\n"
+
+#: ../lib/compatibility/knewstuff/engine.cpp:288
+msgid ""
+"Preview image: %1\n"
+msgstr ""
+"预览图像：%1\n"
+
+#: ../lib/compatibility/knewstuff/engine.cpp:290
+msgid ""
+"Content information: %1\n"
+msgstr ""
+"内容信息：%1\n"
+
+#: ../lib/compatibility/knewstuff/engine.cpp:291
+msgid ""
+"Those files can now be uploaded.\n"
+msgstr ""
+"这些文件即将上传。\n"
+
+#: ../lib/compatibility/knewstuff/engine.cpp:292
+msgid "Beware that any people might have access to them at any time."
+msgstr ""
+
+#: ../lib/compatibility/knewstuff/engine.cpp:294
+msgid "Upload Files"
+msgstr "上传文件"
+
+#: ../lib/compatibility/knewstuff/engine.cpp:299
+msgid "Please upload the files manually."
+msgstr "请手动上传文件。"
+
+#: ../lib/compatibility/knewstuff/engine.cpp:303
+msgid "Upload Info"
+msgstr "上传信息"
+
+#: ../lib/compatibility/knewstuff/engine.cpp:311
+msgid "&Upload"
+msgstr "上传(&U)"
+
+#: ../lib/compatibility/knewstuff/engine.cpp:413
+msgid "Successfully uploaded new stuff."
+msgstr "成功上传了新宝物。"
 
 #: ../lib/compatibility/knewstuff/downloaddialog.cpp:71
 #: ../lib/compatibility/knewstuff/downloaddialog.cpp:78
@@ -14122,232 +14127,225 @@ msgstr "安装"
 msgid "Installation failed."
 msgstr "安装失败。"
 
-#: ../lib/compatibility/knewstuff/knewstuff.cpp:38
-#, c-format
-msgid "Download New %1"
-msgstr "下载新的 %1"
+#: ../lib/compatibility/tdemdi/qextmdi/ktabbar.cpp:195
+msgid "Close this tab"
+msgstr "关闭此标签"
 
-#: ../lib/compatibility/knewstuff/engine.cpp:211
-msgid "Successfully installed hot new stuff."
-msgstr "成功安装了百宝箱。"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:139
+msgid "Tool &Views"
+msgstr "工具视图(&V)"
 
-#: ../lib/compatibility/knewstuff/engine.cpp:216
-msgid "Failed to install hot new stuff."
-msgstr "安装百宝箱失败。"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:142
+msgid "MDI Mode"
+msgstr "MDI 模式"
 
-#: ../lib/compatibility/knewstuff/engine.cpp:270
-msgid "Unable to create file to upload."
-msgstr "无法创建要上传的文件。"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:144
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2598
+msgid "&Toplevel Mode"
+msgstr "顶级模式(&T)"
 
-#: ../lib/compatibility/knewstuff/engine.cpp:285
-msgid ""
-"The files to be uploaded have been created at:\n"
-msgstr ""
-"要上传的文件已经创建于：\n"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:144
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2599
+msgid "C&hildframe Mode"
+msgstr "子框架模式(&H)"
 
-#: ../lib/compatibility/knewstuff/engine.cpp:286
-msgid ""
-"Data file: %1\n"
-msgstr ""
-"数据文件：%1\n"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:144
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2600
+msgid "Ta&b Page Mode"
+msgstr "标签页模式(&B)"
 
-#: ../lib/compatibility/knewstuff/engine.cpp:288
-msgid ""
-"Preview image: %1\n"
-msgstr ""
-"预览图像：%1\n"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:144
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2601
+msgid "I&DEAl Mode"
+msgstr "IDEAL 模式(&D)"
 
-#: ../lib/compatibility/knewstuff/engine.cpp:290
-msgid ""
-"Content information: %1\n"
-msgstr ""
-"内容信息：%1\n"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:154
+msgid "Tool &Docks"
+msgstr "工具停靠(&D)"
 
-#: ../lib/compatibility/knewstuff/engine.cpp:291
-msgid ""
-"Those files can now be uploaded.\n"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:155
+#, fuzzy
+msgid "Switch Top Dock"
+msgstr "切换到(&S)"
+
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:157
+#, fuzzy
+msgid "Switch Left Dock"
+msgstr "切换到(&S)"
+
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:159
+msgid "Switch Right Dock"
 msgstr ""
-"这些文件即将上传。\n"
 
-#: ../lib/compatibility/knewstuff/engine.cpp:292
-msgid "Beware that any people might have access to them at any time."
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:161
+msgid "Switch Bottom Dock"
 msgstr ""
 
-#: ../lib/compatibility/knewstuff/engine.cpp:294
-msgid "Upload Files"
-msgstr "上传文件"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:164
+msgid "Previous Tool View"
+msgstr "上个工具视图"
 
-#: ../lib/compatibility/knewstuff/engine.cpp:299
-msgid "Please upload the files manually."
-msgstr "请手动上传文件。"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:166
+msgid "Next Tool View"
+msgstr "下个工具视图"
 
-#: ../lib/compatibility/knewstuff/engine.cpp:303
-msgid "Upload Info"
-msgstr "上传信息"
+#: ../lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp:2886
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:260
+#, c-format
+msgid "Show %1"
+msgstr "显示 %1"
 
-#: ../lib/compatibility/knewstuff/engine.cpp:311
-msgid "&Upload"
-msgstr "上传(&U)"
+#: ../lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp:2880
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp:265
+#, c-format
+msgid "Hide %1"
+msgstr "隐藏 %1"
 
-#: ../lib/compatibility/knewstuff/engine.cpp:413
-msgid "Successfully uploaded new stuff."
-msgstr "成功上传了新宝物。"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp:71
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp:63
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp:88
+msgid "Unnamed"
+msgstr "未命名"
 
-#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:83
-msgid ""
-"There was an error with the downloaded resource tarball file. Possible causes "
-"are damaged archive or invalid directory structure in the archive."
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1237
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1259
+msgid "&Restore"
+msgstr "还原(&R)"
 
-#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:83
-msgid "Resource Installation Error"
-msgstr "资源安装错误"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1238
+msgid "&Move"
+msgstr "移动(&M)"
 
-#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:94
-msgid "No keys were found."
-msgstr "未发现密钥。"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1239
+msgid "R&esize"
+msgstr "缩放(&E)"
 
-#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:99
-msgid "The validation failed for unknown reason."
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1240
+msgid "M&inimize"
+msgstr "最小化(&I)"
 
-#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:106
-msgid "The MD5SUM check failed, the archive might be broken."
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1241
+msgid "M&aximize"
+msgstr "最大化(&A)"
 
-#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:111
-msgid "The signature is bad, the archive might be broken or altered."
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1261
+msgid "&Maximize"
+msgstr "最大化(&M)"
 
-#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:121
-msgid "The signature is valid, but untrusted."
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1263
+msgid "&Minimize"
+msgstr "最小化(&M)"
 
-#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:127
-msgid "The signature is unknown."
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1265
+msgid "M&ove"
+msgstr "移动(&O)"
 
-#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:131
-msgid ""
-"The resource was signed with key <i>0x%1</i>, belonging to <i>%2 &lt;%3&gt;</i>"
-"."
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1267
+msgid "&Resize"
+msgstr "缩放(&R)"
 
-#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:137
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp:1270
+msgid "&Undock"
+msgstr "取消停靠(&U)"
+
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp:215
 msgid ""
-"<qt>There is a problem with the resource file you have downloaded. The errors "
-"are :<b>%1</b>"
-"<br>%2"
-"<br>"
-"<br>Installation of the resource is <b>not recommended</b>."
-"<br>"
-"<br>Do you want to proceed with the installation?</qt>"
-msgstr ""
+"_: Switch between overlap and side by side mode\n"
+"Overlap"
+msgstr "覆盖"
 
-#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:137
-msgid "Problematic Resource File"
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp:237
+msgid ""
+"_: Freeze the window geometry\n"
+"Freeze"
+msgstr "冻结"
 
-#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:140
-msgid "<qt>%1<br><br>Press OK to install it.</qt>"
-msgstr "<qt>%1<br><br>单击确定可安装。</qt>"
+#: ../lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp:244
+msgid ""
+"_: Dock this window\n"
+"Dock"
+msgstr "停靠"
 
-#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:140
-msgid "Valid Resource"
-msgstr "有效资源"
+#: ../lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp:251
+msgid "Detach"
+msgstr "漂移"
 
-#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:190
-msgid "The signing failed for unknown reason."
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:983
+msgid "Window"
+msgstr "窗口"
 
-#: ../lib/compatibility/knewstuff/knewstuffsecure.cpp:195
-msgid ""
-"There are no keys usable for signing or you did not entered the correct "
-"passphrase.\n"
-"Proceed without signing the resource?"
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:996
+msgid "Undock"
+msgstr "取消停靠"
 
-#: ../lib/compatibility/knewstuff/security.cpp:63
-msgid ""
-"<qt>Cannot start <i>gpg</i> and retrieve the available keys. Make sure that <i>"
-"gpg</i> is installed, otherwise verification of downloaded resources will not "
-"be possible.</qt>"
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:1001
+msgid "Maximize"
+msgstr "最大化"
 
-#: ../lib/compatibility/knewstuff/security.cpp:177
-msgid ""
-"<qt>Enter passphrase for key <b>0x%1</b>, belonging to"
-"<br><i>%2&lt;%3&gt;</i>:</qt>"
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:1003
+msgid "Minimize"
+msgstr "最小化"
 
-#: ../lib/compatibility/knewstuff/security.cpp:257
-msgid ""
-"<qt>Cannot start <i>gpg</i> and check the validity of the file. Make sure that "
-"<i>gpg</i> is installed, otherwise verification of downloaded resources will "
-"not be possible.</qt>"
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:1006
+msgid "Dock"
+msgstr "停靠"
 
-#: ../lib/compatibility/knewstuff/security.cpp:317
-msgid "Select Signing Key"
-msgstr "选择签名密钥"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:1011
+msgid "Operations"
+msgstr "操作"
 
-#: ../lib/compatibility/knewstuff/security.cpp:317
-msgid "Key used for signing:"
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2590
+msgid "&Minimize All"
+msgstr "全部最小化(&M)"
 
-#: ../lib/compatibility/knewstuff/security.cpp:338
-msgid ""
-"<qt>Cannot start <i>gpg</i> and sign the file. Make sure that <i>gpg</i> "
-"is installed, otherwise signing of the resources will not be possible.</qt>"
-msgstr ""
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2596
+msgid "&MDI Mode"
+msgstr "MDI 模式(&M)"
 
-#: ../lib/compatibility/knewstuff/providerdialog.cpp:53
-msgid "Hot New Stuff Providers"
-msgstr "百宝箱提供者"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2623
+msgid "&Tile"
+msgstr "平铺(&T)"
 
-#: ../lib/compatibility/knewstuff/providerdialog.cpp:61
-msgid "Please select one of the providers listed below:"
-msgstr "请从下面列出的提供者中选择一个："
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2625
+msgid "Ca&scade Windows"
+msgstr "层叠窗口(&S)"
 
-#: ../lib/compatibility/knewstuff/providerdialog.cpp:88
-msgid "No provider selected."
-msgstr "没有选中提供者。"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2626
+msgid "Cascade &Maximized"
+msgstr "最大化层叠(&M)"
 
-#: ../lib/ksavealldialog.cpp:53 ../lib/ksavealldialog.cpp:144
-msgid "Save Modified Files?"
-msgstr "保存修改后的文件吗？"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2627
+msgid "Expand &Vertically"
+msgstr "垂直展开(&V)"
 
-#: ../lib/ksavealldialog.cpp:58 ../lib/ksavealldialog.cpp:151
-msgid "The following files have been modified. Save them?"
-msgstr "下列文件已被修改。保存吗？"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2628
+msgid "Expand &Horizontally"
+msgstr "水平展开(&H)"
 
-#: ../lib/ksavealldialog.cpp:65
-msgid "Save &Selected"
-msgstr "保存已选(&S)"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2629
+msgid "Tile &Non-Overlapped"
+msgstr "非层叠平铺(&N)"
 
-#: ../lib/ksavealldialog.cpp:65
-msgid "Saves all selected files"
-msgstr "保存选中的全部文件"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2630
+msgid "Tile Overla&pped"
+msgstr "覆盖平铺(&P)"
 
-#: ../lib/ksavealldialog.cpp:66 ../lib/ksavealldialog.cpp:157
-msgid "Save &None"
-msgstr "全部不存(&N)"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2631
+msgid "Tile V&ertically"
+msgstr "垂直平铺(&E)"
 
-#: ../lib/ksavealldialog.cpp:68 ../lib/ksavealldialog.cpp:159
-msgid "Lose all modifications"
-msgstr "丢弃全部修改"
+#: ../lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp:2637
+msgid "&Dock/Undock"
+msgstr "停靠/取消停靠(&D)"
 
-#: ../lib/ksavealldialog.cpp:69 ../lib/ksavealldialog.cpp:160
-msgid "Cancels the action"
-msgstr "取消动作"
+#~ msgid "&Quanta Homepage"
+#~ msgstr "Quanta 主页(&Q)"
 
-#: ../lib/ksavealldialog.cpp:156
-msgid "Save &All"
-msgstr "全部保存(&A)"
+#~ msgid "&User Mailing List"
+#~ msgstr "用户邮件列表(&U)"
 
-#: ../lib/ksavealldialog.cpp:156
-msgid "Saves all modified files"
-msgstr "保存已修改的全部文件"
+#~ msgid "Make &Donation"
+#~ msgstr "捐助(&D)"
 
 #~ msgid "Abort"
 #~ msgstr "中止"
diff --git a/tde-i18n-zh_CN/messages/tdewebdev/tdefilereplace.po b/tde-i18n-zh_CN/messages/tdewebdev/tdefilereplace.po
index 9079538697a..7a2a89c2c0e 100644
--- a/tde-i18n-zh_CN/messages/tdewebdev/tdefilereplace.po
+++ b/tde-i18n-zh_CN/messages/tdewebdev/tdefilereplace.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2008-07-08 01:25+0200\n"
+"POT-Creation-Date: 2014-09-29 00:53-0500\n"
 "PO-Revision-Date: 2005-12-05 21:08+0800\n"
 "Last-Translator: Dick Zhang <netwind2003@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,382 +31,6 @@ msgstr "netwind2003@263.net"
 msgid " Line:%3,Col:%4 - \"%1\" -> \"%2\""
 msgstr "行：%3，列：%4 -“%1”->“%2”"
 
-#: tdefilereplace.cpp:49
-msgid "Could not find the KFileReplace part."
-msgstr "找不到 KFileReplace 部件。"
-
-#: tdefilereplacelib.cpp:99
-#, c-format
-msgid ""
-"_n: 1 byte\n"
-"%n bytes"
-msgstr "%n 字节"
-
-#: tdefilereplacelib.cpp:105
-msgid "%1 KB"
-msgstr "%1 KB"
-
-#: tdefilereplacelib.cpp:111
-msgid "%1 MB"
-msgstr "%1 MB"
-
-#: tdefilereplacelib.cpp:117
-msgid "%1 GB"
-msgstr "%1 GB"
-
-#: tdefilereplacelib.cpp:140
-msgid ""
-"<qt>Cannot open the file <b>%1</b> and load the string list. This file seems "
-"not to be a valid old kfr file or it is broken.</qt>"
-msgstr "<qt>无法打开文件 <b>%1</b> 并载入字符串列表。此文件似乎不是有效的旧 kfr 文件，或者该文件已经损坏。</qt>"
-
-#: tdefilereplacelib.cpp:158 tdefilereplacelib.cpp:171 tdefilereplacelib.cpp:177
-msgid "Cannot read data."
-msgstr "无法读取数据。"
-
-#: tdefilereplacelib.cpp:167
-msgid "Out of memory."
-msgstr "内存溢出。"
-
-#: tdefilereplacepart.cpp:102
-msgid "Ready."
-msgstr "就绪。"
-
-#: tdefilereplacepart.cpp:151
-msgid "Search completed."
-msgstr "搜索已完成。"
-
-#: tdefilereplacepart.cpp:164
-msgid ""
-"<qt>You have selected <b>%1</b> as the encoding of the files."
-"<br>Selecting the correct encoding is very important as if you have files that "
-"have some other encoding than the selected one, after a replace you may damage "
-"those files."
-"<br>"
-"<br>In case you do not know the encoding of your files, select <i>utf8</i> "
-"and <b>enable</b> the creation of backup files. This setting will autodetect <i>"
-"utf8</i> and <i>utf16</i> files, but the changed files will be converted to <i>"
-"utf8</i>.</qt>"
-msgstr ""
-"<qt>您为文件选择了 <b>%1</b> 编码。"
-"<br>选择正确的编码十分重要，如果您的文件与所选的编码不符的话，进行替换时您的文件将可能被破坏。"
-"<br>"
-"<br>如果您不知道您文件的编码，请选择 <i>utf8</i> 并<b>启用</b>创建备份文件。此设置将会自动检测 <i>utf8</i> 和 <i>"
-"utf16</i> 文件，但是更改后的文件将被转换为 <i>utf8</i>。</qt>"
-
-#: tdefilereplacepart.cpp:164
-msgid "File Encoding Warning"
-msgstr "文件编码警告"
-
-#: tdefilereplacepart.cpp:173
-msgid "Replacing files (simulation)..."
-msgstr "正在替换文件...(模拟)..."
-
-#: tdefilereplacepart.cpp:174
-msgid "Replaced strings (simulation)"
-msgstr "替换字符串(模拟)"
-
-#: tdefilereplacepart.cpp:178
-msgid "Replacing files..."
-msgstr "正在替换文件..."
-
-#: tdefilereplacepart.cpp:179
-msgid "Replaced strings"
-msgstr "替换的字符串"
-
-#: tdefilereplacepart.cpp:233
-msgid "Stopping..."
-msgstr "正在停止..."
-
-#: tdefilereplacepart.cpp:247
-msgid "There are no results to save: the result list is empty."
-msgstr "没有结果可以保存：结果为空。"
-
-#: tdefilereplacepart.cpp:251
-msgid "Save Report"
-msgstr "保存结果"
-
-#: tdefilereplacepart.cpp:261
-msgid "<qt>A folder or a file named <b>%1</b> already exists.</qt>"
-msgstr "<qt>名为 <b>%1</b> 的文件夹或文件已经存在。</qt>"
-
-#: tdefilereplacepart.cpp:269
-msgid "<qt>Cannot create the <b>%1</b> folder.</qt>"
-msgstr "<qt>无法创建 <b>%1</b> 文件夹。</qt>"
-
-#: tdefilereplacepart.cpp:347
-msgid "KFileReplace strings"
-msgstr "KFileReplace 字符串"
-
-#: tdefilereplacepart.cpp:347 tdefilereplaceview.cpp:425
-msgid "All Files"
-msgstr "全部文件"
-
-#: tdefilereplacepart.cpp:348
-msgid "Load Strings From File"
-msgstr "从文件载入字符串"
-
-#: tdefilereplacepart.cpp:381
-msgid "Cannot open folders."
-msgstr "无法打开文件夹。"
-
-#: tdefilereplacepart.cpp:513
-msgid "KFileReplacePart"
-msgstr "KFileReplacePart"
-
-#: tdefilereplacepart.cpp:515
-msgid "Batch search and replace tool."
-msgstr "批量搜索替换工具。"
-
-#: tdefilereplacepart.cpp:517 main.cpp:38
-msgid "Part of the TDEWebDev module."
-msgstr "TDEWebDev 模块的部件。"
-
-#: tdefilereplacepart.cpp:519 main.cpp:44
-msgid "Original author of the KFileReplace tool"
-msgstr "KFileReplace 工具的最初作者"
-
-#: tdefilereplacepart.cpp:522 main.cpp:42
-msgid "Current maintainer, code cleaner and rewriter"
-msgstr "当前维护者，代码清理和重写"
-
-#: tdefilereplacepart.cpp:525
-msgid "Co-maintainer, KPart creator"
-msgstr "联合维护者，KPart 创建者"
-
-#: tdefilereplacepart.cpp:528
-msgid "Original german translator"
-msgstr "德语原翻译者"
-
-#: tdefilereplacepart.cpp:538
-msgid "Sorry, currently the KFileReplace part works only for local files."
-msgstr "抱歉，KFileReplace 部件只能在本地文件上工作。"
-
-#: tdefilereplacepart.cpp:538
-msgid "Non Local File"
-msgstr "非本地文件"
-
-#: tdefilereplacepart.cpp:570
-msgid "Customize Search/Replace Session..."
-msgstr "自定义搜索/替换会话..."
-
-#: tdefilereplacepart.cpp:571
-msgid "&Search"
-msgstr "搜索(&S)"
-
-#: tdefilereplacepart.cpp:572
-msgid "S&imulate"
-msgstr "模拟(&I)"
-
-#: tdefilereplacepart.cpp:573
-msgid "&Replace"
-msgstr "替换(&R)"
-
-#: tdefilereplacepart.cpp:574
-msgid "Sto&p"
-msgstr "停止(&P)"
-
-#: tdefilereplacepart.cpp:575
-msgid "Cre&ate Report File..."
-msgstr "创建报告文件(&A)..."
-
-#: tdefilereplacepart.cpp:578
-msgid "&Add String..."
-msgstr "添加字符串(&A)..."
-
-#: tdefilereplacepart.cpp:580
-msgid "&Delete String"
-msgstr "删除字符串(&D)"
-
-#: tdefilereplacepart.cpp:581
-msgid "&Empty Strings List"
-msgstr "清空字符串列表(&E)"
-
-#: tdefilereplacepart.cpp:582
-msgid "Edit Selected String..."
-msgstr "编辑选中的字符串..."
-
-#: tdefilereplacepart.cpp:583
-msgid "&Save Strings List to File..."
-msgstr "字符串列表保存到文件(&S)..."
-
-#: tdefilereplacepart.cpp:584
-msgid "&Load Strings List From File..."
-msgstr "从文件载入字符串列表(&L)..."
-
-#: tdefilereplacepart.cpp:585
-msgid "&Load Recent Strings Files"
-msgstr "载入最近使用的字符串文件(&L)"
-
-#: tdefilereplacepart.cpp:586
-msgid "&Invert Current String (search <--> replace)"
-msgstr "对调当前字符串(搜索<-->替换)(&I)"
-
-#: tdefilereplacepart.cpp:587
-msgid "&Invert All Strings (search <--> replace)"
-msgstr "对调所有字符串(搜索<-->替换)(&I)"
-
-#: tdefilereplacepart.cpp:590
-msgid "&Include Sub-Folders"
-msgstr "包含子文件夹(&I)"
-
-#: tdefilereplacepart.cpp:591
-msgid "Create &Backup Files"
-msgstr "创建备份文件(&B)"
-
-#: tdefilereplacepart.cpp:592
-msgid "Case &Sensitive"
-msgstr "区分大小写(&S)"
-
-#: tdefilereplacepart.cpp:593
-msgid "Enable Commands &in Replace String: [$command:option$]"
-msgstr "替换字符串中使用命令(&I)：[$命令:选项$]"
-
-#: tdefilereplacepart.cpp:594
-msgid "Enable &Regular Expressions"
-msgstr "启用正则表达式(&R)"
-
-#: tdefilereplacepart.cpp:595
-msgid "Configure &KFileReplace..."
-msgstr "配置 &KFileReplace..."
-
-#: tdefilereplacepart.cpp:598 tdefilereplaceview.cpp:530
-msgid "&Properties"
-msgstr "属性(&P)"
-
-#: tdefilereplacepart.cpp:599 tdefilereplaceview.cpp:502
-msgid "&Open"
-msgstr "打开(&O)"
-
-#: tdefilereplacepart.cpp:603 tdefilereplaceview.cpp:515
-msgid "&Edit in Quanta"
-msgstr "在 Quanta 中编辑(&E)"
-
-#: tdefilereplacepart.cpp:605 tdefilereplaceview.cpp:521
-msgid "Open Parent &Folder"
-msgstr "打开父文件夹(&F)"
-
-#: tdefilereplacepart.cpp:607
-msgid "E&xpand Tree"
-msgstr "展开树(&X)"
-
-#: tdefilereplacepart.cpp:608
-msgid "&Reduce Tree"
-msgstr "缩小树(&R)"
-
-#: tdefilereplacepart.cpp:609
-msgid "&About KFileReplace"
-msgstr "关于 KFileReplace(&A)"
-
-#: tdefilereplacepart.cpp:610
-msgid "KFileReplace &Handbook"
-msgstr "KFileReplace 手册(&H)"
-
-#: tdefilereplacepart.cpp:611
-msgid "&Report Bug"
-msgstr "报告错误(&R)"
-
-#: tdefilereplacepart.cpp:1025 tdefilereplacepart.cpp:1113
-#: tdefilereplacepart.cpp:1335
-msgid "<qt>Cannot open file <b>%1</b> for reading.</qt>"
-msgstr "<qt>无法打开文件 <b>%1</b> 读取。</qt>"
-
-#: tdefilereplacepart.cpp:1064 tdefilereplacepart.cpp:1142
-msgid "<qt>Cannot open file <b>%1</b> for writing.</qt>"
-msgstr "<qt>无法打开文件 <b>%1</b> 写入。</qt>"
-
-#: tdefilereplacepart.cpp:1199
-msgid ""
-"<qt>Do you want to replace the string <b>%1</b> with the string <b>%2</b>?</qt>"
-msgstr "<qt>您是否想要将 <b>%1</b> 替换为 <b>%2</b>？</qt>"
-
-#: tdefilereplacepart.cpp:1200
-msgid "Confirm Replace"
-msgstr "确认替换"
-
-#: tdefilereplacepart.cpp:1202
-msgid "Do Not Replace"
-msgstr "不替换"
-
-#: tdefilereplacepart.cpp:1406 tdefilereplacepart.cpp:1446
-msgid " Line:%2, Col:%3 - \"%1\""
-msgstr " 行：%2，列：%3 -“%1”"
-
-#: tdefilereplacepart.cpp:1512
-msgid "<qt>Cannot open the file <b>%1</b> and load the string list.</qt>"
-msgstr "<qt>无法打开文件 <b>%1</b> 并载入字符串列表。</qt>"
-
-#: tdefilereplacepart.cpp:1520
-msgid ""
-"<qt>File <b>%1</b> seems not to be written in new kfr format. Remember that the "
-"old kfr format will be soon abandoned. You can convert your old rules files by "
-"simply saving them with tdefilereplace.</qt>"
-msgstr ""
-"<qt>文件 <b>%1</b> 好像不是以新的 kfr 格式写入的。请记住，旧的 kfr 格式即将被抛弃。您应该用 tdefilereplace "
-"重新保存旧的规则文件来转换您的旧规则文件。</qt>"
-
-#: tdefilereplacepart.cpp:1540
-msgid ""
-"<qt>The format of kfr files has been changed; attempting to load <b>%1</b>"
-". Please see the KFilereplace manual for details. Do you want to load a "
-"search-and-replace list of strings?</qt>"
-msgstr ""
-"<qt>kfr 文件的格式已经更改；正在试图装入 <b>%1</b>。详情请看 KFilereplace 的手册。您是否想要装入搜索替换的字符串列表？</qt>"
-
-#: tdefilereplacepart.cpp:1540
-msgid "Load"
-msgstr "装入"
-
-#: tdefilereplacepart.cpp:1540
-msgid "Do Not Load"
-msgstr "不装入"
-
-#: tdefilereplacepart.cpp:1629
-msgid "There are no strings to search and replace."
-msgstr "没有要搜索和替换的字符串。"
-
-#: tdefilereplacepart.cpp:1642
-msgid "<qt>The main folder of the project <b>%1</b> does not exist.</qt>"
-msgstr "<qt>项目主文件夹 <b>%1</b> 不存在。</qt>"
-
-#: tdefilereplacepart.cpp:1650
-msgid "<qt>Access denied in the main folder of the project:<br><b>%1</b></qt>"
-msgstr "<qt>对项目主文件夹的访问被禁止：<br><b>%1</b></qt>"
-
-#: tdefilereplaceview.cpp:120
-msgid ""
-"<qt>Cannot invert string <b>%1</b>, because the search string would be "
-"empty.</qt>"
-msgstr "<qt>无法对调字符串 <b>%1</b>，因为那样搜索字符串会为空。</qt>"
-
-#: tdefilereplaceview.cpp:259
-msgid "File %1 cannot be opened. Might be a DCOP problem."
-msgstr "无法打开文件 %1。可能是 DCOP 问题。"
-
-#: tdefilereplaceview.cpp:281
-msgid "Do you really want to delete %1?"
-msgstr "您真的要删除 %1 吗？"
-
-#: tdefilereplaceview.cpp:401
-msgid "No strings to save as the list is empty."
-msgstr "列表中没有字符串可以保存。"
-
-#: tdefilereplaceview.cpp:425
-msgid "KFileReplace Strings"
-msgstr "KFileReplace 字符串"
-
-#: tdefilereplaceview.cpp:426
-msgid "Save Strings to File"
-msgstr "保存字符串到文件"
-
-#: tdefilereplaceview.cpp:437
-msgid "File %1 cannot be saved."
-msgstr "无法保存文件 %1。"
-
-#: tdefilereplaceview.cpp:507
-msgid "Open &With..."
-msgstr "打开方式(&W)..."
-
 #: knewprojectdlg.cpp:97
 msgid "Project Directory"
 msgstr "项目目录"
@@ -431,13 +56,28 @@ msgid "Starting folder"
 msgstr "初始文件夹"
 
 #: main.cpp:37
-msgid "KFileReplace"
+#, fuzzy
+msgid "TDEFileReplace"
 msgstr "KFileReplace"
 
+#: main.cpp:38 tdefilereplacepart.cpp:517
+#, fuzzy
+msgid "Part of the KDEWebDev module."
+msgstr "TDEWebDev 模块的部件。"
+
 #: main.cpp:41
 msgid "Shell author, KPart creator, co-maintainer"
 msgstr "Shell 作者、KPart 创建者、联合维护者"
 
+#: main.cpp:42 tdefilereplacepart.cpp:522
+msgid "Current maintainer, code cleaner and rewriter"
+msgstr "当前维护者，代码清理和重写"
+
+#: main.cpp:44 tdefilereplacepart.cpp:519
+#, fuzzy
+msgid "Original author of the TDEFileReplace tool"
+msgstr "KFileReplace 工具的最初作者"
+
 #. i18n: file tdefilereplacepartui.rc line 4
 #: rc.cpp:3 rc.cpp:27
 #, no-c-format
@@ -458,8 +98,8 @@ msgstr "结果(&R)"
 
 #. i18n: file tdefilereplacepartui.rc line 55
 #: rc.cpp:21
-#, no-c-format
-msgid "KFileReplace Main Toolbar"
+#, fuzzy, no-c-format
+msgid "TDEFileReplace Main Toolbar"
 msgstr "KFileReplace 主工具栏"
 
 #. i18n: file kaddstringdlgs.ui line 16
@@ -499,413 +139,413 @@ msgid "Replace with:"
 msgstr "替换为："
 
 #. i18n: file kaddstringdlgs.ui line 270
-#: rc.cpp:48 rc.cpp:51 rc.cpp:105 rc.cpp:111
+#: rc.cpp:48 rc.cpp:51 rc.cpp:306 rc.cpp:312
 #, no-c-format
 msgid "Search For"
 msgstr "搜索"
 
 #. i18n: file kaddstringdlgs.ui line 322
-#: rc.cpp:54 rc.cpp:108
+#: rc.cpp:54 rc.cpp:309
 #, no-c-format
 msgid "Replace With"
 msgstr "替换为"
 
-#. i18n: file tdefilereplaceviewwdg.ui line 58
-#: rc.cpp:66 rc.cpp:87 rc.cpp:204 rc.cpp:222 report.cpp:114
-#, no-c-format
-msgid "Name"
-msgstr "名称"
-
-#. i18n: file tdefilereplaceviewwdg.ui line 69
-#: rc.cpp:69 rc.cpp:90 report.cpp:115
-#, no-c-format
-msgid "Folder"
-msgstr "文件夹"
-
-#. i18n: file tdefilereplaceviewwdg.ui line 80
-#: rc.cpp:72 report.cpp:122
-#, no-c-format
-msgid "Old Size"
-msgstr "旧的大小"
-
-#. i18n: file tdefilereplaceviewwdg.ui line 91
-#: rc.cpp:75 report.cpp:123
-#, no-c-format
-msgid "New Size"
-msgstr "新的大小"
-
-#. i18n: file tdefilereplaceviewwdg.ui line 102
-#: rc.cpp:78 report.cpp:54
-#, no-c-format
-msgid "Replaced Strings"
-msgstr "替换的字符串"
-
-#. i18n: file tdefilereplaceviewwdg.ui line 113
-#: rc.cpp:81 rc.cpp:99 report.cpp:126
-#, no-c-format
-msgid "Owner User"
-msgstr "所有者用户"
-
-#. i18n: file tdefilereplaceviewwdg.ui line 124
-#: rc.cpp:84 rc.cpp:102 report.cpp:127
-#, no-c-format
-msgid "Owner Group"
-msgstr "所有者组"
-
-#. i18n: file tdefilereplaceviewwdg.ui line 203
-#: rc.cpp:93 report.cpp:118
-#, no-c-format
-msgid "Size"
-msgstr "大小"
-
-#. i18n: file tdefilereplaceviewwdg.ui line 214
-#: rc.cpp:96
-#, no-c-format
-msgid "Found Strings"
-msgstr "找到的字符串"
-
-#. i18n: file tdefilereplaceviewwdg.ui line 427
-#: rc.cpp:114
-#, no-c-format
-msgid "Green means ready"
-msgstr "绿色代表就绪"
-
-#. i18n: file tdefilereplaceviewwdg.ui line 430
-#: rc.cpp:117
-#, no-c-format
-msgid "Ready"
-msgstr "就绪"
-
-#. i18n: file tdefilereplaceviewwdg.ui line 454
-#: rc.cpp:120
-#, no-c-format
-msgid "Yellow means wait while sorting list"
-msgstr "黄色代表正在对列表进行排序"
-
-#. i18n: file tdefilereplaceviewwdg.ui line 457
-#: rc.cpp:123
-#, no-c-format
-msgid "Please wait while sorting list"
-msgstr "请稍候，正在对列表进行排序"
-
-#. i18n: file tdefilereplaceviewwdg.ui line 478
-#: rc.cpp:126
-#, no-c-format
-msgid "Red means scanning files"
-msgstr "红色代表正在扫描文件"
-
-#. i18n: file tdefilereplaceviewwdg.ui line 513
-#: rc.cpp:129
-#, no-c-format
-msgid "Scanned files:"
-msgstr "扫描的文件："
-
 #. i18n: file knewprojectdlgs.ui line 16
-#: rc.cpp:132
+#: rc.cpp:66
 #, no-c-format
 msgid "Search & Replace in Files"
 msgstr "在文件中搜索并替换"
 
 #. i18n: file knewprojectdlgs.ui line 89
-#: rc.cpp:138
+#: rc.cpp:72
 #, no-c-format
 msgid "Search Now"
 msgstr "立即搜索"
 
 #. i18n: file knewprojectdlgs.ui line 103
-#: rc.cpp:141
+#: rc.cpp:75
 #, no-c-format
 msgid "Search Later"
 msgstr "稍后搜索"
 
 #. i18n: file knewprojectdlgs.ui line 142
-#: rc.cpp:147
+#: rc.cpp:81
 #, no-c-format
 msgid "&General"
 msgstr "常规(&G)"
 
 #. i18n: file knewprojectdlgs.ui line 153
-#: rc.cpp:150
+#: rc.cpp:84
 #, no-c-format
 msgid "Startup Folder Options"
 msgstr "启动文件夹选项"
 
 #. i18n: file knewprojectdlgs.ui line 164
-#: rc.cpp:153
+#: rc.cpp:87
 #, no-c-format
 msgid "Filter:"
 msgstr "过滤器："
 
 #. i18n: file knewprojectdlgs.ui line 175
-#: rc.cpp:156
+#: rc.cpp:90
 #, no-c-format
 msgid "Location:"
 msgstr "位置："
 
 #. i18n: file knewprojectdlgs.ui line 212
-#: rc.cpp:159
+#: rc.cpp:93
 #, no-c-format
 msgid "Insert a search path here. You can use the search path button."
 msgstr "在此插入搜索路径。您可以使用搜索路径按钮。"
 
 #. i18n: file knewprojectdlgs.ui line 262
-#: rc.cpp:162
+#: rc.cpp:96
 #, no-c-format
 msgid "&Include subfolders"
 msgstr "包含子文件夹(&I)"
 
 #. i18n: file knewprojectdlgs.ui line 275
-#: rc.cpp:165
+#: rc.cpp:99
 #, no-c-format
 msgid "Search/Replace Strings"
 msgstr "搜索/替换字符串"
 
 #. i18n: file knewprojectdlgs.ui line 296
-#: rc.cpp:168
+#: rc.cpp:102
 #, no-c-format
 msgid "Search:"
 msgstr "搜索："
 
 #. i18n: file knewprojectdlgs.ui line 304
-#: rc.cpp:171
+#: rc.cpp:105
 #, no-c-format
 msgid "Replace:"
 msgstr "替换："
 
 #. i18n: file knewprojectdlgs.ui line 314
-#: rc.cpp:174 rc.cpp:270
+#: rc.cpp:108 rc.cpp:204
 #, no-c-format
 msgid "General Options"
 msgstr "常规选项"
 
 #. i18n: file knewprojectdlgs.ui line 328
-#: rc.cpp:177
+#: rc.cpp:111
 #, no-c-format
 msgid "Enable &regular expressions"
 msgstr "启用正则表达式(&R)"
 
 #. i18n: file knewprojectdlgs.ui line 336
-#: rc.cpp:180
+#: rc.cpp:114
 #, no-c-format
 msgid "Do &backup copy instead of overwrite"
 msgstr "进行备份而不仅是覆盖(&B)"
 
 #. i18n: file knewprojectdlgs.ui line 344
-#: rc.cpp:183
+#: rc.cpp:117
 #, no-c-format
 msgid "&Case sensitive"
 msgstr "区分大小写(&C)"
 
 #. i18n: file knewprojectdlgs.ui line 352
-#: rc.cpp:186
+#: rc.cpp:120
 #, no-c-format
 msgid "Enable co&mmands in the replace string"
 msgstr "在替换字符串中使用命令(&M)"
 
 #. i18n: file knewprojectdlgs.ui line 360
-#: rc.cpp:189 rc.cpp:276
+#: rc.cpp:123 rc.cpp:210
 #, no-c-format
 msgid "Backup copy suffix:"
 msgstr "备份后缀："
 
 #. i18n: file knewprojectdlgs.ui line 389
-#: rc.cpp:192 rc.cpp:294
+#: rc.cpp:126 rc.cpp:228
 #, no-c-format
 msgid "Encoding of the files:"
 msgstr "文件的编码："
 
 #. i18n: file knewprojectdlgs.ui line 401
-#: rc.cpp:195 rc.cpp:297
+#: rc.cpp:129 rc.cpp:231
 #, no-c-format
 msgid "&Advanced"
 msgstr "高级(&A)"
 
 #. i18n: file knewprojectdlgs.ui line 412
-#: rc.cpp:198
+#: rc.cpp:132
 #, no-c-format
 msgid "Ownership Filtering"
 msgstr "拥有者过滤"
 
 #. i18n: file knewprojectdlgs.ui line 423
-#: rc.cpp:201
+#: rc.cpp:135
 #, no-c-format
 msgid "User: "
 msgstr "用户："
 
+#. i18n: file knewprojectdlgs.ui line 429
+#: rc.cpp:138 rc.cpp:156 rc.cpp:267 rc.cpp:288 report.cpp:114
+#, no-c-format
+msgid "Name"
+msgstr "名称"
+
 #. i18n: file knewprojectdlgs.ui line 434
-#: rc.cpp:207 rc.cpp:225
+#: rc.cpp:141 rc.cpp:159
 #, no-c-format
 msgid "ID (Number)"
 msgstr "ID(数字)"
 
 #. i18n: file knewprojectdlgs.ui line 456
-#: rc.cpp:210 rc.cpp:216
+#: rc.cpp:144 rc.cpp:150
 #, no-c-format
 msgid "Equals To"
 msgstr "等于"
 
 #. i18n: file knewprojectdlgs.ui line 461
-#: rc.cpp:213 rc.cpp:219
+#: rc.cpp:147 rc.cpp:153
 #, no-c-format
 msgid "Is Not"
 msgstr "不是"
 
 #. i18n: file knewprojectdlgs.ui line 539
-#: rc.cpp:228
+#: rc.cpp:162
 #, no-c-format
 msgid "Group:"
 msgstr "组："
 
 #. i18n: file knewprojectdlgs.ui line 565
-#: rc.cpp:231
+#: rc.cpp:165
 #, no-c-format
 msgid "Access Date Filtering"
 msgstr "访问日期过滤器"
 
 #. i18n: file knewprojectdlgs.ui line 592
-#: rc.cpp:234
+#: rc.cpp:168
 #, no-c-format
 msgid "Dates valid for:"
 msgstr "有效的日期："
 
 #. i18n: file knewprojectdlgs.ui line 600
-#: rc.cpp:237
+#: rc.cpp:171
 #, no-c-format
 msgid "Accessed after:"
 msgstr "访问时间晚于："
 
 #. i18n: file knewprojectdlgs.ui line 608
-#: rc.cpp:240
+#: rc.cpp:174
 #, no-c-format
 msgid "Accessed before: "
 msgstr "访问时间早于："
 
 #. i18n: file knewprojectdlgs.ui line 624
-#: rc.cpp:243
+#: rc.cpp:177
 #, no-c-format
 msgid "Last Writing Access"
 msgstr "上次写入访问"
 
 #. i18n: file knewprojectdlgs.ui line 629
-#: rc.cpp:246
+#: rc.cpp:180
 #, no-c-format
 msgid "Last Reading Access"
 msgstr "上次读取访问"
 
 #. i18n: file knewprojectdlgs.ui line 737
-#: rc.cpp:249
+#: rc.cpp:183
 #, no-c-format
 msgid "Size Filtering"
 msgstr "大小过滤器"
 
 #. i18n: file knewprojectdlgs.ui line 764
-#: rc.cpp:252
+#: rc.cpp:186
 #, no-c-format
 msgid "Minimum si&ze:"
 msgstr "最小大小(&Z)："
 
 #. i18n: file knewprojectdlgs.ui line 772
-#: rc.cpp:255
+#: rc.cpp:189
 #, no-c-format
 msgid "Maximum size:"
 msgstr "最大大小："
 
 #. i18n: file knewprojectdlgs.ui line 822
-#: rc.cpp:258 rc.cpp:261
+#: rc.cpp:192 rc.cpp:195
 #, no-c-format
 msgid "KB"
 msgstr "KB"
 
 #. i18n: file koptionsdlgs.ui line 34
-#: rc.cpp:267
+#: rc.cpp:201
 #, no-c-format
 msgid "General"
 msgstr "常规"
 
 #. i18n: file koptionsdlgs.ui line 56
-#: rc.cpp:273
+#: rc.cpp:207
 #, no-c-format
 msgid "Enable commands in replace strings"
 msgstr "在替换字符串中使用命令"
 
 #. i18n: file koptionsdlgs.ui line 83
-#: rc.cpp:279
+#: rc.cpp:213
 #, no-c-format
 msgid "Notif&y on errors"
 msgstr "出错时通知(&Y)"
 
 #. i18n: file koptionsdlgs.ui line 91
-#: rc.cpp:282
+#: rc.cpp:216
 #, no-c-format
 msgid "Case sensitive"
 msgstr "区分大小写"
 
 #. i18n: file koptionsdlgs.ui line 102
-#: rc.cpp:285
+#: rc.cpp:219
 #, no-c-format
 msgid "Recursive (search/replace in all sub folders)"
 msgstr "递归(搜索/替换所有子文件夹)"
 
 #. i18n: file koptionsdlgs.ui line 116
-#: rc.cpp:288
+#: rc.cpp:222
 #, no-c-format
 msgid "Enable regular e&xpressions"
 msgstr "启用正则表达式(&X)"
 
 #. i18n: file koptionsdlgs.ui line 124
-#: rc.cpp:291
+#: rc.cpp:225
 #, no-c-format
 msgid "Do &backup copy"
 msgstr "进行备份(&B)"
 
 #. i18n: file koptionsdlgs.ui line 168
-#: rc.cpp:300
+#: rc.cpp:234
 #, no-c-format
 msgid "Advanced Options"
 msgstr "高级选项"
 
 #. i18n: file koptionsdlgs.ui line 179
-#: rc.cpp:303
+#: rc.cpp:237
 #, no-c-format
 msgid "Ignore hidden files and folders"
 msgstr "忽略隐藏的文件和文件夹"
 
 #. i18n: file koptionsdlgs.ui line 187
-#: rc.cpp:306
+#: rc.cpp:240
 #, no-c-format
 msgid "Follow s&ymbolic links"
 msgstr "跟随符号链接(&Y)"
 
 #. i18n: file koptionsdlgs.ui line 195
-#: rc.cpp:309
+#: rc.cpp:243
 #, no-c-format
 msgid "When searching, stop on first string found (faster but no details)"
 msgstr "搜索时，发现第一个字符串时停止(快速但没有细节)"
 
 #. i18n: file koptionsdlgs.ui line 206
-#: rc.cpp:312
+#: rc.cpp:246
 #, no-c-format
 msgid "Do not show file if no strings are found or replaced"
 msgstr "如果未找到或替换字符串，则不显示文件"
 
 #. i18n: file koptionsdlgs.ui line 242
-#: rc.cpp:315
+#: rc.cpp:249
 #, no-c-format
 msgid "Show confirmation dialog"
 msgstr "显示确认对话框"
 
 #. i18n: file koptionsdlgs.ui line 255
-#: rc.cpp:318
+#: rc.cpp:252
 #, no-c-format
 msgid "Confirm before replace each string"
 msgstr "替换每一个字符串时确认"
 
 #. i18n: file koptionsdlgs.ui line 296
-#: rc.cpp:324
+#: rc.cpp:258
 #, no-c-format
 msgid "&Default Values"
 msgstr "默认值(&D)"
 
+#. i18n: file tdefilereplaceviewwdg.ui line 69
+#: rc.cpp:270 rc.cpp:291 report.cpp:115
+#, no-c-format
+msgid "Folder"
+msgstr "文件夹"
+
+#. i18n: file tdefilereplaceviewwdg.ui line 80
+#: rc.cpp:273 report.cpp:122
+#, no-c-format
+msgid "Old Size"
+msgstr "旧的大小"
+
+#. i18n: file tdefilereplaceviewwdg.ui line 91
+#: rc.cpp:276 report.cpp:123
+#, no-c-format
+msgid "New Size"
+msgstr "新的大小"
+
+#. i18n: file tdefilereplaceviewwdg.ui line 102
+#: rc.cpp:279 report.cpp:54
+#, no-c-format
+msgid "Replaced Strings"
+msgstr "替换的字符串"
+
+#. i18n: file tdefilereplaceviewwdg.ui line 113
+#: rc.cpp:282 rc.cpp:300 report.cpp:126
+#, no-c-format
+msgid "Owner User"
+msgstr "所有者用户"
+
+#. i18n: file tdefilereplaceviewwdg.ui line 124
+#: rc.cpp:285 rc.cpp:303 report.cpp:127
+#, no-c-format
+msgid "Owner Group"
+msgstr "所有者组"
+
+#. i18n: file tdefilereplaceviewwdg.ui line 203
+#: rc.cpp:294 report.cpp:118
+#, no-c-format
+msgid "Size"
+msgstr "大小"
+
+#. i18n: file tdefilereplaceviewwdg.ui line 214
+#: rc.cpp:297
+#, no-c-format
+msgid "Found Strings"
+msgstr "找到的字符串"
+
+#. i18n: file tdefilereplaceviewwdg.ui line 427
+#: rc.cpp:315
+#, no-c-format
+msgid "Green means ready"
+msgstr "绿色代表就绪"
+
+#. i18n: file tdefilereplaceviewwdg.ui line 430
+#: rc.cpp:318
+#, no-c-format
+msgid "Ready"
+msgstr "就绪"
+
+#. i18n: file tdefilereplaceviewwdg.ui line 454
+#: rc.cpp:321
+#, no-c-format
+msgid "Yellow means wait while sorting list"
+msgstr "黄色代表正在对列表进行排序"
+
+#. i18n: file tdefilereplaceviewwdg.ui line 457
+#: rc.cpp:324
+#, no-c-format
+msgid "Please wait while sorting list"
+msgstr "请稍候，正在对列表进行排序"
+
+#. i18n: file tdefilereplaceviewwdg.ui line 478
+#: rc.cpp:327
+#, no-c-format
+msgid "Red means scanning files"
+msgstr "红色代表正在扫描文件"
+
+#. i18n: file tdefilereplaceviewwdg.ui line 513
+#: rc.cpp:330
+#, no-c-format
+msgid "Scanned files:"
+msgstr "扫描的文件："
+
 #: report.cpp:41 report.cpp:194
 msgid "<qt>Cannot open the file <b>%1</b>.</qt>"
 msgstr "<qt>无法打开文件 <b>%1</b>。</qt>"
@@ -923,7 +563,8 @@ msgid "-"
 msgstr "-"
 
 #: report.cpp:68
-msgid "KFileReplace Report"
+#, fuzzy
+msgid "TDEFileReplace Report"
 msgstr "KFileReplace 报告"
 
 #: report.cpp:73
@@ -950,6 +591,379 @@ msgstr "日期"
 msgid "Total occurrences"
 msgstr "总计出现次数"
 
+#: tdefilereplace.cpp:49
+#, fuzzy
+msgid "Could not find the TDEFileReplace part."
+msgstr "找不到 KFileReplace 部件。"
+
+#: tdefilereplacelib.cpp:99
+#, c-format
+msgid ""
+"_n: 1 byte\n"
+"%n bytes"
+msgstr "%n 字节"
+
+#: tdefilereplacelib.cpp:105
+msgid "%1 KB"
+msgstr "%1 KB"
+
+#: tdefilereplacelib.cpp:111
+msgid "%1 MB"
+msgstr "%1 MB"
+
+#: tdefilereplacelib.cpp:117
+msgid "%1 GB"
+msgstr "%1 GB"
+
+#: tdefilereplacelib.cpp:140
+msgid ""
+"<qt>Cannot open the file <b>%1</b> and load the string list. This file seems "
+"not to be a valid old kfr file or it is broken.</qt>"
+msgstr "<qt>无法打开文件 <b>%1</b> 并载入字符串列表。此文件似乎不是有效的旧 kfr 文件，或者该文件已经损坏。</qt>"
+
+#: tdefilereplacelib.cpp:158 tdefilereplacelib.cpp:171
+#: tdefilereplacelib.cpp:177
+msgid "Cannot read data."
+msgstr "无法读取数据。"
+
+#: tdefilereplacelib.cpp:167
+msgid "Out of memory."
+msgstr "内存溢出。"
+
+#: tdefilereplacepart.cpp:102
+msgid "Ready."
+msgstr "就绪。"
+
+#: tdefilereplacepart.cpp:151
+msgid "Search completed."
+msgstr "搜索已完成。"
+
+#: tdefilereplacepart.cpp:164
+msgid ""
+"<qt>You have selected <b>%1</b> as the encoding of the files."
+"<br>Selecting the correct encoding is very important as if you have files that "
+"have some other encoding than the selected one, after a replace you may damage "
+"those files."
+"<br>"
+"<br>In case you do not know the encoding of your files, select <i>utf8</i> "
+"and <b>enable</b> the creation of backup files. This setting will autodetect <i>"
+"utf8</i> and <i>utf16</i> files, but the changed files will be converted to <i>"
+"utf8</i>.</qt>"
+msgstr ""
+"<qt>您为文件选择了 <b>%1</b> 编码。"
+"<br>选择正确的编码十分重要，如果您的文件与所选的编码不符的话，进行替换时您的文件将可能被破坏。"
+"<br>"
+"<br>如果您不知道您文件的编码，请选择 <i>utf8</i> 并<b>启用</b>创建备份文件。此设置将会自动检测 <i>utf8</i> 和 <i>"
+"utf16</i> 文件，但是更改后的文件将被转换为 <i>utf8</i>。</qt>"
+
+#: tdefilereplacepart.cpp:164
+msgid "File Encoding Warning"
+msgstr "文件编码警告"
+
+#: tdefilereplacepart.cpp:173
+msgid "Replacing files (simulation)..."
+msgstr "正在替换文件...(模拟)..."
+
+#: tdefilereplacepart.cpp:174
+msgid "Replaced strings (simulation)"
+msgstr "替换字符串(模拟)"
+
+#: tdefilereplacepart.cpp:178
+msgid "Replacing files..."
+msgstr "正在替换文件..."
+
+#: tdefilereplacepart.cpp:179
+msgid "Replaced strings"
+msgstr "替换的字符串"
+
+#: tdefilereplacepart.cpp:233
+msgid "Stopping..."
+msgstr "正在停止..."
+
+#: tdefilereplacepart.cpp:247
+msgid "There are no results to save: the result list is empty."
+msgstr "没有结果可以保存：结果为空。"
+
+#: tdefilereplacepart.cpp:251
+msgid "Save Report"
+msgstr "保存结果"
+
+#: tdefilereplacepart.cpp:261
+msgid "<qt>A folder or a file named <b>%1</b> already exists.</qt>"
+msgstr "<qt>名为 <b>%1</b> 的文件夹或文件已经存在。</qt>"
+
+#: tdefilereplacepart.cpp:269
+msgid "<qt>Cannot create the <b>%1</b> folder.</qt>"
+msgstr "<qt>无法创建 <b>%1</b> 文件夹。</qt>"
+
+#: tdefilereplacepart.cpp:347
+#, fuzzy
+msgid "TDEFileReplace strings"
+msgstr "KFileReplace 字符串"
+
+#: tdefilereplacepart.cpp:347 tdefilereplaceview.cpp:425
+msgid "All Files"
+msgstr "全部文件"
+
+#: tdefilereplacepart.cpp:348
+msgid "Load Strings From File"
+msgstr "从文件载入字符串"
+
+#: tdefilereplacepart.cpp:381
+msgid "Cannot open folders."
+msgstr "无法打开文件夹。"
+
+#: tdefilereplacepart.cpp:513
+#, fuzzy
+msgid "TDEFileReplacePart"
+msgstr "KFileReplacePart"
+
+#: tdefilereplacepart.cpp:515
+msgid "Batch search and replace tool."
+msgstr "批量搜索替换工具。"
+
+#: tdefilereplacepart.cpp:525
+msgid "Co-maintainer, KPart creator"
+msgstr "联合维护者，KPart 创建者"
+
+#: tdefilereplacepart.cpp:528
+msgid "Original german translator"
+msgstr "德语原翻译者"
+
+#: tdefilereplacepart.cpp:538
+#, fuzzy
+msgid "Sorry, currently the TDEFileReplace part works only for local files."
+msgstr "抱歉，KFileReplace 部件只能在本地文件上工作。"
+
+#: tdefilereplacepart.cpp:538
+msgid "Non Local File"
+msgstr "非本地文件"
+
+#: tdefilereplacepart.cpp:570
+msgid "Customize Search/Replace Session..."
+msgstr "自定义搜索/替换会话..."
+
+#: tdefilereplacepart.cpp:571
+msgid "&Search"
+msgstr "搜索(&S)"
+
+#: tdefilereplacepart.cpp:572
+msgid "S&imulate"
+msgstr "模拟(&I)"
+
+#: tdefilereplacepart.cpp:573
+msgid "&Replace"
+msgstr "替换(&R)"
+
+#: tdefilereplacepart.cpp:574
+msgid "Sto&p"
+msgstr "停止(&P)"
+
+#: tdefilereplacepart.cpp:575
+msgid "Cre&ate Report File..."
+msgstr "创建报告文件(&A)..."
+
+#: tdefilereplacepart.cpp:578
+msgid "&Add String..."
+msgstr "添加字符串(&A)..."
+
+#: tdefilereplacepart.cpp:580
+msgid "&Delete String"
+msgstr "删除字符串(&D)"
+
+#: tdefilereplacepart.cpp:581
+msgid "&Empty Strings List"
+msgstr "清空字符串列表(&E)"
+
+#: tdefilereplacepart.cpp:582
+msgid "Edit Selected String..."
+msgstr "编辑选中的字符串..."
+
+#: tdefilereplacepart.cpp:583
+msgid "&Save Strings List to File..."
+msgstr "字符串列表保存到文件(&S)..."
+
+#: tdefilereplacepart.cpp:584
+msgid "&Load Strings List From File..."
+msgstr "从文件载入字符串列表(&L)..."
+
+#: tdefilereplacepart.cpp:585
+msgid "&Load Recent Strings Files"
+msgstr "载入最近使用的字符串文件(&L)"
+
+#: tdefilereplacepart.cpp:586
+msgid "&Invert Current String (search <--> replace)"
+msgstr "对调当前字符串(搜索<-->替换)(&I)"
+
+#: tdefilereplacepart.cpp:587
+msgid "&Invert All Strings (search <--> replace)"
+msgstr "对调所有字符串(搜索<-->替换)(&I)"
+
+#: tdefilereplacepart.cpp:590
+msgid "&Include Sub-Folders"
+msgstr "包含子文件夹(&I)"
+
+#: tdefilereplacepart.cpp:591
+msgid "Create &Backup Files"
+msgstr "创建备份文件(&B)"
+
+#: tdefilereplacepart.cpp:592
+msgid "Case &Sensitive"
+msgstr "区分大小写(&S)"
+
+#: tdefilereplacepart.cpp:593
+msgid "Enable Commands &in Replace String: [$command:option$]"
+msgstr "替换字符串中使用命令(&I)：[$命令:选项$]"
+
+#: tdefilereplacepart.cpp:594
+msgid "Enable &Regular Expressions"
+msgstr "启用正则表达式(&R)"
+
+#: tdefilereplacepart.cpp:595
+#, fuzzy
+msgid "Configure &TDEFileReplace..."
+msgstr "配置 &KFileReplace..."
+
+#: tdefilereplacepart.cpp:598 tdefilereplaceview.cpp:530
+msgid "&Properties"
+msgstr "属性(&P)"
+
+#: tdefilereplacepart.cpp:599 tdefilereplaceview.cpp:502
+msgid "&Open"
+msgstr "打开(&O)"
+
+#: tdefilereplacepart.cpp:603 tdefilereplaceview.cpp:515
+msgid "&Edit in Quanta"
+msgstr "在 Quanta 中编辑(&E)"
+
+#: tdefilereplacepart.cpp:605 tdefilereplaceview.cpp:521
+msgid "Open Parent &Folder"
+msgstr "打开父文件夹(&F)"
+
+#: tdefilereplacepart.cpp:607
+msgid "E&xpand Tree"
+msgstr "展开树(&X)"
+
+#: tdefilereplacepart.cpp:608
+msgid "&Reduce Tree"
+msgstr "缩小树(&R)"
+
+#: tdefilereplacepart.cpp:609
+#, fuzzy
+msgid "&About TDEFileReplace"
+msgstr "关于 KFileReplace(&A)"
+
+#: tdefilereplacepart.cpp:610
+#, fuzzy
+msgid "TDEFileReplace &Handbook"
+msgstr "KFileReplace 手册(&H)"
+
+#: tdefilereplacepart.cpp:611
+msgid "&Report Bug"
+msgstr "报告错误(&R)"
+
+#: tdefilereplacepart.cpp:1025 tdefilereplacepart.cpp:1113
+#: tdefilereplacepart.cpp:1335
+msgid "<qt>Cannot open file <b>%1</b> for reading.</qt>"
+msgstr "<qt>无法打开文件 <b>%1</b> 读取。</qt>"
+
+#: tdefilereplacepart.cpp:1064 tdefilereplacepart.cpp:1142
+msgid "<qt>Cannot open file <b>%1</b> for writing.</qt>"
+msgstr "<qt>无法打开文件 <b>%1</b> 写入。</qt>"
+
+#: tdefilereplacepart.cpp:1199
+msgid ""
+"<qt>Do you want to replace the string <b>%1</b> with the string <b>%2</b>?</qt>"
+msgstr "<qt>您是否想要将 <b>%1</b> 替换为 <b>%2</b>？</qt>"
+
+#: tdefilereplacepart.cpp:1200
+msgid "Confirm Replace"
+msgstr "确认替换"
+
+#: tdefilereplacepart.cpp:1202
+msgid "Do Not Replace"
+msgstr "不替换"
+
+#: tdefilereplacepart.cpp:1406 tdefilereplacepart.cpp:1446
+msgid " Line:%2, Col:%3 - \"%1\""
+msgstr " 行：%2，列：%3 -“%1”"
+
+#: tdefilereplacepart.cpp:1512
+msgid "<qt>Cannot open the file <b>%1</b> and load the string list.</qt>"
+msgstr "<qt>无法打开文件 <b>%1</b> 并载入字符串列表。</qt>"
+
+#: tdefilereplacepart.cpp:1520
+msgid ""
+"<qt>File <b>%1</b> seems not to be written in new kfr format. Remember that the "
+"old kfr format will be soon abandoned. You can convert your old rules files by "
+"simply saving them with tdefilereplace.</qt>"
+msgstr ""
+"<qt>文件 <b>%1</b> 好像不是以新的 kfr 格式写入的。请记住，旧的 kfr 格式即将被抛弃。您应该用 tdefilereplace "
+"重新保存旧的规则文件来转换您的旧规则文件。</qt>"
+
+#: tdefilereplacepart.cpp:1540
+msgid ""
+"<qt>The format of kfr files has been changed; attempting to load <b>%1</b>"
+". Please see the KFilereplace manual for details. Do you want to load a "
+"search-and-replace list of strings?</qt>"
+msgstr ""
+"<qt>kfr 文件的格式已经更改；正在试图装入 <b>%1</b>。详情请看 KFilereplace 的手册。您是否想要装入搜索替换的字符串列表？</qt>"
+
+#: tdefilereplacepart.cpp:1540
+msgid "Load"
+msgstr "装入"
+
+#: tdefilereplacepart.cpp:1540
+msgid "Do Not Load"
+msgstr "不装入"
+
+#: tdefilereplacepart.cpp:1629
+msgid "There are no strings to search and replace."
+msgstr "没有要搜索和替换的字符串。"
+
+#: tdefilereplacepart.cpp:1642
+msgid "<qt>The main folder of the project <b>%1</b> does not exist.</qt>"
+msgstr "<qt>项目主文件夹 <b>%1</b> 不存在。</qt>"
+
+#: tdefilereplacepart.cpp:1650
+msgid "<qt>Access denied in the main folder of the project:<br><b>%1</b></qt>"
+msgstr "<qt>对项目主文件夹的访问被禁止：<br><b>%1</b></qt>"
+
+#: tdefilereplaceview.cpp:120
+msgid ""
+"<qt>Cannot invert string <b>%1</b>, because the search string would be "
+"empty.</qt>"
+msgstr "<qt>无法对调字符串 <b>%1</b>，因为那样搜索字符串会为空。</qt>"
+
+#: tdefilereplaceview.cpp:259
+msgid "File %1 cannot be opened. Might be a DCOP problem."
+msgstr "无法打开文件 %1。可能是 DCOP 问题。"
+
+#: tdefilereplaceview.cpp:281
+msgid "Do you really want to delete %1?"
+msgstr "您真的要删除 %1 吗？"
+
+#: tdefilereplaceview.cpp:401
+msgid "No strings to save as the list is empty."
+msgstr "列表中没有字符串可以保存。"
+
+#: tdefilereplaceview.cpp:425
+#, fuzzy
+msgid "TDEFileReplace Strings"
+msgstr "KFileReplace 字符串"
+
+#: tdefilereplaceview.cpp:426
+msgid "Save Strings to File"
+msgstr "保存字符串到文件"
+
+#: tdefilereplaceview.cpp:437
+msgid "File %1 cannot be saved."
+msgstr "无法保存文件 %1。"
+
+#: tdefilereplaceview.cpp:507
+msgid "Open &With..."
+msgstr "打开方式(&W)..."
+
 #: whatthis.h:29
 msgid ""
 "Shows the statistics of your operations. Note that the columns content changes "