Author: jsuchome Date: Thu Mar 29 13:51:12 2012 New Revision: 67747 URL: http://svn.opensuse.org/viewcvs/yast?rev=67747&view=rev Log: - merged proofread texts Modified: trunk/audit-laf/package/yast2-audit-laf.changes trunk/audit-laf/src/AuditLaf.ycp trunk/audit-laf/src/complex.ycp trunk/audit-laf/src/dialogs.ycp trunk/audit-laf/src/helps.ycp Modified: trunk/audit-laf/package/yast2-audit-laf.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/package/yast2-audit-laf.changes?rev=67747&r1=67746&r2=67747&view=diff ============================================================================== --- trunk/audit-laf/package/yast2-audit-laf.changes (original) +++ trunk/audit-laf/package/yast2-audit-laf.changes Thu Mar 29 13:51:12 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 13:50:48 CEST 2012 - jsuchome@suse.cz + +- merged proofread texts + +------------------------------------------------------------------- Wed Dec 21 14:06:25 CET 2011 - gs@suse.de - Confirmed license Modified: trunk/audit-laf/src/AuditLaf.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/AuditLaf.ycp?rev=67747&r1=67746&r2=67747&view=diff ============================================================================== --- trunk/audit-laf/src/AuditLaf.ycp (original) +++ trunk/audit-laf/src/AuditLaf.ycp Thu Mar 29 13:51:12 2012 @@ -199,11 +199,11 @@ string audit_status = output["stdout"]:""; if ( regexpmatch( audit_status, "^.*enabled=2.*" ) ) - return _( "The rules for auditctl are locked" ); + return _("The rules for auditctl are locked."); else if ( regexpmatch( audit_status, "^.*enabled=1.*" ) ) - return _( "Auditing enabled"); + return _("Auditing enabled"); else - return _( "Auditing disabled"); + return _("Auditing disabled"); } // @@ -417,7 +417,7 @@ /* Progress step 2/3 */ _("Reading the rules file..."), /* Progress step 3/3 */ - _("Checking status..." ), + _("Checking status..."), Message::Finished() ], "" @@ -471,20 +471,21 @@ message = _(" The 'apparmor' kernel module is loaded. The kernel uses a running audit daemon to log audit events to /var/log/audit/audit.log (default). -Do you want to start the daemon now?" ); +Do you want to start the daemon now?"); - boolean start = Popup::YesNoHeadline( _("Audit daemon not running"), + boolean start = Popup::YesNoHeadline( _("Audit daemon not running."), message ); if ( start ) { integer exit_code = Service::RunInitScript( "auditd", "start" ); if ( exit_code != 0 ) { - boolean go_on = Popup::ContinueCancelHeadline( _("Cannot start the audit daemon" ), - _("The reason might be that the rules are locked. + boolean go_on = Popup::ContinueCancelHeadline( _("Cannot start the audit daemon."), + _("The rules may be locked. Continue to check the rules. You can change -the 'Enabled Flag' but to make the change -active a reboot is required afterwards." ) +the 'Enabled Flag', but to activate the change +a reboot is required afterwards. +") ); if ( go_on ) return true; @@ -574,10 +575,11 @@ if ( locked ) { - boolean write_rules = Popup::YesNoHeadline( _("The rules are already locked." ), + boolean write_rules = Popup::YesNoHeadline( _("The rules are already locked."), _("Do you want to change the 'Enabled Flag'? If yes, the new rules will be written to /etc/audit/audit.rules. -After that you have to reboot the system.") ); +Reboot the system afterwards for the change to take effect. +") ); if ( write_rules ) WriteAuditRules(); @@ -600,7 +602,7 @@ if ( exit_code != 0 ) { // Error message - Report::Error ( _("Restart of the audit daemon failed" ) ); + Report::Error ( _("Restart of the audit daemon failed.") ); ret = false; } else @@ -636,7 +638,7 @@ Report::Error( sformat( "%1\n%2", output["stderr"]:"", // Error message, rules cannot be set - _("Please start yast2-audit-laf again and check the rules") ) ); + _("Start yast2-audit-laf again and check the rules.") ) ); ret = false; } } Modified: trunk/audit-laf/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/complex.ycp?rev=67747&r1=67746&r2=67747&view=diff ============================================================================== --- trunk/audit-laf/src/complex.ycp (original) +++ trunk/audit-laf/src/complex.ycp Thu Mar 29 13:51:12 2012 @@ -162,7 +162,7 @@ { Report::Error(_("The 'User Defined Name' is NOT set although the 'Computer Name Format' is set to 'USER'. -Setting the format to 'NONE' (default)." ) ); +Setting the format to 'NONE' (default).") ); AuditLaf::SetAuditdOption( "name_format", "NONE" ); } else @@ -431,12 +431,12 @@ if ( exit_code == 0 ) { // Report success - Popup::Message( _("Rules successfully restored" ) ); + Popup::Message( _("Rules successfully restored") ); AuditLaf::SetRulesChanged( false ); } else // Report error - error during reset - Report::Error( _("Cannot reset rules. Please check /etc/audit/audit.rules." ) ); + Report::Error( _("Cannot reset rules. Check /etc/audit/audit.rules.") ); } } @@ -518,9 +518,11 @@ if ( AuditLaf::RulesAlreadyLocked() ) { - Report::Warning( _("The rules are already locked.\n -A test isn't possible because sending new rules -will cause an error.") ); + Report::Warning( _("The rules are already locked. + +A test is impossible because sending new rules +will cause an error. +") ); go_on = false; } @@ -529,9 +531,11 @@ foreach ( string rule, rules_list, { if ( regexpmatch( rule, "^[ /t]*-e[ /t]*2" ) ) { - Report::Warning( _("Lock is set in audit.rules (-e 2).\n -It doesn't make sense to continue, because the rules would -be locked until next boot.") ); + Report::Warning( _("Lock is set in audit.rules (-e 2). + +It makes no sense to continue, because the rules will +be locked until next boot. +") ); go_on = false; } } ); @@ -561,7 +565,7 @@ } else { - Report::Error( _("Cannot create tmp file for rules" ) ); + Report::Error( _("Cannot create tmp file for rules.") ); } } } @@ -622,7 +626,8 @@ This means the rules are locked until next boot! If you really want this, make sure '-e 2' is the last entry in the rules file. If not, either enable or disable auditing. -To check or to change the rules, please go back to rules editor."), +To check or change the rules, go back to the rules editor. +"), Label::ContinueButton(), Label::BackButton(), `focus_no ); Modified: trunk/audit-laf/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/dialogs.ycp?rev=67747&r1=67746&r2=67747&view=diff ============================================================================== --- trunk/audit-laf/src/dialogs.ycp (original) +++ trunk/audit-laf/src/dialogs.ycp Thu Mar 29 13:51:12 2012 @@ -189,7 +189,7 @@ `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)") )), @@ -200,13 +200,13 @@ ), `HSpacing(1.0), // InputField label - enter the path to a script (which will be executed) - `HWeight( 1, `InputField(`id("space_left_action_exec"), _("Path to Script" ) ) ) + `HWeight( 1, `InputField(`id("space_left_action_exec"), _("Path to Script") ) ) ) ), `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 (MB) ")) ), @@ -217,7 +217,7 @@ ), `HSpacing(1.0), // InputField label - enter the path to a script (which will be executed) - `HWeight( 1, `InputField(`id("admin_space_left_action_exec"), _("Path to Script" ) ) ) + `HWeight( 1, `InputField(`id("admin_space_left_action_exec"), _("Path to Script") ) ) ) ), `VStretch(), @@ -233,7 +233,7 @@ _("Disk &Full Action"), error_actions_list ) ), `HSpacing(2.0), // InputField label - enter the path to a script (which will be executed) - `HWeight( 1, `InputField(`id("disk_full_action_exec"), _("Path to Script" ) ) ) + `HWeight( 1, `InputField(`id("disk_full_action_exec"), _("Path to Script") ) ) ), `HBox( `HWeight ( 1, `ComboBox(`id("disk_error_action"), `opt(`notify ), @@ -241,7 +241,7 @@ _("Disk &Error Action"), error_actions_list ) ), `HSpacing(2.0), // InputField label - enter the path to a script (which will be executed) - `HWeight( 1, `InputField(`id("disk_error_action_exec"), _("Path to Script" ) ) ) + `HWeight( 1, `InputField(`id("disk_error_action_exec"), _("Path to Script") ) ) ) ) ), Modified: trunk/audit-laf/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/helps.ycp?rev=67747&r1=67746&r2=67747&view=diff ============================================================================== --- trunk/audit-laf/src/helps.ycp (original) +++ trunk/audit-laf/src/helps.ycp Thu Mar 29 13:51:12 2012 @@ -37,7 +37,7 @@ /* Read dialog help 1/2 */ "read" : _("<p><b><big>Initializing Configuration of Linux Audit Framework</big></b><br> -Please wait...<br></p> +</p> ") + /* Read dialog help 2/2 */ @@ -47,7 +47,7 @@ /* Write dialog help 1/2 */ "write" : _("<p><b><big>Saving auditd Configuration and Rules</big></b><br> -Please wait...<br></p> +</p> ") + /* Write dialog help 2/2 */ @@ -75,20 +75,25 @@ _("<p><b>Flush</b>: describes how to write the data to disk. If set to <i>INCREMENTAL</i> the <b>Frequency</b> parameter tells how many records to write before issuing an explicit flush to disk. <i>NONE</i> means: no special effort is made to flush data, <i>DATA</i>: keep data portion synced, -<i>SYNC</i>: keep data and meta-data fully synced.</p>" ) + +<i>SYNC</i>: keep data and meta-data fully synced.</p>") + /* logfile_settings dialog help 6/8 */ _("<p>Configure the maximum log file size (in megabytes) and the action to take when this -value is reached in <b>Size and Action</b> frame.</p>") + +value is reached via <b>Size and Action</b>.</p> +") + /* logfile_settings dialog help 7/8 */ _("<p>If the action is set to <i>ROTATE</i> the <b>Number of Log Files</b> specifies the number -of files to keep. <i>SYSLOG</i> means: the audit daemon will write a warning to /var/log/messages, -<i>SUSPEND</i>: stop writing records to disk, <i>IGNORE</i>: do nothing, <i>KEEP_LOGS</i>: similar -to ROTATE, but log files are not overwritten.</p>") + +of files to keep. Set to <i>SYSLOG</i>, the audit daemon will write a warning +to /var/log/messages. With <i>SUSPEND</i> the daemon stops writing records to +disk. <i>IGNORE</i> means do nothing, <i>KEEP_LOGS</i> is similar +to ROTATE, but log files are not overwritten.</p> +") + /* logfile_settings dialog help 8/8 */ - _("<p><b>Computer Name Format</b> describes how to write the computer name to the log file. -If <i>USER</i> is set the <b>User Defined Name</b> is used. <i>NONE</i> means: no computer name -is inserted, <i>HOSTNAME</i>: name returned by the 'gethostname' syscall, -<i>FQD</i>: fully qualified domain name</p>") , + _("<p><b>Computer Name Format</b> describes how to write the computer name to the +log file. If <i>USER</i> is set, the <b>User Defined Name</b> is +used. <i>NONE</i> means no computer name is inserted. <i>HOSTNAME</i> uses the +name returned by the 'gethostname' syscall. <i>FQD</i> uses the fully qualified +domain name.</p> +") , /* dispatcher dialog help 1/5 */ "dispatcher" : _("<p><b><big>Auditd Dispatcher Configuration</big></b><br> @@ -108,13 +113,14 @@ For more information see the manual pages ('man audispd' and 'man audispd.conf').</p>") + /* dispatcher dialog help 5/5 */ - _("<p><b>Please note:</b> The dispatcher program must be owned by 'root', have '0750' - file permissions and the full path name has to be entered.</p>"), + _("<p><b>Note:</b> The dispatcher program must be owned by 'root', have '0750' + file permissions, and the full path name has to be entered.</p> +"), /* disk space dialog help 1/6 */ "diskspace_settings" : _("<p><b><big>Auditd Disk Space Configuration</big></b><br> The settings made here refer to disk space on log partition. -Detailed information can be obtained from the manual page ('man auditd.conf').</p> +For detailed information, refer to the manual page ('man auditd.conf').</p> ") + /* disk space dialog help 2/6 */ _("<p><b>Space Left</b> (in megabytes) tells the audit daemon when to perform an <b>Action</b> because @@ -125,12 +131,14 @@ low</b> on disk space if the value is reached and the specified <b>Action</b> will be performed.</p>") + /* disk space dialog hep 4/6 */ - _("<p>If an action is set to <i>EMAIL</i> a warning mail will be send to the account specified in -<b>Action Mail Account</b>.<br> - <i>SYSLOG</i> means: the disk space warning will be written to /var/log/messages, <i>IGNORE</i>: -do nothing, <i>EXEC</i>: execute the script from <b>Path to Script</b>, <i>SUSPEND</i>: stop writing -records to disk, <i>SINGLE</i>: put the computer system in single user mode, <i>HALT</i>: shutdown -the system.</p>") + + _("<p>If an action is set to <i>EMAIL</i>, a warning mail will be sent to the +account specified in <b>Action Mail Account</b>.<br> <i>SYSLOG</i> means the +disk space warning will be written to /var/log/messages. <i>IGNORE</i> means +do nothing. <i>EXEC</i> runs the script specified in <b>Path to +Script</b>. <i>SUSPEND</i> stops writing records to disk. <i>SINGLE</i> +switches the system to single user mode. <i>HALT</i> shuts down the +system.</p> +") + /* disk space dialog help 5/6 */ _("<p>You can also specify a <b>Disk Full Action</b> (disk has become full already) and @@ -138,30 +146,33 @@ Available actions are the same as above (except for <i>EMAIL</i>).</p>") + /* disk space dialog help 5/6 */ - _("<p><b>Please note:</b> All scripts specified for <i>EXEC</i> must be owned -by 'root', have '0750' file permissions and the full path name has to be entered.</p>"), + _("<p><b>Note:</b> All scripts specified for <i>EXEC</i> must be owned +by 'root', have '0750' file permissions, and the full path name has to be entered.</p> +"), /* rules dialog help 1/6 */ "audit_rules" : _("<p><b><big>Rules for auditctl</big></b><br> This dialog offers the possibility to enable or to disable the syscall auditing as well as to lock the audit configuration. -The selected flag from <b>Set Enabled Flag</b> will be added to the rules.</p>" ) + +The selected flag from <b>Set Enabled Flag</b> will be added to the rules.</p>") + /* rules dialog help 2/6 */ - _("<p><b>Please note:</b><br>Locking the rules means they cannot be changed until next reboot! </p>" ) + + _("<p><b>Note:</b><br>Locking the rules means they cannot be changed until next reboot.</p>") + /* rules dialog help 3/6 */ _("<p>Enabling auditing without additional rules will cause the applications which use <i>libaudit</i>, e.g. PAM to log to /var/log/audit/audit.log (default).</p> ") + /* rules dialog help 4/6 */ - _("<p>The dialog also allows you to edit the rules manually, which is recommended for advanced users only.<br> -For more information about all options, see 'man auditctl'.</p>") + + _("<p>You can also edit the rules manually, which we only recommended for advanced users.<br> +For more information about all options, see 'man auditctl'.</p> +") + /* rules dialog help 5/6 */ - _("<p><b>Check Syntax</b> sends the rules via <i>auditctl</i> to the audit subsystem and tells - whether the syntax is correct.<br><b>Restore</b> restores the settings from /etc/audit/audit.rules.</p>") + + _("<p><b>Check Syntax</b> sends the rules via <i>auditctl</i> to the audit subsystem and checks the syntax.<br><b>Restore</b> restores the settings from /etc/audit/audit.rules.</p> +") + /* rules dialog help 6/6 */ - _("<p>Use the <b>Restore and Reset</b> button to restore the rules and reset -the changes (from previous syntax checks) by calling <i>auditctl</i> with it.<br> -The <b>Load</b> button opens a file selection dialog and you are able to load -an example rules file.</p>") + _("<p>Click <b>Restore and Reset</b> to restore the rules and reset +the changes (from previous syntax checks) by calling <i>auditctl</i>.<br> +Click <b>Load</b> to open a file selection dialog in which you can load +an example rules file.</p> +") ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org