Merge remote-tracking branch 'weblate/master'

Fixed weblate conflicts. Again. Hopefully.

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

1 files changed, 9 insertions, 9 deletions

diff --git a/applications/luci-app-olsr/po/fr/olsr.po b/applications/luci-app-olsr/po/fr/olsr.po
index 20e754eab..66dbf3f16 100644
--- a/applications/luci-app-olsr/po/fr/olsr.po
+++ b/applications/luci-app-olsr/po/fr/olsr.po
@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-05-19 19:36+0200\n"
-"PO-Revision-Date: 2019-12-26 18:22+0000\n"
-"Last-Translator: reyur <remicaruyer@gmail.com>\n"
+"PO-Revision-Date: 2020-01-03 04:11+0000\n"
+"Last-Translator: Philippe Paté <asushen@gmail.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/openwrt/"
 "luciapplicationsolsr/fr/>\n"
 "Language: fr\n"
@@ -168,7 +168,7 @@ 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
@@ -315,7 +315,7 @@ msgstr "IPv4"
 #: 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/olsrd.lua:279
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:104
@@ -588,7 +588,7 @@ 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/olsrd.lua:132
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua:126
@@ -613,7 +613,7 @@ msgstr "Métrique"
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:51
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua:51
 msgid "Mode"
-msgstr ""
+msgstr "Mode"
 
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua:246
 #: applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua:71
@@ -740,7 +740,7 @@ msgstr ""
 
 #: applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm:157
 msgid "Overview"
-msgstr "Vue d'ensemble"
+msgstr "Vue d\\'ensemble"
 
 #: applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm:87
 msgid "Overview of currently active OLSR host net announcements"
@@ -1100,7 +1100,7 @@ msgstr ""
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "no"
-msgstr ""
+msgstr "non"
 
 #: applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm:38
 msgid "up"
@@ -1114,4 +1114,4 @@ msgstr ""
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:138
 #: applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm:139
 msgid "yes"
-msgstr ""
+msgstr "Oui"