zoneconf: Fix spelling

This patch mainly changes "Macvtap" to the branded spelling and removes
short forms as well as hyphenation in German compound nouns.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/doc/language_issues.de b/doc/language_issues.de
index b250a35e950fe9243f8ee2f9d271904d1eedad5f..be76f6d2401e4de4adbb702eb2f46e77304cb811 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -786,13 +786,7 @@ WARNING: untranslated string: guardian logtarget_console = unknown string
 WARNING: untranslated string: guardian logtarget_file = unknown string
 WARNING: untranslated string: guardian logtarget_syslog = unknown string
 WARNING: untranslated string: guardian no entries = unknown string
-WARNING: untranslated string: guardian priolevel_high = unknown string
-WARNING: untranslated string: guardian priolevel_low = unknown string
-WARNING: untranslated string: guardian priolevel_medium = unknown string
-WARNING: untranslated string: guardian priolevel_very_low = unknown string
-WARNING: untranslated string: guardian priority level = unknown string
 WARNING: untranslated string: guardian service = unknown string
-WARNING: untranslated string: guardian watch snort alertfile = unknown string
 WARNING: untranslated string: ids hide = Hide
 WARNING: untranslated string: ids rules update = Ruleset
 WARNING: untranslated string: ids show = Show

diff --git a/doc/language_issues.en b/doc/language_issues.en
index f245519459a74d869750b5340c48bb4862a463a2..bc41cfe235b9cbaff3e5ba37a8054159d468c5f1 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -1009,13 +1009,7 @@ WARNING: untranslated string: guardian logtarget_console = unknown string
 WARNING: untranslated string: guardian logtarget_file = unknown string
 WARNING: untranslated string: guardian logtarget_syslog = unknown string
 WARNING: untranslated string: guardian no entries = unknown string
-WARNING: untranslated string: guardian priolevel_high = unknown string
-WARNING: untranslated string: guardian priolevel_low = unknown string
-WARNING: untranslated string: guardian priolevel_medium = unknown string
-WARNING: untranslated string: guardian priolevel_very_low = unknown string
-WARNING: untranslated string: guardian priority level = unknown string
 WARNING: untranslated string: guardian service = unknown string
-WARNING: untranslated string: guardian watch snort alertfile = unknown string
 WARNING: untranslated string: guest ok = allow guests to access
 WARNING: untranslated string: gui settings = GUI Settings
 WARNING: untranslated string: hangup = Disconnect

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 41833da1f263461e22cf2217dbfb4e3697c34475..676e550928e88f8a271b8b8f737ea76bf8c2528e 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -1061,13 +1061,7 @@ WARNING: untranslated string: guardian logtarget_console = unknown string
 WARNING: untranslated string: guardian logtarget_file = unknown string
 WARNING: untranslated string: guardian logtarget_syslog = unknown string
 WARNING: untranslated string: guardian no entries = unknown string
-WARNING: untranslated string: guardian priolevel_high = unknown string
-WARNING: untranslated string: guardian priolevel_low = unknown string
-WARNING: untranslated string: guardian priolevel_medium = unknown string
-WARNING: untranslated string: guardian priolevel_very_low = unknown string
-WARNING: untranslated string: guardian priority level = unknown string
 WARNING: untranslated string: guardian service = unknown string
-WARNING: untranslated string: guardian watch snort alertfile = unknown string
 WARNING: untranslated string: hardware support = Hardware Support
 WARNING: untranslated string: ids apply = Apply
 WARNING: untranslated string: ids apply ruleset changes = The ruleset changes are being applied. Please wait until all operations have completed successfully...

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 46780db36c82eaf99ce2c32941d404f0552ed107..82268463f2183eef5b4720561a5511c85f3cd210 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -826,13 +826,7 @@ WARNING: untranslated string: guardian logtarget_console = unknown string
 WARNING: untranslated string: guardian logtarget_file = unknown string
 WARNING: untranslated string: guardian logtarget_syslog = unknown string
 WARNING: untranslated string: guardian no entries = unknown string
-WARNING: untranslated string: guardian priolevel_high = unknown string
-WARNING: untranslated string: guardian priolevel_low = unknown string
-WARNING: untranslated string: guardian priolevel_medium = unknown string
-WARNING: untranslated string: guardian priolevel_very_low = unknown string
-WARNING: untranslated string: guardian priority level = unknown string
 WARNING: untranslated string: guardian service = unknown string
