This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 30986dbf03b2ce231f3a53989d4d81ec7ccb1681 (commit) via c02327515412b1b3ffe147275623b8475fe03b1c (commit) via 6e8f58bf709b2bc7f381a648a88ce44dd4f23eed (commit) from 65f2c9bb3940fab663248f81aae2161a3d1e13a5 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 30986dbf03b2ce231f3a53989d4d81ec7ccb1681 Merge: 65f2c9b c023275 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Apr 14 20:26:21 2015 +0200
Merge remote-tracking branch 'origin/master' into next
-----------------------------------------------------------------------
Summary of changes: config/menu/20-status.menu | 8 ++++---- doc/language_issues.de | 1 + doc/language_issues.en | 1 + doc/language_issues.es | 3 +++ doc/language_issues.fr | 3 +++ doc/language_issues.nl | 3 +++ doc/language_issues.pl | 3 +++ doc/language_issues.ru | 3 +++ doc/language_issues.tr | 3 +++ doc/language_missings | 8 ++++++++ langs/de/cgi-bin/de.pl | 4 ++-- langs/en/cgi-bin/en.pl | 2 +- 12 files changed, 35 insertions(+), 7 deletions(-)
Difference in files: diff --git a/config/menu/20-status.menu b/config/menu/20-status.menu index 802885e..2bcf0d5 100644 --- 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 59bbe96..3a31661 100644 --- 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 53e5f96..da14d97 100644 --- 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 58945ab..f76cd5e 100644 --- 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 943b197..178ddff 100644 --- 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 309fbc7..1053474 100644 --- 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 58945ab..f76cd5e 100644 --- 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 de92941..f524498 100644 --- 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 679bc76..310b636 100644 --- 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 05798b9..0d73d2a 100644 --- 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 859c8d3..fe4a200 100644 --- 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 6a9a983..174300e 100644 --- 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).',
hooks/post-receive -- IPFire 2.x development tree