diff options
author | Hannu Nyman <hannu.nyman@iki.fi> | 2020-01-05 12:22:37 +0200 |
---|---|---|
committer | Hannu Nyman <hannu.nyman@iki.fi> | 2020-01-05 12:22:37 +0200 |
commit | 1cd0a4439bb132d095c8919e0016865b7210e7c0 (patch) | |
tree | a9561bb9ba4c622f8740d6f529e030cf0453ef46 /applications/luci-app-uhttpd/po/fr/uhttpd.po | |
parent | d60a1a13b091c622bc2d4d63321d2e3ea0437796 (diff) | |
parent | c2684197cb45443fdfe042221b7edb23f9d91057 (diff) |
Merge remote-tracking branch 'weblate/master'
Fixed weblate conflicts. Again. Hopefully.
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Diffstat (limited to 'applications/luci-app-uhttpd/po/fr/uhttpd.po')
-rw-r--r-- | applications/luci-app-uhttpd/po/fr/uhttpd.po | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/applications/luci-app-uhttpd/po/fr/uhttpd.po b/applications/luci-app-uhttpd/po/fr/uhttpd.po index 1c621bc9a3..91579fd727 100644 --- a/applications/luci-app-uhttpd/po/fr/uhttpd.po +++ b/applications/luci-app-uhttpd/po/fr/uhttpd.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2019-10-25 17:55+0000\n" -"Last-Translator: Nathan <bonnemainsnathan@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/" "luciapplicationsuhttpd/fr/>\n" "Language: fr\n" @@ -10,7 +10,7 @@ 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.9.1-dev\n" +"X-Generator: Weblate 3.10\n" #: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:135 msgid "" @@ -60,7 +60,7 @@ msgstr "" #: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:221 msgid "Country" -msgstr "" +msgstr "Pays" #: applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua:173 msgid "Disable JSON-RPC authorization via ubus session API" |