Merge translation files from master branch.

1 files changed, 114 insertions, 130 deletions

diff --git a/tde-i18n-zh_CN/messages/tdebase/kicker.po b/tde-i18n-zh_CN/messages/tdebase/kicker.po
index 618f13759d9..c085e5f115f 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kicker.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kicker.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-01-13 18:47+0100\n"
+"POT-Creation-Date: 2019-01-23 23:16+0100\n"
 "PO-Revision-Date: 2005-08-21 17:13+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -60,7 +60,7 @@ msgstr "无法执行非 TDE 应用程序。"
 msgid "Kicker Error"
 msgstr "Kicker 错误"
 
-#: buttons/servicemenubutton.cpp:62 ui/k_new_mnu.cpp:1423 ui/k_new_mnu.cpp:1921
+#: buttons/servicemenubutton.cpp:62 ui/k_new_mnu.cpp:1412 ui/k_new_mnu.cpp:1910
 #: ui/k_new_mnu.h:80
 msgid "Applications"
 msgstr "应用程序"
@@ -357,7 +357,7 @@ msgstr "不可执行"
 msgid "Select Other"
 msgstr "选择其它"
 
-#: ui/itemview.cpp:475 ui/k_new_mnu.cpp:1048
+#: ui/itemview.cpp:475 ui/k_new_mnu.cpp:1037
 #, fuzzy
 msgid "New Applications"
 msgstr "应用程序"
@@ -366,7 +366,7 @@ msgstr "应用程序"
 msgid "Restart Computer"
 msgstr ""
 
-#: ui/itemview.cpp:482 ui/k_mnu.cpp:379 ui/k_new_mnu.cpp:1375
+#: ui/itemview.cpp:482 ui/k_mnu.cpp:379 ui/k_new_mnu.cpp:1364
 msgid "Switch User"
 msgstr "切换用户"
 
@@ -395,11 +395,11 @@ msgstr "全部应用程序"
 msgid "Actions"
 msgstr "动作"
 
-#: ui/k_mnu.cpp:370 ui/k_new_mnu.cpp:1440
+#: ui/k_mnu.cpp:370 ui/k_new_mnu.cpp:1429
 msgid "Run Command..."
 msgstr "运行命令..."
 
-#: ui/k_mnu.cpp:391 ui/k_new_mnu.cpp:1369
+#: ui/k_mnu.cpp:391 ui/k_new_mnu.cpp:1358
 msgid "Save Session"
 msgstr "保存会话"
 
@@ -411,15 +411,15 @@ msgstr "锁住会话"
 msgid "Log Out..."
 msgstr "注销..."
 
-#: ui/k_mnu.cpp:477 ui/k_new_mnu.cpp:958 ui/k_new_mnu.cpp:1554
+#: ui/k_mnu.cpp:477 ui/k_new_mnu.cpp:947 ui/k_new_mnu.cpp:1543
 msgid "Lock Current && Start New Session"
 msgstr "锁住当前会话并启动新会话"
 
-#: ui/k_mnu.cpp:479 ui/k_new_mnu.cpp:955 ui/k_new_mnu.cpp:1555
+#: ui/k_mnu.cpp:479 ui/k_new_mnu.cpp:944 ui/k_new_mnu.cpp:1544
 msgid "Start New Session"
 msgstr "启动新会话"
 
-#: ui/k_mnu.cpp:511 ui/k_new_mnu.cpp:1587
+#: ui/k_mnu.cpp:511 ui/k_new_mnu.cpp:1576
 msgid ""
 "<p>You have chosen to open another desktop session.<br>The current session "
 "will be hidden and a new login screen will be displayed.<br>An F-key is "
@@ -433,416 +433,396 @@ msgstr ""
 "话，等等。您可以同时按下 Ctrl、Alt 和相应的 F-功能键切换到不同的会话。此外，"
 "TDE 面板和桌面菜单也可用于切换会话。</p>"
 
