X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fluci-base%2Fpo%2Fen%2Fbase.po;h=5340e83eb4a576c68b93ea185ca7f04d9467ddba;hp=50a7c928156f903a6d2a9faa7f7188084024e6ff;hb=HEAD;hpb=f3b30512361584c61c9daa51650ad833072aa919

diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po
index 50a7c9281..5340e83eb 100644
--- a/modules/luci-base/po/en/base.po
+++ b/modules/luci-base/po/en/base.po
@@ -400,11 +400,11 @@ msgstr ""
 msgid "Any zone"
 msgstr "Any zone"
 
-msgid "Apply"
-msgstr "Apply"
+msgid "Apply request failed with status <code>%h</code>"
+msgstr ""
 
-msgid "Applying changes"
-msgstr "Applying changes"
+msgid "Apply unchecked"
+msgstr ""
 
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
@@ -584,12 +584,20 @@ msgstr "Changes"
 msgid "Changes applied."
 msgstr "Changes applied."
 
+msgid "Changes have been reverted."
+msgstr ""
+
 msgid "Changes the administrator password for accessing the device"
 msgstr "Changes the administrator password for accessing the device"
 
 msgid "Channel"
 msgstr "Channel"
 
+msgid ""
+"Channel %d is not available in the %s regulatory domain and has been auto-"
+"adjusted to %d."
+msgstr ""
+
 msgid "Check"
 msgstr "Check"
 
@@ -668,12 +676,15 @@ msgstr ""
 msgid "Configuration"
 msgstr "Configuration"
 
-msgid "Configuration applied."
-msgstr "Configuration applied."
-
 msgid "Configuration files will be kept."
 msgstr "Configuration files will be kept."
 
+msgid "Configuration has been applied."
+msgstr ""
+
+msgid "Configuration has been rolled back!"
+msgstr ""
+
 msgid "Confirmation"
 msgstr "Confirmation"
 
@@ -692,6 +703,12 @@ msgstr ""
 msgid "Connections"
 msgstr "Connections"
 
+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 "Country"
 
@@ -865,6 +882,9 @@ msgstr ""
 msgid "Device unreachable"
 msgstr ""
 
+msgid "Device unreachable!"
+msgstr ""
+
 msgid "Diagnostics"
 msgstr "Diagnostics"
 
@@ -897,6 +917,9 @@ msgstr ""
 msgid "Discard upstream RFC1918 responses"
 msgstr ""
 
+msgid "Dismiss"
+msgstr ""
+
 msgid "Displaying only packages containing"
 msgstr ""
 
@@ -1151,6 +1174,9 @@ msgstr ""
 msgid "FT protocol"
 msgstr ""
 
+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr ""
+
 msgid "File"
 msgstr ""
 
@@ -2165,6 +2191,9 @@ msgstr ""
 msgid "Obfuscated Password"
 msgstr ""
 
+msgid "Obtain IPv6-Address"
+msgstr ""
+
 msgid "Off-State Delay"
 msgstr ""
 
@@ -2743,6 +2772,15 @@ msgstr ""
 msgid "Revert"
 msgstr "Revert"
 
+msgid "Revert changes"
+msgstr ""
+
+msgid "Revert request failed with status <code>%h</code>"
+msgstr ""
+
+msgid "Reverting configuration…"
+msgstr ""
+
 msgid "Root"
 msgstr ""
 
@@ -2821,9 +2859,6 @@ msgstr "Save"
 msgid "Save & Apply"
 msgstr "Save & Apply"
 
-msgid "Save &#38; Apply"
-msgstr ""
-
 msgid "Scan"
 msgstr "Scan"
 
@@ -2994,6 +3029,9 @@ msgstr "Start"
 msgid "Start priority"
 msgstr "Start priority"
 
+msgid "Starting configuration apply…"
+msgstr ""
+
 msgid "Startup"
 msgstr ""
 
@@ -3144,6 +3182,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 ""
@@ -3165,9 +3213,6 @@ msgid ""
 "\"Proceed\" below to start the flash procedure."
 msgstr ""
 
-msgid "The following changes have been committed"
-msgstr ""
-
 msgid "The following changes have been reverted"
 msgstr "The following changes have been reverted"
 
@@ -3240,7 +3285,7 @@ msgstr ""
 msgid "There are no active leases."
 msgstr ""
 
-msgid "There are no pending changes to apply!"
+msgid "There are no changes to apply."
 msgstr ""
 
 msgid "There are no pending changes to revert!"
@@ -3607,6 +3652,9 @@ msgstr ""
 msgid "Waiting for command to complete..."
 msgstr ""
 
+msgid "Waiting for configuration to get applied… %ds"
+msgstr ""
+
 msgid "Waiting for device..."
 msgstr ""
 
@@ -3845,6 +3893,15 @@ msgstr ""
 msgid "« Back"
 msgstr "« Back"
 
+#~ msgid "Apply"
+#~ msgstr "Apply"
+
+#~ msgid "Applying changes"
+#~ msgstr "Applying changes"
+
+#~ msgid "Configuration applied."
+#~ msgstr "Configuration applied."
+
 #~ msgid "Action"
 #~ msgstr "Action"