From: Michael Tremer Date: Sun, 13 Apr 2014 13:45:19 +0000 (+0200) Subject: Merge remote-tracking branch 'ummeegge/openvpn' into next X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d3c37402c4684e682aabe904f443b93b6dc4310;p=people%2Farne_f%2Fipfire-2.x.git Merge remote-tracking branch 'ummeegge/openvpn' into next --- 1d3c37402c4684e682aabe904f443b93b6dc4310 diff --cc doc/language_issues.de index bdbe71b1a,8bf36d695..93920ef10 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@@ -1,3 -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 -354,7 +355,6 @@@ WARNING: translation string unused: net 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 -401,10 +400,7 @@@ WARNING: translation string unused: out 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 -450,12 +446,16 @@@ WARNING: translation string unused: rel 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,6 +586,7 @@@ WARNING: translation string unused: us 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 -601,20 +602,18 @@@ WARNING: translation string unused: xta 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 diff --cc doc/language_issues.en index 1a909099a,7cf69532a..22ee27a51 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@@ -1,3 -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 -379,7 +380,6 @@@ WARNING: translation string unused: net 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 -427,9 +426,7 @@@ WARNING: translation string unused: out 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 -477,12 +474,16 @@@ WARNING: translation string unused: rel 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 -620,6 +621,7 @@@ WARNING: translation string unused: us 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 -635,15 +637,12 @@@ WARNING: translation string unused: xta 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 diff --cc doc/language_issues.es index a726b4dab,e32468403..5e722984f --- a/doc/language_issues.es +++ b/doc/language_issues.es @@@ -418,12 -419,12 +418,16 @@@ WARNING: translation string unused: rel 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 diff --cc doc/language_issues.fr index f0dee1653,c62c6fb74..564a6b1fe --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@@ -429,12 -430,12 +429,16 @@@ WARNING: translation string unused: rel 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 diff --cc doc/language_issues.nl index 8b2bb09aa,4061147c0..8e74e4339 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@@ -434,12 -435,12 +434,16 @@@ WARNING: translation string unused: rel 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 diff --cc doc/language_issues.pl index a726b4dab,e32468403..5e722984f --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@@ -418,12 -419,12 +418,16 @@@ WARNING: translation string unused: rel 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 diff --cc doc/language_issues.ru index c42030b1a,bf6f61f09..c443cf8e4 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@@ -423,12 -424,12 +423,16 @@@ WARNING: translation string unused: rel 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 diff --cc doc/language_issues.tr index cac53be50,c897378a7..575d54f27 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@@ -474,12 -475,12 +474,16 @@@ WARNING: translation string unused: rel 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 diff --cc doc/language_missings index bc237177c,6d71db20c..cd37869d0 --- a/doc/language_missings +++ b/doc/language_missings @@@ -88,6 -84,6 +88,8 @@@ < dnsforward entries < dnsforward forward_server < dnsforward zone ++< dns servers ++< downlink < dpd delay < dpd timeout < drop action @@@ -115,8 -111,7 +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 -298,6 +306,7 @@@ < ipsec < ipsec network < ipsec no connections ++< last < least preferred < lifetime < mac filter @@@ -313,7 -307,7 +316,6 @@@ < minimum < minute < most preferred --< never < no hardware random number generator < not a valid dh key < notice @@@ -336,7 -329,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 -343,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 @@@ -426,6 -418,6 +424,7 @@@ < tor use exit nodes < updxlrtr sources < updxlrtr standard view ++< uplink < upload dh key < upload new ruleset < uptime @@@ -569,6 -557,6 +568,8 @@@ < dnsforward entries < dnsforward forward_server < dnsforward zone ++< dns servers ++< downlink < dpd delay < dpd timeout < drop action @@@ -596,8 -584,7 +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 -771,6 +786,7 @@@ < ipsec < ipsec network < ipsec no connections ++< last < least preferred < lifetime < mac filter @@@ -794,7 -780,7 +796,6 @@@ < minimum < minute < most preferred --< never < no hardware random number generator < not a valid dh key < notice @@@ -829,7 -814,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 -830,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 @@@ -923,6 -907,6 +920,7 @@@ < tor use exit nodes < updxlrtr sources < updxlrtr standard view ++< uplink < upload dh key < uptime < uptime load average @@@ -1042,6 -1022,6 +1040,8 @@@ < dnsforward entries < dnsforward forward_server < dnsforward zone ++< dns servers ++< downlink < dpd delay < dpd timeout < drop action @@@ -1061,8 -1041,7 +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 -1228,6 +1250,7 @@@ < ipsec < ipsec network < ipsec no connections ++< last < least preferred < lifetime < mac filter @@@ -1259,7 -1237,7 +1260,6 @@@ < minimum < minute < most preferred --< never < no hardware random number generator < not a valid dh key < notice @@@ -1280,7 -1257,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 -1273,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 @@@ -1372,6 -1348,6 +1368,7 @@@ < tor use exit nodes < updxlrtr sources < updxlrtr standard view ++< uplink < upload dh key < uptime < uptime load average @@@ -1494,6 -1466,6 +1491,8 @@@ < dnsforward entries < dnsforward forward_server < dnsforward zone ++< dns servers ++< downlink < dpd delay < dpd timeout < drop action @@@ -1514,8 -1486,7 +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 -1676,6 +1705,7 @@@ < ipsec < ipsec network < ipsec no connections ++< last < least preferred < lifetime < mac filter @@@ -1716,7 -1686,7 +1716,6 @@@ < minute < month-graph < most preferred --< never < no hardware random number generator < not a valid dh key < notice @@@ -1738,7 -1707,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 -1721,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 @@@ -1826,6 -1794,6 +1821,7 @@@ < tor use exit nodes < updxlrtr sources < updxlrtr standard view ++< uplink < upload dh key < uptime < uptime load average diff --cc langs/de/cgi-bin/de.pl index 4fba869ba,ceba677eb..5605210d4 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@@ -660,8 -657,7 +660,8 @@@ 'device' => 'Gerät', 'devices on blue' => 'Geräte auf Blau', 'dh' => 'Diffie-Hellman Key', - 'dh key warn' => 'Keys mit 1024 und 2048 Bit können mehreren Minuten, 3072 und 4096 Bit bis zu mehreren Stunden dauern. Bitte haben sie Geduld.', + 'dh key warn' => 'Keys mit 1024 und 2048 Bit können mehrere Minuten, 3072 und 4096 Bit bis zu mehreren Stunden dauern. Bitte haben sie Geduld.', +'dh name is invalid' => 'Name ist ungültig, bitte "dh1024.pem" verwenden.', 'dhcp advopt add' => 'DHCP Option hinzufügen', 'dhcp advopt added' => 'DHCP Option hinzugefügt', 'dhcp advopt blank value' => 'Wert für DHCP Option darf nicht leer sein', diff --cc langs/en/cgi-bin/en.pl index 5b82627f5,a683b5c31..8f2062fcf --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@@ -682,8 -679,6 +682,8 @@@ 'device' => 'Device', 'devices on blue' => 'Devices on BLUE', 'dh' => 'Diffie-Hellman Key', +'dh key warn' => 'Keys with 1024 and 2048 bit takes up to several minutes, 3072 and 4096 bit might needs several hours. Please be patient.', - 'dh name is invalid' => 'Name ist ungŸltig, bitte "dh1024.pem" verwenden.', ++'dh name is invalid' => 'Name is invalid, please use "dh1024.pem".', 'dhcp advopt add' => 'Add a DHCP option', 'dhcp advopt added' => 'DHCP option added', 'dhcp advopt blank value' => 'DHCP Option value cannot be empty.', @@@ -1663,7 -1660,7 +1666,6 @@@ 'ovpn dh' => 'Diffie-Hellman key lenght', 'ovpn dh name' => 'Diffie-Hellman key name', 'ovpn dl' => 'OVPN-Config Download', - 'ovpn engines' => 'Crypto engine', -'ovpn crypt options' => 'Cryptographic options', 'ovpn errmsg green already pushed' => 'Route for green network is always set', 'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask', 'ovpn generating the root and host certificates' => 'Generating the root and host certifictae can take a long time.',