[yast-commit] r45911 - in /trunk/ftp-server/src: FtpServer.ycp complex.ycp dialogs.ycp ftp-server.ycp helps.ycp wid_functions.ycp

Author: juhliarik Date: Tue Apr 1 09:14:59 2008 New Revision: 45911 URL: http://svn.opensuse.org/viewcvs/yast?rev=45911&view=rev Log: added proofread text Modified: trunk/ftp-server/src/FtpServer.ycp trunk/ftp-server/src/complex.ycp trunk/ftp-server/src/dialogs.ycp trunk/ftp-server/src/ftp-server.ycp trunk/ftp-server/src/helps.ycp trunk/ftp-server/src/wid_functions.ycp Modified: trunk/ftp-server/src/FtpServer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/FtpServer.ycp?rev=45911&r1=45910&r2=45911&view=diff ============================================================================== --- trunk/ftp-server/src/FtpServer.ycp (original) +++ trunk/ftp-server/src/FtpServer.ycp Tue Apr 1 09:14:59 2008 @@ -874,13 +874,13 @@ if ((vsftpd_installed)&&(pureftpd_installed)) { if (CommandLine::Interactive()) { CommandLine::Print(String::UnderlinedHeader(_("You have installed both daemons:"), 0)); - CommandLine::Print(_("It is necessary choose one of them for configuration.")); - CommandLine::Print(_("Do you want to configure vsftpd? (if not you choose pure-ftpd)")); + CommandLine::Print(_("Please choose one of them for configuration.")); + CommandLine::Print(_("Do you want to configure vsftpd? Alternatively choose pure-ftpd")); CommandLine::Print(""); if (CommandLine::YesNo()) vsftpd_edit = true; } else { - CommandLine::Error(_("You have installed both daemons. It is necessary run configuration in interactive mode.")); + CommandLine::Error(_("You have installed both daemons. You have to run the configuration in interactive mode.")); return false; } } @@ -964,7 +964,7 @@ if (PollAbort()) return false; Progress::NextStage (); // write settings for starting daemon - if (!WriteUpload ()) Report::Error (_("Cannot create upload direcotry for anonymous connections!")); + if (!WriteUpload ()) Report::Error (_("Cannot create upload directory for anonymous connections!")); sleep(sl); Modified: trunk/ftp-server/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/complex.ycp?rev=45911&r1=45910&r2=45911&view=diff ============================================================================== --- trunk/ftp-server/src/complex.ycp (original) +++ trunk/ftp-server/src/complex.ycp Tue Apr 1 09:14:59 2008 @@ -81,8 +81,8 @@ `RadioButtonGroup(`id("IntstallFTPd"), `VBox( `Heading (_("No server package installed")), - `Left(`Label(_("Choose ftp daemon please."))), - `Left(`Label(_("If you want to cancel configuration of ftp you can push Cancel button."))), + `Left(`Label(_("Please choose an ftp daemon."))), + `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( @@ -147,7 +147,7 @@ y2milestone("[ftp-server] Package for ftp is not available"); return false; } else if (result == nil) { - Popup::Error(_("Package was not found")); + Popup::Error(_("Package not found")); y2milestone("[ftp-server] Package was not found"); return false; } Modified: trunk/ftp-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/dialogs.ycp?rev=45911&r1=45910&r2=45911&view=diff ============================================================================== --- trunk/ftp-server/src/dialogs.ycp (original) +++ trunk/ftp-server/src/dialogs.ycp Tue Apr 1 09:14:59 2008 @@ -49,7 +49,7 @@ // TRANSLATORS: popup headline _("Aborting FTP Configuration"), // TRANSLATORS: popup message - _("All changes would be lost.Really abort configuration?")); + _("All changes will be lost. Really abort configuration?")); } /** @@ -105,8 +105,8 @@ map StartStop () { map result = $[]; result["service_id"] = "vsftpd"; - result["service_running_label"] = _("FTP is running"); - result["service_not_running_label"] = _("FTP is not running"); + result["service_running_label"] = _("ftp is running"); + result["service_not_running_label"] = _("ftp is not running"); result["start_now_button"] = _("&Start FTP Now"); result["stop_now_button"] = _("S&top FTP Now"); result["save_now_action"] = SaveAndRestartVsftpd; @@ -134,8 +134,8 @@ map StartStopPure () { map result = $[]; result["service_id"] = "pure-ftpd"; - result["service_running_label"] = _("FTP is running"); - result["service_not_running_label"] = _("FTP is not running"); + result["service_running_label"] = _("ftp is running"); + result["service_not_running_label"] = _("ftp is not running"); result["start_now_button"] = _("&Start FTP Now"); result["stop_now_button"] = _("S&top FTP Now"); result["save_now_action"] = SaveAndRestartPure; Modified: trunk/ftp-server/src/ftp-server.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/ftp-server.ycp?rev=45911&r1=45910&r2=45911&view=diff ============================================================================== --- trunk/ftp-server/src/ftp-server.ycp (original) +++ trunk/ftp-server/src/ftp-server.ycp Tue Apr 1 09:14:59 2008 @@ -44,32 +44,32 @@ //start-up settings CommandLine::PrintNoCR(_("Start-Up:")); if (GetStartedViaXinetd ()) { - CommandLine::Print(_("FTP daemon is started via xinetd")); + CommandLine::Print(_("Ftp daemon is started via xinetd")); } else { if (GetEnableService()) { // TRANSLATORS: CommandLine informative text - CommandLine::Print(_("FTP daemon is enabled in the boot process")); + CommandLine::Print(_("Ftp daemon is enabled in the boot process")); } else { // TRANSLATORS: CommandLine informative text - CommandLine::Print(_("FTP daemon needs manual starting")); + CommandLine::Print(_("Ftp daemon needs manual starting")); } } //logging settings CommandLine::PrintNoCR(_("Verbose Logging:")); if (FtpServer::EDIT_SETTINGS["VerboseLogging"]:nil == "YES") { - CommandLine::Print(_("ENABLE")); + CommandLine::Print(_("Enable")); //CommandLine::Print(""); } else { - CommandLine::Print(_("DISABLE")); + CommandLine::Print(_("Disable")); //CommandLine::Print(""); } // chroot settings CommandLine::PrintNoCR(_("Chroot Everyone:")); if (FtpServer::EDIT_SETTINGS["ChrootEnable"]:nil == "YES") { - CommandLine::Print(_("ENABLE")); + CommandLine::Print(_("Enable")); //CommandLine::Print(""); } else { - CommandLine::Print(_("DISABLE")); + CommandLine::Print(_("Disable")); //CommandLine::Print(""); } @@ -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 @@ -265,7 +265,7 @@ CommandLine::Print(String::UnderlinedHeader(_("Start-Up:"), 0)); CommandLine::Print(""); // TRANSLATORS: CommandLine progress information - CommandLine::Print(_("Enabling FTP daemon in the boot process...")); + CommandLine::Print(_("Enabling ftp daemon in the boot process...")); CommandLine::Print(""); SetEnableService(true); } else if (options["manual"]:nil!=nil) { @@ -274,7 +274,7 @@ CommandLine::Print(String::UnderlinedHeader(_("Start-Up:"), 0)); CommandLine::Print(""); // TRANSLATORS: CommandLine progress information - CommandLine::Print(_("Removing FTP daemon from the boot process...")); + CommandLine::Print(_("Removing ftp daemon from the boot process...")); CommandLine::Print(""); SetEnableService(false); } else if (options["xinetd"]:nil!=nil) { @@ -283,7 +283,7 @@ CommandLine::Print(String::UnderlinedHeader(_("Start-Up:"), 0)); CommandLine::Print(""); // TRANSLATORS: CommandLine progress information - CommandLine::Print(_("Start FTP daemon via xinetd")); + CommandLine::Print(_("Start ftp daemon via xinetd")); CommandLine::Print(""); SetStartedViaXinetd(true); if (options["startxinetd"]:nil == nil) { @@ -451,7 +451,7 @@ } } else { // TRANSLATORS: CommandLine error message - CommandLine::Error(_("Only 2 parameters are allowed.")); + CommandLine::Error(_("Only two parameters are allowed.")); CommandLine::Print(""); } } @@ -525,13 +525,13 @@ CommandLine::PrintNoCR(_("Access allowed for: ")); if (options["anon_only"]:nil != nil) { FtpServer::EDIT_SETTINGS["AnonAuthen"] = "0"; - CommandLine::PrintNoCR(_("anonymous users")); + CommandLine::PrintNoCR(_("Anonymous users")); } else if (options["authen_only"]:nil != nil) { FtpServer::EDIT_SETTINGS["AnonAuthen"] = "1"; - CommandLine::PrintNoCR(_("authenticated users")); + CommandLine::PrintNoCR(_("Authenticated users")); } else if (options["anon_and_authen"]:nil != nil) { FtpServer::EDIT_SETTINGS["AnonAuthen"] = "2"; - CommandLine::PrintNoCR(_("anonymous and authenticated users")); + CommandLine::PrintNoCR(_("Anonymous and authenticated users")); } else { // TRANSLATORS: CommandLine error message CommandLine::Error(_("Uknown option.")); @@ -555,18 +555,18 @@ if ((size(options) > 0) && (size(options) <= 2)) { if (options["can_upload"]:nil != nil) { FtpServer::EDIT_SETTINGS["AnonReadOnly"] = "NO"; - CommandLine::PrintNoCR(_("upload ENABLED")); + CommandLine::PrintNoCR(_("Upload enabled")); } else { FtpServer::EDIT_SETTINGS["AnonReadOnly"] = "YES"; - CommandLine::PrintNoCR(_("upload DISABLED")); + CommandLine::PrintNoCR(_("Upload disabled")); } CommandLine::PrintNoCR(_("; ")); if (options["create_dirs"]:nil != nil) { FtpServer::EDIT_SETTINGS["AnonCreatDirs"] = "YES"; - CommandLine::PrintNoCR(_("create dirs ENABLED")); + CommandLine::PrintNoCR(_("Create dirs enabled")); } else { FtpServer::EDIT_SETTINGS["AnonCreatDirs"] = "NO"; - CommandLine::PrintNoCR(_("create dirs DISABLED")); + CommandLine::PrintNoCR(_("Create dirs disabled")); } } else { // TRANSLATORS: CommandLine error message @@ -733,7 +733,7 @@ map cmdline_description = $[ "id" : "ftp-server", /* Command line help text for the Xftpd module */ - "help" : _("Configuration of FTP server"), + "help" : _("Configuration of ftp server"), "guihandler" : FtpdSequence, "initialize" : FtpServer::Read, "finish" : FtpServer::Write, @@ -799,7 +799,7 @@ "authen_dir" : $[ "handler" : FTPdCMDAuthenDir, // TRANSLATORS: CommandLine help - "help" : _("Enter the existing directory for authenticated users.(pure-ftpd only)"), + "help" : _("Enter the existing directory for authenticated users (pure-ftpd only)"), "example" : [ "authen_dir set_authen_dir=/srv/ftp", ], @@ -817,7 +817,7 @@ "idle_time" : $[ "handler" : FTPdCMDIdleTime, // TRANSLATORS: CommandLine help - "help" : _("The maximum Idle Time in minutes"), + "help" : _("The maximum idle time in minutes"), "example" : [ "idle_time set_idle_time=15", ], @@ -826,7 +826,7 @@ "max_clients_ip" : $[ "handler" : FTPdCMDMaxClientsIP, // TRANSLATORS: CommandLine help - "help" : _("The maximum clients connected per IP"), + "help" : _("The maximum clients connected via IP"), "example" : [ "max_clients_ip set_max_clients=20", ], @@ -844,7 +844,7 @@ "max_rate_authen" : $[ "handler" : FTPdCMDMaxRateAuthen, // TRANSLATORS: CommandLine help - "help" : _("The maximum data transfer rate permitted for local authenticated users.[KB/s]"), + "help" : _("The maximum data transfer rate permitted for local authenticated users (KB/s)"), "example" : [ "max_rate_authen set_max_rate=10000", ], @@ -853,7 +853,7 @@ "max_rate_anon" : $[ "handler" : FTPdCMDMaxRateAnon, // TRANSLATORS: CommandLine help - "help" : _("The maximum data transfer rate permitted for anonymous clients.[KB/s]"), + "help" : _("The maximum data transfer rate permitted for anonymous clients (KB/s)"), "example" : [ "max_rate_anon set_max_rate=10000", ], @@ -906,7 +906,7 @@ "SSLv2" : $[ "handler" : FTPdCMDSSLv2, // TRANSLATORS: CommandLine help - "help" : _("If enabled, this option will permit SSL v2 protocol connections. (vsftpd only)"), + "help" : _("If enabled, this option will permit SSL v2 protocol connections (vsftpd only)"), "example" : [ "SSLv2 enable", "SSLv2 disable", @@ -917,7 +917,7 @@ "SSLv3" : $[ "handler" : FTPdCMDSSLv3, // TRANSLATORS: CommandLine help - "help" : _("If enabled, this option will permit SSL v3 protocol connections. (vsftpd only)"), + "help" : _("If enabled, this option will permit SSL v3 protocol connections (vsftpd only)"), "example" : [ "SSLv3 enable", "SSLv3 disable", @@ -940,7 +940,7 @@ "antiwarez" : $[ "handler" : FTPdCMDAntiwarez, // TRANSLATORS: CommandLine help - "help" : _("Disallow downloading of files that were uploaded but not validated by a local admin. (pure-ftpd only)"), + "help" : _("Disallow downloading of files that were uploaded but not validated by a local admin (pure-ftpd only)"), "example" : [ "antiwarez enable", "antiwarez disable", @@ -971,15 +971,15 @@ "options" : $[ "atboot" : $[ // TRANSLATORS: CommandLine help - "help" : _("Start FTP daemon in the boot process"), + "help" : _("Start ftp daemon in the boot process"), ], "manual" : $[ // TRANSLATORS: CommandLine help - "help" : _("Start FTP daemon manually"), + "help" : _("Start ftp daemon manually"), ], "xinetd": $[ // TRANSLATORS: CommandLine help - "help" : _("Start FTP daemon via xinetd"), + "help" : _("Start ftp daemon via xinetd"), ], "startxinetd": $[ // TRANSLATORS: CommandLine help @@ -1029,7 +1029,7 @@ "set_idle_time":$[ "type" : "integer", // TRANSLATORS: CommandLine help - "help" : _("Maximal Idle Time [minutes]."), + "help" : _("Maximal 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 rate for ftp users (KB/s)."), ], "anon_only": $[ @@ -1092,7 +1092,7 @@ //only vsftd "only": $[ // TRANSLATORS: CommandLine help - "help" : _("Refuse connections that don't use SSL/TLS security mechanisms"), + "help" : _("Refuse connections that do not use SSL/TLS security mechanisms"), ], Modified: trunk/ftp-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/helps.ycp?rev=45911&r1=45910&r2=45911&view=diff ============================================================================== --- trunk/ftp-server/src/helps.ycp (original) +++ trunk/ftp-server/src/helps.ycp Tue Apr 1 09:14:59 2008 @@ -76,7 +76,7 @@ /* general logging help 1/1 */ "VerboseLogging": _("<p><b>Verbose Logging</b><br> -When enabled, all FTP requests and responses are logged. +When enabled, all ftp requests and responses are logged. </p> "), @@ -90,29 +90,31 @@ /* general umask for anonymous help - only vsftpd 1/1 */ "UmaskAnon": _("<p><b>Umask for Anonymous:</b><br> The value that the umask for file creation is set to for anonymous users. -If you want to specify octal values, remember the \"0\" prefix otherwise +If you want to specify octal values, remember the \"0\" prefix, otherwise the value will be treated as a base 10 integer. -</p>"), +</p> +"), /* general umask for authenticated users help - only vsftpd 1/1 */ "UmaskLocal": _("<p><b>Umask for Authenticated Users:</b><br> The value that the umask for file creation is set to for local users. -If you want to specify octal values, remember the \"0\" prefix otherwise +If you want to specify octal values, remember the \"0\" prefix, otherwise the value will be treated as a base 10 integer. -</p>"), +</p> +"), /* general FTP dir for anonymous help 1/1 */ "FtpDirAnon": _("<p><b>FTP Directory for Anonymous Users:</b><br> -You can specify directory which is used for FTP anonymous users. -By pressing <b>Browse</b> you can select directory from local filesystem. +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. </p> "), /* general FTP dir for authenticated help 1/1 */ "FtpDirLocal": _("<p><b>FTP Directory for Authenticated Users:</b><br> -You can specify directory which is used for FTP authenticated users. -By pressing <b>Browse</b> you can select directory from local filesystem. +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. </p> "), @@ -124,9 +126,10 @@ /* performance Max Idle Time help 1/1 */ "MaxIdleTime": _("<p><b>Max Idle Time:</b><br> -The timeout which is the maximum time a remote client -may spend between FTP commands. -</p>"), +The maximum time (timeout) a remote client +may spend between ftp commands. +</p> +"), /* performance max clients per IP help 1/1 */ "MaxClientsPerIP": _("<p><b>Max Clients for One IP:</b><br> @@ -168,17 +171,19 @@ /* authentication Enable Upload help 1/1 */ "EnableUpload": _("<p><b>Enable Upload</b><br> -If enable ftp users can upload. Anonymous users need to allow - \"Anonymous Can Upload\" for enabling upload. -</p>"), +If enabled ftp users can upload. Anonymous users need to allow + <b>Anonymous Can Upload</b> for enabling upload. +</p> +"), /* authentication Anonymous Can Upload help 1/1 */ "AnonReadOnly": _("<p><b>Anonymous Can Upload</b><br> If enabled anonymous users will be permitted to upload. -<i>vsftpd only: </i>If you want that anonymous users can upload you -need existing directory with allowed writing in home directory after login. -</p>"), +<i>vsftpd only: </i>If you want to allow anonymous users to upload, you +need an existing directory with write persmission in the home directory after login. +</p> +"), /* authentication Anonymous Can Create Dirs help 1/1 */ "AnonCreatDirs": _("<p><b>Anonymous Can Create Dirs</b><br> @@ -196,20 +201,21 @@ /* expert settings Enable Passive Mode help 1/1 */ "PassiveMode": _("<p><b>Enable Passive Mode</b><br> -If enabled ftp server allowe passive mode for connection. -</p>"), +If enabled ftp server allow passive mode for connection. +</p> +"), /* expert settings Min Port for Pas. Mode help 1/1 */ -"PasMinPort":_("<p><b>Min Port for Pas. Mode</b><br> -Minimal value for port range for passive connection replies. -- for firewalling -</p>"), +"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. +</p> +"), /* expert settings Max Port for Pas. Mode help 1/1 */ "PasMaxPort": _("<p><b>Max Port for Pas. Mode</b><br> -Maximal value for port range for passive connection replies. -- for firewalling -</p>"), +Maximal value for a port range for passive connection replies. This is used for protection by means of a firewall. +</p> +"), /* expert settings Enable SSL help 1/1 */ "SSLEnable": _("<p><b>Enable SSL</b><br> @@ -234,7 +240,7 @@ /* expert settings DSA Certificate to Use for SSL Encrypted Connections help 1/1 */ "CertFile": _("<p><b>DSA Certificate to Use for SSL Encrypted Connections</b><br> This option specifies the location of the DSA certificate to -use for SSL encrypted connections. You can select file by pressing <b>Browse</b> +use for SSL encrypted connections. You can select a file by pressing <b>Browse</b> </p> "), @@ -248,9 +254,8 @@ /* expert settings Security Settings help 1/1 */ "SSL": _("<p><b>Security Settings</b><br> <i>Disable SSL/TLS</i> Disable SSL/TLS encryption layer. -<i>Accept SSL and TLS</i> Accept both traditional and encrypted sessions. -<i>Refuse Conections Without SSL/TLS</i> Refuse connections that don't use -SSL/TLS security mechanisms, including anonymous sessions. +<i>Accept SSL and TLS</i> Accept both, traditional and encrypted sessions. +<i>Refuse Conections Without SSL/TLS</i> Refuse connections that do not use SSL/TLS security mechanisms, including anonymous sessions. </p>"), /** @@ -261,13 +266,13 @@ /* Summary dialog help 1/3 */ "summary" : _("<p><b><big>FTP Server Configuration</big></b><br> -Configure FTP server here.<br></p> +Configure the ftp server here.<br></p> ")+ /* Summary dialog help 2/3 */ _("<p><b><big>Adding an FTP Server:</big></b><br> -Choose an FTP server from the list of detected FTP servers. -If your FTP server was not detected, use <b>Other (not detected)</b>. +Choose an ftp server from the list of detected ftp servers. +If your ftp server was not detected, use <b>Other (not detected)</b>. Then press <b>Configure</b>.</p> ") + @@ -278,20 +283,20 @@ "), /* Ovreview dialog help 1/3 */ - "overview" : _("<p><b><big>FTP Server Configuration Overview</big></b><br> -Obtain an overview of installed FTP servers. Additionally + "overview" : _("<p><b><big>FTP Server Configuration Overvie</big></b><br> +Obtain an overview of the installed ftp servers. Additionally, edit their configurations.<br></p> ") + /* 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 an ftp server.</p> ") + /* Ovreview dialog help 3/3 */ _("<p><b><big>Editing or Deleting</big></b><br> -Choose a FTP server to change or remove. -Then press <b>Edit</b> or <b>Delete</b> as desired.</p> +Choose an ftp server to change or remove. +Then press <b>Edit</b> or <b>Delete</b>, respectively.</p> "), Modified: trunk/ftp-server/src/wid_functions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ftp-server/src/wid_functions.ycp?rev=45911&r1=45910&r2=45911&view=diff ============================================================================== --- trunk/ftp-server/src/wid_functions.ycp (original) +++ trunk/ftp-server/src/wid_functions.ycp Tue Apr 1 09:14:59 2008 @@ -174,7 +174,7 @@ if (FtpServer::WriteStartViaXinetd(true,true) && result) { FtpServer::vsftp_xinetd_running = true; FtpServer::pure_ftp_xinetd_running = false; - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, false); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, true); result = true; @@ -208,7 +208,7 @@ FtpServer::stop_daemon_xinetd = true; if (FtpServer::WriteStartViaXinetd(true,true)) { FtpServer::vsftp_xinetd_running = false; - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is not running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is not running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, true); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, false); result = true; @@ -248,7 +248,7 @@ FtpServer::stop_daemon_xinetd = false; if (FtpServer::WriteStartViaXinetd(true,false) && result) { FtpServer::vsftp_xinetd_running = true; - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, false); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, true); result = true; @@ -293,7 +293,7 @@ if (FtpServer::WriteStartViaXinetd(true,true) && result) { FtpServer::pure_ftp_xinetd_running = true; FtpServer::vsftp_xinetd_running = false; - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, false); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, true); result = true; @@ -330,7 +330,7 @@ FtpServer::stop_daemon_xinetd = true; if (FtpServer::WriteStartViaXinetd(true,true)) { FtpServer::pure_ftp_xinetd_running = false; - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is not running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is not running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, true); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, false); result = true; @@ -368,7 +368,7 @@ FtpServer::stop_daemon_xinetd = false; if (FtpServer::WriteStartViaXinetd(true,false) && result) { FtpServer::pure_ftp_xinetd_running = true; - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, false); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, true); result = true; @@ -448,14 +448,14 @@ void InitStartStopRestart (string key) { if ((FtpServer::pure_ftp_xinetd_running) && (!FtpServer::vsftpd_edit)) { - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, false); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, true); } if ((FtpServer::vsftp_xinetd_running) && (FtpServer::vsftpd_edit)) { - UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("FTP is running"))); + UI::ReplaceWidget (`id ("_cwm_service_status_rp"), `Label(_("ftp is running"))); UI::ChangeWidget (`id ("_cwm_start_service_now"), `Enabled, false); UI::ChangeWidget (`id ("_cwm_stop_service_now"), `Enabled, true); } @@ -584,7 +584,7 @@ list <string> l = splitstring (new_umask, ":"); l = filter (string s, l, ``(s != "")); if (size(l) < 2) { - Popup::Message (_("It is not valid umask.")); + Popup::Message (_("Not a valid umask.")); UI::SetFocus(`id("Umask")); return false; } @@ -829,7 +829,7 @@ list <string> l = splitstring (new_umask, ":"); l = filter (string s, l, ``(s != "")); if (size(l) < 2) { - Popup::Message (_("It is not valid umask.")); + Popup::Message (_("Not a valid umask.")); UI::SetFocus(`id("Umask")); return false; } @@ -1118,16 +1118,23 @@ if (((button == "AnonReadOnly") || (anon_upload) && (check_upload)) && (ask_again)) { if (!FtpServer::create_upload_dir) { - yesno_question =_("Do you want to create directory\n") + FtpServer::anon_homedir +_("upload with allowed writing?"); - yesno_comment = _("If you want that \"anonymous\" users can upload\n you need to create directory with allowed writing.\n\n"); - yesno_comment = yesno_comment + FtpServer::anon_homedir + _(" is a home directory after login of \"anonymous\" users."); + yesno_question =_("Do you want to create a directory?\n") + FtpServer::anon_homedir +_("Upload with write access?"); + yesno_comment = _("If you want anonymous users to be able to upload, + you need to create a directory with write access. + +"); + yesno_comment = yesno_comment + FtpServer::anon_homedir + _(" is a home directory after the login of anonymous users."); FtpServer::create_upload_dir = Popup::YesNoHeadline(yesno_question, yesno_comment); ask_again = FtpServer::create_upload_dir; FtpServer::upload_good_permission = true; } else if (!FtpServer::upload_good_permission) { - yesno_question = _("Do you want to change permission\nfor") + FtpServer::anon_homedir +_("upload (allow writing)?"); - yesno_comment = _("If you want that \"anonymous\" users can upload\n you need directory with allowed writing.\n\n"); - yesno_comment = yesno_comment + FtpServer::anon_homedir + _(" is a home directory after login of \"anonymous\" users."); + yesno_question = _("Do you want to change permissions +for +") + FtpServer::anon_homedir +_("Upload (allow writing)?"); + yesno_comment = _("If you want anonymous users to be able to upload, you need a directory with write access. + +"); + yesno_comment = yesno_comment + FtpServer::anon_homedir + _(" is a home directory after the login of anonymous users."); FtpServer::upload_good_permission = Popup::YesNoHeadline(yesno_question, yesno_comment); ask_again = FtpServer::upload_good_permission; } @@ -1136,16 +1143,24 @@ if (((button == "AnonCreatDirs") || (anon_create_dirs) && (check_upload)) && (ask_again)) { if (!FtpServer::create_upload_dir) { - yesno_question = _("Do you want to create directory\n") + FtpServer::anon_homedir +_("upload with allowed writing?"); - yesno_comment = _("If you want that \"anonymous\" users can create directories\n you need to create directory with allowed writing.\n\n"); - yesno_comment = yesno_comment + FtpServer::anon_homedir + _(" is a home directory after login of \"anonymous\" users."); + yesno_question = _("Do you want to create a directory?\n") + FtpServer::anon_homedir +_("Upload with write access?"); + yesno_comment = _("If you want anonymous users to be able to create directories, + you have to create a directory with write access. + +"); + yesno_comment = yesno_comment + FtpServer::anon_homedir + _(" is a home directory after the login of anonymous users."); FtpServer::create_upload_dir = Popup::YesNoHeadline(yesno_question, yesno_comment); ask_again = FtpServer::create_upload_dir; FtpServer::upload_good_permission = true; } else if (!FtpServer::upload_good_permission) { - yesno_question = _("Do you want to change permission\nfor") + FtpServer::anon_homedir +_("upload (allow writing)?"); - yesno_comment = _("If you want that \"anonymous\" users can create directories\n you need directory with allowed writing.\n\n"); - yesno_comment = yesno_comment + FtpServer::anon_homedir + _(" is a home directory after login of \"anonymous\" users."); + yesno_question = _("Do you want to change permissions +for +") + FtpServer::anon_homedir +_("Upload (allow writing)?"); + yesno_comment = _("If you want anonymous users to be able to create directories, + you need a directory with write acccess. + +"); + yesno_comment = yesno_comment + FtpServer::anon_homedir + _(" is a home directory after the login of anonymous users."); FtpServer::upload_good_permission = Popup::YesNoHeadline(yesno_question, yesno_comment); ask_again = FtpServer::upload_good_permission; } @@ -1195,7 +1210,7 @@ if (!FtpServer::vsftpd_edit) { if (FtpServer::pure_ftp_allowed_permissios_upload == 0) { - yesno_question = sformat(_("Change permission of %1 ?\n"), FtpServer::anon_homedir); + yesno_question = sformat(_("Change permissions of %1 ?\n"), FtpServer::anon_homedir); yesno_comment = sformat(_("If you want to allow uploads for \"anonymous\" users, \nyou need a directory with write access for them.")); result = Popup::YesNoHeadline(yesno_question, yesno_comment); if (result) { @@ -1210,8 +1225,9 @@ } else { if (FtpServer::pure_ftp_allowed_permissios_upload == 1) { - yesno_question = sformat(_("Change permission of %1 ?\n"), FtpServer::anon_homedir); - yesno_comment = sformat(_("For anonymous connections, it is necessary\n that a home directory of an anonymous user is not writeable.")); + yesno_question = sformat(_("Change permissions of %1 ?\n"), FtpServer::anon_homedir); + yesno_comment = sformat(_("For anonymous connections the home directory of an anonymous user should have no write access. +")); result = Popup::YesNoHeadline(yesno_question, yesno_comment); if (result) { FtpServer::pure_ftp_allowed_permissios_upload = 0; @@ -1273,7 +1289,7 @@ if (!FtpServer::vsftpd_edit) { if (FtpServer::pure_ftp_allowed_permissios_upload == 0) { - yesno_question = sformat(_("Change permission of %1 ?\n"), FtpServer::anon_homedir); + yesno_question = sformat(_("Change permissions of %1 ?\n"), FtpServer::anon_homedir); yesno_comment = sformat(_("If you want to allow uploads for \"anonymous\" users, \nyou need a directory with write access for them.")); result = Popup::YesNoHeadline(yesno_question, yesno_comment); if (result) { @@ -1288,8 +1304,9 @@ } else { if (FtpServer::pure_ftp_allowed_permissios_upload == 1) { - yesno_question = sformat(_("Change permission of %1 ?\n"), FtpServer::anon_homedir); - yesno_comment = sformat(_("For anonymous connections, it is necessary\n that a home directory of an anonymous user is not writeable.")); + yesno_question = sformat(_("Change permissions of %1 ?\n"), FtpServer::anon_homedir); + yesno_comment = sformat(_("For anonymous connections the home directory of an anonymous user should have no write access. +")); result = Popup::YesNoHeadline(yesno_question, yesno_comment); if (result) { FtpServer::pure_ftp_allowed_permissios_upload = 0; @@ -1391,16 +1408,23 @@ if (((button == "AnonReadOnly") || (anon_upload) && (check_upload)) && (ask_again)) { if (!FtpServer::create_upload_dir) { - yesno_question = _("Do you want to create directory\n") + FtpServer::anon_homedir +_("upload with allowed writing?"); - yesno_comment = _("If you want that \"anonymous\" users can upload\n you need to create directory with allowed writing.\n\n"); - yesno_comment = yesno_comment + FtpServer::anon_homedir + _(" is a home directory after login of \"anonymous\" users."); + yesno_question = _("Do you want to create a directory?\n") + FtpServer::anon_homedir +_("Upload with write access?"); + yesno_comment = _("If you want anonymous users to be able to upload, + you need to create a directory with write access. + +"); + yesno_comment = yesno_comment + FtpServer::anon_homedir + _(" is a home directory after the login of anonymous users."); FtpServer::create_upload_dir = Popup::YesNoHeadline(yesno_question, yesno_comment); ask_again = FtpServer::create_upload_dir; FtpServer::upload_good_permission = true; } else if (!FtpServer::upload_good_permission) { - yesno_question = _("Do you want to change permission\nfor") + FtpServer::anon_homedir +_("upload (allow writing)?"); - yesno_comment = _("If you want that \"anonymous\" users can upload\n you need directory with allowed writing.\n\n"); - yesno_comment = yesno_comment + FtpServer::anon_homedir + _(" is a home directory after login of \"anonymous\" users."); + yesno_question = _("Do you want to change permissions +for +") + FtpServer::anon_homedir +_("Upload (allow writing)?"); + yesno_comment = _("If you want anonymous users to be able to upload, you need a directory with write access. + +"); + yesno_comment = yesno_comment + FtpServer::anon_homedir + _(" is a home directory after the login of anonymous users."); FtpServer::upload_good_permission = Popup::YesNoHeadline(yesno_question, yesno_comment); ask_again = FtpServer::upload_good_permission; } @@ -1409,16 +1433,24 @@ if (((button == "AnonCreatDirs") || (anon_create_dirs) && (check_upload)) && (ask_again)) { if (!FtpServer::create_upload_dir) { - yesno_question = _("Do you want to create directory\n") + FtpServer::anon_homedir +_("upload with allowed writing?"); - yesno_comment = _("If you want that \"anonymous\" users can create directories\n you need to create directory with allowed writing.\n\n"); - yesno_comment = yesno_comment + FtpServer::anon_homedir + _(" is a home directory after login of \"anonymous\" users."); + yesno_question = _("Do you want to create a directory?\n") + FtpServer::anon_homedir +_("Upload with write access?"); + yesno_comment = _("If you want anonymous users to be able to create directories, + you have to create a directory with write access. + +"); + yesno_comment = yesno_comment + FtpServer::anon_homedir + _(" is a home directory after the login of anonymous users."); FtpServer::create_upload_dir = Popup::YesNoHeadline(yesno_question, yesno_comment); ask_again = FtpServer::create_upload_dir; FtpServer::upload_good_permission = true; } else if (!FtpServer::upload_good_permission) { - yesno_question = _("Do you want to change permission\nfor") + FtpServer::anon_homedir +_("upload (allow writing)?"); - yesno_comment = _("If you want that \"anonymous\" users can create directories\n you need directory with allowed writing.\n\n"); - yesno_comment = yesno_comment + FtpServer::anon_homedir + _(" is a home directory after login of \"anonymous\" users."); + yesno_question = _("Do you want to change permissions +for +") + FtpServer::anon_homedir +_("Upload (allow writing)?"); + yesno_comment = _("If you want anonymous users to be able to create directories, + you need a directory with write acccess. + +"); + yesno_comment = yesno_comment + FtpServer::anon_homedir + _(" is a home directory after the login of anonymous users."); FtpServer::upload_good_permission = Popup::YesNoHeadline(yesno_question, yesno_comment); ask_again = FtpServer::upload_good_permission; } @@ -1770,7 +1802,7 @@ string current = (string) UI::QueryWidget(`id("SSL"), `Value); if ((!FileUtils::Exists("/etc/ssl/private/pure-ftpd.pem")) && ((current == "accept") || (current == "refuse"))) { - Popup::Error(_("Certificate /etc/ssl/private/pure-ftpd.pem for SSL connection is missing.")); + Popup::Error(_("The <tt>/etc/ssl/private/pure-ftpd.pem</tt> certificate for the SSL connection is missing.")); return false; } return true; @@ -1910,7 +1942,7 @@ integer current = (integer) UI::QueryWidget(`id("SSL"), `CurrentButton); if ((!FileUtils::Exists("/etc/ssl/private/pure-ftpd.pem")) && (current > 0)) { - Popup::Error(_("Certificate /etc/ssl/private/pure-ftpd.pem for SSL connection is missing.")); + Popup::Error(_("The <tt>/etc/ssl/private/pure-ftpd.pem</tt> certificate for the SSL connection is missing.")); return false; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org