Author: gs
Date: Tue Sep 9 11:29:08 2008
New Revision: 50877
URL: http://svn.opensuse.org/viewcvs/yast?rev=50877&view=rev
Log:
text merged back from proof read, additional help text added
Modified:
trunk/audit-laf/src/complex.ycp
trunk/audit-laf/src/dialogs.ycp
trunk/audit-laf/src/helps.ycp
trunk/audit-laf/src/wizards.ycp
Modified: trunk/audit-laf/src/complex.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/complex.ycp?rev=50877&r1=50876&r2=50877&view=diff
==============================================================================
--- trunk/audit-laf/src/complex.ycp (original)
+++ trunk/audit-laf/src/complex.ycp Tue Sep 9 11:29:08 2008
@@ -20,7 +20,7 @@
/**
* File: include/audit-laf/complex.ycp
- * Package: Configuration of LAF Auditing
+ * Package: Configuration of Linux Auditing
* Summary: Dialogs definitions
* Authors: Gabriele Mohr
*
@@ -36,6 +36,7 @@
import "Wizard_hw";
import "Confirm";
import "AuditLaf";
+import "Report";
include "audit-laf/helps.ycp";
@@ -102,7 +103,7 @@
});
- y2milestone( "Init logfile settings");
+ y2milestone( "Init log file settings");
}
symbol HandleLogfileSettingsDialog(string id, map event) {
@@ -143,7 +144,7 @@
], {
AuditLaf::SetAuditdOption( key, (string) UI::QueryWidget(`id(key), `Value) );
});
- y2milestone( "Store logfile settings" );
+ y2milestone( "Store log file settings" );
}
void InitDispatcherDialog (string id) {
@@ -204,7 +205,7 @@
});
- y2milestone( "Init diskspace settings" );
+ y2milestone( "Init disk space settings" );
}
void StoreDiskspaceSettingsDialog (string id, map event) {
@@ -220,7 +221,7 @@
AuditLaf::SetAuditdOption( key, (string) UI::QueryWidget(`id(key), `Value) );
});
- y2milestone( "Store diskspace settings" );
+ y2milestone( "Store disk space settings" );
}
void InitRulesDialog( string id ) {
Modified: trunk/audit-laf/src/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/dialogs.ycp?rev=50877&r1=50876&r2=50877&view=diff
==============================================================================
--- trunk/audit-laf/src/dialogs.ycp (original)
+++ trunk/audit-laf/src/dialogs.ycp Tue Sep 9 11:29:08 2008
@@ -20,7 +20,7 @@
/**
* File: include/audit-laf/dialogs.ycp
- * Package: Configuration of LAF Auditing
+ * Package: Configuration of Linux Auditing
* Summary: Dialogs definitions
* Authors: Gabriele Mohr
*
@@ -52,33 +52,37 @@
`VBox(
`VStretch(),
`Frame (
+ // Frame label
_("General Settings"),
`VBox (
`VSquash(
`HBox(
- // Label for InputField
- `InputField(`id("log_file"), `opt(`hstretch), _("Logfile")),
+ // InputField label
+ `InputField(`id("log_file"), `opt(`hstretch), _("&Log File")),
`HSpacing(2.0),
`VBox(
`VSpacing(),
- // Label for PushButton
+ // PushButton label
`Bottom(`PushButton(`id("select_file"), _("Select Fi&le")))
)
)
),
`VBox(
- `HBox(`HWeight( 1,`ComboBox(`id("log_format"), _("Format"),
+ // ComboBox label - select format of logging
+ `HBox(`HWeight( 1,`ComboBox(`id("log_format"), _("&Format"),
[
`item(`id("RAW"), "RAW", true ),
`item(`id("NOLOG"), "NOLOG" )
])
),
`HSpacing(2.0),
- `HWeight( 1, `IntField(`id("num_logs"), `opt(`hstretch), _("Number of Logfiles"), 0, 99, 4) )
+ // InputField label
+ `HWeight( 1, `IntField(`id("num_logs"), `opt(`hstretch), _("&Number of Log Files"), 0, 99, 4) )
),
`HBox(
- `HWeight( 1, `ComboBox(`id("flush"), _("Flush"),
+ // ComboBox label - select how to flush data on disk
+ `HWeight( 1, `ComboBox(`id("flush"), _("Fl&ush"),
[`item(`id("NONE"), "NONE" ),
`item(`id("INCREMENTAL"), "INCREMENTAL", true ),
`item(`id("DATA"), "DATA" ),
@@ -86,19 +90,22 @@
])
),
`HSpacing(2.0),
- `HWeight( 1, `IntField(`id("freq"), `opt(`hstretch), _("Frequence"), 0, 10000, 20 ))
+ // InputField label - enter how many records to write before flush data to disk
+ `HWeight( 1, `IntField(`id("freq"), `opt(`hstretch), _("Fre&quence (Number of Records)"), 0, 10000, 20 ))
)
)
)
),
`VStretch(),
`Frame (
+ // Frame label - data regarding size of log file and action to perform
_("Size and Action"),
`HBox (
- /* A text entry */
+ // InputField label
`HWeight( 1, `InputField(`id("max_log_file"), _("Ma&x File Size (MB)")) ),
`HSpacing(2.0),
- `HWeight( 1, `ComboBox(`id("max_log_file_action"), _("Maximum File Size Action"),
+ // ComboBox label
+ `HWeight( 1, `ComboBox(`id("max_log_file_action"), _("M&aximum File Size Action"),
[`item(`id("IGNORE"), "IGNORE" ),
`item(`id("SYSLOG"), "SYSLOG", true ),
`item(`id("SUSPEND"), "SUSPEND" ),
@@ -107,6 +114,7 @@
] )
),
`HSpacing(2.0),
+ // InputField label
`HWeight( 1, `InputField(`id("action_mail_acct"), _("Action Mail Account")))
)
),
@@ -135,20 +143,22 @@
`VBox(
`VSpacing(2.0),
`Frame (
+ // Frame label - settings of the dispatcher program
_("Dispatcher Settings"),
`VBox (
`VSquash(
`HBox(
- // Label for InputField
+ // InputField label
`InputField(`id("dispatcher"), `opt(`hstretch), _("Dispatcher Program")),
`HSpacing(2.0),
`VBox(
`VSpacing(),
- // Label for PushButton
+ // PushButton label
`Bottom(`PushButton(`id("select_disp"), _("Select Fi&le")))
)
)
),
+ // ComboBox label - communication between the audit daemon and the dispatcher program
`Left(`ComboBox(`id("disp_qos"), _("Communication"),
[`item(`id("lossy"), "lossy", true ),
`item(`id("lossless"), "lossless" )
@@ -167,10 +177,10 @@
`VStretch(),
`Frame(
// Frame label - keep it short!
- _("Value and action for space is starting to run low"),
+ _("Value and Action for Space is Starting to Run Low"),
`HBox(
// InputField label - space on disk is starting to run low if the entered value is reached
- `HWeight( 1, `InputField(`id("space_left"), _("&Space left on Disk (MB)") )),
+ `HWeight( 1, `InputField(`id("space_left"), _("&Space Left on Disk (MB)") )),
`HSpacing(2.0),
`HWeight( 1, `ComboBox(`id("space_left_action"), `opt(`editable),
// ComboBox label - select an action which is performed if space on disk is low
@@ -189,13 +199,13 @@
`VStretch(),
`Frame (
// Frame label - keep it short!
- _("Value and action for space is running low"),
+ _("Value and Action for Space is Running Low"),
`HBox(
// InputField label - space on disk is running low if the entered value is reached
- `HWeight( 1, `InputField(`id("admin_space_left"), _("&Admin Space left on Disk (MB) ")) ),
+ `HWeight( 1, `InputField(`id("admin_space_left"), _("&Admin Space Left on Disk (MB) ")) ),
`HSpacing(2.0),
`HWeight( 1, `ComboBox(`id("admin_space_left_action"), `opt(`editable),
- // ComboBox label - select an action which is performed if space on disk is running low
+ // ComboBox label - select an action which is performed if space on disk is running low
_("Action"),
[`item(`id("IGNORE"), "IGNORE" ),
`item(`id("SYSLOG"), "SYSLOG", true ),
@@ -211,7 +221,7 @@
`VStretch(),
`Frame(
// Frame label - keep it short!
- _("Action on Error or Disk full"),
+ _("Action on Error or Disk Full"),
`VBox(
`ComboBox(`id("disk_full_action"), `opt(`editable),
// ComboBox label - select an action which is performed if disk is full
@@ -247,9 +257,12 @@
`VSpacing(0.2),
`VWeight( 20, `VBox(
// label of a combo box with the possibilitiy to enable/disable auditing or lock the rules
- `Left(`ComboBox( `id("audit_enabled"), `opt(`notify), _("Set Enabled Flag"),
+ `Left(`ComboBox( `id("audit_enabled"), `opt(`notify), _("&Set Enabled Flag"),
+ // ComboBox item
[`item(`id("enabled"), _("Auditing enabled"), true ), // -e 1
+ // ComboBox item
`item(`id("disabled"), _("Auditing disabled") ), // -e 0
+ // ComboBox item
`item(`id("locked"), _("Rules are locked (until next boot)")) // -e 2
]
) ),
@@ -257,22 +270,23 @@
) ),
`VSpacing(0.2),
`VWeight( 90, `VBox(
+ // Label - describes what can be done in the editor
`Left(`Label(_("Edit the rules for the audit subsystem here:") ) ),
`MultiLineEdit(`id("rules"), `opt(`vstretch), "audit.rules" )
) ),
`VWeight( 10,
// label of a push button (please keep it short)
- `HBox(`PushButton( `id( "test" ), _("Check Syntax") ),
+ `HBox(`PushButton( `id( "test" ), _("&Check Syntax") ),
`HSpacing(2.0),
// label of push button (please keep it short)
- `PushButton( `id( "restore" ), _("Restore 'audit.rules'") ),
+ `PushButton( `id( "restore" ), _("&Restore 'audit.rules'") ),
`HSpacing(2.0),
// label of push button (please keep it short)
- `PushButton( `id( "reset" ), _("Restore and Reset") ),
+ `PushButton( `id( "reset" ), _("R&estore and Reset") ),
`HSpacing(2.0),
// label of push button
- `PushButton( `id( "load" ), _("Load ") )
+ `PushButton( `id( "load" ), _("&Load ") )
)
)
Modified: trunk/audit-laf/src/helps.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/helps.ycp?rev=50877&r1=50876&r2=50877&view=diff
==============================================================================
--- trunk/audit-laf/src/helps.ycp (original)
+++ trunk/audit-laf/src/helps.ycp Tue Sep 9 11:29:08 2008
@@ -20,7 +20,7 @@
/**
* File: include/audit-laf/helps.ycp
- * Package: Configuration of LAF auditing
+ * Package: Configuration of Linux Auditing
* Summary: Help texts of all the dialogs
* Authors: Gabriele Mohr
*
@@ -36,7 +36,7 @@
map HELPS = $[
/* Read dialog help 1/2 */
- "read" : _("<p><b><big>Initializing Configuration of LAF Auditing</big></b><br>
+ "read" : _("<p><b><big>Initializing Configuration of Linux Audit Framework</big></b><br>
Please wait...<br></p>
") +
@@ -57,23 +57,29 @@
</p>
"),
- /* logfile_settings dialog help 1/5 */
- "logfile_settings" : _("<p><b><big>Auditd Logfile Configuration</big></b><br>
-Detailed information about the settings can be obtained from 'man auditd.conf'.</p>") +
- /* logfile_settings dialog help 1/3 */
- _("<p><b>Logfile</b>: Enter the full path name to the log file
+ /* logfile_settings dialog help 1/7 */
+ "logfile_settings" : _("<p><b><big>Auditd Log File Configuration</big></b><br>
+The audit daemon logs all relevant audit events to the default log file <i>/var/log/audit/audit.log</i>.
+Events may come from the <i>apparmor</i> kernel module, from applications
+which use <i>libaudit</i> (e.g. PAM) or incidents caused by rules (e.g. file watches).</p>") +
+ /* logfile_settings dialog help 2/7 */
+ _("<p>More information about rules and the possiblity to add rules offers the dialog <b>Rules for auditctl</b>.
+Detailed information about the log file settings can be obtained from 'man auditd.conf'.</p>") +
+ /* logfile_settings dialog help 3/7 */
+ _("<p><b>Log File</b>: Enter the full path name to the log file
(or use <b>Select File</b>.)</p>") +
- /* logfile_settings dialog help 1/3 */
+ /* logfile_settings dialog help 4/7 */
_("<p><b>Format</b>: set <i>RAW</i> to log all data or <i>NOLOG</i>
to discard all audit information (does not affect data sent to the dispatcher).</p> ") +
- /* logfile_settings dialog help 1/3 */
+ /* logfile_settings dialog help 5/7 */
_("<p><b>Flush</b>: describes how to write the data to disk. If set to
-<i>INCREMANTAL</i> the <b>Frequence</b> parameter tells how often a flush to disk is issued.</p>" ) +
- /* logfile_settings dialog help 1/3 */
+<i>INCREMANTAL</i> the <b>Frequence</b> parameter tells how many records to write before
+issuing an explicit flush to disk.</p>" ) +
+ /* logfile_settings dialog help 6/7 */
_("<p>Configure the maximum log file size and the action to take when this
value is reached in <b>Size and Action</b> frame. If action is set to
-<b>ROTATE</b> the <b>Number of Logfiles</b> specifies the number of files to keep.</p>") +
- /* logfile_settings dialog help 1/3 */
+<b>ROTATE</b> the <b>Number of Log Files</b> specifies the number of files to keep.</p>") +
+ /* logfile_settings dialog help 7/7 */
_("<p><b>Computer Name Format</b> describes how to the computer name is written
to the log file. If <i>User</i> is set the <b>User Defined Name</b> is used.</p> "),
@@ -88,15 +94,15 @@
between the daemon and the dispatcher program.<p>"),
/* disksapce dialog help 1/4 */
- "diskspace_settings" : _("<p><b><big>Auditd Diskspace Configuration</big></b><br>
+ "diskspace_settings" : _("<p><b><big>Auditd Disk Space Configuration</big></b><br>
Detailed information about the settings can be obtained from 'man auditd.conf'</p>
") +
/* disksapce dialog help 2/4 */
- _("<p><b>Space left</b> and <b>Action</b> describe how much disk space (in megabytes)
+ _("<p><b>Space Left</b> and <b>Action</b> describe how much disk space (in megabytes)
to left and which action to perform if the system is starting to run low on space.</p>") +
/* disksapce dialog help 3/4 */
- _("<p><b>Admin space left</b> and <b>Action</b> describe how much disk space (in megabytes)
+ _("<p><b>Admin Space Left</b> and <b>Action</b> describe how much disk space (in megabytes)
to left and which action to perform if the system <b>is running low</b>.</p>") +
/* disksapce dialog help 3/4 */
@@ -112,7 +118,7 @@
_("<p><b>Please note:</b><br>Locking the rules means they cannot be changed until next reboot! </p>" ) +
/* rules dialog help 3/5 */
_("<p>To enable the auditing whithout adding additional rules will cause the
- applications which use 'libaudit', e.g. PAM to log to audit.log.</p> ") +
+ applications which use <i>libaudit</i>, e.g. PAM to log to /var/log/audit/audit.log (default).</p> ") +
/* rules dialog help 4/5 */
_("<p>This module also allows you to edit the rules manually. Detailed information
about all options gives 'man auditctl'.<br>
Modified: trunk/audit-laf/src/wizards.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/wizards.ycp?rev=50877&r1=50876&r2=50877&view=diff
==============================================================================
--- trunk/audit-laf/src/wizards.ycp (original)
+++ trunk/audit-laf/src/wizards.ycp Tue Sep 9 11:29:08 2008
@@ -20,7 +20,7 @@
/**
* File: include/audit-laf/wizards.ycp
- * Package: Configuration of LAF Auditing
+ * Package: Configuration of Linux Auditing
* Summary: Wizards definitions
* Authors: Gabriele Mohr
*
@@ -80,21 +80,25 @@
map tabs = $[
"logfile_settings" : $[
- "header" : _("&Logfile"),
+ // Header of tab in tab widget
+ "header" : _("&Log File"),
"widget_names" : ["log"],
"contents" : LogfileSettingsDialogContent(),
],
"dispatcher" : $[
+ // Header of tab in tab widget
"header" : _("&Dispatcher"),
"widget_names" : ["disp"],
"contents" : DispatcherDialogContent(),
],
"diskspace_settings" : $[
- "header" : _("&Diskspace on Log Partion"),
+ // Header of tab in tab widget (keep it short!)
+ "header" : _("Disk &Space on Log Partion"),
"widget_names" : ["disk"],
"contents" : DiskspaceSettingsDialogContent(),
],
"audit_rules" : $[
+ // Header of tab in tab widget
"header" : _("&Rules for auditctl"),
"widget_names" : ["rules"],
"contents" : RulesDialogContent(),
@@ -121,7 +125,8 @@
list
