Author: jsrain Date: Thu Sep 11 08:27:10 2008 New Revision: 51001 URL: http://svn.opensuse.org/viewcvs/yast?rev=51001&view=rev Log: merged texts from proofread Modified: trunk/ftp-server/package/yast2-ftp-server.changes trunk/ftp-server/src/FtpServer.ycp trunk/ftp-server/src/complex.ycp trunk/ftp-server/src/ftp-server.ycp trunk/ftp-server/src/helps.ycp Modified: trunk/ftp-server/package/yast2-ftp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/package/yast2-ftp-server.changes?rev=51001&r1=51000&r2=51001&view=diff ============================================================================== --- trunk/ftp-server/package/yast2-ftp-server.changes (original) +++ trunk/ftp-server/package/yast2-ftp-server.changes Thu Sep 11 08:27:10 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Sep 11 08:27:00 CEST 2008 - jsrain@suse.cz + +- merged texts from proofread + +------------------------------------------------------------------- Fri Jun 27 10:44:22 CEST 2008 - juhliarik@suse.cz - added fix for using <b></b> in dialog (bnc #398519) - 2.17.0 Modified: trunk/ftp-server/src/FtpServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/FtpServer.ycp?rev=51001&r1=51000&r2=51001&view=diff ============================================================================== --- trunk/ftp-server/src/FtpServer.ycp (original) +++ trunk/ftp-server/src/FtpServer.ycp Thu Sep 11 08:27:10 2008 @@ -880,7 +880,7 @@ if (CommandLine::YesNo()) vsftpd_edit = true; } else { - CommandLine::Error(_("You have installed both daemons. You have to run the configuration in interactive mode.")); + CommandLine::Error(_("You have installed both daemons. Therefore you have to run the configuration in interactive mode.")); return false; } } Modified: trunk/ftp-server/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/complex.ycp?rev=51001&r1=51000&r2=51001&view=diff ============================================================================== --- trunk/ftp-server/src/complex.ycp (original) +++ trunk/ftp-server/src/complex.ycp Thu Sep 11 08:27:10 2008 @@ -82,7 +82,7 @@ `VBox( `Heading (_("No server package installed")), `Left(`Label(_("Please choose an ftp daemon."))), - `Left(`Label(_("Press Cancel to cancel the configuration of the ftp."))), + `Left(`Label(_("Press <b>Cancel</b> to cancel the configuration of the ftp."))), `Left(`RadioButton(`id(0), `opt(`notify), _("&vsftpd"), true)), `Left(`RadioButton(`id(1), `opt(`notify), _("&pure-ftpd"))), `HBox( Modified: trunk/ftp-server/src/ftp-server.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/ftp-server.ycp?rev=51001&r1=51000&r2=51001&view=diff ============================================================================== --- trunk/ftp-server/src/ftp-server.ycp (original) +++ trunk/ftp-server/src/ftp-server.ycp Thu Sep 11 08:27:10 2008 @@ -186,14 +186,14 @@ // access permissions for anonymous users CommandLine::PrintNoCR(_("Access Permissions for Anonymous: ")); if (FtpServer::EDIT_SETTINGS["AnonReadOnly"]:nil == "NO") { - CommandLine::PrintNoCR(_("Upload: enabled; ")); + CommandLine::PrintNoCR(_("Upload enabled; ")); } else { - CommandLine::PrintNoCR(_("Upload: disabled; ")); + CommandLine::PrintNoCR(_("Upload disabled; ")); } if (FtpServer::EDIT_SETTINGS["AnonCreatDirs"]:nil == "YES") { - CommandLine::Print(_("Create directories: enabled")); + CommandLine::Print(_("Create directories enabled")); } else { - CommandLine::Print(_("Create directories: disabled")); + CommandLine::Print(_("Create directories disabled")); } // welcome message vsftpd only @@ -826,7 +826,7 @@ "max_clients_ip" : $[ "handler" : FTPdCMDMaxClientsIP, // TRANSLATORS: CommandLine help - "help" : _("The maximum clients connected via IP"), + "help" : _("The maximum number of clients connected via IP"), "example" : [ "max_clients_ip set_max_clients=20", ], @@ -1029,7 +1029,7 @@ "set_idle_time":$[ "type" : "integer", // TRANSLATORS: CommandLine help - "help" : _("Maximal Idle Time (in minutes)."), + "help" : _("Maximum Idle Time (in minutes)."), ], @@ -1043,7 +1043,7 @@ "set_max_rate":$[ "type" : "integer", // TRANSLATORS: CommandLine help - "help" : _("The maximum rate for ftp users (KB/s)."), + "help" : _("The maximum data transfer rate for ftp users (KB/s)."), ], "anon_only": $[ Modified: trunk/ftp-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/helps.ycp?rev=51001&r1=51000&r2=51001&view=diff ============================================================================== --- trunk/ftp-server/src/helps.ycp (original) +++ trunk/ftp-server/src/helps.ycp Thu Sep 11 08:27:10 2008 @@ -106,7 +106,7 @@ /* general FTP dir for anonymous help 1/1 */ "FtpDirAnon": _("<p><b>FTP Directory for Anonymous Users:</b><br> Here you can specify a directory which is used for ftp anonymous users. -By pressing <b>Browse</b> you can select a directory from local filesystem. +By pressing <b>Browse</b> you can select a directory from the local filesystem. </p> "), @@ -114,7 +114,7 @@ /* general FTP dir for authenticated help 1/1 */ "FtpDirLocal": _("<p><b>FTP Directory for Authenticated Users:</b><br> You can specify a directory which is used for ftp authenticated users. -By pressing <b>Browse</b> you can select a directory from local filesystem. +By pressing <b>Browse</b> you can select a directory from the local filesystem. </p> "), @@ -165,14 +165,14 @@ "AnonAuthen": _("<p><b>Enable/Disable Anonymous and Local Users</b><br> <b>Anonymous Only</b> If enabled only anonymous logins are permitted. <b>Authenticated Users Only</b> If enabled only authenticated users are permitted. -<b>Both</b> If enabled authenticated users and anonymous are permitted. +<b>Both</b> If enabled authenticated users and anonymous users are permitted. </p> "), /* authentication Enable Upload help 1/1 */ "EnableUpload": _("<p><b>Enable Upload</b><br> -If enabled ftp users can upload. Anonymous users need to allow - <b>Anonymous Can Upload</b> for enabling upload. +If enabled ftp users can upload. To allow anonymous users +to upload enable <b>Anonymous Can Upload</b> </p> "), @@ -201,19 +201,21 @@ /* expert settings Enable Passive Mode help 1/1 */ "PassiveMode": _("<p><b>Enable Passive Mode</b><br> -If enabled ftp server allow passive mode for connection. +If enabled the ftp server will allow passive mode for connections. </p> "), /* expert settings Min Port for Pas. Mode help 1/1 */ "PasMinPort":_("<p><b>Min Port for Passive Mode</b><br> -Minimal value for a port range for passive connection replies. This is used for protection by means of a firewall. +Minimum value for a port range for passive connection replies. +This is used for protection by means of a firewall. </p> "), /* expert settings Max Port for Pas. Mode help 1/1 */ "PasMaxPort": _("<p><b>Max Port for Pas. Mode</b><br> -Maximal value for a port range for passive connection replies. This is used for protection by means of a firewall. +Maximum value for a port range for passive connection replies. + This is used for protection by means of a firewall. </p> "), @@ -290,14 +292,13 @@ /* Ovreview dialog help 2/3 */ _("<p><b><big>Adding a FTP Server</big></b><br> -Press <b>Add</b> to configure an ftp server.</p> +Press <b>Add</b> to configure a ftp server.</p> ") + /* Ovreview dialog help 3/3 */ _("<p><b><big>Editing or Deleting</big></b><br> -Choose an ftp server to change or remove. -Then press <b>Edit</b> or <b>Delete</b>, respectively.</p> -"), +Choose a ftp server to change or remove. +Then 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