Mailinglist Archive: yast-commit (275 mails)

< Previous Next >
[yast-commit] r67823 - in /trunk/users: VERSION package/yast2-users.changes src/Users.pm src/UsersUI.ycp src/groups.ycp src/helps.ycp src/inst_user_first.ycp src/users.ycp src/users_plugin_quota.ycp src/widgets.ycp
Author: jsuchome
Date: Thu Mar 29 16:25:52 2012
New Revision: 67823

URL: http://svn.opensuse.org/viewcvs/yast?rev=67823&view=rev
Log:
- merged proofread texts


Modified:
trunk/users/VERSION
trunk/users/package/yast2-users.changes
trunk/users/src/Users.pm
trunk/users/src/UsersUI.ycp
trunk/users/src/groups.ycp
trunk/users/src/helps.ycp
trunk/users/src/inst_user_first.ycp
trunk/users/src/users.ycp
trunk/users/src/users_plugin_quota.ycp
trunk/users/src/widgets.ycp

Modified: trunk/users/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=67823&r1=67822&r2=67823&view=diff
==============================================================================
--- trunk/users/VERSION (original)
+++ trunk/users/VERSION Thu Mar 29 16:25:52 2012
@@ -1 +1 @@
-2.22.3
+2.22.4

Modified: trunk/users/package/yast2-users.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.changes?rev=67823&r1=67822&r2=67823&view=diff
==============================================================================
--- trunk/users/package/yast2-users.changes (original)
+++ trunk/users/package/yast2-users.changes Thu Mar 29 16:25:52 2012
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Mar 29 16:25:07 CEST 2012 - jsuchome@xxxxxxx
+
+- merged proofread texts
+- 2.22.4
+
+-------------------------------------------------------------------
Thu Mar 22 11:18:07 CET 2012 - jsuchome@xxxxxxx

- User specific LDAP configuration moved here from ldap-client,

Modified: trunk/users/src/Users.pm
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/users/src/Users.pm?rev=67823&r1=67822&r2=67823&view=diff
==============================================================================
--- trunk/users/src/Users.pm (original)
+++ trunk/users/src/Users.pm Thu Mar 29 16:25:52 2012
@@ -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...

Modified: trunk/users/src/UsersUI.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersUI.ycp?rev=67823&r1=67822&r2=67823&view=diff
==============================================================================
--- trunk/users/src/UsersUI.ycp (original)
+++ trunk/users/src/UsersUI.ycp Thu Mar 29 16:25:52 2012
@@ -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"),

Modified: trunk/users/src/groups.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/users/src/groups.ycp?rev=67823&r1=67822&r2=67823&view=diff
==============================================================================
--- trunk/users/src/groups.ycp (original)
+++ trunk/users/src/groups.ycp Thu Mar 29 16:25:52 2012
@@ -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" : $[

Modified: trunk/users/src/helps.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/users/src/helps.ycp?rev=67823&r1=67822&r2=67823&view=diff
==============================================================================
--- trunk/users/src/helps.ycp (original)
+++ trunk/users/src/helps.ycp Thu Mar 29 16:25:52 2012
@@ -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>

Modified: trunk/users/src/inst_user_first.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/users/src/inst_user_first.ycp?rev=67823&r1=67822&r2=67823&view=diff
==============================================================================
--- trunk/users/src/inst_user_first.ycp (original)
+++ trunk/users/src/inst_user_first.ycp Thu Mar 29 16:25:52 2012
@@ -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 () {

Modified: trunk/users/src/users.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/users/src/users.ycp?rev=67823&r1=67822&r2=67823&view=diff
==============================================================================
--- trunk/users/src/users.ycp (original)
+++ trunk/users/src/users.ycp Thu Mar 29 16:25:52 2012
@@ -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" : $[

Modified: trunk/users/src/users_plugin_quota.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/users/src/users_plugin_quota.ycp?rev=67823&r1=67822&r2=67823&view=diff
==============================================================================
--- trunk/users/src/users_plugin_quota.ycp (original)
+++ trunk/users/src/users_plugin_quota.ycp Thu Mar 29 16:25:52 2012
@@ -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)

Modified: trunk/users/src/widgets.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/users/src/widgets.ycp?rev=67823&r1=67822&r2=67823&view=diff
==============================================================================
--- trunk/users/src/widgets.ycp (original)
+++ trunk/users/src/widgets.ycp Thu Mar 29 16:25:52 2012
@@ -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: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages