Merge remote-tracking branch 'weblate/master'

Fixed weblate conflicts. Again. Hopefully.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

2 files changed, 11 insertions, 11 deletions

diff --git a/applications/luci-app-advanced-reboot/po/fr/advanced-reboot.po b/applications/luci-app-advanced-reboot/po/fr/advanced-reboot.po
index 894681fd2..c60d39591 100644
--- a/applications/luci-app-advanced-reboot/po/fr/advanced-reboot.po
+++ b/applications/luci-app-advanced-reboot/po/fr/advanced-reboot.po
@@ -1,14 +1,14 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-11-17 11:07+0000\n"
-"Last-Translator: ButterflyOfFire <ButterflyOfFire@protonmail.com>\n"
+"PO-Revision-Date: 2020-01-03 04:35+0000\n"
+"Last-Translator: Philippe Paté <asushen@gmail.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsadvanced-reboot/fr/>\n"
 "Language: fr\n"
 "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:189
 #: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:10
@@ -45,7 +45,7 @@ msgstr "ERREUR :"
 
 #: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:28
 msgid "Firmware"
-msgstr ""
+msgstr "Firmware"
 
 #: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/applyreboot.htm:45
 msgid "Loading"
@@ -78,7 +78,7 @@ msgstr "Continuer"
 
 #: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:29
 msgid "Reboot"
-msgstr ""
+msgstr "Redémarrage"
 
 #: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/alternative_reboot.htm:10
 msgid "Reboot Device to an Alternative Partition"
@@ -233,11 +233,11 @@ msgstr ""
 
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:44
 msgid "attempting to mount alternative partition"
-msgstr ""
+msgstr "Tentative de montage de la partition alternative"
 
 #: 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:244
 #: applications/luci-app-advanced-reboot/luasrc/controller/advanced_reboot.lua:245
diff --git a/applications/luci-app-advanced-reboot/po/ro/advanced-reboot.po b/applications/luci-app-advanced-reboot/po/ro/advanced-reboot.po
index 7a589e33c..5aefa32a9 100644
--- a/applications/luci-app-advanced-reboot/po/ro/advanced-reboot.po
+++ b/applications/luci-app-advanced-reboot/po/ro/advanced-reboot.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
-"PO-Revision-Date: 2019-11-06 00:14+0000\n"
-"Last-Translator: olimpiumarius <oliver_magnum44@yahoo.com>\n"
+"PO-Revision-Date: 2020-01-03 04:35+0000\n"
+"Last-Translator: Cristian Ciobanu <cioby.service@gmail.com>\n"
 "Language-Team: Romanian <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsadvanced-reboot/ro/>\n"
 "Language: ro\n"
@@ -9,7 +9,7 @@ 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:189
 #: applications/luci-app-advanced-reboot/luasrc/view/advanced_reboot/advanced_reboot.htm:10
@@ -50,7 +50,7 @@ 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:231
 msgid "No access to fw_printenv or fw_printenv!"