Merge translation files from master branch.

1 files changed, 36 insertions, 41 deletions

diff --git a/tde-i18n-nb/messages/tdelibs/tdeio.po b/tde-i18n-nb/messages/tdelibs/tdeio.po
index 4c4d86eb974..a91a5e3d102 100644
--- a/tde-i18n-nb/messages/tdelibs/tdeio.po
+++ b/tde-i18n-nb/messages/tdelibs/tdeio.po
@@ -15,7 +15,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: 2007-03-17 11:22+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -743,7 +743,7 @@ msgstr ""
 "passord for denne lommeboka nedenfor."
 
 #: misc/tdewalletd/tdewalletd.cpp:443 misc/tdewalletd/tdewalletd.cpp:457
-#: tdefile/tdefiledialog.cpp:1847
+#: tdefile/tdefiledialog.cpp:1841
 msgid "&Open"
 msgstr "&Åpne"
 
@@ -2132,47 +2132,42 @@ msgstr ""
 "bruker. <p>Du kan trykke på en snarvei for å gå direkte dit. <p>Bruk høyre "
 "museknapp for å legge til, endre eller fjerne oppføringer.</qt>"
 
-#: tdefile/kurlbar.cpp:620
-#, fuzzy
-msgid "Desktop Search"
-msgstr "Skrivebord"
-
-#: tdefile/kurlbar.cpp:745
+#: tdefile/kurlbar.cpp:736
 msgid "&Large Icons"
 msgstr "&Store ikoner"
 
-#: tdefile/kurlbar.cpp:745
+#: tdefile/kurlbar.cpp:736
 msgid "&Small Icons"
 msgstr "S&må ikoner"
 
-#: tdefile/kurlbar.cpp:751
+#: tdefile/kurlbar.cpp:742
 msgid "&Edit Entry..."
 msgstr "&Rediger oppføring …"
 
-#: tdefile/kurlbar.cpp:755
+#: tdefile/kurlbar.cpp:746
 msgid "&Add Entry..."
 msgstr "&Legg til oppføring …"
 
-#: tdefile/kurlbar.cpp:759
+#: tdefile/kurlbar.cpp:750
 msgid "&Remove Entry"
 msgstr "&Fjern oppføring"
 
-#: tdefile/kurlbar.cpp:791
+#: tdefile/kurlbar.cpp:782
 msgid "Enter a description"
 msgstr "Oppgi en beskrivelse"
 
-#: tdefile/kurlbar.cpp:937
+#: tdefile/kurlbar.cpp:928
 msgid "Edit Quick Access Entry"
 msgstr "Rediger snarvei"
 
-#: 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>Oppgi beskrivelse, URL og ikon for denne snarveien.</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 "
@@ -2181,12 +2176,12 @@ msgstr ""
 "<qt>Teksten som skal vises i hurtigpanelet. <p>Beskrivelsen bør være ett "
 "eller to ord som minner deg om hvor snarveien fører.</qt>"
 
-#: tdefile/kpropertiesdesktopbase.ui:125 tdefile/kurlbar.cpp:950
+#: tdefile/kpropertiesdesktopbase.ui:125 tdefile/kurlbar.cpp:941
 #, no-c-format
 msgid "&Description:"
 msgstr "&Beskrivelse:"
 
-#: tdefile/kurlbar.cpp:957
+#: tdefile/kurlbar.cpp:948
 #, fuzzy
 msgid ""
 "<qt>This is the location associated with the entry. Any valid URL may be "
@@ -2199,11 +2194,11 @@ msgstr ""
 "pub/kde/stable <p>Du kan bla deg fram til adressen ved å bruken knappen ved "
 "siden av skrivefeltet.</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>"
@@ -2211,15 +2206,15 @@ msgstr ""
 "<qt>Dette er ikonet som blir vist i hurtigpanelet. <p>Trykk på knappen for å "
 "velge et annet ikon.</qt>"
 
-#: tdefile/kurlbar.cpp:970
+#: tdefile/kurlbar.cpp:961
 msgid "Choose an &icon:"
 msgstr "Velg et &ikon:"
 
