Merge remote-tracking branch 'ummeegge/openvpn' into next

2026-04-27 11:13:24 +02:00 · 2014-04-13 15:45:19 +02:00
parent b04a34188c c2b5d12b34
commit 1d3c37402c
13 changed files with 187 additions and 197 deletions
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -1,3 +1,4 @@
+WARNING: translation string unused: Client status and controlc
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
 WARNING: translation string unused: HDD temperature
@@ -354,7 +355,6 @@ WARNING: translation string unused: network time
 WARNING: translation string unused: network traffic graphs
 WARNING: translation string unused: network updated
 WARNING: translation string unused: networks settings
-WARNING: translation string unused: never
 WARNING: translation string unused: new optionsfw must boot
 WARNING: translation string unused: no alcatelusb firmware
 WARNING: translation string unused: no cfg upload
@@ -400,10 +400,7 @@ WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
 WARNING: translation string unused: ovpn config
 WARNING: translation string unused: ovpn dl
-WARNING: translation string unused: ovpn engines
 WARNING: translation string unused: ovpn log
-WARNING: translation string unused: ovpn reneg sec
-WARNING: translation string unused: ovpn_fastio
 WARNING: translation string unused: ovpn_fragment
 WARNING: translation string unused: ovpn_mssfix
 WARNING: translation string unused: ovpn_mtudisc
@@ -449,12 +446,16 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
@@ -585,6 +586,7 @@ WARNING: translation string unused: use dov
 WARNING: translation string unused: use ibod
 WARNING: translation string unused: view log
 WARNING: translation string unused: vpn aggrmode
+WARNING: translation string unused: vpn configuration main
 WARNING: translation string unused: vpn incompatible use of defaultroute
 WARNING: translation string unused: vpn mtu invalid
 WARNING: translation string unused: vpn on blue
@@ -600,20 +602,18 @@ WARNING: translation string unused: xtaccess all error
 WARNING: translation string unused: xtaccess bad transfert
 WARNING: translation string unused: year-graph
 WARNING: translation string unused: yearly firewallhits
+WARNING: untranslated string: Number of Countries for the pie chart
 WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: addons
 WARNING: untranslated string: bytes
 WARNING: untranslated string: community rules
 WARNING: untranslated string: dead peer detection
-WARNING: untranslated string: dns servers
-WARNING: untranslated string: downlink
 WARNING: untranslated string: emerging rules
-WARNING: untranslated string: first
+WARNING: untranslated string: firewall logs country
 WARNING: untranslated string: fwhost err hostip
-WARNING: untranslated string: last
 WARNING: untranslated string: qos add subclass
 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: uplink
+WARNING: untranslated string: source ip country
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -1,3 +1,4 @@
+WARNING: translation string unused: Client status and controlc
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
 WARNING: translation string unused: HDD temperature
@@ -379,7 +380,6 @@ WARNING: translation string unused: network time
 WARNING: translation string unused: network traffic graphs
 WARNING: translation string unused: network updated
 WARNING: translation string unused: networks settings
-WARNING: translation string unused: never
 WARNING: translation string unused: new optionsfw must boot
 WARNING: translation string unused: no alcatelusb firmware
 WARNING: translation string unused: no cfg upload
@@ -426,9 +426,7 @@ WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
 WARNING: translation string unused: ovpn config
 WARNING: translation string unused: ovpn dl
-WARNING: translation string unused: ovpn engines
 WARNING: translation string unused: ovpn log
-WARNING: translation string unused: ovpn reneg sec
 WARNING: translation string unused: ovpn_fastio
 WARNING: translation string unused: ovpn_fragment
 WARNING: translation string unused: ovpn_mssfix
@@ -476,12 +474,16 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
@@ -619,6 +621,7 @@ WARNING: translation string unused: use dov
 WARNING: translation string unused: use ibod
 WARNING: translation string unused: view log
 WARNING: translation string unused: vpn aggrmode
