Merge translation files from master branch.

1 files changed, 28 insertions, 28 deletions

diff --git a/tde-i18n-nb/messages/tdeadmin/knetworkconf.po b/tde-i18n-nb/messages/tdeadmin/knetworkconf.po
index baa56151147..045c1de5be1 100644
--- a/tde-i18n-nb/messages/tdeadmin/knetworkconf.po
+++ b/tde-i18n-nb/messages/tdeadmin/knetworkconf.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: knetworkconf\n"
-"POT-Creation-Date: 2020-05-11 04:10+0200\n"
+"POT-Creation-Date: 2020-06-14 21:27+0200\n"
 "PO-Revision-Date: 2006-06-14 21:28+0200\n"
 "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-no@lister.ping.uio.no>\n"
@@ -53,7 +53,7 @@ msgstr "Den oppgitte IP-adressen har ikke riktig format."
 #: knetworkconf/kadddevicecontainer.cpp:135
 #: knetworkconf/kadddevicecontainer.cpp:138
 #: knetworkconf/kadddnsserverdlg.ui.h:42 knetworkconf/kaddknownhostdlg.ui.h:25
-#: knetworkconf/knetworkconf.cpp:590
+#: knetworkconf/knetworkconf.cpp:591
 msgid "Invalid IP Address"
 msgstr "Ugyldig IP-adresse"
 
@@ -105,27 +105,27 @@ msgstr "Alias:"
 msgid "Add New Alias"
 msgstr "Legg til nytt alias"
 
-#: knetworkconf/knetworkconf.cpp:66
+#: knetworkconf/knetworkconf.cpp:67
 msgid "Could not load network configuration information."
 msgstr "Klarte ikke laste inn opplysninger om nettverksoppsettet."
 
-#: knetworkconf/knetworkconf.cpp:67
+#: knetworkconf/knetworkconf.cpp:68
 msgid "Error Reading Configuration File"
 msgstr "Feil ved lesing av oppsettsfila"
 
-#: knetworkconf/knetworkconf.cpp:118 knetworkconf/knetworkconf.cpp:756
+#: knetworkconf/knetworkconf.cpp:119 knetworkconf/knetworkconf.cpp:757
 msgid "Enabled"
 msgstr "Slått på"
 
-#: knetworkconf/knetworkconf.cpp:128 knetworkconf/knetworkconf.cpp:770
+#: knetworkconf/knetworkconf.cpp:129 knetworkconf/knetworkconf.cpp:771
 msgid "Disabled"
 msgstr "Slått av"
 
-#: knetworkconf/knetworkconf.cpp:137 knetworkconf/knetworkconf.cpp:304
+#: knetworkconf/knetworkconf.cpp:138 knetworkconf/knetworkconf.cpp:305
 msgid "Manual"
 msgstr "Manuell"
 
-#: knetworkconf/knetworkconf.cpp:158
+#: knetworkconf/knetworkconf.cpp:159
 msgid ""
 "The new configuration has not been saved.\n"
 "Do you want to apply changes before quitting?"
@@ -133,41 +133,41 @@ msgstr ""
 "Det nye oppsettet er ikke lagret.\n"
 "Vil du utføre endringene før du avslutter?"
 
-#: knetworkconf/knetworkconf.cpp:159 knetworkconf/knetworkconf.cpp:831
-#: knetworkconf/knetworkconf.cpp:850
+#: knetworkconf/knetworkconf.cpp:160 knetworkconf/knetworkconf.cpp:832
+#: knetworkconf/knetworkconf.cpp:851
 msgid "New Configuration Not Saved"
 msgstr "Nytt oppsett ikke lagret"
 
-#: knetworkconf/knetworkconf.cpp:206
+#: knetworkconf/knetworkconf.cpp:207
 msgid "Edit Server"
 msgstr "Rediger tjener"
 
-#: knetworkconf/knetworkconf.cpp:233
+#: knetworkconf/knetworkconf.cpp:234
 #, c-format
 msgid "Configure Device %1"
 msgstr "Sett opp enhet %1"
 
