Merge translation files from master branch.

1 files changed, 36 insertions, 41 deletions

diff --git a/tde-i18n-en_GB/messages/tdelibs/tdeio.po b/tde-i18n-en_GB/messages/tdelibs/tdeio.po
index d8fdee6033b..eb64285ca4e 100644
--- a/tde-i18n-en_GB/messages/tdelibs/tdeio.po
+++ b/tde-i18n-en_GB/messages/tdelibs/tdeio.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio\n"
-"POT-Creation-Date: 2020-02-03 00:48+0100\n"
+"POT-Creation-Date: 2020-02-09 23:51+0100\n"
 "PO-Revision-Date: 2006-12-07 23:48+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -732,7 +732,7 @@ msgstr ""
 "b>'. Please enter the password for this wallet below."
 
 #: misc/tdewalletd/tdewalletd.cpp:443 misc/tdewalletd/tdewalletd.cpp:457
-#: tdefile/tdefiledialog.cpp:1847
+#: tdefile/tdefiledialog.cpp:1841
 msgid "&Open"
 msgstr "&Open"
 
@@ -2111,40 +2111,35 @@ msgstr ""
 "location.<p>By right clicking on an entry you can add, edit and remove "
 "shortcuts.</qt>"
 
-#: tdefile/kurlbar.cpp:620
-#, fuzzy
-msgid "Desktop Search"
-msgstr "Desktop"
-
-#: tdefile/kurlbar.cpp:745
+#: tdefile/kurlbar.cpp:736
 msgid "&Large Icons"
 msgstr "&Large Icons"
 
-#: tdefile/kurlbar.cpp:745
+#: tdefile/kurlbar.cpp:736
 msgid "&Small Icons"
 msgstr "&Small Icons"
 
-#: tdefile/kurlbar.cpp:751
+#: tdefile/kurlbar.cpp:742
 msgid "&Edit Entry..."
 msgstr "&Edit Entry..."
 
-#: tdefile/kurlbar.cpp:755
+#: tdefile/kurlbar.cpp:746
 msgid "&Add Entry..."
 msgstr "&Add Entry..."
 
-#: tdefile/kurlbar.cpp:759
+#: tdefile/kurlbar.cpp:750
 msgid "&Remove Entry"
 msgstr "&Remove Entry"
 
-#: tdefile/kurlbar.cpp:791
+#: tdefile/kurlbar.cpp:782
 msgid "Enter a description"
 msgstr "Enter a description"
 
-#: tdefile/kurlbar.cpp:937
+#: tdefile/kurlbar.cpp:928
 msgid "Edit Quick Access Entry"
 msgstr "Edit Quick Access Entry"
 
-#: 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>"
@@ -2152,7 +2147,7 @@ msgstr ""
 "<qt><b>Please provide a description, URL and icon for this Quick Access "
 "entry.</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 "
@@ -2162,12 +2157,12 @@ msgstr ""
 "description should consist of one or two words that will help you remember "
 "what this entry refers to.</qt>"
 
-#: tdefile/kpropertiesdesktopbase.ui:125 tdefile/kurlbar.cpp:950
+#: tdefile/kpropertiesdesktopbase.ui:125 tdefile/kurlbar.cpp:941
 #, no-c-format
 msgid "&Description:"
 msgstr "&Description:"
 
-#: tdefile/kurlbar.cpp:957
+#: tdefile/kurlbar.cpp:948
 #, fuzzy
 msgid ""
 "<qt>This is the location associated with the entry. Any valid URL may be "
@@ -2180,11 +2175,11 @@ msgstr ""
 "stable<p>By clicking on the button next to the text edit box you can browse "
 "to an appropriate 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>"
@@ -2192,15 +2187,15 @@ msgstr ""
 "<qt>This is the icon that will appear in the Quick Access panel.<p>Click on "
 "the button to select a different icon.</qt>"
 