-WARNING: untranslated string: guardian watch snort alertfile = unknown string
 WARNING: untranslated string: ids apply = Apply
 WARNING: untranslated string: ids apply ruleset changes = The ruleset changes are being applied. Please wait until all operations have completed successfully...
 WARNING: untranslated string: ids automatic rules update = Automatic Rule Update

diff --git a/doc/language_issues.it b/doc/language_issues.it
index 9d3e0e808290e33aa093280f5221514be6675ed4..4156ed534b0e2acdc205b705daf8107fbdca5e43 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -900,13 +900,7 @@ WARNING: untranslated string: guardian logtarget_console = unknown string
 WARNING: untranslated string: guardian logtarget_file = unknown string
 WARNING: untranslated string: guardian logtarget_syslog = unknown string
 WARNING: untranslated string: guardian no entries = unknown string
-WARNING: untranslated string: guardian priolevel_high = unknown string
-WARNING: untranslated string: guardian priolevel_low = unknown string
-WARNING: untranslated string: guardian priolevel_medium = unknown string
-WARNING: untranslated string: guardian priolevel_very_low = unknown string
-WARNING: untranslated string: guardian priority level = unknown string
 WARNING: untranslated string: guardian service = unknown string
-WARNING: untranslated string: guardian watch snort alertfile = unknown string
 WARNING: untranslated string: ids apply = Apply
 WARNING: untranslated string: ids apply ruleset changes = The ruleset changes are being applied. Please wait until all operations have completed successfully...
 WARNING: untranslated string: ids automatic rules update = Automatic Rule Update

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 69cefe1f9c91704dbeeebd3f81085d7e0cb099ec..8f41d2032d6c196dafb20e5bff9d345ecdf2e72c 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -912,13 +912,7 @@ WARNING: untranslated string: guardian logtarget_console = unknown string
 WARNING: untranslated string: guardian logtarget_file = unknown string
 WARNING: untranslated string: guardian logtarget_syslog = unknown string
 WARNING: untranslated string: guardian no entries = unknown string
-WARNING: untranslated string: guardian priolevel_high = unknown string
-WARNING: untranslated string: guardian priolevel_low = unknown string
-WARNING: untranslated string: guardian priolevel_medium = unknown string
-WARNING: untranslated string: guardian priolevel_very_low = unknown string
-WARNING: untranslated string: guardian priority level = unknown string
 WARNING: untranslated string: guardian service = unknown string
-WARNING: untranslated string: guardian watch snort alertfile = unknown string
 WARNING: untranslated string: ids apply = Apply
 WARNING: untranslated string: ids apply ruleset changes = The ruleset changes are being applied. Please wait until all operations have completed successfully...
 WARNING: untranslated string: ids automatic rules update = Automatic Rule Update

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 41833da1f263461e22cf2217dbfb4e3697c34475..676e550928e88f8a271b8b8f737ea76bf8c2528e 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1061,13 +1061,7 @@ WARNING: untranslated string: guardian logtarget_console = unknown string
 WARNING: untranslated string: guardian logtarget_file = unknown string
 WARNING: untranslated string: guardian logtarget_syslog = unknown string
 WARNING: untranslated string: guardian no entries = unknown string
-WARNING: untranslated string: guardian priolevel_high = unknown string
-WARNING: untranslated string: guardian priolevel_low = unknown string
-WARNING: untranslated string: guardian priolevel_medium = unknown string
-WARNING: untranslated string: guardian priolevel_very_low = unknown string
-WARNING: untranslated string: guardian priority level = unknown string
 WARNING: untranslated string: guardian service = unknown string
-WARNING: untranslated string: guardian watch snort alertfile = unknown string
 WARNING: untranslated string: hardware support = Hardware Support
 WARNING: untranslated string: ids apply = Apply
 WARNING: untranslated string: ids apply ruleset changes = The ruleset changes are being applied. Please wait until all operations have completed successfully...

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index b769c7574eb5633ff3b8a49cbe75564d108f2828..11a424458cf9741b0fcbebf695292fd74ed83b3b 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1062,13 +1062,7 @@ WARNING: untranslated string: guardian logtarget_console = unknown string
 WARNING: untranslated string: guardian logtarget_file = unknown string
 WARNING: untranslated string: guardian logtarget_syslog = unknown string
 WARNING: untranslated string: guardian no entries = unknown string
