From: Hannu Nyman Date: Sun, 5 Jan 2020 10:22:37 +0000 (+0200) Subject: Merge remote-tracking branch 'weblate/master' X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=1cd0a4439bb132d095c8919e0016865b7210e7c0;p=openwrt-luci.git Merge remote-tracking branch 'weblate/master' Fixed weblate conflicts. Again. Hopefully. Signed-off-by: Hannu Nyman --- 1cd0a4439bb132d095c8919e0016865b7210e7c0 diff --cc applications/luci-app-advanced-reboot/po/fr/advanced-reboot.po index 894681fd21,7c3f6c0331..c60d395914 --- a/applications/luci-app-advanced-reboot/po/fr/advanced-reboot.po +++ b/applications/luci-app-advanced-reboot/po/fr/advanced-reboot.po @@@ -8,9 -8,9 +8,9 @@@ 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-advanced-reboot/luasrc/controller/advanced_reboot.lua:185 +#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:189 #: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:10 msgid "Advanced Reboot" msgstr "Redémarrage avancé" @@@ -237,12 -237,12 +237,12 @@@ msgstr "Tentative de montage de la part #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:53 msgid "attempting to unmount alternative partition" - msgstr "" + msgstr "Tentative de démontage de la partition alternative" -#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:226 -#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:227 -#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:240 -#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:241 +#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:244 +#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:245 +#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:258 +#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:259 msgid "to" msgstr "vers" diff --cc applications/luci-app-advanced-reboot/po/ro/advanced-reboot.po index 7a589e33cc,4031a0bee3..5aefa32a9a --- a/applications/luci-app-advanced-reboot/po/ro/advanced-reboot.po +++ b/applications/luci-app-advanced-reboot/po/ro/advanced-reboot.po @@@ -9,9 -9,9 +9,9 @@@ msgstr " "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2;\n" - "X-Generator: Weblate 3.10-dev\n" + "X-Generator: Weblate 3.10\n" -#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:185 +#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:189 #: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:10 msgid "Advanced Reboot" msgstr "Repornire Avansata" @@@ -50,9 -50,9 +50,9 @@@ msgstr " #: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/applyreboot.htm:45 msgid "Loading" - msgstr "Incarcare" + msgstr "Încărcare" -#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:213 +#: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:231 msgid "No access to fw_printenv or fw_printenv!" msgstr "Nu aveți acces la fw_printenv sau fw_printenv!" diff --cc applications/luci-app-firewall/po/sk/firewall.po index 43e1aab2ac,ecf9f23836..4bd90bfc6f --- a/applications/luci-app-firewall/po/sk/firewall.po +++ b/applications/luci-app-firewall/po/sk/firewall.po @@@ -44,10 -48,10 +48,10 @@@ msgstr " msgid "Accept output" msgstr "" -#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:183 -#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:328 +#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:215 +#: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/rules.js:354 msgid "Action" - msgstr "" + msgstr "Akcia" #: applications/luci-app-firewall/htdocs/luci-static/resources/view/firewall/zones.js:246 msgid "" diff --cc applications/luci-app-mwan3/po/fr/mwan3.po index 49b98641e9,668579258b..f71573ba3e --- a/applications/luci-app-mwan3/po/fr/mwan3.po +++ b/applications/luci-app-mwan3/po/fr/mwan3.po @@@ -8,11 -8,11 +8,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.10-dev\n" + "X-Generator: Weblate 3.10\n" -#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:177 -#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:193 -#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:213 +#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:176 +#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:192 +#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:212 msgid "%d hour" msgstr "" @@@ -78,9 -78,9 +78,9 @@@ msgstr " #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:58 msgid "-- Please choose --" - msgstr "" + msgstr "-- Choisir --" -#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:65 +#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:66 msgid "" "Acceptable values: 1-100. This many Tracking IP addresses must respond for " "the link to be deemed up" diff --cc applications/luci-app-mwan3/po/ro/mwan3.po index ebffda62d1,250055efb3..db2afc06e1 --- a/applications/luci-app-mwan3/po/ro/mwan3.po +++ b/applications/luci-app-mwan3/po/ro/mwan3.po @@@ -9,11 -9,11 +9,11 @@@ msgstr " "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2;\n" - "X-Generator: Weblate 3.10-dev\n" + "X-Generator: Weblate 3.10\n" -#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:177 -#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:193 -#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:213 +#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:176 +#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:192 +#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:212 msgid "%d hour" msgstr "" @@@ -174,10 -174,10 +174,10 @@@ msgstr " msgid "Enable ssl tracking" msgstr "" -#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:23 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:160 +#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:23 msgid "Enabled" - msgstr "" + msgstr "Activat" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:64 msgid "" @@@ -768,10 -768,10 +768,10 @@@ msgstr " #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:164 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:49 msgid "Yes" - msgstr "" + msgstr "Da" -#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:29 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua:80 +#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/policyconfig.lua:29 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:73 msgid "blackhole (drop)" msgstr "" diff --cc applications/luci-app-mwan3/po/sk/mwan3.po index 97b70bc52f,6727ee1237..f2c8acabf7 --- a/applications/luci-app-mwan3/po/sk/mwan3.po +++ b/applications/luci-app-mwan3/po/sk/mwan3.po @@@ -3,10 -7,12 +7,12 @@@ msgstr " "Language: sk\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" + "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" + "X-Generator: Weblate 3.10\n" -#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:177 -#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:193 -#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:213 +#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:176 +#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:192 +#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:212 msgid "%d hour" msgstr "" @@@ -167,10 -173,10 +173,10 @@@ msgstr " msgid "Enable ssl tracking" msgstr "" -#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:23 #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua:160 +#: applications/luci-app-mwan3/luasrc/model/cbi/mwan/interfaceconfig.lua:23 msgid "Enabled" - msgstr "" + msgstr "Zapnuté" #: applications/luci-app-mwan3/luasrc/model/cbi/mwan/ruleconfig.lua:64 msgid "" diff --cc applications/luci-app-olsr/po/fr/olsr.po index 20e754eabd,3bdb34d594..66dbf3f167 --- a/applications/luci-app-olsr/po/fr/olsr.po +++ b/applications/luci-app-olsr/po/fr/olsr.po @@@ -168,14 -168,14 +168,14 @@@ msgstr " #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:55 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:107 msgid "Gateway" - msgstr "" + msgstr "Passerelle" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:42 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:216 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:31 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:42 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:222 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:31 msgid "General Settings" msgstr "Paramètres généraux" @@@ -312,13 -312,13 +312,13 @@@ msgstr " msgid "IPv4" msgstr "IPv4" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:278 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:103 msgid "IPv4 broadcast" - msgstr "" + msgstr "Diffusion IPv4" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:279 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104 msgid "" "IPv4 broadcast address for outgoing OLSR packets. One useful example would " "be 255.255.255.255. Default is \"0.0.0.0\", which triggers the usage of the " @@@ -588,10 -588,10 +588,10 @@@ msgstr " #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:26 msgid "MTU" - msgstr "" + msgstr "MTU" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:132 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126 msgid "Main IP" msgstr "" @@@ -606,17 -606,17 +606,17 @@@ msgstr " msgid "Metric" msgstr "Métrique" +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:220 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:357 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:51 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:226 -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:376 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51 msgid "Mode" - msgstr "" + msgstr "Mode" -#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:246 +#: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71 msgid "" "Multiply routes with the factor given here. Allowed values are between 0.01 " "and 1.0. It is only used when LQ-Level is greater than 0. Examples: