i18n: sync translations

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

2 files changed, 59 insertions, 54 deletions

diff --git a/applications/luci-app-uhttpd/po/ja/uhttpd.po b/applications/luci-app-uhttpd/po/ja/uhttpd.po
index c682877ce3..5729034046 100644
--- a/applications/luci-app-uhttpd/po/ja/uhttpd.po
+++ b/applications/luci-app-uhttpd/po/ja/uhttpd.po
@@ -13,21 +13,18 @@ msgstr ""
 "X-Poedit-Basepath: .\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-msgid "404 Error"
-msgstr "404 エラー"
-
 msgid ""
 "(/old/path=/new/path) or (just /old/path which becomes /cgi-prefix/old/path)"
 msgstr ""
 "(/old/path=/new/path) または (just /old/path which becomes /cgi-prefix/old/"
 "path)"
 
+msgid "404 Error"
+msgstr "404 エラー"
+
 msgid "A lightweight single-threaded HTTP(S) server"
 msgstr "軽量なシングル スレッド HTTP(S) サーバーです。"
 
-msgid "a.k.a CommonName"
-msgstr "共通名"
-
 msgid "Advanced Settings"
 msgstr "詳細設定"
 
@@ -81,12 +78,12 @@ msgstr ""
 msgid "For settings primarily geared to serving more than the web UI"
 msgstr "主に、Web UI以上のものを提供することを対象とした設定です。"
 
-msgid "Full real path to handler for Lua scripts"
-msgstr "Lua スクリプトへの絶対パス"
-
 msgid "Full Web Server Settings"
 msgstr "完全なWebサーバー設定"
 
+msgid "Full real path to handler for Lua scripts"
+msgstr "Lua スクリプトへの絶対パス"
+
 msgid "General Settings"
 msgstr "一般設定"
 
@@ -96,12 +93,12 @@ msgstr "HTTP 待ち受け（アドレス:ポート）"
 msgid "HTTPS Certificate (DER Encoded)"
 msgstr "HTTPS 証明書（DER エンコード）"
 
-msgid "HTTPS listener (address:port)"
-msgstr "HTTPS 待ち受け（アドレス:ポート）"
-
 msgid "HTTPS Private Key (DER Encoded)"
 msgstr "HTTPS 秘密鍵（DER エンコード）"
 
+msgid "HTTPS listener (address:port)"
+msgstr "HTTPS 待ち受け（アドレス:ポート）"
+
 msgid "Ignore private IPs on public interface"
 msgstr "公開側インターフェースでのプライベートIPを無視する"
 
@@ -112,8 +109,8 @@ msgid ""
 "Interpreter to associate with file endings ('suffix=handler', e.g. '.php=/"
 "usr/bin/php-cgi')"
 msgstr ""
-"ファイル拡張子に関連付けるインタープリタです。（'suffix=handler'、例: '."
-"php=/usr/bin/php-cgi')"
+"ファイル拡張子に関連付けるインタープリタです。（'suffix=handler'、例: '.php=/"
+"usr/bin/php-cgi')"
 
 msgid "Length of key in bits"
 msgstr "鍵のビット数"
@@ -143,8 +140,8 @@ msgid ""
 "Prevent access from private (RFC1918) IPs on an interface if it has an "
 "public IP address"
 msgstr ""
-"グローバル IPアドレスを持つインターフェースでは、プライベート IP (RFC1918) "
-"からのアクセスをブロックします。"
+"グローバル IPアドレスを持つインターフェースでは、プライベート IP (RFC1918) か"
+"らのアクセスをブロックします。"
 
 msgid "Realm for Basic Auth"
 msgstr "基本認証の領域名"
@@ -174,9 +171,26 @@ msgstr "TCP キープアライブ"
 msgid "This permanently deletes the cert, key, and configuration to use same."
 msgstr ""
 
-msgid "ubus integration is disabled if not present"
+msgid "Valid for # of Days"
+msgstr "有効日数"
+
+msgid ""
+"Virtual URL or CGI script to display on status '404 Not Found'. Must begin "
+"with '/'"
+msgstr ""
+
+msgid "Virtual path prefix for Lua scripts"
+msgstr "Lua スクリプトへの仮想パスプレフィクス"
+
+msgid "Virtual path prefix for ubus via JSON-RPC integration"
 msgstr ""
 
+msgid "Will not use HTTP authentication if not present"
+msgstr "指定しない場合、HTTP 認証は使用されません。"
+
+msgid "a.k.a CommonName"
+msgstr "共通名"
+
 msgid "uHTTPd"
 msgstr "uHTTPd"
 