+WARNING: translation string unused: vpn configuration main
 WARNING: translation string unused: vpn incompatible use of defaultroute
 WARNING: translation string unused: vpn mtu invalid
 WARNING: translation string unused: vpn on blue
@@ -634,15 +637,12 @@ WARNING: translation string unused: xtaccess all error
 WARNING: translation string unused: xtaccess bad transfert
 WARNING: translation string unused: year-graph
 WARNING: translation string unused: yearly firewallhits
+WARNING: untranslated string: Number of Countries for the pie chart
 WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: bytes
-WARNING: untranslated string: dns servers
-WARNING: untranslated string: downlink
-WARNING: untranslated string: first
 WARNING: untranslated string: fwhost err hostip
-WARNING: untranslated string: last
 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: uplink
+WARNING: untranslated string: source ip country
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -418,12 +418,16 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -429,12 +429,16 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -434,12 +434,16 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -418,12 +418,16 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -423,12 +423,16 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -474,12 +474,16 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -88,6 +88,8 @@
 < dnsforward entries
 < dnsforward forward_server
 < dnsforward zone
+< dns servers
+< downlink
 < dpd delay
 < dpd timeout
 < drop action
@@ -115,8 +117,8 @@
 < fireinfo why enable
 < fireinfo why read more
 < fireinfo your profile id
-< firewall logs country
 < firewall rules
+< first
 < flag
 < forward firewall
 < fw default drop
@@ -304,6 +306,7 @@
 < ipsec
 < ipsec network
 < ipsec no connections
+< last
 < least preferred
 < lifetime
 < mac filter
@@ -313,13 +316,11 @@
 < minimum
 < minute
 < most preferred
-< never
 < no hardware random number generator
 < not a valid dh key
 < notice
 < ntp common settings
 < ntp sync
-< Number of Countries for the pie chart
 < openvpn default
 < openvpn destination port used
 < openvpn disabled
@@ -336,7 +337,6 @@
 < ovpn crypt options
 < ovpn dh
 < ovpn dh name
-< ovpn engines
 < ovpn generating the root and host certificates
 < ovpn ha
 < ovpn hmac
@@ -350,7 +350,6 @@
 < ovpn mtu-disc yes
 < ovpn no connections
 < ovpn port in root range
-< ovpn reneg sec
 < p2p block
 < p2p block save notice
 < proxy reports
@@ -364,7 +363,6 @@
 < show dh
 < snat new source ip address
 < snort working
-< source ip country
 < ssh
 < static routes
 < support donation
@@ -426,6 +424,7 @@
 < tor use exit nodes
 < updxlrtr sources
 < updxlrtr standard view
+< uplink
 < upload dh key
 < upload new ruleset
 < uptime
@@ -569,6 +568,8 @@
 < dnsforward entries
 < dnsforward forward_server
 < dnsforward zone
+< dns servers
+< downlink
 < dpd delay
 < dpd timeout
 < drop action
@@ -596,8 +597,8 @@
 < fireinfo why enable
 < fireinfo why read more
 < fireinfo your profile id
-< firewall logs country
 < firewall rules
+< first
 < flag
 < forward firewall
 < fw default drop
@@ -785,6 +786,7 @@
 < ipsec
 < ipsec network
 < ipsec no connections
+< last
 < least preferred
 < lifetime
 < mac filter
@@ -794,11 +796,9 @@
 < minimum
 < minute
 < most preferred
-< never
 < no hardware random number generator
 < not a valid dh key
 < notice
-< Number of Countries for the pie chart
 < openvpn default
 < openvpn destination port used
 < openvpn disabled
@@ -829,7 +829,6 @@
 < ovpn crypt options
 < ovpn dh
 < ovpn dh name
-< ovpn engines
 < ovpn errmsg green already pushed
 < ovpn errmsg invalid ip or mask
 < ovpn generating the root and host certificates
@@ -845,7 +844,6 @@
 < ovpn mtu-disc yes
 < ovpn no connections
 < ovpn port in root range
