Merge translation files from master branch.

1 files changed, 60 insertions, 37 deletions

diff --git a/tde-i18n-nb/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-nb/messages/tdebase/kcmcomponentchooser.po
index ab9ce7603fd..fb0eee3ee07 100644
--- a/tde-i18n-nb/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-nb/messages/tdebase/kcmcomponentchooser.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\n"
-"POT-Creation-Date: 2020-02-16 23:35+0100\n"
+"POT-Creation-Date: 2020-02-23 20:08+0100\n"
 "PO-Revision-Date: 2006-02-25 22:02+0100\n"
 "Last-Translator: Bjørn Steensrud <[email protected]>\n"
 "Language-Team: Norwegian Bokmål <[email protected]>\n"
@@ -31,39 +31,34 @@ msgid ""
 "Your emails"
 msgstr "[email protected]"
 
-#: componentchooser.cpp:165
+#: componentchooser.cpp:166
 msgid "Select preferred email client:"
 msgstr "Velg hvilket e-postprogram du foretrekker:"
 
-#: componentchooser.cpp:271
-#, fuzzy
-msgid "Select preferred file manager application:"
-msgstr "Velg hvilket terminalprogram du foretrekker:"
-
-#: componentchooser.cpp:342
+#: componentchooser.cpp:309
 msgid "Select preferred terminal application:"
 msgstr "Velg hvilket terminalprogram du foretrekker:"
 
-#: componentchooser.cpp:437
+#: componentchooser.cpp:404
 msgid "Select preferred Web browser application:"
 msgstr "Velg hvilken nettleser du foretrekker:"
 
-#: componentchooser.cpp:462
+#: componentchooser.cpp:429
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: componentchooser.cpp:477
+#: componentchooser.cpp:444
 msgid ""
 "<qt>You changed the default component of your choice. Do you want to save "
 "that change now?</qt>"
 msgstr ""
 "<qt>Standardkomponenten du valgte er endret. Skal endringa lagres nå?</qt>"
 
-#: componentchooser.cpp:481
+#: componentchooser.cpp:448
 msgid "No description available"
 msgstr "Ingen beskrivelse er tilgjengelig"
 
-#: componentchooser.cpp:492 componentchooser.cpp:497
+#: componentchooser.cpp:459 componentchooser.cpp:464
 msgid ""
 "Choose from the list below which component should be used by default for the "
 "%1 service."
@@ -99,7 +94,7 @@ msgid "in the following browser:"
 msgstr "i følgende nettleser:"
 
 #: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
-#: filemanagerconfig_ui.ui:149 terminalemulatorconfig_ui.ui:149
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr " …"
@@ -235,32 +230,23 @@ msgstr "Bruk et annet &e-postprogram:"
 msgid "Select this option if you want to use any other mail program."
 msgstr "Velg dette alternativet hvis du vil bruke et annet e-postprogram."
 
-#: filemanagerconfig_ui.ui:72
-#, fuzzy, no-c-format
-msgid "Use a different &file manager program:"
-msgstr "Bruk et annet &skall:"
-
-#: filemanagerconfig_ui.ui:97
-#, fuzzy, no-c-format
-msgid "&Use Konqueror as file manager application"
-msgstr "&Bruk Konsoll som skall"
-
-#: filemanagerconfig_ui.ui:130
-#, fuzzy, no-c-format
+#: filemanagerconfig_ui.ui:36
+#, no-c-format
 msgid ""
-"Press this button to select your favorite file manager client. Please note "
-"that the file you select has to have the executable attribute set in order "
-"to be accepted.<br> "
+"The default file manager can be selected by changing the preferred "
+"application for mime type inode/directory in the File Associations control "
+"module"
 msgstr ""
-"Bruk denne knappen for å velge det skallet du vil bruke. Merk at den fila du "
-"velger må være kjørbar for å bli godtatt. <br>Merk også at noen programmer "
-"som bruker et skall ikke virker dersom du legger til argumenter på "
-"kommandolinja (f eks «konsole -ls»)."
 
-#: filemanagerconfig_ui.ui:152
-#, fuzzy, no-c-format
-msgid "Click here to browse for a file manager program."
-msgstr "Trykk her for å lete etter skall-programmet."
+#: filemanagerconfig_ui.ui:66
+#, no-c-format
+msgid "Open File Associations module"
+msgstr ""
+
+#: filemanagerconfig_ui.ui:69
+#, no-c-format
+msgid "Click here to open the File Association control module."
+msgstr ""
 
 #: terminalemulatorconfig_ui.ui:72
 #, no-c-format
@@ -289,3 +275,40 @@ msgstr ""
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "Trykk her for å lete etter skall-programmet."
+
+#, fuzzy
+#~| msgid "Select preferred terminal application:"
+#~ msgid "Select preferred file manager application:"
+#~ msgstr "Velg hvilket terminalprogram du foretrekker:"
+
+#, fuzzy
+#~| msgid "Use a different &terminal program:"
+#~ msgid "Use a different &file manager program:"
+#~ msgstr "Bruk et annet &skall:"
+
+#, fuzzy
+#~| msgid "&Use Konsole as terminal application"
+#~ msgid "&Use Konqueror as file manager application"
+#~ msgstr "&Bruk Konsoll som skall"
+
+#, fuzzy
+#~| msgid ""
+#~| "Press this button to select your favorite terminal client. Please note "
+#~| "that the file you select has to have the executable attribute set in "
+#~| "order to be accepted.<br> Also note that some programs that utilize "
+#~| "Terminal Emulator will not work if you add command line arguments "
+#~| "(Example: konsole -ls)."
+#~ msgid ""
+#~ "Press this button to select your favorite file manager client. Please "
+#~ "note that the file you select has to have the executable attribute set in "
+#~ "order to be accepted.<br> "
+#~ msgstr ""
+#~ "Bruk denne knappen for å velge det skallet du vil bruke. Merk at den fila "
+#~ "du velger må være kjørbar for å bli godtatt. <br>Merk også at noen "
+#~ "programmer som bruker et skall ikke virker dersom du legger til "
+#~ "argumenter på kommandolinja (f eks «konsole -ls»)."
+
+#, fuzzy
+#~| msgid "Click here to browse for terminal program."
+#~ msgid "Click here to browse for a file manager program."
+#~ msgstr "Trykk her for å lete etter skall-programmet."