Merge branch 'ovpn-mtu-disc' into next

Conflicts:
	html/cgi-bin/ovpnmain.cgi
This commit is contained in:
Stefan Schantl
2012-11-17 13:04:53 +01:00
3 changed files with 139 additions and 20 deletions

View File

@@ -1414,6 +1414,13 @@
'ovpn errmsg green already pushed' => 'Route for green network is always set',
'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask',
'ovpn log' => 'OVPN-Log',
'ovpn mtu-disc' => 'Path MTU Discovery',
'ovpn mtu-disc maybe' => 'Optionally',
'ovpn mtu-disc no' => 'Never',
'ovpn mtu-disc off' => 'Disabled',
'ovpn mtu-disc yes' => 'Forced',
'ovpn mtu-disc and mtu not 1500' => 'Path MTU Discovery requires a MTU of 1500.',
'ovpn mtu-disc with mssfix or fragment' => 'Path MTU Discovery cannot be used with mssfix or fragment.',
'ovpn on blue' => 'OpenVPN on BLUE',
'ovpn on orange' => 'OpenVPN on ORANGE',
'ovpn on red' => 'OpenVPN on RED',