From: Michael Tremer Date: Thu, 8 May 2014 23:31:43 +0000 (+0200) Subject: Merge branch 'master' into next X-Git-Tag: v2.15-core79~98 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=03d0b8c7e8486fca41674ddac51543edad300f4d;p=ipfire-2.x.git Merge branch 'master' into next Conflicts: doc/language_issues.nl doc/language_issues.tr --- 03d0b8c7e8486fca41674ddac51543edad300f4d diff --cc doc/language_issues.nl index 747f406285,6245eefbf1..e06e8a75c6 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@@ -588,344 -649,14 +648,50 @@@ 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: ConnSched dial - WARNING: untranslated string: ConnSched hangup - WARNING: untranslated string: ConnSched reboot - WARNING: untranslated string: ConnSched shutdown - WARNING: untranslated string: MB read - WARNING: untranslated string: MB written +WARNING: untranslated string: Number of Countries for the pie chart WARNING: untranslated string: Scan for Songs - WARNING: untranslated string: addons - WARNING: untranslated string: advproxy cache-digest - WARNING: untranslated string: advproxy errmsg proxy ports equal - WARNING: untranslated string: advproxy proxy port transparent - WARNING: untranslated string: bit + WARNING: untranslated string: atm device WARNING: untranslated string: bytes +WARNING: untranslated string: capabilities - 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: 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 - WARNING: untranslated string: dnsforward add a new entry - WARNING: untranslated string: dnsforward configuration - WARNING: untranslated string: dnsforward edit an entry - WARNING: untranslated string: dnsforward entries - WARNING: untranslated string: dnsforward forward_server - WARNING: untranslated string: dnsforward zone - 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: entropy graphs +WARNING: untranslated string: firewall logs country - WARNING: untranslated string: firewall rules - WARNING: untranslated string: first - WARNING: untranslated string: flag - WARNING: untranslated string: fw default drop - WARNING: untranslated string: fw settings - WARNING: untranslated string: fw settings color - WARNING: untranslated string: fw settings dropdown - WARNING: untranslated string: fw settings remark - WARNING: untranslated string: fw settings ruletable - WARNING: untranslated string: fwdfw ACCEPT - WARNING: untranslated string: fwdfw DROP - WARNING: untranslated string: fwdfw REJECT - WARNING: untranslated string: fwdfw action - WARNING: untranslated string: fwdfw additional - WARNING: untranslated string: fwdfw all icmp - WARNING: untranslated string: fwdfw change - WARNING: untranslated string: fwdfw copy - WARNING: untranslated string: fwdfw delete - WARNING: untranslated string: fwdfw dnat - WARNING: untranslated string: fwdfw dnat error - WARNING: untranslated string: fwdfw dnat extport - WARNING: untranslated string: fwdfw dnat nochoice - WARNING: untranslated string: fwdfw dnat porterr - WARNING: untranslated string: fwdfw dnat porterr2 - WARNING: untranslated string: fwdfw edit - WARNING: untranslated string: fwdfw err nosrc - WARNING: untranslated string: fwdfw err notgt - WARNING: untranslated string: fwdfw err prot_port - WARNING: untranslated string: fwdfw err remark - WARNING: untranslated string: fwdfw err ruleexists - WARNING: untranslated string: fwdfw err same - WARNING: untranslated string: fwdfw err samesub - WARNING: untranslated string: fwdfw err src_addr - WARNING: untranslated string: fwdfw err tgt_addr - WARNING: untranslated string: fwdfw err tgt_grp - WARNING: untranslated string: fwdfw err tgt_mac - WARNING: untranslated string: fwdfw err tgt_port - WARNING: untranslated string: fwdfw err time - WARNING: untranslated string: fwdfw external port nat - WARNING: untranslated string: fwdfw hint ip1 - WARNING: untranslated string: fwdfw hint ip2 - WARNING: untranslated string: fwdfw hint mac - WARNING: untranslated string: fwdfw iface - WARNING: untranslated string: fwdfw log - WARNING: untranslated string: fwdfw log rule - WARNING: untranslated string: fwdfw many - WARNING: untranslated string: fwdfw movedown - WARNING: untranslated string: fwdfw moveup - WARNING: untranslated string: fwdfw newrule - WARNING: untranslated string: fwdfw pol allow - WARNING: untranslated string: fwdfw pol block - WARNING: untranslated string: fwdfw pol text - WARNING: untranslated string: fwdfw pol text1 - WARNING: untranslated string: fwdfw pol title - WARNING: untranslated string: fwdfw prot41 - WARNING: untranslated string: fwdfw prot41 short - WARNING: untranslated string: fwdfw red - WARNING: untranslated string: fwdfw reread - WARNING: untranslated string: fwdfw rule activate - WARNING: untranslated string: fwdfw rulepos - WARNING: untranslated string: fwdfw snat - WARNING: untranslated string: fwdfw source - WARNING: untranslated string: fwdfw sourceip - WARNING: untranslated string: fwdfw target - WARNING: untranslated string: fwdfw targetip - WARNING: untranslated string: fwdfw timeframe - WARNING: untranslated string: fwdfw toggle - WARNING: untranslated string: fwdfw togglelog - WARNING: untranslated string: fwdfw use nat - WARNING: untranslated string: fwdfw use srcport - WARNING: untranslated string: fwdfw use srv - WARNING: untranslated string: fwdfw useless rule - WARNING: untranslated string: fwdfw warn1 - WARNING: untranslated string: fwdfw wd_fri - WARNING: untranslated string: fwdfw wd_mon - WARNING: untranslated string: fwdfw wd_sat - WARNING: untranslated string: fwdfw wd_sun - WARNING: untranslated string: fwdfw wd_thu - WARNING: untranslated string: fwdfw wd_tue - WARNING: untranslated string: fwdfw wd_wed - WARNING: untranslated string: fwhost addgrp - WARNING: untranslated string: fwhost addgrpname - WARNING: untranslated string: fwhost addhost - WARNING: untranslated string: fwhost addnet - WARNING: untranslated string: fwhost addservice - WARNING: untranslated string: fwhost addservicegrp - WARNING: untranslated string: fwhost any - WARNING: untranslated string: fwhost back - WARNING: untranslated string: fwhost ccdhost - WARNING: untranslated string: fwhost ccdnet - WARNING: untranslated string: fwhost change - WARNING: untranslated string: fwhost cust addr - WARNING: untranslated string: fwhost cust grp - WARNING: untranslated string: fwhost cust net - WARNING: untranslated string: fwhost cust service - WARNING: untranslated string: fwhost cust srvgrp - WARNING: untranslated string: fwhost deleted - WARNING: untranslated string: fwhost empty - WARNING: untranslated string: fwhost err addr - WARNING: untranslated string: fwhost err empty - WARNING: untranslated string: fwhost err emptytable - WARNING: untranslated string: fwhost err groupempty - WARNING: untranslated string: fwhost err grpexist - WARNING: untranslated string: fwhost err hostexist WARNING: untranslated string: fwhost err hostip - WARNING: untranslated string: fwhost err ip - WARNING: untranslated string: fwhost err ipcheck - WARNING: untranslated string: fwhost err ipmac - WARNING: untranslated string: fwhost err ipwithsub - WARNING: untranslated string: fwhost err isccdhost - WARNING: untranslated string: fwhost err isccdiphost - WARNING: untranslated string: fwhost err isccdipnet - WARNING: untranslated string: fwhost err isccdnet - WARNING: untranslated string: fwhost err isingrp - WARNING: untranslated string: fwhost err maxservicetcp - WARNING: untranslated string: fwhost err maxserviceudp - WARNING: untranslated string: fwhost err name - WARNING: untranslated string: fwhost err name1 - WARNING: untranslated string: fwhost err net - WARNING: untranslated string: fwhost err netexist - WARNING: untranslated string: fwhost err partofnet - WARNING: untranslated string: fwhost err port - WARNING: untranslated string: fwhost err remark - WARNING: untranslated string: fwhost err srv exists - WARNING: untranslated string: fwhost err srvexist - WARNING: untranslated string: fwhost err sub32 - WARNING: untranslated string: fwhost hint - WARNING: untranslated string: fwhost icmptype - WARNING: untranslated string: fwhost ip_mac - WARNING: untranslated string: fwhost ipsec net - WARNING: untranslated string: fwhost menu - WARNING: untranslated string: fwhost netaddress - WARNING: untranslated string: fwhost newgrp - WARNING: untranslated string: fwhost newhost - WARNING: untranslated string: fwhost newnet - WARNING: untranslated string: fwhost newservice - WARNING: untranslated string: fwhost newservicegrp - WARNING: untranslated string: fwhost ovpn_n2n - WARNING: untranslated string: fwhost port - WARNING: untranslated string: fwhost prot - WARNING: untranslated string: fwhost services - WARNING: untranslated string: fwhost srv_name - WARNING: untranslated string: fwhost stdnet - 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: imei +WARNING: untranslated string: imsi - WARNING: untranslated string: incoming firewall access - 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: 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: model +WARNING: untranslated string: modem hardware details +WARNING: untranslated string: modem information +WARNING: untranslated string: modem network bit error rate +WARNING: untranslated string: modem network information +WARNING: untranslated string: modem network mode +WARNING: untranslated string: modem network operator +WARNING: untranslated string: modem network registration +WARNING: untranslated string: modem network signal quality +WARNING: untranslated string: modem no connection +WARNING: untranslated string: modem no connection message +WARNING: untranslated string: modem sim information +WARNING: untranslated string: modem status +WARNING: untranslated string: monitor interface - 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: outgoing firewall access +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: qos enter bandwidths - WARNING: untranslated string: red1 + WARNING: untranslated string: random number generator daemon 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: software version +WARNING: untranslated string: source ip country - WARNING: untranslated string: ssh - WARNING: untranslated string: support donation - WARNING: untranslated string: system has hwrng - WARNING: untranslated string: system has rdrand - WARNING: untranslated string: tor - WARNING: untranslated string: tor accounting - WARNING: untranslated string: tor accounting bytes - WARNING: untranslated string: tor accounting bytes left - WARNING: untranslated string: tor accounting interval - WARNING: untranslated string: tor accounting limit - WARNING: untranslated string: tor accounting period - WARNING: untranslated string: tor acls - WARNING: untranslated string: tor allowed subnets - WARNING: untranslated string: tor bandwidth burst - WARNING: untranslated string: tor bandwidth rate - WARNING: untranslated string: tor bandwidth settings - WARNING: untranslated string: tor bandwidth unlimited - WARNING: untranslated string: tor common settings - WARNING: untranslated string: tor configuration - WARNING: untranslated string: tor connected relays - WARNING: untranslated string: tor contact info - WARNING: untranslated string: tor daemon - WARNING: untranslated string: tor directory port - WARNING: untranslated string: tor enabled - WARNING: untranslated string: tor errmsg invalid accounting limit - WARNING: untranslated string: tor errmsg invalid directory port - WARNING: untranslated string: tor errmsg invalid ip or mask - WARNING: untranslated string: tor errmsg invalid relay address - WARNING: untranslated string: tor errmsg invalid relay name - WARNING: untranslated string: tor errmsg invalid relay port - WARNING: untranslated string: tor errmsg invalid socks port - WARNING: untranslated string: tor exit country any - WARNING: untranslated string: tor exit nodes - WARNING: untranslated string: tor relay address - WARNING: untranslated string: tor relay configuration - WARNING: untranslated string: tor relay enabled - WARNING: untranslated string: tor relay external address - WARNING: untranslated string: tor relay fingerprint - WARNING: untranslated string: tor relay mode - WARNING: untranslated string: tor relay mode bridge - WARNING: untranslated string: tor relay mode exit - WARNING: untranslated string: tor relay mode private bridge - WARNING: untranslated string: tor relay mode relay - WARNING: untranslated string: tor relay nickname - WARNING: untranslated string: tor relay port - WARNING: untranslated string: tor service - WARNING: untranslated string: tor socks port - WARNING: untranslated string: tor stats - WARNING: untranslated string: tor traffic limit hard - WARNING: untranslated string: tor traffic limit soft - WARNING: untranslated string: tor traffic read written - WARNING: untranslated string: tor use exit nodes - WARNING: untranslated string: uplink +WARNING: untranslated string: upload dh key - WARNING: untranslated string: uptime load average - WARNING: untranslated string: urlfilter redirect template +WARNING: untranslated string: vendor - WARNING: untranslated string: wlan client - WARNING: untranslated string: wlan client advanced settings - WARNING: untranslated string: wlan client and - WARNING: untranslated string: wlan client bssid - WARNING: untranslated string: wlan client ccmp - WARNING: untranslated string: wlan client configuration - WARNING: untranslated string: wlan client disconnected - WARNING: untranslated string: wlan client duplicate ssid - WARNING: untranslated string: wlan client edit entry - WARNING: untranslated string: wlan client encryption - WARNING: untranslated string: wlan client encryption none - WARNING: untranslated string: wlan client encryption wep - WARNING: untranslated string: wlan client encryption wpa - WARNING: untranslated string: wlan client encryption wpa2 - WARNING: untranslated string: wlan client group cipher - WARNING: untranslated string: wlan client group key algorithm - WARNING: untranslated string: wlan client invalid key length - WARNING: untranslated string: wlan client new entry - WARNING: untranslated string: wlan client new network - WARNING: untranslated string: wlan client pairwise cipher - WARNING: untranslated string: wlan client pairwise key algorithm - WARNING: untranslated string: wlan client pairwise key group key - WARNING: untranslated string: wlan client psk - WARNING: untranslated string: wlan client ssid - WARNING: untranslated string: wlan client tkip - WARNING: untranslated string: wlan client wpa mode - WARNING: untranslated string: wlan client wpa mode all - WARNING: untranslated string: wlan client wpa mode ccmp ccmp - WARNING: untranslated string: wlan client wpa mode ccmp tkip - WARNING: untranslated string: wlan client wpa mode tkip tkip - WARNING: untranslated string: wlan clients diff --cc doc/language_issues.tr index bbb832d0e8,e6af830a5d..816967cd37 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@@ -639,48 -648,9 +647,40 @@@ 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: ConnSched dial - WARNING: untranslated string: ConnSched hangup - WARNING: untranslated string: ConnSched reboot - WARNING: untranslated string: ConnSched shutdown +WARNING: untranslated string: Number of Countries for the pie chart WARNING: untranslated string: Scan for Songs WARNING: untranslated string: bytes +WARNING: untranslated string: capabilities - WARNING: untranslated string: count +WARNING: untranslated string: dh +WARNING: untranslated string: dh key warn +WARNING: untranslated string: dh name is invalid +WARNING: untranslated string: firewall logs country - WARNING: untranslated string: fwdfw many WARNING: untranslated string: fwhost err hostip +WARNING: untranslated string: gen dh +WARNING: untranslated string: generate dh key +WARNING: untranslated string: imei +WARNING: untranslated string: imsi - WARNING: untranslated string: incoming firewall access +WARNING: untranslated string: model +WARNING: untranslated string: modem hardware details +WARNING: untranslated string: modem information +WARNING: untranslated string: modem network bit error rate +WARNING: untranslated string: modem network information +WARNING: untranslated string: modem network mode +WARNING: untranslated string: modem network operator +WARNING: untranslated string: modem network registration +WARNING: untranslated string: modem network signal quality +WARNING: untranslated string: modem no connection +WARNING: untranslated string: modem no connection message +WARNING: untranslated string: modem sim information +WARNING: untranslated string: modem status +WARNING: untranslated string: monitor interface +WARNING: untranslated string: not a valid dh key - WARNING: untranslated string: outgoing firewall access +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: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed diff --cc doc/language_missings index 6d7bb9266a,1a386c19c2..b8fe1b4757 --- a/doc/language_missings +++ b/doc/language_missings @@@ -23,9 -23,9 +23,10 @@@ < age shour < age sminute < age ssecond + < atm device < attention < bit +< capabilities < ccd add < ccd choose net < ccd clientip @@@ -376,12 -357,11 +385,13 @@@ < proxy reports today < proxy reports weekly < qos enter bandwidths + < random number generator daemon < red1 < server restart +< show dh < snat new source ip address < snort working +< software version < ssh < static routes < support donation @@@ -524,9 -502,9 +534,10 @@@ < age sminute < age ssecond < Async logging enabled + < atm device < attention < bit +< capabilities < ccd add < ccd choose net < ccd clientip @@@ -1016,9 -972,9 +1036,10 @@@ < age shour < age sminute < age ssecond + < atm device < attention < bit +< capabilities < ccd add < ccd choose net < ccd clientip @@@ -1362,11 -1299,10 +1391,12 @@@ < proxy reports today < proxy reports weekly < qos enter bandwidths + < random number generator daemon < red1 < server restart +< show dh < snat new source ip address +< software version < ssh < static routes < support donation @@@ -1485,9 -1419,9 +1515,10 @@@ < age shour < age sminute < age ssecond + < atm device < attention < bit +< capabilities < ccd add < ccd choose net < ccd clientip @@@ -1835,11 -1750,10 +1874,12 @@@ < proxy reports today < proxy reports weekly < qos enter bandwidths + < random number generator daemon < red1 < server restart +< show dh < snat new source ip address +< software version < ssh < static routes < support donation