Merge translation files from master branch.

2 files changed, 37 insertions, 23 deletions

diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmkicker.po b/tde-i18n-zh_CN/messages/tdebase/kcmkicker.po
index b012521a01e..30f80c21886 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmkicker.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmkicker.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2021-10-01 20:16+0000\n"
+"POT-Creation-Date: 2021-10-08 20:19+0000\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"
@@ -173,11 +173,11 @@ msgstr ""
 "(c) 1999 - 2001 Matthias Elter\n"
 "(c) 2002 - 2003 Aaron J. Seigo"
 
-#: menutab_impl.cpp:135
+#: menutab_impl.cpp:136
 msgid "Quick Browser"
 msgstr "快捷浏览"
 
-#: menutab_impl.cpp:332
+#: menutab_impl.cpp:333
 msgid ""
 "The TDE menu editor (kmenuedit) could not be launched.\n"
 "Perhaps it is not installed or not in your path."
@@ -185,10 +185,20 @@ msgstr ""
 "TDE 菜单编辑器 (kmenuedit) 无法启动。\n"
 "可能它没有安装或者不在您的执行路径上。"
 
-#: menutab_impl.cpp:334
+#: menutab_impl.cpp:335
 msgid "Application Missing"
 msgstr "程序找不到"
 
+#: menutab_impl.cpp:367
+msgid ""
+"Cannot set Escape as menu search shortcut.\n"
+"Would you like to set another shortcut?"
+msgstr ""
+
+#: menutab_impl.cpp:368
+msgid "Invalid shortcut"
+msgstr ""
+
 #: positiontab_impl.cpp:77 positiontab_impl.cpp:92
 msgid "Top left"
 msgstr "顶边偏左"
diff --git a/tde-i18n-zh_CN/messages/tdebase/kicker.po b/tde-i18n-zh_CN/messages/tdebase/kicker.po
index 67b1de7ed70..1a61fd33421 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kicker.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kicker.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2021-10-01 20:16+0000\n"
+"POT-Creation-Date: 2021-10-08 20:19+0000\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"
@@ -93,7 +93,7 @@ msgstr "小程序 %1 无法装入。请检查您的安装。"
 msgid "Applet Loading Error"
 msgstr "小程序装入错误"
 
-#: core/container_button.h:133 ui/k_mnu.cpp:337
+#: core/container_button.h:133 ui/k_mnu.cpp:346
 msgid "Quick Browser"
 msgstr "快速浏览器"
 
@@ -367,7 +367,7 @@ msgstr "应用程序"
 msgid "Restart Computer"
 msgstr ""
 
-#: ui/itemview.cpp:482 ui/k_mnu.cpp:395 ui/k_new_mnu.cpp:1364
+#: ui/itemview.cpp:482 ui/k_mnu.cpp:404 ui/k_new_mnu.cpp:1364
 msgid "Switch User"
 msgstr "切换用户"
 
@@ -384,57 +384,61 @@ msgstr ""
 msgid "Directory: "
 msgstr ""
 
-#: ui/k_mnu.cpp:276
-msgid " Press '%1' or '%2' to search..."
+#: ui/k_mnu.cpp:277
+msgid " Click here to search..."
 msgstr ""
 
-#: ui/k_mnu.cpp:277
+#: ui/k_mnu.cpp:281
 msgid " Press '%1' to search..."
 msgstr ""
 
-#: ui/k_mnu.cpp:288
+#: ui/k_mnu.cpp:285
+msgid " Press '%1' or '%2' to search..."
+msgstr ""
+
+#: ui/k_mnu.cpp:297
 #, fuzzy
 msgid "Search"
 msgstr "搜索(&S)："
 
-#: ui/k_mnu.cpp:288
+#: ui/k_mnu.cpp:297
 #, fuzzy
 msgid "TDE Menu search"
 msgstr "K 菜单"
 
-#: ui/k_mnu.cpp:303
+#: ui/k_mnu.cpp:312
 msgid "All Applications"
 msgstr "全部应用程序"
 
-#: ui/k_mnu.cpp:305 ui/k_new_mnu.h:80
+#: ui/k_mnu.cpp:314 ui/k_new_mnu.h:80
 msgid "Actions"
 msgstr "动作"
 
-#: ui/k_mnu.cpp:386 ui/k_new_mnu.cpp:1429
+#: ui/k_mnu.cpp:395 ui/k_new_mnu.cpp:1429
 msgid "Run Command..."
 msgstr "运行命令..."
 
-#: ui/k_mnu.cpp:407 ui/k_new_mnu.cpp:1358
+#: ui/k_mnu.cpp:416 ui/k_new_mnu.cpp:1358
 msgid "Save Session"
 msgstr "保存会话"
 
-#: ui/k_mnu.cpp:412
+#: ui/k_mnu.cpp:421
 msgid "Lock Session"
 msgstr "锁住会话"
 
-#: ui/k_mnu.cpp:417
+#: ui/k_mnu.cpp:426
 msgid "Log Out..."
 msgstr "注销..."
 
-#: ui/k_mnu.cpp:493 ui/k_new_mnu.cpp:947 ui/k_new_mnu.cpp:1543
+#: ui/k_mnu.cpp:502 ui/k_new_mnu.cpp:947 ui/k_new_mnu.cpp:1543
 msgid "Lock Current && Start New Session"
 msgstr "锁住当前会话并启动新会话"
 
-#: ui/k_mnu.cpp:495 ui/k_new_mnu.cpp:944 ui/k_new_mnu.cpp:1544
+#: ui/k_mnu.cpp:504 ui/k_new_mnu.cpp:944 ui/k_new_mnu.cpp:1544
 msgid "Start New Session"
 msgstr "启动新会话"
 
-#: ui/k_mnu.cpp:527 ui/k_new_mnu.cpp:1576
+#: ui/k_mnu.cpp:536 ui/k_new_mnu.cpp:1576
 msgid ""
 "<p>You have chosen to open another desktop session.<br>The current session "
 "will be hidden and a new login screen will be displayed.<br>An F-key is "
@@ -448,11 +452,11 @@ msgstr ""
 "话，等等。您可以同时按下 Ctrl、Alt 和相应的 F-功能键切换到不同的会话。此外，"
 "TDE 面板和桌面菜单也可用于切换会话。</p>"
 
-#: ui/k_mnu.cpp:538 ui/k_new_mnu.cpp:1587
+#: ui/k_mnu.cpp:547 ui/k_new_mnu.cpp:1587
 msgid "Warning - New Session"
 msgstr "警告 - 新会话"
 
-#: ui/k_mnu.cpp:539 ui/k_new_mnu.cpp:1588
+#: ui/k_mnu.cpp:548 ui/k_new_mnu.cpp:1588
 msgid "&Start New Session"
 msgstr "启动新会话(&S)"