-#: knetworkconf/knetworkconf.cpp:442
+#: knetworkconf/knetworkconf.cpp:443
 msgid "Could not open file '/etc/resolv.conf' for reading."
 msgstr "Kunne ikke åpne fila «/etc/resolv.conf» for lesing."
 
-#: knetworkconf/knetworkconf.cpp:443
+#: knetworkconf/knetworkconf.cpp:444
 msgid "Error Loading Config Files"
 msgstr "Feil ved lasting av oppsettsfiler"
 
-#: knetworkconf/knetworkconf.cpp:590
+#: knetworkconf/knetworkconf.cpp:591
 msgid "The default Gateway IP address is invalid."
 msgstr "IP-adressen for standard portner er ugyldig."
 
-#: knetworkconf/knetworkconf.cpp:681
+#: knetworkconf/knetworkconf.cpp:682
 msgid "Enabling interface <b>%1</b>"
 msgstr "Slår på grensesnitt <b>%1</b>"
 
-#: knetworkconf/knetworkconf.cpp:683
+#: knetworkconf/knetworkconf.cpp:684
 msgid "Disabling interface <b>%1</b>"
 msgstr "Slår av grensesnitt <b>%1</b>"
 
-#: knetworkconf/knetworkconf.cpp:717
+#: knetworkconf/knetworkconf.cpp:718
 msgid ""
 "Could not launch backend to change network device state. You will have to do "
 "it manually."
@@ -175,18 +175,18 @@ msgstr ""
 "Kunne ikke starte bakstykket som endrer status for nettverksenheter. Du må "
 "gjøre det manuelt."
 
-#: knetworkconf/knetworkconf.cpp:738
+#: knetworkconf/knetworkconf.cpp:739
 msgid ""
 "There was an error changing the device's state. You will have to do it "
 "manually."
 msgstr ""
 "Det oppsto en feil ved endring av enhetens status. Du må gjøre det manuelt."
 
-#: knetworkconf/knetworkconf.cpp:739
+#: knetworkconf/knetworkconf.cpp:740
 msgid "Could Not Change Device State"
 msgstr "Kunne ikke endre enhetens status"
 
-#: knetworkconf/knetworkconf.cpp:830 knetworkconf/knetworkconf.cpp:849
+#: knetworkconf/knetworkconf.cpp:831 knetworkconf/knetworkconf.cpp:850
 msgid ""
 "The new configuration has not been saved.\n"
 "Apply changes?"
@@ -194,32 +194,32 @@ msgstr ""
 "Det nye oppsettet er ikke lagret.\n"
 "Vil du utføre endringene?"
 
-#: knetworkconf/kaddknownhostdlg.ui:16 knetworkconf/knetworkconf.cpp:867
+#: knetworkconf/kaddknownhostdlg.ui:16 knetworkconf/knetworkconf.cpp:868
 #, no-c-format
 msgid "Add New Static Host"
 msgstr "Legg til ny fast vert"
 
-#: knetworkconf/knetworkconf.cpp:900
+#: knetworkconf/knetworkconf.cpp:901
 msgid "Edit Static Host"
 msgstr "Rediger fast vert"
 
-#: knetworkconf/knetworkconf.cpp:1038
+#: knetworkconf/knetworkconf.cpp:1039
 msgid "Could not load the selected Network Profile."
 msgstr "Klarte ikke laste inn den valgte nettverksprofilen."
 
-#: knetworkconf/knetworkconf.cpp:1039
+#: knetworkconf/knetworkconf.cpp:1040
 msgid "Error Reading Profile"
 msgstr "Feil ved lesing av profil"
 
-#: knetworkconf/knetworkconf.cpp:1062
+#: knetworkconf/knetworkconf.cpp:1063
 msgid "Create New Network Profile"
 msgstr "Opprett ny nettverksprofil"
 
-#: knetworkconf/knetworkconf.cpp:1063
+#: knetworkconf/knetworkconf.cpp:1064
 msgid "Name of new profile:"
 msgstr "Navn på ny profil:"
 
-#: knetworkconf/knetworkconf.cpp:1092
+#: knetworkconf/knetworkconf.cpp:1093
 msgid "There is already another profile with that name."
 msgstr "Det finnes alt en annen profil med det navnet."