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-splash | |
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-splash')
-rw-r--r-- | applications/luci-app-splash/po/sv/splash.po | 8 | ||||
-rw-r--r-- | applications/luci-app-splash/po/zh_Hans/splash.po | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/applications/luci-app-splash/po/sv/splash.po b/applications/luci-app-splash/po/sv/splash.po index a0662aa2eb..2546e41d0a 100644 --- a/applications/luci-app-splash/po/sv/splash.po +++ b/applications/luci-app-splash/po/sv/splash.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2019-10-17 20:20+0000\n" -"Last-Translator: Mattias Münster <mattiasmun@gmail.com>\n" +"PO-Revision-Date: 2020-11-22 15:35+0000\n" +"Last-Translator: PontusÖsterlindh <pontus@osterlindh.com>\n" "Language-Team: Swedish <https://hosted.weblate.org/projects/openwrt/" "luciapplicationssplash/sv/>\n" "Language: sv\n" @@ -10,11 +10,11 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.9.1-dev\n" +"X-Generator: Weblate 4.4-dev\n" #: applications/luci-app-splash/luasrc/view/splash/splash.htm:53 msgid "%s with the operator of this access point." -msgstr "" +msgstr "%s med operatören för denna åtkomstpunkt." #: applications/luci-app-splash/luasrc/view/splash/splash.htm:65 #: applications/luci-app-splash/luasrc/view/splash_splash/splash.htm:13 diff --git a/applications/luci-app-splash/po/zh_Hans/splash.po b/applications/luci-app-splash/po/zh_Hans/splash.po index 995d609f59..6881753137 100644 --- a/applications/luci-app-splash/po/zh_Hans/splash.po +++ b/applications/luci-app-splash/po/zh_Hans/splash.po @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-06-28 08:58+0200\n" -"PO-Revision-Date: 2020-02-19 13:29+0000\n" -"Last-Translator: xiazhang <xz@xia.plus>\n" +"PO-Revision-Date: 2020-11-22 15:35+0000\n" +"Last-Translator: Eric <spice2wolf@gmail.com>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "openwrt/luciapplicationssplash/zh_Hans/>\n" "Language: zh_Hans\n" @@ -15,7 +15,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 3.11\n" +"X-Generator: Weblate 4.4-dev\n" #: applications/luci-app-splash/luasrc/view/splash/splash.htm:53 msgid "%s with the operator of this access point." @@ -132,7 +132,7 @@ msgstr "客户端上传速度限制(kbyte/s)" #: applications/luci-app-splash/luasrc/view/splash/blocked.htm:15 msgid "Contact the owner" -msgstr "" +msgstr "联系所有者" #: applications/luci-app-splash/luasrc/view/splash_splash/splash.htm:12 msgid "Decline" @@ -170,7 +170,7 @@ msgstr "通用" #: applications/luci-app-splash/luasrc/view/splash/splash.htm:54 msgid "Get in contact" -msgstr "" +msgstr "取得联系" #: applications/luci-app-splash/root/usr/share/rpcd/acl.d/luci-app-splash.json:3 msgid "Grant UCI access for luci-app-splash" @@ -340,7 +340,7 @@ msgstr "" #: applications/luci-app-splash/luasrc/view/admin_status/splash.htm:208 msgid "Time remaining" -msgstr "剩余时间:" +msgstr "剩余时间" #: applications/luci-app-splash/luasrc/view/splash/blocked.htm:15 msgid "" |