Merge remote-tracking branch 'origin/next' into fifteen

Conflicts:
	doc/language_issues.es
	doc/language_issues.fr
	doc/language_issues.nl
	doc/language_issues.pl
	doc/language_issues.tr
	doc/language_missings
This commit is contained in:
Michael Tremer
2013-10-03 14:26:33 +02:00
27 changed files with 130 additions and 22 deletions

View File

@@ -484,6 +484,7 @@ WARNING: translation string unused: to email adr
WARNING: translation string unused: to install an update
WARNING: translation string unused: to warn email bad
WARNING: translation string unused: too long 80 char max
WARNING: translation string unused: tor 0 = disabled
WARNING: translation string unused: tor accounting period daily
WARNING: translation string unused: tor accounting period monthly
WARNING: translation string unused: tor accounting period weekly

View File

@@ -515,6 +515,7 @@ WARNING: translation string unused: to email adr
WARNING: translation string unused: to install an update
WARNING: translation string unused: to warn email bad
WARNING: translation string unused: too long 80 char max
WARNING: translation string unused: tor 0 = disabled
WARNING: translation string unused: tor accounting period daily
WARNING: translation string unused: tor accounting period monthly
WARNING: translation string unused: tor accounting period weekly

View File

@@ -758,7 +758,9 @@ WARNING: untranslated string: fwhost stdnet
WARNING: untranslated string: fwhost type
WARNING: untranslated string: fwhost used
WARNING: untranslated string: fwhost welcome
WARNING: untranslated string: least preferred
WARNING: untranslated string: minute
WARNING: untranslated string: most preferred
WARNING: untranslated string: new
WARNING: untranslated string: openvpn default
WARNING: untranslated string: openvpn destination port used
@@ -825,8 +827,10 @@ 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

View File

@@ -761,7 +761,9 @@ WARNING: untranslated string: fwhost stdnet
WARNING: untranslated string: fwhost type
WARNING: untranslated string: fwhost used
WARNING: untranslated string: fwhost welcome
WARNING: untranslated string: least preferred
WARNING: untranslated string: minute
WARNING: untranslated string: most preferred
WARNING: untranslated string: new
WARNING: untranslated string: ntp common settings
WARNING: untranslated string: ntp sync
@@ -816,8 +818,10 @@ 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

View File

@@ -707,6 +707,8 @@ WARNING: untranslated string: fwhost stdnet
WARNING: untranslated string: fwhost type
WARNING: untranslated string: fwhost used
WARNING: untranslated string: fwhost welcome
WARNING: untranslated string: least preferred
WARNING: untranslated string: most preferred
WARNING: untranslated string: new
WARNING: untranslated string: outgoing firewall reserved groupname
WARNING: untranslated string: qos enter bandwidths
@@ -733,8 +735,10 @@ 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

View File

@@ -758,7 +758,9 @@ WARNING: untranslated string: fwhost stdnet
WARNING: untranslated string: fwhost type
WARNING: untranslated string: fwhost used
WARNING: untranslated string: fwhost welcome
WARNING: untranslated string: least preferred
WARNING: untranslated string: minute
WARNING: untranslated string: most preferred
WARNING: untranslated string: new
WARNING: untranslated string: openvpn default
WARNING: untranslated string: openvpn destination port used
@@ -825,8 +827,10 @@ 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

View File

@@ -745,7 +745,9 @@ WARNING: untranslated string: fwhost type
WARNING: untranslated string: fwhost used
WARNING: untranslated string: fwhost welcome
WARNING: untranslated string: incoming traffic in bytes per second
WARNING: untranslated string: least preferred
WARNING: untranslated string: minute
WARNING: untranslated string: most preferred
WARNING: untranslated string: new
WARNING: untranslated string: openvpn default
WARNING: untranslated string: openvpn destination port used
@@ -796,8 +798,10 @@ 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

View File

@@ -704,6 +704,8 @@ WARNING: untranslated string: fwhost stdnet
WARNING: untranslated string: fwhost type
WARNING: untranslated string: fwhost used
WARNING: untranslated string: fwhost welcome
WARNING: untranslated string: least preferred
WARNING: untranslated string: most preferred
WARNING: untranslated string: new
WARNING: untranslated string: outgoing firewall reserved groupname
WARNING: untranslated string: red1
@@ -729,8 +731,10 @@ 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

View File

@@ -257,7 +257,9 @@
< fw settings dropdown
< fw settings remark
< fw settings ruletable
< least preferred
< minute
< most preferred
< ntp common settings
< ntp sync
< openvpn default
@@ -291,6 +293,7 @@
< static routes
< system information
< tor
< tor 0 = disabled
< tor accounting
< tor accounting bytes
< tor accounting bytes left
@@ -311,8 +314,10 @@
< tor connected relays
< tor contact info
< tor daemon
< tor directory port
< tor enabled
< tor errmsg invalid accounting limit
< tor errmsg invalid directory port
< tor errmsg invalid ip or mask
< tor errmsg invalid relay address
< tor errmsg invalid relay name
@@ -653,7 +658,9 @@
< fw settings dropdown
< fw settings remark
< fw settings ruletable
< least preferred
< minute
< most preferred
< openvpn default
< openvpn destination port used
< openvpn disabled
@@ -703,6 +710,7 @@
< static routes
< system information
< tor
< tor 0 = disabled
< tor accounting
< tor accounting bytes
< tor accounting bytes left
@@ -723,8 +731,10 @@
< tor connected relays
< tor contact info
< tor daemon
< tor directory port
< tor enabled
< tor errmsg invalid accounting limit
< tor errmsg invalid directory port
< tor errmsg invalid ip or mask
< tor errmsg invalid relay address
< tor errmsg invalid relay name
@@ -1033,7 +1043,9 @@
< fw settings dropdown
< fw settings remark
< fw settings ruletable
< least preferred
< minute
< most preferred
< openvpn default
< openvpn destination port used
< openvpn disabled
@@ -1067,6 +1079,7 @@
< server restart
< static routes
< tor
< tor 0 = disabled
< tor accounting
< tor accounting bytes
< tor accounting bytes left
@@ -1087,8 +1100,10 @@
< tor connected relays
< tor contact info
< tor daemon
< tor directory port
< tor enabled
< tor errmsg invalid accounting limit
< tor errmsg invalid directory port
< tor errmsg invalid ip or mask
< tor errmsg invalid relay address
< tor errmsg invalid relay name
@@ -1404,8 +1419,10 @@
< fw settings ruletable
< hour-graph
< incoming traffic in bytes per second
< least preferred
< minute
< month-graph
< most preferred
< openvpn default
< openvpn destination port used
< openvpn disabled
@@ -1436,6 +1453,7 @@
< server restart
< static routes
< tor
< tor 0 = disabled
< tor accounting
< tor accounting bytes
< tor accounting bytes left
@@ -1456,8 +1474,10 @@
< tor connected relays
< tor contact info
< tor daemon
< tor directory port
< tor enabled
< tor errmsg invalid accounting limit
< tor errmsg invalid directory port
< tor errmsg invalid ip or mask
< tor errmsg invalid relay address
< tor errmsg invalid relay name