Merge translation files from master branch.

1 files changed, 36 insertions, 41 deletions

diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdeio.po b/tde-i18n-zh_CN/messages/tdelibs/tdeio.po
index f83a4858ca8..ff5b29346c4 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdeio.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdeio.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdelibs\n"
-"POT-Creation-Date: 2020-02-03 00:48+0100\n"
+"POT-Creation-Date: 2020-02-09 23:51+0100\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"
@@ -717,7 +717,7 @@ msgstr ""
 "<qt>应用程序“<b>%1</b>”请求打开钱包“<b>%2</b>”。请在下面输入此钱包的密码。"
 
 #: misc/tdewalletd/tdewalletd.cpp:443 misc/tdewalletd/tdewalletd.cpp:457
-#: tdefile/tdefiledialog.cpp:1847
+#: tdefile/tdefiledialog.cpp:1841
 msgid "&Open"
 msgstr "打开(&O)"
 
@@ -2043,46 +2043,41 @@ msgstr ""
 "<qt><b>快速访问</b>面板提供对常用文件位置的简便访问。<p>单击快捷项就会将您带"
 "到相应位置。<p>用鼠标右键单击项，可以添加、编辑或删除快捷方式。</qt>"
 
-#: tdefile/kurlbar.cpp:620
-#, fuzzy
-msgid "Desktop Search"
-msgstr "桌面"
-
-#: tdefile/kurlbar.cpp:745
+#: tdefile/kurlbar.cpp:736
 msgid "&Large Icons"
 msgstr "大图标(&L)"
 
-#: tdefile/kurlbar.cpp:745
+#: tdefile/kurlbar.cpp:736
 msgid "&Small Icons"
 msgstr "小图标(&S)"
 
-#: tdefile/kurlbar.cpp:751
+#: tdefile/kurlbar.cpp:742
 msgid "&Edit Entry..."
 msgstr "编辑项目(&E)..."
 
-#: tdefile/kurlbar.cpp:755
+#: tdefile/kurlbar.cpp:746
 msgid "&Add Entry..."
 msgstr "添加项目(&A)..."
 
-#: tdefile/kurlbar.cpp:759
+#: tdefile/kurlbar.cpp:750
 msgid "&Remove Entry"
 msgstr "删除项目(&R)"
 
-#: tdefile/kurlbar.cpp:791
+#: tdefile/kurlbar.cpp:782
 msgid "Enter a description"
 msgstr "输入描述"
 
-#: tdefile/kurlbar.cpp:937
+#: tdefile/kurlbar.cpp:928
 msgid "Edit Quick Access Entry"
 msgstr "编辑快速访问项目"
 
-#: tdefile/kurlbar.cpp:940
+#: tdefile/kurlbar.cpp:931
 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:947
+#: tdefile/kurlbar.cpp:938
 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 "
@@ -2091,12 +2086,12 @@ msgstr ""
 "<qt>这是将出现在快速访问面板中的文字。<p>描述应该由一两个词组成，以便帮助您记"
 "住本项的含义。</qt>"
 
-#: tdefile/kpropertiesdesktopbase.ui:125 tdefile/kurlbar.cpp:950
+#: tdefile/kpropertiesdesktopbase.ui:125 tdefile/kurlbar.cpp:941
 #, no-c-format
 msgid "&Description:"
 msgstr "描述(&D)："
 
-#: tdefile/kurlbar.cpp:957
+#: tdefile/kurlbar.cpp:948
 #, fuzzy
 msgid ""
 "<qt>This is the location associated with the entry. Any valid URL may be "
@@ -2108,26 +2103,26 @@ msgstr ""
 "kde.org<br>ftp://ftp.kde.org/pub/kde/stable<p>单击文本编辑框旁边的按钮可以浏"
 "览相应的 URL。</qt>"
 
-#: tdefile/kurlbar.cpp:961
+#: tdefile/kurlbar.cpp:952
 msgid "&URL:"
 msgstr "&URL："
 
-#: tdefile/kurlbar.cpp:968
+#: tdefile/kurlbar.cpp:959
 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:970
+#: tdefile/kurlbar.cpp:961
 msgid "Choose an &icon:"
 msgstr "选择图标(&I)："
 
-#: tdefile/kurlbar.cpp:986
+#: tdefile/kurlbar.cpp:977
 msgid "&Only show when using this application (%1)"
 msgstr "仅在使用此程序(%1)时显示(&O)"
 
