Mailinglist Archive: yast-commit (1339 mails)

< Previous Next >
[yast-commit] r46843 - in /trunk/autofs: VERSION package/yast2-autofs.changes src/Autofs.pm src/AutofsUI.ycp src/helps.ycp
  • From: jsrain@xxxxxxxxxxxxxxxx
  • Date: Fri, 18 Apr 2008 13:16:58 -0000
  • Message-id: <20080418131658.891B32EC43@xxxxxxxxxxxxxxxx>
Author: jsrain
Date: Fri Apr 18 15:16:58 2008
New Revision: 46843

URL: http://svn.opensuse.org/viewcvs/yast?rev=46843&view=rev
Log:
bump

Modified:
trunk/autofs/VERSION
trunk/autofs/package/yast2-autofs.changes
trunk/autofs/src/Autofs.pm
trunk/autofs/src/AutofsUI.ycp
trunk/autofs/src/helps.ycp

Modified: trunk/autofs/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/autofs/VERSION?rev=46843&r1=46842&r2=46843&view=diff
==============================================================================
--- trunk/autofs/VERSION (original)
+++ trunk/autofs/VERSION Fri Apr 18 15:16:58 2008
@@ -1 +1 @@
-2.15.3
+2.15.4

Modified: trunk/autofs/package/yast2-autofs.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/autofs/package/yast2-autofs.changes?rev=46843&r1=46842&r2=46843&view=diff
==============================================================================
--- trunk/autofs/package/yast2-autofs.changes (original)
+++ trunk/autofs/package/yast2-autofs.changes Fri Apr 18 15:16:58 2008
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Apr 18 15:10:35 CEST 2008 - jsrain@xxxxxxx
+
+- merged texts from proofread
+- 2.15.4
+
+-------------------------------------------------------------------
Mon Mar 17 12:43:32 CET 2008 - jsrain@xxxxxxx

- added 'StartupNotify=true' to the desktop file (bnc #304964)

Modified: trunk/autofs/src/Autofs.pm
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/autofs/src/Autofs.pm?rev=46843&r1=46842&r2=46843&view=diff
==============================================================================
--- trunk/autofs/src/Autofs.pm (original)
+++ trunk/autofs/src/Autofs.pm Fri Apr 18 15:16:58 2008
@@ -221,7 +221,7 @@
if( $LDAPServer eq 'no' )
{
y2milestone("------UNSUITABLE_LDAP_SERVER------");
- return YaPI->SetError( summary => __("The localhost can not be
LDAP server for autofs."),
+ return YaPI->SetError( summary => __("The localhost cannot be
LDAP server for autofs."),
code => "UNSUITABLE_LDAP_SERVER" );
}
}
@@ -237,7 +237,7 @@
if( ! $success )
{
y2milestone("------CAN_NOT_BIND_LDAP------");
- return YaPI->SetError( summary => __("Faild to bind to the LDAP
server."),
+ return YaPI->SetError( summary => __("Failed to bind to the LDAP
server."),
code => "CAN_NOT_BIND_LDAP" );
}


Modified: trunk/autofs/src/AutofsUI.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/autofs/src/AutofsUI.ycp?rev=46843&r1=46842&r2=46843&view=diff
==============================================================================
--- trunk/autofs/src/AutofsUI.ycp (original)
+++ trunk/autofs/src/AutofsUI.ycp Fri Apr 18 15:16:58 2008
@@ -21,7 +21,7 @@
`HSpacing (30),
`RichText(`id(`HelpText),
HELPS["GetLDAPServer"]:""),
// text entry label
- `TextEntry(`id(`ldapserver), _("DNS Name or
IP-address of the LDAP-server"), hostname),
+ `TextEntry(`id(`ldapserver), _("DNS Name or
IP address of the LDAP server"), hostname),
`VSpacing(0.2),
// ok pushbutton: confirm the dialog
`HBox(`PushButton(`id(`ok),
Label::OKButton()),

Modified: trunk/autofs/src/helps.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/autofs/src/helps.ycp?rev=46843&r1=46842&r2=46843&view=diff
==============================================================================
--- trunk/autofs/src/helps.ycp (original)
+++ trunk/autofs/src/helps.ycp Fri Apr 18 15:16:58 2008
@@ -37,7 +37,7 @@
map HELPS = $[

/* Read dialog help 1/2 */
- "read" : _("<p><b><big>Initializing autofs Configuration</big></b><br>
+ "read" : _("<p><b>Initializing autofs configuration</b><br>
Please wait...<br></p>
") +

@@ -47,22 +47,23 @@
"),

/* Write dialog help 1/2 */
- "write" : _("<p><b><big>Saving autofs Configuration</big></b><br>
+ "write" : _("<p><b>Saving autofs configuration</b><br>
Please wait...<br></p>
") +

/* Write dialog help 2/2 */
-_("<p><b><big>Aborting Saving:</big></b><br>
+_("<p><b>Aborting Saving:</b><br>
Abort the save procedure by pressing <b>Abort</b>.
</p>
"),

/* Configure dialog help 1/4 */
- "ConfigureDialog" : _("<p><b><big>Automounter Maps</big></b><br>
+ "ConfigureDialog" : _("<p><b>Automounter Maps</b><br>
The automounter maps are maps referred to by the master
map of the automounter. The automounter maps entries describe how
file systems below the mountpoint of the map are to be mounted.
-<br></p>") +
+<br></p>
+") +

/* Configure dialog help 2/4 */
_("<p><b><big>Key</big></b><br>
@@ -72,8 +73,7 @@

/* Configure dialog help 3/4 */
_("<p><b><big>Options</big></b><br>
-Options are optional. The options are a list of comma separated
-options as customary for the <b>mount</b>(8) command.
+The options are comma seperated, as customary for the <b>mount</b>(8) command.
<br></p>
") +

@@ -87,32 +87,34 @@

/* EntryDialog for NFS entry */
"EntryDialogNFS" : _("<p><b><big>NFS Entry</big></b><br>
-In case of NFS entry the <b>Server</b> is the DNS-name or IP-address of the
NFS-server.<br>
-The <b>Path</p> is the absolute path of the directory on the NFS-server.<br>
+In case of NFS entry the <b>Server</b> is the DNS name or IP address of the
NFS server.<br>
+The <b>Path</p> is the absolute path of the directory on the NFS server.<br>
The <b>Options</b> must be valid options of the <b>mount</b>(8) command for
NFS file system.<br>
-<br></p>"),
+<br></p>
+"),

/* EntryDialog for SAMBA entry */
- "EntryDialogSAMBA" : _("<p><b><big>SAMBA Entry</big></b><br>
-In case of SAMBA entry the <b>Server</b> is the DNS-name or IP-address of the
SAMBA-server.<br>
+ "EntryDialogSAMBA" : _("<p><b>SAMBA Entry</b><br>
+In case of the SAMBA entry the <b>Server</b> is the DNS name or IP address of
the SAMBA server.<br>
The <b>Share</p> is the name of the share to be mounted.<br>
The <b>Options</b> must be valid options of the <b>mount</b>(8) command for
SMB/CIFS file system<br>
-<br></p>"),
+<br></p>
+"),

/* EntryDialog for Other entry */
"EntryDialogOther" : _("<p><b><big>Other Entry</big></b><br>
-Options are optional. The options are a list of comma separated
-options as customary for the <b>mount</b>(8) command.<br>
+The options are comma separated, as customary for the <b>mount</b>(8)
command.<br>
The location specifies from where the file system is to be mounted.
Please consult <b>autofs</b>(5) for more information.
-<br></p>"),
+<br></p>
+"),

/* GetLDAPServer dialog if the ldapserver is localhost */
"GetLDAPServer" : _("<p><b><big>Warning</big></b><br>
-In your system <b>localhost</b> is configured as the LDAP-server.
-But the <b>localhost</b> can not be LDAP-server for autofs because it can not
achieved from the clients.
-Please insert the IP-address or DNS-name of the LDAP-server suitable for the
clients.
-We have suggested the fully qualified hostname of your server. If it is good
push <b>OK</b>.
+In your system <b>localhost</b> is configured as the LDAP server.
+However, the clients cannot reach the <b>localhost</b> and therefore, it
cannot be the LDAP server for autofs.
+Please insert an IP address or DNS name for the LDAP server that is suitable
for the clients, or choose the suggested hostname of your server
+and press <b>Ok</b>.
<br></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