Merge remote-tracking branch 'weblate/master'
authorHannu Nyman <hannu.nyman@iki.fi>
Wed, 1 Jan 2020 10:39:48 +0000 (12:39 +0200)
committerHannu Nyman <hannu.nyman@iki.fi>
Wed, 1 Jan 2020 10:39:48 +0000 (12:39 +0200)
commit7c46a0703ce2ba79d08509fc64eb48c811fa88f6
treefd5c701a556b12485e877cd5f67b80b1ef2c94fb
parent13f9718be05d159fb351d9ea4965490ffb61a69a
parent5ff23089a271f04a158fd39ed2ebf637060355ad
Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
78 files changed:
applications/luci-app-adblock/po/cs/adblock.po
applications/luci-app-adblock/po/fr/adblock.po
applications/luci-app-adblock/po/ms/adblock.po
applications/luci-app-adblock/po/pl/adblock.po
applications/luci-app-adblock/po/pt-br/adblock.po
applications/luci-app-adblock/po/ro/adblock.po
applications/luci-app-adblock/po/ru/adblock.po
applications/luci-app-adblock/po/zh-cn/adblock.po
applications/luci-app-adblock/po/zh-tw/adblock.po
applications/luci-app-aria2/po/hu/aria2.po
applications/luci-app-aria2/po/ms/aria2.po
applications/luci-app-aria2/po/pl/aria2.po
applications/luci-app-aria2/po/pt-br/aria2.po
applications/luci-app-aria2/po/ro/aria2.po
applications/luci-app-aria2/po/ru/aria2.po
applications/luci-app-aria2/po/zh-tw/aria2.po
applications/luci-app-bmx7/po/hu/bmx7.po
applications/luci-app-bmx7/po/mr/bmx7.po
applications/luci-app-bmx7/po/ru/bmx7.po
applications/luci-app-firewall/po/de/firewall.po
applications/luci-app-firewall/po/hu/firewall.po
applications/luci-app-firewall/po/mr/firewall.po
applications/luci-app-firewall/po/ms/firewall.po
applications/luci-app-firewall/po/ro/firewall.po
applications/luci-app-firewall/po/ru/firewall.po
applications/luci-app-firewall/po/sv/firewall.po
applications/luci-app-firewall/po/zh-tw/firewall.po
applications/luci-app-fwknopd/po/hu/fwknopd.po
applications/luci-app-fwknopd/po/mr/fwknopd.po
applications/luci-app-mjpg-streamer/po/fr/mjpg-streamer.po
applications/luci-app-mjpg-streamer/po/hu/mjpg-streamer.po
applications/luci-app-nft-qos/po/hu/nft-qos.po
applications/luci-app-nft-qos/po/mr/nft-qos.po
applications/luci-app-nft-qos/po/ms/nft-qos.po
applications/luci-app-nft-qos/po/ro/nft-qos.po
applications/luci-app-nft-qos/po/ru/nft-qos.po
applications/luci-app-nft-qos/po/zh-tw/nft-qos.po
applications/luci-app-nlbwmon/po/hu/nlbwmon.po
applications/luci-app-nlbwmon/po/mr/nlbwmon.po
applications/luci-app-nlbwmon/po/ms/nlbwmon.po
applications/luci-app-nlbwmon/po/pl/nlbwmon.po
applications/luci-app-nlbwmon/po/ro/nlbwmon.po
applications/luci-app-nlbwmon/po/ru/nlbwmon.po
applications/luci-app-nlbwmon/po/zh-tw/nlbwmon.po
applications/luci-app-nut/po/fr/nut.po
applications/luci-app-nut/po/hu/nut.po
applications/luci-app-nut/po/mr/nut.po
applications/luci-app-nut/po/ru/nut.po
applications/luci-app-ocserv/po/cs/ocserv.po
applications/luci-app-ocserv/po/fr/ocserv.po
applications/luci-app-ocserv/po/hu/ocserv.po
applications/luci-app-ocserv/po/mr/ocserv.po
applications/luci-app-ocserv/po/ms/ocserv.po
applications/luci-app-ocserv/po/ro/ocserv.po
applications/luci-app-ocserv/po/ru/ocserv.po
applications/luci-app-ocserv/po/zh-cn/ocserv.po
applications/luci-app-ocserv/po/zh-tw/ocserv.po
applications/luci-app-omcproxy/po/fr/omcproxy.po
applications/luci-app-omcproxy/po/hu/omcproxy.po
applications/luci-app-omcproxy/po/mr/omcproxy.po
applications/luci-app-omcproxy/po/ro/omcproxy.po
applications/luci-app-omcproxy/po/ru/omcproxy.po
applications/luci-app-omcproxy/po/sv/omcproxy.po
applications/luci-app-opkg/po/ru/opkg.po
applications/luci-app-opkg/po/sv/opkg.po
applications/luci-app-opkg/po/zh-tw/opkg.po
modules/luci-base/po/cs/base.po
modules/luci-base/po/hu/base.po
modules/luci-base/po/it/base.po
modules/luci-base/po/mr/base.po
modules/luci-base/po/ms/base.po
modules/luci-base/po/pl/base.po
modules/luci-base/po/pt-br/base.po
modules/luci-base/po/ro/base.po
modules/luci-base/po/ru/base.po
modules/luci-base/po/sv/base.po
modules/luci-base/po/zh-cn/base.po
modules/luci-base/po/zh-tw/base.po