Merge pull request #1818 from dibdot/lxc_fix

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

diff --git a/modules/luci-base/po/en/base.po b/modules/luci-base/po/en/base.po
index 190a43f..5340e83 100644 (file)
--- 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 "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"
 
 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 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 "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"
 
 msgid "Check"
 msgstr "Check"
 


@@ -668,12 +676,15 @@ msgstr ""
 msgid "Configuration"
 msgstr "Configuration"
 
 msgid "Configuration"
 msgstr "Configuration"
 

-msgid "Configuration applied."
-msgstr "Configuration applied."
-

 msgid "Configuration files will be kept."
 msgstr "Configuration files will be kept."
 
 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"
 
 msgid "Confirmation"
 msgstr "Confirmation"
 


@@ -692,6 +703,12 @@ msgstr ""
 msgid "Connections"
 msgstr "Connections"
 
 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"
 
 msgid "Country"
 msgstr "Country"
 


@@ -865,6 +882,9 @@ msgstr ""
 msgid "Device unreachable"
 msgstr ""
 
 msgid "Device unreachable"
 msgstr ""
 

+msgid "Device unreachable!"
+msgstr ""
+

 msgid "Diagnostics"
 msgstr "Diagnostics"
 
 msgid "Diagnostics"
 msgstr "Diagnostics"
 


@@ -897,6 +917,9 @@ msgstr ""
 msgid "Discard upstream RFC1918 responses"
 msgstr ""
 
 msgid "Discard upstream RFC1918 responses"
 msgstr ""
 

+msgid "Dismiss"
+msgstr ""
+

 msgid "Displaying only packages containing"
 msgstr ""
 
 msgid "Displaying only packages containing"
 msgstr ""
 


@@ -1008,6 +1031,11 @@ msgstr ""
 msgid "Enable"
 msgstr ""
 
 msgid "Enable"
 msgstr ""
 

+msgid ""
+"Enable <abbr title=\"Internet Group Management Protocol\">IGMP</abbr> "
+"snooping"
+msgstr ""
+

 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 
 msgid "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 msgstr "Enable <abbr title=\"Spanning Tree Protocol\">STP</abbr>"
 


@@ -1065,6 +1093,9 @@ msgstr "Enable/Disable"
 msgid "Enabled"
 msgstr "Enabled"
 
 msgid "Enabled"
 msgstr "Enabled"
 

+msgid "Enables IGMP snooping on this bridge"
+msgstr ""
+

 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"
 msgid ""
 "Enables fast roaming among access points that belong to the same Mobility "
 "Domain"


@@ -1143,6 +1174,9 @@ msgstr ""
 msgid "FT protocol"
 msgstr ""
 
 msgid "FT protocol"
 msgstr ""
 

+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr ""
+

 msgid "File"
 msgstr ""
 
 msgid "File"
 msgstr ""
 


@@ -2142,6 +2176,9 @@ msgstr ""
 msgid "Nslookup"
 msgstr ""
 
 msgid "Nslookup"
 msgstr ""
 

+msgid "Number of cached DNS entries (max is 10000, 0 is no caching)"
+msgstr ""
+

 msgid "OK"
 msgstr "OK"
 
 msgid "OK"
 msgstr "OK"
 


@@ -2154,6 +2191,9 @@ msgstr ""
 msgid "Obfuscated Password"
 msgstr ""
 
 msgid "Obfuscated Password"
 msgstr ""
 

+msgid "Obtain IPv6-Address"
+msgstr ""
+

 msgid "Off-State Delay"
 msgstr ""
 
 msgid "Off-State Delay"
 msgstr ""
 


@@ -2732,6 +2772,15 @@ msgstr ""
 msgid "Revert"
 msgstr "Revert"
 
 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 ""
 
 msgid "Root"
 msgstr ""
 


@@ -2810,9 +2859,6 @@ msgstr "Save"
 msgid "Save & Apply"
 msgstr "Save & Apply"
 
 msgid "Save & Apply"
 msgstr "Save & Apply"
 

-msgid "Save &#38; Apply"
-msgstr ""
-

 msgid "Scan"
 msgstr "Scan"
 
 msgid "Scan"
 msgstr "Scan"
 


@@ -2900,6 +2946,9 @@ msgstr "Size"
 msgid "Size (.ipk)"
 msgstr ""
 
 msgid "Size (.ipk)"
 msgstr ""
 

+msgid "Size of DNS query cache"
+msgstr ""
+

 msgid "Skip"
 msgstr "Skip"
 
 msgid "Skip"
 msgstr "Skip"
 


@@ -2980,6 +3029,9 @@ msgstr "Start"
 msgid "Start priority"
 msgstr "Start priority"
 
 msgid "Start priority"
 msgstr "Start priority"
 

+msgid "Starting configuration apply…"
+msgstr ""
+

 msgid "Startup"
 msgstr ""
 
 msgid "Startup"
 msgstr ""
 


@@ -3130,6 +3182,16 @@ msgid "The configuration file could not be loaded due to the following error:"
 msgstr ""
 
 msgid ""
 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 ""
 "The device file of the memory or partition (<abbr title=\"for example\">e.g."
 "</abbr> <code>/dev/sda1</code>)"
 msgstr ""


@@ -3151,9 +3213,6 @@ msgid ""
 "\"Proceed\" below to start the flash procedure."
 msgstr ""
 
 "\"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"
 
 msgid "The following changes have been reverted"
 msgstr "The following changes have been reverted"
 


@@ -3226,7 +3285,7 @@ msgstr ""
 msgid "There are no active leases."
 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!"
 msgstr ""
 
 msgid "There are no pending changes to revert!"


@@ -3484,7 +3543,7 @@ msgstr ""
 
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"
 
 msgid ""
 "Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</"

-"em> indentifies the host, the <em>IPv4-Address</em> specifies the fixed "
+"em> identifies the host, the <em>IPv4-Address</em> specifies the fixed "

 "address to use, and the <em>Hostname</em> is assigned as a symbolic name to "
 "the requesting host. The optional <em>Lease time</em> can be used to set non-"
 "standard host-specific lease time, e.g. 12h, 3d or infinite."
 "address to use, and the <em>Hostname</em> is assigned as a symbolic name to "
 "the requesting host. The optional <em>Lease time</em> can be used to set non-"
 "standard host-specific lease time, e.g. 12h, 3d or infinite."


@@ -3593,6 +3652,9 @@ msgstr ""
 msgid "Waiting for command to complete..."
 msgstr ""
 
 msgid "Waiting for command to complete..."
 msgstr ""
 

+msgid "Waiting for configuration to get applied… %ds"
+msgstr ""
+

 msgid "Waiting for device..."
 msgstr ""
 
 msgid "Waiting for device..."
 msgstr ""
 


@@ -3831,6 +3893,15 @@ msgstr ""
 msgid "« Back"
 msgstr "« Back"
 
 msgid "« Back"
 msgstr "« Back"
 

+#~ msgid "Apply"
+#~ msgstr "Apply"
+
+#~ msgid "Applying changes"
+#~ msgstr "Applying changes"
+
+#~ msgid "Configuration applied."
+#~ msgstr "Configuration applied."
+

 #~ msgid "Action"
 #~ msgstr "Action"
 
 #~ msgid "Action"
 #~ msgstr "Action"