-#: tdefile/kurlbar.cpp:989
+#: tdefile/kurlbar.cpp:980
 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 "
@@ -2294,12 +2289,12 @@ msgid "Please select the file to open."
 msgstr "请选择要打开的文件。"
 
 #: tdefile/tdefiledialog.cpp:414 tdefile/tdefiledialog.cpp:457
-#: tdefile/tdefiledialog.cpp:1564
+#: tdefile/tdefiledialog.cpp:1558
 msgid "You can only select local files."
 msgstr "只能选择本地文件。"
 
 #: tdefile/tdefiledialog.cpp:415 tdefile/tdefiledialog.cpp:458
-#: tdefile/tdefiledialog.cpp:1565
+#: tdefile/tdefiledialog.cpp:1559
 msgid "Remote Files Not Accepted"
 msgstr "不接受远程文件"
 
@@ -2444,21 +2439,17 @@ msgstr ""
 msgid "&Filter:"
 msgstr "过滤(&F)："
 
-#: tdefile/tdefiledialog.cpp:1177
-msgid "search term"
-msgstr ""
-
-#: tdefile/tdefiledialog.cpp:1494
+#: tdefile/tdefiledialog.cpp:1488
 msgid ""
 "The chosen filenames do not\n"
 "appear to be valid."
 msgstr "选中的文件名似乎无效。"
 
-#: tdefile/tdefiledialog.cpp:1496
+#: tdefile/tdefiledialog.cpp:1490
 msgid "Invalid Filenames"
 msgstr "无效的文件名"
 
-#: tdefile/tdefiledialog.cpp:1526
+#: tdefile/tdefiledialog.cpp:1520
 msgid ""
 "The requested filenames\n"
 "%1\n"
@@ -2470,35 +2461,35 @@ msgstr ""
 "似乎无效；\n"
 "请确定将每个文件名包括在双引号内。"
 
-#: tdefile/tdefiledialog.cpp:1530
+#: tdefile/tdefiledialog.cpp:1524
 msgid "Filename Error"
 msgstr "文件名错误"
 
-#: tdefile/tdefiledialog.cpp:1687
+#: tdefile/tdefiledialog.cpp:1681
 msgid "*|All Folders"
 msgstr "*|全部文件夹"
 
-#: tdefile/tdefiledialog.cpp:1690 tdefile/tdefilefiltercombo.cpp:32
+#: tdefile/tdefiledialog.cpp:1684 tdefile/tdefilefiltercombo.cpp:32
 msgid "*|All Files"
 msgstr "*|全部文件"
 
-#: tdefile/tdefiledialog.cpp:1987
+#: tdefile/tdefiledialog.cpp:1981
 msgid "Automatically select filename e&xtension (%1)"
 msgstr "自动选择文件扩展名(%1)(&X)"
 
-#: tdefile/tdefiledialog.cpp:1988
+#: tdefile/tdefiledialog.cpp:1982
 msgid "the extension <b>%1</b>"
 msgstr "扩展名 <b>%1</b>"
 
-#: tdefile/tdefiledialog.cpp:1996
+#: tdefile/tdefiledialog.cpp:1990
 msgid "Automatically select filename e&xtension"
 msgstr "自动选择文件扩展名(&X)"
 
-#: tdefile/tdefiledialog.cpp:1997
+#: tdefile/tdefiledialog.cpp:1991
 msgid "a suitable extension"
 msgstr "适合的扩展名"
 
-#: tdefile/tdefiledialog.cpp:2008
+#: tdefile/tdefiledialog.cpp:2002
 msgid ""
 "This option enables some convenient features for saving files with "
 "extensions:<br><ol><li>Any extension specified in the <b>%1</b> text area "
@@ -2520,7 +2511,7 @@ msgstr ""
 "会被自动去掉)。</li></ol>如果不确定的话，请保持此选项有效，这样会使得您的文件"
 "更容易管理。"
 
-#: tdefile/tdefiledialog.cpp:2282
+#: 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 "
@@ -6103,6 +6094,10 @@ msgstr ""
 #~ msgstr "未知的错误"
 
 #, fuzzy
+#~ msgid "Desktop Search"
+#~ msgstr "桌面"
+
+#, fuzzy
 #~ msgid "Bookmarks"
 #~ msgstr "书签"