This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 1d6bc7a0dc528eda73e7b4c2a2cd5112c25ad304 (commit) via d21b86b6c312c3eaf30cb0b31ec9aa171a37650a (commit) via 03fd68552d8894052fab7a4651f8f1b860644639 (commit) from d04ab223c74ef6b025134388bceff9a03edba7b5 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 1d6bc7a0dc528eda73e7b4c2a2cd5112c25ad304 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu May 9 17:16:35 2019 +0200
zoneconf: Remove red warning
This is a bit shouty and there are various places where we do not warn about this problem, so this patch makes it more consistent.
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d21b86b6c312c3eaf30cb0b31ec9aa171a37650a Author: Michael Tremer michael.tremer@ipfire.org Date: Thu May 9 17:13:52 2019 +0200
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
commit 03fd68552d8894052fab7a4651f8f1b860644639 Author: Michael Tremer michael.tremer@ipfire.org Date: Thu May 9 17:11:24 2019 +0200
zoneconf: Move "None" option to the top
This is a more natural order of the options to me
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: doc/language_issues.de | 7 ------- 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 ------ doc/language_missings | 7 ------- html/cgi-bin/zoneconf.cgi | 16 +++++++--------- langs/de/cgi-bin/de.pl | 5 ++--- langs/en/cgi-bin/en.pl | 11 +++++------ 13 files changed, 14 insertions(+), 80 deletions(-)
Difference in files: diff --git a/doc/language_issues.de b/doc/language_issues.de index b250a35e9..3e8d19897 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -746,7 +746,6 @@ WARNING: translation string unused: zoneconf val native assignment error WARNING: translation string unused: zoneconf val ppp assignment error WARNING: translation string unused: zoneconf val vlan amount assignment error WARNING: translation string unused: zoneconf val vlan tag assignment error -WARNING: translation string unused: zoneconf warning incorrect configuration WARNING: untranslated string: Scan for Songs = unknown string WARNING: untranslated string: addons = Addons WARNING: untranslated string: bytes = unknown string @@ -786,13 +785,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 f24551945..bc41cfe23 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 41833da1f..676e55092 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 46780db36..82268463f 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 9d3e0e808..4156ed534 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 69cefe1f9..8f41d2032 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 41833da1f..676e55092 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 b769c7574..11a424458 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 6a6893abe..297901f65 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/doc/language_missings b/doc/language_missings index 0f3c2a724..0be1accbf 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -859,7 +859,6 @@ < zoneconf val ppp assignment error < zoneconf val vlan amount assignment error < zoneconf val vlan tag assignment error -< zoneconf warning incorrect configuration ############################################################################ # Checking cgi-bin translations for language: fr # ############################################################################ @@ -939,7 +938,6 @@ < zoneconf val ppp assignment error < zoneconf val vlan amount assignment error < zoneconf val vlan tag assignment error -< zoneconf warning incorrect configuration ############################################################################ # Checking cgi-bin translations for language: it # ############################################################################ @@ -1230,7 +1228,6 @@ < zoneconf val ppp assignment error < zoneconf val vlan amount assignment error < zoneconf val vlan tag assignment error -< zoneconf warning incorrect configuration ############################################################################ # Checking cgi-bin translations for language: nl # ############################################################################ @@ -1579,7 +1576,6 @@ < zoneconf val ppp assignment error < zoneconf val vlan amount assignment error < zoneconf val vlan tag assignment error -< zoneconf warning incorrect configuration ############################################################################ # Checking cgi-bin translations for language: pl # ############################################################################ @@ -2368,7 +2364,6 @@ < zoneconf val ppp assignment error < zoneconf val vlan amount assignment error < zoneconf val vlan tag assignment error -< zoneconf warning incorrect configuration ############################################################################ # Checking cgi-bin translations for language: ru # ############################################################################ @@ -3164,7 +3159,6 @@ < zoneconf val ppp assignment error < zoneconf val vlan amount assignment error < zoneconf val vlan tag assignment error -< zoneconf warning incorrect configuration ############################################################################ # Checking cgi-bin translations for language: tr # ############################################################################ @@ -3260,4 +3254,3 @@ < zoneconf val ppp assignment error < zoneconf val vlan amount assignment error < zoneconf val vlan tag assignment error -< zoneconf warning incorrect configuration diff --git a/html/cgi-bin/zoneconf.cgi b/html/cgi-bin/zoneconf.cgi index 69a988bf2..3b711d520 100644 --- a/html/cgi-bin/zoneconf.cgi +++ b/html/cgi-bin/zoneconf.cgi @@ -88,11 +88,9 @@ my $css = <<END }
#submit-container { - display: flex; width: 100%; - justify-content: space-between; padding-top: 20px; - text-align: left; + text-align: right; }
#submit-container.input { @@ -414,9 +412,9 @@ END print <<END <td class="textcenter"> <select name="ACCESS $uc $mac" onchange="document.getElementById('TAG $uc $mac').disabled = (this.value === 'VLAN' ? false : true)"> + <option value="NONE" $access_selected{"NONE"}>- $Lang::tr{"zoneconf access none"} -</option> <option value="NATIVE" $access_selected{"NATIVE"}>$Lang::tr{"zoneconf access native"}</option> <option value="VLAN" $access_selected{"VLAN"} $vlan_disabled>$Lang::tr{"zoneconf access vlan"}</option> - <option value="NONE" $access_selected{"NONE"}>$Lang::tr{"zoneconf access none"}</option> </select> <input type="number" id="TAG $uc $mac" name="TAG $uc $mac" min="1" max="4095" value="$zone_vlan_id" $field_disabled> </td> @@ -429,11 +427,11 @@ END
print <<END </table> - <div id="submit-container"> - <font color="red">$Lang::tr{"zoneconf warning incorrect configuration"}</font> - <input type="submit" name="ACTION" value="$Lang::tr{"save"}"> - </div> - </form> + + <div id="submit-container"> + <input type="submit" name="ACTION" value="$Lang::tr{"save"}"> + </div> +</form> END ;
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index dec4a9f0f..305776dd6 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -2883,16 +2883,15 @@ '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.', 'zoneconf val vlan amount assignment error' => 'Pro Zone kann nur ein VLAN verwendet werden.', 'zoneconf val vlan tag assignment error' => 'Pro Netzwerkkarte kann derselbe VLAN-Tag nur einmal verwendet werden.', -'zoneconf warning incorrect configuration' => 'Achtung: Fehlerhafte Einstellungen können dazu führen, dass diese Webseite nicht mehr erreichbar ist!', );
#EOF diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 005a352f5..5667d2004 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -2935,13 +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 warning incorrect configuration' => 'Warning: Incorrect configuration may render this web interface unreachable!', +'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.', );
#EOF
hooks/post-receive -- IPFire 2.x development tree