Merge remote-tracking branch 'weblate/master'

Fixed the weblate conflicts. Hopefully...

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

1 files changed, 23 insertions, 15 deletions

diff --git a/applications/luci-app-omcproxy/po/fr/omcproxy.po b/applications/luci-app-omcproxy/po/fr/omcproxy.po
index 99523f90f3..5ebd51d4e6 100644
--- a/applications/luci-app-omcproxy/po/fr/omcproxy.po
+++ b/applications/luci-app-omcproxy/po/fr/omcproxy.po
@@ -1,70 +1,78 @@
 msgid ""
 msgstr ""
+"PO-Revision-Date: 2019-12-26 18:24+0000\n"
+"Last-Translator: reyur <remicaruyer@gmail.com>\n"
+"Language-Team: French <https://hosted.weblate.org/projects/openwrt/"
+"luciapplicationsomcproxy/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\n"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:17
 msgid "Add instance"
-msgstr ""
+msgstr "Ajouter une instance"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Downlink interface"
-msgstr ""
+msgstr "Interface Downlink"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 msgid "Embedded IGMPv3 and MLDv2 proxy"
-msgstr ""
+msgstr "Proxy IGMPv3 et MLDv2 intégré"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Minimum multicast scope to proxy (only affects IPv6 multicast)"
 msgstr ""
+"Portée de multidiffusion minimale vers le proxy (affecte uniquement la "
+"multidiffusion IPv6)"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:14
 msgid "Proxy Instance"
-msgstr ""
+msgstr "Instance proxy"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:19
 msgid "Scope"
-msgstr ""
+msgstr "Portée"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Uplink interface"
-msgstr ""
+msgstr "Interface Uplink"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:30
 msgid "Where does the multicast come from?"
-msgstr ""
+msgstr "D'où vient le multicast ?"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:34
 msgid "Where does the multicast go to?"
-msgstr ""
+msgstr "Où va le multicast ?"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:25
 msgid "admin-local"
-msgstr ""
+msgstr "admin-local"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:21
 msgid "default"
-msgstr ""
+msgstr "Par défaut"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:22
 msgid "global"
-msgstr ""
+msgstr "Global"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:12
 #: applications/luci-app-omcproxy/luasrc/controller/omcproxy.lua:11
 msgid "omcproxy"
-msgstr ""
+msgstr "omcproxy"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:23
 msgid "organization-local"
-msgstr ""
+msgstr "organization-local"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:26
 msgid "realm"
-msgstr ""
+msgstr "Domaine"
 
 #: applications/luci-app-omcproxy/htdocs/luci-static/resources/view/omcproxy.js:24
 msgid "site-local"
-msgstr ""
+msgstr "site-local"