From: Michael Tremer Date: Thu, 20 Mar 2014 22:14:13 +0000 (+0100) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into beyond-next X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=dd29d563a603b0bc182af23efd5160caf75657c4 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into beyond-next Conflicts: doc/language_issues.es doc/language_issues.fr doc/language_issues.nl doc/language_issues.pl doc/language_issues.ru doc/language_issues.tr doc/language_missings --- dd29d563a603b0bc182af23efd5160caf75657c4 diff --cc doc/language_issues.es index 065ba9b47,cf2fe5282..2718a1aed --- a/doc/language_issues.es +++ b/doc/language_issues.es @@@ -611,12 -620,13 +616,16 @@@ WARNING: untranslated string: ccd non WARNING: untranslated string: ccd routes WARNING: untranslated string: ccd subnet WARNING: untranslated string: ccd used + WARNING: untranslated string: count + WARNING: untranslated string: countries + WARNING: untranslated string: country codes and flags + WARNING: untranslated string: countrycode WARNING: untranslated string: dead peer detection - WARNING: untranslated string: default ip WARNING: untranslated string: deprecated fs warn + WARNING: untranslated string: details +WARNING: untranslated string: dh +WARNING: untranslated string: dh key warn +WARNING: untranslated string: dh name is invalid WARNING: untranslated string: dnat address WARNING: untranslated string: dns servers WARNING: untranslated string: dnsforward @@@ -798,9 -811,8 +810,10 @@@ WARNING: untranslated string: fwhost st WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome +WARNING: untranslated string: gen dh +WARNING: untranslated string: generate dh key WARNING: untranslated string: grouptype + WARNING: untranslated string: hardware support WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout @@@ -814,7 -826,7 +827,8 @@@ WARNING: untranslated string: maximu WARNING: untranslated string: minimum WARNING: untranslated string: minute WARNING: untranslated string: most preferred + WARNING: untranslated string: no hardware random number generator +WARNING: untranslated string: not a valid dh key WARNING: untranslated string: notice WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used diff --cc doc/language_issues.fr index d20939536,b3d9252be..aaecb4031 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@@ -621,12 -630,13 +626,16 @@@ WARNING: untranslated string: ccd non WARNING: untranslated string: ccd routes WARNING: untranslated string: ccd subnet WARNING: untranslated string: ccd used + WARNING: untranslated string: count + WARNING: untranslated string: countries + WARNING: untranslated string: country codes and flags + WARNING: untranslated string: countrycode WARNING: untranslated string: dead peer detection - WARNING: untranslated string: default ip WARNING: untranslated string: deprecated fs warn + WARNING: untranslated string: details +WARNING: untranslated string: dh +WARNING: untranslated string: dh key warn +WARNING: untranslated string: dh name is invalid WARNING: untranslated string: dnat address WARNING: untranslated string: dns address deleted txt WARNING: untranslated string: dns servers @@@ -809,9 -822,8 +821,10 @@@ WARNING: untranslated string: fwhost st WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome +WARNING: untranslated string: gen dh +WARNING: untranslated string: generate dh key WARNING: untranslated string: grouptype + WARNING: untranslated string: hardware support WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout @@@ -825,7 -837,7 +838,8 @@@ WARNING: untranslated string: maximu WARNING: untranslated string: minimum WARNING: untranslated string: minute WARNING: untranslated string: most preferred + WARNING: untranslated string: no hardware random number generator +WARNING: untranslated string: not a valid dh key WARNING: untranslated string: notice WARNING: untranslated string: ntp common settings WARNING: untranslated string: ntp sync diff --cc doc/language_issues.nl index d5302f762,9b20840e4..d318d7f92 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@@ -587,12 -594,15 +590,18 @@@ WARNING: untranslated string: advproxy WARNING: untranslated string: advproxy proxy port transparent WARNING: untranslated string: bit WARNING: untranslated string: bytes + WARNING: untranslated string: ccd err isipsecrw + WARNING: untranslated string: ccd err isovpnn2n WARNING: untranslated string: ccd iroute2 + WARNING: untranslated string: count + WARNING: untranslated string: countries + WARNING: untranslated string: country codes and flags + WARNING: untranslated string: countrycode WARNING: untranslated string: dead peer detection - WARNING: untranslated string: default ip + WARNING: untranslated string: details +WARNING: untranslated string: dh +WARNING: untranslated string: dh key warn +WARNING: untranslated string: dh name is invalid WARNING: untranslated string: dnat address WARNING: untranslated string: dns servers WARNING: untranslated string: dnsforward @@@ -756,9 -769,8 +768,10 @@@ WARNING: untranslated string: fwhost st WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome +WARNING: untranslated string: gen dh +WARNING: untranslated string: generate dh key WARNING: untranslated string: grouptype + WARNING: untranslated string: hardware support WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout @@@ -771,15 -783,9 +784,16 @@@ WARNING: untranslated string: mac filte WARNING: untranslated string: maximum WARNING: untranslated string: minimum WARNING: untranslated string: most preferred + WARNING: untranslated string: no hardware random number generator +WARNING: untranslated string: not a valid dh key WARNING: untranslated string: notice WARNING: untranslated string: openvpn network +WARNING: untranslated string: ovpn crypt options +WARNING: untranslated string: ovpn dh +WARNING: untranslated string: ovpn dh name +WARNING: untranslated string: ovpn generating the root and host certificates +WARNING: untranslated string: ovpn ha +WARNING: untranslated string: ovpn hmac WARNING: untranslated string: ovpn mgmt in root range WARNING: untranslated string: ovpn no connections WARNING: untranslated string: ovpn port in root range diff --cc doc/language_issues.pl index 065ba9b47,cf2fe5282..2718a1aed --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@@ -611,12 -620,13 +616,16 @@@ WARNING: untranslated string: ccd non WARNING: untranslated string: ccd routes WARNING: untranslated string: ccd subnet WARNING: untranslated string: ccd used + WARNING: untranslated string: count + WARNING: untranslated string: countries + WARNING: untranslated string: country codes and flags + WARNING: untranslated string: countrycode WARNING: untranslated string: dead peer detection - WARNING: untranslated string: default ip WARNING: untranslated string: deprecated fs warn + WARNING: untranslated string: details +WARNING: untranslated string: dh +WARNING: untranslated string: dh key warn +WARNING: untranslated string: dh name is invalid WARNING: untranslated string: dnat address WARNING: untranslated string: dns servers WARNING: untranslated string: dnsforward @@@ -798,9 -811,8 +810,10 @@@ WARNING: untranslated string: fwhost st WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome +WARNING: untranslated string: gen dh +WARNING: untranslated string: generate dh key WARNING: untranslated string: grouptype + WARNING: untranslated string: hardware support WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout @@@ -814,7 -826,7 +827,8 @@@ WARNING: untranslated string: maximu WARNING: untranslated string: minimum WARNING: untranslated string: minute WARNING: untranslated string: most preferred + WARNING: untranslated string: no hardware random number generator +WARNING: untranslated string: not a valid dh key WARNING: untranslated string: notice WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used diff --cc doc/language_issues.ru index e7f884df5,0c94fc64a..be721a37a --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@@ -615,12 -624,13 +620,16 @@@ WARNING: untranslated string: ccd route WARNING: untranslated string: ccd subnet WARNING: untranslated string: ccd used WARNING: untranslated string: community rules + WARNING: untranslated string: count + WARNING: untranslated string: countries + WARNING: untranslated string: country codes and flags + WARNING: untranslated string: countrycode WARNING: untranslated string: dead peer detection - WARNING: untranslated string: default ip WARNING: untranslated string: deprecated fs warn + WARNING: untranslated string: details +WARNING: untranslated string: dh +WARNING: untranslated string: dh key warn +WARNING: untranslated string: dh name is invalid WARNING: untranslated string: disk access per WARNING: untranslated string: dnat address WARNING: untranslated string: dns servers @@@ -793,9 -806,8 +805,10 @@@ WARNING: untranslated string: fwhost st WARNING: untranslated string: fwhost type WARNING: untranslated string: fwhost used WARNING: untranslated string: fwhost welcome +WARNING: untranslated string: gen dh +WARNING: untranslated string: generate dh key WARNING: untranslated string: grouptype + WARNING: untranslated string: hardware support WARNING: untranslated string: incoming traffic in bytes per second WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay @@@ -810,7 -822,7 +823,8 @@@ WARNING: untranslated string: maximu WARNING: untranslated string: minimum WARNING: untranslated string: minute WARNING: untranslated string: most preferred + WARNING: untranslated string: no hardware random number generator +WARNING: untranslated string: not a valid dh key WARNING: untranslated string: notice WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used diff --cc doc/language_issues.tr index 30c3842f8,c2665104d..da4e66c0b --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@@ -629,76 -638,25 +634,39 @@@ WARNING: translation string unused: xta WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs - WARNING: untranslated string: addons - WARNING: untranslated string: advproxy errmsg proxy ports equal - WARNING: untranslated string: advproxy proxy port transparent - WARNING: untranslated string: bit WARNING: untranslated string: bytes - WARNING: untranslated string: dead peer detection - WARNING: untranslated string: default ip + WARNING: untranslated string: ccd err isipsecrw + WARNING: untranslated string: ccd err isovpnn2n + WARNING: untranslated string: count + WARNING: untranslated string: countries + WARNING: untranslated string: country codes and flags + WARNING: untranslated string: countrycode + WARNING: untranslated string: details +WARNING: untranslated string: dh +WARNING: untranslated string: dh key warn +WARNING: untranslated string: dh name is invalid - WARNING: untranslated string: dnat address - WARNING: untranslated string: dns servers - WARNING: untranslated string: downlink - WARNING: untranslated string: dpd delay - WARNING: untranslated string: dpd timeout - WARNING: untranslated string: drop action - WARNING: untranslated string: drop action1 - WARNING: untranslated string: drop action2 - WARNING: untranslated string: drop forward WARNING: untranslated string: drop outgoing - WARNING: untranslated string: encryption - WARNING: untranslated string: entropy - WARNING: untranslated string: firewall rules - WARNING: untranslated string: first - WARNING: untranslated string: fwdfw dnat extport - WARNING: untranslated string: fwdfw dnat nochoice - WARNING: untranslated string: fwdfw dnat porterr2 - WARNING: untranslated string: fwdfw hint mac + WARNING: untranslated string: entropy graphs + WARNING: untranslated string: flag + WARNING: untranslated string: fwdfw warn1 WARNING: untranslated string: fwhost err hostip +WARNING: untranslated string: gen dh +WARNING: untranslated string: generate dh key - WARNING: untranslated string: grouptype - WARNING: untranslated string: integrity - WARNING: untranslated string: invalid input for dpd delay - WARNING: untranslated string: invalid input for dpd timeout - WARNING: untranslated string: ipsec - WARNING: untranslated string: ipsec network + WARNING: untranslated string: hardware support WARNING: untranslated string: last - WARNING: untranslated string: least preferred - WARNING: untranslated string: lifetime - WARNING: untranslated string: mac filter - WARNING: untranslated string: maximum - WARNING: untranslated string: minimum - WARNING: untranslated string: most preferred + WARNING: untranslated string: no hardware random number generator +WARNING: untranslated string: not a valid dh key - WARNING: untranslated string: notice - WARNING: untranslated string: openvpn network +WARNING: untranslated string: ovpn crypt options +WARNING: untranslated string: ovpn dh +WARNING: untranslated string: ovpn dh name +WARNING: untranslated string: ovpn generating the root and host certificates +WARNING: untranslated string: ovpn ha +WARNING: untranslated string: ovpn hmac - WARNING: untranslated string: ovpn mgmt in root range - WARNING: untranslated string: ovpn no connections - WARNING: untranslated string: ovpn port in root range - WARNING: untranslated string: p2p block - WARNING: untranslated string: p2p block save notice - WARNING: untranslated string: red1 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: show dh - WARNING: untranslated string: snat new source ip address - WARNING: untranslated string: ssh - WARNING: untranslated string: support donation - WARNING: untranslated string: tor directory port - WARNING: untranslated string: tor errmsg invalid directory port - WARNING: untranslated string: uplink + WARNING: untranslated string: system has hwrng + WARNING: untranslated string: system has rdrand +WARNING: untranslated string: upload dh key - WARNING: untranslated string: urlfilter redirect template - WARNING: untranslated string: wlan clients diff --cc doc/language_missings index af54f2239,3c3d74207..8e75f7ecb --- a/doc/language_missings +++ b/doc/language_missings @@@ -63,11 -65,13 +65,16 @@@ < ccd routes < ccd subnet < ccd used + < count + < countries + < countrycode + < country codes and flags < default ip < deprecated fs warn + < details +< dh +< dh key warn +< dh name is invalid < dnat address < dns address deleted txt < dnsforward @@@ -104,6 -111,8 +112,7 @@@ < fireinfo why read more < fireinfo your profile id < firewall rules -< first + < flag < forward firewall < fw default drop < fwdfw ACCEPT @@@ -278,9 -288,8 +288,10 @@@ < fw settings dropdown < fw settings remark < fw settings ruletable +< gen dh +< generate dh key < grouptype + < hardware support < integrity < invalid input for dpd delay < invalid input for dpd timeout @@@ -294,8 -304,7 +305,9 @@@ < minimum < minute < most preferred +< never + < no hardware random number generator +< not a valid dh key < notice < ntp common settings < ntp sync @@@ -521,11 -525,13 +537,16 @@@ < ccd routes < ccd subnet < ccd used + < count + < countries + < countrycode + < country codes and flags < default ip < deprecated fs warn + < details +< dh +< dh key warn +< dh name is invalid < dnat address < dnsforward < dnsforward add a new entry @@@ -561,6 -570,8 +583,7 @@@ < fireinfo why read more < fireinfo your profile id < firewall rules -< first + < flag < forward firewall < fw default drop < fwdfw ACCEPT @@@ -735,9 -747,8 +759,10 @@@ < fw settings dropdown < fw settings remark < fw settings ruletable +< gen dh +< generate dh key < grouptype + < hardware support < integrity < invalid input for dpd delay < invalid input for dpd timeout @@@ -751,8 -763,7 +776,9 @@@ < minimum < minute < most preferred +< never + < no hardware random number generator +< not a valid dh key < notice < openvpn default < openvpn destination port used @@@ -970,11 -976,13 +1000,16 @@@ < ccd routes < ccd subnet < ccd used + < count + < countries + < countrycode + < country codes and flags < default ip < deprecated fs warn + < details +< dh +< dh key warn +< dh name is invalid < dnat address < dnsforward < dnsforward add a new entry @@@ -1002,6 -1013,8 +1038,7 @@@ < extrahd unable to write < extrahd you cant mount < firewall rules -< first + < flag < forward firewall < fw default drop < fwdfw ACCEPT @@@ -1176,9 -1190,8 +1214,10 @@@ < fw settings dropdown < fw settings remark < fw settings ruletable +< gen dh +< generate dh key < grouptype + < hardware support < integrity < invalid input for dpd delay < invalid input for dpd timeout @@@ -1192,8 -1206,7 +1231,9 @@@ < minimum < minute < most preferred +< never + < no hardware random number generator +< not a valid dh key < notice < openvpn default < openvpn destination port used @@@ -1399,9 -1411,7 +1447,10 @@@ < day-graph < default ip < deprecated fs warn + < details +< dh +< dh key warn +< dh name is invalid < disk access per < dnat address < dnsforward @@@ -1431,6 -1444,8 +1481,7 @@@ < extrahd unable to write < extrahd you cant mount < firewall rules -< first + < flag < forward firewall < frequency < fw default drop @@@ -1606,9 -1622,8 +1658,10 @@@ < fw settings dropdown < fw settings remark < fw settings ruletable +< gen dh +< generate dh key < grouptype + < hardware support < hour-graph < incoming traffic in bytes per second < integrity @@@ -1625,8 -1641,7 +1678,9 @@@ < minute < month-graph < most preferred +< never + < no hardware random number generator +< not a valid dh key < notice < openvpn default < openvpn destination port used diff --cc langs/de/cgi-bin/de.pl index 67eff2953,267d1751d..c05021735 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@@ -643,11 -650,9 +649,12 @@@ 'destination port numbers' => 'Zielport muß ein(e) gültige(r) Portnummer oder Portbereich sein.', 'destination port overlaps' => 'Der Zielportbereich überlappt einen bereits bestehenden Portbereich.', 'detail level' => 'Detaillierungsgrad', + 'details' => 'Mehr', '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 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 0eb05341a,64b6d19bb..37769b172 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@@ -665,11 -672,9 +671,12 @@@ 'destination port numbers' => 'Destination port must be a valid port number or port range.', 'destination port overlaps' => 'Destination port range overlaps an existing port range.', 'detail level' => 'Detail level', + 'details' => 'Details', '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.', 'dhcp advopt add' => 'Add a DHCP option', 'dhcp advopt added' => 'DHCP option added', 'dhcp advopt blank value' => 'DHCP Option value cannot be empty.',