From c25c91fd4949889343069d01fd387af3f05772ee Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Wed, 11 Sep 2019 17:56:48 +0200
Subject: [PATCH] Update DSVPN interface

---
 luci-app-dsvpn/luasrc/controller/dsvpn.lua |  2 +-
 luci-app-dsvpn/luasrc/model/cbi/dsvpn.lua  |  6 +--
 luci-app-dsvpn/po/fr/dsvpn.po              | 52 ++++++++++++++++++++++
 luci-app-dsvpn/po/templates/dsvpn.pot      | 41 +++++++++++++++++
 4 files changed, 97 insertions(+), 4 deletions(-)
 create mode 100644 luci-app-dsvpn/po/fr/dsvpn.po
 create mode 100644 luci-app-dsvpn/po/templates/dsvpn.pot

diff --git a/luci-app-dsvpn/luasrc/controller/dsvpn.lua b/luci-app-dsvpn/luasrc/controller/dsvpn.lua
index 8476e4767..99793584a 100644
--- a/luci-app-dsvpn/luasrc/controller/dsvpn.lua
+++ b/luci-app-dsvpn/luasrc/controller/dsvpn.lua
@@ -1,7 +1,7 @@
 module("luci.controller.dsvpn", package.seeall)
 
 function index()
-	--entry({"admin", "openmptcprouter", "mlvpn"}, cbi("mlvpn"), _("MLVPN"))
+	--entry({"admin", "openmptcprouter", "mlvpn"}, cbi("mlvpn"), _("DSVPN"))
 	--entry({"admin", "services", "dsvpn"}, cbi("dsvpn"), _("DSVPN"))
 	entry({"admin", "vpn", "dsvpn"}, cbi("dsvpn"), _("DSVPN"))
 end
diff --git a/luci-app-dsvpn/luasrc/model/cbi/dsvpn.lua b/luci-app-dsvpn/luasrc/model/cbi/dsvpn.lua
index f3716d3c8..d0c6a3141 100644
--- a/luci-app-dsvpn/luasrc/model/cbi/dsvpn.lua
+++ b/luci-app-dsvpn/luasrc/model/cbi/dsvpn.lua
@@ -18,7 +18,7 @@ o.default     = "128.128.128.128"
 o.datatype    = "host"
 o.rmempty     = false
 
-o = s:option(Value, "port", translate("Remote/Bind port"))
+o = s:option(Value, "port", translate("Remote port"))
 o.placeholder = "65011"
 o.default     = "65011"
 o.datatype    = "port"
@@ -28,11 +28,11 @@ o.password    = true
 o.rmempty     = false
 
 
-o = s:option(Value, "localip", translate("Local IP"),translate("Tunnel local IP"))
+o = s:option(Value, "localip", translate("Tunnel local IP"))
 o.default     = "10.255.251.2"
 o.datatype    = "host"
 
-o = s:option(Value, "remoteip", translate("Remote IP"),translate("Tunnel remote IP"))
+o = s:option(Value, "remoteip", translate("Tunnel remote IP"))
 o.default     = "10.255.251.1"
 o.datatype    = "host"
 
diff --git a/luci-app-dsvpn/po/fr/dsvpn.po b/luci-app-dsvpn/po/fr/dsvpn.po
new file mode 100644
index 000000000..7eebcf23e
--- /dev/null
+++ b/luci-app-dsvpn/po/fr/dsvpn.po
@@ -0,0 +1,52 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: \n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 2.2.3\n"
+"Last-Translator: Ycarus <ycarus@zugaina.org>\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Language: fr\n"
+
+#: luci-app-dsvpn/luasrc/controller/dsvpn.lua:4
+#: luci-app-dsvpn/luasrc/controller/dsvpn.lua:5
+#: luci-app-dsvpn/luasrc/controller/dsvpn.lua:6
+#: luci-app-dsvpn/luasrc/model/cbi/dsvpn.lua:6
+msgid "DSVPN"
+msgstr ""
+
+#: luci-app-dsvpn/luasrc/model/cbi/dsvpn.lua:12
+msgid "Enable"
+msgstr "Activé"
+
+#: luci-app-dsvpn/luasrc/model/cbi/dsvpn.lua:39
+msgid "Interface name"
+msgstr "Nom de l'interface"
+
+#: luci-app-dsvpn/luasrc/model/cbi/dsvpn.lua:26
+msgid "Key"
+msgstr "Clef"
+
+#: luci-app-dsvpn/luasrc/model/cbi/dsvpn.lua:15
+msgid "Remote host"
+msgstr "Nom de l'hôte distant ou adresse IP"
+
+#: luci-app-dsvpn/luasrc/model/cbi/dsvpn.lua:21
+msgid "Remote port"
+msgstr "Port distant"
+
+#: luci-app-dsvpn/luasrc/model/cbi/dsvpn.lua:8
+msgid "Settings"
+msgstr "Paramètres"
+
+#: luci-app-dsvpn/luasrc/model/cbi/dsvpn.lua:31
+msgid "Tunnel local IP"
+msgstr "Adresse IP locale du tunnel"
+
+#: luci-app-dsvpn/luasrc/model/cbi/dsvpn.lua:35
+msgid "Tunnel remote IP"
+msgstr "Adresse IP distance du tunnel"
diff --git a/luci-app-dsvpn/po/templates/dsvpn.pot b/luci-app-dsvpn/po/templates/dsvpn.pot
new file mode 100644
index 000000000..bc26ff694
--- /dev/null
+++ b/luci-app-dsvpn/po/templates/dsvpn.pot
@@ -0,0 +1,41 @@
+msgid ""
+msgstr "Content-Type: text/plain; charset=UTF-8"
+
+#: luci-app-dsvpn/luasrc/controller/dsvpn.lua:4
+#: luci-app-dsvpn/luasrc/controller/dsvpn.lua:5
+#: luci-app-dsvpn/luasrc/controller/dsvpn.lua:6
+#: luci-app-dsvpn/luasrc/model/cbi/dsvpn.lua:6
+msgid "DSVPN"
+msgstr ""
+
+#: luci-app-dsvpn/luasrc/model/cbi/dsvpn.lua:12
+msgid "Enable"
+msgstr ""
+
+#: luci-app-dsvpn/luasrc/model/cbi/dsvpn.lua:39
+msgid "Interface name"
+msgstr ""
+
+#: luci-app-dsvpn/luasrc/model/cbi/dsvpn.lua:26
+msgid "Key"
+msgstr ""
+
+#: luci-app-dsvpn/luasrc/model/cbi/dsvpn.lua:15
+msgid "Remote host"
+msgstr ""
+
+#: luci-app-dsvpn/luasrc/model/cbi/dsvpn.lua:21
+msgid "Remote port"
+msgstr ""
+
+#: luci-app-dsvpn/luasrc/model/cbi/dsvpn.lua:8
+msgid "Settings"
+msgstr ""
+
+#: luci-app-dsvpn/luasrc/model/cbi/dsvpn.lua:31
+msgid "Tunnel local IP"
+msgstr ""
+
+#: luci-app-dsvpn/luasrc/model/cbi/dsvpn.lua:35
+msgid "Tunnel remote IP"
+msgstr ""