-#: tdefile/kurlbar.cpp:970
+#: tdefile/kurlbar.cpp:961
 msgid "Choose an &icon:"
 msgstr "Choose an &icon:"
 
-#: tdefile/kurlbar.cpp:986
+#: tdefile/kurlbar.cpp:977
 msgid "&Only show when using this application (%1)"
 msgstr "&Only show when using this application (%1)"
 
-#: 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 "
@@ -2372,12 +2367,12 @@ msgid "Please select the file to open."
 msgstr "Please select the file to open."
 
 #: tdefile/tdefiledialog.cpp:414 tdefile/tdefiledialog.cpp:457
-#: tdefile/tdefiledialog.cpp:1564
+#: tdefile/tdefiledialog.cpp:1558
 msgid "You can only select local files."
 msgstr "You can only select local files."
 
 #: tdefile/tdefiledialog.cpp:415 tdefile/tdefiledialog.cpp:458
-#: tdefile/tdefiledialog.cpp:1565
+#: tdefile/tdefiledialog.cpp:1559
 msgid "Remote Files Not Accepted"
 msgstr "Remote Files Not Accepted"
 
@@ -2529,11 +2524,7 @@ msgstr ""
 msgid "&Filter:"
 msgstr "&Filter:"
 
-#: 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."
@@ -2541,11 +2532,11 @@ msgstr ""
 "The chosen filenames do not\n"
 "appear to be valid."
 
-#: tdefile/tdefiledialog.cpp:1496
+#: tdefile/tdefiledialog.cpp:1490
 msgid "Invalid Filenames"
 msgstr "Invalid Filenames"
 
-#: tdefile/tdefiledialog.cpp:1526
+#: tdefile/tdefiledialog.cpp:1520
 msgid ""
 "The requested filenames\n"
 "%1\n"
@@ -2557,35 +2548,35 @@ msgstr ""
 "do not appear to be valid;\n"
 "make sure every filename is enclosed in double quotes."
 
-#: tdefile/tdefiledialog.cpp:1530
+#: tdefile/tdefiledialog.cpp:1524
 msgid "Filename Error"
 msgstr "Filename Error"
 
-#: tdefile/tdefiledialog.cpp:1687
+#: tdefile/tdefiledialog.cpp:1681
 msgid "*|All Folders"
 msgstr "*|All Folders"
 
-#: tdefile/tdefiledialog.cpp:1690 tdefile/tdefilefiltercombo.cpp:32
+#: tdefile/tdefiledialog.cpp:1684 tdefile/tdefilefiltercombo.cpp:32
 msgid "*|All Files"
 msgstr "*|All Files"
 
-#: tdefile/tdefiledialog.cpp:1987
+#: tdefile/tdefiledialog.cpp:1981
 msgid "Automatically select filename e&xtension (%1)"
 msgstr "Automatically select filename e&xtension (%1)"
 
-#: tdefile/tdefiledialog.cpp:1988
+#: tdefile/tdefiledialog.cpp:1982
 msgid "the extension <b>%1</b>"
 msgstr "the extension <b>%1</b>"
 
-#: tdefile/tdefiledialog.cpp:1996
+#: tdefile/tdefiledialog.cpp:1990
 msgid "Automatically select filename e&xtension"
 msgstr "Automatically select filename e&xtension"
 
-#: tdefile/tdefiledialog.cpp:1997
+#: tdefile/tdefiledialog.cpp:1991
 msgid "a suitable extension"
 msgstr "a suitable extension"
 
-#: 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 "
@@ -2611,7 +2602,7 @@ msgstr ""
 "automatically removed).</li></ol>If unsure, keep this option enabled as it "
 "makes your files more manageable."
 
-#: 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 "
@@ -6405,6 +6396,10 @@ msgstr ""
 #~ msgstr "Unknown Error"
 
 #, fuzzy
+#~ msgid "Desktop Search"
+#~ msgstr "Desktop"
+
+#, fuzzy
 #~ msgid "Bookmarks"
 #~ msgstr "Bookmark"