-#: ui/k_mnu.cpp:522 ui/k_new_mnu.cpp:1598
+#: ui/k_mnu.cpp:522 ui/k_new_mnu.cpp:1587
 msgid "Warning - New Session"
 msgstr "警告 - 新会话"
 
-#: ui/k_mnu.cpp:523 ui/k_new_mnu.cpp:1599
+#: ui/k_mnu.cpp:523 ui/k_new_mnu.cpp:1588
 msgid "&Start New Session"
 msgstr "启动新会话(&S)"
 
-#: ui/k_new_mnu.cpp:223
+#: ui/k_new_mnu.cpp:212
 msgid "User&nbsp;<b>%1</b>&nbsp;on&nbsp;<b>%2</b>"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:242
+#: ui/k_new_mnu.cpp:231
 msgid "Most commonly used applications and documents"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:245
+#: ui/k_new_mnu.cpp:234
 #, fuzzy
 msgid "List of installed applications"
 msgstr "最常使用的应用程序"
 
-#: ui/k_new_mnu.cpp:250
+#: ui/k_new_mnu.cpp:239
 msgid ""
 "Information and configuration of your system, access to personal files, "
 "network resources and connected disk drives"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:259
+#: ui/k_new_mnu.cpp:248
 #, fuzzy
 msgid "Recently used applications and documents"
 msgstr "最近用过的应用程序"
 
-#: ui/k_new_mnu.cpp:263
+#: ui/k_new_mnu.cpp:252
 msgid "<qt>Logout, switch user, switch off or reset, suspend of the system"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:267
+#: ui/k_new_mnu.cpp:256
 msgid "<p align=\"center\"> <u>F</u>avorites</p>"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:268
+#: ui/k_new_mnu.cpp:257
 msgid "<p align=\"center\"><u>H</u>istory</p>"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:270
+#: ui/k_new_mnu.cpp:259
 msgid "<p align=\"center\"> <u>C</u>omputer</p>"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:271
+#: ui/k_new_mnu.cpp:260
 msgid "<p align=\"center\"><u>A</u>pplications</p>"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:273
+#: ui/k_new_mnu.cpp:262
 msgid "<p align=\"center\"><u>L</u>eave</p>"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:333
+#: ui/k_new_mnu.cpp:322
 msgid "Search Internet"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:345
+#: ui/k_new_mnu.cpp:334
 #, fuzzy
 msgid "Search Index"
 msgstr "搜索(&S)："
 
-#: ui/k_new_mnu.cpp:434
+#: ui/k_new_mnu.cpp:423
 #, fuzzy
 msgid "Applications, Contacts and Documents"
 msgstr "应用程序、任务和桌面会话"
 
-#: ui/k_new_mnu.cpp:944
+#: ui/k_new_mnu.cpp:933
 msgid "Start '%1'"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:946
+#: ui/k_new_mnu.cpp:935
 msgid "Start '%1' (current)"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:948
+#: ui/k_new_mnu.cpp:937
 msgid "Restart and boot directly into '%1'"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:956
+#: ui/k_new_mnu.cpp:945
 #, fuzzy
 msgid "Start a parallel session"
 msgstr "启动新会话"
 
-#: ui/k_new_mnu.cpp:959
+#: ui/k_new_mnu.cpp:948
 #, fuzzy
 msgid "Lock screen and start a parallel session"
 msgstr "锁住当前会话并启动新会话"
 
-#: ui/k_new_mnu.cpp:970
+#: ui/k_new_mnu.cpp:959
 msgid "Switch to Session of User '%1'"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:971
+#: ui/k_new_mnu.cpp:960
 #, fuzzy, c-format
 msgid "Session: %1"
 msgstr "保存会话"
 
-#: ui/k_new_mnu.cpp:1357
+#: ui/k_new_mnu.cpp:1346
 #, fuzzy
 msgid "Session"
 msgstr "保存会话"
 
