ids.cgi: Update wording and checkbox order

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

diff --git a/doc/language_issues.en b/doc/language_issues.en
index f9f39b023335e8d7c36ea074b13e78ba7ea5cb5c..ddf82764cae18992b9c6580f630be5c1f68f5bd2 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -1064,16 +1064,16 @@ WARNING: untranslated string: ids provider = Provider
 WARNING: untranslated string: ids provider eol = (EOL)
 WARNING: untranslated string: ids provider settings = Provider settings
 WARNING: untranslated string: ids remove rule structures = Remove old rule structures...
-WARNING: untranslated string: ids reports daily = Daily reports
-WARNING: untranslated string: ids reports monthly = Monthly reports
-WARNING: untranslated string: ids reports weekly = Weekly reports
+WARNING: untranslated string: ids reports daily = Send a daily report
+WARNING: untranslated string: ids reports monthly = Send a monthly report
+WARNING: untranslated string: ids reports weekly = Send a weekly report
 WARNING: untranslated string: ids reset provider = Reset provider
 WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully...
 WARNING: untranslated string: ids ruleset is up to date = No update required - The ruleset is up to date.
 WARNING: untranslated string: ids rulesets = Rulesets
+WARNING: untranslated string: ids send email on alert = Send email on alert
 WARNING: untranslated string: ids show = Show
 WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
-WARNING: untranslated string: ids summary reports = Summary reports
 WARNING: untranslated string: ids the choosen provider is already in use = The choosen provider is already in use.
 WARNING: untranslated string: ids unable to download the ruleset = Unable to download the ruleset
 WARNING: untranslated string: ids visit provider website = Visit provider website

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 6208826727627cc14a70dfd38ceb986833305ab3..cf4bee8355765114541994355119fe046300dc51 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -1063,10 +1063,10 @@ WARNING: untranslated string: ids invalid mail address = Is or contains an inval
 WARNING: untranslated string: ids no email recipients = No email recipients given
 WARNING: untranslated string: ids no email sender = No sender email address specified
 WARNING: untranslated string: ids provider eol = (EOL)
-WARNING: untranslated string: ids reports daily = Daily reports
-WARNING: untranslated string: ids reports monthly = Monthly reports
-WARNING: untranslated string: ids reports weekly = Weekly reports
-WARNING: untranslated string: ids summary reports = Summary reports
+WARNING: untranslated string: ids reports daily = Send a daily report
+WARNING: untranslated string: ids reports monthly = Send a monthly report
+WARNING: untranslated string: ids reports weekly = Send a weekly report
+WARNING: untranslated string: ids send email on alert = Send email on alert
 WARNING: untranslated string: indirect target selection = Indirect target selection
 WARNING: untranslated string: info messages = unknown string
 WARNING: untranslated string: mdstat = Mdstat

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 4f52d7b9d82d291551470901ede169d6876f28f6..0f1aefe314480da0af6cc2025602d7ee42fecdb8 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -1051,11 +1051,11 @@ WARNING: untranslated string: ids invalid mail address = Is or contains an inval
 WARNING: untranslated string: ids no email recipients = No email recipients given
 WARNING: untranslated string: ids no email sender = No sender email address specified
 WARNING: untranslated string: ids provider eol = (EOL)
-WARNING: untranslated string: ids reports daily = Daily reports
-WARNING: untranslated string: ids reports monthly = Monthly reports
-WARNING: untranslated string: ids reports weekly = Weekly reports
+WARNING: untranslated string: ids reports daily = Send a daily report
+WARNING: untranslated string: ids reports monthly = Send a monthly report
+WARNING: untranslated string: ids reports weekly = Send a weekly report
 WARNING: untranslated string: ids rulesets = Rulesets
-WARNING: untranslated string: ids summary reports = Summary reports
+WARNING: untranslated string: ids send email on alert = Send email on alert
 WARNING: untranslated string: import connection = Import a Connection
 WARNING: untranslated string: indirect target selection = Indirect target selection
 WARNING: untranslated string: invalid endpoint = Invalid Endpoint

diff --git a/doc/language_issues.it b/doc/language_issues.it
index c02be127d9f22ddd0578a08d76bfef728cf87edb..0a12b68a5bb0d58b43933259d7e5ec6add6cc786 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -1186,16 +1186,16 @@ WARNING: untranslated string: ids provider = Provider
 WARNING: untranslated string: ids provider eol = (EOL)
 WARNING: untranslated string: ids provider settings = Provider settings
 WARNING: untranslated string: ids remove rule structures = Remove old rule structures...
-WARNING: untranslated string: ids reports daily = Daily reports
-WARNING: untranslated string: ids reports monthly = Monthly reports
-WARNING: untranslated string: ids reports weekly = Weekly reports
+WARNING: untranslated string: ids reports daily = Send a daily report
+WARNING: untranslated string: ids reports monthly = Send a monthly report
+WARNING: untranslated string: ids reports weekly = Send a weekly report
 WARNING: untranslated string: ids reset provider = Reset provider
 WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully...
 WARNING: untranslated string: ids ruleset is up to date = No update required - The ruleset is up to date.
 WARNING: untranslated string: ids rulesets = Rulesets
+WARNING: untranslated string: ids send email on alert = Send email on alert
 WARNING: untranslated string: ids show = Show
 WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
-WARNING: untranslated string: ids summary reports = Summary reports
 WARNING: untranslated string: ids the choosen provider is already in use = The choosen provider is already in use.
 WARNING: untranslated string: ids unable to download the ruleset = Unable to download the ruleset
 WARNING: untranslated string: ids visit provider website = Visit provider website

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 12aa189815866e931d31cec8acf5beb120757983..2d3bb45a816979b3933314f7e9c350567f7d57f4 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -1192,16 +1192,16 @@ WARNING: untranslated string: ids provider = Provider
 WARNING: untranslated string: ids provider eol = (EOL)
 WARNING: untranslated string: ids provider settings = Provider settings
 WARNING: untranslated string: ids remove rule structures = Remove old rule structures...
-WARNING: untranslated string: ids reports daily = Daily reports
-WARNING: untranslated string: ids reports monthly = Monthly reports
-WARNING: untranslated string: ids reports weekly = Weekly reports
+WARNING: untranslated string: ids reports daily = Send a daily report
+WARNING: untranslated string: ids reports monthly = Send a monthly report
+WARNING: untranslated string: ids reports weekly = Send a weekly report
 WARNING: untranslated string: ids reset provider = Reset provider
 WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully...
 WARNING: untranslated string: ids ruleset is up to date = No update required - The ruleset is up to date.
 WARNING: untranslated string: ids rulesets = Rulesets
+WARNING: untranslated string: ids send email on alert = Send email on alert
 WARNING: untranslated string: ids show = Show
 WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
-WARNING: untranslated string: ids summary reports = Summary reports
 WARNING: untranslated string: ids the choosen provider is already in use = The choosen provider is already in use.
 WARNING: untranslated string: ids unable to download the ruleset = Unable to download the ruleset
 WARNING: untranslated string: ids visit provider website = Visit provider website

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 0acc6b2a5ca3d1ddbbe3c54ce5b63f14a8f51049..79251b0b42d5a764437c8aa7721eda03d6e2fc04 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1311,16 +1311,16 @@ WARNING: untranslated string: ids provider = Provider
 WARNING: untranslated string: ids provider eol = (EOL)
 WARNING: untranslated string: ids provider settings = Provider settings
 WARNING: untranslated string: ids remove rule structures = Remove old rule structures...
-WARNING: untranslated string: ids reports daily = Daily reports
-WARNING: untranslated string: ids reports monthly = Monthly reports
-WARNING: untranslated string: ids reports weekly = Weekly reports
+WARNING: untranslated string: ids reports daily = Send a daily report
+WARNING: untranslated string: ids reports monthly = Send a monthly report
+WARNING: untranslated string: ids reports weekly = Send a weekly report
 WARNING: untranslated string: ids reset provider = Reset provider
 WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully...
 WARNING: untranslated string: ids ruleset is up to date = No update required - The ruleset is up to date.
 WARNING: untranslated string: ids rulesets = Rulesets
+WARNING: untranslated string: ids send email on alert = Send email on alert
 WARNING: untranslated string: ids show = Show
 WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
-WARNING: untranslated string: ids summary reports = Summary reports
 WARNING: untranslated string: ids the choosen provider is already in use = The choosen provider is already in use.
 WARNING: untranslated string: ids unable to download the ruleset = Unable to download the ruleset
 WARNING: untranslated string: ids visit provider website = Visit provider website

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 173b5f0fe0de4ad135082cfee681c0cc089c810a..8d3d379f87f1cb401c0dd2207e03095909b9144a 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1309,16 +1309,16 @@ WARNING: untranslated string: ids provider = Provider
 WARNING: untranslated string: ids provider eol = (EOL)
 WARNING: untranslated string: ids provider settings = Provider settings
 WARNING: untranslated string: ids remove rule structures = Remove old rule structures...
