Merge branch 'next' into fifteen

Conflicts:
	doc/language_issues.tr
This commit is contained in:
Arne Fitzenreiter
2013-11-30 12:45:31 +01:00
16 changed files with 204 additions and 113 deletions

View File

@@ -210,6 +210,7 @@ WARNING: translation string unused: from email user
WARNING: translation string unused: from warn email bad
WARNING: translation string unused: fwdfw MODE1
WARNING: translation string unused: fwdfw MODE2
WARNING: translation string unused: fwdfw err prot_port1
WARNING: translation string unused: fwdfw err tgt_port
WARNING: translation string unused: fwdfw final_rule
WARNING: translation string unused: fwdfw from