-< ovpn reneg sec
 < ovpn routes push
 < ovpn routes push options
 < p2p block
@@ -861,7 +859,6 @@
 < Set time on boot
 < show dh
 < snat new source ip address
-< source ip country
 < ssh
 < static routes
 < support donation
@@ -923,6 +920,7 @@
 < tor use exit nodes
 < updxlrtr sources
 < updxlrtr standard view
+< uplink
 < upload dh key
 < uptime
 < uptime load average
@@ -1042,6 +1040,8 @@
 < dnsforward entries
 < dnsforward forward_server
 < dnsforward zone
+< dns servers
+< downlink
 < dpd delay
 < dpd timeout
 < drop action
@@ -1061,8 +1061,8 @@
 < extrahd unable to read
 < extrahd unable to write
 < extrahd you cant mount
-< firewall logs country
 < firewall rules
+< first
 < flag
 < forward firewall
 < fw default drop
@@ -1250,6 +1250,7 @@
 < ipsec
 < ipsec network
 < ipsec no connections
+< last
 < least preferred
 < lifetime
 < mac filter
@@ -1259,11 +1260,9 @@
 < minimum
 < minute
 < most preferred
-< never
 < no hardware random number generator
 < not a valid dh key
 < notice
-< Number of Countries for the pie chart
 < openvpn default
 < openvpn destination port used
 < openvpn disabled
@@ -1280,7 +1279,6 @@
 < ovpn crypt options
 < ovpn dh
 < ovpn dh name
-< ovpn engines
 < ovpn errmsg green already pushed
 < ovpn errmsg invalid ip or mask
 < ovpn generating the root and host certificates
@@ -1296,7 +1294,6 @@
 < ovpn mtu-disc yes
 < ovpn no connections
 < ovpn port in root range
-< ovpn reneg sec
 < ovpn routes push
 < ovpn routes push options
 < p2p block
@@ -1311,7 +1308,6 @@
 < server restart
 < show dh
 < snat new source ip address
-< source ip country
 < ssh
 < static routes
 < support donation
@@ -1372,6 +1368,7 @@
 < tor use exit nodes
 < updxlrtr sources
 < updxlrtr standard view
+< uplink
 < upload dh key
 < uptime
 < uptime load average
@@ -1494,6 +1491,8 @@
 < dnsforward entries
 < dnsforward forward_server
 < dnsforward zone
+< dns servers
+< downlink
 < dpd delay
 < dpd timeout
 < drop action
@@ -1514,8 +1513,8 @@
 < extrahd unable to read
 < extrahd unable to write
 < extrahd you cant mount
-< firewall logs country
 < firewall rules
+< first
 < flag
 < forward firewall
 < frequency
@@ -1706,6 +1705,7 @@
 < ipsec
 < ipsec network
 < ipsec no connections
+< last
 < least preferred
 < lifetime
 < mac filter
@@ -1716,11 +1716,9 @@
 < minute
 < month-graph
 < most preferred
-< never
 < no hardware random number generator
 < not a valid dh key
 < notice
-< Number of Countries for the pie chart
 < openvpn default
 < openvpn destination port used
 < openvpn disabled
@@ -1738,7 +1736,6 @@
 < ovpn crypt options
 < ovpn dh
 < ovpn dh name
-< ovpn engines
 < ovpn generating the root and host certificates
 < ovpn ha
 < ovpn hmac
@@ -1752,7 +1749,6 @@
 < ovpn mtu-disc yes
 < ovpn no connections
 < ovpn port in root range
-< ovpn reneg sec
 < p2p block
 < p2p block save notice
 < proxy reports
@@ -1765,7 +1761,6 @@
 < server restart
 < show dh
 < snat new source ip address
-< source ip country
 < ssh
 < static routes
 < support donation
@@ -1826,6 +1821,7 @@
 < tor use exit nodes
 < updxlrtr sources
 < updxlrtr standard view
+< uplink
 < upload dh key
 < uptime
 < uptime load average