Merge remote-tracking branch 'origin/master' into next

diff --git a/config/menu/20-status.menu b/config/menu/20-status.menu
index 802885ee3a441a29ca4da3fc33baf93621060481..2bcf0d5e8d0784ba5065005303c3cddc47e64557 100644 (file)
--- a/config/menu/20-status.menu
+++ b/config/menu/20-status.menu
@@ -41,15 +41,15 @@
                                'enabled' => 1,
                          };
        $substatus->{'53.networkovpn'} = {
-                               'caption' => "$Lang::tr{'openvpn client'}",
+                               'caption' => "$Lang::tr{'vpn statistic rw'}",
                                'uri' => '/cgi-bin/netovpnrw.cgi',
-                               'title' => "$Lang::tr{'openvpn client'}",
+                               'title' => "$Lang::tr{'vpn statistic rw'}",
                                'enabled' => 1,
                          };
        $substatus->{'54.networkovpnsrv'} = {
-                               'caption' => "$Lang::tr{'openvpn server'}",
+                               'caption' => "$Lang::tr{'vpn statistic n2n'}",
                                'uri' => '/cgi-bin/netovpnsrv.cgi',
-                               'title' => "$Lang::tr{'openvpn server'}",
+                               'title' => "$Lang::tr{'vpn statistics n2n'}",
                                'enabled' => 1,
                          };
     $substatus->{'60.hardwaregraphs'} = {

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 59bbe9673fc38ecb946e5b2bec5c4b4a4153d64b..3a31661f36020be486c095e4c34dcb9c3701673a 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -641,3 +641,4 @@ WARNING: untranslated string: routing config added
 WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
 WARNING: untranslated string: show tls-auth key
+WARNING: untranslated string: vpn statistics n2n

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 53e5f963cb28f282a69c60fe904a4be13672c225..da14d97b8cbd5d4af61a0d67219fd99d35ec986b 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -671,3 +671,4 @@ WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added
 WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
+WARNING: untranslated string: vpn statistics n2n

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 58945abe95862105193bf47cbd538241d7c36bd8..f76cd5e6a6acd02033d03107a4786c1b6c6b5257 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -1032,6 +1032,9 @@ WARNING: untranslated string: urlfilter redirect template
 WARNING: untranslated string: vendor
 WARNING: untranslated string: visit us at
 WARNING: untranslated string: vpn keyexchange
+WARNING: untranslated string: vpn statistic n2n
+WARNING: untranslated string: vpn statistic rw
+WARNING: untranslated string: vpn statistics n2n
 WARNING: untranslated string: wlan client
 WARNING: untranslated string: wlan client advanced settings
 WARNING: untranslated string: wlan client and

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 943b19717a6f92e2682d64cdda9c1dce59dc1785..178ddff61b15be0735bc7f384cf9f6b948ee6ed1 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -1043,6 +1043,9 @@ WARNING: untranslated string: urlfilter redirect template
 WARNING: untranslated string: vendor
 WARNING: untranslated string: visit us at
 WARNING: untranslated string: vpn keyexchange
+WARNING: untranslated string: vpn statistic n2n
+WARNING: untranslated string: vpn statistic rw
+WARNING: untranslated string: vpn statistics n2n
 WARNING: untranslated string: wlan client
 WARNING: untranslated string: wlan client advanced settings
 WARNING: untranslated string: wlan client and

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 309fbc79c39f2230ad09d5a44a1edc8cbc994aa9..1053474fc9de0ed96e0486305f34af03cdd9f258 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -749,3 +749,6 @@ WARNING: untranslated string: source ip country
 WARNING: untranslated string: ta key
 WARNING: untranslated string: upload dh key
 WARNING: untranslated string: vendor
+WARNING: untranslated string: vpn statistic n2n
+WARNING: untranslated string: vpn statistic rw
+WARNING: untranslated string: vpn statistics n2n

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 58945abe95862105193bf47cbd538241d7c36bd8..f76cd5e6a6acd02033d03107a4786c1b6c6b5257 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1032,6 +1032,9 @@ WARNING: untranslated string: urlfilter redirect template
 WARNING: untranslated string: vendor
 WARNING: untranslated string: visit us at
 WARNING: untranslated string: vpn keyexchange
+WARNING: untranslated string: vpn statistic n2n
+WARNING: untranslated string: vpn statistic rw
+WARNING: untranslated string: vpn statistics n2n
 WARNING: untranslated string: wlan client
 WARNING: untranslated string: wlan client advanced settings
 WARNING: untranslated string: wlan client and

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index de929418d037574dedba327128ca0e349534b78b..f524498c0a7a1dcf80eeac96426ec48d731adb27 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1021,6 +1021,9 @@ WARNING: untranslated string: urlfilter redirect template
 WARNING: untranslated string: vendor
 WARNING: untranslated string: visit us at
 WARNING: untranslated string: vpn keyexchange
+WARNING: untranslated string: vpn statistic n2n
+WARNING: untranslated string: vpn statistic rw
+WARNING: untranslated string: vpn statistics n2n
 WARNING: untranslated string: wlan client
 WARNING: untranslated string: wlan client advanced settings
 WARNING: untranslated string: wlan client and

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 679bc762791b590457e30c40a98b6b776da410c5..310b63668e27466acc4b0bc7b9333207d3915e49 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -677,3 +677,6 @@ WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added
 WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
+WARNING: untranslated string: vpn statistic n2n
+WARNING: untranslated string: vpn statistic rw
+WARNING: untranslated string: vpn statistics n2n

diff --git a/doc/language_missings b/doc/language_missings
index 05798b91145465f748a1d3aea7123c4814ec687b..0d73d2acfc90c767f39fb0813b662e5eaac3f9d8 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -509,6 +509,8 @@
 < vendor
 < visit us at
 < vpn keyexchange
+< vpn statistic n2n
+< vpn statistic rw
 < wlanap access point
 < wlanap channel
 < wlanap country
@@ -1079,6 +1081,8 @@
 < vendor
 < visit us at
 < vpn keyexchange
+< vpn statistic n2n
+< vpn statistic rw
 < wlanap country
 < wlan client
 < wlan client advanced settings
@@ -1604,6 +1608,8 @@
 < vendor
 < visit us at
 < vpn keyexchange
+< vpn statistic n2n
+< vpn statistic rw
 < wlanap country
 < wlan client
 < wlan client advanced settings
@@ -2134,6 +2140,8 @@
 < vendor
 < visit us at
 < vpn keyexchange
+< vpn statistic n2n
+< vpn statistic rw
 < week-graph
 < wlanap country
 < wlan client

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 859c8d3085a62b7e3e53b6d5fa302e4947653098..fe4a2008425e475f63d7c879fa4d8c387de0b780 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -2573,9 +2573,9 @@
 'vpn payload compression' => 'Datennutzlast-Kompression aushandeln',
 'vpn red name' => 'Öffentliche IP oder FQDN für das rote Interface oder <%defaultroute>',
 'vpn remote id' => 'Remote ID',
-'vpn subjectaltname' => 'Subjekt Alternativer Name',
-'vpn statistic rw' => 'OpenVPN-Roadwarrior-Statistik',
 'vpn statistic n2n' => 'OpenVPN-Netz-zu-Netz-Statistik',
+'vpn statistic rw' => 'OpenVPN-Roadwarrior-Statistik',
+'vpn subjectaltname' => 'Subjekt Alternativer Name',
 'vpn vhost' => 'Roadwarrior virtuelle IP (manchmal auch Inner-IP genannt)',
 'vpn watch' => 'Netz-zu-Netz VPN neu starten, wenn sich Remote-IP ändert (DynDNS).',
 'waiting to synchronize clock' => 'Bitte warten, die Uhr wird synchronisiert',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 6a9a983bf9221c8add90ad81a808f7bf4f8547d5..174300e9dc8143e85cc703e998d72fbfd3d1e718 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2615,8 +2615,8 @@
 'vpn payload compression' => 'Negotiate payload compression',
 'vpn red name' => 'Public IP or FQDN for RED interface or <%defaultroute>',
 'vpn remote id' => 'Remote ID',
-'vpn statistic rw' => 'OpenVPN Roadwarrior Statistics',
 'vpn statistic n2n' => 'OpenVPN Net-to-Net Statistics',
+'vpn statistic rw' => 'OpenVPN Roadwarrior Statistics',
 'vpn subjectaltname' => 'Subject Alt Name',
 'vpn vhost' => 'Roadwarrior virtual IP (sometimes called Inner-IP)',
 'vpn watch' => 'Restart net-to-net vpn when remote peer IP changes (dyndns).',