diff options
author | Hannu Nyman <hannu.nyman@iki.fi> | 2020-11-22 17:59:52 +0200 |
---|---|---|
committer | Hannu Nyman <hannu.nyman@iki.fi> | 2020-11-22 17:59:52 +0200 |
commit | 87d64ee27978ad008743e69e2e1c198e89a598ff (patch) | |
tree | 5579fb973a11bc80430f2821928b2178d82a0b04 /applications/luci-app-shadowsocks-libev/po/ja | |
parent | 0f3f464adc9e24646638aa5d71edb995a352dec5 (diff) | |
parent | 06dcfeffa03b2cfa5a2b739f603d98b67a5786bd (diff) |
treewide: fix conflicts with weblate
Merge remote-tracking branch 'weblate/master' after fixing
modules/luci-base/po/ja/base.po
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Diffstat (limited to 'applications/luci-app-shadowsocks-libev/po/ja')
-rw-r--r-- | applications/luci-app-shadowsocks-libev/po/ja/shadowsocks-libev.po | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/applications/luci-app-shadowsocks-libev/po/ja/shadowsocks-libev.po b/applications/luci-app-shadowsocks-libev/po/ja/shadowsocks-libev.po index f5b368c1ef..c730b80c05 100644 --- a/applications/luci-app-shadowsocks-libev/po/ja/shadowsocks-libev.po +++ b/applications/luci-app-shadowsocks-libev/po/ja/shadowsocks-libev.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"PO-Revision-Date: 2020-10-16 10:26+0000\n" +"PO-Revision-Date: 2020-11-22 15:35+0000\n" "Last-Translator: RyotaGamer <21ryotagamer@gmail.com>\n" "Language-Team: Japanese <https://hosted.weblate.org/projects/openwrt/" "luciapplicationsshadowsocks-libev/ja/>\n" @@ -8,7 +8,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 4.3.1-dev\n" +"X-Generator: Weblate 4.4-dev\n" #: applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/instances.js:45 msgid "-- instance type --" @@ -195,11 +195,11 @@ msgstr "" #: applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/instances.js:93 msgid "Local IPv4 address" -msgstr "ローカル IPv4 アドレス" +msgstr "ローカルIPv4アドレス" #: applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/instances.js:98 msgid "Local IPv6 address" -msgstr "ローカル IPv6 アドレス" +msgstr "ローカルIPv6アドレス" #: applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/instances.js:26 #: applications/luci-app-shadowsocks-libev/root/usr/share/luci/menu.d/luci-app-shadowsocks-libev.json:14 |