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

luci-base: update Japanese translation

1 files changed, 81 insertions, 15 deletions

diff --git a/modules/luci-base/po/ca/base.po b/modules/luci-base/po/ca/base.po
index b08344b404..22889f5dbe 100644
--- a/modules/luci-base/po/ca/base.po
+++ b/modules/luci-base/po/ca/base.po
@@ -406,11 +406,11 @@ msgstr "Configuració d'antena"
 msgid "Any zone"
 msgstr "Qualsevol zona"
 
-msgid "Apply"
-msgstr "Aplica"
+msgid "Apply request failed with status <code>%h</code>"
+msgstr ""
 
-msgid "Applying changes"
-msgstr "Aplicant els canvis"
+msgid "Apply unchecked"
+msgstr ""
 
 msgid ""
 "Assign a part of given length of every public IPv6-prefix to this interface"
@@ -593,12 +593,20 @@ msgstr "Canvis"
 msgid "Changes applied."
 msgstr "Canvis aplicats."
 
+msgid "Changes have been reverted."
+msgstr ""
+
 msgid "Changes the administrator password for accessing the device"
 msgstr "Canvia la paraula clau de l'administrador per accedir al dispositiu"
 
 msgid "Channel"
 msgstr "Canal"
 
+msgid ""
+"Channel %d is not available in the %s regulatory domain and has been auto-"
+"adjusted to %d."
+msgstr ""
+
 msgid "Check"
 msgstr "Comprovació"
 
@@ -678,12 +686,15 @@ msgstr ""
 msgid "Configuration"
 msgstr "Configuració"
 
-msgid "Configuration applied."
-msgstr "S'ha aplicat la configuració."
-
 msgid "Configuration files will be kept."
 msgstr "Es mantindran els fitxers de configuració."
 
+msgid "Configuration has been applied."
+msgstr ""
+
+msgid "Configuration has been rolled back!"
+msgstr ""
+
 msgid "Confirmation"
 msgstr "Confirmació"
 
@@ -702,6 +713,12 @@ msgstr ""
 msgid "Connections"
 msgstr "Connexions"
 
+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 "País"
 
@@ -872,6 +889,9 @@ msgstr ""
 msgid "Device unreachable"
 msgstr ""
 
+msgid "Device unreachable!"
+msgstr ""
+
 msgid "Diagnostics"
 msgstr "Diagnòstics"
 
@@ -906,6 +926,9 @@ msgstr ""
 msgid "Discard upstream RFC1918 responses"
 msgstr "Descarta les respostes RFC1918 des de dalt"
 
+msgid "Dismiss"
+msgstr ""
+
 msgid "Displaying only packages containing"
 msgstr "Mostrant només els paquets que contenen"
 
@@ -1160,6 +1183,9 @@ msgstr ""
 msgid "FT protocol"
 msgstr ""
 
+msgid "Failed to confirm apply within %ds, waiting for rollback…"
+msgstr ""
+
 msgid "File"
 msgstr "Fitxer"
 
@@ -2182,6 +2208,9 @@ msgstr ""
 msgid "Obfuscated Password"
 msgstr ""
 
+msgid "Obtain IPv6-Address"
+msgstr ""
+
 msgid "Off-State Delay"
 msgstr ""
 
@@ -2760,6 +2789,15 @@ msgstr "Mostra/amaga la contrasenya"
 msgid "Revert"
 msgstr "Reverteix"
 
+msgid "Revert changes"
+msgstr ""
+
+msgid "Revert request failed with status <code>%h</code>"
+msgstr ""
+
+msgid "Reverting configuration…"
+msgstr ""
+
 msgid "Root"
 msgstr "Arrel"
 
@@ -2838,9 +2876,6 @@ msgstr "Desa"
 msgid "Save & Apply"
 msgstr "Desa i aplica"
 
-msgid "Save &#38; Apply"
-msgstr "Desa i aplica"
-
 msgid "Scan"
 msgstr "Escaneja"
 
@@ -3012,6 +3047,9 @@ msgstr "Inici"
 msgid "Start priority"
 msgstr "Prioritat d'inici"
 
+msgid "Starting configuration apply…"
+msgstr ""
+
 msgid "Startup"
 msgstr "Arrencada"
 
@@ -3166,6 +3204,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 ""
@@ -3191,9 +3239,6 @@ msgstr ""
 "<br />Fes clic a \"Procedeix\" a continuació per començar el procés "
 "d'escriptura a la memòria flaix."
 
-msgid "The following changes have been committed"
-msgstr "S'han comès els següents canvis"
-
 msgid "The following changes have been reverted"
 msgstr "S&#39;han desfet els següents canvis"
 
@@ -3273,8 +3318,8 @@ msgstr ""
 msgid "There are no active leases."
 msgstr "No hi ha arrendaments actius."
 
-msgid "There are no pending changes to apply!"
-msgstr "No hi ha canvis pendents per aplicar!"
+msgid "There are no changes to apply."
+msgstr ""
 
 msgid "There are no pending changes to revert!"
 msgstr "No hi ha canvis pendents per revertir!"
@@ -3654,6 +3699,9 @@ msgstr "Esperant que s'apliquin els canvis..."
 msgid "Waiting for command to complete..."
 msgstr "Esperant que s'acabi l'ordre..."
 
+msgid "Waiting for configuration to get applied… %ds"
+msgstr ""
+
 msgid "Waiting for device..."
 msgstr "Esperant el dispositiu..."
 
@@ -3895,6 +3943,24 @@ msgstr "sí"
 msgid "« Back"
 msgstr "« Enrere"
 
+#~ msgid "Apply"
+#~ msgstr "Aplica"
+
+#~ msgid "Applying changes"
+#~ msgstr "Aplicant els canvis"
+
+#~ msgid "Configuration applied."
+#~ msgstr "S'ha aplicat la configuració."
+
+#~ msgid "Save &#38; Apply"
+#~ msgstr "Desa i aplica"
+
+#~ msgid "The following changes have been committed"
+#~ msgstr "S'han comès els següents canvis"
+
+#~ msgid "There are no pending changes to apply!"
+#~ msgstr "No hi ha canvis pendents per aplicar!"
+
 #~ msgid "Action"
 #~ msgstr "Acció"