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

[project/luci.git] / modules / luci-base / po / templates / base.pot

diff --git a/modules/luci-base/po/templates/base.pot b/modules/luci-base/po/templates/base.pot
index ddf2e56..ebbe6c6 100644 (file)
--- a/modules/luci-base/po/templates/base.pot
+++ b/modules/luci-base/po/templates/base.pot
@@ -376,10 +376,10 @@ msgstr ""
 msgid "Any zone"
 msgstr ""
 
-msgid "Apply"
+msgid "Apply request failed with status <code>%h</code>"
 msgstr ""
 
-msgid "Applying changes"
+msgid "Apply unchecked"
 msgstr ""
 
 msgid ""
@@ -557,12 +557,20 @@ msgstr ""
 msgid "Changes applied."
 msgstr ""
 
+msgid "Changes have been reverted."
+msgstr ""
+
 msgid "Changes the administrator password for accessing the device"
 msgstr ""
 
 msgid "Channel"
 msgstr ""
 
+msgid ""
+"Channel %d is not available in the %s regulatory domain and has been auto-"
+"adjusted to %d."
+msgstr ""
+
 msgid "Check"
 msgstr ""
 
@@ -632,10 +640,13 @@ msgstr ""
 msgid "Configuration"
 msgstr ""
 
-msgid "Configuration applied."
+msgid "Configuration files will be kept."
 msgstr ""
 
-msgid "Configuration files will be kept."
+msgid "Configuration has been applied."
+msgstr ""
+
+msgid "Configuration has been rolled back!"
 msgstr ""
 
 msgid "Confirmation"
@@ -656,6 +667,12 @@ msgstr ""
 msgid "Connections"
 msgstr ""
 
+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 ""
 
@@ -824,6 +841,9 @@ msgstr ""
 msgid "Device unreachable"
 msgstr ""
 
+msgid "Device unreachable!"
+msgstr ""
+
 msgid "Diagnostics"
 msgstr ""
 
@@ -856,6 +876,9 @@ msgstr ""
 msgid "Discard upstream RFC1918 responses"
 msgstr ""
 
+msgid "Dismiss"
+msgstr ""
+
 msgid "Displaying only packages containing"
 msgstr ""
 
@@ -1101,6 +1124,9 @@ msgstr ""
 msgid "FT protocol"
 msgstr ""
 
+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr ""
+
 msgid "File"
 msgstr ""
 
@@ -2103,6 +2129,9 @@ msgstr ""
 msgid "Obfuscated Password"
 msgstr ""
 
+msgid "Obtain IPv6-Address"
+msgstr ""
+
 msgid "Off-State Delay"
 msgstr ""
 
@@ -2673,6 +2702,15 @@ msgstr ""
 msgid "Revert"
 msgstr ""
 
+msgid "Revert changes"
+msgstr ""
+
+msgid "Revert request failed with status <code>%h</code>"
+msgstr ""
+
+msgid "Reverting configuration…"
+msgstr ""
+
 msgid "Root"
 msgstr ""
 
@@ -2749,9 +2787,6 @@ msgstr ""
 msgid "Save & Apply"
 msgstr ""
 
-msgid "Save &#38; Apply"
-msgstr ""
-
 msgid "Scan"
 msgstr ""
 
@@ -2922,6 +2957,9 @@ msgstr ""
 msgid "Start priority"
 msgstr ""
 
+msgid "Starting configuration apply…"
+msgstr ""
+
 msgid "Startup"
 msgstr ""
 
@@ -3072,6 +3110,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 ""
@@ -3088,9 +3136,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 ""
 
@@ -3156,7 +3201,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!"
@@ -3517,6 +3562,9 @@ msgstr ""
 msgid "Waiting for command to complete..."
 msgstr ""
 
+msgid "Waiting for configuration to get applied… %ds"
+msgstr ""
+
 msgid "Waiting for device..."
 msgstr ""