-#: ui/k_new_mnu.cpp:1359
-#, fuzzy
-msgid "Log out"
-msgstr "注销..."
+#: ui/k_new_mnu.cpp:1348
+msgid "Logout"
+msgstr ""
 
-#: ui/k_new_mnu.cpp:1360
+#: ui/k_new_mnu.cpp:1349
 #, fuzzy
-msgid "End current session"
+msgid "End session"
 msgstr "保存会话"
 
-#: ui/k_new_mnu.cpp:1362
+#: ui/k_new_mnu.cpp:1351
 msgid "Lock"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:1363
+#: ui/k_new_mnu.cpp:1352
 #, fuzzy
-msgid "Lock computer screen"
+msgid "Lock screen"
 msgstr "锁住会话"
 
-#: ui/k_new_mnu.cpp:1370
+#: ui/k_new_mnu.cpp:1359
 msgid "Save current Session for next login"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:1376
+#: ui/k_new_mnu.cpp:1365
 msgid "Manage parallel sessions"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:1393
+#: ui/k_new_mnu.cpp:1382
 msgid "System"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:1394
-msgid "Shutdown"
+#: ui/k_new_mnu.cpp:1383
+msgid "Shutdown Computer"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:1395
+#: ui/k_new_mnu.cpp:1384
 msgid "Turn off computer"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:1397
-msgid "&Restart"
+#: ui/k_new_mnu.cpp:1386
+msgid "&Restart Computer"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:1398
-msgid "Restart computer and boot the default system"
+#: ui/k_new_mnu.cpp:1387
+msgid "Restart and boot the default system"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:1408
+#: ui/k_new_mnu.cpp:1397
 msgid "Start Operating System"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:1409
+#: ui/k_new_mnu.cpp:1398
 msgid "Restart and boot another operating system"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:1444
+#: ui/k_new_mnu.cpp:1433
 #, fuzzy
 msgid "System Folders"
 msgstr "选择文件夹"
 
-#: ui/k_new_mnu.cpp:1446
+#: ui/k_new_mnu.cpp:1435
 #, fuzzy
 msgid "Home Folder"
 msgstr "主文件夹(&H)"
 
-#: ui/k_new_mnu.cpp:1455
+#: ui/k_new_mnu.cpp:1444
 msgid "My Documents"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:1464
+#: ui/k_new_mnu.cpp:1453
 msgid "My Images"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:1473
+#: ui/k_new_mnu.cpp:1462
 msgid "My Music"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:1482
+#: ui/k_new_mnu.cpp:1471
 msgid "My Videos"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:1491
+#: ui/k_new_mnu.cpp:1480
 msgid "My Downloads"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:1494
+#: ui/k_new_mnu.cpp:1483
 #, fuzzy
 msgid "Network Folders"
 msgstr "选择文件夹"
 
-#: ui/k_new_mnu.cpp:1719
+#: ui/k_new_mnu.cpp:1708
 msgid ""
 "<center><b>%1</b></center>\n"
 "You do not have permission to execute this command."
 msgstr ""
 
-#: ui/k_new_mnu.cpp:1747
+#: ui/k_new_mnu.cpp:1736
 msgid ""
 "<center><b>%1</b></center>\n"
 "Could not run the specified command."
 msgstr ""
 
-#: ui/k_new_mnu.cpp:1757
+#: ui/k_new_mnu.cpp:1746
 msgid ""
 "<center><b>%1</b></center>\n"
 "The specified command does not exist."
 msgstr ""
 
-#: ui/k_new_mnu.cpp:1955
+#: ui/k_new_mnu.cpp:1944
 msgid "Documents"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:2291 ui/k_new_mnu.cpp:2421
+#: ui/k_new_mnu.cpp:2280 ui/k_new_mnu.cpp:2410
 #, c-format
 msgid "Send Email to %1"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:2302
