summaryrefslogtreecommitdiffhomepage
path: root/applications
diff options
context:
space:
mode:
authorHannu Nyman <hannu.nyman@iki.fi>2017-03-30 19:46:27 +0300
committerGitHub <noreply@github.com>2017-03-30 19:46:27 +0300
commitf6dd2a09c9c3ebae6f6f396907f85946b43f62e3 (patch)
tree3a2b115ed1446851df49f2331ae1460355a397ea /applications
parent3dc08a354b4f5212fdaf54764729a025a14167cf (diff)
parent369dbbfe713402e9ae062b8c6886d863f51e1adf (diff)
Merge pull request #1090 from musashino205/i18n-sync
i18n: Sync translations
Diffstat (limited to 'applications')
-rw-r--r--applications/luci-app-adblock/po/ja/adblock.po13
-rw-r--r--applications/luci-app-adblock/po/pt-br/adblock.po2
-rw-r--r--applications/luci-app-adblock/po/sv/adblock.po2
-rw-r--r--applications/luci-app-adblock/po/templates/adblock.pot2
-rw-r--r--applications/luci-app-adblock/po/zh-cn/adblock.po2
-rw-r--r--applications/luci-app-simple-adblock/po/ja/simple-adblock.po4
-rw-r--r--applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po7
7 files changed, 21 insertions, 11 deletions
diff --git a/applications/luci-app-adblock/po/ja/adblock.po b/applications/luci-app-adblock/po/ja/adblock.po
index 39bc183493..0d806d21a8 100644
--- a/applications/luci-app-adblock/po/ja/adblock.po
+++ b/applications/luci-app-adblock/po/ja/adblock.po
@@ -107,11 +107,8 @@ msgstr "概要"
msgid ""
"Please add only one domain per line. Comments introduced with '#' are "
-"allowed - ip addresses, wildcards & regex are not."
+"allowed - ip addresses, wildcards and regex are not."
msgstr ""
-"一行に一つのドメインを追加してください。'#' から始まるコメントを記述できます"
-"が、IPアドレスやワイルドカード、正規表現を設定値として使用することはできませ"
-"ん。"
msgid "Query"
msgstr "検索"
@@ -183,6 +180,14 @@ msgid "see online documentation"
msgstr "オンライン ドキュメントを確認してください"
#~ msgid ""
+#~ "Please add only one domain per line. Comments introduced with '#' are "
+#~ "allowed - ip addresses, wildcards & regex are not."
+#~ msgstr ""
+#~ "一行に一つのドメインを追加してください。'#' から始まるコメントを記述できま"
+#~ "すが、IPアドレスやワイルドカード、正規表現を設定値として使用することはでき"
+#~ "ません。"
+
+#~ msgid ""
#~ "). Note that list URLs and Shallalist category selections are not "
#~ "configurable via Luci."
#~ msgstr ""
diff --git a/applications/luci-app-adblock/po/pt-br/adblock.po b/applications/luci-app-adblock/po/pt-br/adblock.po
index 013768773e..c0a4c0ea01 100644
--- a/applications/luci-app-adblock/po/pt-br/adblock.po
+++ b/applications/luci-app-adblock/po/pt-br/adblock.po
@@ -106,7 +106,7 @@ msgstr ""
msgid ""
"Please add only one domain per line. Comments introduced with '#' are "
-"allowed - ip addresses, wildcards & regex are not."
+"allowed - ip addresses, wildcards and regex are not."
msgstr ""
msgid "Query"
diff --git a/applications/luci-app-adblock/po/sv/adblock.po b/applications/luci-app-adblock/po/sv/adblock.po
index 9fcc36d26b..1d2e2351a0 100644
--- a/applications/luci-app-adblock/po/sv/adblock.po
+++ b/applications/luci-app-adblock/po/sv/adblock.po
@@ -95,7 +95,7 @@ msgstr ""
msgid ""
"Please add only one domain per line. Comments introduced with '#' are "
-"allowed - ip addresses, wildcards & regex are not."
+"allowed - ip addresses, wildcards and regex are not."
msgstr ""
msgid "Query"
diff --git a/applications/luci-app-adblock/po/templates/adblock.pot b/applications/luci-app-adblock/po/templates/adblock.pot
index 9282768892..1f27213e44 100644
--- a/applications/luci-app-adblock/po/templates/adblock.pot
+++ b/applications/luci-app-adblock/po/templates/adblock.pot
@@ -93,7 +93,7 @@ msgstr ""
msgid ""
"Please add only one domain per line. Comments introduced with '#' are "
-"allowed - ip addresses, wildcards & regex are not."
+"allowed - ip addresses, wildcards and regex are not."
msgstr ""
msgid "Query"
diff --git a/applications/luci-app-adblock/po/zh-cn/adblock.po b/applications/luci-app-adblock/po/zh-cn/adblock.po
index 277be1a6a3..7fc5dcc4fa 100644
--- a/applications/luci-app-adblock/po/zh-cn/adblock.po
+++ b/applications/luci-app-adblock/po/zh-cn/adblock.po
@@ -104,7 +104,7 @@ msgstr ""
msgid ""
"Please add only one domain per line. Comments introduced with '#' are "
-"allowed - ip addresses, wildcards & regex are not."
+"allowed - ip addresses, wildcards and regex are not."
msgstr ""
msgid "Query"
diff --git a/applications/luci-app-simple-adblock/po/ja/simple-adblock.po b/applications/luci-app-simple-adblock/po/ja/simple-adblock.po
index ff75c8bf1d..7926595b6e 100644
--- a/applications/luci-app-simple-adblock/po/ja/simple-adblock.po
+++ b/applications/luci-app-simple-adblock/po/ja/simple-adblock.po
@@ -34,7 +34,9 @@ msgid "Force Router DNS server to all local devices"
msgstr "全ローカル デバイスにルーター DNSサーバーの使用を強制"
msgid "Forces Router DNS use on local devices, also known as DNS Hijacking"
-msgstr "ローカル デバイスに対し、ルーター上のDNSサーバーの使用を強制します。これは、DNS ハイジャックとしても知られています。"
+msgstr ""
+"ローカル デバイスに対し、ルーター上のDNSサーバーの使用を強制します。これは、"
+"DNS ハイジャックとしても知られています。"
msgid "Individual domains to be blacklisted"
msgstr "ブラックリストに登録する、個々のドメインです。"
diff --git a/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po b/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po
index 5adc5ed4f4..9f3fa2a679 100644
--- a/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po
+++ b/applications/luci-app-vpnbypass/po/pt-br/vpnbypass.po
@@ -18,8 +18,8 @@ msgstr "Domínios para evitar a VPN"
msgid "Domains to be accessed directly (outside of the VPN tunnel), see"
msgstr ""
-msgid "Enable VPN Bypass"
-msgstr "Habilitar o VPN Bypass"
+msgid "Enable/start service"
+msgstr ""
msgid "Local IP Addresses to Bypass"
msgstr ""
@@ -61,6 +61,9 @@ msgstr "Configurações do VPN Bypass"
msgid "for syntax"
msgstr ""
+#~ msgid "Enable VPN Bypass"
+#~ msgstr "Habilitar o VPN Bypass"
+
#~ msgid "Configuration of VPN Bypass Settings"
#~ msgstr "Configurações do VPN Bypass"