-#: tdefile/kurlbar.cpp:986
+#: tdefile/kurlbar.cpp:977
 msgid "&Only show when using this application (%1)"
 msgstr "&Vis bare i dette programmet (%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 "
@@ -2391,12 +2386,12 @@ msgid "Please select the file to open."
 msgstr "Velg fil som skal åpnes."
 
 #: tdefile/tdefiledialog.cpp:414 tdefile/tdefiledialog.cpp:457
-#: tdefile/tdefiledialog.cpp:1564
+#: tdefile/tdefiledialog.cpp:1558
 msgid "You can only select local files."
 msgstr "Du kan bare velge lokale filer."
 
 #: tdefile/tdefiledialog.cpp:415 tdefile/tdefiledialog.cpp:458
-#: tdefile/tdefiledialog.cpp:1565
+#: tdefile/tdefiledialog.cpp:1559
 msgid "Remote Files Not Accepted"
 msgstr "Kan ikke bruke filer fra andre maskiner"
 
@@ -2547,11 +2542,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."
@@ -2559,11 +2550,11 @@ msgstr ""
 "De valgte filnavnene ser\n"
 "ikke ut til å være gyldige."
 
-#: tdefile/tdefiledialog.cpp:1496
+#: tdefile/tdefiledialog.cpp:1490
 msgid "Invalid Filenames"
 msgstr "Ugyldig(e) filnavn"
 
-#: tdefile/tdefiledialog.cpp:1526
+#: tdefile/tdefiledialog.cpp:1520
 msgid ""
 "The requested filenames\n"
 "%1\n"
@@ -2575,35 +2566,35 @@ msgstr ""
 "ser ikke ut til å være gyldige.\n"
 "Se til at alle filnavn ligger inne i doble hermetegn."
 
-#: tdefile/tdefiledialog.cpp:1530
+#: tdefile/tdefiledialog.cpp:1524
 msgid "Filename Error"
 msgstr "Filnavnfeil"
 
-#: tdefile/tdefiledialog.cpp:1687
+#: tdefile/tdefiledialog.cpp:1681
 msgid "*|All Folders"
 msgstr "*|Alle mapper"
 
-#: tdefile/tdefiledialog.cpp:1690 tdefile/tdefilefiltercombo.cpp:32
+#: tdefile/tdefiledialog.cpp:1684 tdefile/tdefilefiltercombo.cpp:32
 msgid "*|All Files"
 msgstr "*|Alle filer"
 
-#: tdefile/tdefiledialog.cpp:1987
+#: tdefile/tdefiledialog.cpp:1981
 msgid "Automatically select filename e&xtension (%1)"
 msgstr "Velg automatisk fil&etternavn (%1)"
 
-#: tdefile/tdefiledialog.cpp:1988
+#: tdefile/tdefiledialog.cpp:1982
 msgid "the extension <b>%1</b>"
 msgstr "etternavnet <b>%1</b>"
 
-#: tdefile/tdefiledialog.cpp:1996
+#: tdefile/tdefiledialog.cpp:1990
 msgid "Automatically select filename e&xtension"
 msgstr "Velg automatisk fil&etternavn"
 
-#: tdefile/tdefiledialog.cpp:1997
+#: tdefile/tdefiledialog.cpp:1991
 msgid "a suitable extension"
 msgstr "et passende etternavn"
 
-#: 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 "
@@ -2629,7 +2620,7 @@ msgstr ""
 "automatisk fjernet).</li></ol> Hvis du ikke er sikker, så behold valget "
 "slått på, fordi det gjør det lettere å holde styr på filene dine."
 
-#: 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 "
@@ -6398,6 +6389,10 @@ msgstr ""
 #~ msgstr "Ukjent feil"
 
 #, fuzzy
+#~ msgid "Desktop Search"
+#~ msgstr "Skrivebord"
+
+#, fuzzy
 #~ msgid "Bookmarks"
 #~ msgstr "Bokmerke"