-WARNING: untranslated string: ids reports daily = Daily reports
-WARNING: untranslated string: ids reports monthly = Monthly reports
-WARNING: untranslated string: ids reports weekly = Weekly reports
+WARNING: untranslated string: ids reports daily = Send a daily report
+WARNING: untranslated string: ids reports monthly = Send a monthly report
+WARNING: untranslated string: ids reports weekly = Send a weekly report
 WARNING: untranslated string: ids reset provider = Reset provider
 WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully...
 WARNING: untranslated string: ids ruleset is up to date = No update required - The ruleset is up to date.
 WARNING: untranslated string: ids rulesets = Rulesets
+WARNING: untranslated string: ids send email on alert = Send email on alert
 WARNING: untranslated string: ids show = Show
 WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
-WARNING: untranslated string: ids summary reports = Summary reports
 WARNING: untranslated string: ids the choosen provider is already in use = The choosen provider is already in use.
 WARNING: untranslated string: ids unable to download the ruleset = Unable to download the ruleset
 WARNING: untranslated string: ids visit provider website = Visit provider website

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 793a22b5d665b879797e90006c014c77c5c5986c..42230af9471b1076ff186d772b3cb4abc697128c 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -1130,16 +1130,16 @@ WARNING: untranslated string: ids provider = Provider
 WARNING: untranslated string: ids provider eol = (EOL)
 WARNING: untranslated string: ids provider settings = Provider settings
 WARNING: untranslated string: ids remove rule structures = Remove old rule structures...
-WARNING: untranslated string: ids reports daily = Daily reports
-WARNING: untranslated string: ids reports monthly = Monthly reports
-WARNING: untranslated string: ids reports weekly = Weekly reports
+WARNING: untranslated string: ids reports daily = Send a daily report
+WARNING: untranslated string: ids reports monthly = Send a monthly report
+WARNING: untranslated string: ids reports weekly = Send a weekly report
 WARNING: untranslated string: ids reset provider = Reset provider
 WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully...
 WARNING: untranslated string: ids ruleset is up to date = No update required - The ruleset is up to date.
 WARNING: untranslated string: ids rulesets = Rulesets
+WARNING: untranslated string: ids send email on alert = Send email on alert
 WARNING: untranslated string: ids show = Show
 WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
-WARNING: untranslated string: ids summary reports = Summary reports
 WARNING: untranslated string: ids the choosen provider is already in use = The choosen provider is already in use.
 WARNING: untranslated string: ids unable to download the ruleset = Unable to download the ruleset
 WARNING: untranslated string: ids visit provider website = Visit provider website

diff --git a/doc/language_issues.tw b/doc/language_issues.tw
index 3b6b449ec62e87225f541e810b4fcbde24428a79..c271e52b236bf60391ab2c01e4f21f610c1d771b 100644 (file)
--- a/doc/language_issues.tw
+++ b/doc/language_issues.tw
@@ -1071,10 +1071,10 @@ WARNING: untranslated string: ids email sender = Sender Address
 WARNING: untranslated string: ids invalid mail address = Is or contains an invalid mail address.
 WARNING: untranslated string: ids no email recipients = No email recipients given
 WARNING: untranslated string: ids no email sender = No sender email address specified
-WARNING: untranslated string: ids reports daily = Daily reports
-WARNING: untranslated string: ids reports monthly = Monthly reports
-WARNING: untranslated string: ids reports weekly = Weekly reports
-WARNING: untranslated string: ids summary reports = Summary reports
+WARNING: untranslated string: ids reports daily = Send a daily report
+WARNING: untranslated string: ids reports monthly = Send a monthly report
+WARNING: untranslated string: ids reports weekly = Send a weekly report
+WARNING: untranslated string: ids send email on alert = Send email on alert
 WARNING: untranslated string: indirect target selection = Indirect target selection
 WARNING: untranslated string: info messages = unknown string
 WARNING: untranslated string: max bandwidth = Maximum bandwidth

