Merge remote-tracking branch 'weblate/master'
authorHannu Nyman <hannu.nyman@iki.fi>
Sun, 5 Jan 2020 10:22:37 +0000 (12:22 +0200)
committerHannu Nyman <hannu.nyman@iki.fi>
Sun, 5 Jan 2020 10:22:37 +0000 (12:22 +0200)
commit1cd0a4439bb132d095c8919e0016865b7210e7c0
treea9561bb9ba4c622f8740d6f529e030cf0453ef46
parentd60a1a13b091c622bc2d4d63321d2e3ea0437796
parentc2684197cb45443fdfe042221b7edb23f9d91057
Merge remote-tracking branch 'weblate/master'

Fixed weblate conflicts. Again. Hopefully.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
21 files changed:
applications/luci-app-advanced-reboot/po/fr/advanced-reboot.po
applications/luci-app-advanced-reboot/po/ro/advanced-reboot.po
applications/luci-app-banip/po/zh-cn/banip.po
applications/luci-app-dcwapd/po/pl/dcwapd.po
applications/luci-app-firewall/po/sk/firewall.po
applications/luci-app-mwan3/po/fr/mwan3.po
applications/luci-app-mwan3/po/ro/mwan3.po
applications/luci-app-mwan3/po/sk/mwan3.po
applications/luci-app-noddos/po/fr/noddos.po
applications/luci-app-nut/po/fr/nut.po
applications/luci-app-olsr/po/fr/olsr.po
applications/luci-app-olsr/po/ro/olsr.po
applications/luci-app-olsr/po/sk/olsr.po
applications/luci-app-statistics/po/fr/statistics.po
modules/luci-base/po/de/base.po
modules/luci-base/po/fr/base.po
modules/luci-base/po/ja/base.po
modules/luci-base/po/pt/base.po
modules/luci-base/po/ro/base.po
modules/luci-base/po/sk/base.po
modules/luci-base/po/zh-cn/base.po