diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2020-01-01 12:39:48 +0200 |
|---|---|---|
| committer | Hannu Nyman <hannu.nyman@iki.fi> | 2020-01-01 12:39:48 +0200 |
| commit | 7c46a0703ce2ba79d08509fc64eb48c811fa88f6 (patch) | |
| tree | fd5c701a556b12485e877cd5f67b80b1ef2c94fb /applications/luci-app-shadowsocks-libev/po/mr | |
| parent | 13f9718be05d159fb351d9ea4965490ffb61a69a (diff) | |
| parent | 5ff23089a271f04a158fd39ed2ebf637060355ad (diff) | |
Merge remote-tracking branch 'weblate/master'
Fixed the weblate conflicts. Hopefully...
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Diffstat (limited to 'applications/luci-app-shadowsocks-libev/po/mr')
| -rw-r--r-- | applications/luci-app-shadowsocks-libev/po/mr/shadowsocks-libev.po | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/applications/luci-app-shadowsocks-libev/po/mr/shadowsocks-libev.po b/applications/luci-app-shadowsocks-libev/po/mr/shadowsocks-libev.po index 3bd8a92f65..4cc5acd6d7 100644 --- a/applications/luci-app-shadowsocks-libev/po/mr/shadowsocks-libev.po +++ b/applications/luci-app-shadowsocks-libev/po/mr/shadowsocks-libev.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"PO-Revision-Date: 2019-12-15 21:23+0000\n" +"PO-Revision-Date: 2019-12-28 03:17+0000\n" "Last-Translator: Prachi Joshi <josprachi@yahoo.com>\n" "Language-Team: Marathi <https://hosted.weblate.org/projects/openwrt/" "luciapplicationsshadowsocks-libev/mr/>\n" @@ -8,7 +8,7 @@ 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.10-dev\n" +"X-Generator: Weblate 3.10\n" #: applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/instances.js:43 msgid "-- instance type --" @@ -154,7 +154,7 @@ msgstr "" #: applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/instances.js:75 #: applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/rules.js:41 msgid "General Settings" -msgstr "" +msgstr "सामान्य सेटिंग्ज" #: applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/shadowsocks-libev.js:178 msgid "IPv6 First" |