Merge pull request #1805 from musashino205/l10n/base-upd-ja

[project/luci.git] / modules / luci-base / po / no / base.po

diff --git a/modules/luci-base/po/no/base.po b/modules/luci-base/po/no/base.po
index 1805d8e..600d007 100644 (file)
--- a/modules/luci-base/po/no/base.po
+++ b/modules/luci-base/po/no/base.po
@@ -398,11 +398,11 @@ msgstr "Antennekonfigurasjon"
 msgid "Any zone"
 msgstr "Alle soner"
 
-msgid "Apply"
-msgstr "Bruk"
+msgid "Apply request failed with status <code>%h</code>"
+msgstr ""
 
-msgid "Applying changes"
-msgstr "Utfører endringer"
+msgid "Apply unchecked"
+msgstr ""
 
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
@@ -582,12 +582,20 @@ msgstr "Endringer"
 msgid "Changes applied."
 msgstr "Endringer utført."
 
+msgid "Changes have been reverted."
+msgstr ""
+
 msgid "Changes the administrator password for accessing the device"
 msgstr "Endrer administrator passordet for tilgang til enheten"
 
 msgid "Channel"
 msgstr "Kanal"
 
+msgid ""
+"Channel %d is not available in the %s regulatory domain and has been auto-"
+"adjusted to %d."
+msgstr ""
+
 msgid "Check"
 msgstr "Kontroller"
 
@@ -668,12 +676,15 @@ msgstr ""
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
-msgid "Configuration applied."
-msgstr "Konfigurasjons endring utført."
-
 msgid "Configuration files will be kept."
 msgstr "Konfigurasjonsfiler vil bli bevart."
 
+msgid "Configuration has been applied."
+msgstr ""
+
+msgid "Configuration has been rolled back!"
+msgstr ""
+
 msgid "Confirmation"
 msgstr "Bekreftelse"
 
@@ -692,6 +703,12 @@ msgstr ""
 msgid "Connections"
 msgstr "Tilkoblinger"
 
+msgid ""
+"Could not regain access to the device after applying the configuration "
+"changes. You might need to reconnect if you modified network related "
+"settings such as the IP address or wireless security credentials."
+msgstr ""
+
 msgid "Country"
 msgstr "Land"
 
@@ -864,6 +881,9 @@ msgstr ""
 msgid "Device unreachable"
 msgstr ""
 
+msgid "Device unreachable!"
+msgstr ""
+
 msgid "Diagnostics"
 msgstr "Nettverksdiagnostikk"
 
@@ -898,6 +918,9 @@ msgstr ""
 msgid "Discard upstream RFC1918 responses"
 msgstr "Forkast oppstrøms RFC1918 svar"
 
+msgid "Dismiss"
+msgstr ""
+
 msgid "Displaying only packages containing"
 msgstr "Viser bare pakker som inneholder"
 
@@ -1157,6 +1180,9 @@ msgstr ""
 msgid "FT protocol"
 msgstr ""
 
+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr ""
+
 msgid "File"
 msgstr "Fil"
 
@@ -2181,6 +2207,9 @@ msgstr ""
 msgid "Obfuscated Password"
 msgstr ""
 
+msgid "Obtain IPv6-Address"
+msgstr ""
+
 msgid "Off-State Delay"
 msgstr "Forsinkelse ved tilstand Av"
 
@@ -2775,6 +2804,15 @@ msgstr "Vis/Skjul passord"
 msgid "Revert"
 msgstr "Tilbakestill"
 
+msgid "Revert changes"
+msgstr ""
+
+msgid "Revert request failed with status <code>%h</code>"
+msgstr ""
+
+msgid "Reverting configuration…"
+msgstr ""
+
 msgid "Root"
 msgstr "Rot"
 
@@ -2853,9 +2891,6 @@ msgstr "Lagre"
 msgid "Save & Apply"
 msgstr "Lagre & Aktiver"
 
-msgid "Save &#38; Apply"
-msgstr "Lagre &#38; Aktiver"
-
 msgid "Scan"
 msgstr "Skann"
 
@@ -3033,6 +3068,9 @@ msgstr "Start"
 msgid "Start priority"
 msgstr "Start prioritet"
 
+msgid "Starting configuration apply…"
+msgstr ""
+
 msgid "Startup"
 msgstr "Oppstart"
 
@@ -3198,6 +3236,16 @@ msgid "The configuration file could not be loaded due to the following error:"
 msgstr ""
 
 msgid ""
+"The device could not be reached within %d seconds after applying the pending "
+"changes, which caused the configuration to be rolled back for safety "
+"reasons. If you believe that the configuration changes are correct "
+"nonetheless, perform an unchecked configuration apply. Alternatively, you "
+"can dismiss this warning and edit changes before attempting to apply again, "
+"or revert all pending changes to keep the currently working configuration "
+"state."
+msgstr ""
+
+msgid ""
 "The device file of the memory or partition (<abbr title=\"for example\">e.g."
 "</abbr> <code>/dev/sda1</code>)"
 msgstr ""
@@ -3222,9 +3270,6 @@ msgstr ""
 "sammenlign dem med den opprinnelige filen for å sikre dataintegriteten.<br /"
 "> Klikk \"Fortsett\" nedenfor for å starte flash prosedyren."
 
-msgid "The following changes have been committed"
-msgstr "Følgende endringer er foretatt"
-
 msgid "The following changes have been reverted"
 msgstr "Følgende endringer er forkastet"
 
@@ -3307,8 +3352,8 @@ msgstr ""
 msgid "There are no active leases."
 msgstr "Det er ingen aktive leieavtaler."
 
-msgid "There are no pending changes to apply!"
-msgstr "Det finnes ingen endringer som kan utføres!"
+msgid "There are no changes to apply."
+msgstr ""
 
 msgid "There are no pending changes to revert!"
 msgstr "Det finnes ingen endriger å reversere!"
@@ -3694,6 +3739,9 @@ msgstr "Venter på at endringer utføres..."
 msgid "Waiting for command to complete..."
 msgstr "Venter på at kommando fullføres..."
 
+msgid "Waiting for configuration to get applied… %ds"
+msgstr ""
+
 msgid "Waiting for device..."
 msgstr ""
 
@@ -3935,6 +3983,24 @@ msgstr "ja"
 msgid "« Back"
 msgstr "« Tilbake"
 
+#~ msgid "Apply"
+#~ msgstr "Bruk"
+
+#~ msgid "Applying changes"
+#~ msgstr "Utfører endringer"
+
+#~ msgid "Configuration applied."
+#~ msgstr "Konfigurasjons endring utført."
+
+#~ msgid "Save &#38; Apply"
+#~ msgstr "Lagre &#38; Aktiver"
+
+#~ msgid "The following changes have been committed"
+#~ msgstr "Følgende endringer er foretatt"
+
+#~ msgid "There are no pending changes to apply!"
+#~ msgstr "Det finnes ingen endringer som kan utføres!"
+
 #~ msgid "Action"
 #~ msgstr "Handling"