[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 6335e4a6054b2393c1e1d38a0c58ac8014948213 - IPFire-SCM

6 Jun 2014

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, master has been updated
       via  6335e4a6054b2393c1e1d38a0c58ac8014948213 (commit)
       via  d4af74b78ab66a59d42a9098c21e9b15229295b4 (commit)
      from  a65b9c3268ffacc27e703025ffd246e95f906a79 (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 6335e4a6054b2393c1e1d38a0c58ac8014948213
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Fri Jun 6 17:20:52 2014 +0200
langs: add monitor port text.
-----------------------------------------------------------------------
Summary of changes:
 config/cfgroot/header.pl      |  4 ++-
 doc/language_issues.de        |  6 +++-
 doc/language_issues.en        |  6 +++-
 doc/language_issues.es        |  5 +++
 doc/language_issues.fr        |  5 +++
 doc/language_issues.nl        |  5 +++
 doc/language_issues.pl        |  5 +++
 doc/language_issues.ru        |  5 +++
 doc/language_issues.tr        |  5 +++
 doc/language_missings         |  4 +++
 html/cgi-bin/modem-status.cgi |  2 +-
 html/cgi-bin/pppsetup.cgi     | 74 +++++++++++++++++++++++++++++++++++++++----
 langs/de/cgi-bin/de.pl        |  5 +--
 langs/en/cgi-bin/en.pl        |  5 +--
 langs/es/cgi-bin/es.pl        |  4 ---
 langs/fr/cgi-bin/fr.pl        |  4 ---
 langs/nl/cgi-bin/nl.pl        |  4 ---
 langs/pl/cgi-bin/pl.pl        |  4 ---
 langs/ru/cgi-bin/ru.pl        |  4 ---
 langs/tr/cgi-bin/tr.pl        |  4 ---
 20 files changed, 117 insertions(+), 43 deletions(-)
 mode change 100755 => 100644 html/cgi-bin/modem-status.cgi
Difference in files:

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index bbb7e21..d90086d 100644
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -45,6 +45,7 @@ my %menuhash = ();
 my $menu = %menuhash;
 %settings = ();
 %ethsettings = ();
+%pppsettings = ();
 @URI = ();
### Make sure this is an SSL request
@@ -57,6 +58,7 @@ if ($ENV{'SERVER_ADDR'} && $ENV{'HTTPS'} ne 'on') {
 ### Initialize environment
 &General::readhash("${swroot}/main/settings", %settings);
 &General::readhash("${swroot}/ethernet/settings", %ethsettings);
+&General::readhash("${swroot}/ppp/settings", %pppsettings);
 $language = $settings{'LANGUAGE'};
 $hostname = $settings{'HOSTNAME'};
 $hostnameintitle = 0;
@@ -154,7 +156,7 @@ sub genmenu {
         $menu->{'01.system'}{'subMenu'}->{'21.wlan'}{'enabled'} = 1;
     }
-    if ($ethsettings{'RED_TYPE'} eq "PPPOE") {
+    if ( $ethsettings{'RED_TYPE'} eq "PPPOE" && $pppsettings{'MONPORT'} ne "" ) {
         $menu->{'02.status'}{'subMenu'}->{'74.modem-status'}{'enabled'} = 1;
     }
 }
diff --git a/doc/language_issues.de b/doc/language_issues.de
index 2140296..9d1e0ad 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -459,12 +459,16 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
@@ -491,6 +495,7 @@ WARNING: translation string unused: source ip in use
 WARNING: translation string unused: source ip or net
 WARNING: translation string unused: source net
 WARNING: translation string unused: source network
+WARNING: translation string unused: source port in use
 WARNING: translation string unused: source port overlaps
 WARNING: translation string unused: squid extension methods
 WARNING: translation string unused: squid extension methods invalid
@@ -620,7 +625,6 @@ WARNING: untranslated string: emerging rules
 WARNING: untranslated string: first
 WARNING: untranslated string: fwhost err hostip
 WARNING: untranslated string: last
-WARNING: untranslated string: monitor interface
 WARNING: untranslated string: qos add subclass
 WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 3a0a4c7..55ee3e2 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -486,12 +486,16 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
@@ -521,6 +525,7 @@ WARNING: translation string unused: source ip in use
 WARNING: translation string unused: source ip or net
 WARNING: translation string unused: source net
 WARNING: translation string unused: source network
+WARNING: translation string unused: source port in use
 WARNING: translation string unused: source port overlaps
 WARNING: translation string unused: squid extension methods
 WARNING: translation string unused: squid extension methods invalid
@@ -651,7 +656,6 @@ WARNING: untranslated string: downlink
 WARNING: untranslated string: first
 WARNING: untranslated string: fwhost err hostip
 WARNING: untranslated string: last
-WARNING: untranslated string: monitor interface
 WARNING: untranslated string: route config changed
 WARNING: untranslated string: routing config added
 WARNING: untranslated string: routing config changed
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 7b59a5e..6bbdc18 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -420,12 +420,16 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
@@ -455,6 +459,7 @@ WARNING: translation string unused: source ip in use
 WARNING: translation string unused: source ip or net
 WARNING: translation string unused: source net
 WARNING: translation string unused: source network
+WARNING: translation string unused: source port in use
 WARNING: translation string unused: source port overlaps
 WARNING: translation string unused: squid extension methods
 WARNING: translation string unused: squid extension methods invalid
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 2446583..13a3c88 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -431,12 +431,16 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
@@ -466,6 +470,7 @@ WARNING: translation string unused: source ip in use
 WARNING: translation string unused: source ip or net
 WARNING: translation string unused: source net
 WARNING: translation string unused: source network
+WARNING: translation string unused: source port in use
 WARNING: translation string unused: source port overlaps
 WARNING: translation string unused: squid extension methods
 WARNING: translation string unused: squid extension methods invalid
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 8dd0a3c..aff38ca 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -485,12 +485,16 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
@@ -520,6 +524,7 @@ WARNING: translation string unused: source ip in use
 WARNING: translation string unused: source ip or net
 WARNING: translation string unused: source net
 WARNING: translation string unused: source network
+WARNING: translation string unused: source port in use
 WARNING: translation string unused: source port overlaps
 WARNING: translation string unused: squid extension methods
 WARNING: translation string unused: squid extension methods invalid
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 7b59a5e..6bbdc18 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -420,12 +420,16 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
@@ -455,6 +459,7 @@ WARNING: translation string unused: source ip in use
 WARNING: translation string unused: source ip or net
 WARNING: translation string unused: source net
 WARNING: translation string unused: source network
+WARNING: translation string unused: source port in use
 WARNING: translation string unused: source port overlaps
 WARNING: translation string unused: squid extension methods
 WARNING: translation string unused: squid extension methods invalid
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 2d12fc6..e553af7 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -425,12 +425,16 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
@@ -460,6 +464,7 @@ WARNING: translation string unused: source ip in use
 WARNING: translation string unused: source ip or net
 WARNING: translation string unused: source net
 WARNING: translation string unused: source network
+WARNING: translation string unused: source port in use
 WARNING: translation string unused: source port overlaps
 WARNING: translation string unused: squid extension methods
 WARNING: translation string unused: squid extension methods invalid
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 7ce95e0..5d3dbc8 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -484,12 +484,16 @@ WARNING: translation string unused: released
 WARNING: translation string unused: removable device advice
 WARNING: translation string unused: reportfile
 WARNING: translation string unused: requested data
+WARNING: translation string unused: reserved dst port
+WARNING: translation string unused: reserved src port
 WARNING: translation string unused: restore hardware settings
 WARNING: translation string unused: root
 WARNING: translation string unused: root path
 WARNING: translation string unused: root user password
 WARNING: translation string unused: route subnet is invalid
 WARNING: translation string unused: router ip
+WARNING: translation string unused: rsvd dst port overlap
+WARNING: translation string unused: rsvd src port overlap
 WARNING: translation string unused: rules already up to date
 WARNING: translation string unused: safe removal of umounted device
 WARNING: translation string unused: save error
@@ -519,6 +523,7 @@ WARNING: translation string unused: source ip in use
 WARNING: translation string unused: source ip or net
 WARNING: translation string unused: source net
 WARNING: translation string unused: source network
+WARNING: translation string unused: source port in use
 WARNING: translation string unused: source port overlaps
 WARNING: translation string unused: squid extension methods
 WARNING: translation string unused: squid extension methods invalid
diff --git a/doc/language_missings b/doc/language_missings
index 7ae53f8..a20a8d7 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -344,6 +344,7 @@
 < modem no connection message
 < modem sim information
 < modem status
+< monitor interface
 < most preferred
 < MTU settings
 < never
@@ -863,6 +864,7 @@
 < modem no connection message
 < modem sim information
 < modem status
+< monitor interface
 < most preferred
 < MTU settings
 < never
@@ -1366,6 +1368,7 @@
 < modem no connection message
 < modem sim information
 < modem status
+< monitor interface
 < most preferred
 < MTU settings
 < never
@@ -1860,6 +1863,7 @@
 < modem no connection message
 < modem sim information
 < modem status
+< monitor interface
 < month-graph
 < most preferred
 < MTU settings
diff --git a/html/cgi-bin/modem-status.cgi b/html/cgi-bin/modem-status.cgi
old mode 100755
new mode 100644
index d278c77..2d33a3d
--- a/html/cgi-bin/modem-status.cgi
+++ b/html/cgi-bin/modem-status.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2008  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2014  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi
index 7bceb80..33f521e 100644
--- a/html/cgi-bin/pppsetup.cgi
+++ b/html/cgi-bin/pppsetup.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  info@ipfire.org                     #
+# Copyright (C) 2007-2014  IPFire Team  info@ipfire.org                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -70,10 +70,10 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'refresh'})
 }
 elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'})
 {
-        if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|ttyACM0|ttyACM1|ttyACM2|ttyACM3|ttyUSB0|ttyUSB1|ttyUSB2|ttyUSB3|rfcomm0|rfcomm1|isdn1|isdn2)$/) {
+        if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|ttyACM[0-9]|ttyUSB[0-9]|rfcomm0|rfcomm1|isdn1|isdn2)$/) {
                 $errormessage = $Lang::tr{'invalid input'};
                 goto ERROR; }