diff --git a/doc/language_issues.zh b/doc/language_issues.zh
index 3b6b449ec62e87225f541e810b4fcbde24428a79..c271e52b236bf60391ab2c01e4f21f610c1d771b 100644 (file)
--- a/doc/language_issues.zh
+++ b/doc/language_issues.zh
@@ -1071,10 +1071,10 @@ WARNING: untranslated string: ids email sender = Sender Address
 WARNING: untranslated string: ids invalid mail address = Is or contains an invalid mail address.
 WARNING: untranslated string: ids no email recipients = No email recipients given
 WARNING: untranslated string: ids no email sender = No sender email address specified
-WARNING: untranslated string: ids reports daily = Daily reports
-WARNING: untranslated string: ids reports monthly = Monthly reports
-WARNING: untranslated string: ids reports weekly = Weekly reports
-WARNING: untranslated string: ids summary reports = Summary reports
+WARNING: untranslated string: ids reports daily = Send a daily report
+WARNING: untranslated string: ids reports monthly = Send a monthly report
+WARNING: untranslated string: ids reports weekly = Send a weekly report
+WARNING: untranslated string: ids send email on alert = Send email on alert
 WARNING: untranslated string: indirect target selection = Indirect target selection
 WARNING: untranslated string: info messages = unknown string
 WARNING: untranslated string: max bandwidth = Maximum bandwidth

diff --git a/doc/language_missings b/doc/language_missings
index 8b1220e5ba414b21e976d564ccb37aec0d83ac6e..4ac744e6c4439738f324135443536999efe5cdec 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -166,7 +166,7 @@
 < ids reports daily
 < ids reports monthly
 < ids reports weekly
-< ids summary reports
+< ids send email on alert
 < indirect target selection
 < mdstat
 < offloaded
@@ -228,7 +228,7 @@
 < ids reports monthly
 < ids reports weekly
 < ids rulesets
-< ids summary reports
+< ids send email on alert
 < ids unsupported provider
 < import connection
 < indirect target selection
@@ -612,9 +612,9 @@
 < ids ruleset is up to date
 < ids rulesets
 < ids ruleset settings
+< ids send email on alert
 < ids show
 < ids subscription code required
-< ids summary reports
 < ids the choosen provider is already in use
 < ids unable to download the ruleset
 < ids unsupported provider
@@ -1266,9 +1266,9 @@
 < ids ruleset is up to date
 < ids rulesets
 < ids ruleset settings
+< ids send email on alert
 < ids show
 < ids subscription code required
-< ids summary reports
 < ids the choosen provider is already in use
 < ids unable to download the ruleset
 < ids unsupported provider
@@ -2222,9 +2222,9 @@
 < ids ruleset is up to date
 < ids rulesets
 < ids ruleset settings
+< ids send email on alert
 < ids show
 < ids subscription code required
-< ids summary reports
 < ids the choosen provider is already in use
 < ids unable to download the ruleset
 < ids unsupported provider
@@ -3346,9 +3346,9 @@
 < ids ruleset is up to date
 < ids rulesets
 < ids ruleset settings
+< ids send email on alert
 < ids show
 < ids subscription code required
-< ids summary reports
 < ids the choosen provider is already in use
 < ids unable to download the ruleset
 < ids unsupported provider
@@ -4064,9 +4064,9 @@
 < ids ruleset is up to date
 < ids rulesets
 < ids ruleset settings
+< ids send email on alert
 < ids show
 < ids subscription code required
-< ids summary reports
 < ids the choosen provider is already in use
 < ids unable to download the ruleset
 < ids unsupported provider
@@ -4374,7 +4374,7 @@
 < ids reports daily
 < ids reports monthly
 < ids reports weekly
-< ids summary reports
+< ids send email on alert
 < indirect target selection
 < max bandwidth
 < offloaded
@@ -4432,7 +4432,7 @@
 < ids reports daily
 < ids reports monthly
 < ids reports weekly
-< ids summary reports
+< ids send email on alert
 < indirect target selection
 < max bandwidth
 < offloaded

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index f5735947c9b99e23d78a9ad8b0ff508aeb10a785..ee5c3d1eb82ec3a4f0eddcbb9ee613982f3bda36 100644 (file)
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -1147,18 +1147,6 @@ print <<END
                        </h6>
 
                        <table class="form">
