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-olsr | |
| 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-olsr')
| -rw-r--r-- | applications/luci-app-olsr/po/ru/olsr.po | 8 | ||||
| -rw-r--r-- | applications/luci-app-olsr/po/zh_Hans/olsr.po | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/applications/luci-app-olsr/po/ru/olsr.po b/applications/luci-app-olsr/po/ru/olsr.po index cc7feb0d45..553d9fb7da 100644 --- a/applications/luci-app-olsr/po/ru/olsr.po +++ b/applications/luci-app-olsr/po/ru/olsr.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: LuCI: olsr\n" "POT-Creation-Date: 2013-09-06 09:58+0200\n" -"PO-Revision-Date: 2020-06-07 15:48+0000\n" -"Last-Translator: Artem <KovalevArtem.ru@gmail.com>\n" +"PO-Revision-Date: 2020-11-22 15:35+0000\n" +"Last-Translator: Max Smolik <makcum15@gmail.com>\n" "Language-Team: Russian <https://hosted.weblate.org/projects/openwrt/" "luciapplicationsolsr/ru/>\n" "Language: ru\n" @@ -12,7 +12,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 4.1-dev\n" +"X-Generator: Weblate 4.4-dev\n" "Project-Info: Это технический перевод, не дословный. Главное-удобный русский " "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n" @@ -539,7 +539,7 @@ msgstr "LQ алгоритм" #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:111 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:105 msgid "LQ fisheye" -msgstr "LQ fisheye" +msgstr "LQ рыбий глаз" #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:82 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:76 diff --git a/applications/luci-app-olsr/po/zh_Hans/olsr.po b/applications/luci-app-olsr/po/zh_Hans/olsr.po index 7378b7deae..94945824a7 100644 --- a/applications/luci-app-olsr/po/zh_Hans/olsr.po +++ b/applications/luci-app-olsr/po/zh_Hans/olsr.po @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2020-02-19 20:00+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/luciapplicationsolsr/zh_Hans/>\n" "Language: zh_Hans\n" @@ -13,7 +13,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-olsr/luasrc/view/status-olsr/mid.htm:13 msgid "Active MID announcements" @@ -529,7 +529,7 @@ msgstr "最后一跳" #: applications/luci-app-olsr/luasrc/view/status-olsr/legend.htm:1 msgid "Legend" -msgstr "Legend" +msgstr "图例" #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:23 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua:257 |