Hello community, here is the log from the commit of package yast2-users for openSUSE:Factory checked in at 2012-03-30 14:22:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-users (Old) and /work/SRC/openSUSE:Factory/.yast2-users.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-users", Maintainer is "jsuchome@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-users/yast2-users.changes 2012-03-23 12:12:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-users.new/yast2-users.changes 2012-03-30 14:22:39.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Mar 29 16:25:07 CEST 2012 - jsuchome@suse.cz + +- merged proofread texts +- 2.22.4 + +------------------------------------------------------------------- Old: ---- yast2-users-2.22.3.tar.bz2 New: ---- yast2-users-2.22.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-users.spec ++++++ --- /var/tmp/diff_new_pack.1rWTYB/_old 2012-03-30 14:22:40.000000000 +0200 +++ /var/tmp/diff_new_pack.1rWTYB/_new 2012-03-30 14:22:40.000000000 +0200 @@ -16,22 +16,47 @@ # - Name: yast2-users -Version: 2.22.3 +Version: 2.22.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-users-%{version}.tar.bz2 -Group: System/YaST -License: GPL-2.0 -BuildRequires: cracklib-devel doxygen gcc-c++ libtool perl-Digest-SHA1 perl-XML-Writer update-desktop-files -BuildRequires: yast2 yast2-core-devel yast2-devtools yast2-ldap-client yast2-perl-bindings yast2-security yast2-testsuite - -Requires: yast2-country yast2-pam yast2-security cracklib perl-Digest-SHA1 perl-X500-DN perl-gettext -Obsoletes: yast2-config-users y2c_users yast2-trans-users y2t_users yast2-trans-inst-user yast2-trans-users y2t_inst-user -Provides: yast2-config-users y2c_users yast2-trans-users y2t_users yast2-trans-inst-user yast2-trans-users y2t_inst-user +BuildRequires: cracklib-devel +BuildRequires: doxygen +BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: perl-Digest-SHA1 +BuildRequires: perl-XML-Writer +BuildRequires: update-desktop-files +BuildRequires: yast2 +BuildRequires: yast2-core-devel +BuildRequires: yast2-devtools +BuildRequires: yast2-ldap-client +BuildRequires: yast2-perl-bindings +BuildRequires: yast2-security +BuildRequires: yast2-testsuite + +Requires: cracklib +Requires: perl-Digest-SHA1 +Requires: perl-X500-DN +Requires: perl-gettext +Requires: yast2-country +Requires: yast2-pam +Requires: yast2-security +Obsoletes: y2c_users +Obsoletes: y2t_inst-user +Obsoletes: y2t_users +Obsoletes: yast2-config-users +Obsoletes: yast2-trans-inst-user +Obsoletes: yast2-trans-users +Provides: y2c_users +Provides: y2t_inst-user +Provides: y2t_users +Provides: yast2-config-users +Provides: yast2-trans-inst-user +Provides: yast2-trans-users # y2usernote, y2useritem Requires: yast2-perl-bindings >= 2.18.0 @@ -47,6 +72,8 @@ Requires: yast2-core >= 2.21.0 Summary: YaST2 - User and Group Configuration +License: GPL-2.0 +Group: System/YaST %description This package provides GUI for maintenance of linux users and groups. ++++++ yast2-users-2.22.3.tar.bz2 -> yast2-users-2.22.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.22.3/VERSION new/yast2-users-2.22.4/VERSION --- old/yast2-users-2.22.3/VERSION 2012-03-22 11:20:47.000000000 +0100 +++ new/yast2-users-2.22.4/VERSION 2012-03-29 16:25:16.000000000 +0200 @@ -1 +1 @@ -2.22.3 +2.22.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.22.3/src/Users.pm new/yast2-users-2.22.4/src/Users.pm --- old/yast2-users-2.22.3/src/Users.pm 2012-03-14 09:46:23.000000000 +0100 +++ new/yast2-users-2.22.4/src/Users.pm 2012-03-29 16:22:31.000000000 +0200 @@ -4984,7 +4984,8 @@ # additional sentence for error popup my $more = (($self->NISAvailable () || $self->LDAPAvailable ()) && ($type eq "local" || $type eq "system")) ? __(" -The existing username might belong to NIS or LDAP user.") : ""; +The existing username might belong to a NIS or LDAP user. +") : ""; # error popup, %1 might be additional sentence ("The existing username...") return sformat (__("There is a conflict between the entered username and an existing username. %1 @@ -5180,9 +5181,10 @@ if ($uid == $dir_uid) { # chown is not needed (#25200) # yes/no popup - $ret{"question"} = sprintf (__("The home directory selected (%s) + $ret{"question"} = sprintf (__("The selected home directory (%s) already exists and is owned by the currently edited user. -Use this directory?"), $home); +Use this directory? +"), $home); $ret{"owned"} = 1; } # maybe it is home of some user marked to delete... diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.22.3/src/UsersUI.ycp new/yast2-users-2.22.4/src/UsersUI.ycp --- old/yast2-users-2.22.3/src/UsersUI.ycp 2012-01-25 14:16:03.000000000 +0100 +++ new/yast2-users-2.22.4/src/UsersUI.ycp 2012-03-29 16:22:31.000000000 +0200 @@ -174,7 +174,7 @@ "Icecast streaming server" : _("Icecast streaming server"), // User name for user: "lighttpd" - "user for lighttpd" : _("user for lighttpd"), + "user for lighttpd" : _("User for lighttpd"), // User name for user: "nagios" "User for Nagios" : _("User for Nagios"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.22.3/src/groups.ycp new/yast2-users-2.22.4/src/groups.ycp --- old/yast2-users-2.22.3/src/groups.ycp 2012-01-25 14:16:03.000000000 +0100 +++ new/yast2-users-2.22.4/src/groups.ycp 2012-03-29 16:22:31.000000000 +0200 @@ -195,7 +195,7 @@ ], "batchmode" :$[ // translators: command line help text for batchmode option - "help" : _("Don't ask for missing data; return error instead.") + "help" : _("Do not ask for missing data; return error instead.") ], ], "mappings" : $[ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.22.3/src/helps.ycp new/yast2-users-2.22.4/src/helps.ycp --- old/yast2-users-2.22.3/src/helps.ycp 2012-01-25 14:16:03.000000000 +0100 +++ new/yast2-users-2.22.4/src/helps.ycp 2012-03-29 16:22:31.000000000 +0200 @@ -129,7 +129,7 @@ // Help text 4.5/6 _("<p><b>Umask for Home Directory</b><br> -Umask which is used for creating new home directories.</p> +Umask to use for creating new home directories.</p> ") + // Help text 5/6: @@ -414,12 +414,12 @@ if (UsersRoutines::CryptedHomesEnabled ()) { // help text for directory encryption - helptext = helptext + _("<p>To encrypt the user's home directory, enable <b>Use Encrypted Home Directory</b> and set the directory size. Encrypting a user's home directory does not provide strong security from other users. If this machine is shared among multiple users, it may be possible for a user to compromise system security, obtain another user's key, and gain access to the encrypted data. If strong security is required, the system should not be physically shared.</p>"); + helptext = helptext + _("<p>To encrypt the user's home directory, enable <b>Use Encrypted Home\nDirectory</b> and set the directory size. Encrypting a user's home directory\ndoes not provide strong security from other users. If this machine is shared\namong multiple users, it may be possible for a user to compromise system\nsecurity by obtaining another user's key and gaining access to the encrypted data. If strong security is required, the system should not be physically shared.</p>"); } else { // help text for directory encryption - helptext = helptext + _("<p>Home directories cannot be encrypted when fingerprint reader device is used. To encrypt the user's home directory, disable fingerprint configuration first.</p>"); + helptext = helptext + _("<p>Home directories cannot be encrypted if a fingerprint reader device is used. To encrypt the user's home directory, disable fingerprint configuration first.</p>"); } } @@ -457,7 +457,7 @@ // help text 8/8 _("<p> <b>Additional Groups:</b> -Select the additional groups in which the user should be a member. +Select additional groups in which the user should be a member. </p> "); return helptext; @@ -500,7 +500,7 @@ */ define string EditUserPasswordDialogHelp() ``{ // Help text 1/6 - return _("<p>Activate <b>Force Password Change</b> to force user to change the password at the next login. If <b>Last Password Change</b> is set to <i>Never</i>, user will be forced to change the password.</p>") + + return _("<p>Activate <b>Force Password Change</b> to force the user to change the\npassword at the next login. If <b>Last Password Change</b> is set to\n<i>Never</i>, the user will be forced to change the password.</p>") + // Help text 2/6 _("<p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.22.3/src/inst_user_first.ycp new/yast2-users-2.22.4/src/inst_user_first.ycp --- old/yast2-users-2.22.3/src/inst_user_first.ycp 2012-01-25 14:16:03.000000000 +0100 +++ new/yast2-users-2.22.4/src/inst_user_first.ycp 2012-03-29 16:22:31.000000000 +0200 @@ -221,7 +221,7 @@ </p>") + // Help text for password expert dialog - _("<p><b>SHA-512</b> is the current standard hash method, using other algorithms is not recommended unless needed for compatibility purpose.</p>"); + _("<p><b>SHA-512</b> is the current standard hash method. Using other algorithms is not recommended unless needed for compatibility purposes.</p>"); // help text for main add user dialog string main_help () { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.22.3/src/ldap_dialogs.ycp new/yast2-users-2.22.4/src/ldap_dialogs.ycp --- old/yast2-users-2.22.3/src/ldap_dialogs.ycp 2012-03-22 11:24:50.000000000 +0100 +++ new/yast2-users-2.22.4/src/ldap_dialogs.ycp 2012-03-22 11:27:14.000000000 +0100 @@ -24,7 +24,7 @@ * Summary: Widgets definitions and helper functions * Authors: Jiri Suchomel <jsuchome@suse.cz> * - * $Id: ldap_dialogs.ycp 67684 2012-03-22 07:10:45Z jsuchome $ + * $Id: ldap_dialogs.ycp 67689 2012-03-22 10:27:12Z jsuchome $ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.22.3/src/users.ycp new/yast2-users-2.22.4/src/users.ycp --- old/yast2-users-2.22.3/src/users.ycp 2012-01-25 14:16:03.000000000 +0100 +++ new/yast2-users-2.22.4/src/users.ycp 2012-03-29 16:22:31.000000000 +0200 @@ -217,7 +217,7 @@ ], "batchmode" :$[ // translators: command line help text for batchmode option - "help" : _("Don't ask for missing data; return error instead.") + "help" : _("Do not ask for missing data; return error instead.") ], ], "mappings" : $[ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.22.3/src/users_plugin_quota.ycp new/yast2-users-2.22.4/src/users_plugin_quota.ycp --- old/yast2-users-2.22.3/src/users_plugin_quota.ycp 2012-01-25 14:16:03.000000000 +0100 +++ new/yast2-users-2.22.4/src/users_plugin_quota.ycp 2012-03-29 16:22:31.000000000 +0200 @@ -135,7 +135,7 @@ string what = config["what"]:"user"; // helptext for quota - string help_text = _("<p>Here, configure quota settings of the user on selected file systems.</p>") + + string help_text = _("<p>Configure quota settings for the user on selected file systems.</p>") + // helptext for quota, cont. _("<p>Define a size limit by specifying the number of 1 KB blocks the @@ -151,11 +151,11 @@ if (what == "group") { // helptext for quota - help_text = _("<p>Here, configure quota settings of the group on selected file systems.</p>") + + help_text = _("<p>Configure quota settings for the group on selected file systems.</p>") + // helptext for quota, cont. _("<p>Define a size limit by specifying the number of 1 kB blocks the -group may have on this file system. Additionally, you can define an inode limit specifying the number of inodes the group may have on the file system.</p> +group may use on this file system. Additionally, you can define an inode limit specifying the number of inodes the group may use on the file system.</p> ") + // helptext for quota, cont. @@ -231,7 +231,7 @@ `VSpacing (0.4), `VSpacing (0.4), // frame label - `Frame (_("I-nodes Limits"), `HBox (`HSpacing (0.5), `VBox ( + `Frame (_("I-nodes Limit"), `HBox (`HSpacing (0.5), `VBox ( `IntField (`id ("quota_inodes_soft"), // intfield label _("S&oft limit"), 0, max, quota_inodes_soft), @@ -283,7 +283,7 @@ if (sel != current || ret == `next) { // error popup - string msg = _("Soft limit cannot be set higher than the hard limit."); + string msg = _("Soft limit cannot be higher than the hard limit."); if ((integer) UI::QueryWidget(`id ("quota_blocks_soft"), `Value) > (integer) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.22.3/src/widgets.ycp new/yast2-users-2.22.4/src/widgets.ycp --- old/yast2-users-2.22.3/src/widgets.ycp 2012-03-14 09:46:23.000000000 +0100 +++ new/yast2-users-2.22.4/src/widgets.ycp 2012-03-29 16:22:31.000000000 +0200 @@ -178,7 +178,7 @@ </p>"); // Help text for password expert dialog 4/5 - help_text = help_text + _("<p><b>SHA-512</b> is the current standard hash method, using other algorithms is not recommended unless needed for compatibility purpose.</p>"); + help_text = help_text + _("<p><b>SHA-512</b> is the current standard hash method. Using other algorithms is not recommended unless needed for compatibility purposes.</p>"); UI::OpenDialog( `VBox( @@ -256,7 +256,7 @@ // help text 2/3 _("<p>It seems that you are running a NIS server. In some network environments, -you could be unable to log in to a NIS client when a user password is +you might be unable to log in to a NIS client when a user password is encrypted with a method other than DES. </p> ") + -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org