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

This commit is contained in:
Arne Fitzenreiter
2015-04-14 20:26:21 +02:00
12 changed files with 35 additions and 7 deletions

View File

@@ -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'} = {

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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',

View File

@@ -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).',