Hello community, here is the log from the commit of package yast2-apparmor for openSUSE:Factory checked in at 2011-11-16 17:22:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-apparmor (Old) and /work/SRC/openSUSE:Factory/.yast2-apparmor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-apparmor", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-apparmor/yast2-apparmor.changes 2011-10-05 17:48:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-apparmor.new/yast2-apparmor.changes 2011-11-16 17:23:27.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 16 12:36:51 CET 2011 - [email protected] + +- merged texts from proofreading +- 2.22.0 + +------------------------------------------------------------------- Old: ---- yast2-apparmor-2.21.5.tar.bz2 New: ---- yast2-apparmor-2.22.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-apparmor.spec ++++++ --- /var/tmp/diff_new_pack.UJUGub/_old 2011-11-16 17:23:29.000000000 +0100 +++ /var/tmp/diff_new_pack.UJUGub/_new 2011-11-16 17:23:29.000000000 +0100 @@ -19,13 +19,11 @@ Name: yast2-apparmor -Version: 2.21.5 +Version: 2.22.0 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-apparmor-2.21.5.tar.bz2 - -Prefix: /usr +Source0: yast2-apparmor-%{version}.tar.bz2 Group: Productivity/Security License: GPL-2.0+ @@ -53,26 +51,26 @@ SubDomain. %prep -%setup -n yast2-apparmor-2.21.5 +%setup -n yast2-apparmor-%{version} %build -%{prefix}/bin/y2tool y2autoconf -%{prefix}/bin/y2tool y2automake +%{_prefix}/bin/y2tool y2autoconf +%{_prefix}/bin/y2tool y2automake autoreconf --force --install export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" %{?suse_update_config:%{suse_update_config -f}} -./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} +./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works make %{?jobs:-j%jobs} V=1 %install make install DESTDIR="$RPM_BUILD_ROOT" -[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" -for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desktop"` ; do +[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" +for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done @@ -98,7 +96,7 @@ %dir %attr(-,root,root) /etc/apparmor %config(noreplace) /etc/apparmor/reports.crontab %config(noreplace) /etc/apparmor/reports.conf -%doc %{prefix}/share/doc/packages/yast2-apparmor +%doc %{_prefix}/share/doc/packages/yast2-apparmor %post REPDIR='/var/log/apparmor/reports' ++++++ yast2-apparmor-2.21.5.tar.bz2 -> yast2-apparmor-2.22.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-2.21.5/Makefile.am new/yast2-apparmor-2.22.0/Makefile.am --- old/yast2-apparmor-2.21.5/Makefile.am 2011-10-05 15:03:14.000000000 +0200 +++ new/yast2-apparmor-2.22.0/Makefile.am 2011-11-16 12:08:33.000000000 +0100 @@ -20,7 +20,6 @@ IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) COPYRIGHT_files_gpl = README COPYING @@ -155,7 +154,7 @@ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-textdomain package-local TAGVERSION = $(Y2TOOL) tagversion @@ -185,21 +184,6 @@ check-parse: @echo "Not running parseycp." -check-all-packages: - @if [ ! -e "$(ALL_PACKAGES)" ]; then \ - echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \ - fi - @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \ - fi - @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some unknown (?) fields:"; \ - echo; \ - grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \ - echo; \ - false; \ - fi - check-textdomain: $(Y2TOOL) check-textdomain $(srcdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-2.21.5/Makefile.in new/yast2-apparmor-2.22.0/Makefile.in --- old/yast2-apparmor-2.21.5/Makefile.in 2011-10-05 15:03:17.000000000 +0200 +++ new/yast2-apparmor-2.22.0/Makefile.in 2011-11-16 12:08:36.000000000 +0100 @@ -262,7 +262,6 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) COPYRIGHT_files_gpl = README COPYING COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ @@ -903,7 +902,7 @@ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-textdomain package-local check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -931,21 +930,6 @@ check-parse: @echo "Not running parseycp." -check-all-packages: - @if [ ! -e "$(ALL_PACKAGES)" ]; then \ - echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \ - fi - @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \ - fi - @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some unknown (?) fields:"; \ - echo; \ - grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \ - echo; \ - false; \ - fi - check-textdomain: $(Y2TOOL) check-textdomain $(srcdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-2.21.5/VERSION new/yast2-apparmor-2.22.0/VERSION --- old/yast2-apparmor-2.21.5/VERSION 2011-10-05 14:59:40.000000000 +0200 +++ new/yast2-apparmor-2.22.0/VERSION 2011-11-16 12:37:33.000000000 +0100 @@ -1 +1 @@ -2.21.5 +2.22.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-2.21.5/configure.in new/yast2-apparmor-2.22.0/configure.in --- old/yast2-apparmor-2.21.5/configure.in 2011-10-05 15:03:14.000000000 +0200 +++ new/yast2-apparmor-2.22.0/configure.in 2011-11-16 12:08:33.000000000 +0100 @@ -1,6 +1,6 @@ dnl configure.in for yast2-apparmor dnl -dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) AC_INIT(yast2-apparmor, 2.21.5, http://bugs.opensuse.org/, yast2-apparmor) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-2.21.5/src/agents/ag_genprof new/yast2-apparmor-2.22.0/src/agents/ag_genprof --- old/yast2-apparmor-2.21.5/src/agents/ag_genprof 2011-09-27 10:35:06.000000000 +0200 +++ new/yast2-apparmor-2.22.0/src/agents/ag_genprof 2011-11-16 12:13:16.000000000 +0100 @@ -85,14 +85,15 @@ my $f = { description => -__("This wizard will help you create a new AppArmor security +__("This wizard will assist you in creating a new AppArmor security profile for an application, or you can use it to enhance an existing profile by allowing AppArmor to learn new application behavior. -Please enter the application name for which you would like -to create a profile, or select Browse to find the -application on your system.") , +Enter the application name for which you would like +to create a profile or select Browse to find the +application on your system. +") , file_label => __("&Application to Profile"), okay_label => __("&Create"), cancel_label => __("&Abort"), @@ -117,16 +118,18 @@ unless(-x $fqdbin) { UI_Important( __("The specified file is not executable. -Please enter an application name to +Enter an application name to continue generating a profile or press -Abort to cancel this wizard.")); +Abort to cancel this wizard. +")); } } elsif(-d $profiling) { UI_Important( __("The specified pathname is a directory. -Please enter an application name to +Enter an application name to continue generating a profile or press -Abort to cancel this wizard.")); +Abort to cancel this wizard. +")); } else { if($profiling !~ /\//) { my $which = which($profiling); @@ -138,9 +141,10 @@ unless(-f $fqdbin) { UI_Important( __("The specified file does not exist. -Please enter an application name to +Enter an application name to continue generating a profile or press -Abort to cancel this wizard.")); +Abort to cancel this wizard. +")); } } @@ -149,9 +153,10 @@ UI_Important( __("You have not entered or selected an application to profile. -Please enter an application name to +Enter an application name to continue generating a profile or press -Abort to cancel this wizard.")); +Abort to cancel this wizard. +")); } } until($fqdbin && -x $fqdbin); @@ -194,15 +199,16 @@ my $q = { }; $q->{headers} = [ __("Profiling"), $fqdbin ]; - $q->{explanation} = __("Please start the application to be profiled in + $q->{explanation} = __("Start the application to be profiled in another window and exercise its functionality now. Once completed, select the 'Scan' option below in order to scan the system logs for AppArmor events. For each AppArmor event, you will be given the -opportunity to choose whether the access should be -allowed or denied."); +opportunity to choose whether access should be +allowed or denied. +"); $q->{functions} = [ "CMD_SCAN", "CMD_FINISHED" ]; $q->{default} = "CMD_SCAN"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-2.21.5/src/clients/AA_AddProfile.ycp new/yast2-apparmor-2.22.0/src/clients/AA_AddProfile.ycp --- old/yast2-apparmor-2.21.5/src/clients/AA_AddProfile.ycp 2011-09-26 11:17:56.000000000 +0200 +++ new/yast2-apparmor-2.22.0/src/clients/AA_AddProfile.ycp 2011-11-16 12:13:16.000000000 +0100 @@ -22,7 +22,7 @@ define boolean CreateNewProfile() { string selectfilename = ""; while ( true ) { - selectfilename = UI::AskForExistingFile( "/", "", _("Select File To Generate A Profile for") ); + selectfilename = UI::AskForExistingFile( "/", "", _("Select File to Generate a Profile for") ); // Check for cancel in the file choose dialog if ( selectfilename == nil ) { return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-2.21.5/src/clients/AA_EditProfile.ycp new/yast2-apparmor-2.22.0/src/clients/AA_EditProfile.ycp --- old/yast2-apparmor-2.21.5/src/clients/AA_EditProfile.ycp 2011-09-30 13:55:07.000000000 +0200 +++ new/yast2-apparmor-2.22.0/src/clients/AA_EditProfile.ycp 2011-11-16 12:13:16.000000000 +0100 @@ -36,7 +36,7 @@ map aliases = $[ "showProfile" : ``(DisplayProfileForm(Settings["CURRENT_PROFILE"]:"", false)), "showHat" : ``(DisplayProfileForm(Settings["CURRENT_HAT"]:"", true)), - "chooseProfile" : ``(SelectProfileForm(profiles, _("Please make a selection from the listed profiles and press Next to edit the profile."), _("Edit Profile - Choose profile to edit"), "apparmor_edit_profile" )), + "chooseProfile" : ``(SelectProfileForm(profiles, _("Selection a listed profile and press Next to edit the profile."), _("Edit Profile - Choose profile to edit"), "apparmor_edit_profile" )), "reread" : ``(Reread()), ]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-2.21.5/src/clients/apparmor.ycp new/yast2-apparmor-2.22.0/src/clients/apparmor.ycp --- old/yast2-apparmor-2.21.5/src/clients/apparmor.ycp 2011-09-30 13:39:56.000000000 +0200 +++ new/yast2-apparmor-2.22.0/src/clients/apparmor.ycp 2011-11-16 12:13:16.000000000 +0100 @@ -13,8 +13,9 @@ string caption = _("AppArmor Configuration"); /* AppArmor dialog help */ - string help = _("<p>Choose one of the available apparmor modules to configure - the corresponding action and press <b>Launch</b>.</p>"); + string help = _("<p>Choose one of the available AppArmor modules to configure + the corresponding action and press <b>Launch</b>.</p> +"); /* AppArmor dialog contents */ term contents = `HBox( @@ -33,7 +34,7 @@ // and so was Reports.pm // `item(`id("AA_Report"), _("Reports")), `item(`id("AA_EditProfile"), _("Manage Existing Profiles")), - `item(`id("AA_AddProfile"), _("Add Manually Profile"))//, + `item(`id("AA_AddProfile"), _("Manually Add Profile"))//, // merged with EditProfile `item(`id("AA_DeleteProfile"), _("Delete Profile")) ]), `VSpacing(3) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-2.21.5/src/include/apparmor/aa-config.ycp new/yast2-apparmor-2.22.0/src/include/apparmor/aa-config.ycp --- old/yast2-apparmor-2.21.5/src/include/apparmor/aa-config.ycp 2011-09-30 09:19:17.000000000 +0200 +++ new/yast2-apparmor-2.22.0/src/include/apparmor/aa-config.ycp 2011-11-16 12:13:16.000000000 +0100 @@ -31,7 +31,7 @@ if ( error != nil && is(error, string) ) { string errorMsg = (string) error; - string popError = _("This operation generated the following error. Please check your installation and AppArmor profile settings."); + string popError = _("This operation generated the following error. Check your installation and AppArmor profile settings."); Popup::Message( popError+ "\n[" + errorMsg + "]"); aaEnabled = ! aaEnabled; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-2.21.5/src/include/apparmor/apparmor_profile_check.ycp new/yast2-apparmor-2.22.0/src/include/apparmor/apparmor_profile_check.ycp --- old/yast2-apparmor-2.21.5/src/include/apparmor/apparmor_profile_check.ycp 2011-09-26 11:17:59.000000000 +0200 +++ new/yast2-apparmor-2.22.0/src/include/apparmor/apparmor_profile_check.ycp 2011-11-16 12:17:44.000000000 +0100 @@ -36,16 +36,11 @@ errmsg = _("<p>These problems must be corrected before AppArmor can be \ started or the profile management tools can be used.</p> ") + "<p>" + errmsg + "</p>" - + _("<p>You can find a description of AppArmor profile syntax by \ -running ") + + _("<p>Find a description of the AppArmor profile syntax by running ") + "<code>man apparmor.d</code></p>" - + _("<p>Comprehensive documentation about AppArmor is available in \ -the Administration guide. This is available in the \ -directory: ") + + _("<p>Comprehensive documentation about AppArmor is available in the Administration guide located in the directory: ") + "</p>" - + "<code>/usr/share/doc/manual/suselinux-manual_LANGUAGE</code>. " - + _("<p>Please refer to this for more detailed information about \ -AppArmor</p>"); + + "<code>/usr/share/doc/manual/suselinux-manual_LANGUAGE</code>. "; Popup::LongText( headline, `RichText(errmsg), 55, 15); } return( syntax_ok ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-2.21.5/src/include/apparmor/apparmor_ycp_utils.ycp new/yast2-apparmor-2.22.0/src/include/apparmor/apparmor_ycp_utils.ycp --- old/yast2-apparmor-2.21.5/src/include/apparmor/apparmor_ycp_utils.ycp 2011-09-26 11:17:59.000000000 +0200 +++ new/yast2-apparmor-2.22.0/src/include/apparmor/apparmor_ycp_utils.ycp 2011-11-16 12:13:16.000000000 +0100 @@ -31,8 +31,8 @@ CMDS["CMD_AUDIT_OFF"] = _("Audi&t off"); CMDS["CMD_AUDIT_FULL"] = _("Audit &All"); CMDS["CMD_OTHER"] = _("&Opts"); - CMDS["CMD_USER_ON"] = _("&Owner permissions on"); - CMDS["CMD_USER_OFF"] = _("&Owner permissions off"); + CMDS["CMD_USER_ON"] = _("&Owner Permissions on"); + CMDS["CMD_USER_OFF"] = _("&Owner Permissions off"); CMDS["CMD_ix"] = _("&Inherit"); CMDS["CMD_px"] = _("&Profile"); CMDS["CMD_px_safe"] = _("&Profile Clean Exec"); @@ -96,7 +96,11 @@ define boolean checkEmailAddress( string emailAddr ) { if ( ! validEmailAddress( emailAddr, false ) ) { - string err_email_format = _("Email address format invalid.\nEmail address must be less than 129 characters \n and of the format \"name@domain\". \n Please enter another address."); + string err_email_format = _("Email address format invalid. +Email address must be less than 129 characters + and of the format \"name@domain\". +Enter a valid address. +"); Popup::Error( err_email_format ); return false; } @@ -258,13 +262,13 @@ ? "y": "n"; if ( username == "" ) { - Popup::Error( _("Username required for registration." )); + Popup::Error( _("Username required for registration.")); } else if ( email == "" ) { - Popup::Error( _("Email address required for registration." )); + Popup::Error( _("Email address required for registration.")); } else if ( password == "" && password_verify == "" ) { - Popup::Error( _("Password is required for registration." )); + Popup::Error( _("Password is required for registration.")); } else if ( password != password_verify ) { - Popup::Error( _("Passwords do not match. Please re-enter." )); + Popup::Error( _("Passwords do not match. Please re-enter.")); } else if ( ! checkEmailAddress( email ) ) { any dummy = nil; } else { @@ -508,7 +512,7 @@ string profile_rules = (string) profiles[first_profile_name]:"MISSING CONTENTS"; string disable_ask_upload_str = - _("&Don't ask again for unselected profiles"); + _("&Do not ask again for unselected profiles"); map ui_capabilities = UI::GetDisplayInfo(); boolean in_ncurses = ui_capabilities["TextMode"]:true;; term profile_contents_text = nil; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-2.21.5/src/include/apparmor/capabilities.ycp new/yast2-apparmor-2.22.0/src/include/apparmor/capabilities.ycp --- old/yast2-apparmor-2.21.5/src/include/apparmor/capabilities.ycp 2011-09-26 11:17:59.000000000 +0200 +++ new/yast2-apparmor-2.22.0/src/include/apparmor/capabilities.ycp 2011-11-16 12:13:16.000000000 +0100 @@ -41,19 +41,15 @@ "fowner" : $[ "name" : "CAP_FOWNER", - "info" : _("<ul><li>Overrides all restrictions about allowed operations on files, -where file owner ID must be equal to the user ID, except where CAP_FSETID is -applicable. It doesn't override MAC and DAC restrictions. </li></ul>"), + "info" : _("<ul><li>Overrides all restrictions on allowed operations on files, where file +owner ID must be equal to the user ID, except where CAP_FSETID is +applicable. It does not override MAC and DAC restrictions. </li></ul>"), ], "fsetid" : $[ "name" : "CAP_FSETID", - "info" : _("<ul><li>Overrides the following restrictions that the effective user -ID shall match the file owner ID when setting the S_ISUID and S_ISGID bits on that -file; that the effective group ID (or one of the supplementary group IDs) shall match -the file owner ID when setting the S_ISGID bit on that file; that the S_ISUID and -S_ISGID bits are cleared on successful return from chown(2) (not implemented). </li></ul>"), + "info" : _("<ul><li>Overrides the following restrictions: user ID must match the file owner ID when setting the S_ISUID and S_ISGID bits on that file; the effective group ID (or one of the supplementary group IDs) must match the file owner ID when setting the S_ISGID bit on that file; the S_ISUID and S_ISGID bits are cleared on successful return from chown(2) (not implemented). </li></ul>"), ], "kill" : @@ -134,8 +130,8 @@ "ipc_lock" : $[ "name" : "CAP_IPC_LOCK", - "info" : _("<ul><li> Allows locking of shared memory segments</li> -<li> Allows mlock and mlockall (which doesn't really have anything to do with IPC) </li></ul>"), + "info" : _("<ul><li> Allows locking of shared memory segments</li> <li> Allows mlock and +mlockall (which does not really have anything to do with IPC) </li></ul>"), ], "ipc_owner" : diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-2.21.5/src/include/apparmor/config_complain.ycp new/yast2-apparmor-2.22.0/src/include/apparmor/config_complain.ycp --- old/yast2-apparmor-2.21.5/src/include/apparmor/config_complain.ycp 2011-09-26 11:17:59.000000000 +0200 +++ new/yast2-apparmor-2.22.0/src/include/apparmor/config_complain.ycp 2011-11-16 12:13:16.000000000 +0100 @@ -38,7 +38,7 @@ } else if ( profile != "" ) { profCmd["profile"] = profile; } else { - Popup::Error( _("Couldn't recognize profile name: ") + profile ); + Popup::Error( _("Could not recognize profile name: ") + profile ); return; } @@ -50,7 +50,7 @@ profCmd["mode"] = "enforce"; } else { error = true; - Popup::Error( _("Couldn't recognize mode: ") + mode ); + Popup::Error( _("Could not recognize mode: ") + mode ); } } else if ( id != `toggle ) { profCmd["mode"] = mode; @@ -211,7 +211,7 @@ } else if ( id == `table ) { - Popup::Message( _("Please select an action to perform from the buttons below.") ); + Popup::Message( _("Select an action to perform.") ); } else { y2error("Unexpected return code: %1", id); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-2.21.5/src/include/apparmor/profile_dialogs.ycp new/yast2-apparmor-2.22.0/src/include/apparmor/profile_dialogs.ycp --- old/yast2-apparmor-2.21.5/src/include/apparmor/profile_dialogs.ycp 2011-09-30 13:38:54.000000000 +0200 +++ new/yast2-apparmor-2.22.0/src/include/apparmor/profile_dialogs.ycp 2011-11-16 12:20:44.000000000 +0100 @@ -245,11 +245,11 @@ `HBox( `VSpacing( 10 ), `HSpacing( 0.75 ), - `Frame( _("Profile Entry For ") + profile, + `Frame( _("Profile Entry for ") + profile, `HBox( `HWeight( 60, `VBox( - `TextEntry(`id(`filename), _("Enter or modify Filename")), + `TextEntry(`id(`filename), _("Enter or Modify Filename")), `HCenter(`PushButton(`id(`browse), _("&Browse") )) ) ), @@ -501,7 +501,7 @@ filename = tostring( UI::QueryWidget(`id(`filename), `Value) ); UI::CloseDialog(); if ( filename == "" || newperms == "" ) { - Popup::Error(_("Entry will not added. Entry name or permissions not defined.")); + Popup::Error(_("Entry will not be added. Entry name or permissions not defined.")); results = nil; } else { results = $[ "PERM": newperms, "FILE": filename ]; @@ -696,7 +696,9 @@ `Top( `VBox( `VSpacing(1), - `Left(`Label( _("Please enter the name of the Hat that you would like \nto add to the profile") + " " + parentProfile + ".")), + `Left(`Label( _("Enter the name of the Hat that you would like +to add to the profile +") + " " + parentProfile + ".")), `VSpacing(0.5), `Left( `TextEntry( @@ -728,8 +730,7 @@ Popup::Error(_("You have not given a name for the hat you want to add.\nPlease enter a hat name to create a new hat, or press Abort to cancel this wizard.")); } else if ( haskey( currentHats, hatname ) ) { - Popup::Error(_("The profile already contains the provided hat name. -Please enter a different name to try again, or press Abort to cancel this wizard.")); + Popup::Error(_("The profile already contains the provided hat name. Enter a different name or press Abort to cancel this wizard.")); } else { Settings["CURRENT_HAT"] = hatname; UI::CloseDialog(); @@ -763,8 +764,7 @@ // FIXME: format these texts better /* help text */ - string help1 = _("<p>In this form you can view and modify the contents of an individual profile. -For existing entries you can double click the permissions to access a modification dialog.</p>"); + string help1 = _("<p>View and modify the contents of an individual profile. For existing entries double click the permissions to access a modification dialog.</p>"); /* help text */ string help2 = _("<p><b>Permission Definitions:</b><br><code> r - read <br> @@ -777,11 +777,11 @@ string help3 = _("<p><b>Add Entry:</b><br>Select the type of resource to add from the drop down list.</p>"); /* help text - part x1 */ - string help4 = _("<p><ul><li><b>File</b><br>Add a file entry to this profile</li>"); + string help4 = _("<p><ul><li><b>File</b><br>Add a file entry to this profile.</li>"); /* help text - part x2 */ - string help5 = _("<li><b>Directory</b><br>Add a directory entry to this profile</li>"); + string help5 = _("<li><b>Directory</b><br>Add a directory entry to this profile.</li>"); /* help text - part x3 */ - string help6 = _("<li><b>Capability</b><br>Add a capability entry to this profile</li>"); + string help6 = _("<li><b>Capability</b><br>Add a capability entry to this profile.</li>"); /* help text - part x4 */ string help7 = _("<li><b>Include</b><br>Add an include entry to this profile. This option includes the profile entry contents of another file in this profile at load time.</li>"); @@ -790,11 +790,11 @@ This option will allow you to specify network access privileges for the profile. You may specify a network address family and socket type.</li>"); /* help text - part x6 */ - string helpHat = _("<li><b>Hat</b><br>Add a sub-profile for this profile - called a Hat. -This option is analogous to manually creating a new profile, which can selected -during execution only in the context of being asked for by a <b>changehat aware</b> -application. For more information on changehat please see <b>man changehat</b> on your -system or the Novell AppArmor Administration Guide.</li>"); + string helpHat = _("<li><b>Hat</b><br>Add a sub-profile for this profile, called a Hat. This +option is analogous to manually creating a new profile, which can be selected +during execution only in the context of being asked for by a <b>changehat +aware</b> application. +For more information on changehat, see <b>man changehat</b> on your system or the Novell AppArmor Administration Guide.</li>"); /* help text - part x7 */ string helpEdit = _("</ul></p><p><b>Edit Entry:</b><br>Edit the selected entry.</p>"); @@ -880,7 +880,7 @@ caps = capabilityEntryPopup( caps, rule, pathname ); profile["allow", "capability"] = caps; } else if ( findinc == 0 ) { - Popup::Error(_("Include entries can not be edited. Please select add or delete to manage Include entries.")); + Popup::Error(_("Include entries can not be edited. Select add or delete to manage Include entries.")); continue; } else if ( findhat == 0 ) { string hatToEdit = substring( rule, 5); @@ -997,7 +997,7 @@ } } else if ( id == `include ) { list <string> customIncludes = (list <string>) SCR::Read(.apparmor, "custom-includes"); - string newInclude = UI::AskForExistingFile( "/etc/apparmor.d/abstractions", "", _("Select File To Include")); + string newInclude = UI::AskForExistingFile( "/etc/apparmor.d/abstractions", "", _("Select File to Include")); if ( newInclude == nil || (string)newInclude == "" ) { continue; } @@ -1054,8 +1054,10 @@ break; } else if ( id == `next ) { if ( ! hat ) { - if (Popup::YesNoHeadline(_("Save changes to the Profile"), - _("Would you like to save the changes to this profile? \n(Note: after saving the changes the AppArmor profiles will be reloaded.)"))) { + if (Popup::YesNoHeadline(_("Save changes to the profile"), + _("Save the changes to this profile? +(Note: after saving, AppArmor profiles will be reloaded.) +"))) { map argmap = $[ "PROFILE_HASH" : Settings["PROFILE_MAP"]:$[], "PROFILE_NAME" : pathname ]; @@ -1131,7 +1133,7 @@ if ( profilename != nil && profilename != "" ) { break; } else { - Popup::Error(_("You must select a profile to edit")); + Popup::Error(_("You must select a profile to edit.")); continue; } } // TODO ELSE POPUP NO ENTRY SELECTED ERROR diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-2.21.5/src/include/apparmor/report_helptext.ycp new/yast2-apparmor-2.22.0/src/include/apparmor/report_helptext.ycp --- old/yast2-apparmor-2.21.5/src/include/apparmor/report_helptext.ycp 2011-09-26 11:17:59.000000000 +0200 +++ new/yast2-apparmor-2.22.0/src/include/apparmor/report_helptext.ycp 2011-11-16 12:22:00.000000000 +0100 @@ -84,12 +84,6 @@ /* START Help Section ************************************************************/ -string repGenHelpText = _("<p><b>Generate Reports Help</b> <p>If there were, in fact, -going to be any help for you (which, incidentally, there isn't going to be), -then you would indeed find said help, here.</p><p>Thank you for your time, -and have a nice day.</p>"); - - string schedHelpText = _("<p>The summary of scheduled reports page shows us when reports are scheduled to run. @@ -99,13 +93,8 @@ _("In the Set Schedule section, you can schedule the following three types of security reports:<br>") + types; -string archHelpText = _("<p>The View Archive Reports form enables you to view -previously generated reports, located in the /var/log/apparmor/reports-archived -directory. The checkboxes at the top of the form enable you to narrow-down -the category of reports shown in the list to the following: SIR Reports, AUD -Reports, or ESS Reports. To see report details, select a report and click the -<b>View</b> button.<br><br> You can view reports from one or more systems if -you move the reports to the /var/log/apparmor/reports-archived directory.</p>"); +string archHelpText = _("<p>The View Archive Reports form enables you to view previously generated +reports located in the /var/log/apparmor/reports-archived directory. Use the checkboxes at the top to narrow-down the category of reports shown in the list to: SIR Reports, AUD Reports or ESS Reports. To see report details, select a report and click the <b>View</b> button.<br><br> You can view reports from one or more systems if you move the reports to the /var/log/apparmor/reports-archived directory.</p>"); string mainHelp = schedHelpText; @@ -114,7 +103,6 @@ term defaultHelp = `RichText ( schedHelpText ); term schedHelp = `RichText ( schedHelpText ); -term repGenHelp = `RichText ( repGenHelpText ); term archHelp = `RichText ( archHelpText ); term otherHelp = `RichText ( archHelpText ); @@ -134,15 +122,7 @@ Select the report from the archive, then <b>View</b> to see the report details.</p>"); -string audHelp = _("<p><b>Applications Audit Report (AUD):</b> An auditing tool -that reports which application servers are running and whether they are confined -by AppArmor. Application servers are applications that accept incoming network -connections. This report provides the host machine's IP Address, the date the -Applications Audit Report ran, the name and path of the unconfined program or -application server, the suggested profile or a placeholder for a profile for an -unconfined program, the process ID number, The state of the program (confined or -unconfined), and the type of confinement that the profile is performing -(enforce/complain).</p>"); +string audHelp = _("<p><b>Applications Audit Report (AUD):</b> An auditing tool that reports which application servers are running and whether they are confined by AppArmor. Application servers are applications that accept incoming network connections. This report provides the host machine's IP Address, the date the Applications Audit Report ran, the name and path of the unconfined program or application server, the suggested profile or a placeholder for a profile for an unconfined program, the process ID number, the state of the program (confined or unconfined) and the type of confinement that the profile is performing (enforce/complain).</p>"); string essHelp = _("<p><b>Executive Security Summary (ESS):</b> A combined report, consisting of one or more high-level reports from one or more machines. This diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-2.21.5/src/include/apparmor/reporting_archived_dialogs.ycp new/yast2-apparmor-2.22.0/src/include/apparmor/reporting_archived_dialogs.ycp --- old/yast2-apparmor-2.21.5/src/include/apparmor/reporting_archived_dialogs.ycp 2011-09-26 11:17:59.000000000 +0200 +++ new/yast2-apparmor-2.22.0/src/include/apparmor/reporting_archived_dialogs.ycp 2011-11-16 12:13:16.000000000 +0100 @@ -183,12 +183,12 @@ } if ( CheckDate(startDay,startMonth,startYear) == false ) { - Popup::Error( _("Illegal start date entered. Please retry.") ); + Popup::Error( _("Illegal start date entered. Retry.") ); continue; } if ( CheckDate(endDay,endMonth,endYear) == false ) { - Popup::Error( _("Illegal end date entered. Please retry.") ); + Popup::Error( _("Illegal end date entered. Retry.") ); continue; } //////////////////////////////////////////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-apparmor-2.21.5/src/include/apparmor/reporting_dialogues.ycp new/yast2-apparmor-2.22.0/src/include/apparmor/reporting_dialogues.ycp --- old/yast2-apparmor-2.21.5/src/include/apparmor/reporting_dialogues.ycp 2011-09-26 11:17:59.000000000 +0200 +++ new/yast2-apparmor-2.22.0/src/include/apparmor/reporting_dialogues.ycp 2011-11-16 12:13:16.000000000 +0100 @@ -132,7 +132,7 @@ // de-i18n if ( weekday == _("Mon") ) { weekday = "Mon"; } if ( weekday == _("Tue") ) { weekday = "Tue"; } - if ( weekday == _("Weds") ) { weekday = "Weds"; } + if ( weekday == _("Wed") ) { weekday = "Weds"; } if ( weekday == _("Thu") ) { weekday = "Thu"; } if ( weekday == _("Fri") ) { weekday = "Fri"; } if ( weekday == _("Sat") ) { weekday = "Sat"; } @@ -669,12 +669,12 @@ string end_time = tostring(end_hour) + ":" + tostring(end_min); if ( CheckDate(startDay,startMonth,startYear) == false ) { - Popup::Error( _("Illegal start date entered. Please retry.") ); + Popup::Error( _("Illegal start date entered. Retry.") ); continue; } if ( CheckDate(endDay,endMonth,endYear) == false ) { - Popup::Error( _("Illegal end date entered. Please retry.") ); + Popup::Error( _("Illegal end date entered. Retry.") ); continue; } @@ -710,7 +710,8 @@ }); string help1 = _("<b>AppArmor Security Events</b><p> - This table displays the events found that match your search criteria."); +This table displays the events that match your search criteria. +"); // DBG y2milestone("in MainReportForm"); @@ -1018,12 +1019,12 @@ string end_time = tostring(end_hour) + ":" + tostring(end_min); if ( CheckDate(startDay,startMonth,startYear) == false ) { - Popup::Error( _("Illegal start date entered. Please retry.") ); + Popup::Error( _("Illegal start date entered. Retry.") ); continue; } if ( CheckDate(endDay,endMonth,endYear) == false ) { - Popup::Error( _("Illegal end date entered. Please retry.") ); + Popup::Error( _("Illegal end date entered. Retry.") ); continue; } @@ -1794,7 +1795,7 @@ // de-i18n if ( weekday == _("Mon") ) { weekday = "Mon"; } if ( weekday == _("Tue") ) { weekday = "Tue"; } - if ( weekday == _("Weds") ) { weekday = "Weds"; } + if ( weekday == _("Wed") ) { weekday = "Weds"; } if ( weekday == _("Thu") ) { weekday = "Thu"; } if ( weekday == _("Fri") ) { weekday = "Fri"; } if ( weekday == _("Sat") ) { weekday = "Sat"; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
