Author: lslezak Date: Tue Apr 15 14:58:28 2008 New Revision: 46670 URL: http://svn.opensuse.org/viewcvs/yast?rev=46670&view=rev Log: - merged proofread texts (2008-04-15) - 2.16.3 Modified: trunk/instserver/VERSION trunk/instserver/package/yast2-instserver.changes trunk/instserver/src/Instserver.ycp trunk/instserver/src/dialogs.ycp trunk/instserver/src/helps.ycp Modified: trunk/instserver/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/instserver/VERSION?rev=46670&r1=46669&r2=46670&view=diff ============================================================================== --- trunk/instserver/VERSION (original) +++ trunk/instserver/VERSION Tue Apr 15 14:58:28 2008 @@ -1 +1 @@ -2.16.2 +2.16.3 Modified: trunk/instserver/package/yast2-instserver.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/instserver/package/yast2-instserver.changes?rev=46670&r1=46669&r2=46670&view=diff ============================================================================== --- trunk/instserver/package/yast2-instserver.changes (original) +++ trunk/instserver/package/yast2-instserver.changes Tue Apr 15 14:58:28 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 15 14:53:45 CEST 2008 - lslezak@suse.cz + +- merged proofread texts (2008-04-15) +- 2.16.3 + +------------------------------------------------------------------- Mon Mar 17 12:43:32 CET 2008 - jsrain@suse.cz - added 'StartupNotify=true' to the desktop file (bnc #304964) Modified: trunk/instserver/src/Instserver.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/instserver/src/Instserver.ycp?rev=46670&r1=46669&r2=46670&view=diff ============================================================================== --- trunk/instserver/src/Instserver.ycp (original) +++ trunk/instserver/src/Instserver.ycp Tue Apr 15 14:58:28 2008 @@ -447,8 +447,9 @@ list oldexists = filter(map e, oldexp, ``(e["mountpoint"]:"" == dir) ); if (size(oldexists) > 0 ) { - boolean yesno = Popup::YesNo(_("Directory is already exported via NFS, -Leave NFS exports unmodified?")); + boolean yesno = Popup::YesNo(_("Directory is already exported via NFS. +Leave NFS exports unmodified? +")); if (yesno) { return true; @@ -813,12 +814,12 @@ /* Progress stage 1/2 */ _("Read configuration file"), /* Progress stage 2/2 */ - _("Look for a new repository"), + _("Search for a new repository"), ], [ /* Progress step 1/2 */ _("Reading configuration file..."), /* Progress step 2/2 */ - _("Looking for a new repository..."), + _("Searching for a new repository..."), /* Progress finished */ _("Finished") ], Modified: trunk/instserver/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/instserver/src/dialogs.ycp?rev=46670&r1=46669&r2=46670&view=diff ============================================================================== --- trunk/instserver/src/dialogs.ycp (original) +++ trunk/instserver/src/dialogs.ycp Tue Apr 15 14:58:28 2008 @@ -1128,10 +1128,11 @@ y2debug("executing: %1", mkdircmd ); if (SCR::Execute(.target.bash, mkdircmd) != 0 ) { - Popup::Error(sformat(_("Error while creating 'repository' directory. + Popup::Error(sformat(_("Error while creating <tt>repository</tt> directory. Verify that the directory %1 -is writable and try again."), Instserver::ServerSettings["directory"]:"")); +is writable and try again. +"), Instserver::ServerSettings["directory"]:"")); continue; } } Modified: trunk/instserver/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/instserver/src/helps.ycp?rev=46670&r1=46669&r2=46670&view=diff ============================================================================== --- trunk/instserver/src/helps.ycp (original) +++ trunk/instserver/src/helps.ycp Tue Apr 15 14:58:28 2008 @@ -57,8 +57,8 @@ ") + _("<p>If the chosen software repository directory is outside -the FTP server hierarchy, a mount entry is added to <tt>/etc/fstab</tt>, -which makes the software repository directory available under the +the FTP server hierarchy, a mount entry is added to <tt>/etc/fstab</tt>. +This makes the software repository directory available under the FTP server (using the <tt>--bind</tt> option of <tt>mount</tt>). </p> ") + @@ -84,21 +84,22 @@ _("<p><tt>http://<Host IP>/SUSE/<Repository Name></tt> </p>"), - "initial": _("<p><b><big>Configuration of the Repository</big></b><br> + "initial": _("<p><b>Configuration of the Repository</b><br> </p> ") + _("<p>The repository name is used to create a directory under which all product CDs are copied and managed. The repository is accessed using the -configured protocol (NFS, FTP, or HTTP)</p> ") + +configured protocol (NFS, FTP, or HTTP).</p> +") + _("<p><b><big>SLP Support</big></b></p>") + - _("<p>SLP (Service Location Protocol) makes finding an installation server easier. + _("<p>SLP (Service Location Protocol) facilitates to find an installation server. If checked, the repository will be announced on the network using SLP.</p> "), - "initial2": _("<p><b><big>Configuration of the Repository</big></b><br> + "initial2": _("<p><b>Configuration of the Repository</b><br> </p> ") + @@ -128,7 +129,7 @@ "), /* Write dialog help 1/2 */ - "write" : _("<p><b><big>Saving Repository Configuration</big></b><br> + "write" : _("<p><b>Saving Repository Configuration</b><br> Please wait...<br></p> ") + @@ -140,17 +141,15 @@ "), /* Summary dialog help 1/3 */ - "summary" : _("<p><b><big>Repository Configuration</big></b><br> + "summary" : _("<p><b>Repository Configuration</b><br> Configure the installation server here.<br></p> ") + /* Summary dialog help 2/3 */ - _("<p><b><big>Adding a Repository:</big></b><br> -In the repository directory is searched for -unconfigured directories, which are then made + _("<p><b>Adding a Repository:</b><br> +Unconfigured directories are detected in the repository directory and then made available for configuration. -Choose a repository from the list of found repositories. -Then press <b>Configure</b>.</p> +To add a repository, select it from the list of unconfigured repositories and press <b>Configure</b>.</p> ") + /* Summary dialog help 3/3 */ @@ -160,20 +159,20 @@ "), /* Ovreview dialog help 1/3 */ - "overview" : _("<p><b><big>Repositories Overview</big></b><br> -Obtain an overview of configured repositories. Additionally -edit their configuration.<br></p> + "overview" : _("<p><b>Repositories Overview</b><br> +Here you get an overview of the configured repositories. Additionally, +you are able to edit their configuration.<br></p> ") + /* Ovreview dialog help 2/3 */ -_("<p><b><big>Adding a Repository:</big></b><br> -Press <b>Add</b> to configure a repository.</p>") + +_("<p><b>Adding a Repository:</b><br> +Press <b>Add</b> to configure a repository.</p> +") + /* Ovreview dialog help 3/3 */ _("<p><b><big>Editing or Deleting:</big></b><br> -Choose a repository to change or remove. -Then press <b>Edit</b> or <b>Delete</b> as desired.</p> -"), +Choose the repository you want to change or remove and +press <b>Edit</b> or <b>Delete</b>, respectively.</p>\n"), ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org