From d21b86b6c312c3eaf30cb0b31ec9aa171a37650a Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Thu, 9 May 2019 17:13:52 +0200 Subject: [PATCH] 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 --- doc/language_issues.de | 6 ------ doc/language_issues.en | 6 ------ doc/language_issues.es | 6 ------ doc/language_issues.fr | 6 ------ doc/language_issues.it | 6 ------ doc/language_issues.nl | 6 ------ doc/language_issues.pl | 6 ------ doc/language_issues.ru | 6 ------ doc/language_issues.tr | 6 ------ langs/de/cgi-bin/de.pl | 4 ++-- langs/en/cgi-bin/en.pl | 10 +++++----- 11 files changed, 7 insertions(+), 61 deletions(-) diff --git a/doc/language_issues.de b/doc/language_issues.de index b250a35e95..be76f6d240 100644 --- 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 f245519459..bc41cfe235 100644 --- 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 41833da1f2..676e550928 100644 --- 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 46780db36c..82268463f2 100644 --- 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 9d3e0e8082..4156ed534b 100644 --- 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 69cefe1f9c..8f41d2032d 100644 --- 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 41833da1f2..676e550928 100644 --- 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 b769c7574e..11a424458c 100644 --- 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 6a6893abea..297901f654 100644 --- 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 dec4a9f0fd..51e8fe58de 100644 --- 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 005a352f55..81963f3a07 100644 --- 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!', ); -- 2.39.2