-        if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'MONPORT'} !~ /^(ttyUSB0|ttyUSB1|ttyUSB2|ttyUSB3)$/) {
+        if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'MONPORT'} !~ /^(|ttyACM[0-9]|ttyUSB[0-9]|rfcomm0|rfcomm1)$/) {
                 $errormessage = $Lang::tr{'invalid input'};
                 goto ERROR; }
         if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ && $pppsettings{'DTERATE'} !~ /^(9600|19200|38400|57600|115200|230400|460800|921600)$/) {
@@ -333,19 +333,49 @@ $selected{'COMPORT'}{'ttyACM0'} = '';
 $selected{'COMPORT'}{'ttyACM1'} = '';
 $selected{'COMPORT'}{'ttyACM2'} = '';
 $selected{'COMPORT'}{'ttyACM3'} = '';
+$selected{'COMPORT'}{'ttyACM4'} = '';
+$selected{'COMPORT'}{'ttyACM5'} = '';
+$selected{'COMPORT'}{'ttyACM6'} = '';
+$selected{'COMPORT'}{'ttyACM7'} = '';
+$selected{'COMPORT'}{'ttyACM8'} = '';
+$selected{'COMPORT'}{'ttyACM9'} = '';
 $selected{'COMPORT'}{'ttyUSB0'} = '';
 $selected{'COMPORT'}{'ttyUSB1'} = '';
 $selected{'COMPORT'}{'ttyUSB2'} = '';
 $selected{'COMPORT'}{'ttyUSB3'} = '';
+$selected{'COMPORT'}{'ttyUSB4'} = '';
+$selected{'COMPORT'}{'ttyUSB5'} = '';
+$selected{'COMPORT'}{'ttyUSB6'} = '';
+$selected{'COMPORT'}{'ttyUSB7'} = '';
+$selected{'COMPORT'}{'ttyUSB8'} = '';
+$selected{'COMPORT'}{'ttyUSB9'} = '';
 $selected{'COMPORT'}{'rfcomm0'} = '';
 $selected{'COMPORT'}{'rfcomm1'} = '';
 $selected{'COMPORT'}{$pppsettings{'COMPORT'}} = "selected='selected'";
$selected{'MONPORT'}{''} = '';
+$selected{'MONPORT'}{'ttyACM0'} = '';
+$selected{'MONPORT'}{'ttyACM1'} = '';
+$selected{'MONPORT'}{'ttyACM2'} = '';
+$selected{'MONPORT'}{'ttyACM3'} = '';
+$selected{'MONPORT'}{'ttyACM4'} = '';
+$selected{'MONPORT'}{'ttyACM5'} = '';
+$selected{'MONPORT'}{'ttyACM6'} = '';
+$selected{'MONPORT'}{'ttyACM7'} = '';
+$selected{'MONPORT'}{'ttyACM8'} = '';
+$selected{'MONPORT'}{'ttyACM9'} = '';
 $selected{'MONPORT'}{'ttyUSB0'} = '';
 $selected{'MONPORT'}{'ttyUSB1'} = '';
 $selected{'MONPORT'}{'ttyUSB2'} = '';
 $selected{'MONPORT'}{'ttyUSB3'} = '';
+$selected{'MONPORT'}{'ttyUSB4'} = '';
+$selected{'MONPORT'}{'ttyUSB5'} = '';
+$selected{'MONPORT'}{'ttyUSB6'} = '';
+$selected{'MONPORT'}{'ttyUSB7'} = '';
+$selected{'MONPORT'}{'ttyUSB8'} = '';
+$selected{'MONPORT'}{'ttyUSB9'} = '';
+$selected{'MONPORT'}{'rfcomm0'} = '';
+$selected{'MONPORT'}{'rfcomm1'} = '';
 $selected{'MONPORT'}{$pppsettings{'MONPORT'}} = "selected='selected'";
$selected{'DTERATE'}{'9600'} = '';
@@ -582,16 +612,28 @@ END
                 <option value='ttyUSB1' $selected{'COMPORT'}{'ttyUSB1'}>ttyUSB1</option>
                 <option value='ttyUSB2' $selected{'COMPORT'}{'ttyUSB2'}>ttyUSB2</option>
                 <option value='ttyUSB3' $selected{'COMPORT'}{'ttyUSB3'}>ttyUSB3</option>
+                <option value='ttyUSB4' $selected{'COMPORT'}{'ttyUSB4'}>ttyUSB4</option>
+                <option value='ttyUSB5' $selected{'COMPORT'}{'ttyUSB5'}>ttyUSB5</option>
+                <option value='ttyUSB6' $selected{'COMPORT'}{'ttyUSB6'}>ttyUSB6</option>
+                <option value='ttyUSB7' $selected{'COMPORT'}{'ttyUSB7'}>ttyUSB7</option>
+                <option value='ttyUSB8' $selected{'COMPORT'}{'ttyUSB8'}>ttyUSB8</option>
+                <option value='ttyUSB9' $selected{'COMPORT'}{'ttyUSB9'}>ttyUSB9</option>
                 <option value='rfcomm0' $selected{'COMPORT'}{'rfcomm0'}>rfcomm0 (bluetooth)</option>
                 <option value='rfcomm1' $selected{'COMPORT'}{'rfcomm1'}>rfcomm1 (bluetooth)</option>
 END
 ;
                 if ($pppsettings{'TYPE'} ne 'serial' ) {
                         print <<END
-                <option value='ttyACM0' $selected{'COMPORT'}{'ttyACM0'}>$Lang::tr{'usb modem on acm0'}</option>
-                <option value='ttyACM1' $selected{'COMPORT'}{'ttyACM1'}>$Lang::tr{'usb modem on acm1'}</option>
-                <option value='ttyACM2' $selected{'COMPORT'}{'ttyACM2'}>$Lang::tr{'usb modem on acm2'}</option>
-                <option value='ttyACM3' $selected{'COMPORT'}{'ttyACM3'}>$Lang::tr{'usb modem on acm3'}</option>
+                <option value='ttyACM0' $selected{'COMPORT'}{'ttyACM0'}>ttyACM0</option>
+                <option value='ttyACM1' $selected{'COMPORT'}{'ttyACM1'}>ttyACM1</option>
+                <option value='ttyACM2' $selected{'COMPORT'}{'ttyACM2'}>ttyACM2</option>
+                <option value='ttyACM3' $selected{'COMPORT'}{'ttyACM3'}>ttyACM3</option>
+                <option value='ttyACM4' $selected{'COMPORT'}{'ttyACM4'}>ttyACM4</option>
+                <option value='ttyACM5' $selected{'COMPORT'}{'ttyACM5'}>ttyACM5</option>
+                <option value='ttyACM6' $selected{'COMPORT'}{'ttyACM6'}>ttyACM6</option>
+                <option value='ttyACM7' $selected{'COMPORT'}{'ttyACM7'}>ttyACM7</option>
+                <option value='ttyACM8' $selected{'COMPORT'}{'ttyACM8'}>ttyACM8</option>
+                <option value='ttyACM9' $selected{'COMPORT'}{'ttyACM9'}>ttyACM9</option>
 END
 ;
                 }
@@ -608,6 +650,24 @@ END
    					<option value="ttyUSB1" $selected{'MONPORT'}{'ttyUSB1'}>ttyUSB1</option>
    					<option value="ttyUSB2" $selected{'MONPORT'}{'ttyUSB2'}>ttyUSB2</option>
    					<option value="ttyUSB3" $selected{'MONPORT'}{'ttyUSB3'}>ttyUSB3</option>
+						<option value="ttyUSB4" $selected{'MONPORT'}{'ttyUSB4'}>ttyUSB4</option>
+						<option value="ttyUSB5" $selected{'MONPORT'}{'ttyUSB5'}>ttyUSB5</option>
+						<option value="ttyUSB6" $selected{'MONPORT'}{'ttyUSB6'}>ttyUSB6</option>
+						<option value="ttyUSB7" $selected{'MONPORT'}{'ttyUSB7'}>ttyUSB7</option>
+						<option value="ttyUSB8" $selected{'MONPORT'}{'ttyUSB8'}>ttyUSB8</option>
+						<option value="ttyUSB9" $selected{'MONPORT'}{'ttyUSB9'}>ttyUSB9</option>
+						<option value="rfcomm0" $selected{'COMPORT'}{'rfcomm0'}>rfcomm0 (bluetooth)</option>
+						<option value="rfcomm1" $selected{'COMPORT'}{'rfcomm1'}>rfcomm1 (bluetooth)</option>
+						<option value="ttyACM0" $selected{'COMPORT'}{'ttyACM0'}>ttyACM0</option>
+						<option value="ttyACM1" $selected{'COMPORT'}{'ttyACM1'}>ttyACM1</option>
+						<option value="ttyACM2" $selected{'COMPORT'}{'ttyACM2'}>ttyACM2</option>
+						<option value="ttyACM3" $selected{'COMPORT'}{'ttyACM3'}>ttyACM3</option>
+						<option value="ttyACM4" $selected{'COMPORT'}{'ttyACM4'}>ttyACM4</option>
+						<option value="ttyACM5" $selected{'COMPORT'}{'ttyACM5'}>ttyACM5</option>
+						<option value="ttyACM6" $selected{'COMPORT'}{'ttyACM6'}>ttyACM6</option>
+						<option value="ttyACM7" $selected{'COMPORT'}{'ttyACM7'}>ttyACM7</option>
+						<option value="ttyACM8" $selected{'COMPORT'}{'ttyACM8'}>ttyACM8</option>
+						<option value="ttyACM9" $selected{'COMPORT'}{'ttyACM9'}>ttyACM9</option>
    				</select>
    			</td>
    		</tr>
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 5df9ba8..c604ef0 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1492,6 +1492,7 @@
 'modify' => 'Ändern',
 'modulation' => 'Modulation',
 'monday' => 'Montag',
+'monitor interface' => 'Monitor-Schnittstelle',
 'month' => 'Monat',
 'month-graph' => 'Monat',
 'monthly firewallhits' => 'monatliche Firewalltreffer',
@@ -2484,10 +2485,6 @@
 'urlfilter weekly' => 'wöchentlich',
 'urlfilter whitelist always allowed' => 'Erlaube angepasste Whitelist für gesperrte Clients',
 'urlfilter wrong filetype' => 'Die Datei hat nicht die Erweiterung .tar.gz',
-'usb modem on acm0' => 'USB Modem an ACM0',
-'usb modem on acm1' => 'USB Modem an ACM1',
-'usb modem on acm2' => 'USB Modem an ACM2',
-'usb modem on acm3' => 'USB Modem an ACM3',
 'use' => 'Einsatz',
 'use a pre-shared key' => 'Verwenden Sie einen Pre-Shared Schlüssel:',
 'use dov' => 'DOV (Data Over Voice) benutzen:',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index e0686f3..f87607f 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1522,6 +1522,7 @@
 'modify' => 'Modify',
 'modulation' => 'Modulation',
 'monday' => 'Monday',
+'monitor interface' => 'Monitior interface',
 'month' => 'Month',
 'month-graph' => 'Month',
 'monthly firewallhits' => 'monthly firewallhits',
@@ -2524,10 +2525,6 @@
 'urlfilter weekly' => 'weekly',
 'urlfilter whitelist always allowed' => 'Allow custom whitelist for banned clients',
 'urlfilter wrong filetype' => 'File has not the extension .tar.gz',
-'usb modem on acm0' => 'USB Modem on ACM0',
-'usb modem on acm1' => 'USB Modem on ACM1',
-'usb modem on acm2' => 'USB Modem on ACM2',
-'usb modem on acm3' => 'USB Modem on ACM3',
 'use' => 'Use',
 'use a pre-shared key' => 'Use a pre-shared key:',
 'use dov' => 'Use data over voice (DOV):',
diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index ae5bf14..2be3d36 100644
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -2051,10 +2051,6 @@
 'urlfilter weekly' => 'semanalmente',
 'urlfilter whitelist always allowed' => 'Permitir lista blanca personalizada para clientes censurados',
 'urlfilter wrong filetype' => 'El archivo no tiene la extension .tar.gz',
-'usb modem on acm0' => 'Modem USB en ACM0',
-'usb modem on acm1' => 'Modem USB en ACM1',
-'usb modem on acm2' => 'Modem USB en ACM2',
-'usb modem on acm3' => 'Modem USB en ACM3',
 'use' => 'Usar',
 'use a pre-shared key' => 'Usar llave pre-compartida',
 'use dov' => 'Usar datos sobre voz (DOV)',
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 84e15a8..f4e9518 100644
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -2065,10 +2065,6 @@
 'urlfilter weekly' => 'hebdomadairement',
 'urlfilter whitelist always allowed' => 'Autoriser une liste blanche personnalisée de clients bannis',
 'urlfilter wrong filetype' => 'Le fichier n'a pas l'extension .tar.gz',
-'usb modem on acm0' => 'Modem USB sur ACM0',
-'usb modem on acm1' => 'Modem USB sur ACM1',
-'usb modem on acm2' => 'Modem USB sur ACM2',
-'usb modem on acm3' => 'Modem USB sur ACM3',
 'use' => 'Utiliser',
 'use a pre-shared key' => 'Utiliser une clé pré-partagée :',
 'use dov' => 'Utilisez DOV (Data Over Voice):',
diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl
index 767f93b..b9e4c6f 100644
--- a/langs/nl/cgi-bin/nl.pl
+++ b/langs/nl/cgi-bin/nl.pl
@@ -2481,10 +2481,6 @@
 'urlfilter weekly' => 'wekelijks',
 'urlfilter whitelist always allowed' => 'Toestaan gebruik van eigen witte lijst voor verboden clients',
 'urlfilter wrong filetype' => 'Bestand heeft niet de extensie .tar.gz',
-'usb modem on acm0' => 'USB Modem op ACM0',
-'usb modem on acm1' => 'USB Modem op ACM1',
-'usb modem on acm2' => 'USB Modem op ACM2',
-'usb modem on acm3' => 'USB Modem op ACM3',
 'use' => 'Gebruik',
 'use a pre-shared key' => 'Gebruik een pre-shared sleutel:',
 'use dov' => 'Gebruik data over voice (DOV):',
diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl
index 103e526..a79eed0 100644
--- a/langs/pl/cgi-bin/pl.pl
+++ b/langs/pl/cgi-bin/pl.pl
@@ -2074,10 +2074,6 @@
 'urlfilter weekly' => 'co tydzień',
 'urlfilter whitelist always allowed' => 'Zezwolenie na białą listę dla zablokowanych klientów',
 'urlfilter wrong filetype' => 'Plik nie posiada rozszerzenia .tar.gz',
-'usb modem on acm0' => 'Modem USB na ACM0',
-'usb modem on acm1' => 'Modem USB na ACM1',
-'usb modem on acm2' => 'Modem USB na ACM2',
-'usb modem on acm3' => 'Modem USB na ACM3',
 'use' => 'Użyj',
 'use a pre-shared key' => 'Użyj klucza współdzielonego:',
 'use dov' => 'Use data over voice (DOV):',
diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl
index 2b680b0..e3aaab4 100644
--- a/langs/ru/cgi-bin/ru.pl
+++ b/langs/ru/cgi-bin/ru.pl
@@ -2069,10 +2069,6 @@
 'urlfilter weekly' => 'Еженедельно',
 'urlfilter whitelist always allowed' => 'Разрешить пользовательский белый список для забаненых клиентов',
 'urlfilter wrong filetype' => 'File has not the extension .tar.gz',
-'usb modem on acm0' => 'USB Модем на ACM0',
-'usb modem on acm1' => 'USB Модем на ACM1',
-'usb modem on acm2' => 'USB Модем на ACM2',
-'usb modem on acm3' => 'USB Модем на ACM3',
 'use' => 'Use',
 'use a pre-shared key' => 'Use a pre-shared key:',
 'use dov' => 'Use data over voice (DOV):',
diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl
index 9eb5a43..619f3f2 100644
--- a/langs/tr/cgi-bin/tr.pl
+++ b/langs/tr/cgi-bin/tr.pl
@@ -2484,10 +2484,6 @@
 'urlfilter weekly' => 'Haftalık',
 'urlfilter whitelist always allowed' => 'Yasaklı istemciler için özel beyaz liste izini',
 'urlfilter wrong filetype' => 'Uzantısı .tar.gz olan dosya yok',
-'usb modem on acm0' => 'ACM0 üzerindeki USB Modem',
-'usb modem on acm1' => 'ACM1 üzerindeki USB Modem',
-'usb modem on acm2' => 'ACM2 üzerindeki USB Modem',
-'usb modem on acm3' => 'ACM3 üzerindeki USB Modem',
 'use' => 'Kullan',
 'use a pre-shared key' => 'Ön paylaşımlı anahtar kullan:',
 'use dov' => 'Ses üzerinden veri kullan (DOV):',
hooks/post-receive
--
IPFire 2.x development tree

    