+#: ui/k_new_mnu.cpp:2291
 #, c-format
 msgid "Open Addressbook at %1"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:2343
+#: ui/k_new_mnu.cpp:2332
 msgid "- Add ext:type to specify a file extension."
 msgstr ""
 
-#: ui/k_new_mnu.cpp:2346
+#: ui/k_new_mnu.cpp:2335
 msgid "- When searching for a phrase, add quotes."
 msgstr ""
 
-#: ui/k_new_mnu.cpp:2349
+#: ui/k_new_mnu.cpp:2338
 msgid "- To exclude search terms, use the minus symbol in front."
 msgstr ""
 
-#: ui/k_new_mnu.cpp:2352
+#: ui/k_new_mnu.cpp:2341
 msgid "- To search for optional terms, use OR."
 msgstr ""
 
-#: ui/k_new_mnu.cpp:2355
+#: ui/k_new_mnu.cpp:2344
 msgid "- You can use upper and lower case."
 msgstr ""
 
-#: ui/k_new_mnu.cpp:2358
+#: ui/k_new_mnu.cpp:2347
 msgid "Search Quick Tips"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:2410
+#: ui/k_new_mnu.cpp:2399
 msgid "%1 = %2"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:2442
+#: ui/k_new_mnu.cpp:2431
 #, c-format
 msgid "Open Local File: %1"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:2445
+#: ui/k_new_mnu.cpp:2434
 #, c-format
 msgid "Open Local Dir: %1"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:2448
+#: ui/k_new_mnu.cpp:2437
 #, c-format
 msgid "Open Remote Location: %1"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:2476
+#: ui/k_new_mnu.cpp:2465
 msgid "Run '%1'"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:2521 ui/k_new_mnu.cpp:2594
+#: ui/k_new_mnu.cpp:2510 ui/k_new_mnu.cpp:2583
 msgid "No matches found"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:2646
+#: ui/k_new_mnu.cpp:2635
 msgid "top %1 of %2"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:2648
+#: ui/k_new_mnu.cpp:2637
 msgid "%1 (top %2 of %3)"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:2782
+#: ui/k_new_mnu.cpp:2768
 msgid "Do you really want to reset the computer and boot Microsoft Windows"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:2782
+#: ui/k_new_mnu.cpp:2768
 #, fuzzy
 msgid "Start Windows Confirmation"
 msgstr "快速浏览器配置"
 
-#: ui/k_new_mnu.cpp:2782
+#: ui/k_new_mnu.cpp:2768
 msgid "Start Windows"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:2807
+#: ui/k_new_mnu.cpp:2793
 msgid "Could not start Tomboy."
 msgstr ""
 
-#: ui/k_new_mnu.cpp:2867
+#: ui/k_new_mnu.cpp:2853
 #, fuzzy
 msgid "Remove From Favorites"
 msgstr "从面板删除(&R)"
 
-#: ui/k_new_mnu.cpp:2874
+#: ui/k_new_mnu.cpp:2860
 #, fuzzy
 msgid "Add to Favorites"
 msgstr "添加到面板(&A)"
 
-#: ui/k_new_mnu.cpp:2905 ui/service_mnu.cpp:630
+#: ui/k_new_mnu.cpp:2891 ui/service_mnu.cpp:630
 msgid "Add Menu to Desktop"
 msgstr "将菜单添加到桌面"
 
-#: ui/k_new_mnu.cpp:2908 ui/service_mnu.cpp:603
+#: ui/k_new_mnu.cpp:2894 ui/service_mnu.cpp:603
 msgid "Add Item to Desktop"
 msgstr "将项目添加到桌面"
 
-#: ui/k_new_mnu.cpp:2915 ui/service_mnu.cpp:636
+#: ui/k_new_mnu.cpp:2901 ui/service_mnu.cpp:636
 msgid "Add Menu to Main Panel"
 msgstr "将菜单添加到主面板"
 