-                               <tr>
-                                       <td>
-                                               <label for="ENABLE_EMAIL">
-                                                       $Lang::tr{'enable'}
-                                               </label>
-                                       </td>
-
-                                       <td>
-                                               <input type='checkbox' name='ENABLE_EMAIL' id="ENABLED_EMAIL" $checked{'ENABLE_EMAIL'}{'on'}>
-                                       </td>
-                               </tr>
-
                                <tr>
                                        <td>
                                                <label for='EMAIL_SENDER'>$Lang::tr{'ids email sender'}</label>
@@ -1179,13 +1167,18 @@ print <<END
                                        </td>
                                </tr>
 
-                       </table>
+                               <tr>
+                                       <td>
+                                               <label for="ENABLE_EMAIL">
+                                                       $Lang::tr{'ids send email on alert'}
+                                               </label>
+                                       </td>
 
-                       <h6>
-                               $Lang::tr{'ids summary reports'}
-                       </h6>
+                                       <td>
+                                               <input type='checkbox' name='ENABLE_EMAIL' id="ENABLED_EMAIL" $checked{'ENABLE_EMAIL'}{'on'}>
+                                       </td>
+                               </tr>
 
-                       <table class="form">
                                <tr>
                                        <td>
                                                <label for="ENABLE_REPORT_DAILY">

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 65fa5f38f1da0a8feafa490bbf7e1985cae1ce34..693495e24f2d640a2787a61bbdd1ece24a788a38 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1416,17 +1416,17 @@
 'ids provider' => 'Regelset-Anbieter',
 'ids provider settings' => 'Regelset-Anbieter-Einstellungen',
 'ids remove rule structures' => 'Entferne alte Regelstrukturen...',
-'ids reports daily' => 'Täglicher Report',
-'ids reports monthly' => 'Monatlicher Report',
-'ids reports weekly' => 'Wöchentlicher Report',
+'ids reports daily' => 'Einen täglichen Bericht schicken',
+'ids reports monthly' => 'Einen monatlichen Bericht schicken',
+'ids reports weekly' => 'Einen wöchentlichen Bericht schicken',
 'ids reset provider' => 'Providereinstellungen zurücksetzen',
 'ids rules update' => 'Regelsatz',
 'ids ruleset autoupdate in progress' => 'Der Regelsatz wird gerade aktualisiert. Bitte warten Sie, bis dieser Vorgang erfolgreich beendet wurde...',
 'ids ruleset is up to date' => 'Regelset ist aktuell - Keine Aktualisierung notwendig.',
 'ids ruleset settings' => 'Regelsatzeinstellungen',
 'ids rulesets' => 'Regelsätze',
+'ids send email on alert' => 'Alarme per Email melden',
 'ids show' => 'Anzeigen',
-'ids summary reports' => 'Zusammenfassender Report',
 'ids the choosen provider is already in use' => 'Der gewhählte Provider wird bereits verwendet.',
 'ids unable to download the ruleset' => 'Das Regelset konnte nicht heruntergeladen werden.',
 'ids unsupported provider' => 'Provider wird nicht mehr unterstützt',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index ad3c55969fa558935a1268cf04485fdf9f539960..b683ee6b46e3ab32825a43f1f7d2958091998f7e 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1474,18 +1474,18 @@
 'ids provider eol' => '(EOL)',
 'ids provider settings' => 'Provider settings',
 'ids remove rule structures' => 'Remove old rule structures...',
-'ids reports daily' => 'Daily reports',
-'ids reports monthly' => 'Monthly reports',
-'ids reports weekly' => 'Weekly reports',
+'ids reports daily' => 'Send a daily report',
+'ids reports monthly' => 'Send a monthly report',
+'ids reports weekly' => 'Send a weekly report',
 'ids reset provider' => 'Reset provider',
 'ids rules update' => 'Ruleset',
 'ids ruleset autoupdate in progress' => 'Ruleset update in progress. Please wait until all operations have completed successfully...',
 'ids ruleset is up to date' => 'No update required - The ruleset is up to date.',
 'ids ruleset settings' => 'Ruleset Settings',
 'ids rulesets' => 'Rulesets',
+'ids send email on alert' => 'Send email on alert',
 'ids show' => 'Show',
 'ids subscription code required' => 'The selected ruleset requires a subscription code',
-'ids summary reports' => 'Summary reports',
 'ids the choosen provider is already in use' => 'The choosen provider is already in use.',
 'ids unable to download the ruleset' => 'Unable to download the ruleset',
 'ids unsupported provider' => 'Provider is not supported anymore',