webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-23 17:32:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent 78403883e2 2d685e1d4c
commit 0203401cf5
27 changed files with 130 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/language_issues.fr
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