-WARNING: untranslated string: guardian priolevel_high = unknown string
-WARNING: untranslated string: guardian priolevel_low = unknown string
-WARNING: untranslated string: guardian priolevel_medium = unknown string
-WARNING: untranslated string: guardian priolevel_very_low = unknown string
-WARNING: untranslated string: guardian priority level = unknown string
 WARNING: untranslated string: guardian service = unknown string
-WARNING: untranslated string: guardian watch snort alertfile = unknown string
 WARNING: untranslated string: hardware support = Hardware Support
 WARNING: untranslated string: ids apply = Apply
 WARNING: untranslated string: ids apply ruleset changes = The ruleset changes are being applied. Please wait until all operations have completed successfully...

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 6a6893abea29c6762d77d9a6bc23f473eec0a728..297901f654ab2431c25ad10f7e8126ca43415ab0 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -831,13 +831,7 @@ WARNING: untranslated string: guardian logtarget_console = unknown string
 WARNING: untranslated string: guardian logtarget_file = unknown string
 WARNING: untranslated string: guardian logtarget_syslog = unknown string
 WARNING: untranslated string: guardian no entries = unknown string
-WARNING: untranslated string: guardian priolevel_high = unknown string
-WARNING: untranslated string: guardian priolevel_low = unknown string
-WARNING: untranslated string: guardian priolevel_medium = unknown string
-WARNING: untranslated string: guardian priolevel_very_low = unknown string
-WARNING: untranslated string: guardian priority level = unknown string
 WARNING: untranslated string: guardian service = unknown string
-WARNING: untranslated string: guardian watch snort alertfile = unknown string
 WARNING: untranslated string: ids apply = Apply
 WARNING: untranslated string: ids apply ruleset changes = The ruleset changes are being applied. Please wait until all operations have completed successfully...
 WARNING: untranslated string: ids automatic rules update = Automatic Rule Update

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index dec4a9f0fdf0ebf953068d16919dff5327910c92..51e8fe58de528d4e7a143b33577dd013adf38067 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -2883,10 +2883,10 @@
 'zoneconf access native' => 'Nativ',
 'zoneconf access none' => 'Keine',
 'zoneconf access vlan' => 'VLAN',
-'zoneconf nic assignment' => 'Netzwerkkarten-Zuordnung',
+'zoneconf nic assignment' => 'Netzwerkkartenzuordnung',
 'zoneconf nicmode bridge' => 'Brücke',
 'zoneconf nicmode default' => 'Normal',
-'zoneconf nicmode macvtap' => 'Macvtap',
+'zoneconf nicmode macvtap' => 'MacVTap',
 'zoneconf title' => 'Zonen einrichten',
 'zoneconf val native assignment error' => 'Eine Netzwerkkarte kann nicht von mehreren Zonen nativ verwendet werden.',
 'zoneconf val ppp assignment error' => 'Die Netzwerkkarte, die von RED im PPP-Modus verwendet wird, kann keiner anderen Zone zugeordnet werden.',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 005a352f5552eeac6bdfbf169b5f675afa034bed..81963f3a07789d7b5d2a3b2b7c486c4a2d18b171 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2935,12 +2935,12 @@
 'zoneconf nic assignment' => 'NIC Assignment',
 'zoneconf nicmode bridge' => 'Bridge',
 'zoneconf nicmode default' => 'Default',
-'zoneconf nicmode macvtap' => 'Macvtap',
+'zoneconf nicmode macvtap' => 'MacVTtap',
 'zoneconf title' => 'Zone Configuration',
-'zoneconf val native assignment error' => 'A NIC can\'t be accessed natively by more than one zone.',
-'zoneconf val ppp assignment error' => 'The NIC used for RED in PPP mode can\'t be accessed by any other zone.',
-'zoneconf val vlan amount assignment error' => 'A zone can\'t have more than one VLAN assigned.',
-'zoneconf val vlan tag assignment error' => 'You can\'t use the same VLAN tag more than once per NIC.',
+'zoneconf val native assignment error' => 'A NIC cannot be accessed natively by more than one zone.',
+'zoneconf val ppp assignment error' => 'The NIC used for RED in PPP mode cannot be accessed by any other zone.',
+'zoneconf val vlan amount assignment error' => 'A zone cannot have more than one VLAN assigned.',
+'zoneconf val vlan tag assignment error' => 'You cannot use the same VLAN tag more than once per NIC.',
 'zoneconf warning incorrect configuration' => 'Warning: Incorrect configuration may render this web interface unreachable!',
 );