Mailinglist Archive: yast-commit (275 mails)

< Previous Next >
[yast-commit] r67789 - in /trunk/nfs-server: package/yast2-nfs-server.changes src/NfsServer.ycp src/nfs_server.ycp src/routines.ycp src/ui.ycp
Author: jsuchome
Date: Thu Mar 29 15:28:57 2012
New Revision: 67789

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


Modified:
trunk/nfs-server/package/yast2-nfs-server.changes
trunk/nfs-server/src/NfsServer.ycp
trunk/nfs-server/src/nfs_server.ycp
trunk/nfs-server/src/routines.ycp
trunk/nfs-server/src/ui.ycp

Modified: trunk/nfs-server/package/yast2-nfs-server.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/package/yast2-nfs-server.changes?rev=67789&r1=67788&r2=67789&view=diff
==============================================================================
--- trunk/nfs-server/package/yast2-nfs-server.changes (original)
+++ trunk/nfs-server/package/yast2-nfs-server.changes Thu Mar 29 15:28:57 2012
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Thu Mar 29 15:28:39 CEST 2012 - jsuchome@xxxxxxx
+
+- merged proofread texts
+
+-------------------------------------------------------------------
Fri Mar 16 08:49:43 UTC 2012 - mfilka@xxxxxxxx

- Fixed testsuites

Modified: trunk/nfs-server/src/NfsServer.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/src/NfsServer.ycp?rev=67789&r1=67788&r2=67789&view=diff
==============================================================================
--- trunk/nfs-server/src/NfsServer.ycp (original)
+++ trunk/nfs-server/src/NfsServer.ycp Thu Mar 29 15:28:57 2012
@@ -345,7 +345,7 @@
{
if (! Service::Start("idmapd"))
{
- Report::Error(_("Unable to start idmapd. Please
check your domain setting."));
+ Report::Error(_("Unable to start idmapd. Check
your domain setting."));
ok = false;
}
}
@@ -353,7 +353,7 @@
{
if (! Service::Restart("idmapd"))
{
- Report::Error(_("Unable to restart idmapd"));
+ Report::Error(_("Unable to restart idmapd."));
ok = false;
}
}
@@ -364,7 +364,7 @@
{
if(!Service::Stop("idmapd"))
{
- Report::Error(_("Unable to stop idmapd"));
+ Report::Error(_("Unable to stop idmapd."));
ok = false;
}
}
@@ -377,7 +377,7 @@
if (! Service::Start("svcgssd"))
{
// FIXME svcgssd is gone! (only nfsserver is left)
- Report::Error(_("Unable to start svcgssd.
Please ensure your kerberos and gssapi (nfs-utils) set up is correct."));
+ Report::Error(_("Unable to start svcgssd.
Ensure your kerberos and gssapi (nfs-utils) setup is correct."));
ok = false;
}
}

Modified: trunk/nfs-server/src/nfs_server.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/src/nfs_server.ycp?rev=67789&r1=67788&r2=67789&view=diff
==============================================================================
--- trunk/nfs-server/src/nfs_server.ycp (original)
+++ trunk/nfs-server/src/nfs_server.ycp Thu Mar 29 15:28:57 2012
@@ -254,14 +254,14 @@

if (v4domain != "") {
if (!NfsServer::enable_nfsv4) {
- CommandLine::Print(_("Domain cannot be set without enabling NFSv4.
Please use the 'set enablev4' command."));
+ CommandLine::Print(_("Domain cannot be set without enabling NFSv4.
Use the 'set enablev4' command."));
return false;
}
NfsServer::domain = v4domain;
}

if (nfs_sec == "" && enablev4 == "" && v4domain == "") {
- CommandLine::Print(_("Command set must be used as in 'set
option=value'. Please use 'set help' to get information about the options."));
+ CommandLine::Print(_("Command 'set' must be used in the form 'set
option=value'. Use 'set help' to get information about available options."));
return false;
}

@@ -300,7 +300,7 @@
],
"set" : $[
"handler" : NfsServerSetOptionHandler,
- "help" : _("Set the parameters for domain, security and
enablev4"),
+ "help" : _("Set the parameters for domain, security and
enablev4."),
]
],
"options" : $[
@@ -319,15 +319,15 @@
],
"domain" : $[
"type" : "string",
- "help" : _("Domain specification for NFSv4 Idmapping, such as
'localdomain' or 'abc.com' etc."),
+ "help" : _("Domain specification for NFSv4 ID mapping, such as
'localdomain' or 'abc.com' etc."),
],
"enablev4" : $[
"type" : "string",
- "help" : _("Yes/No option for enabling/disabling support for
NFSv4"),
+ "help" : _("Yes/No option for enabling/disabling support for
NFSv4."),
],
"security" : $[
"type" : "string",
- "help" : _("Yes/No option for enabling/disabling secure NFS"),
+ "help" : _("Yes/No option for enabling/disabling secure NFS."),
]
],
"mappings" : $[

Modified: trunk/nfs-server/src/routines.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/src/routines.ycp?rev=67789&r1=67788&r2=67789&view=diff
==============================================================================
--- trunk/nfs-server/src/routines.ycp (original)
+++ trunk/nfs-server/src/routines.ycp Thu Mar 29 15:28:57 2012
@@ -453,7 +453,8 @@
// %1 is a list of exported paths
Report::Warning (sformat (_("There are unbalanced parentheses in
export options
for %1.
-Probably there is spurious whitespace in the configuration file."),
+Likely, there is a spurious whitespace in the configuration file.
+"),
bad_shares_s));
}
}

Modified: trunk/nfs-server/src/ui.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/nfs-server/src/ui.ycp?rev=67789&r1=67788&r2=67789&view=diff
==============================================================================
--- trunk/nfs-server/src/ui.ycp (original)
+++ trunk/nfs-server/src/ui.ycp Thu Mar 29 15:28:57 2012
@@ -246,8 +246,9 @@
if (ret == `ok && !NfsServer::enable_nfsv4)
{
if (issubstring (opts,"fsid=0")) {
- Popup::Message(_("'fsid=0'is not a valid option unless
-NFSv4 is enabled (previous page)"));
+ Popup::Message(_("'fsid=0' is not a valid option unless
+NFSv4 is enabled (previous page).
+"));
ret = nil;
}
}
@@ -330,15 +331,15 @@
help_text = help_text + fw_cwm_widget["help"]:"";

help_text = help_text +
-_("<P>If the server needs to handle NFSv4 clients, check <B>Enable NFSv4</B>,
-and fill in the NFSv4 domain name you want the id mapping daemon to use. Leave
+_("<P>If the server needs to handle NFSv4 clients, check <B>Enable NFSv4</B>
+and fill in the NFSv4 domain name you want the ID mapping daemon to use. Leave
it as localdomain or refer to the man page for idmapd and idmapd.conf if you
are not sure.</P>
");

help_text = help_text +
// FIXME: use %1 as nfs-utils.src.rpm produces nfs-kernel-server.rpm
-_("<P>If the server and client must authenticate using GSS library, please
enable the <B>Enable GSS Security</B>
-checkbox. For being able to use GSS API, currently you need to have Kerberos
and gssapi (nfs-utils > 1.0.7) on your system</P>
+_("<P>If the server and client must authenticate using GSS library, check the
+<B>Enable GSS Security</B> box. To use GSS API, you currently need to have
Kerberos and gssapi (nfs-utils > 1.0.7) on your system.</P>
");

/* The end of the definitions */
@@ -509,7 +510,7 @@
if (NfsServer::enable_nfsv4)
{
// Help, part 4 of 5, caution about fsid=0 in case NFSv4 is enabled.
- help_text = help_text + _("<p>The NFSv4 option is enabled in the
previous page. Make sure that only one exported filesystem is marked with the
fsid=0 option for a particular client.</p>");
+ help_text = help_text + _("<p>NFSv4 is enabled. Make sure that only
one exported filesystem is marked with the fsid=0 option for a particular
client.</p>");

// bnc#471874, NFS4 is complex and so is our UI :-/
// but let's fix the help at least

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages