[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 736d1ed96ec00bafb3635f67673796151de02774 - IPFire-SCM

16 Sep 2011

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, master has been updated
       via  736d1ed96ec00bafb3635f67673796151de02774 (commit)
       via  509d6c572633e475520f2ab4ba5da36a026678ec (commit)
       via  cd0c0a0de72e975c87426642d09897aaf3d293e9 (commit)
       via  42a1655807987cc2c51cd06cfa832dbf4de0639a (commit)
      from  c0c9df130fbb3c5080755822d227277627605196 (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 736d1ed96ec00bafb3635f67673796151de02774
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Fri Sep 16 19:46:03 2011 +0200
apache2: update to 2.2.21.
commit 509d6c572633e475520f2ab4ba5da36a026678ec
Merge: c0c9df1 cd0c0a0
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Fri Sep 16 19:40:44 2011 +0200
Merge commit 'origin/next'
Conflicts:
    	html/cgi-bin/ovpnmain.cgi
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/core/{50 => 53}/filelists/apache2 |    0
 config/rootfiles/core/53/update.sh                 |    2 +
 doc/language_issues.de                             |    9 ++--
 doc/language_issues.en                             |    9 ++--
 doc/language_issues.es                             |   19 ++++++--
 doc/language_issues.fr                             |   19 ++++++--
 doc/language_issues.pl                             |   19 ++++++--
 doc/language_issues.ru                             |   18 +++++--
 doc/language_missings                              |   49 ++++++++++++++++++++
 html/cgi-bin/ovpnmain.cgi                          |   26 +++++-----
 langs/de/cgi-bin/de.pl                             |   16 +++++-
 langs/en/cgi-bin/en.pl                             |   16 +++++-
 langs/es/cgi-bin/es.pl                             |    2 +-
 langs/fr/cgi-bin/fr.pl                             |    2 +-
 langs/pl/cgi-bin/pl.pl                             |    2 +-
 lfs/apache2                                        |    4 +-
 16 files changed, 163 insertions(+), 49 deletions(-)
 copy config/rootfiles/core/{50 => 53}/filelists/apache2 (100%)
Difference in files:

diff --git a/config/rootfiles/core/53/filelists/apache2 b/config/rootfiles/core/53/filelists/apache2
new file mode 120000
index 0000000..eef95ef
--- /dev/null
+++ b/config/rootfiles/core/53/filelists/apache2
@@ -0,0 +1 @@
+../../../common/apache2
\ No newline at end of file
diff --git a/config/rootfiles/core/53/update.sh b/config/rootfiles/core/53/update.sh
index 10b45b9..fbf1995 100644
--- a/config/rootfiles/core/53/update.sh
+++ b/config/rootfiles/core/53/update.sh
@@ -36,6 +36,7 @@ done
 #Stop services
/etc/init.d/ipsec stop
+/etc/init.d/apache stop
#
 # Remove old strongswan libs
@@ -65,6 +66,7 @@ sed -i -e "s|^options cfg80211 ieee80211_regdom=EU|#options cfg80211 ieee80211_r
 #
 #Start services
+/etc/init.d/apache start
 if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
    /etc/init.d/ipsec start
 fi
diff --git a/doc/language_issues.de b/doc/language_issues.de
index 0f1b918..d182dbb 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -1,4 +1,3 @@
-WARNING: translation string unused: Act as
 WARNING: translation string unused: Client status and controlc
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
@@ -97,6 +96,7 @@ WARNING: translation string unused: custom networks
 WARNING: translation string unused: custom services
 WARNING: translation string unused: daily firewallhits
 WARNING: translation string unused: dat without key
+WARNING: translation string unused: day-graph
 WARNING: translation string unused: dbfile
 WARNING: translation string unused: ddns help dnsmadeeasy
 WARNING: translation string unused: ddns help freedns
@@ -169,6 +169,7 @@ WARNING: translation string unused: hint
 WARNING: translation string unused: host
 WARNING: translation string unused: host configuration
 WARNING: translation string unused: hostname and domain already in use
+WARNING: translation string unused: hour-graph
 WARNING: translation string unused: hours2
 WARNING: translation string unused: ibod for dual isdn only
 WARNING: translation string unused: icmp selected but no type
@@ -196,7 +197,6 @@ WARNING: translation string unused: invalid upstream proxy username or password
 WARNING: translation string unused: invert
 WARNING: translation string unused: ip address in use
 WARNING: translation string unused: ipfire side
-WARNING: translation string unused: ipfire side is invalid
 WARNING: translation string unused: iptable rules
 WARNING: translation string unused: isdn
 WARNING: translation string unused: isdn settings
@@ -245,6 +245,7 @@ WARNING: translation string unused: modem on com3
 WARNING: translation string unused: modem on com4
 WARNING: translation string unused: modem on com5
 WARNING: translation string unused: modulation
+WARNING: translation string unused: month-graph
 WARNING: translation string unused: monthly firewallhits
 WARNING: translation string unused: monthly start day bad
 WARNING: translation string unused: monthly traffic bad
@@ -278,8 +279,6 @@ WARNING: translation string unused: o-no
 WARNING: translation string unused: o-yes
 WARNING: translation string unused: online help en
 WARNING: translation string unused: only red
-WARNING: translation string unused: openvpn client
-WARNING: translation string unused: openvpn server
 WARNING: translation string unused: optional data
 WARNING: translation string unused: optionsfw portlist hint
 WARNING: translation string unused: optionsfw warning
@@ -457,8 +456,10 @@ WARNING: translation string unused: vpn on green
 WARNING: translation string unused: vpn on orange
 WARNING: translation string unused: warn when traffic reaches
 WARNING: translation string unused: web proxy configuration
+WARNING: translation string unused: week-graph
 WARNING: translation string unused: weekly firewallhits
 WARNING: translation string unused: xtaccess bad transfert
+WARNING: translation string unused: year-graph
 WARNING: translation string unused: yearly firewallhits
 WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: bytes
diff --git a/doc/language_issues.en b/doc/language_issues.en
index bffff80..3ae364c 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -1,4 +1,3 @@
-WARNING: translation string unused: Act as
 WARNING: translation string unused: Client status and controlc
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
@@ -118,6 +117,7 @@ WARNING: translation string unused: custom networks
 WARNING: translation string unused: custom services
 WARNING: translation string unused: daily firewallhits
 WARNING: translation string unused: dat without key
+WARNING: translation string unused: day-graph
 WARNING: translation string unused: dbfile
 WARNING: translation string unused: ddns help dnsmadeeasy
 WARNING: translation string unused: ddns help freedns
@@ -195,6 +195,7 @@ WARNING: translation string unused: hint
 WARNING: translation string unused: host
 WARNING: translation string unused: host configuration
 WARNING: translation string unused: hostname and domain already in use
+WARNING: translation string unused: hour-graph
 WARNING: translation string unused: hours2
 WARNING: translation string unused: ibod for dual isdn only
 WARNING: translation string unused: icmp selected but no type
@@ -223,7 +224,6 @@ WARNING: translation string unused: invalid upstream proxy username or password
 WARNING: translation string unused: invert
 WARNING: translation string unused: ip address in use
 WARNING: translation string unused: ipfire side
-WARNING: translation string unused: ipfire side is invalid
 WARNING: translation string unused: iptable rules
 WARNING: translation string unused: isdn
 WARNING: translation string unused: isdn settings
@@ -272,6 +272,7 @@ WARNING: translation string unused: modem on com3
 WARNING: translation string unused: modem on com4
 WARNING: translation string unused: modem on com5
 WARNING: translation string unused: modulation
+WARNING: translation string unused: month-graph
 WARNING: translation string unused: monthly firewallhits
 WARNING: translation string unused: monthly start day bad
 WARNING: translation string unused: monthly traffic bad
@@ -306,8 +307,6 @@ WARNING: translation string unused: o-no
 WARNING: translation string unused: o-yes
 WARNING: translation string unused: online help en
 WARNING: translation string unused: only red
-WARNING: translation string unused: openvpn client
-WARNING: translation string unused: openvpn server
 WARNING: translation string unused: optional data
 WARNING: translation string unused: optionsfw portlist hint
 WARNING: translation string unused: optionsfw warning
@@ -490,8 +489,10 @@ WARNING: translation string unused: vpn on green
 WARNING: translation string unused: vpn on orange
 WARNING: translation string unused: warn when traffic reaches
 WARNING: translation string unused: web proxy configuration
+WARNING: translation string unused: week-graph
 WARNING: translation string unused: weekly firewallhits
 WARNING: translation string unused: xtaccess bad transfert
+WARNING: translation string unused: year-graph
 WARNING: translation string unused: yearly firewallhits
 WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: bytes
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 0ef2eac..6b2ab8e 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -1,4 +1,3 @@
-WARNING: translation string unused: Act as
 WARNING: translation string unused: Client status and controlc
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
@@ -118,6 +117,7 @@ WARNING: translation string unused: custom networks
 WARNING: translation string unused: custom services
 WARNING: translation string unused: daily firewallhits
 WARNING: translation string unused: dat without key
+WARNING: translation string unused: day-graph
 WARNING: translation string unused: dbfile
 WARNING: translation string unused: ddns help dnsmadeeasy
 WARNING: translation string unused: ddns help freedns
@@ -195,6 +195,7 @@ WARNING: translation string unused: hint
 WARNING: translation string unused: host
 WARNING: translation string unused: host configuration
 WARNING: translation string unused: hostname and domain already in use
+WARNING: translation string unused: hour-graph
 WARNING: translation string unused: hours2
 WARNING: translation string unused: ibod for dual isdn only
 WARNING: translation string unused: icmp selected but no type
@@ -223,7 +224,6 @@ WARNING: translation string unused: invalid upstream proxy username or password
 WARNING: translation string unused: invert
 WARNING: translation string unused: ip address in use
 WARNING: translation string unused: ipfire side
-WARNING: translation string unused: ipfire side is invalid
 WARNING: translation string unused: iptable rules
 WARNING: translation string unused: isdn
 WARNING: translation string unused: isdn settings
@@ -272,6 +272,7 @@ WARNING: translation string unused: modem on com3
 WARNING: translation string unused: modem on com4
 WARNING: translation string unused: modem on com5
 WARNING: translation string unused: modulation
+WARNING: translation string unused: month-graph
 WARNING: translation string unused: monthly firewallhits
 WARNING: translation string unused: monthly start day bad
 WARNING: translation string unused: monthly traffic bad
@@ -306,8 +307,6 @@ WARNING: translation string unused: o-no
 WARNING: translation string unused: o-yes
 WARNING: translation string unused: online help en
 WARNING: translation string unused: only red
-WARNING: translation string unused: openvpn client
-WARNING: translation string unused: openvpn server
 WARNING: translation string unused: optional data
 WARNING: translation string unused: optionsfw portlist hint
 WARNING: translation string unused: optionsfw warning
@@ -491,8 +490,10 @@ WARNING: translation string unused: vpn on green
 WARNING: translation string unused: vpn on orange
 WARNING: translation string unused: warn when traffic reaches
 WARNING: translation string unused: web proxy configuration
+WARNING: translation string unused: week-graph
 WARNING: translation string unused: weekly firewallhits
 WARNING: translation string unused: xtaccess bad transfert
+WARNING: translation string unused: year-graph
 WARNING: translation string unused: yearly firewallhits
 WARNING: untranslated string: Async logging enabled
 WARNING: untranslated string: Scan for Songs
@@ -517,6 +518,16 @@ WARNING: untranslated string: fireinfo why read more
 WARNING: untranslated string: fireinfo your profile id
 WARNING: untranslated string: minute
 WARNING: untranslated string: new
+WARNING: untranslated string: openvpn default
+WARNING: untranslated string: openvpn destination port used
+WARNING: untranslated string: openvpn disabled
+WARNING: untranslated string: openvpn enabled
+WARNING: untranslated string: openvpn fragment allowed with udp
+WARNING: untranslated string: openvpn mssfix allowed with udp
+WARNING: untranslated string: openvpn prefix local subnet
+WARNING: untranslated string: openvpn prefix openvpn subnet
+WARNING: untranslated string: openvpn prefix remote subnet
+WARNING: untranslated string: openvpn subnet is used
 WARNING: untranslated string: outgoing firewall add ip group
 WARNING: untranslated string: outgoing firewall add mac group
 WARNING: untranslated string: outgoing firewall edit ip group
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 00cb462..b1a94a1 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -1,4 +1,3 @@
-WARNING: translation string unused: Act as
 WARNING: translation string unused: Client status and controlc
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
@@ -118,6 +117,7 @@ WARNING: translation string unused: custom networks
 WARNING: translation string unused: custom services
 WARNING: translation string unused: daily firewallhits
 WARNING: translation string unused: dat without key
+WARNING: translation string unused: day-graph
 WARNING: translation string unused: dbfile
 WARNING: translation string unused: ddns help dnsmadeeasy
 WARNING: translation string unused: ddns help freedns
@@ -195,6 +195,7 @@ WARNING: translation string unused: hint
 WARNING: translation string unused: host
 WARNING: translation string unused: host configuration
 WARNING: translation string unused: hostname and domain already in use
+WARNING: translation string unused: hour-graph
 WARNING: translation string unused: hours2
 WARNING: translation string unused: ibod for dual isdn only
 WARNING: translation string unused: icmp selected but no type
@@ -223,7 +224,6 @@ WARNING: translation string unused: invalid upstream proxy username or password
 WARNING: translation string unused: invert
 WARNING: translation string unused: ip address in use
 WARNING: translation string unused: ipfire side
-WARNING: translation string unused: ipfire side is invalid
 WARNING: translation string unused: iptable rules
 WARNING: translation string unused: isdn
 WARNING: translation string unused: isdn settings
@@ -272,6 +272,7 @@ WARNING: translation string unused: modem on com3
 WARNING: translation string unused: modem on com4
 WARNING: translation string unused: modem on com5
 WARNING: translation string unused: modulation
+WARNING: translation string unused: month-graph
 WARNING: translation string unused: monthly firewallhits
 WARNING: translation string unused: monthly start day bad
 WARNING: translation string unused: monthly traffic bad
@@ -306,8 +307,6 @@ WARNING: translation string unused: o-no
 WARNING: translation string unused: o-yes
 WARNING: translation string unused: online help en
 WARNING: translation string unused: only red
-WARNING: translation string unused: openvpn client
-WARNING: translation string unused: openvpn server
 WARNING: translation string unused: optional data
 WARNING: translation string unused: optionsfw portlist hint
 WARNING: translation string unused: optionsfw warning
@@ -492,8 +491,10 @@ WARNING: translation string unused: vpn on green
 WARNING: translation string unused: vpn on orange
 WARNING: translation string unused: warn when traffic reaches
 WARNING: translation string unused: web proxy configuration
+WARNING: translation string unused: week-graph
 WARNING: translation string unused: weekly firewallhits
 WARNING: translation string unused: xtaccess bad transfert
+WARNING: translation string unused: year-graph
 WARNING: translation string unused: yearly firewallhits
 WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: bytes
@@ -519,6 +520,16 @@ WARNING: untranslated string: minute
 WARNING: untranslated string: new
 WARNING: untranslated string: ntp common settings
 WARNING: untranslated string: ntp sync
+WARNING: untranslated string: openvpn default
+WARNING: untranslated string: openvpn destination port used
+WARNING: untranslated string: openvpn disabled
+WARNING: untranslated string: openvpn enabled
+WARNING: untranslated string: openvpn fragment allowed with udp
+WARNING: untranslated string: openvpn mssfix allowed with udp
+WARNING: untranslated string: openvpn prefix local subnet
+WARNING: untranslated string: openvpn prefix openvpn subnet
+WARNING: untranslated string: openvpn prefix remote subnet
+WARNING: untranslated string: openvpn subnet is used
 WARNING: untranslated string: outgoing firewall reserved groupname
 WARNING: untranslated string: pakfire ago
 WARNING: untranslated string: route config changed
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 0ef2eac..6b2ab8e 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1,4 +1,3 @@
-WARNING: translation string unused: Act as
 WARNING: translation string unused: Client status and controlc
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
@@ -118,6 +117,7 @@ WARNING: translation string unused: custom networks
 WARNING: translation string unused: custom services
 WARNING: translation string unused: daily firewallhits
 WARNING: translation string unused: dat without key
+WARNING: translation string unused: day-graph
 WARNING: translation string unused: dbfile
 WARNING: translation string unused: ddns help dnsmadeeasy
 WARNING: translation string unused: ddns help freedns
@@ -195,6 +195,7 @@ WARNING: translation string unused: hint
 WARNING: translation string unused: host
 WARNING: translation string unused: host configuration
 WARNING: translation string unused: hostname and domain already in use
+WARNING: translation string unused: hour-graph
 WARNING: translation string unused: hours2
 WARNING: translation string unused: ibod for dual isdn only
 WARNING: translation string unused: icmp selected but no type
@@ -223,7 +224,6 @@ WARNING: translation string unused: invalid upstream proxy username or password
 WARNING: translation string unused: invert
 WARNING: translation string unused: ip address in use
 WARNING: translation string unused: ipfire side
-WARNING: translation string unused: ipfire side is invalid
 WARNING: translation string unused: iptable rules
 WARNING: translation string unused: isdn
 WARNING: translation string unused: isdn settings
@@ -272,6 +272,7 @@ WARNING: translation string unused: modem on com3
 WARNING: translation string unused: modem on com4
 WARNING: translation string unused: modem on com5
 WARNING: translation string unused: modulation
+WARNING: translation string unused: month-graph
 WARNING: translation string unused: monthly firewallhits
 WARNING: translation string unused: monthly start day bad
 WARNING: translation string unused: monthly traffic bad
@@ -306,8 +307,6 @@ WARNING: translation string unused: o-no
 WARNING: translation string unused: o-yes
 WARNING: translation string unused: online help en
 WARNING: translation string unused: only red
-WARNING: translation string unused: openvpn client
-WARNING: translation string unused: openvpn server
 WARNING: translation string unused: optional data
 WARNING: translation string unused: optionsfw portlist hint
 WARNING: translation string unused: optionsfw warning
@@ -491,8 +490,10 @@ WARNING: translation string unused: vpn on green
 WARNING: translation string unused: vpn on orange
 WARNING: translation string unused: warn when traffic reaches
 WARNING: translation string unused: web proxy configuration
+WARNING: translation string unused: week-graph
 WARNING: translation string unused: weekly firewallhits
 WARNING: translation string unused: xtaccess bad transfert
+WARNING: translation string unused: year-graph
 WARNING: translation string unused: yearly firewallhits
 WARNING: untranslated string: Async logging enabled
 WARNING: untranslated string: Scan for Songs
@@ -517,6 +518,16 @@ WARNING: untranslated string: fireinfo why read more
 WARNING: untranslated string: fireinfo your profile id
 WARNING: untranslated string: minute
 WARNING: untranslated string: new
+WARNING: untranslated string: openvpn default
+WARNING: untranslated string: openvpn destination port used
+WARNING: untranslated string: openvpn disabled
+WARNING: untranslated string: openvpn enabled
+WARNING: untranslated string: openvpn fragment allowed with udp
+WARNING: untranslated string: openvpn mssfix allowed with udp
+WARNING: untranslated string: openvpn prefix local subnet
+WARNING: untranslated string: openvpn prefix openvpn subnet
+WARNING: untranslated string: openvpn prefix remote subnet
+WARNING: untranslated string: openvpn subnet is used
 WARNING: untranslated string: outgoing firewall add ip group
 WARNING: untranslated string: outgoing firewall add mac group
 WARNING: untranslated string: outgoing firewall edit ip group
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 9add81b..ee67873 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1,4 +1,3 @@
-WARNING: translation string unused: Act as
 WARNING: translation string unused: Client status and controlc
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
@@ -174,7 +173,6 @@ WARNING: translation string unused: firewall log viewer
 WARNING: translation string unused: firmware
 WARNING: translation string unused: firmware upload
 WARNING: translation string unused: force update
-WARNING: translation string unused: frequency
 WARNING: translation string unused: fritzdsl help
 WARNING: translation string unused: fritzdsl upload
 WARNING: translation string unused: from email adr
@@ -221,7 +219,6 @@ WARNING: translation string unused: invalid upstream proxy username or password
 WARNING: translation string unused: invert
 WARNING: translation string unused: ip address in use
 WARNING: translation string unused: ipfire side
-WARNING: translation string unused: ipfire side is invalid
 WARNING: translation string unused: iptable rules
 WARNING: translation string unused: isdn
 WARNING: translation string unused: isdn settings
@@ -304,8 +301,6 @@ WARNING: translation string unused: o-no
 WARNING: translation string unused: o-yes
 WARNING: translation string unused: online help en
 WARNING: translation string unused: only red
-WARNING: translation string unused: openvpn client
-WARNING: translation string unused: openvpn server
 WARNING: translation string unused: optional data
 WARNING: translation string unused: optionsfw portlist hint
 WARNING: translation string unused: optionsfw warning
@@ -495,6 +490,7 @@ WARNING: untranslated string: Add a route
 WARNING: untranslated string: Edit an existing route
 WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: bytes
+WARNING: untranslated string: disk access per
 WARNING: untranslated string: extrahd because there is already a device mounted
 WARNING: untranslated string: extrahd cant umount
 WARNING: untranslated string: extrahd install or load driver
@@ -502,9 +498,21 @@ WARNING: untranslated string: extrahd maybe the device is in use
 WARNING: untranslated string: extrahd to
 WARNING: untranslated string: extrahd to root
 WARNING: untranslated string: extrahd you cant mount
+WARNING: untranslated string: incoming traffic in bytes per second
 WARNING: untranslated string: minute
 WARNING: untranslated string: new
+WARNING: untranslated string: openvpn default
+WARNING: untranslated string: openvpn destination port used
+WARNING: untranslated string: openvpn disabled
+WARNING: untranslated string: openvpn enabled
+WARNING: untranslated string: openvpn fragment allowed with udp
+WARNING: untranslated string: openvpn mssfix allowed with udp
+WARNING: untranslated string: openvpn prefix local subnet
+WARNING: untranslated string: openvpn prefix openvpn subnet
+WARNING: untranslated string: openvpn prefix remote subnet
+WARNING: untranslated string: openvpn subnet is used
 WARNING: untranslated string: outgoing firewall reserved groupname
+WARNING: untranslated string: outgoing traffic in bytes per second
 WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added
 WARNING: untranslated string: routing config changed
diff --git a/doc/language_missings b/doc/language_missings
index 5dc1dae..16e3ba5 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -31,6 +31,16 @@
 < minute
 < ntp common settings
 < ntp sync
+< openvpn default
+< openvpn destination port used
+< openvpn disabled
+< openvpn enabled
+< openvpn fragment allowed with udp
+< openvpn mssfix allowed with udp
+< openvpn prefix local subnet
+< openvpn prefix openvpn subnet
+< openvpn prefix remote subnet
+< openvpn subnet is used
 < snort working
 < static routes
 < system information
@@ -83,6 +93,16 @@
 < fireinfo why read more
 < fireinfo your profile id
 < minute
+< openvpn default
+< openvpn destination port used
+< openvpn disabled
+< openvpn enabled
+< openvpn fragment allowed with udp
+< openvpn mssfix allowed with udp
+< openvpn prefix local subnet
+< openvpn prefix openvpn subnet
+< openvpn prefix remote subnet
+< openvpn subnet is used
 < outgoing firewall add ip group
 < outgoing firewall add mac group
 < outgoing firewall edit ip group
@@ -117,6 +137,16 @@
 < extrahd unable to write
 < extrahd you cant mount
 < minute
+< openvpn default
+< openvpn destination port used
+< openvpn disabled
+< openvpn enabled
+< openvpn fragment allowed with udp
+< openvpn mssfix allowed with udp
+< openvpn prefix local subnet
+< openvpn prefix openvpn subnet
+< openvpn prefix remote subnet
+< openvpn subnet is used
 < static routes
 < vpn keyexchange
 ############################################################################
@@ -126,6 +156,8 @@
 # Checking cgi-bin translations for language: ru                           #
 ############################################################################
 < Add a route
+< day-graph
+< disk access per
 < Edit an existing route
 < extrahd because there is already a device mounted
 < extrahd cant umount
@@ -136,6 +168,23 @@
 < extrahd unable to read
 < extrahd unable to write
 < extrahd you cant mount
+< frequency
+< hour-graph
+< incoming traffic in bytes per second
 < minute
+< month-graph
+< openvpn default
+< openvpn destination port used
+< openvpn disabled
+< openvpn enabled
+< openvpn fragment allowed with udp
+< openvpn mssfix allowed with udp
+< openvpn prefix local subnet
+< openvpn prefix openvpn subnet
+< openvpn prefix remote subnet
+< openvpn subnet is used
+< outgoing traffic in bytes per second
 < static routes
 < vpn keyexchange
+< week-graph
+< year-graph
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 165f351..b6c5fc0 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -2607,49 +2607,49 @@ if ($confighash{$cgiparams{'KEY'}}) {
 if ($cgiparams{'TYPE'} eq 'net') {
    	
     if ($cgiparams{'DEST_PORT'} eq  $vpnsettings{'DDEST_PORT'}) {
-			$errormessage = 'The Destination Port is used by the OpenVPN Server please change';
+			$errormessage = $Lang::tr{'openvpn destination port used'};
    		unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!";
        rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!";
       goto VPNCONF_ERROR;			
    	}
if ($cgiparams{'OVPN_SUBNET'} eq  $vpnsettings{'DOVPN_SUBNET'}) {
-			$errormessage = 'The OpenVPN Subnet is used by the OpenVPN Server please change';
+			$errormessage = $Lang::tr{'openvpn subnet is used'};
    		unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!";
        rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!";
    		goto VPNCONF_ERROR;			
    	}
if (($cgiparams{'PROTOCOL'} eq 'tcp') && ($cgiparams{'MSSFIX'} eq 'on')) {
-	    $errormessage = 'mssfix only allowed with udp';
+	    $errormessage = $Lang::tr{'openvpn mssfix allowed with udp'};
        unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!";
        rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!";
        goto VPNCONF_ERROR;
     }
if (($cgiparams{'PROTOCOL'} eq 'tcp') && ($cgiparams{'FRAGMENT'} ne '')) {
-	    $errormessage = 'fragment only allowed with udp';
+	    $errormessage = $Lang::tr{'openvpn fragment allowed with udp'};
        unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!";
        rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!";
        goto VPNCONF_ERROR;
     }
if ( &validdotmask ($cgiparams{'LOCAL_SUBNET'}))  {
-		  $errormessage = 'Prefix not allowed for Local Subnet. Please enter Subnet Mask e.g. 255.255.255.0';
+		  $errormessage = $Lang::tr{'openvpn prefix local subnet'};
    	  unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!";
        rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!";
    	  goto VPNCONF_ERROR;
    	}
if ( &validdotmask ($cgiparams{'OVPN_SUBNET'}))  {
-		  $errormessage = 'Prefix not allowed for OpenVPN Subnet. Please enter Subnet Mask e.g. 255.255.255.0';
+		  $errormessage = $Lang::tr{'openvpn prefix openvpn subnet'};
    	  unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!";
        rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!";
    	  goto VPNCONF_ERROR;
    	}
if ( &validdotmask ($cgiparams{'REMOTE_SUBNET'}))  {
-		  $errormessage = 'Prefix not allowed for Remote Subnet. Please enter Subnet Mask e.g. 255.255.255.0';
+		  $errormessage = $Lang::tr{'openvpn prefix remote subnet'};
    	  unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!";
        rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!";
    	  goto VPNCONF_ERROR;
@@ -3182,8 +3182,8 @@ if ($cgiparams{'TYPE'} eq 'net') {
    	    <td width='25%'>&nbsp;</td>
    	    <td width='25%'>&nbsp;</td></tr>
    	<tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'Act as'}</td>
-		    <td><select name='SIDE'><option value='server' $selected{'SIDE'}{'server'}>OpenVPN Server</option>
-					    <option value='client' $selected{'SIDE'}{'client'}>OpenVPN Client</option></select></td>
+		    <td><select name='SIDE'><option value='server' $selected{'SIDE'}{'server'}>$Lang::tr{'openvpn server'}</option>
+					    <option value='client' $selected{'SIDE'}{'client'}>$Lang::tr{'openvpn client'}</option></select></td>
    	    <td class='boldbase'>$Lang::tr{'remote host/ip'}:</td>
    	    <td><input type='TEXT' name='REMOTE' value='$cgiparams{'REMOTE'}' /></td></tr>
    	<tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'local subnet'}</td>
@@ -3205,9 +3205,9 @@ if ($cgiparams{'TYPE'} eq 'net') {
    	      <tr><td class='boldbase' nowrap='nowrap'>mssfix &nbsp;<img src='/blob.gif' /></td>
    	    <td><input type='checkbox' name='MSSFIX' $checked{'MSSFIX'}{'on'} /></td>
    	    
-		      <tr><td class='boldbase' nowrap='nowrap'>Fragment &nbsp;<img src='/blob.gif' /></td>
+		      <tr><td class='boldbase' nowrap='nowrap'>fragment &nbsp;<img src='/blob.gif' /></td>
    	    <td><input type='TEXT' name='FRAGMENT' VALUE='$cgiparams{'FRAGMENT'}'size='5' /></td>
-		    <td>Default: <span class="base">1300</span></td>
+		    <td>$Lang::tr{'openvpn default'}: <span class="base">1300</span></td>
    	    
            <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'MTU'}&nbsp;<img src='/blob.gif' /></td>
    	    <td> <input type='TEXT' name='MTU' VALUE='$cgiparams{'MTU'}'size='5' /></TD>
@@ -3727,7 +3727,7 @@ END
    my $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourred}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'capsclosed'}</font></b></td></tr></table>";
if ($confighash{$key}[0] eq 'off') {
-	    $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourblue}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'disabled'}</font></b></td></tr></table>";
+	    $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourblue}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'openvpn disabled'}</font></b></td></tr></table>";
    } else {
###
@@ -3750,7 +3750,7 @@ END
 #			   $p->close();
if (-e "/var/run/$confighash{$key}[1]n2n.pid") {
-       $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'enabledtitle'}</font></b></td></tr></table>";
+       $active = "<table cellpadding='2' cellspacing='0' bgcolor='${Header::colourgreen}' width='100%'><tr><td align='center'><b><font color='#FFFFFF'>$Lang::tr{'openvpn enabled'}</font></b></td></tr></table>";
        } 
     }
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index f7aef31..727470f 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -551,9 +551,9 @@
 'date' => 'Datum',
 'date not in logs' => 'Für den gesuchten Tag existiert kein (oder nur ein unvollständiges) Log',
 'day' => 'Tag',
-'day-graph' => 'Tag',
 'day after' => 'Tag danach',
 'day before' => 'Tag davor',
+'day-graph' => 'Tag',
 'days' => 'Tage',
 'dbfile' => 'Dbfile',
 'ddns help dnsmadeeasy' => 'Tragen Sie Ihre ID (oder ID Liste durch ; getrennt) in das Feld "Hostname" ein',
@@ -1283,9 +1283,19 @@
 'only red' => 'Nur ROT',
 'open to all' => 'Überschreibe externen Zugang zu ALL',
 'openssl produced an error' => 'OpenSSL hat einen Fehler verursacht',
-'openvpn client' => 'OpenVPN Client',
+'openvpn client' => 'OpenVPN-Client',
+'openvpn default' => 'Vorgabe',
+'openvpn destination port used' => 'Der Zielport wird bereits von einer anderen OpenVPN-Server-Instanz genutzt.',
+'openvpn disabled' => 'DEAKTIVIERT',
+'openvpn enabled' => 'AKTIVIERT',
+'openvpn fragment allowed with udp' => '"fragment" kann nur in Kombination mit dem UDP-Protokoll genutzt werden.',
 'openvpn log' => 'OpenVPN Log',
-'openvpn server' => 'OpenVPN Server',
+'openvpn mssfix allowed with udp' => '"mssfix" kann nur in Kombination mit dem UDP-Protokoll genutzt werden.',
+'openvpn prefix local subnet' => 'Die Prefix-Notation wird nicht unterstützt. Bitte geben Sie eine Subnetzmaske beim lokalen Subnetz ein wie z.B. 255.255.255.0.',
+'openvpn prefix openvpn subnet' => 'Die Prefix-Notation wird nicht unterstützt. Bitte geben Sie eine Subnetzmaske beim OpenVPN-Subnetz ein wie z.B. 255.255.255.0.',
+'openvpn prefix remote subnet' => 'Die Prefix-Notation wird nicht unterstützt. Bitte geben Sie eine Subnetzmaske beim entfernten Subnetz ein wie z.B. 255.255.255.0.',
+'openvpn server' => 'OpenVPN-Server',
+'openvpn subnet is used' => 'Das angegebene Subnetz wird bereits von einer anderen OpenVPN-Server-Instanz genutzt.',
 'optional at cmd' => 'zusätzlicher Modembefehl',
 'optional data' => '3. Optionale Einstellungen',
 'options' => 'Optionen',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 62925ce..16df2b9 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -572,9 +572,9 @@
 'date' => 'Date',
 'date not in logs' => 'No (or only partial) logs exist for the day queried',
 'day' => 'Day',
-'day-graph' => 'Day',
 'day after' => 'Day after',
 'day before' => 'Day before',
+'day-graph' => 'Day',
 'days' => 'days.',
 'dbfile' => 'Dbfile',
 'ddns help dnsmadeeasy' => 'In the field for hostname enter your ID (or a list of IDs seperated by;)',
@@ -1311,9 +1311,19 @@
 'only red' => 'Only RED',
 'open to all' => 'Override external access to ALL',
 'openssl produced an error' => 'OpenSSL produced an error',
-'openvpn client' => 'OpenVPN Client',
+'openvpn client' => 'OpenVPN client',
+'openvpn default' => 'Default',
+'openvpn destination port used' => 'The destination port is already used by another OpenVPN server.',
+'openvpn disabled' => 'DISABLED',
+'openvpn enabled' => 'ENABLED',
+'openvpn fragment allowed with udp' => 'Using fragment is only allowed when using the UDP protocol.',
 'openvpn log' => 'OpenVPN Log',
-'openvpn server' => 'OpenVPN Server',
+'openvpn mssfix allowed with udp' => 'Using "mssfix" is only allowed when using the UDP protocol.',
+'openvpn prefix local subnet' => 'Using the prefix notation is not supported for the local subnet. Please enter a subnet mask like 255.255.255.0.',
+'openvpn prefix openvpn subnet' => 'Using the prefix notation is not supported for the OpenVPN subnet. Please enter a subnet mask like 255.255.255.0.',
+'openvpn prefix remote subnet' => 'Using the prefix notation is not supported for the remote subnet. Please enter a subnet mask like 255.255.255.0.',
+'openvpn server' => 'OpenVPN server',
+'openvpn subnet is used' => 'The given subnet is used by another OpenVPN server.',
 'optional at cmd' => 'optional AT command',
 'optional data' => '3. Optional Settings:',
 'options' => 'Options',
diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index d410a56..365630a 100644
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -570,9 +570,9 @@
 'date' => 'Fecha',
 'date not in logs' => 'No existen (o sólo parcialmente) registros del dia solicitado',
 'day' => 'Día',
-'day-graph' => 'Dia',
 'day after' => 'Día después',
 'day before' => 'Día anterior',
+'day-graph' => 'Dia',
 'days' => 'dias.',
 'dbfile' => 'Dbfile',
 'ddns help dnsmadeeasy' => '"En el campo nombre de host introduzca si ID (o una lista de Ids separados por ; )"',
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index daeb9f2..04edb25 100644
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -572,9 +572,9 @@
 'date' => 'Date',
 'date not in logs' => 'Aucun (ou imcomplet) rapport n'existe pour le jour demandé',
 'day' => 'Jour',
-'day-graph' => 'Jour',
 'day after' => 'Jour d'après',
 'day before' => 'Jour d'avant',
+'day-graph' => 'Jour',
 'days' => 'jours.',
 'dbfile' => 'Dbfile',
 'ddns help dnsmadeeasy' => 'Entrez votre identifiant dans ce champ pour noms d'hôtes (ou une liste d'identifiants séparés par des ;)',
diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl
index 14160de..12439e4 100644
--- a/langs/pl/cgi-bin/pl.pl
+++ b/langs/pl/cgi-bin/pl.pl
@@ -572,9 +572,9 @@
 'date' => 'Data',
 'date not in logs' => 'Brak (lub tylko część) logów dla podanej daty',
 'day' => 'Dzien',
-'day-graph' => 'Dzien',
 'day after' => 'Dzień po',
 'day before' => 'Dzień przed',
+'day-graph' => 'Dzien',
 'days' => 'dni.',
 'dbfile' => 'Dbfile',
 'ddns help dnsmadeeasy' => 'W polu nazwa hosta wprowadź twoje ID (lub listę ID oddzielanych średnikami)',
diff --git a/lfs/apache2 b/lfs/apache2
index c5fd754..f548271 100644
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -25,7 +25,7 @@
include Config
-VER        = 2.2.20
+VER        = 2.2.21
THISAPP    = httpd-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -47,7 +47,7 @@ objects = $(DL_FILE) \
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 httpd-2.2.2-config-1.patch = $(DL_FROM)/httpd-2.2.2-config-1.patch
-$(DL_FILE)_MD5 = 1ac251431c8c4285f6b085c1d156bb56
+$(DL_FILE)_MD5 = 1696ae62cd879ab1d4dd9ff021a470f2
 httpd-2.2.2-config-1.patch_MD5 = e02a3ec5925eb9e111400b9aa229f822
install : $(TARGET)
hooks/post-receive
--
IPFire 2.x development tree

    