-#: ui/k_new_mnu.cpp:2918 ui/service_mnu.cpp:609
+#: ui/k_new_mnu.cpp:2904 ui/service_mnu.cpp:609
 msgid "Add Item to Main Panel"
 msgstr "将项目添加到主面板"
 
-#: ui/k_new_mnu.cpp:2924 ui/service_mnu.cpp:642
+#: ui/k_new_mnu.cpp:2910 ui/service_mnu.cpp:642
 msgid "Edit Menu"
 msgstr "编辑菜单"
 
-#: ui/k_new_mnu.cpp:2926 ui/service_mnu.cpp:615
+#: ui/k_new_mnu.cpp:2912 ui/service_mnu.cpp:615
 msgid "Edit Item"
 msgstr "编辑项"
 
-#: ui/k_new_mnu.cpp:2932 ui/service_mnu.cpp:621
+#: ui/k_new_mnu.cpp:2918 ui/service_mnu.cpp:621
 msgid "Put Into Run Dialog"
 msgstr "放入运行对话框"
 
-#: ui/k_new_mnu.cpp:2960
+#: ui/k_new_mnu.cpp:2946
 msgid "Advanced"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:2976
+#: ui/k_new_mnu.cpp:2962
 #, fuzzy
 msgid "Clear Recently Used Applications"
 msgstr "最近用过的应用程序"
 
-#: ui/k_new_mnu.cpp:2979
+#: ui/k_new_mnu.cpp:2965
 #, fuzzy
 msgid "Clear Recently Used Documents"
 msgstr "最近用过的应用程序"
 
-#: ui/k_new_mnu.cpp:3564
+#: ui/k_new_mnu.cpp:3550
 msgid "Media"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:3623
+#: ui/k_new_mnu.cpp:3609
 msgid "(%1 available)"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:3754 ui/k_new_mnu.cpp:3758
+#: ui/k_new_mnu.cpp:3740 ui/k_new_mnu.cpp:3744
 #, c-format
 msgid "Directory: %1"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:3849 ui/k_new_mnu.cpp:3875
-msgid "Suspend"
-msgstr ""
-
-#: ui/k_new_mnu.cpp:3859
-msgid "Freeze"
-msgstr ""
-
-#: ui/k_new_mnu.cpp:3860
-msgid "Put the computer in software idle mode"
-msgstr ""
-
-#: ui/k_new_mnu.cpp:3867
-msgid "Standby"
+#: ui/k_new_mnu.cpp:3836
+msgid "Suspend to Disk"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:3868
+#: ui/k_new_mnu.cpp:3837 ui/k_new_mnu.cpp:3845 ui/k_new_mnu.cpp:3853
+#: ui/k_new_mnu.cpp:3861
 msgid "Pause without logging out"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:3876
+#: ui/k_new_mnu.cpp:3844
 msgid "Suspend to RAM"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:3883
-msgid "Hibernate"
-msgstr ""
-
-#: ui/k_new_mnu.cpp:3884
-msgid "Suspend to Disk"
-msgstr ""
-
-#: ui/k_new_mnu.cpp:3891
-msgid "Hybrid Suspend"
+#: ui/k_new_mnu.cpp:3852
+msgid "Freeze"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:3892
-msgid "Suspend to RAM + Disk"
+#: ui/k_new_mnu.cpp:3860
+msgid "Standby"
 msgstr ""
 
-#: ui/k_new_mnu.cpp:3973
+#: ui/k_new_mnu.cpp:3931
 msgid "Suspend failed"
 msgstr ""
 
@@ -1187,6 +1167,10 @@ msgid "&Description:"
 msgstr "描述(&D)："
 
 #, fuzzy
+#~ msgid "Log out"
+#~ msgstr "注销..."
+
+#, fuzzy
 #~ msgid "Bookmarks"
 #~ msgstr "编辑书签(&E)"