@@ -188,21 +202,12 @@ msgid ""
 "shown below."
 msgstr "uHTTPd は、以下に表示した設定で新しい自己署名証明書を生成します。"
 
-msgid "Valid for # of Days"
-msgstr "有効日数"
-
-msgid "Virtual path prefix for Lua scripts"
-msgstr "Lua スクリプトへの仮想パスプレフィクス"
-
-msgid "Virtual path prefix for ubus via JSON-RPC integration"
-msgstr ""
-
-msgid ""
-"Virtual URL or CGI script to display on status '404 Not Found'.  Must begin "
-"with '/'"
+msgid "ubus integration is disabled if not present"
 msgstr ""
-"'404 Not Found' ステータスを表示する、仮想URLまたはCGIスクリプトです。'/' か"
-"ら始まる必要があります。"
 
-msgid "Will not use HTTP authentication if not present"
-msgstr "指定しない場合、HTTP 認証は使用されません。"
+#~ msgid ""
+#~ "Virtual URL or CGI script to display on status '404 Not Found'.  Must "
+#~ "begin with '/'"
+#~ msgstr ""
+#~ "'404 Not Found' ステータスを表示する、仮想URLまたはCGIスクリプトです。'/' "
+#~ "から始まる必要があります。"
diff --git a/applications/luci-app-uhttpd/po/templates/uhttpd.pot b/applications/luci-app-uhttpd/po/templates/uhttpd.pot
index f6599a5486..5503450e0a 100644
--- a/applications/luci-app-uhttpd/po/templates/uhttpd.pot
+++ b/applications/luci-app-uhttpd/po/templates/uhttpd.pot
@@ -1,17 +1,14 @@
 msgid ""
 msgstr "Content-Type: text/plain; charset=UTF-8"
 
-msgid "404 Error"
-msgstr ""
-
 msgid ""
 "(/old/path=/new/path) or (just /old/path which becomes /cgi-prefix/old/path)"
 msgstr ""
 
-msgid "A lightweight single-threaded HTTP(S) server"
+msgid "404 Error"
 msgstr ""
 
-msgid "a.k.a CommonName"
+msgid "A lightweight single-threaded HTTP(S) server"
 msgstr ""
 
 msgid "Advanced Settings"
@@ -65,10 +62,10 @@ msgstr ""
 msgid "For settings primarily geared to serving more than the web UI"
 msgstr ""
 
-msgid "Full real path to handler for Lua scripts"
+msgid "Full Web Server Settings"
 msgstr ""
 
-msgid "Full Web Server Settings"
+msgid "Full real path to handler for Lua scripts"
 msgstr ""
 
 msgid "General Settings"
@@ -80,10 +77,10 @@ msgstr ""
 msgid "HTTPS Certificate (DER Encoded)"
 msgstr ""
 
-msgid "HTTPS listener (address:port)"
+msgid "HTTPS Private Key (DER Encoded)"
 msgstr ""
 
-msgid "HTTPS Private Key (DER Encoded)"
+msgid "HTTPS listener (address:port)"
 msgstr ""
 
 msgid "Ignore private IPs on public interface"
@@ -154,33 +151,36 @@ msgstr ""
 msgid "This permanently deletes the cert, key, and configuration to use same."
 msgstr ""
 
-msgid "ubus integration is disabled if not present"
+msgid "Valid for # of Days"
 msgstr ""
 
-msgid "uHTTPd"
+msgid ""
+"Virtual URL or CGI script to display on status '404 Not Found'. Must begin "
+"with '/'"
 msgstr ""
 
-msgid "uHTTPd Self-signed Certificate Parameters"
+msgid "Virtual path prefix for Lua scripts"
 msgstr ""
 
-msgid ""
-"uHTTPd will generate a new self-signed certificate using the configuration "
-"shown below."
+msgid "Virtual path prefix for ubus via JSON-RPC integration"
 msgstr ""
 
-msgid "Valid for # of Days"
+msgid "Will not use HTTP authentication if not present"
 msgstr ""
 
-msgid "Virtual path prefix for Lua scripts"
+msgid "a.k.a CommonName"
 msgstr ""
 
-msgid "Virtual path prefix for ubus via JSON-RPC integration"
+msgid "uHTTPd"
+msgstr ""
+
+msgid "uHTTPd Self-signed Certificate Parameters"
 msgstr ""
 
 msgid ""
-"Virtual URL or CGI script to display on status '404 Not Found'.  Must begin "
-"with '/'"
+"uHTTPd will generate a new self-signed certificate using the configuration "
+"shown below."
 msgstr ""
 
-msgid "Will not use HTTP authentication if not present"
+msgid "ubus integration is disabled if not present"
 msgstr ""